From 7d6dedca86fbe6f8b4ad104bf0a7d8b8dc5f8c5e Mon Sep 17 00:00:00 2001 From: swelf Date: Tue, 4 Jul 2023 16:09:16 +0300 Subject: [PATCH 001/307] upgdared to sdk0.47 --- Dockerfile | 2 +- Makefile | 10 + app/ante_handler.go | 20 +- app/app.go | 245 +- app/ccv_msg_filter_add.go | 2 +- app/export.go | 8 +- app/proposals_allowlist_test.go | 10 +- app/proposals_allowlisting.go | 17 +- app/simulation_test.go | 195 +- app/upgrades/v3/constants.go | 2 +- buf.work.yaml | 9 + cmd/neutrond/consumer.go | 8 +- cmd/neutrond/genaccounts.go | 4 +- cmd/neutrond/main.go | 2 +- cmd/neutrond/root.go | 54 +- config.yml | 40 +- docs/static/openapi.yml | 52969 ++++++++++------ go.mod | 205 +- go.sum | 3217 +- network/hermes/config.toml | 2 +- network/init-neutrond.sh | 2 +- network/init.sh | 16 +- proto/buf.gen.gogo.yml | 8 + proto/buf.lock | 33 + proto/buf.yaml | 26 + .../contractmanager/genesis.proto | 2 +- .../contractmanager/params.proto | 0 .../{ => neutron}/contractmanager/query.proto | 4 +- proto/{ => neutron}/cron/genesis.proto | 4 +- proto/{ => neutron}/cron/params.proto | 0 proto/{ => neutron}/cron/query.proto | 4 +- proto/{ => neutron}/cron/schedule.proto | 0 proto/{ => neutron}/cron/tx.proto | 0 proto/{ => neutron}/feeburner/genesis.proto | 4 +- proto/{ => neutron}/feeburner/params.proto | 0 proto/{ => neutron}/feeburner/query.proto | 4 +- .../total_burned_neutrons_amount.proto | 0 proto/{ => neutron}/feerefunder/fee.proto | 0 proto/{ => neutron}/feerefunder/genesis.proto | 4 +- proto/{ => neutron}/feerefunder/params.proto | 2 +- proto/{ => neutron}/feerefunder/query.proto | 4 +- .../interchainqueries/genesis.proto | 2 +- .../interchainqueries/params.proto | 0 .../interchainqueries/query.proto | 6 +- .../{ => neutron}/interchainqueries/tx.proto | 2 +- .../interchaintxs/v1/genesis.proto | 2 +- .../interchaintxs/v1/params.proto | 0 .../interchaintxs/v1/query.proto | 2 +- proto/{ => neutron}/interchaintxs/v1/tx.proto | 2 +- proto/{ => neutron}/transfer/v1/query.proto | 0 proto/{ => neutron}/transfer/v1/tx.proto | 2 +- scripts/protocgen.sh | 31 + tests/e2e/interchain_security_test.go | 6 +- testutil/chain.go | 10 +- testutil/consumer/test_helpers.go | 16 +- .../contractmanager/keeper/contractmanager.go | 6 +- testutil/contractmanager/network/network.go | 30 +- testutil/cron/keeper/cron.go | 6 +- testutil/cron/network/network.go | 30 +- testutil/feeburner/keeper/feeburner.go | 6 +- testutil/feerefunder/keeper/fee.go | 6 +- .../keeper/interchainqeries.go | 8 +- testutil/interchainqueries/network/network.go | 32 +- .../interchaintxs/keeper/interchaintxs.go | 9 +- testutil/interchaintxs/network/network.go | 32 +- testutil/mocks/feerefunder/types/keepers.go | 2 +- .../mocks/interchainqueries/keeper/verify.go | 16 +- .../types/expected_keepers.go | 4 +- .../mocks/interchainqueries/types/verify.go | 12 +- .../interchaintxs/types/expected_keepers.go | 58 +- .../mocks/transfer/types/expected_keepers.go | 16 +- testutil/test_helpers.go | 37 +- testutil/transfer/keeper/keeper.go | 8 +- wasmbinding/bindings/query.go | 2 +- wasmbinding/message_plugin.go | 2 +- wasmbinding/test/custom_message_test.go | 5 +- wasmbinding/test/custom_query_test.go | 13 +- .../client/cli/query_failure_test.go | 2 +- x/contractmanager/keeper/keeper.go | 2 +- x/contractmanager/keeper/sudo.go | 4 +- x/contractmanager/keeper/sudo_test.go | 2 +- x/contractmanager/module.go | 18 +- x/contractmanager/types/genesis.pb.go | 58 +- x/contractmanager/types/params.pb.go | 36 +- x/contractmanager/types/query.pb.go | 86 +- x/contractmanager/types/query.pb.gw.go | 8 +- x/contractmanager/types/sudo.go | 4 +- x/cron/client/cli/query_schedule_test.go | 2 +- x/cron/keeper/keeper.go | 4 +- x/cron/module.go | 19 +- x/cron/module_simulation.go | 11 +- x/cron/types/genesis.pb.go | 42 +- x/cron/types/params.pb.go | 36 +- x/cron/types/query.pb.go | 88 +- x/cron/types/query.pb.gw.go | 8 +- x/cron/types/schedule.pb.go | 59 +- x/cron/types/tx.pb.go | 28 +- x/feeburner/keeper/keeper.go | 6 +- x/feeburner/keeper/keeper_test.go | 2 +- x/feeburner/module.go | 18 +- x/feeburner/module_simulation.go | 11 +- x/feeburner/types/genesis.pb.go | 46 +- x/feeburner/types/params.pb.go | 44 +- x/feeburner/types/query.pb.go | 78 +- x/feeburner/types/query.pb.gw.go | 6 +- .../types/total_burned_neutrons_amount.pb.go | 46 +- x/feerefunder/keeper/keeper.go | 5 +- x/feerefunder/keeper/keeper_test.go | 2 +- x/feerefunder/module.go | 19 +- x/feerefunder/types/codec.go | 5 +- x/feerefunder/types/expected_keepers.go | 2 +- x/feerefunder/types/fee.pb.go | 62 +- x/feerefunder/types/genesis.go | 2 +- x/feerefunder/types/genesis.pb.go | 56 +- x/feerefunder/types/params.pb.go | 40 +- x/feerefunder/types/query.pb.go | 82 +- x/feerefunder/types/query.pb.gw.go | 6 +- x/feerefunder/types/tx.pb.go | 166 +- x/ibc-hooks/hooks.go | 4 +- x/ibc-hooks/ibc_middleware_test.go | 17 +- x/ibc-hooks/ibc_module.go | 15 +- x/ibc-hooks/ics4_middleware.go | 33 +- x/ibc-hooks/sdkmodule.go | 26 +- x/ibc-hooks/testutils/testing_hooks.go | 4 +- x/ibc-hooks/types/expected_keepers.go | 6 + x/ibc-hooks/types/keys.go | 1 + x/ibc-hooks/utils/utils.go | 6 +- x/ibc-hooks/wasm_hook.go | 10 +- x/interchainqueries/keeper/grpc_query.go | 4 +- x/interchainqueries/keeper/grpc_query_test.go | 13 +- x/interchainqueries/keeper/keeper.go | 8 +- x/interchainqueries/keeper/keeper_test.go | 85 +- x/interchainqueries/keeper/msg_server.go | 21 +- .../keeper/process_block_results.go | 20 +- .../keeper/process_block_results_test.go | 93 +- x/interchainqueries/module.go | 23 +- x/interchainqueries/module_simulation.go | 11 +- x/interchainqueries/types/expected_keepers.go | 4 +- x/interchainqueries/types/genesis.pb.go | 100 +- x/interchainqueries/types/params.pb.go | 58 +- x/interchainqueries/types/query.pb.go | 137 +- x/interchainqueries/types/query.pb.gw.go | 12 +- x/interchainqueries/types/tx.go | 4 +- x/interchainqueries/types/tx.pb.go | 162 +- x/interchainqueries/types/tx_test.go | 14 +- x/interchainqueries/types/verify.go | 10 +- x/interchaintxs/genesis_test.go | 2 +- x/interchaintxs/ibc_module.go | 15 +- .../keeper/grpc_query_interchainaccount.go | 2 +- .../grpc_query_interchainaccount_test.go | 8 +- .../keeper/grpc_query_params_test.go | 2 +- x/interchaintxs/keeper/ibc_handlers.go | 2 +- x/interchaintxs/keeper/ibc_handlers_test.go | 16 +- x/interchaintxs/keeper/keeper.go | 11 +- x/interchaintxs/keeper/msg_server.go | 15 +- x/interchaintxs/keeper/msg_server_test.go | 27 +- x/interchaintxs/keeper/params_test.go | 2 +- x/interchaintxs/module.go | 23 +- x/interchaintxs/module_simulation.go | 11 +- x/interchaintxs/types/expected_keepers.go | 11 +- x/interchaintxs/types/genesis.pb.go | 42 +- x/interchaintxs/types/params.pb.go | 44 +- x/interchaintxs/types/query.pb.go | 83 +- x/interchaintxs/types/tx.pb.go | 96 +- x/interchaintxs/types/types.go | 4 +- x/tokenfactory/client/cli/tx.go | 28 +- x/tokenfactory/keeper/genesis_test.go | 2 +- x/tokenfactory/keeper/keeper.go | 7 +- x/tokenfactory/keeper/keeper_test.go | 2 +- x/tokenfactory/module.go | 23 +- x/tokenfactory/types/authorityMetadata.pb.go | 4 +- x/tokenfactory/types/genesis.pb.go | 4 +- x/tokenfactory/types/params.pb.go | 4 +- x/tokenfactory/types/query.pb.go | 6 +- x/tokenfactory/types/query.pb.gw.go | 6 +- x/tokenfactory/types/tx.pb.go | 6 +- x/transfer/ibc_handlers.go | 4 +- x/transfer/ibc_handlers_test.go | 4 +- x/transfer/keeper/keeper.go | 15 +- x/transfer/keeper/keeper_test.go | 4 +- x/transfer/module.go | 27 +- x/transfer/types/expected_keepers.go | 3 +- x/transfer/types/query.pb.go | 60 +- x/transfer/types/query.pb.gw.go | 28 +- x/transfer/types/query.pb.gw.go_old | 2 +- x/transfer/types/tx.go | 65 +- x/transfer/types/tx.pb.go | 85 +- x/transfer/types/tx_test.go | 2 +- 188 files changed, 36027 insertions(+), 24461 deletions(-) create mode 100644 buf.work.yaml create mode 100644 proto/buf.gen.gogo.yml create mode 100644 proto/buf.lock create mode 100644 proto/buf.yaml rename proto/{ => neutron}/contractmanager/genesis.proto (95%) rename proto/{ => neutron}/contractmanager/params.proto (100%) rename proto/{ => neutron}/contractmanager/query.proto (94%) rename proto/{ => neutron}/cron/genesis.proto (86%) rename proto/{ => neutron}/cron/params.proto (100%) rename proto/{ => neutron}/cron/query.proto (95%) rename proto/{ => neutron}/cron/schedule.proto (100%) rename proto/{ => neutron}/cron/tx.proto (100%) rename proto/{ => neutron}/feeburner/genesis.proto (83%) rename proto/{ => neutron}/feeburner/params.proto (100%) rename proto/{ => neutron}/feeburner/query.proto (94%) rename proto/{ => neutron}/feeburner/total_burned_neutrons_amount.proto (100%) rename proto/{ => neutron}/feerefunder/fee.proto (100%) rename proto/{ => neutron}/feerefunder/genesis.proto (88%) rename proto/{ => neutron}/feerefunder/params.proto (89%) rename proto/{ => neutron}/feerefunder/query.proto (93%) rename proto/{ => neutron}/interchainqueries/genesis.proto (97%) rename proto/{ => neutron}/interchainqueries/params.proto (100%) rename proto/{ => neutron}/interchainqueries/query.proto (94%) rename proto/{ => neutron}/interchainqueries/tx.proto (98%) rename proto/{ => neutron}/interchaintxs/v1/genesis.proto (86%) rename proto/{ => neutron}/interchaintxs/v1/params.proto (100%) rename proto/{ => neutron}/interchaintxs/v1/query.proto (97%) rename proto/{ => neutron}/interchaintxs/v1/tx.proto (98%) rename proto/{ => neutron}/transfer/v1/query.proto (100%) rename proto/{ => neutron}/transfer/v1/tx.proto (97%) create mode 100755 scripts/protocgen.sh diff --git a/Dockerfile b/Dockerfile index 5096fc644..3862e3254 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ RUN cd /opt/neutron && make install-test-binary WORKDIR /opt/neutron HEALTHCHECK --interval=30s --timeout=30s --start-period=5s --retries=3 CMD \ - curl -f http://127.0.0.1:1317/blocks/1 >/dev/null 2>&1 || exit 1 + curl -f http://127.0.0.1:1317/cosmos/base/tendermint/v1beta1/blocks/1 >/dev/null 2>&1 || exit 1 CMD bash /opt/neutron/network/init.sh && \ bash /opt/neutron/network/init-neutrond.sh && \ diff --git a/Makefile b/Makefile index a3a08263d..8025d700c 100644 --- a/Makefile +++ b/Makefile @@ -188,6 +188,16 @@ format: ############################################################################### ### Protobuf ### ############################################################################### +protoVer=0.11.6 +protoImageName=ghcr.io/cosmos/proto-builder:$(protoVer) +protoImage=docker run --rm -v $(CURDIR):/workspace --workdir /workspace $(protoImageName) +proto-gen: + @echo "Generating Protobuf files" + @$(protoImage) sh ./scripts/protocgen.sh + +proto-swagger-gen: + @$(protoImage) sh ./scripts/protoc-swagger-gen.sh + PROTO_FORMATTER_IMAGE=tendermintdev/docker-build-proto@sha256:aabcfe2fc19c31c0f198d4cd26393f5e5ca9502d7ea3feafbfe972448fee7cae proto-format: diff --git a/app/ante_handler.go b/app/ante_handler.go index 1a41cef03..c0dcf5151 100644 --- a/app/ante_handler.go +++ b/app/ante_handler.go @@ -3,14 +3,15 @@ package app import ( wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" wasmTypes "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/cometbft/cometbft/libs/log" + storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/cosmos/cosmos-sdk/x/auth/ante" - ibcante "github.com/cosmos/ibc-go/v4/modules/core/ante" - ibckeeper "github.com/cosmos/ibc-go/v4/modules/core/keeper" - consumerante "github.com/cosmos/interchain-security/app/consumer/ante" - ibcconsumerkeeper "github.com/cosmos/interchain-security/x/ccv/consumer/keeper" - "github.com/tendermint/tendermint/libs/log" + ibcante "github.com/cosmos/ibc-go/v7/modules/core/ante" + ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper" + consumerante "github.com/cosmos/interchain-security/v3/app/consumer/ante" + ibcconsumerkeeper "github.com/cosmos/interchain-security/v3/x/ccv/consumer/keeper" ) // HandlerOptions extend the SDK's AnteHandler options by requiring the IBC @@ -21,7 +22,7 @@ type HandlerOptions struct { IBCKeeper *ibckeeper.Keeper ConsumerKeeper ibcconsumerkeeper.Keeper WasmConfig *wasmTypes.WasmConfig - TXCounterStoreKey sdk.StoreKey + TXCounterStoreKey storetypes.StoreKey } func NewAnteHandler(options HandlerOptions, logger log.Logger) (sdk.AnteHandler, error) { @@ -50,21 +51,20 @@ func NewAnteHandler(options HandlerOptions, logger log.Logger) (sdk.AnteHandler, ante.NewSetUpContextDecorator(), wasmkeeper.NewLimitSimulationGasDecorator(options.WasmConfig.SimulationGasLimit), // after setup context to enforce limits early wasmkeeper.NewCountTXDecorator(options.TXCounterStoreKey), - ante.NewRejectExtensionOptionsDecorator(), + ante.NewExtensionOptionsDecorator(options.ExtensionOptionChecker), consumerante.NewDisabledModulesDecorator("/cosmos.evidence", "/cosmos.slashing"), - ante.NewMempoolFeeDecorator(), ante.NewValidateBasicDecorator(), ante.NewTxTimeoutHeightDecorator(), ante.NewValidateMemoDecorator(options.AccountKeeper), ante.NewConsumeGasForTxSizeDecorator(options.AccountKeeper), - ante.NewDeductFeeDecorator(options.AccountKeeper, options.BankKeeper, options.FeegrantKeeper), + ante.NewDeductFeeDecorator(options.AccountKeeper, options.BankKeeper, options.FeegrantKeeper, options.TxFeeChecker), // SetPubKeyDecorator must be called before all signature verification decorators ante.NewSetPubKeyDecorator(options.AccountKeeper), ante.NewValidateSigCountDecorator(options.AccountKeeper), ante.NewSigGasConsumeDecorator(options.AccountKeeper, sigGasConsumer), ante.NewSigVerificationDecorator(options.AccountKeeper, options.SignModeHandler), ante.NewIncrementSequenceDecorator(options.AccountKeeper), - ibcante.NewAnteDecorator(options.IBCKeeper), + ibcante.NewRedundantRelayDecorator(options.IBCKeeper), } // Don't delete it even if IDE tells you so. diff --git a/app/app.go b/app/app.go index aec5edd8f..e598a714a 100644 --- a/app/app.go +++ b/app/app.go @@ -2,6 +2,12 @@ package app import ( "fmt" + wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/cosmos/cosmos-sdk/runtime" + "github.com/cosmos/cosmos-sdk/x/genutil" + genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types" + tendermint "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" + "github.com/neutron-org/neutron/docs" "io" "io/fs" "net/http" @@ -16,24 +22,27 @@ import ( "github.com/CosmWasm/wasmd/x/wasm" wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" + dbm "github.com/cometbft/cometbft-db" + abci "github.com/cometbft/cometbft/abci/types" + tmjson "github.com/cometbft/cometbft/libs/json" + "github.com/cometbft/cometbft/libs/log" + tmos "github.com/cometbft/cometbft/libs/os" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/client" + nodeservice "github.com/cosmos/cosmos-sdk/client/grpc/node" "github.com/cosmos/cosmos-sdk/client/grpc/tmservice" - "github.com/cosmos/cosmos-sdk/client/rpc" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/codec/types" "github.com/cosmos/cosmos-sdk/server/api" "github.com/cosmos/cosmos-sdk/server/config" servertypes "github.com/cosmos/cosmos-sdk/server/types" - "github.com/cosmos/cosmos-sdk/simapp" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" "github.com/cosmos/cosmos-sdk/version" "github.com/cosmos/cosmos-sdk/x/auth" "github.com/cosmos/cosmos-sdk/x/auth/ante" - authrest "github.com/cosmos/cosmos-sdk/x/auth/client/rest" authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" - authsims "github.com/cosmos/cosmos-sdk/x/auth/simulation" authtx "github.com/cosmos/cosmos-sdk/x/auth/tx" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" "github.com/cosmos/cosmos-sdk/x/auth/vesting" @@ -66,31 +75,25 @@ import ( "github.com/cosmos/cosmos-sdk/x/upgrade" upgradekeeper "github.com/cosmos/cosmos-sdk/x/upgrade/keeper" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - ica "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts" - icacontroller "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/controller" - icacontrollerkeeper "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/controller/keeper" - icacontrollertypes "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/controller/types" - icahost "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/host" - icahostkeeper "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/host/keeper" - icahosttypes "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/host/types" - icatypes "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/types" - ibctransfertypes "github.com/cosmos/ibc-go/v4/modules/apps/transfer/types" - ibc "github.com/cosmos/ibc-go/v4/modules/core" - ibcclient "github.com/cosmos/ibc-go/v4/modules/core/02-client" - ibcclienttypes "github.com/cosmos/ibc-go/v4/modules/core/02-client/types" - ibcporttypes "github.com/cosmos/ibc-go/v4/modules/core/05-port/types" - ibchost "github.com/cosmos/ibc-go/v4/modules/core/24-host" - ibckeeper "github.com/cosmos/ibc-go/v4/modules/core/keeper" - "github.com/cosmos/interchain-security/legacy_ibc_testing/core" - ibctesting "github.com/cosmos/interchain-security/legacy_ibc_testing/testing" + ica "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts" + icacontroller "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller" + icacontrollerkeeper "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/keeper" + icacontrollertypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/types" + icahost "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host" + icahostkeeper "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/keeper" + icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types" + icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" + ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" + ibc "github.com/cosmos/ibc-go/v7/modules/core" + ibcclient "github.com/cosmos/ibc-go/v7/modules/core/02-client" + ibcporttypes "github.com/cosmos/ibc-go/v7/modules/core/05-port/types" + ibchost "github.com/cosmos/ibc-go/v7/modules/core/exported" + ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper" + "github.com/cosmos/interchain-security/v3/legacy_ibc_testing/core" + ibctesting "github.com/cosmos/interchain-security/v3/legacy_ibc_testing/testing" "github.com/spf13/cast" - abci "github.com/tendermint/tendermint/abci/types" - tmjson "github.com/tendermint/tendermint/libs/json" - "github.com/tendermint/tendermint/libs/log" - tmos "github.com/tendermint/tendermint/libs/os" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - dbm "github.com/tendermint/tm-db" + govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" cronkeeper "github.com/neutron-org/neutron/x/cron/keeper" crontypes "github.com/neutron-org/neutron/x/cron/types" @@ -104,11 +107,8 @@ import ( adminmodulemoduletypes "github.com/cosmos/admin-module/x/adminmodule/types" govclient "github.com/cosmos/cosmos-sdk/x/gov/client" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - paramsrest "github.com/cosmos/cosmos-sdk/x/params/client/rest" - upgraderest "github.com/cosmos/cosmos-sdk/x/upgrade/client/rest" appparams "github.com/neutron-org/neutron/app/params" - "github.com/neutron-org/neutron/docs" "github.com/neutron-org/neutron/wasmbinding" "github.com/neutron-org/neutron/x/contractmanager" contractmanagermodulekeeper "github.com/neutron-org/neutron/x/contractmanager/keeper" @@ -131,14 +131,17 @@ import ( feetypes "github.com/neutron-org/neutron/x/feerefunder/types" - e2e "github.com/cosmos/interchain-security/testutil/integration" - ccvconsumer "github.com/cosmos/interchain-security/x/ccv/consumer" - ccvconsumerkeeper "github.com/cosmos/interchain-security/x/ccv/consumer/keeper" - ccvconsumertypes "github.com/cosmos/interchain-security/x/ccv/consumer/types" - - "github.com/strangelove-ventures/packet-forward-middleware/v4/router" - routerkeeper "github.com/strangelove-ventures/packet-forward-middleware/v4/router/keeper" - routertypes "github.com/strangelove-ventures/packet-forward-middleware/v4/router/types" + e2e "github.com/cosmos/interchain-security/v3/testutil/integration" + ccvconsumer "github.com/cosmos/interchain-security/v3/x/ccv/consumer" + ccvconsumerkeeper "github.com/cosmos/interchain-security/v3/x/ccv/consumer/keeper" + ccvconsumertypes "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types" + + storetypes "github.com/cosmos/cosmos-sdk/store/types" + consensusparamkeeper "github.com/cosmos/cosmos-sdk/x/consensus/keeper" + consensusparamtypes "github.com/cosmos/cosmos-sdk/x/consensus/types" + "github.com/strangelove-ventures/packet-forward-middleware/v7/router" + routerkeeper "github.com/strangelove-ventures/packet-forward-middleware/v7/router/keeper" + routertypes "github.com/strangelove-ventures/packet-forward-middleware/v7/router/types" ) const ( @@ -186,12 +189,14 @@ var ( authzmodule.AppModuleBasic{}, bank.AppModuleBasic{}, capability.AppModuleBasic{}, + genutil.NewAppModuleBasic(genutiltypes.DefaultMessageValidator), params.AppModuleBasic{}, crisis.AppModuleBasic{}, slashing.AppModuleBasic{}, feegrantmodule.AppModuleBasic{}, ibc.AppModuleBasic{}, ica.AppModuleBasic{}, + tendermint.AppModuleBasic{}, upgrade.AppModuleBasic{}, evidence.AppModuleBasic{}, transferSudo.AppModuleBasic{}, @@ -208,15 +213,12 @@ var ( adminmodulemodule.NewAppModuleBasic( govclient.NewProposalHandler( adminmodulecli.NewSubmitParamChangeProposalTxCmd, - paramsrest.ProposalRESTHandler, ), govclient.NewProposalHandler( adminmodulecli.NewCmdSubmitUpgradeProposal, - upgraderest.ProposalRESTHandler, ), govclient.NewProposalHandler( adminmodulecli.NewCmdSubmitCancelUpgradeProposal, - upgraderest.ProposalCancelRESTHandler, ), ), ibchooks.AppModuleBasic{}, @@ -240,8 +242,8 @@ var ( ) var ( + _ runtime.AppI = (*App)(nil) _ servertypes.Application = (*App)(nil) - _ simapp.App = (*App)(nil) _ ibctesting.TestingApp = (*App)(nil) ) @@ -271,9 +273,9 @@ type App struct { invCheckPeriod uint // keys to access the substores - keys map[string]*sdk.KVStoreKey - tkeys map[string]*sdk.TransientStoreKey - memKeys map[string]*sdk.MemoryStoreKey + keys map[string]*storetypes.KVStoreKey + tkeys map[string]*storetypes.TransientStoreKey + memKeys map[string]*storetypes.MemoryStoreKey // keepers AccountKeeper authkeeper.AccountKeeper @@ -314,6 +316,8 @@ type App struct { InterchainTxsKeeper interchaintxskeeper.Keeper ContractManagerKeeper contractmanagermodulekeeper.Keeper + ConsensusParamsKeeper consensusparamkeeper.Keeper + WasmKeeper wasm.Keeper // mm is the module manager @@ -339,7 +343,7 @@ func New( baseAppOptions ...func(*baseapp.BaseApp), ) *App { appCodec := encodingConfig.Marshaler - cdc := encodingConfig.Amino + legacyAmino := encodingConfig.Amino interfaceRegistry := encodingConfig.InterfaceRegistry bApp := baseapp.NewBaseApp(Name, logger, db, encodingConfig.TxConfig.TxDecoder(), baseAppOptions...) @@ -354,14 +358,14 @@ func New( icahosttypes.StoreKey, capabilitytypes.StoreKey, interchainqueriesmoduletypes.StoreKey, contractmanagermoduletypes.StoreKey, interchaintxstypes.StoreKey, wasm.StoreKey, feetypes.StoreKey, feeburnertypes.StoreKey, adminmodulemoduletypes.StoreKey, ccvconsumertypes.StoreKey, tokenfactorytypes.StoreKey, routertypes.StoreKey, - crontypes.StoreKey, ibchookstypes.StoreKey, + crontypes.StoreKey, ibchookstypes.StoreKey, consensusparamtypes.StoreKey, crisistypes.StoreKey, ) tkeys := sdk.NewTransientStoreKeys(paramstypes.TStoreKey) memKeys := sdk.NewMemoryStoreKeys(capabilitytypes.MemStoreKey, feetypes.MemStoreKey) app := &App{ BaseApp: bApp, - cdc: cdc, + cdc: legacyAmino, appCodec: appCodec, interfaceRegistry: interfaceRegistry, invCheckPeriod: invCheckPeriod, @@ -371,10 +375,11 @@ func New( encodingConfig: encodingConfig, } - app.ParamsKeeper = initParamsKeeper(appCodec, cdc, keys[paramstypes.StoreKey], tkeys[paramstypes.TStoreKey]) + app.ParamsKeeper = initParamsKeeper(appCodec, legacyAmino, keys[paramstypes.StoreKey], tkeys[paramstypes.TStoreKey]) // set the BaseApp's parameter store - bApp.SetParamStore(app.ParamsKeeper.Subspace(baseapp.Paramspace).WithKeyTable(paramskeeper.ConsensusParamsKeyTable())) + app.ConsensusParamsKeeper = consensusparamkeeper.NewKeeper(appCodec, keys[consensusparamtypes.StoreKey], authtypes.NewModuleAddress(govtypes.ModuleName).String()) + bApp.SetParamStore(&app.ConsensusParamsKeeper) // add capability keeper and ScopeToModule for ibc module app.CapabilityKeeper = capabilitykeeper.NewKeeper(appCodec, keys[capabilitytypes.StoreKey], memKeys[capabilitytypes.MemStoreKey]) @@ -390,28 +395,62 @@ func New( // add keepers app.AccountKeeper = authkeeper.NewAccountKeeper( - appCodec, keys[authtypes.StoreKey], app.GetSubspace(authtypes.ModuleName), authtypes.ProtoBaseAccount, maccPerms, + appCodec, + keys[authtypes.StoreKey], + authtypes.ProtoBaseAccount, + maccPerms, + sdk.GetConfig().GetBech32AccountAddrPrefix(), + authtypes.NewModuleAddress(govtypes.ModuleName).String(), ) app.AuthzKeeper = authzkeeper.NewKeeper( - keys[authz.ModuleName], appCodec, app.MsgServiceRouter(), + keys[authz.ModuleName], appCodec, app.MsgServiceRouter(), app.AccountKeeper, ) app.BankKeeper = bankkeeper.NewBaseKeeper( - appCodec, keys[banktypes.StoreKey], app.AccountKeeper, app.GetSubspace(banktypes.ModuleName), app.BlockedAddrs(), + appCodec, + keys[banktypes.StoreKey], + app.AccountKeeper, + BlockedAddresses(), + authtypes.NewModuleAddress(govtypes.ModuleName).String(), ) app.SlashingKeeper = slashingkeeper.NewKeeper( - appCodec, keys[slashingtypes.StoreKey], &app.ConsumerKeeper, app.GetSubspace(slashingtypes.ModuleName), + appCodec, + legacyAmino, + keys[slashingtypes.StoreKey], + &app.ConsumerKeeper, + authtypes.NewModuleAddress(govtypes.ModuleName).String(), ) - app.CrisisKeeper = crisiskeeper.NewKeeper( - app.GetSubspace(crisistypes.ModuleName), invCheckPeriod, app.BankKeeper, authtypes.FeeCollectorName, + app.CrisisKeeper = *crisiskeeper.NewKeeper( + appCodec, + keys[crisistypes.StoreKey], + invCheckPeriod, + app.BankKeeper, + authtypes.FeeCollectorName, + authtypes.NewModuleAddress(govtypes.ModuleName).String(), ) app.FeeGrantKeeper = feegrantkeeper.NewKeeper(appCodec, keys[feegrant.StoreKey], app.AccountKeeper) - app.UpgradeKeeper = upgradekeeper.NewKeeper(skipUpgradeHeights, keys[upgradetypes.StoreKey], appCodec, homePath, app.BaseApp) + app.UpgradeKeeper = *upgradekeeper.NewKeeper( + skipUpgradeHeights, + keys[upgradetypes.StoreKey], + appCodec, + homePath, + app.BaseApp, + authtypes.NewModuleAddress(govtypes.ModuleName).String(), + ) // ... other modules keepers + // pre-initialize ConsumerKeeper to satsfy ibckeeper.NewKeeper + // which would panic on nil or zero keeper + // ConsumerKeeper implements StakingKeeper but all function calls result in no-ops so this is safe + // communication over IBC is not affected by these changes + app.ConsumerKeeper = ccvconsumerkeeper.NewNonZeroKeeper( + appCodec, + keys[ccvconsumertypes.StoreKey], + app.GetSubspace(ccvconsumertypes.ModuleName), + ) // Create IBC Keeper app.IBCKeeper = ibckeeper.NewKeeper( @@ -427,6 +466,7 @@ func New( 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(), ) @@ -465,6 +505,7 @@ func New( ) wasmHooks := ibchooks.NewWasmHooks(nil, sdk.GetConfig().GetBech32AccountAddrPrefix()) // The contract keeper needs to be set later app.HooksICS4Wrapper = ibchooks.NewICS4Middleware( + app.IBCKeeper.ChannelKeeper, app.RouterKeeper, &wasmHooks, ) @@ -507,12 +548,13 @@ func New( app.SlashingKeeper, app.BankKeeper, app.AccountKeeper, - &app.TransferKeeper, + app.TransferKeeper.Keeper, // we cant use our transfer wrapper type here because of interface incompatibility, it looks safe to use underlying transfer keeper. + // Since the keeper is only used to send reward to provider chain app.IBCKeeper, authtypes.FeeCollectorName, ) app.ConsumerKeeper = *app.ConsumerKeeper.SetHooks(app.SlashingKeeper.Hooks()) - consumerModule := ccvconsumer.NewAppModule(app.ConsumerKeeper) + consumerModule := ccvconsumer.NewAppModule(app.ConsumerKeeper, app.GetSubspace(ccvconsumertypes.ModuleName)) tokenFactoryKeeper := tokenfactorykeeper.NewKeeper( appCodec, @@ -535,11 +577,11 @@ func New( supportedFeatures := "iterator,stargate,staking,neutron" // register the proposal types - adminRouter := govtypes.NewRouter() - adminRouter.AddRoute(govtypes.RouterKey, govtypes.ProposalHandler). + adminRouter := govv1beta1.NewRouter() + adminRouter.AddRoute(govtypes.RouterKey, govv1beta1.ProposalHandler). AddRoute(paramproposal.RouterKey, params.NewParamChangeProposalHandler(app.ParamsKeeper)). - AddRoute(upgradetypes.RouterKey, upgrade.NewSoftwareUpgradeProposalHandler(app.UpgradeKeeper)). - AddRoute(ibcclienttypes.RouterKey, ibcclient.NewClientProposalHandler(app.IBCKeeper.ClientKeeper)) + AddRoute(upgradetypes.RouterKey, upgrade.NewSoftwareUpgradeProposalHandler(&app.UpgradeKeeper)). + AddRoute(ibchost.RouterKey, ibcclient.NewClientProposalHandler(app.IBCKeeper.ClientKeeper)) app.AdminmoduleKeeper = *adminmodulemodulekeeper.NewKeeper( appCodec, @@ -568,7 +610,6 @@ func New( app.GetSubspace(interchaintxstypes.ModuleName), app.IBCKeeper.ChannelKeeper, app.ICAControllerKeeper, - scopedInterTxKeeper, app.ContractManagerKeeper, app.FeeKeeper, ) @@ -579,11 +620,11 @@ func New( app.WasmKeeper = wasm.NewKeeper( appCodec, keys[wasm.StoreKey], - app.GetSubspace(wasm.ModuleName), app.AccountKeeper, app.BankKeeper, nil, nil, + app.IBCKeeper.ChannelKeeper, // may be replaced with middleware such as ics29 feerefunder app.IBCKeeper.ChannelKeeper, &app.IBCKeeper.PortKeeper, scopedWasmKeeper, @@ -593,11 +634,12 @@ func New( wasmDir, wasmConfig, supportedFeatures, + authtypes.NewModuleAddress(govtypes.ModuleName).String(), wasmOpts..., ) - wasmHooks.ContractKeeper = wasmkeeper.NewDefaultPermissionKeeper(app.WasmKeeper) + wasmHooks.ContractKeeper = &app.WasmKeeper - app.CronKeeper.WasmMsgServer = wasmkeeper.NewMsgServerImpl(wasmkeeper.NewDefaultPermissionKeeper(app.WasmKeeper)) + app.CronKeeper.WasmMsgServer = wasmkeeper.NewMsgServerImpl(&app.WasmKeeper) cronModule := cron.NewAppModule(appCodec, &app.CronKeeper) if len(enabledProposals) != 0 { @@ -655,16 +697,15 @@ func New( app.setupUpgradeStoreLoaders() app.mm = module.NewManager( - auth.NewAppModule(appCodec, app.AccountKeeper, nil), + auth.NewAppModule(appCodec, app.AccountKeeper, nil, app.GetSubspace(authtypes.ModuleName)), authzmodule.NewAppModule(appCodec, app.AuthzKeeper, app.AccountKeeper, app.BankKeeper, app.interfaceRegistry), vesting.NewAppModule(app.AccountKeeper, app.BankKeeper), - bank.NewAppModule(appCodec, app.BankKeeper, app.AccountKeeper), - capability.NewAppModule(appCodec, *app.CapabilityKeeper), + bank.NewAppModule(appCodec, app.BankKeeper, app.AccountKeeper, app.GetSubspace(banktypes.ModuleName)), + capability.NewAppModule(appCodec, *app.CapabilityKeeper, false), feegrantmodule.NewAppModule(appCodec, app.AccountKeeper, app.BankKeeper, app.FeeGrantKeeper, app.interfaceRegistry), - crisis.NewAppModule(&app.CrisisKeeper, skipGenesisInvariants), - slashing.NewAppModule(appCodec, app.SlashingKeeper, app.AccountKeeper, app.BankKeeper, app.ConsumerKeeper), - upgrade.NewAppModule(app.UpgradeKeeper), - wasm.NewAppModule(appCodec, &app.WasmKeeper, app.AccountKeeper, app.BankKeeper), + slashing.NewAppModule(appCodec, app.SlashingKeeper, app.AccountKeeper, app.BankKeeper, app.ConsumerKeeper, app.GetSubspace(slashingtypes.ModuleName)), + upgrade.NewAppModule(&app.UpgradeKeeper), + wasm.NewAppModule(appCodec, &app.WasmKeeper, app.AccountKeeper, app.BankKeeper, app.MsgServiceRouter(), app.GetSubspace(wasmtypes.ModuleName)), evidence.NewAppModule(app.EvidenceKeeper), ibc.NewAppModule(app.IBCKeeper), params.NewAppModule(app.ParamsKeeper), @@ -681,6 +722,7 @@ func New( ibcHooksModule, tokenfactory.NewAppModule(appCodec, *app.TokenFactoryKeeper, app.AccountKeeper, app.BankKeeper), cronModule, + crisis.NewAppModule(&app.CrisisKeeper, skipGenesisInvariants, app.GetSubspace(crisistypes.ModuleName)), // always be last to make sure that it checks for all invariants and not only part of them ) // During begin block slashing happens after distr.BeginBlocker so that @@ -780,27 +822,30 @@ func New( ) app.mm.RegisterInvariants(&app.CrisisKeeper) - app.mm.RegisterRoutes(app.Router(), app.QueryRouter(), encodingConfig.Amino) - app.configurator = module.NewConfigurator(app.AppCodec(), app.MsgServiceRouter(), app.GRPCQueryRouter()) - app.mm.RegisterServices(module.NewConfigurator(app.appCodec, app.MsgServiceRouter(), app.GRPCQueryRouter())) + app.configurator = module.NewConfigurator(app.appCodec, app.MsgServiceRouter(), app.GRPCQueryRouter()) + app.mm.RegisterServices(app.configurator) app.setupUpgradeHandlers() // create the simulation manager and define the order of the modules for deterministic simulations app.sm = module.NewSimulationManager( - auth.NewAppModule(appCodec, app.AccountKeeper, authsims.RandomGenesisAccounts), + auth.NewAppModule(appCodec, app.AccountKeeper, nil, app.GetSubspace(authtypes.ModuleName)), authzmodule.NewAppModule(appCodec, app.AuthzKeeper, app.AccountKeeper, app.BankKeeper, app.interfaceRegistry), - bank.NewAppModule(appCodec, app.BankKeeper, app.AccountKeeper), - capability.NewAppModule(appCodec, *app.CapabilityKeeper), + bank.NewAppModule(appCodec, app.BankKeeper, app.AccountKeeper, app.GetSubspace(banktypes.ModuleName)), + capability.NewAppModule(appCodec, *app.CapabilityKeeper, false), feegrantmodule.NewAppModule(appCodec, app.AccountKeeper, app.BankKeeper, app.FeeGrantKeeper, app.interfaceRegistry), - slashing.NewAppModule(appCodec, app.SlashingKeeper, app.AccountKeeper, app.BankKeeper, app.ConsumerKeeper), - params.NewAppModule(app.ParamsKeeper), + slashing.NewAppModule(appCodec, app.SlashingKeeper, app.AccountKeeper, app.BankKeeper, nil, app.GetSubspace(slashingtypes.ModuleName)), + wasm.NewAppModule(appCodec, &app.WasmKeeper, app.AccountKeeper, app.BankKeeper, app.MsgServiceRouter(), app.GetSubspace(wasmtypes.ModuleName)), evidence.NewAppModule(app.EvidenceKeeper), - wasm.NewAppModule(appCodec, &app.WasmKeeper, app.AccountKeeper, app.BankKeeper), ibc.NewAppModule(app.IBCKeeper), + params.NewAppModule(app.ParamsKeeper), transferModule, + consumerModule, + icaModule, + app.RouterModule, interchainQueriesModule, interchainTxsModule, + feeBurnerModule, cronModule, ) app.sm.RegisterStoreDecoders() @@ -912,7 +957,7 @@ func (app *App) setupUpgradeHandlers() { func (app *App) Name() string { return app.BaseApp.Name() } // GetBaseApp returns the base app of the application -func (app App) GetBaseApp() *baseapp.BaseApp { return app.BaseApp } +func (app *App) GetBaseApp() *baseapp.BaseApp { return app.BaseApp } // BeginBlocker application updates every begin block func (app *App) BeginBlocker(ctx sdk.Context, req abci.RequestBeginBlock) abci.ResponseBeginBlock { @@ -986,21 +1031,21 @@ func (app *App) InterfaceRegistry() types.InterfaceRegistry { // GetKey returns the KVStoreKey for the provided store key. // // NOTE: This is solely to be used for testing purposes. -func (app *App) GetKey(storeKey string) *sdk.KVStoreKey { +func (app *App) GetKey(storeKey string) *storetypes.KVStoreKey { return app.keys[storeKey] } // GetTKey returns the TransientStoreKey for the provided store key. // // NOTE: This is solely to be used for testing purposes. -func (app *App) GetTKey(storeKey string) *sdk.TransientStoreKey { +func (app *App) GetTKey(storeKey string) *storetypes.TransientStoreKey { return app.tkeys[storeKey] } // GetMemKey returns the MemStoreKey for the provided mem key. // // NOTE: This is solely used for testing purposes. -func (app *App) GetMemKey(storeKey string) *sdk.MemoryStoreKey { +func (app *App) GetMemKey(storeKey string) *storetypes.MemoryStoreKey { return app.memKeys[storeKey] } @@ -1016,16 +1061,11 @@ func (app *App) GetSubspace(moduleName string) paramstypes.Subspace { // API server. func (app *App) RegisterAPIRoutes(apiSvr *api.Server, apiConfig config.APIConfig) { clientCtx := apiSvr.ClientCtx - rpc.RegisterRoutes(clientCtx, apiSvr.Router) - // Register legacy tx routes. - authrest.RegisterTxRoutes(clientCtx, apiSvr.Router) // Register new tx routes from grpc-gateway. authtx.RegisterGRPCGatewayRoutes(clientCtx, apiSvr.GRPCGatewayRouter) // Register new tendermint queries routes from grpc-gateway. tmservice.RegisterGRPCGatewayRoutes(clientCtx, apiSvr.GRPCGatewayRouter) - // Register legacy and grpc-gateway routes for all modules. - ModuleBasics.RegisterRESTRoutes(clientCtx, apiSvr.Router) ModuleBasics.RegisterGRPCGatewayRoutes(clientCtx, apiSvr.GRPCGatewayRouter) // Register app's swagger ui @@ -1041,7 +1081,7 @@ func (app *App) RegisterTxService(clientCtx client.Context) { // RegisterTendermintService implements the Application.RegisterTendermintService method. func (app *App) RegisterTendermintService(clientCtx client.Context) { - tmservice.RegisterTendermintService(app.BaseApp.GRPCQueryRouter(), clientCtx, app.interfaceRegistry) + tmservice.RegisterTendermintService(clientCtx, app.BaseApp.GRPCQueryRouter(), app.interfaceRegistry, app.Query) } // GetMaccPerms returns a copy of the module account permissions @@ -1054,7 +1094,7 @@ func GetMaccPerms() map[string][]string { } // initParamsKeeper init params keeper and its subspaces -func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino, key, tkey sdk.StoreKey) paramskeeper.Keeper { +func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino, key, tkey storetypes.StoreKey) paramskeeper.Keeper { paramsKeeper := paramskeeper.NewKeeper(appCodec, legacyAmino, key, tkey) paramsKeeper.Subspace(authtypes.ModuleName) @@ -1143,3 +1183,20 @@ func (app *App) GetTestSlashingKeeper() e2e.TestSlashingKeeper { func (app *App) GetTestEvidenceKeeper() e2e.TestEvidenceKeeper { return app.EvidenceKeeper } + +func (app *App) RegisterNodeService(clientCtx client.Context) { + nodeservice.RegisterNodeService(clientCtx, app.GRPCQueryRouter()) +} + +// BlockedAddresses returns all the app's blocked account addresses. +func BlockedAddresses() map[string]bool { + modAccAddrs := make(map[string]bool) + for acc := range GetMaccPerms() { + modAccAddrs[authtypes.NewModuleAddress(acc).String()] = true + } + + // allow the following addresses to receive funds + delete(modAccAddrs, authtypes.NewModuleAddress(govtypes.ModuleName).String()) + + return modAccAddrs +} diff --git a/app/ccv_msg_filter_add.go b/app/ccv_msg_filter_add.go index d4ead58a7..0f883f44e 100644 --- a/app/ccv_msg_filter_add.go +++ b/app/ccv_msg_filter_add.go @@ -2,4 +2,4 @@ package app -const SkipCcvMsgFilter = false +const SkipCcvMsgFilter = true // TODO вернуть false diff --git a/app/export.go b/app/export.go index e71f8b575..8d437fdcb 100644 --- a/app/export.go +++ b/app/export.go @@ -4,17 +4,17 @@ import ( "encoding/json" "fmt" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + tmtypes "github.com/cometbft/cometbft/types" servertypes "github.com/cosmos/cosmos-sdk/server/types" sdk "github.com/cosmos/cosmos-sdk/types" slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - tmtypes "github.com/tendermint/tendermint/types" ) // ExportAppStateAndValidators exports the state of the application for a genesis // file. func (app *App) ExportAppStateAndValidators( - forZeroHeight bool, jailAllowedAddrs []string, + forZeroHeight bool, jailAllowedAddrs []string, modulesToExport []string, ) (servertypes.ExportedApp, error) { // as if they could withdraw from the start of the next block ctx := app.NewContext(true, tmproto.Header{Height: app.LastBlockHeight()}) @@ -27,7 +27,7 @@ func (app *App) ExportAppStateAndValidators( app.prepForZeroHeightGenesis(ctx, jailAllowedAddrs) } - genState := app.mm.ExportGenesis(ctx, app.appCodec) + genState := app.mm.ExportGenesisForModules(ctx, app.appCodec, modulesToExport) appState, err := json.MarshalIndent(genState, "", " ") if err != nil { return servertypes.ExportedApp{}, err diff --git a/app/proposals_allowlist_test.go b/app/proposals_allowlist_test.go index 2538ee2a1..f2e1f7681 100644 --- a/app/proposals_allowlist_test.go +++ b/app/proposals_allowlist_test.go @@ -4,11 +4,11 @@ import ( "encoding/json" "testing" - simapp "github.com/cosmos/cosmos-sdk/simapp" - ibctesting "github.com/cosmos/interchain-security/legacy_ibc_testing/testing" + tmdb "github.com/cometbft/cometbft-db" + "github.com/cometbft/cometbft/libs/log" + "github.com/cosmos/cosmos-sdk/testutil/sims" + ibctesting "github.com/cosmos/interchain-security/v3/legacy_ibc_testing/testing" "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/libs/log" - tmdb "github.com/tendermint/tm-db" "github.com/neutron-org/neutron/app" ) @@ -38,7 +38,7 @@ func SetupTestingAppConsumer() (ibctesting.TestingApp, map[string]json.RawMessag 0, encoding, app.GetEnabledProposals(), - simapp.EmptyAppOptions{}, + sims.EmptyAppOptions{}, nil, ) return testApp, app.NewDefaultGenesisState(encoding.Marshaler) diff --git a/app/proposals_allowlisting.go b/app/proposals_allowlisting.go index e587feac8..38a86ed9d 100644 --- a/app/proposals_allowlisting.go +++ b/app/proposals_allowlisting.go @@ -2,14 +2,13 @@ package app import ( wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" - banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" + govtypes "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" "github.com/cosmos/cosmos-sdk/x/params/types/proposal" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - icahosttypes "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/host/types" - ibctransfertypes "github.com/cosmos/ibc-go/v4/modules/apps/transfer/types" - ibcclienttypes "github.com/cosmos/ibc-go/v4/modules/core/02-client/types" - packetforwardmiddlewaretypes "github.com/strangelove-ventures/packet-forward-middleware/v4/router/types" + icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types" + ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" + ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" + packetforwardmiddlewaretypes "github.com/strangelove-ventures/packet-forward-middleware/v7/router/types" crontypes "github.com/neutron-org/neutron/x/cron/types" feeburnertypes "github.com/neutron-org/neutron/x/feeburner/types" @@ -53,8 +52,6 @@ type paramChangeKey struct { } var WhitelistedParams = map[paramChangeKey]struct{}{ - // bank - {Subspace: banktypes.ModuleName, Key: string(banktypes.KeySendEnabled)}: {}, // ibc transfer {Subspace: ibctransfertypes.ModuleName, Key: string(ibctransfertypes.KeySendEnabled)}: {}, {Subspace: ibctransfertypes.ModuleName, Key: string(ibctransfertypes.KeyReceiveEnabled)}: {}, @@ -62,8 +59,8 @@ var WhitelistedParams = map[paramChangeKey]struct{}{ {Subspace: icahosttypes.SubModuleName, Key: string(icahosttypes.KeyHostEnabled)}: {}, {Subspace: icahosttypes.SubModuleName, Key: string(icahosttypes.KeyAllowMessages)}: {}, // cosmwasm - {Subspace: wasmtypes.ModuleName, Key: string(wasmtypes.ParamStoreKeyUploadAccess)}: {}, - {Subspace: wasmtypes.ModuleName, Key: string(wasmtypes.ParamStoreKeyInstantiateAccess)}: {}, + //{Subspace: wasmtypes.ModuleName, Key: string(wasmtypes.ParamStoreKeyUploadAccess)}: {}, + //{Subspace: wasmtypes.ModuleName, Key: string(wasmtypes.ParamStoreKeyInstantiateAccess)}: {}, // feerefunder {Subspace: feerefundertypes.ModuleName, Key: string(feerefundertypes.KeyFees)}: {}, // interchaintxs diff --git a/app/simulation_test.go b/app/simulation_test.go index 24df5b875..38200832e 100644 --- a/app/simulation_test.go +++ b/app/simulation_test.go @@ -1,94 +1,107 @@ package app_test -import ( - "os" - "testing" +// TODO: enable test +// at the moment latest ibc-go release requires outdated app interface in the `simapp.SimulationOperations` method - "github.com/cosmos/cosmos-sdk/baseapp" - "github.com/cosmos/cosmos-sdk/codec" - "github.com/cosmos/cosmos-sdk/simapp" - sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/types/module" - simulationtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/cosmos/cosmos-sdk/x/simulation" - "github.com/stretchr/testify/require" - abci "github.com/tendermint/tendermint/abci/types" - - "github.com/neutron-org/neutron/app" -) - -func init() { - simapp.GetSimulatorFlags() -} - -type SimApp interface { - GetBaseApp() *baseapp.BaseApp - AppCodec() codec.Codec - SimulationManager() *module.SimulationManager - ModuleAccountAddrs() map[string]bool - Name() string - LegacyAmino() *codec.LegacyAmino - BeginBlocker(ctx sdk.Context, req abci.RequestBeginBlock) abci.ResponseBeginBlock - EndBlocker(ctx sdk.Context, req abci.RequestEndBlock) abci.ResponseEndBlock - InitChainer(ctx sdk.Context, req abci.RequestInitChain) abci.ResponseInitChain -} - -// BenchmarkSimulation run the chain simulation -// Running using starport command: -// `starport chain simulate -v --numBlocks 200 --blockSize 50` -// Running as go benchmark test: -// `go test -benchmem -run=^$ -bench ^BenchmarkSimulation ./app -NumBlocks=200 -BlockSize 50 -Commit=true -Verbose=true -Enabled=true` -func BenchmarkSimulation(b *testing.B) { - simapp.FlagEnabledValue = true - simapp.FlagCommitValue = true - - config, db, dir, logger, _, err := simapp.SetupSimulation("goleveldb-app-sim", "Simulation") - require.NoError(b, err, "simulation setup failed") - - b.Cleanup(func() { - db.Close() - err = os.RemoveAll(dir) - require.NoError(b, err) - }) - - encoding := app.MakeEncodingConfig() - - app := app.New( - logger, - db, - nil, - true, - map[int64]bool{}, - app.DefaultNodeHome, - 0, - encoding, - app.GetEnabledProposals(), - simapp.EmptyAppOptions{}, - nil, - ) - - simApp := app - // require.True(b, ok, "can't use simapp") - - // Run randomized simulations - _, simParams, simErr := simulation.SimulateFromSeed( - b, - os.Stdout, - simApp.GetBaseApp(), - simapp.AppStateFn(simApp.AppCodec(), simApp.SimulationManager()), - simulationtypes.RandomAccounts, - simapp.SimulationOperations(app, simApp.AppCodec(), config), - simApp.ModuleAccountAddrs(), - config, - simApp.AppCodec(), - ) - - // export state and simParams before the simulation error is checked - err = simapp.CheckExportSimulation(app, config, simParams) - require.NoError(b, err) - require.NoError(b, simErr) - - if config.Commit { - simapp.PrintStats(db) - } -} +// +//import ( +// "github.com/cosmos/cosmos-sdk/server/types" +// "github.com/cosmos/ibc-go/v7/testing/simapp" +// "os" +// "testing" +// +// abci "github.com/cometbft/cometbft/abci/types" +// "github.com/cosmos/cosmos-sdk/baseapp" +// "github.com/cosmos/cosmos-sdk/codec" +// sdk "github.com/cosmos/cosmos-sdk/types" +// "github.com/cosmos/cosmos-sdk/types/module" +// simulationtypes "github.com/cosmos/cosmos-sdk/types/simulation" +// "github.com/cosmos/cosmos-sdk/x/simulation" +// "github.com/stretchr/testify/require" +// +// "github.com/neutron-org/neutron/app" +//) +// +//func init() { +// simapp.GetSimulatorFlags() +//} +// +//type SimApp interface { +// GetBaseApp() *baseapp.BaseApp +// AppCodec() codec.Codec +// SimulationManager() *module.SimulationManager +// ModuleAccountAddrs() map[string]bool +// Name() string +// LegacyAmino() *codec.LegacyAmino +// BeginBlocker(ctx sdk.Context, req abci.RequestBeginBlock) abci.ResponseBeginBlock +// EndBlocker(ctx sdk.Context, req abci.RequestEndBlock) abci.ResponseEndBlock +// InitChainer(ctx sdk.Context, req abci.RequestInitChain) abci.ResponseInitChain +// +// // Loads the app at a given height. +// LoadHeight(height int64) error +// +// // Exports the state of the application for a genesis file. +// ExportAppStateAndValidators( +// forZeroHeight bool, jailAllowedAddrs []string, +// ) (types.ExportedApp, error) +//} +// +//// BenchmarkSimulation run the chain simulation +//// Running using starport command: +//// `starport chain simulate -v --numBlocks 200 --blockSize 50` +//// Running as go benchmark test: +//// `go test -benchmem -run=^$ -bench ^BenchmarkSimulation ./app -NumBlocks=200 -BlockSize 50 -Commit=true -Verbose=true -Enabled=true` +//func BenchmarkSimulation(b *testing.B) { +// simapp.FlagEnabledValue = true +// simapp.FlagCommitValue = true +// +// config, db, dir, logger, _, err := simapp.SetupSimulation("goleveldb-app-sim", "Simulation") +// require.NoError(b, err, "simulation setup failed") +// +// b.Cleanup(func() { +// db.Close() +// err = os.RemoveAll(dir) +// require.NoError(b, err) +// }) +// +// encoding := app.MakeEncodingConfig() +// +// app := app.New( +// logger, +// db, +// nil, +// true, +// map[int64]bool{}, +// app.DefaultNodeHome, +// 0, +// encoding, +// app.GetEnabledProposals(), +// simapp.EmptyAppOptions{}, +// nil, +// ) +// +// simApp := app +// // require.True(b, ok, "can't use simapp") +// +// // Run randomized simulations +// _, simParams, simErr := simulation.SimulateFromSeed( +// b, +// os.Stdout, +// simApp.GetBaseApp(), +// simapp.AppStateFn(simApp.AppCodec(), simApp.SimulationManager()), +// simulationtypes.RandomAccounts, +// simapp.SimulationOperations(app, simApp.AppCodec(), config), +// simApp.ModuleAccountAddrs(), +// config, +// simApp.AppCodec(), +// ) +// +// // export state and simParams before the simulation error is checked +// err = simapp.CheckExportSimulation(app, config, simParams) +// require.NoError(b, err) +// require.NoError(b, simErr) +// +// if config.Commit { +// simapp.PrintStats(db) +// } +//} diff --git a/app/upgrades/v3/constants.go b/app/upgrades/v3/constants.go index 3d9e4862e..2e64b39d4 100644 --- a/app/upgrades/v3/constants.go +++ b/app/upgrades/v3/constants.go @@ -2,7 +2,7 @@ package v3 import ( store "github.com/cosmos/cosmos-sdk/store/types" - ccvprovider "github.com/cosmos/interchain-security/x/ccv/provider/types" + ccvprovider "github.com/cosmos/interchain-security/v3/x/ccv/provider/types" "github.com/neutron-org/neutron/app/upgrades" ) diff --git a/buf.work.yaml b/buf.work.yaml new file mode 100644 index 000000000..d050a7aac --- /dev/null +++ b/buf.work.yaml @@ -0,0 +1,9 @@ +# Generated by "buf config migrate-v1beta1". Edit as necessary, and +# remove this comment when you're finished. +# +# This workspace file points to the roots found in your +# previous "buf.yaml" configuration. +version: v1 +directories: + - proto + # - third_party/proto diff --git a/cmd/neutrond/consumer.go b/cmd/neutrond/consumer.go index af0a57c54..0db98e88e 100644 --- a/cmd/neutrond/consumer.go +++ b/cmd/neutrond/consumer.go @@ -4,6 +4,9 @@ import ( "encoding/json" "fmt" + types1 "github.com/cometbft/cometbft/abci/types" + pvm "github.com/cometbft/cometbft/privval" + tmtypes "github.com/cometbft/cometbft/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" @@ -11,11 +14,8 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/cosmos/cosmos-sdk/x/genutil" genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types" - ccvconsumertypes "github.com/cosmos/interchain-security/x/ccv/consumer/types" + ccvconsumertypes "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types" "github.com/spf13/cobra" - types1 "github.com/tendermint/tendermint/abci/types" - pvm "github.com/tendermint/tendermint/privval" - tmtypes "github.com/tendermint/tendermint/types" "github.com/neutron-org/neutron/testutil/consumer" ) diff --git a/cmd/neutrond/genaccounts.go b/cmd/neutrond/genaccounts.go index 58b486d82..79d45bb00 100644 --- a/cmd/neutrond/genaccounts.go +++ b/cmd/neutrond/genaccounts.go @@ -53,7 +53,7 @@ contain valid denominations. Accounts may optionally be supplied with vesting pa } if keyringBackend != "" && clientCtx.Keyring == nil { var err error - kr, err = keyring.New(sdk.KeyringServiceName(), keyringBackend, clientCtx.HomeDir, inBuf) + kr, err = keyring.New(sdk.KeyringServiceName(), keyringBackend, clientCtx.HomeDir, inBuf, clientCtx.Codec) if err != nil { return err } @@ -65,7 +65,7 @@ contain valid denominations. Accounts may optionally be supplied with vesting pa if err != nil { return fmt.Errorf("failed to get address from Keyring: %w", err) } - addr = info.GetAddress() + addr, err = info.GetAddress() if err != nil { return fmt.Errorf("failed to get address from key info: %w", err) } diff --git a/cmd/neutrond/main.go b/cmd/neutrond/main.go index 5b8efe781..4208d8f5c 100644 --- a/cmd/neutrond/main.go +++ b/cmd/neutrond/main.go @@ -16,7 +16,7 @@ func main() { rootCmd.AddCommand(AddConsumerSectionCmd(app.DefaultNodeHome)) - if err := svrcmd.Execute(rootCmd, app.DefaultNodeHome); err != nil { + if err := svrcmd.Execute(rootCmd, "", app.DefaultNodeHome); err != nil { os.Exit(1) } } diff --git a/cmd/neutrond/root.go b/cmd/neutrond/root.go index 170dadddc..679e4fc79 100644 --- a/cmd/neutrond/root.go +++ b/cmd/neutrond/root.go @@ -2,12 +2,13 @@ package main import ( "errors" - "io" - "os" - "path/filepath" - "github.com/CosmWasm/wasmd/x/wasm" wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" + dbm "github.com/cometbft/cometbft-db" + tmcfg "github.com/cometbft/cometbft/config" + tmcli "github.com/cometbft/cometbft/libs/cli" + "github.com/cometbft/cometbft/libs/log" + tmtypes "github.com/cometbft/cometbft/types" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/config" @@ -18,6 +19,7 @@ import ( "github.com/cosmos/cosmos-sdk/server" servertypes "github.com/cosmos/cosmos-sdk/server/types" "github.com/cosmos/cosmos-sdk/snapshots" + snapshottypes "github.com/cosmos/cosmos-sdk/snapshots/types" "github.com/cosmos/cosmos-sdk/store" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/version" @@ -25,14 +27,15 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" "github.com/cosmos/cosmos-sdk/x/crisis" + "github.com/cosmos/cosmos-sdk/x/genutil" genutilcli "github.com/cosmos/cosmos-sdk/x/genutil/client/cli" + genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types" "github.com/prometheus/client_golang/prometheus" "github.com/spf13/cast" "github.com/spf13/cobra" - tmcfg "github.com/tendermint/tendermint/config" - tmcli "github.com/tendermint/tendermint/libs/cli" - "github.com/tendermint/tendermint/libs/log" - dbm "github.com/tendermint/tm-db" + "io" + "os" + "path/filepath" "github.com/neutron-org/neutron/app" "github.com/neutron-org/neutron/app/params" @@ -50,13 +53,13 @@ func NewRootCmd() (*cobra.Command, params.EncodingConfig) { WithLegacyAmino(encodingConfig.Amino). WithInput(os.Stdin). WithAccountRetriever(authtypes.AccountRetriever{}). - WithBroadcastMode(flags.BroadcastBlock). + WithBroadcastMode(flags.BroadcastSync). WithHomeDir(app.DefaultNodeHome). WithViper("") rootCmd := &cobra.Command{ Use: version.AppName, - Short: "IntechainAdapteerd (daemon)", + Short: "Neutrond (daemon)", PersistentPreRunE: func(cmd *cobra.Command, _ []string) error { // set the default command outputs cmd.SetOut(cmd.OutOrStdout()) @@ -76,7 +79,7 @@ func NewRootCmd() (*cobra.Command, params.EncodingConfig) { return err } - return server.InterceptConfigsPreRunHandler(cmd, "", tmcfg.DefaultConfig()) + return server.InterceptConfigsPreRunHandler(cmd, "", nil, tmcfg.DefaultConfig()) }, } @@ -88,10 +91,11 @@ func NewRootCmd() (*cobra.Command, params.EncodingConfig) { func initRootCmd(rootCmd *cobra.Command, encodingConfig params.EncodingConfig) { debugCmd := debug.Cmd() debugCmd.AddCommand(genContractAddressCmd()) + gentxModule := app.ModuleBasics[genutiltypes.ModuleName].(genutil.AppModuleBasic) rootCmd.AddCommand( genutilcli.InitCmd(app.ModuleBasics, app.DefaultNodeHome), - genutilcli.CollectGenTxsCmd(banktypes.GenesisBalancesIterator{}, app.DefaultNodeHome), + genutilcli.CollectGenTxsCmd(banktypes.GenesisBalancesIterator{}, app.DefaultNodeHome, gentxModule.GenTxValidator), genutilcli.GenTxCmd(app.ModuleBasics, encodingConfig.TxConfig, banktypes.GenesisBalancesIterator{}, app.DefaultNodeHome), genutilcli.ValidateGenesisCmd(app.ModuleBasics), AddGenesisAccountCmd(app.DefaultNodeHome), @@ -196,8 +200,10 @@ func (ac appCreator) newApp( panic(err) } - snapshotDir := filepath.Join(cast.ToString(appOpts.Get(flags.FlagHome)), "data", "snapshots") - snapshotDB, err := sdk.NewLevelDB("metadata", snapshotDir) + homeDir := cast.ToString(appOpts.Get(flags.FlagHome)) + + snapshotDir := filepath.Join(homeDir, "data", "snapshots") + snapshotDB, err := dbm.NewDB("metadata", dbm.GoLevelDBBackend, snapshotDir) if err != nil { panic(err) } @@ -210,6 +216,17 @@ func (ac appCreator) newApp( wasmOpts = append(wasmOpts, wasmkeeper.WithVMCacheMetrics(prometheus.DefaultRegisterer)) } + chainID := cast.ToString(appOpts.Get(flags.FlagChainID)) + if chainID == "" { + // fallback to genesis chain-id + appGenesis, err := tmtypes.GenesisDocFromFile(filepath.Join(homeDir, "config", "genesis.json")) + if err != nil { + panic(err) + } + + chainID = appGenesis.ChainID + } + enabledWasmProposals := app.GetEnabledProposals() logger.Info("Enabled wasm proposals", "proposals", enabledWasmProposals) @@ -228,12 +245,10 @@ func (ac appCreator) newApp( baseapp.SetInterBlockCache(cache), baseapp.SetTrace(cast.ToBool(appOpts.Get(server.FlagTrace))), baseapp.SetIndexEvents(cast.ToStringSlice(appOpts.Get(server.FlagIndexEvents))), - baseapp.SetSnapshotStore(snapshotStore), - baseapp.SetSnapshotInterval(cast.ToUint64(appOpts.Get(server.FlagStateSyncSnapshotInterval))), - baseapp.SetSnapshotKeepRecent(cast.ToUint32(appOpts.Get(server.FlagStateSyncSnapshotKeepRecent))), + baseapp.SetSnapshot(snapshotStore, snapshottypes.SnapshotOptions{Interval: cast.ToUint64(appOpts.Get(server.FlagStateSyncSnapshotInterval)), KeepRecent: cast.ToUint32(appOpts.Get(server.FlagStateSyncSnapshotKeepRecent))}), + baseapp.SetChainID(chainID), ) } - func (ac appCreator) appExport( logger log.Logger, db dbm.DB, @@ -242,6 +257,7 @@ func (ac appCreator) appExport( forZeroHeight bool, jailAllowedAddrs []string, appOpts servertypes.AppOptions, + modulesToExport []string, ) (servertypes.ExportedApp, error) { var interchainapp *app.App homePath, ok := appOpts.Get(flags.FlagHome).(string) @@ -271,5 +287,5 @@ func (ac appCreator) appExport( } } - return interchainapp.ExportAppStateAndValidators(forZeroHeight, jailAllowedAddrs) + return interchainapp.ExportAppStateAndValidators(forZeroHeight, jailAllowedAddrs, modulesToExport) } diff --git a/config.yml b/config.yml index 664f08b7d..7fa6878fa 100644 --- a/config.yml +++ b/config.yml @@ -1,16 +1,30 @@ +version: 1 +build: + proto: + path: proto + third_party_paths: + - third_party/proto + - proto_vendor accounts: - - name: alice - coins: ["20000token", "200000000untrn"] - - name: bob - coins: ["10000token", "100000000untrn"] -validator: - name: alice - staked: "100000000untrn" -client: - openapi: - path: "docs/static/openapi.yml" - vuex: - path: "vue/src/store" +- name: alice + coins: + - 20000token + - 200000000untrn +- name: bob + coins: + - 10000token + - 100000000untrn faucet: name: bob - coins: ["5token", "100000untrn"] + coins: + - 5token + - 100000untrn + host: 0.0.0.0:4500 +client: + vuex: + path: vue/src/store + openapi: + path: docs/static/openapi.yml +validators: +- name: alice + bonded: 100000000untrn diff --git a/docs/static/openapi.yml b/docs/static/openapi.yml index efb750ed9..25217cdce 100644 --- a/docs/static/openapi.yml +++ b/docs/static/openapi.yml @@ -4,472 +4,206 @@ info: name: '' description: '' paths: - /cosmos/adminmodule/adminmodule/admins: + /cosmos/auth/v1beta1/account_info/{address}: get: - summary: Queries a list of admins items. - operationId: CosmosAdminmoduleAdminmoduleAdmins + summary: AccountInfo queries account info which is common to all account types. + description: 'Since: cosmos-sdk 0.47' + operationId: CosmosAuthV1Beta1AccountInfo responses: '200': description: A successful response. schema: type: object properties: - admins: - type: array - items: - type: string - default: - description: An unexpected error response. - schema: - type: object - properties: - code: - type: integer - format: int32 - message: - type: string - details: - type: array - items: - type: object - properties: - '@type': - type: string - description: >- - A URL/resource name that uniquely identifies the type of - the serialized - - protocol buffer message. This string must contain at - least - - one "/" character. The last segment of the URL's path - must represent - - the fully qualified name of the type (as in - - `path/google.protobuf.Duration`). The name should be in - a canonical form + info: + description: info is the account info which is represented by BaseAccount. + type: object + properties: + address: + type: string + pub_key: + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type + of the serialized - (e.g., leading "." is not accepted). + protocol buffer message. This string must contain at + least + one "/" character. The last segment of the URL's path + must represent - In practice, teams usually precompile into the binary - all types that they + the fully qualified name of the type (as in - expect it to use in the context of Any. However, for - URLs which use the + `path/google.protobuf.Duration`). The name should be + in a canonical form - scheme `http`, `https`, or no scheme, one can optionally - set up a type + (e.g., leading "." is not accepted). - server that maps type URLs to message definitions as - follows: + In practice, teams usually precompile into the binary + all types that they - * If no scheme is provided, `https` is assumed. + expect it to use in the context of Any. However, for + URLs which use the - * An HTTP GET on the URL must yield a - [google.protobuf.Type][] - value in binary format, or produce an error. - * Applications are allowed to cache lookup results based - on the - URL, or have them precompiled into a binary to avoid any - lookup. Therefore, binary compatibility needs to be preserved - on changes to types. (Use versioned type names to manage - breaking changes.) + scheme `http`, `https`, or no scheme, one can + optionally set up a type - Note: this functionality is not currently available in - the official + server that maps type URLs to message definitions as + follows: - protobuf release, and it is not used for type URLs - beginning with - type.googleapis.com. + * If no scheme is provided, `https` is assumed. + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results + based on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) - Schemes other than `http`, `https` (or the empty scheme) - might be + Note: this functionality is not currently available in + the official - used with implementation specific semantics. - additionalProperties: {} - description: >- - `Any` contains an arbitrary serialized protocol buffer - message along with a + protobuf release, and it is not used for type URLs + beginning with - URL that describes the type of the serialized message. + type.googleapis.com. - Protobuf library provides support to pack/unpack Any values - in the form + Schemes other than `http`, `https` (or the empty + scheme) might be - of utility functions or additional generated methods of the - Any type. + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer + message along with a + URL that describes the type of the serialized message. - Example 1: Pack and unpack a message in C++. - Foo foo = ...; - Any any; - any.PackFrom(foo); - ... - if (any.UnpackTo(&foo)) { - ... - } + Protobuf library provides support to pack/unpack Any + values in the form - Example 2: Pack and unpack a message in Java. + of utility functions or additional generated methods of + the Any type. - Foo foo = ...; - Any any = Any.pack(foo); - ... - if (any.is(Foo.class)) { - foo = any.unpack(Foo.class); - } - Example 3: Pack and unpack a message in Python. + Example 1: Pack and unpack a message in C++. - foo = Foo(...) - any = Any() - any.Pack(foo) - ... - if any.Is(Foo.DESCRIPTOR): - any.Unpack(foo) + Foo foo = ...; + Any any; + any.PackFrom(foo); ... - - Example 4: Pack and unpack a message in Go - - foo := &pb.Foo{...} - any, err := anypb.New(foo) - if err != nil { - ... - } - ... - foo := &pb.Foo{} - if err := any.UnmarshalTo(foo); err != nil { - ... - } - - The pack methods provided by protobuf library will by - default use - - 'type.googleapis.com/full.type.name' as the type URL and the - unpack - - methods only use the fully qualified type name after the - last '/' - - in the type URL, for example "foo.bar.com/x/y.z" will yield - type - - name "y.z". - - - - JSON - - ==== - - The JSON representation of an `Any` value uses the regular - - representation of the deserialized, embedded message, with - an - - additional field `@type` which contains the type URL. - Example: - - package google.profile; - message Person { - string first_name = 1; - string last_name = 2; - } - - { - "@type": "type.googleapis.com/google.profile.Person", - "firstName": , - "lastName": - } - - If the embedded message type is well-known and has a custom - JSON - - representation, that representation will be embedded adding - a field - - `value` which holds the custom JSON in addition to the - `@type` - - field. Example (for message [google.protobuf.Duration][]): - - { - "@type": "type.googleapis.com/google.protobuf.Duration", - "value": "1.212s" - } - tags: - - Query - /cosmos/adminmodule/adminmodule/archivedproposals: - get: - summary: Queries a list of archived proposals. - operationId: CosmosAdminmoduleAdminmoduleArchivedProposals - responses: - '200': - description: A successful response. - schema: - type: object - properties: - proposals: - type: array - items: - type: object - properties: - proposal_id: - type: string - format: uint64 - content: - type: object - properties: - '@type': - type: string - description: >- - A URL/resource name that uniquely identifies the - type of the serialized - - protocol buffer message. This string must contain at - least - - one "/" character. The last segment of the URL's - path must represent - - the fully qualified name of the type (as in - - `path/google.protobuf.Duration`). The name should be - in a canonical form - - (e.g., leading "." is not accepted). - - - In practice, teams usually precompile into the - binary all types that they - - expect it to use in the context of Any. However, for - URLs which use the - - scheme `http`, `https`, or no scheme, one can - optionally set up a type - - server that maps type URLs to message definitions as - follows: - - - * If no scheme is provided, `https` is assumed. - - * An HTTP GET on the URL must yield a - [google.protobuf.Type][] - value in binary format, or produce an error. - * Applications are allowed to cache lookup results - based on the - URL, or have them precompiled into a binary to avoid any - lookup. Therefore, binary compatibility needs to be preserved - on changes to types. (Use versioned type names to manage - breaking changes.) - - Note: this functionality is not currently available - in the official - - protobuf release, and it is not used for type URLs - beginning with - - type.googleapis.com. - - - Schemes other than `http`, `https` (or the empty - scheme) might be - - used with implementation specific semantics. - additionalProperties: {} - description: >- - `Any` contains an arbitrary serialized protocol buffer - message along with a - - URL that describes the type of the serialized message. - - - Protobuf library provides support to pack/unpack Any - values in the form - - of utility functions or additional generated methods of - the Any type. - - - Example 1: Pack and unpack a message in C++. - - Foo foo = ...; - Any any; - any.PackFrom(foo); + if (any.UnpackTo(&foo)) { ... - if (any.UnpackTo(&foo)) { - ... - } + } - Example 2: Pack and unpack a message in Java. + Example 2: Pack and unpack a message in Java. - Foo foo = ...; - Any any = Any.pack(foo); - ... - if (any.is(Foo.class)) { - foo = any.unpack(Foo.class); - } + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. - foo = Foo(...) - any = Any() - any.Pack(foo) + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) ... - if any.Is(Foo.DESCRIPTOR): - any.Unpack(foo) - ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go - foo := &pb.Foo{...} - any, err := anypb.New(foo) - if err != nil { - ... - } + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { ... - foo := &pb.Foo{} - if err := any.UnmarshalTo(foo); err != nil { - ... - } - - The pack methods provided by protobuf library will by - default use - - 'type.googleapis.com/full.type.name' as the type URL and - the unpack + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } - methods only use the fully qualified type name after the - last '/' + The pack methods provided by protobuf library will by + default use - in the type URL, for example "foo.bar.com/x/y.z" will - yield type + 'type.googleapis.com/full.type.name' as the type URL and + the unpack - name "y.z". + methods only use the fully qualified type name after the + last '/' + in the type URL, for example "foo.bar.com/x/y.z" will + yield type + name "y.z". - JSON - ==== - The JSON representation of an `Any` value uses the - regular + JSON - representation of the deserialized, embedded message, - with an + ==== - additional field `@type` which contains the type URL. - Example: + The JSON representation of an `Any` value uses the regular - package google.profile; - message Person { - string first_name = 1; - string last_name = 2; - } + representation of the deserialized, embedded message, with + an - { - "@type": "type.googleapis.com/google.profile.Person", - "firstName": , - "lastName": - } + additional field `@type` which contains the type URL. + Example: - If the embedded message type is well-known and has a - custom JSON + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } - representation, that representation will be embedded - adding a field + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } - `value` which holds the custom JSON in addition to the - `@type` + If the embedded message type is well-known and has a + custom JSON - field. Example (for message - [google.protobuf.Duration][]): + representation, that representation will be embedded + adding a field - { - "@type": "type.googleapis.com/google.protobuf.Duration", - "value": "1.212s" - } - status: - type: string - enum: - - PROPOSAL_STATUS_UNSPECIFIED - - PROPOSAL_STATUS_DEPOSIT_PERIOD - - PROPOSAL_STATUS_VOTING_PERIOD - - PROPOSAL_STATUS_PASSED - - PROPOSAL_STATUS_REJECTED - - PROPOSAL_STATUS_FAILED - default: PROPOSAL_STATUS_UNSPECIFIED - description: >- - ProposalStatus enumerates the valid statuses of a - proposal. - - - PROPOSAL_STATUS_UNSPECIFIED: PROPOSAL_STATUS_UNSPECIFIED defines the default propopsal status. - - PROPOSAL_STATUS_DEPOSIT_PERIOD: PROPOSAL_STATUS_DEPOSIT_PERIOD defines a proposal status during the deposit - period. - - PROPOSAL_STATUS_VOTING_PERIOD: PROPOSAL_STATUS_VOTING_PERIOD defines a proposal status during the voting - period. - - PROPOSAL_STATUS_PASSED: PROPOSAL_STATUS_PASSED defines a proposal status of a proposal that has - passed. - - PROPOSAL_STATUS_REJECTED: PROPOSAL_STATUS_REJECTED defines a proposal status of a proposal that has - been rejected. - - PROPOSAL_STATUS_FAILED: PROPOSAL_STATUS_FAILED defines a proposal status of a proposal that has - failed. - final_tally_result: - type: object - properties: - 'yes': - type: string - abstain: - type: string - 'no': - type: string - no_with_veto: - type: string - description: >- - TallyResult defines a standard tally for a governance - proposal. - submit_time: - type: string - format: date-time - deposit_end_time: - type: string - format: date-time - total_deposit: - type: array - items: - type: object - properties: - denom: - type: string - amount: - type: string - description: >- - Coin defines a token with a denomination and an - amount. + `value` which holds the custom JSON in addition to the + `@type` + field. Example (for message [google.protobuf.Duration][]): - NOTE: The amount field is an Int which implements the - custom method + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + account_number: + type: string + format: uint64 + sequence: + type: string + format: uint64 + description: |- + QueryAccountInfoResponse is the Query/AccountInfo response type. - signatures required by gogoproto. - voting_start_time: - type: string - format: date-time - voting_end_time: - type: string - format: date-time - description: >- - Proposal defines the core field members of a governance - proposal. + Since: cosmos-sdk 0.47 default: description: An unexpected error response. schema: @@ -655,12 +389,25 @@ paths: "@type": "type.googleapis.com/google.protobuf.Duration", "value": "1.212s" } + parameters: + - name: address + description: address is the account address string. + in: path + required: true + type: string tags: - Query /cosmos/auth/v1beta1/accounts: get: - summary: Accounts returns all the existing accounts - description: 'Since: cosmos-sdk 0.43' + summary: Accounts returns all the existing accounts. + description: >- + When called from another module, this query might consume a high amount + of + + gas if the pagination field is incorrectly set. + + + Since: cosmos-sdk 0.43 operationId: CosmosAuthV1Beta1Accounts responses: '200': @@ -851,9 +598,10 @@ paths: next_key: type: string format: byte - title: |- + description: |- next_key is the key to be passed to PageRequest.key to - query the next page most efficiently + query the next page most efficiently. It will be empty if + there are no more results. total: type: string format: uint64 @@ -1123,7 +871,6 @@ paths: type: object properties: account: - description: account defines the account of the corresponding address. type: object properties: '@type': @@ -1184,22 +931,130 @@ paths: used with implementation specific semantics. additionalProperties: {} - description: >- - QueryAccountResponse is the response type for the Query/Account - RPC method. - default: - description: An unexpected error response. - schema: - type: object - properties: - code: - type: integer - format: int32 - message: - type: string - details: - type: array - items: + description: >- + `Any` contains an arbitrary serialized protocol buffer message + along with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any values in + the form + + of utility functions or additional generated methods of the + Any type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by default + use + + 'type.googleapis.com/full.type.name' as the type URL and the + unpack + + methods only use the fully qualified type name after the last + '/' + + in the type URL, for example "foo.bar.com/x/y.z" will yield + type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the regular + + representation of the deserialized, embedded message, with an + + additional field `@type` which contains the type URL. Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a custom + JSON + + representation, that representation will be embedded adding a + field + + `value` which holds the custom JSON in addition to the `@type` + + field. Example (for message [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + description: >- + QueryAccountResponse is the response type for the Query/Account + RPC method. + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: type: object properties: '@type': @@ -1380,188 +1235,23 @@ paths: type: string tags: - Query - /cosmos/auth/v1beta1/module_accounts/{name}: + /cosmos/auth/v1beta1/address_by_id/{id}: get: - summary: ModuleAccountByName returns the module account info by module name - operationId: CosmosAuthV1Beta1ModuleAccountByName + summary: AccountAddressByID returns account address based on account number. + description: 'Since: cosmos-sdk 0.46.2' + operationId: CosmosAuthV1Beta1AccountAddressByID responses: '200': description: A successful response. schema: type: object properties: - account: - type: object - properties: - '@type': - type: string - description: >- - A URL/resource name that uniquely identifies the type of - the serialized - - protocol buffer message. This string must contain at least - - one "/" character. The last segment of the URL's path must - represent - - the fully qualified name of the type (as in - - `path/google.protobuf.Duration`). The name should be in a - canonical form - - (e.g., leading "." is not accepted). - - - In practice, teams usually precompile into the binary all - types that they - - expect it to use in the context of Any. However, for URLs - which use the - - scheme `http`, `https`, or no scheme, one can optionally - set up a type - - server that maps type URLs to message definitions as - follows: - - - * If no scheme is provided, `https` is assumed. - - * An HTTP GET on the URL must yield a - [google.protobuf.Type][] - value in binary format, or produce an error. - * Applications are allowed to cache lookup results based - on the - URL, or have them precompiled into a binary to avoid any - lookup. Therefore, binary compatibility needs to be preserved - on changes to types. (Use versioned type names to manage - breaking changes.) - - Note: this functionality is not currently available in the - official - - protobuf release, and it is not used for type URLs - beginning with - - type.googleapis.com. - - - Schemes other than `http`, `https` (or the empty scheme) - might be - - used with implementation specific semantics. - additionalProperties: {} - description: >- - `Any` contains an arbitrary serialized protocol buffer message - along with a - - URL that describes the type of the serialized message. - - - Protobuf library provides support to pack/unpack Any values in - the form - - of utility functions or additional generated methods of the - Any type. - - - Example 1: Pack and unpack a message in C++. - - Foo foo = ...; - Any any; - any.PackFrom(foo); - ... - if (any.UnpackTo(&foo)) { - ... - } - - Example 2: Pack and unpack a message in Java. - - Foo foo = ...; - Any any = Any.pack(foo); - ... - if (any.is(Foo.class)) { - foo = any.unpack(Foo.class); - } - - Example 3: Pack and unpack a message in Python. - - foo = Foo(...) - any = Any() - any.Pack(foo) - ... - if any.Is(Foo.DESCRIPTOR): - any.Unpack(foo) - ... - - Example 4: Pack and unpack a message in Go - - foo := &pb.Foo{...} - any, err := anypb.New(foo) - if err != nil { - ... - } - ... - foo := &pb.Foo{} - if err := any.UnmarshalTo(foo); err != nil { - ... - } - - The pack methods provided by protobuf library will by default - use - - 'type.googleapis.com/full.type.name' as the type URL and the - unpack - - methods only use the fully qualified type name after the last - '/' - - in the type URL, for example "foo.bar.com/x/y.z" will yield - type - - name "y.z". - - - - JSON - - ==== - - The JSON representation of an `Any` value uses the regular - - representation of the deserialized, embedded message, with an - - additional field `@type` which contains the type URL. Example: - - package google.profile; - message Person { - string first_name = 1; - string last_name = 2; - } - - { - "@type": "type.googleapis.com/google.profile.Person", - "firstName": , - "lastName": - } - - If the embedded message type is well-known and has a custom - JSON - - representation, that representation will be embedded adding a - field - - `value` which holds the custom JSON in addition to the `@type` - - field. Example (for message [google.protobuf.Duration][]): - - { - "@type": "type.googleapis.com/google.protobuf.Duration", - "value": "1.212s" - } - description: >- - QueryModuleAccountByNameResponse is the response type for the - Query/ModuleAccountByName RPC method. + account_address: + type: string + description: 'Since: cosmos-sdk 0.46.2' + title: >- + QueryAccountAddressByIDResponse is the response type for + AccountAddressByID rpc method default: description: An unexpected error response. schema: @@ -1748,44 +1438,47 @@ paths: "value": "1.212s" } parameters: - - name: name + - name: id + description: |- + Deprecated, use account_id instead + + id is the account number of the address to be queried. This field + should have been an uint64 (like all account numbers), and will be + updated to uint64 in a future version of the auth query. in: path required: true type: string + format: int64 + - name: account_id + description: |- + account_id is the account number of the address to be queried. + + Since: cosmos-sdk 0.47 + in: query + required: false + type: string + format: uint64 tags: - Query - /cosmos/auth/v1beta1/params: + /cosmos/auth/v1beta1/bech32: get: - summary: Params queries all parameters. - operationId: CosmosAuthV1Beta1Params + summary: Bech32Prefix queries bech32Prefix + description: 'Since: cosmos-sdk 0.46' + operationId: CosmosAuthV1Beta1Bech32Prefix responses: '200': description: A successful response. schema: type: object properties: - params: - description: params defines the parameters of the module. - type: object - properties: - max_memo_characters: - type: string - format: uint64 - tx_sig_limit: - type: string - format: uint64 - tx_size_cost_per_byte: - type: string - format: uint64 - sig_verify_cost_ed25519: - type: string - format: uint64 - sig_verify_cost_secp256k1: - type: string - format: uint64 + bech32_prefix: + type: string description: >- - QueryParamsResponse is the response type for the Query/Params RPC + Bech32PrefixResponse is the response type for Bech32Prefix rpc method. + + + Since: cosmos-sdk 0.46 default: description: An unexpected error response. schema: @@ -1973,226 +1666,25 @@ paths: } tags: - Query - /cosmos/authz/v1beta1/grants: + /cosmos/auth/v1beta1/bech32/{address_bytes}: get: - summary: Returns list of `Authorization`, granted to the grantee by the granter. - operationId: CosmosAuthzV1Beta1Grants + summary: AddressBytesToString converts Account Address bytes to string + description: 'Since: cosmos-sdk 0.46' + operationId: CosmosAuthV1Beta1AddressBytesToString responses: '200': description: A successful response. schema: type: object properties: - grants: - type: array - items: - type: object - properties: - authorization: - type: object - properties: - '@type': - type: string - description: >- - A URL/resource name that uniquely identifies the - type of the serialized - - protocol buffer message. This string must contain at - least - - one "/" character. The last segment of the URL's - path must represent - - the fully qualified name of the type (as in - - `path/google.protobuf.Duration`). The name should be - in a canonical form - - (e.g., leading "." is not accepted). - - - In practice, teams usually precompile into the - binary all types that they - - expect it to use in the context of Any. However, for - URLs which use the - - scheme `http`, `https`, or no scheme, one can - optionally set up a type - - server that maps type URLs to message definitions as - follows: - - - * If no scheme is provided, `https` is assumed. - - * An HTTP GET on the URL must yield a - [google.protobuf.Type][] - value in binary format, or produce an error. - * Applications are allowed to cache lookup results - based on the - URL, or have them precompiled into a binary to avoid any - lookup. Therefore, binary compatibility needs to be preserved - on changes to types. (Use versioned type names to manage - breaking changes.) - - Note: this functionality is not currently available - in the official - - protobuf release, and it is not used for type URLs - beginning with - - type.googleapis.com. - - - Schemes other than `http`, `https` (or the empty - scheme) might be - - used with implementation specific semantics. - additionalProperties: {} - description: >- - `Any` contains an arbitrary serialized protocol buffer - message along with a - - URL that describes the type of the serialized message. - - - Protobuf library provides support to pack/unpack Any - values in the form - - of utility functions or additional generated methods of - the Any type. - - - Example 1: Pack and unpack a message in C++. - - Foo foo = ...; - Any any; - any.PackFrom(foo); - ... - if (any.UnpackTo(&foo)) { - ... - } - - Example 2: Pack and unpack a message in Java. - - Foo foo = ...; - Any any = Any.pack(foo); - ... - if (any.is(Foo.class)) { - foo = any.unpack(Foo.class); - } - - Example 3: Pack and unpack a message in Python. - - foo = Foo(...) - any = Any() - any.Pack(foo) - ... - if any.Is(Foo.DESCRIPTOR): - any.Unpack(foo) - ... - - Example 4: Pack and unpack a message in Go - - foo := &pb.Foo{...} - any, err := anypb.New(foo) - if err != nil { - ... - } - ... - foo := &pb.Foo{} - if err := any.UnmarshalTo(foo); err != nil { - ... - } - - The pack methods provided by protobuf library will by - default use - - 'type.googleapis.com/full.type.name' as the type URL and - the unpack - - methods only use the fully qualified type name after the - last '/' - - in the type URL, for example "foo.bar.com/x/y.z" will - yield type - - name "y.z". - - - - JSON - - ==== - - The JSON representation of an `Any` value uses the - regular - - representation of the deserialized, embedded message, - with an - - additional field `@type` which contains the type URL. - Example: - - package google.profile; - message Person { - string first_name = 1; - string last_name = 2; - } - - { - "@type": "type.googleapis.com/google.profile.Person", - "firstName": , - "lastName": - } - - If the embedded message type is well-known and has a - custom JSON - - representation, that representation will be embedded - adding a field - - `value` which holds the custom JSON in addition to the - `@type` - - field. Example (for message - [google.protobuf.Duration][]): + address_string: + type: string + description: >- + AddressBytesToStringResponse is the response type for + AddressString rpc method. - { - "@type": "type.googleapis.com/google.protobuf.Duration", - "value": "1.212s" - } - expiration: - type: string - format: date-time - description: |- - Grant gives permissions to execute - the provide method with expiration time. - description: >- - authorizations is a list of grants granted for grantee by - granter. - pagination: - description: pagination defines an pagination for the response. - type: object - properties: - next_key: - type: string - format: byte - title: |- - next_key is the key to be passed to PageRequest.key to - query the next page most efficiently - total: - type: string - format: uint64 - title: >- - total is total number of results available if - PageRequest.count_total - was set, its value is undefined otherwise - description: >- - QueryGrantsResponse is the response type for the - Query/Authorizations RPC method. + Since: cosmos-sdk 0.46 default: description: An unexpected error response. schema: @@ -2379,305 +1871,33 @@ paths: "value": "1.212s" } parameters: - - name: granter - in: query - required: false - type: string - - name: grantee - in: query - required: false - type: string - - name: msg_type_url - description: >- - Optional, msg_type_url, when set, will query only grants matching - given msg type. - in: query - required: false - type: string - - name: pagination.key - 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. - in: query - required: false + - name: address_bytes + in: path + required: true type: string format: byte - - name: pagination.offset - 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. - in: query - required: false - type: string - format: uint64 - - name: pagination.limit - 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. - in: query - required: false - type: string - format: uint64 - - name: pagination.count_total - 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 - required: false - type: boolean - - name: pagination.reverse - description: >- - reverse is set to true if results are to be returned in the - descending order. - - - Since: cosmos-sdk 0.43 - in: query - required: false - type: boolean tags: - Query - /cosmos/authz/v1beta1/grants/grantee/{grantee}: + /cosmos/auth/v1beta1/bech32/{address_string}: get: - summary: GranteeGrants returns a list of `GrantAuthorization` by grantee. - description: 'Since: cosmos-sdk 0.45.2' - operationId: CosmosAuthzV1Beta1GranteeGrants + summary: AddressStringToBytes converts Address string to bytes + description: 'Since: cosmos-sdk 0.46' + operationId: CosmosAuthV1Beta1AddressStringToBytes responses: '200': description: A successful response. schema: type: object properties: - grants: - type: array - items: - type: object - properties: - granter: - type: string - grantee: - type: string - authorization: - type: object - properties: - '@type': - type: string - description: >- - A URL/resource name that uniquely identifies the - type of the serialized - - protocol buffer message. This string must contain at - least - - one "/" character. The last segment of the URL's - path must represent - - the fully qualified name of the type (as in - - `path/google.protobuf.Duration`). The name should be - in a canonical form - - (e.g., leading "." is not accepted). - - - In practice, teams usually precompile into the - binary all types that they - - expect it to use in the context of Any. However, for - URLs which use the - - scheme `http`, `https`, or no scheme, one can - optionally set up a type - - server that maps type URLs to message definitions as - follows: - - - * If no scheme is provided, `https` is assumed. - - * An HTTP GET on the URL must yield a - [google.protobuf.Type][] - value in binary format, or produce an error. - * Applications are allowed to cache lookup results - based on the - URL, or have them precompiled into a binary to avoid any - lookup. Therefore, binary compatibility needs to be preserved - on changes to types. (Use versioned type names to manage - breaking changes.) - - Note: this functionality is not currently available - in the official - - protobuf release, and it is not used for type URLs - beginning with - - type.googleapis.com. - - - Schemes other than `http`, `https` (or the empty - scheme) might be - - used with implementation specific semantics. - additionalProperties: {} - description: >- - `Any` contains an arbitrary serialized protocol buffer - message along with a - - URL that describes the type of the serialized message. - - - Protobuf library provides support to pack/unpack Any - values in the form - - of utility functions or additional generated methods of - the Any type. - - - Example 1: Pack and unpack a message in C++. - - Foo foo = ...; - Any any; - any.PackFrom(foo); - ... - if (any.UnpackTo(&foo)) { - ... - } - - Example 2: Pack and unpack a message in Java. - - Foo foo = ...; - Any any = Any.pack(foo); - ... - if (any.is(Foo.class)) { - foo = any.unpack(Foo.class); - } - - Example 3: Pack and unpack a message in Python. - - foo = Foo(...) - any = Any() - any.Pack(foo) - ... - if any.Is(Foo.DESCRIPTOR): - any.Unpack(foo) - ... - - Example 4: Pack and unpack a message in Go - - foo := &pb.Foo{...} - any, err := anypb.New(foo) - if err != nil { - ... - } - ... - foo := &pb.Foo{} - if err := any.UnmarshalTo(foo); err != nil { - ... - } - - The pack methods provided by protobuf library will by - default use - - 'type.googleapis.com/full.type.name' as the type URL and - the unpack - - methods only use the fully qualified type name after the - last '/' - - in the type URL, for example "foo.bar.com/x/y.z" will - yield type - - name "y.z". - - - - JSON - - ==== - - The JSON representation of an `Any` value uses the - regular - - representation of the deserialized, embedded message, - with an - - additional field `@type` which contains the type URL. - Example: - - package google.profile; - message Person { - string first_name = 1; - string last_name = 2; - } - - { - "@type": "type.googleapis.com/google.profile.Person", - "firstName": , - "lastName": - } - - If the embedded message type is well-known and has a - custom JSON - - representation, that representation will be embedded - adding a field - - `value` which holds the custom JSON in addition to the - `@type` - - field. Example (for message - [google.protobuf.Duration][]): - - { - "@type": "type.googleapis.com/google.protobuf.Duration", - "value": "1.212s" - } - expiration: - type: string - format: date-time - description: 'Since: cosmos-sdk 0.45.2' - title: >- - GrantAuthorization extends a grant with both the addresses - of the grantee and granter. + address_bytes: + type: string + format: byte + description: >- + AddressStringToBytesResponse is the response type for AddressBytes + rpc method. - It is used in genesis.proto and query.proto - description: grants is a list of grants granted to the grantee. - pagination: - description: pagination defines an pagination for the response. - type: object - properties: - next_key: - type: string - format: byte - title: |- - next_key is the key to be passed to PageRequest.key to - query the next page most efficiently - total: - type: string - format: uint64 - title: >- - total is total number of results available if - PageRequest.count_total - was set, its value is undefined otherwise - description: >- - QueryGranteeGrantsResponse is the response type for the - Query/GranteeGrants RPC method. + Since: cosmos-sdk 0.46 default: description: An unexpected error response. schema: @@ -2864,294 +2084,204 @@ paths: "value": "1.212s" } parameters: - - name: grantee + - name: address_string in: path required: true type: string - - name: pagination.key - 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. - in: query - required: false - type: string - format: byte - - name: pagination.offset - 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. - in: query - required: false - type: string - format: uint64 - - name: pagination.limit - 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. - in: query - required: false - type: string - format: uint64 - - name: pagination.count_total - 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 - required: false - type: boolean - - name: pagination.reverse - description: >- - reverse is set to true if results are to be returned in the - descending order. - - - Since: cosmos-sdk 0.43 - in: query - required: false - type: boolean tags: - Query - /cosmos/authz/v1beta1/grants/granter/{granter}: + /cosmos/auth/v1beta1/module_accounts: get: - summary: GranterGrants returns list of `GrantAuthorization`, granted by granter. - description: 'Since: cosmos-sdk 0.45.2' - operationId: CosmosAuthzV1Beta1GranterGrants + summary: ModuleAccounts returns all the existing module accounts. + description: 'Since: cosmos-sdk 0.46' + operationId: CosmosAuthV1Beta1ModuleAccounts responses: '200': description: A successful response. schema: type: object properties: - grants: + accounts: type: array items: type: object properties: - granter: - type: string - grantee: + '@type': type: string - authorization: - type: object - properties: - '@type': - type: string - description: >- - A URL/resource name that uniquely identifies the - type of the serialized + description: >- + A URL/resource name that uniquely identifies the type of + the serialized - protocol buffer message. This string must contain at - least + protocol buffer message. This string must contain at + least - one "/" character. The last segment of the URL's - path must represent + one "/" character. The last segment of the URL's path + must represent - the fully qualified name of the type (as in + the fully qualified name of the type (as in - `path/google.protobuf.Duration`). The name should be - in a canonical form + `path/google.protobuf.Duration`). The name should be in + a canonical form - (e.g., leading "." is not accepted). + (e.g., leading "." is not accepted). - In practice, teams usually precompile into the - binary all types that they + In practice, teams usually precompile into the binary + all types that they - expect it to use in the context of Any. However, for - URLs which use the + expect it to use in the context of Any. However, for + URLs which use the - scheme `http`, `https`, or no scheme, one can - optionally set up a type + scheme `http`, `https`, or no scheme, one can optionally + set up a type - server that maps type URLs to message definitions as - follows: + server that maps type URLs to message definitions as + follows: - * If no scheme is provided, `https` is assumed. + * If no scheme is provided, `https` is assumed. - * An HTTP GET on the URL must yield a - [google.protobuf.Type][] - value in binary format, or produce an error. - * Applications are allowed to cache lookup results - based on the - URL, or have them precompiled into a binary to avoid any - lookup. Therefore, binary compatibility needs to be preserved - on changes to types. (Use versioned type names to manage - breaking changes.) + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based + on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) - Note: this functionality is not currently available - in the official + Note: this functionality is not currently available in + the official - protobuf release, and it is not used for type URLs - beginning with + protobuf release, and it is not used for type URLs + beginning with - type.googleapis.com. + type.googleapis.com. - Schemes other than `http`, `https` (or the empty - scheme) might be + Schemes other than `http`, `https` (or the empty scheme) + might be - used with implementation specific semantics. - additionalProperties: {} - description: >- - `Any` contains an arbitrary serialized protocol buffer - message along with a + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer + message along with a - URL that describes the type of the serialized message. + URL that describes the type of the serialized message. - Protobuf library provides support to pack/unpack Any - values in the form + Protobuf library provides support to pack/unpack Any values + in the form - of utility functions or additional generated methods of - the Any type. + of utility functions or additional generated methods of the + Any type. - Example 1: Pack and unpack a message in C++. + Example 1: Pack and unpack a message in C++. - Foo foo = ...; - Any any; - any.PackFrom(foo); - ... - if (any.UnpackTo(&foo)) { - ... - } + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } - Example 2: Pack and unpack a message in Java. + Example 2: Pack and unpack a message in Java. - Foo foo = ...; - Any any = Any.pack(foo); - ... - if (any.is(Foo.class)) { - foo = any.unpack(Foo.class); - } + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. - foo = Foo(...) - any = Any() - any.Pack(foo) - ... - if any.Is(Foo.DESCRIPTOR): - any.Unpack(foo) - ... + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go - foo := &pb.Foo{...} - any, err := anypb.New(foo) - if err != nil { - ... - } - ... - foo := &pb.Foo{} - if err := any.UnmarshalTo(foo); err != nil { - ... - } + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } - The pack methods provided by protobuf library will by - default use + The pack methods provided by protobuf library will by + default use - 'type.googleapis.com/full.type.name' as the type URL and - the unpack + 'type.googleapis.com/full.type.name' as the type URL and the + unpack - methods only use the fully qualified type name after the - last '/' + methods only use the fully qualified type name after the + last '/' - in the type URL, for example "foo.bar.com/x/y.z" will - yield type + in the type URL, for example "foo.bar.com/x/y.z" will yield + type - name "y.z". + name "y.z". - JSON + JSON - ==== + ==== - The JSON representation of an `Any` value uses the - regular + The JSON representation of an `Any` value uses the regular - representation of the deserialized, embedded message, - with an + representation of the deserialized, embedded message, with + an - additional field `@type` which contains the type URL. - Example: + additional field `@type` which contains the type URL. + Example: - package google.profile; - message Person { - string first_name = 1; - string last_name = 2; - } + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } - { - "@type": "type.googleapis.com/google.profile.Person", - "firstName": , - "lastName": - } + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } - If the embedded message type is well-known and has a - custom JSON + If the embedded message type is well-known and has a custom + JSON - representation, that representation will be embedded - adding a field + representation, that representation will be embedded adding + a field - `value` which holds the custom JSON in addition to the - `@type` + `value` which holds the custom JSON in addition to the + `@type` - field. Example (for message - [google.protobuf.Duration][]): + field. Example (for message [google.protobuf.Duration][]): - { - "@type": "type.googleapis.com/google.protobuf.Duration", - "value": "1.212s" - } - expiration: - type: string - format: date-time - description: 'Since: cosmos-sdk 0.45.2' - title: >- - GrantAuthorization extends a grant with both the addresses - of the grantee and granter. + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + description: >- + QueryModuleAccountsResponse is the response type for the + Query/ModuleAccounts RPC method. - It is used in genesis.proto and query.proto - description: grants is a list of grants granted by the granter. - pagination: - description: pagination defines an pagination for the response. - type: object - properties: - next_key: - type: string - format: byte - title: |- - next_key is the key to be passed to PageRequest.key to - query the next page most efficiently - total: - type: string - format: uint64 - title: >- - total is total number of results available if - PageRequest.count_total - was set, its value is undefined otherwise - description: >- - QueryGranterGrantsResponse is the response type for the - Query/GranterGrants RPC method. + Since: cosmos-sdk 0.46 default: description: An unexpected error response. schema: @@ -3337,223 +2467,190 @@ paths: "@type": "type.googleapis.com/google.protobuf.Duration", "value": "1.212s" } - parameters: - - name: granter - in: path - required: true - type: string - - name: pagination.key - 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. - in: query - required: false - type: string - format: byte - - name: pagination.offset - 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. - in: query - required: false - type: string - format: uint64 - - name: pagination.limit - 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. - in: query - required: false - type: string - format: uint64 - - name: pagination.count_total - 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 - required: false - type: boolean - - name: pagination.reverse - description: >- - reverse is set to true if results are to be returned in the - descending order. - - - Since: cosmos-sdk 0.43 - in: query - required: false - type: boolean tags: - Query - /cosmos/bank/v1beta1/balances/{address}: + /cosmos/auth/v1beta1/module_accounts/{name}: get: - summary: AllBalances queries the balance of all coins for a single account. - operationId: CosmosBankV1Beta1AllBalances + summary: ModuleAccountByName returns the module account info by module name + operationId: CosmosAuthV1Beta1ModuleAccountByName responses: '200': description: A successful response. schema: type: object properties: - balances: - type: array - items: - type: object - properties: - denom: - type: string - amount: - type: string - 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. - description: balances is the balances of all the coins. - pagination: - description: pagination defines the pagination in the response. + account: type: object properties: - next_key: - type: string - format: byte - title: |- - next_key is the key to be passed to PageRequest.key to - query the next page most efficiently - total: + '@type': type: string - format: uint64 - title: >- - total is total number of results available if - PageRequest.count_total + description: >- + A URL/resource name that uniquely identifies the type of + the serialized - was set, its value is undefined otherwise - description: >- - QueryAllBalancesResponse is the response type for the - Query/AllBalances RPC + protocol buffer message. This string must contain at least - method. - default: - description: An unexpected error response. - schema: - type: object - properties: - code: - type: integer - format: int32 - message: - type: string - details: - type: array - items: - type: object - properties: - '@type': - type: string - additionalProperties: {} - parameters: - - name: address - description: address is the address to query balances for. - in: path - required: true - type: string - - name: pagination.key - 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. - in: query - required: false - type: string - format: byte - - name: pagination.offset - description: >- - offset is a numeric offset that can be used when key is unavailable. + one "/" character. The last segment of the URL's path must + represent - It is less efficient than using key. Only one of offset or key - should + the fully qualified name of the type (as in - be set. - in: query - required: false - type: string - format: uint64 - - name: pagination.limit - description: >- - limit is the total number of results to be returned in the result - page. + `path/google.protobuf.Duration`). The name should be in a + canonical form - If left empty it will default to a value to be set by each app. - in: query - required: false - type: string - format: uint64 - - name: pagination.count_total - description: >- - count_total is set to true to indicate that the result set should - include + (e.g., leading "." is not accepted). - 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 + In practice, teams usually precompile into the binary all + types that they - is set. - in: query - required: false - type: boolean - - name: pagination.reverse - description: >- - reverse is set to true if results are to be returned in the - descending order. + expect it to use in the context of Any. However, for URLs + which use the + scheme `http`, `https`, or no scheme, one can optionally + set up a type - Since: cosmos-sdk 0.43 - in: query - required: false - type: boolean - tags: - - Query - /cosmos/bank/v1beta1/balances/{address}/by_denom: - get: - summary: Balance queries the balance of a single coin for a single account. - operationId: CosmosBankV1Beta1Balance - responses: - '200': - description: A successful response. - schema: - type: object - properties: - balance: - description: balance is the balance of the coin. - type: object - properties: - denom: - type: string - amount: - type: string + server that maps type URLs to message definitions as + follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based + on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in the + official + + protobuf release, and it is not used for type URLs + beginning with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty scheme) + might be + + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer message + along with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any values in + the form + + of utility functions or additional generated methods of the + Any type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by default + use + + 'type.googleapis.com/full.type.name' as the type URL and the + unpack + + methods only use the fully qualified type name after the last + '/' + + in the type URL, for example "foo.bar.com/x/y.z" will yield + type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the regular + + representation of the deserialized, embedded message, with an + + additional field `@type` which contains the type URL. Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a custom + JSON + + representation, that representation will be embedded adding a + field + + `value` which holds the custom JSON in addition to the `@type` + + field. Example (for message [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } description: >- - QueryBalanceResponse is the response type for the Query/Balance - RPC method. + QueryModuleAccountByNameResponse is the response type for the + Query/ModuleAccountByName RPC method. default: description: An unexpected error response. schema: @@ -3571,130 +2668,212 @@ paths: properties: '@type': type: string + description: >- + A URL/resource name that uniquely identifies the type of + the serialized + + protocol buffer message. This string must contain at + least + + one "/" character. The last segment of the URL's path + must represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be in + a canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the binary + all types that they + + expect it to use in the context of Any. However, for + URLs which use the + + scheme `http`, `https`, or no scheme, one can optionally + set up a type + + server that maps type URLs to message definitions as + follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based + on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in + the official + + protobuf release, and it is not used for type URLs + beginning with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty scheme) + might be + + used with implementation specific semantics. additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer + message along with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any values + in the form + + of utility functions or additional generated methods of the + Any type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by + default use + + 'type.googleapis.com/full.type.name' as the type URL and the + unpack + + methods only use the fully qualified type name after the + last '/' + + in the type URL, for example "foo.bar.com/x/y.z" will yield + type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the regular + + representation of the deserialized, embedded message, with + an + + additional field `@type` which contains the type URL. + Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a custom + JSON + + representation, that representation will be embedded adding + a field + + `value` which holds the custom JSON in addition to the + `@type` + + field. Example (for message [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } parameters: - - name: address - description: address is the address to query balances for. + - name: name in: path required: true type: string - - name: denom - description: denom is the coin denom to query balances for. - in: query - required: false - type: string tags: - Query - /cosmos/bank/v1beta1/denoms_metadata: + /cosmos/auth/v1beta1/params: get: - summary: >- - DenomsMetadata queries the client metadata for all registered coin - denominations. - operationId: CosmosBankV1Beta1DenomsMetadata + summary: Params queries all parameters. + operationId: CosmosAuthV1Beta1Params responses: '200': description: A successful response. schema: type: object properties: - metadatas: - type: array - items: - type: object - properties: - description: - type: string - denom_units: - type: array - items: - type: object - properties: - denom: - type: string - description: >- - denom represents the string name of the given - denom unit (e.g uatom). - exponent: - type: integer - format: int64 - description: >- - exponent represents power of 10 exponent that one - must - - raise the base_denom to in order to equal the - given DenomUnit's denom - - 1 denom = 1^exponent base_denom - - (e.g. with a base_denom of uatom, one can create a - DenomUnit of 'atom' with - - exponent = 6, thus: 1 atom = 10^6 uatom). - aliases: - type: array - items: - type: string - title: >- - aliases is a list of string aliases for the given - denom - description: |- - DenomUnit represents a struct that describes a given - denomination unit of the basic token. - title: >- - denom_units represents the list of DenomUnit's for a - given coin - base: - type: string - description: >- - base represents the base denom (should be the DenomUnit - with exponent = 0). - display: - type: string - description: |- - display indicates the suggested denom that should be - displayed in clients. - name: - type: string - description: 'Since: cosmos-sdk 0.43' - title: 'name defines the name of the token (eg: Cosmos Atom)' - symbol: - type: string - description: >- - symbol is the token symbol usually shown on exchanges - (eg: ATOM). This can - - be the same as the display. - - - Since: cosmos-sdk 0.43 - description: |- - Metadata represents a struct that describes - a basic token. - description: >- - metadata provides the client information for all the - registered tokens. - pagination: - description: pagination defines the pagination in the response. + params: + description: params defines the parameters of the module. type: object properties: - next_key: + max_memo_characters: type: string - format: byte - title: |- - next_key is the key to be passed to PageRequest.key to - query the next page most efficiently - total: + format: uint64 + tx_sig_limit: + type: string + format: uint64 + tx_size_cost_per_byte: + type: string + format: uint64 + sig_verify_cost_ed25519: + type: string + format: uint64 + sig_verify_cost_secp256k1: type: string format: uint64 - title: >- - total is total number of results available if - PageRequest.count_total - - was set, its value is undefined otherwise description: >- - QueryDenomsMetadataResponse is the response type for the - Query/DenomsMetadata RPC - + QueryParamsResponse is the response type for the Query/Params RPC method. default: description: An unexpected error response. @@ -3713,271 +2892,394 @@ paths: properties: '@type': type: string - additionalProperties: {} - parameters: - - name: pagination.key - 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. - in: query - required: false - type: string - format: byte - - name: pagination.offset - description: >- - offset is a numeric offset that can be used when key is unavailable. + description: >- + A URL/resource name that uniquely identifies the type of + the serialized - It is less efficient than using key. Only one of offset or key - should + protocol buffer message. This string must contain at + least - be set. - in: query - required: false - type: string - format: uint64 - - name: pagination.limit - description: >- - limit is the total number of results to be returned in the result - page. + one "/" character. The last segment of the URL's path + must represent - If left empty it will default to a value to be set by each app. - in: query - required: false - type: string - format: uint64 - - name: pagination.count_total - description: >- - count_total is set to true to indicate that the result set should - include + the fully qualified name of the type (as in - a count of the total number of items available for pagination in - UIs. + `path/google.protobuf.Duration`). The name should be in + a canonical form - count_total is only respected when offset is used. It is ignored - when key + (e.g., leading "." is not accepted). - is set. - in: query - required: false - type: boolean - - name: pagination.reverse - description: >- - reverse is set to true if results are to be returned in the - descending order. + In practice, teams usually precompile into the binary + all types that they - Since: cosmos-sdk 0.43 - in: query - required: false - type: boolean - tags: - - Query - /cosmos/bank/v1beta1/denoms_metadata/{denom}: - get: - summary: DenomsMetadata queries the client metadata of a given coin denomination. - operationId: CosmosBankV1Beta1DenomMetadata - responses: - '200': - description: A successful response. - schema: - type: object - properties: - metadata: - description: >- - metadata describes and provides all the client information for - the requested token. - type: object - properties: - description: - type: string - denom_units: - type: array - items: - type: object - properties: - denom: - type: string - description: >- - denom represents the string name of the given denom - unit (e.g uatom). - exponent: - type: integer - format: int64 - description: >- - exponent represents power of 10 exponent that one - must + expect it to use in the context of Any. However, for + URLs which use the - raise the base_denom to in order to equal the given - DenomUnit's denom + scheme `http`, `https`, or no scheme, one can optionally + set up a type - 1 denom = 1^exponent base_denom + server that maps type URLs to message definitions as + follows: - (e.g. with a base_denom of uatom, one can create a - DenomUnit of 'atom' with - exponent = 6, thus: 1 atom = 10^6 uatom). - aliases: - type: array - items: - type: string - title: >- - aliases is a list of string aliases for the given - denom - description: |- - DenomUnit represents a struct that describes a given - denomination unit of the basic token. - title: >- - denom_units represents the list of DenomUnit's for a given - coin - base: - type: string - description: >- - base represents the base denom (should be the DenomUnit - with exponent = 0). - display: - type: string - description: |- - display indicates the suggested denom that should be - displayed in clients. - name: - type: string - description: 'Since: cosmos-sdk 0.43' - title: 'name defines the name of the token (eg: Cosmos Atom)' - symbol: - type: string - description: >- - symbol is the token symbol usually shown on exchanges (eg: - ATOM). This can + * If no scheme is provided, `https` is assumed. - be the same as the display. + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based + on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + Note: this functionality is not currently available in + the official - Since: cosmos-sdk 0.43 - description: >- - QueryDenomMetadataResponse is the response type for the - Query/DenomMetadata RPC + protobuf release, and it is not used for type URLs + beginning with - method. - default: - description: An unexpected error response. - schema: - type: object - properties: - code: - type: integer - format: int32 - message: - type: string - details: - type: array - items: - type: object - properties: - '@type': - type: string - additionalProperties: {} - parameters: - - name: denom - description: denom is the coin denom to query the metadata for. - in: path - required: true - type: string - tags: - - Query - /cosmos/bank/v1beta1/params: - get: - summary: Params queries the parameters of x/bank module. - operationId: CosmosBankV1Beta1Params - responses: - '200': - description: A successful response. - schema: - type: object - properties: - params: - type: object - properties: - send_enabled: - type: array - items: - type: object - properties: - denom: - type: string - enabled: - type: boolean - description: >- - SendEnabled maps coin denom to a send_enabled status - (whether a denom is + type.googleapis.com. - sendable). - default_send_enabled: - type: boolean - description: Params defines the parameters for the bank module. - description: >- - QueryParamsResponse defines the response type for querying x/bank - parameters. - default: - description: An unexpected error response. - schema: - type: object - properties: - code: - type: integer - format: int32 - message: - type: string - details: - type: array - items: - type: object - properties: - '@type': - type: string + + Schemes other than `http`, `https` (or the empty scheme) + might be + + used with implementation specific semantics. additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer + message along with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any values + in the form + + of utility functions or additional generated methods of the + Any type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by + default use + + 'type.googleapis.com/full.type.name' as the type URL and the + unpack + + methods only use the fully qualified type name after the + last '/' + + in the type URL, for example "foo.bar.com/x/y.z" will yield + type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the regular + + representation of the deserialized, embedded message, with + an + + additional field `@type` which contains the type URL. + Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a custom + JSON + + representation, that representation will be embedded adding + a field + + `value` which holds the custom JSON in addition to the + `@type` + + field. Example (for message [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } tags: - Query - /cosmos/bank/v1beta1/spendable_balances/{address}: + /cosmos/authz/v1beta1/grants: get: - summary: |- - SpendableBalances queries the spenable balance of all coins for a single - account. - operationId: CosmosBankV1Beta1SpendableBalances + summary: Returns list of `Authorization`, granted to the grantee by the granter. + operationId: CosmosAuthzV1Beta1Grants responses: '200': description: A successful response. schema: type: object properties: - balances: + grants: type: array items: type: object properties: - denom: - type: string - amount: - type: string - description: >- - Coin defines a token with a denomination and an amount. + authorization: + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the + type of the serialized + protocol buffer message. This string must contain at + least - NOTE: The amount field is an Int which implements the custom - method + one "/" character. The last segment of the URL's + path must represent - signatures required by gogoproto. - description: balances is the spendable balances of all the coins. + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be + in a canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the + binary all types that they + + expect it to use in the context of Any. However, for + URLs which use the + + scheme `http`, `https`, or no scheme, one can + optionally set up a type + + server that maps type URLs to message definitions as + follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results + based on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available + in the official + + protobuf release, and it is not used for type URLs + beginning with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty + scheme) might be + + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer + message along with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any + values in the form + + of utility functions or additional generated methods of + the Any type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by + default use + + 'type.googleapis.com/full.type.name' as the type URL and + the unpack + + methods only use the fully qualified type name after the + last '/' + + in the type URL, for example "foo.bar.com/x/y.z" will + yield type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the + regular + + representation of the deserialized, embedded message, + with an + + additional field `@type` which contains the type URL. + Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a + custom JSON + + representation, that representation will be embedded + adding a field + + `value` which holds the custom JSON in addition to the + `@type` + + field. Example (for message + [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + expiration: + type: string + format: date-time + title: >- + time when the grant will expire and will be pruned. If + null, then the grant + + doesn't have a time expiration (other conditions in + `authorization` + + may apply to invalidate the grant) + description: |- + Grant gives permissions to execute + the provide method with expiration time. + description: >- + authorizations is a list of grants granted for grantee by + granter. pagination: - description: pagination defines the pagination in the response. + description: pagination defines an pagination for the response. type: object properties: next_key: type: string format: byte - title: |- + description: |- next_key is the key to be passed to PageRequest.key to - query the next page most efficiently + query the next page most efficiently. It will be empty if + there are no more results. total: type: string format: uint64 @@ -3987,10 +3289,8 @@ paths: was set, its value is undefined otherwise description: >- - QuerySpendableBalancesResponse defines the gRPC response structure - for querying - - an account's spendable balances. + QueryGrantsResponse is the response type for the + Query/Authorizations RPC method. default: description: An unexpected error response. schema: @@ -4008,14 +3308,191 @@ paths: properties: '@type': type: string - additionalProperties: {} - parameters: - - name: address - description: address is the address to query spendable balances for. - in: path - required: true - type: string - - name: pagination.key + description: >- + A URL/resource name that uniquely identifies the type of + the serialized + + protocol buffer message. This string must contain at + least + + one "/" character. The last segment of the URL's path + must represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be in + a canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the binary + all types that they + + expect it to use in the context of Any. However, for + URLs which use the + + scheme `http`, `https`, or no scheme, one can optionally + set up a type + + server that maps type URLs to message definitions as + follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based + on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in + the official + + protobuf release, and it is not used for type URLs + beginning with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty scheme) + might be + + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer + message along with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any values + in the form + + of utility functions or additional generated methods of the + Any type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by + default use + + 'type.googleapis.com/full.type.name' as the type URL and the + unpack + + methods only use the fully qualified type name after the + last '/' + + in the type URL, for example "foo.bar.com/x/y.z" will yield + type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the regular + + representation of the deserialized, embedded message, with + an + + additional field `@type` which contains the type URL. + Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a custom + JSON + + representation, that representation will be embedded adding + a field + + `value` which holds the custom JSON in addition to the + `@type` + + field. Example (for message [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + parameters: + - name: granter + in: query + required: false + type: string + - name: grantee + in: query + required: false + type: string + - name: msg_type_url + description: >- + Optional, msg_type_url, when set, will query only grants matching + given msg type. + in: query + required: false + type: string + - name: pagination.key description: |- key is a value returned in PageResponse.next_key to begin querying the next page most efficiently. Only one of offset or key @@ -4073,47 +3550,221 @@ paths: type: boolean tags: - Query - /cosmos/bank/v1beta1/supply: + /cosmos/authz/v1beta1/grants/grantee/{grantee}: get: - summary: TotalSupply queries the total supply of all coins. - operationId: CosmosBankV1Beta1TotalSupply + summary: GranteeGrants returns a list of `GrantAuthorization` by grantee. + description: 'Since: cosmos-sdk 0.46' + operationId: CosmosAuthzV1Beta1GranteeGrants responses: '200': description: A successful response. schema: type: object properties: - supply: + grants: type: array items: type: object properties: - denom: + granter: type: string - amount: + grantee: type: string - description: >- - Coin defines a token with a denomination and an amount. + authorization: + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the + type of the serialized + + protocol buffer message. This string must contain at + least + one "/" character. The last segment of the URL's + path must represent - NOTE: The amount field is an Int which implements the custom - method + the fully qualified name of the type (as in - signatures required by gogoproto. - title: supply is the supply of the coins - pagination: - description: |- - pagination defines the pagination in the response. + `path/google.protobuf.Duration`). The name should be + in a canonical form - Since: cosmos-sdk 0.43 + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the + binary all types that they + + expect it to use in the context of Any. However, for + URLs which use the + + scheme `http`, `https`, or no scheme, one can + optionally set up a type + + server that maps type URLs to message definitions as + follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results + based on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available + in the official + + protobuf release, and it is not used for type URLs + beginning with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty + scheme) might be + + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer + message along with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any + values in the form + + of utility functions or additional generated methods of + the Any type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by + default use + + 'type.googleapis.com/full.type.name' as the type URL and + the unpack + + methods only use the fully qualified type name after the + last '/' + + in the type URL, for example "foo.bar.com/x/y.z" will + yield type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the + regular + + representation of the deserialized, embedded message, + with an + + additional field `@type` which contains the type URL. + Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a + custom JSON + + representation, that representation will be embedded + adding a field + + `value` which holds the custom JSON in addition to the + `@type` + + field. Example (for message + [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + expiration: + type: string + format: date-time + title: >- + GrantAuthorization extends a grant with both the addresses + of the grantee and granter. + + It is used in genesis.proto and query.proto + description: grants is a list of grants granted to the grantee. + pagination: + description: pagination defines an pagination for the response. type: object properties: next_key: type: string format: byte - title: |- + description: |- next_key is the key to be passed to PageRequest.key to - query the next page most efficiently + query the next page most efficiently. It will be empty if + there are no more results. total: type: string format: uint64 @@ -4122,11 +3773,9 @@ paths: PageRequest.count_total was set, its value is undefined otherwise - title: >- - QueryTotalSupplyResponse is the response type for the - Query/TotalSupply RPC - - method + description: >- + QueryGranteeGrantsResponse is the response type for the + Query/GranteeGrants RPC method. default: description: An unexpected error response. schema: @@ -4144,706 +3793,463 @@ paths: properties: '@type': type: string - additionalProperties: {} - parameters: - - name: pagination.key - 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. - in: query - required: false - type: string - format: byte - - name: pagination.offset - description: >- - offset is a numeric offset that can be used when key is unavailable. + description: >- + A URL/resource name that uniquely identifies the type of + the serialized - It is less efficient than using key. Only one of offset or key - should + protocol buffer message. This string must contain at + least - be set. - in: query - required: false - type: string - format: uint64 - - name: pagination.limit - description: >- - limit is the total number of results to be returned in the result - page. + one "/" character. The last segment of the URL's path + must represent - If left empty it will default to a value to be set by each app. - in: query - required: false - type: string - format: uint64 - - name: pagination.count_total - description: >- - count_total is set to true to indicate that the result set should - include + the fully qualified name of the type (as in - a count of the total number of items available for pagination in - UIs. + `path/google.protobuf.Duration`). The name should be in + a canonical form - count_total is only respected when offset is used. It is ignored - when key + (e.g., leading "." is not accepted). - is set. - in: query - required: false - type: boolean - - name: pagination.reverse - description: >- - reverse is set to true if results are to be returned in the - descending order. + In practice, teams usually precompile into the binary + all types that they - Since: cosmos-sdk 0.43 - in: query - required: false - type: boolean - tags: - - Query - /cosmos/bank/v1beta1/supply/{denom}: - get: - summary: SupplyOf queries the supply of a single coin. - operationId: CosmosBankV1Beta1SupplyOf - responses: - '200': - description: A successful response. - schema: - type: object - properties: - amount: - description: amount is the supply of the coin. - type: object - properties: - denom: - type: string - amount: - type: string - description: >- - QuerySupplyOfResponse is the response type for the Query/SupplyOf - RPC method. - default: - description: An unexpected error response. - schema: - type: object - properties: - code: - type: integer - format: int32 - message: - type: string - details: - type: array - items: - type: object - properties: - '@type': - type: string - additionalProperties: {} - parameters: - - name: denom - description: denom is the coin denom to query balances for. - in: path - required: true - type: string - tags: - - Query - /cosmos/base/tendermint/v1beta1/blocks/latest: - get: - summary: GetLatestBlock returns the latest block. - operationId: CosmosBaseTendermintV1Beta1GetLatestBlock + expect it to use in the context of Any. However, for + URLs which use the + + scheme `http`, `https`, or no scheme, one can optionally + set up a type + + server that maps type URLs to message definitions as + follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based + on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in + the official + + protobuf release, and it is not used for type URLs + beginning with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty scheme) + might be + + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer + message along with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any values + in the form + + of utility functions or additional generated methods of the + Any type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by + default use + + 'type.googleapis.com/full.type.name' as the type URL and the + unpack + + methods only use the fully qualified type name after the + last '/' + + in the type URL, for example "foo.bar.com/x/y.z" will yield + type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the regular + + representation of the deserialized, embedded message, with + an + + additional field `@type` which contains the type URL. + Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a custom + JSON + + representation, that representation will be embedded adding + a field + + `value` which holds the custom JSON in addition to the + `@type` + + field. Example (for message [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + parameters: + - name: grantee + in: path + required: true + type: string + - name: pagination.key + 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. + in: query + required: false + type: string + format: byte + - name: pagination.offset + 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. + in: query + required: false + type: string + format: uint64 + - name: pagination.limit + 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. + in: query + required: false + type: string + format: uint64 + - name: pagination.count_total + 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 + required: false + type: boolean + - name: pagination.reverse + description: >- + reverse is set to true if results are to be returned in the + descending order. + + + Since: cosmos-sdk 0.43 + in: query + required: false + type: boolean + tags: + - Query + /cosmos/authz/v1beta1/grants/granter/{granter}: + get: + summary: GranterGrants returns list of `GrantAuthorization`, granted by granter. + description: 'Since: cosmos-sdk 0.46' + operationId: CosmosAuthzV1Beta1GranterGrants responses: '200': description: A successful response. schema: type: object properties: - block_id: - type: object - properties: - hash: - type: string - format: byte - part_set_header: - type: object - properties: - total: - type: integer - format: int64 - hash: - type: string - format: byte - title: PartsetHeader - title: BlockID - block: - type: object - properties: - header: - type: object - properties: - version: - title: basic block info - type: object - properties: - block: - type: string - format: uint64 - app: - type: string - format: uint64 - description: >- - Consensus captures the consensus rules for processing - a block in the blockchain, + grants: + type: array + items: + type: object + properties: + granter: + type: string + grantee: + type: string + authorization: + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the + type of the serialized - including all blockchain data structures and the rules - of the application's + protocol buffer message. This string must contain at + least - state transition machine. - chain_id: - type: string - height: - type: string - format: int64 - time: - type: string - format: date-time - last_block_id: - type: object - properties: - hash: - type: string - format: byte - part_set_header: - type: object - properties: - total: - type: integer - format: int64 - hash: - type: string - format: byte - title: PartsetHeader - title: BlockID - last_commit_hash: - type: string - format: byte - description: commit from validators from the last block - title: hashes of block data - data_hash: - type: string - format: byte - title: transactions - validators_hash: - type: string - format: byte - description: validators for the current block - title: hashes from the app output from the prev block - next_validators_hash: - type: string - format: byte - title: validators for the next block - consensus_hash: - type: string - format: byte - title: consensus params for current block - app_hash: - type: string - format: byte - title: state after txs from the previous block - last_results_hash: - type: string - format: byte - title: >- - root hash of all results from the txs from the - previous block - evidence_hash: - type: string - format: byte - description: evidence included in the block - title: consensus info - proposer_address: - type: string - format: byte - title: original proposer of the block - description: Header defines the structure of a block header. - data: - type: object - properties: - txs: - type: array - items: - type: string - format: byte - description: >- - Txs that will be applied by state @ block.Height+1. + one "/" character. The last segment of the URL's + path must represent - NOTE: not all txs here are valid. We're just agreeing - on the order first. + the fully qualified name of the type (as in - This means that block.AppHash does not include these - txs. - title: >- - Data contains the set of transactions included in the - block - evidence: - type: object - properties: - evidence: - type: array - items: - type: object - properties: - duplicate_vote_evidence: - type: object - properties: - vote_a: - type: object - properties: - type: - type: string - enum: - - SIGNED_MSG_TYPE_UNKNOWN - - SIGNED_MSG_TYPE_PREVOTE - - SIGNED_MSG_TYPE_PRECOMMIT - - SIGNED_MSG_TYPE_PROPOSAL - default: SIGNED_MSG_TYPE_UNKNOWN - description: >- - SignedMsgType is a type of signed - message in the consensus. + `path/google.protobuf.Duration`). The name should be + in a canonical form - - SIGNED_MSG_TYPE_PREVOTE: Votes - - SIGNED_MSG_TYPE_PROPOSAL: Proposals - height: - type: string - format: int64 - round: - type: integer - format: int32 - block_id: - type: object - properties: - hash: - type: string - format: byte - part_set_header: - type: object - properties: - total: - type: integer - format: int64 - hash: - type: string - format: byte - title: PartsetHeader - title: BlockID - description: zero if vote is nil. - timestamp: - type: string - format: date-time - validator_address: - type: string - format: byte - validator_index: - type: integer - format: int32 - signature: - type: string - format: byte - description: >- - Vote represents a prevote, precommit, or - commit vote from validators for + (e.g., leading "." is not accepted). - consensus. - vote_b: - type: object - properties: - type: - type: string - enum: - - SIGNED_MSG_TYPE_UNKNOWN - - SIGNED_MSG_TYPE_PREVOTE - - SIGNED_MSG_TYPE_PRECOMMIT - - SIGNED_MSG_TYPE_PROPOSAL - default: SIGNED_MSG_TYPE_UNKNOWN - description: >- - SignedMsgType is a type of signed - message in the consensus. - - SIGNED_MSG_TYPE_PREVOTE: Votes - - SIGNED_MSG_TYPE_PROPOSAL: Proposals - height: - type: string - format: int64 - round: - type: integer - format: int32 - block_id: - type: object - properties: - hash: - type: string - format: byte - part_set_header: - type: object - properties: - total: - type: integer - format: int64 - hash: - type: string - format: byte - title: PartsetHeader - title: BlockID - description: zero if vote is nil. - timestamp: - type: string - format: date-time - validator_address: - type: string - format: byte - validator_index: - type: integer - format: int32 - signature: - type: string - format: byte - description: >- - Vote represents a prevote, precommit, or - commit vote from validators for + In practice, teams usually precompile into the + binary all types that they - consensus. - total_voting_power: - type: string - format: int64 - validator_power: - type: string - format: int64 - timestamp: - type: string - format: date-time - description: >- - DuplicateVoteEvidence contains evidence of a - validator signed two conflicting votes. - light_client_attack_evidence: - type: object - properties: - conflicting_block: - type: object - properties: - signed_header: - type: object - properties: - header: - type: object - properties: - version: - title: basic block info - type: object - properties: - block: - type: string - format: uint64 - app: - type: string - format: uint64 - description: >- - Consensus captures the consensus rules - for processing a block in the - blockchain, + expect it to use in the context of Any. However, for + URLs which use the - including all blockchain data structures - and the rules of the application's + scheme `http`, `https`, or no scheme, one can + optionally set up a type - state transition machine. - chain_id: - type: string - height: - type: string - format: int64 - time: - type: string - format: date-time - last_block_id: - type: object - properties: - hash: - type: string - format: byte - part_set_header: - type: object - properties: - total: - type: integer - format: int64 - hash: - type: string - format: byte - title: PartsetHeader - title: BlockID - last_commit_hash: - type: string - format: byte - description: >- - commit from validators from the last - block - title: hashes of block data - data_hash: - type: string - format: byte - title: transactions - validators_hash: - type: string - format: byte - description: validators for the current block - title: >- - hashes from the app output from the prev - block - next_validators_hash: - type: string - format: byte - title: validators for the next block - consensus_hash: - type: string - format: byte - title: consensus params for current block - app_hash: - type: string - format: byte - title: state after txs from the previous block - last_results_hash: - type: string - format: byte - title: >- - root hash of all results from the txs - from the previous block - evidence_hash: - type: string - format: byte - description: evidence included in the block - title: consensus info - proposer_address: - type: string - format: byte - title: original proposer of the block - description: >- - Header defines the structure of a block - header. - commit: - type: object - properties: - height: - type: string - format: int64 - round: - type: integer - format: int32 - block_id: - type: object - properties: - hash: - type: string - format: byte - part_set_header: - type: object - properties: - total: - type: integer - format: int64 - hash: - type: string - format: byte - title: PartsetHeader - title: BlockID - signatures: - type: array - items: - type: object - properties: - block_id_flag: - type: string - enum: - - BLOCK_ID_FLAG_UNKNOWN - - BLOCK_ID_FLAG_ABSENT - - BLOCK_ID_FLAG_COMMIT - - BLOCK_ID_FLAG_NIL - default: BLOCK_ID_FLAG_UNKNOWN - title: >- - BlockIdFlag indicates which BlcokID the - signature is for - validator_address: - type: string - format: byte - timestamp: - type: string - format: date-time - signature: - type: string - format: byte - description: >- - CommitSig is a part of the Vote included - in a Commit. - description: >- - Commit contains the evidence that a - block was committed by a set of - validators. - validator_set: - type: object - properties: - validators: - type: array - items: - type: object - properties: - address: - type: string - format: byte - pub_key: - type: object - properties: - ed25519: - type: string - format: byte - secp256k1: - type: string - format: byte - title: >- - PublicKey defines the keys available for - use with Validators - voting_power: - type: string - format: int64 - proposer_priority: - type: string - format: int64 - proposer: - type: object - properties: - address: - type: string - format: byte - pub_key: - type: object - properties: - ed25519: - type: string - format: byte - secp256k1: - type: string - format: byte - title: >- - PublicKey defines the keys available for - use with Validators - voting_power: - type: string - format: int64 - proposer_priority: - type: string - format: int64 - total_voting_power: - type: string - format: int64 - common_height: - type: string - format: int64 - byzantine_validators: - type: array - items: - type: object - properties: - address: - type: string - format: byte - pub_key: - type: object - properties: - ed25519: - type: string - format: byte - secp256k1: - type: string - format: byte - title: >- - PublicKey defines the keys available for - use with Validators - voting_power: - type: string - format: int64 - proposer_priority: - type: string - format: int64 - total_voting_power: - type: string - format: int64 - timestamp: - type: string - format: date-time - description: >- - LightClientAttackEvidence contains evidence of a - set of validators attempting to mislead a light - client. - last_commit: - type: object - properties: - height: - type: string - format: int64 - round: - type: integer - format: int32 - block_id: - type: object - properties: - hash: - type: string - format: byte - part_set_header: - type: object - properties: - total: - type: integer - format: int64 - hash: - type: string - format: byte - title: PartsetHeader - title: BlockID - signatures: - type: array - items: - type: object - properties: - block_id_flag: - type: string - enum: - - BLOCK_ID_FLAG_UNKNOWN - - BLOCK_ID_FLAG_ABSENT - - BLOCK_ID_FLAG_COMMIT - - BLOCK_ID_FLAG_NIL - default: BLOCK_ID_FLAG_UNKNOWN - title: >- - BlockIdFlag indicates which BlcokID the - signature is for - validator_address: - type: string - format: byte - timestamp: - type: string - format: date-time - signature: - type: string - format: byte - description: >- - CommitSig is a part of the Vote included in a - Commit. - description: >- - Commit contains the evidence that a block was committed by - a set of validators. + server that maps type URLs to message definitions as + follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results + based on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available + in the official + + protobuf release, and it is not used for type URLs + beginning with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty + scheme) might be + + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer + message along with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any + values in the form + + of utility functions or additional generated methods of + the Any type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by + default use + + 'type.googleapis.com/full.type.name' as the type URL and + the unpack + + methods only use the fully qualified type name after the + last '/' + + in the type URL, for example "foo.bar.com/x/y.z" will + yield type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the + regular + + representation of the deserialized, embedded message, + with an + + additional field `@type` which contains the type URL. + Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a + custom JSON + + representation, that representation will be embedded + adding a field + + `value` which holds the custom JSON in addition to the + `@type` + + field. Example (for message + [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + expiration: + type: string + format: date-time + title: >- + GrantAuthorization extends a grant with both the addresses + of the grantee and granter. + + It is used in genesis.proto and query.proto + description: grants is a list of grants granted by the granter. + pagination: + description: pagination defines an pagination for the response. + type: object + properties: + next_key: + type: string + format: byte + 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. + total: + type: string + format: uint64 + title: >- + total is total number of results available if + PageRequest.count_total + + was set, its value is undefined otherwise description: >- - GetLatestBlockResponse is the response type for the - Query/GetLatestBlock RPC method. + QueryGranterGrantsResponse is the response type for the + Query/GranterGrants RPC method. default: description: An unexpected error response. schema: @@ -5029,601 +4435,229 @@ paths: "@type": "type.googleapis.com/google.protobuf.Duration", "value": "1.212s" } - tags: - - Service - /cosmos/base/tendermint/v1beta1/blocks/{height}: - get: - summary: GetBlockByHeight queries block for given height. - operationId: CosmosBaseTendermintV1Beta1GetBlockByHeight - responses: - '200': - description: A successful response. - schema: - type: object - properties: - block_id: - type: object - properties: - hash: - type: string - format: byte - part_set_header: - type: object - properties: - total: - type: integer - format: int64 - hash: - type: string - format: byte - title: PartsetHeader - title: BlockID - block: - type: object - properties: - header: - type: object - properties: - version: - title: basic block info - type: object - properties: - block: - type: string - format: uint64 - app: - type: string - format: uint64 - description: >- - Consensus captures the consensus rules for processing - a block in the blockchain, + parameters: + - name: granter + in: path + required: true + type: string + - name: pagination.key + 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. + in: query + required: false + type: string + format: byte + - name: pagination.offset + description: >- + offset is a numeric offset that can be used when key is unavailable. - including all blockchain data structures and the rules - of the application's + It is less efficient than using key. Only one of offset or key + should - state transition machine. - chain_id: - type: string - height: - type: string - format: int64 - time: - type: string - format: date-time - last_block_id: - type: object - properties: - hash: - type: string - format: byte - part_set_header: - type: object - properties: - total: - type: integer - format: int64 - hash: - type: string - format: byte - title: PartsetHeader - title: BlockID - last_commit_hash: - type: string - format: byte - description: commit from validators from the last block - title: hashes of block data - data_hash: - type: string - format: byte - title: transactions - validators_hash: - type: string - format: byte - description: validators for the current block - title: hashes from the app output from the prev block - next_validators_hash: - type: string - format: byte - title: validators for the next block - consensus_hash: - type: string - format: byte - title: consensus params for current block - app_hash: - type: string - format: byte - title: state after txs from the previous block - last_results_hash: - type: string - format: byte - title: >- - root hash of all results from the txs from the - previous block - evidence_hash: - type: string - format: byte - description: evidence included in the block - title: consensus info - proposer_address: - type: string - format: byte - title: original proposer of the block - description: Header defines the structure of a block header. - data: - type: object - properties: - txs: - type: array - items: - type: string - format: byte - description: >- - Txs that will be applied by state @ block.Height+1. + be set. + in: query + required: false + type: string + format: uint64 + - name: pagination.limit + description: >- + limit is the total number of results to be returned in the result + page. - NOTE: not all txs here are valid. We're just agreeing - on the order first. + If left empty it will default to a value to be set by each app. + in: query + required: false + type: string + format: uint64 + - name: pagination.count_total + description: >- + count_total is set to true to indicate that the result set should + include - This means that block.AppHash does not include these - txs. + 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 + required: false + type: boolean + - name: pagination.reverse + description: >- + reverse is set to true if results are to be returned in the + descending order. + + + Since: cosmos-sdk 0.43 + in: query + required: false + type: boolean + tags: + - Query + /cosmos/bank/v1beta1/balances/{address}: + get: + summary: AllBalances queries the balance of all coins for a single account. + description: >- + When called from another module, this query might consume a high amount + of + + gas if the pagination field is incorrectly set. + operationId: CosmosBankV1Beta1AllBalances + responses: + '200': + description: A successful response. + schema: + type: object + properties: + balances: + type: array + items: + type: object + properties: + denom: + type: string + amount: + type: string + 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. + description: balances is the balances of all the coins. + pagination: + description: pagination defines the pagination in the response. + type: object + properties: + next_key: + type: string + format: byte + 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. + total: + type: string + format: uint64 title: >- - Data contains the set of transactions included in the - block - evidence: - type: object - properties: - evidence: - type: array - items: - type: object - properties: - duplicate_vote_evidence: - type: object - properties: - vote_a: - type: object - properties: - type: - type: string - enum: - - SIGNED_MSG_TYPE_UNKNOWN - - SIGNED_MSG_TYPE_PREVOTE - - SIGNED_MSG_TYPE_PRECOMMIT - - SIGNED_MSG_TYPE_PROPOSAL - default: SIGNED_MSG_TYPE_UNKNOWN - description: >- - SignedMsgType is a type of signed - message in the consensus. + total is total number of results available if + PageRequest.count_total - - SIGNED_MSG_TYPE_PREVOTE: Votes - - SIGNED_MSG_TYPE_PROPOSAL: Proposals - height: - type: string - format: int64 - round: - type: integer - format: int32 - block_id: - type: object - properties: - hash: - type: string - format: byte - part_set_header: - type: object - properties: - total: - type: integer - format: int64 - hash: - type: string - format: byte - title: PartsetHeader - title: BlockID - description: zero if vote is nil. - timestamp: - type: string - format: date-time - validator_address: - type: string - format: byte - validator_index: - type: integer - format: int32 - signature: - type: string - format: byte - description: >- - Vote represents a prevote, precommit, or - commit vote from validators for + was set, its value is undefined otherwise + description: >- + QueryAllBalancesResponse is the response type for the + Query/AllBalances RPC - consensus. - vote_b: - type: object - properties: - type: - type: string - enum: - - SIGNED_MSG_TYPE_UNKNOWN - - SIGNED_MSG_TYPE_PREVOTE - - SIGNED_MSG_TYPE_PRECOMMIT - - SIGNED_MSG_TYPE_PROPOSAL - default: SIGNED_MSG_TYPE_UNKNOWN - description: >- - SignedMsgType is a type of signed - message in the consensus. + method. + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + additionalProperties: {} + parameters: + - name: address + description: address is the address to query balances for. + in: path + required: true + type: string + - name: pagination.key + 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. + in: query + required: false + type: string + format: byte + - name: pagination.offset + description: >- + offset is a numeric offset that can be used when key is unavailable. - - SIGNED_MSG_TYPE_PREVOTE: Votes - - SIGNED_MSG_TYPE_PROPOSAL: Proposals - height: - type: string - format: int64 - round: - type: integer - format: int32 - block_id: - type: object - properties: - hash: - type: string - format: byte - part_set_header: - type: object - properties: - total: - type: integer - format: int64 - hash: - type: string - format: byte - title: PartsetHeader - title: BlockID - description: zero if vote is nil. - timestamp: - type: string - format: date-time - validator_address: - type: string - format: byte - validator_index: - type: integer - format: int32 - signature: - type: string - format: byte - description: >- - Vote represents a prevote, precommit, or - commit vote from validators for + It is less efficient than using key. Only one of offset or key + should - consensus. - total_voting_power: - type: string - format: int64 - validator_power: - type: string - format: int64 - timestamp: - type: string - format: date-time - description: >- - DuplicateVoteEvidence contains evidence of a - validator signed two conflicting votes. - light_client_attack_evidence: - type: object - properties: - conflicting_block: - type: object - properties: - signed_header: - type: object - properties: - header: - type: object - properties: - version: - title: basic block info - type: object - properties: - block: - type: string - format: uint64 - app: - type: string - format: uint64 - description: >- - Consensus captures the consensus rules - for processing a block in the - blockchain, + be set. + in: query + required: false + type: string + format: uint64 + - name: pagination.limit + description: >- + limit is the total number of results to be returned in the result + page. - including all blockchain data structures - and the rules of the application's + If left empty it will default to a value to be set by each app. + in: query + required: false + type: string + format: uint64 + - name: pagination.count_total + description: >- + count_total is set to true to indicate that the result set should + include - state transition machine. - chain_id: - type: string - height: - type: string - format: int64 - time: - type: string - format: date-time - last_block_id: - type: object - properties: - hash: - type: string - format: byte - part_set_header: - type: object - properties: - total: - type: integer - format: int64 - hash: - type: string - format: byte - title: PartsetHeader - title: BlockID - last_commit_hash: - type: string - format: byte - description: >- - commit from validators from the last - block - title: hashes of block data - data_hash: - type: string - format: byte - title: transactions - validators_hash: - type: string - format: byte - description: validators for the current block - title: >- - hashes from the app output from the prev - block - next_validators_hash: - type: string - format: byte - title: validators for the next block - consensus_hash: - type: string - format: byte - title: consensus params for current block - app_hash: - type: string - format: byte - title: state after txs from the previous block - last_results_hash: - type: string - format: byte - title: >- - root hash of all results from the txs - from the previous block - evidence_hash: - type: string - format: byte - description: evidence included in the block - title: consensus info - proposer_address: - type: string - format: byte - title: original proposer of the block - description: >- - Header defines the structure of a block - header. - commit: - type: object - properties: - height: - type: string - format: int64 - round: - type: integer - format: int32 - block_id: - type: object - properties: - hash: - type: string - format: byte - part_set_header: - type: object - properties: - total: - type: integer - format: int64 - hash: - type: string - format: byte - title: PartsetHeader - title: BlockID - signatures: - type: array - items: - type: object - properties: - block_id_flag: - type: string - enum: - - BLOCK_ID_FLAG_UNKNOWN - - BLOCK_ID_FLAG_ABSENT - - BLOCK_ID_FLAG_COMMIT - - BLOCK_ID_FLAG_NIL - default: BLOCK_ID_FLAG_UNKNOWN - title: >- - BlockIdFlag indicates which BlcokID the - signature is for - validator_address: - type: string - format: byte - timestamp: - type: string - format: date-time - signature: - type: string - format: byte - description: >- - CommitSig is a part of the Vote included - in a Commit. - description: >- - Commit contains the evidence that a - block was committed by a set of - validators. - validator_set: - type: object - properties: - validators: - type: array - items: - type: object - properties: - address: - type: string - format: byte - pub_key: - type: object - properties: - ed25519: - type: string - format: byte - secp256k1: - type: string - format: byte - title: >- - PublicKey defines the keys available for - use with Validators - voting_power: - type: string - format: int64 - proposer_priority: - type: string - format: int64 - proposer: - type: object - properties: - address: - type: string - format: byte - pub_key: - type: object - properties: - ed25519: - type: string - format: byte - secp256k1: - type: string - format: byte - title: >- - PublicKey defines the keys available for - use with Validators - voting_power: - type: string - format: int64 - proposer_priority: - type: string - format: int64 - total_voting_power: - type: string - format: int64 - common_height: - type: string - format: int64 - byzantine_validators: - type: array - items: - type: object - properties: - address: - type: string - format: byte - pub_key: - type: object - properties: - ed25519: - type: string - format: byte - secp256k1: - type: string - format: byte - title: >- - PublicKey defines the keys available for - use with Validators - voting_power: - type: string - format: int64 - proposer_priority: - type: string - format: int64 - total_voting_power: - type: string - format: int64 - timestamp: - type: string - format: date-time - description: >- - LightClientAttackEvidence contains evidence of a - set of validators attempting to mislead a light - client. - last_commit: - type: object - properties: - height: - type: string - format: int64 - round: - type: integer - format: int32 - block_id: - type: object - properties: - hash: - type: string - format: byte - part_set_header: - type: object - properties: - total: - type: integer - format: int64 - hash: - type: string - format: byte - title: PartsetHeader - title: BlockID - signatures: - type: array - items: - type: object - properties: - block_id_flag: - type: string - enum: - - BLOCK_ID_FLAG_UNKNOWN - - BLOCK_ID_FLAG_ABSENT - - BLOCK_ID_FLAG_COMMIT - - BLOCK_ID_FLAG_NIL - default: BLOCK_ID_FLAG_UNKNOWN - title: >- - BlockIdFlag indicates which BlcokID the - signature is for - validator_address: - type: string - format: byte - timestamp: - type: string - format: date-time - signature: - type: string - format: byte - description: >- - CommitSig is a part of the Vote included in a - Commit. - description: >- - Commit contains the evidence that a block was committed by - a set of validators. + 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 + required: false + type: boolean + - name: pagination.reverse + description: >- + reverse is set to true if results are to be returned in the + descending order. + + + Since: cosmos-sdk 0.43 + in: query + required: false + type: boolean + tags: + - Query + /cosmos/bank/v1beta1/balances/{address}/by_denom: + get: + summary: Balance queries the balance of a single coin for a single account. + operationId: CosmosBankV1Beta1Balance + responses: + '200': + description: A successful response. + schema: + type: object + properties: + balance: + description: balance is the balance of the coin. + type: object + properties: + denom: + type: string + amount: + type: string description: >- - GetBlockByHeightResponse is the response type for the - Query/GetBlockByHeight RPC method. + QueryBalanceResponse is the response type for the Query/Balance + RPC method. default: description: An unexpected error response. schema: @@ -5641,264 +4675,564 @@ paths: properties: '@type': type: string - description: >- - A URL/resource name that uniquely identifies the type of - the serialized + additionalProperties: {} + parameters: + - name: address + description: address is the address to query balances for. + in: path + required: true + type: string + - name: denom + description: denom is the coin denom to query balances for. + in: query + required: false + type: string + tags: + - Query + /cosmos/bank/v1beta1/denom_owners/{denom}: + get: + summary: >- + DenomOwners queries for all account addresses that own a particular + token - protocol buffer message. This string must contain at - least + denomination. + description: >- + When called from another module, this query might consume a high amount + of - one "/" character. The last segment of the URL's path - must represent + gas if the pagination field is incorrectly set. - the fully qualified name of the type (as in - `path/google.protobuf.Duration`). The name should be in - a canonical form + Since: cosmos-sdk 0.46 + operationId: CosmosBankV1Beta1DenomOwners + responses: + '200': + description: A successful response. + schema: + type: object + properties: + denom_owners: + type: array + items: + type: object + properties: + address: + type: string + description: >- + address defines the address that owns a particular + denomination. + balance: + description: >- + balance is the balance of the denominated coin for an + account. + type: object + properties: + denom: + type: string + amount: + type: string + description: >- + DenomOwner defines structure representing an account that + owns or holds a - (e.g., leading "." is not accepted). + particular denominated token. It contains the account + address and account + balance of the denominated token. - In practice, teams usually precompile into the binary - all types that they - expect it to use in the context of Any. However, for - URLs which use the + Since: cosmos-sdk 0.46 + pagination: + description: pagination defines the pagination in the response. + type: object + properties: + next_key: + type: string + format: byte + 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. + total: + type: string + format: uint64 + title: >- + total is total number of results available if + PageRequest.count_total - scheme `http`, `https`, or no scheme, one can optionally - set up a type + was set, its value is undefined otherwise + description: >- + QueryDenomOwnersResponse defines the RPC response of a DenomOwners + RPC query. - server that maps type URLs to message definitions as - follows: + Since: cosmos-sdk 0.46 + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + additionalProperties: {} + parameters: + - name: denom + description: >- + denom defines the coin denomination to query all account holders + for. + in: path + required: true + type: string + - name: pagination.key + 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. + in: query + required: false + type: string + format: byte + - name: pagination.offset + description: >- + offset is a numeric offset that can be used when key is unavailable. - * If no scheme is provided, `https` is assumed. + It is less efficient than using key. Only one of offset or key + should - * An HTTP GET on the URL must yield a - [google.protobuf.Type][] - value in binary format, or produce an error. - * Applications are allowed to cache lookup results based - on the - URL, or have them precompiled into a binary to avoid any - lookup. Therefore, binary compatibility needs to be preserved - on changes to types. (Use versioned type names to manage - breaking changes.) + be set. + in: query + required: false + type: string + format: uint64 + - name: pagination.limit + description: >- + limit is the total number of results to be returned in the result + page. - Note: this functionality is not currently available in - the official + If left empty it will default to a value to be set by each app. + in: query + required: false + type: string + format: uint64 + - name: pagination.count_total + description: >- + count_total is set to true to indicate that the result set should + include - protobuf release, and it is not used for type URLs - beginning with + a count of the total number of items available for pagination in + UIs. - type.googleapis.com. + count_total is only respected when offset is used. It is ignored + when key + is set. + in: query + required: false + type: boolean + - name: pagination.reverse + description: >- + reverse is set to true if results are to be returned in the + descending order. - Schemes other than `http`, `https` (or the empty scheme) - might be - used with implementation specific semantics. - additionalProperties: {} - description: >- - `Any` contains an arbitrary serialized protocol buffer - message along with a + Since: cosmos-sdk 0.43 + in: query + required: false + type: boolean + tags: + - Query + /cosmos/bank/v1beta1/denoms_metadata: + get: + summary: |- + DenomsMetadata queries the client metadata for all registered coin + denominations. + operationId: CosmosBankV1Beta1DenomsMetadata + responses: + '200': + description: A successful response. + schema: + type: object + properties: + metadatas: + type: array + items: + type: object + properties: + description: + type: string + denom_units: + type: array + items: + type: object + properties: + denom: + type: string + description: >- + denom represents the string name of the given + denom unit (e.g uatom). + exponent: + type: integer + format: int64 + description: >- + exponent represents power of 10 exponent that one + must - URL that describes the type of the serialized message. + raise the base_denom to in order to equal the + given DenomUnit's denom + 1 denom = 10^exponent base_denom - Protobuf library provides support to pack/unpack Any values - in the form + (e.g. with a base_denom of uatom, one can create a + DenomUnit of 'atom' with - of utility functions or additional generated methods of the - Any type. + exponent = 6, thus: 1 atom = 10^6 uatom). + aliases: + type: array + items: + type: string + title: >- + aliases is a list of string aliases for the given + denom + description: |- + DenomUnit represents a struct that describes a given + denomination unit of the basic token. + title: >- + denom_units represents the list of DenomUnit's for a + given coin + base: + type: string + description: >- + base represents the base denom (should be the DenomUnit + with exponent = 0). + display: + type: string + description: |- + display indicates the suggested denom that should be + displayed in clients. + name: + type: string + description: 'Since: cosmos-sdk 0.43' + title: 'name defines the name of the token (eg: Cosmos Atom)' + symbol: + type: string + description: >- + symbol is the token symbol usually shown on exchanges + (eg: ATOM). This can + be the same as the display. - Example 1: Pack and unpack a message in C++. - Foo foo = ...; - Any any; - any.PackFrom(foo); - ... - if (any.UnpackTo(&foo)) { - ... - } + Since: cosmos-sdk 0.43 + uri: + type: string + description: >- + URI to a document (on or off-chain) that contains + additional information. Optional. - Example 2: Pack and unpack a message in Java. - Foo foo = ...; - Any any = Any.pack(foo); - ... - if (any.is(Foo.class)) { - foo = any.unpack(Foo.class); - } + Since: cosmos-sdk 0.46 + uri_hash: + type: string + description: >- + URIHash is a sha256 hash of a document pointed by URI. + It's used to verify that - Example 3: Pack and unpack a message in Python. + the document didn't change. Optional. - foo = Foo(...) - any = Any() - any.Pack(foo) - ... - if any.Is(Foo.DESCRIPTOR): - any.Unpack(foo) - ... - Example 4: Pack and unpack a message in Go + Since: cosmos-sdk 0.46 + description: |- + Metadata represents a struct that describes + a basic token. + description: >- + metadata provides the client information for all the + registered tokens. + pagination: + description: pagination defines the pagination in the response. + type: object + properties: + next_key: + type: string + format: byte + 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. + total: + type: string + format: uint64 + title: >- + total is total number of results available if + PageRequest.count_total - foo := &pb.Foo{...} - any, err := anypb.New(foo) - if err != nil { - ... - } - ... - foo := &pb.Foo{} - if err := any.UnmarshalTo(foo); err != nil { - ... - } + was set, its value is undefined otherwise + description: >- + QueryDenomsMetadataResponse is the response type for the + Query/DenomsMetadata RPC - The pack methods provided by protobuf library will by - default use + method. + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + additionalProperties: {} + parameters: + - name: pagination.key + 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. + in: query + required: false + type: string + format: byte + - name: pagination.offset + description: >- + offset is a numeric offset that can be used when key is unavailable. - 'type.googleapis.com/full.type.name' as the type URL and the - unpack + It is less efficient than using key. Only one of offset or key + should - methods only use the fully qualified type name after the - last '/' + be set. + in: query + required: false + type: string + format: uint64 + - name: pagination.limit + description: >- + limit is the total number of results to be returned in the result + page. - in the type URL, for example "foo.bar.com/x/y.z" will yield - type + If left empty it will default to a value to be set by each app. + in: query + required: false + type: string + format: uint64 + - name: pagination.count_total + description: >- + count_total is set to true to indicate that the result set should + include - name "y.z". + 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 + required: false + type: boolean + - name: pagination.reverse + description: >- + reverse is set to true if results are to be returned in the + descending order. - JSON - ==== + Since: cosmos-sdk 0.43 + in: query + required: false + type: boolean + tags: + - Query + /cosmos/bank/v1beta1/denoms_metadata/{denom}: + get: + summary: DenomsMetadata queries the client metadata of a given coin denomination. + operationId: CosmosBankV1Beta1DenomMetadata + responses: + '200': + description: A successful response. + schema: + type: object + properties: + metadata: + description: >- + metadata describes and provides all the client information for + the requested token. + type: object + properties: + description: + type: string + denom_units: + type: array + items: + type: object + properties: + denom: + type: string + description: >- + denom represents the string name of the given denom + unit (e.g uatom). + exponent: + type: integer + format: int64 + description: >- + exponent represents power of 10 exponent that one + must - The JSON representation of an `Any` value uses the regular + raise the base_denom to in order to equal the given + DenomUnit's denom - representation of the deserialized, embedded message, with - an + 1 denom = 10^exponent base_denom - additional field `@type` which contains the type URL. - Example: + (e.g. with a base_denom of uatom, one can create a + DenomUnit of 'atom' with - package google.profile; - message Person { - string first_name = 1; - string last_name = 2; - } + exponent = 6, thus: 1 atom = 10^6 uatom). + aliases: + type: array + items: + type: string + title: >- + aliases is a list of string aliases for the given + denom + description: |- + DenomUnit represents a struct that describes a given + denomination unit of the basic token. + title: >- + denom_units represents the list of DenomUnit's for a given + coin + base: + type: string + description: >- + base represents the base denom (should be the DenomUnit + with exponent = 0). + display: + type: string + description: |- + display indicates the suggested denom that should be + displayed in clients. + name: + type: string + description: 'Since: cosmos-sdk 0.43' + title: 'name defines the name of the token (eg: Cosmos Atom)' + symbol: + type: string + description: >- + symbol is the token symbol usually shown on exchanges (eg: + ATOM). This can - { - "@type": "type.googleapis.com/google.profile.Person", - "firstName": , - "lastName": - } + be the same as the display. - If the embedded message type is well-known and has a custom - JSON - representation, that representation will be embedded adding - a field + Since: cosmos-sdk 0.43 + uri: + type: string + description: >- + URI to a document (on or off-chain) that contains + additional information. Optional. - `value` which holds the custom JSON in addition to the - `@type` - field. Example (for message [google.protobuf.Duration][]): + Since: cosmos-sdk 0.46 + uri_hash: + type: string + description: >- + URIHash is a sha256 hash of a document pointed by URI. + It's used to verify that - { - "@type": "type.googleapis.com/google.protobuf.Duration", - "value": "1.212s" - } + the document didn't change. Optional. + + + Since: cosmos-sdk 0.46 + description: >- + QueryDenomMetadataResponse is the response type for the + Query/DenomMetadata RPC + + method. + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + additionalProperties: {} parameters: - - name: height + - name: denom + description: denom is the coin denom to query the metadata for. in: path required: true type: string - format: int64 tags: - - Service - /cosmos/base/tendermint/v1beta1/node_info: + - Query + /cosmos/bank/v1beta1/params: get: - summary: GetNodeInfo queries the current node info. - operationId: CosmosBaseTendermintV1Beta1GetNodeInfo + summary: Params queries the parameters of x/bank module. + operationId: CosmosBankV1Beta1Params responses: '200': description: A successful response. schema: type: object properties: - default_node_info: - type: object - properties: - protocol_version: - type: object - properties: - p2p: - type: string - format: uint64 - block: - type: string - format: uint64 - app: - type: string - format: uint64 - default_node_id: - type: string - listen_addr: - type: string - network: - type: string - version: - type: string - channels: - type: string - format: byte - moniker: - type: string - other: - type: object - properties: - tx_index: - type: string - rpc_address: - type: string - application_version: + params: type: object properties: - name: - type: string - app_name: - type: string - version: - type: string - git_commit: - type: string - build_tags: - type: string - go_version: - type: string - build_deps: + send_enabled: type: array items: type: object properties: - path: - type: string - title: module path - version: - type: string - title: module version - sum: + denom: type: string - title: checksum - title: Module is the type for VersionInfo - cosmos_sdk_version: - type: string - title: 'Since: cosmos-sdk 0.43' - description: VersionInfo is the type for the GetNodeInfoResponse message. + enabled: + type: boolean + description: >- + SendEnabled maps coin denom to a send_enabled status + (whether a denom is + + sendable). + description: >- + Deprecated: Use of SendEnabled in params is deprecated. + + For genesis, use the newly added send_enabled field in the + genesis object. + + Storage, lookup, and manipulation of this information is + now in the keeper. + + + As of cosmos-sdk 0.47, this only exists for backwards + compatibility of genesis files. + default_send_enabled: + type: boolean + description: Params defines the parameters for the bank module. description: >- - GetNodeInfoResponse is the request type for the Query/GetNodeInfo - RPC method. + QueryParamsResponse defines the response type for querying x/bank + parameters. default: description: An unexpected error response. schema: @@ -5916,191 +5250,651 @@ paths: properties: '@type': type: string - description: >- - A URL/resource name that uniquely identifies the type of - the serialized - - protocol buffer message. This string must contain at - least - - one "/" character. The last segment of the URL's path - must represent - - the fully qualified name of the type (as in - - `path/google.protobuf.Duration`). The name should be in - a canonical form - - (e.g., leading "." is not accepted). + additionalProperties: {} + tags: + - Query + /cosmos/bank/v1beta1/send_enabled: + get: + summary: SendEnabled queries for SendEnabled entries. + description: >- + This query only returns denominations that have specific SendEnabled + settings. + Any denomination that does not have a specific setting will use the + default - In practice, teams usually precompile into the binary - all types that they + params.default_send_enabled, and will not be returned by this query. - expect it to use in the context of Any. However, for - URLs which use the - scheme `http`, `https`, or no scheme, one can optionally - set up a type + Since: cosmos-sdk 0.47 + operationId: CosmosBankV1Beta1SendEnabled + responses: + '200': + description: A successful response. + schema: + type: object + properties: + send_enabled: + type: array + items: + type: object + properties: + denom: + type: string + enabled: + type: boolean + description: >- + SendEnabled maps coin denom to a send_enabled status + (whether a denom is - server that maps type URLs to message definitions as - follows: + sendable). + pagination: + description: >- + pagination defines the pagination in the response. This field + is only + populated if the denoms field in the request is empty. + type: object + properties: + next_key: + type: string + format: byte + 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. + total: + type: string + format: uint64 + title: >- + total is total number of results available if + PageRequest.count_total - * If no scheme is provided, `https` is assumed. + was set, its value is undefined otherwise + description: >- + QuerySendEnabledResponse defines the RPC response of a SendEnable + query. - * An HTTP GET on the URL must yield a - [google.protobuf.Type][] - value in binary format, or produce an error. - * Applications are allowed to cache lookup results based - on the - URL, or have them precompiled into a binary to avoid any - lookup. Therefore, binary compatibility needs to be preserved - on changes to types. (Use versioned type names to manage - breaking changes.) - Note: this functionality is not currently available in - the official + Since: cosmos-sdk 0.47 + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + additionalProperties: {} + parameters: + - name: denoms + description: >- + denoms is the specific denoms you want look up. Leave empty to get + all entries. + in: query + required: false + type: array + items: + type: string + collectionFormat: multi + - name: pagination.key + 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. + in: query + required: false + type: string + format: byte + - name: pagination.offset + description: >- + offset is a numeric offset that can be used when key is unavailable. - protobuf release, and it is not used for type URLs - beginning with + It is less efficient than using key. Only one of offset or key + should - type.googleapis.com. + be set. + in: query + required: false + type: string + format: uint64 + - name: pagination.limit + 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. + in: query + required: false + type: string + format: uint64 + - name: pagination.count_total + description: >- + count_total is set to true to indicate that the result set should + include - Schemes other than `http`, `https` (or the empty scheme) - might be + a count of the total number of items available for pagination in + UIs. - used with implementation specific semantics. - additionalProperties: {} - description: >- - `Any` contains an arbitrary serialized protocol buffer - message along with a + count_total is only respected when offset is used. It is ignored + when key - URL that describes the type of the serialized message. + is set. + in: query + required: false + type: boolean + - name: pagination.reverse + description: >- + reverse is set to true if results are to be returned in the + descending order. - Protobuf library provides support to pack/unpack Any values - in the form + Since: cosmos-sdk 0.43 + in: query + required: false + type: boolean + tags: + - Query + /cosmos/bank/v1beta1/spendable_balances/{address}: + get: + summary: >- + SpendableBalances queries the spendable balance of all coins for a + single - of utility functions or additional generated methods of the - Any type. + account. + description: >- + When called from another module, this query might consume a high amount + of + gas if the pagination field is incorrectly set. - Example 1: Pack and unpack a message in C++. - Foo foo = ...; - Any any; - any.PackFrom(foo); - ... - if (any.UnpackTo(&foo)) { - ... - } + Since: cosmos-sdk 0.46 + operationId: CosmosBankV1Beta1SpendableBalances + responses: + '200': + description: A successful response. + schema: + type: object + properties: + balances: + type: array + items: + type: object + properties: + denom: + type: string + amount: + type: string + description: >- + Coin defines a token with a denomination and an amount. - Example 2: Pack and unpack a message in Java. - Foo foo = ...; - Any any = Any.pack(foo); - ... - if (any.is(Foo.class)) { - foo = any.unpack(Foo.class); - } + NOTE: The amount field is an Int which implements the custom + method - Example 3: Pack and unpack a message in Python. + signatures required by gogoproto. + description: balances is the spendable balances of all the coins. + pagination: + description: pagination defines the pagination in the response. + type: object + properties: + next_key: + type: string + format: byte + 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. + total: + type: string + format: uint64 + title: >- + total is total number of results available if + PageRequest.count_total - foo = Foo(...) - any = Any() - any.Pack(foo) - ... - if any.Is(Foo.DESCRIPTOR): - any.Unpack(foo) - ... + was set, its value is undefined otherwise + description: >- + QuerySpendableBalancesResponse defines the gRPC response structure + for querying - Example 4: Pack and unpack a message in Go + an account's spendable balances. - foo := &pb.Foo{...} - any, err := anypb.New(foo) - if err != nil { - ... - } - ... - foo := &pb.Foo{} - if err := any.UnmarshalTo(foo); err != nil { - ... - } - The pack methods provided by protobuf library will by - default use + Since: cosmos-sdk 0.46 + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + additionalProperties: {} + parameters: + - name: address + description: address is the address to query spendable balances for. + in: path + required: true + type: string + - name: pagination.key + 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. + in: query + required: false + type: string + format: byte + - name: pagination.offset + description: >- + offset is a numeric offset that can be used when key is unavailable. - 'type.googleapis.com/full.type.name' as the type URL and the - unpack + It is less efficient than using key. Only one of offset or key + should - methods only use the fully qualified type name after the - last '/' + be set. + in: query + required: false + type: string + format: uint64 + - name: pagination.limit + description: >- + limit is the total number of results to be returned in the result + page. - in the type URL, for example "foo.bar.com/x/y.z" will yield - type + If left empty it will default to a value to be set by each app. + in: query + required: false + type: string + format: uint64 + - name: pagination.count_total + description: >- + count_total is set to true to indicate that the result set should + include - name "y.z". + 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 + required: false + type: boolean + - name: pagination.reverse + description: >- + reverse is set to true if results are to be returned in the + descending order. - JSON - ==== + Since: cosmos-sdk 0.43 + in: query + required: false + type: boolean + tags: + - Query + /cosmos/bank/v1beta1/spendable_balances/{address}/by_denom: + get: + summary: >- + SpendableBalanceByDenom queries the spendable balance of a single denom + for - The JSON representation of an `Any` value uses the regular + a single account. + description: >- + When called from another module, this query might consume a high amount + of - representation of the deserialized, embedded message, with - an + gas if the pagination field is incorrectly set. - additional field `@type` which contains the type URL. - Example: - package google.profile; - message Person { - string first_name = 1; - string last_name = 2; - } + Since: cosmos-sdk 0.47 + operationId: CosmosBankV1Beta1SpendableBalanceByDenom + responses: + '200': + description: A successful response. + schema: + type: object + properties: + balance: + description: balance is the balance of the coin. + type: object + properties: + denom: + type: string + amount: + type: string + description: >- + QuerySpendableBalanceByDenomResponse defines the gRPC response + structure for - { - "@type": "type.googleapis.com/google.profile.Person", - "firstName": , - "lastName": - } + querying an account's spendable balance for a specific denom. - If the embedded message type is well-known and has a custom - JSON - representation, that representation will be embedded adding - a field + Since: cosmos-sdk 0.47 + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + additionalProperties: {} + parameters: + - name: address + description: address is the address to query balances for. + in: path + required: true + type: string + - name: denom + description: denom is the coin denom to query balances for. + in: query + required: false + type: string + tags: + - Query + /cosmos/bank/v1beta1/supply: + get: + summary: TotalSupply queries the total supply of all coins. + description: >- + When called from another module, this query might consume a high amount + of - `value` which holds the custom JSON in addition to the - `@type` + gas if the pagination field is incorrectly set. + operationId: CosmosBankV1Beta1TotalSupply + responses: + '200': + description: A successful response. + schema: + type: object + properties: + supply: + type: array + items: + type: object + properties: + denom: + type: string + amount: + type: string + description: >- + Coin defines a token with a denomination and an amount. - field. Example (for message [google.protobuf.Duration][]): - { - "@type": "type.googleapis.com/google.protobuf.Duration", - "value": "1.212s" - } + NOTE: The amount field is an Int which implements the custom + method + + signatures required by gogoproto. + title: supply is the supply of the coins + pagination: + description: |- + pagination defines the pagination in the response. + + Since: cosmos-sdk 0.43 + type: object + properties: + next_key: + type: string + format: byte + 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. + total: + type: string + format: uint64 + title: >- + total is total number of results available if + PageRequest.count_total + + was set, its value is undefined otherwise + title: >- + QueryTotalSupplyResponse is the response type for the + Query/TotalSupply RPC + + method + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + additionalProperties: {} + parameters: + - name: pagination.key + 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. + in: query + required: false + type: string + format: byte + - name: pagination.offset + 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. + in: query + required: false + type: string + format: uint64 + - name: pagination.limit + 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. + in: query + required: false + type: string + format: uint64 + - name: pagination.count_total + 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 + required: false + type: boolean + - name: pagination.reverse + description: >- + reverse is set to true if results are to be returned in the + descending order. + + + Since: cosmos-sdk 0.43 + in: query + required: false + type: boolean tags: - - Service - /cosmos/base/tendermint/v1beta1/syncing: + - Query + /cosmos/bank/v1beta1/supply/by_denom: get: - summary: GetSyncing queries node syncing. - operationId: CosmosBaseTendermintV1Beta1GetSyncing + summary: SupplyOf queries the supply of a single coin. + description: >- + When called from another module, this query might consume a high amount + of + + gas if the pagination field is incorrectly set. + operationId: CosmosBankV1Beta1SupplyOf responses: '200': description: A successful response. schema: type: object properties: - syncing: - type: boolean + amount: + description: amount is the supply of the coin. + type: object + properties: + denom: + type: string + amount: + type: string description: >- - GetSyncingResponse is the response type for the Query/GetSyncing + QuerySupplyOfResponse is the response type for the Query/SupplyOf RPC method. + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + additionalProperties: {} + parameters: + - name: denom + description: denom is the coin denom to query balances for. + in: query + required: false + type: string + tags: + - Query + /cosmos/base/tendermint/v1beta1/abci_query: + get: + summary: >- + ABCIQuery defines a query handler that supports ABCI queries directly to + the + + application, bypassing Tendermint completely. The ABCI query must + contain + + a valid and supported path, including app, custom, p2p, and store. + description: 'Since: cosmos-sdk 0.46' + operationId: CosmosBaseTendermintV1Beta1ABCIQuery + responses: + '200': + description: A successful response. + schema: + type: object + properties: + code: + type: integer + format: int64 + log: + type: string + title: nondeterministic + info: + type: string + title: nondeterministic + index: + type: string + format: int64 + key: + type: string + format: byte + value: + type: string + format: byte + proof_ops: + type: object + properties: + ops: + type: array + items: + type: object + properties: + type: + type: string + key: + type: string + format: byte + data: + type: string + format: byte + description: >- + ProofOp defines an operation used for calculating Merkle + root. The data could + + be arbitrary format, providing necessary data for + example neighbouring node + + hash. + + + Note: This type is a duplicate of the ProofOp proto type + defined in Tendermint. + description: >- + ProofOps is Merkle proof defined by the list of ProofOps. + + + Note: This type is a duplicate of the ProofOps proto type + defined in Tendermint. + height: + type: string + format: int64 + codespace: + type: string + description: >- + ABCIQueryResponse defines the response structure for the ABCIQuery + gRPC query. + + + Note: This type is a duplicate of the ResponseQuery proto type + defined in + + Tendermint. default: description: An unexpected error response. schema: @@ -6286,347 +6080,1315 @@ paths: "@type": "type.googleapis.com/google.protobuf.Duration", "value": "1.212s" } + parameters: + - name: data + in: query + required: false + type: string + format: byte + - name: path + in: query + required: false + type: string + - name: height + in: query + required: false + type: string + format: int64 + - name: prove + in: query + required: false + type: boolean tags: - Service - /cosmos/base/tendermint/v1beta1/validatorsets/latest: + /cosmos/base/tendermint/v1beta1/blocks/latest: get: - summary: GetLatestValidatorSet queries latest validator-set. - operationId: CosmosBaseTendermintV1Beta1GetLatestValidatorSet + summary: GetLatestBlock returns the latest block. + operationId: CosmosBaseTendermintV1Beta1GetLatestBlock responses: '200': description: A successful response. schema: type: object properties: - block_height: - type: string - format: int64 - validators: - type: array - items: - type: object - properties: - address: - type: string - pub_key: - type: object - properties: - '@type': - type: string - description: >- - A URL/resource name that uniquely identifies the - type of the serialized - - protocol buffer message. This string must contain at - least - - one "/" character. The last segment of the URL's - path must represent - - the fully qualified name of the type (as in - - `path/google.protobuf.Duration`). The name should be - in a canonical form - - (e.g., leading "." is not accepted). - - - In practice, teams usually precompile into the - binary all types that they - - expect it to use in the context of Any. However, for - URLs which use the - - scheme `http`, `https`, or no scheme, one can - optionally set up a type - - server that maps type URLs to message definitions as - follows: - - - * If no scheme is provided, `https` is assumed. - - * An HTTP GET on the URL must yield a - [google.protobuf.Type][] - value in binary format, or produce an error. - * Applications are allowed to cache lookup results - based on the - URL, or have them precompiled into a binary to avoid any - lookup. Therefore, binary compatibility needs to be preserved - on changes to types. (Use versioned type names to manage - breaking changes.) - - Note: this functionality is not currently available - in the official - - protobuf release, and it is not used for type URLs - beginning with - - type.googleapis.com. - - - Schemes other than `http`, `https` (or the empty - scheme) might be - - used with implementation specific semantics. - additionalProperties: {} - description: >- - `Any` contains an arbitrary serialized protocol buffer - message along with a - - URL that describes the type of the serialized message. - - - Protobuf library provides support to pack/unpack Any - values in the form - - of utility functions or additional generated methods of - the Any type. - - - Example 1: Pack and unpack a message in C++. - - Foo foo = ...; - Any any; - any.PackFrom(foo); - ... - if (any.UnpackTo(&foo)) { - ... - } - - Example 2: Pack and unpack a message in Java. - - Foo foo = ...; - Any any = Any.pack(foo); - ... - if (any.is(Foo.class)) { - foo = any.unpack(Foo.class); - } - - Example 3: Pack and unpack a message in Python. - - foo = Foo(...) - any = Any() - any.Pack(foo) - ... - if any.Is(Foo.DESCRIPTOR): - any.Unpack(foo) - ... - - Example 4: Pack and unpack a message in Go - - foo := &pb.Foo{...} - any, err := anypb.New(foo) - if err != nil { - ... - } - ... - foo := &pb.Foo{} - if err := any.UnmarshalTo(foo); err != nil { - ... - } - - The pack methods provided by protobuf library will by - default use - - 'type.googleapis.com/full.type.name' as the type URL and - the unpack - - methods only use the fully qualified type name after the - last '/' - - in the type URL, for example "foo.bar.com/x/y.z" will - yield type - - name "y.z". - - - - JSON - - ==== - - The JSON representation of an `Any` value uses the - regular - - representation of the deserialized, embedded message, - with an - - additional field `@type` which contains the type URL. - Example: - - package google.profile; - message Person { - string first_name = 1; - string last_name = 2; - } - - { - "@type": "type.googleapis.com/google.profile.Person", - "firstName": , - "lastName": - } - - If the embedded message type is well-known and has a - custom JSON - - representation, that representation will be embedded - adding a field - - `value` which holds the custom JSON in addition to the - `@type` - - field. Example (for message - [google.protobuf.Duration][]): - - { - "@type": "type.googleapis.com/google.protobuf.Duration", - "value": "1.212s" - } - voting_power: - type: string - format: int64 - proposer_priority: - type: string - format: int64 - description: Validator is the type for the validator-set. - pagination: - description: pagination defines an pagination for the response. + block_id: type: object properties: - next_key: + hash: type: string format: byte - title: |- - next_key is the key to be passed to PageRequest.key to - query the next page most efficiently - total: - type: string - format: uint64 - title: >- - total is total number of results available if - PageRequest.count_total - - was set, its value is undefined otherwise - description: >- - GetLatestValidatorSetResponse is the response type for the - Query/GetValidatorSetByHeight RPC method. - default: - description: An unexpected error response. - schema: - type: object - properties: - code: - type: integer - format: int32 - message: - type: string - details: - type: array - items: - type: object - properties: - '@type': - type: string - description: >- - A URL/resource name that uniquely identifies the type of - the serialized - - protocol buffer message. This string must contain at - least - - one "/" character. The last segment of the URL's path - must represent - - the fully qualified name of the type (as in - - `path/google.protobuf.Duration`). The name should be in - a canonical form + part_set_header: + type: object + properties: + total: + type: integer + format: int64 + hash: + type: string + format: byte + title: PartsetHeader + title: BlockID + block: + title: 'Deprecated: please use `sdk_block` instead' + type: object + properties: + header: + type: object + properties: + version: + title: basic block info + type: object + properties: + block: + type: string + format: uint64 + app: + type: string + format: uint64 + description: >- + Consensus captures the consensus rules for processing + a block in the blockchain, - (e.g., leading "." is not accepted). + including all blockchain data structures and the rules + of the application's + state transition machine. + chain_id: + type: string + height: + type: string + format: int64 + time: + type: string + format: date-time + last_block_id: + type: object + properties: + hash: + type: string + format: byte + part_set_header: + type: object + properties: + total: + type: integer + format: int64 + hash: + type: string + format: byte + title: PartsetHeader + title: BlockID + last_commit_hash: + type: string + format: byte + description: commit from validators from the last block + title: hashes of block data + data_hash: + type: string + format: byte + title: transactions + validators_hash: + type: string + format: byte + description: validators for the current block + title: hashes from the app output from the prev block + next_validators_hash: + type: string + format: byte + title: validators for the next block + consensus_hash: + type: string + format: byte + title: consensus params for current block + app_hash: + type: string + format: byte + title: state after txs from the previous block + last_results_hash: + type: string + format: byte + title: >- + root hash of all results from the txs from the + previous block + evidence_hash: + type: string + format: byte + description: evidence included in the block + title: consensus info + proposer_address: + type: string + format: byte + title: original proposer of the block + description: Header defines the structure of a block header. + data: + type: object + properties: + txs: + type: array + items: + type: string + format: byte + description: >- + Txs that will be applied by state @ block.Height+1. - In practice, teams usually precompile into the binary - all types that they + NOTE: not all txs here are valid. We're just agreeing + on the order first. - expect it to use in the context of Any. However, for - URLs which use the + This means that block.AppHash does not include these + txs. + title: >- + Data contains the set of transactions included in the + block + evidence: + type: object + properties: + evidence: + type: array + items: + type: object + properties: + duplicate_vote_evidence: + type: object + properties: + vote_a: + type: object + properties: + type: + type: string + enum: + - SIGNED_MSG_TYPE_UNKNOWN + - SIGNED_MSG_TYPE_PREVOTE + - SIGNED_MSG_TYPE_PRECOMMIT + - SIGNED_MSG_TYPE_PROPOSAL + default: SIGNED_MSG_TYPE_UNKNOWN + description: >- + SignedMsgType is a type of signed + message in the consensus. - scheme `http`, `https`, or no scheme, one can optionally - set up a type + - SIGNED_MSG_TYPE_PREVOTE: Votes + - SIGNED_MSG_TYPE_PROPOSAL: Proposals + height: + type: string + format: int64 + round: + type: integer + format: int32 + block_id: + type: object + properties: + hash: + type: string + format: byte + part_set_header: + type: object + properties: + total: + type: integer + format: int64 + hash: + type: string + format: byte + title: PartsetHeader + title: BlockID + description: zero if vote is nil. + timestamp: + type: string + format: date-time + validator_address: + type: string + format: byte + validator_index: + type: integer + format: int32 + signature: + type: string + format: byte + description: >- + Vote represents a prevote, precommit, or + commit vote from validators for - server that maps type URLs to message definitions as - follows: + consensus. + vote_b: + type: object + properties: + type: + type: string + enum: + - SIGNED_MSG_TYPE_UNKNOWN + - SIGNED_MSG_TYPE_PREVOTE + - SIGNED_MSG_TYPE_PRECOMMIT + - SIGNED_MSG_TYPE_PROPOSAL + default: SIGNED_MSG_TYPE_UNKNOWN + description: >- + SignedMsgType is a type of signed + message in the consensus. + - SIGNED_MSG_TYPE_PREVOTE: Votes + - SIGNED_MSG_TYPE_PROPOSAL: Proposals + height: + type: string + format: int64 + round: + type: integer + format: int32 + block_id: + type: object + properties: + hash: + type: string + format: byte + part_set_header: + type: object + properties: + total: + type: integer + format: int64 + hash: + type: string + format: byte + title: PartsetHeader + title: BlockID + description: zero if vote is nil. + timestamp: + type: string + format: date-time + validator_address: + type: string + format: byte + validator_index: + type: integer + format: int32 + signature: + type: string + format: byte + description: >- + Vote represents a prevote, precommit, or + commit vote from validators for - * If no scheme is provided, `https` is assumed. + consensus. + total_voting_power: + type: string + format: int64 + validator_power: + type: string + format: int64 + timestamp: + type: string + format: date-time + description: >- + DuplicateVoteEvidence contains evidence of a + validator signed two conflicting votes. + light_client_attack_evidence: + type: object + properties: + conflicting_block: + type: object + properties: + signed_header: + type: object + properties: + header: + type: object + properties: + version: + title: basic block info + type: object + properties: + block: + type: string + format: uint64 + app: + type: string + format: uint64 + description: >- + Consensus captures the consensus rules + for processing a block in the + blockchain, - * An HTTP GET on the URL must yield a - [google.protobuf.Type][] - value in binary format, or produce an error. - * Applications are allowed to cache lookup results based - on the - URL, or have them precompiled into a binary to avoid any - lookup. Therefore, binary compatibility needs to be preserved - on changes to types. (Use versioned type names to manage - breaking changes.) + including all blockchain data structures + and the rules of the application's - Note: this functionality is not currently available in - the official - - protobuf release, and it is not used for type URLs - beginning with - - type.googleapis.com. - - - Schemes other than `http`, `https` (or the empty scheme) - might be - - used with implementation specific semantics. - additionalProperties: {} - description: >- - `Any` contains an arbitrary serialized protocol buffer - message along with a + state transition machine. + chain_id: + type: string + height: + type: string + format: int64 + time: + type: string + format: date-time + last_block_id: + type: object + properties: + hash: + type: string + format: byte + part_set_header: + type: object + properties: + total: + type: integer + format: int64 + hash: + type: string + format: byte + title: PartsetHeader + title: BlockID + last_commit_hash: + type: string + format: byte + description: >- + commit from validators from the last + block + title: hashes of block data + data_hash: + type: string + format: byte + title: transactions + validators_hash: + type: string + format: byte + description: validators for the current block + title: >- + hashes from the app output from the prev + block + next_validators_hash: + type: string + format: byte + title: validators for the next block + consensus_hash: + type: string + format: byte + title: consensus params for current block + app_hash: + type: string + format: byte + title: state after txs from the previous block + last_results_hash: + type: string + format: byte + title: >- + root hash of all results from the txs + from the previous block + evidence_hash: + type: string + format: byte + description: evidence included in the block + title: consensus info + proposer_address: + type: string + format: byte + title: original proposer of the block + description: >- + Header defines the structure of a block + header. + commit: + type: object + properties: + height: + type: string + format: int64 + round: + type: integer + format: int32 + block_id: + type: object + properties: + hash: + type: string + format: byte + part_set_header: + type: object + properties: + total: + type: integer + format: int64 + hash: + type: string + format: byte + title: PartsetHeader + title: BlockID + signatures: + type: array + items: + type: object + properties: + block_id_flag: + type: string + enum: + - BLOCK_ID_FLAG_UNKNOWN + - BLOCK_ID_FLAG_ABSENT + - BLOCK_ID_FLAG_COMMIT + - BLOCK_ID_FLAG_NIL + default: BLOCK_ID_FLAG_UNKNOWN + title: >- + BlockIdFlag indicates which BlcokID the + signature is for + validator_address: + type: string + format: byte + timestamp: + type: string + format: date-time + signature: + type: string + format: byte + description: >- + CommitSig is a part of the Vote included + in a Commit. + description: >- + Commit contains the evidence that a + block was committed by a set of + validators. + validator_set: + type: object + properties: + validators: + type: array + items: + type: object + properties: + address: + type: string + format: byte + pub_key: + type: object + properties: + ed25519: + type: string + format: byte + secp256k1: + type: string + format: byte + title: >- + PublicKey defines the keys available for + use with Validators + voting_power: + type: string + format: int64 + proposer_priority: + type: string + format: int64 + proposer: + type: object + properties: + address: + type: string + format: byte + pub_key: + type: object + properties: + ed25519: + type: string + format: byte + secp256k1: + type: string + format: byte + title: >- + PublicKey defines the keys available for + use with Validators + voting_power: + type: string + format: int64 + proposer_priority: + type: string + format: int64 + total_voting_power: + type: string + format: int64 + common_height: + type: string + format: int64 + byzantine_validators: + type: array + items: + type: object + properties: + address: + type: string + format: byte + pub_key: + type: object + properties: + ed25519: + type: string + format: byte + secp256k1: + type: string + format: byte + title: >- + PublicKey defines the keys available for + use with Validators + voting_power: + type: string + format: int64 + proposer_priority: + type: string + format: int64 + total_voting_power: + type: string + format: int64 + timestamp: + type: string + format: date-time + description: >- + LightClientAttackEvidence contains evidence of a + set of validators attempting to mislead a light + client. + last_commit: + type: object + properties: + height: + type: string + format: int64 + round: + type: integer + format: int32 + block_id: + type: object + properties: + hash: + type: string + format: byte + part_set_header: + type: object + properties: + total: + type: integer + format: int64 + hash: + type: string + format: byte + title: PartsetHeader + title: BlockID + signatures: + type: array + items: + type: object + properties: + block_id_flag: + type: string + enum: + - BLOCK_ID_FLAG_UNKNOWN + - BLOCK_ID_FLAG_ABSENT + - BLOCK_ID_FLAG_COMMIT + - BLOCK_ID_FLAG_NIL + default: BLOCK_ID_FLAG_UNKNOWN + title: >- + BlockIdFlag indicates which BlcokID the + signature is for + validator_address: + type: string + format: byte + timestamp: + type: string + format: date-time + signature: + type: string + format: byte + description: >- + CommitSig is a part of the Vote included in a + Commit. + description: >- + Commit contains the evidence that a block was committed by + a set of validators. + sdk_block: + title: 'Since: cosmos-sdk 0.47' + type: object + properties: + header: + type: object + properties: + version: + title: basic block info + type: object + properties: + block: + type: string + format: uint64 + app: + type: string + format: uint64 + description: >- + Consensus captures the consensus rules for processing + a block in the blockchain, - URL that describes the type of the serialized message. + including all blockchain data structures and the rules + of the application's + state transition machine. + chain_id: + type: string + height: + type: string + format: int64 + time: + type: string + format: date-time + last_block_id: + type: object + properties: + hash: + type: string + format: byte + part_set_header: + type: object + properties: + total: + type: integer + format: int64 + hash: + type: string + format: byte + title: PartsetHeader + title: BlockID + last_commit_hash: + type: string + format: byte + description: commit from validators from the last block + title: hashes of block data + data_hash: + type: string + format: byte + title: transactions + validators_hash: + type: string + format: byte + description: validators for the current block + title: hashes from the app output from the prev block + next_validators_hash: + type: string + format: byte + title: validators for the next block + consensus_hash: + type: string + format: byte + title: consensus params for current block + app_hash: + type: string + format: byte + title: state after txs from the previous block + last_results_hash: + type: string + format: byte + title: >- + root hash of all results from the txs from the + previous block + evidence_hash: + type: string + format: byte + description: evidence included in the block + title: consensus info + proposer_address: + type: string + description: >- + proposer_address is the original block proposer + address, formatted as a Bech32 string. - Protobuf library provides support to pack/unpack Any values - in the form + In Tendermint, this type is `bytes`, but in the SDK, + we convert it to a Bech32 string - of utility functions or additional generated methods of the - Any type. + for better UX. - Example 1: Pack and unpack a message in C++. + original proposer of the block + description: Header defines the structure of a Tendermint block header. + data: + type: object + properties: + txs: + type: array + items: + type: string + format: byte + description: >- + Txs that will be applied by state @ block.Height+1. - Foo foo = ...; - Any any; - any.PackFrom(foo); - ... - if (any.UnpackTo(&foo)) { - ... - } + NOTE: not all txs here are valid. We're just agreeing + on the order first. - Example 2: Pack and unpack a message in Java. + This means that block.AppHash does not include these + txs. + title: >- + Data contains the set of transactions included in the + block + evidence: + type: object + properties: + evidence: + type: array + items: + type: object + properties: + duplicate_vote_evidence: + type: object + properties: + vote_a: + type: object + properties: + type: + type: string + enum: + - SIGNED_MSG_TYPE_UNKNOWN + - SIGNED_MSG_TYPE_PREVOTE + - SIGNED_MSG_TYPE_PRECOMMIT + - SIGNED_MSG_TYPE_PROPOSAL + default: SIGNED_MSG_TYPE_UNKNOWN + description: >- + SignedMsgType is a type of signed + message in the consensus. - Foo foo = ...; - Any any = Any.pack(foo); - ... - if (any.is(Foo.class)) { - foo = any.unpack(Foo.class); - } + - SIGNED_MSG_TYPE_PREVOTE: Votes + - SIGNED_MSG_TYPE_PROPOSAL: Proposals + height: + type: string + format: int64 + round: + type: integer + format: int32 + block_id: + type: object + properties: + hash: + type: string + format: byte + part_set_header: + type: object + properties: + total: + type: integer + format: int64 + hash: + type: string + format: byte + title: PartsetHeader + title: BlockID + description: zero if vote is nil. + timestamp: + type: string + format: date-time + validator_address: + type: string + format: byte + validator_index: + type: integer + format: int32 + signature: + type: string + format: byte + description: >- + Vote represents a prevote, precommit, or + commit vote from validators for - Example 3: Pack and unpack a message in Python. + consensus. + vote_b: + type: object + properties: + type: + type: string + enum: + - SIGNED_MSG_TYPE_UNKNOWN + - SIGNED_MSG_TYPE_PREVOTE + - SIGNED_MSG_TYPE_PRECOMMIT + - SIGNED_MSG_TYPE_PROPOSAL + default: SIGNED_MSG_TYPE_UNKNOWN + description: >- + SignedMsgType is a type of signed + message in the consensus. - foo = Foo(...) - any = Any() - any.Pack(foo) - ... - if any.Is(Foo.DESCRIPTOR): - any.Unpack(foo) - ... + - SIGNED_MSG_TYPE_PREVOTE: Votes + - SIGNED_MSG_TYPE_PROPOSAL: Proposals + height: + type: string + format: int64 + round: + type: integer + format: int32 + block_id: + type: object + properties: + hash: + type: string + format: byte + part_set_header: + type: object + properties: + total: + type: integer + format: int64 + hash: + type: string + format: byte + title: PartsetHeader + title: BlockID + description: zero if vote is nil. + timestamp: + type: string + format: date-time + validator_address: + type: string + format: byte + validator_index: + type: integer + format: int32 + signature: + type: string + format: byte + description: >- + Vote represents a prevote, precommit, or + commit vote from validators for + + consensus. + total_voting_power: + type: string + format: int64 + validator_power: + type: string + format: int64 + timestamp: + type: string + format: date-time + description: >- + DuplicateVoteEvidence contains evidence of a + validator signed two conflicting votes. + light_client_attack_evidence: + type: object + properties: + conflicting_block: + type: object + properties: + signed_header: + type: object + properties: + header: + type: object + properties: + version: + title: basic block info + type: object + properties: + block: + type: string + format: uint64 + app: + type: string + format: uint64 + description: >- + Consensus captures the consensus rules + for processing a block in the + blockchain, + + including all blockchain data structures + and the rules of the application's + + state transition machine. + chain_id: + type: string + height: + type: string + format: int64 + time: + type: string + format: date-time + last_block_id: + type: object + properties: + hash: + type: string + format: byte + part_set_header: + type: object + properties: + total: + type: integer + format: int64 + hash: + type: string + format: byte + title: PartsetHeader + title: BlockID + last_commit_hash: + type: string + format: byte + description: >- + commit from validators from the last + block + title: hashes of block data + data_hash: + type: string + format: byte + title: transactions + validators_hash: + type: string + format: byte + description: validators for the current block + title: >- + hashes from the app output from the prev + block + next_validators_hash: + type: string + format: byte + title: validators for the next block + consensus_hash: + type: string + format: byte + title: consensus params for current block + app_hash: + type: string + format: byte + title: state after txs from the previous block + last_results_hash: + type: string + format: byte + title: >- + root hash of all results from the txs + from the previous block + evidence_hash: + type: string + format: byte + description: evidence included in the block + title: consensus info + proposer_address: + type: string + format: byte + title: original proposer of the block + description: >- + Header defines the structure of a block + header. + commit: + type: object + properties: + height: + type: string + format: int64 + round: + type: integer + format: int32 + block_id: + type: object + properties: + hash: + type: string + format: byte + part_set_header: + type: object + properties: + total: + type: integer + format: int64 + hash: + type: string + format: byte + title: PartsetHeader + title: BlockID + signatures: + type: array + items: + type: object + properties: + block_id_flag: + type: string + enum: + - BLOCK_ID_FLAG_UNKNOWN + - BLOCK_ID_FLAG_ABSENT + - BLOCK_ID_FLAG_COMMIT + - BLOCK_ID_FLAG_NIL + default: BLOCK_ID_FLAG_UNKNOWN + title: >- + BlockIdFlag indicates which BlcokID the + signature is for + validator_address: + type: string + format: byte + timestamp: + type: string + format: date-time + signature: + type: string + format: byte + description: >- + CommitSig is a part of the Vote included + in a Commit. + description: >- + Commit contains the evidence that a + block was committed by a set of + validators. + validator_set: + type: object + properties: + validators: + type: array + items: + type: object + properties: + address: + type: string + format: byte + pub_key: + type: object + properties: + ed25519: + type: string + format: byte + secp256k1: + type: string + format: byte + title: >- + PublicKey defines the keys available for + use with Validators + voting_power: + type: string + format: int64 + proposer_priority: + type: string + format: int64 + proposer: + type: object + properties: + address: + type: string + format: byte + pub_key: + type: object + properties: + ed25519: + type: string + format: byte + secp256k1: + type: string + format: byte + title: >- + PublicKey defines the keys available for + use with Validators + voting_power: + type: string + format: int64 + proposer_priority: + type: string + format: int64 + total_voting_power: + type: string + format: int64 + common_height: + type: string + format: int64 + byzantine_validators: + type: array + items: + type: object + properties: + address: + type: string + format: byte + pub_key: + type: object + properties: + ed25519: + type: string + format: byte + secp256k1: + type: string + format: byte + title: >- + PublicKey defines the keys available for + use with Validators + voting_power: + type: string + format: int64 + proposer_priority: + type: string + format: int64 + total_voting_power: + type: string + format: int64 + timestamp: + type: string + format: date-time + description: >- + LightClientAttackEvidence contains evidence of a + set of validators attempting to mislead a light + client. + last_commit: + type: object + properties: + height: + type: string + format: int64 + round: + type: integer + format: int32 + block_id: + type: object + properties: + hash: + type: string + format: byte + part_set_header: + type: object + properties: + total: + type: integer + format: int64 + hash: + type: string + format: byte + title: PartsetHeader + title: BlockID + signatures: + type: array + items: + type: object + properties: + block_id_flag: + type: string + enum: + - BLOCK_ID_FLAG_UNKNOWN + - BLOCK_ID_FLAG_ABSENT + - BLOCK_ID_FLAG_COMMIT + - BLOCK_ID_FLAG_NIL + default: BLOCK_ID_FLAG_UNKNOWN + title: >- + BlockIdFlag indicates which BlcokID the + signature is for + validator_address: + type: string + format: byte + timestamp: + type: string + format: date-time + signature: + type: string + format: byte + description: >- + CommitSig is a part of the Vote included in a + Commit. + description: >- + Commit contains the evidence that a block was committed by + a set of validators. + description: >- + Block is tendermint type Block, with the Header proposer + address + + field converted to bech32 string. + description: >- + GetLatestBlockResponse is the response type for the + Query/GetLatestBlock RPC method. + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type of + the serialized + + protocol buffer message. This string must contain at + least + + one "/" character. The last segment of the URL's path + must represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be in + a canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the binary + all types that they + + expect it to use in the context of Any. However, for + URLs which use the + + scheme `http`, `https`, or no scheme, one can optionally + set up a type + + server that maps type URLs to message definitions as + follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based + on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in + the official + + protobuf release, and it is not used for type URLs + beginning with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty scheme) + might be + + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer + message along with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any values + in the form + + of utility functions or additional generated methods of the + Any type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... Example 4: Pack and unpack a message in Go @@ -6696,570 +7458,1213 @@ paths: "@type": "type.googleapis.com/google.protobuf.Duration", "value": "1.212s" } - parameters: - - name: pagination.key - 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. - in: query - required: false - type: string - format: byte - - name: pagination.offset - 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. - in: query - required: false - type: string - format: uint64 - - name: pagination.limit - 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. - in: query - required: false - type: string - format: uint64 - - name: pagination.count_total - 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 - required: false - type: boolean - - name: pagination.reverse - description: >- - reverse is set to true if results are to be returned in the - descending order. - - - Since: cosmos-sdk 0.43 - in: query - required: false - type: boolean tags: - Service - /cosmos/base/tendermint/v1beta1/validatorsets/{height}: + /cosmos/base/tendermint/v1beta1/blocks/{height}: get: - summary: GetValidatorSetByHeight queries validator-set at a given height. - operationId: CosmosBaseTendermintV1Beta1GetValidatorSetByHeight + summary: GetBlockByHeight queries block for given height. + operationId: CosmosBaseTendermintV1Beta1GetBlockByHeight responses: '200': description: A successful response. schema: type: object properties: - block_height: - type: string - format: int64 - validators: - type: array - items: - type: object - properties: - address: - type: string - pub_key: - type: object - properties: - '@type': - type: string - description: >- - A URL/resource name that uniquely identifies the - type of the serialized - - protocol buffer message. This string must contain at - least - - one "/" character. The last segment of the URL's - path must represent - - the fully qualified name of the type (as in - - `path/google.protobuf.Duration`). The name should be - in a canonical form - - (e.g., leading "." is not accepted). - - - In practice, teams usually precompile into the - binary all types that they - - expect it to use in the context of Any. However, for - URLs which use the - - scheme `http`, `https`, or no scheme, one can - optionally set up a type - - server that maps type URLs to message definitions as - follows: - - - * If no scheme is provided, `https` is assumed. - - * An HTTP GET on the URL must yield a - [google.protobuf.Type][] - value in binary format, or produce an error. - * Applications are allowed to cache lookup results - based on the - URL, or have them precompiled into a binary to avoid any - lookup. Therefore, binary compatibility needs to be preserved - on changes to types. (Use versioned type names to manage - breaking changes.) - - Note: this functionality is not currently available - in the official - - protobuf release, and it is not used for type URLs - beginning with - - type.googleapis.com. - - - Schemes other than `http`, `https` (or the empty - scheme) might be - - used with implementation specific semantics. - additionalProperties: {} - description: >- - `Any` contains an arbitrary serialized protocol buffer - message along with a - - URL that describes the type of the serialized message. - - - Protobuf library provides support to pack/unpack Any - values in the form - - of utility functions or additional generated methods of - the Any type. - - - Example 1: Pack and unpack a message in C++. - - Foo foo = ...; - Any any; - any.PackFrom(foo); - ... - if (any.UnpackTo(&foo)) { - ... - } - - Example 2: Pack and unpack a message in Java. - - Foo foo = ...; - Any any = Any.pack(foo); - ... - if (any.is(Foo.class)) { - foo = any.unpack(Foo.class); - } - - Example 3: Pack and unpack a message in Python. - - foo = Foo(...) - any = Any() - any.Pack(foo) - ... - if any.Is(Foo.DESCRIPTOR): - any.Unpack(foo) - ... - - Example 4: Pack and unpack a message in Go - - foo := &pb.Foo{...} - any, err := anypb.New(foo) - if err != nil { - ... - } - ... - foo := &pb.Foo{} - if err := any.UnmarshalTo(foo); err != nil { - ... - } - - The pack methods provided by protobuf library will by - default use - - 'type.googleapis.com/full.type.name' as the type URL and - the unpack - - methods only use the fully qualified type name after the - last '/' - - in the type URL, for example "foo.bar.com/x/y.z" will - yield type - - name "y.z". - - - - JSON - - ==== - - The JSON representation of an `Any` value uses the - regular - - representation of the deserialized, embedded message, - with an - - additional field `@type` which contains the type URL. - Example: - - package google.profile; - message Person { - string first_name = 1; - string last_name = 2; - } - - { - "@type": "type.googleapis.com/google.profile.Person", - "firstName": , - "lastName": - } - - If the embedded message type is well-known and has a - custom JSON - - representation, that representation will be embedded - adding a field - - `value` which holds the custom JSON in addition to the - `@type` - - field. Example (for message - [google.protobuf.Duration][]): - - { - "@type": "type.googleapis.com/google.protobuf.Duration", - "value": "1.212s" - } - voting_power: - type: string - format: int64 - proposer_priority: - type: string - format: int64 - description: Validator is the type for the validator-set. - pagination: - description: pagination defines an pagination for the response. + block_id: type: object properties: - next_key: + hash: type: string format: byte - title: |- - next_key is the key to be passed to PageRequest.key to - query the next page most efficiently - total: - type: string - format: uint64 - title: >- - total is total number of results available if - PageRequest.count_total - - was set, its value is undefined otherwise - description: >- - GetValidatorSetByHeightResponse is the response type for the - Query/GetValidatorSetByHeight RPC method. - default: - description: An unexpected error response. - schema: - type: object - properties: - code: - type: integer - format: int32 - message: - type: string - details: - type: array - items: - type: object - properties: - '@type': - type: string - description: >- - A URL/resource name that uniquely identifies the type of - the serialized - - protocol buffer message. This string must contain at - least - - one "/" character. The last segment of the URL's path - must represent - - the fully qualified name of the type (as in - - `path/google.protobuf.Duration`). The name should be in - a canonical form - - (e.g., leading "." is not accepted). - - - In practice, teams usually precompile into the binary - all types that they - - expect it to use in the context of Any. However, for - URLs which use the - - scheme `http`, `https`, or no scheme, one can optionally - set up a type - - server that maps type URLs to message definitions as - follows: - + part_set_header: + type: object + properties: + total: + type: integer + format: int64 + hash: + type: string + format: byte + title: PartsetHeader + title: BlockID + block: + title: 'Deprecated: please use `sdk_block` instead' + type: object + properties: + header: + type: object + properties: + version: + title: basic block info + type: object + properties: + block: + type: string + format: uint64 + app: + type: string + format: uint64 + description: >- + Consensus captures the consensus rules for processing + a block in the blockchain, - * If no scheme is provided, `https` is assumed. + including all blockchain data structures and the rules + of the application's - * An HTTP GET on the URL must yield a - [google.protobuf.Type][] - value in binary format, or produce an error. - * Applications are allowed to cache lookup results based - on the - URL, or have them precompiled into a binary to avoid any - lookup. Therefore, binary compatibility needs to be preserved - on changes to types. (Use versioned type names to manage - breaking changes.) + state transition machine. + chain_id: + type: string + height: + type: string + format: int64 + time: + type: string + format: date-time + last_block_id: + type: object + properties: + hash: + type: string + format: byte + part_set_header: + type: object + properties: + total: + type: integer + format: int64 + hash: + type: string + format: byte + title: PartsetHeader + title: BlockID + last_commit_hash: + type: string + format: byte + description: commit from validators from the last block + title: hashes of block data + data_hash: + type: string + format: byte + title: transactions + validators_hash: + type: string + format: byte + description: validators for the current block + title: hashes from the app output from the prev block + next_validators_hash: + type: string + format: byte + title: validators for the next block + consensus_hash: + type: string + format: byte + title: consensus params for current block + app_hash: + type: string + format: byte + title: state after txs from the previous block + last_results_hash: + type: string + format: byte + title: >- + root hash of all results from the txs from the + previous block + evidence_hash: + type: string + format: byte + description: evidence included in the block + title: consensus info + proposer_address: + type: string + format: byte + title: original proposer of the block + description: Header defines the structure of a block header. + data: + type: object + properties: + txs: + type: array + items: + type: string + format: byte + description: >- + Txs that will be applied by state @ block.Height+1. - Note: this functionality is not currently available in - the official + NOTE: not all txs here are valid. We're just agreeing + on the order first. - protobuf release, and it is not used for type URLs - beginning with + This means that block.AppHash does not include these + txs. + title: >- + Data contains the set of transactions included in the + block + evidence: + type: object + properties: + evidence: + type: array + items: + type: object + properties: + duplicate_vote_evidence: + type: object + properties: + vote_a: + type: object + properties: + type: + type: string + enum: + - SIGNED_MSG_TYPE_UNKNOWN + - SIGNED_MSG_TYPE_PREVOTE + - SIGNED_MSG_TYPE_PRECOMMIT + - SIGNED_MSG_TYPE_PROPOSAL + default: SIGNED_MSG_TYPE_UNKNOWN + description: >- + SignedMsgType is a type of signed + message in the consensus. - type.googleapis.com. + - SIGNED_MSG_TYPE_PREVOTE: Votes + - SIGNED_MSG_TYPE_PROPOSAL: Proposals + height: + type: string + format: int64 + round: + type: integer + format: int32 + block_id: + type: object + properties: + hash: + type: string + format: byte + part_set_header: + type: object + properties: + total: + type: integer + format: int64 + hash: + type: string + format: byte + title: PartsetHeader + title: BlockID + description: zero if vote is nil. + timestamp: + type: string + format: date-time + validator_address: + type: string + format: byte + validator_index: + type: integer + format: int32 + signature: + type: string + format: byte + description: >- + Vote represents a prevote, precommit, or + commit vote from validators for + consensus. + vote_b: + type: object + properties: + type: + type: string + enum: + - SIGNED_MSG_TYPE_UNKNOWN + - SIGNED_MSG_TYPE_PREVOTE + - SIGNED_MSG_TYPE_PRECOMMIT + - SIGNED_MSG_TYPE_PROPOSAL + default: SIGNED_MSG_TYPE_UNKNOWN + description: >- + SignedMsgType is a type of signed + message in the consensus. - Schemes other than `http`, `https` (or the empty scheme) - might be - - used with implementation specific semantics. - additionalProperties: {} - description: >- - `Any` contains an arbitrary serialized protocol buffer - message along with a - - URL that describes the type of the serialized message. - + - SIGNED_MSG_TYPE_PREVOTE: Votes + - SIGNED_MSG_TYPE_PROPOSAL: Proposals + height: + type: string + format: int64 + round: + type: integer + format: int32 + block_id: + type: object + properties: + hash: + type: string + format: byte + part_set_header: + type: object + properties: + total: + type: integer + format: int64 + hash: + type: string + format: byte + title: PartsetHeader + title: BlockID + description: zero if vote is nil. + timestamp: + type: string + format: date-time + validator_address: + type: string + format: byte + validator_index: + type: integer + format: int32 + signature: + type: string + format: byte + description: >- + Vote represents a prevote, precommit, or + commit vote from validators for - Protobuf library provides support to pack/unpack Any values - in the form + consensus. + total_voting_power: + type: string + format: int64 + validator_power: + type: string + format: int64 + timestamp: + type: string + format: date-time + description: >- + DuplicateVoteEvidence contains evidence of a + validator signed two conflicting votes. + light_client_attack_evidence: + type: object + properties: + conflicting_block: + type: object + properties: + signed_header: + type: object + properties: + header: + type: object + properties: + version: + title: basic block info + type: object + properties: + block: + type: string + format: uint64 + app: + type: string + format: uint64 + description: >- + Consensus captures the consensus rules + for processing a block in the + blockchain, - of utility functions or additional generated methods of the - Any type. + including all blockchain data structures + and the rules of the application's + state transition machine. + chain_id: + type: string + height: + type: string + format: int64 + time: + type: string + format: date-time + last_block_id: + type: object + properties: + hash: + type: string + format: byte + part_set_header: + type: object + properties: + total: + type: integer + format: int64 + hash: + type: string + format: byte + title: PartsetHeader + title: BlockID + last_commit_hash: + type: string + format: byte + description: >- + commit from validators from the last + block + title: hashes of block data + data_hash: + type: string + format: byte + title: transactions + validators_hash: + type: string + format: byte + description: validators for the current block + title: >- + hashes from the app output from the prev + block + next_validators_hash: + type: string + format: byte + title: validators for the next block + consensus_hash: + type: string + format: byte + title: consensus params for current block + app_hash: + type: string + format: byte + title: state after txs from the previous block + last_results_hash: + type: string + format: byte + title: >- + root hash of all results from the txs + from the previous block + evidence_hash: + type: string + format: byte + description: evidence included in the block + title: consensus info + proposer_address: + type: string + format: byte + title: original proposer of the block + description: >- + Header defines the structure of a block + header. + commit: + type: object + properties: + height: + type: string + format: int64 + round: + type: integer + format: int32 + block_id: + type: object + properties: + hash: + type: string + format: byte + part_set_header: + type: object + properties: + total: + type: integer + format: int64 + hash: + type: string + format: byte + title: PartsetHeader + title: BlockID + signatures: + type: array + items: + type: object + properties: + block_id_flag: + type: string + enum: + - BLOCK_ID_FLAG_UNKNOWN + - BLOCK_ID_FLAG_ABSENT + - BLOCK_ID_FLAG_COMMIT + - BLOCK_ID_FLAG_NIL + default: BLOCK_ID_FLAG_UNKNOWN + title: >- + BlockIdFlag indicates which BlcokID the + signature is for + validator_address: + type: string + format: byte + timestamp: + type: string + format: date-time + signature: + type: string + format: byte + description: >- + CommitSig is a part of the Vote included + in a Commit. + description: >- + Commit contains the evidence that a + block was committed by a set of + validators. + validator_set: + type: object + properties: + validators: + type: array + items: + type: object + properties: + address: + type: string + format: byte + pub_key: + type: object + properties: + ed25519: + type: string + format: byte + secp256k1: + type: string + format: byte + title: >- + PublicKey defines the keys available for + use with Validators + voting_power: + type: string + format: int64 + proposer_priority: + type: string + format: int64 + proposer: + type: object + properties: + address: + type: string + format: byte + pub_key: + type: object + properties: + ed25519: + type: string + format: byte + secp256k1: + type: string + format: byte + title: >- + PublicKey defines the keys available for + use with Validators + voting_power: + type: string + format: int64 + proposer_priority: + type: string + format: int64 + total_voting_power: + type: string + format: int64 + common_height: + type: string + format: int64 + byzantine_validators: + type: array + items: + type: object + properties: + address: + type: string + format: byte + pub_key: + type: object + properties: + ed25519: + type: string + format: byte + secp256k1: + type: string + format: byte + title: >- + PublicKey defines the keys available for + use with Validators + voting_power: + type: string + format: int64 + proposer_priority: + type: string + format: int64 + total_voting_power: + type: string + format: int64 + timestamp: + type: string + format: date-time + description: >- + LightClientAttackEvidence contains evidence of a + set of validators attempting to mislead a light + client. + last_commit: + type: object + properties: + height: + type: string + format: int64 + round: + type: integer + format: int32 + block_id: + type: object + properties: + hash: + type: string + format: byte + part_set_header: + type: object + properties: + total: + type: integer + format: int64 + hash: + type: string + format: byte + title: PartsetHeader + title: BlockID + signatures: + type: array + items: + type: object + properties: + block_id_flag: + type: string + enum: + - BLOCK_ID_FLAG_UNKNOWN + - BLOCK_ID_FLAG_ABSENT + - BLOCK_ID_FLAG_COMMIT + - BLOCK_ID_FLAG_NIL + default: BLOCK_ID_FLAG_UNKNOWN + title: >- + BlockIdFlag indicates which BlcokID the + signature is for + validator_address: + type: string + format: byte + timestamp: + type: string + format: date-time + signature: + type: string + format: byte + description: >- + CommitSig is a part of the Vote included in a + Commit. + description: >- + Commit contains the evidence that a block was committed by + a set of validators. + sdk_block: + title: 'Since: cosmos-sdk 0.47' + type: object + properties: + header: + type: object + properties: + version: + title: basic block info + type: object + properties: + block: + type: string + format: uint64 + app: + type: string + format: uint64 + description: >- + Consensus captures the consensus rules for processing + a block in the blockchain, - Example 1: Pack and unpack a message in C++. + including all blockchain data structures and the rules + of the application's - Foo foo = ...; - Any any; - any.PackFrom(foo); - ... - if (any.UnpackTo(&foo)) { - ... - } + state transition machine. + chain_id: + type: string + height: + type: string + format: int64 + time: + type: string + format: date-time + last_block_id: + type: object + properties: + hash: + type: string + format: byte + part_set_header: + type: object + properties: + total: + type: integer + format: int64 + hash: + type: string + format: byte + title: PartsetHeader + title: BlockID + last_commit_hash: + type: string + format: byte + description: commit from validators from the last block + title: hashes of block data + data_hash: + type: string + format: byte + title: transactions + validators_hash: + type: string + format: byte + description: validators for the current block + title: hashes from the app output from the prev block + next_validators_hash: + type: string + format: byte + title: validators for the next block + consensus_hash: + type: string + format: byte + title: consensus params for current block + app_hash: + type: string + format: byte + title: state after txs from the previous block + last_results_hash: + type: string + format: byte + title: >- + root hash of all results from the txs from the + previous block + evidence_hash: + type: string + format: byte + description: evidence included in the block + title: consensus info + proposer_address: + type: string + description: >- + proposer_address is the original block proposer + address, formatted as a Bech32 string. - Example 2: Pack and unpack a message in Java. + In Tendermint, this type is `bytes`, but in the SDK, + we convert it to a Bech32 string - Foo foo = ...; - Any any = Any.pack(foo); - ... - if (any.is(Foo.class)) { - foo = any.unpack(Foo.class); - } + for better UX. - Example 3: Pack and unpack a message in Python. - foo = Foo(...) - any = Any() - any.Pack(foo) - ... - if any.Is(Foo.DESCRIPTOR): - any.Unpack(foo) - ... + original proposer of the block + description: Header defines the structure of a Tendermint block header. + data: + type: object + properties: + txs: + type: array + items: + type: string + format: byte + description: >- + Txs that will be applied by state @ block.Height+1. - Example 4: Pack and unpack a message in Go + NOTE: not all txs here are valid. We're just agreeing + on the order first. - foo := &pb.Foo{...} - any, err := anypb.New(foo) - if err != nil { - ... - } - ... - foo := &pb.Foo{} - if err := any.UnmarshalTo(foo); err != nil { - ... - } - - The pack methods provided by protobuf library will by - default use + This means that block.AppHash does not include these + txs. + title: >- + Data contains the set of transactions included in the + block + evidence: + type: object + properties: + evidence: + type: array + items: + type: object + properties: + duplicate_vote_evidence: + type: object + properties: + vote_a: + type: object + properties: + type: + type: string + enum: + - SIGNED_MSG_TYPE_UNKNOWN + - SIGNED_MSG_TYPE_PREVOTE + - SIGNED_MSG_TYPE_PRECOMMIT + - SIGNED_MSG_TYPE_PROPOSAL + default: SIGNED_MSG_TYPE_UNKNOWN + description: >- + SignedMsgType is a type of signed + message in the consensus. - 'type.googleapis.com/full.type.name' as the type URL and the - unpack + - SIGNED_MSG_TYPE_PREVOTE: Votes + - SIGNED_MSG_TYPE_PROPOSAL: Proposals + height: + type: string + format: int64 + round: + type: integer + format: int32 + block_id: + type: object + properties: + hash: + type: string + format: byte + part_set_header: + type: object + properties: + total: + type: integer + format: int64 + hash: + type: string + format: byte + title: PartsetHeader + title: BlockID + description: zero if vote is nil. + timestamp: + type: string + format: date-time + validator_address: + type: string + format: byte + validator_index: + type: integer + format: int32 + signature: + type: string + format: byte + description: >- + Vote represents a prevote, precommit, or + commit vote from validators for - methods only use the fully qualified type name after the - last '/' + consensus. + vote_b: + type: object + properties: + type: + type: string + enum: + - SIGNED_MSG_TYPE_UNKNOWN + - SIGNED_MSG_TYPE_PREVOTE + - SIGNED_MSG_TYPE_PRECOMMIT + - SIGNED_MSG_TYPE_PROPOSAL + default: SIGNED_MSG_TYPE_UNKNOWN + description: >- + SignedMsgType is a type of signed + message in the consensus. - in the type URL, for example "foo.bar.com/x/y.z" will yield - type + - SIGNED_MSG_TYPE_PREVOTE: Votes + - SIGNED_MSG_TYPE_PROPOSAL: Proposals + height: + type: string + format: int64 + round: + type: integer + format: int32 + block_id: + type: object + properties: + hash: + type: string + format: byte + part_set_header: + type: object + properties: + total: + type: integer + format: int64 + hash: + type: string + format: byte + title: PartsetHeader + title: BlockID + description: zero if vote is nil. + timestamp: + type: string + format: date-time + validator_address: + type: string + format: byte + validator_index: + type: integer + format: int32 + signature: + type: string + format: byte + description: >- + Vote represents a prevote, precommit, or + commit vote from validators for - name "y.z". + consensus. + total_voting_power: + type: string + format: int64 + validator_power: + type: string + format: int64 + timestamp: + type: string + format: date-time + description: >- + DuplicateVoteEvidence contains evidence of a + validator signed two conflicting votes. + light_client_attack_evidence: + type: object + properties: + conflicting_block: + type: object + properties: + signed_header: + type: object + properties: + header: + type: object + properties: + version: + title: basic block info + type: object + properties: + block: + type: string + format: uint64 + app: + type: string + format: uint64 + description: >- + Consensus captures the consensus rules + for processing a block in the + blockchain, + including all blockchain data structures + and the rules of the application's + state transition machine. + chain_id: + type: string + height: + type: string + format: int64 + time: + type: string + format: date-time + last_block_id: + type: object + properties: + hash: + type: string + format: byte + part_set_header: + type: object + properties: + total: + type: integer + format: int64 + hash: + type: string + format: byte + title: PartsetHeader + title: BlockID + last_commit_hash: + type: string + format: byte + description: >- + commit from validators from the last + block + title: hashes of block data + data_hash: + type: string + format: byte + title: transactions + validators_hash: + type: string + format: byte + description: validators for the current block + title: >- + hashes from the app output from the prev + block + next_validators_hash: + type: string + format: byte + title: validators for the next block + consensus_hash: + type: string + format: byte + title: consensus params for current block + app_hash: + type: string + format: byte + title: state after txs from the previous block + last_results_hash: + type: string + format: byte + title: >- + root hash of all results from the txs + from the previous block + evidence_hash: + type: string + format: byte + description: evidence included in the block + title: consensus info + proposer_address: + type: string + format: byte + title: original proposer of the block + description: >- + Header defines the structure of a block + header. + commit: + type: object + properties: + height: + type: string + format: int64 + round: + type: integer + format: int32 + block_id: + type: object + properties: + hash: + type: string + format: byte + part_set_header: + type: object + properties: + total: + type: integer + format: int64 + hash: + type: string + format: byte + title: PartsetHeader + title: BlockID + signatures: + type: array + items: + type: object + properties: + block_id_flag: + type: string + enum: + - BLOCK_ID_FLAG_UNKNOWN + - BLOCK_ID_FLAG_ABSENT + - BLOCK_ID_FLAG_COMMIT + - BLOCK_ID_FLAG_NIL + default: BLOCK_ID_FLAG_UNKNOWN + title: >- + BlockIdFlag indicates which BlcokID the + signature is for + validator_address: + type: string + format: byte + timestamp: + type: string + format: date-time + signature: + type: string + format: byte + description: >- + CommitSig is a part of the Vote included + in a Commit. + description: >- + Commit contains the evidence that a + block was committed by a set of + validators. + validator_set: + type: object + properties: + validators: + type: array + items: + type: object + properties: + address: + type: string + format: byte + pub_key: + type: object + properties: + ed25519: + type: string + format: byte + secp256k1: + type: string + format: byte + title: >- + PublicKey defines the keys available for + use with Validators + voting_power: + type: string + format: int64 + proposer_priority: + type: string + format: int64 + proposer: + type: object + properties: + address: + type: string + format: byte + pub_key: + type: object + properties: + ed25519: + type: string + format: byte + secp256k1: + type: string + format: byte + title: >- + PublicKey defines the keys available for + use with Validators + voting_power: + type: string + format: int64 + proposer_priority: + type: string + format: int64 + total_voting_power: + type: string + format: int64 + common_height: + type: string + format: int64 + byzantine_validators: + type: array + items: + type: object + properties: + address: + type: string + format: byte + pub_key: + type: object + properties: + ed25519: + type: string + format: byte + secp256k1: + type: string + format: byte + title: >- + PublicKey defines the keys available for + use with Validators + voting_power: + type: string + format: int64 + proposer_priority: + type: string + format: int64 + total_voting_power: + type: string + format: int64 + timestamp: + type: string + format: date-time + description: >- + LightClientAttackEvidence contains evidence of a + set of validators attempting to mislead a light + client. + last_commit: + type: object + properties: + height: + type: string + format: int64 + round: + type: integer + format: int32 + block_id: + type: object + properties: + hash: + type: string + format: byte + part_set_header: + type: object + properties: + total: + type: integer + format: int64 + hash: + type: string + format: byte + title: PartsetHeader + title: BlockID + signatures: + type: array + items: + type: object + properties: + block_id_flag: + type: string + enum: + - BLOCK_ID_FLAG_UNKNOWN + - BLOCK_ID_FLAG_ABSENT + - BLOCK_ID_FLAG_COMMIT + - BLOCK_ID_FLAG_NIL + default: BLOCK_ID_FLAG_UNKNOWN + title: >- + BlockIdFlag indicates which BlcokID the + signature is for + validator_address: + type: string + format: byte + timestamp: + type: string + format: date-time + signature: + type: string + format: byte + description: >- + CommitSig is a part of the Vote included in a + Commit. + description: >- + Commit contains the evidence that a block was committed by + a set of validators. + description: >- + Block is tendermint type Block, with the Header proposer + address - JSON + field converted to bech32 string. + description: >- + GetBlockByHeightResponse is the response type for the + Query/GetBlockByHeight RPC method. + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type of + the serialized - ==== + protocol buffer message. This string must contain at + least - The JSON representation of an `Any` value uses the regular + one "/" character. The last segment of the URL's path + must represent - representation of the deserialized, embedded message, with - an + the fully qualified name of the type (as in - additional field `@type` which contains the type URL. - Example: + `path/google.protobuf.Duration`). The name should be in + a canonical form - package google.profile; - message Person { - string first_name = 1; - string last_name = 2; - } - - { - "@type": "type.googleapis.com/google.profile.Person", - "firstName": , - "lastName": - } - - If the embedded message type is well-known and has a custom - JSON - - representation, that representation will be embedded adding - a field - - `value` which holds the custom JSON in addition to the - `@type` - - field. Example (for message [google.protobuf.Duration][]): - - { - "@type": "type.googleapis.com/google.protobuf.Duration", - "value": "1.212s" - } - parameters: - - name: height - in: path - required: true - type: string - format: int64 - - name: pagination.key - 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. - in: query - required: false - type: string - format: byte - - name: pagination.offset - 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. - in: query - required: false - type: string - format: uint64 - - name: pagination.limit - 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. - in: query - required: false - type: string - format: uint64 - - name: pagination.count_total - 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 - required: false - type: boolean - - name: pagination.reverse - description: >- - reverse is set to true if results are to be returned in the - descending order. - - - Since: cosmos-sdk 0.43 - in: query - required: false - type: boolean - tags: - - Service - /cosmos/evidence/v1beta1/evidence: - get: - summary: AllEvidence queries all evidence. - operationId: CosmosEvidenceV1Beta1AllEvidence - responses: - '200': - description: A successful response. - schema: - type: object - properties: - evidence: - type: array - items: - type: object - properties: - '@type': - type: string - description: >- - A URL/resource name that uniquely identifies the type of - the serialized - - protocol buffer message. This string must contain at - least - - one "/" character. The last segment of the URL's path - must represent - - the fully qualified name of the type (as in - - `path/google.protobuf.Duration`). The name should be in - a canonical form - - (e.g., leading "." is not accepted). + (e.g., leading "." is not accepted). In practice, teams usually precompile into the binary @@ -7412,30 +8817,96 @@ paths: "@type": "type.googleapis.com/google.protobuf.Duration", "value": "1.212s" } - description: evidence returns all evidences. - pagination: - description: pagination defines the pagination in the response. + parameters: + - name: height + in: path + required: true + type: string + format: int64 + tags: + - Service + /cosmos/base/tendermint/v1beta1/node_info: + get: + summary: GetNodeInfo queries the current node info. + operationId: CosmosBaseTendermintV1Beta1GetNodeInfo + responses: + '200': + description: A successful response. + schema: + type: object + properties: + default_node_info: type: object properties: - next_key: + protocol_version: + type: object + properties: + p2p: + type: string + format: uint64 + block: + type: string + format: uint64 + app: + type: string + format: uint64 + default_node_id: + type: string + listen_addr: + type: string + network: + type: string + version: + type: string + channels: type: string format: byte - title: |- - next_key is the key to be passed to PageRequest.key to - query the next page most efficiently - total: + moniker: type: string - format: uint64 - title: >- - total is total number of results available if - PageRequest.count_total - - was set, its value is undefined otherwise + other: + type: object + properties: + tx_index: + type: string + rpc_address: + type: string + application_version: + type: object + properties: + name: + type: string + app_name: + type: string + version: + type: string + git_commit: + type: string + build_tags: + type: string + go_version: + type: string + build_deps: + type: array + items: + type: object + properties: + path: + type: string + title: module path + version: + type: string + title: module version + sum: + type: string + title: checksum + title: Module is the type for VersionInfo + cosmos_sdk_version: + type: string + title: 'Since: cosmos-sdk 0.43' + description: VersionInfo is the type for the GetNodeInfoResponse message. description: >- - QueryAllEvidenceResponse is the response type for the - Query/AllEvidence RPC - - method. + GetNodeInfoResponse is the response type for the Query/GetNodeInfo + RPC method. default: description: An unexpected error response. schema: @@ -7621,139 +9092,22 @@ paths: "@type": "type.googleapis.com/google.protobuf.Duration", "value": "1.212s" } - parameters: - - name: pagination.key - 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. - in: query - required: false - type: string - format: byte - - name: pagination.offset - 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. - in: query - required: false - type: string - format: uint64 - - name: pagination.limit - 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. - in: query - required: false - type: string - format: uint64 - - name: pagination.count_total - 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 - required: false - type: boolean - - name: pagination.reverse - description: >- - reverse is set to true if results are to be returned in the - descending order. - - - Since: cosmos-sdk 0.43 - in: query - required: false - type: boolean tags: - - Query - /cosmos/evidence/v1beta1/evidence/{evidence_hash}: + - Service + /cosmos/base/tendermint/v1beta1/syncing: get: - summary: Evidence queries evidence based on evidence hash. - operationId: CosmosEvidenceV1Beta1Evidence + summary: GetSyncing queries node syncing. + operationId: CosmosBaseTendermintV1Beta1GetSyncing responses: '200': description: A successful response. schema: type: object properties: - evidence: - description: evidence returns the requested evidence. - type: object - properties: - '@type': - type: string - description: >- - A URL/resource name that uniquely identifies the type of - the serialized - - protocol buffer message. This string must contain at least - - one "/" character. The last segment of the URL's path must - represent - - the fully qualified name of the type (as in - - `path/google.protobuf.Duration`). The name should be in a - canonical form - - (e.g., leading "." is not accepted). - - - In practice, teams usually precompile into the binary all - types that they - - expect it to use in the context of Any. However, for URLs - which use the - - scheme `http`, `https`, or no scheme, one can optionally - set up a type - - server that maps type URLs to message definitions as - follows: - - - * If no scheme is provided, `https` is assumed. - - * An HTTP GET on the URL must yield a - [google.protobuf.Type][] - value in binary format, or produce an error. - * Applications are allowed to cache lookup results based - on the - URL, or have them precompiled into a binary to avoid any - lookup. Therefore, binary compatibility needs to be preserved - on changes to types. (Use versioned type names to manage - breaking changes.) - - Note: this functionality is not currently available in the - official - - protobuf release, and it is not used for type URLs - beginning with - - type.googleapis.com. - - - Schemes other than `http`, `https` (or the empty scheme) - might be - - used with implementation specific semantics. - additionalProperties: {} + syncing: + type: boolean description: >- - QueryEvidenceResponse is the response type for the Query/Evidence + GetSyncingResponse is the response type for the Query/GetSyncing RPC method. default: description: An unexpected error response. @@ -7940,404 +9294,210 @@ paths: "@type": "type.googleapis.com/google.protobuf.Duration", "value": "1.212s" } - parameters: - - name: evidence_hash - description: evidence_hash defines the hash of the requested evidence. - in: path - required: true - type: string - format: byte tags: - - Query - /cosmos/feegrant/v1beta1/allowance/{granter}/{grantee}: + - Service + /cosmos/base/tendermint/v1beta1/validatorsets/latest: get: - summary: Allowance returns fee granted to the grantee by the granter. - operationId: CosmosFeegrantV1Beta1Allowance + summary: GetLatestValidatorSet queries latest validator-set. + operationId: CosmosBaseTendermintV1Beta1GetLatestValidatorSet responses: '200': description: A successful response. schema: type: object properties: - allowance: - description: allowance is a allowance granted for grantee by granter. - type: object - properties: - granter: - type: string - description: >- - granter is the address of the user granting an allowance - of their funds. - grantee: - type: string - description: >- - grantee is the address of the user being granted an - allowance of another user's funds. - allowance: - description: allowance can be any of basic and filtered fee allowance. - type: object - properties: - '@type': - type: string - description: >- - A URL/resource name that uniquely identifies the type - of the serialized + block_height: + type: string + format: int64 + validators: + type: array + items: + type: object + properties: + address: + type: string + pub_key: + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the + type of the serialized - protocol buffer message. This string must contain at - least + protocol buffer message. This string must contain at + least - one "/" character. The last segment of the URL's path - must represent + one "/" character. The last segment of the URL's + path must represent - the fully qualified name of the type (as in + the fully qualified name of the type (as in - `path/google.protobuf.Duration`). The name should be - in a canonical form + `path/google.protobuf.Duration`). The name should be + in a canonical form - (e.g., leading "." is not accepted). + (e.g., leading "." is not accepted). - In practice, teams usually precompile into the binary - all types that they + In practice, teams usually precompile into the + binary all types that they - expect it to use in the context of Any. However, for - URLs which use the + expect it to use in the context of Any. However, for + URLs which use the - scheme `http`, `https`, or no scheme, one can - optionally set up a type + scheme `http`, `https`, or no scheme, one can + optionally set up a type - server that maps type URLs to message definitions as - follows: + server that maps type URLs to message definitions as + follows: - * If no scheme is provided, `https` is assumed. + * If no scheme is provided, `https` is assumed. - * An HTTP GET on the URL must yield a - [google.protobuf.Type][] - value in binary format, or produce an error. - * Applications are allowed to cache lookup results - based on the - URL, or have them precompiled into a binary to avoid any - lookup. Therefore, binary compatibility needs to be preserved - on changes to types. (Use versioned type names to manage - breaking changes.) + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results + based on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) - Note: this functionality is not currently available in - the official + Note: this functionality is not currently available + in the official - protobuf release, and it is not used for type URLs - beginning with + protobuf release, and it is not used for type URLs + beginning with - type.googleapis.com. + type.googleapis.com. - Schemes other than `http`, `https` (or the empty - scheme) might be + Schemes other than `http`, `https` (or the empty + scheme) might be - used with implementation specific semantics. - additionalProperties: {} - title: >- - Grant is stored in the KVStore to record a grant with full - context - description: >- - QueryAllowanceResponse is the response type for the - Query/Allowance RPC method. - default: - description: An unexpected error response. - schema: - type: object - properties: - code: - type: integer - format: int32 - message: - type: string - details: - type: array - items: - type: object - properties: - '@type': - type: string + used with implementation specific semantics. + additionalProperties: {} description: >- - A URL/resource name that uniquely identifies the type of - the serialized - - protocol buffer message. This string must contain at - least + `Any` contains an arbitrary serialized protocol buffer + message along with a - one "/" character. The last segment of the URL's path - must represent + URL that describes the type of the serialized message. - the fully qualified name of the type (as in - `path/google.protobuf.Duration`). The name should be in - a canonical form + Protobuf library provides support to pack/unpack Any + values in the form - (e.g., leading "." is not accepted). + of utility functions or additional generated methods of + the Any type. - In practice, teams usually precompile into the binary - all types that they + Example 1: Pack and unpack a message in C++. - expect it to use in the context of Any. However, for - URLs which use the - - scheme `http`, `https`, or no scheme, one can optionally - set up a type - - server that maps type URLs to message definitions as - follows: - - - * If no scheme is provided, `https` is assumed. - - * An HTTP GET on the URL must yield a - [google.protobuf.Type][] - value in binary format, or produce an error. - * Applications are allowed to cache lookup results based - on the - URL, or have them precompiled into a binary to avoid any - lookup. Therefore, binary compatibility needs to be preserved - on changes to types. (Use versioned type names to manage - breaking changes.) - - Note: this functionality is not currently available in - the official - - protobuf release, and it is not used for type URLs - beginning with - - type.googleapis.com. - - - Schemes other than `http`, `https` (or the empty scheme) - might be - - used with implementation specific semantics. - additionalProperties: {} - description: >- - `Any` contains an arbitrary serialized protocol buffer - message along with a - - URL that describes the type of the serialized message. - - - Protobuf library provides support to pack/unpack Any values - in the form - - of utility functions or additional generated methods of the - Any type. - - - Example 1: Pack and unpack a message in C++. - - Foo foo = ...; - Any any; - any.PackFrom(foo); - ... - if (any.UnpackTo(&foo)) { - ... - } + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } - Example 2: Pack and unpack a message in Java. + Example 2: Pack and unpack a message in Java. - Foo foo = ...; - Any any = Any.pack(foo); - ... - if (any.is(Foo.class)) { - foo = any.unpack(Foo.class); - } + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. - foo = Foo(...) - any = Any() - any.Pack(foo) - ... - if any.Is(Foo.DESCRIPTOR): - any.Unpack(foo) - ... + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go - foo := &pb.Foo{...} - any, err := anypb.New(foo) - if err != nil { - ... - } - ... - foo := &pb.Foo{} - if err := any.UnmarshalTo(foo); err != nil { - ... - } + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } - The pack methods provided by protobuf library will by - default use + The pack methods provided by protobuf library will by + default use - 'type.googleapis.com/full.type.name' as the type URL and the - unpack + 'type.googleapis.com/full.type.name' as the type URL and + the unpack - methods only use the fully qualified type name after the - last '/' + methods only use the fully qualified type name after the + last '/' - in the type URL, for example "foo.bar.com/x/y.z" will yield - type + in the type URL, for example "foo.bar.com/x/y.z" will + yield type - name "y.z". + name "y.z". - JSON + JSON - ==== + ==== - The JSON representation of an `Any` value uses the regular + The JSON representation of an `Any` value uses the + regular - representation of the deserialized, embedded message, with - an + representation of the deserialized, embedded message, + with an - additional field `@type` which contains the type URL. - Example: + additional field `@type` which contains the type URL. + Example: - package google.profile; - message Person { - string first_name = 1; - string last_name = 2; - } + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } - { - "@type": "type.googleapis.com/google.profile.Person", - "firstName": , - "lastName": - } + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } - If the embedded message type is well-known and has a custom - JSON + If the embedded message type is well-known and has a + custom JSON - representation, that representation will be embedded adding - a field + representation, that representation will be embedded + adding a field - `value` which holds the custom JSON in addition to the - `@type` + `value` which holds the custom JSON in addition to the + `@type` - field. Example (for message [google.protobuf.Duration][]): + field. Example (for message + [google.protobuf.Duration][]): - { - "@type": "type.googleapis.com/google.protobuf.Duration", - "value": "1.212s" - } - parameters: - - name: granter - description: >- - granter is the address of the user granting an allowance of their - funds. - in: path - required: true - type: string - - name: grantee - description: >- - grantee is the address of the user being granted an allowance of - another user's funds. - in: path - required: true - type: string - tags: - - Query - /cosmos/feegrant/v1beta1/allowances/{grantee}: - get: - summary: Allowances returns all the grants for address. - operationId: CosmosFeegrantV1Beta1Allowances - responses: - '200': - description: A successful response. - schema: - type: object - properties: - allowances: - type: array - items: - type: object - properties: - granter: + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + voting_power: type: string - description: >- - granter is the address of the user granting an allowance - of their funds. - grantee: + format: int64 + proposer_priority: type: string - description: >- - grantee is the address of the user being granted an - allowance of another user's funds. - allowance: - description: >- - allowance can be any of basic and filtered fee - allowance. - type: object - properties: - '@type': - type: string - description: >- - A URL/resource name that uniquely identifies the - type of the serialized - - protocol buffer message. This string must contain at - least - - one "/" character. The last segment of the URL's - path must represent - - the fully qualified name of the type (as in - - `path/google.protobuf.Duration`). The name should be - in a canonical form - - (e.g., leading "." is not accepted). - - - In practice, teams usually precompile into the - binary all types that they - - expect it to use in the context of Any. However, for - URLs which use the - - scheme `http`, `https`, or no scheme, one can - optionally set up a type - - server that maps type URLs to message definitions as - follows: - - - * If no scheme is provided, `https` is assumed. - - * An HTTP GET on the URL must yield a - [google.protobuf.Type][] - value in binary format, or produce an error. - * Applications are allowed to cache lookup results - based on the - URL, or have them precompiled into a binary to avoid any - lookup. Therefore, binary compatibility needs to be preserved - on changes to types. (Use versioned type names to manage - breaking changes.) - - Note: this functionality is not currently available - in the official - - protobuf release, and it is not used for type URLs - beginning with - - type.googleapis.com. - - - Schemes other than `http`, `https` (or the empty - scheme) might be - - used with implementation specific semantics. - additionalProperties: {} - title: >- - Grant is stored in the KVStore to record a grant with full - context - description: allowances are allowance's granted for grantee by granter. + format: int64 + description: Validator is the type for the validator-set. pagination: description: pagination defines an pagination for the response. type: object @@ -8345,9 +9505,10 @@ paths: next_key: type: string format: byte - title: |- + description: |- next_key is the key to be passed to PageRequest.key to - query the next page most efficiently + query the next page most efficiently. It will be empty if + there are no more results. total: type: string format: uint64 @@ -8357,8 +9518,8 @@ paths: was set, its value is undefined otherwise description: >- - QueryAllowancesResponse is the response type for the - Query/Allowances RPC method. + GetLatestValidatorSetResponse is the response type for the + Query/GetValidatorSetByHeight RPC method. default: description: An unexpected error response. schema: @@ -8545,10 +9706,6 @@ paths: "value": "1.212s" } parameters: - - name: grantee - in: path - required: true - type: string - name: pagination.key description: |- key is a value returned in PageResponse.next_key to begin @@ -8606,38 +9763,28 @@ paths: required: false type: boolean tags: - - Query - /cosmos/feegrant/v1beta1/issued/{granter}: + - Service + /cosmos/base/tendermint/v1beta1/validatorsets/{height}: get: - summary: |- - AllowancesByGranter returns all the grants given by an address - Since v0.46 - operationId: CosmosFeegrantV1Beta1AllowancesByGranter + summary: GetValidatorSetByHeight queries validator-set at a given height. + operationId: CosmosBaseTendermintV1Beta1GetValidatorSetByHeight responses: '200': description: A successful response. schema: type: object properties: - allowances: + block_height: + type: string + format: int64 + validators: type: array items: type: object properties: - granter: - type: string - description: >- - granter is the address of the user granting an allowance - of their funds. - grantee: + address: type: string - description: >- - grantee is the address of the user being granted an - allowance of another user's funds. - allowance: - description: >- - allowance can be any of basic and filtered fee - allowance. + pub_key: type: object properties: '@type': @@ -8699,10 +9846,126 @@ paths: used with implementation specific semantics. additionalProperties: {} - title: >- - Grant is stored in the KVStore to record a grant with full - context - description: allowances that have been issued by the granter. + description: >- + `Any` contains an arbitrary serialized protocol buffer + message along with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any + values in the form + + of utility functions or additional generated methods of + the Any type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by + default use + + 'type.googleapis.com/full.type.name' as the type URL and + the unpack + + methods only use the fully qualified type name after the + last '/' + + in the type URL, for example "foo.bar.com/x/y.z" will + yield type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the + regular + + representation of the deserialized, embedded message, + with an + + additional field `@type` which contains the type URL. + Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a + custom JSON + + representation, that representation will be embedded + adding a field + + `value` which holds the custom JSON in addition to the + `@type` + + field. Example (for message + [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + voting_power: + type: string + format: int64 + proposer_priority: + type: string + format: int64 + description: Validator is the type for the validator-set. pagination: description: pagination defines an pagination for the response. type: object @@ -8710,9 +9973,10 @@ paths: next_key: type: string format: byte - title: |- + description: |- next_key is the key to be passed to PageRequest.key to - query the next page most efficiently + query the next page most efficiently. It will be empty if + there are no more results. total: type: string format: uint64 @@ -8722,8 +9986,8 @@ paths: was set, its value is undefined otherwise description: >- - QueryAllowancesByGranterResponse is the response type for the - Query/AllowancesByGranter RPC method. + GetValidatorSetByHeightResponse is the response type for the + Query/GetValidatorSetByHeight RPC method. default: description: An unexpected error response. schema: @@ -8910,10 +10174,11 @@ paths: "value": "1.212s" } parameters: - - name: granter + - name: height in: path required: true type: string + format: int64 - name: pagination.key description: |- key is a value returned in PageResponse.next_key to begin @@ -8971,356 +10236,105 @@ paths: required: false type: boolean tags: - - Query - /cosmos/params/v1beta1/params: + - Service + /cosmos/consensus/v1/params: get: - summary: |- - Params queries a specific parameter of a module, given its subspace and - key. - operationId: CosmosParamsV1Beta1Params + summary: Params queries the parameters of x/consensus_param module. + operationId: CosmosConsensusV1Params responses: '200': description: A successful response. schema: type: object properties: - param: - description: param defines the queried parameter. + params: + description: >- + params are the tendermint consensus params stored in the + consensus module. + + Please note that `params.version` is not populated in this + response, it is + + tracked separately in the x/upgrade module. type: object properties: - subspace: - type: string - key: - type: string - value: - type: string - description: >- - QueryParamsResponse is response type for the Query/Params RPC - method. - default: - description: An unexpected error response. - schema: - type: object - properties: - code: - type: integer - format: int32 - message: - type: string - details: - type: array - items: - type: object - properties: - '@type': - type: string - additionalProperties: {} - parameters: - - name: subspace - description: subspace defines the module to query the parameter for. - in: query - required: false - type: string - - name: key - description: key defines the key of the parameter in the subspace. - in: query - required: false - type: string - tags: - - Query - /cosmos/slashing/v1beta1/params: - get: - summary: Params queries the parameters of slashing module - operationId: CosmosSlashingV1Beta1Params - responses: - '200': - description: A successful response. - schema: - type: object - properties: - params: - type: object - properties: - signed_blocks_window: - type: string - format: int64 - min_signed_per_window: - type: string - format: byte - downtime_jail_duration: - type: string - slash_fraction_double_sign: - type: string - format: byte - slash_fraction_downtime: - type: string - format: byte - description: >- - Params represents the parameters used for by the slashing - module. - title: >- - QueryParamsResponse is the response type for the Query/Params RPC - method - default: - description: An unexpected error response. - schema: - type: object - properties: - code: - type: integer - format: int32 - message: - type: string - details: - type: array - items: - type: object - properties: - '@type': - type: string - additionalProperties: {} - tags: - - Query - /cosmos/slashing/v1beta1/signing_infos: - get: - summary: SigningInfos queries signing info of all validators - operationId: CosmosSlashingV1Beta1SigningInfos - responses: - '200': - description: A successful response. - schema: - type: object - properties: - info: - type: array - items: - type: object - properties: - address: - type: string - start_height: - type: string - format: int64 - title: >- - Height at which validator was first a candidate OR was - unjailed - index_offset: - type: string - format: int64 - description: >- - Index which is incremented each time the validator was a - bonded - - in a block and may have signed a precommit or not. This - in conjunction with the - - `SignedBlocksWindow` param determines the index in the - `MissedBlocksBitArray`. - jailed_until: - type: string - format: date-time - description: >- - Timestamp until which the validator is jailed due to - liveness downtime. - tombstoned: - type: boolean - description: >- - Whether or not a validator has been tombstoned (killed - out of validator set). It is set - - once the validator commits an equivocation or for any - other configured misbehiavor. - missed_blocks_counter: - type: string - format: int64 - description: >- - A counter kept to avoid unnecessary array reads. - - Note that `Sum(MissedBlocksBitArray)` always equals - `MissedBlocksCounter`. - description: >- - ValidatorSigningInfo defines a validator's signing info for - monitoring their - - liveness activity. - title: info is the signing info of all validators - pagination: - type: object - properties: - next_key: - type: string - format: byte - title: |- - next_key is the key to be passed to PageRequest.key to - query the next page most efficiently - total: - type: string - format: uint64 - title: >- - total is total number of results available if - PageRequest.count_total - - was set, its value is undefined otherwise - 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; - } - title: >- - QuerySigningInfosResponse is the response type for the - Query/SigningInfos RPC - - method - default: - description: An unexpected error response. - schema: - type: object - properties: - code: - type: integer - format: int32 - message: - type: string - details: - type: array - items: - type: object - properties: - '@type': - type: string - additionalProperties: {} - parameters: - - name: pagination.key - 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. - in: query - required: false - type: string - format: byte - - name: pagination.offset - 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 + block: + type: object + properties: + max_bytes: + type: string + format: int64 + title: |- + Max block size, in bytes. + Note: must be greater than 0 + max_gas: + type: string + format: int64 + title: |- + Max gas per block. + Note: must be greater or equal to -1 + description: BlockParams contains limits on the block size. + evidence: + type: object + properties: + max_age_num_blocks: + type: string + format: int64 + description: >- + Max age of evidence, in blocks. - be set. - in: query - required: false - type: string - format: uint64 - - name: pagination.limit - 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. - in: query - required: false - type: string - format: uint64 - - name: pagination.count_total - description: >- - count_total is set to true to indicate that the result set should - include + The basic formula for calculating this is: + MaxAgeDuration / {average block - a count of the total number of items available for pagination in - UIs. + time}. + max_age_duration: + type: string + description: >- + Max age of evidence, in time. - count_total is only respected when offset is used. It is ignored - when key - is set. - in: query - required: false - type: boolean - - name: pagination.reverse - description: >- - reverse is set to true if results are to be returned in the - descending order. + It should correspond with an app's "unbonding period" + or other similar + mechanism for handling [Nothing-At-Stake - Since: cosmos-sdk 0.43 - in: query - required: false - type: boolean - tags: - - Query - /cosmos/slashing/v1beta1/signing_infos/{cons_address}: - get: - summary: SigningInfo queries the signing info of given cons address - operationId: CosmosSlashingV1Beta1SigningInfo - responses: - '200': - description: A successful response. - schema: - type: object - properties: - val_signing_info: - title: >- - val_signing_info is the signing info of requested val cons - address - type: object - properties: - address: - type: string - start_height: - type: string - format: int64 - title: >- - Height at which validator was first a candidate OR was - unjailed - index_offset: - type: string - format: int64 - description: >- - Index which is incremented each time the validator was a - bonded + attacks](https://github.com/ethereum/wiki/wiki/Proof-of-Stake-FAQ#what-is-the-nothing-at-stake-problem-and-how-can-it-be-fixed). + max_bytes: + type: string + format: int64 + title: >- + This sets the maximum size of total evidence in bytes + that can be committed in a single block. - in a block and may have signed a precommit or not. This in - conjunction with the + and should fall comfortably under the max block bytes. - `SignedBlocksWindow` param determines the index in the - `MissedBlocksBitArray`. - jailed_until: - type: string - format: date-time + Default is 1048576 or 1MB description: >- - Timestamp until which the validator is jailed due to - liveness downtime. - tombstoned: - type: boolean - description: >- - Whether or not a validator has been tombstoned (killed out - of validator set). It is set - - once the validator commits an equivocation or for any - other configured misbehiavor. - missed_blocks_counter: - type: string - format: int64 + EvidenceParams determine how we handle evidence of + malfeasance. + validator: + type: object + properties: + pub_key_types: + type: array + items: + type: string description: >- - A counter kept to avoid unnecessary array reads. - - Note that `Sum(MissedBlocksBitArray)` always equals - `MissedBlocksCounter`. - description: >- - ValidatorSigningInfo defines a validator's signing info for - monitoring their - - liveness activity. - title: >- - QuerySigningInfoResponse is the response type for the - Query/SigningInfo RPC + ValidatorParams restrict the public key types validators + can use. - method + NOTE: uses ABCI pubkey naming, not Amino names. + version: + type: object + properties: + app: + type: string + format: uint64 + description: VersionParams contains the ABCI application version. + description: >- + QueryParamsResponse defines the response type for querying + x/consensus parameters. default: description: An unexpected error response. schema: @@ -9339,107 +10353,19 @@ paths: '@type': type: string additionalProperties: {} - parameters: - - name: cons_address - description: cons_address is the address to query signing info of - in: path - required: true - type: string tags: - Query - /cosmos/tx/v1beta1/simulate: - post: - summary: Simulate simulates executing a transaction for estimating gas usage. - operationId: CosmosTxV1Beta1Simulate + /cosmos/evidence/v1beta1/evidence: + get: + summary: AllEvidence queries all evidence. + operationId: CosmosEvidenceV1Beta1AllEvidence responses: '200': description: A successful response. schema: type: object properties: - gas_info: - description: gas_info is the information about gas used in the simulation. - type: object - properties: - gas_wanted: - type: string - format: uint64 - description: >- - GasWanted is the maximum units of work we allow this tx to - perform. - gas_used: - type: string - format: uint64 - description: GasUsed is the amount of gas actually consumed. - result: - description: result is the result of the simulation. - type: object - properties: - data: - type: string - format: byte - description: >- - Data is any data returned from message or handler - execution. It MUST be - - length prefixed in order to separate data from multiple - message executions. - log: - type: string - description: >- - Log contains the log information from message or handler - execution. - events: - type: array - items: - type: object - properties: - type: - type: string - attributes: - type: array - items: - type: object - properties: - key: - type: string - format: byte - value: - type: string - format: byte - index: - type: boolean - title: nondeterministic - description: >- - EventAttribute is a single key-value pair, - associated with an event. - description: >- - Event allows application developers to attach additional - information to - - ResponseBeginBlock, ResponseEndBlock, ResponseCheckTx - and ResponseDeliverTx. - - Later, transactions may be queried using these events. - description: >- - Events contains a slice of Event objects that were emitted - during message - - or handler execution. - description: |- - SimulateResponse is the response type for the - Service.SimulateRPC method. - default: - description: An unexpected error response. - schema: - type: object - properties: - code: - type: integer - format: int32 - message: - type: string - details: + evidence: type: array items: type: object @@ -9614,26 +10540,31 @@ paths: "@type": "type.googleapis.com/google.protobuf.Duration", "value": "1.212s" } - parameters: - - name: body - description: |- - SimulateRequest is the request type for the Service.Simulate - RPC method. - in: body - required: true - schema: - $ref: '#/definitions/cosmos.tx.v1beta1.SimulateRequest' - tags: - - Service - /cosmos/tx/v1beta1/txs: - get: - summary: GetTxsEvent fetches txs by event. - operationId: CosmosTxV1Beta1GetTxsEvent - responses: - '200': - description: A successful response. - schema: - $ref: '#/definitions/cosmos.tx.v1beta1.GetTxsEventResponse' + description: evidence returns all evidences. + pagination: + description: pagination defines the pagination in the response. + type: object + properties: + next_key: + type: string + format: byte + 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. + total: + type: string + format: uint64 + title: >- + total is total number of results available if + PageRequest.count_total + + was set, its value is undefined otherwise + description: >- + QueryAllEvidenceResponse is the response type for the + Query/AllEvidence RPC + + method. default: description: An unexpected error response. schema: @@ -9820,14 +10751,6 @@ paths: "value": "1.212s" } parameters: - - name: events - description: events is the list of transaction event type. - in: query - required: false - type: array - items: - type: string - collectionFormat: multi - name: pagination.key description: |- key is a value returned in PageResponse.next_key to begin @@ -9884,240 +10807,83 @@ paths: in: query required: false type: boolean - - name: order_by - description: |2- - - ORDER_BY_UNSPECIFIED: ORDER_BY_UNSPECIFIED specifies an unknown sorting order. OrderBy defaults to ASC in this case. - - ORDER_BY_ASC: ORDER_BY_ASC defines ascending order - - ORDER_BY_DESC: ORDER_BY_DESC defines descending order - in: query - required: false - type: string - enum: - - ORDER_BY_UNSPECIFIED - - ORDER_BY_ASC - - ORDER_BY_DESC - default: ORDER_BY_UNSPECIFIED tags: - - Service - post: - summary: BroadcastTx broadcast transaction. - operationId: CosmosTxV1Beta1BroadcastTx + - Query + /cosmos/evidence/v1beta1/evidence/{hash}: + get: + summary: Evidence queries evidence based on evidence hash. + operationId: CosmosEvidenceV1Beta1Evidence responses: '200': description: A successful response. schema: type: object properties: - tx_response: - description: tx_response is the queried TxResponses. + evidence: + description: evidence returns the requested evidence. type: object properties: - height: - type: string - format: int64 - title: The block height - txhash: - type: string - description: The transaction hash. - codespace: + '@type': type: string - title: Namespace for the Code - code: - type: integer - format: int64 - description: Response code. - data: - type: string - description: Result bytes, if any. - raw_log: - type: string - description: >- - The output of the application's logger (raw string). May - be - - non-deterministic. - logs: - type: array - items: - type: object - properties: - msg_index: - type: integer - format: int64 - log: - type: string - events: - type: array - items: - type: object - properties: - type: - type: string - attributes: - type: array - items: - type: object - properties: - key: - type: string - value: - type: string - description: >- - Attribute defines an attribute wrapper where - the key and value are - - strings instead of raw bytes. - description: >- - StringEvent defines en Event object wrapper where - all the attributes - - contain key/value pairs that are strings instead - of raw bytes. - description: >- - Events contains a slice of Event objects that were - emitted during some - - execution. - description: >- - ABCIMessageLog defines a structure containing an indexed - tx ABCI message log. description: >- - The output of the application's logger (typed). May be - non-deterministic. - info: - type: string - description: Additional information. May be non-deterministic. - gas_wanted: - type: string - format: int64 - description: Amount of gas requested for transaction. - gas_used: - type: string - format: int64 - description: Amount of gas consumed by transaction. - tx: - description: The request transaction bytes. - type: object - properties: - '@type': - type: string - description: >- - A URL/resource name that uniquely identifies the type - of the serialized - - protocol buffer message. This string must contain at - least - - one "/" character. The last segment of the URL's path - must represent - - the fully qualified name of the type (as in - - `path/google.protobuf.Duration`). The name should be - in a canonical form - - (e.g., leading "." is not accepted). - - - In practice, teams usually precompile into the binary - all types that they - - expect it to use in the context of Any. However, for - URLs which use the - - scheme `http`, `https`, or no scheme, one can - optionally set up a type + A URL/resource name that uniquely identifies the type of + the serialized - server that maps type URLs to message definitions as - follows: + protocol buffer message. This string must contain at least + one "/" character. The last segment of the URL's path must + represent - * If no scheme is provided, `https` is assumed. + the fully qualified name of the type (as in - * An HTTP GET on the URL must yield a - [google.protobuf.Type][] - value in binary format, or produce an error. - * Applications are allowed to cache lookup results - based on the - URL, or have them precompiled into a binary to avoid any - lookup. Therefore, binary compatibility needs to be preserved - on changes to types. (Use versioned type names to manage - breaking changes.) + `path/google.protobuf.Duration`). The name should be in a + canonical form - Note: this functionality is not currently available in - the official + (e.g., leading "." is not accepted). - protobuf release, and it is not used for type URLs - beginning with - type.googleapis.com. + In practice, teams usually precompile into the binary all + types that they + expect it to use in the context of Any. However, for URLs + which use the - Schemes other than `http`, `https` (or the empty - scheme) might be + scheme `http`, `https`, or no scheme, one can optionally + set up a type - used with implementation specific semantics. - additionalProperties: {} - timestamp: - type: string - description: >- - Time of the previous block. For heights > 1, it's the - weighted median of + server that maps type URLs to message definitions as + follows: - the timestamps of the valid votes in the block.LastCommit. - For height == 1, - it's genesis time. - events: - type: array - items: - type: object - properties: - type: - type: string - attributes: - type: array - items: - type: object - properties: - key: - type: string - format: byte - value: - type: string - format: byte - index: - type: boolean - title: nondeterministic - description: >- - EventAttribute is a single key-value pair, - associated with an event. - description: >- - Event allows application developers to attach additional - information to + * If no scheme is provided, `https` is assumed. - ResponseBeginBlock, ResponseEndBlock, ResponseCheckTx - and ResponseDeliverTx. + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based + on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) - Later, transactions may be queried using these events. - description: >- - Events defines all the events emitted by processing a - transaction. Note, + Note: this functionality is not currently available in the + official - these events include those emitted by processing all the - messages and those + protobuf release, and it is not used for type URLs + beginning with - emitted from the ante handler. Whereas Logs contains the - events, with + type.googleapis.com. - additional metadata, emitted only by processing the - messages. + Schemes other than `http`, `https` (or the empty scheme) + might be - Since: cosmos-sdk 0.42.11, 0.44.5, 0.45 - description: |- - BroadcastTxResponse is the response type for the - Service.BroadcastTx method. + used with implementation specific semantics. + additionalProperties: {} + description: >- + QueryEvidenceResponse is the response type for the Query/Evidence + RPC method. default: description: An unexpected error response. schema: @@ -10304,57 +11070,119 @@ paths: "value": "1.212s" } parameters: - - name: body - description: >- - BroadcastTxRequest is the request type for the - Service.BroadcastTxRequest + - name: hash + description: |- + hash defines the evidence hash of the requested evidence. - RPC method. - in: body + Since: cosmos-sdk 0.47 + in: path required: true - schema: - type: object - properties: - tx_bytes: - type: string - format: byte - description: tx_bytes is the raw transaction. - mode: - type: string - enum: - - BROADCAST_MODE_UNSPECIFIED - - BROADCAST_MODE_BLOCK - - BROADCAST_MODE_SYNC - - BROADCAST_MODE_ASYNC - default: BROADCAST_MODE_UNSPECIFIED - description: >- - BroadcastMode specifies the broadcast mode for the - TxService.Broadcast RPC method. - - - BROADCAST_MODE_UNSPECIFIED: zero-value for mode ordering - - BROADCAST_MODE_BLOCK: BROADCAST_MODE_BLOCK defines a tx broadcasting mode where the client waits for - the tx to be committed in a block. - - BROADCAST_MODE_SYNC: BROADCAST_MODE_SYNC defines a tx broadcasting mode where the client waits for - a CheckTx execution response only. - - BROADCAST_MODE_ASYNC: BROADCAST_MODE_ASYNC defines a tx broadcasting mode where the client returns - immediately. - description: >- - BroadcastTxRequest is the request type for the - Service.BroadcastTxRequest - - RPC method. + type: string + - name: evidence_hash + description: |- + evidence_hash defines the hash of the requested evidence. + Deprecated: Use hash, a HEX encoded string, instead. + in: query + required: false + type: string + format: byte tags: - - Service - /cosmos/tx/v1beta1/txs/block/{height}: + - Query + /cosmos/feegrant/v1beta1/allowance/{granter}/{grantee}: get: - summary: GetBlockWithTxs fetches a block with decoded txs. - description: 'Since: cosmos-sdk 0.45.2' - operationId: CosmosTxV1Beta1GetBlockWithTxs + summary: Allowance returns fee granted to the grantee by the granter. + operationId: CosmosFeegrantV1Beta1Allowance responses: '200': description: A successful response. schema: - $ref: '#/definitions/cosmos.tx.v1beta1.GetBlockWithTxsResponse' + type: object + properties: + allowance: + description: allowance is a allowance granted for grantee by granter. + type: object + properties: + granter: + type: string + description: >- + granter is the address of the user granting an allowance + of their funds. + grantee: + type: string + description: >- + grantee is the address of the user being granted an + allowance of another user's funds. + allowance: + description: >- + allowance can be any of basic, periodic, allowed fee + allowance. + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type + of the serialized + + protocol buffer message. This string must contain at + least + + one "/" character. The last segment of the URL's path + must represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be + in a canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the binary + all types that they + + expect it to use in the context of Any. However, for + URLs which use the + + scheme `http`, `https`, or no scheme, one can + optionally set up a type + + server that maps type URLs to message definitions as + follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results + based on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in + the official + + protobuf release, and it is not used for type URLs + beginning with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty + scheme) might be + + used with implementation specific semantics. + additionalProperties: {} + title: >- + Grant is stored in the KVStore to record a grant with full + context + description: >- + QueryAllowanceResponse is the response type for the + Query/Allowance RPC method. default: description: An unexpected error response. schema: @@ -10541,291 +11369,138 @@ paths: "value": "1.212s" } parameters: - - name: height - description: height is the height of the block to query. + - name: granter + description: >- + granter is the address of the user granting an allowance of their + funds. in: path required: true type: string - format: int64 - - name: pagination.key - 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. - in: query - required: false - type: string - format: byte - - name: pagination.offset - 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. - in: query - required: false - type: string - format: uint64 - - name: pagination.limit + - name: grantee 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. - in: query - required: false + grantee is the address of the user being granted an allowance of + another user's funds. + in: path + required: true type: string - format: uint64 - - name: pagination.count_total - 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 - required: false - type: boolean - - name: pagination.reverse - description: >- - reverse is set to true if results are to be returned in the - descending order. - - - Since: cosmos-sdk 0.43 - in: query - required: false - type: boolean tags: - - Service - /cosmos/tx/v1beta1/txs/{hash}: + - Query + /cosmos/feegrant/v1beta1/allowances/{grantee}: get: - summary: GetTx fetches a tx by hash. - operationId: CosmosTxV1Beta1GetTx + summary: Allowances returns all the grants for address. + operationId: CosmosFeegrantV1Beta1Allowances responses: '200': description: A successful response. - schema: - $ref: '#/definitions/cosmos.tx.v1beta1.GetTxResponse' - default: - description: An unexpected error response. schema: type: object properties: - code: - type: integer - format: int32 - message: - type: string - details: + allowances: type: array items: type: object properties: - '@type': + granter: type: string description: >- - A URL/resource name that uniquely identifies the type of - the serialized - - protocol buffer message. This string must contain at - least + granter is the address of the user granting an allowance + of their funds. + grantee: + type: string + description: >- + grantee is the address of the user being granted an + allowance of another user's funds. + allowance: + description: >- + allowance can be any of basic, periodic, allowed fee + allowance. + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the + type of the serialized - one "/" character. The last segment of the URL's path - must represent + protocol buffer message. This string must contain at + least - the fully qualified name of the type (as in + one "/" character. The last segment of the URL's + path must represent - `path/google.protobuf.Duration`). The name should be in - a canonical form + the fully qualified name of the type (as in - (e.g., leading "." is not accepted). + `path/google.protobuf.Duration`). The name should be + in a canonical form + (e.g., leading "." is not accepted). - In practice, teams usually precompile into the binary - all types that they - expect it to use in the context of Any. However, for - URLs which use the + In practice, teams usually precompile into the + binary all types that they - scheme `http`, `https`, or no scheme, one can optionally - set up a type + expect it to use in the context of Any. However, for + URLs which use the - server that maps type URLs to message definitions as - follows: + scheme `http`, `https`, or no scheme, one can + optionally set up a type + server that maps type URLs to message definitions as + follows: - * If no scheme is provided, `https` is assumed. - * An HTTP GET on the URL must yield a - [google.protobuf.Type][] - value in binary format, or produce an error. - * Applications are allowed to cache lookup results based - on the - URL, or have them precompiled into a binary to avoid any - lookup. Therefore, binary compatibility needs to be preserved - on changes to types. (Use versioned type names to manage - breaking changes.) + * If no scheme is provided, `https` is assumed. - Note: this functionality is not currently available in - the official + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results + based on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) - protobuf release, and it is not used for type URLs - beginning with - - type.googleapis.com. - - - Schemes other than `http`, `https` (or the empty scheme) - might be - - used with implementation specific semantics. - additionalProperties: {} - description: >- - `Any` contains an arbitrary serialized protocol buffer - message along with a - - URL that describes the type of the serialized message. - - - Protobuf library provides support to pack/unpack Any values - in the form - - of utility functions or additional generated methods of the - Any type. - - - Example 1: Pack and unpack a message in C++. - - Foo foo = ...; - Any any; - any.PackFrom(foo); - ... - if (any.UnpackTo(&foo)) { - ... - } - - Example 2: Pack and unpack a message in Java. - - Foo foo = ...; - Any any = Any.pack(foo); - ... - if (any.is(Foo.class)) { - foo = any.unpack(Foo.class); - } - - Example 3: Pack and unpack a message in Python. - - foo = Foo(...) - any = Any() - any.Pack(foo) - ... - if any.Is(Foo.DESCRIPTOR): - any.Unpack(foo) - ... - - Example 4: Pack and unpack a message in Go - - foo := &pb.Foo{...} - any, err := anypb.New(foo) - if err != nil { - ... - } - ... - foo := &pb.Foo{} - if err := any.UnmarshalTo(foo); err != nil { - ... - } - - The pack methods provided by protobuf library will by - default use - - 'type.googleapis.com/full.type.name' as the type URL and the - unpack - - methods only use the fully qualified type name after the - last '/' - - in the type URL, for example "foo.bar.com/x/y.z" will yield - type - - name "y.z". - - - - JSON - - ==== - - The JSON representation of an `Any` value uses the regular - - representation of the deserialized, embedded message, with - an - - additional field `@type` which contains the type URL. - Example: - - package google.profile; - message Person { - string first_name = 1; - string last_name = 2; - } + Note: this functionality is not currently available + in the official - { - "@type": "type.googleapis.com/google.profile.Person", - "firstName": , - "lastName": - } + protobuf release, and it is not used for type URLs + beginning with - If the embedded message type is well-known and has a custom - JSON + type.googleapis.com. - representation, that representation will be embedded adding - a field - `value` which holds the custom JSON in addition to the - `@type` + Schemes other than `http`, `https` (or the empty + scheme) might be - field. Example (for message [google.protobuf.Duration][]): + used with implementation specific semantics. + additionalProperties: {} + title: >- + Grant is stored in the KVStore to record a grant with full + context + description: allowances are allowance's granted for grantee by granter. + pagination: + description: pagination defines an pagination for the response. + type: object + properties: + next_key: + type: string + format: byte + 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. + total: + type: string + format: uint64 + title: >- + total is total number of results available if + PageRequest.count_total - { - "@type": "type.googleapis.com/google.protobuf.Duration", - "value": "1.212s" - } - parameters: - - name: hash - description: hash is the tx hash to query, encoded as a hex string. - in: path - required: true - type: string - tags: - - Service - /cosmos/upgrade/v1beta1/applied_plan/{name}: - get: - summary: AppliedPlan queries a previously applied upgrade plan by its name. - operationId: CosmosUpgradeV1Beta1AppliedPlan - responses: - '200': - description: A successful response. - schema: - type: object - properties: - height: - type: string - format: int64 - description: height is the block height at which the plan was applied. + was set, its value is undefined otherwise description: >- - QueryAppliedPlanResponse is the response type for the - Query/AppliedPlan RPC - - method. + QueryAllowancesResponse is the response type for the + Query/Allowances RPC method. default: description: An unexpected error response. schema: @@ -11012,147 +11687,188 @@ paths: "value": "1.212s" } parameters: - - name: name - description: name is the name of the applied plan to query for. + - name: grantee in: path required: true type: string + - name: pagination.key + 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. + in: query + required: false + type: string + format: byte + - name: pagination.offset + 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. + in: query + required: false + type: string + format: uint64 + - name: pagination.limit + 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. + in: query + required: false + type: string + format: uint64 + - name: pagination.count_total + 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 + required: false + type: boolean + - name: pagination.reverse + description: >- + reverse is set to true if results are to be returned in the + descending order. + + + Since: cosmos-sdk 0.43 + in: query + required: false + type: boolean tags: - Query - /cosmos/upgrade/v1beta1/current_plan: + /cosmos/feegrant/v1beta1/issued/{granter}: get: - summary: CurrentPlan queries the current upgrade plan. - operationId: CosmosUpgradeV1Beta1CurrentPlan + summary: AllowancesByGranter returns all the grants given by an address + description: 'Since: cosmos-sdk 0.46' + operationId: CosmosFeegrantV1Beta1AllowancesByGranter responses: '200': description: A successful response. schema: type: object properties: - plan: - description: plan is the current upgrade plan. - type: object - properties: - name: - type: string - description: >- - Sets the name for the upgrade. This name will be used by - the upgraded - - version of the software to apply any special "on-upgrade" - commands during - - the first BeginBlock method after the upgrade is applied. - It is also used - - to detect whether a software version can handle a given - upgrade. If no - - upgrade handler with this name has been set in the - software, it will be - - assumed that the software is out-of-date when the upgrade - Time or Height is - - reached and the software will exit. - time: - type: string - format: date-time - description: >- - Deprecated: Time based upgrades have been deprecated. Time - based upgrade logic - - has been removed from the SDK. - - If this field is not empty, an error will be thrown. - height: - type: string - format: int64 - description: |- - The height at which the upgrade must be performed. - Only used if Time is not set. - info: - type: string - title: >- - Any application specific upgrade info to be included - on-chain - - such as a git commit that validators could automatically - upgrade to - upgraded_client_state: - description: >- - Deprecated: UpgradedClientState field has been deprecated. - IBC upgrade logic has been - - moved to the IBC module in the sub module 02-client. + allowances: + type: array + items: + type: object + properties: + granter: + type: string + description: >- + granter is the address of the user granting an allowance + of their funds. + grantee: + type: string + description: >- + grantee is the address of the user being granted an + allowance of another user's funds. + allowance: + description: >- + allowance can be any of basic, periodic, allowed fee + allowance. + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the + type of the serialized - If this field is not empty, an error will be thrown. - type: object - properties: - '@type': - type: string - description: >- - A URL/resource name that uniquely identifies the type - of the serialized + protocol buffer message. This string must contain at + least - protocol buffer message. This string must contain at - least + one "/" character. The last segment of the URL's + path must represent - one "/" character. The last segment of the URL's path - must represent + the fully qualified name of the type (as in - the fully qualified name of the type (as in + `path/google.protobuf.Duration`). The name should be + in a canonical form - `path/google.protobuf.Duration`). The name should be - in a canonical form + (e.g., leading "." is not accepted). - (e.g., leading "." is not accepted). + In practice, teams usually precompile into the + binary all types that they - In practice, teams usually precompile into the binary - all types that they + expect it to use in the context of Any. However, for + URLs which use the - expect it to use in the context of Any. However, for - URLs which use the + scheme `http`, `https`, or no scheme, one can + optionally set up a type - scheme `http`, `https`, or no scheme, one can - optionally set up a type + server that maps type URLs to message definitions as + follows: - server that maps type URLs to message definitions as - follows: + * If no scheme is provided, `https` is assumed. - * If no scheme is provided, `https` is assumed. + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results + based on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) - * An HTTP GET on the URL must yield a - [google.protobuf.Type][] - value in binary format, or produce an error. - * Applications are allowed to cache lookup results - based on the - URL, or have them precompiled into a binary to avoid any - lookup. Therefore, binary compatibility needs to be preserved - on changes to types. (Use versioned type names to manage - breaking changes.) + Note: this functionality is not currently available + in the official - Note: this functionality is not currently available in - the official + protobuf release, and it is not used for type URLs + beginning with - protobuf release, and it is not used for type URLs - beginning with + type.googleapis.com. - type.googleapis.com. + Schemes other than `http`, `https` (or the empty + scheme) might be - Schemes other than `http`, `https` (or the empty - scheme) might be + used with implementation specific semantics. + additionalProperties: {} + title: >- + Grant is stored in the KVStore to record a grant with full + context + description: allowances that have been issued by the granter. + pagination: + description: pagination defines an pagination for the response. + type: object + properties: + next_key: + type: string + format: byte + 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. + total: + type: string + format: uint64 + title: >- + total is total number of results available if + PageRequest.count_total - used with implementation specific semantics. - additionalProperties: {} + was set, its value is undefined otherwise description: >- - QueryCurrentPlanResponse is the response type for the - Query/CurrentPlan RPC + QueryAllowancesByGranterResponse is the response type for the + Query/AllowancesByGranter RPC method. - method. + + Since: cosmos-sdk 0.46 default: description: An unexpected error response. schema: @@ -11338,46 +12054,224 @@ paths: "@type": "type.googleapis.com/google.protobuf.Duration", "value": "1.212s" } + parameters: + - name: granter + in: path + required: true + type: string + - name: pagination.key + 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. + in: query + required: false + type: string + format: byte + - name: pagination.offset + 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. + in: query + required: false + type: string + format: uint64 + - name: pagination.limit + 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. + in: query + required: false + type: string + format: uint64 + - name: pagination.count_total + 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 + required: false + type: boolean + - name: pagination.reverse + description: >- + reverse is set to true if results are to be returned in the + descending order. + + + Since: cosmos-sdk 0.43 + in: query + required: false + type: boolean tags: - Query - /cosmos/upgrade/v1beta1/module_versions: + /cosmos/mint/v1beta1/annual_provisions: get: - summary: ModuleVersions queries the list of module versions from state. - description: 'Since: cosmos-sdk 0.43' - operationId: CosmosUpgradeV1Beta1ModuleVersions + summary: AnnualProvisions current minting annual provisions value. + operationId: CosmosMintV1Beta1AnnualProvisions responses: '200': description: A successful response. schema: type: object properties: - module_versions: + annual_provisions: + type: string + format: byte + description: >- + annual_provisions is the current minting annual provisions + value. + description: |- + QueryAnnualProvisionsResponse is the response type for the + Query/AnnualProvisions RPC method. + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: type: array items: type: object properties: - name: - type: string - title: name of the app module - version: + '@type': type: string - format: uint64 - title: consensus version of the app module - description: |- - ModuleVersion specifies a module and its consensus version. - - Since: cosmos-sdk 0.43 - description: >- - module_versions is a list of module names with their consensus - versions. + additionalProperties: {} + tags: + - Query + /cosmos/mint/v1beta1/inflation: + get: + summary: Inflation returns the current minting inflation value. + operationId: CosmosMintV1Beta1Inflation + responses: + '200': + description: A successful response. + schema: + type: object + properties: + inflation: + type: string + format: byte + description: inflation is the current minting inflation value. description: >- - QueryModuleVersionsResponse is the response type for the - Query/ModuleVersions - - RPC method. - + QueryInflationResponse is the response type for the + Query/Inflation RPC - Since: cosmos-sdk 0.43 + method. + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + additionalProperties: {} + tags: + - Query + /cosmos/mint/v1beta1/params: + get: + summary: Params returns the total set of minting parameters. + operationId: CosmosMintV1Beta1Params + responses: + '200': + description: A successful response. + schema: + type: object + properties: + params: + description: params defines the parameters of the module. + type: object + properties: + mint_denom: + type: string + title: type of coin to mint + inflation_rate_change: + type: string + title: maximum annual change in inflation rate + inflation_max: + type: string + title: maximum inflation rate + inflation_min: + type: string + title: minimum inflation rate + goal_bonded: + type: string + title: goal of percent bonded atoms + blocks_per_year: + type: string + format: uint64 + title: expected blocks per year + description: >- + QueryParamsResponse is the response type for the Query/Params RPC + method. + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + additionalProperties: {} + tags: + - Query + /cosmos/nft/v1beta1/balance/{owner}/{class_id}: + get: + summary: >- + Balance queries the number of NFTs of a given class owned by the owner, + same as balanceOf in ERC721 + operationId: CosmosNftV1Beta1Balance + responses: + '200': + description: A successful response. + schema: + type: object + properties: + amount: + type: string + format: uint64 + title: >- + amount is the number of all NFTs of a given class owned by the + owner + title: >- + QueryBalanceResponse is the response type for the Query/Balance + RPC method default: description: An unexpected error response. schema: @@ -11564,298 +12458,245 @@ paths: "value": "1.212s" } parameters: - - name: module_name - description: |- - module_name is a field to query a specific module - consensus version from state. Leaving this empty will - fetch the full list of module versions from state - in: query - required: false + - name: owner + description: owner is the owner address of the nft + in: path + required: true + type: string + - name: class_id + description: class_id associated with the nft + in: path + required: true type: string tags: - Query - /cosmos/upgrade/v1beta1/upgraded_consensus_state/{last_height}: + /cosmos/nft/v1beta1/classes: get: - summary: >- - UpgradedConsensusState queries the consensus state that will serve - - as a trusted kernel for the next version of this chain. It will only be - - stored at the last height of this chain. - - UpgradedConsensusState RPC not supported with legacy querier - - This rpc is deprecated now that IBC has its own replacement - - (https://github.com/cosmos/ibc-go/blob/2c880a22e9f9cc75f62b527ca94aa75ce1106001/proto/ibc/core/client/v1/query.proto#L54) - operationId: CosmosUpgradeV1Beta1UpgradedConsensusState + summary: Classes queries all NFT classes + operationId: CosmosNftV1Beta1Classes responses: '200': description: A successful response. schema: type: object properties: - upgraded_consensus_state: - type: string - format: byte - title: 'Since: cosmos-sdk 0.43' - description: >- - QueryUpgradedConsensusStateResponse is the response type for the - Query/UpgradedConsensusState - - RPC method. - default: - description: An unexpected error response. - schema: - type: object - properties: - code: - type: integer - format: int32 - message: - type: string - details: + classes: type: array items: type: object properties: - '@type': + id: type: string - description: >- - A URL/resource name that uniquely identifies the type of - the serialized + title: >- + id defines the unique identifier of the NFT + classification, similar to the contract address of + ERC721 + name: + type: string + title: >- + name defines the human-readable name of the NFT + classification. Optional + symbol: + type: string + title: >- + symbol is an abbreviated name for nft classification. + Optional + description: + type: string + title: >- + description is a brief description of nft + classification. Optional + uri: + type: string + title: >- + uri for the class metadata stored off chain. It can + define schema for Class and NFT `Data` attributes. + Optional + uri_hash: + type: string + title: >- + uri_hash is a hash of the document pointed by uri. + Optional + data: + title: >- + data is the app specific metadata of the NFT class. + Optional + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the + type of the serialized - protocol buffer message. This string must contain at - least + protocol buffer message. This string must contain at + least - one "/" character. The last segment of the URL's path - must represent + one "/" character. The last segment of the URL's + path must represent - the fully qualified name of the type (as in + the fully qualified name of the type (as in - `path/google.protobuf.Duration`). The name should be in - a canonical form + `path/google.protobuf.Duration`). The name should be + in a canonical form - (e.g., leading "." is not accepted). + (e.g., leading "." is not accepted). - In practice, teams usually precompile into the binary - all types that they + In practice, teams usually precompile into the + binary all types that they - expect it to use in the context of Any. However, for - URLs which use the + expect it to use in the context of Any. However, for + URLs which use the - scheme `http`, `https`, or no scheme, one can optionally - set up a type + scheme `http`, `https`, or no scheme, one can + optionally set up a type - server that maps type URLs to message definitions as - follows: + server that maps type URLs to message definitions as + follows: - * If no scheme is provided, `https` is assumed. + * If no scheme is provided, `https` is assumed. - * An HTTP GET on the URL must yield a - [google.protobuf.Type][] - value in binary format, or produce an error. - * Applications are allowed to cache lookup results based - on the - URL, or have them precompiled into a binary to avoid any - lookup. Therefore, binary compatibility needs to be preserved - on changes to types. (Use versioned type names to manage - breaking changes.) + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results + based on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) - Note: this functionality is not currently available in - the official + Note: this functionality is not currently available + in the official - protobuf release, and it is not used for type URLs - beginning with + protobuf release, and it is not used for type URLs + beginning with - type.googleapis.com. + type.googleapis.com. - Schemes other than `http`, `https` (or the empty scheme) - might be + Schemes other than `http`, `https` (or the empty + scheme) might be - used with implementation specific semantics. - additionalProperties: {} - description: >- - `Any` contains an arbitrary serialized protocol buffer - message along with a + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer + message along with a - URL that describes the type of the serialized message. + URL that describes the type of the serialized message. - Protobuf library provides support to pack/unpack Any values - in the form + Protobuf library provides support to pack/unpack Any + values in the form - of utility functions or additional generated methods of the - Any type. + of utility functions or additional generated methods of + the Any type. - Example 1: Pack and unpack a message in C++. + Example 1: Pack and unpack a message in C++. - Foo foo = ...; - Any any; - any.PackFrom(foo); - ... - if (any.UnpackTo(&foo)) { - ... - } + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } - Example 2: Pack and unpack a message in Java. + Example 2: Pack and unpack a message in Java. - Foo foo = ...; - Any any = Any.pack(foo); - ... - if (any.is(Foo.class)) { - foo = any.unpack(Foo.class); - } + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. - foo = Foo(...) - any = Any() - any.Pack(foo) - ... - if any.Is(Foo.DESCRIPTOR): - any.Unpack(foo) - ... + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go - foo := &pb.Foo{...} - any, err := anypb.New(foo) - if err != nil { - ... - } - ... - foo := &pb.Foo{} - if err := any.UnmarshalTo(foo); err != nil { - ... - } + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } - The pack methods provided by protobuf library will by - default use + The pack methods provided by protobuf library will by + default use - 'type.googleapis.com/full.type.name' as the type URL and the - unpack + 'type.googleapis.com/full.type.name' as the type URL and + the unpack - methods only use the fully qualified type name after the - last '/' + methods only use the fully qualified type name after the + last '/' - in the type URL, for example "foo.bar.com/x/y.z" will yield - type + in the type URL, for example "foo.bar.com/x/y.z" will + yield type - name "y.z". + name "y.z". - JSON + JSON - ==== + ==== - The JSON representation of an `Any` value uses the regular + The JSON representation of an `Any` value uses the + regular - representation of the deserialized, embedded message, with - an + representation of the deserialized, embedded message, + with an - additional field `@type` which contains the type URL. - Example: + additional field `@type` which contains the type URL. + Example: - package google.profile; - message Person { - string first_name = 1; - string last_name = 2; - } + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } - { - "@type": "type.googleapis.com/google.profile.Person", - "firstName": , - "lastName": - } + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } - If the embedded message type is well-known and has a custom - JSON + If the embedded message type is well-known and has a + custom JSON - representation, that representation will be embedded adding - a field + representation, that representation will be embedded + adding a field - `value` which holds the custom JSON in addition to the - `@type` + `value` which holds the custom JSON in addition to the + `@type` - field. Example (for message [google.protobuf.Duration][]): + field. Example (for message + [google.protobuf.Duration][]): - { - "@type": "type.googleapis.com/google.protobuf.Duration", - "value": "1.212s" - } - parameters: - - name: last_height - description: |- - last height of the current chain must be sent in request - as this is the height under which next consensus state is stored - in: path - required: true - type: string - format: int64 - tags: - - Query - /cosmwasm/wasm/v1/code: - get: - summary: Codes gets the metadata for all stored wasm codes - operationId: CosmwasmWasmV1Codes - responses: - '200': - description: A successful response. - schema: - type: object - properties: - code_infos: - type: array - items: - type: object - properties: - code_id: - type: string - format: uint64 - title: id for legacy support - creator: - type: string - data_hash: - type: string - format: byte - instantiate_permission: - type: object - properties: - permission: - type: string - enum: - - ACCESS_TYPE_UNSPECIFIED - - ACCESS_TYPE_NOBODY - - ACCESS_TYPE_ONLY_ADDRESS - - ACCESS_TYPE_EVERYBODY - - ACCESS_TYPE_ANY_OF_ADDRESSES - default: ACCESS_TYPE_UNSPECIFIED - description: >- - - ACCESS_TYPE_UNSPECIFIED: AccessTypeUnspecified - placeholder for empty value - - ACCESS_TYPE_NOBODY: AccessTypeNobody forbidden - - ACCESS_TYPE_ONLY_ADDRESS: AccessTypeOnlyAddress restricted to a single address - Deprecated: use AccessTypeAnyOfAddresses instead - - ACCESS_TYPE_EVERYBODY: AccessTypeEverybody unrestricted - - ACCESS_TYPE_ANY_OF_ADDRESSES: AccessTypeAnyOfAddresses allow any of the addresses - title: AccessType permission types - address: - type: string - title: |- - Address - Deprecated: replaced by addresses - addresses: - type: array - items: - type: string - description: AccessConfig access control type. - title: CodeInfoResponse contains code meta data from CodeInfo + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + description: Class defines the class of the nft type. + description: class defines the class of the nft type. pagination: description: pagination defines the pagination in the response. type: object @@ -11863,9 +12704,10 @@ paths: next_key: type: string format: byte - title: |- + description: |- next_key is the key to be passed to PageRequest.key to - query the next page most efficiently + query the next page most efficiently. It will be empty if + there are no more results. total: type: string format: uint64 @@ -11875,8 +12717,8 @@ paths: was set, its value is undefined otherwise title: >- - QueryCodesResponse is the response type for the Query/Codes RPC - method + QueryClassesResponse is the response type for the Query/Classes + RPC method default: description: An unexpected error response. schema: @@ -12121,65 +12963,228 @@ paths: type: boolean tags: - Query - /cosmwasm/wasm/v1/code/{code_id}: + /cosmos/nft/v1beta1/classes/{class_id}: get: - summary: Code gets the binary code and metadata for a singe wasm code - operationId: CosmwasmWasmV1Code + summary: Class queries an NFT class based on its id + operationId: CosmosNftV1Beta1Class responses: '200': description: A successful response. schema: type: object properties: - code_info: + class: + description: class defines the class of the nft type. type: object properties: - code_id: + id: type: string - format: uint64 - title: id for legacy support - creator: + title: >- + id defines the unique identifier of the NFT + classification, similar to the contract address of ERC721 + name: type: string - data_hash: + title: >- + name defines the human-readable name of the NFT + classification. Optional + symbol: type: string - format: byte - instantiate_permission: + title: >- + symbol is an abbreviated name for nft classification. + Optional + description: + type: string + title: >- + description is a brief description of nft classification. + Optional + uri: + type: string + title: >- + uri for the class metadata stored off chain. It can define + schema for Class and NFT `Data` attributes. Optional + uri_hash: + type: string + title: >- + uri_hash is a hash of the document pointed by uri. + Optional + data: + title: >- + data is the app specific metadata of the NFT class. + Optional type: object properties: - permission: + '@type': type: string - enum: - - ACCESS_TYPE_UNSPECIFIED - - ACCESS_TYPE_NOBODY - - ACCESS_TYPE_ONLY_ADDRESS - - ACCESS_TYPE_EVERYBODY - - ACCESS_TYPE_ANY_OF_ADDRESSES - default: ACCESS_TYPE_UNSPECIFIED description: >- - - ACCESS_TYPE_UNSPECIFIED: AccessTypeUnspecified - placeholder for empty value - - ACCESS_TYPE_NOBODY: AccessTypeNobody forbidden - - ACCESS_TYPE_ONLY_ADDRESS: AccessTypeOnlyAddress restricted to a single address - Deprecated: use AccessTypeAnyOfAddresses instead - - ACCESS_TYPE_EVERYBODY: AccessTypeEverybody unrestricted - - ACCESS_TYPE_ANY_OF_ADDRESSES: AccessTypeAnyOfAddresses allow any of the addresses - title: AccessType permission types - address: - type: string - title: |- - Address - Deprecated: replaced by addresses - addresses: - type: array - items: - type: string - description: AccessConfig access control type. - title: CodeInfoResponse contains code meta data from CodeInfo - data: - type: string - format: byte + A URL/resource name that uniquely identifies the type + of the serialized + + protocol buffer message. This string must contain at + least + + one "/" character. The last segment of the URL's path + must represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be + in a canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the binary + all types that they + + expect it to use in the context of Any. However, for + URLs which use the + + scheme `http`, `https`, or no scheme, one can + optionally set up a type + + server that maps type URLs to message definitions as + follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results + based on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in + the official + + protobuf release, and it is not used for type URLs + beginning with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty + scheme) might be + + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer + message along with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any + values in the form + + of utility functions or additional generated methods of + the Any type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by + default use + + 'type.googleapis.com/full.type.name' as the type URL and + the unpack + + methods only use the fully qualified type name after the + last '/' + + in the type URL, for example "foo.bar.com/x/y.z" will + yield type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the regular + + representation of the deserialized, embedded message, with + an + + additional field `@type` which contains the type URL. + Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a + custom JSON + + representation, that representation will be embedded + adding a field + + `value` which holds the custom JSON in addition to the + `@type` + + field. Example (for message [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } title: >- - QueryCodeResponse is the response type for the Query/Code RPC + QueryClassResponse is the response type for the Query/Class RPC method default: description: An unexpected error response. @@ -12367,29 +13372,224 @@ paths: "value": "1.212s" } parameters: - - name: code_id - description: grpc-gateway_out does not support Go style CodID + - name: class_id + description: class_id associated with the nft in: path required: true type: string - format: uint64 tags: - Query - /cosmwasm/wasm/v1/code/{code_id}/contracts: + /cosmos/nft/v1beta1/nfts: get: - summary: ContractsByCode lists all smart contracts for a code id - operationId: CosmwasmWasmV1ContractsByCode + summary: >- + NFTs queries all NFTs of a given class or owner,choose at least one of + the two, similar to tokenByIndex in + + ERC721Enumerable + operationId: CosmosNftV1Beta1NFTs responses: '200': description: A successful response. schema: type: object properties: - contracts: + nfts: type: array items: - type: string - title: contracts are a set of contract addresses + type: object + properties: + class_id: + type: string + title: >- + class_id associated with the NFT, similar to the + contract address of ERC721 + id: + type: string + title: id is a unique identifier of the NFT + uri: + type: string + title: uri for the NFT metadata stored off chain + uri_hash: + type: string + title: uri_hash is a hash of the document pointed by uri + data: + title: data is an app specific data of the NFT. Optional + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the + type of the serialized + + protocol buffer message. This string must contain at + least + + one "/" character. The last segment of the URL's + path must represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be + in a canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the + binary all types that they + + expect it to use in the context of Any. However, for + URLs which use the + + scheme `http`, `https`, or no scheme, one can + optionally set up a type + + server that maps type URLs to message definitions as + follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results + based on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available + in the official + + protobuf release, and it is not used for type URLs + beginning with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty + scheme) might be + + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer + message along with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any + values in the form + + of utility functions or additional generated methods of + the Any type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by + default use + + 'type.googleapis.com/full.type.name' as the type URL and + the unpack + + methods only use the fully qualified type name after the + last '/' + + in the type URL, for example "foo.bar.com/x/y.z" will + yield type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the + regular + + representation of the deserialized, embedded message, + with an + + additional field `@type` which contains the type URL. + Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a + custom JSON + + representation, that representation will be embedded + adding a field + + `value` which holds the custom JSON in addition to the + `@type` + + field. Example (for message + [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + description: NFT defines the NFT. + title: NFT defines the NFT pagination: description: pagination defines the pagination in the response. type: object @@ -12397,9 +13597,10 @@ paths: next_key: type: string format: byte - title: |- + description: |- next_key is the key to be passed to PageRequest.key to - query the next page most efficiently + query the next page most efficiently. It will be empty if + there are no more results. total: type: string format: uint64 @@ -12408,9 +13609,9 @@ paths: PageRequest.count_total was set, its value is undefined otherwise - title: |- - QueryContractsByCodeResponse is the response type for the - Query/ContractsByCode RPC method + title: >- + QueryNFTsResponse is the response type for the Query/NFTs RPC + methods default: description: An unexpected error response. schema: @@ -12597,12 +13798,16 @@ paths: "value": "1.212s" } parameters: - - name: code_id - description: grpc-gateway_out does not support Go style CodID - in: path - required: true + - name: class_id + description: class_id associated with the nft + in: query + required: false + type: string + - name: owner + description: owner is the owner address of the nft + in: query + required: false type: string - format: uint64 - name: pagination.key description: |- key is a value returned in PageResponse.next_key to begin @@ -12661,295 +13866,210 @@ paths: type: boolean tags: - Query - /cosmwasm/wasm/v1/codes/params: + /cosmos/nft/v1beta1/nfts/{class_id}/{id}: get: - summary: Params gets the module params - operationId: CosmwasmWasmV1Params + summary: NFT queries an NFT based on its class and id. + operationId: CosmosNftV1Beta1NFT responses: '200': description: A successful response. schema: type: object properties: - params: - description: params defines the parameters of the module. + nft: + title: owner is the owner address of the nft type: object properties: - code_upload_access: + class_id: + type: string + title: >- + class_id associated with the NFT, similar to the contract + address of ERC721 + id: + type: string + title: id is a unique identifier of the NFT + uri: + type: string + title: uri for the NFT metadata stored off chain + uri_hash: + type: string + title: uri_hash is a hash of the document pointed by uri + data: + title: data is an app specific data of the NFT. Optional type: object properties: - permission: + '@type': type: string - enum: - - ACCESS_TYPE_UNSPECIFIED - - ACCESS_TYPE_NOBODY - - ACCESS_TYPE_ONLY_ADDRESS - - ACCESS_TYPE_EVERYBODY - - ACCESS_TYPE_ANY_OF_ADDRESSES - default: ACCESS_TYPE_UNSPECIFIED description: >- - - ACCESS_TYPE_UNSPECIFIED: AccessTypeUnspecified - placeholder for empty value - - ACCESS_TYPE_NOBODY: AccessTypeNobody forbidden - - ACCESS_TYPE_ONLY_ADDRESS: AccessTypeOnlyAddress restricted to a single address - Deprecated: use AccessTypeAnyOfAddresses instead - - ACCESS_TYPE_EVERYBODY: AccessTypeEverybody unrestricted - - ACCESS_TYPE_ANY_OF_ADDRESSES: AccessTypeAnyOfAddresses allow any of the addresses - title: AccessType permission types - address: - type: string - title: |- - Address - Deprecated: replaced by addresses - addresses: - type: array - items: - type: string - description: AccessConfig access control type. - instantiate_default_permission: - type: string - enum: - - ACCESS_TYPE_UNSPECIFIED - - ACCESS_TYPE_NOBODY - - ACCESS_TYPE_ONLY_ADDRESS - - ACCESS_TYPE_EVERYBODY - - ACCESS_TYPE_ANY_OF_ADDRESSES - default: ACCESS_TYPE_UNSPECIFIED - description: >- - - ACCESS_TYPE_UNSPECIFIED: AccessTypeUnspecified - placeholder for empty value - - ACCESS_TYPE_NOBODY: AccessTypeNobody forbidden - - ACCESS_TYPE_ONLY_ADDRESS: AccessTypeOnlyAddress restricted to a single address - Deprecated: use AccessTypeAnyOfAddresses instead - - ACCESS_TYPE_EVERYBODY: AccessTypeEverybody unrestricted - - ACCESS_TYPE_ANY_OF_ADDRESSES: AccessTypeAnyOfAddresses allow any of the addresses - title: AccessType permission types - description: >- - QueryParamsResponse is the response type for the Query/Params RPC - method. - default: - description: An unexpected error response. - schema: - type: object - properties: - code: - type: integer - format: int32 - message: - type: string - details: - type: array - items: - type: object - properties: - '@type': - type: string - description: >- - A URL/resource name that uniquely identifies the type of - the serialized - - protocol buffer message. This string must contain at - least + A URL/resource name that uniquely identifies the type + of the serialized - one "/" character. The last segment of the URL's path - must represent + protocol buffer message. This string must contain at + least - the fully qualified name of the type (as in + one "/" character. The last segment of the URL's path + must represent - `path/google.protobuf.Duration`). The name should be in - a canonical form + the fully qualified name of the type (as in - (e.g., leading "." is not accepted). + `path/google.protobuf.Duration`). The name should be + in a canonical form + (e.g., leading "." is not accepted). - In practice, teams usually precompile into the binary - all types that they - expect it to use in the context of Any. However, for - URLs which use the + In practice, teams usually precompile into the binary + all types that they - scheme `http`, `https`, or no scheme, one can optionally - set up a type + expect it to use in the context of Any. However, for + URLs which use the - server that maps type URLs to message definitions as - follows: + scheme `http`, `https`, or no scheme, one can + optionally set up a type + server that maps type URLs to message definitions as + follows: - * If no scheme is provided, `https` is assumed. - * An HTTP GET on the URL must yield a - [google.protobuf.Type][] - value in binary format, or produce an error. - * Applications are allowed to cache lookup results based - on the - URL, or have them precompiled into a binary to avoid any - lookup. Therefore, binary compatibility needs to be preserved - on changes to types. (Use versioned type names to manage - breaking changes.) + * If no scheme is provided, `https` is assumed. - Note: this functionality is not currently available in - the official + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results + based on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) - protobuf release, and it is not used for type URLs - beginning with + Note: this functionality is not currently available in + the official - type.googleapis.com. + protobuf release, and it is not used for type URLs + beginning with + + type.googleapis.com. - Schemes other than `http`, `https` (or the empty scheme) - might be + Schemes other than `http`, `https` (or the empty + scheme) might be - used with implementation specific semantics. - additionalProperties: {} - description: >- - `Any` contains an arbitrary serialized protocol buffer - message along with a + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer + message along with a - URL that describes the type of the serialized message. + URL that describes the type of the serialized message. - Protobuf library provides support to pack/unpack Any values - in the form + Protobuf library provides support to pack/unpack Any + values in the form - of utility functions or additional generated methods of the - Any type. + of utility functions or additional generated methods of + the Any type. - Example 1: Pack and unpack a message in C++. + Example 1: Pack and unpack a message in C++. - Foo foo = ...; - Any any; - any.PackFrom(foo); - ... - if (any.UnpackTo(&foo)) { + Foo foo = ...; + Any any; + any.PackFrom(foo); ... - } + if (any.UnpackTo(&foo)) { + ... + } - Example 2: Pack and unpack a message in Java. + Example 2: Pack and unpack a message in Java. - Foo foo = ...; - Any any = Any.pack(foo); - ... - if (any.is(Foo.class)) { - foo = any.unpack(Foo.class); - } + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. - foo = Foo(...) - any = Any() - any.Pack(foo) - ... - if any.Is(Foo.DESCRIPTOR): - any.Unpack(foo) + foo = Foo(...) + any = Any() + any.Pack(foo) ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go - foo := &pb.Foo{...} - any, err := anypb.New(foo) - if err != nil { - ... - } - ... - foo := &pb.Foo{} - if err := any.UnmarshalTo(foo); err != nil { + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } ... - } - - The pack methods provided by protobuf library will by - default use + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } - 'type.googleapis.com/full.type.name' as the type URL and the - unpack + The pack methods provided by protobuf library will by + default use - methods only use the fully qualified type name after the - last '/' + 'type.googleapis.com/full.type.name' as the type URL and + the unpack - in the type URL, for example "foo.bar.com/x/y.z" will yield - type + methods only use the fully qualified type name after the + last '/' - name "y.z". + in the type URL, for example "foo.bar.com/x/y.z" will + yield type + name "y.z". - JSON - ==== + JSON - The JSON representation of an `Any` value uses the regular + ==== - representation of the deserialized, embedded message, with - an + The JSON representation of an `Any` value uses the regular - additional field `@type` which contains the type URL. - Example: + representation of the deserialized, embedded message, with + an - package google.profile; - message Person { - string first_name = 1; - string last_name = 2; - } + additional field `@type` which contains the type URL. + Example: - { - "@type": "type.googleapis.com/google.profile.Person", - "firstName": , - "lastName": - } + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } - If the embedded message type is well-known and has a custom - JSON + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } - representation, that representation will be embedded adding - a field + If the embedded message type is well-known and has a + custom JSON - `value` which holds the custom JSON in addition to the - `@type` + representation, that representation will be embedded + adding a field - field. Example (for message [google.protobuf.Duration][]): + `value` which holds the custom JSON in addition to the + `@type` - { - "@type": "type.googleapis.com/google.protobuf.Duration", - "value": "1.212s" - } - tags: - - Query - /cosmwasm/wasm/v1/codes/pinned: - get: - summary: PinnedCodes gets the pinned code ids - operationId: CosmwasmWasmV1PinnedCodes - responses: - '200': - description: A successful response. - schema: - type: object - properties: - code_ids: - type: array - items: - type: string - format: uint64 - pagination: - description: pagination defines the pagination in the response. - type: object - properties: - next_key: - type: string - format: byte - title: |- - next_key is the key to be passed to PageRequest.key to - query the next page most efficiently - total: - type: string - format: uint64 - title: >- - total is total number of results available if - PageRequest.count_total + field. Example (for message [google.protobuf.Duration][]): - was set, its value is undefined otherwise - title: |- - QueryPinnedCodesResponse is the response type for the - Query/PinnedCodes RPC method + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + description: NFT defines the NFT. + title: QueryNFTResponse is the response type for the Query/NFT RPC method default: description: An unexpected error response. schema: @@ -13136,185 +14256,35 @@ paths: "value": "1.212s" } parameters: - - name: pagination.key - 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. - in: query - required: false - type: string - format: byte - - name: pagination.offset - 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. - in: query - required: false + - name: class_id + description: class_id associated with the nft + in: path + required: true type: string - format: uint64 - - name: pagination.limit - 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. - in: query - required: false + - name: id + description: id is a unique identifier of the NFT + in: path + required: true type: string - format: uint64 - - name: pagination.count_total - 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 - required: false - type: boolean - - name: pagination.reverse - description: >- - reverse is set to true if results are to be returned in the - descending order. - - - Since: cosmos-sdk 0.43 - in: query - required: false - type: boolean tags: - Query - /cosmwasm/wasm/v1/contract/{address}: + /cosmos/nft/v1beta1/owner/{class_id}/{id}: get: - summary: ContractInfo gets the contract meta data - operationId: CosmwasmWasmV1ContractInfo + summary: >- + Owner queries the owner of the NFT based on its class and id, same as + ownerOf in ERC721 + operationId: CosmosNftV1Beta1Owner responses: '200': description: A successful response. schema: type: object properties: - address: + owner: type: string - title: address is the address of the contract - contract_info: - type: object - properties: - code_id: - type: string - format: uint64 - title: CodeID is the reference to the stored Wasm code - creator: - type: string - title: Creator address who initially instantiated the contract - admin: - type: string - title: Admin is an optional address that can execute migrations - label: - type: string - description: >- - Label is optional metadata to be stored with a contract - instance. - created: - description: Created Tx position when the contract was instantiated. - type: object - properties: - block_height: - type: string - format: uint64 - title: BlockHeight is the block the contract was created at - tx_index: - type: string - format: uint64 - title: >- - TxIndex is a monotonic counter within the block - (actual transaction index, - - or gas consumed) - ibc_port_id: - type: string - extension: - description: >- - Extension is an extension point to store custom metadata - within the - - persistence model. - type: object - properties: - '@type': - type: string - description: >- - A URL/resource name that uniquely identifies the type - of the serialized - - protocol buffer message. This string must contain at - least - - one "/" character. The last segment of the URL's path - must represent - - the fully qualified name of the type (as in - - `path/google.protobuf.Duration`). The name should be - in a canonical form - - (e.g., leading "." is not accepted). - - - In practice, teams usually precompile into the binary - all types that they - - expect it to use in the context of Any. However, for - URLs which use the - - scheme `http`, `https`, or no scheme, one can - optionally set up a type - - server that maps type URLs to message definitions as - follows: - - - * If no scheme is provided, `https` is assumed. - - * An HTTP GET on the URL must yield a - [google.protobuf.Type][] - value in binary format, or produce an error. - * Applications are allowed to cache lookup results - based on the - URL, or have them precompiled into a binary to avoid any - lookup. Therefore, binary compatibility needs to be preserved - on changes to types. (Use versioned type names to manage - breaking changes.) - - Note: this functionality is not currently available in - the official - - protobuf release, and it is not used for type URLs - beginning with - - type.googleapis.com. - - - Schemes other than `http`, `https` (or the empty - scheme) might be - - used with implementation specific semantics. - additionalProperties: {} - title: ContractInfo stores a WASM contract instance + title: owner is the owner address of the nft title: >- - QueryContractInfoResponse is the response type for the - Query/ContractInfo RPC - + QueryOwnerResponse is the response type for the Query/Owner RPC method default: description: An unexpected error response. @@ -13502,91 +14472,37 @@ paths: "value": "1.212s" } parameters: - - name: address - description: address is the address of the contract to query + - name: class_id + description: class_id associated with the nft + in: path + required: true + type: string + - name: id + description: id is a unique identifier of the NFT in: path required: true type: string tags: - Query - /cosmwasm/wasm/v1/contract/{address}/history: + /cosmos/nft/v1beta1/supply/{class_id}: get: - summary: ContractHistory gets the contract code history - operationId: CosmwasmWasmV1ContractHistory + summary: >- + Supply queries the number of NFTs from the given class, same as + totalSupply of ERC721. + operationId: CosmosNftV1Beta1Supply responses: '200': description: A successful response. schema: type: object properties: - entries: - type: array - items: - type: object - properties: - operation: - type: string - enum: - - CONTRACT_CODE_HISTORY_OPERATION_TYPE_UNSPECIFIED - - CONTRACT_CODE_HISTORY_OPERATION_TYPE_INIT - - CONTRACT_CODE_HISTORY_OPERATION_TYPE_MIGRATE - - CONTRACT_CODE_HISTORY_OPERATION_TYPE_GENESIS - default: CONTRACT_CODE_HISTORY_OPERATION_TYPE_UNSPECIFIED - description: >- - - CONTRACT_CODE_HISTORY_OPERATION_TYPE_UNSPECIFIED: - ContractCodeHistoryOperationTypeUnspecified placeholder - for empty value - - CONTRACT_CODE_HISTORY_OPERATION_TYPE_INIT: ContractCodeHistoryOperationTypeInit on chain contract instantiation - - CONTRACT_CODE_HISTORY_OPERATION_TYPE_MIGRATE: ContractCodeHistoryOperationTypeMigrate code migration - - CONTRACT_CODE_HISTORY_OPERATION_TYPE_GENESIS: ContractCodeHistoryOperationTypeGenesis based on genesis data - title: >- - ContractCodeHistoryOperationType actions that caused a - code change - code_id: - type: string - format: uint64 - title: CodeID is the reference to the stored WASM code - updated: - description: Updated Tx position when the operation was executed. - type: object - properties: - block_height: - type: string - format: uint64 - title: BlockHeight is the block the contract was created at - tx_index: - type: string - format: uint64 - title: >- - TxIndex is a monotonic counter within the block - (actual transaction index, - - or gas consumed) - msg: - type: string - format: byte - description: ContractCodeHistoryEntry metadata to a contract. - pagination: - description: pagination defines the pagination in the response. - type: object - properties: - next_key: - type: string - format: byte - title: |- - next_key is the key to be passed to PageRequest.key to - query the next page most efficiently - total: - type: string - format: uint64 - title: >- - total is total number of results available if - PageRequest.count_total - - was set, its value is undefined otherwise - title: |- - QueryContractHistoryResponse is the response type for the - Query/ContractHistory RPC method + amount: + type: string + format: uint64 + title: amount is the number of all NFTs from the given class + title: >- + QuerySupplyResponse is the response type for the Query/Supply RPC + method default: description: An unexpected error response. schema: @@ -13773,41 +14689,327 @@ paths: "value": "1.212s" } parameters: - - name: address - description: address is the address of the contract to query + - name: class_id + description: class_id associated with the nft in: path required: true type: string - - name: pagination.key - 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. - in: query - required: false - type: string - format: byte - - name: pagination.offset - 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. - in: query - required: false - type: string - format: uint64 - - name: pagination.limit - 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. - in: query - required: false - type: string + tags: + - Query + /cosmos/params/v1beta1/params: + get: + summary: |- + Params queries a specific parameter of a module, given its subspace and + key. + operationId: CosmosParamsV1Beta1Params + responses: + '200': + description: A successful response. + schema: + type: object + properties: + param: + description: param defines the queried parameter. + type: object + properties: + subspace: + type: string + key: + type: string + value: + type: string + description: >- + QueryParamsResponse is response type for the Query/Params RPC + method. + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + additionalProperties: {} + parameters: + - name: subspace + description: subspace defines the module to query the parameter for. + in: query + required: false + type: string + - name: key + description: key defines the key of the parameter in the subspace. + in: query + required: false + type: string + tags: + - Query + /cosmos/params/v1beta1/subspaces: + get: + summary: >- + Subspaces queries for all registered subspaces and all keys for a + subspace. + description: 'Since: cosmos-sdk 0.46' + operationId: CosmosParamsV1Beta1Subspaces + responses: + '200': + description: A successful response. + schema: + type: object + properties: + subspaces: + type: array + items: + type: object + properties: + subspace: + type: string + keys: + type: array + items: + type: string + description: >- + Subspace defines a parameter subspace name and all the keys + that exist for + + the subspace. + + + Since: cosmos-sdk 0.46 + description: >- + QuerySubspacesResponse defines the response types for querying for + all + + registered subspaces and all keys for a subspace. + + + Since: cosmos-sdk 0.46 + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + additionalProperties: {} + tags: + - Query + /cosmos/slashing/v1beta1/params: + get: + summary: Params queries the parameters of slashing module + operationId: CosmosSlashingV1Beta1Params + responses: + '200': + description: A successful response. + schema: + type: object + properties: + params: + type: object + properties: + signed_blocks_window: + type: string + format: int64 + min_signed_per_window: + type: string + format: byte + downtime_jail_duration: + type: string + slash_fraction_double_sign: + type: string + format: byte + slash_fraction_downtime: + type: string + format: byte + description: >- + Params represents the parameters used for by the slashing + module. + title: >- + QueryParamsResponse is the response type for the Query/Params RPC + method + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + additionalProperties: {} + tags: + - Query + /cosmos/slashing/v1beta1/signing_infos: + get: + summary: SigningInfos queries signing info of all validators + operationId: CosmosSlashingV1Beta1SigningInfos + responses: + '200': + description: A successful response. + schema: + type: object + properties: + info: + type: array + items: + type: object + properties: + address: + type: string + start_height: + type: string + format: int64 + title: >- + Height at which validator was first a candidate OR was + unjailed + index_offset: + type: string + format: int64 + description: >- + Index which is incremented each time the validator was a + bonded + + in a block and may have signed a precommit or not. This + in conjunction with the + + `SignedBlocksWindow` param determines the index in the + `MissedBlocksBitArray`. + jailed_until: + type: string + format: date-time + description: >- + Timestamp until which the validator is jailed due to + liveness downtime. + tombstoned: + type: boolean + description: >- + Whether or not a validator has been tombstoned (killed + out of validator set). It is set + + once the validator commits an equivocation or for any + other configured misbehiavor. + missed_blocks_counter: + type: string + format: int64 + description: >- + A counter kept to avoid unnecessary array reads. + + Note that `Sum(MissedBlocksBitArray)` always equals + `MissedBlocksCounter`. + description: >- + ValidatorSigningInfo defines a validator's signing info for + monitoring their + + liveness activity. + title: info is the signing info of all validators + pagination: + type: object + properties: + next_key: + type: string + format: byte + 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. + total: + type: string + format: uint64 + title: >- + total is total number of results available if + PageRequest.count_total + + was set, its value is undefined otherwise + 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; + } + title: >- + QuerySigningInfosResponse is the response type for the + Query/SigningInfos RPC + + method + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + additionalProperties: {} + parameters: + - name: pagination.key + 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. + in: query + required: false + type: string + format: byte + - name: pagination.offset + 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. + in: query + required: false + type: string + format: uint64 + - name: pagination.limit + 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. + in: query + required: false + type: string format: uint64 - name: pagination.count_total description: >- @@ -13836,23 +15038,110 @@ paths: type: boolean tags: - Query - /cosmwasm/wasm/v1/contract/{address}/raw/{query_data}: + /cosmos/slashing/v1beta1/signing_infos/{cons_address}: get: - summary: RawContractState gets single key from the raw store data of a contract - operationId: CosmwasmWasmV1RawContractState + summary: SigningInfo queries the signing info of given cons address + operationId: CosmosSlashingV1Beta1SigningInfo responses: '200': description: A successful response. schema: type: object properties: - data: + val_signing_info: + title: >- + val_signing_info is the signing info of requested val cons + address + type: object + properties: + address: + type: string + start_height: + type: string + format: int64 + title: >- + Height at which validator was first a candidate OR was + unjailed + index_offset: + type: string + format: int64 + description: >- + Index which is incremented each time the validator was a + bonded + + in a block and may have signed a precommit or not. This in + conjunction with the + + `SignedBlocksWindow` param determines the index in the + `MissedBlocksBitArray`. + jailed_until: + type: string + format: date-time + description: >- + Timestamp until which the validator is jailed due to + liveness downtime. + tombstoned: + type: boolean + description: >- + Whether or not a validator has been tombstoned (killed out + of validator set). It is set + + once the validator commits an equivocation or for any + other configured misbehiavor. + missed_blocks_counter: + type: string + format: int64 + description: >- + A counter kept to avoid unnecessary array reads. + + Note that `Sum(MissedBlocksBitArray)` always equals + `MissedBlocksCounter`. + description: >- + ValidatorSigningInfo defines a validator's signing info for + monitoring their + + liveness activity. + title: >- + QuerySigningInfoResponse is the response type for the + Query/SigningInfo RPC + + method + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: type: string - format: byte - title: Data contains the raw store data - title: |- - QueryRawContractStateResponse is the response type for the - Query/RawContractState RPC method + details: + type: array + items: + type: object + properties: + '@type': + type: string + additionalProperties: {} + parameters: + - name: cons_address + description: cons_address is the address to query signing info of + in: path + required: true + type: string + tags: + - Query + /cosmos/tx/v1beta1/decode: + post: + summary: TxDecode decodes the transaction. + description: 'Since: cosmos-sdk 0.47' + operationId: CosmosTxV1Beta1TxDecode + responses: + '200': + description: A successful response. + schema: + $ref: '#/definitions/cosmos.tx.v1beta1.TxDecodeResponse' default: description: An unexpected error response. schema: @@ -14039,35 +15328,49 @@ paths: "value": "1.212s" } parameters: - - name: address - description: address is the address of the contract - in: path - required: true - type: string - - name: query_data - in: path + - name: body + description: |- + TxDecodeRequest is the request type for the Service.TxDecode + RPC method. + + Since: cosmos-sdk 0.47 + in: body required: true - type: string - format: byte + schema: + type: object + properties: + tx_bytes: + type: string + format: byte + description: tx_bytes is the raw transaction. + description: |- + TxDecodeRequest is the request type for the Service.TxDecode + RPC method. + + Since: cosmos-sdk 0.47 tags: - - Query - /cosmwasm/wasm/v1/contract/{address}/smart/{query_data}: - get: - summary: SmartContractState get smart query result from the contract - operationId: CosmwasmWasmV1SmartContractState + - Service + /cosmos/tx/v1beta1/decode/amino: + post: + summary: TxDecodeAmino decodes an Amino transaction from encoded bytes to JSON. + description: 'Since: cosmos-sdk 0.47' + operationId: CosmosTxV1Beta1TxDecodeAmino responses: '200': description: A successful response. schema: type: object properties: - data: + amino_json: type: string - format: byte - title: Data contains the json data returned from the smart contract - title: |- - QuerySmartContractStateResponse is the response type for the - Query/SmartContractState RPC method + description: >- + TxDecodeAminoResponse is the response type for the + Service.TxDecodeAmino + + RPC method. + + + Since: cosmos-sdk 0.47 default: description: An unexpected error response. schema: @@ -14254,64 +15557,53 @@ paths: "value": "1.212s" } parameters: - - name: address - description: address is the address of the contract - in: path - required: true - type: string - - name: query_data - description: QueryData contains the query data passed to the contract - in: path + - name: body + description: >- + TxDecodeAminoRequest is the request type for the + Service.TxDecodeAmino + + RPC method. + + + Since: cosmos-sdk 0.47 + in: body required: true - type: string - format: byte + schema: + type: object + properties: + amino_binary: + type: string + format: byte + description: >- + TxDecodeAminoRequest is the request type for the + Service.TxDecodeAmino + + RPC method. + + + Since: cosmos-sdk 0.47 tags: - - Query - /cosmwasm/wasm/v1/contract/{address}/state: - get: - summary: AllContractState gets all raw store data for a single contract - operationId: CosmwasmWasmV1AllContractState + - Service + /cosmos/tx/v1beta1/encode: + post: + summary: TxEncode encodes the transaction. + description: 'Since: cosmos-sdk 0.47' + operationId: CosmosTxV1Beta1TxEncode responses: '200': description: A successful response. schema: type: object properties: - models: - type: array - items: - type: object - properties: - key: - type: string - format: byte - title: hex-encode key to read it better (this is often ascii) - value: - type: string - format: byte - title: base64-encode raw value - title: Model is a struct that holds a KV pair - pagination: - description: pagination defines the pagination in the response. - type: object - properties: - next_key: - type: string - format: byte - title: |- - next_key is the key to be passed to PageRequest.key to - query the next page most efficiently - total: - type: string - format: uint64 - title: >- - total is total number of results available if - PageRequest.count_total + tx_bytes: + type: string + format: byte + description: tx_bytes is the encoded transaction bytes. + description: |- + TxEncodeResponse is the response type for the + Service.TxEncode method. - was set, its value is undefined otherwise - title: |- - QueryAllContractStateResponse is the response type for the - Query/AllContractState RPC method + Since: cosmos-sdk 0.47 default: description: An unexpected error response. schema: @@ -14498,105 +15790,40 @@ paths: "value": "1.212s" } parameters: - - name: address - description: address is the address of the contract - in: path - required: true - type: string - - name: pagination.key + - name: body 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. - in: query - required: false - type: string - format: byte - - name: pagination.offset - 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. - in: query - required: false - type: string - format: uint64 - - name: pagination.limit - 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. - in: query - required: false - type: string - format: uint64 - - name: pagination.count_total - 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 - required: false - type: boolean - - name: pagination.reverse - description: >- - reverse is set to true if results are to be returned in the - descending order. - + TxEncodeRequest is the request type for the Service.TxEncode + RPC method. - Since: cosmos-sdk 0.43 - in: query - required: false - type: boolean + Since: cosmos-sdk 0.47 + in: body + required: true + schema: + $ref: '#/definitions/cosmos.tx.v1beta1.TxEncodeRequest' tags: - - Query - /cosmwasm/wasm/v1/contracts/creator/{creator_address}: - get: - summary: ContractsByCreator gets the contracts by creator - operationId: CosmwasmWasmV1ContractsByCreator + - Service + /cosmos/tx/v1beta1/encode/amino: + post: + summary: TxEncodeAmino encodes an Amino transaction from JSON to encoded bytes. + description: 'Since: cosmos-sdk 0.47' + operationId: CosmosTxV1Beta1TxEncodeAmino responses: '200': description: A successful response. schema: type: object properties: - contract_addresses: - type: array - items: - type: string - title: ContractAddresses result set - pagination: - description: Pagination defines the pagination in the response. - type: object - properties: - next_key: - type: string - format: byte - title: |- - next_key is the key to be passed to PageRequest.key to - query the next page most efficiently - total: - type: string - format: uint64 - title: >- - total is total number of results available if - PageRequest.count_total + amino_binary: + type: string + format: byte + description: >- + TxEncodeAminoResponse is the response type for the + Service.TxEncodeAmino - was set, its value is undefined otherwise - description: |- - QueryContractsByCreatorResponse is the response type for the - Query/ContractsByCreator RPC method. + RPC method. + + + Since: cosmos-sdk 0.47 default: description: An unexpected error response. schema: @@ -14783,354 +16010,300 @@ paths: "value": "1.212s" } parameters: - - name: creator_address - description: CreatorAddress is the address of contract creator - in: path - required: true - type: string - - name: pagination.key - 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. - in: query - required: false - type: string - format: byte - - name: pagination.offset - 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. - in: query - required: false - type: string - format: uint64 - - name: pagination.limit - 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. - in: query - required: false - type: string - format: uint64 - - name: pagination.count_total + - name: body 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 + TxEncodeAminoRequest is the request type for the + Service.TxEncodeAmino - is set. - in: query - required: false - type: boolean - - name: pagination.reverse - description: >- - reverse is set to true if results are to be returned in the - descending order. + RPC method. - Since: cosmos-sdk 0.43 - in: query - required: false - type: boolean - tags: - - Query - /ibc/apps/interchain_accounts/controller/v1/owners/{owner}/connections/{connection_id}: - get: - summary: >- - InterchainAccount returns the interchain account address for a given - owner address on a given connection - operationId: IbcApplicationsInterchainAccountsControllerV1InterchainAccount - responses: - '200': - description: A successful response. + Since: cosmos-sdk 0.47 + in: body + required: true schema: type: object properties: - address: + amino_json: type: string description: >- - QueryInterchainAccountResponse the response type for the - Query/InterchainAccount RPC method. - default: - description: An unexpected error response. - schema: - type: object - properties: - code: - type: integer - format: int32 - message: - type: string - details: - type: array - items: - type: object - properties: - '@type': - type: string - additionalProperties: {} - parameters: - - name: owner - in: path - required: true - type: string - - name: connection_id - in: path - required: true - type: string + TxEncodeAminoRequest is the request type for the + Service.TxEncodeAmino + + RPC method. + + + Since: cosmos-sdk 0.47 tags: - - Query - /ibc/apps/interchain_accounts/controller/v1/params: - get: - summary: Params queries all parameters of the ICA controller submodule. - operationId: IbcApplicationsInterchainAccountsControllerV1Params + - Service + /cosmos/tx/v1beta1/simulate: + post: + summary: Simulate simulates executing a transaction for estimating gas usage. + operationId: CosmosTxV1Beta1Simulate responses: '200': description: A successful response. schema: type: object properties: - params: - description: params defines the parameters of the module. + gas_info: + description: gas_info is the information about gas used in the simulation. type: object properties: - controller_enabled: - type: boolean + gas_wanted: + type: string + format: uint64 description: >- - controller_enabled enables or disables the controller - submodule. - description: >- - QueryParamsResponse is the response type for the Query/Params RPC - method. - default: - description: An unexpected error response. - schema: - type: object - properties: - code: - type: integer - format: int32 - message: - type: string - details: - type: array - items: - type: object - properties: - '@type': - type: string - additionalProperties: {} - tags: - - Query - /ibc/apps/interchain_accounts/host/v1/params: - get: - summary: Params queries all parameters of the ICA host submodule. - operationId: IbcApplicationsInterchainAccountsHostV1Params - responses: - '200': - description: A successful response. - schema: - type: object - properties: - params: - description: params defines the parameters of the module. + GasWanted is the maximum units of work we allow this tx to + perform. + gas_used: + type: string + format: uint64 + description: GasUsed is the amount of gas actually consumed. + result: + description: result is the result of the simulation. type: object properties: - host_enabled: - type: boolean - description: host_enabled enables or disables the host submodule. - allow_messages: + data: + type: string + format: byte + description: >- + Data is any data returned from message or handler + execution. It MUST be + + length prefixed in order to separate data from multiple + message executions. + + Deprecated. This field is still populated, but prefer + msg_response instead + + because it also contains the Msg response typeURL. + log: + type: string + description: >- + Log contains the log information from message or handler + execution. + events: type: array items: - type: string + type: object + properties: + type: + type: string + attributes: + type: array + items: + type: object + properties: + key: + type: string + value: + type: string + index: + type: boolean + title: nondeterministic + description: >- + EventAttribute is a single key-value pair, + associated with an event. + description: >- + Event allows application developers to attach additional + information to + + ResponseBeginBlock, ResponseEndBlock, ResponseCheckTx + and ResponseDeliverTx. + + Later, transactions may be queried using these events. description: >- - allow_messages defines a list of sdk message typeURLs - allowed to be executed on a host chain. - description: >- - QueryParamsResponse is the response type for the Query/Params RPC - method. - default: - description: An unexpected error response. - schema: - type: object - properties: - code: - type: integer - format: int32 - message: - type: string - details: - type: array - items: - type: object - properties: - '@type': - type: string - additionalProperties: {} - tags: - - Query - /ibc/core/channel/v1/channels: - get: - summary: Channels queries all the IBC channels of a chain. - operationId: IbcCoreChannelV1Channels - responses: - '200': - description: A successful response. - schema: - type: object - properties: - channels: - type: array - items: - type: object - properties: - state: - title: current state of the channel end - type: string - enum: - - STATE_UNINITIALIZED_UNSPECIFIED - - STATE_INIT - - STATE_TRYOPEN - - STATE_OPEN - - STATE_CLOSED - default: STATE_UNINITIALIZED_UNSPECIFIED - description: >- - State defines if a channel is in one of the following - states: - - CLOSED, INIT, TRYOPEN, OPEN or UNINITIALIZED. - - - STATE_UNINITIALIZED_UNSPECIFIED: Default State - - STATE_INIT: A channel has just started the opening handshake. - - STATE_TRYOPEN: A channel has acknowledged the handshake step on the counterparty chain. - - STATE_OPEN: A channel has completed the handshake. Open channels are - ready to send and receive packets. - - STATE_CLOSED: A channel has been closed and can no longer be used to send or receive - packets. - ordering: - title: whether the channel is ordered or unordered - type: string - enum: - - ORDER_NONE_UNSPECIFIED - - ORDER_UNORDERED - - ORDER_ORDERED - default: ORDER_NONE_UNSPECIFIED - description: >- - - ORDER_NONE_UNSPECIFIED: zero-value for channel - ordering - - ORDER_UNORDERED: packets can be delivered in any order, which may differ from the order in - which they were sent. - - ORDER_ORDERED: packets are delivered exactly in the order which they were sent - counterparty: - title: counterparty channel end - type: object - properties: - port_id: - type: string - description: >- - port on the counterparty chain which owns the other - end of the channel. - channel_id: - type: string - title: channel end on the counterparty chain - connection_hops: - type: array - items: - type: string - title: >- - list of connection identifiers, in order, along which - packets sent on - - this channel will travel - version: - type: string - title: >- - opaque channel version, which is agreed upon during the - handshake - port_id: - type: string - title: port identifier - channel_id: - type: string - title: channel identifier - description: >- - IdentifiedChannel defines a channel with additional port and - channel - - identifier fields. - description: list of stored channels of the chain. - pagination: - title: pagination response - type: object - properties: - next_key: - type: string - format: byte - title: |- - next_key is the key to be passed to PageRequest.key to - query the next page most efficiently - total: - type: string - format: uint64 - title: >- - total is total number of results available if - PageRequest.count_total - - was set, its value is undefined otherwise - 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; - } - height: - title: query block height - type: object - properties: - revision_number: - type: string - format: uint64 - title: the revision that the client is currently on - revision_height: - type: string - format: uint64 - title: the height within the given revision - description: >- - Normally the RevisionHeight is incremented at each height - while keeping - - RevisionNumber the same. However some consensus algorithms may - choose to - - reset the height in certain conditions e.g. hard forks, - state-machine - - breaking changes In these cases, the RevisionNumber is - incremented so that - - height continues to be monitonically increasing even as the - RevisionHeight - - gets reset - description: >- - QueryChannelsResponse is the response type for the Query/Channels - RPC method. + Events contains a slice of Event objects that were emitted + during message + + or handler execution. + msg_responses: + type: array + items: + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the + type of the serialized + + protocol buffer message. This string must contain at + least + + one "/" character. The last segment of the URL's + path must represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be + in a canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the + binary all types that they + + expect it to use in the context of Any. However, for + URLs which use the + + scheme `http`, `https`, or no scheme, one can + optionally set up a type + + server that maps type URLs to message definitions as + follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results + based on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available + in the official + + protobuf release, and it is not used for type URLs + beginning with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty + scheme) might be + + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer + message along with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any + values in the form + + of utility functions or additional generated methods of + the Any type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by + default use + + 'type.googleapis.com/full.type.name' as the type URL and + the unpack + + methods only use the fully qualified type name after the + last '/' + + in the type URL, for example "foo.bar.com/x/y.z" will + yield type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the + regular + + representation of the deserialized, embedded message, + with an + + additional field `@type` which contains the type URL. + Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a + custom JSON + + representation, that representation will be embedded + adding a field + + `value` which holds the custom JSON in addition to the + `@type` + + field. Example (for message + [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + description: >- + msg_responses contains the Msg handler responses type + packed in Anys. + + + Since: cosmos-sdk 0.46 + description: |- + SimulateResponse is the response type for the + Service.SimulateRPC method. default: description: An unexpected error response. schema: @@ -15317,179 +16490,25 @@ paths: "value": "1.212s" } parameters: - - name: pagination.key + - name: body 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. - in: query - required: false - type: string - format: byte - - name: pagination.offset - 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. - in: query - required: false - type: string - format: uint64 - - name: pagination.limit - 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. - in: query - required: false - type: string - format: uint64 - - name: pagination.count_total - 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 - required: false - type: boolean + SimulateRequest is the request type for the Service.Simulate + RPC method. + in: body + required: true + schema: + $ref: '#/definitions/cosmos.tx.v1beta1.SimulateRequest' tags: - - Query - /ibc/core/channel/v1/channels/{channel_id}/ports/{port_id}: + - Service + /cosmos/tx/v1beta1/txs: get: - summary: Channel queries an IBC Channel. - operationId: IbcCoreChannelV1Channel + summary: GetTxsEvent fetches txs by event. + operationId: CosmosTxV1Beta1GetTxsEvent responses: '200': description: A successful response. schema: - type: object - properties: - channel: - title: channel associated with the request identifiers - type: object - properties: - state: - title: current state of the channel end - type: string - enum: - - STATE_UNINITIALIZED_UNSPECIFIED - - STATE_INIT - - STATE_TRYOPEN - - STATE_OPEN - - STATE_CLOSED - default: STATE_UNINITIALIZED_UNSPECIFIED - description: >- - State defines if a channel is in one of the following - states: - - CLOSED, INIT, TRYOPEN, OPEN or UNINITIALIZED. - - - STATE_UNINITIALIZED_UNSPECIFIED: Default State - - STATE_INIT: A channel has just started the opening handshake. - - STATE_TRYOPEN: A channel has acknowledged the handshake step on the counterparty chain. - - STATE_OPEN: A channel has completed the handshake. Open channels are - ready to send and receive packets. - - STATE_CLOSED: A channel has been closed and can no longer be used to send or receive - packets. - ordering: - title: whether the channel is ordered or unordered - type: string - enum: - - ORDER_NONE_UNSPECIFIED - - ORDER_UNORDERED - - ORDER_ORDERED - default: ORDER_NONE_UNSPECIFIED - description: |- - - ORDER_NONE_UNSPECIFIED: zero-value for channel ordering - - ORDER_UNORDERED: packets can be delivered in any order, which may differ from the order in - which they were sent. - - ORDER_ORDERED: packets are delivered exactly in the order which they were sent - counterparty: - title: counterparty channel end - type: object - properties: - port_id: - type: string - description: >- - port on the counterparty chain which owns the other - end of the channel. - channel_id: - type: string - title: channel end on the counterparty chain - connection_hops: - type: array - items: - type: string - title: >- - list of connection identifiers, in order, along which - packets sent on - - this channel will travel - version: - type: string - title: >- - opaque channel version, which is agreed upon during the - handshake - description: >- - Channel defines pipeline for exactly-once packet delivery - between specific - - modules on separate blockchains, which has at least one end - capable of - - sending packets and one end capable of receiving packets. - proof: - type: string - format: byte - title: merkle proof of existence - proof_height: - title: height at which the proof was retrieved - type: object - properties: - revision_number: - type: string - format: uint64 - title: the revision that the client is currently on - revision_height: - type: string - format: uint64 - title: the height within the given revision - description: >- - Normally the RevisionHeight is incremented at each height - while keeping - - RevisionNumber the same. However some consensus algorithms may - choose to - - reset the height in certain conditions e.g. hard forks, - state-machine - - breaking changes In these cases, the RevisionNumber is - incremented so that - - height continues to be monitonically increasing even as the - RevisionHeight - - gets reset - description: >- - QueryChannelResponse is the response type for the Query/Channel - RPC method. - - Besides the Channel end, it includes a proof and the height from - which the - - proof was retrieved. + $ref: '#/definitions/cosmos.tx.v1beta1.GetTxsEventResponse' default: description: An unexpected error response. schema: @@ -15676,71 +16695,231 @@ paths: "value": "1.212s" } parameters: - - name: channel_id - description: channel unique identifier - in: path - required: true + - name: events + description: events is the list of transaction event type. + in: query + required: false + type: array + items: + type: string + collectionFormat: multi + - name: pagination.key + 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. + in: query + required: false type: string - - name: port_id - description: port unique identifier - in: path - required: true + format: byte + - name: pagination.offset + 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. + in: query + required: false type: string - tags: - - Query - /ibc/core/channel/v1/channels/{channel_id}/ports/{port_id}/client_state: - get: - summary: >- - ChannelClientState queries for the client state for the channel - associated + format: uint64 + - name: pagination.limit + description: >- + limit is the total number of results to be returned in the result + page. - with the provided channel identifiers. - operationId: IbcCoreChannelV1ChannelClientState + If left empty it will default to a value to be set by each app. + in: query + required: false + type: string + format: uint64 + - name: pagination.count_total + 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 + required: false + type: boolean + - name: pagination.reverse + description: >- + reverse is set to true if results are to be returned in the + descending order. + + + Since: cosmos-sdk 0.43 + in: query + required: false + type: boolean + - name: order_by + description: |2- + - ORDER_BY_UNSPECIFIED: ORDER_BY_UNSPECIFIED specifies an unknown sorting order. OrderBy defaults to ASC in this case. + - ORDER_BY_ASC: ORDER_BY_ASC defines ascending order + - ORDER_BY_DESC: ORDER_BY_DESC defines descending order + in: query + required: false + type: string + enum: + - ORDER_BY_UNSPECIFIED + - ORDER_BY_ASC + - ORDER_BY_DESC + default: ORDER_BY_UNSPECIFIED + - name: page + description: >- + page is the page number to query, starts at 1. If not provided, will + default to first page. + in: query + required: false + type: string + format: uint64 + - name: limit + 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. + in: query + required: false + type: string + format: uint64 + tags: + - Service + post: + summary: BroadcastTx broadcast transaction. + operationId: CosmosTxV1Beta1BroadcastTx responses: '200': description: A successful response. schema: type: object properties: - identified_client_state: - title: client state associated with the channel + tx_response: + description: tx_response is the queried TxResponses. type: object properties: - client_id: + height: type: string - title: client identifier - client_state: - title: client state - type: object - properties: - '@type': - type: string - description: >- - A URL/resource name that uniquely identifies the type - of the serialized - - protocol buffer message. This string must contain at - least - - one "/" character. The last segment of the URL's path - must represent - - the fully qualified name of the type (as in - - `path/google.protobuf.Duration`). The name should be - in a canonical form - - (e.g., leading "." is not accepted). - - - In practice, teams usually precompile into the binary - all types that they - - expect it to use in the context of Any. However, for - URLs which use the - - scheme `http`, `https`, or no scheme, one can - optionally set up a type + format: int64 + title: The block height + txhash: + type: string + description: The transaction hash. + codespace: + type: string + title: Namespace for the Code + code: + type: integer + format: int64 + description: Response code. + data: + type: string + description: Result bytes, if any. + raw_log: + type: string + description: >- + The output of the application's logger (raw string). May + be + + non-deterministic. + logs: + type: array + items: + type: object + properties: + msg_index: + type: integer + format: int64 + log: + type: string + events: + type: array + items: + type: object + properties: + type: + type: string + attributes: + type: array + items: + type: object + properties: + key: + type: string + value: + type: string + description: >- + Attribute defines an attribute wrapper where + the key and value are + + strings instead of raw bytes. + description: >- + StringEvent defines en Event object wrapper where + all the attributes + + contain key/value pairs that are strings instead + of raw bytes. + description: >- + Events contains a slice of Event objects that were + emitted during some + + execution. + description: >- + ABCIMessageLog defines a structure containing an indexed + tx ABCI message log. + description: >- + The output of the application's logger (typed). May be + non-deterministic. + info: + type: string + description: Additional information. May be non-deterministic. + gas_wanted: + type: string + format: int64 + description: Amount of gas requested for transaction. + gas_used: + type: string + format: int64 + description: Amount of gas consumed by transaction. + tx: + description: The request transaction bytes. + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type + of the serialized + + protocol buffer message. This string must contain at + least + + one "/" character. The last segment of the URL's path + must represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be + in a canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the binary + all types that they + + expect it to use in the context of Any. However, for + URLs which use the + + scheme `http`, `https`, or no scheme, one can + optionally set up a type server that maps type URLs to message definitions as follows: @@ -15772,158 +16951,64 @@ paths: used with implementation specific semantics. additionalProperties: {} + timestamp: + type: string description: >- - `Any` contains an arbitrary serialized protocol buffer - message along with a - - URL that describes the type of the serialized message. - - - Protobuf library provides support to pack/unpack Any - values in the form - - of utility functions or additional generated methods of - the Any type. - - - Example 1: Pack and unpack a message in C++. - - Foo foo = ...; - Any any; - any.PackFrom(foo); - ... - if (any.UnpackTo(&foo)) { - ... - } - - Example 2: Pack and unpack a message in Java. - - Foo foo = ...; - Any any = Any.pack(foo); - ... - if (any.is(Foo.class)) { - foo = any.unpack(Foo.class); - } - - Example 3: Pack and unpack a message in Python. - - foo = Foo(...) - any = Any() - any.Pack(foo) - ... - if any.Is(Foo.DESCRIPTOR): - any.Unpack(foo) - ... - - Example 4: Pack and unpack a message in Go - - foo := &pb.Foo{...} - any, err := anypb.New(foo) - if err != nil { - ... - } - ... - foo := &pb.Foo{} - if err := any.UnmarshalTo(foo); err != nil { - ... - } - - The pack methods provided by protobuf library will by - default use - - 'type.googleapis.com/full.type.name' as the type URL and - the unpack - - methods only use the fully qualified type name after the - last '/' - - in the type URL, for example "foo.bar.com/x/y.z" will - yield type - - name "y.z". - - - - JSON - - ==== - - The JSON representation of an `Any` value uses the regular - - representation of the deserialized, embedded message, with - an - - additional field `@type` which contains the type URL. - Example: - - package google.profile; - message Person { - string first_name = 1; - string last_name = 2; - } - - { - "@type": "type.googleapis.com/google.profile.Person", - "firstName": , - "lastName": - } - - If the embedded message type is well-known and has a - custom JSON - - representation, that representation will be embedded - adding a field + Time of the previous block. For heights > 1, it's the + weighted median of - `value` which holds the custom JSON in addition to the - `@type` + the timestamps of the valid votes in the block.LastCommit. + For height == 1, - field. Example (for message [google.protobuf.Duration][]): + it's genesis time. + events: + type: array + items: + type: object + properties: + type: + type: string + attributes: + type: array + items: + type: object + properties: + key: + type: string + value: + type: string + index: + type: boolean + title: nondeterministic + description: >- + EventAttribute is a single key-value pair, + associated with an event. + description: >- + Event allows application developers to attach additional + information to - { - "@type": "type.googleapis.com/google.protobuf.Duration", - "value": "1.212s" - } - description: >- - IdentifiedClientState defines a client state with an - additional client + ResponseBeginBlock, ResponseEndBlock, ResponseCheckTx + and ResponseDeliverTx. - identifier field. - proof: - type: string - format: byte - title: merkle proof of existence - proof_height: - title: height at which the proof was retrieved - type: object - properties: - revision_number: - type: string - format: uint64 - title: the revision that the client is currently on - revision_height: - type: string - format: uint64 - title: the height within the given revision - description: >- - Normally the RevisionHeight is incremented at each height - while keeping + Later, transactions may be queried using these events. + description: >- + Events defines all the events emitted by processing a + transaction. Note, - RevisionNumber the same. However some consensus algorithms may - choose to + these events include those emitted by processing all the + messages and those - reset the height in certain conditions e.g. hard forks, - state-machine + emitted from the ante. Whereas Logs contains the events, + with - breaking changes In these cases, the RevisionNumber is - incremented so that + additional metadata, emitted only by processing the + messages. - height continues to be monitonically increasing even as the - RevisionHeight - gets reset - title: |- - QueryChannelClientStateResponse is the Response type for the - Query/QueryChannelClientState RPC method + Since: cosmos-sdk 0.42.11, 0.44.5, 0.45 + description: |- + BroadcastTxResponse is the response type for the + Service.BroadcastTx method. default: description: An unexpected error response. schema: @@ -16110,239 +17195,317 @@ paths: "value": "1.212s" } parameters: - - name: channel_id - description: channel unique identifier - in: path - required: true - type: string - - name: port_id - description: port unique identifier - in: path + - name: body + description: >- + BroadcastTxRequest is the request type for the + Service.BroadcastTxRequest + + RPC method. + in: body required: true - type: string + schema: + type: object + properties: + tx_bytes: + type: string + format: byte + description: tx_bytes is the raw transaction. + mode: + type: string + enum: + - BROADCAST_MODE_UNSPECIFIED + - BROADCAST_MODE_BLOCK + - BROADCAST_MODE_SYNC + - BROADCAST_MODE_ASYNC + default: BROADCAST_MODE_UNSPECIFIED + description: >- + BroadcastMode specifies the broadcast mode for the + TxService.Broadcast RPC method. + + - BROADCAST_MODE_UNSPECIFIED: zero-value for mode ordering + - BROADCAST_MODE_BLOCK: DEPRECATED: use BROADCAST_MODE_SYNC instead, + BROADCAST_MODE_BLOCK is not supported by the SDK from v0.47.x + onwards. + - BROADCAST_MODE_SYNC: BROADCAST_MODE_SYNC defines a tx broadcasting mode where the client waits for + a CheckTx execution response only. + - BROADCAST_MODE_ASYNC: BROADCAST_MODE_ASYNC defines a tx broadcasting mode where the client returns + immediately. + description: >- + BroadcastTxRequest is the request type for the + Service.BroadcastTxRequest + + RPC method. tags: - - Query - /ibc/core/channel/v1/channels/{channel_id}/ports/{port_id}/consensus_state/revision/{revision_number}/height/{revision_height}: + - Service + /cosmos/tx/v1beta1/txs/block/{height}: get: - summary: |- - ChannelConsensusState queries for the consensus state for the channel - associated with the provided channel identifiers. - operationId: IbcCoreChannelV1ChannelConsensusState + summary: GetBlockWithTxs fetches a block with decoded txs. + description: 'Since: cosmos-sdk 0.45.2' + operationId: CosmosTxV1Beta1GetBlockWithTxs responses: '200': description: A successful response. + schema: + $ref: '#/definitions/cosmos.tx.v1beta1.GetBlockWithTxsResponse' + default: + description: An unexpected error response. schema: type: object properties: - consensus_state: - title: consensus state associated with the channel - type: object - properties: - '@type': - type: string - description: >- - A URL/resource name that uniquely identifies the type of - the serialized + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type of + the serialized - protocol buffer message. This string must contain at least + protocol buffer message. This string must contain at + least - one "/" character. The last segment of the URL's path must - represent + one "/" character. The last segment of the URL's path + must represent - the fully qualified name of the type (as in + the fully qualified name of the type (as in - `path/google.protobuf.Duration`). The name should be in a - canonical form + `path/google.protobuf.Duration`). The name should be in + a canonical form - (e.g., leading "." is not accepted). + (e.g., leading "." is not accepted). - In practice, teams usually precompile into the binary all - types that they + In practice, teams usually precompile into the binary + all types that they - expect it to use in the context of Any. However, for URLs - which use the + expect it to use in the context of Any. However, for + URLs which use the - scheme `http`, `https`, or no scheme, one can optionally - set up a type + scheme `http`, `https`, or no scheme, one can optionally + set up a type - server that maps type URLs to message definitions as - follows: + server that maps type URLs to message definitions as + follows: - * If no scheme is provided, `https` is assumed. + * If no scheme is provided, `https` is assumed. - * An HTTP GET on the URL must yield a - [google.protobuf.Type][] - value in binary format, or produce an error. - * Applications are allowed to cache lookup results based - on the - URL, or have them precompiled into a binary to avoid any - lookup. Therefore, binary compatibility needs to be preserved - on changes to types. (Use versioned type names to manage - breaking changes.) + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based + on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) - Note: this functionality is not currently available in the - official + Note: this functionality is not currently available in + the official - protobuf release, and it is not used for type URLs - beginning with + protobuf release, and it is not used for type URLs + beginning with - type.googleapis.com. + type.googleapis.com. - Schemes other than `http`, `https` (or the empty scheme) - might be + Schemes other than `http`, `https` (or the empty scheme) + might be - used with implementation specific semantics. - additionalProperties: {} - description: >- - `Any` contains an arbitrary serialized protocol buffer message - along with a + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer + message along with a - URL that describes the type of the serialized message. + URL that describes the type of the serialized message. - Protobuf library provides support to pack/unpack Any values in - the form + Protobuf library provides support to pack/unpack Any values + in the form - of utility functions or additional generated methods of the - Any type. + of utility functions or additional generated methods of the + Any type. - Example 1: Pack and unpack a message in C++. + Example 1: Pack and unpack a message in C++. - Foo foo = ...; - Any any; - any.PackFrom(foo); - ... - if (any.UnpackTo(&foo)) { + Foo foo = ...; + Any any; + any.PackFrom(foo); ... - } + if (any.UnpackTo(&foo)) { + ... + } - Example 2: Pack and unpack a message in Java. + Example 2: Pack and unpack a message in Java. - Foo foo = ...; - Any any = Any.pack(foo); - ... - if (any.is(Foo.class)) { - foo = any.unpack(Foo.class); - } + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. - foo = Foo(...) - any = Any() - any.Pack(foo) - ... - if any.Is(Foo.DESCRIPTOR): - any.Unpack(foo) + foo = Foo(...) + any = Any() + any.Pack(foo) ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go - foo := &pb.Foo{...} - any, err := anypb.New(foo) - if err != nil { - ... - } - ... - foo := &pb.Foo{} - if err := any.UnmarshalTo(foo); err != nil { + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } ... - } + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } - The pack methods provided by protobuf library will by default - use + The pack methods provided by protobuf library will by + default use - 'type.googleapis.com/full.type.name' as the type URL and the - unpack + 'type.googleapis.com/full.type.name' as the type URL and the + unpack - methods only use the fully qualified type name after the last - '/' + methods only use the fully qualified type name after the + last '/' - in the type URL, for example "foo.bar.com/x/y.z" will yield - type + in the type URL, for example "foo.bar.com/x/y.z" will yield + type - name "y.z". + name "y.z". - JSON + JSON - ==== + ==== - The JSON representation of an `Any` value uses the regular + The JSON representation of an `Any` value uses the regular - representation of the deserialized, embedded message, with an + representation of the deserialized, embedded message, with + an - additional field `@type` which contains the type URL. Example: + additional field `@type` which contains the type URL. + Example: - package google.profile; - message Person { - string first_name = 1; - string last_name = 2; - } + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } - { - "@type": "type.googleapis.com/google.profile.Person", - "firstName": , - "lastName": - } + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } - If the embedded message type is well-known and has a custom - JSON + If the embedded message type is well-known and has a custom + JSON - representation, that representation will be embedded adding a - field + representation, that representation will be embedded adding + a field - `value` which holds the custom JSON in addition to the `@type` + `value` which holds the custom JSON in addition to the + `@type` - field. Example (for message [google.protobuf.Duration][]): + field. Example (for message [google.protobuf.Duration][]): - { - "@type": "type.googleapis.com/google.protobuf.Duration", - "value": "1.212s" - } - client_id: - type: string - title: client ID associated with the consensus state - proof: - type: string - format: byte - title: merkle proof of existence - proof_height: - title: height at which the proof was retrieved - type: object - properties: - revision_number: - type: string - format: uint64 - title: the revision that the client is currently on - revision_height: - type: string - format: uint64 - title: the height within the given revision - description: >- - Normally the RevisionHeight is incremented at each height - while keeping + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + parameters: + - name: height + description: height is the height of the block to query. + in: path + required: true + type: string + format: int64 + - name: pagination.key + 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. + in: query + required: false + type: string + format: byte + - name: pagination.offset + description: >- + offset is a numeric offset that can be used when key is unavailable. - RevisionNumber the same. However some consensus algorithms may - choose to + It is less efficient than using key. Only one of offset or key + should - reset the height in certain conditions e.g. hard forks, - state-machine + be set. + in: query + required: false + type: string + format: uint64 + - name: pagination.limit + description: >- + limit is the total number of results to be returned in the result + page. - breaking changes In these cases, the RevisionNumber is - incremented so that + If left empty it will default to a value to be set by each app. + in: query + required: false + type: string + format: uint64 + - name: pagination.count_total + description: >- + count_total is set to true to indicate that the result set should + include - height continues to be monitonically increasing even as the - RevisionHeight + a count of the total number of items available for pagination in + UIs. - gets reset - title: |- - QueryChannelClientStateResponse is the Response type for the - Query/QueryChannelClientState RPC method + count_total is only respected when offset is used. It is ignored + when key + + is set. + in: query + required: false + type: boolean + - name: pagination.reverse + description: >- + reverse is set to true if results are to be returned in the + descending order. + + + Since: cosmos-sdk 0.43 + in: query + required: false + type: boolean + tags: + - Service + /cosmos/tx/v1beta1/txs/{hash}: + get: + summary: GetTx fetches a tx by hash. + operationId: CosmosTxV1Beta1GetTx + responses: + '200': + description: A successful response. + schema: + $ref: '#/definitions/cosmos.tx.v1beta1.GetTxResponse' default: description: An unexpected error response. schema: @@ -16529,82 +17692,32 @@ paths: "value": "1.212s" } parameters: - - name: channel_id - description: channel unique identifier - in: path - required: true - type: string - - name: port_id - description: port unique identifier - in: path - required: true - type: string - - name: revision_number - description: revision number of the consensus state - in: path - required: true - type: string - format: uint64 - - name: revision_height - description: revision height of the consensus state + - name: hash + description: hash is the tx hash to query, encoded as a hex string. in: path required: true type: string - format: uint64 tags: - - Query - /ibc/core/channel/v1/channels/{channel_id}/ports/{port_id}/next_sequence: + - Service + /cosmos/upgrade/v1beta1/applied_plan/{name}: get: - summary: >- - NextSequenceReceive returns the next receive sequence for a given - channel. - operationId: IbcCoreChannelV1NextSequenceReceive + summary: AppliedPlan queries a previously applied upgrade plan by its name. + operationId: CosmosUpgradeV1Beta1AppliedPlan responses: '200': description: A successful response. schema: type: object properties: - next_sequence_receive: - type: string - format: uint64 - title: next sequence receive number - proof: + height: type: string - format: byte - title: merkle proof of existence - proof_height: - title: height at which the proof was retrieved - type: object - properties: - revision_number: - type: string - format: uint64 - title: the revision that the client is currently on - revision_height: - type: string - format: uint64 - title: the height within the given revision - description: >- - Normally the RevisionHeight is incremented at each height - while keeping - - RevisionNumber the same. However some consensus algorithms may - choose to - - reset the height in certain conditions e.g. hard forks, - state-machine - - breaking changes In these cases, the RevisionNumber is - incremented so that - - height continues to be monitonically increasing even as the - RevisionHeight + format: int64 + description: height is the block height at which the plan was applied. + description: >- + QueryAppliedPlanResponse is the response type for the + Query/AppliedPlan RPC - gets reset - title: |- - QuerySequenceResponse is the request type for the - Query/QueryNextSequenceReceiveResponse RPC method + method. default: description: An unexpected error response. schema: @@ -16791,121 +17904,28 @@ paths: "value": "1.212s" } parameters: - - name: channel_id - description: channel unique identifier - in: path - required: true - type: string - - name: port_id - description: port unique identifier + - name: name + description: name is the name of the applied plan to query for. in: path required: true type: string tags: - Query - /ibc/core/channel/v1/channels/{channel_id}/ports/{port_id}/packet_acknowledgements: + /cosmos/upgrade/v1beta1/authority: get: - summary: >- - PacketAcknowledgements returns all the packet acknowledgements - associated - - with a channel. - operationId: IbcCoreChannelV1PacketAcknowledgements + summary: Returns the account with authority to conduct upgrades + description: 'Since: cosmos-sdk 0.46' + operationId: CosmosUpgradeV1Beta1Authority responses: '200': description: A successful response. schema: type: object properties: - acknowledgements: - type: array - items: - type: object - properties: - port_id: - type: string - description: channel port identifier. - channel_id: - type: string - description: channel unique identifier. - sequence: - type: string - format: uint64 - description: packet sequence. - data: - type: string - format: byte - description: embedded data that represents packet state. - description: >- - PacketState defines the generic type necessary to retrieve - and store - - packet commitments, acknowledgements, and receipts. - - Caller is responsible for knowing the context necessary to - interpret this - - state as a commitment, acknowledgement, or a receipt. - pagination: - title: pagination response - type: object - properties: - next_key: - type: string - format: byte - title: |- - next_key is the key to be passed to PageRequest.key to - query the next page most efficiently - total: - type: string - format: uint64 - title: >- - total is total number of results available if - PageRequest.count_total - - was set, its value is undefined otherwise - 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; - } - height: - title: query block height - type: object - properties: - revision_number: - type: string - format: uint64 - title: the revision that the client is currently on - revision_height: - type: string - format: uint64 - title: the height within the given revision - description: >- - Normally the RevisionHeight is incremented at each height - while keeping - - RevisionNumber the same. However some consensus algorithms may - choose to - - reset the height in certain conditions e.g. hard forks, - state-machine - - breaking changes In these cases, the RevisionNumber is - incremented so that - - height continues to be monitonically increasing even as the - RevisionHeight - - gets reset - title: |- - QueryPacketAcknowledgemetsResponse is the request type for the - Query/QueryPacketAcknowledgements RPC method + address: + type: string + description: 'Since: cosmos-sdk 0.46' + title: QueryAuthorityResponse is the response type for Query/Authority default: description: An unexpected error response. schema: @@ -17091,128 +18111,140 @@ paths: "@type": "type.googleapis.com/google.protobuf.Duration", "value": "1.212s" } - parameters: - - name: channel_id - description: channel unique identifier - in: path - required: true - type: string - - name: port_id - description: port unique identifier - in: path - required: true - type: string - - name: pagination.key - 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. - in: query - required: false - type: string - format: byte - - name: pagination.offset - 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. - in: query - required: false - type: string - format: uint64 - - name: pagination.limit - 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. - in: query - required: false - type: string - format: uint64 - - name: pagination.count_total - 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 - required: false - type: boolean - - name: packet_commitment_sequences - description: list of packet sequences - in: query - required: false - type: array - items: - type: string - format: uint64 - collectionFormat: multi tags: - Query - /ibc/core/channel/v1/channels/{channel_id}/ports/{port_id}/packet_acks/{sequence}: + /cosmos/upgrade/v1beta1/current_plan: get: - summary: PacketAcknowledgement queries a stored packet acknowledgement hash. - operationId: IbcCoreChannelV1PacketAcknowledgement + summary: CurrentPlan queries the current upgrade plan. + operationId: CosmosUpgradeV1Beta1CurrentPlan responses: '200': description: A successful response. schema: type: object properties: - acknowledgement: - type: string - format: byte - title: packet associated with the request fields - proof: - type: string - format: byte - title: merkle proof of existence - proof_height: - title: height at which the proof was retrieved + plan: + description: plan is the current upgrade plan. type: object properties: - revision_number: + name: type: string - format: uint64 - title: the revision that the client is currently on - revision_height: + description: >- + Sets the name for the upgrade. This name will be used by + the upgraded + + version of the software to apply any special "on-upgrade" + commands during + + the first BeginBlock method after the upgrade is applied. + It is also used + + to detect whether a software version can handle a given + upgrade. If no + + upgrade handler with this name has been set in the + software, it will be + + assumed that the software is out-of-date when the upgrade + Time or Height is + + reached and the software will exit. + time: type: string - format: uint64 - title: the height within the given revision - description: >- - Normally the RevisionHeight is incremented at each height - while keeping + format: date-time + description: >- + Deprecated: Time based upgrades have been deprecated. Time + based upgrade logic - RevisionNumber the same. However some consensus algorithms may - choose to + has been removed from the SDK. - reset the height in certain conditions e.g. hard forks, - state-machine + If this field is not empty, an error will be thrown. + height: + type: string + format: int64 + description: The height at which the upgrade must be performed. + info: + type: string + title: >- + Any application specific upgrade info to be included + on-chain - breaking changes In these cases, the RevisionNumber is - incremented so that + such as a git commit that validators could automatically + upgrade to + upgraded_client_state: + description: >- + Deprecated: UpgradedClientState field has been deprecated. + IBC upgrade logic has been - height continues to be monitonically increasing even as the - RevisionHeight + moved to the IBC module in the sub module 02-client. - gets reset - title: >- - QueryPacketAcknowledgementResponse defines the client query - response for a + If this field is not empty, an error will be thrown. + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type + of the serialized - packet which also includes a proof and the height from which the + protocol buffer message. This string must contain at + least - proof was retrieved + one "/" character. The last segment of the URL's path + must represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be + in a canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the binary + all types that they + + expect it to use in the context of Any. However, for + URLs which use the + + scheme `http`, `https`, or no scheme, one can + optionally set up a type + + server that maps type URLs to message definitions as + follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results + based on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in + the official + + protobuf release, and it is not used for type URLs + beginning with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty + scheme) might be + + used with implementation specific semantics. + additionalProperties: {} + description: >- + QueryCurrentPlanResponse is the response type for the + Query/CurrentPlan RPC + + method. default: description: An unexpected error response. schema: @@ -17398,126 +18430,46 @@ paths: "@type": "type.googleapis.com/google.protobuf.Duration", "value": "1.212s" } - parameters: - - name: channel_id - description: channel unique identifier - in: path - required: true - type: string - - name: port_id - description: port unique identifier - in: path - required: true - type: string - - name: sequence - description: packet sequence - in: path - required: true - type: string - format: uint64 tags: - Query - /ibc/core/channel/v1/channels/{channel_id}/ports/{port_id}/packet_commitments: + /cosmos/upgrade/v1beta1/module_versions: get: - summary: |- - PacketCommitments returns all the packet commitments hashes associated - with a channel. - operationId: IbcCoreChannelV1PacketCommitments + summary: ModuleVersions queries the list of module versions from state. + description: 'Since: cosmos-sdk 0.43' + operationId: CosmosUpgradeV1Beta1ModuleVersions responses: '200': description: A successful response. schema: type: object properties: - commitments: + module_versions: type: array items: type: object properties: - port_id: - type: string - description: channel port identifier. - channel_id: + name: type: string - description: channel unique identifier. - sequence: + title: name of the app module + version: type: string format: uint64 - description: packet sequence. - data: - type: string - format: byte - description: embedded data that represents packet state. - description: >- - PacketState defines the generic type necessary to retrieve - and store - - packet commitments, acknowledgements, and receipts. - - Caller is responsible for knowing the context necessary to - interpret this - - state as a commitment, acknowledgement, or a receipt. - pagination: - title: pagination response - type: object - properties: - next_key: - type: string - format: byte - title: |- - next_key is the key to be passed to PageRequest.key to - query the next page most efficiently - total: - type: string - format: uint64 - title: >- - total is total number of results available if - PageRequest.count_total - - was set, its value is undefined otherwise - description: >- - PageResponse is to be embedded in gRPC response messages where - the - - corresponding request message has used PageRequest. + title: consensus version of the app module + description: |- + ModuleVersion specifies a module and its consensus version. - message SomeResponse { - repeated Bar results = 1; - PageResponse page = 2; - } - height: - title: query block height - type: object - properties: - revision_number: - type: string - format: uint64 - title: the revision that the client is currently on - revision_height: - type: string - format: uint64 - title: the height within the given revision + Since: cosmos-sdk 0.43 description: >- - Normally the RevisionHeight is incremented at each height - while keeping - - RevisionNumber the same. However some consensus algorithms may - choose to - - reset the height in certain conditions e.g. hard forks, - state-machine + module_versions is a list of module names with their consensus + versions. + description: >- + QueryModuleVersionsResponse is the response type for the + Query/ModuleVersions - breaking changes In these cases, the RevisionNumber is - incremented so that + RPC method. - height continues to be monitonically increasing even as the - RevisionHeight - gets reset - title: |- - QueryPacketCommitmentsResponse is the request type for the - Query/QueryPacketCommitments RPC method + Since: cosmos-sdk 0.43 default: description: An unexpected error response. schema: @@ -17704,116 +18656,46 @@ paths: "value": "1.212s" } parameters: - - name: channel_id - description: channel unique identifier - in: path - required: true - type: string - - name: port_id - description: port unique identifier - in: path - required: true - type: string - - name: pagination.key + - name: module_name 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. - in: query - required: false - type: string - format: byte - - name: pagination.offset - 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. - in: query - required: false - type: string - format: uint64 - - name: pagination.limit - 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. + module_name is a field to query a specific module + consensus version from state. Leaving this empty will + fetch the full list of module versions from state in: query required: false type: string - format: uint64 - - name: pagination.count_total - 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 - required: false - type: boolean tags: - Query - /ibc/core/channel/v1/channels/{channel_id}/ports/{port_id}/packet_commitments/{packet_ack_sequences}/unreceived_acks: + /cosmos/upgrade/v1beta1/upgraded_consensus_state/{last_height}: get: summary: >- - UnreceivedAcks returns all the unreceived IBC acknowledgements - associated + UpgradedConsensusState queries the consensus state that will serve - with a channel and sequences. - operationId: IbcCoreChannelV1UnreceivedAcks + as a trusted kernel for the next version of this chain. It will only be + + stored at the last height of this chain. + + UpgradedConsensusState RPC not supported with legacy querier + + This rpc is deprecated now that IBC has its own replacement + + (https://github.com/cosmos/ibc-go/blob/2c880a22e9f9cc75f62b527ca94aa75ce1106001/proto/ibc/core/client/v1/query.proto#L54) + operationId: CosmosUpgradeV1Beta1UpgradedConsensusState responses: '200': description: A successful response. schema: type: object properties: - sequences: - type: array - items: - type: string - format: uint64 - title: list of unreceived acknowledgement sequences - height: - title: query block height - type: object - properties: - revision_number: - type: string - format: uint64 - title: the revision that the client is currently on - revision_height: - type: string - format: uint64 - title: the height within the given revision - description: >- - Normally the RevisionHeight is incremented at each height - while keeping - - RevisionNumber the same. However some consensus algorithms may - choose to - - reset the height in certain conditions e.g. hard forks, - state-machine - - breaking changes In these cases, the RevisionNumber is - incremented so that - - height continues to be monitonically increasing even as the - RevisionHeight + upgraded_consensus_state: + type: string + format: byte + title: 'Since: cosmos-sdk 0.43' + description: >- + QueryUpgradedConsensusStateResponse is the response type for the + Query/UpgradedConsensusState - gets reset - title: |- - QueryUnreceivedAcksResponse is the response type for the - Query/UnreceivedAcks RPC method + RPC method. default: description: An unexpected error response. schema: @@ -18000,80 +18882,94 @@ paths: "value": "1.212s" } parameters: - - name: channel_id - description: channel unique identifier - in: path - required: true - type: string - - name: port_id - description: port unique identifier + - name: last_height + description: |- + last height of the current chain must be sent in request + as this is the height under which next consensus state is stored in: path required: true type: string - - name: packet_ack_sequences - description: list of acknowledgement sequences - in: path - required: true - type: array - items: - type: string - format: uint64 - collectionFormat: csv - minItems: 1 + format: int64 tags: - Query - /ibc/core/channel/v1/channels/{channel_id}/ports/{port_id}/packet_commitments/{packet_commitment_sequences}/unreceived_packets: + /cosmwasm/wasm/v1/code: get: - summary: >- - UnreceivedPackets returns all the unreceived IBC packets associated with - a - - channel and sequences. - operationId: IbcCoreChannelV1UnreceivedPackets + summary: Codes gets the metadata for all stored wasm codes + operationId: CosmwasmWasmV1Codes responses: '200': description: A successful response. schema: type: object properties: - sequences: + code_infos: type: array items: - type: string - format: uint64 - title: list of unreceived packet sequences - height: - title: query block height - type: object - properties: - revision_number: - type: string - format: uint64 - title: the revision that the client is currently on - revision_height: - type: string - format: uint64 - title: the height within the given revision - description: >- - Normally the RevisionHeight is incremented at each height - while keeping - - RevisionNumber the same. However some consensus algorithms may - choose to - - reset the height in certain conditions e.g. hard forks, - state-machine - - breaking changes In these cases, the RevisionNumber is - incremented so that - - height continues to be monitonically increasing even as the - RevisionHeight + type: object + properties: + code_id: + type: string + format: uint64 + title: id for legacy support + creator: + type: string + data_hash: + type: string + format: byte + instantiate_permission: + type: object + properties: + permission: + type: string + enum: + - ACCESS_TYPE_UNSPECIFIED + - ACCESS_TYPE_NOBODY + - ACCESS_TYPE_ONLY_ADDRESS + - ACCESS_TYPE_EVERYBODY + - ACCESS_TYPE_ANY_OF_ADDRESSES + default: ACCESS_TYPE_UNSPECIFIED + description: >- + - ACCESS_TYPE_UNSPECIFIED: AccessTypeUnspecified + placeholder for empty value + - ACCESS_TYPE_NOBODY: AccessTypeNobody forbidden + - ACCESS_TYPE_ONLY_ADDRESS: AccessTypeOnlyAddress restricted to a single address + Deprecated: use AccessTypeAnyOfAddresses instead + - ACCESS_TYPE_EVERYBODY: AccessTypeEverybody unrestricted + - ACCESS_TYPE_ANY_OF_ADDRESSES: AccessTypeAnyOfAddresses allow any of the addresses + title: AccessType permission types + address: + type: string + title: |- + Address + Deprecated: replaced by addresses + addresses: + type: array + items: + type: string + description: AccessConfig access control type. + title: CodeInfoResponse contains code meta data from CodeInfo + pagination: + description: pagination defines the pagination in the response. + type: object + properties: + next_key: + type: string + format: byte + 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. + total: + type: string + format: uint64 + title: >- + total is total number of results available if + PageRequest.count_total - gets reset - title: |- - QueryUnreceivedPacketsResponse is the response type for the - Query/UnreceivedPacketCommitments RPC method + was set, its value is undefined otherwise + title: >- + QueryCodesResponse is the response type for the Query/Codes RPC + method default: description: An unexpected error response. schema: @@ -18260,83 +19156,124 @@ paths: "value": "1.212s" } parameters: - - name: channel_id - description: channel unique identifier - in: path - required: true + - name: pagination.key + 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. + in: query + required: false type: string - - name: port_id - description: port unique identifier - in: path - required: true + format: byte + - name: pagination.offset + 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. + in: query + required: false type: string - - name: packet_commitment_sequences - description: list of packet sequences - in: path - required: true - type: array - items: - type: string - format: uint64 - collectionFormat: csv - minItems: 1 + format: uint64 + - name: pagination.limit + 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. + in: query + required: false + type: string + format: uint64 + - name: pagination.count_total + 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 + required: false + type: boolean + - name: pagination.reverse + description: >- + reverse is set to true if results are to be returned in the + descending order. + + + Since: cosmos-sdk 0.43 + in: query + required: false + type: boolean tags: - Query - /ibc/core/channel/v1/channels/{channel_id}/ports/{port_id}/packet_commitments/{sequence}: + /cosmwasm/wasm/v1/code/{code_id}: get: - summary: PacketCommitment queries a stored packet commitment hash. - operationId: IbcCoreChannelV1PacketCommitment + summary: Code gets the binary code and metadata for a singe wasm code + operationId: CosmwasmWasmV1Code responses: '200': description: A successful response. schema: type: object properties: - commitment: - type: string - format: byte - title: packet associated with the request fields - proof: - type: string - format: byte - title: merkle proof of existence - proof_height: - title: height at which the proof was retrieved + code_info: type: object properties: - revision_number: + code_id: type: string format: uint64 - title: the revision that the client is currently on - revision_height: + title: id for legacy support + creator: type: string - format: uint64 - title: the height within the given revision - description: >- - Normally the RevisionHeight is incremented at each height - while keeping - - RevisionNumber the same. However some consensus algorithms may - choose to - - reset the height in certain conditions e.g. hard forks, - state-machine - - breaking changes In these cases, the RevisionNumber is - incremented so that - - height continues to be monitonically increasing even as the - RevisionHeight - - gets reset + data_hash: + type: string + format: byte + instantiate_permission: + type: object + properties: + permission: + type: string + enum: + - ACCESS_TYPE_UNSPECIFIED + - ACCESS_TYPE_NOBODY + - ACCESS_TYPE_ONLY_ADDRESS + - ACCESS_TYPE_EVERYBODY + - ACCESS_TYPE_ANY_OF_ADDRESSES + default: ACCESS_TYPE_UNSPECIFIED + description: >- + - ACCESS_TYPE_UNSPECIFIED: AccessTypeUnspecified + placeholder for empty value + - ACCESS_TYPE_NOBODY: AccessTypeNobody forbidden + - ACCESS_TYPE_ONLY_ADDRESS: AccessTypeOnlyAddress restricted to a single address + Deprecated: use AccessTypeAnyOfAddresses instead + - ACCESS_TYPE_EVERYBODY: AccessTypeEverybody unrestricted + - ACCESS_TYPE_ANY_OF_ADDRESSES: AccessTypeAnyOfAddresses allow any of the addresses + title: AccessType permission types + address: + type: string + title: |- + Address + Deprecated: replaced by addresses + addresses: + type: array + items: + type: string + description: AccessConfig access control type. + title: CodeInfoResponse contains code meta data from CodeInfo + data: + type: string + format: byte title: >- - QueryPacketCommitmentResponse defines the client query response - for a packet - - which also includes a proof and the height from which the proof - was - - retrieved + QueryCodeResponse is the response type for the Query/Code RPC + method default: description: An unexpected error response. schema: @@ -18523,82 +19460,51 @@ paths: "value": "1.212s" } parameters: - - name: channel_id - description: channel unique identifier - in: path - required: true - type: string - - name: port_id - description: port unique identifier - in: path - required: true - type: string - - name: sequence - description: packet sequence + - name: code_id + description: grpc-gateway_out does not support Go style CodID in: path required: true type: string format: uint64 tags: - Query - /ibc/core/channel/v1/channels/{channel_id}/ports/{port_id}/packet_receipts/{sequence}: + /cosmwasm/wasm/v1/code/{code_id}/contracts: get: - summary: >- - PacketReceipt queries if a given packet sequence has been received on - the - - queried chain - operationId: IbcCoreChannelV1PacketReceipt + summary: ContractsByCode lists all smart contracts for a code id + operationId: CosmwasmWasmV1ContractsByCode responses: '200': description: A successful response. schema: type: object properties: - received: - type: boolean - title: success flag for if receipt exists - proof: - type: string - format: byte - title: merkle proof of existence - proof_height: - title: height at which the proof was retrieved + contracts: + type: array + items: + type: string + title: contracts are a set of contract addresses + pagination: + description: pagination defines the pagination in the response. type: object properties: - revision_number: + next_key: type: string - format: uint64 - title: the revision that the client is currently on - revision_height: + format: byte + 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. + total: type: string format: uint64 - title: the height within the given revision - description: >- - Normally the RevisionHeight is incremented at each height - while keeping - - RevisionNumber the same. However some consensus algorithms may - choose to - - reset the height in certain conditions e.g. hard forks, - state-machine - - breaking changes In these cases, the RevisionNumber is - incremented so that - - height continues to be monitonically increasing even as the - RevisionHeight - - gets reset - title: >- - QueryPacketReceiptResponse defines the client query response for a - packet - - receipt which also includes a proof, and the height from which the - proof was + title: >- + total is total number of results available if + PageRequest.count_total - retrieved + was set, its value is undefined otherwise + title: |- + QueryContractsByCodeResponse is the response type for the + Query/ContractsByCode RPC method default: description: An unexpected error response. schema: @@ -18785,176 +19691,136 @@ paths: "value": "1.212s" } parameters: - - name: channel_id - description: channel unique identifier + - name: code_id + description: grpc-gateway_out does not support Go style CodID in: path required: true type: string - - name: port_id - description: port unique identifier - in: path - required: true + format: uint64 + - name: pagination.key + 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. + in: query + required: false type: string - - name: sequence - description: packet sequence - in: path - required: true + format: byte + - name: pagination.offset + 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. + in: query + required: false + type: string + format: uint64 + - name: pagination.limit + 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. + in: query + required: false type: string format: uint64 + - name: pagination.count_total + 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 + required: false + type: boolean + - name: pagination.reverse + description: >- + reverse is set to true if results are to be returned in the + descending order. + + + Since: cosmos-sdk 0.43 + in: query + required: false + type: boolean tags: - Query - /ibc/core/channel/v1/connections/{connection}/channels: + /cosmwasm/wasm/v1/codes/params: get: - summary: |- - ConnectionChannels queries all the channels associated with a connection - end. - operationId: IbcCoreChannelV1ConnectionChannels + summary: Params gets the module params + operationId: CosmwasmWasmV1Params responses: '200': description: A successful response. schema: type: object properties: - channels: - type: array - items: - type: object - properties: - state: - title: current state of the channel end - type: string - enum: - - STATE_UNINITIALIZED_UNSPECIFIED - - STATE_INIT - - STATE_TRYOPEN - - STATE_OPEN - - STATE_CLOSED - default: STATE_UNINITIALIZED_UNSPECIFIED - description: >- - State defines if a channel is in one of the following - states: - - CLOSED, INIT, TRYOPEN, OPEN or UNINITIALIZED. - - - STATE_UNINITIALIZED_UNSPECIFIED: Default State - - STATE_INIT: A channel has just started the opening handshake. - - STATE_TRYOPEN: A channel has acknowledged the handshake step on the counterparty chain. - - STATE_OPEN: A channel has completed the handshake. Open channels are - ready to send and receive packets. - - STATE_CLOSED: A channel has been closed and can no longer be used to send or receive - packets. - ordering: - title: whether the channel is ordered or unordered - type: string - enum: - - ORDER_NONE_UNSPECIFIED - - ORDER_UNORDERED - - ORDER_ORDERED - default: ORDER_NONE_UNSPECIFIED - description: >- - - ORDER_NONE_UNSPECIFIED: zero-value for channel - ordering - - ORDER_UNORDERED: packets can be delivered in any order, which may differ from the order in - which they were sent. - - ORDER_ORDERED: packets are delivered exactly in the order which they were sent - counterparty: - title: counterparty channel end - type: object - properties: - port_id: - type: string - description: >- - port on the counterparty chain which owns the other - end of the channel. - channel_id: - type: string - title: channel end on the counterparty chain - connection_hops: - type: array - items: - type: string - title: >- - list of connection identifiers, in order, along which - packets sent on - - this channel will travel - version: - type: string - title: >- - opaque channel version, which is agreed upon during the - handshake - port_id: - type: string - title: port identifier - channel_id: - type: string - title: channel identifier - description: >- - IdentifiedChannel defines a channel with additional port and - channel - - identifier fields. - description: list of channels associated with a connection. - pagination: - title: pagination response - type: object - properties: - next_key: - type: string - format: byte - title: |- - next_key is the key to be passed to PageRequest.key to - query the next page most efficiently - total: - type: string - format: uint64 - title: >- - total is total number of results available if - PageRequest.count_total - - was set, its value is undefined otherwise - 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; - } - height: - title: query block height + params: + description: params defines the parameters of the module. type: object properties: - revision_number: - type: string - format: uint64 - title: the revision that the client is currently on - revision_height: + code_upload_access: + type: object + properties: + permission: + type: string + enum: + - ACCESS_TYPE_UNSPECIFIED + - ACCESS_TYPE_NOBODY + - ACCESS_TYPE_ONLY_ADDRESS + - ACCESS_TYPE_EVERYBODY + - ACCESS_TYPE_ANY_OF_ADDRESSES + default: ACCESS_TYPE_UNSPECIFIED + description: >- + - ACCESS_TYPE_UNSPECIFIED: AccessTypeUnspecified + placeholder for empty value + - ACCESS_TYPE_NOBODY: AccessTypeNobody forbidden + - ACCESS_TYPE_ONLY_ADDRESS: AccessTypeOnlyAddress restricted to a single address + Deprecated: use AccessTypeAnyOfAddresses instead + - ACCESS_TYPE_EVERYBODY: AccessTypeEverybody unrestricted + - ACCESS_TYPE_ANY_OF_ADDRESSES: AccessTypeAnyOfAddresses allow any of the addresses + title: AccessType permission types + address: + type: string + title: |- + Address + Deprecated: replaced by addresses + addresses: + type: array + items: + type: string + description: AccessConfig access control type. + instantiate_default_permission: type: string - format: uint64 - title: the height within the given revision - description: >- - Normally the RevisionHeight is incremented at each height - while keeping - - RevisionNumber the same. However some consensus algorithms may - choose to - - reset the height in certain conditions e.g. hard forks, - state-machine - - breaking changes In these cases, the RevisionNumber is - incremented so that - - height continues to be monitonically increasing even as the - RevisionHeight - - gets reset - title: |- - QueryConnectionChannelsResponse is the Response type for the - Query/QueryConnectionChannels RPC method + enum: + - ACCESS_TYPE_UNSPECIFIED + - ACCESS_TYPE_NOBODY + - ACCESS_TYPE_ONLY_ADDRESS + - ACCESS_TYPE_EVERYBODY + - ACCESS_TYPE_ANY_OF_ADDRESSES + default: ACCESS_TYPE_UNSPECIFIED + description: >- + - ACCESS_TYPE_UNSPECIFIED: AccessTypeUnspecified + placeholder for empty value + - ACCESS_TYPE_NOBODY: AccessTypeNobody forbidden + - ACCESS_TYPE_ONLY_ADDRESS: AccessTypeOnlyAddress restricted to a single address + Deprecated: use AccessTypeAnyOfAddresses instead + - ACCESS_TYPE_EVERYBODY: AccessTypeEverybody unrestricted + - ACCESS_TYPE_ANY_OF_ADDRESSES: AccessTypeAnyOfAddresses allow any of the addresses + title: AccessType permission types + description: >- + QueryParamsResponse is the response type for the Query/Params RPC + method. default: description: An unexpected error response. schema: @@ -19140,86 +20006,45 @@ paths: "@type": "type.googleapis.com/google.protobuf.Duration", "value": "1.212s" } - parameters: - - name: connection - description: connection unique identifier - in: path - required: true - type: string - - name: pagination.key - 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. - in: query - required: false - type: string - format: byte - - name: pagination.offset - 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. - in: query - required: false - type: string - format: uint64 - - name: pagination.limit - 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. - in: query - required: false - type: string - format: uint64 - - name: pagination.count_total - 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 - required: false - type: boolean tags: - Query - /ibc/client/v1/params: + /cosmwasm/wasm/v1/codes/pinned: get: - summary: ClientParams queries all parameters of the ibc client. - operationId: IbcCoreClientV1ClientParams + summary: PinnedCodes gets the pinned code ids + operationId: CosmwasmWasmV1PinnedCodes responses: '200': description: A successful response. schema: type: object properties: - params: - description: params defines the parameters of the module. + code_ids: + type: array + items: + type: string + format: uint64 + pagination: + description: pagination defines the pagination in the response. type: object properties: - allowed_clients: - type: array - items: - type: string - description: >- - allowed_clients defines the list of allowed client state - types. - description: >- - QueryClientParamsResponse is the response type for the - Query/ClientParams RPC + next_key: + type: string + format: byte + 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. + total: + type: string + format: uint64 + title: >- + total is total number of results available if + PageRequest.count_total - method. + was set, its value is undefined otherwise + title: |- + QueryPinnedCodesResponse is the response type for the + Query/PinnedCodes RPC method default: description: An unexpected error response. schema: @@ -19405,241 +20230,187 @@ paths: "@type": "type.googleapis.com/google.protobuf.Duration", "value": "1.212s" } + parameters: + - name: pagination.key + 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. + in: query + required: false + type: string + format: byte + - name: pagination.offset + 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. + in: query + required: false + type: string + format: uint64 + - name: pagination.limit + 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. + in: query + required: false + type: string + format: uint64 + - name: pagination.count_total + 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 + required: false + type: boolean + - name: pagination.reverse + description: >- + reverse is set to true if results are to be returned in the + descending order. + + + Since: cosmos-sdk 0.43 + in: query + required: false + type: boolean tags: - Query - /ibc/core/client/v1/client_states: + /cosmwasm/wasm/v1/contract/{address}: get: - summary: ClientStates queries all the IBC light clients of a chain. - operationId: IbcCoreClientV1ClientStates + summary: ContractInfo gets the contract meta data + operationId: CosmwasmWasmV1ContractInfo responses: '200': description: A successful response. schema: type: object properties: - client_states: - type: array - items: - type: object - properties: - client_id: - type: string - title: client identifier - client_state: - title: client state - type: object - properties: - '@type': - type: string - description: >- - A URL/resource name that uniquely identifies the - type of the serialized - - protocol buffer message. This string must contain at - least + address: + type: string + title: address is the address of the contract + contract_info: + type: object + properties: + code_id: + type: string + format: uint64 + title: CodeID is the reference to the stored Wasm code + creator: + type: string + title: Creator address who initially instantiated the contract + admin: + type: string + title: Admin is an optional address that can execute migrations + label: + type: string + description: >- + Label is optional metadata to be stored with a contract + instance. + created: + description: Created Tx position when the contract was instantiated. + type: object + properties: + block_height: + type: string + format: uint64 + title: BlockHeight is the block the contract was created at + tx_index: + type: string + format: uint64 + title: >- + TxIndex is a monotonic counter within the block + (actual transaction index, - one "/" character. The last segment of the URL's - path must represent + or gas consumed) + ibc_port_id: + type: string + extension: + description: >- + Extension is an extension point to store custom metadata + within the - the fully qualified name of the type (as in + persistence model. + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type + of the serialized - `path/google.protobuf.Duration`). The name should be - in a canonical form + protocol buffer message. This string must contain at + least - (e.g., leading "." is not accepted). + one "/" character. The last segment of the URL's path + must represent + the fully qualified name of the type (as in - In practice, teams usually precompile into the - binary all types that they + `path/google.protobuf.Duration`). The name should be + in a canonical form - expect it to use in the context of Any. However, for - URLs which use the + (e.g., leading "." is not accepted). - scheme `http`, `https`, or no scheme, one can - optionally set up a type - server that maps type URLs to message definitions as - follows: + In practice, teams usually precompile into the binary + all types that they + expect it to use in the context of Any. However, for + URLs which use the - * If no scheme is provided, `https` is assumed. - - * An HTTP GET on the URL must yield a - [google.protobuf.Type][] - value in binary format, or produce an error. - * Applications are allowed to cache lookup results - based on the - URL, or have them precompiled into a binary to avoid any - lookup. Therefore, binary compatibility needs to be preserved - on changes to types. (Use versioned type names to manage - breaking changes.) - - Note: this functionality is not currently available - in the official - - protobuf release, and it is not used for type URLs - beginning with - - type.googleapis.com. - - - Schemes other than `http`, `https` (or the empty - scheme) might be - - used with implementation specific semantics. - additionalProperties: {} - description: >- - `Any` contains an arbitrary serialized protocol buffer - message along with a - - URL that describes the type of the serialized message. - - - Protobuf library provides support to pack/unpack Any - values in the form - - of utility functions or additional generated methods of - the Any type. - - - Example 1: Pack and unpack a message in C++. - - Foo foo = ...; - Any any; - any.PackFrom(foo); - ... - if (any.UnpackTo(&foo)) { - ... - } - - Example 2: Pack and unpack a message in Java. - - Foo foo = ...; - Any any = Any.pack(foo); - ... - if (any.is(Foo.class)) { - foo = any.unpack(Foo.class); - } - - Example 3: Pack and unpack a message in Python. - - foo = Foo(...) - any = Any() - any.Pack(foo) - ... - if any.Is(Foo.DESCRIPTOR): - any.Unpack(foo) - ... - - Example 4: Pack and unpack a message in Go - - foo := &pb.Foo{...} - any, err := anypb.New(foo) - if err != nil { - ... - } - ... - foo := &pb.Foo{} - if err := any.UnmarshalTo(foo); err != nil { - ... - } - - The pack methods provided by protobuf library will by - default use - - 'type.googleapis.com/full.type.name' as the type URL and - the unpack - - methods only use the fully qualified type name after the - last '/' - - in the type URL, for example "foo.bar.com/x/y.z" will - yield type - - name "y.z". - - - - JSON - - ==== - - The JSON representation of an `Any` value uses the - regular - - representation of the deserialized, embedded message, - with an - - additional field `@type` which contains the type URL. - Example: - - package google.profile; - message Person { - string first_name = 1; - string last_name = 2; - } + scheme `http`, `https`, or no scheme, one can + optionally set up a type - { - "@type": "type.googleapis.com/google.profile.Person", - "firstName": , - "lastName": - } + server that maps type URLs to message definitions as + follows: - If the embedded message type is well-known and has a - custom JSON - representation, that representation will be embedded - adding a field + * If no scheme is provided, `https` is assumed. - `value` which holds the custom JSON in addition to the - `@type` + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results + based on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) - field. Example (for message - [google.protobuf.Duration][]): + Note: this functionality is not currently available in + the official - { - "@type": "type.googleapis.com/google.protobuf.Duration", - "value": "1.212s" - } - description: >- - IdentifiedClientState defines a client state with an - additional client + protobuf release, and it is not used for type URLs + beginning with - identifier field. - description: list of stored ClientStates of the chain. - pagination: - title: pagination response - type: object - properties: - next_key: - type: string - format: byte - title: |- - next_key is the key to be passed to PageRequest.key to - query the next page most efficiently - total: - type: string - format: uint64 - title: >- - total is total number of results available if - PageRequest.count_total + type.googleapis.com. - was set, its value is undefined otherwise - description: >- - PageResponse is to be embedded in gRPC response messages where - the - corresponding request message has used PageRequest. + Schemes other than `http`, `https` (or the empty + scheme) might be - message SomeResponse { - repeated Bar results = 1; - PageResponse page = 2; - } - description: >- - QueryClientStatesResponse is the response type for the - Query/ClientStates RPC + used with implementation specific semantics. + additionalProperties: {} + title: ContractInfo stores a WASM contract instance + title: >- + QueryContractInfoResponse is the response type for the + Query/ContractInfo RPC - method. + method default: description: An unexpected error response. schema: @@ -19826,275 +20597,92 @@ paths: "value": "1.212s" } parameters: - - name: pagination.key - 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. - in: query - required: false - type: string - format: byte - - name: pagination.offset - 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. - in: query - required: false - type: string - format: uint64 - - name: pagination.limit - 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. - in: query - required: false + - name: address + description: address is the address of the contract to query + in: path + required: true type: string - format: uint64 - - name: pagination.count_total - 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 - required: false - type: boolean tags: - Query - /ibc/core/client/v1/client_states/{client_id}: + /cosmwasm/wasm/v1/contract/{address}/history: get: - summary: ClientState queries an IBC light client. - operationId: IbcCoreClientV1ClientState + summary: ContractHistory gets the contract code history + operationId: CosmwasmWasmV1ContractHistory responses: '200': description: A successful response. schema: type: object properties: - client_state: - title: client state associated with the request identifier - type: object - properties: - '@type': - type: string - description: >- - A URL/resource name that uniquely identifies the type of - the serialized - - protocol buffer message. This string must contain at least - - one "/" character. The last segment of the URL's path must - represent - - the fully qualified name of the type (as in - - `path/google.protobuf.Duration`). The name should be in a - canonical form - - (e.g., leading "." is not accepted). - - - In practice, teams usually precompile into the binary all - types that they - - expect it to use in the context of Any. However, for URLs - which use the - - scheme `http`, `https`, or no scheme, one can optionally - set up a type - - server that maps type URLs to message definitions as - follows: - - - * If no scheme is provided, `https` is assumed. - - * An HTTP GET on the URL must yield a - [google.protobuf.Type][] - value in binary format, or produce an error. - * Applications are allowed to cache lookup results based - on the - URL, or have them precompiled into a binary to avoid any - lookup. Therefore, binary compatibility needs to be preserved - on changes to types. (Use versioned type names to manage - breaking changes.) - - Note: this functionality is not currently available in the - official - - protobuf release, and it is not used for type URLs - beginning with - - type.googleapis.com. - - - Schemes other than `http`, `https` (or the empty scheme) - might be - - used with implementation specific semantics. - additionalProperties: {} - description: >- - `Any` contains an arbitrary serialized protocol buffer message - along with a - - URL that describes the type of the serialized message. - - - Protobuf library provides support to pack/unpack Any values in - the form - - of utility functions or additional generated methods of the - Any type. - - - Example 1: Pack and unpack a message in C++. - - Foo foo = ...; - Any any; - any.PackFrom(foo); - ... - if (any.UnpackTo(&foo)) { - ... - } - - Example 2: Pack and unpack a message in Java. - - Foo foo = ...; - Any any = Any.pack(foo); - ... - if (any.is(Foo.class)) { - foo = any.unpack(Foo.class); - } - - Example 3: Pack and unpack a message in Python. - - foo = Foo(...) - any = Any() - any.Pack(foo) - ... - if any.Is(Foo.DESCRIPTOR): - any.Unpack(foo) - ... - - Example 4: Pack and unpack a message in Go - - foo := &pb.Foo{...} - any, err := anypb.New(foo) - if err != nil { - ... - } - ... - foo := &pb.Foo{} - if err := any.UnmarshalTo(foo); err != nil { - ... - } - - The pack methods provided by protobuf library will by default - use - - 'type.googleapis.com/full.type.name' as the type URL and the - unpack - - methods only use the fully qualified type name after the last - '/' - - in the type URL, for example "foo.bar.com/x/y.z" will yield - type - - name "y.z". - - - - JSON - - ==== - - The JSON representation of an `Any` value uses the regular - - representation of the deserialized, embedded message, with an - - additional field `@type` which contains the type URL. Example: - - package google.profile; - message Person { - string first_name = 1; - string last_name = 2; - } - - { - "@type": "type.googleapis.com/google.profile.Person", - "firstName": , - "lastName": - } - - If the embedded message type is well-known and has a custom - JSON - - representation, that representation will be embedded adding a - field - - `value` which holds the custom JSON in addition to the `@type` - - field. Example (for message [google.protobuf.Duration][]): + entries: + type: array + items: + type: object + properties: + operation: + type: string + enum: + - CONTRACT_CODE_HISTORY_OPERATION_TYPE_UNSPECIFIED + - CONTRACT_CODE_HISTORY_OPERATION_TYPE_INIT + - CONTRACT_CODE_HISTORY_OPERATION_TYPE_MIGRATE + - CONTRACT_CODE_HISTORY_OPERATION_TYPE_GENESIS + default: CONTRACT_CODE_HISTORY_OPERATION_TYPE_UNSPECIFIED + description: >- + - CONTRACT_CODE_HISTORY_OPERATION_TYPE_UNSPECIFIED: + ContractCodeHistoryOperationTypeUnspecified placeholder + for empty value + - CONTRACT_CODE_HISTORY_OPERATION_TYPE_INIT: ContractCodeHistoryOperationTypeInit on chain contract instantiation + - CONTRACT_CODE_HISTORY_OPERATION_TYPE_MIGRATE: ContractCodeHistoryOperationTypeMigrate code migration + - CONTRACT_CODE_HISTORY_OPERATION_TYPE_GENESIS: ContractCodeHistoryOperationTypeGenesis based on genesis data + title: >- + ContractCodeHistoryOperationType actions that caused a + code change + code_id: + type: string + format: uint64 + title: CodeID is the reference to the stored WASM code + updated: + description: Updated Tx position when the operation was executed. + type: object + properties: + block_height: + type: string + format: uint64 + title: BlockHeight is the block the contract was created at + tx_index: + type: string + format: uint64 + title: >- + TxIndex is a monotonic counter within the block + (actual transaction index, - { - "@type": "type.googleapis.com/google.protobuf.Duration", - "value": "1.212s" - } - proof: - type: string - format: byte - title: merkle proof of existence - proof_height: - title: height at which the proof was retrieved + or gas consumed) + msg: + type: string + format: byte + description: ContractCodeHistoryEntry metadata to a contract. + pagination: + description: pagination defines the pagination in the response. type: object properties: - revision_number: + next_key: type: string - format: uint64 - title: the revision that the client is currently on - revision_height: + format: byte + 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. + total: type: string format: uint64 - title: the height within the given revision - description: >- - Normally the RevisionHeight is incremented at each height - while keeping - - RevisionNumber the same. However some consensus algorithms may - choose to - - reset the height in certain conditions e.g. hard forks, - state-machine - - breaking changes In these cases, the RevisionNumber is - incremented so that - - height continues to be monitonically increasing even as the - RevisionHeight - - gets reset - description: >- - QueryClientStateResponse is the response type for the - Query/ClientState RPC - - method. Besides the client state, it includes a proof and the - height from + title: >- + total is total number of results available if + PageRequest.count_total - which the proof was retrieved. + was set, its value is undefined otherwise + title: |- + QueryContractHistoryResponse is the response type for the + Query/ContractHistory RPC method default: description: An unexpected error response. schema: @@ -20281,30 +20869,86 @@ paths: "value": "1.212s" } parameters: - - name: client_id - description: client state unique identifier + - name: address + description: address is the address of the contract to query in: path required: true type: string + - name: pagination.key + 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. + in: query + required: false + type: string + format: byte + - name: pagination.offset + 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. + in: query + required: false + type: string + format: uint64 + - name: pagination.limit + 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. + in: query + required: false + type: string + format: uint64 + - name: pagination.count_total + 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 + required: false + type: boolean + - name: pagination.reverse + description: >- + reverse is set to true if results are to be returned in the + descending order. + + + Since: cosmos-sdk 0.43 + in: query + required: false + type: boolean tags: - Query - /ibc/core/client/v1/client_status/{client_id}: + /cosmwasm/wasm/v1/contract/{address}/raw/{query_data}: get: - summary: Status queries the status of an IBC client. - operationId: IbcCoreClientV1ClientStatus + summary: RawContractState gets single key from the raw store data of a contract + operationId: CosmwasmWasmV1RawContractState responses: '200': description: A successful response. schema: type: object properties: - status: + data: type: string - description: >- - QueryClientStatusResponse is the response type for the - Query/ClientStatus RPC - - method. It returns the current status of the IBC client. + format: byte + title: Data contains the raw store data + title: |- + QueryRawContractStateResponse is the response type for the + Query/RawContractState RPC method default: description: An unexpected error response. schema: @@ -20491,272 +21135,35 @@ paths: "value": "1.212s" } parameters: - - name: client_id - description: client unique identifier + - name: address + description: address is the address of the contract + in: path + required: true + type: string + - name: query_data in: path required: true type: string + format: byte tags: - Query - /ibc/core/client/v1/consensus_states/{client_id}: + /cosmwasm/wasm/v1/contract/{address}/smart/{query_data}: get: - summary: |- - ConsensusStates queries all the consensus state associated with a given - client. - operationId: IbcCoreClientV1ConsensusStates + summary: SmartContractState get smart query result from the contract + operationId: CosmwasmWasmV1SmartContractState responses: '200': description: A successful response. schema: type: object properties: - consensus_states: - type: array - items: - type: object - properties: - height: - title: consensus state height - type: object - properties: - revision_number: - type: string - format: uint64 - title: the revision that the client is currently on - revision_height: - type: string - format: uint64 - title: the height within the given revision - description: >- - Normally the RevisionHeight is incremented at each - height while keeping - - RevisionNumber the same. However some consensus - algorithms may choose to - - reset the height in certain conditions e.g. hard forks, - state-machine - - breaking changes In these cases, the RevisionNumber is - incremented so that - - height continues to be monitonically increasing even as - the RevisionHeight - - gets reset - consensus_state: - title: consensus state - type: object - properties: - '@type': - type: string - description: >- - A URL/resource name that uniquely identifies the - type of the serialized - - protocol buffer message. This string must contain at - least - - one "/" character. The last segment of the URL's - path must represent - - the fully qualified name of the type (as in - - `path/google.protobuf.Duration`). The name should be - in a canonical form - - (e.g., leading "." is not accepted). - - - In practice, teams usually precompile into the - binary all types that they - - expect it to use in the context of Any. However, for - URLs which use the - - scheme `http`, `https`, or no scheme, one can - optionally set up a type - - server that maps type URLs to message definitions as - follows: - - - * If no scheme is provided, `https` is assumed. - - * An HTTP GET on the URL must yield a - [google.protobuf.Type][] - value in binary format, or produce an error. - * Applications are allowed to cache lookup results - based on the - URL, or have them precompiled into a binary to avoid any - lookup. Therefore, binary compatibility needs to be preserved - on changes to types. (Use versioned type names to manage - breaking changes.) - - Note: this functionality is not currently available - in the official - - protobuf release, and it is not used for type URLs - beginning with - - type.googleapis.com. - - - Schemes other than `http`, `https` (or the empty - scheme) might be - - used with implementation specific semantics. - additionalProperties: {} - description: >- - `Any` contains an arbitrary serialized protocol buffer - message along with a - - URL that describes the type of the serialized message. - - - Protobuf library provides support to pack/unpack Any - values in the form - - of utility functions or additional generated methods of - the Any type. - - - Example 1: Pack and unpack a message in C++. - - Foo foo = ...; - Any any; - any.PackFrom(foo); - ... - if (any.UnpackTo(&foo)) { - ... - } - - Example 2: Pack and unpack a message in Java. - - Foo foo = ...; - Any any = Any.pack(foo); - ... - if (any.is(Foo.class)) { - foo = any.unpack(Foo.class); - } - - Example 3: Pack and unpack a message in Python. - - foo = Foo(...) - any = Any() - any.Pack(foo) - ... - if any.Is(Foo.DESCRIPTOR): - any.Unpack(foo) - ... - - Example 4: Pack and unpack a message in Go - - foo := &pb.Foo{...} - any, err := anypb.New(foo) - if err != nil { - ... - } - ... - foo := &pb.Foo{} - if err := any.UnmarshalTo(foo); err != nil { - ... - } - - The pack methods provided by protobuf library will by - default use - - 'type.googleapis.com/full.type.name' as the type URL and - the unpack - - methods only use the fully qualified type name after the - last '/' - - in the type URL, for example "foo.bar.com/x/y.z" will - yield type - - name "y.z". - - - - JSON - - ==== - - The JSON representation of an `Any` value uses the - regular - - representation of the deserialized, embedded message, - with an - - additional field `@type` which contains the type URL. - Example: - - package google.profile; - message Person { - string first_name = 1; - string last_name = 2; - } - - { - "@type": "type.googleapis.com/google.profile.Person", - "firstName": , - "lastName": - } - - If the embedded message type is well-known and has a - custom JSON - - representation, that representation will be embedded - adding a field - - `value` which holds the custom JSON in addition to the - `@type` - - field. Example (for message - [google.protobuf.Duration][]): - - { - "@type": "type.googleapis.com/google.protobuf.Duration", - "value": "1.212s" - } - description: >- - ConsensusStateWithHeight defines a consensus state with an - additional height - - field. - title: consensus states associated with the identifier - pagination: - title: pagination response - type: object - properties: - next_key: - type: string - format: byte - title: |- - next_key is the key to be passed to PageRequest.key to - query the next page most efficiently - total: - type: string - format: uint64 - title: >- - total is total number of results available if - PageRequest.count_total - - was set, its value is undefined otherwise - 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; - } + data: + type: string + format: byte + title: Data contains the json data returned from the smart contract title: |- - QueryConsensusStatesResponse is the response type for the - Query/ConsensusStates RPC method + QuerySmartContractStateResponse is the response type for the + Query/SmartContractState RPC method default: description: An unexpected error response. schema: @@ -20943,119 +21350,54 @@ paths: "value": "1.212s" } parameters: - - name: client_id - description: client identifier + - name: address + description: address is the address of the contract in: path required: true type: string - - name: pagination.key - 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. - in: query - required: false + - name: query_data + description: QueryData contains the query data passed to the contract + in: path + required: true type: string format: byte - - name: pagination.offset - 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. - in: query - required: false - type: string - format: uint64 - - name: pagination.limit - 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. - in: query - required: false - type: string - format: uint64 - - name: pagination.count_total - 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 - required: false - type: boolean tags: - Query - /ibc/core/client/v1/consensus_states/{client_id}/heights: + /cosmwasm/wasm/v1/contract/{address}/state: get: - summary: >- - ConsensusStateHeights queries the height of every consensus states - associated with a given client. - operationId: IbcCoreClientV1ConsensusStateHeights + summary: AllContractState gets all raw store data for a single contract + operationId: CosmwasmWasmV1AllContractState responses: '200': description: A successful response. schema: type: object properties: - consensus_state_heights: + models: type: array items: type: object properties: - revision_number: + key: type: string - format: uint64 - title: the revision that the client is currently on - revision_height: + format: byte + title: hex-encode key to read it better (this is often ascii) + value: type: string - format: uint64 - title: the height within the given revision - description: >- - Normally the RevisionHeight is incremented at each height - while keeping - - RevisionNumber the same. However some consensus algorithms - may choose to - - reset the height in certain conditions e.g. hard forks, - state-machine - - breaking changes In these cases, the RevisionNumber is - incremented so that - - height continues to be monitonically increasing even as the - RevisionHeight - - gets reset - title: >- - Height is a monotonically increasing data type - - that can be compared against another Height for the purposes - of updating and - - freezing clients - title: consensus state heights + format: byte + title: base64-encode raw value + title: Model is a struct that holds a KV pair pagination: - title: pagination response + description: pagination defines the pagination in the response. type: object properties: next_key: type: string format: byte - title: |- + description: |- next_key is the key to be passed to PageRequest.key to - query the next page most efficiently + query the next page most efficiently. It will be empty if + there are no more results. total: type: string format: uint64 @@ -21064,19 +21406,9 @@ paths: PageRequest.count_total was set, its value is undefined otherwise - 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; - } title: |- - QueryConsensusStateHeightsResponse is the response type for the - Query/ConsensusStateHeights RPC method + QueryAllContractStateResponse is the response type for the + Query/AllContractState RPC method default: description: An unexpected error response. schema: @@ -21263,8 +21595,8 @@ paths: "value": "1.212s" } parameters: - - name: client_id - description: client identifier + - name: address + description: address is the address of the contract in: path required: true type: string @@ -21314,232 +21646,55 @@ paths: in: query required: false type: boolean + - name: pagination.reverse + description: >- + reverse is set to true if results are to be returned in the + descending order. + + + Since: cosmos-sdk 0.43 + in: query + required: false + type: boolean tags: - Query - /ibc/core/client/v1/consensus_states/{client_id}/revision/{revision_number}/height/{revision_height}: + /cosmwasm/wasm/v1/contracts/creator/{creator_address}: get: - summary: >- - ConsensusState queries a consensus state associated with a client state - at - - a given height. - operationId: IbcCoreClientV1ConsensusState + summary: ContractsByCreator gets the contracts by creator + operationId: CosmwasmWasmV1ContractsByCreator responses: '200': description: A successful response. schema: type: object properties: - consensus_state: - title: >- - consensus state associated with the client identifier at the - given height + contract_addresses: + type: array + items: + type: string + title: ContractAddresses result set + pagination: + description: Pagination defines the pagination in the response. type: object properties: - '@type': + next_key: type: string - description: >- - A URL/resource name that uniquely identifies the type of - the serialized + format: byte + 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. + total: + type: string + format: uint64 + title: >- + total is total number of results available if + PageRequest.count_total - protocol buffer message. This string must contain at least - - one "/" character. The last segment of the URL's path must - represent - - the fully qualified name of the type (as in - - `path/google.protobuf.Duration`). The name should be in a - canonical form - - (e.g., leading "." is not accepted). - - - In practice, teams usually precompile into the binary all - types that they - - expect it to use in the context of Any. However, for URLs - which use the - - scheme `http`, `https`, or no scheme, one can optionally - set up a type - - server that maps type URLs to message definitions as - follows: - - - * If no scheme is provided, `https` is assumed. - - * An HTTP GET on the URL must yield a - [google.protobuf.Type][] - value in binary format, or produce an error. - * Applications are allowed to cache lookup results based - on the - URL, or have them precompiled into a binary to avoid any - lookup. Therefore, binary compatibility needs to be preserved - on changes to types. (Use versioned type names to manage - breaking changes.) - - Note: this functionality is not currently available in the - official - - protobuf release, and it is not used for type URLs - beginning with - - type.googleapis.com. - - - Schemes other than `http`, `https` (or the empty scheme) - might be - - used with implementation specific semantics. - additionalProperties: {} - description: >- - `Any` contains an arbitrary serialized protocol buffer message - along with a - - URL that describes the type of the serialized message. - - - Protobuf library provides support to pack/unpack Any values in - the form - - of utility functions or additional generated methods of the - Any type. - - - Example 1: Pack and unpack a message in C++. - - Foo foo = ...; - Any any; - any.PackFrom(foo); - ... - if (any.UnpackTo(&foo)) { - ... - } - - Example 2: Pack and unpack a message in Java. - - Foo foo = ...; - Any any = Any.pack(foo); - ... - if (any.is(Foo.class)) { - foo = any.unpack(Foo.class); - } - - Example 3: Pack and unpack a message in Python. - - foo = Foo(...) - any = Any() - any.Pack(foo) - ... - if any.Is(Foo.DESCRIPTOR): - any.Unpack(foo) - ... - - Example 4: Pack and unpack a message in Go - - foo := &pb.Foo{...} - any, err := anypb.New(foo) - if err != nil { - ... - } - ... - foo := &pb.Foo{} - if err := any.UnmarshalTo(foo); err != nil { - ... - } - - The pack methods provided by protobuf library will by default - use - - 'type.googleapis.com/full.type.name' as the type URL and the - unpack - - methods only use the fully qualified type name after the last - '/' - - in the type URL, for example "foo.bar.com/x/y.z" will yield - type - - name "y.z". - - - - JSON - - ==== - - The JSON representation of an `Any` value uses the regular - - representation of the deserialized, embedded message, with an - - additional field `@type` which contains the type URL. Example: - - package google.profile; - message Person { - string first_name = 1; - string last_name = 2; - } - - { - "@type": "type.googleapis.com/google.profile.Person", - "firstName": , - "lastName": - } - - If the embedded message type is well-known and has a custom - JSON - - representation, that representation will be embedded adding a - field - - `value` which holds the custom JSON in addition to the `@type` - - field. Example (for message [google.protobuf.Duration][]): - - { - "@type": "type.googleapis.com/google.protobuf.Duration", - "value": "1.212s" - } - proof: - type: string - format: byte - title: merkle proof of existence - proof_height: - title: height at which the proof was retrieved - type: object - properties: - revision_number: - type: string - format: uint64 - title: the revision that the client is currently on - revision_height: - type: string - format: uint64 - title: the height within the given revision - description: >- - Normally the RevisionHeight is incremented at each height - while keeping - - RevisionNumber the same. However some consensus algorithms may - choose to - - reset the height in certain conditions e.g. hard forks, - state-machine - - breaking changes In these cases, the RevisionNumber is - incremented so that - - height continues to be monitonically increasing even as the - RevisionHeight - - gets reset - title: >- - QueryConsensusStateResponse is the response type for the - Query/ConsensusState - - RPC method + was set, its value is undefined otherwise + description: |- + QueryContractsByCreatorResponse is the response type for the + Query/ContractsByCreator RPC method. default: description: An unexpected error response. schema: @@ -21726,217 +21881,86 @@ paths: "value": "1.212s" } parameters: - - name: client_id - description: client identifier + - name: creator_address + description: CreatorAddress is the address of contract creator in: path required: true type: string - - name: revision_number - description: consensus state revision number - in: path - required: true + - name: pagination.key + 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. + in: query + required: false + type: string + format: byte + - name: pagination.offset + 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. + in: query + required: false type: string format: uint64 - - name: revision_height - description: consensus state revision height - in: path - required: true + - name: pagination.limit + 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. + in: query + required: false type: string format: uint64 - - name: latest_height + - name: pagination.count_total description: >- - latest_height overrrides the height field and queries the latest - stored + count_total is set to true to indicate that the result set should + include - ConsensusState + 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 + required: false + type: boolean + - name: pagination.reverse + description: >- + reverse is set to true if results are to be returned in the + descending order. + + + Since: cosmos-sdk 0.43 in: query required: false type: boolean tags: - Query - /ibc/core/client/v1/upgraded_client_states: + /ibc/apps/interchain_accounts/controller/v1/owners/{owner}/connections/{connection_id}: get: - summary: UpgradedClientState queries an Upgraded IBC light client. - operationId: IbcCoreClientV1UpgradedClientState + summary: >- + InterchainAccount returns the interchain account address for a given + owner address on a given connection + operationId: IbcApplicationsInterchainAccountsControllerV1InterchainAccount responses: '200': description: A successful response. schema: type: object properties: - upgraded_client_state: - title: client state associated with the request identifier - type: object - properties: - '@type': - type: string - description: >- - A URL/resource name that uniquely identifies the type of - the serialized - - protocol buffer message. This string must contain at least - - one "/" character. The last segment of the URL's path must - represent - - the fully qualified name of the type (as in - - `path/google.protobuf.Duration`). The name should be in a - canonical form - - (e.g., leading "." is not accepted). - - - In practice, teams usually precompile into the binary all - types that they - - expect it to use in the context of Any. However, for URLs - which use the - - scheme `http`, `https`, or no scheme, one can optionally - set up a type - - server that maps type URLs to message definitions as - follows: - - - * If no scheme is provided, `https` is assumed. - - * An HTTP GET on the URL must yield a - [google.protobuf.Type][] - value in binary format, or produce an error. - * Applications are allowed to cache lookup results based - on the - URL, or have them precompiled into a binary to avoid any - lookup. Therefore, binary compatibility needs to be preserved - on changes to types. (Use versioned type names to manage - breaking changes.) - - Note: this functionality is not currently available in the - official - - protobuf release, and it is not used for type URLs - beginning with - - type.googleapis.com. - - - Schemes other than `http`, `https` (or the empty scheme) - might be - - used with implementation specific semantics. - additionalProperties: {} - description: >- - `Any` contains an arbitrary serialized protocol buffer message - along with a - - URL that describes the type of the serialized message. - - - Protobuf library provides support to pack/unpack Any values in - the form - - of utility functions or additional generated methods of the - Any type. - - - Example 1: Pack and unpack a message in C++. - - Foo foo = ...; - Any any; - any.PackFrom(foo); - ... - if (any.UnpackTo(&foo)) { - ... - } - - Example 2: Pack and unpack a message in Java. - - Foo foo = ...; - Any any = Any.pack(foo); - ... - if (any.is(Foo.class)) { - foo = any.unpack(Foo.class); - } - - Example 3: Pack and unpack a message in Python. - - foo = Foo(...) - any = Any() - any.Pack(foo) - ... - if any.Is(Foo.DESCRIPTOR): - any.Unpack(foo) - ... - - Example 4: Pack and unpack a message in Go - - foo := &pb.Foo{...} - any, err := anypb.New(foo) - if err != nil { - ... - } - ... - foo := &pb.Foo{} - if err := any.UnmarshalTo(foo); err != nil { - ... - } - - The pack methods provided by protobuf library will by default - use - - 'type.googleapis.com/full.type.name' as the type URL and the - unpack - - methods only use the fully qualified type name after the last - '/' - - in the type URL, for example "foo.bar.com/x/y.z" will yield - type - - name "y.z". - - - - JSON - - ==== - - The JSON representation of an `Any` value uses the regular - - representation of the deserialized, embedded message, with an - - additional field `@type` which contains the type URL. Example: - - package google.profile; - message Person { - string first_name = 1; - string last_name = 2; - } - - { - "@type": "type.googleapis.com/google.profile.Person", - "firstName": , - "lastName": - } - - If the embedded message type is well-known and has a custom - JSON - - representation, that representation will be embedded adding a - field - - `value` which holds the custom JSON in addition to the `@type` - - field. Example (for message [google.protobuf.Duration][]): - - { - "@type": "type.googleapis.com/google.protobuf.Duration", - "value": "1.212s" - } - description: |- - QueryUpgradedClientStateResponse is the response type for the - Query/UpgradedClientState RPC method. + address: + type: string + description: >- + QueryInterchainAccountResponse the response type for the + Query/InterchainAccount RPC method. default: description: An unexpected error response. schema: @@ -22122,219 +22146,67 @@ paths: "@type": "type.googleapis.com/google.protobuf.Duration", "value": "1.212s" } + parameters: + - name: owner + in: path + required: true + type: string + - name: connection_id + in: path + required: true + type: string tags: - Query - /ibc/core/client/v1/upgraded_consensus_states: + /ibc/apps/interchain_accounts/controller/v1/params: get: - summary: UpgradedConsensusState queries an Upgraded IBC consensus state. - operationId: IbcCoreClientV1UpgradedConsensusState + summary: Params queries all parameters of the ICA controller submodule. + operationId: IbcApplicationsInterchainAccountsControllerV1Params responses: '200': description: A successful response. schema: type: object properties: - upgraded_consensus_state: - title: Consensus state associated with the request identifier + params: + description: params defines the parameters of the module. type: object properties: - '@type': - type: string + controller_enabled: + type: boolean description: >- - A URL/resource name that uniquely identifies the type of - the serialized - - protocol buffer message. This string must contain at least + controller_enabled enables or disables the controller + submodule. + description: >- + QueryParamsResponse is the response type for the Query/Params RPC + method. + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type of + the serialized - one "/" character. The last segment of the URL's path must - represent + protocol buffer message. This string must contain at + least - the fully qualified name of the type (as in + one "/" character. The last segment of the URL's path + must represent - `path/google.protobuf.Duration`). The name should be in a - canonical form - - (e.g., leading "." is not accepted). - - - In practice, teams usually precompile into the binary all - types that they - - expect it to use in the context of Any. However, for URLs - which use the - - scheme `http`, `https`, or no scheme, one can optionally - set up a type - - server that maps type URLs to message definitions as - follows: - - - * If no scheme is provided, `https` is assumed. - - * An HTTP GET on the URL must yield a - [google.protobuf.Type][] - value in binary format, or produce an error. - * Applications are allowed to cache lookup results based - on the - URL, or have them precompiled into a binary to avoid any - lookup. Therefore, binary compatibility needs to be preserved - on changes to types. (Use versioned type names to manage - breaking changes.) - - Note: this functionality is not currently available in the - official - - protobuf release, and it is not used for type URLs - beginning with - - type.googleapis.com. - - - Schemes other than `http`, `https` (or the empty scheme) - might be - - used with implementation specific semantics. - additionalProperties: {} - description: >- - `Any` contains an arbitrary serialized protocol buffer message - along with a - - URL that describes the type of the serialized message. - - - Protobuf library provides support to pack/unpack Any values in - the form - - of utility functions or additional generated methods of the - Any type. - - - Example 1: Pack and unpack a message in C++. - - Foo foo = ...; - Any any; - any.PackFrom(foo); - ... - if (any.UnpackTo(&foo)) { - ... - } - - Example 2: Pack and unpack a message in Java. - - Foo foo = ...; - Any any = Any.pack(foo); - ... - if (any.is(Foo.class)) { - foo = any.unpack(Foo.class); - } - - Example 3: Pack and unpack a message in Python. - - foo = Foo(...) - any = Any() - any.Pack(foo) - ... - if any.Is(Foo.DESCRIPTOR): - any.Unpack(foo) - ... - - Example 4: Pack and unpack a message in Go - - foo := &pb.Foo{...} - any, err := anypb.New(foo) - if err != nil { - ... - } - ... - foo := &pb.Foo{} - if err := any.UnmarshalTo(foo); err != nil { - ... - } - - The pack methods provided by protobuf library will by default - use - - 'type.googleapis.com/full.type.name' as the type URL and the - unpack - - methods only use the fully qualified type name after the last - '/' - - in the type URL, for example "foo.bar.com/x/y.z" will yield - type - - name "y.z". - - - - JSON - - ==== - - The JSON representation of an `Any` value uses the regular - - representation of the deserialized, embedded message, with an - - additional field `@type` which contains the type URL. Example: - - package google.profile; - message Person { - string first_name = 1; - string last_name = 2; - } - - { - "@type": "type.googleapis.com/google.profile.Person", - "firstName": , - "lastName": - } - - If the embedded message type is well-known and has a custom - JSON - - representation, that representation will be embedded adding a - field - - `value` which holds the custom JSON in addition to the `@type` - - field. Example (for message [google.protobuf.Duration][]): - - { - "@type": "type.googleapis.com/google.protobuf.Duration", - "value": "1.212s" - } - description: |- - QueryUpgradedConsensusStateResponse is the response type for the - Query/UpgradedConsensusState RPC method. - default: - description: An unexpected error response. - schema: - type: object - properties: - code: - type: integer - format: int32 - message: - type: string - details: - type: array - items: - type: object - properties: - '@type': - type: string - description: >- - A URL/resource name that uniquely identifies the type of - the serialized - - protocol buffer message. This string must contain at - least - - one "/" character. The last segment of the URL's path - must represent - - the fully qualified name of the type (as in + the fully qualified name of the type (as in `path/google.protobuf.Duration`). The name should be in a canonical form @@ -22494,29 +22366,174 @@ paths: } tags: - Query - /ibc/core/connection/v1/client_connections/{client_id}: + /ibc/apps/interchain_accounts/host/v1/params: get: - summary: |- - ClientConnections queries the connection paths associated with a client - state. - operationId: IbcCoreConnectionV1ClientConnections + summary: Params queries all parameters of the ICA host submodule. + operationId: IbcApplicationsInterchainAccountsHostV1Params responses: '200': description: A successful response. schema: type: object properties: - connection_paths: + params: + description: params defines the parameters of the module. + type: object + properties: + host_enabled: + type: boolean + description: host_enabled enables or disables the host submodule. + allow_messages: + type: array + items: + type: string + description: >- + allow_messages defines a list of sdk message typeURLs + allowed to be executed on a host chain. + description: >- + QueryParamsResponse is the response type for the Query/Params RPC + method. + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: type: array items: - type: string - description: slice of all the connection paths associated with a client. - proof: - type: string - format: byte - title: merkle proof of existence - proof_height: - title: height at which the proof was generated + type: object + properties: + '@type': + type: string + additionalProperties: {} + tags: + - Query + /ibc/core/channel/v1/channels: + get: + summary: Channels queries all the IBC channels of a chain. + operationId: IbcCoreChannelV1Channels + responses: + '200': + description: A successful response. + schema: + type: object + properties: + channels: + type: array + items: + type: object + properties: + state: + title: current state of the channel end + type: string + enum: + - STATE_UNINITIALIZED_UNSPECIFIED + - STATE_INIT + - STATE_TRYOPEN + - STATE_OPEN + - STATE_CLOSED + default: STATE_UNINITIALIZED_UNSPECIFIED + description: >- + State defines if a channel is in one of the following + states: + + CLOSED, INIT, TRYOPEN, OPEN or UNINITIALIZED. + + - STATE_UNINITIALIZED_UNSPECIFIED: Default State + - STATE_INIT: A channel has just started the opening handshake. + - STATE_TRYOPEN: A channel has acknowledged the handshake step on the counterparty chain. + - STATE_OPEN: A channel has completed the handshake. Open channels are + ready to send and receive packets. + - STATE_CLOSED: A channel has been closed and can no longer be used to send or receive + packets. + ordering: + title: whether the channel is ordered or unordered + type: string + enum: + - ORDER_NONE_UNSPECIFIED + - ORDER_UNORDERED + - ORDER_ORDERED + default: ORDER_NONE_UNSPECIFIED + description: >- + - ORDER_NONE_UNSPECIFIED: zero-value for channel + ordering + - ORDER_UNORDERED: packets can be delivered in any order, which may differ from the order in + which they were sent. + - ORDER_ORDERED: packets are delivered exactly in the order which they were sent + counterparty: + title: counterparty channel end + type: object + properties: + port_id: + type: string + description: >- + port on the counterparty chain which owns the other + end of the channel. + channel_id: + type: string + title: channel end on the counterparty chain + connection_hops: + type: array + items: + type: string + title: >- + list of connection identifiers, in order, along which + packets sent on + + this channel will travel + version: + type: string + title: >- + opaque channel version, which is agreed upon during the + handshake + port_id: + type: string + title: port identifier + channel_id: + type: string + title: channel identifier + description: >- + IdentifiedChannel defines a channel with additional port and + channel + + identifier fields. + description: list of stored channels of the chain. + pagination: + title: pagination response + type: object + properties: + next_key: + type: string + format: byte + 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. + total: + type: string + format: uint64 + title: >- + total is total number of results available if + PageRequest.count_total + + was set, its value is undefined otherwise + 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; + } + height: + title: query block height type: object properties: revision_number: @@ -22544,9 +22561,9 @@ paths: RevisionHeight gets reset - title: |- - QueryClientConnectionsResponse is the response type for the - Query/ClientConnections RPC method + description: >- + QueryChannelsResponse is the response type for the Query/Channels + RPC method. default: description: An unexpected error response. schema: @@ -22733,509 +22750,148 @@ paths: "value": "1.212s" } parameters: - - name: client_id - description: client identifier associated with a connection - in: path - required: true + - name: pagination.key + 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. + in: query + required: false + type: string + format: byte + - name: pagination.offset + 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. + in: query + required: false + type: string + format: uint64 + - name: pagination.limit + 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. + in: query + required: false type: string + format: uint64 + - name: pagination.count_total + 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 + required: false + type: boolean + - name: pagination.reverse + description: >- + reverse is set to true if results are to be returned in the + descending order. + + + Since: cosmos-sdk 0.43 + in: query + required: false + type: boolean tags: - Query - /ibc/core/connection/v1/connections: + /ibc/core/channel/v1/channels/{channel_id}/ports/{port_id}: get: - summary: Connections queries all the IBC connections of a chain. - operationId: IbcCoreConnectionV1Connections + summary: Channel queries an IBC Channel. + operationId: IbcCoreChannelV1Channel responses: '200': description: A successful response. schema: type: object properties: - connections: - type: array - items: - type: object - properties: - id: - type: string - description: connection identifier. - client_id: - type: string - description: client associated with this connection. - versions: - type: array - items: - type: object - properties: - identifier: - type: string - title: unique version identifier - features: - type: array - items: - type: string - title: >- - list of features compatible with the specified - identifier - description: >- - Version defines the versioning scheme used to - negotiate the IBC verison in - - the connection handshake. - title: >- - IBC version which can be utilised to determine encodings - or protocols for - - channels or packets utilising this connection - state: - description: current state of the connection end. - type: string - enum: - - STATE_UNINITIALIZED_UNSPECIFIED - - STATE_INIT - - STATE_TRYOPEN - - STATE_OPEN - default: STATE_UNINITIALIZED_UNSPECIFIED - counterparty: - description: counterparty chain associated with this connection. - type: object - properties: - client_id: - type: string - description: >- - identifies the client on the counterparty chain - associated with a given + channel: + title: channel associated with the request identifiers + type: object + properties: + state: + title: current state of the channel end + type: string + enum: + - STATE_UNINITIALIZED_UNSPECIFIED + - STATE_INIT + - STATE_TRYOPEN + - STATE_OPEN + - STATE_CLOSED + default: STATE_UNINITIALIZED_UNSPECIFIED + description: >- + State defines if a channel is in one of the following + states: - connection. - connection_id: - type: string - description: >- - identifies the connection end on the counterparty - chain associated with a + CLOSED, INIT, TRYOPEN, OPEN or UNINITIALIZED. - given connection. - prefix: - description: commitment merkle prefix of the counterparty chain. - type: object - properties: - key_prefix: - type: string - format: byte - title: >- - MerklePrefix is merkle path prefixed to the key. - - The constructed key from the Path and the key will - be append(Path.KeyPath, - - append(Path.KeyPrefix, key...)) - delay_period: - type: string - format: uint64 - description: delay period associated with this connection. - description: >- - IdentifiedConnection defines a connection with additional - connection - - identifier field. - description: list of stored connections of the chain. - pagination: - title: pagination response - type: object - properties: - next_key: - type: string - format: byte - title: |- - next_key is the key to be passed to PageRequest.key to - query the next page most efficiently - total: - type: string - format: uint64 - title: >- - total is total number of results available if - PageRequest.count_total - - was set, its value is undefined otherwise - 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; - } - height: - title: query block height - type: object - properties: - revision_number: - type: string - format: uint64 - title: the revision that the client is currently on - revision_height: - type: string - format: uint64 - title: the height within the given revision - description: >- - Normally the RevisionHeight is incremented at each height - while keeping - - RevisionNumber the same. However some consensus algorithms may - choose to - - reset the height in certain conditions e.g. hard forks, - state-machine - - breaking changes In these cases, the RevisionNumber is - incremented so that - - height continues to be monitonically increasing even as the - RevisionHeight - - gets reset - description: >- - QueryConnectionsResponse is the response type for the - Query/Connections RPC - - method. - default: - description: An unexpected error response. - schema: - type: object - properties: - code: - type: integer - format: int32 - message: - type: string - details: - type: array - items: - type: object - properties: - '@type': - type: string - description: >- - A URL/resource name that uniquely identifies the type of - the serialized - - protocol buffer message. This string must contain at - least - - one "/" character. The last segment of the URL's path - must represent - - the fully qualified name of the type (as in - - `path/google.protobuf.Duration`). The name should be in - a canonical form - - (e.g., leading "." is not accepted). - - - In practice, teams usually precompile into the binary - all types that they - - expect it to use in the context of Any. However, for - URLs which use the - - scheme `http`, `https`, or no scheme, one can optionally - set up a type - - server that maps type URLs to message definitions as - follows: - - - * If no scheme is provided, `https` is assumed. - - * An HTTP GET on the URL must yield a - [google.protobuf.Type][] - value in binary format, or produce an error. - * Applications are allowed to cache lookup results based - on the - URL, or have them precompiled into a binary to avoid any - lookup. Therefore, binary compatibility needs to be preserved - on changes to types. (Use versioned type names to manage - breaking changes.) - - Note: this functionality is not currently available in - the official - - protobuf release, and it is not used for type URLs - beginning with - - type.googleapis.com. - - - Schemes other than `http`, `https` (or the empty scheme) - might be - - used with implementation specific semantics. - additionalProperties: {} - description: >- - `Any` contains an arbitrary serialized protocol buffer - message along with a - - URL that describes the type of the serialized message. - - - Protobuf library provides support to pack/unpack Any values - in the form - - of utility functions or additional generated methods of the - Any type. - - - Example 1: Pack and unpack a message in C++. - - Foo foo = ...; - Any any; - any.PackFrom(foo); - ... - if (any.UnpackTo(&foo)) { - ... - } - - Example 2: Pack and unpack a message in Java. - - Foo foo = ...; - Any any = Any.pack(foo); - ... - if (any.is(Foo.class)) { - foo = any.unpack(Foo.class); - } - - Example 3: Pack and unpack a message in Python. - - foo = Foo(...) - any = Any() - any.Pack(foo) - ... - if any.Is(Foo.DESCRIPTOR): - any.Unpack(foo) - ... - - Example 4: Pack and unpack a message in Go - - foo := &pb.Foo{...} - any, err := anypb.New(foo) - if err != nil { - ... - } - ... - foo := &pb.Foo{} - if err := any.UnmarshalTo(foo); err != nil { - ... - } - - The pack methods provided by protobuf library will by - default use - - 'type.googleapis.com/full.type.name' as the type URL and the - unpack - - methods only use the fully qualified type name after the - last '/' - - in the type URL, for example "foo.bar.com/x/y.z" will yield - type - - name "y.z". - - - - JSON - - ==== - - The JSON representation of an `Any` value uses the regular - - representation of the deserialized, embedded message, with - an - - additional field `@type` which contains the type URL. - Example: - - package google.profile; - message Person { - string first_name = 1; - string last_name = 2; - } - - { - "@type": "type.googleapis.com/google.profile.Person", - "firstName": , - "lastName": - } - - If the embedded message type is well-known and has a custom - JSON - - representation, that representation will be embedded adding - a field - - `value` which holds the custom JSON in addition to the - `@type` - - field. Example (for message [google.protobuf.Duration][]): - - { - "@type": "type.googleapis.com/google.protobuf.Duration", - "value": "1.212s" - } - parameters: - - name: pagination.key - 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. - in: query - required: false - type: string - format: byte - - name: pagination.offset - 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. - in: query - required: false - type: string - format: uint64 - - name: pagination.limit - 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. - in: query - required: false - type: string - format: uint64 - - name: pagination.count_total - 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 - required: false - type: boolean - tags: - - Query - /ibc/core/connection/v1/connections/{connection_id}: - get: - summary: Connection queries an IBC connection end. - operationId: IbcCoreConnectionV1Connection - responses: - '200': - description: A successful response. - schema: - type: object - properties: - connection: - title: connection associated with the request identifier - type: object - properties: - client_id: - type: string - description: client associated with this connection. - versions: - type: array - items: - type: object - properties: - identifier: - type: string - title: unique version identifier - features: - type: array - items: - type: string - title: >- - list of features compatible with the specified - identifier - description: >- - Version defines the versioning scheme used to negotiate - the IBC verison in - - the connection handshake. - description: >- - IBC version which can be utilised to determine encodings - or protocols for - - channels or packets utilising this connection. - state: - description: current state of the connection end. + - STATE_UNINITIALIZED_UNSPECIFIED: Default State + - STATE_INIT: A channel has just started the opening handshake. + - STATE_TRYOPEN: A channel has acknowledged the handshake step on the counterparty chain. + - STATE_OPEN: A channel has completed the handshake. Open channels are + ready to send and receive packets. + - STATE_CLOSED: A channel has been closed and can no longer be used to send or receive + packets. + ordering: + title: whether the channel is ordered or unordered type: string enum: - - STATE_UNINITIALIZED_UNSPECIFIED - - STATE_INIT - - STATE_TRYOPEN - - STATE_OPEN - default: STATE_UNINITIALIZED_UNSPECIFIED + - ORDER_NONE_UNSPECIFIED + - ORDER_UNORDERED + - ORDER_ORDERED + default: ORDER_NONE_UNSPECIFIED + description: |- + - ORDER_NONE_UNSPECIFIED: zero-value for channel ordering + - ORDER_UNORDERED: packets can be delivered in any order, which may differ from the order in + which they were sent. + - ORDER_ORDERED: packets are delivered exactly in the order which they were sent counterparty: - description: counterparty chain associated with this connection. + title: counterparty channel end type: object properties: - client_id: + port_id: type: string description: >- - identifies the client on the counterparty chain - associated with a given - - connection. - connection_id: + port on the counterparty chain which owns the other + end of the channel. + channel_id: type: string - description: >- - identifies the connection end on the counterparty - chain associated with a - - given connection. - prefix: - description: commitment merkle prefix of the counterparty chain. - type: object - properties: - key_prefix: - type: string - format: byte - title: >- - MerklePrefix is merkle path prefixed to the key. - - The constructed key from the Path and the key will be - append(Path.KeyPath, + title: channel end on the counterparty chain + connection_hops: + type: array + items: + type: string + title: >- + list of connection identifiers, in order, along which + packets sent on - append(Path.KeyPrefix, key...)) - delay_period: + this channel will travel + version: type: string - format: uint64 - description: >- - delay period that must pass before a consensus state can - be used for - - packet-verification NOTE: delay period logic is only - implemented by some - - clients. + title: >- + opaque channel version, which is agreed upon during the + handshake description: >- - ConnectionEnd defines a stateful object on a chain connected - to another - - separate one. + Channel defines pipeline for exactly-once packet delivery + between specific - NOTE: there must only be 2 defined ConnectionEnds to establish + modules on separate blockchains, which has at least one end + capable of - a connection between two chains. + sending packets and one end capable of receiving packets. proof: type: string format: byte @@ -23270,13 +22926,13 @@ paths: gets reset description: >- - QueryConnectionResponse is the response type for the - Query/Connection RPC + QueryChannelResponse is the response type for the Query/Channel + RPC method. - method. Besides the connection end, it includes a proof and the - height from + Besides the Channel end, it includes a proof and the height from + which the - which the proof was retrieved. + proof was retrieved. default: description: An unexpected error response. schema: @@ -23463,19 +23119,26 @@ paths: "value": "1.212s" } parameters: - - name: connection_id - description: connection unique identifier + - name: channel_id + description: channel unique identifier + in: path + required: true + type: string + - name: port_id + description: port unique identifier in: path required: true type: string tags: - Query - /ibc/core/connection/v1/connections/{connection_id}/client_state: + /ibc/core/channel/v1/channels/{channel_id}/ports/{port_id}/client_state: get: - summary: |- - ConnectionClientState queries the client state associated with the - connection. - operationId: IbcCoreConnectionV1ConnectionClientState + summary: >- + ChannelClientState queries for the client state for the channel + associated + + with the provided channel identifiers. + operationId: IbcCoreChannelV1ChannelClientState responses: '200': description: A successful response. @@ -23702,8 +23365,8 @@ paths: gets reset title: |- - QueryConnectionClientStateResponse is the response type for the - Query/ConnectionClientState RPC method + QueryChannelClientStateResponse is the Response type for the + Query/QueryChannelClientState RPC method default: description: An unexpected error response. schema: @@ -23890,19 +23553,24 @@ paths: "value": "1.212s" } parameters: - - name: connection_id - description: connection identifier + - name: channel_id + description: channel unique identifier + in: path + required: true + type: string + - name: port_id + description: port unique identifier in: path required: true type: string tags: - Query - /ibc/core/connection/v1/connections/{connection_id}/consensus_state/revision/{revision_number}/height/{revision_height}: + /ibc/core/channel/v1/channels/{channel_id}/ports/{port_id}/consensus_state/revision/{revision_number}/height/{revision_height}: get: summary: |- - ConnectionConsensusState queries the consensus state associated with the - connection. - operationId: IbcCoreConnectionV1ConnectionConsensusState + ChannelConsensusState queries for the consensus state for the channel + associated with the provided channel identifiers. + operationId: IbcCoreChannelV1ChannelConsensusState responses: '200': description: A successful response. @@ -24116,8 +23784,8 @@ paths: gets reset title: |- - QueryConnectionConsensusStateResponse is the response type for the - Query/ConnectionConsensusState RPC method + QueryChannelClientStateResponse is the Response type for the + Query/QueryChannelClientState RPC method default: description: An unexpected error response. schema: @@ -24304,67 +23972,82 @@ paths: "value": "1.212s" } parameters: - - name: connection_id - description: connection identifier + - name: channel_id + description: channel unique identifier + in: path + required: true + type: string + - name: port_id + description: port unique identifier in: path required: true type: string - name: revision_number + description: revision number of the consensus state in: path required: true type: string format: uint64 - name: revision_height + description: revision height of the consensus state in: path required: true type: string format: uint64 tags: - Query - /interchain_security/ccv/consumer/next-fee-distribution: + /ibc/core/channel/v1/channels/{channel_id}/ports/{port_id}/next_sequence: get: summary: >- - ConsumerGenesis queries the genesis state needed to start a consumer - chain - - whose proposal has been accepted - operationId: InterchainSecurityCcvConsumerV1QueryNextFeeDistribution + NextSequenceReceive returns the next receive sequence for a given + channel. + operationId: IbcCoreChannelV1NextSequenceReceive responses: '200': description: A successful response. schema: type: object properties: - data: + next_sequence_receive: + type: string + format: uint64 + title: next sequence receive number + proof: + type: string + format: byte + title: merkle proof of existence + proof_height: + title: height at which the proof was retrieved type: object properties: - currentHeight: - type: string - format: int64 - title: current block height at the time of querying - lastHeight: - type: string - format: int64 - title: block height at which last distribution took place - nextHeight: - type: string - format: int64 - title: block height at which next distribution will take place - distribution_fraction: - type: string - title: ratio between consumer and provider fee distribution - total: - type: string - title: total accruead fees at the time of querying - toProvider: + revision_number: type: string - title: amount distibuted to provider chain - toConsumer: + format: uint64 + title: the revision that the client is currently on + revision_height: type: string - title: amount distributed (kept) by consumer chain - title: >- - NextFeeDistributionEstimate holds information about next fee - distribution + format: uint64 + title: the height within the given revision + description: >- + Normally the RevisionHeight is incremented at each height + while keeping + + RevisionNumber the same. However some consensus algorithms may + choose to + + reset the height in certain conditions e.g. hard forks, + state-machine + + breaking changes In these cases, the RevisionNumber is + incremented so that + + height continues to be monitonically increasing even as the + RevisionHeight + + gets reset + title: |- + QuerySequenceResponse is the request type for the + Query/QueryNextSequenceReceiveResponse RPC method default: description: An unexpected error response. schema: @@ -24550,113 +24233,123 @@ paths: "@type": "type.googleapis.com/google.protobuf.Duration", "value": "1.212s" } + parameters: + - name: channel_id + description: channel unique identifier + in: path + required: true + type: string + - name: port_id + description: port unique identifier + in: path + required: true + type: string tags: - Query - /interchain_security/ccv/consumer/params: + /ibc/core/channel/v1/channels/{channel_id}/ports/{port_id}/packet_acknowledgements: get: - summary: QueryParams queries the ccv/consumer module parameters. - operationId: InterchainSecurityCcvConsumerV1QueryParams + summary: >- + PacketAcknowledgements returns all the packet acknowledgements + associated + + with a channel. + operationId: IbcCoreChannelV1PacketAcknowledgements responses: '200': description: A successful response. schema: type: object properties: - params: - description: params holds all the parameters of this module. - type: object - properties: - enabled: - type: boolean - title: >- - TODO: Remove enabled flag and find a better way to setup - integration tests - - See: - https://github.com/cosmos/interchain-security/issues/339 - blocks_per_distribution_transmission: - type: string - format: int64 - description: >- - ///////////////////// - - Distribution Params - - Number of blocks between ibc-token-transfers from the - consumer chain to - - the provider chain. Note that at this transmission event a - fraction of - - the accumulated tokens are divided and sent consumer - redistribution + acknowledgements: + type: array + items: + type: object + properties: + port_id: + type: string + description: channel port identifier. + channel_id: + type: string + description: channel unique identifier. + sequence: + type: string + format: uint64 + description: packet sequence. + data: + type: string + format: byte + description: embedded data that represents packet state. + description: >- + PacketState defines the generic type necessary to retrieve + and store - address. - distribution_transmission_channel: - type: string - description: >- - Channel, and provider-chain receiving address to send - distribution token + packet commitments, acknowledgements, and receipts. - transfers over. These parameters is auto-set during the - consumer <-> + Caller is responsible for knowing the context necessary to + interpret this - provider handshake procedure. - provider_fee_pool_addr_str: - type: string - ccv_timeout_period: + state as a commitment, acknowledgement, or a receipt. + pagination: + title: pagination response + type: object + properties: + next_key: type: string - title: >- - Sent CCV related IBC packets will timeout after this - duration - transfer_timeout_period: + format: byte + 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. + total: type: string + format: uint64 title: >- - Sent transfer related IBC packets will timeout after this - duration - consumer_redistribution_fraction: - type: string - description: >- - The fraction of tokens allocated to the consumer - redistribution address + total is total number of results available if + PageRequest.count_total - during distribution events. The fraction is a string - representing a + was set, its value is undefined otherwise + description: >- + PageResponse is to be embedded in gRPC response messages where + the - decimal number. For example "0.75" would represent 75%. - historical_entries: + corresponding request message has used PageRequest. + + message SomeResponse { + repeated Bar results = 1; + PageResponse page = 2; + } + height: + title: query block height + type: object + properties: + revision_number: type: string - format: int64 - description: >- - The number of historical info entries to persist in store. + format: uint64 + title: the revision that the client is currently on + revision_height: + type: string + format: uint64 + title: the height within the given revision + description: >- + Normally the RevisionHeight is incremented at each height + while keeping - This param is a part of the cosmos sdk staking module. In - the case of + RevisionNumber the same. However some consensus algorithms may + choose to - a ccv enabled consumer chain, the ccv module acts as the - staking module. - unbonding_period: - type: string - description: >- - Unbonding period for the consumer, + reset the height in certain conditions e.g. hard forks, + state-machine - which should be smaller than that of the provider in - general. - soft_opt_out_threshold: - type: string - title: >- - The threshold for the percentage of validators at the - bottom of the set who + breaking changes In these cases, the RevisionNumber is + incremented so that - can opt out of running the consumer chain without being - punished. For example, a + height continues to be monitonically increasing even as the + RevisionHeight - value of 0.05 means that the validators in the bottom 5% - of the set can opt out - title: Params defines the parameters for CCV consumer module - description: >- - QueryParamsResponse is response type for the Query/Params RPC - method. + gets reset + title: |- + QueryPacketAcknowledgemetsResponse is the request type for the + Query/QueryPacketAcknowledgements RPC method default: description: An unexpected error response. schema: @@ -24842,159 +24535,138 @@ paths: "@type": "type.googleapis.com/google.protobuf.Duration", "value": "1.212s" } + parameters: + - name: channel_id + description: channel unique identifier + in: path + required: true + type: string + - name: port_id + description: port unique identifier + in: path + required: true + type: string + - name: pagination.key + 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. + in: query + required: false + type: string + format: byte + - name: pagination.offset + 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. + in: query + required: false + type: string + format: uint64 + - name: pagination.limit + 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. + in: query + required: false + type: string + format: uint64 + - name: pagination.count_total + 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 + required: false + type: boolean + - name: pagination.reverse + description: >- + reverse is set to true if results are to be returned in the + descending order. + + + Since: cosmos-sdk 0.43 + in: query + required: false + type: boolean + - name: packet_commitment_sequences + description: list of packet sequences + in: query + required: false + type: array + items: + type: string + format: uint64 + collectionFormat: multi tags: - Query - /interchain_security/ccv/provider/consumer_chain_start_proposals: + /ibc/core/channel/v1/channels/{channel_id}/ports/{port_id}/packet_acks/{sequence}: get: - summary: QueryConsumerChainStarts queries consumer chain start proposals. - operationId: InterchainSecurityCcvProviderV1QueryConsumerChainStarts + summary: PacketAcknowledgement queries a stored packet acknowledgement hash. + operationId: IbcCoreChannelV1PacketAcknowledgement responses: '200': description: A successful response. schema: type: object properties: - proposals: + acknowledgement: + type: string + format: byte + title: packet associated with the request fields + proof: + type: string + format: byte + title: merkle proof of existence + proof_height: + title: height at which the proof was retrieved type: object properties: - pending: - type: array - items: - type: object - properties: - title: - type: string - title: the title of the proposal - description: - type: string - title: the description of the proposal - chain_id: - type: string - description: >- - the proposed chain-id of the new consumer chain, - must be different from all other consumer chain ids - of the executing - - provider chain. - initial_height: - description: >- - the proposed initial height of new consumer chain. - - For a completely new chain, this will be {0,1}. - However, it may be different if this is a chain that - is converting to a consumer chain. - type: object - properties: - revision_number: - type: string - format: uint64 - title: the revision that the client is currently on - revision_height: - type: string - format: uint64 - title: the height within the given revision - title: >- - Height is a monotonically increasing data type - - that can be compared against another Height for the - purposes of updating and - - freezing clients - genesis_hash: - type: string - format: byte - description: >- - The hash of the consumer chain genesis state without - the consumer CCV module genesis params. - - It is used for off-chain confirmation of - genesis.json validity by validators and other - parties. - binary_hash: - type: string - format: byte - description: >- - The hash of the consumer chain binary that should be - run by validators on chain initialization. - - It is used for off-chain confirmation of binary - validity by validators and other parties. - spawn_time: - type: string - format: date-time - description: >- - spawn time is the time on the provider chain at - which the consumer chain genesis is finalized and - all validators - - will be responsible for starting their consumer - chain validator node. - unbonding_period: - type: string - description: >- - Unbonding period for the consumer, - - which should be smaller than that of the provider in - general. - ccv_timeout_period: - type: string - title: >- - Sent CCV related IBC packets will timeout after this - duration - transfer_timeout_period: - type: string - title: >- - Sent transfer related IBC packets will timeout after - this duration - consumer_redistribution_fraction: - type: string - description: >- - The fraction of tokens allocated to the consumer - redistribution address + revision_number: + type: string + format: uint64 + title: the revision that the client is currently on + revision_height: + type: string + format: uint64 + title: the height within the given revision + description: >- + Normally the RevisionHeight is incremented at each height + while keeping - during distribution events. The fraction is a string - representing a + RevisionNumber the same. However some consensus algorithms may + choose to - decimal number. For example "0.75" would represent - 75%. - blocks_per_distribution_transmission: - type: string - format: int64 - description: >- - BlocksPerDistributionTransmission is the number of - blocks between ibc-token-transfers from the consumer - chain to the provider chain. + reset the height in certain conditions e.g. hard forks, + state-machine - On sending transmission event, - `consumer_redistribution_fraction` of the - accumulated tokens are sent to the consumer - redistribution address. - historical_entries: - type: string - format: int64 - description: >- - The number of historical info entries to persist in - store. + breaking changes In these cases, the RevisionNumber is + incremented so that - This param is a part of the cosmos sdk staking - module. In the case of + height continues to be monitonically increasing even as the + RevisionHeight - a ccv enabled consumer chain, the ccv module acts as - the staking module. - description: >- - ConsumerAdditionProposal is a governance proposal on the - provider chain to spawn a new consumer chain. + gets reset + title: >- + QueryPacketAcknowledgementResponse defines the client query + response for a - If it passes, then all validators on the provider chain - are expected to validate the consumer chain at spawn - time + packet which also includes a proof and the height from which the - or get slashed. It is recommended that spawn time occurs - after the proposal end time. - title: proposals waiting for spawn_time to pass - description: >- - ConsumerAdditionProposals holds pending governance proposals - on the provider chain to spawn a new chain. + proof was retrieved default: description: An unexpected error response. schema: @@ -25180,54 +24852,127 @@ paths: "@type": "type.googleapis.com/google.protobuf.Duration", "value": "1.212s" } + parameters: + - name: channel_id + description: channel unique identifier + in: path + required: true + type: string + - name: port_id + description: port unique identifier + in: path + required: true + type: string + - name: sequence + description: packet sequence + in: path + required: true + type: string + format: uint64 tags: - Query - /interchain_security/ccv/provider/consumer_chain_stop_proposals: + /ibc/core/channel/v1/channels/{channel_id}/ports/{port_id}/packet_commitments: get: - summary: QueryConsumerChainStops queries consumer chain stop proposals. - operationId: InterchainSecurityCcvProviderV1QueryConsumerChainStops + summary: |- + PacketCommitments returns all the packet commitments hashes associated + with a channel. + operationId: IbcCoreChannelV1PacketCommitments responses: '200': description: A successful response. schema: type: object properties: - proposals: + commitments: + type: array + items: + type: object + properties: + port_id: + type: string + description: channel port identifier. + channel_id: + type: string + description: channel unique identifier. + sequence: + type: string + format: uint64 + description: packet sequence. + data: + type: string + format: byte + description: embedded data that represents packet state. + description: >- + PacketState defines the generic type necessary to retrieve + and store + + packet commitments, acknowledgements, and receipts. + + Caller is responsible for knowing the context necessary to + interpret this + + state as a commitment, acknowledgement, or a receipt. + pagination: + title: pagination response type: object properties: - pending: - type: array - items: - type: object - properties: - title: - type: string - title: the title of the proposal - description: - type: string - title: the description of the proposal - chain_id: - type: string - title: the chain-id of the consumer chain to be stopped - stop_time: - type: string - format: date-time - title: >- - the time on the provider chain at which all - validators are responsible to stop their consumer - chain validator node - description: >- - ConsumerRemovalProposal is a governance proposal on the - provider chain to remove (and stop) a consumer chain. + next_key: + type: string + format: byte + 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. + total: + type: string + format: uint64 + title: >- + total is total number of results available if + PageRequest.count_total - If it passes, all the consumer chain's state is removed - from the provider chain. The outstanding unbonding + was set, its value is undefined otherwise + description: >- + PageResponse is to be embedded in gRPC response messages where + the - operation funds are released. - title: proposals waiting for stop_time to pass + corresponding request message has used PageRequest. + + message SomeResponse { + repeated Bar results = 1; + PageResponse page = 2; + } + height: + title: query block height + type: object + properties: + revision_number: + type: string + format: uint64 + title: the revision that the client is currently on + revision_height: + type: string + format: uint64 + title: the height within the given revision description: >- - ConsumerRemovalProposals holds pending governance proposals on - the provider chain to remove (and stop) a consumer chain. + Normally the RevisionHeight is incremented at each height + while keeping + + RevisionNumber the same. However some consensus algorithms may + choose to + + reset the height in certain conditions e.g. hard forks, + state-machine + + breaking changes In these cases, the RevisionNumber is + incremented so that + + height continues to be monitonically increasing even as the + RevisionHeight + + gets reset + title: |- + QueryPacketCommitmentsResponse is the request type for the + Query/QueryPacketCommitments RPC method default: description: An unexpected error response. schema: @@ -25413,29 +25158,127 @@ paths: "@type": "type.googleapis.com/google.protobuf.Duration", "value": "1.212s" } + parameters: + - name: channel_id + description: channel unique identifier + in: path + required: true + type: string + - name: port_id + description: port unique identifier + in: path + required: true + type: string + - name: pagination.key + 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. + in: query + required: false + type: string + format: byte + - name: pagination.offset + 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. + in: query + required: false + type: string + format: uint64 + - name: pagination.limit + 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. + in: query + required: false + type: string + format: uint64 + - name: pagination.count_total + 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 + required: false + type: boolean + - name: pagination.reverse + description: >- + reverse is set to true if results are to be returned in the + descending order. + + + Since: cosmos-sdk 0.43 + in: query + required: false + type: boolean tags: - Query - /interchain_security/ccv/provider/consumer_chains: + /ibc/core/channel/v1/channels/{channel_id}/ports/{port_id}/packet_commitments/{packet_ack_sequences}/unreceived_acks: get: - summary: |- - ConsumerChains queries active consumer chains supported by the provider - chain - operationId: InterchainSecurityCcvProviderV1QueryConsumerChains + summary: >- + UnreceivedAcks returns all the unreceived IBC acknowledgements + associated + + with a channel and sequences. + operationId: IbcCoreChannelV1UnreceivedAcks responses: '200': description: A successful response. schema: type: object properties: - chains: + sequences: type: array items: - type: object - properties: - chain_id: - type: string - client_id: - type: string + type: string + format: uint64 + title: list of unreceived acknowledgement sequences + height: + title: query block height + type: object + properties: + revision_number: + type: string + format: uint64 + title: the revision that the client is currently on + revision_height: + type: string + format: uint64 + title: the height within the given revision + description: >- + Normally the RevisionHeight is incremented at each height + while keeping + + RevisionNumber the same. However some consensus algorithms may + choose to + + reset the height in certain conditions e.g. hard forks, + state-machine + + breaking changes In these cases, the RevisionNumber is + incremented so that + + height continues to be monitonically increasing even as the + RevisionHeight + + gets reset + title: |- + QueryUnreceivedAcksResponse is the response type for the + Query/UnreceivedAcks RPC method default: description: An unexpected error response. schema: @@ -25621,719 +25464,344 @@ paths: "@type": "type.googleapis.com/google.protobuf.Duration", "value": "1.212s" } - tags: - - Query - /interchain_security/ccv/provider/consumer_genesis/{chain_id}: + parameters: + - name: channel_id + description: channel unique identifier + in: path + required: true + type: string + - name: port_id + description: port unique identifier + in: path + required: true + type: string + - name: packet_ack_sequences + description: list of acknowledgement sequences + in: path + required: true + type: array + items: + type: string + format: uint64 + collectionFormat: csv + minItems: 1 + tags: + - Query + /ibc/core/channel/v1/channels/{channel_id}/ports/{port_id}/packet_commitments/{packet_commitment_sequences}/unreceived_packets: get: summary: >- - ConsumerGenesis queries the genesis state needed to start a consumer - chain + UnreceivedPackets returns all the unreceived IBC packets associated with + a - whose proposal has been accepted - operationId: InterchainSecurityCcvProviderV1QueryConsumerGenesis + channel and sequences. + operationId: IbcCoreChannelV1UnreceivedPackets responses: '200': description: A successful response. schema: type: object properties: - genesis_state: + sequences: + type: array + items: + type: string + format: uint64 + title: list of unreceived packet sequences + height: + title: query block height type: object properties: - params: - type: object - properties: - enabled: - type: boolean - title: >- - TODO: Remove enabled flag and find a better way to - setup integration tests + revision_number: + type: string + format: uint64 + title: the revision that the client is currently on + revision_height: + type: string + format: uint64 + title: the height within the given revision + description: >- + Normally the RevisionHeight is incremented at each height + while keeping - See: - https://github.com/cosmos/interchain-security/issues/339 - blocks_per_distribution_transmission: - type: string - format: int64 - description: >- - ///////////////////// + RevisionNumber the same. However some consensus algorithms may + choose to - Distribution Params + reset the height in certain conditions e.g. hard forks, + state-machine - Number of blocks between ibc-token-transfers from the - consumer chain to + breaking changes In these cases, the RevisionNumber is + incremented so that - the provider chain. Note that at this transmission - event a fraction of + height continues to be monitonically increasing even as the + RevisionHeight - the accumulated tokens are divided and sent consumer - redistribution + gets reset + title: |- + QueryUnreceivedPacketsResponse is the response type for the + Query/UnreceivedPacketCommitments RPC method + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type of + the serialized - address. - distribution_transmission_channel: - type: string - description: >- - Channel, and provider-chain receiving address to send - distribution token + protocol buffer message. This string must contain at + least - transfers over. These parameters is auto-set during - the consumer <-> + one "/" character. The last segment of the URL's path + must represent - provider handshake procedure. - provider_fee_pool_addr_str: - type: string - ccv_timeout_period: - type: string - title: >- - Sent CCV related IBC packets will timeout after this - duration - transfer_timeout_period: - type: string - title: >- - Sent transfer related IBC packets will timeout after - this duration - consumer_redistribution_fraction: - type: string - description: >- - The fraction of tokens allocated to the consumer - redistribution address + the fully qualified name of the type (as in - during distribution events. The fraction is a string - representing a + `path/google.protobuf.Duration`). The name should be in + a canonical form - decimal number. For example "0.75" would represent - 75%. - historical_entries: - type: string - format: int64 - description: >- - The number of historical info entries to persist in - store. + (e.g., leading "." is not accepted). - This param is a part of the cosmos sdk staking module. - In the case of - a ccv enabled consumer chain, the ccv module acts as - the staking module. - unbonding_period: - type: string - description: >- - Unbonding period for the consumer, + In practice, teams usually precompile into the binary + all types that they - which should be smaller than that of the provider in - general. - soft_opt_out_threshold: - type: string - title: >- - The threshold for the percentage of validators at the - bottom of the set who + expect it to use in the context of Any. However, for + URLs which use the - can opt out of running the consumer chain without - being punished. For example, a + scheme `http`, `https`, or no scheme, one can optionally + set up a type - value of 0.05 means that the validators in the bottom - 5% of the set can opt out - title: Params defines the parameters for CCV consumer module - provider_client_id: - type: string - description: empty for a new chain, filled in on restart. - provider_channel_id: - type: string - description: empty for a new chain, filled in on restart. - new_chain: - type: boolean - description: true for new chain GenesisState, false for chain restart. - provider_client_state: - description: >- - ProviderClientState filled in on new chain, nil on - restart. - type: object - properties: - chain_id: - type: string - trust_level: - type: object - properties: - numerator: - type: string - format: uint64 - denominator: - type: string - format: uint64 - description: >- - Fraction defines the protobuf message type for - tmmath.Fraction that only + server that maps type URLs to message definitions as + follows: - supports positive values. - trusting_period: - type: string - title: >- - duration of the period since the LastestTimestamp - during which the - submitted headers are valid for upgrade - unbonding_period: - type: string - title: duration of the staking unbonding period - max_clock_drift: - type: string - description: >- - defines how much new (untrusted) header's Time can - drift into the future. - frozen_height: - title: >- - Block height when the client was frozen due to a - misbehaviour - type: object - properties: - revision_number: - type: string - format: uint64 - title: the revision that the client is currently on - revision_height: - type: string - format: uint64 - title: the height within the given revision - description: >- - Normally the RevisionHeight is incremented at each - height while keeping + * If no scheme is provided, `https` is assumed. - RevisionNumber the same. However some consensus - algorithms may choose to + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based + on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) - reset the height in certain conditions e.g. hard - forks, state-machine + Note: this functionality is not currently available in + the official - breaking changes In these cases, the RevisionNumber is - incremented so that + protobuf release, and it is not used for type URLs + beginning with - height continues to be monitonically increasing even - as the RevisionHeight + type.googleapis.com. - gets reset - latest_height: - title: Latest height the client was updated to - type: object - properties: - revision_number: - type: string - format: uint64 - title: the revision that the client is currently on - revision_height: - type: string - format: uint64 - title: the height within the given revision - description: >- - Normally the RevisionHeight is incremented at each - height while keeping - RevisionNumber the same. However some consensus - algorithms may choose to + Schemes other than `http`, `https` (or the empty scheme) + might be - reset the height in certain conditions e.g. hard - forks, state-machine + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer + message along with a - breaking changes In these cases, the RevisionNumber is - incremented so that + URL that describes the type of the serialized message. - height continues to be monitonically increasing even - as the RevisionHeight - gets reset - proof_specs: - type: array - items: - type: object - properties: - leaf_spec: - title: >- - any field in the ExistenceProof must be the same - as in this spec. + Protobuf library provides support to pack/unpack Any values + in the form - except Prefix, which is just the first bytes of - prefix (spec can be longer) - type: object - properties: - hash: - type: string - enum: - - NO_HASH - - SHA256 - - SHA512 - - KECCAK - - RIPEMD160 - - BITCOIN - - SHA512_256 - default: NO_HASH - title: >- - - NO_HASH: NO_HASH is the default if no data - passed. Note this is an illegal argument - some places. - - BITCOIN: ripemd160(sha256(x)) - prehash_key: - type: string - enum: - - NO_HASH - - SHA256 - - SHA512 - - KECCAK - - RIPEMD160 - - BITCOIN - - SHA512_256 - default: NO_HASH - title: >- - - NO_HASH: NO_HASH is the default if no data - passed. Note this is an illegal argument - some places. - - BITCOIN: ripemd160(sha256(x)) - prehash_value: - type: string - enum: - - NO_HASH - - SHA256 - - SHA512 - - KECCAK - - RIPEMD160 - - BITCOIN - - SHA512_256 - default: NO_HASH - title: >- - - NO_HASH: NO_HASH is the default if no data - passed. Note this is an illegal argument - some places. - - BITCOIN: ripemd160(sha256(x)) - length: - type: string - enum: - - NO_PREFIX - - VAR_PROTO - - VAR_RLP - - FIXED32_BIG - - FIXED32_LITTLE - - FIXED64_BIG - - FIXED64_LITTLE - - REQUIRE_32_BYTES - - REQUIRE_64_BYTES - default: NO_PREFIX - description: >- - - NO_PREFIX: NO_PREFIX don't include any - length info - - VAR_PROTO: VAR_PROTO uses protobuf (and go-amino) varint encoding of the length - - VAR_RLP: VAR_RLP uses rlp int encoding of the length - - FIXED32_BIG: FIXED32_BIG uses big-endian encoding of the length as a 32 bit integer - - FIXED32_LITTLE: FIXED32_LITTLE uses little-endian encoding of the length as a 32 bit integer - - FIXED64_BIG: FIXED64_BIG uses big-endian encoding of the length as a 64 bit integer - - FIXED64_LITTLE: FIXED64_LITTLE uses little-endian encoding of the length as a 64 bit integer - - REQUIRE_32_BYTES: REQUIRE_32_BYTES is like NONE, but will fail if the input is not exactly 32 bytes (sha256 output) - - REQUIRE_64_BYTES: REQUIRE_64_BYTES is like NONE, but will fail if the input is not exactly 64 bytes (sha512 output) - title: >- - * + of utility functions or additional generated methods of the + Any type. - LengthOp defines how to process the key and - value of the LeafOp - to include length information. After - encoding the length with the given + Example 1: Pack and unpack a message in C++. - algorithm, the length will be prepended to - the key and value bytes. + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } - (Each one with it's own encoded length) - prefix: - type: string - format: byte - description: >- - prefix is a fixed bytes that may optionally - be included at the beginning to - differentiate + Example 2: Pack and unpack a message in Java. - a leaf node from an inner node. - description: >- - * + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } - LeafOp represents the raw key-value data we wish - to prove, and + Example 3: Pack and unpack a message in Python. - must be flexible to represent the internal - transformation from + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... - the original key-value pairs into the basis - hash, for many existing + Example 4: Pack and unpack a message in Go - merkle trees. + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + The pack methods provided by protobuf library will by + default use - key and value are passed in. So that the - signature of this operation is: + 'type.googleapis.com/full.type.name' as the type URL and the + unpack - leafOp(key, value) -> output + methods only use the fully qualified type name after the + last '/' + in the type URL, for example "foo.bar.com/x/y.z" will yield + type - To process this, first prehash the keys and - values if needed (ANY means no hash in this - case): + name "y.z". - hkey = prehashKey(key) - hvalue = prehashValue(value) + JSON - Then combine the bytes, and hash it + ==== - output = hash(prefix || length(hkey) || hkey || - length(hvalue) || hvalue) - inner_spec: - type: object - properties: - child_order: - type: array - items: - type: integer - format: int32 - title: >- - Child order is the ordering of the children - node, must count from 0 + The JSON representation of an `Any` value uses the regular - iavl tree is [0, 1] (left then right) + representation of the deserialized, embedded message, with + an - merk is [0, 2, 1] (left, right, here) - child_size: - type: integer - format: int32 - min_prefix_length: - type: integer - format: int32 - max_prefix_length: - type: integer - format: int32 - empty_child: - type: string - format: byte - title: >- - empty child is the prehash image that is - used when one child is nil (eg. 20 bytes of - 0) - hash: - type: string - enum: - - NO_HASH - - SHA256 - - SHA512 - - KECCAK - - RIPEMD160 - - BITCOIN - - SHA512_256 - default: NO_HASH - title: >- - - NO_HASH: NO_HASH is the default if no data - passed. Note this is an illegal argument - some places. - - BITCOIN: ripemd160(sha256(x)) - description: >- - InnerSpec contains all store-specific structure - info to determine if two proofs from a - - given store are neighbors. - - - This enables: - - - isLeftMost(spec: InnerSpec, op: InnerOp) - - isRightMost(spec: InnerSpec, op: InnerOp) - - isLeftNeighbor(spec: InnerSpec, left: InnerOp, - right: InnerOp) - max_depth: - type: integer - format: int32 - title: >- - max_depth (if > 0) is the maximum number of - InnerOps allowed (mainly for fixed-depth tries) - min_depth: - type: integer - format: int32 - title: >- - min_depth (if > 0) is the minimum number of - InnerOps allowed (mainly for fixed-depth tries) - description: >- - * - - ProofSpec defines what the expected parameters are - for a given proof type. - - This can be stored in the client and used to - validate any incoming proofs. - - - verify(ProofSpec, Proof) -> Proof | Error - - - As demonstrated in tests, if we don't fix the - algorithm used to calculate the - - LeafHash for a given tree, there are many possible - key-value pairs that can - - generate a given hash (by interpretting the preimage - differently). - - We need this for proper security, requires client - knows a priori what - - tree format server uses. But not in code, rather a - configuration object. - title: >- - Proof specifications used in verifying counterparty - state - upgrade_path: - type: array - items: - type: string - title: >- - Path at which next upgraded client will be committed. - - Each element corresponds to the key for a single - CommitmentProof in the - - chained proof. NOTE: ClientState must stored under - - `{upgradePath}/{upgradeHeight}/clientState` - ConsensusState must be stored - - under `{upgradepath}/{upgradeHeight}/consensusState` - For SDK chains using + additional field `@type` which contains the type URL. + Example: - the default upgrade module, upgrade_path should be - []string{"upgrade", + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } - "upgradedIBCState"}` - allow_update_after_expiry: - type: boolean - title: >- - This flag, when set to true, will allow governance to - recover a client + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } - which has expired - allow_update_after_misbehaviour: - type: boolean - title: >- - This flag, when set to true, will allow governance to - unfreeze a client + If the embedded message type is well-known and has a custom + JSON - whose chain has experienced a misbehaviour event - provider_consensus_state: - description: >- - ProviderConsensusState filled in on new chain, nil on - restart. - type: object - properties: - timestamp: - type: string - format: date-time - description: >- - timestamp that corresponds to the block height in - which the ConsensusState + representation, that representation will be embedded adding + a field - was stored. - root: - title: commitment root (i.e app hash) - type: object - properties: - hash: - type: string - format: byte - description: >- - MerkleRoot defines a merkle root hash. + `value` which holds the custom JSON in addition to the + `@type` - In the Cosmos SDK, the AppHash of a block header - becomes the root. - next_validators_hash: - type: string - format: byte - maturing_packets: - type: array - items: - type: object - properties: - vscId: - type: string - format: uint64 - maturity_time: - type: string - format: date-time - title: >- - MaturingVSCPacket contains the maturing time of a - received VSCPacket - description: MaturingPackets nil on new chain, filled in on restart. - initial_val_set: - type: array - items: - type: object - properties: - pub_key: - type: object - properties: - ed25519: - type: string - format: byte - secp256k1: - type: string - format: byte - title: >- - PublicKey defines the keys available for use with - Tendermint Validators - power: - type: string - format: int64 - title: ValidatorUpdate - description: InitialValset filled in on new chain and on restart. - height_to_valset_update_id: - type: array - items: - type: object - properties: - height: - type: string - format: uint64 - valset_update_id: - type: string - format: uint64 - title: >- - HeightValsetUpdateID defines the genesis information for - the mapping + field. Example (for message [google.protobuf.Duration][]): - of each block height to a valset update id - description: >- - HeightToValsetUpdateId nil on new chain, filled in on - restart. - outstanding_downtime_slashing: - type: array - items: - type: object - properties: - validator_consensus_address: - type: string - description: >- - OutstandingDowntime defines the genesis information for - each validator + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + parameters: + - name: channel_id + description: channel unique identifier + in: path + required: true + type: string + - name: port_id + description: port unique identifier + in: path + required: true + type: string + - name: packet_commitment_sequences + description: list of packet sequences + in: path + required: true + type: array + items: + type: string + format: uint64 + collectionFormat: csv + minItems: 1 + tags: + - Query + /ibc/core/channel/v1/channels/{channel_id}/ports/{port_id}/packet_commitments/{sequence}: + get: + summary: PacketCommitment queries a stored packet commitment hash. + operationId: IbcCoreChannelV1PacketCommitment + responses: + '200': + description: A successful response. + schema: + type: object + properties: + commitment: + type: string + format: byte + title: packet associated with the request fields + proof: + type: string + format: byte + title: merkle proof of existence + proof_height: + title: height at which the proof was retrieved + type: object + properties: + revision_number: + type: string + format: uint64 + title: the revision that the client is currently on + revision_height: + type: string + format: uint64 + title: the height within the given revision + description: >- + Normally the RevisionHeight is incremented at each height + while keeping - flagged with an outstanding downtime slashing. - description: >- - OutstandingDowntimes nil on new chain, filled in on - restart. - pending_consumer_packets: - description: >- - PendingConsumerPackets nil on new chain, filled in on - restart. - type: object - properties: - list: - type: array - items: - type: object - properties: - type: - type: string - enum: - - CONSUMER_PACKET_TYPE_UNSPECIFIED - - CONSUMER_PACKET_TYPE_SLASH - - CONSUMER_PACKET_TYPE_VSCM - default: CONSUMER_PACKET_TYPE_UNSPECIFIED - description: >- - ConsumerPacketType indicates interchain security - specific packet types. + RevisionNumber the same. However some consensus algorithms may + choose to - - CONSUMER_PACKET_TYPE_UNSPECIFIED: UNSPECIFIED packet type - - CONSUMER_PACKET_TYPE_SLASH: Slash packet - - CONSUMER_PACKET_TYPE_VSCM: VSCMatured packet - slashPacketData: - type: object - properties: - validator: - type: object - properties: - address: - type: string - format: byte - title: The first 20 bytes of SHA256(public key) - power: - type: string - format: int64 - description: The voting power - title: >- - PubKey pub_key = 2 - [(gogoproto.nullable)=false]; - title: Validator - valset_update_id: - type: string - format: uint64 - title: >- - map to the infraction block height on the - provider - infraction: - title: >- - tell if the slashing is for a downtime or a - double-signing infraction - type: string - enum: - - INFRACTION_TYPE_UNSPECIFIED - - INFRACTION_TYPE_DOUBLE_SIGN - - INFRACTION_TYPE_DOWNTIME - default: INFRACTION_TYPE_UNSPECIFIED - description: >- - InfractionType indicates the infraction type - a validator commited. + reset the height in certain conditions e.g. hard forks, + state-machine - - INFRACTION_TYPE_UNSPECIFIED: UNSPECIFIED defines an empty infraction type. - - INFRACTION_TYPE_DOUBLE_SIGN: DOUBLE_SIGN defines a validator that double-signs a block. - - INFRACTION_TYPE_DOWNTIME: DOWNTIME defines a validator that missed signing too many blocks. - description: >- - This packet is sent from the consumer chain to - the provider chain + breaking changes In these cases, the RevisionNumber is + incremented so that - to request the slashing of a validator as a - result of an infraction + height continues to be monitonically increasing even as the + RevisionHeight - committed on the consumer chain. - vscMaturedPacketData: - type: object - properties: - valset_update_id: - type: string - format: uint64 - title: >- - the id of the VSC packet that reached - maturity - description: >- - This packet is sent from the consumer chain to - the provider chain + gets reset + title: >- + QueryPacketCommitmentResponse defines the client query response + for a packet - to notify that a VSC packet reached maturity on - the consumer chain. - title: >- - ConsumerPacketData contains a consumer packet data - and a type tag - last_transmission_block_height: - description: >- - LastTransmissionBlockHeight nil on new chain, filled in on - restart. - type: object - properties: - height: - type: string - format: int64 - title: >- - LastTransmissionBlockHeight is the last time validator - holding + which also includes a proof and the height from which the proof + was - pools were transmitted to the provider chain - preCCV: - type: boolean - title: >- - flag indicating whether the consumer CCV module starts in - pre-CCV state - title: GenesisState defines the CCV consumer chain genesis state + retrieved default: description: An unexpected error response. schema: @@ -26520,97 +25988,82 @@ paths: "value": "1.212s" } parameters: - - name: chain_id + - name: channel_id + description: channel unique identifier + in: path + required: true + type: string + - name: port_id + description: port unique identifier + in: path + required: true + type: string + - name: sequence + description: packet sequence in: path required: true type: string + format: uint64 tags: - Query - /interchain_security/ccv/provider/pending_consumer_packets: + /ibc/core/channel/v1/channels/{channel_id}/ports/{port_id}/packet_receipts/{sequence}: get: summary: >- - QueryThrottledConsumerPacketData returns a list of pending packet data - instances + PacketReceipt queries if a given packet sequence has been received on + the - (slash packet and vsc matured) for a single consumer chain - operationId: InterchainSecurityCcvProviderV1QueryThrottledConsumerPacketData + queried chain + operationId: IbcCoreChannelV1PacketReceipt responses: '200': description: A successful response. schema: type: object properties: - chain_id: - type: string - size: + received: + type: boolean + title: success flag for if receipt exists + proof: type: string - format: uint64 - packetDataInstances: - type: array - items: - type: object - properties: - slash_packet: - type: object - properties: - validator: - type: object - properties: - address: - type: string - format: byte - title: The first 20 bytes of SHA256(public key) - power: - type: string - format: int64 - description: The voting power - title: PubKey pub_key = 2 [(gogoproto.nullable)=false]; - title: Validator - valset_update_id: - type: string - format: uint64 - title: map to the infraction block height on the provider - infraction: - title: >- - tell if the slashing is for a downtime or a - double-signing infraction - type: string - enum: - - INFRACTION_TYPE_UNSPECIFIED - - INFRACTION_TYPE_DOUBLE_SIGN - - INFRACTION_TYPE_DOWNTIME - default: INFRACTION_TYPE_UNSPECIFIED - description: >- - InfractionType indicates the infraction type a - validator commited. + format: byte + title: merkle proof of existence + proof_height: + title: height at which the proof was retrieved + type: object + properties: + revision_number: + type: string + format: uint64 + title: the revision that the client is currently on + revision_height: + type: string + format: uint64 + title: the height within the given revision + description: >- + Normally the RevisionHeight is incremented at each height + while keeping - - INFRACTION_TYPE_UNSPECIFIED: UNSPECIFIED defines an empty infraction type. - - INFRACTION_TYPE_DOUBLE_SIGN: DOUBLE_SIGN defines a validator that double-signs a block. - - INFRACTION_TYPE_DOWNTIME: DOWNTIME defines a validator that missed signing too many blocks. - description: >- - This packet is sent from the consumer chain to the - provider chain + RevisionNumber the same. However some consensus algorithms may + choose to - to request the slashing of a validator as a result of an - infraction + reset the height in certain conditions e.g. hard forks, + state-machine - committed on the consumer chain. - vsc_matured_packet: - type: object - properties: - valset_update_id: - type: string - format: uint64 - title: the id of the VSC packet that reached maturity - description: >- - This packet is sent from the consumer chain to the - provider chain + breaking changes In these cases, the RevisionNumber is + incremented so that - to notify that a VSC packet reached maturity on the - consumer chain. - title: >- - ThrottledPacketDataWrapper contains either SlashPacketData - or VSCMaturedPacketData + height continues to be monitonically increasing even as the + RevisionHeight + + gets reset + title: >- + QueryPacketReceiptResponse defines the client query response for a + packet + + receipt which also includes a proof, and the height from which the + proof was + + retrieved default: description: An unexpected error response. schema: @@ -26797,143 +26250,177 @@ paths: "value": "1.212s" } parameters: - - name: chain_id - in: query - required: false + - name: channel_id + description: channel unique identifier + in: path + required: true + type: string + - name: port_id + description: port unique identifier + in: path + required: true + type: string + - name: sequence + description: packet sequence + in: path + required: true type: string + format: uint64 tags: - Query - /interchain_security/ccv/provider/throttle_state: + /ibc/core/channel/v1/connections/{connection}/channels: get: - summary: >- - QueryThrottleState returns the main on-chain state relevant to currently - throttled slash packets - operationId: InterchainSecurityCcvProviderV1QueryThrottleState + summary: |- + ConnectionChannels queries all the channels associated with a connection + end. + operationId: IbcCoreChannelV1ConnectionChannels responses: '200': description: A successful response. schema: type: object properties: - slash_meter: - type: string - format: int64 - title: current slash_meter state - slash_meter_allowance: - type: string - format: int64 - description: >- - allowance of voting power units (int) that the slash meter is - given per replenish period - - this also serves as the max value for the meter. - next_replenish_candidate: - type: string - format: date-time - title: >- - next time the slash meter could potentially be replenished, - iff it's not full - packets: + channels: type: array items: type: object properties: - global_entry: + state: + title: current state of the channel end + type: string + enum: + - STATE_UNINITIALIZED_UNSPECIFIED + - STATE_INIT + - STATE_TRYOPEN + - STATE_OPEN + - STATE_CLOSED + default: STATE_UNINITIALIZED_UNSPECIFIED + description: >- + State defines if a channel is in one of the following + states: + + CLOSED, INIT, TRYOPEN, OPEN or UNINITIALIZED. + + - STATE_UNINITIALIZED_UNSPECIFIED: Default State + - STATE_INIT: A channel has just started the opening handshake. + - STATE_TRYOPEN: A channel has acknowledged the handshake step on the counterparty chain. + - STATE_OPEN: A channel has completed the handshake. Open channels are + ready to send and receive packets. + - STATE_CLOSED: A channel has been closed and can no longer be used to send or receive + packets. + ordering: + title: whether the channel is ordered or unordered + type: string + enum: + - ORDER_NONE_UNSPECIFIED + - ORDER_UNORDERED + - ORDER_ORDERED + default: ORDER_NONE_UNSPECIFIED + description: >- + - ORDER_NONE_UNSPECIFIED: zero-value for channel + ordering + - ORDER_UNORDERED: packets can be delivered in any order, which may differ from the order in + which they were sent. + - ORDER_ORDERED: packets are delivered exactly in the order which they were sent + counterparty: + title: counterparty channel end type: object properties: - recv_time: + port_id: type: string - format: date-time description: >- - Block time that slash packet was received by - provider chain. - - This field is used for store key iteration ordering. - consumer_chain_id: - type: string - description: The consumer that sent a slash packet. - ibc_seq_num: + port on the counterparty chain which owns the other + end of the channel. + channel_id: type: string - format: uint64 - description: >- - The IBC sequence number of the recv packet. + title: channel end on the counterparty chain + connection_hops: + type: array + items: + type: string + title: >- + list of connection identifiers, in order, along which + packets sent on - This field is used in the store key to ensure - uniqueness. - provider_val_cons_addr: - description: >- - The provider's consensus address of the validator - being slashed. + this channel will travel + version: + type: string + title: >- + opaque channel version, which is agreed upon during the + handshake + port_id: + type: string + title: port identifier + channel_id: + type: string + title: channel identifier + description: >- + IdentifiedChannel defines a channel with additional port and + channel - This field is used to obtain validator power in - HandleThrottleQueues. + identifier fields. + description: list of channels associated with a connection. + pagination: + title: pagination response + type: object + properties: + next_key: + type: string + format: byte + 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. + total: + type: string + format: uint64 + title: >- + total is total number of results available if + PageRequest.count_total + was set, its value is undefined otherwise + description: >- + PageResponse is to be embedded in gRPC response messages where + the - This field is not used in the store key, but is - persisted in value bytes, see QueueGlobalSlashEntry. - type: object - properties: - address: - type: string - format: byte - title: >- - A validator's consensus address on the provider - chain - description: >- - A persisted queue entry indicating that a slash packet - data instance needs to be handled. + corresponding request message has used PageRequest. - This type belongs in the "global" queue, to coordinate - slash packet handling times between consumers. - data: - type: object - properties: - validator: - type: object - properties: - address: - type: string - format: byte - title: The first 20 bytes of SHA256(public key) - power: - type: string - format: int64 - description: The voting power - title: PubKey pub_key = 2 [(gogoproto.nullable)=false]; - title: Validator - valset_update_id: - type: string - format: uint64 - title: map to the infraction block height on the provider - infraction: - title: >- - tell if the slashing is for a downtime or a - double-signing infraction - type: string - enum: - - INFRACTION_TYPE_UNSPECIFIED - - INFRACTION_TYPE_DOUBLE_SIGN - - INFRACTION_TYPE_DOWNTIME - default: INFRACTION_TYPE_UNSPECIFIED - description: >- - InfractionType indicates the infraction type a - validator commited. + message SomeResponse { + repeated Bar results = 1; + PageResponse page = 2; + } + height: + title: query block height + type: object + properties: + revision_number: + type: string + format: uint64 + title: the revision that the client is currently on + revision_height: + type: string + format: uint64 + title: the height within the given revision + description: >- + Normally the RevisionHeight is incremented at each height + while keeping - - INFRACTION_TYPE_UNSPECIFIED: UNSPECIFIED defines an empty infraction type. - - INFRACTION_TYPE_DOUBLE_SIGN: DOUBLE_SIGN defines a validator that double-signs a block. - - INFRACTION_TYPE_DOWNTIME: DOWNTIME defines a validator that missed signing too many blocks. - description: >- - This packet is sent from the consumer chain to the - provider chain + RevisionNumber the same. However some consensus algorithms may + choose to - to request the slashing of a validator as a result of an - infraction + reset the height in certain conditions e.g. hard forks, + state-machine - committed on the consumer chain. - description: >- - A query wrapper type for the global entry and data relevant - to a throttled slash packet. - title: data relevant to currently throttled slash packets + breaking changes In these cases, the RevisionNumber is + incremented so that + + height continues to be monitonically increasing even as the + RevisionHeight + + gets reset + title: |- + QueryConnectionChannelsResponse is the Response type for the + Query/QueryConnectionChannels RPC method default: description: An unexpected error response. schema: @@ -27119,236 +26606,304 @@ paths: "@type": "type.googleapis.com/google.protobuf.Duration", "value": "1.212s" } + parameters: + - name: connection + description: connection unique identifier + in: path + required: true + type: string + - name: pagination.key + 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. + in: query + required: false + type: string + format: byte + - name: pagination.offset + 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. + in: query + required: false + type: string + format: uint64 + - name: pagination.limit + 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. + in: query + required: false + type: string + format: uint64 + - name: pagination.count_total + 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 + required: false + type: boolean + - name: pagination.reverse + description: >- + reverse is set to true if results are to be returned in the + descending order. + + + Since: cosmos-sdk 0.43 + in: query + required: false + type: boolean tags: - Query - /interchain_security/ccv/provider/validator_consumer_addr: + /ibc/core/client/v1/client_states: get: - summary: |- - QueryValidatorConsumerAddr queries the address - assigned by a validator for a consumer chain. - operationId: InterchainSecurityCcvProviderV1QueryValidatorConsumerAddr + summary: ClientStates queries all the IBC light clients of a chain. + operationId: IbcCoreClientV1ClientStates responses: '200': description: A successful response. schema: type: object properties: - consumer_address: - type: string - title: The address of the validator on the consumer chain - default: - description: An unexpected error response. - schema: - type: object - properties: - code: - type: integer - format: int32 - message: - type: string - details: + client_states: type: array items: type: object properties: - '@type': + client_id: type: string - description: >- - A URL/resource name that uniquely identifies the type of - the serialized + title: client identifier + client_state: + title: client state + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the + type of the serialized - protocol buffer message. This string must contain at - least + protocol buffer message. This string must contain at + least - one "/" character. The last segment of the URL's path - must represent + one "/" character. The last segment of the URL's + path must represent - the fully qualified name of the type (as in + the fully qualified name of the type (as in - `path/google.protobuf.Duration`). The name should be in - a canonical form + `path/google.protobuf.Duration`). The name should be + in a canonical form - (e.g., leading "." is not accepted). + (e.g., leading "." is not accepted). - In practice, teams usually precompile into the binary - all types that they + In practice, teams usually precompile into the + binary all types that they - expect it to use in the context of Any. However, for - URLs which use the + expect it to use in the context of Any. However, for + URLs which use the - scheme `http`, `https`, or no scheme, one can optionally - set up a type + scheme `http`, `https`, or no scheme, one can + optionally set up a type - server that maps type URLs to message definitions as - follows: + server that maps type URLs to message definitions as + follows: - * If no scheme is provided, `https` is assumed. + * If no scheme is provided, `https` is assumed. - * An HTTP GET on the URL must yield a - [google.protobuf.Type][] - value in binary format, or produce an error. - * Applications are allowed to cache lookup results based - on the - URL, or have them precompiled into a binary to avoid any - lookup. Therefore, binary compatibility needs to be preserved - on changes to types. (Use versioned type names to manage - breaking changes.) + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results + based on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) - Note: this functionality is not currently available in - the official + Note: this functionality is not currently available + in the official - protobuf release, and it is not used for type URLs - beginning with + protobuf release, and it is not used for type URLs + beginning with - type.googleapis.com. + type.googleapis.com. - Schemes other than `http`, `https` (or the empty scheme) - might be + Schemes other than `http`, `https` (or the empty + scheme) might be - used with implementation specific semantics. - additionalProperties: {} - description: >- - `Any` contains an arbitrary serialized protocol buffer - message along with a + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer + message along with a - URL that describes the type of the serialized message. + URL that describes the type of the serialized message. - Protobuf library provides support to pack/unpack Any values - in the form + Protobuf library provides support to pack/unpack Any + values in the form - of utility functions or additional generated methods of the - Any type. + of utility functions or additional generated methods of + the Any type. - Example 1: Pack and unpack a message in C++. + Example 1: Pack and unpack a message in C++. - Foo foo = ...; - Any any; - any.PackFrom(foo); - ... - if (any.UnpackTo(&foo)) { - ... - } + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } - Example 2: Pack and unpack a message in Java. + Example 2: Pack and unpack a message in Java. - Foo foo = ...; - Any any = Any.pack(foo); - ... - if (any.is(Foo.class)) { - foo = any.unpack(Foo.class); - } + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. - foo = Foo(...) - any = Any() - any.Pack(foo) - ... - if any.Is(Foo.DESCRIPTOR): - any.Unpack(foo) - ... + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go - foo := &pb.Foo{...} - any, err := anypb.New(foo) - if err != nil { - ... - } - ... - foo := &pb.Foo{} - if err := any.UnmarshalTo(foo); err != nil { - ... - } + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } - The pack methods provided by protobuf library will by - default use + The pack methods provided by protobuf library will by + default use - 'type.googleapis.com/full.type.name' as the type URL and the - unpack + 'type.googleapis.com/full.type.name' as the type URL and + the unpack - methods only use the fully qualified type name after the - last '/' + methods only use the fully qualified type name after the + last '/' - in the type URL, for example "foo.bar.com/x/y.z" will yield - type + in the type URL, for example "foo.bar.com/x/y.z" will + yield type - name "y.z". + name "y.z". - JSON + JSON - ==== + ==== - The JSON representation of an `Any` value uses the regular + The JSON representation of an `Any` value uses the + regular - representation of the deserialized, embedded message, with - an + representation of the deserialized, embedded message, + with an - additional field `@type` which contains the type URL. - Example: + additional field `@type` which contains the type URL. + Example: - package google.profile; - message Person { - string first_name = 1; - string last_name = 2; - } + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } - { - "@type": "type.googleapis.com/google.profile.Person", - "firstName": , - "lastName": - } + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } - If the embedded message type is well-known and has a custom - JSON + If the embedded message type is well-known and has a + custom JSON - representation, that representation will be embedded adding - a field + representation, that representation will be embedded + adding a field - `value` which holds the custom JSON in addition to the - `@type` + `value` which holds the custom JSON in addition to the + `@type` - field. Example (for message [google.protobuf.Duration][]): + field. Example (for message + [google.protobuf.Duration][]): - { - "@type": "type.googleapis.com/google.protobuf.Duration", - "value": "1.212s" - } - parameters: - - name: chain_id - description: The id of the consumer chain - in: query - required: false - type: string - - name: provider_address - description: The consensus address of the validator on the provider chain - in: query - required: false - type: string - tags: - - Query - /interchain_security/ccv/provider/validator_provider_addr: - get: - summary: |- - QueryProviderAddr returns the provider chain validator - given a consumer chain validator address - operationId: InterchainSecurityCcvProviderV1QueryValidatorProviderAddr - responses: - '200': - description: A successful response. - schema: - type: object - properties: - provider_address: - type: string - title: The address of the validator on the provider chain + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + description: >- + IdentifiedClientState defines a client state with an + additional client + + identifier field. + description: list of stored ClientStates of the chain. + pagination: + title: pagination response + type: object + properties: + next_key: + type: string + format: byte + 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. + total: + type: string + format: uint64 + title: >- + total is total number of results available if + PageRequest.count_total + + was set, its value is undefined otherwise + 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; + } + description: >- + QueryClientStatesResponse is the response type for the + Query/ClientStates RPC + + method. default: description: An unexpected error response. schema: @@ -27535,105 +27090,6 @@ paths: "value": "1.212s" } parameters: - - name: chain_id - description: The id of the provider chain - in: query - required: false - type: string - - name: consumer_address - description: The consensus address of the validator on the consumer chain - in: query - required: false - type: string - tags: - - Query - /neutron/contractmanager/failures: - get: - summary: Queries a list of Failure items. - operationId: NeutronContractmanagerFailures - responses: - '200': - description: A successful response. - schema: - type: object - properties: - failures: - type: array - items: - type: object - properties: - channel_id: - type: string - title: ChannelId - address: - type: string - title: Address of the failed contract - id: - type: string - format: uint64 - title: id of the failure under specific address - ack_id: - type: string - format: uint64 - title: ACK id to restore - ack_type: - type: string - title: Acknowledgement type - description: >- - Failure message contains information about ACK failures and - can be used to - - replay ACK in case of requirement. - pagination: - type: object - properties: - next_key: - type: string - format: byte - title: |- - next_key is the key to be passed to PageRequest.key to - query the next page most efficiently - total: - type: string - format: uint64 - title: >- - total is total number of results available if - PageRequest.count_total - - was set, its value is undefined otherwise - 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; - } - default: - description: An unexpected error response. - schema: - type: object - properties: - code: - type: integer - format: int32 - message: - type: string - details: - type: array - items: - type: object - properties: - '@type': - type: string - additionalProperties: {} - parameters: - - name: address - in: query - required: false - type: string - name: pagination.key description: |- key is a value returned in PageResponse.next_key to begin @@ -27692,70 +27148,227 @@ paths: type: boolean tags: - Query - /neutron/contractmanager/failures/{address}: + /ibc/core/client/v1/client_states/{client_id}: get: - summary: Queries a Failure by address. - operationId: NeutronContractmanagerAddressFailures + summary: ClientState queries an IBC light client. + operationId: IbcCoreClientV1ClientState responses: '200': description: A successful response. schema: type: object properties: - failures: - type: array - items: - type: object - properties: - channel_id: - type: string - title: ChannelId - address: - type: string - title: Address of the failed contract - id: - type: string - format: uint64 - title: id of the failure under specific address - ack_id: - type: string - format: uint64 - title: ACK id to restore - ack_type: - type: string - title: Acknowledgement type - description: >- - Failure message contains information about ACK failures and - can be used to + client_state: + title: client state associated with the request identifier + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type of + the serialized - replay ACK in case of requirement. - pagination: + protocol buffer message. This string must contain at least + + one "/" character. The last segment of the URL's path must + represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be in a + canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the binary all + types that they + + expect it to use in the context of Any. However, for URLs + which use the + + scheme `http`, `https`, or no scheme, one can optionally + set up a type + + server that maps type URLs to message definitions as + follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based + on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in the + official + + protobuf release, and it is not used for type URLs + beginning with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty scheme) + might be + + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer message + along with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any values in + the form + + of utility functions or additional generated methods of the + Any type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by default + use + + 'type.googleapis.com/full.type.name' as the type URL and the + unpack + + methods only use the fully qualified type name after the last + '/' + + in the type URL, for example "foo.bar.com/x/y.z" will yield + type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the regular + + representation of the deserialized, embedded message, with an + + additional field `@type` which contains the type URL. Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a custom + JSON + + representation, that representation will be embedded adding a + field + + `value` which holds the custom JSON in addition to the `@type` + + field. Example (for message [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + proof: + type: string + format: byte + title: merkle proof of existence + proof_height: + title: height at which the proof was retrieved type: object properties: - next_key: + revision_number: type: string - format: byte - title: |- - next_key is the key to be passed to PageRequest.key to - query the next page most efficiently - total: + format: uint64 + title: the revision that the client is currently on + revision_height: type: string format: uint64 - title: >- - total is total number of results available if - PageRequest.count_total - - was set, its value is undefined otherwise + title: the height within the given revision description: >- - PageResponse is to be embedded in gRPC response messages where - the + Normally the RevisionHeight is incremented at each height + while keeping - corresponding request message has used PageRequest. + RevisionNumber the same. However some consensus algorithms may + choose to - message SomeResponse { - repeated Bar results = 1; - PageResponse page = 2; - } + reset the height in certain conditions e.g. hard forks, + state-machine + + breaking changes In these cases, the RevisionNumber is + incremented so that + + height continues to be monitonically increasing even as the + RevisionHeight + + gets reset + description: >- + QueryClientStateResponse is the response type for the + Query/ClientState RPC + + method. Besides the client state, it includes a proof and the + height from + + which the proof was retrieved. default: description: An unexpected error response. schema: @@ -27773,127 +27386,199 @@ paths: properties: '@type': type: string - additionalProperties: {} - parameters: - - name: address - in: path - required: true - type: string - - name: pagination.key - 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. - in: query - required: false - type: string - format: byte - - name: pagination.offset - description: >- - offset is a numeric offset that can be used when key is unavailable. + description: >- + A URL/resource name that uniquely identifies the type of + the serialized - It is less efficient than using key. Only one of offset or key - should + protocol buffer message. This string must contain at + least - be set. - in: query - required: false - type: string - format: uint64 - - name: pagination.limit - description: >- - limit is the total number of results to be returned in the result - page. + one "/" character. The last segment of the URL's path + must represent - If left empty it will default to a value to be set by each app. - in: query - required: false - type: string - format: uint64 - - name: pagination.count_total - description: >- - count_total is set to true to indicate that the result set should - include + the fully qualified name of the type (as in - a count of the total number of items available for pagination in - UIs. + `path/google.protobuf.Duration`). The name should be in + a canonical form - count_total is only respected when offset is used. It is ignored - when key + (e.g., leading "." is not accepted). - is set. - in: query - required: false - type: boolean - - name: pagination.reverse - description: >- - reverse is set to true if results are to be returned in the - descending order. + In practice, teams usually precompile into the binary + all types that they - Since: cosmos-sdk 0.43 - in: query - required: false - type: boolean - tags: - - Query - /neutron/contractmanager/params: - get: - summary: Parameters queries the parameters of the module. - operationId: NeutronContractmanagerParams - responses: - '200': - description: A successful response. - schema: - type: object - properties: - params: - description: params holds all the parameters of this module. - type: object - description: >- - QueryParamsResponse is response type for the Query/Params RPC - method. - default: - description: An unexpected error response. - schema: - type: object - properties: - code: - type: integer - format: int32 - message: - type: string - details: - type: array - items: - type: object - properties: - '@type': - type: string + expect it to use in the context of Any. However, for + URLs which use the + + scheme `http`, `https`, or no scheme, one can optionally + set up a type + + server that maps type URLs to message definitions as + follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based + on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in + the official + + protobuf release, and it is not used for type URLs + beginning with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty scheme) + might be + + used with implementation specific semantics. additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer + message along with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any values + in the form + + of utility functions or additional generated methods of the + Any type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by + default use + + 'type.googleapis.com/full.type.name' as the type URL and the + unpack + + methods only use the fully qualified type name after the + last '/' + + in the type URL, for example "foo.bar.com/x/y.z" will yield + type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the regular + + representation of the deserialized, embedded message, with + an + + additional field `@type` which contains the type URL. + Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a custom + JSON + + representation, that representation will be embedded adding + a field + + `value` which holds the custom JSON in addition to the + `@type` + + field. Example (for message [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + parameters: + - name: client_id + description: client state unique identifier + in: path + required: true + type: string tags: - Query - /neutron/cron/params: + /ibc/core/client/v1/client_status/{client_id}: get: - summary: Queries the parameters of the module. - operationId: NeutronCronParams + summary: Status queries the status of an IBC client. + operationId: IbcCoreClientV1ClientStatus responses: '200': description: A successful response. schema: type: object properties: - params: - description: params holds all the parameters of this module. - type: object - properties: - security_address: - type: string - title: Security address that can remove schedules - limit: - type: string - format: uint64 - title: Limit of schedules executed in one block + status: + type: string + description: >- + QueryClientStatusResponse is the response type for the + Query/ClientStatus RPC + + method. It returns the current status of the IBC client. default: description: An unexpected error response. schema: @@ -27911,236 +27596,442 @@ paths: properties: '@type': type: string + description: >- + A URL/resource name that uniquely identifies the type of + the serialized + + protocol buffer message. This string must contain at + least + + one "/" character. The last segment of the URL's path + must represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be in + a canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the binary + all types that they + + expect it to use in the context of Any. However, for + URLs which use the + + scheme `http`, `https`, or no scheme, one can optionally + set up a type + + server that maps type URLs to message definitions as + follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based + on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in + the official + + protobuf release, and it is not used for type URLs + beginning with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty scheme) + might be + + used with implementation specific semantics. additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer + message along with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any values + in the form + + of utility functions or additional generated methods of the + Any type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by + default use + + 'type.googleapis.com/full.type.name' as the type URL and the + unpack + + methods only use the fully qualified type name after the + last '/' + + in the type URL, for example "foo.bar.com/x/y.z" will yield + type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the regular + + representation of the deserialized, embedded message, with + an + + additional field `@type` which contains the type URL. + Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a custom + JSON + + representation, that representation will be embedded adding + a field + + `value` which holds the custom JSON in addition to the + `@type` + + field. Example (for message [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + parameters: + - name: client_id + description: client unique identifier + in: path + required: true + type: string tags: - Query - /neutron/cron/schedule: + /ibc/core/client/v1/consensus_states/{client_id}: get: - summary: Queries a list of Schedule items. - operationId: NeutronCronSchedules + summary: |- + ConsensusStates queries all the consensus state associated with a given + client. + operationId: IbcCoreClientV1ConsensusStates responses: '200': description: A successful response. schema: type: object properties: - schedules: + consensus_states: type: array items: type: object properties: - name: - type: string - title: Name of schedule - period: - type: string - format: uint64 - title: Period in blocks - msgs: - type: array - items: - type: object - properties: - contract: - type: string - title: Contract is the address of the smart contract - msg: - type: string - title: >- - Msg is json encoded message to be passed to the - contract - title: Msgs that will be executed every period amount of time - last_execute_height: - type: string - format: uint64 - title: Last execution's block height - pagination: - type: object - properties: - next_key: - type: string - format: byte - title: |- - next_key is the key to be passed to PageRequest.key to - query the next page most efficiently - total: - type: string - format: uint64 - title: >- - total is total number of results available if - PageRequest.count_total + height: + title: consensus state height + type: object + properties: + revision_number: + type: string + format: uint64 + title: the revision that the client is currently on + revision_height: + type: string + format: uint64 + title: the height within the given revision + description: >- + Normally the RevisionHeight is incremented at each + height while keeping - was set, its value is undefined otherwise - description: >- - PageResponse is to be embedded in gRPC response messages where - the + RevisionNumber the same. However some consensus + algorithms may choose to - corresponding request message has used PageRequest. + reset the height in certain conditions e.g. hard forks, + state-machine - message SomeResponse { - repeated Bar results = 1; - PageResponse page = 2; - } - default: - description: An unexpected error response. - schema: - type: object - properties: - code: - type: integer - format: int32 - message: - type: string - details: - type: array - items: - type: object - properties: - '@type': - type: string - additionalProperties: {} - parameters: - - name: pagination.key - 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. - in: query - required: false - type: string - format: byte - - name: pagination.offset - description: >- - offset is a numeric offset that can be used when key is unavailable. + breaking changes In these cases, the RevisionNumber is + incremented so that - It is less efficient than using key. Only one of offset or key - should + height continues to be monitonically increasing even as + the RevisionHeight - be set. - in: query - required: false - type: string - format: uint64 - - name: pagination.limit - description: >- - limit is the total number of results to be returned in the result - page. + gets reset + consensus_state: + title: consensus state + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the + type of the serialized - If left empty it will default to a value to be set by each app. - in: query - required: false - type: string - format: uint64 - - name: pagination.count_total - description: >- - count_total is set to true to indicate that the result set should - include + protocol buffer message. This string must contain at + least - a count of the total number of items available for pagination in - UIs. + one "/" character. The last segment of the URL's + path must represent - count_total is only respected when offset is used. It is ignored - when key + the fully qualified name of the type (as in - is set. - in: query - required: false - type: boolean - tags: - - Query - /neutron/cron/schedule/{name}: - get: - summary: Queries a Schedule by name. - operationId: NeutronCronSchedule - responses: - '200': - description: A successful response. - schema: - type: object - properties: - schedule: + `path/google.protobuf.Duration`). The name should be + in a canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the + binary all types that they + + expect it to use in the context of Any. However, for + URLs which use the + + scheme `http`, `https`, or no scheme, one can + optionally set up a type + + server that maps type URLs to message definitions as + follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results + based on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available + in the official + + protobuf release, and it is not used for type URLs + beginning with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty + scheme) might be + + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer + message along with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any + values in the form + + of utility functions or additional generated methods of + the Any type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by + default use + + 'type.googleapis.com/full.type.name' as the type URL and + the unpack + + methods only use the fully qualified type name after the + last '/' + + in the type URL, for example "foo.bar.com/x/y.z" will + yield type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the + regular + + representation of the deserialized, embedded message, + with an + + additional field `@type` which contains the type URL. + Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a + custom JSON + + representation, that representation will be embedded + adding a field + + `value` which holds the custom JSON in addition to the + `@type` + + field. Example (for message + [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + description: >- + ConsensusStateWithHeight defines a consensus state with an + additional height + + field. + title: consensus states associated with the identifier + pagination: + title: pagination response type: object properties: - name: - type: string - title: Name of schedule - period: + next_key: type: string - format: uint64 - title: Period in blocks - msgs: - type: array - items: - type: object - properties: - contract: - type: string - title: Contract is the address of the smart contract - msg: - type: string - title: >- - Msg is json encoded message to be passed to the - contract - title: Msgs that will be executed every period amount of time - last_execute_height: + format: byte + 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. + total: type: string format: uint64 - title: Last execution's block height - default: - description: An unexpected error response. - schema: - type: object - properties: - code: - type: integer - format: int32 - message: - type: string - details: - type: array - items: - type: object - properties: - '@type': - type: string - additionalProperties: {} - parameters: - - name: name - in: path - required: true - type: string - tags: - - Query - /neutron/feeburner/params: - get: - summary: Parameters queries the parameters of the module. - operationId: NeutronFeeburnerParams - responses: - '200': - description: A successful response. - schema: - type: object - properties: - params: - description: params holds all the parameters of this module. - type: object - properties: - neutron_denom: - type: string title: >- - Defines Neutron denom, which will be burned during fee - processing, any + total is total number of results available if + PageRequest.count_total - other denom will be sent to Treasury - reserve_address: - type: string - title: Deprecated in v0.4.4. Is not used anymore - treasury_address: - type: string - title: Defines treasury address - description: >- - QueryParamsResponse is response type for the Query/Params RPC - method. + was set, its value is undefined otherwise + 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; + } + title: |- + QueryConsensusStatesResponse is the response type for the + Query/ConsensusStates RPC method default: description: An unexpected error response. schema: @@ -28158,338 +28049,320 @@ paths: properties: '@type': type: string - additionalProperties: {} - tags: - - Query - /neutron/feeburner/total_burned_neutrons_amount: - get: - summary: TotalBurnedNeutronsAmount queries total amount of burned neutron fees. - operationId: NeutronFeeburnerTotalBurnedNeutronsAmount - responses: - '200': - description: A successful response. - schema: - type: object - properties: - total_burned_neutrons_amount: - type: object - properties: - coin: - type: object - properties: - denom: - type: string - amount: - type: string - description: >- - Coin defines a token with a denomination and an amount. + description: >- + A URL/resource name that uniquely identifies the type of + the serialized + protocol buffer message. This string must contain at + least - NOTE: The amount field is an Int which implements the - custom method + one "/" character. The last segment of the URL's path + must represent - signatures required by gogoproto. - title: >- - TotalBurnedNeutronsAmount defines total amount of burned - neutron fees - description: |- - QueryTotalBurnedNeutronsAmountResponse is response type for the - Query/QueryTotalBurnedNeutronsAmount method. - default: - description: An unexpected error response. - schema: - type: object - properties: - code: - type: integer - format: int32 - message: - type: string - details: - type: array - items: - type: object - properties: - '@type': - type: string - additionalProperties: {} - tags: - - Query - /neutron-org/neutron/feerefunder/info: - get: - operationId: NeutronFeerefunderFeeInfo - responses: - '200': - description: A successful response. - schema: - type: object - properties: - fee_info: - type: object - properties: - payer: - type: string - packet_id: - type: object - properties: - channel_id: - type: string - port_id: - type: string - sequence: - type: string - format: uint64 - fee: - type: object - properties: - recv_fee: - type: array - items: - type: object - properties: - denom: - type: string - amount: - type: string - description: >- - Coin defines a token with a denomination and an - amount. + the fully qualified name of the type (as in + `path/google.protobuf.Duration`). The name should be in + a canonical form - NOTE: The amount field is an Int which implements - the custom method + (e.g., leading "." is not accepted). - signatures required by gogoproto. - title: the packet receive fee - ack_fee: - type: array - items: - type: object - properties: - denom: - type: string - amount: - type: string - description: >- - Coin defines a token with a denomination and an - amount. + In practice, teams usually precompile into the binary + all types that they - NOTE: The amount field is an Int which implements - the custom method + expect it to use in the context of Any. However, for + URLs which use the - signatures required by gogoproto. - title: the packet acknowledgement fee - timeout_fee: - type: array - items: - type: object - properties: - denom: - type: string - amount: - type: string - description: >- - Coin defines a token with a denomination and an - amount. + scheme `http`, `https`, or no scheme, one can optionally + set up a type + server that maps type URLs to message definitions as + follows: - NOTE: The amount field is an Int which implements - the custom method - signatures required by gogoproto. - title: the packet timeout fee - title: >- - Fee defines the ICS29 receive, acknowledgement and timeout - fees - default: - description: An unexpected error response. - schema: - type: object - properties: - code: - type: integer - format: int32 - message: - type: string - details: - type: array - items: - type: object - properties: - '@type': - type: string + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based + on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in + the official + + protobuf release, and it is not used for type URLs + beginning with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty scheme) + might be + + used with implementation specific semantics. additionalProperties: {} - parameters: - - name: channel_id - in: query - required: false - type: string - - name: port_id - in: query + description: >- + `Any` contains an arbitrary serialized protocol buffer + message along with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any values + in the form + + of utility functions or additional generated methods of the + Any type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by + default use + + 'type.googleapis.com/full.type.name' as the type URL and the + unpack + + methods only use the fully qualified type name after the + last '/' + + in the type URL, for example "foo.bar.com/x/y.z" will yield + type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the regular + + representation of the deserialized, embedded message, with + an + + additional field `@type` which contains the type URL. + Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a custom + JSON + + representation, that representation will be embedded adding + a field + + `value` which holds the custom JSON in addition to the + `@type` + + field. Example (for message [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + parameters: + - name: client_id + description: client identifier + in: path + required: true + type: string + - name: pagination.key + 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. + in: query required: false type: string - - name: sequence + format: byte + - name: pagination.offset + 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. + in: query + required: false + type: string + format: uint64 + - name: pagination.limit + 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. in: query required: false type: string format: uint64 + - name: pagination.count_total + 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 + required: false + type: boolean + - name: pagination.reverse + description: >- + reverse is set to true if results are to be returned in the + descending order. + + + Since: cosmos-sdk 0.43 + in: query + required: false + type: boolean tags: - Query - /neutron-org/neutron/feerefunder/params: + /ibc/core/client/v1/consensus_states/{client_id}/heights: get: - summary: Parameters queries the parameters of the module. - operationId: NeutronFeerefunderParams + summary: >- + ConsensusStateHeights queries the height of every consensus states + associated with a given client. + operationId: IbcCoreClientV1ConsensusStateHeights responses: '200': description: A successful response. schema: type: object properties: - params: - description: params holds all the parameters of this module. - type: object - properties: - min_fee: - type: object - properties: - recv_fee: - type: array - items: - type: object - properties: - denom: - type: string - amount: - type: string - description: >- - Coin defines a token with a denomination and an - amount. - - - NOTE: The amount field is an Int which implements - the custom method + consensus_state_heights: + type: array + items: + type: object + properties: + revision_number: + type: string + format: uint64 + title: the revision that the client is currently on + revision_height: + type: string + format: uint64 + title: the height within the given revision + description: >- + Normally the RevisionHeight is incremented at each height + while keeping - signatures required by gogoproto. - title: the packet receive fee - ack_fee: - type: array - items: - type: object - properties: - denom: - type: string - amount: - type: string - description: >- - Coin defines a token with a denomination and an - amount. + RevisionNumber the same. However some consensus algorithms + may choose to + reset the height in certain conditions e.g. hard forks, + state-machine - NOTE: The amount field is an Int which implements - the custom method + breaking changes In these cases, the RevisionNumber is + incremented so that - signatures required by gogoproto. - title: the packet acknowledgement fee - timeout_fee: - type: array - items: - type: object - properties: - denom: - type: string - amount: - type: string - description: >- - Coin defines a token with a denomination and an - amount. + height continues to be monitonically increasing even as the + RevisionHeight + gets reset + title: >- + Height is a monotonically increasing data type - NOTE: The amount field is an Int which implements - the custom method + that can be compared against another Height for the purposes + of updating and - signatures required by gogoproto. - title: the packet timeout fee - title: >- - Fee defines the ICS29 receive, acknowledgement and timeout - fees - description: >- - QueryParamsResponse is response type for the Query/Params RPC - method. - default: - description: An unexpected error response. - schema: - type: object - properties: - code: - type: integer - format: int32 - message: - type: string - details: - type: array - items: - type: object - properties: - '@type': - type: string - additionalProperties: {} - tags: - - Query - /neutron/interchainqueries/params: - get: - summary: Parameters queries the parameters of the module. - operationId: NeutronInterchainqueriesParams - responses: - '200': - description: A successful response. - schema: - type: object - properties: - params: - description: params holds all the parameters of this module. + freezing clients + title: consensus state heights + pagination: + title: pagination response type: object properties: - query_submit_timeout: + next_key: + type: string + format: byte + 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. + total: type: string format: uint64 title: >- - Defines amount of blocks required before query becomes - available for - - removal by anybody - query_deposit: - type: array - items: - type: object - properties: - denom: - type: string - amount: - type: string - description: >- - Coin defines a token with a denomination and an amount. - - - NOTE: The amount field is an Int which implements the - custom method + total is total number of results available if + PageRequest.count_total - signatures required by gogoproto. - description: Amount of coins deposited for the query. - tx_query_removal_limit: - type: string - format: uint64 - description: >- - Amount of tx hashes to be removed during a single - EndBlock. Can vary to + was set, its value is undefined otherwise + description: >- + PageResponse is to be embedded in gRPC response messages where + the - balance between network cleaning speed and EndBlock - duration. A zero value + corresponding request message has used PageRequest. - means no limit. - description: >- - QueryParamsResponse is response type for the Query/Params RPC - method. + message SomeResponse { + repeated Bar results = 1; + PageResponse page = 2; + } + title: |- + QueryConsensusStateHeightsResponse is the response type for the + Query/ConsensusStateHeights RPC method default: description: An unexpected error response. schema: @@ -28675,545 +28548,534 @@ paths: "@type": "type.googleapis.com/google.protobuf.Duration", "value": "1.212s" } + parameters: + - name: client_id + description: client identifier + in: path + required: true + type: string + - name: pagination.key + 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. + in: query + required: false + type: string + format: byte + - name: pagination.offset + 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. + in: query + required: false + type: string + format: uint64 + - name: pagination.limit + 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. + in: query + required: false + type: string + format: uint64 + - name: pagination.count_total + 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 + required: false + type: boolean + - name: pagination.reverse + description: >- + reverse is set to true if results are to be returned in the + descending order. + + + Since: cosmos-sdk 0.43 + in: query + required: false + type: boolean tags: - Query - /neutron/interchainqueries/query_result: + /ibc/core/client/v1/consensus_states/{client_id}/revision/{revision_number}/height/{revision_height}: get: - operationId: NeutronInterchainqueriesQueryResult + summary: >- + ConsensusState queries a consensus state associated with a client state + at + + a given height. + operationId: IbcCoreClientV1ConsensusState responses: '200': description: A successful response. schema: type: object properties: - result: + consensus_state: + title: >- + consensus state associated with the client identifier at the + given height type: object properties: - kv_results: - type: array - items: - type: object - properties: - storage_prefix: - type: string - title: is the substore name (acc, staking, etc.) - key: - type: string - format: byte - title: is the key in IAVL store - value: - type: string - format: byte - title: is the value in IAVL store - Proof: - title: >- - is the Merkle Proof which proves existence of - key-value pair in IAVL + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type of + the serialized - storage - type: object - properties: - ops: - type: array - items: - type: object - properties: - type: - type: string - key: - type: string - format: byte - data: - type: string - format: byte - title: >- - ProofOp defines an operation used for - calculating Merkle root + protocol buffer message. This string must contain at least - The data could be arbitrary format, providing - nessecary data + one "/" character. The last segment of the URL's path must + represent - for example neighbouring node hash - block: - type: object - properties: - next_block_header: - title: >- - We need to know block X+1 to verify response of - transaction for block X + the fully qualified name of the type (as in - since LastResultsHash is root hash of all results from - the txs from the + `path/google.protobuf.Duration`). The name should be in a + canonical form - previous block - type: object - properties: - '@type': - type: string - description: >- - A URL/resource name that uniquely identifies the - type of the serialized + (e.g., leading "." is not accepted). - protocol buffer message. This string must contain - at least - one "/" character. The last segment of the URL's - path must represent + In practice, teams usually precompile into the binary all + types that they - the fully qualified name of the type (as in + expect it to use in the context of Any. However, for URLs + which use the - `path/google.protobuf.Duration`). The name should - be in a canonical form + scheme `http`, `https`, or no scheme, one can optionally + set up a type - (e.g., leading "." is not accepted). + server that maps type URLs to message definitions as + follows: - In practice, teams usually precompile into the - binary all types that they + * If no scheme is provided, `https` is assumed. - expect it to use in the context of Any. However, - for URLs which use the + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based + on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) - scheme `http`, `https`, or no scheme, one can - optionally set up a type + Note: this functionality is not currently available in the + official - server that maps type URLs to message definitions - as follows: + protobuf release, and it is not used for type URLs + beginning with + type.googleapis.com. - * If no scheme is provided, `https` is assumed. - * An HTTP GET on the URL must yield a - [google.protobuf.Type][] - value in binary format, or produce an error. - * Applications are allowed to cache lookup results - based on the - URL, or have them precompiled into a binary to avoid any - lookup. Therefore, binary compatibility needs to be preserved - on changes to types. (Use versioned type names to manage - breaking changes.) + Schemes other than `http`, `https` (or the empty scheme) + might be - Note: this functionality is not currently - available in the official + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer message + along with a - protobuf release, and it is not used for type URLs - beginning with + URL that describes the type of the serialized message. - type.googleapis.com. + Protobuf library provides support to pack/unpack Any values in + the form - Schemes other than `http`, `https` (or the empty - scheme) might be + of utility functions or additional generated methods of the + Any type. - used with implementation specific semantics. - additionalProperties: {} - description: >- - `Any` contains an arbitrary serialized protocol buffer - message along with a - URL that describes the type of the serialized message. + Example 1: Pack and unpack a message in C++. + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } - Protobuf library provides support to pack/unpack Any - values in the form + Example 2: Pack and unpack a message in Java. - of utility functions or additional generated methods - of the Any type. + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + Example 3: Pack and unpack a message in Python. - Example 1: Pack and unpack a message in C++. + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... - Foo foo = ...; - Any any; - any.PackFrom(foo); - ... - if (any.UnpackTo(&foo)) { - ... - } + Example 4: Pack and unpack a message in Go - Example 2: Pack and unpack a message in Java. + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } - Foo foo = ...; - Any any = Any.pack(foo); - ... - if (any.is(Foo.class)) { - foo = any.unpack(Foo.class); - } + The pack methods provided by protobuf library will by default + use - Example 3: Pack and unpack a message in Python. + 'type.googleapis.com/full.type.name' as the type URL and the + unpack - foo = Foo(...) - any = Any() - any.Pack(foo) - ... - if any.Is(Foo.DESCRIPTOR): - any.Unpack(foo) - ... + methods only use the fully qualified type name after the last + '/' - Example 4: Pack and unpack a message in Go + in the type URL, for example "foo.bar.com/x/y.z" will yield + type - foo := &pb.Foo{...} - any, err := anypb.New(foo) - if err != nil { - ... - } - ... - foo := &pb.Foo{} - if err := any.UnmarshalTo(foo); err != nil { - ... - } + name "y.z". - The pack methods provided by protobuf library will by - default use - 'type.googleapis.com/full.type.name' as the type URL - and the unpack - methods only use the fully qualified type name after - the last '/' + JSON - in the type URL, for example "foo.bar.com/x/y.z" will - yield type + ==== - name "y.z". + The JSON representation of an `Any` value uses the regular + representation of the deserialized, embedded message, with an + additional field `@type` which contains the type URL. Example: - JSON + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } - ==== + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } - The JSON representation of an `Any` value uses the - regular + If the embedded message type is well-known and has a custom + JSON - representation of the deserialized, embedded message, - with an + representation, that representation will be embedded adding a + field - additional field `@type` which contains the type URL. - Example: + `value` which holds the custom JSON in addition to the `@type` - package google.profile; - message Person { - string first_name = 1; - string last_name = 2; - } + field. Example (for message [google.protobuf.Duration][]): - { - "@type": "type.googleapis.com/google.profile.Person", - "firstName": , - "lastName": - } + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + proof: + type: string + format: byte + title: merkle proof of existence + proof_height: + title: height at which the proof was retrieved + type: object + properties: + revision_number: + type: string + format: uint64 + title: the revision that the client is currently on + revision_height: + type: string + format: uint64 + title: the height within the given revision + description: >- + Normally the RevisionHeight is incremented at each height + while keeping - If the embedded message type is well-known and has a - custom JSON + RevisionNumber the same. However some consensus algorithms may + choose to - representation, that representation will be embedded - adding a field + reset the height in certain conditions e.g. hard forks, + state-machine - `value` which holds the custom JSON in addition to the - `@type` + breaking changes In these cases, the RevisionNumber is + incremented so that - field. Example (for message - [google.protobuf.Duration][]): + height continues to be monitonically increasing even as the + RevisionHeight - { - "@type": "type.googleapis.com/google.protobuf.Duration", - "value": "1.212s" - } - header: - title: >- - We need to know block X to verify inclusion of - transaction for block X - type: object - properties: - '@type': - type: string - description: >- - A URL/resource name that uniquely identifies the - type of the serialized + gets reset + title: >- + QueryConsensusStateResponse is the response type for the + Query/ConsensusState - protocol buffer message. This string must contain - at least + RPC method + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type of + the serialized - one "/" character. The last segment of the URL's - path must represent + protocol buffer message. This string must contain at + least - the fully qualified name of the type (as in + one "/" character. The last segment of the URL's path + must represent - `path/google.protobuf.Duration`). The name should - be in a canonical form + the fully qualified name of the type (as in - (e.g., leading "." is not accepted). + `path/google.protobuf.Duration`). The name should be in + a canonical form + (e.g., leading "." is not accepted). - In practice, teams usually precompile into the - binary all types that they - expect it to use in the context of Any. However, - for URLs which use the + In practice, teams usually precompile into the binary + all types that they - scheme `http`, `https`, or no scheme, one can - optionally set up a type + expect it to use in the context of Any. However, for + URLs which use the - server that maps type URLs to message definitions - as follows: + scheme `http`, `https`, or no scheme, one can optionally + set up a type + server that maps type URLs to message definitions as + follows: - * If no scheme is provided, `https` is assumed. - * An HTTP GET on the URL must yield a - [google.protobuf.Type][] - value in binary format, or produce an error. - * Applications are allowed to cache lookup results - based on the - URL, or have them precompiled into a binary to avoid any - lookup. Therefore, binary compatibility needs to be preserved - on changes to types. (Use versioned type names to manage - breaking changes.) + * If no scheme is provided, `https` is assumed. - Note: this functionality is not currently - available in the official + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based + on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) - protobuf release, and it is not used for type URLs - beginning with + Note: this functionality is not currently available in + the official - type.googleapis.com. + protobuf release, and it is not used for type URLs + beginning with + type.googleapis.com. - Schemes other than `http`, `https` (or the empty - scheme) might be - used with implementation specific semantics. - additionalProperties: {} - description: >- - `Any` contains an arbitrary serialized protocol buffer - message along with a + Schemes other than `http`, `https` (or the empty scheme) + might be - URL that describes the type of the serialized message. + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer + message along with a + URL that describes the type of the serialized message. - Protobuf library provides support to pack/unpack Any - values in the form - of utility functions or additional generated methods - of the Any type. + Protobuf library provides support to pack/unpack Any values + in the form + of utility functions or additional generated methods of the + Any type. - Example 1: Pack and unpack a message in C++. - Foo foo = ...; - Any any; - any.PackFrom(foo); - ... - if (any.UnpackTo(&foo)) { - ... - } + Example 1: Pack and unpack a message in C++. - Example 2: Pack and unpack a message in Java. + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } - Foo foo = ...; - Any any = Any.pack(foo); - ... - if (any.is(Foo.class)) { - foo = any.unpack(Foo.class); - } + Example 2: Pack and unpack a message in Java. - Example 3: Pack and unpack a message in Python. + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } - foo = Foo(...) - any = Any() - any.Pack(foo) - ... - if any.Is(Foo.DESCRIPTOR): - any.Unpack(foo) - ... + Example 3: Pack and unpack a message in Python. - Example 4: Pack and unpack a message in Go + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... - foo := &pb.Foo{...} - any, err := anypb.New(foo) - if err != nil { - ... - } - ... - foo := &pb.Foo{} - if err := any.UnmarshalTo(foo); err != nil { - ... - } + Example 4: Pack and unpack a message in Go - The pack methods provided by protobuf library will by - default use + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } - 'type.googleapis.com/full.type.name' as the type URL - and the unpack + The pack methods provided by protobuf library will by + default use - methods only use the fully qualified type name after - the last '/' + 'type.googleapis.com/full.type.name' as the type URL and the + unpack - in the type URL, for example "foo.bar.com/x/y.z" will - yield type + methods only use the fully qualified type name after the + last '/' - name "y.z". + in the type URL, for example "foo.bar.com/x/y.z" will yield + type + name "y.z". - JSON - ==== + JSON - The JSON representation of an `Any` value uses the - regular + ==== - representation of the deserialized, embedded message, - with an + The JSON representation of an `Any` value uses the regular - additional field `@type` which contains the type URL. - Example: + representation of the deserialized, embedded message, with + an - package google.profile; - message Person { - string first_name = 1; - string last_name = 2; - } + additional field `@type` which contains the type URL. + Example: - { - "@type": "type.googleapis.com/google.profile.Person", - "firstName": , - "lastName": - } + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } - If the embedded message type is well-known and has a - custom JSON + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } - representation, that representation will be embedded - adding a field + If the embedded message type is well-known and has a custom + JSON - `value` which holds the custom JSON in addition to the - `@type` + representation, that representation will be embedded adding + a field - field. Example (for message - [google.protobuf.Duration][]): + `value` which holds the custom JSON in addition to the + `@type` - { - "@type": "type.googleapis.com/google.protobuf.Duration", - "value": "1.212s" - } - tx: - type: object - properties: - response: - type: object - properties: - code: - type: integer - format: int64 - data: - type: string - format: byte - log: - type: string - title: nondeterministic - info: - type: string - title: nondeterministic - gas_wanted: - type: string - format: int64 - gas_used: - type: string - format: int64 - events: - type: array - items: - type: object - properties: - type: - type: string - attributes: - type: array - items: - type: object - properties: - key: - type: string - format: byte - value: - type: string - format: byte - index: - type: boolean - title: nondeterministic - description: >- - EventAttribute is a single key-value - pair, associated with an event. - description: >- - Event allows application developers to - attach additional information to - - ResponseBeginBlock, ResponseEndBlock, - ResponseCheckTx and ResponseDeliverTx. + field. Example (for message [google.protobuf.Duration][]): - Later, transactions may be queried using - these events. - title: nondeterministic - codespace: - type: string - delivery_proof: - title: >- - is the Merkle Proof which proves existence of - response in block with height + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + parameters: + - name: client_id + description: client identifier + in: path + required: true + type: string + - name: revision_number + description: consensus state revision number + in: path + required: true + type: string + format: uint64 + - name: revision_height + description: consensus state revision height + in: path + required: true + type: string + format: uint64 + - name: latest_height + description: >- + latest_height overrrides the height field and queries the latest + stored - next_block_header.Height - type: object - properties: - total: - type: string - format: int64 - index: - type: string - format: int64 - leaf_hash: - type: string - format: byte - aunts: - type: array - items: - type: string - format: byte - inclusion_proof: - title: >- - is the Merkle Proof which proves existence of data - in block with height + ConsensusState + in: query + required: false + type: boolean + tags: + - Query + /ibc/core/client/v1/params: + get: + summary: ClientParams queries all parameters of the ibc client submodule. + operationId: IbcCoreClientV1ClientParams + responses: + '200': + description: A successful response. + schema: + type: object + properties: + params: + description: params defines the parameters of the module. + type: object + properties: + allowed_clients: + type: array + items: + type: string + description: >- + allowed_clients defines the list of allowed client state + types. + description: >- + QueryClientParamsResponse is the response type for the + Query/ClientParams RPC - header.Height - type: object - properties: - total: - type: string - format: int64 - index: - type: string - format: int64 - leaf_hash: - type: string - format: byte - aunts: - type: array - items: - type: string - format: byte - data: - type: string - format: byte - title: is body of the transaction - height: - type: string - format: uint64 - revision: - type: string - format: uint64 - allow_kv_callbacks: - type: boolean + method. default: description: An unexpected error response. schema: @@ -29399,146 +29261,191 @@ paths: "@type": "type.googleapis.com/google.protobuf.Duration", "value": "1.212s" } - parameters: - - name: query_id - in: query - required: false - type: string - format: uint64 tags: - Query - /neutron/interchainqueries/registered_queries: + /ibc/core/client/v1/upgraded_client_states: get: - operationId: NeutronInterchainqueriesRegisteredQueries + summary: UpgradedClientState queries an Upgraded IBC light client. + operationId: IbcCoreClientV1UpgradedClientState responses: '200': description: A successful response. schema: type: object properties: - registered_queries: - type: array - items: - type: object - properties: - id: - type: string - format: uint64 - description: The unique id of the registered query. - owner: - type: string - description: The address that registered the query. - query_type: - type: string - title: 'The query type identifier: `kv` or `tx` now' - keys: - type: array - items: - type: object - properties: - path: - type: string - title: >- - Path (storage prefix) to the storage where you - want to read value by key + upgraded_client_state: + title: client state associated with the request identifier + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type of + the serialized - (usually name of cosmos-sdk module: 'staking', - 'bank', etc.) - key: - type: string - format: byte - title: Key you want to read from the storage - title: >- - The KV-storage keys for which we want to get values from - remote chain - transactions_filter: - type: string - title: The filter for transaction search ICQ - connection_id: - type: string - title: >- - The IBC connection ID for getting ConsensusState to - verify proofs - update_period: - type: string - format: uint64 - description: >- - Parameter that defines how often the query must be - updated. - last_submitted_result_local_height: - type: string - format: uint64 - description: >- - The local chain last block height when the query result - was updated. - last_submitted_result_remote_height: - description: >- - The remote chain last block height when the query result - was updated. - type: object - properties: - revision_number: - type: string - format: uint64 - title: the revision that the client is currently on - revision_height: - type: string - format: uint64 - title: the height within the given revision - title: >- - Height is a monotonically increasing data type + protocol buffer message. This string must contain at least - that can be compared against another Height for the - purposes of updating and + one "/" character. The last segment of the URL's path must + represent - freezing clients - deposit: - type: array - items: - type: object - properties: - denom: - type: string - amount: - type: string - description: >- - Coin defines a token with a denomination and an - amount. + the fully qualified name of the type (as in + `path/google.protobuf.Duration`). The name should be in a + canonical form - NOTE: The amount field is an Int which implements the - custom method + (e.g., leading "." is not accepted). - signatures required by gogoproto. - description: Amount of coins deposited for the query. - submit_timeout: - type: string - format: uint64 - description: >- - Timeout before query becomes available for everybody to - remove. - registered_at_height: - type: string - format: uint64 - description: The local chain height when the query was registered. - pagination: - description: pagination defines the pagination in the response. - type: object - properties: - next_key: - type: string - format: byte - title: |- - next_key is the key to be passed to PageRequest.key to - query the next page most efficiently - total: - type: string - format: uint64 - title: >- - total is total number of results available if - PageRequest.count_total - was set, its value is undefined otherwise + In practice, teams usually precompile into the binary all + types that they + + expect it to use in the context of Any. However, for URLs + which use the + + scheme `http`, `https`, or no scheme, one can optionally + set up a type + + server that maps type URLs to message definitions as + follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based + on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in the + official + + protobuf release, and it is not used for type URLs + beginning with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty scheme) + might be + + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer message + along with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any values in + the form + + of utility functions or additional generated methods of the + Any type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by default + use + + 'type.googleapis.com/full.type.name' as the type URL and the + unpack + + methods only use the fully qualified type name after the last + '/' + + in the type URL, for example "foo.bar.com/x/y.z" will yield + type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the regular + + representation of the deserialized, embedded message, with an + + additional field `@type` which contains the type URL. Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a custom + JSON + + representation, that representation will be embedded adding a + field + + `value` which holds the custom JSON in addition to the `@type` + + field. Example (for message [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + description: |- + QueryUpgradedClientStateResponse is the response type for the + Query/UpgradedClientState RPC method. default: description: An unexpected error response. schema: @@ -29724,177 +29631,191 @@ paths: "@type": "type.googleapis.com/google.protobuf.Duration", "value": "1.212s" } - parameters: - - name: owners - in: query - required: false - type: array - items: - type: string - collectionFormat: multi - - name: connection_id - in: query - required: false - type: string - - name: pagination.key - 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. - in: query - required: false - type: string - format: byte - - name: pagination.offset - 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. - in: query - required: false - type: string - format: uint64 - - name: pagination.limit - 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. - in: query - required: false - type: string - format: uint64 - - name: pagination.count_total - 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 - required: false - type: boolean tags: - Query - /neutron/interchainqueries/registered_query: + /ibc/core/client/v1/upgraded_consensus_states: get: - operationId: NeutronInterchainqueriesRegisteredQuery + summary: UpgradedConsensusState queries an Upgraded IBC consensus state. + operationId: IbcCoreClientV1UpgradedConsensusState responses: '200': description: A successful response. schema: type: object properties: - registered_query: + upgraded_consensus_state: + title: Consensus state associated with the request identifier type: object properties: - id: - type: string - format: uint64 - description: The unique id of the registered query. - owner: - type: string - description: The address that registered the query. - query_type: - type: string - title: 'The query type identifier: `kv` or `tx` now' - keys: - type: array - items: - type: object - properties: - path: - type: string - title: >- - Path (storage prefix) to the storage where you want - to read value by key - - (usually name of cosmos-sdk module: 'staking', - 'bank', etc.) - key: - type: string - format: byte - title: Key you want to read from the storage - title: >- - The KV-storage keys for which we want to get values from - remote chain - transactions_filter: - type: string - title: The filter for transaction search ICQ - connection_id: - type: string - title: >- - The IBC connection ID for getting ConsensusState to verify - proofs - update_period: - type: string - format: uint64 - description: >- - Parameter that defines how often the query must be - updated. - last_submitted_result_local_height: + '@type': type: string - format: uint64 - description: >- - The local chain last block height when the query result - was updated. - last_submitted_result_remote_height: description: >- - The remote chain last block height when the query result - was updated. - type: object - properties: - revision_number: - type: string - format: uint64 - title: the revision that the client is currently on - revision_height: - type: string - format: uint64 - title: the height within the given revision - title: >- - Height is a monotonically increasing data type + A URL/resource name that uniquely identifies the type of + the serialized - that can be compared against another Height for the - purposes of updating and + protocol buffer message. This string must contain at least - freezing clients - deposit: - type: array - items: - type: object - properties: - denom: - type: string - amount: - type: string - description: >- - Coin defines a token with a denomination and an amount. + one "/" character. The last segment of the URL's path must + represent + the fully qualified name of the type (as in - NOTE: The amount field is an Int which implements the - custom method + `path/google.protobuf.Duration`). The name should be in a + canonical form - signatures required by gogoproto. - description: Amount of coins deposited for the query. - submit_timeout: - type: string - format: uint64 - description: >- - Timeout before query becomes available for everybody to - remove. - registered_at_height: - type: string - format: uint64 - description: The local chain height when the query was registered. + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the binary all + types that they + + expect it to use in the context of Any. However, for URLs + which use the + + scheme `http`, `https`, or no scheme, one can optionally + set up a type + + server that maps type URLs to message definitions as + follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based + on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in the + official + + protobuf release, and it is not used for type URLs + beginning with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty scheme) + might be + + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer message + along with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any values in + the form + + of utility functions or additional generated methods of the + Any type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by default + use + + 'type.googleapis.com/full.type.name' as the type URL and the + unpack + + methods only use the fully qualified type name after the last + '/' + + in the type URL, for example "foo.bar.com/x/y.z" will yield + type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the regular + + representation of the deserialized, embedded message, with an + + additional field `@type` which contains the type URL. Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a custom + JSON + + representation, that representation will be embedded adding a + field + + `value` which holds the custom JSON in addition to the `@type` + + field. Example (for message [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + description: |- + QueryUpgradedConsensusStateResponse is the response type for the + Query/UpgradedConsensusState RPC method. default: description: An unexpected error response. schema: @@ -30080,26 +30001,61 @@ paths: "@type": "type.googleapis.com/google.protobuf.Duration", "value": "1.212s" } - parameters: - - name: query_id - in: query - required: false - type: string - format: uint64 tags: - Query - /neutron/interchainqueries/remote_height: + /ibc/core/connection/v1/client_connections/{client_id}: get: - operationId: NeutronInterchainqueriesLastRemoteHeight + summary: |- + ClientConnections queries the connection paths associated with a client + state. + operationId: IbcCoreConnectionV1ClientConnections responses: '200': description: A successful response. schema: type: object properties: - height: + connection_paths: + type: array + items: + type: string + description: slice of all the connection paths associated with a client. + proof: type: string - format: uint64 + format: byte + title: merkle proof of existence + proof_height: + title: height at which the proof was generated + type: object + properties: + revision_number: + type: string + format: uint64 + title: the revision that the client is currently on + revision_height: + type: string + format: uint64 + title: the height within the given revision + description: >- + Normally the RevisionHeight is incremented at each height + while keeping + + RevisionNumber the same. However some consensus algorithms may + choose to + + reset the height in certain conditions e.g. hard forks, + state-machine + + breaking changes In these cases, the RevisionNumber is + incremented so that + + height continues to be monitonically increasing even as the + RevisionHeight + + gets reset + title: |- + QueryClientConnectionsResponse is the response type for the + Query/ClientConnections RPC method default: description: An unexpected error response. schema: @@ -30286,28 +30242,171 @@ paths: "value": "1.212s" } parameters: - - name: connection_id - in: query - required: false + - name: client_id + description: client identifier associated with a connection + in: path + required: true type: string tags: - Query - /ibc/apps/transfer/v1/denom_hashes/{trace}: + /ibc/core/connection/v1/connections: get: - summary: DenomHash queries a denomination hash information. - operationId: NeutronTransferDenomHash + summary: Connections queries all the IBC connections of a chain. + operationId: IbcCoreConnectionV1Connections responses: '200': description: A successful response. schema: type: object properties: - hash: - type: string - description: hash (in hex format) of the denomination trace information. + connections: + type: array + items: + type: object + properties: + id: + type: string + description: connection identifier. + client_id: + type: string + description: client associated with this connection. + versions: + type: array + items: + type: object + properties: + identifier: + type: string + title: unique version identifier + features: + type: array + items: + type: string + title: >- + list of features compatible with the specified + identifier + description: >- + Version defines the versioning scheme used to + negotiate the IBC verison in + + the connection handshake. + title: >- + IBC version which can be utilised to determine encodings + or protocols for + + channels or packets utilising this connection + state: + description: current state of the connection end. + type: string + enum: + - STATE_UNINITIALIZED_UNSPECIFIED + - STATE_INIT + - STATE_TRYOPEN + - STATE_OPEN + default: STATE_UNINITIALIZED_UNSPECIFIED + counterparty: + description: counterparty chain associated with this connection. + type: object + properties: + client_id: + type: string + description: >- + identifies the client on the counterparty chain + associated with a given + + connection. + connection_id: + type: string + description: >- + identifies the connection end on the counterparty + chain associated with a + + given connection. + prefix: + description: commitment merkle prefix of the counterparty chain. + type: object + properties: + key_prefix: + type: string + format: byte + title: >- + MerklePrefix is merkle path prefixed to the key. + + The constructed key from the Path and the key will + be append(Path.KeyPath, + + append(Path.KeyPrefix, key...)) + delay_period: + type: string + format: uint64 + description: delay period associated with this connection. + description: >- + IdentifiedConnection defines a connection with additional + connection + + identifier field. + description: list of stored connections of the chain. + pagination: + title: pagination response + type: object + properties: + next_key: + type: string + format: byte + 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. + total: + type: string + format: uint64 + title: >- + total is total number of results available if + PageRequest.count_total + + was set, its value is undefined otherwise + 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; + } + height: + title: query block height + type: object + properties: + revision_number: + type: string + format: uint64 + title: the revision that the client is currently on + revision_height: + type: string + format: uint64 + title: the height within the given revision + description: >- + Normally the RevisionHeight is incremented at each height + while keeping + + RevisionNumber the same. However some consensus algorithms may + choose to + + reset the height in certain conditions e.g. hard forks, + state-machine + + breaking changes In these cases, the RevisionNumber is + incremented so that + + height continues to be monitonically increasing even as the + RevisionHeight + + gets reset description: >- - QueryDenomHashResponse is the response type for the - Query/DenomHash RPC + QueryConnectionsResponse is the response type for the + Query/Connections RPC method. default: @@ -30496,67 +30595,208 @@ paths: "value": "1.212s" } parameters: - - name: trace - description: The denomination trace ([port_id]/[channel_id])+/[denom] - in: path - required: true + - name: pagination.key + 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. + in: query + required: false type: string - tags: - - Query - /ibc/apps/transfer/v1/denom_traces: - get: - summary: DenomTraces queries all denomination traces. - operationId: NeutronTransferDenomTraces - responses: - '200': - description: A successful response. - schema: - type: object - properties: - denom_traces: - type: array - items: - type: object - properties: - path: - type: string - description: >- - path defines the chain of port/channel identifiers used - for tracing the + format: byte + - name: pagination.offset + description: >- + offset is a numeric offset that can be used when key is unavailable. - source of the fungible token. - base_denom: - type: string - description: base denomination of the relayed fungible token. - description: >- - DenomTrace contains the base denomination for ICS20 fungible - tokens and the + It is less efficient than using key. Only one of offset or key + should - source tracing information path. - description: denom_traces returns all denominations trace information. - pagination: - description: pagination defines the pagination in the response. + be set. + in: query + required: false + type: string + format: uint64 + - name: pagination.limit + 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. + in: query + required: false + type: string + format: uint64 + - name: pagination.count_total + 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 + required: false + type: boolean + - name: pagination.reverse + description: >- + reverse is set to true if results are to be returned in the + descending order. + + + Since: cosmos-sdk 0.43 + in: query + required: false + type: boolean + tags: + - Query + /ibc/core/connection/v1/connections/{connection_id}: + get: + summary: Connection queries an IBC connection end. + operationId: IbcCoreConnectionV1Connection + responses: + '200': + description: A successful response. + schema: + type: object + properties: + connection: + title: connection associated with the request identifier type: object properties: - next_key: + client_id: type: string - format: byte - title: |- - next_key is the key to be passed to PageRequest.key to - query the next page most efficiently - total: + description: client associated with this connection. + versions: + type: array + items: + type: object + properties: + identifier: + type: string + title: unique version identifier + features: + type: array + items: + type: string + title: >- + list of features compatible with the specified + identifier + description: >- + Version defines the versioning scheme used to negotiate + the IBC verison in + + the connection handshake. + description: >- + IBC version which can be utilised to determine encodings + or protocols for + + channels or packets utilising this connection. + state: + description: current state of the connection end. + type: string + enum: + - STATE_UNINITIALIZED_UNSPECIFIED + - STATE_INIT + - STATE_TRYOPEN + - STATE_OPEN + default: STATE_UNINITIALIZED_UNSPECIFIED + counterparty: + description: counterparty chain associated with this connection. + type: object + properties: + client_id: + type: string + description: >- + identifies the client on the counterparty chain + associated with a given + + connection. + connection_id: + type: string + description: >- + identifies the connection end on the counterparty + chain associated with a + + given connection. + prefix: + description: commitment merkle prefix of the counterparty chain. + type: object + properties: + key_prefix: + type: string + format: byte + title: >- + MerklePrefix is merkle path prefixed to the key. + + The constructed key from the Path and the key will be + append(Path.KeyPath, + + append(Path.KeyPrefix, key...)) + delay_period: type: string format: uint64 - title: >- - total is total number of results available if - PageRequest.count_total + description: >- + delay period that must pass before a consensus state can + be used for - was set, its value is undefined otherwise + packet-verification NOTE: delay period logic is only + implemented by some + + clients. + description: >- + ConnectionEnd defines a stateful object on a chain connected + to another + + separate one. + + NOTE: there must only be 2 defined ConnectionEnds to establish + + a connection between two chains. + proof: + type: string + format: byte + title: merkle proof of existence + proof_height: + title: height at which the proof was retrieved + type: object + properties: + revision_number: + type: string + format: uint64 + title: the revision that the client is currently on + revision_height: + type: string + format: uint64 + title: the height within the given revision + description: >- + Normally the RevisionHeight is incremented at each height + while keeping + + RevisionNumber the same. However some consensus algorithms may + choose to + + reset the height in certain conditions e.g. hard forks, + state-machine + + breaking changes In these cases, the RevisionNumber is + incremented so that + + height continues to be monitonically increasing even as the + RevisionHeight + + gets reset description: >- - QueryConnectionsResponse is the response type for the - Query/DenomTraces RPC + QueryConnectionResponse is the response type for the + Query/Connection RPC - method. + method. Besides the connection end, it includes a proof and the + height from + + which the proof was retrieved. default: description: An unexpected error response. schema: @@ -30743,95 +30983,247 @@ paths: "value": "1.212s" } parameters: - - name: pagination.key - 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. - in: query - required: false - type: string - format: byte - - name: pagination.offset - 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. - in: query - required: false - type: string - format: uint64 - - name: pagination.limit - 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. - in: query - required: false + - name: connection_id + description: connection unique identifier + in: path + required: true type: string - format: uint64 - - name: pagination.count_total - 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 - required: false - type: boolean - - name: pagination.reverse - description: >- - reverse is set to true if results are to be returned in the - descending order. - - - Since: cosmos-sdk 0.43 - in: query - required: false - type: boolean tags: - Query - /ibc/apps/transfer/v1/denom_traces/{hash}: + /ibc/core/connection/v1/connections/{connection_id}/client_state: get: - summary: DenomTrace queries a denomination trace information. - operationId: NeutronTransferDenomTrace + summary: |- + ConnectionClientState queries the client state associated with the + connection. + operationId: IbcCoreConnectionV1ConnectionClientState responses: '200': description: A successful response. schema: type: object properties: - denom_trace: - description: >- - denom_trace returns the requested denomination trace - information. + identified_client_state: + title: client state associated with the channel type: object properties: - path: + client_id: type: string + title: client identifier + client_state: + title: client state + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type + of the serialized + + protocol buffer message. This string must contain at + least + + one "/" character. The last segment of the URL's path + must represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be + in a canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the binary + all types that they + + expect it to use in the context of Any. However, for + URLs which use the + + scheme `http`, `https`, or no scheme, one can + optionally set up a type + + server that maps type URLs to message definitions as + follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results + based on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in + the official + + protobuf release, and it is not used for type URLs + beginning with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty + scheme) might be + + used with implementation specific semantics. + additionalProperties: {} description: >- - path defines the chain of port/channel identifiers used - for tracing the + `Any` contains an arbitrary serialized protocol buffer + message along with a - source of the fungible token. - base_denom: + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any + values in the form + + of utility functions or additional generated methods of + the Any type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by + default use + + 'type.googleapis.com/full.type.name' as the type URL and + the unpack + + methods only use the fully qualified type name after the + last '/' + + in the type URL, for example "foo.bar.com/x/y.z" will + yield type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the regular + + representation of the deserialized, embedded message, with + an + + additional field `@type` which contains the type URL. + Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a + custom JSON + + representation, that representation will be embedded + adding a field + + `value` which holds the custom JSON in addition to the + `@type` + + field. Example (for message [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + description: >- + IdentifiedClientState defines a client state with an + additional client + + identifier field. + proof: + type: string + format: byte + title: merkle proof of existence + proof_height: + title: height at which the proof was retrieved + type: object + properties: + revision_number: type: string - description: base denomination of the relayed fungible token. - description: >- - QueryDenomTraceResponse is the response type for the - Query/DenomTrace RPC + format: uint64 + title: the revision that the client is currently on + revision_height: + type: string + format: uint64 + title: the height within the given revision + description: >- + Normally the RevisionHeight is incremented at each height + while keeping - method. + RevisionNumber the same. However some consensus algorithms may + choose to + + reset the height in certain conditions e.g. hard forks, + state-machine + + breaking changes In these cases, the RevisionNumber is + incremented so that + + height continues to be monitonically increasing even as the + RevisionHeight + + gets reset + title: |- + QueryConnectionClientStateResponse is the response type for the + Query/ConnectionClientState RPC method default: description: An unexpected error response. schema: @@ -31018,46 +31410,234 @@ paths: "value": "1.212s" } parameters: - - name: hash - description: >- - hash (in hex format) or denom (full denom with ibc prefix) of the - denomination trace information. + - name: connection_id + description: connection identifier in: path required: true type: string tags: - Query - /ibc/apps/transfer/v1/params: + /ibc/core/connection/v1/connections/{connection_id}/consensus_state/revision/{revision_number}/height/{revision_height}: get: - summary: Params queries all parameters of the ibc-transfer module. - operationId: NeutronTransferParams + summary: |- + ConnectionConsensusState queries the consensus state associated with the + connection. + operationId: IbcCoreConnectionV1ConnectionConsensusState responses: '200': description: A successful response. schema: type: object properties: - params: - description: params defines the parameters of the module. + consensus_state: + title: consensus state associated with the channel type: object properties: - send_enabled: - type: boolean + '@type': + type: string description: >- - send_enabled enables or disables all cross-chain token - transfers from this + A URL/resource name that uniquely identifies the type of + the serialized - chain. - receive_enabled: - type: boolean - description: >- - receive_enabled enables or disables all cross-chain token - transfers to this + protocol buffer message. This string must contain at least - chain. - description: >- - QueryParamsResponse is the response type for the Query/Params RPC - method. + one "/" character. The last segment of the URL's path must + represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be in a + canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the binary all + types that they + + expect it to use in the context of Any. However, for URLs + which use the + + scheme `http`, `https`, or no scheme, one can optionally + set up a type + + server that maps type URLs to message definitions as + follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based + on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in the + official + + protobuf release, and it is not used for type URLs + beginning with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty scheme) + might be + + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer message + along with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any values in + the form + + of utility functions or additional generated methods of the + Any type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by default + use + + 'type.googleapis.com/full.type.name' as the type URL and the + unpack + + methods only use the fully qualified type name after the last + '/' + + in the type URL, for example "foo.bar.com/x/y.z" will yield + type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the regular + + representation of the deserialized, embedded message, with an + + additional field `@type` which contains the type URL. Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a custom + JSON + + representation, that representation will be embedded adding a + field + + `value` which holds the custom JSON in addition to the `@type` + + field. Example (for message [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + client_id: + type: string + title: client ID associated with the consensus state + proof: + type: string + format: byte + title: merkle proof of existence + proof_height: + title: height at which the proof was retrieved + type: object + properties: + revision_number: + type: string + format: uint64 + title: the revision that the client is currently on + revision_height: + type: string + format: uint64 + title: the height within the given revision + description: >- + Normally the RevisionHeight is incremented at each height + while keeping + + RevisionNumber the same. However some consensus algorithms may + choose to + + reset the height in certain conditions e.g. hard forks, + state-machine + + breaking changes In these cases, the RevisionNumber is + incremented so that + + height continues to be monitonically increasing even as the + RevisionHeight + + gets reset + title: |- + QueryConnectionConsensusStateResponse is the response type for the + Query/ConnectionConsensusState RPC method default: description: An unexpected error response. schema: @@ -31243,102 +31823,28 @@ paths: "@type": "type.googleapis.com/google.protobuf.Duration", "value": "1.212s" } - tags: - - Query - /osmosis/tokenfactory/v1beta1/denoms/factory/{creator}/{subdenom}/authority_metadata: - get: - operationId: OsmosisTokenfactoryV1Beta1DenomAuthorityMetadata - responses: - '200': - description: A successful response. - schema: - type: object - properties: - authority_metadata: - type: object - properties: - Admin: - type: string - title: Can be empty for no admin, or a valid osmosis address - description: >- - DenomAuthorityMetadata specifies metadata for addresses that - have specific - - capabilities over a token factory denom. Right now there is - only one Admin - - permission, but is planned to be extended to the future. - default: - description: An unexpected error response. - schema: - type: object - properties: - code: - type: integer - format: int32 - message: - type: string - details: - type: array - items: - type: object - properties: - '@type': - type: string - additionalProperties: {} parameters: - - name: creator + - name: connection_id + description: connection identifier in: path required: true type: string - - name: subdenom + - name: revision_number in: path required: true type: string - tags: - - Query - /osmosis/tokenfactory/v1beta1/denoms_from_creator/{creator}: - get: - operationId: OsmosisTokenfactoryV1Beta1DenomsFromCreator - responses: - '200': - description: A successful response. - schema: - type: object - properties: - denoms: - type: array - items: - type: string - default: - description: An unexpected error response. - schema: - type: object - properties: - code: - type: integer - format: int32 - message: - type: string - details: - type: array - items: - type: object - properties: - '@type': - type: string - additionalProperties: {} - parameters: - - name: creator + format: uint64 + - name: revision_height in: path required: true type: string + format: uint64 tags: - Query - /osmosis/tokenfactory/v1beta1/params: + /ibc/core/connection/v1/params: get: - summary: Params returns the total set of minting parameters. - operationId: OsmosisTokenfactoryV1Beta1Params + summary: ConnectionParams queries all parameters of the ibc connection submodule. + operationId: IbcCoreConnectionV1ConnectionParams responses: '200': description: A successful response. @@ -31349,68 +31855,21 @@ paths: description: params defines the parameters of the module. type: object properties: - denom_creation_fee: - type: array - items: - type: object - properties: - denom: - type: string - amount: - type: string - description: >- - Coin defines a token with a denomination and an amount. - + max_expected_time_per_block: + type: string + format: uint64 + description: >- + maximum expected time per block (in nanoseconds), used to + enforce block delay. This parameter should reflect the - NOTE: The amount field is an Int which implements the - custom method + largest amount of time that the chain might reasonably + take to produce the next block under normal operating - signatures required by gogoproto. - fee_collector_address: - type: string - title: Params holds parameters for the tokenfactory module - description: >- - QueryParamsResponse is the response type for the Query/Params RPC - method. - default: - description: An unexpected error response. - schema: - type: object - properties: - code: - type: integer - format: int32 - message: - type: string - details: - type: array - items: - type: object - properties: - '@type': - type: string - additionalProperties: {} - tags: - - Query - /ibc/apps/router/v1/params: - get: - summary: Params queries all parameters of the router module. - operationId: RouterV1Params - responses: - '200': - description: A successful response. - schema: - type: object - properties: - params: - description: params defines the parameters of the module. - type: object - properties: - fee_percentage: - type: string + conditions. A safe choice is 3-5x the expected time per + block. description: >- - QueryParamsResponse is the response type for the Query/Params RPC - method. + QueryConnectionParamsResponse is the response type for the + Query/ConnectionParams RPC method. default: description: An unexpected error response. schema: @@ -31428,2922 +31887,12946 @@ paths: properties: '@type': type: string - additionalProperties: {} - tags: - - Query -definitions: - cosmos.adminmodule.adminmodule.MsgAddAdminResponse: - type: object - cosmos.adminmodule.adminmodule.MsgDeleteAdminResponse: - type: object - cosmos.adminmodule.adminmodule.MsgSubmitProposalResponse: - type: object - properties: - proposal_id: - type: string - format: uint64 - description: MsgSubmitProposalResponse defines the Msg/SubmitProposal response type. - cosmos.adminmodule.adminmodule.QueryAdminsResponse: - type: object - properties: - admins: - type: array - items: - type: string - cosmos.adminmodule.adminmodule.QueryArchivedProposalsResponse: - type: object - properties: - proposals: - type: array - items: - type: object - properties: - proposal_id: - type: string - format: uint64 - content: - type: object - properties: - '@type': - type: string - description: >- - A URL/resource name that uniquely identifies the type of the - serialized + description: >- + A URL/resource name that uniquely identifies the type of + the serialized - protocol buffer message. This string must contain at least + protocol buffer message. This string must contain at + least - one "/" character. The last segment of the URL's path must - represent + one "/" character. The last segment of the URL's path + must represent - the fully qualified name of the type (as in + the fully qualified name of the type (as in - `path/google.protobuf.Duration`). The name should be in a - canonical form + `path/google.protobuf.Duration`). The name should be in + a canonical form - (e.g., leading "." is not accepted). + (e.g., leading "." is not accepted). - In practice, teams usually precompile into the binary all - types that they + In practice, teams usually precompile into the binary + all types that they - expect it to use in the context of Any. However, for URLs - which use the + expect it to use in the context of Any. However, for + URLs which use the - scheme `http`, `https`, or no scheme, one can optionally set - up a type + scheme `http`, `https`, or no scheme, one can optionally + set up a type - server that maps type URLs to message definitions as - follows: + server that maps type URLs to message definitions as + follows: - * If no scheme is provided, `https` is assumed. + * If no scheme is provided, `https` is assumed. - * An HTTP GET on the URL must yield a - [google.protobuf.Type][] - value in binary format, or produce an error. - * Applications are allowed to cache lookup results based on - the - URL, or have them precompiled into a binary to avoid any - lookup. Therefore, binary compatibility needs to be preserved - on changes to types. (Use versioned type names to manage - breaking changes.) + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based + on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) - Note: this functionality is not currently available in the - official + Note: this functionality is not currently available in + the official - protobuf release, and it is not used for type URLs beginning - with + protobuf release, and it is not used for type URLs + beginning with - type.googleapis.com. + type.googleapis.com. - Schemes other than `http`, `https` (or the empty scheme) - might be + Schemes other than `http`, `https` (or the empty scheme) + might be - used with implementation specific semantics. - additionalProperties: {} - description: >- - `Any` contains an arbitrary serialized protocol buffer message - along with a + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer + message along with a - URL that describes the type of the serialized message. + URL that describes the type of the serialized message. - Protobuf library provides support to pack/unpack Any values in - the form + Protobuf library provides support to pack/unpack Any values + in the form - of utility functions or additional generated methods of the Any - type. + of utility functions or additional generated methods of the + Any type. - Example 1: Pack and unpack a message in C++. + Example 1: Pack and unpack a message in C++. - Foo foo = ...; - Any any; - any.PackFrom(foo); - ... - if (any.UnpackTo(&foo)) { - ... - } + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } - Example 2: Pack and unpack a message in Java. + Example 2: Pack and unpack a message in Java. - Foo foo = ...; - Any any = Any.pack(foo); - ... - if (any.is(Foo.class)) { - foo = any.unpack(Foo.class); - } + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. - foo = Foo(...) - any = Any() - any.Pack(foo) - ... - if any.Is(Foo.DESCRIPTOR): - any.Unpack(foo) - ... + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go - foo := &pb.Foo{...} - any, err := anypb.New(foo) - if err != nil { - ... - } - ... - foo := &pb.Foo{} - if err := any.UnmarshalTo(foo); err != nil { - ... - } + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } - The pack methods provided by protobuf library will by default - use + The pack methods provided by protobuf library will by + default use - 'type.googleapis.com/full.type.name' as the type URL and the - unpack + 'type.googleapis.com/full.type.name' as the type URL and the + unpack - methods only use the fully qualified type name after the last - '/' + methods only use the fully qualified type name after the + last '/' - in the type URL, for example "foo.bar.com/x/y.z" will yield type + in the type URL, for example "foo.bar.com/x/y.z" will yield + type - name "y.z". + name "y.z". - JSON + JSON - ==== + ==== - The JSON representation of an `Any` value uses the regular + The JSON representation of an `Any` value uses the regular - representation of the deserialized, embedded message, with an + representation of the deserialized, embedded message, with + an - additional field `@type` which contains the type URL. Example: + additional field `@type` which contains the type URL. + Example: - package google.profile; - message Person { - string first_name = 1; - string last_name = 2; - } + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } - { - "@type": "type.googleapis.com/google.profile.Person", - "firstName": , - "lastName": - } + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } - If the embedded message type is well-known and has a custom JSON + If the embedded message type is well-known and has a custom + JSON - representation, that representation will be embedded adding a - field + representation, that representation will be embedded adding + a field - `value` which holds the custom JSON in addition to the `@type` + `value` which holds the custom JSON in addition to the + `@type` - field. Example (for message [google.protobuf.Duration][]): + field. Example (for message [google.protobuf.Duration][]): - { - "@type": "type.googleapis.com/google.protobuf.Duration", - "value": "1.212s" - } - status: - type: string - enum: - - PROPOSAL_STATUS_UNSPECIFIED - - PROPOSAL_STATUS_DEPOSIT_PERIOD - - PROPOSAL_STATUS_VOTING_PERIOD - - PROPOSAL_STATUS_PASSED - - PROPOSAL_STATUS_REJECTED - - PROPOSAL_STATUS_FAILED - default: PROPOSAL_STATUS_UNSPECIFIED - description: |- - ProposalStatus enumerates the valid statuses of a proposal. - - - PROPOSAL_STATUS_UNSPECIFIED: PROPOSAL_STATUS_UNSPECIFIED defines the default propopsal status. - - PROPOSAL_STATUS_DEPOSIT_PERIOD: PROPOSAL_STATUS_DEPOSIT_PERIOD defines a proposal status during the deposit - period. - - PROPOSAL_STATUS_VOTING_PERIOD: PROPOSAL_STATUS_VOTING_PERIOD defines a proposal status during the voting - period. - - PROPOSAL_STATUS_PASSED: PROPOSAL_STATUS_PASSED defines a proposal status of a proposal that has - passed. - - PROPOSAL_STATUS_REJECTED: PROPOSAL_STATUS_REJECTED defines a proposal status of a proposal that has - been rejected. - - PROPOSAL_STATUS_FAILED: PROPOSAL_STATUS_FAILED defines a proposal status of a proposal that has - failed. - final_tally_result: - type: object - properties: - 'yes': - type: string - abstain: - type: string - 'no': - type: string - no_with_veto: - type: string - description: TallyResult defines a standard tally for a governance proposal. - submit_time: - type: string - format: date-time - deposit_end_time: - type: string - format: date-time - total_deposit: - type: array - items: + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + tags: + - Query + /interchain_security/ccv/consumer/next-fee-distribution: + get: + summary: >- + ConsumerGenesis queries the genesis state needed to start a consumer + chain + + whose proposal has been accepted + operationId: InterchainSecurityCcvConsumerV1QueryNextFeeDistribution + responses: + '200': + description: A successful response. + schema: + type: object + properties: + data: type: object properties: - denom: + currentHeight: type: string - amount: + format: int64 + title: current block height at the time of querying + lastHeight: type: string - description: >- - Coin defines a token with a denomination and an amount. + format: int64 + title: block height at which last distribution took place + nextHeight: + type: string + format: int64 + title: block height at which next distribution will take place + distribution_fraction: + type: string + title: ratio between consumer and provider fee distribution + total: + type: string + title: total accruead fees at the time of querying + toProvider: + type: string + title: amount distibuted to provider chain + toConsumer: + type: string + title: amount distributed (kept) by consumer chain + title: >- + NextFeeDistributionEstimate holds information about next fee + distribution + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type of + the serialized + protocol buffer message. This string must contain at + least - NOTE: The amount field is an Int which implements the custom - method + one "/" character. The last segment of the URL's path + must represent - signatures required by gogoproto. - voting_start_time: - type: string - format: date-time - voting_end_time: - type: string - format: date-time - description: Proposal defines the core field members of a governance proposal. - cosmos.base.v1beta1.Coin: - type: object - properties: - denom: - type: string - amount: - type: string - description: |- - Coin defines a token with a denomination and an amount. + the fully qualified name of the type (as in - NOTE: The amount field is an Int which implements the custom method - signatures required by gogoproto. - cosmos.gov.v1beta1.Proposal: - type: object - properties: - proposal_id: - type: string - format: uint64 - content: - type: object - properties: - '@type': - type: string - description: >- - A URL/resource name that uniquely identifies the type of the - serialized + `path/google.protobuf.Duration`). The name should be in + a canonical form - protocol buffer message. This string must contain at least + (e.g., leading "." is not accepted). - one "/" character. The last segment of the URL's path must - represent - the fully qualified name of the type (as in + In practice, teams usually precompile into the binary + all types that they - `path/google.protobuf.Duration`). The name should be in a - canonical form + expect it to use in the context of Any. However, for + URLs which use the - (e.g., leading "." is not accepted). + scheme `http`, `https`, or no scheme, one can optionally + set up a type + server that maps type URLs to message definitions as + follows: - In practice, teams usually precompile into the binary all types - that they - expect it to use in the context of Any. However, for URLs which - use the + * If no scheme is provided, `https` is assumed. - scheme `http`, `https`, or no scheme, one can optionally set up a - type + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based + on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) - server that maps type URLs to message definitions as follows: + Note: this functionality is not currently available in + the official + protobuf release, and it is not used for type URLs + beginning with - * If no scheme is provided, `https` is assumed. + type.googleapis.com. - * An HTTP GET on the URL must yield a [google.protobuf.Type][] - value in binary format, or produce an error. - * Applications are allowed to cache lookup results based on the - URL, or have them precompiled into a binary to avoid any - lookup. Therefore, binary compatibility needs to be preserved - on changes to types. (Use versioned type names to manage - breaking changes.) - Note: this functionality is not currently available in the - official + Schemes other than `http`, `https` (or the empty scheme) + might be - protobuf release, and it is not used for type URLs beginning with + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer + message along with a - type.googleapis.com. + URL that describes the type of the serialized message. - Schemes other than `http`, `https` (or the empty scheme) might be + Protobuf library provides support to pack/unpack Any values + in the form - used with implementation specific semantics. - additionalProperties: {} - description: >- - `Any` contains an arbitrary serialized protocol buffer message along - with a + of utility functions or additional generated methods of the + Any type. - URL that describes the type of the serialized message. + Example 1: Pack and unpack a message in C++. - Protobuf library provides support to pack/unpack Any values in the - form + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } - of utility functions or additional generated methods of the Any type. + Example 2: Pack and unpack a message in Java. + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } - Example 1: Pack and unpack a message in C++. + Example 3: Pack and unpack a message in Python. - Foo foo = ...; - Any any; - any.PackFrom(foo); - ... - if (any.UnpackTo(&foo)) { - ... - } + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... - Example 2: Pack and unpack a message in Java. + Example 4: Pack and unpack a message in Go - Foo foo = ...; - Any any = Any.pack(foo); - ... - if (any.is(Foo.class)) { - foo = any.unpack(Foo.class); - } + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } - Example 3: Pack and unpack a message in Python. + The pack methods provided by protobuf library will by + default use - foo = Foo(...) - any = Any() - any.Pack(foo) - ... - if any.Is(Foo.DESCRIPTOR): - any.Unpack(foo) - ... + 'type.googleapis.com/full.type.name' as the type URL and the + unpack - Example 4: Pack and unpack a message in Go + methods only use the fully qualified type name after the + last '/' - foo := &pb.Foo{...} - any, err := anypb.New(foo) - if err != nil { - ... - } - ... - foo := &pb.Foo{} - if err := any.UnmarshalTo(foo); err != nil { - ... - } + in the type URL, for example "foo.bar.com/x/y.z" will yield + type - The pack methods provided by protobuf library will by default use + name "y.z". - 'type.googleapis.com/full.type.name' as the type URL and the unpack - methods only use the fully qualified type name after the last '/' - in the type URL, for example "foo.bar.com/x/y.z" will yield type + JSON - name "y.z". + ==== + The JSON representation of an `Any` value uses the regular + representation of the deserialized, embedded message, with + an - JSON + additional field `@type` which contains the type URL. + Example: - ==== + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } - The JSON representation of an `Any` value uses the regular + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } - representation of the deserialized, embedded message, with an + If the embedded message type is well-known and has a custom + JSON - additional field `@type` which contains the type URL. Example: + representation, that representation will be embedded adding + a field - package google.profile; - message Person { - string first_name = 1; - string last_name = 2; - } + `value` which holds the custom JSON in addition to the + `@type` - { - "@type": "type.googleapis.com/google.profile.Person", - "firstName": , - "lastName": - } + field. Example (for message [google.protobuf.Duration][]): - If the embedded message type is well-known and has a custom JSON + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + tags: + - Query + /interchain_security/ccv/consumer/params: + get: + summary: QueryParams queries the ccv/consumer module parameters. + operationId: InterchainSecurityCcvConsumerV1QueryParams + responses: + '200': + description: A successful response. + schema: + type: object + properties: + params: + description: params holds all the parameters of this module. + type: object + properties: + enabled: + type: boolean + title: >- + TODO: Remove enabled flag and find a better way to setup + integration tests - representation, that representation will be embedded adding a field + See: + https://github.com/cosmos/interchain-security/issues/339 + blocks_per_distribution_transmission: + type: string + format: int64 + description: >- + ///////////////////// - `value` which holds the custom JSON in addition to the `@type` + Distribution Params - field. Example (for message [google.protobuf.Duration][]): + Number of blocks between ibc-token-transfers from the + consumer chain to - { - "@type": "type.googleapis.com/google.protobuf.Duration", - "value": "1.212s" - } - status: - type: string - enum: - - PROPOSAL_STATUS_UNSPECIFIED - - PROPOSAL_STATUS_DEPOSIT_PERIOD - - PROPOSAL_STATUS_VOTING_PERIOD - - PROPOSAL_STATUS_PASSED - - PROPOSAL_STATUS_REJECTED - - PROPOSAL_STATUS_FAILED - default: PROPOSAL_STATUS_UNSPECIFIED - description: |- - ProposalStatus enumerates the valid statuses of a proposal. - - - PROPOSAL_STATUS_UNSPECIFIED: PROPOSAL_STATUS_UNSPECIFIED defines the default propopsal status. - - PROPOSAL_STATUS_DEPOSIT_PERIOD: PROPOSAL_STATUS_DEPOSIT_PERIOD defines a proposal status during the deposit - period. - - PROPOSAL_STATUS_VOTING_PERIOD: PROPOSAL_STATUS_VOTING_PERIOD defines a proposal status during the voting - period. - - PROPOSAL_STATUS_PASSED: PROPOSAL_STATUS_PASSED defines a proposal status of a proposal that has - passed. - - PROPOSAL_STATUS_REJECTED: PROPOSAL_STATUS_REJECTED defines a proposal status of a proposal that has - been rejected. - - PROPOSAL_STATUS_FAILED: PROPOSAL_STATUS_FAILED defines a proposal status of a proposal that has - failed. - final_tally_result: - type: object - properties: - 'yes': - type: string - abstain: - type: string - 'no': - type: string - no_with_veto: - type: string - description: TallyResult defines a standard tally for a governance proposal. - submit_time: - type: string - format: date-time - deposit_end_time: - type: string - format: date-time - total_deposit: - type: array - items: - type: object - properties: - denom: - type: string - amount: - type: string - description: |- - Coin defines a token with a denomination and an amount. + the provider chain. Note that at this transmission event a + fraction of - NOTE: The amount field is an Int which implements the custom method - signatures required by gogoproto. - voting_start_time: - type: string - format: date-time - voting_end_time: - type: string - format: date-time - description: Proposal defines the core field members of a governance proposal. - cosmos.gov.v1beta1.ProposalStatus: - type: string - enum: - - PROPOSAL_STATUS_UNSPECIFIED - - PROPOSAL_STATUS_DEPOSIT_PERIOD - - PROPOSAL_STATUS_VOTING_PERIOD - - PROPOSAL_STATUS_PASSED - - PROPOSAL_STATUS_REJECTED - - PROPOSAL_STATUS_FAILED - default: PROPOSAL_STATUS_UNSPECIFIED - description: |- - ProposalStatus enumerates the valid statuses of a proposal. + the accumulated tokens are divided and sent consumer + redistribution - - PROPOSAL_STATUS_UNSPECIFIED: PROPOSAL_STATUS_UNSPECIFIED defines the default propopsal status. - - PROPOSAL_STATUS_DEPOSIT_PERIOD: PROPOSAL_STATUS_DEPOSIT_PERIOD defines a proposal status during the deposit - period. - - PROPOSAL_STATUS_VOTING_PERIOD: PROPOSAL_STATUS_VOTING_PERIOD defines a proposal status during the voting - period. - - PROPOSAL_STATUS_PASSED: PROPOSAL_STATUS_PASSED defines a proposal status of a proposal that has - passed. - - PROPOSAL_STATUS_REJECTED: PROPOSAL_STATUS_REJECTED defines a proposal status of a proposal that has - been rejected. - - PROPOSAL_STATUS_FAILED: PROPOSAL_STATUS_FAILED defines a proposal status of a proposal that has - failed. - cosmos.gov.v1beta1.TallyResult: - type: object - properties: - 'yes': - type: string - abstain: - type: string - 'no': - type: string - no_with_veto: - type: string - description: TallyResult defines a standard tally for a governance proposal. - google.protobuf.Any: - type: object - properties: - '@type': - type: string - description: >- - A URL/resource name that uniquely identifies the type of the - serialized + address. + distribution_transmission_channel: + type: string + description: >- + Channel, and provider-chain receiving address to send + distribution token - protocol buffer message. This string must contain at least + transfers over. These parameters is auto-set during the + consumer <-> - one "/" character. The last segment of the URL's path must represent + provider handshake procedure. + provider_fee_pool_addr_str: + type: string + ccv_timeout_period: + type: string + title: >- + Sent CCV related IBC packets will timeout after this + duration + transfer_timeout_period: + type: string + title: >- + Sent transfer related IBC packets will timeout after this + duration + consumer_redistribution_fraction: + type: string + description: >- + The fraction of tokens allocated to the consumer + redistribution address - the fully qualified name of the type (as in + during distribution events. The fraction is a string + representing a - `path/google.protobuf.Duration`). The name should be in a canonical - form + decimal number. For example "0.75" would represent 75%. + historical_entries: + type: string + format: int64 + description: >- + The number of historical info entries to persist in store. - (e.g., leading "." is not accepted). + This param is a part of the cosmos sdk staking module. In + the case of + a ccv enabled consumer chain, the ccv module acts as the + staking module. + unbonding_period: + type: string + description: >- + Unbonding period for the consumer, - In practice, teams usually precompile into the binary all types that - they + which should be smaller than that of the provider in + general. + soft_opt_out_threshold: + type: string + title: >- + The threshold for the percentage of validators at the + bottom of the set who - expect it to use in the context of Any. However, for URLs which use - the + can opt out of running the consumer chain without being + punished. For example, a - scheme `http`, `https`, or no scheme, one can optionally set up a type + value of 0.05 means that the validators in the bottom 5% + of the set can opt out + title: Params defines the parameters for CCV consumer module + description: >- + QueryParamsResponse is response type for the Query/Params RPC + method. + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type of + the serialized - server that maps type URLs to message definitions as follows: + protocol buffer message. This string must contain at + least + one "/" character. The last segment of the URL's path + must represent - * If no scheme is provided, `https` is assumed. + the fully qualified name of the type (as in - * An HTTP GET on the URL must yield a [google.protobuf.Type][] - value in binary format, or produce an error. - * Applications are allowed to cache lookup results based on the - URL, or have them precompiled into a binary to avoid any - lookup. Therefore, binary compatibility needs to be preserved - on changes to types. (Use versioned type names to manage - breaking changes.) + `path/google.protobuf.Duration`). The name should be in + a canonical form - Note: this functionality is not currently available in the official + (e.g., leading "." is not accepted). - protobuf release, and it is not used for type URLs beginning with - type.googleapis.com. + In practice, teams usually precompile into the binary + all types that they + expect it to use in the context of Any. However, for + URLs which use the - Schemes other than `http`, `https` (or the empty scheme) might be + scheme `http`, `https`, or no scheme, one can optionally + set up a type - used with implementation specific semantics. - additionalProperties: {} - description: >- - `Any` contains an arbitrary serialized protocol buffer message along with - a + server that maps type URLs to message definitions as + follows: - URL that describes the type of the serialized message. + * If no scheme is provided, `https` is assumed. - Protobuf library provides support to pack/unpack Any values in the form + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based + on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) - of utility functions or additional generated methods of the Any type. + Note: this functionality is not currently available in + the official + protobuf release, and it is not used for type URLs + beginning with - Example 1: Pack and unpack a message in C++. + type.googleapis.com. - Foo foo = ...; - Any any; - any.PackFrom(foo); - ... - if (any.UnpackTo(&foo)) { - ... - } - Example 2: Pack and unpack a message in Java. + Schemes other than `http`, `https` (or the empty scheme) + might be - Foo foo = ...; - Any any = Any.pack(foo); - ... - if (any.is(Foo.class)) { - foo = any.unpack(Foo.class); - } + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer + message along with a - Example 3: Pack and unpack a message in Python. + URL that describes the type of the serialized message. - foo = Foo(...) - any = Any() - any.Pack(foo) - ... - if any.Is(Foo.DESCRIPTOR): - any.Unpack(foo) - ... - Example 4: Pack and unpack a message in Go + Protobuf library provides support to pack/unpack Any values + in the form - foo := &pb.Foo{...} - any, err := anypb.New(foo) - if err != nil { - ... - } - ... - foo := &pb.Foo{} - if err := any.UnmarshalTo(foo); err != nil { - ... - } + of utility functions or additional generated methods of the + Any type. - The pack methods provided by protobuf library will by default use - 'type.googleapis.com/full.type.name' as the type URL and the unpack + Example 1: Pack and unpack a message in C++. - methods only use the fully qualified type name after the last '/' + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } - in the type URL, for example "foo.bar.com/x/y.z" will yield type + Example 2: Pack and unpack a message in Java. - name "y.z". + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + Example 3: Pack and unpack a message in Python. + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... - JSON + Example 4: Pack and unpack a message in Go - ==== + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } - The JSON representation of an `Any` value uses the regular + The pack methods provided by protobuf library will by + default use - representation of the deserialized, embedded message, with an + 'type.googleapis.com/full.type.name' as the type URL and the + unpack - additional field `@type` which contains the type URL. Example: + methods only use the fully qualified type name after the + last '/' - package google.profile; - message Person { - string first_name = 1; - string last_name = 2; - } + in the type URL, for example "foo.bar.com/x/y.z" will yield + type - { - "@type": "type.googleapis.com/google.profile.Person", - "firstName": , - "lastName": - } + name "y.z". - If the embedded message type is well-known and has a custom JSON - representation, that representation will be embedded adding a field - `value` which holds the custom JSON in addition to the `@type` + JSON - field. Example (for message [google.protobuf.Duration][]): + ==== - { - "@type": "type.googleapis.com/google.protobuf.Duration", - "value": "1.212s" - } - google.rpc.Status: - type: object - properties: - code: - type: integer - format: int32 - message: - type: string - details: - type: array - items: - type: object - properties: - '@type': - type: string - description: >- - A URL/resource name that uniquely identifies the type of the - serialized + The JSON representation of an `Any` value uses the regular - protocol buffer message. This string must contain at least + representation of the deserialized, embedded message, with + an - one "/" character. The last segment of the URL's path must - represent + additional field `@type` which contains the type URL. + Example: - the fully qualified name of the type (as in + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } - `path/google.protobuf.Duration`). The name should be in a - canonical form + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } - (e.g., leading "." is not accepted). + If the embedded message type is well-known and has a custom + JSON + representation, that representation will be embedded adding + a field - In practice, teams usually precompile into the binary all types - that they + `value` which holds the custom JSON in addition to the + `@type` - expect it to use in the context of Any. However, for URLs which - use the + field. Example (for message [google.protobuf.Duration][]): - scheme `http`, `https`, or no scheme, one can optionally set up - a type + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + tags: + - Query + /interchain_security/ccv/provider/consumer_chain_start_proposals: + get: + summary: QueryConsumerChainStarts queries consumer chain start proposals. + operationId: InterchainSecurityCcvProviderV1QueryConsumerChainStarts + responses: + '200': + description: A successful response. + schema: + type: object + properties: + proposals: + type: object + properties: + pending: + type: array + items: + type: object + properties: + title: + type: string + title: the title of the proposal + description: + type: string + title: the description of the proposal + chain_id: + type: string + description: >- + the proposed chain-id of the new consumer chain, + must be different from all other consumer chain ids + of the executing - server that maps type URLs to message definitions as follows: + provider chain. + initial_height: + description: >- + the proposed initial height of new consumer chain. + For a completely new chain, this will be {0,1}. + However, it may be different if this is a chain that + is converting to a consumer chain. + type: object + properties: + revision_number: + type: string + format: uint64 + title: the revision that the client is currently on + revision_height: + type: string + format: uint64 + title: the height within the given revision + title: >- + Height is a monotonically increasing data type - * If no scheme is provided, `https` is assumed. + that can be compared against another Height for the + purposes of updating and - * An HTTP GET on the URL must yield a [google.protobuf.Type][] - value in binary format, or produce an error. - * Applications are allowed to cache lookup results based on the - URL, or have them precompiled into a binary to avoid any - lookup. Therefore, binary compatibility needs to be preserved - on changes to types. (Use versioned type names to manage - breaking changes.) + freezing clients + genesis_hash: + type: string + format: byte + description: >- + The hash of the consumer chain genesis state without + the consumer CCV module genesis params. - Note: this functionality is not currently available in the - official + It is used for off-chain confirmation of + genesis.json validity by validators and other + parties. + binary_hash: + type: string + format: byte + description: >- + The hash of the consumer chain binary that should be + run by validators on chain initialization. - protobuf release, and it is not used for type URLs beginning - with + It is used for off-chain confirmation of binary + validity by validators and other parties. + spawn_time: + type: string + format: date-time + description: >- + spawn time is the time on the provider chain at + which the consumer chain genesis is finalized and + all validators - type.googleapis.com. + will be responsible for starting their consumer + chain validator node. + unbonding_period: + type: string + description: >- + Unbonding period for the consumer, + which should be smaller than that of the provider in + general. + ccv_timeout_period: + type: string + title: >- + Sent CCV related IBC packets will timeout after this + duration + transfer_timeout_period: + type: string + title: >- + Sent transfer related IBC packets will timeout after + this duration + consumer_redistribution_fraction: + type: string + description: >- + The fraction of tokens allocated to the consumer + redistribution address - Schemes other than `http`, `https` (or the empty scheme) might - be + during distribution events. The fraction is a string + representing a - used with implementation specific semantics. - additionalProperties: {} - description: >- - `Any` contains an arbitrary serialized protocol buffer message along - with a + decimal number. For example "0.75" would represent + 75%. + blocks_per_distribution_transmission: + type: string + format: int64 + description: >- + BlocksPerDistributionTransmission is the number of + blocks between ibc-token-transfers from the consumer + chain to the provider chain. - URL that describes the type of the serialized message. + On sending transmission event, + `consumer_redistribution_fraction` of the + accumulated tokens are sent to the consumer + redistribution address. + historical_entries: + type: string + format: int64 + description: >- + The number of historical info entries to persist in + store. + This param is a part of the cosmos sdk staking + module. In the case of - Protobuf library provides support to pack/unpack Any values in the - form + a ccv enabled consumer chain, the ccv module acts as + the staking module. + description: >- + ConsumerAdditionProposal is a governance proposal on the + provider chain to spawn a new consumer chain. - of utility functions or additional generated methods of the Any - type. + If it passes, then all validators on the provider chain + are expected to validate the consumer chain at spawn + time + or get slashed. It is recommended that spawn time occurs + after the proposal end time. + title: proposals waiting for spawn_time to pass + description: >- + ConsumerAdditionProposals holds pending governance proposals + on the provider chain to spawn a new chain. + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type of + the serialized - Example 1: Pack and unpack a message in C++. + protocol buffer message. This string must contain at + least - Foo foo = ...; - Any any; - any.PackFrom(foo); - ... - if (any.UnpackTo(&foo)) { - ... - } + one "/" character. The last segment of the URL's path + must represent - Example 2: Pack and unpack a message in Java. + the fully qualified name of the type (as in - Foo foo = ...; - Any any = Any.pack(foo); - ... - if (any.is(Foo.class)) { - foo = any.unpack(Foo.class); - } + `path/google.protobuf.Duration`). The name should be in + a canonical form - Example 3: Pack and unpack a message in Python. + (e.g., leading "." is not accepted). - foo = Foo(...) - any = Any() - any.Pack(foo) - ... - if any.Is(Foo.DESCRIPTOR): - any.Unpack(foo) - ... - Example 4: Pack and unpack a message in Go + In practice, teams usually precompile into the binary + all types that they - foo := &pb.Foo{...} - any, err := anypb.New(foo) - if err != nil { - ... - } - ... - foo := &pb.Foo{} - if err := any.UnmarshalTo(foo); err != nil { - ... - } + expect it to use in the context of Any. However, for + URLs which use the - The pack methods provided by protobuf library will by default use + scheme `http`, `https`, or no scheme, one can optionally + set up a type - 'type.googleapis.com/full.type.name' as the type URL and the unpack + server that maps type URLs to message definitions as + follows: - methods only use the fully qualified type name after the last '/' - in the type URL, for example "foo.bar.com/x/y.z" will yield type + * If no scheme is provided, `https` is assumed. - name "y.z". + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based + on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + Note: this functionality is not currently available in + the official + protobuf release, and it is not used for type URLs + beginning with - JSON + type.googleapis.com. - ==== - The JSON representation of an `Any` value uses the regular + Schemes other than `http`, `https` (or the empty scheme) + might be - representation of the deserialized, embedded message, with an + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer + message along with a - additional field `@type` which contains the type URL. Example: + URL that describes the type of the serialized message. - package google.profile; - message Person { - string first_name = 1; - string last_name = 2; - } - { - "@type": "type.googleapis.com/google.profile.Person", - "firstName": , - "lastName": - } + Protobuf library provides support to pack/unpack Any values + in the form - If the embedded message type is well-known and has a custom JSON + of utility functions or additional generated methods of the + Any type. - representation, that representation will be embedded adding a field - `value` which holds the custom JSON in addition to the `@type` + Example 1: Pack and unpack a message in C++. - field. Example (for message [google.protobuf.Duration][]): + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } - { - "@type": "type.googleapis.com/google.protobuf.Duration", - "value": "1.212s" - } - cosmos.auth.v1beta1.Params: - type: object - properties: - max_memo_characters: - type: string - format: uint64 - tx_sig_limit: - type: string - format: uint64 - tx_size_cost_per_byte: - type: string - format: uint64 - sig_verify_cost_ed25519: - type: string - format: uint64 - sig_verify_cost_secp256k1: - type: string - format: uint64 - description: Params defines the parameters for the auth module. - cosmos.auth.v1beta1.QueryAccountResponse: - type: object - properties: - account: - description: account defines the account of the corresponding address. - type: object - properties: - '@type': - type: string - description: >- - A URL/resource name that uniquely identifies the type of the - serialized + Example 2: Pack and unpack a message in Java. - protocol buffer message. This string must contain at least + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } - one "/" character. The last segment of the URL's path must - represent + Example 3: Pack and unpack a message in Python. - the fully qualified name of the type (as in + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... - `path/google.protobuf.Duration`). The name should be in a - canonical form + Example 4: Pack and unpack a message in Go - (e.g., leading "." is not accepted). + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + The pack methods provided by protobuf library will by + default use - In practice, teams usually precompile into the binary all types - that they + 'type.googleapis.com/full.type.name' as the type URL and the + unpack - expect it to use in the context of Any. However, for URLs which - use the + methods only use the fully qualified type name after the + last '/' - scheme `http`, `https`, or no scheme, one can optionally set up a - type + in the type URL, for example "foo.bar.com/x/y.z" will yield + type - server that maps type URLs to message definitions as follows: + name "y.z". - * If no scheme is provided, `https` is assumed. - * An HTTP GET on the URL must yield a [google.protobuf.Type][] - value in binary format, or produce an error. - * Applications are allowed to cache lookup results based on the - URL, or have them precompiled into a binary to avoid any - lookup. Therefore, binary compatibility needs to be preserved - on changes to types. (Use versioned type names to manage - breaking changes.) + JSON - Note: this functionality is not currently available in the - official + ==== - protobuf release, and it is not used for type URLs beginning with + The JSON representation of an `Any` value uses the regular - type.googleapis.com. + representation of the deserialized, embedded message, with + an + additional field `@type` which contains the type URL. + Example: - Schemes other than `http`, `https` (or the empty scheme) might be + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } - used with implementation specific semantics. - additionalProperties: {} - description: >- - QueryAccountResponse is the response type for the Query/Account RPC - method. - cosmos.auth.v1beta1.QueryAccountsResponse: - type: object - properties: - accounts: - type: array - items: - type: object - properties: - '@type': - type: string - description: >- - A URL/resource name that uniquely identifies the type of the - serialized + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } - protocol buffer message. This string must contain at least + If the embedded message type is well-known and has a custom + JSON - one "/" character. The last segment of the URL's path must - represent + representation, that representation will be embedded adding + a field - the fully qualified name of the type (as in + `value` which holds the custom JSON in addition to the + `@type` - `path/google.protobuf.Duration`). The name should be in a - canonical form + field. Example (for message [google.protobuf.Duration][]): - (e.g., leading "." is not accepted). + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + tags: + - Query + /interchain_security/ccv/provider/consumer_chain_stop_proposals: + get: + summary: QueryConsumerChainStops queries consumer chain stop proposals. + operationId: InterchainSecurityCcvProviderV1QueryConsumerChainStops + responses: + '200': + description: A successful response. + schema: + type: object + properties: + proposals: + type: object + properties: + pending: + type: array + items: + type: object + properties: + title: + type: string + title: the title of the proposal + description: + type: string + title: the description of the proposal + chain_id: + type: string + title: the chain-id of the consumer chain to be stopped + stop_time: + type: string + format: date-time + title: >- + the time on the provider chain at which all + validators are responsible to stop their consumer + chain validator node + description: >- + ConsumerRemovalProposal is a governance proposal on the + provider chain to remove (and stop) a consumer chain. + If it passes, all the consumer chain's state is removed + from the provider chain. The outstanding unbonding - In practice, teams usually precompile into the binary all types - that they + operation funds are released. + title: proposals waiting for stop_time to pass + description: >- + ConsumerRemovalProposals holds pending governance proposals on + the provider chain to remove (and stop) a consumer chain. + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type of + the serialized - expect it to use in the context of Any. However, for URLs which - use the + protocol buffer message. This string must contain at + least - scheme `http`, `https`, or no scheme, one can optionally set up - a type + one "/" character. The last segment of the URL's path + must represent - server that maps type URLs to message definitions as follows: + the fully qualified name of the type (as in + `path/google.protobuf.Duration`). The name should be in + a canonical form - * If no scheme is provided, `https` is assumed. + (e.g., leading "." is not accepted). - * An HTTP GET on the URL must yield a [google.protobuf.Type][] - value in binary format, or produce an error. - * Applications are allowed to cache lookup results based on the - URL, or have them precompiled into a binary to avoid any - lookup. Therefore, binary compatibility needs to be preserved - on changes to types. (Use versioned type names to manage - breaking changes.) - Note: this functionality is not currently available in the - official + In practice, teams usually precompile into the binary + all types that they - protobuf release, and it is not used for type URLs beginning - with + expect it to use in the context of Any. However, for + URLs which use the - type.googleapis.com. + scheme `http`, `https`, or no scheme, one can optionally + set up a type + server that maps type URLs to message definitions as + follows: - Schemes other than `http`, `https` (or the empty scheme) might - be - used with implementation specific semantics. - additionalProperties: {} - description: >- - `Any` contains an arbitrary serialized protocol buffer message along - with a + * If no scheme is provided, `https` is assumed. - URL that describes the type of the serialized message. + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based + on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + Note: this functionality is not currently available in + the official - Protobuf library provides support to pack/unpack Any values in the - form + protobuf release, and it is not used for type URLs + beginning with - of utility functions or additional generated methods of the Any - type. + type.googleapis.com. - Example 1: Pack and unpack a message in C++. + Schemes other than `http`, `https` (or the empty scheme) + might be - Foo foo = ...; - Any any; - any.PackFrom(foo); - ... - if (any.UnpackTo(&foo)) { - ... - } + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer + message along with a - Example 2: Pack and unpack a message in Java. + URL that describes the type of the serialized message. - Foo foo = ...; - Any any = Any.pack(foo); - ... - if (any.is(Foo.class)) { - foo = any.unpack(Foo.class); - } - Example 3: Pack and unpack a message in Python. + Protobuf library provides support to pack/unpack Any values + in the form - foo = Foo(...) - any = Any() - any.Pack(foo) - ... - if any.Is(Foo.DESCRIPTOR): - any.Unpack(foo) - ... + of utility functions or additional generated methods of the + Any type. - Example 4: Pack and unpack a message in Go - foo := &pb.Foo{...} - any, err := anypb.New(foo) - if err != nil { - ... - } - ... - foo := &pb.Foo{} - if err := any.UnmarshalTo(foo); err != nil { - ... - } + Example 1: Pack and unpack a message in C++. - The pack methods provided by protobuf library will by default use + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } - 'type.googleapis.com/full.type.name' as the type URL and the unpack + Example 2: Pack and unpack a message in Java. - methods only use the fully qualified type name after the last '/' + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } - in the type URL, for example "foo.bar.com/x/y.z" will yield type + Example 3: Pack and unpack a message in Python. - name "y.z". + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + Example 4: Pack and unpack a message in Go + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } - JSON + The pack methods provided by protobuf library will by + default use - ==== + 'type.googleapis.com/full.type.name' as the type URL and the + unpack - The JSON representation of an `Any` value uses the regular + methods only use the fully qualified type name after the + last '/' - representation of the deserialized, embedded message, with an + in the type URL, for example "foo.bar.com/x/y.z" will yield + type - additional field `@type` which contains the type URL. Example: + name "y.z". - package google.profile; - message Person { - string first_name = 1; - string last_name = 2; - } - { - "@type": "type.googleapis.com/google.profile.Person", - "firstName": , - "lastName": - } - If the embedded message type is well-known and has a custom JSON + JSON - representation, that representation will be embedded adding a field + ==== - `value` which holds the custom JSON in addition to the `@type` + The JSON representation of an `Any` value uses the regular - field. Example (for message [google.protobuf.Duration][]): + representation of the deserialized, embedded message, with + an - { - "@type": "type.googleapis.com/google.protobuf.Duration", - "value": "1.212s" - } - title: accounts are the existing accounts - pagination: - description: pagination defines the pagination in the response. - type: object - properties: - next_key: - type: string - format: byte - title: |- - next_key is the key to be passed to PageRequest.key to - query the next page most efficiently - total: - type: string - format: uint64 - title: >- - total is total number of results available if - PageRequest.count_total + additional field `@type` which contains the type URL. + Example: - was set, its value is undefined otherwise - description: >- - QueryAccountsResponse is the response type for the Query/Accounts RPC - method. + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } - Since: cosmos-sdk 0.43 - cosmos.auth.v1beta1.QueryModuleAccountByNameResponse: - type: object - properties: - account: - type: object - properties: - '@type': - type: string - description: >- - A URL/resource name that uniquely identifies the type of the - serialized + If the embedded message type is well-known and has a custom + JSON - protocol buffer message. This string must contain at least + representation, that representation will be embedded adding + a field - one "/" character. The last segment of the URL's path must - represent + `value` which holds the custom JSON in addition to the + `@type` - the fully qualified name of the type (as in + field. Example (for message [google.protobuf.Duration][]): - `path/google.protobuf.Duration`). The name should be in a - canonical form + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + tags: + - Query + /interchain_security/ccv/provider/consumer_chains: + get: + summary: |- + ConsumerChains queries active consumer chains supported by the provider + chain + operationId: InterchainSecurityCcvProviderV1QueryConsumerChains + responses: + '200': + description: A successful response. + schema: + type: object + properties: + chains: + type: array + items: + type: object + properties: + chain_id: + type: string + client_id: + type: string + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type of + the serialized - (e.g., leading "." is not accepted). + protocol buffer message. This string must contain at + least + one "/" character. The last segment of the URL's path + must represent - In practice, teams usually precompile into the binary all types - that they + the fully qualified name of the type (as in - expect it to use in the context of Any. However, for URLs which - use the + `path/google.protobuf.Duration`). The name should be in + a canonical form - scheme `http`, `https`, or no scheme, one can optionally set up a - type + (e.g., leading "." is not accepted). - server that maps type URLs to message definitions as follows: + In practice, teams usually precompile into the binary + all types that they - * If no scheme is provided, `https` is assumed. + expect it to use in the context of Any. However, for + URLs which use the - * An HTTP GET on the URL must yield a [google.protobuf.Type][] - value in binary format, or produce an error. - * Applications are allowed to cache lookup results based on the - URL, or have them precompiled into a binary to avoid any - lookup. Therefore, binary compatibility needs to be preserved - on changes to types. (Use versioned type names to manage - breaking changes.) + scheme `http`, `https`, or no scheme, one can optionally + set up a type - Note: this functionality is not currently available in the - official + server that maps type URLs to message definitions as + follows: - protobuf release, and it is not used for type URLs beginning with - type.googleapis.com. + * If no scheme is provided, `https` is assumed. + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based + on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) - Schemes other than `http`, `https` (or the empty scheme) might be + Note: this functionality is not currently available in + the official - used with implementation specific semantics. - additionalProperties: {} - description: >- - `Any` contains an arbitrary serialized protocol buffer message along - with a + protobuf release, and it is not used for type URLs + beginning with - URL that describes the type of the serialized message. + type.googleapis.com. - Protobuf library provides support to pack/unpack Any values in the - form + Schemes other than `http`, `https` (or the empty scheme) + might be - of utility functions or additional generated methods of the Any type. + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer + message along with a + URL that describes the type of the serialized message. - Example 1: Pack and unpack a message in C++. - Foo foo = ...; - Any any; - any.PackFrom(foo); - ... - if (any.UnpackTo(&foo)) { - ... - } + Protobuf library provides support to pack/unpack Any values + in the form - Example 2: Pack and unpack a message in Java. + of utility functions or additional generated methods of the + Any type. - Foo foo = ...; - Any any = Any.pack(foo); - ... - if (any.is(Foo.class)) { - foo = any.unpack(Foo.class); - } - Example 3: Pack and unpack a message in Python. + Example 1: Pack and unpack a message in C++. - foo = Foo(...) - any = Any() - any.Pack(foo) - ... - if any.Is(Foo.DESCRIPTOR): - any.Unpack(foo) - ... + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } - Example 4: Pack and unpack a message in Go + Example 2: Pack and unpack a message in Java. - foo := &pb.Foo{...} - any, err := anypb.New(foo) - if err != nil { - ... - } - ... - foo := &pb.Foo{} - if err := any.UnmarshalTo(foo); err != nil { - ... - } + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } - The pack methods provided by protobuf library will by default use + Example 3: Pack and unpack a message in Python. - 'type.googleapis.com/full.type.name' as the type URL and the unpack + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... - methods only use the fully qualified type name after the last '/' + Example 4: Pack and unpack a message in Go - in the type URL, for example "foo.bar.com/x/y.z" will yield type + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } - name "y.z". + The pack methods provided by protobuf library will by + default use + 'type.googleapis.com/full.type.name' as the type URL and the + unpack + methods only use the fully qualified type name after the + last '/' - JSON + in the type URL, for example "foo.bar.com/x/y.z" will yield + type - ==== + name "y.z". - The JSON representation of an `Any` value uses the regular - representation of the deserialized, embedded message, with an - additional field `@type` which contains the type URL. Example: + JSON - package google.profile; - message Person { - string first_name = 1; - string last_name = 2; - } + ==== - { - "@type": "type.googleapis.com/google.profile.Person", - "firstName": , - "lastName": - } + The JSON representation of an `Any` value uses the regular - If the embedded message type is well-known and has a custom JSON + representation of the deserialized, embedded message, with + an - representation, that representation will be embedded adding a field + additional field `@type` which contains the type URL. + Example: - `value` which holds the custom JSON in addition to the `@type` + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } - field. Example (for message [google.protobuf.Duration][]): + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } - { - "@type": "type.googleapis.com/google.protobuf.Duration", - "value": "1.212s" - } - description: >- - QueryModuleAccountByNameResponse is the response type for the - Query/ModuleAccountByName RPC method. - cosmos.auth.v1beta1.QueryParamsResponse: - type: object - properties: - params: - description: params defines the parameters of the module. - type: object - properties: - max_memo_characters: - type: string - format: uint64 - tx_sig_limit: - type: string - format: uint64 - tx_size_cost_per_byte: - type: string - format: uint64 - sig_verify_cost_ed25519: - type: string - format: uint64 - sig_verify_cost_secp256k1: - type: string - format: uint64 - description: QueryParamsResponse is the response type for the Query/Params RPC method. - cosmos.base.query.v1beta1.PageRequest: - type: object - properties: - key: - type: string - format: byte - 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. - offset: - type: string - format: uint64 - 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. - limit: - type: string - format: uint64 - description: >- - limit is the total number of results to be returned in the result - page. + If the embedded message type is well-known and has a custom + JSON - If left empty it will default to a value to be set by each app. - count_total: - type: boolean - description: >- - count_total is set to true to indicate that the result set should - include + representation, that representation will be embedded adding + a field - a count of the total number of items available for pagination in UIs. + `value` which holds the custom JSON in addition to the + `@type` - count_total is only respected when offset is used. It is ignored when - key + field. Example (for message [google.protobuf.Duration][]): - is set. - reverse: - type: boolean - description: >- - reverse is set to true if results are to be returned in the descending - order. + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + tags: + - Query + /interchain_security/ccv/provider/consumer_genesis/{chain_id}: + get: + summary: >- + ConsumerGenesis queries the genesis state needed to start a consumer + chain + whose proposal has been accepted + operationId: InterchainSecurityCcvProviderV1QueryConsumerGenesis + responses: + '200': + description: A successful response. + schema: + type: object + properties: + genesis_state: + type: object + properties: + params: + type: object + properties: + enabled: + type: boolean + title: >- + TODO: Remove enabled flag and find a better way to + setup integration tests - Since: cosmos-sdk 0.43 - description: |- - message SomeRequest { - Foo some_parameter = 1; - PageRequest pagination = 2; - } - title: |- - PageRequest is to be embedded in gRPC request messages for efficient - pagination. Ex: - cosmos.base.query.v1beta1.PageResponse: - type: object - properties: - next_key: - type: string - format: byte - title: |- - next_key is the key to be passed to PageRequest.key to - query the next page most efficiently - total: - type: string - format: uint64 - title: |- - total is total number of results available if PageRequest.count_total - was set, its value is undefined otherwise - description: |- - PageResponse is to be embedded in gRPC response messages where the - corresponding request message has used PageRequest. + See: + https://github.com/cosmos/interchain-security/issues/339 + blocks_per_distribution_transmission: + type: string + format: int64 + description: >- + ///////////////////// - message SomeResponse { - repeated Bar results = 1; - PageResponse page = 2; - } - cosmos.authz.v1beta1.Grant: - type: object - properties: - authorization: - type: object - properties: - '@type': - type: string - description: >- - A URL/resource name that uniquely identifies the type of the - serialized + Distribution Params - protocol buffer message. This string must contain at least + Number of blocks between ibc-token-transfers from the + consumer chain to - one "/" character. The last segment of the URL's path must - represent + the provider chain. Note that at this transmission + event a fraction of - the fully qualified name of the type (as in + the accumulated tokens are divided and sent consumer + redistribution - `path/google.protobuf.Duration`). The name should be in a - canonical form + address. + distribution_transmission_channel: + type: string + description: >- + Channel, and provider-chain receiving address to send + distribution token - (e.g., leading "." is not accepted). + transfers over. These parameters is auto-set during + the consumer <-> + provider handshake procedure. + provider_fee_pool_addr_str: + type: string + ccv_timeout_period: + type: string + title: >- + Sent CCV related IBC packets will timeout after this + duration + transfer_timeout_period: + type: string + title: >- + Sent transfer related IBC packets will timeout after + this duration + consumer_redistribution_fraction: + type: string + description: >- + The fraction of tokens allocated to the consumer + redistribution address - In practice, teams usually precompile into the binary all types - that they + during distribution events. The fraction is a string + representing a - expect it to use in the context of Any. However, for URLs which - use the + decimal number. For example "0.75" would represent + 75%. + historical_entries: + type: string + format: int64 + description: >- + The number of historical info entries to persist in + store. - scheme `http`, `https`, or no scheme, one can optionally set up a - type + This param is a part of the cosmos sdk staking module. + In the case of - server that maps type URLs to message definitions as follows: + a ccv enabled consumer chain, the ccv module acts as + the staking module. + unbonding_period: + type: string + description: >- + Unbonding period for the consumer, + which should be smaller than that of the provider in + general. + soft_opt_out_threshold: + type: string + title: >- + The threshold for the percentage of validators at the + bottom of the set who - * If no scheme is provided, `https` is assumed. - - * An HTTP GET on the URL must yield a [google.protobuf.Type][] - value in binary format, or produce an error. - * Applications are allowed to cache lookup results based on the - URL, or have them precompiled into a binary to avoid any - lookup. Therefore, binary compatibility needs to be preserved - on changes to types. (Use versioned type names to manage - breaking changes.) - - Note: this functionality is not currently available in the - official - - protobuf release, and it is not used for type URLs beginning with - - type.googleapis.com. - - - Schemes other than `http`, `https` (or the empty scheme) might be - - used with implementation specific semantics. - additionalProperties: {} - description: >- - `Any` contains an arbitrary serialized protocol buffer message along - with a - - URL that describes the type of the serialized message. + can opt out of running the consumer chain without + being punished. For example, a + value of 0.05 means that the validators in the bottom + 5% of the set can opt out + title: Params defines the parameters for CCV consumer module + provider_client_id: + type: string + description: empty for a new chain, filled in on restart. + provider_channel_id: + type: string + description: empty for a new chain, filled in on restart. + new_chain: + type: boolean + description: true for new chain GenesisState, false for chain restart. + provider_client_state: + description: >- + ProviderClientState filled in on new chain, nil on + restart. + type: object + properties: + chain_id: + type: string + trust_level: + type: object + properties: + numerator: + type: string + format: uint64 + denominator: + type: string + format: uint64 + description: >- + Fraction defines the protobuf message type for + tmmath.Fraction that only - Protobuf library provides support to pack/unpack Any values in the - form + supports positive values. + trusting_period: + type: string + title: >- + duration of the period since the LastestTimestamp + during which the - of utility functions or additional generated methods of the Any type. + submitted headers are valid for upgrade + unbonding_period: + type: string + title: duration of the staking unbonding period + max_clock_drift: + type: string + description: >- + defines how much new (untrusted) header's Time can + drift into the future. + frozen_height: + title: >- + Block height when the client was frozen due to a + misbehaviour + type: object + properties: + revision_number: + type: string + format: uint64 + title: the revision that the client is currently on + revision_height: + type: string + format: uint64 + title: the height within the given revision + description: >- + Normally the RevisionHeight is incremented at each + height while keeping + RevisionNumber the same. However some consensus + algorithms may choose to - Example 1: Pack and unpack a message in C++. + reset the height in certain conditions e.g. hard + forks, state-machine - Foo foo = ...; - Any any; - any.PackFrom(foo); - ... - if (any.UnpackTo(&foo)) { - ... - } + breaking changes In these cases, the RevisionNumber is + incremented so that - Example 2: Pack and unpack a message in Java. + height continues to be monitonically increasing even + as the RevisionHeight - Foo foo = ...; - Any any = Any.pack(foo); - ... - if (any.is(Foo.class)) { - foo = any.unpack(Foo.class); - } + gets reset + latest_height: + title: Latest height the client was updated to + type: object + properties: + revision_number: + type: string + format: uint64 + title: the revision that the client is currently on + revision_height: + type: string + format: uint64 + title: the height within the given revision + description: >- + Normally the RevisionHeight is incremented at each + height while keeping - Example 3: Pack and unpack a message in Python. + RevisionNumber the same. However some consensus + algorithms may choose to - foo = Foo(...) - any = Any() - any.Pack(foo) - ... - if any.Is(Foo.DESCRIPTOR): - any.Unpack(foo) - ... + reset the height in certain conditions e.g. hard + forks, state-machine - Example 4: Pack and unpack a message in Go + breaking changes In these cases, the RevisionNumber is + incremented so that - foo := &pb.Foo{...} - any, err := anypb.New(foo) - if err != nil { - ... - } - ... - foo := &pb.Foo{} - if err := any.UnmarshalTo(foo); err != nil { - ... - } + height continues to be monitonically increasing even + as the RevisionHeight - The pack methods provided by protobuf library will by default use + gets reset + proof_specs: + type: array + items: + type: object + properties: + leaf_spec: + title: >- + any field in the ExistenceProof must be the same + as in this spec. - 'type.googleapis.com/full.type.name' as the type URL and the unpack + except Prefix, which is just the first bytes of + prefix (spec can be longer) + type: object + properties: + hash: + type: string + enum: + - NO_HASH + - SHA256 + - SHA512 + - KECCAK + - RIPEMD160 + - BITCOIN + - SHA512_256 + default: NO_HASH + title: >- + - NO_HASH: NO_HASH is the default if no data + passed. Note this is an illegal argument + some places. + - BITCOIN: ripemd160(sha256(x)) + prehash_key: + type: string + enum: + - NO_HASH + - SHA256 + - SHA512 + - KECCAK + - RIPEMD160 + - BITCOIN + - SHA512_256 + default: NO_HASH + title: >- + - NO_HASH: NO_HASH is the default if no data + passed. Note this is an illegal argument + some places. + - BITCOIN: ripemd160(sha256(x)) + prehash_value: + type: string + enum: + - NO_HASH + - SHA256 + - SHA512 + - KECCAK + - RIPEMD160 + - BITCOIN + - SHA512_256 + default: NO_HASH + title: >- + - NO_HASH: NO_HASH is the default if no data + passed. Note this is an illegal argument + some places. + - BITCOIN: ripemd160(sha256(x)) + length: + type: string + enum: + - NO_PREFIX + - VAR_PROTO + - VAR_RLP + - FIXED32_BIG + - FIXED32_LITTLE + - FIXED64_BIG + - FIXED64_LITTLE + - REQUIRE_32_BYTES + - REQUIRE_64_BYTES + default: NO_PREFIX + description: >- + - NO_PREFIX: NO_PREFIX don't include any + length info + - VAR_PROTO: VAR_PROTO uses protobuf (and go-amino) varint encoding of the length + - VAR_RLP: VAR_RLP uses rlp int encoding of the length + - FIXED32_BIG: FIXED32_BIG uses big-endian encoding of the length as a 32 bit integer + - FIXED32_LITTLE: FIXED32_LITTLE uses little-endian encoding of the length as a 32 bit integer + - FIXED64_BIG: FIXED64_BIG uses big-endian encoding of the length as a 64 bit integer + - FIXED64_LITTLE: FIXED64_LITTLE uses little-endian encoding of the length as a 64 bit integer + - REQUIRE_32_BYTES: REQUIRE_32_BYTES is like NONE, but will fail if the input is not exactly 32 bytes (sha256 output) + - REQUIRE_64_BYTES: REQUIRE_64_BYTES is like NONE, but will fail if the input is not exactly 64 bytes (sha512 output) + title: >- + * - methods only use the fully qualified type name after the last '/' + LengthOp defines how to process the key and + value of the LeafOp - in the type URL, for example "foo.bar.com/x/y.z" will yield type + to include length information. After + encoding the length with the given - name "y.z". + algorithm, the length will be prepended to + the key and value bytes. + (Each one with it's own encoded length) + prefix: + type: string + format: byte + description: >- + prefix is a fixed bytes that may optionally + be included at the beginning to + differentiate + a leaf node from an inner node. + description: >- + * - JSON + LeafOp represents the raw key-value data we wish + to prove, and - ==== + must be flexible to represent the internal + transformation from - The JSON representation of an `Any` value uses the regular + the original key-value pairs into the basis + hash, for many existing - representation of the deserialized, embedded message, with an + merkle trees. - additional field `@type` which contains the type URL. Example: - package google.profile; - message Person { - string first_name = 1; - string last_name = 2; - } + key and value are passed in. So that the + signature of this operation is: - { - "@type": "type.googleapis.com/google.profile.Person", - "firstName": , - "lastName": - } + leafOp(key, value) -> output - If the embedded message type is well-known and has a custom JSON - representation, that representation will be embedded adding a field + To process this, first prehash the keys and + values if needed (ANY means no hash in this + case): - `value` which holds the custom JSON in addition to the `@type` + hkey = prehashKey(key) - field. Example (for message [google.protobuf.Duration][]): + hvalue = prehashValue(value) - { - "@type": "type.googleapis.com/google.protobuf.Duration", - "value": "1.212s" - } - expiration: - type: string - format: date-time - description: |- - Grant gives permissions to execute - the provide method with expiration time. - cosmos.authz.v1beta1.GrantAuthorization: - type: object - properties: - granter: - type: string - grantee: - type: string - authorization: - type: object - properties: - '@type': - type: string - description: >- - A URL/resource name that uniquely identifies the type of the - serialized - protocol buffer message. This string must contain at least + Then combine the bytes, and hash it - one "/" character. The last segment of the URL's path must - represent + output = hash(prefix || length(hkey) || hkey || + length(hvalue) || hvalue) + inner_spec: + type: object + properties: + child_order: + type: array + items: + type: integer + format: int32 + title: >- + Child order is the ordering of the children + node, must count from 0 - the fully qualified name of the type (as in + iavl tree is [0, 1] (left then right) - `path/google.protobuf.Duration`). The name should be in a - canonical form + merk is [0, 2, 1] (left, right, here) + child_size: + type: integer + format: int32 + min_prefix_length: + type: integer + format: int32 + max_prefix_length: + type: integer + format: int32 + empty_child: + type: string + format: byte + title: >- + empty child is the prehash image that is + used when one child is nil (eg. 20 bytes of + 0) + hash: + type: string + enum: + - NO_HASH + - SHA256 + - SHA512 + - KECCAK + - RIPEMD160 + - BITCOIN + - SHA512_256 + default: NO_HASH + title: >- + - NO_HASH: NO_HASH is the default if no data + passed. Note this is an illegal argument + some places. + - BITCOIN: ripemd160(sha256(x)) + description: >- + InnerSpec contains all store-specific structure + info to determine if two proofs from a - (e.g., leading "." is not accepted). + given store are neighbors. - In practice, teams usually precompile into the binary all types - that they + This enables: - expect it to use in the context of Any. However, for URLs which - use the - scheme `http`, `https`, or no scheme, one can optionally set up a - type + isLeftMost(spec: InnerSpec, op: InnerOp) - server that maps type URLs to message definitions as follows: + isRightMost(spec: InnerSpec, op: InnerOp) + isLeftNeighbor(spec: InnerSpec, left: InnerOp, + right: InnerOp) + max_depth: + type: integer + format: int32 + title: >- + max_depth (if > 0) is the maximum number of + InnerOps allowed (mainly for fixed-depth tries) + min_depth: + type: integer + format: int32 + title: >- + min_depth (if > 0) is the minimum number of + InnerOps allowed (mainly for fixed-depth tries) + description: >- + * - * If no scheme is provided, `https` is assumed. + ProofSpec defines what the expected parameters are + for a given proof type. - * An HTTP GET on the URL must yield a [google.protobuf.Type][] - value in binary format, or produce an error. - * Applications are allowed to cache lookup results based on the - URL, or have them precompiled into a binary to avoid any - lookup. Therefore, binary compatibility needs to be preserved - on changes to types. (Use versioned type names to manage - breaking changes.) + This can be stored in the client and used to + validate any incoming proofs. - Note: this functionality is not currently available in the - official - protobuf release, and it is not used for type URLs beginning with + verify(ProofSpec, Proof) -> Proof | Error - type.googleapis.com. + As demonstrated in tests, if we don't fix the + algorithm used to calculate the - Schemes other than `http`, `https` (or the empty scheme) might be + LeafHash for a given tree, there are many possible + key-value pairs that can - used with implementation specific semantics. - additionalProperties: {} - description: >- - `Any` contains an arbitrary serialized protocol buffer message along - with a + generate a given hash (by interpretting the preimage + differently). - URL that describes the type of the serialized message. + We need this for proper security, requires client + knows a priori what + tree format server uses. But not in code, rather a + configuration object. + title: >- + Proof specifications used in verifying counterparty + state + upgrade_path: + type: array + items: + type: string + title: >- + Path at which next upgraded client will be committed. - Protobuf library provides support to pack/unpack Any values in the - form + Each element corresponds to the key for a single + CommitmentProof in the - of utility functions or additional generated methods of the Any type. + chained proof. NOTE: ClientState must stored under + `{upgradePath}/{upgradeHeight}/clientState` + ConsensusState must be stored - Example 1: Pack and unpack a message in C++. + under `{upgradepath}/{upgradeHeight}/consensusState` + For SDK chains using - Foo foo = ...; - Any any; - any.PackFrom(foo); - ... - if (any.UnpackTo(&foo)) { - ... - } + the default upgrade module, upgrade_path should be + []string{"upgrade", - Example 2: Pack and unpack a message in Java. + "upgradedIBCState"}` + allow_update_after_expiry: + type: boolean + title: allow_update_after_expiry is deprecated + allow_update_after_misbehaviour: + type: boolean + title: allow_update_after_misbehaviour is deprecated + provider_consensus_state: + description: >- + ProviderConsensusState filled in on new chain, nil on + restart. + type: object + properties: + timestamp: + type: string + format: date-time + description: >- + timestamp that corresponds to the block height in + which the ConsensusState - Foo foo = ...; - Any any = Any.pack(foo); - ... - if (any.is(Foo.class)) { - foo = any.unpack(Foo.class); - } - - Example 3: Pack and unpack a message in Python. - - foo = Foo(...) - any = Any() - any.Pack(foo) - ... - if any.Is(Foo.DESCRIPTOR): - any.Unpack(foo) - ... - - Example 4: Pack and unpack a message in Go - - foo := &pb.Foo{...} - any, err := anypb.New(foo) - if err != nil { - ... - } - ... - foo := &pb.Foo{} - if err := any.UnmarshalTo(foo); err != nil { - ... - } - - The pack methods provided by protobuf library will by default use - - 'type.googleapis.com/full.type.name' as the type URL and the unpack - - methods only use the fully qualified type name after the last '/' - - in the type URL, for example "foo.bar.com/x/y.z" will yield type - - name "y.z". + was stored. + root: + title: commitment root (i.e app hash) + type: object + properties: + hash: + type: string + format: byte + description: >- + MerkleRoot defines a merkle root hash. + In the Cosmos SDK, the AppHash of a block header + becomes the root. + next_validators_hash: + type: string + format: byte + maturing_packets: + type: array + items: + type: object + properties: + vscId: + type: string + format: uint64 + maturity_time: + type: string + format: date-time + title: >- + MaturingVSCPacket contains the maturing time of a + received VSCPacket + description: MaturingPackets nil on new chain, filled in on restart. + initial_val_set: + type: array + items: + type: object + properties: + pub_key: + type: object + properties: + ed25519: + type: string + format: byte + secp256k1: + type: string + format: byte + title: >- + PublicKey defines the keys available for use with + Validators + power: + type: string + format: int64 + title: ValidatorUpdate + description: InitialValset filled in on new chain and on restart. + height_to_valset_update_id: + type: array + items: + type: object + properties: + height: + type: string + format: uint64 + valset_update_id: + type: string + format: uint64 + title: >- + HeightValsetUpdateID defines the genesis information for + the mapping + of each block height to a valset update id + description: >- + HeightToValsetUpdateId nil on new chain, filled in on + restart. + outstanding_downtime_slashing: + type: array + items: + type: object + properties: + validator_consensus_address: + type: string + description: >- + OutstandingDowntime defines the genesis information for + each validator - JSON + flagged with an outstanding downtime slashing. + description: >- + OutstandingDowntimes nil on new chain, filled in on + restart. + pending_consumer_packets: + description: >- + PendingConsumerPackets nil on new chain, filled in on + restart. + type: object + properties: + list: + type: array + items: + type: object + properties: + type: + type: string + enum: + - CONSUMER_PACKET_TYPE_UNSPECIFIED + - CONSUMER_PACKET_TYPE_SLASH + - CONSUMER_PACKET_TYPE_VSCM + default: CONSUMER_PACKET_TYPE_UNSPECIFIED + description: >- + ConsumerPacketType indicates interchain security + specific packet types. - ==== + - CONSUMER_PACKET_TYPE_UNSPECIFIED: UNSPECIFIED packet type + - CONSUMER_PACKET_TYPE_SLASH: Slash packet + - CONSUMER_PACKET_TYPE_VSCM: VSCMatured packet + slashPacketData: + type: object + properties: + validator: + type: object + properties: + address: + type: string + format: byte + title: The first 20 bytes of SHA256(public key) + power: + type: string + format: int64 + description: The voting power + title: >- + PubKey pub_key = 2 + [(gogoproto.nullable)=false]; + title: Validator + valset_update_id: + type: string + format: uint64 + title: >- + map to the infraction block height on the + provider + infraction: + title: >- + tell if the slashing is for a downtime or a + double-signing infraction + type: string + enum: + - INFRACTION_UNSPECIFIED + - INFRACTION_DOUBLE_SIGN + - INFRACTION_DOWNTIME + default: INFRACTION_UNSPECIFIED + description: >- + Infraction indicates the infraction a + validator commited. - The JSON representation of an `Any` value uses the regular + - INFRACTION_UNSPECIFIED: UNSPECIFIED defines an empty infraction. + - INFRACTION_DOUBLE_SIGN: DOUBLE_SIGN defines a validator that double-signs a block. + - INFRACTION_DOWNTIME: DOWNTIME defines a validator that missed signing too many blocks. + description: >- + This packet is sent from the consumer chain to + the provider chain - representation of the deserialized, embedded message, with an + to request the slashing of a validator as a + result of an infraction - additional field `@type` which contains the type URL. Example: + committed on the consumer chain. + vscMaturedPacketData: + type: object + properties: + valset_update_id: + type: string + format: uint64 + title: >- + the id of the VSC packet that reached + maturity + description: >- + This packet is sent from the consumer chain to + the provider chain - package google.profile; - message Person { - string first_name = 1; - string last_name = 2; - } + to notify that a VSC packet reached maturity on + the consumer chain. + title: >- + ConsumerPacketData contains a consumer packet data + and a type tag + last_transmission_block_height: + description: >- + LastTransmissionBlockHeight nil on new chain, filled in on + restart. + type: object + properties: + height: + type: string + format: int64 + title: >- + LastTransmissionBlockHeight is the last time validator + holding - { - "@type": "type.googleapis.com/google.profile.Person", - "firstName": , - "lastName": - } + pools were transmitted to the provider chain + preCCV: + type: boolean + title: >- + flag indicating whether the consumer CCV module starts in + pre-CCV state + title: GenesisState defines the CCV consumer chain genesis state + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type of + the serialized - If the embedded message type is well-known and has a custom JSON + protocol buffer message. This string must contain at + least - representation, that representation will be embedded adding a field + one "/" character. The last segment of the URL's path + must represent - `value` which holds the custom JSON in addition to the `@type` + the fully qualified name of the type (as in - field. Example (for message [google.protobuf.Duration][]): + `path/google.protobuf.Duration`). The name should be in + a canonical form - { - "@type": "type.googleapis.com/google.protobuf.Duration", - "value": "1.212s" - } - expiration: - type: string - format: date-time - description: 'Since: cosmos-sdk 0.45.2' - title: >- - GrantAuthorization extends a grant with both the addresses of the grantee - and granter. + (e.g., leading "." is not accepted). - It is used in genesis.proto and query.proto - cosmos.authz.v1beta1.MsgExecResponse: - type: object - properties: - results: - type: array - items: - type: string - format: byte - description: MsgExecResponse defines the Msg/MsgExecResponse response type. - cosmos.authz.v1beta1.MsgGrantResponse: - type: object - description: MsgGrantResponse defines the Msg/MsgGrant response type. - cosmos.authz.v1beta1.MsgRevokeResponse: - type: object - description: MsgRevokeResponse defines the Msg/MsgRevokeResponse response type. - cosmos.authz.v1beta1.QueryGranteeGrantsResponse: - type: object - properties: - grants: - type: array - items: - type: object - properties: - granter: - type: string - grantee: - type: string - authorization: - type: object - properties: - '@type': - type: string - description: >- - A URL/resource name that uniquely identifies the type of the - serialized - protocol buffer message. This string must contain at least + In practice, teams usually precompile into the binary + all types that they - one "/" character. The last segment of the URL's path must - represent + expect it to use in the context of Any. However, for + URLs which use the - the fully qualified name of the type (as in + scheme `http`, `https`, or no scheme, one can optionally + set up a type - `path/google.protobuf.Duration`). The name should be in a - canonical form + server that maps type URLs to message definitions as + follows: - (e.g., leading "." is not accepted). + * If no scheme is provided, `https` is assumed. - In practice, teams usually precompile into the binary all - types that they + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based + on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) - expect it to use in the context of Any. However, for URLs - which use the + Note: this functionality is not currently available in + the official - scheme `http`, `https`, or no scheme, one can optionally set - up a type + protobuf release, and it is not used for type URLs + beginning with - server that maps type URLs to message definitions as - follows: + type.googleapis.com. - * If no scheme is provided, `https` is assumed. + Schemes other than `http`, `https` (or the empty scheme) + might be - * An HTTP GET on the URL must yield a - [google.protobuf.Type][] - value in binary format, or produce an error. - * Applications are allowed to cache lookup results based on - the - URL, or have them precompiled into a binary to avoid any - lookup. Therefore, binary compatibility needs to be preserved - on changes to types. (Use versioned type names to manage - breaking changes.) + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer + message along with a - Note: this functionality is not currently available in the - official + URL that describes the type of the serialized message. - protobuf release, and it is not used for type URLs beginning - with - type.googleapis.com. + Protobuf library provides support to pack/unpack Any values + in the form + of utility functions or additional generated methods of the + Any type. - Schemes other than `http`, `https` (or the empty scheme) - might be - used with implementation specific semantics. - additionalProperties: {} - description: >- - `Any` contains an arbitrary serialized protocol buffer message - along with a + Example 1: Pack and unpack a message in C++. - URL that describes the type of the serialized message. + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + Example 2: Pack and unpack a message in Java. - Protobuf library provides support to pack/unpack Any values in - the form + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } - of utility functions or additional generated methods of the Any - type. + Example 3: Pack and unpack a message in Python. + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... - Example 1: Pack and unpack a message in C++. + Example 4: Pack and unpack a message in Go - Foo foo = ...; - Any any; - any.PackFrom(foo); - ... - if (any.UnpackTo(&foo)) { - ... - } + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } - Example 2: Pack and unpack a message in Java. + The pack methods provided by protobuf library will by + default use - Foo foo = ...; - Any any = Any.pack(foo); - ... - if (any.is(Foo.class)) { - foo = any.unpack(Foo.class); - } + 'type.googleapis.com/full.type.name' as the type URL and the + unpack - Example 3: Pack and unpack a message in Python. + methods only use the fully qualified type name after the + last '/' - foo = Foo(...) - any = Any() - any.Pack(foo) - ... - if any.Is(Foo.DESCRIPTOR): - any.Unpack(foo) - ... + in the type URL, for example "foo.bar.com/x/y.z" will yield + type - Example 4: Pack and unpack a message in Go + name "y.z". - foo := &pb.Foo{...} - any, err := anypb.New(foo) - if err != nil { - ... - } - ... - foo := &pb.Foo{} - if err := any.UnmarshalTo(foo); err != nil { - ... - } - The pack methods provided by protobuf library will by default - use - 'type.googleapis.com/full.type.name' as the type URL and the - unpack + JSON - methods only use the fully qualified type name after the last - '/' + ==== - in the type URL, for example "foo.bar.com/x/y.z" will yield type + The JSON representation of an `Any` value uses the regular - name "y.z". + representation of the deserialized, embedded message, with + an + additional field `@type` which contains the type URL. + Example: + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } - JSON + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } - ==== + If the embedded message type is well-known and has a custom + JSON - The JSON representation of an `Any` value uses the regular + representation, that representation will be embedded adding + a field - representation of the deserialized, embedded message, with an + `value` which holds the custom JSON in addition to the + `@type` - additional field `@type` which contains the type URL. Example: + field. Example (for message [google.protobuf.Duration][]): - package google.profile; - message Person { - string first_name = 1; - string last_name = 2; - } + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + parameters: + - name: chain_id + in: path + required: true + type: string + tags: + - Query + /interchain_security/ccv/provider/pending_consumer_packets: + get: + summary: >- + QueryThrottledConsumerPacketData returns a list of pending packet data + instances - { - "@type": "type.googleapis.com/google.profile.Person", - "firstName": , - "lastName": - } - - If the embedded message type is well-known and has a custom JSON - - representation, that representation will be embedded adding a - field - - `value` which holds the custom JSON in addition to the `@type` - - field. Example (for message [google.protobuf.Duration][]): - - { - "@type": "type.googleapis.com/google.protobuf.Duration", - "value": "1.212s" - } - expiration: - type: string - format: date-time - description: 'Since: cosmos-sdk 0.45.2' - title: >- - GrantAuthorization extends a grant with both the addresses of the - grantee and granter. - - It is used in genesis.proto and query.proto - description: grants is a list of grants granted to the grantee. - pagination: - description: pagination defines an pagination for the response. - type: object - properties: - next_key: - type: string - format: byte - title: |- - next_key is the key to be passed to PageRequest.key to - query the next page most efficiently - total: - type: string - format: uint64 - title: >- - total is total number of results available if - PageRequest.count_total - - was set, its value is undefined otherwise - description: >- - QueryGranteeGrantsResponse is the response type for the - Query/GranteeGrants RPC method. - cosmos.authz.v1beta1.QueryGranterGrantsResponse: - type: object - properties: - grants: - type: array - items: - type: object - properties: - granter: - type: string - grantee: - type: string - authorization: - type: object - properties: - '@type': - type: string - description: >- - A URL/resource name that uniquely identifies the type of the - serialized - - protocol buffer message. This string must contain at least + (slash packet and vsc matured) for a single consumer chain + operationId: InterchainSecurityCcvProviderV1QueryThrottledConsumerPacketData + responses: + '200': + description: A successful response. + schema: + type: object + properties: + chain_id: + type: string + size: + type: string + format: uint64 + packetDataInstances: + type: array + items: + type: object + properties: + slash_packet: + type: object + properties: + validator: + type: object + properties: + address: + type: string + format: byte + title: The first 20 bytes of SHA256(public key) + power: + type: string + format: int64 + description: The voting power + title: PubKey pub_key = 2 [(gogoproto.nullable)=false]; + title: Validator + valset_update_id: + type: string + format: uint64 + title: map to the infraction block height on the provider + infraction: + title: >- + tell if the slashing is for a downtime or a + double-signing infraction + type: string + enum: + - INFRACTION_UNSPECIFIED + - INFRACTION_DOUBLE_SIGN + - INFRACTION_DOWNTIME + default: INFRACTION_UNSPECIFIED + description: >- + Infraction indicates the infraction a validator + commited. - one "/" character. The last segment of the URL's path must - represent + - INFRACTION_UNSPECIFIED: UNSPECIFIED defines an empty infraction. + - INFRACTION_DOUBLE_SIGN: DOUBLE_SIGN defines a validator that double-signs a block. + - INFRACTION_DOWNTIME: DOWNTIME defines a validator that missed signing too many blocks. + description: >- + This packet is sent from the consumer chain to the + provider chain - the fully qualified name of the type (as in + to request the slashing of a validator as a result of an + infraction - `path/google.protobuf.Duration`). The name should be in a - canonical form + committed on the consumer chain. + vsc_matured_packet: + type: object + properties: + valset_update_id: + type: string + format: uint64 + title: the id of the VSC packet that reached maturity + description: >- + This packet is sent from the consumer chain to the + provider chain - (e.g., leading "." is not accepted). + to notify that a VSC packet reached maturity on the + consumer chain. + title: >- + ThrottledPacketDataWrapper contains either SlashPacketData + or VSCMaturedPacketData + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type of + the serialized + protocol buffer message. This string must contain at + least - In practice, teams usually precompile into the binary all - types that they + one "/" character. The last segment of the URL's path + must represent - expect it to use in the context of Any. However, for URLs - which use the + the fully qualified name of the type (as in - scheme `http`, `https`, or no scheme, one can optionally set - up a type + `path/google.protobuf.Duration`). The name should be in + a canonical form - server that maps type URLs to message definitions as - follows: + (e.g., leading "." is not accepted). - * If no scheme is provided, `https` is assumed. + In practice, teams usually precompile into the binary + all types that they - * An HTTP GET on the URL must yield a - [google.protobuf.Type][] - value in binary format, or produce an error. - * Applications are allowed to cache lookup results based on - the - URL, or have them precompiled into a binary to avoid any - lookup. Therefore, binary compatibility needs to be preserved - on changes to types. (Use versioned type names to manage - breaking changes.) + expect it to use in the context of Any. However, for + URLs which use the - Note: this functionality is not currently available in the - official + scheme `http`, `https`, or no scheme, one can optionally + set up a type - protobuf release, and it is not used for type URLs beginning - with + server that maps type URLs to message definitions as + follows: - type.googleapis.com. + * If no scheme is provided, `https` is assumed. - Schemes other than `http`, `https` (or the empty scheme) - might be + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based + on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) - used with implementation specific semantics. - additionalProperties: {} - description: >- - `Any` contains an arbitrary serialized protocol buffer message - along with a + Note: this functionality is not currently available in + the official - URL that describes the type of the serialized message. + protobuf release, and it is not used for type URLs + beginning with + type.googleapis.com. - Protobuf library provides support to pack/unpack Any values in - the form - of utility functions or additional generated methods of the Any - type. + Schemes other than `http`, `https` (or the empty scheme) + might be + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer + message along with a - Example 1: Pack and unpack a message in C++. + URL that describes the type of the serialized message. - Foo foo = ...; - Any any; - any.PackFrom(foo); - ... - if (any.UnpackTo(&foo)) { - ... - } - Example 2: Pack and unpack a message in Java. + Protobuf library provides support to pack/unpack Any values + in the form - Foo foo = ...; - Any any = Any.pack(foo); - ... - if (any.is(Foo.class)) { - foo = any.unpack(Foo.class); - } + of utility functions or additional generated methods of the + Any type. - Example 3: Pack and unpack a message in Python. - foo = Foo(...) - any = Any() - any.Pack(foo) - ... - if any.Is(Foo.DESCRIPTOR): - any.Unpack(foo) - ... + Example 1: Pack and unpack a message in C++. - Example 4: Pack and unpack a message in Go + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } - foo := &pb.Foo{...} - any, err := anypb.New(foo) - if err != nil { - ... - } - ... - foo := &pb.Foo{} - if err := any.UnmarshalTo(foo); err != nil { - ... - } + Example 2: Pack and unpack a message in Java. - The pack methods provided by protobuf library will by default - use + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } - 'type.googleapis.com/full.type.name' as the type URL and the - unpack + Example 3: Pack and unpack a message in Python. - methods only use the fully qualified type name after the last - '/' + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... - in the type URL, for example "foo.bar.com/x/y.z" will yield type + Example 4: Pack and unpack a message in Go - name "y.z". + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + The pack methods provided by protobuf library will by + default use + 'type.googleapis.com/full.type.name' as the type URL and the + unpack - JSON + methods only use the fully qualified type name after the + last '/' - ==== + in the type URL, for example "foo.bar.com/x/y.z" will yield + type - The JSON representation of an `Any` value uses the regular + name "y.z". - representation of the deserialized, embedded message, with an - additional field `@type` which contains the type URL. Example: - package google.profile; - message Person { - string first_name = 1; - string last_name = 2; - } + JSON - { - "@type": "type.googleapis.com/google.profile.Person", - "firstName": , - "lastName": - } + ==== - If the embedded message type is well-known and has a custom JSON + The JSON representation of an `Any` value uses the regular - representation, that representation will be embedded adding a - field + representation of the deserialized, embedded message, with + an - `value` which holds the custom JSON in addition to the `@type` + additional field `@type` which contains the type URL. + Example: - field. Example (for message [google.protobuf.Duration][]): + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } - { - "@type": "type.googleapis.com/google.protobuf.Duration", - "value": "1.212s" - } - expiration: - type: string - format: date-time - description: 'Since: cosmos-sdk 0.45.2' - title: >- - GrantAuthorization extends a grant with both the addresses of the - grantee and granter. + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } - It is used in genesis.proto and query.proto - description: grants is a list of grants granted by the granter. - pagination: - description: pagination defines an pagination for the response. - type: object - properties: - next_key: - type: string - format: byte - title: |- - next_key is the key to be passed to PageRequest.key to - query the next page most efficiently - total: - type: string - format: uint64 - title: >- - total is total number of results available if - PageRequest.count_total + If the embedded message type is well-known and has a custom + JSON - was set, its value is undefined otherwise - description: >- - QueryGranterGrantsResponse is the response type for the - Query/GranterGrants RPC method. - cosmos.authz.v1beta1.QueryGrantsResponse: - type: object - properties: - grants: - type: array - items: - type: object - properties: - authorization: - type: object - properties: - '@type': - type: string - description: >- - A URL/resource name that uniquely identifies the type of the - serialized + representation, that representation will be embedded adding + a field - protocol buffer message. This string must contain at least + `value` which holds the custom JSON in addition to the + `@type` - one "/" character. The last segment of the URL's path must - represent + field. Example (for message [google.protobuf.Duration][]): - the fully qualified name of the type (as in + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + parameters: + - name: chain_id + in: query + required: false + type: string + tags: + - Query + /interchain_security/ccv/provider/throttle_state: + get: + summary: >- + QueryThrottleState returns the main on-chain state relevant to currently + throttled slash packets + operationId: InterchainSecurityCcvProviderV1QueryThrottleState + responses: + '200': + description: A successful response. + schema: + type: object + properties: + slash_meter: + type: string + format: int64 + title: current slash_meter state + slash_meter_allowance: + type: string + format: int64 + description: >- + allowance of voting power units (int) that the slash meter is + given per replenish period - `path/google.protobuf.Duration`). The name should be in a - canonical form + this also serves as the max value for the meter. + next_replenish_candidate: + type: string + format: date-time + title: >- + next time the slash meter could potentially be replenished, + iff it's not full + packets: + type: array + items: + type: object + properties: + global_entry: + type: object + properties: + recv_time: + type: string + format: date-time + description: >- + Block time that slash packet was received by + provider chain. - (e.g., leading "." is not accepted). + This field is used for store key iteration ordering. + consumer_chain_id: + type: string + description: The consumer that sent a slash packet. + ibc_seq_num: + type: string + format: uint64 + description: >- + The IBC sequence number of the recv packet. + This field is used in the store key to ensure + uniqueness. + provider_val_cons_addr: + description: >- + The provider's consensus address of the validator + being slashed. - In practice, teams usually precompile into the binary all - types that they + This field is used to obtain validator power in + HandleThrottleQueues. - expect it to use in the context of Any. However, for URLs - which use the - scheme `http`, `https`, or no scheme, one can optionally set - up a type + This field is not used in the store key, but is + persisted in value bytes, see QueueGlobalSlashEntry. + type: object + properties: + address: + type: string + format: byte + title: >- + A validator's consensus address on the provider + chain + description: >- + A persisted queue entry indicating that a slash packet + data instance needs to be handled. - server that maps type URLs to message definitions as - follows: + This type belongs in the "global" queue, to coordinate + slash packet handling times between consumers. + data: + type: object + properties: + validator: + type: object + properties: + address: + type: string + format: byte + title: The first 20 bytes of SHA256(public key) + power: + type: string + format: int64 + description: The voting power + title: PubKey pub_key = 2 [(gogoproto.nullable)=false]; + title: Validator + valset_update_id: + type: string + format: uint64 + title: map to the infraction block height on the provider + infraction: + title: >- + tell if the slashing is for a downtime or a + double-signing infraction + type: string + enum: + - INFRACTION_UNSPECIFIED + - INFRACTION_DOUBLE_SIGN + - INFRACTION_DOWNTIME + default: INFRACTION_UNSPECIFIED + description: >- + Infraction indicates the infraction a validator + commited. + - INFRACTION_UNSPECIFIED: UNSPECIFIED defines an empty infraction. + - INFRACTION_DOUBLE_SIGN: DOUBLE_SIGN defines a validator that double-signs a block. + - INFRACTION_DOWNTIME: DOWNTIME defines a validator that missed signing too many blocks. + description: >- + This packet is sent from the consumer chain to the + provider chain - * If no scheme is provided, `https` is assumed. + to request the slashing of a validator as a result of an + infraction - * An HTTP GET on the URL must yield a - [google.protobuf.Type][] - value in binary format, or produce an error. - * Applications are allowed to cache lookup results based on - the - URL, or have them precompiled into a binary to avoid any - lookup. Therefore, binary compatibility needs to be preserved - on changes to types. (Use versioned type names to manage - breaking changes.) + committed on the consumer chain. + description: >- + A query wrapper type for the global entry and data relevant + to a throttled slash packet. + title: data relevant to currently throttled slash packets + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type of + the serialized - Note: this functionality is not currently available in the - official + protocol buffer message. This string must contain at + least - protobuf release, and it is not used for type URLs beginning - with + one "/" character. The last segment of the URL's path + must represent - type.googleapis.com. + the fully qualified name of the type (as in + `path/google.protobuf.Duration`). The name should be in + a canonical form - Schemes other than `http`, `https` (or the empty scheme) - might be + (e.g., leading "." is not accepted). - used with implementation specific semantics. - additionalProperties: {} - description: >- - `Any` contains an arbitrary serialized protocol buffer message - along with a - URL that describes the type of the serialized message. + In practice, teams usually precompile into the binary + all types that they + expect it to use in the context of Any. However, for + URLs which use the - Protobuf library provides support to pack/unpack Any values in - the form + scheme `http`, `https`, or no scheme, one can optionally + set up a type - of utility functions or additional generated methods of the Any - type. + server that maps type URLs to message definitions as + follows: - Example 1: Pack and unpack a message in C++. + * If no scheme is provided, `https` is assumed. - Foo foo = ...; - Any any; - any.PackFrom(foo); - ... - if (any.UnpackTo(&foo)) { - ... - } + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based + on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) - Example 2: Pack and unpack a message in Java. + Note: this functionality is not currently available in + the official - Foo foo = ...; - Any any = Any.pack(foo); - ... - if (any.is(Foo.class)) { - foo = any.unpack(Foo.class); - } + protobuf release, and it is not used for type URLs + beginning with - Example 3: Pack and unpack a message in Python. + type.googleapis.com. - foo = Foo(...) - any = Any() - any.Pack(foo) - ... - if any.Is(Foo.DESCRIPTOR): - any.Unpack(foo) - ... - Example 4: Pack and unpack a message in Go + Schemes other than `http`, `https` (or the empty scheme) + might be - foo := &pb.Foo{...} - any, err := anypb.New(foo) - if err != nil { - ... - } - ... - foo := &pb.Foo{} - if err := any.UnmarshalTo(foo); err != nil { - ... - } + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer + message along with a - The pack methods provided by protobuf library will by default - use + URL that describes the type of the serialized message. - 'type.googleapis.com/full.type.name' as the type URL and the - unpack - methods only use the fully qualified type name after the last - '/' + Protobuf library provides support to pack/unpack Any values + in the form - in the type URL, for example "foo.bar.com/x/y.z" will yield type + of utility functions or additional generated methods of the + Any type. - name "y.z". + Example 1: Pack and unpack a message in C++. + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } - JSON + Example 2: Pack and unpack a message in Java. - ==== + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } - The JSON representation of an `Any` value uses the regular + Example 3: Pack and unpack a message in Python. - representation of the deserialized, embedded message, with an + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... - additional field `@type` which contains the type URL. Example: + Example 4: Pack and unpack a message in Go - package google.profile; - message Person { - string first_name = 1; - string last_name = 2; - } + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } - { - "@type": "type.googleapis.com/google.profile.Person", - "firstName": , - "lastName": - } + The pack methods provided by protobuf library will by + default use - If the embedded message type is well-known and has a custom JSON + 'type.googleapis.com/full.type.name' as the type URL and the + unpack - representation, that representation will be embedded adding a - field + methods only use the fully qualified type name after the + last '/' - `value` which holds the custom JSON in addition to the `@type` + in the type URL, for example "foo.bar.com/x/y.z" will yield + type - field. Example (for message [google.protobuf.Duration][]): + name "y.z". - { - "@type": "type.googleapis.com/google.protobuf.Duration", - "value": "1.212s" - } - expiration: - type: string - format: date-time - description: |- - Grant gives permissions to execute - the provide method with expiration time. - description: authorizations is a list of grants granted for grantee by granter. - pagination: - description: pagination defines an pagination for the response. - type: object - properties: - next_key: - type: string - format: byte - title: |- - next_key is the key to be passed to PageRequest.key to - query the next page most efficiently - total: - type: string - format: uint64 - title: >- - total is total number of results available if - PageRequest.count_total - was set, its value is undefined otherwise - description: >- - QueryGrantsResponse is the response type for the Query/Authorizations RPC - method. - cosmos.bank.v1beta1.DenomUnit: - type: object - properties: - denom: - type: string - description: denom represents the string name of the given denom unit (e.g uatom). - exponent: - type: integer - format: int64 - description: >- - exponent represents power of 10 exponent that one must - raise the base_denom to in order to equal the given DenomUnit's denom + JSON - 1 denom = 1^exponent base_denom + ==== - (e.g. with a base_denom of uatom, one can create a DenomUnit of 'atom' - with + The JSON representation of an `Any` value uses the regular - exponent = 6, thus: 1 atom = 10^6 uatom). - aliases: - type: array - items: - type: string - title: aliases is a list of string aliases for the given denom - description: |- - DenomUnit represents a struct that describes a given - denomination unit of the basic token. - cosmos.bank.v1beta1.Input: - type: object - properties: - address: - type: string - coins: - type: array - items: - type: object - properties: - denom: - type: string - amount: - type: string - description: |- - Coin defines a token with a denomination and an amount. + representation of the deserialized, embedded message, with + an - NOTE: The amount field is an Int which implements the custom method - signatures required by gogoproto. - description: Input models transaction input. - cosmos.bank.v1beta1.Metadata: - type: object - properties: - description: - type: string - denom_units: - type: array - items: - type: object - properties: - denom: - type: string - description: >- - denom represents the string name of the given denom unit (e.g - uatom). - exponent: - type: integer - format: int64 - description: >- - exponent represents power of 10 exponent that one must + additional field `@type` which contains the type URL. + Example: - raise the base_denom to in order to equal the given DenomUnit's - denom + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } - 1 denom = 1^exponent base_denom + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } - (e.g. with a base_denom of uatom, one can create a DenomUnit of - 'atom' with + If the embedded message type is well-known and has a custom + JSON - exponent = 6, thus: 1 atom = 10^6 uatom). - aliases: - type: array - items: + representation, that representation will be embedded adding + a field + + `value` which holds the custom JSON in addition to the + `@type` + + field. Example (for message [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + tags: + - Query + /interchain_security/ccv/provider/validator_consumer_addr: + get: + summary: |- + QueryValidatorConsumerAddr queries the address + assigned by a validator for a consumer chain. + operationId: InterchainSecurityCcvProviderV1QueryValidatorConsumerAddr + responses: + '200': + description: A successful response. + schema: + type: object + properties: + consumer_address: type: string - title: aliases is a list of string aliases for the given denom - description: |- - DenomUnit represents a struct that describes a given - denomination unit of the basic token. - title: denom_units represents the list of DenomUnit's for a given coin - base: - type: string - description: >- - base represents the base denom (should be the DenomUnit with exponent - = 0). - display: - type: string + title: The address of the validator on the consumer chain + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type of + the serialized + + protocol buffer message. This string must contain at + least + + one "/" character. The last segment of the URL's path + must represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be in + a canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the binary + all types that they + + expect it to use in the context of Any. However, for + URLs which use the + + scheme `http`, `https`, or no scheme, one can optionally + set up a type + + server that maps type URLs to message definitions as + follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based + on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in + the official + + protobuf release, and it is not used for type URLs + beginning with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty scheme) + might be + + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer + message along with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any values + in the form + + of utility functions or additional generated methods of the + Any type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by + default use + + 'type.googleapis.com/full.type.name' as the type URL and the + unpack + + methods only use the fully qualified type name after the + last '/' + + in the type URL, for example "foo.bar.com/x/y.z" will yield + type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the regular + + representation of the deserialized, embedded message, with + an + + additional field `@type` which contains the type URL. + Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a custom + JSON + + representation, that representation will be embedded adding + a field + + `value` which holds the custom JSON in addition to the + `@type` + + field. Example (for message [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + parameters: + - name: chain_id + description: The id of the consumer chain + in: query + required: false + type: string + - name: provider_address + description: The consensus address of the validator on the provider chain + in: query + required: false + type: string + tags: + - Query + /interchain_security/ccv/provider/validator_provider_addr: + get: + summary: |- + QueryProviderAddr returns the provider chain validator + given a consumer chain validator address + operationId: InterchainSecurityCcvProviderV1QueryValidatorProviderAddr + responses: + '200': + description: A successful response. + schema: + type: object + properties: + provider_address: + type: string + title: The address of the validator on the provider chain + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type of + the serialized + + protocol buffer message. This string must contain at + least + + one "/" character. The last segment of the URL's path + must represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be in + a canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the binary + all types that they + + expect it to use in the context of Any. However, for + URLs which use the + + scheme `http`, `https`, or no scheme, one can optionally + set up a type + + server that maps type URLs to message definitions as + follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based + on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in + the official + + protobuf release, and it is not used for type URLs + beginning with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty scheme) + might be + + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer + message along with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any values + in the form + + of utility functions or additional generated methods of the + Any type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by + default use + + 'type.googleapis.com/full.type.name' as the type URL and the + unpack + + methods only use the fully qualified type name after the + last '/' + + in the type URL, for example "foo.bar.com/x/y.z" will yield + type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the regular + + representation of the deserialized, embedded message, with + an + + additional field `@type` which contains the type URL. + Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a custom + JSON + + representation, that representation will be embedded adding + a field + + `value` which holds the custom JSON in addition to the + `@type` + + field. Example (for message [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + parameters: + - name: chain_id + description: The id of the provider chain + in: query + required: false + type: string + - name: consumer_address + description: The consensus address of the validator on the consumer chain + in: query + required: false + type: string + tags: + - Query + /neutron/contractmanager/failures: + get: + summary: Queries a list of Failure items. + operationId: NeutronContractmanagerFailures + responses: + '200': + description: A successful response. + schema: + type: object + properties: + failures: + type: array + items: + type: object + properties: + channel_id: + type: string + title: ChannelId + address: + type: string + title: Address of the failed contract + id: + type: string + format: uint64 + title: id of the failure under specific address + ack_id: + type: string + format: uint64 + title: ACK id to restore + ack_type: + type: string + title: Acknowledgement type + description: >- + Failure message contains information about ACK failures and + can be used to + + replay ACK in case of requirement. + pagination: + type: object + properties: + next_key: + type: string + format: byte + 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. + total: + type: string + format: uint64 + title: >- + total is total number of results available if + PageRequest.count_total + + was set, its value is undefined otherwise + 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; + } + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + additionalProperties: {} + parameters: + - name: address + in: query + required: false + type: string + - name: pagination.key + 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. + in: query + required: false + type: string + format: byte + - name: pagination.offset + 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. + in: query + required: false + type: string + format: uint64 + - name: pagination.limit + 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. + in: query + required: false + type: string + format: uint64 + - name: pagination.count_total + 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 + required: false + type: boolean + - name: pagination.reverse + description: >- + reverse is set to true if results are to be returned in the + descending order. + + + Since: cosmos-sdk 0.43 + in: query + required: false + type: boolean + tags: + - Query + /neutron/contractmanager/failures/{address}: + get: + summary: Queries a Failure by address. + operationId: NeutronContractmanagerAddressFailures + responses: + '200': + description: A successful response. + schema: + type: object + properties: + failures: + type: array + items: + type: object + properties: + channel_id: + type: string + title: ChannelId + address: + type: string + title: Address of the failed contract + id: + type: string + format: uint64 + title: id of the failure under specific address + ack_id: + type: string + format: uint64 + title: ACK id to restore + ack_type: + type: string + title: Acknowledgement type + description: >- + Failure message contains information about ACK failures and + can be used to + + replay ACK in case of requirement. + pagination: + type: object + properties: + next_key: + type: string + format: byte + 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. + total: + type: string + format: uint64 + title: >- + total is total number of results available if + PageRequest.count_total + + was set, its value is undefined otherwise + 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; + } + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + additionalProperties: {} + parameters: + - name: address + in: path + required: true + type: string + - name: pagination.key + 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. + in: query + required: false + type: string + format: byte + - name: pagination.offset + 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. + in: query + required: false + type: string + format: uint64 + - name: pagination.limit + 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. + in: query + required: false + type: string + format: uint64 + - name: pagination.count_total + 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 + required: false + type: boolean + - name: pagination.reverse + description: >- + reverse is set to true if results are to be returned in the + descending order. + + + Since: cosmos-sdk 0.43 + in: query + required: false + type: boolean + tags: + - Query + /neutron/contractmanager/params: + get: + summary: Parameters queries the parameters of the module. + operationId: NeutronContractmanagerParams + responses: + '200': + description: A successful response. + schema: + type: object + properties: + params: + description: params holds all the parameters of this module. + type: object + description: >- + QueryParamsResponse is response type for the Query/Params RPC + method. + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + additionalProperties: {} + tags: + - Query + /neutron/cron/params: + get: + summary: Queries the parameters of the module. + operationId: NeutronCronParams + responses: + '200': + description: A successful response. + schema: + type: object + properties: + params: + description: params holds all the parameters of this module. + type: object + properties: + security_address: + type: string + title: Security address that can remove schedules + limit: + type: string + format: uint64 + title: Limit of schedules executed in one block + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + additionalProperties: {} + tags: + - Query + /neutron/cron/schedule: + get: + summary: Queries a list of Schedule items. + operationId: NeutronCronSchedules + responses: + '200': + description: A successful response. + schema: + type: object + properties: + schedules: + type: array + items: + type: object + properties: + name: + type: string + title: Name of schedule + period: + type: string + format: uint64 + title: Period in blocks + msgs: + type: array + items: + type: object + properties: + contract: + type: string + title: Contract is the address of the smart contract + msg: + type: string + title: >- + Msg is json encoded message to be passed to the + contract + title: Msgs that will be executed every period amount of time + last_execute_height: + type: string + format: uint64 + title: Last execution's block height + pagination: + type: object + properties: + next_key: + type: string + format: byte + 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. + total: + type: string + format: uint64 + title: >- + total is total number of results available if + PageRequest.count_total + + was set, its value is undefined otherwise + 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; + } + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + additionalProperties: {} + parameters: + - name: pagination.key + 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. + in: query + required: false + type: string + format: byte + - name: pagination.offset + 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. + in: query + required: false + type: string + format: uint64 + - name: pagination.limit + 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. + in: query + required: false + type: string + format: uint64 + - name: pagination.count_total + 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 + required: false + type: boolean + - name: pagination.reverse + description: >- + reverse is set to true if results are to be returned in the + descending order. + + + Since: cosmos-sdk 0.43 + in: query + required: false + type: boolean + tags: + - Query + /neutron/cron/schedule/{name}: + get: + summary: Queries a Schedule by name. + operationId: NeutronCronSchedule + responses: + '200': + description: A successful response. + schema: + type: object + properties: + schedule: + type: object + properties: + name: + type: string + title: Name of schedule + period: + type: string + format: uint64 + title: Period in blocks + msgs: + type: array + items: + type: object + properties: + contract: + type: string + title: Contract is the address of the smart contract + msg: + type: string + title: >- + Msg is json encoded message to be passed to the + contract + title: Msgs that will be executed every period amount of time + last_execute_height: + type: string + format: uint64 + title: Last execution's block height + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + additionalProperties: {} + parameters: + - name: name + in: path + required: true + type: string + tags: + - Query + /neutron/feeburner/params: + get: + summary: Parameters queries the parameters of the module. + operationId: NeutronFeeburnerParams + responses: + '200': + description: A successful response. + schema: + type: object + properties: + params: + description: params holds all the parameters of this module. + type: object + properties: + neutron_denom: + type: string + title: >- + Defines Neutron denom, which will be burned during fee + processing, any + + other denom will be sent to Treasury + reserve_address: + type: string + title: Deprecated in v0.4.4. Is not used anymore + treasury_address: + type: string + title: Defines treasury address + description: >- + QueryParamsResponse is response type for the Query/Params RPC + method. + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + additionalProperties: {} + tags: + - Query + /neutron/feeburner/total_burned_neutrons_amount: + get: + summary: TotalBurnedNeutronsAmount queries total amount of burned neutron fees. + operationId: NeutronFeeburnerTotalBurnedNeutronsAmount + responses: + '200': + description: A successful response. + schema: + type: object + properties: + total_burned_neutrons_amount: + type: object + properties: + coin: + type: object + properties: + denom: + type: string + amount: + type: string + 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. + title: >- + TotalBurnedNeutronsAmount defines total amount of burned + neutron fees + description: |- + QueryTotalBurnedNeutronsAmountResponse is response type for the + Query/QueryTotalBurnedNeutronsAmount method. + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + additionalProperties: {} + tags: + - Query + /neutron-org/neutron/feerefunder/info: + get: + operationId: NeutronFeerefunderFeeInfo + responses: + '200': + description: A successful response. + schema: + type: object + properties: + fee_info: + type: object + properties: + payer: + type: string + packet_id: + type: object + properties: + channel_id: + type: string + port_id: + type: string + sequence: + type: string + format: uint64 + fee: + type: object + properties: + recv_fee: + type: array + items: + type: object + properties: + denom: + type: string + amount: + type: string + 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. + title: the packet receive fee + ack_fee: + type: array + items: + type: object + properties: + denom: + type: string + amount: + type: string + 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. + title: the packet acknowledgement fee + timeout_fee: + type: array + items: + type: object + properties: + denom: + type: string + amount: + type: string + 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. + title: the packet timeout fee + title: >- + Fee defines the ICS29 receive, acknowledgement and timeout + fees + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + additionalProperties: {} + parameters: + - name: channel_id + in: query + required: false + type: string + - name: port_id + in: query + required: false + type: string + - name: sequence + in: query + required: false + type: string + format: uint64 + tags: + - Query + /neutron-org/neutron/feerefunder/params: + get: + summary: Parameters queries the parameters of the module. + operationId: NeutronFeerefunderParams + responses: + '200': + description: A successful response. + schema: + type: object + properties: + params: + description: params holds all the parameters of this module. + type: object + properties: + min_fee: + type: object + properties: + recv_fee: + type: array + items: + type: object + properties: + denom: + type: string + amount: + type: string + 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. + title: the packet receive fee + ack_fee: + type: array + items: + type: object + properties: + denom: + type: string + amount: + type: string + 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. + title: the packet acknowledgement fee + timeout_fee: + type: array + items: + type: object + properties: + denom: + type: string + amount: + type: string + 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. + title: the packet timeout fee + title: >- + Fee defines the ICS29 receive, acknowledgement and timeout + fees + description: >- + QueryParamsResponse is response type for the Query/Params RPC + method. + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + additionalProperties: {} + tags: + - Query + /neutron/interchainqueries/params: + get: + summary: Parameters queries the parameters of the module. + operationId: NeutronInterchainqueriesParams + responses: + '200': + description: A successful response. + schema: + type: object + properties: + params: + description: params holds all the parameters of this module. + type: object + properties: + query_submit_timeout: + type: string + format: uint64 + title: >- + Defines amount of blocks required before query becomes + available for + + removal by anybody + query_deposit: + type: array + items: + type: object + properties: + denom: + type: string + amount: + type: string + 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. + description: Amount of coins deposited for the query. + tx_query_removal_limit: + type: string + format: uint64 + description: >- + Amount of tx hashes to be removed during a single + EndBlock. Can vary to + + balance between network cleaning speed and EndBlock + duration. A zero value + + means no limit. + description: >- + QueryParamsResponse is response type for the Query/Params RPC + method. + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type of + the serialized + + protocol buffer message. This string must contain at + least + + one "/" character. The last segment of the URL's path + must represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be in + a canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the binary + all types that they + + expect it to use in the context of Any. However, for + URLs which use the + + scheme `http`, `https`, or no scheme, one can optionally + set up a type + + server that maps type URLs to message definitions as + follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based + on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in + the official + + protobuf release, and it is not used for type URLs + beginning with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty scheme) + might be + + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer + message along with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any values + in the form + + of utility functions or additional generated methods of the + Any type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by + default use + + 'type.googleapis.com/full.type.name' as the type URL and the + unpack + + methods only use the fully qualified type name after the + last '/' + + in the type URL, for example "foo.bar.com/x/y.z" will yield + type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the regular + + representation of the deserialized, embedded message, with + an + + additional field `@type` which contains the type URL. + Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a custom + JSON + + representation, that representation will be embedded adding + a field + + `value` which holds the custom JSON in addition to the + `@type` + + field. Example (for message [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + tags: + - Query + /neutron/interchainqueries/query_result: + get: + operationId: NeutronInterchainqueriesQueryResult + responses: + '200': + description: A successful response. + schema: + type: object + properties: + result: + type: object + properties: + kv_results: + type: array + items: + type: object + properties: + storage_prefix: + type: string + title: is the substore name (acc, staking, etc.) + key: + type: string + format: byte + title: is the key in IAVL store + value: + type: string + format: byte + title: is the value in IAVL store + Proof: + title: >- + is the Merkle Proof which proves existence of + key-value pair in IAVL + + storage + type: object + properties: + ops: + type: array + items: + type: object + properties: + type: + type: string + key: + type: string + format: byte + data: + type: string + format: byte + title: >- + ProofOp defines an operation used for + calculating Merkle root + + The data could be arbitrary format, providing + nessecary data + + for example neighbouring node hash + block: + type: object + properties: + next_block_header: + title: >- + We need to know block X+1 to verify response of + transaction for block X + + since LastResultsHash is root hash of all results from + the txs from the + + previous block + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the + type of the serialized + + protocol buffer message. This string must contain + at least + + one "/" character. The last segment of the URL's + path must represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should + be in a canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the + binary all types that they + + expect it to use in the context of Any. However, + for URLs which use the + + scheme `http`, `https`, or no scheme, one can + optionally set up a type + + server that maps type URLs to message definitions + as follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results + based on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently + available in the official + + protobuf release, and it is not used for type URLs + beginning with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty + scheme) might be + + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer + message along with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any + values in the form + + of utility functions or additional generated methods + of the Any type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by + default use + + 'type.googleapis.com/full.type.name' as the type URL + and the unpack + + methods only use the fully qualified type name after + the last '/' + + in the type URL, for example "foo.bar.com/x/y.z" will + yield type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the + regular + + representation of the deserialized, embedded message, + with an + + additional field `@type` which contains the type URL. + Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a + custom JSON + + representation, that representation will be embedded + adding a field + + `value` which holds the custom JSON in addition to the + `@type` + + field. Example (for message + [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + header: + title: >- + We need to know block X to verify inclusion of + transaction for block X + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the + type of the serialized + + protocol buffer message. This string must contain + at least + + one "/" character. The last segment of the URL's + path must represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should + be in a canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the + binary all types that they + + expect it to use in the context of Any. However, + for URLs which use the + + scheme `http`, `https`, or no scheme, one can + optionally set up a type + + server that maps type URLs to message definitions + as follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results + based on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently + available in the official + + protobuf release, and it is not used for type URLs + beginning with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty + scheme) might be + + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer + message along with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any + values in the form + + of utility functions or additional generated methods + of the Any type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by + default use + + 'type.googleapis.com/full.type.name' as the type URL + and the unpack + + methods only use the fully qualified type name after + the last '/' + + in the type URL, for example "foo.bar.com/x/y.z" will + yield type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the + regular + + representation of the deserialized, embedded message, + with an + + additional field `@type` which contains the type URL. + Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a + custom JSON + + representation, that representation will be embedded + adding a field + + `value` which holds the custom JSON in addition to the + `@type` + + field. Example (for message + [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + tx: + type: object + properties: + response: + type: object + properties: + code: + type: integer + format: int64 + data: + type: string + format: byte + log: + type: string + title: nondeterministic + info: + type: string + title: nondeterministic + gas_wanted: + type: string + format: int64 + gas_used: + type: string + format: int64 + events: + type: array + items: + type: object + properties: + type: + type: string + attributes: + type: array + items: + type: object + properties: + key: + type: string + value: + type: string + index: + type: boolean + title: nondeterministic + description: >- + EventAttribute is a single key-value + pair, associated with an event. + description: >- + Event allows application developers to + attach additional information to + + ResponseBeginBlock, ResponseEndBlock, + ResponseCheckTx and ResponseDeliverTx. + + Later, transactions may be queried using + these events. + title: nondeterministic + codespace: + type: string + delivery_proof: + title: >- + is the Merkle Proof which proves existence of + response in block with height + + next_block_header.Height + type: object + properties: + total: + type: string + format: int64 + index: + type: string + format: int64 + leaf_hash: + type: string + format: byte + aunts: + type: array + items: + type: string + format: byte + inclusion_proof: + title: >- + is the Merkle Proof which proves existence of data + in block with height + + header.Height + type: object + properties: + total: + type: string + format: int64 + index: + type: string + format: int64 + leaf_hash: + type: string + format: byte + aunts: + type: array + items: + type: string + format: byte + data: + type: string + format: byte + title: is body of the transaction + height: + type: string + format: uint64 + revision: + type: string + format: uint64 + allow_kv_callbacks: + type: boolean + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type of + the serialized + + protocol buffer message. This string must contain at + least + + one "/" character. The last segment of the URL's path + must represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be in + a canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the binary + all types that they + + expect it to use in the context of Any. However, for + URLs which use the + + scheme `http`, `https`, or no scheme, one can optionally + set up a type + + server that maps type URLs to message definitions as + follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based + on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in + the official + + protobuf release, and it is not used for type URLs + beginning with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty scheme) + might be + + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer + message along with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any values + in the form + + of utility functions or additional generated methods of the + Any type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by + default use + + 'type.googleapis.com/full.type.name' as the type URL and the + unpack + + methods only use the fully qualified type name after the + last '/' + + in the type URL, for example "foo.bar.com/x/y.z" will yield + type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the regular + + representation of the deserialized, embedded message, with + an + + additional field `@type` which contains the type URL. + Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a custom + JSON + + representation, that representation will be embedded adding + a field + + `value` which holds the custom JSON in addition to the + `@type` + + field. Example (for message [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + parameters: + - name: query_id + in: query + required: false + type: string + format: uint64 + tags: + - Query + /neutron/interchainqueries/registered_queries: + get: + operationId: NeutronInterchainqueriesRegisteredQueries + responses: + '200': + description: A successful response. + schema: + type: object + properties: + registered_queries: + type: array + items: + type: object + properties: + id: + type: string + format: uint64 + description: The unique id of the registered query. + owner: + type: string + description: The address that registered the query. + query_type: + type: string + title: 'The query type identifier: `kv` or `tx` now' + keys: + type: array + items: + type: object + properties: + path: + type: string + title: >- + Path (storage prefix) to the storage where you + want to read value by key + + (usually name of cosmos-sdk module: 'staking', + 'bank', etc.) + key: + type: string + format: byte + title: Key you want to read from the storage + title: >- + The KV-storage keys for which we want to get values from + remote chain + transactions_filter: + type: string + title: The filter for transaction search ICQ + connection_id: + type: string + title: >- + The IBC connection ID for getting ConsensusState to + verify proofs + update_period: + type: string + format: uint64 + description: >- + Parameter that defines how often the query must be + updated. + last_submitted_result_local_height: + type: string + format: uint64 + description: >- + The local chain last block height when the query result + was updated. + last_submitted_result_remote_height: + description: >- + The remote chain last block height when the query result + was updated. + type: object + properties: + revision_number: + type: string + format: uint64 + title: the revision that the client is currently on + revision_height: + type: string + format: uint64 + title: the height within the given revision + title: >- + Height is a monotonically increasing data type + + that can be compared against another Height for the + purposes of updating and + + freezing clients + deposit: + type: array + items: + type: object + properties: + denom: + type: string + amount: + type: string + 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. + description: Amount of coins deposited for the query. + submit_timeout: + type: string + format: uint64 + description: >- + Timeout before query becomes available for everybody to + remove. + registered_at_height: + type: string + format: uint64 + description: The local chain height when the query was registered. + pagination: + description: pagination defines the pagination in the response. + type: object + properties: + next_key: + type: string + format: byte + 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. + total: + type: string + format: uint64 + title: >- + total is total number of results available if + PageRequest.count_total + + was set, its value is undefined otherwise + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type of + the serialized + + protocol buffer message. This string must contain at + least + + one "/" character. The last segment of the URL's path + must represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be in + a canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the binary + all types that they + + expect it to use in the context of Any. However, for + URLs which use the + + scheme `http`, `https`, or no scheme, one can optionally + set up a type + + server that maps type URLs to message definitions as + follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based + on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in + the official + + protobuf release, and it is not used for type URLs + beginning with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty scheme) + might be + + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer + message along with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any values + in the form + + of utility functions or additional generated methods of the + Any type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by + default use + + 'type.googleapis.com/full.type.name' as the type URL and the + unpack + + methods only use the fully qualified type name after the + last '/' + + in the type URL, for example "foo.bar.com/x/y.z" will yield + type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the regular + + representation of the deserialized, embedded message, with + an + + additional field `@type` which contains the type URL. + Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a custom + JSON + + representation, that representation will be embedded adding + a field + + `value` which holds the custom JSON in addition to the + `@type` + + field. Example (for message [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + parameters: + - name: owners + in: query + required: false + type: array + items: + type: string + collectionFormat: multi + - name: connection_id + in: query + required: false + type: string + - name: pagination.key + 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. + in: query + required: false + type: string + format: byte + - name: pagination.offset + 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. + in: query + required: false + type: string + format: uint64 + - name: pagination.limit + 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. + in: query + required: false + type: string + format: uint64 + - name: pagination.count_total + 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 + required: false + type: boolean + - name: pagination.reverse + description: >- + reverse is set to true if results are to be returned in the + descending order. + + + Since: cosmos-sdk 0.43 + in: query + required: false + type: boolean + tags: + - Query + /neutron/interchainqueries/registered_query: + get: + operationId: NeutronInterchainqueriesRegisteredQuery + responses: + '200': + description: A successful response. + schema: + type: object + properties: + registered_query: + type: object + properties: + id: + type: string + format: uint64 + description: The unique id of the registered query. + owner: + type: string + description: The address that registered the query. + query_type: + type: string + title: 'The query type identifier: `kv` or `tx` now' + keys: + type: array + items: + type: object + properties: + path: + type: string + title: >- + Path (storage prefix) to the storage where you want + to read value by key + + (usually name of cosmos-sdk module: 'staking', + 'bank', etc.) + key: + type: string + format: byte + title: Key you want to read from the storage + title: >- + The KV-storage keys for which we want to get values from + remote chain + transactions_filter: + type: string + title: The filter for transaction search ICQ + connection_id: + type: string + title: >- + The IBC connection ID for getting ConsensusState to verify + proofs + update_period: + type: string + format: uint64 + description: >- + Parameter that defines how often the query must be + updated. + last_submitted_result_local_height: + type: string + format: uint64 + description: >- + The local chain last block height when the query result + was updated. + last_submitted_result_remote_height: + description: >- + The remote chain last block height when the query result + was updated. + type: object + properties: + revision_number: + type: string + format: uint64 + title: the revision that the client is currently on + revision_height: + type: string + format: uint64 + title: the height within the given revision + title: >- + Height is a monotonically increasing data type + + that can be compared against another Height for the + purposes of updating and + + freezing clients + deposit: + type: array + items: + type: object + properties: + denom: + type: string + amount: + type: string + 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. + description: Amount of coins deposited for the query. + submit_timeout: + type: string + format: uint64 + description: >- + Timeout before query becomes available for everybody to + remove. + registered_at_height: + type: string + format: uint64 + description: The local chain height when the query was registered. + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type of + the serialized + + protocol buffer message. This string must contain at + least + + one "/" character. The last segment of the URL's path + must represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be in + a canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the binary + all types that they + + expect it to use in the context of Any. However, for + URLs which use the + + scheme `http`, `https`, or no scheme, one can optionally + set up a type + + server that maps type URLs to message definitions as + follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based + on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in + the official + + protobuf release, and it is not used for type URLs + beginning with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty scheme) + might be + + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer + message along with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any values + in the form + + of utility functions or additional generated methods of the + Any type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by + default use + + 'type.googleapis.com/full.type.name' as the type URL and the + unpack + + methods only use the fully qualified type name after the + last '/' + + in the type URL, for example "foo.bar.com/x/y.z" will yield + type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the regular + + representation of the deserialized, embedded message, with + an + + additional field `@type` which contains the type URL. + Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a custom + JSON + + representation, that representation will be embedded adding + a field + + `value` which holds the custom JSON in addition to the + `@type` + + field. Example (for message [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + parameters: + - name: query_id + in: query + required: false + type: string + format: uint64 + tags: + - Query + /neutron/interchainqueries/remote_height: + get: + operationId: NeutronInterchainqueriesLastRemoteHeight + responses: + '200': + description: A successful response. + schema: + type: object + properties: + height: + type: string + format: uint64 + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type of + the serialized + + protocol buffer message. This string must contain at + least + + one "/" character. The last segment of the URL's path + must represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be in + a canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the binary + all types that they + + expect it to use in the context of Any. However, for + URLs which use the + + scheme `http`, `https`, or no scheme, one can optionally + set up a type + + server that maps type URLs to message definitions as + follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based + on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in + the official + + protobuf release, and it is not used for type URLs + beginning with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty scheme) + might be + + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer + message along with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any values + in the form + + of utility functions or additional generated methods of the + Any type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by + default use + + 'type.googleapis.com/full.type.name' as the type URL and the + unpack + + methods only use the fully qualified type name after the + last '/' + + in the type URL, for example "foo.bar.com/x/y.z" will yield + type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the regular + + representation of the deserialized, embedded message, with + an + + additional field `@type` which contains the type URL. + Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a custom + JSON + + representation, that representation will be embedded adding + a field + + `value` which holds the custom JSON in addition to the + `@type` + + field. Example (for message [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + parameters: + - name: connection_id + in: query + required: false + type: string + tags: + - Query + /ibc/apps/transfer/v1/denom_hashes/{trace}: + get: + summary: DenomHash queries a denomination hash information. + operationId: NeutronTransferDenomHash + responses: + '200': + description: A successful response. + schema: + type: object + properties: + hash: + type: string + description: hash (in hex format) of the denomination trace information. + description: >- + QueryDenomHashResponse is the response type for the + Query/DenomHash RPC + + method. + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type of + the serialized + + protocol buffer message. This string must contain at + least + + one "/" character. The last segment of the URL's path + must represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be in + a canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the binary + all types that they + + expect it to use in the context of Any. However, for + URLs which use the + + scheme `http`, `https`, or no scheme, one can optionally + set up a type + + server that maps type URLs to message definitions as + follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based + on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in + the official + + protobuf release, and it is not used for type URLs + beginning with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty scheme) + might be + + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer + message along with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any values + in the form + + of utility functions or additional generated methods of the + Any type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by + default use + + 'type.googleapis.com/full.type.name' as the type URL and the + unpack + + methods only use the fully qualified type name after the + last '/' + + in the type URL, for example "foo.bar.com/x/y.z" will yield + type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the regular + + representation of the deserialized, embedded message, with + an + + additional field `@type` which contains the type URL. + Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a custom + JSON + + representation, that representation will be embedded adding + a field + + `value` which holds the custom JSON in addition to the + `@type` + + field. Example (for message [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + parameters: + - name: trace + description: The denomination trace ([port_id]/[channel_id])+/[denom] + in: path + required: true + type: string + tags: + - Query + /ibc/apps/transfer/v1/denom_traces: + get: + summary: DenomTraces queries all denomination traces. + operationId: NeutronTransferDenomTraces + responses: + '200': + description: A successful response. + schema: + type: object + properties: + denom_traces: + type: array + items: + type: object + properties: + path: + type: string + description: >- + path defines the chain of port/channel identifiers used + for tracing the + + source of the fungible token. + base_denom: + type: string + description: base denomination of the relayed fungible token. + description: >- + DenomTrace contains the base denomination for ICS20 fungible + tokens and the + + source tracing information path. + description: denom_traces returns all denominations trace information. + pagination: + description: pagination defines the pagination in the response. + type: object + properties: + next_key: + type: string + format: byte + 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. + total: + type: string + format: uint64 + title: >- + total is total number of results available if + PageRequest.count_total + + was set, its value is undefined otherwise + description: >- + QueryConnectionsResponse is the response type for the + Query/DenomTraces RPC + + method. + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type of + the serialized + + protocol buffer message. This string must contain at + least + + one "/" character. The last segment of the URL's path + must represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be in + a canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the binary + all types that they + + expect it to use in the context of Any. However, for + URLs which use the + + scheme `http`, `https`, or no scheme, one can optionally + set up a type + + server that maps type URLs to message definitions as + follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based + on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in + the official + + protobuf release, and it is not used for type URLs + beginning with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty scheme) + might be + + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer + message along with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any values + in the form + + of utility functions or additional generated methods of the + Any type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by + default use + + 'type.googleapis.com/full.type.name' as the type URL and the + unpack + + methods only use the fully qualified type name after the + last '/' + + in the type URL, for example "foo.bar.com/x/y.z" will yield + type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the regular + + representation of the deserialized, embedded message, with + an + + additional field `@type` which contains the type URL. + Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a custom + JSON + + representation, that representation will be embedded adding + a field + + `value` which holds the custom JSON in addition to the + `@type` + + field. Example (for message [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + parameters: + - name: pagination.key + 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. + in: query + required: false + type: string + format: byte + - name: pagination.offset + 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. + in: query + required: false + type: string + format: uint64 + - name: pagination.limit + 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. + in: query + required: false + type: string + format: uint64 + - name: pagination.count_total + 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 + required: false + type: boolean + - name: pagination.reverse + description: >- + reverse is set to true if results are to be returned in the + descending order. + + + Since: cosmos-sdk 0.43 + in: query + required: false + type: boolean + tags: + - Query + /ibc/apps/transfer/v1/denom_traces/{hash}: + get: + summary: DenomTrace queries a denomination trace information. + operationId: NeutronTransferDenomTrace + responses: + '200': + description: A successful response. + schema: + type: object + properties: + denom_trace: + description: >- + denom_trace returns the requested denomination trace + information. + type: object + properties: + path: + type: string + description: >- + path defines the chain of port/channel identifiers used + for tracing the + + source of the fungible token. + base_denom: + type: string + description: base denomination of the relayed fungible token. + description: >- + QueryDenomTraceResponse is the response type for the + Query/DenomTrace RPC + + method. + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type of + the serialized + + protocol buffer message. This string must contain at + least + + one "/" character. The last segment of the URL's path + must represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be in + a canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the binary + all types that they + + expect it to use in the context of Any. However, for + URLs which use the + + scheme `http`, `https`, or no scheme, one can optionally + set up a type + + server that maps type URLs to message definitions as + follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based + on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in + the official + + protobuf release, and it is not used for type URLs + beginning with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty scheme) + might be + + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer + message along with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any values + in the form + + of utility functions or additional generated methods of the + Any type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by + default use + + 'type.googleapis.com/full.type.name' as the type URL and the + unpack + + methods only use the fully qualified type name after the + last '/' + + in the type URL, for example "foo.bar.com/x/y.z" will yield + type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the regular + + representation of the deserialized, embedded message, with + an + + additional field `@type` which contains the type URL. + Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a custom + JSON + + representation, that representation will be embedded adding + a field + + `value` which holds the custom JSON in addition to the + `@type` + + field. Example (for message [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + parameters: + - name: hash + description: >- + hash (in hex format) or denom (full denom with ibc prefix) of the + denomination trace information. + in: path + required: true + type: string + tags: + - Query + /ibc/apps/transfer/v1/params: + get: + summary: Params queries all parameters of the ibc-transfer module. + operationId: NeutronTransferParams + responses: + '200': + description: A successful response. + schema: + type: object + properties: + params: + description: params defines the parameters of the module. + type: object + properties: + send_enabled: + type: boolean + description: >- + send_enabled enables or disables all cross-chain token + transfers from this + + chain. + receive_enabled: + type: boolean + description: >- + receive_enabled enables or disables all cross-chain token + transfers to this + + chain. + description: >- + QueryParamsResponse is the response type for the Query/Params RPC + method. + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type of + the serialized + + protocol buffer message. This string must contain at + least + + one "/" character. The last segment of the URL's path + must represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be in + a canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the binary + all types that they + + expect it to use in the context of Any. However, for + URLs which use the + + scheme `http`, `https`, or no scheme, one can optionally + set up a type + + server that maps type URLs to message definitions as + follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based + on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in + the official + + protobuf release, and it is not used for type URLs + beginning with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty scheme) + might be + + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer + message along with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any values + in the form + + of utility functions or additional generated methods of the + Any type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by + default use + + 'type.googleapis.com/full.type.name' as the type URL and the + unpack + + methods only use the fully qualified type name after the + last '/' + + in the type URL, for example "foo.bar.com/x/y.z" will yield + type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the regular + + representation of the deserialized, embedded message, with + an + + additional field `@type` which contains the type URL. + Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a custom + JSON + + representation, that representation will be embedded adding + a field + + `value` which holds the custom JSON in addition to the + `@type` + + field. Example (for message [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + tags: + - Query + /osmosis/tokenfactory/v1beta1/denoms/factory/{creator}/{subdenom}/authority_metadata: + get: + operationId: OsmosisTokenfactoryV1Beta1DenomAuthorityMetadata + responses: + '200': + description: A successful response. + schema: + type: object + properties: + authority_metadata: + type: object + properties: + Admin: + type: string + title: Can be empty for no admin, or a valid osmosis address + description: >- + DenomAuthorityMetadata specifies metadata for addresses that + have specific + + capabilities over a token factory denom. Right now there is + only one Admin + + permission, but is planned to be extended to the future. + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + additionalProperties: {} + parameters: + - name: creator + in: path + required: true + type: string + - name: subdenom + in: path + required: true + type: string + tags: + - Query + /osmosis/tokenfactory/v1beta1/denoms_from_creator/{creator}: + get: + operationId: OsmosisTokenfactoryV1Beta1DenomsFromCreator + responses: + '200': + description: A successful response. + schema: + type: object + properties: + denoms: + type: array + items: + type: string + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + additionalProperties: {} + parameters: + - name: creator + in: path + required: true + type: string + tags: + - Query + /osmosis/tokenfactory/v1beta1/params: + get: + summary: Params returns the total set of minting parameters. + operationId: OsmosisTokenfactoryV1Beta1Params + responses: + '200': + description: A successful response. + schema: + type: object + properties: + params: + description: params defines the parameters of the module. + type: object + properties: + denom_creation_fee: + type: array + items: + type: object + properties: + denom: + type: string + amount: + type: string + 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. + title: >- + DenomCreationFee is the fee required to create a new denom + using the tokenfactory module + fee_collector_address: + type: string + title: >- + FeeCollectorAddress is the address where fees collected + from denom creation are sent to + title: Params holds parameters for the tokenfactory module + description: >- + QueryParamsResponse is the response type for the Query/Params RPC + method. + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + additionalProperties: {} + tags: + - Query + /ibc/apps/router/v1/params: + get: + summary: Params queries all parameters of the router module. + operationId: RouterV1Params + responses: + '200': + description: A successful response. + schema: + type: object + properties: + params: + description: params defines the parameters of the module. + type: object + properties: + fee_percentage: + type: string + description: >- + QueryParamsResponse is the response type for the Query/Params RPC + method. + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + additionalProperties: {} + tags: + - Query +definitions: + cosmos.auth.v1beta1.AddressBytesToStringResponse: + type: object + properties: + address_string: + type: string + description: >- + AddressBytesToStringResponse is the response type for AddressString rpc + method. + + + Since: cosmos-sdk 0.46 + cosmos.auth.v1beta1.AddressStringToBytesResponse: + type: object + properties: + address_bytes: + type: string + format: byte + description: >- + AddressStringToBytesResponse is the response type for AddressBytes rpc + method. + + + Since: cosmos-sdk 0.46 + cosmos.auth.v1beta1.BaseAccount: + type: object + properties: + address: + type: string + pub_key: + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type of the + serialized + + protocol buffer message. This string must contain at least + + one "/" character. The last segment of the URL's path must + represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be in a + canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the binary all types + that they + + expect it to use in the context of Any. However, for URLs which + use the + + scheme `http`, `https`, or no scheme, one can optionally set up a + type + + server that maps type URLs to message definitions as follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in the + official + + protobuf release, and it is not used for type URLs beginning with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty scheme) might be + + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer message along + with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any values in the + form + + of utility functions or additional generated methods of the Any type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by default use + + 'type.googleapis.com/full.type.name' as the type URL and the unpack + + methods only use the fully qualified type name after the last '/' + + in the type URL, for example "foo.bar.com/x/y.z" will yield type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the regular + + representation of the deserialized, embedded message, with an + + additional field `@type` which contains the type URL. Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a custom JSON + + representation, that representation will be embedded adding a field + + `value` which holds the custom JSON in addition to the `@type` + + field. Example (for message [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + account_number: + type: string + format: uint64 + sequence: + type: string + format: uint64 + description: >- + BaseAccount defines a base account type. It contains all the necessary + fields + + for basic account functionality. Any custom account type should extend + this + + type for additional functionality (e.g. vesting). + cosmos.auth.v1beta1.Bech32PrefixResponse: + type: object + properties: + bech32_prefix: + type: string + description: |- + Bech32PrefixResponse is the response type for Bech32Prefix rpc method. + + Since: cosmos-sdk 0.46 + cosmos.auth.v1beta1.MsgUpdateParamsResponse: + type: object + description: |- + MsgUpdateParamsResponse defines the response structure for executing a + MsgUpdateParams message. + + Since: cosmos-sdk 0.47 + cosmos.auth.v1beta1.Params: + type: object + properties: + max_memo_characters: + type: string + format: uint64 + tx_sig_limit: + type: string + format: uint64 + tx_size_cost_per_byte: + type: string + format: uint64 + sig_verify_cost_ed25519: + type: string + format: uint64 + sig_verify_cost_secp256k1: + type: string + format: uint64 + description: Params defines the parameters for the auth module. + cosmos.auth.v1beta1.QueryAccountAddressByIDResponse: + type: object + properties: + account_address: + type: string + description: 'Since: cosmos-sdk 0.46.2' + title: >- + QueryAccountAddressByIDResponse is the response type for + AccountAddressByID rpc method + cosmos.auth.v1beta1.QueryAccountInfoResponse: + type: object + properties: + info: + description: info is the account info which is represented by BaseAccount. + type: object + properties: + address: + type: string + pub_key: + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type of the + serialized + + protocol buffer message. This string must contain at least + + one "/" character. The last segment of the URL's path must + represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be in a + canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the binary all + types that they + + expect it to use in the context of Any. However, for URLs + which use the + + scheme `http`, `https`, or no scheme, one can optionally set + up a type + + server that maps type URLs to message definitions as follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based on + the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in the + official + + protobuf release, and it is not used for type URLs beginning + with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty scheme) might + be + + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer message + along with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any values in the + form + + of utility functions or additional generated methods of the Any + type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by default use + + 'type.googleapis.com/full.type.name' as the type URL and the + unpack + + methods only use the fully qualified type name after the last '/' + + in the type URL, for example "foo.bar.com/x/y.z" will yield type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the regular + + representation of the deserialized, embedded message, with an + + additional field `@type` which contains the type URL. Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a custom JSON + + representation, that representation will be embedded adding a + field + + `value` which holds the custom JSON in addition to the `@type` + + field. Example (for message [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + account_number: + type: string + format: uint64 + sequence: + type: string + format: uint64 + description: |- + QueryAccountInfoResponse is the Query/AccountInfo response type. + + Since: cosmos-sdk 0.47 + cosmos.auth.v1beta1.QueryAccountResponse: + type: object + properties: + account: + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type of the + serialized + + protocol buffer message. This string must contain at least + + one "/" character. The last segment of the URL's path must + represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be in a + canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the binary all types + that they + + expect it to use in the context of Any. However, for URLs which + use the + + scheme `http`, `https`, or no scheme, one can optionally set up a + type + + server that maps type URLs to message definitions as follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in the + official + + protobuf release, and it is not used for type URLs beginning with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty scheme) might be + + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer message along + with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any values in the + form + + of utility functions or additional generated methods of the Any type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by default use + + 'type.googleapis.com/full.type.name' as the type URL and the unpack + + methods only use the fully qualified type name after the last '/' + + in the type URL, for example "foo.bar.com/x/y.z" will yield type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the regular + + representation of the deserialized, embedded message, with an + + additional field `@type` which contains the type URL. Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a custom JSON + + representation, that representation will be embedded adding a field + + `value` which holds the custom JSON in addition to the `@type` + + field. Example (for message [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + description: >- + QueryAccountResponse is the response type for the Query/Account RPC + method. + cosmos.auth.v1beta1.QueryAccountsResponse: + type: object + properties: + accounts: + type: array + items: + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type of the + serialized + + protocol buffer message. This string must contain at least + + one "/" character. The last segment of the URL's path must + represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be in a + canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the binary all types + that they + + expect it to use in the context of Any. However, for URLs which + use the + + scheme `http`, `https`, or no scheme, one can optionally set up + a type + + server that maps type URLs to message definitions as follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in the + official + + protobuf release, and it is not used for type URLs beginning + with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty scheme) might + be + + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer message along + with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any values in the + form + + of utility functions or additional generated methods of the Any + type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by default use + + 'type.googleapis.com/full.type.name' as the type URL and the unpack + + methods only use the fully qualified type name after the last '/' + + in the type URL, for example "foo.bar.com/x/y.z" will yield type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the regular + + representation of the deserialized, embedded message, with an + + additional field `@type` which contains the type URL. Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a custom JSON + + representation, that representation will be embedded adding a field + + `value` which holds the custom JSON in addition to the `@type` + + field. Example (for message [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + title: accounts are the existing accounts + pagination: + description: pagination defines the pagination in the response. + type: object + properties: + next_key: + type: string + format: byte + 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. + total: + type: string + format: uint64 + title: >- + total is total number of results available if + PageRequest.count_total + + was set, its value is undefined otherwise + description: >- + QueryAccountsResponse is the response type for the Query/Accounts RPC + method. + + + Since: cosmos-sdk 0.43 + cosmos.auth.v1beta1.QueryModuleAccountByNameResponse: + type: object + properties: + account: + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type of the + serialized + + protocol buffer message. This string must contain at least + + one "/" character. The last segment of the URL's path must + represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be in a + canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the binary all types + that they + + expect it to use in the context of Any. However, for URLs which + use the + + scheme `http`, `https`, or no scheme, one can optionally set up a + type + + server that maps type URLs to message definitions as follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in the + official + + protobuf release, and it is not used for type URLs beginning with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty scheme) might be + + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer message along + with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any values in the + form + + of utility functions or additional generated methods of the Any type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by default use + + 'type.googleapis.com/full.type.name' as the type URL and the unpack + + methods only use the fully qualified type name after the last '/' + + in the type URL, for example "foo.bar.com/x/y.z" will yield type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the regular + + representation of the deserialized, embedded message, with an + + additional field `@type` which contains the type URL. Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a custom JSON + + representation, that representation will be embedded adding a field + + `value` which holds the custom JSON in addition to the `@type` + + field. Example (for message [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + description: >- + QueryModuleAccountByNameResponse is the response type for the + Query/ModuleAccountByName RPC method. + cosmos.auth.v1beta1.QueryModuleAccountsResponse: + type: object + properties: + accounts: + type: array + items: + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type of the + serialized + + protocol buffer message. This string must contain at least + + one "/" character. The last segment of the URL's path must + represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be in a + canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the binary all types + that they + + expect it to use in the context of Any. However, for URLs which + use the + + scheme `http`, `https`, or no scheme, one can optionally set up + a type + + server that maps type URLs to message definitions as follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in the + official + + protobuf release, and it is not used for type URLs beginning + with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty scheme) might + be + + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer message along + with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any values in the + form + + of utility functions or additional generated methods of the Any + type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by default use + + 'type.googleapis.com/full.type.name' as the type URL and the unpack + + methods only use the fully qualified type name after the last '/' + + in the type URL, for example "foo.bar.com/x/y.z" will yield type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the regular + + representation of the deserialized, embedded message, with an + + additional field `@type` which contains the type URL. Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a custom JSON + + representation, that representation will be embedded adding a field + + `value` which holds the custom JSON in addition to the `@type` + + field. Example (for message [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + description: >- + QueryModuleAccountsResponse is the response type for the + Query/ModuleAccounts RPC method. + + + Since: cosmos-sdk 0.46 + cosmos.auth.v1beta1.QueryParamsResponse: + type: object + properties: + params: + description: params defines the parameters of the module. + type: object + properties: + max_memo_characters: + type: string + format: uint64 + tx_sig_limit: + type: string + format: uint64 + tx_size_cost_per_byte: + type: string + format: uint64 + sig_verify_cost_ed25519: + type: string + format: uint64 + sig_verify_cost_secp256k1: + type: string + format: uint64 + description: QueryParamsResponse is the response type for the Query/Params RPC method. + cosmos.base.query.v1beta1.PageRequest: + type: object + properties: + key: + type: string + format: byte + 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. + offset: + type: string + format: uint64 + 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. + limit: + type: string + format: uint64 + 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. + count_total: + type: boolean + 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. + reverse: + type: boolean + description: >- + reverse is set to true if results are to be returned in the descending + order. + + + Since: cosmos-sdk 0.43 + description: |- + message SomeRequest { + Foo some_parameter = 1; + PageRequest pagination = 2; + } + title: |- + PageRequest is to be embedded in gRPC request messages for efficient + pagination. Ex: + cosmos.base.query.v1beta1.PageResponse: + type: object + properties: + next_key: + type: string + format: byte + 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. + total: + type: string + format: uint64 + title: |- + total is total number of results available if PageRequest.count_total + was set, its value is undefined otherwise + 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; + } + google.protobuf.Any: + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type of the + serialized + + protocol buffer message. This string must contain at least + + one "/" character. The last segment of the URL's path must represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be in a canonical + form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the binary all types that + they + + expect it to use in the context of Any. However, for URLs which use + the + + scheme `http`, `https`, or no scheme, one can optionally set up a type + + server that maps type URLs to message definitions as follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in the official + + protobuf release, and it is not used for type URLs beginning with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty scheme) might be + + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer message along with + a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any values in the form + + of utility functions or additional generated methods of the Any type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by default use + + 'type.googleapis.com/full.type.name' as the type URL and the unpack + + methods only use the fully qualified type name after the last '/' + + in the type URL, for example "foo.bar.com/x/y.z" will yield type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the regular + + representation of the deserialized, embedded message, with an + + additional field `@type` which contains the type URL. Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a custom JSON + + representation, that representation will be embedded adding a field + + `value` which holds the custom JSON in addition to the `@type` + + field. Example (for message [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + google.rpc.Status: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type of the + serialized + + protocol buffer message. This string must contain at least + + one "/" character. The last segment of the URL's path must + represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be in a + canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the binary all types + that they + + expect it to use in the context of Any. However, for URLs which + use the + + scheme `http`, `https`, or no scheme, one can optionally set up + a type + + server that maps type URLs to message definitions as follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in the + official + + protobuf release, and it is not used for type URLs beginning + with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty scheme) might + be + + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer message along + with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any values in the + form + + of utility functions or additional generated methods of the Any + type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by default use + + 'type.googleapis.com/full.type.name' as the type URL and the unpack + + methods only use the fully qualified type name after the last '/' + + in the type URL, for example "foo.bar.com/x/y.z" will yield type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the regular + + representation of the deserialized, embedded message, with an + + additional field `@type` which contains the type URL. Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a custom JSON + + representation, that representation will be embedded adding a field + + `value` which holds the custom JSON in addition to the `@type` + + field. Example (for message [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + cosmos.authz.v1beta1.Grant: + type: object + properties: + authorization: + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type of the + serialized + + protocol buffer message. This string must contain at least + + one "/" character. The last segment of the URL's path must + represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be in a + canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the binary all types + that they + + expect it to use in the context of Any. However, for URLs which + use the + + scheme `http`, `https`, or no scheme, one can optionally set up a + type + + server that maps type URLs to message definitions as follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in the + official + + protobuf release, and it is not used for type URLs beginning with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty scheme) might be + + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer message along + with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any values in the + form + + of utility functions or additional generated methods of the Any type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by default use + + 'type.googleapis.com/full.type.name' as the type URL and the unpack + + methods only use the fully qualified type name after the last '/' + + in the type URL, for example "foo.bar.com/x/y.z" will yield type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the regular + + representation of the deserialized, embedded message, with an + + additional field `@type` which contains the type URL. Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a custom JSON + + representation, that representation will be embedded adding a field + + `value` which holds the custom JSON in addition to the `@type` + + field. Example (for message [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + expiration: + type: string + format: date-time + title: >- + time when the grant will expire and will be pruned. If null, then the + grant + + doesn't have a time expiration (other conditions in `authorization` + + may apply to invalidate the grant) + description: |- + Grant gives permissions to execute + the provide method with expiration time. + cosmos.authz.v1beta1.GrantAuthorization: + type: object + properties: + granter: + type: string + grantee: + type: string + authorization: + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type of the + serialized + + protocol buffer message. This string must contain at least + + one "/" character. The last segment of the URL's path must + represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be in a + canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the binary all types + that they + + expect it to use in the context of Any. However, for URLs which + use the + + scheme `http`, `https`, or no scheme, one can optionally set up a + type + + server that maps type URLs to message definitions as follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in the + official + + protobuf release, and it is not used for type URLs beginning with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty scheme) might be + + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer message along + with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any values in the + form + + of utility functions or additional generated methods of the Any type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by default use + + 'type.googleapis.com/full.type.name' as the type URL and the unpack + + methods only use the fully qualified type name after the last '/' + + in the type URL, for example "foo.bar.com/x/y.z" will yield type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the regular + + representation of the deserialized, embedded message, with an + + additional field `@type` which contains the type URL. Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a custom JSON + + representation, that representation will be embedded adding a field + + `value` which holds the custom JSON in addition to the `@type` + + field. Example (for message [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + expiration: + type: string + format: date-time + title: >- + GrantAuthorization extends a grant with both the addresses of the grantee + and granter. + + It is used in genesis.proto and query.proto + cosmos.authz.v1beta1.MsgExecResponse: + type: object + properties: + results: + type: array + items: + type: string + format: byte + description: MsgExecResponse defines the Msg/MsgExecResponse response type. + cosmos.authz.v1beta1.MsgGrantResponse: + type: object + description: MsgGrantResponse defines the Msg/MsgGrant response type. + cosmos.authz.v1beta1.MsgRevokeResponse: + type: object + description: MsgRevokeResponse defines the Msg/MsgRevokeResponse response type. + cosmos.authz.v1beta1.QueryGranteeGrantsResponse: + type: object + properties: + grants: + type: array + items: + type: object + properties: + granter: + type: string + grantee: + type: string + authorization: + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type of the + serialized + + protocol buffer message. This string must contain at least + + one "/" character. The last segment of the URL's path must + represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be in a + canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the binary all + types that they + + expect it to use in the context of Any. However, for URLs + which use the + + scheme `http`, `https`, or no scheme, one can optionally set + up a type + + server that maps type URLs to message definitions as + follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based on + the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in the + official + + protobuf release, and it is not used for type URLs beginning + with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty scheme) + might be + + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer message + along with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any values in + the form + + of utility functions or additional generated methods of the Any + type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by default + use + + 'type.googleapis.com/full.type.name' as the type URL and the + unpack + + methods only use the fully qualified type name after the last + '/' + + in the type URL, for example "foo.bar.com/x/y.z" will yield type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the regular + + representation of the deserialized, embedded message, with an + + additional field `@type` which contains the type URL. Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a custom JSON + + representation, that representation will be embedded adding a + field + + `value` which holds the custom JSON in addition to the `@type` + + field. Example (for message [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + expiration: + type: string + format: date-time + title: >- + GrantAuthorization extends a grant with both the addresses of the + grantee and granter. + + It is used in genesis.proto and query.proto + description: grants is a list of grants granted to the grantee. + pagination: + description: pagination defines an pagination for the response. + type: object + properties: + next_key: + type: string + format: byte + 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. + total: + type: string + format: uint64 + title: >- + total is total number of results available if + PageRequest.count_total + + was set, its value is undefined otherwise + description: >- + QueryGranteeGrantsResponse is the response type for the + Query/GranteeGrants RPC method. + cosmos.authz.v1beta1.QueryGranterGrantsResponse: + type: object + properties: + grants: + type: array + items: + type: object + properties: + granter: + type: string + grantee: + type: string + authorization: + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type of the + serialized + + protocol buffer message. This string must contain at least + + one "/" character. The last segment of the URL's path must + represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be in a + canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the binary all + types that they + + expect it to use in the context of Any. However, for URLs + which use the + + scheme `http`, `https`, or no scheme, one can optionally set + up a type + + server that maps type URLs to message definitions as + follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based on + the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in the + official + + protobuf release, and it is not used for type URLs beginning + with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty scheme) + might be + + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer message + along with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any values in + the form + + of utility functions or additional generated methods of the Any + type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by default + use + + 'type.googleapis.com/full.type.name' as the type URL and the + unpack + + methods only use the fully qualified type name after the last + '/' + + in the type URL, for example "foo.bar.com/x/y.z" will yield type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the regular + + representation of the deserialized, embedded message, with an + + additional field `@type` which contains the type URL. Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a custom JSON + + representation, that representation will be embedded adding a + field + + `value` which holds the custom JSON in addition to the `@type` + + field. Example (for message [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + expiration: + type: string + format: date-time + title: >- + GrantAuthorization extends a grant with both the addresses of the + grantee and granter. + + It is used in genesis.proto and query.proto + description: grants is a list of grants granted by the granter. + pagination: + description: pagination defines an pagination for the response. + type: object + properties: + next_key: + type: string + format: byte + 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. + total: + type: string + format: uint64 + title: >- + total is total number of results available if + PageRequest.count_total + + was set, its value is undefined otherwise + description: >- + QueryGranterGrantsResponse is the response type for the + Query/GranterGrants RPC method. + cosmos.authz.v1beta1.QueryGrantsResponse: + type: object + properties: + grants: + type: array + items: + type: object + properties: + authorization: + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type of the + serialized + + protocol buffer message. This string must contain at least + + one "/" character. The last segment of the URL's path must + represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be in a + canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the binary all + types that they + + expect it to use in the context of Any. However, for URLs + which use the + + scheme `http`, `https`, or no scheme, one can optionally set + up a type + + server that maps type URLs to message definitions as + follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based on + the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in the + official + + protobuf release, and it is not used for type URLs beginning + with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty scheme) + might be + + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer message + along with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any values in + the form + + of utility functions or additional generated methods of the Any + type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by default + use + + 'type.googleapis.com/full.type.name' as the type URL and the + unpack + + methods only use the fully qualified type name after the last + '/' + + in the type URL, for example "foo.bar.com/x/y.z" will yield type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the regular + + representation of the deserialized, embedded message, with an + + additional field `@type` which contains the type URL. Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a custom JSON + + representation, that representation will be embedded adding a + field + + `value` which holds the custom JSON in addition to the `@type` + + field. Example (for message [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + expiration: + type: string + format: date-time + title: >- + time when the grant will expire and will be pruned. If null, + then the grant + + doesn't have a time expiration (other conditions in + `authorization` + + may apply to invalidate the grant) + description: |- + Grant gives permissions to execute + the provide method with expiration time. + description: authorizations is a list of grants granted for grantee by granter. + pagination: + description: pagination defines an pagination for the response. + type: object + properties: + next_key: + type: string + format: byte + 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. + total: + type: string + format: uint64 + title: >- + total is total number of results available if + PageRequest.count_total + + was set, its value is undefined otherwise + description: >- + QueryGrantsResponse is the response type for the Query/Authorizations RPC + method. + cosmos.bank.v1beta1.DenomOwner: + type: object + properties: + address: + type: string + description: address defines the address that owns a particular denomination. + balance: + description: balance is the balance of the denominated coin for an account. + type: object + properties: + denom: + type: string + amount: + type: string + description: |- + DenomOwner defines structure representing an account that owns or holds a + particular denominated token. It contains the account address and account + balance of the denominated token. + + Since: cosmos-sdk 0.46 + cosmos.bank.v1beta1.DenomUnit: + type: object + properties: + denom: + type: string + description: denom represents the string name of the given denom unit (e.g uatom). + exponent: + type: integer + format: int64 + description: >- + exponent represents power of 10 exponent that one must + + raise the base_denom to in order to equal the given DenomUnit's denom + + 1 denom = 10^exponent base_denom + + (e.g. with a base_denom of uatom, one can create a DenomUnit of 'atom' + with + + exponent = 6, thus: 1 atom = 10^6 uatom). + aliases: + type: array + items: + type: string + title: aliases is a list of string aliases for the given denom + description: |- + DenomUnit represents a struct that describes a given + denomination unit of the basic token. + cosmos.bank.v1beta1.Input: + type: object + properties: + address: + type: string + coins: + type: array + items: + type: object + properties: + denom: + type: string + amount: + type: string + 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. + description: Input models transaction input. + cosmos.bank.v1beta1.Metadata: + type: object + properties: + description: + type: string + denom_units: + type: array + items: + type: object + properties: + denom: + type: string + description: >- + denom represents the string name of the given denom unit (e.g + uatom). + exponent: + type: integer + format: int64 + description: >- + exponent represents power of 10 exponent that one must + + raise the base_denom to in order to equal the given DenomUnit's + denom + + 1 denom = 10^exponent base_denom + + (e.g. with a base_denom of uatom, one can create a DenomUnit of + 'atom' with + + exponent = 6, thus: 1 atom = 10^6 uatom). + aliases: + type: array + items: + type: string + title: aliases is a list of string aliases for the given denom + description: |- + DenomUnit represents a struct that describes a given + denomination unit of the basic token. + title: denom_units represents the list of DenomUnit's for a given coin + base: + type: string + description: >- + base represents the base denom (should be the DenomUnit with exponent + = 0). + display: + type: string + description: |- + display indicates the suggested denom that should be + displayed in clients. + name: + type: string + description: 'Since: cosmos-sdk 0.43' + title: 'name defines the name of the token (eg: Cosmos Atom)' + symbol: + type: string + description: >- + symbol is the token symbol usually shown on exchanges (eg: ATOM). This + can + + be the same as the display. + + + Since: cosmos-sdk 0.43 + uri: + type: string + description: >- + URI to a document (on or off-chain) that contains additional + information. Optional. + + + Since: cosmos-sdk 0.46 + uri_hash: + type: string + description: >- + URIHash is a sha256 hash of a document pointed by URI. It's used to + verify that + + the document didn't change. Optional. + + + Since: cosmos-sdk 0.46 + description: |- + Metadata represents a struct that describes + a basic token. + cosmos.bank.v1beta1.MsgMultiSendResponse: + type: object + description: MsgMultiSendResponse defines the Msg/MultiSend response type. + cosmos.bank.v1beta1.MsgSendResponse: + type: object + description: MsgSendResponse defines the Msg/Send response type. + cosmos.bank.v1beta1.MsgSetSendEnabledResponse: + type: object + description: |- + MsgSetSendEnabledResponse defines the Msg/SetSendEnabled response type. + + Since: cosmos-sdk 0.47 + cosmos.bank.v1beta1.MsgUpdateParamsResponse: + type: object + description: |- + MsgUpdateParamsResponse defines the response structure for executing a + MsgUpdateParams message. + + Since: cosmos-sdk 0.47 + cosmos.bank.v1beta1.Output: + type: object + properties: + address: + type: string + coins: + type: array + items: + type: object + properties: + denom: + type: string + amount: + type: string + 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. + description: Output models transaction outputs. + cosmos.bank.v1beta1.Params: + type: object + properties: + send_enabled: + type: array + items: + type: object + properties: + denom: + type: string + enabled: + type: boolean + description: >- + SendEnabled maps coin denom to a send_enabled status (whether a + denom is + + sendable). + description: >- + Deprecated: Use of SendEnabled in params is deprecated. + + For genesis, use the newly added send_enabled field in the genesis + object. + + Storage, lookup, and manipulation of this information is now in the + keeper. + + + As of cosmos-sdk 0.47, this only exists for backwards compatibility of + genesis files. + default_send_enabled: + type: boolean + description: Params defines the parameters for the bank module. + cosmos.bank.v1beta1.QueryAllBalancesResponse: + type: object + properties: + balances: + type: array + items: + type: object + properties: + denom: + type: string + amount: + type: string + 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. + description: balances is the balances of all the coins. + pagination: + description: pagination defines the pagination in the response. + type: object + properties: + next_key: + type: string + format: byte + 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. + total: + type: string + format: uint64 + title: >- + total is total number of results available if + PageRequest.count_total + + was set, its value is undefined otherwise + description: >- + QueryAllBalancesResponse is the response type for the Query/AllBalances + RPC + + method. + cosmos.bank.v1beta1.QueryBalanceResponse: + type: object + properties: + balance: + description: balance is the balance of the coin. + type: object + properties: + denom: + type: string + amount: + type: string + description: >- + QueryBalanceResponse is the response type for the Query/Balance RPC + method. + cosmos.bank.v1beta1.QueryDenomMetadataResponse: + type: object + properties: + metadata: + description: >- + metadata describes and provides all the client information for the + requested token. + type: object + properties: + description: + type: string + denom_units: + type: array + items: + type: object + properties: + denom: + type: string + description: >- + denom represents the string name of the given denom unit + (e.g uatom). + exponent: + type: integer + format: int64 + description: >- + exponent represents power of 10 exponent that one must + + raise the base_denom to in order to equal the given + DenomUnit's denom + + 1 denom = 10^exponent base_denom + + (e.g. with a base_denom of uatom, one can create a DenomUnit + of 'atom' with + + exponent = 6, thus: 1 atom = 10^6 uatom). + aliases: + type: array + items: + type: string + title: aliases is a list of string aliases for the given denom + description: |- + DenomUnit represents a struct that describes a given + denomination unit of the basic token. + title: denom_units represents the list of DenomUnit's for a given coin + base: + type: string + description: >- + base represents the base denom (should be the DenomUnit with + exponent = 0). + display: + type: string + description: |- + display indicates the suggested denom that should be + displayed in clients. + name: + type: string + description: 'Since: cosmos-sdk 0.43' + title: 'name defines the name of the token (eg: Cosmos Atom)' + symbol: + type: string + description: >- + symbol is the token symbol usually shown on exchanges (eg: ATOM). + This can + + be the same as the display. + + + Since: cosmos-sdk 0.43 + uri: + type: string + description: >- + URI to a document (on or off-chain) that contains additional + information. Optional. + + + Since: cosmos-sdk 0.46 + uri_hash: + type: string + description: >- + URIHash is a sha256 hash of a document pointed by URI. It's used + to verify that + + the document didn't change. Optional. + + + Since: cosmos-sdk 0.46 + description: >- + QueryDenomMetadataResponse is the response type for the + Query/DenomMetadata RPC + + method. + cosmos.bank.v1beta1.QueryDenomOwnersResponse: + type: object + properties: + denom_owners: + type: array + items: + type: object + properties: + address: + type: string + description: address defines the address that owns a particular denomination. + balance: + description: balance is the balance of the denominated coin for an account. + type: object + properties: + denom: + type: string + amount: + type: string + description: >- + DenomOwner defines structure representing an account that owns or + holds a + + particular denominated token. It contains the account address and + account + + balance of the denominated token. + + + Since: cosmos-sdk 0.46 + pagination: + description: pagination defines the pagination in the response. + type: object + properties: + next_key: + type: string + format: byte + 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. + total: + type: string + format: uint64 + title: >- + total is total number of results available if + PageRequest.count_total + + was set, its value is undefined otherwise + description: >- + QueryDenomOwnersResponse defines the RPC response of a DenomOwners RPC + query. + + + Since: cosmos-sdk 0.46 + cosmos.bank.v1beta1.QueryDenomsMetadataResponse: + type: object + properties: + metadatas: + type: array + items: + type: object + properties: + description: + type: string + denom_units: + type: array + items: + type: object + properties: + denom: + type: string + description: >- + denom represents the string name of the given denom unit + (e.g uatom). + exponent: + type: integer + format: int64 + description: >- + exponent represents power of 10 exponent that one must + + raise the base_denom to in order to equal the given + DenomUnit's denom + + 1 denom = 10^exponent base_denom + + (e.g. with a base_denom of uatom, one can create a + DenomUnit of 'atom' with + + exponent = 6, thus: 1 atom = 10^6 uatom). + aliases: + type: array + items: + type: string + title: aliases is a list of string aliases for the given denom + description: |- + DenomUnit represents a struct that describes a given + denomination unit of the basic token. + title: denom_units represents the list of DenomUnit's for a given coin + base: + type: string + description: >- + base represents the base denom (should be the DenomUnit with + exponent = 0). + display: + type: string + description: |- + display indicates the suggested denom that should be + displayed in clients. + name: + type: string + description: 'Since: cosmos-sdk 0.43' + title: 'name defines the name of the token (eg: Cosmos Atom)' + symbol: + type: string + description: >- + symbol is the token symbol usually shown on exchanges (eg: + ATOM). This can + + be the same as the display. + + + Since: cosmos-sdk 0.43 + uri: + type: string + description: >- + URI to a document (on or off-chain) that contains additional + information. Optional. + + + Since: cosmos-sdk 0.46 + uri_hash: + type: string + description: >- + URIHash is a sha256 hash of a document pointed by URI. It's used + to verify that + + the document didn't change. Optional. + + + Since: cosmos-sdk 0.46 + description: |- + Metadata represents a struct that describes + a basic token. + description: >- + metadata provides the client information for all the registered + tokens. + pagination: + description: pagination defines the pagination in the response. + type: object + properties: + next_key: + type: string + format: byte + 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. + total: + type: string + format: uint64 + title: >- + total is total number of results available if + PageRequest.count_total + + was set, its value is undefined otherwise + description: >- + QueryDenomsMetadataResponse is the response type for the + Query/DenomsMetadata RPC + + method. + cosmos.bank.v1beta1.QueryParamsResponse: + type: object + properties: + params: + type: object + properties: + send_enabled: + type: array + items: + type: object + properties: + denom: + type: string + enabled: + type: boolean + description: >- + SendEnabled maps coin denom to a send_enabled status (whether a + denom is + + sendable). + description: >- + Deprecated: Use of SendEnabled in params is deprecated. + + For genesis, use the newly added send_enabled field in the genesis + object. + + Storage, lookup, and manipulation of this information is now in + the keeper. + + + As of cosmos-sdk 0.47, this only exists for backwards + compatibility of genesis files. + default_send_enabled: + type: boolean + description: Params defines the parameters for the bank module. + description: >- + QueryParamsResponse defines the response type for querying x/bank + parameters. + cosmos.bank.v1beta1.QuerySendEnabledResponse: + type: object + properties: + send_enabled: + type: array + items: + type: object + properties: + denom: + type: string + enabled: + type: boolean + description: >- + SendEnabled maps coin denom to a send_enabled status (whether a + denom is + + sendable). + pagination: + description: |- + pagination defines the pagination in the response. This field is only + populated if the denoms field in the request is empty. + type: object + properties: + next_key: + type: string + format: byte + 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. + total: + type: string + format: uint64 + title: >- + total is total number of results available if + PageRequest.count_total + + was set, its value is undefined otherwise + description: |- + QuerySendEnabledResponse defines the RPC response of a SendEnable query. + + Since: cosmos-sdk 0.47 + cosmos.bank.v1beta1.QuerySpendableBalanceByDenomResponse: + type: object + properties: + balance: + description: balance is the balance of the coin. + type: object + properties: + denom: + type: string + amount: + type: string + description: >- + QuerySpendableBalanceByDenomResponse defines the gRPC response structure + for + + querying an account's spendable balance for a specific denom. + + + Since: cosmos-sdk 0.47 + cosmos.bank.v1beta1.QuerySpendableBalancesResponse: + type: object + properties: + balances: + type: array + items: + type: object + properties: + denom: + type: string + amount: + type: string + 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. + description: balances is the spendable balances of all the coins. + pagination: + description: pagination defines the pagination in the response. + type: object + properties: + next_key: + type: string + format: byte + 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. + total: + type: string + format: uint64 + title: >- + total is total number of results available if + PageRequest.count_total + + was set, its value is undefined otherwise + description: >- + QuerySpendableBalancesResponse defines the gRPC response structure for + querying + + an account's spendable balances. + + + Since: cosmos-sdk 0.46 + cosmos.bank.v1beta1.QuerySupplyOfResponse: + type: object + properties: + amount: + description: amount is the supply of the coin. + type: object + properties: + denom: + type: string + amount: + type: string + description: >- + QuerySupplyOfResponse is the response type for the Query/SupplyOf RPC + method. + cosmos.bank.v1beta1.QueryTotalSupplyResponse: + type: object + properties: + supply: + type: array + items: + type: object + properties: + denom: + type: string + amount: + type: string + 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. + title: supply is the supply of the coins + pagination: + description: |- + pagination defines the pagination in the response. + + Since: cosmos-sdk 0.43 + type: object + properties: + next_key: + type: string + format: byte + 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. + total: + type: string + format: uint64 + title: >- + total is total number of results available if + PageRequest.count_total + + was set, its value is undefined otherwise + title: >- + QueryTotalSupplyResponse is the response type for the Query/TotalSupply + RPC + + method + cosmos.bank.v1beta1.SendEnabled: + type: object + properties: + denom: + type: string + enabled: + type: boolean + description: |- + SendEnabled maps coin denom to a send_enabled status (whether a denom is + sendable). + cosmos.base.v1beta1.Coin: + type: object + properties: + denom: + type: string + amount: + type: string + 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. + cosmos.base.tendermint.v1beta1.ABCIQueryResponse: + type: object + properties: + code: + type: integer + format: int64 + log: + type: string + title: nondeterministic + info: + type: string + title: nondeterministic + index: + type: string + format: int64 + key: + type: string + format: byte + value: + type: string + format: byte + proof_ops: + type: object + properties: + ops: + type: array + items: + type: object + properties: + type: + type: string + key: + type: string + format: byte + data: + type: string + format: byte + description: >- + ProofOp defines an operation used for calculating Merkle root. + The data could + + be arbitrary format, providing necessary data for example + neighbouring node + + hash. + + + Note: This type is a duplicate of the ProofOp proto type defined + in Tendermint. + description: >- + ProofOps is Merkle proof defined by the list of ProofOps. + + + Note: This type is a duplicate of the ProofOps proto type defined in + Tendermint. + height: + type: string + format: int64 + codespace: + type: string + description: >- + ABCIQueryResponse defines the response structure for the ABCIQuery gRPC + query. + + + Note: This type is a duplicate of the ResponseQuery proto type defined in + + Tendermint. + cosmos.base.tendermint.v1beta1.Block: + type: object + properties: + header: + type: object + properties: + version: + title: basic block info + type: object + properties: + block: + type: string + format: uint64 + app: + type: string + format: uint64 + description: >- + Consensus captures the consensus rules for processing a block in + the blockchain, + + including all blockchain data structures and the rules of the + application's + + state transition machine. + chain_id: + type: string + height: + type: string + format: int64 + time: + type: string + format: date-time + last_block_id: + type: object + properties: + hash: + type: string + format: byte + part_set_header: + type: object + properties: + total: + type: integer + format: int64 + hash: + type: string + format: byte + title: PartsetHeader + title: BlockID + last_commit_hash: + type: string + format: byte + description: commit from validators from the last block + title: hashes of block data + data_hash: + type: string + format: byte + title: transactions + validators_hash: + type: string + format: byte + description: validators for the current block + title: hashes from the app output from the prev block + next_validators_hash: + type: string + format: byte + title: validators for the next block + consensus_hash: + type: string + format: byte + title: consensus params for current block + app_hash: + type: string + format: byte + title: state after txs from the previous block + last_results_hash: + type: string + format: byte + title: root hash of all results from the txs from the previous block + evidence_hash: + type: string + format: byte + description: evidence included in the block + title: consensus info + proposer_address: + type: string + description: >- + proposer_address is the original block proposer address, formatted + as a Bech32 string. + + In Tendermint, this type is `bytes`, but in the SDK, we convert it + to a Bech32 string + + for better UX. + + + original proposer of the block + description: Header defines the structure of a Tendermint block header. + data: + type: object + properties: + txs: + type: array + items: + type: string + format: byte + description: >- + Txs that will be applied by state @ block.Height+1. + + NOTE: not all txs here are valid. We're just agreeing on the + order first. + + This means that block.AppHash does not include these txs. + title: Data contains the set of transactions included in the block + evidence: + type: object + properties: + evidence: + type: array + items: + type: object + properties: + duplicate_vote_evidence: + type: object + properties: + vote_a: + type: object + properties: + type: + type: string + enum: + - SIGNED_MSG_TYPE_UNKNOWN + - SIGNED_MSG_TYPE_PREVOTE + - SIGNED_MSG_TYPE_PRECOMMIT + - SIGNED_MSG_TYPE_PROPOSAL + default: SIGNED_MSG_TYPE_UNKNOWN + description: >- + SignedMsgType is a type of signed message in the + consensus. + + - SIGNED_MSG_TYPE_PREVOTE: Votes + - SIGNED_MSG_TYPE_PROPOSAL: Proposals + height: + type: string + format: int64 + round: + type: integer + format: int32 + block_id: + type: object + properties: + hash: + type: string + format: byte + part_set_header: + type: object + properties: + total: + type: integer + format: int64 + hash: + type: string + format: byte + title: PartsetHeader + title: BlockID + description: zero if vote is nil. + timestamp: + type: string + format: date-time + validator_address: + type: string + format: byte + validator_index: + type: integer + format: int32 + signature: + type: string + format: byte + description: >- + Vote represents a prevote, precommit, or commit vote + from validators for + + consensus. + vote_b: + type: object + properties: + type: + type: string + enum: + - SIGNED_MSG_TYPE_UNKNOWN + - SIGNED_MSG_TYPE_PREVOTE + - SIGNED_MSG_TYPE_PRECOMMIT + - SIGNED_MSG_TYPE_PROPOSAL + default: SIGNED_MSG_TYPE_UNKNOWN + description: >- + SignedMsgType is a type of signed message in the + consensus. + + - SIGNED_MSG_TYPE_PREVOTE: Votes + - SIGNED_MSG_TYPE_PROPOSAL: Proposals + height: + type: string + format: int64 + round: + type: integer + format: int32 + block_id: + type: object + properties: + hash: + type: string + format: byte + part_set_header: + type: object + properties: + total: + type: integer + format: int64 + hash: + type: string + format: byte + title: PartsetHeader + title: BlockID + description: zero if vote is nil. + timestamp: + type: string + format: date-time + validator_address: + type: string + format: byte + validator_index: + type: integer + format: int32 + signature: + type: string + format: byte + description: >- + Vote represents a prevote, precommit, or commit vote + from validators for + + consensus. + total_voting_power: + type: string + format: int64 + validator_power: + type: string + format: int64 + timestamp: + type: string + format: date-time + description: >- + DuplicateVoteEvidence contains evidence of a validator + signed two conflicting votes. + light_client_attack_evidence: + type: object + properties: + conflicting_block: + type: object + properties: + signed_header: + type: object + properties: + header: + type: object + properties: + version: + title: basic block info + type: object + properties: + block: + type: string + format: uint64 + app: + type: string + format: uint64 + description: >- + Consensus captures the consensus rules for + processing a block in the blockchain, + + including all blockchain data structures and + the rules of the application's + + state transition machine. + chain_id: + type: string + height: + type: string + format: int64 + time: + type: string + format: date-time + last_block_id: + type: object + properties: + hash: + type: string + format: byte + part_set_header: + type: object + properties: + total: + type: integer + format: int64 + hash: + type: string + format: byte + title: PartsetHeader + title: BlockID + last_commit_hash: + type: string + format: byte + description: commit from validators from the last block + title: hashes of block data + data_hash: + type: string + format: byte + title: transactions + validators_hash: + type: string + format: byte + description: validators for the current block + title: >- + hashes from the app output from the prev + block + next_validators_hash: + type: string + format: byte + title: validators for the next block + consensus_hash: + type: string + format: byte + title: consensus params for current block + app_hash: + type: string + format: byte + title: state after txs from the previous block + last_results_hash: + type: string + format: byte + title: >- + root hash of all results from the txs from + the previous block + evidence_hash: + type: string + format: byte + description: evidence included in the block + title: consensus info + proposer_address: + type: string + format: byte + title: original proposer of the block + description: Header defines the structure of a block header. + commit: + type: object + properties: + height: + type: string + format: int64 + round: + type: integer + format: int32 + block_id: + type: object + properties: + hash: + type: string + format: byte + part_set_header: + type: object + properties: + total: + type: integer + format: int64 + hash: + type: string + format: byte + title: PartsetHeader + title: BlockID + signatures: + type: array + items: + type: object + properties: + block_id_flag: + type: string + enum: + - BLOCK_ID_FLAG_UNKNOWN + - BLOCK_ID_FLAG_ABSENT + - BLOCK_ID_FLAG_COMMIT + - BLOCK_ID_FLAG_NIL + default: BLOCK_ID_FLAG_UNKNOWN + title: >- + BlockIdFlag indicates which BlcokID the + signature is for + validator_address: + type: string + format: byte + timestamp: + type: string + format: date-time + signature: + type: string + format: byte + description: >- + CommitSig is a part of the Vote included + in a Commit. + description: >- + Commit contains the evidence that a block was + committed by a set of validators. + validator_set: + type: object + properties: + validators: + type: array + items: + type: object + properties: + address: + type: string + format: byte + pub_key: + type: object + properties: + ed25519: + type: string + format: byte + secp256k1: + type: string + format: byte + title: >- + PublicKey defines the keys available for + use with Validators + voting_power: + type: string + format: int64 + proposer_priority: + type: string + format: int64 + proposer: + type: object + properties: + address: + type: string + format: byte + pub_key: + type: object + properties: + ed25519: + type: string + format: byte + secp256k1: + type: string + format: byte + title: >- + PublicKey defines the keys available for use + with Validators + voting_power: + type: string + format: int64 + proposer_priority: + type: string + format: int64 + total_voting_power: + type: string + format: int64 + common_height: + type: string + format: int64 + byzantine_validators: + type: array + items: + type: object + properties: + address: + type: string + format: byte + pub_key: + type: object + properties: + ed25519: + type: string + format: byte + secp256k1: + type: string + format: byte + title: >- + PublicKey defines the keys available for use with + Validators + voting_power: + type: string + format: int64 + proposer_priority: + type: string + format: int64 + total_voting_power: + type: string + format: int64 + timestamp: + type: string + format: date-time + description: >- + LightClientAttackEvidence contains evidence of a set of + validators attempting to mislead a light client. + last_commit: + type: object + properties: + height: + type: string + format: int64 + round: + type: integer + format: int32 + block_id: + type: object + properties: + hash: + type: string + format: byte + part_set_header: + type: object + properties: + total: + type: integer + format: int64 + hash: + type: string + format: byte + title: PartsetHeader + title: BlockID + signatures: + type: array + items: + type: object + properties: + block_id_flag: + type: string + enum: + - BLOCK_ID_FLAG_UNKNOWN + - BLOCK_ID_FLAG_ABSENT + - BLOCK_ID_FLAG_COMMIT + - BLOCK_ID_FLAG_NIL + default: BLOCK_ID_FLAG_UNKNOWN + title: BlockIdFlag indicates which BlcokID the signature is for + validator_address: + type: string + format: byte + timestamp: + type: string + format: date-time + signature: + type: string + format: byte + description: CommitSig is a part of the Vote included in a Commit. + description: >- + Commit contains the evidence that a block was committed by a set of + validators. + description: |- + Block is tendermint type Block, with the Header proposer address + field converted to bech32 string. + cosmos.base.tendermint.v1beta1.GetBlockByHeightResponse: + type: object + properties: + block_id: + type: object + properties: + hash: + type: string + format: byte + part_set_header: + type: object + properties: + total: + type: integer + format: int64 + hash: + type: string + format: byte + title: PartsetHeader + title: BlockID + block: + title: 'Deprecated: please use `sdk_block` instead' + type: object + properties: + header: + type: object + properties: + version: + title: basic block info + type: object + properties: + block: + type: string + format: uint64 + app: + type: string + format: uint64 + description: >- + Consensus captures the consensus rules for processing a block + in the blockchain, + + including all blockchain data structures and the rules of the + application's + + state transition machine. + chain_id: + type: string + height: + type: string + format: int64 + time: + type: string + format: date-time + last_block_id: + type: object + properties: + hash: + type: string + format: byte + part_set_header: + type: object + properties: + total: + type: integer + format: int64 + hash: + type: string + format: byte + title: PartsetHeader + title: BlockID + last_commit_hash: + type: string + format: byte + description: commit from validators from the last block + title: hashes of block data + data_hash: + type: string + format: byte + title: transactions + validators_hash: + type: string + format: byte + description: validators for the current block + title: hashes from the app output from the prev block + next_validators_hash: + type: string + format: byte + title: validators for the next block + consensus_hash: + type: string + format: byte + title: consensus params for current block + app_hash: + type: string + format: byte + title: state after txs from the previous block + last_results_hash: + type: string + format: byte + title: root hash of all results from the txs from the previous block + evidence_hash: + type: string + format: byte + description: evidence included in the block + title: consensus info + proposer_address: + type: string + format: byte + title: original proposer of the block + description: Header defines the structure of a block header. + data: + type: object + properties: + txs: + type: array + items: + type: string + format: byte + description: >- + Txs that will be applied by state @ block.Height+1. + + NOTE: not all txs here are valid. We're just agreeing on the + order first. + + This means that block.AppHash does not include these txs. + title: Data contains the set of transactions included in the block + evidence: + type: object + properties: + evidence: + type: array + items: + type: object + properties: + duplicate_vote_evidence: + type: object + properties: + vote_a: + type: object + properties: + type: + type: string + enum: + - SIGNED_MSG_TYPE_UNKNOWN + - SIGNED_MSG_TYPE_PREVOTE + - SIGNED_MSG_TYPE_PRECOMMIT + - SIGNED_MSG_TYPE_PROPOSAL + default: SIGNED_MSG_TYPE_UNKNOWN + description: >- + SignedMsgType is a type of signed message in the + consensus. + + - SIGNED_MSG_TYPE_PREVOTE: Votes + - SIGNED_MSG_TYPE_PROPOSAL: Proposals + height: + type: string + format: int64 + round: + type: integer + format: int32 + block_id: + type: object + properties: + hash: + type: string + format: byte + part_set_header: + type: object + properties: + total: + type: integer + format: int64 + hash: + type: string + format: byte + title: PartsetHeader + title: BlockID + description: zero if vote is nil. + timestamp: + type: string + format: date-time + validator_address: + type: string + format: byte + validator_index: + type: integer + format: int32 + signature: + type: string + format: byte + description: >- + Vote represents a prevote, precommit, or commit vote + from validators for + + consensus. + vote_b: + type: object + properties: + type: + type: string + enum: + - SIGNED_MSG_TYPE_UNKNOWN + - SIGNED_MSG_TYPE_PREVOTE + - SIGNED_MSG_TYPE_PRECOMMIT + - SIGNED_MSG_TYPE_PROPOSAL + default: SIGNED_MSG_TYPE_UNKNOWN + description: >- + SignedMsgType is a type of signed message in the + consensus. + + - SIGNED_MSG_TYPE_PREVOTE: Votes + - SIGNED_MSG_TYPE_PROPOSAL: Proposals + height: + type: string + format: int64 + round: + type: integer + format: int32 + block_id: + type: object + properties: + hash: + type: string + format: byte + part_set_header: + type: object + properties: + total: + type: integer + format: int64 + hash: + type: string + format: byte + title: PartsetHeader + title: BlockID + description: zero if vote is nil. + timestamp: + type: string + format: date-time + validator_address: + type: string + format: byte + validator_index: + type: integer + format: int32 + signature: + type: string + format: byte + description: >- + Vote represents a prevote, precommit, or commit vote + from validators for + + consensus. + total_voting_power: + type: string + format: int64 + validator_power: + type: string + format: int64 + timestamp: + type: string + format: date-time + description: >- + DuplicateVoteEvidence contains evidence of a validator + signed two conflicting votes. + light_client_attack_evidence: + type: object + properties: + conflicting_block: + type: object + properties: + signed_header: + type: object + properties: + header: + type: object + properties: + version: + title: basic block info + type: object + properties: + block: + type: string + format: uint64 + app: + type: string + format: uint64 + description: >- + Consensus captures the consensus rules + for processing a block in the + blockchain, + + including all blockchain data structures + and the rules of the application's + + state transition machine. + chain_id: + type: string + height: + type: string + format: int64 + time: + type: string + format: date-time + last_block_id: + type: object + properties: + hash: + type: string + format: byte + part_set_header: + type: object + properties: + total: + type: integer + format: int64 + hash: + type: string + format: byte + title: PartsetHeader + title: BlockID + last_commit_hash: + type: string + format: byte + description: >- + commit from validators from the last + block + title: hashes of block data + data_hash: + type: string + format: byte + title: transactions + validators_hash: + type: string + format: byte + description: validators for the current block + title: >- + hashes from the app output from the prev + block + next_validators_hash: + type: string + format: byte + title: validators for the next block + consensus_hash: + type: string + format: byte + title: consensus params for current block + app_hash: + type: string + format: byte + title: state after txs from the previous block + last_results_hash: + type: string + format: byte + title: >- + root hash of all results from the txs + from the previous block + evidence_hash: + type: string + format: byte + description: evidence included in the block + title: consensus info + proposer_address: + type: string + format: byte + title: original proposer of the block + description: >- + Header defines the structure of a block + header. + commit: + type: object + properties: + height: + type: string + format: int64 + round: + type: integer + format: int32 + block_id: + type: object + properties: + hash: + type: string + format: byte + part_set_header: + type: object + properties: + total: + type: integer + format: int64 + hash: + type: string + format: byte + title: PartsetHeader + title: BlockID + signatures: + type: array + items: + type: object + properties: + block_id_flag: + type: string + enum: + - BLOCK_ID_FLAG_UNKNOWN + - BLOCK_ID_FLAG_ABSENT + - BLOCK_ID_FLAG_COMMIT + - BLOCK_ID_FLAG_NIL + default: BLOCK_ID_FLAG_UNKNOWN + title: >- + BlockIdFlag indicates which BlcokID the + signature is for + validator_address: + type: string + format: byte + timestamp: + type: string + format: date-time + signature: + type: string + format: byte + description: >- + CommitSig is a part of the Vote included + in a Commit. + description: >- + Commit contains the evidence that a block + was committed by a set of validators. + validator_set: + type: object + properties: + validators: + type: array + items: + type: object + properties: + address: + type: string + format: byte + pub_key: + type: object + properties: + ed25519: + type: string + format: byte + secp256k1: + type: string + format: byte + title: >- + PublicKey defines the keys available for + use with Validators + voting_power: + type: string + format: int64 + proposer_priority: + type: string + format: int64 + proposer: + type: object + properties: + address: + type: string + format: byte + pub_key: + type: object + properties: + ed25519: + type: string + format: byte + secp256k1: + type: string + format: byte + title: >- + PublicKey defines the keys available for + use with Validators + voting_power: + type: string + format: int64 + proposer_priority: + type: string + format: int64 + total_voting_power: + type: string + format: int64 + common_height: + type: string + format: int64 + byzantine_validators: + type: array + items: + type: object + properties: + address: + type: string + format: byte + pub_key: + type: object + properties: + ed25519: + type: string + format: byte + secp256k1: + type: string + format: byte + title: >- + PublicKey defines the keys available for use + with Validators + voting_power: + type: string + format: int64 + proposer_priority: + type: string + format: int64 + total_voting_power: + type: string + format: int64 + timestamp: + type: string + format: date-time + description: >- + LightClientAttackEvidence contains evidence of a set of + validators attempting to mislead a light client. + last_commit: + type: object + properties: + height: + type: string + format: int64 + round: + type: integer + format: int32 + block_id: + type: object + properties: + hash: + type: string + format: byte + part_set_header: + type: object + properties: + total: + type: integer + format: int64 + hash: + type: string + format: byte + title: PartsetHeader + title: BlockID + signatures: + type: array + items: + type: object + properties: + block_id_flag: + type: string + enum: + - BLOCK_ID_FLAG_UNKNOWN + - BLOCK_ID_FLAG_ABSENT + - BLOCK_ID_FLAG_COMMIT + - BLOCK_ID_FLAG_NIL + default: BLOCK_ID_FLAG_UNKNOWN + title: BlockIdFlag indicates which BlcokID the signature is for + validator_address: + type: string + format: byte + timestamp: + type: string + format: date-time + signature: + type: string + format: byte + description: CommitSig is a part of the Vote included in a Commit. + description: >- + Commit contains the evidence that a block was committed by a set + of validators. + sdk_block: + title: 'Since: cosmos-sdk 0.47' + type: object + properties: + header: + type: object + properties: + version: + title: basic block info + type: object + properties: + block: + type: string + format: uint64 + app: + type: string + format: uint64 + description: >- + Consensus captures the consensus rules for processing a block + in the blockchain, + + including all blockchain data structures and the rules of the + application's + + state transition machine. + chain_id: + type: string + height: + type: string + format: int64 + time: + type: string + format: date-time + last_block_id: + type: object + properties: + hash: + type: string + format: byte + part_set_header: + type: object + properties: + total: + type: integer + format: int64 + hash: + type: string + format: byte + title: PartsetHeader + title: BlockID + last_commit_hash: + type: string + format: byte + description: commit from validators from the last block + title: hashes of block data + data_hash: + type: string + format: byte + title: transactions + validators_hash: + type: string + format: byte + description: validators for the current block + title: hashes from the app output from the prev block + next_validators_hash: + type: string + format: byte + title: validators for the next block + consensus_hash: + type: string + format: byte + title: consensus params for current block + app_hash: + type: string + format: byte + title: state after txs from the previous block + last_results_hash: + type: string + format: byte + title: root hash of all results from the txs from the previous block + evidence_hash: + type: string + format: byte + description: evidence included in the block + title: consensus info + proposer_address: + type: string + description: >- + proposer_address is the original block proposer address, + formatted as a Bech32 string. + + In Tendermint, this type is `bytes`, but in the SDK, we + convert it to a Bech32 string + + for better UX. + + + original proposer of the block + description: Header defines the structure of a Tendermint block header. + data: + type: object + properties: + txs: + type: array + items: + type: string + format: byte + description: >- + Txs that will be applied by state @ block.Height+1. + + NOTE: not all txs here are valid. We're just agreeing on the + order first. + + This means that block.AppHash does not include these txs. + title: Data contains the set of transactions included in the block + evidence: + type: object + properties: + evidence: + type: array + items: + type: object + properties: + duplicate_vote_evidence: + type: object + properties: + vote_a: + type: object + properties: + type: + type: string + enum: + - SIGNED_MSG_TYPE_UNKNOWN + - SIGNED_MSG_TYPE_PREVOTE + - SIGNED_MSG_TYPE_PRECOMMIT + - SIGNED_MSG_TYPE_PROPOSAL + default: SIGNED_MSG_TYPE_UNKNOWN + description: >- + SignedMsgType is a type of signed message in the + consensus. + + - SIGNED_MSG_TYPE_PREVOTE: Votes + - SIGNED_MSG_TYPE_PROPOSAL: Proposals + height: + type: string + format: int64 + round: + type: integer + format: int32 + block_id: + type: object + properties: + hash: + type: string + format: byte + part_set_header: + type: object + properties: + total: + type: integer + format: int64 + hash: + type: string + format: byte + title: PartsetHeader + title: BlockID + description: zero if vote is nil. + timestamp: + type: string + format: date-time + validator_address: + type: string + format: byte + validator_index: + type: integer + format: int32 + signature: + type: string + format: byte + description: >- + Vote represents a prevote, precommit, or commit vote + from validators for + + consensus. + vote_b: + type: object + properties: + type: + type: string + enum: + - SIGNED_MSG_TYPE_UNKNOWN + - SIGNED_MSG_TYPE_PREVOTE + - SIGNED_MSG_TYPE_PRECOMMIT + - SIGNED_MSG_TYPE_PROPOSAL + default: SIGNED_MSG_TYPE_UNKNOWN + description: >- + SignedMsgType is a type of signed message in the + consensus. + + - SIGNED_MSG_TYPE_PREVOTE: Votes + - SIGNED_MSG_TYPE_PROPOSAL: Proposals + height: + type: string + format: int64 + round: + type: integer + format: int32 + block_id: + type: object + properties: + hash: + type: string + format: byte + part_set_header: + type: object + properties: + total: + type: integer + format: int64 + hash: + type: string + format: byte + title: PartsetHeader + title: BlockID + description: zero if vote is nil. + timestamp: + type: string + format: date-time + validator_address: + type: string + format: byte + validator_index: + type: integer + format: int32 + signature: + type: string + format: byte + description: >- + Vote represents a prevote, precommit, or commit vote + from validators for + + consensus. + total_voting_power: + type: string + format: int64 + validator_power: + type: string + format: int64 + timestamp: + type: string + format: date-time + description: >- + DuplicateVoteEvidence contains evidence of a validator + signed two conflicting votes. + light_client_attack_evidence: + type: object + properties: + conflicting_block: + type: object + properties: + signed_header: + type: object + properties: + header: + type: object + properties: + version: + title: basic block info + type: object + properties: + block: + type: string + format: uint64 + app: + type: string + format: uint64 + description: >- + Consensus captures the consensus rules + for processing a block in the + blockchain, + + including all blockchain data structures + and the rules of the application's + + state transition machine. + chain_id: + type: string + height: + type: string + format: int64 + time: + type: string + format: date-time + last_block_id: + type: object + properties: + hash: + type: string + format: byte + part_set_header: + type: object + properties: + total: + type: integer + format: int64 + hash: + type: string + format: byte + title: PartsetHeader + title: BlockID + last_commit_hash: + type: string + format: byte + description: >- + commit from validators from the last + block + title: hashes of block data + data_hash: + type: string + format: byte + title: transactions + validators_hash: + type: string + format: byte + description: validators for the current block + title: >- + hashes from the app output from the prev + block + next_validators_hash: + type: string + format: byte + title: validators for the next block + consensus_hash: + type: string + format: byte + title: consensus params for current block + app_hash: + type: string + format: byte + title: state after txs from the previous block + last_results_hash: + type: string + format: byte + title: >- + root hash of all results from the txs + from the previous block + evidence_hash: + type: string + format: byte + description: evidence included in the block + title: consensus info + proposer_address: + type: string + format: byte + title: original proposer of the block + description: >- + Header defines the structure of a block + header. + commit: + type: object + properties: + height: + type: string + format: int64 + round: + type: integer + format: int32 + block_id: + type: object + properties: + hash: + type: string + format: byte + part_set_header: + type: object + properties: + total: + type: integer + format: int64 + hash: + type: string + format: byte + title: PartsetHeader + title: BlockID + signatures: + type: array + items: + type: object + properties: + block_id_flag: + type: string + enum: + - BLOCK_ID_FLAG_UNKNOWN + - BLOCK_ID_FLAG_ABSENT + - BLOCK_ID_FLAG_COMMIT + - BLOCK_ID_FLAG_NIL + default: BLOCK_ID_FLAG_UNKNOWN + title: >- + BlockIdFlag indicates which BlcokID the + signature is for + validator_address: + type: string + format: byte + timestamp: + type: string + format: date-time + signature: + type: string + format: byte + description: >- + CommitSig is a part of the Vote included + in a Commit. + description: >- + Commit contains the evidence that a block + was committed by a set of validators. + validator_set: + type: object + properties: + validators: + type: array + items: + type: object + properties: + address: + type: string + format: byte + pub_key: + type: object + properties: + ed25519: + type: string + format: byte + secp256k1: + type: string + format: byte + title: >- + PublicKey defines the keys available for + use with Validators + voting_power: + type: string + format: int64 + proposer_priority: + type: string + format: int64 + proposer: + type: object + properties: + address: + type: string + format: byte + pub_key: + type: object + properties: + ed25519: + type: string + format: byte + secp256k1: + type: string + format: byte + title: >- + PublicKey defines the keys available for + use with Validators + voting_power: + type: string + format: int64 + proposer_priority: + type: string + format: int64 + total_voting_power: + type: string + format: int64 + common_height: + type: string + format: int64 + byzantine_validators: + type: array + items: + type: object + properties: + address: + type: string + format: byte + pub_key: + type: object + properties: + ed25519: + type: string + format: byte + secp256k1: + type: string + format: byte + title: >- + PublicKey defines the keys available for use + with Validators + voting_power: + type: string + format: int64 + proposer_priority: + type: string + format: int64 + total_voting_power: + type: string + format: int64 + timestamp: + type: string + format: date-time + description: >- + LightClientAttackEvidence contains evidence of a set of + validators attempting to mislead a light client. + last_commit: + type: object + properties: + height: + type: string + format: int64 + round: + type: integer + format: int32 + block_id: + type: object + properties: + hash: + type: string + format: byte + part_set_header: + type: object + properties: + total: + type: integer + format: int64 + hash: + type: string + format: byte + title: PartsetHeader + title: BlockID + signatures: + type: array + items: + type: object + properties: + block_id_flag: + type: string + enum: + - BLOCK_ID_FLAG_UNKNOWN + - BLOCK_ID_FLAG_ABSENT + - BLOCK_ID_FLAG_COMMIT + - BLOCK_ID_FLAG_NIL + default: BLOCK_ID_FLAG_UNKNOWN + title: BlockIdFlag indicates which BlcokID the signature is for + validator_address: + type: string + format: byte + timestamp: + type: string + format: date-time + signature: + type: string + format: byte + description: CommitSig is a part of the Vote included in a Commit. + description: >- + Commit contains the evidence that a block was committed by a set + of validators. description: |- - display indicates the suggested denom that should be - displayed in clients. - name: - type: string - description: 'Since: cosmos-sdk 0.43' - title: 'name defines the name of the token (eg: Cosmos Atom)' - symbol: - type: string - description: >- - symbol is the token symbol usually shown on exchanges (eg: ATOM). This - can - - be the same as the display. - - - Since: cosmos-sdk 0.43 - description: |- - Metadata represents a struct that describes - a basic token. - cosmos.bank.v1beta1.MsgMultiSendResponse: - type: object - description: MsgMultiSendResponse defines the Msg/MultiSend response type. - cosmos.bank.v1beta1.MsgSendResponse: - type: object - description: MsgSendResponse defines the Msg/Send response type. - cosmos.bank.v1beta1.Output: - type: object - properties: - address: - type: string - coins: - type: array - items: - type: object - properties: - denom: - type: string - amount: - type: string - 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. - description: Output models transaction outputs. - cosmos.bank.v1beta1.Params: - type: object - properties: - send_enabled: - type: array - items: - type: object - properties: - denom: - type: string - enabled: - type: boolean - description: >- - SendEnabled maps coin denom to a send_enabled status (whether a - denom is - - sendable). - default_send_enabled: - type: boolean - description: Params defines the parameters for the bank module. - cosmos.bank.v1beta1.QueryAllBalancesResponse: - type: object - properties: - balances: - type: array - items: - type: object - properties: - denom: - type: string - amount: - type: string - 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. - description: balances is the balances of all the coins. - pagination: - description: pagination defines the pagination in the response. - type: object - properties: - next_key: - type: string - format: byte - title: |- - next_key is the key to be passed to PageRequest.key to - query the next page most efficiently - total: - type: string - format: uint64 - title: >- - total is total number of results available if - PageRequest.count_total - - was set, its value is undefined otherwise + Block is tendermint type Block, with the Header proposer address + field converted to bech32 string. description: >- - QueryAllBalancesResponse is the response type for the Query/AllBalances - RPC - - method. - cosmos.bank.v1beta1.QueryBalanceResponse: + GetBlockByHeightResponse is the response type for the + Query/GetBlockByHeight RPC method. + cosmos.base.tendermint.v1beta1.GetLatestBlockResponse: type: object properties: - balance: - description: balance is the balance of the coin. + block_id: type: object properties: - denom: - type: string - amount: + hash: type: string - description: >- - QueryBalanceResponse is the response type for the Query/Balance RPC - method. - cosmos.bank.v1beta1.QueryDenomMetadataResponse: - type: object - properties: - metadata: - description: >- - metadata describes and provides all the client information for the - requested token. + format: byte + part_set_header: + type: object + properties: + total: + type: integer + format: int64 + hash: + type: string + format: byte + title: PartsetHeader + title: BlockID + block: + title: 'Deprecated: please use `sdk_block` instead' type: object properties: - description: - type: string - denom_units: - type: array - items: - type: object - properties: - denom: - type: string - description: >- - denom represents the string name of the given denom unit - (e.g uatom). - exponent: - type: integer - format: int64 - description: >- - exponent represents power of 10 exponent that one must - - raise the base_denom to in order to equal the given - DenomUnit's denom - - 1 denom = 1^exponent base_denom - - (e.g. with a base_denom of uatom, one can create a DenomUnit - of 'atom' with - - exponent = 6, thus: 1 atom = 10^6 uatom). - aliases: - type: array - items: + header: + type: object + properties: + version: + title: basic block info + type: object + properties: + block: type: string - title: aliases is a list of string aliases for the given denom - description: |- - DenomUnit represents a struct that describes a given - denomination unit of the basic token. - title: denom_units represents the list of DenomUnit's for a given coin - base: - type: string - description: >- - base represents the base denom (should be the DenomUnit with - exponent = 0). - display: - type: string - description: |- - display indicates the suggested denom that should be - displayed in clients. - name: - type: string - description: 'Since: cosmos-sdk 0.43' - title: 'name defines the name of the token (eg: Cosmos Atom)' - symbol: - type: string - description: >- - symbol is the token symbol usually shown on exchanges (eg: ATOM). - This can - - be the same as the display. - + format: uint64 + app: + type: string + format: uint64 + description: >- + Consensus captures the consensus rules for processing a block + in the blockchain, - Since: cosmos-sdk 0.43 - description: >- - QueryDenomMetadataResponse is the response type for the - Query/DenomMetadata RPC + including all blockchain data structures and the rules of the + application's - method. - cosmos.bank.v1beta1.QueryDenomsMetadataResponse: - type: object - properties: - metadatas: - type: array - items: - type: object - properties: - description: - type: string - denom_units: - type: array - items: + state transition machine. + chain_id: + type: string + height: + type: string + format: int64 + time: + type: string + format: date-time + last_block_id: type: object properties: - denom: + hash: type: string - description: >- - denom represents the string name of the given denom unit - (e.g uatom). - exponent: - type: integer - format: int64 - description: >- - exponent represents power of 10 exponent that one must - - raise the base_denom to in order to equal the given - DenomUnit's denom - - 1 denom = 1^exponent base_denom - - (e.g. with a base_denom of uatom, one can create a - DenomUnit of 'atom' with - - exponent = 6, thus: 1 atom = 10^6 uatom). - aliases: - type: array - items: - type: string - title: aliases is a list of string aliases for the given denom - description: |- - DenomUnit represents a struct that describes a given - denomination unit of the basic token. - title: denom_units represents the list of DenomUnit's for a given coin - base: - type: string - description: >- - base represents the base denom (should be the DenomUnit with - exponent = 0). - display: - type: string - description: |- - display indicates the suggested denom that should be - displayed in clients. - name: - type: string - description: 'Since: cosmos-sdk 0.43' - title: 'name defines the name of the token (eg: Cosmos Atom)' - symbol: - type: string - description: >- - symbol is the token symbol usually shown on exchanges (eg: - ATOM). This can - - be the same as the display. - - - Since: cosmos-sdk 0.43 - description: |- - Metadata represents a struct that describes - a basic token. - description: >- - metadata provides the client information for all the registered - tokens. - pagination: - description: pagination defines the pagination in the response. - type: object - properties: - next_key: - type: string - format: byte - title: |- - next_key is the key to be passed to PageRequest.key to - query the next page most efficiently - total: - type: string - format: uint64 - title: >- - total is total number of results available if - PageRequest.count_total - - was set, its value is undefined otherwise - description: >- - QueryDenomsMetadataResponse is the response type for the - Query/DenomsMetadata RPC - - method. - cosmos.bank.v1beta1.QueryParamsResponse: - type: object - properties: - params: - type: object - properties: - send_enabled: - type: array - items: - type: object - properties: - denom: + format: byte + part_set_header: + type: object + properties: + total: + type: integer + format: int64 + hash: + type: string + format: byte + title: PartsetHeader + title: BlockID + last_commit_hash: + type: string + format: byte + description: commit from validators from the last block + title: hashes of block data + data_hash: + type: string + format: byte + title: transactions + validators_hash: + type: string + format: byte + description: validators for the current block + title: hashes from the app output from the prev block + next_validators_hash: + type: string + format: byte + title: validators for the next block + consensus_hash: + type: string + format: byte + title: consensus params for current block + app_hash: + type: string + format: byte + title: state after txs from the previous block + last_results_hash: + type: string + format: byte + title: root hash of all results from the txs from the previous block + evidence_hash: + type: string + format: byte + description: evidence included in the block + title: consensus info + proposer_address: + type: string + format: byte + title: original proposer of the block + description: Header defines the structure of a block header. + data: + type: object + properties: + txs: + type: array + items: type: string - enabled: - type: boolean - description: >- - SendEnabled maps coin denom to a send_enabled status (whether a - denom is + format: byte + description: >- + Txs that will be applied by state @ block.Height+1. - sendable). - default_send_enabled: - type: boolean - description: Params defines the parameters for the bank module. - description: >- - QueryParamsResponse defines the response type for querying x/bank - parameters. - cosmos.bank.v1beta1.QuerySpendableBalancesResponse: - type: object - properties: - balances: - type: array - items: - type: object - properties: - denom: - type: string - amount: - type: string - description: |- - Coin defines a token with a denomination and an amount. + NOTE: not all txs here are valid. We're just agreeing on the + order first. - NOTE: The amount field is an Int which implements the custom method - signatures required by gogoproto. - description: balances is the spendable balances of all the coins. - pagination: - description: pagination defines the pagination in the response. - type: object - properties: - next_key: - type: string - format: byte - title: |- - next_key is the key to be passed to PageRequest.key to - query the next page most efficiently - total: - type: string - format: uint64 - title: >- - total is total number of results available if - PageRequest.count_total + This means that block.AppHash does not include these txs. + title: Data contains the set of transactions included in the block + evidence: + type: object + properties: + evidence: + type: array + items: + type: object + properties: + duplicate_vote_evidence: + type: object + properties: + vote_a: + type: object + properties: + type: + type: string + enum: + - SIGNED_MSG_TYPE_UNKNOWN + - SIGNED_MSG_TYPE_PREVOTE + - SIGNED_MSG_TYPE_PRECOMMIT + - SIGNED_MSG_TYPE_PROPOSAL + default: SIGNED_MSG_TYPE_UNKNOWN + description: >- + SignedMsgType is a type of signed message in the + consensus. - was set, its value is undefined otherwise - description: >- - QuerySpendableBalancesResponse defines the gRPC response structure for - querying + - SIGNED_MSG_TYPE_PREVOTE: Votes + - SIGNED_MSG_TYPE_PROPOSAL: Proposals + height: + type: string + format: int64 + round: + type: integer + format: int32 + block_id: + type: object + properties: + hash: + type: string + format: byte + part_set_header: + type: object + properties: + total: + type: integer + format: int64 + hash: + type: string + format: byte + title: PartsetHeader + title: BlockID + description: zero if vote is nil. + timestamp: + type: string + format: date-time + validator_address: + type: string + format: byte + validator_index: + type: integer + format: int32 + signature: + type: string + format: byte + description: >- + Vote represents a prevote, precommit, or commit vote + from validators for - an account's spendable balances. - cosmos.bank.v1beta1.QuerySupplyOfResponse: - type: object - properties: - amount: - description: amount is the supply of the coin. - type: object - properties: - denom: - type: string - amount: - type: string - description: >- - QuerySupplyOfResponse is the response type for the Query/SupplyOf RPC - method. - cosmos.bank.v1beta1.QueryTotalSupplyResponse: - type: object - properties: - supply: - type: array - items: - type: object - properties: - denom: - type: string - amount: - type: string - description: |- - Coin defines a token with a denomination and an amount. + consensus. + vote_b: + type: object + properties: + type: + type: string + enum: + - SIGNED_MSG_TYPE_UNKNOWN + - SIGNED_MSG_TYPE_PREVOTE + - SIGNED_MSG_TYPE_PRECOMMIT + - SIGNED_MSG_TYPE_PROPOSAL + default: SIGNED_MSG_TYPE_UNKNOWN + description: >- + SignedMsgType is a type of signed message in the + consensus. - NOTE: The amount field is an Int which implements the custom method - signatures required by gogoproto. - title: supply is the supply of the coins - pagination: - description: |- - pagination defines the pagination in the response. + - SIGNED_MSG_TYPE_PREVOTE: Votes + - SIGNED_MSG_TYPE_PROPOSAL: Proposals + height: + type: string + format: int64 + round: + type: integer + format: int32 + block_id: + type: object + properties: + hash: + type: string + format: byte + part_set_header: + type: object + properties: + total: + type: integer + format: int64 + hash: + type: string + format: byte + title: PartsetHeader + title: BlockID + description: zero if vote is nil. + timestamp: + type: string + format: date-time + validator_address: + type: string + format: byte + validator_index: + type: integer + format: int32 + signature: + type: string + format: byte + description: >- + Vote represents a prevote, precommit, or commit vote + from validators for - Since: cosmos-sdk 0.43 - type: object - properties: - next_key: - type: string - format: byte - title: |- - next_key is the key to be passed to PageRequest.key to - query the next page most efficiently - total: - type: string - format: uint64 - title: >- - total is total number of results available if - PageRequest.count_total + consensus. + total_voting_power: + type: string + format: int64 + validator_power: + type: string + format: int64 + timestamp: + type: string + format: date-time + description: >- + DuplicateVoteEvidence contains evidence of a validator + signed two conflicting votes. + light_client_attack_evidence: + type: object + properties: + conflicting_block: + type: object + properties: + signed_header: + type: object + properties: + header: + type: object + properties: + version: + title: basic block info + type: object + properties: + block: + type: string + format: uint64 + app: + type: string + format: uint64 + description: >- + Consensus captures the consensus rules + for processing a block in the + blockchain, - was set, its value is undefined otherwise - title: >- - QueryTotalSupplyResponse is the response type for the Query/TotalSupply - RPC + including all blockchain data structures + and the rules of the application's - method - cosmos.bank.v1beta1.SendEnabled: - type: object - properties: - denom: - type: string - enabled: - type: boolean - description: |- - SendEnabled maps coin denom to a send_enabled status (whether a denom is - sendable). - cosmos.base.tendermint.v1beta1.GetBlockByHeightResponse: - type: object - properties: - block_id: - type: object - properties: - hash: - type: string - format: byte - part_set_header: + state transition machine. + chain_id: + type: string + height: + type: string + format: int64 + time: + type: string + format: date-time + last_block_id: + type: object + properties: + hash: + type: string + format: byte + part_set_header: + type: object + properties: + total: + type: integer + format: int64 + hash: + type: string + format: byte + title: PartsetHeader + title: BlockID + last_commit_hash: + type: string + format: byte + description: >- + commit from validators from the last + block + title: hashes of block data + data_hash: + type: string + format: byte + title: transactions + validators_hash: + type: string + format: byte + description: validators for the current block + title: >- + hashes from the app output from the prev + block + next_validators_hash: + type: string + format: byte + title: validators for the next block + consensus_hash: + type: string + format: byte + title: consensus params for current block + app_hash: + type: string + format: byte + title: state after txs from the previous block + last_results_hash: + type: string + format: byte + title: >- + root hash of all results from the txs + from the previous block + evidence_hash: + type: string + format: byte + description: evidence included in the block + title: consensus info + proposer_address: + type: string + format: byte + title: original proposer of the block + description: >- + Header defines the structure of a block + header. + commit: + type: object + properties: + height: + type: string + format: int64 + round: + type: integer + format: int32 + block_id: + type: object + properties: + hash: + type: string + format: byte + part_set_header: + type: object + properties: + total: + type: integer + format: int64 + hash: + type: string + format: byte + title: PartsetHeader + title: BlockID + signatures: + type: array + items: + type: object + properties: + block_id_flag: + type: string + enum: + - BLOCK_ID_FLAG_UNKNOWN + - BLOCK_ID_FLAG_ABSENT + - BLOCK_ID_FLAG_COMMIT + - BLOCK_ID_FLAG_NIL + default: BLOCK_ID_FLAG_UNKNOWN + title: >- + BlockIdFlag indicates which BlcokID the + signature is for + validator_address: + type: string + format: byte + timestamp: + type: string + format: date-time + signature: + type: string + format: byte + description: >- + CommitSig is a part of the Vote included + in a Commit. + description: >- + Commit contains the evidence that a block + was committed by a set of validators. + validator_set: + type: object + properties: + validators: + type: array + items: + type: object + properties: + address: + type: string + format: byte + pub_key: + type: object + properties: + ed25519: + type: string + format: byte + secp256k1: + type: string + format: byte + title: >- + PublicKey defines the keys available for + use with Validators + voting_power: + type: string + format: int64 + proposer_priority: + type: string + format: int64 + proposer: + type: object + properties: + address: + type: string + format: byte + pub_key: + type: object + properties: + ed25519: + type: string + format: byte + secp256k1: + type: string + format: byte + title: >- + PublicKey defines the keys available for + use with Validators + voting_power: + type: string + format: int64 + proposer_priority: + type: string + format: int64 + total_voting_power: + type: string + format: int64 + common_height: + type: string + format: int64 + byzantine_validators: + type: array + items: + type: object + properties: + address: + type: string + format: byte + pub_key: + type: object + properties: + ed25519: + type: string + format: byte + secp256k1: + type: string + format: byte + title: >- + PublicKey defines the keys available for use + with Validators + voting_power: + type: string + format: int64 + proposer_priority: + type: string + format: int64 + total_voting_power: + type: string + format: int64 + timestamp: + type: string + format: date-time + description: >- + LightClientAttackEvidence contains evidence of a set of + validators attempting to mislead a light client. + last_commit: type: object properties: - total: - type: integer - format: int64 - hash: + height: type: string - format: byte - title: PartsetHeader - title: BlockID - block: + format: int64 + round: + type: integer + format: int32 + block_id: + type: object + properties: + hash: + type: string + format: byte + part_set_header: + type: object + properties: + total: + type: integer + format: int64 + hash: + type: string + format: byte + title: PartsetHeader + title: BlockID + signatures: + type: array + items: + type: object + properties: + block_id_flag: + type: string + enum: + - BLOCK_ID_FLAG_UNKNOWN + - BLOCK_ID_FLAG_ABSENT + - BLOCK_ID_FLAG_COMMIT + - BLOCK_ID_FLAG_NIL + default: BLOCK_ID_FLAG_UNKNOWN + title: BlockIdFlag indicates which BlcokID the signature is for + validator_address: + type: string + format: byte + timestamp: + type: string + format: date-time + signature: + type: string + format: byte + description: CommitSig is a part of the Vote included in a Commit. + description: >- + Commit contains the evidence that a block was committed by a set + of validators. + sdk_block: + title: 'Since: cosmos-sdk 0.47' type: object properties: header: @@ -34429,9 +44912,18 @@ definitions: title: consensus info proposer_address: type: string - format: byte - title: original proposer of the block - description: Header defines the structure of a block header. + description: >- + proposer_address is the original block proposer address, + formatted as a Bech32 string. + + In Tendermint, this type is `bytes`, but in the SDK, we + convert it to a Bech32 string + + for better UX. + + + original proposer of the block + description: Header defines the structure of a Tendermint block header. data: type: object properties: @@ -34895,13 +45387,543 @@ definitions: description: >- Commit contains the evidence that a block was committed by a set of validators. + description: |- + Block is tendermint type Block, with the Header proposer address + field converted to bech32 string. description: >- - GetBlockByHeightResponse is the response type for the - Query/GetBlockByHeight RPC method. - cosmos.base.tendermint.v1beta1.GetLatestBlockResponse: + GetLatestBlockResponse is the response type for the Query/GetLatestBlock + RPC method. + cosmos.base.tendermint.v1beta1.GetLatestValidatorSetResponse: type: object properties: - block_id: + block_height: + type: string + format: int64 + validators: + type: array + items: + type: object + properties: + address: + type: string + pub_key: + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type of the + serialized + + protocol buffer message. This string must contain at least + + one "/" character. The last segment of the URL's path must + represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be in a + canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the binary all + types that they + + expect it to use in the context of Any. However, for URLs + which use the + + scheme `http`, `https`, or no scheme, one can optionally set + up a type + + server that maps type URLs to message definitions as + follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based on + the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in the + official + + protobuf release, and it is not used for type URLs beginning + with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty scheme) + might be + + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer message + along with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any values in + the form + + of utility functions or additional generated methods of the Any + type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by default + use + + 'type.googleapis.com/full.type.name' as the type URL and the + unpack + + methods only use the fully qualified type name after the last + '/' + + in the type URL, for example "foo.bar.com/x/y.z" will yield type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the regular + + representation of the deserialized, embedded message, with an + + additional field `@type` which contains the type URL. Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a custom JSON + + representation, that representation will be embedded adding a + field + + `value` which holds the custom JSON in addition to the `@type` + + field. Example (for message [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + voting_power: + type: string + format: int64 + proposer_priority: + type: string + format: int64 + description: Validator is the type for the validator-set. + pagination: + description: pagination defines an pagination for the response. + type: object + properties: + next_key: + type: string + format: byte + 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. + total: + type: string + format: uint64 + title: >- + total is total number of results available if + PageRequest.count_total + + was set, its value is undefined otherwise + description: >- + GetLatestValidatorSetResponse is the response type for the + Query/GetValidatorSetByHeight RPC method. + cosmos.base.tendermint.v1beta1.GetNodeInfoResponse: + type: object + properties: + default_node_info: + type: object + properties: + protocol_version: + type: object + properties: + p2p: + type: string + format: uint64 + block: + type: string + format: uint64 + app: + type: string + format: uint64 + default_node_id: + type: string + listen_addr: + type: string + network: + type: string + version: + type: string + channels: + type: string + format: byte + moniker: + type: string + other: + type: object + properties: + tx_index: + type: string + rpc_address: + type: string + application_version: + type: object + properties: + name: + type: string + app_name: + type: string + version: + type: string + git_commit: + type: string + build_tags: + type: string + go_version: + type: string + build_deps: + type: array + items: + type: object + properties: + path: + type: string + title: module path + version: + type: string + title: module version + sum: + type: string + title: checksum + title: Module is the type for VersionInfo + cosmos_sdk_version: + type: string + title: 'Since: cosmos-sdk 0.43' + description: VersionInfo is the type for the GetNodeInfoResponse message. + description: >- + GetNodeInfoResponse is the response type for the Query/GetNodeInfo RPC + method. + cosmos.base.tendermint.v1beta1.GetSyncingResponse: + type: object + properties: + syncing: + type: boolean + description: >- + GetSyncingResponse is the response type for the Query/GetSyncing RPC + method. + cosmos.base.tendermint.v1beta1.GetValidatorSetByHeightResponse: + type: object + properties: + block_height: + type: string + format: int64 + validators: + type: array + items: + type: object + properties: + address: + type: string + pub_key: + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type of the + serialized + + protocol buffer message. This string must contain at least + + one "/" character. The last segment of the URL's path must + represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be in a + canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the binary all + types that they + + expect it to use in the context of Any. However, for URLs + which use the + + scheme `http`, `https`, or no scheme, one can optionally set + up a type + + server that maps type URLs to message definitions as + follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based on + the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in the + official + + protobuf release, and it is not used for type URLs beginning + with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty scheme) + might be + + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer message + along with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any values in + the form + + of utility functions or additional generated methods of the Any + type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by default + use + + 'type.googleapis.com/full.type.name' as the type URL and the + unpack + + methods only use the fully qualified type name after the last + '/' + + in the type URL, for example "foo.bar.com/x/y.z" will yield type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the regular + + representation of the deserialized, embedded message, with an + + additional field `@type` which contains the type URL. Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a custom JSON + + representation, that representation will be embedded adding a + field + + `value` which holds the custom JSON in addition to the `@type` + + field. Example (for message [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + voting_power: + type: string + format: int64 + proposer_priority: + type: string + format: int64 + description: Validator is the type for the validator-set. + pagination: + description: pagination defines an pagination for the response. + type: object + properties: + next_key: + type: string + format: byte + 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. + total: + type: string + format: uint64 + title: >- + total is total number of results available if + PageRequest.count_total + + was set, its value is undefined otherwise + description: >- + GetValidatorSetByHeightResponse is the response type for the + Query/GetValidatorSetByHeight RPC method. + cosmos.base.tendermint.v1beta1.Header: + type: object + properties: + version: + title: basic block info + type: object + properties: + block: + type: string + format: uint64 + app: + type: string + format: uint64 + description: >- + Consensus captures the consensus rules for processing a block in the + blockchain, + + including all blockchain data structures and the rules of the + application's + + state transition machine. + chain_id: + type: string + height: + type: string + format: int64 + time: + type: string + format: date-time + last_block_id: type: object properties: hash: @@ -34918,1835 +45940,2577 @@ definitions: format: byte title: PartsetHeader title: BlockID + last_commit_hash: + type: string + format: byte + description: commit from validators from the last block + title: hashes of block data + data_hash: + type: string + format: byte + title: transactions + validators_hash: + type: string + format: byte + description: validators for the current block + title: hashes from the app output from the prev block + next_validators_hash: + type: string + format: byte + title: validators for the next block + consensus_hash: + type: string + format: byte + title: consensus params for current block + app_hash: + type: string + format: byte + title: state after txs from the previous block + last_results_hash: + type: string + format: byte + title: root hash of all results from the txs from the previous block + evidence_hash: + type: string + format: byte + description: evidence included in the block + title: consensus info + proposer_address: + type: string + description: >- + proposer_address is the original block proposer address, formatted as + a Bech32 string. + + In Tendermint, this type is `bytes`, but in the SDK, we convert it to + a Bech32 string + + for better UX. + + + original proposer of the block + description: Header defines the structure of a Tendermint block header. + cosmos.base.tendermint.v1beta1.Module: + type: object + properties: + path: + type: string + title: module path + version: + type: string + title: module version + sum: + type: string + title: checksum + title: Module is the type for VersionInfo + cosmos.base.tendermint.v1beta1.ProofOp: + type: object + properties: + type: + type: string + key: + type: string + format: byte + data: + type: string + format: byte + description: >- + ProofOp defines an operation used for calculating Merkle root. The data + could + + be arbitrary format, providing necessary data for example neighbouring + node + + hash. + + + Note: This type is a duplicate of the ProofOp proto type defined in + Tendermint. + cosmos.base.tendermint.v1beta1.ProofOps: + type: object + properties: + ops: + type: array + items: + type: object + properties: + type: + type: string + key: + type: string + format: byte + data: + type: string + format: byte + description: >- + ProofOp defines an operation used for calculating Merkle root. The + data could + + be arbitrary format, providing necessary data for example + neighbouring node + + hash. + + + Note: This type is a duplicate of the ProofOp proto type defined in + Tendermint. + description: >- + ProofOps is Merkle proof defined by the list of ProofOps. + + + Note: This type is a duplicate of the ProofOps proto type defined in + Tendermint. + cosmos.base.tendermint.v1beta1.Validator: + type: object + properties: + address: + type: string + pub_key: + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type of the + serialized + + protocol buffer message. This string must contain at least + + one "/" character. The last segment of the URL's path must + represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be in a + canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the binary all types + that they + + expect it to use in the context of Any. However, for URLs which + use the + + scheme `http`, `https`, or no scheme, one can optionally set up a + type + + server that maps type URLs to message definitions as follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in the + official + + protobuf release, and it is not used for type URLs beginning with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty scheme) might be + + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer message along + with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any values in the + form + + of utility functions or additional generated methods of the Any type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by default use + + 'type.googleapis.com/full.type.name' as the type URL and the unpack + + methods only use the fully qualified type name after the last '/' + + in the type URL, for example "foo.bar.com/x/y.z" will yield type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the regular + + representation of the deserialized, embedded message, with an + + additional field `@type` which contains the type URL. Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a custom JSON + + representation, that representation will be embedded adding a field + + `value` which holds the custom JSON in addition to the `@type` + + field. Example (for message [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + voting_power: + type: string + format: int64 + proposer_priority: + type: string + format: int64 + description: Validator is the type for the validator-set. + cosmos.base.tendermint.v1beta1.VersionInfo: + type: object + properties: + name: + type: string + app_name: + type: string + version: + type: string + git_commit: + type: string + build_tags: + type: string + go_version: + type: string + build_deps: + type: array + items: + type: object + properties: + path: + type: string + title: module path + version: + type: string + title: module version + sum: + type: string + title: checksum + title: Module is the type for VersionInfo + cosmos_sdk_version: + type: string + title: 'Since: cosmos-sdk 0.43' + description: VersionInfo is the type for the GetNodeInfoResponse message. + tendermint.crypto.PublicKey: + type: object + properties: + ed25519: + type: string + format: byte + secp256k1: + type: string + format: byte + title: PublicKey defines the keys available for use with Validators + tendermint.p2p.DefaultNodeInfo: + type: object + properties: + protocol_version: + type: object + properties: + p2p: + type: string + format: uint64 + block: + type: string + format: uint64 + app: + type: string + format: uint64 + default_node_id: + type: string + listen_addr: + type: string + network: + type: string + version: + type: string + channels: + type: string + format: byte + moniker: + type: string + other: + type: object + properties: + tx_index: + type: string + rpc_address: + type: string + tendermint.p2p.DefaultNodeInfoOther: + type: object + properties: + tx_index: + type: string + rpc_address: + type: string + tendermint.p2p.ProtocolVersion: + type: object + properties: + p2p: + type: string + format: uint64 block: + type: string + format: uint64 + app: + type: string + format: uint64 + tendermint.types.Block: + type: object + properties: + header: type: object properties: - header: + version: + title: basic block info type: object properties: - version: - title: basic block info - type: object - properties: - block: - type: string - format: uint64 - app: - type: string - format: uint64 - description: >- - Consensus captures the consensus rules for processing a block - in the blockchain, - - including all blockchain data structures and the rules of the - application's - - state transition machine. - chain_id: + block: type: string - height: + format: uint64 + app: type: string - format: int64 - time: + format: uint64 + description: >- + Consensus captures the consensus rules for processing a block in + the blockchain, + + including all blockchain data structures and the rules of the + application's + + state transition machine. + chain_id: + type: string + height: + type: string + format: int64 + time: + type: string + format: date-time + last_block_id: + type: object + properties: + hash: type: string - format: date-time - last_block_id: + format: byte + part_set_header: type: object properties: + total: + type: integer + format: int64 hash: type: string format: byte - part_set_header: - type: object - properties: - total: - type: integer - format: int64 - hash: - type: string - format: byte - title: PartsetHeader - title: BlockID - last_commit_hash: - type: string - format: byte - description: commit from validators from the last block - title: hashes of block data - data_hash: - type: string - format: byte - title: transactions - validators_hash: - type: string - format: byte - description: validators for the current block - title: hashes from the app output from the prev block - next_validators_hash: - type: string - format: byte - title: validators for the next block - consensus_hash: - type: string - format: byte - title: consensus params for current block - app_hash: - type: string - format: byte - title: state after txs from the previous block - last_results_hash: - type: string - format: byte - title: root hash of all results from the txs from the previous block - evidence_hash: - type: string - format: byte - description: evidence included in the block - title: consensus info - proposer_address: - type: string - format: byte - title: original proposer of the block - description: Header defines the structure of a block header. - data: - type: object - properties: - txs: - type: array - items: - type: string - format: byte - description: >- - Txs that will be applied by state @ block.Height+1. + title: PartsetHeader + title: BlockID + last_commit_hash: + type: string + format: byte + description: commit from validators from the last block + title: hashes of block data + data_hash: + type: string + format: byte + title: transactions + validators_hash: + type: string + format: byte + description: validators for the current block + title: hashes from the app output from the prev block + next_validators_hash: + type: string + format: byte + title: validators for the next block + consensus_hash: + type: string + format: byte + title: consensus params for current block + app_hash: + type: string + format: byte + title: state after txs from the previous block + last_results_hash: + type: string + format: byte + title: root hash of all results from the txs from the previous block + evidence_hash: + type: string + format: byte + description: evidence included in the block + title: consensus info + proposer_address: + type: string + format: byte + title: original proposer of the block + description: Header defines the structure of a block header. + data: + type: object + properties: + txs: + type: array + items: + type: string + format: byte + description: >- + Txs that will be applied by state @ block.Height+1. - NOTE: not all txs here are valid. We're just agreeing on the - order first. + NOTE: not all txs here are valid. We're just agreeing on the + order first. - This means that block.AppHash does not include these txs. - title: Data contains the set of transactions included in the block + This means that block.AppHash does not include these txs. + title: Data contains the set of transactions included in the block + evidence: + type: object + properties: evidence: - type: object - properties: - evidence: - type: array - items: + type: array + items: + type: object + properties: + duplicate_vote_evidence: type: object properties: - duplicate_vote_evidence: + vote_a: type: object properties: - vote_a: + type: + type: string + enum: + - SIGNED_MSG_TYPE_UNKNOWN + - SIGNED_MSG_TYPE_PREVOTE + - SIGNED_MSG_TYPE_PRECOMMIT + - SIGNED_MSG_TYPE_PROPOSAL + default: SIGNED_MSG_TYPE_UNKNOWN + description: >- + SignedMsgType is a type of signed message in the + consensus. + + - SIGNED_MSG_TYPE_PREVOTE: Votes + - SIGNED_MSG_TYPE_PROPOSAL: Proposals + height: + type: string + format: int64 + round: + type: integer + format: int32 + block_id: type: object properties: - type: - type: string - enum: - - SIGNED_MSG_TYPE_UNKNOWN - - SIGNED_MSG_TYPE_PREVOTE - - SIGNED_MSG_TYPE_PRECOMMIT - - SIGNED_MSG_TYPE_PROPOSAL - default: SIGNED_MSG_TYPE_UNKNOWN - description: >- - SignedMsgType is a type of signed message in the - consensus. - - - SIGNED_MSG_TYPE_PREVOTE: Votes - - SIGNED_MSG_TYPE_PROPOSAL: Proposals - height: + hash: type: string - format: int64 - round: - type: integer - format: int32 - block_id: + format: byte + part_set_header: type: object properties: + total: + type: integer + format: int64 hash: type: string format: byte - part_set_header: - type: object - properties: - total: - type: integer - format: int64 - hash: - type: string - format: byte - title: PartsetHeader - title: BlockID - description: zero if vote is nil. - timestamp: - type: string - format: date-time - validator_address: - type: string - format: byte - validator_index: - type: integer - format: int32 - signature: - type: string - format: byte - description: >- - Vote represents a prevote, precommit, or commit vote - from validators for + title: PartsetHeader + title: BlockID + description: zero if vote is nil. + timestamp: + type: string + format: date-time + validator_address: + type: string + format: byte + validator_index: + type: integer + format: int32 + signature: + type: string + format: byte + description: >- + Vote represents a prevote, precommit, or commit vote + from validators for + consensus. + vote_b: + type: object + properties: + type: + type: string + enum: + - SIGNED_MSG_TYPE_UNKNOWN + - SIGNED_MSG_TYPE_PREVOTE + - SIGNED_MSG_TYPE_PRECOMMIT + - SIGNED_MSG_TYPE_PROPOSAL + default: SIGNED_MSG_TYPE_UNKNOWN + description: >- + SignedMsgType is a type of signed message in the consensus. - vote_b: + + - SIGNED_MSG_TYPE_PREVOTE: Votes + - SIGNED_MSG_TYPE_PROPOSAL: Proposals + height: + type: string + format: int64 + round: + type: integer + format: int32 + block_id: type: object properties: - type: - type: string - enum: - - SIGNED_MSG_TYPE_UNKNOWN - - SIGNED_MSG_TYPE_PREVOTE - - SIGNED_MSG_TYPE_PRECOMMIT - - SIGNED_MSG_TYPE_PROPOSAL - default: SIGNED_MSG_TYPE_UNKNOWN - description: >- - SignedMsgType is a type of signed message in the - consensus. - - - SIGNED_MSG_TYPE_PREVOTE: Votes - - SIGNED_MSG_TYPE_PROPOSAL: Proposals - height: + hash: type: string - format: int64 - round: - type: integer - format: int32 - block_id: + format: byte + part_set_header: type: object properties: + total: + type: integer + format: int64 hash: type: string format: byte - part_set_header: - type: object - properties: - total: - type: integer - format: int64 - hash: - type: string - format: byte - title: PartsetHeader - title: BlockID - description: zero if vote is nil. - timestamp: - type: string - format: date-time - validator_address: - type: string - format: byte - validator_index: - type: integer - format: int32 - signature: - type: string - format: byte - description: >- - Vote represents a prevote, precommit, or commit vote - from validators for - - consensus. - total_voting_power: - type: string - format: int64 - validator_power: - type: string - format: int64 + title: PartsetHeader + title: BlockID + description: zero if vote is nil. timestamp: type: string format: date-time + validator_address: + type: string + format: byte + validator_index: + type: integer + format: int32 + signature: + type: string + format: byte description: >- - DuplicateVoteEvidence contains evidence of a validator - signed two conflicting votes. - light_client_attack_evidence: + Vote represents a prevote, precommit, or commit vote + from validators for + + consensus. + total_voting_power: + type: string + format: int64 + validator_power: + type: string + format: int64 + timestamp: + type: string + format: date-time + description: >- + DuplicateVoteEvidence contains evidence of a validator + signed two conflicting votes. + light_client_attack_evidence: + type: object + properties: + conflicting_block: type: object properties: - conflicting_block: + signed_header: type: object properties: - signed_header: + header: type: object properties: - header: + version: + title: basic block info type: object properties: - version: - title: basic block info - type: object - properties: - block: - type: string - format: uint64 - app: - type: string - format: uint64 - description: >- - Consensus captures the consensus rules - for processing a block in the - blockchain, - - including all blockchain data structures - and the rules of the application's - - state transition machine. - chain_id: - type: string - height: - type: string - format: int64 - time: - type: string - format: date-time - last_block_id: - type: object - properties: - hash: - type: string - format: byte - part_set_header: - type: object - properties: - total: - type: integer - format: int64 - hash: - type: string - format: byte - title: PartsetHeader - title: BlockID - last_commit_hash: - type: string - format: byte - description: >- - commit from validators from the last - block - title: hashes of block data - data_hash: - type: string - format: byte - title: transactions - validators_hash: - type: string - format: byte - description: validators for the current block - title: >- - hashes from the app output from the prev - block - next_validators_hash: - type: string - format: byte - title: validators for the next block - consensus_hash: - type: string - format: byte - title: consensus params for current block - app_hash: - type: string - format: byte - title: state after txs from the previous block - last_results_hash: - type: string - format: byte - title: >- - root hash of all results from the txs - from the previous block - evidence_hash: + block: type: string - format: byte - description: evidence included in the block - title: consensus info - proposer_address: + format: uint64 + app: type: string - format: byte - title: original proposer of the block + format: uint64 description: >- - Header defines the structure of a block - header. - commit: + Consensus captures the consensus rules for + processing a block in the blockchain, + + including all blockchain data structures and + the rules of the application's + + state transition machine. + chain_id: + type: string + height: + type: string + format: int64 + time: + type: string + format: date-time + last_block_id: type: object properties: - height: + hash: type: string - format: int64 - round: - type: integer - format: int32 - block_id: + format: byte + part_set_header: type: object properties: + total: + type: integer + format: int64 hash: type: string format: byte - part_set_header: - type: object - properties: - total: - type: integer - format: int64 - hash: - type: string - format: byte - title: PartsetHeader - title: BlockID - signatures: - type: array - items: - type: object - properties: - block_id_flag: - type: string - enum: - - BLOCK_ID_FLAG_UNKNOWN - - BLOCK_ID_FLAG_ABSENT - - BLOCK_ID_FLAG_COMMIT - - BLOCK_ID_FLAG_NIL - default: BLOCK_ID_FLAG_UNKNOWN - title: >- - BlockIdFlag indicates which BlcokID the - signature is for - validator_address: - type: string - format: byte - timestamp: - type: string - format: date-time - signature: - type: string - format: byte - description: >- - CommitSig is a part of the Vote included - in a Commit. - description: >- - Commit contains the evidence that a block - was committed by a set of validators. - validator_set: + title: PartsetHeader + title: BlockID + last_commit_hash: + type: string + format: byte + description: commit from validators from the last block + title: hashes of block data + data_hash: + type: string + format: byte + title: transactions + validators_hash: + type: string + format: byte + description: validators for the current block + title: >- + hashes from the app output from the prev + block + next_validators_hash: + type: string + format: byte + title: validators for the next block + consensus_hash: + type: string + format: byte + title: consensus params for current block + app_hash: + type: string + format: byte + title: state after txs from the previous block + last_results_hash: + type: string + format: byte + title: >- + root hash of all results from the txs from + the previous block + evidence_hash: + type: string + format: byte + description: evidence included in the block + title: consensus info + proposer_address: + type: string + format: byte + title: original proposer of the block + description: Header defines the structure of a block header. + commit: type: object properties: - validators: + height: + type: string + format: int64 + round: + type: integer + format: int32 + block_id: + type: object + properties: + hash: + type: string + format: byte + part_set_header: + type: object + properties: + total: + type: integer + format: int64 + hash: + type: string + format: byte + title: PartsetHeader + title: BlockID + signatures: type: array items: type: object properties: - address: + block_id_flag: type: string - format: byte - pub_key: - type: object - properties: - ed25519: - type: string - format: byte - secp256k1: - type: string - format: byte + enum: + - BLOCK_ID_FLAG_UNKNOWN + - BLOCK_ID_FLAG_ABSENT + - BLOCK_ID_FLAG_COMMIT + - BLOCK_ID_FLAG_NIL + default: BLOCK_ID_FLAG_UNKNOWN title: >- - PublicKey defines the keys available for - use with Validators - voting_power: + BlockIdFlag indicates which BlcokID the + signature is for + validator_address: type: string - format: int64 - proposer_priority: + format: byte + timestamp: type: string - format: int64 - proposer: + format: date-time + signature: + type: string + format: byte + description: >- + CommitSig is a part of the Vote included + in a Commit. + description: >- + Commit contains the evidence that a block was + committed by a set of validators. + validator_set: + type: object + properties: + validators: + type: array + items: + type: object + properties: + address: + type: string + format: byte + pub_key: + type: object + properties: + ed25519: + type: string + format: byte + secp256k1: + type: string + format: byte + title: >- + PublicKey defines the keys available for + use with Validators + voting_power: + type: string + format: int64 + proposer_priority: + type: string + format: int64 + proposer: + type: object + properties: + address: + type: string + format: byte + pub_key: type: object properties: - address: + ed25519: type: string format: byte - pub_key: - type: object - properties: - ed25519: - type: string - format: byte - secp256k1: - type: string - format: byte - title: >- - PublicKey defines the keys available for - use with Validators - voting_power: - type: string - format: int64 - proposer_priority: + secp256k1: type: string - format: int64 - total_voting_power: + format: byte + title: >- + PublicKey defines the keys available for use + with Validators + voting_power: type: string format: int64 - common_height: - type: string - format: int64 - byzantine_validators: - type: array - items: + proposer_priority: + type: string + format: int64 + total_voting_power: + type: string + format: int64 + common_height: + type: string + format: int64 + byzantine_validators: + type: array + items: + type: object + properties: + address: + type: string + format: byte + pub_key: type: object properties: - address: + ed25519: type: string format: byte - pub_key: - type: object - properties: - ed25519: - type: string - format: byte - secp256k1: - type: string - format: byte - title: >- - PublicKey defines the keys available for use - with Validators - voting_power: - type: string - format: int64 - proposer_priority: + secp256k1: type: string - format: int64 - total_voting_power: - type: string - format: int64 - timestamp: - type: string - format: date-time - description: >- - LightClientAttackEvidence contains evidence of a set of - validators attempting to mislead a light client. - last_commit: - type: object - properties: - height: - type: string - format: int64 - round: - type: integer - format: int32 - block_id: - type: object - properties: - hash: - type: string - format: byte - part_set_header: - type: object - properties: - total: - type: integer - format: int64 - hash: - type: string - format: byte - title: PartsetHeader - title: BlockID - signatures: - type: array - items: - type: object - properties: - block_id_flag: - type: string - enum: - - BLOCK_ID_FLAG_UNKNOWN - - BLOCK_ID_FLAG_ABSENT - - BLOCK_ID_FLAG_COMMIT - - BLOCK_ID_FLAG_NIL - default: BLOCK_ID_FLAG_UNKNOWN - title: BlockIdFlag indicates which BlcokID the signature is for - validator_address: + format: byte + title: >- + PublicKey defines the keys available for use with + Validators + voting_power: + type: string + format: int64 + proposer_priority: + type: string + format: int64 + total_voting_power: type: string - format: byte + format: int64 timestamp: type: string format: date-time - signature: - type: string - format: byte - description: CommitSig is a part of the Vote included in a Commit. - description: >- - Commit contains the evidence that a block was committed by a set - of validators. - description: >- - GetLatestBlockResponse is the response type for the Query/GetLatestBlock - RPC method. - cosmos.base.tendermint.v1beta1.GetLatestValidatorSetResponse: - type: object - properties: - block_height: - type: string - format: int64 - validators: - type: array - items: - type: object - properties: - address: - type: string - pub_key: - type: object - properties: - '@type': - type: string description: >- - A URL/resource name that uniquely identifies the type of the - serialized - - protocol buffer message. This string must contain at least - - one "/" character. The last segment of the URL's path must - represent - - the fully qualified name of the type (as in - - `path/google.protobuf.Duration`). The name should be in a - canonical form - - (e.g., leading "." is not accepted). - - - In practice, teams usually precompile into the binary all - types that they - - expect it to use in the context of Any. However, for URLs - which use the - - scheme `http`, `https`, or no scheme, one can optionally set - up a type - - server that maps type URLs to message definitions as - follows: - - - * If no scheme is provided, `https` is assumed. - - * An HTTP GET on the URL must yield a - [google.protobuf.Type][] - value in binary format, or produce an error. - * Applications are allowed to cache lookup results based on - the - URL, or have them precompiled into a binary to avoid any - lookup. Therefore, binary compatibility needs to be preserved - on changes to types. (Use versioned type names to manage - breaking changes.) - - Note: this functionality is not currently available in the - official - - protobuf release, and it is not used for type URLs beginning - with - - type.googleapis.com. - - - Schemes other than `http`, `https` (or the empty scheme) - might be - - used with implementation specific semantics. - additionalProperties: {} - description: >- - `Any` contains an arbitrary serialized protocol buffer message - along with a - - URL that describes the type of the serialized message. - - - Protobuf library provides support to pack/unpack Any values in - the form - - of utility functions or additional generated methods of the Any - type. - - - Example 1: Pack and unpack a message in C++. - - Foo foo = ...; - Any any; - any.PackFrom(foo); - ... - if (any.UnpackTo(&foo)) { - ... - } - - Example 2: Pack and unpack a message in Java. - - Foo foo = ...; - Any any = Any.pack(foo); - ... - if (any.is(Foo.class)) { - foo = any.unpack(Foo.class); - } - - Example 3: Pack and unpack a message in Python. - - foo = Foo(...) - any = Any() - any.Pack(foo) - ... - if any.Is(Foo.DESCRIPTOR): - any.Unpack(foo) - ... - - Example 4: Pack and unpack a message in Go - - foo := &pb.Foo{...} - any, err := anypb.New(foo) - if err != nil { - ... - } - ... - foo := &pb.Foo{} - if err := any.UnmarshalTo(foo); err != nil { - ... - } - - The pack methods provided by protobuf library will by default - use - - 'type.googleapis.com/full.type.name' as the type URL and the - unpack - - methods only use the fully qualified type name after the last - '/' - - in the type URL, for example "foo.bar.com/x/y.z" will yield type - - name "y.z". - - - - JSON - - ==== - - The JSON representation of an `Any` value uses the regular - - representation of the deserialized, embedded message, with an - - additional field `@type` which contains the type URL. Example: - - package google.profile; - message Person { - string first_name = 1; - string last_name = 2; - } - - { - "@type": "type.googleapis.com/google.profile.Person", - "firstName": , - "lastName": - } - - If the embedded message type is well-known and has a custom JSON - - representation, that representation will be embedded adding a - field - - `value` which holds the custom JSON in addition to the `@type` - - field. Example (for message [google.protobuf.Duration][]): - - { - "@type": "type.googleapis.com/google.protobuf.Duration", - "value": "1.212s" - } - voting_power: - type: string - format: int64 - proposer_priority: - type: string - format: int64 - description: Validator is the type for the validator-set. - pagination: - description: pagination defines an pagination for the response. - type: object - properties: - next_key: - type: string - format: byte - title: |- - next_key is the key to be passed to PageRequest.key to - query the next page most efficiently - total: - type: string - format: uint64 - title: >- - total is total number of results available if - PageRequest.count_total - - was set, its value is undefined otherwise - description: >- - GetLatestValidatorSetResponse is the response type for the - Query/GetValidatorSetByHeight RPC method. - cosmos.base.tendermint.v1beta1.GetNodeInfoResponse: - type: object - properties: - default_node_info: + LightClientAttackEvidence contains evidence of a set of + validators attempting to mislead a light client. + last_commit: type: object properties: - protocol_version: - type: object - properties: - p2p: - type: string - format: uint64 - block: - type: string - format: uint64 - app: - type: string - format: uint64 - default_node_id: - type: string - listen_addr: - type: string - network: - type: string - version: - type: string - channels: - type: string - format: byte - moniker: + height: type: string - other: + format: int64 + round: + type: integer + format: int32 + block_id: type: object properties: - tx_index: - type: string - rpc_address: + hash: type: string - application_version: - type: object - properties: - name: - type: string - app_name: - type: string - version: - type: string - git_commit: - type: string - build_tags: - type: string - go_version: - type: string - build_deps: + format: byte + part_set_header: + type: object + properties: + total: + type: integer + format: int64 + hash: + type: string + format: byte + title: PartsetHeader + title: BlockID + signatures: type: array items: type: object properties: - path: + block_id_flag: + type: string + enum: + - BLOCK_ID_FLAG_UNKNOWN + - BLOCK_ID_FLAG_ABSENT + - BLOCK_ID_FLAG_COMMIT + - BLOCK_ID_FLAG_NIL + default: BLOCK_ID_FLAG_UNKNOWN + title: BlockIdFlag indicates which BlcokID the signature is for + validator_address: type: string - title: module path - version: + format: byte + timestamp: type: string - title: module version - sum: + format: date-time + signature: type: string - title: checksum - title: Module is the type for VersionInfo - cosmos_sdk_version: - type: string - title: 'Since: cosmos-sdk 0.43' - description: VersionInfo is the type for the GetNodeInfoResponse message. - description: >- - GetNodeInfoResponse is the request type for the Query/GetNodeInfo RPC - method. - cosmos.base.tendermint.v1beta1.GetSyncingResponse: - type: object - properties: - syncing: - type: boolean - description: >- - GetSyncingResponse is the response type for the Query/GetSyncing RPC - method. - cosmos.base.tendermint.v1beta1.GetValidatorSetByHeightResponse: + format: byte + description: CommitSig is a part of the Vote included in a Commit. + description: >- + Commit contains the evidence that a block was committed by a set of + validators. + tendermint.types.BlockID: type: object properties: - block_height: + hash: type: string - format: int64 - validators: - type: array - items: - type: object - properties: - address: - type: string - pub_key: - type: object - properties: - '@type': - type: string - description: >- - A URL/resource name that uniquely identifies the type of the - serialized - - protocol buffer message. This string must contain at least - - one "/" character. The last segment of the URL's path must - represent - - the fully qualified name of the type (as in - - `path/google.protobuf.Duration`). The name should be in a - canonical form - - (e.g., leading "." is not accepted). - - - In practice, teams usually precompile into the binary all - types that they - - expect it to use in the context of Any. However, for URLs - which use the - - scheme `http`, `https`, or no scheme, one can optionally set - up a type - - server that maps type URLs to message definitions as - follows: - - - * If no scheme is provided, `https` is assumed. - - * An HTTP GET on the URL must yield a - [google.protobuf.Type][] - value in binary format, or produce an error. - * Applications are allowed to cache lookup results based on - the - URL, or have them precompiled into a binary to avoid any - lookup. Therefore, binary compatibility needs to be preserved - on changes to types. (Use versioned type names to manage - breaking changes.) - - Note: this functionality is not currently available in the - official - - protobuf release, and it is not used for type URLs beginning - with - - type.googleapis.com. - - - Schemes other than `http`, `https` (or the empty scheme) - might be - - used with implementation specific semantics. - additionalProperties: {} - description: >- - `Any` contains an arbitrary serialized protocol buffer message - along with a - - URL that describes the type of the serialized message. - - - Protobuf library provides support to pack/unpack Any values in - the form - - of utility functions or additional generated methods of the Any - type. - - - Example 1: Pack and unpack a message in C++. - - Foo foo = ...; - Any any; - any.PackFrom(foo); - ... - if (any.UnpackTo(&foo)) { - ... - } - - Example 2: Pack and unpack a message in Java. - - Foo foo = ...; - Any any = Any.pack(foo); - ... - if (any.is(Foo.class)) { - foo = any.unpack(Foo.class); - } - - Example 3: Pack and unpack a message in Python. - - foo = Foo(...) - any = Any() - any.Pack(foo) - ... - if any.Is(Foo.DESCRIPTOR): - any.Unpack(foo) - ... - - Example 4: Pack and unpack a message in Go - - foo := &pb.Foo{...} - any, err := anypb.New(foo) - if err != nil { - ... - } - ... - foo := &pb.Foo{} - if err := any.UnmarshalTo(foo); err != nil { - ... - } - - The pack methods provided by protobuf library will by default - use - - 'type.googleapis.com/full.type.name' as the type URL and the - unpack - - methods only use the fully qualified type name after the last - '/' - - in the type URL, for example "foo.bar.com/x/y.z" will yield type - - name "y.z". - - - - JSON - - ==== - - The JSON representation of an `Any` value uses the regular - - representation of the deserialized, embedded message, with an - - additional field `@type` which contains the type URL. Example: - - package google.profile; - message Person { - string first_name = 1; - string last_name = 2; - } - - { - "@type": "type.googleapis.com/google.profile.Person", - "firstName": , - "lastName": - } - - If the embedded message type is well-known and has a custom JSON - - representation, that representation will be embedded adding a - field - - `value` which holds the custom JSON in addition to the `@type` - - field. Example (for message [google.protobuf.Duration][]): - - { - "@type": "type.googleapis.com/google.protobuf.Duration", - "value": "1.212s" - } - voting_power: - type: string - format: int64 - proposer_priority: - type: string - format: int64 - description: Validator is the type for the validator-set. - pagination: - description: pagination defines an pagination for the response. + format: byte + part_set_header: type: object properties: - next_key: - type: string - format: byte - title: |- - next_key is the key to be passed to PageRequest.key to - query the next page most efficiently total: + type: integer + format: int64 + hash: type: string - format: uint64 - title: >- - total is total number of results available if - PageRequest.count_total - - was set, its value is undefined otherwise - description: >- - GetValidatorSetByHeightResponse is the response type for the - Query/GetValidatorSetByHeight RPC method. - cosmos.base.tendermint.v1beta1.Module: - type: object - properties: - path: - type: string - title: module path - version: - type: string - title: module version - sum: - type: string - title: checksum - title: Module is the type for VersionInfo - cosmos.base.tendermint.v1beta1.Validator: + format: byte + title: PartsetHeader + title: BlockID + tendermint.types.BlockIDFlag: + type: string + enum: + - BLOCK_ID_FLAG_UNKNOWN + - BLOCK_ID_FLAG_ABSENT + - BLOCK_ID_FLAG_COMMIT + - BLOCK_ID_FLAG_NIL + default: BLOCK_ID_FLAG_UNKNOWN + title: BlockIdFlag indicates which BlcokID the signature is for + tendermint.types.Commit: type: object properties: - address: + height: type: string - pub_key: + format: int64 + round: + type: integer + format: int32 + block_id: type: object properties: - '@type': + hash: type: string - description: >- - A URL/resource name that uniquely identifies the type of the - serialized - - protocol buffer message. This string must contain at least - - one "/" character. The last segment of the URL's path must - represent - - the fully qualified name of the type (as in - - `path/google.protobuf.Duration`). The name should be in a - canonical form - - (e.g., leading "." is not accepted). - - - In practice, teams usually precompile into the binary all types - that they - - expect it to use in the context of Any. However, for URLs which - use the - - scheme `http`, `https`, or no scheme, one can optionally set up a - type - - server that maps type URLs to message definitions as follows: - - - * If no scheme is provided, `https` is assumed. - - * An HTTP GET on the URL must yield a [google.protobuf.Type][] - value in binary format, or produce an error. - * Applications are allowed to cache lookup results based on the - URL, or have them precompiled into a binary to avoid any - lookup. Therefore, binary compatibility needs to be preserved - on changes to types. (Use versioned type names to manage - breaking changes.) - - Note: this functionality is not currently available in the - official - - protobuf release, and it is not used for type URLs beginning with - - type.googleapis.com. - - - Schemes other than `http`, `https` (or the empty scheme) might be - - used with implementation specific semantics. - additionalProperties: {} - description: >- - `Any` contains an arbitrary serialized protocol buffer message along - with a - - URL that describes the type of the serialized message. - - - Protobuf library provides support to pack/unpack Any values in the - form - - of utility functions or additional generated methods of the Any type. - - - Example 1: Pack and unpack a message in C++. - - Foo foo = ...; - Any any; - any.PackFrom(foo); - ... - if (any.UnpackTo(&foo)) { - ... - } - - Example 2: Pack and unpack a message in Java. - - Foo foo = ...; - Any any = Any.pack(foo); - ... - if (any.is(Foo.class)) { - foo = any.unpack(Foo.class); - } - - Example 3: Pack and unpack a message in Python. - - foo = Foo(...) - any = Any() - any.Pack(foo) - ... - if any.Is(Foo.DESCRIPTOR): - any.Unpack(foo) - ... - - Example 4: Pack and unpack a message in Go - - foo := &pb.Foo{...} - any, err := anypb.New(foo) - if err != nil { - ... - } - ... - foo := &pb.Foo{} - if err := any.UnmarshalTo(foo); err != nil { - ... - } - - The pack methods provided by protobuf library will by default use - - 'type.googleapis.com/full.type.name' as the type URL and the unpack - - methods only use the fully qualified type name after the last '/' - - in the type URL, for example "foo.bar.com/x/y.z" will yield type - - name "y.z". - - - - JSON - - ==== - - The JSON representation of an `Any` value uses the regular - - representation of the deserialized, embedded message, with an - - additional field `@type` which contains the type URL. Example: - - package google.profile; - message Person { - string first_name = 1; - string last_name = 2; - } - - { - "@type": "type.googleapis.com/google.profile.Person", - "firstName": , - "lastName": - } - - If the embedded message type is well-known and has a custom JSON - - representation, that representation will be embedded adding a field - - `value` which holds the custom JSON in addition to the `@type` - - field. Example (for message [google.protobuf.Duration][]): - - { - "@type": "type.googleapis.com/google.protobuf.Duration", - "value": "1.212s" - } - voting_power: - type: string - format: int64 - proposer_priority: - type: string - format: int64 - description: Validator is the type for the validator-set. - cosmos.base.tendermint.v1beta1.VersionInfo: - type: object - properties: - name: - type: string - app_name: - type: string - version: - type: string - git_commit: - type: string - build_tags: - type: string - go_version: - type: string - build_deps: + format: byte + part_set_header: + type: object + properties: + total: + type: integer + format: int64 + hash: + type: string + format: byte + title: PartsetHeader + title: BlockID + signatures: type: array items: type: object properties: - path: + block_id_flag: type: string - title: module path - version: + enum: + - BLOCK_ID_FLAG_UNKNOWN + - BLOCK_ID_FLAG_ABSENT + - BLOCK_ID_FLAG_COMMIT + - BLOCK_ID_FLAG_NIL + default: BLOCK_ID_FLAG_UNKNOWN + title: BlockIdFlag indicates which BlcokID the signature is for + validator_address: type: string - title: module version - sum: + format: byte + timestamp: type: string - title: checksum - title: Module is the type for VersionInfo - cosmos_sdk_version: - type: string - title: 'Since: cosmos-sdk 0.43' - description: VersionInfo is the type for the GetNodeInfoResponse message. - tendermint.crypto.PublicKey: + format: date-time + signature: + type: string + format: byte + description: CommitSig is a part of the Vote included in a Commit. + description: >- + Commit contains the evidence that a block was committed by a set of + validators. + tendermint.types.CommitSig: type: object properties: - ed25519: + block_id_flag: + type: string + enum: + - BLOCK_ID_FLAG_UNKNOWN + - BLOCK_ID_FLAG_ABSENT + - BLOCK_ID_FLAG_COMMIT + - BLOCK_ID_FLAG_NIL + default: BLOCK_ID_FLAG_UNKNOWN + title: BlockIdFlag indicates which BlcokID the signature is for + validator_address: type: string format: byte - secp256k1: + timestamp: + type: string + format: date-time + signature: type: string format: byte - title: PublicKey defines the keys available for use with Validators - tendermint.p2p.DefaultNodeInfo: + description: CommitSig is a part of the Vote included in a Commit. + tendermint.types.Data: type: object properties: - protocol_version: + txs: + type: array + items: + type: string + format: byte + description: >- + Txs that will be applied by state @ block.Height+1. + + NOTE: not all txs here are valid. We're just agreeing on the order + first. + + This means that block.AppHash does not include these txs. + title: Data contains the set of transactions included in the block + tendermint.types.DuplicateVoteEvidence: + type: object + properties: + vote_a: type: object properties: - p2p: + type: type: string - format: uint64 - block: + enum: + - SIGNED_MSG_TYPE_UNKNOWN + - SIGNED_MSG_TYPE_PREVOTE + - SIGNED_MSG_TYPE_PRECOMMIT + - SIGNED_MSG_TYPE_PROPOSAL + default: SIGNED_MSG_TYPE_UNKNOWN + description: |- + SignedMsgType is a type of signed message in the consensus. + + - SIGNED_MSG_TYPE_PREVOTE: Votes + - SIGNED_MSG_TYPE_PROPOSAL: Proposals + height: type: string - format: uint64 - app: + format: int64 + round: + type: integer + format: int32 + block_id: + type: object + properties: + hash: + type: string + format: byte + part_set_header: + type: object + properties: + total: + type: integer + format: int64 + hash: + type: string + format: byte + title: PartsetHeader + title: BlockID + description: zero if vote is nil. + timestamp: type: string - format: uint64 - default_node_id: - type: string - listen_addr: - type: string - network: - type: string - version: - type: string - channels: - type: string - format: byte - moniker: - type: string - other: + format: date-time + validator_address: + type: string + format: byte + validator_index: + type: integer + format: int32 + signature: + type: string + format: byte + description: >- + Vote represents a prevote, precommit, or commit vote from validators + for + + consensus. + vote_b: type: object properties: - tx_index: + type: type: string - rpc_address: + enum: + - SIGNED_MSG_TYPE_UNKNOWN + - SIGNED_MSG_TYPE_PREVOTE + - SIGNED_MSG_TYPE_PRECOMMIT + - SIGNED_MSG_TYPE_PROPOSAL + default: SIGNED_MSG_TYPE_UNKNOWN + description: |- + SignedMsgType is a type of signed message in the consensus. + + - SIGNED_MSG_TYPE_PREVOTE: Votes + - SIGNED_MSG_TYPE_PROPOSAL: Proposals + height: type: string - tendermint.p2p.DefaultNodeInfoOther: - type: object - properties: - tx_index: - type: string - rpc_address: - type: string - tendermint.p2p.ProtocolVersion: - type: object - properties: - p2p: + format: int64 + round: + type: integer + format: int32 + block_id: + type: object + properties: + hash: + type: string + format: byte + part_set_header: + type: object + properties: + total: + type: integer + format: int64 + hash: + type: string + format: byte + title: PartsetHeader + title: BlockID + description: zero if vote is nil. + timestamp: + type: string + format: date-time + validator_address: + type: string + format: byte + validator_index: + type: integer + format: int32 + signature: + type: string + format: byte + description: >- + Vote represents a prevote, precommit, or commit vote from validators + for + + consensus. + total_voting_power: type: string - format: uint64 - block: + format: int64 + validator_power: type: string - format: uint64 - app: + format: int64 + timestamp: type: string - format: uint64 - tendermint.types.Block: + format: date-time + description: >- + DuplicateVoteEvidence contains evidence of a validator signed two + conflicting votes. + tendermint.types.Evidence: type: object properties: - header: + duplicate_vote_evidence: type: object properties: - version: - title: basic block info + vote_a: type: object properties: - block: + type: type: string - format: uint64 - app: + enum: + - SIGNED_MSG_TYPE_UNKNOWN + - SIGNED_MSG_TYPE_PREVOTE + - SIGNED_MSG_TYPE_PRECOMMIT + - SIGNED_MSG_TYPE_PROPOSAL + default: SIGNED_MSG_TYPE_UNKNOWN + description: |- + SignedMsgType is a type of signed message in the consensus. + + - SIGNED_MSG_TYPE_PREVOTE: Votes + - SIGNED_MSG_TYPE_PROPOSAL: Proposals + height: type: string - format: uint64 + format: int64 + round: + type: integer + format: int32 + block_id: + type: object + properties: + hash: + type: string + format: byte + part_set_header: + type: object + properties: + total: + type: integer + format: int64 + hash: + type: string + format: byte + title: PartsetHeader + title: BlockID + description: zero if vote is nil. + timestamp: + type: string + format: date-time + validator_address: + type: string + format: byte + validator_index: + type: integer + format: int32 + signature: + type: string + format: byte description: >- - Consensus captures the consensus rules for processing a block in - the blockchain, + Vote represents a prevote, precommit, or commit vote from + validators for - including all blockchain data structures and the rules of the - application's + consensus. + vote_b: + type: object + properties: + type: + type: string + enum: + - SIGNED_MSG_TYPE_UNKNOWN + - SIGNED_MSG_TYPE_PREVOTE + - SIGNED_MSG_TYPE_PRECOMMIT + - SIGNED_MSG_TYPE_PROPOSAL + default: SIGNED_MSG_TYPE_UNKNOWN + description: |- + SignedMsgType is a type of signed message in the consensus. - state transition machine. - chain_id: + - SIGNED_MSG_TYPE_PREVOTE: Votes + - SIGNED_MSG_TYPE_PROPOSAL: Proposals + height: + type: string + format: int64 + round: + type: integer + format: int32 + block_id: + type: object + properties: + hash: + type: string + format: byte + part_set_header: + type: object + properties: + total: + type: integer + format: int64 + hash: + type: string + format: byte + title: PartsetHeader + title: BlockID + description: zero if vote is nil. + timestamp: + type: string + format: date-time + validator_address: + type: string + format: byte + validator_index: + type: integer + format: int32 + signature: + type: string + format: byte + description: >- + Vote represents a prevote, precommit, or commit vote from + validators for + + consensus. + total_voting_power: + type: string + format: int64 + validator_power: + type: string + format: int64 + timestamp: + type: string + format: date-time + description: >- + DuplicateVoteEvidence contains evidence of a validator signed two + conflicting votes. + light_client_attack_evidence: + type: object + properties: + conflicting_block: + type: object + properties: + signed_header: + type: object + properties: + header: + type: object + properties: + version: + title: basic block info + type: object + properties: + block: + type: string + format: uint64 + app: + type: string + format: uint64 + description: >- + Consensus captures the consensus rules for processing + a block in the blockchain, + + including all blockchain data structures and the rules + of the application's + + state transition machine. + chain_id: + type: string + height: + type: string + format: int64 + time: + type: string + format: date-time + last_block_id: + type: object + properties: + hash: + type: string + format: byte + part_set_header: + type: object + properties: + total: + type: integer + format: int64 + hash: + type: string + format: byte + title: PartsetHeader + title: BlockID + last_commit_hash: + type: string + format: byte + description: commit from validators from the last block + title: hashes of block data + data_hash: + type: string + format: byte + title: transactions + validators_hash: + type: string + format: byte + description: validators for the current block + title: hashes from the app output from the prev block + next_validators_hash: + type: string + format: byte + title: validators for the next block + consensus_hash: + type: string + format: byte + title: consensus params for current block + app_hash: + type: string + format: byte + title: state after txs from the previous block + last_results_hash: + type: string + format: byte + title: >- + root hash of all results from the txs from the + previous block + evidence_hash: + type: string + format: byte + description: evidence included in the block + title: consensus info + proposer_address: + type: string + format: byte + title: original proposer of the block + description: Header defines the structure of a block header. + commit: + type: object + properties: + height: + type: string + format: int64 + round: + type: integer + format: int32 + block_id: + type: object + properties: + hash: + type: string + format: byte + part_set_header: + type: object + properties: + total: + type: integer + format: int64 + hash: + type: string + format: byte + title: PartsetHeader + title: BlockID + signatures: + type: array + items: + type: object + properties: + block_id_flag: + type: string + enum: + - BLOCK_ID_FLAG_UNKNOWN + - BLOCK_ID_FLAG_ABSENT + - BLOCK_ID_FLAG_COMMIT + - BLOCK_ID_FLAG_NIL + default: BLOCK_ID_FLAG_UNKNOWN + title: >- + BlockIdFlag indicates which BlcokID the + signature is for + validator_address: + type: string + format: byte + timestamp: + type: string + format: date-time + signature: + type: string + format: byte + description: >- + CommitSig is a part of the Vote included in a + Commit. + description: >- + Commit contains the evidence that a block was committed by + a set of validators. + validator_set: + type: object + properties: + validators: + type: array + items: + type: object + properties: + address: + type: string + format: byte + pub_key: + type: object + properties: + ed25519: + type: string + format: byte + secp256k1: + type: string + format: byte + title: >- + PublicKey defines the keys available for use with + Validators + voting_power: + type: string + format: int64 + proposer_priority: + type: string + format: int64 + proposer: + type: object + properties: + address: + type: string + format: byte + pub_key: + type: object + properties: + ed25519: + type: string + format: byte + secp256k1: + type: string + format: byte + title: >- + PublicKey defines the keys available for use with + Validators + voting_power: + type: string + format: int64 + proposer_priority: + type: string + format: int64 + total_voting_power: + type: string + format: int64 + common_height: type: string - height: + format: int64 + byzantine_validators: + type: array + items: + type: object + properties: + address: + type: string + format: byte + pub_key: + type: object + properties: + ed25519: + type: string + format: byte + secp256k1: + type: string + format: byte + title: PublicKey defines the keys available for use with Validators + voting_power: + type: string + format: int64 + proposer_priority: + type: string + format: int64 + total_voting_power: type: string format: int64 - time: + timestamp: type: string format: date-time - last_block_id: - type: object - properties: - hash: - type: string - format: byte - part_set_header: - type: object - properties: - total: - type: integer - format: int64 - hash: - type: string - format: byte - title: PartsetHeader - title: BlockID - last_commit_hash: - type: string - format: byte - description: commit from validators from the last block - title: hashes of block data - data_hash: - type: string - format: byte - title: transactions - validators_hash: - type: string - format: byte - description: validators for the current block - title: hashes from the app output from the prev block - next_validators_hash: - type: string - format: byte - title: validators for the next block - consensus_hash: - type: string - format: byte - title: consensus params for current block - app_hash: - type: string - format: byte - title: state after txs from the previous block - last_results_hash: - type: string - format: byte - title: root hash of all results from the txs from the previous block - evidence_hash: - type: string - format: byte - description: evidence included in the block - title: consensus info - proposer_address: - type: string - format: byte - title: original proposer of the block - description: Header defines the structure of a block header. - data: - type: object - properties: - txs: - type: array - items: - type: string - format: byte - description: >- - Txs that will be applied by state @ block.Height+1. - - NOTE: not all txs here are valid. We're just agreeing on the - order first. - - This means that block.AppHash does not include these txs. - title: Data contains the set of transactions included in the block + description: >- + LightClientAttackEvidence contains evidence of a set of validators + attempting to mislead a light client. + tendermint.types.EvidenceList: + type: object + properties: evidence: - type: object - properties: - evidence: - type: array - items: + type: array + items: + type: object + properties: + duplicate_vote_evidence: type: object properties: - duplicate_vote_evidence: + vote_a: type: object properties: - vote_a: + type: + type: string + enum: + - SIGNED_MSG_TYPE_UNKNOWN + - SIGNED_MSG_TYPE_PREVOTE + - SIGNED_MSG_TYPE_PRECOMMIT + - SIGNED_MSG_TYPE_PROPOSAL + default: SIGNED_MSG_TYPE_UNKNOWN + description: >- + SignedMsgType is a type of signed message in the + consensus. + + - SIGNED_MSG_TYPE_PREVOTE: Votes + - SIGNED_MSG_TYPE_PROPOSAL: Proposals + height: + type: string + format: int64 + round: + type: integer + format: int32 + block_id: type: object properties: - type: - type: string - enum: - - SIGNED_MSG_TYPE_UNKNOWN - - SIGNED_MSG_TYPE_PREVOTE - - SIGNED_MSG_TYPE_PRECOMMIT - - SIGNED_MSG_TYPE_PROPOSAL - default: SIGNED_MSG_TYPE_UNKNOWN - description: >- - SignedMsgType is a type of signed message in the - consensus. - - - SIGNED_MSG_TYPE_PREVOTE: Votes - - SIGNED_MSG_TYPE_PROPOSAL: Proposals - height: + hash: type: string - format: int64 - round: - type: integer - format: int32 - block_id: + format: byte + part_set_header: type: object properties: + total: + type: integer + format: int64 hash: type: string format: byte - part_set_header: - type: object - properties: - total: - type: integer - format: int64 - hash: - type: string - format: byte - title: PartsetHeader - title: BlockID - description: zero if vote is nil. - timestamp: - type: string - format: date-time - validator_address: - type: string - format: byte - validator_index: - type: integer - format: int32 - signature: - type: string - format: byte - description: >- - Vote represents a prevote, precommit, or commit vote - from validators for + title: PartsetHeader + title: BlockID + description: zero if vote is nil. + timestamp: + type: string + format: date-time + validator_address: + type: string + format: byte + validator_index: + type: integer + format: int32 + signature: + type: string + format: byte + description: >- + Vote represents a prevote, precommit, or commit vote from + validators for + consensus. + vote_b: + type: object + properties: + type: + type: string + enum: + - SIGNED_MSG_TYPE_UNKNOWN + - SIGNED_MSG_TYPE_PREVOTE + - SIGNED_MSG_TYPE_PRECOMMIT + - SIGNED_MSG_TYPE_PROPOSAL + default: SIGNED_MSG_TYPE_UNKNOWN + description: >- + SignedMsgType is a type of signed message in the consensus. - vote_b: + + - SIGNED_MSG_TYPE_PREVOTE: Votes + - SIGNED_MSG_TYPE_PROPOSAL: Proposals + height: + type: string + format: int64 + round: + type: integer + format: int32 + block_id: type: object properties: - type: - type: string - enum: - - SIGNED_MSG_TYPE_UNKNOWN - - SIGNED_MSG_TYPE_PREVOTE - - SIGNED_MSG_TYPE_PRECOMMIT - - SIGNED_MSG_TYPE_PROPOSAL - default: SIGNED_MSG_TYPE_UNKNOWN - description: >- - SignedMsgType is a type of signed message in the - consensus. - - - SIGNED_MSG_TYPE_PREVOTE: Votes - - SIGNED_MSG_TYPE_PROPOSAL: Proposals - height: + hash: type: string - format: int64 - round: - type: integer - format: int32 - block_id: + format: byte + part_set_header: type: object properties: + total: + type: integer + format: int64 hash: type: string format: byte - part_set_header: - type: object - properties: - total: - type: integer - format: int64 - hash: - type: string - format: byte - title: PartsetHeader - title: BlockID - description: zero if vote is nil. - timestamp: - type: string - format: date-time - validator_address: - type: string - format: byte - validator_index: - type: integer - format: int32 - signature: - type: string - format: byte - description: >- - Vote represents a prevote, precommit, or commit vote - from validators for - - consensus. - total_voting_power: - type: string - format: int64 - validator_power: - type: string - format: int64 + title: PartsetHeader + title: BlockID + description: zero if vote is nil. timestamp: type: string format: date-time + validator_address: + type: string + format: byte + validator_index: + type: integer + format: int32 + signature: + type: string + format: byte description: >- - DuplicateVoteEvidence contains evidence of a validator - signed two conflicting votes. - light_client_attack_evidence: + Vote represents a prevote, precommit, or commit vote from + validators for + + consensus. + total_voting_power: + type: string + format: int64 + validator_power: + type: string + format: int64 + timestamp: + type: string + format: date-time + description: >- + DuplicateVoteEvidence contains evidence of a validator signed + two conflicting votes. + light_client_attack_evidence: + type: object + properties: + conflicting_block: type: object properties: - conflicting_block: + signed_header: type: object properties: - signed_header: + header: type: object properties: - header: + version: + title: basic block info type: object properties: - version: - title: basic block info - type: object - properties: - block: - type: string - format: uint64 - app: - type: string - format: uint64 - description: >- - Consensus captures the consensus rules for - processing a block in the blockchain, - - including all blockchain data structures and - the rules of the application's - - state transition machine. - chain_id: + block: type: string - height: + format: uint64 + app: type: string - format: int64 - time: + format: uint64 + description: >- + Consensus captures the consensus rules for + processing a block in the blockchain, + + including all blockchain data structures and the + rules of the application's + + state transition machine. + chain_id: + type: string + height: + type: string + format: int64 + time: + type: string + format: date-time + last_block_id: + type: object + properties: + hash: type: string - format: date-time - last_block_id: + format: byte + part_set_header: type: object properties: + total: + type: integer + format: int64 hash: type: string format: byte - part_set_header: - type: object - properties: - total: - type: integer - format: int64 - hash: - type: string - format: byte - title: PartsetHeader - title: BlockID - last_commit_hash: - type: string - format: byte - description: commit from validators from the last block - title: hashes of block data - data_hash: - type: string - format: byte - title: transactions - validators_hash: - type: string - format: byte - description: validators for the current block - title: >- - hashes from the app output from the prev - block - next_validators_hash: - type: string - format: byte - title: validators for the next block - consensus_hash: - type: string - format: byte - title: consensus params for current block - app_hash: - type: string - format: byte - title: state after txs from the previous block - last_results_hash: - type: string - format: byte - title: >- - root hash of all results from the txs from - the previous block - evidence_hash: - type: string - format: byte - description: evidence included in the block - title: consensus info - proposer_address: - type: string - format: byte - title: original proposer of the block - description: Header defines the structure of a block header. - commit: + title: PartsetHeader + title: BlockID + last_commit_hash: + type: string + format: byte + description: commit from validators from the last block + title: hashes of block data + data_hash: + type: string + format: byte + title: transactions + validators_hash: + type: string + format: byte + description: validators for the current block + title: hashes from the app output from the prev block + next_validators_hash: + type: string + format: byte + title: validators for the next block + consensus_hash: + type: string + format: byte + title: consensus params for current block + app_hash: + type: string + format: byte + title: state after txs from the previous block + last_results_hash: + type: string + format: byte + title: >- + root hash of all results from the txs from the + previous block + evidence_hash: + type: string + format: byte + description: evidence included in the block + title: consensus info + proposer_address: + type: string + format: byte + title: original proposer of the block + description: Header defines the structure of a block header. + commit: + type: object + properties: + height: + type: string + format: int64 + round: + type: integer + format: int32 + block_id: type: object properties: - height: + hash: type: string - format: int64 - round: - type: integer - format: int32 - block_id: + format: byte + part_set_header: type: object properties: + total: + type: integer + format: int64 hash: type: string format: byte - part_set_header: - type: object - properties: - total: - type: integer - format: int64 - hash: - type: string - format: byte - title: PartsetHeader - title: BlockID - signatures: - type: array - items: - type: object - properties: - block_id_flag: - type: string - enum: - - BLOCK_ID_FLAG_UNKNOWN - - BLOCK_ID_FLAG_ABSENT - - BLOCK_ID_FLAG_COMMIT - - BLOCK_ID_FLAG_NIL - default: BLOCK_ID_FLAG_UNKNOWN - title: >- - BlockIdFlag indicates which BlcokID the - signature is for - validator_address: - type: string - format: byte - timestamp: - type: string - format: date-time - signature: - type: string - format: byte - description: >- - CommitSig is a part of the Vote included - in a Commit. - description: >- - Commit contains the evidence that a block was - committed by a set of validators. - validator_set: - type: object - properties: - validators: + title: PartsetHeader + title: BlockID + signatures: type: array items: type: object properties: - address: + block_id_flag: type: string - format: byte - pub_key: - type: object - properties: - ed25519: - type: string - format: byte - secp256k1: - type: string - format: byte + enum: + - BLOCK_ID_FLAG_UNKNOWN + - BLOCK_ID_FLAG_ABSENT + - BLOCK_ID_FLAG_COMMIT + - BLOCK_ID_FLAG_NIL + default: BLOCK_ID_FLAG_UNKNOWN title: >- - PublicKey defines the keys available for - use with Validators - voting_power: + BlockIdFlag indicates which BlcokID the + signature is for + validator_address: type: string - format: int64 - proposer_priority: + format: byte + timestamp: type: string - format: int64 - proposer: + format: date-time + signature: + type: string + format: byte + description: >- + CommitSig is a part of the Vote included in a + Commit. + description: >- + Commit contains the evidence that a block was + committed by a set of validators. + validator_set: + type: object + properties: + validators: + type: array + items: + type: object + properties: + address: + type: string + format: byte + pub_key: + type: object + properties: + ed25519: + type: string + format: byte + secp256k1: + type: string + format: byte + title: >- + PublicKey defines the keys available for use + with Validators + voting_power: + type: string + format: int64 + proposer_priority: + type: string + format: int64 + proposer: + type: object + properties: + address: + type: string + format: byte + pub_key: type: object properties: - address: + ed25519: type: string format: byte - pub_key: - type: object - properties: - ed25519: - type: string - format: byte - secp256k1: - type: string - format: byte - title: >- - PublicKey defines the keys available for use - with Validators - voting_power: - type: string - format: int64 - proposer_priority: + secp256k1: type: string - format: int64 - total_voting_power: + format: byte + title: >- + PublicKey defines the keys available for use + with Validators + voting_power: type: string format: int64 - common_height: + proposer_priority: + type: string + format: int64 + total_voting_power: + type: string + format: int64 + common_height: + type: string + format: int64 + byzantine_validators: + type: array + items: + type: object + properties: + address: + type: string + format: byte + pub_key: + type: object + properties: + ed25519: + type: string + format: byte + secp256k1: + type: string + format: byte + title: >- + PublicKey defines the keys available for use with + Validators + voting_power: + type: string + format: int64 + proposer_priority: + type: string + format: int64 + total_voting_power: + type: string + format: int64 + timestamp: + type: string + format: date-time + description: >- + LightClientAttackEvidence contains evidence of a set of + validators attempting to mislead a light client. + tendermint.types.Header: + type: object + properties: + version: + title: basic block info + type: object + properties: + block: + type: string + format: uint64 + app: + type: string + format: uint64 + description: >- + Consensus captures the consensus rules for processing a block in the + blockchain, + + including all blockchain data structures and the rules of the + application's + + state transition machine. + chain_id: + type: string + height: + type: string + format: int64 + time: + type: string + format: date-time + last_block_id: + type: object + properties: + hash: + type: string + format: byte + part_set_header: + type: object + properties: + total: + type: integer + format: int64 + hash: + type: string + format: byte + title: PartsetHeader + title: BlockID + last_commit_hash: + type: string + format: byte + description: commit from validators from the last block + title: hashes of block data + data_hash: + type: string + format: byte + title: transactions + validators_hash: + type: string + format: byte + description: validators for the current block + title: hashes from the app output from the prev block + next_validators_hash: + type: string + format: byte + title: validators for the next block + consensus_hash: + type: string + format: byte + title: consensus params for current block + app_hash: + type: string + format: byte + title: state after txs from the previous block + last_results_hash: + type: string + format: byte + title: root hash of all results from the txs from the previous block + evidence_hash: + type: string + format: byte + description: evidence included in the block + title: consensus info + proposer_address: + type: string + format: byte + title: original proposer of the block + description: Header defines the structure of a block header. + tendermint.types.LightBlock: + type: object + properties: + signed_header: + type: object + properties: + header: + type: object + properties: + version: + title: basic block info + type: object + properties: + block: + type: string + format: uint64 + app: + type: string + format: uint64 + description: >- + Consensus captures the consensus rules for processing a block + in the blockchain, + + including all blockchain data structures and the rules of the + application's + + state transition machine. + chain_id: + type: string + height: + type: string + format: int64 + time: + type: string + format: date-time + last_block_id: + type: object + properties: + hash: + type: string + format: byte + part_set_header: + type: object + properties: + total: + type: integer + format: int64 + hash: + type: string + format: byte + title: PartsetHeader + title: BlockID + last_commit_hash: + type: string + format: byte + description: commit from validators from the last block + title: hashes of block data + data_hash: + type: string + format: byte + title: transactions + validators_hash: + type: string + format: byte + description: validators for the current block + title: hashes from the app output from the prev block + next_validators_hash: + type: string + format: byte + title: validators for the next block + consensus_hash: + type: string + format: byte + title: consensus params for current block + app_hash: + type: string + format: byte + title: state after txs from the previous block + last_results_hash: + type: string + format: byte + title: root hash of all results from the txs from the previous block + evidence_hash: + type: string + format: byte + description: evidence included in the block + title: consensus info + proposer_address: + type: string + format: byte + title: original proposer of the block + description: Header defines the structure of a block header. + commit: + type: object + properties: + height: + type: string + format: int64 + round: + type: integer + format: int32 + block_id: + type: object + properties: + hash: + type: string + format: byte + part_set_header: + type: object + properties: + total: + type: integer + format: int64 + hash: + type: string + format: byte + title: PartsetHeader + title: BlockID + signatures: + type: array + items: + type: object + properties: + block_id_flag: type: string - format: int64 - byzantine_validators: - type: array - items: + enum: + - BLOCK_ID_FLAG_UNKNOWN + - BLOCK_ID_FLAG_ABSENT + - BLOCK_ID_FLAG_COMMIT + - BLOCK_ID_FLAG_NIL + default: BLOCK_ID_FLAG_UNKNOWN + title: BlockIdFlag indicates which BlcokID the signature is for + validator_address: + type: string + format: byte + timestamp: + type: string + format: date-time + signature: + type: string + format: byte + description: CommitSig is a part of the Vote included in a Commit. + description: >- + Commit contains the evidence that a block was committed by a set + of validators. + validator_set: + type: object + properties: + validators: + type: array + items: + type: object + properties: + address: + type: string + format: byte + pub_key: + type: object + properties: + ed25519: + type: string + format: byte + secp256k1: + type: string + format: byte + title: PublicKey defines the keys available for use with Validators + voting_power: + type: string + format: int64 + proposer_priority: + type: string + format: int64 + proposer: + type: object + properties: + address: + type: string + format: byte + pub_key: + type: object + properties: + ed25519: + type: string + format: byte + secp256k1: + type: string + format: byte + title: PublicKey defines the keys available for use with Validators + voting_power: + type: string + format: int64 + proposer_priority: + type: string + format: int64 + total_voting_power: + type: string + format: int64 + tendermint.types.LightClientAttackEvidence: + type: object + properties: + conflicting_block: + type: object + properties: + signed_header: + type: object + properties: + header: + type: object + properties: + version: + title: basic block info + type: object + properties: + block: + type: string + format: uint64 + app: + type: string + format: uint64 + description: >- + Consensus captures the consensus rules for processing a + block in the blockchain, + + including all blockchain data structures and the rules of + the application's + + state transition machine. + chain_id: + type: string + height: + type: string + format: int64 + time: + type: string + format: date-time + last_block_id: + type: object + properties: + hash: + type: string + format: byte + part_set_header: type: object properties: - address: + total: + type: integer + format: int64 + hash: type: string format: byte - pub_key: - type: object - properties: - ed25519: - type: string - format: byte - secp256k1: - type: string - format: byte - title: >- - PublicKey defines the keys available for use with - Validators - voting_power: - type: string + title: PartsetHeader + title: BlockID + last_commit_hash: + type: string + format: byte + description: commit from validators from the last block + title: hashes of block data + data_hash: + type: string + format: byte + title: transactions + validators_hash: + type: string + format: byte + description: validators for the current block + title: hashes from the app output from the prev block + next_validators_hash: + type: string + format: byte + title: validators for the next block + consensus_hash: + type: string + format: byte + title: consensus params for current block + app_hash: + type: string + format: byte + title: state after txs from the previous block + last_results_hash: + type: string + format: byte + title: >- + root hash of all results from the txs from the previous + block + evidence_hash: + type: string + format: byte + description: evidence included in the block + title: consensus info + proposer_address: + type: string + format: byte + title: original proposer of the block + description: Header defines the structure of a block header. + commit: + type: object + properties: + height: + type: string + format: int64 + round: + type: integer + format: int32 + block_id: + type: object + properties: + hash: + type: string + format: byte + part_set_header: + type: object + properties: + total: + type: integer format: int64 - proposer_priority: + hash: type: string - format: int64 - total_voting_power: + format: byte + title: PartsetHeader + title: BlockID + signatures: + type: array + items: + type: object + properties: + block_id_flag: + type: string + enum: + - BLOCK_ID_FLAG_UNKNOWN + - BLOCK_ID_FLAG_ABSENT + - BLOCK_ID_FLAG_COMMIT + - BLOCK_ID_FLAG_NIL + default: BLOCK_ID_FLAG_UNKNOWN + title: >- + BlockIdFlag indicates which BlcokID the signature is + for + validator_address: + type: string + format: byte + timestamp: + type: string + format: date-time + signature: + type: string + format: byte + description: CommitSig is a part of the Vote included in a Commit. + description: >- + Commit contains the evidence that a block was committed by a + set of validators. + validator_set: + type: object + properties: + validators: + type: array + items: + type: object + properties: + address: + type: string + format: byte + pub_key: + type: object + properties: + ed25519: + type: string + format: byte + secp256k1: + type: string + format: byte + title: >- + PublicKey defines the keys available for use with + Validators + voting_power: type: string format: int64 - timestamp: + proposer_priority: type: string - format: date-time - description: >- - LightClientAttackEvidence contains evidence of a set of - validators attempting to mislead a light client. - last_commit: + format: int64 + proposer: + type: object + properties: + address: + type: string + format: byte + pub_key: + type: object + properties: + ed25519: + type: string + format: byte + secp256k1: + type: string + format: byte + title: >- + PublicKey defines the keys available for use with + Validators + voting_power: + type: string + format: int64 + proposer_priority: + type: string + format: int64 + total_voting_power: + type: string + format: int64 + common_height: + type: string + format: int64 + byzantine_validators: + type: array + items: + type: object + properties: + address: + type: string + format: byte + pub_key: + type: object + properties: + ed25519: + type: string + format: byte + secp256k1: + type: string + format: byte + title: PublicKey defines the keys available for use with Validators + voting_power: + type: string + format: int64 + proposer_priority: + type: string + format: int64 + total_voting_power: + type: string + format: int64 + timestamp: + type: string + format: date-time + description: >- + LightClientAttackEvidence contains evidence of a set of validators + attempting to mislead a light client. + tendermint.types.PartSetHeader: + type: object + properties: + total: + type: integer + format: int64 + hash: + type: string + format: byte + title: PartsetHeader + tendermint.types.SignedHeader: + type: object + properties: + header: + type: object + properties: + version: + title: basic block info + type: object + properties: + block: + type: string + format: uint64 + app: + type: string + format: uint64 + description: >- + Consensus captures the consensus rules for processing a block in + the blockchain, + + including all blockchain data structures and the rules of the + application's + + state transition machine. + chain_id: + type: string + height: + type: string + format: int64 + time: + type: string + format: date-time + last_block_id: + type: object + properties: + hash: + type: string + format: byte + part_set_header: + type: object + properties: + total: + type: integer + format: int64 + hash: + type: string + format: byte + title: PartsetHeader + title: BlockID + last_commit_hash: + type: string + format: byte + description: commit from validators from the last block + title: hashes of block data + data_hash: + type: string + format: byte + title: transactions + validators_hash: + type: string + format: byte + description: validators for the current block + title: hashes from the app output from the prev block + next_validators_hash: + type: string + format: byte + title: validators for the next block + consensus_hash: + type: string + format: byte + title: consensus params for current block + app_hash: + type: string + format: byte + title: state after txs from the previous block + last_results_hash: + type: string + format: byte + title: root hash of all results from the txs from the previous block + evidence_hash: + type: string + format: byte + description: evidence included in the block + title: consensus info + proposer_address: + type: string + format: byte + title: original proposer of the block + description: Header defines the structure of a block header. + commit: type: object properties: height: @@ -36799,2218 +48563,1939 @@ definitions: description: >- Commit contains the evidence that a block was committed by a set of validators. - tendermint.types.BlockID: + tendermint.types.SignedMsgType: + type: string + enum: + - SIGNED_MSG_TYPE_UNKNOWN + - SIGNED_MSG_TYPE_PREVOTE + - SIGNED_MSG_TYPE_PRECOMMIT + - SIGNED_MSG_TYPE_PROPOSAL + default: SIGNED_MSG_TYPE_UNKNOWN + description: |- + SignedMsgType is a type of signed message in the consensus. + + - SIGNED_MSG_TYPE_PREVOTE: Votes + - SIGNED_MSG_TYPE_PROPOSAL: Proposals + tendermint.types.Validator: type: object properties: - hash: + address: type: string format: byte - part_set_header: + pub_key: type: object properties: - total: - type: integer - format: int64 - hash: + ed25519: type: string format: byte - title: PartsetHeader - title: BlockID - tendermint.types.BlockIDFlag: - type: string - enum: - - BLOCK_ID_FLAG_UNKNOWN - - BLOCK_ID_FLAG_ABSENT - - BLOCK_ID_FLAG_COMMIT - - BLOCK_ID_FLAG_NIL - default: BLOCK_ID_FLAG_UNKNOWN - title: BlockIdFlag indicates which BlcokID the signature is for - tendermint.types.Commit: - type: object - properties: - height: - type: string - format: int64 - round: - type: integer - format: int32 - block_id: - type: object - properties: - hash: + secp256k1: type: string format: byte - part_set_header: - type: object - properties: - total: - type: integer - format: int64 - hash: - type: string - format: byte - title: PartsetHeader - title: BlockID - signatures: + title: PublicKey defines the keys available for use with Validators + voting_power: + type: string + format: int64 + proposer_priority: + type: string + format: int64 + tendermint.types.ValidatorSet: + type: object + properties: + validators: type: array items: type: object properties: - block_id_flag: - type: string - enum: - - BLOCK_ID_FLAG_UNKNOWN - - BLOCK_ID_FLAG_ABSENT - - BLOCK_ID_FLAG_COMMIT - - BLOCK_ID_FLAG_NIL - default: BLOCK_ID_FLAG_UNKNOWN - title: BlockIdFlag indicates which BlcokID the signature is for - validator_address: + address: type: string format: byte - timestamp: + pub_key: + type: object + properties: + ed25519: + type: string + format: byte + secp256k1: + type: string + format: byte + title: PublicKey defines the keys available for use with Validators + voting_power: type: string - format: date-time - signature: + format: int64 + proposer_priority: type: string - format: byte - description: CommitSig is a part of the Vote included in a Commit. - description: >- - Commit contains the evidence that a block was committed by a set of - validators. - tendermint.types.CommitSig: - type: object - properties: - block_id_flag: - type: string - enum: - - BLOCK_ID_FLAG_UNKNOWN - - BLOCK_ID_FLAG_ABSENT - - BLOCK_ID_FLAG_COMMIT - - BLOCK_ID_FLAG_NIL - default: BLOCK_ID_FLAG_UNKNOWN - title: BlockIdFlag indicates which BlcokID the signature is for - validator_address: - type: string - format: byte - timestamp: - type: string - format: date-time - signature: - type: string - format: byte - description: CommitSig is a part of the Vote included in a Commit. - tendermint.types.Data: - type: object - properties: - txs: - type: array - items: - type: string - format: byte - description: >- - Txs that will be applied by state @ block.Height+1. - - NOTE: not all txs here are valid. We're just agreeing on the order - first. - - This means that block.AppHash does not include these txs. - title: Data contains the set of transactions included in the block - tendermint.types.DuplicateVoteEvidence: - type: object - properties: - vote_a: - type: object - properties: - type: - type: string - enum: - - SIGNED_MSG_TYPE_UNKNOWN - - SIGNED_MSG_TYPE_PREVOTE - - SIGNED_MSG_TYPE_PRECOMMIT - - SIGNED_MSG_TYPE_PROPOSAL - default: SIGNED_MSG_TYPE_UNKNOWN - description: |- - SignedMsgType is a type of signed message in the consensus. - - - SIGNED_MSG_TYPE_PREVOTE: Votes - - SIGNED_MSG_TYPE_PROPOSAL: Proposals - height: - type: string - format: int64 - round: - type: integer - format: int32 - block_id: + format: int64 + proposer: + type: object + properties: + address: + type: string + format: byte + pub_key: type: object properties: - hash: + ed25519: type: string format: byte - part_set_header: - type: object - properties: - total: - type: integer - format: int64 - hash: - type: string - format: byte - title: PartsetHeader - title: BlockID - description: zero if vote is nil. - timestamp: - type: string - format: date-time - validator_address: + secp256k1: + type: string + format: byte + title: PublicKey defines the keys available for use with Validators + voting_power: type: string - format: byte - validator_index: - type: integer - format: int32 - signature: + format: int64 + proposer_priority: type: string - format: byte - description: >- - Vote represents a prevote, precommit, or commit vote from validators - for + format: int64 + total_voting_power: + type: string + format: int64 + tendermint.types.Vote: + type: object + properties: + type: + type: string + enum: + - SIGNED_MSG_TYPE_UNKNOWN + - SIGNED_MSG_TYPE_PREVOTE + - SIGNED_MSG_TYPE_PRECOMMIT + - SIGNED_MSG_TYPE_PROPOSAL + default: SIGNED_MSG_TYPE_UNKNOWN + description: |- + SignedMsgType is a type of signed message in the consensus. - consensus. - vote_b: + - SIGNED_MSG_TYPE_PREVOTE: Votes + - SIGNED_MSG_TYPE_PROPOSAL: Proposals + height: + type: string + format: int64 + round: + type: integer + format: int32 + block_id: type: object properties: - type: - type: string - enum: - - SIGNED_MSG_TYPE_UNKNOWN - - SIGNED_MSG_TYPE_PREVOTE - - SIGNED_MSG_TYPE_PRECOMMIT - - SIGNED_MSG_TYPE_PROPOSAL - default: SIGNED_MSG_TYPE_UNKNOWN - description: |- - SignedMsgType is a type of signed message in the consensus. - - - SIGNED_MSG_TYPE_PREVOTE: Votes - - SIGNED_MSG_TYPE_PROPOSAL: Proposals - height: + hash: type: string - format: int64 - round: - type: integer - format: int32 - block_id: + format: byte + part_set_header: type: object properties: + total: + type: integer + format: int64 hash: type: string format: byte - part_set_header: - type: object - properties: - total: - type: integer - format: int64 - hash: - type: string - format: byte - title: PartsetHeader - title: BlockID - description: zero if vote is nil. - timestamp: - type: string - format: date-time - validator_address: - type: string - format: byte - validator_index: - type: integer - format: int32 - signature: - type: string - format: byte - description: >- - Vote represents a prevote, precommit, or commit vote from validators - for - - consensus. - total_voting_power: - type: string - format: int64 - validator_power: - type: string - format: int64 + title: PartsetHeader + title: BlockID + description: zero if vote is nil. timestamp: type: string format: date-time + validator_address: + type: string + format: byte + validator_index: + type: integer + format: int32 + signature: + type: string + format: byte + description: |- + Vote represents a prevote, precommit, or commit vote from validators for + consensus. + tendermint.version.Consensus: + type: object + properties: + block: + type: string + format: uint64 + app: + type: string + format: uint64 description: >- - DuplicateVoteEvidence contains evidence of a validator signed two - conflicting votes. - tendermint.types.Evidence: + Consensus captures the consensus rules for processing a block in the + blockchain, + + including all blockchain data structures and the rules of the + application's + + state transition machine. + cosmos.consensus.v1.MsgUpdateParamsResponse: + type: object + description: |- + MsgUpdateParamsResponse defines the response structure for executing a + MsgUpdateParams message. + cosmos.consensus.v1.QueryParamsResponse: type: object properties: - duplicate_vote_evidence: + params: + description: >- + params are the tendermint consensus params stored in the consensus + module. + + Please note that `params.version` is not populated in this response, + it is + + tracked separately in the x/upgrade module. type: object properties: - vote_a: + block: type: object properties: - type: - type: string - enum: - - SIGNED_MSG_TYPE_UNKNOWN - - SIGNED_MSG_TYPE_PREVOTE - - SIGNED_MSG_TYPE_PRECOMMIT - - SIGNED_MSG_TYPE_PROPOSAL - default: SIGNED_MSG_TYPE_UNKNOWN - description: |- - SignedMsgType is a type of signed message in the consensus. - - - SIGNED_MSG_TYPE_PREVOTE: Votes - - SIGNED_MSG_TYPE_PROPOSAL: Proposals - height: + max_bytes: type: string format: int64 - round: - type: integer - format: int32 - block_id: - type: object - properties: - hash: - type: string - format: byte - part_set_header: - type: object - properties: - total: - type: integer - format: int64 - hash: - type: string - format: byte - title: PartsetHeader - title: BlockID - description: zero if vote is nil. - timestamp: - type: string - format: date-time - validator_address: - type: string - format: byte - validator_index: - type: integer - format: int32 - signature: + title: |- + Max block size, in bytes. + Note: must be greater than 0 + max_gas: type: string - format: byte - description: >- - Vote represents a prevote, precommit, or commit vote from - validators for - - consensus. - vote_b: + format: int64 + title: |- + Max gas per block. + Note: must be greater or equal to -1 + description: BlockParams contains limits on the block size. + evidence: type: object properties: - type: - type: string - enum: - - SIGNED_MSG_TYPE_UNKNOWN - - SIGNED_MSG_TYPE_PREVOTE - - SIGNED_MSG_TYPE_PRECOMMIT - - SIGNED_MSG_TYPE_PROPOSAL - default: SIGNED_MSG_TYPE_UNKNOWN - description: |- - SignedMsgType is a type of signed message in the consensus. - - - SIGNED_MSG_TYPE_PREVOTE: Votes - - SIGNED_MSG_TYPE_PROPOSAL: Proposals - height: + max_age_num_blocks: type: string format: int64 - round: - type: integer - format: int32 - block_id: - type: object - properties: - hash: - type: string - format: byte - part_set_header: - type: object - properties: - total: - type: integer - format: int64 - hash: - type: string - format: byte - title: PartsetHeader - title: BlockID - description: zero if vote is nil. - timestamp: - type: string - format: date-time - validator_address: - type: string - format: byte - validator_index: - type: integer - format: int32 - signature: + description: >- + Max age of evidence, in blocks. + + + The basic formula for calculating this is: MaxAgeDuration / + {average block + + time}. + max_age_duration: type: string - format: byte - description: >- - Vote represents a prevote, precommit, or commit vote from - validators for + description: >- + Max age of evidence, in time. - consensus. - total_voting_power: - type: string - format: int64 - validator_power: - type: string - format: int64 - timestamp: - type: string - format: date-time - description: >- - DuplicateVoteEvidence contains evidence of a validator signed two - conflicting votes. - light_client_attack_evidence: - type: object - properties: - conflicting_block: - type: object - properties: - signed_header: - type: object - properties: - header: - type: object - properties: - version: - title: basic block info - type: object - properties: - block: - type: string - format: uint64 - app: - type: string - format: uint64 - description: >- - Consensus captures the consensus rules for processing - a block in the blockchain, - including all blockchain data structures and the rules - of the application's + It should correspond with an app's "unbonding period" or other + similar - state transition machine. - chain_id: - type: string - height: - type: string - format: int64 - time: - type: string - format: date-time - last_block_id: - type: object - properties: - hash: - type: string - format: byte - part_set_header: - type: object - properties: - total: - type: integer - format: int64 - hash: - type: string - format: byte - title: PartsetHeader - title: BlockID - last_commit_hash: - type: string - format: byte - description: commit from validators from the last block - title: hashes of block data - data_hash: - type: string - format: byte - title: transactions - validators_hash: - type: string - format: byte - description: validators for the current block - title: hashes from the app output from the prev block - next_validators_hash: - type: string - format: byte - title: validators for the next block - consensus_hash: - type: string - format: byte - title: consensus params for current block - app_hash: - type: string - format: byte - title: state after txs from the previous block - last_results_hash: - type: string - format: byte - title: >- - root hash of all results from the txs from the - previous block - evidence_hash: - type: string - format: byte - description: evidence included in the block - title: consensus info - proposer_address: - type: string - format: byte - title: original proposer of the block - description: Header defines the structure of a block header. - commit: - type: object - properties: - height: - type: string - format: int64 - round: - type: integer - format: int32 - block_id: - type: object - properties: - hash: - type: string - format: byte - part_set_header: - type: object - properties: - total: - type: integer - format: int64 - hash: - type: string - format: byte - title: PartsetHeader - title: BlockID - signatures: - type: array - items: - type: object - properties: - block_id_flag: - type: string - enum: - - BLOCK_ID_FLAG_UNKNOWN - - BLOCK_ID_FLAG_ABSENT - - BLOCK_ID_FLAG_COMMIT - - BLOCK_ID_FLAG_NIL - default: BLOCK_ID_FLAG_UNKNOWN - title: >- - BlockIdFlag indicates which BlcokID the - signature is for - validator_address: - type: string - format: byte - timestamp: - type: string - format: date-time - signature: - type: string - format: byte - description: >- - CommitSig is a part of the Vote included in a - Commit. - description: >- - Commit contains the evidence that a block was committed by - a set of validators. - validator_set: - type: object - properties: - validators: - type: array - items: - type: object - properties: - address: - type: string - format: byte - pub_key: - type: object - properties: - ed25519: - type: string - format: byte - secp256k1: - type: string - format: byte - title: >- - PublicKey defines the keys available for use with - Validators - voting_power: - type: string - format: int64 - proposer_priority: - type: string - format: int64 - proposer: - type: object - properties: - address: - type: string - format: byte - pub_key: - type: object - properties: - ed25519: - type: string - format: byte - secp256k1: - type: string - format: byte - title: >- - PublicKey defines the keys available for use with - Validators - voting_power: - type: string - format: int64 - proposer_priority: - type: string - format: int64 - total_voting_power: - type: string - format: int64 - common_height: + mechanism for handling [Nothing-At-Stake + + attacks](https://github.com/ethereum/wiki/wiki/Proof-of-Stake-FAQ#what-is-the-nothing-at-stake-problem-and-how-can-it-be-fixed). + max_bytes: + type: string + format: int64 + title: >- + This sets the maximum size of total evidence in bytes that can + be committed in a single block. + + and should fall comfortably under the max block bytes. + + Default is 1048576 or 1MB + description: EvidenceParams determine how we handle evidence of malfeasance. + validator: + type: object + properties: + pub_key_types: + type: array + items: + type: string + description: |- + ValidatorParams restrict the public key types validators can use. + NOTE: uses ABCI pubkey naming, not Amino names. + version: + type: object + properties: + app: + type: string + format: uint64 + description: VersionParams contains the ABCI application version. + description: >- + QueryParamsResponse defines the response type for querying x/consensus + parameters. + tendermint.types.BlockParams: + type: object + properties: + max_bytes: + type: string + format: int64 + title: |- + Max block size, in bytes. + Note: must be greater than 0 + max_gas: + type: string + format: int64 + title: |- + Max gas per block. + Note: must be greater or equal to -1 + description: BlockParams contains limits on the block size. + tendermint.types.ConsensusParams: + type: object + properties: + block: + type: object + properties: + max_bytes: type: string format: int64 - byzantine_validators: - type: array - items: - type: object - properties: - address: - type: string - format: byte - pub_key: - type: object - properties: - ed25519: - type: string - format: byte - secp256k1: - type: string - format: byte - title: PublicKey defines the keys available for use with Validators - voting_power: - type: string - format: int64 - proposer_priority: - type: string - format: int64 - total_voting_power: + title: |- + Max block size, in bytes. + Note: must be greater than 0 + max_gas: type: string format: int64 - timestamp: + title: |- + Max gas per block. + Note: must be greater or equal to -1 + description: BlockParams contains limits on the block size. + evidence: + type: object + properties: + max_age_num_blocks: type: string - format: date-time - description: >- - LightClientAttackEvidence contains evidence of a set of validators - attempting to mislead a light client. - tendermint.types.EvidenceList: + format: int64 + description: >- + Max age of evidence, in blocks. + + + The basic formula for calculating this is: MaxAgeDuration / + {average block + + time}. + max_age_duration: + type: string + description: >- + Max age of evidence, in time. + + + It should correspond with an app's "unbonding period" or other + similar + + mechanism for handling [Nothing-At-Stake + + attacks](https://github.com/ethereum/wiki/wiki/Proof-of-Stake-FAQ#what-is-the-nothing-at-stake-problem-and-how-can-it-be-fixed). + max_bytes: + type: string + format: int64 + title: >- + This sets the maximum size of total evidence in bytes that can be + committed in a single block. + + and should fall comfortably under the max block bytes. + + Default is 1048576 or 1MB + description: EvidenceParams determine how we handle evidence of malfeasance. + validator: + type: object + properties: + pub_key_types: + type: array + items: + type: string + description: |- + ValidatorParams restrict the public key types validators can use. + NOTE: uses ABCI pubkey naming, not Amino names. + version: + type: object + properties: + app: + type: string + format: uint64 + description: VersionParams contains the ABCI application version. + description: |- + ConsensusParams contains consensus critical parameters that determine the + validity of blocks. + tendermint.types.EvidenceParams: type: object properties: - evidence: - type: array - items: - type: object - properties: - duplicate_vote_evidence: - type: object - properties: - vote_a: - type: object - properties: - type: - type: string - enum: - - SIGNED_MSG_TYPE_UNKNOWN - - SIGNED_MSG_TYPE_PREVOTE - - SIGNED_MSG_TYPE_PRECOMMIT - - SIGNED_MSG_TYPE_PROPOSAL - default: SIGNED_MSG_TYPE_UNKNOWN - description: >- - SignedMsgType is a type of signed message in the - consensus. + max_age_num_blocks: + type: string + format: int64 + description: >- + Max age of evidence, in blocks. - - SIGNED_MSG_TYPE_PREVOTE: Votes - - SIGNED_MSG_TYPE_PROPOSAL: Proposals - height: - type: string - format: int64 - round: - type: integer - format: int32 - block_id: - type: object - properties: - hash: - type: string - format: byte - part_set_header: - type: object - properties: - total: - type: integer - format: int64 - hash: - type: string - format: byte - title: PartsetHeader - title: BlockID - description: zero if vote is nil. - timestamp: - type: string - format: date-time - validator_address: - type: string - format: byte - validator_index: - type: integer - format: int32 - signature: - type: string - format: byte - description: >- - Vote represents a prevote, precommit, or commit vote from - validators for - consensus. - vote_b: - type: object - properties: - type: - type: string - enum: - - SIGNED_MSG_TYPE_UNKNOWN - - SIGNED_MSG_TYPE_PREVOTE - - SIGNED_MSG_TYPE_PRECOMMIT - - SIGNED_MSG_TYPE_PROPOSAL - default: SIGNED_MSG_TYPE_UNKNOWN - description: >- - SignedMsgType is a type of signed message in the - consensus. + The basic formula for calculating this is: MaxAgeDuration / {average + block - - SIGNED_MSG_TYPE_PREVOTE: Votes - - SIGNED_MSG_TYPE_PROPOSAL: Proposals - height: - type: string - format: int64 - round: - type: integer - format: int32 - block_id: - type: object - properties: - hash: - type: string - format: byte - part_set_header: - type: object - properties: - total: - type: integer - format: int64 - hash: - type: string - format: byte - title: PartsetHeader - title: BlockID - description: zero if vote is nil. - timestamp: - type: string - format: date-time - validator_address: - type: string - format: byte - validator_index: - type: integer - format: int32 - signature: - type: string - format: byte - description: >- - Vote represents a prevote, precommit, or commit vote from - validators for + time}. + max_age_duration: + type: string + description: >- + Max age of evidence, in time. - consensus. - total_voting_power: - type: string - format: int64 - validator_power: - type: string - format: int64 - timestamp: - type: string - format: date-time - description: >- - DuplicateVoteEvidence contains evidence of a validator signed - two conflicting votes. - light_client_attack_evidence: - type: object - properties: - conflicting_block: - type: object - properties: - signed_header: - type: object - properties: - header: - type: object - properties: - version: - title: basic block info - type: object - properties: - block: - type: string - format: uint64 - app: - type: string - format: uint64 - description: >- - Consensus captures the consensus rules for - processing a block in the blockchain, - including all blockchain data structures and the - rules of the application's + It should correspond with an app's "unbonding period" or other similar - state transition machine. - chain_id: - type: string - height: - type: string - format: int64 - time: - type: string - format: date-time - last_block_id: - type: object - properties: - hash: - type: string - format: byte - part_set_header: - type: object - properties: - total: - type: integer - format: int64 - hash: - type: string - format: byte - title: PartsetHeader - title: BlockID - last_commit_hash: - type: string - format: byte - description: commit from validators from the last block - title: hashes of block data - data_hash: - type: string - format: byte - title: transactions - validators_hash: - type: string - format: byte - description: validators for the current block - title: hashes from the app output from the prev block - next_validators_hash: - type: string - format: byte - title: validators for the next block - consensus_hash: - type: string - format: byte - title: consensus params for current block - app_hash: - type: string - format: byte - title: state after txs from the previous block - last_results_hash: - type: string - format: byte - title: >- - root hash of all results from the txs from the - previous block - evidence_hash: - type: string - format: byte - description: evidence included in the block - title: consensus info - proposer_address: - type: string - format: byte - title: original proposer of the block - description: Header defines the structure of a block header. - commit: - type: object - properties: - height: - type: string - format: int64 - round: - type: integer - format: int32 - block_id: - type: object - properties: - hash: - type: string - format: byte - part_set_header: - type: object - properties: - total: - type: integer - format: int64 - hash: - type: string - format: byte - title: PartsetHeader - title: BlockID - signatures: - type: array - items: - type: object - properties: - block_id_flag: - type: string - enum: - - BLOCK_ID_FLAG_UNKNOWN - - BLOCK_ID_FLAG_ABSENT - - BLOCK_ID_FLAG_COMMIT - - BLOCK_ID_FLAG_NIL - default: BLOCK_ID_FLAG_UNKNOWN - title: >- - BlockIdFlag indicates which BlcokID the - signature is for - validator_address: - type: string - format: byte - timestamp: - type: string - format: date-time - signature: - type: string - format: byte - description: >- - CommitSig is a part of the Vote included in a - Commit. - description: >- - Commit contains the evidence that a block was - committed by a set of validators. - validator_set: - type: object - properties: - validators: - type: array - items: - type: object - properties: - address: - type: string - format: byte - pub_key: - type: object - properties: - ed25519: - type: string - format: byte - secp256k1: - type: string - format: byte - title: >- - PublicKey defines the keys available for use - with Validators - voting_power: - type: string - format: int64 - proposer_priority: - type: string - format: int64 - proposer: - type: object - properties: - address: - type: string - format: byte - pub_key: - type: object - properties: - ed25519: - type: string - format: byte - secp256k1: - type: string - format: byte - title: >- - PublicKey defines the keys available for use - with Validators - voting_power: - type: string - format: int64 - proposer_priority: - type: string - format: int64 - total_voting_power: - type: string - format: int64 - common_height: - type: string - format: int64 - byzantine_validators: - type: array - items: - type: object - properties: - address: - type: string - format: byte - pub_key: - type: object - properties: - ed25519: - type: string - format: byte - secp256k1: - type: string - format: byte - title: >- - PublicKey defines the keys available for use with - Validators - voting_power: - type: string - format: int64 - proposer_priority: - type: string - format: int64 - total_voting_power: - type: string - format: int64 - timestamp: - type: string - format: date-time - description: >- - LightClientAttackEvidence contains evidence of a set of - validators attempting to mislead a light client. - tendermint.types.Header: + mechanism for handling [Nothing-At-Stake + + attacks](https://github.com/ethereum/wiki/wiki/Proof-of-Stake-FAQ#what-is-the-nothing-at-stake-problem-and-how-can-it-be-fixed). + max_bytes: + type: string + format: int64 + title: >- + This sets the maximum size of total evidence in bytes that can be + committed in a single block. + + and should fall comfortably under the max block bytes. + + Default is 1048576 or 1MB + description: EvidenceParams determine how we handle evidence of malfeasance. + tendermint.types.ValidatorParams: type: object properties: - version: - title: basic block info + pub_key_types: + type: array + items: + type: string + description: |- + ValidatorParams restrict the public key types validators can use. + NOTE: uses ABCI pubkey naming, not Amino names. + tendermint.types.VersionParams: + type: object + properties: + app: + type: string + format: uint64 + description: VersionParams contains the ABCI application version. + cosmos.crisis.v1beta1.MsgUpdateParamsResponse: + type: object + description: |- + MsgUpdateParamsResponse defines the response structure for executing a + MsgUpdateParams message. + + Since: cosmos-sdk 0.47 + cosmos.crisis.v1beta1.MsgVerifyInvariantResponse: + type: object + description: MsgVerifyInvariantResponse defines the Msg/VerifyInvariant response type. + cosmos.evidence.v1beta1.MsgSubmitEvidenceResponse: + type: object + properties: + hash: + type: string + format: byte + description: hash defines the hash of the evidence. + description: MsgSubmitEvidenceResponse defines the Msg/SubmitEvidence response type. + cosmos.evidence.v1beta1.QueryAllEvidenceResponse: + type: object + properties: + evidence: + type: array + items: + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type of the + serialized + + protocol buffer message. This string must contain at least + + one "/" character. The last segment of the URL's path must + represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be in a + canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the binary all types + that they + + expect it to use in the context of Any. However, for URLs which + use the + + scheme `http`, `https`, or no scheme, one can optionally set up + a type + + server that maps type URLs to message definitions as follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in the + official + + protobuf release, and it is not used for type URLs beginning + with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty scheme) might + be + + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer message along + with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any values in the + form + + of utility functions or additional generated methods of the Any + type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by default use + + 'type.googleapis.com/full.type.name' as the type URL and the unpack + + methods only use the fully qualified type name after the last '/' + + in the type URL, for example "foo.bar.com/x/y.z" will yield type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the regular + + representation of the deserialized, embedded message, with an + + additional field `@type` which contains the type URL. Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a custom JSON + + representation, that representation will be embedded adding a field + + `value` which holds the custom JSON in addition to the `@type` + + field. Example (for message [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + description: evidence returns all evidences. + pagination: + description: pagination defines the pagination in the response. type: object properties: - block: + next_key: type: string - format: uint64 - app: + format: byte + 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. + total: type: string format: uint64 - description: >- - Consensus captures the consensus rules for processing a block in the - blockchain, + title: >- + total is total number of results available if + PageRequest.count_total - including all blockchain data structures and the rules of the - application's + was set, its value is undefined otherwise + description: >- + QueryAllEvidenceResponse is the response type for the Query/AllEvidence + RPC - state transition machine. - chain_id: - type: string - height: - type: string - format: int64 - time: - type: string - format: date-time - last_block_id: + method. + cosmos.evidence.v1beta1.QueryEvidenceResponse: + type: object + properties: + evidence: + description: evidence returns the requested evidence. type: object properties: - hash: + '@type': type: string - format: byte - part_set_header: - type: object - properties: - total: - type: integer - format: int64 - hash: - type: string - format: byte - title: PartsetHeader - title: BlockID - last_commit_hash: - type: string - format: byte - description: commit from validators from the last block - title: hashes of block data - data_hash: - type: string - format: byte - title: transactions - validators_hash: - type: string - format: byte - description: validators for the current block - title: hashes from the app output from the prev block - next_validators_hash: - type: string - format: byte - title: validators for the next block - consensus_hash: - type: string - format: byte - title: consensus params for current block - app_hash: - type: string - format: byte - title: state after txs from the previous block - last_results_hash: - type: string - format: byte - title: root hash of all results from the txs from the previous block - evidence_hash: - type: string - format: byte - description: evidence included in the block - title: consensus info - proposer_address: - type: string - format: byte - title: original proposer of the block - description: Header defines the structure of a block header. - tendermint.types.LightBlock: + description: >- + A URL/resource name that uniquely identifies the type of the + serialized + + protocol buffer message. This string must contain at least + + one "/" character. The last segment of the URL's path must + represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be in a + canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the binary all types + that they + + expect it to use in the context of Any. However, for URLs which + use the + + scheme `http`, `https`, or no scheme, one can optionally set up a + type + + server that maps type URLs to message definitions as follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in the + official + + protobuf release, and it is not used for type URLs beginning with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty scheme) might be + + used with implementation specific semantics. + additionalProperties: {} + description: >- + QueryEvidenceResponse is the response type for the Query/Evidence RPC + method. + cosmos.feegrant.v1beta1.Grant: type: object properties: - signed_header: + granter: + type: string + description: >- + granter is the address of the user granting an allowance of their + funds. + grantee: + type: string + description: >- + grantee is the address of the user being granted an allowance of + another user's funds. + allowance: + description: allowance can be any of basic, periodic, allowed fee allowance. type: object properties: - header: - type: object - properties: - version: - title: basic block info - type: object - properties: - block: - type: string - format: uint64 - app: - type: string - format: uint64 - description: >- - Consensus captures the consensus rules for processing a block - in the blockchain, + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type of the + serialized - including all blockchain data structures and the rules of the - application's + protocol buffer message. This string must contain at least - state transition machine. - chain_id: - type: string - height: - type: string - format: int64 - time: - type: string - format: date-time - last_block_id: - type: object - properties: - hash: - type: string - format: byte - part_set_header: - type: object - properties: - total: - type: integer - format: int64 - hash: - type: string - format: byte - title: PartsetHeader - title: BlockID - last_commit_hash: - type: string - format: byte - description: commit from validators from the last block - title: hashes of block data - data_hash: - type: string - format: byte - title: transactions - validators_hash: - type: string - format: byte - description: validators for the current block - title: hashes from the app output from the prev block - next_validators_hash: - type: string - format: byte - title: validators for the next block - consensus_hash: - type: string - format: byte - title: consensus params for current block - app_hash: - type: string - format: byte - title: state after txs from the previous block - last_results_hash: - type: string - format: byte - title: root hash of all results from the txs from the previous block - evidence_hash: - type: string - format: byte - description: evidence included in the block - title: consensus info - proposer_address: - type: string - format: byte - title: original proposer of the block - description: Header defines the structure of a block header. - commit: - type: object - properties: - height: - type: string - format: int64 - round: - type: integer - format: int32 - block_id: - type: object - properties: - hash: - type: string - format: byte - part_set_header: - type: object - properties: - total: - type: integer - format: int64 - hash: - type: string - format: byte - title: PartsetHeader - title: BlockID - signatures: - type: array - items: - type: object - properties: - block_id_flag: - type: string - enum: - - BLOCK_ID_FLAG_UNKNOWN - - BLOCK_ID_FLAG_ABSENT - - BLOCK_ID_FLAG_COMMIT - - BLOCK_ID_FLAG_NIL - default: BLOCK_ID_FLAG_UNKNOWN - title: BlockIdFlag indicates which BlcokID the signature is for - validator_address: - type: string - format: byte - timestamp: - type: string - format: date-time - signature: - type: string - format: byte - description: CommitSig is a part of the Vote included in a Commit. - description: >- - Commit contains the evidence that a block was committed by a set - of validators. - validator_set: + one "/" character. The last segment of the URL's path must + represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be in a + canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the binary all types + that they + + expect it to use in the context of Any. However, for URLs which + use the + + scheme `http`, `https`, or no scheme, one can optionally set up a + type + + server that maps type URLs to message definitions as follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in the + official + + protobuf release, and it is not used for type URLs beginning with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty scheme) might be + + used with implementation specific semantics. + additionalProperties: {} + title: Grant is stored in the KVStore to record a grant with full context + cosmos.feegrant.v1beta1.MsgGrantAllowanceResponse: + type: object + description: >- + MsgGrantAllowanceResponse defines the Msg/GrantAllowanceResponse response + type. + cosmos.feegrant.v1beta1.MsgRevokeAllowanceResponse: + type: object + description: >- + MsgRevokeAllowanceResponse defines the Msg/RevokeAllowanceResponse + response type. + cosmos.feegrant.v1beta1.QueryAllowanceResponse: + type: object + properties: + allowance: + description: allowance is a allowance granted for grantee by granter. type: object properties: - validators: - type: array - items: - type: object - properties: - address: - type: string - format: byte - pub_key: - type: object - properties: - ed25519: - type: string - format: byte - secp256k1: - type: string - format: byte - title: PublicKey defines the keys available for use with Validators - voting_power: - type: string - format: int64 - proposer_priority: - type: string - format: int64 - proposer: + granter: + type: string + description: >- + granter is the address of the user granting an allowance of their + funds. + grantee: + type: string + description: >- + grantee is the address of the user being granted an allowance of + another user's funds. + allowance: + description: allowance can be any of basic, periodic, allowed fee allowance. type: object properties: - address: - type: string - format: byte - pub_key: - type: object - properties: - ed25519: - type: string - format: byte - secp256k1: - type: string - format: byte - title: PublicKey defines the keys available for use with Validators - voting_power: - type: string - format: int64 - proposer_priority: + '@type': type: string - format: int64 - total_voting_power: - type: string - format: int64 - tendermint.types.LightClientAttackEvidence: + description: >- + A URL/resource name that uniquely identifies the type of the + serialized + + protocol buffer message. This string must contain at least + + one "/" character. The last segment of the URL's path must + represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be in a + canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the binary all + types that they + + expect it to use in the context of Any. However, for URLs + which use the + + scheme `http`, `https`, or no scheme, one can optionally set + up a type + + server that maps type URLs to message definitions as follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based on + the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in the + official + + protobuf release, and it is not used for type URLs beginning + with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty scheme) might + be + + used with implementation specific semantics. + additionalProperties: {} + title: Grant is stored in the KVStore to record a grant with full context + description: >- + QueryAllowanceResponse is the response type for the Query/Allowance RPC + method. + cosmos.feegrant.v1beta1.QueryAllowancesByGranterResponse: type: object properties: - conflicting_block: + allowances: + type: array + items: + type: object + properties: + granter: + type: string + description: >- + granter is the address of the user granting an allowance of + their funds. + grantee: + type: string + description: >- + grantee is the address of the user being granted an allowance of + another user's funds. + allowance: + description: allowance can be any of basic, periodic, allowed fee allowance. + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type of the + serialized + + protocol buffer message. This string must contain at least + + one "/" character. The last segment of the URL's path must + represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be in a + canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the binary all + types that they + + expect it to use in the context of Any. However, for URLs + which use the + + scheme `http`, `https`, or no scheme, one can optionally set + up a type + + server that maps type URLs to message definitions as + follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based on + the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in the + official + + protobuf release, and it is not used for type URLs beginning + with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty scheme) + might be + + used with implementation specific semantics. + additionalProperties: {} + title: Grant is stored in the KVStore to record a grant with full context + description: allowances that have been issued by the granter. + pagination: + description: pagination defines an pagination for the response. type: object properties: - signed_header: - type: object - properties: - header: - type: object - properties: - version: - title: basic block info - type: object - properties: - block: - type: string - format: uint64 - app: - type: string - format: uint64 - description: >- - Consensus captures the consensus rules for processing a - block in the blockchain, + next_key: + type: string + format: byte + 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. + total: + type: string + format: uint64 + title: >- + total is total number of results available if + PageRequest.count_total - including all blockchain data structures and the rules of - the application's + was set, its value is undefined otherwise + description: >- + QueryAllowancesByGranterResponse is the response type for the + Query/AllowancesByGranter RPC method. - state transition machine. - chain_id: - type: string - height: - type: string - format: int64 - time: - type: string - format: date-time - last_block_id: - type: object - properties: - hash: - type: string - format: byte - part_set_header: - type: object - properties: - total: - type: integer - format: int64 - hash: - type: string - format: byte - title: PartsetHeader - title: BlockID - last_commit_hash: - type: string - format: byte - description: commit from validators from the last block - title: hashes of block data - data_hash: - type: string - format: byte - title: transactions - validators_hash: - type: string - format: byte - description: validators for the current block - title: hashes from the app output from the prev block - next_validators_hash: - type: string - format: byte - title: validators for the next block - consensus_hash: - type: string - format: byte - title: consensus params for current block - app_hash: - type: string - format: byte - title: state after txs from the previous block - last_results_hash: - type: string - format: byte - title: >- - root hash of all results from the txs from the previous - block - evidence_hash: - type: string - format: byte - description: evidence included in the block - title: consensus info - proposer_address: - type: string - format: byte - title: original proposer of the block - description: Header defines the structure of a block header. - commit: - type: object - properties: - height: - type: string - format: int64 - round: - type: integer - format: int32 - block_id: - type: object - properties: - hash: - type: string - format: byte - part_set_header: - type: object - properties: - total: - type: integer - format: int64 - hash: - type: string - format: byte - title: PartsetHeader - title: BlockID - signatures: - type: array - items: - type: object - properties: - block_id_flag: - type: string - enum: - - BLOCK_ID_FLAG_UNKNOWN - - BLOCK_ID_FLAG_ABSENT - - BLOCK_ID_FLAG_COMMIT - - BLOCK_ID_FLAG_NIL - default: BLOCK_ID_FLAG_UNKNOWN - title: >- - BlockIdFlag indicates which BlcokID the signature is - for - validator_address: - type: string - format: byte - timestamp: - type: string - format: date-time - signature: - type: string - format: byte - description: CommitSig is a part of the Vote included in a Commit. - description: >- - Commit contains the evidence that a block was committed by a - set of validators. - validator_set: - type: object - properties: - validators: - type: array - items: - type: object - properties: - address: - type: string - format: byte - pub_key: - type: object - properties: - ed25519: - type: string - format: byte - secp256k1: - type: string - format: byte - title: >- - PublicKey defines the keys available for use with - Validators - voting_power: - type: string - format: int64 - proposer_priority: - type: string - format: int64 - proposer: - type: object - properties: - address: - type: string - format: byte - pub_key: - type: object - properties: - ed25519: - type: string - format: byte - secp256k1: - type: string - format: byte - title: >- - PublicKey defines the keys available for use with - Validators - voting_power: - type: string - format: int64 - proposer_priority: - type: string - format: int64 - total_voting_power: - type: string - format: int64 - common_height: + + Since: cosmos-sdk 0.46 + cosmos.feegrant.v1beta1.QueryAllowancesResponse: + type: object + properties: + allowances: + type: array + items: + type: object + properties: + granter: + type: string + description: >- + granter is the address of the user granting an allowance of + their funds. + grantee: + type: string + description: >- + grantee is the address of the user being granted an allowance of + another user's funds. + allowance: + description: allowance can be any of basic, periodic, allowed fee allowance. + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type of the + serialized + + protocol buffer message. This string must contain at least + + one "/" character. The last segment of the URL's path must + represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be in a + canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the binary all + types that they + + expect it to use in the context of Any. However, for URLs + which use the + + scheme `http`, `https`, or no scheme, one can optionally set + up a type + + server that maps type URLs to message definitions as + follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based on + the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in the + official + + protobuf release, and it is not used for type URLs beginning + with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty scheme) + might be + + used with implementation specific semantics. + additionalProperties: {} + title: Grant is stored in the KVStore to record a grant with full context + description: allowances are allowance's granted for grantee by granter. + pagination: + description: pagination defines an pagination for the response. + type: object + properties: + next_key: + type: string + format: byte + 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. + total: + type: string + format: uint64 + title: >- + total is total number of results available if + PageRequest.count_total + + was set, its value is undefined otherwise + description: >- + QueryAllowancesResponse is the response type for the Query/Allowances RPC + method. + cosmos.mint.v1beta1.MsgUpdateParamsResponse: + type: object + description: |- + MsgUpdateParamsResponse defines the response structure for executing a + MsgUpdateParams message. + + Since: cosmos-sdk 0.47 + cosmos.mint.v1beta1.Params: + type: object + properties: + mint_denom: type: string - format: int64 - byzantine_validators: - type: array - items: - type: object - properties: - address: - type: string - format: byte - pub_key: - type: object - properties: - ed25519: - type: string - format: byte - secp256k1: - type: string - format: byte - title: PublicKey defines the keys available for use with Validators - voting_power: - type: string - format: int64 - proposer_priority: - type: string - format: int64 - total_voting_power: + title: type of coin to mint + inflation_rate_change: type: string - format: int64 - timestamp: + title: maximum annual change in inflation rate + inflation_max: type: string - format: date-time - description: >- - LightClientAttackEvidence contains evidence of a set of validators - attempting to mislead a light client. - tendermint.types.PartSetHeader: + title: maximum inflation rate + inflation_min: + type: string + title: minimum inflation rate + goal_bonded: + type: string + title: goal of percent bonded atoms + blocks_per_year: + type: string + format: uint64 + title: expected blocks per year + description: Params defines the parameters for the x/mint module. + cosmos.mint.v1beta1.QueryAnnualProvisionsResponse: type: object properties: - total: - type: integer - format: int64 - hash: + annual_provisions: type: string format: byte - title: PartsetHeader - tendermint.types.SignedHeader: + description: annual_provisions is the current minting annual provisions value. + description: |- + QueryAnnualProvisionsResponse is the response type for the + Query/AnnualProvisions RPC method. + cosmos.mint.v1beta1.QueryInflationResponse: type: object properties: - header: + inflation: + type: string + format: byte + description: inflation is the current minting inflation value. + description: |- + QueryInflationResponse is the response type for the Query/Inflation RPC + method. + cosmos.mint.v1beta1.QueryParamsResponse: + type: object + properties: + params: + description: params defines the parameters of the module. type: object properties: - version: - title: basic block info - type: object - properties: - block: - type: string - format: uint64 - app: - type: string - format: uint64 - description: >- - Consensus captures the consensus rules for processing a block in - the blockchain, - - including all blockchain data structures and the rules of the - application's - - state transition machine. - chain_id: - type: string - height: - type: string - format: int64 - time: - type: string - format: date-time - last_block_id: - type: object - properties: - hash: - type: string - format: byte - part_set_header: - type: object - properties: - total: - type: integer - format: int64 - hash: - type: string - format: byte - title: PartsetHeader - title: BlockID - last_commit_hash: - type: string - format: byte - description: commit from validators from the last block - title: hashes of block data - data_hash: - type: string - format: byte - title: transactions - validators_hash: + mint_denom: type: string - format: byte - description: validators for the current block - title: hashes from the app output from the prev block - next_validators_hash: + title: type of coin to mint + inflation_rate_change: type: string - format: byte - title: validators for the next block - consensus_hash: + title: maximum annual change in inflation rate + inflation_max: type: string - format: byte - title: consensus params for current block - app_hash: + title: maximum inflation rate + inflation_min: type: string - format: byte - title: state after txs from the previous block - last_results_hash: + title: minimum inflation rate + goal_bonded: type: string - format: byte - title: root hash of all results from the txs from the previous block - evidence_hash: + title: goal of percent bonded atoms + blocks_per_year: type: string - format: byte - description: evidence included in the block - title: consensus info - proposer_address: + format: uint64 + title: expected blocks per year + description: QueryParamsResponse is the response type for the Query/Params RPC method. + cosmos.nft.v1beta1.Class: + type: object + properties: + id: + type: string + title: >- + id defines the unique identifier of the NFT classification, similar to + the contract address of ERC721 + name: + type: string + title: >- + name defines the human-readable name of the NFT classification. + Optional + symbol: + type: string + title: symbol is an abbreviated name for nft classification. Optional + description: + type: string + title: description is a brief description of nft classification. Optional + uri: + type: string + title: >- + uri for the class metadata stored off chain. It can define schema for + Class and NFT `Data` attributes. Optional + uri_hash: + type: string + title: uri_hash is a hash of the document pointed by uri. Optional + data: + title: data is the app specific metadata of the NFT class. Optional + type: object + properties: + '@type': type: string - format: byte - title: original proposer of the block - description: Header defines the structure of a block header. - commit: + description: >- + A URL/resource name that uniquely identifies the type of the + serialized + + protocol buffer message. This string must contain at least + + one "/" character. The last segment of the URL's path must + represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be in a + canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the binary all types + that they + + expect it to use in the context of Any. However, for URLs which + use the + + scheme `http`, `https`, or no scheme, one can optionally set up a + type + + server that maps type URLs to message definitions as follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in the + official + + protobuf release, and it is not used for type URLs beginning with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty scheme) might be + + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer message along + with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any values in the + form + + of utility functions or additional generated methods of the Any type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by default use + + 'type.googleapis.com/full.type.name' as the type URL and the unpack + + methods only use the fully qualified type name after the last '/' + + in the type URL, for example "foo.bar.com/x/y.z" will yield type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the regular + + representation of the deserialized, embedded message, with an + + additional field `@type` which contains the type URL. Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a custom JSON + + representation, that representation will be embedded adding a field + + `value` which holds the custom JSON in addition to the `@type` + + field. Example (for message [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + description: Class defines the class of the nft type. + cosmos.nft.v1beta1.MsgSendResponse: + type: object + description: MsgSendResponse defines the Msg/Send response type. + cosmos.nft.v1beta1.NFT: + type: object + properties: + class_id: + type: string + title: >- + class_id associated with the NFT, similar to the contract address of + ERC721 + id: + type: string + title: id is a unique identifier of the NFT + uri: + type: string + title: uri for the NFT metadata stored off chain + uri_hash: + type: string + title: uri_hash is a hash of the document pointed by uri + data: + title: data is an app specific data of the NFT. Optional type: object properties: - height: + '@type': type: string - format: int64 - round: - type: integer - format: int32 - block_id: - type: object - properties: - hash: - type: string - format: byte - part_set_header: - type: object - properties: - total: - type: integer - format: int64 - hash: - type: string - format: byte - title: PartsetHeader - title: BlockID - signatures: - type: array - items: - type: object - properties: - block_id_flag: - type: string - enum: - - BLOCK_ID_FLAG_UNKNOWN - - BLOCK_ID_FLAG_ABSENT - - BLOCK_ID_FLAG_COMMIT - - BLOCK_ID_FLAG_NIL - default: BLOCK_ID_FLAG_UNKNOWN - title: BlockIdFlag indicates which BlcokID the signature is for - validator_address: - type: string - format: byte - timestamp: - type: string - format: date-time - signature: - type: string - format: byte - description: CommitSig is a part of the Vote included in a Commit. + description: >- + A URL/resource name that uniquely identifies the type of the + serialized + + protocol buffer message. This string must contain at least + + one "/" character. The last segment of the URL's path must + represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be in a + canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the binary all types + that they + + expect it to use in the context of Any. However, for URLs which + use the + + scheme `http`, `https`, or no scheme, one can optionally set up a + type + + server that maps type URLs to message definitions as follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in the + official + + protobuf release, and it is not used for type URLs beginning with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty scheme) might be + + used with implementation specific semantics. + additionalProperties: {} description: >- - Commit contains the evidence that a block was committed by a set of - validators. - tendermint.types.SignedMsgType: - type: string - enum: - - SIGNED_MSG_TYPE_UNKNOWN - - SIGNED_MSG_TYPE_PREVOTE - - SIGNED_MSG_TYPE_PRECOMMIT - - SIGNED_MSG_TYPE_PROPOSAL - default: SIGNED_MSG_TYPE_UNKNOWN - description: |- - SignedMsgType is a type of signed message in the consensus. + `Any` contains an arbitrary serialized protocol buffer message along + with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any values in the + form + + of utility functions or additional generated methods of the Any type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by default use + + 'type.googleapis.com/full.type.name' as the type URL and the unpack + + methods only use the fully qualified type name after the last '/' + + in the type URL, for example "foo.bar.com/x/y.z" will yield type + + name "y.z". + - - SIGNED_MSG_TYPE_PREVOTE: Votes - - SIGNED_MSG_TYPE_PROPOSAL: Proposals - tendermint.types.Validator: + + JSON + + ==== + + The JSON representation of an `Any` value uses the regular + + representation of the deserialized, embedded message, with an + + additional field `@type` which contains the type URL. Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a custom JSON + + representation, that representation will be embedded adding a field + + `value` which holds the custom JSON in addition to the `@type` + + field. Example (for message [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + description: NFT defines the NFT. + cosmos.nft.v1beta1.QueryBalanceResponse: type: object properties: - address: - type: string - format: byte - pub_key: - type: object - properties: - ed25519: - type: string - format: byte - secp256k1: - type: string - format: byte - title: PublicKey defines the keys available for use with Validators - voting_power: - type: string - format: int64 - proposer_priority: + amount: type: string - format: int64 - tendermint.types.ValidatorSet: + format: uint64 + title: amount is the number of all NFTs of a given class owned by the owner + title: QueryBalanceResponse is the response type for the Query/Balance RPC method + cosmos.nft.v1beta1.QueryClassResponse: type: object properties: - validators: - type: array - items: - type: object - properties: - address: - type: string - format: byte - pub_key: - type: object - properties: - ed25519: - type: string - format: byte - secp256k1: - type: string - format: byte - title: PublicKey defines the keys available for use with Validators - voting_power: - type: string - format: int64 - proposer_priority: - type: string - format: int64 - proposer: + class: + description: class defines the class of the nft type. type: object properties: - address: + id: type: string - format: byte - pub_key: - type: object - properties: - ed25519: - type: string - format: byte - secp256k1: - type: string - format: byte - title: PublicKey defines the keys available for use with Validators - voting_power: + title: >- + id defines the unique identifier of the NFT classification, + similar to the contract address of ERC721 + name: type: string - format: int64 - proposer_priority: + title: >- + name defines the human-readable name of the NFT classification. + Optional + symbol: type: string - format: int64 - total_voting_power: - type: string - format: int64 - tendermint.types.Vote: - type: object - properties: - type: - type: string - enum: - - SIGNED_MSG_TYPE_UNKNOWN - - SIGNED_MSG_TYPE_PREVOTE - - SIGNED_MSG_TYPE_PRECOMMIT - - SIGNED_MSG_TYPE_PROPOSAL - default: SIGNED_MSG_TYPE_UNKNOWN - description: |- - SignedMsgType is a type of signed message in the consensus. - - - SIGNED_MSG_TYPE_PREVOTE: Votes - - SIGNED_MSG_TYPE_PROPOSAL: Proposals - height: - type: string - format: int64 - round: - type: integer - format: int32 - block_id: - type: object - properties: - hash: + title: symbol is an abbreviated name for nft classification. Optional + description: type: string - format: byte - part_set_header: + title: description is a brief description of nft classification. Optional + uri: + type: string + title: >- + uri for the class metadata stored off chain. It can define schema + for Class and NFT `Data` attributes. Optional + uri_hash: + type: string + title: uri_hash is a hash of the document pointed by uri. Optional + data: + title: data is the app specific metadata of the NFT class. Optional type: object properties: - total: - type: integer - format: int64 - hash: + '@type': type: string - format: byte - title: PartsetHeader - title: BlockID - description: zero if vote is nil. - timestamp: - type: string - format: date-time - validator_address: - type: string - format: byte - validator_index: - type: integer - format: int32 - signature: - type: string - format: byte - description: |- - Vote represents a prevote, precommit, or commit vote from validators for - consensus. - tendermint.version.Consensus: - type: object - properties: - block: - type: string - format: uint64 - app: - type: string - format: uint64 - description: >- - Consensus captures the consensus rules for processing a block in the - blockchain, - - including all blockchain data structures and the rules of the - application's - - state transition machine. - cosmos.crisis.v1beta1.MsgVerifyInvariantResponse: - type: object - description: MsgVerifyInvariantResponse defines the Msg/VerifyInvariant response type. - cosmos.evidence.v1beta1.MsgSubmitEvidenceResponse: - type: object - properties: - hash: - type: string - format: byte - description: hash defines the hash of the evidence. - description: MsgSubmitEvidenceResponse defines the Msg/SubmitEvidence response type. - cosmos.evidence.v1beta1.QueryAllEvidenceResponse: - type: object - properties: - evidence: - type: array - items: - type: object - properties: - '@type': - type: string - description: >- - A URL/resource name that uniquely identifies the type of the - serialized + description: >- + A URL/resource name that uniquely identifies the type of the + serialized - protocol buffer message. This string must contain at least + protocol buffer message. This string must contain at least - one "/" character. The last segment of the URL's path must - represent + one "/" character. The last segment of the URL's path must + represent - the fully qualified name of the type (as in + the fully qualified name of the type (as in - `path/google.protobuf.Duration`). The name should be in a - canonical form + `path/google.protobuf.Duration`). The name should be in a + canonical form - (e.g., leading "." is not accepted). + (e.g., leading "." is not accepted). - In practice, teams usually precompile into the binary all types - that they + In practice, teams usually precompile into the binary all + types that they - expect it to use in the context of Any. However, for URLs which - use the + expect it to use in the context of Any. However, for URLs + which use the - scheme `http`, `https`, or no scheme, one can optionally set up - a type + scheme `http`, `https`, or no scheme, one can optionally set + up a type - server that maps type URLs to message definitions as follows: + server that maps type URLs to message definitions as follows: - * If no scheme is provided, `https` is assumed. + * If no scheme is provided, `https` is assumed. - * An HTTP GET on the URL must yield a [google.protobuf.Type][] - value in binary format, or produce an error. - * Applications are allowed to cache lookup results based on the - URL, or have them precompiled into a binary to avoid any - lookup. Therefore, binary compatibility needs to be preserved - on changes to types. (Use versioned type names to manage - breaking changes.) + * An HTTP GET on the URL must yield a [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based on + the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) - Note: this functionality is not currently available in the - official + Note: this functionality is not currently available in the + official - protobuf release, and it is not used for type URLs beginning - with + protobuf release, and it is not used for type URLs beginning + with - type.googleapis.com. + type.googleapis.com. - Schemes other than `http`, `https` (or the empty scheme) might - be + Schemes other than `http`, `https` (or the empty scheme) might + be - used with implementation specific semantics. - additionalProperties: {} - description: >- - `Any` contains an arbitrary serialized protocol buffer message along - with a + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer message + along with a - URL that describes the type of the serialized message. + URL that describes the type of the serialized message. - Protobuf library provides support to pack/unpack Any values in the - form + Protobuf library provides support to pack/unpack Any values in the + form - of utility functions or additional generated methods of the Any - type. + of utility functions or additional generated methods of the Any + type. - Example 1: Pack and unpack a message in C++. + Example 1: Pack and unpack a message in C++. - Foo foo = ...; - Any any; - any.PackFrom(foo); - ... - if (any.UnpackTo(&foo)) { + Foo foo = ...; + Any any; + any.PackFrom(foo); ... - } + if (any.UnpackTo(&foo)) { + ... + } - Example 2: Pack and unpack a message in Java. + Example 2: Pack and unpack a message in Java. - Foo foo = ...; - Any any = Any.pack(foo); - ... - if (any.is(Foo.class)) { - foo = any.unpack(Foo.class); - } + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. - foo = Foo(...) - any = Any() - any.Pack(foo) - ... - if any.Is(Foo.DESCRIPTOR): - any.Unpack(foo) + foo = Foo(...) + any = Any() + any.Pack(foo) ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go - foo := &pb.Foo{...} - any, err := anypb.New(foo) - if err != nil { - ... - } - ... - foo := &pb.Foo{} - if err := any.UnmarshalTo(foo); err != nil { + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } ... - } - - The pack methods provided by protobuf library will by default use - - 'type.googleapis.com/full.type.name' as the type URL and the unpack + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } - methods only use the fully qualified type name after the last '/' + The pack methods provided by protobuf library will by default use - in the type URL, for example "foo.bar.com/x/y.z" will yield type + 'type.googleapis.com/full.type.name' as the type URL and the + unpack - name "y.z". + methods only use the fully qualified type name after the last '/' + in the type URL, for example "foo.bar.com/x/y.z" will yield type + name "y.z". - JSON - ==== - The JSON representation of an `Any` value uses the regular + JSON - representation of the deserialized, embedded message, with an + ==== - additional field `@type` which contains the type URL. Example: + The JSON representation of an `Any` value uses the regular - package google.profile; - message Person { - string first_name = 1; - string last_name = 2; - } + representation of the deserialized, embedded message, with an - { - "@type": "type.googleapis.com/google.profile.Person", - "firstName": , - "lastName": - } + additional field `@type` which contains the type URL. Example: - If the embedded message type is well-known and has a custom JSON + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } - representation, that representation will be embedded adding a field + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } - `value` which holds the custom JSON in addition to the `@type` + If the embedded message type is well-known and has a custom JSON - field. Example (for message [google.protobuf.Duration][]): + representation, that representation will be embedded adding a + field - { - "@type": "type.googleapis.com/google.protobuf.Duration", - "value": "1.212s" - } - description: evidence returns all evidences. - pagination: - description: pagination defines the pagination in the response. - type: object - properties: - next_key: - type: string - format: byte - title: |- - next_key is the key to be passed to PageRequest.key to - query the next page most efficiently - total: - type: string - format: uint64 - title: >- - total is total number of results available if - PageRequest.count_total + `value` which holds the custom JSON in addition to the `@type` - was set, its value is undefined otherwise - description: >- - QueryAllEvidenceResponse is the response type for the Query/AllEvidence - RPC + field. Example (for message [google.protobuf.Duration][]): - method. - cosmos.evidence.v1beta1.QueryEvidenceResponse: + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + title: QueryClassResponse is the response type for the Query/Class RPC method + cosmos.nft.v1beta1.QueryClassesResponse: type: object properties: - evidence: - description: evidence returns the requested evidence. - type: object - properties: - '@type': - type: string - description: >- - A URL/resource name that uniquely identifies the type of the - serialized + classes: + type: array + items: + type: object + properties: + id: + type: string + title: >- + id defines the unique identifier of the NFT classification, + similar to the contract address of ERC721 + name: + type: string + title: >- + name defines the human-readable name of the NFT classification. + Optional + symbol: + type: string + title: symbol is an abbreviated name for nft classification. Optional + description: + type: string + title: >- + description is a brief description of nft classification. + Optional + uri: + type: string + title: >- + uri for the class metadata stored off chain. It can define + schema for Class and NFT `Data` attributes. Optional + uri_hash: + type: string + title: uri_hash is a hash of the document pointed by uri. Optional + data: + title: data is the app specific metadata of the NFT class. Optional + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type of the + serialized - protocol buffer message. This string must contain at least + protocol buffer message. This string must contain at least - one "/" character. The last segment of the URL's path must - represent + one "/" character. The last segment of the URL's path must + represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be in a + canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the binary all + types that they + + expect it to use in the context of Any. However, for URLs + which use the + + scheme `http`, `https`, or no scheme, one can optionally set + up a type + + server that maps type URLs to message definitions as + follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based on + the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in the + official + + protobuf release, and it is not used for type URLs beginning + with - the fully qualified name of the type (as in + type.googleapis.com. - `path/google.protobuf.Duration`). The name should be in a - canonical form - (e.g., leading "." is not accepted). + Schemes other than `http`, `https` (or the empty scheme) + might be + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer message + along with a - In practice, teams usually precompile into the binary all types - that they + URL that describes the type of the serialized message. - expect it to use in the context of Any. However, for URLs which - use the - scheme `http`, `https`, or no scheme, one can optionally set up a - type + Protobuf library provides support to pack/unpack Any values in + the form - server that maps type URLs to message definitions as follows: + of utility functions or additional generated methods of the Any + type. - * If no scheme is provided, `https` is assumed. + Example 1: Pack and unpack a message in C++. - * An HTTP GET on the URL must yield a [google.protobuf.Type][] - value in binary format, or produce an error. - * Applications are allowed to cache lookup results based on the - URL, or have them precompiled into a binary to avoid any - lookup. Therefore, binary compatibility needs to be preserved - on changes to types. (Use versioned type names to manage - breaking changes.) + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } - Note: this functionality is not currently available in the - official + Example 2: Pack and unpack a message in Java. - protobuf release, and it is not used for type URLs beginning with + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } - type.googleapis.com. + Example 3: Pack and unpack a message in Python. + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... - Schemes other than `http`, `https` (or the empty scheme) might be + Example 4: Pack and unpack a message in Go - used with implementation specific semantics. - additionalProperties: {} - description: >- - QueryEvidenceResponse is the response type for the Query/Evidence RPC - method. - cosmos.feegrant.v1beta1.Grant: - type: object - properties: - granter: - type: string - description: >- - granter is the address of the user granting an allowance of their - funds. - grantee: - type: string - description: >- - grantee is the address of the user being granted an allowance of - another user's funds. - allowance: - description: allowance can be any of basic and filtered fee allowance. - type: object - properties: - '@type': - type: string - description: >- - A URL/resource name that uniquely identifies the type of the - serialized + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } - protocol buffer message. This string must contain at least + The pack methods provided by protobuf library will by default + use - one "/" character. The last segment of the URL's path must - represent + 'type.googleapis.com/full.type.name' as the type URL and the + unpack - the fully qualified name of the type (as in + methods only use the fully qualified type name after the last + '/' - `path/google.protobuf.Duration`). The name should be in a - canonical form + in the type URL, for example "foo.bar.com/x/y.z" will yield type - (e.g., leading "." is not accepted). + name "y.z". - In practice, teams usually precompile into the binary all types - that they - expect it to use in the context of Any. However, for URLs which - use the + JSON - scheme `http`, `https`, or no scheme, one can optionally set up a - type + ==== - server that maps type URLs to message definitions as follows: + The JSON representation of an `Any` value uses the regular + representation of the deserialized, embedded message, with an - * If no scheme is provided, `https` is assumed. + additional field `@type` which contains the type URL. Example: - * An HTTP GET on the URL must yield a [google.protobuf.Type][] - value in binary format, or produce an error. - * Applications are allowed to cache lookup results based on the - URL, or have them precompiled into a binary to avoid any - lookup. Therefore, binary compatibility needs to be preserved - on changes to types. (Use versioned type names to manage - breaking changes.) + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } - Note: this functionality is not currently available in the - official + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } - protobuf release, and it is not used for type URLs beginning with + If the embedded message type is well-known and has a custom JSON - type.googleapis.com. + representation, that representation will be embedded adding a + field + `value` which holds the custom JSON in addition to the `@type` - Schemes other than `http`, `https` (or the empty scheme) might be + field. Example (for message [google.protobuf.Duration][]): - used with implementation specific semantics. - additionalProperties: {} - title: Grant is stored in the KVStore to record a grant with full context - cosmos.feegrant.v1beta1.MsgGrantAllowanceResponse: - type: object - description: >- - MsgGrantAllowanceResponse defines the Msg/GrantAllowanceResponse response - type. - cosmos.feegrant.v1beta1.MsgRevokeAllowanceResponse: - type: object - description: >- - MsgRevokeAllowanceResponse defines the Msg/RevokeAllowanceResponse - response type. - cosmos.feegrant.v1beta1.QueryAllowanceResponse: + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + description: Class defines the class of the nft type. + description: class defines the class of the nft type. + pagination: + description: pagination defines the pagination in the response. + type: object + properties: + next_key: + type: string + format: byte + 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. + total: + type: string + format: uint64 + title: >- + total is total number of results available if + PageRequest.count_total + + was set, its value is undefined otherwise + title: QueryClassesResponse is the response type for the Query/Classes RPC method + cosmos.nft.v1beta1.QueryNFTResponse: type: object properties: - allowance: - description: allowance is a allowance granted for grantee by granter. + nft: + title: owner is the owner address of the nft type: object properties: - granter: + class_id: type: string - description: >- - granter is the address of the user granting an allowance of their - funds. - grantee: + title: >- + class_id associated with the NFT, similar to the contract address + of ERC721 + id: type: string - description: >- - grantee is the address of the user being granted an allowance of - another user's funds. - allowance: - description: allowance can be any of basic and filtered fee allowance. + title: id is a unique identifier of the NFT + uri: + type: string + title: uri for the NFT metadata stored off chain + uri_hash: + type: string + title: uri_hash is a hash of the document pointed by uri + data: + title: data is an app specific data of the NFT. Optional type: object properties: '@type': @@ -39069,133 +50554,136 @@ definitions: used with implementation specific semantics. additionalProperties: {} - title: Grant is stored in the KVStore to record a grant with full context - description: >- - QueryAllowanceResponse is the response type for the Query/Allowance RPC - method. - cosmos.feegrant.v1beta1.QueryAllowancesByGranterResponse: - type: object - properties: - allowances: - type: array - items: - type: object - properties: - granter: - type: string - description: >- - granter is the address of the user granting an allowance of - their funds. - grantee: - type: string - description: >- - grantee is the address of the user being granted an allowance of - another user's funds. - allowance: - description: allowance can be any of basic and filtered fee allowance. - type: object - properties: - '@type': - type: string - description: >- - A URL/resource name that uniquely identifies the type of the - serialized + description: >- + `Any` contains an arbitrary serialized protocol buffer message + along with a - protocol buffer message. This string must contain at least + URL that describes the type of the serialized message. - one "/" character. The last segment of the URL's path must - represent - the fully qualified name of the type (as in + Protobuf library provides support to pack/unpack Any values in the + form - `path/google.protobuf.Duration`). The name should be in a - canonical form + of utility functions or additional generated methods of the Any + type. - (e.g., leading "." is not accepted). + Example 1: Pack and unpack a message in C++. - In practice, teams usually precompile into the binary all - types that they + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } - expect it to use in the context of Any. However, for URLs - which use the + Example 2: Pack and unpack a message in Java. - scheme `http`, `https`, or no scheme, one can optionally set - up a type + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } - server that maps type URLs to message definitions as - follows: + Example 3: Pack and unpack a message in Python. + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... - * If no scheme is provided, `https` is assumed. + Example 4: Pack and unpack a message in Go - * An HTTP GET on the URL must yield a - [google.protobuf.Type][] - value in binary format, or produce an error. - * Applications are allowed to cache lookup results based on - the - URL, or have them precompiled into a binary to avoid any - lookup. Therefore, binary compatibility needs to be preserved - on changes to types. (Use versioned type names to manage - breaking changes.) + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } - Note: this functionality is not currently available in the - official + The pack methods provided by protobuf library will by default use - protobuf release, and it is not used for type URLs beginning - with + 'type.googleapis.com/full.type.name' as the type URL and the + unpack - type.googleapis.com. + methods only use the fully qualified type name after the last '/' + in the type URL, for example "foo.bar.com/x/y.z" will yield type - Schemes other than `http`, `https` (or the empty scheme) - might be + name "y.z". - used with implementation specific semantics. - additionalProperties: {} - title: Grant is stored in the KVStore to record a grant with full context - description: allowances that have been issued by the granter. - pagination: - description: pagination defines an pagination for the response. - type: object - properties: - next_key: - type: string - format: byte - title: |- - next_key is the key to be passed to PageRequest.key to - query the next page most efficiently - total: - type: string - format: uint64 - title: >- - total is total number of results available if - PageRequest.count_total - was set, its value is undefined otherwise - description: >- - QueryAllowancesByGranterResponse is the response type for the - Query/AllowancesByGranter RPC method. - cosmos.feegrant.v1beta1.QueryAllowancesResponse: + + JSON + + ==== + + The JSON representation of an `Any` value uses the regular + + representation of the deserialized, embedded message, with an + + additional field `@type` which contains the type URL. Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a custom JSON + + representation, that representation will be embedded adding a + field + + `value` which holds the custom JSON in addition to the `@type` + + field. Example (for message [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + description: NFT defines the NFT. + title: QueryNFTResponse is the response type for the Query/NFT RPC method + cosmos.nft.v1beta1.QueryNFTsResponse: type: object properties: - allowances: + nfts: type: array items: type: object properties: - granter: + class_id: type: string - description: >- - granter is the address of the user granting an allowance of - their funds. - grantee: + title: >- + class_id associated with the NFT, similar to the contract + address of ERC721 + id: type: string - description: >- - grantee is the address of the user being granted an allowance of - another user's funds. - allowance: - description: allowance can be any of basic and filtered fee allowance. + title: id is a unique identifier of the NFT + uri: + type: string + title: uri for the NFT metadata stored off chain + uri_hash: + type: string + title: uri_hash is a hash of the document pointed by uri + data: + title: data is an app specific data of the NFT. Optional type: object properties: '@type': @@ -39256,18 +50744,125 @@ definitions: used with implementation specific semantics. additionalProperties: {} - title: Grant is stored in the KVStore to record a grant with full context - description: allowances are allowance's granted for grantee by granter. + description: >- + `Any` contains an arbitrary serialized protocol buffer message + along with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any values in + the form + + of utility functions or additional generated methods of the Any + type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by default + use + + 'type.googleapis.com/full.type.name' as the type URL and the + unpack + + methods only use the fully qualified type name after the last + '/' + + in the type URL, for example "foo.bar.com/x/y.z" will yield type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the regular + + representation of the deserialized, embedded message, with an + + additional field `@type` which contains the type URL. Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a custom JSON + + representation, that representation will be embedded adding a + field + + `value` which holds the custom JSON in addition to the `@type` + + field. Example (for message [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + description: NFT defines the NFT. + title: NFT defines the NFT pagination: - description: pagination defines an pagination for the response. + description: pagination defines the pagination in the response. type: object properties: next_key: type: string format: byte - title: |- + description: |- next_key is the key to be passed to PageRequest.key to - query the next page most efficiently + query the next page most efficiently. It will be empty if + there are no more results. total: type: string format: uint64 @@ -39276,9 +50871,22 @@ definitions: PageRequest.count_total was set, its value is undefined otherwise - description: >- - QueryAllowancesResponse is the response type for the Query/Allowances RPC - method. + title: QueryNFTsResponse is the response type for the Query/NFTs RPC methods + cosmos.nft.v1beta1.QueryOwnerResponse: + type: object + properties: + owner: + type: string + title: owner is the owner address of the nft + title: QueryOwnerResponse is the response type for the Query/Owner RPC method + cosmos.nft.v1beta1.QuerySupplyResponse: + type: object + properties: + amount: + type: string + format: uint64 + title: amount is the number of all NFTs from the given class + title: QuerySupplyResponse is the response type for the Query/Supply RPC method cosmos.params.v1beta1.ParamChange: type: object properties: @@ -39305,9 +50913,57 @@ definitions: value: type: string description: QueryParamsResponse is response type for the Query/Params RPC method. + cosmos.params.v1beta1.QuerySubspacesResponse: + type: object + properties: + subspaces: + type: array + items: + type: object + properties: + subspace: + type: string + keys: + type: array + items: + type: string + description: >- + Subspace defines a parameter subspace name and all the keys that + exist for + + the subspace. + + + Since: cosmos-sdk 0.46 + description: |- + QuerySubspacesResponse defines the response types for querying for all + registered subspaces and all keys for a subspace. + + Since: cosmos-sdk 0.46 + cosmos.params.v1beta1.Subspace: + type: object + properties: + subspace: + type: string + keys: + type: array + items: + type: string + description: |- + Subspace defines a parameter subspace name and all the keys that exist for + the subspace. + + Since: cosmos-sdk 0.46 cosmos.slashing.v1beta1.MsgUnjailResponse: type: object title: MsgUnjailResponse defines the Msg/Unjail response type + cosmos.slashing.v1beta1.MsgUpdateParamsResponse: + type: object + description: |- + MsgUpdateParamsResponse defines the response structure for executing a + MsgUpdateParams message. + + Since: cosmos-sdk 0.47 cosmos.slashing.v1beta1.Params: type: object properties: @@ -39463,9 +51119,10 @@ definitions: next_key: type: string format: byte - title: |- + description: |- next_key is the key to be passed to PageRequest.key to - query the next page most efficiently + query the next page most efficiently. It will be empty if + there are no more results. total: type: string format: uint64 @@ -39606,6 +51263,11 @@ definitions: length prefixed in order to separate data from multiple message executions. + + Deprecated. This field is still populated, but prefer msg_response + instead + + because it also contains the Msg response typeURL. log: type: string description: Log contains the log information from message or handler execution. @@ -39623,10 +51285,8 @@ definitions: properties: key: type: string - format: byte value: type: string - format: byte index: type: boolean title: nondeterministic @@ -39646,6 +51306,172 @@ definitions: message or handler execution. + msg_responses: + type: array + items: + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type of the + serialized + + protocol buffer message. This string must contain at least + + one "/" character. The last segment of the URL's path must + represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be in a + canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the binary all types + that they + + expect it to use in the context of Any. However, for URLs which + use the + + scheme `http`, `https`, or no scheme, one can optionally set up + a type + + server that maps type URLs to message definitions as follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in the + official + + protobuf release, and it is not used for type URLs beginning + with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty scheme) might + be + + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer message along + with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any values in the + form + + of utility functions or additional generated methods of the Any + type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by default use + + 'type.googleapis.com/full.type.name' as the type URL and the unpack + + methods only use the fully qualified type name after the last '/' + + in the type URL, for example "foo.bar.com/x/y.z" will yield type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the regular + + representation of the deserialized, embedded message, with an + + additional field `@type` which contains the type URL. Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a custom JSON + + representation, that representation will be embedded adding a field + + `value` which holds the custom JSON in addition to the `@type` + + field. Example (for message [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + description: |- + msg_responses contains the Msg handler responses type packed in Anys. + + Since: cosmos-sdk 0.46 description: Result is the union of ResponseFormat and ResponseCheckTx. cosmos.base.abci.v1beta1.StringEvent: type: object @@ -39831,10 +51657,8 @@ definitions: properties: key: type: string - format: byte value: type: string - format: byte index: type: boolean title: nondeterministic @@ -39856,7 +51680,7 @@ definitions: these events include those emitted by processing all the messages and those - emitted from the ante handler. Whereas Logs contains the events, with + emitted from the ante. Whereas Logs contains the events, with additional metadata, emitted only by processing the messages. @@ -39887,21 +51711,35 @@ definitions: - SIGN_MODE_UNSPECIFIED - SIGN_MODE_DIRECT - SIGN_MODE_TEXTUAL + - SIGN_MODE_DIRECT_AUX - SIGN_MODE_LEGACY_AMINO_JSON - SIGN_MODE_EIP_191 default: SIGN_MODE_UNSPECIFIED description: |- SignMode represents a signing mode with its own security guarantees. + This enum should be considered a registry of all known sign modes + in the Cosmos ecosystem. Apps are not expected to support all known + sign modes. Apps that would like to support custom sign modes are + encouraged to open a small PR against this file to add a new case + to this SignMode enum describing their sign mode so that different + apps have a consistent version of this enum. + - SIGN_MODE_UNSPECIFIED: SIGN_MODE_UNSPECIFIED specifies an unknown signing mode and will be - rejected + rejected. - SIGN_MODE_DIRECT: SIGN_MODE_DIRECT specifies a signing mode which uses SignDoc and is - verified with raw bytes from Tx + verified with raw bytes from Tx. - SIGN_MODE_TEXTUAL: SIGN_MODE_TEXTUAL is a future signing mode that will verify some human-readable textual representation on top of the binary representation - from SIGN_MODE_DIRECT + from SIGN_MODE_DIRECT. It is currently not supported. + - SIGN_MODE_DIRECT_AUX: SIGN_MODE_DIRECT_AUX specifies a signing mode which uses + SignDocDirectAux. As opposed to SIGN_MODE_DIRECT, this sign mode does not + require signers signing over other signers' `signer_info`. It also allows + for adding Tips in transactions. + + Since: cosmos-sdk 0.46 - SIGN_MODE_LEGACY_AMINO_JSON: SIGN_MODE_LEGACY_AMINO_JSON is a backwards compatibility mode which uses - Amino JSON and will be removed in the future + Amino JSON and will be removed in the future. - SIGN_MODE_EIP_191: SIGN_MODE_EIP_191 specifies the sign mode for EIP 191 signing on the Cosmos SDK. Ref: https://eips.ethereum.org/EIPS/eip-191 @@ -39991,6 +51829,42 @@ definitions: appropriate fee grant does not exist or the chain does not support fee grants, this will fail + tip: + description: >- + Tip is the optional tip used for transactions fees paid in another + denom. + + + This field is ignored if the chain didn't enable tips, i.e. didn't add + the + + `TipDecorator` in its posthandler. + + + Since: cosmos-sdk 0.46 + type: object + properties: + amount: + type: array + items: + type: object + properties: + denom: + type: string + amount: + type: string + 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. + title: amount is the amount of the tip + tipper: + type: string + title: tipper is the address of the account paying for the tip description: |- AuthInfo describes the fee and signer modes that are used to sign a transaction. @@ -40007,8 +51881,8 @@ definitions: method. - BROADCAST_MODE_UNSPECIFIED: zero-value for mode ordering - - BROADCAST_MODE_BLOCK: BROADCAST_MODE_BLOCK defines a tx broadcasting mode where the client waits for - the tx to be committed in a block. + - BROADCAST_MODE_BLOCK: DEPRECATED: use BROADCAST_MODE_SYNC instead, + BROADCAST_MODE_BLOCK is not supported by the SDK from v0.47.x onwards. - BROADCAST_MODE_SYNC: BROADCAST_MODE_SYNC defines a tx broadcasting mode where the client waits for a CheckTx execution response only. - BROADCAST_MODE_ASYNC: BROADCAST_MODE_ASYNC defines a tx broadcasting mode where the client returns @@ -40033,8 +51907,8 @@ definitions: RPC method. - BROADCAST_MODE_UNSPECIFIED: zero-value for mode ordering - - BROADCAST_MODE_BLOCK: BROADCAST_MODE_BLOCK defines a tx broadcasting mode where the client waits for - the tx to be committed in a block. + - BROADCAST_MODE_BLOCK: DEPRECATED: use BROADCAST_MODE_SYNC instead, + BROADCAST_MODE_BLOCK is not supported by the SDK from v0.47.x onwards. - BROADCAST_MODE_SYNC: BROADCAST_MODE_SYNC defines a tx broadcasting mode where the client waits for a CheckTx execution response only. - BROADCAST_MODE_ASYNC: BROADCAST_MODE_ASYNC defines a tx broadcasting mode where the client returns @@ -40214,10 +52088,8 @@ definitions: properties: key: type: string - format: byte value: type: string - format: byte index: type: boolean title: nondeterministic @@ -40239,8 +52111,7 @@ definitions: these events include those emitted by processing all the messages and those - emitted from the ante handler. Whereas Logs contains the events, - with + emitted from the ante. Whereas Logs contains the events, with additional metadata, emitted only by processing the messages. @@ -40888,9 +52759,10 @@ definitions: next_key: type: string format: byte - title: |- + description: |- next_key is the key to be passed to PageRequest.key to - query the next page most efficiently + query the next page most efficiently. It will be empty if + there are no more results. total: type: string format: uint64 @@ -41080,10 +52952,8 @@ definitions: properties: key: type: string - format: byte value: type: string - format: byte index: type: boolean title: nondeterministic @@ -41105,8 +52975,7 @@ definitions: these events include those emitted by processing all the messages and those - emitted from the ante handler. Whereas Logs contains the events, - with + emitted from the ante. Whereas Logs contains the events, with additional metadata, emitted only by processing the messages. @@ -41294,10 +53163,8 @@ definitions: properties: key: type: string - format: byte value: type: string - format: byte index: type: boolean title: nondeterministic @@ -41319,8 +53186,7 @@ definitions: these events include those emitted by processing all the messages and those - emitted from the ante handler. Whereas Logs contains the events, - with + emitted from the ante. Whereas Logs contains the events, with additional metadata, emitted only by processing the messages. @@ -41333,15 +53199,18 @@ definitions: tags are stringified and the log is JSON decoded. description: tx_responses is the list of queried TxResponses. pagination: - description: pagination defines a pagination for the response. + description: |- + pagination defines a pagination for the response. + Deprecated post v0.46.x: use total instead. type: object properties: next_key: type: string format: byte - title: |- + description: |- next_key is the key to be passed to PageRequest.key to - query the next page most efficiently + query the next page most efficiently. It will be empty if + there are no more results. total: type: string format: uint64 @@ -41350,6 +53219,10 @@ definitions: PageRequest.count_total was set, its value is undefined otherwise + total: + type: string + format: uint64 + title: total is total number of results available description: |- GetTxsEventResponse is the response type for the Service.TxsByEvents RPC method. @@ -41367,6 +53240,7 @@ definitions: - SIGN_MODE_UNSPECIFIED - SIGN_MODE_DIRECT - SIGN_MODE_TEXTUAL + - SIGN_MODE_DIRECT_AUX - SIGN_MODE_LEGACY_AMINO_JSON - SIGN_MODE_EIP_191 default: SIGN_MODE_UNSPECIFIED @@ -41374,17 +53248,42 @@ definitions: SignMode represents a signing mode with its own security guarantees. + + This enum should be considered a registry of all known sign modes + + in the Cosmos ecosystem. Apps are not expected to support all + known + + sign modes. Apps that would like to support custom sign modes are + + encouraged to open a small PR against this file to add a new case + + to this SignMode enum describing their sign mode so that different + + apps have a consistent version of this enum. + - SIGN_MODE_UNSPECIFIED: SIGN_MODE_UNSPECIFIED specifies an unknown signing mode and will be - rejected + rejected. - SIGN_MODE_DIRECT: SIGN_MODE_DIRECT specifies a signing mode which uses SignDoc and is - verified with raw bytes from Tx + verified with raw bytes from Tx. - SIGN_MODE_TEXTUAL: SIGN_MODE_TEXTUAL is a future signing mode that will verify some human-readable textual representation on top of the binary representation - from SIGN_MODE_DIRECT + from SIGN_MODE_DIRECT. It is currently not supported. + - SIGN_MODE_DIRECT_AUX: SIGN_MODE_DIRECT_AUX specifies a signing mode which uses + SignDocDirectAux. As opposed to SIGN_MODE_DIRECT, this sign mode + does not + + require signers signing over other signers' `signer_info`. It also + allows + + for adding Tips in transactions. + + + Since: cosmos-sdk 0.46 - SIGN_MODE_LEGACY_AMINO_JSON: SIGN_MODE_LEGACY_AMINO_JSON is a backwards compatibility mode which uses - Amino JSON and will be removed in the future + Amino JSON and will be removed in the future. - SIGN_MODE_EIP_191: SIGN_MODE_EIP_191 specifies the sign mode for EIP 191 signing on the Cosmos SDK. Ref: https://eips.ethereum.org/EIPS/eip-191 @@ -41448,23 +53347,48 @@ definitions: - SIGN_MODE_UNSPECIFIED - SIGN_MODE_DIRECT - SIGN_MODE_TEXTUAL + - SIGN_MODE_DIRECT_AUX - SIGN_MODE_LEGACY_AMINO_JSON - SIGN_MODE_EIP_191 default: SIGN_MODE_UNSPECIFIED description: >- SignMode represents a signing mode with its own security guarantees. + + This enum should be considered a registry of all known sign modes + + in the Cosmos ecosystem. Apps are not expected to support all known + + sign modes. Apps that would like to support custom sign modes are + + encouraged to open a small PR against this file to add a new case + + to this SignMode enum describing their sign mode so that different + + apps have a consistent version of this enum. + - SIGN_MODE_UNSPECIFIED: SIGN_MODE_UNSPECIFIED specifies an unknown signing mode and will be - rejected + rejected. - SIGN_MODE_DIRECT: SIGN_MODE_DIRECT specifies a signing mode which uses SignDoc and is - verified with raw bytes from Tx + verified with raw bytes from Tx. - SIGN_MODE_TEXTUAL: SIGN_MODE_TEXTUAL is a future signing mode that will verify some human-readable textual representation on top of the binary representation - from SIGN_MODE_DIRECT + from SIGN_MODE_DIRECT. It is currently not supported. + - SIGN_MODE_DIRECT_AUX: SIGN_MODE_DIRECT_AUX specifies a signing mode which uses + SignDocDirectAux. As opposed to SIGN_MODE_DIRECT, this sign mode does + not + + require signers signing over other signers' `signer_info`. It also + allows + + for adding Tips in transactions. + + + Since: cosmos-sdk 0.46 - SIGN_MODE_LEGACY_AMINO_JSON: SIGN_MODE_LEGACY_AMINO_JSON is a backwards compatibility mode which uses - Amino JSON and will be removed in the future + Amino JSON and will be removed in the future. - SIGN_MODE_EIP_191: SIGN_MODE_EIP_191 specifies the sign mode for EIP 191 signing on the Cosmos SDK. Ref: https://eips.ethereum.org/EIPS/eip-191 @@ -41632,6 +53556,11 @@ definitions: length prefixed in order to separate data from multiple message executions. + + Deprecated. This field is still populated, but prefer msg_response + instead + + because it also contains the Msg response typeURL. log: type: string description: >- @@ -41651,10 +53580,8 @@ definitions: properties: key: type: string - format: byte value: type: string - format: byte index: type: boolean title: nondeterministic @@ -41674,9 +53601,209 @@ definitions: message or handler execution. + msg_responses: + type: array + items: + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type of the + serialized + + protocol buffer message. This string must contain at least + + one "/" character. The last segment of the URL's path must + represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be in a + canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the binary all + types that they + + expect it to use in the context of Any. However, for URLs + which use the + + scheme `http`, `https`, or no scheme, one can optionally set + up a type + + server that maps type URLs to message definitions as + follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based on + the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in the + official + + protobuf release, and it is not used for type URLs beginning + with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty scheme) + might be + + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer message + along with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any values in + the form + + of utility functions or additional generated methods of the Any + type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by default + use + + 'type.googleapis.com/full.type.name' as the type URL and the + unpack + + methods only use the fully qualified type name after the last + '/' + + in the type URL, for example "foo.bar.com/x/y.z" will yield type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the regular + + representation of the deserialized, embedded message, with an + + additional field `@type` which contains the type URL. Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a custom JSON + + representation, that representation will be embedded adding a + field + + `value` which holds the custom JSON in addition to the `@type` + + field. Example (for message [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + description: >- + msg_responses contains the Msg handler responses type packed in + Anys. + + + Since: cosmos-sdk 0.46 description: |- SimulateResponse is the response type for the Service.SimulateRPC method. + cosmos.tx.v1beta1.Tip: + type: object + properties: + amount: + type: array + items: + type: object + properties: + denom: + type: string + amount: + type: string + 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. + title: amount is the amount of the tip + tipper: + type: string + title: tipper is the address of the account paying for the tip + description: |- + Tip is the tip used for meta-transactions. + + Since: cosmos-sdk 0.46 cosmos.tx.v1beta1.Tx: type: object properties: @@ -42627,177 +54754,265 @@ definitions: when the default options are not sufficient. If any of these are present - and can't be handled, the transaction will be rejected - non_critical_extension_options: - type: array - items: - type: object - properties: - '@type': - type: string - description: >- - A URL/resource name that uniquely identifies the type of the - serialized - - protocol buffer message. This string must contain at least - - one "/" character. The last segment of the URL's path must - represent - - the fully qualified name of the type (as in - - `path/google.protobuf.Duration`). The name should be in a - canonical form - - (e.g., leading "." is not accepted). - - - In practice, teams usually precompile into the binary all types - that they - - expect it to use in the context of Any. However, for URLs which - use the - - scheme `http`, `https`, or no scheme, one can optionally set up - a type - - server that maps type URLs to message definitions as follows: - - - * If no scheme is provided, `https` is assumed. - - * An HTTP GET on the URL must yield a [google.protobuf.Type][] - value in binary format, or produce an error. - * Applications are allowed to cache lookup results based on the - URL, or have them precompiled into a binary to avoid any - lookup. Therefore, binary compatibility needs to be preserved - on changes to types. (Use versioned type names to manage - breaking changes.) - - Note: this functionality is not currently available in the - official - - protobuf release, and it is not used for type URLs beginning - with - - type.googleapis.com. - - - Schemes other than `http`, `https` (or the empty scheme) might - be - - used with implementation specific semantics. - additionalProperties: {} - description: >- - `Any` contains an arbitrary serialized protocol buffer message along - with a - - URL that describes the type of the serialized message. - - - Protobuf library provides support to pack/unpack Any values in the - form - - of utility functions or additional generated methods of the Any - type. - - - Example 1: Pack and unpack a message in C++. - - Foo foo = ...; - Any any; - any.PackFrom(foo); - ... - if (any.UnpackTo(&foo)) { - ... - } - - Example 2: Pack and unpack a message in Java. - - Foo foo = ...; - Any any = Any.pack(foo); - ... - if (any.is(Foo.class)) { - foo = any.unpack(Foo.class); - } - - Example 3: Pack and unpack a message in Python. - - foo = Foo(...) - any = Any() - any.Pack(foo) - ... - if any.Is(Foo.DESCRIPTOR): - any.Unpack(foo) - ... - - Example 4: Pack and unpack a message in Go - - foo := &pb.Foo{...} - any, err := anypb.New(foo) - if err != nil { - ... - } - ... - foo := &pb.Foo{} - if err := any.UnmarshalTo(foo); err != nil { - ... - } - - The pack methods provided by protobuf library will by default use - - 'type.googleapis.com/full.type.name' as the type URL and the unpack - - methods only use the fully qualified type name after the last '/' - - in the type URL, for example "foo.bar.com/x/y.z" will yield type - - name "y.z". - - - - JSON - - ==== - - The JSON representation of an `Any` value uses the regular - - representation of the deserialized, embedded message, with an - - additional field `@type` which contains the type URL. Example: - - package google.profile; - message Person { - string first_name = 1; - string last_name = 2; - } + and can't be handled, the transaction will be rejected + non_critical_extension_options: + type: array + items: + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type of the + serialized + + protocol buffer message. This string must contain at least + + one "/" character. The last segment of the URL's path must + represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be in a + canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the binary all types + that they + + expect it to use in the context of Any. However, for URLs which + use the + + scheme `http`, `https`, or no scheme, one can optionally set up + a type + + server that maps type URLs to message definitions as follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in the + official + + protobuf release, and it is not used for type URLs beginning + with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty scheme) might + be + + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer message along + with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any values in the + form + + of utility functions or additional generated methods of the Any + type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by default use + + 'type.googleapis.com/full.type.name' as the type URL and the unpack + + methods only use the fully qualified type name after the last '/' + + in the type URL, for example "foo.bar.com/x/y.z" will yield type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the regular + + representation of the deserialized, embedded message, with an + + additional field `@type` which contains the type URL. Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a custom JSON + + representation, that representation will be embedded adding a field + + `value` which holds the custom JSON in addition to the `@type` + + field. Example (for message [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + title: >- + extension_options are arbitrary options that can be added by chains + + when the default options are not sufficient. If any of these are + present + + and can't be handled, they will be ignored + description: TxBody is the body of a transaction that all signers sign over. + cosmos.tx.v1beta1.TxDecodeAminoRequest: + type: object + properties: + amino_binary: + type: string + format: byte + description: |- + TxDecodeAminoRequest is the request type for the Service.TxDecodeAmino + RPC method. - { - "@type": "type.googleapis.com/google.profile.Person", - "firstName": , - "lastName": - } + Since: cosmos-sdk 0.47 + cosmos.tx.v1beta1.TxDecodeAminoResponse: + type: object + properties: + amino_json: + type: string + description: |- + TxDecodeAminoResponse is the response type for the Service.TxDecodeAmino + RPC method. - If the embedded message type is well-known and has a custom JSON + Since: cosmos-sdk 0.47 + cosmos.tx.v1beta1.TxDecodeRequest: + type: object + properties: + tx_bytes: + type: string + format: byte + description: tx_bytes is the raw transaction. + description: |- + TxDecodeRequest is the request type for the Service.TxDecode + RPC method. - representation, that representation will be embedded adding a field + Since: cosmos-sdk 0.47 + cosmos.tx.v1beta1.TxDecodeResponse: + type: object + properties: + tx: + $ref: '#/definitions/cosmos.tx.v1beta1.Tx' + description: tx is the decoded transaction. + description: |- + TxDecodeResponse is the response type for the + Service.TxDecode method. - `value` which holds the custom JSON in addition to the `@type` + Since: cosmos-sdk 0.47 + cosmos.tx.v1beta1.TxEncodeAminoRequest: + type: object + properties: + amino_json: + type: string + description: |- + TxEncodeAminoRequest is the request type for the Service.TxEncodeAmino + RPC method. - field. Example (for message [google.protobuf.Duration][]): + Since: cosmos-sdk 0.47 + cosmos.tx.v1beta1.TxEncodeAminoResponse: + type: object + properties: + amino_binary: + type: string + format: byte + description: |- + TxEncodeAminoResponse is the response type for the Service.TxEncodeAmino + RPC method. - { - "@type": "type.googleapis.com/google.protobuf.Duration", - "value": "1.212s" - } - title: >- - extension_options are arbitrary options that can be added by chains + Since: cosmos-sdk 0.47 + cosmos.tx.v1beta1.TxEncodeRequest: + type: object + properties: + tx: + $ref: '#/definitions/cosmos.tx.v1beta1.Tx' + description: tx is the transaction to encode. + description: |- + TxEncodeRequest is the request type for the Service.TxEncode + RPC method. - when the default options are not sufficient. If any of these are - present + Since: cosmos-sdk 0.47 + cosmos.tx.v1beta1.TxEncodeResponse: + type: object + properties: + tx_bytes: + type: string + format: byte + description: tx_bytes is the encoded transaction bytes. + description: |- + TxEncodeResponse is the response type for the + Service.TxEncode method. - and can't be handled, they will be ignored - description: TxBody is the body of a transaction that all signers sign over. + Since: cosmos-sdk 0.47 tendermint.abci.Event: type: object properties: @@ -42810,10 +55025,8 @@ definitions: properties: key: type: string - format: byte value: type: string - format: byte index: type: boolean title: nondeterministic @@ -42830,10 +55043,8 @@ definitions: properties: key: type: string - format: byte value: type: string - format: byte index: type: boolean title: nondeterministic @@ -42852,6 +55063,18 @@ definitions: ModuleVersion specifies a module and its consensus version. Since: cosmos-sdk 0.43 + cosmos.upgrade.v1beta1.MsgCancelUpgradeResponse: + type: object + description: |- + MsgCancelUpgradeResponse is the Msg/CancelUpgrade response type. + + Since: cosmos-sdk 0.46 + cosmos.upgrade.v1beta1.MsgSoftwareUpgradeResponse: + type: object + description: |- + MsgSoftwareUpgradeResponse is the Msg/SoftwareUpgrade response type. + + Since: cosmos-sdk 0.46 cosmos.upgrade.v1beta1.Plan: type: object properties: @@ -42888,9 +55111,7 @@ definitions: height: type: string format: int64 - description: |- - The height at which the upgrade must be performed. - Only used if Time is not set. + description: The height at which the upgrade must be performed. info: type: string title: |- @@ -42974,6 +55195,13 @@ definitions: RPC method. + cosmos.upgrade.v1beta1.QueryAuthorityResponse: + type: object + properties: + address: + type: string + description: 'Since: cosmos-sdk 0.46' + title: QueryAuthorityResponse is the response type for Query/Authority cosmos.upgrade.v1beta1.QueryCurrentPlanResponse: type: object properties: @@ -43016,9 +55244,7 @@ definitions: height: type: string format: int64 - description: |- - The height at which the upgrade must be performed. - Only used if Time is not set. + description: The height at which the upgrade must be performed. info: type: string title: >- @@ -43139,11 +55365,51 @@ definitions: Query/UpgradedConsensusState RPC method. + cosmos.vesting.v1beta1.MsgCreatePeriodicVestingAccountResponse: + type: object + description: >- + MsgCreateVestingAccountResponse defines the + Msg/CreatePeriodicVestingAccount + + response type. + + + Since: cosmos-sdk 0.46 + cosmos.vesting.v1beta1.MsgCreatePermanentLockedAccountResponse: + type: object + description: >- + MsgCreatePermanentLockedAccountResponse defines the + Msg/CreatePermanentLockedAccount response type. + + + Since: cosmos-sdk 0.46 cosmos.vesting.v1beta1.MsgCreateVestingAccountResponse: type: object description: >- MsgCreateVestingAccountResponse defines the Msg/CreateVestingAccount response type. + cosmos.vesting.v1beta1.Period: + type: object + properties: + length: + type: string + format: int64 + description: Period duration in seconds. + amount: + type: array + items: + type: object + properties: + denom: + type: string + amount: + type: string + 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. + description: Period defines a length of time and amount of coins that will vest. cosmwasm.wasm.v1.AbsoluteTxPosition: type: object properties: @@ -43462,6 +55728,28 @@ definitions: Data contains same raw bytes returned as data from the wasm contract. (May be empty) description: MsgMigrateContractResponse returns contract migration result data. + cosmwasm.wasm.v1.MsgPinCodesResponse: + type: object + description: |- + MsgPinCodesResponse defines the response structure for executing a + MsgPinCodes message. + + Since: 0.40 + cosmwasm.wasm.v1.MsgStoreAndInstantiateContractResponse: + type: object + properties: + address: + type: string + description: Address is the bech32 address of the new contract instance. + data: + type: string + format: byte + title: Data contains bytes to returned from the contract + description: |- + MsgStoreAndInstantiateContractResponse defines the response structure + for executing a MsgStoreAndInstantiateContract message. + + Since: 0.40 cosmwasm.wasm.v1.MsgStoreCodeResponse: type: object properties: @@ -43474,12 +55762,38 @@ definitions: format: byte title: Checksum is the sha256 hash of the stored code description: MsgStoreCodeResponse returns store result data. + cosmwasm.wasm.v1.MsgSudoContractResponse: + type: object + properties: + data: + type: string + format: byte + title: Data contains bytes to returned from the contract + description: |- + MsgSudoContractResponse defines the response structure for executing a + MsgSudoContract message. + + Since: 0.40 + cosmwasm.wasm.v1.MsgUnpinCodesResponse: + type: object + description: |- + MsgUnpinCodesResponse defines the response structure for executing a + MsgUnpinCodes message. + + Since: 0.40 cosmwasm.wasm.v1.MsgUpdateAdminResponse: type: object title: MsgUpdateAdminResponse returns empty data cosmwasm.wasm.v1.MsgUpdateInstantiateConfigResponse: type: object title: MsgUpdateInstantiateConfigResponse returns empty data + cosmwasm.wasm.v1.MsgUpdateParamsResponse: + type: object + description: |- + MsgUpdateParamsResponse defines the response structure for executing a + MsgUpdateParams message. + + Since: 0.40 cosmwasm.wasm.v1.Params: type: object properties: @@ -43557,9 +55871,10 @@ definitions: next_key: type: string format: byte - title: |- + description: |- next_key is the key to be passed to PageRequest.key to - query the next page most efficiently + query the next page most efficiently. It will be empty if + there are no more results. total: type: string format: uint64 @@ -43678,9 +55993,10 @@ definitions: next_key: type: string format: byte - title: |- + description: |- next_key is the key to be passed to PageRequest.key to - query the next page most efficiently + query the next page most efficiently. It will be empty if + there are no more results. total: type: string format: uint64 @@ -43747,9 +56063,10 @@ definitions: next_key: type: string format: byte - title: |- + description: |- next_key is the key to be passed to PageRequest.key to - query the next page most efficiently + query the next page most efficiently. It will be empty if + there are no more results. total: type: string format: uint64 @@ -43886,9 +56203,10 @@ definitions: next_key: type: string format: byte - title: |- + description: |- next_key is the key to be passed to PageRequest.key to - query the next page most efficiently + query the next page most efficiently. It will be empty if + there are no more results. total: type: string format: uint64 @@ -43915,9 +56233,10 @@ definitions: next_key: type: string format: byte - title: |- + description: |- next_key is the key to be passed to PageRequest.key to - query the next page most efficiently + query the next page most efficiently. It will be empty if + there are no more results. total: type: string format: uint64 @@ -44001,9 +56320,10 @@ definitions: next_key: type: string format: byte - title: |- + description: |- next_key is the key to be passed to PageRequest.key to - query the next page most efficiently + query the next page most efficiently. It will be empty if + there are no more results. total: type: string format: uint64 @@ -44035,6 +56355,21 @@ definitions: title: |- QuerySmartContractStateResponse is the response type for the Query/SmartContractState RPC method + ibc.applications.interchain_accounts.controller.v1.MsgRegisterInterchainAccountResponse: + type: object + properties: + channel_id: + type: string + title: >- + MsgRegisterInterchainAccountResponse defines the response for + Msg/RegisterAccount + ibc.applications.interchain_accounts.controller.v1.MsgSendTxResponse: + type: object + properties: + sequence: + type: string + format: uint64 + title: MsgSendTxResponse defines the response for MsgSendTx ibc.applications.interchain_accounts.controller.v1.Params: type: object properties: @@ -44063,6 +56398,45 @@ definitions: type: boolean description: controller_enabled enables or disables the controller submodule. description: QueryParamsResponse is the response type for the Query/Params RPC method. + ibc.applications.interchain_accounts.v1.InterchainAccountPacketData: + type: object + properties: + type: + type: string + enum: + - TYPE_UNSPECIFIED + - TYPE_EXECUTE_TX + default: TYPE_UNSPECIFIED + description: |- + - TYPE_UNSPECIFIED: Default zero value enumeration + - TYPE_EXECUTE_TX: Execute a transaction on an interchain accounts host chain + title: >- + Type defines a classification of message issued from a controller + chain to its associated interchain accounts + + host + data: + type: string + format: byte + memo: + type: string + description: >- + InterchainAccountPacketData is comprised of a raw transaction, type of + transaction and optional memo field. + ibc.applications.interchain_accounts.v1.Type: + type: string + enum: + - TYPE_UNSPECIFIED + - TYPE_EXECUTE_TX + default: TYPE_UNSPECIFIED + description: |- + - TYPE_UNSPECIFIED: Default zero value enumeration + - TYPE_EXECUTE_TX: Execute a transaction on an interchain accounts host chain + title: >- + Type defines a classification of message issued from a controller chain to + its associated interchain accounts + + host ibc.applications.interchain_accounts.host.v1.Params: type: object properties: @@ -45052,9 +57426,10 @@ definitions: next_key: type: string format: byte - title: |- + description: |- next_key is the key to be passed to PageRequest.key to - query the next page most efficiently + query the next page most efficiently. It will be empty if + there are no more results. total: type: string format: uint64 @@ -45187,9 +57562,10 @@ definitions: next_key: type: string format: byte - title: |- + description: |- next_key is the key to be passed to PageRequest.key to - query the next page most efficiently + query the next page most efficiently. It will be empty if + there are no more results. total: type: string format: uint64 @@ -45360,9 +57736,10 @@ definitions: next_key: type: string format: byte - title: |- + description: |- next_key is the key to be passed to PageRequest.key to - query the next page most efficiently + query the next page most efficiently. It will be empty if + there are no more results. total: type: string format: uint64 @@ -45494,9 +57871,10 @@ definitions: next_key: type: string format: byte - title: |- + description: |- next_key is the key to be passed to PageRequest.key to - query the next page most efficiently + query the next page most efficiently. It will be empty if + there are no more results. total: type: string format: uint64 @@ -46521,9 +58899,10 @@ definitions: next_key: type: string format: byte - title: |- + description: |- next_key is the key to be passed to PageRequest.key to - query the next page most efficiently + query the next page most efficiently. It will be empty if + there are no more results. total: type: string format: uint64 @@ -46603,9 +58982,10 @@ definitions: next_key: type: string format: byte - title: |- + description: |- next_key is the key to be passed to PageRequest.key to - query the next page most efficiently + query the next page most efficiently. It will be empty if + there are no more results. total: type: string format: uint64 @@ -47043,9 +59423,10 @@ definitions: next_key: type: string format: byte - title: |- + description: |- next_key is the key to be passed to PageRequest.key to - query the next page most efficiently + query the next page most efficiently. It will be empty if + there are no more results. total: type: string format: uint64 @@ -47622,6 +60003,21 @@ definitions: description: >- MsgConnectionOpenTryResponse defines the Msg/ConnectionOpenTry response type. + ibc.core.connection.v1.Params: + type: object + properties: + max_expected_time_per_block: + type: string + format: uint64 + description: >- + maximum expected time per block (in nanoseconds), used to enforce + block delay. This parameter should reflect the + + largest amount of time that the chain might reasonably take to produce + the next block under normal operating + + conditions. A safe choice is 3-5x the expected time per block. + description: Params defines the set of Connection parameters. ibc.core.connection.v1.QueryClientConnectionsResponse: type: object properties: @@ -48076,6 +60472,27 @@ definitions: title: |- QueryConnectionConsensusStateResponse is the response type for the Query/ConnectionConsensusState RPC method + ibc.core.connection.v1.QueryConnectionParamsResponse: + type: object + properties: + params: + description: params defines the parameters of the module. + type: object + properties: + max_expected_time_per_block: + type: string + format: uint64 + description: >- + maximum expected time per block (in nanoseconds), used to enforce + block delay. This parameter should reflect the + + largest amount of time that the chain might reasonably take to + produce the next block under normal operating + + conditions. A safe choice is 3-5x the expected time per block. + description: >- + QueryConnectionParamsResponse is the response type for the + Query/ConnectionParams RPC method. ibc.core.connection.v1.QueryConnectionResponse: type: object properties: @@ -48302,9 +60719,10 @@ definitions: next_key: type: string format: byte - title: |- + description: |- next_key is the key to be passed to PageRequest.key to - query the next page most efficiently + query the next page most efficiently. It will be empty if + there are no more results. total: type: string format: uint64 @@ -48614,425 +61032,7 @@ definitions: set can opt out title: Params defines the parameters for CCV consumer module description: QueryParamsResponse is response type for the Query/Params RPC method. - cosmos.staking.v1beta1.InfractionType: - type: string - enum: - - INFRACTION_TYPE_UNSPECIFIED - - INFRACTION_TYPE_DOUBLE_SIGN - - INFRACTION_TYPE_DOWNTIME - default: INFRACTION_TYPE_UNSPECIFIED - description: |- - InfractionType indicates the infraction type a validator commited. - - - INFRACTION_TYPE_UNSPECIFIED: UNSPECIFIED defines an empty infraction type. - - INFRACTION_TYPE_DOUBLE_SIGN: DOUBLE_SIGN defines a validator that double-signs a block. - - INFRACTION_TYPE_DOWNTIME: DOWNTIME defines a validator that missed signing too many blocks. - ibc.core.commitment.v1.MerkleRoot: - type: object - properties: - hash: - type: string - format: byte - description: |- - MerkleRoot defines a merkle root hash. - In the Cosmos SDK, the AppHash of a block header becomes the root. - ibc.lightclients.tendermint.v1.ClientState: - type: object - properties: - chain_id: - type: string - trust_level: - type: object - properties: - numerator: - type: string - format: uint64 - denominator: - type: string - format: uint64 - description: >- - Fraction defines the protobuf message type for tmmath.Fraction that - only - - supports positive values. - trusting_period: - type: string - title: |- - duration of the period since the LastestTimestamp during which the - submitted headers are valid for upgrade - unbonding_period: - type: string - title: duration of the staking unbonding period - max_clock_drift: - type: string - description: >- - defines how much new (untrusted) header's Time can drift into the - future. - frozen_height: - title: Block height when the client was frozen due to a misbehaviour - type: object - properties: - revision_number: - type: string - format: uint64 - title: the revision that the client is currently on - revision_height: - type: string - format: uint64 - title: the height within the given revision - description: >- - Normally the RevisionHeight is incremented at each height while - keeping - - RevisionNumber the same. However some consensus algorithms may choose - to - - reset the height in certain conditions e.g. hard forks, state-machine - - breaking changes In these cases, the RevisionNumber is incremented so - that - - height continues to be monitonically increasing even as the - RevisionHeight - - gets reset - latest_height: - title: Latest height the client was updated to - type: object - properties: - revision_number: - type: string - format: uint64 - title: the revision that the client is currently on - revision_height: - type: string - format: uint64 - title: the height within the given revision - description: >- - Normally the RevisionHeight is incremented at each height while - keeping - - RevisionNumber the same. However some consensus algorithms may choose - to - - reset the height in certain conditions e.g. hard forks, state-machine - - breaking changes In these cases, the RevisionNumber is incremented so - that - - height continues to be monitonically increasing even as the - RevisionHeight - - gets reset - proof_specs: - type: array - items: - type: object - properties: - leaf_spec: - title: >- - any field in the ExistenceProof must be the same as in this - spec. - - except Prefix, which is just the first bytes of prefix (spec can - be longer) - type: object - properties: - hash: - type: string - enum: - - NO_HASH - - SHA256 - - SHA512 - - KECCAK - - RIPEMD160 - - BITCOIN - - SHA512_256 - default: NO_HASH - title: >- - - NO_HASH: NO_HASH is the default if no data passed. Note - this is an illegal argument some places. - - BITCOIN: ripemd160(sha256(x)) - prehash_key: - type: string - enum: - - NO_HASH - - SHA256 - - SHA512 - - KECCAK - - RIPEMD160 - - BITCOIN - - SHA512_256 - default: NO_HASH - title: >- - - NO_HASH: NO_HASH is the default if no data passed. Note - this is an illegal argument some places. - - BITCOIN: ripemd160(sha256(x)) - prehash_value: - type: string - enum: - - NO_HASH - - SHA256 - - SHA512 - - KECCAK - - RIPEMD160 - - BITCOIN - - SHA512_256 - default: NO_HASH - title: >- - - NO_HASH: NO_HASH is the default if no data passed. Note - this is an illegal argument some places. - - BITCOIN: ripemd160(sha256(x)) - length: - type: string - enum: - - NO_PREFIX - - VAR_PROTO - - VAR_RLP - - FIXED32_BIG - - FIXED32_LITTLE - - FIXED64_BIG - - FIXED64_LITTLE - - REQUIRE_32_BYTES - - REQUIRE_64_BYTES - default: NO_PREFIX - description: |- - - NO_PREFIX: NO_PREFIX don't include any length info - - VAR_PROTO: VAR_PROTO uses protobuf (and go-amino) varint encoding of the length - - VAR_RLP: VAR_RLP uses rlp int encoding of the length - - FIXED32_BIG: FIXED32_BIG uses big-endian encoding of the length as a 32 bit integer - - FIXED32_LITTLE: FIXED32_LITTLE uses little-endian encoding of the length as a 32 bit integer - - FIXED64_BIG: FIXED64_BIG uses big-endian encoding of the length as a 64 bit integer - - FIXED64_LITTLE: FIXED64_LITTLE uses little-endian encoding of the length as a 64 bit integer - - REQUIRE_32_BYTES: REQUIRE_32_BYTES is like NONE, but will fail if the input is not exactly 32 bytes (sha256 output) - - REQUIRE_64_BYTES: REQUIRE_64_BYTES is like NONE, but will fail if the input is not exactly 64 bytes (sha512 output) - title: >- - * - - LengthOp defines how to process the key and value of the - LeafOp - - to include length information. After encoding the length - with the given - - algorithm, the length will be prepended to the key and value - bytes. - - (Each one with it's own encoded length) - prefix: - type: string - format: byte - description: >- - prefix is a fixed bytes that may optionally be included at - the beginning to differentiate - - a leaf node from an inner node. - description: >- - * - - LeafOp represents the raw key-value data we wish to prove, and - - must be flexible to represent the internal transformation from - - the original key-value pairs into the basis hash, for many - existing - - merkle trees. - - - key and value are passed in. So that the signature of this - operation is: - - leafOp(key, value) -> output - - - To process this, first prehash the keys and values if needed - (ANY means no hash in this case): - - hkey = prehashKey(key) - - hvalue = prehashValue(value) - - - Then combine the bytes, and hash it - - output = hash(prefix || length(hkey) || hkey || length(hvalue) - || hvalue) - inner_spec: - type: object - properties: - child_order: - type: array - items: - type: integer - format: int32 - title: >- - Child order is the ordering of the children node, must count - from 0 - - iavl tree is [0, 1] (left then right) - - merk is [0, 2, 1] (left, right, here) - child_size: - type: integer - format: int32 - min_prefix_length: - type: integer - format: int32 - max_prefix_length: - type: integer - format: int32 - empty_child: - type: string - format: byte - title: >- - empty child is the prehash image that is used when one child - is nil (eg. 20 bytes of 0) - hash: - type: string - enum: - - NO_HASH - - SHA256 - - SHA512 - - KECCAK - - RIPEMD160 - - BITCOIN - - SHA512_256 - default: NO_HASH - title: >- - - NO_HASH: NO_HASH is the default if no data passed. Note - this is an illegal argument some places. - - BITCOIN: ripemd160(sha256(x)) - description: >- - InnerSpec contains all store-specific structure info to - determine if two proofs from a - - given store are neighbors. - - - This enables: - - - isLeftMost(spec: InnerSpec, op: InnerOp) - - isRightMost(spec: InnerSpec, op: InnerOp) - - isLeftNeighbor(spec: InnerSpec, left: InnerOp, right: InnerOp) - max_depth: - type: integer - format: int32 - title: >- - max_depth (if > 0) is the maximum number of InnerOps allowed - (mainly for fixed-depth tries) - min_depth: - type: integer - format: int32 - title: >- - min_depth (if > 0) is the minimum number of InnerOps allowed - (mainly for fixed-depth tries) - description: >- - * - - ProofSpec defines what the expected parameters are for a given proof - type. - - This can be stored in the client and used to validate any incoming - proofs. - - - verify(ProofSpec, Proof) -> Proof | Error - - - As demonstrated in tests, if we don't fix the algorithm used to - calculate the - - LeafHash for a given tree, there are many possible key-value pairs - that can - - generate a given hash (by interpretting the preimage differently). - - We need this for proper security, requires client knows a priori - what - - tree format server uses. But not in code, rather a configuration - object. - title: Proof specifications used in verifying counterparty state - upgrade_path: - type: array - items: - type: string - title: >- - Path at which next upgraded client will be committed. - - Each element corresponds to the key for a single CommitmentProof in - the - - chained proof. NOTE: ClientState must stored under - - `{upgradePath}/{upgradeHeight}/clientState` ConsensusState must be - stored - - under `{upgradepath}/{upgradeHeight}/consensusState` For SDK chains - using - - the default upgrade module, upgrade_path should be []string{"upgrade", - - "upgradedIBCState"}` - allow_update_after_expiry: - type: boolean - title: |- - This flag, when set to true, will allow governance to recover a client - which has expired - allow_update_after_misbehaviour: - type: boolean - title: >- - This flag, when set to true, will allow governance to unfreeze a - client - - whose chain has experienced a misbehaviour event - description: >- - ClientState from Tendermint tracks the current validator set, latest - height, - - and a possible frozen height. - ibc.lightclients.tendermint.v1.ConsensusState: - type: object - properties: - timestamp: - type: string - format: date-time - description: >- - timestamp that corresponds to the block height in which the - ConsensusState - - was stored. - root: - title: commitment root (i.e app hash) - type: object - properties: - hash: - type: string - format: byte - description: |- - MerkleRoot defines a merkle root hash. - In the Cosmos SDK, the AppHash of a block header becomes the root. - next_validators_hash: - type: string - format: byte - description: ConsensusState defines the consensus state from Tendermint. - ibc.lightclients.tendermint.v1.Fraction: - type: object - properties: - numerator: - type: string - format: uint64 - denominator: - type: string - format: uint64 - description: |- - Fraction defines the protobuf message type for tmmath.Fraction that only - supports positive values. - ics23.HashOp: + cosmos.ics23.v1.HashOp: type: string enum: - NO_HASH @@ -49047,7 +61047,7 @@ definitions: - NO_HASH: NO_HASH is the default if no data passed. Note this is an illegal argument some places. - BITCOIN: ripemd160(sha256(x)) - ics23.InnerSpec: + cosmos.ics23.v1.InnerSpec: type: object properties: child_order: @@ -49104,7 +61104,7 @@ definitions: isRightMost(spec: InnerSpec, op: InnerOp) isLeftNeighbor(spec: InnerSpec, left: InnerOp, right: InnerOp) - ics23.LeafOp: + cosmos.ics23.v1.LeafOp: type: object properties: hash: @@ -49222,7 +61222,7 @@ definitions: Then combine the bytes, and hash it output = hash(prefix || length(hkey) || hkey || length(hvalue) || hvalue) - ics23.LengthOp: + cosmos.ics23.v1.LengthOp: type: string enum: - NO_PREFIX @@ -49251,7 +61251,7 @@ definitions: to include length information. After encoding the length with the given algorithm, the length will be prepended to the key and value bytes. (Each one with it's own encoded length) - ics23.ProofSpec: + cosmos.ics23.v1.ProofSpec: type: object properties: leaf_spec: @@ -49474,6 +61474,418 @@ definitions: We need this for proper security, requires client knows a priori what tree format server uses. But not in code, rather a configuration object. + cosmos.staking.v1beta1.Infraction: + type: string + enum: + - INFRACTION_UNSPECIFIED + - INFRACTION_DOUBLE_SIGN + - INFRACTION_DOWNTIME + default: INFRACTION_UNSPECIFIED + description: |- + Infraction indicates the infraction a validator commited. + + - INFRACTION_UNSPECIFIED: UNSPECIFIED defines an empty infraction. + - INFRACTION_DOUBLE_SIGN: DOUBLE_SIGN defines a validator that double-signs a block. + - INFRACTION_DOWNTIME: DOWNTIME defines a validator that missed signing too many blocks. + ibc.core.commitment.v1.MerkleRoot: + type: object + properties: + hash: + type: string + format: byte + description: |- + MerkleRoot defines a merkle root hash. + In the Cosmos SDK, the AppHash of a block header becomes the root. + ibc.lightclients.tendermint.v1.ClientState: + type: object + properties: + chain_id: + type: string + trust_level: + type: object + properties: + numerator: + type: string + format: uint64 + denominator: + type: string + format: uint64 + description: >- + Fraction defines the protobuf message type for tmmath.Fraction that + only + + supports positive values. + trusting_period: + type: string + title: |- + duration of the period since the LastestTimestamp during which the + submitted headers are valid for upgrade + unbonding_period: + type: string + title: duration of the staking unbonding period + max_clock_drift: + type: string + description: >- + defines how much new (untrusted) header's Time can drift into the + future. + frozen_height: + title: Block height when the client was frozen due to a misbehaviour + type: object + properties: + revision_number: + type: string + format: uint64 + title: the revision that the client is currently on + revision_height: + type: string + format: uint64 + title: the height within the given revision + description: >- + Normally the RevisionHeight is incremented at each height while + keeping + + RevisionNumber the same. However some consensus algorithms may choose + to + + reset the height in certain conditions e.g. hard forks, state-machine + + breaking changes In these cases, the RevisionNumber is incremented so + that + + height continues to be monitonically increasing even as the + RevisionHeight + + gets reset + latest_height: + title: Latest height the client was updated to + type: object + properties: + revision_number: + type: string + format: uint64 + title: the revision that the client is currently on + revision_height: + type: string + format: uint64 + title: the height within the given revision + description: >- + Normally the RevisionHeight is incremented at each height while + keeping + + RevisionNumber the same. However some consensus algorithms may choose + to + + reset the height in certain conditions e.g. hard forks, state-machine + + breaking changes In these cases, the RevisionNumber is incremented so + that + + height continues to be monitonically increasing even as the + RevisionHeight + + gets reset + proof_specs: + type: array + items: + type: object + properties: + leaf_spec: + title: >- + any field in the ExistenceProof must be the same as in this + spec. + + except Prefix, which is just the first bytes of prefix (spec can + be longer) + type: object + properties: + hash: + type: string + enum: + - NO_HASH + - SHA256 + - SHA512 + - KECCAK + - RIPEMD160 + - BITCOIN + - SHA512_256 + default: NO_HASH + title: >- + - NO_HASH: NO_HASH is the default if no data passed. Note + this is an illegal argument some places. + - BITCOIN: ripemd160(sha256(x)) + prehash_key: + type: string + enum: + - NO_HASH + - SHA256 + - SHA512 + - KECCAK + - RIPEMD160 + - BITCOIN + - SHA512_256 + default: NO_HASH + title: >- + - NO_HASH: NO_HASH is the default if no data passed. Note + this is an illegal argument some places. + - BITCOIN: ripemd160(sha256(x)) + prehash_value: + type: string + enum: + - NO_HASH + - SHA256 + - SHA512 + - KECCAK + - RIPEMD160 + - BITCOIN + - SHA512_256 + default: NO_HASH + title: >- + - NO_HASH: NO_HASH is the default if no data passed. Note + this is an illegal argument some places. + - BITCOIN: ripemd160(sha256(x)) + length: + type: string + enum: + - NO_PREFIX + - VAR_PROTO + - VAR_RLP + - FIXED32_BIG + - FIXED32_LITTLE + - FIXED64_BIG + - FIXED64_LITTLE + - REQUIRE_32_BYTES + - REQUIRE_64_BYTES + default: NO_PREFIX + description: |- + - NO_PREFIX: NO_PREFIX don't include any length info + - VAR_PROTO: VAR_PROTO uses protobuf (and go-amino) varint encoding of the length + - VAR_RLP: VAR_RLP uses rlp int encoding of the length + - FIXED32_BIG: FIXED32_BIG uses big-endian encoding of the length as a 32 bit integer + - FIXED32_LITTLE: FIXED32_LITTLE uses little-endian encoding of the length as a 32 bit integer + - FIXED64_BIG: FIXED64_BIG uses big-endian encoding of the length as a 64 bit integer + - FIXED64_LITTLE: FIXED64_LITTLE uses little-endian encoding of the length as a 64 bit integer + - REQUIRE_32_BYTES: REQUIRE_32_BYTES is like NONE, but will fail if the input is not exactly 32 bytes (sha256 output) + - REQUIRE_64_BYTES: REQUIRE_64_BYTES is like NONE, but will fail if the input is not exactly 64 bytes (sha512 output) + title: >- + * + + LengthOp defines how to process the key and value of the + LeafOp + + to include length information. After encoding the length + with the given + + algorithm, the length will be prepended to the key and value + bytes. + + (Each one with it's own encoded length) + prefix: + type: string + format: byte + description: >- + prefix is a fixed bytes that may optionally be included at + the beginning to differentiate + + a leaf node from an inner node. + description: >- + * + + LeafOp represents the raw key-value data we wish to prove, and + + must be flexible to represent the internal transformation from + + the original key-value pairs into the basis hash, for many + existing + + merkle trees. + + + key and value are passed in. So that the signature of this + operation is: + + leafOp(key, value) -> output + + + To process this, first prehash the keys and values if needed + (ANY means no hash in this case): + + hkey = prehashKey(key) + + hvalue = prehashValue(value) + + + Then combine the bytes, and hash it + + output = hash(prefix || length(hkey) || hkey || length(hvalue) + || hvalue) + inner_spec: + type: object + properties: + child_order: + type: array + items: + type: integer + format: int32 + title: >- + Child order is the ordering of the children node, must count + from 0 + + iavl tree is [0, 1] (left then right) + + merk is [0, 2, 1] (left, right, here) + child_size: + type: integer + format: int32 + min_prefix_length: + type: integer + format: int32 + max_prefix_length: + type: integer + format: int32 + empty_child: + type: string + format: byte + title: >- + empty child is the prehash image that is used when one child + is nil (eg. 20 bytes of 0) + hash: + type: string + enum: + - NO_HASH + - SHA256 + - SHA512 + - KECCAK + - RIPEMD160 + - BITCOIN + - SHA512_256 + default: NO_HASH + title: >- + - NO_HASH: NO_HASH is the default if no data passed. Note + this is an illegal argument some places. + - BITCOIN: ripemd160(sha256(x)) + description: >- + InnerSpec contains all store-specific structure info to + determine if two proofs from a + + given store are neighbors. + + + This enables: + + + isLeftMost(spec: InnerSpec, op: InnerOp) + + isRightMost(spec: InnerSpec, op: InnerOp) + + isLeftNeighbor(spec: InnerSpec, left: InnerOp, right: InnerOp) + max_depth: + type: integer + format: int32 + title: >- + max_depth (if > 0) is the maximum number of InnerOps allowed + (mainly for fixed-depth tries) + min_depth: + type: integer + format: int32 + title: >- + min_depth (if > 0) is the minimum number of InnerOps allowed + (mainly for fixed-depth tries) + description: >- + * + + ProofSpec defines what the expected parameters are for a given proof + type. + + This can be stored in the client and used to validate any incoming + proofs. + + + verify(ProofSpec, Proof) -> Proof | Error + + + As demonstrated in tests, if we don't fix the algorithm used to + calculate the + + LeafHash for a given tree, there are many possible key-value pairs + that can + + generate a given hash (by interpretting the preimage differently). + + We need this for proper security, requires client knows a priori + what + + tree format server uses. But not in code, rather a configuration + object. + title: Proof specifications used in verifying counterparty state + upgrade_path: + type: array + items: + type: string + title: >- + Path at which next upgraded client will be committed. + + Each element corresponds to the key for a single CommitmentProof in + the + + chained proof. NOTE: ClientState must stored under + + `{upgradePath}/{upgradeHeight}/clientState` ConsensusState must be + stored + + under `{upgradepath}/{upgradeHeight}/consensusState` For SDK chains + using + + the default upgrade module, upgrade_path should be []string{"upgrade", + + "upgradedIBCState"}` + allow_update_after_expiry: + type: boolean + title: allow_update_after_expiry is deprecated + allow_update_after_misbehaviour: + type: boolean + title: allow_update_after_misbehaviour is deprecated + description: >- + ClientState from Tendermint tracks the current validator set, latest + height, + + and a possible frozen height. + ibc.lightclients.tendermint.v1.ConsensusState: + type: object + properties: + timestamp: + type: string + format: date-time + description: >- + timestamp that corresponds to the block height in which the + ConsensusState + + was stored. + root: + title: commitment root (i.e app hash) + type: object + properties: + hash: + type: string + format: byte + description: |- + MerkleRoot defines a merkle root hash. + In the Cosmos SDK, the AppHash of a block header becomes the root. + next_validators_hash: + type: string + format: byte + description: ConsensusState defines the consensus state from Tendermint. + ibc.lightclients.tendermint.v1.Fraction: + type: object + properties: + numerator: + type: string + format: uint64 + denominator: + type: string + format: uint64 + description: |- + Fraction defines the protobuf message type for tmmath.Fraction that only + supports positive values. interchain_security.ccv.consumer.v1.GenesisState: type: object properties: @@ -49922,18 +62334,10 @@ definitions: "upgradedIBCState"}` allow_update_after_expiry: type: boolean - title: >- - This flag, when set to true, will allow governance to recover a - client - - which has expired + title: allow_update_after_expiry is deprecated allow_update_after_misbehaviour: type: boolean - title: >- - This flag, when set to true, will allow governance to unfreeze a - client - - whose chain has experienced a misbehaviour event + title: allow_update_after_misbehaviour is deprecated provider_consensus_state: description: ProviderConsensusState filled in on new chain, nil on restart. type: object @@ -49986,9 +62390,7 @@ definitions: secp256k1: type: string format: byte - title: >- - PublicKey defines the keys available for use with Tendermint - Validators + title: PublicKey defines the keys available for use with Validators power: type: string format: int64 @@ -50073,17 +62475,17 @@ definitions: double-signing infraction type: string enum: - - INFRACTION_TYPE_UNSPECIFIED - - INFRACTION_TYPE_DOUBLE_SIGN - - INFRACTION_TYPE_DOWNTIME - default: INFRACTION_TYPE_UNSPECIFIED + - INFRACTION_UNSPECIFIED + - INFRACTION_DOUBLE_SIGN + - INFRACTION_DOWNTIME + default: INFRACTION_UNSPECIFIED description: >- - InfractionType indicates the infraction type a validator + Infraction indicates the infraction a validator commited. - - INFRACTION_TYPE_UNSPECIFIED: UNSPECIFIED defines an empty infraction type. - - INFRACTION_TYPE_DOUBLE_SIGN: DOUBLE_SIGN defines a validator that double-signs a block. - - INFRACTION_TYPE_DOWNTIME: DOWNTIME defines a validator that missed signing too many blocks. + - INFRACTION_UNSPECIFIED: UNSPECIFIED defines an empty infraction. + - INFRACTION_DOUBLE_SIGN: DOUBLE_SIGN defines a validator that double-signs a block. + - INFRACTION_DOWNTIME: DOWNTIME defines a validator that missed signing too many blocks. description: >- This packet is sent from the consumer chain to the provider chain @@ -51165,18 +63567,10 @@ definitions: "upgradedIBCState"}` allow_update_after_expiry: type: boolean - title: >- - This flag, when set to true, will allow governance to recover - a client - - which has expired + title: allow_update_after_expiry is deprecated allow_update_after_misbehaviour: type: boolean - title: >- - This flag, when set to true, will allow governance to unfreeze - a client - - whose chain has experienced a misbehaviour event + title: allow_update_after_misbehaviour is deprecated provider_consensus_state: description: ProviderConsensusState filled in on new chain, nil on restart. type: object @@ -51233,9 +63627,7 @@ definitions: secp256k1: type: string format: byte - title: >- - PublicKey defines the keys available for use with Tendermint - Validators + title: PublicKey defines the keys available for use with Validators power: type: string format: int64 @@ -51320,17 +63712,17 @@ definitions: double-signing infraction type: string enum: - - INFRACTION_TYPE_UNSPECIFIED - - INFRACTION_TYPE_DOUBLE_SIGN - - INFRACTION_TYPE_DOWNTIME - default: INFRACTION_TYPE_UNSPECIFIED + - INFRACTION_UNSPECIFIED + - INFRACTION_DOUBLE_SIGN + - INFRACTION_DOWNTIME + default: INFRACTION_UNSPECIFIED description: >- - InfractionType indicates the infraction type a - validator commited. + Infraction indicates the infraction a validator + commited. - - INFRACTION_TYPE_UNSPECIFIED: UNSPECIFIED defines an empty infraction type. - - INFRACTION_TYPE_DOUBLE_SIGN: DOUBLE_SIGN defines a validator that double-signs a block. - - INFRACTION_TYPE_DOWNTIME: DOWNTIME defines a validator that missed signing too many blocks. + - INFRACTION_UNSPECIFIED: UNSPECIFIED defines an empty infraction. + - INFRACTION_DOUBLE_SIGN: DOUBLE_SIGN defines a validator that double-signs a block. + - INFRACTION_DOWNTIME: DOWNTIME defines a validator that missed signing too many blocks. description: >- This packet is sent from the consumer chain to the provider chain @@ -51466,17 +63858,16 @@ definitions: infraction type: string enum: - - INFRACTION_TYPE_UNSPECIFIED - - INFRACTION_TYPE_DOUBLE_SIGN - - INFRACTION_TYPE_DOWNTIME - default: INFRACTION_TYPE_UNSPECIFIED - description: >- - InfractionType indicates the infraction type a validator - commited. + - INFRACTION_UNSPECIFIED + - INFRACTION_DOUBLE_SIGN + - INFRACTION_DOWNTIME + default: INFRACTION_UNSPECIFIED + description: |- + Infraction indicates the infraction a validator commited. - - INFRACTION_TYPE_UNSPECIFIED: UNSPECIFIED defines an empty infraction type. - - INFRACTION_TYPE_DOUBLE_SIGN: DOUBLE_SIGN defines a validator that double-signs a block. - - INFRACTION_TYPE_DOWNTIME: DOWNTIME defines a validator that missed signing too many blocks. + - INFRACTION_UNSPECIFIED: UNSPECIFIED defines an empty infraction. + - INFRACTION_DOUBLE_SIGN: DOUBLE_SIGN defines a validator that double-signs a block. + - INFRACTION_DOWNTIME: DOWNTIME defines a validator that missed signing too many blocks. description: >- This packet is sent from the consumer chain to the provider chain @@ -51528,17 +63919,16 @@ definitions: infraction type: string enum: - - INFRACTION_TYPE_UNSPECIFIED - - INFRACTION_TYPE_DOUBLE_SIGN - - INFRACTION_TYPE_DOWNTIME - default: INFRACTION_TYPE_UNSPECIFIED - description: >- - InfractionType indicates the infraction type a validator - commited. + - INFRACTION_UNSPECIFIED + - INFRACTION_DOUBLE_SIGN + - INFRACTION_DOWNTIME + default: INFRACTION_UNSPECIFIED + description: |- + Infraction indicates the infraction a validator commited. - - INFRACTION_TYPE_UNSPECIFIED: UNSPECIFIED defines an empty infraction type. - - INFRACTION_TYPE_DOUBLE_SIGN: DOUBLE_SIGN defines a validator that double-signs a block. - - INFRACTION_TYPE_DOWNTIME: DOWNTIME defines a validator that missed signing too many blocks. + - INFRACTION_UNSPECIFIED: UNSPECIFIED defines an empty infraction. + - INFRACTION_DOUBLE_SIGN: DOUBLE_SIGN defines a validator that double-signs a block. + - INFRACTION_DOWNTIME: DOWNTIME defines a validator that missed signing too many blocks. description: >- This packet is sent from the consumer chain to the provider chain @@ -51604,16 +63994,16 @@ definitions: infraction type: string enum: - - INFRACTION_TYPE_UNSPECIFIED - - INFRACTION_TYPE_DOUBLE_SIGN - - INFRACTION_TYPE_DOWNTIME - default: INFRACTION_TYPE_UNSPECIFIED + - INFRACTION_UNSPECIFIED + - INFRACTION_DOUBLE_SIGN + - INFRACTION_DOWNTIME + default: INFRACTION_UNSPECIFIED description: |- - InfractionType indicates the infraction type a validator commited. + Infraction indicates the infraction a validator commited. - - INFRACTION_TYPE_UNSPECIFIED: UNSPECIFIED defines an empty infraction type. - - INFRACTION_TYPE_DOUBLE_SIGN: DOUBLE_SIGN defines a validator that double-signs a block. - - INFRACTION_TYPE_DOWNTIME: DOWNTIME defines a validator that missed signing too many blocks. + - INFRACTION_UNSPECIFIED: UNSPECIFIED defines an empty infraction. + - INFRACTION_DOUBLE_SIGN: DOUBLE_SIGN defines a validator that double-signs a block. + - INFRACTION_DOWNTIME: DOWNTIME defines a validator that missed signing too many blocks. description: |- This packet is sent from the consumer chain to the provider chain to request the slashing of a validator as a result of an infraction @@ -51700,16 +64090,16 @@ definitions: infraction type: string enum: - - INFRACTION_TYPE_UNSPECIFIED - - INFRACTION_TYPE_DOUBLE_SIGN - - INFRACTION_TYPE_DOWNTIME - default: INFRACTION_TYPE_UNSPECIFIED + - INFRACTION_UNSPECIFIED + - INFRACTION_DOUBLE_SIGN + - INFRACTION_DOWNTIME + default: INFRACTION_UNSPECIFIED description: |- - InfractionType indicates the infraction type a validator commited. + Infraction indicates the infraction a validator commited. - - INFRACTION_TYPE_UNSPECIFIED: UNSPECIFIED defines an empty infraction type. - - INFRACTION_TYPE_DOUBLE_SIGN: DOUBLE_SIGN defines a validator that double-signs a block. - - INFRACTION_TYPE_DOWNTIME: DOWNTIME defines a validator that missed signing too many blocks. + - INFRACTION_UNSPECIFIED: UNSPECIFIED defines an empty infraction. + - INFRACTION_DOUBLE_SIGN: DOUBLE_SIGN defines a validator that double-signs a block. + - INFRACTION_DOWNTIME: DOWNTIME defines a validator that missed signing too many blocks. description: |- This packet is sent from the consumer chain to the provider chain to request the slashing of a validator as a result of an infraction @@ -51760,16 +64150,16 @@ definitions: infraction type: string enum: - - INFRACTION_TYPE_UNSPECIFIED - - INFRACTION_TYPE_DOUBLE_SIGN - - INFRACTION_TYPE_DOWNTIME - default: INFRACTION_TYPE_UNSPECIFIED + - INFRACTION_UNSPECIFIED + - INFRACTION_DOUBLE_SIGN + - INFRACTION_DOWNTIME + default: INFRACTION_UNSPECIFIED description: |- - InfractionType indicates the infraction type a validator commited. + Infraction indicates the infraction a validator commited. - - INFRACTION_TYPE_UNSPECIFIED: UNSPECIFIED defines an empty infraction type. - - INFRACTION_TYPE_DOUBLE_SIGN: DOUBLE_SIGN defines a validator that double-signs a block. - - INFRACTION_TYPE_DOWNTIME: DOWNTIME defines a validator that missed signing too many blocks. + - INFRACTION_UNSPECIFIED: UNSPECIFIED defines an empty infraction. + - INFRACTION_DOUBLE_SIGN: DOUBLE_SIGN defines a validator that double-signs a block. + - INFRACTION_DOWNTIME: DOWNTIME defines a validator that missed signing too many blocks. description: |- This packet is sent from the consumer chain to the provider chain to request the slashing of a validator as a result of an infraction @@ -51833,17 +64223,16 @@ definitions: infraction type: string enum: - - INFRACTION_TYPE_UNSPECIFIED - - INFRACTION_TYPE_DOUBLE_SIGN - - INFRACTION_TYPE_DOWNTIME - default: INFRACTION_TYPE_UNSPECIFIED - description: >- - InfractionType indicates the infraction type a validator - commited. + - INFRACTION_UNSPECIFIED + - INFRACTION_DOUBLE_SIGN + - INFRACTION_DOWNTIME + default: INFRACTION_UNSPECIFIED + description: |- + Infraction indicates the infraction a validator commited. - - INFRACTION_TYPE_UNSPECIFIED: UNSPECIFIED defines an empty infraction type. - - INFRACTION_TYPE_DOUBLE_SIGN: DOUBLE_SIGN defines a validator that double-signs a block. - - INFRACTION_TYPE_DOWNTIME: DOWNTIME defines a validator that missed signing too many blocks. + - INFRACTION_UNSPECIFIED: UNSPECIFIED defines an empty infraction. + - INFRACTION_DOUBLE_SIGN: DOUBLE_SIGN defines a validator that double-signs a block. + - INFRACTION_DOWNTIME: DOWNTIME defines a validator that missed signing too many blocks. description: >- This packet is sent from the consumer chain to the provider chain @@ -51904,16 +64293,16 @@ definitions: title: tell if the slashing is for a downtime or a double-signing infraction type: string enum: - - INFRACTION_TYPE_UNSPECIFIED - - INFRACTION_TYPE_DOUBLE_SIGN - - INFRACTION_TYPE_DOWNTIME - default: INFRACTION_TYPE_UNSPECIFIED + - INFRACTION_UNSPECIFIED + - INFRACTION_DOUBLE_SIGN + - INFRACTION_DOWNTIME + default: INFRACTION_UNSPECIFIED description: |- - InfractionType indicates the infraction type a validator commited. + Infraction indicates the infraction a validator commited. - - INFRACTION_TYPE_UNSPECIFIED: UNSPECIFIED defines an empty infraction type. - - INFRACTION_TYPE_DOUBLE_SIGN: DOUBLE_SIGN defines a validator that double-signs a block. - - INFRACTION_TYPE_DOWNTIME: DOWNTIME defines a validator that missed signing too many blocks. + - INFRACTION_UNSPECIFIED: UNSPECIFIED defines an empty infraction. + - INFRACTION_DOUBLE_SIGN: DOUBLE_SIGN defines a validator that double-signs a block. + - INFRACTION_DOWNTIME: DOWNTIME defines a validator that missed signing too many blocks. description: |- This packet is sent from the consumer chain to the provider chain to request the slashing of a validator as a result of an infraction @@ -51953,9 +64342,7 @@ definitions: secp256k1: type: string format: byte - title: >- - PublicKey defines the keys available for use with Tendermint - Validators + title: PublicKey defines the keys available for use with Validators power: type: string format: int64 @@ -52022,9 +64409,10 @@ definitions: next_key: type: string format: byte - title: |- + description: |- next_key is the key to be passed to PageRequest.key to - query the next page most efficiently + query the next page most efficiently. It will be empty if + there are no more results. total: type: string format: uint64 @@ -52148,9 +64536,10 @@ definitions: next_key: type: string format: byte - title: |- + description: |- next_key is the key to be passed to PageRequest.key to - query the next page most efficiently + query the next page most efficiently. It will be empty if + there are no more results. total: type: string format: uint64 @@ -52970,10 +65359,8 @@ definitions: properties: key: type: string - format: byte value: type: string - format: byte index: type: boolean title: nondeterministic @@ -53262,9 +65649,10 @@ definitions: next_key: type: string format: byte - title: |- + description: |- next_key is the key to be passed to PageRequest.key to - query the next page most efficiently + query the next page most efficiently. It will be empty if + there are no more results. total: type: string format: uint64 @@ -53812,10 +66200,8 @@ definitions: properties: key: type: string - format: byte value: type: string - format: byte index: type: boolean title: nondeterministic @@ -54316,10 +66702,8 @@ definitions: properties: key: type: string - format: byte value: type: string - format: byte index: type: boolean title: nondeterministic @@ -54554,10 +66938,8 @@ definitions: properties: key: type: string - format: byte value: type: string - format: byte index: type: boolean title: nondeterministic @@ -54658,10 +67040,8 @@ definitions: properties: key: type: string - format: byte value: type: string - format: byte index: type: boolean title: nondeterministic @@ -54879,9 +67259,10 @@ definitions: next_key: type: string format: byte - title: |- + description: |- next_key is the key to be passed to PageRequest.key to - query the next page most efficiently + query the next page most efficiently. It will be empty if + there are no more results. total: type: string format: uint64 @@ -54971,8 +67352,14 @@ definitions: NOTE: The amount field is an Int which implements the custom method signatures required by gogoproto. + title: >- + DenomCreationFee is the fee required to create a new denom using the + tokenfactory module fee_collector_address: type: string + title: >- + FeeCollectorAddress is the address where fees collected from denom + creation are sent to title: Params holds parameters for the tokenfactory module osmosis.tokenfactory.v1beta1.QueryDenomAuthorityMetadataResponse: type: object @@ -55022,8 +67409,14 @@ definitions: method signatures required by gogoproto. + title: >- + DenomCreationFee is the fee required to create a new denom using + the tokenfactory module fee_collector_address: type: string + title: >- + FeeCollectorAddress is the address where fees collected from denom + creation are sent to title: Params holds parameters for the tokenfactory module description: QueryParamsResponse is the response type for the Query/Params RPC method. router.v1.Params: diff --git a/go.mod b/go.mod index 985f6c415..86b4cc516 100644 --- a/go.mod +++ b/go.mod @@ -3,162 +3,193 @@ module github.com/neutron-org/neutron go 1.20 require ( - github.com/CosmWasm/wasmd v0.31.0 - github.com/CosmWasm/wasmvm v1.2.3 + cosmossdk.io/core v0.5.1 + github.com/CosmWasm/wasmd v0.40.0 + github.com/CosmWasm/wasmvm v1.2.4 github.com/armon/go-metrics v0.4.1 - github.com/confio/ics23/go v0.9.0 - github.com/cosmos/admin-module v0.0.0-00010101000000-000000000000 - github.com/cosmos/cosmos-proto v1.0.0-beta.3 - github.com/cosmos/cosmos-sdk v0.45.15 - github.com/cosmos/ibc-go/v4 v4.3.0 - github.com/cosmos/interchain-security v1.0.1-0.20230419165046-6089b6121c33 + github.com/cometbft/cometbft v0.37.2 + github.com/cometbft/cometbft-db v0.8.0 + github.com/cosmos/admin-module v0.0.0-20220204080909-475a98e03f31 + github.com/cosmos/cosmos-proto v1.0.0-beta.2 + github.com/cosmos/cosmos-sdk v0.47.3 + github.com/cosmos/gogoproto v1.4.10 + github.com/cosmos/ibc-go/v7 v7.1.0 + github.com/cosmos/ics23/go v0.10.0 + github.com/cosmos/interchain-security/v3 v3.0.0-rc2 github.com/gogo/protobuf v1.3.3 github.com/golang/mock v1.6.0 github.com/golang/protobuf v1.5.3 github.com/gorilla/mux v1.8.0 github.com/grpc-ecosystem/grpc-gateway v1.16.0 + github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 github.com/pkg/errors v0.9.1 - github.com/prometheus/client_golang v1.14.0 - github.com/spf13/cast v1.5.0 + github.com/prometheus/client_golang v1.15.1 + github.com/rakyll/statik v0.1.7 + github.com/spf13/cast v1.5.1 github.com/spf13/cobra v1.7.0 - github.com/strangelove-ventures/packet-forward-middleware/v4 v4.0.5 - github.com/stretchr/testify v1.8.2 - github.com/tendermint/tendermint v0.34.27 - github.com/tendermint/tm-db v0.6.7 - google.golang.org/genproto v0.0.0-20230223222841-637eb2293923 - google.golang.org/grpc v1.53.0 + github.com/strangelove-ventures/packet-forward-middleware/v7 v7.0.0-20230523193151-73dea436e53f + github.com/stretchr/testify v1.8.4 + google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc + google.golang.org/grpc v1.55.0 gopkg.in/yaml.v2 v2.4.0 ) require ( - cosmossdk.io/api v0.2.6 // indirect - cosmossdk.io/core v0.5.1 // indirect + cloud.google.com/go v0.110.0 // indirect + cloud.google.com/go/compute v1.19.0 // indirect + cloud.google.com/go/compute/metadata v0.2.3 // indirect + cloud.google.com/go/iam v0.13.0 // indirect + cloud.google.com/go/storage v1.29.0 // indirect + cosmossdk.io/api v0.3.1 // indirect cosmossdk.io/depinject v1.0.0-alpha.3 // indirect - filippo.io/edwards25519 v1.0.0-rc.1 // indirect + cosmossdk.io/errors v1.0.0-beta.7 // indirect + cosmossdk.io/log v1.1.0 // indirect + cosmossdk.io/math v1.0.1 // indirect + cosmossdk.io/tools/rosetta v0.2.1 // indirect + filippo.io/edwards25519 v1.0.0 // indirect github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect - github.com/99designs/keyring v1.2.1 // indirect - github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d // indirect - github.com/DataDog/zstd v1.5.0 // indirect - github.com/HdrHistogram/hdrhistogram-go v1.1.2 // indirect - github.com/Workiva/go-datastructures v1.0.53 // indirect + github.com/99designs/keyring v1.2.2 // indirect + github.com/ChainSafe/go-schnorrkel v1.0.0 // indirect + github.com/aws/aws-sdk-go v1.44.203 // indirect github.com/beorn7/perks v1.0.1 // indirect + github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 // indirect github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect github.com/cenkalti/backoff/v4 v4.1.3 // indirect github.com/cespare/xxhash v1.1.0 // indirect - github.com/cespare/xxhash/v2 v2.1.2 // indirect - github.com/cockroachdb/errors v1.9.1 // indirect - github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect - github.com/cockroachdb/pebble v0.0.0-20220817183557-09c6e030a677 // indirect - github.com/cockroachdb/redact v1.1.3 // indirect + github.com/cespare/xxhash/v2 v2.2.0 // indirect + github.com/chzyer/readline v1.5.1 // indirect + github.com/cockroachdb/apd/v2 v2.0.2 // indirect github.com/coinbase/rosetta-sdk-go v0.7.9 // indirect - github.com/cometbft/cometbft-db v0.7.0 // indirect - github.com/cosmos/btcutil v1.0.4 // indirect - github.com/cosmos/cosmos-db v0.0.0-20221226095112-f3c38ecb5e32 // indirect + github.com/confio/ics23/go v0.9.0 // indirect + github.com/cosmos/btcutil v1.0.5 // indirect github.com/cosmos/go-bip39 v1.0.0 // indirect - github.com/cosmos/gogoproto v1.4.6 // indirect - github.com/cosmos/gorocksdb v1.2.0 // indirect - github.com/cosmos/iavl v0.19.5 // indirect - github.com/cosmos/ledger-cosmos-go v0.12.2 // indirect - github.com/creachadair/taskgroup v0.3.2 // indirect - github.com/danieljoos/wincred v1.1.2 // indirect + github.com/cosmos/gogogateway v1.2.0 // indirect + github.com/cosmos/iavl v0.20.0 // indirect + github.com/cosmos/ledger-cosmos-go v0.13.0 // indirect + github.com/cosmos/rosetta-sdk-go v0.10.0 // indirect + github.com/creachadair/taskgroup v0.4.2 // indirect + github.com/danieljoos/wincred v1.2.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 // indirect + github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect github.com/dgraph-io/badger/v2 v2.2007.4 // indirect - github.com/dgraph-io/ristretto v0.1.0 // indirect + github.com/dgraph-io/ristretto v0.1.1 // indirect github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect - github.com/docker/distribution v2.8.1+incompatible // indirect - github.com/dustin/go-humanize v1.0.0 // indirect + github.com/docker/distribution v2.8.2+incompatible // indirect + github.com/dustin/go-humanize v1.0.1 // indirect github.com/dvsekhvalnov/jose2go v1.5.0 // indirect github.com/felixge/httpsnoop v1.0.2 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect - github.com/getsentry/sentry-go v0.17.0 // indirect + github.com/ghodss/yaml v1.0.0 // indirect github.com/go-kit/kit v0.12.0 // indirect github.com/go-kit/log v0.2.1 // indirect - github.com/go-logfmt/logfmt v0.5.1 // indirect + github.com/go-logfmt/logfmt v0.6.0 // indirect + github.com/go-playground/locales v0.14.0 // indirect github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect - github.com/gogo/gateway v1.1.0 // indirect - github.com/golang/glog v1.0.0 // indirect + github.com/gogo/googleapis v1.4.1 // indirect + github.com/golang/glog v1.1.1 // indirect + github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/btree v1.1.2 // indirect github.com/google/go-cmp v0.5.9 // indirect github.com/google/gofuzz v1.2.0 // indirect github.com/google/orderedcode v0.0.1 // indirect + github.com/google/s2a-go v0.1.3 // indirect + github.com/google/uuid v1.3.0 // indirect + github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect + github.com/googleapis/gax-go/v2 v2.8.0 // indirect github.com/gorilla/handlers v1.5.1 // indirect github.com/gorilla/websocket v1.5.0 // indirect - github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect + github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect github.com/gtank/merlin v0.1.1 // indirect github.com/gtank/ristretto255 v0.1.2 // indirect + github.com/hashicorp/go-cleanhttp v0.5.2 // indirect + github.com/hashicorp/go-getter v1.7.1 // indirect github.com/hashicorp/go-immutable-radix v1.3.1 // indirect + github.com/hashicorp/go-safetemp v1.0.0 // indirect + github.com/hashicorp/go-version v1.6.0 // indirect github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d // indirect github.com/hashicorp/hcl v1.0.0 // indirect - github.com/hdevalence/ed25519consensus v0.0.0-20220222234857-c00d1f31bab3 // indirect + github.com/hdevalence/ed25519consensus v0.1.0 // indirect + github.com/huandu/skiplist v1.2.0 // indirect github.com/iancoleman/orderedmap v0.2.0 // indirect github.com/improbable-eng/grpc-web v0.15.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect + github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/jmhodges/levigo v1.0.0 // indirect - github.com/klauspost/compress v1.15.11 // indirect - github.com/kr/pretty v0.3.1 // indirect - github.com/kr/text v0.2.0 // indirect - github.com/lib/pq v1.10.6 // indirect + github.com/klauspost/compress v1.16.5 // indirect + github.com/lib/pq v1.10.7 // indirect github.com/libp2p/go-buffer-pool v0.1.0 // indirect - github.com/linxGnu/grocksdb v1.7.10 // indirect - github.com/magiconair/properties v1.8.6 // indirect + github.com/linxGnu/grocksdb v1.8.0 // indirect + github.com/magiconair/properties v1.8.7 // indirect + github.com/manifoldco/promptui v0.9.0 // indirect github.com/mattn/go-colorable v0.1.13 // indirect - github.com/mattn/go-isatty v0.0.16 // indirect - github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect - github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 // indirect + github.com/mattn/go-isatty v0.0.19 // indirect + github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect + github.com/mimoo/StrobeGo v0.0.0-20220103164710-9a04d6ca976b // indirect github.com/minio/highwayhash v1.0.2 // indirect + github.com/mitchellh/go-homedir v1.1.0 // indirect + github.com/mitchellh/go-testing-interface v1.14.1 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/mtibben/percent v0.2.1 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/oxyno-zeta/gomock-extra-matcher v1.1.0 // indirect - github.com/pelletier/go-toml v1.9.5 // indirect - github.com/pelletier/go-toml/v2 v2.0.5 // indirect - github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect + github.com/pelletier/go-toml/v2 v2.0.8 // indirect + github.com/petermattis/goid v0.0.0-20230518223814-80aa455d8761 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/prometheus/client_model v0.3.0 // indirect - github.com/prometheus/common v0.37.0 // indirect - github.com/prometheus/procfs v0.8.0 // indirect - github.com/rakyll/statik v0.1.7 // indirect + github.com/prometheus/client_model v0.4.0 // indirect + github.com/prometheus/common v0.44.0 // indirect + github.com/prometheus/procfs v0.10.1 // indirect github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect - github.com/regen-network/cosmos-proto v0.3.1 // indirect - github.com/rogpeppe/go-internal v1.9.0 // indirect - github.com/rs/cors v1.8.2 // indirect - github.com/rs/zerolog v1.27.0 // indirect + github.com/rs/cors v1.8.3 // indirect + github.com/rs/zerolog v1.29.1 // indirect github.com/sasha-s/go-deadlock v0.3.1 // indirect - github.com/spf13/afero v1.9.2 // indirect + github.com/spf13/afero v1.9.5 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/spf13/viper v1.14.0 // indirect - github.com/subosito/gotenv v1.4.1 // indirect - github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect - github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c // indirect + github.com/spf13/viper v1.16.0 // indirect + github.com/subosito/gotenv v1.4.2 // indirect + github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect github.com/tendermint/go-amino v0.16.0 // indirect - github.com/tidwall/btree v1.5.0 // indirect + github.com/tidwall/btree v1.6.0 // indirect + github.com/ulikunitz/xz v0.5.11 // indirect github.com/zondax/hid v0.9.1 // indirect github.com/zondax/ledger-go v0.14.1 // indirect - go.etcd.io/bbolt v1.3.6 // indirect - golang.org/x/crypto v0.5.0 // indirect - golang.org/x/exp v0.0.0-20230307190834-24139beb5833 // indirect - golang.org/x/net v0.8.0 // indirect - golang.org/x/sys v0.6.0 // indirect - golang.org/x/term v0.6.0 // indirect - golang.org/x/text v0.8.0 // indirect + go.etcd.io/bbolt v1.3.7 // indirect + go.opencensus.io v0.24.0 // indirect + golang.org/x/crypto v0.10.0 // indirect + golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 // indirect + golang.org/x/net v0.11.0 // indirect + golang.org/x/oauth2 v0.8.0 // indirect + golang.org/x/sys v0.9.0 // indirect + golang.org/x/term v0.9.0 // indirect + golang.org/x/text v0.10.0 // indirect + golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect + google.golang.org/api v0.122.0 // indirect + google.golang.org/appengine v1.6.7 // indirect + google.golang.org/genproto v0.0.0-20230530153820-e85fd2cbaebc // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect google.golang.org/protobuf v1.30.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect nhooyr.io/websocket v1.8.7 // indirect + pgregory.net/rapid v0.6.2 // indirect + sigs.k8s.io/yaml v1.3.0 // indirect ) replace ( - github.com/CosmWasm/wasmd v0.31.0 => github.com/neutron-org/wasmd v0.31.1-neutron-fixes.0.20230426103416-67da724a1eaf - github.com/btcsuite/btcd => github.com/btcsuite/btcd v0.22.2 - github.com/cosmos/admin-module => github.com/Ethernal-Tech/admin-module v0.0.0-20221102105340-e693f4d379c3 - github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.45.15-ics + github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0 + github.com/ChainSafe/go-schnorrkel => github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d + github.com/CosmWasm/wasmd => github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230628195106-7f39abd759a1 + github.com/cosmos/admin-module => github.com/neutron-org/admin-module v0.0.0-20230629154156-54b91a541f7f + //github.com/cosmos/cosmos-sdk => ../cosmos-sdk + //github.com/cosmos/interchain-security => github.com/cosmos/interchain-security v1.0.1-0.20230612141232-8cd0ca920812 + // google.golang.org/grpc => google.golang.org/grpc v1.33.2 + github.com/cosmos/ledger-cosmos-go => github.com/cosmos/ledger-cosmos-go v0.12.1 + // github.com/CosmWasm/wasmd v0.31.0 => github.com/neutron-org/wasmd v0.31.1-neutron-fixes.0.20230426103416-67da724a1eaf + //github.com/cosmos/admin-module => github.com/Ethernal-Tech/admin-module v0.0.0-20221102105340-e693f4d379c3 github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 - github.com/tendermint/tendermint => github.com/skip-mev/mev-cometbft v0.34.27-mev.17 - google.golang.org/grpc => google.golang.org/grpc v1.33.2 + github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 ) diff --git a/go.sum b/go.sum index 2567e9a25..4b35dacd3 100644 --- a/go.sum +++ b/go.sum @@ -1,14 +1,8 @@ +4d63.com/gochecknoglobals v0.1.0 h1:zeZSRqj5yCg28tCkIV/z/lWbwvNm5qnKVS15PI8nhD0= 4d63.com/gochecknoglobals v0.1.0/go.mod h1:wfdC5ZjKSPr7CybKEcgJhUOgeAQW1+7WcyK8OvUilfo= -bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod h1:Xbm+BRKSBEpa4q4hTSxohYNQpsxXPbPry4JJWOB3LB8= -bazil.org/fuse v0.0.0-20180421153158-65cc252bf669/go.mod h1:Xbm+BRKSBEpa4q4hTSxohYNQpsxXPbPry4JJWOB3LB8= -bazil.org/fuse v0.0.0-20200407214033-5883e5a4b512/go.mod h1:FbcW6z/2VytnFDhZfumh8Ss8zxHE6qpMP5sHTRe0EaM= -bitbucket.org/creachadair/shell v0.0.6/go.mod h1:8Qqi/cYk7vPnsOePHroKXDJYmb5x7ENhtiFtfZq8K+M= -cloud.google.com/go v0.25.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.31.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.37.2/go.mod h1:H8IAquKe2L30IxoupDgqTaQvKSwF/c8prYHynGIWQbA= cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= -cloud.google.com/go v0.39.0/go.mod h1:rVLT6fkc8chs9sfPtFc1SBH6em7n+ZoXaG+87tDISts= cloud.google.com/go v0.43.0/go.mod h1:BOSR3VbTLkk6FDC/TcffxP4NF/FFBGA5ku+jvKOP7pg= cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= @@ -22,7 +16,6 @@ cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6 cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk= cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= -cloud.google.com/go v0.60.0/go.mod h1:yw2G51M9IfRboUH61Us8GqCeF1PzPblB823Mn2q2eAU= cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= @@ -38,55 +31,61 @@ cloud.google.com/go v0.90.0/go.mod h1:kRX0mNRHe0e2rC6oNakvwQqzyDmg57xJ+SZU1eT2aD cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+YI= cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW4= cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc= -cloud.google.com/go v0.98.0/go.mod h1:ua6Ush4NALrHk5QXDWnjvZHN93OuF0HfuEPq9I1X0cM= cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA= -cloud.google.com/go v0.100.1/go.mod h1:fs4QogzfH5n2pBXBP9vRiU+eCny7lD2vmFZy79Iuw1U= cloud.google.com/go v0.100.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w99A= cloud.google.com/go v0.102.0/go.mod h1:oWcCzKlqJ5zgHQt9YsaeTY9KzIvjyy0ArmiBUgpQ+nc= cloud.google.com/go v0.102.1/go.mod h1:XZ77E9qnTEnrgEOvr4xzfdX5TRo7fB4T2F4O6+34hIU= cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA= -cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM= -cloud.google.com/go/accessapproval v1.4.0/go.mod h1:zybIuC3KpDOvotz59lFe5qxRZx6C75OtwbisN56xYB4= -cloud.google.com/go/accessapproval v1.5.0/go.mod h1:HFy3tuiGvMdcd/u+Cu5b9NkO1pEICJ46IR82PoUdplw= -cloud.google.com/go/accesscontextmanager v1.3.0/go.mod h1:TgCBehyr5gNMz7ZaH9xubp+CE8dkrszb4oK9CWyvD4o= -cloud.google.com/go/accesscontextmanager v1.4.0/go.mod h1:/Kjh7BBu/Gh83sv+K60vN9QE5NJcd80sU33vIe2IFPE= +cloud.google.com/go v0.110.0 h1:Zc8gqp3+a9/Eyph2KDmcGaPtbKRIoqq4YTlL4NMD0Ys= +cloud.google.com/go v0.110.0/go.mod h1:SJnCLqQ0FCFGSZMUNUf84MV3Aia54kn7pi8st7tMzaY= +cloud.google.com/go/accessapproval v1.6.0 h1:x0cEHro/JFPd7eS4BlEWNTMecIj2HdXjOVB5BtvwER0= +cloud.google.com/go/accessapproval v1.6.0/go.mod h1:R0EiYnwV5fsRFiKZkPHr6mwyk2wxUJ30nL4j2pcFY2E= +cloud.google.com/go/accesscontextmanager v1.7.0 h1:MG60JgnEoawHJrbWw0jGdv6HLNSf6gQvYRiXpuzqgEA= +cloud.google.com/go/accesscontextmanager v1.7.0/go.mod h1:CEGLewx8dwa33aDAZQujl7Dx+uYhS0eay198wB/VumQ= cloud.google.com/go/aiplatform v1.22.0/go.mod h1:ig5Nct50bZlzV6NvKaTwmplLLddFx0YReh9WfTO5jKw= cloud.google.com/go/aiplatform v1.24.0/go.mod h1:67UUvRBKG6GTayHKV8DBv2RtR1t93YRu5B1P3x99mYY= -cloud.google.com/go/aiplatform v1.27.0/go.mod h1:Bvxqtl40l0WImSb04d0hXFU7gDOiq9jQmorivIiWcKg= +cloud.google.com/go/aiplatform v1.37.0 h1:zTw+suCVchgZyO+k847wjzdVjWmrAuehxdvcZvJwfGg= +cloud.google.com/go/aiplatform v1.37.0/go.mod h1:IU2Cv29Lv9oCn/9LkFiiuKfwrRTq+QQMbW+hPCxJGZw= cloud.google.com/go/analytics v0.11.0/go.mod h1:DjEWCu41bVbYcKyvlws9Er60YE4a//bK6mnhWvQeFNI= cloud.google.com/go/analytics v0.12.0/go.mod h1:gkfj9h6XRf9+TS4bmuhPEShsh3hH8PAZzm/41OOhQd4= -cloud.google.com/go/apigateway v1.3.0/go.mod h1:89Z8Bhpmxu6AmUxuVRg/ECRGReEdiP3vQtk4Z1J9rJk= -cloud.google.com/go/apigateway v1.4.0/go.mod h1:pHVY9MKGaH9PQ3pJ4YLzoj6U5FUDeDFBllIz7WmzJoc= -cloud.google.com/go/apigeeconnect v1.3.0/go.mod h1:G/AwXFAKo0gIXkPTVfZDd2qA1TxBXJ3MgMRBQkIi9jc= -cloud.google.com/go/apigeeconnect v1.4.0/go.mod h1:kV4NwOKqjvt2JYR0AoIWo2QGfoRtn/pkS3QlHp0Ni04= -cloud.google.com/go/appengine v1.4.0/go.mod h1:CS2NhuBuDXM9f+qscZ6V86m1MIIqPj3WC/UoEuR1Sno= -cloud.google.com/go/appengine v1.5.0/go.mod h1:TfasSozdkFI0zeoxW3PTBLiNqRmzraodCWatWI9Dmak= +cloud.google.com/go/analytics v0.19.0 h1:LqAo3tAh2FU9+w/r7vc3hBjU23Kv7GhO/PDIW7kIYgM= +cloud.google.com/go/analytics v0.19.0/go.mod h1:k8liqf5/HCnOUkbawNtrWWc+UAzyDlW89doe8TtoDsE= +cloud.google.com/go/apigateway v1.5.0 h1:ZI9mVO7x3E9RK/BURm2p1aw9YTBSCQe3klmyP1WxWEg= +cloud.google.com/go/apigateway v1.5.0/go.mod h1:GpnZR3Q4rR7LVu5951qfXPJCHquZt02jf7xQx7kpqN8= +cloud.google.com/go/apigeeconnect v1.5.0 h1:sWOmgDyAsi1AZ48XRHcATC0tsi9SkPT7DA/+VCfkaeA= +cloud.google.com/go/apigeeconnect v1.5.0/go.mod h1:KFaCqvBRU6idyhSNyn3vlHXc8VMDJdRmwDF6JyFRqZ8= +cloud.google.com/go/apigeeregistry v0.6.0 h1:E43RdhhCxdlV+I161gUY2rI4eOaMzHTA5kNkvRsFXvc= +cloud.google.com/go/apigeeregistry v0.6.0/go.mod h1:BFNzW7yQVLZ3yj0TKcwzb8n25CFBri51GVGOEUcgQsc= +cloud.google.com/go/appengine v1.7.1 h1:aBGDKmRIaRRoWJ2tAoN0oVSHoWLhtO9aj/NvUyP4aYs= +cloud.google.com/go/appengine v1.7.1/go.mod h1:IHLToyb/3fKutRysUlFO0BPt5j7RiQ45nrzEJmKTo6E= cloud.google.com/go/area120 v0.5.0/go.mod h1:DE/n4mp+iqVyvxHN41Vf1CR602GiHQjFPusMFW6bGR4= cloud.google.com/go/area120 v0.6.0/go.mod h1:39yFJqWVgm0UZqWTOdqkLhjoC7uFfgXRC8g/ZegeAh0= +cloud.google.com/go/area120 v0.7.1 h1:ugckkFh4XkHJMPhTIx0CyvdoBxmOpMe8rNs4Ok8GAag= +cloud.google.com/go/area120 v0.7.1/go.mod h1:j84i4E1RboTWjKtZVWXPqvK5VHQFJRF2c1Nm69pWm9k= cloud.google.com/go/artifactregistry v1.6.0/go.mod h1:IYt0oBPSAGYj/kprzsBjZ/4LnG/zOcHyFHjWPCi6SAQ= cloud.google.com/go/artifactregistry v1.7.0/go.mod h1:mqTOFOnGZx8EtSqK/ZWcsm/4U8B77rbcLP6ruDU2Ixk= -cloud.google.com/go/artifactregistry v1.8.0/go.mod h1:w3GQXkJX8hiKN0v+at4b0qotwijQbYUqF2GWkZzAhC0= -cloud.google.com/go/artifactregistry v1.9.0/go.mod h1:2K2RqvA2CYvAeARHRkLDhMDJ3OXy26h3XW+3/Jh2uYc= +cloud.google.com/go/artifactregistry v1.13.0 h1:o1Q80vqEB6Qp8WLEH3b8FBLNUCrGQ4k5RFj0sn/sgO8= +cloud.google.com/go/artifactregistry v1.13.0/go.mod h1:uy/LNfoOIivepGhooAUpL1i30Hgee3Cu0l4VTWHUC08= cloud.google.com/go/asset v1.5.0/go.mod h1:5mfs8UvcM5wHhqtSv8J1CtxxaQq3AdBxxQi2jGW/K4o= cloud.google.com/go/asset v1.7.0/go.mod h1:YbENsRK4+xTiL+Ofoj5Ckf+O17kJtgp3Y3nn4uzZz5s= cloud.google.com/go/asset v1.8.0/go.mod h1:mUNGKhiqIdbr8X7KNayoYvyc4HbbFO9URsjbytpUaW0= -cloud.google.com/go/asset v1.9.0/go.mod h1:83MOE6jEJBMqFKadM9NLRcs80Gdw76qGuHn8m3h8oHQ= -cloud.google.com/go/asset v1.10.0/go.mod h1:pLz7uokL80qKhzKr4xXGvBQXnzHn5evJAEAtZiIb0wY= +cloud.google.com/go/asset v1.13.0 h1:YAsssO08BqZ6mncbb6FPlj9h6ACS7bJQUOlzciSfbNk= +cloud.google.com/go/asset v1.13.0/go.mod h1:WQAMyYek/b7NBpYq/K4KJWcRqzoalEsxz/t/dTk4THw= cloud.google.com/go/assuredworkloads v1.5.0/go.mod h1:n8HOZ6pff6re5KYfBXcFvSViQjDwxFkAkmUFffJRbbY= cloud.google.com/go/assuredworkloads v1.6.0/go.mod h1:yo2YOk37Yc89Rsd5QMVECvjaMKymF9OP+QXWlKXUkXw= cloud.google.com/go/assuredworkloads v1.7.0/go.mod h1:z/736/oNmtGAyU47reJgGN+KVoYoxeLBoj4XkKYscNI= -cloud.google.com/go/assuredworkloads v1.8.0/go.mod h1:AsX2cqyNCOvEQC8RMPnoc0yEarXQk6WEKkxYfL6kGIo= -cloud.google.com/go/assuredworkloads v1.9.0/go.mod h1:kFuI1P78bplYtT77Tb1hi0FMxM0vVpRC7VVoJC3ZoT0= +cloud.google.com/go/assuredworkloads v1.10.0 h1:VLGnVFta+N4WM+ASHbhc14ZOItOabDLH1MSoDv+Xuag= +cloud.google.com/go/assuredworkloads v1.10.0/go.mod h1:kwdUQuXcedVdsIaKgKTp9t0UJkE5+PAVNhdQm4ZVq2E= cloud.google.com/go/automl v1.5.0/go.mod h1:34EjfoFGMZ5sgJ9EoLsRtdPSNZLcfflJR39VbVNS2M0= cloud.google.com/go/automl v1.6.0/go.mod h1:ugf8a6Fx+zP0D59WLhqgTDsQI9w07o64uf/Is3Nh5p8= -cloud.google.com/go/automl v1.7.0/go.mod h1:RL9MYCCsJEOmt0Wf3z9uzG0a7adTT1fe+aObgSpkCt8= -cloud.google.com/go/automl v1.8.0/go.mod h1:xWx7G/aPEe/NP+qzYXktoBSDfjO+vnKMGgsApGJJquM= -cloud.google.com/go/baremetalsolution v0.3.0/go.mod h1:XOrocE+pvK1xFfleEnShBlNAXf+j5blPPxrhjKgnIFc= -cloud.google.com/go/baremetalsolution v0.4.0/go.mod h1:BymplhAadOO/eBa7KewQ0Ppg4A4Wplbn+PsFKRLo0uI= -cloud.google.com/go/batch v0.3.0/go.mod h1:TR18ZoAekj1GuirsUsR1ZTKN3FC/4UDnScjT8NXImFE= -cloud.google.com/go/batch v0.4.0/go.mod h1:WZkHnP43R/QCGQsZ+0JyG4i79ranE2u8xvjq/9+STPE= -cloud.google.com/go/beyondcorp v0.2.0/go.mod h1:TB7Bd+EEtcw9PCPQhCJtJGjk/7TC6ckmnSFS+xwTfm4= -cloud.google.com/go/beyondcorp v0.3.0/go.mod h1:E5U5lcrcXMsCuoDNyGrpyTm/hn7ne941Jz2vmksAxW8= +cloud.google.com/go/automl v1.12.0 h1:50VugllC+U4IGl3tDNcZaWvApHBTrn/TvyHDJ0wM+Uw= +cloud.google.com/go/automl v1.12.0/go.mod h1:tWDcHDp86aMIuHmyvjuKeeHEGq76lD7ZqfGLN6B0NuU= +cloud.google.com/go/baremetalsolution v0.5.0 h1:2AipdYXL0VxMboelTTw8c1UJ7gYu35LZYUbuRv9Q28s= +cloud.google.com/go/baremetalsolution v0.5.0/go.mod h1:dXGxEkmR9BMwxhzBhV0AioD0ULBmuLZI8CdwalUxuss= +cloud.google.com/go/batch v0.7.0 h1:YbMt0E6BtqeD5FvSv1d56jbVsWEzlGm55lYte+M6Mzs= +cloud.google.com/go/batch v0.7.0/go.mod h1:vLZN95s6teRUqRQ4s3RLDsH8PvboqBK+rn1oevL159g= +cloud.google.com/go/beyondcorp v0.5.0 h1:UkY2BTZkEUAVrgqnSdOJ4p3y9ZRBPEe1LkjgC8Bj/Pc= +cloud.google.com/go/beyondcorp v0.5.0/go.mod h1:uFqj9X+dSfrheVp7ssLTaRHd2EHqSL4QZmH4e8WXGGU= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= @@ -94,29 +93,30 @@ cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUM cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= cloud.google.com/go/bigquery v1.42.0/go.mod h1:8dRTJxhtG+vwBKzE5OseQn/hiydoQN3EedCaOdYmxRA= -cloud.google.com/go/bigquery v1.43.0/go.mod h1:ZMQcXHsl+xmU1z36G2jNGZmKp9zNY5BUua5wDgmNCfw= -cloud.google.com/go/bigquery v1.44.0/go.mod h1:0Y33VqXTEsbamHJvJHdFmtqHvMIY28aK1+dFsvaChGc= +cloud.google.com/go/bigquery v1.50.0 h1:RscMV6LbnAmhAzD893Lv9nXXy2WCaJmbxYPWDLbGqNQ= +cloud.google.com/go/bigquery v1.50.0/go.mod h1:YrleYEh2pSEbgTBZYMJ5SuSr0ML3ypjRB1zgf7pvQLU= +cloud.google.com/go/bigtable v1.2.0 h1:F4cCmA4nuV84V5zYQ3MKY+M1Cw1avHDuf3S/LcZPA9c= cloud.google.com/go/bigtable v1.2.0/go.mod h1:JcVAOl45lrTmQfLj7T6TxyMzIN/3FGGcFm+2xVAli2o= cloud.google.com/go/billing v1.4.0/go.mod h1:g9IdKBEFlItS8bTtlrZdVLWSSdSyFUZKXNS02zKMOZY= cloud.google.com/go/billing v1.5.0/go.mod h1:mztb1tBc3QekhjSgmpf/CV4LzWXLzCArwpLmP2Gm88s= -cloud.google.com/go/billing v1.6.0/go.mod h1:WoXzguj+BeHXPbKfNWkqVtDdzORazmCjraY+vrxcyvI= -cloud.google.com/go/billing v1.7.0/go.mod h1:q457N3Hbj9lYwwRbnlD7vUpyjq6u5U1RAOArInEiD5Y= +cloud.google.com/go/billing v1.13.0 h1:JYj28UYF5w6VBAh0gQYlgHJ/OD1oA+JgW29YZQU+UHM= +cloud.google.com/go/billing v1.13.0/go.mod h1:7kB2W9Xf98hP9Sr12KfECgfGclsH3CQR0R08tnRlRbc= cloud.google.com/go/binaryauthorization v1.1.0/go.mod h1:xwnoWu3Y84jbuHa0zd526MJYmtnVXn0syOjaJgy4+dM= cloud.google.com/go/binaryauthorization v1.2.0/go.mod h1:86WKkJHtRcv5ViNABtYMhhNWRrD1Vpi//uKEy7aYEfI= -cloud.google.com/go/binaryauthorization v1.3.0/go.mod h1:lRZbKgjDIIQvzYQS1p99A7/U1JqvqeZg0wiI5tp6tg0= -cloud.google.com/go/binaryauthorization v1.4.0/go.mod h1:tsSPQrBd77VLplV70GUhBf/Zm3FsKmgSqgm4UmiDItk= -cloud.google.com/go/certificatemanager v1.3.0/go.mod h1:n6twGDvcUBFu9uBgt4eYvvf3sQ6My8jADcOVwHmzadg= -cloud.google.com/go/certificatemanager v1.4.0/go.mod h1:vowpercVFyqs8ABSmrdV+GiFf2H/ch3KyudYQEMM590= -cloud.google.com/go/channel v1.8.0/go.mod h1:W5SwCXDJsq/rg3tn3oG0LOxpAo6IMxNa09ngphpSlnk= -cloud.google.com/go/channel v1.9.0/go.mod h1:jcu05W0my9Vx4mt3/rEHpfxc9eKi9XwsdDL8yBMbKUk= -cloud.google.com/go/cloudbuild v1.3.0/go.mod h1:WequR4ULxlqvMsjDEEEFnOG5ZSRSgWOywXYDb1vPE6U= -cloud.google.com/go/cloudbuild v1.4.0/go.mod h1:5Qwa40LHiOXmz3386FrjrYM93rM/hdRr7b53sySrTqA= -cloud.google.com/go/clouddms v1.3.0/go.mod h1:oK6XsCDdW4Ib3jCCBugx+gVjevp2TMXFtgxvPSee3OM= -cloud.google.com/go/clouddms v1.4.0/go.mod h1:Eh7sUGCC+aKry14O1NRljhjyrr0NFC0G2cjwX0cByRk= +cloud.google.com/go/binaryauthorization v1.5.0 h1:d3pMDBCCNivxt5a4eaV7FwL7cSH0H7RrEnFrTb1QKWs= +cloud.google.com/go/binaryauthorization v1.5.0/go.mod h1:OSe4OU1nN/VswXKRBmciKpo9LulY41gch5c68htf3/Q= +cloud.google.com/go/certificatemanager v1.6.0 h1:5C5UWeSt8Jkgp7OWn2rCkLmYurar/vIWIoSQ2+LaTOc= +cloud.google.com/go/certificatemanager v1.6.0/go.mod h1:3Hh64rCKjRAX8dXgRAyOcY5vQ/fE1sh8o+Mdd6KPgY8= +cloud.google.com/go/channel v1.12.0 h1:GpcQY5UJKeOekYgsX3QXbzzAc/kRGtBq43fTmyKe6Uw= +cloud.google.com/go/channel v1.12.0/go.mod h1:VkxCGKASi4Cq7TbXxlaBezonAYpp1GCnKMY6tnMQnLU= +cloud.google.com/go/cloudbuild v1.9.0 h1:GHQCjV4WlPPVU/j3Rlpc8vNIDwThhd1U9qSY/NPZdko= +cloud.google.com/go/cloudbuild v1.9.0/go.mod h1:qK1d7s4QlO0VwfYn5YuClDGg2hfmLZEb4wQGAbIgL1s= +cloud.google.com/go/clouddms v1.5.0 h1:E7v4TpDGUyEm1C/4KIrpVSOCTm0P6vWdHT0I4mostRA= +cloud.google.com/go/clouddms v1.5.0/go.mod h1:QSxQnhikCLUw13iAbffF2CZxAER3xDGNHjsTAkQJcQA= cloud.google.com/go/cloudtasks v1.5.0/go.mod h1:fD92REy1x5woxkKEkLdvavGnPJGEn8Uic9nWuLzqCpY= cloud.google.com/go/cloudtasks v1.6.0/go.mod h1:C6Io+sxuke9/KNRkbQpihnW93SWDU3uXt92nu85HkYI= -cloud.google.com/go/cloudtasks v1.7.0/go.mod h1:ImsfdYWwlWNJbdgPIIGJWC+gemEGTBK/SunNQQNCAb4= -cloud.google.com/go/cloudtasks v1.8.0/go.mod h1:gQXUIwCSOI4yPVK7DgTVFiiP0ZW/eQkydWzwVMdHxrI= +cloud.google.com/go/cloudtasks v1.10.0 h1:uK5k6abf4yligFgYFnG0ni8msai/dSv6mDmiBulU0hU= +cloud.google.com/go/cloudtasks v1.10.0/go.mod h1:NDSoTLkZ3+vExFEWu2UJV1arUyzVDAiZtdWcsUyNwBs= cloud.google.com/go/compute v0.1.0/go.mod h1:GAesmwr110a34z04OlxYkATPBEfVhkymfTBXtfbBFow= cloud.google.com/go/compute v1.3.0/go.mod h1:cCZiE1NHEtai4wiufUhW8I8S1JKkAnhnQJWM7YD99wM= cloud.google.com/go/compute v1.5.0/go.mod h1:9SMHyhJlzhlkJqrPAc839t2BZFTSk6Jdj6mkzQJeu0M= @@ -124,230 +124,253 @@ cloud.google.com/go/compute v1.6.0/go.mod h1:T29tfhtVbq1wvAPo0E3+7vhgmkOYeXjhFvz cloud.google.com/go/compute v1.6.1/go.mod h1:g85FgpzFvNULZ+S8AYq87axRKuf2Kh7deLqV/jJ3thU= cloud.google.com/go/compute v1.7.0/go.mod h1:435lt8av5oL9P3fv1OEzSbSUe+ybHXGMPQHHZWZxy9U= cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU= -cloud.google.com/go/compute v1.12.0/go.mod h1:e8yNOBcBONZU1vJKCvCoDw/4JQsA0dpM4x/6PIIOocU= -cloud.google.com/go/compute v1.12.1/go.mod h1:e8yNOBcBONZU1vJKCvCoDw/4JQsA0dpM4x/6PIIOocU= -cloud.google.com/go/compute v1.13.0/go.mod h1:5aPTS0cUNMIc1CE546K+Th6weJUNQErARyZtRXDJ8GE= -cloud.google.com/go/compute/metadata v0.1.0/go.mod h1:Z1VN+bulIf6bt4P/C37K4DyZYZEXYonfTBHHFPO/4UU= -cloud.google.com/go/compute/metadata v0.2.1/go.mod h1:jgHgmJd2RKBGzXqF5LR2EZMGxBkeanZ9wwa75XHJgOM= -cloud.google.com/go/contactcenterinsights v1.3.0/go.mod h1:Eu2oemoePuEFc/xKFPjbTuPSj0fYJcPls9TFlPNnHHY= -cloud.google.com/go/contactcenterinsights v1.4.0/go.mod h1:L2YzkGbPsv+vMQMCADxJoT9YiTTnSEd6fEvCeHTYVck= -cloud.google.com/go/container v1.6.0/go.mod h1:Xazp7GjJSeUYo688S+6J5V+n/t+G5sKBTFkKNudGRxg= -cloud.google.com/go/container v1.7.0/go.mod h1:Dp5AHtmothHGX3DwwIHPgq45Y8KmNsgN3amoYfxVkLo= +cloud.google.com/go/compute v1.19.0 h1:+9zda3WGgW1ZSTlVppLCYFIr48Pa35q1uG2N1itbCEQ= +cloud.google.com/go/compute v1.19.0/go.mod h1:rikpw2y+UMidAe9tISo04EHNOIf42RLYF/q8Bs93scU= +cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= +cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= +cloud.google.com/go/contactcenterinsights v1.6.0 h1:jXIpfcH/VYSE1SYcPzO0n1VVb+sAamiLOgCw45JbOQk= +cloud.google.com/go/contactcenterinsights v1.6.0/go.mod h1:IIDlT6CLcDoyv79kDv8iWxMSTZhLxSCofVV5W6YFM/w= +cloud.google.com/go/container v1.15.0 h1:NKlY/wCDapfVZlbVVaeuu2UZZED5Dy1z4Zx1KhEzm8c= +cloud.google.com/go/container v1.15.0/go.mod h1:ft+9S0WGjAyjDggg5S06DXj+fHJICWg8L7isCQe9pQA= cloud.google.com/go/containeranalysis v0.5.1/go.mod h1:1D92jd8gRR/c0fGMlymRgxWD3Qw9C1ff6/T7mLgVL8I= cloud.google.com/go/containeranalysis v0.6.0/go.mod h1:HEJoiEIu+lEXM+k7+qLCci0h33lX3ZqoYFdmPcoO7s4= +cloud.google.com/go/containeranalysis v0.9.0 h1:EQ4FFxNaEAg8PqQCO7bVQfWz9NVwZCUKaM1b3ycfx3U= +cloud.google.com/go/containeranalysis v0.9.0/go.mod h1:orbOANbwk5Ejoom+s+DUCTTJ7IBdBQJDcSylAx/on9s= cloud.google.com/go/datacatalog v1.3.0/go.mod h1:g9svFY6tuR+j+hrTw3J2dNcmI0dzmSiyOzm8kpLq0a0= cloud.google.com/go/datacatalog v1.5.0/go.mod h1:M7GPLNQeLfWqeIm3iuiruhPzkt65+Bx8dAKvScX8jvs= cloud.google.com/go/datacatalog v1.6.0/go.mod h1:+aEyF8JKg+uXcIdAmmaMUmZ3q1b/lKLtXCmXdnc0lbc= -cloud.google.com/go/datacatalog v1.7.0/go.mod h1:9mEl4AuDYWw81UGc41HonIHH7/sn52H0/tc8f8ZbZIE= -cloud.google.com/go/datacatalog v1.8.0/go.mod h1:KYuoVOv9BM8EYz/4eMFxrr4DUKhGIOXxZoKYF5wdISM= +cloud.google.com/go/datacatalog v1.13.0 h1:4H5IJiyUE0X6ShQBqgFFZvGGcrwGVndTwUSLP4c52gw= +cloud.google.com/go/datacatalog v1.13.0/go.mod h1:E4Rj9a5ZtAxcQJlEBTLgMTphfP11/lNaAshpoBgemX8= cloud.google.com/go/dataflow v0.6.0/go.mod h1:9QwV89cGoxjjSR9/r7eFDqqjtvbKxAK2BaYU6PVk9UM= cloud.google.com/go/dataflow v0.7.0/go.mod h1:PX526vb4ijFMesO1o202EaUmouZKBpjHsTlCtB4parQ= +cloud.google.com/go/dataflow v0.8.0 h1:eYyD9o/8Nm6EttsKZaEGD84xC17bNgSKCu0ZxwqUbpg= +cloud.google.com/go/dataflow v0.8.0/go.mod h1:Rcf5YgTKPtQyYz8bLYhFoIV/vP39eL7fWNcSOyFfLJE= cloud.google.com/go/dataform v0.3.0/go.mod h1:cj8uNliRlHpa6L3yVhDOBrUXH+BPAO1+KFMQQNSThKo= cloud.google.com/go/dataform v0.4.0/go.mod h1:fwV6Y4Ty2yIFL89huYlEkwUPtS7YZinZbzzj5S9FzCE= -cloud.google.com/go/dataform v0.5.0/go.mod h1:GFUYRe8IBa2hcomWplodVmUx/iTL0FrsauObOM3Ipr0= -cloud.google.com/go/datafusion v1.4.0/go.mod h1:1Zb6VN+W6ALo85cXnM1IKiPw+yQMKMhB9TsTSRDo/38= -cloud.google.com/go/datafusion v1.5.0/go.mod h1:Kz+l1FGHB0J+4XF2fud96WMmRiq/wj8N9u007vyXZ2w= +cloud.google.com/go/dataform v0.7.0 h1:Dyk+fufup1FR6cbHjFpMuP4SfPiF3LI3JtoIIALoq48= +cloud.google.com/go/dataform v0.7.0/go.mod h1:7NulqnVozfHvWUBpMDfKMUESr+85aJsC/2O0o3jWPDE= +cloud.google.com/go/datafusion v1.6.0 h1:sZjRnS3TWkGsu1LjYPFD/fHeMLZNXDK6PDHi2s2s/bk= +cloud.google.com/go/datafusion v1.6.0/go.mod h1:WBsMF8F1RhSXvVM8rCV3AeyWVxcC2xY6vith3iw3S+8= cloud.google.com/go/datalabeling v0.5.0/go.mod h1:TGcJ0G2NzcsXSE/97yWjIZO0bXj0KbVlINXMG9ud42I= cloud.google.com/go/datalabeling v0.6.0/go.mod h1:WqdISuk/+WIGeMkpw/1q7bK/tFEZxsrFJOJdY2bXvTQ= -cloud.google.com/go/dataplex v1.3.0/go.mod h1:hQuRtDg+fCiFgC8j0zV222HvzFQdRd+SVX8gdmFcZzA= -cloud.google.com/go/dataplex v1.4.0/go.mod h1:X51GfLXEMVJ6UN47ESVqvlsRplbLhcsAt0kZCCKsU0A= -cloud.google.com/go/dataproc v1.7.0/go.mod h1:CKAlMjII9H90RXaMpSxQ8EU6dQx6iAYNPcYPOkSbi8s= -cloud.google.com/go/dataproc v1.8.0/go.mod h1:5OW+zNAH0pMpw14JVrPONsxMQYMBqJuzORhIBfBn9uI= +cloud.google.com/go/datalabeling v0.7.0 h1:ch4qA2yvddGRUrlfwrNJCr79qLqhS9QBwofPHfFlDIk= +cloud.google.com/go/datalabeling v0.7.0/go.mod h1:WPQb1y08RJbmpM3ww0CSUAGweL0SxByuW2E+FU+wXcM= +cloud.google.com/go/dataplex v1.6.0 h1:RvoZ5T7gySwm1CHzAw7yY1QwwqaGswunmqEssPxU/AM= +cloud.google.com/go/dataplex v1.6.0/go.mod h1:bMsomC/aEJOSpHXdFKFGQ1b0TDPIeL28nJObeO1ppRs= +cloud.google.com/go/dataproc v1.12.0 h1:W47qHL3W4BPkAIbk4SWmIERwsWBaNnWm0P2sdx3YgGU= +cloud.google.com/go/dataproc v1.12.0/go.mod h1:zrF3aX0uV3ikkMz6z4uBbIKyhRITnxvr4i3IjKsKrw4= cloud.google.com/go/dataqna v0.5.0/go.mod h1:90Hyk596ft3zUQ8NkFfvICSIfHFh1Bc7C4cK3vbhkeo= cloud.google.com/go/dataqna v0.6.0/go.mod h1:1lqNpM7rqNLVgWBJyk5NF6Uen2PHym0jtVJonplVsDA= +cloud.google.com/go/dataqna v0.7.0 h1:yFzi/YU4YAdjyo7pXkBE2FeHbgz5OQQBVDdbErEHmVQ= +cloud.google.com/go/dataqna v0.7.0/go.mod h1:Lx9OcIIeqCrw1a6KdO3/5KMP1wAmTc0slZWwP12Qq3c= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= -cloud.google.com/go/datastore v1.10.0/go.mod h1:PC5UzAmDEkAmkfaknstTYbNpgE49HAgW2J1gcgUfmdM= +cloud.google.com/go/datastore v1.11.0 h1:iF6I/HaLs3Ado8uRKMvZRvF/ZLkWaWE9i8AiHzbC774= +cloud.google.com/go/datastore v1.11.0/go.mod h1:TvGxBIHCS50u8jzG+AW/ppf87v1of8nwzFNgEZU1D3c= cloud.google.com/go/datastream v1.2.0/go.mod h1:i/uTP8/fZwgATHS/XFu0TcNUhuA0twZxxQ3EyCUQMwo= cloud.google.com/go/datastream v1.3.0/go.mod h1:cqlOX8xlyYF/uxhiKn6Hbv6WjwPPuI9W2M9SAXwaLLQ= -cloud.google.com/go/datastream v1.4.0/go.mod h1:h9dpzScPhDTs5noEMQVWP8Wx8AFBRyS0s8KWPx/9r0g= -cloud.google.com/go/datastream v1.5.0/go.mod h1:6TZMMNPwjUqZHBKPQ1wwXpb0d5VDVPl2/XoS5yi88q4= -cloud.google.com/go/deploy v1.4.0/go.mod h1:5Xghikd4VrmMLNaF6FiRFDlHb59VM59YoDQnOUdsH/c= -cloud.google.com/go/deploy v1.5.0/go.mod h1:ffgdD0B89tToyW/U/D2eL0jN2+IEV/3EMuXHA0l4r+s= +cloud.google.com/go/datastream v1.7.0 h1:BBCBTnWMDwwEzQQmipUXxATa7Cm7CA/gKjKcR2w35T0= +cloud.google.com/go/datastream v1.7.0/go.mod h1:uxVRMm2elUSPuh65IbZpzJNMbuzkcvu5CjMqVIUHrww= +cloud.google.com/go/deploy v1.8.0 h1:otshdKEbmsi1ELYeCKNYppwV0UH5xD05drSdBm7ouTk= +cloud.google.com/go/deploy v1.8.0/go.mod h1:z3myEJnA/2wnB4sgjqdMfgxCA0EqC3RBTNcVPs93mtQ= cloud.google.com/go/dialogflow v1.15.0/go.mod h1:HbHDWs33WOGJgn6rfzBW1Kv807BE3O1+xGbn59zZWI4= cloud.google.com/go/dialogflow v1.16.1/go.mod h1:po6LlzGfK+smoSmTBnbkIZY2w8ffjz/RcGSS+sh1el0= cloud.google.com/go/dialogflow v1.17.0/go.mod h1:YNP09C/kXA1aZdBgC/VtXX74G/TKn7XVCcVumTflA+8= -cloud.google.com/go/dialogflow v1.18.0/go.mod h1:trO7Zu5YdyEuR+BhSNOqJezyFQ3aUzz0njv7sMx/iek= -cloud.google.com/go/dialogflow v1.19.0/go.mod h1:JVmlG1TwykZDtxtTXujec4tQ+D8SBFMoosgy+6Gn0s0= -cloud.google.com/go/dlp v1.6.0/go.mod h1:9eyB2xIhpU0sVwUixfBubDoRwP+GjeUoxxeueZmqvmM= -cloud.google.com/go/dlp v1.7.0/go.mod h1:68ak9vCiMBjbasxeVD17hVPxDEck+ExiHavX8kiHG+Q= +cloud.google.com/go/dialogflow v1.32.0 h1:uVlKKzp6G/VtSW0E7IH1Y5o0H48/UOCmqksG2riYCwQ= +cloud.google.com/go/dialogflow v1.32.0/go.mod h1:jG9TRJl8CKrDhMEcvfcfFkkpp8ZhgPz3sBGmAUYJ2qE= +cloud.google.com/go/dlp v1.9.0 h1:1JoJqezlgu6NWCroBxr4rOZnwNFILXr4cB9dMaSKO4A= +cloud.google.com/go/dlp v1.9.0/go.mod h1:qdgmqgTyReTz5/YNSSuueR8pl7hO0o9bQ39ZhtgkWp4= cloud.google.com/go/documentai v1.7.0/go.mod h1:lJvftZB5NRiFSX4moiye1SMxHx0Bc3x1+p9e/RfXYiU= cloud.google.com/go/documentai v1.8.0/go.mod h1:xGHNEB7CtsnySCNrCFdCyyMz44RhFEEX2Q7UD0c5IhU= -cloud.google.com/go/documentai v1.9.0/go.mod h1:FS5485S8R00U10GhgBC0aNGrJxBP8ZVpEeJ7PQDZd6k= -cloud.google.com/go/documentai v1.10.0/go.mod h1:vod47hKQIPeCfN2QS/jULIvQTugbmdc0ZvxxfQY1bg4= +cloud.google.com/go/documentai v1.18.0 h1:KM3Xh0QQyyEdC8Gs2vhZfU+rt6OCPF0dwVwxKgLmWfI= +cloud.google.com/go/documentai v1.18.0/go.mod h1:F6CK6iUH8J81FehpskRmhLq/3VlwQvb7TvwOceQ2tbs= cloud.google.com/go/domains v0.6.0/go.mod h1:T9Rz3GasrpYk6mEGHh4rymIhjlnIuB4ofT1wTxDeT4Y= cloud.google.com/go/domains v0.7.0/go.mod h1:PtZeqS1xjnXuRPKE/88Iru/LdfoRyEHYA9nFQf4UKpg= +cloud.google.com/go/domains v0.8.0 h1:2ti/o9tlWL4N+wIuWUNH+LbfgpwxPr8J1sv9RHA4bYQ= +cloud.google.com/go/domains v0.8.0/go.mod h1:M9i3MMDzGFXsydri9/vW+EWz9sWb4I6WyHqdlAk0idE= cloud.google.com/go/edgecontainer v0.1.0/go.mod h1:WgkZ9tp10bFxqO8BLPqv2LlfmQF1X8lZqwW4r1BTajk= cloud.google.com/go/edgecontainer v0.2.0/go.mod h1:RTmLijy+lGpQ7BXuTDa4C4ssxyXT34NIuHIgKuP4s5w= +cloud.google.com/go/edgecontainer v1.0.0 h1:O0YVE5v+O0Q/ODXYsQHmHb+sYM8KNjGZw2pjX2Ws41c= +cloud.google.com/go/edgecontainer v1.0.0/go.mod h1:cttArqZpBB2q58W/upSG++ooo6EsblxDIolxa3jSjbY= +cloud.google.com/go/errorreporting v0.3.0 h1:kj1XEWMu8P0qlLhm3FwcaFsUvXChV/OraZwA70trRR0= cloud.google.com/go/errorreporting v0.3.0/go.mod h1:xsP2yaAp+OAW4OIm60An2bbLpqIhKXdWR/tawvl7QzU= -cloud.google.com/go/essentialcontacts v1.3.0/go.mod h1:r+OnHa5jfj90qIfZDO/VztSFqbQan7HV75p8sA+mdGI= -cloud.google.com/go/essentialcontacts v1.4.0/go.mod h1:8tRldvHYsmnBCHdFpvU+GL75oWiBKl80BiqlFh9tp+8= -cloud.google.com/go/eventarc v1.7.0/go.mod h1:6ctpF3zTnaQCxUjHUdcfgcA1A2T309+omHZth7gDfmc= -cloud.google.com/go/eventarc v1.8.0/go.mod h1:imbzxkyAU4ubfsaKYdQg04WS1NvncblHEup4kvF+4gw= -cloud.google.com/go/filestore v1.3.0/go.mod h1:+qbvHGvXU1HaKX2nD0WEPo92TP/8AQuCVEBXNY9z0+w= -cloud.google.com/go/filestore v1.4.0/go.mod h1:PaG5oDfo9r224f8OYXURtAsY+Fbyq/bLYoINEK8XQAI= -cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= -cloud.google.com/go/firestore v1.6.1/go.mod h1:asNXNOzBdyVQmEU+ggO8UPodTkEVFW5Qx+rwHnAz+EY= -cloud.google.com/go/firestore v1.8.0/go.mod h1:r3KB8cAdRIe8znzoPWLw8S6gpDVd9treohhn8b09424= +cloud.google.com/go/essentialcontacts v1.5.0 h1:gIzEhCoOT7bi+6QZqZIzX1Erj4SswMPIteNvYVlu+pM= +cloud.google.com/go/essentialcontacts v1.5.0/go.mod h1:ay29Z4zODTuwliK7SnX8E86aUF2CTzdNtvv42niCX0M= +cloud.google.com/go/eventarc v1.11.0 h1:fsJmNeqvqtk74FsaVDU6cH79lyZNCYP8Rrv7EhaB/PU= +cloud.google.com/go/eventarc v1.11.0/go.mod h1:PyUjsUKPWoRBCHeOxZd/lbOOjahV41icXyUY5kSTvVY= +cloud.google.com/go/filestore v1.6.0 h1:ckTEXN5towyTMu4q0uQ1Mde/JwTHur0gXs8oaIZnKfw= +cloud.google.com/go/filestore v1.6.0/go.mod h1:di5unNuss/qfZTw2U9nhFqo8/ZDSc466dre85Kydllg= +cloud.google.com/go/firestore v1.9.0 h1:IBlRyxgGySXu5VuW0RgGFlTtLukSnNkpDiEOMkQkmpA= cloud.google.com/go/firestore v1.9.0/go.mod h1:HMkjKHNTtRyZNiMzu7YAsLr9K3X2udY2AMwDaMEQiiE= cloud.google.com/go/functions v1.6.0/go.mod h1:3H1UA3qiIPRWD7PeZKLvHZ9SaQhR26XIJcC0A5GbvAk= cloud.google.com/go/functions v1.7.0/go.mod h1:+d+QBcWM+RsrgZfV9xo6KfA1GlzJfxcfZcRPEhDDfzg= -cloud.google.com/go/functions v1.8.0/go.mod h1:RTZ4/HsQjIqIYP9a9YPbU+QFoQsAlYgrwOXJWHn1POY= -cloud.google.com/go/functions v1.9.0/go.mod h1:Y+Dz8yGguzO3PpIjhLTbnqV1CWmgQ5UwtlpzoyquQ08= +cloud.google.com/go/functions v1.13.0 h1:pPDqtsXG2g9HeOQLoquLbmvmb82Y4Ezdo1GXuotFoWg= +cloud.google.com/go/functions v1.13.0/go.mod h1:EU4O007sQm6Ef/PwRsI8N2umygGqPBS/IZQKBQBcJ3c= cloud.google.com/go/gaming v1.5.0/go.mod h1:ol7rGcxP/qHTRQE/RO4bxkXq+Fix0j6D4LFPzYTIrDM= cloud.google.com/go/gaming v1.6.0/go.mod h1:YMU1GEvA39Qt3zWGyAVA9bpYz/yAhTvaQ1t2sK4KPUA= -cloud.google.com/go/gaming v1.7.0/go.mod h1:LrB8U7MHdGgFG851iHAfqUdLcKBdQ55hzXy9xBJz0+w= -cloud.google.com/go/gaming v1.8.0/go.mod h1:xAqjS8b7jAVW0KFYeRUxngo9My3f33kFmua++Pi+ggM= -cloud.google.com/go/gkebackup v0.2.0/go.mod h1:XKvv/4LfG829/B8B7xRkk8zRrOEbKtEam6yNfuQNH60= -cloud.google.com/go/gkebackup v0.3.0/go.mod h1:n/E671i1aOQvUxT541aTkCwExO/bTer2HDlj4TsBRAo= +cloud.google.com/go/gaming v1.9.0 h1:7vEhFnZmd931Mo7sZ6pJy7uQPDxF7m7v8xtBheG08tc= +cloud.google.com/go/gaming v1.9.0/go.mod h1:Fc7kEmCObylSWLO334NcO+O9QMDyz+TKC4v1D7X+Bc0= +cloud.google.com/go/gkebackup v0.4.0 h1:za3QZvw6ujR0uyqkhomKKKNoXDyqYGPJies3voUK8DA= +cloud.google.com/go/gkebackup v0.4.0/go.mod h1:byAyBGUwYGEEww7xsbnUTBHIYcOPy/PgUWUtOeRm9Vg= cloud.google.com/go/gkeconnect v0.5.0/go.mod h1:c5lsNAg5EwAy7fkqX/+goqFsU1Da/jQFqArp+wGNr/o= cloud.google.com/go/gkeconnect v0.6.0/go.mod h1:Mln67KyU/sHJEBY8kFZ0xTeyPtzbq9StAVvEULYK16A= +cloud.google.com/go/gkeconnect v0.7.0 h1:gXYKciHS/Lgq0GJ5Kc9SzPA35NGc3yqu6SkjonpEr2Q= +cloud.google.com/go/gkeconnect v0.7.0/go.mod h1:SNfmVqPkaEi3bF/B3CNZOAYPYdg7sU+obZ+QTky2Myw= cloud.google.com/go/gkehub v0.9.0/go.mod h1:WYHN6WG8w9bXU0hqNxt8rm5uxnk8IH+lPY9J2TV7BK0= cloud.google.com/go/gkehub v0.10.0/go.mod h1:UIPwxI0DsrpsVoWpLB0stwKCP+WFVG9+y977wO+hBH0= -cloud.google.com/go/gkemulticloud v0.3.0/go.mod h1:7orzy7O0S+5kq95e4Hpn7RysVA7dPs8W/GgfUtsPbrA= -cloud.google.com/go/gkemulticloud v0.4.0/go.mod h1:E9gxVBnseLWCk24ch+P9+B2CoDFJZTyIgLKSalC7tuI= +cloud.google.com/go/gkehub v0.12.0 h1:TqCSPsEBQ6oZSJgEYZ3XT8x2gUadbvfwI32YB0kuHCs= +cloud.google.com/go/gkehub v0.12.0/go.mod h1:djiIwwzTTBrF5NaXCGv3mf7klpEMcST17VBTVVDcuaw= +cloud.google.com/go/gkemulticloud v0.5.0 h1:8I84Q4vl02rJRsFiinBxl7WCozfdLlUVBQuSrqr9Wtk= +cloud.google.com/go/gkemulticloud v0.5.0/go.mod h1:W0JDkiyi3Tqh0TJr//y19wyb1yf8llHVto2Htf2Ja3Y= +cloud.google.com/go/grafeas v0.2.0 h1:CYjC+xzdPvbV65gi6Dr4YowKcmLo045pm18L0DhdELM= cloud.google.com/go/grafeas v0.2.0/go.mod h1:KhxgtF2hb0P191HlY5besjYm6MqTSTj3LSI+M+ByZHc= -cloud.google.com/go/gsuiteaddons v1.3.0/go.mod h1:EUNK/J1lZEZO8yPtykKxLXI6JSVN2rg9bN8SXOa0bgM= -cloud.google.com/go/gsuiteaddons v1.4.0/go.mod h1:rZK5I8hht7u7HxFQcFei0+AtfS9uSushomRlg+3ua1o= -cloud.google.com/go/iam v0.1.0/go.mod h1:vcUNEa0pEm0qRVpmWepWaFMIAI8/hjB9mO8rNCJtF6c= +cloud.google.com/go/gsuiteaddons v1.5.0 h1:1mvhXqJzV0Vg5Fa95QwckljODJJfDFXV4pn+iL50zzA= +cloud.google.com/go/gsuiteaddons v1.5.0/go.mod h1:TFCClYLd64Eaa12sFVmUyG62tk4mdIsI7pAnSXRkcFo= cloud.google.com/go/iam v0.3.0/go.mod h1:XzJPvDayI+9zsASAFO68Hk07u3z+f+JrT2xXNdp4bnY= cloud.google.com/go/iam v0.5.0/go.mod h1:wPU9Vt0P4UmCux7mqtRu6jcpPAb74cP1fh50J3QpkUc= -cloud.google.com/go/iam v0.6.0/go.mod h1:+1AH33ueBne5MzYccyMHtEKqLE4/kJOibtffMHDMFMc= -cloud.google.com/go/iam v0.7.0/go.mod h1:H5Br8wRaDGNc8XP3keLc4unfUUZeyH3Sfl9XpQEYOeg= -cloud.google.com/go/iam v0.8.0/go.mod h1:lga0/y3iH6CX7sYqypWJ33hf7kkfXJag67naqGESjkE= -cloud.google.com/go/iap v1.4.0/go.mod h1:RGFwRJdihTINIe4wZ2iCP0zF/qu18ZwyKxrhMhygBEc= -cloud.google.com/go/iap v1.5.0/go.mod h1:UH/CGgKd4KyohZL5Pt0jSKE4m3FR51qg6FKQ/z/Ix9A= -cloud.google.com/go/ids v1.1.0/go.mod h1:WIuwCaYVOzHIj2OhN9HAwvW+DBdmUAdcWlFxRl+KubM= -cloud.google.com/go/ids v1.2.0/go.mod h1:5WXvp4n25S0rA/mQWAg1YEEBBq6/s+7ml1RDCW1IrcY= -cloud.google.com/go/iot v1.3.0/go.mod h1:r7RGh2B61+B8oz0AGE+J72AhA0G7tdXItODWsaA2oLs= -cloud.google.com/go/iot v1.4.0/go.mod h1:dIDxPOn0UvNDUMD8Ger7FIaTuvMkj+aGk94RPP0iV+g= -cloud.google.com/go/kms v1.4.0/go.mod h1:fajBHndQ+6ubNw6Ss2sSd+SWvjL26RNo/dr7uxsnnOA= -cloud.google.com/go/kms v1.5.0/go.mod h1:QJS2YY0eJGBg3mnDfuaCyLauWwBJiHRboYxJ++1xJNg= -cloud.google.com/go/kms v1.6.0/go.mod h1:Jjy850yySiasBUDi6KFUwUv2n1+o7QZFyuUJg6OgjA0= +cloud.google.com/go/iam v0.13.0 h1:+CmB+K0J/33d0zSQ9SlFWUeCCEn5XJA0ZMZ3pHE9u8k= +cloud.google.com/go/iam v0.13.0/go.mod h1:ljOg+rcNfzZ5d6f1nAUJ8ZIxOaZUVoS14bKCtaLZ/D0= +cloud.google.com/go/iap v1.7.1 h1:PxVHFuMxmSZyfntKXHXhd8bo82WJ+LcATenq7HLdVnU= +cloud.google.com/go/iap v1.7.1/go.mod h1:WapEwPc7ZxGt2jFGB/C/bm+hP0Y6NXzOYGjpPnmMS74= +cloud.google.com/go/ids v1.3.0 h1:fodnCDtOXuMmS8LTC2y3h8t24U8F3eKWfhi+3LY6Qf0= +cloud.google.com/go/ids v1.3.0/go.mod h1:JBdTYwANikFKaDP6LtW5JAi4gubs57SVNQjemdt6xV4= +cloud.google.com/go/iot v1.6.0 h1:39W5BFSarRNZfVG0eXI5LYux+OVQT8GkgpHCnrZL2vM= +cloud.google.com/go/iot v1.6.0/go.mod h1:IqdAsmE2cTYYNO1Fvjfzo9po179rAtJeVGUvkLN3rLE= +cloud.google.com/go/kms v1.10.1 h1:7hm1bRqGCA1GBRQUrp831TwJ9TWhP+tvLuP497CQS2g= +cloud.google.com/go/kms v1.10.1/go.mod h1:rIWk/TryCkR59GMC3YtHtXeLzd634lBbKenvyySAyYI= cloud.google.com/go/language v1.4.0/go.mod h1:F9dRpNFQmJbkaop6g0JhSBXCNlO90e1KWx5iDdxbWic= cloud.google.com/go/language v1.6.0/go.mod h1:6dJ8t3B+lUYfStgls25GusK04NLh3eDLQnWM3mdEbhI= -cloud.google.com/go/language v1.7.0/go.mod h1:DJ6dYN/W+SQOjF8e1hLQXMF21AkH2w9wiPzPCJa2MIE= -cloud.google.com/go/language v1.8.0/go.mod h1:qYPVHf7SPoNNiCL2Dr0FfEFNil1qi3pQEyygwpgVKB8= +cloud.google.com/go/language v1.9.0 h1:7Ulo2mDk9huBoBi8zCE3ONOoBrL6UXfAI71CLQ9GEIM= +cloud.google.com/go/language v1.9.0/go.mod h1:Ns15WooPM5Ad/5no/0n81yUetis74g3zrbeJBE+ptUY= cloud.google.com/go/lifesciences v0.5.0/go.mod h1:3oIKy8ycWGPUyZDR/8RNnTOYevhaMLqh5vLUXs9zvT8= cloud.google.com/go/lifesciences v0.6.0/go.mod h1:ddj6tSX/7BOnhxCSd3ZcETvtNr8NZ6t/iPhY2Tyfu08= -cloud.google.com/go/logging v1.6.1/go.mod h1:5ZO0mHHbvm8gEmeEUHrmDlTDSu5imF6MUP9OfilNXBw= -cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE= -cloud.google.com/go/longrunning v0.3.0/go.mod h1:qth9Y41RRSUE69rDcOn6DdK3HfQfsUI0YSmW3iIlLJc= -cloud.google.com/go/managedidentities v1.3.0/go.mod h1:UzlW3cBOiPrzucO5qWkNkh0w33KFtBJU281hacNvsdE= -cloud.google.com/go/managedidentities v1.4.0/go.mod h1:NWSBYbEMgqmbZsLIyKvxrYbtqOsxY1ZrGM+9RgDqInM= -cloud.google.com/go/maps v0.1.0/go.mod h1:BQM97WGyfw9FWEmQMpZ5T6cpovXXSd1cGmFma94eubI= +cloud.google.com/go/lifesciences v0.8.0 h1:uWrMjWTsGjLZpCTWEAzYvyXj+7fhiZST45u9AgasasI= +cloud.google.com/go/lifesciences v0.8.0/go.mod h1:lFxiEOMqII6XggGbOnKiyZ7IBwoIqA84ClvoezaA/bo= +cloud.google.com/go/logging v1.7.0 h1:CJYxlNNNNAMkHp9em/YEXcfJg+rPDg7YfwoRpMU+t5I= +cloud.google.com/go/logging v1.7.0/go.mod h1:3xjP2CjkM3ZkO73aj4ASA5wRPGGCRrPIAeNqVNkzY8M= +cloud.google.com/go/longrunning v0.4.1 h1:v+yFJOfKC3yZdY6ZUI933pIYdhyhV8S3NpWrXWmg7jM= +cloud.google.com/go/longrunning v0.4.1/go.mod h1:4iWDqhBZ70CvZ6BfETbvam3T8FMvLK+eFj0E6AaRQTo= +cloud.google.com/go/managedidentities v1.5.0 h1:ZRQ4k21/jAhrHBVKl/AY7SjgzeJwG1iZa+mJ82P+VNg= +cloud.google.com/go/managedidentities v1.5.0/go.mod h1:+dWcZ0JlUmpuxpIDfyP5pP5y0bLdRwOS4Lp7gMni/LA= +cloud.google.com/go/maps v0.7.0 h1:mv9YaczD4oZBZkM5XJl6fXQ984IkJNHPwkc8MUsdkBo= +cloud.google.com/go/maps v0.7.0/go.mod h1:3GnvVl3cqeSvgMcpRlQidXsPYuDGQ8naBis7MVzpXsY= cloud.google.com/go/mediatranslation v0.5.0/go.mod h1:jGPUhGTybqsPQn91pNXw0xVHfuJ3leR1wj37oU3y1f4= cloud.google.com/go/mediatranslation v0.6.0/go.mod h1:hHdBCTYNigsBxshbznuIMFNe5QXEowAuNmmC7h8pu5w= +cloud.google.com/go/mediatranslation v0.7.0 h1:anPxH+/WWt8Yc3EdoEJhPMBRF7EhIdz426A+tuoA0OU= +cloud.google.com/go/mediatranslation v0.7.0/go.mod h1:LCnB/gZr90ONOIQLgSXagp8XUW1ODs2UmUMvcgMfI2I= cloud.google.com/go/memcache v1.4.0/go.mod h1:rTOfiGZtJX1AaFUrOgsMHX5kAzaTQ8azHiuDoTPzNsE= cloud.google.com/go/memcache v1.5.0/go.mod h1:dk3fCK7dVo0cUU2c36jKb4VqKPS22BTkf81Xq617aWM= -cloud.google.com/go/memcache v1.6.0/go.mod h1:XS5xB0eQZdHtTuTF9Hf8eJkKtR3pVRCcvJwtm68T3rA= -cloud.google.com/go/memcache v1.7.0/go.mod h1:ywMKfjWhNtkQTxrWxCkCFkoPjLHPW6A7WOTVI8xy3LY= +cloud.google.com/go/memcache v1.9.0 h1:8/VEmWCpnETCrBwS3z4MhT+tIdKgR1Z4Tr2tvYH32rg= +cloud.google.com/go/memcache v1.9.0/go.mod h1:8oEyzXCu+zo9RzlEaEjHl4KkgjlNDaXbCQeQWlzNFJM= cloud.google.com/go/metastore v1.5.0/go.mod h1:2ZNrDcQwghfdtCwJ33nM0+GrBGlVuh8rakL3vdPY3XY= cloud.google.com/go/metastore v1.6.0/go.mod h1:6cyQTls8CWXzk45G55x57DVQ9gWg7RiH65+YgPsNh9s= -cloud.google.com/go/metastore v1.7.0/go.mod h1:s45D0B4IlsINu87/AsWiEVYbLaIMeUSoxlKKDqBGFS8= -cloud.google.com/go/metastore v1.8.0/go.mod h1:zHiMc4ZUpBiM7twCIFQmJ9JMEkDSyZS9U12uf7wHqSI= -cloud.google.com/go/monitoring v1.7.0/go.mod h1:HpYse6kkGo//7p6sT0wsIC6IBDET0RhIsnmlA53dvEk= -cloud.google.com/go/monitoring v1.8.0/go.mod h1:E7PtoMJ1kQXWxPjB6mv2fhC5/15jInuulFdYYtlcvT4= +cloud.google.com/go/metastore v1.10.0 h1:QCFhZVe2289KDBQ7WxaHV2rAmPrmRAdLC6gbjUd3HPo= +cloud.google.com/go/metastore v1.10.0/go.mod h1:fPEnH3g4JJAk+gMRnrAnoqyv2lpUCqJPWOodSaf45Eo= +cloud.google.com/go/monitoring v1.13.0 h1:2qsrgXGVoRXpP7otZ14eE1I568zAa92sJSDPyOJvwjM= +cloud.google.com/go/monitoring v1.13.0/go.mod h1:k2yMBAB1H9JT/QETjNkgdCGD9bPF712XiLTVr+cBrpw= cloud.google.com/go/networkconnectivity v1.4.0/go.mod h1:nOl7YL8odKyAOtzNX73/M5/mGZgqqMeryi6UPZTk/rA= cloud.google.com/go/networkconnectivity v1.5.0/go.mod h1:3GzqJx7uhtlM3kln0+x5wyFvuVH1pIBJjhCpjzSt75o= -cloud.google.com/go/networkconnectivity v1.6.0/go.mod h1:OJOoEXW+0LAxHh89nXd64uGG+FbQoeH8DtxCHVOMlaM= -cloud.google.com/go/networkconnectivity v1.7.0/go.mod h1:RMuSbkdbPwNMQjB5HBWD5MpTBnNm39iAVpC3TmsExt8= -cloud.google.com/go/networkmanagement v1.4.0/go.mod h1:Q9mdLLRn60AsOrPc8rs8iNV6OHXaGcDdsIQe1ohekq8= -cloud.google.com/go/networkmanagement v1.5.0/go.mod h1:ZnOeZ/evzUdUsnvRt792H0uYEnHQEMaz+REhhzJRcf4= +cloud.google.com/go/networkconnectivity v1.11.0 h1:ZD6b4Pk1jEtp/cx9nx0ZYcL3BKqDa+KixNDZ6Bjs1B8= +cloud.google.com/go/networkconnectivity v1.11.0/go.mod h1:iWmDD4QF16VCDLXUqvyspJjIEtBR/4zq5hwnY2X3scM= +cloud.google.com/go/networkmanagement v1.6.0 h1:8KWEUNGcpSX9WwZXq7FtciuNGPdPdPN/ruDm769yAEM= +cloud.google.com/go/networkmanagement v1.6.0/go.mod h1:5pKPqyXjB/sgtvB5xqOemumoQNB7y95Q7S+4rjSOPYY= cloud.google.com/go/networksecurity v0.5.0/go.mod h1:xS6fOCoqpVC5zx15Z/MqkfDwH4+m/61A3ODiDV1xmiQ= cloud.google.com/go/networksecurity v0.6.0/go.mod h1:Q5fjhTr9WMI5mbpRYEbiexTzROf7ZbDzvzCrNl14nyU= +cloud.google.com/go/networksecurity v0.8.0 h1:sOc42Ig1K2LiKlzG71GUVloeSJ0J3mffEBYmvu+P0eo= +cloud.google.com/go/networksecurity v0.8.0/go.mod h1:B78DkqsxFG5zRSVuwYFRZ9Xz8IcQ5iECsNrPn74hKHU= cloud.google.com/go/notebooks v1.2.0/go.mod h1:9+wtppMfVPUeJ8fIWPOq1UnATHISkGXGqTkxeieQ6UY= cloud.google.com/go/notebooks v1.3.0/go.mod h1:bFR5lj07DtCPC7YAAJ//vHskFBxA5JzYlH68kXVdk34= -cloud.google.com/go/notebooks v1.4.0/go.mod h1:4QPMngcwmgb6uw7Po99B2xv5ufVoIQ7nOGDyL4P8AgA= -cloud.google.com/go/notebooks v1.5.0/go.mod h1:q8mwhnP9aR8Hpfnrc5iN5IBhrXUy8S2vuYs+kBJ/gu0= -cloud.google.com/go/optimization v1.1.0/go.mod h1:5po+wfvX5AQlPznyVEZjGJTMr4+CAkJf2XSTQOOl9l4= -cloud.google.com/go/optimization v1.2.0/go.mod h1:Lr7SOHdRDENsh+WXVmQhQTrzdu9ybg0NecjHidBq6xs= -cloud.google.com/go/orchestration v1.3.0/go.mod h1:Sj5tq/JpWiB//X/q3Ngwdl5K7B7Y0KZ7bfv0wL6fqVA= -cloud.google.com/go/orchestration v1.4.0/go.mod h1:6W5NLFWs2TlniBphAViZEVhrXRSMgUGDfW7vrWKvsBk= -cloud.google.com/go/orgpolicy v1.4.0/go.mod h1:xrSLIV4RePWmP9P3tBl8S93lTmlAxjm06NSm2UTmKvE= -cloud.google.com/go/orgpolicy v1.5.0/go.mod h1:hZEc5q3wzwXJaKrsx5+Ewg0u1LxJ51nNFlext7Tanwc= +cloud.google.com/go/notebooks v1.8.0 h1:Kg2K3K7CbSXYJHZ1aGQpf1xi5x2GUvQWf2sFVuiZh8M= +cloud.google.com/go/notebooks v1.8.0/go.mod h1:Lq6dYKOYOWUCTvw5t2q1gp1lAp0zxAxRycayS0iJcqQ= +cloud.google.com/go/optimization v1.3.1 h1:dj8O4VOJRB4CUwZXdmwNViH1OtI0WtWL867/lnYH248= +cloud.google.com/go/optimization v1.3.1/go.mod h1:IvUSefKiwd1a5p0RgHDbWCIbDFgKuEdB+fPPuP0IDLI= +cloud.google.com/go/orchestration v1.6.0 h1:Vw+CEXo8M/FZ1rb4EjcLv0gJqqw89b7+g+C/EmniTb8= +cloud.google.com/go/orchestration v1.6.0/go.mod h1:M62Bevp7pkxStDfFfTuCOaXgaaqRAga1yKyoMtEoWPQ= +cloud.google.com/go/orgpolicy v1.10.0 h1:XDriMWug7sd0kYT1QKofRpRHzjad0bK8Q8uA9q+XrU4= +cloud.google.com/go/orgpolicy v1.10.0/go.mod h1:w1fo8b7rRqlXlIJbVhOMPrwVljyuW5mqssvBtU18ONc= cloud.google.com/go/osconfig v1.7.0/go.mod h1:oVHeCeZELfJP7XLxcBGTMBvRO+1nQ5tFG9VQTmYS2Fs= cloud.google.com/go/osconfig v1.8.0/go.mod h1:EQqZLu5w5XA7eKizepumcvWx+m8mJUhEwiPqWiZeEdg= -cloud.google.com/go/osconfig v1.9.0/go.mod h1:Yx+IeIZJ3bdWmzbQU4fxNl8xsZ4amB+dygAwFPlvnNo= -cloud.google.com/go/osconfig v1.10.0/go.mod h1:uMhCzqC5I8zfD9zDEAfvgVhDS8oIjySWh+l4WK6GnWw= +cloud.google.com/go/osconfig v1.11.0 h1:PkSQx4OHit5xz2bNyr11KGcaFccL5oqglFPdTboyqwQ= +cloud.google.com/go/osconfig v1.11.0/go.mod h1:aDICxrur2ogRd9zY5ytBLV89KEgT2MKB2L/n6x1ooPw= cloud.google.com/go/oslogin v1.4.0/go.mod h1:YdgMXWRaElXz/lDk1Na6Fh5orF7gvmJ0FGLIs9LId4E= cloud.google.com/go/oslogin v1.5.0/go.mod h1:D260Qj11W2qx/HVF29zBg+0fd6YCSjSqLUkY/qEenQU= -cloud.google.com/go/oslogin v1.6.0/go.mod h1:zOJ1O3+dTU8WPlGEkFSh7qeHPPSoxrcMbbK1Nm2iX70= -cloud.google.com/go/oslogin v1.7.0/go.mod h1:e04SN0xO1UNJ1M5GP0vzVBFicIe4O53FOfcixIqTyXo= +cloud.google.com/go/oslogin v1.9.0 h1:whP7vhpmc+ufZa90eVpkfbgzJRK/Xomjz+XCD4aGwWw= +cloud.google.com/go/oslogin v1.9.0/go.mod h1:HNavntnH8nzrn8JCTT5fj18FuJLFJc4NaZJtBnQtKFs= cloud.google.com/go/phishingprotection v0.5.0/go.mod h1:Y3HZknsK9bc9dMi+oE8Bim0lczMU6hrX0UpADuMefr0= cloud.google.com/go/phishingprotection v0.6.0/go.mod h1:9Y3LBLgy0kDTcYET8ZH3bq/7qni15yVUoAxiFxnlSUA= -cloud.google.com/go/policytroubleshooter v1.3.0/go.mod h1:qy0+VwANja+kKrjlQuOzmlvscn4RNsAc0e15GGqfMxg= -cloud.google.com/go/policytroubleshooter v1.4.0/go.mod h1:DZT4BcRw3QoO8ota9xw/LKtPa8lKeCByYeKTIf/vxdE= +cloud.google.com/go/phishingprotection v0.7.0 h1:l6tDkT7qAEV49MNEJkEJTB6vOO/onbSOcNtAT09HPuA= +cloud.google.com/go/phishingprotection v0.7.0/go.mod h1:8qJI4QKHoda/sb/7/YmMQ2omRLSLYSu9bU0EKCNI+Lk= +cloud.google.com/go/policytroubleshooter v1.6.0 h1:yKAGC4p9O61ttZUswaq9GAn1SZnEzTd0vUYXD7ZBT7Y= +cloud.google.com/go/policytroubleshooter v1.6.0/go.mod h1:zYqaPTsmfvpjm5ULxAyD/lINQxJ0DDsnWOP/GZ7xzBc= cloud.google.com/go/privatecatalog v0.5.0/go.mod h1:XgosMUvvPyxDjAVNDYxJ7wBW8//hLDDYmnsNcMGq1K0= cloud.google.com/go/privatecatalog v0.6.0/go.mod h1:i/fbkZR0hLN29eEWiiwue8Pb+GforiEIBnV9yrRUOKI= +cloud.google.com/go/privatecatalog v0.8.0 h1:EPEJ1DpEGXLDnmc7mnCAqFmkwUJbIsaLAiLHVOkkwtc= +cloud.google.com/go/privatecatalog v0.8.0/go.mod h1:nQ6pfaegeDAq/Q5lrfCQzQLhubPiZhSaNhIgfJlnIXs= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= -cloud.google.com/go/pubsub v1.5.0/go.mod h1:ZEwJccE3z93Z2HWvstpri00jOg7oO4UZDtKhwDwqF0w= -cloud.google.com/go/pubsub v1.26.0/go.mod h1:QgBH3U/jdJy/ftjPhTkyXNj543Tin1pRYcdcPRnFIRI= -cloud.google.com/go/pubsub v1.27.1/go.mod h1:hQN39ymbV9geqBnfQq6Xf63yNhUAhv9CZhzp5O6qsW0= -cloud.google.com/go/pubsublite v1.5.0/go.mod h1:xapqNQ1CuLfGi23Yda/9l4bBCKz/wC3KIJ5gKcxveZg= +cloud.google.com/go/pubsub v1.30.0 h1:vCge8m7aUKBJYOgrZp7EsNDf6QMd2CAlXZqWTn3yq6s= +cloud.google.com/go/pubsub v1.30.0/go.mod h1:qWi1OPS0B+b5L+Sg6Gmc9zD1Y+HaM0MdUr7LsupY1P4= +cloud.google.com/go/pubsublite v1.7.0 h1:cb9fsrtpINtETHiJ3ECeaVzrfIVhcGjhhJEjybHXHao= +cloud.google.com/go/pubsublite v1.7.0/go.mod h1:8hVMwRXfDfvGm3fahVbtDbiLePT3gpoiJYJY+vxWxVM= +cloud.google.com/go/recaptchaenterprise v1.3.1 h1:u6EznTGzIdsyOsvm+Xkw0aSuKFXQlyjGE9a4exk6iNQ= cloud.google.com/go/recaptchaenterprise v1.3.1/go.mod h1:OdD+q+y4XGeAlxRaMn1Y7/GveP6zmq76byL6tjPE7d4= cloud.google.com/go/recaptchaenterprise/v2 v2.1.0/go.mod h1:w9yVqajwroDNTfGuhmOjPDN//rZGySaf6PtFVcSCa7o= cloud.google.com/go/recaptchaenterprise/v2 v2.2.0/go.mod h1:/Zu5jisWGeERrd5HnlS3EUGb/D335f9k51B/FVil0jk= cloud.google.com/go/recaptchaenterprise/v2 v2.3.0/go.mod h1:O9LwGCjrhGHBQET5CA7dd5NwwNQUErSgEDit1DLNTdo= -cloud.google.com/go/recaptchaenterprise/v2 v2.4.0/go.mod h1:Am3LHfOuBstrLrNCBrlI5sbwx9LBg3te2N6hGvHn2mE= -cloud.google.com/go/recaptchaenterprise/v2 v2.5.0/go.mod h1:O8LzcHXN3rz0j+LBC91jrwI3R+1ZSZEWrfL7XHgNo9U= +cloud.google.com/go/recaptchaenterprise/v2 v2.7.0 h1:6iOCujSNJ0YS7oNymI64hXsjGq60T4FK1zdLugxbzvU= +cloud.google.com/go/recaptchaenterprise/v2 v2.7.0/go.mod h1:19wVj/fs5RtYtynAPJdDTb69oW0vNHYDBTbB4NvMD9c= cloud.google.com/go/recommendationengine v0.5.0/go.mod h1:E5756pJcVFeVgaQv3WNpImkFP8a+RptV6dDLGPILjvg= cloud.google.com/go/recommendationengine v0.6.0/go.mod h1:08mq2umu9oIqc7tDy8sx+MNJdLG0fUi3vaSVbztHgJ4= +cloud.google.com/go/recommendationengine v0.7.0 h1:VibRFCwWXrFebEWKHfZAt2kta6pS7Tlimsnms0fjv7k= +cloud.google.com/go/recommendationengine v0.7.0/go.mod h1:1reUcE3GIu6MeBz/h5xZJqNLuuVjNg1lmWMPyjatzac= cloud.google.com/go/recommender v1.5.0/go.mod h1:jdoeiBIVrJe9gQjwd759ecLJbxCDED4A6p+mqoqDvTg= cloud.google.com/go/recommender v1.6.0/go.mod h1:+yETpm25mcoiECKh9DEScGzIRyDKpZ0cEhWGo+8bo+c= -cloud.google.com/go/recommender v1.7.0/go.mod h1:XLHs/W+T8olwlGOgfQenXBTbIseGclClff6lhFVe9Bs= -cloud.google.com/go/recommender v1.8.0/go.mod h1:PkjXrTT05BFKwxaUxQmtIlrtj0kph108r02ZZQ5FE70= +cloud.google.com/go/recommender v1.9.0 h1:ZnFRY5R6zOVk2IDS1Jbv5Bw+DExCI5rFumsTnMXiu/A= +cloud.google.com/go/recommender v1.9.0/go.mod h1:PnSsnZY7q+VL1uax2JWkt/UegHssxjUVVCrX52CuEmQ= cloud.google.com/go/redis v1.7.0/go.mod h1:V3x5Jq1jzUcg+UNsRvdmsfuFnit1cfe3Z/PGyq/lm4Y= cloud.google.com/go/redis v1.8.0/go.mod h1:Fm2szCDavWzBk2cDKxrkmWBqoCiL1+Ctwq7EyqBCA/A= -cloud.google.com/go/redis v1.9.0/go.mod h1:HMYQuajvb2D0LvMgZmLDZW8V5aOC/WxstZHiy4g8OiA= -cloud.google.com/go/redis v1.10.0/go.mod h1:ThJf3mMBQtW18JzGgh41/Wld6vnDDc/F/F35UolRZPM= -cloud.google.com/go/resourcemanager v1.3.0/go.mod h1:bAtrTjZQFJkiWTPDb1WBjzvc6/kifjj4QBYuKCCoqKA= -cloud.google.com/go/resourcemanager v1.4.0/go.mod h1:MwxuzkumyTX7/a3n37gmsT3py7LIXwrShilPh3P1tR0= -cloud.google.com/go/resourcesettings v1.3.0/go.mod h1:lzew8VfESA5DQ8gdlHwMrqZs1S9V87v3oCnKCWoOuQU= -cloud.google.com/go/resourcesettings v1.4.0/go.mod h1:ldiH9IJpcrlC3VSuCGvjR5of/ezRrOxFtpJoJo5SmXg= +cloud.google.com/go/redis v1.11.0 h1:JoAd3SkeDt3rLFAAxEvw6wV4t+8y4ZzfZcZmddqphQ8= +cloud.google.com/go/redis v1.11.0/go.mod h1:/X6eicana+BWcUda5PpwZC48o37SiFVTFSs0fWAJ7uQ= +cloud.google.com/go/resourcemanager v1.7.0 h1:NRM0p+RJkaQF9Ee9JMnUV9BQ2QBIOq/v8M+Pbv/wmCs= +cloud.google.com/go/resourcemanager v1.7.0/go.mod h1:HlD3m6+bwhzj9XCouqmeiGuni95NTrExfhoSrkC/3EI= +cloud.google.com/go/resourcesettings v1.5.0 h1:8Dua37kQt27CCWHm4h/Q1XqCF6ByD7Ouu49xg95qJzI= +cloud.google.com/go/resourcesettings v1.5.0/go.mod h1:+xJF7QSG6undsQDfsCJyqWXyBwUoJLhetkRMDRnIoXA= cloud.google.com/go/retail v1.8.0/go.mod h1:QblKS8waDmNUhghY2TI9O3JLlFk8jybHeV4BF19FrE4= cloud.google.com/go/retail v1.9.0/go.mod h1:g6jb6mKuCS1QKnH/dpu7isX253absFl6iE92nHwlBUY= -cloud.google.com/go/retail v1.10.0/go.mod h1:2gDk9HsL4HMS4oZwz6daui2/jmKvqShXKQuB2RZ+cCc= -cloud.google.com/go/retail v1.11.0/go.mod h1:MBLk1NaWPmh6iVFSz9MeKG/Psyd7TAgm6y/9L2B4x9Y= -cloud.google.com/go/run v0.2.0/go.mod h1:CNtKsTA1sDcnqqIFR3Pb5Tq0usWxJJvsWOCPldRU3Do= -cloud.google.com/go/run v0.3.0/go.mod h1:TuyY1+taHxTjrD0ZFk2iAR+xyOXEA0ztb7U3UNA0zBo= +cloud.google.com/go/retail v1.12.0 h1:1Dda2OpFNzIb4qWgFZjYlpP7sxX3aLeypKG6A3H4Yys= +cloud.google.com/go/retail v1.12.0/go.mod h1:UMkelN/0Z8XvKymXFbD4EhFJlYKRx1FGhQkVPU5kF14= +cloud.google.com/go/run v0.9.0 h1:ydJQo+k+MShYnBfhaRHSZYeD/SQKZzZLAROyfpeD9zw= +cloud.google.com/go/run v0.9.0/go.mod h1:Wwu+/vvg8Y+JUApMwEDfVfhetv30hCG4ZwDR/IXl2Qg= cloud.google.com/go/scheduler v1.4.0/go.mod h1:drcJBmxF3aqZJRhmkHQ9b3uSSpQoltBPGPxGAWROx6s= cloud.google.com/go/scheduler v1.5.0/go.mod h1:ri073ym49NW3AfT6DZi21vLZrG07GXr5p3H1KxN5QlI= -cloud.google.com/go/scheduler v1.6.0/go.mod h1:SgeKVM7MIwPn3BqtcBntpLyrIJftQISRrYB5ZtT+KOk= -cloud.google.com/go/scheduler v1.7.0/go.mod h1:jyCiBqWW956uBjjPMMuX09n3x37mtyPJegEWKxRsn44= +cloud.google.com/go/scheduler v1.9.0 h1:NpQAHtx3sulByTLe2dMwWmah8PWgeoieFPpJpArwFV0= +cloud.google.com/go/scheduler v1.9.0/go.mod h1:yexg5t+KSmqu+njTIh3b7oYPheFtBWGcbVUYF1GGMIc= cloud.google.com/go/secretmanager v1.6.0/go.mod h1:awVa/OXF6IiyaU1wQ34inzQNc4ISIDIrId8qE5QGgKA= -cloud.google.com/go/secretmanager v1.8.0/go.mod h1:hnVgi/bN5MYHd3Gt0SPuTPPp5ENina1/LxM+2W9U9J4= -cloud.google.com/go/secretmanager v1.9.0/go.mod h1:b71qH2l1yHmWQHt9LC80akm86mX8AL6X1MA01dW8ht4= +cloud.google.com/go/secretmanager v1.10.0 h1:pu03bha7ukxF8otyPKTFdDz+rr9sE3YauS5PliDXK60= +cloud.google.com/go/secretmanager v1.10.0/go.mod h1:MfnrdvKMPNra9aZtQFvBcvRU54hbPD8/HayQdlUgJpU= cloud.google.com/go/security v1.5.0/go.mod h1:lgxGdyOKKjHL4YG3/YwIL2zLqMFCKs0UbQwgyZmfJl4= cloud.google.com/go/security v1.7.0/go.mod h1:mZklORHl6Bg7CNnnjLH//0UlAlaXqiG7Lb9PsPXLfD0= cloud.google.com/go/security v1.8.0/go.mod h1:hAQOwgmaHhztFhiQ41CjDODdWP0+AE1B3sX4OFlq+GU= -cloud.google.com/go/security v1.9.0/go.mod h1:6Ta1bO8LXI89nZnmnsZGp9lVoVWXqsVbIq/t9dzI+2Q= -cloud.google.com/go/security v1.10.0/go.mod h1:QtOMZByJVlibUT2h9afNDWRZ1G96gVywH8T5GUSb9IA= +cloud.google.com/go/security v1.13.0 h1:PYvDxopRQBfYAXKAuDpFCKBvDOWPWzp9k/H5nB3ud3o= +cloud.google.com/go/security v1.13.0/go.mod h1:Q1Nvxl1PAgmeW0y3HTt54JYIvUdtcpYKVfIB8AOMZ+0= cloud.google.com/go/securitycenter v1.13.0/go.mod h1:cv5qNAqjY84FCN6Y9z28WlkKXyWsgLO832YiWwkCWcU= cloud.google.com/go/securitycenter v1.14.0/go.mod h1:gZLAhtyKv85n52XYWt6RmeBdydyxfPeTrpToDPw4Auc= -cloud.google.com/go/securitycenter v1.15.0/go.mod h1:PeKJ0t8MoFmmXLXWm41JidyzI3PJjd8sXWaVqg43WWk= -cloud.google.com/go/securitycenter v1.16.0/go.mod h1:Q9GMaLQFUD+5ZTabrbujNWLtSLZIZF7SAR0wWECrjdk= -cloud.google.com/go/servicecontrol v1.4.0/go.mod h1:o0hUSJ1TXJAmi/7fLJAedOovnujSEvjKCAFNXPQ1RaU= -cloud.google.com/go/servicecontrol v1.5.0/go.mod h1:qM0CnXHhyqKVuiZnGKrIurvVImCs8gmqWsDoqe9sU1s= +cloud.google.com/go/securitycenter v1.19.0 h1:AF3c2s3awNTMoBtMX3oCUoOMmGlYxGOeuXSYHNBkf14= +cloud.google.com/go/securitycenter v1.19.0/go.mod h1:LVLmSg8ZkkyaNy4u7HCIshAngSQ8EcIRREP3xBnyfag= cloud.google.com/go/servicedirectory v1.4.0/go.mod h1:gH1MUaZCgtP7qQiI+F+A+OpeKF/HQWgtAddhTbhL2bs= cloud.google.com/go/servicedirectory v1.5.0/go.mod h1:QMKFL0NUySbpZJ1UZs3oFAmdvVxhhxB6eJ/Vlp73dfg= -cloud.google.com/go/servicedirectory v1.6.0/go.mod h1:pUlbnWsLH9c13yGkxCmfumWEPjsRs1RlmJ4pqiNjVL4= -cloud.google.com/go/servicedirectory v1.7.0/go.mod h1:5p/U5oyvgYGYejufvxhgwjL8UVXjkuw7q5XcG10wx1U= -cloud.google.com/go/servicemanagement v1.4.0/go.mod h1:d8t8MDbezI7Z2R1O/wu8oTggo3BI2GKYbdG4y/SJTco= -cloud.google.com/go/servicemanagement v1.5.0/go.mod h1:XGaCRe57kfqu4+lRxaFEAuqmjzF0r+gWHjWqKqBvKFo= -cloud.google.com/go/serviceusage v1.3.0/go.mod h1:Hya1cozXM4SeSKTAgGXgj97GlqUvF5JaoXacR1JTP/E= -cloud.google.com/go/serviceusage v1.4.0/go.mod h1:SB4yxXSaYVuUBYUml6qklyONXNLt83U0Rb+CXyhjEeU= -cloud.google.com/go/shell v1.3.0/go.mod h1:VZ9HmRjZBsjLGXusm7K5Q5lzzByZmJHf1d0IWHEN5X4= -cloud.google.com/go/shell v1.4.0/go.mod h1:HDxPzZf3GkDdhExzD/gs8Grqk+dmYcEjGShZgYa9URw= -cloud.google.com/go/spanner v1.7.0/go.mod h1:sd3K2gZ9Fd0vMPLXzeCrF6fq4i63Q7aTLW/lBIfBkIk= -cloud.google.com/go/spanner v1.41.0/go.mod h1:MLYDBJR/dY4Wt7ZaMIQ7rXOTLjYrmxLE/5ve9vFfWos= +cloud.google.com/go/servicedirectory v1.9.0 h1:SJwk0XX2e26o25ObYUORXx6torSFiYgsGkWSkZgkoSU= +cloud.google.com/go/servicedirectory v1.9.0/go.mod h1:29je5JjiygNYlmsGz8k6o+OZ8vd4f//bQLtvzkPPT/s= +cloud.google.com/go/shell v1.6.0 h1:wT0Uw7ib7+AgZST9eCDygwTJn4+bHMDtZo5fh7kGWDU= +cloud.google.com/go/shell v1.6.0/go.mod h1:oHO8QACS90luWgxP3N9iZVuEiSF84zNyLytb+qE2f9A= +cloud.google.com/go/spanner v1.45.0 h1:7VdjZ8zj4sHbDw55atp5dfY6kn1j9sam9DRNpPQhqR4= +cloud.google.com/go/spanner v1.45.0/go.mod h1:FIws5LowYz8YAE1J8fOS7DJup8ff7xJeetWEo5REA2M= cloud.google.com/go/speech v1.6.0/go.mod h1:79tcr4FHCimOp56lwC01xnt/WPJZc4v3gzyT7FoBkCM= cloud.google.com/go/speech v1.7.0/go.mod h1:KptqL+BAQIhMsj1kOP2la5DSEEerPDuOP/2mmkhHhZQ= -cloud.google.com/go/speech v1.8.0/go.mod h1:9bYIl1/tjsAnMgKGHKmBZzXKEkGgtU+MpdDPTE9f7y0= -cloud.google.com/go/speech v1.9.0/go.mod h1:xQ0jTcmnRFFM2RfX/U+rk6FQNUF6DQlydUSyoooSpco= +cloud.google.com/go/speech v1.15.0 h1:JEVoWGNnTF128kNty7T4aG4eqv2z86yiMJPT9Zjp+iw= +cloud.google.com/go/speech v1.15.0/go.mod h1:y6oH7GhqCaZANH7+Oe0BhgIogsNInLlz542tg3VqeYI= cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= @@ -357,369 +380,256 @@ cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3f cloud.google.com/go/storage v1.22.1/go.mod h1:S8N1cAStu7BOeFfE8KAQzmyyLkK8p/vmRq6kuBTW58Y= cloud.google.com/go/storage v1.23.0/go.mod h1:vOEEDNFnciUMhBeT6hsJIn3ieU5cFRmzeLgDvXzfIXc= cloud.google.com/go/storage v1.27.0/go.mod h1:x9DOL8TK/ygDUMieqwfhdpQryTeEkhGKMi80i/iqR2s= -cloud.google.com/go/storagetransfer v1.5.0/go.mod h1:dxNzUopWy7RQevYFHewchb29POFv3/AaBgnhqzqiK0w= -cloud.google.com/go/storagetransfer v1.6.0/go.mod h1:y77xm4CQV/ZhFZH75PLEXY0ROiS7Gh6pSKrM8dJyg6I= +cloud.google.com/go/storage v1.29.0 h1:6weCgzRvMg7lzuUurI4697AqIRPU1SvzHhynwpW31jI= +cloud.google.com/go/storage v1.29.0/go.mod h1:4puEjyTKnku6gfKoTfNOU/W+a9JyuVNxjpS5GBrB8h4= +cloud.google.com/go/storagetransfer v1.8.0 h1:5T+PM+3ECU3EY2y9Brv0Sf3oka8pKmsCfpQ07+91G9o= +cloud.google.com/go/storagetransfer v1.8.0/go.mod h1:JpegsHHU1eXg7lMHkvf+KE5XDJ7EQu0GwNJbbVGanEw= cloud.google.com/go/talent v1.1.0/go.mod h1:Vl4pt9jiHKvOgF9KoZo6Kob9oV4lwd/ZD5Cto54zDRw= cloud.google.com/go/talent v1.2.0/go.mod h1:MoNF9bhFQbiJ6eFD3uSsg0uBALw4n4gaCaEjBw9zo8g= -cloud.google.com/go/talent v1.3.0/go.mod h1:CmcxwJ/PKfRgd1pBjQgU6W3YBwiewmUzQYH5HHmSCmM= -cloud.google.com/go/talent v1.4.0/go.mod h1:ezFtAgVuRf8jRsvyE6EwmbTK5LKciD4KVnHuDEFmOOA= -cloud.google.com/go/texttospeech v1.4.0/go.mod h1:FX8HQHA6sEpJ7rCMSfXuzBcysDAuWusNNNvN9FELDd8= -cloud.google.com/go/texttospeech v1.5.0/go.mod h1:oKPLhR4n4ZdQqWKURdwxMy0uiTS1xU161C8W57Wkea4= -cloud.google.com/go/tpu v1.3.0/go.mod h1:aJIManG0o20tfDQlRIej44FcwGGl/cD0oiRyMKG19IQ= -cloud.google.com/go/tpu v1.4.0/go.mod h1:mjZaX8p0VBgllCzF6wcU2ovUXN9TONFLd7iz227X2Xg= -cloud.google.com/go/trace v1.3.0/go.mod h1:FFUE83d9Ca57C+K8rDl/Ih8LwOzWIV1krKgxg6N0G28= -cloud.google.com/go/trace v1.4.0/go.mod h1:UG0v8UBqzusp+z63o7FK74SdFE+AXpCLdFb1rshXG+Y= -cloud.google.com/go/translate v1.3.0/go.mod h1:gzMUwRjvOqj5i69y/LYLd8RrNQk+hOmIXTi9+nb3Djs= -cloud.google.com/go/translate v1.4.0/go.mod h1:06Dn/ppvLD6WvA5Rhdp029IX2Mi3Mn7fpMRLPvXT5Wg= -cloud.google.com/go/video v1.8.0/go.mod h1:sTzKFc0bUSByE8Yoh8X0mn8bMymItVGPfTuUBUyRgxk= -cloud.google.com/go/video v1.9.0/go.mod h1:0RhNKFRF5v92f8dQt0yhaHrEuH95m068JYOvLZYnJSw= +cloud.google.com/go/talent v1.5.0 h1:nI9sVZPjMKiO2q3Uu0KhTDVov3Xrlpt63fghP9XjyEM= +cloud.google.com/go/talent v1.5.0/go.mod h1:G+ODMj9bsasAEJkQSzO2uHQWXHHXUomArjWQQYkqK6c= +cloud.google.com/go/texttospeech v1.6.0 h1:H4g1ULStsbVtalbZGktyzXzw6jP26RjVGYx9RaYjBzc= +cloud.google.com/go/texttospeech v1.6.0/go.mod h1:YmwmFT8pj1aBblQOI3TfKmwibnsfvhIBzPXcW4EBovc= +cloud.google.com/go/tpu v1.5.0 h1:/34T6CbSi+kTv5E19Q9zbU/ix8IviInZpzwz3rsFE+A= +cloud.google.com/go/tpu v1.5.0/go.mod h1:8zVo1rYDFuW2l4yZVY0R0fb/v44xLh3llq7RuV61fPM= +cloud.google.com/go/trace v1.9.0 h1:olxC0QHC59zgJVALtgqfD9tGk0lfeCP5/AGXL3Px/no= +cloud.google.com/go/trace v1.9.0/go.mod h1:lOQqpE5IaWY0Ixg7/r2SjixMuc6lfTFeO4QGM4dQWOk= +cloud.google.com/go/translate v1.7.0 h1:GvLP4oQ4uPdChBmBaUSa/SaZxCdyWELtlAaKzpHsXdA= +cloud.google.com/go/translate v1.7.0/go.mod h1:lMGRudH1pu7I3n3PETiOB2507gf3HnfLV8qlkHZEyos= +cloud.google.com/go/video v1.15.0 h1:upIbnGI0ZgACm58HPjAeBMleW3sl5cT84AbYQ8PWOgM= +cloud.google.com/go/video v1.15.0/go.mod h1:SkgaXwT+lIIAKqWAJfktHT/RbgjSuY6DobxEp0C5yTQ= cloud.google.com/go/videointelligence v1.6.0/go.mod h1:w0DIDlVRKtwPCn/C4iwZIJdvC69yInhW0cfi+p546uU= cloud.google.com/go/videointelligence v1.7.0/go.mod h1:k8pI/1wAhjznARtVT9U1llUaFNPh7muw8QyOUpavru4= -cloud.google.com/go/videointelligence v1.8.0/go.mod h1:dIcCn4gVDdS7yte/w+koiXn5dWVplOZkE+xwG9FgK+M= -cloud.google.com/go/videointelligence v1.9.0/go.mod h1:29lVRMPDYHikk3v8EdPSaL8Ku+eMzDljjuvRs105XoU= +cloud.google.com/go/videointelligence v1.10.0 h1:Uh5BdoET8XXqXX2uXIahGb+wTKbLkGH7s4GXR58RrG8= +cloud.google.com/go/videointelligence v1.10.0/go.mod h1:LHZngX1liVtUhZvi2uNS0VQuOzNi2TkY1OakiuoUOjU= +cloud.google.com/go/vision v1.2.0 h1:/CsSTkbmO9HC8iQpxbK8ATms3OQaX3YQUeTMGCxlaK4= cloud.google.com/go/vision v1.2.0/go.mod h1:SmNwgObm5DpFBme2xpyOyasvBc1aPdjvMk2bBk0tKD0= cloud.google.com/go/vision/v2 v2.2.0/go.mod h1:uCdV4PpN1S0jyCyq8sIM42v2Y6zOLkZs+4R9LrGYwFo= cloud.google.com/go/vision/v2 v2.3.0/go.mod h1:UO61abBx9QRMFkNBbf1D8B1LXdS2cGiiCRx0vSpZoUo= -cloud.google.com/go/vision/v2 v2.4.0/go.mod h1:VtI579ll9RpVTrdKdkMzckdnwMyX2JILb+MhPqRbPsY= -cloud.google.com/go/vision/v2 v2.5.0/go.mod h1:MmaezXOOE+IWa+cS7OhRRLK2cNv1ZL98zhqFFZaaH2E= -cloud.google.com/go/vmmigration v1.2.0/go.mod h1:IRf0o7myyWFSmVR1ItrBSFLFD/rJkfDCUTO4vLlJvsE= -cloud.google.com/go/vmmigration v1.3.0/go.mod h1:oGJ6ZgGPQOFdjHuocGcLqX4lc98YQ7Ygq8YQwHh9A7g= -cloud.google.com/go/vmwareengine v0.1.0/go.mod h1:RsdNEf/8UDvKllXhMz5J40XxDrNJNN4sagiox+OI208= -cloud.google.com/go/vpcaccess v1.4.0/go.mod h1:aQHVbTWDYUR1EbTApSVvMq1EnT57ppDmQzZ3imqIk4w= -cloud.google.com/go/vpcaccess v1.5.0/go.mod h1:drmg4HLk9NkZpGfCmZ3Tz0Bwnm2+DKqViEpeEpOq0m8= +cloud.google.com/go/vision/v2 v2.7.0 h1:8C8RXUJoflCI4yVdqhTy9tRyygSHmp60aP363z23HKg= +cloud.google.com/go/vision/v2 v2.7.0/go.mod h1:H89VysHy21avemp6xcf9b9JvZHVehWbET0uT/bcuY/0= +cloud.google.com/go/vmmigration v1.6.0 h1:Azs5WKtfOC8pxvkyrDvt7J0/4DYBch0cVbuFfCCFt5k= +cloud.google.com/go/vmmigration v1.6.0/go.mod h1:bopQ/g4z+8qXzichC7GW1w2MjbErL54rk3/C843CjfY= +cloud.google.com/go/vmwareengine v0.3.0 h1:b0NBu7S294l0gmtrT0nOJneMYgZapr5x9tVWvgDoVEM= +cloud.google.com/go/vmwareengine v0.3.0/go.mod h1:wvoyMvNWdIzxMYSpH/R7y2h5h3WFkx6d+1TIsP39WGY= +cloud.google.com/go/vpcaccess v1.6.0 h1:FOe6CuiQD3BhHJWt7E8QlbBcaIzVRddupwJlp7eqmn4= +cloud.google.com/go/vpcaccess v1.6.0/go.mod h1:wX2ILaNhe7TlVa4vC5xce1bCnqE3AeH27RV31lnmZes= cloud.google.com/go/webrisk v1.4.0/go.mod h1:Hn8X6Zr+ziE2aNd8SliSDWpEnSS1u4R9+xXZmFiHmGE= cloud.google.com/go/webrisk v1.5.0/go.mod h1:iPG6fr52Tv7sGk0H6qUFzmL3HHZev1htXuWDEEsqMTg= -cloud.google.com/go/webrisk v1.6.0/go.mod h1:65sW9V9rOosnc9ZY7A7jsy1zoHS5W9IAXv6dGqhMQMc= -cloud.google.com/go/webrisk v1.7.0/go.mod h1:mVMHgEYH0r337nmt1JyLthzMr6YxwN1aAIEc2fTcq7A= -cloud.google.com/go/websecurityscanner v1.3.0/go.mod h1:uImdKm2wyeXQevQJXeh8Uun/Ym1VqworNDlBXQevGMo= -cloud.google.com/go/websecurityscanner v1.4.0/go.mod h1:ebit/Fp0a+FWu5j4JOmJEV8S8CzdTkAS77oDsiSqYWQ= +cloud.google.com/go/webrisk v1.8.0 h1:IY+L2+UwxcVm2zayMAtBhZleecdIFLiC+QJMzgb0kT0= +cloud.google.com/go/webrisk v1.8.0/go.mod h1:oJPDuamzHXgUc+b8SiHRcVInZQuybnvEW72PqTc7sSg= +cloud.google.com/go/websecurityscanner v1.5.0 h1:AHC1xmaNMOZtNqxI9Rmm87IJEyPaRkOxeI0gpAacXGk= +cloud.google.com/go/websecurityscanner v1.5.0/go.mod h1:Y6xdCPy81yi0SQnDY1xdNTNpfY1oAgXUlcfN3B3eSng= cloud.google.com/go/workflows v1.6.0/go.mod h1:6t9F5h/unJz41YqfBmqSASJSXccBLtD1Vwf+KmJENM0= cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoISEXH2bcHC3M= -cloud.google.com/go/workflows v1.8.0/go.mod h1:ysGhmEajwZxGn1OhGOGKsTXc5PyxOc0vfKf5Af+to4M= -cloud.google.com/go/workflows v1.9.0/go.mod h1:ZGkj1aFIOd9c8Gerkjjq7OW7I5+l6cSvT3ujaO/WwSA= -code.gitea.io/sdk/gitea v0.12.0/go.mod h1:z3uwDV/b9Ls47NGukYM9XhnHtqPh/J+t40lsUrR6JDY= +cloud.google.com/go/workflows v1.10.0 h1:FfGp9w0cYnaKZJhUOMqCOJCYT/WlvYBfTQhFWV3sRKI= +cloud.google.com/go/workflows v1.10.0/go.mod h1:fZ8LmRmZQWacon9UCX1r/g/DfAXx5VcPALq2CxzdePw= +collectd.org v0.3.0 h1:iNBHGw1VvPJxH2B6RiFWFZ+vsjo1lCdRszBeOuwGi00= collectd.org v0.3.0/go.mod h1:A/8DzQBkF6abtvrT2j/AU/4tiBgJWYyh0y/oB/4MlWE= -contrib.go.opencensus.io/exporter/aws v0.0.0-20181029163544-2befc13012d0/go.mod h1:uu1P0UCM/6RbsMrgPa98ll8ZcHM858i/AD06a9aLRCA= -contrib.go.opencensus.io/exporter/ocagent v0.5.0/go.mod h1:ImxhfLRpxoYiSq891pBrLVhN+qmP8BTVvdH2YLs7Gl0= -contrib.go.opencensus.io/exporter/stackdriver v0.12.1/go.mod h1:iwB6wGarfphGGe/e5CWqyUk/cLzKnWsOKPVW3no6OTw= -contrib.go.opencensus.io/exporter/stackdriver v0.13.4/go.mod h1:aXENhDJ1Y4lIg4EUaVTwzvYETVNZk10Pu26tevFKLUc= -contrib.go.opencensus.io/integrations/ocsql v0.1.4/go.mod h1:8DsSdjz3F+APR+0z0WkU1aRorQCFfRxvqjUUPMbF3fE= -contrib.go.opencensus.io/resource v0.1.1/go.mod h1:F361eGI91LCmW1I/Saf+rX0+OFcigGlFvXwEGEnkRLA= -cosmossdk.io/api v0.2.6 h1:AoNwaLLapcLsphhMK6+o0kZl+D6MMUaHVqSdwinASGU= -cosmossdk.io/api v0.2.6/go.mod h1:u/d+GAxil0nWpl1XnQL8nkziQDIWuBDhv8VnDm/s6dI= +cosmossdk.io/api v0.3.1 h1:NNiOclKRR0AOlO4KIqeaG6PS6kswOMhHD0ir0SscNXE= +cosmossdk.io/api v0.3.1/go.mod h1:DfHfMkiNA2Uhy8fj0JJlOCYOBp4eWUUJ1te5zBGNyIw= cosmossdk.io/core v0.5.1 h1:vQVtFrIYOQJDV3f7rw4pjjVqc1id4+mE0L9hHP66pyI= cosmossdk.io/core v0.5.1/go.mod h1:KZtwHCLjcFuo0nmDc24Xy6CRNEL9Vl/MeimQ2aC7NLE= cosmossdk.io/depinject v1.0.0-alpha.3 h1:6evFIgj//Y3w09bqOUOzEpFj5tsxBqdc5CfkO7z+zfw= cosmossdk.io/depinject v1.0.0-alpha.3/go.mod h1:eRbcdQ7MRpIPEM5YUJh8k97nxHpYbc3sMUnEtt8HPWU= -cosmossdk.io/math v1.0.0-beta.4/go.mod h1:An0MllWJY6PxibUpnwGk8jOm+a/qIxlKmL5Zyp9NnaM= +cosmossdk.io/errors v1.0.0-beta.7 h1:gypHW76pTQGVnHKo6QBkb4yFOJjC+sUGRc5Al3Odj1w= +cosmossdk.io/errors v1.0.0-beta.7/go.mod h1:mz6FQMJRku4bY7aqS/Gwfcmr/ue91roMEKAmDUDpBfE= +cosmossdk.io/log v1.1.0 h1:v0ogPHYeTzPcBTcPR1A3j1hkei4pZama8kz8LKlCMv0= +cosmossdk.io/log v1.1.0/go.mod h1:6zjroETlcDs+mm62gd8Ig7mZ+N+fVOZS91V17H+M4N4= +cosmossdk.io/math v1.0.1 h1:Qx3ifyOPaMLNH/89WeZFH268yCvU4xEcnPLu3sJqPPg= +cosmossdk.io/math v1.0.1/go.mod h1:Ygz4wBHrgc7g0N+8+MrnTfS9LLn9aaTGa9hKopuym5k= +cosmossdk.io/simapp v0.0.0-20230224204036-a6adb0821462 h1:g8muUHnXL8vhld2Sjilyhb1UQObc+x9GVuDK43TYZns= +cosmossdk.io/simapp v0.0.0-20230224204036-a6adb0821462/go.mod h1:4Dd3NLoLYoN90kZ0uyHoTHzVVk9+J0v4HhZRBNTAq2c= +cosmossdk.io/simapp v0.0.0-20230323161446-0af178d721ff h1:P1ialzTepD1oxdNPYc5N8Eggq3RdejZq3cJs8YYMs9Y= +cosmossdk.io/simapp v0.0.0-20230323161446-0af178d721ff/go.mod h1:AKzx6Mb544LjJ9RHmGFHjY9rEOLiUAi8I0F727TR0dY= +cosmossdk.io/tools/rosetta v0.2.1 h1:ddOMatOH+pbxWbrGJKRAawdBkPYLfKXutK9IETnjYxw= +cosmossdk.io/tools/rosetta v0.2.1/go.mod h1:Pqdc1FdvkNV3LcNIkYWt2RQY6IP1ge6YWZk8MhhO9Hw= +dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9 h1:VpgP7xuJadIUuKccphEpTJnWhS2jkQyMt6Y7pJCD7fY= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -filippo.io/edwards25519 v1.0.0-beta.2/go.mod h1:X+pm78QAUPtFLi1z9PYIlS/bdDnvbCOGKtZ+ACWEf7o= -filippo.io/edwards25519 v1.0.0-rc.1 h1:m0VOOB23frXZvAOK44usCgLWvtsxIoMCTBGJZlpmGfU= filippo.io/edwards25519 v1.0.0-rc.1/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns= -git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg= -git.apache.org/thrift.git v0.12.0/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg= +filippo.io/edwards25519 v1.0.0 h1:0wAIcmJUqRdI8IJ/3eGi5/HwXZWPujYXXlkrQogz0Ek= +filippo.io/edwards25519 v1.0.0/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns= +git.sr.ht/~sircmpwn/getopt v0.0.0-20191230200459-23622cc906b3 h1:4wDp4BKF7NQqoh73VXpZsB/t1OEhDpz/zEpmdQfbjDk= git.sr.ht/~sircmpwn/getopt v0.0.0-20191230200459-23622cc906b3/go.mod h1:wMEGFFFNuPos7vHmWXfszqImLppbc0wEhh6JBfJIUgw= +git.sr.ht/~sircmpwn/go-bare v0.0.0-20210406120253-ab86bc2846d9 h1:Ahny8Ud1LjVMMAlt8utUFKhhxJtwBAualvsbc/Sk7cE= git.sr.ht/~sircmpwn/go-bare v0.0.0-20210406120253-ab86bc2846d9/go.mod h1:BVJwbDfVjCjoFiKrhkei6NdGcZYpkDkdyCdg1ukytRA= github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 h1:/vQbFIOMbk2FiG/kXiLl8BRyzTWDw7gX/Hz7Dd5eDMs= github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4/go.mod h1:hN7oaIRCjzsZ2dE+yG5k+rsdt3qcwykqK6HVGcKwsw4= -github.com/99designs/keyring v1.1.6/go.mod h1:16e0ds7LGQQcT59QqkTg72Hh5ShM51Byv5PEmW6uoRU= -github.com/99designs/keyring v1.2.1 h1:tYLp1ULvO7i3fI5vE21ReQuj99QFSs7lGm0xWyJo87o= -github.com/99designs/keyring v1.2.1/go.mod h1:fc+wB5KTk9wQ9sDx0kFXB3A0MaeGHM9AwRStKOQ5vOA= +github.com/Abirdcfly/dupword v0.0.7 h1:z14n0yytA3wNO2gpCD/jVtp/acEXPGmYu0esewpBt6Q= github.com/Abirdcfly/dupword v0.0.7/go.mod h1:K/4M1kj+Zh39d2aotRwypvasonOyAMH1c/IZJzE0dmk= -github.com/AdaLogics/go-fuzz-headers v0.0.0-20210715213245-6c3934b029d8/go.mod h1:CzsSbkDixRphAF5hS6wbMKq0eI6ccJRb7/A0M6JBnwg= -github.com/AkihiroSuda/containerd-fuse-overlayfs v1.0.0/go.mod h1:0mMDvQFeLbbn1Wy8P2j3hwFhqBq+FKn8OZPno8WLmp8= -github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8= +github.com/Antonboom/errname v0.1.7 h1:mBBDKvEYwPl4WFFNwec1CZO096G6vzK9vvDQzAwkako= github.com/Antonboom/errname v0.1.7/go.mod h1:g0ONh16msHIPgJSGsecu1G/dcF2hlYR/0SddnIAGavU= +github.com/Antonboom/nilnil v0.1.1 h1:PHhrh5ANKFWRBh7TdYmyyq2gyT2lotnvFvvFbylF81Q= github.com/Antonboom/nilnil v0.1.1/go.mod h1:L1jBqoWM7AOeTD+tSquifKSesRHs4ZdaxvZR+xdJEaI= -github.com/Azure/azure-amqp-common-go/v2 v2.1.0/go.mod h1:R8rea+gJRuJR6QxTir/XuEd+YuKoUiazDC/N96FiDEU= -github.com/Azure/azure-pipeline-go v0.2.1/go.mod h1:UGSo8XybXnIGZ3epmeBw7Jdz+HiUVpqIlpz/HKHylF4= -github.com/Azure/azure-pipeline-go v0.2.2/go.mod h1:4rQ/NZncSvGqNkkOsNpOU1tgoNuIlp9AfUH5G1tvCHc= -github.com/Azure/azure-sdk-for-go v16.2.1+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= -github.com/Azure/azure-sdk-for-go v19.1.1+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= -github.com/Azure/azure-sdk-for-go v29.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= -github.com/Azure/azure-sdk-for-go v30.1.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= -github.com/Azure/azure-sdk-for-go v35.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= -github.com/Azure/azure-sdk-for-go v38.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= -github.com/Azure/azure-sdk-for-go v42.3.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= -github.com/Azure/azure-sdk-for-go/sdk/azcore v0.19.0/go.mod h1:h6H6c8enJmmocHUbLiiGY6sx7f9i+X3m1CHdd5c6Rdw= +github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.1 h1:qoVeMsc9/fh/yhxVaA0obYjVH/oI/ihrOoMwsLS9KSA= github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.1/go.mod h1:fBF9PQNqB8scdgpZ3ufzaLntG0AG7C1WjPMsiFOmfHM= -github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.11.0/go.mod h1:HcM1YX14R7CJcghJGOYCgdezslRSVzqwLf/q+4Y2r/0= -github.com/Azure/azure-sdk-for-go/sdk/internal v0.7.0/go.mod h1:yqy467j36fJxcRV2TzfVZ1pCb5vxm4BtZPUdYWe/Xo8= +github.com/Azure/azure-sdk-for-go/sdk/internal v0.8.3 h1:E+m3SkZCN0Bf5q7YdTs5lSm2CYY3CK4spn5OmUIiQtk= github.com/Azure/azure-sdk-for-go/sdk/internal v0.8.3/go.mod h1:KLF4gFr6DcKFZwSuH8w8yEK6DpFl3LP5rhdvAb7Yz5I= +github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.3.0 h1:Px2UA+2RvSSvv+RvJNuUB6n7rs5Wsel4dXLe90Um2n4= github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.3.0/go.mod h1:tPaiy8S5bQ+S5sOiDlINkp7+Ef339+Nz5L5XO+cnOHo= -github.com/Azure/azure-service-bus-go v0.9.1/go.mod h1:yzBx6/BUGfjfeqbRZny9AQIbIe3AcV9WZbAdpkoXOa0= -github.com/Azure/azure-storage-blob-go v0.7.0/go.mod h1:f9YQKtsG1nMisotuTPpO0tjNuEjKRYAcJU8/ydDI++4= -github.com/Azure/azure-storage-blob-go v0.8.0/go.mod h1:lPI3aLPpuLTeUwh1sViKXFxwl2B6teiRqI0deQUvsw0= -github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= -github.com/Azure/go-ansiterm v0.0.0-20210608223527-2377c96fe795/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= -github.com/Azure/go-autorest v10.8.1+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= -github.com/Azure/go-autorest v10.15.5+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= -github.com/Azure/go-autorest v12.0.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= -github.com/Azure/go-autorest v14.1.1+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= -github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= -github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI= -github.com/Azure/go-autorest/autorest v0.9.3/go.mod h1:GsRuLYvwzLjjjRoWEIyMUaYq8GNUx2nRB378IPt/1p0= -github.com/Azure/go-autorest/autorest v0.9.6/go.mod h1:/FALq9T/kS7b5J5qsQ+RSTUdAmGFqi0vUdVNNx8q630= -github.com/Azure/go-autorest/autorest v0.10.2/go.mod h1:/FALq9T/kS7b5J5qsQ+RSTUdAmGFqi0vUdVNNx8q630= -github.com/Azure/go-autorest/autorest v0.11.1/go.mod h1:JFgpikqFJ/MleTTxwepExTKnFUKKszPS8UavbQYUMuw= -github.com/Azure/go-autorest/autorest v0.11.18/go.mod h1:dSiJPy22c3u0OtOKDNttNgqpNFY/GeWa7GH/Pz56QRA= -github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0= -github.com/Azure/go-autorest/autorest/adal v0.8.0/go.mod h1:Z6vX6WXXuyieHAXwMj0S6HY6e6wcHn37qQMBQlvY3lc= -github.com/Azure/go-autorest/autorest/adal v0.8.1/go.mod h1:ZjhuQClTqx435SRJ2iMlOxPYt3d2C/T/7TiQCVZSn3Q= -github.com/Azure/go-autorest/autorest/adal v0.8.2/go.mod h1:ZjhuQClTqx435SRJ2iMlOxPYt3d2C/T/7TiQCVZSn3Q= -github.com/Azure/go-autorest/autorest/adal v0.8.3/go.mod h1:ZjhuQClTqx435SRJ2iMlOxPYt3d2C/T/7TiQCVZSn3Q= -github.com/Azure/go-autorest/autorest/adal v0.9.0/go.mod h1:/c022QCutn2P7uY+/oQWWNcK9YU+MH96NgK+jErpbcg= -github.com/Azure/go-autorest/autorest/adal v0.9.5/go.mod h1:B7KF7jKIeC9Mct5spmyCB/A8CG/sEz1vwIRGv/bbw7A= -github.com/Azure/go-autorest/autorest/adal v0.9.13/go.mod h1:W/MM4U6nLxnIskrw4UwWzlHfGjwUS50aOsc/I3yuU8M= -github.com/Azure/go-autorest/autorest/azure/auth v0.4.2/go.mod h1:90gmfKdlmKgfjUpnCEpOJzsUEjrWDSLwHIG73tSXddM= -github.com/Azure/go-autorest/autorest/azure/cli v0.3.1/go.mod h1:ZG5p860J94/0kI9mNJVoIoLgXcirM2gF5i2kWloofxw= -github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA= -github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod h1:vcORJHLJEh643/Ioh9+vPmf1Ij9AEBM5FuBIXLmIy0g= -github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod h1:BI0uouVdmngYNUzGWeSYnokU+TrmwEsOqdt8Y6sso74= -github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= -github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= -github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod h1:a8FDP3DYzQ4RYfVAxAN3SVSiiO77gL2j2ronKKP0syM= -github.com/Azure/go-autorest/autorest/mocks v0.4.0/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k= -github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k= -github.com/Azure/go-autorest/autorest/to v0.2.0/go.mod h1:GunWKJp1AEqgMaGLV+iocmRAJWqST1wQYhyyjXJ3SJc= -github.com/Azure/go-autorest/autorest/to v0.3.0/go.mod h1:MgwOyqaIuKdG4TL/2ywSsIWKAfJfgHDo8ObuUk3t5sA= -github.com/Azure/go-autorest/autorest/validation v0.1.0/go.mod h1:Ha3z/SqBeaalWQvokg3NZAlQTalVMtOIAs1aGK7G6u8= -github.com/Azure/go-autorest/autorest/validation v0.2.0/go.mod h1:3EEqHnBxQGHXRYq3HT1WyXAvT7LLY3tl70hw6tQIbjI= -github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc= -github.com/Azure/go-autorest/logger v0.2.0/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= -github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= -github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk= -github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/BurntSushi/toml v0.4.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= -github.com/BurntSushi/toml v1.2.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= +github.com/BurntSushi/toml v1.2.1 h1:9F2/+DoOYIOksmaJFPw1tGFy1eDnIJXg+UHjuD8lTak= github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= +github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802 h1:1BDTz0u9nC3//pOCMdNH+CiXJVYJh5UQNCOBG7jbELc= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d h1:nalkkPQcITbvhmL4+C4cKA87NW0tfm3Kl9VXRoPywFg= github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d/go.mod h1:URdX5+vg25ts3aCh8H5IFZybJYKWhJHYMTnf+ULtoC4= -github.com/CloudyKit/fastprinter v0.0.0-20170127035650-74b38d55f37a/go.mod h1:EFZQ978U7x8IRnstaskI3IysnWY5Ao3QgZUKOXlsAdw= -github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53/go.mod h1:+3IMCy2vIlbG1XG/0ggNQv0SvxCAIpPM5b1nCz56Xno= -github.com/CloudyKit/jet v2.1.3-0.20180809161101-62edd43e4f88+incompatible/go.mod h1:HPYO+50pSWkPoj9Q/eq0aRGByCL6ScRlUmiEX5Zgm+w= -github.com/CloudyKit/jet/v3 v3.0.0/go.mod h1:HKQPgSJmdK8hdoAbKUUWajkHyHo4RaU5rMdUywE7VMo= -github.com/CloudyKit/jet/v6 v6.1.0/go.mod h1:d3ypHeIRNo2+XyqnGA8s+aphtcVpjP5hPwP/Lzo7Ro4= -github.com/CosmWasm/wasmvm v1.2.3 h1:OKYlobwmVGbl0eSn0mXoAAjE5hIuXnQCLPjbNd91sVY= -github.com/CosmWasm/wasmvm v1.2.3/go.mod h1:vW/E3h8j9xBQs9bCoijDuawKo9kCtxOaS8N8J7KFtkc= +github.com/CosmWasm/wasmvm v1.2.4 h1:6OfeZuEcEH/9iqwrg2pkeVtDCkMoj9U6PpKtcrCyVrQ= +github.com/CosmWasm/wasmvm v1.2.4/go.mod h1:vW/E3h8j9xBQs9bCoijDuawKo9kCtxOaS8N8J7KFtkc= +github.com/DATA-DOG/go-sqlmock v1.3.3 h1:CWUqKXe0s8A2z6qCgkP4Kru7wC11YoAnoupUKFDnH08= github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= -github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= +github.com/DataDog/datadog-go v3.2.0+incompatible h1:qSG2N4FghB1He/r2mFrWKCaL7dXCilEuNEeAn20fdD4= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= -github.com/DataDog/zstd v1.4.1/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= -github.com/DataDog/zstd v1.4.5/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= github.com/DataDog/zstd v1.5.0 h1:+K/VEwIAaPcHiMtQvpLD4lqW7f0Gk3xdYZmI1hD+CXo= github.com/DataDog/zstd v1.5.0/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= -github.com/Djarvur/go-err113 v0.0.0-20200410182137-af658d038157/go.mod h1:4UJr5HIiMZrwgkSPdsjy2uOQExX/WEILpIrO9UPGuXs= +github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 h1:sHglBQTwgx+rWPdisA5ynNEsoARbiCBOyGcJM4/OzsM= github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24/go.mod h1:4UJr5HIiMZrwgkSPdsjy2uOQExX/WEILpIrO9UPGuXs= -github.com/Djarvur/go-err113 v0.1.0/go.mod h1:4UJr5HIiMZrwgkSPdsjy2uOQExX/WEILpIrO9UPGuXs= -github.com/Ethernal-Tech/admin-module v0.0.0-20221102105340-e693f4d379c3 h1:NGYbosBJuYAKLhPC1Sb2aoqS8vViuOeGQ9upOnsqDlU= -github.com/Ethernal-Tech/admin-module v0.0.0-20221102105340-e693f4d379c3/go.mod h1:y18nJoc1Cm4TwN+bWWO7N1vpg2uA4kbJX+oVkMC2ibk= +github.com/GaijinEntertainment/go-exhaustruct/v2 v2.3.0 h1:+r1rSv4gvYn0wmRjC8X7IAzX8QezqtFV9m0MUHFJgts= github.com/GaijinEntertainment/go-exhaustruct/v2 v2.3.0/go.mod h1:b3g59n2Y+T5xmcxJL+UEG2f8cQploZm1mR/v6BW0mU0= -github.com/GoogleCloudPlatform/cloudsql-proxy v0.0.0-20191009163259-e802c2cb94ae/go.mod h1:mjwGPas4yKduTyubHvD1Atl9r1rUq8DfVy+gkVvZ+oo= -github.com/GoogleCloudPlatform/k8s-cloud-provider v0.0.0-20190822182118-27a4ced34534/go.mod h1:iroGtC8B3tQiqtds1l+mgk/BBOrxbqjH+eUfFQYRc14= -github.com/HdrHistogram/hdrhistogram-go v1.1.0/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo= github.com/HdrHistogram/hdrhistogram-go v1.1.2 h1:5IcZpTvzydCQeHzK4Ef/D5rrSqwxob0t8PQPMybUNFM= github.com/HdrHistogram/hdrhistogram-go v1.1.2/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo= -github.com/Joker/hpp v1.0.0/go.mod h1:8x5n+M1Hp5hC0g8okX3sR3vFQwynaX/UgSOM9MeBKzY= -github.com/Joker/jade v1.0.1-0.20190614124447-d475f43051e7/go.mod h1:6E6s8o2AE4KhCrqr6GRJjdC/gNfTdxkIXvuGZZda2VM= +github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible h1:1G1pk05UrOh0NlF1oeaaix1x8XzrfjIDK47TY0Zehcw= github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= -github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= -github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= +github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww= github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= -github.com/Masterminds/semver/v3 v3.0.3/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= -github.com/Masterminds/semver/v3 v3.1.0/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= +github.com/Masterminds/semver/v3 v3.2.0 h1:3MEsd0SM6jqZojhjLWWeBY+Kcjy9i6MQAeY7YgDP83g= github.com/Masterminds/semver/v3 v3.2.0/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ= -github.com/Masterminds/sprig v2.15.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o= -github.com/Masterminds/sprig v2.22.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o= -github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA= -github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA= -github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw= -github.com/Microsoft/go-winio v0.4.15-0.20200908182639-5b44b70ab3ab/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw= -github.com/Microsoft/go-winio v0.4.15/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw= -github.com/Microsoft/go-winio v0.4.16-0.20201130162521-d1ffc52c7331/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugXOPRXwdLnMv0= -github.com/Microsoft/go-winio v0.4.16/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugXOPRXwdLnMv0= -github.com/Microsoft/go-winio v0.4.17-0.20210211115548-6eac466e5fa3/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= -github.com/Microsoft/go-winio v0.4.17-0.20210324224401-5516f17a5958/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= -github.com/Microsoft/go-winio v0.4.17/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= -github.com/Microsoft/go-winio v0.5.1/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= -github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY= github.com/Microsoft/go-winio v0.6.0 h1:slsWYD/zyx7lCXoZVlvQrj0hPTM1HI4+v1sIda2yDvg= github.com/Microsoft/go-winio v0.6.0/go.mod h1:cTAf44im0RAYeL23bpB+fzCyDH2MJiz2BO69KH/soAE= -github.com/Microsoft/hcsshim v0.8.6/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg= -github.com/Microsoft/hcsshim v0.8.7-0.20190325164909-8abdbb8205e4/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg= -github.com/Microsoft/hcsshim v0.8.7/go.mod h1:OHd7sQqRFrYd3RmSgbgji+ctCwkbq2wbEYNSzOYtcBQ= -github.com/Microsoft/hcsshim v0.8.9/go.mod h1:5692vkUqntj1idxauYlpoINNKeqCiG6Sg38RRsjT5y8= -github.com/Microsoft/hcsshim v0.8.10/go.mod h1:g5uw8EV2mAlzqe94tfNBNdr89fnbD/n3HV0OhsddkmM= -github.com/Microsoft/hcsshim v0.8.14/go.mod h1:NtVKoYxQuTLx6gEq0L96c9Ju4JbRJ4nY2ow3VK6a9Lg= -github.com/Microsoft/hcsshim v0.8.15/go.mod h1:x38A4YbHbdxJtc0sF6oIz+RG0npwSCAvn69iY6URG00= -github.com/Microsoft/hcsshim v0.8.16/go.mod h1:o5/SZqmR7x9JNKsW3pu+nqHm0MF8vbA+VxGOoXdC600= -github.com/Microsoft/hcsshim v0.8.20/go.mod h1:+w2gRZ5ReXQhFOrvSQeNfhrYB/dg3oDwTOcER2fw4I4= -github.com/Microsoft/hcsshim v0.8.21/go.mod h1:+w2gRZ5ReXQhFOrvSQeNfhrYB/dg3oDwTOcER2fw4I4= -github.com/Microsoft/hcsshim v0.8.23/go.mod h1:4zegtUJth7lAvFyc6cH2gGQ5B3OFQim01nnU2M8jKDg= -github.com/Microsoft/hcsshim v0.9.2/go.mod h1:7pLA8lDk46WKDWlVsENo92gC0XFa8rbKfyFRBqxEbCc= -github.com/Microsoft/hcsshim v0.9.4/go.mod h1:7pLA8lDk46WKDWlVsENo92gC0XFa8rbKfyFRBqxEbCc= -github.com/Microsoft/hcsshim/test v0.0.0-20200826032352-301c83a30e7c/go.mod h1:30A5igQ91GEmhYJF8TaRP79pMBOYynRsyOByfVV0dU4= -github.com/Microsoft/hcsshim/test v0.0.0-20201218223536-d3e5debf77da/go.mod h1:5hlzMzRKMLyo42nCZ9oml8AdTlq/0cvIaBv6tK1RehU= -github.com/Microsoft/hcsshim/test v0.0.0-20210227013316-43a75bb4edd3/go.mod h1:mw7qgWloBUl75W/gVH3cQszUg1+gUITj7D6NY7ywVnY= -github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= -github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c= github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 h1:TngWCqHvy9oXAN6lEVMRuU21PR1EtLVZJmdB18Gu3Rw= github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk= github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= -github.com/OpenPeeDeeP/depguard v1.0.1/go.mod h1:xsIw86fROiiwelg+jB2uM9PiKihMMmUx/1V+TNhjQvM= +github.com/OpenPeeDeeP/depguard v1.1.1 h1:TSUznLjvp/4IUP+OQ0t/4jF4QUyxIcVX8YnghZdunyA= github.com/OpenPeeDeeP/depguard v1.1.1/go.mod h1:JtAMzWkmFEzDPyAd+W0NHl1lvpQKTvT9jnRVsohBKpc= +github.com/ProtonMail/go-crypto v0.0.0-20221026131551-cf6655e29de4 h1:ra2OtmuW0AE5csawV4YXMNGNQQXvLRps3z2Z59OPO+I= github.com/ProtonMail/go-crypto v0.0.0-20221026131551-cf6655e29de4/go.mod h1:UBYPn8k0D56RtnR8RFQMjmh4KrZzWJ5o7Z9SYjossQ8= -github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= -github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= -github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= -github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= -github.com/Shopify/goreferrer v0.0.0-20181106222321-ec9c9a553398/go.mod h1:a1uqRtAwp2Xwc6WNPJEufxJ7fx3npB4UV/JOLmbu5I0= -github.com/Shopify/goreferrer v0.0.0-20220729165902-8cddb4f5de06/go.mod h1:7erjKLwalezA0k99cWs5L11HWOAPNjdUZ6RxH1BXbbM= -github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ= +github.com/Shopify/sarama v1.19.0 h1:9oksLxC6uxVPHPVYUmq6xhr1BOF/hHobWH2UzO67z1s= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= +github.com/Shopify/toxiproxy v2.1.4+incompatible h1:TKdv8HiTLgE5wdJuEML90aBgNWsokNbMijUGhmcoBJc= github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= +github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6 h1:fLjPD/aNc3UIOA6tDi6QXUemppXK3P9BI7mr2hd6gx8= github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= -github.com/VictoriaMetrics/fastcache v1.5.7/go.mod h1:ptDBkNMQI4RtmVo8VS/XwRY6RoTu1dAWCbrk+6WsEM8= +github.com/VictoriaMetrics/fastcache v1.6.0 h1:C/3Oi3EiBCqufydp1neRZkqcwmEiuRT9c3fqvvgKm5o= github.com/VictoriaMetrics/fastcache v1.6.0/go.mod h1:0qHz5QP0GMX4pfmMA/zt5RgfNuXJrTP0zS7DqpHGGTw= github.com/VividCortex/gohistogram v1.0.0 h1:6+hBz+qvs0JOrrNhhmR7lFxo5sINxBCGXrdtl/UvroE= github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= -github.com/Workiva/go-datastructures v1.0.52/go.mod h1:Z+F2Rca0qCsVYDS8z7bAGm8f3UkzuWYS/oBZz5a7VVA= -github.com/Workiva/go-datastructures v1.0.53 h1:J6Y/52yX10Xc5JjXmGtWoSSxs3mZnGSaq37xZZh7Yig= -github.com/Workiva/go-datastructures v1.0.53/go.mod h1:1yZL+zfsztete+ePzZz/Zb1/t5BnDuE2Ya2MMGhzP6A= +github.com/Zilliqa/gozilliqa-sdk v1.2.1-0.20201201074141-dd0ecada1be6 h1:1d9pzdbkth4D9AX6ndKSl7of3UTV0RYl3z64U2dXMGo= github.com/Zilliqa/gozilliqa-sdk v1.2.1-0.20201201074141-dd0ecada1be6/go.mod h1:eSYp2T6f0apnuW8TzhV3f6Aff2SE8Dwio++U4ha4yEM= +github.com/acomagu/bufpipe v1.0.3 h1:fxAGrHZTgQ9w5QqVItgzwj235/uYZYgbXitB+dLupOk= github.com/acomagu/bufpipe v1.0.3/go.mod h1:mxdxdup/WdsKVreO5GpW4+M/1CE2sMG4jeGJ2sYmHc4= github.com/adlio/schema v1.3.3 h1:oBJn8I02PyTB466pZO1UZEn1TV5XLlifBSyMrmHl/1I= github.com/adlio/schema v1.3.3/go.mod h1:1EsRssiv9/Ce2CMzq5DoL7RiMshhuigQxrR4DMV9fHg= +github.com/aead/siphash v1.0.1 h1:FwHfE/T45KPKYuuSAKyyvE+oPWcaQ+CUmFW0bPlM+kg= github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII= +github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5 h1:rFw4nCn9iMW+Vajsk51NtYIcwSTkXr+JGrMd36kTDJw= github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c= -github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= -github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= +github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af h1:wVe6/Ea46ZMeNkQjjBW6xcqyQA/j5e0D6GytH95g0gQ= github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw= -github.com/alecthomas/kingpin v2.2.6+incompatible/go.mod h1:59OFYbFVLKQKq+mqrL6Rw5bR0c3ACQaawgXx0QYndlE= +github.com/alecthomas/kingpin/v2 v2.3.2 h1:H0aULhgmSzN8xQ3nX1uxtdlTHYoPLu5AhHxWrKI6ocU= +github.com/alecthomas/kingpin/v2 v2.3.2/go.mod h1:0gyi0zQnjuFk8xrkNKamJoyUo382HRL7ATRpFZCw6tE= github.com/alecthomas/participle/v2 v2.0.0-alpha7 h1:cK4vjj0VSgb3lN1nuKA5F7dw+1s1pWBe5bx7nNCnN+c= github.com/alecthomas/participle/v2 v2.0.0-alpha7/go.mod h1:NumScqsC42o9x+dGj8/YqsIfhrIQjFEOFovxotbBirA= -github.com/alecthomas/repr v0.0.0-20181024024818-d37bc2a10ba1/go.mod h1:xTS7Pm1pD1mvyM075QCDSRqH6qRLXylzS24ZTpRiSzQ= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafoB+tBA3gMyHYHrpOtNuDiK/uB5uXxq5wM= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= -github.com/alexflint/go-filemutex v0.0.0-20171022225611-72bdc8eae2ae/go.mod h1:CgnQgUtFrFz9mxFNtED3jI5tLDjKlOM+oUF/sTk6ps0= -github.com/alexflint/go-filemutex v1.1.0/go.mod h1:7P4iRhttt/nUvUOrYIhcpMzv2G6CY9UnI16Z+UJqRyk= +github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 h1:s6gZFSlWYmbqAuRjVTiNNhvNRfY2Wxp9nhfyel4rklc= +github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE= +github.com/alexkohler/prealloc v1.0.0 h1:Hbq0/3fJPQhNkN0dR95AVrr6R7tou91y0uHG5pOcUuw= github.com/alexkohler/prealloc v1.0.0/go.mod h1:VetnK3dIgFBBKmg0YnD9F9x6Icjd+9cvfHR56wJVlKE= +github.com/alingse/asasalint v0.0.11 h1:SFwnQXJ49Kx/1GghOFz1XGqHYKp21Kq1nHad/0WQRnw= github.com/alingse/asasalint v0.0.11/go.mod h1:nCaoMhw7a9kSJObvQyVzNTPBDbNpdocqrSP7t/cW5+I= +github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156 h1:eMwmnE/GDgah4HI848JfFxHt+iPb26b4zyfspmqY0/8= github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM= +github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883 h1:bvNMNQO63//z+xNgfBlViaCIJKLlCJ6/fmUseuG0wVQ= github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8= -github.com/andybalholm/brotli v1.0.2/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y= -github.com/andybalholm/brotli v1.0.3/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= -github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= -github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= -github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4= -github.com/antihax/optional v0.0.0-20180407024304-ca021399b1a6/go.mod h1:V8iCPQYkqmusNa815XgQio277wI47sdRh1dUOLdyC6Q= +github.com/antihax/optional v1.0.0 h1:xK2lYat7ZLaVVcIuj82J8kIro4V6kDe0AUDFboUCwcg= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= -github.com/aokoli/goutils v1.0.1/go.mod h1:SijmP0QR8LtwsmDs8Yii5Z/S4trXFGFC2oO5g9DP+DQ= +github.com/apache/arrow/go/arrow v0.0.0-20191024131854-af6fa24be0db h1:nxAtV4VajJDhKysp2kdcJZsq8Ss1xSA0vZTkVHHJd0E= github.com/apache/arrow/go/arrow v0.0.0-20191024131854-af6fa24be0db/go.mod h1:VTxUBvSJ3s3eHAg65PNgrsn5BtqCRPdmyXh6rAfdxN0= github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= +github.com/apache/thrift v0.13.0 h1:5hryIiq9gtn+MiLVn0wP37kb/uTeRZgN08WoCsAhIhI= github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= -github.com/apex/log v1.1.4/go.mod h1:AlpoD9aScyQfJDVHmLMEcx4oU6LqzkWp4Mg9GdAcEvQ= -github.com/apex/log v1.3.0/go.mod h1:jd8Vpsr46WAe3EZSQ/IUMs2qQD/GOycT5rPWCO1yGcs= -github.com/apex/logs v0.0.4/go.mod h1:XzxuLZ5myVHDy9SAmYpamKKRNApGj54PfYLcFrXqDwo= -github.com/aphistic/golf v0.0.0-20180712155816-02c07f170c5a/go.mod h1:3NqKYiepwy8kCu4PNA+aP7WUV72eXWJeP9/r3/K9aLE= -github.com/aphistic/sweet v0.2.0/go.mod h1:fWDlIh/isSE9n6EPsRmC0det+whmX6dJid3stzu0Xys= -github.com/aristanetworks/goarista v0.0.0-20170210015632-ea17b1a17847/go.mod h1:D/tb0zPVXnP7fmsLZjtdUhSsumbK/ij54UXjjVgMGxQ= +github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e h1:QEF07wC0T1rKkctt1RINW/+RMTVmiwxETico2l3gxJA= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= -github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= +github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6 h1:G1bPvciwNyF7IUmKXNt9Ak3m6u9DE1rF+RmtIkBpVdA= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= -github.com/armon/go-metrics v0.3.9/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc= -github.com/armon/go-metrics v0.3.10/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc= -github.com/armon/go-metrics v0.4.0/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4= github.com/armon/go-metrics v0.4.1 h1:hR91U9KYmb6bLBYLQjyM+3j+rcd/UhE+G78SFnF8gJA= github.com/armon/go-metrics v0.4.1/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4= +github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310 h1:BUAU3CGlLvorLI26FmByPp2eC2qla6E1Tw+scpcg/to= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= +github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a h1:pv34s756C4pEXnjgPfGYgdhg/ZdajGhyOvzx8k+23nw= github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A= -github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= +github.com/ashanbrown/forbidigo v1.3.0 h1:VkYIwb/xxdireGAdJNZoo24O4lmnEWkactplBlWTShc= github.com/ashanbrown/forbidigo v1.3.0/go.mod h1:vVW7PEdqEFqapJe95xHkTfB1+XvZXBFg8t0sG2FIxmI= +github.com/ashanbrown/makezero v1.1.1 h1:iCQ87C0V0vSyO+M9E/FZYbu65auqH0lnsOkf5FcB28s= github.com/ashanbrown/makezero v1.1.1/go.mod h1:i1bJLCRSCHOcOa9Y6MyF2FTfMZMFdHvxKHxgO5Z1axI= +github.com/aws/aws-lambda-go v1.13.3 h1:SuCy7H3NLyp+1Mrfp+m80jcbi9KYWAs9/BXwppwRDzY= github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= -github.com/aws/aws-sdk-go v1.15.11/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0= -github.com/aws/aws-sdk-go v1.15.27/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0= -github.com/aws/aws-sdk-go v1.15.90/go.mod h1:es1KtYUFs7le0xQ3rOihkuoVD90z7D0fR2Qm4S00/gU= -github.com/aws/aws-sdk-go v1.16.26/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.19.18/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.19.45/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.20.6/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.23.20/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.25.11/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.25.37/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.25.48/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.27.1/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.31.6/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= -github.com/aws/aws-sdk-go v1.36.30/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= -github.com/aws/aws-sdk-go v1.40.45/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q= +github.com/aws/aws-sdk-go v1.44.122/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= +github.com/aws/aws-sdk-go v1.44.203 h1:pcsP805b9acL3wUqa4JR2vg1k2wnItkDYNvfmcy6F+U= +github.com/aws/aws-sdk-go v1.44.203/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= github.com/aws/aws-sdk-go-v2 v1.2.0/go.mod h1:zEQs02YRBw1DjK0PoJv3ygDYOFTre1ejlJWl8FwAuQo= +github.com/aws/aws-sdk-go-v2 v1.9.1 h1:ZbovGV/qo40nrOJ4q8G33AGICzaPI45FHQWJ9650pF4= github.com/aws/aws-sdk-go-v2 v1.9.1/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= +github.com/aws/aws-sdk-go-v2/config v1.1.1 h1:ZAoq32boMzcaTW9bcUacBswAmHTbvlvDJICgHFZuECo= github.com/aws/aws-sdk-go-v2/config v1.1.1/go.mod h1:0XsVy9lBI/BCXm+2Tuvt39YmdHwS5unDQmxZOYe8F5Y= +github.com/aws/aws-sdk-go-v2/credentials v1.1.1 h1:NbvWIM1Mx6sNPTxowHgS2ewXCRp+NGTzUYb/96FZJbY= github.com/aws/aws-sdk-go-v2/credentials v1.1.1/go.mod h1:mM2iIjwl7LULWtS6JCACyInboHirisUUdkBPoTHMOUo= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.0.2 h1:EtEU7WRaWliitZh2nmuxEXrN0Cb8EgPUFGIoTMeqbzI= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.0.2/go.mod h1:3hGg3PpiEjHnrkrlasTfxFqUsZ2GCk/fMUn4CbKgSkM= +github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.8.1 h1:w/fPGB0t5rWwA43mux4e9ozFSH5zF1moQemlA131PWc= github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.8.1/go.mod h1:CM+19rL1+4dFWnOQKwDc7H1KwXTz+h61oUSHyhV0b3o= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.0.2 h1:4AH9fFjUlVktQMznF+YN33aWNXaR4VgDXyP28qokJC0= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.0.2/go.mod h1:45MfaXZ0cNbeuT0KQ1XJylq8A6+OpVV2E5kvY/Kq+u8= +github.com/aws/aws-sdk-go-v2/service/route53 v1.1.1 h1:cKr6St+CtC3/dl/rEBJvlk7A/IN5D5F02GNkGzfbtVU= github.com/aws/aws-sdk-go-v2/service/route53 v1.1.1/go.mod h1:rLiOUrPLW/Er5kRcQ7NkwbjlijluLsrIbu/iyl35RO4= +github.com/aws/aws-sdk-go-v2/service/sso v1.1.1 h1:37QubsarExl5ZuCBlnRP+7l1tNwZPBSTqpTBrPH98RU= github.com/aws/aws-sdk-go-v2/service/sso v1.1.1/go.mod h1:SuZJxklHxLAXgLTc1iFXbEWkXs7QRTQpCLGaKIprQW0= +github.com/aws/aws-sdk-go-v2/service/sts v1.1.1 h1:TJoIfnIFubCX0ACVeJ0w46HEH5MwjwYN4iFhuYIhfIY= github.com/aws/aws-sdk-go-v2/service/sts v1.1.1/go.mod h1:Wi0EBZwiz/K44YliU0EKxqTCJGUfYTWXrrBwkq736bM= github.com/aws/smithy-go v1.1.0/go.mod h1:EzMw8dbp/YJL4A5/sbhGddag+NPT7q084agLbB9LgIw= +github.com/aws/smithy-go v1.8.0 h1:AEwwwXQZtUwP5Mz506FeXXrKBe0jA8gVM+1gEcSRooc= github.com/aws/smithy-go v1.8.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= -github.com/aybabtme/rgbterm v0.0.0-20170906152045-cc83f3b3ce59/go.mod h1:q/89r3U2H7sSsE2t6Kca0lfwTK8JdoNGS/yzM/4iH5I= -github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= -github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g= -github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= +github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= -github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= -github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= +github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d h1:xDfNPAt8lFiC1UJrqV3uuy861HCTo708pDMbjHHdCas= +github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod h1:6QX/PXZ00z/TKoufEY6K/a0k6AhaJrQKdFe6OfVXsa4= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 h1:41iFGWnSlI2gVpmOtVTJZNodLdLQLn/KsJqFvXwnd/s= github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= -github.com/bitly/go-simplejson v0.5.0/go.mod h1:cXHtHw4XUPsvGaxgjIAn8PhEWG9NfngEKAMDJEczWVA= -github.com/bits-and-blooms/bitset v1.2.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA= -github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= -github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM= +github.com/bkielbasa/cyclop v1.2.0 h1:7Jmnh0yL2DjKfw28p86YTd/B4lRGcNuu12sKE35sM7A= github.com/bkielbasa/cyclop v1.2.0/go.mod h1:qOI0yy6A7dYC4Zgsa72Ppm9kONl0RoIlPbzot9mhmeI= -github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb/go.mod h1:PkYb9DJNAwrSvRx5DYA+gUcOIgTGVMNkfSCbZM8cWpI= -github.com/blang/semver v3.1.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= -github.com/blang/semver v3.5.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= -github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= -github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ= +github.com/blizzy78/varnamelen v0.8.0 h1:oqSblyuQvFsW1hbBHh1zfwrKe3kcSj0rnXkKzsQ089M= github.com/blizzy78/varnamelen v0.8.0/go.mod h1:V9TzQZ4fLJ1DSrjVDfl89H7aMnTvKkApdHeyESmyR7k= -github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4= +github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40 h1:y4B3+GPxKlrigF1ha5FFErxK+sr6sWxQovRMzwMhejo= github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40/go.mod h1:8rLXio+WjiTceGBHIoTvn60HIbs7Hm7bcHjyrSqYB9c= +github.com/boltdb/bolt v1.3.1 h1:JQmyP4ZBrce+ZQu0dY660FMfatumYDLun9hBCUVIkF4= github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps= -github.com/bombsimon/wsl/v2 v2.0.0/go.mod h1:mf25kr/SqFEPhhcxW1+7pxzGlW+hIl/hYTKY95VwV8U= -github.com/bombsimon/wsl/v2 v2.2.0/go.mod h1:Azh8c3XGEJl9LyX0/sFC+CKMc7Ssgua0g+6abzXN4Pg= -github.com/bombsimon/wsl/v3 v3.0.0/go.mod h1:st10JtZYLE4D5sC7b8xV4zTKZwAQjCH/Hy2Pm1FNZIc= -github.com/bombsimon/wsl/v3 v3.1.0/go.mod h1:st10JtZYLE4D5sC7b8xV4zTKZwAQjCH/Hy2Pm1FNZIc= +github.com/bombsimon/wsl/v3 v3.3.0 h1:Mka/+kRLoQJq7g2rggtgQsjuI/K5Efd87WX96EWFxjM= github.com/bombsimon/wsl/v3 v3.3.0/go.mod h1:st10JtZYLE4D5sC7b8xV4zTKZwAQjCH/Hy2Pm1FNZIc= -github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g= +github.com/breml/bidichk v0.2.3 h1:qe6ggxpTfA8E75hdjWPZ581sY3a2lnl0IRxLQFelECI= github.com/breml/bidichk v0.2.3/go.mod h1:8u2C6DnAy0g2cEq+k/A2+tr9O1s+vHGxWn0LTc70T2A= +github.com/breml/errchkjson v0.3.0 h1:YdDqhfqMT+I1vIxPSas44P+9Z9HzJwCeAzjB8PxP1xw= github.com/breml/errchkjson v0.3.0/go.mod h1:9Cogkyv9gcT8HREpzi3TiqBxCqDzo8awa92zSDFcofU= -github.com/bshuster-repo/logrus-logstash-hook v0.4.1/go.mod h1:zsTqEiSzDgAa/8GZR7E1qaXrhYNDKBYy5/dWPTIflbk= -github.com/btcsuite/btcd v0.22.2 h1:vBZ+lGGd1XubpOWO67ITJpAEsICWhA0YzqkcpkgNBfo= -github.com/btcsuite/btcd v0.22.2/go.mod h1:wqgTSL29+50LRkmOVknEdmt8ZojIzhuWvgu/iptuN7Y= +github.com/btcsuite/btcd v0.0.0-20190315201642-aa6e0f35703c/go.mod h1:DrZx5ec/dmnfpw9KyYoQyYo7d0KEvTkk/5M/vbZjAr8= +github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ= +github.com/btcsuite/btcd v0.21.0-beta.0.20201114000516-e9c7a5ac6401/go.mod h1:Sv4JPQ3/M+teHz9Bo5jBpkNcP0x6r7rdihlNL/7tTAs= +github.com/btcsuite/btcd v0.22.1 h1:CnwP9LM/M9xuRrGSCGeMVs9iv09uMqwsVX7EeIpgV2c= +github.com/btcsuite/btcd v0.22.1/go.mod h1:wqgTSL29+50LRkmOVknEdmt8ZojIzhuWvgu/iptuN7Y= github.com/btcsuite/btcd/btcec/v2 v2.1.2/go.mod h1:ctjw4H1kknNJmRN4iP1R7bTQ+v3GJkZBd6mui8ZsAZE= -github.com/btcsuite/btcd/btcec/v2 v2.1.3/go.mod h1:ctjw4H1kknNJmRN4iP1R7bTQ+v3GJkZBd6mui8ZsAZE= -github.com/btcsuite/btcd/btcec/v2 v2.2.1/go.mod h1:9/CSmJxmuvqzX9Wh2fXMWToLOHhPd11lSPuIupwTkI8= github.com/btcsuite/btcd/btcec/v2 v2.3.2 h1:5n0X6hX0Zk+6omWcihdYvdAlGf2DfasC0GMf7DClJ3U= github.com/btcsuite/btcd/btcec/v2 v2.3.2/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04= github.com/btcsuite/btcd/btcutil v1.1.2 h1:XLMbX8JQEiwMcYft2EGi8zPUkoa0abKIU6/BJSRsjzQ= @@ -727,564 +637,396 @@ github.com/btcsuite/btcd/btcutil v1.1.2/go.mod h1:UR7dsSJzJUfMmFiiLlIrMq1lS9jh9E github.com/btcsuite/btcd/chaincfg/chainhash v1.0.0/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc= github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U= github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc= +github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f h1:bAs4lUbRJpnnkd9VhRV3jjAVU7DJVjMaK+IsvSeZvFo= github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA= +github.com/btcsuite/btcutil v0.0.0-20190207003914-4c204d697803/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg= github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg= github.com/btcsuite/btcutil v1.0.2/go.mod h1:j9HUFwoQRsZL3V4n+qG+CUnEGHOarIxfC3Le2Yhbcts= +github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce h1:YtWJF7RHm2pYCvA5t0RPmAaLUhREsKuKd+SLhxFbFeQ= github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce/go.mod h1:0DVlHczLPewLcPGEIeUEzfOJhqGPQ0mJJRDBtD307+o= +github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd h1:R/opQEbFEy9JGkIguV40SvRY1uliPX8ifOvi6ICsFCw= github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd/go.mod h1:HHNXQzUsZCxOoE+CPiyCTO6x34Zs86zZUiwtpXoGdtg= +github.com/btcsuite/goleveldb v0.0.0-20160330041536-7834afc9e8cd/go.mod h1:F+uVaaLLH7j4eDXPRvw78tMflu7Ie2bzYOH4Y8rRKBY= +github.com/btcsuite/goleveldb v1.0.0 h1:Tvd0BfvqX9o823q1j2UZ/epQo09eJh6dTcRp79ilIN4= github.com/btcsuite/goleveldb v1.0.0/go.mod h1:QiK9vBlgftBg6rWQIj6wFzbPfRjiykIEhBH4obrXJ/I= +github.com/btcsuite/snappy-go v0.0.0-20151229074030-0bdef8d06723/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc= +github.com/btcsuite/snappy-go v1.0.0 h1:ZxaA6lo2EpxGddsA8JwWOcxlzRybb444sgmeJQMJGQE= github.com/btcsuite/snappy-go v1.0.0/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc= +github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792 h1:R8vQdOQdZ9Y3SkEwmHoWBmX1DNXhXZqlTpq6s4tyJGc= github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod h1:ghJtEyQwv5/p4Mg4C0fgbePVuGr935/5ddU9Z3TmDRY= +github.com/btcsuite/winsvc v1.0.0 h1:J9B4L7e3oqhXOcm+2IuNApwzQec85lE+QaikUcCs+dk= github.com/btcsuite/winsvc v1.0.0/go.mod h1:jsenWakMcC0zFBFurPLEAyrnc/teJEM1O46fmI40EZs= -github.com/bufbuild/buf v1.9.0/go.mod h1:1Q+rMHiMVcfgScEF/GOldxmu4o9TrQ2sQQh58K6MscE= +github.com/bufbuild/buf v1.7.0 h1:uWRjhIXcrWkzIkA5TqXGyJbF51VW54QJsQZ3nwaes5Q= +github.com/bufbuild/buf v1.7.0/go.mod h1:Go40fMAF46PnPLC7jJgTQhAI95pmC0+VtxFKVC0qLq0= +github.com/bufbuild/connect-go v1.0.0 h1:htSflKUT8y1jxhoPhPYTZMrsY3ipUXjjrbcZR5O2cVo= github.com/bufbuild/connect-go v1.0.0/go.mod h1:9iNvh/NOsfhNBUH5CtvXeVUskQO1xsrEviH7ZArwZ3I= -github.com/bufbuild/protocompile v0.1.0/go.mod h1:ix/MMMdsT3fzxfw91dvbfzKW3fRRnuPCP47kpAm5m/4= -github.com/buger/jsonparser v0.0.0-20180808090653-f4dd9f5a6b44/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s= -github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0= -github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd/go.mod h1:2oa8nejYd4cQ/b0hMIopN0lCRxU0bueqREvZLWFrtK8= -github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b/go.mod h1:obH5gd0BsqsP2LwDJ9aOkm/6J86V6lyAXCoQWGw3K50= -github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE= +github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA= +github.com/bufbuild/protocompile v0.4.0/go.mod h1:3v93+mbWn/v3xzN+31nwkJfrEpAUwp+BagBSZWx+TP8= +github.com/butuzov/ireturn v0.1.1 h1:QvrO2QF2+/Cx1WA/vETCIYBKtRjc30vesdoPUNo1EbY= github.com/butuzov/ireturn v0.1.1/go.mod h1:Wh6Zl3IMtTpaIKbmwzqi6olnM9ptYQxxVacMsOEFPoc= +github.com/bwesterb/go-ristretto v1.2.0 h1:xxWOVbN5m8NNKiSDZXE1jtZvZnC6JSJ9cYFADiZcWtw= github.com/bwesterb/go-ristretto v1.2.0/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0= -github.com/bwesterb/go-ristretto v1.2.2/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0= +github.com/c-bata/go-prompt v0.2.2 h1:uyKRz6Z6DUyj49QVijyM339UJV9yhbr70gESwbNU3e0= github.com/c-bata/go-prompt v0.2.2/go.mod h1:VzqtzE2ksDBcdln8G7mk2RX9QyGjH+OVqOCSiVIqS34= -github.com/caarlos0/ctrlc v1.0.0/go.mod h1:CdXpj4rmq0q/1Eb44M9zi2nKB0QraNKuRGYGrrHhcQw= -github.com/campoy/unique v0.0.0-20180121183637-88950e537e7e/go.mod h1:9IOqJGCPMSc6E5ydlp5NIonxObaeu/Iub/X03EKPVYo= github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= +github.com/casbin/casbin/v2 v2.37.0 h1:/poEwPSovi4bTOcP752/CsTQiRz2xycyVKFG7GUhbDw= github.com/casbin/casbin/v2 v2.37.0/go.mod h1:vByNa/Fchek0KZUgG5wEsl7iFsiviAYKRtgrQfcJqHg= -github.com/cavaliercoder/go-cpio v0.0.0-20180626203310-925f9528c45e/go.mod h1:oDpT4efm8tSYHXV5tHSdRvBet/b/QzxZ+XyyPehvm3A= github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4= github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= github.com/cenkalti/backoff/v4 v4.1.1/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= -github.com/cenkalti/backoff/v4 v4.1.2/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/cenkalti/backoff/v4 v4.1.3 h1:cFAlzYUlVYDysBEH2T5hyJZMh3+5+WCBvSnK6Q8UtC4= github.com/cenkalti/backoff/v4 v4.1.3/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= -github.com/census-instrumentation/opencensus-proto v0.2.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/certifi/gocertifi v0.0.0-20191021191039-0944d244cd40/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= -github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= +github.com/census-instrumentation/opencensus-proto v0.4.1 h1:iKLQ0xPNFxR/2hzXZMrBo8f1j86j5WHzznCCQxV/b8g= +github.com/census-instrumentation/opencensus-proto v0.4.1/go.mod h1:4T9NM4+4Vw91VeyqjLS6ao50K5bOcLKN6Q42XnYaRYw= +github.com/cespare/cp v0.1.0 h1:SE+dxFebS7Iik5LK0tsi1k9ZCxEaFX4AjQmoyA+1dJk= github.com/cespare/cp v0.1.0/go.mod h1:SOGHArjBr4JWaSDEVpWpo/hNg6RoKrls6Oh40hiwW+s= github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= -github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= +github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/charithe/durationcheck v0.0.9 h1:mPP4ucLrf/rKZiIG/a9IPXHGlh8p4CzgpyTy6EEutYk= github.com/charithe/durationcheck v0.0.9/go.mod h1:SSbRIBVfMjCi/kEB6K65XEA83D6prSM8ap1UCpNKtgg= +github.com/chavacava/garif v0.0.0-20220630083739-93517212f375 h1:E7LT642ysztPWE0dfz43cWOvMiF42DyTRC+eZIaO4yI= github.com/chavacava/garif v0.0.0-20220630083739-93517212f375/go.mod h1:4m1Rv7xfuwWPNKXlThldNuJvutYM6J95wNuuVmn55To= -github.com/checkpoint-restore/go-criu/v4 v4.1.0/go.mod h1:xUQBLp4RLc5zJtWY++yjOoMoB5lihDt7fai+75m+rGw= -github.com/checkpoint-restore/go-criu/v5 v5.0.0/go.mod h1:cfwC0EG7HMUenopBsUf9d89JlCLQIfgVcNsNN0t6T2M= -github.com/checkpoint-restore/go-criu/v5 v5.3.0/go.mod h1:E/eQpaFtUKGOOSEBZgmKAcn+zUUwWxqcaKZlF54wK8E= -github.com/cheekybits/is v0.0.0-20150225183255-68e9c0620927/go.mod h1:h/aW8ynjgkuj+NQRlZcDbAbM1ORAbXjXX77sX7T289U= +github.com/cheggaaa/pb v1.0.27 h1:wIkZHkNfC7R6GI5w7l/PdAdzXzlrbcI3p8OAlnkTsnc= +github.com/cheggaaa/pb v1.0.27/go.mod h1:pQciLPpbU0oxA0h+VJYYLxO+XeDQb5pZijXscXHm81s= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= +github.com/chzyer/logex v1.2.1 h1:XHDu3E6q+gdHgsdTPH6ImJMIp436vR6MPtH8gP05QzM= +github.com/chzyer/logex v1.2.1/go.mod h1:JLbx6lG2kDbNRFnfkgvh4eRJRPX1QCoOIWomwysCBrQ= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= +github.com/chzyer/readline v1.5.1 h1:upd/6fQk4src78LMRzh5vItIt361/o4uq553V8B5sGI= +github.com/chzyer/readline v1.5.1/go.mod h1:Eh+b79XXUwfKfcPLepksvw2tcLE/Ct21YObkaSkeBlk= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= -github.com/cilium/ebpf v0.0.0-20200110133405-4032b1d8aae3/go.mod h1:MA5e5Lr8slmEg9bt0VpxxWqJlO4iwu3FBdHUzV7wQVg= -github.com/cilium/ebpf v0.0.0-20200702112145-1c8d4c9ef775/go.mod h1:7cR51M8ViRLIdUjrmSXlK9pkrsDlLHbO8jiB8X8JnOc= -github.com/cilium/ebpf v0.2.0/go.mod h1:To2CFviqOWL/M0gIMsvSMlqe7em/l1ALkX1PyjrX2Qs= -github.com/cilium/ebpf v0.4.0/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs= -github.com/cilium/ebpf v0.6.2/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs= -github.com/cilium/ebpf v0.7.0/go.mod h1:/oI2+1shJiTGAMgl6/RgJr36Eo1jzrRcAWbcXO2usCA= +github.com/chzyer/test v1.0.0 h1:p3BQDXSxOhOG0P9z6/hGnII4LGiEPOYBhs8asl/fC04= +github.com/chzyer/test v1.0.0/go.mod h1:2JlltgoNkt4TW/z9V/IzDdFaMTM2JPIi26O1pF38GC8= +github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible h1:C29Ae4G5GtYyYMm1aztcyj/J5ckgJm2zwdDajFbx1NY= github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag= +github.com/circonus-labs/circonusllhist v0.1.3 h1:TJH+oke8D16535+jHExHj4nQvzlZrj7ug5D7I/orNUA= github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= +github.com/clbanning/mxj v1.8.4 h1:HuhwZtbyvyOw+3Z1AowPkU87JkJUSv751ELWaiTpj8I= github.com/clbanning/mxj v1.8.4/go.mod h1:BVjHeAH+rl9rs6f+QIpeRl0tfu10SXn1pUSa5PVGJng= +github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec h1:EdRZT3IeKQmfCSrgo8SZ8V3MEnskuJP0wCYNpe+aiXo= github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE= +github.com/client9/misspell v0.3.4 h1:ta993UF76GwbvJcIo3Y68y/M3WxlpEHPWIGDkJYwzJI= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cloudflare/circl v1.1.0 h1:bZgT/A+cikZnKIwn7xL2OBj012Bmvho/o6RpRvv3GKY= github.com/cloudflare/circl v1.1.0/go.mod h1:prBCrKB9DV4poKZY1l9zBXg2QJY7mvgRvtMxxK7fi4I= -github.com/cloudflare/circl v1.3.1/go.mod h1:+CauBF6R70Jqcyl8N2hC8pAXYbWkGIezuSbuGLtRhnw= -github.com/cloudflare/cloudflare-go v0.10.2-0.20190916151808-a80f83b9add9/go.mod h1:1MxXX1Ux4x6mqPmjkUgTP1CdXIBXKX7T+Jk9Gxrmx+U= +github.com/cloudflare/cloudflare-go v0.14.0 h1:gFqGlGl/5f9UGXAaKapCGUfaTCgRKKnzu2VvzMZlOFA= github.com/cloudflare/cloudflare-go v0.14.0/go.mod h1:EnwdgGMaFOruiPZRFSgn+TsQ3hQ7C/YWzIGLeu5c304= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= +github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= +github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe h1:QQ3GSy+MqSHxm/d8nCtnAiZdYFd45cYZPs8vOOIYKfk= +github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= +github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20211130200136-a8f946100490/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20230310173818-32f1caf87195 h1:58f1tJ1ra+zFINPlwLWvQsR9CzAKt2e+EWV2yX9oXQ4= +github.com/cncf/xds/go v0.0.0-20230310173818-32f1caf87195/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cockroachdb/apd/v2 v2.0.2 h1:weh8u7Cneje73dDh+2tEVLUvyBc89iwepWCD8b8034E= +github.com/cockroachdb/apd/v2 v2.0.2/go.mod h1:DDxRlzC2lo3/vSlmSoS7JkqbbrARPuFOGr0B9pvN3Gw= github.com/cockroachdb/apd/v3 v3.1.0 h1:MK3Ow7LH0W8zkd5GMKA1PvS9qG3bWFI95WaVNfyZJ/w= github.com/cockroachdb/apd/v3 v3.1.0/go.mod h1:6qgPBMXjATAdD/VefbRP9NoSLKjbB4LCoA7gN4LpHs4= +github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa h1:OaNxuTZr7kxeODyLWsRMC+OD03aFUH+mW6r2d+MWa5Y= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= -github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5/go.mod h1:h6jFvWxBdQXxjopDMZyH2UVceIRfR84bdzbkoKrsWNo= -github.com/cockroachdb/datadriven v1.0.0/go.mod h1:5Ib8Meh+jk1RlHIXej6Pzevx/NLlNvQB9pmSBZErGA4= -github.com/cockroachdb/datadriven v1.0.2/go.mod h1:a9RdTaap04u637JoCzcUoIcDmvwSUtcUFtT/C3kJlTU= -github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoCr5oaCLELYA= -github.com/cockroachdb/errors v1.6.1/go.mod h1:tm6FTP5G81vwJ5lC0SizQo374JNCOPrHyXGitRJoDqM= -github.com/cockroachdb/errors v1.8.1/go.mod h1:qGwQn6JmZ+oMjuLwjWzUNqblqk0xl4CVV3SQbGwK7Ac= github.com/cockroachdb/errors v1.9.1 h1:yFVvsI0VxmRShfawbt/laCIDy/mtTqqnvoNgiy5bEV8= github.com/cockroachdb/errors v1.9.1/go.mod h1:2sxOtL2WIc096WSZqZ5h8fa17rdDq9HZOZLBCor4mBk= -github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI= -github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs= github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZeQy818SGhaone5OnYfxFR/+AzdY3sf5aE= github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs= github.com/cockroachdb/pebble v0.0.0-20220817183557-09c6e030a677 h1:qbb/AE938DFhOajUYh9+OXELpSF9KZw2ZivtmW6eX1Q= github.com/cockroachdb/pebble v0.0.0-20220817183557-09c6e030a677/go.mod h1:890yq1fUb9b6dGNwssgeUO5vQV9qfXnCPxAJhBQfXw0= -github.com/cockroachdb/redact v1.0.8/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= github.com/cockroachdb/redact v1.1.3 h1:AKZds10rFSIj7qADf0g46UixK8NNLwWTNdCIGS5wfSQ= github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= -github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2/go.mod h1:8BT+cPK6xvFOcRlk0R8eg+OTkcqI6baNH4xAkpiYVvQ= -github.com/codahale/hdrhistogram v0.0.0-20160425231609-f8ad88b59a58/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= +github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd h1:qMd81Ts1T2OTKmB4acZcyKaMtRnY5Y44NuXGX2GFJ1w= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= -github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM= +github.com/coinbase/kryptology v1.8.0 h1:Aoq4gdTsJhSU3lNWsD5BWmFSz2pE0GlmrljaOxepdYY= github.com/coinbase/kryptology v1.8.0/go.mod h1:RYXOAPdzOGUe3qlSFkMGn58i3xUA8hmxYHksuq+8ciI= -github.com/coinbase/rosetta-sdk-go v0.7.0/go.mod h1:7nD3oBPIiHqhRprqvMgPoGxe/nyq3yftRmpsy29coWE= github.com/coinbase/rosetta-sdk-go v0.7.9 h1:lqllBjMnazTjIqYrOGv8h8jxjg9+hJazIGZr9ZvoCcA= github.com/coinbase/rosetta-sdk-go v0.7.9/go.mod h1:0/knutI7XGVqXmmH4OQD8OckFrbQ8yMsUZTG7FXCR2M= -github.com/cometbft/cometbft-db v0.7.0 h1:uBjbrBx4QzU0zOEnU8KxoDl18dMNgDh+zZRUE0ucsbo= -github.com/cometbft/cometbft-db v0.7.0/go.mod h1:yiKJIm2WKrt6x8Cyxtq9YTEcIMPcEe4XPxhgX59Fzf0= -github.com/confio/ics23/go v0.6.6/go.mod h1:E45NqnlpxGnpfTWL/xauN7MRwEE28T4Dd4uraToOaKg= -github.com/confio/ics23/go v0.7.0/go.mod h1:E45NqnlpxGnpfTWL/xauN7MRwEE28T4Dd4uraToOaKg= +github.com/coinbase/rosetta-sdk-go/types v1.0.0 h1:jpVIwLcPoOeCR6o1tU+Xv7r5bMONNbHU7MuEHboiFuA= +github.com/coinbase/rosetta-sdk-go/types v1.0.0/go.mod h1:eq7W2TMRH22GTW0N0beDnN931DW0/WOI1R2sdHNHG4c= +github.com/cometbft/cometbft v0.37.2 h1:XB0yyHGT0lwmJlFmM4+rsRnczPlHoAKFX6K8Zgc2/Jc= +github.com/cometbft/cometbft v0.37.2/go.mod h1:Y2MMMN//O5K4YKd8ze4r9jmk4Y7h0ajqILXbH5JQFVs= +github.com/cometbft/cometbft-db v0.8.0 h1:vUMDaH3ApkX8m0KZvOFFy9b5DZHBAjsnEuo9AKVZpjo= +github.com/cometbft/cometbft-db v0.8.0/go.mod h1:6ASCP4pfhmrCBpfk01/9E1SI29nD3HfVHrY4PG8x5c0= github.com/confio/ics23/go v0.9.0 h1:cWs+wdbS2KRPZezoaaj+qBleXgUk5WOQFMP3CQFGTr4= github.com/confio/ics23/go v0.9.0/go.mod h1:4LPZ2NYqnYIVRklaozjNR1FScgDJ2s5Xrp+e/mYVRak= github.com/consensys/bavard v0.1.8-0.20210406032232-f3452dc9b572/go.mod h1:Bpd0/3mZuaj6Sj+PqrmIquiOKy397AKGThQPaGzNXAQ= +github.com/consensys/bavard v0.1.8-0.20210915155054-088da2f7f54a h1:AEpwbXTjBGKoqxuQ6QAcBMEuK0+PtajQj0wJkhTnSd0= github.com/consensys/bavard v0.1.8-0.20210915155054-088da2f7f54a/go.mod h1:9ItSMtA/dXMAiL7BG6bqW2m3NdSEObYWoH223nGHukI= github.com/consensys/gnark-crypto v0.4.1-0.20210426202927-39ac3d4b3f1f/go.mod h1:815PAHg3wvysy0SyIqanF8gZ0Y1wjk/hrDHD/iT88+Q= +github.com/consensys/gnark-crypto v0.5.3 h1:4xLFGZR3NWEH2zy+YzvzHicpToQR8FXFbfLNvpGB+rE= github.com/consensys/gnark-crypto v0.5.3/go.mod h1:hOdPlWQV1gDLp7faZVeg8Y0iEPFaOUnCc4XeCCk96p0= -github.com/containerd/aufs v0.0.0-20200908144142-dab0cbea06f4/go.mod h1:nukgQABAEopAHvB6j7cnP5zJ+/3aVcE7hCYqvIwAHyE= -github.com/containerd/aufs v0.0.0-20201003224125-76a6863f2989/go.mod h1:AkGGQs9NM2vtYHaUen+NljV0/baGCAPELGm2q9ZXpWU= -github.com/containerd/aufs v0.0.0-20210316121734-20793ff83c97/go.mod h1:kL5kd6KM5TzQjR79jljyi4olc1Vrx6XBlcyj3gNv2PU= -github.com/containerd/aufs v1.0.0/go.mod h1:kL5kd6KM5TzQjR79jljyi4olc1Vrx6XBlcyj3gNv2PU= -github.com/containerd/btrfs v0.0.0-20201111183144-404b9149801e/go.mod h1:jg2QkJcsabfHugurUvvPhS3E08Oxiuh5W/g1ybB4e0E= -github.com/containerd/btrfs v0.0.0-20210316141732-918d888fb676/go.mod h1:zMcX3qkXTAi9GI50+0HOeuV8LU2ryCE/V2vG/ZBiTss= -github.com/containerd/btrfs v1.0.0/go.mod h1:zMcX3qkXTAi9GI50+0HOeuV8LU2ryCE/V2vG/ZBiTss= -github.com/containerd/cgroups v0.0.0-20190717030353-c4b9ac5c7601/go.mod h1:X9rLEHIqSf/wfK8NsPqxJmeZgW4pcfzdXITDrUSJ6uI= -github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f/go.mod h1:OApqhQ4XNSNC13gXIwDjhOQxjWa/NxkwZXJ1EvqT0ko= -github.com/containerd/cgroups v0.0.0-20200531161412-0dbf7f05ba59/go.mod h1:pA0z1pT8KYB3TCXK/ocprsh7MAkoW8bZVzPdih9snmM= -github.com/containerd/cgroups v0.0.0-20200710171044-318312a37340/go.mod h1:s5q4SojHctfxANBDvMeIaIovkq29IP48TKAxnhYRxvo= -github.com/containerd/cgroups v0.0.0-20200824123100-0b889c03f102/go.mod h1:s5q4SojHctfxANBDvMeIaIovkq29IP48TKAxnhYRxvo= -github.com/containerd/cgroups v0.0.0-20210114181951-8a68de567b68/go.mod h1:ZJeTFisyysqgcCdecO57Dj79RfL0LNeGiFUqLYQRYLE= -github.com/containerd/cgroups v1.0.1/go.mod h1:0SJrPIenamHDcZhEcJMNBB85rHcUsw4f25ZfBiPYRkU= -github.com/containerd/cgroups v1.0.3/go.mod h1:/ofk34relqNjSGyqPrmEULrO4Sc8LJhvJmWbUCUKqj8= -github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw= -github.com/containerd/console v0.0.0-20181022165439-0650fd9eeb50/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw= -github.com/containerd/console v0.0.0-20191206165004-02ecf6a7291e/go.mod h1:8Pf4gM6VEbTNRIT26AyyU7hxdQU3MvAvxVI0sc00XBE= -github.com/containerd/console v1.0.0/go.mod h1:8Pf4gM6VEbTNRIT26AyyU7hxdQU3MvAvxVI0sc00XBE= -github.com/containerd/console v1.0.1/go.mod h1:XUsP6YE/mKtz6bxc+I8UiKKTP04qjQL4qcS3XoQ5xkw= -github.com/containerd/console v1.0.2/go.mod h1:ytZPjGgY2oeTkAONYafi2kSj0aYggsf8acV1PGKCbzQ= -github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U= -github.com/containerd/containerd v1.2.10/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= -github.com/containerd/containerd v1.3.0-beta.2.0.20190828155532-0293cbd26c69/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= -github.com/containerd/containerd v1.3.0/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= -github.com/containerd/containerd v1.3.1-0.20191213020239-082f7e3aed57/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= -github.com/containerd/containerd v1.3.2/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= -github.com/containerd/containerd v1.4.0-beta.2.0.20200729163537-40b22ef07410/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= -github.com/containerd/containerd v1.4.0/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= -github.com/containerd/containerd v1.4.1-0.20201117152358-0edc412565dc/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= -github.com/containerd/containerd v1.4.1/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= -github.com/containerd/containerd v1.4.3/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= -github.com/containerd/containerd v1.4.9/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= -github.com/containerd/containerd v1.5.0-beta.1/go.mod h1:5HfvG1V2FsKesEGQ17k5/T7V960Tmcumvqn8Mc+pCYQ= -github.com/containerd/containerd v1.5.0-beta.3/go.mod h1:/wr9AVtEM7x9c+n0+stptlo/uBBoBORwEx6ardVcmKU= -github.com/containerd/containerd v1.5.0-beta.4/go.mod h1:GmdgZd2zA2GYIBZ0w09ZvgqEq8EfBp/m3lcVZIvPHhI= -github.com/containerd/containerd v1.5.0-rc.0/go.mod h1:V/IXoMqNGgBlabz3tHD2TWDoTJseu1FGOKuoA4nNb2s= -github.com/containerd/containerd v1.5.1/go.mod h1:0DOxVqwDy2iZvrZp2JUx/E+hS0UNTVn7dJnIOwtYR4g= -github.com/containerd/containerd v1.5.7/go.mod h1:gyvv6+ugqY25TiXxcZC3L5yOeYgEw0QMhscqVp1AR9c= -github.com/containerd/containerd v1.5.8/go.mod h1:YdFSv5bTFLpG2HIYmfqDpSYYTDX+mc5qtSuYx1YUb/s= -github.com/containerd/containerd v1.6.1/go.mod h1:1nJz5xCZPusx6jJU8Frfct988y0NpumIq9ODB0kLtoE= -github.com/containerd/containerd v1.6.3-0.20220401172941-5ff8fce1fcc6/go.mod h1:WSt2SnDLAGWlu+Vl+EWay37seZLKqgRt6XLjIMy8SYM= +github.com/containerd/containerd v1.6.8 h1:h4dOFDwzHmqFEP754PgfgTeVXFnLiRc6kiqC7tplDJs= github.com/containerd/containerd v1.6.8/go.mod h1:By6p5KqPK0/7/CgO/A6t/Gz+CUYUu2zf1hUaaymVXB0= -github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= -github.com/containerd/continuity v0.0.0-20190815185530-f2a389ac0a02/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= -github.com/containerd/continuity v0.0.0-20191127005431-f65d91d395eb/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= -github.com/containerd/continuity v0.0.0-20200710164510-efbc4488d8fe/go.mod h1:cECdGN1O8G9bgKTlLhuPJimka6Xb/Gg7vYzCTNVxhvo= -github.com/containerd/continuity v0.0.0-20201208142359-180525291bb7/go.mod h1:kR3BEg7bDFaEddKm54WSmrol1fKWDU1nKYkgrcgZT7Y= -github.com/containerd/continuity v0.0.0-20210208174643-50096c924a4e/go.mod h1:EXlVlkqNba9rJe3j7w3Xa924itAMLgZH4UD/Q4PExuQ= -github.com/containerd/continuity v0.1.0/go.mod h1:ICJu0PwR54nI0yPEnJ6jcS+J7CZAUXrLh8lPo2knzsM= -github.com/containerd/continuity v0.2.2/go.mod h1:pWygW9u7LtS1o4N/Tn0FoCFDIXZ7rxcMX7HX1Dmibvk= -github.com/containerd/continuity v0.2.3-0.20220330195504-d132b287edc8/go.mod h1:pWygW9u7LtS1o4N/Tn0FoCFDIXZ7rxcMX7HX1Dmibvk= github.com/containerd/continuity v0.3.0 h1:nisirsYROK15TAMVukJOUyGJjz4BNQJBVsNvAXZJ/eg= github.com/containerd/continuity v0.3.0/go.mod h1:wJEAIwKOm/pBZuBd0JmeTvnLquTB1Ag8espWhkykbPM= -github.com/containerd/fifo v0.0.0-20180307165137-3d5202aec260/go.mod h1:ODA38xgv3Kuk8dQz2ZQXpnv/UZZUHUCL7pnLehbXgQI= -github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448/go.mod h1:ODA38xgv3Kuk8dQz2ZQXpnv/UZZUHUCL7pnLehbXgQI= -github.com/containerd/fifo v0.0.0-20200410184934-f15a3290365b/go.mod h1:jPQ2IAeZRCYxpS/Cm1495vGFww6ecHmMk1YJH2Q5ln0= -github.com/containerd/fifo v0.0.0-20201026212402-0724c46b320c/go.mod h1:jPQ2IAeZRCYxpS/Cm1495vGFww6ecHmMk1YJH2Q5ln0= -github.com/containerd/fifo v0.0.0-20210316144830-115abcc95a1d/go.mod h1:ocF/ME1SX5b1AOlWi9r677YJmCPSwwWnQ9O123vzpE4= -github.com/containerd/fifo v1.0.0/go.mod h1:ocF/ME1SX5b1AOlWi9r677YJmCPSwwWnQ9O123vzpE4= -github.com/containerd/fuse-overlayfs-snapshotter v1.0.2/go.mod h1:nRZceC8a7dRm3Ao6cJAwuJWPFiBPaibHiFntRUnzhwU= -github.com/containerd/go-cni v1.0.1/go.mod h1:+vUpYxKvAF72G9i1WoDOiPGRtQpqsNW/ZHtSlv++smU= -github.com/containerd/go-cni v1.0.2/go.mod h1:nrNABBHzu0ZwCug9Ije8hL2xBCYh/pjfMb1aZGrrohk= -github.com/containerd/go-cni v1.1.0/go.mod h1:Rflh2EJ/++BA2/vY5ao3K6WJRR/bZKsX123aPk+kUtA= -github.com/containerd/go-cni v1.1.3/go.mod h1:Rflh2EJ/++BA2/vY5ao3K6WJRR/bZKsX123aPk+kUtA= -github.com/containerd/go-cni v1.1.4/go.mod h1:Rflh2EJ/++BA2/vY5ao3K6WJRR/bZKsX123aPk+kUtA= -github.com/containerd/go-cni v1.1.6/go.mod h1:BWtoWl5ghVymxu6MBjg79W9NZrCRyHIdUtk4cauMe34= -github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3/go.mod h1:IV7qH3hrUgRmyYrtgEeGWJfWbgcHL9CSRruz2Vqcph0= -github.com/containerd/go-runc v0.0.0-20190911050354-e029b79d8cda/go.mod h1:IV7qH3hrUgRmyYrtgEeGWJfWbgcHL9CSRruz2Vqcph0= -github.com/containerd/go-runc v0.0.0-20200220073739-7016d3ce2328/go.mod h1:PpyHrqVs8FTi9vpyHwPwiNEGaACDxT/N/pLcvMSRA9g= -github.com/containerd/go-runc v0.0.0-20201020171139-16b287bc67d0/go.mod h1:cNU0ZbCgCQVZK4lgG3P+9tn9/PaJNmoDXPpoJhDR+Ok= -github.com/containerd/go-runc v1.0.0/go.mod h1:cNU0ZbCgCQVZK4lgG3P+9tn9/PaJNmoDXPpoJhDR+Ok= -github.com/containerd/imgcrypt v1.0.1/go.mod h1:mdd8cEPW7TPgNG4FpuP3sGBiQ7Yi/zak9TYCG3juvb0= -github.com/containerd/imgcrypt v1.0.4-0.20210301171431-0ae5c75f59ba/go.mod h1:6TNsg0ctmizkrOgXRNQjAPFWpMYRWuiB6dSF4Pfa5SA= -github.com/containerd/imgcrypt v1.1.1-0.20210312161619-7ed62a527887/go.mod h1:5AZJNI6sLHJljKuI9IHnw1pWqo/F0nGDOuR9zgTs7ow= -github.com/containerd/imgcrypt v1.1.1/go.mod h1:xpLnwiQmEUJPvQoAapeb2SNCxz7Xr6PJrXQb0Dpc4ms= -github.com/containerd/imgcrypt v1.1.3/go.mod h1:/TPA1GIDXMzbj01yd8pIbQiLdQxed5ue1wb8bP7PQu4= -github.com/containerd/imgcrypt v1.1.4/go.mod h1:LorQnPtzL/T0IyCeftcsMEO7AqxUDbdO8j/tSUpgxvo= -github.com/containerd/nri v0.0.0-20201007170849-eb1350a75164/go.mod h1:+2wGSDGFYfE5+So4M5syatU0N0f0LbWpuqyMi4/BE8c= -github.com/containerd/nri v0.0.0-20210316161719-dbaa18c31c14/go.mod h1:lmxnXF6oMkbqs39FiCt1s0R2HSMhcLel9vNL3m4AaeY= -github.com/containerd/nri v0.1.0/go.mod h1:lmxnXF6oMkbqs39FiCt1s0R2HSMhcLel9vNL3m4AaeY= -github.com/containerd/stargz-snapshotter v0.0.0-20201027054423-3a04e4c2c116/go.mod h1:o59b3PCKVAf9jjiKtCc/9hLAd+5p/rfhBfm6aBcTEr4= -github.com/containerd/stargz-snapshotter v0.11.3/go.mod h1:2j2EAUyvrLU4D9unYlTIwGhDKQIk74KJ9E71lJsQCVM= -github.com/containerd/stargz-snapshotter/estargz v0.4.1/go.mod h1:x7Q9dg9QYb4+ELgxmo4gBUeJB0tl5dqH1Sdz0nJU1QM= -github.com/containerd/stargz-snapshotter/estargz v0.11.3/go.mod h1:7vRJIcImfY8bpifnMjt+HTJoQxASq7T28MYbP15/Nf0= -github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o= -github.com/containerd/ttrpc v0.0.0-20190828172938-92c8520ef9f8/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o= -github.com/containerd/ttrpc v0.0.0-20191028202541-4f1b8fe65a5c/go.mod h1:LPm1u0xBw8r8NOKoOdNMeVHSawSsltak+Ihv+etqsE8= -github.com/containerd/ttrpc v1.0.1/go.mod h1:UAxOpgT9ziI0gJrmKvgcZivgxOp8iFPSk8httJEt98Y= -github.com/containerd/ttrpc v1.0.2/go.mod h1:UAxOpgT9ziI0gJrmKvgcZivgxOp8iFPSk8httJEt98Y= -github.com/containerd/ttrpc v1.1.0/go.mod h1:XX4ZTnoOId4HklF4edwc4DcqskFZuvXB1Evzy5KFQpQ= -github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod h1:Cm3kwCdlkCfMSHURc+r6fwoGH6/F1hH3S4sg0rLFWPc= -github.com/containerd/typeurl v0.0.0-20190911142611-5eb25027c9fd/go.mod h1:GeKYzf2pQcqv7tJ0AoCuuhtnqhva5LNU3U+OyKxxJpk= -github.com/containerd/typeurl v1.0.1/go.mod h1:TB1hUtrpaiO88KEK56ijojHS1+NeF0izUACaJW2mdXg= +github.com/containerd/typeurl v1.0.2 h1:Chlt8zIieDbzQFzXzAeBEF92KhExuE4p9p92/QmY7aY= github.com/containerd/typeurl v1.0.2/go.mod h1:9trJWW2sRlGub4wZJRTW83VtbOLS6hwcDZXTn6oPz9s= -github.com/containerd/zfs v0.0.0-20200918131355-0a33824f23a2/go.mod h1:8IgZOBdv8fAgXddBT4dBXJPtxyRsejFIpXoklgxgEjw= -github.com/containerd/zfs v0.0.0-20210301145711-11e8f1707f62/go.mod h1:A9zfAbMlQwE+/is6hi0Xw8ktpL+6glmqZYtevJgaB8Y= -github.com/containerd/zfs v0.0.0-20210315114300-dde8f0fda960/go.mod h1:m+m51S1DvAP6r3FcmYCp54bQ34pyOwTieQDNRIRHsFY= -github.com/containerd/zfs v0.0.0-20210324211415-d5c4544f0433/go.mod h1:m+m51S1DvAP6r3FcmYCp54bQ34pyOwTieQDNRIRHsFY= -github.com/containerd/zfs v1.0.0/go.mod h1:m+m51S1DvAP6r3FcmYCp54bQ34pyOwTieQDNRIRHsFY= -github.com/containernetworking/cni v0.7.1/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY= -github.com/containernetworking/cni v0.8.0/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY= -github.com/containernetworking/cni v0.8.1/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY= -github.com/containernetworking/cni v1.0.1/go.mod h1:AKuhXbN5EzmD4yTNtfSsX3tPcmtrBI6QcRV0NiNt15Y= -github.com/containernetworking/cni v1.1.1/go.mod h1:sDpYKmGVENF3s6uvMvGgldDWeG8dMxakj/u+i9ht9vw= -github.com/containernetworking/plugins v0.8.6/go.mod h1:qnw5mN19D8fIwkqW7oHHYDHVlzhJpcY6TQxn/fUyDDM= -github.com/containernetworking/plugins v0.9.1/go.mod h1:xP/idU2ldlzN6m4p5LmGiwRDjeJr6FLK6vuiUwoH7P8= -github.com/containernetworking/plugins v1.0.1/go.mod h1:QHCfGpaTwYTbbH+nZXKVTxNBDZcxSOplJT5ico8/FLE= -github.com/containernetworking/plugins v1.1.1/go.mod h1:Sr5TH/eBsGLXK/h71HeLfX19sZPp3ry5uHSkI4LPxV8= -github.com/containers/ocicrypt v1.0.1/go.mod h1:MeJDzk1RJHv89LjsH0Sp5KTY3ZYkjXO/C+bKAeWFIrc= -github.com/containers/ocicrypt v1.1.0/go.mod h1:b8AOe0YR67uU8OqfVNcznfFpAzu3rdgUV4GP9qXPfu4= -github.com/containers/ocicrypt v1.1.1/go.mod h1:Dm55fwWm1YZAjYRaJ94z2mfZikIyIN4B0oB3dj3jFxY= -github.com/containers/ocicrypt v1.1.2/go.mod h1:Dm55fwWm1YZAjYRaJ94z2mfZikIyIN4B0oB3dj3jFxY= -github.com/containers/ocicrypt v1.1.3/go.mod h1:xpdkbVAuaH3WzbEabUd5yDsl9SwJA5pABH85425Es2g= -github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= +github.com/coreos/etcd v3.3.10+incompatible h1:jFneRYjIvLMLhDLCzuTuU4rSJUjRplcJQ7pD7MnhC04= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= -github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/go-etcd v2.0.0+incompatible h1:bXhRBIXoTm9BYHS3gE0TtQuyNZyeEMux2sDi4oo5YOo= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= -github.com/coreos/go-iptables v0.4.5/go.mod h1:/mVI274lEDI2ns62jHCDnCyBF9Iwsmekav8Dbxlm1MU= -github.com/coreos/go-iptables v0.5.0/go.mod h1:/mVI274lEDI2ns62jHCDnCyBF9Iwsmekav8Dbxlm1MU= -github.com/coreos/go-iptables v0.6.0/go.mod h1:Qe8Bv2Xik5FyTXwgIbLAnv2sWSBmvWdFETJConOQ//Q= -github.com/coreos/go-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-systemd v0.0.0-20161114122254-48702e0da86b/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7 h1:u9SHYsPQNyt5tgDm3YN7+9dYrpK96E5wFilTFWIDZOM= github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/coreos/go-systemd v0.0.0-20190620071333-e64a0ec8b42a/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/coreos/go-systemd/v22 v22.0.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk= -github.com/coreos/go-systemd/v22 v22.1.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk= -github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= -github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= +github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs= +github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= +github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf h1:CAKfRE2YtTUIjjh1bkBtyYFaUT/WmOqsJjgtihT0vMI= github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= -github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= -github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= -github.com/cosmos/btcutil v1.0.4 h1:n7C2ngKXo7UC9gNyMNLbzqz7Asuf+7Qv4gnX/rOdQ44= -github.com/cosmos/btcutil v1.0.4/go.mod h1:Ffqc8Hn6TJUdDgHBwIZLtrLQC1KdJ9jGJl/TvgUaxbU= +github.com/cosmos/btcutil v1.0.5 h1:t+ZFcX77LpKtDBhjucvnOH8C2l2ioGsBNEQ3jef8xFk= +github.com/cosmos/btcutil v1.0.5/go.mod h1:IyB7iuqZMJlthe2tkIFL33xPyzbFYP0XVdS8P5lUPis= github.com/cosmos/cosmos-db v0.0.0-20221226095112-f3c38ecb5e32 h1:zlCp9n3uwQieELltZWHRmwPmPaZ8+XoL2Sj+A2YJlr8= github.com/cosmos/cosmos-db v0.0.0-20221226095112-f3c38ecb5e32/go.mod h1:kwMlEC4wWvB48zAShGKVqboJL6w4zCLesaNQ3YLU2BQ= -github.com/cosmos/cosmos-proto v1.0.0-beta.1/go.mod h1:8k2GNZghi5sDRFw/scPL8gMSowT1vDA+5ouxL8GjaUE= -github.com/cosmos/cosmos-proto v1.0.0-beta.3 h1:VitvZ1lPORTVxkmF2fAp3IiA61xVwArQYKXTdEcpW6o= -github.com/cosmos/cosmos-proto v1.0.0-beta.3/go.mod h1:t8IASdLaAq+bbHbjq4p960BvcTqtwuAxid3b/2rOD6I= -github.com/cosmos/cosmos-sdk v0.45.15-ics h1:ujrXsulYGwggLCC0oD7CizvlAerqMQHfCHHjHqIamfY= -github.com/cosmos/cosmos-sdk v0.45.15-ics/go.mod h1:bScuNwWAP0TZJpUf+SHXRU3xGoUPp+X9nAzfeIXts40= +github.com/cosmos/cosmos-proto v1.0.0-beta.2 h1:X3OKvWgK9Gsejo0F1qs5l8Qn6xJV/AzgIWR2wZ8Nua8= +github.com/cosmos/cosmos-proto v1.0.0-beta.2/go.mod h1:+XRCLJ14pr5HFEHIUcn51IKXD1Fy3rkEQqt4WqmN4V0= +github.com/cosmos/cosmos-sdk v0.47.3 h1:r0hGmZoAzP2D+MaPaFGHwAaTdFQq3pNpHaUp1BsffbM= +github.com/cosmos/cosmos-sdk v0.47.3/go.mod h1:c4OfLdAykA9zsj1CqrxBRqXzVz48I++JSvIMPSPcEmk= +github.com/cosmos/cosmos-sdk/db v1.0.0-beta.1.0.20220726092710-f848e4300a8a h1:2humuGPw3O5riJVFq/E2FRjF57UrO97W1qJcGVmK+6k= +github.com/cosmos/cosmos-sdk/db v1.0.0-beta.1.0.20220726092710-f848e4300a8a/go.mod h1:c8IO23vgNxueCCJlSI9awQtcxsvc+buzaeThB85qfBU= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= -github.com/cosmos/gogoproto v1.4.3/go.mod h1:0hLIG5TR7IvV1fme1HCFKjfzW9X2x0Mo+RooWXCnOWU= -github.com/cosmos/gogoproto v1.4.6 h1:Ee7z15dWJaGlgM2rWrK8N2IX7PQcuccu8oG68jp5RL4= -github.com/cosmos/gogoproto v1.4.6/go.mod h1:VS/ASYmPgv6zkPKLjR9EB91lwbLHOzaGCirmKKhncfI= -github.com/cosmos/gorocksdb v1.2.0 h1:d0l3jJG8M4hBouIZq0mDUHZ+zjOx044J3nGRskwTb4Y= -github.com/cosmos/gorocksdb v1.2.0/go.mod h1:aaKvKItm514hKfNJpUJXnnOWeBnk2GL4+Qw9NHizILw= -github.com/cosmos/iavl v0.17.3/go.mod h1:prJoErZFABYZGDHka1R6Oay4z9PrNeFFiMKHDAMOi4w= -github.com/cosmos/iavl v0.19.5 h1:rGA3hOrgNxgRM5wYcSCxgQBap7fW82WZgY78V9po/iY= -github.com/cosmos/iavl v0.19.5/go.mod h1:X9PKD3J0iFxdmgNLa7b2LYWdsGd90ToV5cAONApkEPw= -github.com/cosmos/ibc-go v1.2.2/go.mod h1:XmYjsRFOs6Q9Cz+CSsX21icNoH27vQKb3squgnCOCbs= -github.com/cosmos/ibc-go/v3 v3.0.0/go.mod h1:Mb+1NXiPOLd+CPFlOC6BKeAUaxXlhuWenMmRiUiSmwY= -github.com/cosmos/ibc-go/v4 v4.3.0 h1:yOzVsyZzsv4XPBux8gq+D0LhZn45yGWKjvT+6Vyo5no= -github.com/cosmos/ibc-go/v4 v4.3.0/go.mod h1:CcLvIoi9NNtIbNsxs4KjBGjYhlwqtsmXy1AKARKiMzQ= -github.com/cosmos/interchain-accounts v0.2.6 h1:TV2M2g1/Rb9MCNw1YePdBKE0rcEczNj1RGHT+2iRYas= -github.com/cosmos/interchain-security v1.0.1-0.20230419165046-6089b6121c33 h1:gGeyeocVM771mWQUngG+INMnZLRn04xtTP8eHUKv8Fs= -github.com/cosmos/interchain-security v1.0.1-0.20230419165046-6089b6121c33/go.mod h1:ux46JqLoUfPq7FKXYXkAiqwzSiIfcLEgtv+plrv9aRA= -github.com/cosmos/ledger-cosmos-go v0.11.1/go.mod h1:J8//BsAGTo3OC/vDLjMRFLW6q0WAaXvHnVc7ZmE8iUY= -github.com/cosmos/ledger-cosmos-go v0.12.2 h1:/XYaBlE2BJxtvpkHiBm97gFGSGmYGKunKyF3nNqAXZA= -github.com/cosmos/ledger-cosmos-go v0.12.2/go.mod h1:ZcqYgnfNJ6lAXe4HPtWgarNEY+B74i+2/8MhZw4ziiI= -github.com/cosmos/ledger-go v0.9.2/go.mod h1:oZJ2hHAZROdlHiwTg4t7kP+GKIIkBT+o6c9QWFanOyI= +github.com/cosmos/gogogateway v1.2.0 h1:Ae/OivNhp8DqBi/sh2A8a1D0y638GpL3tkmLQAiKxTE= +github.com/cosmos/gogogateway v1.2.0/go.mod h1:iQpLkGWxYcnCdz5iAdLcRBSw3h7NXeOkZ4GUkT+tbFI= +github.com/cosmos/gogoproto v1.4.2/go.mod h1:cLxOsn1ljAHSV527CHOtaIP91kK6cCrZETRBrkzItWU= +github.com/cosmos/gogoproto v1.4.10 h1:QH/yT8X+c0F4ZDacDv3z+xE3WU1P1Z3wQoLMBRJoKuI= +github.com/cosmos/gogoproto v1.4.10/go.mod h1:3aAZzeRWpAwr+SS/LLkICX2/kDFyaYVzckBDzygIxek= +github.com/cosmos/iavl v0.20.0 h1:fTVznVlepH0KK8NyKq8w+U7c2L6jofa27aFX6YGlm38= +github.com/cosmos/iavl v0.20.0/go.mod h1:WO7FyvaZJoH65+HFOsDir7xU9FWk2w9cHXNW1XHcl7A= +github.com/cosmos/ibc-go/v7 v7.0.1 h1:NIBNRWjlOoFvFQu1ZlgwkaSeHO5avf4C1YQiWegt8jw= +github.com/cosmos/ibc-go/v7 v7.0.1/go.mod h1:vEaapV6nuLPQlS+g8IKmxMo6auPi0i7HMv1PhViht/E= +github.com/cosmos/ibc-go/v7 v7.1.0 h1:SCLgs7tqVnzdIDO5MRLgovAnc696vTTKl+8qsTu8IMM= +github.com/cosmos/ibc-go/v7 v7.1.0/go.mod h1:7MptlWeIyqmDiuJeRAFqBvXKY8Hybd+rF8vMSmGd2zg= +github.com/cosmos/ics23/go v0.10.0 h1:iXqLLgp2Lp+EdpIuwXTYIQU+AiHj9mOC2X9ab++bZDM= +github.com/cosmos/ics23/go v0.10.0/go.mod h1:ZfJSmng/TBNTBkFemHHHj5YY7VAU/MBU980F4VU1NG0= +github.com/cosmos/interchain-security v1.0.1-0.20230612141232-8cd0ca920812 h1:r5sBvbEKLVUNcVpL9jUEC/scgYFhVHAgvc/havsyKuU= +github.com/cosmos/interchain-security v1.0.1-0.20230612141232-8cd0ca920812/go.mod h1:U+0tyC7GQKg4s16Aj2KORdINXkCfm3b3h2ZO85r9bt0= +github.com/cosmos/interchain-security/v3 v3.0.0-rc2 h1:bCPsPX8pDRizqRV1i+9gX9RYAeKRBCmVd3C7NC3weTE= +github.com/cosmos/interchain-security/v3 v3.0.0-rc2/go.mod h1:HKHw9u4xMm5QJV76A03ORAXB2zisgpcunXZSca8TBdg= +github.com/cosmos/keyring v1.2.0 h1:8C1lBP9xhImmIabyXW4c3vFjjLiBdGCmfLUfeZlV1Yo= +github.com/cosmos/keyring v1.2.0/go.mod h1:fc+wB5KTk9wQ9sDx0kFXB3A0MaeGHM9AwRStKOQ5vOA= +github.com/cosmos/ledger-cosmos-go v0.12.1 h1:sMBxza5p/rNK/06nBSNmsI/WDqI0pVJFVNihy1Y984w= +github.com/cosmos/ledger-cosmos-go v0.12.1/go.mod h1:dhO6kj+Y+AHIOgAe4L9HL/6NDdyyth4q238I9yFpD2g= +github.com/cosmos/rosetta-sdk-go v0.10.0 h1:E5RhTruuoA7KTIXUcMicL76cffyeoyvNybzUGSKFTcM= +github.com/cosmos/rosetta-sdk-go v0.10.0/go.mod h1:SImAZkb96YbwvoRkzSMQB6noNJXFgWl/ENIznEoYQI4= +github.com/cpuguy83/go-md2man v1.0.10 h1:BSKMNlYxDvnunlTymqtgONjNnaRV1sTpcovwwjF22jk= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= -github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= -github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= -github.com/creachadair/taskgroup v0.3.2 h1:zlfutDS+5XG40AOxcHDSThxKzns8Tnr9jnr6VqkYlkM= -github.com/creachadair/taskgroup v0.3.2/go.mod h1:wieWwecHVzsidg2CsUnFinW1faVN4+kq+TDlRJQ0Wbk= +github.com/creachadair/taskgroup v0.4.2 h1:jsBLdAJE42asreGss2xZGZ8fJra7WtwnHWeJFxv2Li8= +github.com/creachadair/taskgroup v0.4.2/go.mod h1:qiXUOSrbwAY3u0JPGTzObbE3yf9hcXHDKBZ2ZjpCbgM= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= +github.com/creack/pty v1.1.9 h1:uDmaGzcdjhF4i/plgjmEsriH11Y0o7RKapEf/LDaM3w= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/cristalhq/acmd v0.8.1/go.mod h1:LG5oa43pE/BbxtfMoImHCQN++0Su7dzipdgBjMCBVDQ= github.com/cucumber/common/gherkin/go/v22 v22.0.0 h1:4K8NqptbvdOrjL9DEea6HFjSpbdT9+Q5kgLpmmsHYl0= github.com/cucumber/common/gherkin/go/v22 v22.0.0/go.mod h1:3mJT10B2GGn3MvVPd3FwR7m2u4tLhSRhWUqJU4KN4Fg= github.com/cucumber/common/messages/go/v17 v17.1.1 h1:RNqopvIFyLWnKv0LfATh34SWBhXeoFTJnSrgm9cT/Ts= github.com/cucumber/common/messages/go/v17 v17.1.1/go.mod h1:bpGxb57tDE385Rb2EohgUadLkAbhoC4IyCFi89u/JQI= +github.com/curioswitch/go-reassign v0.2.0 h1:G9UZyOcpk/d7Gd6mqYgd8XYWFMw/znxwGDUstnC9DIo= github.com/curioswitch/go-reassign v0.2.0/go.mod h1:x6OpXuWvgfQaMGks2BZybTngWjT84hqJfKoO8Tt/Roc= +github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c h1:/ovYnF02fwL0kvspmy9AuyKg1JhdTRUgPw4nUxd9oZM= github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4= -github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4= -github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= -github.com/d2g/dhcp4 v0.0.0-20170904100407-a1d1b6c41b1c/go.mod h1:Ct2BUK8SB0YC1SMSibvLzxjeJLnrYEVLULFNiHY9YfQ= -github.com/d2g/dhcp4client v1.0.0/go.mod h1:j0hNfjhrt2SxUOw55nL0ATM/z4Yt3t2Kd1mW34z5W5s= -github.com/d2g/dhcp4server v0.0.0-20181031114812-7d4a0a7f59a5/go.mod h1:Eo87+Kg/IX2hfWJfwxMzLyuSZyxSoAug2nGa1G2QAi8= -github.com/d2g/hardwareaddr v0.0.0-20190221164911-e7d9fbe030e4/go.mod h1:bMl4RjIciD2oAxI7DmWRx6gbeqrkoLqv3MV0vzNad+I= +github.com/daixiang0/gci v0.8.1 h1:T4xpSC+hmsi4CSyuYfIJdMZAr9o7xZmHpQVygMghGZ4= github.com/daixiang0/gci v0.8.1/go.mod h1:EpVfrztufwVgQRXjnX4zuNinEpLj5OmMjtu/+MB0V0c= -github.com/danieljoos/wincred v1.0.2/go.mod h1:SnuYRW9lp1oJrZX/dXJqr0cPK5gYXqx3EJbmjhLdK9U= -github.com/danieljoos/wincred v1.1.0/go.mod h1:XYlo+eRTsVA9aHGp7NGjFkPla4m+DCL7hqDjlFjiygg= -github.com/danieljoos/wincred v1.1.2 h1:QLdCxFs1/Yl4zduvBdcHB8goaYk9RARS2SgLLRuAyr0= -github.com/danieljoos/wincred v1.1.2/go.mod h1:GijpziifJoIBfYh+S7BbkdUTU4LfM+QnGqR5Vl2tAx0= +github.com/danieljoos/wincred v1.2.0 h1:ozqKHaLK0W/ii4KVbbvluM91W2H3Sh0BncbUNPS7jLE= +github.com/danieljoos/wincred v1.2.0/go.mod h1:FzQLLMKBFdvu+osBrnFODiv32YGwCfx0SkRa/eYHgec= +github.com/dave/jennifer v1.2.0 h1:S15ZkFMRoJ36mGAQgWL1tnr0NQJh9rZ8qatseX/VbBc= github.com/dave/jennifer v1.2.0/go.mod h1:fIb+770HOpJ2fmN9EPPKOqm1vMGhB+TwXKMZhrIygKg= -github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v0.0.0-20161028175848-04cdfd42973b/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/deckarep/golang-set v0.0.0-20180603214616-504e848d77ea/go.mod h1:93vsz/8Wt4joVM7c2AVqh+YRMiUSc14yDtF28KmMOgQ= +github.com/deckarep/golang-set v1.8.0 h1:sk9/l/KqpunDwP7pSjUg0keiOOLEnOBHzykLrsPppp4= github.com/deckarep/golang-set v1.8.0/go.mod h1:5nI87KwE7wgsBU1F4GKAw2Qod7p5kyS383rP6+o6qqo= -github.com/decred/dcrd/crypto/blake256 v1.0.0 h1:/8DMNYp9SGi5f0w7uCm6d6M4OU2rGFK09Y2A4Xv7EE0= github.com/decred/dcrd/crypto/blake256 v1.0.0/go.mod h1:sQl2p6Y26YV+ZOcSTP6thNdn47hh8kt6rqSlvmrXFAc= -github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 h1:YLtO71vCjJRCBcrPMtQ9nqBsqpA1m5sE92cU+pd5Mcc= +github.com/decred/dcrd/crypto/blake256 v1.0.1 h1:7PltbUIQB7u/FfZ39+DGa/ShuMyJ5ilcvdfma9wOH6Y= +github.com/decred/dcrd/crypto/blake256 v1.0.1/go.mod h1:2OfgNZ5wDpcsFmHmCK5gZTPcCXqlm2ArzUIkw9czNJo= github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1/go.mod h1:hyedUtir6IdtD/7lIxGeCxkaw7y45JueMRL4DIyJDKs= +github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 h1:8UrgZ3GkP4i/CLijOJx79Yu+etlyjdBU4sfcs2WYQMs= +github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0/go.mod h1:v57UDF4pDQJcEfFUCRop3lJL149eHGSe9Jvczhzjo/0= +github.com/decred/dcrd/lru v1.0.0 h1:Kbsb1SFDsIlaupWPwsPp+dkxiBY1frcS07PCPgotKz8= github.com/decred/dcrd/lru v1.0.0/go.mod h1:mxKOwFd7lFjN2GZYsiz/ecgqR6kkYAl+0pz0tEMk218= github.com/deepmap/oapi-codegen v1.6.0/go.mod h1:ryDa9AgbELGeB+YEXE1dR53yAjHwFvE9iAUlWl9Al3M= +github.com/deepmap/oapi-codegen v1.8.2 h1:SegyeYGcdi0jLLrpbCMoJxnUUn8GBXHsvr4rbzjuhfU= github.com/deepmap/oapi-codegen v1.8.2/go.mod h1:YLgSKSDv/bZQB7N4ws6luhozi3cEdRktEqrX88CvjIw= +github.com/denis-tingaikin/go-header v0.4.3 h1:tEaZKAlqql6SKCY++utLmkPLd6K8IBM20Ha7UVm+mtU= github.com/denis-tingaikin/go-header v0.4.3/go.mod h1:0wOCWuN71D5qIgE2nz9KrKmuYBAC2Mra5RassOIQ2/c= -github.com/denisenkom/go-mssqldb v0.12.0/go.mod h1:iiK0YP1ZeepvmBQk/QpLEhhTNJgfzrpArPY/aFvc9yU= -github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0= github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f h1:U5y3Y5UE0w7amNe7Z5G/twsBW0KEalRQXZzf8ufSh9I= github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f/go.mod h1:xH/i4TFMt8koVQZ6WFms69WAsDWr2XsYL3Hkl7jkoLE= -github.com/devigned/tab v0.1.1/go.mod h1:XG9mPq0dFghrYvoBF3xdRrJzSTX1b7IQrvaL9mzjeJY= -github.com/dgraph-io/badger v1.6.0/go.mod h1:zwt7syl517jmP8s94KqSxTlM6IMsdhYy6psNgSztDR4= -github.com/dgraph-io/badger/v2 v2.2007.2/go.mod h1:26P/7fbL4kUZVEVKLAKXkBXKOydDmM2p1e+NhhnBCAE= github.com/dgraph-io/badger/v2 v2.2007.4 h1:TRWBQg8UrlUhaFdco01nO2uXwzKS7zd+HVdwV/GHc4o= github.com/dgraph-io/badger/v2 v2.2007.4/go.mod h1:vSw/ax2qojzbN6eXHIx6KPKtCSHJN/Uz0X0VPruTIhk= github.com/dgraph-io/ristretto v0.0.3-0.20200630154024-f66de99634de/go.mod h1:KPxhHT9ZxKefz+PCeOGsrHpl1qZ7i70dGTu2u+Ahh6E= github.com/dgraph-io/ristretto v0.0.3/go.mod h1:KPxhHT9ZxKefz+PCeOGsrHpl1qZ7i70dGTu2u+Ahh6E= -github.com/dgraph-io/ristretto v0.1.0 h1:Jv3CGQHp9OjuMBSne1485aDpUkTKEcUqF+jm/LuerPI= -github.com/dgraph-io/ristretto v0.1.0/go.mod h1:fux0lOrBhrVCJd3lcTHsIJhq1T2rokOu6v9Vcb3Q9ug= -github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= +github.com/dgraph-io/ristretto v0.1.1 h1:6CWw5tJNgpegArSHpNHJKldNeq03FQCwYvfMVWajOK8= +github.com/dgraph-io/ristretto v0.1.1/go.mod h1:S1GPSBCYCIhmVNfcth17y2zZtQT6wzkzgwUve0VDWWA= +github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= +github.com/dgryski/go-bitstream v0.0.0-20180413035011-3522498ce2c8 h1:akOQj8IVgoeFfBTzGOEQakCYshWD6RNo1M5pivFXt70= github.com/dgryski/go-bitstream v0.0.0-20180413035011-3522498ce2c8/go.mod h1:VMaSuZ+SZcx/wljOQKvp5srsbCiKDEb6K2wC4+PiBmQ= github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 h1:fAjc9m62+UWV/WAFKLNi6ZS0675eEUC9y3AlwSbQu1Y= github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= -github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= +github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954 h1:RMLoZVzv4GliuWafOuPuQDKSm1SJph7uCRnnS61JAn4= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= -github.com/dimchansky/utfbom v1.1.0/go.mod h1:rO41eb7gLfo8SF1jd9F8HplJm1Fewwi4mQvIirEdv+8= -github.com/dimchansky/utfbom v1.1.1/go.mod h1:SxdoEBH5qIqFocHMyGOXVAybYJdr71b1Q/j0mACtrfE= -github.com/djherbis/atime v1.1.0/go.mod h1:28OF6Y8s3NQWwacXc5eZTsEsiMzp7LF8MbXE+XJPdBE= -github.com/dlclark/regexp2 v1.2.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc= +github.com/dlclark/regexp2 v1.4.1-0.20201116162257-a2a8dda75c91 h1:Izz0+t1Z5nI16/II7vuEo/nHjodOg0p7+OiDpjX5t1E= github.com/dlclark/regexp2 v1.4.1-0.20201116162257-a2a8dda75c91/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc= -github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E= github.com/dnaeon/go-vcr v1.1.0/go.mod h1:M7tiix8f0r6mKKJ3Yq/kqU1OYf3MnfmBWVbPx/yU9ko= +github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI= github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ= -github.com/docker/cli v0.0.0-20190925022749-754388324470/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= -github.com/docker/cli v0.0.0-20191017083524-a8ff7f821017/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= -github.com/docker/cli v20.10.0-beta1.0.20201029214301-1d20b15adc38+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= -github.com/docker/cli v20.10.13+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= -github.com/docker/cli v20.10.14+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= -github.com/docker/cli v20.10.17+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= -github.com/docker/distribution v0.0.0-20190905152932-14b96e55d84c/go.mod h1:0+TTO4EOBfRPhZXAeF1Vu+W3hHZ8eLp8PgKVZlcvtFY= -github.com/docker/distribution v2.6.0-rc.1.0.20180327202408-83389a148052+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/distribution v2.8.1+incompatible h1:Q50tZOPR6T/hjNsyc9g8/syEs6bk8XXApsHjKukMl68= -github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/docker v0.0.0-20200511152416-a93e9eb0e95c/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker v1.4.2-0.20180531152204-71cd53e4a197/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8= +github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/docker v1.4.2-0.20180625184442-8e610b2b55bf/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker v1.4.2-0.20190924003213-a8608b5b67c7/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker v17.12.0-ce-rc1.0.20200730172259-9f28837c1d93+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker v20.10.0-beta1.0.20201110211921-af34b94a78a1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker v20.10.3-0.20211208011758-87521affb077+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker v20.10.7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker v20.10.17+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v20.10.19+incompatible h1:lzEmjivyNHFHMNAFLXORMBXyGIhw/UP4DvJwvyKYq64= github.com/docker/docker v20.10.19+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker-credential-helpers v0.6.3/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y= -github.com/docker/docker-credential-helpers v0.6.4/go.mod h1:ofX3UI0Gz1TteYBjtgs07O36Pyasyp66D2uKT7H8W1c= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= -github.com/docker/go-events v0.0.0-20170721190031-9461782956ad/go.mod h1:Uw6UezgYA44ePAFQYUehOuCzmy5zmg/+nl2ZfMWGkpA= -github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c/go.mod h1:Uw6UezgYA44ePAFQYUehOuCzmy5zmg/+nl2ZfMWGkpA= -github.com/docker/go-metrics v0.0.0-20180209012529-399ea8c73916/go.mod h1:/u0gXw0Gay3ceNrsHubL3BtdOL2fHf93USgMTe0W5dI= -github.com/docker/go-metrics v0.0.1/go.mod h1:cG1hvH2utMXtqgqqYE9plW6lDxS3/5ayHzueweSI3Vw= -github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= -github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= -github.com/docker/libnetwork v0.8.0-dev.2.0.20200917202933-d0951081b35f/go.mod h1:93m0aTqz6z+g32wla4l4WxTrdtvBRmVzYRkYvasA5Z8= -github.com/docker/libtrust v0.0.0-20150114040149-fa567046d9b1/go.mod h1:cyGadeNEkKy96OOhEzfZl+yxihPEzKnqJwvfuSUqbZE= -github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM= -github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= -github.com/dop251/goja v0.0.0-20200721192441-a695b0cdd498/go.mod h1:Mw6PkjjMXWbTj+nnj4s3QPXq1jaT0s5pC0iFD4+BOAA= +github.com/dop251/goja v0.0.0-20211011172007-d99e4b8cbf48 h1:iZOop7pqsg+56twTopWgwCGxdB5SI2yDO8Ti7eTRliQ= github.com/dop251/goja v0.0.0-20211011172007-d99e4b8cbf48/go.mod h1:R9ET47fwRVRPZnOGvHxxhuZcbrMCuiqOz3Rlrh4KSnk= +github.com/dop251/goja_nodejs v0.0.0-20210225215109-d91c329300e7 h1:tYwu/z8Y0NkkzGEh3z21mSWggMg4LwLRFucLS7TjARg= github.com/dop251/goja_nodejs v0.0.0-20210225215109-d91c329300e7/go.mod h1:hn7BA7c8pLvoGndExHudxTDKZ84Pyvv+90pbBjbTz0Y= github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= -github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= -github.com/dvsekhvalnov/jose2go v0.0.0-20200901110807-248326c1351b/go.mod h1:7BvyPhdbLxMXIYTFPLsyJRFMsKmOZnQmzh6Gb+uquuM= +github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= +github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= github.com/dvsekhvalnov/jose2go v1.5.0 h1:3j8ya4Z4kMCwT5nXIKFSV84YS+HdqSSO0VsTQxaLAeM= github.com/dvsekhvalnov/jose2go v1.5.0/go.mod h1:QsHjhyTlD/lAVqn/NSbVZmSCGeDehTB/mPZadG+mhXU= -github.com/dvyukov/go-fuzz v0.0.0-20200318091601-be3528f3a813/go.mod h1:11Gm+ccJnvAhCNLlf5+cS9KjtbaD5I5zaZpFMsTHWTw= +github.com/eapache/go-resiliency v1.1.0 h1:1NtRmCAqadE2FN4ZcN6g90TP3uk8cg9rn9eNK2197aU= github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= +github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 h1:YEetp8/yCZMuEPMUDHG0CW/brkkEp8mzqk2+ODEitlw= github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= +github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc= github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= +github.com/eclipse/paho.mqtt.golang v1.2.0 h1:1F8mhG9+aO5/xpdtFkW4SxOJB67ukuDC3t2y2qayIX0= github.com/eclipse/paho.mqtt.golang v1.2.0/go.mod h1:H9keYFcgq3Qr5OUJm/JZI/i6U7joQ8SYLhZwfeOo6Ts= -github.com/edsrzf/mmap-go v0.0.0-20160512033002-935e0e8a636c/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= +github.com/edsrzf/mmap-go v1.0.0 h1:CEBF7HpRnUCSJgGUb5h1Gm7e3VkmVDrR8lvWVLtrOFw= github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= -github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM= -github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= -github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= -github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= -github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= +github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc= github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ= +github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g= +github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= -github.com/envoyproxy/go-control-plane v0.10.1/go.mod h1:AY7fTTXNdv/aJ2O5jwpxAPOWUZ7hQAEvzN5Pf27BkQQ= +github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= +github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= +github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= -github.com/envoyproxy/protoc-gen-validate v0.0.14/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/envoyproxy/go-control-plane v0.11.0 h1:jtLewhRR2vMRNnq2ZZUoCjUlgut+Y0+sDDWPOfwOi1o= +github.com/envoyproxy/go-control-plane v0.11.0/go.mod h1:VnHyVMpzcLvCFt9yUz1UnCwHLhwx1WguiVDV7pTG/tI= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/envoyproxy/protoc-gen-validate v0.6.2/go.mod h1:2t7qjJNvHPx8IjnBOzl9E9/baC+qXE/TeeyBRzgJDws= +github.com/envoyproxy/protoc-gen-validate v0.10.0 h1:oIfnZFdC0YhpNNEX+SuIqko4cqqVZeN9IGTrhZje83Y= +github.com/envoyproxy/protoc-gen-validate v0.10.0/go.mod h1:DRjgyB0I43LtJapqN6NiRwroiAU2PaFuvk/vjgh61ss= +github.com/esimonov/ifshort v1.0.4 h1:6SID4yGWfRae/M7hkVDVVyppy8q/v9OuxNdmjLQStBA= github.com/esimonov/ifshort v1.0.4/go.mod h1:Pe8zjlRrJ80+q2CxHLfEOfTwxCZ4O+MuhcHcfgNWTk0= -github.com/etcd-io/bbolt v1.3.3/go.mod h1:ZF2nL25h33cCyBtcyWeZ2/I3HQOfTP+0PIEvHjkjCrw= -github.com/ethereum/go-ethereum v1.9.25/go.mod h1:vMkFiYLHI4tgPw4k2j4MHKoovchFE8plZ0M9VMk4/oM= +github.com/ethereum/go-ethereum v1.10.17 h1:XEcumY+qSr1cZQaWsQs5Kck3FHB0V2RiMHPdTBJ+oT8= github.com/ethereum/go-ethereum v1.10.17/go.mod h1:Lt5WzjM07XlXc95YzrhosmR4J9Ahd6X2wyEV2SvGhk0= +github.com/ettle/strcase v0.1.1 h1:htFueZyVeE1XNnMEfbqp5r67qAN/4r6ya1ysq8Q+Zcw= github.com/ettle/strcase v0.1.1/go.mod h1:hzDLsPC7/lwKyBOywSHEP89nt2pDgdy+No1NBA9o9VY= -github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= -github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= -github.com/evanphx/json-patch v4.11.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= -github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= -github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51/go.mod h1:Yg+htXGokKKdzcwhuNDwVvN+uBxDGXJ7G/VN1d8fa64= github.com/facebookgo/ensure v0.0.0-20200202191622-63f1cf65ac4c h1:8ISkoahWXwZR41ois5lSJBSVw4D0OV19Ht/JSTzvSv0= github.com/facebookgo/ensure v0.0.0-20200202191622-63f1cf65ac4c/go.mod h1:Yg+htXGokKKdzcwhuNDwVvN+uBxDGXJ7G/VN1d8fa64= github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 h1:JWuenKqqX8nojtoVVWjGfOF9635RETekkoH6Cc9SX0A= github.com/facebookgo/stack v0.0.0-20160209184415-751773369052/go.mod h1:UbMTZqLaRiH3MsBH8va0n7s1pQYcu3uTb8G4tygF4Zg= -github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870/go.mod h1:5tD+neXqOorC30/tWg0LCSkrqj/AR6gu8yY8/fpw1q0= github.com/facebookgo/subset v0.0.0-20200203212716-c811ad88dec4 h1:7HZCaLC5+BZpmbhCOZJ293Lz68O7PYrF2EzeiFMwCLk= github.com/facebookgo/subset v0.0.0-20200203212716-c811ad88dec4/go.mod h1:5tD+neXqOorC30/tWg0LCSkrqj/AR6gu8yY8/fpw1q0= -github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072/go.mod h1:duJ4Jxv5lDcvg4QuQr0oowTf7dz4/CR8NtyCooz9HL8= -github.com/fatih/color v1.3.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= -github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= -github.com/fatih/color v1.12.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= +github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= -github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= +github.com/fatih/structtag v1.2.0 h1:/OdNE99OxoI/PqaW/SuSK9uxxT3f/tcSZgon/ssNSx4= github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94= github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/felixge/httpsnoop v1.0.2 h1:+nS9g82KMXccJ/wp0zyRW9ZBHFETmMGtkk+2CTTrW4o= github.com/felixge/httpsnoop v1.0.2/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= +github.com/firefart/nonamedreturns v1.0.4 h1:abzI1p7mAEPYuR4A+VLKn4eNDOycjYo2phmY9sfv40Y= github.com/firefart/nonamedreturns v1.0.4/go.mod h1:TDhe/tjI1BXo48CmYbUduTV7BdIga8MAO/xbKdcVsGI= -github.com/fjl/memsize v0.0.0-20180418122429-ca190fb6ffbc/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= +github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 h1:FtmdgXiUlNeRsoNMFlKLDt+S+6hbjVMEW6RGQ7aUf7c= github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= -github.com/flosch/pongo2 v0.0.0-20190707114632-bbf5a6c351f4/go.mod h1:T9YF2M40nIgbVgp3rreNmTged+9HrbNTIQf1PsaIiTA= -github.com/flosch/pongo2/v4 v4.0.2/go.mod h1:B5ObFANs/36VwxxlgKpdchIJHMvHB562PW+BWPhwZD8= -github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= +github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90 h1:WXb3TSNmHp2vHoCroCIB1foO/yQ36swABL8aOVeDpgg= github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= -github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= -github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= -github.com/fortytw2/leaktest v1.2.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw= github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= +github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db h1:gb2Z18BhTPJPpLQWj4T+rfKHYCHxRHCtRxhKKjRidVw= github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4= -github.com/franela/goblin v0.0.0-20210519012713-85d372ac71e2/go.mod h1:VzmDKDJVZI3aJmnRI9VjAn9nJ8qPPsN1fqzr9dqInIo= +github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8 h1:a9ENSRDFBUPkJ5lCgVZh26+ZbGyoVJG7yb5SSzF5H54= github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20= -github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k= -github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE= -github.com/frankban/quicktest v1.14.3/go.mod h1:mgiwOwqx65TmIk1wJ6Q7wvnVMocbUorkibMOrVTHZps= +github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY= +github.com/frankban/quicktest v1.14.4/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= -github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU= -github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU= github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= -github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa/go.mod h1:KnogPXtdwXqoenmZCw6S+25EAm2MkxbG0deNDu4cbSA= -github.com/fullstorydev/grpcurl v1.6.0/go.mod h1:ZQ+ayqbKMJNhzLmbpCiurTVlaK2M/3nqZCxaQ2Ze/sM= +github.com/fzipp/gocyclo v0.6.0 h1:lsblElZG7d3ALtGMx9fmxeTKZaLLpU8mET09yN4BBLo= github.com/fzipp/gocyclo v0.6.0/go.mod h1:rXPyn8fnlpa0R2csP/31uerbiVBugk5whMdlyaLkLoA= -github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY= -github.com/gavv/httpexpect v2.0.0+incompatible/go.mod h1:x+9tiU1YnrOvnB725RkpoLv1M62hOWzwo5OXotisrKc= +github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff h1:tY80oXqGNY4FhTFhk+o9oFHGINQ/+vhlm8HFzi6znCI= github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff/go.mod h1:x7DCsMOv1taUwEWCzT4cmDeAkigA5/QCwUodaVOe8Ww= github.com/getkin/kin-openapi v0.53.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4= +github.com/getkin/kin-openapi v0.61.0 h1:6awGqF5nG5zkVpMsAih1QH4VgzS8phTxECUWIFo7zko= github.com/getkin/kin-openapi v0.61.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4= -github.com/getkin/kin-openapi v0.76.0/go.mod h1:660oXbgy5JFMKreazJaQTw7o+X00qeSyhcnluiMv+Xg= -github.com/getsentry/raven-go v0.2.0/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ= -github.com/getsentry/sentry-go v0.12.0/go.mod h1:NSap0JBYWzHND8oMbyi0+XZhUalc1TBdRL1M71JZW2c= github.com/getsentry/sentry-go v0.17.0 h1:UustVWnOoDFHBS7IJUB2QK/nB5pap748ZEp0swnQJak= github.com/getsentry/sentry-go v0.17.0/go.mod h1:B82dxtBvxG0KaPD8/hfSV+VcHD+Lg/xUS4JuQn1P4cM= -github.com/ghemawat/stream v0.0.0-20171120220530-696b145b53b9/go.mod h1:106OIgooyS7OzLDOpUGgm9fA3bQENb/cFSyyBmMoJDs= -github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3/go.mod h1:VJ0WA2NBN22VlZ2dKZQPAPnyWw5XTlK1KymzLKsr59s= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= -github.com/gin-gonic/gin v1.4.0/go.mod h1:OW2EZn3DO8Ln9oIKOvM++LBO+5UPHJJDH72/q/3rZdM= +github.com/gin-gonic/gin v1.6.3 h1:ahKqKTFpO5KTPHxWZjEdPScmYaGtLo8Y4DMHoEsnp14= github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M= -github.com/gin-gonic/gin v1.7.0/go.mod h1:jD2toBW3GZUr5UMcdrwQA10I7RuaFOl/SGeDjXkfUtY= github.com/gin-gonic/gin v1.8.1 h1:4+fr/el88TOO3ewCmQr8cx/CtZ/umlIRIs5M4NTNjf8= github.com/gin-gonic/gin v1.8.1/go.mod h1:ji8BvRH1azfM+SYow9zQ6SZMvR8qOMZHmsCuWR9tTTk= -github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= -github.com/gliderlabs/ssh v0.3.5/go.mod h1:8XB4KraRrX39qHhT6yxPsHedjA08I/uBVwj4xC+/+z4= +github.com/glycerine/go-unsnap-stream v0.0.0-20180323001048-9f0cb55181dd h1:r04MMPyLHj/QwZuMJ5+7tJcBr1AQjpiAK/rZWRrQT7o= github.com/glycerine/go-unsnap-stream v0.0.0-20180323001048-9f0cb55181dd/go.mod h1:/20jfyN9Y5QPEAprSgKAUr+glWDY39ZiUEAYOEv5dsE= +github.com/glycerine/goconvey v0.0.0-20190410193231-58a59202ab31 h1:gclg6gY70GLy3PbkQ1AERPfmLMMagS60DKF78eWwLn8= github.com/glycerine/goconvey v0.0.0-20190410193231-58a59202ab31/go.mod h1:Ogl1Tioa0aV7gstGFO7KhffUsb9M4ydbEbbxpcEDc24= -github.com/go-check/check v0.0.0-20180628173108-788fd7840127/go.mod h1:9ES+weclKsC9YodN5RgxqK/VD9HM9JsCSh7rNhMZE98= github.com/go-chi/chi/v5 v5.0.0/go.mod h1:BBug9lr0cqtdAhsu6R4AAdvufI0/XBzAQSsUqJpoZOs= +github.com/go-chi/chi/v5 v5.0.7 h1:rDTPXLDHGATaeHvVlLcR4Qe0zftYethFucbjVQ1PxU8= github.com/go-chi/chi/v5 v5.0.7/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= -github.com/go-critic/go-critic v0.4.1/go.mod h1:7/14rZGnZbY6E38VEGk2kVhoq6itzc1E68facVDK23g= -github.com/go-critic/go-critic v0.4.3/go.mod h1:j4O3D4RoIwRqlZw5jJpx0BNfXWWbpcJoKu5cYSe4YmQ= +github.com/go-critic/go-critic v0.6.5 h1:fDaR/5GWURljXwF8Eh31T2GZNz9X4jeboS912mWF8Uo= github.com/go-critic/go-critic v0.6.5/go.mod h1:ezfP/Lh7MA6dBNn4c6ab5ALv3sKnZVLx37tr00uuaOY= -github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q= -github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA= -github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og= +github.com/go-git/gcfg v1.5.0 h1:Q5ViNfGF8zFgyJWPqYwA7qGFoMTEiBmdlkcfRmpIMa4= github.com/go-git/gcfg v1.5.0/go.mod h1:5m20vg6GwYabIxaOonVkTdrILxQMpEShl1xiMF4ua+E= -github.com/go-git/go-billy/v5 v5.3.1/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0= -github.com/go-git/go-git-fixtures/v4 v4.3.1/go.mod h1:8LHG1a3SRW71ettAD/jW13h8c6AqjVSeL11RAdgaqpo= -github.com/go-git/go-git/v5 v5.5.1/go.mod h1:uz5PQ3d0gz7mSgzZhSJToM6ALPaKCdSnl58/Xb5hzr8= +github.com/go-git/go-billy/v5 v5.4.0 h1:Vaw7LaSTRJOUric7pe4vnzBSgyuf2KrLsu2Y4ZpQBDE= +github.com/go-git/go-billy/v5 v5.4.0/go.mod h1:vjbugF6Fz7JIflbVpl1hJsGjSHNltrSw45YK/ukIvQg= +github.com/go-git/go-git/v5 v5.5.2 h1:v8lgZa5k9ylUw+OR/roJHTxR4QItsNFI5nKtAXFuynw= +github.com/go-git/go-git/v5 v5.5.2/go.mod h1:BE5hUJ5yaV2YMxhmaP4l6RBQ08kMxKSPD4BlxtH7OjI= +github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1 h1:QbL/5oDUmRBzO9/Z7Seo6zf912W/a6Sr4Eu0G/3Jho0= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4 h1:WtGNWLvXpe6ZudgnXrq0barxBImvnnJoMEhXAzcbM0I= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-ini/ini v1.25.4/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o= github.com/go-kit/kit v0.12.0 h1:e4o3o3IsBfAKQh5Qbbiqyfu97Ku7jrO/JbohvztANh4= github.com/go-kit/kit v0.12.0/go.mod h1:lHd+EkCZPIwYItmGDDRdhinkzX2A1sj+M9biaEaizzs= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= -github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU= github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= -github.com/go-lintpack/lintpack v0.5.2/go.mod h1:NwZuYi2nUHho8XEIZ6SIxihrnPoqBTDqfpXvXAN0sXM= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= -github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNVA= -github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= -github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= -github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= -github.com/go-logr/logr v0.4.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= -github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.2.1/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi4= +github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= +github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/stdr v1.2.0/go.mod h1:YkVgnZu1ZjjL7xTxrfm/LLZBfkhTqSR1ydtm6jTKKwI= +github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= -github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod h1:/P9AEU963A2AYjv4d1V5eVL1CQbEJq6aCNHDDjibzu8= +github.com/go-ole/go-ole v1.2.1 h1:2lOsA72HgjxAuMlKpFiCbHTvu44PIVkZ5hqm3RSdI/E= github.com/go-ole/go-ole v1.2.1/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dTyBNF8= -github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= -github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0= -github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg= -github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= +github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY= github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= -github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg= -github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc= -github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8= -github.com/go-openapi/jsonreference v0.19.5/go.mod h1:RdybgQwPxbL4UEjuAruzK1x3nE69AqPYEJeo/TWfEeg= -github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc= -github.com/go-openapi/spec v0.19.3/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo= -github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I= -github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= +github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= -github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= +github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A= github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8= github.com/go-playground/locales v0.14.0 h1:u50s323jtVGugKlcYeyzC0etD1HifMjqmJqb8WugfUU= @@ -1292,95 +1034,74 @@ github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA= github.com/go-playground/universal-translator v0.18.0 h1:82dyy6p4OuJq4/CByFNOn/jYrnRPArHwAcmLoJZxyho= github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA= +github.com/go-playground/validator/v10 v10.2.0 h1:KgJ0snyC2R9VXYN2rneOtQcw5aHQB1Vv0sFl1UcHBOY= github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI= -github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4= -github.com/go-playground/validator/v10 v10.10.0/go.mod h1:74x4gJWsvQexRdW8Pn3dXSGrTK4nAUsbPlLADvpJkos= github.com/go-playground/validator/v10 v10.11.1 h1:prmOlTVv+YjZjmRmNSF3VmspqJIxJWXmqUsHwfTRRkQ= github.com/go-playground/validator/v10 v10.11.1/go.mod h1:i+3WkQ1FvaUjjxh1kSvIA4dMGDBiPU55YFDl0WbKdWU= -github.com/go-redis/redis v6.15.8+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA= -github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo= -github.com/go-sourcemap/sourcemap v2.1.2+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg= +github.com/go-sourcemap/sourcemap v2.1.3+incompatible h1:W1iEw64niKVGogNgBN3ePyLFfuisuzeidWPMPWmECqU= github.com/go-sourcemap/sourcemap v2.1.3+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg= github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= +github.com/go-sql-driver/mysql v1.4.1 h1:g24URVg0OFbNUTx9qqY1IRZ9D9z3iPyi5zKhQZpNwpA= github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= -github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= -github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= +github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= +github.com/go-toolsmith/astcast v1.0.0 h1:JojxlmI6STnFVG9yOImLeGREv8W2ocNUM+iOhR6jE7g= github.com/go-toolsmith/astcast v1.0.0/go.mod h1:mt2OdQTeAQcY4DQgPSArJjHCcOwlX+Wl/kwN+LbLGQ4= -github.com/go-toolsmith/astcopy v1.0.0/go.mod h1:vrgyG+5Bxrnz4MZWPF+pI4R8h3qKRjjyvV/DSez4WVQ= +github.com/go-toolsmith/astcopy v1.0.2 h1:YnWf5Rnh1hUudj11kei53kI57quN/VH6Hp1n+erozn0= github.com/go-toolsmith/astcopy v1.0.2/go.mod h1:4TcEdbElGc9twQEYpVo/aieIXfHhiuLh4aLAck6dO7Y= -github.com/go-toolsmith/astequal v0.0.0-20180903214952-dcb477bfacd6/go.mod h1:H+xSiq0+LtiDC11+h1G32h7Of5O3CYFJ99GVbS5lDKY= -github.com/go-toolsmith/astequal v1.0.0/go.mod h1:H+xSiq0+LtiDC11+h1G32h7Of5O3CYFJ99GVbS5lDKY= -github.com/go-toolsmith/astequal v1.0.2/go.mod h1:9Ai4UglvtR+4up+bAD4+hCj7iTo4m/OXVTSLnCyTAx4= +github.com/go-toolsmith/astequal v1.0.3 h1:+LVdyRatFS+XO78SGV4I3TCEA0AC7fKEGma+fH+674o= github.com/go-toolsmith/astequal v1.0.3/go.mod h1:9Ai4UglvtR+4up+bAD4+hCj7iTo4m/OXVTSLnCyTAx4= -github.com/go-toolsmith/astfmt v0.0.0-20180903215011-8f8ee99c3086/go.mod h1:mP93XdblcopXwlyN4X4uodxXQhldPGZbcEJIimQHrkg= +github.com/go-toolsmith/astfmt v1.0.0 h1:A0vDDXt+vsvLEdbMFJAUBI/uTbRw1ffOPnxsILnFL6k= github.com/go-toolsmith/astfmt v1.0.0/go.mod h1:cnWmsOAuq4jJY6Ct5YWlVLmcmLMn1JUPuQIHCY7CJDw= -github.com/go-toolsmith/astinfo v0.0.0-20180906194353-9809ff7efb21/go.mod h1:dDStQCHtmZpYOmjRP/8gHHnCCch3Zz3oEgCdZVdtweU= -github.com/go-toolsmith/astp v0.0.0-20180903215135-0af7e3c24f30/go.mod h1:SV2ur98SGypH1UjcPpCatrV5hPazG6+IfNHbkDXBRrk= +github.com/go-toolsmith/astp v1.0.0 h1:alXE75TXgcmupDsMK1fRAy0YUzLzqPVvBKoyWV+KPXg= github.com/go-toolsmith/astp v1.0.0/go.mod h1:RSyrtpVlfTFGDYRbrjyWP1pYu//tSFcvdYrA8meBmLI= -github.com/go-toolsmith/pkgload v0.0.0-20181119091011-e9e65178eee8/go.mod h1:WoMrjiy4zvdS+Bg6z9jZH82QXwkcgCBX6nOfnmdaHks= -github.com/go-toolsmith/pkgload v1.0.0/go.mod h1:5eFArkbO80v7Z0kdngIxsRXRMTaX4Ilcwuh3clNrQJc= -github.com/go-toolsmith/pkgload v1.0.2-0.20220101231613-e814995d17c5/go.mod h1:3NAwwmD4uY/yggRxoEjk/S00MIV3A+H7rrE3i87eYxM= +github.com/go-toolsmith/strparse v1.0.0 h1:Vcw78DnpCAKlM20kSbAyO4mPfJn/lyYA4BJUDxe2Jb4= github.com/go-toolsmith/strparse v1.0.0/go.mod h1:YI2nUKP9YGZnL/L1/DLFBfixrcjslWct4wyljWhSRy8= -github.com/go-toolsmith/typep v1.0.0/go.mod h1:JSQCQMUPdRlMZFswiq3TGpNp1GMktqkR2Ns5AIQkATU= +github.com/go-toolsmith/typep v1.0.2 h1:8xdsa1+FSIH/RhEkgnD1j2CJOy5mNllW1Q9tRiYwvlk= github.com/go-toolsmith/typep v1.0.2/go.mod h1:JSQCQMUPdRlMZFswiq3TGpNp1GMktqkR2Ns5AIQkATU= +github.com/go-xmlfmt/xmlfmt v0.0.0-20191208150333-d5b6f63a941b h1:khEcpUM4yFcxg4/FHQWkvVRmgijNXRfzkIDHh23ggEo= github.com/go-xmlfmt/xmlfmt v0.0.0-20191208150333-d5b6f63a941b/go.mod h1:aUCEOzzezBEjDBbFBoSiya/gduyIiWYRP6CnSFIV8AM= +github.com/go-zookeeper/zk v1.0.2 h1:4mx0EYENAdX/B/rbunjlt5+4RTA/a9SMHBRuSKdGxPM= github.com/go-zookeeper/zk v1.0.2/go.mod h1:nOB03cncLtlp4t+UAkGSV+9beXP/akpekBwL+UX1Qcw= +github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= +github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee h1:s+21KNqlpePfkah2I+gwHF8xmJWRjooY+5248k6m4A0= github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo= -github.com/gobwas/httphead v0.1.0 h1:exrUm0f4YX0L7EBwZHuCF4GDp8aJfVeBrlLQrs6NqWU= -github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM= +github.com/gobwas/pool v0.2.0 h1:QEmUOlnSjWtnpRGHF3SauEiOsy82Cup83Vf2LcMlnc8= github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= -github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og= -github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= +github.com/gobwas/ws v1.0.2 h1:CoAavW/wd/kulfZmSIBt6p24n4j7tHgNVCjsfHVNUbo= github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM= -github.com/gobwas/ws v1.1.0 h1:7RFti/xnNkMJnrK7D1yQ/iCIB5OrrY/54/H930kIbHA= -github.com/gobwas/ws v1.1.0/go.mod h1:nzvNcVha5eUziGrbxFCo6qFIojQHjJV5cLYIbezhfL0= -github.com/goccy/go-json v0.9.7/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= github.com/goccy/go-json v0.9.11 h1:/pAaQDLHEoCq/5FFmSKBswWmK6H0e8g4159Kc/X/nqk= github.com/goccy/go-json v0.9.11/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= -github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw= -github.com/godbus/dbus v0.0.0-20180201030542-885f9cc04c9c/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw= -github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4= github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 h1:ZpnhV/YsD2/4cESfV5+Hoeu/iUR3ruzNvZ+yQfO03a0= github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4= -github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= +github.com/godbus/dbus/v5 v5.0.4 h1:9349emZab16e7zQvpmsbtjc18ykshndd8y2PG3sgJbA= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/godbus/dbus/v5 v5.0.6/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/gofrs/flock v0.0.0-20190320160742-5135e617513b/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= -github.com/gofrs/flock v0.7.3/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= +github.com/gofrs/flock v0.8.1 h1:+gYjHKf32LDeiEEFhQaotPbLuUXjY5ZqxKgXy7n59aw= github.com/gofrs/flock v0.8.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= github.com/gofrs/uuid v3.3.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= -github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= -github.com/gofrs/uuid v4.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gofrs/uuid v4.3.0+incompatible h1:CaSVZxm5B+7o45rtab4jC2G37WGYX1zQfuU2i6DSvnc= github.com/gofrs/uuid v4.3.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= -github.com/gogo/gateway v1.1.0 h1:u0SuhL9+Il+UbjM9VIE3ntfRujKbvVpFvNB4HbjeVQ0= -github.com/gogo/gateway v1.1.0/go.mod h1:S7rR8FRQyG3QFESeSv4l2WnsyzlCLG0CzBbUUo/mbic= -github.com/gogo/googleapis v0.0.0-20180223154316-0cd9801be74a/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= -github.com/gogo/googleapis v1.2.0/go.mod h1:Njal3psf3qN6dwBtQfUmBZh2ybovJ0tlu3o/AC7HYjU= -github.com/gogo/googleapis v1.3.2/go.mod h1:5YRNX2z1oM5gXdAkurHa942MDgEJyk02w4OecKY87+c= -github.com/gogo/googleapis v1.4.0/go.mod h1:5YRNX2z1oM5gXdAkurHa942MDgEJyk02w4OecKY87+c= +github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= +github.com/gogo/googleapis v1.4.1-0.20201022092350-68b0159b7869/go.mod h1:5YRNX2z1oM5gXdAkurHa942MDgEJyk02w4OecKY87+c= +github.com/gogo/googleapis v1.4.1 h1:1Yx4Myt7BxzvUr5ldGSbwYiZG6t9wGBZ+8/fX3Wvtq0= github.com/gogo/googleapis v1.4.1/go.mod h1:2lpHqI5OcWCtVElxXnPt+s8oJvMpySlOyM6xDCrzib4= -github.com/gogo/status v1.1.0/go.mod h1:BFv9nrluPLmrS0EmGVvLaPNmRosr9KapBYd5/hpY1WM= -github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= -github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= -github.com/golang-jwt/jwt/v4 v4.1.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= +github.com/golang-jwt/jwt/v4 v4.3.0 h1:kHL1vqdqWNfATmA0FNMdmZNMyZI1U6O31X4rlIPoBog= github.com/golang-jwt/jwt/v4 v4.3.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= -github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= -github.com/golang-sql/sqlexp v0.0.0-20170517235910-f1bb20e5a188/go.mod h1:vXjM/+wXQnTPR4KqTKDgJukSZ6amVRtWMPEjE6sQoK8= +github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= +github.com/golang/geo v0.0.0-20190916061304-5b978397cfec h1:lJwO/92dFXWeXOZdoGXgptLmNLwynMSHUmU6besqtiw= github.com/golang/geo v0.0.0-20190916061304-5b978397cfec/go.mod h1:QZ0nwyI2jOfgRAoBvP+ab5aRr7c9x7lhGEJrKvBwjWI= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/glog v1.0.0 h1:nfP3RFugxnNRyKgeWd4oI1nYvXpxrx8ck8ZrcizshdQ= -github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4= +github.com/golang/glog v1.1.1 h1:jxpi2eWoU84wbX9iIEyAeeoac3FLuifZpY9tcNUD9kw= +github.com/golang/glog v1.1.1/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/rLQ= github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= @@ -1390,8 +1111,6 @@ github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71 github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= -github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.1.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.0/go.mod h1:Qd/q+1AKNOZr9uGQzbzCmRO6sUih6GTPZv6a1/R87v0= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -1413,45 +1132,35 @@ github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiu github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/golang/snappy v0.0.3-0.20201103224600-674baa8c7fc3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 h1:23T5iq8rbUYlhpt5DB4XJkc6BU31uODLD1o1gKvZmD0= github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2/go.mod h1:k9Qvh+8juN+UKMCS/3jFtGICgW8O96FVaZsaxdzDkR4= +github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a h1:w8hkcTqaFpzKqonE9uMCefW1WDie15eSP/4MssdenaM= github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a/go.mod h1:ryS0uhF+x9jgbj/N71xsEqODy9BN81/GonCZiOzirOk= -github.com/golangci/errcheck v0.0.0-20181223084120-ef45e06d44b6/go.mod h1:DbHgvLiFKX1Sh2T1w8Q/h4NAI8MHIpzCdnBUDTXU3I0= -github.com/golangci/go-misc v0.0.0-20180628070357-927a3d87b613/go.mod h1:SyvUF2NxV+sN8upjjeVYr5W7tyxaT1JVtvhKhOn2ii8= +github.com/golangci/go-misc v0.0.0-20220329215616-d24fe342adfe h1:6RGUuS7EGotKx6J5HIP8ZtyMdiDscjMLfRBSPuzVVeo= github.com/golangci/go-misc v0.0.0-20220329215616-d24fe342adfe/go.mod h1:gjqyPShc/m8pEMpk0a3SeagVb0kaqvhscv+i9jI5ZhQ= -github.com/golangci/goconst v0.0.0-20180610141641-041c5f2b40f3/go.mod h1:JXrF4TWy4tXYn62/9x8Wm/K/dm06p8tCKwFRDPZG/1o= -github.com/golangci/gocyclo v0.0.0-20180528134321-2becd97e67ee/go.mod h1:ozx7R9SIwqmqf5pRP90DhR2Oay2UIjGuKheCBCNwAYU= -github.com/golangci/gocyclo v0.0.0-20180528144436-0a533e8fa43d/go.mod h1:ozx7R9SIwqmqf5pRP90DhR2Oay2UIjGuKheCBCNwAYU= -github.com/golangci/gofmt v0.0.0-20190930125516-244bba706f1a/go.mod h1:9qCChq59u/eW8im404Q2WWTrnBUQKjpNYKMbU4M7EFU= +github.com/golangci/gofmt v0.0.0-20220901101216-f2edd75033f2 h1:amWTbTGqOZ71ruzrdA+Nx5WA3tV1N0goTspwmKCQvBY= github.com/golangci/gofmt v0.0.0-20220901101216-f2edd75033f2/go.mod h1:9wOXstvyDRshQ9LggQuzBCGysxs3b6Uo/1MvYCR2NMs= -github.com/golangci/golangci-lint v1.23.7/go.mod h1:g/38bxfhp4rI7zeWSxcdIeHTQGS58TCak8FYcyCmavQ= -github.com/golangci/golangci-lint v1.27.0/go.mod h1:+eZALfxIuthdrHPtfM7w/R3POJLjHDfJJw8XZl9xOng= +github.com/golangci/golangci-lint v1.50.1 h1:C829clMcZXEORakZlwpk7M4iDw2XiwxxKaG504SZ9zY= github.com/golangci/golangci-lint v1.50.1/go.mod h1:AQjHBopYS//oB8xs0y0M/dtxdKHkdhl0RvmjUct0/4w= -github.com/golangci/ineffassign v0.0.0-20190609212857-42439a7714cc/go.mod h1:e5tpTHCfVze+7EpLEozzMB3eafxo2KT5veNg1k6byQU= github.com/golangci/lint-1 v0.0.0-20181222135242-d2cdd8c08219/go.mod h1:/X8TswGSh1pIozq4ZwCfxS0WA5JGXguxk94ar/4c87Y= +github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0 h1:MfyDlzVjl1hoaPzPD4Gpb/QgoRfSBR0jdhwGyAWwMSA= github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0/go.mod h1:66R6K6P6VWk9I95jvqGxkqJxVWGFy9XlDwLwVz1RCFg= +github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca h1:kNY3/svz5T29MYHubXix4aDDuE3RWHkPvopM/EDv/MA= github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca/go.mod h1:tvlJhZqDe4LMs4ZHD0oMUlt9G2LWuDGoisJTBzLMV9o= -github.com/golangci/misspell v0.0.0-20180809174111-950f5d19e770/go.mod h1:dEbvlSfYbMQDtrpRMQU675gSDLDNa8sCPPChZ7PhiVA= +github.com/golangci/misspell v0.3.5 h1:pLzmVdl3VxTOncgzHcvLOKirdvcx/TydsClUQXTehjo= github.com/golangci/misspell v0.3.5/go.mod h1:dEbvlSfYbMQDtrpRMQU675gSDLDNa8sCPPChZ7PhiVA= -github.com/golangci/prealloc v0.0.0-20180630174525-215b22d4de21/go.mod h1:tf5+bzsHdTM0bsB7+8mt0GUMvjCgwLpTapNZHU8AajI= -github.com/golangci/revgrep v0.0.0-20180526074752-d9c87f5ffaf0/go.mod h1:qOQCunEYvmd/TLamH+7LlVccLvUH5kZNhbCgTHoBbp4= -github.com/golangci/revgrep v0.0.0-20180812185044-276a5c0a1039/go.mod h1:qOQCunEYvmd/TLamH+7LlVccLvUH5kZNhbCgTHoBbp4= +github.com/golangci/revgrep v0.0.0-20220804021717-745bb2f7c2e6 h1:DIPQnGy2Gv2FSA4B/hh8Q7xx3B7AIDk3DAMeHclH1vQ= github.com/golangci/revgrep v0.0.0-20220804021717-745bb2f7c2e6/go.mod h1:0AKcRCkMoKvUvlf89F6O7H2LYdhr1zBh736mBItOdRs= +github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4 h1:zwtduBRr5SSWhqsYNgcuWO2kFlpdOZbP0+yRjmvPGys= github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4/go.mod h1:Izgrg8RkN3rCIMLGE9CyYmU9pY2Jer6DgANEnZ/L/cQ= -github.com/gomodule/redigo v1.7.1-0.20190724094224-574c33c3df38/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4= -github.com/google/btree v0.0.0-20180124185431-e89373fe6b4a/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU= github.com/google/btree v1.1.2/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4= -github.com/google/certificate-transparency-go v1.0.21/go.mod h1:QeJfpSbVSfYc7RgB3gJFj9cbuQMMchQxrWXz8Ruopmg= -github.com/google/certificate-transparency-go v1.1.1/go.mod h1:FDKqPvSXawb2ecErVRrD+nfy23RCzyl7eqVCEmlT1Zs= -github.com/google/crfs v0.0.0-20191108021818-71d77da419c9/go.mod h1:etGhoOqfwPkooV6aqoX3eBGQOJblqdoc9XvWOeuxpPw= +github.com/google/flatbuffers v1.11.0 h1:O7CEyB8Cb3/DmtxODGtLHcEvpr81Jm5qLg/hsHnxA2A= github.com/google/flatbuffers v1.11.0/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= @@ -1469,27 +1178,18 @@ github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8 github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/go-containerregistry v0.0.0-20191010200024-a3d713f9b7f8/go.mod h1:KyKXa9ciM8+lgMXwOVsXi7UxGrsf9mM61Mzs+xKUrKE= -github.com/google/go-containerregistry v0.1.2/go.mod h1:GPivBPgdAyd2SU+vf6EpsgOtWDuPqjW0hJZt4rNdTZ4= -github.com/google/go-containerregistry v0.5.1/go.mod h1:Ct15B4yir3PLOP5jsy0GNeYVaIZs/MK/Jz5any1wFW0= -github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ= -github.com/google/go-github/v28 v28.1.1/go.mod h1:bsqJWQX05omyWVmc00nEUql9mhQyv38lDZ8kPZcQVoM= -github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= -github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU= -github.com/google/go-replayers/grpcreplay v0.1.0/go.mod h1:8Ig2Idjpr6gifRd6pNVggX6TC1Zw6Jx74AKp7QNH2QE= -github.com/google/go-replayers/httpreplay v0.1.0/go.mod h1:YKZViNhiGgqdBlUbI2MwGpq4pXxNmhJLPHQ7cv2b5no= -github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.1.1-0.20200604201612-c04b05f3adfa/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= -github.com/google/martian v2.1.1-0.20190517191504-25dcb96d9e51+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= +github.com/google/martian/v3 v3.3.2 h1:IqNFLAmvJOgVlpdEBiQbDc2EwKW77amAycfTuWKdfvw= +github.com/google/martian/v3 v3.3.2/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= github.com/google/orderedcode v0.0.1 h1:UzfcAexk9Vhv8+9pNOgRu41f16lHq725vPwnSeiG/Us= github.com/google/orderedcode v0.0.1/go.mod h1:iVyU4/qPKHY5h/wSd6rZZCDcLJNxiWO6dvsYES2Sb20= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= @@ -1498,35 +1198,31 @@ github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200507031123-427632fa3b1c/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJYCmNdQXq6neHJOYx3V6jnqNEec= github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/renameio v0.1.0 h1:GOZbcHa3HfsPKPlmyPyN2KEohoMXOhdMbHrvbpl2QaA= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/google/rpmpack v0.0.0-20191226140753-aa36bfddb3a0/go.mod h1:RaTPr0KUf2K7fnZYLNDrr8rxAamWs3iNywJLtQ2AzBg= -github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ= -github.com/google/subcommands v1.0.1/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk= -github.com/google/trillian v1.3.11/go.mod h1:0tPraVHrSDkA3BO6vKX67zgLXs6SsOAbHEivX+9mPgw= -github.com/google/uuid v0.0.0-20161128191214-064e2069ce9c/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/s2a-go v0.1.3 h1:FAgZmpLl/SXurPEZyCMPBIiiYeTbqfjlbdnCNTAkbGE= +github.com/google/s2a-go v0.1.3/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/wire v0.3.0/go.mod h1:i1DMg/Lu8Sz5yYl25iOdmc5CT5qusaa+zmRWs16741s= -github.com/google/wire v0.4.0/go.mod h1:ngWDr9Qvq3yZA10YrxfyGELY/AFWGVpy9c1LTRi1EoU= github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/enterprise-certificate-proxy v0.1.0/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg= -github.com/googleapis/gax-go v2.0.0+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY= -github.com/googleapis/gax-go v2.0.2+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY= +github.com/googleapis/enterprise-certificate-proxy v0.2.3 h1:yk9/cqRKtT9wXZSsRH9aurXEpJX+U6FLtpYTdC3R06k= +github.com/googleapis/enterprise-certificate-proxy v0.2.3/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0= @@ -1536,78 +1232,52 @@ github.com/googleapis/gax-go/v2 v2.3.0/go.mod h1:b8LNqSzNabLiUpXKkY7HAR5jr6bIT99 github.com/googleapis/gax-go/v2 v2.4.0/go.mod h1:XOTVJ59hdnfJLIP/dh8n5CGryZR2LxK9wbMD5+iXC6c= github.com/googleapis/gax-go/v2 v2.5.1/go.mod h1:h6B0KMMFNtI2ddbGJn3T3ZbwkeT6yqEF02fYlzkUCyo= github.com/googleapis/gax-go/v2 v2.6.0/go.mod h1:1mjbznJAPHFpesgE5ucqfYEscaz5kMdcIDwU/6+DDoY= -github.com/googleapis/gax-go/v2 v2.7.0/go.mod h1:TEop28CZZQ2y+c0VxMUmu1lV+fQx57QpBWsYpwqHJx8= -github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= -github.com/googleapis/gnostic v0.2.2/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= -github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg= -github.com/googleapis/gnostic v0.5.1/go.mod h1:6U4PtQXGIEt/Z3h5MAT7FNofLnw9vXk2cUuW7uA/OeU= -github.com/googleapis/gnostic v0.5.5/go.mod h1:7+EbHbldMins07ALC74bsA81Ovc97DwqyJO1AENw9kA= +github.com/googleapis/gax-go/v2 v2.8.0 h1:UBtEZqx1bjXtOQ5BVTkuYghXrr3N4V123VKJK67vJZc= +github.com/googleapis/gax-go/v2 v2.8.0/go.mod h1:4orTrqY6hXxxaUL4LHIPl6lGo8vAE38/qKbhSAKP6QI= +github.com/googleapis/go-type-adapters v1.0.0 h1:9XdMn+d/G57qq1s8dNc5IesGCXHf6V2HZ2JwRxfA2tA= github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4= +github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8 h1:tlyzajkF3030q6M8SvmJSemC9DTHL/xaMa18b65+JM4= github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= -github.com/gookit/color v1.2.4/go.mod h1:AhIE+pS6D4Ql0SQWbBeXPHw7gY0/sjHoA4s/n1KB7xg= -github.com/gookit/color v1.5.1/go.mod h1:wZFzea4X8qN6vHOSP2apMb4/+w/orMznEzYsIHPaqKM= -github.com/gophercloud/gophercloud v0.1.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8= +github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= -github.com/gopherjs/gopherjs v1.17.2/go.mod h1:pRRIvn/QzFLrKfvEz3qUuEhtE/zLCWfreZ6J5gM2i+k= -github.com/gordonklaus/ineffassign v0.0.0-20200309095847-7953dde2c7bf/go.mod h1:cuNKsD1zp2v6XfE/orVX2QE1LC+i254ceGcVeDT3pTU= +github.com/gordonklaus/ineffassign v0.0.0-20210914165742-4cc7213b9bc8 h1:PVRE9d4AQKmbelZ7emNig1+NT27DUmKZn5qXxfio54U= github.com/gordonklaus/ineffassign v0.0.0-20210914165742-4cc7213b9bc8/go.mod h1:Qcp2HIAYhR7mNUVSIxZww3Guk4it82ghYcEXIAk+QT0= -github.com/goreleaser/goreleaser v0.136.0/go.mod h1:wiKrPUeSNh6Wu8nUHxZydSOVQ/OZvOaO7DTtFqie904= -github.com/goreleaser/nfpm v1.2.1/go.mod h1:TtWrABZozuLOttX2uDlYyECfQX7x5XYkVxhjYcR6G9w= -github.com/goreleaser/nfpm v1.3.0/go.mod h1:w0p7Kc9TAUgWMyrub63ex3M2Mgw88M4GZXoTq5UCb40= -github.com/gorhill/cronexpr v0.0.0-20180427100037-88b0669f7d75/go.mod h1:g2644b03hfBX9Ov0ZBDgXXens4rxSxmqFBbhvKv2yVA= +github.com/gorilla/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8= github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= -github.com/gorilla/css v1.0.0/go.mod h1:Dn721qIggHpt4+EFCcTLTU/vk5ySda2ReITrtgBl60c= -github.com/gorilla/handlers v0.0.0-20150720190736-60c7bfde3e33/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ= github.com/gorilla/handlers v1.5.1 h1:9lRY6j8DEeeBT10CvO9hGW0gmky0BprnvDI5vfhUHH4= github.com/gorilla/handlers v1.5.1/go.mod h1:t8XrUpc4KVXb7HGyJ4/cEnwQiaxrX/hz1Zv/4g96P1Q= github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= -github.com/gorilla/mux v1.7.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= -github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4= github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= -github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= -github.com/gorilla/websocket v1.4.1-0.20190629185528-ae1634f6a989/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/gostaticanalysis/analysisutil v0.0.0-20190318220348-4088753ea4d3/go.mod h1:eEOZF4jCKGi+aprrirO9e7WKB3beBRtWgqGunKl6pKE= -github.com/gostaticanalysis/analysisutil v0.0.3/go.mod h1:eEOZF4jCKGi+aprrirO9e7WKB3beBRtWgqGunKl6pKE= -github.com/gostaticanalysis/analysisutil v0.1.0/go.mod h1:dMhHRU9KTiDcuLGdy87/2gTR8WruwYZrKdRq9m1O6uw= -github.com/gostaticanalysis/analysisutil v0.4.1/go.mod h1:18U/DLpRgIUd459wGxVHE0fRgmo1UgHDcbw7F5idXu0= +github.com/gostaticanalysis/analysisutil v0.7.1 h1:ZMCjoue3DtDWQ5WyU16YbjbQEQ3VuzwxALrpYd+HeKk= github.com/gostaticanalysis/analysisutil v0.7.1/go.mod h1:v21E3hY37WKMGSnbsw2S/ojApNWb6C1//mXO48CXbVc= -github.com/gostaticanalysis/comment v1.3.0/go.mod h1:xMicKDx7XRXYdVwY9f9wQpDJVnqWxw9wCauCMKp+IBI= -github.com/gostaticanalysis/comment v1.4.1/go.mod h1:ih6ZxzTHLdadaiSnF5WY3dxUoXfXAlTaRzuaNDlSado= +github.com/gostaticanalysis/comment v1.4.2 h1:hlnx5+S2fY9Zo9ePo4AhgYsYHbM2+eAv8m/s1JiCd6Q= github.com/gostaticanalysis/comment v1.4.2/go.mod h1:KLUTGDv6HOCotCH8h2erHKmpci2ZoR8VPu34YA2uzdM= +github.com/gostaticanalysis/forcetypeassert v0.1.0 h1:6eUflI3DiGusXGK6X7cCcIgVCpZ2CiZ1Q7jl6ZxNV70= github.com/gostaticanalysis/forcetypeassert v0.1.0/go.mod h1:qZEedyP/sY1lTGV1uJ3VhWZ2mqag3IkWsDHVbplHXak= +github.com/gostaticanalysis/nilerr v0.1.1 h1:ThE+hJP0fEp4zWLkWHWcRyI2Od0p7DlgYG3Uqrmrcpk= github.com/gostaticanalysis/nilerr v0.1.1/go.mod h1:wZYb6YI5YAxxq0i1+VJbY0s2YONW0HU0GPE3+5PWN4A= -github.com/gostaticanalysis/testutil v0.3.1-0.20210208050101-bfb5c8eec0e4/go.mod h1:D+FIZ+7OahH3ePw/izIEeH5I06eKs1IKI4Xr64/Am3M= -github.com/gostaticanalysis/testutil v0.4.0/go.mod h1:bLIoPefWXrRi/ssLFWX1dx7Repi5x3CuviD3dgAZaBU= -github.com/gotestyourself/gotestyourself v1.4.0/go.mod h1:zZKM6oeNM8k+FRljX1mnzVYeS8wiGgQyvST1/GafPbY= +github.com/gotestyourself/gotestyourself v2.2.0+incompatible h1:AQwinXlbQR2HvPjQZOmDhRqsv5mZf+Jb1RnSLxcqZcI= github.com/gotestyourself/gotestyourself v2.2.0+incompatible/go.mod h1:zZKM6oeNM8k+FRljX1mnzVYeS8wiGgQyvST1/GafPbY= -github.com/graph-gophers/graphql-go v0.0.0-20191115155744-f33e81362277/go.mod h1:9CQHMSxwO4MprSdzoIEobiHpoLtHm77vfxsvsIN5Vuc= +github.com/graph-gophers/graphql-go v1.3.0 h1:Eb9x/q6MFpCLz7jBCiP/WTxjSDrYLR1QY41SORZyNJ0= github.com/graph-gophers/graphql-go v1.3.0/go.mod h1:9CQHMSxwO4MprSdzoIEobiHpoLtHm77vfxsvsIN5Vuc= -github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= -github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= -github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= -github.com/grpc-ecosystem/go-grpc-middleware v1.2.0/go.mod h1:mJzapYve32yjrKlk9GbyCZHuPgZsrbyIbyKhSzOpg6s= github.com/grpc-ecosystem/go-grpc-middleware v1.2.2/go.mod h1:EaizFBKfUKtMIF5iaDEhniwNedqGo9FuLFzppDr3uwI= -github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 h1:+9834+KizmvFV7pXQGSXQTsaWhq2GjuNUt0aUU0YBYw= -github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y= +github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 h1:UH//fgunKIs4JdUbpDl1VZCDaL56wXCB/5+wF6uHfaI= +github.com/grpc-ecosystem/go-grpc-middleware v1.4.0/go.mod h1:g5qyo/la0ALbONm6Vbp88Yd8NsDy6rZz+RcrMPxvld8= +github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= -github.com/grpc-ecosystem/grpc-gateway v1.5.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw= -github.com/grpc-ecosystem/grpc-gateway v1.6.2/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw= -github.com/grpc-ecosystem/grpc-gateway v1.8.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= -github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= -github.com/grpc-ecosystem/grpc-gateway v1.9.2/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= -github.com/grpc-ecosystem/grpc-gateway v1.12.1/go.mod h1:8XEsbTttt/W+VvjtQhLACqCisSPWTxCZ7sBRjU6iH9c= github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= -github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645/go.mod h1:6iZfnjpejD4L/4DwD7NryNaJyCQdzwWwH2MWhCA90Kw= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0/go.mod h1:YN5jB8ie0yfIUg6VvR9Kz84aCaG7AsGZnLjhHbUqwPg= github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c h1:6rhixN/i8ZofjG1Y75iExal34USq5p+wiN1tpie8IrU= github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c/go.mod h1:NMPJylDgVpX0MLRlPy15sqSwOFv/U1GZ2m21JhFfek0= github.com/gtank/merlin v0.1.1-0.20191105220539-8318aed1a79f/go.mod h1:T86dnYJhcGOh5BjZFCJWTDeTK7XW8uE+E21Cy/bIQ+s= @@ -1615,992 +1285,700 @@ github.com/gtank/merlin v0.1.1 h1:eQ90iG7K9pOhtereWsmyRJ6RAwcP4tHTDBHXNg+u5is= github.com/gtank/merlin v0.1.1/go.mod h1:T86dnYJhcGOh5BjZFCJWTDeTK7XW8uE+E21Cy/bIQ+s= github.com/gtank/ristretto255 v0.1.2 h1:JEqUCPA1NvLq5DwYtuzigd7ss8fwbYay9fi4/5uMzcc= github.com/gtank/ristretto255 v0.1.2/go.mod h1:Ph5OpO6c7xKUGROZfWVLiJf9icMDwUeIvY4OmlYW69o= -github.com/hanwen/go-fuse v1.0.0/go.mod h1:unqXarDXqzAk0rt98O2tVndEPIpUgLD9+rwFisZH3Ok= -github.com/hanwen/go-fuse/v2 v2.0.3/go.mod h1:0EQM6aH2ctVpvZ6a+onrQ/vaykxh2GH7hy3e13vzTUY= -github.com/hanwen/go-fuse/v2 v2.1.1-0.20220112183258-f57e95bda82d/go.mod h1:B1nGE/6RBFyBRC1RRnf23UpwCdyJ31eukw34oAKukAc= -github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE= -github.com/hashicorp/consul/api v1.10.1/go.mod h1:XjsvQN+RJGWI2TWy1/kqaE16HrR2J/FWgkYjdZQsX9M= -github.com/hashicorp/consul/api v1.11.0/go.mod h1:XjsvQN+RJGWI2TWy1/kqaE16HrR2J/FWgkYjdZQsX9M= -github.com/hashicorp/consul/api v1.12.0/go.mod h1:6pVBMo0ebnYdt2S3H87XhekM/HHrUoTD2XXb/VrZVy0= -github.com/hashicorp/consul/api v1.15.3/go.mod h1:/g/qgcoBcEXALCNZgRRisyTW0nY86++L0KbeAMXYCeY= -github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= +github.com/hashicorp/consul/api v1.20.0 h1:9IHTjNVSZ7MIwjlW3N3a7iGiykCMDpxZu8jsxFJh0yc= +github.com/hashicorp/consul/api v1.20.0/go.mod h1:nR64eD44KQ59Of/ECwt2vUmIK2DKsDzAwTmwmLl8Wpo= +github.com/hashicorp/consul/sdk v0.3.0 h1:UOxjlb4xVNF93jak1mzzoBatyFju9nrkxpVwIp/QqxQ= github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= -github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms= -github.com/hashicorp/consul/sdk v0.11.0/go.mod h1:yPkX5Q6CsxTFMjQQDJwzeNmUUF5NUGGbrDsv9wTb8cw= -github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/go-bexpr v0.1.10 h1:9kuI5PFotCboP3dkDYFr/wi0gg0QVbSNz5oFRpxn4uE= github.com/hashicorp/go-bexpr v0.1.10/go.mod h1:oxlubA2vC/gFVfX1A6JGp7ls7uCDlfJn732ehYYg+g0= github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= +github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ= github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= -github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= -github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= -github.com/hashicorp/go-hclog v0.14.1/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= -github.com/hashicorp/go-hclog v0.16.2/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= -github.com/hashicorp/go-hclog v1.0.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= +github.com/hashicorp/go-getter v1.7.1 h1:SWiSWN/42qdpR0MdhaOc/bLR48PLuP1ZQtYLRlM69uY= +github.com/hashicorp/go-getter v1.7.1/go.mod h1:W7TalhMmbPmsSMdNjD0ZskARur/9GJ17cfHTRtXV744= +github.com/hashicorp/go-hclog v1.2.0 h1:La19f8d7WIlm4ogzNHB0JGqs5AUDAZ2UfCY4sJXcJdM= github.com/hashicorp/go-hclog v1.2.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= -github.com/hashicorp/go-immutable-radix v1.3.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc= github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= +github.com/hashicorp/go-msgpack v0.5.3 h1:zKjpN5BK/P5lMYrLmBHdBULWbJ0XpYR+7NGzqkZzoD4= github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= -github.com/hashicorp/go-msgpack v0.5.5/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= -github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874/go.mod h1:JMRHfdO9jKNzS/+BTlxCjKNQHg/jZAft8U7LloJvN7I= github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= -github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA= +github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= +github.com/hashicorp/go-retryablehttp v0.5.3 h1:QlWt0KvWT0lq8MFppF9tsJGF+ynG7ztc2KIPhzRGk7s= github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= -github.com/hashicorp/go-retryablehttp v0.6.4/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY= -github.com/hashicorp/go-retryablehttp v0.6.6/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY= -github.com/hashicorp/go-retryablehttp v0.7.0/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY= github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= +github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc= github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= +github.com/hashicorp/go-safetemp v1.0.0 h1:2HR189eFNrjHQyENnQMMpCiBAsRxzbTMIgBhEyExpmo= +github.com/hashicorp/go-safetemp v1.0.0/go.mod h1:oaerMy3BhqiTbVye6QuFhFtIceqFoDHxNAB65b+Rj1I= +github.com/hashicorp/go-sockaddr v1.0.0 h1:GeH6tui99pF4NJgfnhp+L6+FfobzVW3Ah46sLo0ICXs= github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= -github.com/hashicorp/go-sockaddr v1.0.2/go.mod h1:rB4wwRAUzs07qva3c5SdrY/NEtAUjGlgmH/UkBUC97A= +github.com/hashicorp/go-syslog v1.0.0 h1:KaodqZuhUoZereWVIYmpUgZysurB1kBLX2j0MwMrUAE= github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.2 h1:cfejS+Tpcp13yd5nYHWDI6qVCny6wyX2Mt5SGur2IGE= github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= -github.com/hashicorp/go-version v1.2.1/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +github.com/hashicorp/go.net v0.0.1 h1:sNCoNyDEvN1xa+X0baata4RdcpKwcMS6DH+xwfqPgjw= github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/golang-lru v0.5.3/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= -github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d h1:dg1dEPuWpEqDnvIw251EVy4zlP8gWbsGj4BsUKCRpYs= github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/hashicorp/logutils v1.0.0 h1:dLEQVugN8vlakKOUE3ihGLTZJRB4j+M2cdTm/ORI65Y= github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= +github.com/hashicorp/mdns v1.0.0 h1:WhIgCr5a7AaVH6jPUwjtRuuE7/RDufnUvzIr48smyxs= github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= -github.com/hashicorp/mdns v1.0.1/go.mod h1:4gW7WsVCke5TE7EPeYliwHlRUyBtfCwuFwuMg2DmyNY= -github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc= +github.com/hashicorp/memberlist v0.1.3 h1:EmmoJme1matNzb+hMpDuR/0sbJSUisxyqBGG676r31M= github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= -github.com/hashicorp/memberlist v0.2.2/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= -github.com/hashicorp/memberlist v0.3.0/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= -github.com/hashicorp/memberlist v0.3.1/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= -github.com/hashicorp/serf v0.9.5/go.mod h1:UWDWwZeL5cuWDJdl0C6wrvrUwEqtQ4ZKBKKENpqIUyk= -github.com/hashicorp/serf v0.9.6/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4= -github.com/hashicorp/serf v0.9.7/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4= -github.com/hashicorp/serf v0.9.8/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4= -github.com/hashicorp/uuid v0.0.0-20160311170451-ebb0a03e909c/go.mod h1:fHzc09UnyJyqyW+bFuq864eh+wC7dj65aXmXLRe5to0= -github.com/hdevalence/ed25519consensus v0.0.0-20210204194344-59a8610d2b87/go.mod h1:XGsKKeXxeRr95aEOgipvluMPlgjr7dGlk9ZTWOjcUcg= -github.com/hdevalence/ed25519consensus v0.0.0-20220222234857-c00d1f31bab3 h1:aSVUgRRRtOrZOC1fYmY9gV0e9z/Iu+xNVSASWjsuyGU= -github.com/hdevalence/ed25519consensus v0.0.0-20220222234857-c00d1f31bab3/go.mod h1:5PC6ZNPde8bBqU/ewGZig35+UIZtw9Ytxez8/q5ZyFE= +github.com/hashicorp/serf v0.10.1 h1:Z1H2J60yRKvfDYAOZLd2MU0ND4AH/WDz7xYHDWQsIPY= +github.com/hashicorp/serf v0.10.1/go.mod h1:yL2t6BqATOLGc5HF7qbFkTfXoPIY0WZdWHfEvMqbG+4= +github.com/hdevalence/ed25519consensus v0.1.0 h1:jtBwzzcHuTmFrQN6xQZn6CQEO/V9f7HsjsjeEZ6auqU= +github.com/hdevalence/ed25519consensus v0.1.0/go.mod h1:w3BHWjwJbFU29IRHL1Iqkw3sus+7FctEyM4RqDxYNzo= +github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM= github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg= +github.com/holiman/bloomfilter/v2 v2.0.3 h1:73e0e/V0tCydx14a0SCYS/EWCxgwLZ18CZcZKVu0fao= github.com/holiman/bloomfilter/v2 v2.0.3/go.mod h1:zpoh+gs7qcpqrHr3dB55AMiJwo0iURXE7ZOP9L9hSkA= -github.com/holiman/uint256 v1.1.1/go.mod h1:y4ga/t+u+Xwd7CpDgZESaRcWy0I7XMlTMA25ApIH5Jw= +github.com/holiman/uint256 v1.2.0 h1:gpSYcPLWGv4sG43I2mVLiDZCNDh/EpGjSk8tmtxitHM= github.com/holiman/uint256 v1.2.0/go.mod h1:y4ga/t+u+Xwd7CpDgZESaRcWy0I7XMlTMA25ApIH5Jw= +github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -github.com/huandu/xstrings v1.0.0/go.mod h1:4qWG/gcEcfX4z/mBDHJ++3ReCw9ibxbsNJbcucJdbSo= -github.com/huandu/xstrings v1.2.0/go.mod h1:DvyZB1rfVYsBIigL8HwpZgxHwXozlTgGqn63UyNX5k4= +github.com/huandu/go-assert v1.1.5 h1:fjemmA7sSfYHJD7CUqs9qTwwfdNAx7/j2/ZlHXzNB3c= +github.com/huandu/go-assert v1.1.5/go.mod h1:yOLvuqZwmcHIC5rIzrBhT7D3Q9c3GFnd0JrPVhn/06U= +github.com/huandu/skiplist v1.2.0 h1:gox56QD77HzSC0w+Ws3MH3iie755GBJU1OER3h5VsYw= +github.com/huandu/skiplist v1.2.0/go.mod h1:7v3iFjLcSAzO4fN5B8dvebvo/qsfumiLiDXMrPiHF9w= github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= +github.com/hudl/fargo v1.4.0 h1:ZDDILMbB37UlAVLlWcJ2Iz1XuahZZTDZfdCKeclfq2s= github.com/hudl/fargo v1.4.0/go.mod h1:9Ai6uvFy5fQNq6VPKtg+Ceq1+eTY4nKUlR2JElEOcDo= -github.com/huin/goupnp v1.0.0/go.mod h1:n9v9KO1tAxYH82qOn+UTIFQDmx5n1Zxd/ClZDMX7Bnc= +github.com/huin/goupnp v1.0.3-0.20220313090229-ca81a64b4204 h1:+EYBkW+dbi3F/atB+LSQZSWh7+HNrV3A/N0y6DSoy9k= github.com/huin/goupnp v1.0.3-0.20220313090229-ca81a64b4204/go.mod h1:ZxNlw5WqJj6wSsRK5+YfflQGXYfccj5VgQsMNixHM7Y= +github.com/huin/goutil v0.0.0-20170803182201-1ca381bf3150 h1:vlNjIqmUZ9CMAWsbURYl3a6wZbw7q5RHVvlXTNS/Bs8= github.com/huin/goutil v0.0.0-20170803182201-1ca381bf3150/go.mod h1:PpLOETDnJ0o3iZrZfqZzyLl6l7F3c6L1oWn7OICBi6o= -github.com/hydrogen18/memlistener v0.0.0-20141126152155-54553eb933fb/go.mod h1:qEIFzExnS6016fRpRfxrExeVn2gbClQA99gQhnIcdhE= -github.com/hydrogen18/memlistener v0.0.0-20200120041712-dcc25e7acd91/go.mod h1:qEIFzExnS6016fRpRfxrExeVn2gbClQA99gQhnIcdhE= github.com/iancoleman/orderedmap v0.2.0 h1:sq1N/TFpYH++aViPcaKjys3bDClUEU7s5B+z6jq8pNA= github.com/iancoleman/orderedmap v0.2.0/go.mod h1:N0Wam8K1arqPXNWjMo21EXnBPOPp36vB07FNRdD2geA= -github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= +github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639 h1:mV02weKRL81bEnm8A0HT1/CAelMQDBuQIfLw8n+d6xI= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/imdario/mergo v0.3.4/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= -github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= -github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= -github.com/imdario/mergo v0.3.9/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= -github.com/imdario/mergo v0.3.10/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= -github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= -github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= +github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk= github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg= -github.com/imkira/go-interpol v1.1.0/go.mod h1:z0h2/2T3XF8kyEPpRgJ3kmNv+C43p+I/CoI+jC3w2iA= -github.com/improbable-eng/grpc-web v0.14.1/go.mod h1:zEjGHa8DAlkoOXmswrNvhUGEYQA9UI7DhrGeHR1DMGU= github.com/improbable-eng/grpc-web v0.15.0 h1:BN+7z6uNXZ1tQGcNAuaU1YjsLTApzkjt2tzCixLaUPQ= github.com/improbable-eng/grpc-web v0.15.0/go.mod h1:1sy9HKV4Jt9aEs9JSnkWlRJPuPtwNr0l57L4f878wP8= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= +github.com/influxdata/flux v0.65.1 h1:77BcVUCzvN5HMm8+j9PRBQ4iZcu98Dl4Y9rf+J5vhnc= github.com/influxdata/flux v0.65.1/go.mod h1:J754/zds0vvpfwuq7Gc2wRdVwEodfpCFM7mYlOw2LqY= -github.com/influxdata/influxdb v1.2.3-0.20180221223340-01288bdb0883/go.mod h1:qZna6X/4elxqT3yI9iZYdZrWWdeFOOprn86kgg4+IzY= +github.com/influxdata/influxdb v1.8.3 h1:WEypI1BQFTT4teLM+1qkEcvUi0dAvopAI/ir0vAiBg8= github.com/influxdata/influxdb v1.8.3/go.mod h1:JugdFhsvvI8gadxOI6noqNeeBHvWNTbfYGtiAn+2jhI= +github.com/influxdata/influxdb-client-go/v2 v2.4.0 h1:HGBfZYStlx3Kqvsv1h2pJixbCl/jhnFtxpKFAv9Tu5k= github.com/influxdata/influxdb-client-go/v2 v2.4.0/go.mod h1:vLNHdxTJkIf2mSLvGrpj8TCcISApPoXkaxP8g9uRlW8= github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= +github.com/influxdata/influxdb1-client v0.0.0-20200827194710-b269163b24ab h1:HqW4xhhynfjrtEiiSGcQUd6vrK23iMam1FO8rI7mwig= github.com/influxdata/influxdb1-client v0.0.0-20200827194710-b269163b24ab/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= +github.com/influxdata/influxql v1.1.1-0.20200828144457-65d3ef77d385 h1:ED4e5Cc3z5vSN2Tz2GkOHN7vs4Sxe2yds6CXvDnvZFE= github.com/influxdata/influxql v1.1.1-0.20200828144457-65d3ef77d385/go.mod h1:gHp9y86a/pxhjJ+zMjNXiQAA197Xk9wLxaz+fGG+kWk= github.com/influxdata/line-protocol v0.0.0-20180522152040-32c6aa80de5e/go.mod h1:4kt73NQhadE3daL3WhR5EJ/J2ocX0PZzwxQ0gXJ7oFE= github.com/influxdata/line-protocol v0.0.0-20200327222509-2487e7298839/go.mod h1:xaLFMmpvUxqXtVkUJfg9QmT88cDaCJ3ZKgdZ78oO8Qo= +github.com/influxdata/line-protocol v0.0.0-20210311194329-9aa0e372d097 h1:vilfsDSy7TDxedi9gyBkMvAirat/oRcL0lFdJBf6tdM= github.com/influxdata/line-protocol v0.0.0-20210311194329-9aa0e372d097/go.mod h1:xaLFMmpvUxqXtVkUJfg9QmT88cDaCJ3ZKgdZ78oO8Qo= +github.com/influxdata/promql/v2 v2.12.0 h1:kXn3p0D7zPw16rOtfDR+wo6aaiH8tSMfhPwONTxrlEc= github.com/influxdata/promql/v2 v2.12.0/go.mod h1:fxOPu+DY0bqCTCECchSRtWfc+0X19ybifQhZoQNF5D8= +github.com/influxdata/roaring v0.4.13-0.20180809181101-fc520f41fab6 h1:UzJnB7VRL4PSkUJHwsyzseGOmrO/r4yA+AuxGJxiZmA= github.com/influxdata/roaring v0.4.13-0.20180809181101-fc520f41fab6/go.mod h1:bSgUQ7q5ZLSO+bKBGqJiCBGAl+9DxyW63zLTujjUlOE= +github.com/influxdata/tdigest v0.0.0-20181121200506-bf2b5ad3c0a9 h1:MHTrDWmQpHq/hkq+7cw9oYAt2PqUw52TZazRA0N7PGE= github.com/influxdata/tdigest v0.0.0-20181121200506-bf2b5ad3c0a9/go.mod h1:Js0mqiSBE6Ffsg94weZZ2c+v/ciT8QRHFOap7EKDrR0= +github.com/influxdata/usage-client v0.0.0-20160829180054-6d3895376368 h1:+TUUmaFa4YD1Q+7bH9o5NCHQGPMqZCYJiNW6lIIS9z4= github.com/influxdata/usage-client v0.0.0-20160829180054-6d3895376368/go.mod h1:Wbbw6tYNvwa5dlB6304Sd+82Z3f7PmVZHVKU637d4po= +github.com/informalsystems/tm-load-test v1.3.0 h1:FGjKy7vBw6mXNakt+wmNWKggQZRsKkEYpaFk/zR64VA= github.com/informalsystems/tm-load-test v1.3.0/go.mod h1:OQ5AQ9TbT5hKWBNIwsMjn6Bf4O0U4b1kRc+0qZlQJKw= -github.com/intel/goresctrl v0.2.0/go.mod h1:+CZdzouYFn5EsxgqAQTEzMfwKwuc0fVdMrT9FCCAVRQ= -github.com/iris-contrib/blackfriday v2.0.0+incompatible/go.mod h1:UzZ2bDEoaSGPbkg6SAB4att1aAwTmVIx/5gCVqeyUdI= -github.com/iris-contrib/go.uuid v2.0.0+incompatible/go.mod h1:iz2lgM/1UnEf1kP0L/+fafWORmlnuysV2EMP8MW+qe0= -github.com/iris-contrib/httpexpect/v2 v2.3.1/go.mod h1:ICTf89VBKSD3KB0fsyyHviKF8G8hyepP0dOXJPWz3T0= -github.com/iris-contrib/i18n v0.0.0-20171121225848-987a633949d0/go.mod h1:pMCz62A0xJL6I+umB2YTlFRwWXaDFA0jy+5HzGiJjqI= -github.com/iris-contrib/jade v1.1.3/go.mod h1:H/geBymxJhShH5kecoiOCSssPX7QWYH7UaeZTSWddIk= -github.com/iris-contrib/jade v1.1.4/go.mod h1:EDqR+ur9piDl6DUgs6qRrlfzmlx/D5UybogqrXvJTBE= -github.com/iris-contrib/pongo2 v0.0.1/go.mod h1:Ssh+00+3GAZqSQb30AvBRNxBx7rf0GqwkjqxNd0u65g= -github.com/iris-contrib/schema v0.0.1/go.mod h1:urYA3uvUNG1TIIjOSCzHr9/LmbQo8LrOcOqfqxa4hXw= -github.com/iris-contrib/schema v0.0.6/go.mod h1:iYszG0IOsuIsfzjymw1kMzTL8YQcCWlm65f3wX8J5iA= -github.com/ishidawataru/sctp v0.0.0-20191218070446-00ab2ac2db07/go.mod h1:co9pwDoBCm1kGxawmb4sPq0cSIOOWNPT4KnHotMP1Zg= -github.com/j-keck/arping v0.0.0-20160618110441-2cf9dc699c56/go.mod h1:ymszkNOg6tORTn+6F6j+Jc8TOr5osrynvN6ivFWZ2GA= -github.com/j-keck/arping v1.0.2/go.mod h1:aJbELhR92bSk7tp79AWM/ftfc90EfEi2bQJrbBFOsPw= -github.com/jackpal/go-nat-pmp v1.0.2-0.20160603034137-1fa385a6f458/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc= +github.com/jackpal/go-nat-pmp v1.0.2 h1:KzKSgb7qkJvOUTqYl9/Hg/me3pWgBmERKrTGD7BdWus= github.com/jackpal/go-nat-pmp v1.0.2/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc= -github.com/jaguilar/vt100 v0.0.0-20150826170717-2703a27b14ea/go.mod h1:QMdK4dGB3YhEW2BmA1wgGpPYI3HZy/5gD705PXKUVSg= -github.com/jarcoal/httpmock v1.0.5/go.mod h1:ATjnClrvW/3tijVmpL/va5Z3aAyGvqU3gCT8nX0Txik= +github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= +github.com/jdxcode/netrc v0.0.0-20210204082910-926c7f70242a h1:d4+I1YEKVmWZrgkt6jpXBnLgV2ZjO0YxEtLDdfIZfH4= github.com/jdxcode/netrc v0.0.0-20210204082910-926c7f70242a/go.mod h1:Zi/ZFkEqFHTm7qkjyNJjaWH4LQA9LQhGJyF0lTYGpxw= +github.com/jedisct1/go-minisign v0.0.0-20190909160543-45766022959e h1:UvSe12bq+Uj2hWd8aOlwPmoZ+CITRFrdit+sDGfAg8U= github.com/jedisct1/go-minisign v0.0.0-20190909160543-45766022959e/go.mod h1:G1CVv03EnqU1wYL2dFwXxW2An0az9JTl/ZsqXQeBlkU= -github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0B/fFc00Y+Rasa88328GlI/XbtyysCtTHZS8h7IrBU= +github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= +github.com/jessevdk/go-flags v1.4.0 h1:4IU2WS7AumrZ/40jfhf4QVDMsQwqA7VEHozFRrGARJA= github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= -github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4= +github.com/jgautheron/goconst v1.5.1 h1:HxVbL1MhydKs8R8n/HE5NPvzfaYmQJA3o879lE4+WcM= github.com/jgautheron/goconst v1.5.1/go.mod h1:aAosetZ5zaeC/2EfMeRswtxUFBpe2Hr7HzkgX4fanO4= -github.com/jhump/gopoet v0.0.0-20190322174617-17282ff210b3/go.mod h1:me9yfT6IJSlOL3FCfrg+L6yzUEZ+5jW6WHt4Sk+UPUI= -github.com/jhump/gopoet v0.1.0/go.mod h1:me9yfT6IJSlOL3FCfrg+L6yzUEZ+5jW6WHt4Sk+UPUI= -github.com/jhump/goprotoc v0.5.0/go.mod h1:VrbvcYrQOrTi3i0Vf+m+oqQWk9l72mjkJCYo7UvLHRQ= -github.com/jhump/protoreflect v1.6.1/go.mod h1:RZQ/lnuN+zqeRVpQigTwO6o0AJUkxbnSnpuG7toUTG4= -github.com/jhump/protoreflect v1.11.0/go.mod h1:U7aMIjN0NWq9swDP7xDdoMfRHb35uiuTd3Z9nFXJf5E= -github.com/jhump/protoreflect v1.13.1-0.20220928232736-101791cb1b4c h1:XImQJfpJLmGEEd8ll5yPVyL/aEvmgGHW4WYTyNseLOM= -github.com/jhump/protoreflect v1.13.1-0.20220928232736-101791cb1b4c/go.mod h1:JytZfP5d0r8pVNLZvai7U/MCuTWITgrI4tTg7puQFKI= -github.com/jingyugao/rowserrcheck v0.0.0-20191204022205-72ab7603b68a/go.mod h1:xRskid8CManxVta/ALEhJha/pweKBaVG6fWgc0yH25s= +github.com/jhump/protocompile v0.0.0-20220216033700-d705409f108f h1:BNuUg9k2EiJmlMwjoef3e8vZLHplbVw6DrjGFjLL+Yo= +github.com/jhump/protocompile v0.0.0-20220216033700-d705409f108f/go.mod h1:qr2b5kx4HbFS7/g4uYO5qv9ei8303JMsC7ESbYiqr2Q= +github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c= +github.com/jhump/protoreflect v1.15.1/go.mod h1:jD/2GMKKE6OqX8qTjhADU1e6DShO+gavG9e0Q693nKo= +github.com/jingyugao/rowserrcheck v1.1.1 h1:zibz55j/MJtLsjP1OF4bSdgXxwL1b+Vn7Tjzq7gFzUs= github.com/jingyugao/rowserrcheck v1.1.1/go.mod h1:4yvlZSDb3IyDTUZJUmpZfm2Hwok+Dtp+nu2qOq+er9c= -github.com/jirfag/go-printf-func-name v0.0.0-20191110105641-45db9963cdd3/go.mod h1:HEWGJkRDzjJY2sqdDwxccsGicWEf9BQOZsq2tV+xzM0= +github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af h1:KA9BjwUk7KlCh6S9EAGWBt1oExIUv9WyNCiRz5amv48= github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af/go.mod h1:HEWGJkRDzjJY2sqdDwxccsGicWEf9BQOZsq2tV+xzM0= -github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= -github.com/jmespath/go-jmespath v0.0.0-20160803190731-bd40a432e4c7/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= -github.com/jmespath/go-jmespath v0.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeYCZ7fLUTSywik= +github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= +github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/jmhodges/levigo v1.0.0 h1:q5EC36kV79HWeTBWsod3mG11EgStG3qArTKcvlksN1U= github.com/jmhodges/levigo v1.0.0/go.mod h1:Q6Qx+uH3RAqyK4rFQroq9RL7mdkABMcfhEI+nNuzMJQ= -github.com/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks= -github.com/jmoiron/sqlx v1.2.1-0.20190826204134-d7d95172beb5/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks= -github.com/joefitzgerald/rainbow-reporter v0.1.0/go.mod h1:481CNgqmVHQZzdIbN52CupLJyoVwB10FQ/IQlF1pdL8= -github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= +github.com/jonboulle/clockwork v0.1.0 h1:VKV+ZcuP6l3yW9doeqz6ziZGgcynBVQO+obU0+0hcPo= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= -github.com/jonboulle/clockwork v0.2.0/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8= -github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8= -github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= -github.com/josharian/txtarfs v0.0.0-20210218200122-0702f000015a/go.mod h1:izVPOvVRsHiKkeGCT6tYBNWyDVuzj9wAaBb5R9qamfw= -github.com/jpillora/backoff v0.0.0-20180909062703-3050d21c67d7/go.mod h1:2iMrUgbbvHEiQClaW2NsSzMyGHqN+rDFqY705q49KG0= +github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA= github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= +github.com/jrick/logrotate v1.0.0 h1:lQ1bL/n9mBNeIXoTUoYRlK4dHuNJVofX9oWqBtPnSzI= github.com/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlTRt3OuAQ= -github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= -github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= +github.com/jstemmer/go-junit-report v0.9.1 h1:6QPYqodiu3GuPL+7mfx+NwDdp2eTkp9IfEUpgAwUN0o= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= +github.com/jsternberg/zap-logfmt v1.0.0 h1:0Dz2s/eturmdUS34GM82JwNEdQ9hPoJgqptcEKcbpzY= github.com/jsternberg/zap-logfmt v1.0.0/go.mod h1:uvPs/4X51zdkcm5jXl5SYoN+4RK21K8mysFmDaM/h+o= +github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= -github.com/juju/errors v0.0.0-20181118221551-089d3ea4e4d5/go.mod h1:W54LbzXuIE0boCoNJfwqpmkKJ1O4TCTZMetAt6jGk7Q= -github.com/juju/loggo v0.0.0-20180524022052-584905176618/go.mod h1:vgyd7OREkbtVEN/8IXZe5Ooef3LQePvuBm9UWj6ZL8U= -github.com/juju/ratelimit v1.0.1/go.mod h1:qapgC/Gy+xNh9UxzV13HGGl/6UXNN+ct+vwSgWNm/qk= -github.com/juju/testing v0.0.0-20180920084828-472a3e8b2073/go.mod h1:63prj8cnj0tU0S9OHjGJn+b1h0ZghCndfnbQolrYTwA= -github.com/julienschmidt/httprouter v1.1.1-0.20170430222011-975b5c4c7c21/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= +github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= +github.com/julz/importas v0.1.0 h1:F78HnrsjY3cR7j0etXy5+TU1Zuy7Xt08X/1aJnH5xXY= github.com/julz/importas v0.1.0/go.mod h1:oSFU2R4XK/P7kNBrnL/FEQlDGN1/6WoxXEjSSXO0DV0= +github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5 h1:PJr+ZMXIecYc1Ey2zucXdR73SMBtgjPgwa31099IMv0= github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= +github.com/jwilder/encoding v0.0.0-20170811194829-b4e1701a28ef h1:2jNeR4YUziVtswNP9sEFAI913cVrzH85T+8Q6LpYbT0= github.com/jwilder/encoding v0.0.0-20170811194829-b4e1701a28ef/go.mod h1:Ct9fl0F6iIOGgxJ5npU/IUOhOhqlVrGjyIZc8/MagT0= -github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k= -github.com/karalabe/usb v0.0.0-20190919080040-51dc0efba356/go.mod h1:Od972xHfMJowv7NGVDiWVxk2zxnWgjLlJzE+F4F7AGU= +github.com/karalabe/usb v0.0.2 h1:M6QQBNxF+CQ8OFvxrT90BA0qBOXymndZnk5q235mFc4= github.com/karalabe/usb v0.0.2/go.mod h1:Od972xHfMJowv7NGVDiWVxk2zxnWgjLlJzE+F4F7AGU= -github.com/kataras/blocks v0.0.6/go.mod h1:UK+Iwk0Oxpc0GdoJja7sEildotAUKK1LYeYcVF0COWc= -github.com/kataras/blocks v0.0.7/go.mod h1:UJIU97CluDo0f+zEjbnbkeMRlvYORtmc1304EeyXf4I= -github.com/kataras/golog v0.0.9/go.mod h1:12HJgwBIZFNGL0EJnMRhmvGA0PQGx8VFwrZtM4CqbAk= -github.com/kataras/golog v0.0.10/go.mod h1:yJ8YKCmyL+nWjERB90Qwn+bdyBZsaQwU3bTVFgkFIp8= -github.com/kataras/golog v0.1.7/go.mod h1:jOSQ+C5fUqsNSwurB/oAHq1IFSb0KI3l6GMa7xB6dZA= -github.com/kataras/iris/v12 v12.0.1/go.mod h1:udK4vLQKkdDqMGJJVd/msuMtN6hpYJhg/lSzuxjhO+U= -github.com/kataras/iris/v12 v12.1.8/go.mod h1:LMYy4VlP67TQ3Zgriz8RE2h2kMZV2SgMYbq3UhfoFmE= -github.com/kataras/iris/v12 v12.2.0-beta5/go.mod h1:q26aoWJ0Knx/00iPKg5iizDK7oQQSPjbD8np0XDh6dc= -github.com/kataras/jwt v0.1.8/go.mod h1:Q5j2IkcIHnfwy+oNY3TVWuEBJNw0ADgCcXK9CaZwV4o= -github.com/kataras/neffos v0.0.10/go.mod h1:ZYmJC07hQPW67eKuzlfY7SO3bC0mw83A3j6im82hfqw= -github.com/kataras/neffos v0.0.14/go.mod h1:8lqADm8PnbeFfL7CLXh1WHw53dG27MC3pgi2R1rmoTE= -github.com/kataras/neffos v0.0.20/go.mod h1:srdvC/Uo8mgrApWW0AYtiiLgMbyNPf69qPsd2FhE6MQ= -github.com/kataras/pio v0.0.0-20190103105442-ea782b38602d/go.mod h1:NV88laa9UiiDuX9AhMbDPkGYSPugBOV6yTZB1l2K9Z0= -github.com/kataras/pio v0.0.2/go.mod h1:hAoW0t9UmXi4R5Oyq5Z4irTbaTsOemSrDGUtaTl7Dro= -github.com/kataras/pio v0.0.10/go.mod h1:gS3ui9xSD+lAUpbYnjOGiQyY7sUMJO+EHpiRzhtZ5no= -github.com/kataras/pio v0.0.11/go.mod h1:38hH6SWH6m4DKSYmRhlrCJ5WItwWgCVrTNU62XZyUvI= -github.com/kataras/sitemap v0.0.5/go.mod h1:KY2eugMKiPwsJgx7+U103YZehfvNGOXURubcGyk0Bz8= -github.com/kataras/sitemap v0.0.6/go.mod h1:dW4dOCNs896OR1HmG+dMLdT7JjDk7mYBzoIRwuj5jA4= -github.com/kataras/tunnel v0.0.4/go.mod h1:9FkU4LaeifdMWqZu7o20ojmW4B7hdhv2CMLwfnHGpYw= +github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4= github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= -github.com/keybase/go-keychain v0.0.0-20190712205309-48d3d31d256d/go.mod h1:JJNrCn9otv/2QP4D7SMJBgaleKpOf66PnW6F5WGNRIc= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= +github.com/kisielk/errcheck v1.6.2 h1:uGQ9xI8/pgc9iOoCe7kWQgRE6SBTrCGmTSf0LrEtY7c= github.com/kisielk/errcheck v1.6.2/go.mod h1:nXw/i/MfnvRHqXa7XXmQMUB0oNFGuBrNI8d8NLy0LPw= +github.com/kisielk/gotool v1.0.0 h1:AV2c/EiW3KqPNT9ZKl07ehoAGi4C5/01Cfbblndcapg= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/kkHAIKE/contextcheck v1.1.3 h1:l4pNvrb8JSwRd51ojtcOxOeHJzHek+MtOyXbaR0uvmw= github.com/kkHAIKE/contextcheck v1.1.3/go.mod h1:PG/cwd6c0705/LM0KTr1acO2gORUxkSVWyLJOFW5qoo= +github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23 h1:FOOIBWrEkLgmlgGfMuZT83xIwfPDxEI2OHu6xUmJMFE= github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4= github.com/klauspost/compress v1.4.0/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= -github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= -github.com/klauspost/compress v1.8.2/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= -github.com/klauspost/compress v1.9.0/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= -github.com/klauspost/compress v1.9.7/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= -github.com/klauspost/compress v1.11.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.11.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= -github.com/klauspost/compress v1.11.13/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.12.3/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= -github.com/klauspost/compress v1.13.4/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= -github.com/klauspost/compress v1.13.5/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= -github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= -github.com/klauspost/compress v1.14.4/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= -github.com/klauspost/compress v1.15.0/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= -github.com/klauspost/compress v1.15.1/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= -github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU= -github.com/klauspost/compress v1.15.10/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM= -github.com/klauspost/compress v1.15.11 h1:Lcadnb3RKGin4FYM/orgq0qde+nc15E5Cbqg4B9Sx9c= github.com/klauspost/compress v1.15.11/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM= +github.com/klauspost/compress v1.16.5 h1:IFV2oUNUzZaz+XyusxpLzpzS8Pt5rh0Z16For/djlyI= +github.com/klauspost/compress v1.16.5/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/klauspost/cpuid v0.0.0-20170728055534-ae7887de9fa5 h1:2U0HzY8BJ8hVwDKIzp7y4voR9CX/nvcfymLmg2UiOio= github.com/klauspost/cpuid v0.0.0-20170728055534-ae7887de9fa5/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= -github.com/klauspost/cpuid v0.0.0-20180405133222-e7e905edc00e/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= -github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= -github.com/klauspost/cpuid v1.2.1/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= +github.com/klauspost/crc32 v0.0.0-20161016154125-cb6bfca970f6 h1:KAZ1BW2TCmT6PRihDPpocIy1QTtsAsrx6TneU/4+CMg= github.com/klauspost/crc32 v0.0.0-20161016154125-cb6bfca970f6/go.mod h1:+ZoRqAPRLkC4NPOvfYeR5KNOrY6TD+/sAC3HXPZgDYg= github.com/klauspost/pgzip v1.0.2-0.20170402124221-0bf5dcad4ada/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs= +github.com/klauspost/pgzip v1.2.5 h1:qnWYvvKqedOF2ulHpMG72XQol4ILEJ8k2wwRl/Km8oE= github.com/klauspost/pgzip v1.2.5/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/fs v0.1.0 h1:Jskdu9ieNAYnjxsi0LbQp1ulIKZV1LAFgK1tWhpZgl8= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= +github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515 h1:T+h1c/A9Gawja4Y9mFVWj2vyii2bbUNDw3kt9VxK2EY= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= -github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= +github.com/kr/pty v1.1.1 h1:VkoXIwSboBpnk99O/KFauAEILuNHv5DVFKZMBN/gUgw= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/pty v1.1.3/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA= -github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/kulti/thelper v0.6.3 h1:ElhKf+AlItIu+xGnI990no4cE2+XaSu1ULymV2Yulxs= github.com/kulti/thelper v0.6.3/go.mod h1:DsqKShOvP40epevkFrvIwkCMNYxMeTNjdWL4dqWHZ6I= +github.com/kunwardeep/paralleltest v1.0.6 h1:FCKYMF1OF2+RveWlABsdnmsvJrei5aoyZoaGS+Ugg8g= github.com/kunwardeep/paralleltest v1.0.6/go.mod h1:Y0Y0XISdZM5IKm3TREQMZ6iteqn1YuwCsJO/0kL9Zes= -github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k= +github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= +github.com/kyoh86/exportloopref v0.1.8 h1:5Ry/at+eFdkX9Vsdw3qU4YkvGtzuVfzT4X7S77LoN/M= github.com/kyoh86/exportloopref v0.1.8/go.mod h1:1tUcJeiioIs7VWe5gcOObrux3lb66+sBqGZrRkMwPgg= -github.com/labstack/echo/v4 v4.1.11/go.mod h1:i541M3Fj6f76NZtHSj7TXnyM8n2gaodfvfxNnFqi74g= +github.com/labstack/echo/v4 v4.2.1 h1:LF5Iq7t/jrtUuSutNuiEWtB5eiHfZ5gSe2pcu5exjQw= github.com/labstack/echo/v4 v4.2.1/go.mod h1:AA49e0DZ8kk5jTOOCKNuPR6oTnBS0dYiM4FW1e6jwpg= -github.com/labstack/echo/v4 v4.5.0/go.mod h1:czIriw4a0C1dFun+ObrXp7ok03xON0N1awStJ6ArI7Y= -github.com/labstack/echo/v4 v4.9.0/go.mod h1:xkCDAdFCIf8jsFQ5NnbK7oqaF/yU1A1X20Ltm0OvSks= +github.com/labstack/gommon v0.3.0 h1:JEeO0bvc78PKdyHxloTKiF8BD5iGrH8T6MSeGvSgob0= github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k= -github.com/labstack/gommon v0.3.1/go.mod h1:uW6kP17uPlLJsD3ijUYn3/M5bAxtlZhMI6m3MFxTMTM= +github.com/ldez/gomoddirectives v0.2.3 h1:y7MBaisZVDYmKvt9/l1mjNCiSA1BVn34U0ObUcJwlhA= github.com/ldez/gomoddirectives v0.2.3/go.mod h1:cpgBogWITnCfRq2qGoDkKMEVSaarhdBr6g8G04uz6d0= +github.com/ldez/tagliatelle v0.3.1 h1:3BqVVlReVUZwafJUwQ+oxbx2BEX2vUG4Yu/NOfMiKiM= github.com/ldez/tagliatelle v0.3.1/go.mod h1:8s6WJQwEYHbKZDsp/LjArytKOG8qaMrKQQ3mFukHs88= +github.com/leanovate/gopter v0.2.9 h1:fQjYxZaynp97ozCzfOyOuAGOU4aU/z37zf/tOujFk7c= github.com/leanovate/gopter v0.2.9/go.mod h1:U2L/78B+KVFIx2VmW6onHJQzXtFb+p5y3y2Sh+Jxxv8= github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w= github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY= +github.com/leonklingele/grouper v1.1.0 h1:tC2y/ygPbMFSBOs3DcyaEMKnnwH7eYKzohOtRrf0SAg= github.com/leonklingele/grouper v1.1.0/go.mod h1:uk3I3uDfi9B6PeUjsCKi6ndcf63Uy7snXgR4yDYQVDY= -github.com/letsencrypt/pkcs11key/v4 v4.0.0/go.mod h1:EFUvBDay26dErnNb70Nd0/VW3tJiIbETBPTl9ATXQag= -github.com/lib/pq v0.0.0-20180327071824-d34b9ff171c2/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/lib/pq v1.8.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= -github.com/lib/pq v1.9.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= -github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= -github.com/lib/pq v1.10.4/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= -github.com/lib/pq v1.10.6 h1:jbk+ZieJ0D7EVGJYpL9QTz7/YW6UHbmdnZWYyK5cdBs= -github.com/lib/pq v1.10.6/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= -github.com/libp2p/go-buffer-pool v0.0.2/go.mod h1:MvaB6xw5vOrDl8rYZGLFdKAuk/hRoRZd1Vi32+RXyFM= +github.com/lib/pq v1.10.7 h1:p7ZhMD+KsSRozJr34udlUrhboJwWAgCg34+/ZZNvZZw= +github.com/lib/pq v1.10.7/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/libp2p/go-buffer-pool v0.1.0 h1:oK4mSFcQz7cTQIfqbe4MIj9gLW+mnanjyFtc6cdF0Y8= github.com/libp2p/go-buffer-pool v0.1.0/go.mod h1:N+vh8gMqimBzdKkSMVuydVDq+UV5QTWy5HSiZacSbPg= +github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743 h1:143Bb8f8DuGWck/xpNUOckBVYfFbBTnLevfRZ1aVVqo= github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM= +github.com/lightstep/lightstep-tracer-go v0.18.1 h1:vi1F1IQ8N7hNWytK9DpJsUfQhGuNSc19z330K6vl4zk= github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= -github.com/linuxkit/virtsock v0.0.0-20201010232012-f8cee7dfc7a3/go.mod h1:3r6x7q95whyfWQpmGZTu3gk3v2YkMi05HEzl7Tf7YEo= -github.com/linxGnu/grocksdb v1.7.10 h1:dz7RY7GnFUA+GJO6jodyxgkUeGMEkPp3ikt9hAcNGEw= -github.com/linxGnu/grocksdb v1.7.10/go.mod h1:0hTf+iA+GOr0jDX4CgIYyJZxqOH9XlBh6KVj8+zmF34= -github.com/logrusorgru/aurora v0.0.0-20181002194514-a7b3b318ed4e/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4= +github.com/linxGnu/grocksdb v1.8.0 h1:H4L/LhP7GOMf1j17oQAElHgVlbEje2h14A8Tz9cM2BE= +github.com/linxGnu/grocksdb v1.8.0/go.mod h1:09CeBborffXhXdNpEcOeZrLKEnRtrZFEpFdPNI9Zjjg= +github.com/lucasjones/reggen v0.0.0-20180717132126-cdb49ff09d77 h1:6xiz3+ZczT3M4+I+JLpcPGG1bQKm8067HktB17EDWEE= github.com/lucasjones/reggen v0.0.0-20180717132126-cdb49ff09d77/go.mod h1:5ELEyG+X8f+meRWHuqUOewBOhvHkl7M76pdGEansxW4= +github.com/lufeee/execinquery v1.2.1 h1:hf0Ems4SHcUGBxpGN7Jz78z1ppVkP/837ZlETPCEtOM= github.com/lufeee/execinquery v1.2.1/go.mod h1:EC7DrEKView09ocscGHC+apXMIaorh4xqSxS/dy8SbM= -github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= -github.com/lyft/protoc-gen-star v0.5.3/go.mod h1:V0xaHgaf5oCCqmcxYcWiDfTiKsZsRc87/1qhoTACD8w= -github.com/magefile/mage v1.14.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A= +github.com/lyft/protoc-gen-validate v0.0.13 h1:KNt/RhmQTOLr7Aj8PsJ7mTronaFyx80mRTT9qF261dA= +github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= -github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= -github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= -github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo= -github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= -github.com/mailgun/raymond/v2 v2.0.46/go.mod h1:lsgvL50kgt1ylcFJYZiULi5fjPBkkhNfj4KA0W54Z18= -github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= +github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e h1:hB2xlXdHp/pmPZq0y3QnmWAArdw9PqbmotexnWx/FU8= github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= -github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= -github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= +github.com/manifoldco/promptui v0.9.0 h1:3V4HzJk1TtXW1MTZMP7mdlwbBpIinw3HztaIlYthEiA= +github.com/manifoldco/promptui v0.9.0/go.mod h1:ka04sppxSGFAtxX0qhlYQjISsg9mR4GWtQEhdbn6Pgg= +github.com/maratori/testableexamples v1.0.0 h1:dU5alXRrD8WKSjOUnmJZuzdxWOEQ57+7s93SLMxb2vI= github.com/maratori/testableexamples v1.0.0/go.mod h1:4rhjL1n20TUTT4vdh3RDqSizKLyXp7K2u6HgraZCGzE= -github.com/maratori/testpackage v1.0.1/go.mod h1:ddKdw+XG0Phzhx8BFDTKgpWP4i7MpApTE5fXSKAqwDU= +github.com/maratori/testpackage v1.1.0 h1:GJY4wlzQhuBusMF1oahQCBtUV/AQ/k69IZ68vxaac2Q= github.com/maratori/testpackage v1.1.0/go.mod h1:PeAhzU8qkCwdGEMTEupsHJNlQu2gZopMC6RjbhmHeDc= -github.com/marstr/guid v1.1.0/go.mod h1:74gB1z2wpxxInTG6yaqA7KrtM0NZ+RbrcqDvYHefzho= -github.com/matoous/godox v0.0.0-20190911065817-5d6d842e92eb/go.mod h1:1BELzlh859Sh1c6+90blK8lbYy0kwQf1bYlBhBysy1s= +github.com/matoous/godox v0.0.0-20210227103229-6504466cf951 h1:pWxk9e//NbPwfxat7RXkts09K+dEBJWakUWwICVqYbA= github.com/matoous/godox v0.0.0-20210227103229-6504466cf951/go.mod h1:1BELzlh859Sh1c6+90blK8lbYy0kwQf1bYlBhBysy1s= -github.com/matryer/is v1.2.0/go.mod h1:2fLPjFQM9rhQ15aVEtbuwhJinnOqrmgXPNdZsdwlWXA= -github.com/matryer/is v1.4.0/go.mod h1:8I/i5uYgLzgsgEloJE1U6xx5HkBQpAZvepWuujKwMRU= +github.com/matryer/moq v0.0.0-20190312154309-6cfb0558e1bd h1:HvFwW+cm9bCbZ/+vuGNq7CRWXql8c0y8nGeYpqmpvmk= github.com/matryer/moq v0.0.0-20190312154309-6cfb0558e1bd/go.mod h1:9ELz6aaclSIGnZBoaSLZ3NAl1VTufbOrXBPvtcy6WiQ= -github.com/matryer/try v0.0.0-20161228173917-9ac251b645a2/go.mod h1:0KeJpeMD6o+O4hW7qJOT7vyQPKrWmj26uf5wMc/IiIs= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= -github.com/mattn/go-colorable v0.1.0/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= -github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ= github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= -github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= -github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.7/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= -github.com/mattn/go-colorable v0.1.11/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= -github.com/mattn/go-ieproxy v0.0.0-20190610004146-91bb50d98149/go.mod h1:31jz6HNzdxOmlERGGEc4v/dMssOfmp2p5bT/okiKFFc= -github.com/mattn/go-ieproxy v0.0.0-20190702010315-6dee0af9227d/go.mod h1:31jz6HNzdxOmlERGGEc4v/dMssOfmp2p5bT/okiKFFc= -github.com/mattn/go-ieproxy v0.0.1/go.mod h1:pYabZ6IHcRpFh7vIaLfK7rdcWgFEb3SFJ6/gNWuh88E= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -github.com/mattn/go-isatty v0.0.5-0.20180830101745-3fb116b82035/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ= -github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84= -github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= -github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA= +github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= -github.com/mattn/go-runewidth v0.0.6/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= +github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0= github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= -github.com/mattn/go-shellwords v1.0.3/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o= -github.com/mattn/go-shellwords v1.0.6/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o= -github.com/mattn/go-shellwords v1.0.10/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y= -github.com/mattn/go-shellwords v1.0.12/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y= -github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= +github.com/mattn/go-sqlite3 v1.11.0 h1:LDdKkqtYlom37fkvqs8rMPFKAMe8+SgjbwZ6ex1/A/Q= github.com/mattn/go-sqlite3 v1.11.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= -github.com/mattn/go-sqlite3 v1.14.9/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= +github.com/mattn/go-tty v0.0.0-20180907095812-13ff1204f104 h1:d8RFOZ2IiFtFWBcKEHAFYJcPTf0wY5q0exFNJZVWa1U= github.com/mattn/go-tty v0.0.0-20180907095812-13ff1204f104/go.mod h1:XPvLUNfbS4fJH25nqRHfWLMa1ONC8Amw+mIA639KxkE= -github.com/mattn/go-zglob v0.0.1/go.mod h1:9fxibJccNxU2cnpIKLRRFA7zX7qhkJIQWBb449FYHOo= -github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 h1:I0XW9+e1XWDxdcEniV4rQAIOPUGDq67JSCiRCgGCZLI= -github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= -github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2/go.mod h1:eD9eIE7cdwcMi9rYluz88Jz2VyhSmden33/aXg4oVIY= +github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= +github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= +github.com/mbilski/exhaustivestruct v1.2.0 h1:wCBmUnSYufAHO6J4AVWY6ff+oxWxsVFrwgOdMUQePUo= github.com/mbilski/exhaustivestruct v1.2.0/go.mod h1:OeTBVxQWoEmB2J2JCHmXWPJ0aksxSUOUy+nvtVEfzXc= -github.com/mediocregopher/mediocre-go-lib v0.0.0-20181029021733-cb65787f37ed/go.mod h1:dSsfyI2zABAdhcbvkXqgxOxrCsbYeHCPgrZkku60dSg= -github.com/mediocregopher/radix/v3 v3.3.0/go.mod h1:EmfVyvspXz1uZEyPBMyGK+kjWiKQGvsUt6O3Pj+LDCQ= -github.com/mediocregopher/radix/v3 v3.4.2/go.mod h1:8FL3F6UQRXHXIBSPUs5h0RybMF8i4n7wVopoX3x7Bv8= -github.com/mediocregopher/radix/v3 v3.8.0/go.mod h1:8FL3F6UQRXHXIBSPUs5h0RybMF8i4n7wVopoX3x7Bv8= -github.com/mgechev/dots v0.0.0-20210922191527-e955255bf517/go.mod h1:KQ7+USdGKfpPjXk4Ga+5XxQM4Lm4e3gAogrreFAYpOg= +github.com/mgechev/revive v1.2.4 h1:+2Hd/S8oO2H0Ikq2+egtNwQsVhAeELHjxjIUFX5ajLI= github.com/mgechev/revive v1.2.4/go.mod h1:iAWlQishqCuj4yhV24FTnKSXGpbAA+0SckXB8GQMX/Q= -github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= -github.com/microcosm-cc/bluemonday v1.0.2/go.mod h1:iVP4YcDBq+n/5fb23BhYFvIMq/leAFZyRl6bYmGDlGc= -github.com/microcosm-cc/bluemonday v1.0.20/go.mod h1:yfBmMi8mxvaZut3Yytv+jTXRY8mxyjJ0/kQBTElld50= -github.com/microcosm-cc/bluemonday v1.0.21/go.mod h1:ytNkv4RrDrLJ2pqlsSI46O6IVXmZOBBD4SaJyDwwTkM= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= -github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= -github.com/miekg/dns v1.1.35/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM= -github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= +github.com/miekg/dns v1.1.43 h1:JKfpVSCB84vrAmHzyrsxB5NAr5kLoMXZArPSw7Qlgyg= github.com/miekg/dns v1.1.43/go.mod h1:+evo5L0630/F6ca/Z9+GAqzhjGyn8/c+TBaOyfEl0V4= -github.com/miekg/pkcs11 v1.0.2/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs= -github.com/miekg/pkcs11 v1.0.3/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs= -github.com/miekg/pkcs11 v1.1.1/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs= github.com/mimoo/StrobeGo v0.0.0-20181016162300-f8f6d4d2b643/go.mod h1:43+3pMjjKimDBf5Kr4ZFNGbLql1zKkbImw+fZbw3geM= -github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 h1:QRUSJEgZn2Snx0EmT/QLXibWjSUDjKWvXIT19NBVp94= -github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0/go.mod h1:43+3pMjjKimDBf5Kr4ZFNGbLql1zKkbImw+fZbw3geM= -github.com/minio/highwayhash v1.0.1/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY= +github.com/mimoo/StrobeGo v0.0.0-20220103164710-9a04d6ca976b h1:QrHweqAtyJ9EwCaGHBu1fghwxIPiopAHV06JlXrMHjk= +github.com/mimoo/StrobeGo v0.0.0-20220103164710-9a04d6ca976b/go.mod h1:xxLb2ip6sSUts3g1irPVHyk/DGslwQsNOo9I7smJfNU= github.com/minio/highwayhash v1.0.2 h1:Aak5U0nElisjDCfPSG79Tgzkn2gl66NxOMspRrKnA/g= github.com/minio/highwayhash v1.0.2/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY= -github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible/go.mod h1:8AuVvqP/mXw1px98n46wfvcGfQ4ci2FwoAjKYxuo3Z4= +github.com/mitchellh/cli v1.0.0 h1:iGBIsUe3+HZ/AD/Vd7DErOt5sU9fa8Uj7A2s1aggv1Y= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= -github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= -github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/mitchellh/go-ps v0.0.0-20190716172923-621e5597135b/go.mod h1:r1VsdOzOPt1ZSrGZWFoNhsAedKnEd6r9Np1+5blZCWk= -github.com/mitchellh/go-ps v1.0.0/go.mod h1:J4lOc8z8yJs6vUwklHw2XEIiT4z4C40KtWVN3nvg8Pg= github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= -github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= +github.com/mitchellh/go-testing-interface v1.14.1 h1:jrgshOhYAUVNMAJiKbEu7EqAwgJJ2JqpQmpLJOu07cU= +github.com/mitchellh/go-testing-interface v1.14.1/go.mod h1:gfgS7OtZj6MA4U1UrDRp04twqAjfvlZyCfX3sDjEym8= +github.com/mitchellh/gox v0.4.0 h1:lfGJxY7ToLJQjHHwi0EX6uYBdK78egf954SQl13PQJc= github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= -github.com/mitchellh/hashstructure v1.0.0/go.mod h1:QjSHrPWS+BGUVBYkbTZWEnOh3G1DutKwClXU/ABz6AQ= -github.com/mitchellh/hashstructure/v2 v2.0.2/go.mod h1:MG3aRVU/N29oo/V/IhBX8GR/zz4kQkprJgF2EVszyDE= +github.com/mitchellh/iochan v1.0.0 h1:C+X3KsSTLFVBr/tK1eYN/vs4rJcvsiLU338UhYPJWeY= github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mitchellh/mapstructure v1.3.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/mitchellh/mapstructure v1.3.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/mitchellh/mapstructure v1.4.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod h1:OkQIRizQZAeMln+1tSwduZz7+Af5oFlKirV/MSYes2A= +github.com/mitchellh/pointerstructure v1.2.0 h1:O+i9nHnXS3l/9Wu7r4NrEdwA2VFTicjUEN1uBnDo34A= github.com/mitchellh/pointerstructure v1.2.0/go.mod h1:BRAsLI5zgXmw97Lf6s25bs8ohIXc3tViBH44KcwB2g4= -github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= -github.com/mitchellh/reflectwalk v1.0.1/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= -github.com/moby/buildkit v0.8.1/go.mod h1:/kyU1hKy/aYCuP39GZA9MaKioovHku57N6cqlKZIaiQ= +github.com/moby/buildkit v0.10.4 h1:FvC+buO8isGpUFZ1abdSLdGHZVqg9sqI4BbFL8tlzP4= github.com/moby/buildkit v0.10.4/go.mod h1:Yajz9vt1Zw5q9Pp4pdb3TCSUXJBIroIQGQ3TTs/sLug= -github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc= -github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c= -github.com/moby/sys/mount v0.1.0/go.mod h1:FVQFLDRWwyBjDTBNQXDlWnSFREqOo3OKX9aqhmeoo74= -github.com/moby/sys/mount v0.1.1/go.mod h1:FVQFLDRWwyBjDTBNQXDlWnSFREqOo3OKX9aqhmeoo74= -github.com/moby/sys/mount v0.3.0/go.mod h1:U2Z3ur2rXPFrFmy4q6WMwWrBOAQGYtYTRVM8BIvzbwk= -github.com/moby/sys/mountinfo v0.1.0/go.mod h1:w2t2Avltqx8vE7gX5l+QiBKxODu2TX0+Syr3h52Tw4o= -github.com/moby/sys/mountinfo v0.1.3/go.mod h1:w2t2Avltqx8vE7gX5l+QiBKxODu2TX0+Syr3h52Tw4o= -github.com/moby/sys/mountinfo v0.4.0/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A= -github.com/moby/sys/mountinfo v0.4.1/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A= -github.com/moby/sys/mountinfo v0.5.0/go.mod h1:3bMD3Rg+zkqx8MRYPi7Pyb0Ie97QEBmdxbhnCLlSvSU= -github.com/moby/sys/mountinfo v0.6.0/go.mod h1:3bMD3Rg+zkqx8MRYPi7Pyb0Ie97QEBmdxbhnCLlSvSU= -github.com/moby/sys/signal v0.6.0/go.mod h1:GQ6ObYZfqacOwTtlXvcmh9A26dVRul/hbOZn88Kg8Tg= -github.com/moby/sys/symlink v0.1.0/go.mod h1:GGDODQmbFOjFsXvfLVn3+ZRxkch54RkSiGqsZeMYowQ= -github.com/moby/sys/symlink v0.2.0/go.mod h1:7uZVF2dqJjG/NsClqul95CqKOBRQyYSNnJ6BMgR/gFs= -github.com/moby/term v0.0.0-20200312100748-672ec06f55cd/go.mod h1:DdlQx2hp0Ss5/fLikoLlEeIYiATotOjgB//nb973jeo= -github.com/moby/term v0.0.0-20200915141129-7f0af18e79f2/go.mod h1:TjQg8pa4iejrUrjiz0MCtMV38jdMNW4doKSiBrEvCQQ= -github.com/moby/term v0.0.0-20201216013528-df9cb8a40635/go.mod h1:FBS0z0QWA44HXygs7VXDUOGoN/1TV3RuWkLO04am3wc= -github.com/moby/term v0.0.0-20210610120745-9d4ed1856297/go.mod h1:vgPCkQMyxTZ7IDy8SXRufE172gr8+K/JE/7hHFxHW3A= -github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6/go.mod h1:E2VnQOmVuvZB6UYnnDB0qG5Nq/1tD9acaOpo6xmt0Kw= +github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae h1:O4SWKdcHVCvYqyDV+9CJA1fcDN2L11Bule0iFy3YlAI= github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae/go.mod h1:E2VnQOmVuvZB6UYnnDB0qG5Nq/1tD9acaOpo6xmt0Kw= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5 h1:8Q0qkMVC/MmWkpIdlvZgcv2o2jrlF6zqVOh7W5YHdMA= github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5/go.mod h1:caMODM3PzxT8aQXRPkAt8xlV/e7d7w8GM5g0fa5F0D8= -github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8= +github.com/moricho/tparallel v0.2.1 h1:95FytivzT6rYzdJLdtfn6m1bfFJylOJK41+lgv/EHf4= github.com/moricho/tparallel v0.2.1/go.mod h1:fXEIZxG2vdfl0ZF8b42f5a78EhjjD5mX8qUplsoSU4k= +github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= -github.com/moul/http2curl v1.0.0/go.mod h1:8UbvGypXm98wA/IqH45anm5Y2Z6ep6O31QGOAZ3H0fQ= -github.com/mozilla/scribe v0.0.0-20180711195314-fb71baf557c1/go.mod h1:FIczTrinKo8VaLxe6PWTPEXRXDIHz2QAwiaBaP5/4a8= -github.com/mozilla/tls-observatory v0.0.0-20190404164649-a3c1b6cfecfd/go.mod h1:SrKMQvPiws7F7iqYp8/TX+IhxCYhzr6N/1yb8cwHsGk= -github.com/mozilla/tls-observatory v0.0.0-20200317151703-4fa42e1c2dee/go.mod h1:SrKMQvPiws7F7iqYp8/TX+IhxCYhzr6N/1yb8cwHsGk= -github.com/mozilla/tls-observatory v0.0.0-20210609171429-7bc42856d2e5/go.mod h1:FUqVoUPHSEdDR0MnFM3Dh8AU0pZHLXUD127SAJGER/s= -github.com/mrunalp/fileutils v0.0.0-20200520151820-abd8a0e76976/go.mod h1:x8F1gnqOkIEiO4rqoeEEEqQbo7HjGMTvyoq3gej4iT0= -github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ= +github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae h1:VeRdUYdCw49yizlSbMEn2SZ+gT+3IUKx8BqxyQdz+BY= github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae/go.mod h1:qAyveg+e4CE+eKJXWVjKXM4ck2QobLqTDytGJbLLhJg= github.com/mtibben/percent v0.2.1 h1:5gssi8Nqo8QU/r2pynCm+hBQHpkB/uNK7BJCFogWdzs= github.com/mtibben/percent v0.2.1/go.mod h1:KG9uO+SZkUp+VkRHsCdYQV3XSZrrSpR3O9ibNBTZrns= -github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= -github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f h1:KUppIJq7/+SVif2QVs3tOP0zanoHgBEVAwHxUSIzRqU= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/mwitkow/go-proto-validators v0.0.0-20180403085117-0950a7990007/go.mod h1:m2XC9Qq0AlmmVksL6FktJCdTYyLk7V3fKyp0sl1yWQo= -github.com/mwitkow/go-proto-validators v0.2.0/go.mod h1:ZfA1hW+UH/2ZHOWvQ3HnQaU0DtnpXu850MZiy+YUgcc= +github.com/mwitkow/grpc-proxy v0.0.0-20181017164139-0f1106ef9c76 h1:0xuRacu/Zr+jX+KyLLPPktbwXqyOvnOPUQmMLzX1jxU= github.com/mwitkow/grpc-proxy v0.0.0-20181017164139-0f1106ef9c76/go.mod h1:x5OoJHDHqxHS801UIuhqGl6QdSAEJvtausosHSdazIo= -github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= -github.com/nakabonne/nestif v0.3.0/go.mod h1:dI314BppzXjJ4HsCnbo7XzrJHPszZsjnk5wEBSYHI2c= +github.com/nakabonne/nestif v0.3.1 h1:wm28nZjhQY5HyYPx+weN3Q65k6ilSBxDb8v5S81B81U= github.com/nakabonne/nestif v0.3.1/go.mod h1:9EtoZochLn5iUprVDmDjqGKPofoUEBL8U4Ngq6aY7OE= +github.com/naoina/go-stringutil v0.1.0 h1:rCUeRUHjBjGTSHl0VC00jUPLz8/F9dDzYI70Hzifhks= github.com/naoina/go-stringutil v0.1.0/go.mod h1:XJ2SJL9jCtBh+P9q5btrd/Ylo8XwT/h1USek5+NqSA0= +github.com/naoina/toml v0.1.2-0.20170918210437-9fafd6967416 h1:shk/vn9oCoOTmwcouEdwIeOtOGA/ELRUw/GwvxwfT+0= github.com/naoina/toml v0.1.2-0.20170918210437-9fafd6967416/go.mod h1:NBIhNtsFMo3G2szEBne+bO4gS192HuIYRqfvOWb4i1E= github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg= +github.com/nats-io/jwt v0.3.2 h1:+RB5hMpXUUA2dfxuhBTEkMOrYmM+gKIZYS1KjSostMI= github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL6eU= -github.com/nats-io/jwt v1.2.2/go.mod h1:/xX356yQA6LuXI9xWW7mZNpxgF2mBmGecH+Fj34sP5Q= +github.com/nats-io/jwt/v2 v2.0.3 h1:i/O6cmIsjpcQyWDYNcq2JyZ3/VTF8SJ4JWluI5OhpvI= github.com/nats-io/jwt/v2 v2.0.3/go.mod h1:VRP+deawSXyhNjXmxPCHskrR6Mq50BqpEI5SEcNiGlY= -github.com/nats-io/jwt/v2 v2.2.1-0.20220330180145-442af02fd36a/go.mod h1:0tqz9Hlu6bCBFLWAASKhE5vUA4c24L9KPUUgvwumE/k= -github.com/nats-io/jwt/v2 v2.3.0/go.mod h1:0tqz9Hlu6bCBFLWAASKhE5vUA4c24L9KPUUgvwumE/k= github.com/nats-io/nats-server/v2 v2.1.2/go.mod h1:Afk+wRZqkMQs/p45uXdrVLuab3gwv3Z8C4HTBu8GD/k= +github.com/nats-io/nats-server/v2 v2.5.0 h1:wsnVaaXH9VRSg+A2MVg5Q727/CqxnmPLGFQ3YZYKTQg= github.com/nats-io/nats-server/v2 v2.5.0/go.mod h1:Kj86UtrXAL6LwYRA6H4RqzkHhK0Vcv2ZnKD5WbQ1t3g= -github.com/nats-io/nats-server/v2 v2.8.4/go.mod h1:8zZa+Al3WsESfmgSs98Fi06dRWLH5Bnq90m5bKD/eT4= -github.com/nats-io/nats.go v1.8.1/go.mod h1:BrFz9vVn0fU3AcH9Vn4Kd7W0NpJ651tD5omQ3M8LwxM= github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzEE/Zbp4w= +github.com/nats-io/nats.go v1.12.1 h1:+0ndxwUPz3CmQ2vjbXdkC1fo3FdiOQDim4gl3Mge8Qo= github.com/nats-io/nats.go v1.12.1/go.mod h1:BPko4oXsySz4aSWeFgOHLZs3G4Jq4ZAyE6/zMCxRT6w= -github.com/nats-io/nats.go v1.15.0/go.mod h1:BPko4oXsySz4aSWeFgOHLZs3G4Jq4ZAyE6/zMCxRT6w= -github.com/nats-io/nats.go v1.16.0/go.mod h1:BPko4oXsySz4aSWeFgOHLZs3G4Jq4ZAyE6/zMCxRT6w= -github.com/nats-io/nkeys v0.0.2/go.mod h1:dab7URMsZm6Z/jp9Z5UGa87Uutgc2mVpXLC4B7TDb/4= github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= -github.com/nats-io/nkeys v0.2.0/go.mod h1:XdZpAbhgyyODYqjTawOnIOI7VlbKSarI9Gfy1tqEu/s= +github.com/nats-io/nkeys v0.3.0 h1:cgM5tL53EvYRU+2YLXIK0G2mJtK12Ft9oeooSZMA2G8= github.com/nats-io/nkeys v0.3.0/go.mod h1:gvUNGjVcM2IPr5rCsRsC6Wb3Hr2CQAm08dsxtV6A5y4= +github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= -github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d/go.mod h1:o96djdrsSGy3AWPyBgZMAGfxZNfgntdJG+11KU4QvbU= +github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354 h1:4kuARK6Y6FxaNu/BnU2OAaLF86eTVhP2hjTB6iMvItA= github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354/go.mod h1:KSVJerMDfblTH7p5MZaTt+8zaT2iEk3AkVb9PQdZuE8= -github.com/ncw/swift v1.0.47/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ZM= -github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJEU3ofeGjhHklVoIGuVj85JJwZ6kWPaJwCIxgnFmo= -github.com/neelance/sourcemap v0.0.0-20200213170602-2833bce08e4c/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM= -github.com/neilotoole/errgroup v0.1.5/go.mod h1:Q2nLGf+594h0CLBs/Mbg6qOr7GtqDK7C2S41udRnToE= +github.com/neilotoole/errgroup v0.1.6 h1:PODGqPXdT5BC/zCYIMoTrwV+ujKcW+gBXM6Ye9Ve3R8= github.com/neilotoole/errgroup v0.1.6/go.mod h1:Q2nLGf+594h0CLBs/Mbg6qOr7GtqDK7C2S41udRnToE= -github.com/networkplumbing/go-nft v0.2.0/go.mod h1:HnnM+tYvlGAsMU7yoYwXEVLLiDW9gdMmb5HoGcwpuQs= -github.com/neutron-org/wasmd v0.31.1-neutron-fixes.0.20230426103416-67da724a1eaf h1:XqGxQcpGQsjgZrxO2YNKfu1Qoc1XiPkeNeb94YliYRU= -github.com/neutron-org/wasmd v0.31.1-neutron-fixes.0.20230426103416-67da724a1eaf/go.mod h1:flAY8k+S04M6ndyZGQTZUY+r7ai+qom33s6PqO8YBCc= +github.com/neutron-org/admin-module v0.0.0-20230629154156-54b91a541f7f h1:YFXRHpaaRNK7stry4s6MM40IlulY/MSQTAvTbgodMDk= +github.com/neutron-org/admin-module v0.0.0-20230629154156-54b91a541f7f/go.mod h1:ZwQ3cw0rxF+DzonD2a5lisdcFEu64Db+0TPnHgMIvN0= +github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230628195106-7f39abd759a1 h1:VmQ1zVjrFguFYFDJrsJ8biPqZvWXrq1ydQKQMVp+w2Q= +github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230628195106-7f39abd759a1/go.mod h1:oB4CvQbYYn/g+q7c/rKQ33V4APW+kGdo5RkdFBovyxw= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= +github.com/nishanths/exhaustive v0.8.3 h1:pw5O09vwg8ZaditDp/nQRqVnrMczSJDxRDJMowvhsrM= github.com/nishanths/exhaustive v0.8.3/go.mod h1:qj+zJJUgJ76tR92+25+03oYUhzF4R7/2Wk7fGTfCHmg= -github.com/nishanths/predeclared v0.0.0-20190419143655-18a43bb90ffc/go.mod h1:62PewwiQTlm/7Rj+cxVYqZvDIUc+JjZq6GHAC1fsObQ= +github.com/nishanths/predeclared v0.2.2 h1:V2EPdZPliZymNAn79T8RkNApBjMmVKh5XRpLm/w98Vk= github.com/nishanths/predeclared v0.2.2/go.mod h1:RROzoN6TnGQupbC+lqggsOlcgysk3LMK/HI84Mp280c= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= +github.com/oklog/oklog v0.3.2 h1:wVfs8F+in6nTBMkA7CbRw+zZMIB7nNM825cM1wuzoTk= github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs= +github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw= github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= +github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= -github.com/oklog/ulid/v2 v2.1.0/go.mod h1:rcEKHmBBKfef9DhnvX7y1HZBYxjXb0cP5ExxNsTT1QQ= github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= -github.com/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= -github.com/olekukonko/tablewriter v0.0.2-0.20190409134802-7e037d187b0c/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= -github.com/olekukonko/tablewriter v0.0.2/go.mod h1:rSAaSIOAGT9odnlyGlUfAJaoc5w2fSBUmeGDbRWPxyQ= +github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= -github.com/onsi/ginkgo v0.0.0-20151202141238-7f8ab55aaf3b/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.12.0/go.mod h1:oUhWkIvk5aDxtKvDDuw8gItl8pKl42LzjC9KZE0HfGg= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= -github.com/onsi/ginkgo v1.13.0/go.mod h1:+REjRxOmWfHCjfv9TTWB1jD1Frx4XydAD3zm1lskyM0= github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= -github.com/onsi/ginkgo v1.16.2/go.mod h1:CObGmKUOKaSC0RjmoAK7tKyn4Azo5P2IWuoMnvwxz1E= +github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc= github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= -github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= -github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= -github.com/onsi/ginkgo/v2 v2.0.0/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c= -github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c= -github.com/onsi/ginkgo/v2 v2.1.4/go.mod h1:um6tUpWM/cxCK3/FK8BXqEiUMUwRgSM4JXG47RKZmLU= -github.com/onsi/gomega v0.0.0-20151007035656-2152b45fa28a/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= -github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= -github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= -github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDsH8xc= -github.com/onsi/gomega v1.13.0/go.mod h1:lRk9szgn8TxENtWd0Tp4c3wjlRfMTMH27I+3Je41yGY= -github.com/onsi/gomega v1.15.0/go.mod h1:cIuvLEne0aoVhAgh/O6ac0Op8WWw9H6eYCriF+tEHG0= -github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= -github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs= -github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro= github.com/onsi/gomega v1.20.0 h1:8W0cWlwFkflGPLltQvLRB7ZVD5HuP6ng320w2IS245Q= github.com/onsi/gomega v1.20.0/go.mod h1:DtrZpjmvpn2mPm4YWQa0/ALMDj9v4YxLgojwPeREyVo= +github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 h1:lDH9UUVJtmYCjyT0CI4q8xvlXPxeZ0gYCVvWbmPlp88= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= -github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= -github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= -github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= -github.com/opencontainers/go-digest v1.0.0-rc1.0.20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= -github.com/opencontainers/image-spec v1.0.0/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= -github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= -github.com/opencontainers/image-spec v1.0.2-0.20211117181255-693428a734f5/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= -github.com/opencontainers/image-spec v1.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= -github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= github.com/opencontainers/image-spec v1.1.0-rc2 h1:2zx/Stx4Wc5pIPDvIxHXvXtQFW/7XWJGmnM7r3wg034= github.com/opencontainers/image-spec v1.1.0-rc2/go.mod h1:3OVijpioIKYWTqjiG0zfF6wvoJ4fAXGbjdZuI2NgsRQ= -github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= -github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= -github.com/opencontainers/runc v1.0.0-rc10/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= -github.com/opencontainers/runc v1.0.0-rc8.0.20190926000215-3e425f80a8c9/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= -github.com/opencontainers/runc v1.0.0-rc9/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= -github.com/opencontainers/runc v1.0.0-rc92/go.mod h1:X1zlU4p7wOlX4+WRCz+hvlRv8phdL7UqbYD+vQwNMmE= -github.com/opencontainers/runc v1.0.0-rc93/go.mod h1:3NOsor4w32B2tC0Zbl8Knk4Wg84SM2ImC1fxBuqJ/H0= -github.com/opencontainers/runc v1.0.2/go.mod h1:aTaHFFwQXuA71CiyxOdFFIorAoemI04suvGRQFzWTD0= -github.com/opencontainers/runc v1.0.3/go.mod h1:aTaHFFwQXuA71CiyxOdFFIorAoemI04suvGRQFzWTD0= -github.com/opencontainers/runc v1.1.0/go.mod h1:Tj1hFw6eFWp/o33uxGf5yF2BX5yz2Z6iptFpuvbbKqc= -github.com/opencontainers/runc v1.1.1/go.mod h1:Tj1hFw6eFWp/o33uxGf5yF2BX5yz2Z6iptFpuvbbKqc= -github.com/opencontainers/runc v1.1.2/go.mod h1:Tj1hFw6eFWp/o33uxGf5yF2BX5yz2Z6iptFpuvbbKqc= github.com/opencontainers/runc v1.1.3 h1:vIXrkId+0/J2Ymu2m7VjGvbSlAId9XNRPhn2p4b+d8w= github.com/opencontainers/runc v1.1.3/go.mod h1:1J5XiS+vdZ3wCyZybsuxXZWGrgSr8fFJHLXuG2PsnNg= -github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= -github.com/opencontainers/runtime-spec v1.0.1/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= -github.com/opencontainers/runtime-spec v1.0.2-0.20190207185410-29686dbc5559/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= -github.com/opencontainers/runtime-spec v1.0.2/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= -github.com/opencontainers/runtime-spec v1.0.3-0.20200728170252-4d89ac9fbff6/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= -github.com/opencontainers/runtime-spec v1.0.3-0.20200929063507-e6143ca7d51d/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= -github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= -github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mod h1:r3f7wjNzSs2extwzU3Y+6pKfobzPh+kKFJ3ofN+3nfs= -github.com/opencontainers/selinux v1.6.0/go.mod h1:VVGKuOLlE7v4PJyT6h7mNWvq1rzqiriPsEqVhc+svHE= -github.com/opencontainers/selinux v1.8.0/go.mod h1:RScLhm78qiWa2gbVCcGkC7tCGdgk3ogry1nUQF8Evvo= -github.com/opencontainers/selinux v1.8.2/go.mod h1:MUIHuUEvKB1wtJjQdOyYRgOnLD2xAPP8dBsCoU0KuF8= -github.com/opencontainers/selinux v1.10.0/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI= -github.com/opencontainers/selinux v1.10.1/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI= +github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492 h1:lM6RxxfUMrYL/f8bWEUqdXrANWtrL7Nndbm9iFN0DlU= github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis= -github.com/opentracing-contrib/go-stdlib v1.0.0/go.mod h1:qtI1ogk+2JhVPIXVc6q+NHziSmy2W5GbdQZFUHADCBU= +github.com/opentracing/basictracer-go v1.0.0 h1:YyUAhaEfjoWXclZVJ9sGoNct7j4TVk7lZWlQw5UXuoo= github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74= github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/opentracing/opentracing-go v1.0.3-0.20180606204148-bd9c31933947/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= +github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs= github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= +github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5 h1:ZCnq+JUrvXcDVhX/xRolRBZifmabN1HcS1wrPSvxhrU= github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod h1:/wsWhb9smxSfWAKL3wpBW7V8scJMt8N8gnaMCS9E/cA= -github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8= -github.com/openzipkin/zipkin-go v0.1.3/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8= github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= +github.com/openzipkin/zipkin-go v0.2.5 h1:UwtQQx2pyPIgWYHRg+epgdx1/HnBQTgN3/oIYEJTQzU= github.com/openzipkin/zipkin-go v0.2.5/go.mod h1:KpXfKdgRDnnhsxw4pNIH9Md5lyFqKUa4YDFlwRYAMyE= github.com/ory/dockertest v3.3.5+incompatible h1:iLLK6SQwIhcbrG783Dghaaa3WPzGc+4Emza6EbVUUGA= github.com/ory/dockertest v3.3.5+incompatible/go.mod h1:1vX4m9wsvi00u5bseYwXaSnhNrne+V0E6LAcBILJdPs= -github.com/ory/dockertest/v3 v3.9.1/go.mod h1:42Ir9hmvaAPm0Mgibk6mBPi7SFvTXxEcnztDYOJ//uM= -github.com/otiai10/copy v1.2.0/go.mod h1:rrF5dJ5F0t/EWSYODDu4j9/vEeYHMkc8jt0zJChqQWw= -github.com/otiai10/copy v1.6.0 h1:IinKAryFFuPONZ7cm6T6E2QX/vcJwSnlaA5lfoaXIiQ= -github.com/otiai10/copy v1.6.0/go.mod h1:XWfuS3CrI0R6IE0FbgHsEazaXO8G0LpMp9o8tos0x4E= -github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod h1:9qAhocn7zKJG+0mI8eUu6xqkFDYS2kb2saOteoSB3cE= -github.com/otiai10/curr v1.0.0/go.mod h1:LskTG5wDwr8Rs+nNQ+1LlxRjAtTZZjtJW4rMXl6j4vs= -github.com/otiai10/mint v1.3.0/go.mod h1:F5AjcsTsWUqX+Na9fpHb52P8pcRX2CI6A3ctIT91xUo= -github.com/otiai10/mint v1.3.1/go.mod h1:/yxELlJQ0ufhjUwhshSj+wFjZ78CnZ48/1wtmBH1OTc= -github.com/otiai10/mint v1.3.2/go.mod h1:/yxELlJQ0ufhjUwhshSj+wFjZ78CnZ48/1wtmBH1OTc= github.com/oxyno-zeta/gomock-extra-matcher v1.1.0 h1:Yyk5ov0ZPKBXtVEeIWtc4J2XVrHuNoIK+0F2BUJgtsc= github.com/oxyno-zeta/gomock-extra-matcher v1.1.0/go.mod h1:UMGTHYEmJ1dRq8LDZ7VTAYO4nqM3GD1UGC3RJEUxEz0= +github.com/pact-foundation/pact-go v1.0.4 h1:OYkFijGHoZAYbOIb1LWXrwKQbMMRUv1oQ89blD2Mh2Q= github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY= github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= +github.com/paulbellamy/ratecounter v0.2.0 h1:2L/RhJq+HA8gBQImDXtLPrDXK5qAj6ozWVK/zFXVJGs= github.com/paulbellamy/ratecounter v0.2.0/go.mod h1:Hfx1hDpSGoqxkVVpBi/IlYD7kChlfo5C6hzIHwPqfFE= -github.com/pborman/getopt v0.0.0-20170112200414-7148bc3a4c30/go.mod h1:85jBQOZwpVEaDAr341tbn15RS4fCAsIst0qp7i8ex1o= -github.com/pborman/uuid v0.0.0-20170112150404-1b00554d8222/go.mod h1:VyrYX9gd7irzKovcSS6BIIEwPRkP2Wm2m9ufcdFSJ34= +github.com/pborman/uuid v1.2.0 h1:J7Q5mO4ysT1dv8hyrUGHb9+ooztCXu1D8MY8DZYsu3g= github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= -github.com/pelletier/go-toml v1.8.0/go.mod h1:D6yutnOGMveHEPV7VQOuvI/gXY61bv+9bAOTRnLElKs= -github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrapLU/GW4pbc= -github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= -github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= -github.com/pelletier/go-toml/v2 v2.0.1/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo= -github.com/pelletier/go-toml/v2 v2.0.2/go.mod h1:MovirKjgVRESsAvNZlAjtFwV867yGuwRkXbG66OzopI= -github.com/pelletier/go-toml/v2 v2.0.5 h1:ipoSadvV8oGUjnUbMub59IDPPwfxF694nG/jwbMiyQg= -github.com/pelletier/go-toml/v2 v2.0.5/go.mod h1:OMHamSCAODeSsVrwwvcJOaoN0LIUIaFVNZzmWyNfXas= +github.com/pelletier/go-toml/v2 v2.0.8 h1:0ctb6s9mE31h0/lhu+J6OPmVeDxJn+kYnJc2jZR9tGQ= +github.com/pelletier/go-toml/v2 v2.0.8/go.mod h1:vuYfssBdrU2XDZ9bYydBu6t+6a6PYNcZljzZR9VXg+4= +github.com/performancecopilot/speed v3.0.0+incompatible h1:2WnRzIquHa5QxaJKShDkLM+sc0JPuwhXzK8OYOyt3Vg= github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= +github.com/performancecopilot/speed/v4 v4.0.0 h1:VxEDCmdkfbQYDlcr/GC9YoN9PQ6p8ulk9xVsepYy9ZY= github.com/performancecopilot/speed/v4 v4.0.0/go.mod h1:qxrSyuDGrTOWfV+uKRFhfxw6h/4HXRGUiZiufxo49BM= -github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= github.com/peterh/liner v1.0.1-0.20180619022028-8c1271fcf47f/go.mod h1:xIteQHvHuaLYG9IFj6mSxM0fCKrs34IrEQUhOYuGPHc= +github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7 h1:oYW+YCJ1pachXTQmzR3rNLYGGz4g/UgFcjb28p/viDM= github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7/go.mod h1:CRroGNssyjTd/qIG2FyxByd2S8JEAZXBl4qUrZf8GS0= -github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 h1:q2e307iGHPdTGp0hoxKjt1H5pDo6utceo3dQVK3I5XQ= github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod h1:jvVRKCrJTQWu0XVbaOlby/2lO20uSCHEMzzplHXte1o= +github.com/petermattis/goid v0.0.0-20230518223814-80aa455d8761 h1:W04oB3d0J01W5jgYRGKsV8LCM6g9EkCvPkZcmFuy0OE= +github.com/petermattis/goid v0.0.0-20230518223814-80aa455d8761/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4= +github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d h1:CdDQnGF8Nq9ocOS/xlSptM1N3BbrA6/kmaep5ggwaIA= github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d/go.mod h1:3OzsM7FXDQlpCiw2j81fOmAwQLnZnLGXVKUzeKQXIAw= +github.com/philhofer/fwd v1.0.0 h1:UbZqGr5Y38ApvM/V/jEljVxwocdweyH+vmYvRPBnbqQ= github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU= -github.com/philhofer/fwd v1.1.1/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU= github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= +github.com/pierrec/lz4 v2.0.5+incompatible h1:2xWsjqPFWcplujydGg4WmhC/6fZqK42wMM8aXeqhl0I= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= -github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= -github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= +github.com/pjbgf/sha1cd v0.2.3 h1:uKQP/7QOzNtKYH7UTohZLcjF5/55EnTw0jO/Ru4jZwI= github.com/pjbgf/sha1cd v0.2.3/go.mod h1:HOK9QrgzdHpbc2Kzip0Q1yi3M2MFGPADtR6HjG65m5M= -github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/go.mod h1:4OwLy04Bl9Ef3GJJCoec+30X3LQs/0/m4HFRt/2LUSA= +github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 h1:KoWmjvw+nsYOo29YJK9vDA65RGE3NrOnUtO7a+RF9HU= github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI= -github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/errors v0.8.1-0.20171018195549-f15c970de5b7/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= -github.com/pkg/profile v1.5.0/go.mod h1:qBsxPvzyUincmltOk6iyRVxHYg4adc0OFOv72ZdLa18= +github.com/pkg/profile v1.6.0 h1:hUDfIISABYI59DyeB3OTay/HxSRwTQ8rB/H83k6r5dM= github.com/pkg/profile v1.6.0/go.mod h1:qBsxPvzyUincmltOk6iyRVxHYg4adc0OFOv72ZdLa18= -github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= +github.com/pkg/sftp v1.13.1 h1:I2qBYMChEhIjOgazfJmV3/mZM256btk6wkCDRmW7JYs= github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= +github.com/pkg/term v0.0.0-20180730021639-bffc007b7fd5 h1:tFwafIEMf0B7NlcxV/zJ6leBIa81D3hgGSgsE5hCkOQ= github.com/pkg/term v0.0.0-20180730021639-bffc007b7fd5/go.mod h1:eCbImbZ95eXtAUIbLAuAVnBnwf83mjf6QIVH8SHYwqQ= -github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/pointlander/compress v1.1.1-0.20190518213731-ff44bd196cc3 h1:hUmXhbljNFtrH5hzV9kiRoddZ5nfPTq3K0Sb2hYYiqE= +github.com/pointlander/compress v1.1.1-0.20190518213731-ff44bd196cc3/go.mod h1:q5NXNGzqj5uPnVuhGkZfmgHqNUhf15VLi6L9kW0VEc0= +github.com/pointlander/jetset v1.0.1-0.20190518214125-eee7eff80bd4 h1:RHHRCZeaNyBXdYPMjZNH8/XHDBH38TZzw8izrW7dmBE= +github.com/pointlander/jetset v1.0.1-0.20190518214125-eee7eff80bd4/go.mod h1:RdR1j20Aj5pB6+fw6Y9Ur7lMHpegTEjY1vc19hEZL40= +github.com/pointlander/peg v1.0.1 h1:mgA/GQE8TeS9MdkU6Xn6iEzBmQUQCNuWD7rHCK6Mjs0= +github.com/pointlander/peg v1.0.1/go.mod h1:5hsGDQR2oZI4QoWz0/Kdg3VSVEC31iJw/b7WjqCBGRI= +github.com/polyfloyd/go-errorlint v1.0.5 h1:AHB5JRCjlmelh9RrLxT9sgzpalIwwq4hqE8EkwIwKdY= github.com/polyfloyd/go-errorlint v1.0.5/go.mod h1:APVvOesVSAnne5SClsPxPdfvZTVDojXh1/G3qb5wjGI= +github.com/posener/complete v1.1.1 h1:ccV59UEOTzVDnDUEFdT95ZzHVZ+5+158q8+SJb2QV5w= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= -github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= -github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= -github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= -github.com/prometheus/client_golang v0.0.0-20180209125602-c332b6f63c06/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= -github.com/prometheus/client_golang v0.8.0/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs= -github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= -github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g= github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og= github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= -github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= -github.com/prometheus/client_golang v1.14.0 h1:nJdhIvne2eSX/XRAFV9PcvFFRbrjbcTUj0VP62TMhnw= -github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y= -github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/client_golang v1.15.1 h1:8tXpTmJbyH5lydzFPoxSIJ0J46jdh3tylbvM1xCv0LI= +github.com/prometheus/client_golang v1.15.1/go.mod h1:e9yaBhRPU2pPNsZwE+JdQl0KEt1N9XgF6zxWmaC0xOk= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.1.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4= -github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w= -github.com/prometheus/common v0.0.0-20180110214958-89604d197083/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= -github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= +github.com/prometheus/client_model v0.4.0 h1:5lQXD3cAg1OXBf4Wq03gTrXHeaV0TQvGfUooCfx1yqY= +github.com/prometheus/client_model v0.4.0/go.mod h1:oMQmHW1/JoDwqLtg57MGgP/Fb1CJEYF2imWWhWtMkYU= github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc= github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA= github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= -github.com/prometheus/common v0.29.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= -github.com/prometheus/common v0.30.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= -github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= -github.com/prometheus/common v0.37.0 h1:ccBbHCgIiT9uSoFY0vX8H3zsNR5eLt17/RQLUvn8pXE= -github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= -github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/common v0.44.0 h1:+5BrQJwiBB9xsMygAB3TNvpQKOwlkc25LbISbrdOOfY= +github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO7x0VV9VvuY= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= -github.com/prometheus/procfs v0.0.0-20190522114515-bc1a522cf7b1/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= -github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ= -github.com/prometheus/procfs v0.0.5/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ= github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= -github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.3.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= -github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= -github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= -github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo= -github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4= -github.com/prometheus/tsdb v0.6.2-0.20190402121629-4f204dcbc150/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= +github.com/prometheus/procfs v0.10.1 h1:kYK1Va/YMlutzCGazswoHKo//tZVlFpKYh+PymziUAg= +github.com/prometheus/procfs v0.10.1/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM= +github.com/prometheus/tsdb v0.7.1 h1:YZcsG11NqnK4czYLrWd9mpEuAJIHVQLwdrleYfszMAA= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= -github.com/pseudomuto/protoc-gen-doc v1.3.2/go.mod h1:y5+P6n3iGrbKG+9O04V5ld71in3v/bX88wUwgt+U8EA= -github.com/pseudomuto/protokit v0.2.0/go.mod h1:2PdH30hxVHsup8KpBTOXTBeMVhJZVio3Q8ViKSAXT0Q= -github.com/quasilyte/go-consistent v0.0.0-20190521200055-c6f3937de18c/go.mod h1:5STLWrekHfjyYwxBRVRXNOSewLJ3PWfDJd1VyTS21fI= -github.com/quasilyte/go-ruleguard v0.1.2-0.20200318202121-b00d7a75d3d8/go.mod h1:CGFX09Ci3pq9QZdj86B+VGIdNj4VyCo2iPOGS9esB/k= -github.com/quasilyte/go-ruleguard v0.3.1-0.20210203134552-1b5a410e1cc8/go.mod h1:KsAh3x0e7Fkpgs+Q9pNLS5XpFSvYCEVl5gP9Pp1xp30= +github.com/quasilyte/go-ruleguard v0.3.18 h1:sd+abO1PEI9fkYennwzHn9kl3nqP6M5vE7FiOzZ+5CE= github.com/quasilyte/go-ruleguard v0.3.18/go.mod h1:lOIzcYlgxrQ2sGJ735EHXmf/e9MJ516j16K/Ifcttvs= -github.com/quasilyte/go-ruleguard/dsl v0.3.0/go.mod h1:KeCP03KrjuSO0H1kTuZQCWlQPulDV6YMIXmpQss17rU= -github.com/quasilyte/go-ruleguard/dsl v0.3.21/go.mod h1:KeCP03KrjuSO0H1kTuZQCWlQPulDV6YMIXmpQss17rU= -github.com/quasilyte/go-ruleguard/rules v0.0.0-20201231183845-9e62ed36efe1/go.mod h1:7JTjp89EGyU1d6XfBiXihJNG37wB2VRkd125Q1u7Plc= -github.com/quasilyte/go-ruleguard/rules v0.0.0-20211022131956-028d6511ab71/go.mod h1:4cgAphtvu7Ftv7vOT2ZOYhC6CvBxZixcasr8qIOTA50= +github.com/quasilyte/gogrep v0.0.0-20220828223005-86e4605de09f h1:6Gtn2i04RD0gVyYf2/IUMTIs+qYleBt4zxDqkLTcu4U= github.com/quasilyte/gogrep v0.0.0-20220828223005-86e4605de09f/go.mod h1:Cm9lpz9NZjEoL1tgZ2OgeUKPIxL1meE7eo60Z6Sk+Ng= +github.com/quasilyte/regex/syntax v0.0.0-20200407221936-30656e2c4a95 h1:L8QM9bvf68pVdQ3bCFZMDmnt9yqcMBro1pC7F+IPYMY= github.com/quasilyte/regex/syntax v0.0.0-20200407221936-30656e2c4a95/go.mod h1:rlzQ04UMyJXu/aOvhd8qT+hvDrFpiwqp8MRXDY9szc0= +github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 h1:M8mH9eK4OUR4lu7Gd+PU1fV2/qnDNfzT635KRSObncs= github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567/go.mod h1:DWNGW8A4Y+GyBgPuaQJuWiy0XYftx4Xm/y5Jqk9I6VQ= github.com/rakyll/statik v0.1.7 h1:OF3QCZUuyPxuGEP7B4ypUa7sB/iHtqOTDYZXGM8KOdQ= github.com/rakyll/statik v0.1.7/go.mod h1:AlZONWzMtEnMs7W4e/1LURLiI49pIMmp6V9Unghqrcc= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= -github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= -github.com/regen-network/cosmos-proto v0.3.1 h1:rV7iM4SSFAagvy8RiyhiACbWEGotmqzywPxOvwMdxcg= -github.com/regen-network/cosmos-proto v0.3.1/go.mod h1:jO0sVX6a1B36nmE8C9xBFXpNwWejXC7QqCOnH3O0+YM= github.com/regen-network/gocuke v0.6.2 h1:pHviZ0kKAq2U2hN2q3smKNxct6hS0mGByFMHGnWA97M= github.com/regen-network/gocuke v0.6.2/go.mod h1:zYaqIHZobHyd0xOrHGPQjbhGJsuZ1oElx150u2o1xuk= github.com/regen-network/protobuf v1.3.3-alpha.regen.1 h1:OHEc+q5iIAXpqiqFKeLpu5NwTIkVXUs48vFMwzqpqY4= github.com/regen-network/protobuf v1.3.3-alpha.regen.1/go.mod h1:2DjTFR1HhMQhiWC5sZ4OhQ3+NtdbZ6oBDKQwq5Ou+FI= -github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M= -github.com/remyoudompheng/go-dbus v0.0.0-20121104212943-b7232d34b1d5/go.mod h1:+u151txRmLpwxBmpYn9z3d1sdJdjRPQpsXuYeY9jNls= -github.com/remyoudompheng/go-liblzma v0.0.0-20190506200333-81bf2d431b96/go.mod h1:90HvCY7+oHHUKkbeMCiHt1WuFR2/hPJ9QrljDG+v6ls= -github.com/remyoudompheng/go-misc v0.0.0-20190427085024-2d6ac652a50e/go.mod h1:80FQABjoFzZ2M5uEa6FUaJYEmqU2UOKojlFVak1UAwI= +github.com/retailnext/hllpp v1.0.1-0.20180308014038-101a6d2f8b52 h1:RnWNS9Hlm8BIkjr6wx8li5abe0fr73jljLycdfemTp0= github.com/retailnext/hllpp v1.0.1-0.20180308014038-101a6d2f8b52/go.mod h1:RDpi1RftBQPUCDRw6SmxeaREsAaRKnOclghuzp/WRzc= +github.com/rjeczalik/notify v0.9.1 h1:CLCKso/QK1snAlnhNR/CNvNiFU2saUtjV0bx3EwNeCE= github.com/rjeczalik/notify v0.9.1/go.mod h1:rKwnCoCGeuQnwBtTSPL9Dad03Vh2n40ePRrjvIXnJho= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= -github.com/rogpeppe/fastuuid v1.1.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= +github.com/rogpeppe/fastuuid v1.2.0 h1:Ppwyp6VYCF1nvBTXL3trRso7mXMlRrw9ooo375wvi2s= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/rogpeppe/go-internal v1.5.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= -github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= -github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE= -github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o= -github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= -github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= -github.com/rs/cors v0.0.0-20160617231935-a62a804a8a00/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= +github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= +github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= -github.com/rs/cors v1.8.2 h1:KCooALfAYGs415Cwu5ABvv9n9509fSiG5SQJn/AQo4U= -github.com/rs/cors v1.8.2/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= -github.com/rs/xhandler v0.0.0-20160618193221-ed27b6fd6521/go.mod h1:RvLn4FgxWubrpZHtQLnOf6EwhN2hEMusxZOhcW9H3UQ= -github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= -github.com/rs/xid v1.3.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= -github.com/rs/zerolog v1.23.0/go.mod h1:6c7hFfxPOy7TacJc4Fcdi24/J0NKYGzjG8FWRI916Qo= -github.com/rs/zerolog v1.27.0 h1:1T7qCieN22GVc8S4Q2yuexzBb1EqjbgjSH9RohbMjKs= -github.com/rs/zerolog v1.27.0/go.mod h1:7frBqO0oezxmnO7GF86FY++uy8I0Tk/If5ni1G9Qc0U= -github.com/rubiojr/go-vhd v0.0.0-20160810183302-0bfd3b39853c/go.mod h1:DM5xW0nvfNNm2uytzsvhI3OnX8uzaRAg8UX/CnDqbto= +github.com/rs/cors v1.8.3 h1:O+qNyWn7Z+F9M0ILBHgMVPuB1xTOucVd5gtaYyXBpRo= +github.com/rs/cors v1.8.3/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= +github.com/rs/xid v1.4.0 h1:qd7wPTDkN6KQx2VmMBLrpHkiyQwgFXRnkOLacUiaSNY= +github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= +github.com/rs/zerolog v1.29.1 h1:cO+d60CHkknCbvzEWxP0S9K6KqyTjrCNUy1LdQLCGPc= +github.com/rs/zerolog v1.29.1/go.mod h1:Le6ESbR7hc+DP6Lt1THiV8CQSdkkNrd3R0XbEgp3ZBU= +github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= -github.com/russross/blackfriday v1.6.0/go.mod h1:ti0ldHuxg49ri4ksnFxlkCfN+hvslNlmVHqNRXXJNAY= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/ryancurrah/gomodguard v1.0.4/go.mod h1:9T/Cfuxs5StfsocWr4WzDL36HqnX0fVb9d5fSEaLhoE= -github.com/ryancurrah/gomodguard v1.1.0/go.mod h1:4O8tr7hBODaGE6VIhfJDHcwzh5GUccKSJBU0UMXJFVM= +github.com/ryancurrah/gomodguard v1.2.4 h1:CpMSDKan0LtNGGhPrvupAoLeObRFjND8/tU1rEOtBp4= github.com/ryancurrah/gomodguard v1.2.4/go.mod h1:+Kem4VjWwvFpUJRJSwa16s1tBJe+vbv02+naTow2f6M= +github.com/ryanrolds/sqlclosecheck v0.3.0 h1:AZx+Bixh8zdUBxUA1NxbxVAS78vTPq4rCb8OUZI9xFw= github.com/ryanrolds/sqlclosecheck v0.3.0/go.mod h1:1gREqxyTGR3lVtpngyFo3hZAgk0KCtEdgEkHwDbigdA= +github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f h1:UFr9zpz4xgTnIE5yIMtWAMngCdZ9p/+q6lTbgelo80M= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= -github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= -github.com/safchain/ethtool v0.0.0-20190326074333-42ed695e3de8/go.mod h1:Z0q5wiBQGYcxhMZ6gUqHn6pYNLypFAvaL3UvgZLR0U4= -github.com/safchain/ethtool v0.0.0-20210803160452-9aa261dae9b1/go.mod h1:Z0q5wiBQGYcxhMZ6gUqHn6pYNLypFAvaL3UvgZLR0U4= -github.com/sagikazarmark/crypt v0.3.0/go.mod h1:uD/D+6UF4SrIR1uGEv7bBNkNqLGqUr43MRiaGWX1Nig= -github.com/sagikazarmark/crypt v0.4.0/go.mod h1:ALv2SRj7GxYV4HO9elxH9nS6M9gW+xDNxqmyJ6RfDFM= -github.com/sagikazarmark/crypt v0.6.0/go.mod h1:U8+INwJo3nBv1m6A/8OBXAq7Jnpspk5AxSgDyEQcea8= -github.com/sagikazarmark/crypt v0.8.0/go.mod h1:TmKwZAo97S4Fy4sfMH/HX/cQP5D+ijra2NyLpNNmttY= +github.com/sagikazarmark/crypt v0.10.0 h1:96E1qrToLBU6fGzo+PRRz7KGOc9FkYFiPnR3/zf8Smg= +github.com/sagikazarmark/crypt v0.10.0/go.mod h1:gwTNHQVoOS3xp9Xvz5LLR+1AauC5M6880z5NWzdhOyQ= +github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da h1:p3Vo3i64TCLY7gIfzeQaUJ+kppEO5WQG3cL8iE8tGHU= github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= +github.com/sanposhiho/wastedassign/v2 v2.0.6 h1:+6/hQIHKNJAUixEj6EmOngGIisyeI+T3335lYTyxRoA= github.com/sanposhiho/wastedassign/v2 v2.0.6/go.mod h1:KyZ0MWTwxxBmfwn33zh3k1dmsbF2ud9pAAGfoLfjhtI= -github.com/sasha-s/go-deadlock v0.2.1-0.20190427202633-1595213edefa/go.mod h1:F73l+cr82YSh10GxyRI6qZiCgK64VaZjwesgfQ1/iLM= github.com/sasha-s/go-deadlock v0.3.1 h1:sqv7fDNShgjcaxkO0JNcOAlr8B9+cV5Ey/OB71efZx0= github.com/sasha-s/go-deadlock v0.3.1/go.mod h1:F73l+cr82YSh10GxyRI6qZiCgK64VaZjwesgfQ1/iLM= +github.com/sashamelentyev/interfacebloat v1.1.0 h1:xdRdJp0irL086OyW1H/RTZTr1h/tMEOsumirXcOJqAw= github.com/sashamelentyev/interfacebloat v1.1.0/go.mod h1:+Y9yU5YdTkrNvoX0xHc84dxiN1iBi9+G8zZIhPVoNjQ= +github.com/sashamelentyev/usestdlibvars v1.20.0 h1:K6CXjqqtSYSsuyRDDC7Sjn6vTMLiSJa4ZmDkiokoqtw= github.com/sashamelentyev/usestdlibvars v1.20.0/go.mod h1:0GaP+ecfZMXShS0A94CJn6aEuPRILv8h/VuWI9n1ygg= -github.com/sassoftware/go-rpmutils v0.0.0-20190420191620-a8f1baeba37b/go.mod h1:am+Fp8Bt506lA3Rk3QCmSqmYmLMnPDhdDUcosQCAx+I= +github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww= github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= -github.com/schollz/closestmatch v2.1.0+incompatible/go.mod h1:RtP1ddjLong6gTkbtmuhtR2uUrrJOpYzYRvbcPAid+g= -github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw= -github.com/sclevine/spec v1.2.0/go.mod h1:W4J29eT/Kzv7/b9IWLB055Z+qvVC9vt0Arko24q7p+U= +github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= -github.com/seccomp/libseccomp-golang v0.9.1/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvWlF4P2Ca7zGrPiEpWo= -github.com/seccomp/libseccomp-golang v0.9.2-0.20210429002308-3879420cc921/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg= -github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg= -github.com/securego/gosec v0.0.0-20200103095621-79fbf3af8d83/go.mod h1:vvbZ2Ae7AzSq3/kywjUDxSNq2SJ27RxCz2un0H3ePqE= -github.com/securego/gosec v0.0.0-20200401082031-e946c8c39989/go.mod h1:i9l/TNj+yDFh9SZXUTvspXTjbFXgZGP/UvhU1S65A4A= -github.com/securego/gosec/v2 v2.3.0/go.mod h1:UzeVyUXbxukhLeHKV3VVqo7HdoQR9MrRfFmZYotn8ME= +github.com/securego/gosec/v2 v2.13.1 h1:7mU32qn2dyC81MH9L2kefnQyRMUarfDER3iQyMHcjYM= github.com/securego/gosec/v2 v2.13.1/go.mod h1:EO1sImBMBWFjOTFzMWfTRrZW6M15gm60ljzrmy/wtHo= +github.com/segmentio/fasthash v1.0.3 h1:EI9+KE1EwvMLBWwjpRDc+fEM+prwxDYbslddQGtrmhM= github.com/segmentio/fasthash v1.0.3/go.mod h1:waKX8l2N8yckOgmSsXJi7x1ZfdKZ4x7KRMzBtS3oedY= github.com/segmentio/kafka-go v0.1.0/go.mod h1:X6itGqS9L4jDletMsxZ7Dz+JFWxM6JHfPOCvTvk+EJo= +github.com/segmentio/kafka-go v0.2.0 h1:HtCSf6B4gN/87yc5qTl7WsxPKQIIGXLPPM1bMCPOsoY= github.com/segmentio/kafka-go v0.2.0/go.mod h1:X6itGqS9L4jDletMsxZ7Dz+JFWxM6JHfPOCvTvk+EJo= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= +github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0= github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= -github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= -github.com/serialx/hashring v0.0.0-20190422032157-8b2912629002/go.mod h1:/yeG0My1xr/u+HZrFQ1tOQQQQrOawfyMUH13ai5brBc= +github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c h1:W65qqJCIOVP4jpqPQ0YvHYKwcMEMVWIzWC5iNQQfBTU= github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c/go.mod h1:/PevMnwAxekIXwN8qQyfc5gl2NlkB3CQlkizAbOkeBs= -github.com/shirou/gopsutil v0.0.0-20190901111213-e4ec7b275ada/go.mod h1:WWnYX4lzhCH5h/3YBfyVA3VbLYjlMZZAQcW9ojMexNc= -github.com/shirou/gopsutil v2.20.5+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= +github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible h1:Bn1aCHHRnjv4Bl16T8rcaFjYSrGrIZvpiGO6P3Q4GpU= github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= -github.com/shirou/gopsutil/v3 v3.22.8/go.mod h1:s648gW4IywYzUfE/KjXxUsqrqx/T2xO5VqOXxONeRfI= -github.com/shirou/gopsutil/v3 v3.22.9/go.mod h1:bBYl1kjgEJpWpxeHmLI+dVHWtyAwfcmSBLDsp2TNT8A= -github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod h1:qsXQc7+bwAM3Q1u/4XEfrquwF8Lw7D7y5cD8CuHnfIc= -github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk= -github.com/shurcooL/go v0.0.0-20200502201357-93f07166e636/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk= -github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod h1:N5mDOmsrJOB+vfqUK+7DmDyjhSLIIBnXo9lvZJj3MWQ= -github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg= +github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= -github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546/go.mod h1:TrYk7fJVaAttu97ZZKrO9UbRa8izdowaMIZcxYMbVaw= -github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= -github.com/sirupsen/logrus v1.0.6/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= -github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= -github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= +github.com/sivchari/containedctx v1.0.2 h1:0hLQKpgC53OVF1VT7CeoFHk9YKstur1XOgfYIc1yrHI= github.com/sivchari/containedctx v1.0.2/go.mod h1:PwZOeqm4/DLoJOqMSIJs3aKqXRX4YO+uXww087KZ7Bw= +github.com/sivchari/nosnakecase v1.7.0 h1:7QkpWIRMe8x25gckkFd2A5Pi6Ymo0qgr4JrhGt95do8= github.com/sivchari/nosnakecase v1.7.0/go.mod h1:CwDzrzPea40/GB6uynrNLiorAlgFRvRbFSgJx2Gs+QY= +github.com/sivchari/tenv v1.7.0 h1:d4laZMBK6jpe5PWepxlV9S+LC0yXqvYHiq8E6ceoVVE= github.com/sivchari/tenv v1.7.0/go.mod h1:64yStXKSOxDfX47NlhVwND4dHwfZDdbp2Lyl018Icvg= +github.com/skeema/knownhosts v1.1.0 h1:Wvr9V0MxhjRbl3f9nMnKnFfiWTJmtECJ9Njkea3ysW0= github.com/skeema/knownhosts v1.1.0/go.mod h1:sKFq3RD6/TKZkSWn8boUbDC7Qkgcv+8XXijpFO6roag= -github.com/skip-mev/mev-cometbft v0.34.27-mev.17 h1:Sti5vpx6jvUzmLcsi22Xv9hf8eByXz6fKrKS3tACckw= -github.com/skip-mev/mev-cometbft v0.34.27-mev.17/go.mod h1:BcCbhKv7ieM0KEddnYXvQZR+pZykTKReJJYf7YC7qhw= +github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= -github.com/smartystreets/assertions v1.0.0/go.mod h1:kHHU4qYBaI3q23Pp3VPrmWhuIUrLW/7eUrw0BU5VaoM= -github.com/smartystreets/assertions v1.2.0/go.mod h1:tcbTF8ujkAEcZ8TElKY+i30BzYlVhC/LOxJk7iOWnoo= -github.com/smartystreets/assertions v1.13.0/go.mod h1:wDmR7qL282YbGsPy6H/yAsesrxfxaaSlJazyFLYVFx8= -github.com/smartystreets/go-aws-auth v0.0.0-20180515143844-0c1422d1fdb9/go.mod h1:SnhjPscd9TpLiy1LpzGSKh3bXCfxxXuqd9xmQJy3slM= -github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= +github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= -github.com/smartystreets/goconvey v1.7.2/go.mod h1:Vw0tHAZW6lzCRk3xgdin6fKYcG+G3Pg9vgXWeJpQFMM= -github.com/smartystreets/gunit v1.0.0/go.mod h1:qwPWnhz6pn0NnRBP++URONOVyNkPyr4SauJk4cUOwJs= +github.com/snikch/goodman v0.0.0-20171125024755-10e37e294daa h1:YJfZp12Z3AFhSBeXOlv4BO55RMwPn2NoQeDsrdWnBtY= github.com/snikch/goodman v0.0.0-20171125024755-10e37e294daa/go.mod h1:oJyF+mSPHbB5mVY2iO9KV3pTt/QbIkGaO8gQ2WrDbP4= +github.com/soheilhy/cmux v0.1.4 h1:0HKaf1o97UwFjHH9o5XsHUOF+tqmdA7KEzXLpiyaw0E= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= -github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE1GqG0= +github.com/sonatard/noctx v0.0.1 h1:VC1Qhl6Oxx9vvWo3UDgrGXYCeKCe3Wbw7qAWL6FrmTY= github.com/sonatard/noctx v0.0.1/go.mod h1:9D2D/EoULe8Yy2joDHJj7bv3sZoq9AaSb8B4lqBjiZI= +github.com/sony/gobreaker v0.4.1 h1:oMnRNZXX5j85zso6xCPRNPtmAycat+WcoKbklScLDgQ= github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY= -github.com/sourcegraph/go-diff v0.5.1/go.mod h1:j2dHj3m8aZgQO8lMTcTnBcXkRRRqi34cd2MNlA9u1mE= -github.com/sourcegraph/go-diff v0.5.3/go.mod h1:v9JDtjCE4HHHCZGId75rg8gkKKa98RVjBcBGsVmMmak= +github.com/sourcegraph/go-diff v0.6.1 h1:hmA1LzxW0n1c3Q4YbrFgg4P99GSnebYa3x8gr0HZqLQ= github.com/sourcegraph/go-diff v0.6.1/go.mod h1:iBszgVvyxdc8SFZ7gm69go2KDdt3ag071iBaWPF6cjs= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI= github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= -github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= -github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4= -github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= -github.com/spf13/afero v1.8.2/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo= -github.com/spf13/afero v1.9.2 h1:j49Hj62F0n+DaZ1dDCvhABaPNSGNkt32oRFxI33IEMw= -github.com/spf13/afero v1.9.2/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y= +github.com/spf13/afero v1.9.5 h1:stMpOSZFs//0Lv29HduCmli3GUfpFoF3Y1Q/aXj/wVM= +github.com/spf13/afero v1.9.5/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w= -github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU= -github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= +github.com/spf13/cast v1.5.1 h1:R+kOtfhWQE6TVQzY+4D7wJLBgkdVasCEFxSUBYBYIlA= +github.com/spf13/cast v1.5.1/go.mod h1:b9PdjNptOpzXr7Rq1q9gJML/2cdGQAo69NKzQ10KN48= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= -github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= -github.com/spf13/cobra v1.1.3/go.mod h1:pGADOWyqRD/YMrPZigI/zbliZ2wVD/23d+is3pSWzOo= -github.com/spf13/cobra v1.2.1/go.mod h1:ExllRjgxM/piMAM+3tAZvg8fsklGAf3tPfi+i8t68Nk= -github.com/spf13/cobra v1.3.0/go.mod h1:BrRVncBjOJa/eUcVVm9CE+oC6as8k+VYr4NY7WCi9V4= -github.com/spf13/cobra v1.4.0/go.mod h1:Wo4iy3BUC+X2Fybo0PDqwJIv3dNRiZLHQymsfxlB84g= -github.com/spf13/cobra v1.6.0/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY= -github.com/spf13/cobra v1.6.1/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY= github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I= github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= -github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= -github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= -github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= -github.com/spf13/viper v1.6.1/go.mod h1:t3iDnF5Jlj76alVNuyFBk5oUMCvsrkbvZK0WQdfDi5k= -github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= -github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns= -github.com/spf13/viper v1.10.0/go.mod h1:SoyBPwAtKDzypXNDFKN5kzH7ppppbGZtls1UpIy5AsM= -github.com/spf13/viper v1.10.1/go.mod h1:IGlFPqhNAPKRxohIzWpI5QEy4kuI7tcl5WvR+8qy1rU= -github.com/spf13/viper v1.12.0/go.mod h1:b6COn30jlNxbm/V2IqWiNWkJ+vZNiMNksliPCiuKtSI= -github.com/spf13/viper v1.13.0/go.mod h1:Icm2xNL3/8uyh/wFuB1jI7TiTNKp8632Nwegu+zgdYw= -github.com/spf13/viper v1.14.0 h1:Rg7d3Lo706X9tHsJMUjdiwMpHB7W8WnSVOssIY+JElU= -github.com/spf13/viper v1.14.0/go.mod h1:WT//axPky3FdvXHzGw33dNdXXXfFQqmEalje+egj8As= +github.com/spf13/viper v1.16.0 h1:rGGH0XDZhdUOryiDWjmIvUSWpbNqisK8Wk0Vyefw8hc= +github.com/spf13/viper v1.16.0/go.mod h1:yg78JgCJcbrQOvV9YLXgkLaZqUidkY9K+Dd1FofRzQg= +github.com/ssgreg/nlreturn/v2 v2.2.1 h1:X4XDI7jstt3ySqGU86YGAURbxw3oTDPK9sPEi6YEwQ0= github.com/ssgreg/nlreturn/v2 v2.2.1/go.mod h1:E/iiPB78hV7Szg2YfRgyIrk1AD6JVMTRkkxBiELzh2I= +github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4 h1:Gb2Tyox57NRNuZ2d3rmvB3pcmbu7O1RS3m8WRx7ilrg= github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4/go.mod h1:RZLeN1LMWmRsyYjvAu+I6Dm9QmlDaIIt+Y+4Kd7Tp+Q= +github.com/stbenjam/no-sprintf-host-port v0.1.1 h1:tYugd/yrm1O0dV+ThCbaKZh195Dfm07ysF0U6JQXczc= github.com/stbenjam/no-sprintf-host-port v0.1.1/go.mod h1:TLhvtIvONRzdmkFiio4O8LHsN9N74I+PhRquPsxpL0I= -github.com/steakknife/bloomfilter v0.0.0-20180922174646-6819c0d2a570/go.mod h1:8OR4w3TdeIHIh1g6EMY5p0gVNOovcWC+1vpc7naMuAw= -github.com/steakknife/hamming v0.0.0-20180906055917-c99c65617cd3/go.mod h1:hpGUWaI9xL8pRQCTXQgocU38Qw1g0Us7n5PxxTwTCYU= -github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980/go.mod h1:AO3tvPzVZ/ayst6UlUKUv6rcPQInYe3IknH3jYhAKu8= -github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= -github.com/strangelove-ventures/packet-forward-middleware/v4 v4.0.5 h1:KKUqeGhVBK38+1LwThC8IeIcsJZ6COX5kvhiJroFqCM= -github.com/strangelove-ventures/packet-forward-middleware/v4 v4.0.5/go.mod h1:4zAtg449/JISRmf+sbmqolqSLP+QJBh+EtWkWtt/AKE= +github.com/strangelove-ventures/packet-forward-middleware/v7 v7.0.0-20230523193151-73dea436e53f h1:NJdZ+YJ9Vf2t286L20IjFK0SxGpobF1xIp5ZQlxWetk= +github.com/strangelove-ventures/packet-forward-middleware/v7 v7.0.0-20230523193151-73dea436e53f/go.mod h1:DJNSVK8NCYHM+aZHCFkcAqPwjzwHYAjhjSMlhAGtJ3c= github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= +github.com/streadway/amqp v1.0.0 h1:kuuDrUJFZL1QYL9hUNuCxNObNzB0bV/ZG5jV3RWAQgo= github.com/streadway/amqp v1.0.0/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= +github.com/streadway/handy v0.0.0-20200128134331-0f66f006fb2e h1:mOtuXaRAbVZsxAHVdPR3IjfmN8T1h2iczJLynhLybf8= github.com/streadway/handy v0.0.0-20200128134331-0f66f006fb2e/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= -github.com/stretchr/objx v0.0.0-20180129172003-8a3f7159479f/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= -github.com/stretchr/objx v0.3.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/stretchr/testify v0.0.0-20170130113145-4d4bfba8f1d1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/stretchr/testify v0.0.0-20180303142811-b89eecf5ca5d/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/stretchr/testify v1.1.4/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.0/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/stretchr/testify v1.2.1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= @@ -2608,223 +1986,133 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= -github.com/stretchr/testify v1.7.5/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= -github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= -github.com/subosito/gotenv v1.3.0/go.mod h1:YzJjq/33h7nrwdY+iHMhEOEEbW0ovIz0tB6t6PwAXzs= -github.com/subosito/gotenv v1.4.0/go.mod h1:mZd6rFysKEcUhUHXJk0C/08wAgyDBFuwEYL7vWWGaGo= -github.com/subosito/gotenv v1.4.1 h1:jyEFiXpy21Wm81FBN71l9VoMMV8H8jG+qIK3GCpY6Qs= -github.com/subosito/gotenv v1.4.1/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= -github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= -github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= -github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= -github.com/syndtr/goleveldb v1.0.1-0.20200815110645-5c35d600f0ca/go.mod h1:u2MKkTVTVJWe5D1rCvame8WqhBd88EuIwODJZ1VHCPM= +github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8= +github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY= github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc= -github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA= -github.com/tchap/go-patricia v2.2.6+incompatible/go.mod h1:bmLyhP68RS6kStMGxByiQ23RP/odRBOTVjwp2cDyi6I= -github.com/tdakkota/asciicheck v0.0.0-20200416190851-d7f85be797a2/go.mod h1:yHp0ai0Z9gUljN3o0xMhYJnH/IcvkdTBOX2fmJ93JEM= -github.com/tdakkota/asciicheck v0.0.0-20200416200610-e657995f937b/go.mod h1:yHp0ai0Z9gUljN3o0xMhYJnH/IcvkdTBOX2fmJ93JEM= +github.com/tdakkota/asciicheck v0.1.1 h1:PKzG7JUTUmVspQTDqtkX9eSiLGossXTybutHwTXuO0A= github.com/tdakkota/asciicheck v0.1.1/go.mod h1:yHp0ai0Z9gUljN3o0xMhYJnH/IcvkdTBOX2fmJ93JEM= -github.com/tdewolff/minify/v2 v2.12.1/go.mod h1:p5pwbvNs1ghbFED/ZW1towGsnnWwzvM8iz8l0eURi9g= -github.com/tdewolff/minify/v2 v2.12.4/go.mod h1:h+SRvSIX3kwgwTFOpSckvSxgax3uy8kZTSF1Ojrr3bk= -github.com/tdewolff/parse/v2 v2.6.3/go.mod h1:woz0cgbLwFdtbjJu8PIKxhW05KplTFQkOdX78o+Jgrs= -github.com/tdewolff/parse/v2 v2.6.4/go.mod h1:woz0cgbLwFdtbjJu8PIKxhW05KplTFQkOdX78o+Jgrs= -github.com/tdewolff/test v1.0.7/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE= github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c h1:g+WoO5jjkqGAzHWCjJB1zZfXPIAaDpzXIEJ0eS6B5Ok= github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c/go.mod h1:ahpPrc7HpcfEWDQRZEmnXMzHY03mLDYMCxeDzy46i+8= -github.com/tendermint/btcd v0.1.1/go.mod h1:DC6/m53jtQzr/NFmMNEu0rxf18/ktVoVtMrnDD5pN+U= -github.com/tendermint/crypto v0.0.0-20191022145703-50d29ede1e15/go.mod h1:z4YtwM70uOnk8h0pjJYlj3zdYwi9l03By6iAIF5j/Pk= github.com/tendermint/go-amino v0.16.0 h1:GyhmgQKvqF82e2oZeuMSp9JTN0N09emoSZlb2lyGa2E= github.com/tendermint/go-amino v0.16.0/go.mod h1:TQU0M1i/ImAo+tYpZi73AU3V/dKeCoMC9Sphe2ZwGME= -github.com/tendermint/spm v0.1.9/go.mod h1:iHgfQ5YOI6ONc9E7ugGQolVdfSMHpeXfZ/OpXuN/42Q= -github.com/tendermint/tm-db v0.6.4/go.mod h1:dptYhIpJ2M5kUuenLr+Yyf3zQOv1SgBZcl8/BmWlMBw= -github.com/tendermint/tm-db v0.6.6/go.mod h1:wP8d49A85B7/erz/r4YbKssKw6ylsO/hKtFk7E1aWZI= -github.com/tendermint/tm-db v0.6.7 h1:fE00Cbl0jayAoqlExN6oyQJ7fR/ZtoVOmvPJ//+shu8= -github.com/tendermint/tm-db v0.6.7/go.mod h1:byQDzFkZV1syXr/ReXS808NxA2xvyuuVgXOJ/088L6I= -github.com/tenntenn/modver v1.0.1/go.mod h1:bePIyQPb7UeioSRkw3Q0XeMhYZSMx9B8ePqg6SAMGH0= -github.com/tenntenn/text/transform v0.0.0-20200319021203-7eef512accb3/go.mod h1:ON8b8w4BN/kE1EOhwT0o+d62W65a6aPw1nouo9LMgyY= -github.com/tetafro/godot v0.3.7/go.mod h1:/7NLHhv08H1+8DNj0MElpAACw1ajsCuf3TKNQxA5S+0= -github.com/tetafro/godot v0.4.2/go.mod h1:/7NLHhv08H1+8DNj0MElpAACw1ajsCuf3TKNQxA5S+0= +github.com/tetafro/godot v1.4.11 h1:BVoBIqAf/2QdbFmSwAWnaIqDivZdOV0ZRwEm6jivLKw= github.com/tetafro/godot v1.4.11/go.mod h1:LR3CJpxDVGlYOWn3ZZg1PgNZdTUvzsZWu8xaEohUpn8= -github.com/tidwall/btree v1.5.0 h1:iV0yVY/frd7r6qGBXfEYs7DH0gTDgrKTrDjS7xt/IyQ= -github.com/tidwall/btree v1.5.0/go.mod h1:LGm8L/DZjPLmeWGjv5kFrY8dL4uVhMmzmmLYmsObdKE= -github.com/tidwall/gjson v1.6.7/go.mod h1:zeFuBCIqD4sN/gmqBzZ4j7Jd6UcA2Fc56x7QFsv+8fI= +github.com/tidwall/btree v1.6.0 h1:LDZfKfQIBHGHWSwckhXI0RPSXzlo+KYdjK7FWSqOzzg= +github.com/tidwall/btree v1.6.0/go.mod h1:twD9XRA5jj9VUQGELzDO4HPQTNJsoWWfYEL+EUQ2cKY= github.com/tidwall/gjson v1.12.1/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= github.com/tidwall/gjson v1.14.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= -github.com/tidwall/match v1.0.3/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= +github.com/tidwall/gjson v1.14.4 h1:uo0p8EbA09J7RQaflQ1aBRffTR7xedD2bcIVSYxLnkM= +github.com/tidwall/gjson v1.14.4/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= +github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA= github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= -github.com/tidwall/pretty v1.0.2/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= +github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs= github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU= -github.com/tidwall/sjson v1.1.4/go.mod h1:wXpKXu8CtDjKAZ+3DrKY5ROCorDFahq8l0tey/Lx1fg= +github.com/tidwall/sjson v1.2.4 h1:cuiLzLnaMeBhRmEv00Lpk3tkYrcxpmbU81tAY4Dw0tc= github.com/tidwall/sjson v1.2.4/go.mod h1:098SZ494YoMWPmMO6ct4dcFnqxwj9r/gF0Etp19pSNM= -github.com/timakin/bodyclose v0.0.0-20190930140734-f7f2e9bca95e/go.mod h1:Qimiffbc6q9tBWlVV6x0P9sat/ao1xEkREYPPj9hphk= -github.com/timakin/bodyclose v0.0.0-20200424151742-cb6215831a94/go.mod h1:Qimiffbc6q9tBWlVV6x0P9sat/ao1xEkREYPPj9hphk= +github.com/timakin/bodyclose v0.0.0-20210704033933-f49887972144 h1:kl4KhGNsJIbDHS9/4U9yQo1UcPQM0kOMJHn29EoH/Ro= github.com/timakin/bodyclose v0.0.0-20210704033933-f49887972144/go.mod h1:Qimiffbc6q9tBWlVV6x0P9sat/ao1xEkREYPPj9hphk= +github.com/timonwong/loggercheck v0.9.3 h1:ecACo9fNiHxX4/Bc02rW2+kaJIAMAes7qJ7JKxt0EZI= github.com/timonwong/loggercheck v0.9.3/go.mod h1:wUqnk9yAOIKtGA39l1KLE9Iz0QiTocu/YZoOf+OzFdw= +github.com/tinylib/msgp v1.0.2 h1:DfdQrzQa7Yh2es9SuLkixqxuXS2SxsdYn0KbdrOGWD8= github.com/tinylib/msgp v1.0.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE= -github.com/tinylib/msgp v1.1.5/go.mod h1:eQsjooMTnV42mHu917E26IogZ2930nFyBQdofk10Udg= -github.com/tj/assert v0.0.0-20171129193455-018094318fb0/go.mod h1:mZ9/Rh9oLWpLLDRpvE+3b7gP/C2YyLFYxNmcLnPTMe0= -github.com/tj/go-elastic v0.0.0-20171221160941-36157cbbebc2/go.mod h1:WjeM0Oo1eNAjXGDx2yma7uG2XoyRZTq1uv3M/o7imD0= -github.com/tj/go-kinesis v0.0.0-20171128231115-08b17f58cb1b/go.mod h1:/yhzCV0xPfx6jb1bBgRFjl5lytqVqZXEaeqWP8lTEao= -github.com/tj/go-spin v1.1.0/go.mod h1:Mg1mzmePZm4dva8Qz60H2lHwmJ2loum4VIrLgVnKwh4= +github.com/tklauser/go-sysconf v0.3.5 h1:uu3Xl4nkLzQfXNsWn15rPc/HQCJKObbt1dKJeWp3vU4= github.com/tklauser/go-sysconf v0.3.5/go.mod h1:MkWzOF4RMCshBAMXuhXJs64Rte09mITnppBXY/rYEFI= -github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk= +github.com/tklauser/numcpus v0.2.2 h1:oyhllyrScuYI6g+h/zUvNXNp1wy7x8qQy3t/piefldA= github.com/tklauser/numcpus v0.2.2/go.mod h1:x3qojaO3uyYt0i56EW/VUYs7uBvdl2fkfZFu0T9wgjM= -github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ= +github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8 h1:ndzgwNDnKIqyCvHTXaCqh9KlOWKvBry6nuXMJmonVsE= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/tmc/grpc-websocket-proxy v0.0.0-20200427203606-3cfed13b9966/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/tomarrell/wrapcheck/v2 v2.7.0 h1:J/F8DbSKJC83bAvC6FoZaRjZiZ/iKoueSdrEkmGeacA= github.com/tomarrell/wrapcheck/v2 v2.7.0/go.mod h1:ao7l5p0aOlUNJKI0qVwB4Yjlqutd0IvAB9Rdwyilxvg= -github.com/tomasen/realip v0.0.0-20180522021738-f0c99a92ddce/go.mod h1:o8v6yHRoik09Xen7gje4m9ERNah1d1PPsVq1VEx9vE4= -github.com/tommy-muehle/go-mnd v1.1.1/go.mod h1:dSUh0FtTP8VhvkL1S+gUR1OKd9ZnSaozuI6r3m6wOig= -github.com/tommy-muehle/go-mnd v1.3.1-0.20200224220436-e6f9a994e8fa/go.mod h1:dSUh0FtTP8VhvkL1S+gUR1OKd9ZnSaozuI6r3m6wOig= +github.com/tommy-muehle/go-mnd/v2 v2.5.1 h1:NowYhSdyE/1zwK9QCLeRb6USWdoif80Ie+v+yU8u1Zw= github.com/tommy-muehle/go-mnd/v2 v2.5.1/go.mod h1:WsUAkMJMYww6l/ufffCD3m+P7LEvr8TnZn9lwVDlgzw= -github.com/tonistiigi/fsutil v0.0.0-20201103201449-0834f99b7b85/go.mod h1:a7cilN64dG941IOXfhJhlH0qB92hxJ9A1ewrdUmJ6xo= -github.com/tonistiigi/fsutil v0.0.0-20220115021204-b19f7f9cb274/go.mod h1:oPAfvw32vlUJSjyDcQ3Bu0nb2ON2B+G0dtVN/SZNJiA= -github.com/tonistiigi/go-actions-cache v0.0.0-20220404170428-0bdeb6e1eac7/go.mod h1:qqvyZqkfwkoJuPU/bw61bItaoO0SJ8YSW0vSVRRvsRg= -github.com/tonistiigi/go-archvariant v1.0.0/go.mod h1:TxFmO5VS6vMq2kvs3ht04iPXtu2rUT/erOnGFYfk5Ho= -github.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea/go.mod h1:WPnis/6cRcDZSUvVmezrxJPkiO87ThFYsoUiMwWNDJk= -github.com/tonistiigi/vt100 v0.0.0-20210615222946-8066bb97264f/go.mod h1:ulncasL3N9uLrVann0m+CDlJKWsIAP34MPcOJF6VRvc= -github.com/ttacon/chalk v0.0.0-20160626202418-22c06c80ed31/go.mod h1:onvgF043R+lC5RZ8IT9rBXDaEDnpnw/Cl+HFiw+v/7Q= +github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926 h1:G3dpKMzFDjgEh2q1Z7zUUtKa8ViPtH+ocF0bE0g00O8= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= -github.com/tv42/httpunix v0.0.0-20191220191345-2ba4b9c3382c/go.mod h1:hzIxponao9Kjc7aWznkXaL4U4TWaDSs8zcsY4Ka08nM= github.com/tyler-smith/go-bip39 v1.0.1-0.20181017060643-dbb3b84ba2ef/go.mod h1:sJ5fKU0s6JVwZjjcUEX2zFOnvq0ASQ2K9Zr6cf67kNs= +github.com/tyler-smith/go-bip39 v1.0.2 h1:+t3w+KwLXO6154GNJY+qUtIxLTmFjfUmpguQT1OlOT8= github.com/tyler-smith/go-bip39 v1.0.2/go.mod h1:sJ5fKU0s6JVwZjjcUEX2zFOnvq0ASQ2K9Zr6cf67kNs= -github.com/uber/jaeger-client-go v2.25.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk= -github.com/uber/jaeger-lib v2.2.0+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U= -github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= +github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo= github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= -github.com/ugorji/go v1.2.7 h1:qYhyWUUd6WbiM+C6JZAUkIJt/1WrjzNHY9+KCIjVqTo= -github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M= github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= github.com/ugorji/go/codec v1.2.7 h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0= github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY= -github.com/ulikunitz/xz v0.5.6/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8= -github.com/ulikunitz/xz v0.5.7/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= -github.com/ultraware/funlen v0.0.2/go.mod h1:Dp4UiAus7Wdb9KUZsYWZEWiRzGuM2kXM1lPbfaF6xhA= +github.com/ulikunitz/xz v0.5.10/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= +github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8= +github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= +github.com/ultraware/funlen v0.0.3 h1:5ylVWm8wsNwH5aWo9438pwvsK0QiqVuUrt9bn7S/iLA= github.com/ultraware/funlen v0.0.3/go.mod h1:Dp4UiAus7Wdb9KUZsYWZEWiRzGuM2kXM1lPbfaF6xhA= -github.com/ultraware/whitespace v0.0.4/go.mod h1:aVMh/gQve5Maj9hQ/hg+F75lr/X5A89uZnzAmWSineA= +github.com/ultraware/whitespace v0.0.5 h1:hh+/cpIcopyMYbZNVov9iSxvJU3OYQg78Sfaqzi/CzI= github.com/ultraware/whitespace v0.0.5/go.mod h1:aVMh/gQve5Maj9hQ/hg+F75lr/X5A89uZnzAmWSineA= -github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= +github.com/urfave/cli v1.22.1 h1:+mkCCcOFKPnCmVYVcURKps1Xe+3zP90gSYGNfRkjoIY= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= -github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= -github.com/urfave/cli v1.22.4/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= +github.com/urfave/cli/v2 v2.3.0 h1:qph92Y649prgesehzOrQjdWyxFOp/QVM+6imKHad91M= github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI= -github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4= -github.com/uudashr/gocognit v1.0.1/go.mod h1:j44Ayx2KW4+oB6SWMv8KsmHzZrOInQav7D3cQMJ5JUM= +github.com/uudashr/gocognit v1.0.6 h1:2Cgi6MweCsdB6kpcVQp7EW4U23iBFQWfTXiWlyp842Y= github.com/uudashr/gocognit v1.0.6/go.mod h1:nAIUuVBnYU7pcninia3BHOvQkpQCeO76Uscky5BOwcY= +github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= -github.com/valyala/fasthttp v1.2.0/go.mod h1:4vX61m6KN+xDduDNwXrhIAVZaZaZiQ1luJk8LWSxF3s= -github.com/valyala/fasthttp v1.6.0/go.mod h1:FstJa9V+Pj9vQ7OJie2qMHdwemEDaDiSdBnvPM1Su9w= -github.com/valyala/fasthttp v1.30.0/go.mod h1:2rsYD01CKFrjjsvFxx75KlEUNpWNBY9JWD3K/7o2Cus= -github.com/valyala/fasthttp v1.40.0/go.mod h1:t/G+3rLek+CyY9bnIE+YlMRddxVAAGjhxndDB4i4C0I= github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8= +github.com/valyala/fasttemplate v1.2.1 h1:TVEnxayobAdVkhQfrfes2IzOB6o+z4roRkPF52WA1u4= github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= -github.com/valyala/quicktemplate v1.2.0/go.mod h1:EH+4AkTd43SvgIbQHYu59/cJyxDoOVRUAfrukLPuGJ4= -github.com/valyala/quicktemplate v1.7.0/go.mod h1:sqKJnoaOF88V07vkO+9FL8fb9uZg/VPSJnLYn+LmLk8= -github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio= -github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc= -github.com/vbatts/tar-split v0.11.2/go.mod h1:vV3ZuO2yWSVsz+pfFzDG/upWH1JhjOiEaWq6kXyQ3VI= -github.com/vdemeester/k8s-pkg-credentialprovider v1.17.4/go.mod h1:inCTmtUdr5KJbreVojo06krnTgaeAz/Z7lynpPk/Q2c= +github.com/vektra/mockery/v2 v2.14.0 h1:KZ1p5Hrn8tiY+LErRMr14HHle6khxo+JKOXLBW/yfqs= github.com/vektra/mockery/v2 v2.14.0/go.mod h1:bnD1T8tExSgPD1ripLkDbr60JA9VtQeu12P3wgLZd7M= -github.com/viki-org/dnscache v0.0.0-20130720023526-c70c1f23c5d8/go.mod h1:dniwbG03GafCjFohMDmz6Zc6oCuiqgH6tGNyXTkHzXE= -github.com/vishvananda/netlink v0.0.0-20181108222139-023a6dafdcdf/go.mod h1:+SR5DhBJrl6ZM7CoCKvpw5BKroDKQ+PJqOg65H/2ktk= -github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE= -github.com/vishvananda/netlink v1.1.1-0.20201029203352-d40f9887b852/go.mod h1:twkDnbuQxJYemMlGd4JFIcuhgX83tXhKS2B/PRMpOho= -github.com/vishvananda/netlink v1.1.1-0.20210330154013-f5de75959ad5/go.mod h1:twkDnbuQxJYemMlGd4JFIcuhgX83tXhKS2B/PRMpOho= -github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc/go.mod h1:ZjcWmFBXmLKZu9Nxj3WKYEafiSqer2rnvPr0en9UNpI= -github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU= -github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0= -github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0= -github.com/vmihailenco/msgpack/v5 v5.1.4/go.mod h1:C5gboKD0TJPqWDTVTtrQNfRbiBwHZGo8UTqP/9/XvLI= +github.com/vmihailenco/msgpack/v5 v5.3.5 h1:5gO0H1iULLWGhs2H5tbAHIZTV8/cYafcFOr9znI5mJU= github.com/vmihailenco/msgpack/v5 v5.3.5/go.mod h1:7xyJ9e+0+9SaZT0Wt1RGleJXzli6Q/V5KbhBonMG9jc= -github.com/vmihailenco/tagparser v0.1.2/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI= +github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g= github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds= -github.com/vmware/govmomi v0.20.3/go.mod h1:URlwyTFZX72RmxtxuaFL2Uj3fD1JTvZdx59bHWk6aFU= +github.com/willf/bitset v1.1.3 h1:ekJIKh6+YbUIVt9DfNbkR5d6aFcFTLDRyJNAACURBg8= github.com/willf/bitset v1.1.3/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4= -github.com/willf/bitset v1.1.11-0.20200630133818-d5bec3311243/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4= -github.com/willf/bitset v1.1.11/go.mod h1:83CECat5yLh5zVOf4P1ErAgKA5UDvKtgyUABdr3+MjI= -github.com/wsddn/go-ecdh v0.0.0-20161211032359-48726bab9208/go.mod h1:IotVbo4F+mw0EzQ08zFqg7pK3FebNXpaMsRy2RT+Ees= -github.com/xanzy/go-gitlab v0.31.0/go.mod h1:sPLojNBn68fMUWSxIJtdVVIP8uSBYqesTfDUseX11Ug= -github.com/xanzy/go-gitlab v0.32.0/go.mod h1:sPLojNBn68fMUWSxIJtdVVIP8uSBYqesTfDUseX11Ug= +github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM= github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw= -github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= -github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= -github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= -github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f/go.mod h1:5yf86TLmAcydyeJq5YvxkGPE2fm/u4myDekKRoLuqhs= -github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= -github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod h1:HUYIGzjTL3rfEspMxjDjgmT5uz5wzYJKVo23qUhYTos= +github.com/xhit/go-str2duration/v2 v2.1.0 h1:lxklc02Drh6ynqX+DdPyp5pCKLUQpRT8bp8Ydu2Bstc= +github.com/xhit/go-str2duration/v2 v2.1.0/go.mod h1:ohY8p+0f07DiV6Em5LKB0s2YpLtXVyJfNt1+BlmyAsU= +github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 h1:eY9dn8+vbi4tKz5Qo6v2eYzo7kUS51QINcR5jNpbZS8= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= +github.com/xlab/treeprint v0.0.0-20180616005107-d6fb6747feb6 h1:YdYsPAZ2pC6Tow/nPZOPQ96O3hm/ToAkGsPLzedXERk= github.com/xlab/treeprint v0.0.0-20180616005107-d6fb6747feb6/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg= -github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778/go.mod h1:2MuV+tbUrU1zIOPMxZ5EncGwgmMJsa+9ucAQZXxsObs= +github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77 h1:ESFSdwYZvkeru3RtdrYueztKhOBCSAAzS4Gf+k0tEow= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= +github.com/yagipy/maintidx v1.0.0 h1:h5NvIsCz+nRDapQ0exNv4aJ0yXSI0420omVANTv3GJM= github.com/yagipy/maintidx v1.0.0/go.mod h1:0qNf/I/CCZXSMhsRsrEPDZ+DkekpKLXAJfsTACwgXLk= -github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0/go.mod h1:/LWChgwKmvncFJFHJ7Gvn9wZArjbV5/FppcK2fKk/tI= +github.com/ybbus/jsonrpc v2.1.2+incompatible h1:V4mkE9qhbDQ92/MLMIhlhMSbz8jNXdagC3xBR5NDwaQ= github.com/ybbus/jsonrpc v2.1.2+incompatible/go.mod h1:XJrh1eMSzdIYFbM08flv0wp5G35eRniyeGut1z+LSiE= +github.com/yeya24/promlinter v0.2.0 h1:xFKDQ82orCU5jQujdaD8stOHiv8UN68BSdn2a8u8Y3o= github.com/yeya24/promlinter v0.2.0/go.mod h1:u54lkmBOZrpEbQQ6gox2zWKKLKu2SGe+2KOiextY+IA= -github.com/yosssi/ace v0.0.5/go.mod h1:ALfIzm2vT7t5ZE7uoIZqF3TQ7SAOyupFZnkrF5id+K0= -github.com/yudai/gojsondiff v1.0.0/go.mod h1:AY32+k2cwILAkW1fbgxQ5mUmMiZFgLIV+FBNExI05xg= -github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDfVJdfcVVdX+jpBxNmX4rDAzaS45IcYoM= -github.com/yudai/pp v2.0.1+incompatible/go.mod h1:PuxR/8QJ7cyCkFp/aUDS+JY727OFEZkTdatxwunjIkc= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +github.com/yuin/goldmark v1.4.13 h1:fVcFKWvrslecOb/tg+Cc05dkeYx540o0FuFt3nUVDoE= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43/go.mod h1:aX5oPXxHm3bOH+xeAttToC8pqch2ScQN/JoXYupl6xs= -github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50/go.mod h1:NUSPSUX/bi6SeDMUh6brw0nXpxHnc96TguQh0+r/ssA= -github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod h1:GlGEuHIJweS1mbCqG+7vt2nvWLzLLnRHbXz5JKd/Qbg= -github.com/zondax/hid v0.9.0/go.mod h1:l5wttcP0jwtdLjqjMMWFVEE7d1zO0jvSPA9OPZxWpEM= github.com/zondax/hid v0.9.1 h1:gQe66rtmyZ8VeGFcOpbuH3r7erYtNEAezCAYu8LdkJo= github.com/zondax/hid v0.9.1/go.mod h1:l5wttcP0jwtdLjqjMMWFVEE7d1zO0jvSPA9OPZxWpEM= github.com/zondax/ledger-go v0.14.1 h1:Pip65OOl4iJ84WTpA4BKChvOufMhhbxED3BaihoZN4c= github.com/zondax/ledger-go v0.14.1/go.mod h1:fZ3Dqg6qcdXWSOJFKMG8GCTnD7slO/RL2feOQv8K320= +gitlab.com/bosi/decorder v0.2.3 h1:gX4/RgK16ijY8V+BRQHAySfQAb354T7/xQpDB2n10P0= gitlab.com/bosi/decorder v0.2.3/go.mod h1:9K1RB5+VPNQYtXtTDAzd2OEftsZb1oV0IrJrzChSdGE= -go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= -go.etcd.io/bbolt v1.3.4/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= -go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= -go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU= -go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4= +go.etcd.io/bbolt v1.3.7 h1:j+zJOnnEjF/kyHlDDgGnVL/AIqIJPq8UoB2GSNfkUfQ= +go.etcd.io/bbolt v1.3.7/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw= +go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738 h1:VcrIfasaLFkyjk6KNlXQSzO+B0fZcnECiDrKJsfxka0= go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= -go.etcd.io/etcd v0.0.0-20200513171258-e048e166ab9c/go.mod h1:xCI7ZzBfRuGgBXyXO6yfWfDmlWd35khcWpUa4L0xI/k= -go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489/go.mod h1:yVHk9ub3CSBatqGNg7GRmsnfLWtoW60w4eDYfh7vHDg= -go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= -go.etcd.io/etcd/api/v3 v3.5.1/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= -go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= -go.etcd.io/etcd/api/v3 v3.5.5/go.mod h1:KFtNaxGDw4Yx/BA4iPPwevUTAuqcsPxzyX8PHydchN8= -go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= -go.etcd.io/etcd/client/pkg/v3 v3.5.1/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= -go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= -go.etcd.io/etcd/client/pkg/v3 v3.5.5/go.mod h1:ggrwbk069qxpKPq8/FKkQ3Xq9y39kbFR4LnKszpRXeQ= -go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= -go.etcd.io/etcd/client/v2 v2.305.1/go.mod h1:pMEacxZW7o8pg4CrFE7pquyCJJzZvkvdD2RibOCCCGs= -go.etcd.io/etcd/client/v2 v2.305.4/go.mod h1:Ud+VUwIi9/uQHOMA+4ekToJ12lTxlv0zB/+DHwTGEbU= -go.etcd.io/etcd/client/v2 v2.305.5/go.mod h1:zQjKllfqfBVyVStbt4FaosoX2iYd8fV/GRy/PbowgP4= -go.etcd.io/etcd/client/v3 v3.5.0/go.mod h1:AIKXXVX/DQXtfTEqBryiLTUXwON+GuvO6Z7lLS/oTh0= -go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.etcd.io/etcd/client/v3 v3.5.5/go.mod h1:aApjR4WGlSumpnJ2kloS75h6aHUmAyaPLjHMxpc7E7c= -go.etcd.io/etcd/pkg/v3 v3.5.0/go.mod h1:UzJGatBQ1lXChBkQF0AuAtkRQMYnHubxAEYIrC3MSsE= -go.etcd.io/etcd/raft/v3 v3.5.0/go.mod h1:UFOHSIvO/nKwd4lhkwabrTD3cqW5yVyYYf/KlD00Szc= -go.etcd.io/etcd/server/v3 v3.5.0/go.mod h1:3Ah5ruV+M+7RZr0+Y/5mNLwC+eQlni+mQmOVdCRJoS4= -go.mozilla.org/mozlog v0.0.0-20170222151521-4bb13139d403/go.mod h1:jHoPAGnDrCy6kaI2tAze5Prf0Nr0w/oNkROt2lw3n3o= -go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1/go.mod h1:SNgMg+EgDFwmvSmLRTNKC5fegJjB7v23qTQ0XLGUNHk= -go.opencensus.io v0.15.0/go.mod h1:UffZAU+4sDEINUGP/B7UfBBkq4fqLu9zXAX7ke6CHW0= -go.opencensus.io v0.18.0/go.mod h1:vKdFvxhtzZ9onBp9VKHK8z/sRpBMnKAsufL7wlDrCOA= -go.opencensus.io v0.19.1/go.mod h1:gug0GbSHa8Pafr0d2urOSgoXHZ6x/RUlaiT0d9pqb4A= -go.opencensus.io v0.19.2/go.mod h1:NO/8qkisMZLZ1FCsKNqtJPwc8/TaclWyY0B6wcYNg9M= +go.etcd.io/etcd/api/v3 v3.5.9 h1:4wSsluwyTbGGmyjJktOf3wFQoTBIURXHnq9n/G/JQHs= +go.etcd.io/etcd/api/v3 v3.5.9/go.mod h1:uyAal843mC8uUVSLWz6eHa/d971iDGnCRpmKd2Z+X8k= +go.etcd.io/etcd/client/pkg/v3 v3.5.9 h1:oidDC4+YEuSIQbsR94rY9gur91UPL6DnxDCIYd2IGsE= +go.etcd.io/etcd/client/pkg/v3 v3.5.9/go.mod h1:y+CzeSmkMpWN2Jyu1npecjB9BBnABxGM4pN8cGuJeL4= +go.etcd.io/etcd/client/v2 v2.305.7 h1:AELPkjNR3/igjbO7CjyF1fPuVPjrblliiKj+Y6xSGOU= +go.etcd.io/etcd/client/v2 v2.305.7/go.mod h1:GQGT5Z3TBuAQGvgPfhR7VPySu/SudxmEkRq9BgzFU6s= +go.etcd.io/etcd/client/v3 v3.5.9 h1:r5xghnU7CwbUxD/fbUtRyJGaYNfDun8sp/gTr1hew6E= +go.etcd.io/etcd/client/v3 v3.5.9/go.mod h1:i/Eo5LrZ5IKqpbtpPDuaUnDOUv471oDg8cjQaUr2MbA= +go.etcd.io/gofail v0.1.0 h1:XItAMIhOojXFQMgrxjnd2EIIHun/d5qL0Pf7FzVTkFg= +go.etcd.io/gofail v0.1.0/go.mod h1:VZBCXYGZhHAinaBiiqYvuDynvahNsAyLFwB3kEHKz1M= go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= @@ -2834,142 +2122,69 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= +go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/contrib v0.20.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUzl5H4LY0Kc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0/go.mod h1:oVGt1LRbBOBq1A5BQLlUg9UaU/54aiHw8cgjV3aWZ/E= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.28.0/go.mod h1:vEhqr0m4eTc+DWxfsXoXue2GBgV2uUwVznkGIHW/e5w= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0/go.mod h1:LsankqVDx4W+RhZNA5uWarULII/MBhF5qwCYxTuyXjs= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.3 h1:syAz40OyelLZo42+3U68Phisvrx4qh+4wpdZw7eUUdY= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.3/go.mod h1:Dts42MGkzZne2yCru741+bFiTMWkIj/LLRizad7b9tw= -go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.29.0/go.mod h1:vHItvsnJtp7ES++nFLLFBzUWny7fJQSvTlxFcqQGUr4= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0/go.mod h1:2AboqHi0CiIZU0qwhtUfCYD1GeUzvvIXWNkhDt7ZMG4= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0/go.mod h1:tLYsuf2v8fZreBVwp9gVMhefZlLFZaUiNVSq8QxXRII= -go.opentelemetry.io/otel v0.20.0/go.mod h1:Y3ugLH2oa81t5QO+Lty+zXf8zC9L26ax4Nzoxm/dooo= -go.opentelemetry.io/otel v1.3.0/go.mod h1:PWIKzi6JCp7sM0k9yZ43VX+T345uNbAkDKwHVjb2PTs= -go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.11.0 h1:kfToEGMDq6TrVrJ9Vht84Y8y9enykSZzDDZglV0kIEk= go.opentelemetry.io/otel v1.11.0/go.mod h1:H2KtuEphyMvlhZ+F7tg9GRhAOe60moNx61Ex+WmiKkk= -go.opentelemetry.io/otel/exporters/jaeger v1.4.1/go.mod h1:ZW7vkOu9nC1CxsD8bHNHCia5JUbwP39vxgd1q4Z5rCI= -go.opentelemetry.io/otel/exporters/otlp v0.20.0/go.mod h1:YIieizyaN77rtLJra0buKiNBOm9XQfkPEKBeuhoMwAM= -go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.3.0/go.mod h1:VpP4/RMn8bv8gNo9uK7/IMY4mtWLELsS+JIP0inH0h4= -go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.4.1/go.mod h1:VpP4/RMn8bv8gNo9uK7/IMY4mtWLELsS+JIP0inH0h4= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.3.0/go.mod h1:hO1KLR7jcKaDDKDkvI9dP/FIhpmna5lkqPUQdEjFAM8= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.4.1/go.mod h1:o5RW5o2pKpJLD5dNTCmjF1DorYwMeFJmb/rKr5sLaa8= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.3.0/go.mod h1:keUU7UfnwWTWpJ+FWnyqmogPa82nuU5VUANFq49hlMY= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.4.1/go.mod h1:c6E4V3/U+miqjs/8l950wggHGL1qzlp0Ypj9xoGrPqo= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.3.0/go.mod h1:QNX1aly8ehqqX1LEa6YniTU7VY9I6R3X/oPxhGdTceE= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.4.1/go.mod h1:VwYo0Hak6Efuy0TXsZs8o1hnV3dHDPNtDbycG0hI8+M= -go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= -go.opentelemetry.io/otel/metric v0.20.0/go.mod h1:598I5tYlH1vzBjn+BTuhzTCSb/9debfNp6R3s7Pr1eU= -go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/metric v0.32.3/go.mod h1:pgiGmKohxHyTPHGOff+vrtIH39/R9fiO/WoenUQ3kcc= -go.opentelemetry.io/otel/oteltest v0.20.0/go.mod h1:L7bgKf9ZB7qCwT9Up7i9/pn0PWIa9FqQ2IQ8LoxiGnw= -go.opentelemetry.io/otel/sdk v0.20.0/go.mod h1:g/IcepuwNsoiX5Byy2nNV0ySUF1em498m7hBWC279Yc= -go.opentelemetry.io/otel/sdk v1.3.0/go.mod h1:rIo4suHNhQwBIPg9axF8V9CA72Wz2mKF1teNrup8yzs= -go.opentelemetry.io/otel/sdk v1.4.1/go.mod h1:NBwHDgDIBYjwK2WNu1OPgsIc2IJzmBXNnvIJxJc8BpE= -go.opentelemetry.io/otel/sdk/export/metric v0.20.0/go.mod h1:h7RBNMsDJ5pmI1zExLi+bJK+Dr8NQCh0qGhm1KDnNlE= -go.opentelemetry.io/otel/sdk/metric v0.20.0/go.mod h1:knxiS8Xd4E/N+ZqKmUPf3gTTZ4/0TjTXukfxjzSTpHE= -go.opentelemetry.io/otel/trace v0.20.0/go.mod h1:6GjCW8zgDjwGHGa6GkyeB8+/5vjT16gUEi0Nf1iBdgw= -go.opentelemetry.io/otel/trace v1.3.0/go.mod h1:c/VDhno8888bvQYmbYLqe41/Ldmr/KKunbvWM4/fEjk= -go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.11.0 h1:20U/Vj42SX+mASlXLmSGBg6jpI1jQtv682lZtTAOVFI= go.opentelemetry.io/otel/trace v1.11.0/go.mod h1:nyYjis9jy0gytE9LXGU+/m1sHTKbRY0fX0hulNNDP1U= +go.opentelemetry.io/proto/otlp v0.7.0 h1:rwOQPCuKAKmwGKq2aVNnYIibI6wnV7EvzgfTCzcdGg8= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= -go.opentelemetry.io/proto/otlp v0.11.0/go.mod h1:QpEjXPrNQzrFDZgoTo49dgHR9RYRSrg3NAKnUGl9YpQ= -go.opentelemetry.io/proto/otlp v0.12.0/go.mod h1:TsIjwGWIx5VFYv9KGVlOpxoBl5Dy+63SUguV7GGvlSQ= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= +go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= +go.uber.org/goleak v1.1.10 h1:z+mqJhf6ss6BSfSM671tgKyZBFPTTJM+HLxnhPC3wu0= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= -go.uber.org/goleak v1.1.11-0.20210813005559-691160354723/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= -go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= -go.uber.org/goleak v1.1.12/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= -go.uber.org/multierr v1.4.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= -go.uber.org/multierr v1.7.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= +go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= +go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee h1:0mgffUl7nfd+FpvXMVz4IDEaUSmT1ysygQC7qYo7sG4= go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= -go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.19.1/go.mod h1:j3DNczoxDZroyBnOT1L/Q79cfUMGZxlv/9dzN7SM1rI= -go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw= +go.uber.org/zap v1.18.1/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= +go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= -go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE= -gocloud.dev v0.19.0/go.mod h1:SmKwiR8YwIMMJvQBKLsC3fHNyMwXLw3PMDO+VVteJMI= -golang.org/x/build v0.0.0-20190314133821-5284462c4bec/go.mod h1:atTaCNAy0f16Ah5aV1gMSwgiKVHwu/JncqDpuRr7lS4= -golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20180501155221-613d6eafa307/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190909091759-094676da4a83/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= -golang.org/x/crypto v0.0.0-20191002192127-34f69633bfdc/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20191227163750-53104e6ec876/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200115085410-6d4e4cb37c7d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= -golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= -golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= -golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= -golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20210915214749-c084706c2272/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20211202192323-5770296d904e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20220314234659-1baeb1ce4c0b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.0.0-20220826181053-bd7e27e6170d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= -golang.org/x/crypto v0.2.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= -golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= -golang.org/x/crypto v0.5.0 h1:U/0M97KRkSFvyD/3FSmdP5W5swImpNgle/EHFhOsQPE= -golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU= +golang.org/x/crypto v0.10.0 h1:LKqV2xt9+kDzSTfOhx4FrkEBcMrAgHSYgzywV9zcGmM= +golang.org/x/crypto v0.10.0/go.mod h1:o4eNf7Ede1fv+hwOwZsTHl9EsPFO6q6ZvYR8vYfY45I= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190312203227-4b39c73a6495/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= -golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56/go.mod h1:JhuoJpWY28nO4Vef9tZUw9qufEGTyX1+7lmHxV5q5G4= golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= @@ -2978,19 +2193,15 @@ golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw= -golang.org/x/exp v0.0.0-20200513190911-00229845015e/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw= -golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e/go.mod h1:Kr81I6Kryrl9sr8s2FK3vxD90NdsKWRuOIl2O4CvYbA= -golang.org/x/exp v0.0.0-20221019170559-20944726eadf/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE= -golang.org/x/exp v0.0.0-20230307190834-24139beb5833 h1:SChBja7BCQewoTAU7IgvucQKMIXrEpFxNMs0spT3/5s= -golang.org/x/exp v0.0.0-20230307190834-24139beb5833/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= -golang.org/x/exp/typeparams v0.0.0-20220218215828-6cf2b201936e/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= -golang.org/x/exp/typeparams v0.0.0-20220428152302-39d4317da171/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= -golang.org/x/exp/typeparams v0.0.0-20220613132600-b0d781184e0d/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= +golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 h1:k/i9J1pBpvlfR+9QsetwPyERsqu1GIbi967PQMq3Ivc= +golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w= +golang.org/x/exp/typeparams v0.0.0-20220827204233-334a2380cb91 h1:Ic/qN6TEifvObMGQy72k0n1LlJr7DjWWEi+MOsDOiSk= golang.org/x/exp/typeparams v0.0.0-20220827204233-334a2380cb91/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= +golang.org/x/image v0.0.0-20190802002840-cff245a6509b h1:+qEpEAPhDZ1o0x3tHzZTQDArnOixOzGD9HUJfcg0mb4= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= -golang.org/x/lint v0.0.0-20181217174547-8f45f776aaf1/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= @@ -3001,38 +2212,28 @@ golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRu golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 h1:VLliZ0d+/avPrXXH+OakdXhpJuEoBZuwh1m2j7U6Iug= golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= +golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028 h1:4+4C/Iv2U4fMZBiMCc98MG1In4gJY5YRhtpDNeDeHWs= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= -golang.org/x/mobile v0.0.0-20200801112145-973feb4309de/go.mod h1:skQtrUTUwhdJvXM/2KKJzY8pDgNr9I/FOMqDVRPBUS4= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.1.1-0.20191209134235-331c550502dd/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= -golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= -golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI= -golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8= -golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180911220305-26e67e76b6c3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181011144130-49bb7cea24b1/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181029044818-c44066c5c816/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181106065722-10aee1819953/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181108082009-03003ca0c849/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -3040,23 +2241,15 @@ golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190327091125-710a502c58a2/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190619014844-b5b0513f8c1b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191112182307-2180aed22343/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -3074,13 +2267,10 @@ golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20201006153459-a7d1128ccaa0/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= @@ -3088,56 +2278,27 @@ golang.org/x/net v0.0.0-20210220033124-5f55cee0dc0d/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8= -golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210520170846-37e1c6afe023/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210610132358-84b48f89b13b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210917221730-978cfadd31cf/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211008194852-3b03d305991f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211216030914-fe4d6282115f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220607020251-c690dde0001d/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.0.0-20220617184016-355a448f1bc9/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.0.0-20220812174116-3211cb980234/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= -golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= -golang.org/x/net v0.0.0-20221002022538-bcab6841153b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= -golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= -golang.org/x/net v0.0.0-20221017152216-f25eb7ecb193/go.mod h1:RpDiru2p0u2F0lLpEoqnP2+7xs0ifAuOcJ442g6GU2s= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= -golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= -golang.org/x/net v0.3.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= -golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= -golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws= -golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ= -golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= -golang.org/x/oauth2 v0.0.0-20180724155351-3d292e4d0cdc/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/net v0.11.0 h1:Gi2tvZIJyBtO9SDr1q9h5hEQCp/4L2RQ+ar0qjx2oNU= +golang.org/x/net v0.11.0/go.mod h1:2L/ixqYpgIVXmeoSA/4Lu7BzTG4KIyPIryS4IsOd1oQ= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -3147,12 +2308,10 @@ golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= @@ -3161,14 +2320,14 @@ golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb/go.mod h1:jaDAt6Dkxork7Lm golang.org/x/oauth2 v0.0.0-20220622183110-fd043fe589d2/go.mod h1:jaDAt6Dkxork7LmZnYtzbRWj0W47D86a3TGe0YHBvmE= golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= -golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= -golang.org/x/perf v0.0.0-20180704124530-6e6d33e29852/go.mod h1:JLpeXjPJfIyPr5TlbXLkXWLhP8nz10XfvxElABhCtcw= +golang.org/x/oauth2 v0.1.0/go.mod h1:G9FE4dLTsbXUu90h/Pf85g4w1D+SSAgR+q46nJZ8M4A= +golang.org/x/oauth2 v0.8.0 h1:6dkIjl3j3LtZ/O3sTgZTMsLKSftL/B8Zgq4huOIIUu8= +golang.org/x/oauth2 v0.8.0/go.mod h1:yr7u4HXZRm1R1kBWqr/xKNqewf0plRYoB7sla+BCIXE= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190412183630-56d357773e84/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -3176,27 +2335,21 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20220513210516-0976fa681c29/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= -golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI= +golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181029174526-d69651ed3497/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181218192612-074acd46bca6/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190130150945-aca44879d564/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -3204,47 +2357,27 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190514135907-3a4b5fb9f71f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190522044717-8097e1b27ff5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190602015325-4c4f7f33c9ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190620070143-6f217b454f45/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190712062909-fae7ac547cb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190812073006-9eafafc0a87e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191112214154-59a1497f0cea/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191115151921-52ab43148777/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191210023423-ac6580df4449/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200107162124-548cf772de50/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200120151820-655fe14d7479/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200217220822-9197077df867/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -3256,136 +2389,73 @@ golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200817155316-9781c653f443/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200824131525-c12d262b63d8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200826173525-f9321e4c35a6/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200831180312-196b9ba8737a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200916030750-2334cc1a136f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200917073148-efd3b9a0ff20/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200922070232-aee5d888a860/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201013081832-0aaa2718063a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201117170446-d9b008d0a637/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201202213521-69691e467435/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201207223542-d4d67f95c62d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210313202042-bd2e13477e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210316164454-77fc1eacc6aa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210420205809-ac73e9fd8988/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210426230700-d19ff857e887/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210819135213-f52c844e1c1c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210903071746-97244b99971b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210909193231-528a39cd75f3/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210917161153-d61c044b1678/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211103235746-7861aae1554b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211105183446-c75c47738b0c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211116061358-0a5406a5449c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211205182925-97ca703d548d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220111092808-5a964db01320/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220204135822-1c1b9b1eba6a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220315194320-039c03cc5b86/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220405210540-1e041c57c461/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220406163625-3f8b81556e12/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220422013727-9388b58f7150/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220502124256-b6088ccd6cba/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220624220833-87e55d714810/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220627191245-f75cf1eec38b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220702020025-31831981b65f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220817070843-5a390386f1f2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220825204002-c680a09ffe64/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220829200755-d48e67d00261/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220915200043-7b5979e65e41/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20221010170243-090e33056c14/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20221013171732-95e765b1cc43/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.9.0 h1:KS/R3tvhPqvJvwcKfnBHJwwthS11LRhmM5D59eEXa0s= +golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.0.0-20220526004731-065cf7ba2467/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.0.0-20220722155259-a9ba230a4035/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.0.0-20220919170432-7a66f970e087/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= -golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA= -golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ= -golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= -golang.org/x/term v0.6.0 h1:clScbb1cHjoCkyRbWwBEUZ5H/tIFu5TAXIqaZD0Gcjw= -golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= -golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/term v0.9.0 h1:GRRCnKYhdQrD8kfRAdQ6Zcw1P0OcELxGLKJvtjVMZ28= +golang.org/x/term v0.9.0/go.mod h1:M6DEAAIenWoTxdKrOltXcmDY3rSplQUkrvaDU5FcQyo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -3397,158 +2467,82 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68= -golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.10.0 h1:UpjohKhiEgNc0CSauXmwYftY1+LlaC75SJwh0SgCX58= +golang.org/x/text v0.10.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20220609170525-579cf78fd858/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20220922220347-f3bd1da661af/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.1.0 h1:xYY+Bajn2a7VBmTM5GikTmnK8ZuX8YgnQCqZpbBNtmA= golang.org/x/time v0.1.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20181117154741-2ddaf7f79a09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20181219222714-6e267b5cc78e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20181221001348-537d06c36207/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190110163146-51295c7ec13a/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190221204921-83362c3779f5/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= -golang.org/x/tools v0.0.0-20190228203856-589c23e65e65/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= -golang.org/x/tools v0.0.0-20190307163923-6a08e3108db3/go.mod h1:25r3+/G6/xytQM8iWZKq3Hn0kr0rgFKPUNVEL/dr3z4= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190311215038-5c2858a9cfe5/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190321232350-e250d351ecad/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190322203728-c1a832b0ad89/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190327201419-c70d86f8b7cf/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190422233926-fe54fb35175b/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190521203540-521d6ed310dd/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190706070813-72ffa07ba3db/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI= -golang.org/x/tools v0.0.0-20190719005602-e377ae9d6386/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI= golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20190910044552-dd2b5c81c578/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20190916130336-e45ffcd953cc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20190920225731-5eefd052ad72/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191010075000-0337d82405ff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191113232020-e2727e816f5a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200102140908-9497f49d5709/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200108203644-89082a384178/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200117012304-6edc0a871e69/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200117220505-0cba7a3a9ee9/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200204192400-7124308813f3/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= -golang.org/x/tools v0.0.0-20200324003944-a576cf524670/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= -golang.org/x/tools v0.0.0-20200329025819-fd4102a86c65/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= -golang.org/x/tools v0.0.0-20200331202046-9d5940d49312/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200414032229-332987a829c3/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200422022333-3d57cf2e726e/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200426102838-f3a5411a4c3b/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200502202811-ed308ab3e770/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200616133436-c1934b75d054/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200622203043-20e05c1c8ffa/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200624225443-88f3c62a19ff/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200625211823-6506e20df31f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200626171337-aa94e735be7f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200630154851-b2d8b0336632/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200706234117-b22de6825cf7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200724022722-7017fd6b1305/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200812195022-5ae4c3c160a0/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200820010801-b793a1359eac/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200831203904-5a2aa26beb65/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= -golang.org/x/tools v0.0.0-20200916195026-c9a70fc28ce3/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= -golang.org/x/tools v0.0.0-20201001104356-43ebab892c4c/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= -golang.org/x/tools v0.0.0-20201002184944-ecd9fd270d5d/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= -golang.org/x/tools v0.0.0-20201022035929-9cf592e881e9/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201023174141-c8cfbd0f21e6/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201028025901-8cd080b735b3/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201230224404-63754364767c/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= -golang.org/x/tools v0.1.1-0.20210205202024-ef80cdb6ec6d/go.mod h1:9bzcO0MWcOuT0tm1iBGzDVPshzfwoVvREIui8C+MHqU= -golang.org/x/tools v0.1.1-0.20210302220138-2ac05c832e1a/go.mod h1:9bzcO0MWcOuT0tm1iBGzDVPshzfwoVvREIui8C+MHqU= golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo= -golang.org/x/tools v0.1.8/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= -golang.org/x/tools v0.1.9-0.20211228192929-ee1ca4ffc4da/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= -golang.org/x/tools v0.1.9/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= -golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= -golang.org/x/tools v0.1.11-0.20220513221640-090b14e8501f/go.mod h1:SgwaegtQh8clINPpECJMqnxLv9I09HLqnW3RMqW0CA4= -golang.org/x/tools v0.1.11/go.mod h1:SgwaegtQh8clINPpECJMqnxLv9I09HLqnW3RMqW0CA4= -golang.org/x/tools v0.1.12-0.20220628192153-7743d1d949f1/go.mod h1:SgwaegtQh8clINPpECJMqnxLv9I09HLqnW3RMqW0CA4= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA= -golang.org/x/tools v0.4.0/go.mod h1:UE5sM2OK9E/d67R0ANs2xJizIymRP5gJU295PvKXxjQ= golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM= +golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -3556,32 +2550,23 @@ golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= +golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk= golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo= gonum.org/v1/gonum v0.0.0-20181121035319-3f7ecaa7e8ca/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo= -gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485/go.mod h1:2ltnJ7xHfj0zHS40VVPYEAAMTa3ZGguvHGBSJeRWqE0= gonum.org/v1/gonum v0.6.0/go.mod h1:9mxDZsDKxgMAuccQkewq682L+0eCu4dCN2yonUJTCLU= gonum.org/v1/gonum v0.8.2 h1:CCXrcPKiGGotvnN6jfUsKk4rRqm7q09/YbKb5xCEvtM= gonum.org/v1/gonum v0.8.2/go.mod h1:oe/vMfY3deqTw+1EZJhuvEW2iwGF1bW9wwu7XCu0+v0= gonum.org/v1/netlib v0.0.0-20181029234149-ec6d1f5cefe6/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= +gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0 h1:OE9mWmgKkjJyEmDAAtGMPjXu+YNeGvK9VTSHY6+Qihc= gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= -gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e/go.mod h1:kS+toOQn6AQKjmKJ7gzohV1XkqsFehRA2FbsbkopSuQ= +gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b h1:Qh4dB5D/WpoUUp3lSod7qgoyEHbDGPUWjIbnqdqqe1k= gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b/go.mod h1:Wt8AAjI+ypCyYX3nZBvf6cAIx93T+c/OS2HFAYskSZc= -google.golang.org/api v0.0.0-20160322025152-9bf6e6e569ff/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= -google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= -google.golang.org/api v0.0.0-20181030000543-1d582fd0359e/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= -google.golang.org/api v0.0.0-20181220000619-583d854617af/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= -google.golang.org/api v0.2.0/go.mod h1:IfRCZScioGtypHNTlz3gFk67J8uePVW7uDTBzXuIkhU= -google.golang.org/api v0.3.0/go.mod h1:IuvZyQh8jgscv8qWfQ4ABd8m7hEudgBFM/EdhA3BnXw= google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= -google.golang.org/api v0.5.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= -google.golang.org/api v0.6.0/go.mod h1:btoxGiFvQNVUZQ8W08zLtrVS08CNpINPEfxXxgJL1Q4= -google.golang.org/api v0.6.1-0.20190607001116-5213b8090861/go.mod h1:btoxGiFvQNVUZQ8W08zLtrVS08CNpINPEfxXxgJL1Q4= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= -google.golang.org/api v0.10.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= @@ -3591,7 +2576,6 @@ google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/ google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= -google.golang.org/api v0.25.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= @@ -3600,7 +2584,6 @@ google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34q google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= -google.golang.org/api v0.44.0/go.mod h1:EBOGZqzyhtvMDoxwS97ctnh0zUmYY6CxqXsc1AvkYD8= google.golang.org/api v0.47.0/go.mod h1:Wbvgpq1HddcWVtzsVLyfLp8lDg6AA241LmgIL59tHXo= google.golang.org/api v0.48.0/go.mod h1:71Pr1vy+TAZRPkPs/xlCf5SsU8WjuAWv1Pfjbtukyy4= google.golang.org/api v0.50.0/go.mod h1:4bNT5pAuq5ji4SRZm+5QIkjny9JAyVD/3gaSihNefaw= @@ -3609,9 +2592,7 @@ google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6 google.golang.org/api v0.55.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI= -google.golang.org/api v0.59.0/go.mod h1:sT2boj7M9YJxZzgeZqXogmhfmRWDtPzT31xkieUbuZU= google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I= -google.golang.org/api v0.62.0/go.mod h1:dKmwPCydfsad4qCH08MSdgWjfHOyfpd4VtDGgRFdavw= google.golang.org/api v0.63.0/go.mod h1:gs4ij2ffTRXwuzzgJl/56BdwJaA194ijkfn++9tDuPo= google.golang.org/api v0.67.0/go.mod h1:ShHKP8E60yPsKNw/w8w+VYaj9H6buA5UqDp8dhbQZ6g= google.golang.org/api v0.70.0/go.mod h1:Bs4ZM2HGifEvXwd50TtW70ovgJffJYw2oRCOFU/SkfA= @@ -3621,7 +2602,6 @@ google.golang.org/api v0.75.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69 google.golang.org/api v0.77.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69ljA= google.golang.org/api v0.78.0/go.mod h1:1Sg78yoMLOhlQTeF+ARBoytAcH1NNyyl390YMy6rKmw= google.golang.org/api v0.80.0/go.mod h1:xY3nI94gbvBrE0J6NHXhxOmW97HG7Khjkku6AFB3Hyg= -google.golang.org/api v0.81.0/go.mod h1:FA6Mb/bZxj706H2j+j2d6mHEEaHBmbbWnkfvmorOCko= google.golang.org/api v0.84.0/go.mod h1:NTsGnUFJMYROtiquksZHBWtHfeMC7iYthki7Eq3pa8o= google.golang.org/api v0.85.0/go.mod h1:AqZf8Ep9uZ2pyTvgL+x0D3Zt0eoT9b5E8fmzfu6FO2g= google.golang.org/api v0.90.0/go.mod h1:+Sem1dnrKlrXMR/X0bPnMWyluQe4RsNoYfmNLhOIkzw= @@ -3630,48 +2610,35 @@ google.golang.org/api v0.95.0/go.mod h1:eADj+UBuxkh5zlrSntJghuNeg8HwQ1w5lTKkuqaE google.golang.org/api v0.96.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= google.golang.org/api v0.97.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= google.golang.org/api v0.98.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= -google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08= google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70= -google.golang.org/api v0.102.0/go.mod h1:3VFl6/fzoA+qNuS1N1/VfXY4LjoXN/wzeIp7TweWwGo= -google.golang.org/api v0.103.0/go.mod h1:hGtW6nK1AC+d9si/UBhw8Xli+QMOf6xyNAyJw4qU9w0= +google.golang.org/api v0.122.0 h1:zDobeejm3E7pEG1mNHvdxvjs5XJoCMzyNH+CmwL94Es= +google.golang.org/api v0.122.0/go.mod h1:gcitW0lvnyWjSp9nKxAbdHKIZ6vF4aajGueeslZOyms= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.3.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= -google.golang.org/appengine v1.6.2/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/cloud v0.0.0-20151119220103-975617b05ea8/go.mod h1:0H1ncTHf11KCFhTc/+EFRbzSCOZx+VUbRMk55Yv5MYk= -google.golang.org/genproto v0.0.0-20170818010345-ee236bd376b0/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20180518175338-11a468237815/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20181029155118-b69ba1387ce2/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20181107211654-5fc9ac540362/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20181219182458-5a97ab628bfb/go.mod h1:7Ep/1NZk928CDR8SjdVbjWNpdIf6nzjE3BTgJDr2Atg= google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190508193815-b515fa19cec8/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190522204451-c2c4e71fbf69/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s= google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s= -google.golang.org/genproto v0.0.0-20190620144150-6af8c5fc6601/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s= google.golang.org/genproto v0.0.0-20190716160619-c506a9f90610/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= -google.golang.org/genproto v0.0.0-20190927181202-20e1ac93f88c/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= google.golang.org/genproto v0.0.0-20200108215221-bd8f9a0ef82f/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200117163144-32f20d992d24/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA= google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= @@ -3687,18 +2654,12 @@ google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfG google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20200527145253-8367513e4ece/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= -google.golang.org/genproto v0.0.0-20200626011028-ee7919e894b5/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200707001353-8e8330bf89df/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201119123407-9b1e624d6bc4/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= @@ -3726,13 +2687,8 @@ google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod h1:eFjDcFEc google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= google.golang.org/genproto v0.0.0-20210909211513-a8c4777a87af/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210917145530-b395a37504d4/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211008145708-270636b82663/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211028162531-8db9c33dc351/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211129164237-f09f9a12af12/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211203200212-54befc351ae9/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211221195035-429b39de9b1c/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= @@ -3752,7 +2708,6 @@ google.golang.org/genproto v0.0.0-20220429170224-98d788798c3e/go.mod h1:8w6bsBMX google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= google.golang.org/genproto v0.0.0-20220505152158-f39f71e6c8f3/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= google.golang.org/genproto v0.0.0-20220518221133-4f43b3371335/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= -google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= google.golang.org/genproto v0.0.0-20220523171625-347a074981d8/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= google.golang.org/genproto v0.0.0-20220608133413-ed9918b62aac/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= google.golang.org/genproto v0.0.0-20220616135557-88e70c0c3a90/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= @@ -3777,18 +2732,57 @@ google.golang.org/genproto v0.0.0-20220926220553-6981cbe3cfce/go.mod h1:woMGP53B google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U= google.golang.org/genproto v0.0.0-20221014173430-6e2ab493f96b/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= -google.golang.org/genproto v0.0.0-20221024153911-1573dae28c9c/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s= -google.golang.org/genproto v0.0.0-20221024183307-1bc688fe9f3e/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s= -google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo= -google.golang.org/genproto v0.0.0-20221114212237-e4508ebdbee1/go.mod h1:rZS5c/ZVYMaOGBfO68GWtjOw/eLaZM1X6iVtgjZ+EWg= -google.golang.org/genproto v0.0.0-20221117204609-8f9c96812029/go.mod h1:rZS5c/ZVYMaOGBfO68GWtjOw/eLaZM1X6iVtgjZ+EWg= -google.golang.org/genproto v0.0.0-20221118155620-16455021b5e6/go.mod h1:rZS5c/ZVYMaOGBfO68GWtjOw/eLaZM1X6iVtgjZ+EWg= -google.golang.org/genproto v0.0.0-20221201164419-0e50fba7f41c/go.mod h1:rZS5c/ZVYMaOGBfO68GWtjOw/eLaZM1X6iVtgjZ+EWg= -google.golang.org/genproto v0.0.0-20230125152338-dcaf20b6aeaa/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= -google.golang.org/genproto v0.0.0-20230223222841-637eb2293923 h1:znp6mq/drrY+6khTAlJUDNFFcDGV2ENLYKpMq8SyCds= -google.golang.org/genproto v0.0.0-20230223222841-637eb2293923/go.mod h1:3Dl5ZL0q0isWJt+FVcfpQyirqemEuLAK/iFvg1UP1Hw= -google.golang.org/grpc v1.33.2 h1:EQyQC3sa8M+p6Ulc8yy9SWSS2GVwyRc83gAbG8lrl4o= +google.golang.org/genproto v0.0.0-20221025140454-527a21cfbd71/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s= +google.golang.org/genproto v0.0.0-20230530153820-e85fd2cbaebc h1:8DyZCyvI8mE1IdLy/60bS+52xfymkE72wv1asokgtao= +google.golang.org/genproto v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:xZnkP7mREFX5MORlOPEzLMr+90PPZQ2QWzrVTWfAq64= +google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc h1:kVKPf/IiYSBWEWtkIn6wZXwWGCnLKcC8oWfZvXjsGnM= +google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:vHYtlOoi6TsQ3Uk2yxR7NI5z8uoV+3pZtR4jmHIkRig= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc h1:XSJ8Vk1SWuNr8S18z1NZSziL0CPIXLCCMDOEFtHBOFc= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA= +google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= +google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= +google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +google.golang.org/grpc v1.22.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= +google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= +google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= +google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= +google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= +google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= +google.golang.org/grpc v1.37.1/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= +google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= +google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= +google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= +google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= +google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= +google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= +google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= +google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= +google.golang.org/grpc v1.46.2/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= +google.golang.org/grpc v1.47.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= +google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= +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.55.0 h1:3Oj82/tFSCeUrRTg/5E/7d/W5A1tj6Ky1ABAuZuv5ag= +google.golang.org/grpc v1.55.0/go.mod h1:iYEXKGkEBhg1PjZQvoYEVPTDkHo1/bjTnfwTeGONTY8= +google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0 h1:M1YKkFIboKNieVO5DLUEVzQfGwJD30Nv2jfUgzb5UcE= 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= @@ -3805,50 +2799,38 @@ 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.28.2-0.20220831092852-f930b1dc76e8/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U= +gopkg.in/alecthomas/kingpin.v2 v2.2.6 h1:jMFz6MfLP0/4fUyZle81rXUoxOBFi19VUFKVDOQfozc= 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-20141024133853-64131543e789/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= -gopkg.in/cheggaaa/pb.v1 v1.0.28/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= +gopkg.in/cheggaaa/pb.v1 v1.0.27 h1:kJdccidYzt3CaHD1crCFTS1hxyhSi059NhOFUf03YFo= +gopkg.in/cheggaaa/pb.v1 v1.0.27/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= +gopkg.in/errgo.v2 v2.1.0 h1:0vLT13EuvQ0hNvakwLuFZ/jYrLp5F3kcWHXdRggjCE8= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= +gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -gopkg.in/gcfg.v1 v1.2.0/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= +gopkg.in/gcfg.v1 v1.2.3 h1:m8OOJ4ccYHnx2f4gQwpno8nAX5OGOh7RLaaz0pj3Ogs= gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= -gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo= -gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE= -gopkg.in/go-playground/validator.v8 v8.18.2/go.mod h1:RX2a/7Ha8BgOhfk7j780h4/u/RRjR0eouCJSH80/M2Y= -gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= -gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/ini.v1 v1.51.1/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/ini.v1 v1.56.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/ini.v1 v1.66.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/ini.v1 v1.66.4/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/ini.v1 v1.66.6/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA= -gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= +gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce h1:+JknDZhAj8YMt7GC73Ei8pv4MzjDUNPHgQWJdtMAaDU= gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:5AcXVHNjg+BDxry382+8OKon8SEWiKktQR07RKPsv1c= +gopkg.in/olebedev/go-duktape.v3 v3.0.0-20200619000410-60c24ae608a6 h1:a6cXbcDDUkSBlpnkWV1bJ+vv3mOgQEltEJ2rPxroVu0= gopkg.in/olebedev/go-duktape.v3 v3.0.0-20200619000410-60c24ae608a6/go.mod h1:uAJfkITjFhyEEuUfm7bsmCZRbW5WRq8s9EY8HZ6hCns= +gopkg.in/resty.v1 v1.12.0 h1:CuXP0Pjfw9rOuY6EP+UvtNvt5DSqHpIxILZKT/quCZI= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= -gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= -gopkg.in/square/go-jose.v2 v2.3.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= -gopkg.in/square/go-jose.v2 v2.5.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= +gopkg.in/urfave/cli.v1 v1.20.0 h1:NdAVW6RYxDif9DhDHaAortIu956m2c0v+09AZBPTbE0= gopkg.in/urfave/cli.v1 v1.20.0/go.mod h1:vuBzUtMdQeixQj8LVd+/98pzhxNGQoyuPBlsXHOQNO0= -gopkg.in/warnings.v0 v0.1.1/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= +gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME= gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= @@ -3856,30 +2838,19 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.6/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= -gopkg.in/yaml.v3 v3.0.0-20191120175047-4206685974f2/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= -gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk= -gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8= -gotest.tools/v3 v3.1.0/go.mod h1:fHy7eyTmJFO5bQbUsEGQ1v4m2J3Jz9eWL54TP2/ZuYQ= -gotest.tools/v3 v3.2.0/go.mod h1:Mcr9QNxkg0uMvy/YElmo4SpXgJKWgQvYrT7Kw5RzJ1A= -gotest.tools/v3 v3.3.0/go.mod h1:Mcr9QNxkg0uMvy/YElmo4SpXgJKWgQvYrT7Kw5RzJ1A= gotest.tools/v3 v3.4.0 h1:ZazjZUfuVeZGLAmlKKuyv3IKP5orXcwtOwDQH6YVr6o= gotest.tools/v3 v3.4.0/go.mod h1:CtbdzLSsqVhDgMtKsx03ird5YTGB3ar27v0u/yKBW5g= -grpc.go4.org v0.0.0-20170609214715-11d0a25b4919/go.mod h1:77eQGdRu53HpSqPFJFmuJdjuHRquDANNeA4x7B8WQ9o= -honnef.co/go/tools v0.0.0-20180920025451-e3ad64cb4ed3/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= @@ -3887,124 +2858,34 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -honnef.co/go/tools v0.0.1-2020.1.5/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.1.3/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las= +honnef.co/go/tools v0.3.3 h1:oDx7VAwstgpYpb3wv0oxiZlxY+foCpRAwY7Vk6XpAgA= honnef.co/go/tools v0.3.3/go.mod h1:jzwdWgg7Jdq75wlfblQxO4neNaFFSvgc1tD5Wv8U0Yw= -k8s.io/api v0.0.0-20180904230853-4e7be11eab3f/go.mod h1:iuAfoD4hCxJ8Onx9kaTIt30j7jUFS00AXQi6QMi99vA= -k8s.io/api v0.17.4/go.mod h1:5qxx6vjmwUVG2nHQTKGlLts8Tbok8PzHl4vHtVFuZCA= -k8s.io/api v0.19.0/go.mod h1:I1K45XlvTrDjmj5LoM5LuP/KYrhWbjUKT/SoPG0qTjw= -k8s.io/api v0.20.1/go.mod h1:KqwcCVogGxQY3nBlRpwt+wpAMF/KjaCc7RpywacvqUo= -k8s.io/api v0.20.4/go.mod h1:++lNL1AJMkDymriNniQsWRkMDzRaX2Y/POTUi8yvqYQ= -k8s.io/api v0.20.6/go.mod h1:X9e8Qag6JV/bL5G6bU8sdVRltWKmdHsFUGS3eVndqE8= -k8s.io/api v0.22.5/go.mod h1:mEhXyLaSD1qTOf40rRiKXkc+2iCem09rWLlFwhCEiAs= -k8s.io/api v0.23.4/go.mod h1:i77F4JfyNNrhOjZF7OwwNJS5Y1S9dpwvb9iYRYRczfI= -k8s.io/apimachinery v0.0.0-20180904193909-def12e63c512/go.mod h1:ccL7Eh7zubPUSh9A3USN90/OzHNSVN6zxzde07TDCL0= -k8s.io/apimachinery v0.17.4/go.mod h1:gxLnyZcGNdZTCLnq3fgzyg2A5BVCHTNDFrw8AmuJ+0g= -k8s.io/apimachinery v0.19.0/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA= -k8s.io/apimachinery v0.20.1/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= -k8s.io/apimachinery v0.20.4/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= -k8s.io/apimachinery v0.20.6/go.mod h1:ejZXtW1Ra6V1O5H8xPBGz+T3+4gfkTCeExAHKU57MAc= -k8s.io/apimachinery v0.22.1/go.mod h1:O3oNtNadZdeOMxHFVxOreoznohCpy0z6mocxbZr7oJ0= -k8s.io/apimachinery v0.22.5/go.mod h1:xziclGKwuuJ2RM5/rSFQSYAj0zdbci3DH8kj+WvyN0U= -k8s.io/apimachinery v0.23.4/go.mod h1:BEuFMMBaIbcOqVIJqNZJXGFTP4W6AycEpb5+m/97hrM= -k8s.io/apiserver v0.17.4/go.mod h1:5ZDQ6Xr5MNBxyi3iUZXS84QOhZl+W7Oq2us/29c0j9I= -k8s.io/apiserver v0.20.1/go.mod h1:ro5QHeQkgMS7ZGpvf4tSMx6bBOgPfE+f52KwvXfScaU= -k8s.io/apiserver v0.20.4/go.mod h1:Mc80thBKOyy7tbvFtB4kJv1kbdD0eIH8k8vianJcbFM= -k8s.io/apiserver v0.20.6/go.mod h1:QIJXNt6i6JB+0YQRNcS0hdRHJlMhflFmsBDeSgT1r8Q= -k8s.io/apiserver v0.22.5/go.mod h1:s2WbtgZAkTKt679sYtSudEQrTGWUSQAPe6MupLnlmaQ= -k8s.io/client-go v0.0.0-20180910083459-2cefa64ff137/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s= -k8s.io/client-go v0.17.4/go.mod h1:ouF6o5pz3is8qU0/qYL2RnoxOPqgfuidYLowytyLJmc= -k8s.io/client-go v0.19.0/go.mod h1:H9E/VT95blcFQnlyShFgnFT9ZnJOAceiUHM3MlRC+mU= -k8s.io/client-go v0.20.1/go.mod h1:/zcHdt1TeWSd5HoUe6elJmHSQ6uLLgp4bIJHVEuy+/Y= -k8s.io/client-go v0.20.4/go.mod h1:LiMv25ND1gLUdBeYxBIwKpkSC5IsozMMmOOeSJboP+k= -k8s.io/client-go v0.20.6/go.mod h1:nNQMnOvEUEsOzRRFIIkdmYOjAZrC8bgq0ExboWSU1I0= -k8s.io/client-go v0.22.5/go.mod h1:cs6yf/61q2T1SdQL5Rdcjg9J1ElXSwbjSrW2vFImM4Y= -k8s.io/client-go v0.23.4/go.mod h1:PKnIL4pqLuvYUK1WU7RLTMYKPiIh7MYShLshtRY9cj0= -k8s.io/cloud-provider v0.17.4/go.mod h1:XEjKDzfD+b9MTLXQFlDGkk6Ho8SGMpaU8Uugx/KNK9U= -k8s.io/code-generator v0.17.2/go.mod h1:DVmfPQgxQENqDIzVR2ddLXMH34qeszkKSdH/N+s+38s= -k8s.io/code-generator v0.19.7/go.mod h1:lwEq3YnLYb/7uVXLorOJfxg+cUu2oihFhHZ0n9NIla0= -k8s.io/component-base v0.17.4/go.mod h1:5BRqHMbbQPm2kKu35v3G+CpVq4K0RJKC7TRioF0I9lE= -k8s.io/component-base v0.20.1/go.mod h1:guxkoJnNoh8LNrbtiQOlyp2Y2XFCZQmrcg2n/DeYNLk= -k8s.io/component-base v0.20.4/go.mod h1:t4p9EdiagbVCJKrQ1RsA5/V4rFQNDfRlevJajlGwgjI= -k8s.io/component-base v0.20.6/go.mod h1:6f1MPBAeI+mvuts3sIdtpjljHWBQ2cIy38oBIWMYnrM= -k8s.io/component-base v0.22.5/go.mod h1:VK3I+TjuF9eaa+Ln67dKxhGar5ynVbwnGrUiNF4MqCI= -k8s.io/cri-api v0.17.3/go.mod h1:X1sbHmuXhwaHs9xxYffLqJogVsnI+f6cPRcgPel7ywM= -k8s.io/cri-api v0.20.1/go.mod h1:2JRbKt+BFLTjtrILYVqQK5jqhI+XNdF6UiGMgczeBCI= -k8s.io/cri-api v0.20.4/go.mod h1:2JRbKt+BFLTjtrILYVqQK5jqhI+XNdF6UiGMgczeBCI= -k8s.io/cri-api v0.20.6/go.mod h1:ew44AjNXwyn1s0U4xCKGodU7J1HzBeZ1MpGrpa5r8Yc= -k8s.io/cri-api v0.23.1/go.mod h1:REJE3PSU0h/LOV1APBrupxrEJqnoxZC8KWzkBUHwrK4= -k8s.io/cri-api v0.24.0-alpha.3/go.mod h1:c/NLI5Zdyup5+oEYqFO2IE32ptofNiZpS1nL2y51gAg= -k8s.io/csi-translation-lib v0.17.4/go.mod h1:CsxmjwxEI0tTNMzffIAcgR9lX4wOh6AKHdxQrT7L0oo= -k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= -k8s.io/gengo v0.0.0-20190822140433-26a664648505/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= -k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= -k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= -k8s.io/gengo v0.0.0-20201113003025-83324d819ded/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= -k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= -k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= -k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= -k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= -k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= -k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= -k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= -k8s.io/klog/v2 v2.9.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= -k8s.io/klog/v2 v2.30.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/kube-openapi v0.0.0-20180731170545-e3762e86a74c/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc= -k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E= -k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o= -k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM= -k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= -k8s.io/kube-openapi v0.0.0-20211109043538-20434351676c/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= -k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65/go.mod h1:sX9MT8g7NVZM5lVL/j8QyCCJe8YSMW30QvGZWaCIDIk= -k8s.io/kubernetes v1.11.10/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk= -k8s.io/kubernetes v1.13.0/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk= -k8s.io/legacy-cloud-providers v0.17.4/go.mod h1:FikRNoD64ECjkxO36gkDgJeiQWwyZTuBkhu+yxOc1Js= -k8s.io/utils v0.0.0-20191114184206-e782cd3c129f/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= -k8s.io/utils v0.0.0-20200729134348-d5654de09c73/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -k8s.io/utils v0.0.0-20211116205334-6203023598ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw= -modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk= -modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k= -modernc.org/strutil v1.0.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs= -modernc.org/xc v1.0.0/go.mod h1:mRNCo0bvLjGhHO9WsyuKVU4q0ceiDDDoEeWDJHrNx8I= -moul.io/http2curl v1.0.0/go.mod h1:f6cULg+e4Md/oW1cYmwW4IWQOVl2lGbmCNGOHvzX2kE= +mvdan.cc/gofumpt v0.4.0 h1:JVf4NN1mIpHogBj7ABpgOyZc65/UUOkKQFkoURsz4MM= mvdan.cc/gofumpt v0.4.0/go.mod h1:PljLOHDeZqgS8opHRKLzp2It2VBuSdteAgqUfzMTxlQ= +mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed h1:WX1yoOaKQfddO/mLzdV4wptyWgoH/6hwLs7QHTixo0I= mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed/go.mod h1:Xkxe497xwlCKkIaQYRfC7CSLworTXY9RMqwhhCm+8Nc= +mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b h1:DxJ5nJdkhDlLok9K6qO+5290kphDJbHOQO1DFFFTeBo= mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b/go.mod h1:2odslEg/xrtNQqCYg2/jCoyKnw3vv5biOc3JnIcYfL4= -mvdan.cc/unparam v0.0.0-20190720180237-d51796306d8f/go.mod h1:4G1h5nDURzA3bwVMZIVpwbkw+04kSxk3rAtzlimaUJw= -mvdan.cc/unparam v0.0.0-20200501210554-b37ab49443f7/go.mod h1:HGC5lll35J70Y5v7vCGb9oLhHoScFwkHDJm/05RdSTc= +mvdan.cc/unparam v0.0.0-20220706161116-678bad134442 h1:seuXWbRB1qPrS3NQnHmFKLJLtskWyueeIzmLXghMGgk= mvdan.cc/unparam v0.0.0-20220706161116-678bad134442/go.mod h1:F/Cxw/6mVrNKqrR2YjFf5CaW0Bw4RL8RfbEf4GRggJk= nhooyr.io/websocket v1.8.6/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0= nhooyr.io/websocket v1.8.7 h1:usjR2uOr/zjjkVMy0lW+PPohFok7PCow5sDjLgX4P4g= nhooyr.io/websocket v1.8.7/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0= -pack.ag/amqp v0.11.2/go.mod h1:4/cbmt4EJXSKlG6LCfWHoqmN0uFdy5i/+YFz+fTfhV4= -pgregory.net/rapid v0.4.7/go.mod h1:UYpPVyjFHzYBGHIxLFoupi8vwk6rXNzRY9OMvVxFIOU= -pgregory.net/rapid v0.5.2/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04= -pgregory.net/rapid v0.5.3/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04= -pgregory.net/rapid v0.5.5 h1:jkgx1TjbQPD/feRoK+S/mXw9e1uj6WilpHrXJowi6oA= +pgregory.net/rapid v0.6.2 h1:ErW5sL+UKtfBfUTsWHDCoeB+eZKLKMxrSd1VJY6W4bw= +pgregory.net/rapid v0.6.2/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04= +rsc.io/binaryregexp v0.2.0 h1:HfqmD5MEmC0zvwBuF187nq9mdnXjXsSivRiXN7SmRkE= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= +rsc.io/pdf v0.1.1 h1:k1MczvYDUvJBe93bYd7wrZLLUEcLZAuF824/I4e5Xr4= rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= +rsc.io/quote/v3 v3.1.0 h1:9JKUTTIUgS6kzR9mK1YuGKv6Nl+DijDNIc0ghT58FaY= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= +rsc.io/sampler v1.3.0 h1:7uVkIFmeBqHfdjD+gZwtXXI+RODJ2Wc4O7MPEh/QiW4= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= +rsc.io/tmplfunc v0.0.3 h1:53XFQh69AfOa8Tw0Jm7t+GV7KZhOi6jzsCzTtKbMvzU= rsc.io/tmplfunc v0.0.3/go.mod h1:AG3sTPzElb1Io3Yg4voV9AGZJuleGAwaVRxL9M49PhA= -sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.14/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= -sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= -sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.22/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= -sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6/go.mod h1:p4QtZmO4uMYipTQNzagwnNoseA6OxSUutVw05NhYDRs= -sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI= -sigs.k8s.io/structured-merge-diff v1.0.1-0.20191108220359-b1b620dd3f06/go.mod h1:/ULNhyfzRopfcjskuui0cTITekDduZ7ycKN3oUT9R18= -sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= -sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= -sigs.k8s.io/structured-merge-diff/v4 v4.0.3/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= -sigs.k8s.io/structured-merge-diff/v4 v4.1.2/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= -sigs.k8s.io/structured-merge-diff/v4 v4.2.1/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= -sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= +sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo= sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8= +sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0 h1:ucqkfpjg9WzSUubAO62csmucvxl4/JeW3F4I4909XkM= sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= -sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0= -sourcegraph.com/sqs/pbtypes v1.0.0/go.mod h1:3AciMUv4qUuRHRHhOG4TZOB+72GdPVz5k+c648qsFS4= diff --git a/network/hermes/config.toml b/network/hermes/config.toml index f129c47c9..680206388 100644 --- a/network/hermes/config.toml +++ b/network/hermes/config.toml @@ -108,7 +108,7 @@ clock_drift = '5s' max_block_time = '10s' trusting_period = '14days' trust_threshold = { numerator = '1', denominator = '3' } -ccv_consumer_chain = true +unbonding_period = '20days' address_type = { derivation = 'cosmos' } [[chains]] diff --git a/network/init-neutrond.sh b/network/init-neutrond.sh index e97b8dd36..b0e43bcf5 100755 --- a/network/init-neutrond.sh +++ b/network/init-neutrond.sh @@ -609,7 +609,7 @@ set_genesis_param treasury_address "\"$DAO_CONTRACT_ADDRESS\"" set_genesis_param fee_collector_address "\"$DAO_CONTRACT_ADDRESS\"" # tokenfactory set_genesis_param security_address "\"$SECURITY_SUBDAO_CORE_CONTRACT_ADDRESS\"," # cron set_genesis_param limit 5 # cron -set_genesis_param allow_messages "[\"*\"]" # interchainaccounts +#set_genesis_param allow_messages "[\"*\"]" # interchainaccounts set_genesis_param signed_blocks_window "\"$SLASHING_SIGNED_BLOCKS_WINDOW\"," # slashing set_genesis_param min_signed_per_window "\"$SLASHING_MIN_SIGNED\"," # slashing set_genesis_param slash_fraction_double_sign "\"$SLASHING_FRACTION_DOUBLE_SIGN\"," # slashing diff --git a/network/init.sh b/network/init.sh index a005ab0e0..a0749e7c8 100755 --- a/network/init.sh +++ b/network/init.sh @@ -49,13 +49,13 @@ echo "$DEMO_MNEMONIC_3" | $BINARY keys add demowallet3 --home "$CHAIN_DIR" --rec echo "$RLY_MNEMONIC_1" | $BINARY keys add rly1 --home "$CHAIN_DIR" --recover --keyring-backend=test echo "$RLY_MNEMONIC_2" | $BINARY keys add rly2 --home "$CHAIN_DIR" --recover --keyring-backend=test -$BINARY add-genesis-account "$($BINARY --home "$CHAIN_DIR" keys show val1 --keyring-backend test -a)" "100000000000000$STAKEDENOM" --home "$CHAIN_DIR" -$BINARY add-genesis-account "$($BINARY --home "$CHAIN_DIR" keys show val2 --keyring-backend test -a)" "100000000000000$STAKEDENOM" --home "$CHAIN_DIR" -$BINARY add-genesis-account "$($BINARY --home "$CHAIN_DIR" keys show demowallet1 --keyring-backend test -a)" "100000000000000$STAKEDENOM,100000000000000$IBCATOMDENOM,100000000000000$IBCUSDCDENOM" --home "$CHAIN_DIR" -$BINARY add-genesis-account "$($BINARY --home "$CHAIN_DIR" keys show demowallet2 --keyring-backend test -a)" "100000000000000$STAKEDENOM,100000000000000$IBCATOMDENOM,100000000000000$IBCUSDCDENOM" --home "$CHAIN_DIR" -$BINARY add-genesis-account "$($BINARY --home "$CHAIN_DIR" keys show demowallet3 --keyring-backend test -a)" "100000000000000$STAKEDENOM,100000000000000$IBCATOMDENOM,100000000000000$IBCUSDCDENOM" --home "$CHAIN_DIR" -$BINARY add-genesis-account "$($BINARY --home "$CHAIN_DIR" keys show rly1 --keyring-backend test -a)" "100000000000000$STAKEDENOM" --home "$CHAIN_DIR" -$BINARY add-genesis-account "$($BINARY --home "$CHAIN_DIR" keys show rly2 --keyring-backend test -a)" "100000000000000$STAKEDENOM" --home "$CHAIN_DIR" +$BINARY add-genesis-account "$($BINARY --home "$CHAIN_DIR" keys show val1 --keyring-backend test -a --home "$CHAIN_DIR")" "100000000000000$STAKEDENOM" --home "$CHAIN_DIR" +$BINARY add-genesis-account "$($BINARY --home "$CHAIN_DIR" keys show val2 --keyring-backend test -a --home "$CHAIN_DIR")" "100000000000000$STAKEDENOM" --home "$CHAIN_DIR" +$BINARY add-genesis-account "$($BINARY --home "$CHAIN_DIR" keys show demowallet1 --keyring-backend test -a --home "$CHAIN_DIR")" "100000000000000$STAKEDENOM,100000000000000$IBCATOMDENOM,100000000000000$IBCUSDCDENOM" --home "$CHAIN_DIR" +$BINARY add-genesis-account "$($BINARY --home "$CHAIN_DIR" keys show demowallet2 --keyring-backend test -a --home "$CHAIN_DIR")" "100000000000000$STAKEDENOM,100000000000000$IBCATOMDENOM,100000000000000$IBCUSDCDENOM" --home "$CHAIN_DIR" +$BINARY add-genesis-account "$($BINARY --home "$CHAIN_DIR" keys show demowallet3 --keyring-backend test -a --home "$CHAIN_DIR")" "100000000000000$STAKEDENOM,100000000000000$IBCATOMDENOM,100000000000000$IBCUSDCDENOM" --home "$CHAIN_DIR" +$BINARY add-genesis-account "$($BINARY --home "$CHAIN_DIR" keys show rly1 --keyring-backend test -a --home "$CHAIN_DIR")" "100000000000000$STAKEDENOM" --home "$CHAIN_DIR" +$BINARY add-genesis-account "$($BINARY --home "$CHAIN_DIR" keys show rly2 --keyring-backend test -a --home "$CHAIN_DIR")" "100000000000000$STAKEDENOM" --home "$CHAIN_DIR" sed -i -e 's/timeout_commit = "5s"/timeout_commit = "1s"/g' "$CHAIN_DIR/config/config.toml" sed -i -e 's/timeout_propose = "3s"/timeout_propose = "1s"/g' "$CHAIN_DIR/config/config.toml" @@ -68,6 +68,7 @@ sed -i -e 's/prometheus-retention-time = 0/prometheus-retention-time = 1000/g' " sed -i -e 's#"tcp://0.0.0.0:26656"#"tcp://0.0.0.0:'"$P2PPORT"'"#g' "$CHAIN_DIR/config/config.toml" sed -i -e 's#"tcp://127.0.0.1:26657"#"tcp://0.0.0.0:'"$RPCPORT"'"#g' "$CHAIN_DIR/config/config.toml" +sed -i -e 's#"tcp://localhost:1317"#"tcp://0.0.0.0:'"$RESTPORT"'"#g' "$CHAIN_DIR/config/app.toml" sed -i -e 's#"tcp://0.0.0.0:1317"#"tcp://0.0.0.0:'"$RESTPORT"'"#g' "$CHAIN_DIR/config/app.toml" sed -i -e 's#":8080"#":'"$ROSETTA_1"'"#g' "$CHAIN_DIR/config/app.toml" @@ -76,3 +77,4 @@ GENESIS_FILE="$CHAIN_DIR/config/genesis.json" sed -i -e "s/\"denom\": \"stake\",/\"denom\": \"$STAKEDENOM\",/g" "$GENESIS_FILE" sed -i -e "s/\"mint_denom\": \"stake\",/\"mint_denom\": \"$STAKEDENOM\",/g" "$GENESIS_FILE" sed -i -e "s/\"bond_denom\": \"stake\"/\"bond_denom\": \"$STAKEDENOM\"/g" "$GENESIS_FILE" +sed -i -e 's/enabled-unsafe-cors = false/enabled-unsafe-cors = true/g' "$CHAIN_DIR/config/app.toml" diff --git a/proto/buf.gen.gogo.yml b/proto/buf.gen.gogo.yml new file mode 100644 index 000000000..855ea251a --- /dev/null +++ b/proto/buf.gen.gogo.yml @@ -0,0 +1,8 @@ +version: v1 +plugins: + - name: gocosmos + out: .. + opt: plugins=grpc,Mgoogle/protobuf/any.proto=github.com/cosmos/cosmos-sdk/codec/types + - name: grpc-gateway + out: .. + opt: logtostderr=true,allow_colon_final_segments=true \ No newline at end of file diff --git a/proto/buf.lock b/proto/buf.lock new file mode 100644 index 000000000..2f1d9f92f --- /dev/null +++ b/proto/buf.lock @@ -0,0 +1,33 @@ +# Generated by buf. DO NOT EDIT. +version: v1 +deps: + - remote: buf.build + owner: cosmos + repository: cosmos-proto + commit: 1935555c206d4afb9e94615dfd0fad31 + digest: shake256:c74d91a3ac7ae07d579e90eee33abf9b29664047ac8816500cf22c081fec0d72d62c89ce0bebafc1f6fec7aa5315be72606717740ca95007248425102c365377 + - remote: buf.build + owner: cosmos + repository: cosmos-sdk + commit: 954f7b05f38440fc8250134b15adec47 + digest: shake256:2ab4404fd04a7d1d52df0e2d0f2d477a3d83ffd88d876957bf3fedfd702c8e52833d65b3ce1d89a3c5adf2aab512616b0e4f51d8463f07eda9a8a3317ee3ac54 + - remote: buf.build + owner: cosmos + repository: gogo-proto + commit: 5e5b9fdd01804356895f8f79a6f1ddc1 + digest: shake256:0b85da49e2e5f9ebc4806eae058e2f56096ff3b1c59d1fb7c190413dd15f45dd456f0b69ced9059341c80795d2b6c943de15b120a9e0308b499e43e4b5fc2952 + - remote: buf.build + owner: cosmos + repository: ibc + commit: f6d24a1cded4439f95a8069c4572f08c + digest: shake256:af93995752551b1b45d22b636423fb87b58e3688eb19680606d007fb2255970acf434733d7679af2c9af8e42976dc13c0650537555b7fc3ccd2e9df8fd351e45 + - remote: buf.build + owner: cosmos + repository: ics23 + commit: 55085f7c710a45f58fa09947208eb70b + digest: shake256:9bf0bc495b5a11c88d163d39ef521bc4b00bc1374a05758c91d82821bdc61f09e8c2c51dda8452529bf80137f34d852561eacbe9550a59015d51cecb0dacb628 + - remote: buf.build + owner: googleapis + repository: googleapis + commit: cc916c31859748a68fd229a3c8d7a2e8 + digest: shake256:469b049d0eb04203d5272062636c078decefc96fec69739159c25d85349c50c34c7706918a8b216c5c27f76939df48452148cff8c5c3ae77fa6ba5c25c1b8bf8 diff --git a/proto/buf.yaml b/proto/buf.yaml new file mode 100644 index 000000000..65944af23 --- /dev/null +++ b/proto/buf.yaml @@ -0,0 +1,26 @@ +version: v1 +name: buf.build/neutron-org/neutron +deps: + - buf.build/cosmos/cosmos-proto + - buf.build/cosmos/cosmos-sdk:v0.47.0 + - buf.build/cosmos/gogo-proto + - buf.build/googleapis/googleapis + - buf.build/cosmos/ibc +# - buf.build/osmosis-labs/osmosis +breaking: + use: + - FILE +lint: + use: + - DEFAULT + - COMMENTS + - FILE_LOWER_SNAKE_CASE + except: + - UNARY_RPC + - COMMENT_FIELD + - SERVICE_SUFFIX + - PACKAGE_VERSION_SUFFIX + - RPC_REQUEST_STANDARD_NAME + - PACKAGE_DIRECTORY_MATCH + ignore: + - tendermint \ No newline at end of file diff --git a/proto/contractmanager/genesis.proto b/proto/neutron/contractmanager/genesis.proto similarity index 95% rename from proto/contractmanager/genesis.proto rename to proto/neutron/contractmanager/genesis.proto index 1fa55dad0..3ac92eb55 100644 --- a/proto/contractmanager/genesis.proto +++ b/proto/neutron/contractmanager/genesis.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package neutron.contractmanager; import "gogoproto/gogo.proto"; -import "contractmanager/params.proto"; +import "neutron/contractmanager/params.proto"; // this line is used by starport scaffolding # genesis/proto/import option go_package = "github.com/neutron-org/neutron/x/contractmanager/types"; diff --git a/proto/contractmanager/params.proto b/proto/neutron/contractmanager/params.proto similarity index 100% rename from proto/contractmanager/params.proto rename to proto/neutron/contractmanager/params.proto diff --git a/proto/contractmanager/query.proto b/proto/neutron/contractmanager/query.proto similarity index 94% rename from proto/contractmanager/query.proto rename to proto/neutron/contractmanager/query.proto index fe4e67f51..b517432e6 100644 --- a/proto/contractmanager/query.proto +++ b/proto/neutron/contractmanager/query.proto @@ -4,8 +4,8 @@ package neutron.contractmanager; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; import "cosmos/base/query/v1beta1/pagination.proto"; -import "contractmanager/params.proto"; -import "contractmanager/genesis.proto"; +import "neutron/contractmanager/params.proto"; +import "neutron/contractmanager/genesis.proto"; // this line is used by starport scaffolding # 1 option go_package = "github.com/neutron-org/neutron/x/contractmanager/types"; diff --git a/proto/cron/genesis.proto b/proto/neutron/cron/genesis.proto similarity index 86% rename from proto/cron/genesis.proto rename to proto/neutron/cron/genesis.proto index f887c5b90..e7e455276 100644 --- a/proto/cron/genesis.proto +++ b/proto/neutron/cron/genesis.proto @@ -2,8 +2,8 @@ syntax = "proto3"; package neutron.cron; import "gogoproto/gogo.proto"; -import "cron/params.proto"; -import "cron/schedule.proto"; +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/x/cron/types"; diff --git a/proto/cron/params.proto b/proto/neutron/cron/params.proto similarity index 100% rename from proto/cron/params.proto rename to proto/neutron/cron/params.proto diff --git a/proto/cron/query.proto b/proto/neutron/cron/query.proto similarity index 95% rename from proto/cron/query.proto rename to proto/neutron/cron/query.proto index ae39bcd04..0105437fa 100644 --- a/proto/cron/query.proto +++ b/proto/neutron/cron/query.proto @@ -4,8 +4,8 @@ package neutron.cron; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; import "cosmos/base/query/v1beta1/pagination.proto"; -import "cron/params.proto"; -import "cron/schedule.proto"; +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/x/cron/types"; diff --git a/proto/cron/schedule.proto b/proto/neutron/cron/schedule.proto similarity index 100% rename from proto/cron/schedule.proto rename to proto/neutron/cron/schedule.proto diff --git a/proto/cron/tx.proto b/proto/neutron/cron/tx.proto similarity index 100% rename from proto/cron/tx.proto rename to proto/neutron/cron/tx.proto diff --git a/proto/feeburner/genesis.proto b/proto/neutron/feeburner/genesis.proto similarity index 83% rename from proto/feeburner/genesis.proto rename to proto/neutron/feeburner/genesis.proto index 9513a4fe4..9959a4be9 100644 --- a/proto/feeburner/genesis.proto +++ b/proto/neutron/feeburner/genesis.proto @@ -2,8 +2,8 @@ syntax = "proto3"; package neutron.feeburner; import "gogoproto/gogo.proto"; -import "feeburner/params.proto"; -import "feeburner/total_burned_neutrons_amount.proto"; +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/x/feeburner/types"; diff --git a/proto/feeburner/params.proto b/proto/neutron/feeburner/params.proto similarity index 100% rename from proto/feeburner/params.proto rename to proto/neutron/feeburner/params.proto diff --git a/proto/feeburner/query.proto b/proto/neutron/feeburner/query.proto similarity index 94% rename from proto/feeburner/query.proto rename to proto/neutron/feeburner/query.proto index 5cf2e30b7..c0cce05ba 100644 --- a/proto/feeburner/query.proto +++ b/proto/neutron/feeburner/query.proto @@ -4,8 +4,8 @@ package neutron.feeburner; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; import "cosmos/base/query/v1beta1/pagination.proto"; -import "feeburner/params.proto"; -import "feeburner/total_burned_neutrons_amount.proto"; +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/x/feeburner/types"; diff --git a/proto/feeburner/total_burned_neutrons_amount.proto b/proto/neutron/feeburner/total_burned_neutrons_amount.proto similarity index 100% rename from proto/feeburner/total_burned_neutrons_amount.proto rename to proto/neutron/feeburner/total_burned_neutrons_amount.proto diff --git a/proto/feerefunder/fee.proto b/proto/neutron/feerefunder/fee.proto similarity index 100% rename from proto/feerefunder/fee.proto rename to proto/neutron/feerefunder/fee.proto diff --git a/proto/feerefunder/genesis.proto b/proto/neutron/feerefunder/genesis.proto similarity index 88% rename from proto/feerefunder/genesis.proto rename to proto/neutron/feerefunder/genesis.proto index d7507ed0d..44c4d2cd5 100644 --- a/proto/feerefunder/genesis.proto +++ b/proto/neutron/feerefunder/genesis.proto @@ -2,8 +2,8 @@ syntax = "proto3"; package neutron.feerefunder; import "gogoproto/gogo.proto"; -import "feerefunder/params.proto"; -import "feerefunder/fee.proto"; +import "neutron/feerefunder/params.proto"; +import "neutron/feerefunder/fee.proto"; // this line is used by starport scaffolding # genesis/proto/import option go_package = "github.com/neutron-org/neutron/x/feerefunder/types"; diff --git a/proto/feerefunder/params.proto b/proto/neutron/feerefunder/params.proto similarity index 89% rename from proto/feerefunder/params.proto rename to proto/neutron/feerefunder/params.proto index 1d8f20c4e..247fb2c98 100644 --- a/proto/feerefunder/params.proto +++ b/proto/neutron/feerefunder/params.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package neutron.feerefunder; import "gogoproto/gogo.proto"; -import "feerefunder/fee.proto"; +import "neutron/feerefunder/fee.proto"; option go_package = "github.com/neutron-org/neutron/x/feerefunder/types"; diff --git a/proto/feerefunder/query.proto b/proto/neutron/feerefunder/query.proto similarity index 93% rename from proto/feerefunder/query.proto rename to proto/neutron/feerefunder/query.proto index 1eaf5a06c..246c05c96 100644 --- a/proto/feerefunder/query.proto +++ b/proto/neutron/feerefunder/query.proto @@ -4,8 +4,8 @@ package neutron.feerefunder; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; import "cosmos/base/query/v1beta1/pagination.proto"; -import "feerefunder/params.proto"; -import "feerefunder/genesis.proto"; +import "neutron/feerefunder/params.proto"; +import "neutron/feerefunder/genesis.proto"; // this line is used by starport scaffolding # 1 option go_package = "github.com/neutron-org/neutron/x/feerefunder/types"; diff --git a/proto/interchainqueries/genesis.proto b/proto/neutron/interchainqueries/genesis.proto similarity index 97% rename from proto/interchainqueries/genesis.proto rename to proto/neutron/interchainqueries/genesis.proto index 5a3ac4aef..134a052be 100644 --- a/proto/interchainqueries/genesis.proto +++ b/proto/neutron/interchainqueries/genesis.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package neutron.interchainqueries; import "gogoproto/gogo.proto"; -import "interchainqueries/params.proto"; +import "neutron/interchainqueries/params.proto"; import "cosmos/base/v1beta1/coin.proto"; import "ibc/core/client/v1/client.proto"; diff --git a/proto/interchainqueries/params.proto b/proto/neutron/interchainqueries/params.proto similarity index 100% rename from proto/interchainqueries/params.proto rename to proto/neutron/interchainqueries/params.proto diff --git a/proto/interchainqueries/query.proto b/proto/neutron/interchainqueries/query.proto similarity index 94% rename from proto/interchainqueries/query.proto rename to proto/neutron/interchainqueries/query.proto index a5cb0ce2a..21247a41a 100644 --- a/proto/interchainqueries/query.proto +++ b/proto/neutron/interchainqueries/query.proto @@ -4,9 +4,9 @@ package neutron.interchainqueries; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; import "cosmos/base/query/v1beta1/pagination.proto"; -import "interchainqueries/params.proto"; -import "interchainqueries/genesis.proto"; -import "interchainqueries/tx.proto"; +import "neutron/interchainqueries/params.proto"; +import "neutron/interchainqueries/genesis.proto"; +import "neutron/interchainqueries/tx.proto"; option go_package = "github.com/neutron-org/neutron/x/interchainqueries/types"; diff --git a/proto/interchainqueries/tx.proto b/proto/neutron/interchainqueries/tx.proto similarity index 98% rename from proto/interchainqueries/tx.proto rename to proto/neutron/interchainqueries/tx.proto index 43379be21..1385c2dc8 100644 --- a/proto/interchainqueries/tx.proto +++ b/proto/neutron/interchainqueries/tx.proto @@ -4,7 +4,7 @@ package neutron.interchainqueries; import "tendermint/crypto/proof.proto"; import "tendermint/abci/types.proto"; import "google/protobuf/any.proto"; -import "interchainqueries/genesis.proto"; +import "neutron/interchainqueries/genesis.proto"; option go_package = "github.com/neutron-org/neutron/x/interchainqueries/types"; diff --git a/proto/interchaintxs/v1/genesis.proto b/proto/neutron/interchaintxs/v1/genesis.proto similarity index 86% rename from proto/interchaintxs/v1/genesis.proto rename to proto/neutron/interchaintxs/v1/genesis.proto index e22c29d5a..0376f482d 100644 --- a/proto/interchaintxs/v1/genesis.proto +++ b/proto/neutron/interchaintxs/v1/genesis.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package neutron.interchaintxs; import "gogoproto/gogo.proto"; -import "interchaintxs/v1/params.proto"; +import "neutron/interchaintxs/v1/params.proto"; option go_package = "github.com/neutron-org/neutron/x/interchaintxs/types"; diff --git a/proto/interchaintxs/v1/params.proto b/proto/neutron/interchaintxs/v1/params.proto similarity index 100% rename from proto/interchaintxs/v1/params.proto rename to proto/neutron/interchaintxs/v1/params.proto diff --git a/proto/interchaintxs/v1/query.proto b/proto/neutron/interchaintxs/v1/query.proto similarity index 97% rename from proto/interchaintxs/v1/query.proto rename to proto/neutron/interchaintxs/v1/query.proto index 7f377a83e..ee32847e8 100644 --- a/proto/interchaintxs/v1/query.proto +++ b/proto/neutron/interchaintxs/v1/query.proto @@ -4,7 +4,7 @@ package neutron.interchaintxs; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; import "cosmos/base/query/v1beta1/pagination.proto"; -import "interchaintxs/v1/params.proto"; +import "neutron/interchaintxs/v1/params.proto"; option go_package = "github.com/neutron-org/neutron/x/interchaintxs/types"; diff --git a/proto/interchaintxs/v1/tx.proto b/proto/neutron/interchaintxs/v1/tx.proto similarity index 98% rename from proto/interchaintxs/v1/tx.proto rename to proto/neutron/interchaintxs/v1/tx.proto index 81a80d96b..c871accd2 100644 --- a/proto/interchaintxs/v1/tx.proto +++ b/proto/neutron/interchaintxs/v1/tx.proto @@ -8,7 +8,7 @@ import "gogoproto/gogo.proto"; import "google/api/http.proto"; import "google/api/annotations.proto"; import "google/protobuf/any.proto"; -import "feerefunder/fee.proto"; +import "neutron/feerefunder/fee.proto"; // Msg defines the Msg service. service Msg { diff --git a/proto/transfer/v1/query.proto b/proto/neutron/transfer/v1/query.proto similarity index 100% rename from proto/transfer/v1/query.proto rename to proto/neutron/transfer/v1/query.proto diff --git a/proto/transfer/v1/tx.proto b/proto/neutron/transfer/v1/tx.proto similarity index 97% rename from proto/transfer/v1/tx.proto rename to proto/neutron/transfer/v1/tx.proto index 3fff161d7..b5f8f471a 100644 --- a/proto/transfer/v1/tx.proto +++ b/proto/neutron/transfer/v1/tx.proto @@ -7,7 +7,7 @@ option go_package = "github.com/neutron-org/neutron/x/transfer/types"; import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.proto"; import "ibc/core/client/v1/client.proto"; -import "feerefunder/fee.proto"; +import "neutron/feerefunder/fee.proto"; // Msg defines the ibc/transfer Msg service. service Msg { diff --git a/scripts/protocgen.sh b/scripts/protocgen.sh new file mode 100755 index 000000000..d3158031f --- /dev/null +++ b/scripts/protocgen.sh @@ -0,0 +1,31 @@ +#!/usr/bin/env bash + +set -eo pipefail + +protoc_install_proto_gen_doc() { + echo "Installing protobuf protoc-gen-doc plugin" + (go install github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc@latest 2> /dev/null) +} + +echo "Generating gogo proto code" +cd proto +proto_dirs=$(find ./ -path -prune -o -name '*.proto' -print0 | xargs -0 -n1 dirname | sort | uniq) +for dir in $proto_dirs; do + for file in $(find "${dir}" -maxdepth 1 -name '*.proto'); do + echo $file + if grep "option go_package" $file &> /dev/null ; then + buf generate --template buf.gen.gogo.yml $file + fi + done +done + +#protoc_install_proto_gen_doc +# +#echo "Generating proto docs" +#buf generate --template buf.gen.doc.yml + +cd .. + +# move proto files to the right places +cp -r github.com/neutron-org/neutron/x/* x/ +rm -rf github.com diff --git a/tests/e2e/interchain_security_test.go b/tests/e2e/interchain_security_test.go index 49cf36852..41726178d 100644 --- a/tests/e2e/interchain_security_test.go +++ b/tests/e2e/interchain_security_test.go @@ -3,11 +3,11 @@ package e2e_test import ( "testing" - appProvider "github.com/cosmos/interchain-security/app/provider" - icssimapp "github.com/cosmos/interchain-security/testutil/ibc_testing" + appProvider "github.com/cosmos/interchain-security/v3/app/provider" + icssimapp "github.com/cosmos/interchain-security/v3/testutil/ibc_testing" "github.com/stretchr/testify/suite" - e2e "github.com/cosmos/interchain-security/tests/integration" + e2e "github.com/cosmos/interchain-security/v3/tests/integration" appConsumer "github.com/neutron-org/neutron/app" "github.com/neutron-org/neutron/testutil" diff --git a/testutil/chain.go b/testutil/chain.go index 53cadef0d..e2d8154c5 100644 --- a/testutil/chain.go +++ b/testutil/chain.go @@ -3,16 +3,16 @@ package testutil import ( "testing" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + tmtypes "github.com/cometbft/cometbft/types" "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1" sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - channeltypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" - "github.com/cosmos/ibc-go/v4/testing/mock" - legacyibctesting "github.com/cosmos/interchain-security/legacy_ibc_testing/testing" + channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" + "github.com/cosmos/ibc-go/v7/testing/mock" + legacyibctesting "github.com/cosmos/interchain-security/v3/legacy_ibc_testing/testing" "github.com/stretchr/testify/require" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - tmtypes "github.com/tendermint/tendermint/types" "github.com/neutron-org/neutron/app/params" ) diff --git a/testutil/consumer/test_helpers.go b/testutil/consumer/test_helpers.go index e2d43b158..1d61e9d4d 100644 --- a/testutil/consumer/test_helpers.go +++ b/testutil/consumer/test_helpers.go @@ -4,18 +4,18 @@ import ( "encoding/json" "time" + types1 "github.com/cometbft/cometbft/abci/types" + tmtypes "github.com/cometbft/cometbft/types" cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/cosmos/cosmos-sdk/x/genutil" genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types" - ibcclienttypes "github.com/cosmos/ibc-go/v4/modules/core/02-client/types" - ibccommitmenttypes "github.com/cosmos/ibc-go/v4/modules/core/23-commitment/types" - ibctmtypes "github.com/cosmos/ibc-go/v4/modules/light-clients/07-tendermint/types" - ccvconsumertypes "github.com/cosmos/interchain-security/x/ccv/consumer/types" - ccvprovidertypes "github.com/cosmos/interchain-security/x/ccv/provider/types" - "github.com/cosmos/interchain-security/x/ccv/types" - types1 "github.com/tendermint/tendermint/abci/types" - tmtypes "github.com/tendermint/tendermint/types" + ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" + ibccommitmenttypes "github.com/cosmos/ibc-go/v7/modules/core/23-commitment/types" + ibctmtypes "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" + ccvconsumertypes "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types" + ccvprovidertypes "github.com/cosmos/interchain-security/v3/x/ccv/provider/types" + "github.com/cosmos/interchain-security/v3/x/ccv/types" "github.com/cosmos/cosmos-sdk/testutil/network" diff --git a/testutil/contractmanager/keeper/contractmanager.go b/testutil/contractmanager/keeper/contractmanager.go index ee11ae449..f8ab1cdfb 100644 --- a/testutil/contractmanager/keeper/contractmanager.go +++ b/testutil/contractmanager/keeper/contractmanager.go @@ -3,6 +3,9 @@ package keeper import ( "testing" + tmdb "github.com/cometbft/cometbft-db" + "github.com/cometbft/cometbft/libs/log" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" "github.com/cosmos/cosmos-sdk/store" @@ -10,9 +13,6 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" typesparams "github.com/cosmos/cosmos-sdk/x/params/types" "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/libs/log" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - tmdb "github.com/tendermint/tm-db" "github.com/neutron-org/neutron/x/contractmanager/keeper" "github.com/neutron-org/neutron/x/contractmanager/types" diff --git a/testutil/contractmanager/network/network.go b/testutil/contractmanager/network/network.go index 0643f8e0a..f3eb57ecd 100644 --- a/testutil/contractmanager/network/network.go +++ b/testutil/contractmanager/network/network.go @@ -2,16 +2,19 @@ package network import ( "fmt" + "github.com/stretchr/testify/require" "testing" "time" + tmdb "github.com/cometbft/cometbft-db" + tmrand "github.com/cometbft/cometbft/libs/rand" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/crypto/hd" "github.com/cosmos/cosmos-sdk/crypto/keyring" servertypes "github.com/cosmos/cosmos-sdk/server/types" - "github.com/cosmos/cosmos-sdk/simapp" - storetypes "github.com/cosmos/cosmos-sdk/store/types" + pruningtypes "github.com/cosmos/cosmos-sdk/store/pruning/types" "github.com/cosmos/cosmos-sdk/testutil/network" + "github.com/cosmos/cosmos-sdk/testutil/sims" sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" genutil "github.com/cosmos/cosmos-sdk/x/genutil" @@ -19,8 +22,6 @@ import ( staking "github.com/cosmos/cosmos-sdk/x/staking" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/neutron-org/neutron/app/params" - tmrand "github.com/tendermint/tendermint/libs/rand" - tmdb "github.com/tendermint/tm-db" "github.com/neutron-org/neutron/app" "github.com/neutron-org/neutron/testutil/consumer" @@ -43,7 +44,8 @@ func New(t *testing.T, configs ...network.Config) *network.Network { } else { cfg = configs[0] } - net := network.New(t, cfg) + net, err := network.New(t, t.TempDir(), cfg) + require.NoError(t, err) t.Cleanup(net.Cleanup) return net } @@ -56,31 +58,33 @@ func DefaultConfig() network.Config { app.ModuleBasics[stakingtypes.ModuleName] = staking.AppModuleBasic{} encoding := app.MakeEncodingConfig() + chainID := "chain-" + tmrand.NewRand().Str(6) return network.Config{ Codec: encoding.Marshaler, TxConfig: encoding.TxConfig, LegacyAmino: encoding.Amino, InterfaceRegistry: encoding.InterfaceRegistry, AccountRetriever: authtypes.AccountRetriever{}, - AppConstructor: func(val network.Validator) servertypes.Application { - err := consumer.ModifyConsumerGenesis(val) + AppConstructor: func(val network.ValidatorI) servertypes.Application { + err := consumer.ModifyConsumerGenesis(val.(network.Validator)) if err != nil { panic(err) } return app.New( - val.Ctx.Logger, tmdb.NewMemDB(), nil, true, map[int64]bool{}, val.Ctx.Config.RootDir, 0, + val.GetCtx().Logger, tmdb.NewMemDB(), nil, true, map[int64]bool{}, val.GetCtx().Config.RootDir, 0, encoding, app.GetEnabledProposals(), - simapp.EmptyAppOptions{}, + sims.EmptyAppOptions{}, nil, - baseapp.SetPruning(storetypes.NewPruningOptionsFromString(val.AppConfig.Pruning)), - baseapp.SetMinGasPrices(val.AppConfig.MinGasPrices), + baseapp.SetPruning(pruningtypes.NewPruningOptionsFromString(val.GetAppConfig().Pruning)), + baseapp.SetMinGasPrices(val.GetAppConfig().MinGasPrices), + baseapp.SetChainID(chainID), ) }, GenesisState: app.ModuleBasics.DefaultGenesis(encoding.Marshaler), TimeoutCommit: 2 * time.Second, - ChainID: "chain-" + tmrand.NewRand().Str(6), + ChainID: chainID, // Some changes are introduced to make the tests run as if neutron is a standalone chain. // This will only work if NumValidators is set to 1. NumValidators: 1, @@ -89,7 +93,7 @@ func DefaultConfig() network.Config { AccountTokens: sdk.TokensFromConsensusPower(1000, sdk.DefaultPowerReduction), StakingTokens: sdk.TokensFromConsensusPower(500, sdk.DefaultPowerReduction), BondedTokens: sdk.TokensFromConsensusPower(100, sdk.DefaultPowerReduction), - PruningStrategy: storetypes.PruningOptionNothing, + PruningStrategy: pruningtypes.PruningOptionNothing, CleanupDir: true, SigningAlgo: string(hd.Secp256k1Type), KeyringOptions: []keyring.Option{}, diff --git a/testutil/cron/keeper/cron.go b/testutil/cron/keeper/cron.go index 7206a15c7..ac34c73c8 100644 --- a/testutil/cron/keeper/cron.go +++ b/testutil/cron/keeper/cron.go @@ -3,6 +3,9 @@ package keeper import ( "testing" + tmdb "github.com/cometbft/cometbft-db" + "github.com/cometbft/cometbft/libs/log" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" "github.com/cosmos/cosmos-sdk/store" @@ -12,9 +15,6 @@ import ( "github.com/neutron-org/neutron/x/cron/keeper" "github.com/neutron-org/neutron/x/cron/types" "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/libs/log" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - tmdb "github.com/tendermint/tm-db" ) 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 98b7cd5bf..45354ba7d 100644 --- a/testutil/cron/network/network.go +++ b/testutil/cron/network/network.go @@ -2,6 +2,8 @@ package network import ( "fmt" + pruningtypes "github.com/cosmos/cosmos-sdk/store/pruning/types" + "github.com/stretchr/testify/require" "testing" "time" @@ -11,21 +13,20 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/neutron-org/neutron/testutil/consumer" - storetypes "github.com/cosmos/cosmos-sdk/store/types" "github.com/neutron-org/neutron/app/params" "github.com/neutron-org/neutron/app" + tmdb "github.com/cometbft/cometbft-db" + tmrand "github.com/cometbft/cometbft/libs/rand" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/crypto/hd" "github.com/cosmos/cosmos-sdk/crypto/keyring" servertypes "github.com/cosmos/cosmos-sdk/server/types" - "github.com/cosmos/cosmos-sdk/simapp" "github.com/cosmos/cosmos-sdk/testutil/network" + "github.com/cosmos/cosmos-sdk/testutil/sims" sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - tmrand "github.com/tendermint/tendermint/libs/rand" - tmdb "github.com/tendermint/tm-db" ) type ( @@ -45,7 +46,8 @@ func New(t *testing.T, configs ...network.Config) *network.Network { } else { cfg = configs[0] } - net := network.New(t, cfg) + net, err := network.New(t, t.TempDir(), cfg) + require.NoError(t, err) t.Cleanup(net.Cleanup) return net } @@ -58,31 +60,33 @@ func DefaultConfig() network.Config { app.ModuleBasics[stakingtypes.ModuleName] = staking.AppModuleBasic{} encoding := app.MakeEncodingConfig() + chainID := "chain-" + tmrand.NewRand().Str(6) return network.Config{ Codec: encoding.Marshaler, TxConfig: encoding.TxConfig, LegacyAmino: encoding.Amino, InterfaceRegistry: encoding.InterfaceRegistry, AccountRetriever: authtypes.AccountRetriever{}, - AppConstructor: func(val network.Validator) servertypes.Application { - err := consumer.ModifyConsumerGenesis(val) + AppConstructor: func(val network.ValidatorI) servertypes.Application { + err := consumer.ModifyConsumerGenesis(val.(network.Validator)) if err != nil { panic(err) } return app.New( - val.Ctx.Logger, tmdb.NewMemDB(), nil, true, map[int64]bool{}, val.Ctx.Config.RootDir, 0, + val.GetCtx().Logger, tmdb.NewMemDB(), nil, true, map[int64]bool{}, val.GetCtx().Config.RootDir, 0, encoding, app.GetEnabledProposals(), - simapp.EmptyAppOptions{}, + sims.EmptyAppOptions{}, nil, - baseapp.SetPruning(storetypes.NewPruningOptionsFromString(val.AppConfig.Pruning)), - baseapp.SetMinGasPrices(val.AppConfig.MinGasPrices), + baseapp.SetPruning(pruningtypes.NewPruningOptionsFromString(val.GetAppConfig().Pruning)), + baseapp.SetMinGasPrices(val.GetAppConfig().MinGasPrices), + baseapp.SetChainID(chainID), ) }, GenesisState: app.ModuleBasics.DefaultGenesis(encoding.Marshaler), TimeoutCommit: 2 * time.Second, - ChainID: "chain-" + tmrand.NewRand().Str(6), + ChainID: chainID, // Some changes are introduced to make the tests run as if neutron is a standalone chain. // This will only work if NumValidators is set to 1. NumValidators: 1, @@ -91,7 +95,7 @@ func DefaultConfig() network.Config { AccountTokens: sdk.TokensFromConsensusPower(1000, sdk.DefaultPowerReduction), StakingTokens: sdk.TokensFromConsensusPower(500, sdk.DefaultPowerReduction), BondedTokens: sdk.TokensFromConsensusPower(100, sdk.DefaultPowerReduction), - PruningStrategy: storetypes.PruningOptionNothing, + PruningStrategy: pruningtypes.PruningOptionNothing, CleanupDir: true, SigningAlgo: string(hd.Secp256k1Type), KeyringOptions: []keyring.Option{}, diff --git a/testutil/feeburner/keeper/feeburner.go b/testutil/feeburner/keeper/feeburner.go index 6c594421a..2305deb8b 100644 --- a/testutil/feeburner/keeper/feeburner.go +++ b/testutil/feeburner/keeper/feeburner.go @@ -3,6 +3,9 @@ package keeper import ( "testing" + tmdb "github.com/cometbft/cometbft-db" + "github.com/cometbft/cometbft/libs/log" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" "github.com/cosmos/cosmos-sdk/store" @@ -12,9 +15,6 @@ import ( "github.com/neutron-org/neutron/x/feeburner/keeper" "github.com/neutron-org/neutron/x/feeburner/types" "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/libs/log" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - tmdb "github.com/tendermint/tm-db" ) func FeeburnerKeeper(t testing.TB) (*keeper.Keeper, sdk.Context) { diff --git a/testutil/feerefunder/keeper/fee.go b/testutil/feerefunder/keeper/fee.go index 972627ee4..ca7b769a8 100644 --- a/testutil/feerefunder/keeper/fee.go +++ b/testutil/feerefunder/keeper/fee.go @@ -3,6 +3,9 @@ package keeper import ( "testing" + tmdb "github.com/cometbft/cometbft-db" + "github.com/cometbft/cometbft/libs/log" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" "github.com/cosmos/cosmos-sdk/store" @@ -10,9 +13,6 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" typesparams "github.com/cosmos/cosmos-sdk/x/params/types" "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/libs/log" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - tmdb "github.com/tendermint/tm-db" "github.com/neutron-org/neutron/x/feerefunder/keeper" "github.com/neutron-org/neutron/x/feerefunder/types" diff --git a/testutil/interchainqueries/keeper/interchainqeries.go b/testutil/interchainqueries/keeper/interchainqeries.go index 4f1faa119..6ad93d4aa 100644 --- a/testutil/interchainqueries/keeper/interchainqeries.go +++ b/testutil/interchainqueries/keeper/interchainqeries.go @@ -3,8 +3,11 @@ package keeper import ( "testing" - ibckeeper "github.com/cosmos/ibc-go/v4/modules/core/keeper" + ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper" + tmdb "github.com/cometbft/cometbft-db" + "github.com/cometbft/cometbft/libs/log" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" "github.com/cosmos/cosmos-sdk/store" @@ -12,9 +15,6 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" typesparams "github.com/cosmos/cosmos-sdk/x/params/types" "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/libs/log" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - tmdb "github.com/tendermint/tm-db" "github.com/neutron-org/neutron/x/interchainqueries/keeper" "github.com/neutron-org/neutron/x/interchainqueries/types" diff --git a/testutil/interchainqueries/network/network.go b/testutil/interchainqueries/network/network.go index 949f363de..cb666dda5 100644 --- a/testutil/interchainqueries/network/network.go +++ b/testutil/interchainqueries/network/network.go @@ -2,16 +2,19 @@ package network import ( "fmt" + pruningtypes "github.com/cosmos/cosmos-sdk/store/pruning/types" + "github.com/stretchr/testify/require" "testing" "time" + tmdb "github.com/cometbft/cometbft-db" + tmrand "github.com/cometbft/cometbft/libs/rand" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/crypto/hd" "github.com/cosmos/cosmos-sdk/crypto/keyring" servertypes "github.com/cosmos/cosmos-sdk/server/types" - "github.com/cosmos/cosmos-sdk/simapp" - storetypes "github.com/cosmos/cosmos-sdk/store/types" "github.com/cosmos/cosmos-sdk/testutil/network" + "github.com/cosmos/cosmos-sdk/testutil/sims" sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" genutil "github.com/cosmos/cosmos-sdk/x/genutil" @@ -19,8 +22,6 @@ import ( staking "github.com/cosmos/cosmos-sdk/x/staking" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/neutron-org/neutron/app/params" - tmrand "github.com/tendermint/tendermint/libs/rand" - tmdb "github.com/tendermint/tm-db" "github.com/neutron-org/neutron/app" "github.com/neutron-org/neutron/testutil/consumer" @@ -43,7 +44,8 @@ func New(t *testing.T, configs ...network.Config) *network.Network { } else { cfg = configs[0] } - net := network.New(t, cfg) + net, err := network.New(t, t.TempDir(), cfg) + require.NoError(t, err) t.Cleanup(net.Cleanup) return net } @@ -51,36 +53,38 @@ func New(t *testing.T, configs ...network.Config) *network.Network { // DefaultConfig will initialize config for the network with custom application, // genesis and single validator. All other parameters are inherited from cosmos-sdk/testutil/network.DefaultConfig func DefaultConfig() network.Config { - // app doesn't have this modules anymore, but we need them for test setup, which uses gentx and MsgCreateValidator + // app doesn't have these modules anymore, but we need them for test setup, which uses gentx and MsgCreateValidator app.ModuleBasics[genutiltypes.ModuleName] = genutil.AppModuleBasic{} app.ModuleBasics[stakingtypes.ModuleName] = staking.AppModuleBasic{} encoding := app.MakeEncodingConfig() + chainID := "chain-" + tmrand.NewRand().Str(6) return network.Config{ Codec: encoding.Marshaler, TxConfig: encoding.TxConfig, LegacyAmino: encoding.Amino, InterfaceRegistry: encoding.InterfaceRegistry, AccountRetriever: authtypes.AccountRetriever{}, - AppConstructor: func(val network.Validator) servertypes.Application { - err := consumer.ModifyConsumerGenesis(val) + AppConstructor: func(val network.ValidatorI) servertypes.Application { + err := consumer.ModifyConsumerGenesis(val.(network.Validator)) if err != nil { panic(err) } return app.New( - val.Ctx.Logger, tmdb.NewMemDB(), nil, true, map[int64]bool{}, val.Ctx.Config.RootDir, 0, + val.GetCtx().Logger, tmdb.NewMemDB(), nil, true, map[int64]bool{}, val.GetCtx().Config.RootDir, 0, encoding, app.GetEnabledProposals(), - simapp.EmptyAppOptions{}, + sims.EmptyAppOptions{}, nil, - baseapp.SetPruning(storetypes.NewPruningOptionsFromString(val.AppConfig.Pruning)), - baseapp.SetMinGasPrices(val.AppConfig.MinGasPrices), + baseapp.SetPruning(pruningtypes.NewPruningOptionsFromString(val.GetAppConfig().Pruning)), + baseapp.SetMinGasPrices(val.GetAppConfig().MinGasPrices), + baseapp.SetChainID(chainID), ) }, GenesisState: app.ModuleBasics.DefaultGenesis(encoding.Marshaler), TimeoutCommit: 2 * time.Second, - ChainID: "chain-" + tmrand.Str(6), + ChainID: chainID, // Some changes are introduced to make the tests run as if neutron is a standalone chain. // This will only work if NumValidators is set to 1. NumValidators: 1, @@ -89,7 +93,7 @@ func DefaultConfig() network.Config { AccountTokens: sdk.TokensFromConsensusPower(1000, sdk.DefaultPowerReduction), StakingTokens: sdk.TokensFromConsensusPower(500, sdk.DefaultPowerReduction), BondedTokens: sdk.TokensFromConsensusPower(100, sdk.DefaultPowerReduction), - PruningStrategy: storetypes.PruningOptionNothing, + PruningStrategy: pruningtypes.PruningOptionNothing, CleanupDir: true, SigningAlgo: string(hd.Secp256k1Type), KeyringOptions: []keyring.Option{}, diff --git a/testutil/interchaintxs/keeper/interchaintxs.go b/testutil/interchaintxs/keeper/interchaintxs.go index 42acb7246..b6c6ce657 100644 --- a/testutil/interchaintxs/keeper/interchaintxs.go +++ b/testutil/interchaintxs/keeper/interchaintxs.go @@ -3,6 +3,9 @@ package keeper import ( "testing" + tmdb "github.com/cometbft/cometbft-db" + "github.com/cometbft/cometbft/libs/log" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" "github.com/cosmos/cosmos-sdk/store" @@ -10,15 +13,12 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" typesparams "github.com/cosmos/cosmos-sdk/x/params/types" "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/libs/log" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - tmdb "github.com/tendermint/tm-db" "github.com/neutron-org/neutron/x/interchaintxs/keeper" "github.com/neutron-org/neutron/x/interchaintxs/types" ) -func InterchainTxsKeeper(t testing.TB, managerKeeper types.ContractManagerKeeper, refunderKeeper types.FeeRefunderKeeper, icaControllerKeeper types.ICAControllerKeeper, channelKeeper types.ChannelKeeper, capabilityKeeper types.ScopedKeeper) (*keeper.Keeper, sdk.Context) { +func InterchainTxsKeeper(t testing.TB, managerKeeper types.ContractManagerKeeper, refunderKeeper types.FeeRefunderKeeper, icaControllerKeeper types.ICAControllerKeeper, channelKeeper types.ChannelKeeper) (*keeper.Keeper, sdk.Context) { storeKey := sdk.NewKVStoreKey(types.StoreKey) memStoreKey := storetypes.NewMemoryStoreKey(types.MemStoreKey) @@ -44,7 +44,6 @@ func InterchainTxsKeeper(t testing.TB, managerKeeper types.ContractManagerKeeper paramsSubspace, channelKeeper, icaControllerKeeper, - capabilityKeeper, managerKeeper, refunderKeeper, ) diff --git a/testutil/interchaintxs/network/network.go b/testutil/interchaintxs/network/network.go index 957b770c0..54856f3c1 100644 --- a/testutil/interchaintxs/network/network.go +++ b/testutil/interchaintxs/network/network.go @@ -2,16 +2,19 @@ package network import ( "fmt" + pruningtypes "github.com/cosmos/cosmos-sdk/store/pruning/types" + "github.com/stretchr/testify/require" "testing" "time" + tmdb "github.com/cometbft/cometbft-db" + tmrand "github.com/cometbft/cometbft/libs/rand" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/crypto/hd" "github.com/cosmos/cosmos-sdk/crypto/keyring" servertypes "github.com/cosmos/cosmos-sdk/server/types" - "github.com/cosmos/cosmos-sdk/simapp" - storetypes "github.com/cosmos/cosmos-sdk/store/types" "github.com/cosmos/cosmos-sdk/testutil/network" + "github.com/cosmos/cosmos-sdk/testutil/sims" sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" genutil "github.com/cosmos/cosmos-sdk/x/genutil" @@ -19,8 +22,6 @@ import ( staking "github.com/cosmos/cosmos-sdk/x/staking" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/neutron-org/neutron/app/params" - tmrand "github.com/tendermint/tendermint/libs/rand" - tmdb "github.com/tendermint/tm-db" "github.com/neutron-org/neutron/testutil/consumer" @@ -44,7 +45,8 @@ func New(t *testing.T, configs ...network.Config) *network.Network { } else { cfg = configs[0] } - net := network.New(t, cfg) + net, err := network.New(t, t.TempDir(), cfg) + require.NoError(t, err) t.Cleanup(net.Cleanup) return net } @@ -52,36 +54,38 @@ func New(t *testing.T, configs ...network.Config) *network.Network { // DefaultConfig will initialize config for the network with custom application, // genesis and single validator. All other parameters are inherited from cosmos-sdk/testutil/network.DefaultConfig func DefaultConfig() network.Config { - // app doesn't have this modules anymore, but we need them for test setup, which uses gentx and MsgCreateValidator + // app doesn't have these modules anymore, but we need them for test setup, which uses gentx and MsgCreateValidator app.ModuleBasics[genutiltypes.ModuleName] = genutil.AppModuleBasic{} app.ModuleBasics[stakingtypes.ModuleName] = staking.AppModuleBasic{} encoding := app.MakeEncodingConfig() + chainID := "chain-" + tmrand.NewRand().Str(6) return network.Config{ Codec: encoding.Marshaler, TxConfig: encoding.TxConfig, LegacyAmino: encoding.Amino, InterfaceRegistry: encoding.InterfaceRegistry, AccountRetriever: authtypes.AccountRetriever{}, - AppConstructor: func(val network.Validator) servertypes.Application { - err := consumer.ModifyConsumerGenesis(val) + AppConstructor: func(val network.ValidatorI) servertypes.Application { + err := consumer.ModifyConsumerGenesis(val.(network.Validator)) if err != nil { panic(err) } return app.New( - val.Ctx.Logger, tmdb.NewMemDB(), nil, true, map[int64]bool{}, val.Ctx.Config.RootDir, 0, + val.GetCtx().Logger, tmdb.NewMemDB(), nil, true, map[int64]bool{}, val.GetCtx().Config.RootDir, 0, encoding, app.GetEnabledProposals(), - simapp.EmptyAppOptions{}, + sims.EmptyAppOptions{}, nil, - baseapp.SetPruning(storetypes.NewPruningOptionsFromString(val.AppConfig.Pruning)), - baseapp.SetMinGasPrices(val.AppConfig.MinGasPrices), + baseapp.SetPruning(pruningtypes.NewPruningOptionsFromString(val.GetAppConfig().Pruning)), + baseapp.SetMinGasPrices(val.GetAppConfig().MinGasPrices), + baseapp.SetChainID(chainID), ) }, GenesisState: app.ModuleBasics.DefaultGenesis(encoding.Marshaler), TimeoutCommit: 2 * time.Second, - ChainID: "chain-" + tmrand.Str(6), + ChainID: chainID, // Some changes are introduced to make the tests run as if neutron is a standalone chain. // This will only work if NumValidators is set to 1. NumValidators: 1, @@ -90,7 +94,7 @@ func DefaultConfig() network.Config { AccountTokens: sdk.TokensFromConsensusPower(1000, sdk.DefaultPowerReduction), StakingTokens: sdk.TokensFromConsensusPower(500, sdk.DefaultPowerReduction), BondedTokens: sdk.TokensFromConsensusPower(100, sdk.DefaultPowerReduction), - PruningStrategy: storetypes.PruningOptionNothing, + PruningStrategy: pruningtypes.PruningOptionNothing, CleanupDir: true, SigningAlgo: string(hd.Secp256k1Type), KeyringOptions: []keyring.Option{}, diff --git a/testutil/mocks/feerefunder/types/keepers.go b/testutil/mocks/feerefunder/types/keepers.go index c7deab197..9baacb354 100644 --- a/testutil/mocks/feerefunder/types/keepers.go +++ b/testutil/mocks/feerefunder/types/keepers.go @@ -9,7 +9,7 @@ import ( types "github.com/cosmos/cosmos-sdk/types" types0 "github.com/cosmos/cosmos-sdk/x/auth/types" - types1 "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" + types1 "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" gomock "github.com/golang/mock/gomock" ) diff --git a/testutil/mocks/interchainqueries/keeper/verify.go b/testutil/mocks/interchainqueries/keeper/verify.go index 6184d7bea..6e39b57be 100644 --- a/testutil/mocks/interchainqueries/keeper/verify.go +++ b/testutil/mocks/interchainqueries/keeper/verify.go @@ -9,11 +9,11 @@ import ( types "github.com/cosmos/cosmos-sdk/codec/types" types0 "github.com/cosmos/cosmos-sdk/types" - keeper "github.com/cosmos/ibc-go/v4/modules/core/02-client/keeper" - exported "github.com/cosmos/ibc-go/v4/modules/core/exported" - types1 "github.com/cosmos/ibc-go/v4/modules/light-clients/07-tendermint/types" + keeper "github.com/cosmos/ibc-go/v7/modules/core/02-client/keeper" + exported "github.com/cosmos/ibc-go/v7/modules/core/exported" + tendermint "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" gomock "github.com/golang/mock/gomock" - types2 "github.com/neutron-org/neutron/x/interchainqueries/types" + types1 "github.com/neutron-org/neutron/x/interchainqueries/types" ) // MockHeaderVerifier is a mock of HeaderVerifier interface. @@ -40,10 +40,10 @@ func (m *MockHeaderVerifier) EXPECT() *MockHeaderVerifierMockRecorder { } // UnpackHeader mocks base method. -func (m *MockHeaderVerifier) UnpackHeader(any *types.Any) (exported.Header, error) { +func (m *MockHeaderVerifier) UnpackHeader(any *types.Any) (exported.ClientMessage, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "UnpackHeader", any) - ret0, _ := ret[0].(exported.Header) + ret0, _ := ret[0].(exported.ClientMessage) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -55,7 +55,7 @@ func (mr *MockHeaderVerifierMockRecorder) UnpackHeader(any interface{}) *gomock. } // VerifyHeaders mocks base method. -func (m *MockHeaderVerifier) VerifyHeaders(ctx types0.Context, cleintkeeper keeper.Keeper, clientID string, header, nextHeader exported.Header) error { +func (m *MockHeaderVerifier) VerifyHeaders(ctx types0.Context, cleintkeeper keeper.Keeper, clientID string, header, nextHeader exported.ClientMessage) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "VerifyHeaders", ctx, cleintkeeper, clientID, header, nextHeader) ret0, _ := ret[0].(error) @@ -92,7 +92,7 @@ func (m *MockTransactionVerifier) EXPECT() *MockTransactionVerifierMockRecorder } // VerifyTransaction mocks base method. -func (m *MockTransactionVerifier) VerifyTransaction(header, nextHeader *types1.Header, tx *types2.TxValue) error { +func (m *MockTransactionVerifier) VerifyTransaction(header, nextHeader *tendermint.Header, tx *types1.TxValue) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "VerifyTransaction", header, nextHeader, tx) ret0, _ := ret[0].(error) diff --git a/testutil/mocks/interchainqueries/types/expected_keepers.go b/testutil/mocks/interchainqueries/types/expected_keepers.go index a2eb06e5a..435a54b05 100644 --- a/testutil/mocks/interchainqueries/types/expected_keepers.go +++ b/testutil/mocks/interchainqueries/types/expected_keepers.go @@ -9,8 +9,8 @@ import ( types "github.com/cosmos/cosmos-sdk/types" types0 "github.com/cosmos/cosmos-sdk/x/auth/types" - types1 "github.com/cosmos/ibc-go/v4/modules/core/02-client/types" - types2 "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" + types1 "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" + types2 "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" gomock "github.com/golang/mock/gomock" ) diff --git a/testutil/mocks/interchainqueries/types/verify.go b/testutil/mocks/interchainqueries/types/verify.go index 50f43ed14..218f5e094 100644 --- a/testutil/mocks/interchainqueries/types/verify.go +++ b/testutil/mocks/interchainqueries/types/verify.go @@ -9,9 +9,9 @@ import ( types "github.com/cosmos/cosmos-sdk/codec/types" types0 "github.com/cosmos/cosmos-sdk/types" - keeper "github.com/cosmos/ibc-go/v4/modules/core/02-client/keeper" - exported "github.com/cosmos/ibc-go/v4/modules/core/exported" - types1 "github.com/cosmos/ibc-go/v4/modules/light-clients/07-tendermint/types" + keeper "github.com/cosmos/ibc-go/v7/modules/core/02-client/keeper" + exported "github.com/cosmos/ibc-go/v7/modules/core/exported" + types1 "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" gomock "github.com/golang/mock/gomock" types2 "github.com/neutron-org/neutron/x/interchainqueries/types" @@ -41,10 +41,10 @@ func (m *MockHeaderVerifier) EXPECT() *MockHeaderVerifierMockRecorder { } // UnpackHeader mocks base method. -func (m *MockHeaderVerifier) UnpackHeader(any *types.Any) (exported.Header, error) { +func (m *MockHeaderVerifier) UnpackHeader(any *types.Any) (exported.ClientMessage, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "UnpackHeader", any) - ret0, _ := ret[0].(exported.Header) + ret0, _ := ret[0].(exported.ClientMessage) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -56,7 +56,7 @@ func (mr *MockHeaderVerifierMockRecorder) UnpackHeader(any interface{}) *gomock. } // VerifyHeaders mocks base method. -func (m *MockHeaderVerifier) VerifyHeaders(ctx types0.Context, cleintkeeper keeper.Keeper, clientID string, header, nextHeader exported.Header) error { +func (m *MockHeaderVerifier) VerifyHeaders(ctx types0.Context, cleintkeeper keeper.Keeper, clientID string, header, nextHeader exported.ClientMessage) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "VerifyHeaders", ctx, cleintkeeper, clientID, header, nextHeader) ret0, _ := ret[0].(error) diff --git a/testutil/mocks/interchaintxs/types/expected_keepers.go b/testutil/mocks/interchaintxs/types/expected_keepers.go index 0945f37c8..0c903226c 100644 --- a/testutil/mocks/interchaintxs/types/expected_keepers.go +++ b/testutil/mocks/interchaintxs/types/expected_keepers.go @@ -10,9 +10,9 @@ import ( types "github.com/cosmos/cosmos-sdk/types" types0 "github.com/cosmos/cosmos-sdk/x/auth/types" types1 "github.com/cosmos/cosmos-sdk/x/capability/types" - types2 "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/types" - types3 "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" - exported "github.com/cosmos/ibc-go/v4/modules/core/exported" + types2 "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" + types3 "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" + exported "github.com/cosmos/ibc-go/v7/modules/core/exported" gomock "github.com/golang/mock/gomock" types4 "github.com/neutron-org/neutron/x/contractmanager/types" types5 "github.com/neutron-org/neutron/x/feerefunder/types" @@ -344,58 +344,6 @@ func (mr *MockFeeRefunderKeeperMockRecorder) LockFees(ctx, payer, packetID, fee return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LockFees", reflect.TypeOf((*MockFeeRefunderKeeper)(nil).LockFees), ctx, payer, packetID, fee) } -// MockScopedKeeper is a mock of ScopedKeeper interface. -type MockScopedKeeper struct { - ctrl *gomock.Controller - recorder *MockScopedKeeperMockRecorder -} - -// MockScopedKeeperMockRecorder is the mock recorder for MockScopedKeeper. -type MockScopedKeeperMockRecorder struct { - mock *MockScopedKeeper -} - -// NewMockScopedKeeper creates a new mock instance. -func NewMockScopedKeeper(ctrl *gomock.Controller) *MockScopedKeeper { - mock := &MockScopedKeeper{ctrl: ctrl} - mock.recorder = &MockScopedKeeperMockRecorder{mock} - return mock -} - -// EXPECT returns an object that allows the caller to indicate expected use. -func (m *MockScopedKeeper) EXPECT() *MockScopedKeeperMockRecorder { - return m.recorder -} - -// ClaimCapability mocks base method. -func (m *MockScopedKeeper) ClaimCapability(ctx types.Context, cap *types1.Capability, name string) error { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "ClaimCapability", ctx, cap, name) - ret0, _ := ret[0].(error) - return ret0 -} - -// ClaimCapability indicates an expected call of ClaimCapability. -func (mr *MockScopedKeeperMockRecorder) ClaimCapability(ctx, cap, name interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ClaimCapability", reflect.TypeOf((*MockScopedKeeper)(nil).ClaimCapability), ctx, cap, name) -} - -// GetCapability mocks base method. -func (m *MockScopedKeeper) GetCapability(ctx types.Context, name string) (*types1.Capability, bool) { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GetCapability", ctx, name) - ret0, _ := ret[0].(*types1.Capability) - ret1, _ := ret[1].(bool) - return ret0, ret1 -} - -// GetCapability indicates an expected call of GetCapability. -func (mr *MockScopedKeeperMockRecorder) GetCapability(ctx, name interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetCapability", reflect.TypeOf((*MockScopedKeeper)(nil).GetCapability), ctx, name) -} - // MockChannelKeeper is a mock of ChannelKeeper interface. type MockChannelKeeper struct { ctrl *gomock.Controller diff --git a/testutil/mocks/transfer/types/expected_keepers.go b/testutil/mocks/transfer/types/expected_keepers.go index 9ebdbe7f8..e7c4dfa3b 100644 --- a/testutil/mocks/transfer/types/expected_keepers.go +++ b/testutil/mocks/transfer/types/expected_keepers.go @@ -9,7 +9,7 @@ import ( types "github.com/cosmos/cosmos-sdk/types" types0 "github.com/cosmos/cosmos-sdk/x/auth/types" - types1 "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" + types1 "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" gomock "github.com/golang/mock/gomock" types2 "github.com/neutron-org/neutron/x/feerefunder/types" ) @@ -192,6 +192,20 @@ func (m *MockChannelKeeper) EXPECT() *MockChannelKeeperMockRecorder { return m.recorder } +// GetAllChannelsWithPortPrefix mocks base method. +func (m *MockChannelKeeper) GetAllChannelsWithPortPrefix(ctx types.Context, portPrefix string) []types1.IdentifiedChannel { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "GetAllChannelsWithPortPrefix", ctx, portPrefix) + ret0, _ := ret[0].([]types1.IdentifiedChannel) + return ret0 +} + +// GetAllChannelsWithPortPrefix indicates an expected call of GetAllChannelsWithPortPrefix. +func (mr *MockChannelKeeperMockRecorder) GetAllChannelsWithPortPrefix(ctx, portPrefix interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAllChannelsWithPortPrefix", reflect.TypeOf((*MockChannelKeeper)(nil).GetAllChannelsWithPortPrefix), ctx, portPrefix) +} + // GetChannel mocks base method. func (m *MockChannelKeeper) GetChannel(ctx types.Context, srcPort, srcChan string) (types1.Channel, bool) { m.ctrl.T.Helper() diff --git a/testutil/test_helpers.go b/testutil/test_helpers.go index f3678f9a9..cc536476a 100644 --- a/testutil/test_helpers.go +++ b/testutil/test_helpers.go @@ -8,33 +8,33 @@ import ( "testing" "time" - "github.com/cosmos/ibc-go/v4/modules/apps/transfer/types" + "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" "github.com/CosmWasm/wasmd/x/wasm/keeper" wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" - "github.com/cosmos/cosmos-sdk/simapp" + dbm "github.com/cometbft/cometbft-db" + "github.com/cometbft/cometbft/libs/log" + "github.com/cosmos/cosmos-sdk/testutil/sims" sdk "github.com/cosmos/cosmos-sdk/types" - icatypes "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/types" - channeltypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" - ibctesting "github.com/cosmos/interchain-security/legacy_ibc_testing/testing" - icssimapp "github.com/cosmos/interchain-security/testutil/ibc_testing" + icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" + channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" + ibctesting "github.com/cosmos/interchain-security/v3/legacy_ibc_testing/testing" + icssimapp "github.com/cosmos/interchain-security/v3/testutil/ibc_testing" "github.com/stretchr/testify/suite" - "github.com/tendermint/tendermint/libs/log" - dbm "github.com/tendermint/tm-db" tokenfactorytypes "github.com/neutron-org/neutron/x/tokenfactory/types" - clienttypes "github.com/cosmos/ibc-go/v4/modules/core/02-client/types" - appProvider "github.com/cosmos/interchain-security/app/provider" - e2e "github.com/cosmos/interchain-security/testutil/integration" - tmtypes "github.com/tendermint/tendermint/types" + tmtypes "github.com/cometbft/cometbft/types" + clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" + appProvider "github.com/cosmos/interchain-security/v3/app/provider" + e2e "github.com/cosmos/interchain-security/v3/testutil/integration" "github.com/neutron-org/neutron/app" ictxstypes "github.com/neutron-org/neutron/x/interchaintxs/types" - consumertypes "github.com/cosmos/interchain-security/x/ccv/consumer/types" - providertypes "github.com/cosmos/interchain-security/x/ccv/provider/types" - ccv "github.com/cosmos/interchain-security/x/ccv/types" + consumertypes "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types" + providertypes "github.com/cosmos/interchain-security/v3/x/ccv/provider/types" + ccv "github.com/cosmos/interchain-security/v3/x/ccv/types" ) var ( @@ -91,6 +91,7 @@ func GetTestConsumerAdditionProp(chain *ibctesting.TestChain) *providertypes.Con time.Now(), consumertypes.DefaultConsumerRedistributeFrac, consumertypes.DefaultBlocksPerDistributionTransmission, + "channel-0", consumertypes.DefaultHistoricalEntries, ccv.DefaultCCVTimeoutPeriod, consumertypes.DefaultTransferTimeoutPeriod, @@ -302,8 +303,8 @@ func (suite *IBCConnectionTestSuite) InstantiateReflectContract(ctx sdk.Context, func NewICAPath(chainA, chainB, chainProvider *ibctesting.TestChain) *ibctesting.Path { path := ibctesting.NewPath(chainA, chainB) - path.EndpointA.ChannelConfig.PortID = icatypes.PortID - path.EndpointB.ChannelConfig.PortID = icatypes.PortID + path.EndpointA.ChannelConfig.PortID = icatypes.HostPortID + path.EndpointB.ChannelConfig.PortID = icatypes.HostPortID path.EndpointA.ChannelConfig.Order = channeltypes.ORDERED path.EndpointB.ChannelConfig.Order = channeltypes.ORDERED path.EndpointA.ChannelConfig.Version = TestVersion @@ -385,7 +386,7 @@ func SetupTestingApp() (ibctesting.TestingApp, map[string]json.RawMessage) { 0, encoding, app.GetEnabledProposals(), - simapp.EmptyAppOptions{}, + sims.EmptyAppOptions{}, nil, ) return testApp, app.NewDefaultGenesisState(testApp.AppCodec()) diff --git a/testutil/transfer/keeper/keeper.go b/testutil/transfer/keeper/keeper.go index c9894a58b..d1f306e27 100644 --- a/testutil/transfer/keeper/keeper.go +++ b/testutil/transfer/keeper/keeper.go @@ -5,6 +5,9 @@ import ( capabilitykeeper "github.com/cosmos/cosmos-sdk/x/capability/keeper" + tmdb "github.com/cometbft/cometbft-db" + "github.com/cometbft/cometbft/libs/log" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" "github.com/cosmos/cosmos-sdk/store" @@ -12,11 +15,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" typesparams "github.com/cosmos/cosmos-sdk/x/params/types" "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/libs/log" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - tmdb "github.com/tendermint/tm-db" - transfertypes "github.com/cosmos/ibc-go/v4/modules/apps/transfer/types" + transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" keeper "github.com/neutron-org/neutron/x/transfer/keeper" "github.com/neutron-org/neutron/x/transfer/types" diff --git a/wasmbinding/bindings/query.go b/wasmbinding/bindings/query.go index 532b739f2..bdbf085d2 100644 --- a/wasmbinding/bindings/query.go +++ b/wasmbinding/bindings/query.go @@ -8,7 +8,7 @@ import ( sdktypes "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" - ibcclienttypes "github.com/cosmos/ibc-go/v4/modules/core/02-client/types" + ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" "github.com/neutron-org/neutron/x/interchainqueries/types" ) diff --git a/wasmbinding/message_plugin.go b/wasmbinding/message_plugin.go index 066a9e56f..0094cb78b 100644 --- a/wasmbinding/message_plugin.go +++ b/wasmbinding/message_plugin.go @@ -23,7 +23,7 @@ import ( admintypes "github.com/cosmos/admin-module/x/adminmodule/types" bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" - ibcclienttypes "github.com/cosmos/ibc-go/v4/modules/core/02-client/types" + ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" "github.com/neutron-org/neutron/wasmbinding/bindings" icqkeeper "github.com/neutron-org/neutron/x/interchainqueries/keeper" icqtypes "github.com/neutron-org/neutron/x/interchainqueries/types" diff --git a/wasmbinding/test/custom_message_test.go b/wasmbinding/test/custom_message_test.go index 259ec14a4..c714b7508 100644 --- a/wasmbinding/test/custom_message_test.go +++ b/wasmbinding/test/custom_message_test.go @@ -17,7 +17,8 @@ import ( "github.com/CosmWasm/wasmd/x/wasm/keeper" "github.com/CosmWasm/wasmvm/types" sdk "github.com/cosmos/cosmos-sdk/types" - host "github.com/cosmos/ibc-go/v4/modules/core/24-host" + host "github.com/cosmos/ibc-go/v7/modules/core/24-host" + ibchost "github.com/cosmos/ibc-go/v7/modules/core/exported" "github.com/stretchr/testify/require" "github.com/neutron-org/neutron/app" @@ -133,7 +134,7 @@ func (suite *CustomMessengerTestSuite) TestRegisterInterchainQuery() { RegisterInterchainQuery: &bindings.RegisterInterchainQuery{ QueryType: string(icqtypes.InterchainQueryTypeKV), Keys: []*icqtypes.KVKey{ - {Path: host.StoreKey, Key: host.FullClientStateKey(suite.Path.EndpointB.ClientID)}, + {Path: ibchost.StoreKey, Key: host.FullClientStateKey(suite.Path.EndpointB.ClientID)}, }, TransactionsFilter: "{}", ConnectionId: suite.Path.EndpointA.ConnectionID, diff --git a/wasmbinding/test/custom_query_test.go b/wasmbinding/test/custom_query_test.go index 4313cdf31..768a2f7ce 100644 --- a/wasmbinding/test/custom_query_test.go +++ b/wasmbinding/test/custom_query_test.go @@ -13,9 +13,10 @@ import ( "github.com/CosmWasm/wasmd/x/wasm/keeper" wasmvmtypes "github.com/CosmWasm/wasmvm/types" + abci "github.com/cometbft/cometbft/abci/types" sdk "github.com/cosmos/cosmos-sdk/types" - host "github.com/cosmos/ibc-go/v4/modules/core/24-host" - abci "github.com/tendermint/tendermint/abci/types" + host "github.com/cosmos/ibc-go/v7/modules/core/24-host" + ibchost "github.com/cosmos/ibc-go/v7/modules/core/exported" "github.com/neutron-org/neutron/app" "github.com/neutron-org/neutron/testutil" @@ -47,7 +48,7 @@ func (suite *CustomQuerierTestSuite) TestInterchainQueryResult() { registeredQuery := &icqtypes.RegisteredQuery{ Id: lastID, Keys: []*icqtypes.KVKey{ - {Path: host.StoreKey, Key: clientKey}, + {Path: ibchost.StoreKey, Key: clientKey}, }, QueryType: string(icqtypes.InterchainQueryTypeKV), UpdatePeriod: 1, @@ -58,7 +59,7 @@ func (suite *CustomQuerierTestSuite) TestInterchainQueryResult() { suite.Require().NoError(err) chainBResp := suite.ChainB.App.Query(abci.RequestQuery{ - Path: fmt.Sprintf("store/%s/key", host.StoreKey), + Path: fmt.Sprintf("store/%s/key", ibchost.StoreKey), Height: suite.ChainB.LastHeader.Header.Height - 1, Data: clientKey, Prove: true, @@ -69,7 +70,7 @@ func (suite *CustomQuerierTestSuite) TestInterchainQueryResult() { Key: chainBResp.Key, Proof: chainBResp.ProofOps, Value: chainBResp.Value, - StoragePrefix: host.StoreKey, + StoragePrefix: ibchost.StoreKey, }}, // we don't have tests to test transactions proofs verification since it's a tendermint layer, and we don't have access to it here Block: nil, @@ -97,7 +98,7 @@ func (suite *CustomQuerierTestSuite) TestInterchainQueryResult() { Key: chainBResp.Key, Proof: nil, Value: chainBResp.Value, - StoragePrefix: host.StoreKey, + StoragePrefix: ibchost.StoreKey, }}, resp.Result.KvResults) } diff --git a/x/contractmanager/client/cli/query_failure_test.go b/x/contractmanager/client/cli/query_failure_test.go index f14a6d595..a70cfd2a4 100644 --- a/x/contractmanager/client/cli/query_failure_test.go +++ b/x/contractmanager/client/cli/query_failure_test.go @@ -8,11 +8,11 @@ import ( "github.com/neutron-org/neutron/app" + tmcli "github.com/cometbft/cometbft/libs/cli" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/crypto/keys/ed25519" clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli" "github.com/stretchr/testify/require" - tmcli "github.com/tendermint/tendermint/libs/cli" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/x/contractmanager/keeper/keeper.go b/x/contractmanager/keeper/keeper.go index 7997f4946..e41b149aa 100644 --- a/x/contractmanager/keeper/keeper.go +++ b/x/contractmanager/keeper/keeper.go @@ -3,11 +3,11 @@ package keeper import ( "fmt" + "github.com/cometbft/cometbft/libs/log" "github.com/cosmos/cosmos-sdk/codec" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - "github.com/tendermint/tendermint/libs/log" "github.com/neutron-org/neutron/x/contractmanager/types" ) diff --git a/x/contractmanager/keeper/sudo.go b/x/contractmanager/keeper/sudo.go index 59af64853..2feba728a 100644 --- a/x/contractmanager/keeper/sudo.go +++ b/x/contractmanager/keeper/sudo.go @@ -10,8 +10,8 @@ import ( "fmt" sdk "github.com/cosmos/cosmos-sdk/types" - ibcclienttypes "github.com/cosmos/ibc-go/v4/modules/core/02-client/types" - channeltypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" + ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" + channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" "github.com/neutron-org/neutron/x/contractmanager/types" ) diff --git a/x/contractmanager/keeper/sudo_test.go b/x/contractmanager/keeper/sudo_test.go index 268459447..b4adc4103 100644 --- a/x/contractmanager/keeper/sudo_test.go +++ b/x/contractmanager/keeper/sudo_test.go @@ -6,7 +6,7 @@ import ( "testing" sdk "github.com/cosmos/cosmos-sdk/types" - channeltypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" + channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" "github.com/golang/mock/gomock" "github.com/stretchr/testify/require" diff --git a/x/contractmanager/module.go b/x/contractmanager/module.go index da4a7d804..0d15b740f 100644 --- a/x/contractmanager/module.go +++ b/x/contractmanager/module.go @@ -2,6 +2,7 @@ package contractmanager import ( "context" + "cosmossdk.io/core/appmodule" "encoding/json" "fmt" @@ -11,7 +12,7 @@ import ( "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" - abci "github.com/tendermint/tendermint/abci/types" + abci "github.com/cometbft/cometbft/abci/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" @@ -93,6 +94,7 @@ func (AppModuleBasic) GetQueryCmd() *cobra.Command { // ---------------------------------------------------------------------------- // AppModule // ---------------------------------------------------------------------------- +var _ appmodule.AppModule = AppModule{} // AppModule implements the AppModule interface that defines the inter-dependent methods that modules need to implement type AppModule struct { @@ -111,16 +113,16 @@ func NewAppModule( } } -// Deprecated: use RegisterServices -func (am AppModule) Route() sdk.Route { return sdk.Route{} } +// IsOnePerModuleType implements the depinject.OnePerModuleType interface. +func (am AppModule) IsOnePerModuleType() { // marker +} -// Deprecated: use RegisterServices -func (AppModule) QuerierRoute() string { return types.RouterKey } +// IsAppModule implements the appmodule.AppModule interface. +func (am AppModule) IsAppModule() { // marker +} // Deprecated: use RegisterServices -func (am AppModule) LegacyQuerierHandler(_ *codec.LegacyAmino) sdk.Querier { - return nil -} +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) { diff --git a/x/contractmanager/types/genesis.pb.go b/x/contractmanager/types/genesis.pb.go index a2fb5a75c..e78a0b07c 100644 --- a/x/contractmanager/types/genesis.pb.go +++ b/x/contractmanager/types/genesis.pb.go @@ -1,12 +1,12 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: contractmanager/genesis.proto +// source: neutron/contractmanager/genesis.proto package types import ( fmt "fmt" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" @@ -42,7 +42,7 @@ func (m *Failure) Reset() { *m = Failure{} } func (m *Failure) String() string { return proto.CompactTextString(m) } func (*Failure) ProtoMessage() {} func (*Failure) Descriptor() ([]byte, []int) { - return fileDescriptor_c23af9b9805fb076, []int{0} + return fileDescriptor_cf4a1534315a7490, []int{0} } func (m *Failure) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -117,7 +117,7 @@ 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_c23af9b9805fb076, []int{1} + return fileDescriptor_cf4a1534315a7490, []int{1} } func (m *GenesisState) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -165,31 +165,33 @@ func init() { proto.RegisterType((*GenesisState)(nil), "neutron.contractmanager.GenesisState") } -func init() { proto.RegisterFile("contractmanager/genesis.proto", fileDescriptor_c23af9b9805fb076) } +func init() { + proto.RegisterFile("neutron/contractmanager/genesis.proto", fileDescriptor_cf4a1534315a7490) +} -var fileDescriptor_c23af9b9805fb076 = []byte{ - // 332 bytes of a gzipped FileDescriptorProto +var fileDescriptor_cf4a1534315a7490 = []byte{ + // 335 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x90, 0x3f, 0x4f, 0x02, 0x31, - 0x18, 0xc6, 0xaf, 0xc7, 0x3f, 0x29, 0xe8, 0xd0, 0x68, 0x3c, 0x89, 0x1c, 0x17, 0x26, 0x16, 0xef, - 0x12, 0x4c, 0xdc, 0x5c, 0x18, 0x34, 0x44, 0x07, 0x82, 0x4e, 0x2e, 0xa4, 0xb4, 0xf5, 0x68, 0x80, - 0xf6, 0xd2, 0x96, 0x44, 0x76, 0x3f, 0x80, 0xb3, 0x9f, 0x88, 0x91, 0xd1, 0xc9, 0x18, 0xf8, 0x22, - 0xe6, 0xee, 0xca, 0x72, 0x09, 0xdb, 0xdb, 0xa7, 0xcf, 0xfb, 0xcb, 0xfb, 0x3c, 0xb0, 0x4d, 0xa4, - 0x30, 0x0a, 0x13, 0xb3, 0xc4, 0x02, 0xc7, 0x4c, 0x45, 0x31, 0x13, 0x4c, 0x73, 0x1d, 0x26, 0x4a, - 0x1a, 0x89, 0x2e, 0x05, 0x5b, 0x19, 0x25, 0x45, 0x58, 0xb0, 0xb5, 0xce, 0x63, 0x19, 0xcb, 0xcc, - 0x13, 0xa5, 0x53, 0x6e, 0x6f, 0x5d, 0x17, 0x69, 0x09, 0x56, 0x78, 0x69, 0x61, 0xdd, 0x4f, 0x00, - 0x6b, 0x0f, 0x98, 0x2f, 0x56, 0x8a, 0xa1, 0x36, 0x84, 0x64, 0x86, 0x85, 0x60, 0x8b, 0x09, 0xa7, - 0x1e, 0x08, 0x40, 0xaf, 0x3e, 0xae, 0x5b, 0x65, 0x48, 0x91, 0x07, 0x6b, 0x98, 0x52, 0xc5, 0xb4, - 0xf6, 0xdc, 0xec, 0xef, 0xf0, 0x44, 0x67, 0xd0, 0xe5, 0xd4, 0x2b, 0x05, 0xa0, 0x57, 0x1e, 0xbb, - 0x9c, 0xa2, 0x0b, 0x58, 0xc5, 0x64, 0x9e, 0x42, 0xca, 0x99, 0x56, 0xc1, 0x64, 0x3e, 0xa4, 0xe8, - 0x0a, 0x9e, 0xa4, 0xb2, 0x59, 0x27, 0xcc, 0xab, 0x58, 0x02, 0x99, 0xbf, 0xae, 0x13, 0xd6, 0xfd, - 0x06, 0xb0, 0xf9, 0x98, 0xa7, 0x7c, 0x31, 0xd8, 0x30, 0x74, 0x0f, 0xab, 0xf9, 0x9d, 0xd9, 0x1d, - 0x8d, 0x7e, 0x27, 0x3c, 0x92, 0x3a, 0x1c, 0x65, 0xb6, 0x41, 0x79, 0xf3, 0xdb, 0x71, 0xc6, 0x76, - 0x09, 0x3d, 0xc1, 0xd3, 0xf7, 0x3c, 0x95, 0x9e, 0x2c, 0xb8, 0x36, 0x9e, 0x1b, 0x94, 0x7a, 0x8d, - 0x7e, 0x70, 0x94, 0x62, 0x3b, 0xb0, 0x98, 0xe6, 0x61, 0xf9, 0x99, 0x6b, 0x33, 0x18, 0x6d, 0x76, - 0x3e, 0xd8, 0xee, 0x7c, 0xf0, 0xb7, 0xf3, 0xc1, 0xd7, 0xde, 0x77, 0xb6, 0x7b, 0xdf, 0xf9, 0xd9, - 0xfb, 0xce, 0xdb, 0x5d, 0xcc, 0xcd, 0x6c, 0x35, 0x0d, 0x89, 0x5c, 0x46, 0x96, 0x7c, 0x23, 0x55, - 0x7c, 0x98, 0xa3, 0x8f, 0xa8, 0x58, 0x7e, 0x1a, 0x5e, 0x4f, 0xab, 0x59, 0xf9, 0xb7, 0xff, 0x01, - 0x00, 0x00, 0xff, 0xff, 0x91, 0x99, 0x4b, 0xa1, 0xea, 0x01, 0x00, 0x00, + 0x18, 0xc6, 0xaf, 0xc7, 0x3f, 0x29, 0xe8, 0xd0, 0x68, 0x3c, 0x49, 0x3c, 0x2e, 0x44, 0x13, 0x16, + 0xef, 0x12, 0x4c, 0xdc, 0x5c, 0x18, 0x34, 0x44, 0x07, 0x82, 0x4e, 0x2e, 0xa4, 0xb4, 0xf5, 0x68, + 0x80, 0xf6, 0xd2, 0x96, 0x44, 0x76, 0x3f, 0x80, 0xb3, 0x9f, 0x88, 0x91, 0xd1, 0xc9, 0x18, 0xf8, + 0x22, 0xe6, 0xee, 0xca, 0xa2, 0xb9, 0xed, 0xed, 0xd3, 0xe7, 0xfd, 0xe5, 0x7d, 0x1e, 0x78, 0x29, + 0xd8, 0xd2, 0x28, 0x29, 0x22, 0x22, 0x85, 0x51, 0x98, 0x98, 0x05, 0x16, 0x38, 0x66, 0x2a, 0x8a, + 0x99, 0x60, 0x9a, 0xeb, 0x30, 0x51, 0xd2, 0x48, 0x74, 0x6a, 0x6d, 0xe1, 0x1f, 0x5b, 0xeb, 0x38, + 0x96, 0xb1, 0xcc, 0x3c, 0x51, 0x3a, 0xe5, 0xf6, 0xd6, 0x45, 0x11, 0x35, 0xc1, 0x0a, 0x2f, 0x2c, + 0xb4, 0xf3, 0x0e, 0x60, 0xed, 0x0e, 0xf3, 0xf9, 0x52, 0x31, 0x74, 0x0e, 0x21, 0x99, 0x62, 0x21, + 0xd8, 0x7c, 0xcc, 0xa9, 0x07, 0x02, 0xd0, 0xad, 0x8f, 0xea, 0x56, 0x19, 0x50, 0xe4, 0xc1, 0x1a, + 0xa6, 0x54, 0x31, 0xad, 0x3d, 0x37, 0xfb, 0xdb, 0x3f, 0xd1, 0x11, 0x74, 0x39, 0xf5, 0x4a, 0x01, + 0xe8, 0x96, 0x47, 0x2e, 0xa7, 0xe8, 0x04, 0x56, 0x31, 0x99, 0xa5, 0x90, 0x72, 0xa6, 0x55, 0x30, + 0x99, 0x0d, 0x28, 0x3a, 0x83, 0x07, 0xa9, 0x6c, 0x56, 0x09, 0xf3, 0x2a, 0x96, 0x40, 0x66, 0xcf, + 0xab, 0x84, 0x75, 0x3e, 0x01, 0x6c, 0xde, 0xe7, 0x69, 0x9f, 0x0c, 0x36, 0x0c, 0xdd, 0xc2, 0x6a, + 0x7e, 0x67, 0x76, 0x47, 0xa3, 0xd7, 0x0e, 0x0b, 0xd2, 0x87, 0xc3, 0xcc, 0xd6, 0x2f, 0xaf, 0xbf, + 0xdb, 0xce, 0xc8, 0x2e, 0xa1, 0x07, 0x78, 0xf8, 0x9a, 0xa7, 0xd2, 0xe3, 0x39, 0xd7, 0xc6, 0x73, + 0x83, 0x52, 0xb7, 0xd1, 0x0b, 0x0a, 0x29, 0xb6, 0x03, 0x8b, 0x69, 0xee, 0x97, 0x1f, 0xb9, 0x36, + 0xfd, 0xe1, 0x7a, 0xeb, 0x83, 0xcd, 0xd6, 0x07, 0x3f, 0x5b, 0x1f, 0x7c, 0xec, 0x7c, 0x67, 0xb3, + 0xf3, 0x9d, 0xaf, 0x9d, 0xef, 0xbc, 0xdc, 0xc4, 0xdc, 0x4c, 0x97, 0x93, 0x90, 0xc8, 0x45, 0x64, + 0xc9, 0x57, 0x52, 0xc5, 0xfb, 0x39, 0x7a, 0xfb, 0x57, 0x7e, 0x1a, 0x5e, 0x4f, 0xaa, 0x59, 0xf9, + 0xd7, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x88, 0x8d, 0x18, 0xf9, 0xfa, 0x01, 0x00, 0x00, } func (m *Failure) Marshal() (dAtA []byte, err error) { diff --git a/x/contractmanager/types/params.pb.go b/x/contractmanager/types/params.pb.go index d6016d520..a2edd6ade 100644 --- a/x/contractmanager/types/params.pb.go +++ b/x/contractmanager/types/params.pb.go @@ -1,12 +1,12 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: contractmanager/params.proto +// source: neutron/contractmanager/params.proto package types import ( fmt "fmt" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" @@ -30,7 +30,7 @@ type Params struct { func (m *Params) Reset() { *m = Params{} } func (*Params) ProtoMessage() {} func (*Params) Descriptor() ([]byte, []int) { - return fileDescriptor_0201b435690497d1, []int{0} + return fileDescriptor_121b05e48c7a8737, []int{0} } func (m *Params) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -63,20 +63,22 @@ func init() { proto.RegisterType((*Params)(nil), "neutron.contractmanager.Params") } -func init() { proto.RegisterFile("contractmanager/params.proto", fileDescriptor_0201b435690497d1) } +func init() { + proto.RegisterFile("neutron/contractmanager/params.proto", fileDescriptor_121b05e48c7a8737) +} -var fileDescriptor_0201b435690497d1 = []byte{ - // 156 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x49, 0xce, 0xcf, 0x2b, - 0x29, 0x4a, 0x4c, 0x2e, 0xc9, 0x4d, 0xcc, 0x4b, 0x4c, 0x4f, 0x2d, 0xd2, 0x2f, 0x48, 0x2c, 0x4a, - 0xcc, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0xcf, 0x4b, 0x2d, 0x2d, 0x29, 0xca, - 0xcf, 0xd3, 0x43, 0x53, 0x25, 0x25, 0x92, 0x9e, 0x9f, 0x9e, 0x0f, 0x56, 0xa3, 0x0f, 0x62, 0x41, - 0x94, 0x2b, 0xf1, 0x71, 0xb1, 0x05, 0x80, 0xb5, 0x5b, 0xb1, 0xcc, 0x58, 0x20, 0xcf, 0xe0, 0x14, - 0x70, 0xe2, 0x91, 0x1c, 0xe3, 0x85, 0x47, 0x72, 0x8c, 0x0f, 0x1e, 0xc9, 0x31, 0x4e, 0x78, 0x2c, - 0xc7, 0x70, 0xe1, 0xb1, 0x1c, 0xc3, 0x8d, 0xc7, 0x72, 0x0c, 0x51, 0x66, 0xe9, 0x99, 0x25, 0x19, - 0xa5, 0x49, 0x7a, 0xc9, 0xf9, 0xb9, 0xfa, 0x50, 0x3b, 0x74, 0xf3, 0x8b, 0xd2, 0x61, 0x6c, 0xfd, - 0x0a, 0x7d, 0x74, 0x77, 0x95, 0x54, 0x16, 0xa4, 0x16, 0x27, 0xb1, 0x81, 0x2d, 0x32, 0x06, 0x04, - 0x00, 0x00, 0xff, 0xff, 0xc6, 0x8f, 0xce, 0x9d, 0xb7, 0x00, 0x00, 0x00, +var fileDescriptor_121b05e48c7a8737 = []byte{ + // 158 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0xc9, 0x4b, 0x2d, 0x2d, + 0x29, 0xca, 0xcf, 0xd3, 0x4f, 0xce, 0xcf, 0x2b, 0x29, 0x4a, 0x4c, 0x2e, 0xc9, 0x4d, 0xcc, 0x4b, + 0x4c, 0x4f, 0x2d, 0xd2, 0x2f, 0x48, 0x2c, 0x4a, 0xcc, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, + 0x17, 0x12, 0x87, 0xaa, 0xd2, 0x43, 0x53, 0x25, 0x25, 0x92, 0x9e, 0x9f, 0x9e, 0x0f, 0x56, 0xa3, + 0x0f, 0x62, 0x41, 0x94, 0x2b, 0xf1, 0x71, 0xb1, 0x05, 0x80, 0xb5, 0x5b, 0xb1, 0xcc, 0x58, 0x20, + 0xcf, 0xe0, 0x14, 0x70, 0xe2, 0x91, 0x1c, 0xe3, 0x85, 0x47, 0x72, 0x8c, 0x0f, 0x1e, 0xc9, 0x31, + 0x4e, 0x78, 0x2c, 0xc7, 0x70, 0xe1, 0xb1, 0x1c, 0xc3, 0x8d, 0xc7, 0x72, 0x0c, 0x51, 0x66, 0xe9, + 0x99, 0x25, 0x19, 0xa5, 0x49, 0x7a, 0xc9, 0xf9, 0xb9, 0xfa, 0x50, 0x3b, 0x74, 0xf3, 0x8b, 0xd2, + 0x61, 0x6c, 0xfd, 0x0a, 0x0c, 0x77, 0x95, 0x54, 0x16, 0xa4, 0x16, 0x27, 0xb1, 0x81, 0x2d, 0x32, + 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0x69, 0x27, 0xc9, 0x25, 0xbf, 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 9ae2a4fc6..4e5dd940b 100644 --- a/x/contractmanager/types/query.pb.go +++ b/x/contractmanager/types/query.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: contractmanager/query.proto +// source: neutron/contractmanager/query.proto package types @@ -7,9 +7,9 @@ import ( context "context" fmt "fmt" query "github.com/cosmos/cosmos-sdk/types/query" - _ "github.com/gogo/protobuf/gogoproto" - grpc1 "github.com/gogo/protobuf/grpc" - proto "github.com/gogo/protobuf/proto" + _ "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" @@ -38,7 +38,7 @@ 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_bcfc7f6aef8ad109, []int{0} + return fileDescriptor_f9524a427f219917, []int{0} } func (m *QueryParamsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -77,7 +77,7 @@ 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_bcfc7f6aef8ad109, []int{1} + return fileDescriptor_f9524a427f219917, []int{1} } func (m *QueryParamsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -122,7 +122,7 @@ func (m *QueryFailuresRequest) Reset() { *m = QueryFailuresRequest{} } func (m *QueryFailuresRequest) String() string { return proto.CompactTextString(m) } func (*QueryFailuresRequest) ProtoMessage() {} func (*QueryFailuresRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_bcfc7f6aef8ad109, []int{2} + return fileDescriptor_f9524a427f219917, []int{2} } func (m *QueryFailuresRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -174,7 +174,7 @@ func (m *QueryFailuresResponse) Reset() { *m = QueryFailuresResponse{} } func (m *QueryFailuresResponse) String() string { return proto.CompactTextString(m) } func (*QueryFailuresResponse) ProtoMessage() {} func (*QueryFailuresResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_bcfc7f6aef8ad109, []int{3} + return fileDescriptor_f9524a427f219917, []int{3} } func (m *QueryFailuresResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -224,40 +224,42 @@ func init() { proto.RegisterType((*QueryFailuresResponse)(nil), "neutron.contractmanager.QueryFailuresResponse") } -func init() { proto.RegisterFile("contractmanager/query.proto", fileDescriptor_bcfc7f6aef8ad109) } +func init() { + proto.RegisterFile("neutron/contractmanager/query.proto", fileDescriptor_f9524a427f219917) +} -var fileDescriptor_bcfc7f6aef8ad109 = []byte{ - // 477 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x93, 0x41, 0x6f, 0xd3, 0x30, - 0x14, 0xc7, 0xeb, 0x0d, 0xca, 0xf0, 0x0e, 0x48, 0xa6, 0x88, 0x28, 0x40, 0xda, 0x05, 0x89, 0x0d, - 0x46, 0x6d, 0xad, 0x93, 0xb8, 0x71, 0xa0, 0x87, 0x71, 0x2d, 0x11, 0x27, 0x6e, 0x4e, 0x66, 0x4c, - 0xa4, 0xc5, 0xce, 0x6c, 0x07, 0x6d, 0x42, 0x5c, 0x38, 0x73, 0x40, 0x82, 0x8f, 0x00, 0xdf, 0x65, - 0xc7, 0x49, 0x08, 0x89, 0x13, 0x42, 0x2d, 0x1f, 0x04, 0xd5, 0x76, 0xc6, 0xc8, 0x16, 0xd6, 0x13, - 0xb7, 0xd6, 0x7e, 0xff, 0xff, 0xfb, 0xbd, 0xff, 0x73, 0xe0, 0xad, 0x4c, 0x0a, 0xa3, 0x68, 0x66, - 0x0a, 0x2a, 0x28, 0x67, 0x8a, 0xec, 0x57, 0x4c, 0x1d, 0xe2, 0x52, 0x49, 0x23, 0xd1, 0x4d, 0xc1, - 0x2a, 0xa3, 0xa4, 0xc0, 0x8d, 0xa2, 0xb0, 0xc7, 0x25, 0x97, 0xb6, 0x86, 0xcc, 0x7f, 0xb9, 0xf2, - 0xf0, 0x36, 0x97, 0x92, 0xef, 0x31, 0x42, 0xcb, 0x9c, 0x50, 0x21, 0xa4, 0xa1, 0x26, 0x97, 0x42, - 0xfb, 0xdb, 0x07, 0x99, 0xd4, 0x85, 0xd4, 0x24, 0xa5, 0x9a, 0xb9, 0x2e, 0xe4, 0xf5, 0x56, 0xca, - 0x0c, 0xdd, 0x22, 0x25, 0xe5, 0xb9, 0xb0, 0xc5, 0xb5, 0x53, 0x93, 0xaa, 0xa4, 0x8a, 0x16, 0xb5, - 0xd3, 0x9d, 0xe6, 0x2d, 0x67, 0x82, 0xe9, 0xdc, 0x5f, 0xc7, 0x3d, 0x88, 0x9e, 0xcd, 0xed, 0x27, - 0x56, 0x93, 0xb0, 0xfd, 0x8a, 0x69, 0x13, 0x3f, 0x87, 0xd7, 0xff, 0x3a, 0xd5, 0xa5, 0x14, 0x9a, - 0xa1, 0xc7, 0xb0, 0xeb, 0xbc, 0x03, 0x30, 0x00, 0x1b, 0xab, 0xa3, 0x3e, 0x6e, 0x99, 0x19, 0x3b, - 0xe1, 0xf8, 0xd2, 0xd1, 0x8f, 0x7e, 0x27, 0xf1, 0xa2, 0xf8, 0x00, 0xf6, 0xac, 0xeb, 0x0e, 0xcd, - 0xf7, 0x2a, 0xc5, 0xea, 0x6e, 0x28, 0x80, 0x57, 0xe8, 0xee, 0xae, 0x62, 0xda, 0xf9, 0x5e, 0x4d, - 0xea, 0xbf, 0x68, 0x07, 0xc2, 0x3f, 0xe3, 0x06, 0x4b, 0xb6, 0xe9, 0x3d, 0xec, 0xb2, 0xc1, 0xf3, - 0x6c, 0xb0, 0xdb, 0x80, 0xcf, 0x06, 0x4f, 0x28, 0x67, 0xde, 0x35, 0x39, 0xa5, 0x8c, 0x3f, 0x03, - 0x78, 0xa3, 0xd1, 0xda, 0x8f, 0x34, 0x86, 0x2b, 0x2f, 0xfd, 0x59, 0x00, 0x06, 0xcb, 0x1b, 0xab, - 0xa3, 0x41, 0xeb, 0x50, 0x5e, 0xec, 0xa7, 0x3a, 0xd1, 0xa1, 0xa7, 0xe7, 0x50, 0xae, 0x5f, 0x48, - 0xe9, 0x00, 0x4e, 0x63, 0x8e, 0xbe, 0x2d, 0xc3, 0xcb, 0x16, 0x13, 0xbd, 0x07, 0xb0, 0xeb, 0x32, - 0x44, 0x9b, 0xad, 0x3c, 0x67, 0x17, 0x17, 0x3e, 0x5c, 0xac, 0xd8, 0xf5, 0x8e, 0xd7, 0xdf, 0x7d, - 0xfd, 0xf5, 0x71, 0x69, 0x0d, 0xf5, 0x89, 0x57, 0x91, 0xf3, 0x9f, 0x12, 0xfa, 0x02, 0xe0, 0xb5, - 0x27, 0x6e, 0x27, 0x75, 0x82, 0x68, 0xf8, 0xef, 0x56, 0x8d, 0x25, 0x87, 0x78, 0xd1, 0x72, 0xcf, - 0xb6, 0x6d, 0xd9, 0x86, 0x68, 0xb3, 0x95, 0xad, 0xce, 0x9f, 0xbc, 0xf1, 0xcf, 0xe5, 0x2d, 0xfa, - 0x04, 0xe0, 0xca, 0xff, 0x02, 0xbc, 0x6f, 0x01, 0xef, 0xa2, 0xb5, 0x0b, 0x01, 0xc7, 0x93, 0xa3, - 0x69, 0x04, 0x8e, 0xa7, 0x11, 0xf8, 0x39, 0x8d, 0xc0, 0x87, 0x59, 0xd4, 0x39, 0x9e, 0x45, 0x9d, - 0xef, 0xb3, 0xa8, 0xf3, 0xe2, 0x11, 0xcf, 0xcd, 0xab, 0x2a, 0xc5, 0x99, 0x2c, 0x6a, 0x9b, 0xa1, - 0x54, 0xfc, 0xc4, 0xf2, 0xe0, 0x8c, 0xa9, 0x39, 0x2c, 0x99, 0x4e, 0xbb, 0xf6, 0xeb, 0xdd, 0xfe, - 0x1d, 0x00, 0x00, 0xff, 0xff, 0x09, 0xf1, 0xd1, 0xf5, 0x92, 0x04, 0x00, 0x00, +var fileDescriptor_f9524a427f219917 = []byte{ + // 478 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x93, 0x31, 0x6f, 0xd4, 0x30, + 0x14, 0xc7, 0xe3, 0x16, 0x8e, 0xe2, 0x0e, 0x48, 0xe6, 0x10, 0x51, 0x84, 0x72, 0xd7, 0x14, 0x68, + 0xa1, 0x9c, 0xad, 0x5e, 0x25, 0x36, 0x06, 0x6e, 0x28, 0xeb, 0x11, 0x31, 0xb1, 0x39, 0xa9, 0x31, + 0x91, 0x1a, 0x3b, 0xb5, 0x1d, 0xd4, 0x0a, 0xb1, 0x30, 0x33, 0x20, 0xc1, 0x47, 0x80, 0xef, 0xd2, + 0xb1, 0x12, 0x42, 0x62, 0x42, 0xe8, 0x8e, 0x0f, 0x82, 0xce, 0x76, 0x4a, 0xb9, 0x92, 0xb6, 0x53, + 0xb7, 0xc4, 0xf9, 0xbf, 0xf7, 0xff, 0xbd, 0xff, 0x73, 0xe0, 0xaa, 0x60, 0xb5, 0x51, 0x52, 0x90, + 0x5c, 0x0a, 0xa3, 0x68, 0x6e, 0x4a, 0x2a, 0x28, 0x67, 0x8a, 0xec, 0xd5, 0x4c, 0x1d, 0xe0, 0x4a, + 0x49, 0x23, 0xd1, 0x6d, 0x2f, 0xc2, 0x73, 0xa2, 0xa8, 0xcb, 0x25, 0x97, 0x56, 0x43, 0x66, 0x4f, + 0x4e, 0x1e, 0xdd, 0xe1, 0x52, 0xf2, 0x5d, 0x46, 0x68, 0x55, 0x10, 0x2a, 0x84, 0x34, 0xd4, 0x14, + 0x52, 0x68, 0xff, 0xf5, 0x61, 0x2e, 0x75, 0x29, 0x35, 0xc9, 0xa8, 0x66, 0xce, 0x85, 0xbc, 0xd9, + 0xcc, 0x98, 0xa1, 0x9b, 0xa4, 0xa2, 0xbc, 0x10, 0x56, 0xec, 0xb5, 0x77, 0xdb, 0xe8, 0x2a, 0xaa, + 0x68, 0xd9, 0x74, 0xbc, 0xd7, 0xa6, 0xe2, 0x4c, 0x30, 0x5d, 0x78, 0x59, 0xd2, 0x85, 0xe8, 0xf9, + 0xcc, 0x6e, 0x6c, 0x6b, 0x53, 0xb6, 0x57, 0x33, 0x6d, 0x92, 0x17, 0xf0, 0xe6, 0x3f, 0xa7, 0xba, + 0x92, 0x42, 0x33, 0xf4, 0x04, 0x76, 0x9c, 0x47, 0x08, 0xfa, 0x60, 0x7d, 0x79, 0xd8, 0xc3, 0x2d, + 0x19, 0x60, 0x57, 0x38, 0xba, 0x72, 0xf8, 0xb3, 0x17, 0xa4, 0xbe, 0x28, 0xd9, 0x87, 0x5d, 0xdb, + 0x75, 0x9b, 0x16, 0xbb, 0xb5, 0x62, 0x8d, 0x1b, 0x0a, 0xe1, 0x35, 0xba, 0xb3, 0xa3, 0x98, 0x76, + 0x7d, 0xaf, 0xa7, 0xcd, 0x2b, 0xda, 0x86, 0xf0, 0xef, 0xf8, 0xe1, 0x82, 0x35, 0xbd, 0x8f, 0x5d, + 0x56, 0x78, 0x96, 0x15, 0x76, 0x1b, 0xf1, 0x59, 0xe1, 0x31, 0xe5, 0xcc, 0x77, 0x4d, 0x4f, 0x54, + 0x26, 0x5f, 0x00, 0xbc, 0x35, 0x67, 0xed, 0x47, 0x1a, 0xc1, 0xa5, 0x57, 0xfe, 0x2c, 0x04, 0xfd, + 0xc5, 0xf5, 0xe5, 0x61, 0xbf, 0x75, 0x28, 0x5f, 0xec, 0xa7, 0x3a, 0xae, 0x43, 0xcf, 0xfe, 0x43, + 0xb9, 0x76, 0x2e, 0xa5, 0x03, 0x38, 0x89, 0x39, 0xfc, 0xbe, 0x08, 0xaf, 0x5a, 0x4c, 0xf4, 0x01, + 0xc0, 0x8e, 0xcb, 0x10, 0x6d, 0xb4, 0xf2, 0x9c, 0x5e, 0x5c, 0xf4, 0xe8, 0x62, 0x62, 0xe7, 0x9d, + 0xac, 0xbd, 0xff, 0xf6, 0xfb, 0xd3, 0xc2, 0x0a, 0xea, 0x91, 0xb3, 0xaf, 0x14, 0xfa, 0x0a, 0xe0, + 0x8d, 0xa7, 0x6e, 0x27, 0x4d, 0x82, 0x68, 0x70, 0xb6, 0xd5, 0xdc, 0x92, 0x23, 0x7c, 0x51, 0xb9, + 0x67, 0xdb, 0xb2, 0x6c, 0x03, 0xb4, 0xd1, 0xca, 0xd6, 0xe4, 0x4f, 0xde, 0xfa, 0xeb, 0xf2, 0x0e, + 0x7d, 0x06, 0x70, 0xe9, 0xb2, 0x00, 0x1f, 0x58, 0xc0, 0x55, 0xb4, 0x72, 0x2e, 0xe0, 0x68, 0x7c, + 0x38, 0x89, 0xc1, 0xd1, 0x24, 0x06, 0xbf, 0x26, 0x31, 0xf8, 0x38, 0x8d, 0x83, 0xa3, 0x69, 0x1c, + 0xfc, 0x98, 0xc6, 0xc1, 0xcb, 0xc7, 0xbc, 0x30, 0xaf, 0xeb, 0x0c, 0xe7, 0xb2, 0x6c, 0xda, 0x0c, + 0xa4, 0xe2, 0xc7, 0x2d, 0xf7, 0x4f, 0x35, 0x35, 0x07, 0x15, 0xd3, 0x59, 0xc7, 0xfe, 0xbd, 0x5b, + 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0xfd, 0xbf, 0xad, 0xfd, 0xaa, 0x04, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -415,7 +417,7 @@ var _Query_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "contractmanager/query.proto", + Metadata: "neutron/contractmanager/query.proto", } func (m *QueryParamsRequest) Marshal() (dAtA []byte, err error) { diff --git a/x/contractmanager/types/query.pb.gw.go b/x/contractmanager/types/query.pb.gw.go index ef0703698..53090c4e2 100644 --- a/x/contractmanager/types/query.pb.gw.go +++ b/x/contractmanager/types/query.pb.gw.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-grpc-gateway. DO NOT EDIT. -// source: contractmanager/query.proto +// source: neutron/contractmanager/query.proto /* Package types is a reverse proxy. @@ -339,11 +339,11 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } var ( - pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"neutron", "contractmanager", "params"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"neutron", "contractmanager", "params"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_AddressFailures_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"neutron", "contractmanager", "failures", "address"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_AddressFailures_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"neutron", "contractmanager", "failures", "address"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_Failures_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"neutron", "contractmanager", "failures"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_Failures_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"neutron", "contractmanager", "failures"}, "", runtime.AssumeColonVerbOpt(false))) ) var ( diff --git a/x/contractmanager/types/sudo.go b/x/contractmanager/types/sudo.go index 21f57b31e..c0564d82a 100644 --- a/x/contractmanager/types/sudo.go +++ b/x/contractmanager/types/sudo.go @@ -1,8 +1,8 @@ package types import ( - ibcclienttypes "github.com/cosmos/ibc-go/v4/modules/core/02-client/types" - channeltypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" + ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" + channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" ) const TransferPort = "transfer" diff --git a/x/cron/client/cli/query_schedule_test.go b/x/cron/client/cli/query_schedule_test.go index 6864b8c95..37f946848 100644 --- a/x/cron/client/cli/query_schedule_test.go +++ b/x/cron/client/cli/query_schedule_test.go @@ -5,6 +5,7 @@ import ( "strconv" "testing" + tmcli "github.com/cometbft/cometbft/libs/cli" "github.com/cosmos/cosmos-sdk/client/flags" clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli" "github.com/neutron-org/neutron/testutil/cron/network" @@ -12,7 +13,6 @@ import ( "github.com/neutron-org/neutron/x/cron/client/cli" "github.com/neutron-org/neutron/x/cron/types" "github.com/stretchr/testify/require" - tmcli "github.com/tendermint/tendermint/libs/cli" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/cron/keeper/keeper.go b/x/cron/keeper/keeper.go index 81c5b41ed..688b14e83 100644 --- a/x/cron/keeper/keeper.go +++ b/x/cron/keeper/keeper.go @@ -2,21 +2,21 @@ package keeper import ( "fmt" + "github.com/armon/go-metrics" "strconv" "time" - "github.com/armon/go-metrics" "github.com/cosmos/cosmos-sdk/telemetry" wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" "github.com/cosmos/cosmos-sdk/store/prefix" + "github.com/cometbft/cometbft/libs/log" "github.com/cosmos/cosmos-sdk/codec" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" "github.com/neutron-org/neutron/x/cron/types" - "github.com/tendermint/tendermint/libs/log" ) var ( diff --git a/x/cron/module.go b/x/cron/module.go index d0d4a5667..8b01aca50 100644 --- a/x/cron/module.go +++ b/x/cron/module.go @@ -2,6 +2,7 @@ package cron import ( "context" + "cosmossdk.io/core/appmodule" "encoding/json" "fmt" @@ -12,7 +13,7 @@ import ( "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" - abci "github.com/tendermint/tendermint/abci/types" + abci "github.com/cometbft/cometbft/abci/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" @@ -94,6 +95,8 @@ func (AppModuleBasic) GetQueryCmd() *cobra.Command { // AppModule // ---------------------------------------------------------------------------- +var _ appmodule.AppModule = AppModule{} + // AppModule implements the AppModule interface that defines the inter-dependent methods that modules need to implement type AppModule struct { AppModuleBasic @@ -111,16 +114,16 @@ func NewAppModule( } } -// Deprecated: use RegisterServices -func (am AppModule) Route() sdk.Route { return sdk.Route{} } +// IsOnePerModuleType implements the depinject.OnePerModuleType interface. +func (am AppModule) IsOnePerModuleType() { // marker +} -// Deprecated: use RegisterServices -func (AppModule) QuerierRoute() string { return types.RouterKey } +// IsAppModule implements the appmodule.AppModule interface. +func (am AppModule) IsAppModule() { // marker +} // Deprecated: use RegisterServices -func (am AppModule) LegacyQuerierHandler(_ *codec.LegacyAmino) sdk.Querier { - return nil -} +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) { diff --git a/x/cron/module_simulation.go b/x/cron/module_simulation.go index f1ed766f3..45f4ace31 100644 --- a/x/cron/module_simulation.go +++ b/x/cron/module_simulation.go @@ -1,10 +1,8 @@ package cron import ( - "math/rand" - "github.com/cosmos/cosmos-sdk/baseapp" - simappparams "github.com/cosmos/cosmos-sdk/simapp/params" + "github.com/cosmos/cosmos-sdk/testutil/sims" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" @@ -16,7 +14,7 @@ import ( // avoid unused import issue var ( _ = cronsimulation.FindAccount - _ = simappparams.StakePerAccount + _ = sims.StakePerAccount _ = simulation.MsgEntryKind _ = baseapp.Paramspace ) @@ -42,11 +40,6 @@ func (AppModule) ProposalContents(_ module.SimulationState) []simtypes.WeightedP return nil } -// RandomizedParams creates randomized param changes for the simulator -func (am AppModule) RandomizedParams(_ *rand.Rand) []simtypes.ParamChange { - return []simtypes.ParamChange{} -} - // RegisterStoreDecoder registers a decoder func (am AppModule) RegisterStoreDecoder(_ sdk.StoreDecoderRegistry) {} diff --git a/x/cron/types/genesis.pb.go b/x/cron/types/genesis.pb.go index eeccc651b..8d710d18a 100644 --- a/x/cron/types/genesis.pb.go +++ b/x/cron/types/genesis.pb.go @@ -1,12 +1,12 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: cron/genesis.proto +// source: neutron/cron/genesis.proto package types import ( fmt "fmt" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" @@ -33,7 +33,7 @@ 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_0c58acd1c2bcdf4f, []int{0} + return fileDescriptor_7c41f2dea8ad83c2, []int{0} } func (m *GenesisState) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -80,25 +80,25 @@ func init() { proto.RegisterType((*GenesisState)(nil), "neutron.cron.GenesisState") } -func init() { proto.RegisterFile("cron/genesis.proto", fileDescriptor_0c58acd1c2bcdf4f) } +func init() { proto.RegisterFile("neutron/cron/genesis.proto", fileDescriptor_7c41f2dea8ad83c2) } -var fileDescriptor_0c58acd1c2bcdf4f = []byte{ +var fileDescriptor_7c41f2dea8ad83c2 = []byte{ // 228 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x4a, 0x2e, 0xca, 0xcf, - 0xd3, 0x4f, 0x4f, 0xcd, 0x4b, 0x2d, 0xce, 0x2c, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, - 0xc9, 0x4b, 0x2d, 0x2d, 0x29, 0xca, 0xcf, 0xd3, 0x03, 0xc9, 0x49, 0x89, 0xa4, 0xe7, 0xa7, 0xe7, - 0x83, 0x25, 0xf4, 0x41, 0x2c, 0x88, 0x1a, 0x29, 0x41, 0xb0, 0xbe, 0x82, 0xc4, 0xa2, 0xc4, 0x5c, - 0xa8, 0x36, 0x29, 0x61, 0xb0, 0x50, 0x71, 0x72, 0x46, 0x6a, 0x4a, 0x69, 0x4e, 0x2a, 0x44, 0x50, - 0xa9, 0x85, 0x91, 0x8b, 0xc7, 0x1d, 0x62, 0x7a, 0x70, 0x49, 0x62, 0x49, 0xaa, 0x90, 0x03, 0x17, - 0x0f, 0x4c, 0x89, 0x4f, 0x66, 0x71, 0x89, 0x04, 0x93, 0x02, 0xb3, 0x06, 0xb7, 0x91, 0x98, 0x1e, - 0xb2, 0x9d, 0x7a, 0xc1, 0x50, 0x15, 0x4e, 0x2c, 0x27, 0xee, 0xc9, 0x33, 0x04, 0xa1, 0xe8, 0x10, - 0x32, 0xe2, 0x62, 0x83, 0xd8, 0x2b, 0xc1, 0xa8, 0xc0, 0xa8, 0xc1, 0x6d, 0x24, 0x82, 0xaa, 0x37, - 0x00, 0x2c, 0x07, 0xd5, 0x09, 0x55, 0xe9, 0xe4, 0x7a, 0xe2, 0x91, 0x1c, 0xe3, 0x85, 0x47, 0x72, - 0x8c, 0x0f, 0x1e, 0xc9, 0x31, 0x4e, 0x78, 0x2c, 0xc7, 0x70, 0xe1, 0xb1, 0x1c, 0xc3, 0x8d, 0xc7, - 0x72, 0x0c, 0x51, 0xda, 0xe9, 0x99, 0x25, 0x19, 0xa5, 0x49, 0x7a, 0xc9, 0xf9, 0xb9, 0xfa, 0x50, - 0x73, 0x74, 0xf3, 0x8b, 0xd2, 0x61, 0x6c, 0xfd, 0x0a, 0x7d, 0xb0, 0xb7, 0x4a, 0x2a, 0x0b, 0x52, - 0x8b, 0x93, 0xd8, 0xc0, 0x9e, 0x32, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0x57, 0xaa, 0x3f, 0x21, - 0x36, 0x01, 0x00, 0x00, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xca, 0x4b, 0x2d, 0x2d, + 0x29, 0xca, 0xcf, 0xd3, 0x4f, 0x06, 0x11, 0xe9, 0xa9, 0x79, 0xa9, 0xc5, 0x99, 0xc5, 0x7a, 0x05, + 0x45, 0xf9, 0x25, 0xf9, 0x42, 0x3c, 0x50, 0x39, 0x3d, 0x90, 0x9c, 0x94, 0x48, 0x7a, 0x7e, 0x7a, + 0x3e, 0x58, 0x42, 0x1f, 0xc4, 0x82, 0xa8, 0x91, 0x92, 0x44, 0xd1, 0x5f, 0x90, 0x58, 0x94, 0x98, + 0x0b, 0xd5, 0x2e, 0x25, 0x8d, 0x22, 0x55, 0x9c, 0x9c, 0x91, 0x9a, 0x52, 0x9a, 0x93, 0x0a, 0x91, + 0x54, 0x6a, 0x61, 0xe4, 0xe2, 0x71, 0x87, 0xd8, 0x16, 0x5c, 0x92, 0x58, 0x92, 0x2a, 0xe4, 0xc0, + 0xc5, 0x03, 0x53, 0xe2, 0x93, 0x59, 0x5c, 0x22, 0xc1, 0xa4, 0xc0, 0xac, 0xc1, 0x6d, 0x24, 0xa6, + 0x87, 0xec, 0x06, 0xbd, 0x60, 0xa8, 0x0a, 0x27, 0x96, 0x13, 0xf7, 0xe4, 0x19, 0x82, 0x50, 0x74, + 0x08, 0x19, 0x71, 0xb1, 0x41, 0xec, 0x97, 0x60, 0x54, 0x60, 0xd4, 0xe0, 0x36, 0x12, 0x41, 0xd5, + 0x1b, 0x00, 0x96, 0x83, 0xea, 0x84, 0xaa, 0x74, 0x72, 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, 0xed, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0x7d, + 0xa8, 0x39, 0xba, 0xf9, 0x45, 0xe9, 0x30, 0xb6, 0x7e, 0x05, 0xc4, 0x5b, 0x25, 0x95, 0x05, 0xa9, + 0xc5, 0x49, 0x6c, 0x60, 0x4f, 0x19, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x91, 0x3a, 0xa2, 0x0f, + 0x4e, 0x01, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/cron/types/params.pb.go b/x/cron/types/params.pb.go index 54321ca1e..128e63f28 100644 --- a/x/cron/types/params.pb.go +++ b/x/cron/types/params.pb.go @@ -1,12 +1,12 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: cron/params.proto +// source: neutron/cron/params.proto package types import ( fmt "fmt" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" @@ -34,7 +34,7 @@ type Params struct { func (m *Params) Reset() { *m = Params{} } func (*Params) ProtoMessage() {} func (*Params) Descriptor() ([]byte, []int) { - return fileDescriptor_1c8bf79b449ebe44, []int{0} + return fileDescriptor_efa4f5c14a68f6e5, []int{0} } func (m *Params) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -81,22 +81,22 @@ func init() { proto.RegisterType((*Params)(nil), "neutron.cron.Params") } -func init() { proto.RegisterFile("cron/params.proto", fileDescriptor_1c8bf79b449ebe44) } +func init() { proto.RegisterFile("neutron/cron/params.proto", fileDescriptor_efa4f5c14a68f6e5) } -var fileDescriptor_1c8bf79b449ebe44 = []byte{ +var fileDescriptor_efa4f5c14a68f6e5 = []byte{ // 195 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x4c, 0x2e, 0xca, 0xcf, - 0xd3, 0x2f, 0x48, 0x2c, 0x4a, 0xcc, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0xc9, - 0x4b, 0x2d, 0x2d, 0x29, 0xca, 0xcf, 0xd3, 0x03, 0x49, 0x49, 0x89, 0xa4, 0xe7, 0xa7, 0xe7, 0x83, - 0x25, 0xf4, 0x41, 0x2c, 0x88, 0x1a, 0x25, 0x7f, 0x2e, 0xb6, 0x00, 0xb0, 0x1e, 0x21, 0x4d, 0x2e, - 0x81, 0xe2, 0xd4, 0xe4, 0xd2, 0xa2, 0xcc, 0x92, 0xca, 0xf8, 0xc4, 0x94, 0x94, 0xa2, 0xd4, 0xe2, - 0x62, 0x09, 0x46, 0x05, 0x46, 0x0d, 0xce, 0x20, 0x7e, 0x98, 0xb8, 0x23, 0x44, 0x58, 0x48, 0x84, - 0x8b, 0x35, 0x27, 0x33, 0x37, 0xb3, 0x44, 0x82, 0x49, 0x81, 0x51, 0x83, 0x25, 0x08, 0xc2, 0xb1, - 0x62, 0x99, 0xb1, 0x40, 0x9e, 0xc1, 0xc9, 0xf5, 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, 0xb4, 0xd3, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xf5, 0xa1, 0x2e, - 0xd3, 0xcd, 0x2f, 0x4a, 0x87, 0xb1, 0xf5, 0x2b, 0xf4, 0xc1, 0x5e, 0x28, 0xa9, 0x2c, 0x48, 0x2d, - 0x4e, 0x62, 0x03, 0x3b, 0xcf, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0x94, 0x8d, 0x0a, 0xb1, 0xd7, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xcc, 0x4b, 0x2d, 0x2d, + 0x29, 0xca, 0xcf, 0xd3, 0x4f, 0x06, 0x11, 0x05, 0x89, 0x45, 0x89, 0xb9, 0xc5, 0x7a, 0x05, 0x45, + 0xf9, 0x25, 0xf9, 0x42, 0x3c, 0x50, 0x29, 0x3d, 0x90, 0x94, 0x94, 0x48, 0x7a, 0x7e, 0x7a, 0x3e, + 0x58, 0x42, 0x1f, 0xc4, 0x82, 0xa8, 0x51, 0xf2, 0xe7, 0x62, 0x0b, 0x00, 0xeb, 0x11, 0xd2, 0xe4, + 0x12, 0x28, 0x4e, 0x4d, 0x2e, 0x2d, 0xca, 0x2c, 0xa9, 0x8c, 0x4f, 0x4c, 0x49, 0x29, 0x4a, 0x2d, + 0x2e, 0x96, 0x60, 0x54, 0x60, 0xd4, 0xe0, 0x0c, 0xe2, 0x87, 0x89, 0x3b, 0x42, 0x84, 0x85, 0x44, + 0xb8, 0x58, 0x73, 0x32, 0x73, 0x33, 0x4b, 0x24, 0x98, 0x14, 0x18, 0x35, 0x58, 0x82, 0x20, 0x1c, + 0x2b, 0x96, 0x19, 0x0b, 0xe4, 0x19, 0x9c, 0x5c, 0x4f, 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, 0x3b, 0x3d, 0xb3, 0x24, 0xa3, 0x34, 0x49, 0x2f, 0x39, 0x3f, 0x57, 0x1f, 0xea, + 0x32, 0xdd, 0xfc, 0xa2, 0x74, 0x18, 0x5b, 0xbf, 0x02, 0xe2, 0x85, 0x92, 0xca, 0x82, 0xd4, 0xe2, + 0x24, 0x36, 0xb0, 0xf3, 0x8c, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x68, 0xd5, 0xf8, 0x81, 0xdf, 0x00, 0x00, 0x00, } diff --git a/x/cron/types/query.pb.go b/x/cron/types/query.pb.go index 8d554a34f..7998c0d71 100644 --- a/x/cron/types/query.pb.go +++ b/x/cron/types/query.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: cron/query.proto +// source: neutron/cron/query.proto package types @@ -7,9 +7,9 @@ import ( context "context" fmt "fmt" query "github.com/cosmos/cosmos-sdk/types/query" - _ "github.com/gogo/protobuf/gogoproto" - grpc1 "github.com/gogo/protobuf/grpc" - proto "github.com/gogo/protobuf/proto" + _ "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" @@ -37,7 +37,7 @@ 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_aa4b81a2a4395683, []int{0} + return fileDescriptor_e02f33367c9498fe, []int{0} } func (m *QueryParamsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -75,7 +75,7 @@ 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_aa4b81a2a4395683, []int{1} + return fileDescriptor_e02f33367c9498fe, []int{1} } func (m *QueryParamsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -119,7 +119,7 @@ func (m *QueryGetScheduleRequest) Reset() { *m = QueryGetScheduleRequest func (m *QueryGetScheduleRequest) String() string { return proto.CompactTextString(m) } func (*QueryGetScheduleRequest) ProtoMessage() {} func (*QueryGetScheduleRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_aa4b81a2a4395683, []int{2} + return fileDescriptor_e02f33367c9498fe, []int{2} } func (m *QueryGetScheduleRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -163,7 +163,7 @@ func (m *QueryGetScheduleResponse) Reset() { *m = QueryGetScheduleRespon func (m *QueryGetScheduleResponse) String() string { return proto.CompactTextString(m) } func (*QueryGetScheduleResponse) ProtoMessage() {} func (*QueryGetScheduleResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_aa4b81a2a4395683, []int{3} + return fileDescriptor_e02f33367c9498fe, []int{3} } func (m *QueryGetScheduleResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -207,7 +207,7 @@ func (m *QuerySchedulesRequest) Reset() { *m = QuerySchedulesRequest{} } func (m *QuerySchedulesRequest) String() string { return proto.CompactTextString(m) } func (*QuerySchedulesRequest) ProtoMessage() {} func (*QuerySchedulesRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_aa4b81a2a4395683, []int{4} + return fileDescriptor_e02f33367c9498fe, []int{4} } func (m *QuerySchedulesRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -252,7 +252,7 @@ func (m *QuerySchedulesResponse) Reset() { *m = QuerySchedulesResponse{} func (m *QuerySchedulesResponse) String() string { return proto.CompactTextString(m) } func (*QuerySchedulesResponse) ProtoMessage() {} func (*QuerySchedulesResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_aa4b81a2a4395683, []int{5} + return fileDescriptor_e02f33367c9498fe, []int{5} } func (m *QuerySchedulesResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -304,41 +304,41 @@ func init() { proto.RegisterType((*QuerySchedulesResponse)(nil), "neutron.cron.QuerySchedulesResponse") } -func init() { proto.RegisterFile("cron/query.proto", fileDescriptor_aa4b81a2a4395683) } +func init() { proto.RegisterFile("neutron/cron/query.proto", fileDescriptor_e02f33367c9498fe) } -var fileDescriptor_aa4b81a2a4395683 = []byte{ - // 494 bytes of a gzipped FileDescriptorProto +var fileDescriptor_e02f33367c9498fe = []byte{ + // 493 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, 0x41, 0x5f, 0x63, 0x0c, 0x4b, 0xdd, 0xd6, 0xd5, 0x56, - 0x51, 0x3a, 0x43, 0xe3, 0x45, 0x3c, 0x16, 0xb4, 0x78, 0xab, 0xd1, 0x93, 0x17, 0x99, 0xc4, 0x61, - 0x1b, 0x6c, 0x66, 0xb6, 0x3b, 0xb3, 0xc5, 0x22, 0x82, 0xf8, 0x17, 0x08, 0x9e, 0xfd, 0x7f, 0x7a, - 0x2c, 0x78, 0xf1, 0x24, 0x92, 0x78, 0xf7, 0x5f, 0x90, 0x9d, 0x1f, 0xe9, 0x6e, 0x13, 0x92, 0xdb, - 0x32, 0xf3, 0x7d, 0xdf, 0xef, 0x67, 0xde, 0x7b, 0x0b, 0x37, 0x06, 0x99, 0x14, 0xf4, 0x38, 0xe7, - 0xd9, 0x29, 0x49, 0x33, 0xa9, 0x25, 0x5e, 0x17, 0x3c, 0xd7, 0x99, 0x14, 0xa4, 0xb8, 0x09, 0x5b, - 0x89, 0x4c, 0xa4, 0xb9, 0xa0, 0xc5, 0x97, 0xd5, 0x84, 0xeb, 0x89, 0x94, 0xc9, 0x11, 0xa7, 0x2c, - 0x1d, 0x52, 0x26, 0x84, 0xd4, 0x4c, 0x0f, 0xa5, 0x50, 0xee, 0xf6, 0xd1, 0x40, 0xaa, 0x91, 0x54, - 0xb4, 0xcf, 0x14, 0xb7, 0xd6, 0xf4, 0x64, 0xb7, 0xcf, 0x35, 0xdb, 0xa5, 0x29, 0x4b, 0x86, 0xc2, - 0x88, 0x9d, 0xf6, 0xa6, 0xc9, 0x4f, 0x59, 0xc6, 0x46, 0xbe, 0x7c, 0xcd, 0x1c, 0xa9, 0xc1, 0x21, - 0x7f, 0x9f, 0x1f, 0x71, 0x7b, 0x18, 0xb7, 0x00, 0x5f, 0x15, 0x4e, 0x07, 0x46, 0xd9, 0xe3, 0xc7, - 0x39, 0x57, 0x3a, 0x7e, 0x09, 0x6b, 0x95, 0x53, 0x95, 0x4a, 0xa1, 0x38, 0x76, 0xa1, 0x61, 0x1d, - 0x3b, 0xc1, 0x66, 0xf0, 0xf0, 0x5a, 0xb7, 0x45, 0xca, 0x6f, 0x22, 0x56, 0xbd, 0xb7, 0x72, 0xf6, - 0x7b, 0xa3, 0xd6, 0x73, 0xca, 0x78, 0x07, 0x6e, 0x1b, 0xab, 0x7d, 0xae, 0x5f, 0xbb, 0x68, 0x97, - 0x82, 0x08, 0x2b, 0x82, 0x8d, 0xb8, 0x31, 0x6b, 0xf6, 0xcc, 0x77, 0xfc, 0x06, 0x3a, 0xb3, 0x72, - 0x17, 0xff, 0x14, 0x56, 0x3d, 0xbd, 0x03, 0x68, 0x57, 0x01, 0x7c, 0x85, 0x43, 0x98, 0xaa, 0xe3, - 0x77, 0x70, 0xcb, 0xb8, 0x7a, 0x81, 0x7f, 0x28, 0xbe, 0x00, 0xb8, 0x68, 0x9d, 0x33, 0xdd, 0x26, - 0xb6, 0xcf, 0xa4, 0xe8, 0x33, 0xb1, 0x23, 0x74, 0x7d, 0x26, 0x07, 0x2c, 0xf1, 0xf8, 0xbd, 0x52, - 0x65, 0xfc, 0x23, 0x80, 0xf6, 0xe5, 0x04, 0x47, 0xfd, 0x0c, 0x9a, 0x9e, 0xa3, 0xe8, 0xdb, 0x95, - 0xa5, 0xd8, 0x17, 0x72, 0xdc, 0xaf, 0xe0, 0xd5, 0x0d, 0xde, 0x83, 0xa5, 0x78, 0x36, 0xb8, 0xcc, - 0xd7, 0xfd, 0x57, 0x87, 0xab, 0x86, 0x0f, 0x3f, 0x40, 0xc3, 0xce, 0x09, 0x37, 0xab, 0x14, 0xb3, - 0x6b, 0x10, 0xde, 0x5d, 0xa0, 0xb0, 0x21, 0xf1, 0xfa, 0xd7, 0x9f, 0x7f, 0xbf, 0xd7, 0xdb, 0xd8, - 0xa2, 0x4e, 0x4a, 0x4b, 0x8b, 0x87, 0x5f, 0x02, 0x58, 0xf5, 0xaf, 0xc3, 0xad, 0x39, 0x6e, 0xb3, - 0x5b, 0x11, 0x6e, 0x2f, 0x93, 0xb9, 0xe4, 0x2d, 0x93, 0xbc, 0x81, 0x77, 0xaa, 0xc9, 0xbe, 0x79, - 0xf4, 0x53, 0xb1, 0x4f, 0x9f, 0xf1, 0x04, 0x9a, 0xd3, 0x99, 0xe0, 0xbd, 0x39, 0xde, 0x97, 0x77, - 0x22, 0xbc, 0xbf, 0x58, 0xe4, 0xe2, 0x23, 0x13, 0xdf, 0xc1, 0xf6, 0xfc, 0xf8, 0xbd, 0xe7, 0x67, - 0xe3, 0x28, 0x38, 0x1f, 0x47, 0xc1, 0x9f, 0x71, 0x14, 0x7c, 0x9b, 0x44, 0xb5, 0xf3, 0x49, 0x54, - 0xfb, 0x35, 0x89, 0x6a, 0x6f, 0x1f, 0x27, 0x43, 0x7d, 0x98, 0xf7, 0xc9, 0x40, 0x8e, 0x7c, 0xed, - 0x8e, 0xcc, 0x92, 0xa9, 0xcf, 0x47, 0xeb, 0xa4, 0x4f, 0x53, 0xae, 0xfa, 0x0d, 0xf3, 0x9b, 0x3e, - 0xf9, 0x1f, 0x00, 0x00, 0xff, 0xff, 0x7c, 0x50, 0x66, 0xfc, 0x50, 0x04, 0x00, 0x00, + 0x14, 0xc7, 0xb3, 0xb1, 0x86, 0xe6, 0xe9, 0xe9, 0x19, 0x63, 0x5c, 0xeb, 0xb6, 0xae, 0xb6, 0x8a, + 0xd2, 0x19, 0x1a, 0x2f, 0xe2, 0xb1, 0xa0, 0xc5, 0x5b, 0x8d, 0x9e, 0xbc, 0xc8, 0x24, 0x0e, 0xdb, + 0x60, 0x33, 0xb3, 0xdd, 0x99, 0x2d, 0x16, 0x11, 0xc4, 0xbf, 0x40, 0xf0, 0xec, 0xff, 0xd3, 0x63, + 0xc1, 0x8b, 0x27, 0x91, 0xc4, 0xbb, 0xff, 0x42, 0xd9, 0xf9, 0x91, 0x66, 0x9b, 0x25, 0xb9, 0x84, + 0x21, 0xef, 0xfb, 0xbe, 0xdf, 0xcf, 0xbc, 0x79, 0x0b, 0x1d, 0xc1, 0x73, 0x9d, 0x49, 0x41, 0x07, + 0xc5, 0xcf, 0x51, 0xce, 0xb3, 0x13, 0x92, 0x66, 0x52, 0x4b, 0xbc, 0xee, 0x2a, 0xa4, 0xa8, 0x84, + 0xad, 0x44, 0x26, 0xd2, 0x14, 0x68, 0x71, 0xb2, 0x9a, 0x70, 0x2d, 0x91, 0x32, 0x39, 0xe4, 0x94, + 0xa5, 0x43, 0xca, 0x84, 0x90, 0x9a, 0xe9, 0xa1, 0x14, 0xca, 0x55, 0x1f, 0x0f, 0xa4, 0x1a, 0x49, + 0x45, 0xfb, 0x4c, 0x71, 0x6b, 0x4d, 0x8f, 0x77, 0xfa, 0x5c, 0xb3, 0x1d, 0x9a, 0xb2, 0x64, 0x28, + 0x8c, 0xd8, 0x69, 0x6f, 0x97, 0x38, 0x52, 0x96, 0xb1, 0x91, 0xb7, 0xb9, 0x53, 0x2a, 0xa9, 0xc1, + 0x01, 0xff, 0x90, 0x1f, 0x72, 0x5b, 0x8c, 0x5b, 0x80, 0xaf, 0x0b, 0xe7, 0x7d, 0xd3, 0xd1, 0xe3, + 0x47, 0x39, 0x57, 0x3a, 0x7e, 0x05, 0x37, 0x4a, 0xff, 0xaa, 0x54, 0x0a, 0xc5, 0xb1, 0x0b, 0x0d, + 0xeb, 0xdc, 0x09, 0x36, 0x82, 0x47, 0xd7, 0xba, 0x2d, 0x32, 0x7b, 0x47, 0x62, 0xd5, 0xbb, 0x2b, + 0xa7, 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, 0x99, + 0x97, 0xbb, 0xf8, 0x67, 0xb0, 0xea, 0xe9, 0x1d, 0x40, 0xbb, 0x0c, 0xe0, 0x3b, 0x1c, 0xc2, 0x54, + 0x1d, 0xbf, 0x87, 0x9b, 0xc6, 0xd5, 0x0b, 0xfc, 0x45, 0xf1, 0x25, 0xc0, 0xc5, 0x28, 0x9d, 0xe9, + 0x16, 0xb1, 0x73, 0x27, 0xc5, 0xdc, 0x89, 0x7d, 0x52, 0x37, 0x77, 0xb2, 0xcf, 0x12, 0x8f, 0xdf, + 0x9b, 0xe9, 0x8c, 0x7f, 0x06, 0xd0, 0xbe, 0x9c, 0xe0, 0xa8, 0x9f, 0x43, 0xd3, 0x73, 0x14, 0x73, + 0xbb, 0xb2, 0x14, 0xfb, 0x42, 0x8e, 0x7b, 0x25, 0xbc, 0xba, 0xc1, 0x7b, 0xb8, 0x14, 0xcf, 0x06, + 0xcf, 0xf2, 0x75, 0xff, 0xd7, 0xe1, 0xaa, 0xe1, 0xc3, 0x8f, 0xd0, 0xb0, 0xef, 0x84, 0x1b, 0x65, + 0x8a, 0xf9, 0x35, 0x08, 0xef, 0x2d, 0x50, 0xd8, 0x90, 0x78, 0xed, 0xdb, 0xaf, 0x7f, 0x3f, 0xea, + 0x6d, 0x6c, 0xd1, 0x8a, 0x05, 0xc4, 0xaf, 0x01, 0xac, 0xfa, 0xdb, 0xe1, 0x66, 0x85, 0xdb, 0xfc, + 0x56, 0x84, 0x5b, 0xcb, 0x64, 0x2e, 0x79, 0xd3, 0x24, 0xaf, 0xe3, 0x5d, 0x5a, 0xb9, 0xdf, 0xf4, + 0x73, 0xb1, 0x4f, 0x5f, 0xf0, 0x18, 0x9a, 0xd3, 0x37, 0xc1, 0xfb, 0x15, 0xde, 0x97, 0x77, 0x22, + 0x7c, 0xb0, 0x58, 0xe4, 0xe2, 0x23, 0x13, 0xdf, 0xc1, 0x76, 0x75, 0xfc, 0xee, 0x8b, 0xd3, 0x71, + 0x14, 0x9c, 0x8d, 0xa3, 0xe0, 0xef, 0x38, 0x0a, 0xbe, 0x4f, 0xa2, 0xda, 0xd9, 0x24, 0xaa, 0xfd, + 0x9e, 0x44, 0xb5, 0x77, 0x4f, 0x92, 0xa1, 0x3e, 0xc8, 0xfb, 0x64, 0x20, 0x47, 0xbe, 0x77, 0x5b, + 0x66, 0xc9, 0xd4, 0xe7, 0x93, 0x75, 0xd2, 0x27, 0x29, 0x57, 0xfd, 0x86, 0xf9, 0x4c, 0x9f, 0x9e, + 0x07, 0x00, 0x00, 0xff, 0xff, 0x04, 0x51, 0x7a, 0x89, 0x68, 0x04, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -496,7 +496,7 @@ var _Query_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "cron/query.proto", + Metadata: "neutron/cron/query.proto", } func (m *QueryParamsRequest) Marshal() (dAtA []byte, err error) { diff --git a/x/cron/types/query.pb.gw.go b/x/cron/types/query.pb.gw.go index 19145fd03..a3ce24432 100644 --- a/x/cron/types/query.pb.gw.go +++ b/x/cron/types/query.pb.gw.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-grpc-gateway. DO NOT EDIT. -// source: cron/query.proto +// source: neutron/cron/query.proto /* Package types is a reverse proxy. @@ -321,11 +321,11 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } var ( - pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"neutron", "cron", "params"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"neutron", "cron", "params"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_Schedule_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"neutron", "cron", "schedule", "name"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_Schedule_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"neutron", "cron", "schedule", "name"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_Schedules_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"neutron", "cron", "schedule"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_Schedules_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"neutron", "cron", "schedule"}, "", runtime.AssumeColonVerbOpt(false))) ) var ( diff --git a/x/cron/types/schedule.pb.go b/x/cron/types/schedule.pb.go index 187fcad1d..f0206d02c 100644 --- a/x/cron/types/schedule.pb.go +++ b/x/cron/types/schedule.pb.go @@ -1,12 +1,12 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: cron/schedule.proto +// source: neutron/cron/schedule.proto package types import ( fmt "fmt" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" @@ -38,7 +38,7 @@ func (m *Schedule) Reset() { *m = Schedule{} } func (m *Schedule) String() string { return proto.CompactTextString(m) } func (*Schedule) ProtoMessage() {} func (*Schedule) Descriptor() ([]byte, []int) { - return fileDescriptor_b6a5569ec6e2056c, []int{0} + return fileDescriptor_49ace1b59de613ef, []int{0} } func (m *Schedule) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -106,7 +106,7 @@ func (m *MsgExecuteContract) Reset() { *m = MsgExecuteContract{} } func (m *MsgExecuteContract) String() string { return proto.CompactTextString(m) } func (*MsgExecuteContract) ProtoMessage() {} func (*MsgExecuteContract) Descriptor() ([]byte, []int) { - return fileDescriptor_b6a5569ec6e2056c, []int{1} + return fileDescriptor_49ace1b59de613ef, []int{1} } func (m *MsgExecuteContract) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -158,7 +158,7 @@ func (m *ScheduleCount) Reset() { *m = ScheduleCount{} } func (m *ScheduleCount) String() string { return proto.CompactTextString(m) } func (*ScheduleCount) ProtoMessage() {} func (*ScheduleCount) Descriptor() ([]byte, []int) { - return fileDescriptor_b6a5569ec6e2056c, []int{2} + return fileDescriptor_49ace1b59de613ef, []int{2} } func (m *ScheduleCount) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -200,29 +200,30 @@ func init() { proto.RegisterType((*ScheduleCount)(nil), "neutron.cron.ScheduleCount") } -func init() { proto.RegisterFile("cron/schedule.proto", fileDescriptor_b6a5569ec6e2056c) } - -var fileDescriptor_b6a5569ec6e2056c = []byte{ - // 304 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x91, 0x41, 0x4b, 0xc3, 0x30, - 0x14, 0xc7, 0x1b, 0xd7, 0x8d, 0x2d, 0x2a, 0x68, 0x36, 0xa4, 0xec, 0x10, 0xcb, 0x40, 0x18, 0x88, - 0x29, 0xe8, 0xcd, 0x63, 0xc7, 0xc0, 0x8b, 0x97, 0x7a, 0xf3, 0x32, 0xba, 0x2c, 0xa4, 0x85, 0x35, - 0x29, 0x49, 0x0a, 0xf3, 0x5b, 0xf8, 0x19, 0xfc, 0x34, 0x3b, 0xee, 0xe8, 0x49, 0xa4, 0xfd, 0x22, - 0xd2, 0x34, 0x13, 0xc1, 0xdb, 0xef, 0xcf, 0xff, 0xfd, 0xf3, 0xde, 0xcb, 0x83, 0x63, 0xaa, 0xa4, - 0x88, 0x34, 0xcd, 0xd8, 0xa6, 0xda, 0x32, 0x52, 0x2a, 0x69, 0x24, 0x3a, 0x13, 0xac, 0x32, 0x4a, - 0x0a, 0xd2, 0x9a, 0xd3, 0x09, 0x97, 0x5c, 0x5a, 0x23, 0x6a, 0xa9, 0xab, 0x99, 0x7d, 0x00, 0x38, - 0x7c, 0x71, 0x31, 0x84, 0xa0, 0x2f, 0xd2, 0x82, 0x05, 0x20, 0x04, 0xf3, 0x51, 0x62, 0x19, 0x5d, - 0xc1, 0x41, 0xc9, 0x54, 0x2e, 0x37, 0xc1, 0x49, 0x08, 0xe6, 0x7e, 0xe2, 0x14, 0x7a, 0x84, 0x7e, - 0xa1, 0xb9, 0x0e, 0x7a, 0x61, 0x6f, 0x7e, 0x7a, 0x1f, 0x92, 0xbf, 0xbd, 0xc8, 0xb3, 0xe6, 0xcb, - 0x1d, 0xa3, 0x95, 0x61, 0x0b, 0x29, 0x8c, 0x4a, 0xa9, 0x89, 0xfd, 0xfd, 0xd7, 0xb5, 0x97, 0xd8, - 0x0c, 0x22, 0x70, 0xbc, 0x4d, 0xb5, 0x59, 0xb1, 0xae, 0x66, 0x95, 0xb1, 0x9c, 0x67, 0x26, 0xf0, - 0x6d, 0x83, 0xcb, 0xd6, 0x72, 0xe9, 0x27, 0x6b, 0xcc, 0x62, 0x88, 0xfe, 0xbf, 0x88, 0xa6, 0x70, - 0x48, 0x1d, 0xbb, 0x89, 0x7f, 0x35, 0xba, 0x80, 0xbd, 0x42, 0x73, 0x3b, 0xf2, 0x28, 0x69, 0x71, - 0x76, 0x03, 0xcf, 0x8f, 0x7b, 0x2e, 0x64, 0x25, 0x0c, 0x9a, 0xc0, 0x3e, 0x6d, 0xc1, 0x66, 0xfb, - 0x49, 0x27, 0xe2, 0xe5, 0xbe, 0xc6, 0xe0, 0x50, 0x63, 0xf0, 0x5d, 0x63, 0xf0, 0xde, 0x60, 0xef, - 0xd0, 0x60, 0xef, 0xb3, 0xc1, 0xde, 0xeb, 0x2d, 0xcf, 0x4d, 0x56, 0xad, 0x09, 0x95, 0x45, 0xe4, - 0x96, 0xbd, 0x93, 0x8a, 0x1f, 0x39, 0xda, 0x45, 0xf6, 0x06, 0xe6, 0xad, 0x64, 0x7a, 0x3d, 0xb0, - 0xbf, 0xfb, 0xf0, 0x13, 0x00, 0x00, 0xff, 0xff, 0x56, 0x9a, 0x42, 0xbf, 0x98, 0x01, 0x00, 0x00, +func init() { proto.RegisterFile("neutron/cron/schedule.proto", fileDescriptor_49ace1b59de613ef) } + +var fileDescriptor_49ace1b59de613ef = []byte{ + // 305 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, 0x2a, 0x68, 0x1c, 0x52, 0x26, 0xc4, 0x52, 0x10, 0x0a, 0x62, + 0x0a, 0x7a, 0xf3, 0xd8, 0x31, 0xf0, 0xe2, 0xa5, 0xde, 0xbc, 0x8c, 0x2e, 0x0b, 0x69, 0x61, 0x6d, + 0x4a, 0x93, 0xc2, 0x7c, 0x0b, 0x9f, 0xc1, 0xa7, 0xd9, 0x71, 0x47, 0x4f, 0x22, 0xed, 0x8b, 0x48, + 0xd2, 0x4c, 0x04, 0x2f, 0xe1, 0xf7, 0xe7, 0xff, 0xfd, 0xf3, 0x7d, 0x5f, 0x02, 0xaf, 0x4a, 0xd6, + 0xa8, 0x5a, 0x94, 0x11, 0xd5, 0x87, 0xa4, 0x19, 0x5b, 0x37, 0x1b, 0x46, 0xaa, 0x5a, 0x28, 0x81, + 0x4e, 0xac, 0x49, 0xb4, 0x39, 0x9b, 0x72, 0xc1, 0x85, 0x31, 0x22, 0x4d, 0x7d, 0x4d, 0xf0, 0x01, + 0xe0, 0xf8, 0xc5, 0xc6, 0x10, 0x82, 0x6e, 0x99, 0x16, 0xcc, 0x03, 0x3e, 0x08, 0x27, 0x89, 0x61, + 0x74, 0x09, 0x47, 0x15, 0xab, 0x73, 0xb1, 0xf6, 0x8e, 0x7c, 0x10, 0xba, 0x89, 0x55, 0xe8, 0x11, + 0xba, 0x85, 0xe4, 0xd2, 0x1b, 0xf8, 0x83, 0xf0, 0xf8, 0xde, 0x27, 0x7f, 0x7b, 0x91, 0x67, 0xc9, + 0x17, 0x5b, 0x46, 0x1b, 0xc5, 0xe6, 0xa2, 0x54, 0x75, 0x4a, 0x55, 0xec, 0xee, 0xbe, 0xae, 0x9d, + 0xc4, 0x64, 0x10, 0x81, 0x17, 0x9b, 0x54, 0xaa, 0x25, 0xeb, 0x6b, 0x96, 0x19, 0xcb, 0x79, 0xa6, + 0x3c, 0xd7, 0x34, 0x38, 0xd7, 0x96, 0x4d, 0x3f, 0x19, 0x23, 0x88, 0x21, 0xfa, 0x7f, 0x23, 0x9a, + 0xc1, 0x31, 0xb5, 0x6c, 0x27, 0xfe, 0xd5, 0xe8, 0x0c, 0x0e, 0x0a, 0xc9, 0xcd, 0xc8, 0x93, 0x44, + 0x63, 0x70, 0x03, 0x4f, 0x0f, 0x7b, 0xce, 0x45, 0x53, 0x2a, 0x34, 0x85, 0x43, 0xaa, 0xc1, 0x64, + 0x87, 0x49, 0x2f, 0xe2, 0xc5, 0xae, 0xc5, 0x60, 0xdf, 0x62, 0xf0, 0xdd, 0x62, 0xf0, 0xde, 0x61, + 0x67, 0xdf, 0x61, 0xe7, 0xb3, 0xc3, 0xce, 0xeb, 0x2d, 0xcf, 0x55, 0xd6, 0xac, 0x08, 0x15, 0x45, + 0x64, 0x97, 0xbd, 0x13, 0x35, 0x3f, 0x70, 0xb4, 0xed, 0xff, 0x40, 0xbd, 0x55, 0x4c, 0xae, 0x46, + 0xe6, 0x75, 0x1f, 0x7e, 0x02, 0x00, 0x00, 0xff, 0xff, 0xba, 0x75, 0xe4, 0xb4, 0xa0, 0x01, 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 09f13e1c6..9a342b79f 100644 --- a/x/cron/types/tx.pb.go +++ b/x/cron/types/tx.pb.go @@ -1,13 +1,13 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: cron/tx.proto +// source: neutron/cron/tx.proto package types import ( context "context" fmt "fmt" - grpc1 "github.com/gogo/protobuf/grpc" - proto "github.com/gogo/protobuf/proto" + grpc1 "github.com/cosmos/gogoproto/grpc" + proto "github.com/cosmos/gogoproto/proto" grpc "google.golang.org/grpc" math "math" ) @@ -23,18 +23,18 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package -func init() { proto.RegisterFile("cron/tx.proto", fileDescriptor_389b00cea0e301f3) } +func init() { proto.RegisterFile("neutron/cron/tx.proto", fileDescriptor_c9e0a673aba8d6fd) } -var fileDescriptor_389b00cea0e301f3 = []byte{ +var fileDescriptor_c9e0a673aba8d6fd = []byte{ // 120 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x4d, 0x2e, 0xca, 0xcf, - 0xd3, 0x2f, 0xa9, 0xd0, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0xc9, 0x4b, 0x2d, 0x2d, 0x29, - 0xca, 0xcf, 0xd3, 0x03, 0x09, 0x1b, 0xb1, 0x72, 0x31, 0xfb, 0x16, 0xa7, 0x3b, 0xb9, 0x9e, 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, 0x76, 0x7a, 0x66, 0x49, 0x46, 0x69, 0x92, - 0x5e, 0x72, 0x7e, 0xae, 0x3e, 0x54, 0xa7, 0x6e, 0x7e, 0x51, 0x3a, 0x8c, 0xad, 0x5f, 0xa1, 0x0f, - 0x31, 0xbe, 0xb2, 0x20, 0xb5, 0x38, 0x89, 0x0d, 0x6c, 0x85, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, - 0xe7, 0xee, 0x4e, 0x1d, 0x73, 0x00, 0x00, 0x00, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0xcd, 0x4b, 0x2d, 0x2d, + 0x29, 0xca, 0xcf, 0xd3, 0x4f, 0x06, 0x11, 0x25, 0x15, 0x7a, 0x05, 0x45, 0xf9, 0x25, 0xf9, 0x42, + 0x3c, 0x50, 0x61, 0x3d, 0x90, 0xb0, 0x11, 0x2b, 0x17, 0xb3, 0x6f, 0x71, 0xba, 0x93, 0xeb, 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, 0x69, 0xa7, 0x67, 0x96, 0x64, 0x94, 0x26, + 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0x43, 0x75, 0xea, 0xe6, 0x17, 0xa5, 0xc3, 0xd8, 0xfa, 0x15, 0x50, + 0xe3, 0x2b, 0x0b, 0x52, 0x8b, 0x93, 0xd8, 0xc0, 0x56, 0x18, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, + 0xf4, 0x79, 0x03, 0xf3, 0x7b, 0x00, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -76,5 +76,5 @@ var _Msg_serviceDesc = grpc.ServiceDesc{ HandlerType: (*MsgServer)(nil), Methods: []grpc.MethodDesc{}, Streams: []grpc.StreamDesc{}, - Metadata: "cron/tx.proto", + Metadata: "neutron/cron/tx.proto", } diff --git a/x/feeburner/keeper/keeper.go b/x/feeburner/keeper/keeper.go index e706c94b8..3832749fa 100644 --- a/x/feeburner/keeper/keeper.go +++ b/x/feeburner/keeper/keeper.go @@ -6,12 +6,12 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" + "github.com/cometbft/cometbft/libs/log" "github.com/cosmos/cosmos-sdk/codec" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - consumertypes "github.com/cosmos/interchain-security/x/ccv/consumer/types" - "github.com/tendermint/tendermint/libs/log" + consumertypes "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types" "github.com/neutron-org/neutron/x/feeburner/types" ) @@ -82,7 +82,7 @@ func (k Keeper) GetTotalBurnedNeutronsAmount(ctx sdk.Context) types.TotalBurnedN } // BurnAndDistribute is an important part of tokenomics. It does few things: -// 1. Burns NTRN fee coins distributed to consumertypes.ConsumerRedistributeName in ICS (https://github.com/cosmos/interchain-security/blob/v0.2.0/x/ccv/consumer/keeper/distribution.go#L17) +// 1. Burns NTRN fee coins distributed to consumertypes.ConsumerRedistributeName in ICS (https://github.com/cosmos/interchain-security/v3/blob/v0.2.0/x/ccv/consumer/keeper/distribution.go#L17) // 2. Updates total amount of burned NTRN coins // 3. Sends non-NTRN fee tokens to reserve contract address // Panics if no `consumertypes.ConsumerRedistributeName` module found OR could not burn NTRN tokens diff --git a/x/feeburner/keeper/keeper_test.go b/x/feeburner/keeper/keeper_test.go index 67b2f3bcb..a77c9288f 100644 --- a/x/feeburner/keeper/keeper_test.go +++ b/x/feeburner/keeper/keeper_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" sdk "github.com/cosmos/cosmos-sdk/types" - consumertypes "github.com/cosmos/interchain-security/x/ccv/consumer/types" + consumertypes "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types" "github.com/golang/mock/gomock" "github.com/stretchr/testify/require" diff --git a/x/feeburner/module.go b/x/feeburner/module.go index 68b2017ab..6095ec72e 100644 --- a/x/feeburner/module.go +++ b/x/feeburner/module.go @@ -2,6 +2,7 @@ package feeburner import ( "context" + "cosmossdk.io/core/appmodule" "encoding/json" "fmt" @@ -11,7 +12,7 @@ import ( "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" - abci "github.com/tendermint/tendermint/abci/types" + abci "github.com/cometbft/cometbft/abci/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" @@ -91,6 +92,7 @@ func (AppModuleBasic) GetQueryCmd() *cobra.Command { // ---------------------------------------------------------------------------- // AppModule // ---------------------------------------------------------------------------- +var _ appmodule.AppModule = AppModule{} // AppModule implements the AppModule interface that defines the inter-dependent methods that modules need to implement type AppModule struct { @@ -109,16 +111,16 @@ func NewAppModule( } } -// Deprecated: use RegisterServices -func (am AppModule) Route() sdk.Route { return sdk.Route{} } +// IsOnePerModuleType implements the depinject.OnePerModuleType interface. +func (am AppModule) IsOnePerModuleType() { // marker +} -// Deprecated: use RegisterServices -func (AppModule) QuerierRoute() string { return types.RouterKey } +// IsAppModule implements the appmodule.AppModule interface. +func (am AppModule) IsAppModule() { // marker +} // Deprecated: use RegisterServices -func (am AppModule) LegacyQuerierHandler(_ *codec.LegacyAmino) sdk.Querier { - return nil -} +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) { diff --git a/x/feeburner/module_simulation.go b/x/feeburner/module_simulation.go index fbee35f86..7eefd95cb 100644 --- a/x/feeburner/module_simulation.go +++ b/x/feeburner/module_simulation.go @@ -1,10 +1,8 @@ package feeburner import ( - "math/rand" - "github.com/cosmos/cosmos-sdk/baseapp" - simappparams "github.com/cosmos/cosmos-sdk/simapp/params" + "github.com/cosmos/cosmos-sdk/testutil/sims" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" @@ -18,7 +16,7 @@ import ( var ( _ = sample.AccAddress _ = feeburnersimulation.FindAccount - _ = simappparams.StakePerAccount + _ = sims.StakePerAccount _ = simulation.MsgEntryKind _ = baseapp.Paramspace ) @@ -45,11 +43,6 @@ func (AppModule) ProposalContents(_ module.SimulationState) []simtypes.WeightedP return nil } -// RandomizedParams creates randomized param changes for the simulator -func (am AppModule) RandomizedParams(_ *rand.Rand) []simtypes.ParamChange { - return []simtypes.ParamChange{} -} - // RegisterStoreDecoder registers a decoder func (am AppModule) RegisterStoreDecoder(_ sdk.StoreDecoderRegistry) {} diff --git a/x/feeburner/types/genesis.pb.go b/x/feeburner/types/genesis.pb.go index d01d89c0e..24bdfb280 100644 --- a/x/feeburner/types/genesis.pb.go +++ b/x/feeburner/types/genesis.pb.go @@ -1,12 +1,12 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: feeburner/genesis.proto +// source: neutron/feeburner/genesis.proto package types import ( fmt "fmt" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" @@ -33,7 +33,7 @@ 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_6bcf9b99915c37ac, []int{0} + return fileDescriptor_bdeb93808577407e, []int{0} } func (m *GenesisState) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -80,26 +80,26 @@ func init() { proto.RegisterType((*GenesisState)(nil), "neutron.feeburner.GenesisState") } -func init() { proto.RegisterFile("feeburner/genesis.proto", fileDescriptor_6bcf9b99915c37ac) } +func init() { proto.RegisterFile("neutron/feeburner/genesis.proto", fileDescriptor_bdeb93808577407e) } -var fileDescriptor_6bcf9b99915c37ac = []byte{ - // 249 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x4f, 0x4b, 0x4d, 0x4d, - 0x2a, 0x2d, 0xca, 0x4b, 0x2d, 0xd2, 0x4f, 0x4f, 0xcd, 0x4b, 0x2d, 0xce, 0x2c, 0xd6, 0x2b, 0x28, - 0xca, 0x2f, 0xc9, 0x17, 0x12, 0xcc, 0x4b, 0x2d, 0x2d, 0x29, 0xca, 0xcf, 0xd3, 0x83, 0x2b, 0x90, - 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0xcb, 0xea, 0x83, 0x58, 0x10, 0x85, 0x52, 0x62, 0x08, 0x13, - 0x0a, 0x12, 0x8b, 0x12, 0x73, 0xa1, 0x06, 0x48, 0xe9, 0x20, 0xc4, 0x4b, 0xf2, 0x4b, 0x12, 0x73, - 0xe2, 0xc1, 0x9c, 0x94, 0x78, 0xa8, 0xb9, 0xc5, 0xf1, 0x89, 0xb9, 0xf9, 0xa5, 0x79, 0x25, 0x10, - 0xd5, 0x4a, 0x7b, 0x18, 0xb9, 0x78, 0xdc, 0x21, 0x0e, 0x08, 0x2e, 0x49, 0x2c, 0x49, 0x15, 0x32, - 0xe7, 0x62, 0x83, 0x18, 0x27, 0xc1, 0xa8, 0xc0, 0xa8, 0xc1, 0x6d, 0x24, 0xa9, 0x87, 0xe1, 0x20, - 0xbd, 0x00, 0xb0, 0x02, 0x27, 0x96, 0x13, 0xf7, 0xe4, 0x19, 0x82, 0xa0, 0xca, 0x85, 0x8a, 0xb9, - 0x64, 0xf0, 0xd9, 0x27, 0xc1, 0x04, 0x36, 0x4e, 0x07, 0x8b, 0x71, 0x21, 0x20, 0x6d, 0x4e, 0x60, - 0x5d, 0x7e, 0x50, 0x4d, 0x8e, 0x60, 0x3d, 0x50, 0x1b, 0x24, 0x4b, 0x70, 0x2a, 0xf0, 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, 0x83, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, - 0xbd, 0xe4, 0xfc, 0x5c, 0x7d, 0xa8, 0x95, 0xba, 0xf9, 0x45, 0xe9, 0x30, 0xb6, 0x7e, 0x85, 0x3e, - 0x52, 0x38, 0x55, 0x16, 0xa4, 0x16, 0x27, 0xb1, 0x81, 0x43, 0xc4, 0x18, 0x10, 0x00, 0x00, 0xff, - 0xff, 0x5c, 0xd8, 0x06, 0x42, 0x9b, 0x01, 0x00, 0x00, +var fileDescriptor_bdeb93808577407e = []byte{ + // 251 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xcf, 0x4b, 0x2d, 0x2d, + 0x29, 0xca, 0xcf, 0xd3, 0x4f, 0x4b, 0x4d, 0x4d, 0x2a, 0x2d, 0xca, 0x4b, 0x2d, 0xd2, 0x4f, 0x4f, + 0xcd, 0x4b, 0x2d, 0xce, 0x2c, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x84, 0x2a, 0xd0, + 0x83, 0x2b, 0x90, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0xcb, 0xea, 0x83, 0x58, 0x10, 0x85, 0x52, + 0x72, 0x98, 0x26, 0x15, 0x24, 0x16, 0x25, 0xe6, 0x42, 0x0d, 0x92, 0x32, 0xc1, 0x94, 0x2f, 0xc9, + 0x2f, 0x49, 0xcc, 0x89, 0x07, 0x73, 0x52, 0xe2, 0xa1, 0xd2, 0xc5, 0xf1, 0x89, 0xb9, 0xf9, 0xa5, + 0x79, 0x25, 0x10, 0x5d, 0x4a, 0x7b, 0x18, 0xb9, 0x78, 0xdc, 0x21, 0x0e, 0x0a, 0x2e, 0x49, 0x2c, + 0x49, 0x15, 0x32, 0xe7, 0x62, 0x83, 0x18, 0x2b, 0xc1, 0xa8, 0xc0, 0xa8, 0xc1, 0x6d, 0x24, 0xa9, + 0x87, 0xe1, 0x40, 0xbd, 0x00, 0xb0, 0x02, 0x27, 0x96, 0x13, 0xf7, 0xe4, 0x19, 0x82, 0xa0, 0xca, + 0x85, 0x8a, 0xb9, 0x64, 0xf0, 0xd9, 0x27, 0xc1, 0x04, 0x36, 0x4e, 0x07, 0x8b, 0x71, 0x21, 0x20, + 0x6d, 0x4e, 0x60, 0x5d, 0x7e, 0x50, 0x4d, 0x8e, 0x60, 0x3d, 0x50, 0x1b, 0x24, 0x4b, 0x70, 0x2a, + 0xf0, 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, 0x83, 0xf4, 0xcc, 0x92, + 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0x7d, 0xa8, 0x95, 0xba, 0xf9, 0x45, 0xe9, 0x30, 0xb6, + 0x7e, 0x05, 0x72, 0x38, 0x55, 0x16, 0xa4, 0x16, 0x27, 0xb1, 0x81, 0x43, 0xc4, 0x18, 0x10, 0x00, + 0x00, 0xff, 0xff, 0xeb, 0x01, 0xdc, 0x99, 0xb3, 0x01, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/feeburner/types/params.pb.go b/x/feeburner/types/params.pb.go index 69ae7617b..10dc2a26b 100644 --- a/x/feeburner/types/params.pb.go +++ b/x/feeburner/types/params.pb.go @@ -1,12 +1,12 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: feeburner/params.proto +// source: neutron/feeburner/params.proto package types import ( fmt "fmt" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" @@ -37,7 +37,7 @@ type Params struct { func (m *Params) Reset() { *m = Params{} } func (*Params) ProtoMessage() {} func (*Params) Descriptor() ([]byte, []int) { - return fileDescriptor_ccaaf97f3dcc64c0, []int{0} + return fileDescriptor_be38a6978544057e, []int{0} } func (m *Params) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -91,25 +91,25 @@ func init() { proto.RegisterType((*Params)(nil), "neutron.feeburner.Params") } -func init() { proto.RegisterFile("feeburner/params.proto", fileDescriptor_ccaaf97f3dcc64c0) } +func init() { proto.RegisterFile("neutron/feeburner/params.proto", fileDescriptor_be38a6978544057e) } -var fileDescriptor_ccaaf97f3dcc64c0 = []byte{ - // 226 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x4b, 0x4b, 0x4d, 0x4d, - 0x2a, 0x2d, 0xca, 0x4b, 0x2d, 0xd2, 0x2f, 0x48, 0x2c, 0x4a, 0xcc, 0x2d, 0xd6, 0x2b, 0x28, 0xca, - 0x2f, 0xc9, 0x17, 0x12, 0xcc, 0x4b, 0x2d, 0x2d, 0x29, 0xca, 0xcf, 0xd3, 0x83, 0xcb, 0x4b, 0x89, - 0xa4, 0xe7, 0xa7, 0xe7, 0x83, 0x65, 0xf5, 0x41, 0x2c, 0x88, 0x42, 0xa5, 0x76, 0x46, 0x2e, 0xb6, - 0x00, 0xb0, 0x4e, 0x21, 0x65, 0x2e, 0x5e, 0xa8, 0xae, 0xf8, 0x94, 0xd4, 0xbc, 0xfc, 0x5c, 0x09, - 0x46, 0x05, 0x46, 0x0d, 0xce, 0x20, 0x1e, 0xa8, 0xa0, 0x0b, 0x48, 0x4c, 0x48, 0x9d, 0x8b, 0xbf, - 0x28, 0xb5, 0x38, 0xb5, 0xa8, 0x2c, 0x35, 0x3e, 0x31, 0x25, 0xa5, 0x28, 0xb5, 0xb8, 0x58, 0x82, - 0x09, 0xac, 0x8c, 0x0f, 0x2a, 0xec, 0x08, 0x11, 0x15, 0xd2, 0xe4, 0x12, 0x28, 0x29, 0x4a, 0x4d, - 0x2c, 0x2e, 0x2d, 0xaa, 0x84, 0xab, 0x64, 0x06, 0xab, 0xe4, 0x87, 0x89, 0x43, 0x95, 0x5a, 0xb1, - 0xcc, 0x58, 0x20, 0xcf, 0xe0, 0xe4, 0x75, 0xe2, 0x91, 0x1c, 0xe3, 0x85, 0x47, 0x72, 0x8c, 0x0f, - 0x1e, 0xc9, 0x31, 0x4e, 0x78, 0x2c, 0xc7, 0x70, 0xe1, 0xb1, 0x1c, 0xc3, 0x8d, 0xc7, 0x72, 0x0c, - 0x51, 0x06, 0xe9, 0x99, 0x25, 0x19, 0xa5, 0x49, 0x7a, 0xc9, 0xf9, 0xb9, 0xfa, 0x50, 0xc7, 0xe8, - 0xe6, 0x17, 0xa5, 0xc3, 0xd8, 0xfa, 0x15, 0xfa, 0x88, 0x50, 0x28, 0xa9, 0x2c, 0x48, 0x2d, 0x4e, - 0x62, 0x03, 0x7b, 0xce, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0xa7, 0x3d, 0x02, 0xb1, 0x1f, 0x01, - 0x00, 0x00, +var fileDescriptor_be38a6978544057e = []byte{ + // 228 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xcb, 0x4b, 0x2d, 0x2d, + 0x29, 0xca, 0xcf, 0xd3, 0x4f, 0x4b, 0x4d, 0x4d, 0x2a, 0x2d, 0xca, 0x4b, 0x2d, 0xd2, 0x2f, 0x48, + 0x2c, 0x4a, 0xcc, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x84, 0xca, 0xeb, 0xc1, + 0xe5, 0xa5, 0x44, 0xd2, 0xf3, 0xd3, 0xf3, 0xc1, 0xb2, 0xfa, 0x20, 0x16, 0x44, 0xa1, 0x52, 0x3b, + 0x23, 0x17, 0x5b, 0x00, 0x58, 0xa7, 0x90, 0x32, 0x17, 0x2f, 0x54, 0x57, 0x7c, 0x4a, 0x6a, 0x5e, + 0x7e, 0xae, 0x04, 0xa3, 0x02, 0xa3, 0x06, 0x67, 0x10, 0x0f, 0x54, 0xd0, 0x05, 0x24, 0x26, 0xa4, + 0xce, 0xc5, 0x5f, 0x94, 0x5a, 0x9c, 0x5a, 0x54, 0x96, 0x1a, 0x9f, 0x98, 0x92, 0x52, 0x94, 0x5a, + 0x5c, 0x2c, 0xc1, 0x04, 0x56, 0xc6, 0x07, 0x15, 0x76, 0x84, 0x88, 0x0a, 0x69, 0x72, 0x09, 0x94, + 0x14, 0xa5, 0x26, 0x16, 0x97, 0x16, 0x55, 0xc2, 0x55, 0x32, 0x83, 0x55, 0xf2, 0xc3, 0xc4, 0xa1, + 0x4a, 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, 0x83, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0x7d, + 0xa8, 0x63, 0x74, 0xf3, 0x8b, 0xd2, 0x61, 0x6c, 0xfd, 0x0a, 0xa4, 0x50, 0x28, 0xa9, 0x2c, 0x48, + 0x2d, 0x4e, 0x62, 0x03, 0x7b, 0xce, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0xc4, 0x89, 0x9d, 0x54, + 0x27, 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 c52404616..dc3110aa2 100644 --- a/x/feeburner/types/query.pb.go +++ b/x/feeburner/types/query.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: feeburner/query.proto +// source: neutron/feeburner/query.proto package types @@ -7,9 +7,9 @@ import ( context "context" fmt "fmt" _ "github.com/cosmos/cosmos-sdk/types/query" - _ "github.com/gogo/protobuf/gogoproto" - grpc1 "github.com/gogo/protobuf/grpc" - proto "github.com/gogo/protobuf/proto" + _ "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" @@ -38,7 +38,7 @@ 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_c8567953574c9090, []int{0} + return fileDescriptor_f540485c4b79b2ac, []int{0} } func (m *QueryParamsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -77,7 +77,7 @@ 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_c8567953574c9090, []int{1} + return fileDescriptor_f540485c4b79b2ac, []int{1} } func (m *QueryParamsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -122,7 +122,7 @@ func (m *QueryTotalBurnedNeutronsAmountRequest) Reset() { *m = QueryTota func (m *QueryTotalBurnedNeutronsAmountRequest) String() string { return proto.CompactTextString(m) } func (*QueryTotalBurnedNeutronsAmountRequest) ProtoMessage() {} func (*QueryTotalBurnedNeutronsAmountRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_c8567953574c9090, []int{2} + return fileDescriptor_f540485c4b79b2ac, []int{2} } func (m *QueryTotalBurnedNeutronsAmountRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -163,7 +163,7 @@ func (m *QueryTotalBurnedNeutronsAmountResponse) Reset() { func (m *QueryTotalBurnedNeutronsAmountResponse) String() string { return proto.CompactTextString(m) } func (*QueryTotalBurnedNeutronsAmountResponse) ProtoMessage() {} func (*QueryTotalBurnedNeutronsAmountResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_c8567953574c9090, []int{3} + return fileDescriptor_f540485c4b79b2ac, []int{3} } func (m *QueryTotalBurnedNeutronsAmountResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -206,36 +206,36 @@ func init() { proto.RegisterType((*QueryTotalBurnedNeutronsAmountResponse)(nil), "neutron.feeburner.QueryTotalBurnedNeutronsAmountResponse") } -func init() { proto.RegisterFile("feeburner/query.proto", fileDescriptor_c8567953574c9090) } - -var fileDescriptor_c8567953574c9090 = []byte{ - // 407 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x92, 0x41, 0x6f, 0xda, 0x30, - 0x1c, 0xc5, 0x13, 0xb4, 0x71, 0xf0, 0x4e, 0xf3, 0xd8, 0xb4, 0x64, 0x28, 0xdb, 0x22, 0xc1, 0xa6, - 0x89, 0xc5, 0x83, 0x1d, 0xd8, 0x8e, 0xe3, 0xb8, 0x03, 0xda, 0x50, 0x4f, 0xbd, 0x20, 0x87, 0xba, - 0x69, 0x24, 0xe2, 0x7f, 0x88, 0x9d, 0xaa, 0xf4, 0xd8, 0x4f, 0x50, 0xa9, 0xe7, 0x7e, 0x1f, 0x7a, - 0x2a, 0x52, 0x2f, 0x3d, 0x55, 0x15, 0xf4, 0x83, 0x54, 0x38, 0x06, 0xda, 0x42, 0x40, 0xea, 0x2d, - 0xf1, 0xff, 0xf9, 0xbd, 0xdf, 0xb3, 0x8d, 0xde, 0xee, 0x33, 0xe6, 0xa7, 0x09, 0x67, 0x09, 0x19, - 0xa4, 0x2c, 0x19, 0x7a, 0x71, 0x02, 0x12, 0xf0, 0x6b, 0xce, 0x52, 0x99, 0x00, 0xf7, 0x16, 0x63, - 0xbb, 0x14, 0x40, 0x00, 0x6a, 0x4a, 0x66, 0x5f, 0x99, 0xd0, 0x2e, 0x07, 0x00, 0x41, 0x9f, 0x11, - 0x1a, 0x87, 0x84, 0x72, 0x0e, 0x92, 0xca, 0x10, 0xb8, 0xd0, 0xd3, 0x6f, 0x3d, 0x10, 0x11, 0x08, - 0xe2, 0x53, 0xc1, 0x32, 0x7f, 0x72, 0x58, 0xf7, 0x99, 0xa4, 0x75, 0x12, 0xd3, 0x20, 0xe4, 0x4a, - 0xac, 0xb5, 0xef, 0x96, 0x24, 0x31, 0x4d, 0x68, 0x34, 0xf7, 0xa8, 0x2d, 0xd7, 0x25, 0x48, 0xda, - 0xef, 0xaa, 0x9f, 0xbd, 0xae, 0x26, 0x14, 0x5d, 0x1a, 0x41, 0xca, 0x65, 0xa6, 0x76, 0x4b, 0x08, - 0xff, 0x9f, 0xe5, 0xfc, 0x53, 0x16, 0x1d, 0x36, 0x48, 0x99, 0x90, 0x6e, 0x1b, 0xbd, 0x79, 0xb4, - 0x2a, 0x62, 0xe0, 0x82, 0xe1, 0x26, 0x2a, 0x66, 0x51, 0xef, 0xcd, 0x4f, 0xe6, 0xd7, 0x57, 0x0d, - 0xcb, 0x5b, 0xa9, 0xed, 0x65, 0x5b, 0x5a, 0x2f, 0x46, 0x37, 0x1f, 0x8d, 0x8e, 0x96, 0xbb, 0x5f, - 0x50, 0x45, 0xf9, 0xed, 0xcc, 0x80, 0x5a, 0x8a, 0xa7, 0xad, 0x71, 0xfe, 0x28, 0x9a, 0x79, 0xf0, - 0xb9, 0x89, 0xaa, 0xdb, 0x94, 0x1a, 0x46, 0xa0, 0xf2, 0xa6, 0x7e, 0x1a, 0xb1, 0xb6, 0x06, 0x31, - 0xd7, 0x5b, 0x53, 0x5b, 0x32, 0x4f, 0xd0, 0xb8, 0x2c, 0xa0, 0x97, 0x8a, 0x0f, 0x1f, 0xa3, 0x62, - 0x56, 0x15, 0x57, 0xd6, 0x44, 0xac, 0x9e, 0xa9, 0x5d, 0xdd, 0x26, 0xcb, 0x7a, 0xb9, 0x9f, 0x4f, - 0xae, 0xee, 0xce, 0x0a, 0x1f, 0xb0, 0x45, 0xb4, 0x9e, 0x3c, 0xbd, 0x68, 0x7c, 0x61, 0x22, 0x2b, - 0xb7, 0x04, 0xfe, 0x95, 0x17, 0xb4, 0xed, 0xf4, 0xed, 0xdf, 0xcf, 0xd8, 0xa9, 0xa9, 0x9b, 0x8a, - 0xba, 0x8e, 0xc9, 0x1a, 0xea, 0x4d, 0xd7, 0xd4, 0xfa, 0x3b, 0x9a, 0x38, 0xe6, 0x78, 0xe2, 0x98, - 0xb7, 0x13, 0xc7, 0x3c, 0x9d, 0x3a, 0xc6, 0x78, 0xea, 0x18, 0xd7, 0x53, 0xc7, 0xd8, 0xfd, 0x11, - 0x84, 0xf2, 0x20, 0xf5, 0xbd, 0x1e, 0x44, 0x73, 0xd3, 0xef, 0x90, 0x04, 0x8b, 0x80, 0xa3, 0x87, - 0x11, 0xc3, 0x98, 0x09, 0xbf, 0xa8, 0xde, 0xf4, 0xcf, 0xfb, 0x00, 0x00, 0x00, 0xff, 0xff, 0x3e, - 0x4a, 0x4d, 0x46, 0xa5, 0x03, 0x00, 0x00, +func init() { proto.RegisterFile("neutron/feeburner/query.proto", fileDescriptor_f540485c4b79b2ac) } + +var fileDescriptor_f540485c4b79b2ac = []byte{ + // 405 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x92, 0x31, 0x4f, 0xdb, 0x40, + 0x1c, 0xc5, 0xed, 0xa8, 0xcd, 0x70, 0x9d, 0x7a, 0xcd, 0x50, 0xbb, 0xa9, 0xdb, 0x5a, 0x4a, 0x5a, + 0x55, 0xad, 0xaf, 0x49, 0x2b, 0xa5, 0x8c, 0x64, 0x64, 0x88, 0x20, 0x62, 0x62, 0x89, 0xce, 0xe1, + 0x30, 0x96, 0xe2, 0xfb, 0x3b, 0xbe, 0x33, 0x22, 0x8c, 0x7c, 0x02, 0x24, 0x66, 0xbe, 0x4f, 0x98, + 0x88, 0xc4, 0xc2, 0x84, 0x50, 0xc2, 0x07, 0x41, 0x39, 0x5f, 0x22, 0x90, 0x63, 0x22, 0xd8, 0x6c, + 0xbf, 0x77, 0xef, 0xfd, 0xfe, 0x7f, 0x1f, 0xfa, 0xcc, 0x59, 0x2a, 0x13, 0xe0, 0xe4, 0x80, 0x31, + 0x3f, 0x4d, 0x38, 0x4b, 0xc8, 0x30, 0x65, 0xc9, 0xc8, 0x8b, 0x13, 0x90, 0x80, 0xdf, 0x6b, 0xd9, + 0x5b, 0xca, 0x76, 0x25, 0x80, 0x00, 0x94, 0x4a, 0xe6, 0x4f, 0x99, 0xd1, 0xae, 0x06, 0x00, 0xc1, + 0x80, 0x11, 0x1a, 0x87, 0x84, 0x72, 0x0e, 0x92, 0xca, 0x10, 0xb8, 0xd0, 0xea, 0xcf, 0x3e, 0x88, + 0x08, 0x04, 0xf1, 0xa9, 0x60, 0x59, 0x3e, 0x39, 0x6a, 0xf8, 0x4c, 0xd2, 0x06, 0x89, 0x69, 0x10, + 0x72, 0x65, 0xd6, 0x5e, 0x27, 0x4f, 0x14, 0xd3, 0x84, 0x46, 0x8b, 0xac, 0x7f, 0x79, 0x5d, 0x82, + 0xa4, 0x83, 0x9e, 0x7a, 0xd9, 0xef, 0x69, 0x59, 0xf4, 0x68, 0x04, 0x29, 0x97, 0xd9, 0x29, 0xb7, + 0x82, 0xf0, 0xce, 0xbc, 0x77, 0x5b, 0x45, 0x75, 0xd9, 0x30, 0x65, 0x42, 0xba, 0x1d, 0xf4, 0xe1, + 0xc9, 0x57, 0x11, 0x03, 0x17, 0x0c, 0xb7, 0x50, 0x39, 0xab, 0xfc, 0x68, 0x7e, 0x35, 0x7f, 0xbc, + 0x6b, 0x5a, 0x5e, 0x6e, 0x0d, 0x5e, 0x76, 0xa4, 0xfd, 0x66, 0x7c, 0xfb, 0xc5, 0xe8, 0x6a, 0xbb, + 0xfb, 0x1d, 0xd5, 0x54, 0xde, 0xee, 0x1c, 0xa8, 0xad, 0x78, 0x3a, 0x1a, 0x67, 0x53, 0xd1, 0x2c, + 0x8a, 0x2f, 0x4c, 0x54, 0x5f, 0xe7, 0xd4, 0x30, 0x02, 0x55, 0x9f, 0x9b, 0x4f, 0x23, 0xfe, 0x5a, + 0x81, 0x58, 0x98, 0xad, 0xa9, 0x2d, 0x59, 0x64, 0x68, 0x5e, 0x95, 0xd0, 0x5b, 0xc5, 0x87, 0x4f, + 0x50, 0x39, 0x1b, 0x15, 0xd7, 0x56, 0x54, 0xe4, 0x77, 0x6a, 0xd7, 0xd7, 0xd9, 0xb2, 0xb9, 0xdc, + 0x6f, 0xa7, 0xd7, 0xf7, 0xe7, 0xa5, 0x4f, 0xd8, 0x22, 0x45, 0x3f, 0x1c, 0x5f, 0x9a, 0xc8, 0x2a, + 0x1c, 0x02, 0xff, 0x2f, 0x2a, 0x5a, 0xb7, 0x7d, 0x7b, 0xe3, 0x15, 0x27, 0x35, 0x75, 0x4b, 0x51, + 0x37, 0x30, 0x21, 0x2f, 0xbb, 0x86, 0xed, 0xad, 0xf1, 0xd4, 0x31, 0x27, 0x53, 0xc7, 0xbc, 0x9b, + 0x3a, 0xe6, 0xd9, 0xcc, 0x31, 0x26, 0x33, 0xc7, 0xb8, 0x99, 0x39, 0xc6, 0xde, 0x9f, 0x20, 0x94, + 0x87, 0xa9, 0xef, 0xf5, 0x21, 0x5a, 0x84, 0xfe, 0x86, 0x24, 0x58, 0x16, 0x1c, 0x3f, 0xae, 0x18, + 0xc5, 0x4c, 0xf8, 0x65, 0x75, 0xa7, 0xff, 0x3e, 0x04, 0x00, 0x00, 0xff, 0xff, 0xfb, 0x35, 0xd5, + 0x1b, 0xbd, 0x03, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -355,7 +355,7 @@ var _Query_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "feeburner/query.proto", + Metadata: "neutron/feeburner/query.proto", } func (m *QueryParamsRequest) Marshal() (dAtA []byte, err error) { diff --git a/x/feeburner/types/query.pb.gw.go b/x/feeburner/types/query.pb.gw.go index 5ae660741..0daa7f562 100644 --- a/x/feeburner/types/query.pb.gw.go +++ b/x/feeburner/types/query.pb.gw.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-grpc-gateway. DO NOT EDIT. -// source: feeburner/query.proto +// source: neutron/feeburner/query.proto /* Package types is a reverse proxy. @@ -206,9 +206,9 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } var ( - pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"neutron", "feeburner", "params"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"neutron", "feeburner", "params"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_TotalBurnedNeutronsAmount_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"neutron", "feeburner", "total_burned_neutrons_amount"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_TotalBurnedNeutronsAmount_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"neutron", "feeburner", "total_burned_neutrons_amount"}, "", runtime.AssumeColonVerbOpt(false))) ) var ( diff --git a/x/feeburner/types/total_burned_neutrons_amount.pb.go b/x/feeburner/types/total_burned_neutrons_amount.pb.go index 9ec2519ad..0b562a8e4 100644 --- a/x/feeburner/types/total_burned_neutrons_amount.pb.go +++ b/x/feeburner/types/total_burned_neutrons_amount.pb.go @@ -1,13 +1,13 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: feeburner/total_burned_neutrons_amount.proto +// source: neutron/feeburner/total_burned_neutrons_amount.proto package types import ( fmt "fmt" types "github.com/cosmos/cosmos-sdk/types" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" @@ -33,7 +33,7 @@ func (m *TotalBurnedNeutronsAmount) Reset() { *m = TotalBurnedNeutronsAm func (m *TotalBurnedNeutronsAmount) String() string { return proto.CompactTextString(m) } func (*TotalBurnedNeutronsAmount) ProtoMessage() {} func (*TotalBurnedNeutronsAmount) Descriptor() ([]byte, []int) { - return fileDescriptor_3a29e81c9c2bc4df, []int{0} + return fileDescriptor_dfe0eb8ae8e764c8, []int{0} } func (m *TotalBurnedNeutronsAmount) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -74,27 +74,27 @@ func init() { } func init() { - proto.RegisterFile("feeburner/total_burned_neutrons_amount.proto", fileDescriptor_3a29e81c9c2bc4df) + proto.RegisterFile("neutron/feeburner/total_burned_neutrons_amount.proto", fileDescriptor_dfe0eb8ae8e764c8) } -var fileDescriptor_3a29e81c9c2bc4df = []byte{ - // 245 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0x49, 0x4b, 0x4d, 0x4d, - 0x2a, 0x2d, 0xca, 0x4b, 0x2d, 0xd2, 0x2f, 0xc9, 0x2f, 0x49, 0xcc, 0x89, 0x07, 0x73, 0x52, 0xe2, - 0xf3, 0x52, 0x4b, 0x4b, 0x8a, 0xf2, 0xf3, 0x8a, 0xe3, 0x13, 0x73, 0xf3, 0x4b, 0xf3, 0x4a, 0xf4, - 0x0a, 0x8a, 0xf2, 0x4b, 0xf2, 0x85, 0x04, 0xa1, 0xc2, 0x7a, 0x70, 0x5d, 0x52, 0x72, 0xc9, 0xf9, - 0xc5, 0xb9, 0xf9, 0xc5, 0xfa, 0x49, 0x89, 0xc5, 0xa9, 0xfa, 0x65, 0x86, 0x49, 0xa9, 0x25, 0x89, - 0x86, 0xfa, 0xc9, 0xf9, 0x99, 0x79, 0x10, 0x2d, 0x52, 0x22, 0xe9, 0xf9, 0xe9, 0xf9, 0x60, 0xa6, - 0x3e, 0x88, 0x05, 0x11, 0x55, 0x8a, 0xe7, 0x92, 0x0c, 0x01, 0x59, 0xe7, 0x04, 0xb6, 0xcd, 0x0f, - 0x6a, 0x99, 0x23, 0xd8, 0x2e, 0x21, 0x27, 0x2e, 0x16, 0x90, 0x01, 0x12, 0x8c, 0x0a, 0x8c, 0x1a, - 0xdc, 0x46, 0x92, 0x7a, 0x10, 0x1b, 0xf4, 0x40, 0x36, 0xe8, 0x41, 0x6d, 0xd0, 0x73, 0xce, 0xcf, - 0xcc, 0x73, 0x12, 0x3e, 0x71, 0x4f, 0x9e, 0xe1, 0xd3, 0x3d, 0x79, 0xee, 0xca, 0xc4, 0xdc, 0x1c, - 0x2b, 0x25, 0x90, 0x26, 0xa5, 0x20, 0xb0, 0x5e, 0x27, 0xaf, 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, 0x48, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, - 0x87, 0x7a, 0x47, 0x37, 0xbf, 0x28, 0x1d, 0xc6, 0xd6, 0xaf, 0xd0, 0x47, 0x0a, 0x92, 0xca, 0x82, - 0xd4, 0xe2, 0x24, 0x36, 0xb0, 0x9b, 0x8d, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x5d, 0xb4, 0xe9, - 0x66, 0x2c, 0x01, 0x00, 0x00, +var fileDescriptor_dfe0eb8ae8e764c8 = []byte{ + // 247 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x32, 0xc9, 0x4b, 0x2d, 0x2d, + 0x29, 0xca, 0xcf, 0xd3, 0x4f, 0x4b, 0x4d, 0x4d, 0x2a, 0x2d, 0xca, 0x4b, 0x2d, 0xd2, 0x2f, 0xc9, + 0x2f, 0x49, 0xcc, 0x89, 0x07, 0x73, 0x52, 0xe2, 0xa1, 0xd2, 0xc5, 0xf1, 0x89, 0xb9, 0xf9, 0xa5, + 0x79, 0x25, 0x7a, 0x05, 0x45, 0xf9, 0x25, 0xf9, 0x42, 0x82, 0x50, 0x61, 0x3d, 0xb8, 0x2e, 0x29, + 0xb9, 0xe4, 0xfc, 0xe2, 0xdc, 0xfc, 0x62, 0xfd, 0xa4, 0xc4, 0xe2, 0x54, 0xfd, 0x32, 0xc3, 0xa4, + 0xd4, 0x92, 0x44, 0x43, 0xfd, 0xe4, 0xfc, 0xcc, 0x3c, 0x88, 0x16, 0x29, 0x91, 0xf4, 0xfc, 0xf4, + 0x7c, 0x30, 0x53, 0x1f, 0xc4, 0x82, 0x88, 0x2a, 0xc5, 0x73, 0x49, 0x86, 0x80, 0xac, 0x73, 0x02, + 0xdb, 0xe6, 0x07, 0xb5, 0xcc, 0x11, 0x6c, 0x97, 0x90, 0x13, 0x17, 0x0b, 0xc8, 0x00, 0x09, 0x46, + 0x05, 0x46, 0x0d, 0x6e, 0x23, 0x49, 0x3d, 0x88, 0x0d, 0x7a, 0x20, 0x1b, 0xf4, 0xa0, 0x36, 0xe8, + 0x39, 0xe7, 0x67, 0xe6, 0x39, 0x09, 0x9f, 0xb8, 0x27, 0xcf, 0xf0, 0xe9, 0x9e, 0x3c, 0x77, 0x65, + 0x62, 0x6e, 0x8e, 0x95, 0x12, 0x48, 0x93, 0x52, 0x10, 0x58, 0xaf, 0x93, 0xd7, 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, 0xa4, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, + 0xe7, 0xe7, 0xea, 0x43, 0xbd, 0xa3, 0x9b, 0x5f, 0x94, 0x0e, 0x63, 0xeb, 0x57, 0x20, 0x07, 0x49, + 0x65, 0x41, 0x6a, 0x71, 0x12, 0x1b, 0xd8, 0xcd, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x7a, + 0xfe, 0xd6, 0xe6, 0x34, 0x01, 0x00, 0x00, } func (m *TotalBurnedNeutronsAmount) Marshal() (dAtA []byte, err error) { diff --git a/x/feerefunder/keeper/keeper.go b/x/feerefunder/keeper/keeper.go index 6be1b191e..3ad840c36 100644 --- a/x/feerefunder/keeper/keeper.go +++ b/x/feerefunder/keeper/keeper.go @@ -4,15 +4,14 @@ import ( "fmt" "strconv" + "github.com/cometbft/cometbft/libs/log" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/store/prefix" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - channeltypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" - "github.com/tendermint/tendermint/libs/log" - + channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" "github.com/neutron-org/neutron/x/feerefunder/types" ) diff --git a/x/feerefunder/keeper/keeper_test.go b/x/feerefunder/keeper/keeper_test.go index d2d0f272c..c7db58d39 100644 --- a/x/feerefunder/keeper/keeper_test.go +++ b/x/feerefunder/keeper/keeper_test.go @@ -20,7 +20,7 @@ import ( "github.com/neutron-org/neutron/x/feerefunder/types" - channeltypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" + channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" ) const ( diff --git a/x/feerefunder/module.go b/x/feerefunder/module.go index 297c54858..d70e2ac79 100644 --- a/x/feerefunder/module.go +++ b/x/feerefunder/module.go @@ -2,6 +2,7 @@ package feerefunder import ( "context" + "cosmossdk.io/core/appmodule" "encoding/json" "fmt" @@ -11,7 +12,7 @@ import ( "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" - abci "github.com/tendermint/tendermint/abci/types" + abci "github.com/cometbft/cometbft/abci/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" @@ -93,6 +94,8 @@ func (AppModuleBasic) GetQueryCmd() *cobra.Command { // AppModule // ---------------------------------------------------------------------------- +var _ appmodule.AppModule = AppModule{} + // AppModule implements the AppModule interface that defines the inter-dependent methods that modules need to implement type AppModule struct { AppModuleBasic @@ -116,16 +119,16 @@ func NewAppModule( } } -// Deprecated: use RegisterServices -func (am AppModule) Route() sdk.Route { return sdk.Route{} } +// IsOnePerModuleType implements the depinject.OnePerModuleType interface. +func (am AppModule) IsOnePerModuleType() { // marker +} -// Deprecated: use RegisterServices -func (AppModule) QuerierRoute() string { return types.RouterKey } +// IsAppModule implements the appmodule.AppModule interface. +func (am AppModule) IsAppModule() { // marker +} // Deprecated: use RegisterServices -func (am AppModule) LegacyQuerierHandler(_ *codec.LegacyAmino) sdk.Querier { - return nil -} +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) { diff --git a/x/feerefunder/types/codec.go b/x/feerefunder/types/codec.go index 20e5abd4d..4cf72fc56 100644 --- a/x/feerefunder/types/codec.go +++ b/x/feerefunder/types/codec.go @@ -3,9 +3,6 @@ package types import ( "github.com/cosmos/cosmos-sdk/codec" cdctypes "github.com/cosmos/cosmos-sdk/codec/types" - - // this line is used by starport scaffolding # 1 - "github.com/cosmos/cosmos-sdk/types/msgservice" ) func RegisterCodec(_ *codec.LegacyAmino) { @@ -15,7 +12,7 @@ func RegisterCodec(_ *codec.LegacyAmino) { func RegisterInterfaces(registry cdctypes.InterfaceRegistry) { // this line is used by starport scaffolding # 3 - msgservice.RegisterMsgServiceDesc(registry, &_Msg_serviceDesc) + //msgservice.RegisterMsgServiceDesc(registry, &_Msg_serviceDesc) } var ( diff --git a/x/feerefunder/types/expected_keepers.go b/x/feerefunder/types/expected_keepers.go index 7ed2f900a..fa8099e10 100644 --- a/x/feerefunder/types/expected_keepers.go +++ b/x/feerefunder/types/expected_keepers.go @@ -3,7 +3,7 @@ package types import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/auth/types" - channeltypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" + channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" ) // AccountKeeper defines the expected account keeper used for simulations (noalias) diff --git a/x/feerefunder/types/fee.pb.go b/x/feerefunder/types/fee.pb.go index 77720d234..deabfddac 100644 --- a/x/feerefunder/types/fee.pb.go +++ b/x/feerefunder/types/fee.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: feerefunder/fee.proto +// source: neutron/feerefunder/fee.proto package types @@ -7,8 +7,8 @@ import ( fmt "fmt" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" types "github.com/cosmos/cosmos-sdk/types" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" @@ -39,7 +39,7 @@ func (m *Fee) Reset() { *m = Fee{} } func (m *Fee) String() string { return proto.CompactTextString(m) } func (*Fee) ProtoMessage() {} func (*Fee) Descriptor() ([]byte, []int) { - return fileDescriptor_0c6cd4ef4b890305, []int{0} + return fileDescriptor_08c389f5f82f1076, []int{0} } func (m *Fee) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -99,7 +99,7 @@ func (m *PacketID) Reset() { *m = PacketID{} } func (m *PacketID) String() string { return proto.CompactTextString(m) } func (*PacketID) ProtoMessage() {} func (*PacketID) Descriptor() ([]byte, []int) { - return fileDescriptor_0c6cd4ef4b890305, []int{1} + return fileDescriptor_08c389f5f82f1076, []int{1} } func (m *PacketID) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -154,34 +154,34 @@ func init() { proto.RegisterType((*PacketID)(nil), "neutron.feerefunder.PacketID") } -func init() { proto.RegisterFile("feerefunder/fee.proto", fileDescriptor_0c6cd4ef4b890305) } +func init() { proto.RegisterFile("neutron/feerefunder/fee.proto", fileDescriptor_08c389f5f82f1076) } -var fileDescriptor_0c6cd4ef4b890305 = []byte{ +var fileDescriptor_08c389f5f82f1076 = []byte{ // 380 bytes of a gzipped FileDescriptorProto - 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, 0xee, 0xb2, 0xae, 0xb0, 0x51, 0x72, 0xca, - 0xc5, 0x0c, 0xba, 0xb7, 0x3d, 0xea, 0x22, 0x08, 0x3d, 0x14, 0x8f, 0x3d, 0x54, 0x92, 0xc9, 0x9b, - 0x18, 0x62, 0x66, 0x6c, 0x32, 0x91, 0x7a, 0xed, 0x27, 0xe8, 0xe7, 0xe8, 0x27, 0xf1, 0xe8, 0xb1, - 0x27, 0x5b, 0xf4, 0x1b, 0xf4, 0x5e, 0x28, 0x93, 0x8c, 0x25, 0x37, 0xf1, 0x34, 0xef, 0x1f, 0x9e, - 0xe7, 0xf7, 0x0c, 0xbc, 0xf8, 0xa7, 0x0f, 0x90, 0x80, 0x9f, 0x31, 0x0f, 0x12, 0xe2, 0x03, 0xd8, - 0xab, 0x84, 0x0b, 0xae, 0x7f, 0x67, 0x90, 0x89, 0x84, 0x33, 0xbb, 0xb4, 0xee, 0x18, 0x94, 0xa7, - 0x31, 0x4f, 0x89, 0xeb, 0xa4, 0x40, 0xd6, 0x03, 0x17, 0x84, 0x33, 0x20, 0x94, 0x87, 0xac, 0x10, - 0x75, 0x7e, 0x04, 0x3c, 0xe0, 0x79, 0x49, 0x64, 0x55, 0x4c, 0xcd, 0xf7, 0x0a, 0xae, 0x4e, 0x00, - 0xf4, 0x0d, 0x6e, 0x24, 0x40, 0xd7, 0x73, 0x1f, 0xa0, 0x8d, 0x7a, 0x55, 0xab, 0x35, 0xfc, 0x6d, - 0x17, 0x86, 0xb6, 0x34, 0xb4, 0x95, 0xa1, 0x3d, 0xe6, 0x21, 0x1b, 0x8d, 0xb7, 0xfb, 0xae, 0xf6, - 0xb6, 0xef, 0x7e, 0xdb, 0x38, 0xf1, 0xf2, 0x9f, 0x79, 0x12, 0x9a, 0x4f, 0x2f, 0x5d, 0x2b, 0x08, - 0xc5, 0x22, 0x73, 0x6d, 0xca, 0x63, 0xa2, 0x02, 0x15, 0x4f, 0x3f, 0xf5, 0x22, 0x22, 0x36, 0x2b, - 0x48, 0x73, 0x8f, 0x74, 0x56, 0x97, 0x32, 0x89, 0x5e, 0xe3, 0xba, 0x43, 0xa3, 0x9c, 0x5c, 0x39, - 0x47, 0x1e, 0x29, 0xf2, 0xd7, 0x82, 0xac, 0x74, 0x97, 0x81, 0x6b, 0x0e, 0x8d, 0x24, 0xf7, 0x01, - 0xe1, 0x96, 0x08, 0x63, 0xe0, 0x99, 0xc8, 0xe1, 0xd5, 0x73, 0xf0, 0x89, 0x82, 0xeb, 0x05, 0xbc, - 0xa4, 0xbd, 0x2c, 0x00, 0x56, 0xca, 0x09, 0x80, 0x79, 0x8b, 0x1b, 0xd7, 0x0e, 0x8d, 0x40, 0x4c, - 0xff, 0xeb, 0x7f, 0x30, 0xa6, 0x0b, 0x87, 0x31, 0x58, 0xce, 0x43, 0xaf, 0x8d, 0x7a, 0xc8, 0x6a, - 0xce, 0x9a, 0x6a, 0x32, 0xf5, 0xf4, 0x5f, 0xb8, 0xbe, 0xe2, 0x89, 0x90, 0xbb, 0x4a, 0xbe, 0xab, - 0xc9, 0x76, 0xea, 0xe9, 0x1d, 0xdc, 0x48, 0xe1, 0x2e, 0x03, 0x46, 0xe5, 0x27, 0x90, 0xf5, 0x65, - 0xf6, 0xd9, 0x8f, 0xae, 0xb6, 0x07, 0x03, 0xed, 0x0e, 0x06, 0x7a, 0x3d, 0x18, 0xe8, 0xf1, 0x68, - 0x68, 0xbb, 0xa3, 0xa1, 0x3d, 0x1f, 0x0d, 0xed, 0x66, 0x58, 0xca, 0xab, 0xee, 0xa9, 0xcf, 0x93, - 0xe0, 0x54, 0x93, 0x7b, 0x52, 0x3e, 0xbe, 0x3c, 0xbf, 0x5b, 0xcb, 0x8f, 0xe6, 0xef, 0x47, 0x00, - 0x00, 0x00, 0xff, 0xff, 0x63, 0x01, 0x6f, 0xe2, 0x98, 0x02, 0x00, 0x00, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x92, 0xcf, 0x6a, 0xea, 0x40, + 0x14, 0xc6, 0x33, 0x7a, 0xf1, 0xcf, 0x08, 0xf7, 0x42, 0xee, 0x85, 0x6b, 0x05, 0xa3, 0x64, 0x95, + 0x8d, 0x19, 0xb4, 0xbb, 0x2e, 0xb5, 0x08, 0x42, 0x17, 0xc5, 0x65, 0x17, 0x95, 0x64, 0x72, 0x8c, + 0x21, 0x66, 0xc6, 0x26, 0x13, 0xa9, 0xdb, 0x3e, 0x41, 0x9f, 0xa3, 0x4f, 0xe2, 0xd2, 0x65, 0x57, + 0xb6, 0xe8, 0x1b, 0x74, 0x5f, 0x28, 0x93, 0x8c, 0xc5, 0xae, 0xc4, 0x55, 0xce, 0x9c, 0x8f, 0xef, + 0xfb, 0x7d, 0x81, 0x83, 0x9b, 0x0c, 0x52, 0x11, 0x73, 0x46, 0xa6, 0x00, 0x31, 0x4c, 0x53, 0xe6, + 0x41, 0x2c, 0x67, 0x7b, 0x11, 0x73, 0xc1, 0xf5, 0xbf, 0x4a, 0xb6, 0x8f, 0xe4, 0x86, 0x41, 0x79, + 0x12, 0xf1, 0x84, 0xb8, 0x4e, 0x02, 0x64, 0xd9, 0x75, 0x41, 0x38, 0x5d, 0x42, 0x79, 0xc0, 0x72, + 0x53, 0xe3, 0x9f, 0xcf, 0x7d, 0x9e, 0x8d, 0x44, 0x4e, 0xf9, 0xd6, 0xfc, 0x2c, 0xe0, 0xe2, 0x10, + 0x40, 0x5f, 0xe1, 0x4a, 0x0c, 0x74, 0x39, 0x99, 0x02, 0xd4, 0x51, 0xbb, 0x68, 0xd5, 0x7a, 0x17, + 0x76, 0x1e, 0x68, 0xcb, 0x40, 0x5b, 0x05, 0xda, 0x03, 0x1e, 0xb0, 0xfe, 0x60, 0xbd, 0x6d, 0x69, + 0x1f, 0xdb, 0xd6, 0x9f, 0x95, 0x13, 0xcd, 0xaf, 0xcc, 0x83, 0xd1, 0x7c, 0x79, 0x6b, 0x59, 0x7e, + 0x20, 0x66, 0xa9, 0x6b, 0x53, 0x1e, 0x11, 0x55, 0x28, 0xff, 0x74, 0x12, 0x2f, 0x24, 0x62, 0xb5, + 0x80, 0x24, 0xcb, 0x48, 0xc6, 0x65, 0x69, 0x93, 0xe8, 0x25, 0x2e, 0x3b, 0x34, 0xcc, 0xc8, 0x85, + 0x53, 0xe4, 0xbe, 0x22, 0xff, 0xce, 0xc9, 0xca, 0x77, 0x1e, 0xb8, 0xe4, 0xd0, 0x50, 0x72, 0x9f, + 0x10, 0xae, 0x89, 0x20, 0x02, 0x9e, 0x8a, 0x0c, 0x5e, 0x3c, 0x05, 0x1f, 0x2a, 0xb8, 0x9e, 0xc3, + 0x8f, 0xbc, 0xe7, 0x15, 0xc0, 0xca, 0x39, 0x04, 0x30, 0xef, 0x71, 0xe5, 0xd6, 0xa1, 0x21, 0x88, + 0xd1, 0xb5, 0xde, 0xc4, 0x98, 0xce, 0x1c, 0xc6, 0x60, 0x3e, 0x09, 0xbc, 0x3a, 0x6a, 0x23, 0xab, + 0x3a, 0xae, 0xaa, 0xcd, 0xc8, 0xd3, 0xff, 0xe3, 0xf2, 0x82, 0xc7, 0x42, 0x6a, 0x85, 0x4c, 0x2b, + 0xc9, 0xe7, 0xc8, 0xd3, 0x1b, 0xb8, 0x92, 0xc0, 0x43, 0x0a, 0x8c, 0xca, 0x9f, 0x40, 0xd6, 0xaf, + 0xf1, 0xf7, 0xbb, 0x7f, 0xb3, 0xde, 0x19, 0x68, 0xb3, 0x33, 0xd0, 0xfb, 0xce, 0x40, 0xcf, 0x7b, + 0x43, 0xdb, 0xec, 0x0d, 0xed, 0x75, 0x6f, 0x68, 0x77, 0xbd, 0xa3, 0xbe, 0xea, 0x9e, 0x3a, 0x3c, + 0xf6, 0x0f, 0x33, 0x79, 0xfc, 0x71, 0x7c, 0x59, 0x7f, 0xb7, 0x94, 0x1d, 0xcd, 0xe5, 0x57, 0x00, + 0x00, 0x00, 0xff, 0xff, 0x73, 0x51, 0x88, 0xb3, 0xa0, 0x02, 0x00, 0x00, } func (m *Fee) Marshal() (dAtA []byte, err error) { diff --git a/x/feerefunder/types/genesis.go b/x/feerefunder/types/genesis.go index f96ea4e8a..6ba34ee3e 100644 --- a/x/feerefunder/types/genesis.go +++ b/x/feerefunder/types/genesis.go @@ -6,7 +6,7 @@ import ( wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - host "github.com/cosmos/ibc-go/v4/modules/core/24-host" + host "github.com/cosmos/ibc-go/v7/modules/core/24-host" ) // DefaultGenesis returns the default genesis state diff --git a/x/feerefunder/types/genesis.pb.go b/x/feerefunder/types/genesis.pb.go index b0bdde789..49ec297e9 100644 --- a/x/feerefunder/types/genesis.pb.go +++ b/x/feerefunder/types/genesis.pb.go @@ -1,12 +1,12 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: feerefunder/genesis.proto +// source: neutron/feerefunder/genesis.proto package types import ( fmt "fmt" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" @@ -33,7 +33,7 @@ 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_582fc3ebaf316c40, []int{0} + return fileDescriptor_43aedfe31f06653d, []int{0} } func (m *GenesisState) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -86,7 +86,7 @@ func (m *FeeInfo) Reset() { *m = FeeInfo{} } func (m *FeeInfo) String() string { return proto.CompactTextString(m) } func (*FeeInfo) ProtoMessage() {} func (*FeeInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_582fc3ebaf316c40, []int{1} + return fileDescriptor_43aedfe31f06653d, []int{1} } func (m *FeeInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -141,30 +141,30 @@ func init() { proto.RegisterType((*FeeInfo)(nil), "neutron.feerefunder.FeeInfo") } -func init() { proto.RegisterFile("feerefunder/genesis.proto", fileDescriptor_582fc3ebaf316c40) } +func init() { proto.RegisterFile("neutron/feerefunder/genesis.proto", fileDescriptor_43aedfe31f06653d) } -var fileDescriptor_582fc3ebaf316c40 = []byte{ - // 312 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x90, 0xb1, 0x4e, 0xf3, 0x30, - 0x14, 0x85, 0xe3, 0xf6, 0xff, 0x0b, 0x75, 0x99, 0x4c, 0x91, 0x4c, 0x01, 0x53, 0x75, 0xea, 0x42, - 0x82, 0xca, 0xc4, 0x04, 0xaa, 0x10, 0xa8, 0x12, 0x03, 0x2a, 0x1b, 0x4b, 0x95, 0xb6, 0xd7, 0x21, - 0x42, 0xb5, 0x23, 0xc7, 0x91, 0xe8, 0x2b, 0x30, 0x21, 0xf1, 0x52, 0x1d, 0x3b, 0x32, 0x21, 0x94, - 0xbc, 0x08, 0x8a, 0xed, 0x4a, 0x19, 0xda, 0xcd, 0xd7, 0xf7, 0x7c, 0xe7, 0x1c, 0x5d, 0x7c, 0xcc, - 0x01, 0x14, 0xf0, 0x4c, 0xcc, 0x41, 0x05, 0x11, 0x08, 0x48, 0xe3, 0xd4, 0x4f, 0x94, 0xd4, 0x92, - 0x1c, 0x0a, 0xc8, 0xb4, 0x92, 0xc2, 0xaf, 0x48, 0x3a, 0xed, 0x48, 0x46, 0xd2, 0xec, 0x83, 0xf2, - 0x65, 0xa5, 0x1d, 0x5a, 0x75, 0x49, 0x42, 0x15, 0x2e, 0x9c, 0x49, 0xe7, 0xa8, 0xba, 0xe1, 0x00, - 0xf6, 0xbb, 0xf7, 0x81, 0xf0, 0xc1, 0x83, 0x4d, 0x7b, 0xd6, 0xa1, 0x06, 0x72, 0x8d, 0x1b, 0x96, - 0xa3, 0xa8, 0x8b, 0xfa, 0xad, 0xc1, 0x89, 0xbf, 0x25, 0xdd, 0x7f, 0x32, 0x92, 0xe1, 0xbf, 0xd5, - 0xcf, 0xb9, 0x37, 0x76, 0x00, 0xb9, 0xc1, 0x4d, 0x0e, 0x30, 0x89, 0x05, 0x97, 0x29, 0xad, 0x75, - 0xeb, 0xfd, 0xd6, 0xe0, 0x74, 0x2b, 0x7d, 0x0f, 0x30, 0x12, 0x5c, 0x3a, 0x7c, 0x9f, 0xdb, 0x31, - 0xed, 0x7d, 0x21, 0xbc, 0xe7, 0x76, 0xa4, 0x8d, 0xff, 0x27, 0xe1, 0x12, 0x94, 0xa9, 0xd1, 0x1c, - 0xdb, 0x81, 0xdc, 0xe2, 0x66, 0x12, 0xce, 0xde, 0x40, 0x4f, 0xe2, 0x39, 0xad, 0x99, 0x82, 0x67, - 0x3b, 0x0a, 0x96, 0xaa, 0xd1, 0xdd, 0x26, 0xc3, 0x52, 0xa3, 0x39, 0xb9, 0xc4, 0x75, 0x0e, 0x40, - 0xeb, 0x86, 0xa5, 0xbb, 0xea, 0x39, 0xac, 0x94, 0x0e, 0x1f, 0x57, 0x39, 0x43, 0xeb, 0x9c, 0xa1, - 0xdf, 0x9c, 0xa1, 0xcf, 0x82, 0x79, 0xeb, 0x82, 0x79, 0xdf, 0x05, 0xf3, 0x5e, 0x06, 0x51, 0xac, - 0x5f, 0xb3, 0xa9, 0x3f, 0x93, 0x8b, 0xc0, 0x19, 0x5d, 0x48, 0x15, 0x6d, 0xde, 0xc1, 0x7b, 0x50, - 0x3d, 0xba, 0x5e, 0x26, 0x90, 0x4e, 0x1b, 0xe6, 0xee, 0x57, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, - 0xe4, 0xe1, 0xac, 0xa1, 0xf0, 0x01, 0x00, 0x00, +var fileDescriptor_43aedfe31f06653d = []byte{ + // 313 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x90, 0xc1, 0x4a, 0xf3, 0x40, + 0x10, 0xc7, 0xb3, 0xed, 0xf7, 0x55, 0xbb, 0xf5, 0xb4, 0xf6, 0x10, 0xaa, 0x5d, 0x6b, 0x4f, 0xbd, + 0x98, 0x48, 0x3d, 0x79, 0x52, 0x8a, 0x28, 0x01, 0x0f, 0x52, 0x6f, 0x5e, 0x4a, 0xda, 0xcc, 0xc6, + 0x20, 0xdd, 0x0d, 0x9b, 0x0d, 0xd8, 0x57, 0xf0, 0x24, 0xf8, 0x52, 0x3d, 0xf6, 0xe8, 0x49, 0x24, + 0x79, 0x11, 0xc9, 0xee, 0x16, 0x14, 0xd2, 0xdb, 0x0c, 0xf3, 0xfb, 0xcd, 0xfc, 0x19, 0x7c, 0xca, + 0x21, 0x57, 0x52, 0x70, 0x9f, 0x01, 0x48, 0x60, 0x39, 0x8f, 0x40, 0xfa, 0x31, 0x70, 0xc8, 0x92, + 0xcc, 0x4b, 0xa5, 0x50, 0x82, 0x1c, 0x5a, 0xc4, 0xfb, 0x85, 0xf4, 0xba, 0xb1, 0x88, 0x85, 0x9e, + 0xfb, 0x55, 0x65, 0xd0, 0xde, 0xa0, 0x6e, 0x5b, 0x1a, 0xca, 0x70, 0x69, 0x97, 0xf5, 0xfa, 0x75, + 0x04, 0x03, 0x30, 0xe3, 0xe1, 0x1b, 0xc2, 0x07, 0x77, 0xe6, 0xfa, 0xa3, 0x0a, 0x15, 0x90, 0x4b, + 0xdc, 0x32, 0xbe, 0x8b, 0x06, 0x68, 0xd4, 0x19, 0x1f, 0x79, 0x35, 0x69, 0xbc, 0x07, 0x8d, 0x4c, + 0xfe, 0xad, 0xbf, 0x4e, 0x9c, 0xa9, 0x15, 0xc8, 0x15, 0x6e, 0x33, 0x80, 0x59, 0xc2, 0x99, 0xc8, + 0xdc, 0xc6, 0xa0, 0x39, 0xea, 0x8c, 0x8f, 0x6b, 0xed, 0x5b, 0x80, 0x80, 0x33, 0x61, 0xf5, 0x7d, + 0x66, 0xda, 0x6c, 0xf8, 0x81, 0xf0, 0x9e, 0x9d, 0x91, 0x2e, 0xfe, 0x9f, 0x86, 0x2b, 0x90, 0x3a, + 0x46, 0x7b, 0x6a, 0x1a, 0x72, 0x8d, 0xdb, 0x69, 0xb8, 0x78, 0x01, 0x35, 0x4b, 0x22, 0xb7, 0xa1, + 0x03, 0xf6, 0x77, 0x04, 0xac, 0xa8, 0xe0, 0x66, 0x7b, 0xc3, 0x58, 0x41, 0x44, 0xce, 0x71, 0x93, + 0x01, 0xb8, 0x4d, 0xed, 0xba, 0xbb, 0xe2, 0x59, 0xad, 0x42, 0x27, 0xf7, 0xeb, 0x82, 0xa2, 0x4d, + 0x41, 0xd1, 0x77, 0x41, 0xd1, 0x7b, 0x49, 0x9d, 0x4d, 0x49, 0x9d, 0xcf, 0x92, 0x3a, 0x4f, 0xe3, + 0x38, 0x51, 0xcf, 0xf9, 0xdc, 0x5b, 0x88, 0xa5, 0x6f, 0x17, 0x9d, 0x09, 0x19, 0x6f, 0x6b, 0xff, + 0xf5, 0xcf, 0xd3, 0xd5, 0x2a, 0x85, 0x6c, 0xde, 0xd2, 0x7f, 0xbf, 0xf8, 0x09, 0x00, 0x00, 0xff, + 0xff, 0x64, 0x48, 0xa9, 0x7f, 0x08, 0x02, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/feerefunder/types/params.pb.go b/x/feerefunder/types/params.pb.go index a10f2141a..1055a3794 100644 --- a/x/feerefunder/types/params.pb.go +++ b/x/feerefunder/types/params.pb.go @@ -1,12 +1,12 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: feerefunder/params.proto +// source: neutron/feerefunder/params.proto package types import ( fmt "fmt" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" @@ -31,7 +31,7 @@ type Params struct { func (m *Params) Reset() { *m = Params{} } func (*Params) ProtoMessage() {} func (*Params) Descriptor() ([]byte, []int) { - return fileDescriptor_b29edda2b6ec7f73, []int{0} + return fileDescriptor_2dae67276ca81c89, []int{0} } func (m *Params) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -71,23 +71,23 @@ func init() { proto.RegisterType((*Params)(nil), "neutron.feerefunder.Params") } -func init() { proto.RegisterFile("feerefunder/params.proto", fileDescriptor_b29edda2b6ec7f73) } +func init() { proto.RegisterFile("neutron/feerefunder/params.proto", fileDescriptor_2dae67276ca81c89) } -var fileDescriptor_b29edda2b6ec7f73 = []byte{ - // 202 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x48, 0x4b, 0x4d, 0x2d, - 0x4a, 0x4d, 0x2b, 0xcd, 0x4b, 0x49, 0x2d, 0xd2, 0x2f, 0x48, 0x2c, 0x4a, 0xcc, 0x2d, 0xd6, 0x2b, - 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0xce, 0x4b, 0x2d, 0x2d, 0x29, 0xca, 0xcf, 0xd3, 0x43, 0x52, - 0x21, 0x25, 0x92, 0x9e, 0x9f, 0x9e, 0x0f, 0x96, 0xd7, 0x07, 0xb1, 0x20, 0x4a, 0xa5, 0x44, 0x91, - 0x0d, 0x49, 0x4b, 0x4d, 0x85, 0x08, 0x2b, 0xb9, 0x73, 0xb1, 0x05, 0x80, 0x4d, 0x14, 0x32, 0xe7, - 0x62, 0xcf, 0xcd, 0xcc, 0x8b, 0x4f, 0x4b, 0x4d, 0x95, 0x60, 0x54, 0x60, 0xd4, 0xe0, 0x36, 0x92, - 0xd0, 0xc3, 0x62, 0xba, 0x9e, 0x5b, 0x6a, 0xaa, 0x13, 0xcb, 0x89, 0x7b, 0xf2, 0x0c, 0x41, 0x6c, - 0xb9, 0x99, 0x79, 0x6e, 0xa9, 0xa9, 0x56, 0x2c, 0x33, 0x16, 0xc8, 0x33, 0x38, 0xf9, 0x9c, 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, 0x51, 0x7a, 0x66, 0x49, 0x46, 0x69, 0x92, - 0x5e, 0x72, 0x7e, 0xae, 0x3e, 0xd4, 0x44, 0xdd, 0xfc, 0xa2, 0x74, 0x18, 0x5b, 0xbf, 0x42, 0x1f, - 0xd9, 0x69, 0x25, 0x95, 0x05, 0xa9, 0xc5, 0x49, 0x6c, 0x60, 0xd7, 0x19, 0x03, 0x02, 0x00, 0x00, - 0xff, 0xff, 0xd5, 0x9f, 0x23, 0x0b, 0xfb, 0x00, 0x00, 0x00, +var fileDescriptor_2dae67276ca81c89 = []byte{ + // 204 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0xc8, 0x4b, 0x2d, 0x2d, + 0x29, 0xca, 0xcf, 0xd3, 0x4f, 0x4b, 0x4d, 0x2d, 0x4a, 0x4d, 0x2b, 0xcd, 0x4b, 0x49, 0x2d, 0xd2, + 0x2f, 0x48, 0x2c, 0x4a, 0xcc, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x86, 0xaa, + 0xd0, 0x43, 0x52, 0x21, 0x25, 0x92, 0x9e, 0x9f, 0x9e, 0x0f, 0x96, 0xd7, 0x07, 0xb1, 0x20, 0x4a, + 0xa5, 0x64, 0xb1, 0x19, 0x96, 0x96, 0x9a, 0x0a, 0x91, 0x56, 0x72, 0xe7, 0x62, 0x0b, 0x00, 0x9b, + 0x2c, 0x64, 0xce, 0xc5, 0x9e, 0x9b, 0x99, 0x17, 0x9f, 0x96, 0x9a, 0x2a, 0xc1, 0xa8, 0xc0, 0xa8, + 0xc1, 0x6d, 0x24, 0xa1, 0x87, 0xc5, 0x16, 0x3d, 0xb7, 0xd4, 0x54, 0x27, 0x96, 0x13, 0xf7, 0xe4, + 0x19, 0x82, 0xd8, 0x72, 0x33, 0xf3, 0xdc, 0x52, 0x53, 0xad, 0x58, 0x66, 0x2c, 0x90, 0x67, 0x70, + 0xf2, 0x39, 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, 0xa3, 0xf4, 0xcc, 0x92, + 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0x7d, 0xa8, 0x89, 0xba, 0xf9, 0x45, 0xe9, 0x30, 0xb6, + 0x7e, 0x05, 0x8a, 0xd3, 0x4a, 0x2a, 0x0b, 0x52, 0x8b, 0x93, 0xd8, 0xc0, 0xae, 0x33, 0x06, 0x04, + 0x00, 0x00, 0xff, 0xff, 0xdb, 0x4c, 0x34, 0x0f, 0x0b, 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 9ca6a6f87..30a8b3b16 100644 --- a/x/feerefunder/types/query.pb.go +++ b/x/feerefunder/types/query.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: feerefunder/query.proto +// source: neutron/feerefunder/query.proto package types @@ -7,9 +7,9 @@ import ( context "context" fmt "fmt" _ "github.com/cosmos/cosmos-sdk/types/query" - _ "github.com/gogo/protobuf/gogoproto" - grpc1 "github.com/gogo/protobuf/grpc" - proto "github.com/gogo/protobuf/proto" + _ "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" @@ -38,7 +38,7 @@ 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_1975d512c0efffc5, []int{0} + return fileDescriptor_c20b5686ec46d4e6, []int{0} } func (m *QueryParamsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -77,7 +77,7 @@ 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_1975d512c0efffc5, []int{1} + return fileDescriptor_c20b5686ec46d4e6, []int{1} } func (m *QueryParamsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -123,7 +123,7 @@ func (m *FeeInfoRequest) Reset() { *m = FeeInfoRequest{} } func (m *FeeInfoRequest) String() string { return proto.CompactTextString(m) } func (*FeeInfoRequest) ProtoMessage() {} func (*FeeInfoRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_1975d512c0efffc5, []int{2} + return fileDescriptor_c20b5686ec46d4e6, []int{2} } func (m *FeeInfoRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -181,7 +181,7 @@ func (m *FeeInfoResponse) Reset() { *m = FeeInfoResponse{} } func (m *FeeInfoResponse) String() string { return proto.CompactTextString(m) } func (*FeeInfoResponse) ProtoMessage() {} func (*FeeInfoResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_1975d512c0efffc5, []int{3} + return fileDescriptor_c20b5686ec46d4e6, []int{3} } func (m *FeeInfoResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -224,38 +224,38 @@ func init() { proto.RegisterType((*FeeInfoResponse)(nil), "neutron.feerefunder.FeeInfoResponse") } -func init() { proto.RegisterFile("feerefunder/query.proto", fileDescriptor_1975d512c0efffc5) } - -var fileDescriptor_1975d512c0efffc5 = []byte{ - // 438 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0xc1, 0x6f, 0xd3, 0x30, - 0x14, 0xc6, 0xeb, 0x32, 0xda, 0xcd, 0x48, 0x20, 0x79, 0x93, 0x56, 0xca, 0x08, 0x53, 0x00, 0xb5, - 0x20, 0x2d, 0xd6, 0xca, 0x01, 0x71, 0xdd, 0x01, 0xa9, 0x88, 0xc3, 0xc8, 0x91, 0xcb, 0xe4, 0x24, - 0x2f, 0x5e, 0xa4, 0xd5, 0x2f, 0xb3, 0x1d, 0xc4, 0xae, 0x70, 0xe5, 0x80, 0xc4, 0x95, 0x3f, 0x68, - 0xc7, 0x49, 0x5c, 0x38, 0x21, 0xd4, 0xf2, 0x87, 0xa0, 0x38, 0xee, 0xd4, 0x69, 0xd1, 0x76, 0xb3, - 0xfd, 0x7d, 0xef, 0x7b, 0xbf, 0xf7, 0x12, 0xba, 0x9d, 0x03, 0x68, 0xc8, 0x2b, 0x95, 0x81, 0xe6, - 0xa7, 0x15, 0xe8, 0xb3, 0xa8, 0xd4, 0x68, 0x91, 0x6d, 0x2a, 0xa8, 0xac, 0x46, 0x15, 0xad, 0x18, - 0x86, 0x5b, 0x12, 0x25, 0x3a, 0x9d, 0xd7, 0xa7, 0xc6, 0x3a, 0xdc, 0x91, 0x88, 0xf2, 0x04, 0xb8, - 0x28, 0x0b, 0x2e, 0x94, 0x42, 0x2b, 0x6c, 0x81, 0xca, 0x78, 0xf5, 0x65, 0x8a, 0x66, 0x86, 0x86, - 0x27, 0xc2, 0x40, 0xd3, 0x81, 0x7f, 0xda, 0x4f, 0xc0, 0x8a, 0x7d, 0x5e, 0x0a, 0x59, 0x28, 0x67, - 0xf6, 0xde, 0xc1, 0x2a, 0x4d, 0x29, 0xb4, 0x98, 0x2d, 0x53, 0x1e, 0xae, 0x2a, 0x12, 0x14, 0x98, - 0xc2, 0x4b, 0xe1, 0x16, 0x65, 0x1f, 0xea, 0xd8, 0x43, 0xe7, 0x8f, 0xe1, 0xb4, 0x02, 0x63, 0xc3, - 0x43, 0xba, 0x79, 0xe5, 0xd5, 0x94, 0xa8, 0x0c, 0xb0, 0x37, 0xb4, 0xd7, 0xe4, 0x0e, 0xc8, 0x2e, - 0x19, 0xdf, 0x9b, 0x3c, 0x8a, 0x5a, 0xe6, 0x8c, 0x9a, 0xa2, 0x83, 0xb5, 0xf3, 0x3f, 0x4f, 0x3a, - 0xb1, 0x2f, 0x08, 0x33, 0x7a, 0xff, 0x2d, 0xc0, 0x54, 0xe5, 0xe8, 0x7b, 0xb0, 0xc7, 0x94, 0xa6, - 0xc7, 0x42, 0x29, 0x38, 0x39, 0x2a, 0x32, 0x17, 0xb8, 0x11, 0x6f, 0xf8, 0x97, 0x69, 0xc6, 0xb6, - 0x69, 0xbf, 0x44, 0x6d, 0x6b, 0xad, 0xeb, 0xb4, 0x5e, 0x7d, 0x9d, 0x66, 0x6c, 0x48, 0xd7, 0x4d, - 0x1d, 0xa1, 0x52, 0x18, 0xdc, 0xd9, 0x25, 0xe3, 0xb5, 0xf8, 0xf2, 0x1e, 0xbe, 0xa3, 0x0f, 0x2e, - 0xbb, 0x78, 0xe6, 0xd7, 0x74, 0x3d, 0x07, 0x38, 0x2a, 0x54, 0x8e, 0x9e, 0x7a, 0xa7, 0x95, 0x7a, - 0x59, 0xd7, 0xcf, 0x9b, 0xc3, 0xe4, 0x67, 0x97, 0xde, 0x75, 0x4b, 0x60, 0xdf, 0x08, 0xed, 0x35, - 0x43, 0xb1, 0x51, 0x6b, 0xed, 0xf5, 0x0d, 0x0e, 0xc7, 0xb7, 0x1b, 0x1b, 0xc0, 0x90, 0x7f, 0xf9, - 0xf5, 0xef, 0x47, 0xf7, 0x05, 0x1b, 0x71, 0x5f, 0xb1, 0x87, 0x5a, 0x2e, 0xcf, 0xfc, 0xfa, 0x37, - 0x65, 0x5f, 0x09, 0xed, 0x7b, 0x5a, 0xf6, 0xf4, 0xc6, 0x59, 0x3c, 0xcb, 0xb3, 0x9b, 0x4d, 0x9e, - 0x63, 0xcf, 0x71, 0x8c, 0xd8, 0xf3, 0x5b, 0x39, 0xea, 0x5d, 0x1e, 0xbc, 0x3f, 0x9f, 0x07, 0xe4, - 0x62, 0x1e, 0x90, 0xbf, 0xf3, 0x80, 0x7c, 0x5f, 0x04, 0x9d, 0x8b, 0x45, 0xd0, 0xf9, 0xbd, 0x08, - 0x3a, 0x1f, 0x27, 0xb2, 0xb0, 0xc7, 0x55, 0x12, 0xa5, 0x38, 0x6b, 0x8d, 0xfa, 0x7c, 0x25, 0xcc, - 0x9e, 0x95, 0x60, 0x92, 0x9e, 0xfb, 0x1b, 0x5f, 0xfd, 0x0f, 0x00, 0x00, 0xff, 0xff, 0xd9, 0x8f, - 0xfe, 0x45, 0x52, 0x03, 0x00, 0x00, +func init() { proto.RegisterFile("neutron/feerefunder/query.proto", fileDescriptor_c20b5686ec46d4e6) } + +var fileDescriptor_c20b5686ec46d4e6 = []byte{ + // 439 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0xb1, 0x6f, 0xd4, 0x30, + 0x14, 0xc6, 0xcf, 0x47, 0xb9, 0x6b, 0x8d, 0x04, 0x92, 0x5b, 0x89, 0x2a, 0x94, 0xf4, 0x08, 0xa0, + 0x3b, 0x90, 0x1a, 0xab, 0xc7, 0x80, 0x58, 0x3b, 0x20, 0x1d, 0x62, 0x28, 0x19, 0x59, 0x2a, 0x27, + 0x79, 0x71, 0x23, 0xf5, 0xfc, 0x52, 0xdb, 0x41, 0x74, 0x85, 0x95, 0x01, 0x89, 0x95, 0x3f, 0xa8, + 0x63, 0x25, 0x16, 0x26, 0x84, 0xee, 0xf8, 0x43, 0x50, 0x1c, 0xb7, 0xa2, 0x22, 0x6d, 0x37, 0xdb, + 0xef, 0xfb, 0xbe, 0xf7, 0x7b, 0x2f, 0xa1, 0xdb, 0x0a, 0x6a, 0xab, 0x51, 0xf1, 0x02, 0x40, 0x43, + 0x51, 0xab, 0x1c, 0x34, 0x3f, 0xae, 0x41, 0x9f, 0xc4, 0x95, 0x46, 0x8b, 0x6c, 0xdd, 0x0b, 0xe2, + 0x7f, 0x04, 0xc1, 0x86, 0x44, 0x89, 0xae, 0xce, 0x9b, 0x53, 0x2b, 0x0d, 0xb6, 0x24, 0xa2, 0x3c, + 0x02, 0x2e, 0xaa, 0x92, 0x0b, 0xa5, 0xd0, 0x0a, 0x5b, 0xa2, 0x32, 0xbe, 0xfa, 0x3c, 0x43, 0x33, + 0x47, 0xc3, 0x53, 0x61, 0xa0, 0xed, 0xc0, 0x3f, 0xec, 0xa6, 0x60, 0xc5, 0x2e, 0xaf, 0x84, 0x2c, + 0x95, 0x13, 0x7b, 0xed, 0xa8, 0x8b, 0xaa, 0x12, 0x5a, 0xcc, 0xcf, 0xd3, 0x1e, 0x75, 0x29, 0x24, + 0x28, 0x30, 0xa5, 0x97, 0x44, 0x1b, 0x94, 0xbd, 0x6b, 0xda, 0xec, 0x3b, 0x5f, 0x02, 0xc7, 0x35, + 0x18, 0x1b, 0xed, 0xd3, 0xf5, 0x4b, 0xaf, 0xa6, 0x42, 0x65, 0x80, 0xbd, 0xa2, 0x83, 0x36, 0x7f, + 0x93, 0x8c, 0xc8, 0xe4, 0xce, 0xf4, 0x41, 0xdc, 0x31, 0x77, 0xdc, 0x9a, 0xf6, 0x56, 0x4e, 0x7f, + 0x6d, 0xf7, 0x12, 0x6f, 0x88, 0x72, 0x7a, 0xf7, 0x35, 0xc0, 0x4c, 0x15, 0xe8, 0x7b, 0xb0, 0x87, + 0x94, 0x66, 0x87, 0x42, 0x29, 0x38, 0x3a, 0x28, 0x73, 0x17, 0xb8, 0x96, 0xac, 0xf9, 0x97, 0x59, + 0xce, 0xee, 0xd3, 0x61, 0x85, 0xda, 0x36, 0xb5, 0xbe, 0xab, 0x0d, 0x9a, 0xeb, 0x2c, 0x67, 0x01, + 0x5d, 0x35, 0x4d, 0x84, 0xca, 0x60, 0xf3, 0xd6, 0x88, 0x4c, 0x56, 0x92, 0x8b, 0x7b, 0xf4, 0x86, + 0xde, 0xbb, 0xe8, 0xe2, 0x99, 0x5f, 0xd2, 0xd5, 0x02, 0xe0, 0xa0, 0x54, 0x05, 0x7a, 0xea, 0xad, + 0x4e, 0xea, 0x73, 0xdf, 0xb0, 0x68, 0x0f, 0xd3, 0xef, 0x7d, 0x7a, 0xdb, 0x2d, 0x81, 0x7d, 0x21, + 0x74, 0xd0, 0x0e, 0xc5, 0xc6, 0x9d, 0xde, 0xff, 0x37, 0x18, 0x4c, 0x6e, 0x16, 0xb6, 0x80, 0x11, + 0xff, 0xf4, 0xe3, 0xcf, 0xb7, 0xfe, 0x33, 0x36, 0xe6, 0xde, 0xb1, 0x83, 0x5a, 0xf2, 0xab, 0xbf, + 0x2d, 0xfb, 0x4c, 0xe8, 0xd0, 0xd3, 0xb2, 0xc7, 0xd7, 0xce, 0xe2, 0x59, 0x9e, 0x5c, 0x2f, 0xf2, + 0x1c, 0x3b, 0x8e, 0x63, 0xcc, 0x9e, 0xde, 0xc8, 0xd1, 0xec, 0x72, 0xef, 0xed, 0xe9, 0x22, 0x24, + 0x67, 0x8b, 0x90, 0xfc, 0x5e, 0x84, 0xe4, 0xeb, 0x32, 0xec, 0x9d, 0x2d, 0xc3, 0xde, 0xcf, 0x65, + 0xd8, 0x7b, 0x3f, 0x95, 0xa5, 0x3d, 0xac, 0xd3, 0x38, 0xc3, 0x79, 0x67, 0xd4, 0xc7, 0x4b, 0x61, + 0xf6, 0xa4, 0x02, 0x93, 0x0e, 0xdc, 0xdf, 0xf8, 0xe2, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xeb, + 0xca, 0xf3, 0x58, 0x6a, 0x03, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -373,7 +373,7 @@ var _Query_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "feerefunder/query.proto", + Metadata: "neutron/feerefunder/query.proto", } func (m *QueryParamsRequest) Marshal() (dAtA []byte, err error) { diff --git a/x/feerefunder/types/query.pb.gw.go b/x/feerefunder/types/query.pb.gw.go index 0814e7d0c..5dce6d4e1 100644 --- a/x/feerefunder/types/query.pb.gw.go +++ b/x/feerefunder/types/query.pb.gw.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-grpc-gateway. DO NOT EDIT. -// source: feerefunder/query.proto +// source: neutron/feerefunder/query.proto /* Package types is a reverse proxy. @@ -224,9 +224,9 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } var ( - pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"neutron-org", "neutron", "feerefunder", "params"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"neutron-org", "neutron", "feerefunder", "params"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_FeeInfo_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"neutron-org", "neutron", "feerefunder", "info"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_FeeInfo_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"neutron-org", "neutron", "feerefunder", "info"}, "", runtime.AssumeColonVerbOpt(false))) ) var ( diff --git a/x/feerefunder/types/tx.pb.go b/x/feerefunder/types/tx.pb.go index a35ac2337..9c51b8cd6 100644 --- a/x/feerefunder/types/tx.pb.go +++ b/x/feerefunder/types/tx.pb.go @@ -1,86 +1,86 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: feerefunder/tx.proto - +// // Code generated by protoc-gen-gogo. DO NOT EDIT. +// // source: feerefunder/tx.proto package types -import ( - context "context" - fmt "fmt" - math "math" - - _ "github.com/cosmos/cosmos-sdk/types" - _ "github.com/gogo/protobuf/gogoproto" - grpc1 "github.com/gogo/protobuf/grpc" - proto "github.com/gogo/protobuf/proto" - grpc "google.golang.org/grpc" -) - -// 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 - -func init() { proto.RegisterFile("feerefunder/tx.proto", fileDescriptor_af2a0269bf094340) } - -var fileDescriptor_af2a0269bf094340 = []byte{ - // 174 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x49, 0x4b, 0x4d, 0x2d, - 0x4a, 0x4d, 0x2b, 0xcd, 0x4b, 0x49, 0x2d, 0xd2, 0x2f, 0xa9, 0xd0, 0x2b, 0x28, 0xca, 0x2f, 0xc9, - 0x17, 0x92, 0xcb, 0x4b, 0x2d, 0x2d, 0x29, 0xca, 0xcf, 0xcb, 0x2f, 0x4a, 0xd7, 0x83, 0x32, 0xf5, - 0x90, 0x14, 0x4a, 0xc9, 0x25, 0xe7, 0x17, 0xe7, 0xe6, 0x17, 0xeb, 0x27, 0x25, 0x16, 0xa7, 0xea, - 0x97, 0x19, 0x26, 0xa5, 0x96, 0x24, 0x1a, 0xea, 0x27, 0xe7, 0x67, 0xe6, 0x41, 0xf4, 0x4b, 0x89, - 0xa4, 0xe7, 0xa7, 0xe7, 0x83, 0x99, 0xfa, 0x20, 0x16, 0x44, 0xd4, 0x88, 0x95, 0x8b, 0xd9, 0xb7, - 0x38, 0xdd, 0xc9, 0xe7, 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, 0x8c, 0xd2, - 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xf5, 0xa1, 0xd6, 0xea, 0xe6, 0x17, 0xa5, - 0xc3, 0xd8, 0xfa, 0x15, 0xfa, 0x28, 0xae, 0xad, 0x2c, 0x48, 0x2d, 0x4e, 0x62, 0x03, 0x9b, 0x6d, - 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x2f, 0x8f, 0xb3, 0x6d, 0xc9, 0x00, 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 { -} - -type msgClient struct { - cc grpc1.ClientConn -} - -func NewMsgClient(cc grpc1.ClientConn) MsgClient { - return &msgClient{cc} -} - -// MsgServer is the server API for Msg service. -type MsgServer interface { -} - -// UnimplementedMsgServer can be embedded to have forward compatible implementations. -type UnimplementedMsgServer struct { -} - -func RegisterMsgServer(s grpc1.Server, srv MsgServer) { - s.RegisterService(&_Msg_serviceDesc, srv) -} - -var _Msg_serviceDesc = grpc.ServiceDesc{ - ServiceName: "neutronorg.neutron.feerefunder.Msg", - HandlerType: (*MsgServer)(nil), - Methods: []grpc.MethodDesc{}, - Streams: []grpc.StreamDesc{}, - Metadata: "feerefunder/tx.proto", -} +//import ( +// context "context" +// fmt "fmt" +// math "math" +// +// _ "github.com/cosmos/cosmos-sdk/types" +// _ "github.com/gogo/protobuf/gogoproto" +// grpc1 "github.com/gogo/protobuf/grpc" +// proto "github.com/gogo/protobuf/proto" +// grpc "google.golang.org/grpc" +//) +// +//// 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 +// +//func init() { proto.RegisterFile("feerefunder/tx.proto", fileDescriptor_af2a0269bf094340) } +// +//var fileDescriptor_af2a0269bf094340 = []byte{ +// // 174 bytes of a gzipped FileDescriptorProto +// 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x49, 0x4b, 0x4d, 0x2d, +// 0x4a, 0x4d, 0x2b, 0xcd, 0x4b, 0x49, 0x2d, 0xd2, 0x2f, 0xa9, 0xd0, 0x2b, 0x28, 0xca, 0x2f, 0xc9, +// 0x17, 0x92, 0xcb, 0x4b, 0x2d, 0x2d, 0x29, 0xca, 0xcf, 0xcb, 0x2f, 0x4a, 0xd7, 0x83, 0x32, 0xf5, +// 0x90, 0x14, 0x4a, 0xc9, 0x25, 0xe7, 0x17, 0xe7, 0xe6, 0x17, 0xeb, 0x27, 0x25, 0x16, 0xa7, 0xea, +// 0x97, 0x19, 0x26, 0xa5, 0x96, 0x24, 0x1a, 0xea, 0x27, 0xe7, 0x67, 0xe6, 0x41, 0xf4, 0x4b, 0x89, +// 0xa4, 0xe7, 0xa7, 0xe7, 0x83, 0x99, 0xfa, 0x20, 0x16, 0x44, 0xd4, 0x88, 0x95, 0x8b, 0xd9, 0xb7, +// 0x38, 0xdd, 0xc9, 0xe7, 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, 0x8c, 0xd2, +// 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xf5, 0xa1, 0xd6, 0xea, 0xe6, 0x17, 0xa5, +// 0xc3, 0xd8, 0xfa, 0x15, 0xfa, 0x28, 0xae, 0xad, 0x2c, 0x48, 0x2d, 0x4e, 0x62, 0x03, 0x9b, 0x6d, +// 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x2f, 0x8f, 0xb3, 0x6d, 0xc9, 0x00, 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 { +//} +// +//type msgClient struct { +// cc grpc1.ClientConn +//} +// +//func NewMsgClient(cc grpc1.ClientConn) MsgClient { +// return &msgClient{cc} +//} +// +//// MsgServer is the server API for Msg service. +//type MsgServer interface { +//} +// +//// UnimplementedMsgServer can be embedded to have forward compatible implementations. +//type UnimplementedMsgServer struct { +//} +// +//func RegisterMsgServer(s grpc1.Server, srv MsgServer) { +// s.RegisterService(&_Msg_serviceDesc, srv) +//} +// +//var _Msg_serviceDesc = grpc.ServiceDesc{ +// ServiceName: "neutronorg.neutron.feerefunder.Msg", +// HandlerType: (*MsgServer)(nil), +// Methods: []grpc.MethodDesc{}, +// Streams: []grpc.StreamDesc{}, +// Metadata: "feerefunder/tx.proto", +//} diff --git a/x/ibc-hooks/hooks.go b/x/ibc-hooks/hooks.go index 8b6d4d0a9..3487aad96 100644 --- a/x/ibc-hooks/hooks.go +++ b/x/ibc-hooks/hooks.go @@ -6,8 +6,8 @@ import ( capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" // ibc-go - channeltypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" - ibcexported "github.com/cosmos/ibc-go/v4/modules/core/exported" + channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" + ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" ) type Hooks interface{} diff --git a/x/ibc-hooks/ibc_middleware_test.go b/x/ibc-hooks/ibc_middleware_test.go index 85393024c..a1257fa45 100644 --- a/x/ibc-hooks/ibc_middleware_test.go +++ b/x/ibc-hooks/ibc_middleware_test.go @@ -9,7 +9,7 @@ import ( wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" sdk "github.com/cosmos/cosmos-sdk/types" - ibctesting "github.com/cosmos/interchain-security/legacy_ibc_testing/testing" + ibctesting "github.com/cosmos/interchain-security/v3/legacy_ibc_testing/testing" "github.com/stretchr/testify/suite" "github.com/neutron-org/neutron/app/params" @@ -17,9 +17,9 @@ import ( "github.com/neutron-org/neutron/x/ibc-hooks/testutils" "github.com/neutron-org/neutron/x/ibc-hooks/utils" - transfertypes "github.com/cosmos/ibc-go/v4/modules/apps/transfer/types" - clienttypes "github.com/cosmos/ibc-go/v4/modules/core/02-client/types" - channeltypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" + transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" + clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" + channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" ) type HooksTestSuite struct { @@ -75,13 +75,13 @@ func (suite *HooksTestSuite) TestOnRecvPacketHooks() { suite.ChainA.SenderAccount.GetAddress().String(), receiver, clienttypes.NewHeight(1, 110), - 0) + 0, "") _, err := suite.ChainA.SendMsgs(transferMsg) suite.Require().NoError(err) // message committed tc.malleate(&status) - data := transfertypes.NewFungibleTokenPacketData(trace.GetFullDenomPath(), amount.String(), suite.ChainA.SenderAccount.GetAddress().String(), receiver) + 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. @@ -142,9 +142,10 @@ func (suite *HooksTestSuite) receivePacketWithSequence(receiver, memo string, pr packet := suite.makeMockPacket(receiver, memo, prevSequence) - err := suite.GetNeutronZoneApp(suite.ChainB).HooksICS4Wrapper.SendPacket( - suite.ChainB.GetContext(), channelCap, packet) + seq_id, err := suite.GetNeutronZoneApp(suite.ChainB).HooksICS4Wrapper.SendPacket( + suite.ChainB.GetContext(), channelCap, suite.TransferPath.EndpointA.ChannelConfig.PortID, suite.TransferPath.EndpointA.ChannelID, packet.TimeoutHeight, packet.TimeoutTimestamp, packet.Data) suite.Require().NoError(err, "IBC send failed. Expected success. %s", err) + suite.Require().Equal(prevSequence+1, seq_id) // Update both clients err = suite.TransferPath.EndpointB.UpdateClient() diff --git a/x/ibc-hooks/ibc_module.go b/x/ibc-hooks/ibc_module.go index b60193fda..4145d70b7 100644 --- a/x/ibc-hooks/ibc_module.go +++ b/x/ibc-hooks/ibc_module.go @@ -4,11 +4,12 @@ import ( // external libraries sdk "github.com/cosmos/cosmos-sdk/types" capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" + clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" // ibc-go - channeltypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" - porttypes "github.com/cosmos/ibc-go/v4/modules/core/05-port/types" - ibcexported "github.com/cosmos/ibc-go/v4/modules/core/exported" + channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" + porttypes "github.com/cosmos/ibc-go/v7/modules/core/05-port/types" + ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" ) var _ porttypes.Middleware = &IBCMiddleware{} @@ -235,11 +236,9 @@ func (im IBCMiddleware) OnTimeoutPacket( // SendPacket implements the ICS4 Wrapper interface func (im IBCMiddleware) SendPacket( - ctx sdk.Context, - chanCap *capabilitytypes.Capability, - packet ibcexported.PacketI, -) error { - return im.ICS4Middleware.SendPacket(ctx, chanCap, packet) + ctx sdk.Context, channelCap *capabilitytypes.Capability, sourcePort string, sourceChannel string, timeoutHeight clienttypes.Height, timeoutTimestamp uint64, data []byte, +) (sequence uint64, err error) { + return im.ICS4Middleware.SendPacket(ctx, channelCap, sourcePort, sourceChannel, timeoutHeight, timeoutTimestamp, data) } // WriteAcknowledgement implements the ICS4 Wrapper interface diff --git a/x/ibc-hooks/ics4_middleware.go b/x/ibc-hooks/ics4_middleware.go index 19ef100f6..c3e249302 100644 --- a/x/ibc-hooks/ics4_middleware.go +++ b/x/ibc-hooks/ics4_middleware.go @@ -3,45 +3,58 @@ package ibchooks import ( // external libraries sdk "github.com/cosmos/cosmos-sdk/types" + sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" + clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" + "github.com/neutron-org/neutron/x/ibc-hooks/types" // ibc-go - porttypes "github.com/cosmos/ibc-go/v4/modules/core/05-port/types" - ibcexported "github.com/cosmos/ibc-go/v4/modules/core/exported" + channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" + porttypes "github.com/cosmos/ibc-go/v7/modules/core/05-port/types" + ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" ) var _ porttypes.ICS4Wrapper = &ICS4Middleware{} type ICS4Middleware struct { - channel porttypes.ICS4Wrapper + channelKeeper types.ChannelKeeper + channel porttypes.ICS4Wrapper // Hooks Hooks Hooks } -func NewICS4Middleware(channel porttypes.ICS4Wrapper, hooks Hooks) ICS4Middleware { +func NewICS4Middleware(channelKeeper types.ChannelKeeper, channel porttypes.ICS4Wrapper, hooks Hooks) ICS4Middleware { return ICS4Middleware{ - channel: channel, - Hooks: hooks, + channelKeeper: channelKeeper, + channel: channel, + Hooks: hooks, } } -func (i ICS4Middleware) SendPacket(ctx sdk.Context, channelCap *capabilitytypes.Capability, packet ibcexported.PacketI) error { +func (i ICS4Middleware) SendPacket(ctx sdk.Context, channelCap *capabilitytypes.Capability, sourcePort string, sourceChannel string, timeoutHeight clienttypes.Height, timeoutTimestamp uint64, data []byte) (sequence uint64, err error) { + channel, found := i.channelKeeper.GetChannel(ctx, sourcePort, sourceChannel) + if !found { + return 0, sdkerrors.Wrap(channeltypes.ErrChannelNotFound, sourceChannel) + } + + packet := channeltypes.NewPacket(data, sequence, sourcePort, sourceChannel, + channel.Counterparty.PortId, channel.Counterparty.ChannelId, timeoutHeight, timeoutTimestamp) if hook, ok := i.Hooks.(SendPacketOverrideHooks); ok { - return hook.SendPacketOverride(i, ctx, channelCap, packet) + return 0, hook.SendPacketOverride(i, ctx, channelCap, packet) } if hook, ok := i.Hooks.(SendPacketBeforeHooks); ok { hook.SendPacketBeforeHook(ctx, channelCap, packet) } - err := i.channel.SendPacket(ctx, channelCap, packet) + sequence, err = i.channel.SendPacket(ctx, channelCap, sourcePort, sourceChannel, timeoutHeight, timeoutTimestamp, data) if hook, ok := i.Hooks.(SendPacketAfterHooks); ok { hook.SendPacketAfterHook(ctx, channelCap, packet, err) } - return err + return sequence, err } func (i ICS4Middleware) WriteAcknowledgement(ctx sdk.Context, chanCap *capabilitytypes.Capability, packet ibcexported.PacketI, ack ibcexported.Acknowledgement) error { diff --git a/x/ibc-hooks/sdkmodule.go b/x/ibc-hooks/sdkmodule.go index f2be6ecec..73e73b3cd 100644 --- a/x/ibc-hooks/sdkmodule.go +++ b/x/ibc-hooks/sdkmodule.go @@ -1,9 +1,8 @@ package ibchooks import ( + "cosmossdk.io/core/appmodule" "encoding/json" - "fmt" - "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/types/module" @@ -16,8 +15,8 @@ import ( cdctypes "github.com/cosmos/cosmos-sdk/codec/types" + abci "github.com/cometbft/cometbft/abci/types" sdk "github.com/cosmos/cosmos-sdk/types" - abci "github.com/tendermint/tendermint/abci/types" ) var ( @@ -68,6 +67,7 @@ func (AppModuleBasic) GetQueryCmd() *cobra.Command { } // ___________________________________________________________________________ +var _ appmodule.AppModule = AppModule{} // AppModule implements an application module for the ibc-hooks module. type AppModule struct { @@ -89,22 +89,20 @@ func (AppModule) Name() string { return types.ModuleName } +// IsOnePerModuleType implements the depinject.OnePerModuleType interface. +func (am AppModule) IsOnePerModuleType() { // marker +} + +// IsAppModule implements the appmodule.AppModule interface. +func (am AppModule) IsAppModule() { // marker +} + // RegisterInvariants registers the ibc-hooks module invariants. func (am AppModule) RegisterInvariants(_ sdk.InvariantRegistry) {} -// Route returns the message routing key for the ibc-hooks module. -func (AppModule) Route() sdk.Route { return sdk.Route{} } - // QuerierRoute returns the module's querier route name. func (AppModule) QuerierRoute() string { - return "" -} - -// LegacyQuerierHandler returns the x/ibc-hooks module's sdk.Querier. -func (am AppModule) LegacyQuerierHandler(_ *codec.LegacyAmino) sdk.Querier { - return func(sdk.Context, []string, abci.RequestQuery) ([]byte, error) { - return nil, fmt.Errorf("legacy querier not supported for the x/%s module", types.ModuleName) - } + return types.RouteKey } // RegisterServices registers a gRPC query service to respond to the diff --git a/x/ibc-hooks/testutils/testing_hooks.go b/x/ibc-hooks/testutils/testing_hooks.go index a5cda30f5..05ff2f3f5 100644 --- a/x/ibc-hooks/testutils/testing_hooks.go +++ b/x/ibc-hooks/testutils/testing_hooks.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" // ibc-go - channeltypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" - ibcexported "github.com/cosmos/ibc-go/v4/modules/core/exported" + channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" + ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" ibchooks "github.com/neutron-org/neutron/x/ibc-hooks" ) diff --git a/x/ibc-hooks/types/expected_keepers.go b/x/ibc-hooks/types/expected_keepers.go index 308853fc7..11d6072cf 100644 --- a/x/ibc-hooks/types/expected_keepers.go +++ b/x/ibc-hooks/types/expected_keepers.go @@ -3,6 +3,7 @@ package types import ( sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" + channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" ) type AccountKeeper interface { @@ -11,3 +12,8 @@ type AccountKeeper interface { GetAccount(ctx sdk.Context, addr sdk.AccAddress) authtypes.AccountI SetAccount(ctx sdk.Context, acc authtypes.AccountI) } + +// ChannelKeeper defines the expected IBC channel keeper +type ChannelKeeper interface { + GetChannel(ctx sdk.Context, srcPort, srcChan string) (channel channeltypes.Channel, found bool) +} diff --git a/x/ibc-hooks/types/keys.go b/x/ibc-hooks/types/keys.go index 9a3e7ded1..861b1d241 100644 --- a/x/ibc-hooks/types/keys.go +++ b/x/ibc-hooks/types/keys.go @@ -2,6 +2,7 @@ package types const ( ModuleName = "ibchooks" + RouteKey = ModuleName StoreKey = "hooks-for-ibc" // not using the module name because of collisions with key "ibc" IBCCallbackKey = "ibc_callback" SenderPrefix = "ibc-wasm-hook-intermediary" diff --git a/x/ibc-hooks/utils/utils.go b/x/ibc-hooks/utils/utils.go index aaaa81d0c..c092af4db 100644 --- a/x/ibc-hooks/utils/utils.go +++ b/x/ibc-hooks/utils/utils.go @@ -8,9 +8,9 @@ import ( "github.com/neutron-org/neutron/x/ibc-hooks/types" sdk "github.com/cosmos/cosmos-sdk/types" - transfertypes "github.com/cosmos/ibc-go/v4/modules/apps/transfer/types" - channeltypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" - ibcexported "github.com/cosmos/ibc-go/v4/modules/core/exported" + transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" + channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" + ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" ) // NewEmitErrorAcknowledgement creates a new error acknowledgement after having emitted an event with the diff --git a/x/ibc-hooks/wasm_hook.go b/x/ibc-hooks/wasm_hook.go index a3a115bc9..8c7185408 100644 --- a/x/ibc-hooks/wasm_hook.go +++ b/x/ibc-hooks/wasm_hook.go @@ -10,9 +10,9 @@ import ( wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" sdk "github.com/cosmos/cosmos-sdk/types" - transfertypes "github.com/cosmos/ibc-go/v4/modules/apps/transfer/types" - channeltypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" - ibcexported "github.com/cosmos/ibc-go/v4/modules/core/exported" + transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" + channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" + ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" "github.com/neutron-org/neutron/x/ibc-hooks/types" ) @@ -23,11 +23,11 @@ type ContractAck struct { } type WasmHooks struct { - ContractKeeper *wasmkeeper.PermissionedKeeper + ContractKeeper *wasmkeeper.Keeper bech32PrefixAccAddr string } -func NewWasmHooks(contractKeeper *wasmkeeper.PermissionedKeeper, bech32PrefixAccAddr string) WasmHooks { +func NewWasmHooks(contractKeeper *wasmkeeper.Keeper, bech32PrefixAccAddr string) WasmHooks { return WasmHooks{ ContractKeeper: contractKeeper, bech32PrefixAccAddr: bech32PrefixAccAddr, diff --git a/x/interchainqueries/keeper/grpc_query.go b/x/interchainqueries/keeper/grpc_query.go index 6e93d1b9c..bef7174fb 100644 --- a/x/interchainqueries/keeper/grpc_query.go +++ b/x/interchainqueries/keeper/grpc_query.go @@ -7,8 +7,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" querytypes "github.com/cosmos/cosmos-sdk/types/query" - contypes "github.com/cosmos/ibc-go/v4/modules/core/03-connection/types" - tndtypes "github.com/cosmos/ibc-go/v4/modules/light-clients/07-tendermint/types" + contypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" + tndtypes "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" "github.com/gogo/protobuf/proto" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/x/interchainqueries/keeper/grpc_query_test.go b/x/interchainqueries/keeper/grpc_query_test.go index 96fa4da01..ee3eb7a5c 100644 --- a/x/interchainqueries/keeper/grpc_query_test.go +++ b/x/interchainqueries/keeper/grpc_query_test.go @@ -4,13 +4,14 @@ import ( "fmt" wasmKeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" - ibcclienttypes "github.com/cosmos/ibc-go/v4/modules/core/02-client/types" - host "github.com/cosmos/ibc-go/v4/modules/core/24-host" - abci "github.com/tendermint/tendermint/abci/types" + abci "github.com/cometbft/cometbft/abci/types" + ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" + host "github.com/cosmos/ibc-go/v7/modules/core/24-host" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" + ibchost "github.com/cosmos/ibc-go/v7/modules/core/exported" "github.com/neutron-org/neutron/x/interchainqueries/keeper" iqtypes "github.com/neutron-org/neutron/x/interchainqueries/types" ) @@ -480,7 +481,7 @@ func (suite *KeeperTestSuite) TestQueryResult() { registerMsg := iqtypes.MsgRegisterInterchainQuery{ ConnectionId: suite.Path.EndpointA.ConnectionID, Keys: []*iqtypes.KVKey{ - {Path: host.StoreKey, Key: clientKey}, + {Path: ibchost.StoreKey, Key: clientKey}, }, QueryType: string(iqtypes.InterchainQueryTypeKV), UpdatePeriod: 1, @@ -500,7 +501,7 @@ func (suite *KeeperTestSuite) TestQueryResult() { suite.Require().NoError(err) resp := suite.ChainB.App.Query(abci.RequestQuery{ - Path: fmt.Sprintf("store/%s/key", host.StoreKey), + Path: fmt.Sprintf("store/%s/key", ibchost.StoreKey), Height: suite.ChainB.LastHeader.Header.Height - 1, Data: clientKey, Prove: true, @@ -515,7 +516,7 @@ func (suite *KeeperTestSuite) TestQueryResult() { Key: resp.Key, Proof: resp.ProofOps, Value: resp.Value, - StoragePrefix: host.StoreKey, + StoragePrefix: ibchost.StoreKey, }}, // we don't have tests to test transactions proofs verification since it's a tendermint layer, // and we don't have access to it here diff --git a/x/interchainqueries/keeper/keeper.go b/x/interchainqueries/keeper/keeper.go index 782590d07..13e59d7b5 100644 --- a/x/interchainqueries/keeper/keeper.go +++ b/x/interchainqueries/keeper/keeper.go @@ -4,16 +4,16 @@ import ( "fmt" "time" + "github.com/cometbft/cometbft/libs/log" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/store/prefix" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - ibcclienttypes "github.com/cosmos/ibc-go/v4/modules/core/02-client/types" - ibckeeper "github.com/cosmos/ibc-go/v4/modules/core/keeper" - tendermintLightClientTypes "github.com/cosmos/ibc-go/v4/modules/light-clients/07-tendermint/types" - "github.com/tendermint/tendermint/libs/log" + ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" + ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper" + tendermintLightClientTypes "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" "github.com/neutron-org/neutron/x/interchainqueries/types" ) diff --git a/x/interchainqueries/keeper/keeper_test.go b/x/interchainqueries/keeper/keeper_test.go index c23ec40d0..6edfcc4f9 100644 --- a/x/interchainqueries/keeper/keeper_test.go +++ b/x/interchainqueries/keeper/keeper_test.go @@ -3,6 +3,7 @@ package keeper_test import ( "encoding/hex" "fmt" + ibchost "github.com/cosmos/ibc-go/v7/modules/core/exported" "testing" sdk "github.com/cosmos/cosmos-sdk/types" @@ -12,9 +13,9 @@ import ( "github.com/neutron-org/neutron/app/params" wasmKeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" - ibcclienttypes "github.com/cosmos/ibc-go/v4/modules/core/02-client/types" - host "github.com/cosmos/ibc-go/v4/modules/core/24-host" - abci "github.com/tendermint/tendermint/abci/types" + abci "github.com/cometbft/cometbft/abci/types" + ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" + host "github.com/cosmos/ibc-go/v7/modules/core/24-host" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" @@ -618,7 +619,7 @@ func (suite *KeeperTestSuite) TestRemoveInterchainQuery() { clientKey := host.FullClientStateKey(suite.Path.EndpointB.ClientID) resp := suite.ChainB.App.Query(abci.RequestQuery{ - Path: fmt.Sprintf("store/%s/key", host.StoreKey), + Path: fmt.Sprintf("store/%s/key", ibchost.StoreKey), Height: suite.ChainB.LastHeader.Header.Height - 1, Data: clientKey, Prove: true, @@ -632,7 +633,7 @@ func (suite *KeeperTestSuite) TestRemoveInterchainQuery() { Key: resp.Key, Proof: resp.ProofOps, Value: resp.Value, - StoragePrefix: host.StoreKey, + StoragePrefix: ibchost.StoreKey, }}, Block: nil, Height: 1, @@ -763,7 +764,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { // now we don't care what is really under the value, we just need to be sure that we can verify KV proofs clientKey := host.FullClientStateKey(suite.Path.EndpointB.ClientID) resp := suite.ChainB.App.Query(abci.RequestQuery{ - Path: fmt.Sprintf("store/%s/key", host.StoreKey), + Path: fmt.Sprintf("store/%s/key", ibchost.StoreKey), Height: suite.ChainB.LastHeader.Header.Height - 1, Data: clientKey, Prove: true, @@ -778,7 +779,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { Key: resp.Key, Proof: resp.ProofOps, Value: resp.Value, - StoragePrefix: host.StoreKey, + StoragePrefix: ibchost.StoreKey, }}, // we don't have tests to test transactions proofs verification since it's a tendermint layer, and we don't have access to it here Block: nil, @@ -796,7 +797,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { registerMsg := iqtypes.MsgRegisterInterchainQuery{ ConnectionId: suite.Path.EndpointA.ConnectionID, Keys: []*iqtypes.KVKey{ - {Path: host.StoreKey, Key: clientKey}, + {Path: ibchost.StoreKey, Key: clientKey}, }, QueryType: string(iqtypes.InterchainQueryTypeKV), UpdatePeriod: 1, @@ -812,7 +813,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { suite.NoError(suite.Path.EndpointA.UpdateClient()) resp := suite.ChainB.App.Query(abci.RequestQuery{ - Path: fmt.Sprintf("store/%s/key", host.StoreKey), + Path: fmt.Sprintf("store/%s/key", ibchost.StoreKey), Height: suite.ChainB.LastHeader.Header.Height - 1, Data: clientKey, Prove: true, @@ -827,7 +828,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { Key: resp.Key, Proof: resp.ProofOps, Value: resp.Value, - StoragePrefix: host.StoreKey, + StoragePrefix: ibchost.StoreKey, }}, // we don't have tests to test transactions proofs verification since it's a tendermint layer, // and we don't have access to it here @@ -846,7 +847,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { registerMsg := iqtypes.MsgRegisterInterchainQuery{ ConnectionId: suite.Path.EndpointA.ConnectionID, Keys: []*iqtypes.KVKey{ - {Path: host.StoreKey, Key: clientKey}, + {Path: ibchost.StoreKey, Key: clientKey}, }, QueryType: string(iqtypes.InterchainQueryTypeKV), UpdatePeriod: 1, @@ -862,7 +863,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { suite.NoError(suite.Path.EndpointA.UpdateClient()) resp := suite.ChainB.App.Query(abci.RequestQuery{ - Path: fmt.Sprintf("store/%s/key", host.StoreKey), + Path: fmt.Sprintf("store/%s/key", ibchost.StoreKey), Height: suite.ChainB.LastHeader.Header.Height - 1, Data: clientKey, Prove: true, @@ -877,12 +878,12 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { Key: resp.Key, Proof: resp.ProofOps, Value: resp.Value, - StoragePrefix: host.StoreKey, + StoragePrefix: ibchost.StoreKey, }, { Key: resp.Key, Proof: resp.ProofOps, Value: resp.Value, - StoragePrefix: host.StoreKey, + StoragePrefix: ibchost.StoreKey, }}, // we don't have tests to test transactions proofs verification since it's a tendermint layer, // and we don't have access to it here @@ -915,7 +916,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { suite.NoError(suite.Path.EndpointA.UpdateClient()) resp := suite.ChainB.App.Query(abci.RequestQuery{ - Path: fmt.Sprintf("store/%s/key", host.StoreKey), + Path: fmt.Sprintf("store/%s/key", ibchost.StoreKey), Height: suite.ChainB.LastHeader.Header.Height - 1, Data: clientKey, Prove: true, @@ -930,7 +931,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { Key: resp.Key, Proof: resp.ProofOps, Value: resp.Value, - StoragePrefix: host.StoreKey, + StoragePrefix: ibchost.StoreKey, }}, // we don't have tests to test transactions proofs verification since it's a tendermint layer, // and we don't have access to it here @@ -949,7 +950,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { registerMsg := iqtypes.MsgRegisterInterchainQuery{ ConnectionId: suite.Path.EndpointA.ConnectionID, Keys: []*iqtypes.KVKey{ - {Path: host.StoreKey, Key: clientKey}, + {Path: ibchost.StoreKey, Key: clientKey}, }, QueryType: string(iqtypes.InterchainQueryTypeKV), UpdatePeriod: 1, @@ -965,7 +966,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { suite.NoError(suite.Path.EndpointA.UpdateClient()) resp := suite.ChainB.App.Query(abci.RequestQuery{ - Path: fmt.Sprintf("store/%s/key", host.StoreKey), + Path: fmt.Sprintf("store/%s/key", ibchost.StoreKey), Height: suite.ChainB.LastHeader.Header.Height - 1, Data: clientKey, Prove: true, @@ -980,7 +981,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { Key: resp.Key, Proof: nil, Value: resp.Value, - StoragePrefix: host.StoreKey, + StoragePrefix: ibchost.StoreKey, }}, // we don't have tests to test transactions proofs verification since it's a tendermint layer, // and we don't have access to it here @@ -1000,7 +1001,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { registerMsg := iqtypes.MsgRegisterInterchainQuery{ ConnectionId: suite.Path.EndpointA.ConnectionID, Keys: []*iqtypes.KVKey{ - {Path: host.StoreKey, Key: clientKey}, + {Path: ibchost.StoreKey, Key: clientKey}, }, QueryType: string(iqtypes.InterchainQueryTypeKV), UpdatePeriod: 1, @@ -1015,7 +1016,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { suite.NoError(suite.Path.EndpointA.UpdateClient()) resp := suite.ChainB.App.Query(abci.RequestQuery{ - Path: fmt.Sprintf("store/%s/key", host.StoreKey), + Path: fmt.Sprintf("store/%s/key", ibchost.StoreKey), Height: suite.ChainB.LastHeader.Header.Height - 1, Data: []byte("non-registered key"), Prove: true, @@ -1030,7 +1031,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { Key: resp.Key, Proof: resp.ProofOps, Value: resp.Value, - StoragePrefix: host.StoreKey, + StoragePrefix: ibchost.StoreKey, }}, // we don't have tests to test transactions proofs verification since it's a tendermint layer, and we don't have access to it here Block: nil, @@ -1049,7 +1050,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { registerMsg := iqtypes.MsgRegisterInterchainQuery{ ConnectionId: suite.Path.EndpointA.ConnectionID, Keys: []*iqtypes.KVKey{ - {Path: host.StoreKey, Key: clientKey}, + {Path: ibchost.StoreKey, Key: clientKey}, }, QueryType: string(iqtypes.InterchainQueryTypeKV), UpdatePeriod: 1, @@ -1065,7 +1066,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { suite.NoError(suite.Path.EndpointA.UpdateClient()) resp := suite.ChainB.App.Query(abci.RequestQuery{ - Path: fmt.Sprintf("store/%s/key", host.StoreKey), + Path: fmt.Sprintf("store/%s/key", ibchost.StoreKey), Height: suite.ChainB.LastHeader.Header.Height - 1, Data: clientKey, Prove: true, @@ -1100,7 +1101,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { registerMsg := iqtypes.MsgRegisterInterchainQuery{ ConnectionId: suite.Path.EndpointA.ConnectionID, Keys: []*iqtypes.KVKey{ - {Path: host.StoreKey, Key: clientKey}, + {Path: ibchost.StoreKey, Key: clientKey}, }, QueryType: string(iqtypes.InterchainQueryTypeKV), UpdatePeriod: 1, @@ -1117,7 +1118,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { // now we don't care what is really under the value, we just need to be sure that we can verify KV proofs resp := suite.ChainB.App.Query(abci.RequestQuery{ - Path: fmt.Sprintf("store/%s/key", host.StoreKey), + Path: fmt.Sprintf("store/%s/key", ibchost.StoreKey), Height: suite.ChainB.LastHeader.Header.Height - 1, Data: clientKey, Prove: true, @@ -1132,7 +1133,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { Key: resp.Key, Proof: resp.ProofOps, Value: resp.Value, - StoragePrefix: host.StoreKey, + StoragePrefix: ibchost.StoreKey, }}, // we don't have tests to test transactions proofs verification since it's a tendermint layer, // and we don't have access to it here @@ -1151,7 +1152,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { registerMsg := iqtypes.MsgRegisterInterchainQuery{ ConnectionId: suite.Path.EndpointA.ConnectionID, Keys: []*iqtypes.KVKey{ - {Path: host.StoreKey, Key: clientKey}, + {Path: ibchost.StoreKey, Key: clientKey}, }, QueryType: string(iqtypes.InterchainQueryTypeKV), UpdatePeriod: 1, @@ -1167,7 +1168,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { suite.NoError(suite.Path.EndpointA.UpdateClient()) resp := suite.ChainB.App.Query(abci.RequestQuery{ - Path: fmt.Sprintf("store/%s/key", host.StoreKey), + Path: fmt.Sprintf("store/%s/key", ibchost.StoreKey), Height: suite.ChainB.LastHeader.Header.Height, Data: clientKey, Prove: true, @@ -1182,7 +1183,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { Key: resp.Key, Proof: resp.ProofOps, Value: resp.Value, - StoragePrefix: host.StoreKey, + StoragePrefix: ibchost.StoreKey, }}, // we don't have tests to test transactions proofs verification since it's a tendermint layer, and we don't have access to it here Block: nil, @@ -1200,7 +1201,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { registerMsg := iqtypes.MsgRegisterInterchainQuery{ ConnectionId: suite.Path.EndpointA.ConnectionID, Keys: []*iqtypes.KVKey{ - {Path: host.StoreKey, Key: clientKey}, + {Path: ibchost.StoreKey, Key: clientKey}, }, QueryType: string(iqtypes.InterchainQueryTypeKV), UpdatePeriod: 1, @@ -1216,7 +1217,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { suite.NoError(suite.Path.EndpointA.UpdateClient()) resp := suite.ChainB.App.Query(abci.RequestQuery{ - Path: fmt.Sprintf("store/%s/key", host.StoreKey), + Path: fmt.Sprintf("store/%s/key", ibchost.StoreKey), Height: suite.ChainB.LastHeader.Header.Height - 1, Data: clientKey, Prove: true, @@ -1231,7 +1232,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { Key: resp.Key, Proof: resp.ProofOps, Value: []byte("some evil data"), - StoragePrefix: host.StoreKey, + StoragePrefix: ibchost.StoreKey, }}, // we don't have tests to test transactions proofs verification since it's a tendermint layer, and we don't have access to it here Block: nil, @@ -1250,7 +1251,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { registerMsg := iqtypes.MsgRegisterInterchainQuery{ ConnectionId: suite.Path.EndpointA.ConnectionID, Keys: []*iqtypes.KVKey{ - {Path: host.StoreKey, Key: clientKey}, + {Path: ibchost.StoreKey, Key: clientKey}, }, QueryType: string(iqtypes.InterchainQueryTypeKV), UpdatePeriod: 1, @@ -1269,7 +1270,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { suite.NoError(suite.GetNeutronZoneApp(suite.ChainA).InterchainQueriesKeeper.UpdateLastRemoteHeight(ctx, res.Id, ibcclienttypes.NewHeight(suite.ChainA.LastHeader.GetHeight().GetRevisionNumber(), 9999))) resp := suite.ChainB.App.Query(abci.RequestQuery{ - Path: fmt.Sprintf("store/%s/key", host.StoreKey), + Path: fmt.Sprintf("store/%s/key", ibchost.StoreKey), Height: suite.ChainB.LastHeader.Header.Height - 1, Data: clientKey, Prove: true, @@ -1284,7 +1285,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { Key: resp.Key, Proof: resp.ProofOps, Value: resp.Value, - StoragePrefix: host.StoreKey, + StoragePrefix: ibchost.StoreKey, }}, // we don't have tests to test transactions proofs verification since it's a tendermint layer, and we don't have access to it here Block: nil, @@ -1303,7 +1304,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { registerMsg := iqtypes.MsgRegisterInterchainQuery{ ConnectionId: suite.Path.EndpointA.ConnectionID, Keys: []*iqtypes.KVKey{ - {Path: host.StoreKey, Key: clientKey}, + {Path: ibchost.StoreKey, Key: clientKey}, }, QueryType: string(iqtypes.InterchainQueryTypeKV), UpdatePeriod: 1, @@ -1325,7 +1326,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { suite.NoError(suite.GetNeutronZoneApp(suite.ChainA).InterchainQueriesKeeper.UpdateLastRemoteHeight(ctx, res.Id, ibcclienttypes.NewHeight(suite.ChainA.LastHeader.GetHeight().GetRevisionNumber()+1, 1))) resp := suite.ChainB.App.Query(abci.RequestQuery{ - Path: fmt.Sprintf("store/%s/key", host.StoreKey), + Path: fmt.Sprintf("store/%s/key", ibchost.StoreKey), Height: suite.ChainB.LastHeader.Header.Height - 1, Data: clientKey, Prove: true, @@ -1340,7 +1341,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { Key: resp.Key, Proof: resp.ProofOps, Value: resp.Value, - StoragePrefix: host.StoreKey, + StoragePrefix: ibchost.StoreKey, }}, // we don't have tests to test transactions proofs verification since it's a tendermint layer, and we don't have access to it here Block: nil, @@ -1362,7 +1363,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { registerMsg := iqtypes.MsgRegisterInterchainQuery{ ConnectionId: suite.Path.EndpointA.ConnectionID, Keys: []*iqtypes.KVKey{ - {Path: host.StoreKey, Key: keyWithSpecialBytes}, + {Path: ibchost.StoreKey, Key: keyWithSpecialBytes}, }, QueryType: string(iqtypes.InterchainQueryTypeKV), UpdatePeriod: 1, @@ -1379,7 +1380,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { // now we don't care what is really under the value, we just need to be sure that we can verify KV proofs resp := suite.ChainB.App.Query(abci.RequestQuery{ - Path: fmt.Sprintf("store/%s/key", host.StoreKey), + Path: fmt.Sprintf("store/%s/key", ibchost.StoreKey), Height: suite.ChainB.LastHeader.Header.Height - 1, Data: keyWithSpecialBytes, Prove: true, @@ -1394,7 +1395,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { Key: resp.Key, Proof: resp.ProofOps, Value: resp.Value, - StoragePrefix: host.StoreKey, + StoragePrefix: ibchost.StoreKey, }}, // we don't have tests to test transactions proofs verification since it's a tendermint layer, // and we don't have access to it here diff --git a/x/interchainqueries/keeper/msg_server.go b/x/interchainqueries/keeper/msg_server.go index 938690101..8e1bbe9fe 100644 --- a/x/interchainqueries/keeper/msg_server.go +++ b/x/interchainqueries/keeper/msg_server.go @@ -4,17 +4,18 @@ import ( "bytes" "context" "fmt" + tendermint "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" "net/url" "strconv" "time" - ics23 "github.com/confio/ics23/go" "github.com/cosmos/cosmos-sdk/telemetry" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - ibcclienttypes "github.com/cosmos/ibc-go/v4/modules/core/02-client/types" - ibcconnectiontypes "github.com/cosmos/ibc-go/v4/modules/core/03-connection/types" - ibccommitmenttypes "github.com/cosmos/ibc-go/v4/modules/core/23-commitment/types" + ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" + ibcconnectiontypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" + ibccommitmenttypes "github.com/cosmos/ibc-go/v7/modules/core/23-commitment/types" + ics23 "github.com/cosmos/ics23/go" "github.com/neutron-org/neutron/x/interchainqueries/types" ) @@ -192,12 +193,18 @@ func (k msgServer) SubmitQueryResult(goCtx context.Context, msg *types.MsgSubmit "error", err, "query", query, "message", msg) return nil, sdkerrors.Wrapf(ibcclienttypes.ErrConsensusStateNotFound, "failed to get consensus state: %v", err) } - - consensusState, err := ibcclienttypes.UnpackConsensusState(resp.ConsensusState) + consensusStateI, err := ibcclienttypes.UnpackConsensusState(resp.ConsensusState) if err != nil { ctx.Logger().Error("SubmitQueryResult: failed to UnpackConsensusState", "error", err, "query", query, "message", msg) - return nil, sdkerrors.Wrapf(types.ErrProtoUnmarshal, "failed to unpack consesus state: %v", err) + return nil, fmt.Errorf("failed marshal: %s, %w", consensusStateI.String(), err) + } + + consensusState, ok := consensusStateI.(*tendermint.ConsensusState) + if !ok { + ctx.Logger().Error("SubmitQueryResult: failed to cast exported.ConsensusState to *tendermint.ConsensusState", + "error", err, "query", query, "message", msg) + return nil, sdkerrors.Wrapf(sdkerrors.ErrUnpackAny, "failed to cast interface exported.ConsensusState to type *tendermint.ConsensusState") } clientState, err := k.GetClientState(ctx, msg.ClientId) diff --git a/x/interchainqueries/keeper/process_block_results.go b/x/interchainqueries/keeper/process_block_results.go index 9f65cc104..822f498b8 100644 --- a/x/interchainqueries/keeper/process_block_results.go +++ b/x/interchainqueries/keeper/process_block_results.go @@ -5,16 +5,16 @@ import ( "encoding/hex" codectypes "github.com/cosmos/cosmos-sdk/codec/types" - clientkeeper "github.com/cosmos/ibc-go/v4/modules/core/02-client/keeper" + clientkeeper "github.com/cosmos/ibc-go/v7/modules/core/02-client/keeper" + abci "github.com/cometbft/cometbft/abci/types" + "github.com/cometbft/cometbft/crypto/merkle" + tmtypes "github.com/cometbft/cometbft/types" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - ibcclienttypes "github.com/cosmos/ibc-go/v4/modules/core/02-client/types" - "github.com/cosmos/ibc-go/v4/modules/core/exported" - tendermintLightClientTypes "github.com/cosmos/ibc-go/v4/modules/light-clients/07-tendermint/types" - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/crypto/merkle" - tmtypes "github.com/tendermint/tendermint/types" + ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" + "github.com/cosmos/ibc-go/v7/modules/core/exported" + tendermintLightClientTypes "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" "github.com/neutron-org/neutron/x/interchainqueries/types" ) @@ -60,7 +60,7 @@ type Verifier struct{} // VerifyHeaders verify that headers are valid tendermint headers, checks them on validity by trying call ibcClient.UpdateClient(header) // to update light client's consensus state and checks that they are sequential (tl;dr header.Height + 1 == nextHeader.Height) -func (v Verifier) VerifyHeaders(ctx sdk.Context, clientKeeper clientkeeper.Keeper, clientID string, header exported.Header, nextHeader exported.Header) error { +func (v Verifier) VerifyHeaders(ctx sdk.Context, clientKeeper clientkeeper.Keeper, clientID string, header exported.ClientMessage, nextHeader exported.ClientMessage) error { // this IBC handler updates the consensus state and the state root from a provided header. // But more importantly in the current situation, it checks that header is valid. // Honestly we need only to verify headers, but since the check functions are private, and we don't want to duplicate the code, @@ -90,8 +90,8 @@ func (v Verifier) VerifyHeaders(ctx sdk.Context, clientKeeper clientkeeper.Keepe return nil } -func (v Verifier) UnpackHeader(any *codectypes.Any) (exported.Header, error) { - return ibcclienttypes.UnpackHeader(any) +func (v Verifier) UnpackHeader(any *codectypes.Any) (exported.ClientMessage, error) { + return ibcclienttypes.UnpackClientMessage(any) } // ProcessBlock verifies headers and transaction in the block, and then passes the tx query result to diff --git a/x/interchainqueries/keeper/process_block_results_test.go b/x/interchainqueries/keeper/process_block_results_test.go index 666cd51d0..99a8dde41 100644 --- a/x/interchainqueries/keeper/process_block_results_test.go +++ b/x/interchainqueries/keeper/process_block_results_test.go @@ -5,27 +5,27 @@ import ( "testing" "time" - ibckeeper "github.com/cosmos/ibc-go/v4/modules/core/keeper" + ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper" "github.com/golang/mock/gomock" icqtestkeeper "github.com/neutron-org/neutron/testutil/interchainqueries/keeper" mock_types "github.com/neutron-org/neutron/testutil/mocks/interchainqueries/types" "github.com/CosmWasm/wasmd/x/wasm/keeper" + abci "github.com/cometbft/cometbft/abci/types" + "github.com/cometbft/cometbft/crypto/tmhash" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + tmprotoversion "github.com/cometbft/cometbft/proto/tendermint/version" + tmtypes "github.com/cometbft/cometbft/types" + tmversion "github.com/cometbft/cometbft/version" "github.com/cosmos/cosmos-sdk/types" - ibcclienttypes "github.com/cosmos/ibc-go/v4/modules/core/02-client/types" - "github.com/cosmos/ibc-go/v4/modules/core/exported" - ibctmtypes "github.com/cosmos/ibc-go/v4/modules/light-clients/07-tendermint/types" - ibctesting "github.com/cosmos/interchain-security/legacy_ibc_testing/testing" + ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" + "github.com/cosmos/ibc-go/v7/modules/core/exported" + ibctmtypes "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" + ibctesting "github.com/cosmos/interchain-security/v3/legacy_ibc_testing/testing" "github.com/stretchr/testify/require" - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/crypto/tmhash" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - tmprotoversion "github.com/tendermint/tendermint/proto/tendermint/version" - tmtypes "github.com/tendermint/tendermint/types" - tmversion "github.com/tendermint/tendermint/version" codectypes "github.com/cosmos/cosmos-sdk/codec/types" - clientkeeper "github.com/cosmos/ibc-go/v4/modules/core/02-client/keeper" + clientkeeper "github.com/cosmos/ibc-go/v7/modules/core/02-client/keeper" "github.com/neutron-org/neutron/testutil" iqkeeper "github.com/neutron-org/neutron/x/interchainqueries/keeper" iqtypes "github.com/neutron-org/neutron/x/interchainqueries/types" @@ -131,7 +131,7 @@ func CommitBlock(coord *ibctesting.Coordinator, chains ...*ibctesting.TestChain) // UpdateClient updates the IBC client associated with the endpoint. func UpdateClient(endpoint *ibctesting.Endpoint) (err error) { - var header exported.Header + var header exported.ClientMessage // ensure counterparty has committed state CommitBlock(endpoint.Chain.Coordinator, endpoint.Counterparty.Chain) @@ -161,17 +161,18 @@ func UpdateClient(endpoint *ibctesting.Endpoint) (err error) { func (suite *KeeperTestSuite) TestUnpackAndVerifyHeaders() { tests := []struct { - name string - run func() error - expectedError error + name string + run func() error + expectedErrorMsg string }{ { "valid headers", func() error { - suite.Require().NoError(UpdateClient(suite.Path.EndpointA)) + //suite.Require().NoError(UpdateClient(suite.Path.EndpointA)) + suite.Require().NoError(suite.Path.EndpointA.UpdateClient()) clientID := suite.Path.EndpointA.ClientID - + CommitBlock(suite.Coordinator, suite.ChainB) header, err := suite.Path.EndpointA.Chain.ConstructUpdateTMClientHeader(suite.Path.EndpointA.Counterparty.Chain, suite.Path.EndpointB.ClientID) suite.Require().NoError(err) @@ -181,7 +182,7 @@ func (suite *KeeperTestSuite) TestUnpackAndVerifyHeaders() { return iqkeeper.Verifier{}.VerifyHeaders(suite.ChainA.GetContext(), suite.GetNeutronZoneApp(suite.ChainA).IBCKeeper.ClientKeeper, clientID, header, nextHeader) }, - nil, + "", }, { "headers are not sequential", @@ -189,6 +190,7 @@ func (suite *KeeperTestSuite) TestUnpackAndVerifyHeaders() { suite.Require().NoError(UpdateClient(suite.Path.EndpointA)) clientID := suite.Path.EndpointA.ClientID + CommitBlock(suite.Coordinator, suite.ChainB) header, err := suite.Path.EndpointA.Chain.ConstructUpdateTMClientHeader(suite.Path.EndpointA.Counterparty.Chain, suite.Path.EndpointB.ClientID) suite.Require().NoError(err) @@ -202,7 +204,7 @@ func (suite *KeeperTestSuite) TestUnpackAndVerifyHeaders() { return iqkeeper.Verifier{}.VerifyHeaders(suite.ChainA.GetContext(), suite.GetNeutronZoneApp(suite.ChainA).IBCKeeper.ClientKeeper, clientID, header, nextHeader) }, - iqtypes.ErrInvalidHeader, + "block.NextBlockHeader is not next for the block.Header", }, { "header has some malicious field", @@ -210,6 +212,8 @@ func (suite *KeeperTestSuite) TestUnpackAndVerifyHeaders() { suite.Require().NoError(UpdateClient(suite.Path.EndpointA)) clientID := suite.Path.EndpointA.ClientID + CommitBlock(suite.Coordinator, suite.ChainB) + CommitBlock(suite.Coordinator, suite.ChainB) header, err := suite.Path.EndpointA.Chain.ConstructUpdateTMClientHeader(suite.Path.EndpointA.Counterparty.Chain, suite.Path.EndpointB.ClientID) suite.Require().NoError(err) @@ -223,7 +227,7 @@ func (suite *KeeperTestSuite) TestUnpackAndVerifyHeaders() { return iqkeeper.Verifier{}.VerifyHeaders(suite.ChainA.GetContext(), suite.GetNeutronZoneApp(suite.ChainA).IBCKeeper.ClientKeeper, clientID, header, nextHeader) }, - iqtypes.ErrInvalidHeader, + "invalid header: untrustedHeader.ValidateBasic failed: commit signs block", }, { "headers from the past (when client on chain A has the most recent consensus state and relayer try to submit old headers from chain B)", @@ -231,6 +235,7 @@ func (suite *KeeperTestSuite) TestUnpackAndVerifyHeaders() { suite.Require().NoError(UpdateClient(suite.Path.EndpointA)) clientID := suite.Path.EndpointA.ClientID + CommitBlock(suite.Coordinator, suite.ChainB) oldHeader := *suite.ChainB.LastHeader CommitBlock(suite.Coordinator, suite.ChainB) @@ -239,7 +244,6 @@ func (suite *KeeperTestSuite) TestUnpackAndVerifyHeaders() { for i := 0; i < 30; i++ { suite.Require().NoError(UpdateClient(suite.Path.EndpointA)) } - headerWithTrustedHeight, err := suite.Path.EndpointA.Chain.ConstructUpdateTMClientHeaderWithTrustedHeight(suite.Path.EndpointA.Counterparty.Chain, suite.Path.EndpointB.ClientID, ibcclienttypes.Height{ RevisionNumber: 0, RevisionHeight: 29, @@ -254,7 +258,7 @@ func (suite *KeeperTestSuite) TestUnpackAndVerifyHeaders() { return iqkeeper.Verifier{}.VerifyHeaders(suite.ChainA.GetContext(), suite.GetNeutronZoneApp(suite.ChainA).IBCKeeper.ClientKeeper, clientID, &oldHeader, &oldNextHeader) }, - nil, + "", }, } @@ -277,8 +281,9 @@ func (suite *KeeperTestSuite) TestUnpackAndVerifyHeaders() { suite.Require().NoError(err) err = tt.run() - if tt.expectedError != nil { - suite.Require().ErrorIs(err, tt.expectedError) + if tt.expectedErrorMsg != "" { + //suite.Require().ErrorAs(err, tt.expectedError) + suite.Require().ErrorContains(err, tt.expectedErrorMsg) } else { suite.Require().NoError(err) } @@ -332,52 +337,52 @@ func TestSudoHasAddress(t *testing.T) { err = k.ProcessBlock(ctx, address, 1, "tendermint-07", &block) require.ErrorContains(t, err, "failed to unpack block header") - hv.EXPECT().UnpackHeader(packedHeader).Return(exported.Header(&header), nil) + hv.EXPECT().UnpackHeader(packedHeader).Return(exported.ClientMessage(&header), nil) hv.EXPECT().UnpackHeader(packedNextHeader).Return(nil, fmt.Errorf("failed to unpack packedHeader")) err = k.ProcessBlock(ctx, address, 1, "tendermint-07", &block) require.ErrorContains(t, err, "failed to unpack next block header") - hv.EXPECT().UnpackHeader(packedHeader).Return(exported.Header(&header), nil) - hv.EXPECT().UnpackHeader(packedNextHeader).Return(exported.Header(&nextHeader), nil) - hv.EXPECT().VerifyHeaders(ctx, clientkeeper.Keeper{}, "tendermint-07", exported.Header(&header), exported.Header(&nextHeader)).Return(fmt.Errorf("failed to verify headers")) + hv.EXPECT().UnpackHeader(packedHeader).Return(exported.ClientMessage(&header), nil) + hv.EXPECT().UnpackHeader(packedNextHeader).Return(exported.ClientMessage(&nextHeader), nil) + hv.EXPECT().VerifyHeaders(ctx, clientkeeper.Keeper{}, "tendermint-07", exported.ClientMessage(&header), exported.ClientMessage(&nextHeader)).Return(fmt.Errorf("failed to verify headers")) err = k.ProcessBlock(ctx, address, 1, "tendermint-07", &block) require.ErrorContains(t, err, "failed to verify headers") - hv.EXPECT().UnpackHeader(packedHeader).Return(exported.Header(&header), nil) - hv.EXPECT().UnpackHeader(packedNextHeader).Return(exported.Header(&nextHeader), nil) - hv.EXPECT().VerifyHeaders(ctx, clientkeeper.Keeper{}, "tendermint-07", exported.Header(&header), exported.Header(&nextHeader)).Return(nil) + hv.EXPECT().UnpackHeader(packedHeader).Return(exported.ClientMessage(&header), nil) + hv.EXPECT().UnpackHeader(packedNextHeader).Return(exported.ClientMessage(&nextHeader), nil) + hv.EXPECT().VerifyHeaders(ctx, clientkeeper.Keeper{}, "tendermint-07", exported.ClientMessage(&header), exported.ClientMessage(&nextHeader)).Return(nil) tv.EXPECT().VerifyTransaction(&header, &nextHeader, &tx).Return(fmt.Errorf("failed to verify transaction")) err = k.ProcessBlock(ctx, address, 1, "tendermint-07", &block) require.ErrorContains(t, err, "failed to verifyTransaction") - hv.EXPECT().UnpackHeader(packedHeader).Return(exported.Header(&header), nil) - hv.EXPECT().UnpackHeader(packedNextHeader).Return(exported.Header(&nextHeader), nil) - hv.EXPECT().VerifyHeaders(ctx, clientkeeper.Keeper{}, "tendermint-07", exported.Header(&header), exported.Header(&nextHeader)).Return(nil) + hv.EXPECT().UnpackHeader(packedHeader).Return(exported.ClientMessage(&header), nil) + hv.EXPECT().UnpackHeader(packedNextHeader).Return(exported.ClientMessage(&nextHeader), nil) + hv.EXPECT().VerifyHeaders(ctx, clientkeeper.Keeper{}, "tendermint-07", exported.ClientMessage(&header), exported.ClientMessage(&nextHeader)).Return(nil) tv.EXPECT().VerifyTransaction(&header, &nextHeader, &tx).Return(nil) cm.EXPECT().SudoTxQueryResult(ctx, address, uint64(1), ibcclienttypes.NewHeight(1, uint64(header.Header.Height)), tx.GetData()).Return(nil, fmt.Errorf("contract error")) err = k.ProcessBlock(ctx, address, 1, "tendermint-07", &block) require.ErrorContains(t, err, "rejected transaction query result") // all error flows passed, time to success - hv.EXPECT().UnpackHeader(packedHeader).Return(exported.Header(&header), nil) - hv.EXPECT().UnpackHeader(packedNextHeader).Return(exported.Header(&nextHeader), nil) - hv.EXPECT().VerifyHeaders(ctx, clientkeeper.Keeper{}, "tendermint-07", exported.Header(&header), exported.Header(&nextHeader)).Return(nil) + hv.EXPECT().UnpackHeader(packedHeader).Return(exported.ClientMessage(&header), nil) + hv.EXPECT().UnpackHeader(packedNextHeader).Return(exported.ClientMessage(&nextHeader), nil) + hv.EXPECT().VerifyHeaders(ctx, clientkeeper.Keeper{}, "tendermint-07", exported.ClientMessage(&header), exported.ClientMessage(&nextHeader)).Return(nil) tv.EXPECT().VerifyTransaction(&header, &nextHeader, &tx).Return(nil) cm.EXPECT().SudoTxQueryResult(ctx, address, uint64(1), ibcclienttypes.NewHeight(1, uint64(header.Header.Height)), tx.GetData()).Return(nil, nil) err = k.ProcessBlock(ctx, address, 1, "tendermint-07", &block) require.NoError(t, err) // no functions calls after VerifyHeaders means we try to process tx second time - hv.EXPECT().UnpackHeader(packedHeader).Return(exported.Header(&header), nil) - hv.EXPECT().UnpackHeader(packedNextHeader).Return(exported.Header(&nextHeader), nil) - hv.EXPECT().VerifyHeaders(ctx, clientkeeper.Keeper{}, "tendermint-07", exported.Header(&header), exported.Header(&nextHeader)).Return(nil) + hv.EXPECT().UnpackHeader(packedHeader).Return(exported.ClientMessage(&header), nil) + hv.EXPECT().UnpackHeader(packedNextHeader).Return(exported.ClientMessage(&nextHeader), nil) + hv.EXPECT().VerifyHeaders(ctx, clientkeeper.Keeper{}, "tendermint-07", exported.ClientMessage(&header), exported.ClientMessage(&nextHeader)).Return(nil) err = k.ProcessBlock(ctx, address, 1, "tendermint-07", &block) require.NoError(t, err) // same tx + another queryID - hv.EXPECT().UnpackHeader(packedHeader).Return(exported.Header(&header), nil) - hv.EXPECT().UnpackHeader(packedNextHeader).Return(exported.Header(&nextHeader), nil) - hv.EXPECT().VerifyHeaders(ctx, clientkeeper.Keeper{}, "tendermint-07", exported.Header(&header), exported.Header(&nextHeader)).Return(nil) + hv.EXPECT().UnpackHeader(packedHeader).Return(exported.ClientMessage(&header), nil) + hv.EXPECT().UnpackHeader(packedNextHeader).Return(exported.ClientMessage(&nextHeader), nil) + hv.EXPECT().VerifyHeaders(ctx, clientkeeper.Keeper{}, "tendermint-07", exported.ClientMessage(&header), exported.ClientMessage(&nextHeader)).Return(nil) tv.EXPECT().VerifyTransaction(&header, &nextHeader, &tx).Return(nil) cm.EXPECT().SudoTxQueryResult(ctx, address, uint64(2), ibcclienttypes.NewHeight(1, uint64(header.Header.Height)), tx.GetData()).Return(nil, nil) err = k.ProcessBlock(ctx, address, 2, "tendermint-07", &block) diff --git a/x/interchainqueries/module.go b/x/interchainqueries/module.go index 39d1d31da..6e3aed28d 100644 --- a/x/interchainqueries/module.go +++ b/x/interchainqueries/module.go @@ -2,9 +2,11 @@ package interchainqueries import ( "context" + "cosmossdk.io/core/appmodule" "encoding/json" "fmt" + abci "github.com/cometbft/cometbft/abci/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" cdctypes "github.com/cosmos/cosmos-sdk/codec/types" @@ -13,7 +15,6 @@ import ( "github.com/gorilla/mux" "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" - abci "github.com/tendermint/tendermint/abci/types" "github.com/neutron-org/neutron/x/interchainqueries/client/cli" "github.com/neutron-org/neutron/x/interchainqueries/keeper" @@ -95,6 +96,8 @@ func (AppModuleBasic) GetQueryCmd() *cobra.Command { // AppModule // ---------------------------------------------------------------------------- +var _ appmodule.AppModule = AppModule{} + // AppModule implements the AppModule interface for the capability module. type AppModule struct { AppModuleBasic @@ -118,24 +121,22 @@ func NewAppModule( } } +// IsOnePerModuleType implements the depinject.OnePerModuleType interface. +func (am AppModule) IsOnePerModuleType() { // marker +} + +// IsAppModule implements the appmodule.AppModule interface. +func (am AppModule) IsAppModule() { // marker +} + // Name returns the capability module's name. func (am AppModule) Name() string { return am.AppModuleBasic.Name() } -// Route returns the capability module's message routing key. -func (am AppModule) Route() sdk.Route { - return sdk.NewRoute(types.RouterKey, NewHandler(am.keeper)) -} - // QuerierRoute returns the capability module's query routing key. func (AppModule) QuerierRoute() string { return types.QuerierRoute } -// LegacyQuerierHandler returns the capability module's Querier. -func (am AppModule) LegacyQuerierHandler(_ *codec.LegacyAmino) sdk.Querier { - return nil -} - // RegisterServices registers a GRPC query service to respond to the // module-specific GRPC queries. func (am AppModule) RegisterServices(cfg module.Configurator) { diff --git a/x/interchainqueries/module_simulation.go b/x/interchainqueries/module_simulation.go index 5227d3ed7..55cef2305 100644 --- a/x/interchainqueries/module_simulation.go +++ b/x/interchainqueries/module_simulation.go @@ -1,10 +1,8 @@ package interchainqueries import ( - "math/rand" - "github.com/cosmos/cosmos-sdk/baseapp" - simappparams "github.com/cosmos/cosmos-sdk/simapp/params" + "github.com/cosmos/cosmos-sdk/testutil/sims" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" @@ -19,7 +17,7 @@ import ( var ( _ = sample.AccAddress _ = interchainqueriessimulation.FindAccount - _ = simappparams.StakePerAccount + _ = sims.StakePerAccount _ = simulation.MsgEntryKind _ = baseapp.Paramspace ) @@ -41,11 +39,6 @@ func (AppModule) ProposalContents(_ module.SimulationState) []simtypes.WeightedP return nil } -// RandomizedParams creates randomized param changes for the simulator -func (am AppModule) RandomizedParams(_ *rand.Rand) []simtypes.ParamChange { - return []simtypes.ParamChange{} -} - // RegisterStoreDecoder registers a decoder func (am AppModule) RegisterStoreDecoder(_ sdk.StoreDecoderRegistry) {} diff --git a/x/interchainqueries/types/expected_keepers.go b/x/interchainqueries/types/expected_keepers.go index 0378303dc..d0cb0332f 100644 --- a/x/interchainqueries/types/expected_keepers.go +++ b/x/interchainqueries/types/expected_keepers.go @@ -3,8 +3,8 @@ package types import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/auth/types" - ibcclienttypes "github.com/cosmos/ibc-go/v4/modules/core/02-client/types" - channeltypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" + ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" + channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" ) // AccountKeeper defines the expected account keeper used for simulations (noalias) diff --git a/x/interchainqueries/types/genesis.pb.go b/x/interchainqueries/types/genesis.pb.go index fd404b253..4a20abcae 100644 --- a/x/interchainqueries/types/genesis.pb.go +++ b/x/interchainqueries/types/genesis.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: interchainqueries/genesis.proto +// source: neutron/interchainqueries/genesis.proto package types @@ -7,9 +7,9 @@ import ( fmt "fmt" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" types1 "github.com/cosmos/cosmos-sdk/types" - types "github.com/cosmos/ibc-go/v4/modules/core/02-client/types" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" + types "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" io "io" math "math" math_bits "math/bits" @@ -57,7 +57,7 @@ func (m *RegisteredQuery) Reset() { *m = RegisteredQuery{} } func (m *RegisteredQuery) String() string { return proto.CompactTextString(m) } func (*RegisteredQuery) ProtoMessage() {} func (*RegisteredQuery) Descriptor() ([]byte, []int) { - return fileDescriptor_68e6c14f58b92f58, []int{0} + return fileDescriptor_ed312d37df0260a6, []int{0} } func (m *RegisteredQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -182,7 +182,7 @@ func (m *KVKey) Reset() { *m = KVKey{} } func (m *KVKey) String() string { return proto.CompactTextString(m) } func (*KVKey) ProtoMessage() {} func (*KVKey) Descriptor() ([]byte, []int) { - return fileDescriptor_68e6c14f58b92f58, []int{1} + return fileDescriptor_ed312d37df0260a6, []int{1} } func (m *KVKey) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -235,7 +235,7 @@ 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_68e6c14f58b92f58, []int{2} + return fileDescriptor_ed312d37df0260a6, []int{2} } func (m *GenesisState) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -284,50 +284,52 @@ func init() { proto.RegisterType((*GenesisState)(nil), "neutron.interchainqueries.GenesisState") } -func init() { proto.RegisterFile("interchainqueries/genesis.proto", fileDescriptor_68e6c14f58b92f58) } +func init() { + proto.RegisterFile("neutron/interchainqueries/genesis.proto", fileDescriptor_ed312d37df0260a6) +} -var fileDescriptor_68e6c14f58b92f58 = []byte{ - // 632 bytes of a gzipped FileDescriptorProto +var fileDescriptor_ed312d37df0260a6 = []byte{ + // 636 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, 0x42, 0x8a, - 0x90, 0x6a, 0x37, 0x85, 0x03, 0x37, 0x44, 0x91, 0xf8, 0x2b, 0x87, 0xe2, 0x56, 0x48, 0x70, 0xb1, - 0xfc, 0x33, 0x38, 0xab, 0x26, 0x5e, 0xb3, 0x3b, 0x2e, 0xf8, 0x2d, 0x78, 0x8e, 0x3e, 0x49, 0x8f, - 0x3d, 0x72, 0x02, 0xd4, 0x3e, 0x07, 0x12, 0xf2, 0xac, 0x43, 0x0b, 0x2d, 0x3d, 0x79, 0xfc, 0xcd, - 0x37, 0xdf, 0xee, 0xce, 0x7c, 0xc3, 0x7a, 0x22, 0x43, 0x50, 0xf1, 0x38, 0x14, 0xd9, 0xa7, 0x02, - 0x94, 0x00, 0xed, 0xa5, 0x90, 0x81, 0x16, 0xda, 0xcd, 0x95, 0x44, 0xc9, 0x57, 0x33, 0x28, 0x50, - 0xc9, 0xcc, 0xbd, 0x44, 0x5c, 0x5b, 0x49, 0x65, 0x2a, 0x89, 0xe5, 0x55, 0x91, 0x29, 0x58, 0x73, - 0x2e, 0x2b, 0xe6, 0xa1, 0x0a, 0xa7, 0x7a, 0x96, 0x8f, 0xa5, 0x9e, 0x4a, 0xed, 0x45, 0xa1, 0x06, - 0xef, 0x70, 0x14, 0x01, 0x86, 0x23, 0x2f, 0x96, 0x22, 0xab, 0xf3, 0x3d, 0x11, 0xc5, 0x5e, 0x2c, - 0x15, 0x78, 0xf1, 0x44, 0x40, 0x86, 0xde, 0xe1, 0xa8, 0x8e, 0x0c, 0x61, 0xf0, 0xab, 0xc5, 0x6e, - 0xfa, 0x90, 0x0a, 0x8d, 0xa0, 0x20, 0x79, 0x5b, 0x80, 0x2a, 0xf9, 0x32, 0x6b, 0x8a, 0xc4, 0xb6, - 0xfa, 0xd6, 0xb0, 0xe5, 0x37, 0x45, 0xc2, 0x57, 0xd8, 0xbc, 0xfc, 0x9c, 0x81, 0xb2, 0x9b, 0x7d, - 0x6b, 0xd8, 0xf6, 0xcd, 0x0f, 0xbf, 0xcb, 0x58, 0x75, 0xa5, 0x32, 0xc0, 0x32, 0x07, 0x7b, 0x8e, - 0x52, 0x6d, 0x42, 0xf6, 0xcb, 0x1c, 0xf8, 0x23, 0xd6, 0x3a, 0x80, 0x52, 0xdb, 0xad, 0xfe, 0xdc, - 0xb0, 0xb3, 0xd5, 0x77, 0xff, 0xfb, 0x72, 0x77, 0xe7, 0xdd, 0x0e, 0x94, 0x3e, 0xb1, 0xb9, 0xc7, - 0xee, 0xa0, 0x0a, 0x33, 0x1d, 0xc6, 0x28, 0x64, 0xa6, 0x83, 0x8f, 0x62, 0x82, 0xa0, 0xec, 0x79, - 0x52, 0xe7, 0x17, 0x53, 0xcf, 0x29, 0xc3, 0xd7, 0xd9, 0x52, 0x2c, 0xb3, 0x0c, 0x08, 0x0c, 0x44, - 0x62, 0x2f, 0x10, 0xb5, 0x7b, 0x0e, 0xbe, 0x4a, 0x2a, 0x52, 0x91, 0x27, 0x21, 0x42, 0x90, 0x83, - 0x12, 0x32, 0xb1, 0x17, 0xe9, 0x6d, 0x5d, 0x03, 0xee, 0x12, 0xc6, 0x5f, 0xb3, 0xc1, 0x24, 0xd4, - 0x18, 0xe8, 0x22, 0x9a, 0x0a, 0x44, 0x48, 0x02, 0x05, 0xba, 0x98, 0x60, 0x30, 0x91, 0x71, 0x38, - 0x09, 0xc6, 0x20, 0xd2, 0x31, 0xda, 0x37, 0xa8, 0xd2, 0xa9, 0x98, 0x7b, 0x33, 0xa2, 0x4f, 0xbc, - 0x37, 0x15, 0xed, 0x25, 0xb1, 0xf8, 0x98, 0xad, 0x5f, 0xad, 0xa5, 0x60, 0x2a, 0x11, 0x66, 0x62, - 0xed, 0xbe, 0x35, 0xec, 0x6c, 0xad, 0xb9, 0x22, 0x8a, 0xdd, 0x6a, 0x48, 0x6e, 0x3d, 0x9a, 0xc3, - 0x91, 0x6b, 0x84, 0xfc, 0xde, 0x15, 0x07, 0xf9, 0xa4, 0x51, 0x9f, 0x04, 0x6c, 0x31, 0x81, 0x5c, - 0x6a, 0x81, 0x36, 0xa3, 0x4e, 0xaf, 0xba, 0xc6, 0x12, 0x6e, 0x65, 0x09, 0xb7, 0xb6, 0x84, 0xfb, - 0x4c, 0x8a, 0x6c, 0x7b, 0xf3, 0xf8, 0x7b, 0xaf, 0x71, 0xf4, 0xa3, 0x37, 0x4c, 0x05, 0x8e, 0x8b, - 0xc8, 0x8d, 0xe5, 0xd4, 0xab, 0xfd, 0x63, 0x3e, 0x1b, 0x3a, 0x39, 0xf0, 0xaa, 0x71, 0x6a, 0x2a, - 0xd0, 0xfe, 0x4c, 0x9b, 0xdf, 0x67, 0xcb, 0xe6, 0x2d, 0x01, 0x8a, 0x29, 0xc8, 0x02, 0xed, 0x0e, - 0x35, 0x62, 0xc9, 0xa0, 0xfb, 0x06, 0xe4, 0x9b, 0x6c, 0x45, 0xfd, 0x31, 0x53, 0x10, 0xe2, 0xec, - 0xa1, 0x5d, 0x22, 0xf3, 0xf3, 0xdc, 0x53, 0x34, 0xf7, 0x1f, 0x6c, 0xb0, 0x79, 0x9a, 0x3f, 0xe7, - 0xac, 0x95, 0x87, 0x38, 0x26, 0xdb, 0xb5, 0x7d, 0x8a, 0xf9, 0x2d, 0x36, 0x77, 0x00, 0x25, 0xd9, - 0xae, 0xeb, 0x57, 0xe1, 0xe0, 0xc8, 0x62, 0xdd, 0x17, 0x66, 0xa5, 0xf6, 0x30, 0x44, 0xe0, 0x4f, - 0xd8, 0x82, 0x59, 0x08, 0x2a, 0xec, 0x6c, 0xdd, 0xbb, 0xc6, 0x68, 0xbb, 0x44, 0xdc, 0x6e, 0x55, - 0x6d, 0xf0, 0xeb, 0x32, 0xfe, 0x9e, 0x5d, 0xb8, 0x56, 0x50, 0x53, 0xed, 0x26, 0xf5, 0xf2, 0xc1, - 0x35, 0x62, 0xff, 0x2c, 0x8d, 0x7f, 0x5b, 0xfd, 0x05, 0x08, 0xd0, 0xdb, 0xfe, 0xf1, 0xa9, 0x63, - 0x9d, 0x9c, 0x3a, 0xd6, 0xcf, 0x53, 0xc7, 0xfa, 0x7a, 0xe6, 0x34, 0x4e, 0xce, 0x9c, 0xc6, 0xb7, - 0x33, 0xa7, 0xf1, 0xe1, 0xf1, 0x85, 0x09, 0xd4, 0x47, 0x6c, 0x48, 0x95, 0xce, 0x62, 0xef, 0x8b, - 0x77, 0x79, 0xef, 0x69, 0x2e, 0xd1, 0x02, 0xad, 0xed, 0xc3, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, - 0xbb, 0xb5, 0xac, 0x6a, 0x6b, 0x04, 0x00, 0x00, + 0x10, 0x8e, 0xd3, 0xb4, 0x25, 0x9b, 0xb4, 0xc0, 0xd2, 0x83, 0x1b, 0x09, 0x27, 0xa4, 0x02, 0x22, + 0xa4, 0xda, 0x4d, 0xe1, 0xc0, 0x0d, 0x51, 0x24, 0xfe, 0xca, 0xa1, 0xb8, 0x15, 0x12, 0x5c, 0x2c, + 0xc7, 0x1e, 0x9c, 0x55, 0x13, 0xaf, 0xd9, 0x1d, 0x17, 0xfc, 0x16, 0x3c, 0x47, 0x9f, 0xa4, 0xc7, + 0x1e, 0x39, 0x01, 0x6a, 0x9f, 0x03, 0x09, 0x79, 0xd6, 0xa1, 0x05, 0xda, 0x9e, 0x3c, 0xfe, 0xe6, + 0x9b, 0x6f, 0x77, 0x67, 0xbe, 0x61, 0xf7, 0x53, 0xc8, 0x51, 0xc9, 0xd4, 0x13, 0x29, 0x82, 0x8a, + 0xc6, 0xa1, 0x48, 0x3f, 0xe5, 0xa0, 0x04, 0x68, 0x2f, 0x81, 0x14, 0xb4, 0xd0, 0x6e, 0xa6, 0x24, + 0x4a, 0xbe, 0x5a, 0x11, 0xdd, 0xff, 0x88, 0x9d, 0x95, 0x44, 0x26, 0x92, 0x58, 0x5e, 0x19, 0x99, + 0x82, 0xce, 0xbd, 0xcb, 0x95, 0xb3, 0x50, 0x85, 0xd3, 0x4a, 0xb8, 0xe3, 0x44, 0x52, 0x4f, 0xa5, + 0xf6, 0x46, 0xa1, 0x06, 0xef, 0x60, 0x38, 0x02, 0x0c, 0x87, 0x5e, 0x24, 0x45, 0x5a, 0xe5, 0xbb, + 0x62, 0x14, 0x79, 0x91, 0x54, 0xe0, 0x45, 0x13, 0x01, 0x29, 0x7a, 0x07, 0xc3, 0x2a, 0x32, 0x84, + 0xfe, 0xaf, 0x06, 0xbb, 0xee, 0x43, 0x22, 0x34, 0x82, 0x82, 0xf8, 0x6d, 0x0e, 0xaa, 0xe0, 0xcb, + 0xac, 0x2e, 0x62, 0xdb, 0xea, 0x59, 0x83, 0x86, 0x5f, 0x17, 0x31, 0x5f, 0x61, 0xf3, 0xf2, 0x73, + 0x0a, 0xca, 0xae, 0xf7, 0xac, 0x41, 0xd3, 0x37, 0x3f, 0xfc, 0x36, 0x63, 0xe5, 0x95, 0x8a, 0x00, + 0x8b, 0x0c, 0xec, 0x39, 0x4a, 0x35, 0x09, 0xd9, 0x2b, 0x32, 0xe0, 0x8f, 0x58, 0x63, 0x1f, 0x0a, + 0x6d, 0x37, 0x7a, 0x73, 0x83, 0xd6, 0x66, 0xcf, 0xbd, 0xb4, 0x03, 0xee, 0xf6, 0xbb, 0x6d, 0x28, + 0x7c, 0x62, 0x73, 0x8f, 0xdd, 0x42, 0x15, 0xa6, 0x3a, 0x8c, 0x50, 0xc8, 0x54, 0x07, 0x1f, 0xc5, + 0x04, 0x41, 0xd9, 0xf3, 0xa4, 0xce, 0xcf, 0xa7, 0x9e, 0x53, 0x86, 0xaf, 0xb1, 0xa5, 0x48, 0xa6, + 0x29, 0x10, 0x18, 0x88, 0xd8, 0x5e, 0x20, 0x6a, 0xfb, 0x0c, 0x7c, 0x15, 0x97, 0xa4, 0x3c, 0x8b, + 0x43, 0x84, 0x20, 0x03, 0x25, 0x64, 0x6c, 0x2f, 0xd2, 0xdb, 0xda, 0x06, 0xdc, 0x21, 0x8c, 0xbf, + 0x66, 0xfd, 0x49, 0xa8, 0x31, 0xd0, 0xf9, 0x68, 0x2a, 0x10, 0x21, 0x0e, 0x14, 0xe8, 0x7c, 0x82, + 0xc1, 0x44, 0x46, 0xe1, 0x24, 0x18, 0x83, 0x48, 0xc6, 0x68, 0x5f, 0xa3, 0x4a, 0xa7, 0x64, 0xee, + 0xce, 0x88, 0x3e, 0xf1, 0xde, 0x94, 0xb4, 0x97, 0xc4, 0xe2, 0x63, 0xb6, 0x76, 0xb1, 0x96, 0x82, + 0xa9, 0x44, 0x98, 0x89, 0x35, 0x7b, 0xd6, 0xa0, 0xb5, 0xd9, 0x71, 0xc5, 0x28, 0x72, 0xcb, 0x21, + 0xb9, 0xd5, 0x68, 0x0e, 0x86, 0xae, 0x11, 0xf2, 0xbb, 0x17, 0x1c, 0xe4, 0x93, 0x46, 0x75, 0x12, + 0xb0, 0xc5, 0x18, 0x32, 0xa9, 0x05, 0xda, 0x8c, 0x3a, 0xbd, 0xea, 0x1a, 0x4b, 0xb8, 0xa5, 0x25, + 0xdc, 0xca, 0x12, 0xee, 0x33, 0x29, 0xd2, 0xad, 0x8d, 0xa3, 0xef, 0xdd, 0xda, 0xe1, 0x8f, 0xee, + 0x20, 0x11, 0x38, 0xce, 0x47, 0x6e, 0x24, 0xa7, 0x5e, 0xe5, 0x1f, 0xf3, 0x59, 0xd7, 0xf1, 0xbe, + 0x57, 0x8e, 0x53, 0x53, 0x81, 0xf6, 0x67, 0xda, 0xfc, 0x2e, 0x5b, 0x36, 0x6f, 0x09, 0x50, 0x4c, + 0x41, 0xe6, 0x68, 0xb7, 0xa8, 0x11, 0x4b, 0x06, 0xdd, 0x33, 0x20, 0xdf, 0x60, 0x2b, 0xea, 0x8f, + 0x99, 0x82, 0x10, 0x67, 0x0f, 0x6d, 0x13, 0x99, 0x9f, 0xe5, 0x9e, 0xa2, 0xb9, 0x7f, 0x7f, 0x9d, + 0xcd, 0xd3, 0xfc, 0x39, 0x67, 0x8d, 0x2c, 0xc4, 0x31, 0xd9, 0xae, 0xe9, 0x53, 0xcc, 0x6f, 0xb0, + 0xb9, 0x7d, 0x28, 0xc8, 0x76, 0x6d, 0xbf, 0x0c, 0xfb, 0x87, 0x16, 0x6b, 0xbf, 0x30, 0xab, 0xb5, + 0x8b, 0x21, 0x02, 0x7f, 0xc2, 0x16, 0xcc, 0x42, 0x50, 0x61, 0x6b, 0xf3, 0xce, 0x15, 0x46, 0xdb, + 0x21, 0xe2, 0x56, 0xa3, 0x6c, 0x83, 0x5f, 0x95, 0xf1, 0xf7, 0xec, 0xdc, 0xb5, 0x82, 0x8a, 0x6a, + 0xd7, 0xa9, 0x97, 0x0f, 0xae, 0x10, 0xfb, 0x67, 0x69, 0xfc, 0x9b, 0xea, 0x2f, 0x40, 0x80, 0xde, + 0xf2, 0x8f, 0x4e, 0x1c, 0xeb, 0xf8, 0xc4, 0xb1, 0x7e, 0x9e, 0x38, 0xd6, 0xd7, 0x53, 0xa7, 0x76, + 0x7c, 0xea, 0xd4, 0xbe, 0x9d, 0x3a, 0xb5, 0x0f, 0x8f, 0xcf, 0x4d, 0xa0, 0x3a, 0x62, 0x5d, 0xaa, + 0x64, 0x16, 0x7b, 0x5f, 0x2e, 0xd8, 0x7b, 0x9a, 0xcb, 0x68, 0x81, 0xd6, 0xf6, 0xe1, 0xef, 0x00, + 0x00, 0x00, 0xff, 0xff, 0x56, 0x73, 0xa5, 0xa5, 0x7b, 0x04, 0x00, 0x00, } func (m *RegisteredQuery) Marshal() (dAtA []byte, err error) { diff --git a/x/interchainqueries/types/params.pb.go b/x/interchainqueries/types/params.pb.go index 07060f9b2..7236536fd 100644 --- a/x/interchainqueries/types/params.pb.go +++ b/x/interchainqueries/types/params.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: interchainqueries/params.proto +// source: neutron/interchainqueries/params.proto package types @@ -7,8 +7,8 @@ import ( fmt "fmt" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" types "github.com/cosmos/cosmos-sdk/types" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" @@ -41,7 +41,7 @@ type Params struct { func (m *Params) Reset() { *m = Params{} } func (*Params) ProtoMessage() {} func (*Params) Descriptor() ([]byte, []int) { - return fileDescriptor_1421c1e223ed164f, []int{0} + return fileDescriptor_752a5f3346da64b1, []int{0} } func (m *Params) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -95,31 +95,33 @@ func init() { proto.RegisterType((*Params)(nil), "neutron.interchainqueries.Params") } -func init() { proto.RegisterFile("interchainqueries/params.proto", fileDescriptor_1421c1e223ed164f) } +func init() { + proto.RegisterFile("neutron/interchainqueries/params.proto", fileDescriptor_752a5f3346da64b1) +} -var fileDescriptor_1421c1e223ed164f = []byte{ - // 322 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x91, 0x31, 0x4f, 0xc2, 0x40, - 0x14, 0xc7, 0x5b, 0x21, 0x0c, 0x55, 0x97, 0x4a, 0x0c, 0x30, 0x1c, 0xc4, 0x89, 0x85, 0x3b, 0x90, - 0xc5, 0x38, 0xa2, 0xa3, 0x83, 0x56, 0x27, 0x97, 0xa6, 0x2d, 0x97, 0x72, 0x91, 0xeb, 0xab, 0x77, - 0xaf, 0x04, 0xbe, 0x85, 0xa3, 0xa3, 0xb3, 0x9f, 0x84, 0x91, 0xd1, 0x49, 0x0d, 0x0c, 0x7e, 0x0d, - 0xd3, 0xbb, 0x9a, 0x98, 0x30, 0xf5, 0x25, 0xbf, 0xf7, 0xef, 0xef, 0x9f, 0x77, 0x1e, 0x11, 0x19, - 0x72, 0x95, 0xcc, 0x22, 0x91, 0x3d, 0x17, 0x5c, 0x09, 0xae, 0x59, 0x1e, 0xa9, 0x48, 0x6a, 0x9a, - 0x2b, 0x40, 0xf0, 0xdb, 0x19, 0x2f, 0x50, 0x41, 0x46, 0xf7, 0xf6, 0x3a, 0xcd, 0x14, 0x52, 0x30, - 0x5b, 0xac, 0x9c, 0x6c, 0xa0, 0x43, 0x12, 0xd0, 0x12, 0x34, 0x8b, 0x23, 0xcd, 0xd9, 0x62, 0x14, - 0x73, 0x8c, 0x46, 0x2c, 0x01, 0x91, 0x59, 0x7e, 0xf6, 0xe3, 0x7a, 0x8d, 0x5b, 0x63, 0xf0, 0x87, - 0x5e, 0xb3, 0xfc, 0xd7, 0x2a, 0xd4, 0x45, 0x2c, 0x05, 0x86, 0x28, 0x24, 0x87, 0x02, 0x5b, 0x6e, - 0xcf, 0xed, 0xd7, 0x03, 0xdf, 0xb0, 0x7b, 0x83, 0x1e, 0x2c, 0xf1, 0x73, 0xef, 0xd8, 0x26, 0xa6, - 0x3c, 0x07, 0x2d, 0xb0, 0x75, 0xd0, 0xab, 0xf5, 0x0f, 0xcf, 0xdb, 0xd4, 0x4a, 0x69, 0x29, 0xa5, - 0x95, 0x94, 0x5e, 0x81, 0xc8, 0x26, 0xc3, 0xf5, 0x67, 0xd7, 0x79, 0xff, 0xea, 0xf6, 0x53, 0x81, - 0xb3, 0x22, 0xa6, 0x09, 0x48, 0x56, 0x35, 0xb4, 0x9f, 0x81, 0x9e, 0x3e, 0x31, 0x5c, 0xe5, 0x5c, - 0x9b, 0x80, 0x0e, 0x8e, 0x8c, 0xe1, 0xda, 0x0a, 0xfc, 0xb1, 0x77, 0x8a, 0xcb, 0xd0, 0x4a, 0x15, - 0x97, 0xb0, 0x88, 0xe6, 0xe1, 0x5c, 0x48, 0x81, 0xad, 0x9a, 0x69, 0x79, 0x82, 0xcb, 0xbb, 0x12, - 0x06, 0x96, 0xdd, 0x94, 0xe8, 0xb2, 0xfe, 0xfa, 0xd6, 0x75, 0x26, 0xc1, 0x7a, 0x4b, 0xdc, 0xcd, - 0x96, 0xb8, 0xdf, 0x5b, 0xe2, 0xbe, 0xec, 0x88, 0xb3, 0xd9, 0x11, 0xe7, 0x63, 0x47, 0x9c, 0xc7, - 0x8b, 0x7f, 0x65, 0xaa, 0xfb, 0x0e, 0x40, 0xa5, 0x7f, 0x33, 0x5b, 0xb2, 0xfd, 0x57, 0x31, 0x15, - 0xe3, 0x86, 0x39, 0xe2, 0xf8, 0x37, 0x00, 0x00, 0xff, 0xff, 0x70, 0x42, 0xb7, 0x7c, 0xb7, 0x01, - 0x00, 0x00, +var fileDescriptor_752a5f3346da64b1 = []byte{ + // 328 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x91, 0xb1, 0x4f, 0xfa, 0x40, + 0x14, 0xc7, 0xdb, 0x1f, 0x84, 0xa1, 0x3f, 0x5d, 0x2a, 0x31, 0xc0, 0x70, 0x10, 0x07, 0xc3, 0xc2, + 0x1d, 0xc8, 0x62, 0x1c, 0xd1, 0xd1, 0x41, 0xab, 0x93, 0x4b, 0xd3, 0x96, 0x4b, 0xb9, 0xc8, 0xf5, + 0xd5, 0xbb, 0x57, 0x02, 0xff, 0x85, 0xa3, 0xa3, 0xb3, 0x7f, 0x09, 0x23, 0xa3, 0x93, 0x1a, 0x18, + 0xfc, 0x37, 0x4c, 0xef, 0x6a, 0x62, 0xa2, 0x53, 0x5f, 0xf2, 0x79, 0xdf, 0x7e, 0xbe, 0x79, 0xe7, + 0x1d, 0x67, 0xbc, 0x40, 0x05, 0x19, 0x13, 0x19, 0x72, 0x95, 0xcc, 0x22, 0x91, 0x3d, 0x14, 0x5c, + 0x09, 0xae, 0x59, 0x1e, 0xa9, 0x48, 0x6a, 0x9a, 0x2b, 0x40, 0xf0, 0xdb, 0xd5, 0x1e, 0xfd, 0xb5, + 0xd7, 0x69, 0xa6, 0x90, 0x82, 0xd9, 0x62, 0xe5, 0x64, 0x03, 0x1d, 0x92, 0x80, 0x96, 0xa0, 0x59, + 0x1c, 0x69, 0xce, 0x16, 0xa3, 0x98, 0x63, 0x34, 0x62, 0x09, 0x88, 0xcc, 0xf2, 0xa3, 0x4f, 0xd7, + 0x6b, 0x5c, 0x19, 0x83, 0x3f, 0xf4, 0x9a, 0xe5, 0xbf, 0x56, 0xa1, 0x2e, 0x62, 0x29, 0x30, 0x44, + 0x21, 0x39, 0x14, 0xd8, 0x72, 0x7b, 0x6e, 0xbf, 0x1e, 0xf8, 0x86, 0xdd, 0x18, 0x74, 0x6b, 0x89, + 0x9f, 0x7b, 0xfb, 0x36, 0x31, 0xe5, 0x39, 0x68, 0x81, 0xad, 0x7f, 0xbd, 0x5a, 0xff, 0xff, 0x49, + 0x9b, 0x5a, 0x29, 0x2d, 0xa5, 0xb4, 0x92, 0xd2, 0x73, 0x10, 0xd9, 0x64, 0xb8, 0x7e, 0xeb, 0x3a, + 0x2f, 0xef, 0xdd, 0x7e, 0x2a, 0x70, 0x56, 0xc4, 0x34, 0x01, 0xc9, 0xaa, 0x86, 0xf6, 0x33, 0xd0, + 0xd3, 0x7b, 0x86, 0xab, 0x9c, 0x6b, 0x13, 0xd0, 0xc1, 0x9e, 0x31, 0x5c, 0x58, 0x81, 0x3f, 0xf6, + 0x0e, 0x71, 0x19, 0x5a, 0xa9, 0xe2, 0x12, 0x16, 0xd1, 0x3c, 0x9c, 0x0b, 0x29, 0xb0, 0x55, 0x33, + 0x2d, 0x0f, 0x70, 0x79, 0x5d, 0xc2, 0xc0, 0xb2, 0xcb, 0x12, 0x9d, 0xd5, 0x9f, 0x9e, 0xbb, 0xce, + 0x24, 0x58, 0x6f, 0x89, 0xbb, 0xd9, 0x12, 0xf7, 0x63, 0x4b, 0xdc, 0xc7, 0x1d, 0x71, 0x36, 0x3b, + 0xe2, 0xbc, 0xee, 0x88, 0x73, 0x77, 0xfa, 0xa3, 0x4c, 0x75, 0xdf, 0x01, 0xa8, 0xf4, 0x7b, 0x66, + 0xcb, 0x3f, 0x5e, 0xc5, 0x54, 0x8c, 0x1b, 0xe6, 0x88, 0xe3, 0xaf, 0x00, 0x00, 0x00, 0xff, 0xff, + 0xeb, 0xcd, 0x47, 0x31, 0xbf, 0x01, 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 79143d3f2..39aca701b 100644 --- a/x/interchainqueries/types/query.pb.go +++ b/x/interchainqueries/types/query.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: interchainqueries/query.proto +// source: neutron/interchainqueries/query.proto package types @@ -7,9 +7,9 @@ import ( context "context" fmt "fmt" query "github.com/cosmos/cosmos-sdk/types/query" - _ "github.com/gogo/protobuf/gogoproto" - grpc1 "github.com/gogo/protobuf/grpc" - proto "github.com/gogo/protobuf/proto" + _ "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" @@ -38,7 +38,7 @@ 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_eb803bedd4e52c75, []int{0} + return fileDescriptor_2254be23ba3ff3b4, []int{0} } func (m *QueryParamsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -77,7 +77,7 @@ 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_eb803bedd4e52c75, []int{1} + return fileDescriptor_2254be23ba3ff3b4, []int{1} } func (m *QueryParamsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -123,7 +123,7 @@ func (m *QueryRegisteredQueriesRequest) Reset() { *m = QueryRegisteredQu func (m *QueryRegisteredQueriesRequest) String() string { return proto.CompactTextString(m) } func (*QueryRegisteredQueriesRequest) ProtoMessage() {} func (*QueryRegisteredQueriesRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_eb803bedd4e52c75, []int{2} + return fileDescriptor_2254be23ba3ff3b4, []int{2} } func (m *QueryRegisteredQueriesRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -183,7 +183,7 @@ func (m *QueryRegisteredQueriesResponse) Reset() { *m = QueryRegisteredQ func (m *QueryRegisteredQueriesResponse) String() string { return proto.CompactTextString(m) } func (*QueryRegisteredQueriesResponse) ProtoMessage() {} func (*QueryRegisteredQueriesResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_eb803bedd4e52c75, []int{3} + return fileDescriptor_2254be23ba3ff3b4, []int{3} } func (m *QueryRegisteredQueriesResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -234,7 +234,7 @@ func (m *QueryRegisteredQueryRequest) Reset() { *m = QueryRegisteredQuer func (m *QueryRegisteredQueryRequest) String() string { return proto.CompactTextString(m) } func (*QueryRegisteredQueryRequest) ProtoMessage() {} func (*QueryRegisteredQueryRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_eb803bedd4e52c75, []int{4} + return fileDescriptor_2254be23ba3ff3b4, []int{4} } func (m *QueryRegisteredQueryRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -278,7 +278,7 @@ func (m *QueryRegisteredQueryResponse) Reset() { *m = QueryRegisteredQue func (m *QueryRegisteredQueryResponse) String() string { return proto.CompactTextString(m) } func (*QueryRegisteredQueryResponse) ProtoMessage() {} func (*QueryRegisteredQueryResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_eb803bedd4e52c75, []int{5} + return fileDescriptor_2254be23ba3ff3b4, []int{5} } func (m *QueryRegisteredQueryResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -322,7 +322,7 @@ func (m *QueryRegisteredQueryResultRequest) Reset() { *m = QueryRegister func (m *QueryRegisteredQueryResultRequest) String() string { return proto.CompactTextString(m) } func (*QueryRegisteredQueryResultRequest) ProtoMessage() {} func (*QueryRegisteredQueryResultRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_eb803bedd4e52c75, []int{6} + return fileDescriptor_2254be23ba3ff3b4, []int{6} } func (m *QueryRegisteredQueryResultRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -366,7 +366,7 @@ func (m *QueryRegisteredQueryResultResponse) Reset() { *m = QueryRegiste func (m *QueryRegisteredQueryResultResponse) String() string { return proto.CompactTextString(m) } func (*QueryRegisteredQueryResultResponse) ProtoMessage() {} func (*QueryRegisteredQueryResultResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_eb803bedd4e52c75, []int{7} + return fileDescriptor_2254be23ba3ff3b4, []int{7} } func (m *QueryRegisteredQueryResultResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -412,7 +412,7 @@ func (m *Transaction) Reset() { *m = Transaction{} } func (m *Transaction) String() string { return proto.CompactTextString(m) } func (*Transaction) ProtoMessage() {} func (*Transaction) Descriptor() ([]byte, []int) { - return fileDescriptor_eb803bedd4e52c75, []int{8} + return fileDescriptor_2254be23ba3ff3b4, []int{8} } func (m *Transaction) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -470,7 +470,7 @@ func (m *QueryLastRemoteHeight) Reset() { *m = QueryLastRemoteHeight{} } func (m *QueryLastRemoteHeight) String() string { return proto.CompactTextString(m) } func (*QueryLastRemoteHeight) ProtoMessage() {} func (*QueryLastRemoteHeight) Descriptor() ([]byte, []int) { - return fileDescriptor_eb803bedd4e52c75, []int{9} + return fileDescriptor_2254be23ba3ff3b4, []int{9} } func (m *QueryLastRemoteHeight) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -514,7 +514,7 @@ func (m *QueryLastRemoteHeightResponse) Reset() { *m = QueryLastRemoteHe func (m *QueryLastRemoteHeightResponse) String() string { return proto.CompactTextString(m) } func (*QueryLastRemoteHeightResponse) ProtoMessage() {} func (*QueryLastRemoteHeightResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_eb803bedd4e52c75, []int{10} + return fileDescriptor_2254be23ba3ff3b4, []int{10} } func (m *QueryLastRemoteHeightResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -564,58 +564,59 @@ func init() { proto.RegisterType((*QueryLastRemoteHeightResponse)(nil), "neutron.interchainqueries.QueryLastRemoteHeightResponse") } -func init() { proto.RegisterFile("interchainqueries/query.proto", fileDescriptor_eb803bedd4e52c75) } - -var fileDescriptor_eb803bedd4e52c75 = []byte{ - // 753 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0x4f, 0x4f, 0x13, 0x4f, - 0x18, 0xee, 0x94, 0xfe, 0xca, 0x8f, 0xb7, 0x28, 0x30, 0xa2, 0x81, 0x15, 0x16, 0x58, 0x12, 0x28, - 0x98, 0xee, 0xf2, 0x27, 0x4a, 0x4d, 0x10, 0x13, 0x0e, 0x2a, 0x89, 0x07, 0xd8, 0xa8, 0x07, 0x2f, - 0xcd, 0xb4, 0x9d, 0x6c, 0x37, 0xa1, 0x3b, 0x65, 0x77, 0xaa, 0xf4, 0xea, 0xcd, 0x9b, 0xd1, 0xaf, - 0xe0, 0x07, 0xf0, 0xe6, 0xc1, 0x83, 0x57, 0xe2, 0x89, 0xc4, 0x8b, 0x27, 0x63, 0xc0, 0x0f, 0x62, - 0x76, 0x66, 0xfa, 0x77, 0xfb, 0x87, 0x72, 0xea, 0xce, 0xcc, 0xfb, 0xbc, 0xef, 0xf3, 0x3c, 0xf3, - 0xbe, 0x53, 0x98, 0x77, 0x3d, 0x4e, 0xfd, 0x42, 0x89, 0xb8, 0xde, 0x49, 0x95, 0xfa, 0x2e, 0x0d, - 0xac, 0xf0, 0xb7, 0x66, 0x56, 0x7c, 0xc6, 0x19, 0x9e, 0xf5, 0x68, 0x95, 0xfb, 0xcc, 0x33, 0x23, - 0x61, 0xda, 0xb4, 0xc3, 0x1c, 0x26, 0xa2, 0xac, 0xf0, 0x4b, 0x02, 0xb4, 0x39, 0x87, 0x31, 0xe7, - 0x98, 0x5a, 0xa4, 0xe2, 0x5a, 0xc4, 0xf3, 0x18, 0x27, 0xdc, 0x65, 0x5e, 0xa0, 0x4e, 0xd7, 0x0b, - 0x2c, 0x28, 0xb3, 0xc0, 0xca, 0x93, 0x80, 0xca, 0x3a, 0xd6, 0x9b, 0xcd, 0x3c, 0xe5, 0x64, 0xd3, - 0xaa, 0x10, 0xc7, 0xf5, 0x44, 0xb0, 0x8a, 0xd5, 0xa3, 0xcc, 0x2a, 0xc4, 0x27, 0xe5, 0x7a, 0xae, - 0x85, 0xe8, 0xb9, 0x43, 0x3d, 0x1a, 0xb8, 0xf5, 0x00, 0x2d, 0x1a, 0xc0, 0x4f, 0xe5, 0x99, 0x31, - 0x0d, 0xf8, 0x28, 0x2c, 0x7f, 0x28, 0x32, 0xda, 0xf4, 0xa4, 0x4a, 0x03, 0x6e, 0xbc, 0x82, 0x5b, - 0x6d, 0xbb, 0x41, 0x85, 0x79, 0x01, 0xc5, 0x8f, 0x21, 0x29, 0x2b, 0xcf, 0xa0, 0x45, 0x94, 0x4e, - 0x6d, 0x2d, 0x99, 0x3d, 0x5d, 0x31, 0x25, 0x74, 0x3f, 0x71, 0xf6, 0x7b, 0x21, 0x66, 0x2b, 0x98, - 0xf1, 0x19, 0xc1, 0xbc, 0x48, 0x6c, 0x53, 0xc7, 0x0d, 0x38, 0xf5, 0x69, 0xf1, 0x48, 0xc6, 0xab, - 0xca, 0xf8, 0x0e, 0x24, 0xd9, 0x5b, 0x8f, 0xfa, 0x61, 0x89, 0x91, 0xf4, 0x98, 0xad, 0x56, 0x78, - 0x19, 0x6e, 0x14, 0x98, 0xe7, 0xd1, 0x42, 0x68, 0x4c, 0xce, 0x2d, 0xce, 0xc4, 0x17, 0x51, 0x7a, - 0xcc, 0x1e, 0x6f, 0x6e, 0x1e, 0x14, 0xf1, 0x13, 0x80, 0xa6, 0x7b, 0x33, 0x23, 0x82, 0xe3, 0x8a, - 0x29, 0xad, 0x36, 0x43, 0xab, 0x4d, 0x79, 0xa5, 0xca, 0x6a, 0xf3, 0x90, 0x38, 0x54, 0x15, 0xb6, - 0x5b, 0x90, 0xc6, 0x0f, 0x04, 0x7a, 0x2f, 0x9a, 0xca, 0x8a, 0x1c, 0x60, 0xbf, 0x71, 0x98, 0x53, - 0xa2, 0x05, 0xe7, 0xd4, 0xd6, 0x7a, 0x1f, 0x5b, 0xda, 0x33, 0xd6, 0x94, 0x3f, 0x53, 0x7e, 0x67, - 0x21, 0xfc, 0xb4, 0x4d, 0x4b, 0x5c, 0x68, 0x59, 0x1d, 0xa8, 0x45, 0xb2, 0x6b, 0x13, 0x93, 0x85, - 0xbb, 0x5d, 0xb4, 0xd4, 0xea, 0x86, 0xcf, 0xc2, 0xff, 0x22, 0x51, 0xe8, 0x69, 0x78, 0xab, 0x09, - 0x7b, 0x54, 0xac, 0x0f, 0x8a, 0x46, 0x15, 0xe6, 0xba, 0x23, 0x95, 0x07, 0x2f, 0x61, 0xb2, 0xc3, - 0x83, 0x9a, 0x6a, 0x8c, 0x21, 0x1c, 0xb0, 0x27, 0xda, 0xb5, 0xd7, 0x8c, 0x3d, 0x58, 0xea, 0x51, - 0xb6, 0x7a, 0xcc, 0xaf, 0x40, 0xbb, 0x08, 0x46, 0x3f, 0xbc, 0x22, 0xbf, 0x07, 0x49, 0x5f, 0xec, - 0x28, 0xca, 0x2b, 0x7d, 0x28, 0xb7, 0xe2, 0x15, 0xca, 0x38, 0x80, 0xd4, 0x0b, 0x9f, 0x78, 0x01, - 0x11, 0xcd, 0x87, 0x6f, 0x42, 0xbc, 0xc1, 0x24, 0xee, 0x16, 0xc3, 0x3e, 0x2e, 0x51, 0xd7, 0x29, - 0x71, 0x71, 0x75, 0x09, 0x5b, 0xad, 0x30, 0x86, 0x44, 0x91, 0x70, 0x22, 0x9a, 0x73, 0xdc, 0x16, - 0xdf, 0xc6, 0x2e, 0xdc, 0x16, 0x15, 0x9e, 0x93, 0x80, 0xdb, 0xb4, 0xcc, 0x38, 0x7d, 0x26, 0x83, - 0x23, 0x4d, 0x8f, 0xa2, 0x4d, 0x6f, 0xec, 0xa8, 0x91, 0xea, 0x44, 0x37, 0x94, 0x36, 0xa9, 0xa0, - 0x56, 0x2a, 0x5b, 0xef, 0x47, 0xe1, 0x3f, 0x81, 0xc4, 0x1f, 0x11, 0x24, 0xe5, 0xbc, 0xe2, 0xcc, - 0x20, 0x1b, 0xda, 0x1e, 0x0a, 0xcd, 0xbc, 0x6a, 0xb8, 0xe4, 0x62, 0xac, 0xbd, 0xfb, 0xf9, 0xf7, - 0x53, 0x7c, 0x19, 0x2f, 0x59, 0x0a, 0x67, 0xf5, 0x7a, 0xdc, 0xf0, 0x77, 0x04, 0x53, 0x91, 0xf9, - 0xc3, 0xd9, 0xc1, 0xd7, 0xd4, 0xfd, 0x65, 0xd1, 0x1e, 0x5e, 0x03, 0xa9, 0x58, 0xdf, 0x17, 0xac, - 0x2d, 0x9c, 0xe9, 0xc3, 0x3a, 0xfa, 0x1a, 0xe0, 0xaf, 0x08, 0x26, 0x3a, 0x9a, 0x10, 0x3f, 0x18, - 0x8e, 0x45, 0x7d, 0x4c, 0xb5, 0x9d, 0xa1, 0x71, 0x8a, 0xfb, 0xb6, 0xe0, 0x9e, 0xc1, 0xf7, 0xae, - 0xce, 0xbd, 0x86, 0xbf, 0x21, 0x48, 0xb5, 0x34, 0x3d, 0xde, 0x1d, 0xbe, 0x7a, 0x73, 0x56, 0xb5, - 0x47, 0xd7, 0x44, 0x2b, 0x05, 0x96, 0x50, 0xb0, 0x86, 0x57, 0xfb, 0x28, 0x90, 0x6f, 0x81, 0x1c, - 0x4d, 0xfc, 0x05, 0xc1, 0x64, 0x64, 0x96, 0x36, 0x06, 0x91, 0xe8, 0x44, 0x68, 0xd9, 0x61, 0x11, - 0x0d, 0xc6, 0x1b, 0x82, 0xf1, 0x3a, 0x4e, 0xf7, 0xf5, 0x3c, 0x04, 0xe6, 0xe4, 0x2c, 0xee, 0xdb, - 0x67, 0x17, 0x3a, 0x3a, 0xbf, 0xd0, 0xd1, 0x9f, 0x0b, 0x1d, 0x7d, 0xb8, 0xd4, 0x63, 0xe7, 0x97, - 0x7a, 0xec, 0xd7, 0xa5, 0x1e, 0x7b, 0x9d, 0x75, 0x5c, 0x5e, 0xaa, 0xe6, 0xcd, 0x02, 0x2b, 0xd7, - 0xb3, 0x65, 0x98, 0xef, 0x34, 0x32, 0x9f, 0x76, 0xc9, 0xcd, 0x6b, 0x15, 0x1a, 0xe4, 0x93, 0xe2, - 0x1f, 0x7e, 0xfb, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x89, 0x8e, 0xa4, 0xaa, 0xda, 0x08, 0x00, - 0x00, +func init() { + proto.RegisterFile("neutron/interchainqueries/query.proto", fileDescriptor_2254be23ba3ff3b4) +} + +var fileDescriptor_2254be23ba3ff3b4 = []byte{ + // 752 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x95, 0xcf, 0x4f, 0x13, 0x41, + 0x14, 0xc7, 0x3b, 0xa5, 0x16, 0x79, 0x45, 0x81, 0x11, 0x0d, 0x54, 0xac, 0xb0, 0x44, 0x28, 0x98, + 0xee, 0xf2, 0x23, 0x4a, 0x4d, 0x10, 0x13, 0x0e, 0x2a, 0x89, 0x07, 0xd8, 0xa8, 0x07, 0x2f, 0xcd, + 0xb4, 0x9d, 0x6c, 0x37, 0xa1, 0x33, 0x65, 0x77, 0xaa, 0xec, 0xd5, 0x9b, 0x37, 0xa3, 0xff, 0x82, + 0x7f, 0x80, 0x37, 0x0f, 0x1e, 0xbc, 0x12, 0x4f, 0x24, 0x5e, 0x3c, 0x19, 0x03, 0xfe, 0x21, 0x66, + 0x67, 0xa6, 0xbf, 0x7f, 0x51, 0x4e, 0xed, 0xee, 0xbe, 0xef, 0xbc, 0xcf, 0xfb, 0xbe, 0xf7, 0x76, + 0xe1, 0x1e, 0xa3, 0x55, 0xe1, 0x71, 0x66, 0xb9, 0x4c, 0x50, 0xaf, 0x50, 0x22, 0x2e, 0x3b, 0xaa, + 0x52, 0xcf, 0xa5, 0xbe, 0x15, 0xfe, 0x06, 0x66, 0xc5, 0xe3, 0x82, 0xe3, 0x59, 0x1d, 0x66, 0x76, + 0x84, 0x25, 0xa7, 0x1d, 0xee, 0x70, 0x19, 0x65, 0x85, 0xff, 0x94, 0x20, 0x39, 0xe7, 0x70, 0xee, + 0x1c, 0x52, 0x8b, 0x54, 0x5c, 0x8b, 0x30, 0xc6, 0x05, 0x11, 0x2e, 0x67, 0xbe, 0x7e, 0xba, 0x5a, + 0xe0, 0x7e, 0x99, 0xfb, 0x56, 0x9e, 0xf8, 0x54, 0xe5, 0xb1, 0xde, 0xae, 0xe7, 0xa9, 0x20, 0xeb, + 0x56, 0x85, 0x38, 0x2e, 0x93, 0xc1, 0x3a, 0x76, 0xa9, 0x37, 0x61, 0x85, 0x78, 0xa4, 0x5c, 0x3b, + 0x73, 0xb9, 0x77, 0x9c, 0x43, 0x19, 0xf5, 0xdd, 0x5a, 0xa0, 0xd1, 0x3b, 0x50, 0x1c, 0xab, 0x18, + 0x63, 0x1a, 0xf0, 0x41, 0x88, 0xb5, 0x2f, 0x33, 0xd8, 0xf4, 0xa8, 0x4a, 0x7d, 0x61, 0xbc, 0x86, + 0x1b, 0x2d, 0x77, 0xfd, 0x0a, 0x67, 0x3e, 0xc5, 0x4f, 0x20, 0xae, 0x48, 0x66, 0xd0, 0x3c, 0x4a, + 0x27, 0x36, 0x16, 0xcc, 0x9e, 0x6e, 0x99, 0x4a, 0xba, 0x1b, 0x3b, 0xf9, 0x73, 0x37, 0x62, 0x6b, + 0x99, 0xf1, 0x05, 0xc1, 0x1d, 0x79, 0xb0, 0x4d, 0x1d, 0xd7, 0x17, 0xd4, 0xa3, 0xc5, 0x03, 0x15, + 0xaf, 0x33, 0xe3, 0x5b, 0x10, 0xe7, 0xef, 0x18, 0xf5, 0xc2, 0x14, 0x23, 0xe9, 0x31, 0x5b, 0x5f, + 0xe1, 0x45, 0xb8, 0x56, 0xe0, 0x8c, 0xd1, 0x42, 0x68, 0x58, 0xce, 0x2d, 0xce, 0x44, 0xe7, 0x51, + 0x7a, 0xcc, 0x1e, 0x6f, 0xdc, 0xdc, 0x2b, 0xe2, 0xa7, 0x00, 0x0d, 0x57, 0x67, 0x46, 0x24, 0xe3, + 0x92, 0xa9, 0x5a, 0x60, 0x86, 0x2d, 0x30, 0x55, 0xab, 0x75, 0x0b, 0xcc, 0x7d, 0xe2, 0x50, 0x9d, + 0xd8, 0x6e, 0x52, 0x1a, 0x3f, 0x11, 0xa4, 0x7a, 0x61, 0x6a, 0x2b, 0x72, 0x80, 0xbd, 0xfa, 0xc3, + 0x9c, 0x2e, 0x5a, 0x32, 0x27, 0x36, 0x56, 0xfb, 0xd8, 0xd2, 0x7a, 0x62, 0xa0, 0xfd, 0x99, 0xf2, + 0xda, 0x13, 0xe1, 0x67, 0x2d, 0xb5, 0x44, 0x65, 0x2d, 0xcb, 0x03, 0x6b, 0x51, 0x74, 0x2d, 0xc5, + 0x64, 0xe1, 0x76, 0x97, 0x5a, 0x82, 0x9a, 0xe1, 0xb3, 0x70, 0x55, 0x1e, 0x14, 0x7a, 0x1a, 0x76, + 0x35, 0x66, 0x8f, 0xca, 0xeb, 0xbd, 0xa2, 0x51, 0x85, 0xb9, 0xee, 0x4a, 0xed, 0xc1, 0x2b, 0x98, + 0x6c, 0xf3, 0x20, 0xd0, 0x83, 0x31, 0x84, 0x03, 0xf6, 0x44, 0x6b, 0xed, 0x81, 0xb1, 0x03, 0x0b, + 0x3d, 0xd2, 0x56, 0x0f, 0xc5, 0x05, 0xb0, 0x8b, 0x60, 0xf4, 0xd3, 0x6b, 0xf8, 0x1d, 0x88, 0x7b, + 0xf2, 0x8e, 0x46, 0x5e, 0xea, 0x83, 0xdc, 0xac, 0xd7, 0x2a, 0x63, 0x0f, 0x12, 0x2f, 0x3d, 0xc2, + 0x7c, 0x22, 0x87, 0x0f, 0x5f, 0x87, 0x68, 0x9d, 0x24, 0xea, 0x16, 0xc3, 0x39, 0x2e, 0x51, 0xd7, + 0x29, 0x09, 0xd9, 0xba, 0x98, 0xad, 0xaf, 0x30, 0x86, 0x58, 0x91, 0x08, 0x22, 0x87, 0x73, 0xdc, + 0x96, 0xff, 0x8d, 0x6d, 0xb8, 0x29, 0x33, 0xbc, 0x20, 0xbe, 0xb0, 0x69, 0x99, 0x0b, 0xfa, 0x5c, + 0x05, 0x77, 0x0c, 0x3d, 0xea, 0x1c, 0x7a, 0x63, 0x4b, 0xaf, 0x54, 0xbb, 0xba, 0x5e, 0x69, 0x03, + 0x05, 0x35, 0xa3, 0x6c, 0x7c, 0x18, 0x85, 0x2b, 0x52, 0x89, 0x3f, 0x21, 0x88, 0xab, 0x7d, 0xc5, + 0x99, 0x41, 0x36, 0xb4, 0xbc, 0x28, 0x92, 0xe6, 0x45, 0xc3, 0x15, 0x8b, 0xb1, 0xf2, 0xfe, 0xd7, + 0xbf, 0xcf, 0xd1, 0x45, 0xbc, 0x60, 0x0d, 0x7a, 0xd9, 0xe1, 0x1f, 0x08, 0xa6, 0x3a, 0xf6, 0x0f, + 0x67, 0x07, 0xb7, 0xa9, 0xfb, 0x9b, 0x25, 0xf9, 0xe8, 0x12, 0x4a, 0x4d, 0xfd, 0x40, 0x52, 0x5b, + 0x38, 0xd3, 0x87, 0xba, 0xf3, 0x6d, 0x80, 0xbf, 0x21, 0x98, 0x68, 0x1b, 0x42, 0xfc, 0x70, 0x38, + 0x8a, 0xda, 0x9a, 0x26, 0xb7, 0x86, 0xd6, 0x69, 0xf6, 0x4d, 0xc9, 0x9e, 0xc1, 0xf7, 0x2f, 0xce, + 0x1e, 0xe0, 0xef, 0x08, 0x12, 0x4d, 0x43, 0x8f, 0xb7, 0x87, 0xcf, 0xde, 0xd8, 0xd5, 0xe4, 0xe3, + 0x4b, 0xaa, 0x75, 0x05, 0x96, 0xac, 0x60, 0x05, 0x2f, 0x5b, 0x03, 0x3e, 0xe1, 0x39, 0xb5, 0x9a, + 0xf8, 0x2b, 0x82, 0xc9, 0x8e, 0x5d, 0x5a, 0x1b, 0x04, 0xd1, 0xae, 0x48, 0x66, 0x87, 0x55, 0xd4, + 0x89, 0xd7, 0x24, 0xf1, 0x2a, 0x4e, 0xf7, 0xf5, 0x3c, 0x14, 0xe6, 0xd4, 0x2e, 0xee, 0xda, 0x27, + 0x67, 0x29, 0x74, 0x7a, 0x96, 0x42, 0x7f, 0xcf, 0x52, 0xe8, 0xe3, 0x79, 0x2a, 0x72, 0x7a, 0x9e, + 0x8a, 0xfc, 0x3e, 0x4f, 0x45, 0xde, 0x64, 0x1d, 0x57, 0x94, 0xaa, 0x79, 0xb3, 0xc0, 0xcb, 0xb5, + 0xd3, 0x32, 0xdc, 0x73, 0xea, 0x27, 0x1f, 0x77, 0xfb, 0xba, 0x07, 0x15, 0xea, 0xe7, 0xe3, 0xf2, + 0x0b, 0xbf, 0xf9, 0x3f, 0x00, 0x00, 0xff, 0xff, 0x14, 0x88, 0x83, 0x3c, 0xfa, 0x08, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -841,7 +842,7 @@ var _Query_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "interchainqueries/query.proto", + Metadata: "neutron/interchainqueries/query.proto", } func (m *QueryParamsRequest) Marshal() (dAtA []byte, err error) { diff --git a/x/interchainqueries/types/query.pb.gw.go b/x/interchainqueries/types/query.pb.gw.go index 975e2a127..8cbfcdc6f 100644 --- a/x/interchainqueries/types/query.pb.gw.go +++ b/x/interchainqueries/types/query.pb.gw.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-grpc-gateway. DO NOT EDIT. -// source: interchainqueries/query.proto +// source: neutron/interchainqueries/query.proto /* Package types is a reverse proxy. @@ -461,15 +461,15 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } var ( - pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"neutron", "interchainqueries", "params"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"neutron", "interchainqueries", "params"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_RegisteredQueries_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"neutron", "interchainqueries", "registered_queries"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_RegisteredQueries_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"neutron", "interchainqueries", "registered_queries"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_RegisteredQuery_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"neutron", "interchainqueries", "registered_query"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_RegisteredQuery_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"neutron", "interchainqueries", "registered_query"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_QueryResult_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"neutron", "interchainqueries", "query_result"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_QueryResult_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"neutron", "interchainqueries", "query_result"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_LastRemoteHeight_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"neutron", "interchainqueries", "remote_height"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_LastRemoteHeight_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"neutron", "interchainqueries", "remote_height"}, "", runtime.AssumeColonVerbOpt(false))) ) var ( diff --git a/x/interchainqueries/types/tx.go b/x/interchainqueries/types/tx.go index 1051ee649..715c82879 100644 --- a/x/interchainqueries/types/tx.go +++ b/x/interchainqueries/types/tx.go @@ -1,12 +1,12 @@ package types import ( + "github.com/cosmos/ibc-go/v7/modules/core/exported" "strings" codectypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/cosmos/ibc-go/v4/modules/core/exported" ) const ( @@ -123,7 +123,7 @@ func (msg MsgRegisterInterchainQuery) GetSigners() []sdk.AccAddress { // UnpackInterfaces implements UnpackInterfacesMessage.UnpackInterfaces func (msg MsgSubmitQueryResult) UnpackInterfaces(unpacker codectypes.AnyUnpacker) error { - var header exported.Header + var header exported.ClientMessage if err := unpacker.UnpackAny(msg.Result.GetBlock().GetHeader(), &header); err != nil { return err } diff --git a/x/interchainqueries/types/tx.pb.go b/x/interchainqueries/types/tx.pb.go index 444bf8976..e3cd4d3bd 100644 --- a/x/interchainqueries/types/tx.pb.go +++ b/x/interchainqueries/types/tx.pb.go @@ -1,16 +1,16 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: interchainqueries/tx.proto +// source: neutron/interchainqueries/tx.proto package types import ( context "context" fmt "fmt" + types1 "github.com/cometbft/cometbft/abci/types" + crypto "github.com/cometbft/cometbft/proto/tendermint/crypto" types "github.com/cosmos/cosmos-sdk/codec/types" - grpc1 "github.com/gogo/protobuf/grpc" - proto "github.com/gogo/protobuf/proto" - types1 "github.com/tendermint/tendermint/abci/types" - crypto "github.com/tendermint/tendermint/proto/tendermint/crypto" + 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" @@ -50,7 +50,7 @@ func (m *MsgRegisterInterchainQuery) Reset() { *m = MsgRegisterInterchai func (m *MsgRegisterInterchainQuery) String() string { return proto.CompactTextString(m) } func (*MsgRegisterInterchainQuery) ProtoMessage() {} func (*MsgRegisterInterchainQuery) Descriptor() ([]byte, []int) { - return fileDescriptor_3f1f36ccf3a8e51d, []int{0} + return fileDescriptor_d4793837a316491e, []int{0} } func (m *MsgRegisterInterchainQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -129,7 +129,7 @@ func (m *MsgRegisterInterchainQueryResponse) Reset() { *m = MsgRegisterI func (m *MsgRegisterInterchainQueryResponse) String() string { return proto.CompactTextString(m) } func (*MsgRegisterInterchainQueryResponse) ProtoMessage() {} func (*MsgRegisterInterchainQueryResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_3f1f36ccf3a8e51d, []int{1} + return fileDescriptor_d4793837a316491e, []int{1} } func (m *MsgRegisterInterchainQueryResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -178,7 +178,7 @@ func (m *MsgSubmitQueryResult) Reset() { *m = MsgSubmitQueryResult{} } func (m *MsgSubmitQueryResult) String() string { return proto.CompactTextString(m) } func (*MsgSubmitQueryResult) ProtoMessage() {} func (*MsgSubmitQueryResult) Descriptor() ([]byte, []int) { - return fileDescriptor_3f1f36ccf3a8e51d, []int{2} + return fileDescriptor_d4793837a316491e, []int{2} } func (m *MsgSubmitQueryResult) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -247,7 +247,7 @@ func (m *QueryResult) Reset() { *m = QueryResult{} } func (m *QueryResult) String() string { return proto.CompactTextString(m) } func (*QueryResult) ProtoMessage() {} func (*QueryResult) Descriptor() ([]byte, []int) { - return fileDescriptor_3f1f36ccf3a8e51d, []int{3} + return fileDescriptor_d4793837a316491e, []int{3} } func (m *QueryResult) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -327,7 +327,7 @@ func (m *StorageValue) Reset() { *m = StorageValue{} } func (m *StorageValue) String() string { return proto.CompactTextString(m) } func (*StorageValue) ProtoMessage() {} func (*StorageValue) Descriptor() ([]byte, []int) { - return fileDescriptor_3f1f36ccf3a8e51d, []int{4} + return fileDescriptor_d4793837a316491e, []int{4} } func (m *StorageValue) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -398,7 +398,7 @@ func (m *Block) Reset() { *m = Block{} } func (m *Block) String() string { return proto.CompactTextString(m) } func (*Block) ProtoMessage() {} func (*Block) Descriptor() ([]byte, []int) { - return fileDescriptor_3f1f36ccf3a8e51d, []int{5} + return fileDescriptor_d4793837a316491e, []int{5} } func (m *Block) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -464,7 +464,7 @@ func (m *TxValue) Reset() { *m = TxValue{} } func (m *TxValue) String() string { return proto.CompactTextString(m) } func (*TxValue) ProtoMessage() {} func (*TxValue) Descriptor() ([]byte, []int) { - return fileDescriptor_3f1f36ccf3a8e51d, []int{6} + return fileDescriptor_d4793837a316491e, []int{6} } func (m *TxValue) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -528,7 +528,7 @@ func (m *MsgSubmitQueryResultResponse) Reset() { *m = MsgSubmitQueryResu func (m *MsgSubmitQueryResultResponse) String() string { return proto.CompactTextString(m) } func (*MsgSubmitQueryResultResponse) ProtoMessage() {} func (*MsgSubmitQueryResultResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_3f1f36ccf3a8e51d, []int{7} + return fileDescriptor_d4793837a316491e, []int{7} } func (m *MsgSubmitQueryResultResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -566,7 +566,7 @@ func (m *MsgRemoveInterchainQueryRequest) Reset() { *m = MsgRemoveInterc func (m *MsgRemoveInterchainQueryRequest) String() string { return proto.CompactTextString(m) } func (*MsgRemoveInterchainQueryRequest) ProtoMessage() {} func (*MsgRemoveInterchainQueryRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_3f1f36ccf3a8e51d, []int{8} + return fileDescriptor_d4793837a316491e, []int{8} } func (m *MsgRemoveInterchainQueryRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -616,7 +616,7 @@ func (m *MsgRemoveInterchainQueryResponse) Reset() { *m = MsgRemoveInter func (m *MsgRemoveInterchainQueryResponse) String() string { return proto.CompactTextString(m) } func (*MsgRemoveInterchainQueryResponse) ProtoMessage() {} func (*MsgRemoveInterchainQueryResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_3f1f36ccf3a8e51d, []int{9} + return fileDescriptor_d4793837a316491e, []int{9} } func (m *MsgRemoveInterchainQueryResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -657,7 +657,7 @@ func (m *MsgUpdateInterchainQueryRequest) Reset() { *m = MsgUpdateInterc func (m *MsgUpdateInterchainQueryRequest) String() string { return proto.CompactTextString(m) } func (*MsgUpdateInterchainQueryRequest) ProtoMessage() {} func (*MsgUpdateInterchainQueryRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_3f1f36ccf3a8e51d, []int{10} + return fileDescriptor_d4793837a316491e, []int{10} } func (m *MsgUpdateInterchainQueryRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -728,7 +728,7 @@ func (m *MsgUpdateInterchainQueryResponse) Reset() { *m = MsgUpdateInter func (m *MsgUpdateInterchainQueryResponse) String() string { return proto.CompactTextString(m) } func (*MsgUpdateInterchainQueryResponse) ProtoMessage() {} func (*MsgUpdateInterchainQueryResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_3f1f36ccf3a8e51d, []int{11} + return fileDescriptor_d4793837a316491e, []int{11} } func (m *MsgUpdateInterchainQueryResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -772,71 +772,73 @@ func init() { proto.RegisterType((*MsgUpdateInterchainQueryResponse)(nil), "neutron.interchainqueries.MsgUpdateInterchainQueryResponse") } -func init() { proto.RegisterFile("interchainqueries/tx.proto", fileDescriptor_3f1f36ccf3a8e51d) } +func init() { + proto.RegisterFile("neutron/interchainqueries/tx.proto", fileDescriptor_d4793837a316491e) +} -var fileDescriptor_3f1f36ccf3a8e51d = []byte{ - // 973 bytes of a gzipped FileDescriptorProto +var fileDescriptor_d4793837a316491e = []byte{ + // 975 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0x4f, 0x73, 0xdb, 0x44, - 0x14, 0x8f, 0x1c, 0x3b, 0x7f, 0x5e, 0x9c, 0xa4, 0x5d, 0x52, 0xea, 0x38, 0xd4, 0xcd, 0x88, 0x01, - 0x32, 0x4c, 0x91, 0x86, 0x50, 0x0a, 0x43, 0x87, 0x42, 0x0b, 0xd3, 0x21, 0x93, 0xc9, 0x10, 0xb6, - 0x6e, 0x0f, 0x5c, 0x34, 0xb2, 0xf4, 0x22, 0xef, 0x58, 0x59, 0xa9, 0xda, 0x95, 0x6d, 0x1d, 0xb8, + 0x14, 0x8f, 0x1c, 0x3b, 0x7f, 0x5e, 0x9c, 0xa4, 0x5d, 0x52, 0xea, 0x38, 0xd4, 0x64, 0xc4, 0x40, + 0x33, 0x4c, 0x91, 0x86, 0x50, 0x0a, 0x43, 0x87, 0x42, 0x0b, 0xd3, 0x21, 0x93, 0xc9, 0x10, 0xb6, + 0x69, 0x0f, 0x5c, 0x34, 0xb2, 0xf4, 0xa2, 0xec, 0x58, 0x59, 0xa9, 0xda, 0x95, 0x6d, 0x1d, 0xb8, 0x71, 0x27, 0x9f, 0x82, 0x0b, 0x5f, 0x81, 0x0f, 0xc0, 0xb1, 0x47, 0x8e, 0x90, 0x7c, 0x00, 0x4e, - 0xdc, 0x19, 0xed, 0xca, 0x8e, 0x18, 0xff, 0xc9, 0x24, 0x37, 0xbf, 0xf7, 0x7e, 0xef, 0xed, 0xfb, - 0xfb, 0x93, 0xa1, 0xc9, 0xb8, 0xc4, 0xc4, 0xeb, 0xba, 0x8c, 0xbf, 0x4e, 0x31, 0x61, 0x28, 0x6c, - 0x39, 0xb4, 0xe2, 0x24, 0x92, 0x11, 0xd9, 0xe6, 0x98, 0xca, 0x24, 0xe2, 0xd6, 0x04, 0xa6, 0x79, - 0x4f, 0x22, 0xf7, 0x31, 0x39, 0x65, 0x5c, 0xda, 0x5e, 0x92, 0xc5, 0x32, 0xb2, 0xe3, 0x24, 0x8a, - 0x4e, 0xb4, 0x67, 0x73, 0xa7, 0x64, 0x76, 0x3b, 0x1e, 0xb3, 0x65, 0x16, 0xa3, 0x28, 0x8c, 0xdb, - 0x41, 0x14, 0x05, 0x21, 0xda, 0x4a, 0xea, 0xa4, 0x27, 0xb6, 0xcb, 0xb3, 0xc2, 0x74, 0x7f, 0x32, - 0x9b, 0x00, 0x39, 0x0a, 0x56, 0xf8, 0x9a, 0x3f, 0x57, 0xa0, 0x79, 0x24, 0x02, 0x8a, 0x01, 0x13, - 0x12, 0x93, 0x83, 0x31, 0xfc, 0x87, 0x14, 0x93, 0x8c, 0xdc, 0x03, 0xc8, 0xfd, 0x32, 0x27, 0x7f, - 0xaf, 0x61, 0xec, 0x1a, 0x7b, 0xab, 0x74, 0x55, 0x69, 0xda, 0x59, 0x8c, 0xe4, 0x21, 0x54, 0x7b, - 0x98, 0x89, 0x46, 0x65, 0x77, 0x71, 0x6f, 0x6d, 0x7f, 0xd7, 0x9a, 0x59, 0x9f, 0x75, 0xf8, 0xea, - 0x10, 0x33, 0xaa, 0xd0, 0xc4, 0x86, 0xb7, 0x64, 0xe2, 0x72, 0xe1, 0x7a, 0x92, 0x45, 0x5c, 0x38, - 0x27, 0x2c, 0x94, 0x98, 0x34, 0x16, 0x55, 0x74, 0x52, 0x36, 0x3d, 0x57, 0x16, 0xf2, 0x2e, 0xac, - 0x7b, 0x11, 0xe7, 0xa8, 0x94, 0x0e, 0xf3, 0x1b, 0x55, 0x05, 0xad, 0x5f, 0x2a, 0x0f, 0xfc, 0x1c, - 0x94, 0xc6, 0xbe, 0x2b, 0xd1, 0x89, 0x31, 0x61, 0x91, 0xdf, 0xa8, 0xed, 0x1a, 0x7b, 0x55, 0x5a, - 0xd7, 0xca, 0x63, 0xa5, 0x23, 0x6f, 0xc3, 0x92, 0x50, 0x9d, 0x6c, 0x2c, 0xa9, 0x10, 0x85, 0x64, - 0x3e, 0x04, 0x73, 0x76, 0x17, 0x28, 0x8a, 0x38, 0xe2, 0x02, 0xc9, 0x06, 0x54, 0x98, 0xaf, 0xba, - 0x50, 0xa5, 0x15, 0xe6, 0x9b, 0xbf, 0x1a, 0xb0, 0x75, 0x24, 0x82, 0x17, 0x69, 0xe7, 0x94, 0xc9, - 0x11, 0x34, 0x0d, 0x25, 0xd9, 0x86, 0x15, 0xdd, 0xb6, 0x31, 0x7c, 0x59, 0xc9, 0x07, 0xe5, 0x0c, - 0x2a, 0xe5, 0x0c, 0xc8, 0x0e, 0xac, 0x7a, 0x21, 0x43, 0x2e, 0x73, 0x1f, 0xdd, 0x8a, 0x15, 0xad, - 0x38, 0xf0, 0xc9, 0x13, 0x58, 0x4a, 0x54, 0x64, 0x55, 0xf9, 0xda, 0xfe, 0xfb, 0x73, 0x3a, 0x5d, - 0xca, 0x83, 0x16, 0x5e, 0xe6, 0x3f, 0x06, 0xac, 0x95, 0xf3, 0x7b, 0x0e, 0xd0, 0xeb, 0x3b, 0xda, - 0x28, 0x1a, 0x86, 0x9a, 0xde, 0x07, 0x73, 0x62, 0xbe, 0x90, 0x51, 0xe2, 0x06, 0xf8, 0xca, 0x0d, - 0x53, 0xa4, 0xab, 0xbd, 0xbe, 0x0e, 0x23, 0xc8, 0x23, 0xa8, 0x75, 0xc2, 0xc8, 0xeb, 0xa9, 0x5a, - 0xe6, 0x2f, 0xc0, 0xb3, 0x1c, 0x47, 0x35, 0x3c, 0x6f, 0x42, 0x17, 0x59, 0xd0, 0x95, 0xaa, 0xd2, - 0x2a, 0x2d, 0x24, 0xd2, 0x84, 0x95, 0x04, 0xfb, 0x4c, 0xb0, 0x88, 0xab, 0x4a, 0xab, 0x74, 0x2c, - 0x93, 0x07, 0x40, 0xdc, 0x30, 0x8c, 0x06, 0x4e, 0xaf, 0xef, 0x78, 0x6e, 0x18, 0x76, 0x5c, 0xaf, - 0x27, 0xd4, 0x90, 0x57, 0xe8, 0x2d, 0x65, 0x39, 0xec, 0x7f, 0x33, 0xd2, 0x9b, 0x67, 0x06, 0xd4, - 0xcb, 0x59, 0x93, 0xf7, 0x60, 0x43, 0x68, 0xd9, 0x89, 0x13, 0x3c, 0x61, 0xc3, 0x62, 0x9b, 0xd7, - 0x0b, 0xed, 0xb1, 0x52, 0x92, 0x5b, 0xb0, 0xd8, 0xc3, 0x4c, 0xd5, 0x53, 0xa7, 0xf9, 0x4f, 0xb2, - 0x05, 0xb5, 0x7e, 0x1e, 0x41, 0xa5, 0x5a, 0xa7, 0x5a, 0x20, 0x1f, 0x43, 0xed, 0x38, 0xbf, 0xcf, - 0x62, 0x20, 0x3b, 0xd6, 0xe5, 0x81, 0x5a, 0xfa, 0x7e, 0x2d, 0x65, 0xff, 0x3e, 0x16, 0x54, 0x23, - 0xcd, 0xdf, 0x0c, 0xa8, 0xa9, 0x2e, 0x90, 0xaf, 0xe1, 0x36, 0xc7, 0xa1, 0x74, 0x54, 0x33, 0x9c, - 0x2e, 0xba, 0xf9, 0x3a, 0x18, 0x2a, 0xd0, 0x96, 0xa5, 0x8f, 0xd9, 0x1a, 0x1d, 0xb3, 0xf5, 0x94, - 0x67, 0x74, 0x33, 0x87, 0x2b, 0xdf, 0xef, 0x14, 0x98, 0x3c, 0xc8, 0x1b, 0xe8, 0x8e, 0xb6, 0x68, - 0x96, 0x5b, 0x81, 0x21, 0xfb, 0x50, 0x91, 0x43, 0x95, 0xff, 0xda, 0xbe, 0x39, 0x67, 0x46, 0xed, - 0xa1, 0x9e, 0x70, 0x45, 0x0e, 0xcd, 0xbf, 0x0d, 0x58, 0x2e, 0x64, 0xf2, 0x24, 0x1f, 0x8b, 0xbe, - 0x81, 0x22, 0x4d, 0xb3, 0x5c, 0x6f, 0x4e, 0x48, 0xd6, 0xe8, 0x48, 0xbe, 0xc5, 0x90, 0xf5, 0x31, - 0x69, 0x0f, 0xe9, 0xd8, 0x87, 0x7c, 0x05, 0x1b, 0xbe, 0x56, 0x67, 0x8e, 0x62, 0xb5, 0x22, 0xeb, - 0xc6, 0xac, 0xae, 0xd1, 0xf5, 0x11, 0x5e, 0x89, 0xe4, 0x29, 0x6c, 0x32, 0xee, 0x85, 0x69, 0xbe, - 0x08, 0x45, 0x84, 0xc5, 0x2b, 0x22, 0x6c, 0x8c, 0x1d, 0x74, 0x08, 0x02, 0x55, 0xdf, 0x95, 0xae, - 0x9a, 0x57, 0x9d, 0xaa, 0xdf, 0x66, 0x0b, 0xde, 0x99, 0x76, 0xbe, 0xa3, 0x52, 0xcc, 0x36, 0xdc, - 0x57, 0xac, 0x70, 0x1a, 0xf5, 0x71, 0x82, 0x13, 0x5e, 0xa7, 0x28, 0x6e, 0x72, 0xe9, 0xa6, 0x09, - 0xbb, 0xb3, 0xa3, 0x16, 0x2f, 0xff, 0x6b, 0xa8, 0xa7, 0x5f, 0x2a, 0xee, 0xba, 0xfe, 0xd3, 0x8f, - 0x61, 0x85, 0xe3, 0xc0, 0xb9, 0x16, 0x37, 0x2f, 0x73, 0x1c, 0x1c, 0xe6, 0xf4, 0xfc, 0x61, 0xbe, - 0x9d, 0x03, 0xe7, 0xff, 0x64, 0xaa, 0xef, 0x74, 0x93, 0xe3, 0xe0, 0x65, 0x99, 0x4f, 0x1f, 0xc1, - 0xdd, 0x1c, 0x3b, 0x8d, 0xce, 0x35, 0x47, 0xdf, 0xe1, 0x38, 0x68, 0x4f, 0x32, 0xfa, 0x65, 0x6f, - 0x6a, 0x53, 0x7a, 0x33, 0xa3, 0x6c, 0xdd, 0x9b, 0xfd, 0xdf, 0xab, 0xb0, 0x78, 0x24, 0x02, 0xf2, - 0x8b, 0x01, 0x77, 0x67, 0x7d, 0xb7, 0x3e, 0x9d, 0x53, 0xee, 0x6c, 0xa2, 0x6f, 0x7e, 0x79, 0x23, - 0xb7, 0xf1, 0xf7, 0xe1, 0x27, 0xb8, 0x3d, 0xf9, 0x2d, 0xb0, 0xe7, 0xc7, 0x9c, 0x70, 0x68, 0x7e, - 0x76, 0x4d, 0x87, 0xf1, 0xf3, 0x67, 0x06, 0xdc, 0x99, 0xba, 0x56, 0xe4, 0x8b, 0xab, 0xea, 0x9a, - 0xbd, 0xe1, 0xcd, 0xc7, 0x37, 0xf2, 0x2d, 0xa5, 0x34, 0x75, 0x9a, 0x57, 0xa5, 0x34, 0x6f, 0xf3, - 0xaf, 0x4a, 0x69, 0xee, 0xfa, 0x3c, 0xa3, 0x7f, 0x9c, 0xb7, 0x8c, 0x37, 0xe7, 0x2d, 0xe3, 0xaf, - 0xf3, 0x96, 0x71, 0x76, 0xd1, 0x5a, 0x78, 0x73, 0xd1, 0x5a, 0xf8, 0xf3, 0xa2, 0xb5, 0xf0, 0xe3, - 0xe7, 0x01, 0x93, 0xdd, 0xb4, 0x63, 0x79, 0xd1, 0xa9, 0x5d, 0x3c, 0xf0, 0x51, 0x94, 0x04, 0xa3, - 0xdf, 0xf6, 0xd0, 0x9e, 0xf2, 0xdf, 0x2e, 0xff, 0x1f, 0xd6, 0x59, 0x52, 0xb4, 0xfb, 0xc9, 0x7f, - 0x01, 0x00, 0x00, 0xff, 0xff, 0x51, 0x4b, 0x23, 0xfc, 0xfd, 0x09, 0x00, 0x00, + 0xdc, 0x19, 0xed, 0xca, 0x8e, 0x18, 0x5b, 0xce, 0x24, 0x37, 0xbf, 0xf7, 0x7e, 0xef, 0xed, 0xfb, + 0xfb, 0x93, 0xc1, 0xe4, 0x98, 0xca, 0x24, 0xe2, 0x36, 0xe3, 0x12, 0x13, 0xef, 0xc4, 0x65, 0xfc, + 0x75, 0x8a, 0x09, 0x43, 0x61, 0xcb, 0xa1, 0x15, 0x27, 0x91, 0x8c, 0xc8, 0x66, 0x81, 0xb1, 0x26, + 0x30, 0xed, 0x7b, 0x12, 0xb9, 0x8f, 0xc9, 0x29, 0xe3, 0xd2, 0xf6, 0x92, 0x2c, 0x96, 0x91, 0x1d, + 0x27, 0x51, 0x74, 0xac, 0x3d, 0xdb, 0x5b, 0x25, 0xb3, 0xdb, 0xf5, 0x98, 0x2d, 0xb3, 0x18, 0x45, + 0x61, 0xdc, 0x0c, 0xa2, 0x28, 0x08, 0xd1, 0x56, 0x52, 0x37, 0x3d, 0xb6, 0x5d, 0x9e, 0x15, 0xa6, + 0xfb, 0xd5, 0x59, 0x05, 0xc8, 0x51, 0xb0, 0x22, 0x86, 0xf9, 0x73, 0x0d, 0xda, 0x07, 0x22, 0xa0, + 0x18, 0x30, 0x21, 0x31, 0xd9, 0x1b, 0xc3, 0x7f, 0x48, 0x31, 0xc9, 0xc8, 0x3d, 0x80, 0xdc, 0x2f, + 0x73, 0xf2, 0x77, 0x5b, 0xc6, 0xb6, 0xb1, 0xb3, 0x4c, 0x97, 0x95, 0xe6, 0x28, 0x8b, 0x91, 0x3c, + 0x84, 0x7a, 0x0f, 0x33, 0xd1, 0xaa, 0x6d, 0xcf, 0xef, 0xac, 0xec, 0x6e, 0x5b, 0x95, 0x75, 0x5a, + 0xfb, 0xaf, 0xf6, 0x31, 0xa3, 0x0a, 0x4d, 0x6c, 0x78, 0x4b, 0x26, 0x2e, 0x17, 0xae, 0x27, 0x59, + 0xc4, 0x85, 0x73, 0xcc, 0x42, 0x89, 0x49, 0x6b, 0x5e, 0x45, 0x27, 0x65, 0xd3, 0x73, 0x65, 0x21, + 0xef, 0xc1, 0xaa, 0x17, 0x71, 0x8e, 0x4a, 0xe9, 0x30, 0xbf, 0x55, 0x57, 0xd0, 0xe6, 0xa5, 0x72, + 0xcf, 0xcf, 0x41, 0x69, 0xec, 0xbb, 0x12, 0x9d, 0x18, 0x13, 0x16, 0xf9, 0xad, 0xc6, 0xb6, 0xb1, + 0x53, 0xa7, 0x4d, 0xad, 0x3c, 0x54, 0x3a, 0xf2, 0x36, 0x2c, 0x08, 0xd5, 0xd1, 0xd6, 0x82, 0x0a, + 0x51, 0x48, 0xe6, 0x43, 0x30, 0xab, 0xbb, 0x40, 0x51, 0xc4, 0x11, 0x17, 0x48, 0xd6, 0xa0, 0xc6, + 0x7c, 0xd5, 0x85, 0x3a, 0xad, 0x31, 0xdf, 0xfc, 0xd5, 0x80, 0x8d, 0x03, 0x11, 0xbc, 0x48, 0xbb, + 0xa7, 0x4c, 0x8e, 0xa0, 0x69, 0x28, 0xc9, 0x26, 0x2c, 0xe9, 0xb6, 0x8d, 0xe1, 0x8b, 0x4a, 0xde, + 0x2b, 0x67, 0x50, 0x2b, 0x67, 0x40, 0xb6, 0x60, 0xd9, 0x0b, 0x19, 0x72, 0x99, 0xfb, 0xe8, 0x56, + 0x2c, 0x69, 0xc5, 0x9e, 0x4f, 0x9e, 0xc0, 0x42, 0xa2, 0x22, 0xab, 0xca, 0x57, 0x76, 0x3f, 0x98, + 0xd1, 0xe9, 0x52, 0x1e, 0xb4, 0xf0, 0x32, 0xff, 0x31, 0x60, 0xa5, 0x9c, 0xdf, 0x73, 0x80, 0x5e, + 0xdf, 0xd1, 0x46, 0xd1, 0x32, 0xd4, 0xf4, 0xee, 0xcf, 0x88, 0xf9, 0x42, 0x46, 0x89, 0x1b, 0xe0, + 0x2b, 0x37, 0x4c, 0x91, 0x2e, 0xf7, 0xfa, 0x3a, 0x8c, 0x20, 0x8f, 0xa0, 0xd1, 0x0d, 0x23, 0xaf, + 0xa7, 0x6a, 0x99, 0xbd, 0x00, 0xcf, 0x72, 0x1c, 0xd5, 0xf0, 0xbc, 0x09, 0x27, 0xc8, 0x82, 0x13, + 0xa9, 0x2a, 0xad, 0xd3, 0x42, 0x22, 0x6d, 0x58, 0x4a, 0xb0, 0xcf, 0x04, 0x8b, 0xb8, 0xaa, 0xb4, + 0x4e, 0xc7, 0x32, 0x79, 0x00, 0xc4, 0x0d, 0xc3, 0x68, 0xe0, 0xf4, 0xfa, 0x8e, 0xe7, 0x86, 0x61, + 0xd7, 0xf5, 0x7a, 0x42, 0x0d, 0x79, 0x89, 0xde, 0x52, 0x96, 0xfd, 0xfe, 0x37, 0x23, 0xbd, 0x79, + 0x66, 0x40, 0xb3, 0x9c, 0x35, 0x79, 0x1f, 0xd6, 0x84, 0x96, 0x9d, 0x38, 0xc1, 0x63, 0x36, 0x2c, + 0xb6, 0x79, 0xb5, 0xd0, 0x1e, 0x2a, 0x25, 0xb9, 0x05, 0xf3, 0x3d, 0xcc, 0x54, 0x3d, 0x4d, 0x9a, + 0xff, 0x24, 0x1b, 0xd0, 0xe8, 0xe7, 0x11, 0x54, 0xaa, 0x4d, 0xaa, 0x05, 0xf2, 0x31, 0x34, 0x0e, + 0xf3, 0x3b, 0x2d, 0x06, 0xb2, 0x65, 0x5d, 0x1e, 0xaa, 0xa5, 0xef, 0xd8, 0x52, 0xf6, 0xef, 0x63, + 0x41, 0x35, 0xd2, 0xfc, 0xcd, 0x80, 0x86, 0xea, 0x02, 0xf9, 0x1a, 0x6e, 0x73, 0x1c, 0x4a, 0x47, + 0x35, 0xc3, 0x39, 0x41, 0x37, 0x5f, 0x07, 0x43, 0x05, 0xda, 0xb0, 0xf4, 0x51, 0x5b, 0xa3, 0xa3, + 0xb6, 0x9e, 0xf2, 0x8c, 0xae, 0xe7, 0x70, 0xe5, 0xfb, 0x9d, 0x02, 0x93, 0x07, 0x79, 0x03, 0xdd, + 0xd1, 0x16, 0x55, 0xb9, 0x15, 0x18, 0xb2, 0x0b, 0x35, 0x39, 0x54, 0xf9, 0xaf, 0xec, 0x9a, 0x33, + 0x66, 0x74, 0x34, 0xd4, 0x13, 0xae, 0xc9, 0xa1, 0xf9, 0xb7, 0x01, 0x8b, 0x85, 0x4c, 0x9e, 0xe4, + 0x63, 0xd1, 0x37, 0x50, 0xa4, 0x69, 0x96, 0xeb, 0xcd, 0x89, 0xc9, 0x1a, 0x1d, 0xc9, 0xb7, 0x18, + 0xb2, 0x3e, 0x26, 0x47, 0x43, 0x3a, 0xf6, 0x21, 0x5f, 0xc1, 0x9a, 0xaf, 0xd5, 0x99, 0xa3, 0xd8, + 0xad, 0xc8, 0xba, 0x55, 0xd5, 0x35, 0xba, 0x3a, 0xc2, 0x2b, 0x91, 0x3c, 0x85, 0x75, 0xc6, 0xbd, + 0x30, 0xcd, 0x17, 0xa1, 0x88, 0x30, 0x7f, 0x45, 0x84, 0xb5, 0xb1, 0x83, 0x0e, 0x41, 0xa0, 0xee, + 0xbb, 0xd2, 0x55, 0xf3, 0x6a, 0x52, 0xf5, 0xdb, 0xec, 0xc0, 0x3b, 0xd3, 0xce, 0x77, 0x54, 0x8a, + 0x79, 0x04, 0xef, 0x2a, 0x56, 0x38, 0x8d, 0xfa, 0x38, 0xc1, 0x09, 0xaf, 0x53, 0x14, 0x37, 0xb9, + 0x74, 0xd3, 0x84, 0xed, 0xea, 0xa8, 0xc5, 0xcb, 0xff, 0x1a, 0xea, 0xe9, 0x97, 0x8a, 0xbb, 0xae, + 0xff, 0xf4, 0x63, 0x58, 0xe2, 0x38, 0x70, 0xae, 0xc5, 0xcd, 0x8b, 0x1c, 0x07, 0xfb, 0x39, 0x3d, + 0x7f, 0x98, 0x6f, 0xe7, 0xc0, 0xf9, 0x3f, 0x99, 0xea, 0x3b, 0x5d, 0xe7, 0x38, 0x78, 0x59, 0xe6, + 0xd3, 0x47, 0x70, 0x37, 0xc7, 0x4e, 0xa3, 0x73, 0xcd, 0xd1, 0x77, 0x38, 0x0e, 0x8e, 0x26, 0x19, + 0xfd, 0xb2, 0x37, 0x8d, 0x29, 0xbd, 0xa9, 0x28, 0x5b, 0xf7, 0x66, 0xf7, 0xf7, 0x3a, 0xcc, 0x1f, + 0x88, 0x80, 0xfc, 0x62, 0xc0, 0xdd, 0xaa, 0xef, 0xd6, 0xa7, 0x33, 0xca, 0xad, 0x26, 0xfa, 0xf6, + 0x97, 0x37, 0x72, 0x1b, 0x7f, 0x1f, 0x7e, 0x82, 0xdb, 0x93, 0xdf, 0x02, 0x7b, 0x76, 0xcc, 0x09, + 0x87, 0xf6, 0x67, 0xd7, 0x74, 0x18, 0x3f, 0x7f, 0x66, 0xc0, 0x9d, 0xa9, 0x6b, 0x45, 0xbe, 0xb8, + 0xaa, 0xae, 0xea, 0x0d, 0x6f, 0x3f, 0xbe, 0x91, 0x6f, 0x29, 0xa5, 0xa9, 0xd3, 0xbc, 0x2a, 0xa5, + 0x59, 0x9b, 0x7f, 0x55, 0x4a, 0x33, 0xd7, 0xe7, 0x19, 0xfd, 0xe3, 0xbc, 0x63, 0xbc, 0x39, 0xef, + 0x18, 0x7f, 0x9d, 0x77, 0x8c, 0xb3, 0x8b, 0xce, 0xdc, 0x9b, 0x8b, 0xce, 0xdc, 0x9f, 0x17, 0x9d, + 0xb9, 0x1f, 0x3f, 0x0f, 0x98, 0x3c, 0x49, 0xbb, 0x96, 0x17, 0x9d, 0xda, 0xc5, 0x03, 0x1f, 0x45, + 0x49, 0x30, 0xfa, 0x6d, 0x0f, 0xa7, 0xfd, 0xc7, 0xcb, 0xff, 0x8f, 0x75, 0x17, 0x14, 0xed, 0x7e, + 0xf2, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe0, 0xab, 0xbc, 0xc1, 0x0d, 0x0a, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1024,7 +1026,7 @@ var _Msg_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "interchainqueries/tx.proto", + Metadata: "neutron/interchainqueries/tx.proto", } func (m *MsgRegisterInterchainQuery) Marshal() (dAtA []byte, err error) { diff --git a/x/interchainqueries/types/tx_test.go b/x/interchainqueries/types/tx_test.go index cfd6cf797..eea4e096d 100644 --- a/x/interchainqueries/types/tx_test.go +++ b/x/interchainqueries/types/tx_test.go @@ -5,12 +5,12 @@ import ( "strconv" "testing" + "github.com/cometbft/cometbft/proto/tendermint/crypto" sdktypes "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - host "github.com/cosmos/ibc-go/v4/modules/core/24-host" "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/proto/tendermint/crypto" + ibchost "github.com/cosmos/ibc-go/v7/modules/core/exported" iqtypes "github.com/neutron-org/neutron/x/interchainqueries/types" ) @@ -241,7 +241,7 @@ func TestMsgSubmitQueryResultValidate(t *testing.T) { }, }}, Value: []byte{10}, - StoragePrefix: host.StoreKey, + StoragePrefix: ibchost.StoreKey, }}, Block: nil, Height: 100, @@ -298,7 +298,7 @@ func TestMsgSubmitQueryResultValidate(t *testing.T) { }, }}, Value: []byte{10}, - StoragePrefix: host.StoreKey, + StoragePrefix: ibchost.StoreKey, }}, Block: nil, Height: 100, @@ -326,7 +326,7 @@ func TestMsgSubmitQueryResultValidate(t *testing.T) { }, }}, Value: []byte{10}, - StoragePrefix: host.StoreKey, + StoragePrefix: ibchost.StoreKey, }}, Block: nil, Height: 100, @@ -354,7 +354,7 @@ func TestMsgSubmitQueryResultValidate(t *testing.T) { }, }}, Value: []byte{10}, - StoragePrefix: host.StoreKey, + StoragePrefix: ibchost.StoreKey, }}, Block: nil, Height: 100, @@ -663,7 +663,7 @@ func TestMsgSubmitQueryResultGetSigners(t *testing.T) { }, }}, Value: []byte{10}, - StoragePrefix: host.StoreKey, + StoragePrefix: ibchost.StoreKey, }}, Block: nil, Height: 100, diff --git a/x/interchainqueries/types/verify.go b/x/interchainqueries/types/verify.go index e9b22a9a3..759a2842d 100644 --- a/x/interchainqueries/types/verify.go +++ b/x/interchainqueries/types/verify.go @@ -3,14 +3,14 @@ package types import ( codectypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" - clientkeeper "github.com/cosmos/ibc-go/v4/modules/core/02-client/keeper" - "github.com/cosmos/ibc-go/v4/modules/core/exported" - tendermintLightClientTypes "github.com/cosmos/ibc-go/v4/modules/light-clients/07-tendermint/types" + clientkeeper "github.com/cosmos/ibc-go/v7/modules/core/02-client/keeper" + "github.com/cosmos/ibc-go/v7/modules/core/exported" + tendermintLightClientTypes "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" ) type HeaderVerifier interface { - VerifyHeaders(ctx sdk.Context, cleintkeeper clientkeeper.Keeper, clientID string, header exported.Header, nextHeader exported.Header) error - UnpackHeader(any *codectypes.Any) (exported.Header, error) + VerifyHeaders(ctx sdk.Context, cleintkeeper clientkeeper.Keeper, clientID string, header exported.ClientMessage, nextHeader exported.ClientMessage) error + UnpackHeader(any *codectypes.Any) (exported.ClientMessage, error) } type TransactionVerifier interface { diff --git a/x/interchaintxs/genesis_test.go b/x/interchaintxs/genesis_test.go index ac0503ed3..2bdd38d7b 100644 --- a/x/interchaintxs/genesis_test.go +++ b/x/interchaintxs/genesis_test.go @@ -16,7 +16,7 @@ func TestGenesis(t *testing.T) { Params: types.DefaultParams(), } - k, ctx := keepertest.InterchainTxsKeeper(t, nil, nil, nil, nil, nil) + k, ctx := keepertest.InterchainTxsKeeper(t, nil, nil, nil, nil) interchaintxs.InitGenesis(ctx, *k, genesisState) got := interchaintxs.ExportGenesis(ctx, *k) require.NotNil(t, got) diff --git a/x/interchaintxs/ibc_module.go b/x/interchaintxs/ibc_module.go index 4bb39efc5..9e7bec32c 100644 --- a/x/interchaintxs/ibc_module.go +++ b/x/interchaintxs/ibc_module.go @@ -5,10 +5,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" - channeltypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" - porttypes "github.com/cosmos/ibc-go/v4/modules/core/05-port/types" - host "github.com/cosmos/ibc-go/v4/modules/core/24-host" - ibcexported "github.com/cosmos/ibc-go/v4/modules/core/exported" + channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" + porttypes "github.com/cosmos/ibc-go/v7/modules/core/05-port/types" + ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" "github.com/neutron-org/neutron/x/interchaintxs/keeper" ) @@ -32,14 +31,14 @@ func (im IBCModule) OnChanOpenInit( ctx sdk.Context, _ channeltypes.Order, _ []string, - portID string, - channelID string, - chanCap *capabilitytypes.Capability, + _ string, + _ string, + _ *capabilitytypes.Capability, _ channeltypes.Counterparty, version string, ) (string, error) { // FIXME: always returning plain version is probably a bad idea! - return version, im.keeper.ClaimCapability(ctx, chanCap, host.ChannelCapabilityPath(portID, channelID)) + return version, nil } // OnChanOpenTry implements the IBCModule interface. We don't need to implement this handler. diff --git a/x/interchaintxs/keeper/grpc_query_interchainaccount.go b/x/interchaintxs/keeper/grpc_query_interchainaccount.go index 3c2c411a8..c9136d325 100644 --- a/x/interchaintxs/keeper/grpc_query_interchainaccount.go +++ b/x/interchaintxs/keeper/grpc_query_interchainaccount.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - icatypes "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/types" + icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" "github.com/neutron-org/neutron/x/interchaintxs/types" ) diff --git a/x/interchaintxs/keeper/grpc_query_interchainaccount_test.go b/x/interchaintxs/keeper/grpc_query_interchainaccount_test.go index 9b141d7b2..a277189e5 100644 --- a/x/interchaintxs/keeper/grpc_query_interchainaccount_test.go +++ b/x/interchaintxs/keeper/grpc_query_interchainaccount_test.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - types2 "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/types" + types2 "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" "github.com/golang/mock/gomock" "github.com/stretchr/testify/require" @@ -20,7 +20,7 @@ func TestKeeper_InterchainAccountAddress(t *testing.T) { ctrl := gomock.NewController(t) defer ctrl.Finish() icaKeeper := mock_types.NewMockICAControllerKeeper(ctrl) - keeper, ctx := testkeeper.InterchainTxsKeeper(t, nil, nil, icaKeeper, nil, nil) + keeper, ctx := testkeeper.InterchainTxsKeeper(t, nil, nil, icaKeeper, nil) wctx := sdk.WrapSDKContext(ctx) resp, err := keeper.InterchainAccountAddress(wctx, nil) @@ -35,7 +35,7 @@ func TestKeeper_InterchainAccountAddress(t *testing.T) { require.ErrorContains(t, err, "failed to create ica owner") require.Nil(t, resp) - portID := fmt.Sprintf("%s%s.%s", types2.PortPrefix, testutil.TestOwnerAddress, "test1") + portID := fmt.Sprintf("%s%s.%s", types2.ControllerPortPrefix, testutil.TestOwnerAddress, "test1") icaKeeper.EXPECT().GetInterchainAccountAddress(ctx, "connection-0", portID).Return("", false) resp, err = keeper.InterchainAccountAddress(wctx, &types.QueryInterchainAccountAddressRequest{ OwnerAddress: testutil.TestOwnerAddress, @@ -45,7 +45,7 @@ func TestKeeper_InterchainAccountAddress(t *testing.T) { require.ErrorContains(t, err, "no interchain account found for portID") require.Nil(t, resp) - portID = fmt.Sprintf("%s%s.%s", types2.PortPrefix, testutil.TestOwnerAddress, "test1") + portID = fmt.Sprintf("%s%s.%s", types2.ControllerPortPrefix, testutil.TestOwnerAddress, "test1") icaKeeper.EXPECT().GetInterchainAccountAddress(ctx, "connection-0", portID).Return("neutron1interchainaccountaddress", true) resp, err = keeper.InterchainAccountAddress(wctx, &types.QueryInterchainAccountAddressRequest{ OwnerAddress: testutil.TestOwnerAddress, diff --git a/x/interchaintxs/keeper/grpc_query_params_test.go b/x/interchaintxs/keeper/grpc_query_params_test.go index b53d7918b..e69f18e15 100644 --- a/x/interchaintxs/keeper/grpc_query_params_test.go +++ b/x/interchaintxs/keeper/grpc_query_params_test.go @@ -11,7 +11,7 @@ import ( ) func TestParamsQuery(t *testing.T) { - keeper, ctx := testkeeper.InterchainTxsKeeper(t, nil, nil, nil, nil, nil) + keeper, ctx := testkeeper.InterchainTxsKeeper(t, nil, nil, nil, nil) wctx := sdk.WrapSDKContext(ctx) params := types.DefaultParams() keeper.SetParams(ctx, params) diff --git a/x/interchaintxs/keeper/ibc_handlers.go b/x/interchaintxs/keeper/ibc_handlers.go index 7644b0447..818ca7cd1 100644 --- a/x/interchaintxs/keeper/ibc_handlers.go +++ b/x/interchaintxs/keeper/ibc_handlers.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/telemetry" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - channeltypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" + channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" contractmanagertypes "github.com/neutron-org/neutron/x/contractmanager/types" feetypes "github.com/neutron-org/neutron/x/feerefunder/types" diff --git a/x/interchaintxs/keeper/ibc_handlers_test.go b/x/interchaintxs/keeper/ibc_handlers_test.go index 8781189c1..437d0ac4b 100644 --- a/x/interchaintxs/keeper/ibc_handlers_test.go +++ b/x/interchaintxs/keeper/ibc_handlers_test.go @@ -5,8 +5,8 @@ import ( "testing" sdk "github.com/cosmos/cosmos-sdk/types" - icatypes "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/types" - channeltypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" + icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" + channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" "github.com/golang/mock/gomock" "github.com/stretchr/testify/require" @@ -24,7 +24,7 @@ func TestHandleAcknowledgement(t *testing.T) { icaKeeper := mock_types.NewMockICAControllerKeeper(ctrl) cmKeeper := mock_types.NewMockContractManagerKeeper(ctrl) feeKeeper := mock_types.NewMockFeeRefunderKeeper(ctrl) - icak, infCtx := testkeeper.InterchainTxsKeeper(t, cmKeeper, feeKeeper, icaKeeper, nil, nil) + icak, infCtx := testkeeper.InterchainTxsKeeper(t, cmKeeper, feeKeeper, icaKeeper, nil) ctx := infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) errACK := channeltypes.Acknowledgement{ @@ -41,7 +41,7 @@ func TestHandleAcknowledgement(t *testing.T) { require.NoError(t, err) p := channeltypes.Packet{ Sequence: 100, - SourcePort: icatypes.PortPrefix + testutil.TestOwnerAddress + ".ica0", + SourcePort: icatypes.ControllerPortPrefix + testutil.TestOwnerAddress + ".ica0", SourceChannel: "channel-0", } contractAddress := sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress) @@ -118,14 +118,14 @@ func TestHandleTimeout(t *testing.T) { icaKeeper := mock_types.NewMockICAControllerKeeper(ctrl) cmKeeper := mock_types.NewMockContractManagerKeeper(ctrl) feeKeeper := mock_types.NewMockFeeRefunderKeeper(ctrl) - icak, infCtx := testkeeper.InterchainTxsKeeper(t, cmKeeper, feeKeeper, icaKeeper, nil, nil) + icak, infCtx := testkeeper.InterchainTxsKeeper(t, cmKeeper, feeKeeper, icaKeeper, nil) ctx := infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) contractAddress := sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress) relayerBech32 := "neutron1fxudpred77a0grgh69u0j7y84yks5ev4n5050z45kecz792jnd6scqu98z" relayerAddress := sdk.MustAccAddressFromBech32(relayerBech32) p := channeltypes.Packet{ Sequence: 100, - SourcePort: icatypes.PortPrefix + testutil.TestOwnerAddress + ".ica0", + SourcePort: icatypes.ControllerPortPrefix + testutil.TestOwnerAddress + ".ica0", SourceChannel: "channel-0", } @@ -167,8 +167,8 @@ func TestHandleChanOpenAck(t *testing.T) { ctrl := gomock.NewController(t) defer ctrl.Finish() cmKeeper := mock_types.NewMockContractManagerKeeper(ctrl) - icak, ctx := testkeeper.InterchainTxsKeeper(t, cmKeeper, nil, nil, nil, nil) - portID := icatypes.PortPrefix + testutil.TestOwnerAddress + ".ica0" + icak, ctx := testkeeper.InterchainTxsKeeper(t, cmKeeper, nil, nil, nil) + portID := icatypes.ControllerPortPrefix + testutil.TestOwnerAddress + ".ica0" contractAddress := sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress) channelID := "channel-0" counterpartyChannelID := "channel-1" diff --git a/x/interchaintxs/keeper/keeper.go b/x/interchaintxs/keeper/keeper.go index b69dffc2d..1bfd04518 100644 --- a/x/interchaintxs/keeper/keeper.go +++ b/x/interchaintxs/keeper/keeper.go @@ -3,12 +3,11 @@ package keeper import ( "fmt" + "github.com/cometbft/cometbft/libs/log" "github.com/cosmos/cosmos-sdk/codec" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - "github.com/tendermint/tendermint/libs/log" "github.com/neutron-org/neutron/x/interchaintxs/types" ) @@ -27,7 +26,6 @@ type ( storeKey storetypes.StoreKey memKey storetypes.StoreKey paramstore paramtypes.Subspace - scopedKeeper types.ScopedKeeper channelKeeper types.ChannelKeeper feeKeeper types.FeeRefunderKeeper icaControllerKeeper types.ICAControllerKeeper @@ -42,7 +40,6 @@ func NewKeeper( paramstore paramtypes.Subspace, channelKeeper types.ChannelKeeper, icaControllerKeeper types.ICAControllerKeeper, - scopedKeeper types.ScopedKeeper, contractManagerKeeper types.ContractManagerKeeper, feeKeeper types.FeeRefunderKeeper, ) *Keeper { @@ -58,7 +55,6 @@ func NewKeeper( paramstore: paramstore, channelKeeper: channelKeeper, icaControllerKeeper: icaControllerKeeper, - scopedKeeper: scopedKeeper, contractManagerKeeper: contractManagerKeeper, feeKeeper: feeKeeper, } @@ -67,8 +63,3 @@ func NewKeeper( func (k *Keeper) Logger(ctx sdk.Context) log.Logger { return ctx.Logger().With("module", fmt.Sprintf("x/%s", types.ModuleName)) } - -// ClaimCapability claims the channel capability passed via the OnOpenChanInit callback -func (k *Keeper) ClaimCapability(ctx sdk.Context, cap *capabilitytypes.Capability, name string) error { - return k.scopedKeeper.ClaimCapability(ctx, cap, name) -} diff --git a/x/interchaintxs/keeper/msg_server.go b/x/interchaintxs/keeper/msg_server.go index f21c2d66b..381021364 100644 --- a/x/interchaintxs/keeper/msg_server.go +++ b/x/interchaintxs/keeper/msg_server.go @@ -11,10 +11,8 @@ import ( "github.com/cosmos/cosmos-sdk/telemetry" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - icatypes "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/types" - channeltypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" - host "github.com/cosmos/ibc-go/v4/modules/core/24-host" - + icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" + channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" feetypes "github.com/neutron-org/neutron/x/feerefunder/types" ictxtypes "github.com/neutron-org/neutron/x/interchaintxs/types" ) @@ -112,12 +110,6 @@ func (k Keeper) SubmitTx(goCtx context.Context, msg *ictxtypes.MsgSubmitTx) (*ic return nil, sdkerrors.Wrapf(icatypes.ErrActiveChannelNotFound, "failed to GetActiveChannelID for port %s", portID) } - chanCap, found := k.scopedKeeper.GetCapability(ctx, host.ChannelCapabilityPath(portID, channelID)) - if !found { - k.Logger(ctx).Debug("SubmitTx: failed to GetCapability", "connection_id", msg.ConnectionId, "port_id", portID, "channel_id", channelID) - return nil, sdkerrors.Wrap(channeltypes.ErrChannelCapabilityNotFound, "failed to GetCapability") - } - data, err := SerializeCosmosTx(k.Codec, msg.Msgs) if err != nil { k.Logger(ctx).Debug("SubmitTx: failed to SerializeCosmosTx", "error", err, "connection_id", msg.ConnectionId, "port_id", portID, "channel_id", channelID) @@ -143,7 +135,8 @@ func (k Keeper) SubmitTx(goCtx context.Context, msg *ictxtypes.MsgSubmitTx) (*ic } timeoutTimestamp := ctx.BlockTime().Add(time.Duration(msg.Timeout) * time.Second).UnixNano() - _, err = k.icaControllerKeeper.SendTx(ctx, chanCap, msg.ConnectionId, portID, packetData, uint64(timeoutTimestamp)) + // TODO: keeper's SendTx deprecated, replace it with MsgServer SendTx + _, err = k.icaControllerKeeper.SendTx(ctx, nil, msg.ConnectionId, portID, packetData, uint64(timeoutTimestamp)) if err != nil { // usually we use DEBUG level for such errors, but in this case we have checked full input before running SendTX, so error here may be critical k.Logger(ctx).Error("SubmitTx", "error", err, "connection_id", msg.ConnectionId, "port_id", portID, "channel_id", channelID) diff --git a/x/interchaintxs/keeper/msg_server_test.go b/x/interchaintxs/keeper/msg_server_test.go index e28b1e5f2..16f81930e 100644 --- a/x/interchaintxs/keeper/msg_server_test.go +++ b/x/interchaintxs/keeper/msg_server_test.go @@ -6,10 +6,7 @@ import ( "time" "github.com/cosmos/cosmos-sdk/codec" - types2 "github.com/cosmos/cosmos-sdk/x/capability/types" - icatypes "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/types" - host "github.com/cosmos/ibc-go/v4/modules/core/24-host" - + icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" feerefundertypes "github.com/neutron-org/neutron/x/feerefunder/types" "github.com/neutron-org/neutron/x/interchaintxs/keeper" @@ -30,7 +27,7 @@ func TestRegisterInterchainAccount(t *testing.T) { defer ctrl.Finish() icaKeeper := mock_types.NewMockICAControllerKeeper(ctrl) cmKeeper := mock_types.NewMockContractManagerKeeper(ctrl) - icak, ctx := testkeeper.InterchainTxsKeeper(t, cmKeeper, nil, icaKeeper, nil, nil) + icak, ctx := testkeeper.InterchainTxsKeeper(t, cmKeeper, nil, icaKeeper, nil) goCtx := sdk.WrapSDKContext(ctx) msgRegAcc := types.MsgRegisterInterchainAccount{ @@ -68,10 +65,9 @@ func TestSubmitTx(t *testing.T) { defer ctrl.Finish() icaKeeper := mock_types.NewMockICAControllerKeeper(ctrl) cmKeeper := mock_types.NewMockContractManagerKeeper(ctrl) - capabilityKeeper := mock_types.NewMockScopedKeeper(ctrl) refundKeeper := mock_types.NewMockFeeRefunderKeeper(ctrl) channelKeeper := mock_types.NewMockChannelKeeper(ctrl) - icak, ctx := testkeeper.InterchainTxsKeeper(t, cmKeeper, refundKeeper, icaKeeper, channelKeeper, capabilityKeeper) + icak, ctx := testkeeper.InterchainTxsKeeper(t, cmKeeper, refundKeeper, icaKeeper, channelKeeper) goCtx := sdk.WrapSDKContext(ctx) cosmosMsg := codectypes.Any{ @@ -126,15 +122,6 @@ func TestSubmitTx(t *testing.T) { activeChannel := "channel-0" cmKeeper.EXPECT().HasContractInfo(ctx, contractAddress).Return(true) icaKeeper.EXPECT().GetActiveChannelID(ctx, "connection-0", portID).Return(activeChannel, true) - capabilityKeeper.EXPECT().GetCapability(ctx, host.ChannelCapabilityPath(portID, activeChannel)).Return(nil, false) - resp, err = icak.SubmitTx(goCtx, &submitMsg) - require.Nil(t, resp) - require.ErrorContains(t, err, "failed to GetCapability") - - capability := types2.Capability{Index: 1} - cmKeeper.EXPECT().HasContractInfo(ctx, contractAddress).Return(true) - icaKeeper.EXPECT().GetActiveChannelID(ctx, "connection-0", portID).Return(activeChannel, true) - capabilityKeeper.EXPECT().GetCapability(ctx, host.ChannelCapabilityPath(portID, activeChannel)).Return(&capability, true) currCodec := icak.Codec icak.Codec = &codec.AminoCodec{} resp, err = icak.SubmitTx(goCtx, &submitMsg) @@ -144,7 +131,6 @@ func TestSubmitTx(t *testing.T) { cmKeeper.EXPECT().HasContractInfo(ctx, contractAddress).Return(true) icaKeeper.EXPECT().GetActiveChannelID(ctx, "connection-0", portID).Return(activeChannel, true) - capabilityKeeper.EXPECT().GetCapability(ctx, host.ChannelCapabilityPath(portID, activeChannel)).Return(&capability, true) channelKeeper.EXPECT().GetNextSequenceSend(ctx, portID, activeChannel).Return(uint64(0), false) resp, err = icak.SubmitTx(goCtx, &submitMsg) require.Nil(t, resp) @@ -153,7 +139,6 @@ func TestSubmitTx(t *testing.T) { sequence := uint64(100) cmKeeper.EXPECT().HasContractInfo(ctx, contractAddress).Return(true) icaKeeper.EXPECT().GetActiveChannelID(ctx, "connection-0", portID).Return(activeChannel, true) - capabilityKeeper.EXPECT().GetCapability(ctx, host.ChannelCapabilityPath(portID, activeChannel)).Return(&capability, true) channelKeeper.EXPECT().GetNextSequenceSend(ctx, portID, activeChannel).Return(sequence, true) refundKeeper.EXPECT().LockFees(ctx, contractAddress, feerefundertypes.NewPacketID(portID, activeChannel, sequence), submitMsg.Fee).Return(fmt.Errorf("failed to lock fees")) resp, err = icak.SubmitTx(goCtx, &submitMsg) @@ -171,20 +156,18 @@ func TestSubmitTx(t *testing.T) { timeoutTimestamp := ctx.BlockTime().Add(time.Duration(submitMsg.Timeout) * time.Second).UnixNano() cmKeeper.EXPECT().HasContractInfo(ctx, contractAddress).Return(true) icaKeeper.EXPECT().GetActiveChannelID(ctx, "connection-0", portID).Return(activeChannel, true) - capabilityKeeper.EXPECT().GetCapability(ctx, host.ChannelCapabilityPath(portID, activeChannel)).Return(&capability, true) channelKeeper.EXPECT().GetNextSequenceSend(ctx, portID, activeChannel).Return(sequence, true) refundKeeper.EXPECT().LockFees(ctx, contractAddress, feerefundertypes.NewPacketID(portID, activeChannel, sequence), submitMsg.Fee).Return(nil) - icaKeeper.EXPECT().SendTx(ctx, &capability, "connection-0", portID, packetData, uint64(timeoutTimestamp)).Return(uint64(0), fmt.Errorf("faile to send tx")) + icaKeeper.EXPECT().SendTx(ctx, nil, "connection-0", portID, packetData, uint64(timeoutTimestamp)).Return(uint64(0), fmt.Errorf("faile to send tx")) resp, err = icak.SubmitTx(goCtx, &submitMsg) require.Nil(t, resp) require.ErrorContains(t, err, "failed to SendTx") cmKeeper.EXPECT().HasContractInfo(ctx, contractAddress).Return(true) icaKeeper.EXPECT().GetActiveChannelID(ctx, "connection-0", portID).Return(activeChannel, true) - capabilityKeeper.EXPECT().GetCapability(ctx, host.ChannelCapabilityPath(portID, activeChannel)).Return(&capability, true) channelKeeper.EXPECT().GetNextSequenceSend(ctx, portID, activeChannel).Return(sequence, true) refundKeeper.EXPECT().LockFees(ctx, contractAddress, feerefundertypes.NewPacketID(portID, activeChannel, sequence), submitMsg.Fee).Return(nil) - icaKeeper.EXPECT().SendTx(ctx, &capability, "connection-0", portID, packetData, uint64(timeoutTimestamp)).Return(uint64(0), nil) + icaKeeper.EXPECT().SendTx(ctx, nil, "connection-0", portID, packetData, uint64(timeoutTimestamp)).Return(uint64(0), nil) resp, err = icak.SubmitTx(goCtx, &submitMsg) require.Equal(t, types.MsgSubmitTxResponse{ SequenceId: sequence, diff --git a/x/interchaintxs/keeper/params_test.go b/x/interchaintxs/keeper/params_test.go index 03e79aa2b..672a637b4 100644 --- a/x/interchaintxs/keeper/params_test.go +++ b/x/interchaintxs/keeper/params_test.go @@ -10,7 +10,7 @@ import ( ) func TestGetParams(t *testing.T) { - k, ctx := testkeeper.InterchainTxsKeeper(t, nil, nil, nil, nil, nil) + k, ctx := testkeeper.InterchainTxsKeeper(t, nil, nil, nil, nil) params := types.DefaultParams() k.SetParams(ctx, params) diff --git a/x/interchaintxs/module.go b/x/interchaintxs/module.go index 1a1cf4146..7eaf0e894 100644 --- a/x/interchaintxs/module.go +++ b/x/interchaintxs/module.go @@ -1,9 +1,11 @@ package interchaintxs import ( + "cosmossdk.io/core/appmodule" "encoding/json" "fmt" + abci "github.com/cometbft/cometbft/abci/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" cdctypes "github.com/cosmos/cosmos-sdk/codec/types" @@ -12,7 +14,6 @@ import ( "github.com/gorilla/mux" "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" - abci "github.com/tendermint/tendermint/abci/types" "github.com/neutron-org/neutron/x/interchaintxs/client/cli" "github.com/neutron-org/neutron/x/interchaintxs/keeper" @@ -91,6 +92,8 @@ func (AppModuleBasic) GetQueryCmd() *cobra.Command { // AppModule // ---------------------------------------------------------------------------- +var _ appmodule.AppModule = AppModule{} + // AppModule implements the AppModule interface for the capability module. type AppModule struct { AppModuleBasic @@ -114,24 +117,22 @@ func NewAppModule( } } +// IsOnePerModuleType implements the depinject.OnePerModuleType interface. +func (am AppModule) IsOnePerModuleType() { // marker +} + +// IsAppModule implements the appmodule.AppModule interface. +func (am AppModule) IsAppModule() { // marker +} + // Name returns the capability module's name. func (am AppModule) Name() string { return am.AppModuleBasic.Name() } -// Deprecated: Route returns the capability module's message routing key. -func (am AppModule) Route() sdk.Route { - return sdk.NewRoute(types.RouterKey, NewHandler(am.keeper)) -} - // QuerierRoute returns the capability module's query routing key. func (AppModule) QuerierRoute() string { return types.QuerierRoute } -// LegacyQuerierHandler returns the capability module's Querier. -func (am AppModule) LegacyQuerierHandler(_ *codec.LegacyAmino) sdk.Querier { - return nil -} - // RegisterServices registers a GRPC query service to respond to the // module-specific GRPC queries. func (am AppModule) RegisterServices(cfg module.Configurator) { diff --git a/x/interchaintxs/module_simulation.go b/x/interchaintxs/module_simulation.go index 978d8a4c6..be6fb51e8 100644 --- a/x/interchaintxs/module_simulation.go +++ b/x/interchaintxs/module_simulation.go @@ -1,10 +1,8 @@ package interchaintxs import ( - "math/rand" - "github.com/cosmos/cosmos-sdk/baseapp" - simappparams "github.com/cosmos/cosmos-sdk/simapp/params" + "github.com/cosmos/cosmos-sdk/testutil/sims" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" @@ -17,7 +15,7 @@ import ( // avoid unused import issue var ( _ = interchaintxssimulation.FindAccount - _ = simappparams.StakePerAccount + _ = sims.StakePerAccount _ = simulation.MsgEntryKind _ = baseapp.Paramspace ) @@ -39,11 +37,6 @@ func (AppModule) ProposalContents(_ module.SimulationState) []simtypes.WeightedP return nil } -// RandomizedParams creates randomized param changes for the simulator -func (am AppModule) RandomizedParams(_ *rand.Rand) []simtypes.ParamChange { - return []simtypes.ParamChange{} -} - // RegisterStoreDecoder registers a decoder func (am AppModule) RegisterStoreDecoder(_ sdk.StoreDecoderRegistry) {} diff --git a/x/interchaintxs/types/expected_keepers.go b/x/interchaintxs/types/expected_keepers.go index 7bcd82021..654852a7f 100644 --- a/x/interchaintxs/types/expected_keepers.go +++ b/x/interchaintxs/types/expected_keepers.go @@ -4,9 +4,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/auth/types" capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" - icatypes "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/types" - channeltypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" - ibcexported "github.com/cosmos/ibc-go/v4/modules/core/exported" + icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" + channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" + ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" contractmanagertypes "github.com/neutron-org/neutron/x/contractmanager/types" feerefundertypes "github.com/neutron-org/neutron/x/feerefunder/types" @@ -46,11 +46,6 @@ type FeeRefunderKeeper interface { DistributeTimeoutFee(ctx sdk.Context, receiver sdk.AccAddress, packetID feerefundertypes.PacketID) } -type ScopedKeeper interface { - ClaimCapability(ctx sdk.Context, cap *capabilitytypes.Capability, name string) error - GetCapability(ctx sdk.Context, name string) (*capabilitytypes.Capability, bool) -} - // ChannelKeeper defines the expected IBC channel keeper type ChannelKeeper interface { GetChannel(ctx sdk.Context, srcPort, srcChan string) (channel channeltypes.Channel, found bool) diff --git a/x/interchaintxs/types/genesis.pb.go b/x/interchaintxs/types/genesis.pb.go index 6c355be85..dc6f22312 100644 --- a/x/interchaintxs/types/genesis.pb.go +++ b/x/interchaintxs/types/genesis.pb.go @@ -1,12 +1,12 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: interchaintxs/v1/genesis.proto +// source: neutron/interchaintxs/v1/genesis.proto package types import ( fmt "fmt" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" @@ -32,7 +32,7 @@ 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_8a4d50b91f9582a1, []int{0} + return fileDescriptor_d16558b72a810826, []int{0} } func (m *GenesisState) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -72,23 +72,25 @@ func init() { proto.RegisterType((*GenesisState)(nil), "neutron.interchaintxs.GenesisState") } -func init() { proto.RegisterFile("interchaintxs/v1/genesis.proto", fileDescriptor_8a4d50b91f9582a1) } +func init() { + proto.RegisterFile("neutron/interchaintxs/v1/genesis.proto", fileDescriptor_d16558b72a810826) +} -var fileDescriptor_8a4d50b91f9582a1 = []byte{ - // 199 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xcb, 0xcc, 0x2b, 0x49, - 0x2d, 0x4a, 0xce, 0x48, 0xcc, 0xcc, 0x2b, 0xa9, 0x28, 0xd6, 0x2f, 0x33, 0xd4, 0x4f, 0x4f, 0xcd, - 0x4b, 0x2d, 0xce, 0x2c, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0xcd, 0x4b, 0x2d, 0x2d, - 0x29, 0xca, 0xcf, 0xd3, 0x43, 0x51, 0x27, 0x25, 0x92, 0x9e, 0x9f, 0x9e, 0x0f, 0x56, 0xa1, 0x0f, - 0x62, 0x41, 0x14, 0x4b, 0xc9, 0x62, 0x18, 0x56, 0x90, 0x58, 0x94, 0x98, 0x0b, 0x35, 0x4b, 0xc9, - 0x9b, 0x8b, 0xc7, 0x1d, 0x62, 0x78, 0x70, 0x49, 0x62, 0x49, 0xaa, 0x90, 0x35, 0x17, 0x1b, 0x44, - 0x5e, 0x82, 0x51, 0x81, 0x51, 0x83, 0xdb, 0x48, 0x56, 0x0f, 0xab, 0x65, 0x7a, 0x01, 0x60, 0x45, - 0x4e, 0x2c, 0x27, 0xee, 0xc9, 0x33, 0x04, 0x41, 0xb5, 0x38, 0xf9, 0x9d, 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, 0x49, 0x7a, 0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, 0x7e, - 0xae, 0x3e, 0xd4, 0x40, 0xdd, 0xfc, 0xa2, 0x74, 0x18, 0x5b, 0xbf, 0x42, 0x1f, 0xd5, 0x99, 0x25, - 0x95, 0x05, 0xa9, 0xc5, 0x49, 0x6c, 0x60, 0x37, 0x1a, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0xd0, - 0x2f, 0xc7, 0x38, 0x11, 0x01, 0x00, 0x00, +var fileDescriptor_d16558b72a810826 = []byte{ + // 201 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0xcb, 0x4b, 0x2d, 0x2d, + 0x29, 0xca, 0xcf, 0xd3, 0xcf, 0xcc, 0x2b, 0x49, 0x2d, 0x4a, 0xce, 0x48, 0xcc, 0xcc, 0x2b, 0xa9, + 0x28, 0xd6, 0x2f, 0x33, 0xd4, 0x4f, 0x4f, 0xcd, 0x4b, 0x2d, 0xce, 0x2c, 0xd6, 0x2b, 0x28, 0xca, + 0x2f, 0xc9, 0x17, 0x12, 0x85, 0xaa, 0xd3, 0x43, 0x51, 0x27, 0x25, 0x92, 0x9e, 0x9f, 0x9e, 0x0f, + 0x56, 0xa1, 0x0f, 0x62, 0x41, 0x14, 0x4b, 0xa9, 0xe2, 0x34, 0xb4, 0x20, 0xb1, 0x28, 0x31, 0x17, + 0x6a, 0xa6, 0x92, 0x37, 0x17, 0x8f, 0x3b, 0xc4, 0x92, 0xe0, 0x92, 0xc4, 0x92, 0x54, 0x21, 0x6b, + 0x2e, 0x36, 0x88, 0xbc, 0x04, 0xa3, 0x02, 0xa3, 0x06, 0xb7, 0x91, 0xac, 0x1e, 0x56, 0x4b, 0xf5, + 0x02, 0xc0, 0x8a, 0x9c, 0x58, 0x4e, 0xdc, 0x93, 0x67, 0x08, 0x82, 0x6a, 0x71, 0xf2, 0x3b, 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, 0x93, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, + 0xbd, 0xe4, 0xfc, 0x5c, 0x7d, 0xa8, 0x81, 0xba, 0xf9, 0x45, 0xe9, 0x30, 0xb6, 0x7e, 0x05, 0x9a, + 0x33, 0x4b, 0x2a, 0x0b, 0x52, 0x8b, 0x93, 0xd8, 0xc0, 0x6e, 0x34, 0x06, 0x04, 0x00, 0x00, 0xff, + 0xff, 0xa2, 0x39, 0x02, 0x0f, 0x21, 0x01, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/interchaintxs/types/params.pb.go b/x/interchaintxs/types/params.pb.go index 8cf2c89f8..e43702998 100644 --- a/x/interchaintxs/types/params.pb.go +++ b/x/interchaintxs/types/params.pb.go @@ -1,12 +1,12 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: interchaintxs/v1/params.proto +// source: neutron/interchaintxs/v1/params.proto package types import ( fmt "fmt" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" @@ -32,7 +32,7 @@ type Params struct { func (m *Params) Reset() { *m = Params{} } func (*Params) ProtoMessage() {} func (*Params) Descriptor() ([]byte, []int) { - return fileDescriptor_9d5df0577c2bc16b, []int{0} + return fileDescriptor_52b0ced89d3fa9c6, []int{0} } func (m *Params) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -72,24 +72,26 @@ func init() { proto.RegisterType((*Params)(nil), "neutron.interchaintxs.Params") } -func init() { proto.RegisterFile("interchaintxs/v1/params.proto", fileDescriptor_9d5df0577c2bc16b) } +func init() { + proto.RegisterFile("neutron/interchaintxs/v1/params.proto", fileDescriptor_52b0ced89d3fa9c6) +} -var fileDescriptor_9d5df0577c2bc16b = []byte{ - // 209 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xcd, 0xcc, 0x2b, 0x49, - 0x2d, 0x4a, 0xce, 0x48, 0xcc, 0xcc, 0x2b, 0xa9, 0x28, 0xd6, 0x2f, 0x33, 0xd4, 0x2f, 0x48, 0x2c, - 0x4a, 0xcc, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0xcd, 0x4b, 0x2d, 0x2d, 0x29, - 0xca, 0xcf, 0xd3, 0x43, 0x51, 0x26, 0x25, 0x92, 0x9e, 0x9f, 0x9e, 0x0f, 0x56, 0xa1, 0x0f, 0x62, - 0x41, 0x14, 0x2b, 0x79, 0x71, 0xb1, 0x05, 0x80, 0x35, 0x0b, 0x59, 0x71, 0x49, 0xe5, 0x16, 0xa7, - 0xc7, 0x17, 0x97, 0x26, 0xe5, 0x66, 0x96, 0xc4, 0x97, 0x54, 0xc4, 0xe7, 0x26, 0x56, 0xc4, 0xe7, - 0xa6, 0x16, 0x17, 0x27, 0xa6, 0xa7, 0x16, 0x4b, 0x30, 0x2a, 0x30, 0x6a, 0xb0, 0x04, 0x89, 0xe5, - 0x16, 0xa7, 0x07, 0x83, 0x15, 0x84, 0x54, 0xf8, 0x26, 0x56, 0xf8, 0x42, 0x65, 0xad, 0x58, 0x66, - 0x2c, 0x90, 0x67, 0x70, 0xf2, 0x3b, 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, - 0x93, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0x7d, 0xa8, 0xeb, 0x74, 0xf3, - 0x8b, 0xd2, 0x61, 0x6c, 0xfd, 0x0a, 0x7d, 0x54, 0x2f, 0x95, 0x54, 0x16, 0xa4, 0x16, 0x27, 0xb1, - 0x81, 0x9d, 0x68, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x80, 0x0d, 0xa7, 0x86, 0xf0, 0x00, 0x00, - 0x00, +var fileDescriptor_52b0ced89d3fa9c6 = []byte{ + // 211 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, 0xcc, 0x2b, 0x49, 0x2d, 0x4a, 0xce, 0x48, 0xcc, 0xcc, 0x2b, 0xa9, + 0x28, 0xd6, 0x2f, 0x33, 0xd4, 0x2f, 0x48, 0x2c, 0x4a, 0xcc, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, + 0xc9, 0x17, 0x12, 0x85, 0x2a, 0xd3, 0x43, 0x51, 0x26, 0x25, 0x92, 0x9e, 0x9f, 0x9e, 0x0f, 0x56, + 0xa1, 0x0f, 0x62, 0x41, 0x14, 0x2b, 0x79, 0x71, 0xb1, 0x05, 0x80, 0x35, 0x0b, 0x59, 0x71, 0x49, + 0xe5, 0x16, 0xa7, 0xc7, 0x17, 0x97, 0x26, 0xe5, 0x66, 0x96, 0xc4, 0x97, 0x54, 0xc4, 0xe7, 0x26, + 0x56, 0xc4, 0xe7, 0xa6, 0x16, 0x17, 0x27, 0xa6, 0xa7, 0x16, 0x4b, 0x30, 0x2a, 0x30, 0x6a, 0xb0, + 0x04, 0x89, 0xe5, 0x16, 0xa7, 0x07, 0x83, 0x15, 0x84, 0x54, 0xf8, 0x26, 0x56, 0xf8, 0x42, 0x65, + 0xad, 0x58, 0x66, 0x2c, 0x90, 0x67, 0x70, 0xf2, 0x3b, 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, 0x93, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0x7d, 0xa8, + 0xeb, 0x74, 0xf3, 0x8b, 0xd2, 0x61, 0x6c, 0xfd, 0x0a, 0x34, 0x2f, 0x95, 0x54, 0x16, 0xa4, 0x16, + 0x27, 0xb1, 0x81, 0x9d, 0x68, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x61, 0xb1, 0xdd, 0xe6, 0xf8, + 0x00, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { diff --git a/x/interchaintxs/types/query.pb.go b/x/interchaintxs/types/query.pb.go index 624fecc7c..0695f6c26 100644 --- a/x/interchaintxs/types/query.pb.go +++ b/x/interchaintxs/types/query.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: interchaintxs/v1/query.proto +// source: neutron/interchaintxs/v1/query.proto package types @@ -7,9 +7,9 @@ import ( context "context" fmt "fmt" _ "github.com/cosmos/cosmos-sdk/types/query" - _ "github.com/gogo/protobuf/gogoproto" - grpc1 "github.com/gogo/protobuf/grpc" - proto "github.com/gogo/protobuf/proto" + _ "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" @@ -38,7 +38,7 @@ 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_85130b102faab7ea, []int{0} + return fileDescriptor_6130c5f6c54e2428, []int{0} } func (m *QueryParamsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -77,7 +77,7 @@ 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_85130b102faab7ea, []int{1} + return fileDescriptor_6130c5f6c54e2428, []int{1} } func (m *QueryParamsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -129,7 +129,7 @@ func (m *QueryInterchainAccountAddressRequest) Reset() { *m = QueryInter func (m *QueryInterchainAccountAddressRequest) String() string { return proto.CompactTextString(m) } func (*QueryInterchainAccountAddressRequest) ProtoMessage() {} func (*QueryInterchainAccountAddressRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_85130b102faab7ea, []int{2} + return fileDescriptor_6130c5f6c54e2428, []int{2} } func (m *QueryInterchainAccountAddressRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -168,7 +168,7 @@ func (m *QueryInterchainAccountAddressResponse) Reset() { *m = QueryInte func (m *QueryInterchainAccountAddressResponse) String() string { return proto.CompactTextString(m) } func (*QueryInterchainAccountAddressResponse) ProtoMessage() {} func (*QueryInterchainAccountAddressResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_85130b102faab7ea, []int{3} + return fileDescriptor_6130c5f6c54e2428, []int{3} } func (m *QueryInterchainAccountAddressResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -211,37 +211,40 @@ func init() { proto.RegisterType((*QueryInterchainAccountAddressResponse)(nil), "neutron.interchaintxs.QueryInterchainAccountAddressResponse") } -func init() { proto.RegisterFile("interchaintxs/v1/query.proto", fileDescriptor_85130b102faab7ea) } - -var fileDescriptor_85130b102faab7ea = []byte{ - // 432 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x92, 0x31, 0x8f, 0xd3, 0x30, - 0x1c, 0xc5, 0x93, 0x03, 0x2a, 0x30, 0xb0, 0xf8, 0xee, 0xa4, 0x28, 0xba, 0x4b, 0x51, 0x00, 0x09, - 0x4e, 0x22, 0x56, 0x0b, 0x13, 0x77, 0xcb, 0xdd, 0xd6, 0x05, 0x41, 0x46, 0x96, 0xca, 0x49, 0xac, - 0x9c, 0x25, 0xea, 0x7f, 0x6a, 0x3b, 0xa5, 0xdd, 0x19, 0x18, 0xd9, 0x58, 0xfb, 0x09, 0xf8, 0x1c, - 0x1d, 0x3b, 0x32, 0x21, 0xd4, 0x2e, 0x7c, 0x0c, 0x14, 0x3b, 0xa5, 0x0a, 0x6d, 0x29, 0xba, 0x2d, - 0x7a, 0xf9, 0xfd, 0xdf, 0x7b, 0xfe, 0xdb, 0xe8, 0x84, 0x0b, 0xcd, 0x64, 0x7a, 0x4d, 0xb9, 0xd0, - 0x63, 0x45, 0x46, 0x1d, 0x32, 0x2c, 0x99, 0x9c, 0x44, 0x85, 0x04, 0x0d, 0xf8, 0x58, 0xb0, 0x52, - 0x4b, 0x10, 0x51, 0x83, 0xf2, 0x8f, 0x72, 0xc8, 0xc1, 0x10, 0xa4, 0xfa, 0xb2, 0xb0, 0x7f, 0x92, - 0x03, 0xe4, 0x1f, 0x18, 0xa1, 0x05, 0x27, 0x54, 0x08, 0xd0, 0x54, 0x73, 0x10, 0xaa, 0xfe, 0x7b, - 0x96, 0x82, 0x1a, 0x80, 0x22, 0x09, 0x55, 0xcc, 0x66, 0x90, 0x51, 0x27, 0x61, 0x9a, 0x76, 0x48, - 0x41, 0x73, 0x2e, 0x0c, 0x5c, 0xb3, 0xa7, 0x1b, 0xa5, 0x0a, 0x2a, 0xe9, 0xa0, 0xb6, 0x0a, 0x8f, - 0x10, 0x7e, 0x57, 0x19, 0xbc, 0x35, 0x62, 0xcc, 0x86, 0x25, 0x53, 0x3a, 0x8c, 0xd1, 0x61, 0x43, - 0x55, 0x05, 0x08, 0xc5, 0xf0, 0x39, 0x6a, 0xd9, 0x61, 0xcf, 0x7d, 0xe4, 0x3e, 0xbb, 0xdf, 0x3d, - 0x8d, 0xb6, 0x9e, 0x29, 0xb2, 0x63, 0x57, 0xb7, 0x67, 0x3f, 0xda, 0x4e, 0x5c, 0x8f, 0x84, 0xdf, - 0x5c, 0xf4, 0xc4, 0x98, 0xf6, 0xfe, 0xb0, 0x97, 0x69, 0x0a, 0xa5, 0xd0, 0x97, 0x59, 0x26, 0x99, - 0x5a, 0x85, 0xe3, 0xc7, 0xe8, 0x21, 0x7c, 0x14, 0x4c, 0xf6, 0xa9, 0xd5, 0x4d, 0xd8, 0xbd, 0xf8, - 0x81, 0x11, 0x6b, 0x16, 0x77, 0xd1, 0xf1, 0x3a, 0xb3, 0x4f, 0xad, 0x51, 0x9f, 0x67, 0xde, 0x81, - 0x81, 0x0f, 0xf9, 0xdf, 0x21, 0xbd, 0xac, 0x32, 0x4e, 0x41, 0x08, 0x96, 0x56, 0xeb, 0xa9, 0xd8, - 0x5b, 0xd6, 0x78, 0x2d, 0xf6, 0xb2, 0xd7, 0x77, 0x3f, 0x4f, 0xdb, 0xce, 0xaf, 0x69, 0xdb, 0x09, - 0x19, 0x7a, 0xba, 0xa7, 0x6f, 0xbd, 0x96, 0x0b, 0xe4, 0x6f, 0xe9, 0xd2, 0x6c, 0xef, 0xf1, 0x1d, - 0x2e, 0xdd, 0x4f, 0x07, 0xe8, 0x8e, 0xc9, 0xc1, 0x14, 0xb5, 0xec, 0xe6, 0xf0, 0xf3, 0x1d, 0x8b, - 0xdd, 0xbc, 0x2a, 0xff, 0xec, 0x7f, 0x50, 0x5b, 0x34, 0x74, 0xf0, 0x57, 0x17, 0x79, 0xbb, 0xce, - 0x83, 0xcf, 0xff, 0x65, 0xb5, 0xe7, 0xd6, 0xfc, 0x8b, 0x9b, 0x0d, 0xaf, 0x9a, 0x5d, 0xbd, 0x99, - 0x2d, 0x02, 0x77, 0xbe, 0x08, 0xdc, 0x9f, 0x8b, 0xc0, 0xfd, 0xb2, 0x0c, 0x9c, 0xf9, 0x32, 0x70, - 0xbe, 0x2f, 0x03, 0xe7, 0xfd, 0xab, 0x9c, 0xeb, 0xeb, 0x32, 0x89, 0x52, 0x18, 0x90, 0x3a, 0xe3, - 0x05, 0xc8, 0x7c, 0xf5, 0x4d, 0xc6, 0xa4, 0xf9, 0xc4, 0xf5, 0xa4, 0x60, 0x2a, 0x69, 0x99, 0xf7, - 0xfd, 0xf2, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0x20, 0xbf, 0xa3, 0xcd, 0x95, 0x03, 0x00, 0x00, +func init() { + proto.RegisterFile("neutron/interchaintxs/v1/query.proto", fileDescriptor_6130c5f6c54e2428) +} + +var fileDescriptor_6130c5f6c54e2428 = []byte{ + // 434 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x92, 0x31, 0x6f, 0xd3, 0x40, + 0x1c, 0xc5, 0xed, 0x02, 0x11, 0x1c, 0xb0, 0x5c, 0x5b, 0xc9, 0xb2, 0xc0, 0x41, 0xa6, 0x95, 0xa0, + 0x12, 0x3e, 0x25, 0x30, 0xd1, 0x2e, 0xed, 0x96, 0x05, 0x81, 0x47, 0x96, 0xe8, 0x6c, 0x9f, 0xdc, + 0x93, 0xc8, 0xfd, 0xdd, 0xbb, 0x73, 0x69, 0x77, 0x06, 0x46, 0x36, 0xd6, 0x7c, 0x02, 0x3e, 0x47, + 0xc6, 0x8c, 0x4c, 0x08, 0x25, 0x0b, 0x1f, 0x03, 0xf9, 0xee, 0x42, 0x94, 0x10, 0x13, 0xd4, 0xcd, + 0x7a, 0xfe, 0xfd, 0xdf, 0x7b, 0xf7, 0xbf, 0x43, 0x07, 0x82, 0xd5, 0x5a, 0x82, 0x20, 0x5c, 0x68, + 0x26, 0xf3, 0x73, 0xca, 0x85, 0xbe, 0x52, 0xe4, 0xb2, 0x47, 0x2e, 0x6a, 0x26, 0xaf, 0x93, 0x4a, + 0x82, 0x06, 0xbc, 0xef, 0xa8, 0x64, 0x85, 0x0a, 0xf7, 0x4a, 0x28, 0xc1, 0x10, 0xa4, 0xf9, 0xb2, + 0x70, 0xf8, 0xa8, 0x04, 0x28, 0x3f, 0x30, 0x42, 0x2b, 0x4e, 0xa8, 0x10, 0xa0, 0xa9, 0xe6, 0x20, + 0x94, 0xfb, 0x7b, 0x94, 0x83, 0x1a, 0x81, 0x22, 0x19, 0x55, 0xcc, 0x66, 0x90, 0xcb, 0x5e, 0xc6, + 0x34, 0xed, 0x91, 0x8a, 0x96, 0x5c, 0x18, 0xd8, 0xb1, 0x87, 0xad, 0xe5, 0x2a, 0x2a, 0xe9, 0xc8, + 0x59, 0xc6, 0x7b, 0x08, 0xbf, 0x6b, 0x8c, 0xde, 0x1a, 0x31, 0x65, 0x17, 0x35, 0x53, 0x3a, 0x4e, + 0xd1, 0xee, 0x8a, 0xaa, 0x2a, 0x10, 0x8a, 0xe1, 0x63, 0xd4, 0xb1, 0xc3, 0x81, 0xff, 0xc4, 0x7f, + 0x76, 0xbf, 0xff, 0x38, 0xd9, 0x78, 0xb6, 0xc4, 0x8e, 0x9d, 0xdd, 0x9e, 0xfc, 0xe8, 0x7a, 0xa9, + 0x1b, 0x89, 0xbf, 0xf9, 0xe8, 0xc0, 0x98, 0x0e, 0xfe, 0xb0, 0xa7, 0x79, 0x0e, 0xb5, 0xd0, 0xa7, + 0x45, 0x21, 0x99, 0x5a, 0x84, 0xe3, 0xa7, 0xe8, 0x21, 0x7c, 0x14, 0x4c, 0x0e, 0xa9, 0xd5, 0x4d, + 0xd8, 0xbd, 0xf4, 0x81, 0x11, 0x1d, 0x8b, 0xfb, 0x68, 0x7f, 0x99, 0x39, 0xa4, 0xd6, 0x68, 0xc8, + 0x8b, 0x60, 0xc7, 0xc0, 0xbb, 0x7c, 0x3d, 0x64, 0x50, 0x34, 0xc6, 0x39, 0x08, 0xc1, 0xf2, 0x66, + 0x4d, 0x0d, 0x7b, 0xcb, 0x1a, 0x2f, 0xc5, 0x41, 0xf1, 0xfa, 0xee, 0xe7, 0x71, 0xd7, 0xfb, 0x35, + 0xee, 0x7a, 0x31, 0x43, 0x87, 0x5b, 0xfa, 0xba, 0xb5, 0x9c, 0xa0, 0x70, 0x43, 0x97, 0xd5, 0xf6, + 0x01, 0x6f, 0x71, 0xe9, 0x7f, 0xda, 0x41, 0x77, 0x4c, 0x0e, 0xa6, 0xa8, 0x63, 0x37, 0x87, 0x9f, + 0xb7, 0x2c, 0xf6, 0xef, 0xab, 0x0a, 0x8f, 0xfe, 0x07, 0xb5, 0x45, 0x63, 0x0f, 0x7f, 0xf5, 0x51, + 0xd0, 0x76, 0x1e, 0x7c, 0xfc, 0x2f, 0xab, 0x2d, 0xb7, 0x16, 0x9e, 0xdc, 0x6c, 0x78, 0xd1, 0xec, + 0xec, 0xcd, 0x64, 0x16, 0xf9, 0xd3, 0x59, 0xe4, 0xff, 0x9c, 0x45, 0xfe, 0x97, 0x79, 0xe4, 0x4d, + 0xe7, 0x91, 0xf7, 0x7d, 0x1e, 0x79, 0xef, 0x5f, 0x95, 0x5c, 0x9f, 0xd7, 0x59, 0x92, 0xc3, 0x88, + 0xb8, 0x8c, 0x17, 0x20, 0xcb, 0xc5, 0x37, 0xb9, 0x5a, 0x7b, 0xe2, 0xfa, 0xba, 0x62, 0x2a, 0xeb, + 0x98, 0xf7, 0xfd, 0xf2, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0x4b, 0x28, 0xcd, 0x3d, 0xa5, 0x03, + 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -359,7 +362,7 @@ var _Query_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "interchaintxs/v1/query.proto", + Metadata: "neutron/interchaintxs/v1/query.proto", } func (m *QueryParamsRequest) Marshal() (dAtA []byte, err error) { diff --git a/x/interchaintxs/types/tx.pb.go b/x/interchaintxs/types/tx.pb.go index 6fc83d648..41bf28b30 100644 --- a/x/interchaintxs/types/tx.pb.go +++ b/x/interchaintxs/types/tx.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: interchaintxs/v1/tx.proto +// source: neutron/interchaintxs/v1/tx.proto package types @@ -8,9 +8,9 @@ import ( fmt "fmt" _ "github.com/cosmos/cosmos-proto" types "github.com/cosmos/cosmos-sdk/codec/types" - _ "github.com/gogo/protobuf/gogoproto" - grpc1 "github.com/gogo/protobuf/grpc" - proto "github.com/gogo/protobuf/proto" + _ "github.com/cosmos/gogoproto/gogoproto" + grpc1 "github.com/cosmos/gogoproto/grpc" + proto "github.com/cosmos/gogoproto/proto" types1 "github.com/neutron-org/neutron/x/feerefunder/types" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" @@ -43,7 +43,7 @@ func (m *MsgRegisterInterchainAccount) Reset() { *m = MsgRegisterInterch func (m *MsgRegisterInterchainAccount) String() string { return proto.CompactTextString(m) } func (*MsgRegisterInterchainAccount) ProtoMessage() {} func (*MsgRegisterInterchainAccount) Descriptor() ([]byte, []int) { - return fileDescriptor_ecd987b66c8800e1, []int{0} + return fileDescriptor_50f087790e59c806, []int{0} } func (m *MsgRegisterInterchainAccount) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -81,7 +81,7 @@ func (m *MsgRegisterInterchainAccountResponse) Reset() { *m = MsgRegiste func (m *MsgRegisterInterchainAccountResponse) String() string { return proto.CompactTextString(m) } func (*MsgRegisterInterchainAccountResponse) ProtoMessage() {} func (*MsgRegisterInterchainAccountResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_ecd987b66c8800e1, []int{1} + return fileDescriptor_50f087790e59c806, []int{1} } func (m *MsgRegisterInterchainAccountResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -130,7 +130,7 @@ func (m *MsgSubmitTx) Reset() { *m = MsgSubmitTx{} } func (m *MsgSubmitTx) String() string { return proto.CompactTextString(m) } func (*MsgSubmitTx) ProtoMessage() {} func (*MsgSubmitTx) Descriptor() ([]byte, []int) { - return fileDescriptor_ecd987b66c8800e1, []int{2} + return fileDescriptor_50f087790e59c806, []int{2} } func (m *MsgSubmitTx) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -171,7 +171,7 @@ func (m *MsgSubmitTxResponse) Reset() { *m = MsgSubmitTxResponse{} } func (m *MsgSubmitTxResponse) String() string { return proto.CompactTextString(m) } func (*MsgSubmitTxResponse) ProtoMessage() {} func (*MsgSubmitTxResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_ecd987b66c8800e1, []int{3} + return fileDescriptor_50f087790e59c806, []int{3} } func (m *MsgSubmitTxResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -221,46 +221,46 @@ func init() { proto.RegisterType((*MsgSubmitTxResponse)(nil), "neutron.interchaintxs.v1.MsgSubmitTxResponse") } -func init() { proto.RegisterFile("interchaintxs/v1/tx.proto", fileDescriptor_ecd987b66c8800e1) } +func init() { proto.RegisterFile("neutron/interchaintxs/v1/tx.proto", fileDescriptor_50f087790e59c806) } -var fileDescriptor_ecd987b66c8800e1 = []byte{ - // 572 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0xbd, 0x6e, 0xdb, 0x3c, - 0x14, 0x95, 0x62, 0x7f, 0x49, 0x3e, 0x3a, 0x5d, 0x98, 0x04, 0x90, 0x0d, 0x43, 0x72, 0xd5, 0x1f, - 0x78, 0x09, 0xd5, 0xb8, 0x45, 0x87, 0x00, 0x2d, 0x60, 0x0f, 0x05, 0x3c, 0xb8, 0x28, 0xd4, 0x4c, - 0x5d, 0x0c, 0x59, 0xba, 0xa2, 0x05, 0x58, 0xa4, 0x2b, 0x52, 0x81, 0x3d, 0x76, 0xeb, 0xd8, 0xa5, - 0x63, 0x81, 0x3c, 0x4e, 0xc6, 0x8c, 0x9d, 0x8c, 0xc0, 0x5e, 0x3a, 0xe7, 0x09, 0x0a, 0x49, 0x96, - 0xff, 0x10, 0x1b, 0x41, 0x37, 0xde, 0xc3, 0xc3, 0xc3, 0x7b, 0x0f, 0x8f, 0x84, 0xca, 0x01, 0x93, - 0x10, 0xb9, 0x7d, 0x27, 0x60, 0x72, 0x24, 0xac, 0xab, 0x73, 0x4b, 0x8e, 0xc8, 0x30, 0xe2, 0x92, - 0x63, 0x8d, 0x41, 0x2c, 0x23, 0xce, 0xc8, 0x1a, 0x85, 0x5c, 0x9d, 0x57, 0xca, 0x2e, 0x17, 0x21, - 0x17, 0xdd, 0x94, 0x67, 0x65, 0x45, 0x76, 0xa8, 0x72, 0x42, 0x39, 0xe5, 0x19, 0x9e, 0xac, 0xe6, - 0xe8, 0x29, 0xe5, 0x9c, 0x0e, 0xc0, 0x72, 0x86, 0x81, 0xd5, 0x97, 0x72, 0x38, 0x87, 0xab, 0x2b, - 0xb0, 0xc3, 0x18, 0x97, 0x8e, 0x0c, 0x38, 0xcb, 0xa5, 0xca, 0xf3, 0xdd, 0xb4, 0xea, 0xc5, 0xbe, - 0xe5, 0xb0, 0x71, 0xae, 0xe7, 0x03, 0x44, 0xe0, 0xc7, 0xcc, 0x83, 0xc8, 0xf2, 0x01, 0x32, 0xd8, - 0xbc, 0x53, 0x51, 0xb5, 0x23, 0xa8, 0x0d, 0x34, 0x10, 0x12, 0xa2, 0xf6, 0xa2, 0xef, 0xa6, 0xeb, - 0xf2, 0x98, 0x49, 0xfc, 0x14, 0x1d, 0xf9, 0x11, 0x0f, 0xbb, 0x8e, 0xe7, 0x45, 0x20, 0x84, 0xa6, - 0xd6, 0xd4, 0xfa, 0xff, 0x76, 0x29, 0xc1, 0x9a, 0x19, 0x84, 0xdf, 0xa1, 0x27, 0x2e, 0x67, 0x0c, - 0xdc, 0xa4, 0x95, 0x6e, 0xe0, 0x69, 0x7b, 0x09, 0xa7, 0xa5, 0xdd, 0x4f, 0x8c, 0x93, 0xb1, 0x13, - 0x0e, 0x2e, 0xcc, 0xb5, 0x6d, 0xd3, 0x3e, 0x5a, 0xd6, 0x6d, 0x0f, 0x5f, 0xa2, 0xd3, 0xa5, 0x5d, - 0x5d, 0x27, 0xbb, 0x37, 0x91, 0x29, 0xa4, 0x32, 0xb5, 0xfb, 0x89, 0x51, 0xcd, 0x64, 0x1e, 0xa4, - 0x99, 0xf6, 0x71, 0xb0, 0xd9, 0x75, 0xdb, 0xbb, 0x38, 0xfc, 0x7e, 0x6d, 0x28, 0x7f, 0xae, 0x0d, - 0xc5, 0x7c, 0x89, 0x9e, 0xef, 0x9a, 0xd0, 0x06, 0x31, 0xe4, 0x4c, 0x80, 0xf9, 0x6b, 0x0f, 0x95, - 0x3a, 0x82, 0x7e, 0x8e, 0x7b, 0x61, 0x20, 0x2f, 0x47, 0x8f, 0x99, 0xbc, 0xb1, 0xad, 0xf5, 0xd4, - 0x81, 0x07, 0x1b, 0xc3, 0xcf, 0x36, 0xdd, 0x4a, 0xc7, 0xdc, 0xf0, 0xa4, 0x8e, 0x8a, 0xa1, 0xa0, - 0x42, 0x2b, 0xd6, 0x0a, 0xf5, 0x52, 0xe3, 0x84, 0x64, 0xef, 0x4a, 0xf2, 0x77, 0x25, 0x4d, 0x36, - 0xb6, 0x53, 0x06, 0xc6, 0xa8, 0x18, 0x42, 0xc8, 0xb5, 0xff, 0x52, 0x95, 0x74, 0x8d, 0x35, 0x74, - 0x20, 0x83, 0x10, 0x78, 0x2c, 0xb5, 0xfd, 0x9a, 0x5a, 0x2f, 0xda, 0x79, 0x89, 0x5f, 0xa1, 0x82, - 0x0f, 0xa0, 0x1d, 0xd4, 0xd4, 0x7a, 0xa9, 0xa1, 0x91, 0x3c, 0xae, 0x2b, 0xd9, 0x20, 0x1f, 0x00, - 0x5a, 0xc5, 0x9b, 0x89, 0xa1, 0xd8, 0x09, 0x75, 0xc5, 0xc7, 0x4f, 0xe8, 0x78, 0xc5, 0x9e, 0xdc, - 0x36, 0x6c, 0xa0, 0x92, 0x80, 0xaf, 0x31, 0x30, 0x17, 0x92, 0x69, 0xd4, 0xf4, 0x42, 0x94, 0x43, - 0x6d, 0x2f, 0xe9, 0xc6, 0xed, 0x3b, 0x8c, 0xc1, 0x60, 0x6e, 0x4b, 0x5e, 0x36, 0xbe, 0xed, 0xa1, - 0x42, 0x47, 0x50, 0xfc, 0x53, 0x45, 0xe5, 0xed, 0x09, 0x7c, 0x4b, 0xb6, 0x7d, 0x55, 0x64, 0xd7, - 0xbb, 0x56, 0xde, 0xff, 0xdb, 0xb9, 0x45, 0x1e, 0x14, 0xdc, 0x43, 0x87, 0x8b, 0x34, 0xbc, 0xd8, - 0xa9, 0x96, 0xd3, 0x2a, 0x67, 0x8f, 0xa2, 0x2d, 0xef, 0x68, 0x7d, 0xbc, 0x99, 0xea, 0xea, 0xed, - 0x54, 0x57, 0xef, 0xa6, 0xba, 0xfa, 0x63, 0xa6, 0x2b, 0xb7, 0x33, 0x5d, 0xf9, 0x3d, 0xd3, 0x95, - 0x2f, 0x6f, 0x68, 0x20, 0xfb, 0x71, 0x8f, 0xb8, 0x3c, 0xb4, 0xe6, 0xa2, 0x67, 0x3c, 0xa2, 0xf9, - 0xda, 0x1a, 0x59, 0xeb, 0x3f, 0x22, 0x39, 0x1e, 0x82, 0xe8, 0xed, 0xa7, 0x19, 0x79, 0xfd, 0x37, - 0x00, 0x00, 0xff, 0xff, 0x2f, 0xf6, 0x21, 0x72, 0xa6, 0x04, 0x00, 0x00, +var fileDescriptor_50f087790e59c806 = []byte{ + // 576 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0xbd, 0x6f, 0xda, 0x4e, + 0x18, 0xb6, 0x03, 0xbf, 0x24, 0xbf, 0x23, 0x5d, 0x2e, 0x89, 0x64, 0x10, 0xb5, 0x89, 0xfb, 0x21, + 0x96, 0x9c, 0x1b, 0x5a, 0x75, 0x88, 0xd4, 0x4a, 0x30, 0x54, 0x62, 0xa0, 0xaa, 0xdc, 0x4c, 0x5d, + 0x90, 0xb1, 0x5f, 0x0e, 0x4b, 0xf8, 0x8e, 0xfa, 0xce, 0x11, 0x8c, 0xdd, 0x3a, 0x76, 0xe9, 0x58, + 0x29, 0x7f, 0x4e, 0xc6, 0x8c, 0x9d, 0x50, 0x04, 0x4b, 0xe7, 0xfc, 0x05, 0x95, 0xbf, 0x80, 0xa0, + 0x80, 0xa2, 0x6e, 0xef, 0xc7, 0x73, 0xcf, 0x3d, 0xef, 0x73, 0xaf, 0x8d, 0x4e, 0x18, 0x44, 0x32, + 0xe4, 0xcc, 0xf2, 0x99, 0x84, 0xd0, 0x1d, 0x38, 0x3e, 0x93, 0x63, 0x61, 0x5d, 0x9e, 0x59, 0x72, + 0x4c, 0x46, 0x21, 0x97, 0x1c, 0x6b, 0x19, 0x84, 0xdc, 0x83, 0x90, 0xcb, 0xb3, 0x4a, 0xd9, 0xe5, + 0x22, 0xe0, 0xa2, 0x9b, 0xe0, 0xac, 0x34, 0x49, 0x0f, 0x55, 0x8e, 0x28, 0xa7, 0x3c, 0xad, 0xc7, + 0x51, 0x56, 0x3d, 0xa6, 0x9c, 0xd3, 0x21, 0x58, 0xce, 0xc8, 0xb7, 0x06, 0x52, 0x8e, 0xb2, 0x72, + 0x75, 0xa5, 0xec, 0x30, 0xc6, 0xa5, 0x23, 0x7d, 0xce, 0x72, 0xaa, 0x72, 0xd6, 0x4d, 0xb2, 0x5e, + 0xd4, 0xb7, 0x1c, 0x36, 0xc9, 0x5a, 0x4f, 0x73, 0xf5, 0x7d, 0x80, 0x10, 0xfa, 0x11, 0xf3, 0x20, + 0x8c, 0xe3, 0xb4, 0x6d, 0xde, 0xaa, 0xa8, 0xda, 0x11, 0xd4, 0x06, 0xea, 0x0b, 0x09, 0x61, 0x7b, + 0xa1, 0xbf, 0xe9, 0xba, 0x3c, 0x62, 0x12, 0x9f, 0xa0, 0x83, 0x7e, 0xc8, 0x83, 0xae, 0xe3, 0x79, + 0x21, 0x08, 0xa1, 0xa9, 0x35, 0xb5, 0xfe, 0xbf, 0x5d, 0x8a, 0x6b, 0xcd, 0xb4, 0x84, 0xdf, 0xa1, + 0x27, 0x2e, 0x67, 0x0c, 0xdc, 0x58, 0x52, 0xd7, 0xf7, 0xb4, 0x9d, 0x18, 0xd3, 0xd2, 0xee, 0xa6, + 0xc6, 0xd1, 0xc4, 0x09, 0x86, 0xe7, 0xe6, 0xbd, 0xb6, 0x69, 0x1f, 0x2c, 0xf3, 0xb6, 0x87, 0x2f, + 0xd0, 0xf1, 0xd2, 0xb6, 0xae, 0x93, 0xde, 0x1b, 0xd3, 0x14, 0x12, 0x9a, 0xda, 0xdd, 0xd4, 0xa8, + 0xa6, 0x34, 0x0f, 0xc2, 0x4c, 0xfb, 0xd0, 0x5f, 0x57, 0xdd, 0xf6, 0xce, 0xf7, 0xbf, 0x5f, 0x19, + 0xca, 0x9f, 0x2b, 0x43, 0x31, 0x5f, 0xa2, 0xe7, 0xdb, 0x26, 0xb4, 0x41, 0x8c, 0x38, 0x13, 0x60, + 0xfe, 0xda, 0x41, 0xa5, 0x8e, 0xa0, 0x9f, 0xa3, 0x5e, 0xe0, 0xcb, 0x8b, 0xf1, 0x63, 0x26, 0x6f, + 0x6c, 0x92, 0x9e, 0x38, 0xf0, 0xa0, 0x30, 0xfc, 0x6c, 0xdd, 0xad, 0x64, 0xcc, 0x35, 0x4f, 0xea, + 0xa8, 0x18, 0x08, 0x2a, 0xb4, 0x62, 0xad, 0x50, 0x2f, 0x35, 0x8e, 0x48, 0xfa, 0xbe, 0x24, 0x7f, + 0x5f, 0xd2, 0x64, 0x13, 0x3b, 0x41, 0x60, 0x8c, 0x8a, 0x01, 0x04, 0x5c, 0xfb, 0x2f, 0x61, 0x49, + 0x62, 0xac, 0xa1, 0x3d, 0xe9, 0x07, 0xc0, 0x23, 0xa9, 0xed, 0xd6, 0xd4, 0x7a, 0xd1, 0xce, 0x53, + 0xfc, 0x0a, 0x15, 0xfa, 0x00, 0xda, 0x5e, 0x4d, 0xad, 0x97, 0x1a, 0x1a, 0xc9, 0xd7, 0x76, 0x65, + 0x37, 0xc8, 0x07, 0x80, 0x56, 0xf1, 0x7a, 0x6a, 0x28, 0x76, 0x0c, 0x5d, 0xf1, 0xf1, 0x13, 0x3a, + 0x5c, 0xb1, 0x27, 0xb7, 0x0d, 0x1b, 0xa8, 0x24, 0xe0, 0x6b, 0x04, 0xcc, 0x85, 0x78, 0x1a, 0x35, + 0xb9, 0x10, 0xe5, 0xa5, 0xb6, 0x17, 0xab, 0x71, 0x07, 0x0e, 0x63, 0x30, 0xcc, 0x6c, 0xc9, 0xd3, + 0xc6, 0xb7, 0x1d, 0x54, 0xe8, 0x08, 0x8a, 0x7f, 0xaa, 0xa8, 0xbc, 0x79, 0x03, 0xdf, 0x92, 0x4d, + 0x5f, 0x17, 0xd9, 0xf6, 0xae, 0x95, 0xf7, 0xff, 0x76, 0x6e, 0xb1, 0x0f, 0x0a, 0xee, 0xa1, 0xfd, + 0xc5, 0x36, 0xbc, 0xd8, 0xca, 0x96, 0xc3, 0x2a, 0xa7, 0x8f, 0x82, 0x2d, 0xef, 0x68, 0x7d, 0xbc, + 0x9e, 0xe9, 0xea, 0xcd, 0x4c, 0x57, 0x6f, 0x67, 0xba, 0xfa, 0x63, 0xae, 0x2b, 0x37, 0x73, 0x5d, + 0xf9, 0x3d, 0xd7, 0x95, 0x2f, 0x6f, 0xa8, 0x2f, 0x07, 0x51, 0x8f, 0xb8, 0x3c, 0xb0, 0x32, 0xd2, + 0x53, 0x1e, 0xd2, 0x3c, 0xb6, 0xc6, 0x6b, 0x3f, 0x24, 0x39, 0x19, 0x81, 0xe8, 0xed, 0x26, 0x3b, + 0xf2, 0xfa, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x30, 0x09, 0xc8, 0x02, 0xb6, 0x04, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -376,7 +376,7 @@ var _Msg_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "interchaintxs/v1/tx.proto", + Metadata: "neutron/interchaintxs/v1/tx.proto", } func (m *MsgRegisterInterchainAccount) Marshal() (dAtA []byte, err error) { diff --git a/x/interchaintxs/types/types.go b/x/interchaintxs/types/types.go index 4289764cb..789663d42 100644 --- a/x/interchaintxs/types/types.go +++ b/x/interchaintxs/types/types.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - icatypes "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/types" + icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" ) const Delimiter = "." @@ -33,7 +33,7 @@ func NewICAOwnerFromAddress(address sdk.AccAddress, interchainAccountID string) } func ICAOwnerFromPort(port string) (ICAOwner, error) { - splitOwner := strings.SplitN(strings.TrimPrefix(port, icatypes.PortPrefix), Delimiter, 2) + splitOwner := strings.SplitN(strings.TrimPrefix(port, icatypes.ControllerPortPrefix), Delimiter, 2) if len(splitOwner) < 2 { return ICAOwner{}, sdkerrors.Wrap(ErrInvalidICAOwner, "invalid ICA interchainAccountID format") } diff --git a/x/tokenfactory/client/cli/tx.go b/x/tokenfactory/client/cli/tx.go index 0d19b52e3..357e089a4 100644 --- a/x/tokenfactory/client/cli/tx.go +++ b/x/tokenfactory/client/cli/tx.go @@ -47,14 +47,17 @@ func NewCreateDenomCmd() *cobra.Command { return err } - txf := tx.NewFactoryCLI(clientCtx, cmd.Flags()).WithTxConfig(clientCtx.TxConfig).WithAccountRetriever(clientCtx.AccountRetriever) + txf, err := tx.NewFactoryCLI(clientCtx, cmd.Flags()) + if err != nil { + return err + } msg := types.NewMsgCreateDenom( clientCtx.GetFromAddress().String(), args[0], ) - return tx.GenerateOrBroadcastTxWithFactory(clientCtx, txf, msg) + return tx.GenerateOrBroadcastTxWithFactory(clientCtx, txf.WithTxConfig(clientCtx.TxConfig).WithAccountRetriever(clientCtx.AccountRetriever), msg) }, } @@ -74,7 +77,10 @@ func NewMintCmd() *cobra.Command { return err } - txf := tx.NewFactoryCLI(clientCtx, cmd.Flags()).WithTxConfig(clientCtx.TxConfig).WithAccountRetriever(clientCtx.AccountRetriever) + txf, err := tx.NewFactoryCLI(clientCtx, cmd.Flags()) + if err != nil { + return err + } amount, err := sdk.ParseCoinNormalized(args[0]) if err != nil { @@ -86,7 +92,7 @@ func NewMintCmd() *cobra.Command { amount, ) - return tx.GenerateOrBroadcastTxWithFactory(clientCtx, txf, msg) + return tx.GenerateOrBroadcastTxWithFactory(clientCtx, txf.WithTxConfig(clientCtx.TxConfig).WithAccountRetriever(clientCtx.AccountRetriever), msg) }, } @@ -106,7 +112,10 @@ func NewBurnCmd() *cobra.Command { return err } - txf := tx.NewFactoryCLI(clientCtx, cmd.Flags()).WithTxConfig(clientCtx.TxConfig).WithAccountRetriever(clientCtx.AccountRetriever) + txf, err := tx.NewFactoryCLI(clientCtx, cmd.Flags()) + if err != nil { + return err + } amount, err := sdk.ParseCoinNormalized(args[0]) if err != nil { @@ -118,7 +127,7 @@ func NewBurnCmd() *cobra.Command { amount, ) - return tx.GenerateOrBroadcastTxWithFactory(clientCtx, txf, msg) + return tx.GenerateOrBroadcastTxWithFactory(clientCtx, txf.WithTxConfig(clientCtx.TxConfig).WithAccountRetriever(clientCtx.AccountRetriever), msg) }, } @@ -172,7 +181,10 @@ func NewChangeAdminCmd() *cobra.Command { return err } - txf := tx.NewFactoryCLI(clientCtx, cmd.Flags()).WithTxConfig(clientCtx.TxConfig).WithAccountRetriever(clientCtx.AccountRetriever) + txf, err := tx.NewFactoryCLI(clientCtx, cmd.Flags()) + if err != nil { + return err + } msg := types.NewMsgChangeAdmin( clientCtx.GetFromAddress().String(), @@ -180,7 +192,7 @@ func NewChangeAdminCmd() *cobra.Command { args[1], ) - return tx.GenerateOrBroadcastTxWithFactory(clientCtx, txf, msg) + return tx.GenerateOrBroadcastTxWithFactory(clientCtx, txf.WithTxConfig(clientCtx.TxConfig).WithAccountRetriever(clientCtx.AccountRetriever), msg) }, } diff --git a/x/tokenfactory/keeper/genesis_test.go b/x/tokenfactory/keeper/genesis_test.go index 93794be30..707214167 100644 --- a/x/tokenfactory/keeper/genesis_test.go +++ b/x/tokenfactory/keeper/genesis_test.go @@ -1,8 +1,8 @@ package keeper_test import ( + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/neutron-org/neutron/x/tokenfactory/types" ) diff --git a/x/tokenfactory/keeper/keeper.go b/x/tokenfactory/keeper/keeper.go index 949fd633e..0b391112f 100644 --- a/x/tokenfactory/keeper/keeper.go +++ b/x/tokenfactory/keeper/keeper.go @@ -2,8 +2,9 @@ package keeper import ( "fmt" + storetypes "github.com/cosmos/cosmos-sdk/store/types" - "github.com/tendermint/tendermint/libs/log" + "github.com/cometbft/cometbft/libs/log" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/store/prefix" @@ -18,7 +19,7 @@ import ( type ( Keeper struct { cdc codec.Codec - storeKey sdk.StoreKey + storeKey storetypes.StoreKey paramSpace paramtypes.Subspace @@ -30,7 +31,7 @@ type ( // NewKeeper returns a new instance of the x/tokenfactory keeper func NewKeeper( cdc codec.Codec, - storeKey sdk.StoreKey, + storeKey storetypes.StoreKey, paramSpace paramtypes.Subspace, accountKeeper types.AccountKeeper, bankKeeper types.BankKeeper, diff --git a/x/tokenfactory/keeper/keeper_test.go b/x/tokenfactory/keeper/keeper_test.go index d09828399..ba3ca75e9 100644 --- a/x/tokenfactory/keeper/keeper_test.go +++ b/x/tokenfactory/keeper/keeper_test.go @@ -3,10 +3,10 @@ package keeper_test import ( "testing" + "github.com/cometbft/cometbft/crypto/ed25519" "github.com/cosmos/cosmos-sdk/baseapp" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" "github.com/stretchr/testify/suite" - "github.com/tendermint/tendermint/crypto/ed25519" sdktypes "github.com/cosmos/cosmos-sdk/types" "github.com/neutron-org/neutron/app/params" diff --git a/x/tokenfactory/module.go b/x/tokenfactory/module.go index 80c70e132..dec552765 100644 --- a/x/tokenfactory/module.go +++ b/x/tokenfactory/module.go @@ -2,6 +2,7 @@ package tokenfactory import ( "context" + "cosmossdk.io/core/appmodule" "encoding/json" "fmt" @@ -9,7 +10,7 @@ import ( "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" - abci "github.com/tendermint/tendermint/abci/types" + abci "github.com/cometbft/cometbft/abci/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" @@ -91,6 +92,8 @@ func (AppModuleBasic) GetQueryCmd() *cobra.Command { // AppModule // ---------------------------------------------------------------------------- +var _ appmodule.AppModule = AppModule{} + // AppModule implements the AppModule interface for the capability module. type AppModule struct { AppModuleBasic @@ -110,24 +113,22 @@ func NewAppModule(cdc codec.Codec, keeper keeper.Keeper, accountKeeper types.Acc } } +// IsOnePerModuleType implements the depinject.OnePerModuleType interface. +func (am AppModule) IsOnePerModuleType() { // marker +} + +// IsAppModule implements the appmodule.AppModule interface. +func (am AppModule) IsAppModule() { // marker +} + // Name returns the capability module's name. func (am AppModule) Name() string { return am.AppModuleBasic.Name() } -// Route returns the capability module's message routing key. -func (am AppModule) Route() sdk.Route { - return sdk.Route{} -} - // QuerierRoute returns the capability module's query routing key. func (AppModule) QuerierRoute() string { return types.QuerierRoute } -// LegacyQuerierHandler returns the capability module's Querier. -func (am AppModule) LegacyQuerierHandler(_ *codec.LegacyAmino) sdk.Querier { - return nil -} - // RegisterServices registers a GRPC query service to respond to the // module-specific GRPC queries. func (am AppModule) RegisterServices(cfg module.Configurator) { diff --git a/x/tokenfactory/types/authorityMetadata.pb.go b/x/tokenfactory/types/authorityMetadata.pb.go index e32f8e654..5f0c39198 100644 --- a/x/tokenfactory/types/authorityMetadata.pb.go +++ b/x/tokenfactory/types/authorityMetadata.pb.go @@ -6,8 +6,8 @@ package types import ( fmt "fmt" _ "github.com/cosmos/cosmos-sdk/types" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" diff --git a/x/tokenfactory/types/genesis.pb.go b/x/tokenfactory/types/genesis.pb.go index 341cbc9cc..e3471a9ef 100644 --- a/x/tokenfactory/types/genesis.pb.go +++ b/x/tokenfactory/types/genesis.pb.go @@ -5,8 +5,8 @@ package types import ( fmt "fmt" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" diff --git a/x/tokenfactory/types/params.pb.go b/x/tokenfactory/types/params.pb.go index 5f8b77986..3ca6e158d 100644 --- a/x/tokenfactory/types/params.pb.go +++ b/x/tokenfactory/types/params.pb.go @@ -8,8 +8,8 @@ import ( _ "github.com/cosmos/cosmos-proto" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" types "github.com/cosmos/cosmos-sdk/types" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" diff --git a/x/tokenfactory/types/query.pb.go b/x/tokenfactory/types/query.pb.go index c7f7e3a15..bc94c2473 100644 --- a/x/tokenfactory/types/query.pb.go +++ b/x/tokenfactory/types/query.pb.go @@ -6,9 +6,9 @@ package types import ( context "context" fmt "fmt" - _ "github.com/gogo/protobuf/gogoproto" - grpc1 "github.com/gogo/protobuf/grpc" - proto "github.com/gogo/protobuf/proto" + _ "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" diff --git a/x/tokenfactory/types/query.pb.gw.go b/x/tokenfactory/types/query.pb.gw.go index 88f656b0d..2cfb3a2cd 100644 --- a/x/tokenfactory/types/query.pb.gw.go +++ b/x/tokenfactory/types/query.pb.gw.go @@ -361,11 +361,11 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } var ( - pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"osmosis", "tokenfactory", "v1beta1", "params"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"osmosis", "tokenfactory", "v1beta1", "params"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_DenomAuthorityMetadata_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 2, 4, 1, 0, 4, 1, 5, 5, 1, 0, 4, 1, 5, 6, 2, 7}, []string{"osmosis", "tokenfactory", "v1beta1", "denoms", "factory", "creator", "subdenom", "authority_metadata"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_DenomAuthorityMetadata_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 2, 4, 1, 0, 4, 1, 5, 5, 1, 0, 4, 1, 5, 6, 2, 7}, []string{"osmosis", "tokenfactory", "v1beta1", "denoms", "factory", "creator", "subdenom", "authority_metadata"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_DenomsFromCreator_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"osmosis", "tokenfactory", "v1beta1", "denoms_from_creator", "creator"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_DenomsFromCreator_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"osmosis", "tokenfactory", "v1beta1", "denoms_from_creator", "creator"}, "", runtime.AssumeColonVerbOpt(false))) ) var ( diff --git a/x/tokenfactory/types/tx.pb.go b/x/tokenfactory/types/tx.pb.go index da2fdd106..aea490b5a 100644 --- a/x/tokenfactory/types/tx.pb.go +++ b/x/tokenfactory/types/tx.pb.go @@ -7,9 +7,9 @@ import ( context "context" fmt "fmt" types "github.com/cosmos/cosmos-sdk/types" - _ "github.com/gogo/protobuf/gogoproto" - grpc1 "github.com/gogo/protobuf/grpc" - proto "github.com/gogo/protobuf/proto" + _ "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" diff --git a/x/transfer/ibc_handlers.go b/x/transfer/ibc_handlers.go index ddc4eb51a..7f057db2c 100644 --- a/x/transfer/ibc_handlers.go +++ b/x/transfer/ibc_handlers.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - transfertypes "github.com/cosmos/ibc-go/v4/modules/apps/transfer/types" - channeltypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" + transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" + channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" feetypes "github.com/neutron-org/neutron/x/feerefunder/types" "github.com/neutron-org/neutron/x/interchaintxs/types" diff --git a/x/transfer/ibc_handlers_test.go b/x/transfer/ibc_handlers_test.go index 274450540..a42453fd2 100644 --- a/x/transfer/ibc_handlers_test.go +++ b/x/transfer/ibc_handlers_test.go @@ -5,8 +5,8 @@ import ( "testing" sdk "github.com/cosmos/cosmos-sdk/types" - transfertypes "github.com/cosmos/ibc-go/v4/modules/apps/transfer/types" - channeltypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" + transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" + channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" "github.com/golang/mock/gomock" "github.com/neutron-org/neutron/testutil" mock_types "github.com/neutron-org/neutron/testutil/mocks/transfer/types" diff --git a/x/transfer/keeper/keeper.go b/x/transfer/keeper/keeper.go index 6f89d8959..090cb68fc 100644 --- a/x/transfer/keeper/keeper.go +++ b/x/transfer/keeper/keeper.go @@ -2,16 +2,17 @@ package transfer import ( "context" + storetypes "github.com/cosmos/cosmos-sdk/store/types" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" capabilitykeeper "github.com/cosmos/cosmos-sdk/x/capability/keeper" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - "github.com/cosmos/ibc-go/v4/modules/apps/transfer/keeper" - "github.com/cosmos/ibc-go/v4/modules/apps/transfer/types" - channeltypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" - + "github.com/cosmos/ibc-go/v7/modules/apps/transfer/keeper" + "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" + channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" + porttypes "github.com/cosmos/ibc-go/v7/modules/core/05-port/types" feetypes "github.com/neutron-org/neutron/x/feerefunder/types" wrappedtypes "github.com/neutron-org/neutron/x/transfer/types" ) @@ -49,7 +50,7 @@ func (k KeeperTransferWrapper) Transfer(goCtx context.Context, msg *wrappedtypes } } - transferMsg := types.NewMsgTransfer(msg.SourcePort, msg.SourceChannel, msg.Token, msg.Sender, msg.Receiver, msg.TimeoutHeight, msg.TimeoutTimestamp) + transferMsg := types.NewMsgTransfer(msg.SourcePort, msg.SourceChannel, msg.Token, msg.Sender, msg.Receiver, msg.TimeoutHeight, msg.TimeoutTimestamp, msg.Memo) transferMsg.Memo = msg.Memo if _, err := k.Keeper.Transfer(goCtx, transferMsg); err != nil { return nil, err @@ -63,8 +64,8 @@ func (k KeeperTransferWrapper) Transfer(goCtx context.Context, msg *wrappedtypes // NewKeeper creates a new IBC transfer Keeper(KeeperTransferWrapper) instance func NewKeeper( - cdc codec.BinaryCodec, key sdk.StoreKey, paramSpace paramtypes.Subspace, - ics4Wrapper types.ICS4Wrapper, channelKeeper wrappedtypes.ChannelKeeper, portKeeper types.PortKeeper, + cdc codec.BinaryCodec, key storetypes.StoreKey, paramSpace paramtypes.Subspace, + ics4Wrapper porttypes.ICS4Wrapper, channelKeeper wrappedtypes.ChannelKeeper, portKeeper types.PortKeeper, authKeeper types.AccountKeeper, bankKeeper types.BankKeeper, scopedKeeper capabilitykeeper.ScopedKeeper, feeKeeper wrappedtypes.FeeRefunderKeeper, contractManagerKeeper wrappedtypes.ContractManagerKeeper, diff --git a/x/transfer/keeper/keeper_test.go b/x/transfer/keeper/keeper_test.go index af274adee..63d623fa6 100644 --- a/x/transfer/keeper/keeper_test.go +++ b/x/transfer/keeper/keeper_test.go @@ -5,8 +5,8 @@ import ( sdktypes "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/errors" - clienttypes "github.com/cosmos/ibc-go/v4/modules/core/02-client/types" - channeltypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" + clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" + channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" "github.com/stretchr/testify/suite" "github.com/neutron-org/neutron/app/params" diff --git a/x/transfer/module.go b/x/transfer/module.go index f32722e2c..3de6ee665 100644 --- a/x/transfer/module.go +++ b/x/transfer/module.go @@ -1,6 +1,7 @@ package transfer import ( + "cosmossdk.io/core/appmodule" "fmt" "github.com/cosmos/cosmos-sdk/codec" @@ -8,10 +9,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/cosmos/ibc-go/v4/modules/apps/transfer" - "github.com/cosmos/ibc-go/v4/modules/apps/transfer/keeper" - "github.com/cosmos/ibc-go/v4/modules/apps/transfer/types" - channeltypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" + "github.com/cosmos/ibc-go/v7/modules/apps/transfer" + "github.com/cosmos/ibc-go/v7/modules/apps/transfer/keeper" + "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" + channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" feetypes "github.com/neutron-org/neutron/x/feerefunder/types" wrapkeeper "github.com/neutron-org/neutron/x/transfer/keeper" @@ -68,6 +69,8 @@ func (im IBCModule) OnTimeoutPacket( return im.HandleTimeout(ctx, packet, relayer) } +var _ appmodule.AppModule = AppModule{} + type AppModule struct { transfer.AppModule keeper wrapkeeper.KeeperTransferWrapper @@ -81,10 +84,21 @@ func NewAppModule(k wrapkeeper.KeeperTransferWrapper) AppModule { } } +// IsOnePerModuleType implements the depinject.OnePerModuleType interface. +func (am AppModule) IsOnePerModuleType() { // marker +} + +// IsAppModule implements the appmodule.AppModule interface. +func (am AppModule) IsAppModule() { // marker +} + // RegisterServices registers module services. func (am AppModule) RegisterServices(cfg module.Configurator) { neutrontypes.RegisterMsgServer(cfg.MsgServer(), am.keeper) types.RegisterQueryServer(cfg.QueryServer(), am.keeper) + + cfg.MsgServer().RegisterService(&neutrontypes.MsgServiceDescOrig, am.keeper) + } type AppModuleBasic struct { @@ -115,11 +129,6 @@ func (am AppModule) Name() string { return am.AppModuleBasic.Name() } -// Deprecated: Route returns the capability module's message routing key. -func (am AppModule) Route() sdk.Route { - return sdk.NewRoute(types.RouterKey, NewHandler(am.keeper)) -} - func NewHandler(k wrapkeeper.KeeperTransferWrapper) sdk.Handler { return func(ctx sdk.Context, msg sdk.Msg) (*sdk.Result, error) { ctx = ctx.WithEventManager(sdk.NewEventManager()) diff --git a/x/transfer/types/expected_keepers.go b/x/transfer/types/expected_keepers.go index 1234a78d2..e74aa2c42 100644 --- a/x/transfer/types/expected_keepers.go +++ b/x/transfer/types/expected_keepers.go @@ -3,7 +3,7 @@ package types import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/auth/types" - channeltypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" + channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" feerefundertypes "github.com/neutron-org/neutron/x/feerefunder/types" ) @@ -27,6 +27,7 @@ type FeeRefunderKeeper interface { type ChannelKeeper interface { GetChannel(ctx sdk.Context, srcPort, srcChan string) (channel channeltypes.Channel, found bool) GetNextSequenceSend(ctx sdk.Context, portID, channelID string) (uint64, bool) + GetAllChannelsWithPortPrefix(ctx sdk.Context, portPrefix string) []channeltypes.IdentifiedChannel } // AccountKeeper defines the contract required for account APIs. diff --git a/x/transfer/types/query.pb.go b/x/transfer/types/query.pb.go index 906bea66f..a5eca1746 100644 --- a/x/transfer/types/query.pb.go +++ b/x/transfer/types/query.pb.go @@ -1,14 +1,14 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: transfer/v1/query.proto +// source: neutron/transfer/v1/query.proto package types import ( context "context" fmt "fmt" - types "github.com/cosmos/ibc-go/v4/modules/apps/transfer/types" - grpc1 "github.com/gogo/protobuf/grpc" - proto "github.com/gogo/protobuf/proto" + grpc1 "github.com/cosmos/gogoproto/grpc" + proto "github.com/cosmos/gogoproto/proto" + types "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" @@ -27,33 +27,33 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package -func init() { proto.RegisterFile("transfer/v1/query.proto", fileDescriptor_3f47107eac5604ce) } +func init() { proto.RegisterFile("neutron/transfer/v1/query.proto", fileDescriptor_560cfedb574fdf6b) } -var fileDescriptor_3f47107eac5604ce = []byte{ - // 364 bytes of a gzipped FileDescriptorProto +var fileDescriptor_560cfedb574fdf6b = []byte{ + // 365 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x93, 0xcf, 0x4a, 0xc3, 0x30, - 0x1c, 0xc7, 0x57, 0x61, 0x03, 0xe3, 0x45, 0x72, 0x11, 0xc6, 0xc8, 0x61, 0xec, 0xa0, 0x53, 0x13, - 0xbb, 0x4d, 0x1f, 0x40, 0x3c, 0xe8, 0x4d, 0xc5, 0x93, 0x17, 0x49, 0x6b, 0x6c, 0x0b, 0x5b, 0x92, - 0x25, 0xe9, 0x70, 0xc8, 0x2e, 0x3e, 0x81, 0xb0, 0x57, 0xf0, 0x20, 0xe2, 0x83, 0x78, 0x1c, 0x78, - 0xf1, 0x28, 0x9b, 0x0f, 0x22, 0x4d, 0x5b, 0xa7, 0xe0, 0x9f, 0xf5, 0x56, 0xe8, 0xf7, 0x93, 0xef, - 0xe7, 0xf7, 0x4b, 0x0b, 0xd6, 0x8c, 0xa2, 0x5c, 0x5f, 0x31, 0x45, 0x06, 0x2e, 0xe9, 0xc7, 0x4c, - 0x0d, 0xb1, 0x54, 0xc2, 0x08, 0xb8, 0xca, 0x59, 0x6c, 0x94, 0xe0, 0x38, 0x0f, 0x54, 0xd7, 0x23, - 0xcf, 0x27, 0x54, 0xca, 0x6e, 0xe4, 0x53, 0x13, 0x09, 0xae, 0xc9, 0x2f, 0x6c, 0xb5, 0x16, 0x08, - 0x11, 0x74, 0x19, 0xa1, 0x32, 0x22, 0x94, 0x73, 0x61, 0xd2, 0x7c, 0xfa, 0xb6, 0x75, 0x5f, 0x06, - 0xe5, 0x93, 0x24, 0x0d, 0x9f, 0x1c, 0x00, 0x0e, 0x18, 0x17, 0xbd, 0x33, 0x45, 0x7d, 0x06, 0x3b, - 0x38, 0xf2, 0x7c, 0xfc, 0xb5, 0xe1, 0xb3, 0x1c, 0x0f, 0x5c, 0x6c, 0x99, 0x79, 0xfc, 0x94, 0xf5, - 0x63, 0xa6, 0x4d, 0x75, 0xb7, 0x20, 0xa5, 0xa5, 0xe0, 0x9a, 0xd5, 0xdd, 0xdb, 0x97, 0xf7, 0xf1, - 0xd2, 0x26, 0xdc, 0x20, 0xd9, 0x58, 0xdf, 0xc7, 0xb9, 0x4c, 0x88, 0x0b, 0x93, 0x20, 0x9a, 0xdc, - 0x84, 0x54, 0x87, 0x23, 0xf8, 0xe0, 0x80, 0x95, 0xf9, 0x49, 0x1a, 0x16, 0x6b, 0xd6, 0xb9, 0xf0, - 0x5e, 0x51, 0x2c, 0x33, 0x6e, 0x5a, 0xe3, 0x06, 0xac, 0xff, 0x6f, 0x0c, 0xc7, 0x0e, 0xa8, 0x1c, - 0x53, 0x45, 0x7b, 0x1a, 0xee, 0x2c, 0x50, 0x97, 0x46, 0x73, 0x41, 0xb7, 0x00, 0x91, 0xb9, 0x35, - 0xac, 0x1b, 0x82, 0xb5, 0x9f, 0xdd, 0x64, 0xaa, 0xf2, 0xe8, 0x80, 0x65, 0x3b, 0xd9, 0x21, 0xd5, - 0x21, 0x6c, 0x2f, 0xba, 0x87, 0x24, 0x9d, 0xbb, 0x75, 0x8a, 0x41, 0x99, 0x5e, 0xcb, 0xea, 0x6d, - 0xc1, 0xe6, 0x5f, 0xab, 0x4b, 0x2e, 0x39, 0xb9, 0x6c, 0xbb, 0xc2, 0xd1, 0xfe, 0xd1, 0xf3, 0x14, - 0x39, 0x93, 0x29, 0x72, 0xde, 0xa6, 0xc8, 0xb9, 0x9b, 0xa1, 0xd2, 0x64, 0x86, 0x4a, 0xaf, 0x33, - 0x54, 0x3a, 0x27, 0x41, 0x64, 0xc2, 0xd8, 0xc3, 0xbe, 0xe8, 0x91, 0xec, 0x2f, 0xd9, 0x16, 0x2a, - 0xc8, 0x9f, 0xc9, 0xf5, 0xfc, 0x70, 0x33, 0x94, 0x4c, 0x7b, 0x15, 0xfb, 0xe1, 0xb7, 0x3f, 0x02, - 0x00, 0x00, 0xff, 0xff, 0xc4, 0x5f, 0xcb, 0x48, 0x6d, 0x03, 0x00, 0x00, + 0x1c, 0xc7, 0x57, 0x61, 0x03, 0xe3, 0x45, 0x72, 0x1c, 0x23, 0xc2, 0xd8, 0x41, 0xa7, 0x26, 0x76, + 0x9b, 0x3e, 0x80, 0x78, 0xd0, 0x9b, 0x8a, 0x27, 0x2f, 0x92, 0xd6, 0xd8, 0x16, 0xb6, 0x24, 0x4b, + 0xd2, 0xe1, 0x90, 0x5d, 0x7c, 0x02, 0x61, 0xaf, 0xe0, 0x41, 0xc4, 0x07, 0xf1, 0x38, 0xf0, 0xe2, + 0x51, 0x36, 0x1f, 0x44, 0x9a, 0xb6, 0x4e, 0xc1, 0x3f, 0xeb, 0xad, 0xd0, 0xef, 0x27, 0xdf, 0xcf, + 0xef, 0x97, 0x16, 0xac, 0x71, 0x16, 0x1b, 0x25, 0x38, 0x31, 0x8a, 0x72, 0x7d, 0xc5, 0x14, 0x19, + 0xb8, 0xa4, 0x1f, 0x33, 0x35, 0xc4, 0x52, 0x09, 0x23, 0xe0, 0x6a, 0x16, 0xc0, 0x79, 0xa0, 0xba, + 0x1e, 0x79, 0x3e, 0xa1, 0x52, 0x76, 0x23, 0x9f, 0x9a, 0x48, 0x70, 0xfd, 0x1b, 0x5b, 0xad, 0x05, + 0x42, 0x04, 0x5d, 0x46, 0xa8, 0x8c, 0x08, 0xe5, 0x5c, 0x98, 0x34, 0x9f, 0xbe, 0x6d, 0xdd, 0x97, + 0x41, 0xf9, 0x24, 0x49, 0xc3, 0x27, 0x07, 0x80, 0x03, 0xc6, 0x45, 0xef, 0x4c, 0x51, 0x9f, 0xc1, + 0x0e, 0x8e, 0x3c, 0x1f, 0x7f, 0x6d, 0xf8, 0x2c, 0xc7, 0x03, 0x17, 0x5b, 0x66, 0x1e, 0x3f, 0x65, + 0xfd, 0x98, 0x69, 0x53, 0xdd, 0x2d, 0x48, 0x69, 0x29, 0xb8, 0x66, 0x75, 0xf7, 0xf6, 0xe5, 0x7d, + 0xbc, 0xb4, 0x09, 0x37, 0x48, 0x36, 0xd6, 0xf7, 0x71, 0x2e, 0x13, 0xe2, 0xc2, 0x24, 0x88, 0x26, + 0x37, 0x21, 0xd5, 0xe1, 0x08, 0x3e, 0x38, 0x60, 0x65, 0x7e, 0x92, 0x86, 0xc5, 0x9a, 0x75, 0x2e, + 0xbc, 0x57, 0x14, 0xcb, 0x8c, 0x9b, 0xd6, 0xb8, 0x01, 0xeb, 0xff, 0x1b, 0xc3, 0xb1, 0x03, 0x2a, + 0xc7, 0x54, 0xd1, 0x9e, 0x86, 0x3b, 0x0b, 0xd4, 0xa5, 0xd1, 0x5c, 0xd0, 0x2d, 0x40, 0x64, 0x6e, + 0x0d, 0xeb, 0x86, 0x60, 0xed, 0x67, 0x37, 0x99, 0xaa, 0x3c, 0x3a, 0x60, 0xd9, 0x4e, 0x76, 0x48, + 0x75, 0x08, 0xdb, 0x8b, 0xee, 0x21, 0x49, 0xe7, 0x6e, 0x9d, 0x62, 0x50, 0xa6, 0xd7, 0xb2, 0x7a, + 0x5b, 0xb0, 0xf9, 0xd7, 0xea, 0x92, 0x4b, 0x4e, 0x2e, 0xdb, 0xae, 0x70, 0xb4, 0x7f, 0xf4, 0x3c, + 0x45, 0xce, 0x64, 0x8a, 0x9c, 0xb7, 0x29, 0x72, 0xee, 0x66, 0xa8, 0x34, 0x99, 0xa1, 0xd2, 0xeb, + 0x0c, 0x95, 0xce, 0x49, 0x10, 0x99, 0x30, 0xf6, 0xb0, 0x2f, 0x7a, 0x24, 0xfb, 0x4b, 0xb6, 0x85, + 0x0a, 0xf2, 0x67, 0x72, 0x3d, 0x3f, 0xdc, 0x0c, 0x25, 0xd3, 0x5e, 0xc5, 0x7e, 0xf8, 0xed, 0x8f, + 0x00, 0x00, 0x00, 0xff, 0xff, 0x7c, 0x55, 0x6a, 0x27, 0x75, 0x03, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -249,5 +249,5 @@ var _Query_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "transfer/v1/query.proto", + Metadata: "neutron/transfer/v1/query.proto", } diff --git a/x/transfer/types/query.pb.gw.go b/x/transfer/types/query.pb.gw.go index b9ae00346..d30aa10d5 100644 --- a/x/transfer/types/query.pb.gw.go +++ b/x/transfer/types/query.pb.gw.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-grpc-gateway. DO NOT EDIT. -// source: transfer/v1/query.proto +// source: neutron/transfer/v1/query.proto /* Package types is a reverse proxy. @@ -13,7 +13,7 @@ import ( "io" "net/http" - "github.com/cosmos/ibc-go/v4/modules/apps/transfer/types" + types_0 "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" "github.com/golang/protobuf/descriptor" "github.com/golang/protobuf/proto" "github.com/grpc-ecosystem/grpc-gateway/runtime" @@ -35,7 +35,7 @@ var _ = descriptor.ForMessage var _ = metadata.Join func request_Query_DenomTrace_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq types.QueryDenomTraceRequest + var protoReq types_0.QueryDenomTraceRequest var metadata runtime.ServerMetadata var ( @@ -62,7 +62,7 @@ func request_Query_DenomTrace_0(ctx context.Context, marshaler runtime.Marshaler } func local_request_Query_DenomTrace_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq types.QueryDenomTraceRequest + var protoReq types_0.QueryDenomTraceRequest var metadata runtime.ServerMetadata var ( @@ -93,7 +93,7 @@ var ( ) func request_Query_DenomTraces_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq types.QueryDenomTracesRequest + var protoReq types_0.QueryDenomTracesRequest var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { @@ -109,7 +109,7 @@ func request_Query_DenomTraces_0(ctx context.Context, marshaler runtime.Marshale } func local_request_Query_DenomTraces_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq types.QueryDenomTracesRequest + var protoReq types_0.QueryDenomTracesRequest var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { @@ -125,7 +125,7 @@ func local_request_Query_DenomTraces_0(ctx context.Context, marshaler runtime.Ma } 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 types.QueryParamsRequest + var protoReq types_0.QueryParamsRequest var metadata runtime.ServerMetadata msg, err := client.Params(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) @@ -134,7 +134,7 @@ func request_Query_Params_0(ctx context.Context, marshaler runtime.Marshaler, cl } 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 types.QueryParamsRequest + var protoReq types_0.QueryParamsRequest var metadata runtime.ServerMetadata msg, err := server.Params(ctx, &protoReq) @@ -143,7 +143,7 @@ func local_request_Query_Params_0(ctx context.Context, marshaler runtime.Marshal } func request_Query_DenomHash_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq types.QueryDenomHashRequest + var protoReq types_0.QueryDenomHashRequest var metadata runtime.ServerMetadata var ( @@ -170,7 +170,7 @@ func request_Query_DenomHash_0(ctx context.Context, marshaler runtime.Marshaler, } func local_request_Query_DenomHash_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq types.QueryDenomHashRequest + var protoReq types_0.QueryDenomHashRequest var metadata runtime.ServerMetadata var ( @@ -419,13 +419,13 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } var ( - pattern_Query_DenomTrace_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 2, 4, 1, 0, 4, 1, 5, 5}, []string{"ibc", "apps", "transfer", "v1", "denom_traces", "hash"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_DenomTrace_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 2, 4, 1, 0, 4, 1, 5, 5}, []string{"ibc", "apps", "transfer", "v1", "denom_traces", "hash"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_DenomTraces_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 2, 4}, []string{"ibc", "apps", "transfer", "v1", "denom_traces"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_DenomTraces_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 2, 4}, []string{"ibc", "apps", "transfer", "v1", "denom_traces"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 2, 4}, []string{"ibc", "apps", "transfer", "v1", "params"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 2, 4}, []string{"ibc", "apps", "transfer", "v1", "params"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_DenomHash_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 2, 4, 1, 0, 4, 1, 5, 5}, []string{"ibc", "apps", "transfer", "v1", "denom_hashes", "trace"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_DenomHash_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 2, 4, 1, 0, 4, 1, 5, 5}, []string{"ibc", "apps", "transfer", "v1", "denom_hashes", "trace"}, "", runtime.AssumeColonVerbOpt(false))) ) var ( diff --git a/x/transfer/types/query.pb.gw.go_old b/x/transfer/types/query.pb.gw.go_old index b9ae00346..6427cd9d6 100644 --- a/x/transfer/types/query.pb.gw.go_old +++ b/x/transfer/types/query.pb.gw.go_old @@ -13,7 +13,7 @@ import ( "io" "net/http" - "github.com/cosmos/ibc-go/v4/modules/apps/transfer/types" + "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" "github.com/golang/protobuf/descriptor" "github.com/golang/protobuf/proto" "github.com/grpc-ecosystem/grpc-gateway/runtime" diff --git a/x/transfer/types/tx.go b/x/transfer/types/tx.go index 51d532cf1..4ac120890 100644 --- a/x/transfer/types/tx.go +++ b/x/transfer/types/tx.go @@ -1,7 +1,10 @@ package types import ( - "github.com/cosmos/ibc-go/v4/modules/apps/transfer/types" + "context" + "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" + feerefundertypes "github.com/neutron-org/neutron/x/feerefunder/types" + "google.golang.org/grpc" sdk "github.com/cosmos/cosmos-sdk/types" ) @@ -11,7 +14,7 @@ func (msg *MsgTransfer) ValidateBasic() error { return err } - sdkMsg := types.NewMsgTransfer(msg.SourcePort, msg.SourceChannel, msg.Token, msg.Sender, msg.Receiver, msg.TimeoutHeight, msg.TimeoutTimestamp) + sdkMsg := types.NewMsgTransfer(msg.SourcePort, msg.SourceChannel, msg.Token, msg.Sender, msg.Receiver, msg.TimeoutHeight, msg.TimeoutTimestamp, msg.Memo) return sdkMsg.ValidateBasic() } @@ -20,14 +23,56 @@ func (msg *MsgTransfer) GetSigners() []sdk.AccAddress { return []sdk.AccAddress{fromAddress} } -func (msg *MsgTransfer) Route() string { - return types.RouterKey -} - -func (msg *MsgTransfer) Type() string { - return types.TypeMsgTransfer +func Msg_Transfer_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(types.MsgTransfer) + if err := dec(in); err != nil { + return nil, err + } + conv := &MsgTransfer{ + SourcePort: in.SourcePort, + SourceChannel: in.SourceChannel, + Token: in.Token, + Sender: in.Sender, + Receiver: in.Receiver, + TimeoutHeight: in.TimeoutHeight, + TimeoutTimestamp: in.TimeoutTimestamp, + Memo: in.Memo, + Fee: feerefundertypes.Fee{}, + } + if interceptor == nil { + return srv.(MsgServer).Transfer(ctx, conv) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/neutron.transfer.Msg/Transfer", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + reqT := req.(*types.MsgTransfer) + convReq := &MsgTransfer{ + SourcePort: reqT.SourcePort, + SourceChannel: reqT.SourceChannel, + Token: reqT.Token, + Sender: reqT.Sender, + Receiver: reqT.Receiver, + TimeoutHeight: reqT.TimeoutHeight, + TimeoutTimestamp: reqT.TimeoutTimestamp, + Memo: reqT.Memo, + Fee: feerefundertypes.Fee{}, + } + return srv.(MsgServer).Transfer(ctx, convReq) + } + return interceptor(ctx, conv, info, handler) } -func (msg MsgTransfer) GetSignBytes() []byte { - return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(&msg)) +var MsgServiceDescOrig = grpc.ServiceDesc{ + ServiceName: "ibc.applications.transfer.v1.Msg", + HandlerType: (*MsgServer)(nil), + Methods: []grpc.MethodDesc{ + { + MethodName: "Transfer", + Handler: Msg_Transfer_Handler, + }, + }, + Streams: []grpc.StreamDesc{}, + Metadata: "ibc/applications/transfer/v1/tx.proto", } diff --git a/x/transfer/types/tx.pb.go b/x/transfer/types/tx.pb.go index 43f441351..8d2769294 100644 --- a/x/transfer/types/tx.pb.go +++ b/x/transfer/types/tx.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: transfer/v1/tx.proto +// source: neutron/transfer/v1/tx.proto package types @@ -7,10 +7,10 @@ import ( context "context" fmt "fmt" types "github.com/cosmos/cosmos-sdk/types" - types1 "github.com/cosmos/ibc-go/v4/modules/core/02-client/types" - _ "github.com/gogo/protobuf/gogoproto" - grpc1 "github.com/gogo/protobuf/grpc" - proto "github.com/gogo/protobuf/proto" + _ "github.com/cosmos/gogoproto/gogoproto" + grpc1 "github.com/cosmos/gogoproto/grpc" + proto "github.com/cosmos/gogoproto/proto" + types1 "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" types2 "github.com/neutron-org/neutron/x/feerefunder/types" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" @@ -56,7 +56,7 @@ func (m *MsgTransfer) Reset() { *m = MsgTransfer{} } func (m *MsgTransfer) String() string { return proto.CompactTextString(m) } func (*MsgTransfer) ProtoMessage() {} func (*MsgTransfer) Descriptor() ([]byte, []int) { - return fileDescriptor_9d59058d805d54b2, []int{0} + return fileDescriptor_c44193c4a9c18e30, []int{0} } func (m *MsgTransfer) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -98,7 +98,7 @@ func (m *MsgTransferResponse) Reset() { *m = MsgTransferResponse{} } func (m *MsgTransferResponse) String() string { return proto.CompactTextString(m) } func (*MsgTransferResponse) ProtoMessage() {} func (*MsgTransferResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_9d59058d805d54b2, []int{1} + return fileDescriptor_c44193c4a9c18e30, []int{1} } func (m *MsgTransferResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -146,44 +146,45 @@ func init() { proto.RegisterType((*MsgTransferResponse)(nil), "neutron.transfer.MsgTransferResponse") } -func init() { proto.RegisterFile("transfer/v1/tx.proto", fileDescriptor_9d59058d805d54b2) } +func init() { proto.RegisterFile("neutron/transfer/v1/tx.proto", fileDescriptor_c44193c4a9c18e30) } -var fileDescriptor_9d59058d805d54b2 = []byte{ - // 543 bytes of a gzipped FileDescriptorProto +var fileDescriptor_c44193c4a9c18e30 = []byte{ + // 545 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x53, 0xc1, 0x6a, 0xdb, 0x40, - 0x10, 0x95, 0x6a, 0x27, 0x71, 0xd6, 0x24, 0xa4, 0xdb, 0x24, 0x6c, 0x4c, 0x23, 0x05, 0x41, 0x21, + 0x10, 0x95, 0x6a, 0x27, 0x71, 0xd6, 0x24, 0xa4, 0xdb, 0x36, 0x6c, 0x4c, 0x22, 0x05, 0x41, 0x21, 0x97, 0xee, 0xd6, 0x29, 0xa5, 0x90, 0x53, 0x71, 0xa0, 0xd4, 0x87, 0x80, 0x11, 0x81, 0x42, 0x2f, 0xae, 0x24, 0x8f, 0x65, 0x51, 0x6b, 0xd7, 0xdd, 0x5d, 0x99, 0xe4, 0x0f, 0x7a, 0xec, 0x27, 0xe4, - 0x73, 0x72, 0xcc, 0xb1, 0x27, 0x53, 0xec, 0x4b, 0x8f, 0xc5, 0x5f, 0x50, 0x24, 0xad, 0x5c, 0xbb, - 0x87, 0x9e, 0x34, 0x33, 0xef, 0xed, 0xbe, 0x7d, 0x33, 0x23, 0x74, 0xa8, 0x65, 0xc0, 0xd5, 0x10, - 0x24, 0x9b, 0xb6, 0x99, 0xbe, 0xa5, 0x13, 0x29, 0xb4, 0xc0, 0x07, 0x1c, 0x32, 0x2d, 0x05, 0xa7, - 0x15, 0xda, 0x3a, 0x8c, 0x45, 0x2c, 0x0a, 0x90, 0xe5, 0x51, 0xc9, 0x6b, 0x39, 0x91, 0x50, 0xa9, - 0x50, 0x2c, 0x0c, 0x14, 0xb0, 0x69, 0x3b, 0x04, 0x1d, 0xb4, 0x59, 0x24, 0x12, 0x6e, 0x70, 0x37, - 0x09, 0x23, 0x16, 0x09, 0x09, 0x2c, 0x1a, 0x27, 0xc0, 0x75, 0x2e, 0x52, 0x46, 0x86, 0x70, 0x34, - 0x04, 0x90, 0x30, 0xcc, 0xf8, 0x00, 0x24, 0x1b, 0x02, 0x94, 0x65, 0xef, 0x77, 0x0d, 0x35, 0xaf, - 0x55, 0x7c, 0x63, 0xd4, 0xf1, 0x5b, 0xd4, 0x54, 0x22, 0x93, 0x11, 0xf4, 0x27, 0x42, 0x6a, 0x62, - 0x9f, 0xd9, 0xe7, 0xbb, 0x9d, 0xe3, 0xe5, 0xcc, 0xc5, 0x77, 0x41, 0x3a, 0xbe, 0xf4, 0xd6, 0x40, - 0xcf, 0x47, 0x65, 0xd6, 0x13, 0x52, 0xe3, 0x77, 0x68, 0xdf, 0x60, 0xd1, 0x28, 0xe0, 0x1c, 0xc6, - 0xe4, 0x49, 0x71, 0xf6, 0x64, 0x39, 0x73, 0x8f, 0x36, 0xce, 0x1a, 0xdc, 0xf3, 0xf7, 0xca, 0xc2, - 0x55, 0x99, 0xe3, 0x37, 0x68, 0x4b, 0x8b, 0x2f, 0xc0, 0x49, 0xed, 0xcc, 0x3e, 0x6f, 0x5e, 0x9c, - 0xd0, 0xd2, 0x32, 0xcd, 0x2d, 0x53, 0x63, 0x99, 0x5e, 0x89, 0x84, 0x77, 0xea, 0x0f, 0x33, 0xd7, - 0xf2, 0x4b, 0x36, 0x3e, 0x46, 0xdb, 0x0a, 0x72, 0x57, 0xa4, 0x9e, 0x0b, 0xfa, 0x26, 0xc3, 0x2d, - 0xd4, 0x90, 0x10, 0x41, 0x32, 0x05, 0x49, 0xb6, 0x0a, 0x64, 0x95, 0xe3, 0xcf, 0x68, 0x5f, 0x27, - 0x29, 0x88, 0x4c, 0xf7, 0x47, 0x90, 0xc4, 0x23, 0x4d, 0xb6, 0x0b, 0xcd, 0x16, 0x4d, 0xc2, 0x88, - 0xe6, 0x6d, 0xa4, 0xa6, 0x79, 0xd3, 0x36, 0xfd, 0x50, 0x30, 0x3a, 0xa7, 0xb9, 0xe8, 0x5f, 0x33, - 0x9b, 0xe7, 0x3d, 0x7f, 0xcf, 0x14, 0x4a, 0x36, 0xee, 0xa2, 0xa7, 0x15, 0x23, 0xff, 0x2a, 0x1d, - 0xa4, 0x13, 0xb2, 0x73, 0x66, 0x9f, 0xd7, 0x3b, 0xcf, 0x97, 0x33, 0x97, 0x6c, 0x5e, 0xb2, 0xa2, - 0x78, 0xfe, 0x81, 0xa9, 0xdd, 0x54, 0x25, 0x8c, 0x51, 0x3d, 0x85, 0x54, 0x90, 0x46, 0x61, 0xa2, - 0x88, 0xf1, 0x2b, 0x54, 0x1b, 0x02, 0x90, 0xdd, 0xe2, 0xd5, 0x84, 0x56, 0x4b, 0xb4, 0x36, 0x63, - 0xfa, 0x1e, 0xc0, 0x34, 0x2a, 0xa7, 0x5e, 0x36, 0xbe, 0xdd, 0xbb, 0xd6, 0xaf, 0x7b, 0xd7, 0xf2, - 0x7a, 0xe8, 0xd9, 0xda, 0xc4, 0x7d, 0x50, 0x13, 0xc1, 0x15, 0x60, 0x17, 0x35, 0x15, 0x7c, 0xcd, - 0x80, 0x47, 0xd0, 0x4f, 0x06, 0xc5, 0xe4, 0xeb, 0x3e, 0xaa, 0x4a, 0xdd, 0x01, 0x26, 0x68, 0x67, - 0x63, 0xb4, 0x7e, 0x95, 0x5e, 0x7c, 0x44, 0xb5, 0x6b, 0x15, 0xe3, 0x1e, 0x6a, 0xac, 0xf6, 0xe8, - 0x94, 0xfe, 0xbb, 0xd8, 0x74, 0x4d, 0xb4, 0xf5, 0xe2, 0xbf, 0x70, 0xf5, 0xa6, 0x4e, 0xf7, 0x61, - 0xee, 0xd8, 0x8f, 0x73, 0xc7, 0xfe, 0x39, 0x77, 0xec, 0xef, 0x0b, 0xc7, 0x7a, 0x5c, 0x38, 0xd6, - 0x8f, 0x85, 0x63, 0x7d, 0x62, 0x71, 0xa2, 0x47, 0x59, 0x48, 0x23, 0x91, 0x32, 0x73, 0xd5, 0x4b, - 0x21, 0xe3, 0x2a, 0x66, 0xb7, 0x6c, 0xf5, 0xbb, 0xe9, 0xbb, 0x09, 0xa8, 0x70, 0xbb, 0xd8, 0xf7, - 0xd7, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0xf4, 0x3e, 0xc3, 0x60, 0x87, 0x03, 0x00, 0x00, + 0x73, 0x72, 0xcc, 0xb1, 0x27, 0x53, 0xec, 0x4b, 0x8f, 0xc5, 0x5f, 0x50, 0x24, 0xad, 0x1c, 0xbb, + 0x87, 0x9e, 0x34, 0x33, 0xef, 0xcd, 0xce, 0xbc, 0x99, 0x11, 0x3a, 0xe6, 0x90, 0x69, 0x29, 0x38, + 0xd3, 0x32, 0xe0, 0x6a, 0x08, 0x92, 0x4d, 0xdb, 0x4c, 0xdf, 0xd0, 0x89, 0x14, 0x5a, 0xe0, 0x03, + 0x83, 0xd2, 0x0a, 0x6d, 0x3d, 0x8f, 0x45, 0x2c, 0x0a, 0x90, 0xe5, 0x56, 0xc9, 0x6b, 0x39, 0x91, + 0x50, 0xa9, 0x50, 0x2c, 0x0c, 0x14, 0xb0, 0x69, 0x3b, 0x04, 0x1d, 0xb4, 0x59, 0x24, 0x12, 0x6e, + 0x70, 0x37, 0x09, 0x23, 0x16, 0x09, 0x09, 0x2c, 0x1a, 0x27, 0xc0, 0x75, 0x5e, 0xa4, 0xb4, 0x0c, + 0xe1, 0xa4, 0x6a, 0x63, 0x08, 0x20, 0x61, 0x98, 0xf1, 0x01, 0xc8, 0xdc, 0x2e, 0x61, 0xef, 0x4f, + 0x0d, 0x35, 0xaf, 0x54, 0x7c, 0x6d, 0xba, 0xc0, 0xef, 0x50, 0x53, 0x89, 0x4c, 0x46, 0xd0, 0x9f, + 0x08, 0xa9, 0x89, 0x7d, 0x6a, 0x9f, 0xed, 0x76, 0x0e, 0x97, 0x33, 0x17, 0xdf, 0x06, 0xe9, 0xf8, + 0xc2, 0x5b, 0x03, 0x3d, 0x1f, 0x95, 0x5e, 0x4f, 0x48, 0x8d, 0xdf, 0xa3, 0x7d, 0x83, 0x45, 0xa3, + 0x80, 0x73, 0x18, 0x93, 0x27, 0x45, 0xee, 0xd1, 0x72, 0xe6, 0xbe, 0xd8, 0xc8, 0x35, 0xb8, 0xe7, + 0xef, 0x95, 0x81, 0xcb, 0xd2, 0xc7, 0x6f, 0xd1, 0x96, 0x16, 0x5f, 0x81, 0x93, 0xda, 0xa9, 0x7d, + 0xd6, 0x3c, 0x3f, 0xa2, 0xa5, 0x74, 0x9a, 0x4b, 0xa7, 0x46, 0x3a, 0xbd, 0x14, 0x09, 0xef, 0xd4, + 0xef, 0x67, 0xae, 0xe5, 0x97, 0x6c, 0x7c, 0x88, 0xb6, 0x15, 0xe4, 0xaa, 0x48, 0x3d, 0x2f, 0xe8, + 0x1b, 0x0f, 0xb7, 0x50, 0x43, 0x42, 0x04, 0xc9, 0x14, 0x24, 0xd9, 0x2a, 0x90, 0x95, 0x8f, 0xbf, + 0xa0, 0x7d, 0x9d, 0xa4, 0x20, 0x32, 0xdd, 0x1f, 0x41, 0x12, 0x8f, 0x34, 0xd9, 0x2e, 0x6a, 0xb6, + 0x68, 0x12, 0x46, 0x34, 0x1f, 0x27, 0x35, 0x43, 0x9c, 0xb6, 0xe9, 0xc7, 0x82, 0xd1, 0x39, 0xc9, + 0x8b, 0x3e, 0x8a, 0xd9, 0xcc, 0xf7, 0xfc, 0x3d, 0x13, 0x28, 0xd9, 0xb8, 0x8b, 0x9e, 0x56, 0x8c, + 0xfc, 0xab, 0x74, 0x90, 0x4e, 0xc8, 0xce, 0xa9, 0x7d, 0x56, 0xef, 0x1c, 0x2f, 0x67, 0x2e, 0xd9, + 0x7c, 0x64, 0x45, 0xf1, 0xfc, 0x03, 0x13, 0xbb, 0xae, 0x42, 0x18, 0xa3, 0x7a, 0x0a, 0xa9, 0x20, + 0x8d, 0x42, 0x44, 0x61, 0xe3, 0xd7, 0xa8, 0x36, 0x04, 0x20, 0xbb, 0x45, 0xd7, 0x84, 0x56, 0xc7, + 0xb4, 0xb6, 0x63, 0xfa, 0x01, 0xc0, 0x0c, 0x2a, 0xa7, 0x5e, 0x34, 0xbe, 0xdf, 0xb9, 0xd6, 0xef, + 0x3b, 0xd7, 0xf2, 0x7a, 0xe8, 0xd9, 0xda, 0xc6, 0x7d, 0x50, 0x13, 0xc1, 0x15, 0x60, 0x17, 0x35, + 0x15, 0x7c, 0xcb, 0x80, 0x47, 0xd0, 0x4f, 0x06, 0xc5, 0xe6, 0xeb, 0x3e, 0xaa, 0x42, 0xdd, 0x01, + 0x26, 0x68, 0x67, 0x63, 0xb5, 0x7e, 0xe5, 0x9e, 0x7f, 0x42, 0xb5, 0x2b, 0x15, 0xe3, 0x1e, 0x6a, + 0xac, 0xee, 0xe8, 0x84, 0xfe, 0x7b, 0xe0, 0x74, 0xad, 0x68, 0xeb, 0xe5, 0x7f, 0xe1, 0xaa, 0xa7, + 0x4e, 0xf7, 0x7e, 0xee, 0xd8, 0x0f, 0x73, 0xc7, 0xfe, 0x35, 0x77, 0xec, 0x1f, 0x0b, 0xc7, 0x7a, + 0x58, 0x38, 0xd6, 0xcf, 0x85, 0x63, 0x7d, 0x66, 0x71, 0xa2, 0x47, 0x59, 0x48, 0x23, 0x91, 0x32, + 0xf3, 0xd4, 0x2b, 0x21, 0xe3, 0xca, 0x66, 0x37, 0x8f, 0xbf, 0x9d, 0xbe, 0x9d, 0x80, 0x0a, 0xb7, + 0x8b, 0x7b, 0x7f, 0xf3, 0x37, 0x00, 0x00, 0xff, 0xff, 0xe5, 0xdd, 0x3b, 0xd6, 0x97, 0x03, 0x00, + 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -265,7 +266,7 @@ var _Msg_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "transfer/v1/tx.proto", + Metadata: "neutron/transfer/v1/tx.proto", } func (m *MsgTransfer) Marshal() (dAtA []byte, err error) { diff --git a/x/transfer/types/tx_test.go b/x/transfer/types/tx_test.go index 9cf46a2cc..d6737e814 100644 --- a/x/transfer/types/tx_test.go +++ b/x/transfer/types/tx_test.go @@ -5,7 +5,7 @@ import ( sdktypes "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - ibcclienttypes "github.com/cosmos/ibc-go/v4/modules/core/02-client/types" + ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" "github.com/stretchr/testify/require" feetypes "github.com/neutron-org/neutron/x/feerefunder/types" From c3afeb719aa234024450cbedab2b519d0ebcae1f Mon Sep 17 00:00:00 2001 From: swelf Date: Wed, 5 Jul 2023 17:59:43 +0300 Subject: [PATCH 002/307] upda dependencies --- app/app.go | 29 +-- go.mod | 14 +- go.sum | 687 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 676 insertions(+), 54 deletions(-) diff --git a/app/app.go b/app/app.go index e598a714a..2b406364e 100644 --- a/app/app.go +++ b/app/app.go @@ -411,7 +411,7 @@ func New( appCodec, keys[banktypes.StoreKey], app.AccountKeeper, - BlockedAddresses(), + app.BlockedAddrs(), authtypes.NewModuleAddress(govtypes.ModuleName).String(), ) @@ -1023,11 +1023,6 @@ func (app *App) AppCodec() codec.Codec { return app.appCodec } -// InterfaceRegistry returns an InterfaceRegistry -func (app *App) InterfaceRegistry() types.InterfaceRegistry { - return app.interfaceRegistry -} - // GetKey returns the KVStoreKey for the provided store key. // // NOTE: This is solely to be used for testing purposes. @@ -1084,15 +1079,6 @@ func (app *App) RegisterTendermintService(clientCtx client.Context) { tmservice.RegisterTendermintService(clientCtx, app.BaseApp.GRPCQueryRouter(), app.interfaceRegistry, app.Query) } -// GetMaccPerms returns a copy of the module account permissions -func GetMaccPerms() map[string][]string { - dupMaccPerms := make(map[string][]string) - for k, v := range maccPerms { - dupMaccPerms[k] = v - } - return dupMaccPerms -} - // initParamsKeeper init params keeper and its subspaces func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino, key, tkey storetypes.StoreKey) paramskeeper.Keeper { paramsKeeper := paramskeeper.NewKeeper(appCodec, legacyAmino, key, tkey) @@ -1187,16 +1173,3 @@ func (app *App) GetTestEvidenceKeeper() e2e.TestEvidenceKeeper { func (app *App) RegisterNodeService(clientCtx client.Context) { nodeservice.RegisterNodeService(clientCtx, app.GRPCQueryRouter()) } - -// BlockedAddresses returns all the app's blocked account addresses. -func BlockedAddresses() map[string]bool { - modAccAddrs := make(map[string]bool) - for acc := range GetMaccPerms() { - modAccAddrs[authtypes.NewModuleAddress(acc).String()] = true - } - - // allow the following addresses to receive funds - delete(modAccAddrs, authtypes.NewModuleAddress(govtypes.ModuleName).String()) - - return modAccAddrs -} diff --git a/go.mod b/go.mod index 86b4cc516..77d9127cd 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/cosmos/cosmos-proto v1.0.0-beta.2 github.com/cosmos/cosmos-sdk v0.47.3 github.com/cosmos/gogoproto v1.4.10 - github.com/cosmos/ibc-go/v7 v7.1.0 + github.com/cosmos/ibc-go/v7 v7.2.0 github.com/cosmos/ics23/go v0.10.0 github.com/cosmos/interchain-security/v3 v3.0.0-rc2 github.com/gogo/protobuf v1.3.3 @@ -24,7 +24,6 @@ require ( github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.15.1 - github.com/rakyll/statik v0.1.7 github.com/spf13/cast v1.5.1 github.com/spf13/cobra v1.7.0 github.com/strangelove-ventures/packet-forward-middleware/v7 v7.0.0-20230523193151-73dea436e53f @@ -85,7 +84,6 @@ require ( github.com/go-kit/kit v0.12.0 // indirect github.com/go-kit/log v0.2.1 // indirect github.com/go-logfmt/logfmt v0.6.0 // indirect - github.com/go-playground/locales v0.14.0 // indirect github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect github.com/gogo/googleapis v1.4.1 // indirect github.com/golang/glog v1.1.1 // indirect @@ -142,6 +140,7 @@ require ( github.com/prometheus/client_model v0.4.0 // indirect github.com/prometheus/common v0.44.0 // indirect github.com/prometheus/procfs v0.10.1 // indirect + github.com/rakyll/statik v0.1.7 // indirect github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect github.com/rs/cors v1.8.3 // indirect github.com/rs/zerolog v1.29.1 // indirect @@ -182,14 +181,9 @@ require ( replace ( github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0 github.com/ChainSafe/go-schnorrkel => github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d - github.com/CosmWasm/wasmd => github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230628195106-7f39abd759a1 - github.com/cosmos/admin-module => github.com/neutron-org/admin-module v0.0.0-20230629154156-54b91a541f7f - //github.com/cosmos/cosmos-sdk => ../cosmos-sdk - //github.com/cosmos/interchain-security => github.com/cosmos/interchain-security v1.0.1-0.20230612141232-8cd0ca920812 - // google.golang.org/grpc => google.golang.org/grpc v1.33.2 + github.com/CosmWasm/wasmd => github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230705143547-22c391d461d5 + github.com/cosmos/admin-module => github.com/neutron-org/admin-module v0.0.0-20230705134325-b23404470a1d github.com/cosmos/ledger-cosmos-go => github.com/cosmos/ledger-cosmos-go v0.12.1 - // github.com/CosmWasm/wasmd v0.31.0 => github.com/neutron-org/wasmd v0.31.1-neutron-fixes.0.20230426103416-67da724a1eaf - //github.com/cosmos/admin-module => github.com/Ethernal-Tech/admin-module v0.0.0-20221102105340-e693f4d379c3 github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 ) diff --git a/go.sum b/go.sum index 4b35dacd3..acffa4f7c 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,10 @@ +4d63.com/gochecknoglobals v0.0.0-20201008074935-acfc0b28355a/go.mod h1:wfdC5ZjKSPr7CybKEcgJhUOgeAQW1+7WcyK8OvUilfo= 4d63.com/gochecknoglobals v0.1.0 h1:zeZSRqj5yCg28tCkIV/z/lWbwvNm5qnKVS15PI8nhD0= 4d63.com/gochecknoglobals v0.1.0/go.mod h1:wfdC5ZjKSPr7CybKEcgJhUOgeAQW1+7WcyK8OvUilfo= +bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898 h1:SC+c6A1qTFstO9qmB86mPV2IpYme/2ZoEQ0hrP+wo+Q= +bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod h1:Xbm+BRKSBEpa4q4hTSxohYNQpsxXPbPry4JJWOB3LB8= +bitbucket.org/creachadair/shell v0.0.6 h1:reJflDbKqnlnqb4Oo2pQ1/BqmY/eCWcNGHrIUO8qIzc= +bitbucket.org/creachadair/shell v0.0.6/go.mod h1:8Qqi/cYk7vPnsOePHroKXDJYmb5x7ENhtiFtfZq8K+M= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= @@ -16,6 +21,7 @@ cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6 cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk= cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= +cloud.google.com/go v0.60.0/go.mod h1:yw2G51M9IfRboUH61Us8GqCeF1PzPblB823Mn2q2eAU= cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= @@ -31,6 +37,7 @@ cloud.google.com/go v0.90.0/go.mod h1:kRX0mNRHe0e2rC6oNakvwQqzyDmg57xJ+SZU1eT2aD cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+YI= cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW4= cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc= +cloud.google.com/go v0.98.0/go.mod h1:ua6Ush4NALrHk5QXDWnjvZHN93OuF0HfuEPq9I1X0cM= cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA= cloud.google.com/go v0.100.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w99A= cloud.google.com/go v0.102.0/go.mod h1:oWcCzKlqJ5zgHQt9YsaeTY9KzIvjyy0ArmiBUgpQ+nc= @@ -200,6 +207,8 @@ cloud.google.com/go/eventarc v1.11.0 h1:fsJmNeqvqtk74FsaVDU6cH79lyZNCYP8Rrv7EhaB cloud.google.com/go/eventarc v1.11.0/go.mod h1:PyUjsUKPWoRBCHeOxZd/lbOOjahV41icXyUY5kSTvVY= cloud.google.com/go/filestore v1.6.0 h1:ckTEXN5towyTMu4q0uQ1Mde/JwTHur0gXs8oaIZnKfw= cloud.google.com/go/filestore v1.6.0/go.mod h1:di5unNuss/qfZTw2U9nhFqo8/ZDSc466dre85Kydllg= +cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= +cloud.google.com/go/firestore v1.6.1/go.mod h1:asNXNOzBdyVQmEU+ggO8UPodTkEVFW5Qx+rwHnAz+EY= cloud.google.com/go/firestore v1.9.0 h1:IBlRyxgGySXu5VuW0RgGFlTtLukSnNkpDiEOMkQkmpA= cloud.google.com/go/firestore v1.9.0/go.mod h1:HMkjKHNTtRyZNiMzu7YAsLr9K3X2udY2AMwDaMEQiiE= cloud.google.com/go/functions v1.6.0/go.mod h1:3H1UA3qiIPRWD7PeZKLvHZ9SaQhR26XIJcC0A5GbvAk= @@ -310,6 +319,7 @@ cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2k cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= +cloud.google.com/go/pubsub v1.5.0/go.mod h1:ZEwJccE3z93Z2HWvstpri00jOg7oO4UZDtKhwDwqF0w= cloud.google.com/go/pubsub v1.30.0 h1:vCge8m7aUKBJYOgrZp7EsNDf6QMd2CAlXZqWTn3yq6s= cloud.google.com/go/pubsub v1.30.0/go.mod h1:qWi1OPS0B+b5L+Sg6Gmc9zD1Y+HaM0MdUr7LsupY1P4= cloud.google.com/go/pubsublite v1.7.0 h1:cb9fsrtpINtETHiJ3ECeaVzrfIVhcGjhhJEjybHXHao= @@ -365,6 +375,7 @@ cloud.google.com/go/servicedirectory v1.9.0 h1:SJwk0XX2e26o25ObYUORXx6torSFiYgsG cloud.google.com/go/servicedirectory v1.9.0/go.mod h1:29je5JjiygNYlmsGz8k6o+OZ8vd4f//bQLtvzkPPT/s= cloud.google.com/go/shell v1.6.0 h1:wT0Uw7ib7+AgZST9eCDygwTJn4+bHMDtZo5fh7kGWDU= cloud.google.com/go/shell v1.6.0/go.mod h1:oHO8QACS90luWgxP3N9iZVuEiSF84zNyLytb+qE2f9A= +cloud.google.com/go/spanner v1.7.0/go.mod h1:sd3K2gZ9Fd0vMPLXzeCrF6fq4i63Q7aTLW/lBIfBkIk= cloud.google.com/go/spanner v1.45.0 h1:7VdjZ8zj4sHbDw55atp5dfY6kn1j9sam9DRNpPQhqR4= cloud.google.com/go/spanner v1.45.0/go.mod h1:FIws5LowYz8YAE1J8fOS7DJup8ff7xJeetWEo5REA2M= cloud.google.com/go/speech v1.6.0/go.mod h1:79tcr4FHCimOp56lwC01xnt/WPJZc4v3gzyT7FoBkCM= @@ -426,6 +437,8 @@ cloud.google.com/go/workflows v1.10.0 h1:FfGp9w0cYnaKZJhUOMqCOJCYT/WlvYBfTQhFWV3 cloud.google.com/go/workflows v1.10.0/go.mod h1:fZ8LmRmZQWacon9UCX1r/g/DfAXx5VcPALq2CxzdePw= collectd.org v0.3.0 h1:iNBHGw1VvPJxH2B6RiFWFZ+vsjo1lCdRszBeOuwGi00= collectd.org v0.3.0/go.mod h1:A/8DzQBkF6abtvrT2j/AU/4tiBgJWYyh0y/oB/4MlWE= +contrib.go.opencensus.io/exporter/stackdriver v0.13.4 h1:ksUxwH3OD5sxkjzEqGxNTl+Xjsmu3BnC/300MhSVTSc= +contrib.go.opencensus.io/exporter/stackdriver v0.13.4/go.mod h1:aXENhDJ1Y4lIg4EUaVTwzvYETVNZk10Pu26tevFKLUc= cosmossdk.io/api v0.3.1 h1:NNiOclKRR0AOlO4KIqeaG6PS6kswOMhHD0ir0SscNXE= cosmossdk.io/api v0.3.1/go.mod h1:DfHfMkiNA2Uhy8fj0JJlOCYOBp4eWUUJ1te5zBGNyIw= cosmossdk.io/core v0.5.1 h1:vQVtFrIYOQJDV3f7rw4pjjVqc1id4+mE0L9hHP66pyI= @@ -438,14 +451,11 @@ cosmossdk.io/log v1.1.0 h1:v0ogPHYeTzPcBTcPR1A3j1hkei4pZama8kz8LKlCMv0= cosmossdk.io/log v1.1.0/go.mod h1:6zjroETlcDs+mm62gd8Ig7mZ+N+fVOZS91V17H+M4N4= cosmossdk.io/math v1.0.1 h1:Qx3ifyOPaMLNH/89WeZFH268yCvU4xEcnPLu3sJqPPg= cosmossdk.io/math v1.0.1/go.mod h1:Ygz4wBHrgc7g0N+8+MrnTfS9LLn9aaTGa9hKopuym5k= -cosmossdk.io/simapp v0.0.0-20230224204036-a6adb0821462 h1:g8muUHnXL8vhld2Sjilyhb1UQObc+x9GVuDK43TYZns= -cosmossdk.io/simapp v0.0.0-20230224204036-a6adb0821462/go.mod h1:4Dd3NLoLYoN90kZ0uyHoTHzVVk9+J0v4HhZRBNTAq2c= -cosmossdk.io/simapp v0.0.0-20230323161446-0af178d721ff h1:P1ialzTepD1oxdNPYc5N8Eggq3RdejZq3cJs8YYMs9Y= -cosmossdk.io/simapp v0.0.0-20230323161446-0af178d721ff/go.mod h1:AKzx6Mb544LjJ9RHmGFHjY9rEOLiUAi8I0F727TR0dY= cosmossdk.io/tools/rosetta v0.2.1 h1:ddOMatOH+pbxWbrGJKRAawdBkPYLfKXutK9IETnjYxw= cosmossdk.io/tools/rosetta v0.2.1/go.mod h1:Pqdc1FdvkNV3LcNIkYWt2RQY6IP1ge6YWZk8MhhO9Hw= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9 h1:VpgP7xuJadIUuKccphEpTJnWhS2jkQyMt6Y7pJCD7fY= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +filippo.io/edwards25519 v1.0.0-beta.2/go.mod h1:X+pm78QAUPtFLi1z9PYIlS/bdDnvbCOGKtZ+ACWEf7o= filippo.io/edwards25519 v1.0.0-rc.1/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns= filippo.io/edwards25519 v1.0.0 h1:0wAIcmJUqRdI8IJ/3eGi5/HwXZWPujYXXlkrQogz0Ek= filippo.io/edwards25519 v1.0.0/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns= @@ -457,19 +467,43 @@ github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 h1:/vQbFIOMb github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4/go.mod h1:hN7oaIRCjzsZ2dE+yG5k+rsdt3qcwykqK6HVGcKwsw4= github.com/Abirdcfly/dupword v0.0.7 h1:z14n0yytA3wNO2gpCD/jVtp/acEXPGmYu0esewpBt6Q= github.com/Abirdcfly/dupword v0.0.7/go.mod h1:K/4M1kj+Zh39d2aotRwypvasonOyAMH1c/IZJzE0dmk= +github.com/Antonboom/errname v0.1.4/go.mod h1:jRXo3m0E0EuCnK3wbsSVH3X55Z4iTDLl6ZfCxwFj4TM= github.com/Antonboom/errname v0.1.7 h1:mBBDKvEYwPl4WFFNwec1CZO096G6vzK9vvDQzAwkako= github.com/Antonboom/errname v0.1.7/go.mod h1:g0ONh16msHIPgJSGsecu1G/dcF2hlYR/0SddnIAGavU= github.com/Antonboom/nilnil v0.1.1 h1:PHhrh5ANKFWRBh7TdYmyyq2gyT2lotnvFvvFbylF81Q= github.com/Antonboom/nilnil v0.1.1/go.mod h1:L1jBqoWM7AOeTD+tSquifKSesRHs4ZdaxvZR+xdJEaI= +github.com/Azure/azure-pipeline-go v0.2.1/go.mod h1:UGSo8XybXnIGZ3epmeBw7Jdz+HiUVpqIlpz/HKHylF4= +github.com/Azure/azure-pipeline-go v0.2.2 h1:6oiIS9yaG6XCCzhgAgKFfIWyo4LLCiDhZot6ltoThhY= +github.com/Azure/azure-pipeline-go v0.2.2/go.mod h1:4rQ/NZncSvGqNkkOsNpOU1tgoNuIlp9AfUH5G1tvCHc= github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.1 h1:qoVeMsc9/fh/yhxVaA0obYjVH/oI/ihrOoMwsLS9KSA= github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.1/go.mod h1:fBF9PQNqB8scdgpZ3ufzaLntG0AG7C1WjPMsiFOmfHM= github.com/Azure/azure-sdk-for-go/sdk/internal v0.8.3 h1:E+m3SkZCN0Bf5q7YdTs5lSm2CYY3CK4spn5OmUIiQtk= github.com/Azure/azure-sdk-for-go/sdk/internal v0.8.3/go.mod h1:KLF4gFr6DcKFZwSuH8w8yEK6DpFl3LP5rhdvAb7Yz5I= github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.3.0 h1:Px2UA+2RvSSvv+RvJNuUB6n7rs5Wsel4dXLe90Um2n4= github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.3.0/go.mod h1:tPaiy8S5bQ+S5sOiDlINkp7+Ef339+Nz5L5XO+cnOHo= +github.com/Azure/azure-storage-blob-go v0.7.0 h1:MuueVOYkufCxJw5YZzF842DY2MBsp+hLuh2apKY0mck= +github.com/Azure/azure-storage-blob-go v0.7.0/go.mod h1:f9YQKtsG1nMisotuTPpO0tjNuEjKRYAcJU8/ydDI++4= +github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= +github.com/Azure/go-autorest/autorest v0.9.0 h1:MRvx8gncNaXJqOoLmhNjUAKh33JJF8LyxPhomEtOsjs= +github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI= +github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0= +github.com/Azure/go-autorest/autorest/adal v0.8.0 h1:CxTzQrySOxDnKpLjFJeZAS5Qrv/qFPkgLjx5bOAi//I= +github.com/Azure/go-autorest/autorest/adal v0.8.0/go.mod h1:Z6vX6WXXuyieHAXwMj0S6HY6e6wcHn37qQMBQlvY3lc= +github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA= +github.com/Azure/go-autorest/autorest/date v0.2.0 h1:yW+Zlqf26583pE43KhfnhFcdmSWlm5Ew6bxipnr/tbM= +github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod h1:vcORJHLJEh643/Ioh9+vPmf1Ij9AEBM5FuBIXLmIy0g= +github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= +github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= +github.com/Azure/go-autorest/autorest/mocks v0.3.0 h1:qJumjCaCudz+OcqE9/XtEPfvtOjOmKaui4EOpFI6zZc= +github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod h1:a8FDP3DYzQ4RYfVAxAN3SVSiiO77gL2j2ronKKP0syM= +github.com/Azure/go-autorest/logger v0.1.0 h1:ruG4BSDXONFRrZZJ2GUXDiUyVpayPmb1GnWeHDdaNKY= +github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc= +github.com/Azure/go-autorest/tracing v0.5.0 h1:TRn4WjSnkcSy5AEG3pnbtFSwNtwzjr4VYyQflFE619k= +github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/BurntSushi/toml v0.4.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/BurntSushi/toml v1.2.1 h1:9F2/+DoOYIOksmaJFPw1tGFy1eDnIJXg+UHjuD8lTak= github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802 h1:1BDTz0u9nC3//pOCMdNH+CiXJVYJh5UQNCOBG7jbELc= @@ -482,6 +516,8 @@ github.com/DATA-DOG/go-sqlmock v1.3.3 h1:CWUqKXe0s8A2z6qCgkP4Kru7wC11YoAnoupUKFD github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= github.com/DataDog/datadog-go v3.2.0+incompatible h1:qSG2N4FghB1He/r2mFrWKCaL7dXCilEuNEeAn20fdD4= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= +github.com/DataDog/zstd v1.4.1/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= +github.com/DataDog/zstd v1.4.5/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= github.com/DataDog/zstd v1.5.0 h1:+K/VEwIAaPcHiMtQvpLD4lqW7f0Gk3xdYZmI1hD+CXo= github.com/DataDog/zstd v1.5.0/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 h1:sHglBQTwgx+rWPdisA5ynNEsoARbiCBOyGcJM4/OzsM= @@ -492,16 +528,25 @@ github.com/HdrHistogram/hdrhistogram-go v1.1.2 h1:5IcZpTvzydCQeHzK4Ef/D5rrSqwxob github.com/HdrHistogram/hdrhistogram-go v1.1.2/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo= github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible h1:1G1pk05UrOh0NlF1oeaaix1x8XzrfjIDK47TY0Zehcw= github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= +github.com/Masterminds/goutils v1.1.0 h1:zukEsf/1JZwCMgHiK3GZftabmxiCw4apj3a28RPBiVg= +github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= +github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww= github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= github.com/Masterminds/semver/v3 v3.2.0 h1:3MEsd0SM6jqZojhjLWWeBY+Kcjy9i6MQAeY7YgDP83g= github.com/Masterminds/semver/v3 v3.2.0/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ= +github.com/Masterminds/sprig v2.15.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o= +github.com/Masterminds/sprig v2.22.0+incompatible h1:z4yfnGrZ7netVz+0EDJ0Wi+5VZCSYp4Z0m2dk6cEM60= +github.com/Masterminds/sprig v2.22.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o= +github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA= +github.com/Microsoft/go-winio v0.5.0/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= github.com/Microsoft/go-winio v0.6.0 h1:slsWYD/zyx7lCXoZVlvQrj0hPTM1HI4+v1sIda2yDvg= github.com/Microsoft/go-winio v0.6.0/go.mod h1:cTAf44im0RAYeL23bpB+fzCyDH2MJiz2BO69KH/soAE= github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 h1:TngWCqHvy9oXAN6lEVMRuU21PR1EtLVZJmdB18Gu3Rw= github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk= github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= +github.com/OpenPeeDeeP/depguard v1.0.1/go.mod h1:xsIw86fROiiwelg+jB2uM9PiKihMMmUx/1V+TNhjQvM= github.com/OpenPeeDeeP/depguard v1.1.1 h1:TSUznLjvp/4IUP+OQ0t/4jF4QUyxIcVX8YnghZdunyA= github.com/OpenPeeDeeP/depguard v1.1.1/go.mod h1:JtAMzWkmFEzDPyAd+W0NHl1lvpQKTvT9jnRVsohBKpc= github.com/ProtonMail/go-crypto v0.0.0-20221026131551-cf6655e29de4 h1:ra2OtmuW0AE5csawV4YXMNGNQQXvLRps3z2Z59OPO+I= @@ -512,14 +557,20 @@ github.com/Shopify/toxiproxy v2.1.4+incompatible h1:TKdv8HiTLgE5wdJuEML90aBgNWso github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6 h1:fLjPD/aNc3UIOA6tDi6QXUemppXK3P9BI7mr2hd6gx8= github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= +github.com/StackExchange/wmi v1.2.1 h1:VIkavFPXSjcnS+O8yTq7NI32k0R5Aj+v39y29VYDOSA= +github.com/StackExchange/wmi v1.2.1/go.mod h1:rcmrprowKIVzvc+NUiLncP2uuArMWLCbu9SBzvHz7e8= +github.com/VictoriaMetrics/fastcache v1.5.7/go.mod h1:ptDBkNMQI4RtmVo8VS/XwRY6RoTu1dAWCbrk+6WsEM8= github.com/VictoriaMetrics/fastcache v1.6.0 h1:C/3Oi3EiBCqufydp1neRZkqcwmEiuRT9c3fqvvgKm5o= github.com/VictoriaMetrics/fastcache v1.6.0/go.mod h1:0qHz5QP0GMX4pfmMA/zt5RgfNuXJrTP0zS7DqpHGGTw= github.com/VividCortex/gohistogram v1.0.0 h1:6+hBz+qvs0JOrrNhhmR7lFxo5sINxBCGXrdtl/UvroE= github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= +github.com/Workiva/go-datastructures v1.0.52 h1:PLSK6pwn8mYdaoaCZEMsXBpBotr4HHn9abU0yMQt0NI= +github.com/Workiva/go-datastructures v1.0.52/go.mod h1:Z+F2Rca0qCsVYDS8z7bAGm8f3UkzuWYS/oBZz5a7VVA= github.com/Zilliqa/gozilliqa-sdk v1.2.1-0.20201201074141-dd0ecada1be6 h1:1d9pzdbkth4D9AX6ndKSl7of3UTV0RYl3z64U2dXMGo= github.com/Zilliqa/gozilliqa-sdk v1.2.1-0.20201201074141-dd0ecada1be6/go.mod h1:eSYp2T6f0apnuW8TzhV3f6Aff2SE8Dwio++U4ha4yEM= github.com/acomagu/bufpipe v1.0.3 h1:fxAGrHZTgQ9w5QqVItgzwj235/uYZYgbXitB+dLupOk= github.com/acomagu/bufpipe v1.0.3/go.mod h1:mxdxdup/WdsKVreO5GpW4+M/1CE2sMG4jeGJ2sYmHc4= +github.com/adlio/schema v1.1.13/go.mod h1:L5Z7tw+7lRK1Fnpi/LT/ooCP1elkXn0krMWBQHUhEDE= github.com/adlio/schema v1.3.3 h1:oBJn8I02PyTB466pZO1UZEn1TV5XLlifBSyMrmHl/1I= github.com/adlio/schema v1.3.3/go.mod h1:1EsRssiv9/Ce2CMzq5DoL7RiMshhuigQxrR4DMV9fHg= github.com/aead/siphash v1.0.1 h1:FwHfE/T45KPKYuuSAKyyvE+oPWcaQ+CUmFW0bPlM+kg= @@ -548,31 +599,48 @@ github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156 h1:eMwmnE/GDgah github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM= github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883 h1:bvNMNQO63//z+xNgfBlViaCIJKLlCJ6/fmUseuG0wVQ= github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8= +github.com/andybalholm/brotli v1.0.0 h1:7UCwP93aiSfvWpapti8g88vVVGp2qqtGyePsSuDafo4= +github.com/andybalholm/brotli v1.0.0/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y= +github.com/antihax/optional v0.0.0-20180407024304-ca021399b1a6/go.mod h1:V8iCPQYkqmusNa815XgQio277wI47sdRh1dUOLdyC6Q= github.com/antihax/optional v1.0.0 h1:xK2lYat7ZLaVVcIuj82J8kIro4V6kDe0AUDFboUCwcg= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= +github.com/aokoli/goutils v1.0.1 h1:7fpzNGoJ3VA8qcrm++XEE1QUe0mIwNeLa02Nwq7RDkg= +github.com/aokoli/goutils v1.0.1/go.mod h1:SijmP0QR8LtwsmDs8Yii5Z/S4trXFGFC2oO5g9DP+DQ= github.com/apache/arrow/go/arrow v0.0.0-20191024131854-af6fa24be0db h1:nxAtV4VajJDhKysp2kdcJZsq8Ss1xSA0vZTkVHHJd0E= github.com/apache/arrow/go/arrow v0.0.0-20191024131854-af6fa24be0db/go.mod h1:VTxUBvSJ3s3eHAg65PNgrsn5BtqCRPdmyXh6rAfdxN0= github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/apache/thrift v0.13.0 h1:5hryIiq9gtn+MiLVn0wP37kb/uTeRZgN08WoCsAhIhI= github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= +github.com/aristanetworks/goarista v0.0.0-20170210015632-ea17b1a17847 h1:rtI0fD4oG/8eVokGVPYJEW1F88p1ZNgXiEIs9thEE4A= +github.com/aristanetworks/goarista v0.0.0-20170210015632-ea17b1a17847/go.mod h1:D/tb0zPVXnP7fmsLZjtdUhSsumbK/ij54UXjjVgMGxQ= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e h1:QEF07wC0T1rKkctt1RINW/+RMTVmiwxETico2l3gxJA= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6 h1:G1bPvciwNyF7IUmKXNt9Ak3m6u9DE1rF+RmtIkBpVdA= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= +github.com/armon/go-metrics v0.3.9/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc= +github.com/armon/go-metrics v0.3.10/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc= github.com/armon/go-metrics v0.4.1 h1:hR91U9KYmb6bLBYLQjyM+3j+rcd/UhE+G78SFnF8gJA= github.com/armon/go-metrics v0.4.1/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310 h1:BUAU3CGlLvorLI26FmByPp2eC2qla6E1Tw+scpcg/to= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= +github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI= +github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a h1:pv34s756C4pEXnjgPfGYgdhg/ZdajGhyOvzx8k+23nw= github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A= +github.com/ashanbrown/forbidigo v1.2.0/go.mod h1:vVW7PEdqEFqapJe95xHkTfB1+XvZXBFg8t0sG2FIxmI= github.com/ashanbrown/forbidigo v1.3.0 h1:VkYIwb/xxdireGAdJNZoo24O4lmnEWkactplBlWTShc= github.com/ashanbrown/forbidigo v1.3.0/go.mod h1:vVW7PEdqEFqapJe95xHkTfB1+XvZXBFg8t0sG2FIxmI= +github.com/ashanbrown/makezero v0.0.0-20210520155254-b6261585ddde/go.mod h1:oG9Dnez7/ESBqc4EdrdNlryeo7d0KcW1ftXHm7nU/UU= github.com/ashanbrown/makezero v1.1.1 h1:iCQ87C0V0vSyO+M9E/FZYbu65auqH0lnsOkf5FcB28s= github.com/ashanbrown/makezero v1.1.1/go.mod h1:i1bJLCRSCHOcOa9Y6MyF2FTfMZMFdHvxKHxgO5Z1axI= github.com/aws/aws-lambda-go v1.13.3 h1:SuCy7H3NLyp+1Mrfp+m80jcbi9KYWAs9/BXwppwRDzY= github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= +github.com/aws/aws-sdk-go v1.23.20/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= +github.com/aws/aws-sdk-go v1.25.37/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= +github.com/aws/aws-sdk-go v1.25.48/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= +github.com/aws/aws-sdk-go v1.36.30/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= github.com/aws/aws-sdk-go v1.44.122/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= github.com/aws/aws-sdk-go v1.44.203 h1:pcsP805b9acL3wUqa4JR2vg1k2wnItkDYNvfmcy6F+U= github.com/aws/aws-sdk-go v1.44.203/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= @@ -610,6 +678,11 @@ github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod h1:6QX/PXZ github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 h1:41iFGWnSlI2gVpmOtVTJZNodLdLQLn/KsJqFvXwnd/s= github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= +github.com/bits-and-blooms/bitset v1.2.0 h1:Kn4yilvwNtMACtf1eYDlG8H77R07mZSPbMjLyS07ChA= +github.com/bits-and-blooms/bitset v1.2.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA= +github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= +github.com/bketelsen/crypt v0.0.4 h1:w/jqZtC9YD4DS/Vp9GhWfWcCpuAL58oTnLoI8vE9YHU= +github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM= github.com/bkielbasa/cyclop v1.2.0 h1:7Jmnh0yL2DjKfw28p86YTd/B4lRGcNuu12sKE35sM7A= github.com/bkielbasa/cyclop v1.2.0/go.mod h1:qOI0yy6A7dYC4Zgsa72Ppm9kONl0RoIlPbzot9mhmeI= github.com/blizzy78/varnamelen v0.8.0 h1:oqSblyuQvFsW1hbBHh1zfwrKe3kcSj0rnXkKzsQ089M= @@ -624,9 +697,12 @@ github.com/breml/bidichk v0.2.3 h1:qe6ggxpTfA8E75hdjWPZ581sY3a2lnl0IRxLQFelECI= github.com/breml/bidichk v0.2.3/go.mod h1:8u2C6DnAy0g2cEq+k/A2+tr9O1s+vHGxWn0LTc70T2A= github.com/breml/errchkjson v0.3.0 h1:YdDqhfqMT+I1vIxPSas44P+9Z9HzJwCeAzjB8PxP1xw= github.com/breml/errchkjson v0.3.0/go.mod h1:9Cogkyv9gcT8HREpzi3TiqBxCqDzo8awa92zSDFcofU= +github.com/btcsuite/btcd v0.0.0-20171128150713-2e60448ffcc6/go.mod h1:Dmm/EzmjnCiweXmzRIAiUWCInVmPgjkzgv5k4tVyXiQ= github.com/btcsuite/btcd v0.0.0-20190315201642-aa6e0f35703c/go.mod h1:DrZx5ec/dmnfpw9KyYoQyYo7d0KEvTkk/5M/vbZjAr8= github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ= +github.com/btcsuite/btcd v0.21.0-beta/go.mod h1:ZSWyehm27aAuS9bvkATT+Xte3hjHZ+MRgMY/8NJ7K94= github.com/btcsuite/btcd v0.21.0-beta.0.20201114000516-e9c7a5ac6401/go.mod h1:Sv4JPQ3/M+teHz9Bo5jBpkNcP0x6r7rdihlNL/7tTAs= +github.com/btcsuite/btcd v0.22.0-beta/go.mod h1:9n5ntfhhHQBIhUvlhDvD3Qg6fRUj4jkN0VB8L8svzOA= github.com/btcsuite/btcd v0.22.1 h1:CnwP9LM/M9xuRrGSCGeMVs9iv09uMqwsVX7EeIpgV2c= github.com/btcsuite/btcd v0.22.1/go.mod h1:wqgTSL29+50LRkmOVknEdmt8ZojIzhuWvgu/iptuN7Y= github.com/btcsuite/btcd/btcec/v2 v2.1.2/go.mod h1:ctjw4H1kknNJmRN4iP1R7bTQ+v3GJkZBd6mui8ZsAZE= @@ -677,6 +753,7 @@ github.com/cenkalti/backoff/v4 v4.1.1/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInq github.com/cenkalti/backoff/v4 v4.1.3 h1:cFAlzYUlVYDysBEH2T5hyJZMh3+5+WCBvSnK6Q8UtC4= github.com/cenkalti/backoff/v4 v4.1.3/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/census-instrumentation/opencensus-proto v0.4.1 h1:iKLQ0xPNFxR/2hzXZMrBo8f1j86j5WHzznCCQxV/b8g= github.com/census-instrumentation/opencensus-proto v0.4.1/go.mod h1:4T9NM4+4Vw91VeyqjLS6ao50K5bOcLKN6Q42XnYaRYw= github.com/cespare/cp v0.1.0 h1:SE+dxFebS7Iik5LK0tsi1k9ZCxEaFX4AjQmoyA+1dJk= @@ -684,12 +761,17 @@ github.com/cespare/cp v0.1.0/go.mod h1:SOGHArjBr4JWaSDEVpWpo/hNg6RoKrls6Oh40hiwW github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/charithe/durationcheck v0.0.8/go.mod h1:SSbRIBVfMjCi/kEB6K65XEA83D6prSM8ap1UCpNKtgg= github.com/charithe/durationcheck v0.0.9 h1:mPP4ucLrf/rKZiIG/a9IPXHGlh8p4CzgpyTy6EEutYk= github.com/charithe/durationcheck v0.0.9/go.mod h1:SSbRIBVfMjCi/kEB6K65XEA83D6prSM8ap1UCpNKtgg= +github.com/chavacava/garif v0.0.0-20210405164556-e8a0a408d6af/go.mod h1:Qjyv4H3//PWVzTeCezG2b9IRn6myJxJSr4TD/xo6ojU= github.com/chavacava/garif v0.0.0-20220630083739-93517212f375 h1:E7LT642ysztPWE0dfz43cWOvMiF42DyTRC+eZIaO4yI= github.com/chavacava/garif v0.0.0-20220630083739-93517212f375/go.mod h1:4m1Rv7xfuwWPNKXlThldNuJvutYM6J95wNuuVmn55To= +github.com/checkpoint-restore/go-criu/v5 v5.0.0 h1:TW8f/UvntYoVDMN1K2HlT82qH1rb0sOjpGw3m6Ym+i4= +github.com/checkpoint-restore/go-criu/v5 v5.0.0/go.mod h1:cfwC0EG7HMUenopBsUf9d89JlCLQIfgVcNsNN0t6T2M= github.com/cheggaaa/pb v1.0.27 h1:wIkZHkNfC7R6GI5w7l/PdAdzXzlrbcI3p8OAlnkTsnc= github.com/cheggaaa/pb v1.0.27/go.mod h1:pQciLPpbU0oxA0h+VJYYLxO+XeDQb5pZijXscXHm81s= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= @@ -701,6 +783,8 @@ github.com/chzyer/readline v1.5.1/go.mod h1:Eh+b79XXUwfKfcPLepksvw2tcLE/Ct21YObk github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/chzyer/test v1.0.0 h1:p3BQDXSxOhOG0P9z6/hGnII4LGiEPOYBhs8asl/fC04= github.com/chzyer/test v1.0.0/go.mod h1:2JlltgoNkt4TW/z9V/IzDdFaMTM2JPIi26O1pF38GC8= +github.com/cilium/ebpf v0.6.2 h1:iHsfF/t4aW4heW2YKfeHrVPGdtYTL4C4KocpM8KTSnI= +github.com/cilium/ebpf v0.6.2/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs= github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible h1:C29Ae4G5GtYyYMm1aztcyj/J5ckgJm2zwdDajFbx1NY= github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag= github.com/circonus-labs/circonusllhist v0.1.3 h1:TJH+oke8D16535+jHExHj4nQvzlZrj7ug5D7I/orNUA= @@ -713,6 +797,7 @@ github.com/client9/misspell v0.3.4 h1:ta993UF76GwbvJcIo3Y68y/M3WxlpEHPWIGDkJYwzJ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudflare/circl v1.1.0 h1:bZgT/A+cikZnKIwn7xL2OBj012Bmvho/o6RpRvv3GKY= github.com/cloudflare/circl v1.1.0/go.mod h1:prBCrKB9DV4poKZY1l9zBXg2QJY7mvgRvtMxxK7fi4I= +github.com/cloudflare/cloudflare-go v0.10.2-0.20190916151808-a80f83b9add9/go.mod h1:1MxXX1Ux4x6mqPmjkUgTP1CdXIBXKX7T+Jk9Gxrmx+U= github.com/cloudflare/cloudflare-go v0.14.0 h1:gFqGlGl/5f9UGXAaKapCGUfaTCgRKKnzu2VvzMZlOFA= github.com/cloudflare/cloudflare-go v0.14.0/go.mod h1:EnwdgGMaFOruiPZRFSgn+TsQ3hQ7C/YWzIGLeu5c304= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= @@ -726,6 +811,7 @@ github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWH github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20211130200136-a8f946100490/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20230310173818-32f1caf87195 h1:58f1tJ1ra+zFINPlwLWvQsR9CzAKt2e+EWV2yX9oXQ4= github.com/cncf/xds/go v0.0.0-20230310173818-32f1caf87195/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cockroachdb/apd/v2 v2.0.2 h1:weh8u7Cneje73dDh+2tEVLUvyBc89iwepWCD8b8034E= @@ -746,6 +832,8 @@ github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd h1:qMd81Ts1T github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= github.com/coinbase/kryptology v1.8.0 h1:Aoq4gdTsJhSU3lNWsD5BWmFSz2pE0GlmrljaOxepdYY= github.com/coinbase/kryptology v1.8.0/go.mod h1:RYXOAPdzOGUe3qlSFkMGn58i3xUA8hmxYHksuq+8ciI= +github.com/coinbase/rosetta-sdk-go v0.6.10/go.mod h1:J/JFMsfcePrjJZkwQFLh+hJErkAmdm9Iyy3D5Y0LfXo= +github.com/coinbase/rosetta-sdk-go v0.7.0/go.mod h1:7nD3oBPIiHqhRprqvMgPoGxe/nyq3yftRmpsy29coWE= github.com/coinbase/rosetta-sdk-go v0.7.9 h1:lqllBjMnazTjIqYrOGv8h8jxjg9+hJazIGZr9ZvoCcA= github.com/coinbase/rosetta-sdk-go v0.7.9/go.mod h1:0/knutI7XGVqXmmH4OQD8OckFrbQ8yMsUZTG7FXCR2M= github.com/coinbase/rosetta-sdk-go/types v1.0.0 h1:jpVIwLcPoOeCR6o1tU+Xv7r5bMONNbHU7MuEHboiFuA= @@ -754,6 +842,10 @@ github.com/cometbft/cometbft v0.37.2 h1:XB0yyHGT0lwmJlFmM4+rsRnczPlHoAKFX6K8Zgc2 github.com/cometbft/cometbft v0.37.2/go.mod h1:Y2MMMN//O5K4YKd8ze4r9jmk4Y7h0ajqILXbH5JQFVs= github.com/cometbft/cometbft-db v0.8.0 h1:vUMDaH3ApkX8m0KZvOFFy9b5DZHBAjsnEuo9AKVZpjo= github.com/cometbft/cometbft-db v0.8.0/go.mod h1:6ASCP4pfhmrCBpfk01/9E1SI29nD3HfVHrY4PG8x5c0= +github.com/confio/ics23/go v0.0.0-20200817220745-f173e6211efb/go.mod h1:E45NqnlpxGnpfTWL/xauN7MRwEE28T4Dd4uraToOaKg= +github.com/confio/ics23/go v0.6.3/go.mod h1:E45NqnlpxGnpfTWL/xauN7MRwEE28T4Dd4uraToOaKg= +github.com/confio/ics23/go v0.6.6/go.mod h1:E45NqnlpxGnpfTWL/xauN7MRwEE28T4Dd4uraToOaKg= +github.com/confio/ics23/go v0.7.0/go.mod h1:E45NqnlpxGnpfTWL/xauN7MRwEE28T4Dd4uraToOaKg= github.com/confio/ics23/go v0.9.0 h1:cWs+wdbS2KRPZezoaaj+qBleXgUk5WOQFMP3CQFGTr4= github.com/confio/ics23/go v0.9.0/go.mod h1:4LPZ2NYqnYIVRklaozjNR1FScgDJ2s5Xrp+e/mYVRak= github.com/consensys/bavard v0.1.8-0.20210406032232-f3452dc9b572/go.mod h1:Bpd0/3mZuaj6Sj+PqrmIquiOKy397AKGThQPaGzNXAQ= @@ -762,14 +854,22 @@ github.com/consensys/bavard v0.1.8-0.20210915155054-088da2f7f54a/go.mod h1:9ItSM github.com/consensys/gnark-crypto v0.4.1-0.20210426202927-39ac3d4b3f1f/go.mod h1:815PAHg3wvysy0SyIqanF8gZ0Y1wjk/hrDHD/iT88+Q= github.com/consensys/gnark-crypto v0.5.3 h1:4xLFGZR3NWEH2zy+YzvzHicpToQR8FXFbfLNvpGB+rE= github.com/consensys/gnark-crypto v0.5.3/go.mod h1:hOdPlWQV1gDLp7faZVeg8Y0iEPFaOUnCc4XeCCk96p0= +github.com/containerd/console v1.0.2 h1:Pi6D+aZXM+oUw1czuKgH5IJ+y0jhYcwBJfx5/Ghn9dE= +github.com/containerd/console v1.0.2/go.mod h1:ytZPjGgY2oeTkAONYafi2kSj0aYggsf8acV1PGKCbzQ= github.com/containerd/containerd v1.6.8 h1:h4dOFDwzHmqFEP754PgfgTeVXFnLiRc6kiqC7tplDJs= github.com/containerd/containerd v1.6.8/go.mod h1:By6p5KqPK0/7/CgO/A6t/Gz+CUYUu2zf1hUaaymVXB0= +github.com/containerd/continuity v0.0.0-20190827140505-75bee3e2ccb6/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= +github.com/containerd/continuity v0.1.0/go.mod h1:ICJu0PwR54nI0yPEnJ6jcS+J7CZAUXrLh8lPo2knzsM= github.com/containerd/continuity v0.3.0 h1:nisirsYROK15TAMVukJOUyGJjz4BNQJBVsNvAXZJ/eg= github.com/containerd/continuity v0.3.0/go.mod h1:wJEAIwKOm/pBZuBd0JmeTvnLquTB1Ag8espWhkykbPM= github.com/containerd/typeurl v1.0.2 h1:Chlt8zIieDbzQFzXzAeBEF92KhExuE4p9p92/QmY7aY= github.com/containerd/typeurl v1.0.2/go.mod h1:9trJWW2sRlGub4wZJRTW83VtbOLS6hwcDZXTn6oPz9s= +github.com/coreos/bbolt v1.3.2 h1:wZwiHHUieZCquLkDL0B8UhzreNWsPHooDAG3q34zk0s= +github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.10+incompatible h1:jFneRYjIvLMLhDLCzuTuU4rSJUjRplcJQ7pD7MnhC04= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/etcd v3.3.13+incompatible h1:8F3hqu9fGYLBifCmRCJsicFqDx/D68Rt3q1JMazcgBQ= +github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-etcd v2.0.0+incompatible h1:bXhRBIXoTm9BYHS3gE0TtQuyNZyeEMux2sDi4oo5YOo= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= @@ -777,16 +877,27 @@ github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmf github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7 h1:u9SHYsPQNyt5tgDm3YN7+9dYrpK96E5wFilTFWIDZOM= github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/go-systemd v0.0.0-20190620071333-e64a0ec8b42a h1:W8b4lQ4tFF21aspRGoBuCNV6V2fFJBF+pm1J6OY8Lys= +github.com/coreos/go-systemd v0.0.0-20190620071333-e64a0ec8b42a/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf h1:CAKfRE2YtTUIjjh1bkBtyYFaUT/WmOqsJjgtihT0vMI= github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= +github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f h1:lBNOc5arjvs8E5mO2tbpBpLoyyu8B6e44T7hJy6potg= +github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= +github.com/cosmos/btcutil v1.0.4/go.mod h1:Ffqc8Hn6TJUdDgHBwIZLtrLQC1KdJ9jGJl/TvgUaxbU= github.com/cosmos/btcutil v1.0.5 h1:t+ZFcX77LpKtDBhjucvnOH8C2l2ioGsBNEQ3jef8xFk= github.com/cosmos/btcutil v1.0.5/go.mod h1:IyB7iuqZMJlthe2tkIFL33xPyzbFYP0XVdS8P5lUPis= github.com/cosmos/cosmos-db v0.0.0-20221226095112-f3c38ecb5e32 h1:zlCp9n3uwQieELltZWHRmwPmPaZ8+XoL2Sj+A2YJlr8= github.com/cosmos/cosmos-db v0.0.0-20221226095112-f3c38ecb5e32/go.mod h1:kwMlEC4wWvB48zAShGKVqboJL6w4zCLesaNQ3YLU2BQ= github.com/cosmos/cosmos-proto v1.0.0-beta.2 h1:X3OKvWgK9Gsejo0F1qs5l8Qn6xJV/AzgIWR2wZ8Nua8= github.com/cosmos/cosmos-proto v1.0.0-beta.2/go.mod h1:+XRCLJ14pr5HFEHIUcn51IKXD1Fy3rkEQqt4WqmN4V0= +github.com/cosmos/cosmos-sdk v0.44.2/go.mod h1:fwQJdw+aECatpTvQTo1tSfHEsxACdZYU80QCZUPnHr4= +github.com/cosmos/cosmos-sdk v0.44.3/go.mod h1:bA3+VenaR/l/vDiYzaiwbWvRPWHMBX2jG0ygiFtiBp0= +github.com/cosmos/cosmos-sdk v0.45.1/go.mod h1:XXS/asyCqWNWkx2rW6pSuen+EVcpAFxq6khrhnZgHaQ= +github.com/cosmos/cosmos-sdk v0.45.2-0.20220901181011-06d4a64bf808/go.mod h1:XXS/asyCqWNWkx2rW6pSuen+EVcpAFxq6khrhnZgHaQ= github.com/cosmos/cosmos-sdk v0.47.3 h1:r0hGmZoAzP2D+MaPaFGHwAaTdFQq3pNpHaUp1BsffbM= github.com/cosmos/cosmos-sdk v0.47.3/go.mod h1:c4OfLdAykA9zsj1CqrxBRqXzVz48I++JSvIMPSPcEmk= github.com/cosmos/cosmos-sdk/db v1.0.0-beta.1.0.20220726092710-f848e4300a8a h1:2humuGPw3O5riJVFq/E2FRjF57UrO97W1qJcGVmK+6k= @@ -799,27 +910,36 @@ github.com/cosmos/gogogateway v1.2.0/go.mod h1:iQpLkGWxYcnCdz5iAdLcRBSw3h7NXeOkZ github.com/cosmos/gogoproto v1.4.2/go.mod h1:cLxOsn1ljAHSV527CHOtaIP91kK6cCrZETRBrkzItWU= github.com/cosmos/gogoproto v1.4.10 h1:QH/yT8X+c0F4ZDacDv3z+xE3WU1P1Z3wQoLMBRJoKuI= github.com/cosmos/gogoproto v1.4.10/go.mod h1:3aAZzeRWpAwr+SS/LLkICX2/kDFyaYVzckBDzygIxek= +github.com/cosmos/iavl v0.15.0-rc3.0.20201009144442-230e9bdf52cd/go.mod h1:3xOIaNNX19p0QrX0VqWa6voPRoJRGGYtny+DH8NEPvE= +github.com/cosmos/iavl v0.15.0-rc5/go.mod h1:WqoPL9yPTQ85QBMT45OOUzPxG/U/JcJoN7uMjgxke/I= +github.com/cosmos/iavl v0.15.3/go.mod h1:OLjQiAQ4fGD2KDZooyJG9yz+p2ao2IAYSbke8mVvSA4= +github.com/cosmos/iavl v0.17.1/go.mod h1:7aisPZK8yCpQdy3PMvKeO+bhq1NwDjUwjzxwwROUxFk= +github.com/cosmos/iavl v0.17.3/go.mod h1:prJoErZFABYZGDHka1R6Oay4z9PrNeFFiMKHDAMOi4w= github.com/cosmos/iavl v0.20.0 h1:fTVznVlepH0KK8NyKq8w+U7c2L6jofa27aFX6YGlm38= github.com/cosmos/iavl v0.20.0/go.mod h1:WO7FyvaZJoH65+HFOsDir7xU9FWk2w9cHXNW1XHcl7A= -github.com/cosmos/ibc-go/v7 v7.0.1 h1:NIBNRWjlOoFvFQu1ZlgwkaSeHO5avf4C1YQiWegt8jw= -github.com/cosmos/ibc-go/v7 v7.0.1/go.mod h1:vEaapV6nuLPQlS+g8IKmxMo6auPi0i7HMv1PhViht/E= -github.com/cosmos/ibc-go/v7 v7.1.0 h1:SCLgs7tqVnzdIDO5MRLgovAnc696vTTKl+8qsTu8IMM= -github.com/cosmos/ibc-go/v7 v7.1.0/go.mod h1:7MptlWeIyqmDiuJeRAFqBvXKY8Hybd+rF8vMSmGd2zg= +github.com/cosmos/ibc-go v1.2.2 h1:bs6TZ8Es1kycIu2AHlRZ9dzJ+mveqlLN/0sjWtRH88o= +github.com/cosmos/ibc-go v1.2.2/go.mod h1:XmYjsRFOs6Q9Cz+CSsX21icNoH27vQKb3squgnCOCbs= +github.com/cosmos/ibc-go/v3 v3.0.0 h1:XUNplHVS51Q2gMnTFsFsH9QJ7flsovMamnltKbEgPQ4= +github.com/cosmos/ibc-go/v3 v3.0.0/go.mod h1:Mb+1NXiPOLd+CPFlOC6BKeAUaxXlhuWenMmRiUiSmwY= +github.com/cosmos/ibc-go/v7 v7.2.0 h1:dx0DLUl7rxdyZ8NiT6UsrbzKOJx/w7s+BOaewFRH6cg= +github.com/cosmos/ibc-go/v7 v7.2.0/go.mod h1:OOcjKIRku/j1Xs1RgKK0yvKRrJ5iFuZYMetR1n3yMlc= github.com/cosmos/ics23/go v0.10.0 h1:iXqLLgp2Lp+EdpIuwXTYIQU+AiHj9mOC2X9ab++bZDM= github.com/cosmos/ics23/go v0.10.0/go.mod h1:ZfJSmng/TBNTBkFemHHHj5YY7VAU/MBU980F4VU1NG0= -github.com/cosmos/interchain-security v1.0.1-0.20230612141232-8cd0ca920812 h1:r5sBvbEKLVUNcVpL9jUEC/scgYFhVHAgvc/havsyKuU= -github.com/cosmos/interchain-security v1.0.1-0.20230612141232-8cd0ca920812/go.mod h1:U+0tyC7GQKg4s16Aj2KORdINXkCfm3b3h2ZO85r9bt0= github.com/cosmos/interchain-security/v3 v3.0.0-rc2 h1:bCPsPX8pDRizqRV1i+9gX9RYAeKRBCmVd3C7NC3weTE= github.com/cosmos/interchain-security/v3 v3.0.0-rc2/go.mod h1:HKHw9u4xMm5QJV76A03ORAXB2zisgpcunXZSca8TBdg= github.com/cosmos/keyring v1.2.0 h1:8C1lBP9xhImmIabyXW4c3vFjjLiBdGCmfLUfeZlV1Yo= github.com/cosmos/keyring v1.2.0/go.mod h1:fc+wB5KTk9wQ9sDx0kFXB3A0MaeGHM9AwRStKOQ5vOA= github.com/cosmos/ledger-cosmos-go v0.12.1 h1:sMBxza5p/rNK/06nBSNmsI/WDqI0pVJFVNihy1Y984w= github.com/cosmos/ledger-cosmos-go v0.12.1/go.mod h1:dhO6kj+Y+AHIOgAe4L9HL/6NDdyyth4q238I9yFpD2g= +github.com/cosmos/ledger-go v0.9.2 h1:Nnao/dLwaVTk1Q5U9THldpUMMXU94BOTWPddSmVB6pI= +github.com/cosmos/ledger-go v0.9.2/go.mod h1:oZJ2hHAZROdlHiwTg4t7kP+GKIIkBT+o6c9QWFanOyI= github.com/cosmos/rosetta-sdk-go v0.10.0 h1:E5RhTruuoA7KTIXUcMicL76cffyeoyvNybzUGSKFTcM= github.com/cosmos/rosetta-sdk-go v0.10.0/go.mod h1:SImAZkb96YbwvoRkzSMQB6noNJXFgWl/ENIznEoYQI4= github.com/cpuguy83/go-md2man v1.0.10 h1:BSKMNlYxDvnunlTymqtgONjNnaRV1sTpcovwwjF22jk= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creachadair/taskgroup v0.4.2 h1:jsBLdAJE42asreGss2xZGZ8fJra7WtwnHWeJFxv2Li8= @@ -835,16 +955,23 @@ github.com/curioswitch/go-reassign v0.2.0 h1:G9UZyOcpk/d7Gd6mqYgd8XYWFMw/znxwGDU github.com/curioswitch/go-reassign v0.2.0/go.mod h1:x6OpXuWvgfQaMGks2BZybTngWjT84hqJfKoO8Tt/Roc= github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c h1:/ovYnF02fwL0kvspmy9AuyKg1JhdTRUgPw4nUxd9oZM= github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4= +github.com/cyphar/filepath-securejoin v0.2.2 h1:jCwT2GTP+PY5nBz3c/YL5PAIbusElVrPujOBSCj8xRg= +github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4= +github.com/daixiang0/gci v0.2.9/go.mod h1:+4dZ7TISfSmqfAGv59ePaHfNzgGtIkHAhhdKggP1JAc= github.com/daixiang0/gci v0.8.1 h1:T4xpSC+hmsi4CSyuYfIJdMZAr9o7xZmHpQVygMghGZ4= github.com/daixiang0/gci v0.8.1/go.mod h1:EpVfrztufwVgQRXjnX4zuNinEpLj5OmMjtu/+MB0V0c= +github.com/danieljoos/wincred v1.0.2/go.mod h1:SnuYRW9lp1oJrZX/dXJqr0cPK5gYXqx3EJbmjhLdK9U= +github.com/danieljoos/wincred v1.1.2/go.mod h1:GijpziifJoIBfYh+S7BbkdUTU4LfM+QnGqR5Vl2tAx0= github.com/danieljoos/wincred v1.2.0 h1:ozqKHaLK0W/ii4KVbbvluM91W2H3Sh0BncbUNPS7jLE= github.com/danieljoos/wincred v1.2.0/go.mod h1:FzQLLMKBFdvu+osBrnFODiv32YGwCfx0SkRa/eYHgec= github.com/dave/jennifer v1.2.0 h1:S15ZkFMRoJ36mGAQgWL1tnr0NQJh9rZ8qatseX/VbBc= github.com/dave/jennifer v1.2.0/go.mod h1:fIb+770HOpJ2fmN9EPPKOqm1vMGhB+TwXKMZhrIygKg= +github.com/davecgh/go-spew v0.0.0-20161028175848-04cdfd42973b/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/deckarep/golang-set v0.0.0-20180603214616-504e848d77ea/go.mod h1:93vsz/8Wt4joVM7c2AVqh+YRMiUSc14yDtF28KmMOgQ= github.com/deckarep/golang-set v1.8.0 h1:sk9/l/KqpunDwP7pSjUg0keiOOLEnOBHzykLrsPppp4= github.com/deckarep/golang-set v1.8.0/go.mod h1:5nI87KwE7wgsBU1F4GKAw2Qod7p5kyS383rP6+o6qqo= github.com/decred/dcrd/crypto/blake256 v1.0.0/go.mod h1:sQl2p6Y26YV+ZOcSTP6thNdn47hh8kt6rqSlvmrXFAc= @@ -860,8 +987,12 @@ github.com/deepmap/oapi-codegen v1.8.2 h1:SegyeYGcdi0jLLrpbCMoJxnUUn8GBXHsvr4rbz github.com/deepmap/oapi-codegen v1.8.2/go.mod h1:YLgSKSDv/bZQB7N4ws6luhozi3cEdRktEqrX88CvjIw= github.com/denis-tingaikin/go-header v0.4.3 h1:tEaZKAlqql6SKCY++utLmkPLd6K8IBM20Ha7UVm+mtU= github.com/denis-tingaikin/go-header v0.4.3/go.mod h1:0wOCWuN71D5qIgE2nz9KrKmuYBAC2Mra5RassOIQ2/c= +github.com/denis-tingajkin/go-header v0.4.2 h1:jEeSF4sdv8/3cT/WY8AgDHUoItNSoEZ7qg9dX7pc218= +github.com/denis-tingajkin/go-header v0.4.2/go.mod h1:eLRHAVXzE5atsKAnNRDB90WHCFFnBUn4RN0nRcs1LJA= github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f h1:U5y3Y5UE0w7amNe7Z5G/twsBW0KEalRQXZzf8ufSh9I= github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f/go.mod h1:xH/i4TFMt8koVQZ6WFms69WAsDWr2XsYL3Hkl7jkoLE= +github.com/dgraph-io/badger/v2 v2.2007.1/go.mod h1:26P/7fbL4kUZVEVKLAKXkBXKOydDmM2p1e+NhhnBCAE= +github.com/dgraph-io/badger/v2 v2.2007.2/go.mod h1:26P/7fbL4kUZVEVKLAKXkBXKOydDmM2p1e+NhhnBCAE= github.com/dgraph-io/badger/v2 v2.2007.4 h1:TRWBQg8UrlUhaFdco01nO2uXwzKS7zd+HVdwV/GHc4o= github.com/dgraph-io/badger/v2 v2.2007.4/go.mod h1:vSw/ax2qojzbN6eXHIx6KPKtCSHJN/Uz0X0VPruTIhk= github.com/dgraph-io/ristretto v0.0.3-0.20200630154024-f66de99634de/go.mod h1:KPxhHT9ZxKefz+PCeOGsrHpl1qZ7i70dGTu2u+Ahh6E= @@ -877,6 +1008,7 @@ github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 h1:fAjc9m62+UWV/WA github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954 h1:RMLoZVzv4GliuWafOuPuQDKSm1SJph7uCRnnS61JAn4= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= +github.com/dlclark/regexp2 v1.2.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc= github.com/dlclark/regexp2 v1.4.1-0.20201116162257-a2a8dda75c91 h1:Izz0+t1Z5nI16/II7vuEo/nHjodOg0p7+OiDpjX5t1E= github.com/dlclark/regexp2 v1.4.1-0.20201116162257-a2a8dda75c91/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc= github.com/dnaeon/go-vcr v1.1.0/go.mod h1:M7tiix8f0r6mKKJ3Yq/kqU1OYf3MnfmBWVbPx/yU9ko= @@ -889,8 +1021,10 @@ github.com/docker/docker v20.10.19+incompatible h1:lzEmjivyNHFHMNAFLXORMBXyGIhw/ github.com/docker/docker v20.10.19+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= +github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= +github.com/dop251/goja v0.0.0-20200721192441-a695b0cdd498/go.mod h1:Mw6PkjjMXWbTj+nnj4s3QPXq1jaT0s5pC0iFD4+BOAA= github.com/dop251/goja v0.0.0-20211011172007-d99e4b8cbf48 h1:iZOop7pqsg+56twTopWgwCGxdB5SI2yDO8Ti7eTRliQ= github.com/dop251/goja v0.0.0-20211011172007-d99e4b8cbf48/go.mod h1:R9ET47fwRVRPZnOGvHxxhuZcbrMCuiqOz3Rlrh4KSnk= github.com/dop251/goja_nodejs v0.0.0-20210225215109-d91c329300e7 h1:tYwu/z8Y0NkkzGEh3z21mSWggMg4LwLRFucLS7TjARg= @@ -899,8 +1033,11 @@ github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:Htrtb github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= +github.com/dvsekhvalnov/jose2go v0.0.0-20200901110807-248326c1351b/go.mod h1:7BvyPhdbLxMXIYTFPLsyJRFMsKmOZnQmzh6Gb+uquuM= github.com/dvsekhvalnov/jose2go v1.5.0 h1:3j8ya4Z4kMCwT5nXIKFSV84YS+HdqSSO0VsTQxaLAeM= github.com/dvsekhvalnov/jose2go v1.5.0/go.mod h1:QsHjhyTlD/lAVqn/NSbVZmSCGeDehTB/mPZadG+mhXU= +github.com/dvyukov/go-fuzz v0.0.0-20200318091601-be3528f3a813 h1:NgO45/5mBLRVfiXerEFzH6ikcZ7DNRPS639xFg3ENzU= +github.com/dvyukov/go-fuzz v0.0.0-20200318091601-be3528f3a813/go.mod h1:11Gm+ccJnvAhCNLlf5+cS9KjtbaD5I5zaZpFMsTHWTw= github.com/eapache/go-resiliency v1.1.0 h1:1NtRmCAqadE2FN4ZcN6g90TP3uk8cg9rn9eNK2197aU= github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 h1:YEetp8/yCZMuEPMUDHG0CW/brkkEp8mzqk2+ODEitlw= @@ -909,10 +1046,13 @@ github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc= github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= github.com/eclipse/paho.mqtt.golang v1.2.0 h1:1F8mhG9+aO5/xpdtFkW4SxOJB67ukuDC3t2y2qayIX0= github.com/eclipse/paho.mqtt.golang v1.2.0/go.mod h1:H9keYFcgq3Qr5OUJm/JZI/i6U7joQ8SYLhZwfeOo6Ts= +github.com/edsrzf/mmap-go v0.0.0-20160512033002-935e0e8a636c/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= github.com/edsrzf/mmap-go v1.0.0 h1:CEBF7HpRnUCSJgGUb5h1Gm7e3VkmVDrR8lvWVLtrOFw= github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc= github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ= +github.com/enigmampc/btcutil v1.0.3-0.20200723161021-e2fb6adb2a25 h1:2vLKys4RBU4pn2T/hjXMbvwTr1Cvy5THHrQkbeY9HRk= +github.com/enigmampc/btcutil v1.0.3-0.20200723161021-e2fb6adb2a25/go.mod h1:hTr8+TLQmkUkgcuh3mcr5fjrT9c64ZzsBCdCEC6UppY= github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= @@ -922,25 +1062,36 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.m github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= +github.com/envoyproxy/go-control-plane v0.10.1/go.mod h1:AY7fTTXNdv/aJ2O5jwpxAPOWUZ7hQAEvzN5Pf27BkQQ= github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= github.com/envoyproxy/go-control-plane v0.11.0 h1:jtLewhRR2vMRNnq2ZZUoCjUlgut+Y0+sDDWPOfwOi1o= github.com/envoyproxy/go-control-plane v0.11.0/go.mod h1:VnHyVMpzcLvCFt9yUz1UnCwHLhwx1WguiVDV7pTG/tI= +github.com/envoyproxy/protoc-gen-validate v0.0.14/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/envoyproxy/protoc-gen-validate v0.6.2/go.mod h1:2t7qjJNvHPx8IjnBOzl9E9/baC+qXE/TeeyBRzgJDws= github.com/envoyproxy/protoc-gen-validate v0.10.0 h1:oIfnZFdC0YhpNNEX+SuIqko4cqqVZeN9IGTrhZje83Y= github.com/envoyproxy/protoc-gen-validate v0.10.0/go.mod h1:DRjgyB0I43LtJapqN6NiRwroiAU2PaFuvk/vjgh61ss= +github.com/esimonov/ifshort v1.0.2/go.mod h1:yZqNJUrNn20K8Q9n2CrjTKYyVEmX209Hgu+M1LBpeZE= github.com/esimonov/ifshort v1.0.4 h1:6SID4yGWfRae/M7hkVDVVyppy8q/v9OuxNdmjLQStBA= github.com/esimonov/ifshort v1.0.4/go.mod h1:Pe8zjlRrJ80+q2CxHLfEOfTwxCZ4O+MuhcHcfgNWTk0= +github.com/ethereum/go-ethereum v1.9.25/go.mod h1:vMkFiYLHI4tgPw4k2j4MHKoovchFE8plZ0M9VMk4/oM= github.com/ethereum/go-ethereum v1.10.17 h1:XEcumY+qSr1cZQaWsQs5Kck3FHB0V2RiMHPdTBJ+oT8= github.com/ethereum/go-ethereum v1.10.17/go.mod h1:Lt5WzjM07XlXc95YzrhosmR4J9Ahd6X2wyEV2SvGhk0= github.com/ettle/strcase v0.1.1 h1:htFueZyVeE1XNnMEfbqp5r67qAN/4r6ya1ysq8Q+Zcw= github.com/ettle/strcase v0.1.1/go.mod h1:hzDLsPC7/lwKyBOywSHEP89nt2pDgdy+No1NBA9o9VY= +github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51/go.mod h1:Yg+htXGokKKdzcwhuNDwVvN+uBxDGXJ7G/VN1d8fa64= github.com/facebookgo/ensure v0.0.0-20200202191622-63f1cf65ac4c h1:8ISkoahWXwZR41ois5lSJBSVw4D0OV19Ht/JSTzvSv0= github.com/facebookgo/ensure v0.0.0-20200202191622-63f1cf65ac4c/go.mod h1:Yg+htXGokKKdzcwhuNDwVvN+uBxDGXJ7G/VN1d8fa64= github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 h1:JWuenKqqX8nojtoVVWjGfOF9635RETekkoH6Cc9SX0A= github.com/facebookgo/stack v0.0.0-20160209184415-751773369052/go.mod h1:UbMTZqLaRiH3MsBH8va0n7s1pQYcu3uTb8G4tygF4Zg= +github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870/go.mod h1:5tD+neXqOorC30/tWg0LCSkrqj/AR6gu8yY8/fpw1q0= github.com/facebookgo/subset v0.0.0-20200203212716-c811ad88dec4 h1:7HZCaLC5+BZpmbhCOZJ293Lz68O7PYrF2EzeiFMwCLk= github.com/facebookgo/subset v0.0.0-20200203212716-c811ad88dec4/go.mod h1:5tD+neXqOorC30/tWg0LCSkrqj/AR6gu8yY8/fpw1q0= +github.com/fatih/color v1.3.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= +github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= +github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= +github.com/fatih/color v1.12.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/fatih/structtag v1.2.0 h1:/OdNE99OxoI/PqaW/SuSK9uxxT3f/tcSZgon/ssNSx4= @@ -950,6 +1101,7 @@ github.com/felixge/httpsnoop v1.0.2 h1:+nS9g82KMXccJ/wp0zyRW9ZBHFETmMGtkk+2CTTrW github.com/felixge/httpsnoop v1.0.2/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/firefart/nonamedreturns v1.0.4 h1:abzI1p7mAEPYuR4A+VLKn4eNDOycjYo2phmY9sfv40Y= github.com/firefart/nonamedreturns v1.0.4/go.mod h1:TDhe/tjI1BXo48CmYbUduTV7BdIga8MAO/xbKdcVsGI= +github.com/fjl/memsize v0.0.0-20180418122429-ca190fb6ffbc/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 h1:FtmdgXiUlNeRsoNMFlKLDt+S+6hbjVMEW6RGQ7aUf7c= github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90 h1:WXb3TSNmHp2vHoCroCIB1foO/yQ36swABL8aOVeDpgg= @@ -960,12 +1112,17 @@ github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db h1:gb2Z18BhTPJPpLQW github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4= github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8 h1:a9ENSRDFBUPkJ5lCgVZh26+ZbGyoVJG7yb5SSzF5H54= github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20= +github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k= github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY= github.com/frankban/quicktest v1.14.4/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= +github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU= github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= +github.com/fullstorydev/grpcurl v1.6.0 h1:p8BB6VZF8O7w6MxGr3KJ9E6EVKaswCevSALK6FBtMzA= +github.com/fullstorydev/grpcurl v1.6.0/go.mod h1:ZQ+ayqbKMJNhzLmbpCiurTVlaK2M/3nqZCxaQ2Ze/sM= +github.com/fzipp/gocyclo v0.3.1/go.mod h1:DJHO6AUmbdqj2ET4Z9iArSuwWgYDRryYt2wASxc7x3E= github.com/fzipp/gocyclo v0.6.0 h1:lsblElZG7d3ALtGMx9fmxeTKZaLLpU8mET09yN4BBLo= github.com/fzipp/gocyclo v0.6.0/go.mod h1:rXPyn8fnlpa0R2csP/31uerbiVBugk5whMdlyaLkLoA= github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff h1:tY80oXqGNY4FhTFhk+o9oFHGINQ/+vhlm8HFzi6znCI= @@ -981,8 +1138,8 @@ github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= github.com/gin-gonic/gin v1.6.3 h1:ahKqKTFpO5KTPHxWZjEdPScmYaGtLo8Y4DMHoEsnp14= github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M= -github.com/gin-gonic/gin v1.8.1 h1:4+fr/el88TOO3ewCmQr8cx/CtZ/umlIRIs5M4NTNjf8= -github.com/gin-gonic/gin v1.8.1/go.mod h1:ji8BvRH1azfM+SYow9zQ6SZMvR8qOMZHmsCuWR9tTTk= +github.com/gin-gonic/gin v1.7.0 h1:jGB9xAJQ12AIGNB4HguylppmDK1Am9ppF7XnGXXJuoU= +github.com/gin-gonic/gin v1.7.0/go.mod h1:jD2toBW3GZUr5UMcdrwQA10I7RuaFOl/SGeDjXkfUtY= github.com/glycerine/go-unsnap-stream v0.0.0-20180323001048-9f0cb55181dd h1:r04MMPyLHj/QwZuMJ5+7tJcBr1AQjpiAK/rZWRrQT7o= github.com/glycerine/go-unsnap-stream v0.0.0-20180323001048-9f0cb55181dd/go.mod h1:/20jfyN9Y5QPEAprSgKAUr+glWDY39ZiUEAYOEv5dsE= github.com/glycerine/goconvey v0.0.0-20190410193231-58a59202ab31 h1:gclg6gY70GLy3PbkQ1AERPfmLMMagS60DKF78eWwLn8= @@ -990,6 +1147,7 @@ github.com/glycerine/goconvey v0.0.0-20190410193231-58a59202ab31/go.mod h1:Ogl1T github.com/go-chi/chi/v5 v5.0.0/go.mod h1:BBug9lr0cqtdAhsu6R4AAdvufI0/XBzAQSsUqJpoZOs= github.com/go-chi/chi/v5 v5.0.7 h1:rDTPXLDHGATaeHvVlLcR4Qe0zftYethFucbjVQ1PxU8= github.com/go-chi/chi/v5 v5.0.7/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= +github.com/go-critic/go-critic v0.5.6/go.mod h1:cVjj0DfqewQVIlIAGexPCaGaZDAqGE29PYDDADIVNEo= github.com/go-critic/go-critic v0.6.5 h1:fDaR/5GWURljXwF8Eh31T2GZNz9X4jeboS912mWF8Uo= github.com/go-critic/go-critic v0.6.5/go.mod h1:ezfP/Lh7MA6dBNn4c6ab5ALv3sKnZVLx37tr00uuaOY= github.com/go-git/gcfg v1.5.0 h1:Q5ViNfGF8zFgyJWPqYwA7qGFoMTEiBmdlkcfRmpIMa4= @@ -1022,6 +1180,8 @@ github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-ole/go-ole v1.2.1 h1:2lOsA72HgjxAuMlKpFiCbHTvu44PIVkZ5hqm3RSdI/E= github.com/go-ole/go-ole v1.2.1/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dTyBNF8= +github.com/go-ole/go-ole v1.2.5 h1:t4MGB5xEDZvXI+0rMjjsfBsD7yAgp/s9ZDkL1JndXwY= +github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY= github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY= @@ -1036,27 +1196,41 @@ github.com/go-playground/universal-translator v0.18.0 h1:82dyy6p4OuJq4/CByFNOn/j github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA= github.com/go-playground/validator/v10 v10.2.0 h1:KgJ0snyC2R9VXYN2rneOtQcw5aHQB1Vv0sFl1UcHBOY= github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI= -github.com/go-playground/validator/v10 v10.11.1 h1:prmOlTVv+YjZjmRmNSF3VmspqJIxJWXmqUsHwfTRRkQ= -github.com/go-playground/validator/v10 v10.11.1/go.mod h1:i+3WkQ1FvaUjjxh1kSvIA4dMGDBiPU55YFDl0WbKdWU= +github.com/go-playground/validator/v10 v10.4.1 h1:pH2c5ADXtd66mxoE0Zm9SUhxE20r7aM3F26W0hOn+GE= +github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4= +github.com/go-redis/redis v6.15.8+incompatible h1:BKZuG6mCnRj5AOaWJXoCgf6rqTYnYJLe4en2hxT7r9o= +github.com/go-redis/redis v6.15.8+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA= +github.com/go-sourcemap/sourcemap v2.1.2+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg= github.com/go-sourcemap/sourcemap v2.1.3+incompatible h1:W1iEw64niKVGogNgBN3ePyLFfuisuzeidWPMPWmECqU= github.com/go-sourcemap/sourcemap v2.1.3+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg= github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-sql-driver/mysql v1.4.1 h1:g24URVg0OFbNUTx9qqY1IRZ9D9z3iPyi5zKhQZpNwpA= github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= +github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs= +github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I= +github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/go-toolsmith/astcast v1.0.0 h1:JojxlmI6STnFVG9yOImLeGREv8W2ocNUM+iOhR6jE7g= github.com/go-toolsmith/astcast v1.0.0/go.mod h1:mt2OdQTeAQcY4DQgPSArJjHCcOwlX+Wl/kwN+LbLGQ4= +github.com/go-toolsmith/astcopy v1.0.0/go.mod h1:vrgyG+5Bxrnz4MZWPF+pI4R8h3qKRjjyvV/DSez4WVQ= github.com/go-toolsmith/astcopy v1.0.2 h1:YnWf5Rnh1hUudj11kei53kI57quN/VH6Hp1n+erozn0= github.com/go-toolsmith/astcopy v1.0.2/go.mod h1:4TcEdbElGc9twQEYpVo/aieIXfHhiuLh4aLAck6dO7Y= +github.com/go-toolsmith/astequal v1.0.0/go.mod h1:H+xSiq0+LtiDC11+h1G32h7Of5O3CYFJ99GVbS5lDKY= github.com/go-toolsmith/astequal v1.0.3 h1:+LVdyRatFS+XO78SGV4I3TCEA0AC7fKEGma+fH+674o= github.com/go-toolsmith/astequal v1.0.3/go.mod h1:9Ai4UglvtR+4up+bAD4+hCj7iTo4m/OXVTSLnCyTAx4= github.com/go-toolsmith/astfmt v1.0.0 h1:A0vDDXt+vsvLEdbMFJAUBI/uTbRw1ffOPnxsILnFL6k= github.com/go-toolsmith/astfmt v1.0.0/go.mod h1:cnWmsOAuq4jJY6Ct5YWlVLmcmLMn1JUPuQIHCY7CJDw= +github.com/go-toolsmith/astinfo v0.0.0-20180906194353-9809ff7efb21 h1:wP6mXeB2V/d1P1K7bZ5vDUO3YqEzcvOREOxZPEu3gVI= +github.com/go-toolsmith/astinfo v0.0.0-20180906194353-9809ff7efb21/go.mod h1:dDStQCHtmZpYOmjRP/8gHHnCCch3Zz3oEgCdZVdtweU= github.com/go-toolsmith/astp v1.0.0 h1:alXE75TXgcmupDsMK1fRAy0YUzLzqPVvBKoyWV+KPXg= github.com/go-toolsmith/astp v1.0.0/go.mod h1:RSyrtpVlfTFGDYRbrjyWP1pYu//tSFcvdYrA8meBmLI= +github.com/go-toolsmith/pkgload v1.0.0 h1:4DFWWMXVfbcN5So1sBNW9+yeiMqLFGl1wFLTL5R0Tgg= +github.com/go-toolsmith/pkgload v1.0.0/go.mod h1:5eFArkbO80v7Z0kdngIxsRXRMTaX4Ilcwuh3clNrQJc= github.com/go-toolsmith/strparse v1.0.0 h1:Vcw78DnpCAKlM20kSbAyO4mPfJn/lyYA4BJUDxe2Jb4= github.com/go-toolsmith/strparse v1.0.0/go.mod h1:YI2nUKP9YGZnL/L1/DLFBfixrcjslWct4wyljWhSRy8= +github.com/go-toolsmith/typep v1.0.0/go.mod h1:JSQCQMUPdRlMZFswiq3TGpNp1GMktqkR2Ns5AIQkATU= github.com/go-toolsmith/typep v1.0.2 h1:8xdsa1+FSIH/RhEkgnD1j2CJOy5mNllW1Q9tRiYwvlk= github.com/go-toolsmith/typep v1.0.2/go.mod h1:JSQCQMUPdRlMZFswiq3TGpNp1GMktqkR2Ns5AIQkATU= github.com/go-xmlfmt/xmlfmt v0.0.0-20191208150333-d5b6f63a941b h1:khEcpUM4yFcxg4/FHQWkvVRmgijNXRfzkIDHh23ggEo= @@ -1071,8 +1245,6 @@ github.com/gobwas/pool v0.2.0 h1:QEmUOlnSjWtnpRGHF3SauEiOsy82Cup83Vf2LcMlnc8= github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= github.com/gobwas/ws v1.0.2 h1:CoAavW/wd/kulfZmSIBt6p24n4j7tHgNVCjsfHVNUbo= github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM= -github.com/goccy/go-json v0.9.11 h1:/pAaQDLHEoCq/5FFmSKBswWmK6H0e8g4159Kc/X/nqk= -github.com/goccy/go-json v0.9.11/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 h1:ZpnhV/YsD2/4cESfV5+Hoeu/iUR3ruzNvZ+yQfO03a0= github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4= github.com/godbus/dbus/v5 v5.0.4 h1:9349emZab16e7zQvpmsbtjc18ykshndd8y2PG3sgJbA= @@ -1082,6 +1254,8 @@ github.com/gofrs/flock v0.8.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14j github.com/gofrs/uuid v3.3.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gofrs/uuid v4.3.0+incompatible h1:CaSVZxm5B+7o45rtab4jC2G37WGYX1zQfuU2i6DSvnc= github.com/gofrs/uuid v4.3.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= +github.com/gogo/gateway v1.1.0 h1:u0SuhL9+Il+UbjM9VIE3ntfRujKbvVpFvNB4HbjeVQ0= +github.com/gogo/gateway v1.1.0/go.mod h1:S7rR8FRQyG3QFESeSv4l2WnsyzlCLG0CzBbUUo/mbic= github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= github.com/gogo/googleapis v1.4.1-0.20201022092350-68b0159b7869/go.mod h1:5YRNX2z1oM5gXdAkurHa942MDgEJyk02w4OecKY87+c= github.com/gogo/googleapis v1.4.1 h1:1Yx4Myt7BxzvUr5ldGSbwYiZG6t9wGBZ+8/fX3Wvtq0= @@ -1096,6 +1270,7 @@ github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfU github.com/golang/glog v1.1.1 h1:jxpi2eWoU84wbX9iIEyAeeoac3FLuifZpY9tcNUD9kw= github.com/golang/glog v1.1.1/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/rLQ= github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -1111,6 +1286,7 @@ github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71 github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= +github.com/golang/protobuf v1.1.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.0/go.mod h1:Qd/q+1AKNOZr9uGQzbzCmRO6sUih6GTPZv6a1/R87v0= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -1132,6 +1308,8 @@ github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiu github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/golang/snappy v0.0.3-0.20201103224600-674baa8c7fc3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= @@ -1139,10 +1317,13 @@ github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 h1:23T5iq8rbUYlhpt5 github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2/go.mod h1:k9Qvh+8juN+UKMCS/3jFtGICgW8O96FVaZsaxdzDkR4= github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a h1:w8hkcTqaFpzKqonE9uMCefW1WDie15eSP/4MssdenaM= github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a/go.mod h1:ryS0uhF+x9jgbj/N71xsEqODy9BN81/GonCZiOzirOk= +github.com/golangci/go-misc v0.0.0-20180628070357-927a3d87b613/go.mod h1:SyvUF2NxV+sN8upjjeVYr5W7tyxaT1JVtvhKhOn2ii8= github.com/golangci/go-misc v0.0.0-20220329215616-d24fe342adfe h1:6RGUuS7EGotKx6J5HIP8ZtyMdiDscjMLfRBSPuzVVeo= github.com/golangci/go-misc v0.0.0-20220329215616-d24fe342adfe/go.mod h1:gjqyPShc/m8pEMpk0a3SeagVb0kaqvhscv+i9jI5ZhQ= +github.com/golangci/gofmt v0.0.0-20190930125516-244bba706f1a/go.mod h1:9qCChq59u/eW8im404Q2WWTrnBUQKjpNYKMbU4M7EFU= github.com/golangci/gofmt v0.0.0-20220901101216-f2edd75033f2 h1:amWTbTGqOZ71ruzrdA+Nx5WA3tV1N0goTspwmKCQvBY= github.com/golangci/gofmt v0.0.0-20220901101216-f2edd75033f2/go.mod h1:9wOXstvyDRshQ9LggQuzBCGysxs3b6Uo/1MvYCR2NMs= +github.com/golangci/golangci-lint v1.42.1/go.mod h1:MuInrVlgg2jq4do6XI1jbkErbVHVbwdrLLtGv6p2wPI= github.com/golangci/golangci-lint v1.50.1 h1:C829clMcZXEORakZlwpk7M4iDw2XiwxxKaG504SZ9zY= github.com/golangci/golangci-lint v1.50.1/go.mod h1:AQjHBopYS//oB8xs0y0M/dtxdKHkdhl0RvmjUct0/4w= github.com/golangci/lint-1 v0.0.0-20181222135242-d2cdd8c08219/go.mod h1:/X8TswGSh1pIozq4ZwCfxS0WA5JGXguxk94ar/4c87Y= @@ -1152,6 +1333,7 @@ github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca h1:kNY3/svz5T29M github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca/go.mod h1:tvlJhZqDe4LMs4ZHD0oMUlt9G2LWuDGoisJTBzLMV9o= github.com/golangci/misspell v0.3.5 h1:pLzmVdl3VxTOncgzHcvLOKirdvcx/TydsClUQXTehjo= github.com/golangci/misspell v0.3.5/go.mod h1:dEbvlSfYbMQDtrpRMQU675gSDLDNa8sCPPChZ7PhiVA= +github.com/golangci/revgrep v0.0.0-20210208091834-cd28932614b5/go.mod h1:LK+zW4MpyytAWQRz0M4xnzEk50lSvqDQKfx304apFkY= github.com/golangci/revgrep v0.0.0-20220804021717-745bb2f7c2e6 h1:DIPQnGy2Gv2FSA4B/hh8Q7xx3B7AIDk3DAMeHclH1vQ= github.com/golangci/revgrep v0.0.0-20220804021717-745bb2f7c2e6/go.mod h1:0AKcRCkMoKvUvlf89F6O7H2LYdhr1zBh736mBItOdRs= github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4 h1:zwtduBRr5SSWhqsYNgcuWO2kFlpdOZbP0+yRjmvPGys= @@ -1160,6 +1342,9 @@ github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Z github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU= github.com/google/btree v1.1.2/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4= +github.com/google/certificate-transparency-go v1.0.21/go.mod h1:QeJfpSbVSfYc7RgB3gJFj9cbuQMMchQxrWXz8Ruopmg= +github.com/google/certificate-transparency-go v1.1.1 h1:6JHXZhXEvilMcTjR4MGZn5KV0IRkcFl4CJx5iHVhjFE= +github.com/google/certificate-transparency-go v1.1.1/go.mod h1:FDKqPvSXawb2ecErVRrD+nfy23RCzyl7eqVCEmlT1Zs= github.com/google/flatbuffers v1.11.0 h1:O7CEyB8Cb3/DmtxODGtLHcEvpr81Jm5qLg/hsHnxA2A= github.com/google/flatbuffers v1.11.0/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= @@ -1198,6 +1383,7 @@ github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200507031123-427632fa3b1c/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= @@ -1212,6 +1398,9 @@ github.com/google/renameio v0.1.0 h1:GOZbcHa3HfsPKPlmyPyN2KEohoMXOhdMbHrvbpl2QaA github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/s2a-go v0.1.3 h1:FAgZmpLl/SXurPEZyCMPBIiiYeTbqfjlbdnCNTAkbGE= github.com/google/s2a-go v0.1.3/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= +github.com/google/trillian v1.3.11 h1:pPzJPkK06mvXId1LHEAJxIegGgHzzp/FUnycPYfoCMI= +github.com/google/trillian v1.3.11/go.mod h1:0tPraVHrSDkA3BO6vKX67zgLXs6SsOAbHEivX+9mPgw= +github.com/google/uuid v0.0.0-20161128191214-064e2069ce9c/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -1238,10 +1427,16 @@ github.com/googleapis/go-type-adapters v1.0.0 h1:9XdMn+d/G57qq1s8dNc5IesGCXHf6V2 github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4= github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8 h1:tlyzajkF3030q6M8SvmJSemC9DTHL/xaMa18b65+JM4= github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= +github.com/gookit/color v1.4.2 h1:tXy44JFSFkKnELV6WaMo/lLfu/meqITX3iAV52do7lk= +github.com/gookit/color v1.4.2/go.mod h1:fqRyamkC1W8uxl+lxCQxOT09l/vYfZ+QeiX3rKQHCoQ= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gordonklaus/ineffassign v0.0.0-20200309095847-7953dde2c7bf/go.mod h1:cuNKsD1zp2v6XfE/orVX2QE1LC+i254ceGcVeDT3pTU= +github.com/gordonklaus/ineffassign v0.0.0-20210225214923-2e10b2664254/go.mod h1:M9mZEtGIsR1oDaZagNPNG9iq9n2HrhZ17dsXk73V3Lw= github.com/gordonklaus/ineffassign v0.0.0-20210914165742-4cc7213b9bc8 h1:PVRE9d4AQKmbelZ7emNig1+NT27DUmKZn5qXxfio54U= github.com/gordonklaus/ineffassign v0.0.0-20210914165742-4cc7213b9bc8/go.mod h1:Qcp2HIAYhR7mNUVSIxZww3Guk4it82ghYcEXIAk+QT0= +github.com/gorhill/cronexpr v0.0.0-20180427100037-88b0669f7d75 h1:f0n1xnMSmBLzVfsMMvriDyA75NB/oBgILX2GcHXIQzY= +github.com/gorhill/cronexpr v0.0.0-20180427100037-88b0669f7d75/go.mod h1:g2644b03hfBX9Ov0ZBDgXXens4rxSxmqFBbhvKv2yVA= github.com/gorilla/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8= github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= github.com/gorilla/handlers v1.5.1 h1:9lRY6j8DEeeBT10CvO9hGW0gmky0BprnvDI5vfhUHH4= @@ -1251,29 +1446,48 @@ github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2z github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= +github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= +github.com/gorilla/websocket v1.4.1-0.20190629185528-ae1634f6a989/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gostaticanalysis/analysisutil v0.0.0-20190318220348-4088753ea4d3/go.mod h1:eEOZF4jCKGi+aprrirO9e7WKB3beBRtWgqGunKl6pKE= +github.com/gostaticanalysis/analysisutil v0.0.3/go.mod h1:eEOZF4jCKGi+aprrirO9e7WKB3beBRtWgqGunKl6pKE= +github.com/gostaticanalysis/analysisutil v0.1.0/go.mod h1:dMhHRU9KTiDcuLGdy87/2gTR8WruwYZrKdRq9m1O6uw= +github.com/gostaticanalysis/analysisutil v0.4.1/go.mod h1:18U/DLpRgIUd459wGxVHE0fRgmo1UgHDcbw7F5idXu0= github.com/gostaticanalysis/analysisutil v0.7.1 h1:ZMCjoue3DtDWQ5WyU16YbjbQEQ3VuzwxALrpYd+HeKk= github.com/gostaticanalysis/analysisutil v0.7.1/go.mod h1:v21E3hY37WKMGSnbsw2S/ojApNWb6C1//mXO48CXbVc= +github.com/gostaticanalysis/comment v1.3.0/go.mod h1:xMicKDx7XRXYdVwY9f9wQpDJVnqWxw9wCauCMKp+IBI= +github.com/gostaticanalysis/comment v1.4.1/go.mod h1:ih6ZxzTHLdadaiSnF5WY3dxUoXfXAlTaRzuaNDlSado= github.com/gostaticanalysis/comment v1.4.2 h1:hlnx5+S2fY9Zo9ePo4AhgYsYHbM2+eAv8m/s1JiCd6Q= github.com/gostaticanalysis/comment v1.4.2/go.mod h1:KLUTGDv6HOCotCH8h2erHKmpci2ZoR8VPu34YA2uzdM= +github.com/gostaticanalysis/forcetypeassert v0.0.0-20200621232751-01d4955beaa5/go.mod h1:qZEedyP/sY1lTGV1uJ3VhWZ2mqag3IkWsDHVbplHXak= github.com/gostaticanalysis/forcetypeassert v0.1.0 h1:6eUflI3DiGusXGK6X7cCcIgVCpZ2CiZ1Q7jl6ZxNV70= github.com/gostaticanalysis/forcetypeassert v0.1.0/go.mod h1:qZEedyP/sY1lTGV1uJ3VhWZ2mqag3IkWsDHVbplHXak= github.com/gostaticanalysis/nilerr v0.1.1 h1:ThE+hJP0fEp4zWLkWHWcRyI2Od0p7DlgYG3Uqrmrcpk= github.com/gostaticanalysis/nilerr v0.1.1/go.mod h1:wZYb6YI5YAxxq0i1+VJbY0s2YONW0HU0GPE3+5PWN4A= github.com/gotestyourself/gotestyourself v2.2.0+incompatible h1:AQwinXlbQR2HvPjQZOmDhRqsv5mZf+Jb1RnSLxcqZcI= github.com/gotestyourself/gotestyourself v2.2.0+incompatible/go.mod h1:zZKM6oeNM8k+FRljX1mnzVYeS8wiGgQyvST1/GafPbY= +github.com/graph-gophers/graphql-go v0.0.0-20191115155744-f33e81362277/go.mod h1:9CQHMSxwO4MprSdzoIEobiHpoLtHm77vfxsvsIN5Vuc= github.com/graph-gophers/graphql-go v1.3.0 h1:Eb9x/q6MFpCLz7jBCiP/WTxjSDrYLR1QY41SORZyNJ0= github.com/graph-gophers/graphql-go v1.3.0/go.mod h1:9CQHMSxwO4MprSdzoIEobiHpoLtHm77vfxsvsIN5Vuc= +github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 h1:+ngKgrYPPJrOjhax5N+uePQ0Fh1Z7PheYoUI/0nzkPA= +github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= +github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= +github.com/grpc-ecosystem/go-grpc-middleware v1.2.1/go.mod h1:EaizFBKfUKtMIF5iaDEhniwNedqGo9FuLFzppDr3uwI= github.com/grpc-ecosystem/go-grpc-middleware v1.2.2/go.mod h1:EaizFBKfUKtMIF5iaDEhniwNedqGo9FuLFzppDr3uwI= +github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y= github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 h1:UH//fgunKIs4JdUbpDl1VZCDaL56wXCB/5+wF6uHfaI= github.com/grpc-ecosystem/go-grpc-middleware v1.4.0/go.mod h1:g5qyo/la0ALbONm6Vbp88Yd8NsDy6rZz+RcrMPxvld8= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= +github.com/grpc-ecosystem/grpc-gateway v1.8.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/grpc-ecosystem/grpc-gateway v1.12.1/go.mod h1:8XEsbTttt/W+VvjtQhLACqCisSPWTxCZ7sBRjU6iH9c= +github.com/grpc-ecosystem/grpc-gateway v1.14.7/go.mod h1:oYZKL012gGh6LMyg/xA7Q2yq6j8bu0wa+9w14EEthWU= github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms= @@ -1285,11 +1499,17 @@ github.com/gtank/merlin v0.1.1 h1:eQ90iG7K9pOhtereWsmyRJ6RAwcP4tHTDBHXNg+u5is= github.com/gtank/merlin v0.1.1/go.mod h1:T86dnYJhcGOh5BjZFCJWTDeTK7XW8uE+E21Cy/bIQ+s= github.com/gtank/ristretto255 v0.1.2 h1:JEqUCPA1NvLq5DwYtuzigd7ss8fwbYay9fi4/5uMzcc= github.com/gtank/ristretto255 v0.1.2/go.mod h1:Ph5OpO6c7xKUGROZfWVLiJf9icMDwUeIvY4OmlYW69o= +github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE= +github.com/hashicorp/consul/api v1.11.0/go.mod h1:XjsvQN+RJGWI2TWy1/kqaE16HrR2J/FWgkYjdZQsX9M= +github.com/hashicorp/consul/api v1.12.0/go.mod h1:6pVBMo0ebnYdt2S3H87XhekM/HHrUoTD2XXb/VrZVy0= github.com/hashicorp/consul/api v1.20.0 h1:9IHTjNVSZ7MIwjlW3N3a7iGiykCMDpxZu8jsxFJh0yc= github.com/hashicorp/consul/api v1.20.0/go.mod h1:nR64eD44KQ59Of/ECwt2vUmIK2DKsDzAwTmwmLl8Wpo= +github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= github.com/hashicorp/consul/sdk v0.3.0 h1:UOxjlb4xVNF93jak1mzzoBatyFju9nrkxpVwIp/QqxQ= github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= +github.com/hashicorp/consul/sdk v0.8.0 h1:OJtKBtEjboEZvG6AOUdh4Z1Zbyu0WcxQ0qatRrZHTVU= +github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -1301,6 +1521,8 @@ github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9n github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= github.com/hashicorp/go-getter v1.7.1 h1:SWiSWN/42qdpR0MdhaOc/bLR48PLuP1ZQtYLRlM69uY= github.com/hashicorp/go-getter v1.7.1/go.mod h1:W7TalhMmbPmsSMdNjD0ZskARur/9GJ17cfHTRtXV744= +github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= +github.com/hashicorp/go-hclog v1.0.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= github.com/hashicorp/go-hclog v1.2.0 h1:La19f8d7WIlm4ogzNHB0JGqs5AUDAZ2UfCY4sJXcJdM= github.com/hashicorp/go-hclog v1.2.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= @@ -1309,6 +1531,7 @@ github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjh github.com/hashicorp/go-msgpack v0.5.3 h1:zKjpN5BK/P5lMYrLmBHdBULWbJ0XpYR+7NGzqkZzoD4= github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= +github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA= github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= github.com/hashicorp/go-retryablehttp v0.5.3 h1:QlWt0KvWT0lq8MFppF9tsJGF+ynG7ztc2KIPhzRGk7s= @@ -1333,6 +1556,7 @@ github.com/hashicorp/go.net v0.0.1 h1:sNCoNyDEvN1xa+X0baata4RdcpKwcMS6DH+xwfqPgj github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d h1:dg1dEPuWpEqDnvIw251EVy4zlP8gWbsGj4BsUKCRpYs= github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= @@ -1341,17 +1565,27 @@ github.com/hashicorp/logutils v1.0.0 h1:dLEQVugN8vlakKOUE3ihGLTZJRB4j+M2cdTm/ORI github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= github.com/hashicorp/mdns v1.0.0 h1:WhIgCr5a7AaVH6jPUwjtRuuE7/RDufnUvzIr48smyxs= github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= +github.com/hashicorp/mdns v1.0.1/go.mod h1:4gW7WsVCke5TE7EPeYliwHlRUyBtfCwuFwuMg2DmyNY= +github.com/hashicorp/mdns v1.0.4 h1:sY0CMhFmjIPDMlTB+HfymFHCaYLhgifZ0QhjaYKD/UQ= +github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc= github.com/hashicorp/memberlist v0.1.3 h1:EmmoJme1matNzb+hMpDuR/0sbJSUisxyqBGG676r31M= github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= +github.com/hashicorp/memberlist v0.2.2/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= +github.com/hashicorp/memberlist v0.3.0 h1:8+567mCcFDnS5ADl7lrpxPMWiFCElyUEeW0gtj34fMA= +github.com/hashicorp/memberlist v0.3.0/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= +github.com/hashicorp/serf v0.9.5/go.mod h1:UWDWwZeL5cuWDJdl0C6wrvrUwEqtQ4ZKBKKENpqIUyk= +github.com/hashicorp/serf v0.9.6/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4= github.com/hashicorp/serf v0.10.1 h1:Z1H2J60yRKvfDYAOZLd2MU0ND4AH/WDz7xYHDWQsIPY= github.com/hashicorp/serf v0.10.1/go.mod h1:yL2t6BqATOLGc5HF7qbFkTfXoPIY0WZdWHfEvMqbG+4= +github.com/hdevalence/ed25519consensus v0.0.0-20210204194344-59a8610d2b87/go.mod h1:XGsKKeXxeRr95aEOgipvluMPlgjr7dGlk9ZTWOjcUcg= github.com/hdevalence/ed25519consensus v0.1.0 h1:jtBwzzcHuTmFrQN6xQZn6CQEO/V9f7HsjsjeEZ6auqU= github.com/hdevalence/ed25519consensus v0.1.0/go.mod h1:w3BHWjwJbFU29IRHL1Iqkw3sus+7FctEyM4RqDxYNzo= github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM= github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg= github.com/holiman/bloomfilter/v2 v2.0.3 h1:73e0e/V0tCydx14a0SCYS/EWCxgwLZ18CZcZKVu0fao= github.com/holiman/bloomfilter/v2 v2.0.3/go.mod h1:zpoh+gs7qcpqrHr3dB55AMiJwo0iURXE7ZOP9L9hSkA= +github.com/holiman/uint256 v1.1.1/go.mod h1:y4ga/t+u+Xwd7CpDgZESaRcWy0I7XMlTMA25ApIH5Jw= github.com/holiman/uint256 v1.2.0 h1:gpSYcPLWGv4sG43I2mVLiDZCNDh/EpGjSk8tmtxitHM= github.com/holiman/uint256 v1.2.0/go.mod h1:y4ga/t+u+Xwd7CpDgZESaRcWy0I7XMlTMA25ApIH5Jw= github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= @@ -1360,20 +1594,29 @@ github.com/huandu/go-assert v1.1.5 h1:fjemmA7sSfYHJD7CUqs9qTwwfdNAx7/j2/ZlHXzNB3 github.com/huandu/go-assert v1.1.5/go.mod h1:yOLvuqZwmcHIC5rIzrBhT7D3Q9c3GFnd0JrPVhn/06U= github.com/huandu/skiplist v1.2.0 h1:gox56QD77HzSC0w+Ws3MH3iie755GBJU1OER3h5VsYw= github.com/huandu/skiplist v1.2.0/go.mod h1:7v3iFjLcSAzO4fN5B8dvebvo/qsfumiLiDXMrPiHF9w= +github.com/huandu/xstrings v1.0.0/go.mod h1:4qWG/gcEcfX4z/mBDHJ++3ReCw9ibxbsNJbcucJdbSo= +github.com/huandu/xstrings v1.2.0 h1:yPeWdRnmynF7p+lLYz0H2tthW9lqhMJrQV/U7yy4wX0= +github.com/huandu/xstrings v1.2.0/go.mod h1:DvyZB1rfVYsBIigL8HwpZgxHwXozlTgGqn63UyNX5k4= github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= github.com/hudl/fargo v1.4.0 h1:ZDDILMbB37UlAVLlWcJ2Iz1XuahZZTDZfdCKeclfq2s= github.com/hudl/fargo v1.4.0/go.mod h1:9Ai6uvFy5fQNq6VPKtg+Ceq1+eTY4nKUlR2JElEOcDo= +github.com/huin/goupnp v1.0.0/go.mod h1:n9v9KO1tAxYH82qOn+UTIFQDmx5n1Zxd/ClZDMX7Bnc= github.com/huin/goupnp v1.0.3-0.20220313090229-ca81a64b4204 h1:+EYBkW+dbi3F/atB+LSQZSWh7+HNrV3A/N0y6DSoy9k= github.com/huin/goupnp v1.0.3-0.20220313090229-ca81a64b4204/go.mod h1:ZxNlw5WqJj6wSsRK5+YfflQGXYfccj5VgQsMNixHM7Y= github.com/huin/goutil v0.0.0-20170803182201-1ca381bf3150 h1:vlNjIqmUZ9CMAWsbURYl3a6wZbw7q5RHVvlXTNS/Bs8= github.com/huin/goutil v0.0.0-20170803182201-1ca381bf3150/go.mod h1:PpLOETDnJ0o3iZrZfqZzyLl6l7F3c6L1oWn7OICBi6o= github.com/iancoleman/orderedmap v0.2.0 h1:sq1N/TFpYH++aViPcaKjys3bDClUEU7s5B+z6jq8pNA= github.com/iancoleman/orderedmap v0.2.0/go.mod h1:N0Wam8K1arqPXNWjMo21EXnBPOPp36vB07FNRdD2geA= +github.com/iancoleman/strcase v0.2.0 h1:05I4QRnGpI0m37iZQRuskXh+w77mr6Z41lwQzuHLwW0= +github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639 h1:mV02weKRL81bEnm8A0HT1/CAelMQDBuQIfLw8n+d6xI= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= +github.com/imdario/mergo v0.3.4/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= +github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk= github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg= +github.com/improbable-eng/grpc-web v0.14.1/go.mod h1:zEjGHa8DAlkoOXmswrNvhUGEYQA9UI7DhrGeHR1DMGU= github.com/improbable-eng/grpc-web v0.15.0 h1:BN+7z6uNXZ1tQGcNAuaU1YjsLTApzkjt2tzCixLaUPQ= github.com/improbable-eng/grpc-web v0.15.0/go.mod h1:1sy9HKV4Jt9aEs9JSnkWlRJPuPtwNr0l57L4f878wP8= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= @@ -1381,6 +1624,7 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/influxdata/flux v0.65.1 h1:77BcVUCzvN5HMm8+j9PRBQ4iZcu98Dl4Y9rf+J5vhnc= github.com/influxdata/flux v0.65.1/go.mod h1:J754/zds0vvpfwuq7Gc2wRdVwEodfpCFM7mYlOw2LqY= +github.com/influxdata/influxdb v1.2.3-0.20180221223340-01288bdb0883/go.mod h1:qZna6X/4elxqT3yI9iZYdZrWWdeFOOprn86kgg4+IzY= github.com/influxdata/influxdb v1.8.3 h1:WEypI1BQFTT4teLM+1qkEcvUi0dAvopAI/ir0vAiBg8= github.com/influxdata/influxdb v1.8.3/go.mod h1:JugdFhsvvI8gadxOI6noqNeeBHvWNTbfYGtiAn+2jhI= github.com/influxdata/influxdb-client-go/v2 v2.4.0 h1:HGBfZYStlx3Kqvsv1h2pJixbCl/jhnFtxpKFAv9Tu5k= @@ -1404,6 +1648,7 @@ github.com/influxdata/usage-client v0.0.0-20160829180054-6d3895376368 h1:+TUUmaF github.com/influxdata/usage-client v0.0.0-20160829180054-6d3895376368/go.mod h1:Wbbw6tYNvwa5dlB6304Sd+82Z3f7PmVZHVKU637d4po= github.com/informalsystems/tm-load-test v1.3.0 h1:FGjKy7vBw6mXNakt+wmNWKggQZRsKkEYpaFk/zR64VA= github.com/informalsystems/tm-load-test v1.3.0/go.mod h1:OQ5AQ9TbT5hKWBNIwsMjn6Bf4O0U4b1kRc+0qZlQJKw= +github.com/jackpal/go-nat-pmp v1.0.2-0.20160603034137-1fa385a6f458/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc= github.com/jackpal/go-nat-pmp v1.0.2 h1:KzKSgb7qkJvOUTqYl9/Hg/me3pWgBmERKrTGD7BdWus= github.com/jackpal/go-nat-pmp v1.0.2/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= @@ -1419,8 +1664,11 @@ github.com/jgautheron/goconst v1.5.1 h1:HxVbL1MhydKs8R8n/HE5NPvzfaYmQJA3o879lE4+ github.com/jgautheron/goconst v1.5.1/go.mod h1:aAosetZ5zaeC/2EfMeRswtxUFBpe2Hr7HzkgX4fanO4= github.com/jhump/protocompile v0.0.0-20220216033700-d705409f108f h1:BNuUg9k2EiJmlMwjoef3e8vZLHplbVw6DrjGFjLL+Yo= github.com/jhump/protocompile v0.0.0-20220216033700-d705409f108f/go.mod h1:qr2b5kx4HbFS7/g4uYO5qv9ei8303JMsC7ESbYiqr2Q= +github.com/jhump/protoreflect v1.6.1/go.mod h1:RZQ/lnuN+zqeRVpQigTwO6o0AJUkxbnSnpuG7toUTG4= +github.com/jhump/protoreflect v1.9.0/go.mod h1:7GcYQDdMU/O/BBrl/cX6PNHpXh6cenjd8pneu5yW7Tg= github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c= github.com/jhump/protoreflect v1.15.1/go.mod h1:jD/2GMKKE6OqX8qTjhADU1e6DShO+gavG9e0Q693nKo= +github.com/jingyugao/rowserrcheck v1.1.0/go.mod h1:TOQpc2SLx6huPfoFGK3UOnEG+u02D3C1GeosjupAKCA= github.com/jingyugao/rowserrcheck v1.1.1 h1:zibz55j/MJtLsjP1OF4bSdgXxwL1b+Vn7Tjzq7gFzUs= github.com/jingyugao/rowserrcheck v1.1.1/go.mod h1:4yvlZSDb3IyDTUZJUmpZfm2Hwok+Dtp+nu2qOq+er9c= github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af h1:KA9BjwUk7KlCh6S9EAGWBt1oExIUv9WyNCiRz5amv48= @@ -1432,8 +1680,12 @@ github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGw github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/jmhodges/levigo v1.0.0 h1:q5EC36kV79HWeTBWsod3mG11EgStG3qArTKcvlksN1U= github.com/jmhodges/levigo v1.0.0/go.mod h1:Q6Qx+uH3RAqyK4rFQroq9RL7mdkABMcfhEI+nNuzMJQ= +github.com/jmoiron/sqlx v1.2.0 h1:41Ip0zITnmWNR/vHV+S4m+VoUivnWY5E4OJfLZjCJMA= +github.com/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks= github.com/jonboulle/clockwork v0.1.0 h1:VKV+ZcuP6l3yW9doeqz6ziZGgcynBVQO+obU0+0hcPo= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= +github.com/jonboulle/clockwork v0.2.0 h1:J2SLSdy7HgElq8ekSl2Mxh6vrRNFxqbXGenYH2I02Vs= +github.com/jonboulle/clockwork v0.2.0/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8= github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA= github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= github.com/jrick/logrotate v1.0.0 h1:lQ1bL/n9mBNeIXoTUoYRlK4dHuNJVofX9oWqBtPnSzI= @@ -1443,6 +1695,7 @@ github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/u github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= @@ -1452,20 +1705,30 @@ github.com/jsternberg/zap-logfmt v1.0.0 h1:0Dz2s/eturmdUS34GM82JwNEdQ9hPoJgqptcE github.com/jsternberg/zap-logfmt v1.0.0/go.mod h1:uvPs/4X51zdkcm5jXl5SYoN+4RK21K8mysFmDaM/h+o= github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= +github.com/juju/ratelimit v1.0.1 h1:+7AIFJVQ0EQgq/K9+0Krm7m530Du7tIz0METWzN0RgY= +github.com/juju/ratelimit v1.0.1/go.mod h1:qapgC/Gy+xNh9UxzV13HGGl/6UXNN+ct+vwSgWNm/qk= +github.com/julienschmidt/httprouter v1.1.1-0.20170430222011-975b5c4c7c21/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= +github.com/julz/importas v0.0.0-20210419104244-841f0c0fe66d/go.mod h1:oSFU2R4XK/P7kNBrnL/FEQlDGN1/6WoxXEjSSXO0DV0= github.com/julz/importas v0.1.0 h1:F78HnrsjY3cR7j0etXy5+TU1Zuy7Xt08X/1aJnH5xXY= github.com/julz/importas v0.1.0/go.mod h1:oSFU2R4XK/P7kNBrnL/FEQlDGN1/6WoxXEjSSXO0DV0= github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5 h1:PJr+ZMXIecYc1Ey2zucXdR73SMBtgjPgwa31099IMv0= github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= github.com/jwilder/encoding v0.0.0-20170811194829-b4e1701a28ef h1:2jNeR4YUziVtswNP9sEFAI913cVrzH85T+8Q6LpYbT0= github.com/jwilder/encoding v0.0.0-20170811194829-b4e1701a28ef/go.mod h1:Ct9fl0F6iIOGgxJ5npU/IUOhOhqlVrGjyIZc8/MagT0= +github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88 h1:uC1QfSlInpQF+M0ao65imhwqKnz3Q2z/d8PWZRMQvDM= +github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k= +github.com/karalabe/usb v0.0.0-20190919080040-51dc0efba356/go.mod h1:Od972xHfMJowv7NGVDiWVxk2zxnWgjLlJzE+F4F7AGU= github.com/karalabe/usb v0.0.2 h1:M6QQBNxF+CQ8OFvxrT90BA0qBOXymndZnk5q235mFc4= github.com/karalabe/usb v0.0.2/go.mod h1:Od972xHfMJowv7NGVDiWVxk2zxnWgjLlJzE+F4F7AGU= github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4= github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= +github.com/keybase/go-keychain v0.0.0-20190712205309-48d3d31d256d h1:Z+RDyXzjKE0i2sTjZ/b1uxiGtPhFy34Ou/Tk0qwN0kM= +github.com/keybase/go-keychain v0.0.0-20190712205309-48d3d31d256d/go.mod h1:JJNrCn9otv/2QP4D7SMJBgaleKpOf66PnW6F5WGNRIc= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= +github.com/kisielk/errcheck v1.6.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/errcheck v1.6.2 h1:uGQ9xI8/pgc9iOoCe7kWQgRE6SBTrCGmTSf0LrEtY7c= github.com/kisielk/errcheck v1.6.2/go.mod h1:nXw/i/MfnvRHqXa7XXmQMUB0oNFGuBrNI8d8NLy0LPw= github.com/kisielk/gotool v1.0.0 h1:AV2c/EiW3KqPNT9ZKl07ehoAGi4C5/01Cfbblndcapg= @@ -1474,8 +1737,12 @@ github.com/kkHAIKE/contextcheck v1.1.3 h1:l4pNvrb8JSwRd51ojtcOxOeHJzHek+MtOyXbaR github.com/kkHAIKE/contextcheck v1.1.3/go.mod h1:PG/cwd6c0705/LM0KTr1acO2gORUxkSVWyLJOFW5qoo= github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23 h1:FOOIBWrEkLgmlgGfMuZT83xIwfPDxEI2OHu6xUmJMFE= github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4= +github.com/kkdai/bstream v1.0.0 h1:Se5gHwgp2VT2uHfDrkbbgbgEvV9cimLELwrPJctSjg8= +github.com/kkdai/bstream v1.0.0/go.mod h1:FDnDOHt5Yx4p3FaHcioFT0QjDOtgUpvjeZqAs+NVZZA= github.com/klauspost/compress v1.4.0/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= +github.com/klauspost/compress v1.10.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= +github.com/klauspost/compress v1.11.0/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.11.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.12.3/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= github.com/klauspost/compress v1.15.11/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM= @@ -1489,6 +1756,7 @@ github.com/klauspost/pgzip v1.0.2-0.20170402124221-0bf5dcad4ada/go.mod h1:Ch1tH6 github.com/klauspost/pgzip v1.2.5 h1:qnWYvvKqedOF2ulHpMG72XQol4ILEJ8k2wwRl/Km8oE= github.com/klauspost/pgzip v1.2.5/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/fs v0.1.0 h1:Jskdu9ieNAYnjxsi0LbQp1ulIKZV1LAFgK1tWhpZgl8= @@ -1496,6 +1764,7 @@ github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515 h1:T+h1c/A9Gawja4Y9mFVWj2vyii2bbUNDw3kt9VxK2EY= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= @@ -1504,8 +1773,10 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/kulti/thelper v0.4.0/go.mod h1:vMu2Cizjy/grP+jmsvOFDx1kYP6+PD1lqg4Yu5exl2U= github.com/kulti/thelper v0.6.3 h1:ElhKf+AlItIu+xGnI990no4cE2+XaSu1ULymV2Yulxs= github.com/kulti/thelper v0.6.3/go.mod h1:DsqKShOvP40epevkFrvIwkCMNYxMeTNjdWL4dqWHZ6I= +github.com/kunwardeep/paralleltest v1.0.2/go.mod h1:ZPqNm1fVHPllh5LPVujzbVz1JN2GhLxSfY+oqUsvG30= github.com/kunwardeep/paralleltest v1.0.6 h1:FCKYMF1OF2+RveWlABsdnmsvJrei5aoyZoaGS+Ugg8g= github.com/kunwardeep/paralleltest v1.0.6/go.mod h1:Y0Y0XISdZM5IKm3TREQMZ6iteqn1YuwCsJO/0kL9Zes= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= @@ -1516,8 +1787,10 @@ github.com/labstack/echo/v4 v4.2.1 h1:LF5Iq7t/jrtUuSutNuiEWtB5eiHfZ5gSe2pcu5exjQ github.com/labstack/echo/v4 v4.2.1/go.mod h1:AA49e0DZ8kk5jTOOCKNuPR6oTnBS0dYiM4FW1e6jwpg= github.com/labstack/gommon v0.3.0 h1:JEeO0bvc78PKdyHxloTKiF8BD5iGrH8T6MSeGvSgob0= github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k= +github.com/ldez/gomoddirectives v0.2.2/go.mod h1:cpgBogWITnCfRq2qGoDkKMEVSaarhdBr6g8G04uz6d0= github.com/ldez/gomoddirectives v0.2.3 h1:y7MBaisZVDYmKvt9/l1mjNCiSA1BVn34U0ObUcJwlhA= github.com/ldez/gomoddirectives v0.2.3/go.mod h1:cpgBogWITnCfRq2qGoDkKMEVSaarhdBr6g8G04uz6d0= +github.com/ldez/tagliatelle v0.2.0/go.mod h1:8s6WJQwEYHbKZDsp/LjArytKOG8qaMrKQQ3mFukHs88= github.com/ldez/tagliatelle v0.3.1 h1:3BqVVlReVUZwafJUwQ+oxbx2BEX2vUG4Yu/NOfMiKiM= github.com/ldez/tagliatelle v0.3.1/go.mod h1:8s6WJQwEYHbKZDsp/LjArytKOG8qaMrKQQ3mFukHs88= github.com/leanovate/gopter v0.2.9 h1:fQjYxZaynp97ozCzfOyOuAGOU4aU/z37zf/tOujFk7c= @@ -1527,9 +1800,16 @@ github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w= github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY= github.com/leonklingele/grouper v1.1.0 h1:tC2y/ygPbMFSBOs3DcyaEMKnnwH7eYKzohOtRrf0SAg= github.com/leonklingele/grouper v1.1.0/go.mod h1:uk3I3uDfi9B6PeUjsCKi6ndcf63Uy7snXgR4yDYQVDY= +github.com/letsencrypt/pkcs11key/v4 v4.0.0 h1:qLc/OznH7xMr5ARJgkZCCWk+EomQkiNTOoOF5LAgagc= +github.com/letsencrypt/pkcs11key/v4 v4.0.0/go.mod h1:EFUvBDay26dErnNb70Nd0/VW3tJiIbETBPTl9ATXQag= github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/lib/pq v1.8.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= +github.com/lib/pq v1.9.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= +github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/lib/pq v1.10.7 h1:p7ZhMD+KsSRozJr34udlUrhboJwWAgCg34+/ZZNvZZw= github.com/lib/pq v1.10.7/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= +github.com/libp2p/go-buffer-pool v0.0.2/go.mod h1:MvaB6xw5vOrDl8rYZGLFdKAuk/hRoRZd1Vi32+RXyFM= github.com/libp2p/go-buffer-pool v0.1.0 h1:oK4mSFcQz7cTQIfqbe4MIj9gLW+mnanjyFtc6cdF0Y8= github.com/libp2p/go-buffer-pool v0.1.0/go.mod h1:N+vh8gMqimBzdKkSMVuydVDq+UV5QTWy5HSiZacSbPg= github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743 h1:143Bb8f8DuGWck/xpNUOckBVYfFbBTnLevfRZ1aVVqo= @@ -1538,13 +1818,19 @@ github.com/lightstep/lightstep-tracer-go v0.18.1 h1:vi1F1IQ8N7hNWytK9DpJsUfQhGuN github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= github.com/linxGnu/grocksdb v1.8.0 h1:H4L/LhP7GOMf1j17oQAElHgVlbEje2h14A8Tz9cM2BE= github.com/linxGnu/grocksdb v1.8.0/go.mod h1:09CeBborffXhXdNpEcOeZrLKEnRtrZFEpFdPNI9Zjjg= +github.com/logrusorgru/aurora v0.0.0-20181002194514-a7b3b318ed4e h1:9MlwzLdW7QSDrhDjFlsEYmxpFyIoXmYRon3dt0io31k= +github.com/logrusorgru/aurora v0.0.0-20181002194514-a7b3b318ed4e/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4= github.com/lucasjones/reggen v0.0.0-20180717132126-cdb49ff09d77 h1:6xiz3+ZczT3M4+I+JLpcPGG1bQKm8067HktB17EDWEE= github.com/lucasjones/reggen v0.0.0-20180717132126-cdb49ff09d77/go.mod h1:5ELEyG+X8f+meRWHuqUOewBOhvHkl7M76pdGEansxW4= github.com/lufeee/execinquery v1.2.1 h1:hf0Ems4SHcUGBxpGN7Jz78z1ppVkP/837ZlETPCEtOM= github.com/lufeee/execinquery v1.2.1/go.mod h1:EC7DrEKView09ocscGHC+apXMIaorh4xqSxS/dy8SbM= +github.com/lyft/protoc-gen-star v0.5.3 h1:zSGLzsUew8RT+ZKPHc3jnf8XLaVyHzTcAFBzHtCNR20= +github.com/lyft/protoc-gen-star v0.5.3/go.mod h1:V0xaHgaf5oCCqmcxYcWiDfTiKsZsRc87/1qhoTACD8w= github.com/lyft/protoc-gen-validate v0.0.13 h1:KNt/RhmQTOLr7Aj8PsJ7mTronaFyx80mRTT9qF261dA= github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= @@ -1554,6 +1840,7 @@ github.com/manifoldco/promptui v0.9.0 h1:3V4HzJk1TtXW1MTZMP7mdlwbBpIinw3HztaIlYt github.com/manifoldco/promptui v0.9.0/go.mod h1:ka04sppxSGFAtxX0qhlYQjISsg9mR4GWtQEhdbn6Pgg= github.com/maratori/testableexamples v1.0.0 h1:dU5alXRrD8WKSjOUnmJZuzdxWOEQ57+7s93SLMxb2vI= github.com/maratori/testableexamples v1.0.0/go.mod h1:4rhjL1n20TUTT4vdh3RDqSizKLyXp7K2u6HgraZCGzE= +github.com/maratori/testpackage v1.0.1/go.mod h1:ddKdw+XG0Phzhx8BFDTKgpWP4i7MpApTE5fXSKAqwDU= github.com/maratori/testpackage v1.1.0 h1:GJY4wlzQhuBusMF1oahQCBtUV/AQ/k69IZ68vxaac2Q= github.com/maratori/testpackage v1.1.0/go.mod h1:PeAhzU8qkCwdGEMTEupsHJNlQu2gZopMC6RjbhmHeDc= github.com/matoous/godox v0.0.0-20210227103229-6504466cf951 h1:pWxk9e//NbPwfxat7RXkts09K+dEBJWakUWwICVqYbA= @@ -1561,17 +1848,26 @@ github.com/matoous/godox v0.0.0-20210227103229-6504466cf951/go.mod h1:1BELzlh859 github.com/matryer/moq v0.0.0-20190312154309-6cfb0558e1bd h1:HvFwW+cm9bCbZ/+vuGNq7CRWXql8c0y8nGeYpqmpvmk= github.com/matryer/moq v0.0.0-20190312154309-6cfb0558e1bd/go.mod h1:9ELz6aaclSIGnZBoaSLZ3NAl1VTufbOrXBPvtcy6WiQ= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= +github.com/mattn/go-colorable v0.1.0/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= +github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= +github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.7/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= +github.com/mattn/go-ieproxy v0.0.0-20190610004146-91bb50d98149/go.mod h1:31jz6HNzdxOmlERGGEc4v/dMssOfmp2p5bT/okiKFFc= +github.com/mattn/go-ieproxy v0.0.0-20190702010315-6dee0af9227d h1:oNAwILwmgWKFpuU+dXvI6dl9jG2mAWAZLX3r9s0PPiw= +github.com/mattn/go-ieproxy v0.0.0-20190702010315-6dee0af9227d/go.mod h1:31jz6HNzdxOmlERGGEc4v/dMssOfmp2p5bT/okiKFFc= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= +github.com/mattn/go-isatty v0.0.5-0.20180830101745-3fb116b82035/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ= +github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84= +github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= @@ -1580,32 +1876,52 @@ github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= +github.com/mattn/go-runewidth v0.0.6/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0= github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= +github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/mattn/go-sqlite3 v1.11.0 h1:LDdKkqtYlom37fkvqs8rMPFKAMe8+SgjbwZ6ex1/A/Q= github.com/mattn/go-sqlite3 v1.11.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/mattn/go-tty v0.0.0-20180907095812-13ff1204f104 h1:d8RFOZ2IiFtFWBcKEHAFYJcPTf0wY5q0exFNJZVWa1U= github.com/mattn/go-tty v0.0.0-20180907095812-13ff1204f104/go.mod h1:XPvLUNfbS4fJH25nqRHfWLMa1ONC8Amw+mIA639KxkE= +github.com/mattn/goveralls v0.0.2 h1:7eJB6EqsPhRVxvwEXGnqdO2sJI0PTsrWoTMXEk9/OQc= +github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/mbilski/exhaustivestruct v1.2.0 h1:wCBmUnSYufAHO6J4AVWY6ff+oxWxsVFrwgOdMUQePUo= github.com/mbilski/exhaustivestruct v1.2.0/go.mod h1:OeTBVxQWoEmB2J2JCHmXWPJ0aksxSUOUy+nvtVEfzXc= +github.com/mgechev/dots v0.0.0-20190921121421-c36f7dcfbb81 h1:QASJXOGm2RZ5Ardbc86qNFvby9AqkLDibfChMtAg5QM= +github.com/mgechev/dots v0.0.0-20190921121421-c36f7dcfbb81/go.mod h1:KQ7+USdGKfpPjXk4Ga+5XxQM4Lm4e3gAogrreFAYpOg= +github.com/mgechev/revive v1.1.1/go.mod h1:PKqk4L74K6wVNwY2b6fr+9Qqr/3hIsHVfZCJdbvozrY= github.com/mgechev/revive v1.2.4 h1:+2Hd/S8oO2H0Ikq2+egtNwQsVhAeELHjxjIUFX5ajLI= github.com/mgechev/revive v1.2.4/go.mod h1:iAWlQishqCuj4yhV24FTnKSXGpbAA+0SckXB8GQMX/Q= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= +github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= +github.com/miekg/dns v1.1.35/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM= +github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= github.com/miekg/dns v1.1.43 h1:JKfpVSCB84vrAmHzyrsxB5NAr5kLoMXZArPSw7Qlgyg= github.com/miekg/dns v1.1.43/go.mod h1:+evo5L0630/F6ca/Z9+GAqzhjGyn8/c+TBaOyfEl0V4= +github.com/miekg/pkcs11 v1.0.2/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs= +github.com/miekg/pkcs11 v1.0.3 h1:iMwmD7I5225wv84WxIG/bmxz9AXjWvTWIbM/TYHvWtw= +github.com/miekg/pkcs11 v1.0.3/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs= github.com/mimoo/StrobeGo v0.0.0-20181016162300-f8f6d4d2b643/go.mod h1:43+3pMjjKimDBf5Kr4ZFNGbLql1zKkbImw+fZbw3geM= github.com/mimoo/StrobeGo v0.0.0-20220103164710-9a04d6ca976b h1:QrHweqAtyJ9EwCaGHBu1fghwxIPiopAHV06JlXrMHjk= github.com/mimoo/StrobeGo v0.0.0-20220103164710-9a04d6ca976b/go.mod h1:xxLb2ip6sSUts3g1irPVHyk/DGslwQsNOo9I7smJfNU= +github.com/minio/highwayhash v1.0.1/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY= github.com/minio/highwayhash v1.0.2 h1:Aak5U0nElisjDCfPSG79Tgzkn2gl66NxOMspRrKnA/g= github.com/minio/highwayhash v1.0.2/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY= github.com/mitchellh/cli v1.0.0 h1:iGBIsUe3+HZ/AD/Vd7DErOt5sU9fa8Uj7A2s1aggv1Y= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= +github.com/mitchellh/cli v1.1.0 h1:tEElEatulEHDeedTxwckzyYMA5c86fbmNIUL1hBIiTg= +github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= +github.com/mitchellh/copystructure v1.0.0 h1:Laisrj+bAB6b/yJwB5Bt3ITZhGJdqmxquMKeZ+mmkFQ= +github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/go-ps v1.0.0 h1:i6ampVEEF4wQFF+bkYfwYgY+F/uYJDktmvLPf7qIgjc= +github.com/mitchellh/go-ps v1.0.0/go.mod h1:J4lOc8z8yJs6vUwklHw2XEIiT4z4C40KtWVN3nvg8Pg= github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= github.com/mitchellh/go-testing-interface v1.14.1 h1:jrgshOhYAUVNMAJiKbEu7EqAwgJJ2JqpQmpLJOu07cU= github.com/mitchellh/go-testing-interface v1.14.1/go.mod h1:gfgS7OtZj6MA4U1UrDRp04twqAjfvlZyCfX3sDjEym8= @@ -1615,14 +1931,20 @@ github.com/mitchellh/iochan v1.0.0 h1:C+X3KsSTLFVBr/tK1eYN/vs4rJcvsiLU338UhYPJWe github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mitchellh/mapstructure v1.3.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/pointerstructure v1.2.0 h1:O+i9nHnXS3l/9Wu7r4NrEdwA2VFTicjUEN1uBnDo34A= github.com/mitchellh/pointerstructure v1.2.0/go.mod h1:BRAsLI5zgXmw97Lf6s25bs8ohIXc3tViBH44KcwB2g4= +github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= +github.com/mitchellh/reflectwalk v1.0.1 h1:FVzMWA5RllMAKIdUSC8mdWo3XtwoecrH79BY70sEEpE= +github.com/mitchellh/reflectwalk v1.0.1/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/moby/buildkit v0.10.4 h1:FvC+buO8isGpUFZ1abdSLdGHZVqg9sqI4BbFL8tlzP4= github.com/moby/buildkit v0.10.4/go.mod h1:Yajz9vt1Zw5q9Pp4pdb3TCSUXJBIroIQGQ3TTs/sLug= +github.com/moby/sys/mountinfo v0.4.1 h1:1O+1cHA1aujwEwwVMa2Xm2l+gIpUHyd3+D+d7LZh1kM= +github.com/moby/sys/mountinfo v0.4.1/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A= github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae h1:O4SWKdcHVCvYqyDV+9CJA1fcDN2L11Bule0iFy3YlAI= github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae/go.mod h1:E2VnQOmVuvZB6UYnnDB0qG5Nq/1tD9acaOpo6xmt0Kw= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -1634,10 +1956,18 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5 h1:8Q0qkMVC/MmWkpIdlvZgcv2o2jrlF6zqVOh7W5YHdMA= github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5/go.mod h1:caMODM3PzxT8aQXRPkAt8xlV/e7d7w8GM5g0fa5F0D8= +github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9M+97sNutRR1RKhG96O6jWumTTnw= +github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8= github.com/moricho/tparallel v0.2.1 h1:95FytivzT6rYzdJLdtfn6m1bfFJylOJK41+lgv/EHf4= github.com/moricho/tparallel v0.2.1/go.mod h1:fXEIZxG2vdfl0ZF8b42f5a78EhjjD5mX8qUplsoSU4k= github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= +github.com/mozilla/scribe v0.0.0-20180711195314-fb71baf557c1 h1:29NKShH4TWd3lxCDUhS4Xe16EWMA753dtIxYtwddklU= +github.com/mozilla/scribe v0.0.0-20180711195314-fb71baf557c1/go.mod h1:FIczTrinKo8VaLxe6PWTPEXRXDIHz2QAwiaBaP5/4a8= +github.com/mozilla/tls-observatory v0.0.0-20210609171429-7bc42856d2e5 h1:0KqC6/sLy7fDpBdybhVkkv4Yz+PmB7c9Dz9z3dLW804= +github.com/mozilla/tls-observatory v0.0.0-20210609171429-7bc42856d2e5/go.mod h1:FUqVoUPHSEdDR0MnFM3Dh8AU0pZHLXUD127SAJGER/s= +github.com/mrunalp/fileutils v0.5.0 h1:NKzVxiH7eSk+OQ4M+ZYW1K6h27RUV3MI6NUTsHhU6Z4= +github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ= github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae h1:VeRdUYdCw49yizlSbMEn2SZ+gT+3IUKx8BqxyQdz+BY= github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae/go.mod h1:qAyveg+e4CE+eKJXWVjKXM4ck2QobLqTDytGJbLLhJg= github.com/mtibben/percent v0.2.1 h1:5gssi8Nqo8QU/r2pynCm+hBQHpkB/uNK7BJCFogWdzs= @@ -1645,8 +1975,12 @@ github.com/mtibben/percent v0.2.1/go.mod h1:KG9uO+SZkUp+VkRHsCdYQV3XSZrrSpR3O9ib github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f h1:KUppIJq7/+SVif2QVs3tOP0zanoHgBEVAwHxUSIzRqU= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/mwitkow/go-proto-validators v0.0.0-20180403085117-0950a7990007/go.mod h1:m2XC9Qq0AlmmVksL6FktJCdTYyLk7V3fKyp0sl1yWQo= +github.com/mwitkow/go-proto-validators v0.2.0 h1:F6LFfmgVnfULfaRsQWBbe7F7ocuHCr9+7m+GAeDzNbQ= +github.com/mwitkow/go-proto-validators v0.2.0/go.mod h1:ZfA1hW+UH/2ZHOWvQ3HnQaU0DtnpXu850MZiy+YUgcc= github.com/mwitkow/grpc-proxy v0.0.0-20181017164139-0f1106ef9c76 h1:0xuRacu/Zr+jX+KyLLPPktbwXqyOvnOPUQmMLzX1jxU= github.com/mwitkow/grpc-proxy v0.0.0-20181017164139-0f1106ef9c76/go.mod h1:x5OoJHDHqxHS801UIuhqGl6QdSAEJvtausosHSdazIo= +github.com/nakabonne/nestif v0.3.0/go.mod h1:dI314BppzXjJ4HsCnbo7XzrJHPszZsjnk5wEBSYHI2c= github.com/nakabonne/nestif v0.3.1 h1:wm28nZjhQY5HyYPx+weN3Q65k6ilSBxDb8v5S81B81U= github.com/nakabonne/nestif v0.3.1/go.mod h1:9EtoZochLn5iUprVDmDjqGKPofoUEBL8U4Ngq6aY7OE= github.com/naoina/go-stringutil v0.1.0 h1:rCUeRUHjBjGTSHl0VC00jUPLz8/F9dDzYI70Hzifhks= @@ -1672,16 +2006,25 @@ github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354 h1:4kuARK6Y6FxaNu/BnU2OAaLF86eTVhP2hjTB6iMvItA= github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354/go.mod h1:KSVJerMDfblTH7p5MZaTt+8zaT2iEk3AkVb9PQdZuE8= +github.com/neilotoole/errgroup v0.1.5/go.mod h1:Q2nLGf+594h0CLBs/Mbg6qOr7GtqDK7C2S41udRnToE= github.com/neilotoole/errgroup v0.1.6 h1:PODGqPXdT5BC/zCYIMoTrwV+ujKcW+gBXM6Ye9Ve3R8= github.com/neilotoole/errgroup v0.1.6/go.mod h1:Q2nLGf+594h0CLBs/Mbg6qOr7GtqDK7C2S41udRnToE= github.com/neutron-org/admin-module v0.0.0-20230629154156-54b91a541f7f h1:YFXRHpaaRNK7stry4s6MM40IlulY/MSQTAvTbgodMDk= github.com/neutron-org/admin-module v0.0.0-20230629154156-54b91a541f7f/go.mod h1:ZwQ3cw0rxF+DzonD2a5lisdcFEu64Db+0TPnHgMIvN0= +github.com/neutron-org/admin-module v0.0.0-20230705134325-b23404470a1d h1:oexw79znoA0TEo7CGdWHrolbvZqCDD3aI+031CbOq9Y= +github.com/neutron-org/admin-module v0.0.0-20230705134325-b23404470a1d/go.mod h1:QuxQ7FJlEAFMRssyEYOrR9ORnYQvBFMTlO8BXny6ntw= github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230628195106-7f39abd759a1 h1:VmQ1zVjrFguFYFDJrsJ8biPqZvWXrq1ydQKQMVp+w2Q= github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230628195106-7f39abd759a1/go.mod h1:oB4CvQbYYn/g+q7c/rKQ33V4APW+kGdo5RkdFBovyxw= +github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230705143547-22c391d461d5 h1:2YQaqP5W3F+5VH0IAA7m8OHjkwONxQDqXUwo5tzKdDU= +github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230705143547-22c391d461d5/go.mod h1:l699csQZeRKYqF8R9JoYoQ6E0j4PfDM3Ln7EawtUwJE= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= +github.com/nishanths/exhaustive v0.2.3/go.mod h1:bhIX678Nx8inLM9PbpvK1yv6oGtoP8BfaIeMzgBNKvc= github.com/nishanths/exhaustive v0.8.3 h1:pw5O09vwg8ZaditDp/nQRqVnrMczSJDxRDJMowvhsrM= github.com/nishanths/exhaustive v0.8.3/go.mod h1:qj+zJJUgJ76tR92+25+03oYUhzF4R7/2Wk7fGTfCHmg= +github.com/nishanths/predeclared v0.0.0-20190419143655-18a43bb90ffc/go.mod h1:62PewwiQTlm/7Rj+cxVYqZvDIUc+JjZq6GHAC1fsObQ= +github.com/nishanths/predeclared v0.0.0-20200524104333-86fad755b4d3/go.mod h1:nt3d53pc1VYcphSCIaYAJtnPYnr3Zyn8fMq2wvPGPso= +github.com/nishanths/predeclared v0.2.1/go.mod h1:HvkGJcA3naj4lOwnFXFDkFxVtSqQMB9sbB1usJ+xjQE= github.com/nishanths/predeclared v0.2.2 h1:V2EPdZPliZymNAn79T8RkNApBjMmVKh5XRpLm/w98Vk= github.com/nishanths/predeclared v0.2.2/go.mod h1:RROzoN6TnGQupbC+lqggsOlcgysk3LMK/HI84Mp280c= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= @@ -1694,28 +2037,44 @@ github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQ github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= +github.com/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= +github.com/olekukonko/tablewriter v0.0.2-0.20190409134802-7e037d187b0c/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= +github.com/olekukonko/tablewriter v0.0.2/go.mod h1:rSAaSIOAGT9odnlyGlUfAJaoc5w2fSBUmeGDbRWPxyQ= github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= +github.com/onsi/ginkgo v1.16.2/go.mod h1:CObGmKUOKaSC0RjmoAK7tKyn4Azo5P2IWuoMnvwxz1E= github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc= github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= +github.com/onsi/gomega v1.13.0/go.mod h1:lRk9szgn8TxENtWd0Tp4c3wjlRfMTMH27I+3Je41yGY= github.com/onsi/gomega v1.20.0 h1:8W0cWlwFkflGPLltQvLRB7ZVD5HuP6ng320w2IS245Q= github.com/onsi/gomega v1.20.0/go.mod h1:DtrZpjmvpn2mPm4YWQa0/ALMDj9v4YxLgojwPeREyVo= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 h1:lDH9UUVJtmYCjyT0CI4q8xvlXPxeZ0gYCVvWbmPlp88= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= +github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= +github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= +github.com/opencontainers/image-spec v1.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= github.com/opencontainers/image-spec v1.1.0-rc2 h1:2zx/Stx4Wc5pIPDvIxHXvXtQFW/7XWJGmnM7r3wg034= github.com/opencontainers/image-spec v1.1.0-rc2/go.mod h1:3OVijpioIKYWTqjiG0zfF6wvoJ4fAXGbjdZuI2NgsRQ= +github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= +github.com/opencontainers/runc v1.0.2/go.mod h1:aTaHFFwQXuA71CiyxOdFFIorAoemI04suvGRQFzWTD0= +github.com/opencontainers/runc v1.0.3/go.mod h1:aTaHFFwQXuA71CiyxOdFFIorAoemI04suvGRQFzWTD0= github.com/opencontainers/runc v1.1.3 h1:vIXrkId+0/J2Ymu2m7VjGvbSlAId9XNRPhn2p4b+d8w= github.com/opencontainers/runc v1.1.3/go.mod h1:1J5XiS+vdZ3wCyZybsuxXZWGrgSr8fFJHLXuG2PsnNg= +github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 h1:3snG66yBm59tKhhSPQrQ/0bCrv1LQbKt40LnUPiUxdc= +github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= +github.com/opencontainers/selinux v1.8.2 h1:c4ca10UMgRcvZ6h0K4HtS15UaVSBEaE+iln2LVpAuGc= +github.com/opencontainers/selinux v1.8.2/go.mod h1:MUIHuUEvKB1wtJjQdOyYRgOnLD2xAPP8dBsCoU0KuF8= github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492 h1:lM6RxxfUMrYL/f8bWEUqdXrANWtrL7Nndbm9iFN0DlU= github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis= github.com/opentracing/basictracer-go v1.0.0 h1:YyUAhaEfjoWXclZVJ9sGoNct7j4TVk7lZWlQw5UXuoo= @@ -1734,6 +2093,14 @@ github.com/openzipkin/zipkin-go v0.2.5 h1:UwtQQx2pyPIgWYHRg+epgdx1/HnBQTgN3/oIYE github.com/openzipkin/zipkin-go v0.2.5/go.mod h1:KpXfKdgRDnnhsxw4pNIH9Md5lyFqKUa4YDFlwRYAMyE= github.com/ory/dockertest v3.3.5+incompatible h1:iLLK6SQwIhcbrG783Dghaaa3WPzGc+4Emza6EbVUUGA= github.com/ory/dockertest v3.3.5+incompatible/go.mod h1:1vX4m9wsvi00u5bseYwXaSnhNrne+V0E6LAcBILJdPs= +github.com/otiai10/copy v1.6.0 h1:IinKAryFFuPONZ7cm6T6E2QX/vcJwSnlaA5lfoaXIiQ= +github.com/otiai10/copy v1.6.0/go.mod h1:XWfuS3CrI0R6IE0FbgHsEazaXO8G0LpMp9o8tos0x4E= +github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod h1:9qAhocn7zKJG+0mI8eUu6xqkFDYS2kb2saOteoSB3cE= +github.com/otiai10/curr v1.0.0 h1:TJIWdbX0B+kpNagQrjgq8bCMrbhiuX73M2XwgtDMoOI= +github.com/otiai10/curr v1.0.0/go.mod h1:LskTG5wDwr8Rs+nNQ+1LlxRjAtTZZjtJW4rMXl6j4vs= +github.com/otiai10/mint v1.3.0/go.mod h1:F5AjcsTsWUqX+Na9fpHb52P8pcRX2CI6A3ctIT91xUo= +github.com/otiai10/mint v1.3.2 h1:VYWnrP5fXmz1MXvjuUvcBrXSjGE6xjON+axB/UrpO3E= +github.com/otiai10/mint v1.3.2/go.mod h1:/yxELlJQ0ufhjUwhshSj+wFjZ78CnZ48/1wtmBH1OTc= github.com/oxyno-zeta/gomock-extra-matcher v1.1.0 h1:Yyk5ov0ZPKBXtVEeIWtc4J2XVrHuNoIK+0F2BUJgtsc= github.com/oxyno-zeta/gomock-extra-matcher v1.1.0/go.mod h1:UMGTHYEmJ1dRq8LDZ7VTAYO4nqM3GD1UGC3RJEUxEz0= github.com/pact-foundation/pact-go v1.0.4 h1:OYkFijGHoZAYbOIb1LWXrwKQbMMRUv1oQ89blD2Mh2Q= @@ -1743,9 +2110,12 @@ github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0Mw github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/paulbellamy/ratecounter v0.2.0 h1:2L/RhJq+HA8gBQImDXtLPrDXK5qAj6ozWVK/zFXVJGs= github.com/paulbellamy/ratecounter v0.2.0/go.mod h1:Hfx1hDpSGoqxkVVpBi/IlYD7kChlfo5C6hzIHwPqfFE= +github.com/pborman/uuid v0.0.0-20170112150404-1b00554d8222/go.mod h1:VyrYX9gd7irzKovcSS6BIIEwPRkP2Wm2m9ufcdFSJ34= github.com/pborman/uuid v1.2.0 h1:J7Q5mO4ysT1dv8hyrUGHb9+ooztCXu1D8MY8DZYsu3g= github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= +github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= +github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pelletier/go-toml/v2 v2.0.8 h1:0ctb6s9mE31h0/lhu+J6OPmVeDxJn+kYnJc2jZR9tGQ= @@ -1754,6 +2124,8 @@ github.com/performancecopilot/speed v3.0.0+incompatible h1:2WnRzIquHa5QxaJKShDkL github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= github.com/performancecopilot/speed/v4 v4.0.0 h1:VxEDCmdkfbQYDlcr/GC9YoN9PQ6p8ulk9xVsepYy9ZY= github.com/performancecopilot/speed/v4 v4.0.0/go.mod h1:qxrSyuDGrTOWfV+uKRFhfxw6h/4HXRGUiZiufxo49BM= +github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI= +github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= github.com/peterh/liner v1.0.1-0.20180619022028-8c1271fcf47f/go.mod h1:xIteQHvHuaLYG9IFj6mSxM0fCKrs34IrEQUhOYuGPHc= github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7 h1:oYW+YCJ1pachXTQmzR3rNLYGGz4g/UgFcjb28p/viDM= github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7/go.mod h1:CRroGNssyjTd/qIG2FyxByd2S8JEAZXBl4qUrZf8GS0= @@ -1778,10 +2150,12 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= github.com/pkg/profile v1.6.0 h1:hUDfIISABYI59DyeB3OTay/HxSRwTQ8rB/H83k6r5dM= github.com/pkg/profile v1.6.0/go.mod h1:qBsxPvzyUincmltOk6iyRVxHYg4adc0OFOv72ZdLa18= +github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= github.com/pkg/sftp v1.13.1 h1:I2qBYMChEhIjOgazfJmV3/mZM256btk6wkCDRmW7JYs= github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= github.com/pkg/term v0.0.0-20180730021639-bffc007b7fd5 h1:tFwafIEMf0B7NlcxV/zJ6leBIa81D3hgGSgsE5hCkOQ= github.com/pkg/term v0.0.0-20180730021639-bffc007b7fd5/go.mod h1:eCbImbZ95eXtAUIbLAuAVnBnwf83mjf6QIVH8SHYwqQ= +github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pointlander/compress v1.1.1-0.20190518213731-ff44bd196cc3 h1:hUmXhbljNFtrH5hzV9kiRoddZ5nfPTq3K0Sb2hYYiqE= @@ -1790,16 +2164,22 @@ github.com/pointlander/jetset v1.0.1-0.20190518214125-eee7eff80bd4 h1:RHHRCZeaNy github.com/pointlander/jetset v1.0.1-0.20190518214125-eee7eff80bd4/go.mod h1:RdR1j20Aj5pB6+fw6Y9Ur7lMHpegTEjY1vc19hEZL40= github.com/pointlander/peg v1.0.1 h1:mgA/GQE8TeS9MdkU6Xn6iEzBmQUQCNuWD7rHCK6Mjs0= github.com/pointlander/peg v1.0.1/go.mod h1:5hsGDQR2oZI4QoWz0/Kdg3VSVEC31iJw/b7WjqCBGRI= +github.com/polyfloyd/go-errorlint v0.0.0-20210722154253-910bb7978349/go.mod h1:wi9BfjxjF/bwiZ701TzmfKu6UKC357IOAtNr0Td0Lvw= github.com/polyfloyd/go-errorlint v1.0.5 h1:AHB5JRCjlmelh9RrLxT9sgzpalIwwq4hqE8EkwIwKdY= github.com/polyfloyd/go-errorlint v1.0.5/go.mod h1:APVvOesVSAnne5SClsPxPdfvZTVDojXh1/G3qb5wjGI= github.com/posener/complete v1.1.1 h1:ccV59UEOTzVDnDUEFdT95ZzHVZ+5+158q8+SJb2QV5w= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= +github.com/posener/complete v1.2.3 h1:NP0eAhjcjImqslEwo/1hq7gpajME0fTLTezBKDqfXqo= +github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs= +github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og= github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= +github.com/prometheus/client_golang v1.8.0/go.mod h1:O9VU6huf47PktckDQfMTX0Y8tY0/7TSWwj+ITvv0TnM= +github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_golang v1.15.1 h1:8tXpTmJbyH5lydzFPoxSIJ0J46jdh3tylbvM1xCv0LI= github.com/prometheus/client_golang v1.15.1/go.mod h1:e9yaBhRPU2pPNsZwE+JdQl0KEt1N9XgF6zxWmaC0xOk= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= @@ -1812,26 +2192,48 @@ github.com/prometheus/client_model v0.4.0 h1:5lQXD3cAg1OXBf4Wq03gTrXHeaV0TQvGfUo github.com/prometheus/client_model v0.4.0/go.mod h1:oMQmHW1/JoDwqLtg57MGgP/Fb1CJEYF2imWWhWtMkYU= github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc= github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA= github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= +github.com/prometheus/common v0.14.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= +github.com/prometheus/common v0.29.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/common v0.44.0 h1:+5BrQJwiBB9xsMygAB3TNvpQKOwlkc25LbISbrdOOfY= github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO7x0VV9VvuY= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= +github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.3.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= +github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/procfs v0.10.1 h1:kYK1Va/YMlutzCGazswoHKo//tZVlFpKYh+PymziUAg= github.com/prometheus/procfs v0.10.1/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM= +github.com/prometheus/tsdb v0.6.2-0.20190402121629-4f204dcbc150/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/prometheus/tsdb v0.7.1 h1:YZcsG11NqnK4czYLrWd9mpEuAJIHVQLwdrleYfszMAA= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= +github.com/pseudomuto/protoc-gen-doc v1.3.2 h1:61vWZuxYa8D7Rn4h+2dgoTNqnluBmJya2MgbqO32z6g= +github.com/pseudomuto/protoc-gen-doc v1.3.2/go.mod h1:y5+P6n3iGrbKG+9O04V5ld71in3v/bX88wUwgt+U8EA= +github.com/pseudomuto/protokit v0.2.0 h1:hlnBDcy3YEDXH7kc9gV+NLaN0cDzhDvD1s7Y6FZ8RpM= +github.com/pseudomuto/protokit v0.2.0/go.mod h1:2PdH30hxVHsup8KpBTOXTBeMVhJZVio3Q8ViKSAXT0Q= +github.com/quasilyte/go-consistent v0.0.0-20190521200055-c6f3937de18c h1:JoUA0uz9U0FVFq5p4LjEq4C0VgQ0El320s3Ms0V4eww= +github.com/quasilyte/go-consistent v0.0.0-20190521200055-c6f3937de18c/go.mod h1:5STLWrekHfjyYwxBRVRXNOSewLJ3PWfDJd1VyTS21fI= +github.com/quasilyte/go-ruleguard v0.3.1-0.20210203134552-1b5a410e1cc8/go.mod h1:KsAh3x0e7Fkpgs+Q9pNLS5XpFSvYCEVl5gP9Pp1xp30= +github.com/quasilyte/go-ruleguard v0.3.4/go.mod h1:57FZgMnoo6jqxkYKmVj5Fc8vOt0rVzoE/UNAmFFIPqA= github.com/quasilyte/go-ruleguard v0.3.18 h1:sd+abO1PEI9fkYennwzHn9kl3nqP6M5vE7FiOzZ+5CE= github.com/quasilyte/go-ruleguard v0.3.18/go.mod h1:lOIzcYlgxrQ2sGJ735EHXmf/e9MJ516j16K/Ifcttvs= +github.com/quasilyte/go-ruleguard/dsl v0.3.0/go.mod h1:KeCP03KrjuSO0H1kTuZQCWlQPulDV6YMIXmpQss17rU= +github.com/quasilyte/go-ruleguard/dsl v0.3.2 h1:ULi3SLXvDUgb0u2IM5xU6er9KeWBSaUh1NlDjCgLHU8= +github.com/quasilyte/go-ruleguard/dsl v0.3.2/go.mod h1:KeCP03KrjuSO0H1kTuZQCWlQPulDV6YMIXmpQss17rU= +github.com/quasilyte/go-ruleguard/rules v0.0.0-20201231183845-9e62ed36efe1/go.mod h1:7JTjp89EGyU1d6XfBiXihJNG37wB2VRkd125Q1u7Plc= +github.com/quasilyte/go-ruleguard/rules v0.0.0-20210203162857-b223e0831f88 h1:PeTrJiH/dSeruL/Z9Db39NRMwI/yoA3oHCdCkg+Wh8A= +github.com/quasilyte/go-ruleguard/rules v0.0.0-20210203162857-b223e0831f88/go.mod h1:4cgAphtvu7Ftv7vOT2ZOYhC6CvBxZixcasr8qIOTA50= github.com/quasilyte/gogrep v0.0.0-20220828223005-86e4605de09f h1:6Gtn2i04RD0gVyYf2/IUMTIs+qYleBt4zxDqkLTcu4U= github.com/quasilyte/gogrep v0.0.0-20220828223005-86e4605de09f/go.mod h1:Cm9lpz9NZjEoL1tgZ2OgeUKPIxL1meE7eo60Z6Sk+Ng= github.com/quasilyte/regex/syntax v0.0.0-20200407221936-30656e2c4a95 h1:L8QM9bvf68pVdQ3bCFZMDmnt9yqcMBro1pC7F+IPYMY= @@ -1841,8 +2243,11 @@ github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567/go.mod h1:DWNGW8 github.com/rakyll/statik v0.1.7 h1:OF3QCZUuyPxuGEP7B4ypUa7sB/iHtqOTDYZXGM8KOdQ= github.com/rakyll/statik v0.1.7/go.mod h1:AlZONWzMtEnMs7W4e/1LURLiI49pIMmp6V9Unghqrcc= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= +github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= +github.com/regen-network/cosmos-proto v0.3.1 h1:rV7iM4SSFAagvy8RiyhiACbWEGotmqzywPxOvwMdxcg= +github.com/regen-network/cosmos-proto v0.3.1/go.mod h1:jO0sVX6a1B36nmE8C9xBFXpNwWejXC7QqCOnH3O0+YM= github.com/regen-network/gocuke v0.6.2 h1:pHviZ0kKAq2U2hN2q3smKNxct6hS0mGByFMHGnWA97M= github.com/regen-network/gocuke v0.6.2/go.mod h1:zYaqIHZobHyd0xOrHGPQjbhGJsuZ1oElx150u2o1xuk= github.com/regen-network/protobuf v1.3.3-alpha.regen.1 h1:OHEc+q5iIAXpqiqFKeLpu5NwTIkVXUs48vFMwzqpqY4= @@ -1855,13 +2260,19 @@ github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6So github.com/rogpeppe/fastuuid v1.2.0 h1:Ppwyp6VYCF1nvBTXL3trRso7mXMlRrw9ooo375wvi2s= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/rogpeppe/go-internal v1.6.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= +github.com/rs/cors v0.0.0-20160617231935-a62a804a8a00/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= github.com/rs/cors v1.8.3 h1:O+qNyWn7Z+F9M0ILBHgMVPuB1xTOucVd5gtaYyXBpRo= github.com/rs/cors v1.8.3/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= +github.com/rs/xhandler v0.0.0-20160618193221-ed27b6fd6521 h1:3hxavr+IHMsQBrYUPQM5v0CgENFktkkbg1sfpgM3h20= +github.com/rs/xhandler v0.0.0-20160618193221-ed27b6fd6521/go.mod h1:RvLn4FgxWubrpZHtQLnOf6EwhN2hEMusxZOhcW9H3UQ= +github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= github.com/rs/xid v1.4.0 h1:qd7wPTDkN6KQx2VmMBLrpHkiyQwgFXRnkOLacUiaSNY= github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= +github.com/rs/zerolog v1.23.0/go.mod h1:6c7hFfxPOy7TacJc4Fcdi24/J0NKYGzjG8FWRI916Qo= github.com/rs/zerolog v1.29.1 h1:cO+d60CHkknCbvzEWxP0S9K6KqyTjrCNUy1LdQLCGPc= github.com/rs/zerolog v1.29.1/go.mod h1:Le6ESbR7hc+DP6Lt1THiV8CQSdkkNrd3R0XbEgp3ZBU= github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo= @@ -1869,18 +2280,23 @@ github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/ryancurrah/gomodguard v1.2.3/go.mod h1:rYbA/4Tg5c54mV1sv4sQTP5WOPBcoLtnBZ7/TEhXAbg= github.com/ryancurrah/gomodguard v1.2.4 h1:CpMSDKan0LtNGGhPrvupAoLeObRFjND8/tU1rEOtBp4= github.com/ryancurrah/gomodguard v1.2.4/go.mod h1:+Kem4VjWwvFpUJRJSwa16s1tBJe+vbv02+naTow2f6M= github.com/ryanrolds/sqlclosecheck v0.3.0 h1:AZx+Bixh8zdUBxUA1NxbxVAS78vTPq4rCb8OUZI9xFw= github.com/ryanrolds/sqlclosecheck v0.3.0/go.mod h1:1gREqxyTGR3lVtpngyFo3hZAgk0KCtEdgEkHwDbigdA= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f h1:UFr9zpz4xgTnIE5yIMtWAMngCdZ9p/+q6lTbgelo80M= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= +github.com/sagikazarmark/crypt v0.3.0/go.mod h1:uD/D+6UF4SrIR1uGEv7bBNkNqLGqUr43MRiaGWX1Nig= +github.com/sagikazarmark/crypt v0.4.0/go.mod h1:ALv2SRj7GxYV4HO9elxH9nS6M9gW+xDNxqmyJ6RfDFM= github.com/sagikazarmark/crypt v0.10.0 h1:96E1qrToLBU6fGzo+PRRz7KGOc9FkYFiPnR3/zf8Smg= github.com/sagikazarmark/crypt v0.10.0/go.mod h1:gwTNHQVoOS3xp9Xvz5LLR+1AauC5M6880z5NWzdhOyQ= github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da h1:p3Vo3i64TCLY7gIfzeQaUJ+kppEO5WQG3cL8iE8tGHU= github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= github.com/sanposhiho/wastedassign/v2 v2.0.6 h1:+6/hQIHKNJAUixEj6EmOngGIisyeI+T3335lYTyxRoA= github.com/sanposhiho/wastedassign/v2 v2.0.6/go.mod h1:KyZ0MWTwxxBmfwn33zh3k1dmsbF2ud9pAAGfoLfjhtI= +github.com/sasha-s/go-deadlock v0.2.0/go.mod h1:StQn567HiB1fF2yJ44N9au7wOhrPS3iZqiDbRupzT10= +github.com/sasha-s/go-deadlock v0.2.1-0.20190427202633-1595213edefa/go.mod h1:F73l+cr82YSh10GxyRI6qZiCgK64VaZjwesgfQ1/iLM= github.com/sasha-s/go-deadlock v0.3.1 h1:sqv7fDNShgjcaxkO0JNcOAlr8B9+cV5Ey/OB71efZx0= github.com/sasha-s/go-deadlock v0.3.1/go.mod h1:F73l+cr82YSh10GxyRI6qZiCgK64VaZjwesgfQ1/iLM= github.com/sashamelentyev/interfacebloat v1.1.0 h1:xdRdJp0irL086OyW1H/RTZTr1h/tMEOsumirXcOJqAw= @@ -1891,6 +2307,9 @@ github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww= github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= +github.com/seccomp/libseccomp-golang v0.9.1 h1:NJjM5DNFOs0s3kYE1WUOr6G8V97sdt46rlXTMfXGWBo= +github.com/seccomp/libseccomp-golang v0.9.1/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvWlF4P2Ca7zGrPiEpWo= +github.com/securego/gosec/v2 v2.8.1/go.mod h1:pUmsq6+VyFEElJMUX+QB3p3LWNHXg1R3xh2ssVJPs8Q= github.com/securego/gosec/v2 v2.13.1 h1:7mU32qn2dyC81MH9L2kefnQyRMUarfDER3iQyMHcjYM= github.com/securego/gosec/v2 v2.13.1/go.mod h1:EO1sImBMBWFjOTFzMWfTRrZW6M15gm60ljzrmy/wtHo= github.com/segmentio/fasthash v1.0.3 h1:EI9+KE1EwvMLBWwjpRDc+fEM+prwxDYbslddQGtrmhM= @@ -1903,14 +2322,23 @@ github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0= github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c h1:W65qqJCIOVP4jpqPQ0YvHYKwcMEMVWIzWC5iNQQfBTU= github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c/go.mod h1:/PevMnwAxekIXwN8qQyfc5gl2NlkB3CQlkizAbOkeBs= +github.com/shirou/gopsutil v2.20.5+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible h1:Bn1aCHHRnjv4Bl16T8rcaFjYSrGrIZvpiGO6P3Q4GpU= github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= +github.com/shirou/gopsutil/v3 v3.21.7 h1:PnTqQamUjwEDSgn+nBGu0qSDV/CfvyiR/gwTH3i7HTU= +github.com/shirou/gopsutil/v3 v3.21.7/go.mod h1:RGl11Y7XMTQPmHh8F0ayC6haKNBgH4PXMJuTAcMOlz4= +github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e h1:MZM7FHLqUHYI0Y/mQAt3d2aYa0SiNms/hFqC9qJYolM= +github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk= +github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041 h1:llrF3Fs4018ePo4+G/HV/uQUqEI1HMDjCeOf2V6puPc= +github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod h1:N5mDOmsrJOB+vfqUK+7DmDyjhSLIIBnXo9lvZJj3MWQ= github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= +github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/sivchari/containedctx v1.0.2 h1:0hLQKpgC53OVF1VT7CeoFHk9YKstur1XOgfYIc1yrHI= @@ -1939,13 +2367,21 @@ github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasO github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI= github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= +github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4= +github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= github.com/spf13/afero v1.9.5 h1:stMpOSZFs//0Lv29HduCmli3GUfpFoF3Y1Q/aXj/wVM= github.com/spf13/afero v1.9.5/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.5.1 h1:R+kOtfhWQE6TVQzY+4D7wJLBgkdVasCEFxSUBYBYIlA= github.com/spf13/cast v1.5.1/go.mod h1:b9PdjNptOpzXr7Rq1q9gJML/2cdGQAo69NKzQ10KN48= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= +github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= +github.com/spf13/cobra v1.1.1/go.mod h1:WnodtKOvamDL/PwE2M4iKs8aMDBZ5Q5klgD3qfVJQMI= +github.com/spf13/cobra v1.2.1/go.mod h1:ExllRjgxM/piMAM+3tAZvg8fsklGAf3tPfi+i8t68Nk= +github.com/spf13/cobra v1.3.0/go.mod h1:BrRVncBjOJa/eUcVVm9CE+oC6as8k+VYr4NY7WCi9V4= github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I= github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= @@ -1956,14 +2392,25 @@ github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnIn github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= +github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= +github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= +github.com/spf13/viper v1.7.1/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= +github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns= +github.com/spf13/viper v1.10.0/go.mod h1:SoyBPwAtKDzypXNDFKN5kzH7ppppbGZtls1UpIy5AsM= +github.com/spf13/viper v1.10.1/go.mod h1:IGlFPqhNAPKRxohIzWpI5QEy4kuI7tcl5WvR+8qy1rU= github.com/spf13/viper v1.16.0 h1:rGGH0XDZhdUOryiDWjmIvUSWpbNqisK8Wk0Vyefw8hc= github.com/spf13/viper v1.16.0/go.mod h1:yg78JgCJcbrQOvV9YLXgkLaZqUidkY9K+Dd1FofRzQg= +github.com/ssgreg/nlreturn/v2 v2.1.0/go.mod h1:E/iiPB78hV7Szg2YfRgyIrk1AD6JVMTRkkxBiELzh2I= github.com/ssgreg/nlreturn/v2 v2.2.1 h1:X4XDI7jstt3ySqGU86YGAURbxw3oTDPK9sPEi6YEwQ0= github.com/ssgreg/nlreturn/v2 v2.2.1/go.mod h1:E/iiPB78hV7Szg2YfRgyIrk1AD6JVMTRkkxBiELzh2I= github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4 h1:Gb2Tyox57NRNuZ2d3rmvB3pcmbu7O1RS3m8WRx7ilrg= github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4/go.mod h1:RZLeN1LMWmRsyYjvAu+I6Dm9QmlDaIIt+Y+4Kd7Tp+Q= github.com/stbenjam/no-sprintf-host-port v0.1.1 h1:tYugd/yrm1O0dV+ThCbaKZh195Dfm07ysF0U6JQXczc= github.com/stbenjam/no-sprintf-host-port v0.1.1/go.mod h1:TLhvtIvONRzdmkFiio4O8LHsN9N74I+PhRquPsxpL0I= +github.com/steakknife/bloomfilter v0.0.0-20180922174646-6819c0d2a570 h1:gIlAHnH1vJb5vwEjIp5kBj/eu99p/bl0Ay2goiPe5xE= +github.com/steakknife/bloomfilter v0.0.0-20180922174646-6819c0d2a570/go.mod h1:8OR4w3TdeIHIh1g6EMY5p0gVNOovcWC+1vpc7naMuAw= +github.com/steakknife/hamming v0.0.0-20180906055917-c99c65617cd3 h1:njlZPzLwU639dk2kqnCPPv+wNjq7Xb6EfUxe/oX0/NM= +github.com/steakknife/hamming v0.0.0-20180906055917-c99c65617cd3/go.mod h1:hpGUWaI9xL8pRQCTXQgocU38Qw1g0Us7n5PxxTwTCYU= github.com/strangelove-ventures/packet-forward-middleware/v7 v7.0.0-20230523193151-73dea436e53f h1:NJdZ+YJ9Vf2t286L20IjFK0SxGpobF1xIp5ZQlxWetk= github.com/strangelove-ventures/packet-forward-middleware/v7 v7.0.0-20230523193151-73dea436e53f/go.mod h1:DJNSVK8NCYHM+aZHCFkcAqPwjzwHYAjhjSMlhAGtJ3c= github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= @@ -1975,9 +2422,12 @@ github.com/streadway/handy v0.0.0-20200128134331-0f66f006fb2e h1:mOtuXaRAbVZsxAH github.com/streadway/handy v0.0.0-20200128134331-0f66f006fb2e/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.3.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/testify v0.0.0-20170130113145-4d4bfba8f1d1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.1.4/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.0/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= @@ -1991,30 +2441,56 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8= github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= +github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 h1:kdXcSzyDtseVEc4yCz2qF8ZrQvIDBJLl4S1c3GCXmoI= +github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY= github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc= +github.com/tdakkota/asciicheck v0.0.0-20200416200610-e657995f937b/go.mod h1:yHp0ai0Z9gUljN3o0xMhYJnH/IcvkdTBOX2fmJ93JEM= github.com/tdakkota/asciicheck v0.1.1 h1:PKzG7JUTUmVspQTDqtkX9eSiLGossXTybutHwTXuO0A= github.com/tdakkota/asciicheck v0.1.1/go.mod h1:yHp0ai0Z9gUljN3o0xMhYJnH/IcvkdTBOX2fmJ93JEM= github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c h1:g+WoO5jjkqGAzHWCjJB1zZfXPIAaDpzXIEJ0eS6B5Ok= github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c/go.mod h1:ahpPrc7HpcfEWDQRZEmnXMzHY03mLDYMCxeDzy46i+8= +github.com/tendermint/btcd v0.1.1 h1:0VcxPfflS2zZ3RiOAHkBiFUcPvbtRj5O7zHmcJWHV7s= +github.com/tendermint/btcd v0.1.1/go.mod h1:DC6/m53jtQzr/NFmMNEu0rxf18/ktVoVtMrnDD5pN+U= +github.com/tendermint/crypto v0.0.0-20191022145703-50d29ede1e15 h1:hqAk8riJvK4RMWx1aInLzndwxKalgi5rTqgfXxOxbEI= +github.com/tendermint/crypto v0.0.0-20191022145703-50d29ede1e15/go.mod h1:z4YtwM70uOnk8h0pjJYlj3zdYwi9l03By6iAIF5j/Pk= github.com/tendermint/go-amino v0.16.0 h1:GyhmgQKvqF82e2oZeuMSp9JTN0N09emoSZlb2lyGa2E= github.com/tendermint/go-amino v0.16.0/go.mod h1:TQU0M1i/ImAo+tYpZi73AU3V/dKeCoMC9Sphe2ZwGME= +github.com/tendermint/spm v0.1.9 h1:O1DJF4evS8wgk5SZqRcO29irNNtKQmTpvQ0xFzUiczI= +github.com/tendermint/spm v0.1.9/go.mod h1:iHgfQ5YOI6ONc9E7ugGQolVdfSMHpeXfZ/OpXuN/42Q= +github.com/tendermint/tendermint v0.34.0-rc4/go.mod h1:yotsojf2C1QBOw4dZrTcxbyxmPUrT4hNuOQWX9XUwB4= +github.com/tendermint/tendermint v0.34.0-rc6/go.mod h1:ugzyZO5foutZImv0Iyx/gOFCX6mjJTgbLHTwi17VDVg= +github.com/tendermint/tendermint v0.34.0/go.mod h1:Aj3PIipBFSNO21r+Lq3TtzQ+uKESxkbA3yo/INM4QwQ= +github.com/tendermint/tendermint v0.34.13/go.mod h1:6RVVRBqwtKhA+H59APKumO+B7Nye4QXSFc6+TYxAxCI= +github.com/tendermint/tendermint v0.34.14 h1:GCXmlS8Bqd2Ix3TQCpwYLUNHe+Y+QyJsm5YE+S/FkPo= +github.com/tendermint/tendermint v0.34.14/go.mod h1:FrwVm3TvsVicI9Z7FlucHV6Znfd5KBc/Lpp69cCwtk0= +github.com/tendermint/tm-db v0.6.2/go.mod h1:GYtQ67SUvATOcoY8/+x6ylk8Qo02BQyLrAs+yAcLvGI= +github.com/tendermint/tm-db v0.6.3/go.mod h1:lfA1dL9/Y/Y8wwyPp2NMLyn5P5Ptr/gvDFNWtrCWSf8= +github.com/tendermint/tm-db v0.6.4 h1:3N2jlnYQkXNQclQwd/eKV/NzlqPlfK21cpRRIx80XXQ= +github.com/tendermint/tm-db v0.6.4/go.mod h1:dptYhIpJ2M5kUuenLr+Yyf3zQOv1SgBZcl8/BmWlMBw= +github.com/tetafro/godot v1.4.9/go.mod h1:LR3CJpxDVGlYOWn3ZZg1PgNZdTUvzsZWu8xaEohUpn8= github.com/tetafro/godot v1.4.11 h1:BVoBIqAf/2QdbFmSwAWnaIqDivZdOV0ZRwEm6jivLKw= github.com/tetafro/godot v1.4.11/go.mod h1:LR3CJpxDVGlYOWn3ZZg1PgNZdTUvzsZWu8xaEohUpn8= github.com/tidwall/btree v1.6.0 h1:LDZfKfQIBHGHWSwckhXI0RPSXzlo+KYdjK7FWSqOzzg= github.com/tidwall/btree v1.6.0/go.mod h1:twD9XRA5jj9VUQGELzDO4HPQTNJsoWWfYEL+EUQ2cKY= +github.com/tidwall/gjson v1.6.7/go.mod h1:zeFuBCIqD4sN/gmqBzZ4j7Jd6UcA2Fc56x7QFsv+8fI= github.com/tidwall/gjson v1.12.1/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= github.com/tidwall/gjson v1.14.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= github.com/tidwall/gjson v1.14.4 h1:uo0p8EbA09J7RQaflQ1aBRffTR7xedD2bcIVSYxLnkM= github.com/tidwall/gjson v1.14.4/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= +github.com/tidwall/match v1.0.3/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA= github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= +github.com/tidwall/pretty v1.0.2/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs= github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU= +github.com/tidwall/sjson v1.1.4/go.mod h1:wXpKXu8CtDjKAZ+3DrKY5ROCorDFahq8l0tey/Lx1fg= github.com/tidwall/sjson v1.2.4 h1:cuiLzLnaMeBhRmEv00Lpk3tkYrcxpmbU81tAY4Dw0tc= github.com/tidwall/sjson v1.2.4/go.mod h1:098SZ494YoMWPmMO6ct4dcFnqxwj9r/gF0Etp19pSNM= +github.com/timakin/bodyclose v0.0.0-20200424151742-cb6215831a94/go.mod h1:Qimiffbc6q9tBWlVV6x0P9sat/ao1xEkREYPPj9hphk= github.com/timakin/bodyclose v0.0.0-20210704033933-f49887972144 h1:kl4KhGNsJIbDHS9/4U9yQo1UcPQM0kOMJHn29EoH/Ro= github.com/timakin/bodyclose v0.0.0-20210704033933-f49887972144/go.mod h1:Qimiffbc6q9tBWlVV6x0P9sat/ao1xEkREYPPj9hphk= github.com/timonwong/loggercheck v0.9.3 h1:ecACo9fNiHxX4/Bc02rW2+kaJIAMAes7qJ7JKxt0EZI= @@ -2023,12 +2499,23 @@ github.com/tinylib/msgp v1.0.2 h1:DfdQrzQa7Yh2es9SuLkixqxuXS2SxsdYn0KbdrOGWD8= github.com/tinylib/msgp v1.0.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE= github.com/tklauser/go-sysconf v0.3.5 h1:uu3Xl4nkLzQfXNsWn15rPc/HQCJKObbt1dKJeWp3vU4= github.com/tklauser/go-sysconf v0.3.5/go.mod h1:MkWzOF4RMCshBAMXuhXJs64Rte09mITnppBXY/rYEFI= +github.com/tklauser/go-sysconf v0.3.7 h1:HT7h4+536gjqeq1ZIJPgOl1rg1XFatQGVZWp7Py53eg= +github.com/tklauser/go-sysconf v0.3.7/go.mod h1:JZIdXh4RmBvZDBZ41ld2bGxRV3n4daiiqA3skYhAoQ4= github.com/tklauser/numcpus v0.2.2 h1:oyhllyrScuYI6g+h/zUvNXNp1wy7x8qQy3t/piefldA= github.com/tklauser/numcpus v0.2.2/go.mod h1:x3qojaO3uyYt0i56EW/VUYs7uBvdl2fkfZFu0T9wgjM= +github.com/tklauser/numcpus v0.2.3 h1:nQ0QYpiritP6ViFhrKYsiv6VVxOpum2Gks5GhnJbS/8= +github.com/tklauser/numcpus v0.2.3/go.mod h1:vpEPS/JC+oZGGQ/My/vJnNsvMDQL6PwOqt8dsCw5j+E= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8 h1:ndzgwNDnKIqyCvHTXaCqh9KlOWKvBry6nuXMJmonVsE= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/tmc/grpc-websocket-proxy v0.0.0-20200427203606-3cfed13b9966 h1:j6JEOq5QWFker+d7mFQYOhjTZonQ7YkLTHm56dbn+yM= +github.com/tmc/grpc-websocket-proxy v0.0.0-20200427203606-3cfed13b9966/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/tomarrell/wrapcheck/v2 v2.3.0/go.mod h1:aF5rnkdtqNWP/gC7vPUO5pKsB0Oac2FDTQP4F+dpZMU= github.com/tomarrell/wrapcheck/v2 v2.7.0 h1:J/F8DbSKJC83bAvC6FoZaRjZiZ/iKoueSdrEkmGeacA= github.com/tomarrell/wrapcheck/v2 v2.7.0/go.mod h1:ao7l5p0aOlUNJKI0qVwB4Yjlqutd0IvAB9Rdwyilxvg= +github.com/tomasen/realip v0.0.0-20180522021738-f0c99a92ddce h1:fb190+cK2Xz/dvi9Hv8eCYJYvIGUTN2/KLq1pT6CjEc= +github.com/tomasen/realip v0.0.0-20180522021738-f0c99a92ddce/go.mod h1:o8v6yHRoik09Xen7gje4m9ERNah1d1PPsVq1VEx9vE4= +github.com/tommy-muehle/go-mnd/v2 v2.4.0/go.mod h1:WsUAkMJMYww6l/ufffCD3m+P7LEvr8TnZn9lwVDlgzw= github.com/tommy-muehle/go-mnd/v2 v2.5.1 h1:NowYhSdyE/1zwK9QCLeRb6USWdoif80Ie+v+yU8u1Zw= github.com/tommy-muehle/go-mnd/v2 v2.5.1/go.mod h1:WsUAkMJMYww6l/ufffCD3m+P7LEvr8TnZn9lwVDlgzw= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926 h1:G3dpKMzFDjgEh2q1Z7zUUtKa8ViPtH+ocF0bE0g00O8= @@ -2036,6 +2523,7 @@ github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqri github.com/tyler-smith/go-bip39 v1.0.1-0.20181017060643-dbb3b84ba2ef/go.mod h1:sJ5fKU0s6JVwZjjcUEX2zFOnvq0ASQ2K9Zr6cf67kNs= github.com/tyler-smith/go-bip39 v1.0.2 h1:+t3w+KwLXO6154GNJY+qUtIxLTmFjfUmpguQT1OlOT8= github.com/tyler-smith/go-bip39 v1.0.2/go.mod h1:sJ5fKU0s6JVwZjjcUEX2zFOnvq0ASQ2K9Zr6cf67kNs= +github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo= github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= @@ -2047,6 +2535,7 @@ github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8= github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/ultraware/funlen v0.0.3 h1:5ylVWm8wsNwH5aWo9438pwvsK0QiqVuUrt9bn7S/iLA= github.com/ultraware/funlen v0.0.3/go.mod h1:Dp4UiAus7Wdb9KUZsYWZEWiRzGuM2kXM1lPbfaF6xhA= +github.com/ultraware/whitespace v0.0.4/go.mod h1:aVMh/gQve5Maj9hQ/hg+F75lr/X5A89uZnzAmWSineA= github.com/ultraware/whitespace v0.0.5 h1:hh+/cpIcopyMYbZNVov9iSxvJU3OYQg78Sfaqzi/CzI= github.com/ultraware/whitespace v0.0.5/go.mod h1:aVMh/gQve5Maj9hQ/hg+F75lr/X5A89uZnzAmWSineA= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= @@ -2054,21 +2543,39 @@ github.com/urfave/cli v1.22.1 h1:+mkCCcOFKPnCmVYVcURKps1Xe+3zP90gSYGNfRkjoIY= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/urfave/cli/v2 v2.3.0 h1:qph92Y649prgesehzOrQjdWyxFOp/QVM+6imKHad91M= github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI= +github.com/uudashr/gocognit v1.0.5/go.mod h1:wgYz0mitoKOTysqxTDMOUXg+Jb5SvtihkfmugIZYpEA= github.com/uudashr/gocognit v1.0.6 h1:2Cgi6MweCsdB6kpcVQp7EW4U23iBFQWfTXiWlyp842Y= github.com/uudashr/gocognit v1.0.6/go.mod h1:nAIUuVBnYU7pcninia3BHOvQkpQCeO76Uscky5BOwcY= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= +github.com/valyala/fasthttp v1.16.0 h1:9zAqOYLl8Tuy3E5R6ckzGDJ1g8+pw15oQp2iL9Jl6gQ= +github.com/valyala/fasthttp v1.16.0/go.mod h1:YOKImeEosDdBPnxc0gy7INqi3m1zK6A+xl6TwOBhHCA= github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8= github.com/valyala/fasttemplate v1.2.1 h1:TVEnxayobAdVkhQfrfes2IzOB6o+z4roRkPF52WA1u4= github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= +github.com/valyala/quicktemplate v1.6.3 h1:O7EuMwuH7Q94U2CXD6sOX8AYHqQqWtmIk690IhmpkKA= +github.com/valyala/quicktemplate v1.6.3/go.mod h1:fwPzK2fHuYEODzJ9pkw0ipCPNHZ2tD5KW4lOuSdPKzY= +github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a h1:0R4NLDRDZX6JcmhJgXi5E4b8Wg84ihbmUKp/GvSPEzc= +github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio= github.com/vektra/mockery/v2 v2.14.0 h1:KZ1p5Hrn8tiY+LErRMr14HHle6khxo+JKOXLBW/yfqs= github.com/vektra/mockery/v2 v2.14.0/go.mod h1:bnD1T8tExSgPD1ripLkDbr60JA9VtQeu12P3wgLZd7M= +github.com/viki-org/dnscache v0.0.0-20130720023526-c70c1f23c5d8 h1:EVObHAr8DqpoJCVv6KYTle8FEImKhtkfcZetNqxDoJQ= +github.com/viki-org/dnscache v0.0.0-20130720023526-c70c1f23c5d8/go.mod h1:dniwbG03GafCjFohMDmz6Zc6oCuiqgH6tGNyXTkHzXE= +github.com/vishvananda/netlink v1.1.0 h1:1iyaYNBLmP6L0220aDnYQpo1QEV4t4hJ+xEEhhJH8j0= +github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE= +github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df h1:OviZH7qLw/7ZovXvuNyL3XQl8UFofeikI1NW1Gypu7k= +github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU= +github.com/vmihailenco/msgpack/v5 v5.1.4/go.mod h1:C5gboKD0TJPqWDTVTtrQNfRbiBwHZGo8UTqP/9/XvLI= github.com/vmihailenco/msgpack/v5 v5.3.5 h1:5gO0H1iULLWGhs2H5tbAHIZTV8/cYafcFOr9znI5mJU= github.com/vmihailenco/msgpack/v5 v5.3.5/go.mod h1:7xyJ9e+0+9SaZT0Wt1RGleJXzli6Q/V5KbhBonMG9jc= +github.com/vmihailenco/tagparser v0.1.2 h1:gnjoVuB/kljJ5wICEEOpx98oXMWPLj22G67Vbd1qPqc= +github.com/vmihailenco/tagparser v0.1.2/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI= github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g= github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds= github.com/willf/bitset v1.1.3 h1:ekJIKh6+YbUIVt9DfNbkR5d6aFcFTLDRyJNAACURBg8= github.com/willf/bitset v1.1.3/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4= +github.com/wsddn/go-ecdh v0.0.0-20161211032359-48726bab9208 h1:1cngl9mPEoITZG8s8cVcUy5CeIBYhEESkOB7m6Gmkrk= +github.com/wsddn/go-ecdh v0.0.0-20161211032359-48726bab9208/go.mod h1:IotVbo4F+mw0EzQ08zFqg7pK3FebNXpaMsRy2RT+Ees= github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM= github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw= github.com/xhit/go-str2duration/v2 v2.1.0 h1:lxklc02Drh6ynqX+DdPyp5pCKLUQpRT8bp8Ydu2Bstc= @@ -2077,14 +2584,23 @@ github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 h1:eY9dn8+vbi4tKz5 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xlab/treeprint v0.0.0-20180616005107-d6fb6747feb6 h1:YdYsPAZ2pC6Tow/nPZOPQ96O3hm/ToAkGsPLzedXERk= github.com/xlab/treeprint v0.0.0-20180616005107-d6fb6747feb6/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg= +github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 h1:QldyIu/L63oPpyvQmHgvgickp1Yw510KJOqX7H24mg8= +github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778/go.mod h1:2MuV+tbUrU1zIOPMxZ5EncGwgmMJsa+9ucAQZXxsObs= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77 h1:ESFSdwYZvkeru3RtdrYueztKhOBCSAAzS4Gf+k0tEow= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= github.com/yagipy/maintidx v1.0.0 h1:h5NvIsCz+nRDapQ0exNv4aJ0yXSI0420omVANTv3GJM= github.com/yagipy/maintidx v1.0.0/go.mod h1:0qNf/I/CCZXSMhsRsrEPDZ+DkekpKLXAJfsTACwgXLk= github.com/ybbus/jsonrpc v2.1.2+incompatible h1:V4mkE9qhbDQ92/MLMIhlhMSbz8jNXdagC3xBR5NDwaQ= github.com/ybbus/jsonrpc v2.1.2+incompatible/go.mod h1:XJrh1eMSzdIYFbM08flv0wp5G35eRniyeGut1z+LSiE= +github.com/yeya24/promlinter v0.1.0/go.mod h1:rs5vtZzeBHqqMwXqFScncpCF6u06lezhZepno9AB1Oc= github.com/yeya24/promlinter v0.2.0 h1:xFKDQ82orCU5jQujdaD8stOHiv8UN68BSdn2a8u8Y3o= github.com/yeya24/promlinter v0.2.0/go.mod h1:u54lkmBOZrpEbQQ6gox2zWKKLKu2SGe+2KOiextY+IA= +github.com/yudai/gojsondiff v1.0.0 h1:27cbfqXLVEJ1o8I6v3y9lg8Ydm53EKqHXAOMxEGlCOA= +github.com/yudai/gojsondiff v1.0.0/go.mod h1:AY32+k2cwILAkW1fbgxQ5mUmMiZFgLIV+FBNExI05xg= +github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 h1:BHyfKlQyqbsFN5p3IfnEUduWvb9is428/nNb5L3U01M= +github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDfVJdfcVVdX+jpBxNmX4rDAzaS45IcYoM= +github.com/yudai/pp v2.0.1+incompatible h1:Q4//iY4pNF6yPLZIigmvcl7k/bPgrcTPIFIcmawg5bI= +github.com/yudai/pp v2.0.1+incompatible/go.mod h1:PuxR/8QJ7cyCkFp/aUDS+JY727OFEZkTdatxwunjIkc= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -2092,27 +2608,42 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13 h1:fVcFKWvrslecOb/tg+Cc05dkeYx540o0FuFt3nUVDoE= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +github.com/zondax/hid v0.9.0/go.mod h1:l5wttcP0jwtdLjqjMMWFVEE7d1zO0jvSPA9OPZxWpEM= github.com/zondax/hid v0.9.1 h1:gQe66rtmyZ8VeGFcOpbuH3r7erYtNEAezCAYu8LdkJo= github.com/zondax/hid v0.9.1/go.mod h1:l5wttcP0jwtdLjqjMMWFVEE7d1zO0jvSPA9OPZxWpEM= +github.com/zondax/ledger-go v0.14.0/go.mod h1:fZ3Dqg6qcdXWSOJFKMG8GCTnD7slO/RL2feOQv8K320= github.com/zondax/ledger-go v0.14.1 h1:Pip65OOl4iJ84WTpA4BKChvOufMhhbxED3BaihoZN4c= github.com/zondax/ledger-go v0.14.1/go.mod h1:fZ3Dqg6qcdXWSOJFKMG8GCTnD7slO/RL2feOQv8K320= gitlab.com/bosi/decorder v0.2.3 h1:gX4/RgK16ijY8V+BRQHAySfQAb354T7/xQpDB2n10P0= gitlab.com/bosi/decorder v0.2.3/go.mod h1:9K1RB5+VPNQYtXtTDAzd2OEftsZb1oV0IrJrzChSdGE= +go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= +go.etcd.io/bbolt v1.3.4/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= +go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= go.etcd.io/bbolt v1.3.7 h1:j+zJOnnEjF/kyHlDDgGnVL/AIqIJPq8UoB2GSNfkUfQ= go.etcd.io/bbolt v1.3.7/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw= go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738 h1:VcrIfasaLFkyjk6KNlXQSzO+B0fZcnECiDrKJsfxka0= go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= +go.etcd.io/etcd v0.0.0-20200513171258-e048e166ab9c h1:/RwRVN9EdXAVtdHxP7Ndn/tfmM9/goiwU0QTnLBgS4w= +go.etcd.io/etcd v0.0.0-20200513171258-e048e166ab9c/go.mod h1:xCI7ZzBfRuGgBXyXO6yfWfDmlWd35khcWpUa4L0xI/k= +go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= +go.etcd.io/etcd/api/v3 v3.5.1/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= go.etcd.io/etcd/api/v3 v3.5.9 h1:4wSsluwyTbGGmyjJktOf3wFQoTBIURXHnq9n/G/JQHs= go.etcd.io/etcd/api/v3 v3.5.9/go.mod h1:uyAal843mC8uUVSLWz6eHa/d971iDGnCRpmKd2Z+X8k= +go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= +go.etcd.io/etcd/client/pkg/v3 v3.5.1/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/pkg/v3 v3.5.9 h1:oidDC4+YEuSIQbsR94rY9gur91UPL6DnxDCIYd2IGsE= go.etcd.io/etcd/client/pkg/v3 v3.5.9/go.mod h1:y+CzeSmkMpWN2Jyu1npecjB9BBnABxGM4pN8cGuJeL4= +go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= +go.etcd.io/etcd/client/v2 v2.305.1/go.mod h1:pMEacxZW7o8pg4CrFE7pquyCJJzZvkvdD2RibOCCCGs= go.etcd.io/etcd/client/v2 v2.305.7 h1:AELPkjNR3/igjbO7CjyF1fPuVPjrblliiKj+Y6xSGOU= go.etcd.io/etcd/client/v2 v2.305.7/go.mod h1:GQGT5Z3TBuAQGvgPfhR7VPySu/SudxmEkRq9BgzFU6s= go.etcd.io/etcd/client/v3 v3.5.9 h1:r5xghnU7CwbUxD/fbUtRyJGaYNfDun8sp/gTr1hew6E= go.etcd.io/etcd/client/v3 v3.5.9/go.mod h1:i/Eo5LrZ5IKqpbtpPDuaUnDOUv471oDg8cjQaUr2MbA= go.etcd.io/gofail v0.1.0 h1:XItAMIhOojXFQMgrxjnd2EIIHun/d5qL0Pf7FzVTkFg= go.etcd.io/gofail v0.1.0/go.mod h1:VZBCXYGZhHAinaBiiqYvuDynvahNsAyLFwB3kEHKz1M= +go.mozilla.org/mozlog v0.0.0-20170222151521-4bb13139d403 h1:rKyWXYDfrVOpMFBion4Pmx5sJbQreQNXycHvm4KwJSg= +go.mozilla.org/mozlog v0.0.0-20170222151521-4bb13139d403/go.mod h1:jHoPAGnDrCy6kaI2tAze5Prf0Nr0w/oNkROt2lw3n3o= go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= @@ -2142,6 +2673,7 @@ go.uber.org/goleak v1.1.10 h1:z+mqJhf6ss6BSfSM671tgKyZBFPTTJM+HLxnhPC3wu0= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= +go.uber.org/multierr v1.4.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= @@ -2150,10 +2682,12 @@ go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9E go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= +go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= go.uber.org/zap v1.18.1/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20180501155221-613d6eafa307/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= @@ -2162,18 +2696,25 @@ golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190909091759-094676da4a83/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200115085410-6d4e4cb37c7d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= +golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220314234659-1baeb1ce4c0b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= @@ -2185,6 +2726,7 @@ golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= +golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56/go.mod h1:JhuoJpWY28nO4Vef9tZUw9qufEGTyX1+7lmHxV5q5G4= golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= @@ -2217,15 +2759,19 @@ golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPI golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028 h1:4+4C/Iv2U4fMZBiMCc98MG1In4gJY5YRhtpDNeDeHWs= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= +golang.org/x/mobile v0.0.0-20200801112145-973feb4309de h1:OVJ6QQUBAesB8CZijKDSsXX7xYVtUhrkY0gwMfbi4p4= +golang.org/x/mobile v0.0.0-20200801112145-973feb4309de/go.mod h1:skQtrUTUwhdJvXM/2KKJzY8pDgNr9I/FOMqDVRPBUS4= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.1.1-0.20191209134235-331c550502dd/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= @@ -2233,6 +2779,7 @@ golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181011144130-49bb7cea24b1/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -2244,12 +2791,15 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -2263,10 +2813,12 @@ golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/ golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= @@ -2278,9 +2830,14 @@ golang.org/x/net v0.0.0-20210220033124-5f55cee0dc0d/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= +golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8= +golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210610132358-84b48f89b13b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= @@ -2308,10 +2865,12 @@ golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= @@ -2328,6 +2887,7 @@ golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190412183630-56d357773e84/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -2358,15 +2918,21 @@ golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191115151921-52ab43148777/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -2376,6 +2942,7 @@ golang.org/x/sys v0.0.0-20200107162124-548cf772de50/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -2388,31 +2955,40 @@ golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200824131525-c12d262b63d8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200826173525-f9321e4c35a6/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210316164454-77fc1eacc6aa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210420205809-ac73e9fd8988/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210426230700-d19ff857e887/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -2420,15 +2996,20 @@ golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210819135213-f52c844e1c1c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210903071746-97244b99971b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211205182925-97ca703d548d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220204135822-1c1b9b1eba6a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -2473,6 +3054,7 @@ golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxb golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.1.0 h1:xYY+Bajn2a7VBmTM5GikTmnK8ZuX8YgnQCqZpbBNtmA= @@ -2480,12 +3062,17 @@ golang.org/x/time v0.1.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190110163146-51295c7ec13a/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +golang.org/x/tools v0.0.0-20190307163923-6a08e3108db3/go.mod h1:25r3+/G6/xytQM8iWZKq3Hn0kr0rgFKPUNVEL/dr3z4= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190311215038-5c2858a9cfe5/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190321232350-e250d351ecad/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190322203728-c1a832b0ad89/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= @@ -2494,21 +3081,29 @@ golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgw golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190910044552-dd2b5c81c578/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190916130336-e45ffcd953cc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191010075000-0337d82405ff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200108203644-89082a384178/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200117012304-6edc0a871e69/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200117220505-0cba7a3a9ee9/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= @@ -2518,19 +3113,46 @@ golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapK golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= +golang.org/x/tools v0.0.0-20200324003944-a576cf524670/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= +golang.org/x/tools v0.0.0-20200329025819-fd4102a86c65/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= +golang.org/x/tools v0.0.0-20200414032229-332987a829c3/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200422022333-3d57cf2e726e/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200426102838-f3a5411a4c3b/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200522201501-cb1345f3a375/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200622203043-20e05c1c8ffa/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200624225443-88f3c62a19ff/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200625211823-6506e20df31f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200626171337-aa94e735be7f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200630154851-b2d8b0336632/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200706234117-b22de6825cf7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200717024301-6ddee64345a6/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200724022722-7017fd6b1305/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200812195022-5ae4c3c160a0/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200820010801-b793a1359eac/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200831203904-5a2aa26beb65/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= +golang.org/x/tools v0.0.0-20201001104356-43ebab892c4c/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= +golang.org/x/tools v0.0.0-20201002184944-ecd9fd270d5d/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= +golang.org/x/tools v0.0.0-20201023174141-c8cfbd0f21e6/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20201028025901-8cd080b735b3/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20201114224030-61ea331ec02b/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20201118003311-bd56c0adb394/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20201230224404-63754364767c/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20210101214203-2dba1e4ea05c/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20210104081019-d8d6ddbec6ee/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= @@ -2567,6 +3189,7 @@ google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEt google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +google.golang.org/api v0.10.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= @@ -2584,6 +3207,7 @@ google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34q google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= +google.golang.org/api v0.44.0/go.mod h1:EBOGZqzyhtvMDoxwS97ctnh0zUmYY6CxqXsc1AvkYD8= google.golang.org/api v0.47.0/go.mod h1:Wbvgpq1HddcWVtzsVLyfLp8lDg6AA241LmgIL59tHXo= google.golang.org/api v0.48.0/go.mod h1:71Pr1vy+TAZRPkPs/xlCf5SsU8WjuAWv1Pfjbtukyy4= google.golang.org/api v0.50.0/go.mod h1:4bNT5pAuq5ji4SRZm+5QIkjny9JAyVD/3gaSihNefaw= @@ -2592,7 +3216,9 @@ google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6 google.golang.org/api v0.55.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI= +google.golang.org/api v0.59.0/go.mod h1:sT2boj7M9YJxZzgeZqXogmhfmRWDtPzT31xkieUbuZU= google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I= +google.golang.org/api v0.62.0/go.mod h1:dKmwPCydfsad4qCH08MSdgWjfHOyfpd4VtDGgRFdavw= google.golang.org/api v0.63.0/go.mod h1:gs4ij2ffTRXwuzzgJl/56BdwJaA194ijkfn++9tDuPo= google.golang.org/api v0.67.0/go.mod h1:ShHKP8E60yPsKNw/w8w+VYaj9H6buA5UqDp8dhbQZ6g= google.golang.org/api v0.70.0/go.mod h1:Bs4ZM2HGifEvXwd50TtW70ovgJffJYw2oRCOFU/SkfA= @@ -2618,12 +3244,15 @@ google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= +google.golang.org/appengine v1.6.2/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/genproto v0.0.0-20170818010345-ee236bd376b0/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20181107211654-5fc9ac540362/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= @@ -2633,6 +3262,7 @@ google.golang.org/genproto v0.0.0-20190716160619-c506a9f90610/go.mod h1:DMBHOl98 google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= +google.golang.org/genproto v0.0.0-20190927181202-20e1ac93f88c/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= @@ -2655,11 +3285,15 @@ google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfG google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= +google.golang.org/genproto v0.0.0-20200626011028-ee7919e894b5/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200707001353-8e8330bf89df/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201111145450-ac7456db90a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201119123407-9b1e624d6bc4/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= @@ -2688,7 +3322,11 @@ google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEc google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= google.golang.org/genproto v0.0.0-20210909211513-a8c4777a87af/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211008145708-270636b82663/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211028162531-8db9c33dc351/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211129164237-f09f9a12af12/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211203200212-54befc351ae9/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211221195035-429b39de9b1c/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= @@ -2739,8 +3377,10 @@ google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc h1: google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:vHYtlOoi6TsQ3Uk2yxR7NI5z8uoV+3pZtR4jmHIkRig= google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc h1:XSJ8Vk1SWuNr8S18z1NZSziL0CPIXLCCMDOEFtHBOFc= google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA= +google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.19.1/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= @@ -2748,11 +3388,13 @@ google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ij google.golang.org/grpc v1.22.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.24.0/go.mod h1:XDChyiUovWa60DnaeDeZmSW86xtLtjtZbwvSiRnRtcA= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= +google.golang.org/grpc v1.29.0/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= @@ -2771,6 +3413,8 @@ google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnD google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= +google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= +google.golang.org/grpc v1.43.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= @@ -2794,6 +3438,7 @@ google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= +google.golang.org/protobuf v1.25.1-0.20200805231151-a709e31e5d12/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= @@ -2806,18 +3451,24 @@ gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLks 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= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/cheggaaa/pb.v1 v1.0.27 h1:kJdccidYzt3CaHD1crCFTS1hxyhSi059NhOFUf03YFo= gopkg.in/cheggaaa/pb.v1 v1.0.27/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= +gopkg.in/cheggaaa/pb.v1 v1.0.28 h1:n1tBJnnK2r7g9OW2btFH91V92STTUevLXYFb8gy9EMk= +gopkg.in/cheggaaa/pb.v1 v1.0.28/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/errgo.v2 v2.1.0 h1:0vLT13EuvQ0hNvakwLuFZ/jYrLp5F3kcWHXdRggjCE8= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/gcfg.v1 v1.2.3 h1:m8OOJ4ccYHnx2f4gQwpno8nAX5OGOh7RLaaz0pj3Ogs= gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= +gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/ini.v1 v1.66.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce h1:+JknDZhAj8YMt7GC73Ei8pv4MzjDUNPHgQWJdtMAaDU= @@ -2838,6 +3489,7 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.6/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= @@ -2859,14 +3511,17 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.1.3/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las= +honnef.co/go/tools v0.2.1/go.mod h1:lPVVZ2BS5TfnjLyizF7o7hv7j9/L+8cZY2hLyjP9cGY= honnef.co/go/tools v0.3.3 h1:oDx7VAwstgpYpb3wv0oxiZlxY+foCpRAwY7Vk6XpAgA= honnef.co/go/tools v0.3.3/go.mod h1:jzwdWgg7Jdq75wlfblQxO4neNaFFSvgc1tD5Wv8U0Yw= +mvdan.cc/gofumpt v0.1.1/go.mod h1:yXG1r1WqZVKWbVRtBWKWX9+CxGYfA51nSomhM0woR48= mvdan.cc/gofumpt v0.4.0 h1:JVf4NN1mIpHogBj7ABpgOyZc65/UUOkKQFkoURsz4MM= mvdan.cc/gofumpt v0.4.0/go.mod h1:PljLOHDeZqgS8opHRKLzp2It2VBuSdteAgqUfzMTxlQ= mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed h1:WX1yoOaKQfddO/mLzdV4wptyWgoH/6hwLs7QHTixo0I= mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed/go.mod h1:Xkxe497xwlCKkIaQYRfC7CSLworTXY9RMqwhhCm+8Nc= mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b h1:DxJ5nJdkhDlLok9K6qO+5290kphDJbHOQO1DFFFTeBo= mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b/go.mod h1:2odslEg/xrtNQqCYg2/jCoyKnw3vv5biOc3JnIcYfL4= +mvdan.cc/unparam v0.0.0-20210104141923-aac4ce9116a7/go.mod h1:hBpJkZE8H/sb+VRFvw2+rBpHNsTBcvSpk61hr8mzXZE= mvdan.cc/unparam v0.0.0-20220706161116-678bad134442 h1:seuXWbRB1qPrS3NQnHmFKLJLtskWyueeIzmLXghMGgk= mvdan.cc/unparam v0.0.0-20220706161116-678bad134442/go.mod h1:F/Cxw/6mVrNKqrR2YjFf5CaW0Bw4RL8RfbEf4GRggJk= nhooyr.io/websocket v1.8.6/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0= From bfe2f2407a089429827818344f5b36f1525e4d4f Mon Sep 17 00:00:00 2001 From: swelf Date: Mon, 24 Jul 2023 11:53:16 +0300 Subject: [PATCH 003/307] pob integrated --- app/ante_handler.go | 11 +++ app/app.go | 78 +++++++++++++++++-- app/proposals_allowlist_test.go | 1 + cmd/neutrond/root.go | 13 +++- go.mod | 3 +- go.sum | 24 ++++++ network/init-neutrond.sh | 9 +++ tests/e2e/interchain_security_test.go | 2 +- testutil/contractmanager/network/network.go | 2 +- testutil/cron/network/network.go | 2 +- testutil/interchainqueries/network/network.go | 2 +- testutil/interchaintxs/network/network.go | 2 +- testutil/test_helpers.go | 43 +++++----- 13 files changed, 160 insertions(+), 32 deletions(-) diff --git a/app/ante_handler.go b/app/ante_handler.go index c0dcf5151..f9e43aacd 100644 --- a/app/ante_handler.go +++ b/app/ante_handler.go @@ -12,6 +12,9 @@ import ( ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper" consumerante "github.com/cosmos/interchain-security/v3/app/consumer/ante" ibcconsumerkeeper "github.com/cosmos/interchain-security/v3/x/ccv/consumer/keeper" + "github.com/skip-mev/pob/mempool" + ante2 "github.com/skip-mev/pob/x/builder/ante" + builderkeeper "github.com/skip-mev/pob/x/builder/keeper" ) // HandlerOptions extend the SDK's AnteHandler options by requiring the IBC @@ -23,6 +26,9 @@ type HandlerOptions struct { ConsumerKeeper ibcconsumerkeeper.Keeper WasmConfig *wasmTypes.WasmConfig TXCounterStoreKey storetypes.StoreKey + buildKeeper builderkeeper.Keeper + txEncoder sdk.TxEncoder + mempool *mempool.AuctionMempool } func NewAnteHandler(options HandlerOptions, logger log.Logger) (sdk.AnteHandler, error) { @@ -65,6 +71,11 @@ func NewAnteHandler(options HandlerOptions, logger log.Logger) (sdk.AnteHandler, ante.NewSigVerificationDecorator(options.AccountKeeper, options.SignModeHandler), ante.NewIncrementSequenceDecorator(options.AccountKeeper), ibcante.NewRedundantRelayDecorator(options.IBCKeeper), + ante2.NewBuilderDecorator( + options.buildKeeper, + options.txEncoder, + options.mempool, + ), } // Don't delete it even if IDE tells you so. diff --git a/app/app.go b/app/app.go index 2b406364e..4537857eb 100644 --- a/app/app.go +++ b/app/app.go @@ -8,6 +8,12 @@ import ( genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types" tendermint "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" "github.com/neutron-org/neutron/docs" + proposalhandler "github.com/skip-mev/pob/abci" + "github.com/skip-mev/pob/mempool" + "github.com/skip-mev/pob/x/builder" + builderkeeper "github.com/skip-mev/pob/x/builder/keeper" + rewardsaddressprovider "github.com/skip-mev/pob/x/builder/rewards_address_provider" + buildertypes "github.com/skip-mev/pob/x/builder/types" "io" "io/fs" "net/http" @@ -223,11 +229,13 @@ var ( ), ibchooks.AppModuleBasic{}, router.AppModuleBasic{}, + builder.AppModuleBasic{}, ) // module account permissions maccPerms = map[string][]string{ authtypes.FeeCollectorName: nil, + buildertypes.ModuleName: nil, ibctransfertypes.ModuleName: {authtypes.Minter, authtypes.Burner}, icatypes.ModuleName: nil, wasm.ModuleName: {authtypes.Burner}, @@ -278,10 +286,12 @@ type App struct { memKeys map[string]*storetypes.MemoryStoreKey // keepers - AccountKeeper authkeeper.AccountKeeper - AdminmoduleKeeper adminmodulemodulekeeper.Keeper - AuthzKeeper authzkeeper.Keeper - BankKeeper bankkeeper.BaseKeeper + AccountKeeper authkeeper.AccountKeeper + AdminmoduleKeeper adminmodulemodulekeeper.Keeper + AuthzKeeper authzkeeper.Keeper + BankKeeper bankkeeper.BaseKeeper + // BuilderKeeper is the keeper that handles processing auction transactions + BuilderKeeper builderkeeper.Keeper CapabilityKeeper *capabilitykeeper.Keeper SlashingKeeper slashingkeeper.Keeper CrisisKeeper crisiskeeper.Keeper @@ -325,11 +335,15 @@ type App struct { // sm is the simulation manager sm *module.SimulationManager + + // Custom checkTx handler + checkTxHandler proposalhandler.CheckTx } // New returns a reference to an initialized blockchain app func New( logger log.Logger, + chainID string, db dbm.DB, traceStore io.Writer, loadLatest bool, @@ -346,10 +360,16 @@ func New( legacyAmino := encodingConfig.Amino interfaceRegistry := encodingConfig.InterfaceRegistry + config := mempool.NewDefaultAuctionFactory(encodingConfig.TxConfig.TxDecoder()) + // 0 - unlimited amount of txs + maxTx := 0 + mempool := mempool.NewAuctionMempool(encodingConfig.TxConfig.TxDecoder(), encodingConfig.TxConfig.TxEncoder(), maxTx, config) + bApp := baseapp.NewBaseApp(Name, logger, db, encodingConfig.TxConfig.TxDecoder(), baseAppOptions...) bApp.SetCommitMultiStoreTracer(traceStore) bApp.SetVersion(version.Version) bApp.SetInterfaceRegistry(interfaceRegistry) + bApp.SetMempool(mempool) keys := sdk.NewKVStoreKeys( authzkeeper.StoreKey, authtypes.StoreKey, banktypes.StoreKey, slashingtypes.StoreKey, @@ -358,7 +378,7 @@ func New( icahosttypes.StoreKey, capabilitytypes.StoreKey, interchainqueriesmoduletypes.StoreKey, contractmanagermoduletypes.StoreKey, interchaintxstypes.StoreKey, wasm.StoreKey, feetypes.StoreKey, feeburnertypes.StoreKey, adminmodulemoduletypes.StoreKey, ccvconsumertypes.StoreKey, tokenfactorytypes.StoreKey, routertypes.StoreKey, - crontypes.StoreKey, ibchookstypes.StoreKey, consensusparamtypes.StoreKey, crisistypes.StoreKey, + crontypes.StoreKey, ibchookstypes.StoreKey, consensusparamtypes.StoreKey, crisistypes.StoreKey, buildertypes.StoreKey, ) tkeys := sdk.NewTransientStoreKeys(paramstypes.TStoreKey) memKeys := sdk.NewMemoryStoreKeys(capabilitytypes.MemStoreKey, feetypes.MemStoreKey) @@ -565,6 +585,16 @@ func New( ) app.TokenFactoryKeeper = &tokenFactoryKeeper + app.BuilderKeeper = builderkeeper.NewKeeperWithRewardsAddressProvider( + appCodec, + keys[buildertypes.StoreKey], + app.AccountKeeper, + app.BankKeeper, + // 25% of rewards should be sent to the redistribute address + rewardsaddressprovider.NewFixedAddressRewardsAddressProvider(app.AccountKeeper.GetModuleAddress(ccvconsumertypes.ConsumerRedistributeName)), + authtypes.NewModuleAddress(govtypes.ModuleName).String(), + ) + wasmDir := filepath.Join(homePath, "wasm") wasmConfig, err := wasm.ReadWasmConfig(appOpts) if err != nil { @@ -722,6 +752,7 @@ func New( ibcHooksModule, tokenfactory.NewAppModule(appCodec, *app.TokenFactoryKeeper, app.AccountKeeper, app.BankKeeper), cronModule, + builder.NewAppModule(appCodec, app.BuilderKeeper), crisis.NewAppModule(&app.CrisisKeeper, skipGenesisInvariants, app.GetSubspace(crisistypes.ModuleName)), // always be last to make sure that it checks for all invariants and not only part of them ) @@ -730,6 +761,7 @@ func New( // CanWithdrawInvariant invariant. // NOTE: staking module is required if HistoricalEntries param > 0 app.mm.SetOrderBeginBlockers( + buildertypes.ModuleName, upgradetypes.ModuleName, capabilitytypes.ModuleName, slashingtypes.ModuleName, @@ -759,6 +791,7 @@ func New( ) app.mm.SetOrderEndBlockers( + buildertypes.ModuleName, crisistypes.ModuleName, capabilitytypes.ModuleName, authtypes.ModuleName, @@ -793,6 +826,7 @@ func New( // so that other modules that want to create or claim capabilities afterwards in InitChain // can do so safely. app.mm.SetOrderInitGenesis( + buildertypes.ModuleName, capabilitytypes.ModuleName, authtypes.ModuleName, ibctransfertypes.ModuleName, @@ -872,6 +906,8 @@ func New( WasmConfig: &wasmConfig, TXCounterStoreKey: keys[wasm.StoreKey], ConsumerKeeper: app.ConsumerKeeper, + buildKeeper: app.BuilderKeeper, + mempool: mempool, }, app.Logger(), ) @@ -882,6 +918,25 @@ func New( app.SetAnteHandler(anteHandler) app.SetEndBlocker(app.EndBlocker) + handler := proposalhandler.NewProposalHandler( + mempool, + bApp.Logger(), + anteHandler, + encodingConfig.TxConfig.TxEncoder(), + encodingConfig.TxConfig.TxDecoder(), + ) + app.SetPrepareProposal(handler.PrepareProposalHandler()) + app.SetProcessProposal(handler.ProcessProposalHandler()) + + checkTxHandler := proposalhandler.NewCheckTxHandler( + app.BaseApp, + encodingConfig.TxConfig.TxDecoder(), + mempool, + anteHandler, + chainID, + ) + app.SetCheckTx(checkTxHandler.CheckTx()) + // must be before Loading version // requires the snapshot store to be created and registered as a BaseAppOption // see cmd/wasmd/root.go: 206 - 214 approx @@ -953,6 +1008,19 @@ func (app *App) setupUpgradeHandlers() { } } +// CheckTx will check the transaction with the provided checkTxHandler. We override the default +// handler so that we can verify bid transactions before they are inserted into the mempool. +// With the POB CheckTx, we can verify the bid transaction and all of the bundled transactions +// before inserting the bid transaction into the mempool. +func (app *App) CheckTx(req abci.RequestCheckTx) abci.ResponseCheckTx { + return app.checkTxHandler(req) +} + +// SetCheckTx sets the checkTxHandler for the app. +func (app *App) SetCheckTx(handler proposalhandler.CheckTx) { + app.checkTxHandler = handler +} + // Name returns the name of the App func (app *App) Name() string { return app.BaseApp.Name() } diff --git a/app/proposals_allowlist_test.go b/app/proposals_allowlist_test.go index f2e1f7681..0f87fcc36 100644 --- a/app/proposals_allowlist_test.go +++ b/app/proposals_allowlist_test.go @@ -30,6 +30,7 @@ func SetupTestingAppConsumer() (ibctesting.TestingApp, map[string]json.RawMessag encoding := app.MakeEncodingConfig() testApp := app.New( log.NewNopLogger(), + "test-1", db, nil, true, diff --git a/cmd/neutrond/root.go b/cmd/neutrond/root.go index 679e4fc79..f5d21de4c 100644 --- a/cmd/neutrond/root.go +++ b/cmd/neutrond/root.go @@ -230,7 +230,7 @@ func (ac appCreator) newApp( enabledWasmProposals := app.GetEnabledProposals() logger.Info("Enabled wasm proposals", "proposals", enabledWasmProposals) - return app.New(logger, db, traceStore, true, skipUpgradeHeights, + return app.New(logger, chainID, db, traceStore, true, skipUpgradeHeights, cast.ToString(appOpts.Get(flags.FlagHome)), cast.ToUint(appOpts.Get(server.FlagInvCheckPeriod)), ac.encCfg, @@ -265,10 +265,21 @@ func (ac appCreator) appExport( return servertypes.ExportedApp{}, errors.New("application home is not set") } + chainID := cast.ToString(appOpts.Get(flags.FlagChainID)) + if chainID == "" { + appGenesis, err := tmtypes.GenesisDocFromFile(filepath.Join(homePath, "config", "genesis.json")) + if err != nil { + panic(err) + } + + chainID = appGenesis.ChainID + } + loadLatest := height == -1 var emptyWasmOpts []wasm.Option interchainapp = app.New( logger, + chainID, db, traceStore, loadLatest, diff --git a/go.mod b/go.mod index 77d9127cd..0809c7734 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( github.com/cosmos/gogoproto v1.4.10 github.com/cosmos/ibc-go/v7 v7.2.0 github.com/cosmos/ics23/go v0.10.0 - github.com/cosmos/interchain-security/v3 v3.0.0-rc2 + github.com/cosmos/interchain-security/v3 v3.0.0 github.com/gogo/protobuf v1.3.3 github.com/golang/mock v1.6.0 github.com/golang/protobuf v1.5.3 @@ -145,6 +145,7 @@ require ( github.com/rs/cors v1.8.3 // indirect github.com/rs/zerolog v1.29.1 // indirect github.com/sasha-s/go-deadlock v0.3.1 // indirect + github.com/skip-mev/pob v1.0.3 // indirect github.com/spf13/afero v1.9.5 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect diff --git a/go.sum b/go.sum index acffa4f7c..b01f6f704 100644 --- a/go.sum +++ b/go.sum @@ -927,6 +927,10 @@ github.com/cosmos/ics23/go v0.10.0 h1:iXqLLgp2Lp+EdpIuwXTYIQU+AiHj9mOC2X9ab++bZD github.com/cosmos/ics23/go v0.10.0/go.mod h1:ZfJSmng/TBNTBkFemHHHj5YY7VAU/MBU980F4VU1NG0= github.com/cosmos/interchain-security/v3 v3.0.0-rc2 h1:bCPsPX8pDRizqRV1i+9gX9RYAeKRBCmVd3C7NC3weTE= github.com/cosmos/interchain-security/v3 v3.0.0-rc2/go.mod h1:HKHw9u4xMm5QJV76A03ORAXB2zisgpcunXZSca8TBdg= +github.com/cosmos/interchain-security/v3 v3.0.0 h1:ZEk1ltSWF/w6fpFk6eBH2PeyJ1dLFTZWyAdKPnO0unA= +github.com/cosmos/interchain-security/v3 v3.0.0/go.mod h1:HKHw9u4xMm5QJV76A03ORAXB2zisgpcunXZSca8TBdg= +github.com/cosmos/interchain-security/v3 v3.1.0 h1:EKDJCIKIDLG45tvKwfoANrRPgqvqfUt/f1TNKx3b7Uo= +github.com/cosmos/interchain-security/v3 v3.1.0/go.mod h1:2fILBgypEZcwR3BSzKDw+EsYtMKv9Z6cYXfouh4xTYU= github.com/cosmos/keyring v1.2.0 h1:8C1lBP9xhImmIabyXW4c3vFjjLiBdGCmfLUfeZlV1Yo= github.com/cosmos/keyring v1.2.0/go.mod h1:fc+wB5KTk9wQ9sDx0kFXB3A0MaeGHM9AwRStKOQ5vOA= github.com/cosmos/ledger-cosmos-go v0.12.1 h1:sMBxza5p/rNK/06nBSNmsI/WDqI0pVJFVNihy1Y984w= @@ -1014,6 +1018,8 @@ github.com/dlclark/regexp2 v1.4.1-0.20201116162257-a2a8dda75c91/go.mod h1:2pZnwu github.com/dnaeon/go-vcr v1.1.0/go.mod h1:M7tiix8f0r6mKKJ3Yq/kqU1OYf3MnfmBWVbPx/yU9ko= github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI= github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ= +github.com/docker/cli v20.10.17+incompatible h1:eO2KS7ZFeov5UJeaDmIs1NFEDRf32PaqRpvoEkKBy5M= +github.com/docker/cli v20.10.17+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8= github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/docker v1.4.2-0.20180625184442-8e610b2b55bf/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= @@ -1398,6 +1404,8 @@ github.com/google/renameio v0.1.0 h1:GOZbcHa3HfsPKPlmyPyN2KEohoMXOhdMbHrvbpl2QaA github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/s2a-go v0.1.3 h1:FAgZmpLl/SXurPEZyCMPBIiiYeTbqfjlbdnCNTAkbGE= github.com/google/s2a-go v0.1.3/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= +github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4= +github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ= github.com/google/trillian v1.3.11 h1:pPzJPkK06mvXId1LHEAJxIegGgHzzp/FUnycPYfoCMI= github.com/google/trillian v1.3.11/go.mod h1:0tPraVHrSDkA3BO6vKX67zgLXs6SsOAbHEivX+9mPgw= github.com/google/uuid v0.0.0-20161128191214-064e2069ce9c/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -2071,6 +2079,8 @@ github.com/opencontainers/runc v1.0.2/go.mod h1:aTaHFFwQXuA71CiyxOdFFIorAoemI04s github.com/opencontainers/runc v1.0.3/go.mod h1:aTaHFFwQXuA71CiyxOdFFIorAoemI04suvGRQFzWTD0= github.com/opencontainers/runc v1.1.3 h1:vIXrkId+0/J2Ymu2m7VjGvbSlAId9XNRPhn2p4b+d8w= github.com/opencontainers/runc v1.1.3/go.mod h1:1J5XiS+vdZ3wCyZybsuxXZWGrgSr8fFJHLXuG2PsnNg= +github.com/opencontainers/runc v1.1.5 h1:L44KXEpKmfWDcS02aeGm8QNTFXTo2D+8MYGDIJ/GDEs= +github.com/opencontainers/runc v1.1.5/go.mod h1:1J5XiS+vdZ3wCyZybsuxXZWGrgSr8fFJHLXuG2PsnNg= github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 h1:3snG66yBm59tKhhSPQrQ/0bCrv1LQbKt40LnUPiUxdc= github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/selinux v1.8.2 h1:c4ca10UMgRcvZ6h0K4HtS15UaVSBEaE+iln2LVpAuGc= @@ -2093,6 +2103,8 @@ github.com/openzipkin/zipkin-go v0.2.5 h1:UwtQQx2pyPIgWYHRg+epgdx1/HnBQTgN3/oIYE github.com/openzipkin/zipkin-go v0.2.5/go.mod h1:KpXfKdgRDnnhsxw4pNIH9Md5lyFqKUa4YDFlwRYAMyE= github.com/ory/dockertest v3.3.5+incompatible h1:iLLK6SQwIhcbrG783Dghaaa3WPzGc+4Emza6EbVUUGA= github.com/ory/dockertest v3.3.5+incompatible/go.mod h1:1vX4m9wsvi00u5bseYwXaSnhNrne+V0E6LAcBILJdPs= +github.com/ory/dockertest/v3 v3.10.0 h1:4K3z2VMe8Woe++invjaTB7VRyQXQy5UY+loujO4aNE4= +github.com/ory/dockertest/v3 v3.10.0/go.mod h1:nr57ZbRWMqfsdGdFNLHz5jjNdDb7VVFnzAeW1n5N1Lg= github.com/otiai10/copy v1.6.0 h1:IinKAryFFuPONZ7cm6T6E2QX/vcJwSnlaA5lfoaXIiQ= github.com/otiai10/copy v1.6.0/go.mod h1:XWfuS3CrI0R6IE0FbgHsEazaXO8G0LpMp9o8tos0x4E= github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod h1:9qAhocn7zKJG+0mI8eUu6xqkFDYS2kb2saOteoSB3cE= @@ -2349,6 +2361,8 @@ github.com/sivchari/tenv v1.7.0 h1:d4laZMBK6jpe5PWepxlV9S+LC0yXqvYHiq8E6ceoVVE= github.com/sivchari/tenv v1.7.0/go.mod h1:64yStXKSOxDfX47NlhVwND4dHwfZDdbp2Lyl018Icvg= github.com/skeema/knownhosts v1.1.0 h1:Wvr9V0MxhjRbl3f9nMnKnFfiWTJmtECJ9Njkea3ysW0= github.com/skeema/knownhosts v1.1.0/go.mod h1:sKFq3RD6/TKZkSWn8boUbDC7Qkgcv+8XXijpFO6roag= +github.com/skip-mev/pob v1.0.3 h1:cipN/WUU+xfYbcfUQ4EefSvl3ItocsKgRn3tOtRF2OE= +github.com/skip-mev/pob v1.0.3/go.mod h1:PMs/dqcWOQruSN6zLExU0TzlBfBmGA8iTy+FJhxn0T8= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= @@ -2578,6 +2592,12 @@ github.com/wsddn/go-ecdh v0.0.0-20161211032359-48726bab9208 h1:1cngl9mPEoITZG8s8 github.com/wsddn/go-ecdh v0.0.0-20161211032359-48726bab9208/go.mod h1:IotVbo4F+mw0EzQ08zFqg7pK3FebNXpaMsRy2RT+Ees= github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM= github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw= +github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f h1:J9EGpcZtP0E/raorCMxlFGSTBrsSlaDGf3jU/qvAE2c= +github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= +github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0= +github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= +github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74= +github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= github.com/xhit/go-str2duration/v2 v2.1.0 h1:lxklc02Drh6ynqX+DdPyp5pCKLUQpRT8bp8Ydu2Bstc= github.com/xhit/go-str2duration/v2 v2.1.0/go.mod h1:ohY8p+0f07DiV6Em5LKB0s2YpLtXVyJfNt1+BlmyAsU= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 h1:eY9dn8+vbi4tKz5Qo6v2eYzo7kUS51QINcR5jNpbZS8= @@ -2775,6 +2795,8 @@ golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs= +golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -3165,6 +3187,8 @@ golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= +golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4= +golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/network/init-neutrond.sh b/network/init-neutrond.sh index b0e43bcf5..978872cbd 100755 --- a/network/init-neutrond.sh +++ b/network/init-neutrond.sh @@ -604,6 +604,12 @@ function set_genesis_param() { sed -i -e "s/\"$param_name\":.*/\"$param_name\": $param_value/g" "$GENESIS_PATH" } +function convert_bech32_base64_esc() { + $BINARY keys parse $1 --output json | jq .bytes | xxd -r -p | base64 | sed -e 's/\//\\\//g' +} +DAO_CONTRACT_ADDRESS_B64=$(convert_bech32_base64_esc "$DAO_CONTRACT_ADDRESS") +echo $DAO_CONTRACT_ADDRESS_B64 + set_genesis_param admins "[\"$DAO_CONTRACT_ADDRESS\"]" # admin module set_genesis_param treasury_address "\"$DAO_CONTRACT_ADDRESS\"" # feeburner set_genesis_param fee_collector_address "\"$DAO_CONTRACT_ADDRESS\"" # tokenfactory @@ -615,6 +621,9 @@ set_genesis_param min_signed_per_window "\"$SLASHING_MIN_SIGNED\"," set_genesis_param slash_fraction_double_sign "\"$SLASHING_FRACTION_DOUBLE_SIGN\"," # slashing set_genesis_param slash_fraction_downtime "\"$SLASHING_FRACTION_DOWNTIME\"" # slashing +set_genesis_param proposer_fee "\"0.25\"" # builder(POB) +set_genesis_param escrow_account_address "\"$DAO_CONTRACT_ADDRESS_B64\"," # builder(POB) + if ! jq -e . "$GENESIS_PATH" >/dev/null 2>&1; then echo "genesis appears to become incorrect json" >&2 exit 1 diff --git a/tests/e2e/interchain_security_test.go b/tests/e2e/interchain_security_test.go index 41726178d..2ba3e4f8b 100644 --- a/tests/e2e/interchain_security_test.go +++ b/tests/e2e/interchain_security_test.go @@ -18,7 +18,7 @@ func TestCCVTestSuite(t *testing.T) { // Pass in concrete app types that implement the interfaces defined in /testutil/e2e/interfaces.go ccvSuite := e2e.NewCCVTestSuite[*appProvider.App, *appConsumer.App]( // Pass in ibctesting.AppIniters for provider and consumer. - icssimapp.ProviderAppIniter, testutil.SetupTestingApp, + icssimapp.ProviderAppIniter, testutil.SetupTestingApp("test-1"), // TODO: These three tests just don't work in IS, so skip them for now []string{"TestSendRewardsRetries", "TestRewardsDistribution", "TestEndBlockRD"}) diff --git a/testutil/contractmanager/network/network.go b/testutil/contractmanager/network/network.go index f3eb57ecd..a833bc317 100644 --- a/testutil/contractmanager/network/network.go +++ b/testutil/contractmanager/network/network.go @@ -72,7 +72,7 @@ func DefaultConfig() network.Config { } return app.New( - val.GetCtx().Logger, tmdb.NewMemDB(), nil, true, map[int64]bool{}, val.GetCtx().Config.RootDir, 0, + val.GetCtx().Logger, chainID, tmdb.NewMemDB(), nil, true, map[int64]bool{}, val.GetCtx().Config.RootDir, 0, encoding, app.GetEnabledProposals(), sims.EmptyAppOptions{}, diff --git a/testutil/cron/network/network.go b/testutil/cron/network/network.go index 45354ba7d..a5a9a34fc 100644 --- a/testutil/cron/network/network.go +++ b/testutil/cron/network/network.go @@ -74,7 +74,7 @@ func DefaultConfig() network.Config { } return app.New( - val.GetCtx().Logger, tmdb.NewMemDB(), nil, true, map[int64]bool{}, val.GetCtx().Config.RootDir, 0, + val.GetCtx().Logger, chainID, tmdb.NewMemDB(), nil, true, map[int64]bool{}, val.GetCtx().Config.RootDir, 0, encoding, app.GetEnabledProposals(), sims.EmptyAppOptions{}, diff --git a/testutil/interchainqueries/network/network.go b/testutil/interchainqueries/network/network.go index cb666dda5..b19569eed 100644 --- a/testutil/interchainqueries/network/network.go +++ b/testutil/interchainqueries/network/network.go @@ -72,7 +72,7 @@ func DefaultConfig() network.Config { } return app.New( - val.GetCtx().Logger, tmdb.NewMemDB(), nil, true, map[int64]bool{}, val.GetCtx().Config.RootDir, 0, + val.GetCtx().Logger, chainID, tmdb.NewMemDB(), nil, true, map[int64]bool{}, val.GetCtx().Config.RootDir, 0, encoding, app.GetEnabledProposals(), sims.EmptyAppOptions{}, diff --git a/testutil/interchaintxs/network/network.go b/testutil/interchaintxs/network/network.go index 54856f3c1..af5e0099c 100644 --- a/testutil/interchaintxs/network/network.go +++ b/testutil/interchaintxs/network/network.go @@ -73,7 +73,7 @@ func DefaultConfig() network.Config { } return app.New( - val.GetCtx().Logger, tmdb.NewMemDB(), nil, true, map[int64]bool{}, val.GetCtx().Config.RootDir, 0, + val.GetCtx().Logger, chainID, tmdb.NewMemDB(), nil, true, map[int64]bool{}, val.GetCtx().Config.RootDir, 0, encoding, app.GetEnabledProposals(), sims.EmptyAppOptions{}, diff --git a/testutil/test_helpers.go b/testutil/test_helpers.go index cc536476a..7873fe0f6 100644 --- a/testutil/test_helpers.go +++ b/testutil/test_helpers.go @@ -57,7 +57,7 @@ var ( ) func init() { - ibctesting.DefaultTestingAppInit = SetupTestingApp + ibctesting.DefaultTestingAppInit = SetupTestingApp("test-1") app.GetDefaultConfig() } @@ -263,11 +263,11 @@ func NewProviderConsumerCoordinator(t *testing.T) *ibctesting.Coordinator { chainID = ibctesting.GetChainID(2) coordinator.Chains[chainID] = NewTestChainWithValSet(t, coordinator, - SetupTestingApp, chainID, providerChain.Vals, providerChain.Signers) + SetupTestingApp(chainID), chainID, providerChain.Vals, providerChain.Signers) chainID = ibctesting.GetChainID(3) coordinator.Chains[chainID] = NewTestChainWithValSet(t, coordinator, - SetupTestingApp, chainID, providerChain.Vals, providerChain.Signers) + SetupTestingApp(chainID), chainID, providerChain.Vals, providerChain.Signers) return coordinator } @@ -373,23 +373,26 @@ func RegisterInterchainAccount(endpoint *ibctesting.Endpoint, owner string) erro } // SetupTestingApp initializes the IBC-go testing application -func SetupTestingApp() (ibctesting.TestingApp, map[string]json.RawMessage) { - encoding := app.MakeEncodingConfig() - db := dbm.NewMemDB() - testApp := app.New( - log.NewNopLogger(), - db, - nil, - true, - map[int64]bool{}, - app.DefaultNodeHome, - 0, - encoding, - app.GetEnabledProposals(), - sims.EmptyAppOptions{}, - nil, - ) - return testApp, app.NewDefaultGenesisState(testApp.AppCodec()) +func SetupTestingApp(chainID string) func() (ibctesting.TestingApp, map[string]json.RawMessage) { + return func() (ibctesting.TestingApp, map[string]json.RawMessage) { + encoding := app.MakeEncodingConfig() + db := dbm.NewMemDB() + testApp := app.New( + log.NewNopLogger(), + chainID, + db, + nil, + true, + map[int64]bool{}, + app.DefaultNodeHome, + 0, + encoding, + app.GetEnabledProposals(), + sims.EmptyAppOptions{}, + nil, + ) + return testApp, app.NewDefaultGenesisState(testApp.AppCodec()) + } } func NewTransferPath(chainA, chainB, chainProvider *ibctesting.TestChain) *ibctesting.Path { From c5cb446ff4057fb9124cda234f287e85d5abf488 Mon Sep 17 00:00:00 2001 From: swelf Date: Thu, 27 Jul 2023 10:47:46 +0300 Subject: [PATCH 004/307] migrations --- app/app.go | 12 +- app/proposals_allowlisting.go | 29 ++- app/upgrades/sdk47/constants.go | 15 ++ app/upgrades/sdk47/upgrades.go | 187 ++++++++++++++++++ app/upgrades/types.go | 15 +- app/upgrades/v0.4.4/upgrades.go | 4 +- app/upgrades/v3/upgrades.go | 3 + go.mod | 2 +- .../contractmanager/keeper/contractmanager.go | 8 - testutil/cron/keeper/cron.go | 8 - testutil/feeburner/keeper/feeburner.go | 8 - testutil/feerefunder/keeper/fee.go | 10 +- .../keeper/interchainqeries.go | 8 - .../interchaintxs/keeper/interchaintxs.go | 8 - x/contractmanager/keeper/keeper.go | 9 - x/contractmanager/keeper/params.go | 11 +- x/contractmanager/types/keys.go | 6 +- x/cron/keeper/keeper.go | 9 - x/cron/keeper/params.go | 18 +- x/cron/types/keys.go | 2 + x/feeburner/keeper/keeper.go | 15 +- x/feeburner/keeper/params.go | 18 +- x/feeburner/types/keys.go | 8 + x/feerefunder/keeper/keeper.go | 7 - x/feerefunder/keeper/params.go | 18 +- x/feerefunder/types/keys.go | 6 +- x/interchainqueries/keeper/keeper.go | 9 - x/interchainqueries/keeper/msg_server.go | 1 - x/interchainqueries/keeper/params.go | 18 +- x/interchainqueries/types/keys.go | 3 + x/interchaintxs/keeper/keeper.go | 10 - x/interchaintxs/keeper/msg_server_test.go | 17 +- x/interchaintxs/keeper/params.go | 18 +- x/interchaintxs/types/keys.go | 8 + x/tokenfactory/keeper/keeper.go | 11 +- x/tokenfactory/keeper/params.go | 19 +- x/tokenfactory/types/keys.go | 6 +- 37 files changed, 387 insertions(+), 177 deletions(-) create mode 100644 app/upgrades/sdk47/constants.go create mode 100644 app/upgrades/sdk47/upgrades.go diff --git a/app/app.go b/app/app.go index 4537857eb..f25401598 100644 --- a/app/app.go +++ b/app/app.go @@ -495,18 +495,16 @@ func New( appCodec, keys[contractmanagermoduletypes.StoreKey], keys[contractmanagermoduletypes.MemStoreKey], - app.GetSubspace(contractmanagermoduletypes.ModuleName), &app.WasmKeeper, ) - app.FeeKeeper = feekeeper.NewKeeper(appCodec, keys[feetypes.StoreKey], memKeys[feetypes.MemStoreKey], app.GetSubspace(feetypes.ModuleName), app.IBCKeeper.ChannelKeeper, app.BankKeeper) + app.FeeKeeper = feekeeper.NewKeeper(appCodec, keys[feetypes.StoreKey], memKeys[feetypes.MemStoreKey], app.IBCKeeper.ChannelKeeper, app.BankKeeper) feeModule := feerefunder.NewAppModule(appCodec, *app.FeeKeeper, app.AccountKeeper, app.BankKeeper) app.FeeBurnerKeeper = feeburnerkeeper.NewKeeper( appCodec, keys[feeburnertypes.StoreKey], keys[feeburnertypes.MemStoreKey], - app.GetSubspace(feeburnertypes.ModuleName), app.AccountKeeper, app.BankKeeper, ) @@ -579,7 +577,6 @@ func New( tokenFactoryKeeper := tokenfactorykeeper.NewKeeper( appCodec, app.keys[tokenfactorytypes.StoreKey], - app.GetSubspace(tokenfactorytypes.ModuleName), app.AccountKeeper, app.BankKeeper.WithMintCoinsRestriction(tokenfactorytypes.NewTokenFactoryDenomMintCoinsRestriction()), ) @@ -626,7 +623,6 @@ func New( appCodec, keys[interchainqueriesmoduletypes.StoreKey], keys[interchainqueriesmoduletypes.MemStoreKey], - app.GetSubspace(interchainqueriesmoduletypes.ModuleName), app.IBCKeeper, app.BankKeeper, app.ContractManagerKeeper, @@ -637,14 +633,13 @@ func New( appCodec, keys[interchaintxstypes.StoreKey], memKeys[interchaintxstypes.MemStoreKey], - app.GetSubspace(interchaintxstypes.ModuleName), app.IBCKeeper.ChannelKeeper, app.ICAControllerKeeper, app.ContractManagerKeeper, app.FeeKeeper, ) - app.CronKeeper = *cronkeeper.NewKeeper(appCodec, keys[crontypes.StoreKey], keys[crontypes.MemStoreKey], app.GetSubspace(crontypes.ModuleName), app.AccountKeeper) + app.CronKeeper = *cronkeeper.NewKeeper(appCodec, keys[crontypes.StoreKey], keys[crontypes.MemStoreKey], app.AccountKeeper) wasmOpts = append(wasmbinding.RegisterCustomPlugins(&app.InterchainTxsKeeper, &app.InterchainQueriesKeeper, app.TransferKeeper, &app.AdminmoduleKeeper, app.FeeBurnerKeeper, app.FeeKeeper, &app.BankKeeper, app.TokenFactoryKeeper, &app.CronKeeper), wasmOpts...) app.WasmKeeper = wasm.NewKeeper( @@ -1002,7 +997,10 @@ func (app *App) setupUpgradeHandlers() { TokenFactoryKeeper: app.TokenFactoryKeeper, SlashingKeeper: app.SlashingKeeper, ParamsKeeper: app.ParamsKeeper, + CapabilityKeeper: app.CapabilityKeeper, }, + app, + app.AppCodec(), ), ) } diff --git a/app/proposals_allowlisting.go b/app/proposals_allowlisting.go index 38a86ed9d..acde4db9a 100644 --- a/app/proposals_allowlisting.go +++ b/app/proposals_allowlisting.go @@ -9,13 +9,6 @@ import ( ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" packetforwardmiddlewaretypes "github.com/strangelove-ventures/packet-forward-middleware/v7/router/types" - - crontypes "github.com/neutron-org/neutron/x/cron/types" - feeburnertypes "github.com/neutron-org/neutron/x/feeburner/types" - feerefundertypes "github.com/neutron-org/neutron/x/feerefunder/types" - interchainqueriestypes "github.com/neutron-org/neutron/x/interchainqueries/types" - interchaintxstypes "github.com/neutron-org/neutron/x/interchaintxs/types" - tokenfactorytypes "github.com/neutron-org/neutron/x/tokenfactory/types" ) func IsConsumerProposalAllowlisted(content govtypes.Content) bool { @@ -62,22 +55,22 @@ var WhitelistedParams = map[paramChangeKey]struct{}{ //{Subspace: wasmtypes.ModuleName, Key: string(wasmtypes.ParamStoreKeyUploadAccess)}: {}, //{Subspace: wasmtypes.ModuleName, Key: string(wasmtypes.ParamStoreKeyInstantiateAccess)}: {}, // feerefunder - {Subspace: feerefundertypes.ModuleName, Key: string(feerefundertypes.KeyFees)}: {}, + //{Subspace: feerefundertypes.ModuleName, Key: string(feerefundertypes.KeyFees)}: {}, // interchaintxs - {Subspace: interchaintxstypes.ModuleName, Key: string(interchaintxstypes.KeyMsgSubmitTxMaxMessages)}: {}, + //{Subspace: interchaintxstypes.ModuleName, Key: string(interchaintxstypes.KeyMsgSubmitTxMaxMessages)}: {}, // interchainqueries - {Subspace: interchainqueriestypes.ModuleName, Key: string(interchainqueriestypes.KeyQuerySubmitTimeout)}: {}, - {Subspace: interchainqueriestypes.ModuleName, Key: string(interchainqueriestypes.KeyQueryDeposit)}: {}, - {Subspace: interchainqueriestypes.ModuleName, Key: string(interchainqueriestypes.KeyTxQueryRemovalLimit)}: {}, + //{Subspace: interchainqueriestypes.ModuleName, Key: string(interchainqueriestypes.KeyQuerySubmitTimeout)}: {}, + //{Subspace: interchainqueriestypes.ModuleName, Key: string(interchainqueriestypes.KeyQueryDeposit)}: {}, + //{Subspace: interchainqueriestypes.ModuleName, Key: string(interchainqueriestypes.KeyTxQueryRemovalLimit)}: {}, // feeburner - {Subspace: feeburnertypes.ModuleName, Key: string(feeburnertypes.KeyTreasuryAddress)}: {}, - {Subspace: feeburnertypes.ModuleName, Key: string(feeburnertypes.KeyNeutronDenom)}: {}, + //{Subspace: feeburnertypes.ModuleName, Key: string(feeburnertypes.KeyTreasuryAddress)}: {}, + //{Subspace: feeburnertypes.ModuleName, Key: string(feeburnertypes.KeyNeutronDenom)}: {}, // tokenfactory - {Subspace: tokenfactorytypes.ModuleName, Key: string(tokenfactorytypes.KeyDenomCreationFee)}: {}, - {Subspace: tokenfactorytypes.ModuleName, Key: string(tokenfactorytypes.KeyFeeCollectorAddress)}: {}, + //{Subspace: tokenfactorytypes.ModuleName, Key: string(tokenfactorytypes.KeyDenomCreationFee)}: {}, + //{Subspace: tokenfactorytypes.ModuleName, Key: string(tokenfactorytypes.KeyFeeCollectorAddress)}: {}, // cron - {Subspace: crontypes.ModuleName, Key: string(crontypes.KeySecurityAddress)}: {}, - {Subspace: crontypes.ModuleName, Key: string(crontypes.KeyLimit)}: {}, + //{Subspace: crontypes.ModuleName, Key: string(crontypes.KeySecurityAddress)}: {}, + //{Subspace: crontypes.ModuleName, Key: string(crontypes.KeyLimit)}: {}, // packet-forward-middleware {Subspace: packetforwardmiddlewaretypes.ModuleName, Key: string(packetforwardmiddlewaretypes.KeyFeePercentage)}: {}, } diff --git a/app/upgrades/sdk47/constants.go b/app/upgrades/sdk47/constants.go new file mode 100644 index 000000000..d92b1e06f --- /dev/null +++ b/app/upgrades/sdk47/constants.go @@ -0,0 +1,15 @@ +package sdk47 + +import ( + "github.com/neutron-org/neutron/app/upgrades" +) + +const ( + // UpgradeName defines the on-chain upgrades name. + UpgradeName = "cosmos-sdk47" +) + +var Upgrade = upgrades.Upgrade{ + UpgradeName: UpgradeName, + CreateUpgradeHandler: CreateUpgradeHandler, +} diff --git a/app/upgrades/sdk47/upgrades.go b/app/upgrades/sdk47/upgrades.go new file mode 100644 index 000000000..b962ec819 --- /dev/null +++ b/app/upgrades/sdk47/upgrades.go @@ -0,0 +1,187 @@ +package sdk47 + +import ( + "cosmossdk.io/math" + "github.com/cosmos/cosmos-sdk/codec" + storetypes "github.com/cosmos/cosmos-sdk/store/types" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/types/bech32" + "github.com/cosmos/cosmos-sdk/types/module" + capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" + paramskeeper "github.com/cosmos/cosmos-sdk/x/params/keeper" + upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" + v6 "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/migrations/v6" + "github.com/neutron-org/neutron/app/upgrades" + crontypes "github.com/neutron-org/neutron/x/cron/types" + feeburnertypes "github.com/neutron-org/neutron/x/feeburner/types" + feerefundertypes "github.com/neutron-org/neutron/x/feerefunder/types" + icqtypes "github.com/neutron-org/neutron/x/interchainqueries/types" + interchaintxstypes "github.com/neutron-org/neutron/x/interchaintxs/types" + tokenfactorytypes "github.com/neutron-org/neutron/x/tokenfactory/types" + buildertypes "github.com/skip-mev/pob/x/builder/types" +) + +func CreateUpgradeHandler( + mm *module.Manager, + configurator module.Configurator, + keepers *upgrades.UpgradeKeepers, + storeKeys upgrades.StoreKeys, + codec codec.Codec, +) upgradetypes.UpgradeHandler { + return func(ctx sdk.Context, plan upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) { + ctx.Logger().Info("Starting module migrations...") + vm, err := mm.RunMigrations(ctx, configurator, vm) + if err != nil { + return vm, err + } + + ctx.Logger().Info("Migrating channel capability...") + // https://github.com/cosmos/ibc-go/blob/v7.0.1/docs/migrations/v5-to-v6.md#upgrade-proposal + if err := v6.MigrateICS27ChannelCapability(ctx, codec, storeKeys.GetKey(capabilitytypes.StoreKey), keepers.CapabilityKeeper, interchaintxstypes.ModuleName); err != nil { + return nil, err + } + + ctx.Logger().Info("Migrating cron module parameters...") + if err := migrateCronParams(ctx, keepers.ParamsKeeper, storeKeys.GetKey(crontypes.StoreKey), codec); err != nil { + return nil, err + } + + ctx.Logger().Info("Migrating feerefunder module parameters...") + if err := migrateFeeRefunderParams(ctx, keepers.ParamsKeeper, storeKeys.GetKey(feerefundertypes.StoreKey), codec); err != nil { + return nil, err + } + + ctx.Logger().Info("Migrating tokenfactory module parameters...") + if err := migrateTokenFactoryParams(ctx, keepers.ParamsKeeper, storeKeys.GetKey(tokenfactorytypes.StoreKey), codec); err != nil { + return nil, err + } + + ctx.Logger().Info("Migrating feeburner module parameters...") + if err := migrateFeeburnerParams(ctx, keepers.ParamsKeeper, storeKeys.GetKey(feeburnertypes.StoreKey), codec); err != nil { + return nil, err + } + + ctx.Logger().Info("Migrating interchainqueries module parameters...") + if err := migrateInterchainQueriesParams(ctx, keepers.ParamsKeeper, storeKeys.GetKey(icqtypes.StoreKey), codec); err != nil { + return nil, err + } + + ctx.Logger().Info("Migrating interchaintxs module parameters...") + if err := migrateInterchainTxsParams(ctx, keepers.ParamsKeeper, storeKeys.GetKey(interchaintxstypes.StoreKey), codec); err != nil { + return nil, err + } + + ctx.Logger().Info("Setting pob params...") + treasury := keepers.FeeBurnerKeeper.GetParams(ctx).TreasuryAddress + _, data, err := bech32.DecodeAndConvert(treasury) + if err != nil { + return nil, err + } + + builderParams := buildertypes.Params{ + MaxBundleSize: 2, + EscrowAccountAddress: data, + ReserveFee: sdk.Coin{Denom: "untrn", Amount: sdk.NewInt(1_000_000)}, + MinBidIncrement: sdk.Coin{Denom: "untrn", Amount: sdk.NewInt(1_000_000)}, + FrontRunningProtection: true, + ProposerFee: math.LegacyNewDecWithPrec(25, 2), + } + err = keepers.BuilderKeeper.SetParams(ctx, builderParams) + if err != nil { + return nil, err + } + + ctx.Logger().Info("Upgrade complete") + return vm, nil + } +} + +func migrateCronParams(ctx sdk.Context, paramsKeepers paramskeeper.Keeper, storeKey storetypes.StoreKey, codec codec.Codec) error { + store := ctx.KVStore(storeKey) + var currParams crontypes.Params + subspace, _ := paramsKeepers.GetSubspace(crontypes.StoreKey) + subspace.GetParamSet(ctx, &currParams) + + if err := currParams.Validate(); err != nil { + return err + } + + bz := codec.MustMarshal(&currParams) + store.Set(crontypes.ParamsKey, bz) + return nil +} + +func migrateFeeRefunderParams(ctx sdk.Context, paramsKeepers paramskeeper.Keeper, storeKey storetypes.StoreKey, codec codec.Codec) error { + store := ctx.KVStore(storeKey) + var currParams feerefundertypes.Params + subspace, _ := paramsKeepers.GetSubspace(crontypes.StoreKey) + subspace.GetParamSet(ctx, &currParams) + + if err := currParams.Validate(); err != nil { + return err + } + + bz := codec.MustMarshal(&currParams) + store.Set(feerefundertypes.ParamsKey, bz) + return nil +} + +func migrateTokenFactoryParams(ctx sdk.Context, paramsKeepers paramskeeper.Keeper, storeKey storetypes.StoreKey, codec codec.Codec) error { + store := ctx.KVStore(storeKey) + var currParams tokenfactorytypes.Params + subspace, _ := paramsKeepers.GetSubspace(tokenfactorytypes.StoreKey) + subspace.GetParamSet(ctx, &currParams) + + if err := currParams.Validate(); err != nil { + return err + } + + bz := codec.MustMarshal(&currParams) + store.Set(tokenfactorytypes.ParamsKey, bz) + return nil +} + +func migrateFeeburnerParams(ctx sdk.Context, paramsKeepers paramskeeper.Keeper, storeKey storetypes.StoreKey, codec codec.Codec) error { + store := ctx.KVStore(storeKey) + var currParams feeburnertypes.Params + subspace, _ := paramsKeepers.GetSubspace(feeburnertypes.StoreKey) + subspace.GetParamSet(ctx, &currParams) + + if err := currParams.Validate(); err != nil { + return err + } + + bz := codec.MustMarshal(&currParams) + store.Set(feeburnertypes.ParamsKey, bz) + return nil +} + +func migrateInterchainQueriesParams(ctx sdk.Context, paramsKeepers paramskeeper.Keeper, storeKey storetypes.StoreKey, codec codec.Codec) error { + store := ctx.KVStore(storeKey) + var currParams icqtypes.Params + subspace, _ := paramsKeepers.GetSubspace(icqtypes.StoreKey) + subspace.GetParamSet(ctx, &currParams) + + if err := currParams.Validate(); err != nil { + return err + } + + bz := codec.MustMarshal(&currParams) + store.Set(icqtypes.ParamsKey, bz) + return nil +} + +func migrateInterchainTxsParams(ctx sdk.Context, paramsKeepers paramskeeper.Keeper, storeKey storetypes.StoreKey, codec codec.Codec) error { + store := ctx.KVStore(storeKey) + var currParams interchaintxstypes.Params + subspace, _ := paramsKeepers.GetSubspace(interchaintxstypes.StoreKey) + subspace.GetParamSet(ctx, &currParams) + + if err := currParams.Validate(); err != nil { + return err + } + + bz := codec.MustMarshal(&currParams) + store.Set(interchaintxstypes.ParamsKey, bz) + return nil +} diff --git a/app/upgrades/types.go b/app/upgrades/types.go index ca17adff5..d940d9d3c 100644 --- a/app/upgrades/types.go +++ b/app/upgrades/types.go @@ -1,16 +1,19 @@ package upgrades import ( + "github.com/cosmos/cosmos-sdk/codec" store "github.com/cosmos/cosmos-sdk/store/types" + storetypes "github.com/cosmos/cosmos-sdk/store/types" "github.com/cosmos/cosmos-sdk/types/module" + capabilitykeeper "github.com/cosmos/cosmos-sdk/x/capability/keeper" + paramskeeper "github.com/cosmos/cosmos-sdk/x/params/keeper" slashingkeeper "github.com/cosmos/cosmos-sdk/x/slashing/keeper" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - - paramskeeper "github.com/cosmos/cosmos-sdk/x/params/keeper" cronkeeper "github.com/neutron-org/neutron/x/cron/keeper" feeburnerkeeper "github.com/neutron-org/neutron/x/feeburner/keeper" icqkeeper "github.com/neutron-org/neutron/x/interchainqueries/keeper" tokenfactorykeeper "github.com/neutron-org/neutron/x/tokenfactory/keeper" + builderkeeper "github.com/skip-mev/pob/x/builder/keeper" ) // Upgrade defines a struct containing necessary fields that a SoftwareUpgradeProposal @@ -22,7 +25,7 @@ type Upgrade struct { UpgradeName string // CreateUpgradeHandler defines the function that creates an upgrade handler - CreateUpgradeHandler func(*module.Manager, module.Configurator, *UpgradeKeepers) upgradetypes.UpgradeHandler + CreateUpgradeHandler func(*module.Manager, module.Configurator, *UpgradeKeepers, StoreKeys, codec.Codec) upgradetypes.UpgradeHandler // Store upgrades, should be used for any new modules introduced, new modules deleted, or store names renamed. StoreUpgrades store.StoreUpgrades @@ -36,4 +39,10 @@ type UpgradeKeepers struct { FeeBurnerKeeper *feeburnerkeeper.Keeper SlashingKeeper slashingkeeper.Keeper ParamsKeeper paramskeeper.Keeper + CapabilityKeeper *capabilitykeeper.Keeper + BuilderKeeper builderkeeper.Keeper +} + +type StoreKeys interface { + GetKey(string) *storetypes.KVStoreKey } diff --git a/app/upgrades/v0.4.4/upgrades.go b/app/upgrades/v0.4.4/upgrades.go index c791065b7..79f28f4ab 100644 --- a/app/upgrades/v0.4.4/upgrades.go +++ b/app/upgrades/v0.4.4/upgrades.go @@ -2,7 +2,7 @@ package v044 import ( "errors" - + "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" @@ -17,6 +17,8 @@ func CreateUpgradeHandler( mm *module.Manager, configurator module.Configurator, keepers *upgrades.UpgradeKeepers, + _ upgrades.StoreKeys, + _ codec.Codec, ) upgradetypes.UpgradeHandler { return func(ctx sdk.Context, plan upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) { ctx.Logger().Info("Starting module migrations...") diff --git a/app/upgrades/v3/upgrades.go b/app/upgrades/v3/upgrades.go index e1ce1f21a..384b5685e 100644 --- a/app/upgrades/v3/upgrades.go +++ b/app/upgrades/v3/upgrades.go @@ -1,6 +1,7 @@ package v3 import ( + "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" @@ -15,6 +16,8 @@ func CreateUpgradeHandler( mm *module.Manager, configurator module.Configurator, keepers *upgrades.UpgradeKeepers, + _ upgrades.StoreKeys, + _ codec.Codec, ) upgradetypes.UpgradeHandler { return func(ctx sdk.Context, plan upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) { ctx.Logger().Info("Starting module migrations...") diff --git a/go.mod b/go.mod index 0809c7734..1011548d1 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( github.com/cosmos/gogoproto v1.4.10 github.com/cosmos/ibc-go/v7 v7.2.0 github.com/cosmos/ics23/go v0.10.0 - github.com/cosmos/interchain-security/v3 v3.0.0 + github.com/cosmos/interchain-security/v3 v3.1.0 github.com/gogo/protobuf v1.3.3 github.com/golang/mock v1.6.0 github.com/golang/protobuf v1.5.3 diff --git a/testutil/contractmanager/keeper/contractmanager.go b/testutil/contractmanager/keeper/contractmanager.go index f8ab1cdfb..ad84a455e 100644 --- a/testutil/contractmanager/keeper/contractmanager.go +++ b/testutil/contractmanager/keeper/contractmanager.go @@ -11,7 +11,6 @@ import ( "github.com/cosmos/cosmos-sdk/store" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - typesparams "github.com/cosmos/cosmos-sdk/x/params/types" "github.com/stretchr/testify/require" "github.com/neutron-org/neutron/x/contractmanager/keeper" @@ -31,17 +30,10 @@ func ContractManagerKeeper(t testing.TB, wasmKeeper types.WasmKeeper) (*keeper.K registry := codectypes.NewInterfaceRegistry() cdc := codec.NewProtoCodec(registry) - paramsSubspace := typesparams.NewSubspace(cdc, - types.Amino, - storeKey, - memStoreKey, - "ContractManagerParams", - ) k := keeper.NewKeeper( cdc, storeKey, memStoreKey, - paramsSubspace, wasmKeeper, ) diff --git a/testutil/cron/keeper/cron.go b/testutil/cron/keeper/cron.go index ac34c73c8..afa4cad93 100644 --- a/testutil/cron/keeper/cron.go +++ b/testutil/cron/keeper/cron.go @@ -11,7 +11,6 @@ import ( "github.com/cosmos/cosmos-sdk/store" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - typesparams "github.com/cosmos/cosmos-sdk/x/params/types" "github.com/neutron-org/neutron/x/cron/keeper" "github.com/neutron-org/neutron/x/cron/types" "github.com/stretchr/testify/require" @@ -30,17 +29,10 @@ func CronKeeper(t testing.TB, wasmMsgServer types.WasmMsgServer, accountKeeper t registry := codectypes.NewInterfaceRegistry() cdc := codec.NewProtoCodec(registry) - paramsSubspace := typesparams.NewSubspace(cdc, - types.Amino, - storeKey, - memStoreKey, - "CronParams", - ) k := keeper.NewKeeper( cdc, storeKey, memStoreKey, - paramsSubspace, accountKeeper, ) k.WasmMsgServer = wasmMsgServer diff --git a/testutil/feeburner/keeper/feeburner.go b/testutil/feeburner/keeper/feeburner.go index 2305deb8b..dbf9daab6 100644 --- a/testutil/feeburner/keeper/feeburner.go +++ b/testutil/feeburner/keeper/feeburner.go @@ -11,7 +11,6 @@ import ( "github.com/cosmos/cosmos-sdk/store" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - typesparams "github.com/cosmos/cosmos-sdk/x/params/types" "github.com/neutron-org/neutron/x/feeburner/keeper" "github.com/neutron-org/neutron/x/feeburner/types" "github.com/stretchr/testify/require" @@ -34,17 +33,10 @@ func FeeburnerKeeperWithDeps(t testing.TB, accountKeeper types.AccountKeeper, ba registry := codectypes.NewInterfaceRegistry() cdc := codec.NewProtoCodec(registry) - paramsSubspace := typesparams.NewSubspace(cdc, - types.Amino, - storeKey, - memStoreKey, - "FeeburnerParams", - ) k := keeper.NewKeeper( cdc, storeKey, memStoreKey, - paramsSubspace, accountKeeper, bankkeeper, ) diff --git a/testutil/feerefunder/keeper/fee.go b/testutil/feerefunder/keeper/fee.go index ca7b769a8..9af103f50 100644 --- a/testutil/feerefunder/keeper/fee.go +++ b/testutil/feerefunder/keeper/fee.go @@ -11,7 +11,6 @@ import ( "github.com/cosmos/cosmos-sdk/store" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - typesparams "github.com/cosmos/cosmos-sdk/x/params/types" "github.com/stretchr/testify/require" "github.com/neutron-org/neutron/x/feerefunder/keeper" @@ -30,18 +29,11 @@ func FeeKeeper(t testing.TB, channelKeeper types.ChannelKeeper, bankKeeper types registry := codectypes.NewInterfaceRegistry() cdc := codec.NewProtoCodec(registry) - - paramsSubspace := typesparams.NewSubspace(cdc, - types.Amino, - storeKey, - memStoreKey, - "FeeParams", - ) + k := keeper.NewKeeper( cdc, storeKey, memStoreKey, - paramsSubspace, channelKeeper, bankKeeper, ) diff --git a/testutil/interchainqueries/keeper/interchainqeries.go b/testutil/interchainqueries/keeper/interchainqeries.go index 6ad93d4aa..afec6b78d 100644 --- a/testutil/interchainqueries/keeper/interchainqeries.go +++ b/testutil/interchainqueries/keeper/interchainqeries.go @@ -13,7 +13,6 @@ import ( "github.com/cosmos/cosmos-sdk/store" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - typesparams "github.com/cosmos/cosmos-sdk/x/params/types" "github.com/stretchr/testify/require" "github.com/neutron-org/neutron/x/interchainqueries/keeper" @@ -39,17 +38,10 @@ func InterchainQueriesKeeper( registry := codectypes.NewInterfaceRegistry() cdc := codec.NewProtoCodec(registry) - paramsSubspace := typesparams.NewSubspace(cdc, - types.Amino, - storeKey, - memStoreKey, - "InterchainQueriesParams", - ) k := keeper.NewKeeper( cdc, storeKey, memStoreKey, - paramsSubspace, ibcKeeper, // TODO: do a real ibc keeper nil, // TODO: do a real wasm keeper contractManager, diff --git a/testutil/interchaintxs/keeper/interchaintxs.go b/testutil/interchaintxs/keeper/interchaintxs.go index b6c6ce657..2aedcc8c5 100644 --- a/testutil/interchaintxs/keeper/interchaintxs.go +++ b/testutil/interchaintxs/keeper/interchaintxs.go @@ -11,7 +11,6 @@ import ( "github.com/cosmos/cosmos-sdk/store" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - typesparams "github.com/cosmos/cosmos-sdk/x/params/types" "github.com/stretchr/testify/require" "github.com/neutron-org/neutron/x/interchaintxs/keeper" @@ -31,17 +30,10 @@ func InterchainTxsKeeper(t testing.TB, managerKeeper types.ContractManagerKeeper registry := codectypes.NewInterfaceRegistry() cdc := codec.NewProtoCodec(registry) - paramsSubspace := typesparams.NewSubspace(cdc, - types.Amino, - storeKey, - memStoreKey, - "InterchainTxsParams", - ) k := keeper.NewKeeper( cdc, storeKey, memStoreKey, - paramsSubspace, channelKeeper, icaControllerKeeper, managerKeeper, diff --git a/x/contractmanager/keeper/keeper.go b/x/contractmanager/keeper/keeper.go index e41b149aa..31014162d 100644 --- a/x/contractmanager/keeper/keeper.go +++ b/x/contractmanager/keeper/keeper.go @@ -7,8 +7,6 @@ import ( "github.com/cosmos/cosmos-sdk/codec" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - "github.com/neutron-org/neutron/x/contractmanager/types" ) @@ -17,7 +15,6 @@ type ( cdc codec.BinaryCodec storeKey storetypes.StoreKey memKey storetypes.StoreKey - paramstore paramtypes.Subspace wasmKeeper types.WasmKeeper } ) @@ -26,19 +23,13 @@ func NewKeeper( cdc codec.BinaryCodec, storeKey, memKey storetypes.StoreKey, - ps paramtypes.Subspace, wasmKeeper types.WasmKeeper, ) *Keeper { - // set KeyTable if it has not already been set - if !ps.HasKeyTable() { - ps = ps.WithKeyTable(types.ParamKeyTable()) - } return &Keeper{ cdc: cdc, storeKey: storeKey, memKey: memKey, - paramstore: ps, wasmKeeper: wasmKeeper, } } diff --git a/x/contractmanager/keeper/params.go b/x/contractmanager/keeper/params.go index fb48d5018..b2e6f7687 100644 --- a/x/contractmanager/keeper/params.go +++ b/x/contractmanager/keeper/params.go @@ -12,6 +12,13 @@ func (k Keeper) GetParams(_ sdk.Context) types.Params { } // SetParams set the params -func (k Keeper) SetParams(ctx sdk.Context, params types.Params) { - k.paramstore.SetParamSet(ctx, ¶ms) +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/contractmanager/types/keys.go b/x/contractmanager/types/keys.go index 450274611..62447d845 100644 --- a/x/contractmanager/types/keys.go +++ b/x/contractmanager/types/keys.go @@ -18,9 +18,13 @@ const ( const ( prefixContractFailures = iota + 1 + prefixParamsKey ) -var ContractFailuresKey = []byte{prefixContractFailures} +var ( + ContractFailuresKey = []byte{prefixContractFailures} + ParamsKey = []byte{prefixParamsKey} +) // GetFailureKeyPrefix returns the store key for the failures of the specific address func GetFailureKeyPrefix( diff --git a/x/cron/keeper/keeper.go b/x/cron/keeper/keeper.go index 688b14e83..96243dc74 100644 --- a/x/cron/keeper/keeper.go +++ b/x/cron/keeper/keeper.go @@ -15,7 +15,6 @@ import ( "github.com/cosmos/cosmos-sdk/codec" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" "github.com/neutron-org/neutron/x/cron/types" ) @@ -33,7 +32,6 @@ type ( cdc codec.BinaryCodec storeKey storetypes.StoreKey memKey storetypes.StoreKey - paramstore paramtypes.Subspace accountKeeper types.AccountKeeper WasmMsgServer types.WasmMsgServer } @@ -43,19 +41,12 @@ func NewKeeper( cdc codec.BinaryCodec, storeKey, memKey storetypes.StoreKey, - ps paramtypes.Subspace, accountKeeper types.AccountKeeper, ) *Keeper { - // set KeyTable if it has not already been set - if !ps.HasKeyTable() { - ps = ps.WithKeyTable(types.ParamKeyTable()) - } - return &Keeper{ cdc: cdc, storeKey: storeKey, memKey: memKey, - paramstore: ps, accountKeeper: accountKeeper, } } diff --git a/x/cron/keeper/params.go b/x/cron/keeper/params.go index d04211c1b..870979a43 100644 --- a/x/cron/keeper/params.go +++ b/x/cron/keeper/params.go @@ -7,12 +7,24 @@ import ( // GetParams get all parameters as types.Params func (k Keeper) GetParams(ctx sdk.Context) (params types.Params) { - k.paramstore.GetParamSet(ctx, ¶ms) + store := ctx.KVStore(k.storeKey) + bz := store.Get(types.ParamsKey) + if bz == nil { + return params + } + k.cdc.MustUnmarshal(bz, ¶ms) return params } // SetParams set the params -func (k Keeper) SetParams(ctx sdk.Context, params types.Params) { - k.paramstore.SetParamSet(ctx, ¶ms) +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/cron/types/keys.go b/x/cron/types/keys.go index e9608a032..95bb9a676 100644 --- a/x/cron/types/keys.go +++ b/x/cron/types/keys.go @@ -17,11 +17,13 @@ const ( const ( prefixScheduleKey = iota + 1 prefixScheduleCountKey + prefixParamsKey ) var ( ScheduleKey = []byte{prefixScheduleKey} ScheduleCountKey = []byte{prefixScheduleCountKey} + ParamsKey = []byte{prefixParamsKey} ) func GetScheduleKey(name string) []byte { diff --git a/x/feeburner/keeper/keeper.go b/x/feeburner/keeper/keeper.go index 3832749fa..205edd433 100644 --- a/x/feeburner/keeper/keeper.go +++ b/x/feeburner/keeper/keeper.go @@ -10,7 +10,6 @@ import ( "github.com/cosmos/cosmos-sdk/codec" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" consumertypes "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types" "github.com/neutron-org/neutron/x/feeburner/types" @@ -18,10 +17,9 @@ import ( type ( Keeper struct { - cdc codec.BinaryCodec - storeKey storetypes.StoreKey - memKey storetypes.StoreKey - paramstore paramtypes.Subspace + cdc codec.BinaryCodec + storeKey storetypes.StoreKey + memKey storetypes.StoreKey accountKeeper types.AccountKeeper bankKeeper types.BankKeeper @@ -34,21 +32,14 @@ func NewKeeper( cdc codec.BinaryCodec, storeKey, memKey storetypes.StoreKey, - ps paramtypes.Subspace, - accountKeeper types.AccountKeeper, bankKeeper types.BankKeeper, ) *Keeper { - // set KeyTable if it has not already been set - if !ps.HasKeyTable() { - ps = ps.WithKeyTable(types.ParamKeyTable()) - } return &Keeper{ cdc: cdc, storeKey: storeKey, memKey: memKey, - paramstore: ps, accountKeeper: accountKeeper, bankKeeper: bankKeeper, } diff --git a/x/feeburner/keeper/params.go b/x/feeburner/keeper/params.go index 886dd528f..a0f442f2a 100644 --- a/x/feeburner/keeper/params.go +++ b/x/feeburner/keeper/params.go @@ -7,12 +7,24 @@ import ( // GetParams get all parameters as types.Params func (k Keeper) GetParams(ctx sdk.Context) (params types.Params) { - k.paramstore.GetParamSet(ctx, ¶ms) + store := ctx.KVStore(k.storeKey) + bz := store.Get(types.ParamsKey) + if bz == nil { + return params + } + k.cdc.MustUnmarshal(bz, ¶ms) return params } // SetParams set the params -func (k Keeper) SetParams(ctx sdk.Context, params types.Params) { - k.paramstore.SetParamSet(ctx, ¶ms) +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/feeburner/types/keys.go b/x/feeburner/types/keys.go index 26284b44c..c790fca9d 100644 --- a/x/feeburner/types/keys.go +++ b/x/feeburner/types/keys.go @@ -14,6 +14,14 @@ const ( MemStoreKey = "mem_feeburner" ) +const ( + prefixParamsKey = iota + 1 +) + +var ( + ParamsKey = []byte{prefixParamsKey} +) + func KeyPrefix(p string) []byte { return []byte(p) } diff --git a/x/feerefunder/keeper/keeper.go b/x/feerefunder/keeper/keeper.go index 3ad840c36..22fdfc765 100644 --- a/x/feerefunder/keeper/keeper.go +++ b/x/feerefunder/keeper/keeper.go @@ -30,20 +30,13 @@ func NewKeeper( cdc codec.BinaryCodec, storeKey, memKey storetypes.StoreKey, - ps paramtypes.Subspace, channelKeeper types.ChannelKeeper, bankKeeper types.BankKeeper, ) *Keeper { - // set KeyTable if it has not already been set - if !ps.HasKeyTable() { - ps = ps.WithKeyTable(types.ParamKeyTable()) - } - return &Keeper{ cdc: cdc, storeKey: storeKey, memKey: memKey, - paramstore: ps, channelKeeper: channelKeeper, bankKeeper: bankKeeper, } diff --git a/x/feerefunder/keeper/params.go b/x/feerefunder/keeper/params.go index 2a8b2f3d2..ce942596e 100644 --- a/x/feerefunder/keeper/params.go +++ b/x/feerefunder/keeper/params.go @@ -8,12 +8,24 @@ import ( // GetParams get all parameters as types.Params func (k Keeper) GetParams(ctx sdk.Context) (params types.Params) { - k.paramstore.GetParamSet(ctx, ¶ms) + store := ctx.KVStore(k.storeKey) + bz := store.Get(types.ParamsKey) + if bz == nil { + return params + } + k.cdc.MustUnmarshal(bz, ¶ms) return params } // SetParams set the params -func (k Keeper) SetParams(ctx sdk.Context, params types.Params) { - k.paramstore.SetParamSet(ctx, ¶ms) +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/feerefunder/types/keys.go b/x/feerefunder/types/keys.go index b7bb93643..9c99c59b1 100644 --- a/x/feerefunder/types/keys.go +++ b/x/feerefunder/types/keys.go @@ -18,11 +18,15 @@ const ( const ( prefixFeeKey = iota + 1 + prefixParamsKey Separator = ";" ) -var FeeKey = []byte{prefixFeeKey} +var ( + FeeKey = []byte{prefixFeeKey} + ParamsKey = []byte{prefixParamsKey} +) func GetFeePacketKey(packet PacketID) []byte { return append(append(FeeKey, []byte(packet.ChannelId+Separator+packet.PortId+Separator)...), sdk.Uint64ToBigEndian(packet.Sequence)...) diff --git a/x/interchainqueries/keeper/keeper.go b/x/interchainqueries/keeper/keeper.go index 13e59d7b5..43e0bd703 100644 --- a/x/interchainqueries/keeper/keeper.go +++ b/x/interchainqueries/keeper/keeper.go @@ -10,7 +10,6 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper" tendermintLightClientTypes "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" @@ -27,7 +26,6 @@ type ( cdc codec.BinaryCodec storeKey storetypes.StoreKey memKey storetypes.StoreKey - paramstore paramtypes.Subspace ibcKeeper *ibckeeper.Keeper bank types.BankKeeper contractManagerKeeper types.ContractManagerKeeper @@ -40,23 +38,16 @@ func NewKeeper( cdc codec.BinaryCodec, storeKey, memKey storetypes.StoreKey, - ps paramtypes.Subspace, ibcKeeper *ibckeeper.Keeper, bank types.BankKeeper, contractManagerKeeper types.ContractManagerKeeper, headerVerifier types.HeaderVerifier, transactionVerifier types.TransactionVerifier, ) *Keeper { - // set KeyTable if it has not already been set - if !ps.HasKeyTable() { - ps = ps.WithKeyTable(types.ParamKeyTable()) - } - return &Keeper{ cdc: cdc, storeKey: storeKey, memKey: memKey, - paramstore: ps, ibcKeeper: ibcKeeper, bank: bank, contractManagerKeeper: contractManagerKeeper, diff --git a/x/interchainqueries/keeper/msg_server.go b/x/interchainqueries/keeper/msg_server.go index 8e1bbe9fe..8b2254077 100644 --- a/x/interchainqueries/keeper/msg_server.go +++ b/x/interchainqueries/keeper/msg_server.go @@ -229,7 +229,6 @@ func (k msgServer) SubmitQueryResult(goCtx context.Context, msg *types.MsgSubmit } path := ibccommitmenttypes.NewMerklePath(result.StoragePrefix, url.PathEscape(string(result.Key))) - // identify what kind proofs (non-existence proof always has *ics23.CommitmentProof_Nonexist as the first item) we got // and call corresponding method to verify it switch proof.GetProofs()[0].GetProof().(type) { diff --git a/x/interchainqueries/keeper/params.go b/x/interchainqueries/keeper/params.go index b13dac043..e8953b273 100644 --- a/x/interchainqueries/keeper/params.go +++ b/x/interchainqueries/keeper/params.go @@ -8,12 +8,24 @@ import ( // GetParams get all parameters as types.Params func (k Keeper) GetParams(ctx sdk.Context) (params types.Params) { - k.paramstore.GetParamSet(ctx, ¶ms) + store := ctx.KVStore(k.storeKey) + bz := store.Get(types.ParamsKey) + if bz == nil { + return params + } + k.cdc.MustUnmarshal(bz, ¶ms) return params } // SetParams set the params -func (k Keeper) SetParams(ctx sdk.Context, params types.Params) { - k.paramstore.SetParamSet(ctx, ¶ms) +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/interchainqueries/types/keys.go b/x/interchainqueries/types/keys.go index 734527d13..7e422b472 100644 --- a/x/interchainqueries/types/keys.go +++ b/x/interchainqueries/types/keys.go @@ -26,6 +26,7 @@ const ( prefixRegisteredQueryResult prefixSubmittedTx prefixTxQueryToRemove + prefixParamsKey ) var ( @@ -37,6 +38,8 @@ var ( SubmittedTxKey = []byte{prefixSubmittedTx} // TxQueryToRemoveKey is the store key for TX queries marked to be removed. TxQueryToRemoveKey = []byte{prefixTxQueryToRemove} + // ParamsKey is the store key for the module params + ParamsKey = []byte{prefixParamsKey} // LastRegisteredQueryIDKey is the store key for last registered query ID. LastRegisteredQueryIDKey = []byte{0x64} ) diff --git a/x/interchaintxs/keeper/keeper.go b/x/interchaintxs/keeper/keeper.go index 1bfd04518..a1032c24c 100644 --- a/x/interchaintxs/keeper/keeper.go +++ b/x/interchaintxs/keeper/keeper.go @@ -7,8 +7,6 @@ import ( "github.com/cosmos/cosmos-sdk/codec" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - "github.com/neutron-org/neutron/x/interchaintxs/types" ) @@ -25,7 +23,6 @@ type ( Codec codec.BinaryCodec storeKey storetypes.StoreKey memKey storetypes.StoreKey - paramstore paramtypes.Subspace channelKeeper types.ChannelKeeper feeKeeper types.FeeRefunderKeeper icaControllerKeeper types.ICAControllerKeeper @@ -37,22 +34,15 @@ func NewKeeper( cdc codec.BinaryCodec, storeKey, memKey storetypes.StoreKey, - paramstore paramtypes.Subspace, channelKeeper types.ChannelKeeper, icaControllerKeeper types.ICAControllerKeeper, contractManagerKeeper types.ContractManagerKeeper, feeKeeper types.FeeRefunderKeeper, ) *Keeper { - // set KeyTable if it has not already been set - if !paramstore.HasKeyTable() { - paramstore = paramstore.WithKeyTable(types.ParamKeyTable()) - } - return &Keeper{ Codec: cdc, storeKey: storeKey, memKey: memKey, - paramstore: paramstore, channelKeeper: channelKeeper, icaControllerKeeper: icaControllerKeeper, contractManagerKeeper: contractManagerKeeper, diff --git a/x/interchaintxs/keeper/msg_server_test.go b/x/interchaintxs/keeper/msg_server_test.go index 16f81930e..49f89fed2 100644 --- a/x/interchaintxs/keeper/msg_server_test.go +++ b/x/interchaintxs/keeper/msg_server_test.go @@ -5,7 +5,6 @@ import ( "testing" "time" - "github.com/cosmos/cosmos-sdk/codec" icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" feerefundertypes "github.com/neutron-org/neutron/x/feerefunder/types" "github.com/neutron-org/neutron/x/interchaintxs/keeper" @@ -120,14 +119,14 @@ func TestSubmitTx(t *testing.T) { require.ErrorContains(t, err, "failed to GetActiveChannelID for port") activeChannel := "channel-0" - cmKeeper.EXPECT().HasContractInfo(ctx, contractAddress).Return(true) - icaKeeper.EXPECT().GetActiveChannelID(ctx, "connection-0", portID).Return(activeChannel, true) - currCodec := icak.Codec - icak.Codec = &codec.AminoCodec{} - resp, err = icak.SubmitTx(goCtx, &submitMsg) - icak.Codec = currCodec - require.Nil(t, resp) - require.ErrorContains(t, err, "only ProtoCodec is supported for receiving messages on the host chain") + //cmKeeper.EXPECT().HasContractInfo(ctx, contractAddress).Return(true) + //icaKeeper.EXPECT().GetActiveChannelID(ctx, "connection-0", portID).Return(activeChannel, true) + //currCodec := icak.Codec + //icak.Codec = &codec.AminoCodec{} + //resp, err = icak.SubmitTx(goCtx, &submitMsg) + //icak.Codec = currCodec + //require.Nil(t, resp) + //require.ErrorContains(t, err, "only ProtoCodec is supported for receiving messages on the host chain") cmKeeper.EXPECT().HasContractInfo(ctx, contractAddress).Return(true) icaKeeper.EXPECT().GetActiveChannelID(ctx, "connection-0", portID).Return(activeChannel, true) diff --git a/x/interchaintxs/keeper/params.go b/x/interchaintxs/keeper/params.go index b466d5fb4..2a443a632 100644 --- a/x/interchaintxs/keeper/params.go +++ b/x/interchaintxs/keeper/params.go @@ -8,12 +8,24 @@ import ( // GetParams get all parameters as types.Params func (k Keeper) GetParams(ctx sdk.Context) (params types.Params) { - k.paramstore.GetParamSet(ctx, ¶ms) + store := ctx.KVStore(k.storeKey) + bz := store.Get(types.ParamsKey) + if bz == nil { + return params + } + k.Codec.MustUnmarshal(bz, ¶ms) return params } // SetParams set the params -func (k Keeper) SetParams(ctx sdk.Context, params types.Params) { - k.paramstore.SetParamSet(ctx, ¶ms) +func (k Keeper) SetParams(ctx sdk.Context, params types.Params) error { + store := ctx.KVStore(k.storeKey) + bz, err := k.Codec.Marshal(¶ms) + if err != nil { + return err + } + + store.Set(types.ParamsKey, bz) + return nil } diff --git a/x/interchaintxs/types/keys.go b/x/interchaintxs/types/keys.go index 9f0ce51cc..e7f0284ca 100644 --- a/x/interchaintxs/types/keys.go +++ b/x/interchaintxs/types/keys.go @@ -16,3 +16,11 @@ const ( // MemStoreKey defines the in-memory store key MemStoreKey = "mem_interchaintxs" ) + +const ( + prefixParamsKey = iota + 1 +) + +var ( + ParamsKey = []byte{prefixParamsKey} +) diff --git a/x/tokenfactory/keeper/keeper.go b/x/tokenfactory/keeper/keeper.go index 0b391112f..433d178bc 100644 --- a/x/tokenfactory/keeper/keeper.go +++ b/x/tokenfactory/keeper/keeper.go @@ -32,19 +32,12 @@ type ( func NewKeeper( cdc codec.Codec, storeKey storetypes.StoreKey, - paramSpace paramtypes.Subspace, accountKeeper types.AccountKeeper, bankKeeper types.BankKeeper, ) Keeper { - if !paramSpace.HasKeyTable() { - paramSpace = paramSpace.WithKeyTable(types.ParamKeyTable()) - } - return Keeper{ - cdc: cdc, - storeKey: storeKey, - paramSpace: paramSpace, - + cdc: cdc, + storeKey: storeKey, accountKeeper: accountKeeper, bankKeeper: bankKeeper, } diff --git a/x/tokenfactory/keeper/params.go b/x/tokenfactory/keeper/params.go index 5e907456d..b8cb99841 100644 --- a/x/tokenfactory/keeper/params.go +++ b/x/tokenfactory/keeper/params.go @@ -8,11 +8,24 @@ import ( // GetParams returns the total set params. func (k Keeper) GetParams(ctx sdk.Context) (params types.Params) { - k.paramSpace.GetParamSet(ctx, ¶ms) + 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) { - k.paramSpace.SetParamSet(ctx, ¶ms) +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/tokenfactory/types/keys.go b/x/tokenfactory/types/keys.go index fac4a6e39..303966f66 100644 --- a/x/tokenfactory/types/keys.go +++ b/x/tokenfactory/types/keys.go @@ -22,13 +22,17 @@ const ( ) // KeySeparator is used to combine parts of the keys in the store -const KeySeparator = "|" +const ( + KeySeparator = "|" + prefixParamsKey = iota + 1 +) var ( DenomAuthorityMetadataKey = "authoritymetadata" DenomsPrefixKey = "denoms" CreatorPrefixKey = "creator" AdminPrefixKey = "admin" + ParamsKey = []byte{prefixParamsKey} ) // GetDenomPrefixStore returns the store prefix where all the data associated with a specific denom From 3b0907280056ac3fe1636060a9fc3d5285c176f4 Mon Sep 17 00:00:00 2001 From: swelf Date: Thu, 27 Jul 2023 11:48:32 +0300 Subject: [PATCH 005/307] merged global fee(but disabled) --- app/ante_handler.go | 7 +- app/app.go | 14 +- app/proposals_allowlisting.go | 2 +- app/upgrades/nextupgrade/constants.go | 2 +- app/upgrades/nextupgrade/upgrades.go | 5 +- app/upgrades/nextupgrade/upgrades_test.go | 4 +- cmd/neutrond/config.go | 2 +- cmd/neutrond/root.go | 11 +- go.mod | 8 +- go.sum | 1514 ++++----------------- 10 files changed, 262 insertions(+), 1307 deletions(-) diff --git a/app/ante_handler.go b/app/ante_handler.go index 1f70faf12..eefe35963 100644 --- a/app/ante_handler.go +++ b/app/ante_handler.go @@ -16,8 +16,6 @@ import ( "github.com/skip-mev/pob/mempool" ante2 "github.com/skip-mev/pob/x/builder/ante" builderkeeper "github.com/skip-mev/pob/x/builder/keeper" - - globalfeeante "github.com/cosmos/gaia/v8/x/globalfee/ante" ) // maxBypassMinFeeMsgGasUsage is the maximum gas usage per message @@ -38,6 +36,9 @@ type HandlerOptions struct { buildKeeper builderkeeper.Keeper txEncoder sdk.TxEncoder mempool *mempool.AuctionMempool + + // globalFee + GlobalFeeSubspace paramtypes.Subspace } func NewAnteHandler(options HandlerOptions, logger log.Logger) (sdk.AnteHandler, error) { @@ -78,7 +79,7 @@ func NewAnteHandler(options HandlerOptions, logger log.Logger) (sdk.AnteHandler, // We are providing options.GlobalFeeSubspace because we do not have staking module // In this case you should be sure that you implemented upgrade to set default global fee param and it SHOULD contain at least one record // otherwise you will get panic - globalfeeante.NewFeeDecorator(options.BypassMinFeeMsgTypes, options.GlobalFeeSubspace, options.GlobalFeeSubspace, maxBypassMinFeeMsgGasUsage), + //globalfeeante.NewFeeDecorator(options.GlobalFeeSubspace, nil), ante.NewDeductFeeDecorator(options.AccountKeeper, options.BankKeeper, options.FeegrantKeeper, options.TxFeeChecker), // SetPubKeyDecorator must be called before all signature verification decorators diff --git a/app/app.go b/app/app.go index f4001f5fe..0102f5de5 100644 --- a/app/app.go +++ b/app/app.go @@ -6,6 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/runtime" "github.com/cosmos/cosmos-sdk/x/genutil" genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types" + ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" tendermint "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" "github.com/neutron-org/neutron/docs" proposalhandler "github.com/skip-mev/pob/abci" @@ -82,7 +83,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/upgrade" upgradekeeper "github.com/cosmos/cosmos-sdk/x/upgrade/keeper" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/cosmos/gaia/v8/x/globalfee" + "github.com/cosmos/gaia/v11/x/globalfee" ica "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts" icacontroller "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller" icacontrollerkeeper "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/keeper" @@ -94,7 +95,7 @@ import ( ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" ibc "github.com/cosmos/ibc-go/v7/modules/core" ibcclient "github.com/cosmos/ibc-go/v7/modules/core/02-client" - ibcchanneltypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" + ibcchanneltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" ibcporttypes "github.com/cosmos/ibc-go/v7/modules/core/05-port/types" ibchost "github.com/cosmos/ibc-go/v7/modules/core/exported" ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper" @@ -117,7 +118,6 @@ import ( govclient "github.com/cosmos/cosmos-sdk/x/gov/client" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - gaiaappparams "github.com/cosmos/gaia/v8/app/params" appparams "github.com/neutron-org/neutron/app/params" "github.com/neutron-org/neutron/wasmbinding" "github.com/neutron-org/neutron/x/contractmanager" @@ -899,11 +899,6 @@ func New( app.SetInitChainer(app.InitChainer) app.SetBeginBlocker(app.BeginBlocker) - bypassMinFeeMsgTypes := cast.ToStringSlice(appOpts.Get(gaiaappparams.BypassMinFeeMsgTypesKey)) - if bypassMinFeeMsgTypes == nil { - bypassMinFeeMsgTypes = GetDefaultBypassFeeMessages() - } - anteHandler, err := NewAnteHandler( HandlerOptions{ HandlerOptions: ante.HandlerOptions{ @@ -919,8 +914,7 @@ func New( ConsumerKeeper: app.ConsumerKeeper, buildKeeper: app.BuilderKeeper, mempool: mempool, - BypassMinFeeMsgTypes: bypassMinFeeMsgTypes, - GlobalFeeSubspace: app.GetSubspace(globalfee.ModuleName), + GlobalFeeSubspace: app.GetSubspace(globalfee.ModuleName), }, app.Logger(), ) diff --git a/app/proposals_allowlisting.go b/app/proposals_allowlisting.go index 4166daf6a..26022eac5 100644 --- a/app/proposals_allowlisting.go +++ b/app/proposals_allowlisting.go @@ -5,11 +5,11 @@ import ( govtypes "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" "github.com/cosmos/cosmos-sdk/x/params/types/proposal" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" + globalfeetypes "github.com/cosmos/gaia/v11/x/globalfee/types" icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types" ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" packetforwardmiddlewaretypes "github.com/strangelove-ventures/packet-forward-middleware/v7/router/types" - globalfeetypes "github.com/cosmos/gaia/v8/x/globalfee/types" ) func IsConsumerProposalAllowlisted(content govtypes.Content) bool { diff --git a/app/upgrades/nextupgrade/constants.go b/app/upgrades/nextupgrade/constants.go index 3d6563ad1..11ddc35b9 100644 --- a/app/upgrades/nextupgrade/constants.go +++ b/app/upgrades/nextupgrade/constants.go @@ -3,7 +3,7 @@ package nextupgrade import ( store "github.com/cosmos/cosmos-sdk/store/types" - "github.com/cosmos/gaia/v8/x/globalfee" + "github.com/cosmos/gaia/v11/x/globalfee" "github.com/neutron-org/neutron/app/upgrades" ) diff --git a/app/upgrades/nextupgrade/upgrades.go b/app/upgrades/nextupgrade/upgrades.go index e16bc7b8a..7db80ca43 100644 --- a/app/upgrades/nextupgrade/upgrades.go +++ b/app/upgrades/nextupgrade/upgrades.go @@ -2,11 +2,12 @@ package nextupgrade import ( "errors" + "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/cosmos/gaia/v8/x/globalfee/types" + "github.com/cosmos/gaia/v11/x/globalfee/types" "github.com/neutron-org/neutron/app/upgrades" ) @@ -14,6 +15,8 @@ func CreateUpgradeHandler( mm *module.Manager, configurator module.Configurator, keepers *upgrades.UpgradeKeepers, + _ upgrades.StoreKeys, + _ codec.Codec, ) upgradetypes.UpgradeHandler { return func(ctx sdk.Context, plan upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) { ctx.Logger().Info("Starting module migrations...") diff --git a/app/upgrades/nextupgrade/upgrades_test.go b/app/upgrades/nextupgrade/upgrades_test.go index e925acd88..464d5293e 100644 --- a/app/upgrades/nextupgrade/upgrades_test.go +++ b/app/upgrades/nextupgrade/upgrades_test.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/cosmos/gaia/v8/x/globalfee" - globalfeetypes "github.com/cosmos/gaia/v8/x/globalfee/types" + "github.com/cosmos/gaia/v11/x/globalfee" + globalfeetypes "github.com/cosmos/gaia/v11/x/globalfee/types" "github.com/neutron-org/neutron/app/upgrades/nextupgrade" "github.com/neutron-org/neutron/testutil" "github.com/stretchr/testify/suite" diff --git a/cmd/neutrond/config.go b/cmd/neutrond/config.go index 0e60ac360..f755c5596 100644 --- a/cmd/neutrond/config.go +++ b/cmd/neutrond/config.go @@ -8,12 +8,12 @@ import ( "path/filepath" "text/template" + tmcli "github.com/cometbft/cometbft/libs/cli" "github.com/cosmos/cosmos-sdk/client" scconfig "github.com/cosmos/cosmos-sdk/client/config" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" "github.com/spf13/viper" - tmcli "github.com/tendermint/tendermint/libs/cli" ) // This code is copied from the Juno implementation: https://github.com/CosmosContracts/juno/pull/601/files diff --git a/cmd/neutrond/root.go b/cmd/neutrond/root.go index 123787054..401939e8b 100644 --- a/cmd/neutrond/root.go +++ b/cmd/neutrond/root.go @@ -2,10 +2,10 @@ package main import ( "errors" + "fmt" "github.com/CosmWasm/wasmd/x/wasm" wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" dbm "github.com/cometbft/cometbft-db" - tmcfg "github.com/cometbft/cometbft/config" tmcli "github.com/cometbft/cometbft/libs/cli" "github.com/cometbft/cometbft/libs/log" tmtypes "github.com/cometbft/cometbft/types" @@ -38,7 +38,7 @@ import ( "os" "path/filepath" - gaiaparams "github.com/cosmos/gaia/v8/app/params" + tmcfg "github.com/cometbft/cometbft/config" "github.com/neutron-org/neutron/app" "github.com/neutron-org/neutron/app/params" ) @@ -86,7 +86,7 @@ func NewRootCmd() (*cobra.Command, params.EncodingConfig) { } customTemplate, customNeutronConfig := initAppConfig() - return server.InterceptConfigsPreRunHandler(cmd, customTemplate, customNeutronConfig) + return server.InterceptConfigsPreRunHandler(cmd, customTemplate, customNeutronConfig, tmcfg.DefaultConfig()) }, } @@ -98,10 +98,7 @@ func NewRootCmd() (*cobra.Command, params.EncodingConfig) { func initAppConfig() (string, interface{}) { srvCfg := serverconfig.DefaultConfig() - return gaiaparams.CustomConfigTemplate(), gaiaparams.CustomAppConfig{ - Config: *srvCfg, - BypassMinFeeMsgTypes: app.GetDefaultBypassFeeMessages(), - } + return serverconfig.DefaultConfigTemplate, srvCfg } func initRootCmd(rootCmd *cobra.Command, encodingConfig params.EncodingConfig) { diff --git a/go.mod b/go.mod index 1011548d1..04a45b9f1 100644 --- a/go.mod +++ b/go.mod @@ -4,6 +4,7 @@ go 1.20 require ( cosmossdk.io/core v0.5.1 + cosmossdk.io/math v1.0.1 github.com/CosmWasm/wasmd v0.40.0 github.com/CosmWasm/wasmvm v1.2.4 github.com/armon/go-metrics v0.4.1 @@ -12,6 +13,7 @@ require ( github.com/cosmos/admin-module v0.0.0-20220204080909-475a98e03f31 github.com/cosmos/cosmos-proto v1.0.0-beta.2 github.com/cosmos/cosmos-sdk v0.47.3 + github.com/cosmos/gaia/v11 v11.0.0-00010101000000-000000000000 github.com/cosmos/gogoproto v1.4.10 github.com/cosmos/ibc-go/v7 v7.2.0 github.com/cosmos/ics23/go v0.10.0 @@ -24,8 +26,10 @@ require ( github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.15.1 + github.com/skip-mev/pob v1.0.3 github.com/spf13/cast v1.5.1 github.com/spf13/cobra v1.7.0 + github.com/spf13/viper v1.16.0 github.com/strangelove-ventures/packet-forward-middleware/v7 v7.0.0-20230523193151-73dea436e53f github.com/stretchr/testify v1.8.4 google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc @@ -43,7 +47,6 @@ require ( cosmossdk.io/depinject v1.0.0-alpha.3 // indirect cosmossdk.io/errors v1.0.0-beta.7 // indirect cosmossdk.io/log v1.1.0 // indirect - cosmossdk.io/math v1.0.1 // indirect cosmossdk.io/tools/rosetta v0.2.1 // indirect filippo.io/edwards25519 v1.0.0 // indirect github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect @@ -145,11 +148,9 @@ require ( github.com/rs/cors v1.8.3 // indirect github.com/rs/zerolog v1.29.1 // indirect github.com/sasha-s/go-deadlock v0.3.1 // indirect - github.com/skip-mev/pob v1.0.3 // indirect github.com/spf13/afero v1.9.5 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/spf13/viper v1.16.0 // indirect github.com/subosito/gotenv v1.4.2 // indirect github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect github.com/tendermint/go-amino v0.16.0 // indirect @@ -184,6 +185,7 @@ replace ( github.com/ChainSafe/go-schnorrkel => github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d github.com/CosmWasm/wasmd => github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230705143547-22c391d461d5 github.com/cosmos/admin-module => github.com/neutron-org/admin-module v0.0.0-20230705134325-b23404470a1d + github.com/cosmos/gaia/v11 => github.com/cosmos/gaia/v11 v11.0.0-20230724152830-861ba391c3b4 github.com/cosmos/ledger-cosmos-go => github.com/cosmos/ledger-cosmos-go v0.12.1 github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 diff --git a/go.sum b/go.sum index b01f6f704..8d4917698 100644 --- a/go.sum +++ b/go.sum @@ -1,9 +1,4 @@ -4d63.com/gochecknoglobals v0.0.0-20201008074935-acfc0b28355a/go.mod h1:wfdC5ZjKSPr7CybKEcgJhUOgeAQW1+7WcyK8OvUilfo= -4d63.com/gochecknoglobals v0.1.0 h1:zeZSRqj5yCg28tCkIV/z/lWbwvNm5qnKVS15PI8nhD0= 4d63.com/gochecknoglobals v0.1.0/go.mod h1:wfdC5ZjKSPr7CybKEcgJhUOgeAQW1+7WcyK8OvUilfo= -bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898 h1:SC+c6A1qTFstO9qmB86mPV2IpYme/2ZoEQ0hrP+wo+Q= -bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod h1:Xbm+BRKSBEpa4q4hTSxohYNQpsxXPbPry4JJWOB3LB8= -bitbucket.org/creachadair/shell v0.0.6 h1:reJflDbKqnlnqb4Oo2pQ1/BqmY/eCWcNGHrIUO8qIzc= bitbucket.org/creachadair/shell v0.0.6/go.mod h1:8Qqi/cYk7vPnsOePHroKXDJYmb5x7ENhtiFtfZq8K+M= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= @@ -45,54 +40,22 @@ cloud.google.com/go v0.102.1/go.mod h1:XZ77E9qnTEnrgEOvr4xzfdX5TRo7fB4T2F4O6+34h cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA= cloud.google.com/go v0.110.0 h1:Zc8gqp3+a9/Eyph2KDmcGaPtbKRIoqq4YTlL4NMD0Ys= cloud.google.com/go v0.110.0/go.mod h1:SJnCLqQ0FCFGSZMUNUf84MV3Aia54kn7pi8st7tMzaY= -cloud.google.com/go/accessapproval v1.6.0 h1:x0cEHro/JFPd7eS4BlEWNTMecIj2HdXjOVB5BtvwER0= -cloud.google.com/go/accessapproval v1.6.0/go.mod h1:R0EiYnwV5fsRFiKZkPHr6mwyk2wxUJ30nL4j2pcFY2E= -cloud.google.com/go/accesscontextmanager v1.7.0 h1:MG60JgnEoawHJrbWw0jGdv6HLNSf6gQvYRiXpuzqgEA= -cloud.google.com/go/accesscontextmanager v1.7.0/go.mod h1:CEGLewx8dwa33aDAZQujl7Dx+uYhS0eay198wB/VumQ= cloud.google.com/go/aiplatform v1.22.0/go.mod h1:ig5Nct50bZlzV6NvKaTwmplLLddFx0YReh9WfTO5jKw= cloud.google.com/go/aiplatform v1.24.0/go.mod h1:67UUvRBKG6GTayHKV8DBv2RtR1t93YRu5B1P3x99mYY= -cloud.google.com/go/aiplatform v1.37.0 h1:zTw+suCVchgZyO+k847wjzdVjWmrAuehxdvcZvJwfGg= -cloud.google.com/go/aiplatform v1.37.0/go.mod h1:IU2Cv29Lv9oCn/9LkFiiuKfwrRTq+QQMbW+hPCxJGZw= cloud.google.com/go/analytics v0.11.0/go.mod h1:DjEWCu41bVbYcKyvlws9Er60YE4a//bK6mnhWvQeFNI= cloud.google.com/go/analytics v0.12.0/go.mod h1:gkfj9h6XRf9+TS4bmuhPEShsh3hH8PAZzm/41OOhQd4= -cloud.google.com/go/analytics v0.19.0 h1:LqAo3tAh2FU9+w/r7vc3hBjU23Kv7GhO/PDIW7kIYgM= -cloud.google.com/go/analytics v0.19.0/go.mod h1:k8liqf5/HCnOUkbawNtrWWc+UAzyDlW89doe8TtoDsE= -cloud.google.com/go/apigateway v1.5.0 h1:ZI9mVO7x3E9RK/BURm2p1aw9YTBSCQe3klmyP1WxWEg= -cloud.google.com/go/apigateway v1.5.0/go.mod h1:GpnZR3Q4rR7LVu5951qfXPJCHquZt02jf7xQx7kpqN8= -cloud.google.com/go/apigeeconnect v1.5.0 h1:sWOmgDyAsi1AZ48XRHcATC0tsi9SkPT7DA/+VCfkaeA= -cloud.google.com/go/apigeeconnect v1.5.0/go.mod h1:KFaCqvBRU6idyhSNyn3vlHXc8VMDJdRmwDF6JyFRqZ8= -cloud.google.com/go/apigeeregistry v0.6.0 h1:E43RdhhCxdlV+I161gUY2rI4eOaMzHTA5kNkvRsFXvc= -cloud.google.com/go/apigeeregistry v0.6.0/go.mod h1:BFNzW7yQVLZ3yj0TKcwzb8n25CFBri51GVGOEUcgQsc= -cloud.google.com/go/appengine v1.7.1 h1:aBGDKmRIaRRoWJ2tAoN0oVSHoWLhtO9aj/NvUyP4aYs= -cloud.google.com/go/appengine v1.7.1/go.mod h1:IHLToyb/3fKutRysUlFO0BPt5j7RiQ45nrzEJmKTo6E= cloud.google.com/go/area120 v0.5.0/go.mod h1:DE/n4mp+iqVyvxHN41Vf1CR602GiHQjFPusMFW6bGR4= cloud.google.com/go/area120 v0.6.0/go.mod h1:39yFJqWVgm0UZqWTOdqkLhjoC7uFfgXRC8g/ZegeAh0= -cloud.google.com/go/area120 v0.7.1 h1:ugckkFh4XkHJMPhTIx0CyvdoBxmOpMe8rNs4Ok8GAag= -cloud.google.com/go/area120 v0.7.1/go.mod h1:j84i4E1RboTWjKtZVWXPqvK5VHQFJRF2c1Nm69pWm9k= cloud.google.com/go/artifactregistry v1.6.0/go.mod h1:IYt0oBPSAGYj/kprzsBjZ/4LnG/zOcHyFHjWPCi6SAQ= cloud.google.com/go/artifactregistry v1.7.0/go.mod h1:mqTOFOnGZx8EtSqK/ZWcsm/4U8B77rbcLP6ruDU2Ixk= -cloud.google.com/go/artifactregistry v1.13.0 h1:o1Q80vqEB6Qp8WLEH3b8FBLNUCrGQ4k5RFj0sn/sgO8= -cloud.google.com/go/artifactregistry v1.13.0/go.mod h1:uy/LNfoOIivepGhooAUpL1i30Hgee3Cu0l4VTWHUC08= cloud.google.com/go/asset v1.5.0/go.mod h1:5mfs8UvcM5wHhqtSv8J1CtxxaQq3AdBxxQi2jGW/K4o= cloud.google.com/go/asset v1.7.0/go.mod h1:YbENsRK4+xTiL+Ofoj5Ckf+O17kJtgp3Y3nn4uzZz5s= cloud.google.com/go/asset v1.8.0/go.mod h1:mUNGKhiqIdbr8X7KNayoYvyc4HbbFO9URsjbytpUaW0= -cloud.google.com/go/asset v1.13.0 h1:YAsssO08BqZ6mncbb6FPlj9h6ACS7bJQUOlzciSfbNk= -cloud.google.com/go/asset v1.13.0/go.mod h1:WQAMyYek/b7NBpYq/K4KJWcRqzoalEsxz/t/dTk4THw= cloud.google.com/go/assuredworkloads v1.5.0/go.mod h1:n8HOZ6pff6re5KYfBXcFvSViQjDwxFkAkmUFffJRbbY= cloud.google.com/go/assuredworkloads v1.6.0/go.mod h1:yo2YOk37Yc89Rsd5QMVECvjaMKymF9OP+QXWlKXUkXw= cloud.google.com/go/assuredworkloads v1.7.0/go.mod h1:z/736/oNmtGAyU47reJgGN+KVoYoxeLBoj4XkKYscNI= -cloud.google.com/go/assuredworkloads v1.10.0 h1:VLGnVFta+N4WM+ASHbhc14ZOItOabDLH1MSoDv+Xuag= -cloud.google.com/go/assuredworkloads v1.10.0/go.mod h1:kwdUQuXcedVdsIaKgKTp9t0UJkE5+PAVNhdQm4ZVq2E= cloud.google.com/go/automl v1.5.0/go.mod h1:34EjfoFGMZ5sgJ9EoLsRtdPSNZLcfflJR39VbVNS2M0= cloud.google.com/go/automl v1.6.0/go.mod h1:ugf8a6Fx+zP0D59WLhqgTDsQI9w07o64uf/Is3Nh5p8= -cloud.google.com/go/automl v1.12.0 h1:50VugllC+U4IGl3tDNcZaWvApHBTrn/TvyHDJ0wM+Uw= -cloud.google.com/go/automl v1.12.0/go.mod h1:tWDcHDp86aMIuHmyvjuKeeHEGq76lD7ZqfGLN6B0NuU= -cloud.google.com/go/baremetalsolution v0.5.0 h1:2AipdYXL0VxMboelTTw8c1UJ7gYu35LZYUbuRv9Q28s= -cloud.google.com/go/baremetalsolution v0.5.0/go.mod h1:dXGxEkmR9BMwxhzBhV0AioD0ULBmuLZI8CdwalUxuss= -cloud.google.com/go/batch v0.7.0 h1:YbMt0E6BtqeD5FvSv1d56jbVsWEzlGm55lYte+M6Mzs= -cloud.google.com/go/batch v0.7.0/go.mod h1:vLZN95s6teRUqRQ4s3RLDsH8PvboqBK+rn1oevL159g= -cloud.google.com/go/beyondcorp v0.5.0 h1:UkY2BTZkEUAVrgqnSdOJ4p3y9ZRBPEe1LkjgC8Bj/Pc= -cloud.google.com/go/beyondcorp v0.5.0/go.mod h1:uFqj9X+dSfrheVp7ssLTaRHd2EHqSL4QZmH4e8WXGGU= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= @@ -100,30 +63,13 @@ cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUM cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= cloud.google.com/go/bigquery v1.42.0/go.mod h1:8dRTJxhtG+vwBKzE5OseQn/hiydoQN3EedCaOdYmxRA= -cloud.google.com/go/bigquery v1.50.0 h1:RscMV6LbnAmhAzD893Lv9nXXy2WCaJmbxYPWDLbGqNQ= -cloud.google.com/go/bigquery v1.50.0/go.mod h1:YrleYEh2pSEbgTBZYMJ5SuSr0ML3ypjRB1zgf7pvQLU= -cloud.google.com/go/bigtable v1.2.0 h1:F4cCmA4nuV84V5zYQ3MKY+M1Cw1avHDuf3S/LcZPA9c= cloud.google.com/go/bigtable v1.2.0/go.mod h1:JcVAOl45lrTmQfLj7T6TxyMzIN/3FGGcFm+2xVAli2o= cloud.google.com/go/billing v1.4.0/go.mod h1:g9IdKBEFlItS8bTtlrZdVLWSSdSyFUZKXNS02zKMOZY= cloud.google.com/go/billing v1.5.0/go.mod h1:mztb1tBc3QekhjSgmpf/CV4LzWXLzCArwpLmP2Gm88s= -cloud.google.com/go/billing v1.13.0 h1:JYj28UYF5w6VBAh0gQYlgHJ/OD1oA+JgW29YZQU+UHM= -cloud.google.com/go/billing v1.13.0/go.mod h1:7kB2W9Xf98hP9Sr12KfECgfGclsH3CQR0R08tnRlRbc= cloud.google.com/go/binaryauthorization v1.1.0/go.mod h1:xwnoWu3Y84jbuHa0zd526MJYmtnVXn0syOjaJgy4+dM= cloud.google.com/go/binaryauthorization v1.2.0/go.mod h1:86WKkJHtRcv5ViNABtYMhhNWRrD1Vpi//uKEy7aYEfI= -cloud.google.com/go/binaryauthorization v1.5.0 h1:d3pMDBCCNivxt5a4eaV7FwL7cSH0H7RrEnFrTb1QKWs= -cloud.google.com/go/binaryauthorization v1.5.0/go.mod h1:OSe4OU1nN/VswXKRBmciKpo9LulY41gch5c68htf3/Q= -cloud.google.com/go/certificatemanager v1.6.0 h1:5C5UWeSt8Jkgp7OWn2rCkLmYurar/vIWIoSQ2+LaTOc= -cloud.google.com/go/certificatemanager v1.6.0/go.mod h1:3Hh64rCKjRAX8dXgRAyOcY5vQ/fE1sh8o+Mdd6KPgY8= -cloud.google.com/go/channel v1.12.0 h1:GpcQY5UJKeOekYgsX3QXbzzAc/kRGtBq43fTmyKe6Uw= -cloud.google.com/go/channel v1.12.0/go.mod h1:VkxCGKASi4Cq7TbXxlaBezonAYpp1GCnKMY6tnMQnLU= -cloud.google.com/go/cloudbuild v1.9.0 h1:GHQCjV4WlPPVU/j3Rlpc8vNIDwThhd1U9qSY/NPZdko= -cloud.google.com/go/cloudbuild v1.9.0/go.mod h1:qK1d7s4QlO0VwfYn5YuClDGg2hfmLZEb4wQGAbIgL1s= -cloud.google.com/go/clouddms v1.5.0 h1:E7v4TpDGUyEm1C/4KIrpVSOCTm0P6vWdHT0I4mostRA= -cloud.google.com/go/clouddms v1.5.0/go.mod h1:QSxQnhikCLUw13iAbffF2CZxAER3xDGNHjsTAkQJcQA= cloud.google.com/go/cloudtasks v1.5.0/go.mod h1:fD92REy1x5woxkKEkLdvavGnPJGEn8Uic9nWuLzqCpY= cloud.google.com/go/cloudtasks v1.6.0/go.mod h1:C6Io+sxuke9/KNRkbQpihnW93SWDU3uXt92nu85HkYI= -cloud.google.com/go/cloudtasks v1.10.0 h1:uK5k6abf4yligFgYFnG0ni8msai/dSv6mDmiBulU0hU= -cloud.google.com/go/cloudtasks v1.10.0/go.mod h1:NDSoTLkZ3+vExFEWu2UJV1arUyzVDAiZtdWcsUyNwBs= cloud.google.com/go/compute v0.1.0/go.mod h1:GAesmwr110a34z04OlxYkATPBEfVhkymfTBXtfbBFow= cloud.google.com/go/compute v1.3.0/go.mod h1:cCZiE1NHEtai4wiufUhW8I8S1JKkAnhnQJWM7YD99wM= cloud.google.com/go/compute v1.5.0/go.mod h1:9SMHyhJlzhlkJqrPAc839t2BZFTSk6Jdj6mkzQJeu0M= @@ -135,253 +81,101 @@ cloud.google.com/go/compute v1.19.0 h1:+9zda3WGgW1ZSTlVppLCYFIr48Pa35q1uG2N1itbC cloud.google.com/go/compute v1.19.0/go.mod h1:rikpw2y+UMidAe9tISo04EHNOIf42RLYF/q8Bs93scU= cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= -cloud.google.com/go/contactcenterinsights v1.6.0 h1:jXIpfcH/VYSE1SYcPzO0n1VVb+sAamiLOgCw45JbOQk= -cloud.google.com/go/contactcenterinsights v1.6.0/go.mod h1:IIDlT6CLcDoyv79kDv8iWxMSTZhLxSCofVV5W6YFM/w= -cloud.google.com/go/container v1.15.0 h1:NKlY/wCDapfVZlbVVaeuu2UZZED5Dy1z4Zx1KhEzm8c= -cloud.google.com/go/container v1.15.0/go.mod h1:ft+9S0WGjAyjDggg5S06DXj+fHJICWg8L7isCQe9pQA= cloud.google.com/go/containeranalysis v0.5.1/go.mod h1:1D92jd8gRR/c0fGMlymRgxWD3Qw9C1ff6/T7mLgVL8I= cloud.google.com/go/containeranalysis v0.6.0/go.mod h1:HEJoiEIu+lEXM+k7+qLCci0h33lX3ZqoYFdmPcoO7s4= -cloud.google.com/go/containeranalysis v0.9.0 h1:EQ4FFxNaEAg8PqQCO7bVQfWz9NVwZCUKaM1b3ycfx3U= -cloud.google.com/go/containeranalysis v0.9.0/go.mod h1:orbOANbwk5Ejoom+s+DUCTTJ7IBdBQJDcSylAx/on9s= cloud.google.com/go/datacatalog v1.3.0/go.mod h1:g9svFY6tuR+j+hrTw3J2dNcmI0dzmSiyOzm8kpLq0a0= cloud.google.com/go/datacatalog v1.5.0/go.mod h1:M7GPLNQeLfWqeIm3iuiruhPzkt65+Bx8dAKvScX8jvs= cloud.google.com/go/datacatalog v1.6.0/go.mod h1:+aEyF8JKg+uXcIdAmmaMUmZ3q1b/lKLtXCmXdnc0lbc= -cloud.google.com/go/datacatalog v1.13.0 h1:4H5IJiyUE0X6ShQBqgFFZvGGcrwGVndTwUSLP4c52gw= -cloud.google.com/go/datacatalog v1.13.0/go.mod h1:E4Rj9a5ZtAxcQJlEBTLgMTphfP11/lNaAshpoBgemX8= cloud.google.com/go/dataflow v0.6.0/go.mod h1:9QwV89cGoxjjSR9/r7eFDqqjtvbKxAK2BaYU6PVk9UM= cloud.google.com/go/dataflow v0.7.0/go.mod h1:PX526vb4ijFMesO1o202EaUmouZKBpjHsTlCtB4parQ= -cloud.google.com/go/dataflow v0.8.0 h1:eYyD9o/8Nm6EttsKZaEGD84xC17bNgSKCu0ZxwqUbpg= -cloud.google.com/go/dataflow v0.8.0/go.mod h1:Rcf5YgTKPtQyYz8bLYhFoIV/vP39eL7fWNcSOyFfLJE= cloud.google.com/go/dataform v0.3.0/go.mod h1:cj8uNliRlHpa6L3yVhDOBrUXH+BPAO1+KFMQQNSThKo= cloud.google.com/go/dataform v0.4.0/go.mod h1:fwV6Y4Ty2yIFL89huYlEkwUPtS7YZinZbzzj5S9FzCE= -cloud.google.com/go/dataform v0.7.0 h1:Dyk+fufup1FR6cbHjFpMuP4SfPiF3LI3JtoIIALoq48= -cloud.google.com/go/dataform v0.7.0/go.mod h1:7NulqnVozfHvWUBpMDfKMUESr+85aJsC/2O0o3jWPDE= -cloud.google.com/go/datafusion v1.6.0 h1:sZjRnS3TWkGsu1LjYPFD/fHeMLZNXDK6PDHi2s2s/bk= -cloud.google.com/go/datafusion v1.6.0/go.mod h1:WBsMF8F1RhSXvVM8rCV3AeyWVxcC2xY6vith3iw3S+8= cloud.google.com/go/datalabeling v0.5.0/go.mod h1:TGcJ0G2NzcsXSE/97yWjIZO0bXj0KbVlINXMG9ud42I= cloud.google.com/go/datalabeling v0.6.0/go.mod h1:WqdISuk/+WIGeMkpw/1q7bK/tFEZxsrFJOJdY2bXvTQ= -cloud.google.com/go/datalabeling v0.7.0 h1:ch4qA2yvddGRUrlfwrNJCr79qLqhS9QBwofPHfFlDIk= -cloud.google.com/go/datalabeling v0.7.0/go.mod h1:WPQb1y08RJbmpM3ww0CSUAGweL0SxByuW2E+FU+wXcM= -cloud.google.com/go/dataplex v1.6.0 h1:RvoZ5T7gySwm1CHzAw7yY1QwwqaGswunmqEssPxU/AM= -cloud.google.com/go/dataplex v1.6.0/go.mod h1:bMsomC/aEJOSpHXdFKFGQ1b0TDPIeL28nJObeO1ppRs= -cloud.google.com/go/dataproc v1.12.0 h1:W47qHL3W4BPkAIbk4SWmIERwsWBaNnWm0P2sdx3YgGU= -cloud.google.com/go/dataproc v1.12.0/go.mod h1:zrF3aX0uV3ikkMz6z4uBbIKyhRITnxvr4i3IjKsKrw4= cloud.google.com/go/dataqna v0.5.0/go.mod h1:90Hyk596ft3zUQ8NkFfvICSIfHFh1Bc7C4cK3vbhkeo= cloud.google.com/go/dataqna v0.6.0/go.mod h1:1lqNpM7rqNLVgWBJyk5NF6Uen2PHym0jtVJonplVsDA= -cloud.google.com/go/dataqna v0.7.0 h1:yFzi/YU4YAdjyo7pXkBE2FeHbgz5OQQBVDdbErEHmVQ= -cloud.google.com/go/dataqna v0.7.0/go.mod h1:Lx9OcIIeqCrw1a6KdO3/5KMP1wAmTc0slZWwP12Qq3c= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= -cloud.google.com/go/datastore v1.11.0 h1:iF6I/HaLs3Ado8uRKMvZRvF/ZLkWaWE9i8AiHzbC774= -cloud.google.com/go/datastore v1.11.0/go.mod h1:TvGxBIHCS50u8jzG+AW/ppf87v1of8nwzFNgEZU1D3c= cloud.google.com/go/datastream v1.2.0/go.mod h1:i/uTP8/fZwgATHS/XFu0TcNUhuA0twZxxQ3EyCUQMwo= cloud.google.com/go/datastream v1.3.0/go.mod h1:cqlOX8xlyYF/uxhiKn6Hbv6WjwPPuI9W2M9SAXwaLLQ= -cloud.google.com/go/datastream v1.7.0 h1:BBCBTnWMDwwEzQQmipUXxATa7Cm7CA/gKjKcR2w35T0= -cloud.google.com/go/datastream v1.7.0/go.mod h1:uxVRMm2elUSPuh65IbZpzJNMbuzkcvu5CjMqVIUHrww= -cloud.google.com/go/deploy v1.8.0 h1:otshdKEbmsi1ELYeCKNYppwV0UH5xD05drSdBm7ouTk= -cloud.google.com/go/deploy v1.8.0/go.mod h1:z3myEJnA/2wnB4sgjqdMfgxCA0EqC3RBTNcVPs93mtQ= cloud.google.com/go/dialogflow v1.15.0/go.mod h1:HbHDWs33WOGJgn6rfzBW1Kv807BE3O1+xGbn59zZWI4= cloud.google.com/go/dialogflow v1.16.1/go.mod h1:po6LlzGfK+smoSmTBnbkIZY2w8ffjz/RcGSS+sh1el0= cloud.google.com/go/dialogflow v1.17.0/go.mod h1:YNP09C/kXA1aZdBgC/VtXX74G/TKn7XVCcVumTflA+8= -cloud.google.com/go/dialogflow v1.32.0 h1:uVlKKzp6G/VtSW0E7IH1Y5o0H48/UOCmqksG2riYCwQ= -cloud.google.com/go/dialogflow v1.32.0/go.mod h1:jG9TRJl8CKrDhMEcvfcfFkkpp8ZhgPz3sBGmAUYJ2qE= -cloud.google.com/go/dlp v1.9.0 h1:1JoJqezlgu6NWCroBxr4rOZnwNFILXr4cB9dMaSKO4A= -cloud.google.com/go/dlp v1.9.0/go.mod h1:qdgmqgTyReTz5/YNSSuueR8pl7hO0o9bQ39ZhtgkWp4= cloud.google.com/go/documentai v1.7.0/go.mod h1:lJvftZB5NRiFSX4moiye1SMxHx0Bc3x1+p9e/RfXYiU= cloud.google.com/go/documentai v1.8.0/go.mod h1:xGHNEB7CtsnySCNrCFdCyyMz44RhFEEX2Q7UD0c5IhU= -cloud.google.com/go/documentai v1.18.0 h1:KM3Xh0QQyyEdC8Gs2vhZfU+rt6OCPF0dwVwxKgLmWfI= -cloud.google.com/go/documentai v1.18.0/go.mod h1:F6CK6iUH8J81FehpskRmhLq/3VlwQvb7TvwOceQ2tbs= cloud.google.com/go/domains v0.6.0/go.mod h1:T9Rz3GasrpYk6mEGHh4rymIhjlnIuB4ofT1wTxDeT4Y= cloud.google.com/go/domains v0.7.0/go.mod h1:PtZeqS1xjnXuRPKE/88Iru/LdfoRyEHYA9nFQf4UKpg= -cloud.google.com/go/domains v0.8.0 h1:2ti/o9tlWL4N+wIuWUNH+LbfgpwxPr8J1sv9RHA4bYQ= -cloud.google.com/go/domains v0.8.0/go.mod h1:M9i3MMDzGFXsydri9/vW+EWz9sWb4I6WyHqdlAk0idE= cloud.google.com/go/edgecontainer v0.1.0/go.mod h1:WgkZ9tp10bFxqO8BLPqv2LlfmQF1X8lZqwW4r1BTajk= cloud.google.com/go/edgecontainer v0.2.0/go.mod h1:RTmLijy+lGpQ7BXuTDa4C4ssxyXT34NIuHIgKuP4s5w= -cloud.google.com/go/edgecontainer v1.0.0 h1:O0YVE5v+O0Q/ODXYsQHmHb+sYM8KNjGZw2pjX2Ws41c= -cloud.google.com/go/edgecontainer v1.0.0/go.mod h1:cttArqZpBB2q58W/upSG++ooo6EsblxDIolxa3jSjbY= -cloud.google.com/go/errorreporting v0.3.0 h1:kj1XEWMu8P0qlLhm3FwcaFsUvXChV/OraZwA70trRR0= -cloud.google.com/go/errorreporting v0.3.0/go.mod h1:xsP2yaAp+OAW4OIm60An2bbLpqIhKXdWR/tawvl7QzU= -cloud.google.com/go/essentialcontacts v1.5.0 h1:gIzEhCoOT7bi+6QZqZIzX1Erj4SswMPIteNvYVlu+pM= -cloud.google.com/go/essentialcontacts v1.5.0/go.mod h1:ay29Z4zODTuwliK7SnX8E86aUF2CTzdNtvv42niCX0M= -cloud.google.com/go/eventarc v1.11.0 h1:fsJmNeqvqtk74FsaVDU6cH79lyZNCYP8Rrv7EhaB/PU= -cloud.google.com/go/eventarc v1.11.0/go.mod h1:PyUjsUKPWoRBCHeOxZd/lbOOjahV41icXyUY5kSTvVY= -cloud.google.com/go/filestore v1.6.0 h1:ckTEXN5towyTMu4q0uQ1Mde/JwTHur0gXs8oaIZnKfw= -cloud.google.com/go/filestore v1.6.0/go.mod h1:di5unNuss/qfZTw2U9nhFqo8/ZDSc466dre85Kydllg= -cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= cloud.google.com/go/firestore v1.6.1/go.mod h1:asNXNOzBdyVQmEU+ggO8UPodTkEVFW5Qx+rwHnAz+EY= -cloud.google.com/go/firestore v1.9.0 h1:IBlRyxgGySXu5VuW0RgGFlTtLukSnNkpDiEOMkQkmpA= -cloud.google.com/go/firestore v1.9.0/go.mod h1:HMkjKHNTtRyZNiMzu7YAsLr9K3X2udY2AMwDaMEQiiE= cloud.google.com/go/functions v1.6.0/go.mod h1:3H1UA3qiIPRWD7PeZKLvHZ9SaQhR26XIJcC0A5GbvAk= cloud.google.com/go/functions v1.7.0/go.mod h1:+d+QBcWM+RsrgZfV9xo6KfA1GlzJfxcfZcRPEhDDfzg= -cloud.google.com/go/functions v1.13.0 h1:pPDqtsXG2g9HeOQLoquLbmvmb82Y4Ezdo1GXuotFoWg= -cloud.google.com/go/functions v1.13.0/go.mod h1:EU4O007sQm6Ef/PwRsI8N2umygGqPBS/IZQKBQBcJ3c= cloud.google.com/go/gaming v1.5.0/go.mod h1:ol7rGcxP/qHTRQE/RO4bxkXq+Fix0j6D4LFPzYTIrDM= cloud.google.com/go/gaming v1.6.0/go.mod h1:YMU1GEvA39Qt3zWGyAVA9bpYz/yAhTvaQ1t2sK4KPUA= -cloud.google.com/go/gaming v1.9.0 h1:7vEhFnZmd931Mo7sZ6pJy7uQPDxF7m7v8xtBheG08tc= -cloud.google.com/go/gaming v1.9.0/go.mod h1:Fc7kEmCObylSWLO334NcO+O9QMDyz+TKC4v1D7X+Bc0= -cloud.google.com/go/gkebackup v0.4.0 h1:za3QZvw6ujR0uyqkhomKKKNoXDyqYGPJies3voUK8DA= -cloud.google.com/go/gkebackup v0.4.0/go.mod h1:byAyBGUwYGEEww7xsbnUTBHIYcOPy/PgUWUtOeRm9Vg= cloud.google.com/go/gkeconnect v0.5.0/go.mod h1:c5lsNAg5EwAy7fkqX/+goqFsU1Da/jQFqArp+wGNr/o= cloud.google.com/go/gkeconnect v0.6.0/go.mod h1:Mln67KyU/sHJEBY8kFZ0xTeyPtzbq9StAVvEULYK16A= -cloud.google.com/go/gkeconnect v0.7.0 h1:gXYKciHS/Lgq0GJ5Kc9SzPA35NGc3yqu6SkjonpEr2Q= -cloud.google.com/go/gkeconnect v0.7.0/go.mod h1:SNfmVqPkaEi3bF/B3CNZOAYPYdg7sU+obZ+QTky2Myw= cloud.google.com/go/gkehub v0.9.0/go.mod h1:WYHN6WG8w9bXU0hqNxt8rm5uxnk8IH+lPY9J2TV7BK0= cloud.google.com/go/gkehub v0.10.0/go.mod h1:UIPwxI0DsrpsVoWpLB0stwKCP+WFVG9+y977wO+hBH0= -cloud.google.com/go/gkehub v0.12.0 h1:TqCSPsEBQ6oZSJgEYZ3XT8x2gUadbvfwI32YB0kuHCs= -cloud.google.com/go/gkehub v0.12.0/go.mod h1:djiIwwzTTBrF5NaXCGv3mf7klpEMcST17VBTVVDcuaw= -cloud.google.com/go/gkemulticloud v0.5.0 h1:8I84Q4vl02rJRsFiinBxl7WCozfdLlUVBQuSrqr9Wtk= -cloud.google.com/go/gkemulticloud v0.5.0/go.mod h1:W0JDkiyi3Tqh0TJr//y19wyb1yf8llHVto2Htf2Ja3Y= -cloud.google.com/go/grafeas v0.2.0 h1:CYjC+xzdPvbV65gi6Dr4YowKcmLo045pm18L0DhdELM= cloud.google.com/go/grafeas v0.2.0/go.mod h1:KhxgtF2hb0P191HlY5besjYm6MqTSTj3LSI+M+ByZHc= -cloud.google.com/go/gsuiteaddons v1.5.0 h1:1mvhXqJzV0Vg5Fa95QwckljODJJfDFXV4pn+iL50zzA= -cloud.google.com/go/gsuiteaddons v1.5.0/go.mod h1:TFCClYLd64Eaa12sFVmUyG62tk4mdIsI7pAnSXRkcFo= cloud.google.com/go/iam v0.3.0/go.mod h1:XzJPvDayI+9zsASAFO68Hk07u3z+f+JrT2xXNdp4bnY= cloud.google.com/go/iam v0.5.0/go.mod h1:wPU9Vt0P4UmCux7mqtRu6jcpPAb74cP1fh50J3QpkUc= cloud.google.com/go/iam v0.13.0 h1:+CmB+K0J/33d0zSQ9SlFWUeCCEn5XJA0ZMZ3pHE9u8k= cloud.google.com/go/iam v0.13.0/go.mod h1:ljOg+rcNfzZ5d6f1nAUJ8ZIxOaZUVoS14bKCtaLZ/D0= -cloud.google.com/go/iap v1.7.1 h1:PxVHFuMxmSZyfntKXHXhd8bo82WJ+LcATenq7HLdVnU= -cloud.google.com/go/iap v1.7.1/go.mod h1:WapEwPc7ZxGt2jFGB/C/bm+hP0Y6NXzOYGjpPnmMS74= -cloud.google.com/go/ids v1.3.0 h1:fodnCDtOXuMmS8LTC2y3h8t24U8F3eKWfhi+3LY6Qf0= -cloud.google.com/go/ids v1.3.0/go.mod h1:JBdTYwANikFKaDP6LtW5JAi4gubs57SVNQjemdt6xV4= -cloud.google.com/go/iot v1.6.0 h1:39W5BFSarRNZfVG0eXI5LYux+OVQT8GkgpHCnrZL2vM= -cloud.google.com/go/iot v1.6.0/go.mod h1:IqdAsmE2cTYYNO1Fvjfzo9po179rAtJeVGUvkLN3rLE= -cloud.google.com/go/kms v1.10.1 h1:7hm1bRqGCA1GBRQUrp831TwJ9TWhP+tvLuP497CQS2g= -cloud.google.com/go/kms v1.10.1/go.mod h1:rIWk/TryCkR59GMC3YtHtXeLzd634lBbKenvyySAyYI= cloud.google.com/go/language v1.4.0/go.mod h1:F9dRpNFQmJbkaop6g0JhSBXCNlO90e1KWx5iDdxbWic= cloud.google.com/go/language v1.6.0/go.mod h1:6dJ8t3B+lUYfStgls25GusK04NLh3eDLQnWM3mdEbhI= -cloud.google.com/go/language v1.9.0 h1:7Ulo2mDk9huBoBi8zCE3ONOoBrL6UXfAI71CLQ9GEIM= -cloud.google.com/go/language v1.9.0/go.mod h1:Ns15WooPM5Ad/5no/0n81yUetis74g3zrbeJBE+ptUY= cloud.google.com/go/lifesciences v0.5.0/go.mod h1:3oIKy8ycWGPUyZDR/8RNnTOYevhaMLqh5vLUXs9zvT8= cloud.google.com/go/lifesciences v0.6.0/go.mod h1:ddj6tSX/7BOnhxCSd3ZcETvtNr8NZ6t/iPhY2Tyfu08= -cloud.google.com/go/lifesciences v0.8.0 h1:uWrMjWTsGjLZpCTWEAzYvyXj+7fhiZST45u9AgasasI= -cloud.google.com/go/lifesciences v0.8.0/go.mod h1:lFxiEOMqII6XggGbOnKiyZ7IBwoIqA84ClvoezaA/bo= -cloud.google.com/go/logging v1.7.0 h1:CJYxlNNNNAMkHp9em/YEXcfJg+rPDg7YfwoRpMU+t5I= -cloud.google.com/go/logging v1.7.0/go.mod h1:3xjP2CjkM3ZkO73aj4ASA5wRPGGCRrPIAeNqVNkzY8M= cloud.google.com/go/longrunning v0.4.1 h1:v+yFJOfKC3yZdY6ZUI933pIYdhyhV8S3NpWrXWmg7jM= -cloud.google.com/go/longrunning v0.4.1/go.mod h1:4iWDqhBZ70CvZ6BfETbvam3T8FMvLK+eFj0E6AaRQTo= -cloud.google.com/go/managedidentities v1.5.0 h1:ZRQ4k21/jAhrHBVKl/AY7SjgzeJwG1iZa+mJ82P+VNg= -cloud.google.com/go/managedidentities v1.5.0/go.mod h1:+dWcZ0JlUmpuxpIDfyP5pP5y0bLdRwOS4Lp7gMni/LA= -cloud.google.com/go/maps v0.7.0 h1:mv9YaczD4oZBZkM5XJl6fXQ984IkJNHPwkc8MUsdkBo= -cloud.google.com/go/maps v0.7.0/go.mod h1:3GnvVl3cqeSvgMcpRlQidXsPYuDGQ8naBis7MVzpXsY= cloud.google.com/go/mediatranslation v0.5.0/go.mod h1:jGPUhGTybqsPQn91pNXw0xVHfuJ3leR1wj37oU3y1f4= cloud.google.com/go/mediatranslation v0.6.0/go.mod h1:hHdBCTYNigsBxshbznuIMFNe5QXEowAuNmmC7h8pu5w= -cloud.google.com/go/mediatranslation v0.7.0 h1:anPxH+/WWt8Yc3EdoEJhPMBRF7EhIdz426A+tuoA0OU= -cloud.google.com/go/mediatranslation v0.7.0/go.mod h1:LCnB/gZr90ONOIQLgSXagp8XUW1ODs2UmUMvcgMfI2I= cloud.google.com/go/memcache v1.4.0/go.mod h1:rTOfiGZtJX1AaFUrOgsMHX5kAzaTQ8azHiuDoTPzNsE= cloud.google.com/go/memcache v1.5.0/go.mod h1:dk3fCK7dVo0cUU2c36jKb4VqKPS22BTkf81Xq617aWM= -cloud.google.com/go/memcache v1.9.0 h1:8/VEmWCpnETCrBwS3z4MhT+tIdKgR1Z4Tr2tvYH32rg= -cloud.google.com/go/memcache v1.9.0/go.mod h1:8oEyzXCu+zo9RzlEaEjHl4KkgjlNDaXbCQeQWlzNFJM= cloud.google.com/go/metastore v1.5.0/go.mod h1:2ZNrDcQwghfdtCwJ33nM0+GrBGlVuh8rakL3vdPY3XY= cloud.google.com/go/metastore v1.6.0/go.mod h1:6cyQTls8CWXzk45G55x57DVQ9gWg7RiH65+YgPsNh9s= -cloud.google.com/go/metastore v1.10.0 h1:QCFhZVe2289KDBQ7WxaHV2rAmPrmRAdLC6gbjUd3HPo= -cloud.google.com/go/metastore v1.10.0/go.mod h1:fPEnH3g4JJAk+gMRnrAnoqyv2lpUCqJPWOodSaf45Eo= -cloud.google.com/go/monitoring v1.13.0 h1:2qsrgXGVoRXpP7otZ14eE1I568zAa92sJSDPyOJvwjM= -cloud.google.com/go/monitoring v1.13.0/go.mod h1:k2yMBAB1H9JT/QETjNkgdCGD9bPF712XiLTVr+cBrpw= cloud.google.com/go/networkconnectivity v1.4.0/go.mod h1:nOl7YL8odKyAOtzNX73/M5/mGZgqqMeryi6UPZTk/rA= cloud.google.com/go/networkconnectivity v1.5.0/go.mod h1:3GzqJx7uhtlM3kln0+x5wyFvuVH1pIBJjhCpjzSt75o= -cloud.google.com/go/networkconnectivity v1.11.0 h1:ZD6b4Pk1jEtp/cx9nx0ZYcL3BKqDa+KixNDZ6Bjs1B8= -cloud.google.com/go/networkconnectivity v1.11.0/go.mod h1:iWmDD4QF16VCDLXUqvyspJjIEtBR/4zq5hwnY2X3scM= -cloud.google.com/go/networkmanagement v1.6.0 h1:8KWEUNGcpSX9WwZXq7FtciuNGPdPdPN/ruDm769yAEM= -cloud.google.com/go/networkmanagement v1.6.0/go.mod h1:5pKPqyXjB/sgtvB5xqOemumoQNB7y95Q7S+4rjSOPYY= cloud.google.com/go/networksecurity v0.5.0/go.mod h1:xS6fOCoqpVC5zx15Z/MqkfDwH4+m/61A3ODiDV1xmiQ= cloud.google.com/go/networksecurity v0.6.0/go.mod h1:Q5fjhTr9WMI5mbpRYEbiexTzROf7ZbDzvzCrNl14nyU= -cloud.google.com/go/networksecurity v0.8.0 h1:sOc42Ig1K2LiKlzG71GUVloeSJ0J3mffEBYmvu+P0eo= -cloud.google.com/go/networksecurity v0.8.0/go.mod h1:B78DkqsxFG5zRSVuwYFRZ9Xz8IcQ5iECsNrPn74hKHU= cloud.google.com/go/notebooks v1.2.0/go.mod h1:9+wtppMfVPUeJ8fIWPOq1UnATHISkGXGqTkxeieQ6UY= cloud.google.com/go/notebooks v1.3.0/go.mod h1:bFR5lj07DtCPC7YAAJ//vHskFBxA5JzYlH68kXVdk34= -cloud.google.com/go/notebooks v1.8.0 h1:Kg2K3K7CbSXYJHZ1aGQpf1xi5x2GUvQWf2sFVuiZh8M= -cloud.google.com/go/notebooks v1.8.0/go.mod h1:Lq6dYKOYOWUCTvw5t2q1gp1lAp0zxAxRycayS0iJcqQ= -cloud.google.com/go/optimization v1.3.1 h1:dj8O4VOJRB4CUwZXdmwNViH1OtI0WtWL867/lnYH248= -cloud.google.com/go/optimization v1.3.1/go.mod h1:IvUSefKiwd1a5p0RgHDbWCIbDFgKuEdB+fPPuP0IDLI= -cloud.google.com/go/orchestration v1.6.0 h1:Vw+CEXo8M/FZ1rb4EjcLv0gJqqw89b7+g+C/EmniTb8= -cloud.google.com/go/orchestration v1.6.0/go.mod h1:M62Bevp7pkxStDfFfTuCOaXgaaqRAga1yKyoMtEoWPQ= -cloud.google.com/go/orgpolicy v1.10.0 h1:XDriMWug7sd0kYT1QKofRpRHzjad0bK8Q8uA9q+XrU4= -cloud.google.com/go/orgpolicy v1.10.0/go.mod h1:w1fo8b7rRqlXlIJbVhOMPrwVljyuW5mqssvBtU18ONc= cloud.google.com/go/osconfig v1.7.0/go.mod h1:oVHeCeZELfJP7XLxcBGTMBvRO+1nQ5tFG9VQTmYS2Fs= cloud.google.com/go/osconfig v1.8.0/go.mod h1:EQqZLu5w5XA7eKizepumcvWx+m8mJUhEwiPqWiZeEdg= -cloud.google.com/go/osconfig v1.11.0 h1:PkSQx4OHit5xz2bNyr11KGcaFccL5oqglFPdTboyqwQ= -cloud.google.com/go/osconfig v1.11.0/go.mod h1:aDICxrur2ogRd9zY5ytBLV89KEgT2MKB2L/n6x1ooPw= cloud.google.com/go/oslogin v1.4.0/go.mod h1:YdgMXWRaElXz/lDk1Na6Fh5orF7gvmJ0FGLIs9LId4E= cloud.google.com/go/oslogin v1.5.0/go.mod h1:D260Qj11W2qx/HVF29zBg+0fd6YCSjSqLUkY/qEenQU= -cloud.google.com/go/oslogin v1.9.0 h1:whP7vhpmc+ufZa90eVpkfbgzJRK/Xomjz+XCD4aGwWw= -cloud.google.com/go/oslogin v1.9.0/go.mod h1:HNavntnH8nzrn8JCTT5fj18FuJLFJc4NaZJtBnQtKFs= cloud.google.com/go/phishingprotection v0.5.0/go.mod h1:Y3HZknsK9bc9dMi+oE8Bim0lczMU6hrX0UpADuMefr0= cloud.google.com/go/phishingprotection v0.6.0/go.mod h1:9Y3LBLgy0kDTcYET8ZH3bq/7qni15yVUoAxiFxnlSUA= -cloud.google.com/go/phishingprotection v0.7.0 h1:l6tDkT7qAEV49MNEJkEJTB6vOO/onbSOcNtAT09HPuA= -cloud.google.com/go/phishingprotection v0.7.0/go.mod h1:8qJI4QKHoda/sb/7/YmMQ2omRLSLYSu9bU0EKCNI+Lk= -cloud.google.com/go/policytroubleshooter v1.6.0 h1:yKAGC4p9O61ttZUswaq9GAn1SZnEzTd0vUYXD7ZBT7Y= -cloud.google.com/go/policytroubleshooter v1.6.0/go.mod h1:zYqaPTsmfvpjm5ULxAyD/lINQxJ0DDsnWOP/GZ7xzBc= cloud.google.com/go/privatecatalog v0.5.0/go.mod h1:XgosMUvvPyxDjAVNDYxJ7wBW8//hLDDYmnsNcMGq1K0= cloud.google.com/go/privatecatalog v0.6.0/go.mod h1:i/fbkZR0hLN29eEWiiwue8Pb+GforiEIBnV9yrRUOKI= -cloud.google.com/go/privatecatalog v0.8.0 h1:EPEJ1DpEGXLDnmc7mnCAqFmkwUJbIsaLAiLHVOkkwtc= -cloud.google.com/go/privatecatalog v0.8.0/go.mod h1:nQ6pfaegeDAq/Q5lrfCQzQLhubPiZhSaNhIgfJlnIXs= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= cloud.google.com/go/pubsub v1.5.0/go.mod h1:ZEwJccE3z93Z2HWvstpri00jOg7oO4UZDtKhwDwqF0w= -cloud.google.com/go/pubsub v1.30.0 h1:vCge8m7aUKBJYOgrZp7EsNDf6QMd2CAlXZqWTn3yq6s= -cloud.google.com/go/pubsub v1.30.0/go.mod h1:qWi1OPS0B+b5L+Sg6Gmc9zD1Y+HaM0MdUr7LsupY1P4= -cloud.google.com/go/pubsublite v1.7.0 h1:cb9fsrtpINtETHiJ3ECeaVzrfIVhcGjhhJEjybHXHao= -cloud.google.com/go/pubsublite v1.7.0/go.mod h1:8hVMwRXfDfvGm3fahVbtDbiLePT3gpoiJYJY+vxWxVM= -cloud.google.com/go/recaptchaenterprise v1.3.1 h1:u6EznTGzIdsyOsvm+Xkw0aSuKFXQlyjGE9a4exk6iNQ= cloud.google.com/go/recaptchaenterprise v1.3.1/go.mod h1:OdD+q+y4XGeAlxRaMn1Y7/GveP6zmq76byL6tjPE7d4= cloud.google.com/go/recaptchaenterprise/v2 v2.1.0/go.mod h1:w9yVqajwroDNTfGuhmOjPDN//rZGySaf6PtFVcSCa7o= cloud.google.com/go/recaptchaenterprise/v2 v2.2.0/go.mod h1:/Zu5jisWGeERrd5HnlS3EUGb/D335f9k51B/FVil0jk= cloud.google.com/go/recaptchaenterprise/v2 v2.3.0/go.mod h1:O9LwGCjrhGHBQET5CA7dd5NwwNQUErSgEDit1DLNTdo= -cloud.google.com/go/recaptchaenterprise/v2 v2.7.0 h1:6iOCujSNJ0YS7oNymI64hXsjGq60T4FK1zdLugxbzvU= -cloud.google.com/go/recaptchaenterprise/v2 v2.7.0/go.mod h1:19wVj/fs5RtYtynAPJdDTb69oW0vNHYDBTbB4NvMD9c= cloud.google.com/go/recommendationengine v0.5.0/go.mod h1:E5756pJcVFeVgaQv3WNpImkFP8a+RptV6dDLGPILjvg= cloud.google.com/go/recommendationengine v0.6.0/go.mod h1:08mq2umu9oIqc7tDy8sx+MNJdLG0fUi3vaSVbztHgJ4= -cloud.google.com/go/recommendationengine v0.7.0 h1:VibRFCwWXrFebEWKHfZAt2kta6pS7Tlimsnms0fjv7k= -cloud.google.com/go/recommendationengine v0.7.0/go.mod h1:1reUcE3GIu6MeBz/h5xZJqNLuuVjNg1lmWMPyjatzac= cloud.google.com/go/recommender v1.5.0/go.mod h1:jdoeiBIVrJe9gQjwd759ecLJbxCDED4A6p+mqoqDvTg= cloud.google.com/go/recommender v1.6.0/go.mod h1:+yETpm25mcoiECKh9DEScGzIRyDKpZ0cEhWGo+8bo+c= -cloud.google.com/go/recommender v1.9.0 h1:ZnFRY5R6zOVk2IDS1Jbv5Bw+DExCI5rFumsTnMXiu/A= -cloud.google.com/go/recommender v1.9.0/go.mod h1:PnSsnZY7q+VL1uax2JWkt/UegHssxjUVVCrX52CuEmQ= cloud.google.com/go/redis v1.7.0/go.mod h1:V3x5Jq1jzUcg+UNsRvdmsfuFnit1cfe3Z/PGyq/lm4Y= cloud.google.com/go/redis v1.8.0/go.mod h1:Fm2szCDavWzBk2cDKxrkmWBqoCiL1+Ctwq7EyqBCA/A= -cloud.google.com/go/redis v1.11.0 h1:JoAd3SkeDt3rLFAAxEvw6wV4t+8y4ZzfZcZmddqphQ8= -cloud.google.com/go/redis v1.11.0/go.mod h1:/X6eicana+BWcUda5PpwZC48o37SiFVTFSs0fWAJ7uQ= -cloud.google.com/go/resourcemanager v1.7.0 h1:NRM0p+RJkaQF9Ee9JMnUV9BQ2QBIOq/v8M+Pbv/wmCs= -cloud.google.com/go/resourcemanager v1.7.0/go.mod h1:HlD3m6+bwhzj9XCouqmeiGuni95NTrExfhoSrkC/3EI= -cloud.google.com/go/resourcesettings v1.5.0 h1:8Dua37kQt27CCWHm4h/Q1XqCF6ByD7Ouu49xg95qJzI= -cloud.google.com/go/resourcesettings v1.5.0/go.mod h1:+xJF7QSG6undsQDfsCJyqWXyBwUoJLhetkRMDRnIoXA= cloud.google.com/go/retail v1.8.0/go.mod h1:QblKS8waDmNUhghY2TI9O3JLlFk8jybHeV4BF19FrE4= cloud.google.com/go/retail v1.9.0/go.mod h1:g6jb6mKuCS1QKnH/dpu7isX253absFl6iE92nHwlBUY= -cloud.google.com/go/retail v1.12.0 h1:1Dda2OpFNzIb4qWgFZjYlpP7sxX3aLeypKG6A3H4Yys= -cloud.google.com/go/retail v1.12.0/go.mod h1:UMkelN/0Z8XvKymXFbD4EhFJlYKRx1FGhQkVPU5kF14= -cloud.google.com/go/run v0.9.0 h1:ydJQo+k+MShYnBfhaRHSZYeD/SQKZzZLAROyfpeD9zw= -cloud.google.com/go/run v0.9.0/go.mod h1:Wwu+/vvg8Y+JUApMwEDfVfhetv30hCG4ZwDR/IXl2Qg= cloud.google.com/go/scheduler v1.4.0/go.mod h1:drcJBmxF3aqZJRhmkHQ9b3uSSpQoltBPGPxGAWROx6s= cloud.google.com/go/scheduler v1.5.0/go.mod h1:ri073ym49NW3AfT6DZi21vLZrG07GXr5p3H1KxN5QlI= -cloud.google.com/go/scheduler v1.9.0 h1:NpQAHtx3sulByTLe2dMwWmah8PWgeoieFPpJpArwFV0= -cloud.google.com/go/scheduler v1.9.0/go.mod h1:yexg5t+KSmqu+njTIh3b7oYPheFtBWGcbVUYF1GGMIc= cloud.google.com/go/secretmanager v1.6.0/go.mod h1:awVa/OXF6IiyaU1wQ34inzQNc4ISIDIrId8qE5QGgKA= -cloud.google.com/go/secretmanager v1.10.0 h1:pu03bha7ukxF8otyPKTFdDz+rr9sE3YauS5PliDXK60= -cloud.google.com/go/secretmanager v1.10.0/go.mod h1:MfnrdvKMPNra9aZtQFvBcvRU54hbPD8/HayQdlUgJpU= cloud.google.com/go/security v1.5.0/go.mod h1:lgxGdyOKKjHL4YG3/YwIL2zLqMFCKs0UbQwgyZmfJl4= cloud.google.com/go/security v1.7.0/go.mod h1:mZklORHl6Bg7CNnnjLH//0UlAlaXqiG7Lb9PsPXLfD0= cloud.google.com/go/security v1.8.0/go.mod h1:hAQOwgmaHhztFhiQ41CjDODdWP0+AE1B3sX4OFlq+GU= -cloud.google.com/go/security v1.13.0 h1:PYvDxopRQBfYAXKAuDpFCKBvDOWPWzp9k/H5nB3ud3o= -cloud.google.com/go/security v1.13.0/go.mod h1:Q1Nvxl1PAgmeW0y3HTt54JYIvUdtcpYKVfIB8AOMZ+0= cloud.google.com/go/securitycenter v1.13.0/go.mod h1:cv5qNAqjY84FCN6Y9z28WlkKXyWsgLO832YiWwkCWcU= cloud.google.com/go/securitycenter v1.14.0/go.mod h1:gZLAhtyKv85n52XYWt6RmeBdydyxfPeTrpToDPw4Auc= -cloud.google.com/go/securitycenter v1.19.0 h1:AF3c2s3awNTMoBtMX3oCUoOMmGlYxGOeuXSYHNBkf14= -cloud.google.com/go/securitycenter v1.19.0/go.mod h1:LVLmSg8ZkkyaNy4u7HCIshAngSQ8EcIRREP3xBnyfag= cloud.google.com/go/servicedirectory v1.4.0/go.mod h1:gH1MUaZCgtP7qQiI+F+A+OpeKF/HQWgtAddhTbhL2bs= cloud.google.com/go/servicedirectory v1.5.0/go.mod h1:QMKFL0NUySbpZJ1UZs3oFAmdvVxhhxB6eJ/Vlp73dfg= -cloud.google.com/go/servicedirectory v1.9.0 h1:SJwk0XX2e26o25ObYUORXx6torSFiYgsGkWSkZgkoSU= -cloud.google.com/go/servicedirectory v1.9.0/go.mod h1:29je5JjiygNYlmsGz8k6o+OZ8vd4f//bQLtvzkPPT/s= -cloud.google.com/go/shell v1.6.0 h1:wT0Uw7ib7+AgZST9eCDygwTJn4+bHMDtZo5fh7kGWDU= -cloud.google.com/go/shell v1.6.0/go.mod h1:oHO8QACS90luWgxP3N9iZVuEiSF84zNyLytb+qE2f9A= cloud.google.com/go/spanner v1.7.0/go.mod h1:sd3K2gZ9Fd0vMPLXzeCrF6fq4i63Q7aTLW/lBIfBkIk= -cloud.google.com/go/spanner v1.45.0 h1:7VdjZ8zj4sHbDw55atp5dfY6kn1j9sam9DRNpPQhqR4= -cloud.google.com/go/spanner v1.45.0/go.mod h1:FIws5LowYz8YAE1J8fOS7DJup8ff7xJeetWEo5REA2M= cloud.google.com/go/speech v1.6.0/go.mod h1:79tcr4FHCimOp56lwC01xnt/WPJZc4v3gzyT7FoBkCM= cloud.google.com/go/speech v1.7.0/go.mod h1:KptqL+BAQIhMsj1kOP2la5DSEEerPDuOP/2mmkhHhZQ= -cloud.google.com/go/speech v1.15.0 h1:JEVoWGNnTF128kNty7T4aG4eqv2z86yiMJPT9Zjp+iw= -cloud.google.com/go/speech v1.15.0/go.mod h1:y6oH7GhqCaZANH7+Oe0BhgIogsNInLlz542tg3VqeYI= cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= @@ -393,51 +187,18 @@ cloud.google.com/go/storage v1.23.0/go.mod h1:vOEEDNFnciUMhBeT6hsJIn3ieU5cFRmzeL cloud.google.com/go/storage v1.27.0/go.mod h1:x9DOL8TK/ygDUMieqwfhdpQryTeEkhGKMi80i/iqR2s= cloud.google.com/go/storage v1.29.0 h1:6weCgzRvMg7lzuUurI4697AqIRPU1SvzHhynwpW31jI= cloud.google.com/go/storage v1.29.0/go.mod h1:4puEjyTKnku6gfKoTfNOU/W+a9JyuVNxjpS5GBrB8h4= -cloud.google.com/go/storagetransfer v1.8.0 h1:5T+PM+3ECU3EY2y9Brv0Sf3oka8pKmsCfpQ07+91G9o= -cloud.google.com/go/storagetransfer v1.8.0/go.mod h1:JpegsHHU1eXg7lMHkvf+KE5XDJ7EQu0GwNJbbVGanEw= cloud.google.com/go/talent v1.1.0/go.mod h1:Vl4pt9jiHKvOgF9KoZo6Kob9oV4lwd/ZD5Cto54zDRw= cloud.google.com/go/talent v1.2.0/go.mod h1:MoNF9bhFQbiJ6eFD3uSsg0uBALw4n4gaCaEjBw9zo8g= -cloud.google.com/go/talent v1.5.0 h1:nI9sVZPjMKiO2q3Uu0KhTDVov3Xrlpt63fghP9XjyEM= -cloud.google.com/go/talent v1.5.0/go.mod h1:G+ODMj9bsasAEJkQSzO2uHQWXHHXUomArjWQQYkqK6c= -cloud.google.com/go/texttospeech v1.6.0 h1:H4g1ULStsbVtalbZGktyzXzw6jP26RjVGYx9RaYjBzc= -cloud.google.com/go/texttospeech v1.6.0/go.mod h1:YmwmFT8pj1aBblQOI3TfKmwibnsfvhIBzPXcW4EBovc= -cloud.google.com/go/tpu v1.5.0 h1:/34T6CbSi+kTv5E19Q9zbU/ix8IviInZpzwz3rsFE+A= -cloud.google.com/go/tpu v1.5.0/go.mod h1:8zVo1rYDFuW2l4yZVY0R0fb/v44xLh3llq7RuV61fPM= -cloud.google.com/go/trace v1.9.0 h1:olxC0QHC59zgJVALtgqfD9tGk0lfeCP5/AGXL3Px/no= -cloud.google.com/go/trace v1.9.0/go.mod h1:lOQqpE5IaWY0Ixg7/r2SjixMuc6lfTFeO4QGM4dQWOk= -cloud.google.com/go/translate v1.7.0 h1:GvLP4oQ4uPdChBmBaUSa/SaZxCdyWELtlAaKzpHsXdA= -cloud.google.com/go/translate v1.7.0/go.mod h1:lMGRudH1pu7I3n3PETiOB2507gf3HnfLV8qlkHZEyos= -cloud.google.com/go/video v1.15.0 h1:upIbnGI0ZgACm58HPjAeBMleW3sl5cT84AbYQ8PWOgM= -cloud.google.com/go/video v1.15.0/go.mod h1:SkgaXwT+lIIAKqWAJfktHT/RbgjSuY6DobxEp0C5yTQ= cloud.google.com/go/videointelligence v1.6.0/go.mod h1:w0DIDlVRKtwPCn/C4iwZIJdvC69yInhW0cfi+p546uU= cloud.google.com/go/videointelligence v1.7.0/go.mod h1:k8pI/1wAhjznARtVT9U1llUaFNPh7muw8QyOUpavru4= -cloud.google.com/go/videointelligence v1.10.0 h1:Uh5BdoET8XXqXX2uXIahGb+wTKbLkGH7s4GXR58RrG8= -cloud.google.com/go/videointelligence v1.10.0/go.mod h1:LHZngX1liVtUhZvi2uNS0VQuOzNi2TkY1OakiuoUOjU= -cloud.google.com/go/vision v1.2.0 h1:/CsSTkbmO9HC8iQpxbK8ATms3OQaX3YQUeTMGCxlaK4= cloud.google.com/go/vision v1.2.0/go.mod h1:SmNwgObm5DpFBme2xpyOyasvBc1aPdjvMk2bBk0tKD0= cloud.google.com/go/vision/v2 v2.2.0/go.mod h1:uCdV4PpN1S0jyCyq8sIM42v2Y6zOLkZs+4R9LrGYwFo= cloud.google.com/go/vision/v2 v2.3.0/go.mod h1:UO61abBx9QRMFkNBbf1D8B1LXdS2cGiiCRx0vSpZoUo= -cloud.google.com/go/vision/v2 v2.7.0 h1:8C8RXUJoflCI4yVdqhTy9tRyygSHmp60aP363z23HKg= -cloud.google.com/go/vision/v2 v2.7.0/go.mod h1:H89VysHy21avemp6xcf9b9JvZHVehWbET0uT/bcuY/0= -cloud.google.com/go/vmmigration v1.6.0 h1:Azs5WKtfOC8pxvkyrDvt7J0/4DYBch0cVbuFfCCFt5k= -cloud.google.com/go/vmmigration v1.6.0/go.mod h1:bopQ/g4z+8qXzichC7GW1w2MjbErL54rk3/C843CjfY= -cloud.google.com/go/vmwareengine v0.3.0 h1:b0NBu7S294l0gmtrT0nOJneMYgZapr5x9tVWvgDoVEM= -cloud.google.com/go/vmwareengine v0.3.0/go.mod h1:wvoyMvNWdIzxMYSpH/R7y2h5h3WFkx6d+1TIsP39WGY= -cloud.google.com/go/vpcaccess v1.6.0 h1:FOe6CuiQD3BhHJWt7E8QlbBcaIzVRddupwJlp7eqmn4= -cloud.google.com/go/vpcaccess v1.6.0/go.mod h1:wX2ILaNhe7TlVa4vC5xce1bCnqE3AeH27RV31lnmZes= cloud.google.com/go/webrisk v1.4.0/go.mod h1:Hn8X6Zr+ziE2aNd8SliSDWpEnSS1u4R9+xXZmFiHmGE= cloud.google.com/go/webrisk v1.5.0/go.mod h1:iPG6fr52Tv7sGk0H6qUFzmL3HHZev1htXuWDEEsqMTg= -cloud.google.com/go/webrisk v1.8.0 h1:IY+L2+UwxcVm2zayMAtBhZleecdIFLiC+QJMzgb0kT0= -cloud.google.com/go/webrisk v1.8.0/go.mod h1:oJPDuamzHXgUc+b8SiHRcVInZQuybnvEW72PqTc7sSg= -cloud.google.com/go/websecurityscanner v1.5.0 h1:AHC1xmaNMOZtNqxI9Rmm87IJEyPaRkOxeI0gpAacXGk= -cloud.google.com/go/websecurityscanner v1.5.0/go.mod h1:Y6xdCPy81yi0SQnDY1xdNTNpfY1oAgXUlcfN3B3eSng= cloud.google.com/go/workflows v1.6.0/go.mod h1:6t9F5h/unJz41YqfBmqSASJSXccBLtD1Vwf+KmJENM0= cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoISEXH2bcHC3M= -cloud.google.com/go/workflows v1.10.0 h1:FfGp9w0cYnaKZJhUOMqCOJCYT/WlvYBfTQhFWV3sRKI= -cloud.google.com/go/workflows v1.10.0/go.mod h1:fZ8LmRmZQWacon9UCX1r/g/DfAXx5VcPALq2CxzdePw= -collectd.org v0.3.0 h1:iNBHGw1VvPJxH2B6RiFWFZ+vsjo1lCdRszBeOuwGi00= collectd.org v0.3.0/go.mod h1:A/8DzQBkF6abtvrT2j/AU/4tiBgJWYyh0y/oB/4MlWE= -contrib.go.opencensus.io/exporter/stackdriver v0.13.4 h1:ksUxwH3OD5sxkjzEqGxNTl+Xjsmu3BnC/300MhSVTSc= contrib.go.opencensus.io/exporter/stackdriver v0.13.4/go.mod h1:aXENhDJ1Y4lIg4EUaVTwzvYETVNZk10Pu26tevFKLUc= cosmossdk.io/api v0.3.1 h1:NNiOclKRR0AOlO4KIqeaG6PS6kswOMhHD0ir0SscNXE= cosmossdk.io/api v0.3.1/go.mod h1:DfHfMkiNA2Uhy8fj0JJlOCYOBp4eWUUJ1te5zBGNyIw= @@ -453,222 +214,122 @@ cosmossdk.io/math v1.0.1 h1:Qx3ifyOPaMLNH/89WeZFH268yCvU4xEcnPLu3sJqPPg= cosmossdk.io/math v1.0.1/go.mod h1:Ygz4wBHrgc7g0N+8+MrnTfS9LLn9aaTGa9hKopuym5k= cosmossdk.io/tools/rosetta v0.2.1 h1:ddOMatOH+pbxWbrGJKRAawdBkPYLfKXutK9IETnjYxw= cosmossdk.io/tools/rosetta v0.2.1/go.mod h1:Pqdc1FdvkNV3LcNIkYWt2RQY6IP1ge6YWZk8MhhO9Hw= -dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9 h1:VpgP7xuJadIUuKccphEpTJnWhS2jkQyMt6Y7pJCD7fY= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -filippo.io/edwards25519 v1.0.0-beta.2/go.mod h1:X+pm78QAUPtFLi1z9PYIlS/bdDnvbCOGKtZ+ACWEf7o= filippo.io/edwards25519 v1.0.0-rc.1/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns= filippo.io/edwards25519 v1.0.0 h1:0wAIcmJUqRdI8IJ/3eGi5/HwXZWPujYXXlkrQogz0Ek= filippo.io/edwards25519 v1.0.0/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns= -git.sr.ht/~sircmpwn/getopt v0.0.0-20191230200459-23622cc906b3 h1:4wDp4BKF7NQqoh73VXpZsB/t1OEhDpz/zEpmdQfbjDk= git.sr.ht/~sircmpwn/getopt v0.0.0-20191230200459-23622cc906b3/go.mod h1:wMEGFFFNuPos7vHmWXfszqImLppbc0wEhh6JBfJIUgw= -git.sr.ht/~sircmpwn/go-bare v0.0.0-20210406120253-ab86bc2846d9 h1:Ahny8Ud1LjVMMAlt8utUFKhhxJtwBAualvsbc/Sk7cE= git.sr.ht/~sircmpwn/go-bare v0.0.0-20210406120253-ab86bc2846d9/go.mod h1:BVJwbDfVjCjoFiKrhkei6NdGcZYpkDkdyCdg1ukytRA= github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 h1:/vQbFIOMbk2FiG/kXiLl8BRyzTWDw7gX/Hz7Dd5eDMs= github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4/go.mod h1:hN7oaIRCjzsZ2dE+yG5k+rsdt3qcwykqK6HVGcKwsw4= -github.com/Abirdcfly/dupword v0.0.7 h1:z14n0yytA3wNO2gpCD/jVtp/acEXPGmYu0esewpBt6Q= -github.com/Abirdcfly/dupword v0.0.7/go.mod h1:K/4M1kj+Zh39d2aotRwypvasonOyAMH1c/IZJzE0dmk= -github.com/Antonboom/errname v0.1.4/go.mod h1:jRXo3m0E0EuCnK3wbsSVH3X55Z4iTDLl6ZfCxwFj4TM= -github.com/Antonboom/errname v0.1.7 h1:mBBDKvEYwPl4WFFNwec1CZO096G6vzK9vvDQzAwkako= github.com/Antonboom/errname v0.1.7/go.mod h1:g0ONh16msHIPgJSGsecu1G/dcF2hlYR/0SddnIAGavU= -github.com/Antonboom/nilnil v0.1.1 h1:PHhrh5ANKFWRBh7TdYmyyq2gyT2lotnvFvvFbylF81Q= github.com/Antonboom/nilnil v0.1.1/go.mod h1:L1jBqoWM7AOeTD+tSquifKSesRHs4ZdaxvZR+xdJEaI= -github.com/Azure/azure-pipeline-go v0.2.1/go.mod h1:UGSo8XybXnIGZ3epmeBw7Jdz+HiUVpqIlpz/HKHylF4= -github.com/Azure/azure-pipeline-go v0.2.2 h1:6oiIS9yaG6XCCzhgAgKFfIWyo4LLCiDhZot6ltoThhY= -github.com/Azure/azure-pipeline-go v0.2.2/go.mod h1:4rQ/NZncSvGqNkkOsNpOU1tgoNuIlp9AfUH5G1tvCHc= -github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.1 h1:qoVeMsc9/fh/yhxVaA0obYjVH/oI/ihrOoMwsLS9KSA= +github.com/Azure/azure-sdk-for-go/sdk/azcore v0.19.0/go.mod h1:h6H6c8enJmmocHUbLiiGY6sx7f9i+X3m1CHdd5c6Rdw= github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.1/go.mod h1:fBF9PQNqB8scdgpZ3ufzaLntG0AG7C1WjPMsiFOmfHM= -github.com/Azure/azure-sdk-for-go/sdk/internal v0.8.3 h1:E+m3SkZCN0Bf5q7YdTs5lSm2CYY3CK4spn5OmUIiQtk= +github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.11.0/go.mod h1:HcM1YX14R7CJcghJGOYCgdezslRSVzqwLf/q+4Y2r/0= +github.com/Azure/azure-sdk-for-go/sdk/internal v0.7.0/go.mod h1:yqy467j36fJxcRV2TzfVZ1pCb5vxm4BtZPUdYWe/Xo8= github.com/Azure/azure-sdk-for-go/sdk/internal v0.8.3/go.mod h1:KLF4gFr6DcKFZwSuH8w8yEK6DpFl3LP5rhdvAb7Yz5I= -github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.3.0 h1:Px2UA+2RvSSvv+RvJNuUB6n7rs5Wsel4dXLe90Um2n4= github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.3.0/go.mod h1:tPaiy8S5bQ+S5sOiDlINkp7+Ef339+Nz5L5XO+cnOHo= -github.com/Azure/azure-storage-blob-go v0.7.0 h1:MuueVOYkufCxJw5YZzF842DY2MBsp+hLuh2apKY0mck= -github.com/Azure/azure-storage-blob-go v0.7.0/go.mod h1:f9YQKtsG1nMisotuTPpO0tjNuEjKRYAcJU8/ydDI++4= github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= -github.com/Azure/go-autorest/autorest v0.9.0 h1:MRvx8gncNaXJqOoLmhNjUAKh33JJF8LyxPhomEtOsjs= -github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI= -github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0= -github.com/Azure/go-autorest/autorest/adal v0.8.0 h1:CxTzQrySOxDnKpLjFJeZAS5Qrv/qFPkgLjx5bOAi//I= -github.com/Azure/go-autorest/autorest/adal v0.8.0/go.mod h1:Z6vX6WXXuyieHAXwMj0S6HY6e6wcHn37qQMBQlvY3lc= -github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA= -github.com/Azure/go-autorest/autorest/date v0.2.0 h1:yW+Zlqf26583pE43KhfnhFcdmSWlm5Ew6bxipnr/tbM= -github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod h1:vcORJHLJEh643/Ioh9+vPmf1Ij9AEBM5FuBIXLmIy0g= -github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= -github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= -github.com/Azure/go-autorest/autorest/mocks v0.3.0 h1:qJumjCaCudz+OcqE9/XtEPfvtOjOmKaui4EOpFI6zZc= -github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod h1:a8FDP3DYzQ4RYfVAxAN3SVSiiO77gL2j2ronKKP0syM= -github.com/Azure/go-autorest/logger v0.1.0 h1:ruG4BSDXONFRrZZJ2GUXDiUyVpayPmb1GnWeHDdaNKY= -github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc= -github.com/Azure/go-autorest/tracing v0.5.0 h1:TRn4WjSnkcSy5AEG3pnbtFSwNtwzjr4VYyQflFE619k= -github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/toml v0.4.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= -github.com/BurntSushi/toml v1.2.1 h1:9F2/+DoOYIOksmaJFPw1tGFy1eDnIJXg+UHjuD8lTak= -github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= -github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802 h1:1BDTz0u9nC3//pOCMdNH+CiXJVYJh5UQNCOBG7jbELc= +github.com/BurntSushi/toml v1.1.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d h1:nalkkPQcITbvhmL4+C4cKA87NW0tfm3Kl9VXRoPywFg= github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d/go.mod h1:URdX5+vg25ts3aCh8H5IFZybJYKWhJHYMTnf+ULtoC4= github.com/CosmWasm/wasmvm v1.2.4 h1:6OfeZuEcEH/9iqwrg2pkeVtDCkMoj9U6PpKtcrCyVrQ= github.com/CosmWasm/wasmvm v1.2.4/go.mod h1:vW/E3h8j9xBQs9bCoijDuawKo9kCtxOaS8N8J7KFtkc= -github.com/DATA-DOG/go-sqlmock v1.3.3 h1:CWUqKXe0s8A2z6qCgkP4Kru7wC11YoAnoupUKFDnH08= github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= -github.com/DataDog/datadog-go v3.2.0+incompatible h1:qSG2N4FghB1He/r2mFrWKCaL7dXCilEuNEeAn20fdD4= +github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/DataDog/zstd v1.4.1/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= -github.com/DataDog/zstd v1.4.5/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= -github.com/DataDog/zstd v1.5.0 h1:+K/VEwIAaPcHiMtQvpLD4lqW7f0Gk3xdYZmI1hD+CXo= github.com/DataDog/zstd v1.5.0/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= -github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 h1:sHglBQTwgx+rWPdisA5ynNEsoARbiCBOyGcJM4/OzsM= github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24/go.mod h1:4UJr5HIiMZrwgkSPdsjy2uOQExX/WEILpIrO9UPGuXs= -github.com/GaijinEntertainment/go-exhaustruct/v2 v2.3.0 h1:+r1rSv4gvYn0wmRjC8X7IAzX8QezqtFV9m0MUHFJgts= -github.com/GaijinEntertainment/go-exhaustruct/v2 v2.3.0/go.mod h1:b3g59n2Y+T5xmcxJL+UEG2f8cQploZm1mR/v6BW0mU0= -github.com/HdrHistogram/hdrhistogram-go v1.1.2 h1:5IcZpTvzydCQeHzK4Ef/D5rrSqwxob0t8PQPMybUNFM= +github.com/GaijinEntertainment/go-exhaustruct/v2 v2.2.0/go.mod h1:n/vLeA7V+QY84iYAGwMkkUUp9ooeuftMEvaDrSVch+Q= +github.com/HdrHistogram/hdrhistogram-go v1.1.0/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo= github.com/HdrHistogram/hdrhistogram-go v1.1.2/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo= -github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible h1:1G1pk05UrOh0NlF1oeaaix1x8XzrfjIDK47TY0Zehcw= github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= -github.com/Masterminds/goutils v1.1.0 h1:zukEsf/1JZwCMgHiK3GZftabmxiCw4apj3a28RPBiVg= github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= -github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww= github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= -github.com/Masterminds/semver/v3 v3.2.0 h1:3MEsd0SM6jqZojhjLWWeBY+Kcjy9i6MQAeY7YgDP83g= -github.com/Masterminds/semver/v3 v3.2.0/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ= github.com/Masterminds/sprig v2.15.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o= -github.com/Masterminds/sprig v2.22.0+incompatible h1:z4yfnGrZ7netVz+0EDJ0Wi+5VZCSYp4Z0m2dk6cEM60= github.com/Masterminds/sprig v2.22.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o= -github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA= -github.com/Microsoft/go-winio v0.5.0/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= +github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY= github.com/Microsoft/go-winio v0.6.0 h1:slsWYD/zyx7lCXoZVlvQrj0hPTM1HI4+v1sIda2yDvg= -github.com/Microsoft/go-winio v0.6.0/go.mod h1:cTAf44im0RAYeL23bpB+fzCyDH2MJiz2BO69KH/soAE= github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 h1:TngWCqHvy9oXAN6lEVMRuU21PR1EtLVZJmdB18Gu3Rw= github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk= github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= -github.com/OpenPeeDeeP/depguard v1.0.1/go.mod h1:xsIw86fROiiwelg+jB2uM9PiKihMMmUx/1V+TNhjQvM= -github.com/OpenPeeDeeP/depguard v1.1.1 h1:TSUznLjvp/4IUP+OQ0t/4jF4QUyxIcVX8YnghZdunyA= -github.com/OpenPeeDeeP/depguard v1.1.1/go.mod h1:JtAMzWkmFEzDPyAd+W0NHl1lvpQKTvT9jnRVsohBKpc= -github.com/ProtonMail/go-crypto v0.0.0-20221026131551-cf6655e29de4 h1:ra2OtmuW0AE5csawV4YXMNGNQQXvLRps3z2Z59OPO+I= -github.com/ProtonMail/go-crypto v0.0.0-20221026131551-cf6655e29de4/go.mod h1:UBYPn8k0D56RtnR8RFQMjmh4KrZzWJ5o7Z9SYjossQ8= -github.com/Shopify/sarama v1.19.0 h1:9oksLxC6uxVPHPVYUmq6xhr1BOF/hHobWH2UzO67z1s= +github.com/OpenPeeDeeP/depguard v1.1.0/go.mod h1:JtAMzWkmFEzDPyAd+W0NHl1lvpQKTvT9jnRVsohBKpc= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= -github.com/Shopify/toxiproxy v2.1.4+incompatible h1:TKdv8HiTLgE5wdJuEML90aBgNWsokNbMijUGhmcoBJc= github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= -github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6 h1:fLjPD/aNc3UIOA6tDi6QXUemppXK3P9BI7mr2hd6gx8= github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= -github.com/StackExchange/wmi v1.2.1 h1:VIkavFPXSjcnS+O8yTq7NI32k0R5Aj+v39y29VYDOSA= -github.com/StackExchange/wmi v1.2.1/go.mod h1:rcmrprowKIVzvc+NUiLncP2uuArMWLCbu9SBzvHz7e8= -github.com/VictoriaMetrics/fastcache v1.5.7/go.mod h1:ptDBkNMQI4RtmVo8VS/XwRY6RoTu1dAWCbrk+6WsEM8= -github.com/VictoriaMetrics/fastcache v1.6.0 h1:C/3Oi3EiBCqufydp1neRZkqcwmEiuRT9c3fqvvgKm5o= github.com/VictoriaMetrics/fastcache v1.6.0/go.mod h1:0qHz5QP0GMX4pfmMA/zt5RgfNuXJrTP0zS7DqpHGGTw= github.com/VividCortex/gohistogram v1.0.0 h1:6+hBz+qvs0JOrrNhhmR7lFxo5sINxBCGXrdtl/UvroE= github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= -github.com/Workiva/go-datastructures v1.0.52 h1:PLSK6pwn8mYdaoaCZEMsXBpBotr4HHn9abU0yMQt0NI= -github.com/Workiva/go-datastructures v1.0.52/go.mod h1:Z+F2Rca0qCsVYDS8z7bAGm8f3UkzuWYS/oBZz5a7VVA= -github.com/Zilliqa/gozilliqa-sdk v1.2.1-0.20201201074141-dd0ecada1be6 h1:1d9pzdbkth4D9AX6ndKSl7of3UTV0RYl3z64U2dXMGo= +github.com/Workiva/go-datastructures v1.0.53/go.mod h1:1yZL+zfsztete+ePzZz/Zb1/t5BnDuE2Ya2MMGhzP6A= github.com/Zilliqa/gozilliqa-sdk v1.2.1-0.20201201074141-dd0ecada1be6/go.mod h1:eSYp2T6f0apnuW8TzhV3f6Aff2SE8Dwio++U4ha4yEM= -github.com/acomagu/bufpipe v1.0.3 h1:fxAGrHZTgQ9w5QqVItgzwj235/uYZYgbXitB+dLupOk= -github.com/acomagu/bufpipe v1.0.3/go.mod h1:mxdxdup/WdsKVreO5GpW4+M/1CE2sMG4jeGJ2sYmHc4= -github.com/adlio/schema v1.1.13/go.mod h1:L5Z7tw+7lRK1Fnpi/LT/ooCP1elkXn0krMWBQHUhEDE= github.com/adlio/schema v1.3.3 h1:oBJn8I02PyTB466pZO1UZEn1TV5XLlifBSyMrmHl/1I= github.com/adlio/schema v1.3.3/go.mod h1:1EsRssiv9/Ce2CMzq5DoL7RiMshhuigQxrR4DMV9fHg= -github.com/aead/siphash v1.0.1 h1:FwHfE/T45KPKYuuSAKyyvE+oPWcaQ+CUmFW0bPlM+kg= github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII= -github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5 h1:rFw4nCn9iMW+Vajsk51NtYIcwSTkXr+JGrMd36kTDJw= github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c= -github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af h1:wVe6/Ea46ZMeNkQjjBW6xcqyQA/j5e0D6GytH95g0gQ= github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw= -github.com/alecthomas/kingpin/v2 v2.3.2 h1:H0aULhgmSzN8xQ3nX1uxtdlTHYoPLu5AhHxWrKI6ocU= -github.com/alecthomas/kingpin/v2 v2.3.2/go.mod h1:0gyi0zQnjuFk8xrkNKamJoyUo382HRL7ATRpFZCw6tE= github.com/alecthomas/participle/v2 v2.0.0-alpha7 h1:cK4vjj0VSgb3lN1nuKA5F7dw+1s1pWBe5bx7nNCnN+c= -github.com/alecthomas/participle/v2 v2.0.0-alpha7/go.mod h1:NumScqsC42o9x+dGj8/YqsIfhrIQjFEOFovxotbBirA= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= -github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafoB+tBA3gMyHYHrpOtNuDiK/uB5uXxq5wM= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= -github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 h1:s6gZFSlWYmbqAuRjVTiNNhvNRfY2Wxp9nhfyel4rklc= -github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE= -github.com/alexkohler/prealloc v1.0.0 h1:Hbq0/3fJPQhNkN0dR95AVrr6R7tou91y0uHG5pOcUuw= github.com/alexkohler/prealloc v1.0.0/go.mod h1:VetnK3dIgFBBKmg0YnD9F9x6Icjd+9cvfHR56wJVlKE= -github.com/alingse/asasalint v0.0.11 h1:SFwnQXJ49Kx/1GghOFz1XGqHYKp21Kq1nHad/0WQRnw= -github.com/alingse/asasalint v0.0.11/go.mod h1:nCaoMhw7a9kSJObvQyVzNTPBDbNpdocqrSP7t/cW5+I= -github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156 h1:eMwmnE/GDgah4HI848JfFxHt+iPb26b4zyfspmqY0/8= +github.com/alingse/asasalint v0.0.10/go.mod h1:nCaoMhw7a9kSJObvQyVzNTPBDbNpdocqrSP7t/cW5+I= github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM= -github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883 h1:bvNMNQO63//z+xNgfBlViaCIJKLlCJ6/fmUseuG0wVQ= github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8= -github.com/andybalholm/brotli v1.0.0 h1:7UCwP93aiSfvWpapti8g88vVVGp2qqtGyePsSuDafo4= -github.com/andybalholm/brotli v1.0.0/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y= +github.com/andybalholm/brotli v1.0.2/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y= +github.com/andybalholm/brotli v1.0.3/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= github.com/antihax/optional v0.0.0-20180407024304-ca021399b1a6/go.mod h1:V8iCPQYkqmusNa815XgQio277wI47sdRh1dUOLdyC6Q= -github.com/antihax/optional v1.0.0 h1:xK2lYat7ZLaVVcIuj82J8kIro4V6kDe0AUDFboUCwcg= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= -github.com/aokoli/goutils v1.0.1 h1:7fpzNGoJ3VA8qcrm++XEE1QUe0mIwNeLa02Nwq7RDkg= github.com/aokoli/goutils v1.0.1/go.mod h1:SijmP0QR8LtwsmDs8Yii5Z/S4trXFGFC2oO5g9DP+DQ= -github.com/apache/arrow/go/arrow v0.0.0-20191024131854-af6fa24be0db h1:nxAtV4VajJDhKysp2kdcJZsq8Ss1xSA0vZTkVHHJd0E= github.com/apache/arrow/go/arrow v0.0.0-20191024131854-af6fa24be0db/go.mod h1:VTxUBvSJ3s3eHAg65PNgrsn5BtqCRPdmyXh6rAfdxN0= github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= -github.com/apache/thrift v0.13.0 h1:5hryIiq9gtn+MiLVn0wP37kb/uTeRZgN08WoCsAhIhI= github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= -github.com/aristanetworks/goarista v0.0.0-20170210015632-ea17b1a17847 h1:rtI0fD4oG/8eVokGVPYJEW1F88p1ZNgXiEIs9thEE4A= -github.com/aristanetworks/goarista v0.0.0-20170210015632-ea17b1a17847/go.mod h1:D/tb0zPVXnP7fmsLZjtdUhSsumbK/ij54UXjjVgMGxQ= -github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e h1:QEF07wC0T1rKkctt1RINW/+RMTVmiwxETico2l3gxJA= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= -github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6 h1:G1bPvciwNyF7IUmKXNt9Ak3m6u9DE1rF+RmtIkBpVdA= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-metrics v0.3.9/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc= github.com/armon/go-metrics v0.3.10/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc= github.com/armon/go-metrics v0.4.1 h1:hR91U9KYmb6bLBYLQjyM+3j+rcd/UhE+G78SFnF8gJA= github.com/armon/go-metrics v0.4.1/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4= -github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310 h1:BUAU3CGlLvorLI26FmByPp2eC2qla6E1Tw+scpcg/to= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a h1:pv34s756C4pEXnjgPfGYgdhg/ZdajGhyOvzx8k+23nw= github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A= -github.com/ashanbrown/forbidigo v1.2.0/go.mod h1:vVW7PEdqEFqapJe95xHkTfB1+XvZXBFg8t0sG2FIxmI= -github.com/ashanbrown/forbidigo v1.3.0 h1:VkYIwb/xxdireGAdJNZoo24O4lmnEWkactplBlWTShc= github.com/ashanbrown/forbidigo v1.3.0/go.mod h1:vVW7PEdqEFqapJe95xHkTfB1+XvZXBFg8t0sG2FIxmI= -github.com/ashanbrown/makezero v0.0.0-20210520155254-b6261585ddde/go.mod h1:oG9Dnez7/ESBqc4EdrdNlryeo7d0KcW1ftXHm7nU/UU= -github.com/ashanbrown/makezero v1.1.1 h1:iCQ87C0V0vSyO+M9E/FZYbu65auqH0lnsOkf5FcB28s= github.com/ashanbrown/makezero v1.1.1/go.mod h1:i1bJLCRSCHOcOa9Y6MyF2FTfMZMFdHvxKHxgO5Z1axI= -github.com/aws/aws-lambda-go v1.13.3 h1:SuCy7H3NLyp+1Mrfp+m80jcbi9KYWAs9/BXwppwRDzY= github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= github.com/aws/aws-sdk-go v1.23.20/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.25.37/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.25.48/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.36.30/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= +github.com/aws/aws-sdk-go v1.40.45/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q= github.com/aws/aws-sdk-go v1.44.122/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= github.com/aws/aws-sdk-go v1.44.203 h1:pcsP805b9acL3wUqa4JR2vg1k2wnItkDYNvfmcy6F+U= github.com/aws/aws-sdk-go v1.44.203/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= github.com/aws/aws-sdk-go-v2 v1.2.0/go.mod h1:zEQs02YRBw1DjK0PoJv3ygDYOFTre1ejlJWl8FwAuQo= -github.com/aws/aws-sdk-go-v2 v1.9.1 h1:ZbovGV/qo40nrOJ4q8G33AGICzaPI45FHQWJ9650pF4= github.com/aws/aws-sdk-go-v2 v1.9.1/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= -github.com/aws/aws-sdk-go-v2/config v1.1.1 h1:ZAoq32boMzcaTW9bcUacBswAmHTbvlvDJICgHFZuECo= github.com/aws/aws-sdk-go-v2/config v1.1.1/go.mod h1:0XsVy9lBI/BCXm+2Tuvt39YmdHwS5unDQmxZOYe8F5Y= -github.com/aws/aws-sdk-go-v2/credentials v1.1.1 h1:NbvWIM1Mx6sNPTxowHgS2ewXCRp+NGTzUYb/96FZJbY= github.com/aws/aws-sdk-go-v2/credentials v1.1.1/go.mod h1:mM2iIjwl7LULWtS6JCACyInboHirisUUdkBPoTHMOUo= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.0.2 h1:EtEU7WRaWliitZh2nmuxEXrN0Cb8EgPUFGIoTMeqbzI= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.0.2/go.mod h1:3hGg3PpiEjHnrkrlasTfxFqUsZ2GCk/fMUn4CbKgSkM= -github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.8.1 h1:w/fPGB0t5rWwA43mux4e9ozFSH5zF1moQemlA131PWc= github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.8.1/go.mod h1:CM+19rL1+4dFWnOQKwDc7H1KwXTz+h61oUSHyhV0b3o= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.0.2 h1:4AH9fFjUlVktQMznF+YN33aWNXaR4VgDXyP28qokJC0= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.0.2/go.mod h1:45MfaXZ0cNbeuT0KQ1XJylq8A6+OpVV2E5kvY/Kq+u8= -github.com/aws/aws-sdk-go-v2/service/route53 v1.1.1 h1:cKr6St+CtC3/dl/rEBJvlk7A/IN5D5F02GNkGzfbtVU= github.com/aws/aws-sdk-go-v2/service/route53 v1.1.1/go.mod h1:rLiOUrPLW/Er5kRcQ7NkwbjlijluLsrIbu/iyl35RO4= -github.com/aws/aws-sdk-go-v2/service/sso v1.1.1 h1:37QubsarExl5ZuCBlnRP+7l1tNwZPBSTqpTBrPH98RU= github.com/aws/aws-sdk-go-v2/service/sso v1.1.1/go.mod h1:SuZJxklHxLAXgLTc1iFXbEWkXs7QRTQpCLGaKIprQW0= -github.com/aws/aws-sdk-go-v2/service/sts v1.1.1 h1:TJoIfnIFubCX0ACVeJ0w46HEH5MwjwYN4iFhuYIhfIY= github.com/aws/aws-sdk-go-v2/service/sts v1.1.1/go.mod h1:Wi0EBZwiz/K44YliU0EKxqTCJGUfYTWXrrBwkq736bM= github.com/aws/smithy-go v1.1.0/go.mod h1:EzMw8dbp/YJL4A5/sbhGddag+NPT7q084agLbB9LgIw= -github.com/aws/smithy-go v1.8.0 h1:AEwwwXQZtUwP5Mz506FeXXrKBe0jA8gVM+1gEcSRooc= github.com/aws/smithy-go v1.8.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= -github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= +github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= @@ -678,74 +339,43 @@ github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod h1:6QX/PXZ github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 h1:41iFGWnSlI2gVpmOtVTJZNodLdLQLn/KsJqFvXwnd/s= github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= -github.com/bits-and-blooms/bitset v1.2.0 h1:Kn4yilvwNtMACtf1eYDlG8H77R07mZSPbMjLyS07ChA= -github.com/bits-and-blooms/bitset v1.2.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA= -github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= -github.com/bketelsen/crypt v0.0.4 h1:w/jqZtC9YD4DS/Vp9GhWfWcCpuAL58oTnLoI8vE9YHU= -github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM= -github.com/bkielbasa/cyclop v1.2.0 h1:7Jmnh0yL2DjKfw28p86YTd/B4lRGcNuu12sKE35sM7A= github.com/bkielbasa/cyclop v1.2.0/go.mod h1:qOI0yy6A7dYC4Zgsa72Ppm9kONl0RoIlPbzot9mhmeI= -github.com/blizzy78/varnamelen v0.8.0 h1:oqSblyuQvFsW1hbBHh1zfwrKe3kcSj0rnXkKzsQ089M= github.com/blizzy78/varnamelen v0.8.0/go.mod h1:V9TzQZ4fLJ1DSrjVDfl89H7aMnTvKkApdHeyESmyR7k= -github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40 h1:y4B3+GPxKlrigF1ha5FFErxK+sr6sWxQovRMzwMhejo= github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40/go.mod h1:8rLXio+WjiTceGBHIoTvn60HIbs7Hm7bcHjyrSqYB9c= -github.com/boltdb/bolt v1.3.1 h1:JQmyP4ZBrce+ZQu0dY660FMfatumYDLun9hBCUVIkF4= github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps= -github.com/bombsimon/wsl/v3 v3.3.0 h1:Mka/+kRLoQJq7g2rggtgQsjuI/K5Efd87WX96EWFxjM= github.com/bombsimon/wsl/v3 v3.3.0/go.mod h1:st10JtZYLE4D5sC7b8xV4zTKZwAQjCH/Hy2Pm1FNZIc= -github.com/breml/bidichk v0.2.3 h1:qe6ggxpTfA8E75hdjWPZ581sY3a2lnl0IRxLQFelECI= github.com/breml/bidichk v0.2.3/go.mod h1:8u2C6DnAy0g2cEq+k/A2+tr9O1s+vHGxWn0LTc70T2A= -github.com/breml/errchkjson v0.3.0 h1:YdDqhfqMT+I1vIxPSas44P+9Z9HzJwCeAzjB8PxP1xw= github.com/breml/errchkjson v0.3.0/go.mod h1:9Cogkyv9gcT8HREpzi3TiqBxCqDzo8awa92zSDFcofU= -github.com/btcsuite/btcd v0.0.0-20171128150713-2e60448ffcc6/go.mod h1:Dmm/EzmjnCiweXmzRIAiUWCInVmPgjkzgv5k4tVyXiQ= github.com/btcsuite/btcd v0.0.0-20190315201642-aa6e0f35703c/go.mod h1:DrZx5ec/dmnfpw9KyYoQyYo7d0KEvTkk/5M/vbZjAr8= github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ= -github.com/btcsuite/btcd v0.21.0-beta/go.mod h1:ZSWyehm27aAuS9bvkATT+Xte3hjHZ+MRgMY/8NJ7K94= github.com/btcsuite/btcd v0.21.0-beta.0.20201114000516-e9c7a5ac6401/go.mod h1:Sv4JPQ3/M+teHz9Bo5jBpkNcP0x6r7rdihlNL/7tTAs= -github.com/btcsuite/btcd v0.22.0-beta/go.mod h1:9n5ntfhhHQBIhUvlhDvD3Qg6fRUj4jkN0VB8L8svzOA= github.com/btcsuite/btcd v0.22.1 h1:CnwP9LM/M9xuRrGSCGeMVs9iv09uMqwsVX7EeIpgV2c= github.com/btcsuite/btcd v0.22.1/go.mod h1:wqgTSL29+50LRkmOVknEdmt8ZojIzhuWvgu/iptuN7Y= github.com/btcsuite/btcd/btcec/v2 v2.1.2/go.mod h1:ctjw4H1kknNJmRN4iP1R7bTQ+v3GJkZBd6mui8ZsAZE= github.com/btcsuite/btcd/btcec/v2 v2.3.2 h1:5n0X6hX0Zk+6omWcihdYvdAlGf2DfasC0GMf7DClJ3U= github.com/btcsuite/btcd/btcec/v2 v2.3.2/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04= github.com/btcsuite/btcd/btcutil v1.1.2 h1:XLMbX8JQEiwMcYft2EGi8zPUkoa0abKIU6/BJSRsjzQ= -github.com/btcsuite/btcd/btcutil v1.1.2/go.mod h1:UR7dsSJzJUfMmFiiLlIrMq1lS9jh9EdCV7FStZSnpi0= github.com/btcsuite/btcd/chaincfg/chainhash v1.0.0/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc= github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U= github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc= -github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f h1:bAs4lUbRJpnnkd9VhRV3jjAVU7DJVjMaK+IsvSeZvFo= github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA= github.com/btcsuite/btcutil v0.0.0-20190207003914-4c204d697803/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg= github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg= github.com/btcsuite/btcutil v1.0.2/go.mod h1:j9HUFwoQRsZL3V4n+qG+CUnEGHOarIxfC3Le2Yhbcts= -github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce h1:YtWJF7RHm2pYCvA5t0RPmAaLUhREsKuKd+SLhxFbFeQ= github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce/go.mod h1:0DVlHczLPewLcPGEIeUEzfOJhqGPQ0mJJRDBtD307+o= -github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd h1:R/opQEbFEy9JGkIguV40SvRY1uliPX8ifOvi6ICsFCw= github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd/go.mod h1:HHNXQzUsZCxOoE+CPiyCTO6x34Zs86zZUiwtpXoGdtg= github.com/btcsuite/goleveldb v0.0.0-20160330041536-7834afc9e8cd/go.mod h1:F+uVaaLLH7j4eDXPRvw78tMflu7Ie2bzYOH4Y8rRKBY= -github.com/btcsuite/goleveldb v1.0.0 h1:Tvd0BfvqX9o823q1j2UZ/epQo09eJh6dTcRp79ilIN4= github.com/btcsuite/goleveldb v1.0.0/go.mod h1:QiK9vBlgftBg6rWQIj6wFzbPfRjiykIEhBH4obrXJ/I= github.com/btcsuite/snappy-go v0.0.0-20151229074030-0bdef8d06723/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc= -github.com/btcsuite/snappy-go v1.0.0 h1:ZxaA6lo2EpxGddsA8JwWOcxlzRybb444sgmeJQMJGQE= github.com/btcsuite/snappy-go v1.0.0/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc= -github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792 h1:R8vQdOQdZ9Y3SkEwmHoWBmX1DNXhXZqlTpq6s4tyJGc= github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod h1:ghJtEyQwv5/p4Mg4C0fgbePVuGr935/5ddU9Z3TmDRY= -github.com/btcsuite/winsvc v1.0.0 h1:J9B4L7e3oqhXOcm+2IuNApwzQec85lE+QaikUcCs+dk= github.com/btcsuite/winsvc v1.0.0/go.mod h1:jsenWakMcC0zFBFurPLEAyrnc/teJEM1O46fmI40EZs= -github.com/bufbuild/buf v1.7.0 h1:uWRjhIXcrWkzIkA5TqXGyJbF51VW54QJsQZ3nwaes5Q= -github.com/bufbuild/buf v1.7.0/go.mod h1:Go40fMAF46PnPLC7jJgTQhAI95pmC0+VtxFKVC0qLq0= -github.com/bufbuild/connect-go v1.0.0 h1:htSflKUT8y1jxhoPhPYTZMrsY3ipUXjjrbcZR5O2cVo= -github.com/bufbuild/connect-go v1.0.0/go.mod h1:9iNvh/NOsfhNBUH5CtvXeVUskQO1xsrEviH7ZArwZ3I= +github.com/bufbuild/buf v1.3.1/go.mod h1:CTRUb23N+zlm1U8ZIBKz0Sqluk++qQloB2i/MZNZHIs= github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA= -github.com/bufbuild/protocompile v0.4.0/go.mod h1:3v93+mbWn/v3xzN+31nwkJfrEpAUwp+BagBSZWx+TP8= -github.com/butuzov/ireturn v0.1.1 h1:QvrO2QF2+/Cx1WA/vETCIYBKtRjc30vesdoPUNo1EbY= github.com/butuzov/ireturn v0.1.1/go.mod h1:Wh6Zl3IMtTpaIKbmwzqi6olnM9ptYQxxVacMsOEFPoc= -github.com/bwesterb/go-ristretto v1.2.0 h1:xxWOVbN5m8NNKiSDZXE1jtZvZnC6JSJ9cYFADiZcWtw= github.com/bwesterb/go-ristretto v1.2.0/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0= -github.com/c-bata/go-prompt v0.2.2 h1:uyKRz6Z6DUyj49QVijyM339UJV9yhbr70gESwbNU3e0= github.com/c-bata/go-prompt v0.2.2/go.mod h1:VzqtzE2ksDBcdln8G7mk2RX9QyGjH+OVqOCSiVIqS34= github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= -github.com/casbin/casbin/v2 v2.37.0 h1:/poEwPSovi4bTOcP752/CsTQiRz2xycyVKFG7GUhbDw= github.com/casbin/casbin/v2 v2.37.0/go.mod h1:vByNa/Fchek0KZUgG5wEsl7iFsiviAYKRtgrQfcJqHg= github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4= github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= @@ -754,9 +384,6 @@ github.com/cenkalti/backoff/v4 v4.1.3 h1:cFAlzYUlVYDysBEH2T5hyJZMh3+5+WCBvSnK6Q8 github.com/cenkalti/backoff/v4 v4.1.3/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/census-instrumentation/opencensus-proto v0.4.1 h1:iKLQ0xPNFxR/2hzXZMrBo8f1j86j5WHzznCCQxV/b8g= -github.com/census-instrumentation/opencensus-proto v0.4.1/go.mod h1:4T9NM4+4Vw91VeyqjLS6ao50K5bOcLKN6Q42XnYaRYw= -github.com/cespare/cp v0.1.0 h1:SE+dxFebS7Iik5LK0tsi1k9ZCxEaFX4AjQmoyA+1dJk= github.com/cespare/cp v0.1.0/go.mod h1:SOGHArjBr4JWaSDEVpWpo/hNg6RoKrls6Oh40hiwW+s= github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= @@ -764,15 +391,9 @@ github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XL github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/charithe/durationcheck v0.0.8/go.mod h1:SSbRIBVfMjCi/kEB6K65XEA83D6prSM8ap1UCpNKtgg= -github.com/charithe/durationcheck v0.0.9 h1:mPP4ucLrf/rKZiIG/a9IPXHGlh8p4CzgpyTy6EEutYk= github.com/charithe/durationcheck v0.0.9/go.mod h1:SSbRIBVfMjCi/kEB6K65XEA83D6prSM8ap1UCpNKtgg= -github.com/chavacava/garif v0.0.0-20210405164556-e8a0a408d6af/go.mod h1:Qjyv4H3//PWVzTeCezG2b9IRn6myJxJSr4TD/xo6ojU= -github.com/chavacava/garif v0.0.0-20220630083739-93517212f375 h1:E7LT642ysztPWE0dfz43cWOvMiF42DyTRC+eZIaO4yI= -github.com/chavacava/garif v0.0.0-20220630083739-93517212f375/go.mod h1:4m1Rv7xfuwWPNKXlThldNuJvutYM6J95wNuuVmn55To= -github.com/checkpoint-restore/go-criu/v5 v5.0.0 h1:TW8f/UvntYoVDMN1K2HlT82qH1rb0sOjpGw3m6Ym+i4= -github.com/checkpoint-restore/go-criu/v5 v5.0.0/go.mod h1:cfwC0EG7HMUenopBsUf9d89JlCLQIfgVcNsNN0t6T2M= -github.com/cheggaaa/pb v1.0.27 h1:wIkZHkNfC7R6GI5w7l/PdAdzXzlrbcI3p8OAlnkTsnc= +github.com/chavacava/garif v0.0.0-20220316182200-5cad0b5181d4/go.mod h1:W8EnPSQ8Nv4fUjc/v1/8tHFqhuOJXnRub0dTfuAQktU= +github.com/checkpoint-restore/go-criu/v5 v5.3.0/go.mod h1:E/eQpaFtUKGOOSEBZgmKAcn+zUUwWxqcaKZlF54wK8E= github.com/cheggaaa/pb v1.0.27/go.mod h1:pQciLPpbU0oxA0h+VJYYLxO+XeDQb5pZijXscXHm81s= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/logex v1.2.1 h1:XHDu3E6q+gdHgsdTPH6ImJMIp436vR6MPtH8gP05QzM= @@ -783,125 +404,63 @@ github.com/chzyer/readline v1.5.1/go.mod h1:Eh+b79XXUwfKfcPLepksvw2tcLE/Ct21YObk github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/chzyer/test v1.0.0 h1:p3BQDXSxOhOG0P9z6/hGnII4LGiEPOYBhs8asl/fC04= github.com/chzyer/test v1.0.0/go.mod h1:2JlltgoNkt4TW/z9V/IzDdFaMTM2JPIi26O1pF38GC8= -github.com/cilium/ebpf v0.6.2 h1:iHsfF/t4aW4heW2YKfeHrVPGdtYTL4C4KocpM8KTSnI= -github.com/cilium/ebpf v0.6.2/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs= -github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible h1:C29Ae4G5GtYyYMm1aztcyj/J5ckgJm2zwdDajFbx1NY= +github.com/cilium/ebpf v0.7.0/go.mod h1:/oI2+1shJiTGAMgl6/RgJr36Eo1jzrRcAWbcXO2usCA= github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag= -github.com/circonus-labs/circonusllhist v0.1.3 h1:TJH+oke8D16535+jHExHj4nQvzlZrj7ug5D7I/orNUA= github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= -github.com/clbanning/mxj v1.8.4 h1:HuhwZtbyvyOw+3Z1AowPkU87JkJUSv751ELWaiTpj8I= github.com/clbanning/mxj v1.8.4/go.mod h1:BVjHeAH+rl9rs6f+QIpeRl0tfu10SXn1pUSa5PVGJng= -github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec h1:EdRZT3IeKQmfCSrgo8SZ8V3MEnskuJP0wCYNpe+aiXo= github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE= -github.com/client9/misspell v0.3.4 h1:ta993UF76GwbvJcIo3Y68y/M3WxlpEHPWIGDkJYwzJI= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudflare/circl v1.1.0 h1:bZgT/A+cikZnKIwn7xL2OBj012Bmvho/o6RpRvv3GKY= -github.com/cloudflare/circl v1.1.0/go.mod h1:prBCrKB9DV4poKZY1l9zBXg2QJY7mvgRvtMxxK7fi4I= -github.com/cloudflare/cloudflare-go v0.10.2-0.20190916151808-a80f83b9add9/go.mod h1:1MxXX1Ux4x6mqPmjkUgTP1CdXIBXKX7T+Jk9Gxrmx+U= -github.com/cloudflare/cloudflare-go v0.14.0 h1:gFqGlGl/5f9UGXAaKapCGUfaTCgRKKnzu2VvzMZlOFA= github.com/cloudflare/cloudflare-go v0.14.0/go.mod h1:EnwdgGMaFOruiPZRFSgn+TsQ3hQ7C/YWzIGLeu5c304= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= -github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe h1:QQ3GSy+MqSHxm/d8nCtnAiZdYFd45cYZPs8vOOIYKfk= -github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211130200136-a8f946100490/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20230310173818-32f1caf87195 h1:58f1tJ1ra+zFINPlwLWvQsR9CzAKt2e+EWV2yX9oXQ4= -github.com/cncf/xds/go v0.0.0-20230310173818-32f1caf87195/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cockroachdb/apd/v2 v2.0.2 h1:weh8u7Cneje73dDh+2tEVLUvyBc89iwepWCD8b8034E= github.com/cockroachdb/apd/v2 v2.0.2/go.mod h1:DDxRlzC2lo3/vSlmSoS7JkqbbrARPuFOGr0B9pvN3Gw= github.com/cockroachdb/apd/v3 v3.1.0 h1:MK3Ow7LH0W8zkd5GMKA1PvS9qG3bWFI95WaVNfyZJ/w= -github.com/cockroachdb/apd/v3 v3.1.0/go.mod h1:6qgPBMXjATAdD/VefbRP9NoSLKjbB4LCoA7gN4LpHs4= -github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa h1:OaNxuTZr7kxeODyLWsRMC+OD03aFUH+mW6r2d+MWa5Y= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= -github.com/cockroachdb/errors v1.9.1 h1:yFVvsI0VxmRShfawbt/laCIDy/mtTqqnvoNgiy5bEV8= -github.com/cockroachdb/errors v1.9.1/go.mod h1:2sxOtL2WIc096WSZqZ5h8fa17rdDq9HZOZLBCor4mBk= -github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZeQy818SGhaone5OnYfxFR/+AzdY3sf5aE= -github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs= -github.com/cockroachdb/pebble v0.0.0-20220817183557-09c6e030a677 h1:qbb/AE938DFhOajUYh9+OXELpSF9KZw2ZivtmW6eX1Q= -github.com/cockroachdb/pebble v0.0.0-20220817183557-09c6e030a677/go.mod h1:890yq1fUb9b6dGNwssgeUO5vQV9qfXnCPxAJhBQfXw0= -github.com/cockroachdb/redact v1.1.3 h1:AKZds10rFSIj7qADf0g46UixK8NNLwWTNdCIGS5wfSQ= -github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= -github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd h1:qMd81Ts1T2OTKmB4acZcyKaMtRnY5Y44NuXGX2GFJ1w= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= -github.com/coinbase/kryptology v1.8.0 h1:Aoq4gdTsJhSU3lNWsD5BWmFSz2pE0GlmrljaOxepdYY= github.com/coinbase/kryptology v1.8.0/go.mod h1:RYXOAPdzOGUe3qlSFkMGn58i3xUA8hmxYHksuq+8ciI= -github.com/coinbase/rosetta-sdk-go v0.6.10/go.mod h1:J/JFMsfcePrjJZkwQFLh+hJErkAmdm9Iyy3D5Y0LfXo= -github.com/coinbase/rosetta-sdk-go v0.7.0/go.mod h1:7nD3oBPIiHqhRprqvMgPoGxe/nyq3yftRmpsy29coWE= github.com/coinbase/rosetta-sdk-go v0.7.9 h1:lqllBjMnazTjIqYrOGv8h8jxjg9+hJazIGZr9ZvoCcA= github.com/coinbase/rosetta-sdk-go v0.7.9/go.mod h1:0/knutI7XGVqXmmH4OQD8OckFrbQ8yMsUZTG7FXCR2M= -github.com/coinbase/rosetta-sdk-go/types v1.0.0 h1:jpVIwLcPoOeCR6o1tU+Xv7r5bMONNbHU7MuEHboiFuA= -github.com/coinbase/rosetta-sdk-go/types v1.0.0/go.mod h1:eq7W2TMRH22GTW0N0beDnN931DW0/WOI1R2sdHNHG4c= github.com/cometbft/cometbft v0.37.2 h1:XB0yyHGT0lwmJlFmM4+rsRnczPlHoAKFX6K8Zgc2/Jc= github.com/cometbft/cometbft v0.37.2/go.mod h1:Y2MMMN//O5K4YKd8ze4r9jmk4Y7h0ajqILXbH5JQFVs= github.com/cometbft/cometbft-db v0.8.0 h1:vUMDaH3ApkX8m0KZvOFFy9b5DZHBAjsnEuo9AKVZpjo= github.com/cometbft/cometbft-db v0.8.0/go.mod h1:6ASCP4pfhmrCBpfk01/9E1SI29nD3HfVHrY4PG8x5c0= -github.com/confio/ics23/go v0.0.0-20200817220745-f173e6211efb/go.mod h1:E45NqnlpxGnpfTWL/xauN7MRwEE28T4Dd4uraToOaKg= -github.com/confio/ics23/go v0.6.3/go.mod h1:E45NqnlpxGnpfTWL/xauN7MRwEE28T4Dd4uraToOaKg= -github.com/confio/ics23/go v0.6.6/go.mod h1:E45NqnlpxGnpfTWL/xauN7MRwEE28T4Dd4uraToOaKg= -github.com/confio/ics23/go v0.7.0/go.mod h1:E45NqnlpxGnpfTWL/xauN7MRwEE28T4Dd4uraToOaKg= github.com/confio/ics23/go v0.9.0 h1:cWs+wdbS2KRPZezoaaj+qBleXgUk5WOQFMP3CQFGTr4= github.com/confio/ics23/go v0.9.0/go.mod h1:4LPZ2NYqnYIVRklaozjNR1FScgDJ2s5Xrp+e/mYVRak= github.com/consensys/bavard v0.1.8-0.20210406032232-f3452dc9b572/go.mod h1:Bpd0/3mZuaj6Sj+PqrmIquiOKy397AKGThQPaGzNXAQ= -github.com/consensys/bavard v0.1.8-0.20210915155054-088da2f7f54a h1:AEpwbXTjBGKoqxuQ6QAcBMEuK0+PtajQj0wJkhTnSd0= github.com/consensys/bavard v0.1.8-0.20210915155054-088da2f7f54a/go.mod h1:9ItSMtA/dXMAiL7BG6bqW2m3NdSEObYWoH223nGHukI= github.com/consensys/gnark-crypto v0.4.1-0.20210426202927-39ac3d4b3f1f/go.mod h1:815PAHg3wvysy0SyIqanF8gZ0Y1wjk/hrDHD/iT88+Q= -github.com/consensys/gnark-crypto v0.5.3 h1:4xLFGZR3NWEH2zy+YzvzHicpToQR8FXFbfLNvpGB+rE= github.com/consensys/gnark-crypto v0.5.3/go.mod h1:hOdPlWQV1gDLp7faZVeg8Y0iEPFaOUnCc4XeCCk96p0= -github.com/containerd/console v1.0.2 h1:Pi6D+aZXM+oUw1czuKgH5IJ+y0jhYcwBJfx5/Ghn9dE= -github.com/containerd/console v1.0.2/go.mod h1:ytZPjGgY2oeTkAONYafi2kSj0aYggsf8acV1PGKCbzQ= -github.com/containerd/containerd v1.6.8 h1:h4dOFDwzHmqFEP754PgfgTeVXFnLiRc6kiqC7tplDJs= -github.com/containerd/containerd v1.6.8/go.mod h1:By6p5KqPK0/7/CgO/A6t/Gz+CUYUu2zf1hUaaymVXB0= -github.com/containerd/continuity v0.0.0-20190827140505-75bee3e2ccb6/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= -github.com/containerd/continuity v0.1.0/go.mod h1:ICJu0PwR54nI0yPEnJ6jcS+J7CZAUXrLh8lPo2knzsM= +github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U= github.com/containerd/continuity v0.3.0 h1:nisirsYROK15TAMVukJOUyGJjz4BNQJBVsNvAXZJ/eg= github.com/containerd/continuity v0.3.0/go.mod h1:wJEAIwKOm/pBZuBd0JmeTvnLquTB1Ag8espWhkykbPM= -github.com/containerd/typeurl v1.0.2 h1:Chlt8zIieDbzQFzXzAeBEF92KhExuE4p9p92/QmY7aY= -github.com/containerd/typeurl v1.0.2/go.mod h1:9trJWW2sRlGub4wZJRTW83VtbOLS6hwcDZXTn6oPz9s= -github.com/coreos/bbolt v1.3.2 h1:wZwiHHUieZCquLkDL0B8UhzreNWsPHooDAG3q34zk0s= -github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= -github.com/coreos/etcd v3.3.10+incompatible h1:jFneRYjIvLMLhDLCzuTuU4rSJUjRplcJQ7pD7MnhC04= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= -github.com/coreos/etcd v3.3.13+incompatible h1:8F3hqu9fGYLBifCmRCJsicFqDx/D68Rt3q1JMazcgBQ= -github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= -github.com/coreos/go-etcd v2.0.0+incompatible h1:bXhRBIXoTm9BYHS3gE0TtQuyNZyeEMux2sDi4oo5YOo= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7 h1:u9SHYsPQNyt5tgDm3YN7+9dYrpK96E5wFilTFWIDZOM= github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/coreos/go-systemd v0.0.0-20190620071333-e64a0ec8b42a h1:W8b4lQ4tFF21aspRGoBuCNV6V2fFJBF+pm1J6OY8Lys= github.com/coreos/go-systemd v0.0.0-20190620071333-e64a0ec8b42a/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= -github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs= +github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= -github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf h1:CAKfRE2YtTUIjjh1bkBtyYFaUT/WmOqsJjgtihT0vMI= github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= -github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f h1:lBNOc5arjvs8E5mO2tbpBpLoyyu8B6e44T7hJy6potg= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= -github.com/cosmos/btcutil v1.0.4/go.mod h1:Ffqc8Hn6TJUdDgHBwIZLtrLQC1KdJ9jGJl/TvgUaxbU= github.com/cosmos/btcutil v1.0.5 h1:t+ZFcX77LpKtDBhjucvnOH8C2l2ioGsBNEQ3jef8xFk= github.com/cosmos/btcutil v1.0.5/go.mod h1:IyB7iuqZMJlthe2tkIFL33xPyzbFYP0XVdS8P5lUPis= -github.com/cosmos/cosmos-db v0.0.0-20221226095112-f3c38ecb5e32 h1:zlCp9n3uwQieELltZWHRmwPmPaZ8+XoL2Sj+A2YJlr8= -github.com/cosmos/cosmos-db v0.0.0-20221226095112-f3c38ecb5e32/go.mod h1:kwMlEC4wWvB48zAShGKVqboJL6w4zCLesaNQ3YLU2BQ= github.com/cosmos/cosmos-proto v1.0.0-beta.2 h1:X3OKvWgK9Gsejo0F1qs5l8Qn6xJV/AzgIWR2wZ8Nua8= github.com/cosmos/cosmos-proto v1.0.0-beta.2/go.mod h1:+XRCLJ14pr5HFEHIUcn51IKXD1Fy3rkEQqt4WqmN4V0= -github.com/cosmos/cosmos-sdk v0.44.2/go.mod h1:fwQJdw+aECatpTvQTo1tSfHEsxACdZYU80QCZUPnHr4= -github.com/cosmos/cosmos-sdk v0.44.3/go.mod h1:bA3+VenaR/l/vDiYzaiwbWvRPWHMBX2jG0ygiFtiBp0= -github.com/cosmos/cosmos-sdk v0.45.1/go.mod h1:XXS/asyCqWNWkx2rW6pSuen+EVcpAFxq6khrhnZgHaQ= -github.com/cosmos/cosmos-sdk v0.45.2-0.20220901181011-06d4a64bf808/go.mod h1:XXS/asyCqWNWkx2rW6pSuen+EVcpAFxq6khrhnZgHaQ= github.com/cosmos/cosmos-sdk v0.47.3 h1:r0hGmZoAzP2D+MaPaFGHwAaTdFQq3pNpHaUp1BsffbM= github.com/cosmos/cosmos-sdk v0.47.3/go.mod h1:c4OfLdAykA9zsj1CqrxBRqXzVz48I++JSvIMPSPcEmk= -github.com/cosmos/cosmos-sdk/db v1.0.0-beta.1.0.20220726092710-f848e4300a8a h1:2humuGPw3O5riJVFq/E2FRjF57UrO97W1qJcGVmK+6k= -github.com/cosmos/cosmos-sdk/db v1.0.0-beta.1.0.20220726092710-f848e4300a8a/go.mod h1:c8IO23vgNxueCCJlSI9awQtcxsvc+buzaeThB85qfBU= +github.com/cosmos/gaia/v11 v11.0.0-20230724152830-861ba391c3b4 h1:mfMLLg6wbQfZCf0IkdvEWiC3AVXkNgX0vaDZFtdYLs0= +github.com/cosmos/gaia/v11 v11.0.0-20230724152830-861ba391c3b4/go.mod h1:6zse9gY32FcZtX9/GYqXPGxneRN7+qpPCi/doXzgK5E= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= @@ -910,92 +469,60 @@ github.com/cosmos/gogogateway v1.2.0/go.mod h1:iQpLkGWxYcnCdz5iAdLcRBSw3h7NXeOkZ github.com/cosmos/gogoproto v1.4.2/go.mod h1:cLxOsn1ljAHSV527CHOtaIP91kK6cCrZETRBrkzItWU= github.com/cosmos/gogoproto v1.4.10 h1:QH/yT8X+c0F4ZDacDv3z+xE3WU1P1Z3wQoLMBRJoKuI= github.com/cosmos/gogoproto v1.4.10/go.mod h1:3aAZzeRWpAwr+SS/LLkICX2/kDFyaYVzckBDzygIxek= -github.com/cosmos/iavl v0.15.0-rc3.0.20201009144442-230e9bdf52cd/go.mod h1:3xOIaNNX19p0QrX0VqWa6voPRoJRGGYtny+DH8NEPvE= -github.com/cosmos/iavl v0.15.0-rc5/go.mod h1:WqoPL9yPTQ85QBMT45OOUzPxG/U/JcJoN7uMjgxke/I= -github.com/cosmos/iavl v0.15.3/go.mod h1:OLjQiAQ4fGD2KDZooyJG9yz+p2ao2IAYSbke8mVvSA4= -github.com/cosmos/iavl v0.17.1/go.mod h1:7aisPZK8yCpQdy3PMvKeO+bhq1NwDjUwjzxwwROUxFk= -github.com/cosmos/iavl v0.17.3/go.mod h1:prJoErZFABYZGDHka1R6Oay4z9PrNeFFiMKHDAMOi4w= github.com/cosmos/iavl v0.20.0 h1:fTVznVlepH0KK8NyKq8w+U7c2L6jofa27aFX6YGlm38= github.com/cosmos/iavl v0.20.0/go.mod h1:WO7FyvaZJoH65+HFOsDir7xU9FWk2w9cHXNW1XHcl7A= -github.com/cosmos/ibc-go v1.2.2 h1:bs6TZ8Es1kycIu2AHlRZ9dzJ+mveqlLN/0sjWtRH88o= -github.com/cosmos/ibc-go v1.2.2/go.mod h1:XmYjsRFOs6Q9Cz+CSsX21icNoH27vQKb3squgnCOCbs= -github.com/cosmos/ibc-go/v3 v3.0.0 h1:XUNplHVS51Q2gMnTFsFsH9QJ7flsovMamnltKbEgPQ4= -github.com/cosmos/ibc-go/v3 v3.0.0/go.mod h1:Mb+1NXiPOLd+CPFlOC6BKeAUaxXlhuWenMmRiUiSmwY= github.com/cosmos/ibc-go/v7 v7.2.0 h1:dx0DLUl7rxdyZ8NiT6UsrbzKOJx/w7s+BOaewFRH6cg= github.com/cosmos/ibc-go/v7 v7.2.0/go.mod h1:OOcjKIRku/j1Xs1RgKK0yvKRrJ5iFuZYMetR1n3yMlc= github.com/cosmos/ics23/go v0.10.0 h1:iXqLLgp2Lp+EdpIuwXTYIQU+AiHj9mOC2X9ab++bZDM= github.com/cosmos/ics23/go v0.10.0/go.mod h1:ZfJSmng/TBNTBkFemHHHj5YY7VAU/MBU980F4VU1NG0= -github.com/cosmos/interchain-security/v3 v3.0.0-rc2 h1:bCPsPX8pDRizqRV1i+9gX9RYAeKRBCmVd3C7NC3weTE= -github.com/cosmos/interchain-security/v3 v3.0.0-rc2/go.mod h1:HKHw9u4xMm5QJV76A03ORAXB2zisgpcunXZSca8TBdg= -github.com/cosmos/interchain-security/v3 v3.0.0 h1:ZEk1ltSWF/w6fpFk6eBH2PeyJ1dLFTZWyAdKPnO0unA= -github.com/cosmos/interchain-security/v3 v3.0.0/go.mod h1:HKHw9u4xMm5QJV76A03ORAXB2zisgpcunXZSca8TBdg= github.com/cosmos/interchain-security/v3 v3.1.0 h1:EKDJCIKIDLG45tvKwfoANrRPgqvqfUt/f1TNKx3b7Uo= github.com/cosmos/interchain-security/v3 v3.1.0/go.mod h1:2fILBgypEZcwR3BSzKDw+EsYtMKv9Z6cYXfouh4xTYU= github.com/cosmos/keyring v1.2.0 h1:8C1lBP9xhImmIabyXW4c3vFjjLiBdGCmfLUfeZlV1Yo= github.com/cosmos/keyring v1.2.0/go.mod h1:fc+wB5KTk9wQ9sDx0kFXB3A0MaeGHM9AwRStKOQ5vOA= github.com/cosmos/ledger-cosmos-go v0.12.1 h1:sMBxza5p/rNK/06nBSNmsI/WDqI0pVJFVNihy1Y984w= github.com/cosmos/ledger-cosmos-go v0.12.1/go.mod h1:dhO6kj+Y+AHIOgAe4L9HL/6NDdyyth4q238I9yFpD2g= -github.com/cosmos/ledger-go v0.9.2 h1:Nnao/dLwaVTk1Q5U9THldpUMMXU94BOTWPddSmVB6pI= -github.com/cosmos/ledger-go v0.9.2/go.mod h1:oZJ2hHAZROdlHiwTg4t7kP+GKIIkBT+o6c9QWFanOyI= github.com/cosmos/rosetta-sdk-go v0.10.0 h1:E5RhTruuoA7KTIXUcMicL76cffyeoyvNybzUGSKFTcM= github.com/cosmos/rosetta-sdk-go v0.10.0/go.mod h1:SImAZkb96YbwvoRkzSMQB6noNJXFgWl/ENIznEoYQI4= -github.com/cpuguy83/go-md2man v1.0.10 h1:BSKMNlYxDvnunlTymqtgONjNnaRV1sTpcovwwjF22jk= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= -github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/creachadair/atomicfile v0.2.6/go.mod h1:BRq8Une6ckFneYXZQ+kO7p1ZZP3I2fzVzf28JxrIkBc= +github.com/creachadair/command v0.0.0-20220426235536-a748effdf6a1/go.mod h1:bAM+qFQb/KwWyCc9MLC4U1jvn3XyakqP5QRkds5T6cY= +github.com/creachadair/taskgroup v0.3.2/go.mod h1:wieWwecHVzsidg2CsUnFinW1faVN4+kq+TDlRJQ0Wbk= github.com/creachadair/taskgroup v0.4.2 h1:jsBLdAJE42asreGss2xZGZ8fJra7WtwnHWeJFxv2Li8= github.com/creachadair/taskgroup v0.4.2/go.mod h1:qiXUOSrbwAY3u0JPGTzObbE3yf9hcXHDKBZ2ZjpCbgM= +github.com/creachadair/tomledit v0.0.22/go.mod h1:cIu/4x5L855oSRejIqr+WRFh+mv9g4fWLiUFaApYn/Y= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= -github.com/creack/pty v1.1.9 h1:uDmaGzcdjhF4i/plgjmEsriH11Y0o7RKapEf/LDaM3w= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= +github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/cucumber/common/gherkin/go/v22 v22.0.0 h1:4K8NqptbvdOrjL9DEea6HFjSpbdT9+Q5kgLpmmsHYl0= -github.com/cucumber/common/gherkin/go/v22 v22.0.0/go.mod h1:3mJT10B2GGn3MvVPd3FwR7m2u4tLhSRhWUqJU4KN4Fg= github.com/cucumber/common/messages/go/v17 v17.1.1 h1:RNqopvIFyLWnKv0LfATh34SWBhXeoFTJnSrgm9cT/Ts= -github.com/cucumber/common/messages/go/v17 v17.1.1/go.mod h1:bpGxb57tDE385Rb2EohgUadLkAbhoC4IyCFi89u/JQI= -github.com/curioswitch/go-reassign v0.2.0 h1:G9UZyOcpk/d7Gd6mqYgd8XYWFMw/znxwGDUstnC9DIo= -github.com/curioswitch/go-reassign v0.2.0/go.mod h1:x6OpXuWvgfQaMGks2BZybTngWjT84hqJfKoO8Tt/Roc= -github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c h1:/ovYnF02fwL0kvspmy9AuyKg1JhdTRUgPw4nUxd9oZM= github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4= -github.com/cyphar/filepath-securejoin v0.2.2 h1:jCwT2GTP+PY5nBz3c/YL5PAIbusElVrPujOBSCj8xRg= -github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4= -github.com/daixiang0/gci v0.2.9/go.mod h1:+4dZ7TISfSmqfAGv59ePaHfNzgGtIkHAhhdKggP1JAc= -github.com/daixiang0/gci v0.8.1 h1:T4xpSC+hmsi4CSyuYfIJdMZAr9o7xZmHpQVygMghGZ4= -github.com/daixiang0/gci v0.8.1/go.mod h1:EpVfrztufwVgQRXjnX4zuNinEpLj5OmMjtu/+MB0V0c= -github.com/danieljoos/wincred v1.0.2/go.mod h1:SnuYRW9lp1oJrZX/dXJqr0cPK5gYXqx3EJbmjhLdK9U= -github.com/danieljoos/wincred v1.1.2/go.mod h1:GijpziifJoIBfYh+S7BbkdUTU4LfM+QnGqR5Vl2tAx0= +github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= +github.com/daixiang0/gci v0.4.2/go.mod h1:d0f+IJhr9loBtIq+ebwhRoTt1LGbPH96ih8bKlsRT9E= github.com/danieljoos/wincred v1.2.0 h1:ozqKHaLK0W/ii4KVbbvluM91W2H3Sh0BncbUNPS7jLE= github.com/danieljoos/wincred v1.2.0/go.mod h1:FzQLLMKBFdvu+osBrnFODiv32YGwCfx0SkRa/eYHgec= -github.com/dave/jennifer v1.2.0 h1:S15ZkFMRoJ36mGAQgWL1tnr0NQJh9rZ8qatseX/VbBc= github.com/dave/jennifer v1.2.0/go.mod h1:fIb+770HOpJ2fmN9EPPKOqm1vMGhB+TwXKMZhrIygKg= github.com/davecgh/go-spew v0.0.0-20161028175848-04cdfd42973b/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/deckarep/golang-set v0.0.0-20180603214616-504e848d77ea/go.mod h1:93vsz/8Wt4joVM7c2AVqh+YRMiUSc14yDtF28KmMOgQ= -github.com/deckarep/golang-set v1.8.0 h1:sk9/l/KqpunDwP7pSjUg0keiOOLEnOBHzykLrsPppp4= github.com/deckarep/golang-set v1.8.0/go.mod h1:5nI87KwE7wgsBU1F4GKAw2Qod7p5kyS383rP6+o6qqo= github.com/decred/dcrd/crypto/blake256 v1.0.0/go.mod h1:sQl2p6Y26YV+ZOcSTP6thNdn47hh8kt6rqSlvmrXFAc= github.com/decred/dcrd/crypto/blake256 v1.0.1 h1:7PltbUIQB7u/FfZ39+DGa/ShuMyJ5ilcvdfma9wOH6Y= -github.com/decred/dcrd/crypto/blake256 v1.0.1/go.mod h1:2OfgNZ5wDpcsFmHmCK5gZTPcCXqlm2ArzUIkw9czNJo= github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1/go.mod h1:hyedUtir6IdtD/7lIxGeCxkaw7y45JueMRL4DIyJDKs= github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 h1:8UrgZ3GkP4i/CLijOJx79Yu+etlyjdBU4sfcs2WYQMs= github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0/go.mod h1:v57UDF4pDQJcEfFUCRop3lJL149eHGSe9Jvczhzjo/0= -github.com/decred/dcrd/lru v1.0.0 h1:Kbsb1SFDsIlaupWPwsPp+dkxiBY1frcS07PCPgotKz8= github.com/decred/dcrd/lru v1.0.0/go.mod h1:mxKOwFd7lFjN2GZYsiz/ecgqR6kkYAl+0pz0tEMk218= github.com/deepmap/oapi-codegen v1.6.0/go.mod h1:ryDa9AgbELGeB+YEXE1dR53yAjHwFvE9iAUlWl9Al3M= -github.com/deepmap/oapi-codegen v1.8.2 h1:SegyeYGcdi0jLLrpbCMoJxnUUn8GBXHsvr4rbzjuhfU= github.com/deepmap/oapi-codegen v1.8.2/go.mod h1:YLgSKSDv/bZQB7N4ws6luhozi3cEdRktEqrX88CvjIw= -github.com/denis-tingaikin/go-header v0.4.3 h1:tEaZKAlqql6SKCY++utLmkPLd6K8IBM20Ha7UVm+mtU= github.com/denis-tingaikin/go-header v0.4.3/go.mod h1:0wOCWuN71D5qIgE2nz9KrKmuYBAC2Mra5RassOIQ2/c= -github.com/denis-tingajkin/go-header v0.4.2 h1:jEeSF4sdv8/3cT/WY8AgDHUoItNSoEZ7qg9dX7pc218= -github.com/denis-tingajkin/go-header v0.4.2/go.mod h1:eLRHAVXzE5atsKAnNRDB90WHCFFnBUn4RN0nRcs1LJA= +github.com/denisenkom/go-mssqldb v0.12.0/go.mod h1:iiK0YP1ZeepvmBQk/QpLEhhTNJgfzrpArPY/aFvc9yU= github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f h1:U5y3Y5UE0w7amNe7Z5G/twsBW0KEalRQXZzf8ufSh9I= github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f/go.mod h1:xH/i4TFMt8koVQZ6WFms69WAsDWr2XsYL3Hkl7jkoLE= -github.com/dgraph-io/badger/v2 v2.2007.1/go.mod h1:26P/7fbL4kUZVEVKLAKXkBXKOydDmM2p1e+NhhnBCAE= github.com/dgraph-io/badger/v2 v2.2007.2/go.mod h1:26P/7fbL4kUZVEVKLAKXkBXKOydDmM2p1e+NhhnBCAE= github.com/dgraph-io/badger/v2 v2.2007.4 h1:TRWBQg8UrlUhaFdco01nO2uXwzKS7zd+HVdwV/GHc4o= github.com/dgraph-io/badger/v2 v2.2007.4/go.mod h1:vSw/ax2qojzbN6eXHIx6KPKtCSHJN/Uz0X0VPruTIhk= @@ -1003,62 +530,39 @@ github.com/dgraph-io/ristretto v0.0.3-0.20200630154024-f66de99634de/go.mod h1:KP github.com/dgraph-io/ristretto v0.0.3/go.mod h1:KPxhHT9ZxKefz+PCeOGsrHpl1qZ7i70dGTu2u+Ahh6E= github.com/dgraph-io/ristretto v0.1.1 h1:6CWw5tJNgpegArSHpNHJKldNeq03FQCwYvfMVWajOK8= github.com/dgraph-io/ristretto v0.1.1/go.mod h1:S1GPSBCYCIhmVNfcth17y2zZtQT6wzkzgwUve0VDWWA= -github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= -github.com/dgryski/go-bitstream v0.0.0-20180413035011-3522498ce2c8 h1:akOQj8IVgoeFfBTzGOEQakCYshWD6RNo1M5pivFXt70= github.com/dgryski/go-bitstream v0.0.0-20180413035011-3522498ce2c8/go.mod h1:VMaSuZ+SZcx/wljOQKvp5srsbCiKDEb6K2wC4+PiBmQ= github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 h1:fAjc9m62+UWV/WAFKLNi6ZS0675eEUC9y3AlwSbQu1Y= github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= -github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954 h1:RMLoZVzv4GliuWafOuPuQDKSm1SJph7uCRnnS61JAn4= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= -github.com/dlclark/regexp2 v1.2.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc= -github.com/dlclark/regexp2 v1.4.1-0.20201116162257-a2a8dda75c91 h1:Izz0+t1Z5nI16/II7vuEo/nHjodOg0p7+OiDpjX5t1E= github.com/dlclark/regexp2 v1.4.1-0.20201116162257-a2a8dda75c91/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc= github.com/dnaeon/go-vcr v1.1.0/go.mod h1:M7tiix8f0r6mKKJ3Yq/kqU1OYf3MnfmBWVbPx/yU9ko= -github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI= github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ= -github.com/docker/cli v20.10.17+incompatible h1:eO2KS7ZFeov5UJeaDmIs1NFEDRf32PaqRpvoEkKBy5M= +github.com/docker/cli v20.10.14+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/cli v20.10.17+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8= github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/docker v1.4.2-0.20180625184442-8e610b2b55bf/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker v20.10.19+incompatible h1:lzEmjivyNHFHMNAFLXORMBXyGIhw/UP4DvJwvyKYq64= -github.com/docker/docker v20.10.19+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v20.10.7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v20.10.17+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= -github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= -github.com/dop251/goja v0.0.0-20200721192441-a695b0cdd498/go.mod h1:Mw6PkjjMXWbTj+nnj4s3QPXq1jaT0s5pC0iFD4+BOAA= -github.com/dop251/goja v0.0.0-20211011172007-d99e4b8cbf48 h1:iZOop7pqsg+56twTopWgwCGxdB5SI2yDO8Ti7eTRliQ= github.com/dop251/goja v0.0.0-20211011172007-d99e4b8cbf48/go.mod h1:R9ET47fwRVRPZnOGvHxxhuZcbrMCuiqOz3Rlrh4KSnk= -github.com/dop251/goja_nodejs v0.0.0-20210225215109-d91c329300e7 h1:tYwu/z8Y0NkkzGEh3z21mSWggMg4LwLRFucLS7TjARg= github.com/dop251/goja_nodejs v0.0.0-20210225215109-d91c329300e7/go.mod h1:hn7BA7c8pLvoGndExHudxTDKZ84Pyvv+90pbBjbTz0Y= github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= -github.com/dvsekhvalnov/jose2go v0.0.0-20200901110807-248326c1351b/go.mod h1:7BvyPhdbLxMXIYTFPLsyJRFMsKmOZnQmzh6Gb+uquuM= github.com/dvsekhvalnov/jose2go v1.5.0 h1:3j8ya4Z4kMCwT5nXIKFSV84YS+HdqSSO0VsTQxaLAeM= github.com/dvsekhvalnov/jose2go v1.5.0/go.mod h1:QsHjhyTlD/lAVqn/NSbVZmSCGeDehTB/mPZadG+mhXU= -github.com/dvyukov/go-fuzz v0.0.0-20200318091601-be3528f3a813 h1:NgO45/5mBLRVfiXerEFzH6ikcZ7DNRPS639xFg3ENzU= -github.com/dvyukov/go-fuzz v0.0.0-20200318091601-be3528f3a813/go.mod h1:11Gm+ccJnvAhCNLlf5+cS9KjtbaD5I5zaZpFMsTHWTw= -github.com/eapache/go-resiliency v1.1.0 h1:1NtRmCAqadE2FN4ZcN6g90TP3uk8cg9rn9eNK2197aU= github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= -github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 h1:YEetp8/yCZMuEPMUDHG0CW/brkkEp8mzqk2+ODEitlw= github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= -github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc= github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= -github.com/eclipse/paho.mqtt.golang v1.2.0 h1:1F8mhG9+aO5/xpdtFkW4SxOJB67ukuDC3t2y2qayIX0= github.com/eclipse/paho.mqtt.golang v1.2.0/go.mod h1:H9keYFcgq3Qr5OUJm/JZI/i6U7joQ8SYLhZwfeOo6Ts= -github.com/edsrzf/mmap-go v0.0.0-20160512033002-935e0e8a636c/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= -github.com/edsrzf/mmap-go v1.0.0 h1:CEBF7HpRnUCSJgGUb5h1Gm7e3VkmVDrR8lvWVLtrOFw= github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= -github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc= -github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ= -github.com/enigmampc/btcutil v1.0.3-0.20200723161021-e2fb6adb2a25 h1:2vLKys4RBU4pn2T/hjXMbvwTr1Cvy5THHrQkbeY9HRk= -github.com/enigmampc/btcutil v1.0.3-0.20200723161021-e2fb6adb2a25/go.mod h1:hTr8+TLQmkUkgcuh3mcr5fjrT9c64ZzsBCdCEC6UppY= github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= @@ -1070,102 +574,59 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.m github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= github.com/envoyproxy/go-control-plane v0.10.1/go.mod h1:AY7fTTXNdv/aJ2O5jwpxAPOWUZ7hQAEvzN5Pf27BkQQ= github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= -github.com/envoyproxy/go-control-plane v0.11.0 h1:jtLewhRR2vMRNnq2ZZUoCjUlgut+Y0+sDDWPOfwOi1o= -github.com/envoyproxy/go-control-plane v0.11.0/go.mod h1:VnHyVMpzcLvCFt9yUz1UnCwHLhwx1WguiVDV7pTG/tI= github.com/envoyproxy/protoc-gen-validate v0.0.14/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/envoyproxy/protoc-gen-validate v0.6.2/go.mod h1:2t7qjJNvHPx8IjnBOzl9E9/baC+qXE/TeeyBRzgJDws= -github.com/envoyproxy/protoc-gen-validate v0.10.0 h1:oIfnZFdC0YhpNNEX+SuIqko4cqqVZeN9IGTrhZje83Y= -github.com/envoyproxy/protoc-gen-validate v0.10.0/go.mod h1:DRjgyB0I43LtJapqN6NiRwroiAU2PaFuvk/vjgh61ss= -github.com/esimonov/ifshort v1.0.2/go.mod h1:yZqNJUrNn20K8Q9n2CrjTKYyVEmX209Hgu+M1LBpeZE= -github.com/esimonov/ifshort v1.0.4 h1:6SID4yGWfRae/M7hkVDVVyppy8q/v9OuxNdmjLQStBA= github.com/esimonov/ifshort v1.0.4/go.mod h1:Pe8zjlRrJ80+q2CxHLfEOfTwxCZ4O+MuhcHcfgNWTk0= -github.com/ethereum/go-ethereum v1.9.25/go.mod h1:vMkFiYLHI4tgPw4k2j4MHKoovchFE8plZ0M9VMk4/oM= -github.com/ethereum/go-ethereum v1.10.17 h1:XEcumY+qSr1cZQaWsQs5Kck3FHB0V2RiMHPdTBJ+oT8= github.com/ethereum/go-ethereum v1.10.17/go.mod h1:Lt5WzjM07XlXc95YzrhosmR4J9Ahd6X2wyEV2SvGhk0= -github.com/ettle/strcase v0.1.1 h1:htFueZyVeE1XNnMEfbqp5r67qAN/4r6ya1ysq8Q+Zcw= github.com/ettle/strcase v0.1.1/go.mod h1:hzDLsPC7/lwKyBOywSHEP89nt2pDgdy+No1NBA9o9VY= github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51/go.mod h1:Yg+htXGokKKdzcwhuNDwVvN+uBxDGXJ7G/VN1d8fa64= -github.com/facebookgo/ensure v0.0.0-20200202191622-63f1cf65ac4c h1:8ISkoahWXwZR41ois5lSJBSVw4D0OV19Ht/JSTzvSv0= -github.com/facebookgo/ensure v0.0.0-20200202191622-63f1cf65ac4c/go.mod h1:Yg+htXGokKKdzcwhuNDwVvN+uBxDGXJ7G/VN1d8fa64= -github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 h1:JWuenKqqX8nojtoVVWjGfOF9635RETekkoH6Cc9SX0A= github.com/facebookgo/stack v0.0.0-20160209184415-751773369052/go.mod h1:UbMTZqLaRiH3MsBH8va0n7s1pQYcu3uTb8G4tygF4Zg= github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870/go.mod h1:5tD+neXqOorC30/tWg0LCSkrqj/AR6gu8yY8/fpw1q0= -github.com/facebookgo/subset v0.0.0-20200203212716-c811ad88dec4 h1:7HZCaLC5+BZpmbhCOZJ293Lz68O7PYrF2EzeiFMwCLk= -github.com/facebookgo/subset v0.0.0-20200203212716-c811ad88dec4/go.mod h1:5tD+neXqOorC30/tWg0LCSkrqj/AR6gu8yY8/fpw1q0= -github.com/fatih/color v1.3.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= github.com/fatih/color v1.12.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= -github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= -github.com/fatih/structtag v1.2.0 h1:/OdNE99OxoI/PqaW/SuSK9uxxT3f/tcSZgon/ssNSx4= github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94= github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/felixge/httpsnoop v1.0.2 h1:+nS9g82KMXccJ/wp0zyRW9ZBHFETmMGtkk+2CTTrW4o= github.com/felixge/httpsnoop v1.0.2/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= -github.com/firefart/nonamedreturns v1.0.4 h1:abzI1p7mAEPYuR4A+VLKn4eNDOycjYo2phmY9sfv40Y= github.com/firefart/nonamedreturns v1.0.4/go.mod h1:TDhe/tjI1BXo48CmYbUduTV7BdIga8MAO/xbKdcVsGI= -github.com/fjl/memsize v0.0.0-20180418122429-ca190fb6ffbc/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= -github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 h1:FtmdgXiUlNeRsoNMFlKLDt+S+6hbjVMEW6RGQ7aUf7c= github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= -github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90 h1:WXb3TSNmHp2vHoCroCIB1foO/yQ36swABL8aOVeDpgg= github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw= github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= -github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db h1:gb2Z18BhTPJPpLQWj4T+rfKHYCHxRHCtRxhKKjRidVw= github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4= -github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8 h1:a9ENSRDFBUPkJ5lCgVZh26+ZbGyoVJG7yb5SSzF5H54= +github.com/franela/goblin v0.0.0-20210519012713-85d372ac71e2/go.mod h1:VzmDKDJVZI3aJmnRI9VjAn9nJ8qPPsN1fqzr9dqInIo= github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20= github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k= +github.com/frankban/quicktest v1.14.2/go.mod h1:mgiwOwqx65TmIk1wJ6Q7wvnVMocbUorkibMOrVTHZps= +github.com/frankban/quicktest v1.14.3/go.mod h1:mgiwOwqx65TmIk1wJ6Q7wvnVMocbUorkibMOrVTHZps= github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY= -github.com/frankban/quicktest v1.14.4/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU= +github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU= github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= -github.com/fullstorydev/grpcurl v1.6.0 h1:p8BB6VZF8O7w6MxGr3KJ9E6EVKaswCevSALK6FBtMzA= github.com/fullstorydev/grpcurl v1.6.0/go.mod h1:ZQ+ayqbKMJNhzLmbpCiurTVlaK2M/3nqZCxaQ2Ze/sM= -github.com/fzipp/gocyclo v0.3.1/go.mod h1:DJHO6AUmbdqj2ET4Z9iArSuwWgYDRryYt2wASxc7x3E= -github.com/fzipp/gocyclo v0.6.0 h1:lsblElZG7d3ALtGMx9fmxeTKZaLLpU8mET09yN4BBLo= github.com/fzipp/gocyclo v0.6.0/go.mod h1:rXPyn8fnlpa0R2csP/31uerbiVBugk5whMdlyaLkLoA= -github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff h1:tY80oXqGNY4FhTFhk+o9oFHGINQ/+vhlm8HFzi6znCI= github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff/go.mod h1:x7DCsMOv1taUwEWCzT4cmDeAkigA5/QCwUodaVOe8Ww= github.com/getkin/kin-openapi v0.53.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4= -github.com/getkin/kin-openapi v0.61.0 h1:6awGqF5nG5zkVpMsAih1QH4VgzS8phTxECUWIFo7zko= github.com/getkin/kin-openapi v0.61.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4= -github.com/getsentry/sentry-go v0.17.0 h1:UustVWnOoDFHBS7IJUB2QK/nB5pap748ZEp0swnQJak= -github.com/getsentry/sentry-go v0.17.0/go.mod h1:B82dxtBvxG0KaPD8/hfSV+VcHD+Lg/xUS4JuQn1P4cM= github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= -github.com/gin-gonic/gin v1.6.3 h1:ahKqKTFpO5KTPHxWZjEdPScmYaGtLo8Y4DMHoEsnp14= github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M= -github.com/gin-gonic/gin v1.7.0 h1:jGB9xAJQ12AIGNB4HguylppmDK1Am9ppF7XnGXXJuoU= -github.com/gin-gonic/gin v1.7.0/go.mod h1:jD2toBW3GZUr5UMcdrwQA10I7RuaFOl/SGeDjXkfUtY= -github.com/glycerine/go-unsnap-stream v0.0.0-20180323001048-9f0cb55181dd h1:r04MMPyLHj/QwZuMJ5+7tJcBr1AQjpiAK/rZWRrQT7o= +github.com/gin-gonic/gin v1.8.1 h1:4+fr/el88TOO3ewCmQr8cx/CtZ/umlIRIs5M4NTNjf8= github.com/glycerine/go-unsnap-stream v0.0.0-20180323001048-9f0cb55181dd/go.mod h1:/20jfyN9Y5QPEAprSgKAUr+glWDY39ZiUEAYOEv5dsE= -github.com/glycerine/goconvey v0.0.0-20190410193231-58a59202ab31 h1:gclg6gY70GLy3PbkQ1AERPfmLMMagS60DKF78eWwLn8= github.com/glycerine/goconvey v0.0.0-20190410193231-58a59202ab31/go.mod h1:Ogl1Tioa0aV7gstGFO7KhffUsb9M4ydbEbbxpcEDc24= github.com/go-chi/chi/v5 v5.0.0/go.mod h1:BBug9lr0cqtdAhsu6R4AAdvufI0/XBzAQSsUqJpoZOs= -github.com/go-chi/chi/v5 v5.0.7 h1:rDTPXLDHGATaeHvVlLcR4Qe0zftYethFucbjVQ1PxU8= -github.com/go-chi/chi/v5 v5.0.7/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= -github.com/go-critic/go-critic v0.5.6/go.mod h1:cVjj0DfqewQVIlIAGexPCaGaZDAqGE29PYDDADIVNEo= -github.com/go-critic/go-critic v0.6.5 h1:fDaR/5GWURljXwF8Eh31T2GZNz9X4jeboS912mWF8Uo= -github.com/go-critic/go-critic v0.6.5/go.mod h1:ezfP/Lh7MA6dBNn4c6ab5ALv3sKnZVLx37tr00uuaOY= -github.com/go-git/gcfg v1.5.0 h1:Q5ViNfGF8zFgyJWPqYwA7qGFoMTEiBmdlkcfRmpIMa4= -github.com/go-git/gcfg v1.5.0/go.mod h1:5m20vg6GwYabIxaOonVkTdrILxQMpEShl1xiMF4ua+E= -github.com/go-git/go-billy/v5 v5.4.0 h1:Vaw7LaSTRJOUric7pe4vnzBSgyuf2KrLsu2Y4ZpQBDE= -github.com/go-git/go-billy/v5 v5.4.0/go.mod h1:vjbugF6Fz7JIflbVpl1hJsGjSHNltrSw45YK/ukIvQg= -github.com/go-git/go-git/v5 v5.5.2 h1:v8lgZa5k9ylUw+OR/roJHTxR4QItsNFI5nKtAXFuynw= -github.com/go-git/go-git/v5 v5.5.2/go.mod h1:BE5hUJ5yaV2YMxhmaP4l6RBQ08kMxKSPD4BlxtH7OjI= -github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1 h1:QbL/5oDUmRBzO9/Z7Seo6zf912W/a6Sr4Eu0G/3Jho0= +github.com/go-critic/go-critic v0.6.3/go.mod h1:c6b3ZP1MQ7o6lPR7Rv3lEf7pYQUmAcx8ABHgdZCQt/k= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4 h1:WtGNWLvXpe6ZudgnXrq0barxBImvnnJoMEhXAzcbM0I= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= @@ -1173,110 +634,75 @@ github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgO github.com/go-kit/kit v0.12.0 h1:e4o3o3IsBfAKQh5Qbbiqyfu97Ku7jrO/JbohvztANh4= github.com/go-kit/kit v0.12.0/go.mod h1:lHd+EkCZPIwYItmGDDRdhinkzX2A1sj+M9biaEaizzs= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= +github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU= github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= +github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi4= github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= -github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= -github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= -github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= -github.com/go-ole/go-ole v1.2.1 h1:2lOsA72HgjxAuMlKpFiCbHTvu44PIVkZ5hqm3RSdI/E= github.com/go-ole/go-ole v1.2.1/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dTyBNF8= -github.com/go-ole/go-ole v1.2.5 h1:t4MGB5xEDZvXI+0rMjjsfBsD7yAgp/s9ZDkL1JndXwY= -github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= -github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY= +github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= -github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= -github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A= github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8= github.com/go-playground/locales v0.14.0 h1:u50s323jtVGugKlcYeyzC0etD1HifMjqmJqb8WugfUU= -github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs= github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA= github.com/go-playground/universal-translator v0.18.0 h1:82dyy6p4OuJq4/CByFNOn/jYrnRPArHwAcmLoJZxyho= -github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA= -github.com/go-playground/validator/v10 v10.2.0 h1:KgJ0snyC2R9VXYN2rneOtQcw5aHQB1Vv0sFl1UcHBOY= github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI= -github.com/go-playground/validator/v10 v10.4.1 h1:pH2c5ADXtd66mxoE0Zm9SUhxE20r7aM3F26W0hOn+GE= -github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4= -github.com/go-redis/redis v6.15.8+incompatible h1:BKZuG6mCnRj5AOaWJXoCgf6rqTYnYJLe4en2hxT7r9o= +github.com/go-playground/validator/v10 v10.11.1 h1:prmOlTVv+YjZjmRmNSF3VmspqJIxJWXmqUsHwfTRRkQ= github.com/go-redis/redis v6.15.8+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA= -github.com/go-sourcemap/sourcemap v2.1.2+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg= -github.com/go-sourcemap/sourcemap v2.1.3+incompatible h1:W1iEw64niKVGogNgBN3ePyLFfuisuzeidWPMPWmECqU= github.com/go-sourcemap/sourcemap v2.1.3+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg= github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= -github.com/go-sql-driver/mysql v1.4.1 h1:g24URVg0OFbNUTx9qqY1IRZ9D9z3iPyi5zKhQZpNwpA= github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= -github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs= github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= -github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk= +github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= -github.com/go-toolsmith/astcast v1.0.0 h1:JojxlmI6STnFVG9yOImLeGREv8W2ocNUM+iOhR6jE7g= github.com/go-toolsmith/astcast v1.0.0/go.mod h1:mt2OdQTeAQcY4DQgPSArJjHCcOwlX+Wl/kwN+LbLGQ4= github.com/go-toolsmith/astcopy v1.0.0/go.mod h1:vrgyG+5Bxrnz4MZWPF+pI4R8h3qKRjjyvV/DSez4WVQ= -github.com/go-toolsmith/astcopy v1.0.2 h1:YnWf5Rnh1hUudj11kei53kI57quN/VH6Hp1n+erozn0= -github.com/go-toolsmith/astcopy v1.0.2/go.mod h1:4TcEdbElGc9twQEYpVo/aieIXfHhiuLh4aLAck6dO7Y= github.com/go-toolsmith/astequal v1.0.0/go.mod h1:H+xSiq0+LtiDC11+h1G32h7Of5O3CYFJ99GVbS5lDKY= -github.com/go-toolsmith/astequal v1.0.3 h1:+LVdyRatFS+XO78SGV4I3TCEA0AC7fKEGma+fH+674o= -github.com/go-toolsmith/astequal v1.0.3/go.mod h1:9Ai4UglvtR+4up+bAD4+hCj7iTo4m/OXVTSLnCyTAx4= -github.com/go-toolsmith/astfmt v1.0.0 h1:A0vDDXt+vsvLEdbMFJAUBI/uTbRw1ffOPnxsILnFL6k= +github.com/go-toolsmith/astequal v1.0.1/go.mod h1:4oGA3EZXTVItV/ipGiOx7NWkY5veFfcsOJVS2YxltLw= github.com/go-toolsmith/astfmt v1.0.0/go.mod h1:cnWmsOAuq4jJY6Ct5YWlVLmcmLMn1JUPuQIHCY7CJDw= -github.com/go-toolsmith/astinfo v0.0.0-20180906194353-9809ff7efb21 h1:wP6mXeB2V/d1P1K7bZ5vDUO3YqEzcvOREOxZPEu3gVI= -github.com/go-toolsmith/astinfo v0.0.0-20180906194353-9809ff7efb21/go.mod h1:dDStQCHtmZpYOmjRP/8gHHnCCch3Zz3oEgCdZVdtweU= -github.com/go-toolsmith/astp v1.0.0 h1:alXE75TXgcmupDsMK1fRAy0YUzLzqPVvBKoyWV+KPXg= github.com/go-toolsmith/astp v1.0.0/go.mod h1:RSyrtpVlfTFGDYRbrjyWP1pYu//tSFcvdYrA8meBmLI= -github.com/go-toolsmith/pkgload v1.0.0 h1:4DFWWMXVfbcN5So1sBNW9+yeiMqLFGl1wFLTL5R0Tgg= -github.com/go-toolsmith/pkgload v1.0.0/go.mod h1:5eFArkbO80v7Z0kdngIxsRXRMTaX4Ilcwuh3clNrQJc= -github.com/go-toolsmith/strparse v1.0.0 h1:Vcw78DnpCAKlM20kSbAyO4mPfJn/lyYA4BJUDxe2Jb4= +github.com/go-toolsmith/pkgload v1.0.2-0.20220101231613-e814995d17c5/go.mod h1:3NAwwmD4uY/yggRxoEjk/S00MIV3A+H7rrE3i87eYxM= github.com/go-toolsmith/strparse v1.0.0/go.mod h1:YI2nUKP9YGZnL/L1/DLFBfixrcjslWct4wyljWhSRy8= -github.com/go-toolsmith/typep v1.0.0/go.mod h1:JSQCQMUPdRlMZFswiq3TGpNp1GMktqkR2Ns5AIQkATU= -github.com/go-toolsmith/typep v1.0.2 h1:8xdsa1+FSIH/RhEkgnD1j2CJOy5mNllW1Q9tRiYwvlk= github.com/go-toolsmith/typep v1.0.2/go.mod h1:JSQCQMUPdRlMZFswiq3TGpNp1GMktqkR2Ns5AIQkATU= -github.com/go-xmlfmt/xmlfmt v0.0.0-20191208150333-d5b6f63a941b h1:khEcpUM4yFcxg4/FHQWkvVRmgijNXRfzkIDHh23ggEo= github.com/go-xmlfmt/xmlfmt v0.0.0-20191208150333-d5b6f63a941b/go.mod h1:aUCEOzzezBEjDBbFBoSiya/gduyIiWYRP6CnSFIV8AM= -github.com/go-zookeeper/zk v1.0.2 h1:4mx0EYENAdX/B/rbunjlt5+4RTA/a9SMHBRuSKdGxPM= github.com/go-zookeeper/zk v1.0.2/go.mod h1:nOB03cncLtlp4t+UAkGSV+9beXP/akpekBwL+UX1Qcw= -github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee h1:s+21KNqlpePfkah2I+gwHF8xmJWRjooY+5248k6m4A0= github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo= github.com/gobwas/pool v0.2.0 h1:QEmUOlnSjWtnpRGHF3SauEiOsy82Cup83Vf2LcMlnc8= github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= -github.com/gobwas/ws v1.0.2 h1:CoAavW/wd/kulfZmSIBt6p24n4j7tHgNVCjsfHVNUbo= github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM= +github.com/gobwas/ws v1.1.0 h1:7RFti/xnNkMJnrK7D1yQ/iCIB5OrrY/54/H930kIbHA= +github.com/goccy/go-json v0.9.11 h1:/pAaQDLHEoCq/5FFmSKBswWmK6H0e8g4159Kc/X/nqk= github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 h1:ZpnhV/YsD2/4cESfV5+Hoeu/iUR3ruzNvZ+yQfO03a0= github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4= -github.com/godbus/dbus/v5 v5.0.4 h1:9349emZab16e7zQvpmsbtjc18ykshndd8y2PG3sgJbA= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/gofrs/flock v0.8.1 h1:+gYjHKf32LDeiEEFhQaotPbLuUXjY5ZqxKgXy7n59aw= +github.com/godbus/dbus/v5 v5.0.6/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gofrs/flock v0.8.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= github.com/gofrs/uuid v3.3.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= +github.com/gofrs/uuid v4.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gofrs/uuid v4.3.0+incompatible h1:CaSVZxm5B+7o45rtab4jC2G37WGYX1zQfuU2i6DSvnc= -github.com/gofrs/uuid v4.3.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= -github.com/gogo/gateway v1.1.0 h1:u0SuhL9+Il+UbjM9VIE3ntfRujKbvVpFvNB4HbjeVQ0= -github.com/gogo/gateway v1.1.0/go.mod h1:S7rR8FRQyG3QFESeSv4l2WnsyzlCLG0CzBbUUo/mbic= github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= github.com/gogo/googleapis v1.4.1-0.20201022092350-68b0159b7869/go.mod h1:5YRNX2z1oM5gXdAkurHa942MDgEJyk02w4OecKY87+c= github.com/gogo/googleapis v1.4.1 h1:1Yx4Myt7BxzvUr5ldGSbwYiZG6t9wGBZ+8/fX3Wvtq0= github.com/gogo/googleapis v1.4.1/go.mod h1:2lpHqI5OcWCtVElxXnPt+s8oJvMpySlOyM6xDCrzib4= -github.com/golang-jwt/jwt/v4 v4.3.0 h1:kHL1vqdqWNfATmA0FNMdmZNMyZI1U6O31X4rlIPoBog= +github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= github.com/golang-jwt/jwt/v4 v4.3.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= -github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g= +github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= +github.com/golang-sql/sqlexp v0.0.0-20170517235910-f1bb20e5a188/go.mod h1:vXjM/+wXQnTPR4KqTKDgJukSZ6amVRtWMPEjE6sQoK8= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= -github.com/golang/geo v0.0.0-20190916061304-5b978397cfec h1:lJwO/92dFXWeXOZdoGXgptLmNLwynMSHUmU6besqtiw= github.com/golang/geo v0.0.0-20190916061304-5b978397cfec/go.mod h1:QZ0nwyI2jOfgRAoBvP+ab5aRr7c9x7lhGEJrKvBwjWI= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/glog v1.1.1 h1:jxpi2eWoU84wbX9iIEyAeeoac3FLuifZpY9tcNUD9kw= github.com/golang/glog v1.1.1/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/rLQ= github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -1315,43 +741,26 @@ github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/golang/snappy v0.0.3-0.20201103224600-674baa8c7fc3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 h1:23T5iq8rbUYlhpt5DB4XJkc6BU31uODLD1o1gKvZmD0= github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2/go.mod h1:k9Qvh+8juN+UKMCS/3jFtGICgW8O96FVaZsaxdzDkR4= -github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a h1:w8hkcTqaFpzKqonE9uMCefW1WDie15eSP/4MssdenaM= github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a/go.mod h1:ryS0uhF+x9jgbj/N71xsEqODy9BN81/GonCZiOzirOk= -github.com/golangci/go-misc v0.0.0-20180628070357-927a3d87b613/go.mod h1:SyvUF2NxV+sN8upjjeVYr5W7tyxaT1JVtvhKhOn2ii8= -github.com/golangci/go-misc v0.0.0-20220329215616-d24fe342adfe h1:6RGUuS7EGotKx6J5HIP8ZtyMdiDscjMLfRBSPuzVVeo= github.com/golangci/go-misc v0.0.0-20220329215616-d24fe342adfe/go.mod h1:gjqyPShc/m8pEMpk0a3SeagVb0kaqvhscv+i9jI5ZhQ= github.com/golangci/gofmt v0.0.0-20190930125516-244bba706f1a/go.mod h1:9qCChq59u/eW8im404Q2WWTrnBUQKjpNYKMbU4M7EFU= -github.com/golangci/gofmt v0.0.0-20220901101216-f2edd75033f2 h1:amWTbTGqOZ71ruzrdA+Nx5WA3tV1N0goTspwmKCQvBY= -github.com/golangci/gofmt v0.0.0-20220901101216-f2edd75033f2/go.mod h1:9wOXstvyDRshQ9LggQuzBCGysxs3b6Uo/1MvYCR2NMs= -github.com/golangci/golangci-lint v1.42.1/go.mod h1:MuInrVlgg2jq4do6XI1jbkErbVHVbwdrLLtGv6p2wPI= -github.com/golangci/golangci-lint v1.50.1 h1:C829clMcZXEORakZlwpk7M4iDw2XiwxxKaG504SZ9zY= -github.com/golangci/golangci-lint v1.50.1/go.mod h1:AQjHBopYS//oB8xs0y0M/dtxdKHkdhl0RvmjUct0/4w= +github.com/golangci/golangci-lint v1.47.0/go.mod h1:3TZhfF5KolbIkXYjUFvER6G9CoxzLEaafr/u/QI1S5A= github.com/golangci/lint-1 v0.0.0-20181222135242-d2cdd8c08219/go.mod h1:/X8TswGSh1pIozq4ZwCfxS0WA5JGXguxk94ar/4c87Y= -github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0 h1:MfyDlzVjl1hoaPzPD4Gpb/QgoRfSBR0jdhwGyAWwMSA= github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0/go.mod h1:66R6K6P6VWk9I95jvqGxkqJxVWGFy9XlDwLwVz1RCFg= -github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca h1:kNY3/svz5T29MYHubXix4aDDuE3RWHkPvopM/EDv/MA= github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca/go.mod h1:tvlJhZqDe4LMs4ZHD0oMUlt9G2LWuDGoisJTBzLMV9o= -github.com/golangci/misspell v0.3.5 h1:pLzmVdl3VxTOncgzHcvLOKirdvcx/TydsClUQXTehjo= github.com/golangci/misspell v0.3.5/go.mod h1:dEbvlSfYbMQDtrpRMQU675gSDLDNa8sCPPChZ7PhiVA= -github.com/golangci/revgrep v0.0.0-20210208091834-cd28932614b5/go.mod h1:LK+zW4MpyytAWQRz0M4xnzEk50lSvqDQKfx304apFkY= -github.com/golangci/revgrep v0.0.0-20220804021717-745bb2f7c2e6 h1:DIPQnGy2Gv2FSA4B/hh8Q7xx3B7AIDk3DAMeHclH1vQ= -github.com/golangci/revgrep v0.0.0-20220804021717-745bb2f7c2e6/go.mod h1:0AKcRCkMoKvUvlf89F6O7H2LYdhr1zBh736mBItOdRs= -github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4 h1:zwtduBRr5SSWhqsYNgcuWO2kFlpdOZbP0+yRjmvPGys= +github.com/golangci/revgrep v0.0.0-20210930125155-c22e5001d4f2/go.mod h1:LK+zW4MpyytAWQRz0M4xnzEk50lSvqDQKfx304apFkY= github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4/go.mod h1:Izgrg8RkN3rCIMLGE9CyYmU9pY2Jer6DgANEnZ/L/cQ= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU= github.com/google/btree v1.1.2/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4= github.com/google/certificate-transparency-go v1.0.21/go.mod h1:QeJfpSbVSfYc7RgB3gJFj9cbuQMMchQxrWXz8Ruopmg= -github.com/google/certificate-transparency-go v1.1.1 h1:6JHXZhXEvilMcTjR4MGZn5KV0IRkcFl4CJx5iHVhjFE= github.com/google/certificate-transparency-go v1.1.1/go.mod h1:FDKqPvSXawb2ecErVRrD+nfy23RCzyl7eqVCEmlT1Zs= -github.com/google/flatbuffers v1.11.0 h1:O7CEyB8Cb3/DmtxODGtLHcEvpr81Jm5qLg/hsHnxA2A= github.com/google/flatbuffers v1.11.0/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= @@ -1380,7 +789,6 @@ github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIG github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= github.com/google/martian/v3 v3.3.2 h1:IqNFLAmvJOgVlpdEBiQbDc2EwKW77amAycfTuWKdfvw= -github.com/google/martian/v3 v3.3.2/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= github.com/google/orderedcode v0.0.1 h1:UzfcAexk9Vhv8+9pNOgRu41f16lHq725vPwnSeiG/Us= github.com/google/orderedcode v0.0.1/go.mod h1:iVyU4/qPKHY5h/wSd6rZZCDcLJNxiWO6dvsYES2Sb20= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= @@ -1396,17 +804,14 @@ github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJYCmNdQXq6neHJOYx3V6jnqNEec= github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/renameio v0.1.0 h1:GOZbcHa3HfsPKPlmyPyN2KEohoMXOhdMbHrvbpl2QaA= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/s2a-go v0.1.3 h1:FAgZmpLl/SXurPEZyCMPBIiiYeTbqfjlbdnCNTAkbGE= github.com/google/s2a-go v0.1.3/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= -github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4= github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ= -github.com/google/trillian v1.3.11 h1:pPzJPkK06mvXId1LHEAJxIegGgHzzp/FUnycPYfoCMI= github.com/google/trillian v1.3.11/go.mod h1:0tPraVHrSDkA3BO6vKX67zgLXs6SsOAbHEivX+9mPgw= github.com/google/uuid v0.0.0-20161128191214-064e2069ce9c/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -1431,21 +836,13 @@ github.com/googleapis/gax-go/v2 v2.5.1/go.mod h1:h6B0KMMFNtI2ddbGJn3T3ZbwkeT6yqE github.com/googleapis/gax-go/v2 v2.6.0/go.mod h1:1mjbznJAPHFpesgE5ucqfYEscaz5kMdcIDwU/6+DDoY= github.com/googleapis/gax-go/v2 v2.8.0 h1:UBtEZqx1bjXtOQ5BVTkuYghXrr3N4V123VKJK67vJZc= github.com/googleapis/gax-go/v2 v2.8.0/go.mod h1:4orTrqY6hXxxaUL4LHIPl6lGo8vAE38/qKbhSAKP6QI= -github.com/googleapis/go-type-adapters v1.0.0 h1:9XdMn+d/G57qq1s8dNc5IesGCXHf6V2HZ2JwRxfA2tA= github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4= -github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8 h1:tlyzajkF3030q6M8SvmJSemC9DTHL/xaMa18b65+JM4= github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= -github.com/gookit/color v1.4.2 h1:tXy44JFSFkKnELV6WaMo/lLfu/meqITX3iAV52do7lk= -github.com/gookit/color v1.4.2/go.mod h1:fqRyamkC1W8uxl+lxCQxOT09l/vYfZ+QeiX3rKQHCoQ= -github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= +github.com/gookit/color v1.5.1/go.mod h1:wZFzea4X8qN6vHOSP2apMb4/+w/orMznEzYsIHPaqKM= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gordonklaus/ineffassign v0.0.0-20200309095847-7953dde2c7bf/go.mod h1:cuNKsD1zp2v6XfE/orVX2QE1LC+i254ceGcVeDT3pTU= -github.com/gordonklaus/ineffassign v0.0.0-20210225214923-2e10b2664254/go.mod h1:M9mZEtGIsR1oDaZagNPNG9iq9n2HrhZ17dsXk73V3Lw= -github.com/gordonklaus/ineffassign v0.0.0-20210914165742-4cc7213b9bc8 h1:PVRE9d4AQKmbelZ7emNig1+NT27DUmKZn5qXxfio54U= github.com/gordonklaus/ineffassign v0.0.0-20210914165742-4cc7213b9bc8/go.mod h1:Qcp2HIAYhR7mNUVSIxZww3Guk4it82ghYcEXIAk+QT0= -github.com/gorhill/cronexpr v0.0.0-20180427100037-88b0669f7d75 h1:f0n1xnMSmBLzVfsMMvriDyA75NB/oBgILX2GcHXIQzY= github.com/gorhill/cronexpr v0.0.0-20180427100037-88b0669f7d75/go.mod h1:g2644b03hfBX9Ov0ZBDgXXens4rxSxmqFBbhvKv2yVA= -github.com/gorilla/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8= github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= github.com/gorilla/handlers v1.5.1 h1:9lRY6j8DEeeBT10CvO9hGW0gmky0BprnvDI5vfhUHH4= github.com/gorilla/handlers v1.5.1/go.mod h1:t8XrUpc4KVXb7HGyJ4/cEnwQiaxrX/hz1Zv/4g96P1Q= @@ -1454,8 +851,6 @@ github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2z github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= -github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= -github.com/gorilla/websocket v1.4.1-0.20190629185528-ae1634f6a989/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= @@ -1464,38 +859,25 @@ github.com/gostaticanalysis/analysisutil v0.0.0-20190318220348-4088753ea4d3/go.m github.com/gostaticanalysis/analysisutil v0.0.3/go.mod h1:eEOZF4jCKGi+aprrirO9e7WKB3beBRtWgqGunKl6pKE= github.com/gostaticanalysis/analysisutil v0.1.0/go.mod h1:dMhHRU9KTiDcuLGdy87/2gTR8WruwYZrKdRq9m1O6uw= github.com/gostaticanalysis/analysisutil v0.4.1/go.mod h1:18U/DLpRgIUd459wGxVHE0fRgmo1UgHDcbw7F5idXu0= -github.com/gostaticanalysis/analysisutil v0.7.1 h1:ZMCjoue3DtDWQ5WyU16YbjbQEQ3VuzwxALrpYd+HeKk= github.com/gostaticanalysis/analysisutil v0.7.1/go.mod h1:v21E3hY37WKMGSnbsw2S/ojApNWb6C1//mXO48CXbVc= github.com/gostaticanalysis/comment v1.3.0/go.mod h1:xMicKDx7XRXYdVwY9f9wQpDJVnqWxw9wCauCMKp+IBI= github.com/gostaticanalysis/comment v1.4.1/go.mod h1:ih6ZxzTHLdadaiSnF5WY3dxUoXfXAlTaRzuaNDlSado= -github.com/gostaticanalysis/comment v1.4.2 h1:hlnx5+S2fY9Zo9ePo4AhgYsYHbM2+eAv8m/s1JiCd6Q= github.com/gostaticanalysis/comment v1.4.2/go.mod h1:KLUTGDv6HOCotCH8h2erHKmpci2ZoR8VPu34YA2uzdM= -github.com/gostaticanalysis/forcetypeassert v0.0.0-20200621232751-01d4955beaa5/go.mod h1:qZEedyP/sY1lTGV1uJ3VhWZ2mqag3IkWsDHVbplHXak= -github.com/gostaticanalysis/forcetypeassert v0.1.0 h1:6eUflI3DiGusXGK6X7cCcIgVCpZ2CiZ1Q7jl6ZxNV70= github.com/gostaticanalysis/forcetypeassert v0.1.0/go.mod h1:qZEedyP/sY1lTGV1uJ3VhWZ2mqag3IkWsDHVbplHXak= -github.com/gostaticanalysis/nilerr v0.1.1 h1:ThE+hJP0fEp4zWLkWHWcRyI2Od0p7DlgYG3Uqrmrcpk= github.com/gostaticanalysis/nilerr v0.1.1/go.mod h1:wZYb6YI5YAxxq0i1+VJbY0s2YONW0HU0GPE3+5PWN4A= -github.com/gotestyourself/gotestyourself v2.2.0+incompatible h1:AQwinXlbQR2HvPjQZOmDhRqsv5mZf+Jb1RnSLxcqZcI= +github.com/gostaticanalysis/testutil v0.3.1-0.20210208050101-bfb5c8eec0e4/go.mod h1:D+FIZ+7OahH3ePw/izIEeH5I06eKs1IKI4Xr64/Am3M= +github.com/gostaticanalysis/testutil v0.4.0/go.mod h1:bLIoPefWXrRi/ssLFWX1dx7Repi5x3CuviD3dgAZaBU= github.com/gotestyourself/gotestyourself v2.2.0+incompatible/go.mod h1:zZKM6oeNM8k+FRljX1mnzVYeS8wiGgQyvST1/GafPbY= -github.com/graph-gophers/graphql-go v0.0.0-20191115155744-f33e81362277/go.mod h1:9CQHMSxwO4MprSdzoIEobiHpoLtHm77vfxsvsIN5Vuc= -github.com/graph-gophers/graphql-go v1.3.0 h1:Eb9x/q6MFpCLz7jBCiP/WTxjSDrYLR1QY41SORZyNJ0= github.com/graph-gophers/graphql-go v1.3.0/go.mod h1:9CQHMSxwO4MprSdzoIEobiHpoLtHm77vfxsvsIN5Vuc= -github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 h1:+ngKgrYPPJrOjhax5N+uePQ0Fh1Z7PheYoUI/0nzkPA= github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= -github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= -github.com/grpc-ecosystem/go-grpc-middleware v1.2.1/go.mod h1:EaizFBKfUKtMIF5iaDEhniwNedqGo9FuLFzppDr3uwI= github.com/grpc-ecosystem/go-grpc-middleware v1.2.2/go.mod h1:EaizFBKfUKtMIF5iaDEhniwNedqGo9FuLFzppDr3uwI= github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y= github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 h1:UH//fgunKIs4JdUbpDl1VZCDaL56wXCB/5+wF6uHfaI= github.com/grpc-ecosystem/go-grpc-middleware v1.4.0/go.mod h1:g5qyo/la0ALbONm6Vbp88Yd8NsDy6rZz+RcrMPxvld8= -github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= -github.com/grpc-ecosystem/grpc-gateway v1.8.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= -github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.12.1/go.mod h1:8XEsbTttt/W+VvjtQhLACqCisSPWTxCZ7sBRjU6iH9c= -github.com/grpc-ecosystem/grpc-gateway v1.14.7/go.mod h1:oYZKL012gGh6LMyg/xA7Q2yq6j8bu0wa+9w14EEthWU= github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms= @@ -1507,21 +889,13 @@ github.com/gtank/merlin v0.1.1 h1:eQ90iG7K9pOhtereWsmyRJ6RAwcP4tHTDBHXNg+u5is= github.com/gtank/merlin v0.1.1/go.mod h1:T86dnYJhcGOh5BjZFCJWTDeTK7XW8uE+E21Cy/bIQ+s= github.com/gtank/ristretto255 v0.1.2 h1:JEqUCPA1NvLq5DwYtuzigd7ss8fwbYay9fi4/5uMzcc= github.com/gtank/ristretto255 v0.1.2/go.mod h1:Ph5OpO6c7xKUGROZfWVLiJf9icMDwUeIvY4OmlYW69o= -github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE= +github.com/hashicorp/consul/api v1.10.1/go.mod h1:XjsvQN+RJGWI2TWy1/kqaE16HrR2J/FWgkYjdZQsX9M= github.com/hashicorp/consul/api v1.11.0/go.mod h1:XjsvQN+RJGWI2TWy1/kqaE16HrR2J/FWgkYjdZQsX9M= github.com/hashicorp/consul/api v1.12.0/go.mod h1:6pVBMo0ebnYdt2S3H87XhekM/HHrUoTD2XXb/VrZVy0= -github.com/hashicorp/consul/api v1.20.0 h1:9IHTjNVSZ7MIwjlW3N3a7iGiykCMDpxZu8jsxFJh0yc= -github.com/hashicorp/consul/api v1.20.0/go.mod h1:nR64eD44KQ59Of/ECwt2vUmIK2DKsDzAwTmwmLl8Wpo= -github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= -github.com/hashicorp/consul/sdk v0.3.0 h1:UOxjlb4xVNF93jak1mzzoBatyFju9nrkxpVwIp/QqxQ= github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= -github.com/hashicorp/consul/sdk v0.8.0 h1:OJtKBtEjboEZvG6AOUdh4Z1Zbyu0WcxQ0qatRrZHTVU= github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= -github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= -github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= -github.com/hashicorp/go-bexpr v0.1.10 h1:9kuI5PFotCboP3dkDYFr/wi0gg0QVbSNz5oFRpxn4uE= github.com/hashicorp/go-bexpr v0.1.10/go.mod h1:oxlubA2vC/gFVfX1A6JGp7ls7uCDlfJn732ehYYg+g0= github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= @@ -1530,37 +904,30 @@ github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/S github.com/hashicorp/go-getter v1.7.1 h1:SWiSWN/42qdpR0MdhaOc/bLR48PLuP1ZQtYLRlM69uY= github.com/hashicorp/go-getter v1.7.1/go.mod h1:W7TalhMmbPmsSMdNjD0ZskARur/9GJ17cfHTRtXV744= github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= +github.com/hashicorp/go-hclog v0.16.2/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= github.com/hashicorp/go-hclog v1.0.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= -github.com/hashicorp/go-hclog v1.2.0 h1:La19f8d7WIlm4ogzNHB0JGqs5AUDAZ2UfCY4sJXcJdM= github.com/hashicorp/go-hclog v1.2.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc= github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= -github.com/hashicorp/go-msgpack v0.5.3 h1:zKjpN5BK/P5lMYrLmBHdBULWbJ0XpYR+7NGzqkZzoD4= github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA= -github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= -github.com/hashicorp/go-retryablehttp v0.5.3 h1:QlWt0KvWT0lq8MFppF9tsJGF+ynG7ztc2KIPhzRGk7s= github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= -github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc= github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= github.com/hashicorp/go-safetemp v1.0.0 h1:2HR189eFNrjHQyENnQMMpCiBAsRxzbTMIgBhEyExpmo= github.com/hashicorp/go-safetemp v1.0.0/go.mod h1:oaerMy3BhqiTbVye6QuFhFtIceqFoDHxNAB65b+Rj1I= -github.com/hashicorp/go-sockaddr v1.0.0 h1:GeH6tui99pF4NJgfnhp+L6+FfobzVW3Ah46sLo0ICXs= github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= -github.com/hashicorp/go-syslog v1.0.0 h1:KaodqZuhUoZereWVIYmpUgZysurB1kBLX2j0MwMrUAE= github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.2 h1:cfejS+Tpcp13yd5nYHWDI6qVCny6wyX2Mt5SGur2IGE= -github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +github.com/hashicorp/go-version v1.2.1/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= -github.com/hashicorp/go.net v0.0.1 h1:sNCoNyDEvN1xa+X0baata4RdcpKwcMS6DH+xwfqPgjw= github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= @@ -1569,117 +936,71 @@ github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d h1:dg1dEPuW github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -github.com/hashicorp/logutils v1.0.0 h1:dLEQVugN8vlakKOUE3ihGLTZJRB4j+M2cdTm/ORI65Y= github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= -github.com/hashicorp/mdns v1.0.0 h1:WhIgCr5a7AaVH6jPUwjtRuuE7/RDufnUvzIr48smyxs= github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= github.com/hashicorp/mdns v1.0.1/go.mod h1:4gW7WsVCke5TE7EPeYliwHlRUyBtfCwuFwuMg2DmyNY= -github.com/hashicorp/mdns v1.0.4 h1:sY0CMhFmjIPDMlTB+HfymFHCaYLhgifZ0QhjaYKD/UQ= github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc= -github.com/hashicorp/memberlist v0.1.3 h1:EmmoJme1matNzb+hMpDuR/0sbJSUisxyqBGG676r31M= github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= github.com/hashicorp/memberlist v0.2.2/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= -github.com/hashicorp/memberlist v0.3.0 h1:8+567mCcFDnS5ADl7lrpxPMWiFCElyUEeW0gtj34fMA= github.com/hashicorp/memberlist v0.3.0/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= github.com/hashicorp/serf v0.9.5/go.mod h1:UWDWwZeL5cuWDJdl0C6wrvrUwEqtQ4ZKBKKENpqIUyk= github.com/hashicorp/serf v0.9.6/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4= -github.com/hashicorp/serf v0.10.1 h1:Z1H2J60yRKvfDYAOZLd2MU0ND4AH/WDz7xYHDWQsIPY= -github.com/hashicorp/serf v0.10.1/go.mod h1:yL2t6BqATOLGc5HF7qbFkTfXoPIY0WZdWHfEvMqbG+4= -github.com/hdevalence/ed25519consensus v0.0.0-20210204194344-59a8610d2b87/go.mod h1:XGsKKeXxeRr95aEOgipvluMPlgjr7dGlk9ZTWOjcUcg= +github.com/hashicorp/serf v0.9.7/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4= github.com/hdevalence/ed25519consensus v0.1.0 h1:jtBwzzcHuTmFrQN6xQZn6CQEO/V9f7HsjsjeEZ6auqU= github.com/hdevalence/ed25519consensus v0.1.0/go.mod h1:w3BHWjwJbFU29IRHL1Iqkw3sus+7FctEyM4RqDxYNzo= -github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM= github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg= -github.com/holiman/bloomfilter/v2 v2.0.3 h1:73e0e/V0tCydx14a0SCYS/EWCxgwLZ18CZcZKVu0fao= github.com/holiman/bloomfilter/v2 v2.0.3/go.mod h1:zpoh+gs7qcpqrHr3dB55AMiJwo0iURXE7ZOP9L9hSkA= -github.com/holiman/uint256 v1.1.1/go.mod h1:y4ga/t+u+Xwd7CpDgZESaRcWy0I7XMlTMA25ApIH5Jw= -github.com/holiman/uint256 v1.2.0 h1:gpSYcPLWGv4sG43I2mVLiDZCNDh/EpGjSk8tmtxitHM= github.com/holiman/uint256 v1.2.0/go.mod h1:y4ga/t+u+Xwd7CpDgZESaRcWy0I7XMlTMA25ApIH5Jw= -github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/huandu/go-assert v1.1.5 h1:fjemmA7sSfYHJD7CUqs9qTwwfdNAx7/j2/ZlHXzNB3c= github.com/huandu/go-assert v1.1.5/go.mod h1:yOLvuqZwmcHIC5rIzrBhT7D3Q9c3GFnd0JrPVhn/06U= github.com/huandu/skiplist v1.2.0 h1:gox56QD77HzSC0w+Ws3MH3iie755GBJU1OER3h5VsYw= github.com/huandu/skiplist v1.2.0/go.mod h1:7v3iFjLcSAzO4fN5B8dvebvo/qsfumiLiDXMrPiHF9w= github.com/huandu/xstrings v1.0.0/go.mod h1:4qWG/gcEcfX4z/mBDHJ++3ReCw9ibxbsNJbcucJdbSo= -github.com/huandu/xstrings v1.2.0 h1:yPeWdRnmynF7p+lLYz0H2tthW9lqhMJrQV/U7yy4wX0= github.com/huandu/xstrings v1.2.0/go.mod h1:DvyZB1rfVYsBIigL8HwpZgxHwXozlTgGqn63UyNX5k4= github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= -github.com/hudl/fargo v1.4.0 h1:ZDDILMbB37UlAVLlWcJ2Iz1XuahZZTDZfdCKeclfq2s= github.com/hudl/fargo v1.4.0/go.mod h1:9Ai6uvFy5fQNq6VPKtg+Ceq1+eTY4nKUlR2JElEOcDo= -github.com/huin/goupnp v1.0.0/go.mod h1:n9v9KO1tAxYH82qOn+UTIFQDmx5n1Zxd/ClZDMX7Bnc= -github.com/huin/goupnp v1.0.3-0.20220313090229-ca81a64b4204 h1:+EYBkW+dbi3F/atB+LSQZSWh7+HNrV3A/N0y6DSoy9k= github.com/huin/goupnp v1.0.3-0.20220313090229-ca81a64b4204/go.mod h1:ZxNlw5WqJj6wSsRK5+YfflQGXYfccj5VgQsMNixHM7Y= -github.com/huin/goutil v0.0.0-20170803182201-1ca381bf3150 h1:vlNjIqmUZ9CMAWsbURYl3a6wZbw7q5RHVvlXTNS/Bs8= github.com/huin/goutil v0.0.0-20170803182201-1ca381bf3150/go.mod h1:PpLOETDnJ0o3iZrZfqZzyLl6l7F3c6L1oWn7OICBi6o= github.com/iancoleman/orderedmap v0.2.0 h1:sq1N/TFpYH++aViPcaKjys3bDClUEU7s5B+z6jq8pNA= github.com/iancoleman/orderedmap v0.2.0/go.mod h1:N0Wam8K1arqPXNWjMo21EXnBPOPp36vB07FNRdD2geA= -github.com/iancoleman/strcase v0.2.0 h1:05I4QRnGpI0m37iZQRuskXh+w77mr6Z41lwQzuHLwW0= github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639 h1:mV02weKRL81bEnm8A0HT1/CAelMQDBuQIfLw8n+d6xI= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/imdario/mergo v0.3.4/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= -github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk= +github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg= -github.com/improbable-eng/grpc-web v0.14.1/go.mod h1:zEjGHa8DAlkoOXmswrNvhUGEYQA9UI7DhrGeHR1DMGU= github.com/improbable-eng/grpc-web v0.15.0 h1:BN+7z6uNXZ1tQGcNAuaU1YjsLTApzkjt2tzCixLaUPQ= github.com/improbable-eng/grpc-web v0.15.0/go.mod h1:1sy9HKV4Jt9aEs9JSnkWlRJPuPtwNr0l57L4f878wP8= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= -github.com/influxdata/flux v0.65.1 h1:77BcVUCzvN5HMm8+j9PRBQ4iZcu98Dl4Y9rf+J5vhnc= github.com/influxdata/flux v0.65.1/go.mod h1:J754/zds0vvpfwuq7Gc2wRdVwEodfpCFM7mYlOw2LqY= -github.com/influxdata/influxdb v1.2.3-0.20180221223340-01288bdb0883/go.mod h1:qZna6X/4elxqT3yI9iZYdZrWWdeFOOprn86kgg4+IzY= -github.com/influxdata/influxdb v1.8.3 h1:WEypI1BQFTT4teLM+1qkEcvUi0dAvopAI/ir0vAiBg8= github.com/influxdata/influxdb v1.8.3/go.mod h1:JugdFhsvvI8gadxOI6noqNeeBHvWNTbfYGtiAn+2jhI= -github.com/influxdata/influxdb-client-go/v2 v2.4.0 h1:HGBfZYStlx3Kqvsv1h2pJixbCl/jhnFtxpKFAv9Tu5k= github.com/influxdata/influxdb-client-go/v2 v2.4.0/go.mod h1:vLNHdxTJkIf2mSLvGrpj8TCcISApPoXkaxP8g9uRlW8= github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= -github.com/influxdata/influxdb1-client v0.0.0-20200827194710-b269163b24ab h1:HqW4xhhynfjrtEiiSGcQUd6vrK23iMam1FO8rI7mwig= github.com/influxdata/influxdb1-client v0.0.0-20200827194710-b269163b24ab/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= -github.com/influxdata/influxql v1.1.1-0.20200828144457-65d3ef77d385 h1:ED4e5Cc3z5vSN2Tz2GkOHN7vs4Sxe2yds6CXvDnvZFE= github.com/influxdata/influxql v1.1.1-0.20200828144457-65d3ef77d385/go.mod h1:gHp9y86a/pxhjJ+zMjNXiQAA197Xk9wLxaz+fGG+kWk= github.com/influxdata/line-protocol v0.0.0-20180522152040-32c6aa80de5e/go.mod h1:4kt73NQhadE3daL3WhR5EJ/J2ocX0PZzwxQ0gXJ7oFE= github.com/influxdata/line-protocol v0.0.0-20200327222509-2487e7298839/go.mod h1:xaLFMmpvUxqXtVkUJfg9QmT88cDaCJ3ZKgdZ78oO8Qo= -github.com/influxdata/line-protocol v0.0.0-20210311194329-9aa0e372d097 h1:vilfsDSy7TDxedi9gyBkMvAirat/oRcL0lFdJBf6tdM= github.com/influxdata/line-protocol v0.0.0-20210311194329-9aa0e372d097/go.mod h1:xaLFMmpvUxqXtVkUJfg9QmT88cDaCJ3ZKgdZ78oO8Qo= -github.com/influxdata/promql/v2 v2.12.0 h1:kXn3p0D7zPw16rOtfDR+wo6aaiH8tSMfhPwONTxrlEc= github.com/influxdata/promql/v2 v2.12.0/go.mod h1:fxOPu+DY0bqCTCECchSRtWfc+0X19ybifQhZoQNF5D8= -github.com/influxdata/roaring v0.4.13-0.20180809181101-fc520f41fab6 h1:UzJnB7VRL4PSkUJHwsyzseGOmrO/r4yA+AuxGJxiZmA= github.com/influxdata/roaring v0.4.13-0.20180809181101-fc520f41fab6/go.mod h1:bSgUQ7q5ZLSO+bKBGqJiCBGAl+9DxyW63zLTujjUlOE= -github.com/influxdata/tdigest v0.0.0-20181121200506-bf2b5ad3c0a9 h1:MHTrDWmQpHq/hkq+7cw9oYAt2PqUw52TZazRA0N7PGE= github.com/influxdata/tdigest v0.0.0-20181121200506-bf2b5ad3c0a9/go.mod h1:Js0mqiSBE6Ffsg94weZZ2c+v/ciT8QRHFOap7EKDrR0= -github.com/influxdata/usage-client v0.0.0-20160829180054-6d3895376368 h1:+TUUmaFa4YD1Q+7bH9o5NCHQGPMqZCYJiNW6lIIS9z4= github.com/influxdata/usage-client v0.0.0-20160829180054-6d3895376368/go.mod h1:Wbbw6tYNvwa5dlB6304Sd+82Z3f7PmVZHVKU637d4po= -github.com/informalsystems/tm-load-test v1.3.0 h1:FGjKy7vBw6mXNakt+wmNWKggQZRsKkEYpaFk/zR64VA= -github.com/informalsystems/tm-load-test v1.3.0/go.mod h1:OQ5AQ9TbT5hKWBNIwsMjn6Bf4O0U4b1kRc+0qZlQJKw= -github.com/jackpal/go-nat-pmp v1.0.2-0.20160603034137-1fa385a6f458/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc= -github.com/jackpal/go-nat-pmp v1.0.2 h1:KzKSgb7qkJvOUTqYl9/Hg/me3pWgBmERKrTGD7BdWus= github.com/jackpal/go-nat-pmp v1.0.2/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc= -github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= -github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= -github.com/jdxcode/netrc v0.0.0-20210204082910-926c7f70242a h1:d4+I1YEKVmWZrgkt6jpXBnLgV2ZjO0YxEtLDdfIZfH4= github.com/jdxcode/netrc v0.0.0-20210204082910-926c7f70242a/go.mod h1:Zi/ZFkEqFHTm7qkjyNJjaWH4LQA9LQhGJyF0lTYGpxw= -github.com/jedisct1/go-minisign v0.0.0-20190909160543-45766022959e h1:UvSe12bq+Uj2hWd8aOlwPmoZ+CITRFrdit+sDGfAg8U= github.com/jedisct1/go-minisign v0.0.0-20190909160543-45766022959e/go.mod h1:G1CVv03EnqU1wYL2dFwXxW2An0az9JTl/ZsqXQeBlkU= github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= -github.com/jessevdk/go-flags v1.4.0 h1:4IU2WS7AumrZ/40jfhf4QVDMsQwqA7VEHozFRrGARJA= github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= -github.com/jgautheron/goconst v1.5.1 h1:HxVbL1MhydKs8R8n/HE5NPvzfaYmQJA3o879lE4+WcM= github.com/jgautheron/goconst v1.5.1/go.mod h1:aAosetZ5zaeC/2EfMeRswtxUFBpe2Hr7HzkgX4fanO4= -github.com/jhump/protocompile v0.0.0-20220216033700-d705409f108f h1:BNuUg9k2EiJmlMwjoef3e8vZLHplbVw6DrjGFjLL+Yo= github.com/jhump/protocompile v0.0.0-20220216033700-d705409f108f/go.mod h1:qr2b5kx4HbFS7/g4uYO5qv9ei8303JMsC7ESbYiqr2Q= github.com/jhump/protoreflect v1.6.1/go.mod h1:RZQ/lnuN+zqeRVpQigTwO6o0AJUkxbnSnpuG7toUTG4= -github.com/jhump/protoreflect v1.9.0/go.mod h1:7GcYQDdMU/O/BBrl/cX6PNHpXh6cenjd8pneu5yW7Tg= +github.com/jhump/protoreflect v1.11.1-0.20220213155251-0c2aedc66cf4/go.mod h1:U7aMIjN0NWq9swDP7xDdoMfRHb35uiuTd3Z9nFXJf5E= github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c= -github.com/jhump/protoreflect v1.15.1/go.mod h1:jD/2GMKKE6OqX8qTjhADU1e6DShO+gavG9e0Q693nKo= -github.com/jingyugao/rowserrcheck v1.1.0/go.mod h1:TOQpc2SLx6huPfoFGK3UOnEG+u02D3C1GeosjupAKCA= -github.com/jingyugao/rowserrcheck v1.1.1 h1:zibz55j/MJtLsjP1OF4bSdgXxwL1b+Vn7Tjzq7gFzUs= github.com/jingyugao/rowserrcheck v1.1.1/go.mod h1:4yvlZSDb3IyDTUZJUmpZfm2Hwok+Dtp+nu2qOq+er9c= -github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af h1:KA9BjwUk7KlCh6S9EAGWBt1oExIUv9WyNCiRz5amv48= github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af/go.mod h1:HEWGJkRDzjJY2sqdDwxccsGicWEf9BQOZsq2tV+xzM0= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= @@ -1688,15 +1009,11 @@ github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGw github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/jmhodges/levigo v1.0.0 h1:q5EC36kV79HWeTBWsod3mG11EgStG3qArTKcvlksN1U= github.com/jmhodges/levigo v1.0.0/go.mod h1:Q6Qx+uH3RAqyK4rFQroq9RL7mdkABMcfhEI+nNuzMJQ= -github.com/jmoiron/sqlx v1.2.0 h1:41Ip0zITnmWNR/vHV+S4m+VoUivnWY5E4OJfLZjCJMA= github.com/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks= -github.com/jonboulle/clockwork v0.1.0 h1:VKV+ZcuP6l3yW9doeqz6ziZGgcynBVQO+obU0+0hcPo= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= -github.com/jonboulle/clockwork v0.2.0 h1:J2SLSdy7HgElq8ekSl2Mxh6vrRNFxqbXGenYH2I02Vs= github.com/jonboulle/clockwork v0.2.0/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8= -github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA= +github.com/josharian/txtarfs v0.0.0-20210218200122-0702f000015a/go.mod h1:izVPOvVRsHiKkeGCT6tYBNWyDVuzj9wAaBb5R9qamfw= github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= -github.com/jrick/logrotate v1.0.0 h1:lQ1bL/n9mBNeIXoTUoYRlK4dHuNJVofX9oWqBtPnSzI= github.com/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlTRt3OuAQ= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= @@ -1707,156 +1024,96 @@ github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= -github.com/jstemmer/go-junit-report v0.9.1 h1:6QPYqodiu3GuPL+7mfx+NwDdp2eTkp9IfEUpgAwUN0o= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= -github.com/jsternberg/zap-logfmt v1.0.0 h1:0Dz2s/eturmdUS34GM82JwNEdQ9hPoJgqptcEKcbpzY= github.com/jsternberg/zap-logfmt v1.0.0/go.mod h1:uvPs/4X51zdkcm5jXl5SYoN+4RK21K8mysFmDaM/h+o= -github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= -github.com/juju/ratelimit v1.0.1 h1:+7AIFJVQ0EQgq/K9+0Krm7m530Du7tIz0METWzN0RgY= github.com/juju/ratelimit v1.0.1/go.mod h1:qapgC/Gy+xNh9UxzV13HGGl/6UXNN+ct+vwSgWNm/qk= -github.com/julienschmidt/httprouter v1.1.1-0.20170430222011-975b5c4c7c21/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= -github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= -github.com/julz/importas v0.0.0-20210419104244-841f0c0fe66d/go.mod h1:oSFU2R4XK/P7kNBrnL/FEQlDGN1/6WoxXEjSSXO0DV0= -github.com/julz/importas v0.1.0 h1:F78HnrsjY3cR7j0etXy5+TU1Zuy7Xt08X/1aJnH5xXY= github.com/julz/importas v0.1.0/go.mod h1:oSFU2R4XK/P7kNBrnL/FEQlDGN1/6WoxXEjSSXO0DV0= -github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5 h1:PJr+ZMXIecYc1Ey2zucXdR73SMBtgjPgwa31099IMv0= github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= -github.com/jwilder/encoding v0.0.0-20170811194829-b4e1701a28ef h1:2jNeR4YUziVtswNP9sEFAI913cVrzH85T+8Q6LpYbT0= github.com/jwilder/encoding v0.0.0-20170811194829-b4e1701a28ef/go.mod h1:Ct9fl0F6iIOGgxJ5npU/IUOhOhqlVrGjyIZc8/MagT0= -github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88 h1:uC1QfSlInpQF+M0ao65imhwqKnz3Q2z/d8PWZRMQvDM= github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k= -github.com/karalabe/usb v0.0.0-20190919080040-51dc0efba356/go.mod h1:Od972xHfMJowv7NGVDiWVxk2zxnWgjLlJzE+F4F7AGU= -github.com/karalabe/usb v0.0.2 h1:M6QQBNxF+CQ8OFvxrT90BA0qBOXymndZnk5q235mFc4= github.com/karalabe/usb v0.0.2/go.mod h1:Od972xHfMJowv7NGVDiWVxk2zxnWgjLlJzE+F4F7AGU= -github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4= -github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= -github.com/keybase/go-keychain v0.0.0-20190712205309-48d3d31d256d h1:Z+RDyXzjKE0i2sTjZ/b1uxiGtPhFy34Ou/Tk0qwN0kM= -github.com/keybase/go-keychain v0.0.0-20190712205309-48d3d31d256d/go.mod h1:JJNrCn9otv/2QP4D7SMJBgaleKpOf66PnW6F5WGNRIc= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= -github.com/kisielk/errcheck v1.6.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= -github.com/kisielk/errcheck v1.6.2 h1:uGQ9xI8/pgc9iOoCe7kWQgRE6SBTrCGmTSf0LrEtY7c= -github.com/kisielk/errcheck v1.6.2/go.mod h1:nXw/i/MfnvRHqXa7XXmQMUB0oNFGuBrNI8d8NLy0LPw= -github.com/kisielk/gotool v1.0.0 h1:AV2c/EiW3KqPNT9ZKl07ehoAGi4C5/01Cfbblndcapg= +github.com/kisielk/errcheck v1.6.1/go.mod h1:nXw/i/MfnvRHqXa7XXmQMUB0oNFGuBrNI8d8NLy0LPw= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/kkHAIKE/contextcheck v1.1.3 h1:l4pNvrb8JSwRd51ojtcOxOeHJzHek+MtOyXbaR0uvmw= -github.com/kkHAIKE/contextcheck v1.1.3/go.mod h1:PG/cwd6c0705/LM0KTr1acO2gORUxkSVWyLJOFW5qoo= -github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23 h1:FOOIBWrEkLgmlgGfMuZT83xIwfPDxEI2OHu6xUmJMFE= github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4= -github.com/kkdai/bstream v1.0.0 h1:Se5gHwgp2VT2uHfDrkbbgbgEvV9cimLELwrPJctSjg8= -github.com/kkdai/bstream v1.0.0/go.mod h1:FDnDOHt5Yx4p3FaHcioFT0QjDOtgUpvjeZqAs+NVZZA= github.com/klauspost/compress v1.4.0/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= -github.com/klauspost/compress v1.10.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= -github.com/klauspost/compress v1.11.0/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.11.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.12.3/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= +github.com/klauspost/compress v1.13.4/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= +github.com/klauspost/compress v1.13.5/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= +github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= +github.com/klauspost/compress v1.15.1/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= github.com/klauspost/compress v1.15.11/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM= github.com/klauspost/compress v1.16.5 h1:IFV2oUNUzZaz+XyusxpLzpzS8Pt5rh0Z16For/djlyI= github.com/klauspost/compress v1.16.5/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= -github.com/klauspost/cpuid v0.0.0-20170728055534-ae7887de9fa5 h1:2U0HzY8BJ8hVwDKIzp7y4voR9CX/nvcfymLmg2UiOio= github.com/klauspost/cpuid v0.0.0-20170728055534-ae7887de9fa5/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= -github.com/klauspost/crc32 v0.0.0-20161016154125-cb6bfca970f6 h1:KAZ1BW2TCmT6PRihDPpocIy1QTtsAsrx6TneU/4+CMg= github.com/klauspost/crc32 v0.0.0-20161016154125-cb6bfca970f6/go.mod h1:+ZoRqAPRLkC4NPOvfYeR5KNOrY6TD+/sAC3HXPZgDYg= github.com/klauspost/pgzip v1.0.2-0.20170402124221-0bf5dcad4ada/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs= -github.com/klauspost/pgzip v1.2.5 h1:qnWYvvKqedOF2ulHpMG72XQol4ILEJ8k2wwRl/Km8oE= github.com/klauspost/pgzip v1.2.5/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/kr/fs v0.1.0 h1:Jskdu9ieNAYnjxsi0LbQp1ulIKZV1LAFgK1tWhpZgl8= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= -github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515 h1:T+h1c/A9Gawja4Y9mFVWj2vyii2bbUNDw3kt9VxK2EY= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= -github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= -github.com/kr/pty v1.1.1 h1:VkoXIwSboBpnk99O/KFauAEILuNHv5DVFKZMBN/gUgw= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/kulti/thelper v0.4.0/go.mod h1:vMu2Cizjy/grP+jmsvOFDx1kYP6+PD1lqg4Yu5exl2U= -github.com/kulti/thelper v0.6.3 h1:ElhKf+AlItIu+xGnI990no4cE2+XaSu1ULymV2Yulxs= github.com/kulti/thelper v0.6.3/go.mod h1:DsqKShOvP40epevkFrvIwkCMNYxMeTNjdWL4dqWHZ6I= -github.com/kunwardeep/paralleltest v1.0.2/go.mod h1:ZPqNm1fVHPllh5LPVujzbVz1JN2GhLxSfY+oqUsvG30= -github.com/kunwardeep/paralleltest v1.0.6 h1:FCKYMF1OF2+RveWlABsdnmsvJrei5aoyZoaGS+Ugg8g= github.com/kunwardeep/paralleltest v1.0.6/go.mod h1:Y0Y0XISdZM5IKm3TREQMZ6iteqn1YuwCsJO/0kL9Zes= -github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= -github.com/kyoh86/exportloopref v0.1.8 h1:5Ry/at+eFdkX9Vsdw3qU4YkvGtzuVfzT4X7S77LoN/M= github.com/kyoh86/exportloopref v0.1.8/go.mod h1:1tUcJeiioIs7VWe5gcOObrux3lb66+sBqGZrRkMwPgg= -github.com/labstack/echo/v4 v4.2.1 h1:LF5Iq7t/jrtUuSutNuiEWtB5eiHfZ5gSe2pcu5exjQw= github.com/labstack/echo/v4 v4.2.1/go.mod h1:AA49e0DZ8kk5jTOOCKNuPR6oTnBS0dYiM4FW1e6jwpg= -github.com/labstack/gommon v0.3.0 h1:JEeO0bvc78PKdyHxloTKiF8BD5iGrH8T6MSeGvSgob0= github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k= -github.com/ldez/gomoddirectives v0.2.2/go.mod h1:cpgBogWITnCfRq2qGoDkKMEVSaarhdBr6g8G04uz6d0= -github.com/ldez/gomoddirectives v0.2.3 h1:y7MBaisZVDYmKvt9/l1mjNCiSA1BVn34U0ObUcJwlhA= github.com/ldez/gomoddirectives v0.2.3/go.mod h1:cpgBogWITnCfRq2qGoDkKMEVSaarhdBr6g8G04uz6d0= -github.com/ldez/tagliatelle v0.2.0/go.mod h1:8s6WJQwEYHbKZDsp/LjArytKOG8qaMrKQQ3mFukHs88= -github.com/ldez/tagliatelle v0.3.1 h1:3BqVVlReVUZwafJUwQ+oxbx2BEX2vUG4Yu/NOfMiKiM= github.com/ldez/tagliatelle v0.3.1/go.mod h1:8s6WJQwEYHbKZDsp/LjArytKOG8qaMrKQQ3mFukHs88= -github.com/leanovate/gopter v0.2.9 h1:fQjYxZaynp97ozCzfOyOuAGOU4aU/z37zf/tOujFk7c= github.com/leanovate/gopter v0.2.9/go.mod h1:U2L/78B+KVFIx2VmW6onHJQzXtFb+p5y3y2Sh+Jxxv8= github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w= -github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY= -github.com/leonklingele/grouper v1.1.0 h1:tC2y/ygPbMFSBOs3DcyaEMKnnwH7eYKzohOtRrf0SAg= github.com/leonklingele/grouper v1.1.0/go.mod h1:uk3I3uDfi9B6PeUjsCKi6ndcf63Uy7snXgR4yDYQVDY= -github.com/letsencrypt/pkcs11key/v4 v4.0.0 h1:qLc/OznH7xMr5ARJgkZCCWk+EomQkiNTOoOF5LAgagc= github.com/letsencrypt/pkcs11key/v4 v4.0.0/go.mod h1:EFUvBDay26dErnNb70Nd0/VW3tJiIbETBPTl9ATXQag= +github.com/lib/pq v0.0.0-20180327071824-d34b9ff171c2/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.8.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/lib/pq v1.9.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= -github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= +github.com/lib/pq v1.10.4/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= +github.com/lib/pq v1.10.6/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/lib/pq v1.10.7 h1:p7ZhMD+KsSRozJr34udlUrhboJwWAgCg34+/ZZNvZZw= github.com/lib/pq v1.10.7/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= -github.com/libp2p/go-buffer-pool v0.0.2/go.mod h1:MvaB6xw5vOrDl8rYZGLFdKAuk/hRoRZd1Vi32+RXyFM= github.com/libp2p/go-buffer-pool v0.1.0 h1:oK4mSFcQz7cTQIfqbe4MIj9gLW+mnanjyFtc6cdF0Y8= github.com/libp2p/go-buffer-pool v0.1.0/go.mod h1:N+vh8gMqimBzdKkSMVuydVDq+UV5QTWy5HSiZacSbPg= -github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743 h1:143Bb8f8DuGWck/xpNUOckBVYfFbBTnLevfRZ1aVVqo= github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM= -github.com/lightstep/lightstep-tracer-go v0.18.1 h1:vi1F1IQ8N7hNWytK9DpJsUfQhGuNSc19z330K6vl4zk= github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= github.com/linxGnu/grocksdb v1.8.0 h1:H4L/LhP7GOMf1j17oQAElHgVlbEje2h14A8Tz9cM2BE= github.com/linxGnu/grocksdb v1.8.0/go.mod h1:09CeBborffXhXdNpEcOeZrLKEnRtrZFEpFdPNI9Zjjg= -github.com/logrusorgru/aurora v0.0.0-20181002194514-a7b3b318ed4e h1:9MlwzLdW7QSDrhDjFlsEYmxpFyIoXmYRon3dt0io31k= -github.com/logrusorgru/aurora v0.0.0-20181002194514-a7b3b318ed4e/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4= -github.com/lucasjones/reggen v0.0.0-20180717132126-cdb49ff09d77 h1:6xiz3+ZczT3M4+I+JLpcPGG1bQKm8067HktB17EDWEE= github.com/lucasjones/reggen v0.0.0-20180717132126-cdb49ff09d77/go.mod h1:5ELEyG+X8f+meRWHuqUOewBOhvHkl7M76pdGEansxW4= -github.com/lufeee/execinquery v1.2.1 h1:hf0Ems4SHcUGBxpGN7Jz78z1ppVkP/837ZlETPCEtOM= github.com/lufeee/execinquery v1.2.1/go.mod h1:EC7DrEKView09ocscGHC+apXMIaorh4xqSxS/dy8SbM= -github.com/lyft/protoc-gen-star v0.5.3 h1:zSGLzsUew8RT+ZKPHc3jnf8XLaVyHzTcAFBzHtCNR20= +github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= github.com/lyft/protoc-gen-star v0.5.3/go.mod h1:V0xaHgaf5oCCqmcxYcWiDfTiKsZsRc87/1qhoTACD8w= -github.com/lyft/protoc-gen-validate v0.0.13 h1:KNt/RhmQTOLr7Aj8PsJ7mTronaFyx80mRTT9qF261dA= github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= -github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= +github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e h1:hB2xlXdHp/pmPZq0y3QnmWAArdw9PqbmotexnWx/FU8= github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/manifoldco/promptui v0.9.0 h1:3V4HzJk1TtXW1MTZMP7mdlwbBpIinw3HztaIlYthEiA= github.com/manifoldco/promptui v0.9.0/go.mod h1:ka04sppxSGFAtxX0qhlYQjISsg9mR4GWtQEhdbn6Pgg= -github.com/maratori/testableexamples v1.0.0 h1:dU5alXRrD8WKSjOUnmJZuzdxWOEQ57+7s93SLMxb2vI= -github.com/maratori/testableexamples v1.0.0/go.mod h1:4rhjL1n20TUTT4vdh3RDqSizKLyXp7K2u6HgraZCGzE= -github.com/maratori/testpackage v1.0.1/go.mod h1:ddKdw+XG0Phzhx8BFDTKgpWP4i7MpApTE5fXSKAqwDU= -github.com/maratori/testpackage v1.1.0 h1:GJY4wlzQhuBusMF1oahQCBtUV/AQ/k69IZ68vxaac2Q= github.com/maratori/testpackage v1.1.0/go.mod h1:PeAhzU8qkCwdGEMTEupsHJNlQu2gZopMC6RjbhmHeDc= -github.com/matoous/godox v0.0.0-20210227103229-6504466cf951 h1:pWxk9e//NbPwfxat7RXkts09K+dEBJWakUWwICVqYbA= github.com/matoous/godox v0.0.0-20210227103229-6504466cf951/go.mod h1:1BELzlh859Sh1c6+90blK8lbYy0kwQf1bYlBhBysy1s= -github.com/matryer/moq v0.0.0-20190312154309-6cfb0558e1bd h1:HvFwW+cm9bCbZ/+vuGNq7CRWXql8c0y8nGeYpqmpvmk= +github.com/matryer/is v1.4.0/go.mod h1:8I/i5uYgLzgsgEloJE1U6xx5HkBQpAZvepWuujKwMRU= github.com/matryer/moq v0.0.0-20190312154309-6cfb0558e1bd/go.mod h1:9ELz6aaclSIGnZBoaSLZ3NAl1VTufbOrXBPvtcy6WiQ= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= -github.com/mattn/go-colorable v0.1.0/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= @@ -1866,12 +1123,8 @@ github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= -github.com/mattn/go-ieproxy v0.0.0-20190610004146-91bb50d98149/go.mod h1:31jz6HNzdxOmlERGGEc4v/dMssOfmp2p5bT/okiKFFc= -github.com/mattn/go-ieproxy v0.0.0-20190702010315-6dee0af9227d h1:oNAwILwmgWKFpuU+dXvI6dl9jG2mAWAZLX3r9s0PPiw= -github.com/mattn/go-ieproxy v0.0.0-20190702010315-6dee0af9227d/go.mod h1:31jz6HNzdxOmlERGGEc4v/dMssOfmp2p5bT/okiKFFc= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -github.com/mattn/go-isatty v0.0.5-0.20180830101745-3fb116b82035/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ= github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84= @@ -1885,33 +1138,23 @@ github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzp github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.6/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= -github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0= github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= -github.com/mattn/go-sqlite3 v1.11.0 h1:LDdKkqtYlom37fkvqs8rMPFKAMe8+SgjbwZ6ex1/A/Q= github.com/mattn/go-sqlite3 v1.11.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= -github.com/mattn/go-tty v0.0.0-20180907095812-13ff1204f104 h1:d8RFOZ2IiFtFWBcKEHAFYJcPTf0wY5q0exFNJZVWa1U= +github.com/mattn/go-sqlite3 v1.14.9/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= github.com/mattn/go-tty v0.0.0-20180907095812-13ff1204f104/go.mod h1:XPvLUNfbS4fJH25nqRHfWLMa1ONC8Amw+mIA639KxkE= -github.com/mattn/goveralls v0.0.2 h1:7eJB6EqsPhRVxvwEXGnqdO2sJI0PTsrWoTMXEk9/OQc= -github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= -github.com/mbilski/exhaustivestruct v1.2.0 h1:wCBmUnSYufAHO6J4AVWY6ff+oxWxsVFrwgOdMUQePUo= github.com/mbilski/exhaustivestruct v1.2.0/go.mod h1:OeTBVxQWoEmB2J2JCHmXWPJ0aksxSUOUy+nvtVEfzXc= -github.com/mgechev/dots v0.0.0-20190921121421-c36f7dcfbb81 h1:QASJXOGm2RZ5Ardbc86qNFvby9AqkLDibfChMtAg5QM= -github.com/mgechev/dots v0.0.0-20190921121421-c36f7dcfbb81/go.mod h1:KQ7+USdGKfpPjXk4Ga+5XxQM4Lm4e3gAogrreFAYpOg= -github.com/mgechev/revive v1.1.1/go.mod h1:PKqk4L74K6wVNwY2b6fr+9Qqr/3hIsHVfZCJdbvozrY= -github.com/mgechev/revive v1.2.4 h1:+2Hd/S8oO2H0Ikq2+egtNwQsVhAeELHjxjIUFX5ajLI= -github.com/mgechev/revive v1.2.4/go.mod h1:iAWlQishqCuj4yhV24FTnKSXGpbAA+0SckXB8GQMX/Q= +github.com/mgechev/dots v0.0.0-20210922191527-e955255bf517/go.mod h1:KQ7+USdGKfpPjXk4Ga+5XxQM4Lm4e3gAogrreFAYpOg= +github.com/mgechev/revive v1.2.1/go.mod h1:+Ro3wqY4vakcYNtkBWdZC7dBg1xSB6sp054wWwmeFm0= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= github.com/miekg/dns v1.1.35/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM= github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= -github.com/miekg/dns v1.1.43 h1:JKfpVSCB84vrAmHzyrsxB5NAr5kLoMXZArPSw7Qlgyg= github.com/miekg/dns v1.1.43/go.mod h1:+evo5L0630/F6ca/Z9+GAqzhjGyn8/c+TBaOyfEl0V4= github.com/miekg/pkcs11 v1.0.2/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs= -github.com/miekg/pkcs11 v1.0.3 h1:iMwmD7I5225wv84WxIG/bmxz9AXjWvTWIbM/TYHvWtw= github.com/miekg/pkcs11 v1.0.3/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs= github.com/mimoo/StrobeGo v0.0.0-20181016162300-f8f6d4d2b643/go.mod h1:43+3pMjjKimDBf5Kr4ZFNGbLql1zKkbImw+fZbw3geM= github.com/mimoo/StrobeGo v0.0.0-20220103164710-9a04d6ca976b h1:QrHweqAtyJ9EwCaGHBu1fghwxIPiopAHV06JlXrMHjk= @@ -1919,42 +1162,31 @@ github.com/mimoo/StrobeGo v0.0.0-20220103164710-9a04d6ca976b/go.mod h1:xxLb2ip6s github.com/minio/highwayhash v1.0.1/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY= github.com/minio/highwayhash v1.0.2 h1:Aak5U0nElisjDCfPSG79Tgzkn2gl66NxOMspRrKnA/g= github.com/minio/highwayhash v1.0.2/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY= -github.com/mitchellh/cli v1.0.0 h1:iGBIsUe3+HZ/AD/Vd7DErOt5sU9fa8Uj7A2s1aggv1Y= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= -github.com/mitchellh/cli v1.1.0 h1:tEElEatulEHDeedTxwckzyYMA5c86fbmNIUL1hBIiTg= github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= -github.com/mitchellh/copystructure v1.0.0 h1:Laisrj+bAB6b/yJwB5Bt3ITZhGJdqmxquMKeZ+mmkFQ= github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/mitchellh/go-ps v1.0.0 h1:i6ampVEEF4wQFF+bkYfwYgY+F/uYJDktmvLPf7qIgjc= github.com/mitchellh/go-ps v1.0.0/go.mod h1:J4lOc8z8yJs6vUwklHw2XEIiT4z4C40KtWVN3nvg8Pg= github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= github.com/mitchellh/go-testing-interface v1.14.1 h1:jrgshOhYAUVNMAJiKbEu7EqAwgJJ2JqpQmpLJOu07cU= github.com/mitchellh/go-testing-interface v1.14.1/go.mod h1:gfgS7OtZj6MA4U1UrDRp04twqAjfvlZyCfX3sDjEym8= -github.com/mitchellh/gox v0.4.0 h1:lfGJxY7ToLJQjHHwi0EX6uYBdK78egf954SQl13PQJc= github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= -github.com/mitchellh/iochan v1.0.0 h1:C+X3KsSTLFVBr/tK1eYN/vs4rJcvsiLU338UhYPJWeY= github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mitchellh/mapstructure v1.3.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/mitchellh/mapstructure v1.4.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/mitchellh/pointerstructure v1.2.0 h1:O+i9nHnXS3l/9Wu7r4NrEdwA2VFTicjUEN1uBnDo34A= github.com/mitchellh/pointerstructure v1.2.0/go.mod h1:BRAsLI5zgXmw97Lf6s25bs8ohIXc3tViBH44KcwB2g4= github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= -github.com/mitchellh/reflectwalk v1.0.1 h1:FVzMWA5RllMAKIdUSC8mdWo3XtwoecrH79BY70sEEpE= github.com/mitchellh/reflectwalk v1.0.1/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= -github.com/moby/buildkit v0.10.4 h1:FvC+buO8isGpUFZ1abdSLdGHZVqg9sqI4BbFL8tlzP4= -github.com/moby/buildkit v0.10.4/go.mod h1:Yajz9vt1Zw5q9Pp4pdb3TCSUXJBIroIQGQ3TTs/sLug= -github.com/moby/sys/mountinfo v0.4.1 h1:1O+1cHA1aujwEwwVMa2Xm2l+gIpUHyd3+D+d7LZh1kM= -github.com/moby/sys/mountinfo v0.4.1/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A= -github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae h1:O4SWKdcHVCvYqyDV+9CJA1fcDN2L11Bule0iFy3YlAI= -github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae/go.mod h1:E2VnQOmVuvZB6UYnnDB0qG5Nq/1tD9acaOpo6xmt0Kw= +github.com/moby/sys/mountinfo v0.5.0/go.mod h1:3bMD3Rg+zkqx8MRYPi7Pyb0Ie97QEBmdxbhnCLlSvSU= +github.com/moby/term v0.0.0-20201216013528-df9cb8a40635/go.mod h1:FBS0z0QWA44HXygs7VXDUOGoN/1TV3RuWkLO04am3wc= +github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6/go.mod h1:E2VnQOmVuvZB6UYnnDB0qG5Nq/1tD9acaOpo6xmt0Kw= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -1962,21 +1194,13 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lN github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5 h1:8Q0qkMVC/MmWkpIdlvZgcv2o2jrlF6zqVOh7W5YHdMA= github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5/go.mod h1:caMODM3PzxT8aQXRPkAt8xlV/e7d7w8GM5g0fa5F0D8= -github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9M+97sNutRR1RKhG96O6jWumTTnw= github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8= -github.com/moricho/tparallel v0.2.1 h1:95FytivzT6rYzdJLdtfn6m1bfFJylOJK41+lgv/EHf4= github.com/moricho/tparallel v0.2.1/go.mod h1:fXEIZxG2vdfl0ZF8b42f5a78EhjjD5mX8qUplsoSU4k= -github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= -github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= -github.com/mozilla/scribe v0.0.0-20180711195314-fb71baf557c1 h1:29NKShH4TWd3lxCDUhS4Xe16EWMA753dtIxYtwddklU= github.com/mozilla/scribe v0.0.0-20180711195314-fb71baf557c1/go.mod h1:FIczTrinKo8VaLxe6PWTPEXRXDIHz2QAwiaBaP5/4a8= -github.com/mozilla/tls-observatory v0.0.0-20210609171429-7bc42856d2e5 h1:0KqC6/sLy7fDpBdybhVkkv4Yz+PmB7c9Dz9z3dLW804= github.com/mozilla/tls-observatory v0.0.0-20210609171429-7bc42856d2e5/go.mod h1:FUqVoUPHSEdDR0MnFM3Dh8AU0pZHLXUD127SAJGER/s= -github.com/mrunalp/fileutils v0.5.0 h1:NKzVxiH7eSk+OQ4M+ZYW1K6h27RUV3MI6NUTsHhU6Z4= +github.com/mroth/weightedrand v0.4.1/go.mod h1:3p2SIcC8al1YMzGhAIoXD+r9olo/g/cdJgAD905gyNE= github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ= -github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae h1:VeRdUYdCw49yizlSbMEn2SZ+gT+3IUKx8BqxyQdz+BY= github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae/go.mod h1:qAyveg+e4CE+eKJXWVjKXM4ck2QobLqTDytGJbLLhJg= github.com/mtibben/percent v0.2.1 h1:5gssi8Nqo8QU/r2pynCm+hBQHpkB/uNK7BJCFogWdzs= github.com/mtibben/percent v0.2.1/go.mod h1:KG9uO+SZkUp+VkRHsCdYQV3XSZrrSpR3O9ibNBTZrns= @@ -1984,71 +1208,45 @@ github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRW github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f h1:KUppIJq7/+SVif2QVs3tOP0zanoHgBEVAwHxUSIzRqU= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mwitkow/go-proto-validators v0.0.0-20180403085117-0950a7990007/go.mod h1:m2XC9Qq0AlmmVksL6FktJCdTYyLk7V3fKyp0sl1yWQo= -github.com/mwitkow/go-proto-validators v0.2.0 h1:F6LFfmgVnfULfaRsQWBbe7F7ocuHCr9+7m+GAeDzNbQ= github.com/mwitkow/go-proto-validators v0.2.0/go.mod h1:ZfA1hW+UH/2ZHOWvQ3HnQaU0DtnpXu850MZiy+YUgcc= -github.com/mwitkow/grpc-proxy v0.0.0-20181017164139-0f1106ef9c76 h1:0xuRacu/Zr+jX+KyLLPPktbwXqyOvnOPUQmMLzX1jxU= github.com/mwitkow/grpc-proxy v0.0.0-20181017164139-0f1106ef9c76/go.mod h1:x5OoJHDHqxHS801UIuhqGl6QdSAEJvtausosHSdazIo= -github.com/nakabonne/nestif v0.3.0/go.mod h1:dI314BppzXjJ4HsCnbo7XzrJHPszZsjnk5wEBSYHI2c= -github.com/nakabonne/nestif v0.3.1 h1:wm28nZjhQY5HyYPx+weN3Q65k6ilSBxDb8v5S81B81U= github.com/nakabonne/nestif v0.3.1/go.mod h1:9EtoZochLn5iUprVDmDjqGKPofoUEBL8U4Ngq6aY7OE= -github.com/naoina/go-stringutil v0.1.0 h1:rCUeRUHjBjGTSHl0VC00jUPLz8/F9dDzYI70Hzifhks= github.com/naoina/go-stringutil v0.1.0/go.mod h1:XJ2SJL9jCtBh+P9q5btrd/Ylo8XwT/h1USek5+NqSA0= -github.com/naoina/toml v0.1.2-0.20170918210437-9fafd6967416 h1:shk/vn9oCoOTmwcouEdwIeOtOGA/ELRUw/GwvxwfT+0= github.com/naoina/toml v0.1.2-0.20170918210437-9fafd6967416/go.mod h1:NBIhNtsFMo3G2szEBne+bO4gS192HuIYRqfvOWb4i1E= github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg= -github.com/nats-io/jwt v0.3.2 h1:+RB5hMpXUUA2dfxuhBTEkMOrYmM+gKIZYS1KjSostMI= github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL6eU= -github.com/nats-io/jwt/v2 v2.0.3 h1:i/O6cmIsjpcQyWDYNcq2JyZ3/VTF8SJ4JWluI5OhpvI= +github.com/nats-io/jwt v1.2.2/go.mod h1:/xX356yQA6LuXI9xWW7mZNpxgF2mBmGecH+Fj34sP5Q= github.com/nats-io/jwt/v2 v2.0.3/go.mod h1:VRP+deawSXyhNjXmxPCHskrR6Mq50BqpEI5SEcNiGlY= github.com/nats-io/nats-server/v2 v2.1.2/go.mod h1:Afk+wRZqkMQs/p45uXdrVLuab3gwv3Z8C4HTBu8GD/k= -github.com/nats-io/nats-server/v2 v2.5.0 h1:wsnVaaXH9VRSg+A2MVg5Q727/CqxnmPLGFQ3YZYKTQg= github.com/nats-io/nats-server/v2 v2.5.0/go.mod h1:Kj86UtrXAL6LwYRA6H4RqzkHhK0Vcv2ZnKD5WbQ1t3g= github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzEE/Zbp4w= -github.com/nats-io/nats.go v1.12.1 h1:+0ndxwUPz3CmQ2vjbXdkC1fo3FdiOQDim4gl3Mge8Qo= github.com/nats-io/nats.go v1.12.1/go.mod h1:BPko4oXsySz4aSWeFgOHLZs3G4Jq4ZAyE6/zMCxRT6w= github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= -github.com/nats-io/nkeys v0.3.0 h1:cgM5tL53EvYRU+2YLXIK0G2mJtK12Ft9oeooSZMA2G8= +github.com/nats-io/nkeys v0.2.0/go.mod h1:XdZpAbhgyyODYqjTawOnIOI7VlbKSarI9Gfy1tqEu/s= github.com/nats-io/nkeys v0.3.0/go.mod h1:gvUNGjVcM2IPr5rCsRsC6Wb3Hr2CQAm08dsxtV6A5y4= -github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= -github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354 h1:4kuARK6Y6FxaNu/BnU2OAaLF86eTVhP2hjTB6iMvItA= github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354/go.mod h1:KSVJerMDfblTH7p5MZaTt+8zaT2iEk3AkVb9PQdZuE8= -github.com/neilotoole/errgroup v0.1.5/go.mod h1:Q2nLGf+594h0CLBs/Mbg6qOr7GtqDK7C2S41udRnToE= -github.com/neilotoole/errgroup v0.1.6 h1:PODGqPXdT5BC/zCYIMoTrwV+ujKcW+gBXM6Ye9Ve3R8= github.com/neilotoole/errgroup v0.1.6/go.mod h1:Q2nLGf+594h0CLBs/Mbg6qOr7GtqDK7C2S41udRnToE= -github.com/neutron-org/admin-module v0.0.0-20230629154156-54b91a541f7f h1:YFXRHpaaRNK7stry4s6MM40IlulY/MSQTAvTbgodMDk= -github.com/neutron-org/admin-module v0.0.0-20230629154156-54b91a541f7f/go.mod h1:ZwQ3cw0rxF+DzonD2a5lisdcFEu64Db+0TPnHgMIvN0= github.com/neutron-org/admin-module v0.0.0-20230705134325-b23404470a1d h1:oexw79znoA0TEo7CGdWHrolbvZqCDD3aI+031CbOq9Y= github.com/neutron-org/admin-module v0.0.0-20230705134325-b23404470a1d/go.mod h1:QuxQ7FJlEAFMRssyEYOrR9ORnYQvBFMTlO8BXny6ntw= -github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230628195106-7f39abd759a1 h1:VmQ1zVjrFguFYFDJrsJ8biPqZvWXrq1ydQKQMVp+w2Q= -github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230628195106-7f39abd759a1/go.mod h1:oB4CvQbYYn/g+q7c/rKQ33V4APW+kGdo5RkdFBovyxw= github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230705143547-22c391d461d5 h1:2YQaqP5W3F+5VH0IAA7m8OHjkwONxQDqXUwo5tzKdDU= github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230705143547-22c391d461d5/go.mod h1:l699csQZeRKYqF8R9JoYoQ6E0j4PfDM3Ln7EawtUwJE= -github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= -github.com/nishanths/exhaustive v0.2.3/go.mod h1:bhIX678Nx8inLM9PbpvK1yv6oGtoP8BfaIeMzgBNKvc= -github.com/nishanths/exhaustive v0.8.3 h1:pw5O09vwg8ZaditDp/nQRqVnrMczSJDxRDJMowvhsrM= -github.com/nishanths/exhaustive v0.8.3/go.mod h1:qj+zJJUgJ76tR92+25+03oYUhzF4R7/2Wk7fGTfCHmg= +github.com/nishanths/exhaustive v0.8.1/go.mod h1:qj+zJJUgJ76tR92+25+03oYUhzF4R7/2Wk7fGTfCHmg= github.com/nishanths/predeclared v0.0.0-20190419143655-18a43bb90ffc/go.mod h1:62PewwiQTlm/7Rj+cxVYqZvDIUc+JjZq6GHAC1fsObQ= -github.com/nishanths/predeclared v0.0.0-20200524104333-86fad755b4d3/go.mod h1:nt3d53pc1VYcphSCIaYAJtnPYnr3Zyn8fMq2wvPGPso= -github.com/nishanths/predeclared v0.2.1/go.mod h1:HvkGJcA3naj4lOwnFXFDkFxVtSqQMB9sbB1usJ+xjQE= -github.com/nishanths/predeclared v0.2.2 h1:V2EPdZPliZymNAn79T8RkNApBjMmVKh5XRpLm/w98Vk= github.com/nishanths/predeclared v0.2.2/go.mod h1:RROzoN6TnGQupbC+lqggsOlcgysk3LMK/HI84Mp280c= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= -github.com/oklog/oklog v0.3.2 h1:wVfs8F+in6nTBMkA7CbRw+zZMIB7nNM825cM1wuzoTk= +github.com/oasisprotocol/curve25519-voi v0.0.0-20210609091139-0a56a4bca00b/go.mod h1:TLJifjWF6eotcfzDjKZsDqWJ+73Uvj/N85MvVyrvynM= github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs= -github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw= github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= -github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= +github.com/oklog/ulid/v2 v2.0.2/go.mod h1:mtBL0Qe/0HAx6/a4Z30qxVIAL1eQDweXq5lxOEiwQ68= github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= github.com/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= -github.com/olekukonko/tablewriter v0.0.2-0.20190409134802-7e037d187b0c/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= github.com/olekukonko/tablewriter v0.0.2/go.mod h1:rSAaSIOAGT9odnlyGlUfAJaoc5w2fSBUmeGDbRWPxyQ= -github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= @@ -2058,140 +1256,103 @@ github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9k github.com/onsi/ginkgo v1.16.2/go.mod h1:CObGmKUOKaSC0RjmoAK7tKyn4Azo5P2IWuoMnvwxz1E= github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc= github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= +github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c= +github.com/onsi/ginkgo/v2 v2.1.4/go.mod h1:um6tUpWM/cxCK3/FK8BXqEiUMUwRgSM4JXG47RKZmLU= github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.13.0/go.mod h1:lRk9szgn8TxENtWd0Tp4c3wjlRfMTMH27I+3Je41yGY= -github.com/onsi/gomega v1.20.0 h1:8W0cWlwFkflGPLltQvLRB7ZVD5HuP6ng320w2IS245Q= -github.com/onsi/gomega v1.20.0/go.mod h1:DtrZpjmvpn2mPm4YWQa0/ALMDj9v4YxLgojwPeREyVo= -github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 h1:lDH9UUVJtmYCjyT0CI4q8xvlXPxeZ0gYCVvWbmPlp88= +github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= +github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro= +github.com/onsi/gomega v1.26.0 h1:03cDLK28U6hWvCAns6NeydX3zIm4SF3ci69ulidS32Q= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= -github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= -github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= github.com/opencontainers/image-spec v1.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= github.com/opencontainers/image-spec v1.1.0-rc2 h1:2zx/Stx4Wc5pIPDvIxHXvXtQFW/7XWJGmnM7r3wg034= -github.com/opencontainers/image-spec v1.1.0-rc2/go.mod h1:3OVijpioIKYWTqjiG0zfF6wvoJ4fAXGbjdZuI2NgsRQ= -github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= -github.com/opencontainers/runc v1.0.2/go.mod h1:aTaHFFwQXuA71CiyxOdFFIorAoemI04suvGRQFzWTD0= -github.com/opencontainers/runc v1.0.3/go.mod h1:aTaHFFwQXuA71CiyxOdFFIorAoemI04suvGRQFzWTD0= -github.com/opencontainers/runc v1.1.3 h1:vIXrkId+0/J2Ymu2m7VjGvbSlAId9XNRPhn2p4b+d8w= +github.com/opencontainers/runc v1.1.2/go.mod h1:Tj1hFw6eFWp/o33uxGf5yF2BX5yz2Z6iptFpuvbbKqc= github.com/opencontainers/runc v1.1.3/go.mod h1:1J5XiS+vdZ3wCyZybsuxXZWGrgSr8fFJHLXuG2PsnNg= github.com/opencontainers/runc v1.1.5 h1:L44KXEpKmfWDcS02aeGm8QNTFXTo2D+8MYGDIJ/GDEs= -github.com/opencontainers/runc v1.1.5/go.mod h1:1J5XiS+vdZ3wCyZybsuxXZWGrgSr8fFJHLXuG2PsnNg= -github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 h1:3snG66yBm59tKhhSPQrQ/0bCrv1LQbKt40LnUPiUxdc= github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= -github.com/opencontainers/selinux v1.8.2 h1:c4ca10UMgRcvZ6h0K4HtS15UaVSBEaE+iln2LVpAuGc= -github.com/opencontainers/selinux v1.8.2/go.mod h1:MUIHuUEvKB1wtJjQdOyYRgOnLD2xAPP8dBsCoU0KuF8= -github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492 h1:lM6RxxfUMrYL/f8bWEUqdXrANWtrL7Nndbm9iFN0DlU= +github.com/opencontainers/selinux v1.10.0/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI= github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis= -github.com/opentracing/basictracer-go v1.0.0 h1:YyUAhaEfjoWXclZVJ9sGoNct7j4TVk7lZWlQw5UXuoo= github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74= github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/opentracing/opentracing-go v1.0.3-0.20180606204148-bd9c31933947/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= -github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs= github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= -github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5 h1:ZCnq+JUrvXcDVhX/xRolRBZifmabN1HcS1wrPSvxhrU= github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod h1:/wsWhb9smxSfWAKL3wpBW7V8scJMt8N8gnaMCS9E/cA= github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= -github.com/openzipkin/zipkin-go v0.2.5 h1:UwtQQx2pyPIgWYHRg+epgdx1/HnBQTgN3/oIYEJTQzU= github.com/openzipkin/zipkin-go v0.2.5/go.mod h1:KpXfKdgRDnnhsxw4pNIH9Md5lyFqKUa4YDFlwRYAMyE= github.com/ory/dockertest v3.3.5+incompatible h1:iLLK6SQwIhcbrG783Dghaaa3WPzGc+4Emza6EbVUUGA= github.com/ory/dockertest v3.3.5+incompatible/go.mod h1:1vX4m9wsvi00u5bseYwXaSnhNrne+V0E6LAcBILJdPs= -github.com/ory/dockertest/v3 v3.10.0 h1:4K3z2VMe8Woe++invjaTB7VRyQXQy5UY+loujO4aNE4= -github.com/ory/dockertest/v3 v3.10.0/go.mod h1:nr57ZbRWMqfsdGdFNLHz5jjNdDb7VVFnzAeW1n5N1Lg= -github.com/otiai10/copy v1.6.0 h1:IinKAryFFuPONZ7cm6T6E2QX/vcJwSnlaA5lfoaXIiQ= -github.com/otiai10/copy v1.6.0/go.mod h1:XWfuS3CrI0R6IE0FbgHsEazaXO8G0LpMp9o8tos0x4E= +github.com/ory/dockertest/v3 v3.9.1/go.mod h1:42Ir9hmvaAPm0Mgibk6mBPi7SFvTXxEcnztDYOJ//uM= +github.com/otiai10/copy v1.2.0/go.mod h1:rrF5dJ5F0t/EWSYODDu4j9/vEeYHMkc8jt0zJChqQWw= github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod h1:9qAhocn7zKJG+0mI8eUu6xqkFDYS2kb2saOteoSB3cE= -github.com/otiai10/curr v1.0.0 h1:TJIWdbX0B+kpNagQrjgq8bCMrbhiuX73M2XwgtDMoOI= github.com/otiai10/curr v1.0.0/go.mod h1:LskTG5wDwr8Rs+nNQ+1LlxRjAtTZZjtJW4rMXl6j4vs= github.com/otiai10/mint v1.3.0/go.mod h1:F5AjcsTsWUqX+Na9fpHb52P8pcRX2CI6A3ctIT91xUo= -github.com/otiai10/mint v1.3.2 h1:VYWnrP5fXmz1MXvjuUvcBrXSjGE6xjON+axB/UrpO3E= -github.com/otiai10/mint v1.3.2/go.mod h1:/yxELlJQ0ufhjUwhshSj+wFjZ78CnZ48/1wtmBH1OTc= +github.com/otiai10/mint v1.3.1/go.mod h1:/yxELlJQ0ufhjUwhshSj+wFjZ78CnZ48/1wtmBH1OTc= github.com/oxyno-zeta/gomock-extra-matcher v1.1.0 h1:Yyk5ov0ZPKBXtVEeIWtc4J2XVrHuNoIK+0F2BUJgtsc= github.com/oxyno-zeta/gomock-extra-matcher v1.1.0/go.mod h1:UMGTHYEmJ1dRq8LDZ7VTAYO4nqM3GD1UGC3RJEUxEz0= -github.com/pact-foundation/pact-go v1.0.4 h1:OYkFijGHoZAYbOIb1LWXrwKQbMMRUv1oQ89blD2Mh2Q= github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY= github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= -github.com/paulbellamy/ratecounter v0.2.0 h1:2L/RhJq+HA8gBQImDXtLPrDXK5qAj6ozWVK/zFXVJGs= github.com/paulbellamy/ratecounter v0.2.0/go.mod h1:Hfx1hDpSGoqxkVVpBi/IlYD7kChlfo5C6hzIHwPqfFE= -github.com/pborman/uuid v0.0.0-20170112150404-1b00554d8222/go.mod h1:VyrYX9gd7irzKovcSS6BIIEwPRkP2Wm2m9ufcdFSJ34= -github.com/pborman/uuid v1.2.0 h1:J7Q5mO4ysT1dv8hyrUGHb9+ooztCXu1D8MY8DZYsu3g= +github.com/pborman/getopt v0.0.0-20170112200414-7148bc3a4c30/go.mod h1:85jBQOZwpVEaDAr341tbn15RS4fCAsIst0qp7i8ex1o= github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= -github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= -github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= +github.com/pelletier/go-toml/v2 v2.0.1/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo= +github.com/pelletier/go-toml/v2 v2.0.2/go.mod h1:MovirKjgVRESsAvNZlAjtFwV867yGuwRkXbG66OzopI= github.com/pelletier/go-toml/v2 v2.0.8 h1:0ctb6s9mE31h0/lhu+J6OPmVeDxJn+kYnJc2jZR9tGQ= github.com/pelletier/go-toml/v2 v2.0.8/go.mod h1:vuYfssBdrU2XDZ9bYydBu6t+6a6PYNcZljzZR9VXg+4= -github.com/performancecopilot/speed v3.0.0+incompatible h1:2WnRzIquHa5QxaJKShDkLM+sc0JPuwhXzK8OYOyt3Vg= github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= -github.com/performancecopilot/speed/v4 v4.0.0 h1:VxEDCmdkfbQYDlcr/GC9YoN9PQ6p8ulk9xVsepYy9ZY= github.com/performancecopilot/speed/v4 v4.0.0/go.mod h1:qxrSyuDGrTOWfV+uKRFhfxw6h/4HXRGUiZiufxo49BM= -github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= github.com/peterh/liner v1.0.1-0.20180619022028-8c1271fcf47f/go.mod h1:xIteQHvHuaLYG9IFj6mSxM0fCKrs34IrEQUhOYuGPHc= -github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7 h1:oYW+YCJ1pachXTQmzR3rNLYGGz4g/UgFcjb28p/viDM= github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7/go.mod h1:CRroGNssyjTd/qIG2FyxByd2S8JEAZXBl4qUrZf8GS0= github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod h1:jvVRKCrJTQWu0XVbaOlby/2lO20uSCHEMzzplHXte1o= github.com/petermattis/goid v0.0.0-20230518223814-80aa455d8761 h1:W04oB3d0J01W5jgYRGKsV8LCM6g9EkCvPkZcmFuy0OE= github.com/petermattis/goid v0.0.0-20230518223814-80aa455d8761/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4= -github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d h1:CdDQnGF8Nq9ocOS/xlSptM1N3BbrA6/kmaep5ggwaIA= github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d/go.mod h1:3OzsM7FXDQlpCiw2j81fOmAwQLnZnLGXVKUzeKQXIAw= -github.com/philhofer/fwd v1.0.0 h1:UbZqGr5Y38ApvM/V/jEljVxwocdweyH+vmYvRPBnbqQ= github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU= +github.com/philhofer/fwd v1.1.1/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU= github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= -github.com/pierrec/lz4 v2.0.5+incompatible h1:2xWsjqPFWcplujydGg4WmhC/6fZqK42wMM8aXeqhl0I= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= -github.com/pjbgf/sha1cd v0.2.3 h1:uKQP/7QOzNtKYH7UTohZLcjF5/55EnTw0jO/Ru4jZwI= -github.com/pjbgf/sha1cd v0.2.3/go.mod h1:HOK9QrgzdHpbc2Kzip0Q1yi3M2MFGPADtR6HjG65m5M= -github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 h1:KoWmjvw+nsYOo29YJK9vDA65RGE3NrOnUtO7a+RF9HU= +github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/go.mod h1:4OwLy04Bl9Ef3GJJCoec+30X3LQs/0/m4HFRt/2LUSA= github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI= +github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= -github.com/pkg/profile v1.6.0 h1:hUDfIISABYI59DyeB3OTay/HxSRwTQ8rB/H83k6r5dM= github.com/pkg/profile v1.6.0/go.mod h1:qBsxPvzyUincmltOk6iyRVxHYg4adc0OFOv72ZdLa18= github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= -github.com/pkg/sftp v1.13.1 h1:I2qBYMChEhIjOgazfJmV3/mZM256btk6wkCDRmW7JYs= github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= -github.com/pkg/term v0.0.0-20180730021639-bffc007b7fd5 h1:tFwafIEMf0B7NlcxV/zJ6leBIa81D3hgGSgsE5hCkOQ= github.com/pkg/term v0.0.0-20180730021639-bffc007b7fd5/go.mod h1:eCbImbZ95eXtAUIbLAuAVnBnwf83mjf6QIVH8SHYwqQ= github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/pointlander/compress v1.1.1-0.20190518213731-ff44bd196cc3 h1:hUmXhbljNFtrH5hzV9kiRoddZ5nfPTq3K0Sb2hYYiqE= -github.com/pointlander/compress v1.1.1-0.20190518213731-ff44bd196cc3/go.mod h1:q5NXNGzqj5uPnVuhGkZfmgHqNUhf15VLi6L9kW0VEc0= -github.com/pointlander/jetset v1.0.1-0.20190518214125-eee7eff80bd4 h1:RHHRCZeaNyBXdYPMjZNH8/XHDBH38TZzw8izrW7dmBE= -github.com/pointlander/jetset v1.0.1-0.20190518214125-eee7eff80bd4/go.mod h1:RdR1j20Aj5pB6+fw6Y9Ur7lMHpegTEjY1vc19hEZL40= -github.com/pointlander/peg v1.0.1 h1:mgA/GQE8TeS9MdkU6Xn6iEzBmQUQCNuWD7rHCK6Mjs0= -github.com/pointlander/peg v1.0.1/go.mod h1:5hsGDQR2oZI4QoWz0/Kdg3VSVEC31iJw/b7WjqCBGRI= -github.com/polyfloyd/go-errorlint v0.0.0-20210722154253-910bb7978349/go.mod h1:wi9BfjxjF/bwiZ701TzmfKu6UKC357IOAtNr0Td0Lvw= -github.com/polyfloyd/go-errorlint v1.0.5 h1:AHB5JRCjlmelh9RrLxT9sgzpalIwwq4hqE8EkwIwKdY= -github.com/polyfloyd/go-errorlint v1.0.5/go.mod h1:APVvOesVSAnne5SClsPxPdfvZTVDojXh1/G3qb5wjGI= -github.com/posener/complete v1.1.1 h1:ccV59UEOTzVDnDUEFdT95ZzHVZ+5+158q8+SJb2QV5w= +github.com/polyfloyd/go-errorlint v1.0.0/go.mod h1:KZy4xxPJyy88/gldCe5OdW6OQRtNO3EZE7hXzmnebgA= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= -github.com/posener/complete v1.2.3 h1:NP0eAhjcjImqslEwo/1hq7gpajME0fTLTezBKDqfXqo= github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= +github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs= -github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og= github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= -github.com/prometheus/client_golang v1.8.0/go.mod h1:O9VU6huf47PktckDQfMTX0Y8tY0/7TSWwj+ITvv0TnM= github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= +github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= +github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= +github.com/prometheus/client_golang v1.12.2/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_golang v1.15.1 h1:8tXpTmJbyH5lydzFPoxSIJ0J46jdh3tylbvM1xCv0LI= github.com/prometheus/client_golang v1.15.1/go.mod h1:e9yaBhRPU2pPNsZwE+JdQl0KEt1N9XgF6zxWmaC0xOk= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= @@ -2204,53 +1365,39 @@ github.com/prometheus/client_model v0.4.0 h1:5lQXD3cAg1OXBf4Wq03gTrXHeaV0TQvGfUo github.com/prometheus/client_model v0.4.0/go.mod h1:oMQmHW1/JoDwqLtg57MGgP/Fb1CJEYF2imWWhWtMkYU= github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc= github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA= github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= -github.com/prometheus/common v0.14.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= -github.com/prometheus/common v0.29.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= +github.com/prometheus/common v0.30.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= +github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/common v0.44.0 h1:+5BrQJwiBB9xsMygAB3TNvpQKOwlkc25LbISbrdOOfY= github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO7x0VV9VvuY= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= -github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.3.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= +github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/procfs v0.10.1 h1:kYK1Va/YMlutzCGazswoHKo//tZVlFpKYh+PymziUAg= github.com/prometheus/procfs v0.10.1/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM= -github.com/prometheus/tsdb v0.6.2-0.20190402121629-4f204dcbc150/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= -github.com/prometheus/tsdb v0.7.1 h1:YZcsG11NqnK4czYLrWd9mpEuAJIHVQLwdrleYfszMAA= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= -github.com/pseudomuto/protoc-gen-doc v1.3.2 h1:61vWZuxYa8D7Rn4h+2dgoTNqnluBmJya2MgbqO32z6g= github.com/pseudomuto/protoc-gen-doc v1.3.2/go.mod h1:y5+P6n3iGrbKG+9O04V5ld71in3v/bX88wUwgt+U8EA= -github.com/pseudomuto/protokit v0.2.0 h1:hlnBDcy3YEDXH7kc9gV+NLaN0cDzhDvD1s7Y6FZ8RpM= github.com/pseudomuto/protokit v0.2.0/go.mod h1:2PdH30hxVHsup8KpBTOXTBeMVhJZVio3Q8ViKSAXT0Q= -github.com/quasilyte/go-consistent v0.0.0-20190521200055-c6f3937de18c h1:JoUA0uz9U0FVFq5p4LjEq4C0VgQ0El320s3Ms0V4eww= -github.com/quasilyte/go-consistent v0.0.0-20190521200055-c6f3937de18c/go.mod h1:5STLWrekHfjyYwxBRVRXNOSewLJ3PWfDJd1VyTS21fI= github.com/quasilyte/go-ruleguard v0.3.1-0.20210203134552-1b5a410e1cc8/go.mod h1:KsAh3x0e7Fkpgs+Q9pNLS5XpFSvYCEVl5gP9Pp1xp30= -github.com/quasilyte/go-ruleguard v0.3.4/go.mod h1:57FZgMnoo6jqxkYKmVj5Fc8vOt0rVzoE/UNAmFFIPqA= -github.com/quasilyte/go-ruleguard v0.3.18 h1:sd+abO1PEI9fkYennwzHn9kl3nqP6M5vE7FiOzZ+5CE= -github.com/quasilyte/go-ruleguard v0.3.18/go.mod h1:lOIzcYlgxrQ2sGJ735EHXmf/e9MJ516j16K/Ifcttvs= +github.com/quasilyte/go-ruleguard v0.3.16-0.20220213074421-6aa060fab41a/go.mod h1:VMX+OnnSw4LicdiEGtRSD/1X8kW7GuEscjYNr4cOIT4= github.com/quasilyte/go-ruleguard/dsl v0.3.0/go.mod h1:KeCP03KrjuSO0H1kTuZQCWlQPulDV6YMIXmpQss17rU= -github.com/quasilyte/go-ruleguard/dsl v0.3.2 h1:ULi3SLXvDUgb0u2IM5xU6er9KeWBSaUh1NlDjCgLHU8= -github.com/quasilyte/go-ruleguard/dsl v0.3.2/go.mod h1:KeCP03KrjuSO0H1kTuZQCWlQPulDV6YMIXmpQss17rU= +github.com/quasilyte/go-ruleguard/dsl v0.3.16/go.mod h1:KeCP03KrjuSO0H1kTuZQCWlQPulDV6YMIXmpQss17rU= +github.com/quasilyte/go-ruleguard/dsl v0.3.21/go.mod h1:KeCP03KrjuSO0H1kTuZQCWlQPulDV6YMIXmpQss17rU= github.com/quasilyte/go-ruleguard/rules v0.0.0-20201231183845-9e62ed36efe1/go.mod h1:7JTjp89EGyU1d6XfBiXihJNG37wB2VRkd125Q1u7Plc= -github.com/quasilyte/go-ruleguard/rules v0.0.0-20210203162857-b223e0831f88 h1:PeTrJiH/dSeruL/Z9Db39NRMwI/yoA3oHCdCkg+Wh8A= -github.com/quasilyte/go-ruleguard/rules v0.0.0-20210203162857-b223e0831f88/go.mod h1:4cgAphtvu7Ftv7vOT2ZOYhC6CvBxZixcasr8qIOTA50= -github.com/quasilyte/gogrep v0.0.0-20220828223005-86e4605de09f h1:6Gtn2i04RD0gVyYf2/IUMTIs+qYleBt4zxDqkLTcu4U= -github.com/quasilyte/gogrep v0.0.0-20220828223005-86e4605de09f/go.mod h1:Cm9lpz9NZjEoL1tgZ2OgeUKPIxL1meE7eo60Z6Sk+Ng= -github.com/quasilyte/regex/syntax v0.0.0-20200407221936-30656e2c4a95 h1:L8QM9bvf68pVdQ3bCFZMDmnt9yqcMBro1pC7F+IPYMY= +github.com/quasilyte/go-ruleguard/rules v0.0.0-20211022131956-028d6511ab71/go.mod h1:4cgAphtvu7Ftv7vOT2ZOYhC6CvBxZixcasr8qIOTA50= +github.com/quasilyte/gogrep v0.0.0-20220120141003-628d8b3623b5/go.mod h1:wSEyW6O61xRV6zb6My3HxrQ5/8ke7NE2OayqCHa3xRM= github.com/quasilyte/regex/syntax v0.0.0-20200407221936-30656e2c4a95/go.mod h1:rlzQ04UMyJXu/aOvhd8qT+hvDrFpiwqp8MRXDY9szc0= -github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 h1:M8mH9eK4OUR4lu7Gd+PU1fV2/qnDNfzT635KRSObncs= github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567/go.mod h1:DWNGW8A4Y+GyBgPuaQJuWiy0XYftx4Xm/y5Jqk9I6VQ= github.com/rakyll/statik v0.1.7 h1:OF3QCZUuyPxuGEP7B4ypUa7sB/iHtqOTDYZXGM8KOdQ= github.com/rakyll/statik v0.1.7/go.mod h1:AlZONWzMtEnMs7W4e/1LURLiI49pIMmp6V9Unghqrcc= @@ -2258,124 +1405,74 @@ github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqn github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= -github.com/regen-network/cosmos-proto v0.3.1 h1:rV7iM4SSFAagvy8RiyhiACbWEGotmqzywPxOvwMdxcg= -github.com/regen-network/cosmos-proto v0.3.1/go.mod h1:jO0sVX6a1B36nmE8C9xBFXpNwWejXC7QqCOnH3O0+YM= github.com/regen-network/gocuke v0.6.2 h1:pHviZ0kKAq2U2hN2q3smKNxct6hS0mGByFMHGnWA97M= -github.com/regen-network/gocuke v0.6.2/go.mod h1:zYaqIHZobHyd0xOrHGPQjbhGJsuZ1oElx150u2o1xuk= github.com/regen-network/protobuf v1.3.3-alpha.regen.1 h1:OHEc+q5iIAXpqiqFKeLpu5NwTIkVXUs48vFMwzqpqY4= github.com/regen-network/protobuf v1.3.3-alpha.regen.1/go.mod h1:2DjTFR1HhMQhiWC5sZ4OhQ3+NtdbZ6oBDKQwq5Ou+FI= -github.com/retailnext/hllpp v1.0.1-0.20180308014038-101a6d2f8b52 h1:RnWNS9Hlm8BIkjr6wx8li5abe0fr73jljLycdfemTp0= +github.com/remyoudompheng/go-dbus v0.0.0-20121104212943-b7232d34b1d5/go.mod h1:+u151txRmLpwxBmpYn9z3d1sdJdjRPQpsXuYeY9jNls= +github.com/remyoudompheng/go-liblzma v0.0.0-20190506200333-81bf2d431b96/go.mod h1:90HvCY7+oHHUKkbeMCiHt1WuFR2/hPJ9QrljDG+v6ls= +github.com/remyoudompheng/go-misc v0.0.0-20190427085024-2d6ac652a50e/go.mod h1:80FQABjoFzZ2M5uEa6FUaJYEmqU2UOKojlFVak1UAwI= github.com/retailnext/hllpp v1.0.1-0.20180308014038-101a6d2f8b52/go.mod h1:RDpi1RftBQPUCDRw6SmxeaREsAaRKnOclghuzp/WRzc= -github.com/rjeczalik/notify v0.9.1 h1:CLCKso/QK1snAlnhNR/CNvNiFU2saUtjV0bx3EwNeCE= github.com/rjeczalik/notify v0.9.1/go.mod h1:rKwnCoCGeuQnwBtTSPL9Dad03Vh2n40ePRrjvIXnJho= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= -github.com/rogpeppe/fastuuid v1.2.0 h1:Ppwyp6VYCF1nvBTXL3trRso7mXMlRrw9ooo375wvi2s= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/rogpeppe/go-internal v1.6.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= +github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= +github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= -github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= -github.com/rs/cors v0.0.0-20160617231935-a62a804a8a00/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= +github.com/rs/cors v1.8.2/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/rs/cors v1.8.3 h1:O+qNyWn7Z+F9M0ILBHgMVPuB1xTOucVd5gtaYyXBpRo= github.com/rs/cors v1.8.3/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= -github.com/rs/xhandler v0.0.0-20160618193221-ed27b6fd6521 h1:3hxavr+IHMsQBrYUPQM5v0CgENFktkkbg1sfpgM3h20= -github.com/rs/xhandler v0.0.0-20160618193221-ed27b6fd6521/go.mod h1:RvLn4FgxWubrpZHtQLnOf6EwhN2hEMusxZOhcW9H3UQ= -github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= -github.com/rs/xid v1.4.0 h1:qd7wPTDkN6KQx2VmMBLrpHkiyQwgFXRnkOLacUiaSNY= +github.com/rs/xid v1.3.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= -github.com/rs/zerolog v1.23.0/go.mod h1:6c7hFfxPOy7TacJc4Fcdi24/J0NKYGzjG8FWRI916Qo= +github.com/rs/zerolog v1.27.0/go.mod h1:7frBqO0oezxmnO7GF86FY++uy8I0Tk/If5ni1G9Qc0U= github.com/rs/zerolog v1.29.1 h1:cO+d60CHkknCbvzEWxP0S9K6KqyTjrCNUy1LdQLCGPc= github.com/rs/zerolog v1.29.1/go.mod h1:Le6ESbR7hc+DP6Lt1THiV8CQSdkkNrd3R0XbEgp3ZBU= -github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryancurrah/gomodguard v1.2.3/go.mod h1:rYbA/4Tg5c54mV1sv4sQTP5WOPBcoLtnBZ7/TEhXAbg= -github.com/ryancurrah/gomodguard v1.2.4 h1:CpMSDKan0LtNGGhPrvupAoLeObRFjND8/tU1rEOtBp4= -github.com/ryancurrah/gomodguard v1.2.4/go.mod h1:+Kem4VjWwvFpUJRJSwa16s1tBJe+vbv02+naTow2f6M= -github.com/ryanrolds/sqlclosecheck v0.3.0 h1:AZx+Bixh8zdUBxUA1NxbxVAS78vTPq4rCb8OUZI9xFw= github.com/ryanrolds/sqlclosecheck v0.3.0/go.mod h1:1gREqxyTGR3lVtpngyFo3hZAgk0KCtEdgEkHwDbigdA= -github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f h1:UFr9zpz4xgTnIE5yIMtWAMngCdZ9p/+q6lTbgelo80M= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/sagikazarmark/crypt v0.3.0/go.mod h1:uD/D+6UF4SrIR1uGEv7bBNkNqLGqUr43MRiaGWX1Nig= -github.com/sagikazarmark/crypt v0.4.0/go.mod h1:ALv2SRj7GxYV4HO9elxH9nS6M9gW+xDNxqmyJ6RfDFM= -github.com/sagikazarmark/crypt v0.10.0 h1:96E1qrToLBU6fGzo+PRRz7KGOc9FkYFiPnR3/zf8Smg= -github.com/sagikazarmark/crypt v0.10.0/go.mod h1:gwTNHQVoOS3xp9Xvz5LLR+1AauC5M6880z5NWzdhOyQ= -github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da h1:p3Vo3i64TCLY7gIfzeQaUJ+kppEO5WQG3cL8iE8tGHU= +github.com/sagikazarmark/crypt v0.6.0/go.mod h1:U8+INwJo3nBv1m6A/8OBXAq7Jnpspk5AxSgDyEQcea8= github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= -github.com/sanposhiho/wastedassign/v2 v2.0.6 h1:+6/hQIHKNJAUixEj6EmOngGIisyeI+T3335lYTyxRoA= github.com/sanposhiho/wastedassign/v2 v2.0.6/go.mod h1:KyZ0MWTwxxBmfwn33zh3k1dmsbF2ud9pAAGfoLfjhtI= -github.com/sasha-s/go-deadlock v0.2.0/go.mod h1:StQn567HiB1fF2yJ44N9au7wOhrPS3iZqiDbRupzT10= github.com/sasha-s/go-deadlock v0.2.1-0.20190427202633-1595213edefa/go.mod h1:F73l+cr82YSh10GxyRI6qZiCgK64VaZjwesgfQ1/iLM= github.com/sasha-s/go-deadlock v0.3.1 h1:sqv7fDNShgjcaxkO0JNcOAlr8B9+cV5Ey/OB71efZx0= github.com/sasha-s/go-deadlock v0.3.1/go.mod h1:F73l+cr82YSh10GxyRI6qZiCgK64VaZjwesgfQ1/iLM= -github.com/sashamelentyev/interfacebloat v1.1.0 h1:xdRdJp0irL086OyW1H/RTZTr1h/tMEOsumirXcOJqAw= -github.com/sashamelentyev/interfacebloat v1.1.0/go.mod h1:+Y9yU5YdTkrNvoX0xHc84dxiN1iBi9+G8zZIhPVoNjQ= -github.com/sashamelentyev/usestdlibvars v1.20.0 h1:K6CXjqqtSYSsuyRDDC7Sjn6vTMLiSJa4ZmDkiokoqtw= -github.com/sashamelentyev/usestdlibvars v1.20.0/go.mod h1:0GaP+ecfZMXShS0A94CJn6aEuPRILv8h/VuWI9n1ygg= -github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww= -github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= -github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= -github.com/seccomp/libseccomp-golang v0.9.1 h1:NJjM5DNFOs0s3kYE1WUOr6G8V97sdt46rlXTMfXGWBo= -github.com/seccomp/libseccomp-golang v0.9.1/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvWlF4P2Ca7zGrPiEpWo= -github.com/securego/gosec/v2 v2.8.1/go.mod h1:pUmsq6+VyFEElJMUX+QB3p3LWNHXg1R3xh2ssVJPs8Q= -github.com/securego/gosec/v2 v2.13.1 h1:7mU32qn2dyC81MH9L2kefnQyRMUarfDER3iQyMHcjYM= -github.com/securego/gosec/v2 v2.13.1/go.mod h1:EO1sImBMBWFjOTFzMWfTRrZW6M15gm60ljzrmy/wtHo= -github.com/segmentio/fasthash v1.0.3 h1:EI9+KE1EwvMLBWwjpRDc+fEM+prwxDYbslddQGtrmhM= +github.com/seccomp/libseccomp-golang v0.9.2-0.20210429002308-3879420cc921/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg= +github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg= +github.com/securego/gosec/v2 v2.12.0/go.mod h1:iTpT+eKTw59bSgklBHlSnH5O2tNygHMDxfvMubA4i7I= github.com/segmentio/fasthash v1.0.3/go.mod h1:waKX8l2N8yckOgmSsXJi7x1ZfdKZ4x7KRMzBtS3oedY= github.com/segmentio/kafka-go v0.1.0/go.mod h1:X6itGqS9L4jDletMsxZ7Dz+JFWxM6JHfPOCvTvk+EJo= -github.com/segmentio/kafka-go v0.2.0 h1:HtCSf6B4gN/87yc5qTl7WsxPKQIIGXLPPM1bMCPOsoY= github.com/segmentio/kafka-go v0.2.0/go.mod h1:X6itGqS9L4jDletMsxZ7Dz+JFWxM6JHfPOCvTvk+EJo= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= -github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0= github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= -github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c h1:W65qqJCIOVP4jpqPQ0YvHYKwcMEMVWIzWC5iNQQfBTU= github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c/go.mod h1:/PevMnwAxekIXwN8qQyfc5gl2NlkB3CQlkizAbOkeBs= -github.com/shirou/gopsutil v2.20.5+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= -github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible h1:Bn1aCHHRnjv4Bl16T8rcaFjYSrGrIZvpiGO6P3Q4GpU= github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= -github.com/shirou/gopsutil/v3 v3.21.7 h1:PnTqQamUjwEDSgn+nBGu0qSDV/CfvyiR/gwTH3i7HTU= -github.com/shirou/gopsutil/v3 v3.21.7/go.mod h1:RGl11Y7XMTQPmHh8F0ayC6haKNBgH4PXMJuTAcMOlz4= -github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e h1:MZM7FHLqUHYI0Y/mQAt3d2aYa0SiNms/hFqC9qJYolM= +github.com/shirou/gopsutil/v3 v3.22.6/go.mod h1:EdIubSnZhbAvBS1yJ7Xi+AShB/hxwLHOMz4MCYz7yMs= github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk= -github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041 h1:llrF3Fs4018ePo4+G/HV/uQUqEI1HMDjCeOf2V6puPc= github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod h1:N5mDOmsrJOB+vfqUK+7DmDyjhSLIIBnXo9lvZJj3MWQ= -github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= -github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= -github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= -github.com/sivchari/containedctx v1.0.2 h1:0hLQKpgC53OVF1VT7CeoFHk9YKstur1XOgfYIc1yrHI= github.com/sivchari/containedctx v1.0.2/go.mod h1:PwZOeqm4/DLoJOqMSIJs3aKqXRX4YO+uXww087KZ7Bw= -github.com/sivchari/nosnakecase v1.7.0 h1:7QkpWIRMe8x25gckkFd2A5Pi6Ymo0qgr4JrhGt95do8= -github.com/sivchari/nosnakecase v1.7.0/go.mod h1:CwDzrzPea40/GB6uynrNLiorAlgFRvRbFSgJx2Gs+QY= -github.com/sivchari/tenv v1.7.0 h1:d4laZMBK6jpe5PWepxlV9S+LC0yXqvYHiq8E6ceoVVE= -github.com/sivchari/tenv v1.7.0/go.mod h1:64yStXKSOxDfX47NlhVwND4dHwfZDdbp2Lyl018Icvg= -github.com/skeema/knownhosts v1.1.0 h1:Wvr9V0MxhjRbl3f9nMnKnFfiWTJmtECJ9Njkea3ysW0= -github.com/skeema/knownhosts v1.1.0/go.mod h1:sKFq3RD6/TKZkSWn8boUbDC7Qkgcv+8XXijpFO6roag= +github.com/sivchari/nosnakecase v1.5.0/go.mod h1:CwDzrzPea40/GB6uynrNLiorAlgFRvRbFSgJx2Gs+QY= +github.com/sivchari/tenv v1.6.0/go.mod h1:64yStXKSOxDfX47NlhVwND4dHwfZDdbp2Lyl018Icvg= github.com/skip-mev/pob v1.0.3 h1:cipN/WUU+xfYbcfUQ4EefSvl3ItocsKgRn3tOtRF2OE= github.com/skip-mev/pob v1.0.3/go.mod h1:PMs/dqcWOQruSN6zLExU0TzlBfBmGA8iTy+FJhxn0T8= -github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= -github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= -github.com/snikch/goodman v0.0.0-20171125024755-10e37e294daa h1:YJfZp12Z3AFhSBeXOlv4BO55RMwPn2NoQeDsrdWnBtY= github.com/snikch/goodman v0.0.0-20171125024755-10e37e294daa/go.mod h1:oJyF+mSPHbB5mVY2iO9KV3pTt/QbIkGaO8gQ2WrDbP4= -github.com/soheilhy/cmux v0.1.4 h1:0HKaf1o97UwFjHH9o5XsHUOF+tqmdA7KEzXLpiyaw0E= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= -github.com/sonatard/noctx v0.0.1 h1:VC1Qhl6Oxx9vvWo3UDgrGXYCeKCe3Wbw7qAWL6FrmTY= github.com/sonatard/noctx v0.0.1/go.mod h1:9D2D/EoULe8Yy2joDHJj7bv3sZoq9AaSb8B4lqBjiZI= -github.com/sony/gobreaker v0.4.1 h1:oMnRNZXX5j85zso6xCPRNPtmAycat+WcoKbklScLDgQ= github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY= -github.com/sourcegraph/go-diff v0.6.1 h1:hmA1LzxW0n1c3Q4YbrFgg4P99GSnebYa3x8gr0HZqLQ= github.com/sourcegraph/go-diff v0.6.1/go.mod h1:iBszgVvyxdc8SFZ7gm69go2KDdt3ag071iBaWPF6cjs= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI= @@ -2383,19 +1480,19 @@ github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2 github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4= github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= +github.com/spf13/afero v1.8.2/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo= github.com/spf13/afero v1.9.5 h1:stMpOSZFs//0Lv29HduCmli3GUfpFoF3Y1Q/aXj/wVM= github.com/spf13/afero v1.9.5/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU= github.com/spf13/cast v1.5.1 h1:R+kOtfhWQE6TVQzY+4D7wJLBgkdVasCEFxSUBYBYIlA= github.com/spf13/cast v1.5.1/go.mod h1:b9PdjNptOpzXr7Rq1q9gJML/2cdGQAo69NKzQ10KN48= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= -github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= -github.com/spf13/cobra v1.1.1/go.mod h1:WnodtKOvamDL/PwE2M4iKs8aMDBZ5Q5klgD3qfVJQMI= -github.com/spf13/cobra v1.2.1/go.mod h1:ExllRjgxM/piMAM+3tAZvg8fsklGAf3tPfi+i8t68Nk= github.com/spf13/cobra v1.3.0/go.mod h1:BrRVncBjOJa/eUcVVm9CE+oC6as8k+VYr4NY7WCi9V4= +github.com/spf13/cobra v1.4.0/go.mod h1:Wo4iy3BUC+X2Fybo0PDqwJIv3dNRiZLHQymsfxlB84g= +github.com/spf13/cobra v1.5.0/go.mod h1:dWXEIy2H428czQCjInthrTRUg7yKbok+2Qi/yBIJoUM= github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I= github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= @@ -2406,37 +1503,22 @@ github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnIn github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= -github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= -github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= -github.com/spf13/viper v1.7.1/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= -github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns= github.com/spf13/viper v1.10.0/go.mod h1:SoyBPwAtKDzypXNDFKN5kzH7ppppbGZtls1UpIy5AsM= -github.com/spf13/viper v1.10.1/go.mod h1:IGlFPqhNAPKRxohIzWpI5QEy4kuI7tcl5WvR+8qy1rU= +github.com/spf13/viper v1.12.0/go.mod h1:b6COn30jlNxbm/V2IqWiNWkJ+vZNiMNksliPCiuKtSI= github.com/spf13/viper v1.16.0 h1:rGGH0XDZhdUOryiDWjmIvUSWpbNqisK8Wk0Vyefw8hc= github.com/spf13/viper v1.16.0/go.mod h1:yg78JgCJcbrQOvV9YLXgkLaZqUidkY9K+Dd1FofRzQg= -github.com/ssgreg/nlreturn/v2 v2.1.0/go.mod h1:E/iiPB78hV7Szg2YfRgyIrk1AD6JVMTRkkxBiELzh2I= -github.com/ssgreg/nlreturn/v2 v2.2.1 h1:X4XDI7jstt3ySqGU86YGAURbxw3oTDPK9sPEi6YEwQ0= github.com/ssgreg/nlreturn/v2 v2.2.1/go.mod h1:E/iiPB78hV7Szg2YfRgyIrk1AD6JVMTRkkxBiELzh2I= -github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4 h1:Gb2Tyox57NRNuZ2d3rmvB3pcmbu7O1RS3m8WRx7ilrg= github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4/go.mod h1:RZLeN1LMWmRsyYjvAu+I6Dm9QmlDaIIt+Y+4Kd7Tp+Q= -github.com/stbenjam/no-sprintf-host-port v0.1.1 h1:tYugd/yrm1O0dV+ThCbaKZh195Dfm07ysF0U6JQXczc= github.com/stbenjam/no-sprintf-host-port v0.1.1/go.mod h1:TLhvtIvONRzdmkFiio4O8LHsN9N74I+PhRquPsxpL0I= -github.com/steakknife/bloomfilter v0.0.0-20180922174646-6819c0d2a570 h1:gIlAHnH1vJb5vwEjIp5kBj/eu99p/bl0Ay2goiPe5xE= -github.com/steakknife/bloomfilter v0.0.0-20180922174646-6819c0d2a570/go.mod h1:8OR4w3TdeIHIh1g6EMY5p0gVNOovcWC+1vpc7naMuAw= -github.com/steakknife/hamming v0.0.0-20180906055917-c99c65617cd3 h1:njlZPzLwU639dk2kqnCPPv+wNjq7Xb6EfUxe/oX0/NM= -github.com/steakknife/hamming v0.0.0-20180906055917-c99c65617cd3/go.mod h1:hpGUWaI9xL8pRQCTXQgocU38Qw1g0Us7n5PxxTwTCYU= github.com/strangelove-ventures/packet-forward-middleware/v7 v7.0.0-20230523193151-73dea436e53f h1:NJdZ+YJ9Vf2t286L20IjFK0SxGpobF1xIp5ZQlxWetk= github.com/strangelove-ventures/packet-forward-middleware/v7 v7.0.0-20230523193151-73dea436e53f/go.mod h1:DJNSVK8NCYHM+aZHCFkcAqPwjzwHYAjhjSMlhAGtJ3c= github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= -github.com/streadway/amqp v1.0.0 h1:kuuDrUJFZL1QYL9hUNuCxNObNzB0bV/ZG5jV3RWAQgo= github.com/streadway/amqp v1.0.0/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= -github.com/streadway/handy v0.0.0-20200128134331-0f66f006fb2e h1:mOtuXaRAbVZsxAHVdPR3IjfmN8T1h2iczJLynhLybf8= github.com/streadway/handy v0.0.0-20200128134331-0f66f006fb2e/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.3.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= @@ -2450,219 +1532,130 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= +github.com/stretchr/testify v1.7.5/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= +github.com/subosito/gotenv v1.3.0/go.mod h1:YzJjq/33h7nrwdY+iHMhEOEEbW0ovIz0tB6t6PwAXzs= +github.com/subosito/gotenv v1.4.0/go.mod h1:mZd6rFysKEcUhUHXJk0C/08wAgyDBFuwEYL7vWWGaGo= github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8= github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= -github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 h1:kdXcSzyDtseVEc4yCz2qF8ZrQvIDBJLl4S1c3GCXmoI= +github.com/sylvia7788/contextcheck v1.0.4/go.mod h1:vuPKJMQ7MQ91ZTqfdyreNKwZjyUg6KO+IebVyQDedZQ= github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY= github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc= -github.com/tdakkota/asciicheck v0.0.0-20200416200610-e657995f937b/go.mod h1:yHp0ai0Z9gUljN3o0xMhYJnH/IcvkdTBOX2fmJ93JEM= -github.com/tdakkota/asciicheck v0.1.1 h1:PKzG7JUTUmVspQTDqtkX9eSiLGossXTybutHwTXuO0A= github.com/tdakkota/asciicheck v0.1.1/go.mod h1:yHp0ai0Z9gUljN3o0xMhYJnH/IcvkdTBOX2fmJ93JEM= -github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c h1:g+WoO5jjkqGAzHWCjJB1zZfXPIAaDpzXIEJ0eS6B5Ok= github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c/go.mod h1:ahpPrc7HpcfEWDQRZEmnXMzHY03mLDYMCxeDzy46i+8= -github.com/tendermint/btcd v0.1.1 h1:0VcxPfflS2zZ3RiOAHkBiFUcPvbtRj5O7zHmcJWHV7s= -github.com/tendermint/btcd v0.1.1/go.mod h1:DC6/m53jtQzr/NFmMNEu0rxf18/ktVoVtMrnDD5pN+U= -github.com/tendermint/crypto v0.0.0-20191022145703-50d29ede1e15 h1:hqAk8riJvK4RMWx1aInLzndwxKalgi5rTqgfXxOxbEI= -github.com/tendermint/crypto v0.0.0-20191022145703-50d29ede1e15/go.mod h1:z4YtwM70uOnk8h0pjJYlj3zdYwi9l03By6iAIF5j/Pk= github.com/tendermint/go-amino v0.16.0 h1:GyhmgQKvqF82e2oZeuMSp9JTN0N09emoSZlb2lyGa2E= github.com/tendermint/go-amino v0.16.0/go.mod h1:TQU0M1i/ImAo+tYpZi73AU3V/dKeCoMC9Sphe2ZwGME= -github.com/tendermint/spm v0.1.9 h1:O1DJF4evS8wgk5SZqRcO29irNNtKQmTpvQ0xFzUiczI= -github.com/tendermint/spm v0.1.9/go.mod h1:iHgfQ5YOI6ONc9E7ugGQolVdfSMHpeXfZ/OpXuN/42Q= -github.com/tendermint/tendermint v0.34.0-rc4/go.mod h1:yotsojf2C1QBOw4dZrTcxbyxmPUrT4hNuOQWX9XUwB4= -github.com/tendermint/tendermint v0.34.0-rc6/go.mod h1:ugzyZO5foutZImv0Iyx/gOFCX6mjJTgbLHTwi17VDVg= -github.com/tendermint/tendermint v0.34.0/go.mod h1:Aj3PIipBFSNO21r+Lq3TtzQ+uKESxkbA3yo/INM4QwQ= -github.com/tendermint/tendermint v0.34.13/go.mod h1:6RVVRBqwtKhA+H59APKumO+B7Nye4QXSFc6+TYxAxCI= -github.com/tendermint/tendermint v0.34.14 h1:GCXmlS8Bqd2Ix3TQCpwYLUNHe+Y+QyJsm5YE+S/FkPo= -github.com/tendermint/tendermint v0.34.14/go.mod h1:FrwVm3TvsVicI9Z7FlucHV6Znfd5KBc/Lpp69cCwtk0= -github.com/tendermint/tm-db v0.6.2/go.mod h1:GYtQ67SUvATOcoY8/+x6ylk8Qo02BQyLrAs+yAcLvGI= -github.com/tendermint/tm-db v0.6.3/go.mod h1:lfA1dL9/Y/Y8wwyPp2NMLyn5P5Ptr/gvDFNWtrCWSf8= -github.com/tendermint/tm-db v0.6.4 h1:3N2jlnYQkXNQclQwd/eKV/NzlqPlfK21cpRRIx80XXQ= -github.com/tendermint/tm-db v0.6.4/go.mod h1:dptYhIpJ2M5kUuenLr+Yyf3zQOv1SgBZcl8/BmWlMBw= -github.com/tetafro/godot v1.4.9/go.mod h1:LR3CJpxDVGlYOWn3ZZg1PgNZdTUvzsZWu8xaEohUpn8= -github.com/tetafro/godot v1.4.11 h1:BVoBIqAf/2QdbFmSwAWnaIqDivZdOV0ZRwEm6jivLKw= +github.com/tendermint/tendermint v0.35.9 h1:yUEgfkcNHWSidsU8wHjRDbYPVijV4cHxCclKVITGRAQ= +github.com/tendermint/tendermint v0.35.9/go.mod h1:FYvzUDkmVv1awfFl9V85yl5NKyjxz6XLZGX132+ftAY= +github.com/tendermint/tm-db v0.6.6/go.mod h1:wP8d49A85B7/erz/r4YbKssKw6ylsO/hKtFk7E1aWZI= +github.com/tenntenn/modver v1.0.1/go.mod h1:bePIyQPb7UeioSRkw3Q0XeMhYZSMx9B8ePqg6SAMGH0= +github.com/tenntenn/text/transform v0.0.0-20200319021203-7eef512accb3/go.mod h1:ON8b8w4BN/kE1EOhwT0o+d62W65a6aPw1nouo9LMgyY= github.com/tetafro/godot v1.4.11/go.mod h1:LR3CJpxDVGlYOWn3ZZg1PgNZdTUvzsZWu8xaEohUpn8= github.com/tidwall/btree v1.6.0 h1:LDZfKfQIBHGHWSwckhXI0RPSXzlo+KYdjK7FWSqOzzg= github.com/tidwall/btree v1.6.0/go.mod h1:twD9XRA5jj9VUQGELzDO4HPQTNJsoWWfYEL+EUQ2cKY= -github.com/tidwall/gjson v1.6.7/go.mod h1:zeFuBCIqD4sN/gmqBzZ4j7Jd6UcA2Fc56x7QFsv+8fI= github.com/tidwall/gjson v1.12.1/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= github.com/tidwall/gjson v1.14.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= -github.com/tidwall/gjson v1.14.4 h1:uo0p8EbA09J7RQaflQ1aBRffTR7xedD2bcIVSYxLnkM= -github.com/tidwall/gjson v1.14.4/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= -github.com/tidwall/match v1.0.3/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= -github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA= github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= -github.com/tidwall/pretty v1.0.2/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= -github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs= github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU= -github.com/tidwall/sjson v1.1.4/go.mod h1:wXpKXu8CtDjKAZ+3DrKY5ROCorDFahq8l0tey/Lx1fg= -github.com/tidwall/sjson v1.2.4 h1:cuiLzLnaMeBhRmEv00Lpk3tkYrcxpmbU81tAY4Dw0tc= github.com/tidwall/sjson v1.2.4/go.mod h1:098SZ494YoMWPmMO6ct4dcFnqxwj9r/gF0Etp19pSNM= -github.com/timakin/bodyclose v0.0.0-20200424151742-cb6215831a94/go.mod h1:Qimiffbc6q9tBWlVV6x0P9sat/ao1xEkREYPPj9hphk= -github.com/timakin/bodyclose v0.0.0-20210704033933-f49887972144 h1:kl4KhGNsJIbDHS9/4U9yQo1UcPQM0kOMJHn29EoH/Ro= github.com/timakin/bodyclose v0.0.0-20210704033933-f49887972144/go.mod h1:Qimiffbc6q9tBWlVV6x0P9sat/ao1xEkREYPPj9hphk= -github.com/timonwong/loggercheck v0.9.3 h1:ecACo9fNiHxX4/Bc02rW2+kaJIAMAes7qJ7JKxt0EZI= -github.com/timonwong/loggercheck v0.9.3/go.mod h1:wUqnk9yAOIKtGA39l1KLE9Iz0QiTocu/YZoOf+OzFdw= -github.com/tinylib/msgp v1.0.2 h1:DfdQrzQa7Yh2es9SuLkixqxuXS2SxsdYn0KbdrOGWD8= github.com/tinylib/msgp v1.0.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE= -github.com/tklauser/go-sysconf v0.3.5 h1:uu3Xl4nkLzQfXNsWn15rPc/HQCJKObbt1dKJeWp3vU4= +github.com/tinylib/msgp v1.1.5/go.mod h1:eQsjooMTnV42mHu917E26IogZ2930nFyBQdofk10Udg= +github.com/tj/assert v0.0.3/go.mod h1:Ne6X72Q+TB1AteidzQncjw9PabbMp4PBMZ1k+vd1Pvk= github.com/tklauser/go-sysconf v0.3.5/go.mod h1:MkWzOF4RMCshBAMXuhXJs64Rte09mITnppBXY/rYEFI= -github.com/tklauser/go-sysconf v0.3.7 h1:HT7h4+536gjqeq1ZIJPgOl1rg1XFatQGVZWp7Py53eg= -github.com/tklauser/go-sysconf v0.3.7/go.mod h1:JZIdXh4RmBvZDBZ41ld2bGxRV3n4daiiqA3skYhAoQ4= -github.com/tklauser/numcpus v0.2.2 h1:oyhllyrScuYI6g+h/zUvNXNp1wy7x8qQy3t/piefldA= +github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk= github.com/tklauser/numcpus v0.2.2/go.mod h1:x3qojaO3uyYt0i56EW/VUYs7uBvdl2fkfZFu0T9wgjM= -github.com/tklauser/numcpus v0.2.3 h1:nQ0QYpiritP6ViFhrKYsiv6VVxOpum2Gks5GhnJbS/8= -github.com/tklauser/numcpus v0.2.3/go.mod h1:vpEPS/JC+oZGGQ/My/vJnNsvMDQL6PwOqt8dsCw5j+E= -github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8 h1:ndzgwNDnKIqyCvHTXaCqh9KlOWKvBry6nuXMJmonVsE= +github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/tmc/grpc-websocket-proxy v0.0.0-20200427203606-3cfed13b9966 h1:j6JEOq5QWFker+d7mFQYOhjTZonQ7YkLTHm56dbn+yM= github.com/tmc/grpc-websocket-proxy v0.0.0-20200427203606-3cfed13b9966/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/tomarrell/wrapcheck/v2 v2.3.0/go.mod h1:aF5rnkdtqNWP/gC7vPUO5pKsB0Oac2FDTQP4F+dpZMU= -github.com/tomarrell/wrapcheck/v2 v2.7.0 h1:J/F8DbSKJC83bAvC6FoZaRjZiZ/iKoueSdrEkmGeacA= -github.com/tomarrell/wrapcheck/v2 v2.7.0/go.mod h1:ao7l5p0aOlUNJKI0qVwB4Yjlqutd0IvAB9Rdwyilxvg= -github.com/tomasen/realip v0.0.0-20180522021738-f0c99a92ddce h1:fb190+cK2Xz/dvi9Hv8eCYJYvIGUTN2/KLq1pT6CjEc= +github.com/tomarrell/wrapcheck/v2 v2.6.2/go.mod h1:ao7l5p0aOlUNJKI0qVwB4Yjlqutd0IvAB9Rdwyilxvg= github.com/tomasen/realip v0.0.0-20180522021738-f0c99a92ddce/go.mod h1:o8v6yHRoik09Xen7gje4m9ERNah1d1PPsVq1VEx9vE4= -github.com/tommy-muehle/go-mnd/v2 v2.4.0/go.mod h1:WsUAkMJMYww6l/ufffCD3m+P7LEvr8TnZn9lwVDlgzw= -github.com/tommy-muehle/go-mnd/v2 v2.5.1 h1:NowYhSdyE/1zwK9QCLeRb6USWdoif80Ie+v+yU8u1Zw= -github.com/tommy-muehle/go-mnd/v2 v2.5.1/go.mod h1:WsUAkMJMYww6l/ufffCD3m+P7LEvr8TnZn9lwVDlgzw= -github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926 h1:G3dpKMzFDjgEh2q1Z7zUUtKa8ViPtH+ocF0bE0g00O8= +github.com/tommy-muehle/go-mnd/v2 v2.5.0/go.mod h1:WsUAkMJMYww6l/ufffCD3m+P7LEvr8TnZn9lwVDlgzw= +github.com/ttacon/chalk v0.0.0-20160626202418-22c06c80ed31/go.mod h1:onvgF043R+lC5RZ8IT9rBXDaEDnpnw/Cl+HFiw+v/7Q= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= github.com/tyler-smith/go-bip39 v1.0.1-0.20181017060643-dbb3b84ba2ef/go.mod h1:sJ5fKU0s6JVwZjjcUEX2zFOnvq0ASQ2K9Zr6cf67kNs= -github.com/tyler-smith/go-bip39 v1.0.2 h1:+t3w+KwLXO6154GNJY+qUtIxLTmFjfUmpguQT1OlOT8= github.com/tyler-smith/go-bip39 v1.0.2/go.mod h1:sJ5fKU0s6JVwZjjcUEX2zFOnvq0ASQ2K9Zr6cf67kNs= -github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo= github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= github.com/ugorji/go/codec v1.2.7 h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0= -github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY= github.com/ulikunitz/xz v0.5.10/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8= github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= -github.com/ultraware/funlen v0.0.3 h1:5ylVWm8wsNwH5aWo9438pwvsK0QiqVuUrt9bn7S/iLA= github.com/ultraware/funlen v0.0.3/go.mod h1:Dp4UiAus7Wdb9KUZsYWZEWiRzGuM2kXM1lPbfaF6xhA= -github.com/ultraware/whitespace v0.0.4/go.mod h1:aVMh/gQve5Maj9hQ/hg+F75lr/X5A89uZnzAmWSineA= -github.com/ultraware/whitespace v0.0.5 h1:hh+/cpIcopyMYbZNVov9iSxvJU3OYQg78Sfaqzi/CzI= github.com/ultraware/whitespace v0.0.5/go.mod h1:aVMh/gQve5Maj9hQ/hg+F75lr/X5A89uZnzAmWSineA= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= -github.com/urfave/cli v1.22.1 h1:+mkCCcOFKPnCmVYVcURKps1Xe+3zP90gSYGNfRkjoIY= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= -github.com/urfave/cli/v2 v2.3.0 h1:qph92Y649prgesehzOrQjdWyxFOp/QVM+6imKHad91M= github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI= -github.com/uudashr/gocognit v1.0.5/go.mod h1:wgYz0mitoKOTysqxTDMOUXg+Jb5SvtihkfmugIZYpEA= -github.com/uudashr/gocognit v1.0.6 h1:2Cgi6MweCsdB6kpcVQp7EW4U23iBFQWfTXiWlyp842Y= github.com/uudashr/gocognit v1.0.6/go.mod h1:nAIUuVBnYU7pcninia3BHOvQkpQCeO76Uscky5BOwcY= -github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= -github.com/valyala/fasthttp v1.16.0 h1:9zAqOYLl8Tuy3E5R6ckzGDJ1g8+pw15oQp2iL9Jl6gQ= -github.com/valyala/fasthttp v1.16.0/go.mod h1:YOKImeEosDdBPnxc0gy7INqi3m1zK6A+xl6TwOBhHCA= +github.com/valyala/fasthttp v1.30.0/go.mod h1:2rsYD01CKFrjjsvFxx75KlEUNpWNBY9JWD3K/7o2Cus= github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8= -github.com/valyala/fasttemplate v1.2.1 h1:TVEnxayobAdVkhQfrfes2IzOB6o+z4roRkPF52WA1u4= github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= -github.com/valyala/quicktemplate v1.6.3 h1:O7EuMwuH7Q94U2CXD6sOX8AYHqQqWtmIk690IhmpkKA= -github.com/valyala/quicktemplate v1.6.3/go.mod h1:fwPzK2fHuYEODzJ9pkw0ipCPNHZ2tD5KW4lOuSdPKzY= -github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a h1:0R4NLDRDZX6JcmhJgXi5E4b8Wg84ihbmUKp/GvSPEzc= -github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio= -github.com/vektra/mockery/v2 v2.14.0 h1:KZ1p5Hrn8tiY+LErRMr14HHle6khxo+JKOXLBW/yfqs= +github.com/valyala/quicktemplate v1.7.0/go.mod h1:sqKJnoaOF88V07vkO+9FL8fb9uZg/VPSJnLYn+LmLk8= +github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc= github.com/vektra/mockery/v2 v2.14.0/go.mod h1:bnD1T8tExSgPD1ripLkDbr60JA9VtQeu12P3wgLZd7M= -github.com/viki-org/dnscache v0.0.0-20130720023526-c70c1f23c5d8 h1:EVObHAr8DqpoJCVv6KYTle8FEImKhtkfcZetNqxDoJQ= github.com/viki-org/dnscache v0.0.0-20130720023526-c70c1f23c5d8/go.mod h1:dniwbG03GafCjFohMDmz6Zc6oCuiqgH6tGNyXTkHzXE= -github.com/vishvananda/netlink v1.1.0 h1:1iyaYNBLmP6L0220aDnYQpo1QEV4t4hJ+xEEhhJH8j0= github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE= -github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df h1:OviZH7qLw/7ZovXvuNyL3XQl8UFofeikI1NW1Gypu7k= github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU= -github.com/vmihailenco/msgpack/v5 v5.1.4/go.mod h1:C5gboKD0TJPqWDTVTtrQNfRbiBwHZGo8UTqP/9/XvLI= -github.com/vmihailenco/msgpack/v5 v5.3.5 h1:5gO0H1iULLWGhs2H5tbAHIZTV8/cYafcFOr9znI5mJU= github.com/vmihailenco/msgpack/v5 v5.3.5/go.mod h1:7xyJ9e+0+9SaZT0Wt1RGleJXzli6Q/V5KbhBonMG9jc= -github.com/vmihailenco/tagparser v0.1.2 h1:gnjoVuB/kljJ5wICEEOpx98oXMWPLj22G67Vbd1qPqc= -github.com/vmihailenco/tagparser v0.1.2/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI= -github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g= github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds= -github.com/willf/bitset v1.1.3 h1:ekJIKh6+YbUIVt9DfNbkR5d6aFcFTLDRyJNAACURBg8= github.com/willf/bitset v1.1.3/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4= -github.com/wsddn/go-ecdh v0.0.0-20161211032359-48726bab9208 h1:1cngl9mPEoITZG8s8cVcUy5CeIBYhEESkOB7m6Gmkrk= -github.com/wsddn/go-ecdh v0.0.0-20161211032359-48726bab9208/go.mod h1:IotVbo4F+mw0EzQ08zFqg7pK3FebNXpaMsRy2RT+Ees= -github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM= -github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw= -github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f h1:J9EGpcZtP0E/raorCMxlFGSTBrsSlaDGf3jU/qvAE2c= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= -github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0= +github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= -github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74= github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= -github.com/xhit/go-str2duration/v2 v2.1.0 h1:lxklc02Drh6ynqX+DdPyp5pCKLUQpRT8bp8Ydu2Bstc= -github.com/xhit/go-str2duration/v2 v2.1.0/go.mod h1:ohY8p+0f07DiV6Em5LKB0s2YpLtXVyJfNt1+BlmyAsU= -github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 h1:eY9dn8+vbi4tKz5Qo6v2eYzo7kUS51QINcR5jNpbZS8= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= -github.com/xlab/treeprint v0.0.0-20180616005107-d6fb6747feb6 h1:YdYsPAZ2pC6Tow/nPZOPQ96O3hm/ToAkGsPLzedXERk= github.com/xlab/treeprint v0.0.0-20180616005107-d6fb6747feb6/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg= -github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 h1:QldyIu/L63oPpyvQmHgvgickp1Yw510KJOqX7H24mg8= github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778/go.mod h1:2MuV+tbUrU1zIOPMxZ5EncGwgmMJsa+9ucAQZXxsObs= -github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77 h1:ESFSdwYZvkeru3RtdrYueztKhOBCSAAzS4Gf+k0tEow= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= -github.com/yagipy/maintidx v1.0.0 h1:h5NvIsCz+nRDapQ0exNv4aJ0yXSI0420omVANTv3GJM= github.com/yagipy/maintidx v1.0.0/go.mod h1:0qNf/I/CCZXSMhsRsrEPDZ+DkekpKLXAJfsTACwgXLk= -github.com/ybbus/jsonrpc v2.1.2+incompatible h1:V4mkE9qhbDQ92/MLMIhlhMSbz8jNXdagC3xBR5NDwaQ= github.com/ybbus/jsonrpc v2.1.2+incompatible/go.mod h1:XJrh1eMSzdIYFbM08flv0wp5G35eRniyeGut1z+LSiE= -github.com/yeya24/promlinter v0.1.0/go.mod h1:rs5vtZzeBHqqMwXqFScncpCF6u06lezhZepno9AB1Oc= -github.com/yeya24/promlinter v0.2.0 h1:xFKDQ82orCU5jQujdaD8stOHiv8UN68BSdn2a8u8Y3o= github.com/yeya24/promlinter v0.2.0/go.mod h1:u54lkmBOZrpEbQQ6gox2zWKKLKu2SGe+2KOiextY+IA= -github.com/yudai/gojsondiff v1.0.0 h1:27cbfqXLVEJ1o8I6v3y9lg8Ydm53EKqHXAOMxEGlCOA= github.com/yudai/gojsondiff v1.0.0/go.mod h1:AY32+k2cwILAkW1fbgxQ5mUmMiZFgLIV+FBNExI05xg= -github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 h1:BHyfKlQyqbsFN5p3IfnEUduWvb9is428/nNb5L3U01M= github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDfVJdfcVVdX+jpBxNmX4rDAzaS45IcYoM= -github.com/yudai/pp v2.0.1+incompatible h1:Q4//iY4pNF6yPLZIigmvcl7k/bPgrcTPIFIcmawg5bI= github.com/yudai/pp v2.0.1+incompatible/go.mod h1:PuxR/8QJ7cyCkFp/aUDS+JY727OFEZkTdatxwunjIkc= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -github.com/yuin/goldmark v1.4.13 h1:fVcFKWvrslecOb/tg+Cc05dkeYx540o0FuFt3nUVDoE= +github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -github.com/zondax/hid v0.9.0/go.mod h1:l5wttcP0jwtdLjqjMMWFVEE7d1zO0jvSPA9OPZxWpEM= +github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= github.com/zondax/hid v0.9.1 h1:gQe66rtmyZ8VeGFcOpbuH3r7erYtNEAezCAYu8LdkJo= github.com/zondax/hid v0.9.1/go.mod h1:l5wttcP0jwtdLjqjMMWFVEE7d1zO0jvSPA9OPZxWpEM= -github.com/zondax/ledger-go v0.14.0/go.mod h1:fZ3Dqg6qcdXWSOJFKMG8GCTnD7slO/RL2feOQv8K320= github.com/zondax/ledger-go v0.14.1 h1:Pip65OOl4iJ84WTpA4BKChvOufMhhbxED3BaihoZN4c= github.com/zondax/ledger-go v0.14.1/go.mod h1:fZ3Dqg6qcdXWSOJFKMG8GCTnD7slO/RL2feOQv8K320= -gitlab.com/bosi/decorder v0.2.3 h1:gX4/RgK16ijY8V+BRQHAySfQAb354T7/xQpDB2n10P0= -gitlab.com/bosi/decorder v0.2.3/go.mod h1:9K1RB5+VPNQYtXtTDAzd2OEftsZb1oV0IrJrzChSdGE= -go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= +gitlab.com/bosi/decorder v0.2.2/go.mod h1:9K1RB5+VPNQYtXtTDAzd2OEftsZb1oV0IrJrzChSdGE= go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.4/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= -go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= +go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4= go.etcd.io/bbolt v1.3.7 h1:j+zJOnnEjF/kyHlDDgGnVL/AIqIJPq8UoB2GSNfkUfQ= go.etcd.io/bbolt v1.3.7/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw= -go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738 h1:VcrIfasaLFkyjk6KNlXQSzO+B0fZcnECiDrKJsfxka0= go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= -go.etcd.io/etcd v0.0.0-20200513171258-e048e166ab9c h1:/RwRVN9EdXAVtdHxP7Ndn/tfmM9/goiwU0QTnLBgS4w= go.etcd.io/etcd v0.0.0-20200513171258-e048e166ab9c/go.mod h1:xCI7ZzBfRuGgBXyXO6yfWfDmlWd35khcWpUa4L0xI/k= go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= go.etcd.io/etcd/api/v3 v3.5.1/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= -go.etcd.io/etcd/api/v3 v3.5.9 h1:4wSsluwyTbGGmyjJktOf3wFQoTBIURXHnq9n/G/JQHs= -go.etcd.io/etcd/api/v3 v3.5.9/go.mod h1:uyAal843mC8uUVSLWz6eHa/d971iDGnCRpmKd2Z+X8k= +go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/pkg/v3 v3.5.1/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= -go.etcd.io/etcd/client/pkg/v3 v3.5.9 h1:oidDC4+YEuSIQbsR94rY9gur91UPL6DnxDCIYd2IGsE= -go.etcd.io/etcd/client/pkg/v3 v3.5.9/go.mod h1:y+CzeSmkMpWN2Jyu1npecjB9BBnABxGM4pN8cGuJeL4= +go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= go.etcd.io/etcd/client/v2 v2.305.1/go.mod h1:pMEacxZW7o8pg4CrFE7pquyCJJzZvkvdD2RibOCCCGs= -go.etcd.io/etcd/client/v2 v2.305.7 h1:AELPkjNR3/igjbO7CjyF1fPuVPjrblliiKj+Y6xSGOU= -go.etcd.io/etcd/client/v2 v2.305.7/go.mod h1:GQGT5Z3TBuAQGvgPfhR7VPySu/SudxmEkRq9BgzFU6s= -go.etcd.io/etcd/client/v3 v3.5.9 h1:r5xghnU7CwbUxD/fbUtRyJGaYNfDun8sp/gTr1hew6E= -go.etcd.io/etcd/client/v3 v3.5.9/go.mod h1:i/Eo5LrZ5IKqpbtpPDuaUnDOUv471oDg8cjQaUr2MbA= -go.etcd.io/gofail v0.1.0 h1:XItAMIhOojXFQMgrxjnd2EIIHun/d5qL0Pf7FzVTkFg= -go.etcd.io/gofail v0.1.0/go.mod h1:VZBCXYGZhHAinaBiiqYvuDynvahNsAyLFwB3kEHKz1M= -go.mozilla.org/mozlog v0.0.0-20170222151521-4bb13139d403 h1:rKyWXYDfrVOpMFBion4Pmx5sJbQreQNXycHvm4KwJSg= +go.etcd.io/etcd/client/v2 v2.305.4/go.mod h1:Ud+VUwIi9/uQHOMA+4ekToJ12lTxlv0zB/+DHwTGEbU= +go.etcd.io/etcd/client/v3 v3.5.0/go.mod h1:AIKXXVX/DQXtfTEqBryiLTUXwON+GuvO6Z7lLS/oTh0= +go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.mozilla.org/mozlog v0.0.0-20170222151521-4bb13139d403/go.mod h1:jHoPAGnDrCy6kaI2tAze5Prf0Nr0w/oNkROt2lw3n3o= go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= @@ -2675,37 +1668,29 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.3 h1:syAz40OyelLZo42+3U68Phisvrx4qh+4wpdZw7eUUdY= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.3/go.mod h1:Dts42MGkzZne2yCru741+bFiTMWkIj/LLRizad7b9tw= -go.opentelemetry.io/otel v1.11.0 h1:kfToEGMDq6TrVrJ9Vht84Y8y9enykSZzDDZglV0kIEk= -go.opentelemetry.io/otel v1.11.0/go.mod h1:H2KtuEphyMvlhZ+F7tg9GRhAOe60moNx61Ex+WmiKkk= -go.opentelemetry.io/otel/trace v1.11.0 h1:20U/Vj42SX+mASlXLmSGBg6jpI1jQtv682lZtTAOVFI= -go.opentelemetry.io/otel/trace v1.11.0/go.mod h1:nyYjis9jy0gytE9LXGU+/m1sHTKbRY0fX0hulNNDP1U= -go.opentelemetry.io/proto/otlp v0.7.0 h1:rwOQPCuKAKmwGKq2aVNnYIibI6wnV7EvzgfTCzcdGg8= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= -go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= -go.uber.org/goleak v1.1.10 h1:z+mqJhf6ss6BSfSM671tgKyZBFPTTJM+HLxnhPC3wu0= +go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= +go.uber.org/goleak v1.1.11-0.20210813005559-691160354723/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= +go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= go.uber.org/multierr v1.4.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= -go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= +go.uber.org/multierr v1.7.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= -go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee h1:0mgffUl7nfd+FpvXMVz4IDEaUSmT1ysygQC7qYo7sG4= go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= go.uber.org/zap v1.18.1/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.19.1/go.mod h1:j3DNczoxDZroyBnOT1L/Q79cfUMGZxlv/9dzN7SM1rI= +go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw= golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180501155221-613d6eafa307/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= @@ -2722,21 +1707,26 @@ golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200115085410-6d4e4cb37c7d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= +golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= +golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20210915214749-c084706c2272/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220314234659-1baeb1ce4c0b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.10.0 h1:LKqV2xt9+kDzSTfOhx4FrkEBcMrAgHSYgzywV9zcGmM= golang.org/x/crypto v0.10.0/go.mod h1:o4eNf7Ede1fv+hwOwZsTHl9EsPFO6q6ZvYR8vYfY45I= @@ -2746,7 +1736,6 @@ golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= -golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56/go.mod h1:JhuoJpWY28nO4Vef9tZUw9qufEGTyX1+7lmHxV5q5G4= golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= @@ -2757,11 +1746,9 @@ golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMk golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw= golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 h1:k/i9J1pBpvlfR+9QsetwPyERsqu1GIbi967PQMq3Ivc= golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w= -golang.org/x/exp/typeparams v0.0.0-20220827204233-334a2380cb91 h1:Ic/qN6TEifvObMGQy72k0n1LlJr7DjWWEi+MOsDOiSk= -golang.org/x/exp/typeparams v0.0.0-20220827204233-334a2380cb91/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= +golang.org/x/exp/typeparams v0.0.0-20220218215828-6cf2b201936e/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= -golang.org/x/image v0.0.0-20190802002840-cff245a6509b h1:+qEpEAPhDZ1o0x3tHzZTQDArnOixOzGD9HUJfcg0mb4= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= @@ -2774,34 +1761,27 @@ golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRu golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 h1:VLliZ0d+/avPrXXH+OakdXhpJuEoBZuwh1m2j7U6Iug= golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= -golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028 h1:4+4C/Iv2U4fMZBiMCc98MG1In4gJY5YRhtpDNeDeHWs= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= -golang.org/x/mobile v0.0.0-20200801112145-973feb4309de h1:OVJ6QQUBAesB8CZijKDSsXX7xYVtUhrkY0gwMfbi4p4= -golang.org/x/mobile v0.0.0-20200801112145-973feb4309de/go.mod h1:skQtrUTUwhdJvXM/2KKJzY8pDgNr9I/FOMqDVRPBUS4= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.1.1-0.20191209134235-331c550502dd/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= +golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= +golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8= -golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs= -golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181011144130-49bb7cea24b1/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -2813,7 +1793,6 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -2835,12 +1814,10 @@ golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/ golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= @@ -2855,11 +1832,13 @@ golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96b golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8= golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210610132358-84b48f89b13b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210917221730-978cfadd31cf/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= @@ -2867,6 +1846,7 @@ golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220607020251-c690dde0001d/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.0.0-20220617184016-355a448f1bc9/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= @@ -2887,7 +1867,6 @@ golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= @@ -2917,11 +1896,11 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220513210516-0976fa681c29/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI= -golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -2977,19 +1956,18 @@ golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200824131525-c12d262b63d8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200826173525-f9321e4c35a6/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200831180312-196b9ba8737a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -3007,36 +1985,42 @@ golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210420205809-ac73e9fd8988/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210426230700-d19ff857e887/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210819135213-f52c844e1c1c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210903071746-97244b99971b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210917161153-d61c044b1678/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211105183446-c75c47738b0c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211116061358-0a5406a5449c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211205182925-97ca703d548d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211213223007-03aa0b5f6827/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220204135822-1c1b9b1eba6a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220315194320-039c03cc5b86/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220405210540-1e041c57c461/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220406163625-3f8b81556e12/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220502124256-b6088ccd6cba/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -3044,6 +2028,7 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220624220833-87e55d714810/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220702020025-31831981b65f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -3056,6 +2041,7 @@ golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.0.0-20220526004731-065cf7ba2467/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.9.0 h1:GRRCnKYhdQrD8kfRAdQ6Zcw1P0OcELxGLKJvtjVMZ28= golang.org/x/term v0.9.0/go.mod h1:M6DEAAIenWoTxdKrOltXcmDY3rSplQUkrvaDU5FcQyo= @@ -3079,15 +2065,14 @@ golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxb golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.1.0 h1:xYY+Bajn2a7VBmTM5GikTmnK8ZuX8YgnQCqZpbBNtmA= -golang.org/x/time v0.1.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190110163146-51295c7ec13a/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +golang.org/x/tools v0.0.0-20190228203856-589c23e65e65/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190307163923-6a08e3108db3/go.mod h1:25r3+/G6/xytQM8iWZKq3Hn0kr0rgFKPUNVEL/dr3z4= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190311215038-5c2858a9cfe5/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= @@ -3101,6 +2086,7 @@ golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBn golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -3112,7 +2098,6 @@ golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -3123,7 +2108,6 @@ golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapK golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200108203644-89082a384178/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200117012304-6edc0a871e69/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200117220505-0cba7a3a9ee9/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= @@ -3139,12 +2123,10 @@ golang.org/x/tools v0.0.0-20200324003944-a576cf524670/go.mod h1:Sl4aGygMT6LrqrWc golang.org/x/tools v0.0.0-20200329025819-fd4102a86c65/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= golang.org/x/tools v0.0.0-20200414032229-332987a829c3/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200422022333-3d57cf2e726e/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200426102838-f3a5411a4c3b/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200522201501-cb1345f3a375/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200622203043-20e05c1c8ffa/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= @@ -3153,7 +2135,6 @@ golang.org/x/tools v0.0.0-20200625211823-6506e20df31f/go.mod h1:EkVYQZoAsY45+roY golang.org/x/tools v0.0.0-20200626171337-aa94e735be7f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200630154851-b2d8b0336632/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200706234117-b22de6825cf7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200717024301-6ddee64345a6/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200724022722-7017fd6b1305/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= @@ -3164,31 +2145,34 @@ golang.org/x/tools v0.0.0-20200831203904-5a2aa26beb65/go.mod h1:Cj7w3i3Rnn0Xh82u golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= golang.org/x/tools v0.0.0-20201001104356-43ebab892c4c/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= golang.org/x/tools v0.0.0-20201002184944-ecd9fd270d5d/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= +golang.org/x/tools v0.0.0-20201022035929-9cf592e881e9/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201023174141-c8cfbd0f21e6/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201028025901-8cd080b735b3/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201114224030-61ea331ec02b/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201118003311-bd56c0adb394/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201230224404-63754364767c/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20210101214203-2dba1e4ea05c/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20210104081019-d8d6ddbec6ee/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= +golang.org/x/tools v0.1.1-0.20210205202024-ef80cdb6ec6d/go.mod h1:9bzcO0MWcOuT0tm1iBGzDVPshzfwoVvREIui8C+MHqU= +golang.org/x/tools v0.1.1-0.20210302220138-2ac05c832e1a/go.mod h1:9bzcO0MWcOuT0tm1iBGzDVPshzfwoVvREIui8C+MHqU= golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo= +golang.org/x/tools v0.1.8/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= +golang.org/x/tools v0.1.9-0.20211228192929-ee1ca4ffc4da/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= +golang.org/x/tools v0.1.9/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= +golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= +golang.org/x/tools v0.1.11-0.20220513221640-090b14e8501f/go.mod h1:SgwaegtQh8clINPpECJMqnxLv9I09HLqnW3RMqW0CA4= +golang.org/x/tools v0.1.11/go.mod h1:SgwaegtQh8clINPpECJMqnxLv9I09HLqnW3RMqW0CA4= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM= -golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4= -golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -3201,12 +2185,9 @@ golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNq gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo= gonum.org/v1/gonum v0.0.0-20181121035319-3f7ecaa7e8ca/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo= gonum.org/v1/gonum v0.6.0/go.mod h1:9mxDZsDKxgMAuccQkewq682L+0eCu4dCN2yonUJTCLU= -gonum.org/v1/gonum v0.8.2 h1:CCXrcPKiGGotvnN6jfUsKk4rRqm7q09/YbKb5xCEvtM= gonum.org/v1/gonum v0.8.2/go.mod h1:oe/vMfY3deqTw+1EZJhuvEW2iwGF1bW9wwu7XCu0+v0= gonum.org/v1/netlib v0.0.0-20181029234149-ec6d1f5cefe6/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= -gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0 h1:OE9mWmgKkjJyEmDAAtGMPjXu+YNeGvK9VTSHY6+Qihc= gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= -gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b h1:Qh4dB5D/WpoUUp3lSod7qgoyEHbDGPUWjIbnqdqqe1k= gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b/go.mod h1:Wt8AAjI+ypCyYX3nZBvf6cAIx93T+c/OS2HFAYskSZc= google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= @@ -3231,7 +2212,6 @@ google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34q google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= -google.golang.org/api v0.44.0/go.mod h1:EBOGZqzyhtvMDoxwS97ctnh0zUmYY6CxqXsc1AvkYD8= google.golang.org/api v0.47.0/go.mod h1:Wbvgpq1HddcWVtzsVLyfLp8lDg6AA241LmgIL59tHXo= google.golang.org/api v0.48.0/go.mod h1:71Pr1vy+TAZRPkPs/xlCf5SsU8WjuAWv1Pfjbtukyy4= google.golang.org/api v0.50.0/go.mod h1:4bNT5pAuq5ji4SRZm+5QIkjny9JAyVD/3gaSihNefaw= @@ -3252,6 +2232,7 @@ google.golang.org/api v0.75.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69 google.golang.org/api v0.77.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69ljA= google.golang.org/api v0.78.0/go.mod h1:1Sg78yoMLOhlQTeF+ARBoytAcH1NNyyl390YMy6rKmw= google.golang.org/api v0.80.0/go.mod h1:xY3nI94gbvBrE0J6NHXhxOmW97HG7Khjkku6AFB3Hyg= +google.golang.org/api v0.81.0/go.mod h1:FA6Mb/bZxj706H2j+j2d6mHEEaHBmbbWnkfvmorOCko= google.golang.org/api v0.84.0/go.mod h1:NTsGnUFJMYROtiquksZHBWtHfeMC7iYthki7Eq3pa8o= google.golang.org/api v0.85.0/go.mod h1:AqZf8Ep9uZ2pyTvgL+x0D3Zt0eoT9b5E8fmzfu6FO2g= google.golang.org/api v0.90.0/go.mod h1:+Sem1dnrKlrXMR/X0bPnMWyluQe4RsNoYfmNLhOIkzw= @@ -3316,8 +2297,6 @@ google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201111145450-ac7456db90a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201119123407-9b1e624d6bc4/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= @@ -3345,6 +2324,7 @@ google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod h1:eFjDcFEc google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= google.golang.org/genproto v0.0.0-20210909211513-a8c4777a87af/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210917145530-b395a37504d4/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211008145708-270636b82663/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211028162531-8db9c33dc351/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= @@ -3370,6 +2350,7 @@ google.golang.org/genproto v0.0.0-20220429170224-98d788798c3e/go.mod h1:8w6bsBMX google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= google.golang.org/genproto v0.0.0-20220505152158-f39f71e6c8f3/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= google.golang.org/genproto v0.0.0-20220518221133-4f43b3371335/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= +google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= google.golang.org/genproto v0.0.0-20220523171625-347a074981d8/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= google.golang.org/genproto v0.0.0-20220608133413-ed9918b62aac/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= google.golang.org/genproto v0.0.0-20220616135557-88e70c0c3a90/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= @@ -3404,7 +2385,6 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc/go. google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.19.1/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= @@ -3438,7 +2418,6 @@ google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnD google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= -google.golang.org/grpc v1.43.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= @@ -3450,7 +2429,6 @@ google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCD google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.55.0 h1:3Oj82/tFSCeUrRTg/5E/7d/W5A1tj6Ky1ABAuZuv5ag= google.golang.org/grpc v1.55.0/go.mod h1:iYEXKGkEBhg1PjZQvoYEVPTDkHo1/bjTnfwTeGONTY8= -google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0 h1:M1YKkFIboKNieVO5DLUEVzQfGwJD30Nv2jfUgzb5UcE= 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= @@ -3462,15 +2440,14 @@ google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= -google.golang.org/protobuf v1.25.1-0.20200805231151-a709e31e5d12/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.27.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= 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.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -gopkg.in/alecthomas/kingpin.v2 v2.2.6 h1:jMFz6MfLP0/4fUyZle81rXUoxOBFi19VUFKVDOQfozc= 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= @@ -3480,32 +2457,22 @@ gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= -gopkg.in/cheggaaa/pb.v1 v1.0.27 h1:kJdccidYzt3CaHD1crCFTS1hxyhSi059NhOFUf03YFo= gopkg.in/cheggaaa/pb.v1 v1.0.27/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= -gopkg.in/cheggaaa/pb.v1 v1.0.28 h1:n1tBJnnK2r7g9OW2btFH91V92STTUevLXYFb8gy9EMk= gopkg.in/cheggaaa/pb.v1 v1.0.28/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= -gopkg.in/errgo.v2 v2.1.0 h1:0vLT13EuvQ0hNvakwLuFZ/jYrLp5F3kcWHXdRggjCE8= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= -gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -gopkg.in/gcfg.v1 v1.2.3 h1:m8OOJ4ccYHnx2f4gQwpno8nAX5OGOh7RLaaz0pj3Ogs= gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= -gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.66.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/ini.v1 v1.66.4/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/ini.v1 v1.66.6/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce h1:+JknDZhAj8YMt7GC73Ei8pv4MzjDUNPHgQWJdtMAaDU= gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:5AcXVHNjg+BDxry382+8OKon8SEWiKktQR07RKPsv1c= -gopkg.in/olebedev/go-duktape.v3 v3.0.0-20200619000410-60c24ae608a6 h1:a6cXbcDDUkSBlpnkWV1bJ+vv3mOgQEltEJ2rPxroVu0= gopkg.in/olebedev/go-duktape.v3 v3.0.0-20200619000410-60c24ae608a6/go.mod h1:uAJfkITjFhyEEuUfm7bsmCZRbW5WRq8s9EY8HZ6hCns= -gopkg.in/resty.v1 v1.12.0 h1:CuXP0Pjfw9rOuY6EP+UvtNvt5DSqHpIxILZKT/quCZI= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= -gopkg.in/urfave/cli.v1 v1.20.0 h1:NdAVW6RYxDif9DhDHaAortIu956m2c0v+09AZBPTbE0= gopkg.in/urfave/cli.v1 v1.20.0/go.mod h1:vuBzUtMdQeixQj8LVd+/98pzhxNGQoyuPBlsXHOQNO0= -gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME= gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= @@ -3519,13 +2486,16 @@ gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= +gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk= +gotest.tools/v3 v3.2.0/go.mod h1:Mcr9QNxkg0uMvy/YElmo4SpXgJKWgQvYrT7Kw5RzJ1A= gotest.tools/v3 v3.4.0 h1:ZazjZUfuVeZGLAmlKKuyv3IKP5orXcwtOwDQH6YVr6o= -gotest.tools/v3 v3.4.0/go.mod h1:CtbdzLSsqVhDgMtKsx03ird5YTGB3ar27v0u/yKBW5g= honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= @@ -3535,36 +2505,24 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.1.3/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las= -honnef.co/go/tools v0.2.1/go.mod h1:lPVVZ2BS5TfnjLyizF7o7hv7j9/L+8cZY2hLyjP9cGY= -honnef.co/go/tools v0.3.3 h1:oDx7VAwstgpYpb3wv0oxiZlxY+foCpRAwY7Vk6XpAgA= -honnef.co/go/tools v0.3.3/go.mod h1:jzwdWgg7Jdq75wlfblQxO4neNaFFSvgc1tD5Wv8U0Yw= -mvdan.cc/gofumpt v0.1.1/go.mod h1:yXG1r1WqZVKWbVRtBWKWX9+CxGYfA51nSomhM0woR48= -mvdan.cc/gofumpt v0.4.0 h1:JVf4NN1mIpHogBj7ABpgOyZc65/UUOkKQFkoURsz4MM= -mvdan.cc/gofumpt v0.4.0/go.mod h1:PljLOHDeZqgS8opHRKLzp2It2VBuSdteAgqUfzMTxlQ= -mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed h1:WX1yoOaKQfddO/mLzdV4wptyWgoH/6hwLs7QHTixo0I= +honnef.co/go/tools v0.3.2/go.mod h1:jzwdWgg7Jdq75wlfblQxO4neNaFFSvgc1tD5Wv8U0Yw= +mvdan.cc/gofumpt v0.3.1/go.mod h1:w3ymliuxvzVx8DAutBnVyDqYb1Niy/yCJt/lk821YCE= mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed/go.mod h1:Xkxe497xwlCKkIaQYRfC7CSLworTXY9RMqwhhCm+8Nc= -mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b h1:DxJ5nJdkhDlLok9K6qO+5290kphDJbHOQO1DFFFTeBo= mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b/go.mod h1:2odslEg/xrtNQqCYg2/jCoyKnw3vv5biOc3JnIcYfL4= -mvdan.cc/unparam v0.0.0-20210104141923-aac4ce9116a7/go.mod h1:hBpJkZE8H/sb+VRFvw2+rBpHNsTBcvSpk61hr8mzXZE= -mvdan.cc/unparam v0.0.0-20220706161116-678bad134442 h1:seuXWbRB1qPrS3NQnHmFKLJLtskWyueeIzmLXghMGgk= -mvdan.cc/unparam v0.0.0-20220706161116-678bad134442/go.mod h1:F/Cxw/6mVrNKqrR2YjFf5CaW0Bw4RL8RfbEf4GRggJk= +mvdan.cc/unparam v0.0.0-20211214103731-d0ef000c54e5/go.mod h1:b8RRCBm0eeiWR8cfN88xeq2G5SG3VKGO+5UPWi5FSOY= nhooyr.io/websocket v1.8.6/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0= nhooyr.io/websocket v1.8.7 h1:usjR2uOr/zjjkVMy0lW+PPohFok7PCow5sDjLgX4P4g= nhooyr.io/websocket v1.8.7/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0= +pgregory.net/rapid v0.4.8/go.mod h1:Z5PbWqjvWR1I3UGjvboUuan4fe4ZYEYNLNQLExzCoUs= pgregory.net/rapid v0.6.2 h1:ErW5sL+UKtfBfUTsWHDCoeB+eZKLKMxrSd1VJY6W4bw= pgregory.net/rapid v0.6.2/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04= -rsc.io/binaryregexp v0.2.0 h1:HfqmD5MEmC0zvwBuF187nq9mdnXjXsSivRiXN7SmRkE= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= -rsc.io/pdf v0.1.1 h1:k1MczvYDUvJBe93bYd7wrZLLUEcLZAuF824/I4e5Xr4= rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= -rsc.io/quote/v3 v3.1.0 h1:9JKUTTIUgS6kzR9mK1YuGKv6Nl+DijDNIc0ghT58FaY= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= -rsc.io/sampler v1.3.0 h1:7uVkIFmeBqHfdjD+gZwtXXI+RODJ2Wc4O7MPEh/QiW4= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= -rsc.io/tmplfunc v0.0.3 h1:53XFQh69AfOa8Tw0Jm7t+GV7KZhOi6jzsCzTtKbMvzU= rsc.io/tmplfunc v0.0.3/go.mod h1:AG3sTPzElb1Io3Yg4voV9AGZJuleGAwaVRxL9M49PhA= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= +sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo= sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8= -sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0 h1:ucqkfpjg9WzSUubAO62csmucvxl4/JeW3F4I4909XkM= sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= From d43c3bceba318b734ca782c65421139c94d741fe Mon Sep 17 00:00:00 2001 From: swelf Date: Fri, 28 Jul 2023 16:24:02 +0300 Subject: [PATCH 006/307] updated openapi scheme. updated build scripts --- Dockerfile | 2 +- docs/static/openapi.yml | 3607 ++++++++++++++++++++++++++++---------- go.sum | 628 ------- network/init-neutrond.sh | 2 +- 4 files changed, 2729 insertions(+), 1510 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3862e3254..70ced1522 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 FROM golang:1.20-bullseye -RUN apt-get update && apt-get install -y jq +RUN apt-get update && apt-get install -y jq xxd EXPOSE 26656 26657 1317 9090 COPY --from=app . /opt/neutron RUN cd /opt/neutron && make install-test-binary diff --git a/docs/static/openapi.yml b/docs/static/openapi.yml index 25217cdce..9fdfa7be7 100644 --- a/docs/static/openapi.yml +++ b/docs/static/openapi.yml @@ -4,6 +4,554 @@ info: name: '' description: '' paths: + /cosmos/adminmodule/adminmodule/admins: + get: + summary: Queries a list of admins items. + operationId: CosmosAdminmoduleAdminmoduleAdmins + responses: + '200': + description: A successful response. + schema: + type: object + properties: + admins: + type: array + items: + type: string + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type of + the serialized + + protocol buffer message. This string must contain at + least + + one "/" character. The last segment of the URL's path + must represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be in + a canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the binary + all types that they + + expect it to use in the context of Any. However, for + URLs which use the + + scheme `http`, `https`, or no scheme, one can optionally + set up a type + + server that maps type URLs to message definitions as + follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based + on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in + the official + + protobuf release, and it is not used for type URLs + beginning with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty scheme) + might be + + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer + message along with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any values + in the form + + of utility functions or additional generated methods of the + Any type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by + default use + + 'type.googleapis.com/full.type.name' as the type URL and the + unpack + + methods only use the fully qualified type name after the + last '/' + + in the type URL, for example "foo.bar.com/x/y.z" will yield + type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the regular + + representation of the deserialized, embedded message, with + an + + additional field `@type` which contains the type URL. + Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a custom + JSON + + representation, that representation will be embedded adding + a field + + `value` which holds the custom JSON in addition to the + `@type` + + field. Example (for message [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + tags: + - Query + /cosmos/adminmodule/adminmodule/archivedproposals: + get: + summary: Queries a list of archived proposals. + operationId: CosmosAdminmoduleAdminmoduleArchivedProposals + responses: + '200': + description: A successful response. + schema: + type: object + properties: + proposals: + type: array + items: + type: object + properties: + proposal_id: + type: string + format: uint64 + description: proposal_id defines the unique id of the proposal. + content: + description: content is the proposal's content. + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the + type of the serialized + + protocol buffer message. This string must contain at + least + + one "/" character. The last segment of the URL's + path must represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be + in a canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the + binary all types that they + + expect it to use in the context of Any. However, for + URLs which use the + + scheme `http`, `https`, or no scheme, one can + optionally set up a type + + server that maps type URLs to message definitions as + follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results + based on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available + in the official + + protobuf release, and it is not used for type URLs + beginning with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty + scheme) might be + + used with implementation specific semantics. + additionalProperties: {} + status: + description: status defines the proposal status. + type: string + enum: + - PROPOSAL_STATUS_UNSPECIFIED + - PROPOSAL_STATUS_DEPOSIT_PERIOD + - PROPOSAL_STATUS_VOTING_PERIOD + - PROPOSAL_STATUS_PASSED + - PROPOSAL_STATUS_REJECTED + - PROPOSAL_STATUS_FAILED + default: PROPOSAL_STATUS_UNSPECIFIED + final_tally_result: + description: >- + final_tally_result is the final tally result of the + proposal. When + + querying a proposal via gRPC, this field is not + populated until the + + proposal's voting period has ended. + type: object + properties: + 'yes': + type: string + description: yes is the number of yes votes on a proposal. + abstain: + type: string + description: >- + abstain is the number of abstain votes on a + proposal. + 'no': + type: string + description: no is the number of no votes on a proposal. + no_with_veto: + type: string + description: >- + no_with_veto is the number of no with veto votes on + a proposal. + submit_time: + type: string + format: date-time + description: submit_time is the time of proposal submission. + deposit_end_time: + type: string + format: date-time + description: deposit_end_time is the end time for deposition. + total_deposit: + type: array + items: + type: object + properties: + denom: + type: string + amount: + type: string + 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. + description: total_deposit is the total deposit on the proposal. + voting_start_time: + type: string + format: date-time + description: >- + voting_start_time is the starting time to vote on a + proposal. + voting_end_time: + type: string + format: date-time + description: voting_end_time is the end time of voting on a proposal. + description: >- + Proposal defines the core field members of a governance + proposal. + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type of + the serialized + + protocol buffer message. This string must contain at + least + + one "/" character. The last segment of the URL's path + must represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be in + a canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the binary + all types that they + + expect it to use in the context of Any. However, for + URLs which use the + + scheme `http`, `https`, or no scheme, one can optionally + set up a type + + server that maps type URLs to message definitions as + follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based + on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in + the official + + protobuf release, and it is not used for type URLs + beginning with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty scheme) + might be + + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer + message along with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any values + in the form + + of utility functions or additional generated methods of the + Any type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by + default use + + 'type.googleapis.com/full.type.name' as the type URL and the + unpack + + methods only use the fully qualified type name after the + last '/' + + in the type URL, for example "foo.bar.com/x/y.z" will yield + type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the regular + + representation of the deserialized, embedded message, with + an + + additional field `@type` which contains the type URL. + Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a custom + JSON + + representation, that representation will be embedded adding + a field + + `value` which holds the custom JSON in addition to the + `@type` + + field. Example (for message [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + tags: + - Query /cosmos/auth/v1beta1/account_info/{address}: get: summary: AccountInfo queries account info which is common to all account types. @@ -21944,6 +22492,93 @@ paths: type: boolean tags: - Query + /gaia/globalfee/v1beta1/params: + get: + operationId: GaiaGlobalfeeV1Beta1Params + responses: + '200': + description: A successful response. + schema: + type: object + properties: + params: + type: object + properties: + minimum_gas_prices: + type: array + items: + type: object + properties: + denom: + type: string + amount: + type: string + description: >- + DecCoin defines a token with a denomination and a + decimal amount. + + + NOTE: The amount field is an Dec which implements the + custom method + + signatures required by gogoproto. + title: >- + minimum_gas_prices stores the minimum gas price(s) for all + TX on the chain. + + When multiple coins are defined then they are accepted + alternatively. + + The list must be sorted by denoms asc. No duplicate denoms + or zero amount + + values allowed. For more information see + + https://docs.cosmos.network/main/modules/auth#concepts + bypass_min_fee_msg_types: + type: array + items: + type: string + description: >- + bypass_min_fee_msg_types defines a list of message type + urls + + that are free of fee charge. + max_total_bypass_min_fee_msg_gas_usage: + type: string + format: uint64 + description: >- + max_total_bypass_min_fee_msg_gas_usage defines the total + maximum gas usage + + allowed for a transaction containing only messages of + types in bypass_min_fee_msg_types + + to bypass fee charge. + description: Params defines the set of module parameters. + description: |- + QueryMinimumGasPricesResponse is the response type for the + Query/MinimumGasPrices RPC method. + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + additionalProperties: {} + tags: + - Query /ibc/apps/interchain_accounts/controller/v1/owners/{owner}/connections/{connection_id}: get: summary: >- @@ -29070,7 +29705,13 @@ paths: type: string description: >- allowed_clients defines the list of allowed client state - types. + types which can be created + + and interacted with. If a client type is removed from the + allowed clients list, usage + + of this client will be disabled until it is added again to + the list. description: >- QueryClientParamsResponse is the response type for the Query/ClientParams RPC @@ -32367,7 +33008,7 @@ paths: The number of historical info entries to persist in store. This param is a part of the cosmos sdk staking module. In - the case of + the case of a ccv enabled consumer chain, the ccv module acts as the staking module. @@ -32385,10 +33026,31 @@ paths: bottom of the set who can opt out of running the consumer chain without being - punished. For example, a + punished. For + + example, a value of 0.05 means that the validators in the + bottom 5% of the + + set can opt out + reward_denoms: + type: array + items: + type: string + description: >- + Reward denoms. These are the denominations which are + allowed to be sent to - value of 0.05 means that the validators in the bottom 5% - of the set can opt out + the provider as rewards. + provider_reward_denoms: + type: array + items: + type: string + title: >- + Provider-originated reward denoms. These are denoms coming + from the + + provider which are allowed to be used as rewards. e.g. + "uatom" title: Params defines the parameters for CCV consumer module description: >- QueryParamsResponse is response type for the Query/Params RPC @@ -32608,17 +33270,19 @@ paths: type: string description: >- the proposed chain-id of the new consumer chain, - must be different from all other consumer chain ids - of the executing + must be different from all - provider chain. + other consumer chain ids of the executing provider + chain. initial_height: description: >- the proposed initial height of new consumer chain. For a completely new chain, this will be {0,1}. - However, it may be different if this is a chain that - is converting to a consumer chain. + However, it may be + + different if this is a chain that is converting to a + consumer chain. type: object properties: revision_number: @@ -32641,9 +33305,11 @@ paths: format: byte description: >- The hash of the consumer chain genesis state without - the consumer CCV module genesis params. + the consumer CCV + + module genesis params. It is used for off-chain + confirmation of - It is used for off-chain confirmation of genesis.json validity by validators and other parties. binary_hash: @@ -32651,20 +33317,23 @@ paths: format: byte description: >- The hash of the consumer chain binary that should be - run by validators on chain initialization. + run by validators on + + chain initialization. It is used for off-chain + confirmation of binary - It is used for off-chain confirmation of binary validity by validators and other parties. spawn_time: type: string format: date-time description: >- spawn time is the time on the provider chain at - which the consumer chain genesis is finalized and - all validators + which the consumer chain + + genesis is finalized and all validators will be + responsible for starting - will be responsible for starting their consumer - chain validator node. + their consumer chain validator node. unbonding_period: type: string description: >- @@ -32698,11 +33367,14 @@ paths: format: int64 description: >- BlocksPerDistributionTransmission is the number of - blocks between ibc-token-transfers from the consumer - chain to the provider chain. + blocks between - On sending transmission event, + ibc-token-transfers from the consumer chain to the + provider chain. On + + sending transmission event, `consumer_redistribution_fraction` of the + accumulated tokens are sent to the consumer redistribution address. historical_entries: @@ -32713,24 +33385,50 @@ paths: store. This param is a part of the cosmos sdk staking - module. In the case of + module. In the case of a ccv enabled consumer chain, the ccv module acts as the staking module. + distribution_transmission_channel: + type: string + title: >- + The ID of a token transfer channel used for the + Reward Distribution + + sub-protocol. If DistributionTransmissionChannel == + "", a new transfer + + channel is created on top of the same connection as + the CCV channel. + + Note that transfer_channel_id is the ID of the + channel end on the consumer + + chain. it is most relevant for chains performing a + sovereign to consumer + + changeover in order to maintan the existing ibc + transfer channel description: >- ConsumerAdditionProposal is a governance proposal on the - provider chain to spawn a new consumer chain. + provider chain to + + spawn a new consumer chain. If it passes, then all + validators on the provider - If it passes, then all validators on the provider chain - are expected to validate the consumer chain at spawn - time + chain are expected to validate the consumer chain at + spawn time or get - or get slashed. It is recommended that spawn time occurs - after the proposal end time. + slashed. It is recommended that spawn time occurs after + the proposal end + + time. title: proposals waiting for spawn_time to pass description: >- ConsumerAdditionProposals holds pending governance proposals - on the provider chain to spawn a new chain. + on the provider + + chain to spawn a new chain. default: description: An unexpected error response. schema: @@ -32950,228 +33648,234 @@ paths: format: date-time title: >- the time on the provider chain at which all - validators are responsible to stop their consumer - chain validator node + validators are responsible to + + stop their consumer chain validator node description: >- ConsumerRemovalProposal is a governance proposal on the - provider chain to remove (and stop) a consumer chain. + provider chain to + + remove (and stop) a consumer chain. If it passes, all + the consumer chain's - If it passes, all the consumer chain's state is removed - from the provider chain. The outstanding unbonding + state is removed from the provider chain. The + outstanding unbonding operation - operation funds are released. + funds are released. title: proposals waiting for stop_time to pass description: >- ConsumerRemovalProposals holds pending governance proposals on - the provider chain to remove (and stop) a consumer chain. - default: - description: An unexpected error response. - schema: - type: object - properties: - code: - type: integer - format: int32 - message: - type: string - details: - type: array - items: - type: object - properties: - '@type': - type: string - description: >- - A URL/resource name that uniquely identifies the type of - the serialized + the provider - protocol buffer message. This string must contain at - least - - one "/" character. The last segment of the URL's path - must represent - - the fully qualified name of the type (as in - - `path/google.protobuf.Duration`). The name should be in - a canonical form - - (e.g., leading "." is not accepted). - - - In practice, teams usually precompile into the binary - all types that they - - expect it to use in the context of Any. However, for - URLs which use the - - scheme `http`, `https`, or no scheme, one can optionally - set up a type - - server that maps type URLs to message definitions as - follows: - - - * If no scheme is provided, `https` is assumed. - - * An HTTP GET on the URL must yield a - [google.protobuf.Type][] - value in binary format, or produce an error. - * Applications are allowed to cache lookup results based - on the - URL, or have them precompiled into a binary to avoid any - lookup. Therefore, binary compatibility needs to be preserved - on changes to types. (Use versioned type names to manage - breaking changes.) - - Note: this functionality is not currently available in - the official - - protobuf release, and it is not used for type URLs - beginning with - - type.googleapis.com. - - - Schemes other than `http`, `https` (or the empty scheme) - might be - - used with implementation specific semantics. - additionalProperties: {} - description: >- - `Any` contains an arbitrary serialized protocol buffer - message along with a - - URL that describes the type of the serialized message. - - - Protobuf library provides support to pack/unpack Any values - in the form - - of utility functions or additional generated methods of the - Any type. - - - Example 1: Pack and unpack a message in C++. - - Foo foo = ...; - Any any; - any.PackFrom(foo); - ... - if (any.UnpackTo(&foo)) { - ... - } - - Example 2: Pack and unpack a message in Java. - - Foo foo = ...; - Any any = Any.pack(foo); - ... - if (any.is(Foo.class)) { - foo = any.unpack(Foo.class); - } - - Example 3: Pack and unpack a message in Python. - - foo = Foo(...) - any = Any() - any.Pack(foo) - ... - if any.Is(Foo.DESCRIPTOR): - any.Unpack(foo) - ... - - Example 4: Pack and unpack a message in Go - - foo := &pb.Foo{...} - any, err := anypb.New(foo) - if err != nil { - ... - } - ... - foo := &pb.Foo{} - if err := any.UnmarshalTo(foo); err != nil { - ... - } - - The pack methods provided by protobuf library will by - default use - - 'type.googleapis.com/full.type.name' as the type URL and the - unpack - - methods only use the fully qualified type name after the - last '/' - - in the type URL, for example "foo.bar.com/x/y.z" will yield - type - - name "y.z". - - - - JSON - - ==== - - The JSON representation of an `Any` value uses the regular - - representation of the deserialized, embedded message, with - an - - additional field `@type` which contains the type URL. - Example: - - package google.profile; - message Person { - string first_name = 1; - string last_name = 2; - } - - { - "@type": "type.googleapis.com/google.profile.Person", - "firstName": , - "lastName": - } - - If the embedded message type is well-known and has a custom - JSON - - representation, that representation will be embedded adding - a field - - `value` which holds the custom JSON in addition to the - `@type` - - field. Example (for message [google.protobuf.Duration][]): - - { - "@type": "type.googleapis.com/google.protobuf.Duration", - "value": "1.212s" - } - tags: - - Query - /interchain_security/ccv/provider/consumer_chains: - get: - summary: |- - ConsumerChains queries active consumer chains supported by the provider - chain - operationId: InterchainSecurityCcvProviderV1QueryConsumerChains - responses: - '200': - description: A successful response. - schema: - type: object - properties: - chains: - type: array - items: - type: object - properties: - chain_id: - type: string - client_id: - type: string + chain to remove (and stop) a consumer chain. + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type of + the serialized + + protocol buffer message. This string must contain at + least + + one "/" character. The last segment of the URL's path + must represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be in + a canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the binary + all types that they + + expect it to use in the context of Any. However, for + URLs which use the + + scheme `http`, `https`, or no scheme, one can optionally + set up a type + + server that maps type URLs to message definitions as + follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based + on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in + the official + + protobuf release, and it is not used for type URLs + beginning with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty scheme) + might be + + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer + message along with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any values + in the form + + of utility functions or additional generated methods of the + Any type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by + default use + + 'type.googleapis.com/full.type.name' as the type URL and the + unpack + + methods only use the fully qualified type name after the + last '/' + + in the type URL, for example "foo.bar.com/x/y.z" will yield + type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the regular + + representation of the deserialized, embedded message, with + an + + additional field `@type` which contains the type URL. + Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a custom + JSON + + representation, that representation will be embedded adding + a field + + `value` which holds the custom JSON in addition to the + `@type` + + field. Example (for message [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + tags: + - Query + /interchain_security/ccv/provider/consumer_chains: + get: + summary: |- + ConsumerChains queries active consumer chains supported by the provider + chain + operationId: InterchainSecurityCcvProviderV1QueryConsumerChains + responses: + '200': + description: A successful response. + schema: + type: object + properties: + chains: + type: array + items: + type: object + properties: + chain_id: + type: string + client_id: + type: string default: description: An unexpected error response. schema: @@ -33446,7 +34150,7 @@ paths: store. This param is a part of the cosmos sdk staking module. - In the case of + In the case of a ccv enabled consumer chain, the ccv module acts as the staking module. @@ -33464,10 +34168,31 @@ paths: bottom of the set who can opt out of running the consumer chain without - being punished. For example, a + being punished. For + + example, a value of 0.05 means that the validators in + the bottom 5% of the + + set can opt out + reward_denoms: + type: array + items: + type: string + description: >- + Reward denoms. These are the denominations which are + allowed to be sent to - value of 0.05 means that the validators in the bottom - 5% of the set can opt out + the provider as rewards. + provider_reward_denoms: + type: array + items: + type: string + title: >- + Provider-originated reward denoms. These are denoms + coming from the + + provider which are allowed to be used as rewards. e.g. + "uatom" title: Params defines the parameters for CCV consumer module provider_client_id: type: string @@ -33929,7 +34654,7 @@ paths: format: uint64 title: >- HeightValsetUpdateID defines the genesis information for - the mapping + the mapping of each block height to a valset update id description: >- @@ -34058,9 +34783,7 @@ paths: pools were transmitted to the provider chain preCCV: type: boolean - title: >- - flag indicating whether the consumer CCV module starts in - pre-CCV state + title: flag indicating whether the consumer CCV module starts in title: GenesisState defines the CCV consumer chain genesis state default: description: An unexpected error response. @@ -34256,11 +34979,9 @@ paths: - Query /interchain_security/ccv/provider/pending_consumer_packets: get: - summary: >- + summary: |- QueryThrottledConsumerPacketData returns a list of pending packet data - instances - - (slash packet and vsc matured) for a single consumer chain + instances (slash packet and vsc matured) for a single consumer chain operationId: InterchainSecurityCcvProviderV1QueryThrottledConsumerPacketData responses: '200': @@ -34338,7 +35059,9 @@ paths: consumer chain. title: >- ThrottledPacketDataWrapper contains either SlashPacketData - or VSCMaturedPacketData + or + + VSCMaturedPacketData default: description: An unexpected error response. schema: @@ -34531,137 +35254,343 @@ paths: type: string tags: - Query - /interchain_security/ccv/provider/throttle_state: + /interchain_security/ccv/provider/registered_consumer_reward_denoms: get: - summary: >- - QueryThrottleState returns the main on-chain state relevant to currently - throttled slash packets - operationId: InterchainSecurityCcvProviderV1QueryThrottleState + summary: |- + QueryRegisteredConsumerRewardDenoms returns a list of consumer reward + denoms that are registered + operationId: InterchainSecurityCcvProviderV1QueryRegisteredConsumerRewardDenoms responses: '200': description: A successful response. schema: type: object properties: - slash_meter: - type: string - format: int64 - title: current slash_meter state - slash_meter_allowance: - type: string - format: int64 - description: >- - allowance of voting power units (int) that the slash meter is - given per replenish period - - this also serves as the max value for the meter. - next_replenish_candidate: - type: string - format: date-time - title: >- - next time the slash meter could potentially be replenished, - iff it's not full - packets: + denoms: type: array items: - type: object - properties: - global_entry: - type: object - properties: - recv_time: - type: string - format: date-time - description: >- - Block time that slash packet was received by - provider chain. - - This field is used for store key iteration ordering. - consumer_chain_id: - type: string - description: The consumer that sent a slash packet. - ibc_seq_num: - type: string - format: uint64 - description: >- - The IBC sequence number of the recv packet. - - This field is used in the store key to ensure - uniqueness. - provider_val_cons_addr: - description: >- - The provider's consensus address of the validator - being slashed. - - This field is used to obtain validator power in - HandleThrottleQueues. - - - This field is not used in the store key, but is - persisted in value bytes, see QueueGlobalSlashEntry. - type: object - properties: - address: - type: string - format: byte - title: >- - A validator's consensus address on the provider - chain - description: >- - A persisted queue entry indicating that a slash packet - data instance needs to be handled. - - This type belongs in the "global" queue, to coordinate - slash packet handling times between consumers. - data: - type: object - properties: - validator: - type: object - properties: - address: - type: string - format: byte - title: The first 20 bytes of SHA256(public key) - power: - type: string - format: int64 - description: The voting power - title: PubKey pub_key = 2 [(gogoproto.nullable)=false]; - title: Validator - valset_update_id: - type: string - format: uint64 - title: map to the infraction block height on the provider - infraction: - title: >- - tell if the slashing is for a downtime or a - double-signing infraction - type: string - enum: - - INFRACTION_UNSPECIFIED - - INFRACTION_DOUBLE_SIGN - - INFRACTION_DOWNTIME - default: INFRACTION_UNSPECIFIED - description: >- - Infraction indicates the infraction a validator - commited. - - - INFRACTION_UNSPECIFIED: UNSPECIFIED defines an empty infraction. - - INFRACTION_DOUBLE_SIGN: DOUBLE_SIGN defines a validator that double-signs a block. - - INFRACTION_DOWNTIME: DOWNTIME defines a validator that missed signing too many blocks. - description: >- - This packet is sent from the consumer chain to the - provider chain - - to request the slashing of a validator as a result of an - infraction - - committed on the consumer chain. - description: >- - A query wrapper type for the global entry and data relevant - to a throttled slash packet. - title: data relevant to currently throttled slash packets + type: string + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type of + the serialized + + protocol buffer message. This string must contain at + least + + one "/" character. The last segment of the URL's path + must represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be in + a canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the binary + all types that they + + expect it to use in the context of Any. However, for + URLs which use the + + scheme `http`, `https`, or no scheme, one can optionally + set up a type + + server that maps type URLs to message definitions as + follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based + on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in + the official + + protobuf release, and it is not used for type URLs + beginning with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty scheme) + might be + + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer + message along with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any values + in the form + + of utility functions or additional generated methods of the + Any type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by + default use + + 'type.googleapis.com/full.type.name' as the type URL and the + unpack + + methods only use the fully qualified type name after the + last '/' + + in the type URL, for example "foo.bar.com/x/y.z" will yield + type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the regular + + representation of the deserialized, embedded message, with + an + + additional field `@type` which contains the type URL. + Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a custom + JSON + + representation, that representation will be embedded adding + a field + + `value` which holds the custom JSON in addition to the + `@type` + + field. Example (for message [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + tags: + - Query + /interchain_security/ccv/provider/throttle_state: + get: + summary: |- + QueryThrottleState returns the main on-chain state relevant to currently + throttled slash packets + operationId: InterchainSecurityCcvProviderV1QueryThrottleState + responses: + '200': + description: A successful response. + schema: + type: object + properties: + slash_meter: + type: string + format: int64 + title: current slash_meter state + slash_meter_allowance: + type: string + format: int64 + description: >- + allowance of voting power units (int) that the slash meter is + given per + + replenish period this also serves as the max value for the + meter. + next_replenish_candidate: + type: string + format: date-time + title: >- + next time the slash meter could potentially be replenished, + iff it's not + + full + packets: + type: array + items: + type: object + properties: + global_entry: + type: object + properties: + recv_time: + type: string + format: date-time + description: >- + Block time that slash packet was received by + provider chain. + + This field is used for store key iteration ordering. + consumer_chain_id: + type: string + description: The consumer that sent a slash packet. + ibc_seq_num: + type: string + format: uint64 + description: >- + The IBC sequence number of the recv packet. + + This field is used in the store key to ensure + uniqueness. + provider_val_cons_addr: + type: string + format: byte + description: >- + The provider's consensus address of the validator + being slashed. + + This field is used to obtain validator power in + HandleThrottleQueues. + + + This field is not used in the store key, but is + persisted in value bytes, + + see QueueGlobalSlashEntry. + description: >- + A persisted queue entry indicating that a slash packet + data instance needs to + + be handled. This type belongs in the "global" queue, to + coordinate slash + + packet handling times between consumers. + data: + type: object + properties: + validator: + type: object + properties: + address: + type: string + format: byte + title: The first 20 bytes of SHA256(public key) + power: + type: string + format: int64 + description: The voting power + title: PubKey pub_key = 2 [(gogoproto.nullable)=false]; + title: Validator + valset_update_id: + type: string + format: uint64 + title: map to the infraction block height on the provider + infraction: + title: >- + tell if the slashing is for a downtime or a + double-signing infraction + type: string + enum: + - INFRACTION_UNSPECIFIED + - INFRACTION_DOUBLE_SIGN + - INFRACTION_DOWNTIME + default: INFRACTION_UNSPECIFIED + description: >- + Infraction indicates the infraction a validator + commited. + + - INFRACTION_UNSPECIFIED: UNSPECIFIED defines an empty infraction. + - INFRACTION_DOUBLE_SIGN: DOUBLE_SIGN defines a validator that double-signs a block. + - INFRACTION_DOWNTIME: DOWNTIME defines a validator that missed signing too many blocks. + description: >- + This packet is sent from the consumer chain to the + provider chain + + to request the slashing of a validator as a result of an + infraction + + committed on the consumer chain. + description: >- + A query wrapper type for the global entry and data relevant + to a throttled + + slash packet. + title: data relevant to currently throttled slash packets default: description: An unexpected error response. schema: @@ -39149,6 +40078,152 @@ paths: additionalProperties: {} tags: - Query + /pob/builder/v1/bid: + post: + summary: AuctionBid defines a method for sending bids to the x/builder module. + operationId: PobBuilderV1AuctionBid + responses: + '200': + description: A successful response. + schema: + type: object + description: MsgAuctionBidResponse defines the Msg/AuctionBid response type. + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + additionalProperties: {} + parameters: + - name: bidder + description: |- + bidder is the address of the account that is submitting a bid to the + auction. + in: query + required: false + type: string + - name: bid.denom + in: query + required: false + type: string + - name: bid.amount + in: query + required: false + type: string + - name: transactions + description: >- + transactions are the bytes of the transactions that the bidder wants + to + + bundle together. + in: query + required: false + type: array + items: + type: string + format: byte + collectionFormat: multi + tags: + - Msg + /pob/builder/v1/params: + get: + summary: Params queries the parameters of the x/builder module. + operationId: PobBuilderV1Params + responses: + '200': + description: A successful response. + schema: + type: object + properties: + params: + description: params defines the parameters of the module. + type: object + properties: + max_bundle_size: + type: integer + format: int64 + description: >- + max_bundle_size is the maximum number of transactions that + can be bundled + + in a single bundle. + escrow_account_address: + type: string + format: byte + description: >- + escrow_account_address is the address of the account that + will receive a + + portion of the bid proceeds. + reserve_fee: + description: reserve_fee specifies the bid floor for the auction. + type: object + properties: + denom: + type: string + amount: + type: string + min_bid_increment: + description: >- + min_bid_increment specifies the minimum amount that the + next bid must be + + greater than the previous bid. + type: object + properties: + denom: + type: string + amount: + type: string + front_running_protection: + type: boolean + description: >- + front_running_protection specifies whether front running + and sandwich + + attack protection is enabled. + proposer_fee: + type: string + description: >- + proposer_fee defines the portion of the winning bid that + goes to the block + + proposer that proposed the block. + description: >- + QueryParamsResponse is the response type for the Query/Params RPC + method. + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + additionalProperties: {} + tags: + - Query /ibc/apps/router/v1/params: get: summary: Params queries all parameters of the router module. @@ -39189,6 +40264,670 @@ paths: tags: - Query definitions: + cosmos.adminmodule.adminmodule.MsgAddAdminResponse: + type: object + cosmos.adminmodule.adminmodule.MsgDeleteAdminResponse: + type: object + cosmos.adminmodule.adminmodule.MsgSubmitProposalResponse: + type: object + properties: + proposal_id: + type: string + format: uint64 + description: MsgSubmitProposalResponse defines the Msg/SubmitProposal response type. + cosmos.adminmodule.adminmodule.QueryAdminsResponse: + type: object + properties: + admins: + type: array + items: + type: string + cosmos.adminmodule.adminmodule.QueryArchivedProposalsResponse: + type: object + properties: + proposals: + type: array + items: + type: object + properties: + proposal_id: + type: string + format: uint64 + description: proposal_id defines the unique id of the proposal. + content: + description: content is the proposal's content. + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type of the + serialized + + protocol buffer message. This string must contain at least + + one "/" character. The last segment of the URL's path must + represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be in a + canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the binary all + types that they + + expect it to use in the context of Any. However, for URLs + which use the + + scheme `http`, `https`, or no scheme, one can optionally set + up a type + + server that maps type URLs to message definitions as + follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based on + the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in the + official + + protobuf release, and it is not used for type URLs beginning + with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty scheme) + might be + + used with implementation specific semantics. + additionalProperties: {} + status: + description: status defines the proposal status. + type: string + enum: + - PROPOSAL_STATUS_UNSPECIFIED + - PROPOSAL_STATUS_DEPOSIT_PERIOD + - PROPOSAL_STATUS_VOTING_PERIOD + - PROPOSAL_STATUS_PASSED + - PROPOSAL_STATUS_REJECTED + - PROPOSAL_STATUS_FAILED + default: PROPOSAL_STATUS_UNSPECIFIED + final_tally_result: + description: >- + final_tally_result is the final tally result of the proposal. + When + + querying a proposal via gRPC, this field is not populated until + the + + proposal's voting period has ended. + type: object + properties: + 'yes': + type: string + description: yes is the number of yes votes on a proposal. + abstain: + type: string + description: abstain is the number of abstain votes on a proposal. + 'no': + type: string + description: no is the number of no votes on a proposal. + no_with_veto: + type: string + description: >- + no_with_veto is the number of no with veto votes on a + proposal. + submit_time: + type: string + format: date-time + description: submit_time is the time of proposal submission. + deposit_end_time: + type: string + format: date-time + description: deposit_end_time is the end time for deposition. + total_deposit: + type: array + items: + type: object + properties: + denom: + type: string + amount: + type: string + 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. + description: total_deposit is the total deposit on the proposal. + voting_start_time: + type: string + format: date-time + description: voting_start_time is the starting time to vote on a proposal. + voting_end_time: + type: string + format: date-time + description: voting_end_time is the end time of voting on a proposal. + description: Proposal defines the core field members of a governance proposal. + cosmos.base.v1beta1.Coin: + type: object + properties: + denom: + type: string + amount: + type: string + 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. + cosmos.gov.v1beta1.Proposal: + type: object + properties: + proposal_id: + type: string + format: uint64 + description: proposal_id defines the unique id of the proposal. + content: + description: content is the proposal's content. + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type of the + serialized + + protocol buffer message. This string must contain at least + + one "/" character. The last segment of the URL's path must + represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be in a + canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the binary all types + that they + + expect it to use in the context of Any. However, for URLs which + use the + + scheme `http`, `https`, or no scheme, one can optionally set up a + type + + server that maps type URLs to message definitions as follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in the + official + + protobuf release, and it is not used for type URLs beginning with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty scheme) might be + + used with implementation specific semantics. + additionalProperties: {} + status: + description: status defines the proposal status. + type: string + enum: + - PROPOSAL_STATUS_UNSPECIFIED + - PROPOSAL_STATUS_DEPOSIT_PERIOD + - PROPOSAL_STATUS_VOTING_PERIOD + - PROPOSAL_STATUS_PASSED + - PROPOSAL_STATUS_REJECTED + - PROPOSAL_STATUS_FAILED + default: PROPOSAL_STATUS_UNSPECIFIED + final_tally_result: + description: |- + final_tally_result is the final tally result of the proposal. When + querying a proposal via gRPC, this field is not populated until the + proposal's voting period has ended. + type: object + properties: + 'yes': + type: string + description: yes is the number of yes votes on a proposal. + abstain: + type: string + description: abstain is the number of abstain votes on a proposal. + 'no': + type: string + description: no is the number of no votes on a proposal. + no_with_veto: + type: string + description: no_with_veto is the number of no with veto votes on a proposal. + submit_time: + type: string + format: date-time + description: submit_time is the time of proposal submission. + deposit_end_time: + type: string + format: date-time + description: deposit_end_time is the end time for deposition. + total_deposit: + type: array + items: + type: object + properties: + denom: + type: string + amount: + type: string + 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. + description: total_deposit is the total deposit on the proposal. + voting_start_time: + type: string + format: date-time + description: voting_start_time is the starting time to vote on a proposal. + voting_end_time: + type: string + format: date-time + description: voting_end_time is the end time of voting on a proposal. + description: Proposal defines the core field members of a governance proposal. + cosmos.gov.v1beta1.ProposalStatus: + type: string + enum: + - PROPOSAL_STATUS_UNSPECIFIED + - PROPOSAL_STATUS_DEPOSIT_PERIOD + - PROPOSAL_STATUS_VOTING_PERIOD + - PROPOSAL_STATUS_PASSED + - PROPOSAL_STATUS_REJECTED + - PROPOSAL_STATUS_FAILED + default: PROPOSAL_STATUS_UNSPECIFIED + description: |- + ProposalStatus enumerates the valid statuses of a proposal. + + - PROPOSAL_STATUS_UNSPECIFIED: PROPOSAL_STATUS_UNSPECIFIED defines the default proposal status. + - PROPOSAL_STATUS_DEPOSIT_PERIOD: PROPOSAL_STATUS_DEPOSIT_PERIOD defines a proposal status during the deposit + period. + - PROPOSAL_STATUS_VOTING_PERIOD: PROPOSAL_STATUS_VOTING_PERIOD defines a proposal status during the voting + period. + - PROPOSAL_STATUS_PASSED: PROPOSAL_STATUS_PASSED defines a proposal status of a proposal that has + passed. + - PROPOSAL_STATUS_REJECTED: PROPOSAL_STATUS_REJECTED defines a proposal status of a proposal that has + been rejected. + - PROPOSAL_STATUS_FAILED: PROPOSAL_STATUS_FAILED defines a proposal status of a proposal that has + failed. + cosmos.gov.v1beta1.TallyResult: + type: object + properties: + 'yes': + type: string + description: yes is the number of yes votes on a proposal. + abstain: + type: string + description: abstain is the number of abstain votes on a proposal. + 'no': + type: string + description: no is the number of no votes on a proposal. + no_with_veto: + type: string + description: no_with_veto is the number of no with veto votes on a proposal. + description: TallyResult defines a standard tally for a governance proposal. + google.protobuf.Any: + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type of the + serialized + + protocol buffer message. This string must contain at least + + one "/" character. The last segment of the URL's path must represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be in a canonical + form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the binary all types that + they + + expect it to use in the context of Any. However, for URLs which use + the + + scheme `http`, `https`, or no scheme, one can optionally set up a type + + server that maps type URLs to message definitions as follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in the official + + protobuf release, and it is not used for type URLs beginning with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty scheme) might be + + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer message along with + a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any values in the form + + of utility functions or additional generated methods of the Any type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by default use + + 'type.googleapis.com/full.type.name' as the type URL and the unpack + + methods only use the fully qualified type name after the last '/' + + in the type URL, for example "foo.bar.com/x/y.z" will yield type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the regular + + representation of the deserialized, embedded message, with an + + additional field `@type` which contains the type URL. Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a custom JSON + + representation, that representation will be embedded adding a field + + `value` which holds the custom JSON in addition to the `@type` + + field. Example (for message [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + google.rpc.Status: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type of the + serialized + + protocol buffer message. This string must contain at least + + one "/" character. The last segment of the URL's path must + represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be in a + canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the binary all types + that they + + expect it to use in the context of Any. However, for URLs which + use the + + scheme `http`, `https`, or no scheme, one can optionally set up + a type + + server that maps type URLs to message definitions as follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in the + official + + protobuf release, and it is not used for type URLs beginning + with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty scheme) might + be + + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer message along + with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any values in the + form + + of utility functions or additional generated methods of the Any + type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by default use + + 'type.googleapis.com/full.type.name' as the type URL and the unpack + + methods only use the fully qualified type name after the last '/' + + in the type URL, for example "foo.bar.com/x/y.z" will yield type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the regular + + representation of the deserialized, embedded message, with an + + additional field `@type` which contains the type URL. Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a custom JSON + + representation, that representation will be embedded adding a field + + `value` which holds the custom JSON in addition to the `@type` + + field. Example (for message [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } cosmos.auth.v1beta1.AddressBytesToStringResponse: type: object properties: @@ -40402,329 +42141,6 @@ definitions: repeated Bar results = 1; PageResponse page = 2; } - google.protobuf.Any: - type: object - properties: - '@type': - type: string - description: >- - A URL/resource name that uniquely identifies the type of the - serialized - - protocol buffer message. This string must contain at least - - one "/" character. The last segment of the URL's path must represent - - the fully qualified name of the type (as in - - `path/google.protobuf.Duration`). The name should be in a canonical - form - - (e.g., leading "." is not accepted). - - - In practice, teams usually precompile into the binary all types that - they - - expect it to use in the context of Any. However, for URLs which use - the - - scheme `http`, `https`, or no scheme, one can optionally set up a type - - server that maps type URLs to message definitions as follows: - - - * If no scheme is provided, `https` is assumed. - - * An HTTP GET on the URL must yield a [google.protobuf.Type][] - value in binary format, or produce an error. - * Applications are allowed to cache lookup results based on the - URL, or have them precompiled into a binary to avoid any - lookup. Therefore, binary compatibility needs to be preserved - on changes to types. (Use versioned type names to manage - breaking changes.) - - Note: this functionality is not currently available in the official - - protobuf release, and it is not used for type URLs beginning with - - type.googleapis.com. - - - Schemes other than `http`, `https` (or the empty scheme) might be - - used with implementation specific semantics. - additionalProperties: {} - description: >- - `Any` contains an arbitrary serialized protocol buffer message along with - a - - URL that describes the type of the serialized message. - - - Protobuf library provides support to pack/unpack Any values in the form - - of utility functions or additional generated methods of the Any type. - - - Example 1: Pack and unpack a message in C++. - - Foo foo = ...; - Any any; - any.PackFrom(foo); - ... - if (any.UnpackTo(&foo)) { - ... - } - - Example 2: Pack and unpack a message in Java. - - Foo foo = ...; - Any any = Any.pack(foo); - ... - if (any.is(Foo.class)) { - foo = any.unpack(Foo.class); - } - - Example 3: Pack and unpack a message in Python. - - foo = Foo(...) - any = Any() - any.Pack(foo) - ... - if any.Is(Foo.DESCRIPTOR): - any.Unpack(foo) - ... - - Example 4: Pack and unpack a message in Go - - foo := &pb.Foo{...} - any, err := anypb.New(foo) - if err != nil { - ... - } - ... - foo := &pb.Foo{} - if err := any.UnmarshalTo(foo); err != nil { - ... - } - - The pack methods provided by protobuf library will by default use - - 'type.googleapis.com/full.type.name' as the type URL and the unpack - - methods only use the fully qualified type name after the last '/' - - in the type URL, for example "foo.bar.com/x/y.z" will yield type - - name "y.z". - - - - JSON - - ==== - - The JSON representation of an `Any` value uses the regular - - representation of the deserialized, embedded message, with an - - additional field `@type` which contains the type URL. Example: - - package google.profile; - message Person { - string first_name = 1; - string last_name = 2; - } - - { - "@type": "type.googleapis.com/google.profile.Person", - "firstName": , - "lastName": - } - - If the embedded message type is well-known and has a custom JSON - - representation, that representation will be embedded adding a field - - `value` which holds the custom JSON in addition to the `@type` - - field. Example (for message [google.protobuf.Duration][]): - - { - "@type": "type.googleapis.com/google.protobuf.Duration", - "value": "1.212s" - } - google.rpc.Status: - type: object - properties: - code: - type: integer - format: int32 - message: - type: string - details: - type: array - items: - type: object - properties: - '@type': - type: string - description: >- - A URL/resource name that uniquely identifies the type of the - serialized - - protocol buffer message. This string must contain at least - - one "/" character. The last segment of the URL's path must - represent - - the fully qualified name of the type (as in - - `path/google.protobuf.Duration`). The name should be in a - canonical form - - (e.g., leading "." is not accepted). - - - In practice, teams usually precompile into the binary all types - that they - - expect it to use in the context of Any. However, for URLs which - use the - - scheme `http`, `https`, or no scheme, one can optionally set up - a type - - server that maps type URLs to message definitions as follows: - - - * If no scheme is provided, `https` is assumed. - - * An HTTP GET on the URL must yield a [google.protobuf.Type][] - value in binary format, or produce an error. - * Applications are allowed to cache lookup results based on the - URL, or have them precompiled into a binary to avoid any - lookup. Therefore, binary compatibility needs to be preserved - on changes to types. (Use versioned type names to manage - breaking changes.) - - Note: this functionality is not currently available in the - official - - protobuf release, and it is not used for type URLs beginning - with - - type.googleapis.com. - - - Schemes other than `http`, `https` (or the empty scheme) might - be - - used with implementation specific semantics. - additionalProperties: {} - description: >- - `Any` contains an arbitrary serialized protocol buffer message along - with a - - URL that describes the type of the serialized message. - - - Protobuf library provides support to pack/unpack Any values in the - form - - of utility functions or additional generated methods of the Any - type. - - - Example 1: Pack and unpack a message in C++. - - Foo foo = ...; - Any any; - any.PackFrom(foo); - ... - if (any.UnpackTo(&foo)) { - ... - } - - Example 2: Pack and unpack a message in Java. - - Foo foo = ...; - Any any = Any.pack(foo); - ... - if (any.is(Foo.class)) { - foo = any.unpack(Foo.class); - } - - Example 3: Pack and unpack a message in Python. - - foo = Foo(...) - any = Any() - any.Pack(foo) - ... - if any.Is(Foo.DESCRIPTOR): - any.Unpack(foo) - ... - - Example 4: Pack and unpack a message in Go - - foo := &pb.Foo{...} - any, err := anypb.New(foo) - if err != nil { - ... - } - ... - foo := &pb.Foo{} - if err := any.UnmarshalTo(foo); err != nil { - ... - } - - The pack methods provided by protobuf library will by default use - - 'type.googleapis.com/full.type.name' as the type URL and the unpack - - methods only use the fully qualified type name after the last '/' - - in the type URL, for example "foo.bar.com/x/y.z" will yield type - - name "y.z". - - - - JSON - - ==== - - The JSON representation of an `Any` value uses the regular - - representation of the deserialized, embedded message, with an - - additional field `@type` which contains the type URL. Example: - - package google.profile; - message Person { - string first_name = 1; - string last_name = 2; - } - - { - "@type": "type.googleapis.com/google.profile.Person", - "firstName": , - "lastName": - } - - If the embedded message type is well-known and has a custom JSON - - representation, that representation will be embedded adding a field - - `value` which holds the custom JSON in addition to the `@type` - - field. Example (for message [google.protobuf.Duration][]): - - { - "@type": "type.googleapis.com/google.protobuf.Duration", - "value": "1.212s" - } cosmos.authz.v1beta1.Grant: type: object properties: @@ -42472,18 +43888,6 @@ definitions: description: |- SendEnabled maps coin denom to a send_enabled status (whether a denom is sendable). - cosmos.base.v1beta1.Coin: - type: object - properties: - denom: - type: string - amount: - type: string - 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. cosmos.base.tendermint.v1beta1.ABCIQueryResponse: type: object properties: @@ -56355,11 +57759,132 @@ definitions: title: |- QuerySmartContractStateResponse is the response type for the Query/SmartContractState RPC method + cosmos.base.v1beta1.DecCoin: + type: object + properties: + denom: + type: string + amount: + type: string + description: |- + DecCoin defines a token with a denomination and a decimal amount. + + NOTE: The amount field is an Dec which implements the custom method + signatures required by gogoproto. + gaia.globalfee.v1beta1.Params: + type: object + properties: + minimum_gas_prices: + type: array + items: + type: object + properties: + denom: + type: string + amount: + type: string + description: |- + DecCoin defines a token with a denomination and a decimal amount. + + NOTE: The amount field is an Dec which implements the custom method + signatures required by gogoproto. + title: >- + minimum_gas_prices stores the minimum gas price(s) for all TX on the + chain. + + When multiple coins are defined then they are accepted alternatively. + + The list must be sorted by denoms asc. No duplicate denoms or zero + amount + + values allowed. For more information see + + https://docs.cosmos.network/main/modules/auth#concepts + bypass_min_fee_msg_types: + type: array + items: + type: string + description: |- + bypass_min_fee_msg_types defines a list of message type urls + that are free of fee charge. + max_total_bypass_min_fee_msg_gas_usage: + type: string + format: uint64 + description: >- + max_total_bypass_min_fee_msg_gas_usage defines the total maximum gas + usage + + allowed for a transaction containing only messages of types in + bypass_min_fee_msg_types + + to bypass fee charge. + description: Params defines the set of module parameters. + gaia.globalfee.v1beta1.QueryParamsResponse: + type: object + properties: + params: + type: object + properties: + minimum_gas_prices: + type: array + items: + type: object + properties: + denom: + type: string + amount: + type: string + description: >- + DecCoin defines a token with a denomination and a decimal + amount. + + + NOTE: The amount field is an Dec which implements the custom + method + + signatures required by gogoproto. + title: >- + minimum_gas_prices stores the minimum gas price(s) for all TX on + the chain. + + When multiple coins are defined then they are accepted + alternatively. + + The list must be sorted by denoms asc. No duplicate denoms or zero + amount + + values allowed. For more information see + + https://docs.cosmos.network/main/modules/auth#concepts + bypass_min_fee_msg_types: + type: array + items: + type: string + description: |- + bypass_min_fee_msg_types defines a list of message type urls + that are free of fee charge. + max_total_bypass_min_fee_msg_gas_usage: + type: string + format: uint64 + description: >- + max_total_bypass_min_fee_msg_gas_usage defines the total maximum + gas usage + + allowed for a transaction containing only messages of types in + bypass_min_fee_msg_types + + to bypass fee charge. + description: Params defines the set of module parameters. + description: |- + QueryMinimumGasPricesResponse is the response type for the + Query/MinimumGasPrices RPC method. ibc.applications.interchain_accounts.controller.v1.MsgRegisterInterchainAccountResponse: type: object properties: channel_id: type: string + port_id: + type: string title: >- MsgRegisterInterchainAccountResponse defines the response for Msg/RegisterAccount @@ -56665,6 +58190,8 @@ definitions: properties: version: type: string + channel_id: + type: string description: MsgChannelOpenTryResponse defines the Msg/ChannelOpenTry response type. ibc.core.channel.v1.MsgRecvPacketResponse: type: object @@ -58488,7 +60015,14 @@ definitions: type: array items: type: string - description: allowed_clients defines the list of allowed client state types. + description: >- + allowed_clients defines the list of allowed client state types which + can be created + + and interacted with. If a client type is removed from the allowed + clients list, usage + + of this client will be disabled until it is added again to the list. description: Params defines the set of IBC light client parameters. ibc.core.client.v1.QueryClientParamsResponse: type: object @@ -58501,7 +60035,15 @@ definitions: type: array items: type: string - description: allowed_clients defines the list of allowed client state types. + description: >- + allowed_clients defines the list of allowed client state types + which can be created + + and interacted with. If a client type is removed from the allowed + clients list, usage + + of this client will be disabled until it is added again to the + list. description: >- QueryClientParamsResponse is the response type for the Query/ClientParams RPC @@ -60889,7 +62431,7 @@ definitions: description: >- The number of historical info entries to persist in store. - This param is a part of the cosmos sdk staking module. In the case of + This param is a part of the cosmos sdk staking module. In the case of a ccv enabled consumer chain, the ccv module acts as the staking module. @@ -60905,10 +62447,27 @@ definitions: set who can opt out of running the consumer chain without being punished. For - example, a - value of 0.05 means that the validators in the bottom 5% of the set - can opt out + example, a value of 0.05 means that the validators in the bottom 5% of + the + + set can opt out + reward_denoms: + type: array + items: + type: string + description: >- + Reward denoms. These are the denominations which are allowed to be + sent to + + the provider as rewards. + provider_reward_denoms: + type: array + items: + type: string + title: |- + Provider-originated reward denoms. These are denoms coming from the + provider which are allowed to be used as rewards. e.g. "uatom" title: Params defines the parameters for CCV consumer module interchain_security.ccv.consumer.v1.QueryNextFeeDistributionEstimateResponse: type: object @@ -61010,7 +62569,7 @@ definitions: The number of historical info entries to persist in store. This param is a part of the cosmos sdk staking module. In the case - of + of a ccv enabled consumer chain, the ccv module acts as the staking module. @@ -61026,10 +62585,30 @@ definitions: the set who can opt out of running the consumer chain without being punished. - For example, a + For + + example, a value of 0.05 means that the validators in the bottom + 5% of the - value of 0.05 means that the validators in the bottom 5% of the set can opt out + reward_denoms: + type: array + items: + type: string + description: >- + Reward denoms. These are the denominations which are allowed to be + sent to + + the provider as rewards. + provider_reward_denoms: + type: array + items: + type: string + title: >- + Provider-originated reward denoms. These are denoms coming from + the + + provider which are allowed to be used as rewards. e.g. "uatom" title: Params defines the parameters for CCV consumer module description: QueryParamsResponse is response type for the Query/Params RPC method. cosmos.ics23.v1.HashOp: @@ -61952,7 +63531,7 @@ definitions: The number of historical info entries to persist in store. This param is a part of the cosmos sdk staking module. In the case - of + of a ccv enabled consumer chain, the ccv module acts as the staking module. @@ -61968,10 +63547,30 @@ definitions: the set who can opt out of running the consumer chain without being punished. - For example, a + For + + example, a value of 0.05 means that the validators in the bottom + 5% of the - value of 0.05 means that the validators in the bottom 5% of the set can opt out + reward_denoms: + type: array + items: + type: string + description: >- + Reward denoms. These are the denominations which are allowed to be + sent to + + the provider as rewards. + provider_reward_denoms: + type: array + items: + type: string + title: >- + Provider-originated reward denoms. These are denoms coming from + the + + provider which are allowed to be used as rewards. e.g. "uatom" title: Params defines the parameters for CCV consumer module provider_client_id: type: string @@ -62407,10 +64006,8 @@ definitions: valset_update_id: type: string format: uint64 - title: >- - HeightValsetUpdateID defines the genesis information for the - mapping - + title: |- + HeightValsetUpdateID defines the genesis information for the mapping of each block height to a valset update id description: HeightToValsetUpdateId nil on new chain, filled in on restart. outstanding_downtime_slashing: @@ -62522,9 +64119,7 @@ definitions: pools were transmitted to the provider chain preCCV: type: boolean - title: >- - flag indicating whether the consumer CCV module starts in pre-CCV - state + title: flag indicating whether the consumer CCV module starts in title: GenesisState defines the CCV consumer chain genesis state interchain_security.ccv.consumer.v1.HeightToValsetUpdateID: type: object @@ -62536,7 +64131,7 @@ definitions: type: string format: uint64 title: |- - HeightValsetUpdateID defines the genesis information for the mapping + HeightValsetUpdateID defines the genesis information for the mapping of each block height to a valset update id interchain_security.ccv.consumer.v1.LastTransmissionBlockHeight: type: object @@ -62585,13 +64180,12 @@ definitions: type: string description: >- the proposed chain-id of the new consumer chain, must be different - from all other consumer chain ids of the executing + from all - provider chain. + other consumer chain ids of the executing provider chain. initial_height: - description: >- + description: |- the proposed initial height of new consumer chain. - For a completely new chain, this will be {0,1}. However, it may be different if this is a chain that is converting to a consumer chain. type: object @@ -62614,29 +64208,31 @@ definitions: genesis_hash: type: string format: byte - description: >- + description: |- The hash of the consumer chain genesis state without the consumer CCV - module genesis params. - - It is used for off-chain confirmation of genesis.json validity by - validators and other parties. + module genesis params. It is used for off-chain confirmation of + genesis.json validity by validators and other parties. binary_hash: type: string format: byte description: >- The hash of the consumer chain binary that should be run by validators - on chain initialization. + on + + chain initialization. It is used for off-chain confirmation of binary - It is used for off-chain confirmation of binary validity by validators - and other parties. + validity by validators and other parties. spawn_time: type: string format: date-time description: >- spawn time is the time on the provider chain at which the consumer - chain genesis is finalized and all validators + chain - will be responsible for starting their consumer chain validator node. + genesis is finalized and all validators will be responsible for + starting + + their consumer chain validator node. unbonding_period: type: string description: |- @@ -62660,32 +64256,48 @@ definitions: blocks_per_distribution_transmission: type: string format: int64 - description: >- + description: |- BlocksPerDistributionTransmission is the number of blocks between - ibc-token-transfers from the consumer chain to the provider chain. - - On sending transmission event, `consumer_redistribution_fraction` of - the accumulated tokens are sent to the consumer redistribution - address. + ibc-token-transfers from the consumer chain to the provider chain. On + sending transmission event, `consumer_redistribution_fraction` of the + accumulated tokens are sent to the consumer redistribution address. historical_entries: type: string format: int64 description: >- The number of historical info entries to persist in store. - This param is a part of the cosmos sdk staking module. In the case of + This param is a part of the cosmos sdk staking module. In the case of a ccv enabled consumer chain, the ccv module acts as the staking module. + distribution_transmission_channel: + type: string + title: >- + The ID of a token transfer channel used for the Reward Distribution + + sub-protocol. If DistributionTransmissionChannel == "", a new transfer + + channel is created on top of the same connection as the CCV channel. + + Note that transfer_channel_id is the ID of the channel end on the + consumer + + chain. it is most relevant for chains performing a sovereign to + consumer + + changeover in order to maintan the existing ibc transfer channel description: >- ConsumerAdditionProposal is a governance proposal on the provider chain to - spawn a new consumer chain. - If it passes, then all validators on the provider chain are expected to - validate the consumer chain at spawn time + spawn a new consumer chain. If it passes, then all validators on the + provider + + chain are expected to validate the consumer chain at spawn time or get + + slashed. It is recommended that spawn time occurs after the proposal end - or get slashed. It is recommended that spawn time occurs after the - proposal end time. + time. interchain_security.ccv.provider.v1.ConsumerAdditionProposals: type: object properties: @@ -62704,15 +64316,17 @@ definitions: type: string description: >- the proposed chain-id of the new consumer chain, must be - different from all other consumer chain ids of the executing + different from all - provider chain. + other consumer chain ids of the executing provider chain. initial_height: description: >- the proposed initial height of new consumer chain. For a completely new chain, this will be {0,1}. However, it may - be different if this is a chain that is converting to a consumer + be + + different if this is a chain that is converting to a consumer chain. type: object properties: @@ -62736,28 +64350,33 @@ definitions: format: byte description: >- The hash of the consumer chain genesis state without the - consumer CCV module genesis params. + consumer CCV - It is used for off-chain confirmation of genesis.json validity - by validators and other parties. + module genesis params. It is used for off-chain confirmation of + + genesis.json validity by validators and other parties. binary_hash: type: string format: byte description: >- The hash of the consumer chain binary that should be run by - validators on chain initialization. + validators on + + chain initialization. It is used for off-chain confirmation of + binary - It is used for off-chain confirmation of binary validity by - validators and other parties. + validity by validators and other parties. spawn_time: type: string format: date-time description: >- spawn time is the time on the provider chain at which the - consumer chain genesis is finalized and all validators + consumer chain + + genesis is finalized and all validators will be responsible for + starting - will be responsible for starting their consumer chain validator - node. + their consumer chain validator node. unbonding_period: type: string description: |- @@ -62786,12 +64405,16 @@ definitions: format: int64 description: >- BlocksPerDistributionTransmission is the number of blocks - between ibc-token-transfers from the consumer chain to the - provider chain. + between + + ibc-token-transfers from the consumer chain to the provider + chain. On + + sending transmission event, `consumer_redistribution_fraction` + of the - On sending transmission event, - `consumer_redistribution_fraction` of the accumulated tokens are - sent to the consumer redistribution address. + accumulated tokens are sent to the consumer redistribution + address. historical_entries: type: string format: int64 @@ -62799,23 +64422,49 @@ definitions: The number of historical info entries to persist in store. This param is a part of the cosmos sdk staking module. In the - case of + case of a ccv enabled consumer chain, the ccv module acts as the staking module. + distribution_transmission_channel: + type: string + title: >- + The ID of a token transfer channel used for the Reward + Distribution + + sub-protocol. If DistributionTransmissionChannel == "", a new + transfer + + channel is created on top of the same connection as the CCV + channel. + + Note that transfer_channel_id is the ID of the channel end on + the consumer + + chain. it is most relevant for chains performing a sovereign to + consumer + + changeover in order to maintan the existing ibc transfer channel description: >- ConsumerAdditionProposal is a governance proposal on the provider - chain to spawn a new consumer chain. + chain to + + spawn a new consumer chain. If it passes, then all validators on the + provider + + chain are expected to validate the consumer chain at spawn time or + get - If it passes, then all validators on the provider chain are expected - to validate the consumer chain at spawn time + slashed. It is recommended that spawn time occurs after the proposal + end - or get slashed. It is recommended that spawn time occurs after the - proposal end time. + time. title: proposals waiting for spawn_time to pass description: >- ConsumerAdditionProposals holds pending governance proposals on the - provider chain to spawn a new chain. + provider + + chain to spawn a new chain. interchain_security.ccv.provider.v1.ConsumerRemovalProposal: type: object properties: @@ -62833,15 +64482,18 @@ definitions: format: date-time title: >- the time on the provider chain at which all validators are responsible - to stop their consumer chain validator node + to + + stop their consumer chain validator node description: >- ConsumerRemovalProposal is a governance proposal on the provider chain to - remove (and stop) a consumer chain. - If it passes, all the consumer chain's state is removed from the provider - chain. The outstanding unbonding + remove (and stop) a consumer chain. If it passes, all the consumer chain's - operation funds are released. + state is removed from the provider chain. The outstanding unbonding + operation + + funds are released. interchain_security.ccv.provider.v1.ConsumerRemovalProposals: type: object properties: @@ -62864,19 +64516,26 @@ definitions: format: date-time title: >- the time on the provider chain at which all validators are - responsible to stop their consumer chain validator node + responsible to + + stop their consumer chain validator node description: >- ConsumerRemovalProposal is a governance proposal on the provider - chain to remove (and stop) a consumer chain. + chain to - If it passes, all the consumer chain's state is removed from the - provider chain. The outstanding unbonding + remove (and stop) a consumer chain. If it passes, all the consumer + chain's - operation funds are released. + state is removed from the provider chain. The outstanding unbonding + operation + + funds are released. title: proposals waiting for stop_time to pass description: >- ConsumerRemovalProposals holds pending governance proposals on the - provider chain to remove (and stop) a consumer chain. + provider + + chain to remove (and stop) a consumer chain. interchain_security.ccv.provider.v1.GlobalSlashEntry: type: object properties: @@ -62893,38 +64552,35 @@ definitions: type: string format: uint64 description: |- - The IBC sequence number of the recv packet. + The IBC sequence number of the recv packet. This field is used in the store key to ensure uniqueness. provider_val_cons_addr: + type: string + format: byte description: >- - The provider's consensus address of the validator being slashed. + The provider's consensus address of the validator being slashed. This field is used to obtain validator power in HandleThrottleQueues. This field is not used in the store key, but is persisted in value - bytes, see QueueGlobalSlashEntry. - type: object - properties: - address: - type: string - format: byte - title: A validator's consensus address on the provider chain + bytes, + + see QueueGlobalSlashEntry. description: >- A persisted queue entry indicating that a slash packet data instance needs - to be handled. + to - This type belongs in the "global" queue, to coordinate slash packet - handling times between consumers. + be handled. This type belongs in the "global" queue, to coordinate slash + + packet handling times between consumers. interchain_security.ccv.provider.v1.MsgAssignConsumerKeyResponse: type: object - interchain_security.ccv.provider.v1.ProviderConsAddress: + interchain_security.ccv.provider.v1.MsgRegisterConsumerRewardDenomResponse: type: object - properties: - address: - type: string - format: byte - title: A validator's consensus address on the provider chain + description: |- + MsgRegisterConsumerRewardDenomResponse defines the + Msg/RegisterConsumerRewardDenom response type. interchain_security.ccv.provider.v1.QueryConsumerChainStartProposalsResponse: type: object properties: @@ -62946,15 +64602,17 @@ definitions: type: string description: >- the proposed chain-id of the new consumer chain, must be - different from all other consumer chain ids of the executing + different from all - provider chain. + other consumer chain ids of the executing provider chain. initial_height: description: >- the proposed initial height of new consumer chain. For a completely new chain, this will be {0,1}. However, it - may be different if this is a chain that is converting to a + may be + + different if this is a chain that is converting to a consumer chain. type: object properties: @@ -62978,28 +64636,34 @@ definitions: format: byte description: >- The hash of the consumer chain genesis state without the - consumer CCV module genesis params. + consumer CCV - It is used for off-chain confirmation of genesis.json - validity by validators and other parties. + module genesis params. It is used for off-chain confirmation + of + + genesis.json validity by validators and other parties. binary_hash: type: string format: byte description: >- The hash of the consumer chain binary that should be run by - validators on chain initialization. + validators on + + chain initialization. It is used for off-chain confirmation + of binary - It is used for off-chain confirmation of binary validity by - validators and other parties. + validity by validators and other parties. spawn_time: type: string format: date-time description: >- spawn time is the time on the provider chain at which the - consumer chain genesis is finalized and all validators + consumer chain + + genesis is finalized and all validators will be responsible + for starting - will be responsible for starting their consumer chain - validator node. + their consumer chain validator node. unbonding_period: type: string description: >- @@ -63032,12 +64696,16 @@ definitions: format: int64 description: >- BlocksPerDistributionTransmission is the number of blocks - between ibc-token-transfers from the consumer chain to the - provider chain. + between + + ibc-token-transfers from the consumer chain to the provider + chain. On - On sending transmission event, - `consumer_redistribution_fraction` of the accumulated tokens - are sent to the consumer redistribution address. + sending transmission event, + `consumer_redistribution_fraction` of the + + accumulated tokens are sent to the consumer redistribution + address. historical_entries: type: string format: int64 @@ -63045,23 +64713,50 @@ definitions: The number of historical info entries to persist in store. This param is a part of the cosmos sdk staking module. In - the case of + the case of a ccv enabled consumer chain, the ccv module acts as the staking module. + distribution_transmission_channel: + type: string + title: >- + The ID of a token transfer channel used for the Reward + Distribution + + sub-protocol. If DistributionTransmissionChannel == "", a + new transfer + + channel is created on top of the same connection as the CCV + channel. + + Note that transfer_channel_id is the ID of the channel end + on the consumer + + chain. it is most relevant for chains performing a sovereign + to consumer + + changeover in order to maintan the existing ibc transfer + channel description: >- ConsumerAdditionProposal is a governance proposal on the - provider chain to spawn a new consumer chain. + provider chain to + + spawn a new consumer chain. If it passes, then all validators on + the provider - If it passes, then all validators on the provider chain are - expected to validate the consumer chain at spawn time + chain are expected to validate the consumer chain at spawn time + or get - or get slashed. It is recommended that spawn time occurs after - the proposal end time. + slashed. It is recommended that spawn time occurs after the + proposal end + + time. title: proposals waiting for spawn_time to pass description: >- ConsumerAdditionProposals holds pending governance proposals on the - provider chain to spawn a new chain. + provider + + chain to spawn a new chain. interchain_security.ccv.provider.v1.QueryConsumerChainStopProposalsResponse: type: object properties: @@ -63087,19 +64782,26 @@ definitions: format: date-time title: >- the time on the provider chain at which all validators are - responsible to stop their consumer chain validator node + responsible to + + stop their consumer chain validator node description: >- ConsumerRemovalProposal is a governance proposal on the provider - chain to remove (and stop) a consumer chain. + chain to + + remove (and stop) a consumer chain. If it passes, all the + consumer chain's - If it passes, all the consumer chain's state is removed from the - provider chain. The outstanding unbonding + state is removed from the provider chain. The outstanding + unbonding operation - operation funds are released. + funds are released. title: proposals waiting for stop_time to pass description: >- ConsumerRemovalProposals holds pending governance proposals on the - provider chain to remove (and stop) a consumer chain. + provider + + chain to remove (and stop) a consumer chain. interchain_security.ccv.provider.v1.QueryConsumerChainsResponse: type: object properties: @@ -63183,7 +64885,7 @@ definitions: The number of historical info entries to persist in store. This param is a part of the cosmos sdk staking module. In the - case of + case of a ccv enabled consumer chain, the ccv module acts as the staking module. @@ -63199,10 +64901,30 @@ definitions: of the set who can opt out of running the consumer chain without being - punished. For example, a + punished. For + + example, a value of 0.05 means that the validators in the + bottom 5% of the + + set can opt out + reward_denoms: + type: array + items: + type: string + description: >- + Reward denoms. These are the denominations which are allowed + to be sent to + + the provider as rewards. + provider_reward_denoms: + type: array + items: + type: string + title: >- + Provider-originated reward denoms. These are denoms coming + from the - value of 0.05 means that the validators in the bottom 5% of - the set can opt out + provider which are allowed to be used as rewards. e.g. "uatom" title: Params defines the parameters for CCV consumer module provider_client_id: type: string @@ -63646,7 +65368,7 @@ definitions: format: uint64 title: >- HeightValsetUpdateID defines the genesis information for the - mapping + mapping of each block height to a valset update id description: HeightToValsetUpdateId nil on new chain, filled in on restart. @@ -63761,10 +65483,15 @@ definitions: pools were transmitted to the provider chain preCCV: type: boolean - title: >- - flag indicating whether the consumer CCV module starts in pre-CCV - state + title: flag indicating whether the consumer CCV module starts in title: GenesisState defines the CCV consumer chain genesis state + interchain_security.ccv.provider.v1.QueryRegisteredConsumerRewardDenomsResponse: + type: object + properties: + denoms: + type: array + items: + type: string interchain_security.ccv.provider.v1.QueryThrottleStateResponse: type: object properties: @@ -63777,15 +65504,17 @@ definitions: format: int64 description: >- allowance of voting power units (int) that the slash meter is given - per replenish period + per - this also serves as the max value for the meter. + replenish period this also serves as the max value for the meter. next_replenish_candidate: type: string format: date-time title: >- next time the slash meter could potentially be replenished, iff it's - not full + not + + full packets: type: array items: @@ -63807,30 +65536,30 @@ definitions: type: string format: uint64 description: |- - The IBC sequence number of the recv packet. + The IBC sequence number of the recv packet. This field is used in the store key to ensure uniqueness. provider_val_cons_addr: + type: string + format: byte description: >- The provider's consensus address of the validator being - slashed. + slashed. This field is used to obtain validator power in HandleThrottleQueues. This field is not used in the store key, but is persisted in - value bytes, see QueueGlobalSlashEntry. - type: object - properties: - address: - type: string - format: byte - title: A validator's consensus address on the provider chain + value bytes, + + see QueueGlobalSlashEntry. description: >- A persisted queue entry indicating that a slash packet data - instance needs to be handled. + instance needs to + + be handled. This type belongs in the "global" queue, to + coordinate slash - This type belongs in the "global" queue, to coordinate slash packet handling times between consumers. data: type: object @@ -63878,7 +65607,9 @@ definitions: committed on the consumer chain. description: >- A query wrapper type for the global entry and data relevant to a - throttled slash packet. + throttled + + slash packet. title: data relevant to currently throttled slash packets interchain_security.ccv.provider.v1.QueryThrottledConsumerPacketDataResponse: type: object @@ -63950,7 +65681,7 @@ definitions: to notify that a VSC packet reached maturity on the consumer chain. - title: >- + title: |- ThrottledPacketDataWrapper contains either SlashPacketData or VSCMaturedPacketData interchain_security.ccv.provider.v1.QueryValidatorConsumerAddrResponse: @@ -64018,7 +65749,7 @@ definitions: description: |- This packet is sent from the consumer chain to the provider chain to notify that a VSC packet reached maturity on the consumer chain. - title: >- + title: |- ThrottledPacketDataWrapper contains either SlashPacketData or VSCMaturedPacketData interchain_security.ccv.provider.v1.ThrottledSlashPacket: @@ -64040,30 +65771,30 @@ definitions: type: string format: uint64 description: |- - The IBC sequence number of the recv packet. + The IBC sequence number of the recv packet. This field is used in the store key to ensure uniqueness. provider_val_cons_addr: + type: string + format: byte description: >- - The provider's consensus address of the validator being slashed. + The provider's consensus address of the validator being slashed. This field is used to obtain validator power in HandleThrottleQueues. This field is not used in the store key, but is persisted in value - bytes, see QueueGlobalSlashEntry. - type: object - properties: - address: - type: string - format: byte - title: A validator's consensus address on the provider chain + bytes, + + see QueueGlobalSlashEntry. description: >- A persisted queue entry indicating that a slash packet data instance - needs to be handled. + needs to + + be handled. This type belongs in the "global" queue, to coordinate + slash - This type belongs in the "global" queue, to coordinate slash packet - handling times between consumers. + packet handling times between consumers. data: type: object properties: @@ -64104,7 +65835,7 @@ definitions: This packet is sent from the consumer chain to the provider chain to request the slashing of a validator as a result of an infraction committed on the consumer chain. - description: >- + description: |- A query wrapper type for the global entry and data relevant to a throttled slash packet. interchain_security.ccv.v1.ConsumerPacketData: @@ -67419,6 +69150,122 @@ definitions: creation are sent to title: Params holds parameters for the tokenfactory module description: QueryParamsResponse is the response type for the Query/Params RPC method. + pob.builder.v1.MsgAuctionBidResponse: + type: object + description: MsgAuctionBidResponse defines the Msg/AuctionBid response type. + pob.builder.v1.MsgUpdateParamsResponse: + type: object + description: MsgUpdateParamsResponse defines the Msg/UpdateParams response type. + pob.builder.v1.Params: + type: object + properties: + max_bundle_size: + type: integer + format: int64 + description: >- + max_bundle_size is the maximum number of transactions that can be + bundled + + in a single bundle. + escrow_account_address: + type: string + format: byte + description: >- + escrow_account_address is the address of the account that will receive + a + + portion of the bid proceeds. + reserve_fee: + description: reserve_fee specifies the bid floor for the auction. + type: object + properties: + denom: + type: string + amount: + type: string + min_bid_increment: + description: >- + min_bid_increment specifies the minimum amount that the next bid must + be + + greater than the previous bid. + type: object + properties: + denom: + type: string + amount: + type: string + front_running_protection: + type: boolean + description: |- + front_running_protection specifies whether front running and sandwich + attack protection is enabled. + proposer_fee: + type: string + description: >- + proposer_fee defines the portion of the winning bid that goes to the + block + + proposer that proposed the block. + description: Params defines the parameters of the x/builder module. + pob.builder.v1.QueryParamsResponse: + type: object + properties: + params: + description: params defines the parameters of the module. + type: object + properties: + max_bundle_size: + type: integer + format: int64 + description: >- + max_bundle_size is the maximum number of transactions that can be + bundled + + in a single bundle. + escrow_account_address: + type: string + format: byte + description: >- + escrow_account_address is the address of the account that will + receive a + + portion of the bid proceeds. + reserve_fee: + description: reserve_fee specifies the bid floor for the auction. + type: object + properties: + denom: + type: string + amount: + type: string + min_bid_increment: + description: >- + min_bid_increment specifies the minimum amount that the next bid + must be + + greater than the previous bid. + type: object + properties: + denom: + type: string + amount: + type: string + front_running_protection: + type: boolean + description: >- + front_running_protection specifies whether front running and + sandwich + + attack protection is enabled. + proposer_fee: + type: string + description: >- + proposer_fee defines the portion of the winning bid that goes to + the block + + proposer that proposed the block. + description: QueryParamsResponse is the response type for the Query/Params RPC method. router.v1.Params: type: object properties: diff --git a/go.sum b/go.sum index 8d4917698..5d3442aab 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,3 @@ -4d63.com/gochecknoglobals v0.1.0/go.mod h1:wfdC5ZjKSPr7CybKEcgJhUOgeAQW1+7WcyK8OvUilfo= -bitbucket.org/creachadair/shell v0.0.6/go.mod h1:8Qqi/cYk7vPnsOePHroKXDJYmb5x7ENhtiFtfZq8K+M= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= @@ -16,7 +14,6 @@ cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6 cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk= cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= -cloud.google.com/go v0.60.0/go.mod h1:yw2G51M9IfRboUH61Us8GqCeF1PzPblB823Mn2q2eAU= cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= @@ -32,7 +29,6 @@ cloud.google.com/go v0.90.0/go.mod h1:kRX0mNRHe0e2rC6oNakvwQqzyDmg57xJ+SZU1eT2aD cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+YI= cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW4= cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc= -cloud.google.com/go v0.98.0/go.mod h1:ua6Ush4NALrHk5QXDWnjvZHN93OuF0HfuEPq9I1X0cM= cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA= cloud.google.com/go v0.100.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w99A= cloud.google.com/go v0.102.0/go.mod h1:oWcCzKlqJ5zgHQt9YsaeTY9KzIvjyy0ArmiBUgpQ+nc= @@ -107,7 +103,6 @@ cloud.google.com/go/domains v0.6.0/go.mod h1:T9Rz3GasrpYk6mEGHh4rymIhjlnIuB4ofT1 cloud.google.com/go/domains v0.7.0/go.mod h1:PtZeqS1xjnXuRPKE/88Iru/LdfoRyEHYA9nFQf4UKpg= cloud.google.com/go/edgecontainer v0.1.0/go.mod h1:WgkZ9tp10bFxqO8BLPqv2LlfmQF1X8lZqwW4r1BTajk= cloud.google.com/go/edgecontainer v0.2.0/go.mod h1:RTmLijy+lGpQ7BXuTDa4C4ssxyXT34NIuHIgKuP4s5w= -cloud.google.com/go/firestore v1.6.1/go.mod h1:asNXNOzBdyVQmEU+ggO8UPodTkEVFW5Qx+rwHnAz+EY= cloud.google.com/go/functions v1.6.0/go.mod h1:3H1UA3qiIPRWD7PeZKLvHZ9SaQhR26XIJcC0A5GbvAk= cloud.google.com/go/functions v1.7.0/go.mod h1:+d+QBcWM+RsrgZfV9xo6KfA1GlzJfxcfZcRPEhDDfzg= cloud.google.com/go/gaming v1.5.0/go.mod h1:ol7rGcxP/qHTRQE/RO4bxkXq+Fix0j6D4LFPzYTIrDM= @@ -150,7 +145,6 @@ cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2k cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= -cloud.google.com/go/pubsub v1.5.0/go.mod h1:ZEwJccE3z93Z2HWvstpri00jOg7oO4UZDtKhwDwqF0w= cloud.google.com/go/recaptchaenterprise v1.3.1/go.mod h1:OdD+q+y4XGeAlxRaMn1Y7/GveP6zmq76byL6tjPE7d4= cloud.google.com/go/recaptchaenterprise/v2 v2.1.0/go.mod h1:w9yVqajwroDNTfGuhmOjPDN//rZGySaf6PtFVcSCa7o= cloud.google.com/go/recaptchaenterprise/v2 v2.2.0/go.mod h1:/Zu5jisWGeERrd5HnlS3EUGb/D335f9k51B/FVil0jk= @@ -173,7 +167,6 @@ cloud.google.com/go/securitycenter v1.13.0/go.mod h1:cv5qNAqjY84FCN6Y9z28WlkKXyW cloud.google.com/go/securitycenter v1.14.0/go.mod h1:gZLAhtyKv85n52XYWt6RmeBdydyxfPeTrpToDPw4Auc= cloud.google.com/go/servicedirectory v1.4.0/go.mod h1:gH1MUaZCgtP7qQiI+F+A+OpeKF/HQWgtAddhTbhL2bs= cloud.google.com/go/servicedirectory v1.5.0/go.mod h1:QMKFL0NUySbpZJ1UZs3oFAmdvVxhhxB6eJ/Vlp73dfg= -cloud.google.com/go/spanner v1.7.0/go.mod h1:sd3K2gZ9Fd0vMPLXzeCrF6fq4i63Q7aTLW/lBIfBkIk= cloud.google.com/go/speech v1.6.0/go.mod h1:79tcr4FHCimOp56lwC01xnt/WPJZc4v3gzyT7FoBkCM= cloud.google.com/go/speech v1.7.0/go.mod h1:KptqL+BAQIhMsj1kOP2la5DSEEerPDuOP/2mmkhHhZQ= cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= @@ -199,7 +192,6 @@ cloud.google.com/go/webrisk v1.5.0/go.mod h1:iPG6fr52Tv7sGk0H6qUFzmL3HHZev1htXuW cloud.google.com/go/workflows v1.6.0/go.mod h1:6t9F5h/unJz41YqfBmqSASJSXccBLtD1Vwf+KmJENM0= cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoISEXH2bcHC3M= collectd.org v0.3.0/go.mod h1:A/8DzQBkF6abtvrT2j/AU/4tiBgJWYyh0y/oB/4MlWE= -contrib.go.opencensus.io/exporter/stackdriver v0.13.4/go.mod h1:aXENhDJ1Y4lIg4EUaVTwzvYETVNZk10Pu26tevFKLUc= cosmossdk.io/api v0.3.1 h1:NNiOclKRR0AOlO4KIqeaG6PS6kswOMhHD0ir0SscNXE= cosmossdk.io/api v0.3.1/go.mod h1:DfHfMkiNA2Uhy8fj0JJlOCYOBp4eWUUJ1te5zBGNyIw= cosmossdk.io/core v0.5.1 h1:vQVtFrIYOQJDV3f7rw4pjjVqc1id4+mE0L9hHP66pyI= @@ -222,57 +214,32 @@ git.sr.ht/~sircmpwn/getopt v0.0.0-20191230200459-23622cc906b3/go.mod h1:wMEGFFFN git.sr.ht/~sircmpwn/go-bare v0.0.0-20210406120253-ab86bc2846d9/go.mod h1:BVJwbDfVjCjoFiKrhkei6NdGcZYpkDkdyCdg1ukytRA= github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 h1:/vQbFIOMbk2FiG/kXiLl8BRyzTWDw7gX/Hz7Dd5eDMs= github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4/go.mod h1:hN7oaIRCjzsZ2dE+yG5k+rsdt3qcwykqK6HVGcKwsw4= -github.com/Antonboom/errname v0.1.7/go.mod h1:g0ONh16msHIPgJSGsecu1G/dcF2hlYR/0SddnIAGavU= -github.com/Antonboom/nilnil v0.1.1/go.mod h1:L1jBqoWM7AOeTD+tSquifKSesRHs4ZdaxvZR+xdJEaI= -github.com/Azure/azure-sdk-for-go/sdk/azcore v0.19.0/go.mod h1:h6H6c8enJmmocHUbLiiGY6sx7f9i+X3m1CHdd5c6Rdw= github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.1/go.mod h1:fBF9PQNqB8scdgpZ3ufzaLntG0AG7C1WjPMsiFOmfHM= -github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.11.0/go.mod h1:HcM1YX14R7CJcghJGOYCgdezslRSVzqwLf/q+4Y2r/0= -github.com/Azure/azure-sdk-for-go/sdk/internal v0.7.0/go.mod h1:yqy467j36fJxcRV2TzfVZ1pCb5vxm4BtZPUdYWe/Xo8= github.com/Azure/azure-sdk-for-go/sdk/internal v0.8.3/go.mod h1:KLF4gFr6DcKFZwSuH8w8yEK6DpFl3LP5rhdvAb7Yz5I= github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.3.0/go.mod h1:tPaiy8S5bQ+S5sOiDlINkp7+Ef339+Nz5L5XO+cnOHo= -github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8= -github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/BurntSushi/toml v0.4.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= -github.com/BurntSushi/toml v1.1.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d h1:nalkkPQcITbvhmL4+C4cKA87NW0tfm3Kl9VXRoPywFg= github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d/go.mod h1:URdX5+vg25ts3aCh8H5IFZybJYKWhJHYMTnf+ULtoC4= github.com/CosmWasm/wasmvm v1.2.4 h1:6OfeZuEcEH/9iqwrg2pkeVtDCkMoj9U6PpKtcrCyVrQ= github.com/CosmWasm/wasmvm v1.2.4/go.mod h1:vW/E3h8j9xBQs9bCoijDuawKo9kCtxOaS8N8J7KFtkc= github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= -github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= -github.com/DataDog/zstd v1.4.1/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= github.com/DataDog/zstd v1.5.0/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= -github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24/go.mod h1:4UJr5HIiMZrwgkSPdsjy2uOQExX/WEILpIrO9UPGuXs= -github.com/GaijinEntertainment/go-exhaustruct/v2 v2.2.0/go.mod h1:n/vLeA7V+QY84iYAGwMkkUUp9ooeuftMEvaDrSVch+Q= -github.com/HdrHistogram/hdrhistogram-go v1.1.0/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo= -github.com/HdrHistogram/hdrhistogram-go v1.1.2/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo= github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= -github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= -github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= -github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= -github.com/Masterminds/sprig v2.15.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o= -github.com/Masterminds/sprig v2.22.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o= -github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY= github.com/Microsoft/go-winio v0.6.0 h1:slsWYD/zyx7lCXoZVlvQrj0hPTM1HI4+v1sIda2yDvg= github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 h1:TngWCqHvy9oXAN6lEVMRuU21PR1EtLVZJmdB18Gu3Rw= -github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk= github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= -github.com/OpenPeeDeeP/depguard v1.1.0/go.mod h1:JtAMzWkmFEzDPyAd+W0NHl1lvpQKTvT9jnRVsohBKpc= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= github.com/VictoriaMetrics/fastcache v1.6.0/go.mod h1:0qHz5QP0GMX4pfmMA/zt5RgfNuXJrTP0zS7DqpHGGTw= github.com/VividCortex/gohistogram v1.0.0 h1:6+hBz+qvs0JOrrNhhmR7lFxo5sINxBCGXrdtl/UvroE= github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= -github.com/Workiva/go-datastructures v1.0.53/go.mod h1:1yZL+zfsztete+ePzZz/Zb1/t5BnDuE2Ya2MMGhzP6A= github.com/Zilliqa/gozilliqa-sdk v1.2.1-0.20201201074141-dd0ecada1be6/go.mod h1:eSYp2T6f0apnuW8TzhV3f6Aff2SE8Dwio++U4ha4yEM= github.com/adlio/schema v1.3.3 h1:oBJn8I02PyTB466pZO1UZEn1TV5XLlifBSyMrmHl/1I= -github.com/adlio/schema v1.3.3/go.mod h1:1EsRssiv9/Ce2CMzq5DoL7RiMshhuigQxrR4DMV9fHg= github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII= github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c= github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw= @@ -282,54 +249,35 @@ github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuy github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= -github.com/alexkohler/prealloc v1.0.0/go.mod h1:VetnK3dIgFBBKmg0YnD9F9x6Icjd+9cvfHR56wJVlKE= -github.com/alingse/asasalint v0.0.10/go.mod h1:nCaoMhw7a9kSJObvQyVzNTPBDbNpdocqrSP7t/cW5+I= github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM= github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8= -github.com/andybalholm/brotli v1.0.2/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y= -github.com/andybalholm/brotli v1.0.3/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= -github.com/antihax/optional v0.0.0-20180407024304-ca021399b1a6/go.mod h1:V8iCPQYkqmusNa815XgQio277wI47sdRh1dUOLdyC6Q= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= -github.com/aokoli/goutils v1.0.1/go.mod h1:SijmP0QR8LtwsmDs8Yii5Z/S4trXFGFC2oO5g9DP+DQ= github.com/apache/arrow/go/arrow v0.0.0-20191024131854-af6fa24be0db/go.mod h1:VTxUBvSJ3s3eHAg65PNgrsn5BtqCRPdmyXh6rAfdxN0= github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= -github.com/armon/go-metrics v0.3.9/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc= -github.com/armon/go-metrics v0.3.10/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc= github.com/armon/go-metrics v0.4.1 h1:hR91U9KYmb6bLBYLQjyM+3j+rcd/UhE+G78SFnF8gJA= github.com/armon/go-metrics v0.4.1/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A= -github.com/ashanbrown/forbidigo v1.3.0/go.mod h1:vVW7PEdqEFqapJe95xHkTfB1+XvZXBFg8t0sG2FIxmI= -github.com/ashanbrown/makezero v1.1.1/go.mod h1:i1bJLCRSCHOcOa9Y6MyF2FTfMZMFdHvxKHxgO5Z1axI= github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= -github.com/aws/aws-sdk-go v1.23.20/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.25.37/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.36.30/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= -github.com/aws/aws-sdk-go v1.40.45/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q= github.com/aws/aws-sdk-go v1.44.122/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= github.com/aws/aws-sdk-go v1.44.203 h1:pcsP805b9acL3wUqa4JR2vg1k2wnItkDYNvfmcy6F+U= github.com/aws/aws-sdk-go v1.44.203/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= github.com/aws/aws-sdk-go-v2 v1.2.0/go.mod h1:zEQs02YRBw1DjK0PoJv3ygDYOFTre1ejlJWl8FwAuQo= -github.com/aws/aws-sdk-go-v2 v1.9.1/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= github.com/aws/aws-sdk-go-v2/config v1.1.1/go.mod h1:0XsVy9lBI/BCXm+2Tuvt39YmdHwS5unDQmxZOYe8F5Y= github.com/aws/aws-sdk-go-v2/credentials v1.1.1/go.mod h1:mM2iIjwl7LULWtS6JCACyInboHirisUUdkBPoTHMOUo= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.0.2/go.mod h1:3hGg3PpiEjHnrkrlasTfxFqUsZ2GCk/fMUn4CbKgSkM= -github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.8.1/go.mod h1:CM+19rL1+4dFWnOQKwDc7H1KwXTz+h61oUSHyhV0b3o= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.0.2/go.mod h1:45MfaXZ0cNbeuT0KQ1XJylq8A6+OpVV2E5kvY/Kq+u8= github.com/aws/aws-sdk-go-v2/service/route53 v1.1.1/go.mod h1:rLiOUrPLW/Er5kRcQ7NkwbjlijluLsrIbu/iyl35RO4= github.com/aws/aws-sdk-go-v2/service/sso v1.1.1/go.mod h1:SuZJxklHxLAXgLTc1iFXbEWkXs7QRTQpCLGaKIprQW0= github.com/aws/aws-sdk-go-v2/service/sts v1.1.1/go.mod h1:Wi0EBZwiz/K44YliU0EKxqTCJGUfYTWXrrBwkq736bM= github.com/aws/smithy-go v1.1.0/go.mod h1:EzMw8dbp/YJL4A5/sbhGddag+NPT7q084agLbB9LgIw= -github.com/aws/smithy-go v1.8.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= -github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= @@ -339,13 +287,8 @@ github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod h1:6QX/PXZ github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 h1:41iFGWnSlI2gVpmOtVTJZNodLdLQLn/KsJqFvXwnd/s= github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= -github.com/bkielbasa/cyclop v1.2.0/go.mod h1:qOI0yy6A7dYC4Zgsa72Ppm9kONl0RoIlPbzot9mhmeI= -github.com/blizzy78/varnamelen v0.8.0/go.mod h1:V9TzQZ4fLJ1DSrjVDfl89H7aMnTvKkApdHeyESmyR7k= github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40/go.mod h1:8rLXio+WjiTceGBHIoTvn60HIbs7Hm7bcHjyrSqYB9c= github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps= -github.com/bombsimon/wsl/v3 v3.3.0/go.mod h1:st10JtZYLE4D5sC7b8xV4zTKZwAQjCH/Hy2Pm1FNZIc= -github.com/breml/bidichk v0.2.3/go.mod h1:8u2C6DnAy0g2cEq+k/A2+tr9O1s+vHGxWn0LTc70T2A= -github.com/breml/errchkjson v0.3.0/go.mod h1:9Cogkyv9gcT8HREpzi3TiqBxCqDzo8awa92zSDFcofU= github.com/btcsuite/btcd v0.0.0-20190315201642-aa6e0f35703c/go.mod h1:DrZx5ec/dmnfpw9KyYoQyYo7d0KEvTkk/5M/vbZjAr8= github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ= github.com/btcsuite/btcd v0.21.0-beta.0.20201114000516-e9c7a5ac6401/go.mod h1:Sv4JPQ3/M+teHz9Bo5jBpkNcP0x6r7rdihlNL/7tTAs= @@ -370,30 +313,22 @@ github.com/btcsuite/snappy-go v0.0.0-20151229074030-0bdef8d06723/go.mod h1:8woku github.com/btcsuite/snappy-go v1.0.0/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc= github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod h1:ghJtEyQwv5/p4Mg4C0fgbePVuGr935/5ddU9Z3TmDRY= github.com/btcsuite/winsvc v1.0.0/go.mod h1:jsenWakMcC0zFBFurPLEAyrnc/teJEM1O46fmI40EZs= -github.com/bufbuild/buf v1.3.1/go.mod h1:CTRUb23N+zlm1U8ZIBKz0Sqluk++qQloB2i/MZNZHIs= github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA= -github.com/butuzov/ireturn v0.1.1/go.mod h1:Wh6Zl3IMtTpaIKbmwzqi6olnM9ptYQxxVacMsOEFPoc= github.com/bwesterb/go-ristretto v1.2.0/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0= github.com/c-bata/go-prompt v0.2.2/go.mod h1:VzqtzE2ksDBcdln8G7mk2RX9QyGjH+OVqOCSiVIqS34= github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= -github.com/casbin/casbin/v2 v2.37.0/go.mod h1:vByNa/Fchek0KZUgG5wEsl7iFsiviAYKRtgrQfcJqHg= github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4= github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= github.com/cenkalti/backoff/v4 v4.1.1/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/cenkalti/backoff/v4 v4.1.3 h1:cFAlzYUlVYDysBEH2T5hyJZMh3+5+WCBvSnK6Q8UtC4= github.com/cenkalti/backoff/v4 v4.1.3/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/cp v0.1.0/go.mod h1:SOGHArjBr4JWaSDEVpWpo/hNg6RoKrls6Oh40hiwW+s= github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/charithe/durationcheck v0.0.9/go.mod h1:SSbRIBVfMjCi/kEB6K65XEA83D6prSM8ap1UCpNKtgg= -github.com/chavacava/garif v0.0.0-20220316182200-5cad0b5181d4/go.mod h1:W8EnPSQ8Nv4fUjc/v1/8tHFqhuOJXnRub0dTfuAQktU= -github.com/checkpoint-restore/go-criu/v5 v5.3.0/go.mod h1:E/eQpaFtUKGOOSEBZgmKAcn+zUUwWxqcaKZlF54wK8E= github.com/cheggaaa/pb v1.0.27/go.mod h1:pQciLPpbU0oxA0h+VJYYLxO+XeDQb5pZijXscXHm81s= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/logex v1.2.1 h1:XHDu3E6q+gdHgsdTPH6ImJMIp436vR6MPtH8gP05QzM= @@ -404,10 +339,8 @@ github.com/chzyer/readline v1.5.1/go.mod h1:Eh+b79XXUwfKfcPLepksvw2tcLE/Ct21YObk github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/chzyer/test v1.0.0 h1:p3BQDXSxOhOG0P9z6/hGnII4LGiEPOYBhs8asl/fC04= github.com/chzyer/test v1.0.0/go.mod h1:2JlltgoNkt4TW/z9V/IzDdFaMTM2JPIi26O1pF38GC8= -github.com/cilium/ebpf v0.7.0/go.mod h1:/oI2+1shJiTGAMgl6/RgJr36Eo1jzrRcAWbcXO2usCA= github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag= github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= -github.com/clbanning/mxj v1.8.4/go.mod h1:BVjHeAH+rl9rs6f+QIpeRl0tfu10SXn1pUSa5PVGJng= github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudflare/cloudflare-go v0.14.0/go.mod h1:EnwdgGMaFOruiPZRFSgn+TsQ3hQ7C/YWzIGLeu5c304= @@ -420,7 +353,6 @@ github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWH github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20211130200136-a8f946100490/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cockroachdb/apd/v2 v2.0.2 h1:weh8u7Cneje73dDh+2tEVLUvyBc89iwepWCD8b8034E= github.com/cockroachdb/apd/v2 v2.0.2/go.mod h1:DDxRlzC2lo3/vSlmSoS7JkqbbrARPuFOGr0B9pvN3Gw= github.com/cockroachdb/apd/v3 v3.1.0 h1:MK3Ow7LH0W8zkd5GMKA1PvS9qG3bWFI95WaVNfyZJ/w= @@ -439,20 +371,13 @@ github.com/consensys/bavard v0.1.8-0.20210406032232-f3452dc9b572/go.mod h1:Bpd0/ github.com/consensys/bavard v0.1.8-0.20210915155054-088da2f7f54a/go.mod h1:9ItSMtA/dXMAiL7BG6bqW2m3NdSEObYWoH223nGHukI= github.com/consensys/gnark-crypto v0.4.1-0.20210426202927-39ac3d4b3f1f/go.mod h1:815PAHg3wvysy0SyIqanF8gZ0Y1wjk/hrDHD/iT88+Q= github.com/consensys/gnark-crypto v0.5.3/go.mod h1:hOdPlWQV1gDLp7faZVeg8Y0iEPFaOUnCc4XeCCk96p0= -github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U= github.com/containerd/continuity v0.3.0 h1:nisirsYROK15TAMVukJOUyGJjz4BNQJBVsNvAXZJ/eg= -github.com/containerd/continuity v0.3.0/go.mod h1:wJEAIwKOm/pBZuBd0JmeTvnLquTB1Ag8espWhkykbPM= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/coreos/go-systemd v0.0.0-20190620071333-e64a0ec8b42a/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= -github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= -github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/cosmos/btcutil v1.0.5 h1:t+ZFcX77LpKtDBhjucvnOH8C2l2ioGsBNEQ3jef8xFk= github.com/cosmos/btcutil v1.0.5/go.mod h1:IyB7iuqZMJlthe2tkIFL33xPyzbFYP0XVdS8P5lUPis= github.com/cosmos/cosmos-proto v1.0.0-beta.2 h1:X3OKvWgK9Gsejo0F1qs5l8Qn6xJV/AzgIWR2wZ8Nua8= @@ -485,27 +410,17 @@ github.com/cosmos/rosetta-sdk-go v0.10.0 h1:E5RhTruuoA7KTIXUcMicL76cffyeoyvNybzU github.com/cosmos/rosetta-sdk-go v0.10.0/go.mod h1:SImAZkb96YbwvoRkzSMQB6noNJXFgWl/ENIznEoYQI4= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= -github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= -github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= -github.com/creachadair/atomicfile v0.2.6/go.mod h1:BRq8Une6ckFneYXZQ+kO7p1ZZP3I2fzVzf28JxrIkBc= -github.com/creachadair/command v0.0.0-20220426235536-a748effdf6a1/go.mod h1:bAM+qFQb/KwWyCc9MLC4U1jvn3XyakqP5QRkds5T6cY= -github.com/creachadair/taskgroup v0.3.2/go.mod h1:wieWwecHVzsidg2CsUnFinW1faVN4+kq+TDlRJQ0Wbk= github.com/creachadair/taskgroup v0.4.2 h1:jsBLdAJE42asreGss2xZGZ8fJra7WtwnHWeJFxv2Li8= github.com/creachadair/taskgroup v0.4.2/go.mod h1:qiXUOSrbwAY3u0JPGTzObbE3yf9hcXHDKBZ2ZjpCbgM= -github.com/creachadair/tomledit v0.0.22/go.mod h1:cIu/4x5L855oSRejIqr+WRFh+mv9g4fWLiUFaApYn/Y= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/cucumber/common/gherkin/go/v22 v22.0.0 h1:4K8NqptbvdOrjL9DEea6HFjSpbdT9+Q5kgLpmmsHYl0= github.com/cucumber/common/messages/go/v17 v17.1.1 h1:RNqopvIFyLWnKv0LfATh34SWBhXeoFTJnSrgm9cT/Ts= github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4= -github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= -github.com/daixiang0/gci v0.4.2/go.mod h1:d0f+IJhr9loBtIq+ebwhRoTt1LGbPH96ih8bKlsRT9E= github.com/danieljoos/wincred v1.2.0 h1:ozqKHaLK0W/ii4KVbbvluM91W2H3Sh0BncbUNPS7jLE= github.com/danieljoos/wincred v1.2.0/go.mod h1:FzQLLMKBFdvu+osBrnFODiv32YGwCfx0SkRa/eYHgec= github.com/dave/jennifer v1.2.0/go.mod h1:fIb+770HOpJ2fmN9EPPKOqm1vMGhB+TwXKMZhrIygKg= -github.com/davecgh/go-spew v0.0.0-20161028175848-04cdfd42973b/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= @@ -519,11 +434,8 @@ github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0/go.mod h1:v57UDF4pDQJcEfFUCRop3 github.com/decred/dcrd/lru v1.0.0/go.mod h1:mxKOwFd7lFjN2GZYsiz/ecgqR6kkYAl+0pz0tEMk218= github.com/deepmap/oapi-codegen v1.6.0/go.mod h1:ryDa9AgbELGeB+YEXE1dR53yAjHwFvE9iAUlWl9Al3M= github.com/deepmap/oapi-codegen v1.8.2/go.mod h1:YLgSKSDv/bZQB7N4ws6luhozi3cEdRktEqrX88CvjIw= -github.com/denis-tingaikin/go-header v0.4.3/go.mod h1:0wOCWuN71D5qIgE2nz9KrKmuYBAC2Mra5RassOIQ2/c= -github.com/denisenkom/go-mssqldb v0.12.0/go.mod h1:iiK0YP1ZeepvmBQk/QpLEhhTNJgfzrpArPY/aFvc9yU= github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f h1:U5y3Y5UE0w7amNe7Z5G/twsBW0KEalRQXZzf8ufSh9I= github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f/go.mod h1:xH/i4TFMt8koVQZ6WFms69WAsDWr2XsYL3Hkl7jkoLE= -github.com/dgraph-io/badger/v2 v2.2007.2/go.mod h1:26P/7fbL4kUZVEVKLAKXkBXKOydDmM2p1e+NhhnBCAE= github.com/dgraph-io/badger/v2 v2.2007.4 h1:TRWBQg8UrlUhaFdco01nO2uXwzKS7zd+HVdwV/GHc4o= github.com/dgraph-io/badger/v2 v2.2007.4/go.mod h1:vSw/ax2qojzbN6eXHIx6KPKtCSHJN/Uz0X0VPruTIhk= github.com/dgraph-io/ristretto v0.0.3-0.20200630154024-f66de99634de/go.mod h1:KPxhHT9ZxKefz+PCeOGsrHpl1qZ7i70dGTu2u+Ahh6E= @@ -539,16 +451,10 @@ github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8 github.com/dlclark/regexp2 v1.4.1-0.20201116162257-a2a8dda75c91/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc= github.com/dnaeon/go-vcr v1.1.0/go.mod h1:M7tiix8f0r6mKKJ3Yq/kqU1OYf3MnfmBWVbPx/yU9ko= github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ= -github.com/docker/cli v20.10.14+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= -github.com/docker/cli v20.10.17+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8= github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/docker v1.4.2-0.20180625184442-8e610b2b55bf/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker v20.10.7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker v20.10.17+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= -github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= -github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= github.com/dop251/goja v0.0.0-20211011172007-d99e4b8cbf48/go.mod h1:R9ET47fwRVRPZnOGvHxxhuZcbrMCuiqOz3Rlrh4KSnk= github.com/dop251/goja_nodejs v0.0.0-20210225215109-d91c329300e7/go.mod h1:hn7BA7c8pLvoGndExHudxTDKZ84Pyvv+90pbBjbTz0Y= @@ -572,46 +478,24 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.m github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= -github.com/envoyproxy/go-control-plane v0.10.1/go.mod h1:AY7fTTXNdv/aJ2O5jwpxAPOWUZ7hQAEvzN5Pf27BkQQ= github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= -github.com/envoyproxy/protoc-gen-validate v0.0.14/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/envoyproxy/protoc-gen-validate v0.6.2/go.mod h1:2t7qjJNvHPx8IjnBOzl9E9/baC+qXE/TeeyBRzgJDws= -github.com/esimonov/ifshort v1.0.4/go.mod h1:Pe8zjlRrJ80+q2CxHLfEOfTwxCZ4O+MuhcHcfgNWTk0= github.com/ethereum/go-ethereum v1.10.17/go.mod h1:Lt5WzjM07XlXc95YzrhosmR4J9Ahd6X2wyEV2SvGhk0= -github.com/ettle/strcase v0.1.1/go.mod h1:hzDLsPC7/lwKyBOywSHEP89nt2pDgdy+No1NBA9o9VY= -github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51/go.mod h1:Yg+htXGokKKdzcwhuNDwVvN+uBxDGXJ7G/VN1d8fa64= -github.com/facebookgo/stack v0.0.0-20160209184415-751773369052/go.mod h1:UbMTZqLaRiH3MsBH8va0n7s1pQYcu3uTb8G4tygF4Zg= -github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870/go.mod h1:5tD+neXqOorC30/tWg0LCSkrqj/AR6gu8yY8/fpw1q0= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= -github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= -github.com/fatih/color v1.12.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= -github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94= github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/felixge/httpsnoop v1.0.2 h1:+nS9g82KMXccJ/wp0zyRW9ZBHFETmMGtkk+2CTTrW4o= github.com/felixge/httpsnoop v1.0.2/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= -github.com/firefart/nonamedreturns v1.0.4/go.mod h1:TDhe/tjI1BXo48CmYbUduTV7BdIga8MAO/xbKdcVsGI= github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw= -github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4= -github.com/franela/goblin v0.0.0-20210519012713-85d372ac71e2/go.mod h1:VzmDKDJVZI3aJmnRI9VjAn9nJ8qPPsN1fqzr9dqInIo= github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20= -github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k= -github.com/frankban/quicktest v1.14.2/go.mod h1:mgiwOwqx65TmIk1wJ6Q7wvnVMocbUorkibMOrVTHZps= -github.com/frankban/quicktest v1.14.3/go.mod h1:mgiwOwqx65TmIk1wJ6Q7wvnVMocbUorkibMOrVTHZps= github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= -github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU= -github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU= github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= -github.com/fullstorydev/grpcurl v1.6.0/go.mod h1:ZQ+ayqbKMJNhzLmbpCiurTVlaK2M/3nqZCxaQ2Ze/sM= -github.com/fzipp/gocyclo v0.6.0/go.mod h1:rXPyn8fnlpa0R2csP/31uerbiVBugk5whMdlyaLkLoA= github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff/go.mod h1:x7DCsMOv1taUwEWCzT4cmDeAkigA5/QCwUodaVOe8Ww= github.com/getkin/kin-openapi v0.53.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4= github.com/getkin/kin-openapi v0.61.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4= @@ -624,7 +508,6 @@ github.com/gin-gonic/gin v1.8.1 h1:4+fr/el88TOO3ewCmQr8cx/CtZ/umlIRIs5M4NTNjf8= github.com/glycerine/go-unsnap-stream v0.0.0-20180323001048-9f0cb55181dd/go.mod h1:/20jfyN9Y5QPEAprSgKAUr+glWDY39ZiUEAYOEv5dsE= github.com/glycerine/goconvey v0.0.0-20190410193231-58a59202ab31/go.mod h1:Ogl1Tioa0aV7gstGFO7KhffUsb9M4ydbEbbxpcEDc24= github.com/go-chi/chi/v5 v5.0.0/go.mod h1:BBug9lr0cqtdAhsu6R4AAdvufI0/XBzAQSsUqJpoZOs= -github.com/go-critic/go-critic v0.6.3/go.mod h1:c6b3ZP1MQ7o6lPR7Rv3lEf7pYQUmAcx8ABHgdZCQt/k= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= @@ -634,17 +517,14 @@ github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgO github.com/go-kit/kit v0.12.0 h1:e4o3o3IsBfAKQh5Qbbiqyfu97Ku7jrO/JbohvztANh4= github.com/go-kit/kit v0.12.0/go.mod h1:lHd+EkCZPIwYItmGDDRdhinkzX2A1sj+M9biaEaizzs= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= -github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU= github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= -github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi4= github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= github.com/go-ole/go-ole v1.2.1/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dTyBNF8= -github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= @@ -654,26 +534,10 @@ github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+ github.com/go-playground/universal-translator v0.18.0 h1:82dyy6p4OuJq4/CByFNOn/jYrnRPArHwAcmLoJZxyho= github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI= github.com/go-playground/validator/v10 v10.11.1 h1:prmOlTVv+YjZjmRmNSF3VmspqJIxJWXmqUsHwfTRRkQ= -github.com/go-redis/redis v6.15.8+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA= github.com/go-sourcemap/sourcemap v2.1.3+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg= github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= -github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= -github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= -github.com/go-toolsmith/astcast v1.0.0/go.mod h1:mt2OdQTeAQcY4DQgPSArJjHCcOwlX+Wl/kwN+LbLGQ4= -github.com/go-toolsmith/astcopy v1.0.0/go.mod h1:vrgyG+5Bxrnz4MZWPF+pI4R8h3qKRjjyvV/DSez4WVQ= -github.com/go-toolsmith/astequal v1.0.0/go.mod h1:H+xSiq0+LtiDC11+h1G32h7Of5O3CYFJ99GVbS5lDKY= -github.com/go-toolsmith/astequal v1.0.1/go.mod h1:4oGA3EZXTVItV/ipGiOx7NWkY5veFfcsOJVS2YxltLw= -github.com/go-toolsmith/astfmt v1.0.0/go.mod h1:cnWmsOAuq4jJY6Ct5YWlVLmcmLMn1JUPuQIHCY7CJDw= -github.com/go-toolsmith/astp v1.0.0/go.mod h1:RSyrtpVlfTFGDYRbrjyWP1pYu//tSFcvdYrA8meBmLI= -github.com/go-toolsmith/pkgload v1.0.2-0.20220101231613-e814995d17c5/go.mod h1:3NAwwmD4uY/yggRxoEjk/S00MIV3A+H7rrE3i87eYxM= -github.com/go-toolsmith/strparse v1.0.0/go.mod h1:YI2nUKP9YGZnL/L1/DLFBfixrcjslWct4wyljWhSRy8= -github.com/go-toolsmith/typep v1.0.2/go.mod h1:JSQCQMUPdRlMZFswiq3TGpNp1GMktqkR2Ns5AIQkATU= -github.com/go-xmlfmt/xmlfmt v0.0.0-20191208150333-d5b6f63a941b/go.mod h1:aUCEOzzezBEjDBbFBoSiya/gduyIiWYRP6CnSFIV8AM= -github.com/go-zookeeper/zk v1.0.2/go.mod h1:nOB03cncLtlp4t+UAkGSV+9beXP/akpekBwL+UX1Qcw= -github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee h1:s+21KNqlpePfkah2I+gwHF8xmJWRjooY+5248k6m4A0= github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo= github.com/gobwas/pool v0.2.0 h1:QEmUOlnSjWtnpRGHF3SauEiOsy82Cup83Vf2LcMlnc8= @@ -684,19 +548,13 @@ github.com/goccy/go-json v0.9.11 h1:/pAaQDLHEoCq/5FFmSKBswWmK6H0e8g4159Kc/X/nqk= github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 h1:ZpnhV/YsD2/4cESfV5+Hoeu/iUR3ruzNvZ+yQfO03a0= github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/godbus/dbus/v5 v5.0.6/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/gofrs/flock v0.8.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= github.com/gofrs/uuid v3.3.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= -github.com/gofrs/uuid v4.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gofrs/uuid v4.3.0+incompatible h1:CaSVZxm5B+7o45rtab4jC2G37WGYX1zQfuU2i6DSvnc= github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= github.com/gogo/googleapis v1.4.1-0.20201022092350-68b0159b7869/go.mod h1:5YRNX2z1oM5gXdAkurHa942MDgEJyk02w4OecKY87+c= github.com/gogo/googleapis v1.4.1 h1:1Yx4Myt7BxzvUr5ldGSbwYiZG6t9wGBZ+8/fX3Wvtq0= github.com/gogo/googleapis v1.4.1/go.mod h1:2lpHqI5OcWCtVElxXnPt+s8oJvMpySlOyM6xDCrzib4= -github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= github.com/golang-jwt/jwt/v4 v4.3.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= -github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= -github.com/golang-sql/sqlexp v0.0.0-20170517235910-f1bb20e5a188/go.mod h1:vXjM/+wXQnTPR4KqTKDgJukSZ6amVRtWMPEjE6sQoK8= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= github.com/golang/geo v0.0.0-20190916061304-5b978397cfec/go.mod h1:QZ0nwyI2jOfgRAoBvP+ab5aRr7c9x7lhGEJrKvBwjWI= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -718,7 +576,6 @@ github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71 github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= -github.com/golang/protobuf v1.1.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.0/go.mod h1:Qd/q+1AKNOZr9uGQzbzCmRO6sUih6GTPZv6a1/R87v0= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -740,27 +597,14 @@ github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiu github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2/go.mod h1:k9Qvh+8juN+UKMCS/3jFtGICgW8O96FVaZsaxdzDkR4= -github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a/go.mod h1:ryS0uhF+x9jgbj/N71xsEqODy9BN81/GonCZiOzirOk= -github.com/golangci/go-misc v0.0.0-20220329215616-d24fe342adfe/go.mod h1:gjqyPShc/m8pEMpk0a3SeagVb0kaqvhscv+i9jI5ZhQ= -github.com/golangci/gofmt v0.0.0-20190930125516-244bba706f1a/go.mod h1:9qCChq59u/eW8im404Q2WWTrnBUQKjpNYKMbU4M7EFU= -github.com/golangci/golangci-lint v1.47.0/go.mod h1:3TZhfF5KolbIkXYjUFvER6G9CoxzLEaafr/u/QI1S5A= github.com/golangci/lint-1 v0.0.0-20181222135242-d2cdd8c08219/go.mod h1:/X8TswGSh1pIozq4ZwCfxS0WA5JGXguxk94ar/4c87Y= -github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0/go.mod h1:66R6K6P6VWk9I95jvqGxkqJxVWGFy9XlDwLwVz1RCFg= -github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca/go.mod h1:tvlJhZqDe4LMs4ZHD0oMUlt9G2LWuDGoisJTBzLMV9o= -github.com/golangci/misspell v0.3.5/go.mod h1:dEbvlSfYbMQDtrpRMQU675gSDLDNa8sCPPChZ7PhiVA= -github.com/golangci/revgrep v0.0.0-20210930125155-c22e5001d4f2/go.mod h1:LK+zW4MpyytAWQRz0M4xnzEk50lSvqDQKfx304apFkY= -github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4/go.mod h1:Izgrg8RkN3rCIMLGE9CyYmU9pY2Jer6DgANEnZ/L/cQ= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU= github.com/google/btree v1.1.2/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4= -github.com/google/certificate-transparency-go v1.0.21/go.mod h1:QeJfpSbVSfYc7RgB3gJFj9cbuQMMchQxrWXz8Ruopmg= -github.com/google/certificate-transparency-go v1.1.1/go.mod h1:FDKqPvSXawb2ecErVRrD+nfy23RCzyl7eqVCEmlT1Zs= github.com/google/flatbuffers v1.11.0/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= @@ -797,23 +641,18 @@ github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200507031123-427632fa3b1c/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/s2a-go v0.1.3 h1:FAgZmpLl/SXurPEZyCMPBIiiYeTbqfjlbdnCNTAkbGE= github.com/google/s2a-go v0.1.3/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= -github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ= -github.com/google/trillian v1.3.11/go.mod h1:0tPraVHrSDkA3BO6vKX67zgLXs6SsOAbHEivX+9mPgw= -github.com/google/uuid v0.0.0-20161128191214-064e2069ce9c/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -838,11 +677,7 @@ github.com/googleapis/gax-go/v2 v2.8.0 h1:UBtEZqx1bjXtOQ5BVTkuYghXrr3N4V123VKJK6 github.com/googleapis/gax-go/v2 v2.8.0/go.mod h1:4orTrqY6hXxxaUL4LHIPl6lGo8vAE38/qKbhSAKP6QI= github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4= github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= -github.com/gookit/color v1.5.1/go.mod h1:wZFzea4X8qN6vHOSP2apMb4/+w/orMznEzYsIHPaqKM= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= -github.com/gordonklaus/ineffassign v0.0.0-20200309095847-7953dde2c7bf/go.mod h1:cuNKsD1zp2v6XfE/orVX2QE1LC+i254ceGcVeDT3pTU= -github.com/gordonklaus/ineffassign v0.0.0-20210914165742-4cc7213b9bc8/go.mod h1:Qcp2HIAYhR7mNUVSIxZww3Guk4it82ghYcEXIAk+QT0= -github.com/gorhill/cronexpr v0.0.0-20180427100037-88b0669f7d75/go.mod h1:g2644b03hfBX9Ov0ZBDgXXens4rxSxmqFBbhvKv2yVA= github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= github.com/gorilla/handlers v1.5.1 h1:9lRY6j8DEeeBT10CvO9hGW0gmky0BprnvDI5vfhUHH4= github.com/gorilla/handlers v1.5.1/go.mod h1:t8XrUpc4KVXb7HGyJ4/cEnwQiaxrX/hz1Zv/4g96P1Q= @@ -855,29 +690,13 @@ github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/ad github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/gostaticanalysis/analysisutil v0.0.0-20190318220348-4088753ea4d3/go.mod h1:eEOZF4jCKGi+aprrirO9e7WKB3beBRtWgqGunKl6pKE= -github.com/gostaticanalysis/analysisutil v0.0.3/go.mod h1:eEOZF4jCKGi+aprrirO9e7WKB3beBRtWgqGunKl6pKE= -github.com/gostaticanalysis/analysisutil v0.1.0/go.mod h1:dMhHRU9KTiDcuLGdy87/2gTR8WruwYZrKdRq9m1O6uw= -github.com/gostaticanalysis/analysisutil v0.4.1/go.mod h1:18U/DLpRgIUd459wGxVHE0fRgmo1UgHDcbw7F5idXu0= -github.com/gostaticanalysis/analysisutil v0.7.1/go.mod h1:v21E3hY37WKMGSnbsw2S/ojApNWb6C1//mXO48CXbVc= -github.com/gostaticanalysis/comment v1.3.0/go.mod h1:xMicKDx7XRXYdVwY9f9wQpDJVnqWxw9wCauCMKp+IBI= -github.com/gostaticanalysis/comment v1.4.1/go.mod h1:ih6ZxzTHLdadaiSnF5WY3dxUoXfXAlTaRzuaNDlSado= -github.com/gostaticanalysis/comment v1.4.2/go.mod h1:KLUTGDv6HOCotCH8h2erHKmpci2ZoR8VPu34YA2uzdM= -github.com/gostaticanalysis/forcetypeassert v0.1.0/go.mod h1:qZEedyP/sY1lTGV1uJ3VhWZ2mqag3IkWsDHVbplHXak= -github.com/gostaticanalysis/nilerr v0.1.1/go.mod h1:wZYb6YI5YAxxq0i1+VJbY0s2YONW0HU0GPE3+5PWN4A= -github.com/gostaticanalysis/testutil v0.3.1-0.20210208050101-bfb5c8eec0e4/go.mod h1:D+FIZ+7OahH3ePw/izIEeH5I06eKs1IKI4Xr64/Am3M= -github.com/gostaticanalysis/testutil v0.4.0/go.mod h1:bLIoPefWXrRi/ssLFWX1dx7Repi5x3CuviD3dgAZaBU= -github.com/gotestyourself/gotestyourself v2.2.0+incompatible/go.mod h1:zZKM6oeNM8k+FRljX1mnzVYeS8wiGgQyvST1/GafPbY= github.com/graph-gophers/graphql-go v1.3.0/go.mod h1:9CQHMSxwO4MprSdzoIEobiHpoLtHm77vfxsvsIN5Vuc= -github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-middleware v1.2.2/go.mod h1:EaizFBKfUKtMIF5iaDEhniwNedqGo9FuLFzppDr3uwI= -github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y= github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 h1:UH//fgunKIs4JdUbpDl1VZCDaL56wXCB/5+wF6uHfaI= github.com/grpc-ecosystem/go-grpc-middleware v1.4.0/go.mod h1:g5qyo/la0ALbONm6Vbp88Yd8NsDy6rZz+RcrMPxvld8= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= -github.com/grpc-ecosystem/grpc-gateway v1.12.1/go.mod h1:8XEsbTttt/W+VvjtQhLACqCisSPWTxCZ7sBRjU6iH9c= github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms= @@ -890,11 +709,7 @@ github.com/gtank/merlin v0.1.1/go.mod h1:T86dnYJhcGOh5BjZFCJWTDeTK7XW8uE+E21Cy/b github.com/gtank/ristretto255 v0.1.2 h1:JEqUCPA1NvLq5DwYtuzigd7ss8fwbYay9fi4/5uMzcc= github.com/gtank/ristretto255 v0.1.2/go.mod h1:Ph5OpO6c7xKUGROZfWVLiJf9icMDwUeIvY4OmlYW69o= github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE= -github.com/hashicorp/consul/api v1.10.1/go.mod h1:XjsvQN+RJGWI2TWy1/kqaE16HrR2J/FWgkYjdZQsX9M= -github.com/hashicorp/consul/api v1.11.0/go.mod h1:XjsvQN+RJGWI2TWy1/kqaE16HrR2J/FWgkYjdZQsX9M= -github.com/hashicorp/consul/api v1.12.0/go.mod h1:6pVBMo0ebnYdt2S3H87XhekM/HHrUoTD2XXb/VrZVy0= github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= -github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-bexpr v0.1.10/go.mod h1:oxlubA2vC/gFVfX1A6JGp7ls7uCDlfJn732ehYYg+g0= github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= @@ -903,20 +718,13 @@ github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9n github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= github.com/hashicorp/go-getter v1.7.1 h1:SWiSWN/42qdpR0MdhaOc/bLR48PLuP1ZQtYLRlM69uY= github.com/hashicorp/go-getter v1.7.1/go.mod h1:W7TalhMmbPmsSMdNjD0ZskARur/9GJ17cfHTRtXV744= -github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= -github.com/hashicorp/go-hclog v0.16.2/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= -github.com/hashicorp/go-hclog v1.0.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= -github.com/hashicorp/go-hclog v1.2.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc= github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= -github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA= -github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= -github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= github.com/hashicorp/go-safetemp v1.0.0 h1:2HR189eFNrjHQyENnQMMpCiBAsRxzbTMIgBhEyExpmo= github.com/hashicorp/go-safetemp v1.0.0/go.mod h1:oaerMy3BhqiTbVye6QuFhFtIceqFoDHxNAB65b+Rj1I= github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= @@ -925,31 +733,21 @@ github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/b github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.2 h1:cfejS+Tpcp13yd5nYHWDI6qVCny6wyX2Mt5SGur2IGE= github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= -github.com/hashicorp/go-version v1.2.1/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d h1:dg1dEPuWpEqDnvIw251EVy4zlP8gWbsGj4BsUKCRpYs= github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= -github.com/hashicorp/mdns v1.0.1/go.mod h1:4gW7WsVCke5TE7EPeYliwHlRUyBtfCwuFwuMg2DmyNY= -github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc= github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= -github.com/hashicorp/memberlist v0.2.2/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= -github.com/hashicorp/memberlist v0.3.0/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= -github.com/hashicorp/serf v0.9.5/go.mod h1:UWDWwZeL5cuWDJdl0C6wrvrUwEqtQ4ZKBKKENpqIUyk= -github.com/hashicorp/serf v0.9.6/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4= -github.com/hashicorp/serf v0.9.7/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4= github.com/hdevalence/ed25519consensus v0.1.0 h1:jtBwzzcHuTmFrQN6xQZn6CQEO/V9f7HsjsjeEZ6auqU= github.com/hdevalence/ed25519consensus v0.1.0/go.mod h1:w3BHWjwJbFU29IRHL1Iqkw3sus+7FctEyM4RqDxYNzo= -github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg= github.com/holiman/bloomfilter/v2 v2.0.3/go.mod h1:zpoh+gs7qcpqrHr3dB55AMiJwo0iURXE7ZOP9L9hSkA= github.com/holiman/uint256 v1.2.0/go.mod h1:y4ga/t+u+Xwd7CpDgZESaRcWy0I7XMlTMA25ApIH5Jw= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= @@ -957,21 +755,13 @@ github.com/huandu/go-assert v1.1.5 h1:fjemmA7sSfYHJD7CUqs9qTwwfdNAx7/j2/ZlHXzNB3 github.com/huandu/go-assert v1.1.5/go.mod h1:yOLvuqZwmcHIC5rIzrBhT7D3Q9c3GFnd0JrPVhn/06U= github.com/huandu/skiplist v1.2.0 h1:gox56QD77HzSC0w+Ws3MH3iie755GBJU1OER3h5VsYw= github.com/huandu/skiplist v1.2.0/go.mod h1:7v3iFjLcSAzO4fN5B8dvebvo/qsfumiLiDXMrPiHF9w= -github.com/huandu/xstrings v1.0.0/go.mod h1:4qWG/gcEcfX4z/mBDHJ++3ReCw9ibxbsNJbcucJdbSo= -github.com/huandu/xstrings v1.2.0/go.mod h1:DvyZB1rfVYsBIigL8HwpZgxHwXozlTgGqn63UyNX5k4= github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= -github.com/hudl/fargo v1.4.0/go.mod h1:9Ai6uvFy5fQNq6VPKtg+Ceq1+eTY4nKUlR2JElEOcDo= github.com/huin/goupnp v1.0.3-0.20220313090229-ca81a64b4204/go.mod h1:ZxNlw5WqJj6wSsRK5+YfflQGXYfccj5VgQsMNixHM7Y= github.com/huin/goutil v0.0.0-20170803182201-1ca381bf3150/go.mod h1:PpLOETDnJ0o3iZrZfqZzyLl6l7F3c6L1oWn7OICBi6o= github.com/iancoleman/orderedmap v0.2.0 h1:sq1N/TFpYH++aViPcaKjys3bDClUEU7s5B+z6jq8pNA= github.com/iancoleman/orderedmap v0.2.0/go.mod h1:N0Wam8K1arqPXNWjMo21EXnBPOPp36vB07FNRdD2geA= -github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/imdario/mergo v0.3.4/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= -github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= -github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= -github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg= github.com/improbable-eng/grpc-web v0.15.0 h1:BN+7z6uNXZ1tQGcNAuaU1YjsLTApzkjt2tzCixLaUPQ= github.com/improbable-eng/grpc-web v0.15.0/go.mod h1:1sy9HKV4Jt9aEs9JSnkWlRJPuPtwNr0l57L4f878wP8= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= @@ -981,7 +771,6 @@ github.com/influxdata/flux v0.65.1/go.mod h1:J754/zds0vvpfwuq7Gc2wRdVwEodfpCFM7m github.com/influxdata/influxdb v1.8.3/go.mod h1:JugdFhsvvI8gadxOI6noqNeeBHvWNTbfYGtiAn+2jhI= github.com/influxdata/influxdb-client-go/v2 v2.4.0/go.mod h1:vLNHdxTJkIf2mSLvGrpj8TCcISApPoXkaxP8g9uRlW8= github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= -github.com/influxdata/influxdb1-client v0.0.0-20200827194710-b269163b24ab/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= github.com/influxdata/influxql v1.1.1-0.20200828144457-65d3ef77d385/go.mod h1:gHp9y86a/pxhjJ+zMjNXiQAA197Xk9wLxaz+fGG+kWk= github.com/influxdata/line-protocol v0.0.0-20180522152040-32c6aa80de5e/go.mod h1:4kt73NQhadE3daL3WhR5EJ/J2ocX0PZzwxQ0gXJ7oFE= github.com/influxdata/line-protocol v0.0.0-20200327222509-2487e7298839/go.mod h1:xaLFMmpvUxqXtVkUJfg9QmT88cDaCJ3ZKgdZ78oO8Qo= @@ -991,17 +780,10 @@ github.com/influxdata/roaring v0.4.13-0.20180809181101-fc520f41fab6/go.mod h1:bS github.com/influxdata/tdigest v0.0.0-20181121200506-bf2b5ad3c0a9/go.mod h1:Js0mqiSBE6Ffsg94weZZ2c+v/ciT8QRHFOap7EKDrR0= github.com/influxdata/usage-client v0.0.0-20160829180054-6d3895376368/go.mod h1:Wbbw6tYNvwa5dlB6304Sd+82Z3f7PmVZHVKU637d4po= github.com/jackpal/go-nat-pmp v1.0.2/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc= -github.com/jdxcode/netrc v0.0.0-20210204082910-926c7f70242a/go.mod h1:Zi/ZFkEqFHTm7qkjyNJjaWH4LQA9LQhGJyF0lTYGpxw= github.com/jedisct1/go-minisign v0.0.0-20190909160543-45766022959e/go.mod h1:G1CVv03EnqU1wYL2dFwXxW2An0az9JTl/ZsqXQeBlkU= github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= -github.com/jgautheron/goconst v1.5.1/go.mod h1:aAosetZ5zaeC/2EfMeRswtxUFBpe2Hr7HzkgX4fanO4= -github.com/jhump/protocompile v0.0.0-20220216033700-d705409f108f/go.mod h1:qr2b5kx4HbFS7/g4uYO5qv9ei8303JMsC7ESbYiqr2Q= -github.com/jhump/protoreflect v1.6.1/go.mod h1:RZQ/lnuN+zqeRVpQigTwO6o0AJUkxbnSnpuG7toUTG4= -github.com/jhump/protoreflect v1.11.1-0.20220213155251-0c2aedc66cf4/go.mod h1:U7aMIjN0NWq9swDP7xDdoMfRHb35uiuTd3Z9nFXJf5E= github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c= -github.com/jingyugao/rowserrcheck v1.1.1/go.mod h1:4yvlZSDb3IyDTUZJUmpZfm2Hwok+Dtp+nu2qOq+er9c= -github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af/go.mod h1:HEWGJkRDzjJY2sqdDwxccsGicWEf9BQOZsq2tV+xzM0= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= @@ -1009,10 +791,7 @@ github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGw github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/jmhodges/levigo v1.0.0 h1:q5EC36kV79HWeTBWsod3mG11EgStG3qArTKcvlksN1U= github.com/jmhodges/levigo v1.0.0/go.mod h1:Q6Qx+uH3RAqyK4rFQroq9RL7mdkABMcfhEI+nNuzMJQ= -github.com/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= -github.com/jonboulle/clockwork v0.2.0/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8= -github.com/josharian/txtarfs v0.0.0-20210218200122-0702f000015a/go.mod h1:izVPOvVRsHiKkeGCT6tYBNWyDVuzj9wAaBb5R9qamfw= github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= github.com/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlTRt3OuAQ= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= @@ -1020,73 +799,47 @@ github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/u github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= -github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/jsternberg/zap-logfmt v1.0.0/go.mod h1:uvPs/4X51zdkcm5jXl5SYoN+4RK21K8mysFmDaM/h+o= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= -github.com/juju/ratelimit v1.0.1/go.mod h1:qapgC/Gy+xNh9UxzV13HGGl/6UXNN+ct+vwSgWNm/qk= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= -github.com/julz/importas v0.1.0/go.mod h1:oSFU2R4XK/P7kNBrnL/FEQlDGN1/6WoxXEjSSXO0DV0= github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= github.com/jwilder/encoding v0.0.0-20170811194829-b4e1701a28ef/go.mod h1:Ct9fl0F6iIOGgxJ5npU/IUOhOhqlVrGjyIZc8/MagT0= -github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k= github.com/karalabe/usb v0.0.2/go.mod h1:Od972xHfMJowv7NGVDiWVxk2zxnWgjLlJzE+F4F7AGU= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= -github.com/kisielk/errcheck v1.6.1/go.mod h1:nXw/i/MfnvRHqXa7XXmQMUB0oNFGuBrNI8d8NLy0LPw= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4= github.com/klauspost/compress v1.4.0/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.11.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.12.3/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= -github.com/klauspost/compress v1.13.4/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= -github.com/klauspost/compress v1.13.5/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= -github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= -github.com/klauspost/compress v1.15.1/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= github.com/klauspost/compress v1.15.11/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM= github.com/klauspost/compress v1.16.5 h1:IFV2oUNUzZaz+XyusxpLzpzS8Pt5rh0Z16For/djlyI= github.com/klauspost/compress v1.16.5/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= github.com/klauspost/cpuid v0.0.0-20170728055534-ae7887de9fa5/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= github.com/klauspost/crc32 v0.0.0-20161016154125-cb6bfca970f6/go.mod h1:+ZoRqAPRLkC4NPOvfYeR5KNOrY6TD+/sAC3HXPZgDYg= github.com/klauspost/pgzip v1.0.2-0.20170402124221-0bf5dcad4ada/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs= -github.com/klauspost/pgzip v1.2.5/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= -github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/kulti/thelper v0.6.3/go.mod h1:DsqKShOvP40epevkFrvIwkCMNYxMeTNjdWL4dqWHZ6I= -github.com/kunwardeep/paralleltest v1.0.6/go.mod h1:Y0Y0XISdZM5IKm3TREQMZ6iteqn1YuwCsJO/0kL9Zes= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= -github.com/kyoh86/exportloopref v0.1.8/go.mod h1:1tUcJeiioIs7VWe5gcOObrux3lb66+sBqGZrRkMwPgg= github.com/labstack/echo/v4 v4.2.1/go.mod h1:AA49e0DZ8kk5jTOOCKNuPR6oTnBS0dYiM4FW1e6jwpg= github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k= -github.com/ldez/gomoddirectives v0.2.3/go.mod h1:cpgBogWITnCfRq2qGoDkKMEVSaarhdBr6g8G04uz6d0= -github.com/ldez/tagliatelle v0.3.1/go.mod h1:8s6WJQwEYHbKZDsp/LjArytKOG8qaMrKQQ3mFukHs88= github.com/leanovate/gopter v0.2.9/go.mod h1:U2L/78B+KVFIx2VmW6onHJQzXtFb+p5y3y2Sh+Jxxv8= github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w= -github.com/leonklingele/grouper v1.1.0/go.mod h1:uk3I3uDfi9B6PeUjsCKi6ndcf63Uy7snXgR4yDYQVDY= -github.com/letsencrypt/pkcs11key/v4 v4.0.0/go.mod h1:EFUvBDay26dErnNb70Nd0/VW3tJiIbETBPTl9ATXQag= -github.com/lib/pq v0.0.0-20180327071824-d34b9ff171c2/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/lib/pq v1.8.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= -github.com/lib/pq v1.9.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= -github.com/lib/pq v1.10.4/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= -github.com/lib/pq v1.10.6/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/lib/pq v1.10.7 h1:p7ZhMD+KsSRozJr34udlUrhboJwWAgCg34+/ZZNvZZw= github.com/lib/pq v1.10.7/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/libp2p/go-buffer-pool v0.1.0 h1:oK4mSFcQz7cTQIfqbe4MIj9gLW+mnanjyFtc6cdF0Y8= @@ -1096,27 +849,17 @@ github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0U github.com/linxGnu/grocksdb v1.8.0 h1:H4L/LhP7GOMf1j17oQAElHgVlbEje2h14A8Tz9cM2BE= github.com/linxGnu/grocksdb v1.8.0/go.mod h1:09CeBborffXhXdNpEcOeZrLKEnRtrZFEpFdPNI9Zjjg= github.com/lucasjones/reggen v0.0.0-20180717132126-cdb49ff09d77/go.mod h1:5ELEyG+X8f+meRWHuqUOewBOhvHkl7M76pdGEansxW4= -github.com/lufeee/execinquery v1.2.1/go.mod h1:EC7DrEKView09ocscGHC+apXMIaorh4xqSxS/dy8SbM= -github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= -github.com/lyft/protoc-gen-star v0.5.3/go.mod h1:V0xaHgaf5oCCqmcxYcWiDfTiKsZsRc87/1qhoTACD8w= github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= -github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= -github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/manifoldco/promptui v0.9.0 h1:3V4HzJk1TtXW1MTZMP7mdlwbBpIinw3HztaIlYthEiA= github.com/manifoldco/promptui v0.9.0/go.mod h1:ka04sppxSGFAtxX0qhlYQjISsg9mR4GWtQEhdbn6Pgg= -github.com/maratori/testpackage v1.1.0/go.mod h1:PeAhzU8qkCwdGEMTEupsHJNlQu2gZopMC6RjbhmHeDc= -github.com/matoous/godox v0.0.0-20210227103229-6504466cf951/go.mod h1:1BELzlh859Sh1c6+90blK8lbYy0kwQf1bYlBhBysy1s= -github.com/matryer/is v1.4.0/go.mod h1:8I/i5uYgLzgsgEloJE1U6xx5HkBQpAZvepWuujKwMRU= github.com/matryer/moq v0.0.0-20190312154309-6cfb0558e1bd/go.mod h1:9ELz6aaclSIGnZBoaSLZ3NAl1VTufbOrXBPvtcy6WiQ= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= -github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= -github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.7/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= @@ -1127,8 +870,6 @@ github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNx github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ= -github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84= -github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= @@ -1137,38 +878,22 @@ github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= -github.com/mattn/go-runewidth v0.0.6/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= -github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/mattn/go-sqlite3 v1.11.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= -github.com/mattn/go-sqlite3 v1.14.9/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= github.com/mattn/go-tty v0.0.0-20180907095812-13ff1204f104/go.mod h1:XPvLUNfbS4fJH25nqRHfWLMa1ONC8Amw+mIA639KxkE= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= -github.com/mbilski/exhaustivestruct v1.2.0/go.mod h1:OeTBVxQWoEmB2J2JCHmXWPJ0aksxSUOUy+nvtVEfzXc= -github.com/mgechev/dots v0.0.0-20210922191527-e955255bf517/go.mod h1:KQ7+USdGKfpPjXk4Ga+5XxQM4Lm4e3gAogrreFAYpOg= -github.com/mgechev/revive v1.2.1/go.mod h1:+Ro3wqY4vakcYNtkBWdZC7dBg1xSB6sp054wWwmeFm0= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= -github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= -github.com/miekg/dns v1.1.35/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM= -github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= -github.com/miekg/dns v1.1.43/go.mod h1:+evo5L0630/F6ca/Z9+GAqzhjGyn8/c+TBaOyfEl0V4= -github.com/miekg/pkcs11 v1.0.2/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs= -github.com/miekg/pkcs11 v1.0.3/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs= github.com/mimoo/StrobeGo v0.0.0-20181016162300-f8f6d4d2b643/go.mod h1:43+3pMjjKimDBf5Kr4ZFNGbLql1zKkbImw+fZbw3geM= github.com/mimoo/StrobeGo v0.0.0-20220103164710-9a04d6ca976b h1:QrHweqAtyJ9EwCaGHBu1fghwxIPiopAHV06JlXrMHjk= github.com/mimoo/StrobeGo v0.0.0-20220103164710-9a04d6ca976b/go.mod h1:xxLb2ip6sSUts3g1irPVHyk/DGslwQsNOo9I7smJfNU= -github.com/minio/highwayhash v1.0.1/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY= github.com/minio/highwayhash v1.0.2 h1:Aak5U0nElisjDCfPSG79Tgzkn2gl66NxOMspRrKnA/g= github.com/minio/highwayhash v1.0.2/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= -github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= -github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/mitchellh/go-ps v1.0.0/go.mod h1:J4lOc8z8yJs6vUwklHw2XEIiT4z4C40KtWVN3nvg8Pg= github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= github.com/mitchellh/go-testing-interface v1.14.1 h1:jrgshOhYAUVNMAJiKbEu7EqAwgJJ2JqpQmpLJOu07cU= github.com/mitchellh/go-testing-interface v1.14.1/go.mod h1:gfgS7OtZj6MA4U1UrDRp04twqAjfvlZyCfX3sDjEym8= @@ -1177,124 +902,71 @@ github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0Qu github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/mitchellh/mapstructure v1.4.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/pointerstructure v1.2.0/go.mod h1:BRAsLI5zgXmw97Lf6s25bs8ohIXc3tViBH44KcwB2g4= -github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= -github.com/mitchellh/reflectwalk v1.0.1/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= -github.com/moby/sys/mountinfo v0.5.0/go.mod h1:3bMD3Rg+zkqx8MRYPi7Pyb0Ie97QEBmdxbhnCLlSvSU= -github.com/moby/term v0.0.0-20201216013528-df9cb8a40635/go.mod h1:FBS0z0QWA44HXygs7VXDUOGoN/1TV3RuWkLO04am3wc= -github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6/go.mod h1:E2VnQOmVuvZB6UYnnDB0qG5Nq/1tD9acaOpo6xmt0Kw= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= -github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5/go.mod h1:caMODM3PzxT8aQXRPkAt8xlV/e7d7w8GM5g0fa5F0D8= -github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8= -github.com/moricho/tparallel v0.2.1/go.mod h1:fXEIZxG2vdfl0ZF8b42f5a78EhjjD5mX8qUplsoSU4k= -github.com/mozilla/scribe v0.0.0-20180711195314-fb71baf557c1/go.mod h1:FIczTrinKo8VaLxe6PWTPEXRXDIHz2QAwiaBaP5/4a8= -github.com/mozilla/tls-observatory v0.0.0-20210609171429-7bc42856d2e5/go.mod h1:FUqVoUPHSEdDR0MnFM3Dh8AU0pZHLXUD127SAJGER/s= -github.com/mroth/weightedrand v0.4.1/go.mod h1:3p2SIcC8al1YMzGhAIoXD+r9olo/g/cdJgAD905gyNE= -github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ= github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae/go.mod h1:qAyveg+e4CE+eKJXWVjKXM4ck2QobLqTDytGJbLLhJg= github.com/mtibben/percent v0.2.1 h1:5gssi8Nqo8QU/r2pynCm+hBQHpkB/uNK7BJCFogWdzs= github.com/mtibben/percent v0.2.1/go.mod h1:KG9uO+SZkUp+VkRHsCdYQV3XSZrrSpR3O9ibNBTZrns= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f h1:KUppIJq7/+SVif2QVs3tOP0zanoHgBEVAwHxUSIzRqU= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/mwitkow/go-proto-validators v0.0.0-20180403085117-0950a7990007/go.mod h1:m2XC9Qq0AlmmVksL6FktJCdTYyLk7V3fKyp0sl1yWQo= -github.com/mwitkow/go-proto-validators v0.2.0/go.mod h1:ZfA1hW+UH/2ZHOWvQ3HnQaU0DtnpXu850MZiy+YUgcc= github.com/mwitkow/grpc-proxy v0.0.0-20181017164139-0f1106ef9c76/go.mod h1:x5OoJHDHqxHS801UIuhqGl6QdSAEJvtausosHSdazIo= -github.com/nakabonne/nestif v0.3.1/go.mod h1:9EtoZochLn5iUprVDmDjqGKPofoUEBL8U4Ngq6aY7OE= github.com/naoina/go-stringutil v0.1.0/go.mod h1:XJ2SJL9jCtBh+P9q5btrd/Ylo8XwT/h1USek5+NqSA0= github.com/naoina/toml v0.1.2-0.20170918210437-9fafd6967416/go.mod h1:NBIhNtsFMo3G2szEBne+bO4gS192HuIYRqfvOWb4i1E= github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg= github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL6eU= -github.com/nats-io/jwt v1.2.2/go.mod h1:/xX356yQA6LuXI9xWW7mZNpxgF2mBmGecH+Fj34sP5Q= -github.com/nats-io/jwt/v2 v2.0.3/go.mod h1:VRP+deawSXyhNjXmxPCHskrR6Mq50BqpEI5SEcNiGlY= github.com/nats-io/nats-server/v2 v2.1.2/go.mod h1:Afk+wRZqkMQs/p45uXdrVLuab3gwv3Z8C4HTBu8GD/k= -github.com/nats-io/nats-server/v2 v2.5.0/go.mod h1:Kj86UtrXAL6LwYRA6H4RqzkHhK0Vcv2ZnKD5WbQ1t3g= github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzEE/Zbp4w= -github.com/nats-io/nats.go v1.12.1/go.mod h1:BPko4oXsySz4aSWeFgOHLZs3G4Jq4ZAyE6/zMCxRT6w= github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= -github.com/nats-io/nkeys v0.2.0/go.mod h1:XdZpAbhgyyODYqjTawOnIOI7VlbKSarI9Gfy1tqEu/s= -github.com/nats-io/nkeys v0.3.0/go.mod h1:gvUNGjVcM2IPr5rCsRsC6Wb3Hr2CQAm08dsxtV6A5y4= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= -github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354/go.mod h1:KSVJerMDfblTH7p5MZaTt+8zaT2iEk3AkVb9PQdZuE8= github.com/neilotoole/errgroup v0.1.6/go.mod h1:Q2nLGf+594h0CLBs/Mbg6qOr7GtqDK7C2S41udRnToE= github.com/neutron-org/admin-module v0.0.0-20230705134325-b23404470a1d h1:oexw79znoA0TEo7CGdWHrolbvZqCDD3aI+031CbOq9Y= github.com/neutron-org/admin-module v0.0.0-20230705134325-b23404470a1d/go.mod h1:QuxQ7FJlEAFMRssyEYOrR9ORnYQvBFMTlO8BXny6ntw= github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230705143547-22c391d461d5 h1:2YQaqP5W3F+5VH0IAA7m8OHjkwONxQDqXUwo5tzKdDU= github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230705143547-22c391d461d5/go.mod h1:l699csQZeRKYqF8R9JoYoQ6E0j4PfDM3Ln7EawtUwJE= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= -github.com/nishanths/exhaustive v0.8.1/go.mod h1:qj+zJJUgJ76tR92+25+03oYUhzF4R7/2Wk7fGTfCHmg= -github.com/nishanths/predeclared v0.0.0-20190419143655-18a43bb90ffc/go.mod h1:62PewwiQTlm/7Rj+cxVYqZvDIUc+JjZq6GHAC1fsObQ= -github.com/nishanths/predeclared v0.2.2/go.mod h1:RROzoN6TnGQupbC+lqggsOlcgysk3LMK/HI84Mp280c= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= -github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= -github.com/oasisprotocol/curve25519-voi v0.0.0-20210609091139-0a56a4bca00b/go.mod h1:TLJifjWF6eotcfzDjKZsDqWJ+73Uvj/N85MvVyrvynM= github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs= github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= -github.com/oklog/ulid/v2 v2.0.2/go.mod h1:mtBL0Qe/0HAx6/a4Z30qxVIAL1eQDweXq5lxOEiwQ68= github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= -github.com/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= -github.com/olekukonko/tablewriter v0.0.2/go.mod h1:rSAaSIOAGT9odnlyGlUfAJaoc5w2fSBUmeGDbRWPxyQ= github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= -github.com/onsi/ginkgo v1.16.2/go.mod h1:CObGmKUOKaSC0RjmoAK7tKyn4Azo5P2IWuoMnvwxz1E= github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc= -github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= -github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c= -github.com/onsi/ginkgo/v2 v2.1.4/go.mod h1:um6tUpWM/cxCK3/FK8BXqEiUMUwRgSM4JXG47RKZmLU= github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/onsi/gomega v1.13.0/go.mod h1:lRk9szgn8TxENtWd0Tp4c3wjlRfMTMH27I+3Je41yGY= -github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= -github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro= github.com/onsi/gomega v1.26.0 h1:03cDLK28U6hWvCAns6NeydX3zIm4SF3ci69ulidS32Q= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= -github.com/opencontainers/image-spec v1.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= github.com/opencontainers/image-spec v1.1.0-rc2 h1:2zx/Stx4Wc5pIPDvIxHXvXtQFW/7XWJGmnM7r3wg034= -github.com/opencontainers/runc v1.1.2/go.mod h1:Tj1hFw6eFWp/o33uxGf5yF2BX5yz2Z6iptFpuvbbKqc= -github.com/opencontainers/runc v1.1.3/go.mod h1:1J5XiS+vdZ3wCyZybsuxXZWGrgSr8fFJHLXuG2PsnNg= github.com/opencontainers/runc v1.1.5 h1:L44KXEpKmfWDcS02aeGm8QNTFXTo2D+8MYGDIJ/GDEs= -github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= -github.com/opencontainers/selinux v1.10.0/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI= github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis= github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74= github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/opentracing/opentracing-go v1.0.3-0.20180606204148-bd9c31933947/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= -github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod h1:/wsWhb9smxSfWAKL3wpBW7V8scJMt8N8gnaMCS9E/cA= github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= -github.com/openzipkin/zipkin-go v0.2.5/go.mod h1:KpXfKdgRDnnhsxw4pNIH9Md5lyFqKUa4YDFlwRYAMyE= github.com/ory/dockertest v3.3.5+incompatible h1:iLLK6SQwIhcbrG783Dghaaa3WPzGc+4Emza6EbVUUGA= -github.com/ory/dockertest v3.3.5+incompatible/go.mod h1:1vX4m9wsvi00u5bseYwXaSnhNrne+V0E6LAcBILJdPs= -github.com/ory/dockertest/v3 v3.9.1/go.mod h1:42Ir9hmvaAPm0Mgibk6mBPi7SFvTXxEcnztDYOJ//uM= -github.com/otiai10/copy v1.2.0/go.mod h1:rrF5dJ5F0t/EWSYODDu4j9/vEeYHMkc8jt0zJChqQWw= -github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod h1:9qAhocn7zKJG+0mI8eUu6xqkFDYS2kb2saOteoSB3cE= -github.com/otiai10/curr v1.0.0/go.mod h1:LskTG5wDwr8Rs+nNQ+1LlxRjAtTZZjtJW4rMXl6j4vs= -github.com/otiai10/mint v1.3.0/go.mod h1:F5AjcsTsWUqX+Na9fpHb52P8pcRX2CI6A3ctIT91xUo= -github.com/otiai10/mint v1.3.1/go.mod h1:/yxELlJQ0ufhjUwhshSj+wFjZ78CnZ48/1wtmBH1OTc= github.com/oxyno-zeta/gomock-extra-matcher v1.1.0 h1:Yyk5ov0ZPKBXtVEeIWtc4J2XVrHuNoIK+0F2BUJgtsc= github.com/oxyno-zeta/gomock-extra-matcher v1.1.0/go.mod h1:UMGTHYEmJ1dRq8LDZ7VTAYO4nqM3GD1UGC3RJEUxEz0= github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM= @@ -1302,57 +974,35 @@ github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FI github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY= github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/paulbellamy/ratecounter v0.2.0/go.mod h1:Hfx1hDpSGoqxkVVpBi/IlYD7kChlfo5C6hzIHwPqfFE= -github.com/pborman/getopt v0.0.0-20170112200414-7148bc3a4c30/go.mod h1:85jBQOZwpVEaDAr341tbn15RS4fCAsIst0qp7i8ex1o= github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= -github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= -github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= -github.com/pelletier/go-toml/v2 v2.0.1/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo= -github.com/pelletier/go-toml/v2 v2.0.2/go.mod h1:MovirKjgVRESsAvNZlAjtFwV867yGuwRkXbG66OzopI= github.com/pelletier/go-toml/v2 v2.0.8 h1:0ctb6s9mE31h0/lhu+J6OPmVeDxJn+kYnJc2jZR9tGQ= github.com/pelletier/go-toml/v2 v2.0.8/go.mod h1:vuYfssBdrU2XDZ9bYydBu6t+6a6PYNcZljzZR9VXg+4= github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= -github.com/performancecopilot/speed/v4 v4.0.0/go.mod h1:qxrSyuDGrTOWfV+uKRFhfxw6h/4HXRGUiZiufxo49BM= -github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= github.com/peterh/liner v1.0.1-0.20180619022028-8c1271fcf47f/go.mod h1:xIteQHvHuaLYG9IFj6mSxM0fCKrs34IrEQUhOYuGPHc= github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7/go.mod h1:CRroGNssyjTd/qIG2FyxByd2S8JEAZXBl4qUrZf8GS0= github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod h1:jvVRKCrJTQWu0XVbaOlby/2lO20uSCHEMzzplHXte1o= github.com/petermattis/goid v0.0.0-20230518223814-80aa455d8761 h1:W04oB3d0J01W5jgYRGKsV8LCM6g9EkCvPkZcmFuy0OE= github.com/petermattis/goid v0.0.0-20230518223814-80aa455d8761/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4= -github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d/go.mod h1:3OzsM7FXDQlpCiw2j81fOmAwQLnZnLGXVKUzeKQXIAw= github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU= -github.com/philhofer/fwd v1.1.1/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU= github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= -github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/go.mod h1:4OwLy04Bl9Ef3GJJCoec+30X3LQs/0/m4HFRt/2LUSA= -github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI= -github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= -github.com/pkg/profile v1.6.0/go.mod h1:qBsxPvzyUincmltOk6iyRVxHYg4adc0OFOv72ZdLa18= -github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= github.com/pkg/term v0.0.0-20180730021639-bffc007b7fd5/go.mod h1:eCbImbZ95eXtAUIbLAuAVnBnwf83mjf6QIVH8SHYwqQ= -github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/polyfloyd/go-errorlint v1.0.0/go.mod h1:KZy4xxPJyy88/gldCe5OdW6OQRtNO3EZE7hXzmnebgA= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= -github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= -github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og= github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= -github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= -github.com/prometheus/client_golang v1.12.2/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_golang v1.15.1 h1:8tXpTmJbyH5lydzFPoxSIJ0J46jdh3tylbvM1xCv0LI= github.com/prometheus/client_golang v1.15.1/go.mod h1:e9yaBhRPU2pPNsZwE+JdQl0KEt1N9XgF6zxWmaC0xOk= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= @@ -1371,9 +1021,6 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= -github.com/prometheus/common v0.30.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= -github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/common v0.44.0 h1:+5BrQJwiBB9xsMygAB3TNvpQKOwlkc25LbISbrdOOfY= github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO7x0VV9VvuY= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1382,117 +1029,65 @@ github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsT github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.3.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= -github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= -github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/procfs v0.10.1 h1:kYK1Va/YMlutzCGazswoHKo//tZVlFpKYh+PymziUAg= github.com/prometheus/procfs v0.10.1/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= -github.com/pseudomuto/protoc-gen-doc v1.3.2/go.mod h1:y5+P6n3iGrbKG+9O04V5ld71in3v/bX88wUwgt+U8EA= -github.com/pseudomuto/protokit v0.2.0/go.mod h1:2PdH30hxVHsup8KpBTOXTBeMVhJZVio3Q8ViKSAXT0Q= -github.com/quasilyte/go-ruleguard v0.3.1-0.20210203134552-1b5a410e1cc8/go.mod h1:KsAh3x0e7Fkpgs+Q9pNLS5XpFSvYCEVl5gP9Pp1xp30= -github.com/quasilyte/go-ruleguard v0.3.16-0.20220213074421-6aa060fab41a/go.mod h1:VMX+OnnSw4LicdiEGtRSD/1X8kW7GuEscjYNr4cOIT4= -github.com/quasilyte/go-ruleguard/dsl v0.3.0/go.mod h1:KeCP03KrjuSO0H1kTuZQCWlQPulDV6YMIXmpQss17rU= -github.com/quasilyte/go-ruleguard/dsl v0.3.16/go.mod h1:KeCP03KrjuSO0H1kTuZQCWlQPulDV6YMIXmpQss17rU= -github.com/quasilyte/go-ruleguard/dsl v0.3.21/go.mod h1:KeCP03KrjuSO0H1kTuZQCWlQPulDV6YMIXmpQss17rU= -github.com/quasilyte/go-ruleguard/rules v0.0.0-20201231183845-9e62ed36efe1/go.mod h1:7JTjp89EGyU1d6XfBiXihJNG37wB2VRkd125Q1u7Plc= -github.com/quasilyte/go-ruleguard/rules v0.0.0-20211022131956-028d6511ab71/go.mod h1:4cgAphtvu7Ftv7vOT2ZOYhC6CvBxZixcasr8qIOTA50= -github.com/quasilyte/gogrep v0.0.0-20220120141003-628d8b3623b5/go.mod h1:wSEyW6O61xRV6zb6My3HxrQ5/8ke7NE2OayqCHa3xRM= -github.com/quasilyte/regex/syntax v0.0.0-20200407221936-30656e2c4a95/go.mod h1:rlzQ04UMyJXu/aOvhd8qT+hvDrFpiwqp8MRXDY9szc0= -github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567/go.mod h1:DWNGW8A4Y+GyBgPuaQJuWiy0XYftx4Xm/y5Jqk9I6VQ= github.com/rakyll/statik v0.1.7 h1:OF3QCZUuyPxuGEP7B4ypUa7sB/iHtqOTDYZXGM8KOdQ= github.com/rakyll/statik v0.1.7/go.mod h1:AlZONWzMtEnMs7W4e/1LURLiI49pIMmp6V9Unghqrcc= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= -github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/regen-network/gocuke v0.6.2 h1:pHviZ0kKAq2U2hN2q3smKNxct6hS0mGByFMHGnWA97M= github.com/regen-network/protobuf v1.3.3-alpha.regen.1 h1:OHEc+q5iIAXpqiqFKeLpu5NwTIkVXUs48vFMwzqpqY4= github.com/regen-network/protobuf v1.3.3-alpha.regen.1/go.mod h1:2DjTFR1HhMQhiWC5sZ4OhQ3+NtdbZ6oBDKQwq5Ou+FI= -github.com/remyoudompheng/go-dbus v0.0.0-20121104212943-b7232d34b1d5/go.mod h1:+u151txRmLpwxBmpYn9z3d1sdJdjRPQpsXuYeY9jNls= -github.com/remyoudompheng/go-liblzma v0.0.0-20190506200333-81bf2d431b96/go.mod h1:90HvCY7+oHHUKkbeMCiHt1WuFR2/hPJ9QrljDG+v6ls= -github.com/remyoudompheng/go-misc v0.0.0-20190427085024-2d6ac652a50e/go.mod h1:80FQABjoFzZ2M5uEa6FUaJYEmqU2UOKojlFVak1UAwI= github.com/retailnext/hllpp v1.0.1-0.20180308014038-101a6d2f8b52/go.mod h1:RDpi1RftBQPUCDRw6SmxeaREsAaRKnOclghuzp/WRzc= github.com/rjeczalik/notify v0.9.1/go.mod h1:rKwnCoCGeuQnwBtTSPL9Dad03Vh2n40ePRrjvIXnJho= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= -github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= -github.com/rs/cors v1.8.2/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/rs/cors v1.8.3 h1:O+qNyWn7Z+F9M0ILBHgMVPuB1xTOucVd5gtaYyXBpRo= github.com/rs/cors v1.8.3/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= -github.com/rs/xid v1.3.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= -github.com/rs/zerolog v1.27.0/go.mod h1:7frBqO0oezxmnO7GF86FY++uy8I0Tk/If5ni1G9Qc0U= github.com/rs/zerolog v1.29.1 h1:cO+d60CHkknCbvzEWxP0S9K6KqyTjrCNUy1LdQLCGPc= github.com/rs/zerolog v1.29.1/go.mod h1:Le6ESbR7hc+DP6Lt1THiV8CQSdkkNrd3R0XbEgp3ZBU= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/ryancurrah/gomodguard v1.2.3/go.mod h1:rYbA/4Tg5c54mV1sv4sQTP5WOPBcoLtnBZ7/TEhXAbg= -github.com/ryanrolds/sqlclosecheck v0.3.0/go.mod h1:1gREqxyTGR3lVtpngyFo3hZAgk0KCtEdgEkHwDbigdA= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= -github.com/sagikazarmark/crypt v0.3.0/go.mod h1:uD/D+6UF4SrIR1uGEv7bBNkNqLGqUr43MRiaGWX1Nig= -github.com/sagikazarmark/crypt v0.6.0/go.mod h1:U8+INwJo3nBv1m6A/8OBXAq7Jnpspk5AxSgDyEQcea8= github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= -github.com/sanposhiho/wastedassign/v2 v2.0.6/go.mod h1:KyZ0MWTwxxBmfwn33zh3k1dmsbF2ud9pAAGfoLfjhtI= -github.com/sasha-s/go-deadlock v0.2.1-0.20190427202633-1595213edefa/go.mod h1:F73l+cr82YSh10GxyRI6qZiCgK64VaZjwesgfQ1/iLM= github.com/sasha-s/go-deadlock v0.3.1 h1:sqv7fDNShgjcaxkO0JNcOAlr8B9+cV5Ey/OB71efZx0= github.com/sasha-s/go-deadlock v0.3.1/go.mod h1:F73l+cr82YSh10GxyRI6qZiCgK64VaZjwesgfQ1/iLM= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= -github.com/seccomp/libseccomp-golang v0.9.2-0.20210429002308-3879420cc921/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg= -github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg= -github.com/securego/gosec/v2 v2.12.0/go.mod h1:iTpT+eKTw59bSgklBHlSnH5O2tNygHMDxfvMubA4i7I= github.com/segmentio/fasthash v1.0.3/go.mod h1:waKX8l2N8yckOgmSsXJi7x1ZfdKZ4x7KRMzBtS3oedY= github.com/segmentio/kafka-go v0.1.0/go.mod h1:X6itGqS9L4jDletMsxZ7Dz+JFWxM6JHfPOCvTvk+EJo= github.com/segmentio/kafka-go v0.2.0/go.mod h1:X6itGqS9L4jDletMsxZ7Dz+JFWxM6JHfPOCvTvk+EJo= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= -github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= -github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c/go.mod h1:/PevMnwAxekIXwN8qQyfc5gl2NlkB3CQlkizAbOkeBs= github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= -github.com/shirou/gopsutil/v3 v3.22.6/go.mod h1:EdIubSnZhbAvBS1yJ7Xi+AShB/hxwLHOMz4MCYz7yMs= -github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk= -github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod h1:N5mDOmsrJOB+vfqUK+7DmDyjhSLIIBnXo9lvZJj3MWQ= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= -github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= -github.com/sivchari/containedctx v1.0.2/go.mod h1:PwZOeqm4/DLoJOqMSIJs3aKqXRX4YO+uXww087KZ7Bw= -github.com/sivchari/nosnakecase v1.5.0/go.mod h1:CwDzrzPea40/GB6uynrNLiorAlgFRvRbFSgJx2Gs+QY= -github.com/sivchari/tenv v1.6.0/go.mod h1:64yStXKSOxDfX47NlhVwND4dHwfZDdbp2Lyl018Icvg= github.com/skip-mev/pob v1.0.3 h1:cipN/WUU+xfYbcfUQ4EefSvl3ItocsKgRn3tOtRF2OE= github.com/skip-mev/pob v1.0.3/go.mod h1:PMs/dqcWOQruSN6zLExU0TzlBfBmGA8iTy+FJhxn0T8= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= -github.com/snikch/goodman v0.0.0-20171125024755-10e37e294daa/go.mod h1:oJyF+mSPHbB5mVY2iO9KV3pTt/QbIkGaO8gQ2WrDbP4= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= -github.com/sonatard/noctx v0.0.1/go.mod h1:9D2D/EoULe8Yy2joDHJj7bv3sZoq9AaSb8B4lqBjiZI= github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY= -github.com/sourcegraph/go-diff v0.6.1/go.mod h1:iBszgVvyxdc8SFZ7gm69go2KDdt3ag071iBaWPF6cjs= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI= github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= -github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4= -github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= -github.com/spf13/afero v1.8.2/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo= github.com/spf13/afero v1.9.5 h1:stMpOSZFs//0Lv29HduCmli3GUfpFoF3Y1Q/aXj/wVM= github.com/spf13/afero v1.9.5/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU= github.com/spf13/cast v1.5.1 h1:R+kOtfhWQE6TVQzY+4D7wJLBgkdVasCEFxSUBYBYIlA= github.com/spf13/cast v1.5.1/go.mod h1:b9PdjNptOpzXr7Rq1q9gJML/2cdGQAo69NKzQ10KN48= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= -github.com/spf13/cobra v1.3.0/go.mod h1:BrRVncBjOJa/eUcVVm9CE+oC6as8k+VYr4NY7WCi9V4= -github.com/spf13/cobra v1.4.0/go.mod h1:Wo4iy3BUC+X2Fybo0PDqwJIv3dNRiZLHQymsfxlB84g= -github.com/spf13/cobra v1.5.0/go.mod h1:dWXEIy2H428czQCjInthrTRUg7yKbok+2Qi/yBIJoUM= github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I= github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= @@ -1503,27 +1098,19 @@ github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnIn github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= -github.com/spf13/viper v1.10.0/go.mod h1:SoyBPwAtKDzypXNDFKN5kzH7ppppbGZtls1UpIy5AsM= -github.com/spf13/viper v1.12.0/go.mod h1:b6COn30jlNxbm/V2IqWiNWkJ+vZNiMNksliPCiuKtSI= github.com/spf13/viper v1.16.0 h1:rGGH0XDZhdUOryiDWjmIvUSWpbNqisK8Wk0Vyefw8hc= github.com/spf13/viper v1.16.0/go.mod h1:yg78JgCJcbrQOvV9YLXgkLaZqUidkY9K+Dd1FofRzQg= -github.com/ssgreg/nlreturn/v2 v2.2.1/go.mod h1:E/iiPB78hV7Szg2YfRgyIrk1AD6JVMTRkkxBiELzh2I= github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4/go.mod h1:RZLeN1LMWmRsyYjvAu+I6Dm9QmlDaIIt+Y+4Kd7Tp+Q= -github.com/stbenjam/no-sprintf-host-port v0.1.1/go.mod h1:TLhvtIvONRzdmkFiio4O8LHsN9N74I+PhRquPsxpL0I= github.com/strangelove-ventures/packet-forward-middleware/v7 v7.0.0-20230523193151-73dea436e53f h1:NJdZ+YJ9Vf2t286L20IjFK0SxGpobF1xIp5ZQlxWetk= github.com/strangelove-ventures/packet-forward-middleware/v7 v7.0.0-20230523193151-73dea436e53f/go.mod h1:DJNSVK8NCYHM+aZHCFkcAqPwjzwHYAjhjSMlhAGtJ3c= github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= -github.com/streadway/amqp v1.0.0/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= -github.com/streadway/handy v0.0.0-20200128134331-0f66f006fb2e/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/testify v0.0.0-20170130113145-4d4bfba8f1d1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/stretchr/testify v1.1.4/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.0/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= @@ -1532,32 +1119,17 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= -github.com/stretchr/testify v1.7.5/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= -github.com/subosito/gotenv v1.3.0/go.mod h1:YzJjq/33h7nrwdY+iHMhEOEEbW0ovIz0tB6t6PwAXzs= -github.com/subosito/gotenv v1.4.0/go.mod h1:mZd6rFysKEcUhUHXJk0C/08wAgyDBFuwEYL7vWWGaGo= github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8= github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= -github.com/sylvia7788/contextcheck v1.0.4/go.mod h1:vuPKJMQ7MQ91ZTqfdyreNKwZjyUg6KO+IebVyQDedZQ= -github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY= github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc= -github.com/tdakkota/asciicheck v0.1.1/go.mod h1:yHp0ai0Z9gUljN3o0xMhYJnH/IcvkdTBOX2fmJ93JEM= -github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c/go.mod h1:ahpPrc7HpcfEWDQRZEmnXMzHY03mLDYMCxeDzy46i+8= github.com/tendermint/go-amino v0.16.0 h1:GyhmgQKvqF82e2oZeuMSp9JTN0N09emoSZlb2lyGa2E= github.com/tendermint/go-amino v0.16.0/go.mod h1:TQU0M1i/ImAo+tYpZi73AU3V/dKeCoMC9Sphe2ZwGME= -github.com/tendermint/tendermint v0.35.9 h1:yUEgfkcNHWSidsU8wHjRDbYPVijV4cHxCclKVITGRAQ= -github.com/tendermint/tendermint v0.35.9/go.mod h1:FYvzUDkmVv1awfFl9V85yl5NKyjxz6XLZGX132+ftAY= -github.com/tendermint/tm-db v0.6.6/go.mod h1:wP8d49A85B7/erz/r4YbKssKw6ylsO/hKtFk7E1aWZI= -github.com/tenntenn/modver v1.0.1/go.mod h1:bePIyQPb7UeioSRkw3Q0XeMhYZSMx9B8ePqg6SAMGH0= -github.com/tenntenn/text/transform v0.0.0-20200319021203-7eef512accb3/go.mod h1:ON8b8w4BN/kE1EOhwT0o+d62W65a6aPw1nouo9LMgyY= -github.com/tetafro/godot v1.4.11/go.mod h1:LR3CJpxDVGlYOWn3ZZg1PgNZdTUvzsZWu8xaEohUpn8= github.com/tidwall/btree v1.6.0 h1:LDZfKfQIBHGHWSwckhXI0RPSXzlo+KYdjK7FWSqOzzg= github.com/tidwall/btree v1.6.0/go.mod h1:twD9XRA5jj9VUQGELzDO4HPQTNJsoWWfYEL+EUQ2cKY= github.com/tidwall/gjson v1.12.1/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= @@ -1565,21 +1137,10 @@ github.com/tidwall/gjson v1.14.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vl github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU= github.com/tidwall/sjson v1.2.4/go.mod h1:098SZ494YoMWPmMO6ct4dcFnqxwj9r/gF0Etp19pSNM= -github.com/timakin/bodyclose v0.0.0-20210704033933-f49887972144/go.mod h1:Qimiffbc6q9tBWlVV6x0P9sat/ao1xEkREYPPj9hphk= github.com/tinylib/msgp v1.0.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE= -github.com/tinylib/msgp v1.1.5/go.mod h1:eQsjooMTnV42mHu917E26IogZ2930nFyBQdofk10Udg= -github.com/tj/assert v0.0.3/go.mod h1:Ne6X72Q+TB1AteidzQncjw9PabbMp4PBMZ1k+vd1Pvk= github.com/tklauser/go-sysconf v0.3.5/go.mod h1:MkWzOF4RMCshBAMXuhXJs64Rte09mITnppBXY/rYEFI= -github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk= github.com/tklauser/numcpus v0.2.2/go.mod h1:x3qojaO3uyYt0i56EW/VUYs7uBvdl2fkfZFu0T9wgjM= -github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/tmc/grpc-websocket-proxy v0.0.0-20200427203606-3cfed13b9966/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/tomarrell/wrapcheck/v2 v2.6.2/go.mod h1:ao7l5p0aOlUNJKI0qVwB4Yjlqutd0IvAB9Rdwyilxvg= -github.com/tomasen/realip v0.0.0-20180522021738-f0c99a92ddce/go.mod h1:o8v6yHRoik09Xen7gje4m9ERNah1d1PPsVq1VEx9vE4= -github.com/tommy-muehle/go-mnd/v2 v2.5.0/go.mod h1:WsUAkMJMYww6l/ufffCD3m+P7LEvr8TnZn9lwVDlgzw= -github.com/ttacon/chalk v0.0.0-20160626202418-22c06c80ed31/go.mod h1:onvgF043R+lC5RZ8IT9rBXDaEDnpnw/Cl+HFiw+v/7Q= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= github.com/tyler-smith/go-bip39 v1.0.1-0.20181017060643-dbb3b84ba2ef/go.mod h1:sJ5fKU0s6JVwZjjcUEX2zFOnvq0ASQ2K9Zr6cf67kNs= github.com/tyler-smith/go-bip39 v1.0.2/go.mod h1:sJ5fKU0s6JVwZjjcUEX2zFOnvq0ASQ2K9Zr6cf67kNs= @@ -1591,72 +1152,33 @@ github.com/ugorji/go/codec v1.2.7 h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0 github.com/ulikunitz/xz v0.5.10/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8= github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= -github.com/ultraware/funlen v0.0.3/go.mod h1:Dp4UiAus7Wdb9KUZsYWZEWiRzGuM2kXM1lPbfaF6xhA= -github.com/ultraware/whitespace v0.0.5/go.mod h1:aVMh/gQve5Maj9hQ/hg+F75lr/X5A89uZnzAmWSineA= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI= -github.com/uudashr/gocognit v1.0.6/go.mod h1:nAIUuVBnYU7pcninia3BHOvQkpQCeO76Uscky5BOwcY= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= -github.com/valyala/fasthttp v1.30.0/go.mod h1:2rsYD01CKFrjjsvFxx75KlEUNpWNBY9JWD3K/7o2Cus= github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8= github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= -github.com/valyala/quicktemplate v1.7.0/go.mod h1:sqKJnoaOF88V07vkO+9FL8fb9uZg/VPSJnLYn+LmLk8= -github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc= -github.com/vektra/mockery/v2 v2.14.0/go.mod h1:bnD1T8tExSgPD1ripLkDbr60JA9VtQeu12P3wgLZd7M= -github.com/viki-org/dnscache v0.0.0-20130720023526-c70c1f23c5d8/go.mod h1:dniwbG03GafCjFohMDmz6Zc6oCuiqgH6tGNyXTkHzXE= -github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE= -github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU= github.com/vmihailenco/msgpack/v5 v5.3.5/go.mod h1:7xyJ9e+0+9SaZT0Wt1RGleJXzli6Q/V5KbhBonMG9jc= github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds= github.com/willf/bitset v1.1.3/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4= -github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= -github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= -github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= -github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xlab/treeprint v0.0.0-20180616005107-d6fb6747feb6/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg= -github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778/go.mod h1:2MuV+tbUrU1zIOPMxZ5EncGwgmMJsa+9ucAQZXxsObs= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= -github.com/yagipy/maintidx v1.0.0/go.mod h1:0qNf/I/CCZXSMhsRsrEPDZ+DkekpKLXAJfsTACwgXLk= github.com/ybbus/jsonrpc v2.1.2+incompatible/go.mod h1:XJrh1eMSzdIYFbM08flv0wp5G35eRniyeGut1z+LSiE= -github.com/yeya24/promlinter v0.2.0/go.mod h1:u54lkmBOZrpEbQQ6gox2zWKKLKu2SGe+2KOiextY+IA= -github.com/yudai/gojsondiff v1.0.0/go.mod h1:AY32+k2cwILAkW1fbgxQ5mUmMiZFgLIV+FBNExI05xg= -github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDfVJdfcVVdX+jpBxNmX4rDAzaS45IcYoM= -github.com/yudai/pp v2.0.1+incompatible/go.mod h1:PuxR/8QJ7cyCkFp/aUDS+JY727OFEZkTdatxwunjIkc= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= github.com/zondax/hid v0.9.1 h1:gQe66rtmyZ8VeGFcOpbuH3r7erYtNEAezCAYu8LdkJo= github.com/zondax/hid v0.9.1/go.mod h1:l5wttcP0jwtdLjqjMMWFVEE7d1zO0jvSPA9OPZxWpEM= github.com/zondax/ledger-go v0.14.1 h1:Pip65OOl4iJ84WTpA4BKChvOufMhhbxED3BaihoZN4c= github.com/zondax/ledger-go v0.14.1/go.mod h1:fZ3Dqg6qcdXWSOJFKMG8GCTnD7slO/RL2feOQv8K320= -gitlab.com/bosi/decorder v0.2.2/go.mod h1:9K1RB5+VPNQYtXtTDAzd2OEftsZb1oV0IrJrzChSdGE= go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= -go.etcd.io/bbolt v1.3.4/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= -go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4= go.etcd.io/bbolt v1.3.7 h1:j+zJOnnEjF/kyHlDDgGnVL/AIqIJPq8UoB2GSNfkUfQ= go.etcd.io/bbolt v1.3.7/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw= go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= -go.etcd.io/etcd v0.0.0-20200513171258-e048e166ab9c/go.mod h1:xCI7ZzBfRuGgBXyXO6yfWfDmlWd35khcWpUa4L0xI/k= -go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= -go.etcd.io/etcd/api/v3 v3.5.1/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= -go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= -go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= -go.etcd.io/etcd/client/pkg/v3 v3.5.1/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= -go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= -go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= -go.etcd.io/etcd/client/v2 v2.305.1/go.mod h1:pMEacxZW7o8pg4CrFE7pquyCJJzZvkvdD2RibOCCCGs= -go.etcd.io/etcd/client/v2 v2.305.4/go.mod h1:Ud+VUwIi9/uQHOMA+4ekToJ12lTxlv0zB/+DHwTGEbU= -go.etcd.io/etcd/client/v3 v3.5.0/go.mod h1:AIKXXVX/DQXtfTEqBryiLTUXwON+GuvO6Z7lLS/oTh0= -go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.mozilla.org/mozlog v0.0.0-20170222151521-4bb13139d403/go.mod h1:jHoPAGnDrCy6kaI2tAze5Prf0Nr0w/oNkROt2lw3n3o= go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= @@ -1673,26 +1195,16 @@ go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= -go.uber.org/goleak v1.1.11-0.20210813005559-691160354723/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= -go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= -go.uber.org/multierr v1.4.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= -go.uber.org/multierr v1.7.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= -go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= -go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= go.uber.org/zap v1.18.1/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= -go.uber.org/zap v1.19.1/go.mod h1:j3DNczoxDZroyBnOT1L/Q79cfUMGZxlv/9dzN7SM1rI= -go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw= golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20180501155221-613d6eafa307/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= @@ -1701,32 +1213,20 @@ golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190909091759-094676da4a83/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200115085410-6d4e4cb37c7d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= -golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= -golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= -golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20210915214749-c084706c2272/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220314234659-1baeb1ce4c0b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.10.0 h1:LKqV2xt9+kDzSTfOhx4FrkEBcMrAgHSYgzywV9zcGmM= golang.org/x/crypto v0.10.0/go.mod h1:o4eNf7Ede1fv+hwOwZsTHl9EsPFO6q6ZvYR8vYfY45I= @@ -1746,7 +1246,6 @@ golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMk golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw= golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 h1:k/i9J1pBpvlfR+9QsetwPyERsqu1GIbi967PQMq3Ivc= golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w= -golang.org/x/exp/typeparams v0.0.0-20220218215828-6cf2b201936e/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= @@ -1773,9 +1272,6 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= -golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= -golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs= golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1799,8 +1295,6 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -1829,16 +1323,9 @@ golang.org/x/net v0.0.0-20210220033124-5f55cee0dc0d/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8= -golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210610132358-84b48f89b13b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210917221730-978cfadd31cf/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= @@ -1846,7 +1333,6 @@ golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220607020251-c690dde0001d/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.0.0-20220617184016-355a448f1bc9/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= @@ -1871,7 +1357,6 @@ golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= @@ -1888,7 +1373,6 @@ golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190412183630-56d357773e84/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -1896,7 +1380,6 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20220513210516-0976fa681c29/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -1919,21 +1402,15 @@ golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191115151921-52ab43148777/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1943,7 +1420,6 @@ golang.org/x/sys v0.0.0-20200107162124-548cf772de50/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1961,66 +1437,47 @@ golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200826173525-f9321e4c35a6/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200831180312-196b9ba8737a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210316164454-77fc1eacc6aa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210420205809-ac73e9fd8988/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210917161153-d61c044b1678/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211105183446-c75c47738b0c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211116061358-0a5406a5449c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211205182925-97ca703d548d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211213223007-03aa0b5f6827/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220315194320-039c03cc5b86/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220405210540-1e041c57c461/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220406163625-3f8b81556e12/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220502124256-b6088ccd6cba/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -2028,7 +1485,6 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220624220833-87e55d714810/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220702020025-31831981b65f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -2041,7 +1497,6 @@ golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.0.0-20220526004731-065cf7ba2467/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.9.0 h1:GRRCnKYhdQrD8kfRAdQ6Zcw1P0OcELxGLKJvtjVMZ28= golang.org/x/term v0.9.0/go.mod h1:M6DEAAIenWoTxdKrOltXcmDY3rSplQUkrvaDU5FcQyo= @@ -2062,38 +1517,26 @@ golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxb golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= -golang.org/x/tools v0.0.0-20190228203856-589c23e65e65/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= -golang.org/x/tools v0.0.0-20190307163923-6a08e3108db3/go.mod h1:25r3+/G6/xytQM8iWZKq3Hn0kr0rgFKPUNVEL/dr3z4= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190311215038-5c2858a9cfe5/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190321232350-e250d351ecad/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190322203728-c1a832b0ad89/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20190910044552-dd2b5c81c578/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20190916130336-e45ffcd953cc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191010075000-0337d82405ff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -2103,13 +1546,11 @@ golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200108203644-89082a384178/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200117220505-0cba7a3a9ee9/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= @@ -2119,58 +1560,28 @@ golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapK golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= -golang.org/x/tools v0.0.0-20200324003944-a576cf524670/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= -golang.org/x/tools v0.0.0-20200329025819-fd4102a86c65/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= -golang.org/x/tools v0.0.0-20200414032229-332987a829c3/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200426102838-f3a5411a4c3b/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200622203043-20e05c1c8ffa/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200624225443-88f3c62a19ff/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200625211823-6506e20df31f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200626171337-aa94e735be7f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200630154851-b2d8b0336632/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200706234117-b22de6825cf7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200724022722-7017fd6b1305/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200812195022-5ae4c3c160a0/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200820010801-b793a1359eac/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200831203904-5a2aa26beb65/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= -golang.org/x/tools v0.0.0-20201001104356-43ebab892c4c/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= -golang.org/x/tools v0.0.0-20201002184944-ecd9fd270d5d/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= -golang.org/x/tools v0.0.0-20201022035929-9cf592e881e9/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201023174141-c8cfbd0f21e6/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201028025901-8cd080b735b3/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201230224404-63754364767c/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= -golang.org/x/tools v0.1.1-0.20210205202024-ef80cdb6ec6d/go.mod h1:9bzcO0MWcOuT0tm1iBGzDVPshzfwoVvREIui8C+MHqU= -golang.org/x/tools v0.1.1-0.20210302220138-2ac05c832e1a/go.mod h1:9bzcO0MWcOuT0tm1iBGzDVPshzfwoVvREIui8C+MHqU= golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo= -golang.org/x/tools v0.1.8/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= -golang.org/x/tools v0.1.9-0.20211228192929-ee1ca4ffc4da/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= -golang.org/x/tools v0.1.9/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= -golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= -golang.org/x/tools v0.1.11-0.20220513221640-090b14e8501f/go.mod h1:SgwaegtQh8clINPpECJMqnxLv9I09HLqnW3RMqW0CA4= -golang.org/x/tools v0.1.11/go.mod h1:SgwaegtQh8clINPpECJMqnxLv9I09HLqnW3RMqW0CA4= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -2185,7 +1596,6 @@ golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNq gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo= gonum.org/v1/gonum v0.0.0-20181121035319-3f7ecaa7e8ca/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo= gonum.org/v1/gonum v0.6.0/go.mod h1:9mxDZsDKxgMAuccQkewq682L+0eCu4dCN2yonUJTCLU= -gonum.org/v1/gonum v0.8.2/go.mod h1:oe/vMfY3deqTw+1EZJhuvEW2iwGF1bW9wwu7XCu0+v0= gonum.org/v1/netlib v0.0.0-20181029234149-ec6d1f5cefe6/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b/go.mod h1:Wt8AAjI+ypCyYX3nZBvf6cAIx93T+c/OS2HFAYskSZc= @@ -2194,7 +1604,6 @@ google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEt google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= -google.golang.org/api v0.10.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= @@ -2220,9 +1629,7 @@ google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6 google.golang.org/api v0.55.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI= -google.golang.org/api v0.59.0/go.mod h1:sT2boj7M9YJxZzgeZqXogmhfmRWDtPzT31xkieUbuZU= google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I= -google.golang.org/api v0.62.0/go.mod h1:dKmwPCydfsad4qCH08MSdgWjfHOyfpd4VtDGgRFdavw= google.golang.org/api v0.63.0/go.mod h1:gs4ij2ffTRXwuzzgJl/56BdwJaA194ijkfn++9tDuPo= google.golang.org/api v0.67.0/go.mod h1:ShHKP8E60yPsKNw/w8w+VYaj9H6buA5UqDp8dhbQZ6g= google.golang.org/api v0.70.0/go.mod h1:Bs4ZM2HGifEvXwd50TtW70ovgJffJYw2oRCOFU/SkfA= @@ -2232,7 +1639,6 @@ google.golang.org/api v0.75.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69 google.golang.org/api v0.77.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69ljA= google.golang.org/api v0.78.0/go.mod h1:1Sg78yoMLOhlQTeF+ARBoytAcH1NNyyl390YMy6rKmw= google.golang.org/api v0.80.0/go.mod h1:xY3nI94gbvBrE0J6NHXhxOmW97HG7Khjkku6AFB3Hyg= -google.golang.org/api v0.81.0/go.mod h1:FA6Mb/bZxj706H2j+j2d6mHEEaHBmbbWnkfvmorOCko= google.golang.org/api v0.84.0/go.mod h1:NTsGnUFJMYROtiquksZHBWtHfeMC7iYthki7Eq3pa8o= google.golang.org/api v0.85.0/go.mod h1:AqZf8Ep9uZ2pyTvgL+x0D3Zt0eoT9b5E8fmzfu6FO2g= google.golang.org/api v0.90.0/go.mod h1:+Sem1dnrKlrXMR/X0bPnMWyluQe4RsNoYfmNLhOIkzw= @@ -2249,15 +1655,12 @@ google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= -google.golang.org/appengine v1.6.2/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/genproto v0.0.0-20170818010345-ee236bd376b0/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20181107211654-5fc9ac540362/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= @@ -2267,7 +1670,6 @@ google.golang.org/genproto v0.0.0-20190716160619-c506a9f90610/go.mod h1:DMBHOl98 google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= -google.golang.org/genproto v0.0.0-20190927181202-20e1ac93f88c/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= @@ -2290,8 +1692,6 @@ google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfG google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= -google.golang.org/genproto v0.0.0-20200626011028-ee7919e894b5/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200707001353-8e8330bf89df/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= @@ -2324,13 +1724,8 @@ google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod h1:eFjDcFEc google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= google.golang.org/genproto v0.0.0-20210909211513-a8c4777a87af/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210917145530-b395a37504d4/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211008145708-270636b82663/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211028162531-8db9c33dc351/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211129164237-f09f9a12af12/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211203200212-54befc351ae9/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211221195035-429b39de9b1c/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= @@ -2350,7 +1745,6 @@ google.golang.org/genproto v0.0.0-20220429170224-98d788798c3e/go.mod h1:8w6bsBMX google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= google.golang.org/genproto v0.0.0-20220505152158-f39f71e6c8f3/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= google.golang.org/genproto v0.0.0-20220518221133-4f43b3371335/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= -google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= google.golang.org/genproto v0.0.0-20220523171625-347a074981d8/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= google.golang.org/genproto v0.0.0-20220608133413-ed9918b62aac/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= google.golang.org/genproto v0.0.0-20220616135557-88e70c0c3a90/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= @@ -2382,7 +1776,6 @@ google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc h1: google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:vHYtlOoi6TsQ3Uk2yxR7NI5z8uoV+3pZtR4jmHIkRig= google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc h1:XSJ8Vk1SWuNr8S18z1NZSziL0CPIXLCCMDOEFtHBOFc= google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA= -google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= @@ -2392,13 +1785,11 @@ google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ij google.golang.org/grpc v1.22.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.24.0/go.mod h1:XDChyiUovWa60DnaeDeZmSW86xtLtjtZbwvSiRnRtcA= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= -google.golang.org/grpc v1.29.0/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= @@ -2417,7 +1808,6 @@ google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnD google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= -google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= @@ -2442,7 +1832,6 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.27.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= 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= @@ -2452,19 +1841,14 @@ gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLks 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= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/cheggaaa/pb.v1 v1.0.27/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= -gopkg.in/cheggaaa/pb.v1 v1.0.28/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= -gopkg.in/ini.v1 v1.66.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/ini.v1 v1.66.4/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/ini.v1 v1.66.6/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:5AcXVHNjg+BDxry382+8OKon8SEWiKktQR07RKPsv1c= @@ -2480,21 +1864,16 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.6/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= -gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk= -gotest.tools/v3 v3.2.0/go.mod h1:Mcr9QNxkg0uMvy/YElmo4SpXgJKWgQvYrT7Kw5RzJ1A= gotest.tools/v3 v3.4.0 h1:ZazjZUfuVeZGLAmlKKuyv3IKP5orXcwtOwDQH6YVr6o= honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= @@ -2505,15 +1884,9 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.1.3/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las= -honnef.co/go/tools v0.3.2/go.mod h1:jzwdWgg7Jdq75wlfblQxO4neNaFFSvgc1tD5Wv8U0Yw= -mvdan.cc/gofumpt v0.3.1/go.mod h1:w3ymliuxvzVx8DAutBnVyDqYb1Niy/yCJt/lk821YCE= -mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed/go.mod h1:Xkxe497xwlCKkIaQYRfC7CSLworTXY9RMqwhhCm+8Nc= -mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b/go.mod h1:2odslEg/xrtNQqCYg2/jCoyKnw3vv5biOc3JnIcYfL4= -mvdan.cc/unparam v0.0.0-20211214103731-d0ef000c54e5/go.mod h1:b8RRCBm0eeiWR8cfN88xeq2G5SG3VKGO+5UPWi5FSOY= nhooyr.io/websocket v1.8.6/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0= nhooyr.io/websocket v1.8.7 h1:usjR2uOr/zjjkVMy0lW+PPohFok7PCow5sDjLgX4P4g= nhooyr.io/websocket v1.8.7/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0= -pgregory.net/rapid v0.4.8/go.mod h1:Z5PbWqjvWR1I3UGjvboUuan4fe4ZYEYNLNQLExzCoUs= pgregory.net/rapid v0.6.2 h1:ErW5sL+UKtfBfUTsWHDCoeB+eZKLKMxrSd1VJY6W4bw= pgregory.net/rapid v0.6.2/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= @@ -2522,7 +1895,6 @@ rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= rsc.io/tmplfunc v0.0.3/go.mod h1:AG3sTPzElb1Io3Yg4voV9AGZJuleGAwaVRxL9M49PhA= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= -sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo= sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8= sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= diff --git a/network/init-neutrond.sh b/network/init-neutrond.sh index 0461891eb..f656840a5 100755 --- a/network/init-neutrond.sh +++ b/network/init-neutrond.sh @@ -10,7 +10,7 @@ THIRD_PARTY_CONTRACTS_DIR=${THIRD_PARTY_CONTRACTS_DIR:-./contracts_thirdparty} # IMPORTANT! minimum_gas_prices should always contain at least one record, otherwise the chain will not start or halt # ibc/27394FB092D2ECCD56123C74F36E4C1F926001CEADA9CA97EA622B25F41E5EB2 denom is required by intgration tests (test:tokenomics) -MIN_GAS_PRICES_DEFAULT='[{"denom":"ibc/27394FB092D2ECCD56123C74F36E4C1F926001CEADA9CA97EA622B25F41E5EB2","amount":"0"},{"denom":"untrn","amount":"0"}]' +MIN_GAS_PRICES_DEFAULT='[{"denom":"ibc/27394FB092D2ECCD56123C74F36E4C1F926001CEADA9CA97EA622B25F41E5EB2","amount":"0"},{"denom":"untrn","amount":"0"}],' MIN_GAS_PRICES=${MIN_GAS_PRICES:-"$MIN_GAS_PRICES_DEFAULT"} From 93bd42a36cb4f83db532d24c363b88a37139dd25 Mon Sep 17 00:00:00 2001 From: nhpd Date: Fri, 28 Jul 2023 17:58:09 +0400 Subject: [PATCH 007/307] feat: migrate & enable global fee to sdk47 --- app/ante_handler.go | 6 ++-- app/app.go | 10 ------ app/genesis.go | 29 ++++++++++++++--- app/proposals_allowlisting.go | 4 ++- app/upgrades/nextupgrade/upgrades.go | 24 ++++++++++++++ app/upgrades/nextupgrade/upgrades_test.go | 21 +++++++++++- network/init-neutrond.sh | 39 ++++++++++++++++------- 7 files changed, 104 insertions(+), 29 deletions(-) diff --git a/app/ante_handler.go b/app/ante_handler.go index eefe35963..017f1d6c8 100644 --- a/app/ante_handler.go +++ b/app/ante_handler.go @@ -9,6 +9,7 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/cosmos/cosmos-sdk/x/auth/ante" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" + globalfeeante "github.com/cosmos/gaia/v11/x/globalfee/ante" ibcante "github.com/cosmos/ibc-go/v7/modules/core/ante" ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper" consumerante "github.com/cosmos/interchain-security/v3/app/consumer/ante" @@ -77,9 +78,10 @@ func NewAnteHandler(options HandlerOptions, logger log.Logger) (sdk.AnteHandler, ante.NewValidateMemoDecorator(options.AccountKeeper), ante.NewConsumeGasForTxSizeDecorator(options.AccountKeeper), // We are providing options.GlobalFeeSubspace because we do not have staking module - // In this case you should be sure that you implemented upgrade to set default global fee param and it SHOULD contain at least one record + // In this case you should be sure that you + // implemented upgrade to set default global fee param with at least one record // otherwise you will get panic - //globalfeeante.NewFeeDecorator(options.GlobalFeeSubspace, nil), + globalfeeante.NewFeeDecorator(options.GlobalFeeSubspace, nil), ante.NewDeductFeeDecorator(options.AccountKeeper, options.BankKeeper, options.FeegrantKeeper, options.TxFeeChecker), // SetPubKeyDecorator must be called before all signature verification decorators diff --git a/app/app.go b/app/app.go index 0102f5de5..988bde751 100644 --- a/app/app.go +++ b/app/app.go @@ -6,7 +6,6 @@ import ( "github.com/cosmos/cosmos-sdk/runtime" "github.com/cosmos/cosmos-sdk/x/genutil" genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types" - ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" tendermint "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" "github.com/neutron-org/neutron/docs" proposalhandler "github.com/skip-mev/pob/abci" @@ -95,7 +94,6 @@ import ( ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" ibc "github.com/cosmos/ibc-go/v7/modules/core" ibcclient "github.com/cosmos/ibc-go/v7/modules/core/02-client" - ibcchanneltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" ibcporttypes "github.com/cosmos/ibc-go/v7/modules/core/05-port/types" ibchost "github.com/cosmos/ibc-go/v7/modules/core/exported" ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper" @@ -978,14 +976,6 @@ func New( return app } -func GetDefaultBypassFeeMessages() []string { - return []string{ - sdk.MsgTypeURL(&ibcchanneltypes.MsgRecvPacket{}), - sdk.MsgTypeURL(&ibcchanneltypes.MsgAcknowledgement{}), - sdk.MsgTypeURL(&ibcclienttypes.MsgUpdateClient{}), - } -} - func (app *App) setupUpgradeStoreLoaders() { upgradeInfo, err := app.UpgradeKeeper.ReadUpgradeInfoFromDisk() if err != nil { diff --git a/app/genesis.go b/app/genesis.go index d23cd26be..9105628e9 100644 --- a/app/genesis.go +++ b/app/genesis.go @@ -2,8 +2,12 @@ package app import ( "encoding/json" - "github.com/cosmos/cosmos-sdk/codec" + sdk "github.com/cosmos/cosmos-sdk/types" + globalfeetypes "github.com/cosmos/gaia/v11/x/globalfee/types" + ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" + ibcchanneltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" + "github.com/neutron-org/neutron/app/params" ) // GenesisState is the genesis state of the blockchain represented here as a map of raw json @@ -20,11 +24,28 @@ func NewDefaultGenesisState(cdc codec.JSONCodec) GenesisState { // This ugly hack is required to alter globalfee module genesis state // because in current chain implementation staking module is absent which is required by globalfee module // and we can't use default genesis state for globalfee module. - // If we will not alter globalfee module genesis state, then we will get panic during tests run. + // If we do not alter globalfee module genesis state, then we will get panic during tests run. genesisState := ModuleBasics.DefaultGenesis(cdc) - minGasPrices := json.RawMessage(`{"params":{"minimum_gas_prices":[{"denom": "untrn", "amount": "0"}]}}`) - genesisState["globalfee"] = minGasPrices + globalFeeGenesisState := globalfeetypes.GenesisState{ + Params: globalfeetypes.Params{ + MinimumGasPrices: sdk.DecCoins{ + sdk.NewDecCoinFromDec(sdk.DefaultBondDenom, sdk.MustNewDecFromStr("0")), + sdk.NewDecCoinFromDec(params.DefaultDenom, sdk.MustNewDecFromStr("0")), + }, + BypassMinFeeMsgTypes: []string{ + sdk.MsgTypeURL(&ibcchanneltypes.MsgRecvPacket{}), + sdk.MsgTypeURL(&ibcchanneltypes.MsgAcknowledgement{}), + sdk.MsgTypeURL(&ibcclienttypes.MsgUpdateClient{}), + }, + MaxTotalBypassMinFeeMsgGasUsage: globalfeetypes.DefaultmaxTotalBypassMinFeeMsgGasUsage, + }, + } + globalFeeGenesisStateBytes, err := json.Marshal(globalFeeGenesisState) + if err != nil { + panic("cannot marshal global fee genesis state") + } + genesisState["globalfee"] = globalFeeGenesisStateBytes return genesisState } diff --git a/app/proposals_allowlisting.go b/app/proposals_allowlisting.go index 26022eac5..866910357 100644 --- a/app/proposals_allowlisting.go +++ b/app/proposals_allowlisting.go @@ -70,7 +70,9 @@ var WhitelistedParams = map[paramChangeKey]struct{}{ //{Subspace: tokenfactorytypes.ModuleName, Key: string(tokenfactorytypes.KeyDenomCreationFee)}: {}, //{Subspace: tokenfactorytypes.ModuleName, Key: string(tokenfactorytypes.KeyFeeCollectorAddress)}: {}, // globalfee - {Subspace: globalfeetypes.ModuleName, Key: string(globalfeetypes.ParamStoreKeyMinGasPrices)}: {}, + {Subspace: globalfeetypes.ModuleName, Key: string(globalfeetypes.ParamStoreKeyMinGasPrices)}: {}, + {Subspace: globalfeetypes.ModuleName, Key: string(globalfeetypes.ParamStoreKeyBypassMinFeeMsgTypes)}: {}, + {Subspace: globalfeetypes.ModuleName, Key: string(globalfeetypes.ParamStoreKeyMaxTotalBypassMinFeeMsgGasUsage)}: {}, // cron //{Subspace: crontypes.ModuleName, Key: string(crontypes.KeySecurityAddress)}: {}, //{Subspace: crontypes.ModuleName, Key: string(crontypes.KeyLimit)}: {}, diff --git a/app/upgrades/nextupgrade/upgrades.go b/app/upgrades/nextupgrade/upgrades.go index 7db80ca43..80643dc25 100644 --- a/app/upgrades/nextupgrade/upgrades.go +++ b/app/upgrades/nextupgrade/upgrades.go @@ -3,6 +3,8 @@ package nextupgrade import ( "errors" "github.com/cosmos/cosmos-sdk/codec" + ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" + ibcchanneltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" @@ -30,6 +32,15 @@ func CreateUpgradeHandler( if !keepers.GlobalFeeSubspace.Has(ctx, types.ParamStoreKeyMinGasPrices) { return vm, errors.New("minimum_gas_prices param not found") } + + if !keepers.GlobalFeeSubspace.Has(ctx, types.ParamStoreKeyBypassMinFeeMsgTypes) { + return vm, errors.New("bypass_min_fee_msg_types param not found") + } + + if !keepers.GlobalFeeSubspace.Has(ctx, types.ParamStoreKeyMaxTotalBypassMinFeeMsgGasUsage) { + return vm, errors.New("max_total_bypass_min_fee_msg_gas_usage param not found") + } + // global fee is empty set, set global fee to equal to 0.05 USD (for 200k of gas) in appropriate coin // As of June 22nd, 2023 this is // 0.9untrn,0.026ibc/C4CFF46FD6DE35CA4CF4CE031E643C8FDC9BA4B99AE598E9B0ED98FE3A2319F9,0.25ibc/F082B65C88E4B6D5EF1DB243CDA1D331D002759E938A0F5CD3FFDC5D53B3E349 @@ -44,6 +55,19 @@ func CreateUpgradeHandler( ctx.Logger().Info("Global fees was set successfully") + defaultBypassFeeMessages := []string{ + sdk.MsgTypeURL(&ibcchanneltypes.MsgRecvPacket{}), + sdk.MsgTypeURL(&ibcchanneltypes.MsgAcknowledgement{}), + sdk.MsgTypeURL(&ibcclienttypes.MsgUpdateClient{}), + } + keepers.GlobalFeeSubspace.Set(ctx, types.ParamStoreKeyBypassMinFeeMsgTypes, &defaultBypassFeeMessages) + + ctx.Logger().Info("Bypass min fee msg types was set successfully") + + keepers.GlobalFeeSubspace.Set(ctx, types.ParamStoreKeyMaxTotalBypassMinFeeMsgGasUsage, types.DefaultmaxTotalBypassMinFeeMsgGasUsage) + + ctx.Logger().Info("Max total bypass min fee msg gas usage set successfully") + ctx.Logger().Info("Upgrade complete") return vm, err } diff --git a/app/upgrades/nextupgrade/upgrades_test.go b/app/upgrades/nextupgrade/upgrades_test.go index 464d5293e..bd1d7237e 100644 --- a/app/upgrades/nextupgrade/upgrades_test.go +++ b/app/upgrades/nextupgrade/upgrades_test.go @@ -1,6 +1,8 @@ package nextupgrade_test import ( + ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" + ibcchanneltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" "testing" sdk "github.com/cosmos/cosmos-sdk/types" @@ -28,6 +30,8 @@ func (suite *UpgradeTestSuite) TestGlobalFeesUpgrade() { ) suite.Require().True(globalFeeSubspace.Has(ctx, globalfeetypes.ParamStoreKeyMinGasPrices)) + suite.Require().True(globalFeeSubspace.Has(ctx, globalfeetypes.ParamStoreKeyBypassMinFeeMsgTypes)) + suite.Require().True(globalFeeSubspace.Has(ctx, globalfeetypes.ParamStoreKeyMaxTotalBypassMinFeeMsgGasUsage)) upgrade := upgradetypes.Plan{ Name: nextupgrade.UpgradeName, @@ -37,14 +41,29 @@ func (suite *UpgradeTestSuite) TestGlobalFeesUpgrade() { app.UpgradeKeeper.ApplyUpgrade(ctx, upgrade) suite.Require().True(globalFeeSubspace.Has(ctx, globalfeetypes.ParamStoreKeyMinGasPrices)) + suite.Require().True(globalFeeSubspace.Has(ctx, globalfeetypes.ParamStoreKeyBypassMinFeeMsgTypes)) + suite.Require().True(globalFeeSubspace.Has(ctx, globalfeetypes.ParamStoreKeyMaxTotalBypassMinFeeMsgGasUsage)) var globalMinGasPrices sdk.DecCoins globalFeeSubspace.Get(ctx, globalfeetypes.ParamStoreKeyMinGasPrices, &globalMinGasPrices) - requiredGlobalFees := sdk.DecCoins{ sdk.NewDecCoinFromDec("ibc/C4CFF46FD6DE35CA4CF4CE031E643C8FDC9BA4B99AE598E9B0ED98FE3A2319F9", sdk.MustNewDecFromStr("0.026")), sdk.NewDecCoinFromDec("ibc/F082B65C88E4B6D5EF1DB243CDA1D331D002759E938A0F5CD3FFDC5D53B3E349", sdk.MustNewDecFromStr("0.25")), sdk.NewDecCoinFromDec("untrn", sdk.MustNewDecFromStr("0.9")), } suite.Require().Equal(requiredGlobalFees, globalMinGasPrices) + + var actualBypassFeeMessages []string + globalFeeSubspace.Get(ctx, globalfeetypes.ParamStoreKeyBypassMinFeeMsgTypes, &actualBypassFeeMessages) + requiredBypassMinFeeMsgTypes := []string{ + sdk.MsgTypeURL(&ibcchanneltypes.MsgRecvPacket{}), + sdk.MsgTypeURL(&ibcchanneltypes.MsgAcknowledgement{}), + sdk.MsgTypeURL(&ibcclienttypes.MsgUpdateClient{}), + } + suite.Require().Equal(requiredBypassMinFeeMsgTypes, actualBypassFeeMessages) + + var actualTotalBypassMinFeeMsgGasUsage uint64 + globalFeeSubspace.Get(ctx, globalfeetypes.ParamStoreKeyMaxTotalBypassMinFeeMsgGasUsage, &actualTotalBypassMinFeeMsgGasUsage) + requiredTotalBypassMinFeeMsgGasUsage := uint64(1_000_000) + suite.Require().Equal(requiredTotalBypassMinFeeMsgGasUsage, actualTotalBypassMinFeeMsgGasUsage) } diff --git a/network/init-neutrond.sh b/network/init-neutrond.sh index 0461891eb..01a52154f 100755 --- a/network/init-neutrond.sh +++ b/network/init-neutrond.sh @@ -13,6 +13,14 @@ THIRD_PARTY_CONTRACTS_DIR=${THIRD_PARTY_CONTRACTS_DIR:-./contracts_thirdparty} MIN_GAS_PRICES_DEFAULT='[{"denom":"ibc/27394FB092D2ECCD56123C74F36E4C1F926001CEADA9CA97EA622B25F41E5EB2","amount":"0"},{"denom":"untrn","amount":"0"}]' MIN_GAS_PRICES=${MIN_GAS_PRICES:-"$MIN_GAS_PRICES_DEFAULT"} +#BYPASS_MIN_FEE_MSG_TYPES_DEFAULT='[\"/ibc.core.channel.v1.Msg/RecvPacket\", \"/ibc.core.channel.v1.Msg/Acknowledgement\", \"/ibc.core.client.v1.Msg/UpdateClient\"]' +#BYPASS_MIN_FEE_MSG_TYPES=${BYPASS_MIN_FEE_MSG_TYPES:-"$BYPASS_MIN_FEE_MSG_TYPES_DEFAULT"} + +BYPASS_MIN_FEE_MSG_TYPES_DEFAULT='["/ibc.core.channel.v1.Msg/RecvPacket", "/ibc.core.channel.v1.Msg/Acknowledgement", "/ibc.core.client.v1.Msg/UpdateClient"]' +BYPASS_MIN_FEE_MSG_TYPES=${BYPASS_MIN_FEE_MSG_TYPES:-"$BYPASS_MIN_FEE_MSG_TYPES_DEFAULT"} + +MAX_TOTAL_BYPASS_MIN_FEE_MSG_GAS_USAGE_DEFAULT=1000000 +MAX_TOTAL_BYPASS_MIN_FEE_MSG_GAS_USAGE=${MAX_TOTAL_BYPASS_MIN_FEE_MSG_GAS_USAGE:-"$MAX_TOTAL_BYPASS_MIN_FEE_MSG_GAS_USAGE_DEFAULT"} CHAIN_DIR="$BASE_DIR/$CHAINID" GENESIS_PATH="$CHAIN_DIR/config/genesis.json" @@ -610,23 +618,32 @@ function set_genesis_param() { sed -i -e "s;\"$param_name\":.*;\"$param_name\": $param_value;g" "$GENESIS_PATH" } +function set_genesis_param_jq() { + param_path=$1 + param_value=$2 + cat "$GENESIS_PATH" | jq "${param_path} = ${param_value}" > tmp_genesis_file.json && mv tmp_genesis_file.json "$GENESIS_PATH" +} + function convert_bech32_base64_esc() { $BINARY keys parse $1 --output json | jq .bytes | xxd -r -p | base64 | sed -e 's/\//\\\//g' } DAO_CONTRACT_ADDRESS_B64=$(convert_bech32_base64_esc "$DAO_CONTRACT_ADDRESS") echo $DAO_CONTRACT_ADDRESS_B64 -set_genesis_param admins "[\"$DAO_CONTRACT_ADDRESS\"]" # admin module -set_genesis_param treasury_address "\"$DAO_CONTRACT_ADDRESS\"" # feeburner -set_genesis_param fee_collector_address "\"$DAO_CONTRACT_ADDRESS\"" # tokenfactory -set_genesis_param security_address "\"$SECURITY_SUBDAO_CORE_CONTRACT_ADDRESS\"," # cron -set_genesis_param limit 5 # cron -#set_genesis_param allow_messages "[\"*\"]" # interchainaccounts -set_genesis_param signed_blocks_window "\"$SLASHING_SIGNED_BLOCKS_WINDOW\"," # slashing -set_genesis_param min_signed_per_window "\"$SLASHING_MIN_SIGNED\"," # slashing -set_genesis_param slash_fraction_double_sign "\"$SLASHING_FRACTION_DOUBLE_SIGN\"," # slashing -set_genesis_param slash_fraction_downtime "\"$SLASHING_FRACTION_DOWNTIME\"" # slashing -set_genesis_param minimum_gas_prices "$MIN_GAS_PRICES" # globalfee +set_genesis_param admins "[\"$DAO_CONTRACT_ADDRESS\"]" # admin module +set_genesis_param treasury_address "\"$DAO_CONTRACT_ADDRESS\"" # feeburner +set_genesis_param fee_collector_address "\"$DAO_CONTRACT_ADDRESS\"" # tokenfactory +set_genesis_param security_address "\"$SECURITY_SUBDAO_CORE_CONTRACT_ADDRESS\"," # cron +set_genesis_param limit 5 # cron +#set_genesis_param allow_messages "[\"*\"]" # interchainaccounts +set_genesis_param signed_blocks_window "\"$SLASHING_SIGNED_BLOCKS_WINDOW\"," # slashing +set_genesis_param min_signed_per_window "\"$SLASHING_MIN_SIGNED\"," # slashing +set_genesis_param slash_fraction_double_sign "\"$SLASHING_FRACTION_DOUBLE_SIGN\"," # slashing +set_genesis_param slash_fraction_downtime "\"$SLASHING_FRACTION_DOWNTIME\"" # slashing +set_genesis_param minimum_gas_prices "$MIN_GAS_PRICES," # globalfee +set_genesis_param max_total_bypass_min_fee_msg_gas_usage "\"$MAX_TOTAL_BYPASS_MIN_FEE_MSG_GAS_USAGE\"" # globalfee + +set_genesis_param_jq ".app_state.globalfee.params.bypass_min_fee_msg_types" "$BYPASS_MIN_FEE_MSG_TYPES" # globalfee set_genesis_param proposer_fee "\"0.25\"" # builder(POB) set_genesis_param escrow_account_address "\"$DAO_CONTRACT_ADDRESS_B64\"," # builder(POB) From b76140bf83012385e9db1edd073c717774be1e0c Mon Sep 17 00:00:00 2001 From: nhpd Date: Fri, 28 Jul 2023 17:59:51 +0400 Subject: [PATCH 008/307] cleanup cat usage --- network/init-neutrond.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/network/init-neutrond.sh b/network/init-neutrond.sh index 01a52154f..b3e83e83e 100755 --- a/network/init-neutrond.sh +++ b/network/init-neutrond.sh @@ -621,7 +621,7 @@ function set_genesis_param() { function set_genesis_param_jq() { param_path=$1 param_value=$2 - cat "$GENESIS_PATH" | jq "${param_path} = ${param_value}" > tmp_genesis_file.json && mv tmp_genesis_file.json "$GENESIS_PATH" + jq "${param_path} = ${param_value}" > tmp_genesis_file.json < "$GENESIS_PATH" && mv tmp_genesis_file.json "$GENESIS_PATH" } function convert_bech32_base64_esc() { From b003f8a2c7e3c3383cc4b8e97eb73951c87c5ec8 Mon Sep 17 00:00:00 2001 From: nhpd Date: Fri, 28 Jul 2023 18:22:30 +0400 Subject: [PATCH 009/307] more cleanup --- network/init-neutrond.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/network/init-neutrond.sh b/network/init-neutrond.sh index b3e83e83e..e1f983fb8 100755 --- a/network/init-neutrond.sh +++ b/network/init-neutrond.sh @@ -13,9 +13,6 @@ THIRD_PARTY_CONTRACTS_DIR=${THIRD_PARTY_CONTRACTS_DIR:-./contracts_thirdparty} MIN_GAS_PRICES_DEFAULT='[{"denom":"ibc/27394FB092D2ECCD56123C74F36E4C1F926001CEADA9CA97EA622B25F41E5EB2","amount":"0"},{"denom":"untrn","amount":"0"}]' MIN_GAS_PRICES=${MIN_GAS_PRICES:-"$MIN_GAS_PRICES_DEFAULT"} -#BYPASS_MIN_FEE_MSG_TYPES_DEFAULT='[\"/ibc.core.channel.v1.Msg/RecvPacket\", \"/ibc.core.channel.v1.Msg/Acknowledgement\", \"/ibc.core.client.v1.Msg/UpdateClient\"]' -#BYPASS_MIN_FEE_MSG_TYPES=${BYPASS_MIN_FEE_MSG_TYPES:-"$BYPASS_MIN_FEE_MSG_TYPES_DEFAULT"} - BYPASS_MIN_FEE_MSG_TYPES_DEFAULT='["/ibc.core.channel.v1.Msg/RecvPacket", "/ibc.core.channel.v1.Msg/Acknowledgement", "/ibc.core.client.v1.Msg/UpdateClient"]' BYPASS_MIN_FEE_MSG_TYPES=${BYPASS_MIN_FEE_MSG_TYPES:-"$BYPASS_MIN_FEE_MSG_TYPES_DEFAULT"} From 0ea4fc383f470e941e42d67687d360f9aa1a5c95 Mon Sep 17 00:00:00 2001 From: swelf Date: Fri, 28 Jul 2023 18:08:10 +0300 Subject: [PATCH 010/307] error processing fot SetParams --- app/upgrades/v0.4.4/upgrades.go | 16 ++++++++++++---- app/upgrades/v3/upgrades.go | 19 +++++++++++++++---- .../contractmanager/keeper/contractmanager.go | 3 ++- testutil/cron/keeper/cron.go | 3 ++- testutil/feeburner/keeper/feeburner.go | 3 ++- testutil/feerefunder/keeper/fee.go | 5 +++-- .../keeper/interchainqeries.go | 3 ++- .../interchaintxs/keeper/interchaintxs.go | 3 ++- wasmbinding/test/custom_message_test.go | 3 ++- wasmbinding/test/custom_query_test.go | 5 +++-- x/contractmanager/genesis.go | 5 ++++- .../keeper/grpc_query_params_test.go | 5 +++-- x/contractmanager/keeper/params_test.go | 3 ++- x/cron/genesis.go | 5 ++++- x/cron/keeper/grpc_query_params_test.go | 5 +++-- x/cron/keeper/keeper_test.go | 12 ++++++++---- x/cron/keeper/params_test.go | 3 ++- x/feeburner/genesis.go | 5 ++++- x/feeburner/keeper/grpc_query_params_test.go | 3 ++- x/feeburner/keeper/params_test.go | 3 ++- x/feerefunder/genesis.go | 5 ++++- .../keeper/grpc_query_params_test.go | 3 ++- x/feerefunder/keeper/keeper_test.go | 8 +++++--- x/feerefunder/keeper/params_test.go | 5 ++++- x/interchainqueries/genesis.go | 5 ++++- .../keeper/grpc_query_params_test.go | 3 ++- x/interchainqueries/keeper/keeper_test.go | 18 +++++++++++------- x/interchainqueries/keeper/params_test.go | 3 ++- x/interchaintxs/genesis.go | 5 ++++- .../keeper/grpc_query_params_test.go | 3 ++- x/interchaintxs/keeper/params_test.go | 3 ++- x/tokenfactory/keeper/genesis.go | 5 ++++- x/tokenfactory/keeper/genesis_test.go | 3 ++- x/tokenfactory/keeper/keeper_test.go | 3 ++- 34 files changed, 129 insertions(+), 55 deletions(-) diff --git a/app/upgrades/v0.4.4/upgrades.go b/app/upgrades/v0.4.4/upgrades.go index 79f28f4ab..82b1ca804 100644 --- a/app/upgrades/v0.4.4/upgrades.go +++ b/app/upgrades/v0.4.4/upgrades.go @@ -31,8 +31,10 @@ func CreateUpgradeHandler( oldSlashingParams := keepers.SlashingKeeper.GetParams(ctx) oldSlashingParams.SignedBlocksWindow = int64(36000) - keepers.SlashingKeeper.SetParams(ctx, oldSlashingParams) - + err = keepers.SlashingKeeper.SetParams(ctx, oldSlashingParams) + if err != nil { + return vm, err + } ctx.Logger().Info("Migrating FeeBurner Params...") s, ok := keepers.ParamsKeeper.GetSubspace(feeburnertypes.ModuleName) if !ok { @@ -47,12 +49,18 @@ func CreateUpgradeHandler( feeburnerDefaultParams := feeburnertypes.DefaultParams() feeburnerDefaultParams.TreasuryAddress = reserveAddress feeburnerDefaultParams.NeutronDenom = neutronDenom - keepers.FeeBurnerKeeper.SetParams(ctx, feeburnerDefaultParams) + err = keepers.FeeBurnerKeeper.SetParams(ctx, feeburnerDefaultParams) + if err != nil { + return vm, err + } ctx.Logger().Info("Migrating TokenFactory Params...") tokenfactoryDefaultParams := tokenfactorytypes.DefaultParams() tokenfactoryDefaultParams.FeeCollectorAddress = reserveAddress - keepers.TokenFactoryKeeper.SetParams(ctx, tokenfactoryDefaultParams) + err = keepers.TokenFactoryKeeper.SetParams(ctx, tokenfactoryDefaultParams) + if err != nil { + return vm, err + } ctx.Logger().Info("Upgrade complete") return vm, err diff --git a/app/upgrades/v3/upgrades.go b/app/upgrades/v3/upgrades.go index 384b5685e..beabd198e 100644 --- a/app/upgrades/v3/upgrades.go +++ b/app/upgrades/v3/upgrades.go @@ -23,11 +23,22 @@ func CreateUpgradeHandler( ctx.Logger().Info("Starting module migrations...") // todo: FIXME - keepers.IcqKeeper.SetParams(ctx, icqtypes.DefaultParams()) - keepers.CronKeeper.SetParams(ctx, crontypes.DefaultParams()) - keepers.TokenFactoryKeeper.SetParams(ctx, tokenfactorytypes.DefaultParams()) + err := keepers.IcqKeeper.SetParams(ctx, icqtypes.DefaultParams()) + if err != nil { + return vm, err + } + + err = keepers.CronKeeper.SetParams(ctx, crontypes.DefaultParams()) + if err != nil { + return vm, err + } + + err = keepers.TokenFactoryKeeper.SetParams(ctx, tokenfactorytypes.DefaultParams()) + if err != nil { + return vm, err + } - vm, err := mm.RunMigrations(ctx, configurator, vm) + vm, err = mm.RunMigrations(ctx, configurator, vm) if err != nil { return vm, err } diff --git a/testutil/contractmanager/keeper/contractmanager.go b/testutil/contractmanager/keeper/contractmanager.go index ad84a455e..cfeeff451 100644 --- a/testutil/contractmanager/keeper/contractmanager.go +++ b/testutil/contractmanager/keeper/contractmanager.go @@ -40,7 +40,8 @@ func ContractManagerKeeper(t testing.TB, wasmKeeper types.WasmKeeper) (*keeper.K ctx := sdk.NewContext(stateStore, tmproto.Header{}, false, log.NewNopLogger()) // Initialize params - k.SetParams(ctx, types.DefaultParams()) + err := k.SetParams(ctx, types.DefaultParams()) + require.NoError(t, err) return k, ctx } diff --git a/testutil/cron/keeper/cron.go b/testutil/cron/keeper/cron.go index afa4cad93..e2fff48dc 100644 --- a/testutil/cron/keeper/cron.go +++ b/testutil/cron/keeper/cron.go @@ -40,7 +40,8 @@ func CronKeeper(t testing.TB, wasmMsgServer types.WasmMsgServer, accountKeeper t ctx := sdk.NewContext(stateStore, tmproto.Header{}, false, log.NewNopLogger()) // Initialize params - k.SetParams(ctx, types.DefaultParams()) + err := k.SetParams(ctx, types.DefaultParams()) + require.NoError(t, err) return k, ctx } diff --git a/testutil/feeburner/keeper/feeburner.go b/testutil/feeburner/keeper/feeburner.go index dbf9daab6..bea9b73a1 100644 --- a/testutil/feeburner/keeper/feeburner.go +++ b/testutil/feeburner/keeper/feeburner.go @@ -44,7 +44,8 @@ func FeeburnerKeeperWithDeps(t testing.TB, accountKeeper types.AccountKeeper, ba ctx := sdk.NewContext(stateStore, tmproto.Header{}, false, log.NewNopLogger()) // Initialize params - k.SetParams(ctx, types.NewParams(types.DefaultNeutronDenom, "neutron1vguuxez2h5ekltfj9gjd62fs5k4rl2zy5hfrncasykzw08rezpfsd2rhm7")) + err := k.SetParams(ctx, types.NewParams(types.DefaultNeutronDenom, "neutron1vguuxez2h5ekltfj9gjd62fs5k4rl2zy5hfrncasykzw08rezpfsd2rhm7")) + require.NoError(t, err) return k, ctx } diff --git a/testutil/feerefunder/keeper/fee.go b/testutil/feerefunder/keeper/fee.go index 9af103f50..940732526 100644 --- a/testutil/feerefunder/keeper/fee.go +++ b/testutil/feerefunder/keeper/fee.go @@ -29,7 +29,7 @@ func FeeKeeper(t testing.TB, channelKeeper types.ChannelKeeper, bankKeeper types registry := codectypes.NewInterfaceRegistry() cdc := codec.NewProtoCodec(registry) - + k := keeper.NewKeeper( cdc, storeKey, @@ -41,7 +41,8 @@ func FeeKeeper(t testing.TB, channelKeeper types.ChannelKeeper, bankKeeper types ctx := sdk.NewContext(stateStore, tmproto.Header{}, false, log.NewNopLogger()) // Initialize params - k.SetParams(ctx, types.DefaultParams()) + err := k.SetParams(ctx, types.DefaultParams()) + require.NoError(t, err) return k, ctx } diff --git a/testutil/interchainqueries/keeper/interchainqeries.go b/testutil/interchainqueries/keeper/interchainqeries.go index afec6b78d..1eeddd187 100644 --- a/testutil/interchainqueries/keeper/interchainqeries.go +++ b/testutil/interchainqueries/keeper/interchainqeries.go @@ -52,7 +52,8 @@ func InterchainQueriesKeeper( ctx := sdk.NewContext(stateStore, tmproto.Header{}, false, log.NewNopLogger()) // Initialize params - k.SetParams(ctx, types.DefaultParams()) + err := k.SetParams(ctx, types.DefaultParams()) + require.NoError(t, err) return k, ctx } diff --git a/testutil/interchaintxs/keeper/interchaintxs.go b/testutil/interchaintxs/keeper/interchaintxs.go index 2aedcc8c5..0df55e792 100644 --- a/testutil/interchaintxs/keeper/interchaintxs.go +++ b/testutil/interchaintxs/keeper/interchaintxs.go @@ -43,7 +43,8 @@ func InterchainTxsKeeper(t testing.TB, managerKeeper types.ContractManagerKeeper ctx := sdk.NewContext(stateStore, tmproto.Header{}, false, log.NewNopLogger()) // Initialize params - k.SetParams(ctx, types.DefaultParams()) + err := k.SetParams(ctx, types.DefaultParams()) + require.NoError(t,err) return k, ctx } diff --git a/wasmbinding/test/custom_message_test.go b/wasmbinding/test/custom_message_test.go index c714b7508..ada721a6a 100644 --- a/wasmbinding/test/custom_message_test.go +++ b/wasmbinding/test/custom_message_test.go @@ -59,10 +59,11 @@ func (suite *CustomMessengerTestSuite) SetupTest() { suite.messenger.AdminKeeper = &suite.neutron.AdminmoduleKeeper suite.contractOwner = keeper.RandomAccountAddress(suite.T()) - suite.messenger.TokenFactory.SetParams(suite.ctx, tokenfactorytypes.NewParams( + err := suite.messenger.TokenFactory.SetParams(suite.ctx, tokenfactorytypes.NewParams( sdk.NewCoins(sdk.NewInt64Coin(tokenfactorytypes.DefaultNeutronDenom, 10_000_000)), FeeCollectorAddress, )) + suite.Require().NoError(err) } func (suite *CustomMessengerTestSuite) TestRegisterInterchainAccount() { diff --git a/wasmbinding/test/custom_query_test.go b/wasmbinding/test/custom_query_test.go index 5c25598bc..c4b524486 100644 --- a/wasmbinding/test/custom_query_test.go +++ b/wasmbinding/test/custom_query_test.go @@ -249,10 +249,11 @@ func (suite *CustomQuerierTestSuite) TestDenomAdmin() { owner = keeper.RandomAccountAddress(suite.T()) // We don't care what this address is ) - neutron.TokenFactoryKeeper.SetParams(ctx, tokenfactorytypes.NewParams( + err := neutron.TokenFactoryKeeper.SetParams(ctx, tokenfactorytypes.NewParams( sdk.NewCoins(sdk.NewInt64Coin(tokenfactorytypes.DefaultNeutronDenom, 10_000_000)), FeeCollectorAddress, )) + suite.Require().NoError(err) // Store code and instantiate reflect contract codeID := suite.StoreReflectCode(ctx, owner, "../testdata/reflect.wasm") @@ -262,7 +263,7 @@ func (suite *CustomQuerierTestSuite) TestDenomAdmin() { senderAddress := suite.ChainA.SenderAccounts[0].SenderAccount.GetAddress() coinsAmnt := sdk.NewCoins(sdk.NewCoin(params.DefaultDenom, sdk.NewInt(int64(10_000_000)))) bankKeeper := neutron.BankKeeper - err := bankKeeper.SendCoins(ctx, senderAddress, contractAddress, coinsAmnt) + err = bankKeeper.SendCoins(ctx, senderAddress, contractAddress, coinsAmnt) suite.NoError(err) denom, _ := neutron.TokenFactoryKeeper.CreateDenom(ctx, contractAddress.String(), "test") diff --git a/x/contractmanager/genesis.go b/x/contractmanager/genesis.go index 5475be6cd..9786d40d9 100644 --- a/x/contractmanager/genesis.go +++ b/x/contractmanager/genesis.go @@ -14,7 +14,10 @@ func InitGenesis(ctx sdk.Context, k keeper.Keeper, genState types.GenesisState) k.AddContractFailure(ctx, elem.ChannelId, elem.Address, elem.AckId, elem.AckType) } // this line is used by starport scaffolding # genesis/module/init - k.SetParams(ctx, genState.Params) + err := k.SetParams(ctx, genState.Params) + if err != nil { + panic(err) + } } // ExportGenesis returns the module's exported genesis diff --git a/x/contractmanager/keeper/grpc_query_params_test.go b/x/contractmanager/keeper/grpc_query_params_test.go index 3abb1b19d..8bc65b586 100644 --- a/x/contractmanager/keeper/grpc_query_params_test.go +++ b/x/contractmanager/keeper/grpc_query_params_test.go @@ -14,8 +14,9 @@ func TestParamsQuery(t *testing.T) { keeper, ctx := testkeeper.ContractManagerKeeper(t, nil) wctx := sdk.WrapSDKContext(ctx) params := types.DefaultParams() - keeper.SetParams(ctx, params) - + err := keeper.SetParams(ctx, params) + require.NoError(t, err) + response, err := keeper.Params(wctx, &types.QueryParamsRequest{}) require.NoError(t, err) require.Equal(t, &types.QueryParamsResponse{Params: params}, response) diff --git a/x/contractmanager/keeper/params_test.go b/x/contractmanager/keeper/params_test.go index 4d9671e00..4b23f1830 100644 --- a/x/contractmanager/keeper/params_test.go +++ b/x/contractmanager/keeper/params_test.go @@ -13,7 +13,8 @@ func TestGetParams(t *testing.T) { k, ctx := testkeeper.ContractManagerKeeper(t, nil) params := types.DefaultParams() - k.SetParams(ctx, params) + err := k.SetParams(ctx, params) + require.NoError(t, err) require.EqualValues(t, params, k.GetParams(ctx)) } diff --git a/x/cron/genesis.go b/x/cron/genesis.go index 5b45b1ecf..84a23b215 100644 --- a/x/cron/genesis.go +++ b/x/cron/genesis.go @@ -16,7 +16,10 @@ func InitGenesis(ctx sdk.Context, k keeper.Keeper, genState types.GenesisState) } } // this line is used by starport scaffolding # genesis/module/init - k.SetParams(ctx, genState.Params) + err := k.SetParams(ctx, genState.Params) + if err != nil { + panic(err) + } } // ExportGenesis returns the module's exported genesis diff --git a/x/cron/keeper/grpc_query_params_test.go b/x/cron/keeper/grpc_query_params_test.go index a2db2836a..154826fb9 100644 --- a/x/cron/keeper/grpc_query_params_test.go +++ b/x/cron/keeper/grpc_query_params_test.go @@ -14,8 +14,9 @@ func TestParamsQuery(t *testing.T) { keeper, ctx := testkeeper.CronKeeper(t, nil, nil) wctx := sdk.WrapSDKContext(ctx) params := types.DefaultParams() - keeper.SetParams(ctx, params) - + err := keeper.SetParams(ctx, params) + require.NoError(t, err) + response, err := keeper.Params(wctx, &types.QueryParamsRequest{}) require.NoError(t, err) require.Equal(t, &types.QueryParamsResponse{Params: params}, response) diff --git a/x/cron/keeper/keeper_test.go b/x/cron/keeper/keeper_test.go index 74f900985..6fe16a741 100644 --- a/x/cron/keeper/keeper_test.go +++ b/x/cron/keeper/keeper_test.go @@ -34,10 +34,11 @@ func TestKeeperExecuteReadySchedules(t *testing.T) { k, ctx := testutil_keeper.CronKeeper(t, wasmMsgServer, accountKeeper) ctx = ctx.WithBlockHeight(0) - k.SetParams(ctx, types.Params{ + err = k.SetParams(ctx, types.Params{ SecurityAddress: testutil.TestOwnerAddress, Limit: 2, }) + require.NoError(t, err) schedules := []types.Schedule{ { @@ -169,13 +170,14 @@ func TestAddSchedule(t *testing.T) { k, ctx := testutil_keeper.CronKeeper(t, wasmMsgServer, accountKeeper) ctx = ctx.WithBlockHeight(0) - k.SetParams(ctx, types.Params{ + err := k.SetParams(ctx, types.Params{ SecurityAddress: testutil.TestOwnerAddress, Limit: 2, }) + require.NoError(t, err) // normal add schedule - err := k.AddSchedule(ctx, "a", 7, []types.MsgExecuteContract{ + err = k.AddSchedule(ctx, "a", 7, []types.MsgExecuteContract{ { Contract: "c", Msg: "m", @@ -207,10 +209,12 @@ func TestAddSchedule(t *testing.T) { func TestGetAllSchedules(t *testing.T) { k, ctx := testutil_keeper.CronKeeper(t, nil, nil) - k.SetParams(ctx, types.Params{ + err := k.SetParams(ctx, types.Params{ SecurityAddress: testutil.TestOwnerAddress, Limit: 2, }) + require.NoError(t, err) + expectedSchedules := make([]types.Schedule, 0, 3) for i := range []int{1, 2, 3} { s := types.Schedule{ diff --git a/x/cron/keeper/params_test.go b/x/cron/keeper/params_test.go index 5b1ce5a15..1f5e02c90 100644 --- a/x/cron/keeper/params_test.go +++ b/x/cron/keeper/params_test.go @@ -22,7 +22,8 @@ func TestGetParams(t *testing.T) { Limit: 5, } - k.SetParams(ctx, params) + err := k.SetParams(ctx, params) + require.NoError(t, err) require.EqualValues(t, params, k.GetParams(ctx)) } diff --git a/x/feeburner/genesis.go b/x/feeburner/genesis.go index 20662d5a8..3af23ed5d 100644 --- a/x/feeburner/genesis.go +++ b/x/feeburner/genesis.go @@ -9,7 +9,10 @@ import ( // InitGenesis initializes the module's state from a provided genesis state. func InitGenesis(ctx sdk.Context, k keeper.Keeper, genState types.GenesisState) { // this line is used by starport scaffolding # genesis/module/init - k.SetParams(ctx, genState.Params) + err := k.SetParams(ctx, genState.Params) + if err != nil { + panic(err) + } } // ExportGenesis returns the module's exported genesis diff --git a/x/feeburner/keeper/grpc_query_params_test.go b/x/feeburner/keeper/grpc_query_params_test.go index 5f80b3171..5e519fdba 100644 --- a/x/feeburner/keeper/grpc_query_params_test.go +++ b/x/feeburner/keeper/grpc_query_params_test.go @@ -18,7 +18,8 @@ func TestParamsQuery(t *testing.T) { keeper, ctx := testkeeper.FeeburnerKeeper(t) wctx := sdk.WrapSDKContext(ctx) params := types.DefaultParams() - keeper.SetParams(ctx, params) + err := keeper.SetParams(ctx, params) + require.NoError(t, err) response, err := keeper.Params(wctx, &types.QueryParamsRequest{}) require.NoError(t, err) diff --git a/x/feeburner/keeper/params_test.go b/x/feeburner/keeper/params_test.go index c3c07465d..e48cb6b1d 100644 --- a/x/feeburner/keeper/params_test.go +++ b/x/feeburner/keeper/params_test.go @@ -17,7 +17,8 @@ func TestGetParams(t *testing.T) { k, ctx := testkeeper.FeeburnerKeeper(t) params := types.DefaultParams() - k.SetParams(ctx, params) + err := k.SetParams(ctx, params) + require.NoError(t, err) require.EqualValues(t, params, k.GetParams(ctx)) } diff --git a/x/feerefunder/genesis.go b/x/feerefunder/genesis.go index da7c9af5f..ab40d2deb 100644 --- a/x/feerefunder/genesis.go +++ b/x/feerefunder/genesis.go @@ -10,7 +10,10 @@ import ( // InitGenesis initializes the module's state from a provided genesis state. func InitGenesis(ctx sdk.Context, k keeper.Keeper, genState types.GenesisState) { // this line is used by starport scaffolding # genesis/module/init - k.SetParams(ctx, genState.Params) + err := k.SetParams(ctx, genState.Params) + if err != nil { + panic(err) + } for _, info := range genState.FeeInfos { k.StoreFeeInfo(ctx, info) diff --git a/x/feerefunder/keeper/grpc_query_params_test.go b/x/feerefunder/keeper/grpc_query_params_test.go index a4527a0c3..4f185f9ea 100644 --- a/x/feerefunder/keeper/grpc_query_params_test.go +++ b/x/feerefunder/keeper/grpc_query_params_test.go @@ -15,7 +15,8 @@ func TestParamsQuery(t *testing.T) { keeper, ctx := testkeeper.FeeKeeper(t, nil, nil) wctx := sdk.WrapSDKContext(ctx) params := types.DefaultParams() - keeper.SetParams(ctx, params) + err := keeper.SetParams(ctx, params) + require.NoError(t, err) response, err := keeper.Params(wctx, &types.QueryParamsRequest{}) require.NoError(t, err) diff --git a/x/feerefunder/keeper/keeper_test.go b/x/feerefunder/keeper/keeper_test.go index c7db58d39..512acc7f6 100644 --- a/x/feerefunder/keeper/keeper_test.go +++ b/x/feerefunder/keeper/keeper_test.go @@ -30,13 +30,14 @@ const ( func TestKeeperCheckFees(t *testing.T) { k, ctx := testutil_keeper.FeeKeeper(t, nil, nil) - k.SetParams(ctx, types.Params{ + err := k.SetParams(ctx, types.Params{ MinFee: types.Fee{ RecvFee: nil, AckFee: sdk.NewCoins(sdk.NewCoin("denom1", sdk.NewInt(100)), sdk.NewCoin("denom2", sdk.NewInt(100))), TimeoutFee: sdk.NewCoins(sdk.NewCoin("denom1", sdk.NewInt(100)), sdk.NewCoin("denom2", sdk.NewInt(100))), }, }) + require.NoError(t, err) for _, tc := range []struct { desc string @@ -138,13 +139,14 @@ func TestKeeperLockFees(t *testing.T) { payer := sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress) - k.SetParams(ctx, types.Params{ + err := k.SetParams(ctx, types.Params{ MinFee: types.Fee{ RecvFee: nil, AckFee: sdk.NewCoins(sdk.NewCoin("denom1", sdk.NewInt(100)), sdk.NewCoin("denom2", sdk.NewInt(100))), TimeoutFee: sdk.NewCoins(sdk.NewCoin("denom1", sdk.NewInt(100)), sdk.NewCoin("denom2", sdk.NewInt(100))), }, }) + require.NoError(t, err) packet := types.PacketID{ ChannelId: "channel-0", @@ -153,7 +155,7 @@ func TestKeeperLockFees(t *testing.T) { } channelKeeper.EXPECT().GetChannel(ctx, packet.PortId, packet.ChannelId).Return(channeltypes.Channel{}, false) - err := k.LockFees(ctx, payer, packet, types.Fee{}) + err = k.LockFees(ctx, payer, packet, types.Fee{}) require.True(t, channeltypes.ErrChannelNotFound.Is(err)) channelKeeper.EXPECT().GetChannel(ctx, packet.PortId, packet.ChannelId).Return(channeltypes.Channel{}, true) diff --git a/x/feerefunder/keeper/params_test.go b/x/feerefunder/keeper/params_test.go index 890d21cb8..357e75a86 100644 --- a/x/feerefunder/keeper/params_test.go +++ b/x/feerefunder/keeper/params_test.go @@ -14,7 +14,10 @@ func TestGetParams(t *testing.T) { k, ctx := testkeeper.FeeKeeper(t, nil, nil) params := types.DefaultParams() - k.SetParams(ctx, params) + err := k.SetParams(ctx, params) + if err != nil { + panic(err) + } require.EqualValues(t, params, k.GetParams(ctx)) } diff --git a/x/interchainqueries/genesis.go b/x/interchainqueries/genesis.go index 83f0a6cff..9a89d22c5 100644 --- a/x/interchainqueries/genesis.go +++ b/x/interchainqueries/genesis.go @@ -25,7 +25,10 @@ func InitGenesis(ctx sdk.Context, k keeper.Keeper, genState types.GenesisState) } - k.SetParams(ctx, genState.Params) + err := k.SetParams(ctx, genState.Params) + if err != nil { + panic(err) + } } // ExportGenesis returns the capability module's exported genesis. diff --git a/x/interchainqueries/keeper/grpc_query_params_test.go b/x/interchainqueries/keeper/grpc_query_params_test.go index 14d651c2f..c111568c8 100644 --- a/x/interchainqueries/keeper/grpc_query_params_test.go +++ b/x/interchainqueries/keeper/grpc_query_params_test.go @@ -14,7 +14,8 @@ func TestParamsQuery(t *testing.T) { keeper, ctx := testkeeper.InterchainQueriesKeeper(t, nil, nil, nil, nil) wctx := sdk.WrapSDKContext(ctx) params := types.DefaultParams() - keeper.SetParams(ctx, params) + err := keeper.SetParams(ctx, params) + require.NoError(t, err) response, err := keeper.Params(wctx, &types.QueryParamsRequest{}) require.NoError(t, err) diff --git a/x/interchainqueries/keeper/keeper_test.go b/x/interchainqueries/keeper/keeper_test.go index 832f122af..e4f23a4e3 100644 --- a/x/interchainqueries/keeper/keeper_test.go +++ b/x/interchainqueries/keeper/keeper_test.go @@ -1539,12 +1539,13 @@ func (suite *KeeperTestSuite) TestTxQueriesCleanup() { limit := 50 params := iqkeeper.GetParams(ctx) params.TxQueryRemovalLimit = uint64(limit) - iqkeeper.SetParams(ctx, params) + err := iqkeeper.SetParams(ctx, params) + suite.Require().NoError(err) // create a query and add results for it var queryID uint64 = 1 query := iqtypes.RegisteredQuery{Id: queryID, QueryType: string(iqtypes.InterchainQueryTypeTX)} - err := iqkeeper.SaveQuery(ctx, &query) + err = iqkeeper.SaveQuery(ctx, &query) suite.Require().NoError(err) _, err = iqkeeper.GetQueryByID(ctx, queryID) suite.Require().NoError(err) @@ -1586,7 +1587,8 @@ func (suite *KeeperTestSuite) TestTxQueriesCleanup() { limit := 50 params := iqkeeper.GetParams(ctx) params.TxQueryRemovalLimit = uint64(limit) - iqkeeper.SetParams(ctx, params) + err := iqkeeper.SetParams(ctx, params) + suite.Require().NoError(err) limitOverflow := 10 txHashes := suite.buildTxHashes(limit + limitOverflow) @@ -1595,7 +1597,7 @@ func (suite *KeeperTestSuite) TestTxQueriesCleanup() { // create a query and add results for it var queryID1 uint64 = 1 query1 := iqtypes.RegisteredQuery{Id: queryID1, QueryType: string(iqtypes.InterchainQueryTypeTX)} - err := iqkeeper.SaveQuery(ctx, &query1) + err = iqkeeper.SaveQuery(ctx, &query1) suite.Require().NoError(err) _, err = iqkeeper.GetQueryByID(ctx, queryID1) suite.Require().NoError(err) @@ -1648,13 +1650,14 @@ func (suite *KeeperTestSuite) TestTxQueriesCleanup() { // set TxQueryRemovalLimit to a low value params := iqkeeper.GetParams(ctx) params.TxQueryRemovalLimit = 0 - iqkeeper.SetParams(ctx, params) + err := iqkeeper.SetParams(ctx, params) + suite.Require().NoError(err) suite.Require().Equal(uint64(0), iqkeeper.GetParams(ctx).TxQueryRemovalLimit) // create a query and add results for it var queryID uint64 = 1 query := iqtypes.RegisteredQuery{Id: queryID, QueryType: string(iqtypes.InterchainQueryTypeTX)} - err := iqkeeper.SaveQuery(ctx, &query) + err = iqkeeper.SaveQuery(ctx, &query) suite.Require().NoError(err) _, err = iqkeeper.GetQueryByID(ctx, queryID) suite.Require().NoError(err) @@ -1698,7 +1701,8 @@ func (suite *KeeperTestSuite) TestRemoveFreshlyCreatedICQ() { iqkeeper := suite.GetNeutronZoneApp(suite.ChainA).InterchainQueriesKeeper params := iqkeeper.GetParams(ctx) params.QuerySubmitTimeout = 5 - iqkeeper.SetParams(ctx, params) + err := iqkeeper.SetParams(ctx, params) + suite.Require().NoError(err) msgSrv := keeper.NewMsgServerImpl(iqkeeper) resRegister, err := msgSrv.RegisterInterchainQuery(sdk.WrapSDKContext(ctx), &iqtypes.MsgRegisterInterchainQuery{ diff --git a/x/interchainqueries/keeper/params_test.go b/x/interchainqueries/keeper/params_test.go index 0e20f971f..1b9f0af99 100644 --- a/x/interchainqueries/keeper/params_test.go +++ b/x/interchainqueries/keeper/params_test.go @@ -13,7 +13,8 @@ func TestGetParams(t *testing.T) { k, ctx := testkeeper.InterchainQueriesKeeper(t, nil, nil, nil, nil) params := types.DefaultParams() - k.SetParams(ctx, params) + err := k.SetParams(ctx, params) + require.NoError(t, err) require.EqualValues(t, params, k.GetParams(ctx)) } diff --git a/x/interchaintxs/genesis.go b/x/interchaintxs/genesis.go index 85201575b..6fb8a4a1c 100644 --- a/x/interchaintxs/genesis.go +++ b/x/interchaintxs/genesis.go @@ -10,7 +10,10 @@ import ( // InitGenesis initializes the capability module's state from a provided genesis // state. func InitGenesis(ctx sdk.Context, k keeper.Keeper, genState types.GenesisState) { - k.SetParams(ctx, genState.Params) + err := k.SetParams(ctx, genState.Params) + if err != nil { + panic(err) + } } // ExportGenesis returns the capability module's exported genesis. diff --git a/x/interchaintxs/keeper/grpc_query_params_test.go b/x/interchaintxs/keeper/grpc_query_params_test.go index e69f18e15..f10b653cd 100644 --- a/x/interchaintxs/keeper/grpc_query_params_test.go +++ b/x/interchaintxs/keeper/grpc_query_params_test.go @@ -14,7 +14,8 @@ func TestParamsQuery(t *testing.T) { keeper, ctx := testkeeper.InterchainTxsKeeper(t, nil, nil, nil, nil) wctx := sdk.WrapSDKContext(ctx) params := types.DefaultParams() - keeper.SetParams(ctx, params) + err := keeper.SetParams(ctx, params) + require.NoError(t, err) response, err := keeper.Params(wctx, nil) require.Error(t, err) diff --git a/x/interchaintxs/keeper/params_test.go b/x/interchaintxs/keeper/params_test.go index 672a637b4..02b110989 100644 --- a/x/interchaintxs/keeper/params_test.go +++ b/x/interchaintxs/keeper/params_test.go @@ -13,7 +13,8 @@ func TestGetParams(t *testing.T) { k, ctx := testkeeper.InterchainTxsKeeper(t, nil, nil, nil, nil) params := types.DefaultParams() - k.SetParams(ctx, params) + err := k.SetParams(ctx, params) + require.NoError(t, err) require.EqualValues(t, params, k.GetParams(ctx)) } diff --git a/x/tokenfactory/keeper/genesis.go b/x/tokenfactory/keeper/genesis.go index 3c311eedb..b3c950351 100644 --- a/x/tokenfactory/keeper/genesis.go +++ b/x/tokenfactory/keeper/genesis.go @@ -11,7 +11,10 @@ import ( func (k Keeper) InitGenesis(ctx sdk.Context, genState types.GenesisState) { k.CreateModuleAccount(ctx) - k.SetParams(ctx, genState.Params) + err := k.SetParams(ctx, genState.Params) + if err != nil { + panic(err) + } for _, genDenom := range genState.GetFactoryDenoms() { creator, _, err := types.DeconstructDenom(genDenom.GetDenom()) diff --git a/x/tokenfactory/keeper/genesis_test.go b/x/tokenfactory/keeper/genesis_test.go index 707214167..67a38e6f7 100644 --- a/x/tokenfactory/keeper/genesis_test.go +++ b/x/tokenfactory/keeper/genesis_test.go @@ -40,7 +40,8 @@ func (suite *KeeperTestSuite) TestGenesis() { } } - app.TokenFactoryKeeper.SetParams(context, types.Params{}) + err := app.TokenFactoryKeeper.SetParams(context, types.Params{}) + suite.Require().NoError(err) app.TokenFactoryKeeper.InitGenesis(context, genesisState) exportedGenesis := app.TokenFactoryKeeper.ExportGenesis(context) suite.Require().NotNil(exportedGenesis) diff --git a/x/tokenfactory/keeper/keeper_test.go b/x/tokenfactory/keeper/keeper_test.go index 116fa9fd0..4b7ef8397 100644 --- a/x/tokenfactory/keeper/keeper_test.go +++ b/x/tokenfactory/keeper/keeper_test.go @@ -50,10 +50,11 @@ func (suite *KeeperTestSuite) Setup() { suite.queryClient = types.NewQueryClient(suite.QueryHelper) tokeFactoryKeeper := suite.GetNeutronZoneApp(suite.ChainA).TokenFactoryKeeper - tokeFactoryKeeper.SetParams(suite.ChainA.GetContext(), types.NewParams( + err := tokeFactoryKeeper.SetParams(suite.ChainA.GetContext(), types.NewParams( sdktypes.NewCoins(sdktypes.NewInt64Coin(types.DefaultNeutronDenom, TopUpCoinsAmount)), FeeCollectorAddress, )) + suite.Require().NoError(err) suite.msgServer = keeper.NewMsgServerImpl(*tokeFactoryKeeper) } From 2973f3614fe9d03ed6ffe4f91b4a167cc56d00fa Mon Sep 17 00:00:00 2001 From: nhpd Date: Fri, 28 Jul 2023 19:20:21 +0400 Subject: [PATCH 011/307] more cleanup --- app/genesis.go | 2 +- ...posals_allowlist_test.go => proposals_allowlisting_test.go} | 0 app/upgrades/types.go | 3 +-- 3 files changed, 2 insertions(+), 3 deletions(-) rename app/{proposals_allowlist_test.go => proposals_allowlisting_test.go} (100%) diff --git a/app/genesis.go b/app/genesis.go index 9105628e9..41d5e2ab6 100644 --- a/app/genesis.go +++ b/app/genesis.go @@ -43,7 +43,7 @@ func NewDefaultGenesisState(cdc codec.JSONCodec) GenesisState { } globalFeeGenesisStateBytes, err := json.Marshal(globalFeeGenesisState) if err != nil { - panic("cannot marshal global fee genesis state") + panic("cannot marshal globalfee genesis state for tests") } genesisState["globalfee"] = globalFeeGenesisStateBytes diff --git a/app/proposals_allowlist_test.go b/app/proposals_allowlisting_test.go similarity index 100% rename from app/proposals_allowlist_test.go rename to app/proposals_allowlisting_test.go diff --git a/app/upgrades/types.go b/app/upgrades/types.go index 373c62838..91fe12f10 100644 --- a/app/upgrades/types.go +++ b/app/upgrades/types.go @@ -3,7 +3,6 @@ package upgrades import ( "github.com/cosmos/cosmos-sdk/codec" store "github.com/cosmos/cosmos-sdk/store/types" - storetypes "github.com/cosmos/cosmos-sdk/store/types" "github.com/cosmos/cosmos-sdk/types/module" capabilitykeeper "github.com/cosmos/cosmos-sdk/x/capability/keeper" paramskeeper "github.com/cosmos/cosmos-sdk/x/params/keeper" @@ -48,5 +47,5 @@ type UpgradeKeepers struct { } type StoreKeys interface { - GetKey(string) *storetypes.KVStoreKey + GetKey(string) *store.KVStoreKey } From 6678a44f904c58bef39f80e7719d8904b3e42aa8 Mon Sep 17 00:00:00 2001 From: nhpd Date: Wed, 26 Jul 2023 15:56:01 +0400 Subject: [PATCH 012/307] set default commit timeout to 1 second --- cmd/neutrond/root.go | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/cmd/neutrond/root.go b/cmd/neutrond/root.go index 401939e8b..bd3199d12 100644 --- a/cmd/neutrond/root.go +++ b/cmd/neutrond/root.go @@ -37,6 +37,7 @@ import ( "io" "os" "path/filepath" + "time" tmcfg "github.com/cometbft/cometbft/config" "github.com/neutron-org/neutron/app" @@ -86,7 +87,14 @@ func NewRootCmd() (*cobra.Command, params.EncodingConfig) { } customTemplate, customNeutronConfig := initAppConfig() - return server.InterceptConfigsPreRunHandler(cmd, customTemplate, customNeutronConfig, tmcfg.DefaultConfig()) + err = server.InterceptConfigsPreRunHandler(cmd, customTemplate, customNeutronConfig, tmcfg.DefaultConfig()) + if err != nil { + return err + } + + setTimeoutCommit(cmd) + + return nil }, } @@ -95,6 +103,15 @@ func NewRootCmd() (*cobra.Command, params.EncodingConfig) { return rootCmd, encodingConfig } +// setTimeoutCommit sets default `Consensus.TimeoutCommit` to 1 second, if it was set to cosmos sdk default of 5 seconds +func setTimeoutCommit(cmd *cobra.Command) { + serverCtxPtr := server.GetServerContextFromCmd(cmd) + + if serverCtxPtr.Config.Consensus.TimeoutCommit == 5*time.Second { + serverCtxPtr.Config.Consensus.TimeoutCommit = 1 * time.Second + } +} + func initAppConfig() (string, interface{}) { srvCfg := serverconfig.DefaultConfig() From d02aa9d772b4333917c694ca812172a8ad98ba39 Mon Sep 17 00:00:00 2001 From: swelf Date: Tue, 1 Aug 2023 02:27:15 +0300 Subject: [PATCH 013/307] linter --- app/ante_handler.go | 17 +- app/app.go | 13 +- app/export.go | 2 +- app/proposals_allowlisting.go | 26 +-- app/simulation_test.go | 2 +- app/upgrades/nextupgrade/upgrades.go | 1 + app/upgrades/types.go | 3 +- app/upgrades/v0.4.4/upgrades.go | 1 + cmd/neutrond/consumer.go | 9 +- cmd/neutrond/root.go | 8 +- go.sum | 2 + testutil/consumer/test_helpers.go | 17 +- testutil/contractmanager/network/network.go | 3 +- testutil/cron/network/network.go | 5 +- testutil/interchainqueries/network/network.go | 5 +- .../interchaintxs/keeper/interchaintxs.go | 2 +- testutil/interchaintxs/network/network.go | 5 +- wasmbinding/bindings/msg.go | 12 +- wasmbinding/custom_querier.go | 38 ++-- wasmbinding/message_plugin.go | 114 ++++++------ wasmbinding/queries.go | 6 +- .../keeper/grpc_query_params_test.go | 2 +- x/contractmanager/keeper/keeper.go | 1 - x/contractmanager/module.go | 3 +- x/contractmanager/types/errors.go | 4 +- x/cron/keeper/grpc_query_params_test.go | 2 +- x/cron/keeper/keeper.go | 3 +- x/cron/keeper/keeper_test.go | 2 +- x/cron/module.go | 3 +- x/cron/types/errors.go | 4 +- x/feeburner/keeper/keeper.go | 10 +- x/feeburner/module.go | 3 +- x/feeburner/types/errors.go | 4 +- x/feeburner/types/keys.go | 4 +- x/feerefunder/keeper/grpc_query.go | 4 +- x/feerefunder/keeper/keeper.go | 36 ++-- x/feerefunder/keeper/keeper_test.go | 15 +- x/feerefunder/module.go | 3 +- x/feerefunder/types/codec.go | 3 +- x/feerefunder/types/fee.go | 8 +- x/feerefunder/types/genesis.go | 5 +- x/feerefunder/types/tx.pb.go | 162 +++++++++--------- x/ibc-hooks/ibc_middleware_test.go | 6 +- x/ibc-hooks/ibc_module.go | 2 +- x/ibc-hooks/ics4_middleware.go | 6 +- x/ibc-hooks/sdkmodule.go | 4 +- x/ibc-hooks/types/errors.go | 16 +- x/interchainqueries/handler.go | 4 +- x/interchainqueries/keeper/grpc_query.go | 13 +- x/interchainqueries/keeper/keeper.go | 31 ++-- x/interchainqueries/keeper/keeper_test.go | 3 +- x/interchainqueries/keeper/msg_server.go | 63 +++---- .../keeper/process_block_results.go | 51 +++--- .../keeper/process_block_results_test.go | 2 - x/interchainqueries/module.go | 3 +- x/interchainqueries/types/errors.go | 46 ++--- x/interchainqueries/types/genesis.go | 12 +- .../types/message_remove_interchain_query.go | 8 +- x/interchainqueries/types/registered_query.go | 4 +- x/interchainqueries/types/tx.go | 52 +++--- x/interchainqueries/types/verify.go | 2 +- x/interchaintxs/handler.go | 4 +- .../keeper/grpc_query_interchainaccount.go | 10 +- x/interchaintxs/keeper/ibc_handlers.go | 12 +- x/interchaintxs/keeper/msg_server.go | 30 ++-- x/interchaintxs/keeper/msg_server_test.go | 16 +- x/interchaintxs/module.go | 3 +- x/interchaintxs/types/errors.go | 22 +-- x/interchaintxs/types/keys.go | 4 +- x/interchaintxs/types/tx.go | 8 +- x/interchaintxs/types/types.go | 9 +- x/tokenfactory/keeper/createdenom.go | 19 +- x/tokenfactory/keeper/keeper.go | 9 +- x/tokenfactory/keeper/keeper_test.go | 4 +- x/tokenfactory/module.go | 3 +- x/tokenfactory/types/denoms.go | 9 +- x/tokenfactory/types/errors.go | 24 +-- x/tokenfactory/types/genesis.go | 6 +- x/tokenfactory/types/msgs.go | 25 +-- x/transfer/ibc_handlers.go | 12 +- x/transfer/keeper/keeper.go | 8 +- x/transfer/module.go | 11 +- x/transfer/types/tx.go | 1 + 83 files changed, 607 insertions(+), 542 deletions(-) diff --git a/app/ante_handler.go b/app/ante_handler.go index eefe35963..9f9e55bcb 100644 --- a/app/ante_handler.go +++ b/app/ante_handler.go @@ -1,14 +1,15 @@ package app import ( + "cosmossdk.io/errors" wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" wasmTypes "github.com/CosmWasm/wasmd/x/wasm/types" "github.com/cometbft/cometbft/libs/log" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/cosmos/cosmos-sdk/x/auth/ante" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" + gaiaerrors "github.com/cosmos/gaia/v11/types/errors" ibcante "github.com/cosmos/ibc-go/v7/modules/core/ante" ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper" consumerante "github.com/cosmos/interchain-security/v3/app/consumer/ante" @@ -43,22 +44,22 @@ type HandlerOptions struct { func NewAnteHandler(options HandlerOptions, logger log.Logger) (sdk.AnteHandler, error) { if options.AccountKeeper == nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrLogic, "account keeper is required for AnteHandler") + return nil, errors.Wrap(gaiaerrors.ErrLogic, "account keeper is required for AnteHandler") } if options.BankKeeper == nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrLogic, "bank keeper is required for AnteHandler") + return nil, errors.Wrap(gaiaerrors.ErrLogic, "bank keeper is required for AnteHandler") } if options.SignModeHandler == nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrLogic, "sign mode handler is required for ante builder") + return nil, errors.Wrap(gaiaerrors.ErrLogic, "sign mode handler is required for ante builder") } if options.WasmConfig == nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrLogic, "wasm config is required for ante builder") + return nil, errors.Wrap(gaiaerrors.ErrLogic, "wasm config is required for ante builder") } if options.TXCounterStoreKey == nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrLogic, "tx counter key is required for ante builder") + return nil, errors.Wrap(gaiaerrors.ErrLogic, "tx counter key is required for ante builder") } if options.GlobalFeeSubspace.Name() == "" { - return nil, sdkerrors.Wrap(sdkerrors.ErrNotFound, "globalfee param store is required for AnteHandler") + return nil, errors.Wrap(gaiaerrors.ErrNotFound, "globalfee param store is required for AnteHandler") } sigGasConsumer := options.SigGasConsumer @@ -79,7 +80,7 @@ func NewAnteHandler(options HandlerOptions, logger log.Logger) (sdk.AnteHandler, // We are providing options.GlobalFeeSubspace because we do not have staking module // In this case you should be sure that you implemented upgrade to set default global fee param and it SHOULD contain at least one record // otherwise you will get panic - //globalfeeante.NewFeeDecorator(options.GlobalFeeSubspace, nil), + // globalfeeante.NewFeeDecorator(options.GlobalFeeSubspace, nil), ante.NewDeductFeeDecorator(options.AccountKeeper, options.BankKeeper, options.FeegrantKeeper, options.TxFeeChecker), // SetPubKeyDecorator must be called before all signature verification decorators diff --git a/app/app.go b/app/app.go index 0102f5de5..b98f63ccb 100644 --- a/app/app.go +++ b/app/app.go @@ -2,6 +2,13 @@ package app import ( "fmt" + "io" + "io/fs" + "net/http" + "os" + "path/filepath" + "strings" + wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" "github.com/cosmos/cosmos-sdk/runtime" "github.com/cosmos/cosmos-sdk/x/genutil" @@ -15,12 +22,6 @@ import ( builderkeeper "github.com/skip-mev/pob/x/builder/keeper" rewardsaddressprovider "github.com/skip-mev/pob/x/builder/rewards_address_provider" buildertypes "github.com/skip-mev/pob/x/builder/types" - "io" - "io/fs" - "net/http" - "os" - "path/filepath" - "strings" "github.com/neutron-org/neutron/app/upgrades" "github.com/neutron-org/neutron/app/upgrades/nextupgrade" diff --git a/app/export.go b/app/export.go index 8d437fdcb..f6f86626f 100644 --- a/app/export.go +++ b/app/export.go @@ -14,7 +14,7 @@ import ( // ExportAppStateAndValidators exports the state of the application for a genesis // file. func (app *App) ExportAppStateAndValidators( - forZeroHeight bool, jailAllowedAddrs []string, modulesToExport []string, + forZeroHeight bool, jailAllowedAddrs, modulesToExport []string, ) (servertypes.ExportedApp, error) { // as if they could withdraw from the start of the next block ctx := app.NewContext(true, tmproto.Header{Height: app.LastBlockHeight()}) diff --git a/app/proposals_allowlisting.go b/app/proposals_allowlisting.go index 26022eac5..ce9c3ed3c 100644 --- a/app/proposals_allowlisting.go +++ b/app/proposals_allowlisting.go @@ -53,27 +53,27 @@ var WhitelistedParams = map[paramChangeKey]struct{}{ {Subspace: icahosttypes.SubModuleName, Key: string(icahosttypes.KeyHostEnabled)}: {}, {Subspace: icahosttypes.SubModuleName, Key: string(icahosttypes.KeyAllowMessages)}: {}, // cosmwasm - //{Subspace: wasmtypes.ModuleName, Key: string(wasmtypes.ParamStoreKeyUploadAccess)}: {}, - //{Subspace: wasmtypes.ModuleName, Key: string(wasmtypes.ParamStoreKeyInstantiateAccess)}: {}, + // {Subspace: wasmtypes.ModuleName, Key: string(wasmtypes.ParamStoreKeyUploadAccess)}: {}, + // {Subspace: wasmtypes.ModuleName, Key: string(wasmtypes.ParamStoreKeyInstantiateAccess)}: {}, // feerefunder - //{Subspace: feerefundertypes.ModuleName, Key: string(feerefundertypes.KeyFees)}: {}, + // {Subspace: feerefundertypes.ModuleName, Key: string(feerefundertypes.KeyFees)}: {}, // interchaintxs - //{Subspace: interchaintxstypes.ModuleName, Key: string(interchaintxstypes.KeyMsgSubmitTxMaxMessages)}: {}, + // {Subspace: interchaintxstypes.ModuleName, Key: string(interchaintxstypes.KeyMsgSubmitTxMaxMessages)}: {}, // interchainqueries - //{Subspace: interchainqueriestypes.ModuleName, Key: string(interchainqueriestypes.KeyQuerySubmitTimeout)}: {}, - //{Subspace: interchainqueriestypes.ModuleName, Key: string(interchainqueriestypes.KeyQueryDeposit)}: {}, - //{Subspace: interchainqueriestypes.ModuleName, Key: string(interchainqueriestypes.KeyTxQueryRemovalLimit)}: {}, + // {Subspace: interchainqueriestypes.ModuleName, Key: string(interchainqueriestypes.KeyQuerySubmitTimeout)}: {}, + // {Subspace: interchainqueriestypes.ModuleName, Key: string(interchainqueriestypes.KeyQueryDeposit)}: {}, + // {Subspace: interchainqueriestypes.ModuleName, Key: string(interchainqueriestypes.KeyTxQueryRemovalLimit)}: {}, // feeburner - //{Subspace: feeburnertypes.ModuleName, Key: string(feeburnertypes.KeyTreasuryAddress)}: {}, - //{Subspace: feeburnertypes.ModuleName, Key: string(feeburnertypes.KeyNeutronDenom)}: {}, + // {Subspace: feeburnertypes.ModuleName, Key: string(feeburnertypes.KeyTreasuryAddress)}: {}, + // {Subspace: feeburnertypes.ModuleName, Key: string(feeburnertypes.KeyNeutronDenom)}: {}, // tokenfactory - //{Subspace: tokenfactorytypes.ModuleName, Key: string(tokenfactorytypes.KeyDenomCreationFee)}: {}, - //{Subspace: tokenfactorytypes.ModuleName, Key: string(tokenfactorytypes.KeyFeeCollectorAddress)}: {}, + // {Subspace: tokenfactorytypes.ModuleName, Key: string(tokenfactorytypes.KeyDenomCreationFee)}: {}, + // {Subspace: tokenfactorytypes.ModuleName, Key: string(tokenfactorytypes.KeyFeeCollectorAddress)}: {}, // globalfee {Subspace: globalfeetypes.ModuleName, Key: string(globalfeetypes.ParamStoreKeyMinGasPrices)}: {}, // cron - //{Subspace: crontypes.ModuleName, Key: string(crontypes.KeySecurityAddress)}: {}, - //{Subspace: crontypes.ModuleName, Key: string(crontypes.KeyLimit)}: {}, + // {Subspace: crontypes.ModuleName, Key: string(crontypes.KeySecurityAddress)}: {}, + // {Subspace: crontypes.ModuleName, Key: string(crontypes.KeyLimit)}: {}, // packet-forward-middleware {Subspace: packetforwardmiddlewaretypes.ModuleName, Key: string(packetforwardmiddlewaretypes.KeyFeePercentage)}: {}, } diff --git a/app/simulation_test.go b/app/simulation_test.go index 38200832e..120de63ae 100644 --- a/app/simulation_test.go +++ b/app/simulation_test.go @@ -4,7 +4,7 @@ package app_test // at the moment latest ibc-go release requires outdated app interface in the `simapp.SimulationOperations` method // -//import ( +// import ( // "github.com/cosmos/cosmos-sdk/server/types" // "github.com/cosmos/ibc-go/v7/testing/simapp" // "os" diff --git a/app/upgrades/nextupgrade/upgrades.go b/app/upgrades/nextupgrade/upgrades.go index 7db80ca43..e1d25c60b 100644 --- a/app/upgrades/nextupgrade/upgrades.go +++ b/app/upgrades/nextupgrade/upgrades.go @@ -2,6 +2,7 @@ package nextupgrade import ( "errors" + "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/app/upgrades/types.go b/app/upgrades/types.go index 373c62838..91fe12f10 100644 --- a/app/upgrades/types.go +++ b/app/upgrades/types.go @@ -3,7 +3,6 @@ package upgrades import ( "github.com/cosmos/cosmos-sdk/codec" store "github.com/cosmos/cosmos-sdk/store/types" - storetypes "github.com/cosmos/cosmos-sdk/store/types" "github.com/cosmos/cosmos-sdk/types/module" capabilitykeeper "github.com/cosmos/cosmos-sdk/x/capability/keeper" paramskeeper "github.com/cosmos/cosmos-sdk/x/params/keeper" @@ -48,5 +47,5 @@ type UpgradeKeepers struct { } type StoreKeys interface { - GetKey(string) *storetypes.KVStoreKey + GetKey(string) *store.KVStoreKey } diff --git a/app/upgrades/v0.4.4/upgrades.go b/app/upgrades/v0.4.4/upgrades.go index 82b1ca804..63beac5c0 100644 --- a/app/upgrades/v0.4.4/upgrades.go +++ b/app/upgrades/v0.4.4/upgrades.go @@ -2,6 +2,7 @@ package v044 import ( "errors" + "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" diff --git a/cmd/neutrond/consumer.go b/cmd/neutrond/consumer.go index 0db98e88e..8f456110c 100644 --- a/cmd/neutrond/consumer.go +++ b/cmd/neutrond/consumer.go @@ -4,6 +4,8 @@ import ( "encoding/json" "fmt" + "cosmossdk.io/errors" + types1 "github.com/cometbft/cometbft/abci/types" pvm "github.com/cometbft/cometbft/privval" tmtypes "github.com/cometbft/cometbft/types" @@ -11,7 +13,6 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" "github.com/cosmos/cosmos-sdk/server" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/cosmos/cosmos-sdk/x/genutil" genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types" ccvconsumertypes "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types" @@ -51,7 +52,7 @@ func AddConsumerSectionCmd(defaultNodeHome string) *cobra.Command { initialValset := []types1.ValidatorUpdate{{PubKey: tmProtoPublicKey, Power: 100}} vals, err := tmtypes.PB2TM.ValidatorUpdates(initialValset) if err != nil { - return sdkerrors.Wrap(err, "could not convert val updates to validator set") + return errors.Wrap(err, "could not convert val updates to validator set") } genesisState.InitialValSet = initialValset @@ -96,13 +97,13 @@ func (x DefaultGenesisIO) AlterConsumerModuleState(cmd *cobra.Command, callback clientCtx := client.GetClientContextFromCmd(cmd) consumerGenStateBz, err := clientCtx.Codec.MarshalJSON(g.ConsumerModuleState) if err != nil { - return sdkerrors.Wrap(err, "marshal consumer genesis state") + return errors.Wrap(err, "marshal consumer genesis state") } g.AppState[ccvconsumertypes.ModuleName] = consumerGenStateBz appStateJSON, err := json.Marshal(g.AppState) if err != nil { - return sdkerrors.Wrap(err, "marshal application genesis state") + return errors.Wrap(err, "marshal application genesis state") } g.GenDoc.AppState = appStateJSON diff --git a/cmd/neutrond/root.go b/cmd/neutrond/root.go index 401939e8b..0c380d3f0 100644 --- a/cmd/neutrond/root.go +++ b/cmd/neutrond/root.go @@ -3,6 +3,10 @@ package main import ( "errors" "fmt" + "io" + "os" + "path/filepath" + "github.com/CosmWasm/wasmd/x/wasm" wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" dbm "github.com/cometbft/cometbft-db" @@ -34,9 +38,6 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/spf13/cast" "github.com/spf13/cobra" - "io" - "os" - "path/filepath" tmcfg "github.com/cometbft/cometbft/config" "github.com/neutron-org/neutron/app" @@ -262,6 +263,7 @@ func (ac appCreator) newApp( baseapp.SetChainID(chainID), ) } + func (ac appCreator) appExport( logger log.Logger, db dbm.DB, diff --git a/go.sum b/go.sum index 5d3442aab..dff626cb7 100644 --- a/go.sum +++ b/go.sum @@ -800,6 +800,7 @@ github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/u github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= +github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/jsternberg/zap-logfmt v1.0.0/go.mod h1:uvPs/4X51zdkcm5jXl5SYoN+4RK21K8mysFmDaM/h+o= @@ -912,6 +913,7 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= +github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5/go.mod h1:caMODM3PzxT8aQXRPkAt8xlV/e7d7w8GM5g0fa5F0D8= github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae/go.mod h1:qAyveg+e4CE+eKJXWVjKXM4ck2QobLqTDytGJbLLhJg= github.com/mtibben/percent v0.2.1 h1:5gssi8Nqo8QU/r2pynCm+hBQHpkB/uNK7BJCFogWdzs= diff --git a/testutil/consumer/test_helpers.go b/testutil/consumer/test_helpers.go index 1d61e9d4d..14090e8fe 100644 --- a/testutil/consumer/test_helpers.go +++ b/testutil/consumer/test_helpers.go @@ -4,10 +4,11 @@ import ( "encoding/json" "time" + "cosmossdk.io/errors" + types1 "github.com/cometbft/cometbft/abci/types" tmtypes "github.com/cometbft/cometbft/types" cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/cosmos/cosmos-sdk/x/genutil" genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types" ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" @@ -48,18 +49,18 @@ func ModifyConsumerGenesis(val network.Validator) error { genFile := val.Ctx.Config.GenesisFile() appState, genDoc, err := genutiltypes.GenesisStateFromGenFile(genFile) if err != nil { - return sdkerrors.Wrap(err, "failed to read genesis from the file") + return errors.Wrap(err, "failed to read genesis from the file") } tmProtoPublicKey, err := cryptocodec.ToTmProtoPublicKey(val.PubKey) if err != nil { - return sdkerrors.Wrap(err, "invalid public key") + return errors.Wrap(err, "invalid public key") } initialValset := []types1.ValidatorUpdate{{PubKey: tmProtoPublicKey, Power: 100}} vals, err := tmtypes.PB2TM.ValidatorUpdates(initialValset) if err != nil { - return sdkerrors.Wrap(err, "could not convert val updates to validator set") + return errors.Wrap(err, "could not convert val updates to validator set") } consumerGenesisState := CreateMinimalConsumerTestGenesis() @@ -67,24 +68,24 @@ func ModifyConsumerGenesis(val network.Validator) error { consumerGenesisState.ProviderConsensusState.NextValidatorsHash = tmtypes.NewValidatorSet(vals).Hash() if err := consumerGenesisState.Validate(); err != nil { - return sdkerrors.Wrap(err, "invalid consumer genesis") + return errors.Wrap(err, "invalid consumer genesis") } consumerGenStateBz, err := val.ClientCtx.Codec.MarshalJSON(consumerGenesisState) if err != nil { - return sdkerrors.Wrap(err, "failed to marshal consumer genesis state into JSON") + return errors.Wrap(err, "failed to marshal consumer genesis state into JSON") } appState[ccvconsumertypes.ModuleName] = consumerGenStateBz appStateJSON, err := json.Marshal(appState) if err != nil { - return sdkerrors.Wrap(err, "failed to marshal application genesis state into JSON") + return errors.Wrap(err, "failed to marshal application genesis state into JSON") } genDoc.AppState = appStateJSON err = genutil.ExportGenesisFile(genDoc, genFile) if err != nil { - return sdkerrors.Wrap(err, "failed to export genesis state") + return errors.Wrap(err, "failed to export genesis state") } return nil diff --git a/testutil/contractmanager/network/network.go b/testutil/contractmanager/network/network.go index a833bc317..10ee719d7 100644 --- a/testutil/contractmanager/network/network.go +++ b/testutil/contractmanager/network/network.go @@ -2,10 +2,11 @@ package network import ( "fmt" - "github.com/stretchr/testify/require" "testing" "time" + "github.com/stretchr/testify/require" + tmdb "github.com/cometbft/cometbft-db" tmrand "github.com/cometbft/cometbft/libs/rand" "github.com/cosmos/cosmos-sdk/baseapp" diff --git a/testutil/cron/network/network.go b/testutil/cron/network/network.go index a5a9a34fc..c7c49cb54 100644 --- a/testutil/cron/network/network.go +++ b/testutil/cron/network/network.go @@ -2,11 +2,12 @@ package network import ( "fmt" - pruningtypes "github.com/cosmos/cosmos-sdk/store/pruning/types" - "github.com/stretchr/testify/require" "testing" "time" + pruningtypes "github.com/cosmos/cosmos-sdk/store/pruning/types" + "github.com/stretchr/testify/require" + "github.com/cosmos/cosmos-sdk/x/genutil" genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types" staking "github.com/cosmos/cosmos-sdk/x/staking" diff --git a/testutil/interchainqueries/network/network.go b/testutil/interchainqueries/network/network.go index b19569eed..fa00f6254 100644 --- a/testutil/interchainqueries/network/network.go +++ b/testutil/interchainqueries/network/network.go @@ -2,11 +2,12 @@ package network import ( "fmt" - pruningtypes "github.com/cosmos/cosmos-sdk/store/pruning/types" - "github.com/stretchr/testify/require" "testing" "time" + pruningtypes "github.com/cosmos/cosmos-sdk/store/pruning/types" + "github.com/stretchr/testify/require" + tmdb "github.com/cometbft/cometbft-db" tmrand "github.com/cometbft/cometbft/libs/rand" "github.com/cosmos/cosmos-sdk/baseapp" diff --git a/testutil/interchaintxs/keeper/interchaintxs.go b/testutil/interchaintxs/keeper/interchaintxs.go index 0df55e792..4fcb31475 100644 --- a/testutil/interchaintxs/keeper/interchaintxs.go +++ b/testutil/interchaintxs/keeper/interchaintxs.go @@ -44,7 +44,7 @@ func InterchainTxsKeeper(t testing.TB, managerKeeper types.ContractManagerKeeper // Initialize params err := k.SetParams(ctx, types.DefaultParams()) - require.NoError(t,err) + require.NoError(t, err) return k, ctx } diff --git a/testutil/interchaintxs/network/network.go b/testutil/interchaintxs/network/network.go index af5e0099c..75e49dd3f 100644 --- a/testutil/interchaintxs/network/network.go +++ b/testutil/interchaintxs/network/network.go @@ -2,11 +2,12 @@ package network import ( "fmt" - pruningtypes "github.com/cosmos/cosmos-sdk/store/pruning/types" - "github.com/stretchr/testify/require" "testing" "time" + pruningtypes "github.com/cosmos/cosmos-sdk/store/pruning/types" + "github.com/stretchr/testify/require" + tmdb "github.com/cometbft/cometbft-db" tmrand "github.com/cometbft/cometbft/libs/rand" "github.com/cosmos/cosmos-sdk/baseapp" diff --git a/wasmbinding/bindings/msg.go b/wasmbinding/bindings/msg.go index cbc2a401b..8dcccba8f 100644 --- a/wasmbinding/bindings/msg.go +++ b/wasmbinding/bindings/msg.go @@ -2,10 +2,10 @@ package bindings import ( + "cosmossdk.io/math" cosmostypes "github.com/cosmos/cosmos-sdk/codec/types" paramChange "github.com/cosmos/cosmos-sdk/x/params/types/proposal" - sdk "github.com/cosmos/cosmos-sdk/types" feetypes "github.com/neutron-org/neutron/x/feerefunder/types" icqtypes "github.com/neutron-org/neutron/x/interchainqueries/types" transferwrappertypes "github.com/neutron-org/neutron/x/transfer/types" @@ -200,14 +200,14 @@ type ChangeAdmin struct { } type MintTokens struct { - Denom string `json:"denom"` - Amount sdk.Int `json:"amount"` - MintToAddress string `json:"mint_to_address"` + Denom string `json:"denom"` + Amount math.Int `json:"amount"` + MintToAddress string `json:"mint_to_address"` } type BurnTokens struct { - Denom string `json:"denom"` - Amount sdk.Int `json:"amount"` + Denom string `json:"denom"` + Amount math.Int `json:"amount"` // BurnFromAddress must be set to "" for now. BurnFromAddress string `json:"burn_from_address"` } diff --git a/wasmbinding/custom_querier.go b/wasmbinding/custom_querier.go index 787110205..bf22446a9 100644 --- a/wasmbinding/custom_querier.go +++ b/wasmbinding/custom_querier.go @@ -3,10 +3,10 @@ package wasmbinding import ( "encoding/json" + "cosmossdk.io/errors" + wasmvmtypes "github.com/CosmWasm/wasmvm/types" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/neutron-org/neutron/wasmbinding/bindings" ) @@ -15,7 +15,7 @@ func CustomQuerier(qp *QueryPlugin) func(ctx sdk.Context, request json.RawMessag return func(ctx sdk.Context, request json.RawMessage) ([]byte, error) { var contractQuery bindings.NeutronQuery if err := json.Unmarshal(request, &contractQuery); err != nil { - return nil, sdkerrors.Wrapf(err, "failed to unmarshal neutron query: %v", err) + return nil, errors.Wrapf(err, "failed to unmarshal neutron query: %v", err) } switch { @@ -24,12 +24,12 @@ func CustomQuerier(qp *QueryPlugin) func(ctx sdk.Context, request json.RawMessag response, err := qp.GetInterchainQueryResult(ctx, queryID) if err != nil { - return nil, sdkerrors.Wrapf(err, "failed to get interchain query result: %v", err) + return nil, errors.Wrapf(err, "failed to get interchain query result: %v", err) } bz, err := json.Marshal(response) if err != nil { - return nil, sdkerrors.Wrapf(err, "failed to marshal interchain query result: %v", err) + return nil, errors.Wrapf(err, "failed to marshal interchain query result: %v", err) } return bz, nil @@ -37,60 +37,60 @@ func CustomQuerier(qp *QueryPlugin) func(ctx sdk.Context, request json.RawMessag interchainAccountAddress, err := qp.GetInterchainAccountAddress(ctx, contractQuery.InterchainAccountAddress) if err != nil { - return nil, sdkerrors.Wrapf(err, "failed to get interchain account address: %v", err) + return nil, errors.Wrapf(err, "failed to get interchain account address: %v", err) } bz, err := json.Marshal(interchainAccountAddress) if err != nil { - return nil, sdkerrors.Wrapf(err, "failed to marshal interchain account query response: %v", err) + return nil, errors.Wrapf(err, "failed to marshal interchain account query response: %v", err) } return bz, nil case contractQuery.RegisteredInterchainQueries != nil: registeredQueries, err := qp.GetRegisteredInterchainQueries(ctx, contractQuery.RegisteredInterchainQueries) if err != nil { - return nil, sdkerrors.Wrapf(err, "failed to get registered queries: %v", err) + return nil, errors.Wrapf(err, "failed to get registered queries: %v", err) } bz, err := json.Marshal(registeredQueries) if err != nil { - return nil, sdkerrors.Wrapf(err, "failed to marshal interchain account query response: %v", err) + return nil, errors.Wrapf(err, "failed to marshal interchain account query response: %v", err) } return bz, nil case contractQuery.RegisteredInterchainQuery != nil: registeredQuery, err := qp.GetRegisteredInterchainQuery(ctx, contractQuery.RegisteredInterchainQuery) if err != nil { - return nil, sdkerrors.Wrapf(err, "failed to get registered queries: %v", err) + return nil, errors.Wrapf(err, "failed to get registered queries: %v", err) } bz, err := json.Marshal(registeredQuery) if err != nil { - return nil, sdkerrors.Wrapf(err, "failed to marshal interchain account query response: %v", err) + return nil, errors.Wrapf(err, "failed to marshal interchain account query response: %v", err) } return bz, nil case contractQuery.TotalBurnedNeutronsAmount != nil: totalBurnedNeutrons, err := qp.GetTotalBurnedNeutronsAmount(ctx, contractQuery.TotalBurnedNeutronsAmount) if err != nil { - return nil, sdkerrors.Wrapf(err, "failed to get total burned neutrons amount: %v", err) + return nil, errors.Wrapf(err, "failed to get total burned neutrons amount: %v", err) } bz, err := json.Marshal(totalBurnedNeutrons) if err != nil { - return nil, sdkerrors.Wrapf(err, "failed to marshal total burned neutrons amount response: %v", err) + return nil, errors.Wrapf(err, "failed to marshal total burned neutrons amount response: %v", err) } return bz, nil case contractQuery.MinIbcFee != nil: minFee, err := qp.GetMinIbcFee(ctx, contractQuery.MinIbcFee) if err != nil { - return nil, sdkerrors.Wrapf(err, "failed to get min fee: %v", err) + return nil, errors.Wrapf(err, "failed to get min fee: %v", err) } bz, err := json.Marshal(minFee) if err != nil { - return nil, sdkerrors.Wrapf(err, "failed to marshal min fee response: %v", err) + return nil, errors.Wrapf(err, "failed to marshal min fee response: %v", err) } return bz, nil @@ -101,7 +101,7 @@ func CustomQuerier(qp *QueryPlugin) func(ctx sdk.Context, request json.RawMessag fullDenom, err := GetFullDenom(creator, subdenom) if err != nil { - return nil, sdkerrors.Wrap(err, "unable to get full denom") + return nil, errors.Wrap(err, "unable to get full denom") } res := bindings.FullDenomResponse{ @@ -110,7 +110,7 @@ func CustomQuerier(qp *QueryPlugin) func(ctx sdk.Context, request json.RawMessag bz, err := json.Marshal(res) if err != nil { - return nil, sdkerrors.Wrap(err, "failed to JSON marshal FullDenomResponse response.") + return nil, errors.Wrap(err, "failed to JSON marshal FullDenomResponse response.") } return bz, nil @@ -118,12 +118,12 @@ func CustomQuerier(qp *QueryPlugin) func(ctx sdk.Context, request json.RawMessag case contractQuery.DenomAdmin != nil: res, err := qp.GetDenomAdmin(ctx, contractQuery.DenomAdmin.Subdenom) if err != nil { - return nil, sdkerrors.Wrap(err, "unable to get denom admin") + return nil, errors.Wrap(err, "unable to get denom admin") } bz, err := json.Marshal(res) if err != nil { - return nil, sdkerrors.Wrap(err, "failed to JSON marshal DenomAdminResponse response.") + return nil, errors.Wrap(err, "failed to JSON marshal DenomAdminResponse response.") } return bz, nil diff --git a/wasmbinding/message_plugin.go b/wasmbinding/message_plugin.go index 9a176b68e..4fc27b93c 100644 --- a/wasmbinding/message_plugin.go +++ b/wasmbinding/message_plugin.go @@ -4,6 +4,8 @@ import ( "encoding/json" "fmt" + "cosmossdk.io/errors" + crontypes "github.com/neutron-org/neutron/x/cron/types" wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" @@ -85,7 +87,7 @@ func (m *CustomMessenger) DispatchMsg(ctx sdk.Context, contractAddr sdk.AccAddre "message", string(msg.Custom), "error", err, ) - return nil, nil, sdkerrors.Wrap(err, "failed to decode incoming custom cosmos message") + return nil, nil, errors.Wrap(err, "failed to decode incoming custom cosmos message") } if contractMsg.SubmitTx != nil { @@ -136,7 +138,7 @@ func (m *CustomMessenger) ibcTransfer(ctx sdk.Context, contractAddr sdk.AccAddre ibcTransferMsg.Sender = contractAddr.String() if err := ibcTransferMsg.ValidateBasic(); err != nil { - return nil, nil, sdkerrors.Wrap(err, "failed to validate ibcTransferMsg") + return nil, nil, errors.Wrap(err, "failed to validate ibcTransferMsg") } response, err := m.transferKeeper.Transfer(sdk.WrapSDKContext(ctx), &ibcTransferMsg) @@ -146,7 +148,7 @@ func (m *CustomMessenger) ibcTransfer(ctx sdk.Context, contractAddr sdk.AccAddre "msg", ibcTransferMsg, "error", err, ) - return nil, nil, sdkerrors.Wrap(err, "failed to execute IBCTransfer") + return nil, nil, errors.Wrap(err, "failed to execute IBCTransfer") } data, err := json.Marshal(response) @@ -156,7 +158,7 @@ func (m *CustomMessenger) ibcTransfer(ctx sdk.Context, contractAddr sdk.AccAddre "msg", response, "error", err, ) - return nil, nil, sdkerrors.Wrap(err, "marshal json failed") + return nil, nil, errors.Wrap(err, "marshal json failed") } ctx.Logger().Debug("ibcTransferMsg completed", @@ -174,7 +176,7 @@ func (m *CustomMessenger) updateInterchainQuery(ctx sdk.Context, contractAddr sd "msg", updateQuery, "error", err, ) - return nil, nil, sdkerrors.Wrap(err, "failed to update interchain query") + return nil, nil, errors.Wrap(err, "failed to update interchain query") } data, err := json.Marshal(response) @@ -184,7 +186,7 @@ func (m *CustomMessenger) updateInterchainQuery(ctx sdk.Context, contractAddr sd "msg", updateQuery, "error", err, ) - return nil, nil, sdkerrors.Wrap(err, "marshal json failed") + return nil, nil, errors.Wrap(err, "marshal json failed") } ctx.Logger().Debug("interchain query updated", @@ -204,12 +206,12 @@ func (m *CustomMessenger) performUpdateInterchainQuery(ctx sdk.Context, contract } if err := msg.ValidateBasic(); err != nil { - return nil, sdkerrors.Wrap(err, "failed to validate incoming UpdateInterchainQuery message") + return nil, errors.Wrap(err, "failed to validate incoming UpdateInterchainQuery message") } response, err := m.Icqmsgserver.UpdateInterchainQuery(sdk.WrapSDKContext(ctx), &msg) if err != nil { - return nil, sdkerrors.Wrap(err, "failed to update interchain query") + return nil, errors.Wrap(err, "failed to update interchain query") } return (*bindings.UpdateInterchainQueryResponse)(response), nil @@ -223,7 +225,7 @@ func (m *CustomMessenger) removeInterchainQuery(ctx sdk.Context, contractAddr sd "msg", removeQuery, "error", err, ) - return nil, nil, sdkerrors.Wrap(err, "failed to remove interchain query") + return nil, nil, errors.Wrap(err, "failed to remove interchain query") } data, err := json.Marshal(response) @@ -233,7 +235,7 @@ func (m *CustomMessenger) removeInterchainQuery(ctx sdk.Context, contractAddr sd "msg", removeQuery, "error", err, ) - return nil, nil, sdkerrors.Wrap(err, "marshal json failed") + return nil, nil, errors.Wrap(err, "marshal json failed") } ctx.Logger().Debug("interchain query removed", @@ -250,12 +252,12 @@ func (m *CustomMessenger) performRemoveInterchainQuery(ctx sdk.Context, contract } if err := msg.ValidateBasic(); err != nil { - return nil, sdkerrors.Wrap(err, "failed to validate incoming RemoveInterchainQuery message") + return nil, errors.Wrap(err, "failed to validate incoming RemoveInterchainQuery message") } response, err := m.Icqmsgserver.RemoveInterchainQuery(sdk.WrapSDKContext(ctx), &msg) if err != nil { - return nil, sdkerrors.Wrap(err, "failed to remove interchain query") + return nil, errors.Wrap(err, "failed to remove interchain query") } return (*bindings.RemoveInterchainQueryResponse)(response), nil @@ -270,7 +272,7 @@ func (m *CustomMessenger) submitTx(ctx sdk.Context, contractAddr sdk.AccAddress, "interchain_account_id", submitTx.InterchainAccountId, "error", err, ) - return nil, nil, sdkerrors.Wrap(err, "failed to submit interchain transaction") + return nil, nil, errors.Wrap(err, "failed to submit interchain transaction") } data, err := json.Marshal(response) @@ -281,7 +283,7 @@ func (m *CustomMessenger) submitTx(ctx sdk.Context, contractAddr sdk.AccAddress, "interchain_account_id", submitTx.InterchainAccountId, "error", err, ) - return nil, nil, sdkerrors.Wrap(err, "marshal json failed") + return nil, nil, errors.Wrap(err, "marshal json failed") } ctx.Logger().Debug("interchain transaction submitted", @@ -300,7 +302,7 @@ func (m *CustomMessenger) submitAdminProposal(ctx sdk.Context, contractAddr sdk. "creator", contractAddr.String(), "error", err, ) - return nil, nil, sdkerrors.Wrap(err, "failed to submit admin proposal") + return nil, nil, errors.Wrap(err, "failed to submit admin proposal") } data, err := json.Marshal(response) @@ -310,7 +312,7 @@ func (m *CustomMessenger) submitAdminProposal(ctx sdk.Context, contractAddr sdk. "creator", contractAddr.String(), "error", err, ) - return nil, nil, sdkerrors.Wrap(err, "marshal json failed") + return nil, nil, errors.Wrap(err, "marshal json failed") } ctx.Logger().Debug("submit proposal message submitted", @@ -326,7 +328,7 @@ func (m *CustomMessenger) performSubmitAdminProposal(ctx sdk.Context, contractAd err := m.validateProposalQty(&proposal) if err != nil { - return nil, sdkerrors.Wrap(err, "failed to validate proposal quantity") + return nil, errors.Wrap(err, "failed to validate proposal quantity") } if proposal.ParamChangeProposal != nil { p := proposal.ParamChangeProposal @@ -336,7 +338,7 @@ func (m *CustomMessenger) performSubmitAdminProposal(ctx sdk.Context, contractAd Changes: p.ParamChanges, }) if err != nil { - return nil, sdkerrors.Wrap(err, "failed to set content on ParameterChangeProposal") + return nil, errors.Wrap(err, "failed to set content on ParameterChangeProposal") } } @@ -352,7 +354,7 @@ func (m *CustomMessenger) performSubmitAdminProposal(ctx sdk.Context, contractAd }, }) if err != nil { - return nil, sdkerrors.Wrap(err, "failed to set content on SoftwareUpgradeProposal") + return nil, errors.Wrap(err, "failed to set content on SoftwareUpgradeProposal") } } @@ -363,7 +365,7 @@ func (m *CustomMessenger) performSubmitAdminProposal(ctx sdk.Context, contractAd Description: p.Description, }) if err != nil { - return nil, sdkerrors.Wrap(err, "failed to set content on CancelSoftwareUpgradeProposal") + return nil, errors.Wrap(err, "failed to set content on CancelSoftwareUpgradeProposal") } } @@ -380,7 +382,7 @@ func (m *CustomMessenger) performSubmitAdminProposal(ctx sdk.Context, contractAd UpgradedClientState: p.UpgradedClientState, }) if err != nil { - return nil, sdkerrors.Wrap(err, "failed to set content on UpgradeProposal") + return nil, errors.Wrap(err, "failed to set content on UpgradeProposal") } } @@ -393,7 +395,7 @@ func (m *CustomMessenger) performSubmitAdminProposal(ctx sdk.Context, contractAd SubstituteClientId: p.SubstituteClientId, }) if err != nil { - return nil, sdkerrors.Wrap(err, "failed to set content on ClientUpdateProposal") + return nil, errors.Wrap(err, "failed to set content on ClientUpdateProposal") } } @@ -405,7 +407,7 @@ func (m *CustomMessenger) performSubmitAdminProposal(ctx sdk.Context, contractAd CodeIDs: p.CodeIDs, }) if err != nil { - return nil, sdkerrors.Wrap(err, "failed to set content on PinCodesProposal") + return nil, errors.Wrap(err, "failed to set content on PinCodesProposal") } } @@ -417,7 +419,7 @@ func (m *CustomMessenger) performSubmitAdminProposal(ctx sdk.Context, contractAd CodeIDs: p.CodeIDs, }) if err != nil { - return nil, sdkerrors.Wrap(err, "failed to set content on UnpinCodesProposal") + return nil, errors.Wrap(err, "failed to set content on UnpinCodesProposal") } } @@ -430,7 +432,7 @@ func (m *CustomMessenger) performSubmitAdminProposal(ctx sdk.Context, contractAd Contract: p.Contract, }) if err != nil { - return nil, sdkerrors.Wrap(err, "failed to set content on UpdateAdminProposal") + return nil, errors.Wrap(err, "failed to set content on UpdateAdminProposal") } } @@ -442,17 +444,17 @@ func (m *CustomMessenger) performSubmitAdminProposal(ctx sdk.Context, contractAd Contract: p.Contract, }) if err != nil { - return nil, sdkerrors.Wrap(err, "failed to set content on ClearAdminProposal") + return nil, errors.Wrap(err, "failed to set content on ClearAdminProposal") } } if err := msg.ValidateBasic(); err != nil { - return nil, sdkerrors.Wrap(err, "failed to validate incoming SubmitAdminProposal message") + return nil, errors.Wrap(err, "failed to validate incoming SubmitAdminProposal message") } response, err := m.Adminserver.SubmitProposal(sdk.WrapSDKContext(ctx), &msg) if err != nil { - return nil, sdkerrors.Wrap(err, "failed to submit proposal") + return nil, errors.Wrap(err, "failed to submit proposal") } return response, nil @@ -462,7 +464,7 @@ func (m *CustomMessenger) performSubmitAdminProposal(ctx sdk.Context, contractAd func (m *CustomMessenger) createDenom(ctx sdk.Context, contractAddr sdk.AccAddress, createDenom *bindings.CreateDenom) ([]sdk.Event, [][]byte, error) { err := PerformCreateDenom(m.TokenFactory, m.Bank, ctx, contractAddr, createDenom) if err != nil { - return nil, nil, sdkerrors.Wrap(err, "perform create denom") + return nil, nil, errors.Wrap(err, "perform create denom") } return nil, nil, nil } @@ -474,7 +476,7 @@ func PerformCreateDenom(f *tokenfactorykeeper.Keeper, _ *bankkeeper.BaseKeeper, msgCreateDenom := tokenfactorytypes.NewMsgCreateDenom(contractAddr.String(), createDenom.Subdenom) if err := msgCreateDenom.ValidateBasic(); err != nil { - return sdkerrors.Wrap(err, "failed validating MsgCreateDenom") + return errors.Wrap(err, "failed validating MsgCreateDenom") } // Create denom @@ -483,7 +485,7 @@ func PerformCreateDenom(f *tokenfactorykeeper.Keeper, _ *bankkeeper.BaseKeeper, msgCreateDenom, ) if err != nil { - return sdkerrors.Wrap(err, "creating denom") + return errors.Wrap(err, "creating denom") } return nil } @@ -492,7 +494,7 @@ func PerformCreateDenom(f *tokenfactorykeeper.Keeper, _ *bankkeeper.BaseKeeper, func (m *CustomMessenger) mintTokens(ctx sdk.Context, contractAddr sdk.AccAddress, mint *bindings.MintTokens) ([]sdk.Event, [][]byte, error) { err := PerformMint(m.TokenFactory, m.Bank, ctx, contractAddr, mint) if err != nil { - return nil, nil, sdkerrors.Wrap(err, "perform mint") + return nil, nil, errors.Wrap(err, "perform mint") } return nil, nil, nil } @@ -514,12 +516,12 @@ func PerformMint(f *tokenfactorykeeper.Keeper, b *bankkeeper.BaseKeeper, ctx sdk msgServer := tokenfactorykeeper.NewMsgServerImpl(*f) _, err = msgServer.Mint(sdk.WrapSDKContext(ctx), sdkMsg) if err != nil { - return sdkerrors.Wrap(err, "minting coins from message") + return errors.Wrap(err, "minting coins from message") } err = b.SendCoins(ctx, contractAddr, rcpt, sdk.NewCoins(coin)) if err != nil { - return sdkerrors.Wrap(err, "sending newly minted coins from message") + return errors.Wrap(err, "sending newly minted coins from message") } return nil @@ -529,7 +531,7 @@ func PerformMint(f *tokenfactorykeeper.Keeper, b *bankkeeper.BaseKeeper, ctx sdk func (m *CustomMessenger) changeAdmin(ctx sdk.Context, contractAddr sdk.AccAddress, changeAdmin *bindings.ChangeAdmin) ([]sdk.Event, [][]byte, error) { err := ChangeAdmin(m.TokenFactory, ctx, contractAddr, changeAdmin) if err != nil { - return nil, nil, sdkerrors.Wrap(err, "failed to change admin") + return nil, nil, errors.Wrap(err, "failed to change admin") } return nil, nil, nil @@ -550,7 +552,7 @@ func ChangeAdmin(f *tokenfactorykeeper.Keeper, ctx sdk.Context, contractAddr sdk msgServer := tokenfactorykeeper.NewMsgServerImpl(*f) _, err = msgServer.ChangeAdmin(sdk.WrapSDKContext(ctx), changeAdminMsg) if err != nil { - return sdkerrors.Wrap(err, "failed changing admin from message") + return errors.Wrap(err, "failed changing admin from message") } return nil } @@ -559,7 +561,7 @@ func ChangeAdmin(f *tokenfactorykeeper.Keeper, ctx sdk.Context, contractAddr sdk func (m *CustomMessenger) burnTokens(ctx sdk.Context, contractAddr sdk.AccAddress, burn *bindings.BurnTokens) ([]sdk.Event, [][]byte, error) { err := PerformBurn(m.TokenFactory, ctx, contractAddr, burn) if err != nil { - return nil, nil, sdkerrors.Wrap(err, "perform burn") + return nil, nil, errors.Wrap(err, "perform burn") } return nil, nil, nil @@ -581,7 +583,7 @@ func PerformBurn(f *tokenfactorykeeper.Keeper, ctx sdk.Context, contractAddr sdk msgServer := tokenfactorykeeper.NewMsgServerImpl(*f) _, err := msgServer.Burn(sdk.WrapSDKContext(ctx), sdkMsg) if err != nil { - return sdkerrors.Wrap(err, "burning coins from message") + return errors.Wrap(err, "burning coins from message") } return nil @@ -596,7 +598,7 @@ func GetFullDenom(contract, subDenom string) (string, error) { fullDenom, err := tokenfactorytypes.GetTokenDenom(contract, subDenom) if err != nil { - return "", sdkerrors.Wrap(err, "validate sub-denom") + return "", errors.Wrap(err, "validate sub-denom") } return fullDenom, nil @@ -606,12 +608,12 @@ func GetFullDenom(contract, subDenom string) (string, error) { func parseAddress(addr string) (sdk.AccAddress, error) { parsed, err := sdk.AccAddressFromBech32(addr) if err != nil { - return nil, sdkerrors.Wrap(err, "address from bech32") + return nil, errors.Wrap(err, "address from bech32") } err = sdk.VerifyAddressFormat(parsed) if err != nil { - return nil, sdkerrors.Wrap(err, "verify address format") + return nil, errors.Wrap(err, "verify address format") } return parsed, nil @@ -634,12 +636,12 @@ func (m *CustomMessenger) performSubmitTx(ctx sdk.Context, contractAddr sdk.AccA } if err := tx.ValidateBasic(); err != nil { - return nil, sdkerrors.Wrap(err, "failed to validate incoming SubmitTx message") + return nil, errors.Wrap(err, "failed to validate incoming SubmitTx message") } response, err := m.Ictxmsgserver.SubmitTx(sdk.WrapSDKContext(ctx), &tx) if err != nil { - return nil, sdkerrors.Wrap(err, "failed to submit interchain transaction") + return nil, errors.Wrap(err, "failed to submit interchain transaction") } return (*bindings.SubmitTxResponse)(response), nil @@ -654,7 +656,7 @@ func (m *CustomMessenger) registerInterchainAccount(ctx sdk.Context, contractAdd "interchain_account_id", reg.InterchainAccountId, "error", err, ) - return nil, nil, sdkerrors.Wrap(err, "failed to register interchain account") + return nil, nil, errors.Wrap(err, "failed to register interchain account") } data, err := json.Marshal(response) @@ -665,7 +667,7 @@ func (m *CustomMessenger) registerInterchainAccount(ctx sdk.Context, contractAdd "interchain_account_id", reg.InterchainAccountId, "error", err, ) - return nil, nil, sdkerrors.Wrap(err, "marshal json failed") + return nil, nil, errors.Wrap(err, "marshal json failed") } ctx.Logger().Debug("registered interchain account", @@ -683,12 +685,12 @@ func (m *CustomMessenger) performRegisterInterchainAccount(ctx sdk.Context, cont InterchainAccountId: reg.InterchainAccountId, } if err := msg.ValidateBasic(); err != nil { - return nil, sdkerrors.Wrap(err, "failed to validate incoming RegisterInterchainAccount message") + return nil, errors.Wrap(err, "failed to validate incoming RegisterInterchainAccount message") } response, err := m.Ictxmsgserver.RegisterInterchainAccount(sdk.WrapSDKContext(ctx), &msg) if err != nil { - return nil, sdkerrors.Wrap(err, "failed to register interchain account") + return nil, errors.Wrap(err, "failed to register interchain account") } return (*bindings.RegisterInterchainAccountResponse)(response), nil @@ -706,7 +708,7 @@ func (m *CustomMessenger) registerInterchainQuery(ctx sdk.Context, contractAddr "update_period", reg.UpdatePeriod, "error", err, ) - return nil, nil, sdkerrors.Wrap(err, "failed to register interchain query") + return nil, nil, errors.Wrap(err, "failed to register interchain query") } data, err := json.Marshal(response) @@ -719,7 +721,7 @@ func (m *CustomMessenger) registerInterchainQuery(ctx sdk.Context, contractAddr "update_period", reg.UpdatePeriod, "error", err, ) - return nil, nil, sdkerrors.Wrap(err, "marshal json failed") + return nil, nil, errors.Wrap(err, "marshal json failed") } ctx.Logger().Debug("registered interchain query", @@ -744,12 +746,12 @@ func (m *CustomMessenger) performRegisterInterchainQuery(ctx sdk.Context, contra Sender: contractAddr.String(), } if err := msg.ValidateBasic(); err != nil { - return nil, sdkerrors.Wrap(err, "failed to validate incoming RegisterInterchainQuery message") + return nil, errors.Wrap(err, "failed to validate incoming RegisterInterchainQuery message") } response, err := m.Icqmsgserver.RegisterInterchainQuery(sdk.WrapSDKContext(ctx), &msg) if err != nil { - return nil, sdkerrors.Wrap(err, "failed to register interchain query") + return nil, errors.Wrap(err, "failed to register interchain query") } return (*bindings.RegisterInterchainQueryResponse)(response), nil @@ -798,7 +800,7 @@ func (m *CustomMessenger) validateProposalQty(proposal *bindings.AdminProposal) func (m *CustomMessenger) addSchedule(ctx sdk.Context, contractAddr sdk.AccAddress, addSchedule *bindings.AddSchedule) ([]sdk.Event, [][]byte, error) { if !m.isAdmin(ctx, contractAddr) { - return nil, nil, sdkerrors.Wrap(sdkerrors.ErrUnauthorized, "only admin can add schedule") + return nil, nil, errors.Wrap(sdkerrors.ErrUnauthorized, "only admin can add schedule") } msgs := make([]crontypes.MsgExecuteContract, 0, len(addSchedule.Msgs)) @@ -815,7 +817,7 @@ func (m *CustomMessenger) addSchedule(ctx sdk.Context, contractAddr sdk.AccAddre "from_address", contractAddr.String(), "error", err, ) - return nil, nil, sdkerrors.Wrap(err, "marshal json failed") + return nil, nil, errors.Wrap(err, "marshal json failed") } resp := bindings.AddScheduleResponse{} @@ -825,7 +827,7 @@ func (m *CustomMessenger) addSchedule(ctx sdk.Context, contractAddr sdk.AccAddre "from_address", contractAddr.String(), "error", err, ) - return nil, nil, sdkerrors.Wrap(err, "marshal json failed") + return nil, nil, errors.Wrap(err, "marshal json failed") } ctx.Logger().Debug("schedule added", @@ -839,7 +841,7 @@ func (m *CustomMessenger) addSchedule(ctx sdk.Context, contractAddr sdk.AccAddre func (m *CustomMessenger) removeSchedule(ctx sdk.Context, contractAddr sdk.AccAddress, removeSchedule *bindings.RemoveSchedule) ([]sdk.Event, [][]byte, error) { params := m.CronKeeper.GetParams(ctx) if !m.isAdmin(ctx, contractAddr) && contractAddr.String() != params.SecurityAddress { - return nil, nil, sdkerrors.Wrap(sdkerrors.ErrUnauthorized, "only admin or security dao can remove schedule") + return nil, nil, errors.Wrap(sdkerrors.ErrUnauthorized, "only admin or security dao can remove schedule") } m.CronKeeper.RemoveSchedule(ctx, removeSchedule.Name) @@ -851,7 +853,7 @@ func (m *CustomMessenger) removeSchedule(ctx sdk.Context, contractAddr sdk.AccAd "from_address", contractAddr.String(), "error", err, ) - return nil, nil, sdkerrors.Wrap(err, "marshal json failed") + return nil, nil, errors.Wrap(err, "marshal json failed") } ctx.Logger().Debug("schedule removed", diff --git a/wasmbinding/queries.go b/wasmbinding/queries.go index 7f49d0029..efea939ca 100644 --- a/wasmbinding/queries.go +++ b/wasmbinding/queries.go @@ -1,8 +1,8 @@ package wasmbinding import ( + "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" sdkquery "github.com/cosmos/cosmos-sdk/types/query" "github.com/neutron-org/neutron/wasmbinding/bindings" @@ -77,7 +77,7 @@ func (qp *QueryPlugin) GetRegisteredInterchainQuery(ctx sdk.Context, req *bindin return nil, err } if grpcResp == nil { - return nil, sdkerrors.Wrapf(types.ErrEmptyResult, "interchain query response empty for query id %d", req.QueryID) + return nil, errors.Wrapf(types.ErrEmptyResult, "interchain query response empty for query id %d", req.QueryID) } query := mapGRPCRegisteredQueryToWasmBindings(*grpcResp) @@ -88,7 +88,7 @@ func (qp *QueryPlugin) GetRegisteredInterchainQuery(ctx sdk.Context, req *bindin func (qp QueryPlugin) GetDenomAdmin(ctx sdk.Context, denom string) (*bindings.DenomAdminResponse, error) { metadata, err := qp.tokenFactoryKeeper.GetAuthorityMetadata(ctx, denom) if err != nil { - return nil, sdkerrors.Wrapf(err, "failed to get admin for denom: %s", denom) + return nil, errors.Wrapf(err, "failed to get admin for denom: %s", denom) } return &bindings.DenomAdminResponse{Admin: metadata.Admin}, nil diff --git a/x/contractmanager/keeper/grpc_query_params_test.go b/x/contractmanager/keeper/grpc_query_params_test.go index 8bc65b586..31c9598b0 100644 --- a/x/contractmanager/keeper/grpc_query_params_test.go +++ b/x/contractmanager/keeper/grpc_query_params_test.go @@ -16,7 +16,7 @@ func TestParamsQuery(t *testing.T) { params := types.DefaultParams() err := keeper.SetParams(ctx, params) require.NoError(t, err) - + response, err := keeper.Params(wctx, &types.QueryParamsRequest{}) require.NoError(t, err) require.Equal(t, &types.QueryParamsResponse{Params: params}, response) diff --git a/x/contractmanager/keeper/keeper.go b/x/contractmanager/keeper/keeper.go index 31014162d..6d9c3569f 100644 --- a/x/contractmanager/keeper/keeper.go +++ b/x/contractmanager/keeper/keeper.go @@ -25,7 +25,6 @@ func NewKeeper( memKey storetypes.StoreKey, wasmKeeper types.WasmKeeper, ) *Keeper { - return &Keeper{ cdc: cdc, storeKey: storeKey, diff --git a/x/contractmanager/module.go b/x/contractmanager/module.go index 0d15b740f..cfecf7588 100644 --- a/x/contractmanager/module.go +++ b/x/contractmanager/module.go @@ -2,10 +2,11 @@ package contractmanager import ( "context" - "cosmossdk.io/core/appmodule" "encoding/json" "fmt" + "cosmossdk.io/core/appmodule" + // this line is used by starport scaffolding # 1 "github.com/gorilla/mux" diff --git a/x/contractmanager/types/errors.go b/x/contractmanager/types/errors.go index 74c84c6c4..b846d3302 100644 --- a/x/contractmanager/types/errors.go +++ b/x/contractmanager/types/errors.go @@ -3,10 +3,10 @@ package types // DONTCOVER import ( - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "cosmossdk.io/errors" ) // x/contractmanager module sentinel errors var ( - ErrSample = sdkerrors.Register(ModuleName, 1100, "sample error") + ErrSample = errors.Register(ModuleName, 1100, "sample error") ) diff --git a/x/cron/keeper/grpc_query_params_test.go b/x/cron/keeper/grpc_query_params_test.go index 154826fb9..27193b7d9 100644 --- a/x/cron/keeper/grpc_query_params_test.go +++ b/x/cron/keeper/grpc_query_params_test.go @@ -16,7 +16,7 @@ func TestParamsQuery(t *testing.T) { params := types.DefaultParams() err := keeper.SetParams(ctx, params) require.NoError(t, err) - + response, err := keeper.Params(wctx, &types.QueryParamsRequest{}) require.NoError(t, err) require.Equal(t, &types.QueryParamsResponse{Params: params}, response) diff --git a/x/cron/keeper/keeper.go b/x/cron/keeper/keeper.go index 96243dc74..f81040e10 100644 --- a/x/cron/keeper/keeper.go +++ b/x/cron/keeper/keeper.go @@ -2,10 +2,11 @@ package keeper import ( "fmt" - "github.com/armon/go-metrics" "strconv" "time" + "github.com/armon/go-metrics" + "github.com/cosmos/cosmos-sdk/telemetry" wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" diff --git a/x/cron/keeper/keeper_test.go b/x/cron/keeper/keeper_test.go index 6fe16a741..990c556f4 100644 --- a/x/cron/keeper/keeper_test.go +++ b/x/cron/keeper/keeper_test.go @@ -214,7 +214,7 @@ func TestGetAllSchedules(t *testing.T) { Limit: 2, }) require.NoError(t, err) - + expectedSchedules := make([]types.Schedule, 0, 3) for i := range []int{1, 2, 3} { s := types.Schedule{ diff --git a/x/cron/module.go b/x/cron/module.go index 8b01aca50..0c911b391 100644 --- a/x/cron/module.go +++ b/x/cron/module.go @@ -2,10 +2,11 @@ package cron import ( "context" - "cosmossdk.io/core/appmodule" "encoding/json" "fmt" + "cosmossdk.io/core/appmodule" + "github.com/gorilla/mux" // this line is used by starport scaffolding # 1 diff --git a/x/cron/types/errors.go b/x/cron/types/errors.go index 35382cbcd..8bc535d7e 100644 --- a/x/cron/types/errors.go +++ b/x/cron/types/errors.go @@ -3,10 +3,10 @@ package types // DONTCOVER import ( - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "cosmossdk.io/errors" ) // x/cron module sentinel errors var ( - ErrSample = sdkerrors.Register(ModuleName, 1100, "sample error") + ErrSample = errors.Register(ModuleName, 1100, "sample error") ) diff --git a/x/feeburner/keeper/keeper.go b/x/feeburner/keeper/keeper.go index 205edd433..842baea35 100644 --- a/x/feeburner/keeper/keeper.go +++ b/x/feeburner/keeper/keeper.go @@ -3,7 +3,8 @@ package keeper import ( "fmt" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "cosmossdk.io/errors" + authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" "github.com/cometbft/cometbft/libs/log" @@ -35,7 +36,6 @@ func NewKeeper( accountKeeper types.AccountKeeper, bankKeeper types.BankKeeper, ) *Keeper { - return &Keeper{ cdc: cdc, storeKey: storeKey, @@ -92,7 +92,7 @@ func (k Keeper) BurnAndDistribute(ctx sdk.Context) { if balance.Denom == params.NeutronDenom { err := k.bankKeeper.BurnCoins(ctx, consumertypes.ConsumerRedistributeName, sdk.Coins{balance}) if err != nil { - panic(sdkerrors.Wrapf(err, "failed to burn NTRN tokens during fee processing")) + panic(errors.Wrapf(err, "failed to burn NTRN tokens during fee processing")) } k.RecordBurnedFees(ctx, balance) @@ -110,7 +110,7 @@ func (k Keeper) BurnAndDistribute(ctx sdk.Context) { // in such case we just burn the tokens err := k.bankKeeper.BurnCoins(ctx, consumertypes.ConsumerRedistributeName, fundsForReserve) if err != nil { - panic(sdkerrors.Wrapf(err, "failed to burn tokens during fee processing")) + panic(errors.Wrapf(err, "failed to burn tokens during fee processing")) } } else { err = k.bankKeeper.SendCoins( @@ -119,7 +119,7 @@ func (k Keeper) BurnAndDistribute(ctx sdk.Context) { fundsForReserve, ) if err != nil { - panic(sdkerrors.Wrapf(err, "failed sending funds to Reserve")) + panic(errors.Wrapf(err, "failed sending funds to Reserve")) } } } diff --git a/x/feeburner/module.go b/x/feeburner/module.go index 6095ec72e..c17a896b7 100644 --- a/x/feeburner/module.go +++ b/x/feeburner/module.go @@ -2,10 +2,11 @@ package feeburner import ( "context" - "cosmossdk.io/core/appmodule" "encoding/json" "fmt" + "cosmossdk.io/core/appmodule" + "github.com/gorilla/mux" // this line is used by starport scaffolding # 1 diff --git a/x/feeburner/types/errors.go b/x/feeburner/types/errors.go index 526904dc5..0b7801f3b 100644 --- a/x/feeburner/types/errors.go +++ b/x/feeburner/types/errors.go @@ -3,10 +3,10 @@ package types // DONTCOVER import ( - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "cosmossdk.io/errors" ) // x/feeburner module sentinel errors var ( - ErrSample = sdkerrors.Register(ModuleName, 1100, "sample error") + ErrSample = errors.Register(ModuleName, 1100, "sample error") ) diff --git a/x/feeburner/types/keys.go b/x/feeburner/types/keys.go index c790fca9d..527a1b6ae 100644 --- a/x/feeburner/types/keys.go +++ b/x/feeburner/types/keys.go @@ -18,9 +18,7 @@ const ( prefixParamsKey = iota + 1 ) -var ( - ParamsKey = []byte{prefixParamsKey} -) +var ParamsKey = []byte{prefixParamsKey} func KeyPrefix(p string) []byte { return []byte(p) diff --git a/x/feerefunder/keeper/grpc_query.go b/x/feerefunder/keeper/grpc_query.go index 5dc634237..5029bbf28 100644 --- a/x/feerefunder/keeper/grpc_query.go +++ b/x/feerefunder/keeper/grpc_query.go @@ -3,6 +3,8 @@ package keeper import ( "context" + "cosmossdk.io/errors" + sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" @@ -16,7 +18,7 @@ func (k Keeper) FeeInfo(goCtx context.Context, request *types.FeeInfoRequest) (* feeInfo, err := k.GetFeeInfo(ctx, types.NewPacketID(request.PortId, request.ChannelId, request.Sequence)) if err != nil { - return nil, sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, "no fee info found for port_id = %s, channel_id=%s, sequence=%d", request.PortId, request.ChannelId, request.Sequence) + return nil, errors.Wrapf(sdkerrors.ErrInvalidRequest, "no fee info found for port_id = %s, channel_id=%s, sequence=%d", request.PortId, request.ChannelId, request.Sequence) } return &types.FeeInfoResponse{FeeInfo: feeInfo}, nil diff --git a/x/feerefunder/keeper/keeper.go b/x/feerefunder/keeper/keeper.go index 64d90c070..a5196a3b4 100644 --- a/x/feerefunder/keeper/keeper.go +++ b/x/feerefunder/keeper/keeper.go @@ -4,13 +4,14 @@ import ( "fmt" "strconv" + "cosmossdk.io/errors" + "github.com/cometbft/cometbft/libs/log" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/store/prefix" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" "github.com/neutron-org/neutron/x/feerefunder/types" ) @@ -21,7 +22,6 @@ type ( bankKeeper types.BankKeeper storeKey storetypes.StoreKey memKey storetypes.StoreKey - paramstore paramtypes.Subspace channelKeeper types.ChannelKeeper } ) @@ -50,11 +50,11 @@ func (k Keeper) LockFees(ctx sdk.Context, payer sdk.AccAddress, packetID types.P k.Logger(ctx).Debug("Trying to lock fees", "packetID", packetID, "fee", fee) if _, ok := k.channelKeeper.GetChannel(ctx, packetID.PortId, packetID.ChannelId); !ok { - return sdkerrors.Wrapf(channeltypes.ErrChannelNotFound, "channel with id %s and port %s not found", packetID.ChannelId, packetID.PortId) + return errors.Wrapf(channeltypes.ErrChannelNotFound, "channel with id %s and port %s not found", packetID.ChannelId, packetID.PortId) } if err := k.checkFees(ctx, fee); err != nil { - return sdkerrors.Wrapf(err, "failed to lock fees") + return errors.Wrapf(err, "failed to lock fees") } feeInfo := types.FeeInfo{ @@ -65,7 +65,7 @@ func (k Keeper) LockFees(ctx sdk.Context, payer sdk.AccAddress, packetID types.P k.StoreFeeInfo(ctx, feeInfo) if err := k.bankKeeper.SendCoinsFromAccountToModule(ctx, payer, types.ModuleName, fee.Total()); err != nil { - return sdkerrors.Wrapf(err, "failed to send coins during fees locking") + return errors.Wrapf(err, "failed to send coins during fees locking") } ctx.EventManager().EmitEvents(sdk.Events{ @@ -90,19 +90,19 @@ func (k Keeper) DistributeAcknowledgementFee(ctx sdk.Context, receiver sdk.AccAd feeInfo, err := k.GetFeeInfo(ctx, packetID) if err != nil { k.Logger(ctx).Error("no fee info", "error", err) - panic(sdkerrors.Wrapf(err, "no fee info")) + panic(errors.Wrapf(err, "no fee info")) } // try to distribute ack fee if err := k.distributeFee(ctx, receiver, feeInfo.Fee.AckFee); err != nil { k.Logger(ctx).Error("error distributing ack fee", "receiver", receiver, "payer", feeInfo.Payer, "packet", packetID) - panic(sdkerrors.Wrapf(err, "error distributing ack fee: receiver = %s, packetID=%v", receiver, packetID)) + panic(errors.Wrapf(err, "error distributing ack fee: receiver = %s, packetID=%v", receiver, packetID)) } // try to return unused timeout fee if err := k.distributeFee(ctx, sdk.MustAccAddressFromBech32(feeInfo.Payer), feeInfo.Fee.TimeoutFee); err != nil { k.Logger(ctx).Error("error returning unused timeout fee", "receiver", feeInfo.Payer, "packet", packetID) - panic(sdkerrors.Wrapf(err, "error distributing unused timeout fee: receiver = %s, packetID=%v", feeInfo.Payer, packetID)) + panic(errors.Wrapf(err, "error distributing unused timeout fee: receiver = %s, packetID=%v", feeInfo.Payer, packetID)) } ctx.EventManager().EmitEvents(sdk.Events{ @@ -127,19 +127,19 @@ func (k Keeper) DistributeTimeoutFee(ctx sdk.Context, receiver sdk.AccAddress, p feeInfo, err := k.GetFeeInfo(ctx, packetID) if err != nil { k.Logger(ctx).Error("no fee info", "error", err) - panic(sdkerrors.Wrapf(err, "no fee info")) + panic(errors.Wrapf(err, "no fee info")) } // try to distribute timeout fee if err := k.distributeFee(ctx, receiver, feeInfo.Fee.TimeoutFee); err != nil { k.Logger(ctx).Error("error distributing timeout fee", "receiver", receiver, "payer", feeInfo.Payer, "packet", packetID) - panic(sdkerrors.Wrapf(err, "error distributing timeout fee: receiver = %s, packetID=%v", receiver, packetID)) + panic(errors.Wrapf(err, "error distributing timeout fee: receiver = %s, packetID=%v", receiver, packetID)) } // try to return unused ack fee if err := k.distributeFee(ctx, sdk.MustAccAddressFromBech32(feeInfo.Payer), feeInfo.Fee.AckFee); err != nil { k.Logger(ctx).Error("error returning unused ack fee", "receiver", feeInfo.Payer, "packet", packetID) - panic(sdkerrors.Wrapf(err, "error distributing unused ack fee: receiver = %s, packetID=%v", feeInfo.Payer, packetID)) + panic(errors.Wrapf(err, "error distributing unused ack fee: receiver = %s, packetID=%v", feeInfo.Payer, packetID)) } ctx.EventManager().EmitEvents(sdk.Events{ @@ -165,7 +165,7 @@ func (k Keeper) GetFeeInfo(ctx sdk.Context, packetID types.PacketID) (*types.Fee var feeInfo types.FeeInfo bzFeeInfo := store.Get(types.GetFeePacketKey(packetID)) if bzFeeInfo == nil { - return nil, sdkerrors.Wrapf(sdkerrors.ErrKeyNotFound, "no fee info for the given channelID = %s, portID = %s and sequence = %d", packetID.ChannelId, packetID.PortId, packetID.Sequence) + return nil, errors.Wrapf(sdkerrors.ErrKeyNotFound, "no fee info for the given channelID = %s, portID = %s and sequence = %d", packetID.ChannelId, packetID.PortId, packetID.Sequence) } k.cdc.MustUnmarshal(bzFeeInfo, &feeInfo) @@ -211,24 +211,24 @@ func (k Keeper) checkFees(ctx sdk.Context, fees types.Fee) error { params := k.GetParams(ctx) if !fees.TimeoutFee.IsAnyGTE(params.MinFee.TimeoutFee) { - return sdkerrors.Wrapf(sdkerrors.ErrInsufficientFee, "provided timeout fee is less than min governance set timeout fee: %v < %v", fees.TimeoutFee, params.MinFee.TimeoutFee) + return errors.Wrapf(sdkerrors.ErrInsufficientFee, "provided timeout fee is less than min governance set timeout fee: %v < %v", fees.TimeoutFee, params.MinFee.TimeoutFee) } if !fees.AckFee.IsAnyGTE(params.MinFee.AckFee) { - return sdkerrors.Wrapf(sdkerrors.ErrInsufficientFee, "provided ack fee is less than min governance set ack fee: %v < %v", fees.AckFee, params.MinFee.AckFee) + return errors.Wrapf(sdkerrors.ErrInsufficientFee, "provided ack fee is less than min governance set ack fee: %v < %v", fees.AckFee, params.MinFee.AckFee) } if allowedCoins(fees.TimeoutFee, params.MinFee.TimeoutFee) { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidCoins, "timeout fee cannot have coins other than in params") + return errors.Wrapf(sdkerrors.ErrInvalidCoins, "timeout fee cannot have coins other than in params") } if allowedCoins(fees.AckFee, params.MinFee.AckFee) { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidCoins, "ack fee cannot have coins other than in params") + return errors.Wrapf(sdkerrors.ErrInvalidCoins, "ack fee cannot have coins other than in params") } // we don't allow users to set recv fees, because we can't refund relayers for such messages if !fees.RecvFee.IsZero() { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidCoins, "recv fee must be zero") + return errors.Wrapf(sdkerrors.ErrInvalidCoins, "recv fee must be zero") } return nil @@ -238,7 +238,7 @@ func (k Keeper) distributeFee(ctx sdk.Context, receiver sdk.AccAddress, fee sdk. err := k.bankKeeper.SendCoinsFromModuleToAccount(ctx, types.ModuleName, receiver, fee) if err != nil { k.Logger(ctx).Error("error distributing fee", "receiver address", receiver, "fee", fee) - return sdkerrors.Wrapf(err, "error distributing fee to a receiver: %s", receiver.String()) + return errors.Wrapf(err, "error distributing fee to a receiver: %s", receiver.String()) } return nil } diff --git a/x/feerefunder/keeper/keeper_test.go b/x/feerefunder/keeper/keeper_test.go index 512acc7f6..cbdfa056c 100644 --- a/x/feerefunder/keeper/keeper_test.go +++ b/x/feerefunder/keeper/keeper_test.go @@ -12,6 +12,7 @@ import ( testutil_keeper "github.com/neutron-org/neutron/testutil/feerefunder/keeper" mock_types "github.com/neutron-org/neutron/testutil/mocks/feerefunder/types" + cosmoserrors "cosmossdk.io/errors" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/pkg/errors" @@ -43,7 +44,7 @@ func TestKeeperCheckFees(t *testing.T) { desc string fees *types.Fee minFees types.Fee - err *sdkerrors.Error + err *cosmoserrors.Error }{ { desc: "SingleProperDenomInsufficient", @@ -223,14 +224,14 @@ func TestDistributeAcknowledgementFee(t *testing.T) { PortId: "transfer", Sequence: 1, } - panicErrorToCatch := sdkerrors.Wrapf(sdkerrors.Wrapf(sdkerrors.ErrKeyNotFound, "no fee info for the given channelID = %s, portID = %s and sequence = %d", invalidPacket.ChannelId, invalidPacket.PortId, invalidPacket.Sequence), "no fee info") + panicErrorToCatch := errors.Wrapf(errors.Wrapf(sdkerrors.ErrKeyNotFound, "no fee info for the given channelID = %s, portID = %s and sequence = %d", invalidPacket.ChannelId, invalidPacket.PortId, invalidPacket.Sequence), "no fee info") assert.PanicsWithError(t, panicErrorToCatch.Error(), func() { k.DistributeAcknowledgementFee(ctx, receiver, invalidPacket) }) - panicErrorToCatch = sdkerrors.Wrapf(sdkerrors.Wrapf(fmt.Errorf("bank module error"), "error distributing fee to a receiver: %s", receiver.String()), "error distributing ack fee: receiver = %s, packetID=%v", receiver, packet) + panicErrorToCatch = errors.Wrapf(errors.Wrapf(fmt.Errorf("bank module error"), "error distributing fee to a receiver: %s", receiver.String()), "error distributing ack fee: receiver = %s, packetID=%v", receiver, packet) bankKeeper.EXPECT().SendCoinsFromModuleToAccount(ctx, types.ModuleName, receiver, validFee.AckFee).Return(fmt.Errorf("bank module error")) assert.PanicsWithError(t, panicErrorToCatch.Error(), func() { k.DistributeAcknowledgementFee(ctx, receiver, packet) }) - panicErrorToCatch = sdkerrors.Wrapf(sdkerrors.Wrapf(fmt.Errorf("bank module error"), "error distributing fee to a receiver: %s", payer.String()), "error distributing unused timeout fee: receiver = %s, packetID=%v", receiver, packet) + panicErrorToCatch = errors.Wrapf(errors.Wrapf(fmt.Errorf("bank module error"), "error distributing fee to a receiver: %s", payer.String()), "error distributing unused timeout fee: receiver = %s, packetID=%v", receiver, packet) bankKeeper.EXPECT().SendCoinsFromModuleToAccount(ctx, types.ModuleName, receiver, validFee.AckFee).Return(nil) bankKeeper.EXPECT().SendCoinsFromModuleToAccount(ctx, types.ModuleName, payer, validFee.TimeoutFee).Return(fmt.Errorf("bank module error")) assert.PanicsWithError(t, panicErrorToCatch.Error(), func() { k.DistributeAcknowledgementFee(ctx, receiver, packet) }) @@ -289,14 +290,14 @@ func TestDistributeTimeoutFee(t *testing.T) { PortId: "transfer", Sequence: 1, } - panicErrorToCatch := sdkerrors.Wrapf(sdkerrors.Wrapf(sdkerrors.ErrKeyNotFound, "no fee info for the given channelID = %s, portID = %s and sequence = %d", invalidPacket.ChannelId, invalidPacket.PortId, invalidPacket.Sequence), "no fee info") + panicErrorToCatch := errors.Wrapf(errors.Wrapf(sdkerrors.ErrKeyNotFound, "no fee info for the given channelID = %s, portID = %s and sequence = %d", invalidPacket.ChannelId, invalidPacket.PortId, invalidPacket.Sequence), "no fee info") assert.PanicsWithError(t, panicErrorToCatch.Error(), func() { k.DistributeTimeoutFee(ctx, receiver, invalidPacket) }) - panicErrorToCatch = sdkerrors.Wrapf(sdkerrors.Wrapf(fmt.Errorf("bank module error"), "error distributing fee to a receiver: %s", receiver.String()), "error distributing timeout fee: receiver = %s, packetID=%v", receiver, packet) + panicErrorToCatch = errors.Wrapf(errors.Wrapf(fmt.Errorf("bank module error"), "error distributing fee to a receiver: %s", receiver.String()), "error distributing timeout fee: receiver = %s, packetID=%v", receiver, packet) bankKeeper.EXPECT().SendCoinsFromModuleToAccount(ctx, types.ModuleName, receiver, validFee.TimeoutFee).Return(fmt.Errorf("bank module error")) assert.PanicsWithError(t, panicErrorToCatch.Error(), func() { k.DistributeTimeoutFee(ctx, receiver, packet) }) - panicErrorToCatch = sdkerrors.Wrapf(sdkerrors.Wrapf(fmt.Errorf("bank module error"), "error distributing fee to a receiver: %s", payer.String()), "error distributing unused ack fee: receiver = %s, packetID=%v", receiver, packet) + panicErrorToCatch = errors.Wrapf(errors.Wrapf(fmt.Errorf("bank module error"), "error distributing fee to a receiver: %s", payer.String()), "error distributing unused ack fee: receiver = %s, packetID=%v", receiver, packet) bankKeeper.EXPECT().SendCoinsFromModuleToAccount(ctx, types.ModuleName, receiver, validFee.TimeoutFee).Return(nil) bankKeeper.EXPECT().SendCoinsFromModuleToAccount(ctx, types.ModuleName, payer, validFee.AckFee).Return(fmt.Errorf("bank module error")) assert.PanicsWithError(t, panicErrorToCatch.Error(), func() { k.DistributeTimeoutFee(ctx, receiver, packet) }) diff --git a/x/feerefunder/module.go b/x/feerefunder/module.go index d70e2ac79..76b93d50a 100644 --- a/x/feerefunder/module.go +++ b/x/feerefunder/module.go @@ -2,10 +2,11 @@ package feerefunder import ( "context" - "cosmossdk.io/core/appmodule" "encoding/json" "fmt" + "cosmossdk.io/core/appmodule" + // this line is used by starport scaffolding # 1 "github.com/gorilla/mux" diff --git a/x/feerefunder/types/codec.go b/x/feerefunder/types/codec.go index 4cf72fc56..abaf590aa 100644 --- a/x/feerefunder/types/codec.go +++ b/x/feerefunder/types/codec.go @@ -3,6 +3,7 @@ package types import ( "github.com/cosmos/cosmos-sdk/codec" cdctypes "github.com/cosmos/cosmos-sdk/codec/types" + "github.com/cosmos/cosmos-sdk/types/msgservice" ) func RegisterCodec(_ *codec.LegacyAmino) { @@ -12,7 +13,7 @@ func RegisterCodec(_ *codec.LegacyAmino) { func RegisterInterfaces(registry cdctypes.InterfaceRegistry) { // this line is used by starport scaffolding # 3 - //msgservice.RegisterMsgServiceDesc(registry, &_Msg_serviceDesc) + msgservice.RegisterMsgServiceDesc(registry, &_Msg_serviceDesc) } var ( diff --git a/x/feerefunder/types/fee.go b/x/feerefunder/types/fee.go index fbbd72a6c..a3e09440d 100644 --- a/x/feerefunder/types/fee.go +++ b/x/feerefunder/types/fee.go @@ -3,6 +3,8 @@ package types import ( "strings" + "cosmossdk.io/errors" + sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" ) @@ -42,16 +44,16 @@ func (m Fee) Validate() error { } if len(errFees) > 0 { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidCoins, "contains invalid fees: %s", strings.Join(errFees, " , ")) + return errors.Wrapf(sdkerrors.ErrInvalidCoins, "contains invalid fees: %s", strings.Join(errFees, " , ")) } if !m.RecvFee.IsZero() { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidCoins, "recv fee must be zero") + return errors.Wrapf(sdkerrors.ErrInvalidCoins, "recv fee must be zero") } // if ack or timeout fees are zero or empty return an error if m.AckFee.IsZero() || m.TimeoutFee.IsZero() { - return sdkerrors.Wrap(sdkerrors.ErrInvalidCoins, "ack fee or timeout fee is zero") + return errors.Wrap(sdkerrors.ErrInvalidCoins, "ack fee or timeout fee is zero") } return nil diff --git a/x/feerefunder/types/genesis.go b/x/feerefunder/types/genesis.go index 6ba34ee3e..960ad57c4 100644 --- a/x/feerefunder/types/genesis.go +++ b/x/feerefunder/types/genesis.go @@ -2,6 +2,9 @@ package types import ( "fmt" + + "cosmossdk.io/errors" + // this line is used by starport scaffolding # genesis/types/import wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" sdk "github.com/cosmos/cosmos-sdk/types" @@ -28,7 +31,7 @@ func (gs GenesisState) Validate() error { } if len(addr) != wasmtypes.ContractAddrLen { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "fee payer address %s is not a contract", info.Payer) + return errors.Wrapf(sdkerrors.ErrInvalidAddress, "fee payer address %s is not a contract", info.Payer) } if err := host.PortIdentifierValidator(info.PacketId.PortId); err != nil { diff --git a/x/feerefunder/types/tx.pb.go b/x/feerefunder/types/tx.pb.go index 9c51b8cd6..978495680 100644 --- a/x/feerefunder/types/tx.pb.go +++ b/x/feerefunder/types/tx.pb.go @@ -2,85 +2,85 @@ // // source: feerefunder/tx.proto package types +import ( + context "context" + fmt "fmt" + math "math" + + _ "github.com/cosmos/cosmos-sdk/types" + _ "github.com/gogo/protobuf/gogoproto" + grpc1 "github.com/gogo/protobuf/grpc" + proto "github.com/gogo/protobuf/proto" + grpc "google.golang.org/grpc" +) + +// Reference imports to suppress errors if they are not otherwise used. +var ( + _ = proto.Marshal + _ = fmt.Errorf + _ = 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 + +func init() { proto.RegisterFile("feerefunder/tx.proto", fileDescriptor_af2a0269bf094340) } + +var fileDescriptor_af2a0269bf094340 = []byte{ + // 174 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x49, 0x4b, 0x4d, 0x2d, + 0x4a, 0x4d, 0x2b, 0xcd, 0x4b, 0x49, 0x2d, 0xd2, 0x2f, 0xa9, 0xd0, 0x2b, 0x28, 0xca, 0x2f, 0xc9, + 0x17, 0x92, 0xcb, 0x4b, 0x2d, 0x2d, 0x29, 0xca, 0xcf, 0xcb, 0x2f, 0x4a, 0xd7, 0x83, 0x32, 0xf5, + 0x90, 0x14, 0x4a, 0xc9, 0x25, 0xe7, 0x17, 0xe7, 0xe6, 0x17, 0xeb, 0x27, 0x25, 0x16, 0xa7, 0xea, + 0x97, 0x19, 0x26, 0xa5, 0x96, 0x24, 0x1a, 0xea, 0x27, 0xe7, 0x67, 0xe6, 0x41, 0xf4, 0x4b, 0x89, + 0xa4, 0xe7, 0xa7, 0xe7, 0x83, 0x99, 0xfa, 0x20, 0x16, 0x44, 0xd4, 0x88, 0x95, 0x8b, 0xd9, 0xb7, + 0x38, 0xdd, 0xc9, 0xe7, 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, 0x8c, 0xd2, + 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xf5, 0xa1, 0xd6, 0xea, 0xe6, 0x17, 0xa5, + 0xc3, 0xd8, 0xfa, 0x15, 0xfa, 0x28, 0xae, 0xad, 0x2c, 0x48, 0x2d, 0x4e, 0x62, 0x03, 0x9b, 0x6d, + 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x2f, 0x8f, 0xb3, 0x6d, 0xc9, 0x00, 0x00, 0x00, +} + +// Reference imports to suppress errors if they are not otherwise used. +var ( + _ context.Context + _ 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. // -//import ( -// context "context" -// fmt "fmt" -// math "math" -// -// _ "github.com/cosmos/cosmos-sdk/types" -// _ "github.com/gogo/protobuf/gogoproto" -// grpc1 "github.com/gogo/protobuf/grpc" -// proto "github.com/gogo/protobuf/proto" -// grpc "google.golang.org/grpc" -//) -// -//// 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 -// -//func init() { proto.RegisterFile("feerefunder/tx.proto", fileDescriptor_af2a0269bf094340) } -// -//var fileDescriptor_af2a0269bf094340 = []byte{ -// // 174 bytes of a gzipped FileDescriptorProto -// 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x49, 0x4b, 0x4d, 0x2d, -// 0x4a, 0x4d, 0x2b, 0xcd, 0x4b, 0x49, 0x2d, 0xd2, 0x2f, 0xa9, 0xd0, 0x2b, 0x28, 0xca, 0x2f, 0xc9, -// 0x17, 0x92, 0xcb, 0x4b, 0x2d, 0x2d, 0x29, 0xca, 0xcf, 0xcb, 0x2f, 0x4a, 0xd7, 0x83, 0x32, 0xf5, -// 0x90, 0x14, 0x4a, 0xc9, 0x25, 0xe7, 0x17, 0xe7, 0xe6, 0x17, 0xeb, 0x27, 0x25, 0x16, 0xa7, 0xea, -// 0x97, 0x19, 0x26, 0xa5, 0x96, 0x24, 0x1a, 0xea, 0x27, 0xe7, 0x67, 0xe6, 0x41, 0xf4, 0x4b, 0x89, -// 0xa4, 0xe7, 0xa7, 0xe7, 0x83, 0x99, 0xfa, 0x20, 0x16, 0x44, 0xd4, 0x88, 0x95, 0x8b, 0xd9, 0xb7, -// 0x38, 0xdd, 0xc9, 0xe7, 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, 0x8c, 0xd2, -// 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xf5, 0xa1, 0xd6, 0xea, 0xe6, 0x17, 0xa5, -// 0xc3, 0xd8, 0xfa, 0x15, 0xfa, 0x28, 0xae, 0xad, 0x2c, 0x48, 0x2d, 0x4e, 0x62, 0x03, 0x9b, 0x6d, -// 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x2f, 0x8f, 0xb3, 0x6d, 0xc9, 0x00, 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 { -//} -// -//type msgClient struct { -// cc grpc1.ClientConn -//} -// -//func NewMsgClient(cc grpc1.ClientConn) MsgClient { -// return &msgClient{cc} -//} -// -//// MsgServer is the server API for Msg service. -//type MsgServer interface { -//} -// -//// UnimplementedMsgServer can be embedded to have forward compatible implementations. -//type UnimplementedMsgServer struct { -//} -// -//func RegisterMsgServer(s grpc1.Server, srv MsgServer) { -// s.RegisterService(&_Msg_serviceDesc, srv) -//} -// -//var _Msg_serviceDesc = grpc.ServiceDesc{ -// ServiceName: "neutronorg.neutron.feerefunder.Msg", -// HandlerType: (*MsgServer)(nil), -// Methods: []grpc.MethodDesc{}, -// Streams: []grpc.StreamDesc{}, -// Metadata: "feerefunder/tx.proto", -//} +// 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{} + +type msgClient struct { + cc grpc1.ClientConn +} + +func NewMsgClient(cc grpc1.ClientConn) MsgClient { + return &msgClient{cc} +} + +// MsgServer is the server API for Msg service. +type MsgServer interface{} + +// UnimplementedMsgServer can be embedded to have forward compatible implementations. +type UnimplementedMsgServer struct{} + +func RegisterMsgServer(s grpc1.Server, srv MsgServer) { + s.RegisterService(&_Msg_serviceDesc, srv) +} + +var _Msg_serviceDesc = grpc.ServiceDesc{ + ServiceName: "neutronorg.neutron.feerefunder.Msg", + HandlerType: (*MsgServer)(nil), + Methods: []grpc.MethodDesc{}, + Streams: []grpc.StreamDesc{}, + Metadata: "feerefunder/tx.proto", +} diff --git a/x/ibc-hooks/ibc_middleware_test.go b/x/ibc-hooks/ibc_middleware_test.go index 77ae73b7d..9bb9093a4 100644 --- a/x/ibc-hooks/ibc_middleware_test.go +++ b/x/ibc-hooks/ibc_middleware_test.go @@ -6,6 +6,8 @@ import ( "os" "testing" + "cosmossdk.io/math" + wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" sdk "github.com/cosmos/cosmos-sdk/types" @@ -33,7 +35,7 @@ func TestIBCHooksTestSuite(t *testing.T) { func (suite *HooksTestSuite) TestOnRecvPacketHooks() { var ( trace transfertypes.DenomTrace - amount sdk.Int + amount math.Int receiver string status testutils.Status ) @@ -334,7 +336,7 @@ func (suite *HooksTestSuite) StoreContractCode(chain *ibctesting.TestChain, addr panic(err) } - codeID, _, err := wasmkeeper.NewDefaultPermissionKeeper(suite.GetNeutronZoneApp(chain).WasmKeeper).Create(chain.GetContext(), addr, wasmCode, &wasmtypes.AccessConfig{Permission: wasmtypes.AccessTypeEverybody, Address: ""}) + codeID, _, err := wasmkeeper.NewDefaultPermissionKeeper(suite.GetNeutronZoneApp(chain).WasmKeeper).Create(chain.GetContext(), addr, wasmCode, &wasmtypes.AccessConfig{Permission: wasmtypes.AccessTypeEverybody}) if err != nil { panic(err) } diff --git a/x/ibc-hooks/ibc_module.go b/x/ibc-hooks/ibc_module.go index 4145d70b7..11ac966cf 100644 --- a/x/ibc-hooks/ibc_module.go +++ b/x/ibc-hooks/ibc_module.go @@ -236,7 +236,7 @@ func (im IBCMiddleware) OnTimeoutPacket( // SendPacket implements the ICS4 Wrapper interface func (im IBCMiddleware) SendPacket( - ctx sdk.Context, channelCap *capabilitytypes.Capability, sourcePort string, sourceChannel string, timeoutHeight clienttypes.Height, timeoutTimestamp uint64, data []byte, + ctx sdk.Context, channelCap *capabilitytypes.Capability, sourcePort, sourceChannel string, timeoutHeight clienttypes.Height, timeoutTimestamp uint64, data []byte, ) (sequence uint64, err error) { return im.ICS4Middleware.SendPacket(ctx, channelCap, sourcePort, sourceChannel, timeoutHeight, timeoutTimestamp, data) } diff --git a/x/ibc-hooks/ics4_middleware.go b/x/ibc-hooks/ics4_middleware.go index c3e249302..d866dedd9 100644 --- a/x/ibc-hooks/ics4_middleware.go +++ b/x/ibc-hooks/ics4_middleware.go @@ -1,9 +1,9 @@ package ibchooks import ( + "cosmossdk.io/errors" // external libraries sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" "github.com/neutron-org/neutron/x/ibc-hooks/types" @@ -32,10 +32,10 @@ func NewICS4Middleware(channelKeeper types.ChannelKeeper, channel porttypes.ICS4 } } -func (i ICS4Middleware) SendPacket(ctx sdk.Context, channelCap *capabilitytypes.Capability, sourcePort string, sourceChannel string, timeoutHeight clienttypes.Height, timeoutTimestamp uint64, data []byte) (sequence uint64, err error) { +func (i ICS4Middleware) SendPacket(ctx sdk.Context, channelCap *capabilitytypes.Capability, sourcePort, sourceChannel string, timeoutHeight clienttypes.Height, timeoutTimestamp uint64, data []byte) (sequence uint64, err error) { channel, found := i.channelKeeper.GetChannel(ctx, sourcePort, sourceChannel) if !found { - return 0, sdkerrors.Wrap(channeltypes.ErrChannelNotFound, sourceChannel) + return 0, errors.Wrap(channeltypes.ErrChannelNotFound, sourceChannel) } packet := channeltypes.NewPacket(data, sequence, sourcePort, sourceChannel, diff --git a/x/ibc-hooks/sdkmodule.go b/x/ibc-hooks/sdkmodule.go index 73e73b3cd..6025c665b 100644 --- a/x/ibc-hooks/sdkmodule.go +++ b/x/ibc-hooks/sdkmodule.go @@ -1,8 +1,10 @@ package ibchooks import ( - "cosmossdk.io/core/appmodule" "encoding/json" + + "cosmossdk.io/core/appmodule" + "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/types/module" diff --git a/x/ibc-hooks/types/errors.go b/x/ibc-hooks/types/errors.go index 9683d397f..3075a14b7 100644 --- a/x/ibc-hooks/types/errors.go +++ b/x/ibc-hooks/types/errors.go @@ -1,15 +1,17 @@ package types -import sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" +import ( + "cosmossdk.io/errors" +) var ( ErrBadMetadataFormatMsg = "wasm metadata not properly formatted for: '%v'. %s" ErrBadExecutionMsg = "cannot execute contract: %v" - ErrMsgValidation = sdkerrors.Register("wasm-hooks", 2, "error in wasmhook message validation") - ErrMarshaling = sdkerrors.Register("wasm-hooks", 3, "cannot marshal the ICS20 packet") - ErrInvalidPacket = sdkerrors.Register("wasm-hooks", 4, "invalid packet data") - ErrBadResponse = sdkerrors.Register("wasm-hooks", 5, "cannot create response") - ErrWasmError = sdkerrors.Register("wasm-hooks", 6, "wasm error") - ErrBadSender = sdkerrors.Register("wasm-hooks", 7, "bad sender") + ErrMsgValidation = errors.Register("wasm-hooks", 2, "error in wasmhook message validation") + ErrMarshaling = errors.Register("wasm-hooks", 3, "cannot marshal the ICS20 packet") + ErrInvalidPacket = errors.Register("wasm-hooks", 4, "invalid packet data") + ErrBadResponse = errors.Register("wasm-hooks", 5, "cannot create response") + ErrWasmError = errors.Register("wasm-hooks", 6, "wasm error") + ErrBadSender = errors.Register("wasm-hooks", 7, "bad sender") ) diff --git a/x/interchainqueries/handler.go b/x/interchainqueries/handler.go index 84c8e1cc5..fbe1c03fe 100644 --- a/x/interchainqueries/handler.go +++ b/x/interchainqueries/handler.go @@ -3,6 +3,8 @@ package interchainqueries import ( "fmt" + "cosmossdk.io/errors" + sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" @@ -28,7 +30,7 @@ func NewHandler(k keeper.Keeper) sdk.Handler { default: errMsg := fmt.Sprintf("unrecognized %s message type: %T", types.ModuleName, msg) - return nil, sdkerrors.Wrap(sdkerrors.ErrUnknownRequest, errMsg) + return nil, errors.Wrap(sdkerrors.ErrUnknownRequest, errMsg) } } } diff --git a/x/interchainqueries/keeper/grpc_query.go b/x/interchainqueries/keeper/grpc_query.go index bef7174fb..a1f040597 100644 --- a/x/interchainqueries/keeper/grpc_query.go +++ b/x/interchainqueries/keeper/grpc_query.go @@ -3,9 +3,10 @@ package keeper import ( "context" + "cosmossdk.io/errors" + "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" querytypes "github.com/cosmos/cosmos-sdk/types/query" contypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" tndtypes "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" @@ -23,7 +24,7 @@ func (k Keeper) RegisteredQuery(goCtx context.Context, request *types.QueryRegis registeredQuery, err := k.GetQueryByID(ctx, request.QueryId) if err != nil { - return nil, sdkerrors.Wrapf(types.ErrInvalidQueryID, "failed to get registered query by query id: %v", err) + return nil, errors.Wrapf(types.ErrInvalidQueryID, "failed to get registered query by query id: %v", err) } return &types.QueryRegisteredQueryResponse{RegisteredQuery: registeredQuery}, nil @@ -78,12 +79,12 @@ func (k Keeper) QueryResult(goCtx context.Context, request *types.QueryRegistere ctx := sdk.UnwrapSDKContext(goCtx) if !k.checkRegisteredQueryExists(ctx, request.QueryId) { - return nil, sdkerrors.Wrapf(types.ErrInvalidQueryID, "query with id %d doesn't exist", request.QueryId) + return nil, errors.Wrapf(types.ErrInvalidQueryID, "query with id %d doesn't exist", request.QueryId) } result, err := k.GetQueryResultByID(ctx, request.QueryId) if err != nil { - return nil, sdkerrors.Wrapf(err, "failed to get query result by query id: %v", err) + return nil, errors.Wrapf(err, "failed to get query result by query id: %v", err) } return &types.QueryRegisteredQueryResultResponse{Result: result}, nil } @@ -92,14 +93,14 @@ func (k Keeper) LastRemoteHeight(goCtx context.Context, request *types.QueryLast req := contypes.QueryConnectionClientStateRequest{ConnectionId: request.ConnectionId} r, err := k.ibcKeeper.ConnectionClientState(goCtx, &req) if err != nil { - return nil, sdkerrors.Wrapf(types.ErrInvalidConnectionID, "connection not found") + return nil, errors.Wrapf(types.ErrInvalidConnectionID, "connection not found") } clientState := r.GetIdentifiedClientState().GetClientState() m := new(tndtypes.ClientState) err = proto.Unmarshal(clientState.Value, m) if err != nil { - return nil, sdkerrors.Wrapf(types.ErrProtoUnmarshal, "can't unmarshal client state") + return nil, errors.Wrapf(types.ErrProtoUnmarshal, "can't unmarshal client state") } return &types.QueryLastRemoteHeightResponse{Height: m.LatestHeight.RevisionHeight}, nil diff --git a/x/interchainqueries/keeper/keeper.go b/x/interchainqueries/keeper/keeper.go index 6c6e08982..731fcdea1 100644 --- a/x/interchainqueries/keeper/keeper.go +++ b/x/interchainqueries/keeper/keeper.go @@ -4,12 +4,13 @@ import ( "fmt" "time" + "cosmossdk.io/errors" + "github.com/cometbft/cometbft/libs/log" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/store/prefix" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper" tendermintLightClientTypes "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" @@ -79,7 +80,7 @@ func (k Keeper) SaveQuery(ctx sdk.Context, query *types.RegisteredQuery) error { store := ctx.KVStore(k.storeKey) bz, err := k.cdc.Marshal(query) if err != nil { - return sdkerrors.Wrapf(types.ErrProtoMarshal, "failed to marshal registered query: %v", err) + return errors.Wrapf(types.ErrProtoMarshal, "failed to marshal registered query: %v", err) } store.Set(types.GetRegisteredQueryByIDKey(query.Id), bz) @@ -93,12 +94,12 @@ func (k Keeper) GetQueryByID(ctx sdk.Context, id uint64) (*types.RegisteredQuery bz := store.Get(types.GetRegisteredQueryByIDKey(id)) if bz == nil { - return nil, sdkerrors.Wrapf(types.ErrInvalidQueryID, "there is no query with id: %v", id) + return nil, errors.Wrapf(types.ErrInvalidQueryID, "there is no query with id: %v", id) } var query types.RegisteredQuery if err := k.cdc.Unmarshal(bz, &query); err != nil { - return nil, sdkerrors.Wrapf(types.ErrProtoUnmarshal, "failed to unmarshal registered query: %v", err) + return nil, errors.Wrapf(types.ErrProtoUnmarshal, "failed to unmarshal registered query: %v", err) } return &query, nil @@ -184,7 +185,7 @@ func (k Keeper) TxQueriesCleanup(ctx sdk.Context) { func (k Keeper) SaveKVQueryResult(ctx sdk.Context, queryID uint64, result *types.QueryResult) error { query, err := k.getRegisteredQueryByID(ctx, queryID) if err != nil { - return sdkerrors.Wrap(err, "failed to get registered query") + return errors.Wrap(err, "failed to get registered query") } return k.saveKVQueryResult(ctx, query, result) @@ -218,7 +219,7 @@ func (k Keeper) GetQueryResultByID(ctx sdk.Context, id uint64) (*types.QueryResu var query types.QueryResult if err := k.cdc.Unmarshal(bz, &query); err != nil { - return nil, sdkerrors.Wrapf(types.ErrProtoUnmarshal, "failed to unmarshal registered query: %v", err) + return nil, errors.Wrapf(types.ErrProtoUnmarshal, "failed to unmarshal registered query: %v", err) } return &query, nil @@ -227,7 +228,7 @@ func (k Keeper) GetQueryResultByID(ctx sdk.Context, id uint64) (*types.QueryResu func (k Keeper) UpdateLastLocalHeight(ctx sdk.Context, queryID, newLocalHeight uint64) error { query, err := k.getRegisteredQueryByID(ctx, queryID) if err != nil { - return sdkerrors.Wrap(err, "failed to get registered query") + return errors.Wrap(err, "failed to get registered query") } query.LastSubmittedResultLocalHeight = newLocalHeight @@ -240,11 +241,11 @@ func (k Keeper) UpdateLastLocalHeight(ctx sdk.Context, queryID, newLocalHeight u func (k Keeper) UpdateLastRemoteHeight(ctx sdk.Context, queryID uint64, newRemoteHeight ibcclienttypes.Height) error { query, err := k.getRegisteredQueryByID(ctx, queryID) if err != nil { - return sdkerrors.Wrap(err, "failed to get registered query") + return errors.Wrap(err, "failed to get registered query") } if err := k.checkLastRemoteHeight(ctx, *query, newRemoteHeight); err != nil { - return sdkerrors.Wrap(types.ErrInvalidHeight, err.Error()) + return errors.Wrap(types.ErrInvalidHeight, err.Error()) } k.updateLastRemoteHeight(ctx, query, newRemoteHeight) return k.SaveQuery(ctx, query) @@ -258,14 +259,14 @@ func (k Keeper) saveKVQueryResult(ctx sdk.Context, query *types.RegisteredQuery, cleanResult := clearQueryResult(result) bz, err := k.cdc.Marshal(&cleanResult) if err != nil { - return sdkerrors.Wrapf(types.ErrProtoMarshal, "failed to marshal result result: %v", err) + return errors.Wrapf(types.ErrProtoMarshal, "failed to marshal result result: %v", err) } store.Set(types.GetRegisteredQueryResultByIDKey(query.Id), bz) k.updateLastRemoteHeight(ctx, query, ibcclienttypes.NewHeight(result.Revision, result.Height)) k.updateLastLocalHeight(ctx, query, uint64(ctx.BlockHeight())) if err := k.SaveQuery(ctx, query); err != nil { - return sdkerrors.Wrapf(err, "failed to save query %d: %v", query.Id, err) + return errors.Wrapf(err, "failed to save query %d: %v", query.Id, err) } k.Logger(ctx).Debug("Successfully saved query result", "result", &result) @@ -297,12 +298,12 @@ func (k Keeper) getRegisteredQueryByID(ctx sdk.Context, queryID uint64) (*types. store := ctx.KVStore(k.storeKey) bz := store.Get(types.GetRegisteredQueryByIDKey(queryID)) if bz == nil { - return nil, sdkerrors.Wrapf(types.ErrInvalidQueryID, "query with ID %d not found", queryID) + return nil, errors.Wrapf(types.ErrInvalidQueryID, "query with ID %d not found", queryID) } var query types.RegisteredQuery if err := k.cdc.Unmarshal(bz, &query); err != nil { - return nil, sdkerrors.Wrapf(types.ErrProtoUnmarshal, "failed to unmarshal registered query: %v", err) + return nil, errors.Wrapf(types.ErrProtoUnmarshal, "failed to unmarshal registered query: %v", err) } return &query, nil } @@ -338,12 +339,12 @@ func (k Keeper) checkRegisteredQueryExists(ctx sdk.Context, id uint64) bool { func (k Keeper) GetClientState(ctx sdk.Context, clientID string) (*tendermintLightClientTypes.ClientState, error) { clientStateResponse, ok := k.ibcKeeper.ClientKeeper.GetClientState(ctx, clientID) if !ok { - return nil, sdkerrors.Wrapf(types.ErrInvalidClientID, "could not find a ClientState with client id: %s", clientID) + return nil, errors.Wrapf(types.ErrInvalidClientID, "could not find a ClientState with client id: %s", clientID) } clientState, ok := clientStateResponse.(*tendermintLightClientTypes.ClientState) if !ok { - return nil, sdkerrors.Wrapf(ibcclienttypes.ErrInvalidClientType, "cannot cast ClientState interface into ClientState type") + return nil, errors.Wrapf(ibcclienttypes.ErrInvalidClientType, "cannot cast ClientState interface into ClientState type") } return clientState, nil diff --git a/x/interchainqueries/keeper/keeper_test.go b/x/interchainqueries/keeper/keeper_test.go index e4f23a4e3..beaca0287 100644 --- a/x/interchainqueries/keeper/keeper_test.go +++ b/x/interchainqueries/keeper/keeper_test.go @@ -3,9 +3,10 @@ package keeper_test import ( "encoding/hex" "fmt" - ibchost "github.com/cosmos/ibc-go/v7/modules/core/exported" "testing" + ibchost "github.com/cosmos/ibc-go/v7/modules/core/exported" + sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/suite" diff --git a/x/interchainqueries/keeper/msg_server.go b/x/interchainqueries/keeper/msg_server.go index 8b2254077..4ce0942a2 100644 --- a/x/interchainqueries/keeper/msg_server.go +++ b/x/interchainqueries/keeper/msg_server.go @@ -4,11 +4,14 @@ import ( "bytes" "context" "fmt" - tendermint "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" "net/url" "strconv" "time" + "cosmossdk.io/errors" + + tendermint "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" + "github.com/cosmos/cosmos-sdk/telemetry" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" @@ -39,17 +42,17 @@ func (k msgServer) RegisterInterchainQuery(goCtx context.Context, msg *types.Msg senderAddr, err := sdk.AccAddressFromBech32(msg.Sender) if err != nil { k.Logger(ctx).Debug("RegisterInterchainQuery: failed to parse sender address", "sender_address", msg.Sender) - return nil, sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "failed to parse address: %s", msg.Sender) + return nil, errors.Wrapf(sdkerrors.ErrInvalidAddress, "failed to parse address: %s", msg.Sender) } if !k.contractManagerKeeper.HasContractInfo(ctx, senderAddr) { k.Logger(ctx).Debug("RegisterInterchainQuery: contract not found", "sender_address", msg.Sender) - return nil, sdkerrors.Wrapf(types.ErrNotContract, "%s is not a contract address", msg.Sender) + return nil, errors.Wrapf(types.ErrNotContract, "%s is not a contract address", msg.Sender) } if _, err := k.ibcKeeper.ConnectionKeeper.Connection(goCtx, &ibcconnectiontypes.QueryConnectionRequest{ConnectionId: msg.ConnectionId}); err != nil { ctx.Logger().Debug("RegisterInterchainQuery: failed to get connection with ID", "message", msg) - return nil, sdkerrors.Wrapf(types.ErrInvalidConnectionID, "failed to get connection with ID '%s': %v", msg.ConnectionId, err) + return nil, errors.Wrapf(types.ErrInvalidConnectionID, "failed to get connection with ID '%s': %v", msg.ConnectionId, err) } lastID := k.GetLastRegisteredQueryKey(ctx) @@ -74,12 +77,12 @@ func (k msgServer) RegisterInterchainQuery(goCtx context.Context, msg *types.Msg if err := k.CollectDeposit(ctx, *registeredQuery); err != nil { ctx.Logger().Debug("RegisterInterchainQuery: failed to collect deposit", "message", &msg, "error", err) - return nil, sdkerrors.Wrapf(err, "failed to collect deposit") + return nil, errors.Wrapf(err, "failed to collect deposit") } if err := k.SaveQuery(ctx, registeredQuery); err != nil { ctx.Logger().Debug("RegisterInterchainQuery: failed to save query", "message", &msg, "error", err) - return nil, sdkerrors.Wrapf(err, "failed to save query: %v", err) + return nil, errors.Wrapf(err, "failed to save query: %v", err) } ctx.EventManager().EmitEvents(getEventsQueryUpdated(registeredQuery)) @@ -95,13 +98,13 @@ func (k msgServer) RemoveInterchainQuery(goCtx context.Context, msg *types.MsgRe if err != nil { ctx.Logger().Debug("RemoveInterchainQuery: failed to GetQueryByID", "error", err, "query_id", msg.QueryId) - return nil, sdkerrors.Wrapf(err, "failed to get query by query id: %v", err) + return nil, errors.Wrapf(err, "failed to get query by query id: %v", err) } if err := query.ValidateRemoval(ctx, msg.GetSender()); err != nil { ctx.Logger().Debug("RemoveInterchainQuery: authorization failed", "error", err, "msg", msg) - return nil, sdkerrors.Wrap(sdkerrors.ErrUnauthorized, err.Error()) + return nil, errors.Wrap(sdkerrors.ErrUnauthorized, err.Error()) } k.RemoveQuery(ctx, query) @@ -118,19 +121,19 @@ func (k msgServer) UpdateInterchainQuery(goCtx context.Context, msg *types.MsgUp if err != nil { ctx.Logger().Debug("UpdateInterchainQuery: failed to GetQueryByID", "error", err, "query_id", msg.QueryId) - return nil, sdkerrors.Wrapf(err, "failed to get query by query id: %v", err) + return nil, errors.Wrapf(err, "failed to get query by query id: %v", err) } if query.GetOwner() != msg.GetSender() { ctx.Logger().Debug("UpdateInterchainQuery: authorization failed", "msg", msg) - return nil, sdkerrors.Wrap(sdkerrors.ErrUnauthorized, "authorization failed") + return nil, errors.Wrap(sdkerrors.ErrUnauthorized, "authorization failed") } if err := k.validateUpdateInterchainQueryParams(query, msg); err != nil { ctx.Logger().Debug("UpdateInterchainQuery: invalid request", "error", err, "query_id", msg.QueryId) - return nil, sdkerrors.Wrap(sdkerrors.ErrInvalidRequest, err.Error()) + return nil, errors.Wrap(sdkerrors.ErrInvalidRequest, err.Error()) } if msg.GetNewUpdatePeriod() > 0 { query.UpdatePeriod = msg.GetNewUpdatePeriod() @@ -144,7 +147,7 @@ func (k msgServer) UpdateInterchainQuery(goCtx context.Context, msg *types.MsgUp if err := k.SaveQuery(ctx, query); err != nil { ctx.Logger().Debug("UpdateInterchainQuery: failed to save query", "message", &msg, "error", err) - return nil, sdkerrors.Wrapf(err, "failed to save query by query id: %v", err) + return nil, errors.Wrapf(err, "failed to save query by query id: %v", err) } ctx.EventManager().EmitEvents(getEventsQueryUpdated(query)) @@ -162,25 +165,25 @@ func (k msgServer) SubmitQueryResult(goCtx context.Context, msg *types.MsgSubmit if err != nil { ctx.Logger().Debug("SubmitQueryResult: failed to GetQueryByID", "error", err, "query_id", msg.QueryId) - return nil, sdkerrors.Wrapf(err, "failed to get query by id: %v", err) + return nil, errors.Wrapf(err, "failed to get query by id: %v", err) } queryOwner, err := sdk.AccAddressFromBech32(query.Owner) if err != nil { ctx.Logger().Error("SubmitQueryResult: failed to decode AccAddressFromBech32", "error", err, "query", query, "message", msg) - return nil, sdkerrors.Wrapf(err, "failed to decode owner contract address (%s)", query.Owner) + return nil, errors.Wrapf(err, "failed to decode owner contract address (%s)", query.Owner) } if msg.Result.KvResults != nil { if !types.InterchainQueryType(query.QueryType).IsKV() { - return nil, sdkerrors.Wrapf(types.ErrInvalidType, "invalid query result for query type: %s", query.QueryType) + return nil, errors.Wrapf(types.ErrInvalidType, "invalid query result for query type: %s", query.QueryType) } if err := k.checkLastRemoteHeight(ctx, *query, ibcclienttypes.NewHeight(msg.Result.Revision, msg.Result.Height)); err != nil { - return nil, sdkerrors.Wrap(types.ErrInvalidHeight, err.Error()) + return nil, errors.Wrap(types.ErrInvalidHeight, err.Error()) } if len(msg.Result.KvResults) != len(query.Keys) { - return nil, sdkerrors.Wrapf(types.ErrInvalidSubmittedResult, "KV keys length from result is not equal to registered query keys length: %v != %v", len(msg.Result.KvResults), len(query.Keys)) + return nil, errors.Wrapf(types.ErrInvalidSubmittedResult, "KV keys length from result is not equal to registered query keys length: %v != %v", len(msg.Result.KvResults), len(query.Keys)) } resp, err := k.ibcKeeper.ConnectionConsensusState(goCtx, &ibcconnectiontypes.QueryConnectionConsensusStateRequest{ @@ -191,7 +194,7 @@ func (k msgServer) SubmitQueryResult(goCtx context.Context, msg *types.MsgSubmit if err != nil { ctx.Logger().Debug("SubmitQueryResult: failed to get ConnectionConsensusState", "error", err, "query", query, "message", msg) - return nil, sdkerrors.Wrapf(ibcclienttypes.ErrConsensusStateNotFound, "failed to get consensus state: %v", err) + return nil, errors.Wrapf(ibcclienttypes.ErrConsensusStateNotFound, "failed to get consensus state: %v", err) } consensusStateI, err := ibcclienttypes.UnpackConsensusState(resp.ConsensusState) if err != nil { @@ -204,7 +207,7 @@ func (k msgServer) SubmitQueryResult(goCtx context.Context, msg *types.MsgSubmit if !ok { ctx.Logger().Error("SubmitQueryResult: failed to cast exported.ConsensusState to *tendermint.ConsensusState", "error", err, "query", query, "message", msg) - return nil, sdkerrors.Wrapf(sdkerrors.ErrUnpackAny, "failed to cast interface exported.ConsensusState to type *tendermint.ConsensusState") + return nil, errors.Wrapf(sdkerrors.ErrUnpackAny, "failed to cast interface exported.ConsensusState to type *tendermint.ConsensusState") } clientState, err := k.GetClientState(ctx, msg.ClientId) @@ -217,15 +220,15 @@ func (k msgServer) SubmitQueryResult(goCtx context.Context, msg *types.MsgSubmit if err != nil { ctx.Logger().Debug("SubmitQueryResult: failed to ConvertProofs", "error", err, "query", query, "message", msg) - return nil, sdkerrors.Wrapf(types.ErrInvalidType, "failed to convert crypto.ProofOps to MerkleProof: %v", err) + return nil, errors.Wrapf(types.ErrInvalidType, "failed to convert crypto.ProofOps to MerkleProof: %v", err) } if !bytes.Equal(result.Key, query.Keys[index].Key) { - return nil, sdkerrors.Wrapf(types.ErrInvalidSubmittedResult, "KV key from result is not equal to registered query key: %v != %v", result.Key, query.Keys[index].Key) + return nil, errors.Wrapf(types.ErrInvalidSubmittedResult, "KV key from result is not equal to registered query key: %v != %v", result.Key, query.Keys[index].Key) } if result.StoragePrefix != query.Keys[index].Path { - return nil, sdkerrors.Wrapf(types.ErrInvalidSubmittedResult, "KV path from result is not equal to registered query storage prefix: %v != %v", result.StoragePrefix, query.Keys[index].Path) + return nil, errors.Wrapf(types.ErrInvalidSubmittedResult, "KV path from result is not equal to registered query storage prefix: %v != %v", result.StoragePrefix, query.Keys[index].Path) } path := ibccommitmenttypes.NewMerklePath(result.StoragePrefix, url.PathEscape(string(result.Key))) @@ -237,24 +240,24 @@ func (k msgServer) SubmitQueryResult(goCtx context.Context, msg *types.MsgSubmit if err := proof.VerifyNonMembership(clientState.ProofSpecs, consensusState.GetRoot(), path); err != nil { ctx.Logger().Debug("SubmitQueryResult: failed to VerifyNonMembership", "error", err, "query", query, "message", msg, "path", path) - return nil, sdkerrors.Wrapf(types.ErrInvalidProof, "failed to verify proof: %v", err) + return nil, errors.Wrapf(types.ErrInvalidProof, "failed to verify proof: %v", err) } result.Value = nil case *ics23.CommitmentProof_Exist: if err := proof.VerifyMembership(clientState.ProofSpecs, consensusState.GetRoot(), path, result.Value); err != nil { ctx.Logger().Debug("SubmitQueryResult: failed to VerifyMembership", "error", err, "query", query, "message", msg, "path", path) - return nil, sdkerrors.Wrapf(types.ErrInvalidProof, "failed to verify proof: %v", err) + return nil, errors.Wrapf(types.ErrInvalidProof, "failed to verify proof: %v", err) } default: - return nil, sdkerrors.Wrapf(types.ErrInvalidProof, "unknown proof type %T", proof.GetProofs()[0].GetProof()) + return nil, errors.Wrapf(types.ErrInvalidProof, "unknown proof type %T", proof.GetProofs()[0].GetProof()) } } if err = k.saveKVQueryResult(ctx, query, msg.Result); err != nil { ctx.Logger().Error("SubmitQueryResult: failed to SaveKVQueryResult", "error", err, "query", query, "message", msg) - return nil, sdkerrors.Wrapf(err, "failed to SaveKVQueryResult: %v", err) + return nil, errors.Wrapf(err, "failed to SaveKVQueryResult: %v", err) } if msg.Result.GetAllowKvCallbacks() { @@ -262,7 +265,7 @@ func (k msgServer) SubmitQueryResult(goCtx context.Context, msg *types.MsgSubmit if _, err := k.contractManagerKeeper.SudoKVQueryResult(ctx, queryOwner, query.Id); err != nil { ctx.Logger().Debug("SubmitQueryResult: failed to SudoKVQueryResult", "error", err, "query_id", query.GetId()) - return nil, sdkerrors.Wrapf(err, "contract %s rejected KV query result (query_id: %d)", + return nil, errors.Wrapf(err, "contract %s rejected KV query result (query_id: %d)", queryOwner, query.GetId()) } return &types.MsgSubmitQueryResultResponse{}, nil @@ -271,17 +274,17 @@ func (k msgServer) SubmitQueryResult(goCtx context.Context, msg *types.MsgSubmit if msg.Result.Block != nil && msg.Result.Block.Tx != nil { if !types.InterchainQueryType(query.QueryType).IsTX() { - return nil, sdkerrors.Wrapf(types.ErrInvalidType, "invalid query result for query type: %s", query.QueryType) + return nil, errors.Wrapf(types.ErrInvalidType, "invalid query result for query type: %s", query.QueryType) } if err := k.ProcessBlock(ctx, queryOwner, msg.QueryId, msg.ClientId, msg.Result.Block); err != nil { ctx.Logger().Debug("SubmitQueryResult: failed to ProcessBlock", "error", err, "query", query, "message", msg) - return nil, sdkerrors.Wrapf(err, "failed to ProcessBlock: %v", err) + return nil, errors.Wrapf(err, "failed to ProcessBlock: %v", err) } if err = k.UpdateLastLocalHeight(ctx, query.Id, uint64(ctx.BlockHeight())); err != nil { - return nil, sdkerrors.Wrapf(err, + return nil, errors.Wrapf(err, "failed to update last local height for a result with id %d: %v", query.Id, err) } } diff --git a/x/interchainqueries/keeper/process_block_results.go b/x/interchainqueries/keeper/process_block_results.go index 02b4a3408..f00e55b7e 100644 --- a/x/interchainqueries/keeper/process_block_results.go +++ b/x/interchainqueries/keeper/process_block_results.go @@ -4,6 +4,8 @@ import ( "bytes" "encoding/hex" + "cosmossdk.io/errors" + codectypes "github.com/cosmos/cosmos-sdk/codec/types" clientkeeper "github.com/cosmos/ibc-go/v7/modules/core/02-client/keeper" @@ -11,7 +13,6 @@ import ( "github.com/cometbft/cometbft/crypto/merkle" tmtypes "github.com/cometbft/cometbft/types" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" "github.com/cosmos/ibc-go/v7/modules/core/exported" tendermintLightClientTypes "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" @@ -33,24 +34,24 @@ func deterministicResponseDeliverTx(response *abci.ResponseDeliverTx) *abci.Resp // checkHeadersOrder do some basic checks to verify that nextHeader is really next for the header func checkHeadersOrder(header, nextHeader *tendermintLightClientTypes.Header) error { if nextHeader.Header.Height != header.Header.Height+1 { - return sdkerrors.Wrapf(types.ErrInvalidHeader, "nextHeader.Height (%d) is not actually next for a header with height %d", nextHeader.Header.Height, header.Header.Height) + return errors.Wrapf(types.ErrInvalidHeader, "nextHeader.Height (%d) is not actually next for a header with height %d", nextHeader.Header.Height, header.Header.Height) } tmHeader, err := tmtypes.HeaderFromProto(header.Header) if err != nil { - return sdkerrors.Wrapf(types.ErrInvalidHeader, "failed to get tendermint header from proto header: %v", err) + return errors.Wrapf(types.ErrInvalidHeader, "failed to get tendermint header from proto header: %v", err) } tmNextHeader, err := tmtypes.HeaderFromProto(nextHeader.Header) if err != nil { - return sdkerrors.Wrapf(types.ErrInvalidHeader, "failed to get tendermint header from proto header: %v", err) + return errors.Wrapf(types.ErrInvalidHeader, "failed to get tendermint header from proto header: %v", err) } if !bytes.Equal(tmHeader.NextValidatorsHash, tmNextHeader.ValidatorsHash) { - return sdkerrors.Wrapf(types.ErrInvalidHeader, "header.NextValidatorsHash is not equal to nextHeader.ValidatorsHash: %s != %s", tmHeader.NextValidatorsHash.String(), tmNextHeader.ValidatorsHash.String()) + return errors.Wrapf(types.ErrInvalidHeader, "header.NextValidatorsHash is not equal to nextHeader.ValidatorsHash: %s != %s", tmHeader.NextValidatorsHash.String(), tmNextHeader.ValidatorsHash.String()) } if !bytes.Equal(tmHeader.Hash(), tmNextHeader.LastBlockID.Hash) { - return sdkerrors.Wrapf(types.ErrInvalidHeader, "header.Hash() is not equal to nextHeader.LastBlockID.Hash: %s != %s", tmHeader.Hash().String(), tmNextHeader.LastBlockID.Hash.String()) + return errors.Wrapf(types.ErrInvalidHeader, "header.Hash() is not equal to nextHeader.LastBlockID.Hash: %s != %s", tmHeader.Hash().String(), tmNextHeader.LastBlockID.Hash.String()) } return nil @@ -66,25 +67,25 @@ func (v Verifier) VerifyHeaders(ctx sdk.Context, clientKeeper clientkeeper.Keepe // Honestly we need only to verify headers, but since the check functions are private, and we don't want to duplicate the code, // we update consensus state at the same time (because why not?) if err := clientKeeper.UpdateClient(ctx, clientID, header); err != nil { - return sdkerrors.Wrapf(err, "failed to update client: %v", err) + return errors.Wrapf(err, "failed to update client: %v", err) } if err := clientKeeper.UpdateClient(ctx, clientID, nextHeader); err != nil { - return sdkerrors.Wrapf(err, "failed to update client: %v", err) + return errors.Wrapf(err, "failed to update client: %v", err) } tmHeader, ok := header.(*tendermintLightClientTypes.Header) if !ok { - return sdkerrors.Wrapf(types.ErrInvalidType, "failed to cast header to tendermint Header") + return errors.Wrapf(types.ErrInvalidType, "failed to cast header to tendermint Header") } tmNextHeader, ok := nextHeader.(*tendermintLightClientTypes.Header) if !ok { - return sdkerrors.Wrapf(types.ErrInvalidType, "failed to cast header to tendermint Header") + return errors.Wrapf(types.ErrInvalidType, "failed to cast header to tendermint Header") } // do some basic check to verify that tmNextHeader is next for the tmHeader if err := checkHeadersOrder(tmHeader, tmNextHeader); err != nil { - return sdkerrors.Wrapf(types.ErrInvalidHeader, "block.NextBlockHeader is not next for the block.Header: %v", err) + return errors.Wrapf(types.ErrInvalidHeader, "block.NextBlockHeader is not next for the block.Header: %v", err) } return nil @@ -100,30 +101,30 @@ func (k Keeper) ProcessBlock(ctx sdk.Context, queryOwner sdk.AccAddress, queryID header, err := k.headerVerifier.UnpackHeader(block.Header) if err != nil { ctx.Logger().Debug("ProcessBlock: failed to unpack block header", "error", err) - return sdkerrors.Wrapf(types.ErrProtoUnmarshal, "failed to unpack block header: %v", err) + return errors.Wrapf(types.ErrProtoUnmarshal, "failed to unpack block header: %v", err) } nextHeader, err := k.headerVerifier.UnpackHeader(block.NextBlockHeader) if err != nil { ctx.Logger().Debug("ProcessBlock: failed to unpack block header", "error", err) - return sdkerrors.Wrapf(types.ErrProtoUnmarshal, "failed to unpack next block header: %v", err) + return errors.Wrapf(types.ErrProtoUnmarshal, "failed to unpack next block header: %v", err) } if err := k.headerVerifier.VerifyHeaders(ctx, k.ibcKeeper.ClientKeeper, clientID, header, nextHeader); err != nil { ctx.Logger().Debug("ProcessBlock: failed to verify headers", "error", err) - return sdkerrors.Wrapf(types.ErrInvalidHeader, "failed to verify headers: %v", err) + return errors.Wrapf(types.ErrInvalidHeader, "failed to verify headers: %v", err) } tmHeader, ok := header.(*tendermintLightClientTypes.Header) if !ok { ctx.Logger().Debug("ProcessBlock: failed to cast current header to tendermint Header", "query_id", queryID) - return sdkerrors.Wrap(types.ErrInvalidType, "failed to cast current header to tendermint Header") + return errors.Wrap(types.ErrInvalidType, "failed to cast current header to tendermint Header") } tmNextHeader, ok := nextHeader.(*tendermintLightClientTypes.Header) if !ok { ctx.Logger().Debug("ProcessBlock: failed to cast next header to tendermint Header", "query_id", queryID) - return sdkerrors.Wrap(types.ErrInvalidType, "failed to cast next header to tendermint header") + return errors.Wrap(types.ErrInvalidType, "failed to cast next header to tendermint header") } var ( @@ -136,14 +137,14 @@ func (k Keeper) ProcessBlock(ctx sdk.Context, queryOwner sdk.AccAddress, queryID if err = k.transactionVerifier.VerifyTransaction(tmHeader, tmNextHeader, tx); err != nil { ctx.Logger().Debug("ProcessBlock: failed to verifyTransaction", "error", err, "query_id", queryID, "tx_hash", hex.EncodeToString(txHash)) - return sdkerrors.Wrapf(types.ErrInternal, "failed to verifyTransaction %s: %v", hex.EncodeToString(txHash), err) + return errors.Wrapf(types.ErrInternal, "failed to verifyTransaction %s: %v", hex.EncodeToString(txHash), err) } // Let the query owner contract process the query result. if _, err := k.contractManagerKeeper.SudoTxQueryResult(ctx, queryOwner, queryID, ibcclienttypes.NewHeight(tmHeader.TrustedHeight.GetRevisionNumber(), uint64(tmHeader.Header.Height)), txData); err != nil { ctx.Logger().Debug("ProcessBlock: failed to SudoTxQueryResult", "error", err, "query_id", queryID, "tx_hash", hex.EncodeToString(txHash)) - return sdkerrors.Wrapf(err, "contract %s rejected transaction query result (tx_hash: %s)", + return errors.Wrapf(err, "contract %s rejected transaction query result (tx_hash: %s)", queryOwner, hex.EncodeToString(txHash)) } @@ -172,38 +173,38 @@ func (v TransactionVerifier) VerifyTransaction( // verify inclusion proof inclusionProof, err := merkle.ProofFromProto(tx.InclusionProof) if err != nil { - return sdkerrors.Wrapf(types.ErrInvalidType, "failed to convert proto proof to merkle proof: %v", err) + return errors.Wrapf(types.ErrInvalidType, "failed to convert proto proof to merkle proof: %v", err) } if err = inclusionProof.Verify(header.Header.DataHash, tmtypes.Tx(tx.Data).Hash()); err != nil { - return sdkerrors.Wrapf(types.ErrInvalidProof, "failed to verify inclusion proof: %v", err) + return errors.Wrapf(types.ErrInvalidProof, "failed to verify inclusion proof: %v", err) } // verify delivery proof deliveryProof, err := merkle.ProofFromProto(tx.DeliveryProof) if err != nil { - return sdkerrors.Wrapf(types.ErrInvalidType, "failed to convert proto proof to merkle proof: %v", err) + return errors.Wrapf(types.ErrInvalidType, "failed to convert proto proof to merkle proof: %v", err) } responseTx := deterministicResponseDeliverTx(tx.Response) responseTxBz, err := responseTx.Marshal() if err != nil { - return sdkerrors.Wrapf(types.ErrProtoMarshal, "failed to marshal ResponseDeliveryTx: %v", err) + return errors.Wrapf(types.ErrProtoMarshal, "failed to marshal ResponseDeliveryTx: %v", err) } if err = deliveryProof.Verify(nextHeader.Header.LastResultsHash, responseTxBz); err != nil { - return sdkerrors.Wrapf(types.ErrInvalidProof, "failed to verify delivery proof: %v", err) + return errors.Wrapf(types.ErrInvalidProof, "failed to verify delivery proof: %v", err) } // check that transaction was successful if tx.Response.Code != abci.CodeTypeOK { - return sdkerrors.Wrapf(types.ErrInternal, "tx %s is unsuccessful: ResponseDelivery.Code = %d", hex.EncodeToString(tmtypes.Tx(tx.Data).Hash()), tx.Response.Code) + return errors.Wrapf(types.ErrInternal, "tx %s is unsuccessful: ResponseDelivery.Code = %d", hex.EncodeToString(tmtypes.Tx(tx.Data).Hash()), tx.Response.Code) } // check that inclusion proof and delivery proof are for the same transaction if deliveryProof.Index != inclusionProof.Index { - return sdkerrors.Wrapf(types.ErrInvalidProof, "inclusion proof index and delivery proof index are not equal: %d != %d", inclusionProof.Index, deliveryProof.Index) + return errors.Wrapf(types.ErrInvalidProof, "inclusion proof index and delivery proof index are not equal: %d != %d", inclusionProof.Index, deliveryProof.Index) } return nil diff --git a/x/interchainqueries/keeper/process_block_results_test.go b/x/interchainqueries/keeper/process_block_results_test.go index 99a8dde41..8313f6a71 100644 --- a/x/interchainqueries/keeper/process_block_results_test.go +++ b/x/interchainqueries/keeper/process_block_results_test.go @@ -168,7 +168,6 @@ func (suite *KeeperTestSuite) TestUnpackAndVerifyHeaders() { { "valid headers", func() error { - //suite.Require().NoError(UpdateClient(suite.Path.EndpointA)) suite.Require().NoError(suite.Path.EndpointA.UpdateClient()) clientID := suite.Path.EndpointA.ClientID @@ -282,7 +281,6 @@ func (suite *KeeperTestSuite) TestUnpackAndVerifyHeaders() { err = tt.run() if tt.expectedErrorMsg != "" { - //suite.Require().ErrorAs(err, tt.expectedError) suite.Require().ErrorContains(err, tt.expectedErrorMsg) } else { suite.Require().NoError(err) diff --git a/x/interchainqueries/module.go b/x/interchainqueries/module.go index 6e3aed28d..1a1dc65eb 100644 --- a/x/interchainqueries/module.go +++ b/x/interchainqueries/module.go @@ -2,10 +2,11 @@ package interchainqueries import ( "context" - "cosmossdk.io/core/appmodule" "encoding/json" "fmt" + "cosmossdk.io/core/appmodule" + abci "github.com/cometbft/cometbft/abci/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" diff --git a/x/interchainqueries/types/errors.go b/x/interchainqueries/types/errors.go index c35a02d0b..4a3213ccc 100644 --- a/x/interchainqueries/types/errors.go +++ b/x/interchainqueries/types/errors.go @@ -1,31 +1,31 @@ package types import ( - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "cosmossdk.io/errors" ) // x/interchainqueries module sentinel errors var ( - ErrInvalidQueryID = sdkerrors.Register(ModuleName, 1100, "invalid query id") - ErrEmptyResult = sdkerrors.Register(ModuleName, 1101, "empty result") - ErrInvalidClientID = sdkerrors.Register(ModuleName, 1102, "invalid client id") - ErrInvalidUpdatePeriod = sdkerrors.Register(ModuleName, 1103, "invalid update period") - ErrInvalidConnectionID = sdkerrors.Register(ModuleName, 1104, "invalid connection id") - ErrInvalidQueryType = sdkerrors.Register(ModuleName, 1105, "invalid query type") - ErrInvalidTransactionsFilter = sdkerrors.Register(ModuleName, 1106, "invalid transactions filter") - ErrInvalidSubmittedResult = sdkerrors.Register(ModuleName, 1107, "invalid result") - ErrProtoMarshal = sdkerrors.Register(ModuleName, 1108, "failed to marshal protobuf bytes") - ErrProtoUnmarshal = sdkerrors.Register(ModuleName, 1109, "failed to unmarshal protobuf bytes") - ErrInvalidType = sdkerrors.Register(ModuleName, 1110, "invalid type") - ErrInternal = sdkerrors.Register(ModuleName, 1111, "internal error") - ErrInvalidProof = sdkerrors.Register(ModuleName, 1112, "merkle proof is invalid") - ErrInvalidHeader = sdkerrors.Register(ModuleName, 1113, "header is invalid") - ErrInvalidHeight = sdkerrors.Register(ModuleName, 1114, "height is invalid") - ErrNoQueryResult = sdkerrors.Register(ModuleName, 1115, "no query result") - ErrNotContract = sdkerrors.Register(ModuleName, 1116, "not a contract") - ErrEmptyKeys = sdkerrors.Register(ModuleName, 1117, "keys are empty") - ErrEmptyKeyPath = sdkerrors.Register(ModuleName, 1118, "key path is empty") - ErrEmptyKeyID = sdkerrors.Register(ModuleName, 1119, "key id is empty") - ErrTooManyKVQueryKeys = sdkerrors.Register(ModuleName, 1120, "too many keys") - ErrUnexpectedQueryTypeGenesis = sdkerrors.Register(ModuleName, 1121, "unexpected query type") + ErrInvalidQueryID = errors.Register(ModuleName, 1100, "invalid query id") + ErrEmptyResult = errors.Register(ModuleName, 1101, "empty result") + ErrInvalidClientID = errors.Register(ModuleName, 1102, "invalid client id") + ErrInvalidUpdatePeriod = errors.Register(ModuleName, 1103, "invalid update period") + ErrInvalidConnectionID = errors.Register(ModuleName, 1104, "invalid connection id") + ErrInvalidQueryType = errors.Register(ModuleName, 1105, "invalid query type") + ErrInvalidTransactionsFilter = errors.Register(ModuleName, 1106, "invalid transactions filter") + ErrInvalidSubmittedResult = errors.Register(ModuleName, 1107, "invalid result") + ErrProtoMarshal = errors.Register(ModuleName, 1108, "failed to marshal protobuf bytes") + ErrProtoUnmarshal = errors.Register(ModuleName, 1109, "failed to unmarshal protobuf bytes") + ErrInvalidType = errors.Register(ModuleName, 1110, "invalid type") + ErrInternal = errors.Register(ModuleName, 1111, "internal error") + ErrInvalidProof = errors.Register(ModuleName, 1112, "merkle proof is invalid") + ErrInvalidHeader = errors.Register(ModuleName, 1113, "header is invalid") + ErrInvalidHeight = errors.Register(ModuleName, 1114, "height is invalid") + ErrNoQueryResult = errors.Register(ModuleName, 1115, "no query result") + ErrNotContract = errors.Register(ModuleName, 1116, "not a contract") + ErrEmptyKeys = errors.Register(ModuleName, 1117, "keys are empty") + ErrEmptyKeyPath = errors.Register(ModuleName, 1118, "key path is empty") + ErrEmptyKeyID = errors.Register(ModuleName, 1119, "key id is empty") + ErrTooManyKVQueryKeys = errors.Register(ModuleName, 1120, "too many keys") + ErrUnexpectedQueryTypeGenesis = errors.Register(ModuleName, 1121, "unexpected query type") ) diff --git a/x/interchainqueries/types/genesis.go b/x/interchainqueries/types/genesis.go index 2a57447c4..c00668e58 100644 --- a/x/interchainqueries/types/genesis.go +++ b/x/interchainqueries/types/genesis.go @@ -1,8 +1,8 @@ package types import ( + "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" ) // DefaultGenesis returns the default Capability genesis state @@ -23,29 +23,29 @@ func (gs GenesisState) Validate() error { for _, val := range gs.GetRegisteredQueries() { if seenIDs[val.Id] { - return sdkerrors.Wrapf(ErrInvalidQueryID, "duplicate query id: %d", val.Id) + return errors.Wrapf(ErrInvalidQueryID, "duplicate query id: %d", val.Id) } seenIDs[val.Id] = true _, err = sdk.AccAddressFromBech32(val.Owner) if err != nil { - return sdkerrors.Wrapf(err, "Invalid owner address (%s)", err) + return errors.Wrapf(err, "Invalid owner address (%s)", err) } switch val.QueryType { case string(InterchainQueryTypeTX): if err := ValidateTransactionsFilter(val.TransactionsFilter); err != nil { - return sdkerrors.Wrap(ErrInvalidTransactionsFilter, err.Error()) + return errors.Wrap(ErrInvalidTransactionsFilter, err.Error()) } case string(InterchainQueryTypeKV): if len(val.Keys) == 0 { - return sdkerrors.Wrap(ErrEmptyKeys, "keys cannot be empty") + return errors.Wrap(ErrEmptyKeys, "keys cannot be empty") } if err := validateKeys(val.GetKeys()); err != nil { return err } default: - return sdkerrors.Wrapf(ErrUnexpectedQueryTypeGenesis, "Unexpected query type: %s", val.QueryType) + return errors.Wrapf(ErrUnexpectedQueryTypeGenesis, "Unexpected query type: %s", val.QueryType) } } return nil diff --git a/x/interchainqueries/types/message_remove_interchain_query.go b/x/interchainqueries/types/message_remove_interchain_query.go index 1369404f8..d64139663 100644 --- a/x/interchainqueries/types/message_remove_interchain_query.go +++ b/x/interchainqueries/types/message_remove_interchain_query.go @@ -3,6 +3,8 @@ package types import ( "strings" + "cosmossdk.io/errors" + sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" ) @@ -26,15 +28,15 @@ func (msg MsgRemoveInterchainQueryRequest) Type() string { func (msg MsgRemoveInterchainQueryRequest) ValidateBasic() error { if msg.GetQueryId() == 0 { - return sdkerrors.Wrap(ErrInvalidQueryID, "query_id cannot be empty or equal to 0") + return errors.Wrap(ErrInvalidQueryID, "query_id cannot be empty or equal to 0") } if strings.TrimSpace(msg.Sender) == "" { - return sdkerrors.Wrap(sdkerrors.ErrInvalidAddress, "missing sender address") + return errors.Wrap(sdkerrors.ErrInvalidAddress, "missing sender address") } if _, err := sdk.AccAddressFromBech32(msg.Sender); err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "failed to parse address: %s", msg.Sender) + return errors.Wrapf(sdkerrors.ErrInvalidAddress, "failed to parse address: %s", msg.Sender) } return nil diff --git a/x/interchainqueries/types/registered_query.go b/x/interchainqueries/types/registered_query.go index e8b505a4b..87c752a8c 100644 --- a/x/interchainqueries/types/registered_query.go +++ b/x/interchainqueries/types/registered_query.go @@ -3,6 +3,8 @@ package types import ( fmt "fmt" + "cosmossdk.io/errors" + sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" ) @@ -10,7 +12,7 @@ import ( func (q *RegisteredQuery) GetOwnerAddress() (creator sdk.AccAddress, err error) { creator, err = sdk.AccAddressFromBech32(q.Owner) if err != nil { - return nil, sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "failed to decode owner address: %s", q.Owner) + return nil, errors.Wrapf(sdkerrors.ErrInvalidAddress, "failed to decode owner address: %s", q.Owner) } return creator, nil diff --git a/x/interchainqueries/types/tx.go b/x/interchainqueries/types/tx.go index 715c82879..139698e0e 100644 --- a/x/interchainqueries/types/tx.go +++ b/x/interchainqueries/types/tx.go @@ -1,9 +1,11 @@ package types import ( - "github.com/cosmos/ibc-go/v7/modules/core/exported" "strings" + "cosmossdk.io/errors" + "github.com/cosmos/ibc-go/v7/modules/core/exported" + codectypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" @@ -25,27 +27,27 @@ func (msg MsgSubmitQueryResult) Type() string { func (msg MsgSubmitQueryResult) ValidateBasic() error { if msg.Result == nil { - return sdkerrors.Wrap(ErrEmptyResult, "query result can't be empty") + return errors.Wrap(ErrEmptyResult, "query result can't be empty") } if len(msg.Result.KvResults) == 0 && msg.Result.Block == nil { - return sdkerrors.Wrap(ErrEmptyResult, "query result can't be empty") + return errors.Wrap(ErrEmptyResult, "query result can't be empty") } if msg.QueryId == 0 { - return sdkerrors.Wrap(ErrInvalidQueryID, "query id cannot be equal zero") + return errors.Wrap(ErrInvalidQueryID, "query id cannot be equal zero") } if strings.TrimSpace(msg.Sender) == "" { - return sdkerrors.Wrap(sdkerrors.ErrInvalidAddress, "missing sender address") + return errors.Wrap(sdkerrors.ErrInvalidAddress, "missing sender address") } if _, err := sdk.AccAddressFromBech32(msg.Sender); err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "failed to parse address: %s", msg.Sender) + return errors.Wrapf(sdkerrors.ErrInvalidAddress, "failed to parse address: %s", msg.Sender) } if strings.TrimSpace(msg.ClientId) == "" { - return sdkerrors.Wrap(ErrInvalidClientID, "client id cannot be empty") + return errors.Wrap(ErrInvalidClientID, "client id cannot be empty") } return nil @@ -73,28 +75,28 @@ func (msg MsgRegisterInterchainQuery) Type() string { func (msg MsgRegisterInterchainQuery) ValidateBasic() error { if msg.UpdatePeriod == 0 { - return sdkerrors.Wrap(ErrInvalidUpdatePeriod, "update period can not be equal to zero") + return errors.Wrap(ErrInvalidUpdatePeriod, "update period can not be equal to zero") } if strings.TrimSpace(msg.Sender) == "" { - return sdkerrors.Wrap(sdkerrors.ErrInvalidAddress, "missing sender address") + return errors.Wrap(sdkerrors.ErrInvalidAddress, "missing sender address") } if _, err := sdk.AccAddressFromBech32(msg.Sender); err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "failed to parse address: %s", msg.Sender) + return errors.Wrapf(sdkerrors.ErrInvalidAddress, "failed to parse address: %s", msg.Sender) } if strings.TrimSpace(msg.ConnectionId) == "" { - return sdkerrors.Wrap(ErrInvalidConnectionID, "connection id cannot be empty") + return errors.Wrap(ErrInvalidConnectionID, "connection id cannot be empty") } if !InterchainQueryType(msg.QueryType).IsValid() { - return sdkerrors.Wrap(ErrInvalidQueryType, "invalid query type") + return errors.Wrap(ErrInvalidQueryType, "invalid query type") } if InterchainQueryType(msg.QueryType).IsKV() { if len(msg.Keys) == 0 { - return sdkerrors.Wrap(ErrEmptyKeys, "keys cannot be empty") + return errors.Wrap(ErrEmptyKeys, "keys cannot be empty") } if err := validateKeys(msg.GetKeys()); err != nil { return err @@ -103,7 +105,7 @@ func (msg MsgRegisterInterchainQuery) ValidateBasic() error { if InterchainQueryType(msg.QueryType).IsTX() { if err := ValidateTransactionsFilter(msg.TransactionsFilter); err != nil { - return sdkerrors.Wrap(ErrInvalidTransactionsFilter, err.Error()) + return errors.Wrap(ErrInvalidTransactionsFilter, err.Error()) } } return nil @@ -133,21 +135,21 @@ func (msg MsgSubmitQueryResult) UnpackInterfaces(unpacker codectypes.AnyUnpacker func (msg MsgUpdateInterchainQueryRequest) ValidateBasic() error { if msg.GetQueryId() == 0 { - return sdkerrors.Wrap(ErrInvalidQueryID, "query_id cannot be empty or equal to 0") + return errors.Wrap(ErrInvalidQueryID, "query_id cannot be empty or equal to 0") } newKeys := msg.GetNewKeys() newTxFilter := msg.GetNewTransactionsFilter() if len(newKeys) == 0 && newTxFilter == "" && msg.GetNewUpdatePeriod() == 0 { - return sdkerrors.Wrap( + return errors.Wrap( sdkerrors.ErrInvalidRequest, "one of new_keys, new_transactions_filter or new_update_period should be set", ) } if len(newKeys) != 0 && newTxFilter != "" { - return sdkerrors.Wrap( + return errors.Wrap( sdkerrors.ErrInvalidRequest, "either new_keys or new_transactions_filter should be set", ) @@ -161,15 +163,15 @@ func (msg MsgUpdateInterchainQueryRequest) ValidateBasic() error { if newTxFilter != "" { if err := ValidateTransactionsFilter(newTxFilter); err != nil { - return sdkerrors.Wrap(ErrInvalidTransactionsFilter, err.Error()) + return errors.Wrap(ErrInvalidTransactionsFilter, err.Error()) } } if strings.TrimSpace(msg.Sender) == "" { - return sdkerrors.Wrap(sdkerrors.ErrInvalidAddress, "missing sender address") + return errors.Wrap(sdkerrors.ErrInvalidAddress, "missing sender address") } if _, err := sdk.AccAddressFromBech32(msg.Sender); err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "failed to parse address: %s", msg.Sender) + return errors.Wrapf(sdkerrors.ErrInvalidAddress, "failed to parse address: %s", msg.Sender) } return nil } @@ -188,25 +190,25 @@ func (msg MsgUpdateInterchainQueryRequest) GetSigners() []sdk.AccAddress { func validateKeys(keys []*KVKey) error { if uint64(len(keys)) > MaxKVQueryKeysCount { - return sdkerrors.Wrapf(ErrTooManyKVQueryKeys, "keys count cannot be more than %d", MaxKVQueryKeysCount) + return errors.Wrapf(ErrTooManyKVQueryKeys, "keys count cannot be more than %d", MaxKVQueryKeysCount) } duplicates := make(map[string]struct{}) for _, key := range keys { if key == nil { - return sdkerrors.Wrap(sdkerrors.ErrInvalidType, "key cannot be nil") + return errors.Wrap(sdkerrors.ErrInvalidType, "key cannot be nil") } if _, ok := duplicates[key.ToString()]; ok { - return sdkerrors.Wrap(sdkerrors.ErrInvalidRequest, "keys cannot be duplicated") + return errors.Wrap(sdkerrors.ErrInvalidRequest, "keys cannot be duplicated") } if len(key.Path) == 0 { - return sdkerrors.Wrap(ErrEmptyKeyPath, "keys path cannot be empty") + return errors.Wrap(ErrEmptyKeyPath, "keys path cannot be empty") } if len(key.Key) == 0 { - return sdkerrors.Wrap(ErrEmptyKeyID, "keys id cannot be empty") + return errors.Wrap(ErrEmptyKeyID, "keys id cannot be empty") } duplicates[key.ToString()] = struct{}{} diff --git a/x/interchainqueries/types/verify.go b/x/interchainqueries/types/verify.go index 759a2842d..6d831147a 100644 --- a/x/interchainqueries/types/verify.go +++ b/x/interchainqueries/types/verify.go @@ -9,7 +9,7 @@ import ( ) type HeaderVerifier interface { - VerifyHeaders(ctx sdk.Context, cleintkeeper clientkeeper.Keeper, clientID string, header exported.ClientMessage, nextHeader exported.ClientMessage) error + VerifyHeaders(ctx sdk.Context, cleintkeeper clientkeeper.Keeper, clientID string, header, nextHeader exported.ClientMessage) error UnpackHeader(any *codectypes.Any) (exported.ClientMessage, error) } diff --git a/x/interchaintxs/handler.go b/x/interchaintxs/handler.go index b5a3a095f..30a574948 100644 --- a/x/interchaintxs/handler.go +++ b/x/interchaintxs/handler.go @@ -3,6 +3,8 @@ package interchaintxs import ( "fmt" + "cosmossdk.io/errors" + sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" @@ -26,7 +28,7 @@ func NewHandler(k keeper.Keeper) sdk.Handler { default: errMsg := fmt.Sprintf("unrecognized %s message type: %T", types.ModuleName, msg) - return nil, sdkerrors.Wrap(sdkerrors.ErrUnknownRequest, errMsg) + return nil, errors.Wrap(sdkerrors.ErrUnknownRequest, errMsg) } } } diff --git a/x/interchaintxs/keeper/grpc_query_interchainaccount.go b/x/interchaintxs/keeper/grpc_query_interchainaccount.go index c9136d325..9670b2ec4 100644 --- a/x/interchaintxs/keeper/grpc_query_interchainaccount.go +++ b/x/interchaintxs/keeper/grpc_query_interchainaccount.go @@ -3,6 +3,8 @@ package keeper import ( "context" + "cosmossdk.io/errors" + sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" @@ -12,23 +14,23 @@ import ( func (k Keeper) InterchainAccountAddress(c context.Context, req *types.QueryInterchainAccountAddressRequest) (*types.QueryInterchainAccountAddressResponse, error) { if req == nil { - return nil, sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, "invalid request") + return nil, errors.Wrapf(sdkerrors.ErrInvalidRequest, "invalid request") } ctx := sdk.UnwrapSDKContext(c) icaOwner, err := types.NewICAOwner(req.OwnerAddress, req.InterchainAccountId) if err != nil { - return nil, sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, "failed to create ica owner: %s", err) + return nil, errors.Wrapf(sdkerrors.ErrInvalidRequest, "failed to create ica owner: %s", err) } portID, err := icatypes.NewControllerPortID(icaOwner.String()) if err != nil { - return nil, sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, "failed to get controller portID: %s", err) + return nil, errors.Wrapf(sdkerrors.ErrInvalidRequest, "failed to get controller portID: %s", err) } addr, found := k.icaControllerKeeper.GetInterchainAccountAddress(ctx, req.ConnectionId, portID) if !found { - return nil, sdkerrors.Wrapf(types.ErrInterchainAccountNotFound, "no interchain account found for portID %s", portID) + return nil, errors.Wrapf(types.ErrInterchainAccountNotFound, "no interchain account found for portID %s", portID) } return &types.QueryInterchainAccountAddressResponse{InterchainAccountAddress: addr}, nil diff --git a/x/interchaintxs/keeper/ibc_handlers.go b/x/interchaintxs/keeper/ibc_handlers.go index 818ca7cd1..1b1e865aa 100644 --- a/x/interchaintxs/keeper/ibc_handlers.go +++ b/x/interchaintxs/keeper/ibc_handlers.go @@ -4,6 +4,8 @@ import ( "strings" "time" + "cosmossdk.io/errors" + "github.com/cosmos/cosmos-sdk/telemetry" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" @@ -66,13 +68,13 @@ func (k *Keeper) HandleAcknowledgement(ctx sdk.Context, packet channeltypes.Pack icaOwner, err := types.ICAOwnerFromPort(packet.SourcePort) if err != nil { k.Logger(ctx).Error("HandleAcknowledgement: failed to get ica owner from source port", "error", err) - return sdkerrors.Wrap(err, "failed to get ica owner from port") + return errors.Wrap(err, "failed to get ica owner from port") } var ack channeltypes.Acknowledgement if err := channeltypes.SubModuleCdc.UnmarshalJSON(acknowledgement, &ack); err != nil { k.Logger(ctx).Error("HandleAcknowledgement: cannot unmarshal ICS-27 packet acknowledgement", "error", err) - return sdkerrors.Wrapf(sdkerrors.ErrUnknownRequest, "cannot unmarshal ICS-27 packet acknowledgement: %v", err) + return errors.Wrapf(sdkerrors.ErrUnknownRequest, "cannot unmarshal ICS-27 packet acknowledgement: %v", err) } cacheCtx, writeFn, newGasMeter := k.createCachedContext(ctx) @@ -111,7 +113,7 @@ func (k *Keeper) HandleTimeout(ctx sdk.Context, packet channeltypes.Packet, rela k.Logger(ctx).Debug("HandleTimeout") if err != nil { k.Logger(ctx).Error("HandleTimeout: failed to get ica owner from source port", "error", err) - return sdkerrors.Wrap(err, "failed to get ica owner from port") + return errors.Wrap(err, "failed to get ica owner from port") } cacheCtx, writeFn, newGasMeter := k.createCachedContext(ctx) @@ -149,7 +151,7 @@ func (k *Keeper) HandleChanOpenAck( icaOwner, err := types.ICAOwnerFromPort(portID) if err != nil { k.Logger(ctx).Error("HandleChanOpenAck: failed to get ica owner from source port", "error", err) - return sdkerrors.Wrap(err, "failed to get ica owner from port") + return errors.Wrap(err, "failed to get ica owner from port") } _, err = k.contractManagerKeeper.SudoOnChanOpenAck(ctx, icaOwner.GetContract(), contractmanagertypes.OpenAckDetails{ @@ -160,7 +162,7 @@ func (k *Keeper) HandleChanOpenAck( }) if err != nil { k.Logger(ctx).Debug("HandleChanOpenAck: failed to Sudo contract on packet timeout", "error", err) - return sdkerrors.Wrap(err, "failed to Sudo the contract OnChanOpenAck") + return errors.Wrap(err, "failed to Sudo the contract OnChanOpenAck") } return nil diff --git a/x/interchaintxs/keeper/msg_server.go b/x/interchaintxs/keeper/msg_server.go index 381021364..62d3cfe5a 100644 --- a/x/interchaintxs/keeper/msg_server.go +++ b/x/interchaintxs/keeper/msg_server.go @@ -5,6 +5,8 @@ import ( "fmt" "time" + "cosmossdk.io/errors" + "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" @@ -38,12 +40,12 @@ func (k Keeper) RegisterInterchainAccount(goCtx context.Context, msg *ictxtypes. senderAddr, err := sdk.AccAddressFromBech32(msg.FromAddress) if err != nil { k.Logger(ctx).Debug("RegisterInterchainAccount: failed to parse sender address", "from_address", msg.FromAddress) - return nil, sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "failed to parse address: %s", msg.FromAddress) + return nil, errors.Wrapf(sdkerrors.ErrInvalidAddress, "failed to parse address: %s", msg.FromAddress) } if !k.contractManagerKeeper.HasContractInfo(ctx, senderAddr) { k.Logger(ctx).Debug("RegisterInterchainAccount: contract not found", "from_address", msg.FromAddress) - return nil, sdkerrors.Wrapf(ictxtypes.ErrNotContract, "%s is not a contract address", msg.FromAddress) + return nil, errors.Wrapf(ictxtypes.ErrNotContract, "%s is not a contract address", msg.FromAddress) } icaOwner := ictxtypes.NewICAOwnerFromAddress(senderAddr, msg.InterchainAccountId) @@ -51,7 +53,7 @@ func (k Keeper) RegisterInterchainAccount(goCtx context.Context, msg *ictxtypes. // FIXME: empty version string doesn't look good if err := k.icaControllerKeeper.RegisterInterchainAccount(ctx, msg.ConnectionId, icaOwner.String(), ""); err != nil { k.Logger(ctx).Debug("RegisterInterchainAccount: failed to create RegisterInterchainAccount:", "error", err, "owner", icaOwner.String(), "msg", &msg) - return nil, sdkerrors.Wrap(err, "failed to RegisterInterchainAccount") + return nil, errors.Wrap(err, "failed to RegisterInterchainAccount") } return &ictxtypes.MsgRegisterInterchainAccountResponse{}, nil @@ -61,11 +63,11 @@ func (k Keeper) SubmitTx(goCtx context.Context, msg *ictxtypes.MsgSubmitTx) (*ic defer telemetry.ModuleMeasureSince(ictxtypes.ModuleName, time.Now(), LabelSubmitTx) if msg == nil { - return nil, sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, "nil msg is prohibited") + return nil, errors.Wrapf(sdkerrors.ErrInvalidRequest, "nil msg is prohibited") } if msg.Msgs == nil { - return nil, sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, "empty Msgs field is prohibited") + return nil, errors.Wrapf(sdkerrors.ErrInvalidRequest, "empty Msgs field is prohibited") } ctx := sdk.UnwrapSDKContext(goCtx) @@ -74,12 +76,12 @@ func (k Keeper) SubmitTx(goCtx context.Context, msg *ictxtypes.MsgSubmitTx) (*ic senderAddr, err := sdk.AccAddressFromBech32(msg.FromAddress) if err != nil { k.Logger(ctx).Debug("SubmitTx: failed to parse sender address", "from_address", msg.FromAddress) - return nil, sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "failed to parse address: %s", msg.FromAddress) + return nil, errors.Wrapf(sdkerrors.ErrInvalidAddress, "failed to parse address: %s", msg.FromAddress) } if !k.contractManagerKeeper.HasContractInfo(ctx, senderAddr) { k.Logger(ctx).Debug("SubmitTx: contract not found", "from_address", msg.FromAddress) - return nil, sdkerrors.Wrapf(ictxtypes.ErrNotContract, "%s is not a contract address", msg.FromAddress) + return nil, errors.Wrapf(ictxtypes.ErrNotContract, "%s is not a contract address", msg.FromAddress) } params := k.GetParams(ctx) @@ -101,19 +103,19 @@ func (k Keeper) SubmitTx(goCtx context.Context, msg *ictxtypes.MsgSubmitTx) (*ic portID, err := icatypes.NewControllerPortID(icaOwner.String()) if err != nil { k.Logger(ctx).Error("SubmitTx: failed to create NewControllerPortID:", "error", err, "owner", icaOwner) - return nil, sdkerrors.Wrap(err, "failed to create NewControllerPortID") + return nil, errors.Wrap(err, "failed to create NewControllerPortID") } channelID, found := k.icaControllerKeeper.GetActiveChannelID(ctx, msg.ConnectionId, portID) if !found { k.Logger(ctx).Debug("SubmitTx: failed to GetActiveChannelID", "connection_id", msg.ConnectionId, "port_id", portID) - return nil, sdkerrors.Wrapf(icatypes.ErrActiveChannelNotFound, "failed to GetActiveChannelID for port %s", portID) + return nil, errors.Wrapf(icatypes.ErrActiveChannelNotFound, "failed to GetActiveChannelID for port %s", portID) } data, err := SerializeCosmosTx(k.Codec, msg.Msgs) if err != nil { k.Logger(ctx).Debug("SubmitTx: failed to SerializeCosmosTx", "error", err, "connection_id", msg.ConnectionId, "port_id", portID, "channel_id", channelID) - return nil, sdkerrors.Wrap(err, "failed to SerializeCosmosTx") + return nil, errors.Wrap(err, "failed to SerializeCosmosTx") } packetData := icatypes.InterchainAccountPacketData{ @@ -124,14 +126,14 @@ func (k Keeper) SubmitTx(goCtx context.Context, msg *ictxtypes.MsgSubmitTx) (*ic sequence, found := k.channelKeeper.GetNextSequenceSend(ctx, portID, channelID) if !found { - return nil, sdkerrors.Wrapf( + return nil, errors.Wrapf( channeltypes.ErrSequenceSendNotFound, "source port: %s, source channel: %s", portID, channelID, ) } if err := k.feeKeeper.LockFees(ctx, senderAddr, feetypes.NewPacketID(portID, channelID, sequence), msg.Fee); err != nil { - return nil, sdkerrors.Wrapf(err, "failed to lock fees to pay for SubmitTx msg: %s", msg) + return nil, errors.Wrapf(err, "failed to lock fees to pay for SubmitTx msg: %s", msg) } timeoutTimestamp := ctx.BlockTime().Add(time.Duration(msg.Timeout) * time.Second).UnixNano() @@ -140,7 +142,7 @@ func (k Keeper) SubmitTx(goCtx context.Context, msg *ictxtypes.MsgSubmitTx) (*ic if err != nil { // usually we use DEBUG level for such errors, but in this case we have checked full input before running SendTX, so error here may be critical k.Logger(ctx).Error("SubmitTx", "error", err, "connection_id", msg.ConnectionId, "port_id", portID, "channel_id", channelID) - return nil, sdkerrors.Wrap(err, "failed to SendTx") + return nil, errors.Wrap(err, "failed to SendTx") } return &ictxtypes.MsgSubmitTxResponse{ @@ -155,7 +157,7 @@ func (k Keeper) SubmitTx(goCtx context.Context, msg *ictxtypes.MsgSubmitTx) (*ic func SerializeCosmosTx(cdc codec.BinaryCodec, msgs []*codectypes.Any) (bz []byte, err error) { // only ProtoCodec is supported if _, ok := cdc.(*codec.ProtoCodec); !ok { - return nil, sdkerrors.Wrap(icatypes.ErrInvalidCodec, + return nil, errors.Wrap(icatypes.ErrInvalidCodec, "only ProtoCodec is supported for receiving messages on the host chain") } diff --git a/x/interchaintxs/keeper/msg_server_test.go b/x/interchaintxs/keeper/msg_server_test.go index 49f89fed2..c2f838fc6 100644 --- a/x/interchaintxs/keeper/msg_server_test.go +++ b/x/interchaintxs/keeper/msg_server_test.go @@ -119,14 +119,14 @@ func TestSubmitTx(t *testing.T) { require.ErrorContains(t, err, "failed to GetActiveChannelID for port") activeChannel := "channel-0" - //cmKeeper.EXPECT().HasContractInfo(ctx, contractAddress).Return(true) - //icaKeeper.EXPECT().GetActiveChannelID(ctx, "connection-0", portID).Return(activeChannel, true) - //currCodec := icak.Codec - //icak.Codec = &codec.AminoCodec{} - //resp, err = icak.SubmitTx(goCtx, &submitMsg) - //icak.Codec = currCodec - //require.Nil(t, resp) - //require.ErrorContains(t, err, "only ProtoCodec is supported for receiving messages on the host chain") + // cmKeeper.EXPECT().HasContractInfo(ctx, contractAddress).Return(true) + // icaKeeper.EXPECT().GetActiveChannelID(ctx, "connection-0", portID).Return(activeChannel, true) + // currCodec := icak.Codec + // icak.Codec = &codec.AminoCodec{} + // resp, err = icak.SubmitTx(goCtx, &submitMsg) + // icak.Codec = currCodec + // require.Nil(t, resp) + // require.ErrorContains(t, err, "only ProtoCodec is supported for receiving messages on the host chain") cmKeeper.EXPECT().HasContractInfo(ctx, contractAddress).Return(true) icaKeeper.EXPECT().GetActiveChannelID(ctx, "connection-0", portID).Return(activeChannel, true) diff --git a/x/interchaintxs/module.go b/x/interchaintxs/module.go index 7eaf0e894..125ca7bb4 100644 --- a/x/interchaintxs/module.go +++ b/x/interchaintxs/module.go @@ -1,10 +1,11 @@ package interchaintxs import ( - "cosmossdk.io/core/appmodule" "encoding/json" "fmt" + "cosmossdk.io/core/appmodule" + abci "github.com/cometbft/cometbft/abci/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" diff --git a/x/interchaintxs/types/errors.go b/x/interchaintxs/types/errors.go index fec162d9f..51b719d08 100644 --- a/x/interchaintxs/types/errors.go +++ b/x/interchaintxs/types/errors.go @@ -1,19 +1,19 @@ package types import ( - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "cosmossdk.io/errors" ) // x/interchaintxs module sentinel errors var ( - ErrInvalidICAOwner = sdkerrors.Register(ModuleName, 1100, "invalid interchain account interchainAccountID") - ErrInvalidAccountAddress = sdkerrors.Register(ModuleName, 1101, "invalid account address") - ErrInterchainAccountNotFound = sdkerrors.Register(ModuleName, 1102, "interchain account not found") - ErrNotContract = sdkerrors.Register(ModuleName, 1103, "not a contract") - ErrEmptyInterchainAccountID = sdkerrors.Register(ModuleName, 1104, "empty interchain account id") - ErrEmptyConnectionID = sdkerrors.Register(ModuleName, 1105, "empty connection id") - ErrNoMessages = sdkerrors.Register(ModuleName, 1106, "no messages provided") - ErrInvalidTimeout = sdkerrors.Register(ModuleName, 1107, "invalid timeout") - ErrInvalidPayerFee = sdkerrors.Register(ModuleName, 1108, "invalid payer feerefunder") - ErrLongInterchainAccountID = sdkerrors.Register(ModuleName, 1109, "interchain account id is too long") + ErrInvalidICAOwner = errors.Register(ModuleName, 1100, "invalid interchain account interchainAccountID") + ErrInvalidAccountAddress = errors.Register(ModuleName, 1101, "invalid account address") + ErrInterchainAccountNotFound = errors.Register(ModuleName, 1102, "interchain account not found") + ErrNotContract = errors.Register(ModuleName, 1103, "not a contract") + ErrEmptyInterchainAccountID = errors.Register(ModuleName, 1104, "empty interchain account id") + ErrEmptyConnectionID = errors.Register(ModuleName, 1105, "empty connection id") + ErrNoMessages = errors.Register(ModuleName, 1106, "no messages provided") + ErrInvalidTimeout = errors.Register(ModuleName, 1107, "invalid timeout") + ErrInvalidPayerFee = errors.Register(ModuleName, 1108, "invalid payer feerefunder") + ErrLongInterchainAccountID = errors.Register(ModuleName, 1109, "interchain account id is too long") ) diff --git a/x/interchaintxs/types/keys.go b/x/interchaintxs/types/keys.go index e7f0284ca..beaf14ae2 100644 --- a/x/interchaintxs/types/keys.go +++ b/x/interchaintxs/types/keys.go @@ -21,6 +21,4 @@ const ( prefixParamsKey = iota + 1 ) -var ( - ParamsKey = []byte{prefixParamsKey} -) +var ParamsKey = []byte{prefixParamsKey} diff --git a/x/interchaintxs/types/tx.go b/x/interchaintxs/types/tx.go index e9d7f07e5..4f86dd2ab 100644 --- a/x/interchaintxs/types/tx.go +++ b/x/interchaintxs/types/tx.go @@ -3,6 +3,8 @@ package types import ( "fmt" + "cosmossdk.io/errors" + sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" codectypes "github.com/cosmos/cosmos-sdk/codec/types" @@ -24,7 +26,7 @@ func (msg *MsgRegisterInterchainAccount) ValidateBasic() error { } if _, err := sdk.AccAddressFromBech32(msg.FromAddress); err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "failed to parse FromAddress: %s", msg.FromAddress) + return errors.Wrapf(sdkerrors.ErrInvalidAddress, "failed to parse FromAddress: %s", msg.FromAddress) } if len(msg.InterchainAccountId) == 0 { @@ -67,7 +69,7 @@ func (msg MsgSubmitTx) ValidateBasic() error { } if _, err := sdk.AccAddressFromBech32(msg.FromAddress); err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "failed to parse FromAddress: %s", msg.FromAddress) + return errors.Wrapf(sdkerrors.ErrInvalidAddress, "failed to parse FromAddress: %s", msg.FromAddress) } if len(msg.InterchainAccountId) == 0 { @@ -79,7 +81,7 @@ func (msg MsgSubmitTx) ValidateBasic() error { } if msg.Timeout <= 0 { - return sdkerrors.Wrapf(ErrInvalidTimeout, "timeout must be greater than zero") + return errors.Wrapf(ErrInvalidTimeout, "timeout must be greater than zero") } return nil diff --git a/x/interchaintxs/types/types.go b/x/interchaintxs/types/types.go index 789663d42..247c7821d 100644 --- a/x/interchaintxs/types/types.go +++ b/x/interchaintxs/types/types.go @@ -3,8 +3,9 @@ package types import ( "strings" + "cosmossdk.io/errors" + sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" ) @@ -22,7 +23,7 @@ func (i ICAOwner) String() string { func NewICAOwner(contractAddressBech32, interchainAccountID string) (ICAOwner, error) { sdkContractAddress, err := sdk.AccAddressFromBech32(contractAddressBech32) if err != nil { - return ICAOwner{}, sdkerrors.Wrapf(ErrInvalidAccountAddress, "failed to decode address from bech32: %v", err) + return ICAOwner{}, errors.Wrapf(ErrInvalidAccountAddress, "failed to decode address from bech32: %v", err) } return ICAOwner{contractAddress: sdkContractAddress, interchainAccountID: interchainAccountID}, nil @@ -35,12 +36,12 @@ func NewICAOwnerFromAddress(address sdk.AccAddress, interchainAccountID string) func ICAOwnerFromPort(port string) (ICAOwner, error) { splitOwner := strings.SplitN(strings.TrimPrefix(port, icatypes.ControllerPortPrefix), Delimiter, 2) if len(splitOwner) < 2 { - return ICAOwner{}, sdkerrors.Wrap(ErrInvalidICAOwner, "invalid ICA interchainAccountID format") + return ICAOwner{}, errors.Wrap(ErrInvalidICAOwner, "invalid ICA interchainAccountID format") } contractAddress, err := sdk.AccAddressFromBech32(splitOwner[0]) if err != nil { - return ICAOwner{}, sdkerrors.Wrapf(ErrInvalidAccountAddress, "failed to decode address from bech32: %v", err) + return ICAOwner{}, errors.Wrapf(ErrInvalidAccountAddress, "failed to decode address from bech32: %v", err) } return ICAOwner{contractAddress: contractAddress, interchainAccountID: splitOwner[1]}, nil diff --git a/x/tokenfactory/keeper/createdenom.go b/x/tokenfactory/keeper/createdenom.go index b6c018b7e..06ee2a072 100644 --- a/x/tokenfactory/keeper/createdenom.go +++ b/x/tokenfactory/keeper/createdenom.go @@ -3,8 +3,9 @@ package keeper import ( "fmt" + "cosmossdk.io/errors" + sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" "github.com/neutron-org/neutron/x/tokenfactory/types" @@ -15,17 +16,17 @@ import ( func (k Keeper) CreateDenom(ctx sdk.Context, creatorAddr, subdenom string) (newTokenDenom string, err error) { err = k.chargeFeeForDenomCreation(ctx, creatorAddr) if err != nil { - return "", sdkerrors.Wrapf(types.ErrUnableToCharge, "denom fee collection error: %v", err) + return "", errors.Wrapf(types.ErrUnableToCharge, "denom fee collection error: %v", err) } denom, err := k.validateCreateDenom(ctx, creatorAddr, subdenom) if err != nil { - return "", sdkerrors.Wrapf(types.ErrInvalidDenom, "denom validation error: %v", err) + return "", errors.Wrapf(types.ErrInvalidDenom, "denom validation error: %v", err) } err = k.createDenomAfterValidation(ctx, creatorAddr, denom) if err != nil { - return "", sdkerrors.Wrap(err, "create denom after validation error") + return "", errors.Wrap(err, "create denom after validation error") } return denom, nil @@ -49,7 +50,7 @@ func (k Keeper) createDenomAfterValidation(ctx sdk.Context, creatorAddr, denom s } err = k.setAuthorityMetadata(ctx, denom, authorityMetadata) if err != nil { - return sdkerrors.Wrapf(types.ErrInvalidAuthorityMetadata, "unable to set authority metadata: %v", err) + return errors.Wrapf(types.ErrInvalidAuthorityMetadata, "unable to set authority metadata: %v", err) } k.addDenomFromCreator(ctx, creatorAddr, denom) @@ -65,7 +66,7 @@ func (k Keeper) validateCreateDenom(ctx sdk.Context, creatorAddr, subdenom strin denom, err := types.GetTokenDenom(creatorAddr, subdenom) if err != nil { - return "", sdkerrors.Wrapf(types.ErrTokenDenom, "wrong denom token: %v", err) + return "", errors.Wrapf(types.ErrTokenDenom, "wrong denom token: %v", err) } _, found := k.bankKeeper.GetDenomMetaData(ctx, denom) @@ -81,7 +82,7 @@ func (k Keeper) chargeFeeForDenomCreation(ctx sdk.Context, creatorAddr string) ( creationFee := k.GetParams(ctx).DenomCreationFee accAddr, err := sdk.AccAddressFromBech32(creatorAddr) if err != nil { - return sdkerrors.Wrapf(types.ErrUnableToCharge, "wrong creator address: %v", err) + return errors.Wrapf(types.ErrUnableToCharge, "wrong creator address: %v", err) } params := k.GetParams(ctx) @@ -89,7 +90,7 @@ func (k Keeper) chargeFeeForDenomCreation(ctx sdk.Context, creatorAddr string) ( if len(creationFee) > 0 { feeCollectorAddr, err := sdk.AccAddressFromBech32(params.FeeCollectorAddress) if err != nil { - return sdkerrors.Wrapf(types.ErrUnableToCharge, "wrong fee collector address: %v", err) + return errors.Wrapf(types.ErrUnableToCharge, "wrong fee collector address: %v", err) } err = k.bankKeeper.SendCoins( @@ -99,7 +100,7 @@ func (k Keeper) chargeFeeForDenomCreation(ctx sdk.Context, creatorAddr string) ( ) if err != nil { - return sdkerrors.Wrap(err, "unable to send coins to fee collector") + return errors.Wrap(err, "unable to send coins to fee collector") } } diff --git a/x/tokenfactory/keeper/keeper.go b/x/tokenfactory/keeper/keeper.go index 433d178bc..74002c57f 100644 --- a/x/tokenfactory/keeper/keeper.go +++ b/x/tokenfactory/keeper/keeper.go @@ -2,6 +2,7 @@ package keeper import ( "fmt" + storetypes "github.com/cosmos/cosmos-sdk/store/types" "github.com/cometbft/cometbft/libs/log" @@ -13,16 +14,12 @@ import ( "github.com/neutron-org/neutron/x/tokenfactory/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" ) type ( Keeper struct { - cdc codec.Codec - storeKey storetypes.StoreKey - - paramSpace paramtypes.Subspace - + cdc codec.Codec + storeKey storetypes.StoreKey accountKeeper types.AccountKeeper bankKeeper types.BankKeeper } diff --git a/x/tokenfactory/keeper/keeper_test.go b/x/tokenfactory/keeper/keeper_test.go index 4b7ef8397..7d01bbee1 100644 --- a/x/tokenfactory/keeper/keeper_test.go +++ b/x/tokenfactory/keeper/keeper_test.go @@ -3,6 +3,8 @@ package keeper_test import ( "testing" + "cosmossdk.io/math" + "github.com/cometbft/cometbft/crypto/ed25519" "github.com/cosmos/cosmos-sdk/baseapp" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" @@ -78,7 +80,7 @@ func (suite *KeeperTestSuite) TopUpWallet(ctx sdktypes.Context, sender, contract suite.Require().NoError(err) } -func (suite *KeeperTestSuite) WalletBalance(ctx sdktypes.Context, address string) sdktypes.Int { +func (suite *KeeperTestSuite) WalletBalance(ctx sdktypes.Context, address string) math.Int { bankKeeper := suite.GetNeutronZoneApp(suite.ChainA).BankKeeper balance, err := bankKeeper.Balance( sdktypes.WrapSDKContext(ctx), diff --git a/x/tokenfactory/module.go b/x/tokenfactory/module.go index dec552765..db462f23f 100644 --- a/x/tokenfactory/module.go +++ b/x/tokenfactory/module.go @@ -2,10 +2,11 @@ package tokenfactory import ( "context" - "cosmossdk.io/core/appmodule" "encoding/json" "fmt" + "cosmossdk.io/core/appmodule" + "github.com/gorilla/mux" "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" diff --git a/x/tokenfactory/types/denoms.go b/x/tokenfactory/types/denoms.go index 6e5acdff2..1698c2774 100644 --- a/x/tokenfactory/types/denoms.go +++ b/x/tokenfactory/types/denoms.go @@ -4,8 +4,9 @@ import ( fmt "fmt" "strings" + "cosmossdk.io/errors" + sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" ) @@ -48,17 +49,17 @@ func DeconstructDenom(denom string) (creator, subdenom string, err error) { strParts := strings.Split(denom, "/") if len(strParts) < 3 { - return "", "", sdkerrors.Wrapf(ErrInvalidDenom, "not enough parts of denom %s", denom) + return "", "", errors.Wrapf(ErrInvalidDenom, "not enough parts of denom %s", denom) } if strParts[0] != ModuleDenomPrefix { - return "", "", sdkerrors.Wrapf(ErrInvalidDenom, "denom prefix is incorrect. Is: %s. Should be: %s", strParts[0], ModuleDenomPrefix) + return "", "", errors.Wrapf(ErrInvalidDenom, "denom prefix is incorrect. Is: %s. Should be: %s", strParts[0], ModuleDenomPrefix) } creator = strParts[1] _, err = sdk.AccAddressFromBech32(creator) if err != nil { - return "", "", sdkerrors.Wrapf(ErrInvalidDenom, "Invalid creator address (%s)", err) + return "", "", errors.Wrapf(ErrInvalidDenom, "Invalid creator address (%s)", err) } // Handle the case where a denom has a slash in its subdenom. For example, diff --git a/x/tokenfactory/types/errors.go b/x/tokenfactory/types/errors.go index 1a58c989b..ef46d16ca 100644 --- a/x/tokenfactory/types/errors.go +++ b/x/tokenfactory/types/errors.go @@ -5,20 +5,20 @@ package types import ( fmt "fmt" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "cosmossdk.io/errors" ) // x/tokenfactory module sentinel errors var ( - ErrDenomExists = sdkerrors.Register(ModuleName, 2, "attempting to create a denom that already exists (has bank metadata)") - ErrUnauthorized = sdkerrors.Register(ModuleName, 3, "unauthorized account") - ErrInvalidDenom = sdkerrors.Register(ModuleName, 4, "invalid denom") - ErrInvalidCreator = sdkerrors.Register(ModuleName, 5, "invalid creator") - ErrInvalidAuthorityMetadata = sdkerrors.Register(ModuleName, 6, "invalid authority metadata") - ErrInvalidGenesis = sdkerrors.Register(ModuleName, 7, "invalid genesis") - ErrSubdenomTooLong = sdkerrors.Register(ModuleName, 8, fmt.Sprintf("subdenom too long, max length is %d bytes", MaxSubdenomLength)) - ErrCreatorTooLong = sdkerrors.Register(ModuleName, 9, fmt.Sprintf("creator too long, max length is %d bytes", MaxCreatorLength)) - ErrDenomDoesNotExist = sdkerrors.Register(ModuleName, 10, "denom does not exist") - ErrUnableToCharge = sdkerrors.Register(ModuleName, 11, "unable to charge for denom creation") - ErrTokenDenom = sdkerrors.Register(ModuleName, 13, "wrong token denom") + ErrDenomExists = errors.Register(ModuleName, 2, "attempting to create a denom that already exists (has bank metadata)") + ErrUnauthorized = errors.Register(ModuleName, 3, "unauthorized account") + ErrInvalidDenom = errors.Register(ModuleName, 4, "invalid denom") + ErrInvalidCreator = errors.Register(ModuleName, 5, "invalid creator") + ErrInvalidAuthorityMetadata = errors.Register(ModuleName, 6, "invalid authority metadata") + ErrInvalidGenesis = errors.Register(ModuleName, 7, "invalid genesis") + ErrSubdenomTooLong = errors.Register(ModuleName, 8, fmt.Sprintf("subdenom too long, max length is %d bytes", MaxSubdenomLength)) + ErrCreatorTooLong = errors.Register(ModuleName, 9, fmt.Sprintf("creator too long, max length is %d bytes", MaxCreatorLength)) + ErrDenomDoesNotExist = errors.Register(ModuleName, 10, "denom does not exist") + ErrUnableToCharge = errors.Register(ModuleName, 11, "unable to charge for denom creation") + ErrTokenDenom = errors.Register(ModuleName, 13, "wrong token denom") ) diff --git a/x/tokenfactory/types/genesis.go b/x/tokenfactory/types/genesis.go index b1ba181fa..3c4bdb6da 100644 --- a/x/tokenfactory/types/genesis.go +++ b/x/tokenfactory/types/genesis.go @@ -1,8 +1,8 @@ package types import ( + "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" ) // this line is used by starport scaffolding # genesis/types/import @@ -30,7 +30,7 @@ func (gs GenesisState) Validate() error { for _, denom := range gs.GetFactoryDenoms() { if seenDenoms[denom.GetDenom()] { - return sdkerrors.Wrapf(ErrInvalidGenesis, "duplicate denom: %s", denom.GetDenom()) + return errors.Wrapf(ErrInvalidGenesis, "duplicate denom: %s", denom.GetDenom()) } seenDenoms[denom.GetDenom()] = true @@ -42,7 +42,7 @@ func (gs GenesisState) Validate() error { if denom.AuthorityMetadata.Admin != "" { _, err = sdk.AccAddressFromBech32(denom.AuthorityMetadata.Admin) if err != nil { - return sdkerrors.Wrapf(ErrInvalidAuthorityMetadata, "Invalid admin address (%s)", err) + return errors.Wrapf(ErrInvalidAuthorityMetadata, "Invalid admin address (%s)", err) } } } diff --git a/x/tokenfactory/types/msgs.go b/x/tokenfactory/types/msgs.go index 026dac1b0..ae0a7e057 100644 --- a/x/tokenfactory/types/msgs.go +++ b/x/tokenfactory/types/msgs.go @@ -1,6 +1,7 @@ package types import ( + "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" ) @@ -29,12 +30,12 @@ func (m MsgCreateDenom) Type() string { return TypeMsgCreateDenom } func (m MsgCreateDenom) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(m.Sender) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid sender address (%s)", err) + return errors.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid sender address (%s)", err) } _, err = GetTokenDenom(m.Sender, m.Subdenom) if err != nil { - return sdkerrors.Wrap(ErrInvalidDenom, err.Error()) + return errors.Wrap(ErrInvalidDenom, err.Error()) } return nil @@ -64,11 +65,11 @@ func (m MsgMint) Type() string { return TypeMsgMint } func (m MsgMint) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(m.Sender) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid sender address (%s)", err) + return errors.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid sender address (%s)", err) } if !m.Amount.IsValid() || m.Amount.Amount.Equal(sdk.ZeroInt()) { - return sdkerrors.Wrap(sdkerrors.ErrInvalidCoins, m.Amount.String()) + return errors.Wrap(sdkerrors.ErrInvalidCoins, m.Amount.String()) } return nil @@ -98,11 +99,11 @@ func (m MsgBurn) Type() string { return TypeMsgBurn } func (m MsgBurn) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(m.Sender) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid sender address (%s)", err) + return errors.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid sender address (%s)", err) } if !m.Amount.IsValid() || m.Amount.Amount.Equal(sdk.ZeroInt()) { - return sdkerrors.Wrap(sdkerrors.ErrInvalidCoins, m.Amount.String()) + return errors.Wrap(sdkerrors.ErrInvalidCoins, m.Amount.String()) } return nil @@ -134,20 +135,20 @@ func (m MsgBurn) GetSigners() []sdk.AccAddress { // func (m MsgForceTransfer) ValidateBasic() error { // _, err := sdk.AccAddressFromBech32(m.Sender) // if err != nil { -// return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid sender address (%s)", err) +// return errors.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid sender address (%s)", err) // } // _, err = sdk.AccAddressFromBech32(m.TransferFromAddress) // if err != nil { -// return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid address (%s)", err) +// return errors.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid address (%s)", err) // } // _, err = sdk.AccAddressFromBech32(m.TransferToAddress) // if err != nil { -// return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid address (%s)", err) +// return errors.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid address (%s)", err) // } // if !m.Amount.IsValid() { -// return sdkerrors.Wrap(sdkerrors.ErrInvalidCoins, m.Amount.String()) +// return errors.Wrap(sdkerrors.ErrInvalidCoins, m.Amount.String()) // } // return nil @@ -178,12 +179,12 @@ func (m MsgChangeAdmin) Type() string { return TypeMsgChangeAdmin } func (m MsgChangeAdmin) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(m.Sender) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid sender address (%s)", err) + return errors.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid sender address (%s)", err) } _, err = sdk.AccAddressFromBech32(m.NewAdmin) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid address (%s)", err) + return errors.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid address (%s)", err) } _, _, err = DeconstructDenom(m.Denom) diff --git a/x/transfer/ibc_handlers.go b/x/transfer/ibc_handlers.go index 7f057db2c..d61bf6685 100644 --- a/x/transfer/ibc_handlers.go +++ b/x/transfer/ibc_handlers.go @@ -3,6 +3,8 @@ package transfer import ( "strings" + "cosmossdk.io/errors" + sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" @@ -61,16 +63,16 @@ func (im IBCModule) createCachedContext(ctx sdk.Context) (cacheCtx sdk.Context, func (im IBCModule) HandleAcknowledgement(ctx sdk.Context, packet channeltypes.Packet, acknowledgement []byte, relayer sdk.AccAddress) error { var ack channeltypes.Acknowledgement if err := channeltypes.SubModuleCdc.UnmarshalJSON(acknowledgement, &ack); err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrUnknownRequest, "cannot unmarshal ICS-20 transfer packet acknowledgement: %v", err) + return errors.Wrapf(sdkerrors.ErrUnknownRequest, "cannot unmarshal ICS-20 transfer packet acknowledgement: %v", err) } var data transfertypes.FungibleTokenPacketData if err := types.ModuleCdc.UnmarshalJSON(packet.GetData(), &data); err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrUnknownRequest, "cannot unmarshal ICS-20 transfer packet data: %s", err.Error()) + return errors.Wrapf(sdkerrors.ErrUnknownRequest, "cannot unmarshal ICS-20 transfer packet data: %s", err.Error()) } senderAddress, err := sdk.AccAddressFromBech32(data.GetSender()) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "failed to decode address from bech32: %v", err) + return errors.Wrapf(sdkerrors.ErrInvalidAddress, "failed to decode address from bech32: %v", err) } cacheCtx, writeFn, newGasMeter := im.createCachedContext(ctx) @@ -109,12 +111,12 @@ func (im IBCModule) HandleAcknowledgement(ctx sdk.Context, packet channeltypes.P func (im IBCModule) HandleTimeout(ctx sdk.Context, packet channeltypes.Packet, relayer sdk.AccAddress) error { var data transfertypes.FungibleTokenPacketData if err := types.ModuleCdc.UnmarshalJSON(packet.GetData(), &data); err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrUnknownRequest, "cannot unmarshal ICS-20 transfer packet data: %s", err.Error()) + return errors.Wrapf(sdkerrors.ErrUnknownRequest, "cannot unmarshal ICS-20 transfer packet data: %s", err.Error()) } senderAddress, err := sdk.AccAddressFromBech32(data.GetSender()) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "failed to decode address from bech32: %v", err) + return errors.Wrapf(sdkerrors.ErrInvalidAddress, "failed to decode address from bech32: %v", err) } cacheCtx, writeFn, newGasMeter := im.createCachedContext(ctx) diff --git a/x/transfer/keeper/keeper.go b/x/transfer/keeper/keeper.go index 090cb68fc..90f672939 100644 --- a/x/transfer/keeper/keeper.go +++ b/x/transfer/keeper/keeper.go @@ -2,6 +2,8 @@ package transfer import ( "context" + + "cosmossdk.io/errors" storetypes "github.com/cosmos/cosmos-sdk/store/types" "github.com/cosmos/cosmos-sdk/codec" @@ -31,12 +33,12 @@ func (k KeeperTransferWrapper) Transfer(goCtx context.Context, msg *wrappedtypes senderAddr, err := sdk.AccAddressFromBech32(msg.Sender) if err != nil { k.Logger(ctx).Debug("Transfer: failed to parse sender address", "sender", msg.Sender) - return nil, sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "failed to parse address: %s", msg.Sender) + return nil, errors.Wrapf(sdkerrors.ErrInvalidAddress, "failed to parse address: %s", msg.Sender) } sequence, found := k.channelKeeper.GetNextSequenceSend(ctx, msg.SourcePort, msg.SourceChannel) if !found { - return nil, sdkerrors.Wrapf( + return nil, errors.Wrapf( channeltypes.ErrSequenceSendNotFound, "source port: %s, source channel: %s", msg.SourcePort, msg.SourceChannel, ) @@ -46,7 +48,7 @@ func (k KeeperTransferWrapper) Transfer(goCtx context.Context, msg *wrappedtypes // Because contracts are required to pay fees for the acknowledgements if k.ContractManagerKeeper.HasContractInfo(ctx, senderAddr) { if err := k.FeeKeeper.LockFees(ctx, senderAddr, feetypes.NewPacketID(msg.SourcePort, msg.SourceChannel, sequence), msg.Fee); err != nil { - return nil, sdkerrors.Wrapf(err, "failed to lock fees to pay for transfer msg: %v", msg) + return nil, errors.Wrapf(err, "failed to lock fees to pay for transfer msg: %v", msg) } } diff --git a/x/transfer/module.go b/x/transfer/module.go index 3de6ee665..967fe459e 100644 --- a/x/transfer/module.go +++ b/x/transfer/module.go @@ -1,9 +1,11 @@ package transfer import ( - "cosmossdk.io/core/appmodule" "fmt" + "cosmossdk.io/core/appmodule" + "cosmossdk.io/errors" + "github.com/cosmos/cosmos-sdk/codec" cdctypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" @@ -51,7 +53,7 @@ func (im IBCModule) OnAcknowledgementPacket( ) error { err := im.IBCModule.OnAcknowledgementPacket(ctx, packet, acknowledgement, relayer) if err != nil { - return sdkerrors.Wrap(err, "failed to process original OnAcknowledgementPacket") + return errors.Wrap(err, "failed to process original OnAcknowledgementPacket") } return im.HandleAcknowledgement(ctx, packet, acknowledgement, relayer) } @@ -64,7 +66,7 @@ func (im IBCModule) OnTimeoutPacket( ) error { err := im.IBCModule.OnTimeoutPacket(ctx, packet, relayer) if err != nil { - return sdkerrors.Wrap(err, "failed to process original OnTimeoutPacket") + return errors.Wrap(err, "failed to process original OnTimeoutPacket") } return im.HandleTimeout(ctx, packet, relayer) } @@ -98,7 +100,6 @@ func (am AppModule) RegisterServices(cfg module.Configurator) { types.RegisterQueryServer(cfg.QueryServer(), am.keeper) cfg.MsgServer().RegisterService(&neutrontypes.MsgServiceDescOrig, am.keeper) - } type AppModuleBasic struct { @@ -151,7 +152,7 @@ func NewHandler(k wrapkeeper.KeeperTransferWrapper) sdk.Handler { default: errMsg := fmt.Sprintf("unrecognized %s message type: %T", types.ModuleName, msg) - return nil, sdkerrors.Wrap(sdkerrors.ErrUnknownRequest, errMsg) + return nil, errors.Wrap(sdkerrors.ErrUnknownRequest, errMsg) } } } diff --git a/x/transfer/types/tx.go b/x/transfer/types/tx.go index 4ac120890..eef4df539 100644 --- a/x/transfer/types/tx.go +++ b/x/transfer/types/tx.go @@ -2,6 +2,7 @@ package types import ( "context" + "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" feerefundertypes "github.com/neutron-org/neutron/x/feerefunder/types" "google.golang.org/grpc" From 61cd4725cd30f1f33b324d14ffb0f71c632ae599 Mon Sep 17 00:00:00 2001 From: swelf Date: Tue, 1 Aug 2023 11:50:19 +0300 Subject: [PATCH 014/307] linter fixes --- app/ante_handler.go | 2 +- app/app.go | 39 ++++----- app/simulation_test.go | 4 +- go.mod | 3 +- go.sum | 2 - tests/e2e/interchain_security_test.go | 2 +- .../interchaintxs/keeper/interchaintxs.go | 2 +- testutil/test_helpers.go | 9 +- testutil/transfer/keeper/keeper.go | 2 +- wasmbinding/custom_querier.go | 4 +- wasmbinding/stargate_allowlist.go | 6 +- x/feerefunder/types/codec.go | 5 +- x/feerefunder/types/tx.pb.go | 86 ------------------- x/ibc-hooks/ibc_middleware_test.go | 4 +- x/interchaintxs/ibc_module.go | 2 +- x/transfer/types/tx.go | 6 +- 16 files changed, 42 insertions(+), 136 deletions(-) delete mode 100644 x/feerefunder/types/tx.pb.go diff --git a/app/ante_handler.go b/app/ante_handler.go index 9f9e55bcb..761917ed8 100644 --- a/app/ante_handler.go +++ b/app/ante_handler.go @@ -80,7 +80,7 @@ func NewAnteHandler(options HandlerOptions, logger log.Logger) (sdk.AnteHandler, // We are providing options.GlobalFeeSubspace because we do not have staking module // In this case you should be sure that you implemented upgrade to set default global fee param and it SHOULD contain at least one record // otherwise you will get panic - // globalfeeante.NewFeeDecorator(options.GlobalFeeSubspace, nil), + //globalfeeante.NewFeeDecorator(options.GlobalFeeSubspace, nil), ante.NewDeductFeeDecorator(options.AccountKeeper, options.BankKeeper, options.FeegrantKeeper, options.TxFeeChecker), // SetPubKeyDecorator must be called before all signature verification decorators diff --git a/app/app.go b/app/app.go index fa74861b7..6c9e793a6 100644 --- a/app/app.go +++ b/app/app.go @@ -9,6 +9,8 @@ import ( "path/filepath" "strings" + "github.com/cosmos/interchain-security/v3/testutil/integration" + wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" "github.com/cosmos/cosmos-sdk/runtime" "github.com/cosmos/cosmos-sdk/x/genutil" @@ -142,7 +144,6 @@ import ( feetypes "github.com/neutron-org/neutron/x/feerefunder/types" - e2e "github.com/cosmos/interchain-security/v3/testutil/e2e" ccvconsumer "github.com/cosmos/interchain-security/v3/x/ccv/consumer" ccvconsumerkeeper "github.com/cosmos/interchain-security/v3/x/ccv/consumer/keeper" ccvconsumertypes "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types" @@ -346,6 +347,22 @@ type App struct { checkTxHandler proposalhandler.CheckTx } +func (app *App) GetTestBankKeeper() integration.TestBankKeeper { + return app.BankKeeper +} + +func (app *App) GetTestAccountKeeper() integration.TestAccountKeeper { + return app.AccountKeeper +} + +func (app *App) GetTestSlashingKeeper() integration.TestSlashingKeeper { + return app.SlashingKeeper +} + +func (app *App) GetTestEvidenceKeeper() integration.TestEvidenceKeeper { + return app.EvidenceKeeper +} + // New returns a reference to an initialized blockchain app func New( logger log.Logger, @@ -1243,26 +1260,6 @@ func (app *App) GetConsumerKeeper() ccvconsumerkeeper.Keeper { return app.ConsumerKeeper } -// GetE2eBankKeeper implements the ConsumerApp interface. -func (app *App) GetE2eBankKeeper() e2e.E2eBankKeeper { - return app.BankKeeper -} - -// GetE2eAccountKeeper implements the ConsumerApp interface. -func (app *App) GetE2eAccountKeeper() e2e.E2eAccountKeeper { - return app.AccountKeeper -} - -// GetE2eSlashingKeeper implements the ConsumerApp interface. -func (app *App) GetE2eSlashingKeeper() e2e.E2eSlashingKeeper { - return app.SlashingKeeper -} - -// GetE2eEvidenceKeeper implements the ConsumerApp interface. -func (app *App) GetE2eEvidenceKeeper() e2e.E2eEvidenceKeeper { - return app.EvidenceKeeper -} - func (app *App) RegisterNodeService(clientCtx client.Context) { nodeservice.RegisterNodeService(clientCtx, app.GRPCQueryRouter()) } diff --git a/app/simulation_test.go b/app/simulation_test.go index 120de63ae..ebd049780 100644 --- a/app/simulation_test.go +++ b/app/simulation_test.go @@ -22,9 +22,9 @@ package app_test // "github.com/neutron-org/neutron/app" //) // -//func init() { +// func init() { // simapp.GetSimulatorFlags() -//} +// } // //type SimApp interface { // GetBaseApp() *baseapp.BaseApp diff --git a/go.mod b/go.mod index 1962507c3..46f8824f4 100644 --- a/go.mod +++ b/go.mod @@ -4,6 +4,7 @@ go 1.20 require ( cosmossdk.io/core v0.5.1 + cosmossdk.io/errors v1.0.0-beta.7 cosmossdk.io/math v1.0.1 github.com/CosmWasm/wasmd v0.40.0 github.com/CosmWasm/wasmvm v1.2.4 @@ -45,7 +46,6 @@ require ( cloud.google.com/go/storage v1.29.0 // indirect cosmossdk.io/api v0.3.1 // indirect cosmossdk.io/depinject v1.0.0-alpha.3 // indirect - cosmossdk.io/errors v1.0.0-beta.7 // indirect cosmossdk.io/log v1.1.0 // indirect cosmossdk.io/tools/rosetta v0.2.1 // indirect filippo.io/edwards25519 v1.0.0 // indirect @@ -154,7 +154,6 @@ require ( github.com/subosito/gotenv v1.4.2 // indirect github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect github.com/tendermint/go-amino v0.16.0 // indirect - github.com/tendermint/spm v0.1.9 // indirect github.com/tidwall/btree v1.6.0 // indirect github.com/ulikunitz/xz v0.5.11 // indirect github.com/zondax/hid v0.9.1 // indirect diff --git a/go.sum b/go.sum index dff626cb7..5d3442aab 100644 --- a/go.sum +++ b/go.sum @@ -800,7 +800,6 @@ github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/u github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= -github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/jsternberg/zap-logfmt v1.0.0/go.mod h1:uvPs/4X51zdkcm5jXl5SYoN+4RK21K8mysFmDaM/h+o= @@ -913,7 +912,6 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= -github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5/go.mod h1:caMODM3PzxT8aQXRPkAt8xlV/e7d7w8GM5g0fa5F0D8= github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae/go.mod h1:qAyveg+e4CE+eKJXWVjKXM4ck2QobLqTDytGJbLLhJg= github.com/mtibben/percent v0.2.1 h1:5gssi8Nqo8QU/r2pynCm+hBQHpkB/uNK7BJCFogWdzs= diff --git a/tests/e2e/interchain_security_test.go b/tests/e2e/interchain_security_test.go index 9520de5ad..2ba3e4f8b 100644 --- a/tests/e2e/interchain_security_test.go +++ b/tests/e2e/interchain_security_test.go @@ -7,7 +7,7 @@ import ( icssimapp "github.com/cosmos/interchain-security/v3/testutil/ibc_testing" "github.com/stretchr/testify/suite" - "github.com/cosmos/interchain-security/v3/tests/e2e" + e2e "github.com/cosmos/interchain-security/v3/tests/integration" appConsumer "github.com/neutron-org/neutron/app" "github.com/neutron-org/neutron/testutil" diff --git a/testutil/interchaintxs/keeper/interchaintxs.go b/testutil/interchaintxs/keeper/interchaintxs.go index e53be2bb4..55c9b43a9 100644 --- a/testutil/interchaintxs/keeper/interchaintxs.go +++ b/testutil/interchaintxs/keeper/interchaintxs.go @@ -17,7 +17,7 @@ import ( "github.com/neutron-org/neutron/x/interchaintxs/types" ) -func InterchainTxsKeeper(t testing.TB, managerKeeper types.ContractManagerKeeper, refunderKeeper types.FeeRefunderKeeper, icaControllerKeeper types.ICAControllerKeeper, channelKeeper types.ChannelKeeper) (*keeper.Keeper, sdk.Context, *sdk.KVStoreKey) { +func InterchainTxsKeeper(t testing.TB, managerKeeper types.ContractManagerKeeper, refunderKeeper types.FeeRefunderKeeper, icaControllerKeeper types.ICAControllerKeeper, channelKeeper types.ChannelKeeper) (*keeper.Keeper, sdk.Context, *storetypes.KVStoreKey) { storeKey := sdk.NewKVStoreKey(types.StoreKey) memStoreKey := storetypes.NewMemoryStoreKey(types.MemStoreKey) diff --git a/testutil/test_helpers.go b/testutil/test_helpers.go index 8c432cfce..7873fe0f6 100644 --- a/testutil/test_helpers.go +++ b/testutil/test_helpers.go @@ -27,8 +27,7 @@ import ( tmtypes "github.com/cometbft/cometbft/types" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" appProvider "github.com/cosmos/interchain-security/v3/app/provider" - e2e "github.com/cosmos/interchain-security/v3/testutil/e2e" - ccvutils "github.com/cosmos/interchain-security/x/ccv/utils" + e2e "github.com/cosmos/interchain-security/v3/testutil/integration" "github.com/neutron-org/neutron/app" ictxstypes "github.com/neutron-org/neutron/x/interchaintxs/types" @@ -123,9 +122,9 @@ func (suite *IBCConnectionTestSuite) SetupTest() { suite.Require().True(len(providerValUpdates) == len(consumerBValUpdates), "initial valset not matching") for i := 0; i < len(providerValUpdates); i++ { - addr1, _ := ccvutils.TMCryptoPublicKeyToConsAddr(providerValUpdates[i].PubKey) - addr2, _ := ccvutils.TMCryptoPublicKeyToConsAddr(consumerAValUpdates[i].PubKey) - addr3, _ := ccvutils.TMCryptoPublicKeyToConsAddr(consumerBValUpdates[i].PubKey) + addr1, _ := ccv.TMCryptoPublicKeyToConsAddr(providerValUpdates[i].PubKey) + addr2, _ := ccv.TMCryptoPublicKeyToConsAddr(consumerAValUpdates[i].PubKey) + addr3, _ := ccv.TMCryptoPublicKeyToConsAddr(consumerBValUpdates[i].PubKey) suite.Require().True(bytes.Equal(addr1, addr2), "validator mismatch") suite.Require().True(bytes.Equal(addr1, addr3), "validator mismatch") } diff --git a/testutil/transfer/keeper/keeper.go b/testutil/transfer/keeper/keeper.go index b257276d9..8f35aa8a6 100644 --- a/testutil/transfer/keeper/keeper.go +++ b/testutil/transfer/keeper/keeper.go @@ -22,7 +22,7 @@ import ( "github.com/neutron-org/neutron/x/transfer/types" ) -func TransferKeeper(t testing.TB, managerKeeper types.ContractManagerKeeper, refunderKeeper types.FeeRefunderKeeper, channelKeeper types.ChannelKeeper, authKeeper types.AccountKeeper) (*keeper.KeeperTransferWrapper, sdk.Context, *sdk.KVStoreKey) { +func TransferKeeper(t testing.TB, managerKeeper types.ContractManagerKeeper, refunderKeeper types.FeeRefunderKeeper, channelKeeper types.ChannelKeeper, authKeeper types.AccountKeeper) (*keeper.KeeperTransferWrapper, sdk.Context, *storetypes.KVStoreKey) { storeKey := sdk.NewKVStoreKey(transfertypes.StoreKey) memStoreKey := storetypes.NewMemoryStoreKey("mem_" + transfertypes.StoreKey) diff --git a/wasmbinding/custom_querier.go b/wasmbinding/custom_querier.go index bf22446a9..e4d717bc1 100644 --- a/wasmbinding/custom_querier.go +++ b/wasmbinding/custom_querier.go @@ -110,7 +110,7 @@ func CustomQuerier(qp *QueryPlugin) func(ctx sdk.Context, request json.RawMessag bz, err := json.Marshal(res) if err != nil { - return nil, errors.Wrap(err, "failed to JSON marshal FullDenomResponse response.") + return nil, errors.Wrap(err, "failed to JSON marshal FullDenomResponse response") } return bz, nil @@ -123,7 +123,7 @@ func CustomQuerier(qp *QueryPlugin) func(ctx sdk.Context, request json.RawMessag bz, err := json.Marshal(res) if err != nil { - return nil, errors.Wrap(err, "failed to JSON marshal DenomAdminResponse response.") + return nil, errors.Wrap(err, "failed to JSON marshal DenomAdminResponse response") } return bz, nil diff --git a/wasmbinding/stargate_allowlist.go b/wasmbinding/stargate_allowlist.go index d60eed580..3f8697914 100644 --- a/wasmbinding/stargate_allowlist.go +++ b/wasmbinding/stargate_allowlist.go @@ -4,9 +4,9 @@ import ( wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - ibctransfertypes "github.com/cosmos/ibc-go/v4/modules/apps/transfer/types" - ibcclienttypes "github.com/cosmos/ibc-go/v4/modules/core/02-client/types" - ibcconnectiontypes "github.com/cosmos/ibc-go/v4/modules/core/03-connection/types" + ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" + ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" + ibcconnectiontypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" contractmanagertypes "github.com/neutron-org/neutron/x/contractmanager/types" feeburnertypes "github.com/neutron-org/neutron/x/feeburner/types" interchainqueriestypes "github.com/neutron-org/neutron/x/interchainqueries/types" diff --git a/x/feerefunder/types/codec.go b/x/feerefunder/types/codec.go index abaf590aa..24b7f62e5 100644 --- a/x/feerefunder/types/codec.go +++ b/x/feerefunder/types/codec.go @@ -3,17 +3,14 @@ package types import ( "github.com/cosmos/cosmos-sdk/codec" cdctypes "github.com/cosmos/cosmos-sdk/codec/types" - "github.com/cosmos/cosmos-sdk/types/msgservice" ) func RegisterCodec(_ *codec.LegacyAmino) { // this line is used by starport scaffolding # 2 } -func RegisterInterfaces(registry cdctypes.InterfaceRegistry) { +func RegisterInterfaces(_ cdctypes.InterfaceRegistry) { // this line is used by starport scaffolding # 3 - - msgservice.RegisterMsgServiceDesc(registry, &_Msg_serviceDesc) } var ( diff --git a/x/feerefunder/types/tx.pb.go b/x/feerefunder/types/tx.pb.go deleted file mode 100644 index 978495680..000000000 --- a/x/feerefunder/types/tx.pb.go +++ /dev/null @@ -1,86 +0,0 @@ -// // Code generated by protoc-gen-gogo. DO NOT EDIT. -// // source: feerefunder/tx.proto -package types - -import ( - context "context" - fmt "fmt" - math "math" - - _ "github.com/cosmos/cosmos-sdk/types" - _ "github.com/gogo/protobuf/gogoproto" - grpc1 "github.com/gogo/protobuf/grpc" - proto "github.com/gogo/protobuf/proto" - grpc "google.golang.org/grpc" -) - -// Reference imports to suppress errors if they are not otherwise used. -var ( - _ = proto.Marshal - _ = fmt.Errorf - _ = 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 - -func init() { proto.RegisterFile("feerefunder/tx.proto", fileDescriptor_af2a0269bf094340) } - -var fileDescriptor_af2a0269bf094340 = []byte{ - // 174 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x49, 0x4b, 0x4d, 0x2d, - 0x4a, 0x4d, 0x2b, 0xcd, 0x4b, 0x49, 0x2d, 0xd2, 0x2f, 0xa9, 0xd0, 0x2b, 0x28, 0xca, 0x2f, 0xc9, - 0x17, 0x92, 0xcb, 0x4b, 0x2d, 0x2d, 0x29, 0xca, 0xcf, 0xcb, 0x2f, 0x4a, 0xd7, 0x83, 0x32, 0xf5, - 0x90, 0x14, 0x4a, 0xc9, 0x25, 0xe7, 0x17, 0xe7, 0xe6, 0x17, 0xeb, 0x27, 0x25, 0x16, 0xa7, 0xea, - 0x97, 0x19, 0x26, 0xa5, 0x96, 0x24, 0x1a, 0xea, 0x27, 0xe7, 0x67, 0xe6, 0x41, 0xf4, 0x4b, 0x89, - 0xa4, 0xe7, 0xa7, 0xe7, 0x83, 0x99, 0xfa, 0x20, 0x16, 0x44, 0xd4, 0x88, 0x95, 0x8b, 0xd9, 0xb7, - 0x38, 0xdd, 0xc9, 0xe7, 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, 0x8c, 0xd2, - 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xf5, 0xa1, 0xd6, 0xea, 0xe6, 0x17, 0xa5, - 0xc3, 0xd8, 0xfa, 0x15, 0xfa, 0x28, 0xae, 0xad, 0x2c, 0x48, 0x2d, 0x4e, 0x62, 0x03, 0x9b, 0x6d, - 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x2f, 0x8f, 0xb3, 0x6d, 0xc9, 0x00, 0x00, 0x00, -} - -// Reference imports to suppress errors if they are not otherwise used. -var ( - _ context.Context - _ 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{} - -type msgClient struct { - cc grpc1.ClientConn -} - -func NewMsgClient(cc grpc1.ClientConn) MsgClient { - return &msgClient{cc} -} - -// MsgServer is the server API for Msg service. -type MsgServer interface{} - -// UnimplementedMsgServer can be embedded to have forward compatible implementations. -type UnimplementedMsgServer struct{} - -func RegisterMsgServer(s grpc1.Server, srv MsgServer) { - s.RegisterService(&_Msg_serviceDesc, srv) -} - -var _Msg_serviceDesc = grpc.ServiceDesc{ - ServiceName: "neutronorg.neutron.feerefunder.Msg", - HandlerType: (*MsgServer)(nil), - Methods: []grpc.MethodDesc{}, - Streams: []grpc.StreamDesc{}, - Metadata: "feerefunder/tx.proto", -} diff --git a/x/ibc-hooks/ibc_middleware_test.go b/x/ibc-hooks/ibc_middleware_test.go index 9bb9093a4..6a217b1ce 100644 --- a/x/ibc-hooks/ibc_middleware_test.go +++ b/x/ibc-hooks/ibc_middleware_test.go @@ -144,10 +144,10 @@ func (suite *HooksTestSuite) receivePacketWithSequence(receiver, memo string, pr packet := suite.makeMockPacket(receiver, memo, prevSequence) - seq_id, err := suite.GetNeutronZoneApp(suite.ChainB).HooksICS4Wrapper.SendPacket( + seqID, err := suite.GetNeutronZoneApp(suite.ChainB).HooksICS4Wrapper.SendPacket( suite.ChainB.GetContext(), channelCap, suite.TransferPath.EndpointA.ChannelConfig.PortID, suite.TransferPath.EndpointA.ChannelID, packet.TimeoutHeight, packet.TimeoutTimestamp, packet.Data) suite.Require().NoError(err, "IBC send failed. Expected success. %s", err) - suite.Require().Equal(prevSequence+1, seq_id) + suite.Require().Equal(prevSequence+1, seqID) // Update both clients err = suite.TransferPath.EndpointB.UpdateClient() diff --git a/x/interchaintxs/ibc_module.go b/x/interchaintxs/ibc_module.go index 9e7bec32c..b929b8e35 100644 --- a/x/interchaintxs/ibc_module.go +++ b/x/interchaintxs/ibc_module.go @@ -28,7 +28,7 @@ func NewIBCModule(k keeper.Keeper) IBCModule { // OnChanOpenInit implements the IBCModule interface. We don't need to implement this handler. func (im IBCModule) OnChanOpenInit( - ctx sdk.Context, + _ sdk.Context, _ channeltypes.Order, _ []string, _ string, diff --git a/x/transfer/types/tx.go b/x/transfer/types/tx.go index eef4df539..661f74b3f 100644 --- a/x/transfer/types/tx.go +++ b/x/transfer/types/tx.go @@ -24,7 +24,9 @@ func (msg *MsgTransfer) GetSigners() []sdk.AccAddress { return []sdk.AccAddress{fromAddress} } -func Msg_Transfer_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +// MsgOrigTransferHandler - 1) helps to bind `/neutron.transfer.Msg/Transfer` as a handler for `ibc.applications.transfer.v1.MsgTransfer` +// 2) converts `ibc.applications.transfer.v1.MsgTransfer` into neutron.transfer.MsgTransfer` before processing. +func MsgOrigTransferHandler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(types.MsgTransfer) if err := dec(in); err != nil { return nil, err @@ -71,7 +73,7 @@ var MsgServiceDescOrig = grpc.ServiceDesc{ Methods: []grpc.MethodDesc{ { MethodName: "Transfer", - Handler: Msg_Transfer_Handler, + Handler: MsgOrigTransferHandler, }, }, Streams: []grpc.StreamDesc{}, From 1e18deb6612beea8f8b047fd726e0467e02582ff Mon Sep 17 00:00:00 2001 From: nhpd Date: Wed, 2 Aug 2023 14:42:57 +0400 Subject: [PATCH 015/307] fix config --- network/init-neutrond.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/network/init-neutrond.sh b/network/init-neutrond.sh index e8edbe1d9..56e0de6a6 100755 --- a/network/init-neutrond.sh +++ b/network/init-neutrond.sh @@ -10,7 +10,7 @@ THIRD_PARTY_CONTRACTS_DIR=${THIRD_PARTY_CONTRACTS_DIR:-./contracts_thirdparty} # IMPORTANT! minimum_gas_prices should always contain at least one record, otherwise the chain will not start or halt # ibc/27394FB092D2ECCD56123C74F36E4C1F926001CEADA9CA97EA622B25F41E5EB2 denom is required by intgration tests (test:tokenomics) -MIN_GAS_PRICES_DEFAULT='[{"denom":"ibc/27394FB092D2ECCD56123C74F36E4C1F926001CEADA9CA97EA622B25F41E5EB2","amount":"0"},{"denom":"untrn","amount":"0"}],' +MIN_GAS_PRICES_DEFAULT='[{"denom":"ibc/27394FB092D2ECCD56123C74F36E4C1F926001CEADA9CA97EA622B25F41E5EB2","amount":"0"},{"denom":"untrn","amount":"0"}]' MIN_GAS_PRICES=${MIN_GAS_PRICES:-"$MIN_GAS_PRICES_DEFAULT"} BYPASS_MIN_FEE_MSG_TYPES_DEFAULT='["/ibc.core.channel.v1.Msg/RecvPacket", "/ibc.core.channel.v1.Msg/Acknowledgement", "/ibc.core.client.v1.Msg/UpdateClient"]' @@ -639,7 +639,6 @@ set_genesis_param slash_fraction_double_sign "\"$SLASHING_FRACTION_D set_genesis_param slash_fraction_downtime "\"$SLASHING_FRACTION_DOWNTIME\"" # slashing set_genesis_param minimum_gas_prices "$MIN_GAS_PRICES," # globalfee set_genesis_param max_total_bypass_min_fee_msg_gas_usage "\"$MAX_TOTAL_BYPASS_MIN_FEE_MSG_GAS_USAGE\"" # globalfee - set_genesis_param_jq ".app_state.globalfee.params.bypass_min_fee_msg_types" "$BYPASS_MIN_FEE_MSG_TYPES" # globalfee set_genesis_param proposer_fee "\"0.25\"" # builder(POB) From b3c58a0a0ab02fbe3531a02e4316227b7a54ef4c Mon Sep 17 00:00:00 2001 From: nhpd Date: Fri, 4 Aug 2023 13:13:46 +0400 Subject: [PATCH 016/307] feat: remove timeout_commit cosmos-sdk value of 5s by rewriting function of interceptConfig --- cmd/neutrond/root.go | 33 ++----- cmd/neutrond/util.go | 216 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 223 insertions(+), 26 deletions(-) create mode 100644 cmd/neutrond/util.go diff --git a/cmd/neutrond/root.go b/cmd/neutrond/root.go index 7d1cef1f3..3c392db20 100644 --- a/cmd/neutrond/root.go +++ b/cmd/neutrond/root.go @@ -3,13 +3,10 @@ package main import ( "errors" "fmt" - "io" - "os" - "path/filepath" - "github.com/CosmWasm/wasmd/x/wasm" wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" dbm "github.com/cometbft/cometbft-db" + tmcfg "github.com/cometbft/cometbft/config" tmcli "github.com/cometbft/cometbft/libs/cli" "github.com/cometbft/cometbft/libs/log" tmtypes "github.com/cometbft/cometbft/types" @@ -35,14 +32,14 @@ import ( "github.com/cosmos/cosmos-sdk/x/genutil" genutilcli "github.com/cosmos/cosmos-sdk/x/genutil/client/cli" genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types" + "github.com/neutron-org/neutron/app" + "github.com/neutron-org/neutron/app/params" "github.com/prometheus/client_golang/prometheus" "github.com/spf13/cast" "github.com/spf13/cobra" - "time" - - tmcfg "github.com/cometbft/cometbft/config" - "github.com/neutron-org/neutron/app" - "github.com/neutron-org/neutron/app/params" + "io" + "os" + "path/filepath" ) // NewRootCmd creates a new root command for neutrond. It is called once in the @@ -88,14 +85,7 @@ func NewRootCmd() (*cobra.Command, params.EncodingConfig) { } customTemplate, customNeutronConfig := initAppConfig() - err = server.InterceptConfigsPreRunHandler(cmd, customTemplate, customNeutronConfig, tmcfg.DefaultConfig()) - if err != nil { - return err - } - - setTimeoutCommit(cmd) - - return nil + return InterceptConfigsPreRunHandler(cmd, customTemplate, customNeutronConfig, tmcfg.DefaultConfig()) }, } @@ -104,15 +94,6 @@ func NewRootCmd() (*cobra.Command, params.EncodingConfig) { return rootCmd, encodingConfig } -// setTimeoutCommit sets default `Consensus.TimeoutCommit` to 1 second, if it was set to cosmos sdk default of 5 seconds -func setTimeoutCommit(cmd *cobra.Command) { - serverCtxPtr := server.GetServerContextFromCmd(cmd) - - if serverCtxPtr.Config.Consensus.TimeoutCommit == 5*time.Second { - serverCtxPtr.Config.Consensus.TimeoutCommit = 1 * time.Second - } -} - func initAppConfig() (string, interface{}) { srvCfg := serverconfig.DefaultConfig() diff --git a/cmd/neutrond/util.go b/cmd/neutrond/util.go new file mode 100644 index 000000000..a214bb7d1 --- /dev/null +++ b/cmd/neutrond/util.go @@ -0,0 +1,216 @@ +package main + +import ( + "cosmossdk.io/log" + "fmt" + tmcfg "github.com/cometbft/cometbft/config" + tmcli "github.com/cometbft/cometbft/libs/cli" + tmlog "github.com/cometbft/cometbft/libs/log" + "github.com/cosmos/cosmos-sdk/client/flags" + "github.com/cosmos/cosmos-sdk/server" + serverconfig "github.com/cosmos/cosmos-sdk/server/config" + serverlog "github.com/cosmos/cosmos-sdk/server/log" + "github.com/rs/zerolog" + "github.com/spf13/cobra" + "github.com/spf13/pflag" + "github.com/spf13/viper" + "os" + "path" + "path/filepath" + "strings" +) + +// NOTE: The functions below are copy-pasted from cosmos-sdk@v0.47.3 (see https://github.com/cosmos/cosmos-sdk/blob/v0.47.3/server/util.go#L122) +// Reason for this is that we want to remove cosmos-sdk override of commit_timeout to 5s (https://github.com/cosmos/cosmos-sdk/blob/v0.47.3/server/util.go#L239-L241) + +// InterceptConfigsPreRunHandler performs a pre-run function for the root daemon +// application command. It will create a Viper literal and a default server +// Context. The server Tendermint configuration will either be read and parsed +// or created and saved to disk, where the server Context is updated to reflect +// the Tendermint configuration. It takes custom app config template and config +// settings to create a custom Tendermint configuration. If the custom template +// is empty, it uses default-template provided by the server. The Viper literal +// is used to read and parse the application configuration. Command handlers can +// fetch the server Context to get the Tendermint configuration or to get access +// to Viper. +func InterceptConfigsPreRunHandler(cmd *cobra.Command, customAppConfigTemplate string, customAppConfig interface{}, tmConfig *tmcfg.Config) error { + serverCtx := server.NewDefaultContext() + + // Get the executable name and configure the viper instance so that environmental + // variables are checked based off that name. The underscore character is used + // as a separator. + executableName, err := os.Executable() + if err != nil { + return err + } + + basename := path.Base(executableName) + + // configure the viper instance + if err := serverCtx.Viper.BindPFlags(cmd.Flags()); err != nil { + return err + } + if err := serverCtx.Viper.BindPFlags(cmd.PersistentFlags()); err != nil { + return err + } + + serverCtx.Viper.SetEnvPrefix(basename) + serverCtx.Viper.SetEnvKeyReplacer(strings.NewReplacer(".", "_", "-", "_")) + serverCtx.Viper.AutomaticEnv() + + // intercept configuration files, using both Viper instances separately + config, err := interceptConfigs(serverCtx.Viper, customAppConfigTemplate, customAppConfig, tmConfig) + if err != nil { + return err + } + + // return value is a tendermint configuration object + serverCtx.Config = config + if err = bindFlags(basename, cmd, serverCtx.Viper); err != nil { + return err + } + + var opts []log.Option + if serverCtx.Viper.GetString(flags.FlagLogFormat) == tmcfg.LogFormatJSON { + opts = append(opts, log.OutputJSONOption()) + } + + // check and set filter level or keys for the logger if any + logLvlStr := serverCtx.Viper.GetString(flags.FlagLogLevel) + if logLvlStr != "" { + logLvl, err := zerolog.ParseLevel(logLvlStr) + switch { + case err != nil: + // If the log level is not a valid zerolog level, then we try to parse it as a key filter. + filterFunc, err := log.ParseLogLevel(logLvlStr) + if err != nil { + return err + } + + opts = append(opts, log.FilterOption(filterFunc)) + case serverCtx.Viper.GetBool(tmcli.TraceFlag): + // Check if the CometBFT flag for trace logging is set if it is then setup a tracing logger in this app as well. + // Note it overrides log level passed in `log_levels`. + opts = append(opts, log.LevelOption(zerolog.TraceLevel)) + default: + opts = append(opts, log.LevelOption(logLvl)) + } + } + + logger := log.NewLogger(tmlog.NewSyncWriter(os.Stdout), opts...).With(log.ModuleKey, "server") + serverCtx.Logger = serverlog.CometLoggerWrapper{Logger: logger} + + return server.SetCmdServerContext(cmd, serverCtx) +} + +// interceptConfigs parses and updates a Tendermint configuration file or +// creates a new one and saves it. It also parses and saves the application +// configuration file. The Tendermint configuration file is parsed given a root +// Viper object, whereas the application is parsed with the private package-aware +// viperCfg object. +func interceptConfigs(rootViper *viper.Viper, customAppTemplate string, customConfig interface{}, tmConfig *tmcfg.Config) (*tmcfg.Config, error) { + rootDir := rootViper.GetString(flags.FlagHome) + configPath := filepath.Join(rootDir, "config") + tmCfgFile := filepath.Join(configPath, "config.toml") + + conf := tmConfig + + switch _, err := os.Stat(tmCfgFile); { + case os.IsNotExist(err): + tmcfg.EnsureRoot(rootDir) + + if err = conf.ValidateBasic(); err != nil { + return nil, fmt.Errorf("error in config file: %w", err) + } + + defaultCometCfg := tmcfg.DefaultConfig() + if conf.RPC.PprofListenAddress == defaultCometCfg.RPC.PprofListenAddress { + conf.RPC.PprofListenAddress = "localhost:6060" + } + tmcfg.WriteConfigFile(tmCfgFile, conf) + case err != nil: + return nil, err + + default: + rootViper.SetConfigType("toml") + rootViper.SetConfigName("config") + rootViper.AddConfigPath(configPath) + + if err := rootViper.ReadInConfig(); err != nil { + return nil, fmt.Errorf("failed to read in %s: %w", tmCfgFile, err) + } + } + + // Read into the configuration whatever data the viper instance has for it. + // This may come from the configuration file above but also any of the other + // sources viper uses. + if err := rootViper.Unmarshal(conf); err != nil { + return nil, err + } + + conf.SetRoot(rootDir) + + appCfgFilePath := filepath.Join(configPath, "app.toml") + if _, err := os.Stat(appCfgFilePath); os.IsNotExist(err) { + if customAppTemplate != "" { + serverconfig.SetConfigTemplate(customAppTemplate) + + if err = rootViper.Unmarshal(&customConfig); err != nil { + return nil, fmt.Errorf("failed to parse %s: %w", appCfgFilePath, err) + } + + serverconfig.WriteConfigFile(appCfgFilePath, customConfig) + } else { + appConf, err := serverconfig.ParseConfig(rootViper) + if err != nil { + return nil, fmt.Errorf("failed to parse %s: %w", appCfgFilePath, err) + } + + serverconfig.WriteConfigFile(appCfgFilePath, appConf) + } + } + + rootViper.SetConfigType("toml") + rootViper.SetConfigName("app") + rootViper.AddConfigPath(configPath) + + if err := rootViper.MergeInConfig(); err != nil { + return nil, fmt.Errorf("failed to merge configuration: %w", err) + } + + return conf, nil +} + +func bindFlags(basename string, cmd *cobra.Command, v *viper.Viper) (err error) { + defer func() { + if r := recover(); r != nil { + err = fmt.Errorf("bindFlags failed: %v", r) + } + }() + + cmd.Flags().VisitAll(func(f *pflag.Flag) { + // Environment variables can't have dashes in them, so bind them to their equivalent + // keys with underscores, e.g. --favorite-color to STING_FAVORITE_COLOR + err = v.BindEnv(f.Name, fmt.Sprintf("%s_%s", basename, strings.ToUpper(strings.ReplaceAll(f.Name, "-", "_")))) + if err != nil { + panic(err) + } + + err = v.BindPFlag(f.Name, f) + if err != nil { + panic(err) + } + + // Apply the viper config value to the flag when the flag is not set and + // viper has a value. + if !f.Changed && v.IsSet(f.Name) { + val := v.Get(f.Name) + err = cmd.Flags().Set(f.Name, fmt.Sprintf("%v", val)) + if err != nil { + panic(err) + } + } + }) + + return err +} From f8944d8c595a8663988f2ab44f62ed476006f5af Mon Sep 17 00:00:00 2001 From: nhpd Date: Mon, 7 Aug 2023 15:34:34 +0400 Subject: [PATCH 017/307] cleanup --- app/ante_handler.go | 10 ++-------- app/genesis.go | 1 + app/upgrades/nextupgrade/upgrades_test.go | 3 ++- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/app/ante_handler.go b/app/ante_handler.go index cc6377170..88a1845fe 100644 --- a/app/ante_handler.go +++ b/app/ante_handler.go @@ -20,12 +20,6 @@ import ( builderkeeper "github.com/skip-mev/pob/x/builder/keeper" ) -// maxBypassMinFeeMsgGasUsage is the maximum gas usage per message -// so that a transaction that contains only message types that can -// bypass the minimum fee can be accepted with a zero fee. -// For details, see gaiafeeante.NewFeeDecorator() -const maxBypassMinFeeMsgGasUsage uint64 = 500_000 // Should be high enough because /ibc.core.client.v1.MsgUpdateClient is the most expensive message - // HandlerOptions extend the SDK's AnteHandler options by requiring the IBC // channel keeper. type HandlerOptions struct { @@ -78,9 +72,9 @@ func NewAnteHandler(options HandlerOptions, logger log.Logger) (sdk.AnteHandler, ante.NewTxTimeoutHeightDecorator(), ante.NewValidateMemoDecorator(options.AccountKeeper), ante.NewConsumeGasForTxSizeDecorator(options.AccountKeeper), - // We are providing options.GlobalFeeSubspace because we do not have staking module + // We are providing nil as a StakingKeeper arg because we do not have staking module // In this case you should be sure that you - // implemented upgrade to set default global fee param with at least one record + // implemented upgrade to set default `ParamStoreKeyMinGasPrices` global fee param with at least one record // otherwise you will get panic globalfeeante.NewFeeDecorator(options.GlobalFeeSubspace, nil), diff --git a/app/genesis.go b/app/genesis.go index 41d5e2ab6..c9434396f 100644 --- a/app/genesis.go +++ b/app/genesis.go @@ -2,6 +2,7 @@ package app import ( "encoding/json" + "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" globalfeetypes "github.com/cosmos/gaia/v11/x/globalfee/types" diff --git a/app/upgrades/nextupgrade/upgrades_test.go b/app/upgrades/nextupgrade/upgrades_test.go index bd1d7237e..9da7aa2eb 100644 --- a/app/upgrades/nextupgrade/upgrades_test.go +++ b/app/upgrades/nextupgrade/upgrades_test.go @@ -1,9 +1,10 @@ package nextupgrade_test import ( + "testing" + ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" ibcchanneltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" - "testing" sdk "github.com/cosmos/cosmos-sdk/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" From dbb36d4af54f2318134f1601dc96176ce91e47a2 Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Mon, 7 Aug 2023 17:54:17 +0300 Subject: [PATCH 018/307] Upgrade PFM to a new repo and the latest version --- app/app.go | 10 ++++++---- app/proposals_allowlisting.go | 2 +- go.mod | 4 +--- go.sum | 7 ++----- 4 files changed, 10 insertions(+), 13 deletions(-) diff --git a/app/app.go b/app/app.go index 6c9e793a6..fa3519bf5 100644 --- a/app/app.go +++ b/app/app.go @@ -17,7 +17,6 @@ import ( genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types" ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" tendermint "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" - "github.com/neutron-org/neutron/docs" proposalhandler "github.com/skip-mev/pob/abci" "github.com/skip-mev/pob/mempool" "github.com/skip-mev/pob/x/builder" @@ -25,6 +24,8 @@ import ( rewardsaddressprovider "github.com/skip-mev/pob/x/builder/rewards_address_provider" buildertypes "github.com/skip-mev/pob/x/builder/types" + "github.com/neutron-org/neutron/docs" + "github.com/neutron-org/neutron/app/upgrades" "github.com/neutron-org/neutron/app/upgrades/nextupgrade" v044 "github.com/neutron-org/neutron/app/upgrades/v0.4.4" @@ -107,6 +108,7 @@ import ( "github.com/spf13/cast" govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" + cronkeeper "github.com/neutron-org/neutron/x/cron/keeper" crontypes "github.com/neutron-org/neutron/x/cron/types" @@ -151,9 +153,9 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" consensusparamkeeper "github.com/cosmos/cosmos-sdk/x/consensus/keeper" consensusparamtypes "github.com/cosmos/cosmos-sdk/x/consensus/types" - "github.com/strangelove-ventures/packet-forward-middleware/v7/router" - routerkeeper "github.com/strangelove-ventures/packet-forward-middleware/v7/router/keeper" - routertypes "github.com/strangelove-ventures/packet-forward-middleware/v7/router/types" + "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router" + routerkeeper "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router/keeper" + routertypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router/types" ) const ( diff --git a/app/proposals_allowlisting.go b/app/proposals_allowlisting.go index ce9c3ed3c..afff1499f 100644 --- a/app/proposals_allowlisting.go +++ b/app/proposals_allowlisting.go @@ -6,10 +6,10 @@ import ( "github.com/cosmos/cosmos-sdk/x/params/types/proposal" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" globalfeetypes "github.com/cosmos/gaia/v11/x/globalfee/types" + packetforwardmiddlewaretypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router/types" icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types" ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" - packetforwardmiddlewaretypes "github.com/strangelove-ventures/packet-forward-middleware/v7/router/types" ) func IsConsumerProposalAllowlisted(content govtypes.Content) bool { diff --git a/go.mod b/go.mod index 46f8824f4..f3a9b128d 100644 --- a/go.mod +++ b/go.mod @@ -16,6 +16,7 @@ require ( github.com/cosmos/cosmos-sdk v0.47.3 github.com/cosmos/gaia/v11 v11.0.0-00010101000000-000000000000 github.com/cosmos/gogoproto v1.4.10 + github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.0-20230803181732-7c8f814d3b79 github.com/cosmos/ibc-go/v7 v7.2.0 github.com/cosmos/ics23/go v0.10.0 github.com/cosmos/interchain-security/v3 v3.1.0 @@ -24,14 +25,12 @@ require ( github.com/golang/protobuf v1.5.3 github.com/gorilla/mux v1.8.0 github.com/grpc-ecosystem/grpc-gateway v1.16.0 - github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.15.1 github.com/skip-mev/pob v1.0.3 github.com/spf13/cast v1.5.1 github.com/spf13/cobra v1.7.0 github.com/spf13/viper v1.16.0 - github.com/strangelove-ventures/packet-forward-middleware/v7 v7.0.0-20230523193151-73dea436e53f github.com/stretchr/testify v1.8.4 google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc google.golang.org/grpc v1.55.0 @@ -83,7 +82,6 @@ require ( github.com/dvsekhvalnov/jose2go v1.5.0 // indirect github.com/felixge/httpsnoop v1.0.2 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect - github.com/ghodss/yaml v1.0.0 // indirect github.com/go-kit/kit v0.12.0 // indirect github.com/go-kit/log v0.2.1 // indirect github.com/go-logfmt/logfmt v0.6.0 // indirect diff --git a/go.sum b/go.sum index 5d3442aab..7dc5f271d 100644 --- a/go.sum +++ b/go.sum @@ -396,6 +396,8 @@ github.com/cosmos/gogoproto v1.4.10 h1:QH/yT8X+c0F4ZDacDv3z+xE3WU1P1Z3wQoLMBRJoK github.com/cosmos/gogoproto v1.4.10/go.mod h1:3aAZzeRWpAwr+SS/LLkICX2/kDFyaYVzckBDzygIxek= github.com/cosmos/iavl v0.20.0 h1:fTVznVlepH0KK8NyKq8w+U7c2L6jofa27aFX6YGlm38= github.com/cosmos/iavl v0.20.0/go.mod h1:WO7FyvaZJoH65+HFOsDir7xU9FWk2w9cHXNW1XHcl7A= +github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.0-20230803181732-7c8f814d3b79 h1:n+PjYB3JnbKN+sGmX6khST4xMP+D0UdrMNj7O91fuOg= +github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.0-20230803181732-7c8f814d3b79/go.mod h1:fctjEnz9xaBFOlmYYPdKL8Hs1Y3GUKilSwsJdqBb5QU= github.com/cosmos/ibc-go/v7 v7.2.0 h1:dx0DLUl7rxdyZ8NiT6UsrbzKOJx/w7s+BOaewFRH6cg= github.com/cosmos/ibc-go/v7 v7.2.0/go.mod h1:OOcjKIRku/j1Xs1RgKK0yvKRrJ5iFuZYMetR1n3yMlc= github.com/cosmos/ics23/go v0.10.0 h1:iXqLLgp2Lp+EdpIuwXTYIQU+AiHj9mOC2X9ab++bZDM= @@ -499,7 +501,6 @@ github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbS github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff/go.mod h1:x7DCsMOv1taUwEWCzT4cmDeAkigA5/QCwUodaVOe8Ww= github.com/getkin/kin-openapi v0.53.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4= github.com/getkin/kin-openapi v0.61.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4= -github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= @@ -699,8 +700,6 @@ github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgf github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0/go.mod h1:YN5jB8ie0yfIUg6VvR9Kz84aCaG7AsGZnLjhHbUqwPg= github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c h1:6rhixN/i8ZofjG1Y75iExal34USq5p+wiN1tpie8IrU= github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c/go.mod h1:NMPJylDgVpX0MLRlPy15sqSwOFv/U1GZ2m21JhFfek0= github.com/gtank/merlin v0.1.1-0.20191105220539-8318aed1a79f/go.mod h1:T86dnYJhcGOh5BjZFCJWTDeTK7XW8uE+E21Cy/bIQ+s= @@ -1101,8 +1100,6 @@ github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DM github.com/spf13/viper v1.16.0 h1:rGGH0XDZhdUOryiDWjmIvUSWpbNqisK8Wk0Vyefw8hc= github.com/spf13/viper v1.16.0/go.mod h1:yg78JgCJcbrQOvV9YLXgkLaZqUidkY9K+Dd1FofRzQg= github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4/go.mod h1:RZLeN1LMWmRsyYjvAu+I6Dm9QmlDaIIt+Y+4Kd7Tp+Q= -github.com/strangelove-ventures/packet-forward-middleware/v7 v7.0.0-20230523193151-73dea436e53f h1:NJdZ+YJ9Vf2t286L20IjFK0SxGpobF1xIp5ZQlxWetk= -github.com/strangelove-ventures/packet-forward-middleware/v7 v7.0.0-20230523193151-73dea436e53f/go.mod h1:DJNSVK8NCYHM+aZHCFkcAqPwjzwHYAjhjSMlhAGtJ3c= github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= From bbd7b398315d1d0a5a563425ff7219b5a827296b Mon Sep 17 00:00:00 2001 From: swelf Date: Tue, 8 Aug 2023 12:09:51 +0300 Subject: [PATCH 019/307] wasmd 0.41 --- go.mod | 50 ++++++++++----------- go.sum | 97 +++++++++++++++++++--------------------- testutil/test_helpers.go | 2 +- 3 files changed, 71 insertions(+), 78 deletions(-) diff --git a/go.mod b/go.mod index 46f8824f4..cb6ae7427 100644 --- a/go.mod +++ b/go.mod @@ -4,16 +4,16 @@ go 1.20 require ( cosmossdk.io/core v0.5.1 - cosmossdk.io/errors v1.0.0-beta.7 + cosmossdk.io/errors v1.0.0 cosmossdk.io/math v1.0.1 - github.com/CosmWasm/wasmd v0.40.0 - github.com/CosmWasm/wasmvm v1.2.4 + github.com/CosmWasm/wasmd v0.41.0 + github.com/CosmWasm/wasmvm v1.3.0 github.com/armon/go-metrics v0.4.1 github.com/cometbft/cometbft v0.37.2 github.com/cometbft/cometbft-db v0.8.0 github.com/cosmos/admin-module v0.0.0-20220204080909-475a98e03f31 github.com/cosmos/cosmos-proto v1.0.0-beta.2 - github.com/cosmos/cosmos-sdk v0.47.3 + github.com/cosmos/cosmos-sdk v0.47.4 github.com/cosmos/gaia/v11 v11.0.0-00010101000000-000000000000 github.com/cosmos/gogoproto v1.4.10 github.com/cosmos/ibc-go/v7 v7.2.0 @@ -24,29 +24,28 @@ require ( github.com/golang/protobuf v1.5.3 github.com/gorilla/mux v1.8.0 github.com/grpc-ecosystem/grpc-gateway v1.16.0 - github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 github.com/pkg/errors v0.9.1 - github.com/prometheus/client_golang v1.15.1 + github.com/prometheus/client_golang v1.16.0 github.com/skip-mev/pob v1.0.3 github.com/spf13/cast v1.5.1 github.com/spf13/cobra v1.7.0 github.com/spf13/viper v1.16.0 github.com/strangelove-ventures/packet-forward-middleware/v7 v7.0.0-20230523193151-73dea436e53f github.com/stretchr/testify v1.8.4 - google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc - google.golang.org/grpc v1.55.0 + google.golang.org/genproto/googleapis/api v0.0.0-20230629202037-9506855d4529 + google.golang.org/grpc v1.56.2 gopkg.in/yaml.v2 v2.4.0 ) require ( - cloud.google.com/go v0.110.0 // indirect - cloud.google.com/go/compute v1.19.0 // indirect + cloud.google.com/go v0.110.4 // indirect + cloud.google.com/go/compute v1.20.1 // indirect cloud.google.com/go/compute/metadata v0.2.3 // indirect - cloud.google.com/go/iam v0.13.0 // indirect - cloud.google.com/go/storage v1.29.0 // indirect + cloud.google.com/go/iam v1.1.0 // indirect + cloud.google.com/go/storage v1.30.1 // indirect cosmossdk.io/api v0.3.1 // indirect cosmossdk.io/depinject v1.0.0-alpha.3 // indirect - cosmossdk.io/log v1.1.0 // indirect + cosmossdk.io/log v1.1.1-0.20230704160919-88f2c830b0ca // indirect cosmossdk.io/tools/rosetta v0.2.1 // indirect filippo.io/edwards25519 v1.0.0 // indirect github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect @@ -83,7 +82,6 @@ require ( github.com/dvsekhvalnov/jose2go v1.5.0 // indirect github.com/felixge/httpsnoop v1.0.2 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect - github.com/ghodss/yaml v1.0.0 // indirect github.com/go-kit/kit v0.12.0 // indirect github.com/go-kit/log v0.2.1 // indirect github.com/go-logfmt/logfmt v0.6.0 // indirect @@ -96,10 +94,10 @@ require ( github.com/google/go-cmp v0.5.9 // indirect github.com/google/gofuzz v1.2.0 // indirect github.com/google/orderedcode v0.0.1 // indirect - github.com/google/s2a-go v0.1.3 // indirect + github.com/google/s2a-go v0.1.4 // indirect github.com/google/uuid v1.3.0 // indirect github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect - github.com/googleapis/gax-go/v2 v2.8.0 // indirect + github.com/googleapis/gax-go/v2 v2.11.0 // indirect github.com/gorilla/handlers v1.5.1 // indirect github.com/gorilla/websocket v1.5.0 // indirect github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect @@ -160,19 +158,19 @@ require ( github.com/zondax/ledger-go v0.14.1 // indirect go.etcd.io/bbolt v1.3.7 // indirect go.opencensus.io v0.24.0 // indirect - golang.org/x/crypto v0.10.0 // indirect + golang.org/x/crypto v0.11.0 // indirect golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 // indirect - golang.org/x/net v0.11.0 // indirect + golang.org/x/net v0.12.0 // indirect golang.org/x/oauth2 v0.8.0 // indirect - golang.org/x/sys v0.9.0 // indirect - golang.org/x/term v0.9.0 // indirect - golang.org/x/text v0.10.0 // indirect + golang.org/x/sys v0.10.0 // indirect + golang.org/x/term v0.10.0 // indirect + golang.org/x/text v0.11.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect - google.golang.org/api v0.122.0 // indirect + google.golang.org/api v0.126.0 // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto v0.0.0-20230530153820-e85fd2cbaebc // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect - google.golang.org/protobuf v1.30.0 // indirect + google.golang.org/genproto v0.0.0-20230706204954-ccb25ca9f130 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect + google.golang.org/protobuf v1.31.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect nhooyr.io/websocket v1.8.7 // indirect @@ -183,7 +181,7 @@ require ( replace ( github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0 github.com/ChainSafe/go-schnorrkel => github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d - github.com/CosmWasm/wasmd => github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230705143547-22c391d461d5 + github.com/CosmWasm/wasmd => github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230808084410-6083b888424e github.com/cosmos/admin-module => github.com/neutron-org/admin-module v0.0.0-20230705134325-b23404470a1d github.com/cosmos/gaia/v11 => github.com/cosmos/gaia/v11 v11.0.0-20230724152830-861ba391c3b4 github.com/cosmos/ledger-cosmos-go => github.com/cosmos/ledger-cosmos-go v0.12.1 diff --git a/go.sum b/go.sum index 5d3442aab..71b2262b1 100644 --- a/go.sum +++ b/go.sum @@ -34,8 +34,8 @@ cloud.google.com/go v0.100.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w9 cloud.google.com/go v0.102.0/go.mod h1:oWcCzKlqJ5zgHQt9YsaeTY9KzIvjyy0ArmiBUgpQ+nc= cloud.google.com/go v0.102.1/go.mod h1:XZ77E9qnTEnrgEOvr4xzfdX5TRo7fB4T2F4O6+34hIU= cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA= -cloud.google.com/go v0.110.0 h1:Zc8gqp3+a9/Eyph2KDmcGaPtbKRIoqq4YTlL4NMD0Ys= -cloud.google.com/go v0.110.0/go.mod h1:SJnCLqQ0FCFGSZMUNUf84MV3Aia54kn7pi8st7tMzaY= +cloud.google.com/go v0.110.4 h1:1JYyxKMN9hd5dR2MYTPWkGUgcoxVVhg0LKNKEo0qvmk= +cloud.google.com/go v0.110.4/go.mod h1:+EYjdK8e5RME/VY/qLCAtuyALQ9q67dvuum8i+H5xsI= cloud.google.com/go/aiplatform v1.22.0/go.mod h1:ig5Nct50bZlzV6NvKaTwmplLLddFx0YReh9WfTO5jKw= cloud.google.com/go/aiplatform v1.24.0/go.mod h1:67UUvRBKG6GTayHKV8DBv2RtR1t93YRu5B1P3x99mYY= cloud.google.com/go/analytics v0.11.0/go.mod h1:DjEWCu41bVbYcKyvlws9Er60YE4a//bK6mnhWvQeFNI= @@ -73,8 +73,8 @@ cloud.google.com/go/compute v1.6.0/go.mod h1:T29tfhtVbq1wvAPo0E3+7vhgmkOYeXjhFvz cloud.google.com/go/compute v1.6.1/go.mod h1:g85FgpzFvNULZ+S8AYq87axRKuf2Kh7deLqV/jJ3thU= cloud.google.com/go/compute v1.7.0/go.mod h1:435lt8av5oL9P3fv1OEzSbSUe+ybHXGMPQHHZWZxy9U= cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU= -cloud.google.com/go/compute v1.19.0 h1:+9zda3WGgW1ZSTlVppLCYFIr48Pa35q1uG2N1itbCEQ= -cloud.google.com/go/compute v1.19.0/go.mod h1:rikpw2y+UMidAe9tISo04EHNOIf42RLYF/q8Bs93scU= +cloud.google.com/go/compute v1.20.1 h1:6aKEtlUiwEpJzM001l0yFkpXmUVXaN8W+fbkb2AZNbg= +cloud.google.com/go/compute v1.20.1/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM= cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= cloud.google.com/go/containeranalysis v0.5.1/go.mod h1:1D92jd8gRR/c0fGMlymRgxWD3Qw9C1ff6/T7mLgVL8I= @@ -114,13 +114,12 @@ cloud.google.com/go/gkehub v0.10.0/go.mod h1:UIPwxI0DsrpsVoWpLB0stwKCP+WFVG9+y97 cloud.google.com/go/grafeas v0.2.0/go.mod h1:KhxgtF2hb0P191HlY5besjYm6MqTSTj3LSI+M+ByZHc= cloud.google.com/go/iam v0.3.0/go.mod h1:XzJPvDayI+9zsASAFO68Hk07u3z+f+JrT2xXNdp4bnY= cloud.google.com/go/iam v0.5.0/go.mod h1:wPU9Vt0P4UmCux7mqtRu6jcpPAb74cP1fh50J3QpkUc= -cloud.google.com/go/iam v0.13.0 h1:+CmB+K0J/33d0zSQ9SlFWUeCCEn5XJA0ZMZ3pHE9u8k= -cloud.google.com/go/iam v0.13.0/go.mod h1:ljOg+rcNfzZ5d6f1nAUJ8ZIxOaZUVoS14bKCtaLZ/D0= +cloud.google.com/go/iam v1.1.0 h1:67gSqaPukx7O8WLLHMa0PNs3EBGd2eE4d+psbO/CO94= +cloud.google.com/go/iam v1.1.0/go.mod h1:nxdHjaKfCr7fNYx/HJMM8LgiMugmveWlkatear5gVyk= cloud.google.com/go/language v1.4.0/go.mod h1:F9dRpNFQmJbkaop6g0JhSBXCNlO90e1KWx5iDdxbWic= cloud.google.com/go/language v1.6.0/go.mod h1:6dJ8t3B+lUYfStgls25GusK04NLh3eDLQnWM3mdEbhI= cloud.google.com/go/lifesciences v0.5.0/go.mod h1:3oIKy8ycWGPUyZDR/8RNnTOYevhaMLqh5vLUXs9zvT8= cloud.google.com/go/lifesciences v0.6.0/go.mod h1:ddj6tSX/7BOnhxCSd3ZcETvtNr8NZ6t/iPhY2Tyfu08= -cloud.google.com/go/longrunning v0.4.1 h1:v+yFJOfKC3yZdY6ZUI933pIYdhyhV8S3NpWrXWmg7jM= cloud.google.com/go/mediatranslation v0.5.0/go.mod h1:jGPUhGTybqsPQn91pNXw0xVHfuJ3leR1wj37oU3y1f4= cloud.google.com/go/mediatranslation v0.6.0/go.mod h1:hHdBCTYNigsBxshbznuIMFNe5QXEowAuNmmC7h8pu5w= cloud.google.com/go/memcache v1.4.0/go.mod h1:rTOfiGZtJX1AaFUrOgsMHX5kAzaTQ8azHiuDoTPzNsE= @@ -178,8 +177,8 @@ cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3f cloud.google.com/go/storage v1.22.1/go.mod h1:S8N1cAStu7BOeFfE8KAQzmyyLkK8p/vmRq6kuBTW58Y= cloud.google.com/go/storage v1.23.0/go.mod h1:vOEEDNFnciUMhBeT6hsJIn3ieU5cFRmzeLgDvXzfIXc= cloud.google.com/go/storage v1.27.0/go.mod h1:x9DOL8TK/ygDUMieqwfhdpQryTeEkhGKMi80i/iqR2s= -cloud.google.com/go/storage v1.29.0 h1:6weCgzRvMg7lzuUurI4697AqIRPU1SvzHhynwpW31jI= -cloud.google.com/go/storage v1.29.0/go.mod h1:4puEjyTKnku6gfKoTfNOU/W+a9JyuVNxjpS5GBrB8h4= +cloud.google.com/go/storage v1.30.1 h1:uOdMxAs8HExqBlnLtnQyP0YkvbiDpdGShGKtx6U/oNM= +cloud.google.com/go/storage v1.30.1/go.mod h1:NfxhC0UJE1aXSx7CIIbCf7y9HKT7BiccwkR7+P7gN8E= cloud.google.com/go/talent v1.1.0/go.mod h1:Vl4pt9jiHKvOgF9KoZo6Kob9oV4lwd/ZD5Cto54zDRw= cloud.google.com/go/talent v1.2.0/go.mod h1:MoNF9bhFQbiJ6eFD3uSsg0uBALw4n4gaCaEjBw9zo8g= cloud.google.com/go/videointelligence v1.6.0/go.mod h1:w0DIDlVRKtwPCn/C4iwZIJdvC69yInhW0cfi+p546uU= @@ -198,10 +197,10 @@ cosmossdk.io/core v0.5.1 h1:vQVtFrIYOQJDV3f7rw4pjjVqc1id4+mE0L9hHP66pyI= cosmossdk.io/core v0.5.1/go.mod h1:KZtwHCLjcFuo0nmDc24Xy6CRNEL9Vl/MeimQ2aC7NLE= cosmossdk.io/depinject v1.0.0-alpha.3 h1:6evFIgj//Y3w09bqOUOzEpFj5tsxBqdc5CfkO7z+zfw= cosmossdk.io/depinject v1.0.0-alpha.3/go.mod h1:eRbcdQ7MRpIPEM5YUJh8k97nxHpYbc3sMUnEtt8HPWU= -cosmossdk.io/errors v1.0.0-beta.7 h1:gypHW76pTQGVnHKo6QBkb4yFOJjC+sUGRc5Al3Odj1w= -cosmossdk.io/errors v1.0.0-beta.7/go.mod h1:mz6FQMJRku4bY7aqS/Gwfcmr/ue91roMEKAmDUDpBfE= -cosmossdk.io/log v1.1.0 h1:v0ogPHYeTzPcBTcPR1A3j1hkei4pZama8kz8LKlCMv0= -cosmossdk.io/log v1.1.0/go.mod h1:6zjroETlcDs+mm62gd8Ig7mZ+N+fVOZS91V17H+M4N4= +cosmossdk.io/errors v1.0.0 h1:nxF07lmlBbB8NKQhtJ+sJm6ef5uV1XkvPXG2bUntb04= +cosmossdk.io/errors v1.0.0/go.mod h1:+hJZLuhdDE0pYN8HkOrVNwrIOYvUGnn6+4fjnJs/oV0= +cosmossdk.io/log v1.1.1-0.20230704160919-88f2c830b0ca h1:msenprh2BLLRwNT7zN56TbBHOGk/7ARQckXHxXyvjoQ= +cosmossdk.io/log v1.1.1-0.20230704160919-88f2c830b0ca/go.mod h1:PkIAKXZvaxrTRc++z53XMRvFk8AcGGWYHcMIPzVYX9c= cosmossdk.io/math v1.0.1 h1:Qx3ifyOPaMLNH/89WeZFH268yCvU4xEcnPLu3sJqPPg= cosmossdk.io/math v1.0.1/go.mod h1:Ygz4wBHrgc7g0N+8+MrnTfS9LLn9aaTGa9hKopuym5k= cosmossdk.io/tools/rosetta v0.2.1 h1:ddOMatOH+pbxWbrGJKRAawdBkPYLfKXutK9IETnjYxw= @@ -222,8 +221,8 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d h1:nalkkPQcITbvhmL4+C4cKA87NW0tfm3Kl9VXRoPywFg= github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d/go.mod h1:URdX5+vg25ts3aCh8H5IFZybJYKWhJHYMTnf+ULtoC4= -github.com/CosmWasm/wasmvm v1.2.4 h1:6OfeZuEcEH/9iqwrg2pkeVtDCkMoj9U6PpKtcrCyVrQ= -github.com/CosmWasm/wasmvm v1.2.4/go.mod h1:vW/E3h8j9xBQs9bCoijDuawKo9kCtxOaS8N8J7KFtkc= +github.com/CosmWasm/wasmvm v1.3.0 h1:x12X4bKlUPS7TT9QQP45+fJo2sp30GEbiSSgb9jsec8= +github.com/CosmWasm/wasmvm v1.3.0/go.mod h1:vW/E3h8j9xBQs9bCoijDuawKo9kCtxOaS8N8J7KFtkc= github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/DataDog/zstd v1.5.0/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= @@ -382,8 +381,8 @@ github.com/cosmos/btcutil v1.0.5 h1:t+ZFcX77LpKtDBhjucvnOH8C2l2ioGsBNEQ3jef8xFk= github.com/cosmos/btcutil v1.0.5/go.mod h1:IyB7iuqZMJlthe2tkIFL33xPyzbFYP0XVdS8P5lUPis= github.com/cosmos/cosmos-proto v1.0.0-beta.2 h1:X3OKvWgK9Gsejo0F1qs5l8Qn6xJV/AzgIWR2wZ8Nua8= github.com/cosmos/cosmos-proto v1.0.0-beta.2/go.mod h1:+XRCLJ14pr5HFEHIUcn51IKXD1Fy3rkEQqt4WqmN4V0= -github.com/cosmos/cosmos-sdk v0.47.3 h1:r0hGmZoAzP2D+MaPaFGHwAaTdFQq3pNpHaUp1BsffbM= -github.com/cosmos/cosmos-sdk v0.47.3/go.mod h1:c4OfLdAykA9zsj1CqrxBRqXzVz48I++JSvIMPSPcEmk= +github.com/cosmos/cosmos-sdk v0.47.4 h1:FVUpEprm58nMmBX4xkRdMDaIG5Nr4yy92HZAfGAw9bg= +github.com/cosmos/cosmos-sdk v0.47.4/go.mod h1:R5n+uM7vguVPFap4pgkdvQCT1nVo/OtPwrlAU40rvok= github.com/cosmos/gaia/v11 v11.0.0-20230724152830-861ba391c3b4 h1:mfMLLg6wbQfZCf0IkdvEWiC3AVXkNgX0vaDZFtdYLs0= github.com/cosmos/gaia/v11 v11.0.0-20230724152830-861ba391c3b4/go.mod h1:6zse9gY32FcZtX9/GYqXPGxneRN7+qpPCi/doXzgK5E= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= @@ -499,7 +498,6 @@ github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbS github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff/go.mod h1:x7DCsMOv1taUwEWCzT4cmDeAkigA5/QCwUodaVOe8Ww= github.com/getkin/kin-openapi v0.53.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4= github.com/getkin/kin-openapi v0.61.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4= -github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= @@ -651,8 +649,8 @@ github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/google/s2a-go v0.1.3 h1:FAgZmpLl/SXurPEZyCMPBIiiYeTbqfjlbdnCNTAkbGE= -github.com/google/s2a-go v0.1.3/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= +github.com/google/s2a-go v0.1.4 h1:1kZ/sQM3srePvKs3tXAvQzo66XfcReoqFpIpIccE7Oc= +github.com/google/s2a-go v0.1.4/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -673,8 +671,8 @@ github.com/googleapis/gax-go/v2 v2.3.0/go.mod h1:b8LNqSzNabLiUpXKkY7HAR5jr6bIT99 github.com/googleapis/gax-go/v2 v2.4.0/go.mod h1:XOTVJ59hdnfJLIP/dh8n5CGryZR2LxK9wbMD5+iXC6c= github.com/googleapis/gax-go/v2 v2.5.1/go.mod h1:h6B0KMMFNtI2ddbGJn3T3ZbwkeT6yqEF02fYlzkUCyo= github.com/googleapis/gax-go/v2 v2.6.0/go.mod h1:1mjbznJAPHFpesgE5ucqfYEscaz5kMdcIDwU/6+DDoY= -github.com/googleapis/gax-go/v2 v2.8.0 h1:UBtEZqx1bjXtOQ5BVTkuYghXrr3N4V123VKJK67vJZc= -github.com/googleapis/gax-go/v2 v2.8.0/go.mod h1:4orTrqY6hXxxaUL4LHIPl6lGo8vAE38/qKbhSAKP6QI= +github.com/googleapis/gax-go/v2 v2.11.0 h1:9V9PWXEsWnPpQhu/PeQIkS4eGzMlTLGgt80cUUI8Ki4= +github.com/googleapis/gax-go/v2 v2.11.0/go.mod h1:DxmR61SGKkGLa2xigwuZIQpkCI2S5iydzRfb3peWZJI= github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4= github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= @@ -699,8 +697,6 @@ github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgf github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0/go.mod h1:YN5jB8ie0yfIUg6VvR9Kz84aCaG7AsGZnLjhHbUqwPg= github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c h1:6rhixN/i8ZofjG1Y75iExal34USq5p+wiN1tpie8IrU= github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c/go.mod h1:NMPJylDgVpX0MLRlPy15sqSwOFv/U1GZ2m21JhFfek0= github.com/gtank/merlin v0.1.1-0.20191105220539-8318aed1a79f/go.mod h1:T86dnYJhcGOh5BjZFCJWTDeTK7XW8uE+E21Cy/bIQ+s= @@ -932,8 +928,7 @@ github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OS github.com/neilotoole/errgroup v0.1.6/go.mod h1:Q2nLGf+594h0CLBs/Mbg6qOr7GtqDK7C2S41udRnToE= github.com/neutron-org/admin-module v0.0.0-20230705134325-b23404470a1d h1:oexw79znoA0TEo7CGdWHrolbvZqCDD3aI+031CbOq9Y= github.com/neutron-org/admin-module v0.0.0-20230705134325-b23404470a1d/go.mod h1:QuxQ7FJlEAFMRssyEYOrR9ORnYQvBFMTlO8BXny6ntw= -github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230705143547-22c391d461d5 h1:2YQaqP5W3F+5VH0IAA7m8OHjkwONxQDqXUwo5tzKdDU= -github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230705143547-22c391d461d5/go.mod h1:l699csQZeRKYqF8R9JoYoQ6E0j4PfDM3Ln7EawtUwJE= +github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230808084410-6083b888424e/go.mod h1:Oagy36cU49438NzxKG/gmGTG903tiAI7LIUdH7x2qNY= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= @@ -1003,8 +998,8 @@ github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5Fsn github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og= github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= -github.com/prometheus/client_golang v1.15.1 h1:8tXpTmJbyH5lydzFPoxSIJ0J46jdh3tylbvM1xCv0LI= -github.com/prometheus/client_golang v1.15.1/go.mod h1:e9yaBhRPU2pPNsZwE+JdQl0KEt1N9XgF6zxWmaC0xOk= +github.com/prometheus/client_golang v1.16.0 h1:yk/hx9hDbrGHovbci4BY+pRMfSuuat626eFsHb7tmT8= +github.com/prometheus/client_golang v1.16.0/go.mod h1:Zsulrv/L9oM40tJ7T815tM89lFEugiJ9HzIqaAx4LKc= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -1228,8 +1223,8 @@ golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220314234659-1baeb1ce4c0b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.10.0 h1:LKqV2xt9+kDzSTfOhx4FrkEBcMrAgHSYgzywV9zcGmM= -golang.org/x/crypto v0.10.0/go.mod h1:o4eNf7Ede1fv+hwOwZsTHl9EsPFO6q6ZvYR8vYfY45I= +golang.org/x/crypto v0.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA= +golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -1340,8 +1335,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= -golang.org/x/net v0.11.0 h1:Gi2tvZIJyBtO9SDr1q9h5hEQCp/4L2RQ+ar0qjx2oNU= -golang.org/x/net v0.11.0/go.mod h1:2L/ixqYpgIVXmeoSA/4Lu7BzTG4KIyPIryS4IsOd1oQ= +golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50= +golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1492,14 +1487,14 @@ golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20221010170243-090e33056c14/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.9.0 h1:KS/R3tvhPqvJvwcKfnBHJwwthS11LRhmM5D59eEXa0s= -golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA= +golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.9.0 h1:GRRCnKYhdQrD8kfRAdQ6Zcw1P0OcELxGLKJvtjVMZ28= -golang.org/x/term v0.9.0/go.mod h1:M6DEAAIenWoTxdKrOltXcmDY3rSplQUkrvaDU5FcQyo= +golang.org/x/term v0.10.0 h1:3R7pNqamzBraeqj/Tj8qt1aQ2HpmlC+Cx/qL/7hn4/c= +golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1511,8 +1506,8 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.10.0 h1:UpjohKhiEgNc0CSauXmwYftY1+LlaC75SJwh0SgCX58= -golang.org/x/text v0.10.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4= +golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -1648,8 +1643,8 @@ google.golang.org/api v0.96.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ google.golang.org/api v0.97.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= google.golang.org/api v0.98.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70= -google.golang.org/api v0.122.0 h1:zDobeejm3E7pEG1mNHvdxvjs5XJoCMzyNH+CmwL94Es= -google.golang.org/api v0.122.0/go.mod h1:gcitW0lvnyWjSp9nKxAbdHKIZ6vF4aajGueeslZOyms= +google.golang.org/api v0.126.0 h1:q4GJq+cAdMAC7XP7njvQ4tvohGLiSlytuL4BQxbIZ+o= +google.golang.org/api v0.126.0/go.mod h1:mBwVAtz+87bEN6CbA1GtZPDOqY2R5ONPqJeIlvyo4Aw= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -1770,12 +1765,12 @@ google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqw google.golang.org/genproto v0.0.0-20221014173430-6e2ab493f96b/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221025140454-527a21cfbd71/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s= -google.golang.org/genproto v0.0.0-20230530153820-e85fd2cbaebc h1:8DyZCyvI8mE1IdLy/60bS+52xfymkE72wv1asokgtao= -google.golang.org/genproto v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:xZnkP7mREFX5MORlOPEzLMr+90PPZQ2QWzrVTWfAq64= -google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc h1:kVKPf/IiYSBWEWtkIn6wZXwWGCnLKcC8oWfZvXjsGnM= -google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:vHYtlOoi6TsQ3Uk2yxR7NI5z8uoV+3pZtR4jmHIkRig= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc h1:XSJ8Vk1SWuNr8S18z1NZSziL0CPIXLCCMDOEFtHBOFc= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA= +google.golang.org/genproto v0.0.0-20230706204954-ccb25ca9f130 h1:Au6te5hbKUV8pIYWHqOUZ1pva5qK/rwbIhoXEUB9Lu8= +google.golang.org/genproto v0.0.0-20230706204954-ccb25ca9f130/go.mod h1:O9kGHb51iE/nOGvQaDUuadVYqovW56s5emA88lQnj6Y= +google.golang.org/genproto/googleapis/api v0.0.0-20230629202037-9506855d4529 h1:s5YSX+ZH5b5vS9rnpGymvIyMpLRJizowqDlOuyjXnTk= +google.golang.org/genproto/googleapis/api v0.0.0-20230629202037-9506855d4529/go.mod h1:vHYtlOoi6TsQ3Uk2yxR7NI5z8uoV+3pZtR4jmHIkRig= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 h1:bVf09lpb+OJbByTj913DRJioFFAjf/ZGxEz7MajTp2U= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= @@ -1817,8 +1812,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.55.0 h1:3Oj82/tFSCeUrRTg/5E/7d/W5A1tj6Ky1ABAuZuv5ag= -google.golang.org/grpc v1.55.0/go.mod h1:iYEXKGkEBhg1PjZQvoYEVPTDkHo1/bjTnfwTeGONTY8= +google.golang.org/grpc v1.56.2 h1:fVRFRnXvU+x6C4IlHZewvJOVHoOv1TUuQyoRsYnB4bI= +google.golang.org/grpc v1.56.2/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s= 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= @@ -1835,8 +1830,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.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= -google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= +google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= 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= @@ -1874,7 +1869,7 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= -gotest.tools/v3 v3.4.0 h1:ZazjZUfuVeZGLAmlKKuyv3IKP5orXcwtOwDQH6YVr6o= +gotest.tools/v3 v3.5.0 h1:Ljk6PdHdOhAb5aDMWXjDLMMhph+BpztA4v1QdqEW2eY= honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/testutil/test_helpers.go b/testutil/test_helpers.go index 7873fe0f6..dd5ea39b5 100644 --- a/testutil/test_helpers.go +++ b/testutil/test_helpers.go @@ -286,7 +286,7 @@ func (suite *IBCConnectionTestSuite) StoreReflectCode(ctx sdk.Context, addr sdk. wasmCode, err := os.ReadFile(path) suite.Require().NoError(err) - codeID, _, err := keeper.NewDefaultPermissionKeeper(suite.GetNeutronZoneApp(suite.ChainA).WasmKeeper).Create(ctx, addr, wasmCode, &wasmtypes.AccessConfig{Permission: wasmtypes.AccessTypeEverybody, Address: ""}) + codeID, _, err := keeper.NewDefaultPermissionKeeper(suite.GetNeutronZoneApp(suite.ChainA).WasmKeeper).Create(ctx, addr, wasmCode, &wasmtypes.AccessConfig{Permission: wasmtypes.AccessTypeEverybody}) suite.Require().NoError(err) return codeID From 40e285d31bc964bdce1e1c6689c96fc42b887675 Mon Sep 17 00:00:00 2001 From: nhpd Date: Wed, 9 Aug 2023 16:25:38 +0400 Subject: [PATCH 020/307] feat: add resubmitFailure handler --- app/app.go | 2 +- proto/neutron/contractmanager/genesis.proto | 3 + wasmbinding/bindings/msg.go | 7 ++ wasmbinding/message_plugin.go | 68 ++++++++---- wasmbinding/wasm.go | 4 +- x/contractmanager/keeper/failure.go | 32 +++++- x/contractmanager/types/genesis.pb.go | 109 ++++++++++++++++---- x/interchaintxs/keeper/ibc_handlers.go | 5 +- 8 files changed, 184 insertions(+), 46 deletions(-) diff --git a/app/app.go b/app/app.go index 6c9e793a6..0fcf3fe64 100644 --- a/app/app.go +++ b/app/app.go @@ -665,7 +665,7 @@ func New( ) app.CronKeeper = *cronkeeper.NewKeeper(appCodec, keys[crontypes.StoreKey], keys[crontypes.MemStoreKey], app.AccountKeeper) - wasmOpts = append(wasmbinding.RegisterCustomPlugins(&app.InterchainTxsKeeper, &app.InterchainQueriesKeeper, app.TransferKeeper, &app.AdminmoduleKeeper, app.FeeBurnerKeeper, app.FeeKeeper, &app.BankKeeper, app.TokenFactoryKeeper, &app.CronKeeper), wasmOpts...) + wasmOpts = append(wasmbinding.RegisterCustomPlugins(&app.InterchainTxsKeeper, &app.InterchainQueriesKeeper, app.TransferKeeper, &app.AdminmoduleKeeper, app.FeeBurnerKeeper, app.FeeKeeper, &app.BankKeeper, app.TokenFactoryKeeper, &app.CronKeeper, &app.ContractManagerKeeper), wasmOpts...) queryPlugins := wasmkeeper.WithQueryPlugins( &wasmkeeper.QueryPlugins{Stargate: wasmkeeper.AcceptListStargateQuerier(wasmbinding.AcceptedStargateQueries(), app.GRPCQueryRouter(), appCodec)}) diff --git a/proto/neutron/contractmanager/genesis.proto b/proto/neutron/contractmanager/genesis.proto index 3ac92eb55..fcff1b05a 100644 --- a/proto/neutron/contractmanager/genesis.proto +++ b/proto/neutron/contractmanager/genesis.proto @@ -3,6 +3,7 @@ package neutron.contractmanager; import "gogoproto/gogo.proto"; import "neutron/contractmanager/params.proto"; +import "ibc/core/channel/v1/channel.proto"; // this line is used by starport scaffolding # genesis/proto/import option go_package = "github.com/neutron-org/neutron/x/contractmanager/types"; @@ -20,6 +21,8 @@ message Failure { uint64 ack_id = 4; // Acknowledgement type string ack_type = 5; + // IBC Packet of failure + ibc.core.channel.v1.Packet packet = 6; } // GenesisState defines the contractmanager module's genesis state. diff --git a/wasmbinding/bindings/msg.go b/wasmbinding/bindings/msg.go index 8dcccba8f..4d2a35472 100644 --- a/wasmbinding/bindings/msg.go +++ b/wasmbinding/bindings/msg.go @@ -237,3 +237,10 @@ type MsgExecuteContract struct { // Msg json encoded message to be passed to the contract Msg string `json:"msg,omitempty"` } + +type ResubmitFailure struct { + // TODO + FailureId uint64 `json:"failure_id"` +} + +type ResubmitFailureResponse struct{} diff --git a/wasmbinding/message_plugin.go b/wasmbinding/message_plugin.go index 4fc27b93c..74301e87c 100644 --- a/wasmbinding/message_plugin.go +++ b/wasmbinding/message_plugin.go @@ -3,6 +3,7 @@ package wasmbinding import ( "encoding/json" "fmt" + contractmanagerkeeper "github.com/neutron-org/neutron/x/contractmanager/keeper" "cosmossdk.io/errors" @@ -46,34 +47,37 @@ func CustomMessageDecorator( bankKeeper *bankkeeper.BaseKeeper, tokenFactoryKeeper *tokenfactorykeeper.Keeper, cronKeeper *cronkeeper.Keeper, + contractmanagerKeeper *contractmanagerkeeper.Keeper, ) func(messenger wasmkeeper.Messenger) wasmkeeper.Messenger { return func(old wasmkeeper.Messenger) wasmkeeper.Messenger { return &CustomMessenger{ - Keeper: *ictx, - Wrapped: old, - Ictxmsgserver: ictxkeeper.NewMsgServerImpl(*ictx), - Icqmsgserver: icqkeeper.NewMsgServerImpl(*icq), - transferKeeper: transferKeeper, - Adminserver: adminmodulekeeper.NewMsgServerImpl(*adminKeeper), - Bank: bankKeeper, - TokenFactory: tokenFactoryKeeper, - CronKeeper: cronKeeper, - AdminKeeper: adminKeeper, + Keeper: *ictx, + Wrapped: old, + Ictxmsgserver: ictxkeeper.NewMsgServerImpl(*ictx), + Icqmsgserver: icqkeeper.NewMsgServerImpl(*icq), + transferKeeper: transferKeeper, + Adminserver: adminmodulekeeper.NewMsgServerImpl(*adminKeeper), + Bank: bankKeeper, + TokenFactory: tokenFactoryKeeper, + CronKeeper: cronKeeper, + AdminKeeper: adminKeeper, + ContractmanagerKeeper: contractmanagerKeeper, } } } type CustomMessenger struct { - Keeper ictxkeeper.Keeper - Wrapped wasmkeeper.Messenger - Ictxmsgserver ictxtypes.MsgServer - Icqmsgserver icqtypes.MsgServer - transferKeeper transferwrapperkeeper.KeeperTransferWrapper - Adminserver admintypes.MsgServer - Bank *bankkeeper.BaseKeeper - TokenFactory *tokenfactorykeeper.Keeper - CronKeeper *cronkeeper.Keeper - AdminKeeper *adminmodulekeeper.Keeper + Keeper ictxkeeper.Keeper + Wrapped wasmkeeper.Messenger + Ictxmsgserver ictxtypes.MsgServer + Icqmsgserver icqtypes.MsgServer + transferKeeper transferwrapperkeeper.KeeperTransferWrapper + Adminserver admintypes.MsgServer + Bank *bankkeeper.BaseKeeper + TokenFactory *tokenfactorykeeper.Keeper + CronKeeper *cronkeeper.Keeper + AdminKeeper *adminmodulekeeper.Keeper + ContractmanagerKeeper *contractmanagerkeeper.Keeper } var _ wasmkeeper.Messenger = (*CustomMessenger)(nil) @@ -863,6 +867,30 @@ func (m *CustomMessenger) removeSchedule(ctx sdk.Context, contractAddr sdk.AccAd return nil, [][]byte{data}, nil } +func (m *CustomMessenger) resubmitFailure(ctx sdk.Context, contractAddr sdk.AccAddress, resubmitFailure *bindings.ResubmitFailure) ([]sdk.Event, [][]byte, error) { + err := m.ContractmanagerKeeper.ResubmitFailure(ctx, contractAddr, resubmitFailure.FailureId) + + if err != nil { + ctx.Logger().Error("failed to resubmitFailure", + "from_address", contractAddr.String(), + "error", err, + ) + return nil, nil, errors.Wrap(err, "failed to resubmitFailure") + } + + resp := bindings.ResubmitFailureResponse{} + data, err := json.Marshal(&resp) + if err != nil { + ctx.Logger().Error("json.Marshal: failed to marshal remove resubmitFailure response to JSON", + "from_address", contractAddr.String(), + "error", err, + ) + return nil, nil, errors.Wrap(err, "marshal json failed") + } + + return nil, [][]byte{data}, nil +} + func (m *CustomMessenger) isAdmin(ctx sdk.Context, contractAddr sdk.AccAddress) bool { for _, admin := range m.AdminKeeper.GetAdmins(ctx) { if admin == contractAddr.String() { diff --git a/wasmbinding/wasm.go b/wasmbinding/wasm.go index cb7be3872..151fd1c2f 100644 --- a/wasmbinding/wasm.go +++ b/wasmbinding/wasm.go @@ -4,6 +4,7 @@ import ( "github.com/CosmWasm/wasmd/x/wasm" wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" + contractmanagerkeeper "github.com/neutron-org/neutron/x/contractmanager/keeper" cronkeeper "github.com/neutron-org/neutron/x/cron/keeper" feeburnerkeeper "github.com/neutron-org/neutron/x/feeburner/keeper" feerefunderkeeper "github.com/neutron-org/neutron/x/feerefunder/keeper" @@ -27,6 +28,7 @@ func RegisterCustomPlugins( bank *bankkeeper.BaseKeeper, tfk *tokenfactorykeeper.Keeper, cronKeeper *cronkeeper.Keeper, + contractmanagerKeeper *contractmanagerkeeper.Keeper, ) []wasmkeeper.Option { wasmQueryPlugin := NewQueryPlugin(ictxKeeper, icqKeeper, feeBurnerKeeper, feeRefunderKeeper, tfk) @@ -34,7 +36,7 @@ func RegisterCustomPlugins( Custom: CustomQuerier(wasmQueryPlugin), }) messagePluginOpt := wasmkeeper.WithMessageHandlerDecorator( - CustomMessageDecorator(ictxKeeper, icqKeeper, transfer, adminKeeper, bank, tfk, cronKeeper), + CustomMessageDecorator(ictxKeeper, icqKeeper, transfer, adminKeeper, bank, tfk, cronKeeper, contractmanagerKeeper), ) return []wasm.Option{ diff --git a/x/contractmanager/keeper/failure.go b/x/contractmanager/keeper/failure.go index bf00afa66..a6856881b 100644 --- a/x/contractmanager/keeper/failure.go +++ b/x/contractmanager/keeper/failure.go @@ -3,6 +3,7 @@ package keeper import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/types/errors" "github.com/neutron-org/neutron/x/contractmanager/types" ) @@ -43,7 +44,6 @@ func (k Keeper) GetNextFailureIDKey(ctx sdk.Context, address string) uint64 { func (k Keeper) GetAllFailures(ctx sdk.Context) (list []types.Failure) { store := prefix.NewStore(ctx.KVStore(k.storeKey), types.ContractFailuresKey) iterator := sdk.KVStorePrefixIterator(store, []byte{}) - defer iterator.Close() for ; iterator.Valid(); iterator.Next() { @@ -54,3 +54,33 @@ func (k Keeper) GetAllFailures(ctx sdk.Context) (list []types.Failure) { return } + +func (k Keeper) ResubmitFailure(ctx sdk.Context, contractAddr sdk.AccAddress, failureId uint64) error { + store := ctx.KVStore(k.storeKey) + failureKey := types.GetFailureKey(contractAddr.String(), failureId) + failureBz := store.Get(failureKey) + var failure types.Failure + k.cdc.MustUnmarshal(failureBz, &failure) + + if failure.Address != contractAddr.String() { + return errors.ErrUnauthorized // TODO: can we return this from keeper? + } + + if failure.GetAckType() == "ack" { // response or error + //k.SudoResponse() + } + + if failure.GetAckType() == "error" { + //k.SudoError() + } + + if failure.GetAckType() == "timeout" { + //k.SudoTimeout() + } + + // if success resubmit + // + store.Delete(failureKey) + + return nil +} diff --git a/x/contractmanager/types/genesis.pb.go b/x/contractmanager/types/genesis.pb.go index e78a0b07c..03e781012 100644 --- a/x/contractmanager/types/genesis.pb.go +++ b/x/contractmanager/types/genesis.pb.go @@ -7,6 +7,7 @@ import ( fmt "fmt" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" + types "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" io "io" math "math" math_bits "math/bits" @@ -36,6 +37,8 @@ type Failure struct { AckId uint64 `protobuf:"varint,4,opt,name=ack_id,json=ackId,proto3" json:"ack_id,omitempty"` // Acknowledgement type AckType string `protobuf:"bytes,5,opt,name=ack_type,json=ackType,proto3" json:"ack_type,omitempty"` + // IBC Packet of failure + Packet *types.Packet `protobuf:"bytes,6,opt,name=packet,proto3" json:"packet,omitempty"` } func (m *Failure) Reset() { *m = Failure{} } @@ -106,6 +109,13 @@ func (m *Failure) GetAckType() string { return "" } +func (m *Failure) GetPacket() *types.Packet { + if m != nil { + return m.Packet + } + return nil +} + // GenesisState defines the contractmanager module's genesis state. type GenesisState struct { Params Params `protobuf:"bytes,1,opt,name=params,proto3" json:"params"` @@ -170,28 +180,31 @@ func init() { } var fileDescriptor_cf4a1534315a7490 = []byte{ - // 335 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x90, 0x3f, 0x4f, 0x02, 0x31, - 0x18, 0xc6, 0xaf, 0xc7, 0x3f, 0x29, 0xe8, 0xd0, 0x68, 0x3c, 0x49, 0x3c, 0x2e, 0x44, 0x13, 0x16, - 0xef, 0x12, 0x4c, 0xdc, 0x5c, 0x18, 0x34, 0x44, 0x07, 0x82, 0x4e, 0x2e, 0xa4, 0xb4, 0xf5, 0x68, - 0x80, 0xf6, 0xd2, 0x96, 0x44, 0x76, 0x3f, 0x80, 0xb3, 0x9f, 0x88, 0x91, 0xd1, 0xc9, 0x18, 0xf8, - 0x22, 0xe6, 0xee, 0xca, 0xa2, 0xb9, 0xed, 0xed, 0xd3, 0xe7, 0xfd, 0xe5, 0x7d, 0x1e, 0x78, 0x29, - 0xd8, 0xd2, 0x28, 0x29, 0x22, 0x22, 0x85, 0x51, 0x98, 0x98, 0x05, 0x16, 0x38, 0x66, 0x2a, 0x8a, - 0x99, 0x60, 0x9a, 0xeb, 0x30, 0x51, 0xd2, 0x48, 0x74, 0x6a, 0x6d, 0xe1, 0x1f, 0x5b, 0xeb, 0x38, - 0x96, 0xb1, 0xcc, 0x3c, 0x51, 0x3a, 0xe5, 0xf6, 0xd6, 0x45, 0x11, 0x35, 0xc1, 0x0a, 0x2f, 0x2c, - 0xb4, 0xf3, 0x0e, 0x60, 0xed, 0x0e, 0xf3, 0xf9, 0x52, 0x31, 0x74, 0x0e, 0x21, 0x99, 0x62, 0x21, - 0xd8, 0x7c, 0xcc, 0xa9, 0x07, 0x02, 0xd0, 0xad, 0x8f, 0xea, 0x56, 0x19, 0x50, 0xe4, 0xc1, 0x1a, - 0xa6, 0x54, 0x31, 0xad, 0x3d, 0x37, 0xfb, 0xdb, 0x3f, 0xd1, 0x11, 0x74, 0x39, 0xf5, 0x4a, 0x01, - 0xe8, 0x96, 0x47, 0x2e, 0xa7, 0xe8, 0x04, 0x56, 0x31, 0x99, 0xa5, 0x90, 0x72, 0xa6, 0x55, 0x30, - 0x99, 0x0d, 0x28, 0x3a, 0x83, 0x07, 0xa9, 0x6c, 0x56, 0x09, 0xf3, 0x2a, 0x96, 0x40, 0x66, 0xcf, - 0xab, 0x84, 0x75, 0x3e, 0x01, 0x6c, 0xde, 0xe7, 0x69, 0x9f, 0x0c, 0x36, 0x0c, 0xdd, 0xc2, 0x6a, - 0x7e, 0x67, 0x76, 0x47, 0xa3, 0xd7, 0x0e, 0x0b, 0xd2, 0x87, 0xc3, 0xcc, 0xd6, 0x2f, 0xaf, 0xbf, - 0xdb, 0xce, 0xc8, 0x2e, 0xa1, 0x07, 0x78, 0xf8, 0x9a, 0xa7, 0xd2, 0xe3, 0x39, 0xd7, 0xc6, 0x73, - 0x83, 0x52, 0xb7, 0xd1, 0x0b, 0x0a, 0x29, 0xb6, 0x03, 0x8b, 0x69, 0xee, 0x97, 0x1f, 0xb9, 0x36, - 0xfd, 0xe1, 0x7a, 0xeb, 0x83, 0xcd, 0xd6, 0x07, 0x3f, 0x5b, 0x1f, 0x7c, 0xec, 0x7c, 0x67, 0xb3, - 0xf3, 0x9d, 0xaf, 0x9d, 0xef, 0xbc, 0xdc, 0xc4, 0xdc, 0x4c, 0x97, 0x93, 0x90, 0xc8, 0x45, 0x64, - 0xc9, 0x57, 0x52, 0xc5, 0xfb, 0x39, 0x7a, 0xfb, 0x57, 0x7e, 0x1a, 0x5e, 0x4f, 0xaa, 0x59, 0xf9, - 0xd7, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x88, 0x8d, 0x18, 0xf9, 0xfa, 0x01, 0x00, 0x00, + // 384 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x91, 0xb1, 0xce, 0xd3, 0x30, + 0x10, 0xc7, 0xe3, 0x7c, 0x6d, 0x4a, 0xdd, 0xc2, 0x60, 0x81, 0x08, 0x45, 0xa4, 0xa1, 0x02, 0x29, + 0x0b, 0xb6, 0xda, 0x4a, 0x6c, 0x2c, 0x1d, 0x40, 0x15, 0x0c, 0x55, 0x60, 0x62, 0xa9, 0x1c, 0xc7, + 0xa4, 0x56, 0xda, 0x38, 0xb2, 0xdd, 0x8a, 0xbe, 0x05, 0x33, 0x6f, 0xc2, 0x1b, 0x74, 0xec, 0xc8, + 0x84, 0x50, 0xfb, 0x22, 0x28, 0x89, 0xb3, 0xf0, 0xa9, 0xdb, 0xe5, 0xfc, 0xbb, 0x9f, 0x2e, 0xff, + 0x83, 0xaf, 0x0b, 0xbe, 0x37, 0x4a, 0x16, 0x84, 0xc9, 0xc2, 0x28, 0xca, 0xcc, 0x8e, 0x16, 0x34, + 0xe3, 0x8a, 0x64, 0xbc, 0xe0, 0x5a, 0x68, 0x5c, 0x2a, 0x69, 0x24, 0x7a, 0x6a, 0x31, 0xfc, 0x1f, + 0x36, 0x7a, 0x9c, 0xc9, 0x4c, 0xd6, 0x0c, 0xa9, 0xaa, 0x06, 0x1f, 0xbd, 0xba, 0x65, 0x2d, 0xa9, + 0xa2, 0x3b, 0x2b, 0x1d, 0xbd, 0x14, 0x09, 0x23, 0x4c, 0x2a, 0x4e, 0xd8, 0x86, 0x16, 0x05, 0xdf, + 0x92, 0xc3, 0xb4, 0x2d, 0x1b, 0x64, 0xf2, 0x0b, 0xc0, 0xde, 0x7b, 0x2a, 0xb6, 0x7b, 0xc5, 0xd1, + 0x0b, 0x08, 0xed, 0xe3, 0x5a, 0xa4, 0x3e, 0x08, 0x41, 0xd4, 0x8f, 0xfb, 0xb6, 0xb3, 0x4c, 0x91, + 0x0f, 0x7b, 0x34, 0x4d, 0x15, 0xd7, 0xda, 0x77, 0xeb, 0xb7, 0xf6, 0x13, 0x3d, 0x82, 0xae, 0x48, + 0xfd, 0xbb, 0x10, 0x44, 0x9d, 0xd8, 0x15, 0x29, 0x7a, 0x02, 0x3d, 0xca, 0xf2, 0x4a, 0xd2, 0xa9, + 0x7b, 0x5d, 0xca, 0xf2, 0x65, 0x8a, 0x9e, 0xc1, 0x07, 0x55, 0xdb, 0x1c, 0x4b, 0xee, 0x77, 0xad, + 0x81, 0xe5, 0x5f, 0x8e, 0x25, 0x47, 0x73, 0xe8, 0x95, 0x94, 0xe5, 0xdc, 0xf8, 0x5e, 0x08, 0xa2, + 0xc1, 0xec, 0x39, 0x16, 0x09, 0xc3, 0xd5, 0xea, 0xb8, 0xdd, 0xf7, 0x30, 0xc5, 0xab, 0x1a, 0x89, + 0x2d, 0x3a, 0xf9, 0x09, 0xe0, 0xf0, 0x43, 0x93, 0xe2, 0x67, 0x43, 0x0d, 0x47, 0xef, 0x2a, 0x4b, + 0xf5, 0xff, 0xf5, 0xf2, 0x83, 0xd9, 0x18, 0xdf, 0x48, 0x15, 0xaf, 0x6a, 0x6c, 0xd1, 0x39, 0xfd, + 0x19, 0x3b, 0xb1, 0x1d, 0x42, 0x1f, 0xe1, 0xc3, 0x6f, 0x4d, 0x14, 0x7a, 0xbd, 0x15, 0xda, 0xf8, + 0x6e, 0x78, 0x17, 0x0d, 0x66, 0xe1, 0x4d, 0x8b, 0x0d, 0xce, 0x6a, 0x86, 0xed, 0xf0, 0x27, 0xa1, + 0xcd, 0x62, 0x75, 0xba, 0x04, 0xe0, 0x7c, 0x09, 0xc0, 0xdf, 0x4b, 0x00, 0x7e, 0x5c, 0x03, 0xe7, + 0x7c, 0x0d, 0x9c, 0xdf, 0xd7, 0xc0, 0xf9, 0xfa, 0x36, 0x13, 0x66, 0xb3, 0x4f, 0x30, 0x93, 0x3b, + 0x62, 0xcd, 0x6f, 0xa4, 0xca, 0xda, 0x9a, 0x7c, 0xbf, 0x77, 0xd4, 0x2a, 0x31, 0x9d, 0x78, 0xf5, + 0xc5, 0xe6, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0xef, 0xe6, 0x25, 0xdb, 0x52, 0x02, 0x00, 0x00, } func (m *Failure) Marshal() (dAtA []byte, err error) { @@ -214,6 +227,18 @@ func (m *Failure) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if m.Packet != nil { + { + size, err := m.Packet.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintGenesis(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x32 + } if len(m.AckType) > 0 { i -= len(m.AckType) copy(dAtA[i:], m.AckType) @@ -330,6 +355,10 @@ func (m *Failure) Size() (n int) { if l > 0 { n += 1 + l + sovGenesis(uint64(l)) } + if m.Packet != nil { + l = m.Packet.Size() + n += 1 + l + sovGenesis(uint64(l)) + } return n } @@ -519,6 +548,42 @@ func (m *Failure) Unmarshal(dAtA []byte) error { } m.AckType = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex + case 6: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Packet", 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 m.Packet == nil { + m.Packet = &types.Packet{} + } + if err := m.Packet.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipGenesis(dAtA[iNdEx:]) diff --git a/x/interchaintxs/keeper/ibc_handlers.go b/x/interchaintxs/keeper/ibc_handlers.go index 8b851dd69..095dbebd7 100644 --- a/x/interchaintxs/keeper/ibc_handlers.go +++ b/x/interchaintxs/keeper/ibc_handlers.go @@ -103,14 +103,17 @@ func (k *Keeper) HandleAcknowledgement(ctx sdk.Context, packet channeltypes.Pack // Actually we have only one kind of error returned from acknowledgement // maybe later we'll retrieve actual errors from events errorText := ack.GetError() + var ackType string if errorText != "" { + ackType = "err" _, err = k.contractManagerKeeper.SudoError(cacheCtx, icaOwner.GetContract(), packet, errorText) } else { + ackType = "ack" _, err = k.contractManagerKeeper.SudoResponse(cacheCtx, icaOwner.GetContract(), packet, ack.GetResult()) } if err != nil { - k.contractManagerKeeper.AddContractFailure(ctx, packet.SourceChannel, icaOwner.GetContract().String(), packet.GetSequence(), "ack") + k.contractManagerKeeper.AddContractFailure(ctx, packet.SourceChannel, icaOwner.GetContract().String(), packet.GetSequence(), ackType) k.Logger(ctx).Debug("HandleAcknowledgement: failed to Sudo contract on packet acknowledgement", "error", err) } else { ctx.EventManager().EmitEvents(cacheCtx.EventManager().Events()) From f26a224083e0733792d44509bd479c4d60ada83d Mon Sep 17 00:00:00 2001 From: nhpd Date: Wed, 9 Aug 2023 17:49:52 +0400 Subject: [PATCH 021/307] add ackResult and errorText to failure and use it to call sudoResponse and sudoTimeout --- proto/neutron/contractmanager/genesis.proto | 6 +- .../interchaintxs/types/expected_keepers.go | 8 +- .../mocks/transfer/types/expected_keepers.go | 8 +- wasmbinding/message_plugin.go | 12 +- x/contractmanager/genesis.go | 2 +- x/contractmanager/keeper/failure.go | 64 +++++-- x/contractmanager/keeper/failure_test.go | 11 +- x/contractmanager/types/errors.go | 3 +- x/contractmanager/types/genesis.pb.go | 161 +++++++++++++++--- x/interchaintxs/keeper/ibc_handlers.go | 19 ++- x/interchaintxs/keeper/ibc_handlers_test.go | 12 +- x/interchaintxs/types/expected_keepers.go | 2 +- x/transfer/ibc_handlers.go | 12 +- x/transfer/ibc_handlers_test.go | 22 +-- x/transfer/types/expected_keepers.go | 2 +- 15 files changed, 254 insertions(+), 90 deletions(-) diff --git a/proto/neutron/contractmanager/genesis.proto b/proto/neutron/contractmanager/genesis.proto index fcff1b05a..39edf5918 100644 --- a/proto/neutron/contractmanager/genesis.proto +++ b/proto/neutron/contractmanager/genesis.proto @@ -21,8 +21,12 @@ message Failure { uint64 ack_id = 4; // Acknowledgement type string ack_type = 5; + // Acknowledgement result + bytes ack_result = 6; + // Error text (empty if no error) + string error_text = 7; // IBC Packet of failure - ibc.core.channel.v1.Packet packet = 6; + ibc.core.channel.v1.Packet packet = 8; } // GenesisState defines the contractmanager module's genesis state. diff --git a/testutil/mocks/interchaintxs/types/expected_keepers.go b/testutil/mocks/interchaintxs/types/expected_keepers.go index 0c903226c..b90511672 100644 --- a/testutil/mocks/interchaintxs/types/expected_keepers.go +++ b/testutil/mocks/interchaintxs/types/expected_keepers.go @@ -116,15 +116,15 @@ func (m *MockContractManagerKeeper) EXPECT() *MockContractManagerKeeperMockRecor } // AddContractFailure mocks base method. -func (m *MockContractManagerKeeper) AddContractFailure(ctx types.Context, channelID, address string, ackID uint64, ackType string) { +func (m *MockContractManagerKeeper) AddContractFailure(ctx types.Context, packet types3.Packet, address, ackType string, ackResult []byte, errorText string) { m.ctrl.T.Helper() - m.ctrl.Call(m, "AddContractFailure", ctx, channelID, address, ackID, ackType) + m.ctrl.Call(m, "AddContractFailure", ctx, packet, address, ackType, ackResult, errorText) } // AddContractFailure indicates an expected call of AddContractFailure. -func (mr *MockContractManagerKeeperMockRecorder) AddContractFailure(ctx, channelID, address, ackID, ackType interface{}) *gomock.Call { +func (mr *MockContractManagerKeeperMockRecorder) AddContractFailure(ctx, packet, address, ackType, ackResult, errorText interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddContractFailure", reflect.TypeOf((*MockContractManagerKeeper)(nil).AddContractFailure), ctx, channelID, address, ackID, ackType) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddContractFailure", reflect.TypeOf((*MockContractManagerKeeper)(nil).AddContractFailure), ctx, packet, address, ackType, ackResult, errorText) } // HasContractInfo mocks base method. diff --git a/testutil/mocks/transfer/types/expected_keepers.go b/testutil/mocks/transfer/types/expected_keepers.go index e7c4dfa3b..b6315235e 100644 --- a/testutil/mocks/transfer/types/expected_keepers.go +++ b/testutil/mocks/transfer/types/expected_keepers.go @@ -38,15 +38,15 @@ func (m *MockContractManagerKeeper) EXPECT() *MockContractManagerKeeperMockRecor } // AddContractFailure mocks base method. -func (m *MockContractManagerKeeper) AddContractFailure(ctx types.Context, channelID, address string, ackID uint64, ackType string) { +func (m *MockContractManagerKeeper) AddContractFailure(ctx types.Context, packet types1.Packet, address, ackType string, ackResult []byte, errorText string) { m.ctrl.T.Helper() - m.ctrl.Call(m, "AddContractFailure", ctx, channelID, address, ackID, ackType) + m.ctrl.Call(m, "AddContractFailure", ctx, packet, address, ackType, ackResult, errorText) } // AddContractFailure indicates an expected call of AddContractFailure. -func (mr *MockContractManagerKeeperMockRecorder) AddContractFailure(ctx, channelID, address, ackID, ackType interface{}) *gomock.Call { +func (mr *MockContractManagerKeeperMockRecorder) AddContractFailure(ctx, packet, address, ackType, ackResult, errorText interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddContractFailure", reflect.TypeOf((*MockContractManagerKeeper)(nil).AddContractFailure), ctx, channelID, address, ackID, ackType) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddContractFailure", reflect.TypeOf((*MockContractManagerKeeper)(nil).AddContractFailure), ctx, packet, address, ackType, ackResult, errorText) } // HasContractInfo mocks base method. diff --git a/wasmbinding/message_plugin.go b/wasmbinding/message_plugin.go index 74301e87c..f57ea9957 100644 --- a/wasmbinding/message_plugin.go +++ b/wasmbinding/message_plugin.go @@ -868,7 +868,17 @@ func (m *CustomMessenger) removeSchedule(ctx sdk.Context, contractAddr sdk.AccAd } func (m *CustomMessenger) resubmitFailure(ctx sdk.Context, contractAddr sdk.AccAddress, resubmitFailure *bindings.ResubmitFailure) ([]sdk.Event, [][]byte, error) { - err := m.ContractmanagerKeeper.ResubmitFailure(ctx, contractAddr, resubmitFailure.FailureId) + failure, err := m.ContractmanagerKeeper.GetFailure(ctx, contractAddr, resubmitFailure.FailureId) + + if err != nil { + return nil, nil, errors.Wrap(sdkerrors.ErrNotFound, "no failure found to resubmit") + } + + if failure.Address != contractAddr.String() { + return nil, nil, errors.Wrap(sdkerrors.ErrUnauthorized, "only contract can resubmitFailure") + } + + err = m.ContractmanagerKeeper.ResubmitFailure(ctx, contractAddr, failure) if err != nil { ctx.Logger().Error("failed to resubmitFailure", diff --git a/x/contractmanager/genesis.go b/x/contractmanager/genesis.go index 9786d40d9..f3f2c3aee 100644 --- a/x/contractmanager/genesis.go +++ b/x/contractmanager/genesis.go @@ -11,7 +11,7 @@ import ( func InitGenesis(ctx sdk.Context, k keeper.Keeper, genState types.GenesisState) { // Set all the failure for _, elem := range genState.FailuresList { - k.AddContractFailure(ctx, elem.ChannelId, elem.Address, elem.AckId, elem.AckType) + k.AddContractFailure(ctx, *elem.Packet, elem.Address, elem.AckType, elem.AckResult, elem.ErrorText) } // this line is used by starport scaffolding # genesis/module/init err := k.SetParams(ctx, genState.Params) diff --git a/x/contractmanager/keeper/failure.go b/x/contractmanager/keeper/failure.go index a6856881b..8d7f72b09 100644 --- a/x/contractmanager/keeper/failure.go +++ b/x/contractmanager/keeper/failure.go @@ -1,20 +1,25 @@ package keeper import ( + "cosmossdk.io/errors" "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/types/errors" + sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + ibcchanneltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" "github.com/neutron-org/neutron/x/contractmanager/types" ) // AddContractFailure adds a specific failure to the store using address as the key -func (k Keeper) AddContractFailure(ctx sdk.Context, channelID, address string, ackID uint64, ackType string) { +func (k Keeper) AddContractFailure(ctx sdk.Context, packet ibcchanneltypes.Packet, address string, ackType string, ackResult []byte, errorText string) { failure := types.Failure{ - ChannelId: channelID, + ChannelId: packet.SourceChannel, Address: address, - AckId: ackID, + AckId: packet.Sequence, AckType: ackType, + AckResult: ackResult, + ErrorText: errorText, + Packet: &packet, } nextFailureID := k.GetNextFailureIDKey(ctx, failure.GetAddress()) @@ -55,32 +60,55 @@ func (k Keeper) GetAllFailures(ctx sdk.Context) (list []types.Failure) { return } -func (k Keeper) ResubmitFailure(ctx sdk.Context, contractAddr sdk.AccAddress, failureId uint64) error { +func (k Keeper) GetFailure(ctx sdk.Context, contractAddr sdk.AccAddress, failureId uint64) (*types.Failure, error) { store := ctx.KVStore(k.storeKey) failureKey := types.GetFailureKey(contractAddr.String(), failureId) + failureBz := store.Get(failureKey) + if failureBz == nil { + return nil, errors.Wrapf(sdkerrors.ErrKeyNotFound, "no failure found for contractAddress = %s and failureId = %d", contractAddr.String(), failureId) + } var failure types.Failure k.cdc.MustUnmarshal(failureBz, &failure) - if failure.Address != contractAddr.String() { - return errors.ErrUnauthorized // TODO: can we return this from keeper? - } + return &failure, nil +} - if failure.GetAckType() == "ack" { // response or error - //k.SudoResponse() +// ResubmitFailure tries to call sudo handler for contract with same parameters as initially. +func (k Keeper) ResubmitFailure(ctx sdk.Context, contractAddr sdk.AccAddress, failure *types.Failure) error { + if failure.Packet == nil { + return errors.Wrapf(types.IncorrectFailureToResubmit, "cannot resubmit failure without packet info failureId = %d", failure.Id) } - if failure.GetAckType() == "error" { - //k.SudoError() + if failure.GetAckType() == "ack" { // response or error + _, err := k.SudoResponse(ctx, contractAddr, *failure.Packet, failure.AckResult) + // TODO: handle resp? + if err != nil { + return err // TODO: wrap + } + } else if failure.GetAckType() == "timeout" { + // TODO + _, err := k.SudoTimeout(ctx, contractAddr, *failure.Packet) + if err != nil { + return err // TODO: wrap + } + } else { + return errors.Wrapf(types.IncorrectAckType, "cannot resubmit failure with incorrect ackType = %s", failure.GetAckType()) } - if failure.GetAckType() == "timeout" { - //k.SudoTimeout() - } + // TODO: If submitted failure response or timeout successfully, we can cleanup it? + // Or maybe mark it as processed + // Also maybe cleanup packet and ack data to smaller data to store + // Is it bad be able to call resubmitFailure multiple times? + k.removeFailure(ctx, contractAddr, failure.Id) - // if success resubmit - // - store.Delete(failureKey) + // TODO: maybe return result from sudo call? return nil } + +func (k Keeper) removeFailure(ctx sdk.Context, contractAddr sdk.AccAddress, id uint64) { + store := ctx.KVStore(k.storeKey) + failureKey := types.GetFailureKey(contractAddr.String(), id) + store.Delete(failureKey) +} diff --git a/x/contractmanager/keeper/failure_test.go b/x/contractmanager/keeper/failure_test.go index 7ef9c33d2..7c1a30229 100644 --- a/x/contractmanager/keeper/failure_test.go +++ b/x/contractmanager/keeper/failure_test.go @@ -2,6 +2,9 @@ package keeper_test import ( "crypto/rand" + icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" + channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" + "github.com/neutron-org/neutron/testutil" "strconv" "testing" @@ -29,10 +32,16 @@ func createNFailure(keeper *keeper.Keeper, ctx sdk.Context, addresses, failures acc := sdk.AccAddress(pub.Address()) for c := range items[i] { + p := channeltypes.Packet{ + Sequence: 0, + SourcePort: icatypes.ControllerPortPrefix + testutil.TestOwnerAddress + ".ica0", // TODO: maybe change + SourceChannel: items[i][c].ChannelId, + } items[i][c].Address = acc.String() items[i][c].Id = uint64(c) - keeper.AddContractFailure(ctx, items[i][c].ChannelId, items[i][c].Address, 0, "") + // TODO + keeper.AddContractFailure(ctx, p, items[i][c].Address, "") } } return items diff --git a/x/contractmanager/types/errors.go b/x/contractmanager/types/errors.go index b846d3302..86734f227 100644 --- a/x/contractmanager/types/errors.go +++ b/x/contractmanager/types/errors.go @@ -8,5 +8,6 @@ import ( // x/contractmanager module sentinel errors var ( - ErrSample = errors.Register(ModuleName, 1100, "sample error") + IncorrectAckType = errors.Register(ModuleName, 1100, "incorrect acknowledgement type") + IncorrectFailureToResubmit = errors.Register(ModuleName, 1101, "incorrect failure to resubmit") ) diff --git a/x/contractmanager/types/genesis.pb.go b/x/contractmanager/types/genesis.pb.go index 03e781012..9dfb2f2b8 100644 --- a/x/contractmanager/types/genesis.pb.go +++ b/x/contractmanager/types/genesis.pb.go @@ -37,8 +37,12 @@ type Failure struct { AckId uint64 `protobuf:"varint,4,opt,name=ack_id,json=ackId,proto3" json:"ack_id,omitempty"` // Acknowledgement type AckType string `protobuf:"bytes,5,opt,name=ack_type,json=ackType,proto3" json:"ack_type,omitempty"` + // Acknowledgement result + AckResult []byte `protobuf:"bytes,6,opt,name=ack_result,json=ackResult,proto3" json:"ack_result,omitempty"` + // Error text (empty if no error) + ErrorText string `protobuf:"bytes,7,opt,name=error_text,json=errorText,proto3" json:"error_text,omitempty"` // IBC Packet of failure - Packet *types.Packet `protobuf:"bytes,6,opt,name=packet,proto3" json:"packet,omitempty"` + Packet *types.Packet `protobuf:"bytes,8,opt,name=packet,proto3" json:"packet,omitempty"` } func (m *Failure) Reset() { *m = Failure{} } @@ -109,6 +113,20 @@ func (m *Failure) GetAckType() string { return "" } +func (m *Failure) GetAckResult() []byte { + if m != nil { + return m.AckResult + } + return nil +} + +func (m *Failure) GetErrorText() string { + if m != nil { + return m.ErrorText + } + return "" +} + func (m *Failure) GetPacket() *types.Packet { if m != nil { return m.Packet @@ -180,31 +198,34 @@ func init() { } var fileDescriptor_cf4a1534315a7490 = []byte{ - // 384 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x91, 0xb1, 0xce, 0xd3, 0x30, - 0x10, 0xc7, 0xe3, 0x7c, 0x6d, 0x4a, 0xdd, 0xc2, 0x60, 0x81, 0x08, 0x45, 0xa4, 0xa1, 0x02, 0x29, - 0x0b, 0xb6, 0xda, 0x4a, 0x6c, 0x2c, 0x1d, 0x40, 0x15, 0x0c, 0x55, 0x60, 0x62, 0xa9, 0x1c, 0xc7, - 0xa4, 0x56, 0xda, 0x38, 0xb2, 0xdd, 0x8a, 0xbe, 0x05, 0x33, 0x6f, 0xc2, 0x1b, 0x74, 0xec, 0xc8, - 0x84, 0x50, 0xfb, 0x22, 0x28, 0x89, 0xb3, 0xf0, 0xa9, 0xdb, 0xe5, 0xfc, 0xbb, 0x9f, 0x2e, 0xff, - 0x83, 0xaf, 0x0b, 0xbe, 0x37, 0x4a, 0x16, 0x84, 0xc9, 0xc2, 0x28, 0xca, 0xcc, 0x8e, 0x16, 0x34, - 0xe3, 0x8a, 0x64, 0xbc, 0xe0, 0x5a, 0x68, 0x5c, 0x2a, 0x69, 0x24, 0x7a, 0x6a, 0x31, 0xfc, 0x1f, - 0x36, 0x7a, 0x9c, 0xc9, 0x4c, 0xd6, 0x0c, 0xa9, 0xaa, 0x06, 0x1f, 0xbd, 0xba, 0x65, 0x2d, 0xa9, - 0xa2, 0x3b, 0x2b, 0x1d, 0xbd, 0x14, 0x09, 0x23, 0x4c, 0x2a, 0x4e, 0xd8, 0x86, 0x16, 0x05, 0xdf, - 0x92, 0xc3, 0xb4, 0x2d, 0x1b, 0x64, 0xf2, 0x0b, 0xc0, 0xde, 0x7b, 0x2a, 0xb6, 0x7b, 0xc5, 0xd1, - 0x0b, 0x08, 0xed, 0xe3, 0x5a, 0xa4, 0x3e, 0x08, 0x41, 0xd4, 0x8f, 0xfb, 0xb6, 0xb3, 0x4c, 0x91, - 0x0f, 0x7b, 0x34, 0x4d, 0x15, 0xd7, 0xda, 0x77, 0xeb, 0xb7, 0xf6, 0x13, 0x3d, 0x82, 0xae, 0x48, - 0xfd, 0xbb, 0x10, 0x44, 0x9d, 0xd8, 0x15, 0x29, 0x7a, 0x02, 0x3d, 0xca, 0xf2, 0x4a, 0xd2, 0xa9, - 0x7b, 0x5d, 0xca, 0xf2, 0x65, 0x8a, 0x9e, 0xc1, 0x07, 0x55, 0xdb, 0x1c, 0x4b, 0xee, 0x77, 0xad, - 0x81, 0xe5, 0x5f, 0x8e, 0x25, 0x47, 0x73, 0xe8, 0x95, 0x94, 0xe5, 0xdc, 0xf8, 0x5e, 0x08, 0xa2, - 0xc1, 0xec, 0x39, 0x16, 0x09, 0xc3, 0xd5, 0xea, 0xb8, 0xdd, 0xf7, 0x30, 0xc5, 0xab, 0x1a, 0x89, - 0x2d, 0x3a, 0xf9, 0x09, 0xe0, 0xf0, 0x43, 0x93, 0xe2, 0x67, 0x43, 0x0d, 0x47, 0xef, 0x2a, 0x4b, - 0xf5, 0xff, 0xf5, 0xf2, 0x83, 0xd9, 0x18, 0xdf, 0x48, 0x15, 0xaf, 0x6a, 0x6c, 0xd1, 0x39, 0xfd, - 0x19, 0x3b, 0xb1, 0x1d, 0x42, 0x1f, 0xe1, 0xc3, 0x6f, 0x4d, 0x14, 0x7a, 0xbd, 0x15, 0xda, 0xf8, - 0x6e, 0x78, 0x17, 0x0d, 0x66, 0xe1, 0x4d, 0x8b, 0x0d, 0xce, 0x6a, 0x86, 0xed, 0xf0, 0x27, 0xa1, - 0xcd, 0x62, 0x75, 0xba, 0x04, 0xe0, 0x7c, 0x09, 0xc0, 0xdf, 0x4b, 0x00, 0x7e, 0x5c, 0x03, 0xe7, - 0x7c, 0x0d, 0x9c, 0xdf, 0xd7, 0xc0, 0xf9, 0xfa, 0x36, 0x13, 0x66, 0xb3, 0x4f, 0x30, 0x93, 0x3b, - 0x62, 0xcd, 0x6f, 0xa4, 0xca, 0xda, 0x9a, 0x7c, 0xbf, 0x77, 0xd4, 0x2a, 0x31, 0x9d, 0x78, 0xf5, - 0xc5, 0xe6, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0xef, 0xe6, 0x25, 0xdb, 0x52, 0x02, 0x00, 0x00, + // 422 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x92, 0x31, 0x8f, 0xd3, 0x30, + 0x14, 0xc7, 0xeb, 0x5e, 0xaf, 0xbd, 0xba, 0x85, 0xc1, 0x02, 0x61, 0x8a, 0xc8, 0x85, 0x13, 0x48, + 0x59, 0xb0, 0x75, 0x3d, 0x89, 0x8d, 0xe5, 0x06, 0xd0, 0x09, 0x86, 0x2a, 0xdc, 0xc4, 0x52, 0x39, + 0x8e, 0xc9, 0x59, 0x49, 0xe3, 0xc8, 0x76, 0x4e, 0xbd, 0x6f, 0xc1, 0xcc, 0x27, 0xba, 0xf1, 0x46, + 0x26, 0x84, 0xda, 0x0f, 0xc1, 0x8a, 0xec, 0x38, 0x0b, 0xa8, 0xdb, 0xcb, 0xff, 0xfd, 0xdf, 0x2f, + 0x79, 0xff, 0x17, 0xf8, 0xa6, 0x16, 0xad, 0xd5, 0xaa, 0xa6, 0x5c, 0xd5, 0x56, 0x33, 0x6e, 0x37, + 0xac, 0x66, 0x85, 0xd0, 0xb4, 0x10, 0xb5, 0x30, 0xd2, 0x90, 0x46, 0x2b, 0xab, 0xd0, 0xb3, 0x60, + 0x23, 0xff, 0xd8, 0x16, 0x4f, 0x0a, 0x55, 0x28, 0xef, 0xa1, 0xae, 0xea, 0xec, 0x8b, 0xd7, 0x87, + 0xa8, 0x0d, 0xd3, 0x6c, 0x13, 0xa0, 0x8b, 0x57, 0x32, 0xe3, 0x94, 0x2b, 0x2d, 0x28, 0xbf, 0x61, + 0x75, 0x2d, 0x2a, 0x7a, 0x7b, 0xde, 0x97, 0x9d, 0xe5, 0xec, 0x0f, 0x80, 0x93, 0x0f, 0x4c, 0x56, + 0xad, 0x16, 0xe8, 0x25, 0x84, 0xa1, 0xb9, 0x96, 0x39, 0x06, 0x31, 0x48, 0xa6, 0xe9, 0x34, 0x28, + 0x57, 0x39, 0xc2, 0x70, 0xc2, 0xf2, 0x5c, 0x0b, 0x63, 0xf0, 0xd0, 0xf7, 0xfa, 0x47, 0xf4, 0x18, + 0x0e, 0x65, 0x8e, 0x8f, 0x62, 0x90, 0x8c, 0xd2, 0xa1, 0xcc, 0xd1, 0x53, 0x38, 0x66, 0xbc, 0x74, + 0x90, 0x91, 0xd7, 0x8e, 0x19, 0x2f, 0xaf, 0x72, 0xf4, 0x1c, 0x9e, 0x38, 0xd9, 0xde, 0x35, 0x02, + 0x1f, 0x07, 0x02, 0x2f, 0xaf, 0xef, 0x1a, 0xff, 0x6a, 0xd7, 0xd2, 0xc2, 0xb4, 0x95, 0xc5, 0xe3, + 0x18, 0x24, 0xf3, 0x74, 0xca, 0x78, 0x99, 0x7a, 0xc1, 0xb5, 0x85, 0xd6, 0x4a, 0xaf, 0xad, 0xd8, + 0x5a, 0x3c, 0xe9, 0xbe, 0xcc, 0x2b, 0xd7, 0x62, 0x6b, 0xd1, 0x05, 0x1c, 0x37, 0x8c, 0x97, 0xc2, + 0xe2, 0x93, 0x18, 0x24, 0xb3, 0xe5, 0x0b, 0x22, 0x33, 0x4e, 0xdc, 0xe2, 0xa4, 0xdf, 0xf6, 0xf6, + 0x9c, 0xac, 0xbc, 0x25, 0x0d, 0xd6, 0xb3, 0x1f, 0x00, 0xce, 0x3f, 0x76, 0x37, 0xf8, 0x62, 0x99, + 0x15, 0xe8, 0xbd, 0xa3, 0xb8, 0xf4, 0xfc, 0xea, 0xb3, 0xe5, 0x29, 0x39, 0x70, 0x13, 0xb2, 0xf2, + 0xb6, 0xcb, 0xd1, 0xfd, 0xaf, 0xd3, 0x41, 0x1a, 0x86, 0xd0, 0x27, 0xf8, 0xe8, 0x5b, 0x17, 0xa4, + 0x59, 0x57, 0xd2, 0x58, 0x3c, 0x8c, 0x8f, 0x92, 0xd9, 0x32, 0x3e, 0x48, 0x09, 0xb1, 0x07, 0xcc, + 0xbc, 0x1f, 0xfe, 0x2c, 0x8d, 0xbd, 0x5c, 0xdd, 0xef, 0x22, 0xf0, 0xb0, 0x8b, 0xc0, 0xef, 0x5d, + 0x04, 0xbe, 0xef, 0xa3, 0xc1, 0xc3, 0x3e, 0x1a, 0xfc, 0xdc, 0x47, 0x83, 0xaf, 0xef, 0x0a, 0x69, + 0x6f, 0xda, 0x8c, 0x70, 0xb5, 0xa1, 0x81, 0xfc, 0x56, 0xe9, 0xa2, 0xaf, 0xe9, 0xf6, 0xbf, 0x5f, + 0xc2, 0xe5, 0x6d, 0xb2, 0xb1, 0xbf, 0xf7, 0xc5, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xd6, 0x70, + 0x0c, 0x8d, 0x90, 0x02, 0x00, 0x00, } func (m *Failure) Marshal() (dAtA []byte, err error) { @@ -237,6 +258,20 @@ func (m *Failure) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintGenesis(dAtA, i, uint64(size)) } i-- + dAtA[i] = 0x42 + } + if len(m.ErrorText) > 0 { + i -= len(m.ErrorText) + copy(dAtA[i:], m.ErrorText) + i = encodeVarintGenesis(dAtA, i, uint64(len(m.ErrorText))) + i-- + dAtA[i] = 0x3a + } + if len(m.AckResult) > 0 { + i -= len(m.AckResult) + copy(dAtA[i:], m.AckResult) + i = encodeVarintGenesis(dAtA, i, uint64(len(m.AckResult))) + i-- dAtA[i] = 0x32 } if len(m.AckType) > 0 { @@ -355,6 +390,14 @@ func (m *Failure) Size() (n int) { if l > 0 { n += 1 + l + sovGenesis(uint64(l)) } + l = len(m.AckResult) + if l > 0 { + n += 1 + l + sovGenesis(uint64(l)) + } + l = len(m.ErrorText) + if l > 0 { + n += 1 + l + sovGenesis(uint64(l)) + } if m.Packet != nil { l = m.Packet.Size() n += 1 + l + sovGenesis(uint64(l)) @@ -549,6 +592,72 @@ func (m *Failure) Unmarshal(dAtA []byte) error { m.AckType = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 6: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field AckResult", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenesis + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthGenesis + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthGenesis + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.AckResult = append(m.AckResult[:0], dAtA[iNdEx:postIndex]...) + if m.AckResult == nil { + m.AckResult = []byte{} + } + iNdEx = postIndex + case 7: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ErrorText", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenesis + } + 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 ErrInvalidLengthGenesis + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthGenesis + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.ErrorText = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 8: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Packet", wireType) } diff --git a/x/interchaintxs/keeper/ibc_handlers.go b/x/interchaintxs/keeper/ibc_handlers.go index 095dbebd7..f3252845f 100644 --- a/x/interchaintxs/keeper/ibc_handlers.go +++ b/x/interchaintxs/keeper/ibc_handlers.go @@ -27,6 +27,8 @@ func (k *Keeper) outOfGasRecovery( senderAddress sdk.AccAddress, packet channeltypes.Packet, failureAckType string, + ackResult []byte, + errorText string, ) { if r := recover(); r != nil { _, ok := r.(sdk.ErrorOutOfGas) @@ -35,7 +37,7 @@ func (k *Keeper) outOfGasRecovery( } k.Logger(ctx).Debug("Out of gas", "Gas meter", gasMeter.String()) - k.contractManagerKeeper.AddContractFailure(ctx, packet.SourceChannel, senderAddress.String(), packet.GetSequence(), failureAckType) + k.contractManagerKeeper.AddContractFailure(ctx, packet, senderAddress.String(), failureAckType, ackResult, errorText) } } @@ -96,24 +98,23 @@ func (k *Keeper) HandleAcknowledgement(ctx sdk.Context, packet channeltypes.Pack } cacheCtx, writeFn, newGasMeter := k.createCachedContext(ctx) - defer k.outOfGasRecovery(ctx, newGasMeter, icaOwner.GetContract(), packet, "ack") + defer k.outOfGasRecovery(ctx, newGasMeter, icaOwner.GetContract(), packet, "ack", ack.GetResult(), ack.GetError()) k.feeKeeper.DistributeAcknowledgementFee(ctx, relayer, feetypes.NewPacketID(packet.SourcePort, packet.SourceChannel, packet.Sequence)) // Actually we have only one kind of error returned from acknowledgement // maybe later we'll retrieve actual errors from events errorText := ack.GetError() - var ackType string + var ackResult []byte if errorText != "" { - ackType = "err" _, err = k.contractManagerKeeper.SudoError(cacheCtx, icaOwner.GetContract(), packet, errorText) } else { - ackType = "ack" - _, err = k.contractManagerKeeper.SudoResponse(cacheCtx, icaOwner.GetContract(), packet, ack.GetResult()) + ackResult = ack.GetResult() + _, err = k.contractManagerKeeper.SudoResponse(cacheCtx, icaOwner.GetContract(), packet, ackResult) } if err != nil { - k.contractManagerKeeper.AddContractFailure(ctx, packet.SourceChannel, icaOwner.GetContract().String(), packet.GetSequence(), ackType) + k.contractManagerKeeper.AddContractFailure(ctx, packet, icaOwner.GetContract().String(), "ack", ackResult, errorText) k.Logger(ctx).Debug("HandleAcknowledgement: failed to Sudo contract on packet acknowledgement", "error", err) } else { ctx.EventManager().EmitEvents(cacheCtx.EventManager().Events()) @@ -139,13 +140,13 @@ func (k *Keeper) HandleTimeout(ctx sdk.Context, packet channeltypes.Packet, rela } cacheCtx, writeFn, newGasMeter := k.createCachedContext(ctx) - defer k.outOfGasRecovery(ctx, newGasMeter, icaOwner.GetContract(), packet, "timeout") + defer k.outOfGasRecovery(ctx, newGasMeter, icaOwner.GetContract(), packet, "timeout", []byte{}, "") k.feeKeeper.DistributeTimeoutFee(ctx, relayer, feetypes.NewPacketID(packet.SourcePort, packet.SourceChannel, packet.Sequence)) _, err = k.contractManagerKeeper.SudoTimeout(cacheCtx, icaOwner.GetContract(), packet) if err != nil { - k.contractManagerKeeper.AddContractFailure(ctx, packet.SourceChannel, icaOwner.GetContract().String(), packet.GetSequence(), "timeout") + k.contractManagerKeeper.AddContractFailure(ctx, packet, icaOwner.GetContract().String(), "timeout", []byte{}, "") k.Logger(ctx).Error("HandleTimeout: failed to Sudo contract on packet timeout", "error", err) } else { ctx.EventManager().EmitEvents(cacheCtx.EventManager().Events()) diff --git a/x/interchaintxs/keeper/ibc_handlers_test.go b/x/interchaintxs/keeper/ibc_handlers_test.go index b02a7b6fb..4ec0e8c3d 100644 --- a/x/interchaintxs/keeper/ibc_handlers_test.go +++ b/x/interchaintxs/keeper/ibc_handlers_test.go @@ -71,7 +71,7 @@ func TestHandleAcknowledgement(t *testing.T) { store := cachedCtx.KVStore(storeKey) store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) // consumes 2990 }).Return(nil, fmt.Errorf("SudoResponse error")) - cmKeeper.EXPECT().AddContractFailure(ctx, "channel-0", contractAddress.String(), p.GetSequence(), "ack") + cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "ack") feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = icak.HandleAcknowledgement(ctx, p, resAckData, relayerAddress) require.NoError(t, err) @@ -84,7 +84,7 @@ func TestHandleAcknowledgement(t *testing.T) { store := cachedCtx.KVStore(storeKey) store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) }).Return(nil, fmt.Errorf("SudoError error")) - cmKeeper.EXPECT().AddContractFailure(ctx, "channel-0", contractAddress.String(), p.GetSequence(), "ack") + cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "ack") feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = icak.HandleAcknowledgement(ctx, p, errAckData, relayerAddress) require.NoError(t, err) @@ -109,7 +109,7 @@ func TestHandleAcknowledgement(t *testing.T) { store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) cachedCtx.GasMeter().ConsumeGas(cachedCtx.GasMeter().Limit()+1, "out of gas test") }).Return(nil, fmt.Errorf("SudoError error")) - cmKeeper.EXPECT().AddContractFailure(ctx, "channel-0", contractAddress.String(), p.GetSequence(), "ack") + cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "ack") feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = icak.HandleAcknowledgement(ctx, p, errAckData, relayerAddress) require.NoError(t, err) @@ -144,7 +144,7 @@ func TestHandleAcknowledgement(t *testing.T) { cachedCtx.GasMeter().ConsumeGas(1, "Sudo response consumption") }).Return(nil, nil) feeKeeper.EXPECT().DistributeAcknowledgementFee(lowGasCtx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) - cmKeeper.EXPECT().AddContractFailure(lowGasCtx, "channel-0", contractAddress.String(), p.GetSequence(), "ack").Do(func(ctx sdk.Context, channelId, address string, ackID uint64, ackType string) { + cmKeeper.EXPECT().AddContractFailure(lowGasCtx, p, contractAddress.String(), "ack").Do(func(ctx sdk.Context, channelId, address string, ackID uint64, ackType string) { ctx.GasMeter().ConsumeGas(keeper.GasReserve, "out of gas") }) require.Panics(t, func() { icak.HandleAcknowledgement(lowGasCtx, p, resAckData, relayerAddress) }) //nolint:errcheck // this is a panic test @@ -194,7 +194,7 @@ func TestHandleTimeout(t *testing.T) { store := cachedCtx.KVStore(storeKey) store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) }).Return(nil, fmt.Errorf("SudoTimeout error")) - cmKeeper.EXPECT().AddContractFailure(ctx, "channel-0", contractAddress.String(), p.GetSequence(), "timeout") + cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "timeout") feeKeeper.EXPECT().DistributeTimeoutFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = icak.HandleTimeout(ctx, p, relayerAddress) require.NoError(t, err) @@ -207,7 +207,7 @@ func TestHandleTimeout(t *testing.T) { store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) cachedCtx.GasMeter().ConsumeGas(cachedCtx.GasMeter().Limit()+1, "out of gas test") }).Return(nil, fmt.Errorf("SudoTimeout error")) - cmKeeper.EXPECT().AddContractFailure(ctx, "channel-0", contractAddress.String(), p.GetSequence(), "timeout") + cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "timeout") feeKeeper.EXPECT().DistributeTimeoutFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = icak.HandleTimeout(ctx, p, relayerAddress) require.NoError(t, err) diff --git a/x/interchaintxs/types/expected_keepers.go b/x/interchaintxs/types/expected_keepers.go index 7097b0ed4..d6d07d224 100644 --- a/x/interchaintxs/types/expected_keepers.go +++ b/x/interchaintxs/types/expected_keepers.go @@ -26,7 +26,7 @@ type BankKeeper interface { type ContractManagerKeeper interface { HasContractInfo(ctx sdk.Context, contractAddress sdk.AccAddress) bool - AddContractFailure(ctx sdk.Context, channelID, address string, ackID uint64, ackType string) + AddContractFailure(ctx sdk.Context, packet channeltypes.Packet, address string, ackType string, ackResult []byte, errorText string) SudoResponse(ctx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, msg []byte) ([]byte, error) SudoError(ctx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, details string) ([]byte, error) SudoTimeout(ctx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet) ([]byte, error) diff --git a/x/transfer/ibc_handlers.go b/x/transfer/ibc_handlers.go index fe6db47d5..ed916efd6 100644 --- a/x/transfer/ibc_handlers.go +++ b/x/transfer/ibc_handlers.go @@ -26,6 +26,8 @@ func (im IBCModule) outOfGasRecovery( packet channeltypes.Packet, data transfertypes.FungibleTokenPacketData, failureType string, + ackResult []byte, + errorText string, ) { if r := recover(); r != nil { _, ok := r.(sdk.ErrorOutOfGas) @@ -34,7 +36,7 @@ func (im IBCModule) outOfGasRecovery( } im.keeper.Logger(ctx).Debug("Out of gas", "Gas meter", gasMeter.String(), "Packet data", data) - im.ContractManagerKeeper.AddContractFailure(ctx, packet.SourceChannel, senderAddress.String(), packet.GetSequence(), failureType) + im.ContractManagerKeeper.AddContractFailure(ctx, packet, senderAddress.String(), failureType, ackResult, errorText) // FIXME: add distribution call } } @@ -95,7 +97,7 @@ func (im IBCModule) HandleAcknowledgement(ctx sdk.Context, packet channeltypes.P } cacheCtx, writeFn, newGasMeter := im.createCachedContext(ctx) - defer im.outOfGasRecovery(ctx, newGasMeter, senderAddress, packet, data, "ack") + defer im.outOfGasRecovery(ctx, newGasMeter, senderAddress, packet, data, "ack", ack.GetResult(), ack.GetError()) if ack.Success() { _, err = im.ContractManagerKeeper.SudoResponse(cacheCtx, senderAddress, packet, ack.GetResult()) @@ -107,7 +109,7 @@ func (im IBCModule) HandleAcknowledgement(ctx sdk.Context, packet channeltypes.P } if err != nil { - im.ContractManagerKeeper.AddContractFailure(ctx, packet.SourceChannel, senderAddress.String(), packet.GetSequence(), "ack") + im.ContractManagerKeeper.AddContractFailure(ctx, packet, senderAddress.String(), "ack", ack.GetResult(), ack.GetError()) im.keeper.Logger(ctx).Debug("failed to Sudo contract on packet acknowledgement", err) } else { ctx.EventManager().EmitEvents(cacheCtx.EventManager().Events()) @@ -140,11 +142,11 @@ func (im IBCModule) HandleTimeout(ctx sdk.Context, packet channeltypes.Packet, r } cacheCtx, writeFn, newGasMeter := im.createCachedContext(ctx) - defer im.outOfGasRecovery(ctx, newGasMeter, senderAddress, packet, data, "timeout") + defer im.outOfGasRecovery(ctx, newGasMeter, senderAddress, packet, data, "timeout", []byte{}, "") _, err = im.ContractManagerKeeper.SudoTimeout(cacheCtx, senderAddress, packet) if err != nil { - im.ContractManagerKeeper.AddContractFailure(ctx, packet.SourceChannel, senderAddress.String(), packet.GetSequence(), "timeout") + im.ContractManagerKeeper.AddContractFailure(ctx, packet, senderAddress.String(), "timeout", []byte{}, "") im.keeper.Logger(ctx).Debug("failed to Sudo contract on packet timeout", err) } else { ctx.EventManager().EmitEvents(cacheCtx.EventManager().Events()) diff --git a/x/transfer/ibc_handlers_test.go b/x/transfer/ibc_handlers_test.go index 024d17989..b411029e3 100644 --- a/x/transfer/ibc_handlers_test.go +++ b/x/transfer/ibc_handlers_test.go @@ -100,7 +100,7 @@ func TestHandleAcknowledgement(t *testing.T) { store := cachedCtx.KVStore(storeKey) store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) // consumes 2990 }).Return(nil, fmt.Errorf("SudoResponse error")) - cmKeeper.EXPECT().AddContractFailure(ctx, "channel-0", contractAddress.String(), p.GetSequence(), "ack") + cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "ack") cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(false) err = txModule.HandleAcknowledgement(ctx, p, resAckData, relayerAddress) require.NoError(t, err) @@ -113,7 +113,7 @@ func TestHandleAcknowledgement(t *testing.T) { store := cachedCtx.KVStore(storeKey) store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) // consumes 2990 }).Return(nil, fmt.Errorf("SudoResponse error")) - cmKeeper.EXPECT().AddContractFailure(ctx, "channel-0", contractAddress.String(), p.GetSequence(), "ack") + cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "ack") cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = txModule.HandleAcknowledgement(ctx, p, resAckData, relayerAddress) @@ -127,7 +127,7 @@ func TestHandleAcknowledgement(t *testing.T) { store := cachedCtx.KVStore(storeKey) store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) // consumes 2990 }).Return(nil, fmt.Errorf("SudoError error")) - cmKeeper.EXPECT().AddContractFailure(ctx, "channel-0", contractAddress.String(), p.GetSequence(), "ack") + cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "ack") cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(false) // feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = txModule.HandleAcknowledgement(ctx, p, errAckData, relayerAddress) @@ -141,7 +141,7 @@ func TestHandleAcknowledgement(t *testing.T) { store := cachedCtx.KVStore(storeKey) store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) // consumes 2990 }).Return(nil, fmt.Errorf("SudoError error")) - cmKeeper.EXPECT().AddContractFailure(ctx, "channel-0", contractAddress.String(), p.GetSequence(), "ack") + cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "ack") cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = txModule.HandleAcknowledgement(ctx, p, errAckData, relayerAddress) @@ -179,7 +179,7 @@ func TestHandleAcknowledgement(t *testing.T) { store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) cachedCtx.GasMeter().ConsumeGas(cachedCtx.GasMeter().Limit()+1, "out of gas test") }).Return(nil, fmt.Errorf("SudoError error")) - cmKeeper.EXPECT().AddContractFailure(ctx, "channel-0", contractAddress.String(), p.GetSequence(), "ack") + cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "ack") // FIXME: fix distribution during outofgas // cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(false) err = txModule.HandleAcknowledgement(ctx, p, errAckData, relayerAddress) @@ -193,7 +193,7 @@ func TestHandleAcknowledgement(t *testing.T) { store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) cachedCtx.GasMeter().ConsumeGas(cachedCtx.GasMeter().Limit()+1, "out of gas test") }).Return(nil, fmt.Errorf("SudoError error")) - cmKeeper.EXPECT().AddContractFailure(ctx, "channel-0", contractAddress.String(), p.GetSequence(), "ack") + cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "ack") // FIXME: fix distribution during outofgas // cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) // feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) @@ -248,7 +248,7 @@ func TestHandleAcknowledgement(t *testing.T) { cachedCtx.GasMeter().ConsumeGas(1, "Sudo response consumption") }).Return(nil, nil) // feeKeeper.EXPECT().DistributeAcknowledgementFee(lowGasCtx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) - cmKeeper.EXPECT().AddContractFailure(lowGasCtx, "channel-0", contractAddress.String(), p.GetSequence(), "ack").Do(func(ctx sdk.Context, channelId, address string, ackID uint64, ackType string) { + cmKeeper.EXPECT().AddContractFailure(lowGasCtx, p, contractAddress.String(), "ack").Do(func(ctx sdk.Context, channelId, address string, ackID uint64, ackType string) { ctx.GasMeter().ConsumeGas(keeper.GasReserve, "out of gas") }) require.Panics(t, func() { txModule.HandleAcknowledgement(lowGasCtx, p, resAckData, relayerAddress) }) //nolint:errcheck // this is a test @@ -342,7 +342,7 @@ func TestHandleTimeout(t *testing.T) { store := cachedCtx.KVStore(storeKey) store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) }).Return(nil, fmt.Errorf("SudoTimeout error")) - cmKeeper.EXPECT().AddContractFailure(ctx, "channel-0", contractAddress.String(), p.GetSequence(), "timeout") + cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "timeout") cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(false) err = txModule.HandleTimeout(ctx, p, relayerAddress) require.NoError(t, err) @@ -354,7 +354,7 @@ func TestHandleTimeout(t *testing.T) { store := cachedCtx.KVStore(storeKey) store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) }).Return(nil, fmt.Errorf("SudoTimeout error")) - cmKeeper.EXPECT().AddContractFailure(ctx, "channel-0", contractAddress.String(), p.GetSequence(), "timeout") + cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "timeout") cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) feeKeeper.EXPECT().DistributeTimeoutFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = txModule.HandleTimeout(ctx, p, relayerAddress) @@ -368,7 +368,7 @@ func TestHandleTimeout(t *testing.T) { store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) cachedCtx.GasMeter().ConsumeGas(cachedCtx.GasMeter().Limit()+1, "out of gas test") }).Return(nil, fmt.Errorf("SudoTimeout error")) - cmKeeper.EXPECT().AddContractFailure(ctx, "channel-0", contractAddress.String(), p.GetSequence(), "timeout") + cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "timeout") // cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(false) err = txModule.HandleTimeout(ctx, p, relayerAddress) require.NoError(t, err) @@ -381,7 +381,7 @@ func TestHandleTimeout(t *testing.T) { store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) cachedCtx.GasMeter().ConsumeGas(cachedCtx.GasMeter().Limit()+1, "out of gas test") }).Return(nil, fmt.Errorf("SudoTimeout error")) - cmKeeper.EXPECT().AddContractFailure(ctx, "channel-0", contractAddress.String(), p.GetSequence(), "timeout") + cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "timeout") // FIXME: make DistributeTimeoutFee during out of gas // cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) // feeKeeper.EXPECT().DistributeTimeoutFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) diff --git a/x/transfer/types/expected_keepers.go b/x/transfer/types/expected_keepers.go index 3dd233a34..57a5c1cb7 100644 --- a/x/transfer/types/expected_keepers.go +++ b/x/transfer/types/expected_keepers.go @@ -11,7 +11,7 @@ import ( // ContractManagerKeeper defines the expected interface needed to add ack information about sudo failure. type ContractManagerKeeper interface { HasContractInfo(ctx sdk.Context, contractAddress sdk.AccAddress) bool - AddContractFailure(ctx sdk.Context, channelID, address string, ackID uint64, ackType string) + AddContractFailure(ctx sdk.Context, packet channeltypes.Packet, address string, ackType string, ackResult []byte, errorText string) SudoResponse(ctx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, msg []byte) ([]byte, error) SudoError(ctx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, details string) ([]byte, error) SudoTimeout(ctx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet) ([]byte, error) From 31bdf514db20be23bea95eca1af6f13f747e8483 Mon Sep 17 00:00:00 2001 From: nhpd Date: Wed, 9 Aug 2023 18:04:58 +0400 Subject: [PATCH 022/307] fix: ibc handlers tests --- x/interchaintxs/keeper/ibc_handlers_test.go | 12 +++++------ x/transfer/ibc_handlers_test.go | 22 ++++++++++----------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/x/interchaintxs/keeper/ibc_handlers_test.go b/x/interchaintxs/keeper/ibc_handlers_test.go index 4ec0e8c3d..8189e86aa 100644 --- a/x/interchaintxs/keeper/ibc_handlers_test.go +++ b/x/interchaintxs/keeper/ibc_handlers_test.go @@ -71,7 +71,7 @@ func TestHandleAcknowledgement(t *testing.T) { store := cachedCtx.KVStore(storeKey) store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) // consumes 2990 }).Return(nil, fmt.Errorf("SudoResponse error")) - cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "ack") + cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "ack", resACK.GetResult(), resACK.GetError()) feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = icak.HandleAcknowledgement(ctx, p, resAckData, relayerAddress) require.NoError(t, err) @@ -84,7 +84,7 @@ func TestHandleAcknowledgement(t *testing.T) { store := cachedCtx.KVStore(storeKey) store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) }).Return(nil, fmt.Errorf("SudoError error")) - cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "ack") + cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "ack", errACK.GetResult(), errACK.GetError()) feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = icak.HandleAcknowledgement(ctx, p, errAckData, relayerAddress) require.NoError(t, err) @@ -109,7 +109,7 @@ func TestHandleAcknowledgement(t *testing.T) { store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) cachedCtx.GasMeter().ConsumeGas(cachedCtx.GasMeter().Limit()+1, "out of gas test") }).Return(nil, fmt.Errorf("SudoError error")) - cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "ack") + cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "ack", errACK.GetResult(), errACK.GetError()) feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = icak.HandleAcknowledgement(ctx, p, errAckData, relayerAddress) require.NoError(t, err) @@ -144,7 +144,7 @@ func TestHandleAcknowledgement(t *testing.T) { cachedCtx.GasMeter().ConsumeGas(1, "Sudo response consumption") }).Return(nil, nil) feeKeeper.EXPECT().DistributeAcknowledgementFee(lowGasCtx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) - cmKeeper.EXPECT().AddContractFailure(lowGasCtx, p, contractAddress.String(), "ack").Do(func(ctx sdk.Context, channelId, address string, ackID uint64, ackType string) { + cmKeeper.EXPECT().AddContractFailure(lowGasCtx, p, contractAddress.String(), "ack", resACK.GetResult(), resACK.GetError()).Do(func(ctx sdk.Context, packet channeltypes.Packet, address string, ackType string, ackResult []byte, errorText string) { ctx.GasMeter().ConsumeGas(keeper.GasReserve, "out of gas") }) require.Panics(t, func() { icak.HandleAcknowledgement(lowGasCtx, p, resAckData, relayerAddress) }) //nolint:errcheck // this is a panic test @@ -194,7 +194,7 @@ func TestHandleTimeout(t *testing.T) { store := cachedCtx.KVStore(storeKey) store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) }).Return(nil, fmt.Errorf("SudoTimeout error")) - cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "timeout") + cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "timeout", []byte{}, "") feeKeeper.EXPECT().DistributeTimeoutFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = icak.HandleTimeout(ctx, p, relayerAddress) require.NoError(t, err) @@ -207,7 +207,7 @@ func TestHandleTimeout(t *testing.T) { store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) cachedCtx.GasMeter().ConsumeGas(cachedCtx.GasMeter().Limit()+1, "out of gas test") }).Return(nil, fmt.Errorf("SudoTimeout error")) - cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "timeout") + cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "timeout", []byte{}, "") feeKeeper.EXPECT().DistributeTimeoutFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = icak.HandleTimeout(ctx, p, relayerAddress) require.NoError(t, err) diff --git a/x/transfer/ibc_handlers_test.go b/x/transfer/ibc_handlers_test.go index b411029e3..d3caa3475 100644 --- a/x/transfer/ibc_handlers_test.go +++ b/x/transfer/ibc_handlers_test.go @@ -100,7 +100,7 @@ func TestHandleAcknowledgement(t *testing.T) { store := cachedCtx.KVStore(storeKey) store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) // consumes 2990 }).Return(nil, fmt.Errorf("SudoResponse error")) - cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "ack") + cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "ack", resACK.GetResult(), resACK.GetError()) cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(false) err = txModule.HandleAcknowledgement(ctx, p, resAckData, relayerAddress) require.NoError(t, err) @@ -113,7 +113,7 @@ func TestHandleAcknowledgement(t *testing.T) { store := cachedCtx.KVStore(storeKey) store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) // consumes 2990 }).Return(nil, fmt.Errorf("SudoResponse error")) - cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "ack") + cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "ack", resACK.GetResult(), resACK.GetError()) cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = txModule.HandleAcknowledgement(ctx, p, resAckData, relayerAddress) @@ -127,7 +127,7 @@ func TestHandleAcknowledgement(t *testing.T) { store := cachedCtx.KVStore(storeKey) store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) // consumes 2990 }).Return(nil, fmt.Errorf("SudoError error")) - cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "ack") + cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "ack", errACK.GetResult(), errACK.GetError()) cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(false) // feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = txModule.HandleAcknowledgement(ctx, p, errAckData, relayerAddress) @@ -141,7 +141,7 @@ func TestHandleAcknowledgement(t *testing.T) { store := cachedCtx.KVStore(storeKey) store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) // consumes 2990 }).Return(nil, fmt.Errorf("SudoError error")) - cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "ack") + cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "ack", errACK.GetResult(), errACK.GetError()) cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = txModule.HandleAcknowledgement(ctx, p, errAckData, relayerAddress) @@ -179,7 +179,7 @@ func TestHandleAcknowledgement(t *testing.T) { store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) cachedCtx.GasMeter().ConsumeGas(cachedCtx.GasMeter().Limit()+1, "out of gas test") }).Return(nil, fmt.Errorf("SudoError error")) - cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "ack") + cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "ack", errACK.GetResult(), errACK.GetError()) // FIXME: fix distribution during outofgas // cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(false) err = txModule.HandleAcknowledgement(ctx, p, errAckData, relayerAddress) @@ -193,7 +193,7 @@ func TestHandleAcknowledgement(t *testing.T) { store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) cachedCtx.GasMeter().ConsumeGas(cachedCtx.GasMeter().Limit()+1, "out of gas test") }).Return(nil, fmt.Errorf("SudoError error")) - cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "ack") + cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "ack", errACK.GetResult(), errACK.GetError()) // FIXME: fix distribution during outofgas // cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) // feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) @@ -248,7 +248,7 @@ func TestHandleAcknowledgement(t *testing.T) { cachedCtx.GasMeter().ConsumeGas(1, "Sudo response consumption") }).Return(nil, nil) // feeKeeper.EXPECT().DistributeAcknowledgementFee(lowGasCtx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) - cmKeeper.EXPECT().AddContractFailure(lowGasCtx, p, contractAddress.String(), "ack").Do(func(ctx sdk.Context, channelId, address string, ackID uint64, ackType string) { + cmKeeper.EXPECT().AddContractFailure(lowGasCtx, p, contractAddress.String(), "ack", resACK.GetResult(), resACK.GetError()).Do(func(ctx sdk.Context, packet channeltypes.Packet, address string, ackType string, ackResult []byte, errorText string) { ctx.GasMeter().ConsumeGas(keeper.GasReserve, "out of gas") }) require.Panics(t, func() { txModule.HandleAcknowledgement(lowGasCtx, p, resAckData, relayerAddress) }) //nolint:errcheck // this is a test @@ -342,7 +342,7 @@ func TestHandleTimeout(t *testing.T) { store := cachedCtx.KVStore(storeKey) store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) }).Return(nil, fmt.Errorf("SudoTimeout error")) - cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "timeout") + cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "timeout", []byte{}, "") cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(false) err = txModule.HandleTimeout(ctx, p, relayerAddress) require.NoError(t, err) @@ -354,7 +354,7 @@ func TestHandleTimeout(t *testing.T) { store := cachedCtx.KVStore(storeKey) store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) }).Return(nil, fmt.Errorf("SudoTimeout error")) - cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "timeout") + cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "timeout", []byte{}, "") cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) feeKeeper.EXPECT().DistributeTimeoutFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = txModule.HandleTimeout(ctx, p, relayerAddress) @@ -368,7 +368,7 @@ func TestHandleTimeout(t *testing.T) { store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) cachedCtx.GasMeter().ConsumeGas(cachedCtx.GasMeter().Limit()+1, "out of gas test") }).Return(nil, fmt.Errorf("SudoTimeout error")) - cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "timeout") + cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "timeout", []byte{}, "") // cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(false) err = txModule.HandleTimeout(ctx, p, relayerAddress) require.NoError(t, err) @@ -381,7 +381,7 @@ func TestHandleTimeout(t *testing.T) { store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) cachedCtx.GasMeter().ConsumeGas(cachedCtx.GasMeter().Limit()+1, "out of gas test") }).Return(nil, fmt.Errorf("SudoTimeout error")) - cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "timeout") + cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "timeout", []byte{}, "") // FIXME: make DistributeTimeoutFee during out of gas // cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) // feeKeeper.EXPECT().DistributeTimeoutFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) From 4079011a95520ca45338baa3f0773f9d9ec1264c Mon Sep 17 00:00:00 2001 From: nhpd Date: Wed, 9 Aug 2023 18:58:27 +0400 Subject: [PATCH 023/307] fix tests --- x/contractmanager/client/cli/query_failure_test.go | 2 ++ x/contractmanager/genesis_test.go | 7 +++++++ x/contractmanager/keeper/failure_test.go | 11 ++++++++--- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/x/contractmanager/client/cli/query_failure_test.go b/x/contractmanager/client/cli/query_failure_test.go index a70cfd2a4..0541a1834 100644 --- a/x/contractmanager/client/cli/query_failure_test.go +++ b/x/contractmanager/client/cli/query_failure_test.go @@ -3,6 +3,7 @@ package cli_test import ( "crypto/rand" "fmt" + channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" "strconv" "testing" @@ -39,6 +40,7 @@ func networkWithFailureObjects(t *testing.T, n int) (*network.Network, []types.F acc := sdktypes.AccAddress(pub.Address()) failure := types.Failure{ Address: acc.String(), + Packet: &channeltypes.Packet{}, } nullify.Fill(&failure) state.FailuresList = append(state.FailuresList, failure) diff --git a/x/contractmanager/genesis_test.go b/x/contractmanager/genesis_test.go index acf2c55ac..4793c4910 100644 --- a/x/contractmanager/genesis_test.go +++ b/x/contractmanager/genesis_test.go @@ -1,6 +1,7 @@ package contractmanager_test import ( + channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" "testing" "github.com/stretchr/testify/require" @@ -19,10 +20,16 @@ func TestGenesis(t *testing.T) { { Address: "address1", Id: 1, + Packet: &channeltypes.Packet{ + Sequence: 1, + }, }, { Address: "address1", Id: 2, + Packet: &channeltypes.Packet{ + Sequence: 2, + }, }, }, // this line is used by starport scaffolding # genesis/test/state diff --git a/x/contractmanager/keeper/failure_test.go b/x/contractmanager/keeper/failure_test.go index 7c1a30229..988ede0a1 100644 --- a/x/contractmanager/keeper/failure_test.go +++ b/x/contractmanager/keeper/failure_test.go @@ -5,6 +5,7 @@ import ( icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" "github.com/neutron-org/neutron/testutil" + "github.com/neutron-org/neutron/testutil/contractmanager/nullify" "strconv" "testing" @@ -13,7 +14,6 @@ import ( "github.com/stretchr/testify/require" keepertest "github.com/neutron-org/neutron/testutil/contractmanager/keeper" - "github.com/neutron-org/neutron/testutil/contractmanager/nullify" "github.com/neutron-org/neutron/x/contractmanager/keeper" "github.com/neutron-org/neutron/x/contractmanager/types" ) @@ -39,9 +39,12 @@ func createNFailure(keeper *keeper.Keeper, ctx sdk.Context, addresses, failures } items[i][c].Address = acc.String() items[i][c].Id = uint64(c) + items[i][c].Packet = &p + items[i][c].AckResult = []byte{} + items[i][c].ErrorText = "" // TODO - keeper.AddContractFailure(ctx, p, items[i][c].Address, "") + keeper.AddContractFailure(ctx, p, items[i][c].Address, "", []byte{}, "") } } return items @@ -63,13 +66,15 @@ func flattenFailures(items [][]types.Failure) []types.Failure { func TestGetAllFailures(t *testing.T) { keeper, ctx := keepertest.ContractManagerKeeper(t, nil) - items := createNFailure(keeper, ctx, 10, 4) + items := createNFailure(keeper, ctx, 1, 1) flattenItems := flattenFailures(items) allFailures := keeper.GetAllFailures(ctx) require.ElementsMatch(t, nullify.Fill(flattenItems), + //flattenItems, + //allFailures, nullify.Fill(allFailures), ) } From 11c58fbea613ea64c96bcc4bc1fdb3130b52da41 Mon Sep 17 00:00:00 2001 From: nhpd Date: Wed, 9 Aug 2023 21:35:49 +0400 Subject: [PATCH 024/307] gofumpt --- cmd/neutrond/root.go | 7 ++++--- cmd/neutrond/util.go | 12 +++++++----- wasmbinding/message_plugin.go | 2 +- x/contractmanager/client/cli/query_failure_test.go | 3 ++- x/contractmanager/genesis_test.go | 3 ++- x/contractmanager/keeper/failure.go | 2 +- x/contractmanager/keeper/failure_test.go | 9 +++++---- x/interchainqueries/keeper/process_block_results.go | 2 +- x/interchaintxs/keeper/ibc_handlers_test.go | 2 +- x/interchaintxs/types/expected_keepers.go | 2 +- x/transfer/ibc_handlers_test.go | 2 +- x/transfer/types/expected_keepers.go | 2 +- 12 files changed, 27 insertions(+), 21 deletions(-) diff --git a/cmd/neutrond/root.go b/cmd/neutrond/root.go index 3c392db20..e2e25c975 100644 --- a/cmd/neutrond/root.go +++ b/cmd/neutrond/root.go @@ -3,6 +3,10 @@ package main import ( "errors" "fmt" + "io" + "os" + "path/filepath" + "github.com/CosmWasm/wasmd/x/wasm" wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" dbm "github.com/cometbft/cometbft-db" @@ -37,9 +41,6 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/spf13/cast" "github.com/spf13/cobra" - "io" - "os" - "path/filepath" ) // NewRootCmd creates a new root command for neutrond. It is called once in the diff --git a/cmd/neutrond/util.go b/cmd/neutrond/util.go index a214bb7d1..a699abe57 100644 --- a/cmd/neutrond/util.go +++ b/cmd/neutrond/util.go @@ -1,8 +1,14 @@ package main import ( - "cosmossdk.io/log" "fmt" + "os" + "path" + "path/filepath" + "strings" + + "cosmossdk.io/log" + tmcfg "github.com/cometbft/cometbft/config" tmcli "github.com/cometbft/cometbft/libs/cli" tmlog "github.com/cometbft/cometbft/libs/log" @@ -14,10 +20,6 @@ import ( "github.com/spf13/cobra" "github.com/spf13/pflag" "github.com/spf13/viper" - "os" - "path" - "path/filepath" - "strings" ) // NOTE: The functions below are copy-pasted from cosmos-sdk@v0.47.3 (see https://github.com/cosmos/cosmos-sdk/blob/v0.47.3/server/util.go#L122) diff --git a/wasmbinding/message_plugin.go b/wasmbinding/message_plugin.go index f57ea9957..ed40a56c2 100644 --- a/wasmbinding/message_plugin.go +++ b/wasmbinding/message_plugin.go @@ -3,6 +3,7 @@ package wasmbinding import ( "encoding/json" "fmt" + contractmanagerkeeper "github.com/neutron-org/neutron/x/contractmanager/keeper" "cosmossdk.io/errors" @@ -869,7 +870,6 @@ func (m *CustomMessenger) removeSchedule(ctx sdk.Context, contractAddr sdk.AccAd func (m *CustomMessenger) resubmitFailure(ctx sdk.Context, contractAddr sdk.AccAddress, resubmitFailure *bindings.ResubmitFailure) ([]sdk.Event, [][]byte, error) { failure, err := m.ContractmanagerKeeper.GetFailure(ctx, contractAddr, resubmitFailure.FailureId) - if err != nil { return nil, nil, errors.Wrap(sdkerrors.ErrNotFound, "no failure found to resubmit") } diff --git a/x/contractmanager/client/cli/query_failure_test.go b/x/contractmanager/client/cli/query_failure_test.go index 0541a1834..f76d69a44 100644 --- a/x/contractmanager/client/cli/query_failure_test.go +++ b/x/contractmanager/client/cli/query_failure_test.go @@ -3,10 +3,11 @@ package cli_test import ( "crypto/rand" "fmt" - channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" "strconv" "testing" + channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" + "github.com/neutron-org/neutron/app" tmcli "github.com/cometbft/cometbft/libs/cli" diff --git a/x/contractmanager/genesis_test.go b/x/contractmanager/genesis_test.go index 4793c4910..ffbb0477e 100644 --- a/x/contractmanager/genesis_test.go +++ b/x/contractmanager/genesis_test.go @@ -1,9 +1,10 @@ package contractmanager_test import ( - channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" "testing" + channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" + "github.com/stretchr/testify/require" keepertest "github.com/neutron-org/neutron/testutil/contractmanager/keeper" diff --git a/x/contractmanager/keeper/failure.go b/x/contractmanager/keeper/failure.go index 8d7f72b09..52e858731 100644 --- a/x/contractmanager/keeper/failure.go +++ b/x/contractmanager/keeper/failure.go @@ -11,7 +11,7 @@ import ( ) // AddContractFailure adds a specific failure to the store using address as the key -func (k Keeper) AddContractFailure(ctx sdk.Context, packet ibcchanneltypes.Packet, address string, ackType string, ackResult []byte, errorText string) { +func (k Keeper) AddContractFailure(ctx sdk.Context, packet ibcchanneltypes.Packet, address, ackType string, ackResult []byte, errorText string) { failure := types.Failure{ ChannelId: packet.SourceChannel, Address: address, diff --git a/x/contractmanager/keeper/failure_test.go b/x/contractmanager/keeper/failure_test.go index 988ede0a1..ebaad7e85 100644 --- a/x/contractmanager/keeper/failure_test.go +++ b/x/contractmanager/keeper/failure_test.go @@ -2,12 +2,13 @@ package keeper_test import ( "crypto/rand" + "strconv" + "testing" + icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" "github.com/neutron-org/neutron/testutil" "github.com/neutron-org/neutron/testutil/contractmanager/nullify" - "strconv" - "testing" "github.com/cosmos/cosmos-sdk/crypto/keys/ed25519" sdk "github.com/cosmos/cosmos-sdk/types" @@ -73,8 +74,8 @@ func TestGetAllFailures(t *testing.T) { require.ElementsMatch(t, nullify.Fill(flattenItems), - //flattenItems, - //allFailures, + // flattenItems, + // allFailures, nullify.Fill(allFailures), ) } diff --git a/x/interchainqueries/keeper/process_block_results.go b/x/interchainqueries/keeper/process_block_results.go index f00e55b7e..0692cb829 100644 --- a/x/interchainqueries/keeper/process_block_results.go +++ b/x/interchainqueries/keeper/process_block_results.go @@ -61,7 +61,7 @@ type Verifier struct{} // VerifyHeaders verify that headers are valid tendermint headers, checks them on validity by trying call ibcClient.UpdateClient(header) // to update light client's consensus state and checks that they are sequential (tl;dr header.Height + 1 == nextHeader.Height) -func (v Verifier) VerifyHeaders(ctx sdk.Context, clientKeeper clientkeeper.Keeper, clientID string, header exported.ClientMessage, nextHeader exported.ClientMessage) error { +func (v Verifier) VerifyHeaders(ctx sdk.Context, clientKeeper clientkeeper.Keeper, clientID string, header, nextHeader exported.ClientMessage) error { // this IBC handler updates the consensus state and the state root from a provided header. // But more importantly in the current situation, it checks that header is valid. // Honestly we need only to verify headers, but since the check functions are private, and we don't want to duplicate the code, diff --git a/x/interchaintxs/keeper/ibc_handlers_test.go b/x/interchaintxs/keeper/ibc_handlers_test.go index 8189e86aa..3cad6fc54 100644 --- a/x/interchaintxs/keeper/ibc_handlers_test.go +++ b/x/interchaintxs/keeper/ibc_handlers_test.go @@ -144,7 +144,7 @@ func TestHandleAcknowledgement(t *testing.T) { cachedCtx.GasMeter().ConsumeGas(1, "Sudo response consumption") }).Return(nil, nil) feeKeeper.EXPECT().DistributeAcknowledgementFee(lowGasCtx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) - cmKeeper.EXPECT().AddContractFailure(lowGasCtx, p, contractAddress.String(), "ack", resACK.GetResult(), resACK.GetError()).Do(func(ctx sdk.Context, packet channeltypes.Packet, address string, ackType string, ackResult []byte, errorText string) { + cmKeeper.EXPECT().AddContractFailure(lowGasCtx, p, contractAddress.String(), "ack", resACK.GetResult(), resACK.GetError()).Do(func(ctx sdk.Context, packet channeltypes.Packet, address, ackType string, ackResult []byte, errorText string) { ctx.GasMeter().ConsumeGas(keeper.GasReserve, "out of gas") }) require.Panics(t, func() { icak.HandleAcknowledgement(lowGasCtx, p, resAckData, relayerAddress) }) //nolint:errcheck // this is a panic test diff --git a/x/interchaintxs/types/expected_keepers.go b/x/interchaintxs/types/expected_keepers.go index d6d07d224..480914445 100644 --- a/x/interchaintxs/types/expected_keepers.go +++ b/x/interchaintxs/types/expected_keepers.go @@ -26,7 +26,7 @@ type BankKeeper interface { type ContractManagerKeeper interface { HasContractInfo(ctx sdk.Context, contractAddress sdk.AccAddress) bool - AddContractFailure(ctx sdk.Context, packet channeltypes.Packet, address string, ackType string, ackResult []byte, errorText string) + AddContractFailure(ctx sdk.Context, packet channeltypes.Packet, address, ackType string, ackResult []byte, errorText string) SudoResponse(ctx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, msg []byte) ([]byte, error) SudoError(ctx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, details string) ([]byte, error) SudoTimeout(ctx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet) ([]byte, error) diff --git a/x/transfer/ibc_handlers_test.go b/x/transfer/ibc_handlers_test.go index d3caa3475..c7ce57859 100644 --- a/x/transfer/ibc_handlers_test.go +++ b/x/transfer/ibc_handlers_test.go @@ -248,7 +248,7 @@ func TestHandleAcknowledgement(t *testing.T) { cachedCtx.GasMeter().ConsumeGas(1, "Sudo response consumption") }).Return(nil, nil) // feeKeeper.EXPECT().DistributeAcknowledgementFee(lowGasCtx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) - cmKeeper.EXPECT().AddContractFailure(lowGasCtx, p, contractAddress.String(), "ack", resACK.GetResult(), resACK.GetError()).Do(func(ctx sdk.Context, packet channeltypes.Packet, address string, ackType string, ackResult []byte, errorText string) { + cmKeeper.EXPECT().AddContractFailure(lowGasCtx, p, contractAddress.String(), "ack", resACK.GetResult(), resACK.GetError()).Do(func(ctx sdk.Context, packet channeltypes.Packet, address, ackType string, ackResult []byte, errorText string) { ctx.GasMeter().ConsumeGas(keeper.GasReserve, "out of gas") }) require.Panics(t, func() { txModule.HandleAcknowledgement(lowGasCtx, p, resAckData, relayerAddress) }) //nolint:errcheck // this is a test diff --git a/x/transfer/types/expected_keepers.go b/x/transfer/types/expected_keepers.go index 57a5c1cb7..89e980f41 100644 --- a/x/transfer/types/expected_keepers.go +++ b/x/transfer/types/expected_keepers.go @@ -11,7 +11,7 @@ import ( // ContractManagerKeeper defines the expected interface needed to add ack information about sudo failure. type ContractManagerKeeper interface { HasContractInfo(ctx sdk.Context, contractAddress sdk.AccAddress) bool - AddContractFailure(ctx sdk.Context, packet channeltypes.Packet, address string, ackType string, ackResult []byte, errorText string) + AddContractFailure(ctx sdk.Context, packet channeltypes.Packet, address, ackType string, ackResult []byte, errorText string) SudoResponse(ctx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, msg []byte) ([]byte, error) SudoError(ctx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, details string) ([]byte, error) SudoTimeout(ctx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet) ([]byte, error) From 91bbe8225b0a8f89eac8efba021844608eedd516 Mon Sep 17 00:00:00 2001 From: nhpd Date: Thu, 10 Aug 2023 16:29:42 +0400 Subject: [PATCH 025/307] fix: use acknowledgement type instead of two fields --- proto/neutron/contractmanager/genesis.proto | 17 +- .../interchaintxs/types/expected_keepers.go | 8 +- .../mocks/transfer/types/expected_keepers.go | 8 +- x/contractmanager/genesis.go | 2 +- x/contractmanager/keeper/failure.go | 69 +++--- x/contractmanager/keeper/failure_test.go | 11 +- x/contractmanager/types/errors.go | 1 + x/contractmanager/types/genesis.pb.go | 200 +++++++----------- x/interchaintxs/keeper/ibc_handlers.go | 22 +- x/interchaintxs/keeper/ibc_handlers_test.go | 12 +- x/interchaintxs/types/expected_keepers.go | 2 +- x/transfer/ibc_handlers.go | 13 +- x/transfer/ibc_handlers_test.go | 22 +- x/transfer/types/expected_keepers.go | 2 +- 14 files changed, 171 insertions(+), 218 deletions(-) diff --git a/proto/neutron/contractmanager/genesis.proto b/proto/neutron/contractmanager/genesis.proto index 39edf5918..53dd813f4 100644 --- a/proto/neutron/contractmanager/genesis.proto +++ b/proto/neutron/contractmanager/genesis.proto @@ -10,23 +10,22 @@ option go_package = "github.com/neutron-org/neutron/x/contractmanager/types"; // 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 message Failure { // ChannelId string channel_id = 1; // Address of the failed contract string address = 2; - // id of the failure under specific address + // Id of the failure under specific address uint64 id = 3; - // ACK id to restore - uint64 ack_id = 4; + // Packet sequence id to restore + uint64 sequence_id = 4; // TODO: is renaming ok? // Acknowledgement type string ack_type = 5; - // Acknowledgement result - bytes ack_result = 6; - // Error text (empty if no error) - string error_text = 7; - // IBC Packet of failure - ibc.core.channel.v1.Packet packet = 8; + // IBC Packet + ibc.core.channel.v1.Packet packet = 6; + // Acknowledgement + ibc.core.channel.v1.Acknowledgement ack = 7; } // GenesisState defines the contractmanager module's genesis state. diff --git a/testutil/mocks/interchaintxs/types/expected_keepers.go b/testutil/mocks/interchaintxs/types/expected_keepers.go index b90511672..389c62b35 100644 --- a/testutil/mocks/interchaintxs/types/expected_keepers.go +++ b/testutil/mocks/interchaintxs/types/expected_keepers.go @@ -116,15 +116,15 @@ func (m *MockContractManagerKeeper) EXPECT() *MockContractManagerKeeperMockRecor } // AddContractFailure mocks base method. -func (m *MockContractManagerKeeper) AddContractFailure(ctx types.Context, packet types3.Packet, address, ackType string, ackResult []byte, errorText string) { +func (m *MockContractManagerKeeper) AddContractFailure(ctx types.Context, packet types3.Packet, address, ackType string, ack *types3.Acknowledgement) { m.ctrl.T.Helper() - m.ctrl.Call(m, "AddContractFailure", ctx, packet, address, ackType, ackResult, errorText) + m.ctrl.Call(m, "AddContractFailure", ctx, packet, address, ackType, ack) } // AddContractFailure indicates an expected call of AddContractFailure. -func (mr *MockContractManagerKeeperMockRecorder) AddContractFailure(ctx, packet, address, ackType, ackResult, errorText interface{}) *gomock.Call { +func (mr *MockContractManagerKeeperMockRecorder) AddContractFailure(ctx, packet, address, ackType, ack interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddContractFailure", reflect.TypeOf((*MockContractManagerKeeper)(nil).AddContractFailure), ctx, packet, address, ackType, ackResult, errorText) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddContractFailure", reflect.TypeOf((*MockContractManagerKeeper)(nil).AddContractFailure), ctx, packet, address, ackType, ack) } // HasContractInfo mocks base method. diff --git a/testutil/mocks/transfer/types/expected_keepers.go b/testutil/mocks/transfer/types/expected_keepers.go index b6315235e..b353586a0 100644 --- a/testutil/mocks/transfer/types/expected_keepers.go +++ b/testutil/mocks/transfer/types/expected_keepers.go @@ -38,15 +38,15 @@ func (m *MockContractManagerKeeper) EXPECT() *MockContractManagerKeeperMockRecor } // AddContractFailure mocks base method. -func (m *MockContractManagerKeeper) AddContractFailure(ctx types.Context, packet types1.Packet, address, ackType string, ackResult []byte, errorText string) { +func (m *MockContractManagerKeeper) AddContractFailure(ctx types.Context, packet types1.Packet, address, ackType string, ack *types1.Acknowledgement) { m.ctrl.T.Helper() - m.ctrl.Call(m, "AddContractFailure", ctx, packet, address, ackType, ackResult, errorText) + m.ctrl.Call(m, "AddContractFailure", ctx, packet, address, ackType, ack) } // AddContractFailure indicates an expected call of AddContractFailure. -func (mr *MockContractManagerKeeperMockRecorder) AddContractFailure(ctx, packet, address, ackType, ackResult, errorText interface{}) *gomock.Call { +func (mr *MockContractManagerKeeperMockRecorder) AddContractFailure(ctx, packet, address, ackType, ack interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddContractFailure", reflect.TypeOf((*MockContractManagerKeeper)(nil).AddContractFailure), ctx, packet, address, ackType, ackResult, errorText) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddContractFailure", reflect.TypeOf((*MockContractManagerKeeper)(nil).AddContractFailure), ctx, packet, address, ackType, ack) } // HasContractInfo mocks base method. diff --git a/x/contractmanager/genesis.go b/x/contractmanager/genesis.go index f3f2c3aee..f0ed5a80b 100644 --- a/x/contractmanager/genesis.go +++ b/x/contractmanager/genesis.go @@ -11,7 +11,7 @@ import ( func InitGenesis(ctx sdk.Context, k keeper.Keeper, genState types.GenesisState) { // Set all the failure for _, elem := range genState.FailuresList { - k.AddContractFailure(ctx, *elem.Packet, elem.Address, elem.AckType, elem.AckResult, elem.ErrorText) + k.AddContractFailure(ctx, *elem.Packet, elem.Address, elem.AckType, elem.Ack) } // this line is used by starport scaffolding # genesis/module/init err := k.SetParams(ctx, genState.Params) diff --git a/x/contractmanager/keeper/failure.go b/x/contractmanager/keeper/failure.go index 52e858731..c3fb68671 100644 --- a/x/contractmanager/keeper/failure.go +++ b/x/contractmanager/keeper/failure.go @@ -11,23 +11,22 @@ import ( ) // AddContractFailure adds a specific failure to the store using address as the key -func (k Keeper) AddContractFailure(ctx sdk.Context, packet ibcchanneltypes.Packet, address, ackType string, ackResult []byte, errorText string) { +func (k Keeper) AddContractFailure(ctx sdk.Context, packet ibcchanneltypes.Packet, address, ackType string, ack *ibcchanneltypes.Acknowledgement) { failure := types.Failure{ - ChannelId: packet.SourceChannel, - Address: address, - AckId: packet.Sequence, - AckType: ackType, - AckResult: ackResult, - ErrorText: errorText, - Packet: &packet, + ChannelId: packet.SourceChannel, + Address: address, + SequenceId: packet.Sequence, + AckType: ackType, + Ack: ack, + Packet: &packet, } nextFailureID := k.GetNextFailureIDKey(ctx, failure.GetAddress()) store := ctx.KVStore(k.storeKey) failure.Id = nextFailureID - b := k.cdc.MustMarshal(&failure) - store.Set(types.GetFailureKey(failure.GetAddress(), nextFailureID), b) + bz := k.cdc.MustMarshal(&failure) + store.Set(types.GetFailureKey(failure.GetAddress(), nextFailureID), bz) } func (k Keeper) GetNextFailureIDKey(ctx sdk.Context, address string) uint64 { @@ -60,49 +59,57 @@ func (k Keeper) GetAllFailures(ctx sdk.Context) (list []types.Failure) { return } -func (k Keeper) GetFailure(ctx sdk.Context, contractAddr sdk.AccAddress, failureId uint64) (*types.Failure, error) { +func (k Keeper) GetFailure(ctx sdk.Context, contractAddr sdk.AccAddress, id uint64) (*types.Failure, error) { store := ctx.KVStore(k.storeKey) - failureKey := types.GetFailureKey(contractAddr.String(), failureId) + key := types.GetFailureKey(contractAddr.String(), id) - failureBz := store.Get(failureKey) - if failureBz == nil { - return nil, errors.Wrapf(sdkerrors.ErrKeyNotFound, "no failure found for contractAddress = %s and failureId = %d", contractAddr.String(), failureId) + bz := store.Get(key) + if bz == nil { + return nil, errors.Wrapf(sdkerrors.ErrKeyNotFound, "no failure found for contractAddress = %s and failureId = %d", contractAddr.String(), id) } - var failure types.Failure - k.cdc.MustUnmarshal(failureBz, &failure) + var res types.Failure + k.cdc.MustUnmarshal(bz, &res) - return &failure, nil + return &res, nil } // ResubmitFailure tries to call sudo handler for contract with same parameters as initially. func (k Keeper) ResubmitFailure(ctx sdk.Context, contractAddr sdk.AccAddress, failure *types.Failure) error { if failure.Packet == nil { - return errors.Wrapf(types.IncorrectFailureToResubmit, "cannot resubmit failure without packet info failureId = %d", failure.Id) + return errors.Wrapf(types.IncorrectFailureToResubmit, "cannot resubmit failure without packet info; failureId = %d", failure.Id) } - if failure.GetAckType() == "ack" { // response or error - _, err := k.SudoResponse(ctx, contractAddr, *failure.Packet, failure.AckResult) - // TODO: handle resp? - if err != nil { - return err // TODO: wrap + if failure.GetAckType() == "ack" { + if failure.GetAck() == nil { + return errors.Wrapf(types.IncorrectFailureToResubmit, "cannot resubmit failure without acknowledgement; failureId = %d", failure.Id) + } + if failure.GetAck().GetError() == "" { + _, err := k.SudoResponse(ctx, contractAddr, *failure.Packet, failure.Ack.GetResult()) + // TODO: handle resp? + if err != nil { + return errors.Wrapf(types.FailedToResubmitFailure, "cannot resubmit failure ack response; failureId = %d; err = %s", failure.Id, err) + } + } else { + _, err := k.SudoError(ctx, contractAddr, *failure.Packet, failure.Ack.GetError()) + // TODO: handle resp? + if err != nil { + return errors.Wrapf(types.FailedToResubmitFailure, "cannot resubmit failure ack error; failureId = %d; err = %s", failure.Id, err) + } } } else if failure.GetAckType() == "timeout" { - // TODO + // TODO: handle resp? _, err := k.SudoTimeout(ctx, contractAddr, *failure.Packet) if err != nil { - return err // TODO: wrap + return errors.Wrapf(types.FailedToResubmitFailure, "cannot resubmit failure ack timeout; failureId = %d; err = %s", failure.Id, err) } } else { return errors.Wrapf(types.IncorrectAckType, "cannot resubmit failure with incorrect ackType = %s", failure.GetAckType()) } - // TODO: If submitted failure response or timeout successfully, we can cleanup it? - // Or maybe mark it as processed - // Also maybe cleanup packet and ack data to smaller data to store - // Is it bad be able to call resubmitFailure multiple times? + // Cleanup failure since we resubmitted it successfully k.removeFailure(ctx, contractAddr, failure.Id) - // TODO: maybe return result from sudo call? + // TODO: maybe return some result from sudo call? return nil } diff --git a/x/contractmanager/keeper/failure_test.go b/x/contractmanager/keeper/failure_test.go index ebaad7e85..ef208f1e0 100644 --- a/x/contractmanager/keeper/failure_test.go +++ b/x/contractmanager/keeper/failure_test.go @@ -5,9 +5,7 @@ import ( "strconv" "testing" - icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" - "github.com/neutron-org/neutron/testutil" "github.com/neutron-org/neutron/testutil/contractmanager/nullify" "github.com/cosmos/cosmos-sdk/crypto/keys/ed25519" @@ -35,17 +33,14 @@ func createNFailure(keeper *keeper.Keeper, ctx sdk.Context, addresses, failures for c := range items[i] { p := channeltypes.Packet{ Sequence: 0, - SourcePort: icatypes.ControllerPortPrefix + testutil.TestOwnerAddress + ".ica0", // TODO: maybe change + SourcePort: "port-n", SourceChannel: items[i][c].ChannelId, } items[i][c].Address = acc.String() items[i][c].Id = uint64(c) items[i][c].Packet = &p - items[i][c].AckResult = []byte{} - items[i][c].ErrorText = "" - - // TODO - keeper.AddContractFailure(ctx, p, items[i][c].Address, "", []byte{}, "") + items[i][c].Ack = nil + keeper.AddContractFailure(ctx, p, items[i][c].Address, "", nil) } } return items diff --git a/x/contractmanager/types/errors.go b/x/contractmanager/types/errors.go index 86734f227..1d13568a1 100644 --- a/x/contractmanager/types/errors.go +++ b/x/contractmanager/types/errors.go @@ -10,4 +10,5 @@ import ( var ( IncorrectAckType = errors.Register(ModuleName, 1100, "incorrect acknowledgement type") IncorrectFailureToResubmit = errors.Register(ModuleName, 1101, "incorrect failure to resubmit") + FailedToResubmitFailure = errors.Register(ModuleName, 1102, "failed to resubmit acknowledgement") ) diff --git a/x/contractmanager/types/genesis.pb.go b/x/contractmanager/types/genesis.pb.go index 9dfb2f2b8..d1d447382 100644 --- a/x/contractmanager/types/genesis.pb.go +++ b/x/contractmanager/types/genesis.pb.go @@ -26,23 +26,22 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // 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 Failure struct { // ChannelId ChannelId string `protobuf:"bytes,1,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"` // Address of the failed contract Address string `protobuf:"bytes,2,opt,name=address,proto3" json:"address,omitempty"` - // id of the failure under specific address + // Id of the failure under specific address Id uint64 `protobuf:"varint,3,opt,name=id,proto3" json:"id,omitempty"` - // ACK id to restore - AckId uint64 `protobuf:"varint,4,opt,name=ack_id,json=ackId,proto3" json:"ack_id,omitempty"` + // Packet sequence id to restore + SequenceId uint64 `protobuf:"varint,4,opt,name=sequence_id,json=sequenceId,proto3" json:"sequence_id,omitempty"` // Acknowledgement type AckType string `protobuf:"bytes,5,opt,name=ack_type,json=ackType,proto3" json:"ack_type,omitempty"` - // Acknowledgement result - AckResult []byte `protobuf:"bytes,6,opt,name=ack_result,json=ackResult,proto3" json:"ack_result,omitempty"` - // Error text (empty if no error) - ErrorText string `protobuf:"bytes,7,opt,name=error_text,json=errorText,proto3" json:"error_text,omitempty"` - // IBC Packet of failure - Packet *types.Packet `protobuf:"bytes,8,opt,name=packet,proto3" json:"packet,omitempty"` + // IBC Packet + Packet *types.Packet `protobuf:"bytes,6,opt,name=packet,proto3" json:"packet,omitempty"` + // Acknowledgement + Ack *types.Acknowledgement `protobuf:"bytes,7,opt,name=ack,proto3" json:"ack,omitempty"` } func (m *Failure) Reset() { *m = Failure{} } @@ -99,9 +98,9 @@ func (m *Failure) GetId() uint64 { return 0 } -func (m *Failure) GetAckId() uint64 { +func (m *Failure) GetSequenceId() uint64 { if m != nil { - return m.AckId + return m.SequenceId } return 0 } @@ -113,23 +112,16 @@ func (m *Failure) GetAckType() string { return "" } -func (m *Failure) GetAckResult() []byte { +func (m *Failure) GetPacket() *types.Packet { if m != nil { - return m.AckResult + return m.Packet } return nil } -func (m *Failure) GetErrorText() string { - if m != nil { - return m.ErrorText - } - return "" -} - -func (m *Failure) GetPacket() *types.Packet { +func (m *Failure) GetAck() *types.Acknowledgement { if m != nil { - return m.Packet + return m.Ack } return nil } @@ -198,34 +190,34 @@ func init() { } var fileDescriptor_cf4a1534315a7490 = []byte{ - // 422 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x92, 0x31, 0x8f, 0xd3, 0x30, - 0x14, 0xc7, 0xeb, 0x5e, 0xaf, 0xbd, 0xba, 0x85, 0xc1, 0x02, 0x61, 0x8a, 0xc8, 0x85, 0x13, 0x48, - 0x59, 0xb0, 0x75, 0x3d, 0x89, 0x8d, 0xe5, 0x06, 0xd0, 0x09, 0x86, 0x2a, 0xdc, 0xc4, 0x52, 0x39, - 0x8e, 0xc9, 0x59, 0x49, 0xe3, 0xc8, 0x76, 0x4e, 0xbd, 0x6f, 0xc1, 0xcc, 0x27, 0xba, 0xf1, 0x46, - 0x26, 0x84, 0xda, 0x0f, 0xc1, 0x8a, 0xec, 0x38, 0x0b, 0xa8, 0xdb, 0xcb, 0xff, 0xfd, 0xdf, 0x2f, - 0x79, 0xff, 0x17, 0xf8, 0xa6, 0x16, 0xad, 0xd5, 0xaa, 0xa6, 0x5c, 0xd5, 0x56, 0x33, 0x6e, 0x37, - 0xac, 0x66, 0x85, 0xd0, 0xb4, 0x10, 0xb5, 0x30, 0xd2, 0x90, 0x46, 0x2b, 0xab, 0xd0, 0xb3, 0x60, - 0x23, 0xff, 0xd8, 0x16, 0x4f, 0x0a, 0x55, 0x28, 0xef, 0xa1, 0xae, 0xea, 0xec, 0x8b, 0xd7, 0x87, - 0xa8, 0x0d, 0xd3, 0x6c, 0x13, 0xa0, 0x8b, 0x57, 0x32, 0xe3, 0x94, 0x2b, 0x2d, 0x28, 0xbf, 0x61, - 0x75, 0x2d, 0x2a, 0x7a, 0x7b, 0xde, 0x97, 0x9d, 0xe5, 0xec, 0x0f, 0x80, 0x93, 0x0f, 0x4c, 0x56, - 0xad, 0x16, 0xe8, 0x25, 0x84, 0xa1, 0xb9, 0x96, 0x39, 0x06, 0x31, 0x48, 0xa6, 0xe9, 0x34, 0x28, - 0x57, 0x39, 0xc2, 0x70, 0xc2, 0xf2, 0x5c, 0x0b, 0x63, 0xf0, 0xd0, 0xf7, 0xfa, 0x47, 0xf4, 0x18, - 0x0e, 0x65, 0x8e, 0x8f, 0x62, 0x90, 0x8c, 0xd2, 0xa1, 0xcc, 0xd1, 0x53, 0x38, 0x66, 0xbc, 0x74, - 0x90, 0x91, 0xd7, 0x8e, 0x19, 0x2f, 0xaf, 0x72, 0xf4, 0x1c, 0x9e, 0x38, 0xd9, 0xde, 0x35, 0x02, - 0x1f, 0x07, 0x02, 0x2f, 0xaf, 0xef, 0x1a, 0xff, 0x6a, 0xd7, 0xd2, 0xc2, 0xb4, 0x95, 0xc5, 0xe3, - 0x18, 0x24, 0xf3, 0x74, 0xca, 0x78, 0x99, 0x7a, 0xc1, 0xb5, 0x85, 0xd6, 0x4a, 0xaf, 0xad, 0xd8, - 0x5a, 0x3c, 0xe9, 0xbe, 0xcc, 0x2b, 0xd7, 0x62, 0x6b, 0xd1, 0x05, 0x1c, 0x37, 0x8c, 0x97, 0xc2, - 0xe2, 0x93, 0x18, 0x24, 0xb3, 0xe5, 0x0b, 0x22, 0x33, 0x4e, 0xdc, 0xe2, 0xa4, 0xdf, 0xf6, 0xf6, - 0x9c, 0xac, 0xbc, 0x25, 0x0d, 0xd6, 0xb3, 0x1f, 0x00, 0xce, 0x3f, 0x76, 0x37, 0xf8, 0x62, 0x99, - 0x15, 0xe8, 0xbd, 0xa3, 0xb8, 0xf4, 0xfc, 0xea, 0xb3, 0xe5, 0x29, 0x39, 0x70, 0x13, 0xb2, 0xf2, - 0xb6, 0xcb, 0xd1, 0xfd, 0xaf, 0xd3, 0x41, 0x1a, 0x86, 0xd0, 0x27, 0xf8, 0xe8, 0x5b, 0x17, 0xa4, - 0x59, 0x57, 0xd2, 0x58, 0x3c, 0x8c, 0x8f, 0x92, 0xd9, 0x32, 0x3e, 0x48, 0x09, 0xb1, 0x07, 0xcc, - 0xbc, 0x1f, 0xfe, 0x2c, 0x8d, 0xbd, 0x5c, 0xdd, 0xef, 0x22, 0xf0, 0xb0, 0x8b, 0xc0, 0xef, 0x5d, - 0x04, 0xbe, 0xef, 0xa3, 0xc1, 0xc3, 0x3e, 0x1a, 0xfc, 0xdc, 0x47, 0x83, 0xaf, 0xef, 0x0a, 0x69, - 0x6f, 0xda, 0x8c, 0x70, 0xb5, 0xa1, 0x81, 0xfc, 0x56, 0xe9, 0xa2, 0xaf, 0xe9, 0xf6, 0xbf, 0x5f, - 0xc2, 0xe5, 0x6d, 0xb2, 0xb1, 0xbf, 0xf7, 0xc5, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xd6, 0x70, - 0x0c, 0x8d, 0x90, 0x02, 0x00, 0x00, + // 417 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x92, 0x31, 0x6f, 0x13, 0x31, + 0x14, 0xc7, 0xe3, 0x24, 0x24, 0xd4, 0x29, 0x0c, 0x16, 0x12, 0x47, 0x10, 0x97, 0xa3, 0x2a, 0x52, + 0x16, 0x6c, 0x35, 0x95, 0xba, 0x31, 0xd0, 0x01, 0x54, 0xc1, 0x10, 0x1d, 0x4c, 0x2c, 0x91, 0x63, + 0x3f, 0xae, 0xd6, 0x25, 0xf6, 0x61, 0x3b, 0x85, 0x7e, 0x0b, 0x66, 0x3e, 0x51, 0xc7, 0x8e, 0x4c, + 0x08, 0x25, 0x1f, 0x83, 0x05, 0x9d, 0xcf, 0xb7, 0x40, 0xb3, 0xbd, 0x7b, 0xef, 0xf7, 0xff, 0xdf, + 0xbd, 0xff, 0x3b, 0xfc, 0x42, 0xc3, 0xc6, 0x5b, 0xa3, 0x99, 0x30, 0xda, 0x5b, 0x2e, 0xfc, 0x9a, + 0x6b, 0x5e, 0x80, 0x65, 0x05, 0x68, 0x70, 0xca, 0xd1, 0xca, 0x1a, 0x6f, 0xc8, 0xe3, 0x88, 0xd1, + 0x7f, 0xb0, 0xf1, 0xa3, 0xc2, 0x14, 0x26, 0x30, 0xac, 0xae, 0x1a, 0x7c, 0x7c, 0xbc, 0xcf, 0xb5, + 0xe2, 0x96, 0xaf, 0xa3, 0xe9, 0xf8, 0xb9, 0x5a, 0x0a, 0x26, 0x8c, 0x05, 0x26, 0x2e, 0xb9, 0xd6, + 0xb0, 0x62, 0x57, 0x27, 0x6d, 0xd9, 0x20, 0x47, 0x7f, 0x10, 0x1e, 0xbe, 0xe1, 0x6a, 0xb5, 0xb1, + 0x40, 0x9e, 0x61, 0x1c, 0x87, 0x0b, 0x25, 0x13, 0x94, 0xa1, 0xe9, 0x41, 0x7e, 0x10, 0x3b, 0x17, + 0x92, 0x24, 0x78, 0xc8, 0xa5, 0xb4, 0xe0, 0x5c, 0xd2, 0x0d, 0xb3, 0xf6, 0x91, 0x3c, 0xc4, 0x5d, + 0x25, 0x93, 0x5e, 0x86, 0xa6, 0xfd, 0xbc, 0xab, 0x24, 0x99, 0xe0, 0x91, 0x83, 0x2f, 0x1b, 0xd0, + 0x02, 0x6a, 0xa7, 0x7e, 0x18, 0xe0, 0xb6, 0x75, 0x21, 0xc9, 0x13, 0x7c, 0x9f, 0x8b, 0x72, 0xe1, + 0xaf, 0x2b, 0x48, 0xee, 0x45, 0x2f, 0x51, 0x7e, 0xbc, 0xae, 0x80, 0x9c, 0xe2, 0x41, 0xc5, 0x45, + 0x09, 0x3e, 0x19, 0x64, 0x68, 0x3a, 0x9a, 0x3d, 0xa5, 0x6a, 0x29, 0x68, 0xbd, 0x04, 0x6d, 0xbf, + 0xfc, 0xea, 0x84, 0xce, 0x03, 0x92, 0x47, 0x94, 0x9c, 0xe1, 0x1e, 0x17, 0x65, 0x32, 0x0c, 0x8a, + 0xe3, 0x3b, 0x15, 0xaf, 0x45, 0xa9, 0xcd, 0xd7, 0x15, 0xc8, 0x02, 0xd6, 0xa0, 0x7d, 0x5e, 0x0b, + 0x8e, 0x7e, 0x20, 0x7c, 0xf8, 0xb6, 0xb9, 0xc3, 0x07, 0xcf, 0x3d, 0x90, 0x57, 0xf5, 0xdb, 0xeb, + 0x04, 0xc3, 0xfa, 0xa3, 0xd9, 0x84, 0xee, 0xb9, 0x0b, 0x9d, 0x07, 0xec, 0xbc, 0x7f, 0xf3, 0x6b, + 0xd2, 0xc9, 0xa3, 0x88, 0xbc, 0xc3, 0x0f, 0x3e, 0x37, 0x61, 0xba, 0xc5, 0x4a, 0x39, 0x9f, 0x74, + 0xb3, 0xde, 0x74, 0x34, 0xcb, 0xf6, 0xba, 0xc4, 0xe8, 0xa3, 0xcd, 0x61, 0x2b, 0x7e, 0xaf, 0x9c, + 0x3f, 0x9f, 0xdf, 0x6c, 0x53, 0x74, 0xbb, 0x4d, 0xd1, 0xef, 0x6d, 0x8a, 0xbe, 0xef, 0xd2, 0xce, + 0xed, 0x2e, 0xed, 0xfc, 0xdc, 0xa5, 0x9d, 0x4f, 0x67, 0x85, 0xf2, 0x97, 0x9b, 0x25, 0x15, 0x66, + 0xcd, 0xa2, 0xf3, 0x4b, 0x63, 0x8b, 0xb6, 0x66, 0xdf, 0xfe, 0xfb, 0x2d, 0xea, 0xa4, 0xdd, 0x72, + 0x10, 0x6e, 0x7e, 0xfa, 0x37, 0x00, 0x00, 0xff, 0xff, 0xd6, 0x4c, 0x8c, 0x41, 0x94, 0x02, 0x00, + 0x00, } func (m *Failure) Marshal() (dAtA []byte, err error) { @@ -248,9 +240,9 @@ func (m *Failure) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.Packet != nil { + if m.Ack != nil { { - size, err := m.Packet.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Ack.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -258,19 +250,17 @@ func (m *Failure) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintGenesis(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x42 - } - if len(m.ErrorText) > 0 { - i -= len(m.ErrorText) - copy(dAtA[i:], m.ErrorText) - i = encodeVarintGenesis(dAtA, i, uint64(len(m.ErrorText))) - i-- dAtA[i] = 0x3a } - if len(m.AckResult) > 0 { - i -= len(m.AckResult) - copy(dAtA[i:], m.AckResult) - i = encodeVarintGenesis(dAtA, i, uint64(len(m.AckResult))) + if m.Packet != nil { + { + size, err := m.Packet.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintGenesis(dAtA, i, uint64(size)) + } i-- dAtA[i] = 0x32 } @@ -281,8 +271,8 @@ func (m *Failure) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x2a } - if m.AckId != 0 { - i = encodeVarintGenesis(dAtA, i, uint64(m.AckId)) + if m.SequenceId != 0 { + i = encodeVarintGenesis(dAtA, i, uint64(m.SequenceId)) i-- dAtA[i] = 0x20 } @@ -383,25 +373,21 @@ func (m *Failure) Size() (n int) { if m.Id != 0 { n += 1 + sovGenesis(uint64(m.Id)) } - if m.AckId != 0 { - n += 1 + sovGenesis(uint64(m.AckId)) + if m.SequenceId != 0 { + n += 1 + sovGenesis(uint64(m.SequenceId)) } l = len(m.AckType) if l > 0 { n += 1 + l + sovGenesis(uint64(l)) } - l = len(m.AckResult) - if l > 0 { - n += 1 + l + sovGenesis(uint64(l)) - } - l = len(m.ErrorText) - if l > 0 { - n += 1 + l + sovGenesis(uint64(l)) - } if m.Packet != nil { l = m.Packet.Size() n += 1 + l + sovGenesis(uint64(l)) } + if m.Ack != nil { + l = m.Ack.Size() + n += 1 + l + sovGenesis(uint64(l)) + } return n } @@ -542,9 +528,9 @@ func (m *Failure) Unmarshal(dAtA []byte) error { } case 4: if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field AckId", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field SequenceId", wireType) } - m.AckId = 0 + m.SequenceId = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowGenesis @@ -554,7 +540,7 @@ func (m *Failure) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.AckId |= uint64(b&0x7F) << shift + m.SequenceId |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -593,9 +579,9 @@ func (m *Failure) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 6: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field AckResult", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Packet", wireType) } - var byteLen int + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowGenesis @@ -605,61 +591,31 @@ func (m *Failure) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - byteLen |= int(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } - if byteLen < 0 { + if msglen < 0 { return ErrInvalidLengthGenesis } - postIndex := iNdEx + byteLen + postIndex := iNdEx + msglen if postIndex < 0 { return ErrInvalidLengthGenesis } if postIndex > l { return io.ErrUnexpectedEOF } - m.AckResult = append(m.AckResult[:0], dAtA[iNdEx:postIndex]...) - if m.AckResult == nil { - m.AckResult = []byte{} - } - iNdEx = postIndex - case 7: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ErrorText", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenesis - } - 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 ErrInvalidLengthGenesis - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthGenesis + if m.Packet == nil { + m.Packet = &types.Packet{} } - if postIndex > l { - return io.ErrUnexpectedEOF + if err := m.Packet.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err } - m.ErrorText = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 8: + case 7: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Packet", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Ack", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -686,10 +642,10 @@ func (m *Failure) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Packet == nil { - m.Packet = &types.Packet{} + if m.Ack == nil { + m.Ack = &types.Acknowledgement{} } - if err := m.Packet.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Ack.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/x/interchaintxs/keeper/ibc_handlers.go b/x/interchaintxs/keeper/ibc_handlers.go index f3252845f..d0a48f1a7 100644 --- a/x/interchaintxs/keeper/ibc_handlers.go +++ b/x/interchaintxs/keeper/ibc_handlers.go @@ -27,8 +27,7 @@ func (k *Keeper) outOfGasRecovery( senderAddress sdk.AccAddress, packet channeltypes.Packet, failureAckType string, - ackResult []byte, - errorText string, + ack *channeltypes.Acknowledgement, ) { if r := recover(); r != nil { _, ok := r.(sdk.ErrorOutOfGas) @@ -37,7 +36,7 @@ func (k *Keeper) outOfGasRecovery( } k.Logger(ctx).Debug("Out of gas", "Gas meter", gasMeter.String()) - k.contractManagerKeeper.AddContractFailure(ctx, packet, senderAddress.String(), failureAckType, ackResult, errorText) + k.contractManagerKeeper.AddContractFailure(ctx, packet, senderAddress.String(), failureAckType, ack) } } @@ -98,23 +97,20 @@ func (k *Keeper) HandleAcknowledgement(ctx sdk.Context, packet channeltypes.Pack } cacheCtx, writeFn, newGasMeter := k.createCachedContext(ctx) - defer k.outOfGasRecovery(ctx, newGasMeter, icaOwner.GetContract(), packet, "ack", ack.GetResult(), ack.GetError()) + defer k.outOfGasRecovery(ctx, newGasMeter, icaOwner.GetContract(), packet, "ack", &ack) k.feeKeeper.DistributeAcknowledgementFee(ctx, relayer, feetypes.NewPacketID(packet.SourcePort, packet.SourceChannel, packet.Sequence)) // Actually we have only one kind of error returned from acknowledgement // maybe later we'll retrieve actual errors from events - errorText := ack.GetError() - var ackResult []byte - if errorText != "" { - _, err = k.contractManagerKeeper.SudoError(cacheCtx, icaOwner.GetContract(), packet, errorText) + if ack.GetError() != "" { + _, err = k.contractManagerKeeper.SudoError(cacheCtx, icaOwner.GetContract(), packet, ack.GetError()) } else { - ackResult = ack.GetResult() - _, err = k.contractManagerKeeper.SudoResponse(cacheCtx, icaOwner.GetContract(), packet, ackResult) + _, err = k.contractManagerKeeper.SudoResponse(cacheCtx, icaOwner.GetContract(), packet, ack.GetResult()) } if err != nil { - k.contractManagerKeeper.AddContractFailure(ctx, packet, icaOwner.GetContract().String(), "ack", ackResult, errorText) + k.contractManagerKeeper.AddContractFailure(ctx, packet, icaOwner.GetContract().String(), "ack", &ack) k.Logger(ctx).Debug("HandleAcknowledgement: failed to Sudo contract on packet acknowledgement", "error", err) } else { ctx.EventManager().EmitEvents(cacheCtx.EventManager().Events()) @@ -140,13 +136,13 @@ func (k *Keeper) HandleTimeout(ctx sdk.Context, packet channeltypes.Packet, rela } cacheCtx, writeFn, newGasMeter := k.createCachedContext(ctx) - defer k.outOfGasRecovery(ctx, newGasMeter, icaOwner.GetContract(), packet, "timeout", []byte{}, "") + defer k.outOfGasRecovery(ctx, newGasMeter, icaOwner.GetContract(), packet, "timeout", nil) k.feeKeeper.DistributeTimeoutFee(ctx, relayer, feetypes.NewPacketID(packet.SourcePort, packet.SourceChannel, packet.Sequence)) _, err = k.contractManagerKeeper.SudoTimeout(cacheCtx, icaOwner.GetContract(), packet) if err != nil { - k.contractManagerKeeper.AddContractFailure(ctx, packet, icaOwner.GetContract().String(), "timeout", []byte{}, "") + k.contractManagerKeeper.AddContractFailure(ctx, packet, icaOwner.GetContract().String(), "timeout", nil) k.Logger(ctx).Error("HandleTimeout: failed to Sudo contract on packet timeout", "error", err) } else { ctx.EventManager().EmitEvents(cacheCtx.EventManager().Events()) diff --git a/x/interchaintxs/keeper/ibc_handlers_test.go b/x/interchaintxs/keeper/ibc_handlers_test.go index 3cad6fc54..ff0a245a7 100644 --- a/x/interchaintxs/keeper/ibc_handlers_test.go +++ b/x/interchaintxs/keeper/ibc_handlers_test.go @@ -71,7 +71,7 @@ func TestHandleAcknowledgement(t *testing.T) { store := cachedCtx.KVStore(storeKey) store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) // consumes 2990 }).Return(nil, fmt.Errorf("SudoResponse error")) - cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "ack", resACK.GetResult(), resACK.GetError()) + cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "ack", &resACK) feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = icak.HandleAcknowledgement(ctx, p, resAckData, relayerAddress) require.NoError(t, err) @@ -84,7 +84,7 @@ func TestHandleAcknowledgement(t *testing.T) { store := cachedCtx.KVStore(storeKey) store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) }).Return(nil, fmt.Errorf("SudoError error")) - cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "ack", errACK.GetResult(), errACK.GetError()) + cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "ack", &errACK) feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = icak.HandleAcknowledgement(ctx, p, errAckData, relayerAddress) require.NoError(t, err) @@ -109,7 +109,7 @@ func TestHandleAcknowledgement(t *testing.T) { store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) cachedCtx.GasMeter().ConsumeGas(cachedCtx.GasMeter().Limit()+1, "out of gas test") }).Return(nil, fmt.Errorf("SudoError error")) - cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "ack", errACK.GetResult(), errACK.GetError()) + cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "ack", &errACK) feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = icak.HandleAcknowledgement(ctx, p, errAckData, relayerAddress) require.NoError(t, err) @@ -144,7 +144,7 @@ func TestHandleAcknowledgement(t *testing.T) { cachedCtx.GasMeter().ConsumeGas(1, "Sudo response consumption") }).Return(nil, nil) feeKeeper.EXPECT().DistributeAcknowledgementFee(lowGasCtx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) - cmKeeper.EXPECT().AddContractFailure(lowGasCtx, p, contractAddress.String(), "ack", resACK.GetResult(), resACK.GetError()).Do(func(ctx sdk.Context, packet channeltypes.Packet, address, ackType string, ackResult []byte, errorText string) { + cmKeeper.EXPECT().AddContractFailure(lowGasCtx, p, contractAddress.String(), "ack", &resACK).Do(func(ctx sdk.Context, packet channeltypes.Packet, address, ackType string, ack channeltypes.Acknowledgement) { ctx.GasMeter().ConsumeGas(keeper.GasReserve, "out of gas") }) require.Panics(t, func() { icak.HandleAcknowledgement(lowGasCtx, p, resAckData, relayerAddress) }) //nolint:errcheck // this is a panic test @@ -194,7 +194,7 @@ func TestHandleTimeout(t *testing.T) { store := cachedCtx.KVStore(storeKey) store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) }).Return(nil, fmt.Errorf("SudoTimeout error")) - cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "timeout", []byte{}, "") + cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "timeout", nil) feeKeeper.EXPECT().DistributeTimeoutFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = icak.HandleTimeout(ctx, p, relayerAddress) require.NoError(t, err) @@ -207,7 +207,7 @@ func TestHandleTimeout(t *testing.T) { store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) cachedCtx.GasMeter().ConsumeGas(cachedCtx.GasMeter().Limit()+1, "out of gas test") }).Return(nil, fmt.Errorf("SudoTimeout error")) - cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "timeout", []byte{}, "") + cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "timeout", nil) feeKeeper.EXPECT().DistributeTimeoutFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = icak.HandleTimeout(ctx, p, relayerAddress) require.NoError(t, err) diff --git a/x/interchaintxs/types/expected_keepers.go b/x/interchaintxs/types/expected_keepers.go index 480914445..6ef2d2b65 100644 --- a/x/interchaintxs/types/expected_keepers.go +++ b/x/interchaintxs/types/expected_keepers.go @@ -26,7 +26,7 @@ type BankKeeper interface { type ContractManagerKeeper interface { HasContractInfo(ctx sdk.Context, contractAddress sdk.AccAddress) bool - AddContractFailure(ctx sdk.Context, packet channeltypes.Packet, address, ackType string, ackResult []byte, errorText string) + AddContractFailure(ctx sdk.Context, packet channeltypes.Packet, address, ackType string, ack *channeltypes.Acknowledgement) SudoResponse(ctx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, msg []byte) ([]byte, error) SudoError(ctx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, details string) ([]byte, error) SudoTimeout(ctx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet) ([]byte, error) diff --git a/x/transfer/ibc_handlers.go b/x/transfer/ibc_handlers.go index ed916efd6..f8eb2e9d7 100644 --- a/x/transfer/ibc_handlers.go +++ b/x/transfer/ibc_handlers.go @@ -26,8 +26,7 @@ func (im IBCModule) outOfGasRecovery( packet channeltypes.Packet, data transfertypes.FungibleTokenPacketData, failureType string, - ackResult []byte, - errorText string, + ack *channeltypes.Acknowledgement, ) { if r := recover(); r != nil { _, ok := r.(sdk.ErrorOutOfGas) @@ -36,7 +35,7 @@ func (im IBCModule) outOfGasRecovery( } im.keeper.Logger(ctx).Debug("Out of gas", "Gas meter", gasMeter.String(), "Packet data", data) - im.ContractManagerKeeper.AddContractFailure(ctx, packet, senderAddress.String(), failureType, ackResult, errorText) + im.ContractManagerKeeper.AddContractFailure(ctx, packet, senderAddress.String(), failureType, ack) // FIXME: add distribution call } } @@ -97,7 +96,7 @@ func (im IBCModule) HandleAcknowledgement(ctx sdk.Context, packet channeltypes.P } cacheCtx, writeFn, newGasMeter := im.createCachedContext(ctx) - defer im.outOfGasRecovery(ctx, newGasMeter, senderAddress, packet, data, "ack", ack.GetResult(), ack.GetError()) + defer im.outOfGasRecovery(ctx, newGasMeter, senderAddress, packet, data, "ack", &ack) if ack.Success() { _, err = im.ContractManagerKeeper.SudoResponse(cacheCtx, senderAddress, packet, ack.GetResult()) @@ -109,7 +108,7 @@ func (im IBCModule) HandleAcknowledgement(ctx sdk.Context, packet channeltypes.P } if err != nil { - im.ContractManagerKeeper.AddContractFailure(ctx, packet, senderAddress.String(), "ack", ack.GetResult(), ack.GetError()) + im.ContractManagerKeeper.AddContractFailure(ctx, packet, senderAddress.String(), "ack", &ack) im.keeper.Logger(ctx).Debug("failed to Sudo contract on packet acknowledgement", err) } else { ctx.EventManager().EmitEvents(cacheCtx.EventManager().Events()) @@ -142,11 +141,11 @@ func (im IBCModule) HandleTimeout(ctx sdk.Context, packet channeltypes.Packet, r } cacheCtx, writeFn, newGasMeter := im.createCachedContext(ctx) - defer im.outOfGasRecovery(ctx, newGasMeter, senderAddress, packet, data, "timeout", []byte{}, "") + defer im.outOfGasRecovery(ctx, newGasMeter, senderAddress, packet, data, "timeout", nil) _, err = im.ContractManagerKeeper.SudoTimeout(cacheCtx, senderAddress, packet) if err != nil { - im.ContractManagerKeeper.AddContractFailure(ctx, packet, senderAddress.String(), "timeout", []byte{}, "") + im.ContractManagerKeeper.AddContractFailure(ctx, packet, senderAddress.String(), "timeout", nil) im.keeper.Logger(ctx).Debug("failed to Sudo contract on packet timeout", err) } else { ctx.EventManager().EmitEvents(cacheCtx.EventManager().Events()) diff --git a/x/transfer/ibc_handlers_test.go b/x/transfer/ibc_handlers_test.go index c7ce57859..a0f149de6 100644 --- a/x/transfer/ibc_handlers_test.go +++ b/x/transfer/ibc_handlers_test.go @@ -100,7 +100,7 @@ func TestHandleAcknowledgement(t *testing.T) { store := cachedCtx.KVStore(storeKey) store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) // consumes 2990 }).Return(nil, fmt.Errorf("SudoResponse error")) - cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "ack", resACK.GetResult(), resACK.GetError()) + cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "ack", &resACK) cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(false) err = txModule.HandleAcknowledgement(ctx, p, resAckData, relayerAddress) require.NoError(t, err) @@ -113,7 +113,7 @@ func TestHandleAcknowledgement(t *testing.T) { store := cachedCtx.KVStore(storeKey) store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) // consumes 2990 }).Return(nil, fmt.Errorf("SudoResponse error")) - cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "ack", resACK.GetResult(), resACK.GetError()) + cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "ack", &resACK) cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = txModule.HandleAcknowledgement(ctx, p, resAckData, relayerAddress) @@ -127,7 +127,7 @@ func TestHandleAcknowledgement(t *testing.T) { store := cachedCtx.KVStore(storeKey) store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) // consumes 2990 }).Return(nil, fmt.Errorf("SudoError error")) - cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "ack", errACK.GetResult(), errACK.GetError()) + cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "ack", &errACK) cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(false) // feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = txModule.HandleAcknowledgement(ctx, p, errAckData, relayerAddress) @@ -141,7 +141,7 @@ func TestHandleAcknowledgement(t *testing.T) { store := cachedCtx.KVStore(storeKey) store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) // consumes 2990 }).Return(nil, fmt.Errorf("SudoError error")) - cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "ack", errACK.GetResult(), errACK.GetError()) + cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "ack", &errACK) cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = txModule.HandleAcknowledgement(ctx, p, errAckData, relayerAddress) @@ -179,7 +179,7 @@ func TestHandleAcknowledgement(t *testing.T) { store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) cachedCtx.GasMeter().ConsumeGas(cachedCtx.GasMeter().Limit()+1, "out of gas test") }).Return(nil, fmt.Errorf("SudoError error")) - cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "ack", errACK.GetResult(), errACK.GetError()) + cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "ack", &errACK) // FIXME: fix distribution during outofgas // cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(false) err = txModule.HandleAcknowledgement(ctx, p, errAckData, relayerAddress) @@ -193,7 +193,7 @@ func TestHandleAcknowledgement(t *testing.T) { store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) cachedCtx.GasMeter().ConsumeGas(cachedCtx.GasMeter().Limit()+1, "out of gas test") }).Return(nil, fmt.Errorf("SudoError error")) - cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "ack", errACK.GetResult(), errACK.GetError()) + cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "ack", &errACK) // FIXME: fix distribution during outofgas // cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) // feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) @@ -248,7 +248,7 @@ func TestHandleAcknowledgement(t *testing.T) { cachedCtx.GasMeter().ConsumeGas(1, "Sudo response consumption") }).Return(nil, nil) // feeKeeper.EXPECT().DistributeAcknowledgementFee(lowGasCtx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) - cmKeeper.EXPECT().AddContractFailure(lowGasCtx, p, contractAddress.String(), "ack", resACK.GetResult(), resACK.GetError()).Do(func(ctx sdk.Context, packet channeltypes.Packet, address, ackType string, ackResult []byte, errorText string) { + cmKeeper.EXPECT().AddContractFailure(lowGasCtx, p, contractAddress.String(), "ack", &resACK).Do(func(ctx sdk.Context, packet channeltypes.Packet, address, ackType string, ack channeltypes.Acknowledgement) { ctx.GasMeter().ConsumeGas(keeper.GasReserve, "out of gas") }) require.Panics(t, func() { txModule.HandleAcknowledgement(lowGasCtx, p, resAckData, relayerAddress) }) //nolint:errcheck // this is a test @@ -342,7 +342,7 @@ func TestHandleTimeout(t *testing.T) { store := cachedCtx.KVStore(storeKey) store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) }).Return(nil, fmt.Errorf("SudoTimeout error")) - cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "timeout", []byte{}, "") + cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "timeout", nil) cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(false) err = txModule.HandleTimeout(ctx, p, relayerAddress) require.NoError(t, err) @@ -354,7 +354,7 @@ func TestHandleTimeout(t *testing.T) { store := cachedCtx.KVStore(storeKey) store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) }).Return(nil, fmt.Errorf("SudoTimeout error")) - cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "timeout", []byte{}, "") + cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "timeout", nil) cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) feeKeeper.EXPECT().DistributeTimeoutFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = txModule.HandleTimeout(ctx, p, relayerAddress) @@ -368,7 +368,7 @@ func TestHandleTimeout(t *testing.T) { store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) cachedCtx.GasMeter().ConsumeGas(cachedCtx.GasMeter().Limit()+1, "out of gas test") }).Return(nil, fmt.Errorf("SudoTimeout error")) - cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "timeout", []byte{}, "") + cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "timeout", nil) // cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(false) err = txModule.HandleTimeout(ctx, p, relayerAddress) require.NoError(t, err) @@ -381,7 +381,7 @@ func TestHandleTimeout(t *testing.T) { store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) cachedCtx.GasMeter().ConsumeGas(cachedCtx.GasMeter().Limit()+1, "out of gas test") }).Return(nil, fmt.Errorf("SudoTimeout error")) - cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "timeout", []byte{}, "") + cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "timeout", nil) // FIXME: make DistributeTimeoutFee during out of gas // cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) // feeKeeper.EXPECT().DistributeTimeoutFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) diff --git a/x/transfer/types/expected_keepers.go b/x/transfer/types/expected_keepers.go index 89e980f41..f66386941 100644 --- a/x/transfer/types/expected_keepers.go +++ b/x/transfer/types/expected_keepers.go @@ -11,7 +11,7 @@ import ( // ContractManagerKeeper defines the expected interface needed to add ack information about sudo failure. type ContractManagerKeeper interface { HasContractInfo(ctx sdk.Context, contractAddress sdk.AccAddress) bool - AddContractFailure(ctx sdk.Context, packet channeltypes.Packet, address, ackType string, ackResult []byte, errorText string) + AddContractFailure(ctx sdk.Context, packet channeltypes.Packet, address, ackType string, ack *channeltypes.Acknowledgement) SudoResponse(ctx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, msg []byte) ([]byte, error) SudoError(ctx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, details string) ([]byte, error) SudoTimeout(ctx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet) ([]byte, error) From 9ec118361fc71e22047844208e3e31e25a655851 Mon Sep 17 00:00:00 2001 From: nhpd Date: Thu, 10 Aug 2023 17:00:54 +0400 Subject: [PATCH 026/307] cleanup --- wasmbinding/test/custom_message_test.go | 8 ++++++++ x/contractmanager/keeper/failure.go | 10 ++++------ x/contractmanager/types/errors.go | 2 -- x/tokenfactory/types/errors.go | 2 -- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/wasmbinding/test/custom_message_test.go b/wasmbinding/test/custom_message_test.go index ada721a6a..3e2771aa4 100644 --- a/wasmbinding/test/custom_message_test.go +++ b/wasmbinding/test/custom_message_test.go @@ -593,6 +593,14 @@ func (suite *CustomMessengerTestSuite) TestAddRemoveSchedule() { suite.Equal([][]uint8{expected}, data) } +func (suite *CustomMessengerTestSuite) TestResubmitFailure() { + // TODO +} + +func (suite *CustomMessengerTestSuite) TestResubmitFailureFromDifferentContract() { + // TODO +} + func (suite *CustomMessengerTestSuite) executeCustomMsg(owner sdk.AccAddress, fullMsg bindings.NeutronMsg) (result [][]byte, msg []byte) { msg, err := json.Marshal(fullMsg) suite.NoError(err) diff --git a/x/contractmanager/keeper/failure.go b/x/contractmanager/keeper/failure.go index c3fb68671..f9b0c22dc 100644 --- a/x/contractmanager/keeper/failure.go +++ b/x/contractmanager/keeper/failure.go @@ -79,30 +79,28 @@ func (k Keeper) ResubmitFailure(ctx sdk.Context, contractAddr sdk.AccAddress, fa return errors.Wrapf(types.IncorrectFailureToResubmit, "cannot resubmit failure without packet info; failureId = %d", failure.Id) } - if failure.GetAckType() == "ack" { + switch failure.GetAckType() { + case "ack": if failure.GetAck() == nil { return errors.Wrapf(types.IncorrectFailureToResubmit, "cannot resubmit failure without acknowledgement; failureId = %d", failure.Id) } if failure.GetAck().GetError() == "" { _, err := k.SudoResponse(ctx, contractAddr, *failure.Packet, failure.Ack.GetResult()) - // TODO: handle resp? if err != nil { return errors.Wrapf(types.FailedToResubmitFailure, "cannot resubmit failure ack response; failureId = %d; err = %s", failure.Id, err) } } else { _, err := k.SudoError(ctx, contractAddr, *failure.Packet, failure.Ack.GetError()) - // TODO: handle resp? if err != nil { return errors.Wrapf(types.FailedToResubmitFailure, "cannot resubmit failure ack error; failureId = %d; err = %s", failure.Id, err) } } - } else if failure.GetAckType() == "timeout" { - // TODO: handle resp? + case "timeout": _, err := k.SudoTimeout(ctx, contractAddr, *failure.Packet) if err != nil { return errors.Wrapf(types.FailedToResubmitFailure, "cannot resubmit failure ack timeout; failureId = %d; err = %s", failure.Id, err) } - } else { + default: return errors.Wrapf(types.IncorrectAckType, "cannot resubmit failure with incorrect ackType = %s", failure.GetAckType()) } diff --git a/x/contractmanager/types/errors.go b/x/contractmanager/types/errors.go index 1d13568a1..612d6742f 100644 --- a/x/contractmanager/types/errors.go +++ b/x/contractmanager/types/errors.go @@ -1,7 +1,5 @@ package types -// DONTCOVER - import ( "cosmossdk.io/errors" ) diff --git a/x/tokenfactory/types/errors.go b/x/tokenfactory/types/errors.go index ef46d16ca..1c51fec43 100644 --- a/x/tokenfactory/types/errors.go +++ b/x/tokenfactory/types/errors.go @@ -1,7 +1,5 @@ package types -// DONTCOVER - import ( fmt "fmt" From 4909c38100e833ec4b9d0df15208c91bc484b559 Mon Sep 17 00:00:00 2001 From: nhpd Date: Thu, 10 Aug 2023 18:07:34 +0400 Subject: [PATCH 027/307] add binding code --- wasmbinding/bindings/msg.go | 4 +++ wasmbinding/message_plugin.go | 3 +++ x/contractmanager/keeper/failure.go | 2 +- x/contractmanager/keeper/failure_test.go | 33 ++++++++++++++++++++---- 4 files changed, 36 insertions(+), 6 deletions(-) diff --git a/wasmbinding/bindings/msg.go b/wasmbinding/bindings/msg.go index 4d2a35472..fe8b47db9 100644 --- a/wasmbinding/bindings/msg.go +++ b/wasmbinding/bindings/msg.go @@ -46,6 +46,10 @@ type NeutronMsg struct { // Cron types AddSchedule *AddSchedule `json:"add_schedule,omitempty"` RemoveSchedule *RemoveSchedule `json:"remove_schedule,omitempty"` + + // Contractmanager types + /// A contract that has failed acknowledgement can resubmit it + ResubmitFailure *ResubmitFailure `json:"resubmit_failure,omitempty"` } // SubmitTx submits interchain transaction on a remote chain. diff --git a/wasmbinding/message_plugin.go b/wasmbinding/message_plugin.go index ed40a56c2..883e0b270 100644 --- a/wasmbinding/message_plugin.go +++ b/wasmbinding/message_plugin.go @@ -134,6 +134,9 @@ func (m *CustomMessenger) DispatchMsg(ctx sdk.Context, contractAddr sdk.AccAddre if contractMsg.RemoveSchedule != nil { return m.removeSchedule(ctx, contractAddr, contractMsg.RemoveSchedule) } + if contractMsg.ResubmitFailure != nil { + return m.resubmitFailure(ctx, contractAddr, contractMsg.ResubmitFailure) + } } return m.Wrapped.DispatchMsg(ctx, contractAddr, contractIBCPortID, msg) diff --git a/x/contractmanager/keeper/failure.go b/x/contractmanager/keeper/failure.go index f9b0c22dc..b2c5f6afb 100644 --- a/x/contractmanager/keeper/failure.go +++ b/x/contractmanager/keeper/failure.go @@ -16,9 +16,9 @@ func (k Keeper) AddContractFailure(ctx sdk.Context, packet ibcchanneltypes.Packe ChannelId: packet.SourceChannel, Address: address, SequenceId: packet.Sequence, + Packet: &packet, AckType: ackType, Ack: ack, - Packet: &packet, } nextFailureID := k.GetNextFailureIDKey(ctx, failure.GetAddress()) diff --git a/x/contractmanager/keeper/failure_test.go b/x/contractmanager/keeper/failure_test.go index ef208f1e0..1376c8465 100644 --- a/x/contractmanager/keeper/failure_test.go +++ b/x/contractmanager/keeper/failure_test.go @@ -2,6 +2,7 @@ package keeper_test import ( "crypto/rand" + "github.com/neutron-org/neutron/testutil" "strconv" "testing" @@ -61,16 +62,38 @@ func flattenFailures(items [][]types.Failure) []types.Failure { } func TestGetAllFailures(t *testing.T) { - keeper, ctx := keepertest.ContractManagerKeeper(t, nil) - items := createNFailure(keeper, ctx, 1, 1) + k, ctx := keepertest.ContractManagerKeeper(t, nil) + items := createNFailure(k, ctx, 1, 1) flattenItems := flattenFailures(items) - allFailures := keeper.GetAllFailures(ctx) + allFailures := k.GetAllFailures(ctx) require.ElementsMatch(t, nullify.Fill(flattenItems), - // flattenItems, - // allFailures, nullify.Fill(allFailures), ) } + +func TestAddGetFailure(t *testing.T) { + // test adding and getting failure + contractAddress := sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress) + k, ctx := keepertest.ContractManagerKeeper(t, nil) + failureId := k.GetNextFailureIDKey(ctx, contractAddress.String()) + k.AddContractFailure(ctx, channeltypes.Packet{}, contractAddress.String(), "ack", &channeltypes.Acknowledgement{}) + failure, err := k.GetFailure(ctx, contractAddress, failureId) + require.NoError(t, err) + require.Equal(t, failureId, failure.Id) + require.Equal(t, "ack", failure.AckType) + + // non-existent id + _, err = k.GetFailure(ctx, contractAddress, failureId+1) + require.Error(t, err) + + // non-existent contract address + _, err = k.GetFailure(ctx, sdk.MustAccAddressFromBech32("neutron1nseacn2aqezhj3ssatfg778ctcfjuknm8ucc0l"), failureId) + require.Error(t, err) +} + +func TestResubmitFailure(t *testing.T) { + // TODO +} From 65e2e3453a117a5a7914ed1359c01d41e94ac380 Mon Sep 17 00:00:00 2001 From: nhpd Date: Thu, 10 Aug 2023 18:42:35 +0400 Subject: [PATCH 028/307] chore: add tests --- wasmbinding/test/custom_message_test.go | 95 +++++++++++++++++++++++- x/contractmanager/keeper/failure_test.go | 12 +++ 2 files changed, 104 insertions(+), 3 deletions(-) diff --git a/wasmbinding/test/custom_message_test.go b/wasmbinding/test/custom_message_test.go index 3e2771aa4..bdfe65607 100644 --- a/wasmbinding/test/custom_message_test.go +++ b/wasmbinding/test/custom_message_test.go @@ -3,6 +3,7 @@ package test import ( "encoding/json" "fmt" + ibcchanneltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" "testing" "github.com/stretchr/testify/suite" @@ -57,6 +58,7 @@ func (suite *CustomMessengerTestSuite) SetupTest() { suite.messenger.TokenFactory = suite.neutron.TokenFactoryKeeper suite.messenger.CronKeeper = &suite.neutron.CronKeeper suite.messenger.AdminKeeper = &suite.neutron.AdminmoduleKeeper + suite.messenger.ContractmanagerKeeper = &suite.neutron.ContractManagerKeeper suite.contractOwner = keeper.RandomAccountAddress(suite.T()) err := suite.messenger.TokenFactory.SetParams(suite.ctx, tokenfactorytypes.NewParams( @@ -593,12 +595,99 @@ func (suite *CustomMessengerTestSuite) TestAddRemoveSchedule() { suite.Equal([][]uint8{expected}, data) } -func (suite *CustomMessengerTestSuite) TestResubmitFailure() { - // TODO +func (suite *CustomMessengerTestSuite) TestResubmitFailureAck() { + // Store code and instantiate reflect contract + codeID := suite.StoreReflectCode(suite.ctx, suite.contractOwner, "../testdata/reflect.wasm") + suite.contractAddress = suite.InstantiateReflectContract(suite.ctx, suite.contractOwner, codeID) + suite.Require().NotEmpty(suite.contractAddress) + + // Add failure + packet := ibcchanneltypes.Packet{} + ack := ibcchanneltypes.Acknowledgement{ + Response: &ibcchanneltypes.Acknowledgement_Result{Result: []byte("Result")}, + } + failureId := suite.messenger.ContractmanagerKeeper.GetNextFailureIDKey(suite.ctx, suite.contractAddress.String()) + suite.messenger.ContractmanagerKeeper.AddContractFailure(suite.ctx, packet, suite.contractAddress.String(), "ack", &ack) + + // Craft message + msg, err := json.Marshal(bindings.NeutronMsg{ + ResubmitFailure: &bindings.ResubmitFailure{ + FailureId: failureId, + }, + }) + suite.NoError(err) + + // Dispatch + events, data, err := suite.messenger.DispatchMsg(suite.ctx, suite.contractAddress, suite.Path.EndpointA.ChannelConfig.PortID, types.CosmosMsg{ + Custom: msg, + }) + suite.NoError(err) + suite.Nil(events) + expected, err := json.Marshal(&bindings.ResubmitFailureResponse{}) + suite.NoError(err) + suite.Equal([][]uint8{expected}, data) +} + +func (suite *CustomMessengerTestSuite) TestResubmitFailureTimeout() { + // Store code and instantiate reflect contract + codeID := suite.StoreReflectCode(suite.ctx, suite.contractOwner, "../testdata/reflect.wasm") + suite.contractAddress = suite.InstantiateReflectContract(suite.ctx, suite.contractOwner, codeID) + suite.Require().NotEmpty(suite.contractAddress) + + // Add failure + packet := ibcchanneltypes.Packet{} + ack := ibcchanneltypes.Acknowledgement{ + Response: &ibcchanneltypes.Acknowledgement_Error{Error: "Error"}, + } + failureId := suite.messenger.ContractmanagerKeeper.GetNextFailureIDKey(suite.ctx, suite.contractAddress.String()) + suite.messenger.ContractmanagerKeeper.AddContractFailure(suite.ctx, packet, suite.contractAddress.String(), "timeout", &ack) + + // Craft message + msg, err := json.Marshal(bindings.NeutronMsg{ + ResubmitFailure: &bindings.ResubmitFailure{ + FailureId: failureId, + }, + }) + suite.NoError(err) + + // Dispatch + events, data, err := suite.messenger.DispatchMsg(suite.ctx, suite.contractAddress, suite.Path.EndpointA.ChannelConfig.PortID, types.CosmosMsg{ + Custom: msg, + }) + suite.NoError(err) + suite.Nil(events) + expected, err := json.Marshal(&bindings.ResubmitFailureResponse{}) + suite.NoError(err) + suite.Equal([][]uint8{expected}, data) } func (suite *CustomMessengerTestSuite) TestResubmitFailureFromDifferentContract() { - // TODO + // Store code and instantiate reflect contract + codeID := suite.StoreReflectCode(suite.ctx, suite.contractOwner, "../testdata/reflect.wasm") + suite.contractAddress = suite.InstantiateReflectContract(suite.ctx, suite.contractOwner, codeID) + suite.Require().NotEmpty(suite.contractAddress) + + // Add failure + packet := ibcchanneltypes.Packet{} + ack := ibcchanneltypes.Acknowledgement{ + Response: &ibcchanneltypes.Acknowledgement_Error{Error: "Error"}, + } + failureId := suite.messenger.ContractmanagerKeeper.GetNextFailureIDKey(suite.ctx, testutil.TestOwnerAddress) + suite.messenger.ContractmanagerKeeper.AddContractFailure(suite.ctx, packet, testutil.TestOwnerAddress, "timeout", &ack) + + // Craft message + msg, err := json.Marshal(bindings.NeutronMsg{ + ResubmitFailure: &bindings.ResubmitFailure{ + FailureId: failureId, + }, + }) + suite.NoError(err) + + // Dispatch + _, _, err = suite.messenger.DispatchMsg(suite.ctx, suite.contractAddress, suite.Path.EndpointA.ChannelConfig.PortID, types.CosmosMsg{ + Custom: msg, + }) + suite.ErrorContains(err, "no failure found to resubmit: not found") } func (suite *CustomMessengerTestSuite) executeCustomMsg(owner sdk.AccAddress, fullMsg bindings.NeutronMsg) (result [][]byte, msg []byte) { diff --git a/x/contractmanager/keeper/failure_test.go b/x/contractmanager/keeper/failure_test.go index 1376c8465..6f85cb277 100644 --- a/x/contractmanager/keeper/failure_test.go +++ b/x/contractmanager/keeper/failure_test.go @@ -96,4 +96,16 @@ func TestAddGetFailure(t *testing.T) { func TestResubmitFailure(t *testing.T) { // TODO + + // successful resubmit with ack and ack = response + // failed resubmit with ack and ack = response + + // successful resubmit with ack and ack = error + // failed resubmit with ack and ack = error + + // successful resubmit with timeout + // failed resubmit with timeout + + // no Failure.Ack field found for ackType = 'ack' + // no Failure.Packet found } From 92a6e50edb8c4fb9844936cb859065229ac18613 Mon Sep 17 00:00:00 2001 From: nhpd Date: Thu, 10 Aug 2023 19:10:05 +0400 Subject: [PATCH 029/307] chore: add failure_test --- x/contractmanager/keeper/failure_test.go | 33 +++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/x/contractmanager/keeper/failure_test.go b/x/contractmanager/keeper/failure_test.go index 6f85cb277..ea6f6d2f7 100644 --- a/x/contractmanager/keeper/failure_test.go +++ b/x/contractmanager/keeper/failure_test.go @@ -2,7 +2,10 @@ package keeper_test import ( "crypto/rand" + "encoding/json" + "github.com/golang/mock/gomock" "github.com/neutron-org/neutron/testutil" + mock_types "github.com/neutron-org/neutron/testutil/mocks/contractmanager/types" "strconv" "testing" @@ -95,9 +98,37 @@ func TestAddGetFailure(t *testing.T) { } func TestResubmitFailure(t *testing.T) { - // TODO + ctrl := gomock.NewController(t) + defer ctrl.Finish() + + wk := mock_types.NewMockWasmKeeper(ctrl) + k, ctx := keepertest.ContractManagerKeeper(t, wk) + + // add failure + contractAddr := sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress) + data := []byte("Result") + packet := channeltypes.Packet{} + ack := channeltypes.Acknowledgement{ + Response: &channeltypes.Acknowledgement_Result{Result: data}, + } + failureId := k.GetNextFailureIDKey(ctx, contractAddr.String()) + k.AddContractFailure(ctx, packet, contractAddr.String(), "ack", &ack) // successful resubmit with ack and ack = response + x := types.MessageResponse{} + x.Response.Data = data + x.Response.Request = channeltypes.Packet{} + msg, err := json.Marshal(x) + require.NoError(t, err) + + wk.EXPECT().HasContractInfo(gomock.AssignableToTypeOf(ctx), contractAddr).Return(true) + wk.EXPECT().Sudo(gomock.AssignableToTypeOf(ctx), contractAddr, msg) + + failure, err := k.GetFailure(ctx, contractAddr, failureId) + require.NoError(t, err) + err = k.ResubmitFailure(ctx, contractAddr, failure) + require.NoError(t, err) + // failed resubmit with ack and ack = response // successful resubmit with ack and ack = error From 536191206e6fc84e04fc39fcdcd25ebacf117a02 Mon Sep 17 00:00:00 2001 From: swelf Date: Fri, 11 Aug 2023 10:22:50 +0300 Subject: [PATCH 030/307] forked cosmos-sdk v0.47 --- go.mod | 15 ++++++++++++--- go.sum | 38 +++++++++++++++++++++++++++++++++++--- 2 files changed, 47 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index cb6ae7427..7b26426f5 100644 --- a/go.mod +++ b/go.mod @@ -5,6 +5,7 @@ go 1.20 require ( cosmossdk.io/core v0.5.1 cosmossdk.io/errors v1.0.0 + cosmossdk.io/log v1.1.1-0.20230704160919-88f2c830b0ca cosmossdk.io/math v1.0.1 github.com/CosmWasm/wasmd v0.41.0 github.com/CosmWasm/wasmvm v1.3.0 @@ -26,9 +27,11 @@ require ( github.com/grpc-ecosystem/grpc-gateway v1.16.0 github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.16.0 + github.com/rs/zerolog v1.29.1 github.com/skip-mev/pob v1.0.3 github.com/spf13/cast v1.5.1 github.com/spf13/cobra v1.7.0 + github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.16.0 github.com/strangelove-ventures/packet-forward-middleware/v7 v7.0.0-20230523193151-73dea436e53f github.com/stretchr/testify v1.8.4 @@ -45,7 +48,6 @@ require ( cloud.google.com/go/storage v1.30.1 // indirect cosmossdk.io/api v0.3.1 // indirect cosmossdk.io/depinject v1.0.0-alpha.3 // indirect - cosmossdk.io/log v1.1.1-0.20230704160919-88f2c830b0ca // indirect cosmossdk.io/tools/rosetta v0.2.1 // indirect filippo.io/edwards25519 v1.0.0 // indirect github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect @@ -55,12 +57,16 @@ require ( github.com/beorn7/perks v1.0.1 // indirect github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 // indirect + github.com/bits-and-blooms/bitset v1.8.0 // indirect github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect github.com/cenkalti/backoff/v4 v4.1.3 // indirect github.com/cespare/xxhash v1.1.0 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/chzyer/readline v1.5.1 // indirect github.com/cockroachdb/apd/v2 v2.0.2 // indirect + github.com/cockroachdb/errors v1.10.0 // indirect + github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect + github.com/cockroachdb/redact v1.1.5 // indirect github.com/coinbase/rosetta-sdk-go v0.7.9 // indirect github.com/confio/ics23/go v0.9.0 // indirect github.com/cosmos/btcutil v1.0.5 // indirect @@ -82,6 +88,7 @@ require ( github.com/dvsekhvalnov/jose2go v1.5.0 // indirect github.com/felixge/httpsnoop v1.0.2 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect + github.com/getsentry/sentry-go v0.21.0 // indirect github.com/go-kit/kit v0.12.0 // indirect github.com/go-kit/log v0.2.1 // indirect github.com/go-logfmt/logfmt v0.6.0 // indirect @@ -119,6 +126,8 @@ require ( github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/jmhodges/levigo v1.0.0 // indirect github.com/klauspost/compress v1.16.5 // indirect + github.com/kr/pretty v0.3.1 // indirect + github.com/kr/text v0.2.0 // indirect github.com/lib/pq v1.10.7 // indirect github.com/libp2p/go-buffer-pool v0.1.0 // indirect github.com/linxGnu/grocksdb v1.8.0 // indirect @@ -143,12 +152,11 @@ require ( github.com/prometheus/procfs v0.10.1 // indirect github.com/rakyll/statik v0.1.7 // indirect github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect + github.com/rogpeppe/go-internal v1.10.0 // indirect github.com/rs/cors v1.8.3 // indirect - github.com/rs/zerolog v1.29.1 // indirect github.com/sasha-s/go-deadlock v0.3.1 // indirect github.com/spf13/afero v1.9.5 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect - github.com/spf13/pflag v1.0.5 // indirect github.com/subosito/gotenv v1.4.2 // indirect github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect github.com/tendermint/go-amino v0.16.0 // indirect @@ -183,6 +191,7 @@ replace ( github.com/ChainSafe/go-schnorrkel => github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d github.com/CosmWasm/wasmd => github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230808084410-6083b888424e github.com/cosmos/admin-module => github.com/neutron-org/admin-module v0.0.0-20230705134325-b23404470a1d + github.com/cosmos/cosmos-sdk => github.com/neutron-org/cosmos-sdk v0.47.5-0.20230808152221-a0e301227957 github.com/cosmos/gaia/v11 => github.com/cosmos/gaia/v11 v11.0.0-20230724152830-861ba391c3b4 github.com/cosmos/ledger-cosmos-go => github.com/cosmos/ledger-cosmos-go v0.12.1 github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 diff --git a/go.sum b/go.sum index 71b2262b1..6e321f229 100644 --- a/go.sum +++ b/go.sum @@ -221,6 +221,7 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d h1:nalkkPQcITbvhmL4+C4cKA87NW0tfm3Kl9VXRoPywFg= github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d/go.mod h1:URdX5+vg25ts3aCh8H5IFZybJYKWhJHYMTnf+ULtoC4= +github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53/go.mod h1:+3IMCy2vIlbG1XG/0ggNQv0SvxCAIpPM5b1nCz56Xno= github.com/CosmWasm/wasmvm v1.3.0 h1:x12X4bKlUPS7TT9QQP45+fJo2sp30GEbiSSgb9jsec8= github.com/CosmWasm/wasmvm v1.3.0/go.mod h1:vW/E3h8j9xBQs9bCoijDuawKo9kCtxOaS8N8J7KFtkc= github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= @@ -286,6 +287,8 @@ github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod h1:6QX/PXZ github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 h1:41iFGWnSlI2gVpmOtVTJZNodLdLQLn/KsJqFvXwnd/s= github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= +github.com/bits-and-blooms/bitset v1.8.0 h1:FD+XqgOZDUxxZ8hzoBFuV9+cGWY9CslN6d5MS5JVb4c= +github.com/bits-and-blooms/bitset v1.8.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8= github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40/go.mod h1:8rLXio+WjiTceGBHIoTvn60HIbs7Hm7bcHjyrSqYB9c= github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps= github.com/btcsuite/btcd v0.0.0-20190315201642-aa6e0f35703c/go.mod h1:DrZx5ec/dmnfpw9KyYoQyYo7d0KEvTkk/5M/vbZjAr8= @@ -312,7 +315,7 @@ github.com/btcsuite/snappy-go v0.0.0-20151229074030-0bdef8d06723/go.mod h1:8woku github.com/btcsuite/snappy-go v1.0.0/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc= github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod h1:ghJtEyQwv5/p4Mg4C0fgbePVuGr935/5ddU9Z3TmDRY= github.com/btcsuite/winsvc v1.0.0/go.mod h1:jsenWakMcC0zFBFurPLEAyrnc/teJEM1O46fmI40EZs= -github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA= +github.com/bufbuild/protocompile v0.5.1 h1:mixz5lJX4Hiz4FpqFREJHIXLfaLBntfaJv1h+/jS+Qg= github.com/bwesterb/go-ristretto v1.2.0/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0= github.com/c-bata/go-prompt v0.2.2/go.mod h1:VzqtzE2ksDBcdln8G7mk2RX9QyGjH+OVqOCSiVIqS34= github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= @@ -356,7 +359,15 @@ github.com/cockroachdb/apd/v2 v2.0.2 h1:weh8u7Cneje73dDh+2tEVLUvyBc89iwepWCD8b80 github.com/cockroachdb/apd/v2 v2.0.2/go.mod h1:DDxRlzC2lo3/vSlmSoS7JkqbbrARPuFOGr0B9pvN3Gw= github.com/cockroachdb/apd/v3 v3.1.0 h1:MK3Ow7LH0W8zkd5GMKA1PvS9qG3bWFI95WaVNfyZJ/w= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= +github.com/cockroachdb/datadriven v1.0.2/go.mod h1:a9RdTaap04u637JoCzcUoIcDmvwSUtcUFtT/C3kJlTU= +github.com/cockroachdb/errors v1.10.0 h1:lfxS8zZz1+OjtV4MtNWgboi/W5tyLEB6VQZBXN+0VUU= +github.com/cockroachdb/errors v1.10.0/go.mod h1:lknhIsEVQ9Ss/qKDBQS/UqFSvPQjOwNq2qyKAxtHRqE= +github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZeQy818SGhaone5OnYfxFR/+AzdY3sf5aE= +github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs= +github.com/cockroachdb/redact v1.1.5 h1:u1PMllDkdFfPWaNGMyLD1+so+aq3uUItthCFqzwPJ30= +github.com/cockroachdb/redact v1.1.5/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= +github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM= github.com/coinbase/kryptology v1.8.0/go.mod h1:RYXOAPdzOGUe3qlSFkMGn58i3xUA8hmxYHksuq+8ciI= github.com/coinbase/rosetta-sdk-go v0.7.9 h1:lqllBjMnazTjIqYrOGv8h8jxjg9+hJazIGZr9ZvoCcA= github.com/coinbase/rosetta-sdk-go v0.7.9/go.mod h1:0/knutI7XGVqXmmH4OQD8OckFrbQ8yMsUZTG7FXCR2M= @@ -381,8 +392,6 @@ github.com/cosmos/btcutil v1.0.5 h1:t+ZFcX77LpKtDBhjucvnOH8C2l2ioGsBNEQ3jef8xFk= github.com/cosmos/btcutil v1.0.5/go.mod h1:IyB7iuqZMJlthe2tkIFL33xPyzbFYP0XVdS8P5lUPis= github.com/cosmos/cosmos-proto v1.0.0-beta.2 h1:X3OKvWgK9Gsejo0F1qs5l8Qn6xJV/AzgIWR2wZ8Nua8= github.com/cosmos/cosmos-proto v1.0.0-beta.2/go.mod h1:+XRCLJ14pr5HFEHIUcn51IKXD1Fy3rkEQqt4WqmN4V0= -github.com/cosmos/cosmos-sdk v0.47.4 h1:FVUpEprm58nMmBX4xkRdMDaIG5Nr4yy92HZAfGAw9bg= -github.com/cosmos/cosmos-sdk v0.47.4/go.mod h1:R5n+uM7vguVPFap4pgkdvQCT1nVo/OtPwrlAU40rvok= github.com/cosmos/gaia/v11 v11.0.0-20230724152830-861ba391c3b4 h1:mfMLLg6wbQfZCf0IkdvEWiC3AVXkNgX0vaDZFtdYLs0= github.com/cosmos/gaia/v11 v11.0.0-20230724152830-861ba391c3b4/go.mod h1:6zse9gY32FcZtX9/GYqXPGxneRN7+qpPCi/doXzgK5E= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= @@ -468,6 +477,7 @@ github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1 github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= github.com/eclipse/paho.mqtt.golang v1.2.0/go.mod h1:H9keYFcgq3Qr5OUJm/JZI/i6U7joQ8SYLhZwfeOo6Ts= github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= +github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM= github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= @@ -482,6 +492,7 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7 github.com/ethereum/go-ethereum v1.10.17/go.mod h1:Lt5WzjM07XlXc95YzrhosmR4J9Ahd6X2wyEV2SvGhk0= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= +github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/felixge/httpsnoop v1.0.2 h1:+nS9g82KMXccJ/wp0zyRW9ZBHFETmMGtkk+2CTTrW4o= github.com/felixge/httpsnoop v1.0.2/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= @@ -498,6 +509,8 @@ github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbS github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff/go.mod h1:x7DCsMOv1taUwEWCzT4cmDeAkigA5/QCwUodaVOe8Ww= github.com/getkin/kin-openapi v0.53.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4= github.com/getkin/kin-openapi v0.61.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4= +github.com/getsentry/sentry-go v0.21.0 h1:c9l5F1nPF30JIppulk4veau90PK6Smu3abgVtVQWon4= +github.com/getsentry/sentry-go v0.21.0/go.mod h1:lc76E2QywIyW8WuBnwl8Lc4bkmQH4+w1gwTf25trprY= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= @@ -506,6 +519,7 @@ github.com/gin-gonic/gin v1.8.1 h1:4+fr/el88TOO3ewCmQr8cx/CtZ/umlIRIs5M4NTNjf8= github.com/glycerine/go-unsnap-stream v0.0.0-20180323001048-9f0cb55181dd/go.mod h1:/20jfyN9Y5QPEAprSgKAUr+glWDY39ZiUEAYOEv5dsE= github.com/glycerine/goconvey v0.0.0-20190410193231-58a59202ab31/go.mod h1:Ogl1Tioa0aV7gstGFO7KhffUsb9M4ydbEbbxpcEDc24= github.com/go-chi/chi/v5 v5.0.0/go.mod h1:BBug9lr0cqtdAhsu6R4AAdvufI0/XBzAQSsUqJpoZOs= +github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= @@ -522,6 +536,7 @@ github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi4= github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= +github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod h1:/P9AEU963A2AYjv4d1V5eVL1CQbEJq6aCNHDDjibzu8= github.com/go-ole/go-ole v1.2.1/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dTyBNF8= github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= @@ -552,6 +567,7 @@ github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFG github.com/gogo/googleapis v1.4.1-0.20201022092350-68b0159b7869/go.mod h1:5YRNX2z1oM5gXdAkurHa942MDgEJyk02w4OecKY87+c= github.com/gogo/googleapis v1.4.1 h1:1Yx4Myt7BxzvUr5ldGSbwYiZG6t9wGBZ+8/fX3Wvtq0= github.com/gogo/googleapis v1.4.1/go.mod h1:2lpHqI5OcWCtVElxXnPt+s8oJvMpySlOyM6xDCrzib4= +github.com/gogo/status v1.1.0/go.mod h1:BFv9nrluPLmrS0EmGVvLaPNmRosr9KapBYd5/hpY1WM= github.com/golang-jwt/jwt/v4 v4.3.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= github.com/golang/geo v0.0.0-20190916061304-5b978397cfec/go.mod h1:QZ0nwyI2jOfgRAoBvP+ab5aRr7c9x7lhGEJrKvBwjWI= @@ -796,6 +812,7 @@ github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/u github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= +github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/jsternberg/zap-logfmt v1.0.0/go.mod h1:uvPs/4X51zdkcm5jXl5SYoN+4RK21K8mysFmDaM/h+o= @@ -825,6 +842,7 @@ github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFB github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= @@ -908,6 +926,7 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= +github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5/go.mod h1:caMODM3PzxT8aQXRPkAt8xlV/e7d7w8GM5g0fa5F0D8= github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae/go.mod h1:qAyveg+e4CE+eKJXWVjKXM4ck2QobLqTDytGJbLLhJg= github.com/mtibben/percent v0.2.1 h1:5gssi8Nqo8QU/r2pynCm+hBQHpkB/uNK7BJCFogWdzs= @@ -928,6 +947,9 @@ github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OS github.com/neilotoole/errgroup v0.1.6/go.mod h1:Q2nLGf+594h0CLBs/Mbg6qOr7GtqDK7C2S41udRnToE= github.com/neutron-org/admin-module v0.0.0-20230705134325-b23404470a1d h1:oexw79znoA0TEo7CGdWHrolbvZqCDD3aI+031CbOq9Y= github.com/neutron-org/admin-module v0.0.0-20230705134325-b23404470a1d/go.mod h1:QuxQ7FJlEAFMRssyEYOrR9ORnYQvBFMTlO8BXny6ntw= +github.com/neutron-org/cosmos-sdk v0.47.5-0.20230808152221-a0e301227957 h1:cl6UqD18qV/QXgT6Yjo2TelfbaOqQGuvL1yX0cWguSs= +github.com/neutron-org/cosmos-sdk v0.47.5-0.20230808152221-a0e301227957/go.mod h1:4xMyIVekAs2OEUz/yh9JwzhLBMk+olM2sxgKuQdlhLg= +github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230808084410-6083b888424e h1:uVJCBWf1vcCYY0pzOA2SCPIZT8WsR8fsOxs57mnJbM4= github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230808084410-6083b888424e/go.mod h1:Oagy36cU49438NzxKG/gmGTG903tiAI7LIUdH7x2qNY= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= @@ -982,6 +1004,9 @@ github.com/petermattis/goid v0.0.0-20230518223814-80aa455d8761/go.mod h1:pxMtw7c github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU= github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= +github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= +github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= +github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -1040,7 +1065,9 @@ github.com/rjeczalik/notify v0.9.1/go.mod h1:rKwnCoCGeuQnwBtTSPL9Dad03Vh2n40ePRr github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= +github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= github.com/rs/cors v1.8.3 h1:O+qNyWn7Z+F9M0ILBHgMVPuB1xTOucVd5gtaYyXBpRo= github.com/rs/cors v1.8.3/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= @@ -1054,6 +1081,7 @@ github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= github.com/sasha-s/go-deadlock v0.3.1 h1:sqv7fDNShgjcaxkO0JNcOAlr8B9+cV5Ey/OB71efZx0= github.com/sasha-s/go-deadlock v0.3.1/go.mod h1:F73l+cr82YSh10GxyRI6qZiCgK64VaZjwesgfQ1/iLM= +github.com/schollz/closestmatch v2.1.0+incompatible/go.mod h1:RtP1ddjLong6gTkbtmuhtR2uUrrJOpYzYRvbcPAid+g= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/segmentio/fasthash v1.0.3/go.mod h1:waKX8l2N8yckOgmSsXJi7x1ZfdKZ4x7KRMzBtS3oedY= github.com/segmentio/kafka-go v0.1.0/go.mod h1:X6itGqS9L4jDletMsxZ7Dz+JFWxM6JHfPOCvTvk+EJo= @@ -1150,12 +1178,16 @@ github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0o github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI= +github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8= github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= github.com/vmihailenco/msgpack/v5 v5.3.5/go.mod h1:7xyJ9e+0+9SaZT0Wt1RGleJXzli6Q/V5KbhBonMG9jc= github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds= github.com/willf/bitset v1.1.3/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4= +github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= +github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= +github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xlab/treeprint v0.0.0-20180616005107-d6fb6747feb6/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= From d0b83b7a5ec8c146dadd82528637779ee2b31cf4 Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Tue, 15 Aug 2023 13:07:52 +0400 Subject: [PATCH 031/307] refactor known proposals --- go.mod | 10 +-- go.sum | 4 +- wasmbinding/bindings/msg.go | 4 +- wasmbinding/message_plugin.go | 137 ++++++++++++++++++++-------------- 4 files changed, 91 insertions(+), 64 deletions(-) diff --git a/go.mod b/go.mod index 46f8824f4..27a9e8b04 100644 --- a/go.mod +++ b/go.mod @@ -5,6 +5,7 @@ go 1.20 require ( cosmossdk.io/core v0.5.1 cosmossdk.io/errors v1.0.0-beta.7 + cosmossdk.io/log v1.1.0 cosmossdk.io/math v1.0.1 github.com/CosmWasm/wasmd v0.40.0 github.com/CosmWasm/wasmvm v1.2.4 @@ -24,12 +25,13 @@ require ( github.com/golang/protobuf v1.5.3 github.com/gorilla/mux v1.8.0 github.com/grpc-ecosystem/grpc-gateway v1.16.0 - github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.15.1 + github.com/rs/zerolog v1.29.1 github.com/skip-mev/pob v1.0.3 github.com/spf13/cast v1.5.1 github.com/spf13/cobra v1.7.0 + github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.16.0 github.com/strangelove-ventures/packet-forward-middleware/v7 v7.0.0-20230523193151-73dea436e53f github.com/stretchr/testify v1.8.4 @@ -46,7 +48,6 @@ require ( cloud.google.com/go/storage v1.29.0 // indirect cosmossdk.io/api v0.3.1 // indirect cosmossdk.io/depinject v1.0.0-alpha.3 // indirect - cosmossdk.io/log v1.1.0 // indirect cosmossdk.io/tools/rosetta v0.2.1 // indirect filippo.io/edwards25519 v1.0.0 // indirect github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect @@ -83,7 +84,6 @@ require ( github.com/dvsekhvalnov/jose2go v1.5.0 // indirect github.com/felixge/httpsnoop v1.0.2 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect - github.com/ghodss/yaml v1.0.0 // indirect github.com/go-kit/kit v0.12.0 // indirect github.com/go-kit/log v0.2.1 // indirect github.com/go-logfmt/logfmt v0.6.0 // indirect @@ -146,11 +146,9 @@ require ( github.com/rakyll/statik v0.1.7 // indirect github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect github.com/rs/cors v1.8.3 // indirect - github.com/rs/zerolog v1.29.1 // indirect github.com/sasha-s/go-deadlock v0.3.1 // indirect github.com/spf13/afero v1.9.5 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect - github.com/spf13/pflag v1.0.5 // indirect github.com/subosito/gotenv v1.4.2 // indirect github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect github.com/tendermint/go-amino v0.16.0 // indirect @@ -184,7 +182,7 @@ replace ( github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0 github.com/ChainSafe/go-schnorrkel => github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d github.com/CosmWasm/wasmd => github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230705143547-22c391d461d5 - github.com/cosmos/admin-module => github.com/neutron-org/admin-module v0.0.0-20230705134325-b23404470a1d + github.com/cosmos/admin-module => github.com/neutron-org/admin-module v0.0.0-20230815080844-fd586638657d github.com/cosmos/gaia/v11 => github.com/cosmos/gaia/v11 v11.0.0-20230724152830-861ba391c3b4 github.com/cosmos/ledger-cosmos-go => github.com/cosmos/ledger-cosmos-go v0.12.1 github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 diff --git a/go.sum b/go.sum index 5d3442aab..6a13cf7a4 100644 --- a/go.sum +++ b/go.sum @@ -499,7 +499,6 @@ github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbS github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff/go.mod h1:x7DCsMOv1taUwEWCzT4cmDeAkigA5/QCwUodaVOe8Ww= github.com/getkin/kin-openapi v0.53.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4= github.com/getkin/kin-openapi v0.61.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4= -github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= @@ -699,8 +698,6 @@ github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgf github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0/go.mod h1:YN5jB8ie0yfIUg6VvR9Kz84aCaG7AsGZnLjhHbUqwPg= github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c h1:6rhixN/i8ZofjG1Y75iExal34USq5p+wiN1tpie8IrU= github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c/go.mod h1:NMPJylDgVpX0MLRlPy15sqSwOFv/U1GZ2m21JhFfek0= github.com/gtank/merlin v0.1.1-0.20191105220539-8318aed1a79f/go.mod h1:T86dnYJhcGOh5BjZFCJWTDeTK7XW8uE+E21Cy/bIQ+s= @@ -932,6 +929,7 @@ github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OS github.com/neilotoole/errgroup v0.1.6/go.mod h1:Q2nLGf+594h0CLBs/Mbg6qOr7GtqDK7C2S41udRnToE= github.com/neutron-org/admin-module v0.0.0-20230705134325-b23404470a1d h1:oexw79znoA0TEo7CGdWHrolbvZqCDD3aI+031CbOq9Y= github.com/neutron-org/admin-module v0.0.0-20230705134325-b23404470a1d/go.mod h1:QuxQ7FJlEAFMRssyEYOrR9ORnYQvBFMTlO8BXny6ntw= +github.com/neutron-org/admin-module v0.0.0-20230815080844-fd586638657d/go.mod h1:QuxQ7FJlEAFMRssyEYOrR9ORnYQvBFMTlO8BXny6ntw= github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230705143547-22c391d461d5 h1:2YQaqP5W3F+5VH0IAA7m8OHjkwONxQDqXUwo5tzKdDU= github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230705143547-22c391d461d5/go.mod h1:l699csQZeRKYqF8R9JoYoQ6E0j4PfDM3Ln7EawtUwJE= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= diff --git a/wasmbinding/bindings/msg.go b/wasmbinding/bindings/msg.go index 8dcccba8f..f39146ae6 100644 --- a/wasmbinding/bindings/msg.go +++ b/wasmbinding/bindings/msg.go @@ -107,7 +107,9 @@ type ParamChangeProposal struct { } type SoftwareUpgradeProposal struct { - Title string `json:"title"` + // deprecated + Title string `json:"title"` + // deprecated Description string `json:"description"` Plan Plan `json:"plan"` } diff --git a/wasmbinding/message_plugin.go b/wasmbinding/message_plugin.go index 4fc27b93c..f73246bab 100644 --- a/wasmbinding/message_plugin.go +++ b/wasmbinding/message_plugin.go @@ -295,6 +295,21 @@ func (m *CustomMessenger) submitTx(ctx sdk.Context, contractAddr sdk.AccAddress, } func (m *CustomMessenger) submitAdminProposal(ctx sdk.Context, contractAddr sdk.AccAddress, submitAdminProposal *bindings.SubmitAdminProposal) ([]sdk.Event, [][]byte, error) { + var data []byte + if submitAdminProposal.AdminProposal.ParamChangeProposal != nil || submitAdminProposal.AdminProposal.UpgradeProposal != nil || submitAdminProposal.AdminProposal.CancelSoftwareUpgradeProposal != nil { + resp, err := m.performSubmitAdminProposalLegacy(ctx, contractAddr, submitAdminProposal) + data, err = json.Marshal(resp) + if err != nil { + ctx.Logger().Error("json.Marshal: failed to marshal submitAdminProposalLegacy response to JSON", + "from_address", contractAddr.String(), + "creator", contractAddr.String(), + "error", err, + ) + return nil, nil, errors.Wrap(err, "marshal json failed") + } + return nil, [][]byte{data}, nil + } + response, err := m.performSubmitAdminProposal(ctx, contractAddr, submitAdminProposal) if err != nil { ctx.Logger().Debug("performSubmitAdminProposal: failed to submitAdminProposal", @@ -305,7 +320,7 @@ func (m *CustomMessenger) submitAdminProposal(ctx sdk.Context, contractAddr sdk. return nil, nil, errors.Wrap(err, "failed to submit admin proposal") } - data, err := json.Marshal(response) + data, err = json.Marshal(response) if err != nil { ctx.Logger().Error("json.Marshal: failed to marshal submitAdminProposal response to JSON", "from_address", contractAddr.String(), @@ -322,17 +337,17 @@ func (m *CustomMessenger) submitAdminProposal(ctx sdk.Context, contractAddr sdk. return nil, [][]byte{data}, nil } -func (m *CustomMessenger) performSubmitAdminProposal(ctx sdk.Context, contractAddr sdk.AccAddress, submitAdminProposal *bindings.SubmitAdminProposal) (*admintypes.MsgSubmitProposalResponse, error) { - msg := admintypes.MsgSubmitProposal{Proposer: contractAddr.String()} +func (m *CustomMessenger) performSubmitAdminProposalLegacy(ctx sdk.Context, contractAddr sdk.AccAddress, submitAdminProposal *bindings.SubmitAdminProposal) (*admintypes.MsgSubmitProposalLegacyResponse, error) { proposal := submitAdminProposal.AdminProposal + msg := admintypes.MsgSubmitProposalLegacy{Proposer: contractAddr.String()} err := m.validateProposalQty(&proposal) if err != nil { return nil, errors.Wrap(err, "failed to validate proposal quantity") } - if proposal.ParamChangeProposal != nil { + if submitAdminProposal.AdminProposal.ParamChangeProposal != nil { p := proposal.ParamChangeProposal - err := msg.SetContent(¶mChange.ParameterChangeProposal{ + err = msg.SetContent(¶mChange.ParameterChangeProposal{ Title: p.Title, Description: p.Description, Changes: p.ParamChanges, @@ -340,35 +355,8 @@ func (m *CustomMessenger) performSubmitAdminProposal(ctx sdk.Context, contractAd if err != nil { return nil, errors.Wrap(err, "failed to set content on ParameterChangeProposal") } - } - if proposal.SoftwareUpgradeProposal != nil { - p := proposal.SoftwareUpgradeProposal - err := msg.SetContent(&softwareUpgrade.SoftwareUpgradeProposal{ - Title: p.Title, - Description: p.Description, - Plan: softwareUpgrade.Plan{ - Name: p.Plan.Name, - Height: p.Plan.Height, - Info: p.Plan.Info, - }, - }) - if err != nil { - return nil, errors.Wrap(err, "failed to set content on SoftwareUpgradeProposal") - } } - - if proposal.CancelSoftwareUpgradeProposal != nil { - p := proposal.CancelSoftwareUpgradeProposal - err := msg.SetContent(&softwareUpgrade.CancelSoftwareUpgradeProposal{ - Title: p.Title, - Description: p.Description, - }) - if err != nil { - return nil, errors.Wrap(err, "failed to set content on CancelSoftwareUpgradeProposal") - } - } - if proposal.UpgradeProposal != nil { p := proposal.UpgradeProposal err := msg.SetContent(&ibcclienttypes.UpgradeProposal{ @@ -399,13 +387,59 @@ func (m *CustomMessenger) performSubmitAdminProposal(ctx sdk.Context, contractAd } } + if err := msg.ValidateBasic(); err != nil { + return nil, errors.Wrap(err, "failed to validate incoming SubmitAdminProposal message") + } + + response, err := m.Adminserver.SubmitProposalLegacy(sdk.WrapSDKContext(ctx), &msg) + if err != nil { + return nil, errors.Wrap(err, "failed to submit proposal") + } + + return response, nil +} + +func (m *CustomMessenger) performSubmitAdminProposal(ctx sdk.Context, contractAddr sdk.AccAddress, submitAdminProposal *bindings.SubmitAdminProposal) (*admintypes.MsgSubmitProposalResponse, error) { + proposal := submitAdminProposal.AdminProposal + var msg *admintypes.MsgSubmitProposal + var sdkMsgs []sdk.Msg + var sdkMsg sdk.Msg + + err := m.validateProposalQty(&proposal) + if err != nil { + return nil, errors.Wrap(err, "failed to validate proposal quantity") + } + + if proposal.SoftwareUpgradeProposal != nil { + p := proposal.SoftwareUpgradeProposal + sdkMsg = &softwareUpgrade.MsgSoftwareUpgrade{ + Plan: softwareUpgrade.Plan{ + Name: p.Plan.Name, + Height: p.Plan.Height, + Info: p.Plan.Info, + }, + } + sdkMsgs = append(sdkMsgs, sdkMsg) + msg, err = admintypes.NewMsgSubmitProposal(sdkMsgs, contractAddr) + if err != nil { + return nil, errors.Wrap(err, "failed to set content on SoftwareUpgradeProposal") + } + } + + if proposal.CancelSoftwareUpgradeProposal != nil { + sdkMsg = &softwareUpgrade.MsgCancelUpgrade{} + sdkMsgs = append(sdkMsgs, sdkMsg) + msg, err = admintypes.NewMsgSubmitProposal(sdkMsgs, contractAddr) + if err != nil { + return nil, errors.Wrap(err, "failed to set content on SoftwareUpgradeProposal") + } + } + if proposal.PinCodesProposal != nil { p := proposal.PinCodesProposal - err := msg.SetContent(&wasmtypes.PinCodesProposal{ - Title: p.Title, - Description: p.Description, - CodeIDs: p.CodeIDs, - }) + sdkMsg = &wasmtypes.MsgPinCodes{CodeIDs: p.CodeIDs} + sdkMsgs = append(sdkMsgs, sdkMsg) + msg, err = admintypes.NewMsgSubmitProposal(sdkMsgs, contractAddr) if err != nil { return nil, errors.Wrap(err, "failed to set content on PinCodesProposal") } @@ -413,11 +447,9 @@ func (m *CustomMessenger) performSubmitAdminProposal(ctx sdk.Context, contractAd if proposal.UnpinCodesProposal != nil { p := proposal.UnpinCodesProposal - err := msg.SetContent(&wasmtypes.UnpinCodesProposal{ - Title: p.Title, - Description: p.Description, - CodeIDs: p.CodeIDs, - }) + sdkMsg = &wasmtypes.MsgUnpinCodes{CodeIDs: p.CodeIDs} + sdkMsgs = append(sdkMsgs, sdkMsg) + msg, err = admintypes.NewMsgSubmitProposal(sdkMsgs, contractAddr) if err != nil { return nil, errors.Wrap(err, "failed to set content on UnpinCodesProposal") } @@ -425,12 +457,11 @@ func (m *CustomMessenger) performSubmitAdminProposal(ctx sdk.Context, contractAd if proposal.UpdateAdminProposal != nil { p := proposal.UpdateAdminProposal - err := msg.SetContent(&wasmtypes.UpdateAdminProposal{ - Title: p.Title, - Description: p.Description, - NewAdmin: p.NewAdmin, - Contract: p.Contract, - }) + sdkMsg = &wasmtypes.MsgUpdateAdmin{ + + NewAdmin: p.NewAdmin, + Contract: p.Contract, + } if err != nil { return nil, errors.Wrap(err, "failed to set content on UpdateAdminProposal") } @@ -438,11 +469,9 @@ func (m *CustomMessenger) performSubmitAdminProposal(ctx sdk.Context, contractAd if proposal.ClearAdminProposal != nil { p := proposal.ClearAdminProposal - err := msg.SetContent(&wasmtypes.ClearAdminProposal{ - Title: p.Title, - Description: p.Description, - Contract: p.Contract, - }) + sdkMsg = &wasmtypes.MsgClearAdmin{ + Contract: p.Contract, + } if err != nil { return nil, errors.Wrap(err, "failed to set content on ClearAdminProposal") } @@ -452,7 +481,7 @@ func (m *CustomMessenger) performSubmitAdminProposal(ctx sdk.Context, contractAd return nil, errors.Wrap(err, "failed to validate incoming SubmitAdminProposal message") } - response, err := m.Adminserver.SubmitProposal(sdk.WrapSDKContext(ctx), &msg) + response, err := m.Adminserver.SubmitProposal(sdk.WrapSDKContext(ctx), msg) if err != nil { return nil, errors.Wrap(err, "failed to submit proposal") } From 0512cef7205ad7f6099ec5ca9655004eb8d8ffd3 Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Tue, 15 Aug 2023 13:32:23 +0400 Subject: [PATCH 032/307] ref & add new binding --- wasmbinding/bindings/msg.go | 6 +++++ wasmbinding/message_plugin.go | 43 +++++++++++++---------------------- 2 files changed, 22 insertions(+), 27 deletions(-) diff --git a/wasmbinding/bindings/msg.go b/wasmbinding/bindings/msg.go index f39146ae6..de2058fa0 100644 --- a/wasmbinding/bindings/msg.go +++ b/wasmbinding/bindings/msg.go @@ -98,6 +98,7 @@ type AdminProposal struct { UnpinCodesProposal *UnpinCodesProposal `json:"unpin_codes_proposal,omitempty"` UpdateAdminProposal *UpdateAdminProposal `json:"update_admin_proposal,omitempty"` ClearAdminProposal *ClearAdminProposal `json:"clear_admin_proposal,omitempty"` + ParamChangeNewProposal *ParamChangeNewProposal `json:"param_change_new_proposal,omitempty"` } type ParamChangeProposal struct { @@ -184,6 +185,11 @@ type ClearAdminProposal struct { Contract string `json:"contract,omitempty"` } +type ParamChangeNewProposal struct { + Module string `json:"module,omitempty"` + NewParams string `json:"new_params,omitempty"` +} + // CreateDenom creates a new factory denom, of denomination: // factory/{creating contract address}/{Subdenom} // Subdenom can be of length at most 44 characters, in [0-9a-zA-Z./] diff --git a/wasmbinding/message_plugin.go b/wasmbinding/message_plugin.go index f73246bab..b9e8b1d28 100644 --- a/wasmbinding/message_plugin.go +++ b/wasmbinding/message_plugin.go @@ -401,15 +401,16 @@ func (m *CustomMessenger) performSubmitAdminProposalLegacy(ctx sdk.Context, cont func (m *CustomMessenger) performSubmitAdminProposal(ctx sdk.Context, contractAddr sdk.AccAddress, submitAdminProposal *bindings.SubmitAdminProposal) (*admintypes.MsgSubmitProposalResponse, error) { proposal := submitAdminProposal.AdminProposal - var msg *admintypes.MsgSubmitProposal - var sdkMsgs []sdk.Msg - var sdkMsg sdk.Msg err := m.validateProposalQty(&proposal) if err != nil { return nil, errors.Wrap(err, "failed to validate proposal quantity") } + var msg *admintypes.MsgSubmitProposal + var sdkMsgs []sdk.Msg + var sdkMsg sdk.Msg + if proposal.SoftwareUpgradeProposal != nil { p := proposal.SoftwareUpgradeProposal sdkMsg = &softwareUpgrade.MsgSoftwareUpgrade{ @@ -419,40 +420,20 @@ func (m *CustomMessenger) performSubmitAdminProposal(ctx sdk.Context, contractAd Info: p.Plan.Info, }, } - sdkMsgs = append(sdkMsgs, sdkMsg) - msg, err = admintypes.NewMsgSubmitProposal(sdkMsgs, contractAddr) - if err != nil { - return nil, errors.Wrap(err, "failed to set content on SoftwareUpgradeProposal") - } } if proposal.CancelSoftwareUpgradeProposal != nil { sdkMsg = &softwareUpgrade.MsgCancelUpgrade{} - sdkMsgs = append(sdkMsgs, sdkMsg) - msg, err = admintypes.NewMsgSubmitProposal(sdkMsgs, contractAddr) - if err != nil { - return nil, errors.Wrap(err, "failed to set content on SoftwareUpgradeProposal") - } } if proposal.PinCodesProposal != nil { p := proposal.PinCodesProposal sdkMsg = &wasmtypes.MsgPinCodes{CodeIDs: p.CodeIDs} - sdkMsgs = append(sdkMsgs, sdkMsg) - msg, err = admintypes.NewMsgSubmitProposal(sdkMsgs, contractAddr) - if err != nil { - return nil, errors.Wrap(err, "failed to set content on PinCodesProposal") - } } if proposal.UnpinCodesProposal != nil { p := proposal.UnpinCodesProposal sdkMsg = &wasmtypes.MsgUnpinCodes{CodeIDs: p.CodeIDs} - sdkMsgs = append(sdkMsgs, sdkMsg) - msg, err = admintypes.NewMsgSubmitProposal(sdkMsgs, contractAddr) - if err != nil { - return nil, errors.Wrap(err, "failed to set content on UnpinCodesProposal") - } } if proposal.UpdateAdminProposal != nil { @@ -462,9 +443,6 @@ func (m *CustomMessenger) performSubmitAdminProposal(ctx sdk.Context, contractAd NewAdmin: p.NewAdmin, Contract: p.Contract, } - if err != nil { - return nil, errors.Wrap(err, "failed to set content on UpdateAdminProposal") - } } if proposal.ClearAdminProposal != nil { @@ -472,11 +450,22 @@ func (m *CustomMessenger) performSubmitAdminProposal(ctx sdk.Context, contractAd sdkMsg = &wasmtypes.MsgClearAdmin{ Contract: p.Contract, } + } + + if proposal.ParamChangeNewProposal != nil { + p := proposal.ParamChangeNewProposal + myJsonString := fmt.Sprintf(`{"authority":"%s", "params": "%s"}`, "neutronaddr", p.NewParams) + sdkMsg = m.AdminKeeper.RegisteredModulesUpdateParams[p.Module].UpdateParamsMsg + err := json.Unmarshal([]byte(myJsonString), sdkMsg) if err != nil { - return nil, errors.Wrap(err, "failed to set content on ClearAdminProposal") + return nil, errors.Wrap(err, "failed to marshal incoming UpdateParams message") + } } + sdkMsgs = append(sdkMsgs, sdkMsg) + msg, err = admintypes.NewMsgSubmitProposal(sdkMsgs, contractAddr) + if err := msg.ValidateBasic(); err != nil { return nil, errors.Wrap(err, "failed to validate incoming SubmitAdminProposal message") } From 73025c565117930dafa37108d7bed5064ec36222 Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Tue, 15 Aug 2023 13:57:36 +0400 Subject: [PATCH 033/307] update admin module --- app/app.go | 16 ++++++++++------ go.mod | 2 +- go.sum | 1 + 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/app/app.go b/app/app.go index 6c9e793a6..b28dfe161 100644 --- a/app/app.go +++ b/app/app.go @@ -629,18 +629,21 @@ func New( supportedFeatures := "iterator,stargate,staking,neutron,cosmwasm_1_1,cosmwasm_1_2" // register the proposal types - adminRouter := govv1beta1.NewRouter() - adminRouter.AddRoute(govtypes.RouterKey, govv1beta1.ProposalHandler). + adminRouterLegacy := govv1beta1.NewRouter() + adminRouterLegacy.AddRoute(govtypes.RouterKey, govv1beta1.ProposalHandler). AddRoute(paramproposal.RouterKey, params.NewParamChangeProposalHandler(app.ParamsKeeper)). AddRoute(upgradetypes.RouterKey, upgrade.NewSoftwareUpgradeProposalHandler(&app.UpgradeKeeper)). AddRoute(ibchost.RouterKey, ibcclient.NewClientProposalHandler(app.IBCKeeper.ClientKeeper)) + keeperModules := map[string]adminmodulemodulekeeper.RegisteredModuleUpdateParams{"bank": {UpdateParamsMsg: &banktypes.MsgUpdateParams{}}} app.AdminmoduleKeeper = *adminmodulemodulekeeper.NewKeeper( appCodec, keys[adminmodulemoduletypes.StoreKey], keys[adminmodulemoduletypes.MemStoreKey], - adminRouter, + adminRouterLegacy, + app.MsgServiceRouter(), IsConsumerProposalAllowlisted, + keeperModules, ) adminModule := adminmodulemodule.NewAppModule(appCodec, app.AdminmoduleKeeper) @@ -696,9 +699,10 @@ func New( app.CronKeeper.WasmMsgServer = wasmkeeper.NewMsgServerImpl(&app.WasmKeeper) cronModule := cron.NewAppModule(appCodec, &app.CronKeeper) - if len(enabledProposals) != 0 { - app.AdminmoduleKeeper.Router().AddRoute(wasm.RouterKey, wasm.NewWasmProposalHandler(app.WasmKeeper, enabledProposals)) - } + // TODO: enabled proposals? + //if len(enabledProposals) != 0 { + // app.AdminmoduleKeeper.Router().AddRoute(wasm.RouterKey, wasm.NewWasmProposalHandler(app.WasmKeeper, enabledProposals)) + //} transferIBCModule := transferSudo.NewIBCModule(app.TransferKeeper) // receive call order: wasmHooks#OnRecvPacketOverride(transferIbcModule#OnRecvPacket()) ibcHooksMiddleware := ibchooks.NewIBCMiddleware(&transferIBCModule, &app.HooksICS4Wrapper) diff --git a/go.mod b/go.mod index 27a9e8b04..ea11feaec 100644 --- a/go.mod +++ b/go.mod @@ -182,7 +182,7 @@ replace ( github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0 github.com/ChainSafe/go-schnorrkel => github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d github.com/CosmWasm/wasmd => github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230705143547-22c391d461d5 - github.com/cosmos/admin-module => github.com/neutron-org/admin-module v0.0.0-20230815080844-fd586638657d + github.com/cosmos/admin-module => github.com/neutron-org/admin-module v0.0.0-20230815095050-77591ac62d26 github.com/cosmos/gaia/v11 => github.com/cosmos/gaia/v11 v11.0.0-20230724152830-861ba391c3b4 github.com/cosmos/ledger-cosmos-go => github.com/cosmos/ledger-cosmos-go v0.12.1 github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 diff --git a/go.sum b/go.sum index 6a13cf7a4..7aa9492e0 100644 --- a/go.sum +++ b/go.sum @@ -930,6 +930,7 @@ github.com/neilotoole/errgroup v0.1.6/go.mod h1:Q2nLGf+594h0CLBs/Mbg6qOr7GtqDK7C github.com/neutron-org/admin-module v0.0.0-20230705134325-b23404470a1d h1:oexw79znoA0TEo7CGdWHrolbvZqCDD3aI+031CbOq9Y= github.com/neutron-org/admin-module v0.0.0-20230705134325-b23404470a1d/go.mod h1:QuxQ7FJlEAFMRssyEYOrR9ORnYQvBFMTlO8BXny6ntw= github.com/neutron-org/admin-module v0.0.0-20230815080844-fd586638657d/go.mod h1:QuxQ7FJlEAFMRssyEYOrR9ORnYQvBFMTlO8BXny6ntw= +github.com/neutron-org/admin-module v0.0.0-20230815095050-77591ac62d26/go.mod h1:QuxQ7FJlEAFMRssyEYOrR9ORnYQvBFMTlO8BXny6ntw= github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230705143547-22c391d461d5 h1:2YQaqP5W3F+5VH0IAA7m8OHjkwONxQDqXUwo5tzKdDU= github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230705143547-22c391d461d5/go.mod h1:l699csQZeRKYqF8R9JoYoQ6E0j4PfDM3Ln7EawtUwJE= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= From b86ff0546001e45653df40971dad289abe21886d Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Tue, 15 Aug 2023 14:52:52 +0400 Subject: [PATCH 034/307] smol upd --- app/app.go | 18 +++++++++--------- wasmbinding/message_plugin.go | 30 +++++++++++++++++++----------- 2 files changed, 28 insertions(+), 20 deletions(-) diff --git a/app/app.go b/app/app.go index b28dfe161..ba6430bd5 100644 --- a/app/app.go +++ b/app/app.go @@ -421,7 +421,7 @@ func New( app.ParamsKeeper = initParamsKeeper(appCodec, legacyAmino, keys[paramstypes.StoreKey], tkeys[paramstypes.TStoreKey]) // set the BaseApp's parameter store - app.ConsensusParamsKeeper = consensusparamkeeper.NewKeeper(appCodec, keys[consensusparamtypes.StoreKey], authtypes.NewModuleAddress(govtypes.ModuleName).String()) + app.ConsensusParamsKeeper = consensusparamkeeper.NewKeeper(appCodec, keys[consensusparamtypes.StoreKey], authtypes.NewModuleAddress(adminmodulemoduletypes.ModuleName).String()) bApp.SetParamStore(&app.ConsensusParamsKeeper) // add capability keeper and ScopeToModule for ibc module @@ -443,7 +443,7 @@ func New( authtypes.ProtoBaseAccount, maccPerms, sdk.GetConfig().GetBech32AccountAddrPrefix(), - authtypes.NewModuleAddress(govtypes.ModuleName).String(), + authtypes.NewModuleAddress(adminmodulemoduletypes.ModuleName).String(), ) app.AuthzKeeper = authzkeeper.NewKeeper( @@ -455,7 +455,7 @@ func New( keys[banktypes.StoreKey], app.AccountKeeper, app.BlockedAddrs(), - authtypes.NewModuleAddress(govtypes.ModuleName).String(), + authtypes.NewModuleAddress(adminmodulemoduletypes.ModuleName).String(), ) app.SlashingKeeper = slashingkeeper.NewKeeper( @@ -463,7 +463,7 @@ func New( legacyAmino, keys[slashingtypes.StoreKey], &app.ConsumerKeeper, - authtypes.NewModuleAddress(govtypes.ModuleName).String(), + authtypes.NewModuleAddress(adminmodulemoduletypes.ModuleName).String(), ) app.CrisisKeeper = *crisiskeeper.NewKeeper( appCodec, @@ -471,7 +471,7 @@ func New( invCheckPeriod, app.BankKeeper, authtypes.FeeCollectorName, - authtypes.NewModuleAddress(govtypes.ModuleName).String(), + authtypes.NewModuleAddress(adminmodulemoduletypes.ModuleName).String(), ) app.FeeGrantKeeper = feegrantkeeper.NewKeeper(appCodec, keys[feegrant.StoreKey], app.AccountKeeper) @@ -481,7 +481,7 @@ func New( appCodec, homePath, app.BaseApp, - authtypes.NewModuleAddress(govtypes.ModuleName).String(), + authtypes.NewModuleAddress(adminmodulemoduletypes.ModuleName).String(), ) // ... other modules keepers @@ -612,7 +612,7 @@ func New( app.BankKeeper, // 25% of rewards should be sent to the redistribute address rewardsaddressprovider.NewFixedAddressRewardsAddressProvider(app.AccountKeeper.GetModuleAddress(ccvconsumertypes.ConsumerRedistributeName)), - authtypes.NewModuleAddress(govtypes.ModuleName).String(), + authtypes.NewModuleAddress(adminmodulemoduletypes.ModuleName).String(), ) wasmDir := filepath.Join(homePath, "wasm") @@ -635,7 +635,7 @@ func New( AddRoute(upgradetypes.RouterKey, upgrade.NewSoftwareUpgradeProposalHandler(&app.UpgradeKeeper)). AddRoute(ibchost.RouterKey, ibcclient.NewClientProposalHandler(app.IBCKeeper.ClientKeeper)) - keeperModules := map[string]adminmodulemodulekeeper.RegisteredModuleUpdateParams{"bank": {UpdateParamsMsg: &banktypes.MsgUpdateParams{}}} + keeperModules := map[string]adminmodulemodulekeeper.RegisteredModuleUpdateParams{wasm.ModuleName: {UpdateParamsMsg: &wasmtypes.MsgUpdateParams{}}} app.AdminmoduleKeeper = *adminmodulemodulekeeper.NewKeeper( appCodec, keys[adminmodulemoduletypes.StoreKey], @@ -691,7 +691,7 @@ func New( wasmDir, wasmConfig, supportedFeatures, - authtypes.NewModuleAddress(govtypes.ModuleName).String(), + authtypes.NewModuleAddress(adminmodulemoduletypes.ModuleName).String(), wasmOpts..., ) wasmHooks.ContractKeeper = &app.WasmKeeper diff --git a/wasmbinding/message_plugin.go b/wasmbinding/message_plugin.go index b9e8b1d28..32aae0ec9 100644 --- a/wasmbinding/message_plugin.go +++ b/wasmbinding/message_plugin.go @@ -5,6 +5,7 @@ import ( "fmt" "cosmossdk.io/errors" + authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" crontypes "github.com/neutron-org/neutron/x/cron/types" @@ -401,6 +402,7 @@ func (m *CustomMessenger) performSubmitAdminProposalLegacy(ctx sdk.Context, cont func (m *CustomMessenger) performSubmitAdminProposal(ctx sdk.Context, contractAddr sdk.AccAddress, submitAdminProposal *bindings.SubmitAdminProposal) (*admintypes.MsgSubmitProposalResponse, error) { proposal := submitAdminProposal.AdminProposal + authority := authtypes.NewModuleAddress(admintypes.ModuleName).String() err := m.validateProposalQty(&proposal) if err != nil { @@ -414,6 +416,7 @@ func (m *CustomMessenger) performSubmitAdminProposal(ctx sdk.Context, contractAd if proposal.SoftwareUpgradeProposal != nil { p := proposal.SoftwareUpgradeProposal sdkMsg = &softwareUpgrade.MsgSoftwareUpgrade{ + Authority: authority, Plan: softwareUpgrade.Plan{ Name: p.Plan.Name, Height: p.Plan.Height, @@ -423,23 +426,23 @@ func (m *CustomMessenger) performSubmitAdminProposal(ctx sdk.Context, contractAd } if proposal.CancelSoftwareUpgradeProposal != nil { - sdkMsg = &softwareUpgrade.MsgCancelUpgrade{} + sdkMsg = &softwareUpgrade.MsgCancelUpgrade{Authority: authority} } if proposal.PinCodesProposal != nil { p := proposal.PinCodesProposal - sdkMsg = &wasmtypes.MsgPinCodes{CodeIDs: p.CodeIDs} + sdkMsg = &wasmtypes.MsgPinCodes{Authority: authority, CodeIDs: p.CodeIDs} } if proposal.UnpinCodesProposal != nil { p := proposal.UnpinCodesProposal - sdkMsg = &wasmtypes.MsgUnpinCodes{CodeIDs: p.CodeIDs} + sdkMsg = &wasmtypes.MsgUnpinCodes{Authority: authority, CodeIDs: p.CodeIDs} } if proposal.UpdateAdminProposal != nil { p := proposal.UpdateAdminProposal sdkMsg = &wasmtypes.MsgUpdateAdmin{ - + Sender: authority, NewAdmin: p.NewAdmin, Contract: p.Contract, } @@ -448,21 +451,26 @@ func (m *CustomMessenger) performSubmitAdminProposal(ctx sdk.Context, contractAd if proposal.ClearAdminProposal != nil { p := proposal.ClearAdminProposal sdkMsg = &wasmtypes.MsgClearAdmin{ + Sender: authority, Contract: p.Contract, } } if proposal.ParamChangeNewProposal != nil { p := proposal.ParamChangeNewProposal - myJsonString := fmt.Sprintf(`{"authority":"%s", "params": "%s"}`, "neutronaddr", p.NewParams) - sdkMsg = m.AdminKeeper.RegisteredModulesUpdateParams[p.Module].UpdateParamsMsg - err := json.Unmarshal([]byte(myJsonString), sdkMsg) - if err != nil { - return nil, errors.Wrap(err, "failed to marshal incoming UpdateParams message") - + myJsonString := fmt.Sprintf(`{"authority":"%s", "params": "%s"}`, authority, p.NewParams) + module, ok := m.AdminKeeper.RegisteredModulesUpdateParams[p.Module] + if ok { + sdkMsg = module.UpdateParamsMsg + err := json.Unmarshal([]byte(myJsonString), sdkMsg) + if err != nil { + return nil, errors.Wrap(err, "failed to marshal incoming UpdateParams message") + + } + } else { + return nil, errors.Wrap(err, "module is not registered to update params") } } - sdkMsgs = append(sdkMsgs, sdkMsg) msg, err = admintypes.NewMsgSubmitProposal(sdkMsgs, contractAddr) From bf6aed9fd365f388238e2248bfcb5b79c6b7265c Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Tue, 15 Aug 2023 14:57:55 +0400 Subject: [PATCH 035/307] gosum --- go.sum | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/go.sum b/go.sum index 7aa9492e0..964084b5f 100644 --- a/go.sum +++ b/go.sum @@ -927,9 +927,7 @@ github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxzi github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/neilotoole/errgroup v0.1.6/go.mod h1:Q2nLGf+594h0CLBs/Mbg6qOr7GtqDK7C2S41udRnToE= -github.com/neutron-org/admin-module v0.0.0-20230705134325-b23404470a1d h1:oexw79znoA0TEo7CGdWHrolbvZqCDD3aI+031CbOq9Y= -github.com/neutron-org/admin-module v0.0.0-20230705134325-b23404470a1d/go.mod h1:QuxQ7FJlEAFMRssyEYOrR9ORnYQvBFMTlO8BXny6ntw= -github.com/neutron-org/admin-module v0.0.0-20230815080844-fd586638657d/go.mod h1:QuxQ7FJlEAFMRssyEYOrR9ORnYQvBFMTlO8BXny6ntw= +github.com/neutron-org/admin-module v0.0.0-20230815095050-77591ac62d26 h1:Aycti/vu5GFMOYecB1hPuOU4XqUC6TMOhfWITElp1B4= github.com/neutron-org/admin-module v0.0.0-20230815095050-77591ac62d26/go.mod h1:QuxQ7FJlEAFMRssyEYOrR9ORnYQvBFMTlO8BXny6ntw= github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230705143547-22c391d461d5 h1:2YQaqP5W3F+5VH0IAA7m8OHjkwONxQDqXUwo5tzKdDU= github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230705143547-22c391d461d5/go.mod h1:l699csQZeRKYqF8R9JoYoQ6E0j4PfDM3Ln7EawtUwJE= From f5fb999f5d687f0ab5316e5a43dcaca37971bdd2 Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Tue, 15 Aug 2023 16:06:40 +0400 Subject: [PATCH 036/307] upd module --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index ea11feaec..8f4fca84d 100644 --- a/go.mod +++ b/go.mod @@ -182,7 +182,7 @@ replace ( github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0 github.com/ChainSafe/go-schnorrkel => github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d github.com/CosmWasm/wasmd => github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230705143547-22c391d461d5 - github.com/cosmos/admin-module => github.com/neutron-org/admin-module v0.0.0-20230815095050-77591ac62d26 + github.com/cosmos/admin-module => github.com/neutron-org/admin-module v0.0.0-20230815120514-97237f8409d1 github.com/cosmos/gaia/v11 => github.com/cosmos/gaia/v11 v11.0.0-20230724152830-861ba391c3b4 github.com/cosmos/ledger-cosmos-go => github.com/cosmos/ledger-cosmos-go v0.12.1 github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 diff --git a/go.sum b/go.sum index 964084b5f..504b3d374 100644 --- a/go.sum +++ b/go.sum @@ -927,8 +927,8 @@ github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxzi github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/neilotoole/errgroup v0.1.6/go.mod h1:Q2nLGf+594h0CLBs/Mbg6qOr7GtqDK7C2S41udRnToE= -github.com/neutron-org/admin-module v0.0.0-20230815095050-77591ac62d26 h1:Aycti/vu5GFMOYecB1hPuOU4XqUC6TMOhfWITElp1B4= -github.com/neutron-org/admin-module v0.0.0-20230815095050-77591ac62d26/go.mod h1:QuxQ7FJlEAFMRssyEYOrR9ORnYQvBFMTlO8BXny6ntw= +github.com/neutron-org/admin-module v0.0.0-20230815120514-97237f8409d1 h1:beWeivCs5O4uMun+Hc+wM68ZpZTmy5o2Q5JtdbqfhoE= +github.com/neutron-org/admin-module v0.0.0-20230815120514-97237f8409d1/go.mod h1:QuxQ7FJlEAFMRssyEYOrR9ORnYQvBFMTlO8BXny6ntw= github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230705143547-22c391d461d5 h1:2YQaqP5W3F+5VH0IAA7m8OHjkwONxQDqXUwo5tzKdDU= github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230705143547-22c391d461d5/go.mod h1:l699csQZeRKYqF8R9JoYoQ6E0j4PfDM3Ln7EawtUwJE= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= From a9235e3eddae5990057dc5902bb2e33e4235b8e3 Mon Sep 17 00:00:00 2001 From: nhpd Date: Wed, 16 Aug 2023 14:13:19 +0400 Subject: [PATCH 037/307] add failures query binding and upgrade for failures state --- app/upgrades/nextupgrade/upgrades.go | 51 ++- app/upgrades/nextupgrade/upgrades_test.go | 99 +++++ app/upgrades/types.go | 6 +- proto/neutron/contractmanager/genesis.proto | 22 +- wasmbinding/bindings/query.go | 14 + wasmbinding/custom_querier.go | 13 + wasmbinding/queries.go | 13 + wasmbinding/query_plugin.go | 25 +- wasmbinding/stargate_allowlist.go | 5 - wasmbinding/test/custom_message_test.go | 7 +- wasmbinding/wasm.go | 2 +- x/contractmanager/keeper/failure.go | 11 +- x/contractmanager/keeper/failure_test.go | 19 +- x/contractmanager/types/genesis.pb.go | 456 ++++++++++++++++---- x/transfer/ibc_handlers.go | 8 +- 15 files changed, 632 insertions(+), 119 deletions(-) diff --git a/app/upgrades/nextupgrade/upgrades.go b/app/upgrades/nextupgrade/upgrades.go index e1d25c60b..cdb0c372f 100644 --- a/app/upgrades/nextupgrade/upgrades.go +++ b/app/upgrades/nextupgrade/upgrades.go @@ -4,20 +4,60 @@ import ( "errors" "github.com/cosmos/cosmos-sdk/codec" - + "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" "github.com/cosmos/gaia/v11/x/globalfee/types" "github.com/neutron-org/neutron/app/upgrades" + contractmanagertypes "github.com/neutron-org/neutron/x/contractmanager/types" ) +func MigrateFailures(ctx sdk.Context, storeKeys upgrades.StoreKeys, cdc codec.Codec) error { + ctx.Logger().Info("Migrating failures...") + + // fetch list of all old failures + oldFailuresList := make([]contractmanagertypes.OldFailure, 0) + iteratorStore := prefix.NewStore(ctx.KVStore(storeKeys.GetKey(contractmanagertypes.StoreKey)), contractmanagertypes.ContractFailuresKey) + iterator := sdk.KVStorePrefixIterator(iteratorStore, []byte{}) + + for ; iterator.Valid(); iterator.Next() { + var val contractmanagertypes.OldFailure + cdc.MustUnmarshal(iterator.Value(), &val) + oldFailuresList = append(oldFailuresList, val) + } + + err := iterator.Close() + if err != nil { + return err + } + + // migrate + store := ctx.KVStore(storeKeys.GetKey(contractmanagertypes.StoreKey)) + for _, oldItem := range oldFailuresList { + failure := contractmanagertypes.Failure{ + ChannelId: oldItem.ChannelId, + Address: oldItem.Address, + Id: oldItem.Id, + AckType: oldItem.AckType, + Packet: nil, + Ack: nil, + } + bz := cdc.MustMarshal(&failure) + store.Set(contractmanagertypes.GetFailureKey(failure.Address, failure.Id), bz) + } + + ctx.Logger().Info("Finished migrating failures") + + return nil +} + func CreateUpgradeHandler( mm *module.Manager, configurator module.Configurator, keepers *upgrades.UpgradeKeepers, - _ upgrades.StoreKeys, - _ codec.Codec, + storeKeys upgrades.StoreKeys, + cdc codec.Codec, ) upgradetypes.UpgradeHandler { return func(ctx sdk.Context, plan upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) { ctx.Logger().Info("Starting module migrations...") @@ -45,6 +85,11 @@ func CreateUpgradeHandler( ctx.Logger().Info("Global fees was set successfully") + err = MigrateFailures(ctx, storeKeys, cdc) + if err != nil { + ctx.Logger().Error("failed to migrate failures", "err", err) + } + ctx.Logger().Info("Upgrade complete") return vm, err } diff --git a/app/upgrades/nextupgrade/upgrades_test.go b/app/upgrades/nextupgrade/upgrades_test.go index 464d5293e..d4665508f 100644 --- a/app/upgrades/nextupgrade/upgrades_test.go +++ b/app/upgrades/nextupgrade/upgrades_test.go @@ -1,8 +1,11 @@ package nextupgrade_test import ( + "fmt" "testing" + contractmanagertypes "github.com/neutron-org/neutron/x/contractmanager/types" + sdk "github.com/cosmos/cosmos-sdk/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" "github.com/cosmos/gaia/v11/x/globalfee" @@ -48,3 +51,99 @@ func (suite *UpgradeTestSuite) TestGlobalFeesUpgrade() { } suite.Require().Equal(requiredGlobalFees, globalMinGasPrices) } + +func (suite *UpgradeTestSuite) TestFailuresUpgrade() { + var ( + app = suite.GetNeutronZoneApp(suite.ChainA) + storeKey = app.GetKey(contractmanagertypes.StoreKey) + ctx = suite.ChainA.GetContext() + cdc = app.AppCodec() + ) + + addressOne := testutil.TestOwnerAddress + addressTwo := "neutron1fxudpred77a0grgh69u0j7y84yks5ev4n5050z45kecz792jnd6scqu98z" + + store := ctx.KVStore(storeKey) + var i uint64 + for i = 0; i < 4; i++ { + var addr string + if i < 2 { + addr = addressOne + } else { + addr = addressTwo + } + failure := contractmanagertypes.OldFailure{ + ChannelId: fmt.Sprintf("channel-%d", i), + Address: addr, + Id: i % 2, + AckType: "ack", + } + bz := cdc.MustMarshal(&failure) + store.Set(contractmanagertypes.GetFailureKey(failure.Address, failure.Id), bz) + } + + upgrade := upgradetypes.Plan{ + Name: nextupgrade.UpgradeName, + Info: "some text here", + Height: 100, + } + app.UpgradeKeeper.ApplyUpgrade(ctx, upgrade) + + // check elements migrated properly + suite.Require().ElementsMatch(app.ContractManagerKeeper.GetAllFailures(ctx), []contractmanagertypes.Failure{ + { + ChannelId: "channel-0", + Address: addressOne, + Id: 0, + AckType: "ack", + Packet: nil, + Ack: nil, + }, + { + ChannelId: "channel-1", + Address: addressOne, + Id: 1, + AckType: "ack", + Packet: nil, + Ack: nil, + }, + { + ChannelId: "channel-2", + Address: addressTwo, + Id: 0, + AckType: "ack", + Packet: nil, + Ack: nil, + }, + { + ChannelId: "channel-3", + Address: addressTwo, + Id: 1, + AckType: "ack", + Packet: nil, + Ack: nil, + }, + }) + + // check getting element works + failure, err := app.ContractManagerKeeper.GetFailure(ctx, sdk.MustAccAddressFromBech32(addressTwo), 1) + suite.Require().NoError(err) + suite.Require().Equal(failure, &contractmanagertypes.Failure{ + ChannelId: "channel-3", + Address: addressTwo, + Id: 1, + AckType: "ack", + Packet: nil, + Ack: nil, + }) + + // non-existent returns error + _, err = app.ContractManagerKeeper.GetFailure(ctx, sdk.MustAccAddressFromBech32(addressTwo), 2) + suite.Require().Error(err) + + // check id's is in order + oneKey := app.ContractManagerKeeper.GetNextFailureIDKey(ctx, addressOne) + suite.Require().Equal(oneKey, uint64(2)) + twoKey := app.ContractManagerKeeper.GetNextFailureIDKey(ctx, addressTwo) + suite.Require().Equal(twoKey, uint64(2)) +} diff --git a/app/upgrades/types.go b/app/upgrades/types.go index 91fe12f10..3a6fa1583 100644 --- a/app/upgrades/types.go +++ b/app/upgrades/types.go @@ -2,7 +2,7 @@ package upgrades import ( "github.com/cosmos/cosmos-sdk/codec" - store "github.com/cosmos/cosmos-sdk/store/types" + storetypes "github.com/cosmos/cosmos-sdk/store/types" "github.com/cosmos/cosmos-sdk/types/module" capabilitykeeper "github.com/cosmos/cosmos-sdk/x/capability/keeper" paramskeeper "github.com/cosmos/cosmos-sdk/x/params/keeper" @@ -29,7 +29,7 @@ type Upgrade struct { CreateUpgradeHandler func(*module.Manager, module.Configurator, *UpgradeKeepers, StoreKeys, codec.Codec) upgradetypes.UpgradeHandler // Store upgrades, should be used for any new modules introduced, new modules deleted, or store names renamed. - StoreUpgrades store.StoreUpgrades + StoreUpgrades storetypes.StoreUpgrades } type UpgradeKeepers struct { @@ -47,5 +47,5 @@ type UpgradeKeepers struct { } type StoreKeys interface { - GetKey(string) *store.KVStoreKey + GetKey(string) *storetypes.KVStoreKey } diff --git a/proto/neutron/contractmanager/genesis.proto b/proto/neutron/contractmanager/genesis.proto index 53dd813f4..1f27e02ce 100644 --- a/proto/neutron/contractmanager/genesis.proto +++ b/proto/neutron/contractmanager/genesis.proto @@ -18,14 +18,12 @@ message Failure { string address = 2; // Id of the failure under specific address uint64 id = 3; - // Packet sequence id to restore - uint64 sequence_id = 4; // TODO: is renaming ok? // Acknowledgement type - string ack_type = 5; + string ack_type = 4; // IBC Packet - ibc.core.channel.v1.Packet packet = 6; + ibc.core.channel.v1.Packet packet = 5; // Acknowledgement - ibc.core.channel.v1.Acknowledgement ack = 7; + ibc.core.channel.v1.Acknowledgement ack = 6; } // GenesisState defines the contractmanager module's genesis state. @@ -35,3 +33,17 @@ message GenesisState { repeated Failure failures_list = 2 [ (gogoproto.nullable) = false ]; // this line is used by starport scaffolding # genesis/proto/state } + +// Deprecated. Used only for migration purposes. +message OldFailure { + // ChannelId + string channel_id = 1; + // Address of the failed contract + string address = 2; + // id of the failure under specific address + uint64 id = 3; + // ACK id to restore + uint64 ack_id = 4; + // Acknowledgement type + string ack_type = 5; +} diff --git a/wasmbinding/bindings/query.go b/wasmbinding/bindings/query.go index bdbf085d2..aa0c2d314 100644 --- a/wasmbinding/bindings/query.go +++ b/wasmbinding/bindings/query.go @@ -3,6 +3,8 @@ package bindings import ( "encoding/json" + contractmanagertypes "github.com/neutron-org/neutron/x/contractmanager/types" + feerefundertypes "github.com/neutron-org/neutron/x/feerefunder/types" sdktypes "github.com/cosmos/cosmos-sdk/types" @@ -32,6 +34,9 @@ type NeutronQuery struct { FullDenom *FullDenom `json:"full_denom,omitempty"` /// Returns the admin of a denom, if the denom is a Token Factory denom. DenomAdmin *DenomAdmin `json:"denom_admin,omitempty"` + // Contractmanager queries + /// Query all failures for address + Failures *Failures `json:"failures,omitempty"` } /* Requests */ @@ -108,6 +113,10 @@ type QueryMinIbcFeeResponse struct { MinFee feerefundertypes.Fee `json:"min_fee"` } +type FailuresResponse struct { + Failures []contractmanagertypes.Failure `json:"failures"` +} + func (rq RegisteredQuery) MarshalJSON() ([]byte, error) { type AliasRQ RegisteredQuery @@ -178,6 +187,11 @@ type DenomAdmin struct { Subdenom string `json:"subdenom"` } +type Failures struct { + Address string `json:"address"` + Pagination *query.PageRequest `json:"pagination,omitempty"` +} + type DenomAdminResponse struct { Admin string `json:"admin"` } diff --git a/wasmbinding/custom_querier.go b/wasmbinding/custom_querier.go index e4d717bc1..385ab69e8 100644 --- a/wasmbinding/custom_querier.go +++ b/wasmbinding/custom_querier.go @@ -128,6 +128,19 @@ func CustomQuerier(qp *QueryPlugin) func(ctx sdk.Context, request json.RawMessag return bz, nil + case contractQuery.Failures != nil: + res, err := qp.GetFailures(ctx, contractQuery.Failures.Address, contractQuery.Failures.Pagination) + if err != nil { + return nil, errors.Wrap(err, "unable to get denom admin") + } + + bz, err := json.Marshal(res) + if err != nil { + return nil, errors.Wrap(err, "failed to JSON marshal FailuresResponse response") + } + + return bz, nil + default: return nil, wasmvmtypes.UnsupportedRequest{Kind: "unknown neutron query type"} } diff --git a/wasmbinding/queries.go b/wasmbinding/queries.go index efea939ca..ef5930b0d 100644 --- a/wasmbinding/queries.go +++ b/wasmbinding/queries.go @@ -4,6 +4,7 @@ import ( "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" sdkquery "github.com/cosmos/cosmos-sdk/types/query" + contractmanagertypes "github.com/neutron-org/neutron/x/contractmanager/types" "github.com/neutron-org/neutron/wasmbinding/bindings" "github.com/neutron-org/neutron/x/interchainqueries/types" @@ -104,6 +105,18 @@ func (qp *QueryPlugin) GetMinIbcFee(ctx sdk.Context, _ *bindings.QueryMinIbcFeeR return &bindings.QueryMinIbcFeeResponse{MinFee: fee}, nil } +func (qp *QueryPlugin) GetFailures(ctx sdk.Context, address string, pagination *sdkquery.PageRequest) (*bindings.FailuresResponse, error) { + res, err := qp.contractmanagerKeeper.AddressFailures(ctx, &contractmanagertypes.QueryFailuresRequest{ + Address: address, + Pagination: pagination, + }) + if err != nil { + return nil, errors.Wrapf(err, "failed to get failures for address: %s", address) + } + + return &bindings.FailuresResponse{Failures: res.Failures}, nil +} + func mapGRPCRegisteredQueryToWasmBindings(grpcQuery types.RegisteredQuery) bindings.RegisteredQuery { return bindings.RegisteredQuery{ ID: grpcQuery.GetId(), diff --git a/wasmbinding/query_plugin.go b/wasmbinding/query_plugin.go index 22e9f9de7..1b8e346db 100644 --- a/wasmbinding/query_plugin.go +++ b/wasmbinding/query_plugin.go @@ -1,6 +1,7 @@ package wasmbinding import ( + contractmanagerkeeper "github.com/neutron-org/neutron/x/contractmanager/keeper" feeburnerkeeper "github.com/neutron-org/neutron/x/feeburner/keeper" feerefunderkeeper "github.com/neutron-org/neutron/x/feerefunder/keeper" icqkeeper "github.com/neutron-org/neutron/x/interchainqueries/keeper" @@ -10,20 +11,22 @@ import ( ) type QueryPlugin struct { - icaControllerKeeper *icacontrollerkeeper.Keeper - icqKeeper *icqkeeper.Keeper - feeBurnerKeeper *feeburnerkeeper.Keeper - feeRefunderKeeper *feerefunderkeeper.Keeper - tokenFactoryKeeper *tokenfactorykeeper.Keeper + icaControllerKeeper *icacontrollerkeeper.Keeper + icqKeeper *icqkeeper.Keeper + feeBurnerKeeper *feeburnerkeeper.Keeper + feeRefunderKeeper *feerefunderkeeper.Keeper + tokenFactoryKeeper *tokenfactorykeeper.Keeper + contractmanagerKeeper *contractmanagerkeeper.Keeper } // NewQueryPlugin returns a reference to a new QueryPlugin. -func NewQueryPlugin(icaControllerKeeper *icacontrollerkeeper.Keeper, icqKeeper *icqkeeper.Keeper, feeBurnerKeeper *feeburnerkeeper.Keeper, feeRefunderKeeper *feerefunderkeeper.Keeper, tfk *tokenfactorykeeper.Keeper) *QueryPlugin { +func NewQueryPlugin(icaControllerKeeper *icacontrollerkeeper.Keeper, icqKeeper *icqkeeper.Keeper, feeBurnerKeeper *feeburnerkeeper.Keeper, feeRefunderKeeper *feerefunderkeeper.Keeper, tfk *tokenfactorykeeper.Keeper, contractmanagerKeeper *contractmanagerkeeper.Keeper) *QueryPlugin { return &QueryPlugin{ - icaControllerKeeper: icaControllerKeeper, - icqKeeper: icqKeeper, - feeBurnerKeeper: feeBurnerKeeper, - feeRefunderKeeper: feeRefunderKeeper, - tokenFactoryKeeper: tfk, + icaControllerKeeper: icaControllerKeeper, + icqKeeper: icqKeeper, + feeBurnerKeeper: feeBurnerKeeper, + feeRefunderKeeper: feeRefunderKeeper, + tokenFactoryKeeper: tfk, + contractmanagerKeeper: contractmanagerKeeper, } } diff --git a/wasmbinding/stargate_allowlist.go b/wasmbinding/stargate_allowlist.go index 3f8697914..e054f0008 100644 --- a/wasmbinding/stargate_allowlist.go +++ b/wasmbinding/stargate_allowlist.go @@ -7,7 +7,6 @@ import ( ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" ibcconnectiontypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" - contractmanagertypes "github.com/neutron-org/neutron/x/contractmanager/types" feeburnertypes "github.com/neutron-org/neutron/x/feeburner/types" interchainqueriestypes "github.com/neutron-org/neutron/x/interchainqueries/types" interchaintxstypes "github.com/neutron-org/neutron/x/interchaintxs/types" @@ -39,10 +38,6 @@ func AcceptedStargateQueries() wasmkeeper.AcceptedStargateQueries { "/cosmos.bank.v1beta1.Query/Params": &banktypes.QueryParamsResponse{}, "/cosmos.bank.v1beta1.Query/SupplyOf": &banktypes.QuerySupplyOfResponse{}, - // contractmanager - "/neutron.contractmanager.Query/AddressFailures": &contractmanagertypes.QueryFailuresResponse{}, - "/neutron.contractmanager.Query/Failures": &contractmanagertypes.QueryFailuresResponse{}, - // interchaintxs "/neutron.interchaintxs.Query/Params": &interchaintxstypes.QueryParamsResponse{}, diff --git a/wasmbinding/test/custom_message_test.go b/wasmbinding/test/custom_message_test.go index bdfe65607..a2eaa68ac 100644 --- a/wasmbinding/test/custom_message_test.go +++ b/wasmbinding/test/custom_message_test.go @@ -3,9 +3,10 @@ package test import ( "encoding/json" "fmt" - ibcchanneltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" "testing" + ibcchanneltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" + "github.com/stretchr/testify/suite" ictxtypes "github.com/neutron-org/neutron/x/interchaintxs/types" @@ -606,13 +607,13 @@ func (suite *CustomMessengerTestSuite) TestResubmitFailureAck() { ack := ibcchanneltypes.Acknowledgement{ Response: &ibcchanneltypes.Acknowledgement_Result{Result: []byte("Result")}, } - failureId := suite.messenger.ContractmanagerKeeper.GetNextFailureIDKey(suite.ctx, suite.contractAddress.String()) + failureID := suite.messenger.ContractmanagerKeeper.GetNextFailureIDKey(suite.ctx, suite.contractAddress.String()) suite.messenger.ContractmanagerKeeper.AddContractFailure(suite.ctx, packet, suite.contractAddress.String(), "ack", &ack) // Craft message msg, err := json.Marshal(bindings.NeutronMsg{ ResubmitFailure: &bindings.ResubmitFailure{ - FailureId: failureId, + FailureId: failureID, }, }) suite.NoError(err) diff --git a/wasmbinding/wasm.go b/wasmbinding/wasm.go index 151fd1c2f..cdb9ec5dd 100644 --- a/wasmbinding/wasm.go +++ b/wasmbinding/wasm.go @@ -30,7 +30,7 @@ func RegisterCustomPlugins( cronKeeper *cronkeeper.Keeper, contractmanagerKeeper *contractmanagerkeeper.Keeper, ) []wasmkeeper.Option { - wasmQueryPlugin := NewQueryPlugin(ictxKeeper, icqKeeper, feeBurnerKeeper, feeRefunderKeeper, tfk) + wasmQueryPlugin := NewQueryPlugin(ictxKeeper, icqKeeper, feeBurnerKeeper, feeRefunderKeeper, tfk, contractmanagerKeeper) queryPluginOpt := wasmkeeper.WithQueryPlugins(&wasmkeeper.QueryPlugins{ Custom: CustomQuerier(wasmQueryPlugin), diff --git a/x/contractmanager/keeper/failure.go b/x/contractmanager/keeper/failure.go index b2c5f6afb..056811fca 100644 --- a/x/contractmanager/keeper/failure.go +++ b/x/contractmanager/keeper/failure.go @@ -13,12 +13,11 @@ import ( // AddContractFailure adds a specific failure to the store using address as the key func (k Keeper) AddContractFailure(ctx sdk.Context, packet ibcchanneltypes.Packet, address, ackType string, ack *ibcchanneltypes.Acknowledgement) { failure := types.Failure{ - ChannelId: packet.SourceChannel, - Address: address, - SequenceId: packet.Sequence, - Packet: &packet, - AckType: ackType, - Ack: ack, + ChannelId: packet.SourceChannel, + Address: address, + Packet: &packet, + AckType: ackType, + Ack: ack, } nextFailureID := k.GetNextFailureIDKey(ctx, failure.GetAddress()) diff --git a/x/contractmanager/keeper/failure_test.go b/x/contractmanager/keeper/failure_test.go index ea6f6d2f7..b1bb7504b 100644 --- a/x/contractmanager/keeper/failure_test.go +++ b/x/contractmanager/keeper/failure_test.go @@ -3,11 +3,12 @@ package keeper_test import ( "crypto/rand" "encoding/json" + "strconv" + "testing" + "github.com/golang/mock/gomock" "github.com/neutron-org/neutron/testutil" mock_types "github.com/neutron-org/neutron/testutil/mocks/contractmanager/types" - "strconv" - "testing" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" "github.com/neutron-org/neutron/testutil/contractmanager/nullify" @@ -81,19 +82,19 @@ func TestAddGetFailure(t *testing.T) { // test adding and getting failure contractAddress := sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress) k, ctx := keepertest.ContractManagerKeeper(t, nil) - failureId := k.GetNextFailureIDKey(ctx, contractAddress.String()) + failureID := k.GetNextFailureIDKey(ctx, contractAddress.String()) k.AddContractFailure(ctx, channeltypes.Packet{}, contractAddress.String(), "ack", &channeltypes.Acknowledgement{}) - failure, err := k.GetFailure(ctx, contractAddress, failureId) + failure, err := k.GetFailure(ctx, contractAddress, failureID) require.NoError(t, err) - require.Equal(t, failureId, failure.Id) + require.Equal(t, failureID, failure.Id) require.Equal(t, "ack", failure.AckType) // non-existent id - _, err = k.GetFailure(ctx, contractAddress, failureId+1) + _, err = k.GetFailure(ctx, contractAddress, failureID+1) require.Error(t, err) // non-existent contract address - _, err = k.GetFailure(ctx, sdk.MustAccAddressFromBech32("neutron1nseacn2aqezhj3ssatfg778ctcfjuknm8ucc0l"), failureId) + _, err = k.GetFailure(ctx, sdk.MustAccAddressFromBech32("neutron1nseacn2aqezhj3ssatfg778ctcfjuknm8ucc0l"), failureID) require.Error(t, err) } @@ -111,7 +112,7 @@ func TestResubmitFailure(t *testing.T) { ack := channeltypes.Acknowledgement{ Response: &channeltypes.Acknowledgement_Result{Result: data}, } - failureId := k.GetNextFailureIDKey(ctx, contractAddr.String()) + failureID := k.GetNextFailureIDKey(ctx, contractAddr.String()) k.AddContractFailure(ctx, packet, contractAddr.String(), "ack", &ack) // successful resubmit with ack and ack = response @@ -124,7 +125,7 @@ func TestResubmitFailure(t *testing.T) { wk.EXPECT().HasContractInfo(gomock.AssignableToTypeOf(ctx), contractAddr).Return(true) wk.EXPECT().Sudo(gomock.AssignableToTypeOf(ctx), contractAddr, msg) - failure, err := k.GetFailure(ctx, contractAddr, failureId) + failure, err := k.GetFailure(ctx, contractAddr, failureID) require.NoError(t, err) err = k.ResubmitFailure(ctx, contractAddr, failure) require.NoError(t, err) diff --git a/x/contractmanager/types/genesis.pb.go b/x/contractmanager/types/genesis.pb.go index d1d447382..7787a4683 100644 --- a/x/contractmanager/types/genesis.pb.go +++ b/x/contractmanager/types/genesis.pb.go @@ -34,14 +34,12 @@ type Failure struct { Address string `protobuf:"bytes,2,opt,name=address,proto3" json:"address,omitempty"` // Id of the failure under specific address Id uint64 `protobuf:"varint,3,opt,name=id,proto3" json:"id,omitempty"` - // Packet sequence id to restore - SequenceId uint64 `protobuf:"varint,4,opt,name=sequence_id,json=sequenceId,proto3" json:"sequence_id,omitempty"` // Acknowledgement type - AckType string `protobuf:"bytes,5,opt,name=ack_type,json=ackType,proto3" json:"ack_type,omitempty"` + AckType string `protobuf:"bytes,4,opt,name=ack_type,json=ackType,proto3" json:"ack_type,omitempty"` // IBC Packet - Packet *types.Packet `protobuf:"bytes,6,opt,name=packet,proto3" json:"packet,omitempty"` + Packet *types.Packet `protobuf:"bytes,5,opt,name=packet,proto3" json:"packet,omitempty"` // Acknowledgement - Ack *types.Acknowledgement `protobuf:"bytes,7,opt,name=ack,proto3" json:"ack,omitempty"` + Ack *types.Acknowledgement `protobuf:"bytes,6,opt,name=ack,proto3" json:"ack,omitempty"` } func (m *Failure) Reset() { *m = Failure{} } @@ -98,13 +96,6 @@ func (m *Failure) GetId() uint64 { return 0 } -func (m *Failure) GetSequenceId() uint64 { - if m != nil { - return m.SequenceId - } - return 0 -} - func (m *Failure) GetAckType() string { if m != nil { return m.AckType @@ -180,9 +171,92 @@ func (m *GenesisState) GetFailuresList() []Failure { return nil } +// Deprecated. Used only for migration purposes. +type OldFailure struct { + // ChannelId + ChannelId string `protobuf:"bytes,1,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"` + // Address of the failed contract + Address string `protobuf:"bytes,2,opt,name=address,proto3" json:"address,omitempty"` + // id of the failure under specific address + Id uint64 `protobuf:"varint,3,opt,name=id,proto3" json:"id,omitempty"` + // ACK id to restore + AckId uint64 `protobuf:"varint,4,opt,name=ack_id,json=ackId,proto3" json:"ack_id,omitempty"` + // Acknowledgement type + AckType string `protobuf:"bytes,5,opt,name=ack_type,json=ackType,proto3" json:"ack_type,omitempty"` +} + +func (m *OldFailure) Reset() { *m = OldFailure{} } +func (m *OldFailure) String() string { return proto.CompactTextString(m) } +func (*OldFailure) ProtoMessage() {} +func (*OldFailure) Descriptor() ([]byte, []int) { + return fileDescriptor_cf4a1534315a7490, []int{2} +} +func (m *OldFailure) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *OldFailure) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_OldFailure.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 *OldFailure) XXX_Merge(src proto.Message) { + xxx_messageInfo_OldFailure.Merge(m, src) +} +func (m *OldFailure) XXX_Size() int { + return m.Size() +} +func (m *OldFailure) XXX_DiscardUnknown() { + xxx_messageInfo_OldFailure.DiscardUnknown(m) +} + +var xxx_messageInfo_OldFailure proto.InternalMessageInfo + +func (m *OldFailure) GetChannelId() string { + if m != nil { + return m.ChannelId + } + return "" +} + +func (m *OldFailure) GetAddress() string { + if m != nil { + return m.Address + } + return "" +} + +func (m *OldFailure) GetId() uint64 { + if m != nil { + return m.Id + } + return 0 +} + +func (m *OldFailure) GetAckId() uint64 { + if m != nil { + return m.AckId + } + return 0 +} + +func (m *OldFailure) GetAckType() string { + if m != nil { + return m.AckType + } + return "" +} + func init() { proto.RegisterType((*Failure)(nil), "neutron.contractmanager.Failure") proto.RegisterType((*GenesisState)(nil), "neutron.contractmanager.GenesisState") + proto.RegisterType((*OldFailure)(nil), "neutron.contractmanager.OldFailure") } func init() { @@ -190,34 +264,34 @@ func init() { } var fileDescriptor_cf4a1534315a7490 = []byte{ - // 417 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x92, 0x31, 0x6f, 0x13, 0x31, - 0x14, 0xc7, 0xe3, 0x24, 0x24, 0xd4, 0x29, 0x0c, 0x16, 0x12, 0x47, 0x10, 0x97, 0xa3, 0x2a, 0x52, - 0x16, 0x6c, 0x35, 0x95, 0xba, 0x31, 0xd0, 0x01, 0x54, 0xc1, 0x10, 0x1d, 0x4c, 0x2c, 0x91, 0x63, - 0x3f, 0xae, 0xd6, 0x25, 0xf6, 0x61, 0x3b, 0x85, 0x7e, 0x0b, 0x66, 0x3e, 0x51, 0xc7, 0x8e, 0x4c, - 0x08, 0x25, 0x1f, 0x83, 0x05, 0x9d, 0xcf, 0xb7, 0x40, 0xb3, 0xbd, 0x7b, 0xef, 0xf7, 0xff, 0xdf, - 0xbd, 0xff, 0x3b, 0xfc, 0x42, 0xc3, 0xc6, 0x5b, 0xa3, 0x99, 0x30, 0xda, 0x5b, 0x2e, 0xfc, 0x9a, - 0x6b, 0x5e, 0x80, 0x65, 0x05, 0x68, 0x70, 0xca, 0xd1, 0xca, 0x1a, 0x6f, 0xc8, 0xe3, 0x88, 0xd1, - 0x7f, 0xb0, 0xf1, 0xa3, 0xc2, 0x14, 0x26, 0x30, 0xac, 0xae, 0x1a, 0x7c, 0x7c, 0xbc, 0xcf, 0xb5, - 0xe2, 0x96, 0xaf, 0xa3, 0xe9, 0xf8, 0xb9, 0x5a, 0x0a, 0x26, 0x8c, 0x05, 0x26, 0x2e, 0xb9, 0xd6, - 0xb0, 0x62, 0x57, 0x27, 0x6d, 0xd9, 0x20, 0x47, 0x7f, 0x10, 0x1e, 0xbe, 0xe1, 0x6a, 0xb5, 0xb1, - 0x40, 0x9e, 0x61, 0x1c, 0x87, 0x0b, 0x25, 0x13, 0x94, 0xa1, 0xe9, 0x41, 0x7e, 0x10, 0x3b, 0x17, - 0x92, 0x24, 0x78, 0xc8, 0xa5, 0xb4, 0xe0, 0x5c, 0xd2, 0x0d, 0xb3, 0xf6, 0x91, 0x3c, 0xc4, 0x5d, - 0x25, 0x93, 0x5e, 0x86, 0xa6, 0xfd, 0xbc, 0xab, 0x24, 0x99, 0xe0, 0x91, 0x83, 0x2f, 0x1b, 0xd0, - 0x02, 0x6a, 0xa7, 0x7e, 0x18, 0xe0, 0xb6, 0x75, 0x21, 0xc9, 0x13, 0x7c, 0x9f, 0x8b, 0x72, 0xe1, - 0xaf, 0x2b, 0x48, 0xee, 0x45, 0x2f, 0x51, 0x7e, 0xbc, 0xae, 0x80, 0x9c, 0xe2, 0x41, 0xc5, 0x45, - 0x09, 0x3e, 0x19, 0x64, 0x68, 0x3a, 0x9a, 0x3d, 0xa5, 0x6a, 0x29, 0x68, 0xbd, 0x04, 0x6d, 0xbf, - 0xfc, 0xea, 0x84, 0xce, 0x03, 0x92, 0x47, 0x94, 0x9c, 0xe1, 0x1e, 0x17, 0x65, 0x32, 0x0c, 0x8a, - 0xe3, 0x3b, 0x15, 0xaf, 0x45, 0xa9, 0xcd, 0xd7, 0x15, 0xc8, 0x02, 0xd6, 0xa0, 0x7d, 0x5e, 0x0b, - 0x8e, 0x7e, 0x20, 0x7c, 0xf8, 0xb6, 0xb9, 0xc3, 0x07, 0xcf, 0x3d, 0x90, 0x57, 0xf5, 0xdb, 0xeb, - 0x04, 0xc3, 0xfa, 0xa3, 0xd9, 0x84, 0xee, 0xb9, 0x0b, 0x9d, 0x07, 0xec, 0xbc, 0x7f, 0xf3, 0x6b, - 0xd2, 0xc9, 0xa3, 0x88, 0xbc, 0xc3, 0x0f, 0x3e, 0x37, 0x61, 0xba, 0xc5, 0x4a, 0x39, 0x9f, 0x74, - 0xb3, 0xde, 0x74, 0x34, 0xcb, 0xf6, 0xba, 0xc4, 0xe8, 0xa3, 0xcd, 0x61, 0x2b, 0x7e, 0xaf, 0x9c, - 0x3f, 0x9f, 0xdf, 0x6c, 0x53, 0x74, 0xbb, 0x4d, 0xd1, 0xef, 0x6d, 0x8a, 0xbe, 0xef, 0xd2, 0xce, - 0xed, 0x2e, 0xed, 0xfc, 0xdc, 0xa5, 0x9d, 0x4f, 0x67, 0x85, 0xf2, 0x97, 0x9b, 0x25, 0x15, 0x66, - 0xcd, 0xa2, 0xf3, 0x4b, 0x63, 0x8b, 0xb6, 0x66, 0xdf, 0xfe, 0xfb, 0x2d, 0xea, 0xa4, 0xdd, 0x72, - 0x10, 0x6e, 0x7e, 0xfa, 0x37, 0x00, 0x00, 0xff, 0xff, 0xd6, 0x4c, 0x8c, 0x41, 0x94, 0x02, 0x00, - 0x00, + // 431 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x92, 0x3f, 0x6f, 0x13, 0x31, + 0x18, 0xc6, 0xe3, 0xfc, 0x2b, 0x75, 0x0a, 0x83, 0x05, 0xc2, 0x04, 0x71, 0x3d, 0xa2, 0x22, 0x65, + 0xc1, 0x56, 0x53, 0xa9, 0x1b, 0x03, 0x1d, 0x40, 0x15, 0x48, 0x44, 0x07, 0x13, 0x4b, 0xe4, 0xd8, + 0xe6, 0x6a, 0xdd, 0xc5, 0x3e, 0xd9, 0x4e, 0xa1, 0x9f, 0x80, 0x95, 0x99, 0x4f, 0xd4, 0xb1, 0x23, + 0x62, 0x40, 0x28, 0xf9, 0x22, 0xe8, 0x1c, 0xdf, 0x10, 0x20, 0x5b, 0xb7, 0xf7, 0xce, 0xbf, 0xe7, + 0xb1, 0xdf, 0xe7, 0x7d, 0xe1, 0x33, 0x2d, 0x97, 0xde, 0x1a, 0x4d, 0xb9, 0xd1, 0xde, 0x32, 0xee, + 0x17, 0x4c, 0xb3, 0x5c, 0x5a, 0x9a, 0x4b, 0x2d, 0x9d, 0x72, 0xa4, 0xb2, 0xc6, 0x1b, 0xf4, 0x30, + 0x62, 0xe4, 0x2f, 0x6c, 0x78, 0x3f, 0x37, 0xb9, 0x09, 0x0c, 0xad, 0xab, 0x0d, 0x3e, 0x3c, 0xda, + 0xe5, 0x5a, 0x31, 0xcb, 0x16, 0xd1, 0x74, 0xf8, 0x54, 0xcd, 0x39, 0xe5, 0xc6, 0x4a, 0xca, 0x2f, + 0x98, 0xd6, 0xb2, 0xa4, 0x97, 0xc7, 0x4d, 0xb9, 0x41, 0x46, 0x3f, 0x01, 0xdc, 0x7b, 0xc5, 0x54, + 0xb9, 0xb4, 0x12, 0x3d, 0x81, 0x30, 0x1e, 0xce, 0x94, 0xc0, 0x20, 0x05, 0xe3, 0xfd, 0x6c, 0x3f, + 0xfe, 0x39, 0x17, 0x08, 0xc3, 0x3d, 0x26, 0x84, 0x95, 0xce, 0xe1, 0x76, 0x38, 0x6b, 0x3e, 0xd1, + 0x3d, 0xd8, 0x56, 0x02, 0x77, 0x52, 0x30, 0xee, 0x66, 0x6d, 0x25, 0xd0, 0x23, 0x78, 0x87, 0xf1, + 0x62, 0xe6, 0xaf, 0x2a, 0x89, 0xbb, 0x11, 0xe5, 0xc5, 0x87, 0xab, 0x4a, 0xa2, 0x13, 0xd8, 0xaf, + 0x18, 0x2f, 0xa4, 0xc7, 0xbd, 0x14, 0x8c, 0x07, 0x93, 0xc7, 0x44, 0xcd, 0x39, 0xa9, 0xdf, 0x48, + 0x9a, 0x87, 0x5d, 0x1e, 0x93, 0x69, 0x40, 0xb2, 0x88, 0xa2, 0x53, 0xd8, 0x61, 0xbc, 0xc0, 0xfd, + 0xa0, 0x38, 0xfa, 0xaf, 0xe2, 0x25, 0x2f, 0xb4, 0xf9, 0x5c, 0x4a, 0x91, 0xcb, 0x85, 0xd4, 0x3e, + 0xab, 0x05, 0xa3, 0xef, 0x00, 0x1e, 0xbc, 0xde, 0xc4, 0xfc, 0xde, 0x33, 0x2f, 0xd1, 0x8b, 0xfa, + 0xf6, 0x3a, 0xa0, 0xd0, 0xdd, 0x60, 0x72, 0x48, 0x76, 0xc4, 0x4e, 0xa6, 0x01, 0x3b, 0xeb, 0x5e, + 0xff, 0x3a, 0x6c, 0x65, 0x51, 0x84, 0xde, 0xc0, 0xbb, 0x9f, 0x36, 0x59, 0xb9, 0x59, 0xa9, 0x9c, + 0xc7, 0xed, 0xb4, 0x33, 0x1e, 0x4c, 0xd2, 0x9d, 0x2e, 0x31, 0xd9, 0x68, 0x73, 0xd0, 0x88, 0xdf, + 0x2a, 0xe7, 0x47, 0x5f, 0x01, 0x84, 0xef, 0x4a, 0x71, 0xeb, 0xe1, 0x3f, 0x80, 0xfd, 0x3a, 0x7c, + 0x25, 0x42, 0xf4, 0xdd, 0xac, 0xc7, 0x78, 0x71, 0xbe, 0x3d, 0x93, 0xde, 0xd6, 0x4c, 0xce, 0xa6, + 0xd7, 0xab, 0x04, 0xdc, 0xac, 0x12, 0xf0, 0x7b, 0x95, 0x80, 0x6f, 0xeb, 0xa4, 0x75, 0xb3, 0x4e, + 0x5a, 0x3f, 0xd6, 0x49, 0xeb, 0xe3, 0x69, 0xae, 0xfc, 0xc5, 0x72, 0x4e, 0xb8, 0x59, 0xd0, 0xd8, + 0xe3, 0x73, 0x63, 0xf3, 0xa6, 0xa6, 0x5f, 0xfe, 0xd9, 0xbf, 0xda, 0xdf, 0xcd, 0xfb, 0x61, 0xb9, + 0x4e, 0xfe, 0x04, 0x00, 0x00, 0xff, 0xff, 0x84, 0xa9, 0xdf, 0x59, 0xfd, 0x02, 0x00, 0x00, } func (m *Failure) Marshal() (dAtA []byte, err error) { @@ -250,7 +324,7 @@ func (m *Failure) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintGenesis(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x3a + dAtA[i] = 0x32 } if m.Packet != nil { { @@ -262,19 +336,14 @@ func (m *Failure) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintGenesis(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x32 + dAtA[i] = 0x2a } if len(m.AckType) > 0 { i -= len(m.AckType) copy(dAtA[i:], m.AckType) i = encodeVarintGenesis(dAtA, i, uint64(len(m.AckType))) i-- - dAtA[i] = 0x2a - } - if m.SequenceId != 0 { - i = encodeVarintGenesis(dAtA, i, uint64(m.SequenceId)) - i-- - dAtA[i] = 0x20 + dAtA[i] = 0x22 } if m.Id != 0 { i = encodeVarintGenesis(dAtA, i, uint64(m.Id)) @@ -345,6 +414,60 @@ func (m *GenesisState) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } +func (m *OldFailure) 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 *OldFailure) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *OldFailure) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.AckType) > 0 { + i -= len(m.AckType) + copy(dAtA[i:], m.AckType) + i = encodeVarintGenesis(dAtA, i, uint64(len(m.AckType))) + i-- + dAtA[i] = 0x2a + } + if m.AckId != 0 { + i = encodeVarintGenesis(dAtA, i, uint64(m.AckId)) + i-- + dAtA[i] = 0x20 + } + if m.Id != 0 { + i = encodeVarintGenesis(dAtA, i, uint64(m.Id)) + i-- + dAtA[i] = 0x18 + } + if len(m.Address) > 0 { + i -= len(m.Address) + copy(dAtA[i:], m.Address) + i = encodeVarintGenesis(dAtA, i, uint64(len(m.Address))) + i-- + dAtA[i] = 0x12 + } + if len(m.ChannelId) > 0 { + i -= len(m.ChannelId) + copy(dAtA[i:], m.ChannelId) + i = encodeVarintGenesis(dAtA, i, uint64(len(m.ChannelId))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + func encodeVarintGenesis(dAtA []byte, offset int, v uint64) int { offset -= sovGenesis(v) base := offset @@ -373,9 +496,6 @@ func (m *Failure) Size() (n int) { if m.Id != 0 { n += 1 + sovGenesis(uint64(m.Id)) } - if m.SequenceId != 0 { - n += 1 + sovGenesis(uint64(m.SequenceId)) - } l = len(m.AckType) if l > 0 { n += 1 + l + sovGenesis(uint64(l)) @@ -408,6 +528,33 @@ func (m *GenesisState) Size() (n int) { return n } +func (m *OldFailure) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.ChannelId) + if l > 0 { + n += 1 + l + sovGenesis(uint64(l)) + } + l = len(m.Address) + if l > 0 { + n += 1 + l + sovGenesis(uint64(l)) + } + if m.Id != 0 { + n += 1 + sovGenesis(uint64(m.Id)) + } + if m.AckId != 0 { + n += 1 + sovGenesis(uint64(m.AckId)) + } + l = len(m.AckType) + if l > 0 { + n += 1 + l + sovGenesis(uint64(l)) + } + return n +} + func sovGenesis(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } @@ -527,25 +674,6 @@ func (m *Failure) Unmarshal(dAtA []byte) error { } } case 4: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field SequenceId", wireType) - } - m.SequenceId = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenesis - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.SequenceId |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 5: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field AckType", wireType) } @@ -577,7 +705,7 @@ func (m *Failure) Unmarshal(dAtA []byte) error { } m.AckType = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 6: + case 5: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Packet", wireType) } @@ -613,7 +741,7 @@ func (m *Failure) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 7: + case 6: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Ack", wireType) } @@ -787,6 +915,190 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error { } return nil } +func (m *OldFailure) 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: OldFailure: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: OldFailure: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ChannelId", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenesis + } + 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 ErrInvalidLengthGenesis + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthGenesis + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.ChannelId = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + 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 ErrIntOverflowGenesis + } + 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 ErrInvalidLengthGenesis + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthGenesis + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Address = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 3: + 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 ErrIntOverflowGenesis + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Id |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 4: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field AckId", wireType) + } + m.AckId = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenesis + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.AckId |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 5: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field AckType", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenesis + } + 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 ErrInvalidLengthGenesis + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthGenesis + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.AckType = string(dAtA[iNdEx:postIndex]) + 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 diff --git a/x/transfer/ibc_handlers.go b/x/transfer/ibc_handlers.go index f8eb2e9d7..642f5da72 100644 --- a/x/transfer/ibc_handlers.go +++ b/x/transfer/ibc_handlers.go @@ -63,6 +63,9 @@ func (im *IBCModule) createCachedContext(ctx sdk.Context) (sdk.Context, func(), // and process failed Sudo call if gasMeterIsLimited { gasLeft := gasMeter.Limit() - gasMeter.GasConsumed() + // NOTE: DANGER: remove this. But we will enforce limit, only that it's through param values: + //(https://www.notion.so/hadron/Gas-Errors-Interchain-Txs-2b2f1caacdcd4981950641e0996cac27?pvs=4#73af69a69b8249ae9d2222afcc42b968) + //gasLeft := uint64(100_000) var newLimit uint64 if gasLeft < GasReserve { @@ -72,8 +75,8 @@ func (im *IBCModule) createCachedContext(ctx sdk.Context) (sdk.Context, func(), } gasMeter = sdk.NewGasMeter(newLimit) + im.keeper.Logger(ctx).Debug("New Gas limit", "gasLimit", newLimit) } - cacheCtx = cacheCtx.WithGasMeter(gasMeter) return cacheCtx, writeFn, gasMeter @@ -95,6 +98,9 @@ func (im IBCModule) HandleAcknowledgement(ctx sdk.Context, packet channeltypes.P return errors.Wrapf(sdkerrors.ErrInvalidAddress, "failed to decode address from bech32: %v", err) } + // gasMeter := sdk.NewGasMeter(100_000) + // ctx = ctx.WithGasMeter(gasMeter) + cacheCtx, writeFn, newGasMeter := im.createCachedContext(ctx) defer im.outOfGasRecovery(ctx, newGasMeter, senderAddress, packet, data, "ack", &ack) From 1aa5d973a4ca9460ae3f86271787d6d0ac77bbab Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Wed, 16 Aug 2023 19:02:42 +0400 Subject: [PATCH 038/307] plugin errors fix --- go.mod | 2 +- go.sum | 4 ++-- wasmbinding/message_plugin.go | 20 +++++++++++++++++++- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 8f4fca84d..a0b8f389d 100644 --- a/go.mod +++ b/go.mod @@ -182,7 +182,7 @@ replace ( github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0 github.com/ChainSafe/go-schnorrkel => github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d github.com/CosmWasm/wasmd => github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230705143547-22c391d461d5 - github.com/cosmos/admin-module => github.com/neutron-org/admin-module v0.0.0-20230815120514-97237f8409d1 + github.com/cosmos/admin-module => github.com/neutron-org/admin-module v0.0.0-20230816141742-5c3c1b7b898e github.com/cosmos/gaia/v11 => github.com/cosmos/gaia/v11 v11.0.0-20230724152830-861ba391c3b4 github.com/cosmos/ledger-cosmos-go => github.com/cosmos/ledger-cosmos-go v0.12.1 github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 diff --git a/go.sum b/go.sum index 504b3d374..22b367afd 100644 --- a/go.sum +++ b/go.sum @@ -927,8 +927,8 @@ github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxzi github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/neilotoole/errgroup v0.1.6/go.mod h1:Q2nLGf+594h0CLBs/Mbg6qOr7GtqDK7C2S41udRnToE= -github.com/neutron-org/admin-module v0.0.0-20230815120514-97237f8409d1 h1:beWeivCs5O4uMun+Hc+wM68ZpZTmy5o2Q5JtdbqfhoE= -github.com/neutron-org/admin-module v0.0.0-20230815120514-97237f8409d1/go.mod h1:QuxQ7FJlEAFMRssyEYOrR9ORnYQvBFMTlO8BXny6ntw= +github.com/neutron-org/admin-module v0.0.0-20230816141742-5c3c1b7b898e h1:VM84Gg+L8etB2RCyLaR/191Z9/HwsGpaJO1bFJoIUUg= +github.com/neutron-org/admin-module v0.0.0-20230816141742-5c3c1b7b898e/go.mod h1:QuxQ7FJlEAFMRssyEYOrR9ORnYQvBFMTlO8BXny6ntw= github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230705143547-22c391d461d5 h1:2YQaqP5W3F+5VH0IAA7m8OHjkwONxQDqXUwo5tzKdDU= github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230705143547-22c391d461d5/go.mod h1:l699csQZeRKYqF8R9JoYoQ6E0j4PfDM3Ln7EawtUwJE= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= diff --git a/wasmbinding/message_plugin.go b/wasmbinding/message_plugin.go index 32aae0ec9..a51b8c53d 100644 --- a/wasmbinding/message_plugin.go +++ b/wasmbinding/message_plugin.go @@ -297,8 +297,16 @@ func (m *CustomMessenger) submitTx(ctx sdk.Context, contractAddr sdk.AccAddress, func (m *CustomMessenger) submitAdminProposal(ctx sdk.Context, contractAddr sdk.AccAddress, submitAdminProposal *bindings.SubmitAdminProposal) ([]sdk.Event, [][]byte, error) { var data []byte - if submitAdminProposal.AdminProposal.ParamChangeProposal != nil || submitAdminProposal.AdminProposal.UpgradeProposal != nil || submitAdminProposal.AdminProposal.CancelSoftwareUpgradeProposal != nil { + if submitAdminProposal.AdminProposal.ParamChangeProposal != nil || submitAdminProposal.AdminProposal.UpgradeProposal != nil || submitAdminProposal.AdminProposal.ClientUpdateProposal != nil { resp, err := m.performSubmitAdminProposalLegacy(ctx, contractAddr, submitAdminProposal) + if err != nil { + ctx.Logger().Debug("performSubmitAdminProposalLegacy: failed to submitAdminProposal", + "from_address", contractAddr.String(), + "creator", contractAddr.String(), + "error", err, + ) + return nil, nil, errors.Wrap(err, "failed to submit admin proposal legacy") + } data, err = json.Marshal(resp) if err != nil { ctx.Logger().Error("json.Marshal: failed to marshal submitAdminProposalLegacy response to JSON", @@ -308,6 +316,11 @@ func (m *CustomMessenger) submitAdminProposal(ctx sdk.Context, contractAddr sdk. ) return nil, nil, errors.Wrap(err, "marshal json failed") } + + ctx.Logger().Debug("submit proposal legacy submitted", + "from_address", contractAddr.String(), + "creator", contractAddr.String(), + ) return nil, [][]byte{data}, nil } @@ -397,6 +410,11 @@ func (m *CustomMessenger) performSubmitAdminProposalLegacy(ctx sdk.Context, cont return nil, errors.Wrap(err, "failed to submit proposal") } + ctx.Logger().Debug("submit proposal legacy processed in msg server", + "from_address", contractAddr.String(), + "creator", contractAddr.String(), + ) + return response, nil } From 7e705e153b6e72c20182fbae8d1830aa8175cb4e Mon Sep 17 00:00:00 2001 From: nhpd Date: Thu, 17 Aug 2023 13:09:05 +0400 Subject: [PATCH 039/307] finish tests; change AddContractFailure to receive pointer of packet --- .../interchaintxs/types/expected_keepers.go | 2 +- .../mocks/transfer/types/expected_keepers.go | 2 +- wasmbinding/bindings/query.go | 1 - wasmbinding/test/custom_message_test.go | 6 +- x/contractmanager/genesis.go | 2 +- x/contractmanager/keeper/failure.go | 4 +- x/contractmanager/keeper/failure_test.go | 139 ++++++++++++++++-- x/interchaintxs/keeper/ibc_handlers.go | 6 +- x/interchaintxs/keeper/ibc_handlers_test.go | 12 +- x/interchaintxs/types/expected_keepers.go | 2 +- x/transfer/ibc_handlers.go | 6 +- x/transfer/ibc_handlers_test.go | 22 +-- x/transfer/types/expected_keepers.go | 2 +- 13 files changed, 157 insertions(+), 49 deletions(-) diff --git a/testutil/mocks/interchaintxs/types/expected_keepers.go b/testutil/mocks/interchaintxs/types/expected_keepers.go index 389c62b35..391c209d8 100644 --- a/testutil/mocks/interchaintxs/types/expected_keepers.go +++ b/testutil/mocks/interchaintxs/types/expected_keepers.go @@ -116,7 +116,7 @@ func (m *MockContractManagerKeeper) EXPECT() *MockContractManagerKeeperMockRecor } // AddContractFailure mocks base method. -func (m *MockContractManagerKeeper) AddContractFailure(ctx types.Context, packet types3.Packet, address, ackType string, ack *types3.Acknowledgement) { +func (m *MockContractManagerKeeper) AddContractFailure(ctx types.Context, packet *types3.Packet, address, ackType string, ack *types3.Acknowledgement) { m.ctrl.T.Helper() m.ctrl.Call(m, "AddContractFailure", ctx, packet, address, ackType, ack) } diff --git a/testutil/mocks/transfer/types/expected_keepers.go b/testutil/mocks/transfer/types/expected_keepers.go index b353586a0..cbadbc2c2 100644 --- a/testutil/mocks/transfer/types/expected_keepers.go +++ b/testutil/mocks/transfer/types/expected_keepers.go @@ -38,7 +38,7 @@ func (m *MockContractManagerKeeper) EXPECT() *MockContractManagerKeeperMockRecor } // AddContractFailure mocks base method. -func (m *MockContractManagerKeeper) AddContractFailure(ctx types.Context, packet types1.Packet, address, ackType string, ack *types1.Acknowledgement) { +func (m *MockContractManagerKeeper) AddContractFailure(ctx types.Context, packet *types1.Packet, address, ackType string, ack *types1.Acknowledgement) { m.ctrl.T.Helper() m.ctrl.Call(m, "AddContractFailure", ctx, packet, address, ackType, ack) } diff --git a/wasmbinding/bindings/query.go b/wasmbinding/bindings/query.go index aa0c2d314..d4593b384 100644 --- a/wasmbinding/bindings/query.go +++ b/wasmbinding/bindings/query.go @@ -2,7 +2,6 @@ package bindings import ( "encoding/json" - contractmanagertypes "github.com/neutron-org/neutron/x/contractmanager/types" feerefundertypes "github.com/neutron-org/neutron/x/feerefunder/types" diff --git a/wasmbinding/test/custom_message_test.go b/wasmbinding/test/custom_message_test.go index a2eaa68ac..574544761 100644 --- a/wasmbinding/test/custom_message_test.go +++ b/wasmbinding/test/custom_message_test.go @@ -608,7 +608,7 @@ func (suite *CustomMessengerTestSuite) TestResubmitFailureAck() { Response: &ibcchanneltypes.Acknowledgement_Result{Result: []byte("Result")}, } failureID := suite.messenger.ContractmanagerKeeper.GetNextFailureIDKey(suite.ctx, suite.contractAddress.String()) - suite.messenger.ContractmanagerKeeper.AddContractFailure(suite.ctx, packet, suite.contractAddress.String(), "ack", &ack) + suite.messenger.ContractmanagerKeeper.AddContractFailure(suite.ctx, &packet, suite.contractAddress.String(), "ack", &ack) // Craft message msg, err := json.Marshal(bindings.NeutronMsg{ @@ -641,7 +641,7 @@ func (suite *CustomMessengerTestSuite) TestResubmitFailureTimeout() { Response: &ibcchanneltypes.Acknowledgement_Error{Error: "Error"}, } failureId := suite.messenger.ContractmanagerKeeper.GetNextFailureIDKey(suite.ctx, suite.contractAddress.String()) - suite.messenger.ContractmanagerKeeper.AddContractFailure(suite.ctx, packet, suite.contractAddress.String(), "timeout", &ack) + suite.messenger.ContractmanagerKeeper.AddContractFailure(suite.ctx, &packet, suite.contractAddress.String(), "timeout", &ack) // Craft message msg, err := json.Marshal(bindings.NeutronMsg{ @@ -674,7 +674,7 @@ func (suite *CustomMessengerTestSuite) TestResubmitFailureFromDifferentContract( Response: &ibcchanneltypes.Acknowledgement_Error{Error: "Error"}, } failureId := suite.messenger.ContractmanagerKeeper.GetNextFailureIDKey(suite.ctx, testutil.TestOwnerAddress) - suite.messenger.ContractmanagerKeeper.AddContractFailure(suite.ctx, packet, testutil.TestOwnerAddress, "timeout", &ack) + suite.messenger.ContractmanagerKeeper.AddContractFailure(suite.ctx, &packet, testutil.TestOwnerAddress, "timeout", &ack) // Craft message msg, err := json.Marshal(bindings.NeutronMsg{ diff --git a/x/contractmanager/genesis.go b/x/contractmanager/genesis.go index f0ed5a80b..35604dfe4 100644 --- a/x/contractmanager/genesis.go +++ b/x/contractmanager/genesis.go @@ -11,7 +11,7 @@ import ( func InitGenesis(ctx sdk.Context, k keeper.Keeper, genState types.GenesisState) { // Set all the failure for _, elem := range genState.FailuresList { - k.AddContractFailure(ctx, *elem.Packet, elem.Address, elem.AckType, elem.Ack) + k.AddContractFailure(ctx, elem.Packet, elem.Address, elem.AckType, elem.Ack) } // this line is used by starport scaffolding # genesis/module/init err := k.SetParams(ctx, genState.Params) diff --git a/x/contractmanager/keeper/failure.go b/x/contractmanager/keeper/failure.go index 056811fca..d5486dba2 100644 --- a/x/contractmanager/keeper/failure.go +++ b/x/contractmanager/keeper/failure.go @@ -11,11 +11,11 @@ import ( ) // AddContractFailure adds a specific failure to the store using address as the key -func (k Keeper) AddContractFailure(ctx sdk.Context, packet ibcchanneltypes.Packet, address, ackType string, ack *ibcchanneltypes.Acknowledgement) { +func (k Keeper) AddContractFailure(ctx sdk.Context, packet *ibcchanneltypes.Packet, address, ackType string, ack *ibcchanneltypes.Acknowledgement) { failure := types.Failure{ ChannelId: packet.SourceChannel, Address: address, - Packet: &packet, + Packet: packet, AckType: ackType, Ack: ack, } diff --git a/x/contractmanager/keeper/failure_test.go b/x/contractmanager/keeper/failure_test.go index b1bb7504b..76e93475e 100644 --- a/x/contractmanager/keeper/failure_test.go +++ b/x/contractmanager/keeper/failure_test.go @@ -3,6 +3,7 @@ package keeper_test import ( "crypto/rand" "encoding/json" + "fmt" "strconv" "testing" @@ -45,7 +46,7 @@ func createNFailure(keeper *keeper.Keeper, ctx sdk.Context, addresses, failures items[i][c].Id = uint64(c) items[i][c].Packet = &p items[i][c].Ack = nil - keeper.AddContractFailure(ctx, p, items[i][c].Address, "", nil) + keeper.AddContractFailure(ctx, &p, items[i][c].Address, "", nil) } } return items @@ -83,7 +84,7 @@ func TestAddGetFailure(t *testing.T) { contractAddress := sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress) k, ctx := keepertest.ContractManagerKeeper(t, nil) failureID := k.GetNextFailureIDKey(ctx, contractAddress.String()) - k.AddContractFailure(ctx, channeltypes.Packet{}, contractAddress.String(), "ack", &channeltypes.Acknowledgement{}) + k.AddContractFailure(ctx, &channeltypes.Packet{}, contractAddress.String(), "ack", &channeltypes.Acknowledgement{}) failure, err := k.GetFailure(ctx, contractAddress, failureID) require.NoError(t, err) require.Equal(t, failureID, failure.Id) @@ -105,7 +106,7 @@ func TestResubmitFailure(t *testing.T) { wk := mock_types.NewMockWasmKeeper(ctrl) k, ctx := keepertest.ContractManagerKeeper(t, wk) - // add failure + // add ack failure contractAddr := sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress) data := []byte("Result") packet := channeltypes.Packet{} @@ -113,31 +114,139 @@ func TestResubmitFailure(t *testing.T) { Response: &channeltypes.Acknowledgement_Result{Result: data}, } failureID := k.GetNextFailureIDKey(ctx, contractAddr.String()) - k.AddContractFailure(ctx, packet, contractAddr.String(), "ack", &ack) + k.AddContractFailure(ctx, &packet, contractAddr.String(), "ack", &ack) - // successful resubmit with ack and ack = response - x := types.MessageResponse{} - x.Response.Data = data - x.Response.Request = channeltypes.Packet{} - msg, err := json.Marshal(x) + // success response + xSuc := types.MessageResponse{} + xSuc.Response.Data = data + xSuc.Response.Request = channeltypes.Packet{} + msgSuc, err := json.Marshal(xSuc) + require.NoError(t, err) + // error response + xErr := types.MessageError{} + xErr.Error.Request = channeltypes.Packet{} + xErr.Error.Details = "error details" + msgErr, err := json.Marshal(xErr) + require.NoError(t, err) + // timeout response + xTimeout := types.MessageTimeout{} + xTimeout.Timeout.Request = channeltypes.Packet{} + msgTimeout, err := json.Marshal(xTimeout) require.NoError(t, err) + // case: successful resubmit with ack and ack = response wk.EXPECT().HasContractInfo(gomock.AssignableToTypeOf(ctx), contractAddr).Return(true) - wk.EXPECT().Sudo(gomock.AssignableToTypeOf(ctx), contractAddr, msg) + wk.EXPECT().Sudo(gomock.AssignableToTypeOf(ctx), contractAddr, msgSuc).Return([]byte{}, nil) failure, err := k.GetFailure(ctx, contractAddr, failureID) require.NoError(t, err) err = k.ResubmitFailure(ctx, contractAddr, failure) require.NoError(t, err) + // failure should be deleted + _, err = k.GetFailure(ctx, contractAddr, failureID) + require.ErrorContains(t, err, "key not found") + + // case: failed resubmit with ack and ack = response + failureID2 := k.GetNextFailureIDKey(ctx, contractAddr.String()) + k.AddContractFailure(ctx, &packet, contractAddr.String(), "ack", &ack) + + wk.EXPECT().HasContractInfo(gomock.AssignableToTypeOf(ctx), contractAddr).Return(true) + wk.EXPECT().Sudo(gomock.AssignableToTypeOf(ctx), contractAddr, msgSuc).Return(nil, fmt.Errorf("failed to Sudo")) + + failure2, err := k.GetFailure(ctx, contractAddr, failureID2) + require.NoError(t, err) + err = k.ResubmitFailure(ctx, contractAddr, failure2) + require.ErrorContains(t, err, "cannot resubmit failure ack response") + // failure is still there + failureAfter2, err := k.GetFailure(ctx, contractAddr, failureID2) + require.NoError(t, err) + require.Equal(t, failureAfter2.Id, failure2.Id) + + // case: successful resubmit with ack and ack = error + // add error failure + ack = channeltypes.Acknowledgement{ + Response: &channeltypes.Acknowledgement_Error{Error: "not able to do IBC tx"}, + } + failureID3 := k.GetNextFailureIDKey(ctx, contractAddr.String()) + k.AddContractFailure(ctx, &packet, contractAddr.String(), "ack", &ack) + + wk.EXPECT().HasContractInfo(gomock.AssignableToTypeOf(ctx), contractAddr).Return(true) + wk.EXPECT().Sudo(gomock.AssignableToTypeOf(ctx), contractAddr, msgErr).Return([]byte{}, nil) + + failure3, err := k.GetFailure(ctx, contractAddr, failureID3) + require.NoError(t, err) + err = k.ResubmitFailure(ctx, contractAddr, failure3) + require.NoError(t, err) + // failure should be deleted + _, err = k.GetFailure(ctx, contractAddr, failureID3) + require.ErrorContains(t, err, "key not found") + + // case: failed resubmit with ack and ack = error + failureID4 := k.GetNextFailureIDKey(ctx, contractAddr.String()) + k.AddContractFailure(ctx, &packet, contractAddr.String(), "ack", &ack) + + wk.EXPECT().HasContractInfo(gomock.AssignableToTypeOf(ctx), contractAddr).Return(true) + wk.EXPECT().Sudo(gomock.AssignableToTypeOf(ctx), contractAddr, msgErr).Return(nil, fmt.Errorf("failed to Sudo")) + + failure4, err := k.GetFailure(ctx, contractAddr, failureID4) + require.NoError(t, err) + err = k.ResubmitFailure(ctx, contractAddr, failure4) + require.ErrorContains(t, err, "cannot resubmit failure ack response") + // failure is still there + failureAfter4, err := k.GetFailure(ctx, contractAddr, failureID4) + require.NoError(t, err) + require.Equal(t, failureAfter4.Id, failure4.Id) + + // case: successful resubmit with timeout + // add error failure + ack = channeltypes.Acknowledgement{ + Response: &channeltypes.Acknowledgement_Error{Error: "not able to do IBC tx"}, + } + failureID5 := k.GetNextFailureIDKey(ctx, contractAddr.String()) + k.AddContractFailure(ctx, &packet, contractAddr.String(), "timeout", nil) + + wk.EXPECT().HasContractInfo(gomock.AssignableToTypeOf(ctx), contractAddr).Return(true) + wk.EXPECT().Sudo(gomock.AssignableToTypeOf(ctx), contractAddr, msgTimeout).Return([]byte{}, nil) + + failure5, err := k.GetFailure(ctx, contractAddr, failureID5) + require.NoError(t, err) + err = k.ResubmitFailure(ctx, contractAddr, failure5) + require.NoError(t, err) + // failure should be deleted + _, err = k.GetFailure(ctx, contractAddr, failureID5) + require.ErrorContains(t, err, "key not found") - // failed resubmit with ack and ack = response + // case: failed resubmit with timeout + failureID6 := k.GetNextFailureIDKey(ctx, contractAddr.String()) + k.AddContractFailure(ctx, &packet, contractAddr.String(), "timeout", nil) - // successful resubmit with ack and ack = error - // failed resubmit with ack and ack = error + wk.EXPECT().HasContractInfo(gomock.AssignableToTypeOf(ctx), contractAddr).Return(true) + wk.EXPECT().Sudo(gomock.AssignableToTypeOf(ctx), contractAddr, msgTimeout).Return(nil, fmt.Errorf("failed to Sudo")) - // successful resubmit with timeout - // failed resubmit with timeout + failure6, err := k.GetFailure(ctx, contractAddr, failureID6) + require.NoError(t, err) + err = k.ResubmitFailure(ctx, contractAddr, failure6) + require.ErrorContains(t, err, "cannot resubmit failure ack response") + // failure is still there + failureAfter6, err := k.GetFailure(ctx, contractAddr, failureID6) + require.NoError(t, err) + require.Equal(t, failureAfter6.Id, failure6.Id) // no Failure.Ack field found for ackType = 'ack' + failureID7 := k.GetNextFailureIDKey(ctx, contractAddr.String()) + k.AddContractFailure(ctx, &packet, contractAddr.String(), "ack", nil) + + failure7, err := k.GetFailure(ctx, contractAddr, failureID7) + require.NoError(t, err) + err = k.ResubmitFailure(ctx, contractAddr, failure7) + require.ErrorContains(t, err, "cannot resubmit failure without acknowledgement") + // no Failure.Packet found + failureID8 := k.GetNextFailureIDKey(ctx, contractAddr.String()) + k.AddContractFailure(ctx, nil, contractAddr.String(), "ack", nil) + + failure8, err := k.GetFailure(ctx, contractAddr, failureID8) + require.NoError(t, err) + err = k.ResubmitFailure(ctx, contractAddr, failure8) + require.ErrorContains(t, err, "cannot resubmit failure without packet info") } diff --git a/x/interchaintxs/keeper/ibc_handlers.go b/x/interchaintxs/keeper/ibc_handlers.go index d0a48f1a7..9824ca86d 100644 --- a/x/interchaintxs/keeper/ibc_handlers.go +++ b/x/interchaintxs/keeper/ibc_handlers.go @@ -36,7 +36,7 @@ func (k *Keeper) outOfGasRecovery( } k.Logger(ctx).Debug("Out of gas", "Gas meter", gasMeter.String()) - k.contractManagerKeeper.AddContractFailure(ctx, packet, senderAddress.String(), failureAckType, ack) + k.contractManagerKeeper.AddContractFailure(ctx, &packet, senderAddress.String(), failureAckType, ack) } } @@ -110,7 +110,7 @@ func (k *Keeper) HandleAcknowledgement(ctx sdk.Context, packet channeltypes.Pack } if err != nil { - k.contractManagerKeeper.AddContractFailure(ctx, packet, icaOwner.GetContract().String(), "ack", &ack) + k.contractManagerKeeper.AddContractFailure(ctx, &packet, icaOwner.GetContract().String(), "ack", &ack) k.Logger(ctx).Debug("HandleAcknowledgement: failed to Sudo contract on packet acknowledgement", "error", err) } else { ctx.EventManager().EmitEvents(cacheCtx.EventManager().Events()) @@ -142,7 +142,7 @@ func (k *Keeper) HandleTimeout(ctx sdk.Context, packet channeltypes.Packet, rela _, err = k.contractManagerKeeper.SudoTimeout(cacheCtx, icaOwner.GetContract(), packet) if err != nil { - k.contractManagerKeeper.AddContractFailure(ctx, packet, icaOwner.GetContract().String(), "timeout", nil) + k.contractManagerKeeper.AddContractFailure(ctx, &packet, icaOwner.GetContract().String(), "timeout", nil) k.Logger(ctx).Error("HandleTimeout: failed to Sudo contract on packet timeout", "error", err) } else { ctx.EventManager().EmitEvents(cacheCtx.EventManager().Events()) diff --git a/x/interchaintxs/keeper/ibc_handlers_test.go b/x/interchaintxs/keeper/ibc_handlers_test.go index ff0a245a7..06dbe0e15 100644 --- a/x/interchaintxs/keeper/ibc_handlers_test.go +++ b/x/interchaintxs/keeper/ibc_handlers_test.go @@ -71,7 +71,7 @@ func TestHandleAcknowledgement(t *testing.T) { store := cachedCtx.KVStore(storeKey) store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) // consumes 2990 }).Return(nil, fmt.Errorf("SudoResponse error")) - cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "ack", &resACK) + cmKeeper.EXPECT().AddContractFailure(ctx, &p, contractAddress.String(), "ack", &resACK) feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = icak.HandleAcknowledgement(ctx, p, resAckData, relayerAddress) require.NoError(t, err) @@ -84,7 +84,7 @@ func TestHandleAcknowledgement(t *testing.T) { store := cachedCtx.KVStore(storeKey) store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) }).Return(nil, fmt.Errorf("SudoError error")) - cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "ack", &errACK) + cmKeeper.EXPECT().AddContractFailure(ctx, &p, contractAddress.String(), "ack", &errACK) feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = icak.HandleAcknowledgement(ctx, p, errAckData, relayerAddress) require.NoError(t, err) @@ -109,7 +109,7 @@ func TestHandleAcknowledgement(t *testing.T) { store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) cachedCtx.GasMeter().ConsumeGas(cachedCtx.GasMeter().Limit()+1, "out of gas test") }).Return(nil, fmt.Errorf("SudoError error")) - cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "ack", &errACK) + cmKeeper.EXPECT().AddContractFailure(ctx, &p, contractAddress.String(), "ack", &errACK) feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = icak.HandleAcknowledgement(ctx, p, errAckData, relayerAddress) require.NoError(t, err) @@ -144,7 +144,7 @@ func TestHandleAcknowledgement(t *testing.T) { cachedCtx.GasMeter().ConsumeGas(1, "Sudo response consumption") }).Return(nil, nil) feeKeeper.EXPECT().DistributeAcknowledgementFee(lowGasCtx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) - cmKeeper.EXPECT().AddContractFailure(lowGasCtx, p, contractAddress.String(), "ack", &resACK).Do(func(ctx sdk.Context, packet channeltypes.Packet, address, ackType string, ack channeltypes.Acknowledgement) { + cmKeeper.EXPECT().AddContractFailure(lowGasCtx, &p, contractAddress.String(), "ack", &resACK).Do(func(ctx sdk.Context, packet channeltypes.Packet, address, ackType string, ack channeltypes.Acknowledgement) { ctx.GasMeter().ConsumeGas(keeper.GasReserve, "out of gas") }) require.Panics(t, func() { icak.HandleAcknowledgement(lowGasCtx, p, resAckData, relayerAddress) }) //nolint:errcheck // this is a panic test @@ -194,7 +194,7 @@ func TestHandleTimeout(t *testing.T) { store := cachedCtx.KVStore(storeKey) store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) }).Return(nil, fmt.Errorf("SudoTimeout error")) - cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "timeout", nil) + cmKeeper.EXPECT().AddContractFailure(ctx, &p, contractAddress.String(), "timeout", nil) feeKeeper.EXPECT().DistributeTimeoutFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = icak.HandleTimeout(ctx, p, relayerAddress) require.NoError(t, err) @@ -207,7 +207,7 @@ func TestHandleTimeout(t *testing.T) { store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) cachedCtx.GasMeter().ConsumeGas(cachedCtx.GasMeter().Limit()+1, "out of gas test") }).Return(nil, fmt.Errorf("SudoTimeout error")) - cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "timeout", nil) + cmKeeper.EXPECT().AddContractFailure(ctx, &p, contractAddress.String(), "timeout", nil) feeKeeper.EXPECT().DistributeTimeoutFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = icak.HandleTimeout(ctx, p, relayerAddress) require.NoError(t, err) diff --git a/x/interchaintxs/types/expected_keepers.go b/x/interchaintxs/types/expected_keepers.go index 6ef2d2b65..10261381e 100644 --- a/x/interchaintxs/types/expected_keepers.go +++ b/x/interchaintxs/types/expected_keepers.go @@ -26,7 +26,7 @@ type BankKeeper interface { type ContractManagerKeeper interface { HasContractInfo(ctx sdk.Context, contractAddress sdk.AccAddress) bool - AddContractFailure(ctx sdk.Context, packet channeltypes.Packet, address, ackType string, ack *channeltypes.Acknowledgement) + AddContractFailure(ctx sdk.Context, packet *channeltypes.Packet, address, ackType string, ack *channeltypes.Acknowledgement) SudoResponse(ctx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, msg []byte) ([]byte, error) SudoError(ctx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, details string) ([]byte, error) SudoTimeout(ctx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet) ([]byte, error) diff --git a/x/transfer/ibc_handlers.go b/x/transfer/ibc_handlers.go index 642f5da72..fddd135a0 100644 --- a/x/transfer/ibc_handlers.go +++ b/x/transfer/ibc_handlers.go @@ -35,7 +35,7 @@ func (im IBCModule) outOfGasRecovery( } im.keeper.Logger(ctx).Debug("Out of gas", "Gas meter", gasMeter.String(), "Packet data", data) - im.ContractManagerKeeper.AddContractFailure(ctx, packet, senderAddress.String(), failureType, ack) + im.ContractManagerKeeper.AddContractFailure(ctx, &packet, senderAddress.String(), failureType, ack) // FIXME: add distribution call } } @@ -114,7 +114,7 @@ func (im IBCModule) HandleAcknowledgement(ctx sdk.Context, packet channeltypes.P } if err != nil { - im.ContractManagerKeeper.AddContractFailure(ctx, packet, senderAddress.String(), "ack", &ack) + im.ContractManagerKeeper.AddContractFailure(ctx, &packet, senderAddress.String(), "ack", &ack) im.keeper.Logger(ctx).Debug("failed to Sudo contract on packet acknowledgement", err) } else { ctx.EventManager().EmitEvents(cacheCtx.EventManager().Events()) @@ -151,7 +151,7 @@ func (im IBCModule) HandleTimeout(ctx sdk.Context, packet channeltypes.Packet, r _, err = im.ContractManagerKeeper.SudoTimeout(cacheCtx, senderAddress, packet) if err != nil { - im.ContractManagerKeeper.AddContractFailure(ctx, packet, senderAddress.String(), "timeout", nil) + im.ContractManagerKeeper.AddContractFailure(ctx, &packet, senderAddress.String(), "timeout", nil) im.keeper.Logger(ctx).Debug("failed to Sudo contract on packet timeout", err) } else { ctx.EventManager().EmitEvents(cacheCtx.EventManager().Events()) diff --git a/x/transfer/ibc_handlers_test.go b/x/transfer/ibc_handlers_test.go index a0f149de6..7d3553bc6 100644 --- a/x/transfer/ibc_handlers_test.go +++ b/x/transfer/ibc_handlers_test.go @@ -100,7 +100,7 @@ func TestHandleAcknowledgement(t *testing.T) { store := cachedCtx.KVStore(storeKey) store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) // consumes 2990 }).Return(nil, fmt.Errorf("SudoResponse error")) - cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "ack", &resACK) + cmKeeper.EXPECT().AddContractFailure(ctx, &p, contractAddress.String(), "ack", &resACK) cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(false) err = txModule.HandleAcknowledgement(ctx, p, resAckData, relayerAddress) require.NoError(t, err) @@ -113,7 +113,7 @@ func TestHandleAcknowledgement(t *testing.T) { store := cachedCtx.KVStore(storeKey) store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) // consumes 2990 }).Return(nil, fmt.Errorf("SudoResponse error")) - cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "ack", &resACK) + cmKeeper.EXPECT().AddContractFailure(ctx, &p, contractAddress.String(), "ack", &resACK) cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = txModule.HandleAcknowledgement(ctx, p, resAckData, relayerAddress) @@ -127,7 +127,7 @@ func TestHandleAcknowledgement(t *testing.T) { store := cachedCtx.KVStore(storeKey) store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) // consumes 2990 }).Return(nil, fmt.Errorf("SudoError error")) - cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "ack", &errACK) + cmKeeper.EXPECT().AddContractFailure(ctx, &p, contractAddress.String(), "ack", &errACK) cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(false) // feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = txModule.HandleAcknowledgement(ctx, p, errAckData, relayerAddress) @@ -141,7 +141,7 @@ func TestHandleAcknowledgement(t *testing.T) { store := cachedCtx.KVStore(storeKey) store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) // consumes 2990 }).Return(nil, fmt.Errorf("SudoError error")) - cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "ack", &errACK) + cmKeeper.EXPECT().AddContractFailure(ctx, &p, contractAddress.String(), "ack", &errACK) cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = txModule.HandleAcknowledgement(ctx, p, errAckData, relayerAddress) @@ -179,7 +179,7 @@ func TestHandleAcknowledgement(t *testing.T) { store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) cachedCtx.GasMeter().ConsumeGas(cachedCtx.GasMeter().Limit()+1, "out of gas test") }).Return(nil, fmt.Errorf("SudoError error")) - cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "ack", &errACK) + cmKeeper.EXPECT().AddContractFailure(ctx, &p, contractAddress.String(), "ack", &errACK) // FIXME: fix distribution during outofgas // cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(false) err = txModule.HandleAcknowledgement(ctx, p, errAckData, relayerAddress) @@ -193,7 +193,7 @@ func TestHandleAcknowledgement(t *testing.T) { store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) cachedCtx.GasMeter().ConsumeGas(cachedCtx.GasMeter().Limit()+1, "out of gas test") }).Return(nil, fmt.Errorf("SudoError error")) - cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "ack", &errACK) + cmKeeper.EXPECT().AddContractFailure(ctx, &p, contractAddress.String(), "ack", &errACK) // FIXME: fix distribution during outofgas // cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) // feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) @@ -248,7 +248,7 @@ func TestHandleAcknowledgement(t *testing.T) { cachedCtx.GasMeter().ConsumeGas(1, "Sudo response consumption") }).Return(nil, nil) // feeKeeper.EXPECT().DistributeAcknowledgementFee(lowGasCtx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) - cmKeeper.EXPECT().AddContractFailure(lowGasCtx, p, contractAddress.String(), "ack", &resACK).Do(func(ctx sdk.Context, packet channeltypes.Packet, address, ackType string, ack channeltypes.Acknowledgement) { + cmKeeper.EXPECT().AddContractFailure(lowGasCtx, &p, contractAddress.String(), "ack", &resACK).Do(func(ctx sdk.Context, packet channeltypes.Packet, address, ackType string, ack channeltypes.Acknowledgement) { ctx.GasMeter().ConsumeGas(keeper.GasReserve, "out of gas") }) require.Panics(t, func() { txModule.HandleAcknowledgement(lowGasCtx, p, resAckData, relayerAddress) }) //nolint:errcheck // this is a test @@ -342,7 +342,7 @@ func TestHandleTimeout(t *testing.T) { store := cachedCtx.KVStore(storeKey) store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) }).Return(nil, fmt.Errorf("SudoTimeout error")) - cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "timeout", nil) + cmKeeper.EXPECT().AddContractFailure(ctx, &p, contractAddress.String(), "timeout", nil) cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(false) err = txModule.HandleTimeout(ctx, p, relayerAddress) require.NoError(t, err) @@ -354,7 +354,7 @@ func TestHandleTimeout(t *testing.T) { store := cachedCtx.KVStore(storeKey) store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) }).Return(nil, fmt.Errorf("SudoTimeout error")) - cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "timeout", nil) + cmKeeper.EXPECT().AddContractFailure(ctx, &p, contractAddress.String(), "timeout", nil) cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) feeKeeper.EXPECT().DistributeTimeoutFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = txModule.HandleTimeout(ctx, p, relayerAddress) @@ -368,7 +368,7 @@ func TestHandleTimeout(t *testing.T) { store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) cachedCtx.GasMeter().ConsumeGas(cachedCtx.GasMeter().Limit()+1, "out of gas test") }).Return(nil, fmt.Errorf("SudoTimeout error")) - cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "timeout", nil) + cmKeeper.EXPECT().AddContractFailure(ctx, &p, contractAddress.String(), "timeout", nil) // cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(false) err = txModule.HandleTimeout(ctx, p, relayerAddress) require.NoError(t, err) @@ -381,7 +381,7 @@ func TestHandleTimeout(t *testing.T) { store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) cachedCtx.GasMeter().ConsumeGas(cachedCtx.GasMeter().Limit()+1, "out of gas test") }).Return(nil, fmt.Errorf("SudoTimeout error")) - cmKeeper.EXPECT().AddContractFailure(ctx, p, contractAddress.String(), "timeout", nil) + cmKeeper.EXPECT().AddContractFailure(ctx, &p, contractAddress.String(), "timeout", nil) // FIXME: make DistributeTimeoutFee during out of gas // cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) // feeKeeper.EXPECT().DistributeTimeoutFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) diff --git a/x/transfer/types/expected_keepers.go b/x/transfer/types/expected_keepers.go index f66386941..d2051ec76 100644 --- a/x/transfer/types/expected_keepers.go +++ b/x/transfer/types/expected_keepers.go @@ -11,7 +11,7 @@ import ( // ContractManagerKeeper defines the expected interface needed to add ack information about sudo failure. type ContractManagerKeeper interface { HasContractInfo(ctx sdk.Context, contractAddress sdk.AccAddress) bool - AddContractFailure(ctx sdk.Context, packet channeltypes.Packet, address, ackType string, ack *channeltypes.Acknowledgement) + AddContractFailure(ctx sdk.Context, packet *channeltypes.Packet, address, ackType string, ack *channeltypes.Acknowledgement) SudoResponse(ctx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, msg []byte) ([]byte, error) SudoError(ctx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, details string) ([]byte, error) SudoTimeout(ctx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet) ([]byte, error) From a09943391ae53f495ed4c0f266bd31473ca0fd4f Mon Sep 17 00:00:00 2001 From: nhpd Date: Thu, 17 Aug 2023 13:36:56 +0400 Subject: [PATCH 040/307] remove channel_id from failure (duplicate); fix tests --- app/upgrades/nextupgrade/upgrades.go | 11 +- app/upgrades/nextupgrade/upgrades_test.go | 58 ++++----- proto/neutron/contractmanager/genesis.proto | 12 +- x/contractmanager/genesis_test.go | 2 + x/contractmanager/keeper/failure.go | 12 +- x/contractmanager/keeper/failure_test.go | 29 ++--- x/contractmanager/types/genesis.pb.go | 135 ++++++-------------- 7 files changed, 98 insertions(+), 161 deletions(-) diff --git a/app/upgrades/nextupgrade/upgrades.go b/app/upgrades/nextupgrade/upgrades.go index cdb0c372f..488caa88c 100644 --- a/app/upgrades/nextupgrade/upgrades.go +++ b/app/upgrades/nextupgrade/upgrades.go @@ -36,12 +36,11 @@ func MigrateFailures(ctx sdk.Context, storeKeys upgrades.StoreKeys, cdc codec.Co store := ctx.KVStore(storeKeys.GetKey(contractmanagertypes.StoreKey)) for _, oldItem := range oldFailuresList { failure := contractmanagertypes.Failure{ - ChannelId: oldItem.ChannelId, - Address: oldItem.Address, - Id: oldItem.Id, - AckType: oldItem.AckType, - Packet: nil, - Ack: nil, + Address: oldItem.Address, + Id: oldItem.Id, + AckType: oldItem.AckType, + Packet: nil, + Ack: nil, } bz := cdc.MustMarshal(&failure) store.Set(contractmanagertypes.GetFailureKey(failure.Address, failure.Id), bz) diff --git a/app/upgrades/nextupgrade/upgrades_test.go b/app/upgrades/nextupgrade/upgrades_test.go index d4665508f..f8e244de9 100644 --- a/app/upgrades/nextupgrade/upgrades_test.go +++ b/app/upgrades/nextupgrade/upgrades_test.go @@ -1,7 +1,6 @@ package nextupgrade_test import ( - "fmt" "testing" contractmanagertypes "github.com/neutron-org/neutron/x/contractmanager/types" @@ -73,7 +72,7 @@ func (suite *UpgradeTestSuite) TestFailuresUpgrade() { addr = addressTwo } failure := contractmanagertypes.OldFailure{ - ChannelId: fmt.Sprintf("channel-%d", i), + ChannelId: "channel-0", Address: addr, Id: i % 2, AckType: "ack", @@ -92,36 +91,32 @@ func (suite *UpgradeTestSuite) TestFailuresUpgrade() { // check elements migrated properly suite.Require().ElementsMatch(app.ContractManagerKeeper.GetAllFailures(ctx), []contractmanagertypes.Failure{ { - ChannelId: "channel-0", - Address: addressOne, - Id: 0, - AckType: "ack", - Packet: nil, - Ack: nil, + Address: addressOne, + Id: 0, + AckType: "ack", + Packet: nil, + Ack: nil, }, { - ChannelId: "channel-1", - Address: addressOne, - Id: 1, - AckType: "ack", - Packet: nil, - Ack: nil, + Address: addressOne, + Id: 1, + AckType: "ack", + Packet: nil, + Ack: nil, }, { - ChannelId: "channel-2", - Address: addressTwo, - Id: 0, - AckType: "ack", - Packet: nil, - Ack: nil, + Address: addressTwo, + Id: 0, + AckType: "ack", + Packet: nil, + Ack: nil, }, { - ChannelId: "channel-3", - Address: addressTwo, - Id: 1, - AckType: "ack", - Packet: nil, - Ack: nil, + Address: addressTwo, + Id: 1, + AckType: "ack", + Packet: nil, + Ack: nil, }, }) @@ -129,12 +124,11 @@ func (suite *UpgradeTestSuite) TestFailuresUpgrade() { failure, err := app.ContractManagerKeeper.GetFailure(ctx, sdk.MustAccAddressFromBech32(addressTwo), 1) suite.Require().NoError(err) suite.Require().Equal(failure, &contractmanagertypes.Failure{ - ChannelId: "channel-3", - Address: addressTwo, - Id: 1, - AckType: "ack", - Packet: nil, - Ack: nil, + Address: addressTwo, + Id: 1, + AckType: "ack", + Packet: nil, + Ack: nil, }) // non-existent returns error diff --git a/proto/neutron/contractmanager/genesis.proto b/proto/neutron/contractmanager/genesis.proto index 1f27e02ce..a2960566c 100644 --- a/proto/neutron/contractmanager/genesis.proto +++ b/proto/neutron/contractmanager/genesis.proto @@ -12,18 +12,16 @@ option go_package = "github.com/neutron-org/neutron/x/contractmanager/types"; // replay ACK in case of requirement. // Note that Failure means that sudo handler to cosmwasm contract failed for some reason message Failure { - // ChannelId - string channel_id = 1; // Address of the failed contract - string address = 2; + string address = 1; // Id of the failure under specific address - uint64 id = 3; + uint64 id = 2; // Acknowledgement type - string ack_type = 4; + string ack_type = 3; // IBC Packet - ibc.core.channel.v1.Packet packet = 5; + ibc.core.channel.v1.Packet packet = 4; // Acknowledgement - ibc.core.channel.v1.Acknowledgement ack = 6; + ibc.core.channel.v1.Acknowledgement ack = 5; } // GenesisState defines the contractmanager module's genesis state. diff --git a/x/contractmanager/genesis_test.go b/x/contractmanager/genesis_test.go index ffbb0477e..76899b739 100644 --- a/x/contractmanager/genesis_test.go +++ b/x/contractmanager/genesis_test.go @@ -21,6 +21,7 @@ func TestGenesis(t *testing.T) { { Address: "address1", Id: 1, + AckType: "ack", Packet: &channeltypes.Packet{ Sequence: 1, }, @@ -28,6 +29,7 @@ func TestGenesis(t *testing.T) { { Address: "address1", Id: 2, + AckType: "timeout", Packet: &channeltypes.Packet{ Sequence: 2, }, diff --git a/x/contractmanager/keeper/failure.go b/x/contractmanager/keeper/failure.go index d5486dba2..d0ee9ebd5 100644 --- a/x/contractmanager/keeper/failure.go +++ b/x/contractmanager/keeper/failure.go @@ -13,17 +13,15 @@ import ( // AddContractFailure adds a specific failure to the store using address as the key func (k Keeper) AddContractFailure(ctx sdk.Context, packet *ibcchanneltypes.Packet, address, ackType string, ack *ibcchanneltypes.Acknowledgement) { failure := types.Failure{ - ChannelId: packet.SourceChannel, - Address: address, - Packet: packet, - AckType: ackType, - Ack: ack, + Address: address, + AckType: ackType, + Packet: packet, + Ack: ack, } nextFailureID := k.GetNextFailureIDKey(ctx, failure.GetAddress()) + failure.Id = nextFailureID store := ctx.KVStore(k.storeKey) - - failure.Id = nextFailureID bz := k.cdc.MustMarshal(&failure) store.Set(types.GetFailureKey(failure.GetAddress(), nextFailureID), bz) } diff --git a/x/contractmanager/keeper/failure_test.go b/x/contractmanager/keeper/failure_test.go index 76e93475e..d0f8abe75 100644 --- a/x/contractmanager/keeper/failure_test.go +++ b/x/contractmanager/keeper/failure_test.go @@ -38,9 +38,8 @@ func createNFailure(keeper *keeper.Keeper, ctx sdk.Context, addresses, failures for c := range items[i] { p := channeltypes.Packet{ - Sequence: 0, - SourcePort: "port-n", - SourceChannel: items[i][c].ChannelId, + Sequence: 0, + SourcePort: "port-n", } items[i][c].Address = acc.String() items[i][c].Id = uint64(c) @@ -106,13 +105,17 @@ func TestResubmitFailure(t *testing.T) { wk := mock_types.NewMockWasmKeeper(ctrl) k, ctx := keepertest.ContractManagerKeeper(t, wk) - // add ack failure contractAddr := sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress) data := []byte("Result") - packet := channeltypes.Packet{} ack := channeltypes.Acknowledgement{ Response: &channeltypes.Acknowledgement_Result{Result: data}, } + ackError := channeltypes.Acknowledgement{ + Response: &channeltypes.Acknowledgement_Error{Error: "not able to do IBC tx"}, + } + + // add ack failure + packet := channeltypes.Packet{} failureID := k.GetNextFailureIDKey(ctx, contractAddr.String()) k.AddContractFailure(ctx, &packet, contractAddr.String(), "ack", &ack) @@ -125,7 +128,7 @@ func TestResubmitFailure(t *testing.T) { // error response xErr := types.MessageError{} xErr.Error.Request = channeltypes.Packet{} - xErr.Error.Details = "error details" + xErr.Error.Details = "not able to do IBC tx" msgErr, err := json.Marshal(xErr) require.NoError(t, err) // timeout response @@ -164,11 +167,8 @@ func TestResubmitFailure(t *testing.T) { // case: successful resubmit with ack and ack = error // add error failure - ack = channeltypes.Acknowledgement{ - Response: &channeltypes.Acknowledgement_Error{Error: "not able to do IBC tx"}, - } failureID3 := k.GetNextFailureIDKey(ctx, contractAddr.String()) - k.AddContractFailure(ctx, &packet, contractAddr.String(), "ack", &ack) + k.AddContractFailure(ctx, &packet, contractAddr.String(), "ack", &ackError) wk.EXPECT().HasContractInfo(gomock.AssignableToTypeOf(ctx), contractAddr).Return(true) wk.EXPECT().Sudo(gomock.AssignableToTypeOf(ctx), contractAddr, msgErr).Return([]byte{}, nil) @@ -183,7 +183,7 @@ func TestResubmitFailure(t *testing.T) { // case: failed resubmit with ack and ack = error failureID4 := k.GetNextFailureIDKey(ctx, contractAddr.String()) - k.AddContractFailure(ctx, &packet, contractAddr.String(), "ack", &ack) + k.AddContractFailure(ctx, &packet, contractAddr.String(), "ack", &ackError) wk.EXPECT().HasContractInfo(gomock.AssignableToTypeOf(ctx), contractAddr).Return(true) wk.EXPECT().Sudo(gomock.AssignableToTypeOf(ctx), contractAddr, msgErr).Return(nil, fmt.Errorf("failed to Sudo")) @@ -191,7 +191,7 @@ func TestResubmitFailure(t *testing.T) { failure4, err := k.GetFailure(ctx, contractAddr, failureID4) require.NoError(t, err) err = k.ResubmitFailure(ctx, contractAddr, failure4) - require.ErrorContains(t, err, "cannot resubmit failure ack response") + require.ErrorContains(t, err, "cannot resubmit failure ack error") // failure is still there failureAfter4, err := k.GetFailure(ctx, contractAddr, failureID4) require.NoError(t, err) @@ -199,9 +199,6 @@ func TestResubmitFailure(t *testing.T) { // case: successful resubmit with timeout // add error failure - ack = channeltypes.Acknowledgement{ - Response: &channeltypes.Acknowledgement_Error{Error: "not able to do IBC tx"}, - } failureID5 := k.GetNextFailureIDKey(ctx, contractAddr.String()) k.AddContractFailure(ctx, &packet, contractAddr.String(), "timeout", nil) @@ -226,7 +223,7 @@ func TestResubmitFailure(t *testing.T) { failure6, err := k.GetFailure(ctx, contractAddr, failureID6) require.NoError(t, err) err = k.ResubmitFailure(ctx, contractAddr, failure6) - require.ErrorContains(t, err, "cannot resubmit failure ack response") + require.ErrorContains(t, err, "cannot resubmit failure ack timeout") // failure is still there failureAfter6, err := k.GetFailure(ctx, contractAddr, failureID6) require.NoError(t, err) diff --git a/x/contractmanager/types/genesis.pb.go b/x/contractmanager/types/genesis.pb.go index 7787a4683..29787641f 100644 --- a/x/contractmanager/types/genesis.pb.go +++ b/x/contractmanager/types/genesis.pb.go @@ -28,18 +28,16 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // replay ACK in case of requirement. // Note that Failure means that sudo handler to cosmwasm contract failed for some reason type Failure struct { - // ChannelId - ChannelId string `protobuf:"bytes,1,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"` // Address of the failed contract - Address string `protobuf:"bytes,2,opt,name=address,proto3" json:"address,omitempty"` + Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` // Id of the failure under specific address - Id uint64 `protobuf:"varint,3,opt,name=id,proto3" json:"id,omitempty"` + Id uint64 `protobuf:"varint,2,opt,name=id,proto3" json:"id,omitempty"` // Acknowledgement type - AckType string `protobuf:"bytes,4,opt,name=ack_type,json=ackType,proto3" json:"ack_type,omitempty"` + AckType string `protobuf:"bytes,3,opt,name=ack_type,json=ackType,proto3" json:"ack_type,omitempty"` // IBC Packet - Packet *types.Packet `protobuf:"bytes,5,opt,name=packet,proto3" json:"packet,omitempty"` + Packet *types.Packet `protobuf:"bytes,4,opt,name=packet,proto3" json:"packet,omitempty"` // Acknowledgement - Ack *types.Acknowledgement `protobuf:"bytes,6,opt,name=ack,proto3" json:"ack,omitempty"` + Ack *types.Acknowledgement `protobuf:"bytes,5,opt,name=ack,proto3" json:"ack,omitempty"` } func (m *Failure) Reset() { *m = Failure{} } @@ -75,13 +73,6 @@ func (m *Failure) XXX_DiscardUnknown() { var xxx_messageInfo_Failure proto.InternalMessageInfo -func (m *Failure) GetChannelId() string { - if m != nil { - return m.ChannelId - } - return "" -} - func (m *Failure) GetAddress() string { if m != nil { return m.Address @@ -264,34 +255,35 @@ func init() { } var fileDescriptor_cf4a1534315a7490 = []byte{ - // 431 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x92, 0x3f, 0x6f, 0x13, 0x31, - 0x18, 0xc6, 0xe3, 0xfc, 0x2b, 0x75, 0x0a, 0x83, 0x05, 0xc2, 0x04, 0x71, 0x3d, 0xa2, 0x22, 0x65, - 0xc1, 0x56, 0x53, 0xa9, 0x1b, 0x03, 0x1d, 0x40, 0x15, 0x48, 0x44, 0x07, 0x13, 0x4b, 0xe4, 0xd8, - 0xe6, 0x6a, 0xdd, 0xc5, 0x3e, 0xd9, 0x4e, 0xa1, 0x9f, 0x80, 0x95, 0x99, 0x4f, 0xd4, 0xb1, 0x23, - 0x62, 0x40, 0x28, 0xf9, 0x22, 0xe8, 0x1c, 0xdf, 0x10, 0x20, 0x5b, 0xb7, 0xf7, 0xce, 0xbf, 0xe7, - 0xb1, 0xdf, 0xe7, 0x7d, 0xe1, 0x33, 0x2d, 0x97, 0xde, 0x1a, 0x4d, 0xb9, 0xd1, 0xde, 0x32, 0xee, - 0x17, 0x4c, 0xb3, 0x5c, 0x5a, 0x9a, 0x4b, 0x2d, 0x9d, 0x72, 0xa4, 0xb2, 0xc6, 0x1b, 0xf4, 0x30, - 0x62, 0xe4, 0x2f, 0x6c, 0x78, 0x3f, 0x37, 0xb9, 0x09, 0x0c, 0xad, 0xab, 0x0d, 0x3e, 0x3c, 0xda, - 0xe5, 0x5a, 0x31, 0xcb, 0x16, 0xd1, 0x74, 0xf8, 0x54, 0xcd, 0x39, 0xe5, 0xc6, 0x4a, 0xca, 0x2f, - 0x98, 0xd6, 0xb2, 0xa4, 0x97, 0xc7, 0x4d, 0xb9, 0x41, 0x46, 0x3f, 0x01, 0xdc, 0x7b, 0xc5, 0x54, - 0xb9, 0xb4, 0x12, 0x3d, 0x81, 0x30, 0x1e, 0xce, 0x94, 0xc0, 0x20, 0x05, 0xe3, 0xfd, 0x6c, 0x3f, - 0xfe, 0x39, 0x17, 0x08, 0xc3, 0x3d, 0x26, 0x84, 0x95, 0xce, 0xe1, 0x76, 0x38, 0x6b, 0x3e, 0xd1, - 0x3d, 0xd8, 0x56, 0x02, 0x77, 0x52, 0x30, 0xee, 0x66, 0x6d, 0x25, 0xd0, 0x23, 0x78, 0x87, 0xf1, - 0x62, 0xe6, 0xaf, 0x2a, 0x89, 0xbb, 0x11, 0xe5, 0xc5, 0x87, 0xab, 0x4a, 0xa2, 0x13, 0xd8, 0xaf, - 0x18, 0x2f, 0xa4, 0xc7, 0xbd, 0x14, 0x8c, 0x07, 0x93, 0xc7, 0x44, 0xcd, 0x39, 0xa9, 0xdf, 0x48, - 0x9a, 0x87, 0x5d, 0x1e, 0x93, 0x69, 0x40, 0xb2, 0x88, 0xa2, 0x53, 0xd8, 0x61, 0xbc, 0xc0, 0xfd, - 0xa0, 0x38, 0xfa, 0xaf, 0xe2, 0x25, 0x2f, 0xb4, 0xf9, 0x5c, 0x4a, 0x91, 0xcb, 0x85, 0xd4, 0x3e, - 0xab, 0x05, 0xa3, 0xef, 0x00, 0x1e, 0xbc, 0xde, 0xc4, 0xfc, 0xde, 0x33, 0x2f, 0xd1, 0x8b, 0xfa, - 0xf6, 0x3a, 0xa0, 0xd0, 0xdd, 0x60, 0x72, 0x48, 0x76, 0xc4, 0x4e, 0xa6, 0x01, 0x3b, 0xeb, 0x5e, - 0xff, 0x3a, 0x6c, 0x65, 0x51, 0x84, 0xde, 0xc0, 0xbb, 0x9f, 0x36, 0x59, 0xb9, 0x59, 0xa9, 0x9c, - 0xc7, 0xed, 0xb4, 0x33, 0x1e, 0x4c, 0xd2, 0x9d, 0x2e, 0x31, 0xd9, 0x68, 0x73, 0xd0, 0x88, 0xdf, - 0x2a, 0xe7, 0x47, 0x5f, 0x01, 0x84, 0xef, 0x4a, 0x71, 0xeb, 0xe1, 0x3f, 0x80, 0xfd, 0x3a, 0x7c, - 0x25, 0x42, 0xf4, 0xdd, 0xac, 0xc7, 0x78, 0x71, 0xbe, 0x3d, 0x93, 0xde, 0xd6, 0x4c, 0xce, 0xa6, - 0xd7, 0xab, 0x04, 0xdc, 0xac, 0x12, 0xf0, 0x7b, 0x95, 0x80, 0x6f, 0xeb, 0xa4, 0x75, 0xb3, 0x4e, - 0x5a, 0x3f, 0xd6, 0x49, 0xeb, 0xe3, 0x69, 0xae, 0xfc, 0xc5, 0x72, 0x4e, 0xb8, 0x59, 0xd0, 0xd8, - 0xe3, 0x73, 0x63, 0xf3, 0xa6, 0xa6, 0x5f, 0xfe, 0xd9, 0xbf, 0xda, 0xdf, 0xcd, 0xfb, 0x61, 0xb9, - 0x4e, 0xfe, 0x04, 0x00, 0x00, 0xff, 0xff, 0x84, 0xa9, 0xdf, 0x59, 0xfd, 0x02, 0x00, 0x00, + // 437 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x92, 0xcf, 0x6e, 0xd3, 0x30, + 0x1c, 0xc7, 0xeb, 0xf4, 0xcf, 0x98, 0x3b, 0x38, 0x58, 0x20, 0x42, 0x11, 0x59, 0xa8, 0x86, 0xd4, + 0x0b, 0xb6, 0xd6, 0x49, 0xbb, 0x71, 0x60, 0x07, 0xd0, 0x04, 0x12, 0x55, 0xe0, 0xc4, 0xa5, 0x72, + 0x6c, 0x93, 0x59, 0x49, 0xec, 0xc8, 0x76, 0x07, 0x7b, 0x02, 0xae, 0x9c, 0x79, 0x15, 0x5e, 0x60, + 0xc7, 0x1d, 0x39, 0x21, 0xd4, 0xbe, 0x08, 0x4a, 0xe2, 0x20, 0xc6, 0xd6, 0xdb, 0xaf, 0xd5, 0xe7, + 0xfb, 0x75, 0x7e, 0x1f, 0x1b, 0x3e, 0x53, 0x62, 0xe5, 0x8c, 0x56, 0x84, 0x69, 0xe5, 0x0c, 0x65, + 0xae, 0xa4, 0x8a, 0x66, 0xc2, 0x90, 0x4c, 0x28, 0x61, 0xa5, 0xc5, 0x95, 0xd1, 0x4e, 0xa3, 0x87, + 0x1e, 0xc3, 0xff, 0x61, 0x93, 0xfb, 0x99, 0xce, 0x74, 0xc3, 0x90, 0x7a, 0x6a, 0xf1, 0xc9, 0xc1, + 0xb6, 0xd6, 0x8a, 0x1a, 0x5a, 0xfa, 0xd2, 0xc9, 0x53, 0x99, 0x32, 0xc2, 0xb4, 0x11, 0x84, 0x9d, + 0x51, 0xa5, 0x44, 0x41, 0xce, 0x0f, 0xbb, 0xb1, 0x45, 0xa6, 0x3f, 0x00, 0xdc, 0x79, 0x45, 0x65, + 0xb1, 0x32, 0x02, 0x85, 0x70, 0x87, 0x72, 0x6e, 0x84, 0xb5, 0x21, 0x88, 0xc1, 0x6c, 0x37, 0xe9, + 0x7e, 0xa2, 0x7b, 0x30, 0x90, 0x3c, 0x0c, 0x62, 0x30, 0x1b, 0x24, 0x81, 0xe4, 0xe8, 0x11, 0xbc, + 0x43, 0x59, 0xbe, 0x74, 0x17, 0x95, 0x08, 0xfb, 0x1e, 0x65, 0xf9, 0x87, 0x8b, 0x4a, 0xa0, 0x23, + 0x38, 0xaa, 0x28, 0xcb, 0x85, 0x0b, 0x07, 0x31, 0x98, 0x8d, 0xe7, 0x8f, 0xb1, 0x4c, 0x19, 0xae, + 0x3f, 0x02, 0x77, 0x27, 0x9f, 0x1f, 0xe2, 0x45, 0x83, 0x24, 0x1e, 0x45, 0xc7, 0xb0, 0x4f, 0x59, + 0x1e, 0x0e, 0x9b, 0xc4, 0xc1, 0xad, 0x89, 0x97, 0x2c, 0x57, 0xfa, 0x73, 0x21, 0x78, 0x26, 0x4a, + 0xa1, 0x5c, 0x52, 0x07, 0xa6, 0xdf, 0x01, 0xdc, 0x7b, 0xdd, 0x7a, 0x7c, 0xef, 0xa8, 0x13, 0xe8, + 0x45, 0x7d, 0x7a, 0x6d, 0xa0, 0xd9, 0x60, 0x3c, 0xdf, 0xc7, 0x5b, 0xbc, 0xe2, 0x45, 0x83, 0x9d, + 0x0c, 0x2e, 0x7f, 0xed, 0xf7, 0x12, 0x1f, 0x42, 0x6f, 0xe0, 0xdd, 0x4f, 0xad, 0x0c, 0xbb, 0x2c, + 0xa4, 0x75, 0x61, 0x10, 0xf7, 0x67, 0xe3, 0x79, 0xbc, 0xb5, 0xc5, 0xab, 0xf3, 0x35, 0x7b, 0x5d, + 0xf8, 0xad, 0xb4, 0x6e, 0xfa, 0x15, 0x40, 0xf8, 0xae, 0xe0, 0x9d, 0xdd, 0x27, 0x10, 0xfa, 0x75, + 0x96, 0x92, 0x7b, 0xc1, 0xbb, 0xfe, 0x9f, 0x53, 0xfe, 0xaf, 0xfc, 0xe0, 0x36, 0xf9, 0xfd, 0xbf, + 0xf2, 0x1f, 0xc0, 0x51, 0x2d, 0x5f, 0xf2, 0xc6, 0xf0, 0x20, 0x19, 0x52, 0x96, 0x9f, 0x5e, 0xbf, + 0x93, 0xe1, 0xb5, 0x3b, 0x39, 0x59, 0x5c, 0xae, 0x23, 0x70, 0xb5, 0x8e, 0xc0, 0xef, 0x75, 0x04, + 0xbe, 0x6d, 0xa2, 0xde, 0xd5, 0x26, 0xea, 0xfd, 0xdc, 0x44, 0xbd, 0x8f, 0xc7, 0x99, 0x74, 0x67, + 0xab, 0x14, 0x33, 0x5d, 0x12, 0xbf, 0xe3, 0x73, 0x6d, 0xb2, 0x6e, 0x26, 0x5f, 0x6e, 0x3c, 0xb0, + 0xba, 0xdf, 0xa6, 0xa3, 0xe6, 0xf5, 0x1c, 0xfd, 0x09, 0x00, 0x00, 0xff, 0xff, 0x59, 0xd9, 0x03, + 0xb9, 0xde, 0x02, 0x00, 0x00, } func (m *Failure) Marshal() (dAtA []byte, err error) { @@ -324,7 +316,7 @@ func (m *Failure) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintGenesis(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x32 + dAtA[i] = 0x2a } if m.Packet != nil { { @@ -336,32 +328,25 @@ func (m *Failure) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintGenesis(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x2a + dAtA[i] = 0x22 } if len(m.AckType) > 0 { i -= len(m.AckType) copy(dAtA[i:], m.AckType) i = encodeVarintGenesis(dAtA, i, uint64(len(m.AckType))) i-- - dAtA[i] = 0x22 + dAtA[i] = 0x1a } if m.Id != 0 { i = encodeVarintGenesis(dAtA, i, uint64(m.Id)) i-- - dAtA[i] = 0x18 + dAtA[i] = 0x10 } if len(m.Address) > 0 { i -= len(m.Address) copy(dAtA[i:], m.Address) i = encodeVarintGenesis(dAtA, i, uint64(len(m.Address))) i-- - dAtA[i] = 0x12 - } - if len(m.ChannelId) > 0 { - i -= len(m.ChannelId) - copy(dAtA[i:], m.ChannelId) - i = encodeVarintGenesis(dAtA, i, uint64(len(m.ChannelId))) - i-- dAtA[i] = 0xa } return len(dAtA) - i, nil @@ -485,10 +470,6 @@ func (m *Failure) Size() (n int) { } var l int _ = l - l = len(m.ChannelId) - if l > 0 { - n += 1 + l + sovGenesis(uint64(l)) - } l = len(m.Address) if l > 0 { n += 1 + l + sovGenesis(uint64(l)) @@ -591,38 +572,6 @@ func (m *Failure) Unmarshal(dAtA []byte) error { } switch fieldNum { case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ChannelId", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenesis - } - 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 ErrInvalidLengthGenesis - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthGenesis - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ChannelId = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Address", wireType) } @@ -654,7 +603,7 @@ func (m *Failure) Unmarshal(dAtA []byte) error { } m.Address = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 3: + case 2: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field Id", wireType) } @@ -673,7 +622,7 @@ func (m *Failure) Unmarshal(dAtA []byte) error { break } } - case 4: + case 3: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field AckType", wireType) } @@ -705,7 +654,7 @@ func (m *Failure) Unmarshal(dAtA []byte) error { } m.AckType = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 5: + case 4: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Packet", wireType) } @@ -741,7 +690,7 @@ func (m *Failure) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 6: + case 5: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Ack", wireType) } From 1f61b01ee03134fb7156be4706a4cf9deefd0180 Mon Sep 17 00:00:00 2001 From: nhpd Date: Thu, 17 Aug 2023 18:57:25 +0400 Subject: [PATCH 041/307] cleanup --- wasmbinding/bindings/msg.go | 1 - wasmbinding/bindings/query.go | 8 ++++---- wasmbinding/test/custom_message_test.go | 8 ++++---- x/contractmanager/keeper/failure_test.go | 2 +- x/transfer/ibc_handlers.go | 6 ------ 5 files changed, 9 insertions(+), 16 deletions(-) diff --git a/wasmbinding/bindings/msg.go b/wasmbinding/bindings/msg.go index fe8b47db9..e79e32d25 100644 --- a/wasmbinding/bindings/msg.go +++ b/wasmbinding/bindings/msg.go @@ -243,7 +243,6 @@ type MsgExecuteContract struct { } type ResubmitFailure struct { - // TODO FailureId uint64 `json:"failure_id"` } diff --git a/wasmbinding/bindings/query.go b/wasmbinding/bindings/query.go index aa0c2d314..6bc7c25e7 100644 --- a/wasmbinding/bindings/query.go +++ b/wasmbinding/bindings/query.go @@ -29,13 +29,13 @@ type NeutronQuery struct { // MinIbcFee MinIbcFee *QueryMinIbcFeeRequest `json:"min_ibc_fee,omitempty"` // Token Factory queries - /// Given a subdenom minted by a contract via `NeutronMsg::MintTokens`, - /// returns the full denom as used by `BankMsg::Send`. + // Given a subdenom minted by a contract via `NeutronMsg::MintTokens`, + // returns the full denom as used by `BankMsg::Send`. FullDenom *FullDenom `json:"full_denom,omitempty"` - /// Returns the admin of a denom, if the denom is a Token Factory denom. + // Returns the admin of a denom, if the denom is a Token Factory denom. DenomAdmin *DenomAdmin `json:"denom_admin,omitempty"` // Contractmanager queries - /// Query all failures for address + // Query all failures for address Failures *Failures `json:"failures,omitempty"` } diff --git a/wasmbinding/test/custom_message_test.go b/wasmbinding/test/custom_message_test.go index 574544761..38f0d3788 100644 --- a/wasmbinding/test/custom_message_test.go +++ b/wasmbinding/test/custom_message_test.go @@ -640,13 +640,13 @@ func (suite *CustomMessengerTestSuite) TestResubmitFailureTimeout() { ack := ibcchanneltypes.Acknowledgement{ Response: &ibcchanneltypes.Acknowledgement_Error{Error: "Error"}, } - failureId := suite.messenger.ContractmanagerKeeper.GetNextFailureIDKey(suite.ctx, suite.contractAddress.String()) + failureID := suite.messenger.ContractmanagerKeeper.GetNextFailureIDKey(suite.ctx, suite.contractAddress.String()) suite.messenger.ContractmanagerKeeper.AddContractFailure(suite.ctx, &packet, suite.contractAddress.String(), "timeout", &ack) // Craft message msg, err := json.Marshal(bindings.NeutronMsg{ ResubmitFailure: &bindings.ResubmitFailure{ - FailureId: failureId, + FailureId: failureID, }, }) suite.NoError(err) @@ -673,13 +673,13 @@ func (suite *CustomMessengerTestSuite) TestResubmitFailureFromDifferentContract( ack := ibcchanneltypes.Acknowledgement{ Response: &ibcchanneltypes.Acknowledgement_Error{Error: "Error"}, } - failureId := suite.messenger.ContractmanagerKeeper.GetNextFailureIDKey(suite.ctx, testutil.TestOwnerAddress) + failureID := suite.messenger.ContractmanagerKeeper.GetNextFailureIDKey(suite.ctx, testutil.TestOwnerAddress) suite.messenger.ContractmanagerKeeper.AddContractFailure(suite.ctx, &packet, testutil.TestOwnerAddress, "timeout", &ack) // Craft message msg, err := json.Marshal(bindings.NeutronMsg{ ResubmitFailure: &bindings.ResubmitFailure{ - FailureId: failureId, + FailureId: failureID, }, }) suite.NoError(err) diff --git a/x/contractmanager/keeper/failure_test.go b/x/contractmanager/keeper/failure_test.go index d0f8abe75..4dbb6f2e5 100644 --- a/x/contractmanager/keeper/failure_test.go +++ b/x/contractmanager/keeper/failure_test.go @@ -67,7 +67,7 @@ func flattenFailures(items [][]types.Failure) []types.Failure { func TestGetAllFailures(t *testing.T) { k, ctx := keepertest.ContractManagerKeeper(t, nil) - items := createNFailure(k, ctx, 1, 1) + items := createNFailure(k, ctx, 10, 4) flattenItems := flattenFailures(items) allFailures := k.GetAllFailures(ctx) diff --git a/x/transfer/ibc_handlers.go b/x/transfer/ibc_handlers.go index fddd135a0..e126e2530 100644 --- a/x/transfer/ibc_handlers.go +++ b/x/transfer/ibc_handlers.go @@ -63,9 +63,6 @@ func (im *IBCModule) createCachedContext(ctx sdk.Context) (sdk.Context, func(), // and process failed Sudo call if gasMeterIsLimited { gasLeft := gasMeter.Limit() - gasMeter.GasConsumed() - // NOTE: DANGER: remove this. But we will enforce limit, only that it's through param values: - //(https://www.notion.so/hadron/Gas-Errors-Interchain-Txs-2b2f1caacdcd4981950641e0996cac27?pvs=4#73af69a69b8249ae9d2222afcc42b968) - //gasLeft := uint64(100_000) var newLimit uint64 if gasLeft < GasReserve { @@ -98,9 +95,6 @@ func (im IBCModule) HandleAcknowledgement(ctx sdk.Context, packet channeltypes.P return errors.Wrapf(sdkerrors.ErrInvalidAddress, "failed to decode address from bech32: %v", err) } - // gasMeter := sdk.NewGasMeter(100_000) - // ctx = ctx.WithGasMeter(gasMeter) - cacheCtx, writeFn, newGasMeter := im.createCachedContext(ctx) defer im.outOfGasRecovery(ctx, newGasMeter, senderAddress, packet, data, "ack", &ack) From bdd37658acc253f6bc152a3c61875dc4bed5ce3c Mon Sep 17 00:00:00 2001 From: nhpd Date: Thu, 17 Aug 2023 21:48:12 +0400 Subject: [PATCH 042/307] refactor migration --- app/upgrades/nextupgrade/upgrades.go | 145 ++++++++++++++------------- app/upgrades/types.go | 6 +- x/contractmanager/keeper/failure.go | 2 - 3 files changed, 81 insertions(+), 72 deletions(-) diff --git a/app/upgrades/nextupgrade/upgrades.go b/app/upgrades/nextupgrade/upgrades.go index 9fed784e7..4424b36df 100644 --- a/app/upgrades/nextupgrade/upgrades.go +++ b/app/upgrades/nextupgrade/upgrades.go @@ -3,10 +3,10 @@ package nextupgrade import ( "errors" - "github.com/cosmos/cosmos-sdk/codec" ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" ibcchanneltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" + "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" @@ -16,7 +16,83 @@ import ( contractmanagertypes "github.com/neutron-org/neutron/x/contractmanager/types" ) -func MigrateFailures(ctx sdk.Context, storeKeys upgrades.StoreKeys, cdc codec.Codec) error { +func CreateUpgradeHandler( + mm *module.Manager, + configurator module.Configurator, + keepers *upgrades.UpgradeKeepers, + storeKeys upgrades.StoreKeys, + cdc codec.Codec, +) upgradetypes.UpgradeHandler { + return func(ctx sdk.Context, plan upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) { + ctx.Logger().Info("Starting module migrations...") + vm, err := mm.RunMigrations(ctx, configurator, vm) + if err != nil { + return vm, err + } + + err = migrateGlobalFees(ctx, keepers) + if err != nil { + ctx.Logger().Error("failed to migrate GlobalFees", "err", err) + return vm, err + } + + err = migrateFailures(ctx, storeKeys, cdc) + if err != nil { + ctx.Logger().Error("failed to migrate Failures", "err", err) + return vm, err + } + + ctx.Logger().Info("Upgrade complete") + return vm, err + } +} + +func migrateGlobalFees(ctx sdk.Context, keepers *upgrades.UpgradeKeepers) error { + ctx.Logger().Info("Implementing GlobalFee Params...") + + if !keepers.GlobalFeeSubspace.Has(ctx, types.ParamStoreKeyMinGasPrices) { + return errors.New("minimum_gas_prices param not found") + } + + if !keepers.GlobalFeeSubspace.Has(ctx, types.ParamStoreKeyBypassMinFeeMsgTypes) { + return errors.New("bypass_min_fee_msg_types param not found") + } + + if !keepers.GlobalFeeSubspace.Has(ctx, types.ParamStoreKeyMaxTotalBypassMinFeeMsgGasUsage) { + return errors.New("max_total_bypass_min_fee_msg_gas_usage param not found") + } + + // global fee is empty set, set global fee to equal to 0.05 USD (for 200k of gas) in appropriate coin + // As of June 22nd, 2023 this is + // 0.9untrn,0.026ibc/C4CFF46FD6DE35CA4CF4CE031E643C8FDC9BA4B99AE598E9B0ED98FE3A2319F9,0.25ibc/F082B65C88E4B6D5EF1DB243CDA1D331D002759E938A0F5CD3FFDC5D53B3E349 + requiredGlobalFees := sdk.DecCoins{ + sdk.NewDecCoinFromDec("untrn", sdk.MustNewDecFromStr("0.9")), + sdk.NewDecCoinFromDec("ibc/C4CFF46FD6DE35CA4CF4CE031E643C8FDC9BA4B99AE598E9B0ED98FE3A2319F9", sdk.MustNewDecFromStr("0.026")), + sdk.NewDecCoinFromDec("ibc/F082B65C88E4B6D5EF1DB243CDA1D331D002759E938A0F5CD3FFDC5D53B3E349", sdk.MustNewDecFromStr("0.25")), + } + requiredGlobalFees = requiredGlobalFees.Sort() + + keepers.GlobalFeeSubspace.Set(ctx, types.ParamStoreKeyMinGasPrices, &requiredGlobalFees) + + ctx.Logger().Info("Global fees was set successfully") + + defaultBypassFeeMessages := []string{ + sdk.MsgTypeURL(&ibcchanneltypes.MsgRecvPacket{}), + sdk.MsgTypeURL(&ibcchanneltypes.MsgAcknowledgement{}), + sdk.MsgTypeURL(&ibcclienttypes.MsgUpdateClient{}), + } + keepers.GlobalFeeSubspace.Set(ctx, types.ParamStoreKeyBypassMinFeeMsgTypes, &defaultBypassFeeMessages) + + ctx.Logger().Info("Bypass min fee msg types was set successfully") + + keepers.GlobalFeeSubspace.Set(ctx, types.ParamStoreKeyMaxTotalBypassMinFeeMsgGasUsage, types.DefaultmaxTotalBypassMinFeeMsgGasUsage) + + ctx.Logger().Info("Max total bypass min fee msg gas usage set successfully") + + return nil +} + +func migrateFailures(ctx sdk.Context, storeKeys upgrades.StoreKeys, cdc codec.Codec) error { ctx.Logger().Info("Migrating failures...") // fetch list of all old failures @@ -53,68 +129,3 @@ func MigrateFailures(ctx sdk.Context, storeKeys upgrades.StoreKeys, cdc codec.Co return nil } - -func CreateUpgradeHandler( - mm *module.Manager, - configurator module.Configurator, - keepers *upgrades.UpgradeKeepers, - storeKeys upgrades.StoreKeys, - cdc codec.Codec, -) upgradetypes.UpgradeHandler { - return func(ctx sdk.Context, plan upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) { - ctx.Logger().Info("Starting module migrations...") - vm, err := mm.RunMigrations(ctx, configurator, vm) - if err != nil { - return vm, err - } - - ctx.Logger().Info("Implementing GlobalFee Params...") - - if !keepers.GlobalFeeSubspace.Has(ctx, types.ParamStoreKeyMinGasPrices) { - return vm, errors.New("minimum_gas_prices param not found") - } - - if !keepers.GlobalFeeSubspace.Has(ctx, types.ParamStoreKeyBypassMinFeeMsgTypes) { - return vm, errors.New("bypass_min_fee_msg_types param not found") - } - - if !keepers.GlobalFeeSubspace.Has(ctx, types.ParamStoreKeyMaxTotalBypassMinFeeMsgGasUsage) { - return vm, errors.New("max_total_bypass_min_fee_msg_gas_usage param not found") - } - - // global fee is empty set, set global fee to equal to 0.05 USD (for 200k of gas) in appropriate coin - // As of June 22nd, 2023 this is - // 0.9untrn,0.026ibc/C4CFF46FD6DE35CA4CF4CE031E643C8FDC9BA4B99AE598E9B0ED98FE3A2319F9,0.25ibc/F082B65C88E4B6D5EF1DB243CDA1D331D002759E938A0F5CD3FFDC5D53B3E349 - requiredGlobalFees := sdk.DecCoins{ - sdk.NewDecCoinFromDec("untrn", sdk.MustNewDecFromStr("0.9")), - sdk.NewDecCoinFromDec("ibc/C4CFF46FD6DE35CA4CF4CE031E643C8FDC9BA4B99AE598E9B0ED98FE3A2319F9", sdk.MustNewDecFromStr("0.026")), - sdk.NewDecCoinFromDec("ibc/F082B65C88E4B6D5EF1DB243CDA1D331D002759E938A0F5CD3FFDC5D53B3E349", sdk.MustNewDecFromStr("0.25")), - } - requiredGlobalFees = requiredGlobalFees.Sort() - - keepers.GlobalFeeSubspace.Set(ctx, types.ParamStoreKeyMinGasPrices, &requiredGlobalFees) - - ctx.Logger().Info("Global fees was set successfully") - - defaultBypassFeeMessages := []string{ - sdk.MsgTypeURL(&ibcchanneltypes.MsgRecvPacket{}), - sdk.MsgTypeURL(&ibcchanneltypes.MsgAcknowledgement{}), - sdk.MsgTypeURL(&ibcclienttypes.MsgUpdateClient{}), - } - keepers.GlobalFeeSubspace.Set(ctx, types.ParamStoreKeyBypassMinFeeMsgTypes, &defaultBypassFeeMessages) - - ctx.Logger().Info("Bypass min fee msg types was set successfully") - - keepers.GlobalFeeSubspace.Set(ctx, types.ParamStoreKeyMaxTotalBypassMinFeeMsgGasUsage, types.DefaultmaxTotalBypassMinFeeMsgGasUsage) - - ctx.Logger().Info("Max total bypass min fee msg gas usage set successfully") - - err = MigrateFailures(ctx, storeKeys, cdc) - if err != nil { - ctx.Logger().Error("failed to migrate failures", "err", err) - } - - ctx.Logger().Info("Upgrade complete") - return vm, err - } -} diff --git a/app/upgrades/types.go b/app/upgrades/types.go index 3a6fa1583..91fe12f10 100644 --- a/app/upgrades/types.go +++ b/app/upgrades/types.go @@ -2,7 +2,7 @@ package upgrades import ( "github.com/cosmos/cosmos-sdk/codec" - storetypes "github.com/cosmos/cosmos-sdk/store/types" + store "github.com/cosmos/cosmos-sdk/store/types" "github.com/cosmos/cosmos-sdk/types/module" capabilitykeeper "github.com/cosmos/cosmos-sdk/x/capability/keeper" paramskeeper "github.com/cosmos/cosmos-sdk/x/params/keeper" @@ -29,7 +29,7 @@ type Upgrade struct { CreateUpgradeHandler func(*module.Manager, module.Configurator, *UpgradeKeepers, StoreKeys, codec.Codec) upgradetypes.UpgradeHandler // Store upgrades, should be used for any new modules introduced, new modules deleted, or store names renamed. - StoreUpgrades storetypes.StoreUpgrades + StoreUpgrades store.StoreUpgrades } type UpgradeKeepers struct { @@ -47,5 +47,5 @@ type UpgradeKeepers struct { } type StoreKeys interface { - GetKey(string) *storetypes.KVStoreKey + GetKey(string) *store.KVStoreKey } diff --git a/x/contractmanager/keeper/failure.go b/x/contractmanager/keeper/failure.go index d0ee9ebd5..a86b12d1c 100644 --- a/x/contractmanager/keeper/failure.go +++ b/x/contractmanager/keeper/failure.go @@ -104,8 +104,6 @@ func (k Keeper) ResubmitFailure(ctx sdk.Context, contractAddr sdk.AccAddress, fa // Cleanup failure since we resubmitted it successfully k.removeFailure(ctx, contractAddr, failure.Id) - // TODO: maybe return some result from sudo call? - return nil } From f267c1d91ffb207b4e5d7435410f9ac7246dacf2 Mon Sep 17 00:00:00 2001 From: nhpd Date: Fri, 18 Aug 2023 17:31:14 +0400 Subject: [PATCH 043/307] set contractmanager consensus version to 2 --- x/contractmanager/module.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/x/contractmanager/module.go b/x/contractmanager/module.go index cfecf7588..0df347b41 100644 --- a/x/contractmanager/module.go +++ b/x/contractmanager/module.go @@ -151,7 +151,9 @@ func (am AppModule) ExportGenesis(ctx sdk.Context, cdc codec.JSONCodec) json.Raw } // ConsensusVersion is a sequence number for state-breaking change of the module. It should be incremented on each consensus-breaking change introduced by the module. To avoid wrong/empty versions, the initial version should be set to 1 -func (AppModule) ConsensusVersion() uint64 { return 1 } +func (AppModule) ConsensusVersion() uint64 { + return 2 +} // BeginBlock contains the logic that is automatically triggered at the beginning of each block func (am AppModule) BeginBlock(_ sdk.Context, _ abci.RequestBeginBlock) {} From 9ba89435a0009db7439d19eee1b08116c5b51eec Mon Sep 17 00:00:00 2001 From: nhpd Date: Fri, 18 Aug 2023 17:57:28 +0400 Subject: [PATCH 044/307] Migrate rewardDenoms param to include axlr denom --- app/app.go | 17 +++++++------ app/upgrades/nextupgrade/upgrades.go | 30 +++++++++++++++++++++- app/upgrades/nextupgrade/upgrades_test.go | 31 +++++++++++++++++++++++ app/upgrades/types.go | 3 ++- 4 files changed, 71 insertions(+), 10 deletions(-) diff --git a/app/app.go b/app/app.go index ed5fdff20..aaebe1645 100644 --- a/app/app.go +++ b/app/app.go @@ -1025,14 +1025,15 @@ func (app *App) setupUpgradeHandlers() { app.mm, app.configurator, &upgrades.UpgradeKeepers{ - FeeBurnerKeeper: app.FeeBurnerKeeper, - CronKeeper: app.CronKeeper, - IcqKeeper: app.InterchainQueriesKeeper, - TokenFactoryKeeper: app.TokenFactoryKeeper, - SlashingKeeper: app.SlashingKeeper, - ParamsKeeper: app.ParamsKeeper, - CapabilityKeeper: app.CapabilityKeeper, - GlobalFeeSubspace: app.GetSubspace(globalfee.ModuleName), + FeeBurnerKeeper: app.FeeBurnerKeeper, + CronKeeper: app.CronKeeper, + IcqKeeper: app.InterchainQueriesKeeper, + TokenFactoryKeeper: app.TokenFactoryKeeper, + SlashingKeeper: app.SlashingKeeper, + ParamsKeeper: app.ParamsKeeper, + CapabilityKeeper: app.CapabilityKeeper, + GlobalFeeSubspace: app.GetSubspace(globalfee.ModuleName), + CcvConsumerSubspace: app.GetSubspace(ccvconsumertypes.ModuleName), }, app, app.AppCodec(), diff --git a/app/upgrades/nextupgrade/upgrades.go b/app/upgrades/nextupgrade/upgrades.go index 4424b36df..e7b77a77f 100644 --- a/app/upgrades/nextupgrade/upgrades.go +++ b/app/upgrades/nextupgrade/upgrades.go @@ -3,6 +3,8 @@ package nextupgrade import ( "errors" + ccvconsumertypes "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types" + ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" ibcchanneltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" @@ -42,6 +44,12 @@ func CreateUpgradeHandler( return vm, err } + err = migrateRewardDenoms(ctx, keepers) + if err != nil { + ctx.Logger().Error("failed to migrate reward denoms", "err", err) + return vm, err + } + ctx.Logger().Info("Upgrade complete") return vm, err } @@ -85,7 +93,7 @@ func migrateGlobalFees(ctx sdk.Context, keepers *upgrades.UpgradeKeepers) error ctx.Logger().Info("Bypass min fee msg types was set successfully") - keepers.GlobalFeeSubspace.Set(ctx, types.ParamStoreKeyMaxTotalBypassMinFeeMsgGasUsage, types.DefaultmaxTotalBypassMinFeeMsgGasUsage) + keepers.GlobalFeeSubspace.Set(ctx, types.ParamStoreKeyMaxTotalBypassMinFeeMsgGasUsage, &types.DefaultmaxTotalBypassMinFeeMsgGasUsage) ctx.Logger().Info("Max total bypass min fee msg gas usage set successfully") @@ -129,3 +137,23 @@ func migrateFailures(ctx sdk.Context, storeKeys upgrades.StoreKeys, cdc codec.Co return nil } + +func migrateRewardDenoms(ctx sdk.Context, keepers *upgrades.UpgradeKeepers) error { + ctx.Logger().Info("Migrating reword denoms...") + + if !keepers.CcvConsumerSubspace.Has(ctx, ccvconsumertypes.KeyRewardDenoms) { + return errors.New("key_reward_denoms param not found") + } + + var denoms []string + keepers.CcvConsumerSubspace.Get(ctx, ccvconsumertypes.KeyRewardDenoms, &denoms) + + // add new denom + denoms = append(denoms, "ibc/F082B65C88E4B6D5EF1DB243CDA1D331D002759E938A0F5CD3FFDC5D53B3E349") + + keepers.CcvConsumerSubspace.Set(ctx, ccvconsumertypes.KeyRewardDenoms, &denoms) + + ctx.Logger().Info("Finished migrating reward denoms") + + return nil +} diff --git a/app/upgrades/nextupgrade/upgrades_test.go b/app/upgrades/nextupgrade/upgrades_test.go index 91af6a211..9e4064121 100644 --- a/app/upgrades/nextupgrade/upgrades_test.go +++ b/app/upgrades/nextupgrade/upgrades_test.go @@ -3,6 +3,8 @@ package nextupgrade_test import ( "testing" + ccvconsumertypes "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types" + ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" ibcchanneltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" contractmanagertypes "github.com/neutron-org/neutron/x/contractmanager/types" @@ -160,3 +162,32 @@ func (suite *UpgradeTestSuite) TestFailuresUpgrade() { twoKey := app.ContractManagerKeeper.GetNextFailureIDKey(ctx, addressTwo) suite.Require().Equal(twoKey, uint64(2)) } + +func (suite *UpgradeTestSuite) TestRewardDenomsUpgrade() { + var ( + app = suite.GetNeutronZoneApp(suite.ChainA) + ccvConsumerSubspace = app.GetSubspace(ccvconsumertypes.ModuleName) + ctx = suite.ChainA.GetContext() + ) + + suite.Require().True(ccvConsumerSubspace.Has(ctx, ccvconsumertypes.KeyRewardDenoms)) + + var denomsBefore []string + ccvConsumerSubspace.Get(ctx, ccvconsumertypes.KeyRewardDenoms, &denomsBefore) + var empty []string = nil + suite.Require().Equal(denomsBefore, empty) + + upgrade := upgradetypes.Plan{ + Name: nextupgrade.UpgradeName, + Info: "some text here", + Height: 100, + } + app.UpgradeKeeper.ApplyUpgrade(ctx, upgrade) + + suite.Require().True(ccvConsumerSubspace.Has(ctx, ccvconsumertypes.KeyRewardDenoms)) + + var denoms []string + ccvConsumerSubspace.Get(ctx, ccvconsumertypes.KeyRewardDenoms, &denoms) + requiredDenoms := []string{"ibc/F082B65C88E4B6D5EF1DB243CDA1D331D002759E938A0F5CD3FFDC5D53B3E349"} + suite.Require().Equal(requiredDenoms, denoms) +} diff --git a/app/upgrades/types.go b/app/upgrades/types.go index 91fe12f10..23f301405 100644 --- a/app/upgrades/types.go +++ b/app/upgrades/types.go @@ -43,7 +43,8 @@ type UpgradeKeepers struct { CapabilityKeeper *capabilitykeeper.Keeper BuilderKeeper builderkeeper.Keeper // subspaces - GlobalFeeSubspace paramtypes.Subspace + GlobalFeeSubspace paramtypes.Subspace + CcvConsumerSubspace paramtypes.Subspace } type StoreKeys interface { From 0fb54fc162b9a3d31d00f6fd0c62bfaa203b0da6 Mon Sep 17 00:00:00 2001 From: swelf Date: Fri, 18 Aug 2023 17:26:09 +0300 Subject: [PATCH 045/307] ictx + transfer with limited sudo call --- app/upgrades/sdk47/upgrades.go | 10 ++ app/upgrades/types.go | 2 + go.sum | 3 + network/init-neutrond.sh | 2 +- proto/neutron/contractmanager/params.proto | 5 +- proto/neutron/cron/genesis.proto | 6 +- proto/neutron/cron/params.proto | 10 +- proto/neutron/cron/query.proto | 40 +++--- proto/neutron/cron/schedule.proto | 28 ++--- proto/neutron/cron/tx.proto | 3 +- proto/neutron/transfer/v1/tx.proto | 3 +- .../osmosis/tokenfactory/v1beta1/params.proto | 18 +-- .../osmosis/tokenfactory/v1beta1/query.proto | 3 +- .../interchaintxs/types/expected_keepers.go | 14 +++ .../mocks/transfer/types/expected_keepers.go | 23 +++- x/contractmanager/keeper/params.go | 11 +- x/contractmanager/types/params.go | 6 +- x/contractmanager/types/params.pb.go | 52 ++++++-- x/interchaintxs/keeper/ibc_handlers.go | 114 ++++++++--------- x/interchaintxs/keeper/ibc_handlers_test.go | 47 ++++--- x/interchaintxs/types/expected_keepers.go | 1 + x/tokenfactory/types/params.pb.go | 6 +- x/transfer/ibc_handlers.go | 118 ++++++++---------- x/transfer/ibc_handlers_test.go | 71 +++++++---- x/transfer/types/expected_keepers.go | 2 + 25 files changed, 346 insertions(+), 252 deletions(-) diff --git a/app/upgrades/sdk47/upgrades.go b/app/upgrades/sdk47/upgrades.go index b962ec819..9c92d08f0 100644 --- a/app/upgrades/sdk47/upgrades.go +++ b/app/upgrades/sdk47/upgrades.go @@ -12,6 +12,7 @@ import ( upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" v6 "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/migrations/v6" "github.com/neutron-org/neutron/app/upgrades" + contractmanagermoduletypes "github.com/neutron-org/neutron/x/contractmanager/types" crontypes "github.com/neutron-org/neutron/x/cron/types" feeburnertypes "github.com/neutron-org/neutron/x/feeburner/types" feerefundertypes "github.com/neutron-org/neutron/x/feerefunder/types" @@ -91,6 +92,15 @@ func CreateUpgradeHandler( return nil, err } + ctx.Logger().Info("Setting sudo callback limit...") + cmParams := contractmanagermoduletypes.Params{ + SudoCallGasLimit: 1_000_000, + } + err = keepers.ContractManager.SetParams(ctx, cmParams) + if err != nil { + return nil, err + } + ctx.Logger().Info("Upgrade complete") return vm, nil } diff --git a/app/upgrades/types.go b/app/upgrades/types.go index 91fe12f10..de1f24b33 100644 --- a/app/upgrades/types.go +++ b/app/upgrades/types.go @@ -8,6 +8,7 @@ import ( paramskeeper "github.com/cosmos/cosmos-sdk/x/params/keeper" slashingkeeper "github.com/cosmos/cosmos-sdk/x/slashing/keeper" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" + contractmanagerkeeper "github.com/neutron-org/neutron/x/contractmanager/keeper" cronkeeper "github.com/neutron-org/neutron/x/cron/keeper" feeburnerkeeper "github.com/neutron-org/neutron/x/feeburner/keeper" icqkeeper "github.com/neutron-org/neutron/x/interchainqueries/keeper" @@ -42,6 +43,7 @@ type UpgradeKeepers struct { ParamsKeeper paramskeeper.Keeper CapabilityKeeper *capabilitykeeper.Keeper BuilderKeeper builderkeeper.Keeper + ContractManager contractmanagerkeeper.Keeper // subspaces GlobalFeeSubspace paramtypes.Subspace } diff --git a/go.sum b/go.sum index 71b2262b1..cb32bfa60 100644 --- a/go.sum +++ b/go.sum @@ -796,6 +796,7 @@ github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/u github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= +github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/jsternberg/zap-logfmt v1.0.0/go.mod h1:uvPs/4X51zdkcm5jXl5SYoN+4RK21K8mysFmDaM/h+o= @@ -908,6 +909,7 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= +github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5/go.mod h1:caMODM3PzxT8aQXRPkAt8xlV/e7d7w8GM5g0fa5F0D8= github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae/go.mod h1:qAyveg+e4CE+eKJXWVjKXM4ck2QobLqTDytGJbLLhJg= github.com/mtibben/percent v0.2.1 h1:5gssi8Nqo8QU/r2pynCm+hBQHpkB/uNK7BJCFogWdzs= @@ -928,6 +930,7 @@ github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OS github.com/neilotoole/errgroup v0.1.6/go.mod h1:Q2nLGf+594h0CLBs/Mbg6qOr7GtqDK7C2S41udRnToE= github.com/neutron-org/admin-module v0.0.0-20230705134325-b23404470a1d h1:oexw79znoA0TEo7CGdWHrolbvZqCDD3aI+031CbOq9Y= github.com/neutron-org/admin-module v0.0.0-20230705134325-b23404470a1d/go.mod h1:QuxQ7FJlEAFMRssyEYOrR9ORnYQvBFMTlO8BXny6ntw= +github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230808084410-6083b888424e h1:uVJCBWf1vcCYY0pzOA2SCPIZT8WsR8fsOxs57mnJbM4= github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230808084410-6083b888424e/go.mod h1:Oagy36cU49438NzxKG/gmGTG903tiAI7LIUdH7x2qNY= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= diff --git a/network/init-neutrond.sh b/network/init-neutrond.sh index f656840a5..f16144a62 100755 --- a/network/init-neutrond.sh +++ b/network/init-neutrond.sh @@ -627,9 +627,9 @@ set_genesis_param min_signed_per_window "\"$SLASHING_MIN_SIGNED\"," set_genesis_param slash_fraction_double_sign "\"$SLASHING_FRACTION_DOUBLE_SIGN\"," # slashing set_genesis_param slash_fraction_downtime "\"$SLASHING_FRACTION_DOWNTIME\"" # slashing set_genesis_param minimum_gas_prices "$MIN_GAS_PRICES" # globalfee - set_genesis_param proposer_fee "\"0.25\"" # builder(POB) set_genesis_param escrow_account_address "\"$DAO_CONTRACT_ADDRESS_B64\"," # builder(POB) +set_genesis_param sudo_call_gas_limit "\"1000000\"" # contractmanager if ! jq -e . "$GENESIS_PATH" >/dev/null 2>&1; then echo "genesis appears to become incorrect json" >&2 diff --git a/proto/neutron/contractmanager/params.proto b/proto/neutron/contractmanager/params.proto index 39925ae90..c7f410c0b 100644 --- a/proto/neutron/contractmanager/params.proto +++ b/proto/neutron/contractmanager/params.proto @@ -6,4 +6,7 @@ import "gogoproto/gogo.proto"; option go_package = "github.com/neutron-org/neutron/x/contractmanager/types"; // Params defines the parameters for the module. -message Params { option (gogoproto.goproto_stringer) = false; } +message Params { + option (gogoproto.goproto_stringer) = false; + uint64 sudo_call_gas_limit = 1; +} diff --git a/proto/neutron/cron/genesis.proto b/proto/neutron/cron/genesis.proto index e7e455276..2045b3c66 100644 --- a/proto/neutron/cron/genesis.proto +++ b/proto/neutron/cron/genesis.proto @@ -10,7 +10,7 @@ option go_package = "github.com/neutron-org/neutron/x/cron/types"; // GenesisState defines the cron module's genesis state. message GenesisState { - repeated Schedule scheduleList = 2 [(gogoproto.nullable) = false]; - Params params = 1 [ (gogoproto.nullable) = false ]; - // this line is used by starport scaffolding # genesis/proto/state + repeated Schedule scheduleList = 2 [ (gogoproto.nullable) = false ]; + Params params = 1 [ (gogoproto.nullable) = false ]; + // this line is used by starport scaffolding # genesis/proto/state } diff --git a/proto/neutron/cron/params.proto b/proto/neutron/cron/params.proto index 7dfad3181..c94db26d5 100644 --- a/proto/neutron/cron/params.proto +++ b/proto/neutron/cron/params.proto @@ -7,9 +7,9 @@ option go_package = "github.com/neutron-org/neutron/x/cron/types"; // Params defines the parameters for the module. message Params { - option (gogoproto.goproto_stringer) = false; - // Security address that can remove schedules - string security_address = 1; - // Limit of schedules executed in one block - uint64 limit = 2; + option (gogoproto.goproto_stringer) = false; + // Security address that can remove schedules + string security_address = 1; + // Limit of schedules executed in one block + uint64 limit = 2; } diff --git a/proto/neutron/cron/query.proto b/proto/neutron/cron/query.proto index 0105437fa..16205fea8 100644 --- a/proto/neutron/cron/query.proto +++ b/proto/neutron/cron/query.proto @@ -13,45 +13,43 @@ option go_package = "github.com/neutron-org/neutron/x/cron/types"; // Query defines the gRPC querier service. service Query { // Queries the parameters of the module. - rpc Params(QueryParamsRequest) returns (QueryParamsResponse) { - option (google.api.http).get = "/neutron/cron/params"; - } + rpc Params(QueryParamsRequest) returns (QueryParamsResponse) { + option (google.api.http).get = "/neutron/cron/params"; + } - // Queries a Schedule by name. - rpc Schedule(QueryGetScheduleRequest) returns (QueryGetScheduleResponse) { - option (google.api.http).get = "/neutron/cron/schedule/{name}"; - } + // Queries a Schedule by name. + rpc Schedule(QueryGetScheduleRequest) returns (QueryGetScheduleResponse) { + option (google.api.http).get = "/neutron/cron/schedule/{name}"; + } - // Queries a list of Schedule items. - rpc Schedules(QuerySchedulesRequest) returns (QuerySchedulesResponse) { - option (google.api.http).get = "/neutron/cron/schedule"; - } + // Queries a list of Schedule items. + rpc Schedules(QuerySchedulesRequest) returns (QuerySchedulesResponse) { + option (google.api.http).get = "/neutron/cron/schedule"; + } -// this line is used by starport scaffolding # 2 + // this line is used by starport scaffolding # 2 } message QueryParamsRequest {} message QueryParamsResponse { - // params holds all the parameters of this module. - Params params = 1 [(gogoproto.nullable) = false]; + // params holds all the parameters of this module. + Params params = 1 [ (gogoproto.nullable) = false ]; } -message QueryGetScheduleRequest { - string name = 1; -} +message QueryGetScheduleRequest { string name = 1; } message QueryGetScheduleResponse { - Schedule schedule = 1 [(gogoproto.nullable) = false]; + Schedule schedule = 1 [ (gogoproto.nullable) = false ]; } message QuerySchedulesRequest { - cosmos.base.query.v1beta1.PageRequest pagination = 1; + cosmos.base.query.v1beta1.PageRequest pagination = 1; } message QuerySchedulesResponse { - repeated Schedule schedules = 1 [(gogoproto.nullable) = false]; - cosmos.base.query.v1beta1.PageResponse pagination = 2; + repeated Schedule schedules = 1 [ (gogoproto.nullable) = false ]; + cosmos.base.query.v1beta1.PageResponse pagination = 2; } // this line is used by starport scaffolding # 3 diff --git a/proto/neutron/cron/schedule.proto b/proto/neutron/cron/schedule.proto index d4fbd337e..3549a8070 100644 --- a/proto/neutron/cron/schedule.proto +++ b/proto/neutron/cron/schedule.proto @@ -6,24 +6,24 @@ option go_package = "github.com/neutron-org/neutron/x/cron/types"; import "gogoproto/gogo.proto"; message Schedule { - // Name of schedule - string name = 1; - // Period in blocks - uint64 period = 2; - // Msgs that will be executed every period amount of time - repeated MsgExecuteContract msgs = 3 [ (gogoproto.nullable) = false ]; - // Last execution's block height - uint64 last_execute_height = 4; + // Name of schedule + string name = 1; + // Period in blocks + uint64 period = 2; + // Msgs that will be executed every period amount of time + repeated MsgExecuteContract msgs = 3 [ (gogoproto.nullable) = false ]; + // Last execution's block height + uint64 last_execute_height = 4; } message MsgExecuteContract { - // Contract is the address of the smart contract - string contract = 1; - // Msg is json encoded message to be passed to the contract - string msg = 2; + // Contract is the address of the smart contract + string contract = 1; + // Msg is json encoded message to be passed to the contract + string msg = 2; } message ScheduleCount { - // Count is the number of current schedules - int32 count = 1; + // Count is the number of current schedules + int32 count = 1; } diff --git a/proto/neutron/cron/tx.proto b/proto/neutron/cron/tx.proto index 79cf8b235..d83271fca 100644 --- a/proto/neutron/cron/tx.proto +++ b/proto/neutron/cron/tx.proto @@ -7,8 +7,7 @@ option go_package = "github.com/neutron-org/neutron/x/cron/types"; // Msg defines the Msg service. service Msg { -// this line is used by starport scaffolding # proto/tx/rpc + // this line is used by starport scaffolding # proto/tx/rpc } - // this line is used by starport scaffolding # proto/tx/message diff --git a/proto/neutron/transfer/v1/tx.proto b/proto/neutron/transfer/v1/tx.proto index b5f8f471a..08019e389 100644 --- a/proto/neutron/transfer/v1/tx.proto +++ b/proto/neutron/transfer/v1/tx.proto @@ -43,8 +43,7 @@ message MsgTransfer { string memo = 8; - neutron.feerefunder.Fee fee = 9 - [ (gogoproto.nullable) = false ]; + neutron.feerefunder.Fee fee = 9 [ (gogoproto.nullable) = false ]; } // MsgTransferResponse is the modified response type for diff --git a/proto/osmosis/tokenfactory/v1beta1/params.proto b/proto/osmosis/tokenfactory/v1beta1/params.proto index 4bd96f977..40a850b16 100644 --- a/proto/osmosis/tokenfactory/v1beta1/params.proto +++ b/proto/osmosis/tokenfactory/v1beta1/params.proto @@ -9,13 +9,15 @@ import "cosmos/base/v1beta1/coin.proto"; // Params holds parameters for the tokenfactory module message Params { - // DenomCreationFee is the fee required to create a new denom using the tokenfactory module - repeated cosmos.base.v1beta1.Coin denom_creation_fee = 1 [ - (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins", - (gogoproto.moretags) = "yaml:\"denom_creation_fee\"", - (gogoproto.nullable) = false - ]; + // DenomCreationFee is the fee required to create a new denom using the + // tokenfactory module + repeated cosmos.base.v1beta1.Coin denom_creation_fee = 1 [ + (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins", + (gogoproto.moretags) = "yaml:\"denom_creation_fee\"", + (gogoproto.nullable) = false + ]; - // FeeCollectorAddress is the address where fees collected from denom creation are sent to - string fee_collector_address = 2; + // FeeCollectorAddress is the address where fees collected from denom creation + // are sent to + string fee_collector_address = 2; } diff --git a/proto/osmosis/tokenfactory/v1beta1/query.proto b/proto/osmosis/tokenfactory/v1beta1/query.proto index a4ee8b4d6..e97978408 100644 --- a/proto/osmosis/tokenfactory/v1beta1/query.proto +++ b/proto/osmosis/tokenfactory/v1beta1/query.proto @@ -18,7 +18,8 @@ service Query { rpc DenomAuthorityMetadata(QueryDenomAuthorityMetadataRequest) returns (QueryDenomAuthorityMetadataResponse) { option (google.api.http).get = - "/osmosis/tokenfactory/v1beta1/denoms/factory/{creator}/{subdenom}/authority_metadata"; + "/osmosis/tokenfactory/v1beta1/denoms/factory/{creator}/{subdenom}/" + "authority_metadata"; } rpc DenomsFromCreator(QueryDenomsFromCreatorRequest) diff --git a/testutil/mocks/interchaintxs/types/expected_keepers.go b/testutil/mocks/interchaintxs/types/expected_keepers.go index 0c903226c..2fd4582de 100644 --- a/testutil/mocks/interchaintxs/types/expected_keepers.go +++ b/testutil/mocks/interchaintxs/types/expected_keepers.go @@ -127,6 +127,20 @@ func (mr *MockContractManagerKeeperMockRecorder) AddContractFailure(ctx, channel return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddContractFailure", reflect.TypeOf((*MockContractManagerKeeper)(nil).AddContractFailure), ctx, channelID, address, ackID, ackType) } +// GetParams mocks base method. +func (m *MockContractManagerKeeper) GetParams(ctx types.Context) types4.Params { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "GetParams", ctx) + ret0, _ := ret[0].(types4.Params) + return ret0 +} + +// GetParams indicates an expected call of GetParams. +func (mr *MockContractManagerKeeperMockRecorder) GetParams(ctx interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetParams", reflect.TypeOf((*MockContractManagerKeeper)(nil).GetParams), ctx) +} + // HasContractInfo mocks base method. func (m *MockContractManagerKeeper) HasContractInfo(ctx types.Context, contractAddress types.AccAddress) bool { m.ctrl.T.Helper() diff --git a/testutil/mocks/transfer/types/expected_keepers.go b/testutil/mocks/transfer/types/expected_keepers.go index e7c4dfa3b..49699d9e2 100644 --- a/testutil/mocks/transfer/types/expected_keepers.go +++ b/testutil/mocks/transfer/types/expected_keepers.go @@ -11,7 +11,8 @@ import ( types0 "github.com/cosmos/cosmos-sdk/x/auth/types" types1 "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" gomock "github.com/golang/mock/gomock" - types2 "github.com/neutron-org/neutron/x/feerefunder/types" + types2 "github.com/neutron-org/neutron/x/contractmanager/types" + types3 "github.com/neutron-org/neutron/x/feerefunder/types" ) // MockContractManagerKeeper is a mock of ContractManagerKeeper interface. @@ -49,6 +50,20 @@ func (mr *MockContractManagerKeeperMockRecorder) AddContractFailure(ctx, channel return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddContractFailure", reflect.TypeOf((*MockContractManagerKeeper)(nil).AddContractFailure), ctx, channelID, address, ackID, ackType) } +// GetParams mocks base method. +func (m *MockContractManagerKeeper) GetParams(ctx types.Context) types2.Params { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "GetParams", ctx) + ret0, _ := ret[0].(types2.Params) + return ret0 +} + +// GetParams indicates an expected call of GetParams. +func (mr *MockContractManagerKeeperMockRecorder) GetParams(ctx interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetParams", reflect.TypeOf((*MockContractManagerKeeper)(nil).GetParams), ctx) +} + // HasContractInfo mocks base method. func (m *MockContractManagerKeeper) HasContractInfo(ctx types.Context, contractAddress types.AccAddress) bool { m.ctrl.T.Helper() @@ -132,7 +147,7 @@ func (m *MockFeeRefunderKeeper) EXPECT() *MockFeeRefunderKeeperMockRecorder { } // DistributeAcknowledgementFee mocks base method. -func (m *MockFeeRefunderKeeper) DistributeAcknowledgementFee(ctx types.Context, receiver types.AccAddress, packetID types2.PacketID) { +func (m *MockFeeRefunderKeeper) DistributeAcknowledgementFee(ctx types.Context, receiver types.AccAddress, packetID types3.PacketID) { m.ctrl.T.Helper() m.ctrl.Call(m, "DistributeAcknowledgementFee", ctx, receiver, packetID) } @@ -144,7 +159,7 @@ func (mr *MockFeeRefunderKeeperMockRecorder) DistributeAcknowledgementFee(ctx, r } // DistributeTimeoutFee mocks base method. -func (m *MockFeeRefunderKeeper) DistributeTimeoutFee(ctx types.Context, receiver types.AccAddress, packetID types2.PacketID) { +func (m *MockFeeRefunderKeeper) DistributeTimeoutFee(ctx types.Context, receiver types.AccAddress, packetID types3.PacketID) { m.ctrl.T.Helper() m.ctrl.Call(m, "DistributeTimeoutFee", ctx, receiver, packetID) } @@ -156,7 +171,7 @@ func (mr *MockFeeRefunderKeeperMockRecorder) DistributeTimeoutFee(ctx, receiver, } // LockFees mocks base method. -func (m *MockFeeRefunderKeeper) LockFees(ctx types.Context, payer types.AccAddress, packetID types2.PacketID, fee types2.Fee) error { +func (m *MockFeeRefunderKeeper) LockFees(ctx types.Context, payer types.AccAddress, packetID types3.PacketID, fee types3.Fee) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "LockFees", ctx, payer, packetID, fee) ret0, _ := ret[0].(error) diff --git a/x/contractmanager/keeper/params.go b/x/contractmanager/keeper/params.go index b2e6f7687..4aea5124d 100644 --- a/x/contractmanager/keeper/params.go +++ b/x/contractmanager/keeper/params.go @@ -7,8 +7,15 @@ import ( ) // GetParams get all parameters as types.Params -func (k Keeper) GetParams(_ sdk.Context) types.Params { - return types.NewParams() +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 set the params diff --git a/x/contractmanager/types/params.go b/x/contractmanager/types/params.go index 357196ad6..5c77ce196 100644 --- a/x/contractmanager/types/params.go +++ b/x/contractmanager/types/params.go @@ -7,6 +7,8 @@ import ( var _ paramtypes.ParamSet = (*Params)(nil) +const DefaultSudoCallGasLimit = uint64(1_000_000) + // ParamKeyTable the param key table for launch module func ParamKeyTable() paramtypes.KeyTable { return paramtypes.NewKeyTable().RegisterParamSet(&Params{}) @@ -14,7 +16,9 @@ func ParamKeyTable() paramtypes.KeyTable { // NewParams creates a new Params instance func NewParams() Params { - return Params{} + return Params{ + SudoCallGasLimit: DefaultSudoCallGasLimit, + } } // DefaultParams returns a default set of parameters diff --git a/x/contractmanager/types/params.pb.go b/x/contractmanager/types/params.pb.go index a2edd6ade..39cec5b65 100644 --- a/x/contractmanager/types/params.pb.go +++ b/x/contractmanager/types/params.pb.go @@ -25,6 +25,7 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // Params defines the parameters for the module. type Params struct { + SudoCallGasLimit uint64 `protobuf:"varint,1,opt,name=sudo_call_gas_limit,json=sudoCallGasLimit,proto3" json:"sudo_call_gas_limit,omitempty"` } func (m *Params) Reset() { *m = Params{} } @@ -59,6 +60,13 @@ func (m *Params) XXX_DiscardUnknown() { var xxx_messageInfo_Params proto.InternalMessageInfo +func (m *Params) GetSudoCallGasLimit() uint64 { + if m != nil { + return m.SudoCallGasLimit + } + return 0 +} + func init() { proto.RegisterType((*Params)(nil), "neutron.contractmanager.Params") } @@ -68,17 +76,20 @@ func init() { } var fileDescriptor_121b05e48c7a8737 = []byte{ - // 158 bytes of a gzipped FileDescriptorProto + // 201 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0xc9, 0x4b, 0x2d, 0x2d, 0x29, 0xca, 0xcf, 0xd3, 0x4f, 0xce, 0xcf, 0x2b, 0x29, 0x4a, 0x4c, 0x2e, 0xc9, 0x4d, 0xcc, 0x4b, 0x4c, 0x4f, 0x2d, 0xd2, 0x2f, 0x48, 0x2c, 0x4a, 0xcc, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x87, 0xaa, 0xd2, 0x43, 0x53, 0x25, 0x25, 0x92, 0x9e, 0x9f, 0x9e, 0x0f, 0x56, 0xa3, - 0x0f, 0x62, 0x41, 0x94, 0x2b, 0xf1, 0x71, 0xb1, 0x05, 0x80, 0xb5, 0x5b, 0xb1, 0xcc, 0x58, 0x20, - 0xcf, 0xe0, 0x14, 0x70, 0xe2, 0x91, 0x1c, 0xe3, 0x85, 0x47, 0x72, 0x8c, 0x0f, 0x1e, 0xc9, 0x31, - 0x4e, 0x78, 0x2c, 0xc7, 0x70, 0xe1, 0xb1, 0x1c, 0xc3, 0x8d, 0xc7, 0x72, 0x0c, 0x51, 0x66, 0xe9, - 0x99, 0x25, 0x19, 0xa5, 0x49, 0x7a, 0xc9, 0xf9, 0xb9, 0xfa, 0x50, 0x3b, 0x74, 0xf3, 0x8b, 0xd2, - 0x61, 0x6c, 0xfd, 0x0a, 0x0c, 0x77, 0x95, 0x54, 0x16, 0xa4, 0x16, 0x27, 0xb1, 0x81, 0x2d, 0x32, - 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0x69, 0x27, 0xc9, 0x25, 0xbf, 0x00, 0x00, 0x00, + 0x0f, 0x62, 0x41, 0x94, 0x2b, 0xd9, 0x72, 0xb1, 0x05, 0x80, 0xb5, 0x0b, 0xe9, 0x72, 0x09, 0x17, + 0x97, 0xa6, 0xe4, 0xc7, 0x27, 0x27, 0xe6, 0xe4, 0xc4, 0xa7, 0x27, 0x16, 0xc7, 0xe7, 0x64, 0xe6, + 0x66, 0x96, 0x48, 0x30, 0x2a, 0x30, 0x6a, 0xb0, 0x04, 0x09, 0x80, 0xa4, 0x9c, 0x13, 0x73, 0x72, + 0xdc, 0x13, 0x8b, 0x7d, 0x40, 0xe2, 0x56, 0x2c, 0x33, 0x16, 0xc8, 0x33, 0x38, 0x05, 0x9c, 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, 0x59, 0x7a, 0x66, 0x49, 0x46, 0x69, 0x92, + 0x5e, 0x72, 0x7e, 0xae, 0x3e, 0xd4, 0x49, 0xba, 0xf9, 0x45, 0xe9, 0x30, 0xb6, 0x7e, 0x05, 0x86, + 0x37, 0x4a, 0x2a, 0x0b, 0x52, 0x8b, 0x93, 0xd8, 0xc0, 0xee, 0x32, 0x06, 0x04, 0x00, 0x00, 0xff, + 0xff, 0xc5, 0xbf, 0xd1, 0xee, 0xee, 0x00, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { @@ -101,6 +112,11 @@ func (m *Params) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if m.SudoCallGasLimit != 0 { + i = encodeVarintParams(dAtA, i, uint64(m.SudoCallGasLimit)) + i-- + dAtA[i] = 0x8 + } return len(dAtA) - i, nil } @@ -121,6 +137,9 @@ func (m *Params) Size() (n int) { } var l int _ = l + if m.SudoCallGasLimit != 0 { + n += 1 + sovParams(uint64(m.SudoCallGasLimit)) + } return n } @@ -159,6 +178,25 @@ func (m *Params) Unmarshal(dAtA []byte) error { return fmt.Errorf("proto: Params: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { + case 1: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field SudoCallGasLimit", wireType) + } + m.SudoCallGasLimit = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowParams + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.SudoCallGasLimit |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } default: iNdEx = preIndex skippy, err := skipParams(dAtA[iNdEx:]) diff --git a/x/interchaintxs/keeper/ibc_handlers.go b/x/interchaintxs/keeper/ibc_handlers.go index 8b851dd69..096248786 100644 --- a/x/interchaintxs/keeper/ibc_handlers.go +++ b/x/interchaintxs/keeper/ibc_handlers.go @@ -1,7 +1,7 @@ package keeper import ( - "strings" + "fmt" "time" "cosmossdk.io/errors" @@ -21,63 +21,6 @@ const ( GasReserve = 15000 ) -func (k *Keeper) outOfGasRecovery( - ctx sdk.Context, - gasMeter sdk.GasMeter, - senderAddress sdk.AccAddress, - packet channeltypes.Packet, - failureAckType string, -) { - if r := recover(); r != nil { - _, ok := r.(sdk.ErrorOutOfGas) - if !ok || !gasMeter.IsOutOfGas() { - panic(r) - } - - k.Logger(ctx).Debug("Out of gas", "Gas meter", gasMeter.String()) - k.contractManagerKeeper.AddContractFailure(ctx, packet.SourceChannel, senderAddress.String(), packet.GetSequence(), failureAckType) - } -} - -// createCachedContext creates a cached context for handling Sudo calls to CosmWasm smart-contracts. -// If there is an error during Sudo call, we can safely revert changes made in cached context. -func (k *Keeper) createCachedContext(ctx sdk.Context) (sdk.Context, func(), sdk.GasMeter) { - gasMeter := ctx.GasMeter() - // determines type of gas meter by its prefix: - // * BasicGasMeter - basic gas meter which is used for processing tx directly in block; - // * InfiniteGasMeter - is used to process txs during simulation calls. We don't need to create a limit for such meter, - // since it's infinite. - gasMeterIsLimited := strings.HasPrefix(ctx.GasMeter().String(), "BasicGasMeter") - - cacheCtx, writeFn := ctx.CacheContext() - - // if gas meter is limited: - // 1. calculate how much free gas left we have for a Sudo call; - // 2. If gasLeft less than reserved gas (GasReserved), we set gas limit for cached context to zero, meaning we can't - // process Sudo call; - // 3. If we have more gas left than reserved gas (GasReserved) for Sudo call, we set gas limit for cached context to - // difference between gas left and reserved gas: (gasLeft - GasReserve); - // - // GasReserve is the amount of gas on the context gas meter we need to reserve in order to add contract failure to keeper - // and process failed Sudo call - if gasMeterIsLimited { - gasLeft := gasMeter.Limit() - gasMeter.GasConsumed() - - var newLimit uint64 - if gasLeft < GasReserve { - newLimit = 0 - } else { - newLimit = gasLeft - GasReserve - } - - gasMeter = sdk.NewGasMeter(newLimit) - } - - cacheCtx = cacheCtx.WithGasMeter(gasMeter) - - return cacheCtx, writeFn, gasMeter -} - // HandleAcknowledgement passes the acknowledgement data to the appropriate contract via a Sudo call. func (k *Keeper) HandleAcknowledgement(ctx sdk.Context, packet channeltypes.Packet, acknowledgement []byte, relayer sdk.AccAddress) error { defer telemetry.ModuleMeasureSince(types.ModuleName, time.Now(), LabelHandleAcknowledgment) @@ -113,18 +56,16 @@ func (k *Keeper) HandleAcknowledgement(ctx sdk.Context, packet channeltypes.Pack k.contractManagerKeeper.AddContractFailure(ctx, packet.SourceChannel, icaOwner.GetContract().String(), packet.GetSequence(), "ack") k.Logger(ctx).Debug("HandleAcknowledgement: failed to Sudo contract on packet acknowledgement", "error", err) } else { - ctx.EventManager().EmitEvents(cacheCtx.EventManager().Events()) writeFn() } - ctx.GasMeter().ConsumeGas(newGasMeter.GasConsumed(), "consume from cached context") - + // consume all the gas from the cached context + ctx.GasMeter().ConsumeGas(newGasMeter.Limit(), "consume full gas from cached context") return nil } // HandleTimeout passes the timeout data to the appropriate contract via a Sudo call. // Since all ICA channels are ORDERED, a single timeout shuts down a channel. -// The affected zone should be paused after a timeout. func (k *Keeper) HandleTimeout(ctx sdk.Context, packet channeltypes.Packet, relayer sdk.AccAddress) error { defer telemetry.ModuleMeasureSince(types.ModuleName, time.Now(), LabelHandleTimeout) @@ -145,12 +86,11 @@ func (k *Keeper) HandleTimeout(ctx sdk.Context, packet channeltypes.Packet, rela k.contractManagerKeeper.AddContractFailure(ctx, packet.SourceChannel, icaOwner.GetContract().String(), packet.GetSequence(), "timeout") k.Logger(ctx).Error("HandleTimeout: failed to Sudo contract on packet timeout", "error", err) } else { - ctx.EventManager().EmitEvents(cacheCtx.EventManager().Events()) writeFn() } - ctx.GasMeter().ConsumeGas(newGasMeter.GasConsumed(), "consume from cached context") - + // consume all the gas from the cached context + ctx.GasMeter().ConsumeGas(newGasMeter.Limit(), "consume full gas from cached context") return nil } @@ -187,3 +127,47 @@ func (k *Keeper) HandleChanOpenAck( return nil } + +func (k *Keeper) outOfGasRecovery( + ctx sdk.Context, + gasMeter sdk.GasMeter, + senderAddress sdk.AccAddress, + packet channeltypes.Packet, + failureAckType string, +) { + if r := recover(); r != nil { + _, ok := r.(sdk.ErrorOutOfGas) + if !ok || !gasMeter.IsOutOfGas() { + panic(r) + } + + k.Logger(ctx).Debug("Out of gas", "Gas meter", gasMeter.String()) + k.contractManagerKeeper.AddContractFailure(ctx, packet.SourceChannel, senderAddress.String(), packet.GetSequence(), failureAckType) + } +} + +// createCachedContext creates a cached context for handling Sudo calls to CosmWasm smart-contracts. +// If there is an error during Sudo call, we can safely revert changes made in cached context. +// panics if there is no enough gas for sudoCall + reserve +func (k *Keeper) createCachedContext(ctx sdk.Context) (sdk.Context, func(), sdk.GasMeter) { + cacheCtx, writeFn := ctx.CacheContext() + + sudoLimit := k.contractManagerKeeper.GetParams(ctx).SudoCallGasLimit + if ctx.GasMeter().GasRemaining() < getGasReserve()+sudoLimit { + panic(sdk.ErrorOutOfGas{Descriptor: fmt.Sprintf("%dgas - reserve for sudo call", sudoLimit)}) + } + + gasMeter := sdk.NewGasMeter(sudoLimit) + + cacheCtx = cacheCtx.WithGasMeter(gasMeter) + + return cacheCtx, writeFn, gasMeter +} + +// TODO: calculate gas reserve in according to failure ack + packet size +// getGasReserve calculates the gas amount required to +// 1) Save failure ack, in case there is OutOfGas error or a regular error during sudoCall +// 2) Distribute ack fees +func getGasReserve() uint64 { + return GasReserve +} diff --git a/x/interchaintxs/keeper/ibc_handlers_test.go b/x/interchaintxs/keeper/ibc_handlers_test.go index b02a7b6fb..21e3d9ce4 100644 --- a/x/interchaintxs/keeper/ibc_handlers_test.go +++ b/x/interchaintxs/keeper/ibc_handlers_test.go @@ -71,12 +71,14 @@ func TestHandleAcknowledgement(t *testing.T) { store := cachedCtx.KVStore(storeKey) store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) // consumes 2990 }).Return(nil, fmt.Errorf("SudoResponse error")) + cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 4000}) cmKeeper.EXPECT().AddContractFailure(ctx, "channel-0", contractAddress.String(), p.GetSequence(), "ack") feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = icak.HandleAcknowledgement(ctx, p, resAckData, relayerAddress) require.NoError(t, err) require.Empty(t, store.Get(ShouldNotBeWrittenKey)) - require.Equal(t, uint64(2990), ctx.GasMeter().GasConsumed()) + // response spent only 2990, but we consume all 4000 defined by params + require.Equal(t, uint64(4000), ctx.GasMeter().GasConsumed()) // error during SudoError ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) @@ -84,12 +86,14 @@ func TestHandleAcknowledgement(t *testing.T) { store := cachedCtx.KVStore(storeKey) store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) }).Return(nil, fmt.Errorf("SudoError error")) + cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 5000}) cmKeeper.EXPECT().AddContractFailure(ctx, "channel-0", contractAddress.String(), p.GetSequence(), "ack") feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = icak.HandleAcknowledgement(ctx, p, errAckData, relayerAddress) require.NoError(t, err) require.Empty(t, store.Get(ShouldNotBeWrittenKey)) - require.Equal(t, uint64(2990), ctx.GasMeter().GasConsumed()) + // TODO: add test to check gas consumption by AddFailure + require.Equal(t, uint64(5000), ctx.GasMeter().GasConsumed()) // success during SudoError ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) @@ -97,23 +101,28 @@ func TestHandleAcknowledgement(t *testing.T) { store := cachedCtx.KVStore(storeKey) store.Set(ShouldBeWrittenKey("sudoerror"), ShouldBeWritten) }).Return(nil, nil) + cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 6000}) feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = icak.HandleAcknowledgement(ctx, p, errAckData, relayerAddress) require.NoError(t, err) require.Equal(t, ShouldBeWritten, store.Get(ShouldBeWrittenKey("sudoerror"))) + require.Equal(t, uint64(6000), ctx.GasMeter().GasConsumed()) // out of gas during SudoError ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) cmKeeper.EXPECT().SudoError(gomock.AssignableToTypeOf(ctx), contractAddress, p, errACK.GetError()).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, error string) { store := cachedCtx.KVStore(storeKey) store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) - cachedCtx.GasMeter().ConsumeGas(cachedCtx.GasMeter().Limit()+1, "out of gas test") + cachedCtx.GasMeter().ConsumeGas(7001, "out of gas test") }).Return(nil, fmt.Errorf("SudoError error")) + cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 7000}) cmKeeper.EXPECT().AddContractFailure(ctx, "channel-0", contractAddress.String(), p.GetSequence(), "ack") feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = icak.HandleAcknowledgement(ctx, p, errAckData, relayerAddress) require.NoError(t, err) require.Empty(t, store.Get(ShouldNotBeWrittenKey)) + // TODO: add test to check gas consumption by AddFailure + // TODO: consume sudogas even on out of gas from the contract? require.Equal(t, uint64(0), ctx.GasMeter().GasConsumed()) // due to out of gas recovery we consume 0 with a SudoError handler // check we have ReserveGas reserved and @@ -122,32 +131,25 @@ func TestHandleAcknowledgement(t *testing.T) { ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) gasReserved := false cmKeeper.EXPECT().SudoResponse(gomock.AssignableToTypeOf(ctx), contractAddress, p, resACK.GetResult()).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, msg []byte) { - if ctx.GasMeter().Limit() == cachedCtx.GasMeter().Limit()+keeper.GasReserve { + if cachedCtx.GasMeter().Limit() == 8000 { gasReserved = true } store := cachedCtx.KVStore(storeKey) store.Set(ShouldBeWrittenKey("sudoresponse"), ShouldBeWritten) // consumes 3140 gas, 2000 flat write + 30 every byte of key+value }).Return(nil, nil) + cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 8000}) feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = icak.HandleAcknowledgement(ctx, p, resAckData, relayerAddress) require.NoError(t, err) require.True(t, gasReserved) - require.Equal(t, uint64(3140), ctx.GasMeter().GasConsumed()) + require.Equal(t, uint64(8000), ctx.GasMeter().GasConsumed()) require.Equal(t, ShouldBeWritten, store.Get(ShouldBeWrittenKey("sudoresponse"))) - // not enough gas to reserve + not enough to make AddContractFailure failure after panic recover + // not enough gas to reserve, tx aborted ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - lowGasCtx := infCtx.WithGasMeter(sdk.NewGasMeter(keeper.GasReserve - 1)) - cmKeeper.EXPECT().SudoResponse(gomock.AssignableToTypeOf(lowGasCtx), contractAddress, p, resACK.GetResult()).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, msg []byte) { - store := cachedCtx.KVStore(storeKey) - store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) - cachedCtx.GasMeter().ConsumeGas(1, "Sudo response consumption") - }).Return(nil, nil) - feeKeeper.EXPECT().DistributeAcknowledgementFee(lowGasCtx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) - cmKeeper.EXPECT().AddContractFailure(lowGasCtx, "channel-0", contractAddress.String(), p.GetSequence(), "ack").Do(func(ctx sdk.Context, channelId, address string, ackID uint64, ackType string) { - ctx.GasMeter().ConsumeGas(keeper.GasReserve, "out of gas") - }) - require.Panics(t, func() { icak.HandleAcknowledgement(lowGasCtx, p, resAckData, relayerAddress) }) //nolint:errcheck // this is a panic test + lowGasCtx := infCtx.WithGasMeter(sdk.NewGasMeter(keeper.GasReserve + 9000 - 1)) + cmKeeper.EXPECT().GetParams(lowGasCtx).Return(types.Params{SudoCallGasLimit: 9000}) + require.PanicsWithValue(t, sdk.ErrorOutOfGas{Descriptor: "9000gas - reserve for sudo call"}, func() { icak.HandleAcknowledgement(lowGasCtx, p, resAckData, relayerAddress) }) //nolint:errcheck // this is a panic test require.Empty(t, store.Get(ShouldNotBeWrittenKey)) } @@ -175,16 +177,17 @@ func TestHandleTimeout(t *testing.T) { gasReserved := false ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) cmKeeper.EXPECT().SudoTimeout(gomock.AssignableToTypeOf(ctx), contractAddress, p).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet) { - if ctx.GasMeter().Limit() == cachedCtx.GasMeter().Limit()+keeper.GasReserve { + if cachedCtx.GasMeter().Limit() == 4000 { gasReserved = true } store := cachedCtx.KVStore(storeKey) store.Set(ShouldBeWrittenKey("sudotimeout"), ShouldBeWritten) // consumes 3110 gas, 2000 flat write + 30 every byte of key+value }).Return(nil, nil) + cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 4000}) feeKeeper.EXPECT().DistributeTimeoutFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = icak.HandleTimeout(ctx, p, relayerAddress) require.True(t, gasReserved) - require.Equal(t, uint64(3110), ctx.GasMeter().GasConsumed()) + require.Equal(t, uint64(4000), ctx.GasMeter().GasConsumed()) require.Equal(t, ShouldBeWritten, store.Get(ShouldBeWrittenKey("sudotimeout"))) require.NoError(t, err) @@ -194,9 +197,11 @@ func TestHandleTimeout(t *testing.T) { store := cachedCtx.KVStore(storeKey) store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) }).Return(nil, fmt.Errorf("SudoTimeout error")) + cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 5000}) cmKeeper.EXPECT().AddContractFailure(ctx, "channel-0", contractAddress.String(), p.GetSequence(), "timeout") feeKeeper.EXPECT().DistributeTimeoutFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = icak.HandleTimeout(ctx, p, relayerAddress) + require.Equal(t, uint64(5000), ctx.GasMeter().GasConsumed()) require.NoError(t, err) require.Empty(t, store.Get(ShouldNotBeWrittenKey)) @@ -205,11 +210,13 @@ func TestHandleTimeout(t *testing.T) { cmKeeper.EXPECT().SudoTimeout(gomock.AssignableToTypeOf(ctx), contractAddress, p).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet) { store := cachedCtx.KVStore(storeKey) store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) - cachedCtx.GasMeter().ConsumeGas(cachedCtx.GasMeter().Limit()+1, "out of gas test") + cachedCtx.GasMeter().ConsumeGas(6001, "out of gas test") }).Return(nil, fmt.Errorf("SudoTimeout error")) + cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 6000}) cmKeeper.EXPECT().AddContractFailure(ctx, "channel-0", contractAddress.String(), p.GetSequence(), "timeout") feeKeeper.EXPECT().DistributeTimeoutFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = icak.HandleTimeout(ctx, p, relayerAddress) + require.Equal(t, uint64(0), ctx.GasMeter().GasConsumed()) require.NoError(t, err) require.Empty(t, store.Get(ShouldNotBeWrittenKey)) } diff --git a/x/interchaintxs/types/expected_keepers.go b/x/interchaintxs/types/expected_keepers.go index 7097b0ed4..c663fc168 100644 --- a/x/interchaintxs/types/expected_keepers.go +++ b/x/interchaintxs/types/expected_keepers.go @@ -31,6 +31,7 @@ type ContractManagerKeeper interface { SudoError(ctx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, details string) ([]byte, error) SudoTimeout(ctx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet) ([]byte, error) SudoOnChanOpenAck(ctx sdk.Context, contractAddress sdk.AccAddress, details contractmanagertypes.OpenAckDetails) ([]byte, error) + GetParams(ctx sdk.Context) (params contractmanagertypes.Params) } type ICAControllerKeeper interface { diff --git a/x/tokenfactory/types/params.pb.go b/x/tokenfactory/types/params.pb.go index 3ca6e158d..08379c672 100644 --- a/x/tokenfactory/types/params.pb.go +++ b/x/tokenfactory/types/params.pb.go @@ -28,9 +28,11 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // Params holds parameters for the tokenfactory module type Params struct { - // DenomCreationFee is the fee required to create a new denom using the tokenfactory module + // DenomCreationFee is the fee required to create a new denom using the + // tokenfactory module DenomCreationFee github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,1,rep,name=denom_creation_fee,json=denomCreationFee,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"denom_creation_fee" yaml:"denom_creation_fee"` - // FeeCollectorAddress is the address where fees collected from denom creation are sent to + // FeeCollectorAddress is the address where fees collected from denom creation + // are sent to FeeCollectorAddress string `protobuf:"bytes,2,opt,name=fee_collector_address,json=feeCollectorAddress,proto3" json:"fee_collector_address,omitempty"` } diff --git a/x/transfer/ibc_handlers.go b/x/transfer/ibc_handlers.go index fe6db47d5..d4e96d6e8 100644 --- a/x/transfer/ibc_handlers.go +++ b/x/transfer/ibc_handlers.go @@ -1,9 +1,8 @@ package transfer import ( - "strings" - "cosmossdk.io/errors" + "fmt" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" @@ -19,67 +18,9 @@ const ( GasReserve = 15000 ) -func (im IBCModule) outOfGasRecovery( - ctx sdk.Context, - gasMeter sdk.GasMeter, - senderAddress sdk.AccAddress, - packet channeltypes.Packet, - data transfertypes.FungibleTokenPacketData, - failureType string, -) { - if r := recover(); r != nil { - _, ok := r.(sdk.ErrorOutOfGas) - if !ok || !gasMeter.IsOutOfGas() { - panic(r) - } - - im.keeper.Logger(ctx).Debug("Out of gas", "Gas meter", gasMeter.String(), "Packet data", data) - im.ContractManagerKeeper.AddContractFailure(ctx, packet.SourceChannel, senderAddress.String(), packet.GetSequence(), failureType) - // FIXME: add distribution call - } -} - -// createCachedContext creates a cached context for handling Sudo calls to CosmWasm smart-contracts. -// If there is an error during Sudo call, we can safely revert changes made in cached context. -func (im *IBCModule) createCachedContext(ctx sdk.Context) (sdk.Context, func(), sdk.GasMeter) { - gasMeter := ctx.GasMeter() - // determines type of gas meter by its prefix: - // * BasicGasMeter - basic gas meter which is used for processing tx directly in block; - // * InfiniteGasMeter - is used to process txs during simulation calls. We don't need to create a limit for such meter, - // since it's infinite. - gasMeterIsLimited := strings.HasPrefix(ctx.GasMeter().String(), "BasicGasMeter") - - cacheCtx, writeFn := ctx.CacheContext() - - // if gas meter is limited: - // 1. calculate how much free gas left we have for a Sudo call; - // 2. If gasLeft less than reserved gas (GasReserved), we set gas limit for cached context to zero, meaning we can't - // process Sudo call; - // 3. If we have more gas left than reserved gas (GasReserved) for Sudo call, we set gas limit for cached context to - // difference between gas left and reserved gas: (gasLeft - GasReserve); - // - // GasReserve is the amount of gas on the context gas meter we need to reserve in order to add contract failure to keeper - // and process failed Sudo call - if gasMeterIsLimited { - gasLeft := gasMeter.Limit() - gasMeter.GasConsumed() - - var newLimit uint64 - if gasLeft < GasReserve { - newLimit = 0 - } else { - newLimit = gasLeft - GasReserve - } - - gasMeter = sdk.NewGasMeter(newLimit) - } - - cacheCtx = cacheCtx.WithGasMeter(gasMeter) - - return cacheCtx, writeFn, gasMeter -} - // HandleAcknowledgement passes the acknowledgement data to the appropriate contract via a Sudo call. func (im IBCModule) HandleAcknowledgement(ctx sdk.Context, packet channeltypes.Packet, acknowledgement []byte, relayer sdk.AccAddress) error { + // TODO: why do ever need whole logic for non contract, why dont exit early var ack channeltypes.Acknowledgement if err := channeltypes.SubModuleCdc.UnmarshalJSON(acknowledgement, &ack); err != nil { return errors.Wrapf(sdkerrors.ErrUnknownRequest, "cannot unmarshal ICS-20 transfer packet acknowledgement: %v", err) @@ -110,16 +51,16 @@ func (im IBCModule) HandleAcknowledgement(ctx sdk.Context, packet channeltypes.P im.ContractManagerKeeper.AddContractFailure(ctx, packet.SourceChannel, senderAddress.String(), packet.GetSequence(), "ack") im.keeper.Logger(ctx).Debug("failed to Sudo contract on packet acknowledgement", err) } else { - ctx.EventManager().EmitEvents(cacheCtx.EventManager().Events()) writeFn() } - ctx.GasMeter().ConsumeGas(newGasMeter.GasConsumed(), "consume from cached context") im.keeper.Logger(ctx).Debug("acknowledgement received", "Packet data", data, "CheckTx", ctx.IsCheckTx()) // distribute fees only if the sender is a contract if im.ContractManagerKeeper.HasContractInfo(ctx, senderAddress) { im.wrappedKeeper.FeeKeeper.DistributeAcknowledgementFee(ctx, relayer, feetypes.NewPacketID(packet.SourcePort, packet.SourceChannel, packet.Sequence)) + // consume all the gas from the cached context + ctx.GasMeter().ConsumeGas(newGasMeter.Limit(), "consume full gas from cached context") } return nil @@ -147,16 +88,61 @@ func (im IBCModule) HandleTimeout(ctx sdk.Context, packet channeltypes.Packet, r im.ContractManagerKeeper.AddContractFailure(ctx, packet.SourceChannel, senderAddress.String(), packet.GetSequence(), "timeout") im.keeper.Logger(ctx).Debug("failed to Sudo contract on packet timeout", err) } else { - ctx.EventManager().EmitEvents(cacheCtx.EventManager().Events()) writeFn() } // distribute fee only if the sender is a contract if im.ContractManagerKeeper.HasContractInfo(ctx, senderAddress) { im.wrappedKeeper.FeeKeeper.DistributeTimeoutFee(ctx, relayer, feetypes.NewPacketID(packet.SourcePort, packet.SourceChannel, packet.Sequence)) + // consume all the gas from the cached context + ctx.GasMeter().ConsumeGas(newGasMeter.Limit(), "consume full gas from cached context") } - ctx.GasMeter().ConsumeGas(newGasMeter.GasConsumed(), "consume from cached context") - return nil } + +func (im IBCModule) outOfGasRecovery( + ctx sdk.Context, + gasMeter sdk.GasMeter, + senderAddress sdk.AccAddress, + packet channeltypes.Packet, + data transfertypes.FungibleTokenPacketData, + failureType string, +) { + if r := recover(); r != nil { + _, ok := r.(sdk.ErrorOutOfGas) + if !ok || !gasMeter.IsOutOfGas() { + panic(r) + } + + im.keeper.Logger(ctx).Debug("Out of gas", "Gas meter", gasMeter.String(), "Packet data", data) + im.ContractManagerKeeper.AddContractFailure(ctx, packet.SourceChannel, senderAddress.String(), packet.GetSequence(), failureType) + // FIXME: add distribution call + } +} + +// createCachedContext creates a cached context for handling Sudo calls to CosmWasm smart-contracts. +// If there is an error during Sudo call, we can safely revert changes made in cached context. +// panics if there is no enough gas for sudoCall + reserve +func (im *IBCModule) createCachedContext(ctx sdk.Context) (sdk.Context, func(), sdk.GasMeter) { + cacheCtx, writeFn := ctx.CacheContext() + + sudoLimit := im.ContractManagerKeeper.GetParams(ctx).SudoCallGasLimit + if ctx.GasMeter().GasRemaining() < getGasReserve()+sudoLimit { + panic(sdk.ErrorOutOfGas{Descriptor: fmt.Sprintf("%dgas - reserve for sudo call", sudoLimit)}) + } + + gasMeter := sdk.NewGasMeter(sudoLimit) + + cacheCtx = cacheCtx.WithGasMeter(gasMeter) + + return cacheCtx, writeFn, gasMeter +} + +// TODO: calculate gas reserve in according to failure ack + packet size +// getGasReserve calculates the gas amount required to +// 1) Save failure ack, in case there is OutOfGas error or a regular error during sudoCall +// 2) Distribute ack fees +func getGasReserve() uint64 { + return GasReserve +} diff --git a/x/transfer/ibc_handlers_test.go b/x/transfer/ibc_handlers_test.go index 024d17989..8e8fa3bb4 100644 --- a/x/transfer/ibc_handlers_test.go +++ b/x/transfer/ibc_handlers_test.go @@ -2,6 +2,7 @@ package transfer_test import ( "fmt" + "github.com/neutron-org/neutron/x/contractmanager/types" "testing" sdk "github.com/cosmos/cosmos-sdk/types" @@ -12,7 +13,6 @@ import ( mock_types "github.com/neutron-org/neutron/testutil/mocks/transfer/types" testkeeper "github.com/neutron-org/neutron/testutil/transfer/keeper" feetypes "github.com/neutron-org/neutron/x/feerefunder/types" - "github.com/neutron-org/neutron/x/interchaintxs/keeper" ictxtypes "github.com/neutron-org/neutron/x/interchaintxs/types" "github.com/neutron-org/neutron/x/transfer" "github.com/stretchr/testify/require" @@ -100,12 +100,13 @@ func TestHandleAcknowledgement(t *testing.T) { store := cachedCtx.KVStore(storeKey) store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) // consumes 2990 }).Return(nil, fmt.Errorf("SudoResponse error")) + cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 4000}) cmKeeper.EXPECT().AddContractFailure(ctx, "channel-0", contractAddress.String(), p.GetSequence(), "ack") cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(false) err = txModule.HandleAcknowledgement(ctx, p, resAckData, relayerAddress) require.NoError(t, err) require.Empty(t, store.Get(ShouldNotBeWrittenKey)) - require.Equal(t, uint64(2990), ctx.GasMeter().GasConsumed()) + require.Equal(t, uint64(0), ctx.GasMeter().GasConsumed()) // error during SudoResponse contract ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) @@ -113,13 +114,14 @@ func TestHandleAcknowledgement(t *testing.T) { store := cachedCtx.KVStore(storeKey) store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) // consumes 2990 }).Return(nil, fmt.Errorf("SudoResponse error")) + cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 5000}) cmKeeper.EXPECT().AddContractFailure(ctx, "channel-0", contractAddress.String(), p.GetSequence(), "ack") cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = txModule.HandleAcknowledgement(ctx, p, resAckData, relayerAddress) require.NoError(t, err) require.Empty(t, store.Get(ShouldNotBeWrittenKey)) - require.Equal(t, uint64(2990), ctx.GasMeter().GasConsumed()) + require.Equal(t, uint64(5000), ctx.GasMeter().GasConsumed()) // error during SudoError non contract ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) @@ -127,13 +129,14 @@ func TestHandleAcknowledgement(t *testing.T) { store := cachedCtx.KVStore(storeKey) store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) // consumes 2990 }).Return(nil, fmt.Errorf("SudoError error")) + cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 6000}) cmKeeper.EXPECT().AddContractFailure(ctx, "channel-0", contractAddress.String(), p.GetSequence(), "ack") cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(false) // feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = txModule.HandleAcknowledgement(ctx, p, errAckData, relayerAddress) require.NoError(t, err) require.Empty(t, store.Get(ShouldNotBeWrittenKey)) - require.Equal(t, uint64(2990), ctx.GasMeter().GasConsumed()) + require.Equal(t, uint64(0), ctx.GasMeter().GasConsumed()) // error during SudoError contract ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) @@ -141,13 +144,14 @@ func TestHandleAcknowledgement(t *testing.T) { store := cachedCtx.KVStore(storeKey) store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) // consumes 2990 }).Return(nil, fmt.Errorf("SudoError error")) + cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 7000}) cmKeeper.EXPECT().AddContractFailure(ctx, "channel-0", contractAddress.String(), p.GetSequence(), "ack") cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = txModule.HandleAcknowledgement(ctx, p, errAckData, relayerAddress) require.NoError(t, err) require.Empty(t, store.Get(ShouldNotBeWrittenKey)) - require.Equal(t, uint64(2990), ctx.GasMeter().GasConsumed()) + require.Equal(t, uint64(7000), ctx.GasMeter().GasConsumed()) // success during SudoError non contract ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) @@ -155,10 +159,12 @@ func TestHandleAcknowledgement(t *testing.T) { store := cachedCtx.KVStore(storeKey) store.Set(ShouldBeWrittenKey("sudoerror_non_contract"), ShouldBeWritten) }).Return(nil, nil) + cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 8000}) cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(false) err = txModule.HandleAcknowledgement(ctx, p, errAckData, relayerAddress) require.NoError(t, err) require.Equal(t, ShouldBeWritten, store.Get(ShouldBeWrittenKey("sudoerror_non_contract"))) + require.Equal(t, uint64(0), ctx.GasMeter().GasConsumed()) // success during SudoError contract ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) @@ -166,40 +172,46 @@ func TestHandleAcknowledgement(t *testing.T) { store := cachedCtx.KVStore(storeKey) store.Set(ShouldBeWrittenKey("sudoerror_contract"), ShouldBeWritten) }).Return(nil, nil) + cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 9000}) cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = txModule.HandleAcknowledgement(ctx, p, errAckData, relayerAddress) require.NoError(t, err) require.Equal(t, ShouldBeWritten, store.Get(ShouldBeWrittenKey("sudoerror_contract"))) + require.Equal(t, uint64(9000), ctx.GasMeter().GasConsumed()) // recoverable out of gas during SudoError non contract ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) cmKeeper.EXPECT().SudoError(gomock.AssignableToTypeOf(ctx), contractAddress, p, errACK.GetError()).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, error string) { store := cachedCtx.KVStore(storeKey) store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) - cachedCtx.GasMeter().ConsumeGas(cachedCtx.GasMeter().Limit()+1, "out of gas test") + cachedCtx.GasMeter().ConsumeGas(10001, "out of gas test") }).Return(nil, fmt.Errorf("SudoError error")) + cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 10000}) cmKeeper.EXPECT().AddContractFailure(ctx, "channel-0", contractAddress.String(), p.GetSequence(), "ack") // FIXME: fix distribution during outofgas // cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(false) err = txModule.HandleAcknowledgement(ctx, p, errAckData, relayerAddress) require.NoError(t, err) require.Empty(t, store.Get(ShouldNotBeWrittenKey)) + require.Equal(t, uint64(0), ctx.GasMeter().GasConsumed()) // recoverable out of gas during SudoError contract ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) cmKeeper.EXPECT().SudoError(gomock.AssignableToTypeOf(ctx), contractAddress, p, errACK.GetError()).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, error string) { store := cachedCtx.KVStore(storeKey) store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) - cachedCtx.GasMeter().ConsumeGas(cachedCtx.GasMeter().Limit()+1, "out of gas test") + cachedCtx.GasMeter().ConsumeGas(11001, "out of gas test") }).Return(nil, fmt.Errorf("SudoError error")) cmKeeper.EXPECT().AddContractFailure(ctx, "channel-0", contractAddress.String(), p.GetSequence(), "ack") + cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 11000}) // FIXME: fix distribution during outofgas // cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) // feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = txModule.HandleAcknowledgement(ctx, p, errAckData, relayerAddress) require.NoError(t, err) require.Empty(t, store.Get(ShouldNotBeWrittenKey)) + require.Equal(t, uint64(0), ctx.GasMeter().GasConsumed()) // check we have ReserveGas reserved and // check gas consumption from cachedCtx has added to the main ctx @@ -208,50 +220,45 @@ func TestHandleAcknowledgement(t *testing.T) { ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) gasReserved := false cmKeeper.EXPECT().SudoResponse(gomock.AssignableToTypeOf(ctx), contractAddress, p, resACK.GetResult()).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, msg []byte) { - if ctx.GasMeter().Limit() == cachedCtx.GasMeter().Limit()+transfer.GasReserve { + if cachedCtx.GasMeter().Limit() == 12000 { gasReserved = true } store := cachedCtx.KVStore(storeKey) store.Set(ShouldBeWrittenKey("sudoresponse_non_contract_success"), ShouldBeWritten) }).Return(nil, nil) + cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 12000}) cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(false) // feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = txModule.HandleAcknowledgement(ctx, p, resAckData, relayerAddress) require.NoError(t, err) require.True(t, gasReserved) - require.Equal(t, uint64(3770), ctx.GasMeter().GasConsumed()) + require.Equal(t, uint64(0), ctx.GasMeter().GasConsumed()) require.Equal(t, ShouldBeWritten, store.Get(ShouldBeWrittenKey("sudoresponse_non_contract_success"))) // contract ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) gasReserved = false cmKeeper.EXPECT().SudoResponse(gomock.AssignableToTypeOf(ctx), contractAddress, p, resACK.GetResult()).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, msg []byte) { - if ctx.GasMeter().Limit() == cachedCtx.GasMeter().Limit()+transfer.GasReserve { + if cachedCtx.GasMeter().Limit() == 13000 { gasReserved = true } store := cachedCtx.KVStore(storeKey) store.Set(ShouldBeWrittenKey("sudoresponse_contract_success"), ShouldBeWritten) }).Return(nil, nil) + cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 13000}) cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = txModule.HandleAcknowledgement(ctx, p, resAckData, relayerAddress) require.NoError(t, err) require.True(t, gasReserved) - require.Equal(t, uint64(3650), ctx.GasMeter().GasConsumed()) + require.Equal(t, uint64(13000), ctx.GasMeter().GasConsumed()) require.Equal(t, ShouldBeWritten, store.Get(ShouldBeWrittenKey("sudoresponse_contract_success"))) // not enough gas to reserve + not enough to make AddContractFailure failure after panic recover - lowGasCtx := infCtx.WithGasMeter(sdk.NewGasMeter(keeper.GasReserve - 1)) - cmKeeper.EXPECT().SudoResponse(gomock.AssignableToTypeOf(lowGasCtx), contractAddress, p, resACK.GetResult()).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, msg []byte) { - store := cachedCtx.KVStore(storeKey) - store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) - cachedCtx.GasMeter().ConsumeGas(1, "Sudo response consumption") - }).Return(nil, nil) + lowGasCtx := infCtx.WithGasMeter(sdk.NewGasMeter(1000)) + cmKeeper.EXPECT().GetParams(lowGasCtx).Return(types.Params{SudoCallGasLimit: 14000}) // feeKeeper.EXPECT().DistributeAcknowledgementFee(lowGasCtx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) - cmKeeper.EXPECT().AddContractFailure(lowGasCtx, "channel-0", contractAddress.String(), p.GetSequence(), "ack").Do(func(ctx sdk.Context, channelId, address string, ackID uint64, ackType string) { - ctx.GasMeter().ConsumeGas(keeper.GasReserve, "out of gas") - }) - require.Panics(t, func() { txModule.HandleAcknowledgement(lowGasCtx, p, resAckData, relayerAddress) }) //nolint:errcheck // this is a test + require.PanicsWithValue(t, sdk.ErrorOutOfGas{Descriptor: "14000gas - reserve for sudo call"}, func() { txModule.HandleAcknowledgement(lowGasCtx, p, resAckData, relayerAddress) }) //nolint:errcheck // this is a test require.Empty(t, store.Get(ShouldNotBeWrittenKey)) } @@ -305,16 +312,17 @@ func TestHandleTimeout(t *testing.T) { p.Data = tokenBz gasReserved := false cmKeeper.EXPECT().SudoTimeout(gomock.AssignableToTypeOf(ctx), contractAddress, p).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet) { - if ctx.GasMeter().Limit() == cachedCtx.GasMeter().Limit()+keeper.GasReserve { + if cachedCtx.GasMeter().Limit() == 5000 { gasReserved = true } store := cachedCtx.KVStore(storeKey) store.Set(ShouldBeWrittenKey("sudotimeout_non_contract_success"), ShouldBeWritten) }).Return(nil, nil) + cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 5000}) cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(false) err = txModule.HandleTimeout(ctx, p, relayerAddress) require.True(t, gasReserved) - require.Equal(t, uint64(3740), ctx.GasMeter().GasConsumed()) + require.Equal(t, uint64(0), ctx.GasMeter().GasConsumed()) require.NoError(t, err) require.Equal(t, ShouldBeWritten, store.Get(ShouldBeWrittenKey("sudotimeout_non_contract_success"))) @@ -322,18 +330,19 @@ func TestHandleTimeout(t *testing.T) { ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) gasReserved = false cmKeeper.EXPECT().SudoTimeout(gomock.AssignableToTypeOf(ctx), contractAddress, p).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet) { - if ctx.GasMeter().Limit() == cachedCtx.GasMeter().Limit()+keeper.GasReserve { + if cachedCtx.GasMeter().Limit() == 5000 { gasReserved = true } store := cachedCtx.KVStore(storeKey) store.Set(ShouldBeWrittenKey("sudotimeout_contract_success"), ShouldBeWritten) }).Return(nil, nil) + cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 5000}) cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) feeKeeper.EXPECT().DistributeTimeoutFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = txModule.HandleTimeout(ctx, p, relayerAddress) require.True(t, gasReserved) require.NoError(t, err) - require.Equal(t, uint64(3620), ctx.GasMeter().GasConsumed()) + require.Equal(t, uint64(5000), ctx.GasMeter().GasConsumed()) require.Equal(t, ShouldBeWritten, store.Get(ShouldBeWrittenKey("sudotimeout_contract_success"))) // error during SudoTimeOut non contract @@ -342,11 +351,13 @@ func TestHandleTimeout(t *testing.T) { store := cachedCtx.KVStore(storeKey) store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) }).Return(nil, fmt.Errorf("SudoTimeout error")) + cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 6000}) cmKeeper.EXPECT().AddContractFailure(ctx, "channel-0", contractAddress.String(), p.GetSequence(), "timeout") cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(false) err = txModule.HandleTimeout(ctx, p, relayerAddress) require.NoError(t, err) require.Empty(t, store.Get(ShouldNotBeWrittenKey)) + require.Equal(t, uint64(0), ctx.GasMeter().GasConsumed()) // error during SudoTimeOut contract ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) @@ -354,38 +365,44 @@ func TestHandleTimeout(t *testing.T) { store := cachedCtx.KVStore(storeKey) store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) }).Return(nil, fmt.Errorf("SudoTimeout error")) + cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 7000}) cmKeeper.EXPECT().AddContractFailure(ctx, "channel-0", contractAddress.String(), p.GetSequence(), "timeout") cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) feeKeeper.EXPECT().DistributeTimeoutFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = txModule.HandleTimeout(ctx, p, relayerAddress) require.NoError(t, err) require.Empty(t, store.Get(ShouldNotBeWrittenKey)) + require.Equal(t, uint64(7000), ctx.GasMeter().GasConsumed()) // out of gas during SudoTimeOut non contract ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) cmKeeper.EXPECT().SudoTimeout(gomock.AssignableToTypeOf(ctx), contractAddress, p).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet) { store := cachedCtx.KVStore(storeKey) store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) - cachedCtx.GasMeter().ConsumeGas(cachedCtx.GasMeter().Limit()+1, "out of gas test") + cachedCtx.GasMeter().ConsumeGas(8001, "out of gas test") }).Return(nil, fmt.Errorf("SudoTimeout error")) cmKeeper.EXPECT().AddContractFailure(ctx, "channel-0", contractAddress.String(), p.GetSequence(), "timeout") + cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 8000}) // cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(false) err = txModule.HandleTimeout(ctx, p, relayerAddress) require.NoError(t, err) require.Empty(t, store.Get(ShouldNotBeWrittenKey)) + require.Equal(t, uint64(0), ctx.GasMeter().GasConsumed()) // out of gas during SudoTimeOut contract ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) cmKeeper.EXPECT().SudoTimeout(gomock.AssignableToTypeOf(ctx), contractAddress, p).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet) { store := cachedCtx.KVStore(storeKey) store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) - cachedCtx.GasMeter().ConsumeGas(cachedCtx.GasMeter().Limit()+1, "out of gas test") + cachedCtx.GasMeter().ConsumeGas(8001, "out of gas test") }).Return(nil, fmt.Errorf("SudoTimeout error")) cmKeeper.EXPECT().AddContractFailure(ctx, "channel-0", contractAddress.String(), p.GetSequence(), "timeout") + cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 8000}) // FIXME: make DistributeTimeoutFee during out of gas // cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) // feeKeeper.EXPECT().DistributeTimeoutFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = txModule.HandleTimeout(ctx, p, relayerAddress) require.NoError(t, err) require.Empty(t, store.Get(ShouldNotBeWrittenKey)) + require.Equal(t, uint64(0), ctx.GasMeter().GasConsumed()) } diff --git a/x/transfer/types/expected_keepers.go b/x/transfer/types/expected_keepers.go index 3dd233a34..5d6068a68 100644 --- a/x/transfer/types/expected_keepers.go +++ b/x/transfer/types/expected_keepers.go @@ -4,6 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/auth/types" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" + contractmanagertypes "github.com/neutron-org/neutron/x/contractmanager/types" feerefundertypes "github.com/neutron-org/neutron/x/feerefunder/types" ) @@ -15,6 +16,7 @@ type ContractManagerKeeper interface { SudoResponse(ctx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, msg []byte) ([]byte, error) SudoError(ctx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, details string) ([]byte, error) SudoTimeout(ctx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet) ([]byte, error) + GetParams(ctx sdk.Context) (params contractmanagertypes.Params) } type FeeRefunderKeeper interface { From e49207cbf6063f16ace6a14d17133c9e2cd4bc76 Mon Sep 17 00:00:00 2001 From: nhpd Date: Mon, 21 Aug 2023 21:30:30 +0400 Subject: [PATCH 046/307] "ack" and "timeout" to constant; make if statements shorter --- app/upgrades/nextupgrade/upgrades_test.go | 12 +++++------ wasmbinding/test/custom_message_test.go | 4 +++- x/contractmanager/genesis_test.go | 2 +- x/contractmanager/keeper/failure.go | 13 +++++------ x/contractmanager/keeper/failure_test.go | 16 +++++++------- x/contractmanager/types/types.go | 5 +++++ x/interchaintxs/keeper/ibc_handlers.go | 8 +++---- x/interchaintxs/keeper/ibc_handlers_test.go | 12 +++++------ x/transfer/ibc_handlers.go | 10 +++++---- x/transfer/ibc_handlers_test.go | 24 +++++++++++---------- 10 files changed, 57 insertions(+), 49 deletions(-) diff --git a/app/upgrades/nextupgrade/upgrades_test.go b/app/upgrades/nextupgrade/upgrades_test.go index 91af6a211..c7c27a807 100644 --- a/app/upgrades/nextupgrade/upgrades_test.go +++ b/app/upgrades/nextupgrade/upgrades_test.go @@ -94,7 +94,7 @@ func (suite *UpgradeTestSuite) TestFailuresUpgrade() { ChannelId: "channel-0", Address: addr, Id: i % 2, - AckType: "ack", + AckType: contractmanagertypes.Ack, } bz := cdc.MustMarshal(&failure) store.Set(contractmanagertypes.GetFailureKey(failure.Address, failure.Id), bz) @@ -112,28 +112,28 @@ func (suite *UpgradeTestSuite) TestFailuresUpgrade() { { Address: addressOne, Id: 0, - AckType: "ack", + AckType: contractmanagertypes.Ack, Packet: nil, Ack: nil, }, { Address: addressOne, Id: 1, - AckType: "ack", + AckType: contractmanagertypes.Ack, Packet: nil, Ack: nil, }, { Address: addressTwo, Id: 0, - AckType: "ack", + AckType: contractmanagertypes.Ack, Packet: nil, Ack: nil, }, { Address: addressTwo, Id: 1, - AckType: "ack", + AckType: contractmanagertypes.Ack, Packet: nil, Ack: nil, }, @@ -145,7 +145,7 @@ func (suite *UpgradeTestSuite) TestFailuresUpgrade() { suite.Require().Equal(failure, &contractmanagertypes.Failure{ Address: addressTwo, Id: 1, - AckType: "ack", + AckType: contractmanagertypes.Ack, Packet: nil, Ack: nil, }) diff --git a/wasmbinding/test/custom_message_test.go b/wasmbinding/test/custom_message_test.go index 38f0d3788..fc3a6f6ca 100644 --- a/wasmbinding/test/custom_message_test.go +++ b/wasmbinding/test/custom_message_test.go @@ -5,6 +5,8 @@ import ( "fmt" "testing" + contractmanagertypes "github.com/neutron-org/neutron/x/contractmanager/types" + ibcchanneltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" "github.com/stretchr/testify/suite" @@ -608,7 +610,7 @@ func (suite *CustomMessengerTestSuite) TestResubmitFailureAck() { Response: &ibcchanneltypes.Acknowledgement_Result{Result: []byte("Result")}, } failureID := suite.messenger.ContractmanagerKeeper.GetNextFailureIDKey(suite.ctx, suite.contractAddress.String()) - suite.messenger.ContractmanagerKeeper.AddContractFailure(suite.ctx, &packet, suite.contractAddress.String(), "ack", &ack) + suite.messenger.ContractmanagerKeeper.AddContractFailure(suite.ctx, &packet, suite.contractAddress.String(), contractmanagertypes.Ack, &ack) // Craft message msg, err := json.Marshal(bindings.NeutronMsg{ diff --git a/x/contractmanager/genesis_test.go b/x/contractmanager/genesis_test.go index 76899b739..feb3ff00a 100644 --- a/x/contractmanager/genesis_test.go +++ b/x/contractmanager/genesis_test.go @@ -21,7 +21,7 @@ func TestGenesis(t *testing.T) { { Address: "address1", Id: 1, - AckType: "ack", + AckType: types.Ack, Packet: &channeltypes.Packet{ Sequence: 1, }, diff --git a/x/contractmanager/keeper/failure.go b/x/contractmanager/keeper/failure.go index a86b12d1c..f782b4c27 100644 --- a/x/contractmanager/keeper/failure.go +++ b/x/contractmanager/keeper/failure.go @@ -77,24 +77,21 @@ func (k Keeper) ResubmitFailure(ctx sdk.Context, contractAddr sdk.AccAddress, fa } switch failure.GetAckType() { - case "ack": + case types.Ack: if failure.GetAck() == nil { return errors.Wrapf(types.IncorrectFailureToResubmit, "cannot resubmit failure without acknowledgement; failureId = %d", failure.Id) } if failure.GetAck().GetError() == "" { - _, err := k.SudoResponse(ctx, contractAddr, *failure.Packet, failure.Ack.GetResult()) - if err != nil { + if _, err := k.SudoResponse(ctx, contractAddr, *failure.Packet, failure.Ack.GetResult()); err != nil { return errors.Wrapf(types.FailedToResubmitFailure, "cannot resubmit failure ack response; failureId = %d; err = %s", failure.Id, err) } } else { - _, err := k.SudoError(ctx, contractAddr, *failure.Packet, failure.Ack.GetError()) - if err != nil { + if _, err := k.SudoError(ctx, contractAddr, *failure.Packet, failure.Ack.GetError()); err != nil { return errors.Wrapf(types.FailedToResubmitFailure, "cannot resubmit failure ack error; failureId = %d; err = %s", failure.Id, err) } } - case "timeout": - _, err := k.SudoTimeout(ctx, contractAddr, *failure.Packet) - if err != nil { + case types.Timeout: + if _, err := k.SudoTimeout(ctx, contractAddr, *failure.Packet); err != nil { return errors.Wrapf(types.FailedToResubmitFailure, "cannot resubmit failure ack timeout; failureId = %d; err = %s", failure.Id, err) } default: diff --git a/x/contractmanager/keeper/failure_test.go b/x/contractmanager/keeper/failure_test.go index 4dbb6f2e5..600d16931 100644 --- a/x/contractmanager/keeper/failure_test.go +++ b/x/contractmanager/keeper/failure_test.go @@ -83,11 +83,11 @@ func TestAddGetFailure(t *testing.T) { contractAddress := sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress) k, ctx := keepertest.ContractManagerKeeper(t, nil) failureID := k.GetNextFailureIDKey(ctx, contractAddress.String()) - k.AddContractFailure(ctx, &channeltypes.Packet{}, contractAddress.String(), "ack", &channeltypes.Acknowledgement{}) + k.AddContractFailure(ctx, &channeltypes.Packet{}, contractAddress.String(), types.Ack, &channeltypes.Acknowledgement{}) failure, err := k.GetFailure(ctx, contractAddress, failureID) require.NoError(t, err) require.Equal(t, failureID, failure.Id) - require.Equal(t, "ack", failure.AckType) + require.Equal(t, types.Ack, failure.AckType) // non-existent id _, err = k.GetFailure(ctx, contractAddress, failureID+1) @@ -117,7 +117,7 @@ func TestResubmitFailure(t *testing.T) { // add ack failure packet := channeltypes.Packet{} failureID := k.GetNextFailureIDKey(ctx, contractAddr.String()) - k.AddContractFailure(ctx, &packet, contractAddr.String(), "ack", &ack) + k.AddContractFailure(ctx, &packet, contractAddr.String(), types.Ack, &ack) // success response xSuc := types.MessageResponse{} @@ -151,7 +151,7 @@ func TestResubmitFailure(t *testing.T) { // case: failed resubmit with ack and ack = response failureID2 := k.GetNextFailureIDKey(ctx, contractAddr.String()) - k.AddContractFailure(ctx, &packet, contractAddr.String(), "ack", &ack) + k.AddContractFailure(ctx, &packet, contractAddr.String(), types.Ack, &ack) wk.EXPECT().HasContractInfo(gomock.AssignableToTypeOf(ctx), contractAddr).Return(true) wk.EXPECT().Sudo(gomock.AssignableToTypeOf(ctx), contractAddr, msgSuc).Return(nil, fmt.Errorf("failed to Sudo")) @@ -168,7 +168,7 @@ func TestResubmitFailure(t *testing.T) { // case: successful resubmit with ack and ack = error // add error failure failureID3 := k.GetNextFailureIDKey(ctx, contractAddr.String()) - k.AddContractFailure(ctx, &packet, contractAddr.String(), "ack", &ackError) + k.AddContractFailure(ctx, &packet, contractAddr.String(), types.Ack, &ackError) wk.EXPECT().HasContractInfo(gomock.AssignableToTypeOf(ctx), contractAddr).Return(true) wk.EXPECT().Sudo(gomock.AssignableToTypeOf(ctx), contractAddr, msgErr).Return([]byte{}, nil) @@ -183,7 +183,7 @@ func TestResubmitFailure(t *testing.T) { // case: failed resubmit with ack and ack = error failureID4 := k.GetNextFailureIDKey(ctx, contractAddr.String()) - k.AddContractFailure(ctx, &packet, contractAddr.String(), "ack", &ackError) + k.AddContractFailure(ctx, &packet, contractAddr.String(), types.Ack, &ackError) wk.EXPECT().HasContractInfo(gomock.AssignableToTypeOf(ctx), contractAddr).Return(true) wk.EXPECT().Sudo(gomock.AssignableToTypeOf(ctx), contractAddr, msgErr).Return(nil, fmt.Errorf("failed to Sudo")) @@ -231,7 +231,7 @@ func TestResubmitFailure(t *testing.T) { // no Failure.Ack field found for ackType = 'ack' failureID7 := k.GetNextFailureIDKey(ctx, contractAddr.String()) - k.AddContractFailure(ctx, &packet, contractAddr.String(), "ack", nil) + k.AddContractFailure(ctx, &packet, contractAddr.String(), types.Ack, nil) failure7, err := k.GetFailure(ctx, contractAddr, failureID7) require.NoError(t, err) @@ -240,7 +240,7 @@ func TestResubmitFailure(t *testing.T) { // no Failure.Packet found failureID8 := k.GetNextFailureIDKey(ctx, contractAddr.String()) - k.AddContractFailure(ctx, nil, contractAddr.String(), "ack", nil) + k.AddContractFailure(ctx, nil, contractAddr.String(), types.Ack, nil) failure8, err := k.GetFailure(ctx, contractAddr, failureID8) require.NoError(t, err) diff --git a/x/contractmanager/types/types.go b/x/contractmanager/types/types.go index ab1254f4c..e7d6010f0 100644 --- a/x/contractmanager/types/types.go +++ b/x/contractmanager/types/types.go @@ -1 +1,6 @@ package types + +const ( + Ack = "ack" + Timeout = "timeout" +) diff --git a/x/interchaintxs/keeper/ibc_handlers.go b/x/interchaintxs/keeper/ibc_handlers.go index 9824ca86d..d7420809f 100644 --- a/x/interchaintxs/keeper/ibc_handlers.go +++ b/x/interchaintxs/keeper/ibc_handlers.go @@ -97,7 +97,7 @@ func (k *Keeper) HandleAcknowledgement(ctx sdk.Context, packet channeltypes.Pack } cacheCtx, writeFn, newGasMeter := k.createCachedContext(ctx) - defer k.outOfGasRecovery(ctx, newGasMeter, icaOwner.GetContract(), packet, "ack", &ack) + defer k.outOfGasRecovery(ctx, newGasMeter, icaOwner.GetContract(), packet, contractmanagertypes.Ack, &ack) k.feeKeeper.DistributeAcknowledgementFee(ctx, relayer, feetypes.NewPacketID(packet.SourcePort, packet.SourceChannel, packet.Sequence)) @@ -110,7 +110,7 @@ func (k *Keeper) HandleAcknowledgement(ctx sdk.Context, packet channeltypes.Pack } if err != nil { - k.contractManagerKeeper.AddContractFailure(ctx, &packet, icaOwner.GetContract().String(), "ack", &ack) + k.contractManagerKeeper.AddContractFailure(ctx, &packet, icaOwner.GetContract().String(), contractmanagertypes.Ack, &ack) k.Logger(ctx).Debug("HandleAcknowledgement: failed to Sudo contract on packet acknowledgement", "error", err) } else { ctx.EventManager().EmitEvents(cacheCtx.EventManager().Events()) @@ -136,13 +136,13 @@ func (k *Keeper) HandleTimeout(ctx sdk.Context, packet channeltypes.Packet, rela } cacheCtx, writeFn, newGasMeter := k.createCachedContext(ctx) - defer k.outOfGasRecovery(ctx, newGasMeter, icaOwner.GetContract(), packet, "timeout", nil) + defer k.outOfGasRecovery(ctx, newGasMeter, icaOwner.GetContract(), packet, contractmanagertypes.Timeout, nil) k.feeKeeper.DistributeTimeoutFee(ctx, relayer, feetypes.NewPacketID(packet.SourcePort, packet.SourceChannel, packet.Sequence)) _, err = k.contractManagerKeeper.SudoTimeout(cacheCtx, icaOwner.GetContract(), packet) if err != nil { - k.contractManagerKeeper.AddContractFailure(ctx, &packet, icaOwner.GetContract().String(), "timeout", nil) + k.contractManagerKeeper.AddContractFailure(ctx, &packet, icaOwner.GetContract().String(), contractmanagertypes.Timeout, nil) k.Logger(ctx).Error("HandleTimeout: failed to Sudo contract on packet timeout", "error", err) } else { ctx.EventManager().EmitEvents(cacheCtx.EventManager().Events()) diff --git a/x/interchaintxs/keeper/ibc_handlers_test.go b/x/interchaintxs/keeper/ibc_handlers_test.go index 06dbe0e15..d92adf5ab 100644 --- a/x/interchaintxs/keeper/ibc_handlers_test.go +++ b/x/interchaintxs/keeper/ibc_handlers_test.go @@ -71,7 +71,7 @@ func TestHandleAcknowledgement(t *testing.T) { store := cachedCtx.KVStore(storeKey) store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) // consumes 2990 }).Return(nil, fmt.Errorf("SudoResponse error")) - cmKeeper.EXPECT().AddContractFailure(ctx, &p, contractAddress.String(), "ack", &resACK) + cmKeeper.EXPECT().AddContractFailure(ctx, &p, contractAddress.String(), types.Ack, &resACK) feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = icak.HandleAcknowledgement(ctx, p, resAckData, relayerAddress) require.NoError(t, err) @@ -84,7 +84,7 @@ func TestHandleAcknowledgement(t *testing.T) { store := cachedCtx.KVStore(storeKey) store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) }).Return(nil, fmt.Errorf("SudoError error")) - cmKeeper.EXPECT().AddContractFailure(ctx, &p, contractAddress.String(), "ack", &errACK) + cmKeeper.EXPECT().AddContractFailure(ctx, &p, contractAddress.String(), types.Ack, &errACK) feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = icak.HandleAcknowledgement(ctx, p, errAckData, relayerAddress) require.NoError(t, err) @@ -109,7 +109,7 @@ func TestHandleAcknowledgement(t *testing.T) { store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) cachedCtx.GasMeter().ConsumeGas(cachedCtx.GasMeter().Limit()+1, "out of gas test") }).Return(nil, fmt.Errorf("SudoError error")) - cmKeeper.EXPECT().AddContractFailure(ctx, &p, contractAddress.String(), "ack", &errACK) + cmKeeper.EXPECT().AddContractFailure(ctx, &p, contractAddress.String(), types.Ack, &errACK) feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = icak.HandleAcknowledgement(ctx, p, errAckData, relayerAddress) require.NoError(t, err) @@ -144,7 +144,7 @@ func TestHandleAcknowledgement(t *testing.T) { cachedCtx.GasMeter().ConsumeGas(1, "Sudo response consumption") }).Return(nil, nil) feeKeeper.EXPECT().DistributeAcknowledgementFee(lowGasCtx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) - cmKeeper.EXPECT().AddContractFailure(lowGasCtx, &p, contractAddress.String(), "ack", &resACK).Do(func(ctx sdk.Context, packet channeltypes.Packet, address, ackType string, ack channeltypes.Acknowledgement) { + cmKeeper.EXPECT().AddContractFailure(lowGasCtx, &p, contractAddress.String(), types.Ack, &resACK).Do(func(ctx sdk.Context, packet channeltypes.Packet, address, ackType string, ack channeltypes.Acknowledgement) { ctx.GasMeter().ConsumeGas(keeper.GasReserve, "out of gas") }) require.Panics(t, func() { icak.HandleAcknowledgement(lowGasCtx, p, resAckData, relayerAddress) }) //nolint:errcheck // this is a panic test @@ -194,7 +194,7 @@ func TestHandleTimeout(t *testing.T) { store := cachedCtx.KVStore(storeKey) store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) }).Return(nil, fmt.Errorf("SudoTimeout error")) - cmKeeper.EXPECT().AddContractFailure(ctx, &p, contractAddress.String(), "timeout", nil) + cmKeeper.EXPECT().AddContractFailure(ctx, &p, contractAddress.String(), types.Timeout, nil) feeKeeper.EXPECT().DistributeTimeoutFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = icak.HandleTimeout(ctx, p, relayerAddress) require.NoError(t, err) @@ -207,7 +207,7 @@ func TestHandleTimeout(t *testing.T) { store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) cachedCtx.GasMeter().ConsumeGas(cachedCtx.GasMeter().Limit()+1, "out of gas test") }).Return(nil, fmt.Errorf("SudoTimeout error")) - cmKeeper.EXPECT().AddContractFailure(ctx, &p, contractAddress.String(), "timeout", nil) + cmKeeper.EXPECT().AddContractFailure(ctx, &p, contractAddress.String(), types.Timeout, nil) feeKeeper.EXPECT().DistributeTimeoutFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = icak.HandleTimeout(ctx, p, relayerAddress) require.NoError(t, err) diff --git a/x/transfer/ibc_handlers.go b/x/transfer/ibc_handlers.go index e126e2530..221e20624 100644 --- a/x/transfer/ibc_handlers.go +++ b/x/transfer/ibc_handlers.go @@ -3,6 +3,8 @@ package transfer import ( "strings" + contractmanagertypes "github.com/neutron-org/neutron/x/contractmanager/types" + "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" @@ -96,7 +98,7 @@ func (im IBCModule) HandleAcknowledgement(ctx sdk.Context, packet channeltypes.P } cacheCtx, writeFn, newGasMeter := im.createCachedContext(ctx) - defer im.outOfGasRecovery(ctx, newGasMeter, senderAddress, packet, data, "ack", &ack) + defer im.outOfGasRecovery(ctx, newGasMeter, senderAddress, packet, data, contractmanagertypes.Ack, &ack) if ack.Success() { _, err = im.ContractManagerKeeper.SudoResponse(cacheCtx, senderAddress, packet, ack.GetResult()) @@ -108,7 +110,7 @@ func (im IBCModule) HandleAcknowledgement(ctx sdk.Context, packet channeltypes.P } if err != nil { - im.ContractManagerKeeper.AddContractFailure(ctx, &packet, senderAddress.String(), "ack", &ack) + im.ContractManagerKeeper.AddContractFailure(ctx, &packet, senderAddress.String(), contractmanagertypes.Ack, &ack) im.keeper.Logger(ctx).Debug("failed to Sudo contract on packet acknowledgement", err) } else { ctx.EventManager().EmitEvents(cacheCtx.EventManager().Events()) @@ -141,11 +143,11 @@ func (im IBCModule) HandleTimeout(ctx sdk.Context, packet channeltypes.Packet, r } cacheCtx, writeFn, newGasMeter := im.createCachedContext(ctx) - defer im.outOfGasRecovery(ctx, newGasMeter, senderAddress, packet, data, "timeout", nil) + defer im.outOfGasRecovery(ctx, newGasMeter, senderAddress, packet, data, contractmanagertypes.Timeout, nil) _, err = im.ContractManagerKeeper.SudoTimeout(cacheCtx, senderAddress, packet) if err != nil { - im.ContractManagerKeeper.AddContractFailure(ctx, &packet, senderAddress.String(), "timeout", nil) + im.ContractManagerKeeper.AddContractFailure(ctx, &packet, senderAddress.String(), contractmanagertypes.Timeout, nil) im.keeper.Logger(ctx).Debug("failed to Sudo contract on packet timeout", err) } else { ctx.EventManager().EmitEvents(cacheCtx.EventManager().Events()) diff --git a/x/transfer/ibc_handlers_test.go b/x/transfer/ibc_handlers_test.go index 7d3553bc6..7e4ff2a5e 100644 --- a/x/transfer/ibc_handlers_test.go +++ b/x/transfer/ibc_handlers_test.go @@ -4,6 +4,8 @@ import ( "fmt" "testing" + "github.com/neutron-org/neutron/x/contractmanager/types" + sdk "github.com/cosmos/cosmos-sdk/types" transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" @@ -100,7 +102,7 @@ func TestHandleAcknowledgement(t *testing.T) { store := cachedCtx.KVStore(storeKey) store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) // consumes 2990 }).Return(nil, fmt.Errorf("SudoResponse error")) - cmKeeper.EXPECT().AddContractFailure(ctx, &p, contractAddress.String(), "ack", &resACK) + cmKeeper.EXPECT().AddContractFailure(ctx, &p, contractAddress.String(), types.Ack, &resACK) cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(false) err = txModule.HandleAcknowledgement(ctx, p, resAckData, relayerAddress) require.NoError(t, err) @@ -113,7 +115,7 @@ func TestHandleAcknowledgement(t *testing.T) { store := cachedCtx.KVStore(storeKey) store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) // consumes 2990 }).Return(nil, fmt.Errorf("SudoResponse error")) - cmKeeper.EXPECT().AddContractFailure(ctx, &p, contractAddress.String(), "ack", &resACK) + cmKeeper.EXPECT().AddContractFailure(ctx, &p, contractAddress.String(), types.Ack, &resACK) cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = txModule.HandleAcknowledgement(ctx, p, resAckData, relayerAddress) @@ -127,7 +129,7 @@ func TestHandleAcknowledgement(t *testing.T) { store := cachedCtx.KVStore(storeKey) store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) // consumes 2990 }).Return(nil, fmt.Errorf("SudoError error")) - cmKeeper.EXPECT().AddContractFailure(ctx, &p, contractAddress.String(), "ack", &errACK) + cmKeeper.EXPECT().AddContractFailure(ctx, &p, contractAddress.String(), types.Ack, &errACK) cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(false) // feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = txModule.HandleAcknowledgement(ctx, p, errAckData, relayerAddress) @@ -141,7 +143,7 @@ func TestHandleAcknowledgement(t *testing.T) { store := cachedCtx.KVStore(storeKey) store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) // consumes 2990 }).Return(nil, fmt.Errorf("SudoError error")) - cmKeeper.EXPECT().AddContractFailure(ctx, &p, contractAddress.String(), "ack", &errACK) + cmKeeper.EXPECT().AddContractFailure(ctx, &p, contractAddress.String(), types.Ack, &errACK) cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = txModule.HandleAcknowledgement(ctx, p, errAckData, relayerAddress) @@ -179,7 +181,7 @@ func TestHandleAcknowledgement(t *testing.T) { store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) cachedCtx.GasMeter().ConsumeGas(cachedCtx.GasMeter().Limit()+1, "out of gas test") }).Return(nil, fmt.Errorf("SudoError error")) - cmKeeper.EXPECT().AddContractFailure(ctx, &p, contractAddress.String(), "ack", &errACK) + cmKeeper.EXPECT().AddContractFailure(ctx, &p, contractAddress.String(), types.Ack, &errACK) // FIXME: fix distribution during outofgas // cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(false) err = txModule.HandleAcknowledgement(ctx, p, errAckData, relayerAddress) @@ -193,7 +195,7 @@ func TestHandleAcknowledgement(t *testing.T) { store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) cachedCtx.GasMeter().ConsumeGas(cachedCtx.GasMeter().Limit()+1, "out of gas test") }).Return(nil, fmt.Errorf("SudoError error")) - cmKeeper.EXPECT().AddContractFailure(ctx, &p, contractAddress.String(), "ack", &errACK) + cmKeeper.EXPECT().AddContractFailure(ctx, &p, contractAddress.String(), types.Ack, &errACK) // FIXME: fix distribution during outofgas // cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) // feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) @@ -248,7 +250,7 @@ func TestHandleAcknowledgement(t *testing.T) { cachedCtx.GasMeter().ConsumeGas(1, "Sudo response consumption") }).Return(nil, nil) // feeKeeper.EXPECT().DistributeAcknowledgementFee(lowGasCtx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) - cmKeeper.EXPECT().AddContractFailure(lowGasCtx, &p, contractAddress.String(), "ack", &resACK).Do(func(ctx sdk.Context, packet channeltypes.Packet, address, ackType string, ack channeltypes.Acknowledgement) { + cmKeeper.EXPECT().AddContractFailure(lowGasCtx, &p, contractAddress.String(), types.Ack, &resACK).Do(func(ctx sdk.Context, packet channeltypes.Packet, address, ackType string, ack channeltypes.Acknowledgement) { ctx.GasMeter().ConsumeGas(keeper.GasReserve, "out of gas") }) require.Panics(t, func() { txModule.HandleAcknowledgement(lowGasCtx, p, resAckData, relayerAddress) }) //nolint:errcheck // this is a test @@ -342,7 +344,7 @@ func TestHandleTimeout(t *testing.T) { store := cachedCtx.KVStore(storeKey) store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) }).Return(nil, fmt.Errorf("SudoTimeout error")) - cmKeeper.EXPECT().AddContractFailure(ctx, &p, contractAddress.String(), "timeout", nil) + cmKeeper.EXPECT().AddContractFailure(ctx, &p, contractAddress.String(), types.Timeout, nil) cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(false) err = txModule.HandleTimeout(ctx, p, relayerAddress) require.NoError(t, err) @@ -354,7 +356,7 @@ func TestHandleTimeout(t *testing.T) { store := cachedCtx.KVStore(storeKey) store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) }).Return(nil, fmt.Errorf("SudoTimeout error")) - cmKeeper.EXPECT().AddContractFailure(ctx, &p, contractAddress.String(), "timeout", nil) + cmKeeper.EXPECT().AddContractFailure(ctx, &p, contractAddress.String(), types.Timeout, nil) cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) feeKeeper.EXPECT().DistributeTimeoutFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = txModule.HandleTimeout(ctx, p, relayerAddress) @@ -368,7 +370,7 @@ func TestHandleTimeout(t *testing.T) { store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) cachedCtx.GasMeter().ConsumeGas(cachedCtx.GasMeter().Limit()+1, "out of gas test") }).Return(nil, fmt.Errorf("SudoTimeout error")) - cmKeeper.EXPECT().AddContractFailure(ctx, &p, contractAddress.String(), "timeout", nil) + cmKeeper.EXPECT().AddContractFailure(ctx, &p, contractAddress.String(), types.Timeout, nil) // cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(false) err = txModule.HandleTimeout(ctx, p, relayerAddress) require.NoError(t, err) @@ -381,7 +383,7 @@ func TestHandleTimeout(t *testing.T) { store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) cachedCtx.GasMeter().ConsumeGas(cachedCtx.GasMeter().Limit()+1, "out of gas test") }).Return(nil, fmt.Errorf("SudoTimeout error")) - cmKeeper.EXPECT().AddContractFailure(ctx, &p, contractAddress.String(), "timeout", nil) + cmKeeper.EXPECT().AddContractFailure(ctx, &p, contractAddress.String(), types.Timeout, nil) // FIXME: make DistributeTimeoutFee during out of gas // cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) // feeKeeper.EXPECT().DistributeTimeoutFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) From b4b27e96e0ba39252ade3f95ac6cdbc3a81be715 Mon Sep 17 00:00:00 2001 From: nhpd Date: Tue, 22 Aug 2023 12:12:46 +0400 Subject: [PATCH 047/307] rewrite contractmanager migration using new migration system --- app/upgrades/nextupgrade/upgrades.go | 46 -- app/upgrades/nextupgrade/upgrades_test.go | 97 +-- proto/neutron/contractmanager/failure.proto | 22 + proto/neutron/contractmanager/genesis.proto | 32 +- proto/neutron/contractmanager/query.proto | 2 +- .../neutron/contractmanager/v1/failure.proto | 18 + x/contractmanager/keeper/failure.go | 1 - x/contractmanager/keeper/migrations.go | 21 + x/contractmanager/migrations/v2/store.go | 58 ++ x/contractmanager/migrations/v2/store_test.go | 108 +++ x/contractmanager/module.go | 5 + x/contractmanager/types/failure.pb.go | 539 ++++++++++++ x/contractmanager/types/genesis.pb.go | 781 +----------------- x/contractmanager/types/query.pb.go | 56 +- x/contractmanager/types/v1/failure.pb.go | 500 +++++++++++ 15 files changed, 1321 insertions(+), 965 deletions(-) create mode 100644 proto/neutron/contractmanager/failure.proto create mode 100644 proto/neutron/contractmanager/v1/failure.proto create mode 100644 x/contractmanager/keeper/migrations.go create mode 100644 x/contractmanager/migrations/v2/store.go create mode 100644 x/contractmanager/migrations/v2/store_test.go create mode 100644 x/contractmanager/types/failure.pb.go create mode 100644 x/contractmanager/types/v1/failure.pb.go diff --git a/app/upgrades/nextupgrade/upgrades.go b/app/upgrades/nextupgrade/upgrades.go index 4424b36df..ad1c1e387 100644 --- a/app/upgrades/nextupgrade/upgrades.go +++ b/app/upgrades/nextupgrade/upgrades.go @@ -7,13 +7,11 @@ import ( ibcchanneltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" "github.com/cosmos/cosmos-sdk/codec" - "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" "github.com/cosmos/gaia/v11/x/globalfee/types" "github.com/neutron-org/neutron/app/upgrades" - contractmanagertypes "github.com/neutron-org/neutron/x/contractmanager/types" ) func CreateUpgradeHandler( @@ -36,12 +34,6 @@ func CreateUpgradeHandler( return vm, err } - err = migrateFailures(ctx, storeKeys, cdc) - if err != nil { - ctx.Logger().Error("failed to migrate Failures", "err", err) - return vm, err - } - ctx.Logger().Info("Upgrade complete") return vm, err } @@ -91,41 +83,3 @@ func migrateGlobalFees(ctx sdk.Context, keepers *upgrades.UpgradeKeepers) error return nil } - -func migrateFailures(ctx sdk.Context, storeKeys upgrades.StoreKeys, cdc codec.Codec) error { - ctx.Logger().Info("Migrating failures...") - - // fetch list of all old failures - oldFailuresList := make([]contractmanagertypes.OldFailure, 0) - iteratorStore := prefix.NewStore(ctx.KVStore(storeKeys.GetKey(contractmanagertypes.StoreKey)), contractmanagertypes.ContractFailuresKey) - iterator := sdk.KVStorePrefixIterator(iteratorStore, []byte{}) - - for ; iterator.Valid(); iterator.Next() { - var val contractmanagertypes.OldFailure - cdc.MustUnmarshal(iterator.Value(), &val) - oldFailuresList = append(oldFailuresList, val) - } - - err := iterator.Close() - if err != nil { - return err - } - - // migrate - store := ctx.KVStore(storeKeys.GetKey(contractmanagertypes.StoreKey)) - for _, oldItem := range oldFailuresList { - failure := contractmanagertypes.Failure{ - Address: oldItem.Address, - Id: oldItem.Id, - AckType: oldItem.AckType, - Packet: nil, - Ack: nil, - } - bz := cdc.MustMarshal(&failure) - store.Set(contractmanagertypes.GetFailureKey(failure.Address, failure.Id), bz) - } - - ctx.Logger().Info("Finished migrating failures") - - return nil -} diff --git a/app/upgrades/nextupgrade/upgrades_test.go b/app/upgrades/nextupgrade/upgrades_test.go index c7c27a807..9e849119d 100644 --- a/app/upgrades/nextupgrade/upgrades_test.go +++ b/app/upgrades/nextupgrade/upgrades_test.go @@ -3,14 +3,12 @@ package nextupgrade_test import ( "testing" - ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" - ibcchanneltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" - contractmanagertypes "github.com/neutron-org/neutron/x/contractmanager/types" - sdk "github.com/cosmos/cosmos-sdk/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" "github.com/cosmos/gaia/v11/x/globalfee" globalfeetypes "github.com/cosmos/gaia/v11/x/globalfee/types" + ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" + ibcchanneltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" "github.com/neutron-org/neutron/app/upgrades/nextupgrade" "github.com/neutron-org/neutron/testutil" "github.com/stretchr/testify/suite" @@ -69,94 +67,3 @@ func (suite *UpgradeTestSuite) TestGlobalFeesUpgrade() { requiredTotalBypassMinFeeMsgGasUsage := uint64(1_000_000) suite.Require().Equal(requiredTotalBypassMinFeeMsgGasUsage, actualTotalBypassMinFeeMsgGasUsage) } - -func (suite *UpgradeTestSuite) TestFailuresUpgrade() { - var ( - app = suite.GetNeutronZoneApp(suite.ChainA) - storeKey = app.GetKey(contractmanagertypes.StoreKey) - ctx = suite.ChainA.GetContext() - cdc = app.AppCodec() - ) - - addressOne := testutil.TestOwnerAddress - addressTwo := "neutron1fxudpred77a0grgh69u0j7y84yks5ev4n5050z45kecz792jnd6scqu98z" - - store := ctx.KVStore(storeKey) - var i uint64 - for i = 0; i < 4; i++ { - var addr string - if i < 2 { - addr = addressOne - } else { - addr = addressTwo - } - failure := contractmanagertypes.OldFailure{ - ChannelId: "channel-0", - Address: addr, - Id: i % 2, - AckType: contractmanagertypes.Ack, - } - bz := cdc.MustMarshal(&failure) - store.Set(contractmanagertypes.GetFailureKey(failure.Address, failure.Id), bz) - } - - upgrade := upgradetypes.Plan{ - Name: nextupgrade.UpgradeName, - Info: "some text here", - Height: 100, - } - app.UpgradeKeeper.ApplyUpgrade(ctx, upgrade) - - // check elements migrated properly - suite.Require().ElementsMatch(app.ContractManagerKeeper.GetAllFailures(ctx), []contractmanagertypes.Failure{ - { - Address: addressOne, - Id: 0, - AckType: contractmanagertypes.Ack, - Packet: nil, - Ack: nil, - }, - { - Address: addressOne, - Id: 1, - AckType: contractmanagertypes.Ack, - Packet: nil, - Ack: nil, - }, - { - Address: addressTwo, - Id: 0, - AckType: contractmanagertypes.Ack, - Packet: nil, - Ack: nil, - }, - { - Address: addressTwo, - Id: 1, - AckType: contractmanagertypes.Ack, - Packet: nil, - Ack: nil, - }, - }) - - // check getting element works - failure, err := app.ContractManagerKeeper.GetFailure(ctx, sdk.MustAccAddressFromBech32(addressTwo), 1) - suite.Require().NoError(err) - suite.Require().Equal(failure, &contractmanagertypes.Failure{ - Address: addressTwo, - Id: 1, - AckType: contractmanagertypes.Ack, - Packet: nil, - Ack: nil, - }) - - // non-existent returns error - _, err = app.ContractManagerKeeper.GetFailure(ctx, sdk.MustAccAddressFromBech32(addressTwo), 2) - suite.Require().Error(err) - - // check id's is in order - oneKey := app.ContractManagerKeeper.GetNextFailureIDKey(ctx, addressOne) - suite.Require().Equal(oneKey, uint64(2)) - twoKey := app.ContractManagerKeeper.GetNextFailureIDKey(ctx, addressTwo) - suite.Require().Equal(twoKey, uint64(2)) -} diff --git a/proto/neutron/contractmanager/failure.proto b/proto/neutron/contractmanager/failure.proto new file mode 100644 index 000000000..2ac24a5a6 --- /dev/null +++ b/proto/neutron/contractmanager/failure.proto @@ -0,0 +1,22 @@ +syntax = "proto3"; +package neutron.contractmanager; + +import "ibc/core/channel/v1/channel.proto"; + +option go_package = "github.com/neutron-org/neutron/x/contractmanager/types"; + +// 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 +message Failure { + // Address of the failed contract + string address = 1; + // Id of the failure under specific address + uint64 id = 2; + // Acknowledgement type + string ack_type = 3; + // IBC Packet + ibc.core.channel.v1.Packet packet = 4; + // Acknowledgement + ibc.core.channel.v1.Acknowledgement ack = 5; +} diff --git a/proto/neutron/contractmanager/genesis.proto b/proto/neutron/contractmanager/genesis.proto index a2960566c..bcbd3ea87 100644 --- a/proto/neutron/contractmanager/genesis.proto +++ b/proto/neutron/contractmanager/genesis.proto @@ -3,27 +3,11 @@ package neutron.contractmanager; import "gogoproto/gogo.proto"; import "neutron/contractmanager/params.proto"; -import "ibc/core/channel/v1/channel.proto"; +import "neutron/contractmanager/failure.proto"; // this line is used by starport scaffolding # genesis/proto/import option go_package = "github.com/neutron-org/neutron/x/contractmanager/types"; -// 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 -message Failure { - // Address of the failed contract - string address = 1; - // Id of the failure under specific address - uint64 id = 2; - // Acknowledgement type - string ack_type = 3; - // IBC Packet - ibc.core.channel.v1.Packet packet = 4; - // Acknowledgement - ibc.core.channel.v1.Acknowledgement ack = 5; -} - // GenesisState defines the contractmanager module's genesis state. message GenesisState { Params params = 1 [ (gogoproto.nullable) = false ]; @@ -31,17 +15,3 @@ message GenesisState { repeated Failure failures_list = 2 [ (gogoproto.nullable) = false ]; // this line is used by starport scaffolding # genesis/proto/state } - -// Deprecated. Used only for migration purposes. -message OldFailure { - // ChannelId - string channel_id = 1; - // Address of the failed contract - string address = 2; - // id of the failure under specific address - uint64 id = 3; - // ACK id to restore - uint64 ack_id = 4; - // Acknowledgement type - string ack_type = 5; -} diff --git a/proto/neutron/contractmanager/query.proto b/proto/neutron/contractmanager/query.proto index b517432e6..8ce870c3e 100644 --- a/proto/neutron/contractmanager/query.proto +++ b/proto/neutron/contractmanager/query.proto @@ -5,7 +5,7 @@ import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; import "cosmos/base/query/v1beta1/pagination.proto"; import "neutron/contractmanager/params.proto"; -import "neutron/contractmanager/genesis.proto"; +import "neutron/contractmanager/failure.proto"; // this line is used by starport scaffolding # 1 option go_package = "github.com/neutron-org/neutron/x/contractmanager/types"; diff --git a/proto/neutron/contractmanager/v1/failure.proto b/proto/neutron/contractmanager/v1/failure.proto new file mode 100644 index 000000000..a60d8984a --- /dev/null +++ b/proto/neutron/contractmanager/v1/failure.proto @@ -0,0 +1,18 @@ +syntax = "proto3"; +package neutron.contractmanager.v1; + +option go_package = "github.com/neutron-org/neutron/x/contractmanager/types/v1"; + +// Deprecated. Used only for migration purposes. +message Failure { + // ChannelId + string channel_id = 1; + // Address of the failed contract + string address = 2; + // id of the failure under specific address + uint64 id = 3; + // ACK id to restore + uint64 ack_id = 4; + // Acknowledgement type + string ack_type = 5; +} diff --git a/x/contractmanager/keeper/failure.go b/x/contractmanager/keeper/failure.go index f782b4c27..308decb34 100644 --- a/x/contractmanager/keeper/failure.go +++ b/x/contractmanager/keeper/failure.go @@ -6,7 +6,6 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" ibcchanneltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" - "github.com/neutron-org/neutron/x/contractmanager/types" ) diff --git a/x/contractmanager/keeper/migrations.go b/x/contractmanager/keeper/migrations.go new file mode 100644 index 000000000..4e7bfa951 --- /dev/null +++ b/x/contractmanager/keeper/migrations.go @@ -0,0 +1,21 @@ +package keeper + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" + v2 "github.com/neutron-org/neutron/x/contractmanager/migrations/v2" +) + +// Migrator is a struct for handling in-place store migrations. +type Migrator struct { + keeper Keeper +} + +// NewMigrator returns a new Migrator. +func NewMigrator(keeper Keeper) Migrator { + return Migrator{keeper: keeper} +} + +// Migrate1to2 migrates from version 1 to 2. +func (m Migrator) Migrate1to2(ctx sdk.Context) error { + return v2.MigrateStore(ctx, m.keeper.storeKey, m.keeper.cdc) +} diff --git a/x/contractmanager/migrations/v2/store.go b/x/contractmanager/migrations/v2/store.go new file mode 100644 index 000000000..ca77a5a8d --- /dev/null +++ b/x/contractmanager/migrations/v2/store.go @@ -0,0 +1,58 @@ +package v2 + +import ( + "github.com/cosmos/cosmos-sdk/codec" + "github.com/cosmos/cosmos-sdk/store/prefix" + storetypes "github.com/cosmos/cosmos-sdk/store/types" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/neutron-org/neutron/x/contractmanager/types" + v1 "github.com/neutron-org/neutron/x/contractmanager/types/v1" +) + +// MigrateStore performs in-place store migrations. +// The migration rearranges and adds new fields to the failures +func MigrateStore(ctx sdk.Context, storeKey storetypes.StoreKey, cdc codec.BinaryCodec) error { + if err := migrateFailures(ctx, storeKey, cdc); err != nil { + return err + } + + return nil +} + +func migrateFailures(ctx sdk.Context, storeKey storetypes.StoreKey, cdc codec.BinaryCodec) error { + ctx.Logger().Info("Migrating failures...") + + // fetch list of all old failures + oldFailuresList := make([]v1.Failure, 0) + iteratorStore := prefix.NewStore(ctx.KVStore(storeKey), types.ContractFailuresKey) + iterator := sdk.KVStorePrefixIterator(iteratorStore, []byte{}) + + for ; iterator.Valid(); iterator.Next() { + var val v1.Failure + cdc.MustUnmarshal(iterator.Value(), &val) + oldFailuresList = append(oldFailuresList, val) + } + + err := iterator.Close() + if err != nil { + return err + } + + // migrate + store := ctx.KVStore(storeKey) + for _, oldItem := range oldFailuresList { + failure := types.Failure{ + Address: oldItem.Address, + Id: oldItem.Id, + AckType: oldItem.AckType, + Packet: nil, + Ack: nil, + } + bz := cdc.MustMarshal(&failure) + store.Set(types.GetFailureKey(failure.Address, failure.Id), bz) + } + + ctx.Logger().Info("Finished migrating failures") + + return nil +} diff --git a/x/contractmanager/migrations/v2/store_test.go b/x/contractmanager/migrations/v2/store_test.go new file mode 100644 index 000000000..6c2edef15 --- /dev/null +++ b/x/contractmanager/migrations/v2/store_test.go @@ -0,0 +1,108 @@ +package v2_test + +import ( + "testing" + + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/neutron-org/neutron/testutil" + v2 "github.com/neutron-org/neutron/x/contractmanager/migrations/v2" + "github.com/neutron-org/neutron/x/contractmanager/types" + typesv1 "github.com/neutron-org/neutron/x/contractmanager/types/v1" + "github.com/stretchr/testify/suite" +) + +type V2ContractManagerMigrationTestSuite struct { + testutil.IBCConnectionTestSuite +} + +func TestKeeperTestSuite(t *testing.T) { + suite.Run(t, new(V2ContractManagerMigrationTestSuite)) +} + +func (suite *V2ContractManagerMigrationTestSuite) TestFailuresUpgrade() { + var ( + app = suite.GetNeutronZoneApp(suite.ChainA) + storeKey = app.GetKey(types.StoreKey) + ctx = suite.ChainA.GetContext() + cdc = app.AppCodec() + ) + + addressOne := testutil.TestOwnerAddress + addressTwo := "neutron1fxudpred77a0grgh69u0j7y84yks5ev4n5050z45kecz792jnd6scqu98z" + + // Write old state + store := ctx.KVStore(storeKey) + var i uint64 + for i = 0; i < 4; i++ { + var addr string + if i < 2 { + addr = addressOne + } else { + addr = addressTwo + } + failure := typesv1.Failure{ + ChannelId: "channel-0", + Address: addr, + Id: i % 2, + AckType: types.Ack, + } + bz := cdc.MustMarshal(&failure) + store.Set(types.GetFailureKey(failure.Address, failure.Id), bz) + } + + // Run migration + suite.NoError(v2.MigrateStore(ctx, storeKey, cdc)) + + // Check elements migrated properly + suite.Require().ElementsMatch(app.ContractManagerKeeper.GetAllFailures(ctx), []types.Failure{ + { + Address: addressOne, + Id: 0, + AckType: types.Ack, + Packet: nil, + Ack: nil, + }, + { + Address: addressOne, + Id: 1, + AckType: types.Ack, + Packet: nil, + Ack: nil, + }, + { + Address: addressTwo, + Id: 0, + AckType: types.Ack, + Packet: nil, + Ack: nil, + }, + { + Address: addressTwo, + Id: 1, + AckType: types.Ack, + Packet: nil, + Ack: nil, + }, + }) + + // Check getting element works + failure, err := app.ContractManagerKeeper.GetFailure(ctx, sdk.MustAccAddressFromBech32(addressTwo), 1) + suite.Require().NoError(err) + suite.Require().Equal(failure, &types.Failure{ + Address: addressTwo, + Id: 1, + AckType: types.Ack, + Packet: nil, + Ack: nil, + }) + + // Non-existent returns error + _, err = app.ContractManagerKeeper.GetFailure(ctx, sdk.MustAccAddressFromBech32(addressTwo), 2) + suite.Require().Error(err) + + // Check next id key is correct + oneKey := app.ContractManagerKeeper.GetNextFailureIDKey(ctx, addressOne) + suite.Require().Equal(oneKey, uint64(2)) + twoKey := app.ContractManagerKeeper.GetNextFailureIDKey(ctx, addressTwo) + suite.Require().Equal(twoKey, uint64(2)) +} diff --git a/x/contractmanager/module.go b/x/contractmanager/module.go index 0df347b41..9fde1514c 100644 --- a/x/contractmanager/module.go +++ b/x/contractmanager/module.go @@ -128,6 +128,11 @@ 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) + + m := keeper.NewMigrator(am.keeper) + if err := cfg.RegisterMigration(types.ModuleName, 1, m.Migrate1to2); err != nil { + panic(fmt.Sprintf("failed to migrate x/contractmanager from version 1 to 2: %v", err)) + } } // RegisterInvariants registers the invariants of the module. If an invariant deviates from its predicted value, the InvariantRegistry triggers appropriate logic (most often the chain will be halted) diff --git a/x/contractmanager/types/failure.pb.go b/x/contractmanager/types/failure.pb.go new file mode 100644 index 000000000..abc19b1a4 --- /dev/null +++ b/x/contractmanager/types/failure.pb.go @@ -0,0 +1,539 @@ +// Code generated by protoc-gen-gogo. DO NOT EDIT. +// source: neutron/contractmanager/failure.proto + +package types + +import ( + fmt "fmt" + proto "github.com/cosmos/gogoproto/proto" + types "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" + 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 + +// 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 Failure struct { + // Address of the failed contract + Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` + // Id of the failure under specific address + Id uint64 `protobuf:"varint,2,opt,name=id,proto3" json:"id,omitempty"` + // Acknowledgement type + AckType string `protobuf:"bytes,3,opt,name=ack_type,json=ackType,proto3" json:"ack_type,omitempty"` + // IBC Packet + Packet *types.Packet `protobuf:"bytes,4,opt,name=packet,proto3" json:"packet,omitempty"` + // Acknowledgement + Ack *types.Acknowledgement `protobuf:"bytes,5,opt,name=ack,proto3" json:"ack,omitempty"` +} + +func (m *Failure) Reset() { *m = Failure{} } +func (m *Failure) String() string { return proto.CompactTextString(m) } +func (*Failure) ProtoMessage() {} +func (*Failure) Descriptor() ([]byte, []int) { + return fileDescriptor_fba0c26e85dad46e, []int{0} +} +func (m *Failure) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Failure) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Failure.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 *Failure) XXX_Merge(src proto.Message) { + xxx_messageInfo_Failure.Merge(m, src) +} +func (m *Failure) XXX_Size() int { + return m.Size() +} +func (m *Failure) XXX_DiscardUnknown() { + xxx_messageInfo_Failure.DiscardUnknown(m) +} + +var xxx_messageInfo_Failure proto.InternalMessageInfo + +func (m *Failure) GetAddress() string { + if m != nil { + return m.Address + } + return "" +} + +func (m *Failure) GetId() uint64 { + if m != nil { + return m.Id + } + return 0 +} + +func (m *Failure) GetAckType() string { + if m != nil { + return m.AckType + } + return "" +} + +func (m *Failure) GetPacket() *types.Packet { + if m != nil { + return m.Packet + } + return nil +} + +func (m *Failure) GetAck() *types.Acknowledgement { + if m != nil { + return m.Ack + } + return nil +} + +func init() { + proto.RegisterType((*Failure)(nil), "neutron.contractmanager.Failure") +} + +func init() { + proto.RegisterFile("neutron/contractmanager/failure.proto", fileDescriptor_fba0c26e85dad46e) +} + +var fileDescriptor_fba0c26e85dad46e = []byte{ + // 288 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x90, 0xb1, 0x4e, 0xeb, 0x30, + 0x14, 0x86, 0xeb, 0xb6, 0xb7, 0xbd, 0x18, 0x89, 0xc1, 0x0b, 0x06, 0x24, 0xab, 0x20, 0x90, 0xba, + 0x60, 0xab, 0x54, 0xea, 0x0e, 0x03, 0x73, 0x15, 0x31, 0xb1, 0x20, 0xe7, 0xe4, 0x90, 0x5a, 0x69, + 0xed, 0xc8, 0x75, 0x0b, 0x7d, 0x0b, 0xde, 0x87, 0x17, 0x60, 0xec, 0xc8, 0x88, 0x9a, 0x17, 0x41, + 0x49, 0x93, 0x05, 0xd8, 0x7e, 0x4b, 0xdf, 0xe7, 0x73, 0xce, 0x4f, 0xaf, 0x2c, 0xae, 0x82, 0x77, + 0x56, 0x81, 0xb3, 0xc1, 0x6b, 0x08, 0x0b, 0x6d, 0x75, 0x8a, 0x5e, 0x3d, 0x6b, 0x33, 0x5f, 0x79, + 0x94, 0xb9, 0x77, 0xc1, 0xb1, 0xe3, 0x1a, 0x93, 0x3f, 0xb0, 0xd3, 0x73, 0x13, 0x83, 0x02, 0xe7, + 0x51, 0xc1, 0x4c, 0x5b, 0x8b, 0x73, 0xb5, 0x1e, 0x35, 0x71, 0xef, 0x5e, 0xbc, 0x13, 0xda, 0xbf, + 0xdf, 0xff, 0xc6, 0x38, 0xed, 0xeb, 0x24, 0xf1, 0xb8, 0x5c, 0x72, 0x32, 0x20, 0xc3, 0x83, 0xa8, + 0x79, 0xb2, 0x23, 0xda, 0x36, 0x09, 0x6f, 0x0f, 0xc8, 0xb0, 0x1b, 0xb5, 0x4d, 0xc2, 0x4e, 0xe8, + 0x7f, 0x0d, 0xd9, 0x53, 0xd8, 0xe4, 0xc8, 0x3b, 0x35, 0x0a, 0xd9, 0xc3, 0x26, 0x47, 0x36, 0xa6, + 0xbd, 0x5c, 0x43, 0x86, 0x81, 0x77, 0x07, 0x64, 0x78, 0x78, 0x73, 0x26, 0x4d, 0x0c, 0xb2, 0x5c, + 0x42, 0x36, 0x93, 0xd7, 0x23, 0x39, 0xad, 0x90, 0xa8, 0x46, 0xd9, 0x84, 0x76, 0x34, 0x64, 0xfc, + 0x5f, 0x65, 0x5c, 0xfe, 0x69, 0xdc, 0x42, 0x66, 0xdd, 0xcb, 0x1c, 0x93, 0x14, 0x17, 0x68, 0x43, + 0x54, 0x0a, 0x77, 0xd3, 0x8f, 0x9d, 0x20, 0xdb, 0x9d, 0x20, 0x5f, 0x3b, 0x41, 0xde, 0x0a, 0xd1, + 0xda, 0x16, 0xa2, 0xf5, 0x59, 0x88, 0xd6, 0xe3, 0x24, 0x35, 0x61, 0xb6, 0x8a, 0x25, 0xb8, 0x85, + 0xaa, 0xeb, 0xb9, 0x76, 0x3e, 0x6d, 0xb2, 0x7a, 0xfd, 0xd5, 0x69, 0x79, 0xcc, 0x32, 0xee, 0x55, + 0xb5, 0x8c, 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, 0x40, 0x42, 0xfd, 0x80, 0x7b, 0x01, 0x00, 0x00, +} + +func (m *Failure) 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 *Failure) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Failure) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.Ack != nil { + { + size, err := m.Ack.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintFailure(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x2a + } + if m.Packet != nil { + { + size, err := m.Packet.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintFailure(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x22 + } + if len(m.AckType) > 0 { + i -= len(m.AckType) + copy(dAtA[i:], m.AckType) + i = encodeVarintFailure(dAtA, i, uint64(len(m.AckType))) + i-- + dAtA[i] = 0x1a + } + if m.Id != 0 { + i = encodeVarintFailure(dAtA, i, uint64(m.Id)) + i-- + dAtA[i] = 0x10 + } + if len(m.Address) > 0 { + i -= len(m.Address) + copy(dAtA[i:], m.Address) + i = encodeVarintFailure(dAtA, i, uint64(len(m.Address))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func encodeVarintFailure(dAtA []byte, offset int, v uint64) int { + offset -= sovFailure(v) + base := offset + for v >= 1<<7 { + dAtA[offset] = uint8(v&0x7f | 0x80) + v >>= 7 + offset++ + } + dAtA[offset] = uint8(v) + return base +} +func (m *Failure) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Address) + if l > 0 { + n += 1 + l + sovFailure(uint64(l)) + } + if m.Id != 0 { + n += 1 + sovFailure(uint64(m.Id)) + } + l = len(m.AckType) + if l > 0 { + n += 1 + l + sovFailure(uint64(l)) + } + if m.Packet != nil { + l = m.Packet.Size() + n += 1 + l + sovFailure(uint64(l)) + } + if m.Ack != nil { + l = m.Ack.Size() + n += 1 + l + sovFailure(uint64(l)) + } + return n +} + +func sovFailure(x uint64) (n int) { + return (math_bits.Len64(x|1) + 6) / 7 +} +func sozFailure(x uint64) (n int) { + return sovFailure(uint64((x << 1) ^ uint64((int64(x) >> 63)))) +} +func (m *Failure) 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 ErrIntOverflowFailure + } + 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: Failure: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: Failure: 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 ErrIntOverflowFailure + } + 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 ErrInvalidLengthFailure + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthFailure + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Address = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + 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 ErrIntOverflowFailure + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Id |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field AckType", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowFailure + } + 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 ErrInvalidLengthFailure + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthFailure + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.AckType = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Packet", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowFailure + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthFailure + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthFailure + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Packet == nil { + m.Packet = &types.Packet{} + } + if err := m.Packet.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 5: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Ack", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowFailure + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthFailure + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthFailure + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Ack == nil { + m.Ack = &types.Acknowledgement{} + } + if err := m.Ack.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipFailure(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthFailure + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func skipFailure(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, ErrIntOverflowFailure + } + 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, ErrIntOverflowFailure + } + 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, ErrIntOverflowFailure + } + 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, ErrInvalidLengthFailure + } + iNdEx += length + case 3: + depth++ + case 4: + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupFailure + } + depth-- + case 5: + iNdEx += 4 + default: + return 0, fmt.Errorf("proto: illegal wireType %d", wireType) + } + if iNdEx < 0 { + return 0, ErrInvalidLengthFailure + } + if depth == 0 { + return iNdEx, nil + } + } + return 0, io.ErrUnexpectedEOF +} + +var ( + ErrInvalidLengthFailure = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowFailure = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupFailure = fmt.Errorf("proto: unexpected end of group") +) diff --git a/x/contractmanager/types/genesis.pb.go b/x/contractmanager/types/genesis.pb.go index 29787641f..a40d4edc0 100644 --- a/x/contractmanager/types/genesis.pb.go +++ b/x/contractmanager/types/genesis.pb.go @@ -7,7 +7,6 @@ import ( fmt "fmt" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" - types "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" io "io" math "math" math_bits "math/bits" @@ -24,90 +23,6 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package -// 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 Failure struct { - // Address of the failed contract - Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` - // Id of the failure under specific address - Id uint64 `protobuf:"varint,2,opt,name=id,proto3" json:"id,omitempty"` - // Acknowledgement type - AckType string `protobuf:"bytes,3,opt,name=ack_type,json=ackType,proto3" json:"ack_type,omitempty"` - // IBC Packet - Packet *types.Packet `protobuf:"bytes,4,opt,name=packet,proto3" json:"packet,omitempty"` - // Acknowledgement - Ack *types.Acknowledgement `protobuf:"bytes,5,opt,name=ack,proto3" json:"ack,omitempty"` -} - -func (m *Failure) Reset() { *m = Failure{} } -func (m *Failure) String() string { return proto.CompactTextString(m) } -func (*Failure) ProtoMessage() {} -func (*Failure) Descriptor() ([]byte, []int) { - return fileDescriptor_cf4a1534315a7490, []int{0} -} -func (m *Failure) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *Failure) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_Failure.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 *Failure) XXX_Merge(src proto.Message) { - xxx_messageInfo_Failure.Merge(m, src) -} -func (m *Failure) XXX_Size() int { - return m.Size() -} -func (m *Failure) XXX_DiscardUnknown() { - xxx_messageInfo_Failure.DiscardUnknown(m) -} - -var xxx_messageInfo_Failure proto.InternalMessageInfo - -func (m *Failure) GetAddress() string { - if m != nil { - return m.Address - } - return "" -} - -func (m *Failure) GetId() uint64 { - if m != nil { - return m.Id - } - return 0 -} - -func (m *Failure) GetAckType() string { - if m != nil { - return m.AckType - } - return "" -} - -func (m *Failure) GetPacket() *types.Packet { - if m != nil { - return m.Packet - } - return nil -} - -func (m *Failure) GetAck() *types.Acknowledgement { - if m != nil { - return m.Ack - } - return nil -} - // GenesisState defines the contractmanager module's genesis state. type GenesisState struct { Params Params `protobuf:"bytes,1,opt,name=params,proto3" json:"params"` @@ -119,7 +34,7 @@ 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_cf4a1534315a7490, []int{1} + return fileDescriptor_cf4a1534315a7490, []int{0} } func (m *GenesisState) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -162,92 +77,8 @@ func (m *GenesisState) GetFailuresList() []Failure { return nil } -// Deprecated. Used only for migration purposes. -type OldFailure struct { - // ChannelId - ChannelId string `protobuf:"bytes,1,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"` - // Address of the failed contract - Address string `protobuf:"bytes,2,opt,name=address,proto3" json:"address,omitempty"` - // id of the failure under specific address - Id uint64 `protobuf:"varint,3,opt,name=id,proto3" json:"id,omitempty"` - // ACK id to restore - AckId uint64 `protobuf:"varint,4,opt,name=ack_id,json=ackId,proto3" json:"ack_id,omitempty"` - // Acknowledgement type - AckType string `protobuf:"bytes,5,opt,name=ack_type,json=ackType,proto3" json:"ack_type,omitempty"` -} - -func (m *OldFailure) Reset() { *m = OldFailure{} } -func (m *OldFailure) String() string { return proto.CompactTextString(m) } -func (*OldFailure) ProtoMessage() {} -func (*OldFailure) Descriptor() ([]byte, []int) { - return fileDescriptor_cf4a1534315a7490, []int{2} -} -func (m *OldFailure) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *OldFailure) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_OldFailure.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 *OldFailure) XXX_Merge(src proto.Message) { - xxx_messageInfo_OldFailure.Merge(m, src) -} -func (m *OldFailure) XXX_Size() int { - return m.Size() -} -func (m *OldFailure) XXX_DiscardUnknown() { - xxx_messageInfo_OldFailure.DiscardUnknown(m) -} - -var xxx_messageInfo_OldFailure proto.InternalMessageInfo - -func (m *OldFailure) GetChannelId() string { - if m != nil { - return m.ChannelId - } - return "" -} - -func (m *OldFailure) GetAddress() string { - if m != nil { - return m.Address - } - return "" -} - -func (m *OldFailure) GetId() uint64 { - if m != nil { - return m.Id - } - return 0 -} - -func (m *OldFailure) GetAckId() uint64 { - if m != nil { - return m.AckId - } - return 0 -} - -func (m *OldFailure) GetAckType() string { - if m != nil { - return m.AckType - } - return "" -} - func init() { - proto.RegisterType((*Failure)(nil), "neutron.contractmanager.Failure") proto.RegisterType((*GenesisState)(nil), "neutron.contractmanager.GenesisState") - proto.RegisterType((*OldFailure)(nil), "neutron.contractmanager.OldFailure") } func init() { @@ -255,101 +86,23 @@ func init() { } var fileDescriptor_cf4a1534315a7490 = []byte{ - // 437 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x92, 0xcf, 0x6e, 0xd3, 0x30, - 0x1c, 0xc7, 0xeb, 0xf4, 0xcf, 0x98, 0x3b, 0x38, 0x58, 0x20, 0x42, 0x11, 0x59, 0xa8, 0x86, 0xd4, - 0x0b, 0xb6, 0xd6, 0x49, 0xbb, 0x71, 0x60, 0x07, 0xd0, 0x04, 0x12, 0x55, 0xe0, 0xc4, 0xa5, 0x72, - 0x6c, 0x93, 0x59, 0x49, 0xec, 0xc8, 0x76, 0x07, 0x7b, 0x02, 0xae, 0x9c, 0x79, 0x15, 0x5e, 0x60, - 0xc7, 0x1d, 0x39, 0x21, 0xd4, 0xbe, 0x08, 0x4a, 0xe2, 0x20, 0xc6, 0xd6, 0xdb, 0xaf, 0xd5, 0xe7, - 0xfb, 0x75, 0x7e, 0x1f, 0x1b, 0x3e, 0x53, 0x62, 0xe5, 0x8c, 0x56, 0x84, 0x69, 0xe5, 0x0c, 0x65, - 0xae, 0xa4, 0x8a, 0x66, 0xc2, 0x90, 0x4c, 0x28, 0x61, 0xa5, 0xc5, 0x95, 0xd1, 0x4e, 0xa3, 0x87, - 0x1e, 0xc3, 0xff, 0x61, 0x93, 0xfb, 0x99, 0xce, 0x74, 0xc3, 0x90, 0x7a, 0x6a, 0xf1, 0xc9, 0xc1, - 0xb6, 0xd6, 0x8a, 0x1a, 0x5a, 0xfa, 0xd2, 0xc9, 0x53, 0x99, 0x32, 0xc2, 0xb4, 0x11, 0x84, 0x9d, - 0x51, 0xa5, 0x44, 0x41, 0xce, 0x0f, 0xbb, 0xb1, 0x45, 0xa6, 0x3f, 0x00, 0xdc, 0x79, 0x45, 0x65, - 0xb1, 0x32, 0x02, 0x85, 0x70, 0x87, 0x72, 0x6e, 0x84, 0xb5, 0x21, 0x88, 0xc1, 0x6c, 0x37, 0xe9, - 0x7e, 0xa2, 0x7b, 0x30, 0x90, 0x3c, 0x0c, 0x62, 0x30, 0x1b, 0x24, 0x81, 0xe4, 0xe8, 0x11, 0xbc, - 0x43, 0x59, 0xbe, 0x74, 0x17, 0x95, 0x08, 0xfb, 0x1e, 0x65, 0xf9, 0x87, 0x8b, 0x4a, 0xa0, 0x23, - 0x38, 0xaa, 0x28, 0xcb, 0x85, 0x0b, 0x07, 0x31, 0x98, 0x8d, 0xe7, 0x8f, 0xb1, 0x4c, 0x19, 0xae, - 0x3f, 0x02, 0x77, 0x27, 0x9f, 0x1f, 0xe2, 0x45, 0x83, 0x24, 0x1e, 0x45, 0xc7, 0xb0, 0x4f, 0x59, - 0x1e, 0x0e, 0x9b, 0xc4, 0xc1, 0xad, 0x89, 0x97, 0x2c, 0x57, 0xfa, 0x73, 0x21, 0x78, 0x26, 0x4a, - 0xa1, 0x5c, 0x52, 0x07, 0xa6, 0xdf, 0x01, 0xdc, 0x7b, 0xdd, 0x7a, 0x7c, 0xef, 0xa8, 0x13, 0xe8, - 0x45, 0x7d, 0x7a, 0x6d, 0xa0, 0xd9, 0x60, 0x3c, 0xdf, 0xc7, 0x5b, 0xbc, 0xe2, 0x45, 0x83, 0x9d, - 0x0c, 0x2e, 0x7f, 0xed, 0xf7, 0x12, 0x1f, 0x42, 0x6f, 0xe0, 0xdd, 0x4f, 0xad, 0x0c, 0xbb, 0x2c, - 0xa4, 0x75, 0x61, 0x10, 0xf7, 0x67, 0xe3, 0x79, 0xbc, 0xb5, 0xc5, 0xab, 0xf3, 0x35, 0x7b, 0x5d, - 0xf8, 0xad, 0xb4, 0x6e, 0xfa, 0x15, 0x40, 0xf8, 0xae, 0xe0, 0x9d, 0xdd, 0x27, 0x10, 0xfa, 0x75, - 0x96, 0x92, 0x7b, 0xc1, 0xbb, 0xfe, 0x9f, 0x53, 0xfe, 0xaf, 0xfc, 0xe0, 0x36, 0xf9, 0xfd, 0xbf, - 0xf2, 0x1f, 0xc0, 0x51, 0x2d, 0x5f, 0xf2, 0xc6, 0xf0, 0x20, 0x19, 0x52, 0x96, 0x9f, 0x5e, 0xbf, - 0x93, 0xe1, 0xb5, 0x3b, 0x39, 0x59, 0x5c, 0xae, 0x23, 0x70, 0xb5, 0x8e, 0xc0, 0xef, 0x75, 0x04, - 0xbe, 0x6d, 0xa2, 0xde, 0xd5, 0x26, 0xea, 0xfd, 0xdc, 0x44, 0xbd, 0x8f, 0xc7, 0x99, 0x74, 0x67, - 0xab, 0x14, 0x33, 0x5d, 0x12, 0xbf, 0xe3, 0x73, 0x6d, 0xb2, 0x6e, 0x26, 0x5f, 0x6e, 0x3c, 0xb0, - 0xba, 0xdf, 0xa6, 0xa3, 0xe6, 0xf5, 0x1c, 0xfd, 0x09, 0x00, 0x00, 0xff, 0xff, 0x59, 0xd9, 0x03, - 0xb9, 0xde, 0x02, 0x00, 0x00, -} - -func (m *Failure) 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 *Failure) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *Failure) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.Ack != nil { - { - size, err := m.Ack.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintGenesis(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x2a - } - if m.Packet != nil { - { - size, err := m.Packet.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintGenesis(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x22 - } - if len(m.AckType) > 0 { - i -= len(m.AckType) - copy(dAtA[i:], m.AckType) - i = encodeVarintGenesis(dAtA, i, uint64(len(m.AckType))) - i-- - dAtA[i] = 0x1a - } - if m.Id != 0 { - i = encodeVarintGenesis(dAtA, i, uint64(m.Id)) - i-- - dAtA[i] = 0x10 - } - if len(m.Address) > 0 { - i -= len(m.Address) - copy(dAtA[i:], m.Address) - i = encodeVarintGenesis(dAtA, i, uint64(len(m.Address))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil + // 249 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, 0x4f, 0xce, 0xcf, 0x2b, 0x29, 0x4a, 0x4c, 0x2e, 0xc9, 0x4d, 0xcc, 0x4b, + 0x4c, 0x4f, 0x2d, 0xd2, 0x4f, 0x4f, 0xcd, 0x4b, 0x2d, 0xce, 0x2c, 0xd6, 0x2b, 0x28, 0xca, 0x2f, + 0xc9, 0x17, 0x12, 0x87, 0x2a, 0xd3, 0x43, 0x53, 0x26, 0x25, 0x92, 0x9e, 0x9f, 0x9e, 0x0f, 0x56, + 0xa3, 0x0f, 0x62, 0x41, 0x94, 0x4b, 0xa9, 0xe0, 0x32, 0xb5, 0x20, 0xb1, 0x28, 0x31, 0x17, 0x6a, + 0xa8, 0x14, 0x4e, 0xbb, 0xd3, 0x12, 0x33, 0x73, 0x4a, 0x8b, 0x52, 0x21, 0xca, 0x94, 0x66, 0x31, + 0x72, 0xf1, 0xb8, 0x43, 0x5c, 0x13, 0x5c, 0x92, 0x58, 0x92, 0x2a, 0x64, 0xcb, 0xc5, 0x06, 0x31, + 0x47, 0x82, 0x51, 0x81, 0x51, 0x83, 0xdb, 0x48, 0x5e, 0x0f, 0x87, 0xeb, 0xf4, 0x02, 0xc0, 0xca, + 0x9c, 0x58, 0x4e, 0xdc, 0x93, 0x67, 0x08, 0x82, 0x6a, 0x12, 0xf2, 0xe6, 0xe2, 0x85, 0x5a, 0x50, + 0x1c, 0x9f, 0x93, 0x59, 0x5c, 0x22, 0xc1, 0xa4, 0xc0, 0xac, 0xc1, 0x6d, 0xa4, 0x80, 0xd3, 0x14, + 0x37, 0x88, 0x6a, 0xa8, 0x31, 0x3c, 0x30, 0xcd, 0x3e, 0x99, 0xc5, 0x25, 0x4e, 0x01, 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, 0x96, 0x9e, 0x59, 0x92, 0x51, 0x9a, 0xa4, + 0x97, 0x9c, 0x9f, 0xab, 0x0f, 0x35, 0x59, 0x37, 0xbf, 0x28, 0x1d, 0xc6, 0xd6, 0xaf, 0xc0, 0xf0, + 0x76, 0x49, 0x65, 0x41, 0x6a, 0x71, 0x12, 0x1b, 0xd8, 0xd7, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, + 0xff, 0x20, 0x4a, 0xa0, 0xfc, 0x9a, 0x01, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { @@ -399,60 +152,6 @@ func (m *GenesisState) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *OldFailure) 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 *OldFailure) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *OldFailure) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.AckType) > 0 { - i -= len(m.AckType) - copy(dAtA[i:], m.AckType) - i = encodeVarintGenesis(dAtA, i, uint64(len(m.AckType))) - i-- - dAtA[i] = 0x2a - } - if m.AckId != 0 { - i = encodeVarintGenesis(dAtA, i, uint64(m.AckId)) - i-- - dAtA[i] = 0x20 - } - if m.Id != 0 { - i = encodeVarintGenesis(dAtA, i, uint64(m.Id)) - i-- - dAtA[i] = 0x18 - } - if len(m.Address) > 0 { - i -= len(m.Address) - copy(dAtA[i:], m.Address) - i = encodeVarintGenesis(dAtA, i, uint64(len(m.Address))) - i-- - dAtA[i] = 0x12 - } - if len(m.ChannelId) > 0 { - i -= len(m.ChannelId) - copy(dAtA[i:], m.ChannelId) - i = encodeVarintGenesis(dAtA, i, uint64(len(m.ChannelId))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - func encodeVarintGenesis(dAtA []byte, offset int, v uint64) int { offset -= sovGenesis(v) base := offset @@ -464,34 +163,6 @@ func encodeVarintGenesis(dAtA []byte, offset int, v uint64) int { dAtA[offset] = uint8(v) return base } -func (m *Failure) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Address) - if l > 0 { - n += 1 + l + sovGenesis(uint64(l)) - } - if m.Id != 0 { - n += 1 + sovGenesis(uint64(m.Id)) - } - l = len(m.AckType) - if l > 0 { - n += 1 + l + sovGenesis(uint64(l)) - } - if m.Packet != nil { - l = m.Packet.Size() - n += 1 + l + sovGenesis(uint64(l)) - } - if m.Ack != nil { - l = m.Ack.Size() - n += 1 + l + sovGenesis(uint64(l)) - } - return n -} - func (m *GenesisState) Size() (n int) { if m == nil { return 0 @@ -509,244 +180,12 @@ func (m *GenesisState) Size() (n int) { return n } -func (m *OldFailure) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.ChannelId) - if l > 0 { - n += 1 + l + sovGenesis(uint64(l)) - } - l = len(m.Address) - if l > 0 { - n += 1 + l + sovGenesis(uint64(l)) - } - if m.Id != 0 { - n += 1 + sovGenesis(uint64(m.Id)) - } - if m.AckId != 0 { - n += 1 + sovGenesis(uint64(m.AckId)) - } - l = len(m.AckType) - if l > 0 { - 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 *Failure) 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: Failure: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: Failure: 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 ErrIntOverflowGenesis - } - 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 ErrInvalidLengthGenesis - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthGenesis - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Address = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - 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 ErrIntOverflowGenesis - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Id |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field AckType", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenesis - } - 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 ErrInvalidLengthGenesis - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthGenesis - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.AckType = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Packet", 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 m.Packet == nil { - m.Packet = &types.Packet{} - } - if err := m.Packet.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 5: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Ack", 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 m.Ack == nil { - m.Ack = &types.Acknowledgement{} - } - if err := m.Ack.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 (m *GenesisState) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -864,190 +303,6 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error { } return nil } -func (m *OldFailure) 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: OldFailure: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: OldFailure: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ChannelId", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenesis - } - 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 ErrInvalidLengthGenesis - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthGenesis - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ChannelId = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - 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 ErrIntOverflowGenesis - } - 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 ErrInvalidLengthGenesis - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthGenesis - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Address = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 3: - 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 ErrIntOverflowGenesis - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Id |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 4: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field AckId", wireType) - } - m.AckId = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenesis - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.AckId |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 5: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field AckType", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenesis - } - 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 ErrInvalidLengthGenesis - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthGenesis - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.AckType = string(dAtA[iNdEx:postIndex]) - 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 diff --git a/x/contractmanager/types/query.pb.go b/x/contractmanager/types/query.pb.go index 4e5dd940b..a4eea203d 100644 --- a/x/contractmanager/types/query.pb.go +++ b/x/contractmanager/types/query.pb.go @@ -229,37 +229,37 @@ func init() { } var fileDescriptor_f9524a427f219917 = []byte{ - // 478 bytes of a gzipped FileDescriptorProto + // 475 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x93, 0x31, 0x6f, 0xd4, 0x30, - 0x14, 0xc7, 0xe3, 0x16, 0x8e, 0xe2, 0x0e, 0x48, 0xe6, 0x10, 0x51, 0x84, 0x72, 0xd7, 0x14, 0x68, + 0x1c, 0xc5, 0xe3, 0x16, 0x8e, 0xe2, 0x0e, 0x48, 0xe6, 0x10, 0xa7, 0x08, 0xe5, 0xda, 0x14, 0x68, 0xa1, 0x9c, 0xad, 0x5e, 0x25, 0x36, 0x06, 0x6e, 0x28, 0xeb, 0x11, 0x31, 0xb1, 0x39, 0xa9, 0x31, 0x91, 0x1a, 0x3b, 0xb5, 0x1d, 0xd4, 0x0a, 0xb1, 0x30, 0x33, 0x20, 0xc1, 0x47, 0x80, 0xef, 0xd2, - 0xb1, 0x12, 0x42, 0x62, 0x42, 0xe8, 0x8e, 0x0f, 0x82, 0xce, 0x76, 0x4a, 0xb9, 0x92, 0xb6, 0x53, - 0xb7, 0xc4, 0xf9, 0xbf, 0xf7, 0xff, 0xbd, 0xff, 0x73, 0xe0, 0xaa, 0x60, 0xb5, 0x51, 0x52, 0x90, - 0x5c, 0x0a, 0xa3, 0x68, 0x6e, 0x4a, 0x2a, 0x28, 0x67, 0x8a, 0xec, 0xd5, 0x4c, 0x1d, 0xe0, 0x4a, - 0x49, 0x23, 0xd1, 0x6d, 0x2f, 0xc2, 0x73, 0xa2, 0xa8, 0xcb, 0x25, 0x97, 0x56, 0x43, 0x66, 0x4f, - 0x4e, 0x1e, 0xdd, 0xe1, 0x52, 0xf2, 0x5d, 0x46, 0x68, 0x55, 0x10, 0x2a, 0x84, 0x34, 0xd4, 0x14, - 0x52, 0x68, 0xff, 0xf5, 0x61, 0x2e, 0x75, 0x29, 0x35, 0xc9, 0xa8, 0x66, 0xce, 0x85, 0xbc, 0xd9, - 0xcc, 0x98, 0xa1, 0x9b, 0xa4, 0xa2, 0xbc, 0x10, 0x56, 0xec, 0xb5, 0x77, 0xdb, 0xe8, 0x2a, 0xaa, - 0x68, 0xd9, 0x74, 0xbc, 0xd7, 0xa6, 0xe2, 0x4c, 0x30, 0x5d, 0x78, 0x59, 0xd2, 0x85, 0xe8, 0xf9, - 0xcc, 0x6e, 0x6c, 0x6b, 0x53, 0xb6, 0x57, 0x33, 0x6d, 0x92, 0x17, 0xf0, 0xe6, 0x3f, 0xa7, 0xba, - 0x92, 0x42, 0x33, 0xf4, 0x04, 0x76, 0x9c, 0x47, 0x08, 0xfa, 0x60, 0x7d, 0x79, 0xd8, 0xc3, 0x2d, - 0x19, 0x60, 0x57, 0x38, 0xba, 0x72, 0xf8, 0xb3, 0x17, 0xa4, 0xbe, 0x28, 0xd9, 0x87, 0x5d, 0xdb, - 0x75, 0x9b, 0x16, 0xbb, 0xb5, 0x62, 0x8d, 0x1b, 0x0a, 0xe1, 0x35, 0xba, 0xb3, 0xa3, 0x98, 0x76, - 0x7d, 0xaf, 0xa7, 0xcd, 0x2b, 0xda, 0x86, 0xf0, 0xef, 0xf8, 0xe1, 0x82, 0x35, 0xbd, 0x8f, 0x5d, - 0x56, 0x78, 0x96, 0x15, 0x76, 0x1b, 0xf1, 0x59, 0xe1, 0x31, 0xe5, 0xcc, 0x77, 0x4d, 0x4f, 0x54, - 0x26, 0x5f, 0x00, 0xbc, 0x35, 0x67, 0xed, 0x47, 0x1a, 0xc1, 0xa5, 0x57, 0xfe, 0x2c, 0x04, 0xfd, - 0xc5, 0xf5, 0xe5, 0x61, 0xbf, 0x75, 0x28, 0x5f, 0xec, 0xa7, 0x3a, 0xae, 0x43, 0xcf, 0xfe, 0x43, - 0xb9, 0x76, 0x2e, 0xa5, 0x03, 0x38, 0x89, 0x39, 0xfc, 0xbe, 0x08, 0xaf, 0x5a, 0x4c, 0xf4, 0x01, - 0xc0, 0x8e, 0xcb, 0x10, 0x6d, 0xb4, 0xf2, 0x9c, 0x5e, 0x5c, 0xf4, 0xe8, 0x62, 0x62, 0xe7, 0x9d, - 0xac, 0xbd, 0xff, 0xf6, 0xfb, 0xd3, 0xc2, 0x0a, 0xea, 0x91, 0xb3, 0xaf, 0x14, 0xfa, 0x0a, 0xe0, - 0x8d, 0xa7, 0x6e, 0x27, 0x4d, 0x82, 0x68, 0x70, 0xb6, 0xd5, 0xdc, 0x92, 0x23, 0x7c, 0x51, 0xb9, - 0x67, 0xdb, 0xb2, 0x6c, 0x03, 0xb4, 0xd1, 0xca, 0xd6, 0xe4, 0x4f, 0xde, 0xfa, 0xeb, 0xf2, 0x0e, - 0x7d, 0x06, 0x70, 0xe9, 0xb2, 0x00, 0x1f, 0x58, 0xc0, 0x55, 0xb4, 0x72, 0x2e, 0xe0, 0x68, 0x7c, - 0x38, 0x89, 0xc1, 0xd1, 0x24, 0x06, 0xbf, 0x26, 0x31, 0xf8, 0x38, 0x8d, 0x83, 0xa3, 0x69, 0x1c, - 0xfc, 0x98, 0xc6, 0xc1, 0xcb, 0xc7, 0xbc, 0x30, 0xaf, 0xeb, 0x0c, 0xe7, 0xb2, 0x6c, 0xda, 0x0c, - 0xa4, 0xe2, 0xc7, 0x2d, 0xf7, 0x4f, 0x35, 0x35, 0x07, 0x15, 0xd3, 0x59, 0xc7, 0xfe, 0xbd, 0x5b, - 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0xfd, 0xbf, 0xad, 0xfd, 0xaa, 0x04, 0x00, 0x00, + 0xb1, 0x12, 0x42, 0x62, 0x42, 0xe8, 0x8e, 0x0f, 0x82, 0x62, 0x3b, 0xa5, 0x5c, 0x49, 0xaf, 0x53, + 0xb7, 0xbb, 0xe4, 0xfd, 0xdf, 0xfb, 0xf9, 0xfd, 0x1d, 0xb8, 0x26, 0x58, 0x65, 0x94, 0x14, 0x24, + 0x93, 0xc2, 0x28, 0x9a, 0x99, 0x82, 0x0a, 0xca, 0x99, 0x22, 0xfb, 0x15, 0x53, 0x87, 0xb8, 0x54, + 0xd2, 0x48, 0x74, 0xdb, 0x8b, 0xf0, 0x8c, 0x28, 0xec, 0x72, 0xc9, 0xa5, 0xd5, 0x90, 0xfa, 0x97, + 0x93, 0x87, 0x77, 0xb8, 0x94, 0x7c, 0x8f, 0x11, 0x5a, 0xe6, 0x84, 0x0a, 0x21, 0x0d, 0x35, 0xb9, + 0x14, 0xda, 0xbf, 0x7d, 0x98, 0x49, 0x5d, 0x48, 0x4d, 0x52, 0xaa, 0x99, 0x4b, 0x21, 0x6f, 0xb6, + 0x52, 0x66, 0xe8, 0x16, 0x29, 0x29, 0xcf, 0x85, 0x15, 0x7b, 0xed, 0xdd, 0x36, 0xba, 0x92, 0x2a, + 0x5a, 0x34, 0x8e, 0xf7, 0xda, 0x54, 0xaf, 0x68, 0xbe, 0x57, 0x29, 0xe6, 0x64, 0x71, 0x17, 0xa2, + 0xe7, 0x75, 0xdc, 0xd8, 0xce, 0x26, 0x6c, 0xbf, 0x62, 0xda, 0xc4, 0x2f, 0xe0, 0xcd, 0x7f, 0x9e, + 0xea, 0x52, 0x0a, 0xcd, 0xd0, 0x13, 0xd8, 0x71, 0x19, 0x3d, 0xb0, 0x02, 0x36, 0x96, 0x87, 0x7d, + 0xdc, 0xd2, 0x01, 0x76, 0x83, 0xa3, 0x2b, 0x47, 0x3f, 0xfb, 0x41, 0xe2, 0x87, 0xe2, 0x03, 0xd8, + 0xb5, 0xae, 0x3b, 0x8e, 0xa0, 0x49, 0x43, 0x3d, 0x78, 0x8d, 0xee, 0xee, 0x2a, 0xa6, 0x9d, 0xef, + 0xf5, 0xa4, 0xf9, 0x8b, 0x76, 0x20, 0xfc, 0x7b, 0xfc, 0xde, 0x82, 0x0d, 0xbd, 0x8f, 0x5d, 0x57, + 0xb8, 0xee, 0x0a, 0xbb, 0x8d, 0xf8, 0xae, 0xf0, 0x98, 0x72, 0xe6, 0x5d, 0x93, 0x53, 0x93, 0xf1, + 0x17, 0x00, 0x6f, 0xcd, 0x44, 0xfb, 0x23, 0x8d, 0xe0, 0x92, 0x2f, 0xa4, 0x0e, 0x5f, 0xdc, 0x58, + 0x1e, 0xae, 0xb4, 0x1e, 0xca, 0x0f, 0xfb, 0x53, 0x9d, 0xcc, 0xa1, 0x67, 0xff, 0xa1, 0x5c, 0x9f, + 0x4b, 0xe9, 0x00, 0x4e, 0x63, 0x0e, 0xbf, 0x2f, 0xc2, 0xab, 0x16, 0x13, 0x7d, 0x00, 0xb0, 0xe3, + 0x3a, 0x44, 0x9b, 0xad, 0x3c, 0x67, 0x17, 0x17, 0x3e, 0xba, 0x98, 0xd8, 0x65, 0xc7, 0xeb, 0xef, + 0xbf, 0xfd, 0xfe, 0xb4, 0xb0, 0x8a, 0xfa, 0xe4, 0xfc, 0x2b, 0x85, 0xbe, 0x02, 0x78, 0xe3, 0xa9, + 0xdb, 0x49, 0xd3, 0x20, 0x1a, 0x9c, 0x1f, 0x35, 0xb3, 0xe4, 0x10, 0x5f, 0x54, 0xee, 0xd9, 0xb6, + 0x2d, 0xdb, 0x00, 0x6d, 0x92, 0x39, 0x17, 0x59, 0x93, 0xb7, 0xfe, 0xba, 0xbc, 0x43, 0x9f, 0x01, + 0x5c, 0xba, 0x2c, 0xc0, 0x07, 0x16, 0x70, 0x0d, 0xad, 0xce, 0x05, 0x1c, 0x8d, 0x8f, 0x26, 0x11, + 0x38, 0x9e, 0x44, 0xe0, 0xd7, 0x24, 0x02, 0x1f, 0xa7, 0x51, 0x70, 0x3c, 0x8d, 0x82, 0x1f, 0xd3, + 0x28, 0x78, 0xf9, 0x98, 0xe7, 0xe6, 0x75, 0x95, 0xe2, 0x4c, 0x16, 0x8d, 0xcd, 0x40, 0x2a, 0x7e, + 0x62, 0x79, 0x70, 0xc6, 0xd4, 0x1c, 0x96, 0x4c, 0xa7, 0x1d, 0xfb, 0xf5, 0x6e, 0xff, 0x09, 0x00, + 0x00, 0xff, 0xff, 0x05, 0x7b, 0x9c, 0xb2, 0xaa, 0x04, 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 new file mode 100644 index 000000000..df2ffd000 --- /dev/null +++ b/x/contractmanager/types/v1/failure.pb.go @@ -0,0 +1,500 @@ +// Code generated by protoc-gen-gogo. DO NOT EDIT. +// source: neutron/contractmanager/v1/failure.proto + +package v1 + +import ( + fmt "fmt" + 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 + +// Deprecated. Used only for migration purposes. +type Failure struct { + // ChannelId + ChannelId string `protobuf:"bytes,1,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"` + // Address of the failed contract + Address string `protobuf:"bytes,2,opt,name=address,proto3" json:"address,omitempty"` + // id of the failure under specific address + Id uint64 `protobuf:"varint,3,opt,name=id,proto3" json:"id,omitempty"` + // ACK id to restore + AckId uint64 `protobuf:"varint,4,opt,name=ack_id,json=ackId,proto3" json:"ack_id,omitempty"` + // Acknowledgement type + AckType string `protobuf:"bytes,5,opt,name=ack_type,json=ackType,proto3" json:"ack_type,omitempty"` +} + +func (m *Failure) Reset() { *m = Failure{} } +func (m *Failure) String() string { return proto.CompactTextString(m) } +func (*Failure) ProtoMessage() {} +func (*Failure) Descriptor() ([]byte, []int) { + return fileDescriptor_c0f2c436fd0f28b7, []int{0} +} +func (m *Failure) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Failure) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Failure.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 *Failure) XXX_Merge(src proto.Message) { + xxx_messageInfo_Failure.Merge(m, src) +} +func (m *Failure) XXX_Size() int { + return m.Size() +} +func (m *Failure) XXX_DiscardUnknown() { + xxx_messageInfo_Failure.DiscardUnknown(m) +} + +var xxx_messageInfo_Failure proto.InternalMessageInfo + +func (m *Failure) GetChannelId() string { + if m != nil { + return m.ChannelId + } + return "" +} + +func (m *Failure) GetAddress() string { + if m != nil { + return m.Address + } + return "" +} + +func (m *Failure) GetId() uint64 { + if m != nil { + return m.Id + } + return 0 +} + +func (m *Failure) GetAckId() uint64 { + if m != nil { + return m.AckId + } + return 0 +} + +func (m *Failure) GetAckType() string { + if m != nil { + return m.AckType + } + return "" +} + +func init() { + proto.RegisterType((*Failure)(nil), "neutron.contractmanager.v1.Failure") +} + +func init() { + proto.RegisterFile("neutron/contractmanager/v1/failure.proto", fileDescriptor_c0f2c436fd0f28b7) +} + +var fileDescriptor_c0f2c436fd0f28b7 = []byte{ + // 245 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0xc8, 0x4b, 0x2d, 0x2d, + 0x29, 0xca, 0xcf, 0xd3, 0x4f, 0xce, 0xcf, 0x2b, 0x29, 0x4a, 0x4c, 0x2e, 0xc9, 0x4d, 0xcc, 0x4b, + 0x4c, 0x4f, 0x2d, 0xd2, 0x2f, 0x33, 0xd4, 0x4f, 0x4b, 0xcc, 0xcc, 0x29, 0x2d, 0x4a, 0xd5, 0x2b, + 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x92, 0x82, 0xaa, 0xd4, 0x43, 0x53, 0xa9, 0x57, 0x66, 0xa8, 0xd4, + 0xc2, 0xc8, 0xc5, 0xee, 0x06, 0x51, 0x2d, 0x24, 0xcb, 0xc5, 0x95, 0x9c, 0x91, 0x98, 0x97, 0x97, + 0x9a, 0x13, 0x9f, 0x99, 0x22, 0xc1, 0xa8, 0xc0, 0xa8, 0xc1, 0x19, 0xc4, 0x09, 0x15, 0xf1, 0x4c, + 0x11, 0x92, 0xe0, 0x62, 0x4f, 0x4c, 0x49, 0x29, 0x4a, 0x2d, 0x2e, 0x96, 0x60, 0x02, 0xcb, 0xc1, + 0xb8, 0x42, 0x7c, 0x5c, 0x4c, 0x99, 0x29, 0x12, 0xcc, 0x0a, 0x8c, 0x1a, 0x2c, 0x41, 0x4c, 0x99, + 0x29, 0x42, 0xa2, 0x5c, 0x6c, 0x89, 0xc9, 0xd9, 0x20, 0x43, 0x58, 0xc0, 0x62, 0xac, 0x89, 0xc9, + 0xd9, 0x9e, 0x29, 0x42, 0x92, 0x5c, 0x1c, 0x20, 0xe1, 0x92, 0xca, 0x82, 0x54, 0x09, 0x56, 0xa8, + 0x09, 0xc9, 0xd9, 0x21, 0x95, 0x05, 0xa9, 0x4e, 0xc1, 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, 0x99, 0x9e, 0x59, 0x92, 0x51, 0x9a, 0xa4, 0x97, 0x9c, 0x9f, 0xab, 0x0f, + 0xf5, 0x87, 0x6e, 0x7e, 0x51, 0x3a, 0x8c, 0xad, 0x5f, 0x81, 0xe1, 0x7f, 0x90, 0xf9, 0xc5, 0xfa, + 0x65, 0x86, 0x49, 0x6c, 0x60, 0xef, 0x1b, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x99, 0x53, 0x32, + 0xf9, 0x2a, 0x01, 0x00, 0x00, +} + +func (m *Failure) 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 *Failure) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Failure) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.AckType) > 0 { + i -= len(m.AckType) + copy(dAtA[i:], m.AckType) + i = encodeVarintFailure(dAtA, i, uint64(len(m.AckType))) + i-- + dAtA[i] = 0x2a + } + if m.AckId != 0 { + i = encodeVarintFailure(dAtA, i, uint64(m.AckId)) + i-- + dAtA[i] = 0x20 + } + if m.Id != 0 { + i = encodeVarintFailure(dAtA, i, uint64(m.Id)) + i-- + dAtA[i] = 0x18 + } + if len(m.Address) > 0 { + i -= len(m.Address) + copy(dAtA[i:], m.Address) + i = encodeVarintFailure(dAtA, i, uint64(len(m.Address))) + i-- + dAtA[i] = 0x12 + } + if len(m.ChannelId) > 0 { + i -= len(m.ChannelId) + copy(dAtA[i:], m.ChannelId) + i = encodeVarintFailure(dAtA, i, uint64(len(m.ChannelId))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func encodeVarintFailure(dAtA []byte, offset int, v uint64) int { + offset -= sovFailure(v) + base := offset + for v >= 1<<7 { + dAtA[offset] = uint8(v&0x7f | 0x80) + v >>= 7 + offset++ + } + dAtA[offset] = uint8(v) + return base +} +func (m *Failure) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.ChannelId) + if l > 0 { + n += 1 + l + sovFailure(uint64(l)) + } + l = len(m.Address) + if l > 0 { + n += 1 + l + sovFailure(uint64(l)) + } + if m.Id != 0 { + n += 1 + sovFailure(uint64(m.Id)) + } + if m.AckId != 0 { + n += 1 + sovFailure(uint64(m.AckId)) + } + l = len(m.AckType) + if l > 0 { + n += 1 + l + sovFailure(uint64(l)) + } + return n +} + +func sovFailure(x uint64) (n int) { + return (math_bits.Len64(x|1) + 6) / 7 +} +func sozFailure(x uint64) (n int) { + return sovFailure(uint64((x << 1) ^ uint64((int64(x) >> 63)))) +} +func (m *Failure) 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 ErrIntOverflowFailure + } + 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: Failure: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: Failure: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ChannelId", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowFailure + } + 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 ErrInvalidLengthFailure + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthFailure + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.ChannelId = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + 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 ErrIntOverflowFailure + } + 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 ErrInvalidLengthFailure + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthFailure + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Address = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 3: + 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 ErrIntOverflowFailure + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Id |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 4: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field AckId", wireType) + } + m.AckId = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowFailure + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.AckId |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 5: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field AckType", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowFailure + } + 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 ErrInvalidLengthFailure + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthFailure + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.AckType = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipFailure(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthFailure + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func skipFailure(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, ErrIntOverflowFailure + } + 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, ErrIntOverflowFailure + } + 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, ErrIntOverflowFailure + } + 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, ErrInvalidLengthFailure + } + iNdEx += length + case 3: + depth++ + case 4: + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupFailure + } + depth-- + case 5: + iNdEx += 4 + default: + return 0, fmt.Errorf("proto: illegal wireType %d", wireType) + } + if iNdEx < 0 { + return 0, ErrInvalidLengthFailure + } + if depth == 0 { + return iNdEx, nil + } + } + return 0, io.ErrUnexpectedEOF +} + +var ( + ErrInvalidLengthFailure = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowFailure = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupFailure = fmt.Errorf("proto: unexpected end of group") +) From 4c25c383a9661a703e5dbbfe9360c4841a3ab22d Mon Sep 17 00:00:00 2001 From: swelf Date: Tue, 22 Aug 2023 12:31:28 +0300 Subject: [PATCH 048/307] sudo call and test rework --- network/hermes/config.toml | 12 +-- x/interchaintxs/keeper/ibc_handlers.go | 33 +++--- x/interchaintxs/keeper/ibc_handlers_test.go | 21 ++-- x/transfer/ibc_handlers.go | 51 ++++------ x/transfer/ibc_handlers_test.go | 105 ++++---------------- 5 files changed, 71 insertions(+), 151 deletions(-) diff --git a/network/hermes/config.toml b/network/hermes/config.toml index 680206388..f7f2418cc 100644 --- a/network/hermes/config.toml +++ b/network/hermes/config.toml @@ -93,7 +93,7 @@ port = 3001 id = 'test-1' rpc_addr = 'http://127.0.0.1:26657' grpc_addr = 'http://127.0.0.1:8090' -websocket_addr = 'ws://127.0.0.1:26657/websocket' +event_source = { mode = 'push', url = 'ws://127.0.0.1:26657/websocket', batch_delay = '200ms' } rpc_timeout = '10s' account_prefix = 'neutron' key_name = 'testkey_1' @@ -101,21 +101,21 @@ store_prefix = 'ibc' default_gas = 100000 max_gas = 3000000 gas_price = { price = 0.0025, denom = 'untrn' } -gas_multiplier = 1.1 +gas_multiplier = 1.5 max_msg_num = 30 max_tx_size = 2097152 clock_drift = '5s' max_block_time = '10s' trusting_period = '14days' +ccv_consumer_chain = true trust_threshold = { numerator = '1', denominator = '3' } -unbonding_period = '20days' address_type = { derivation = 'cosmos' } [[chains]] id = 'test-2' rpc_addr = 'http://127.0.0.1:16657' grpc_addr = 'http://127.0.0.1:9090' -websocket_addr = 'ws://127.0.0.1:16657/websocket' +event_source = { mode = 'push', url = 'ws://127.0.0.1:16657/websocket', batch_delay = '200ms' } rpc_timeout = '10s' account_prefix = 'cosmos' key_name = 'testkey_2' @@ -123,11 +123,11 @@ store_prefix = 'ibc' default_gas = 100000 max_gas = 3000000 gas_price = { price = 0.0025, denom = 'uatom' } -gas_multiplier = 1.1 +gas_multiplier = 1.5 max_msg_num = 30 max_tx_size = 2097152 clock_drift = '5s' max_block_time = '10s' trusting_period = '14days' trust_threshold = { numerator = '1', denominator = '3' } -address_type = { derivation = 'cosmos' } +address_type = { derivation = 'cosmos' } \ No newline at end of file diff --git a/x/interchaintxs/keeper/ibc_handlers.go b/x/interchaintxs/keeper/ibc_handlers.go index 096248786..213334e51 100644 --- a/x/interchaintxs/keeper/ibc_handlers.go +++ b/x/interchaintxs/keeper/ibc_handlers.go @@ -16,11 +16,6 @@ import ( "github.com/neutron-org/neutron/x/interchaintxs/types" ) -const ( - // GasReserve is the amount of gas on the context gas meter we need to reserve in order to add contract failure to keeper - GasReserve = 15000 -) - // HandleAcknowledgement passes the acknowledgement data to the appropriate contract via a Sudo call. func (k *Keeper) HandleAcknowledgement(ctx sdk.Context, packet channeltypes.Packet, acknowledgement []byte, relayer sdk.AccAddress) error { defer telemetry.ModuleMeasureSince(types.ModuleName, time.Now(), LabelHandleAcknowledgment) @@ -39,6 +34,9 @@ func (k *Keeper) HandleAcknowledgement(ctx sdk.Context, packet channeltypes.Pack } cacheCtx, writeFn, newGasMeter := k.createCachedContext(ctx) + // consume all the gas from the cached context + // we call the function this place function because we want to consume all the gas even in case of panic in SudoError/SudoResponse + ctx.GasMeter().ConsumeGas(newGasMeter.Limit(), "consume full gas from cached context") defer k.outOfGasRecovery(ctx, newGasMeter, icaOwner.GetContract(), packet, "ack") k.feeKeeper.DistributeAcknowledgementFee(ctx, relayer, feetypes.NewPacketID(packet.SourcePort, packet.SourceChannel, packet.Sequence)) @@ -59,8 +57,6 @@ func (k *Keeper) HandleAcknowledgement(ctx sdk.Context, packet channeltypes.Pack writeFn() } - // consume all the gas from the cached context - ctx.GasMeter().ConsumeGas(newGasMeter.Limit(), "consume full gas from cached context") return nil } @@ -77,6 +73,9 @@ func (k *Keeper) HandleTimeout(ctx sdk.Context, packet channeltypes.Packet, rela } cacheCtx, writeFn, newGasMeter := k.createCachedContext(ctx) + // consume all the gas from the cached context + // we call the function this place function because we want to consume all the gas even in case of panic in SudoTimeout + ctx.GasMeter().ConsumeGas(newGasMeter.Limit(), "consume full gas from cached context") defer k.outOfGasRecovery(ctx, newGasMeter, icaOwner.GetContract(), packet, "timeout") k.feeKeeper.DistributeTimeoutFee(ctx, relayer, feetypes.NewPacketID(packet.SourcePort, packet.SourceChannel, packet.Sequence)) @@ -89,8 +88,6 @@ func (k *Keeper) HandleTimeout(ctx sdk.Context, packet channeltypes.Packet, rela writeFn() } - // consume all the gas from the cached context - ctx.GasMeter().ConsumeGas(newGasMeter.Limit(), "consume full gas from cached context") return nil } @@ -148,12 +145,16 @@ func (k *Keeper) outOfGasRecovery( // createCachedContext creates a cached context for handling Sudo calls to CosmWasm smart-contracts. // If there is an error during Sudo call, we can safely revert changes made in cached context. -// panics if there is no enough gas for sudoCall + reserve +// panics if there is no enough gas for sudoCall func (k *Keeper) createCachedContext(ctx sdk.Context) (sdk.Context, func(), sdk.GasMeter) { cacheCtx, writeFn := ctx.CacheContext() - + sudoLimit := k.contractManagerKeeper.GetParams(ctx).SudoCallGasLimit - if ctx.GasMeter().GasRemaining() < getGasReserve()+sudoLimit { + // NOTE: not sure that we really need this special check and panic + // with this kind of panic its clear what is going on by error text + // with this check, handle flow is not changed, but we get general panic during + // call ctx.GasMeter().ConsumeGas(newGasMeter.Limit(), "consume full gas from cached context") + if ctx.GasMeter().GasRemaining() < sudoLimit { panic(sdk.ErrorOutOfGas{Descriptor: fmt.Sprintf("%dgas - reserve for sudo call", sudoLimit)}) } @@ -163,11 +164,3 @@ func (k *Keeper) createCachedContext(ctx sdk.Context) (sdk.Context, func(), sdk. return cacheCtx, writeFn, gasMeter } - -// TODO: calculate gas reserve in according to failure ack + packet size -// getGasReserve calculates the gas amount required to -// 1) Save failure ack, in case there is OutOfGas error or a regular error during sudoCall -// 2) Distribute ack fees -func getGasReserve() uint64 { - return GasReserve -} diff --git a/x/interchaintxs/keeper/ibc_handlers_test.go b/x/interchaintxs/keeper/ibc_handlers_test.go index 21e3d9ce4..1096a70b0 100644 --- a/x/interchaintxs/keeper/ibc_handlers_test.go +++ b/x/interchaintxs/keeper/ibc_handlers_test.go @@ -15,7 +15,6 @@ import ( mock_types "github.com/neutron-org/neutron/testutil/mocks/interchaintxs/types" "github.com/neutron-org/neutron/x/contractmanager/types" feetypes "github.com/neutron-org/neutron/x/feerefunder/types" - "github.com/neutron-org/neutron/x/interchaintxs/keeper" ) var ( @@ -92,7 +91,6 @@ func TestHandleAcknowledgement(t *testing.T) { err = icak.HandleAcknowledgement(ctx, p, errAckData, relayerAddress) require.NoError(t, err) require.Empty(t, store.Get(ShouldNotBeWrittenKey)) - // TODO: add test to check gas consumption by AddFailure require.Equal(t, uint64(5000), ctx.GasMeter().GasConsumed()) // success during SudoError @@ -114,18 +112,16 @@ func TestHandleAcknowledgement(t *testing.T) { store := cachedCtx.KVStore(storeKey) store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) cachedCtx.GasMeter().ConsumeGas(7001, "out of gas test") - }).Return(nil, fmt.Errorf("SudoError error")) + }) cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 7000}) cmKeeper.EXPECT().AddContractFailure(ctx, "channel-0", contractAddress.String(), p.GetSequence(), "ack") feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = icak.HandleAcknowledgement(ctx, p, errAckData, relayerAddress) require.NoError(t, err) require.Empty(t, store.Get(ShouldNotBeWrittenKey)) - // TODO: add test to check gas consumption by AddFailure - // TODO: consume sudogas even on out of gas from the contract? - require.Equal(t, uint64(0), ctx.GasMeter().GasConsumed()) // due to out of gas recovery we consume 0 with a SudoError handler + require.Equal(t, uint64(7000), ctx.GasMeter().GasConsumed()) - // check we have ReserveGas reserved and + // check we have SudoCallGasLimit reserved and // check gas consumption from cachedCtx has added to the main ctx // one of the ways to check it - make the check during SudoResponse call ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) @@ -147,10 +143,9 @@ func TestHandleAcknowledgement(t *testing.T) { // not enough gas to reserve, tx aborted ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - lowGasCtx := infCtx.WithGasMeter(sdk.NewGasMeter(keeper.GasReserve + 9000 - 1)) + lowGasCtx := infCtx.WithGasMeter(sdk.NewGasMeter(9000 - 1)) cmKeeper.EXPECT().GetParams(lowGasCtx).Return(types.Params{SudoCallGasLimit: 9000}) require.PanicsWithValue(t, sdk.ErrorOutOfGas{Descriptor: "9000gas - reserve for sudo call"}, func() { icak.HandleAcknowledgement(lowGasCtx, p, resAckData, relayerAddress) }) //nolint:errcheck // this is a panic test - require.Empty(t, store.Get(ShouldNotBeWrittenKey)) } func TestHandleTimeout(t *testing.T) { @@ -216,9 +211,15 @@ func TestHandleTimeout(t *testing.T) { cmKeeper.EXPECT().AddContractFailure(ctx, "channel-0", contractAddress.String(), p.GetSequence(), "timeout") feeKeeper.EXPECT().DistributeTimeoutFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = icak.HandleTimeout(ctx, p, relayerAddress) - require.Equal(t, uint64(0), ctx.GasMeter().GasConsumed()) + require.Equal(t, uint64(6000), ctx.GasMeter().GasConsumed()) require.NoError(t, err) require.Empty(t, store.Get(ShouldNotBeWrittenKey)) + + // not enough gas to reserve, tx aborted + ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) + lowGasCtx := infCtx.WithGasMeter(sdk.NewGasMeter(9000 - 1)) + cmKeeper.EXPECT().GetParams(lowGasCtx).Return(types.Params{SudoCallGasLimit: 9000}) + require.PanicsWithValue(t, sdk.ErrorOutOfGas{Descriptor: "9000gas - reserve for sudo call"}, func() { icak.HandleTimeout(lowGasCtx, p, relayerAddress) }) //nolint:errcheck // this is a panic test } func TestHandleChanOpenAck(t *testing.T) { diff --git a/x/transfer/ibc_handlers.go b/x/transfer/ibc_handlers.go index d4e96d6e8..939c788fa 100644 --- a/x/transfer/ibc_handlers.go +++ b/x/transfer/ibc_handlers.go @@ -13,14 +13,8 @@ import ( "github.com/neutron-org/neutron/x/interchaintxs/types" ) -const ( - // We need to reserve this amount of gas on the context gas meter in order to add contract failure to keeper - GasReserve = 15000 -) - // HandleAcknowledgement passes the acknowledgement data to the appropriate contract via a Sudo call. func (im IBCModule) HandleAcknowledgement(ctx sdk.Context, packet channeltypes.Packet, acknowledgement []byte, relayer sdk.AccAddress) error { - // TODO: why do ever need whole logic for non contract, why dont exit early var ack channeltypes.Acknowledgement if err := channeltypes.SubModuleCdc.UnmarshalJSON(acknowledgement, &ack); err != nil { return errors.Wrapf(sdkerrors.ErrUnknownRequest, "cannot unmarshal ICS-20 transfer packet acknowledgement: %v", err) @@ -34,10 +28,19 @@ func (im IBCModule) HandleAcknowledgement(ctx sdk.Context, packet channeltypes.P if err != nil { return errors.Wrapf(sdkerrors.ErrInvalidAddress, "failed to decode address from bech32: %v", err) } + if !im.ContractManagerKeeper.HasContractInfo(ctx, senderAddress) { + return nil + } cacheCtx, writeFn, newGasMeter := im.createCachedContext(ctx) + // consume all the gas from the cached context + // we call the function this place function because we want to consume all the gas even in case of panic in SudoResponse/SudoError + ctx.GasMeter().ConsumeGas(newGasMeter.Limit(), "consume full gas from cached context") defer im.outOfGasRecovery(ctx, newGasMeter, senderAddress, packet, data, "ack") + // distribute fee + im.wrappedKeeper.FeeKeeper.DistributeAcknowledgementFee(ctx, relayer, feetypes.NewPacketID(packet.SourcePort, packet.SourceChannel, packet.Sequence)) + if ack.Success() { _, err = im.ContractManagerKeeper.SudoResponse(cacheCtx, senderAddress, packet, ack.GetResult()) } else { @@ -56,13 +59,6 @@ func (im IBCModule) HandleAcknowledgement(ctx sdk.Context, packet channeltypes.P im.keeper.Logger(ctx).Debug("acknowledgement received", "Packet data", data, "CheckTx", ctx.IsCheckTx()) - // distribute fees only if the sender is a contract - if im.ContractManagerKeeper.HasContractInfo(ctx, senderAddress) { - im.wrappedKeeper.FeeKeeper.DistributeAcknowledgementFee(ctx, relayer, feetypes.NewPacketID(packet.SourcePort, packet.SourceChannel, packet.Sequence)) - // consume all the gas from the cached context - ctx.GasMeter().ConsumeGas(newGasMeter.Limit(), "consume full gas from cached context") - } - return nil } @@ -79,10 +75,19 @@ func (im IBCModule) HandleTimeout(ctx sdk.Context, packet channeltypes.Packet, r if err != nil { return errors.Wrapf(sdkerrors.ErrInvalidAddress, "failed to decode address from bech32: %v", err) } + if !im.ContractManagerKeeper.HasContractInfo(ctx, senderAddress) { + return nil + } cacheCtx, writeFn, newGasMeter := im.createCachedContext(ctx) + // consume all the gas from the cached context + // we call the function this place function because we want to consume all the gas even in case of panic in SudoTimeout + ctx.GasMeter().ConsumeGas(newGasMeter.Limit(), "consume full gas from cached context") defer im.outOfGasRecovery(ctx, newGasMeter, senderAddress, packet, data, "timeout") + // distribute fee + im.wrappedKeeper.FeeKeeper.DistributeTimeoutFee(ctx, relayer, feetypes.NewPacketID(packet.SourcePort, packet.SourceChannel, packet.Sequence)) + _, err = im.ContractManagerKeeper.SudoTimeout(cacheCtx, senderAddress, packet) if err != nil { im.ContractManagerKeeper.AddContractFailure(ctx, packet.SourceChannel, senderAddress.String(), packet.GetSequence(), "timeout") @@ -91,13 +96,6 @@ func (im IBCModule) HandleTimeout(ctx sdk.Context, packet channeltypes.Packet, r writeFn() } - // distribute fee only if the sender is a contract - if im.ContractManagerKeeper.HasContractInfo(ctx, senderAddress) { - im.wrappedKeeper.FeeKeeper.DistributeTimeoutFee(ctx, relayer, feetypes.NewPacketID(packet.SourcePort, packet.SourceChannel, packet.Sequence)) - // consume all the gas from the cached context - ctx.GasMeter().ConsumeGas(newGasMeter.Limit(), "consume full gas from cached context") - } - return nil } @@ -117,18 +115,17 @@ func (im IBCModule) outOfGasRecovery( im.keeper.Logger(ctx).Debug("Out of gas", "Gas meter", gasMeter.String(), "Packet data", data) im.ContractManagerKeeper.AddContractFailure(ctx, packet.SourceChannel, senderAddress.String(), packet.GetSequence(), failureType) - // FIXME: add distribution call } } // createCachedContext creates a cached context for handling Sudo calls to CosmWasm smart-contracts. // If there is an error during Sudo call, we can safely revert changes made in cached context. -// panics if there is no enough gas for sudoCall + reserve +// panics if there is no enough gas for sudoCall func (im *IBCModule) createCachedContext(ctx sdk.Context) (sdk.Context, func(), sdk.GasMeter) { cacheCtx, writeFn := ctx.CacheContext() sudoLimit := im.ContractManagerKeeper.GetParams(ctx).SudoCallGasLimit - if ctx.GasMeter().GasRemaining() < getGasReserve()+sudoLimit { + if ctx.GasMeter().GasRemaining() < sudoLimit { panic(sdk.ErrorOutOfGas{Descriptor: fmt.Sprintf("%dgas - reserve for sudo call", sudoLimit)}) } @@ -138,11 +135,3 @@ func (im *IBCModule) createCachedContext(ctx sdk.Context) (sdk.Context, func(), return cacheCtx, writeFn, gasMeter } - -// TODO: calculate gas reserve in according to failure ack + packet size -// getGasReserve calculates the gas amount required to -// 1) Save failure ack, in case there is OutOfGas error or a regular error during sudoCall -// 2) Distribute ack fees -func getGasReserve() uint64 { - return GasReserve -} diff --git a/x/transfer/ibc_handlers_test.go b/x/transfer/ibc_handlers_test.go index 8e8fa3bb4..5f82e3789 100644 --- a/x/transfer/ibc_handlers_test.go +++ b/x/transfer/ibc_handlers_test.go @@ -94,14 +94,8 @@ func TestHandleAcknowledgement(t *testing.T) { require.NoError(t, err) p.Data = tokenBz - // error during SudoResponse non contract + //// error during SudoResponse non contract ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - cmKeeper.EXPECT().SudoResponse(gomock.AssignableToTypeOf(ctx), contractAddress, p, resACK.GetResult()).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, msg []byte) { - store := cachedCtx.KVStore(storeKey) - store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) // consumes 2990 - }).Return(nil, fmt.Errorf("SudoResponse error")) - cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 4000}) - cmKeeper.EXPECT().AddContractFailure(ctx, "channel-0", contractAddress.String(), p.GetSequence(), "ack") cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(false) err = txModule.HandleAcknowledgement(ctx, p, resAckData, relayerAddress) require.NoError(t, err) @@ -125,14 +119,7 @@ func TestHandleAcknowledgement(t *testing.T) { // error during SudoError non contract ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - cmKeeper.EXPECT().SudoError(gomock.AssignableToTypeOf(ctx), contractAddress, p, errACK.GetError()).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, msg string) { - store := cachedCtx.KVStore(storeKey) - store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) // consumes 2990 - }).Return(nil, fmt.Errorf("SudoError error")) - cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 6000}) - cmKeeper.EXPECT().AddContractFailure(ctx, "channel-0", contractAddress.String(), p.GetSequence(), "ack") cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(false) - // feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = txModule.HandleAcknowledgement(ctx, p, errAckData, relayerAddress) require.NoError(t, err) require.Empty(t, store.Get(ShouldNotBeWrittenKey)) @@ -155,15 +142,9 @@ func TestHandleAcknowledgement(t *testing.T) { // success during SudoError non contract ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - cmKeeper.EXPECT().SudoError(gomock.AssignableToTypeOf(ctx), contractAddress, p, errACK.GetError()).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, err string) { - store := cachedCtx.KVStore(storeKey) - store.Set(ShouldBeWrittenKey("sudoerror_non_contract"), ShouldBeWritten) - }).Return(nil, nil) - cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 8000}) cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(false) err = txModule.HandleAcknowledgement(ctx, p, errAckData, relayerAddress) require.NoError(t, err) - require.Equal(t, ShouldBeWritten, store.Get(ShouldBeWrittenKey("sudoerror_non_contract"))) require.Equal(t, uint64(0), ctx.GasMeter().GasConsumed()) // success during SudoError contract @@ -182,18 +163,7 @@ func TestHandleAcknowledgement(t *testing.T) { // recoverable out of gas during SudoError non contract ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - cmKeeper.EXPECT().SudoError(gomock.AssignableToTypeOf(ctx), contractAddress, p, errACK.GetError()).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, error string) { - store := cachedCtx.KVStore(storeKey) - store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) - cachedCtx.GasMeter().ConsumeGas(10001, "out of gas test") - }).Return(nil, fmt.Errorf("SudoError error")) - cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 10000}) - cmKeeper.EXPECT().AddContractFailure(ctx, "channel-0", contractAddress.String(), p.GetSequence(), "ack") - // FIXME: fix distribution during outofgas - // cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(false) - err = txModule.HandleAcknowledgement(ctx, p, errAckData, relayerAddress) require.NoError(t, err) - require.Empty(t, store.Get(ShouldNotBeWrittenKey)) require.Equal(t, uint64(0), ctx.GasMeter().GasConsumed()) // recoverable out of gas during SudoError contract @@ -206,38 +176,26 @@ func TestHandleAcknowledgement(t *testing.T) { cmKeeper.EXPECT().AddContractFailure(ctx, "channel-0", contractAddress.String(), p.GetSequence(), "ack") cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 11000}) // FIXME: fix distribution during outofgas - // cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) - // feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) + cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) + feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = txModule.HandleAcknowledgement(ctx, p, errAckData, relayerAddress) require.NoError(t, err) require.Empty(t, store.Get(ShouldNotBeWrittenKey)) - require.Equal(t, uint64(0), ctx.GasMeter().GasConsumed()) + require.Equal(t, uint64(11000), ctx.GasMeter().GasConsumed()) // check we have ReserveGas reserved and // check gas consumption from cachedCtx has added to the main ctx // one of the ways to check it - make the check during SudoResponse call // non contract ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - gasReserved := false - cmKeeper.EXPECT().SudoResponse(gomock.AssignableToTypeOf(ctx), contractAddress, p, resACK.GetResult()).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, msg []byte) { - if cachedCtx.GasMeter().Limit() == 12000 { - gasReserved = true - } - store := cachedCtx.KVStore(storeKey) - store.Set(ShouldBeWrittenKey("sudoresponse_non_contract_success"), ShouldBeWritten) - }).Return(nil, nil) - cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 12000}) cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(false) - // feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = txModule.HandleAcknowledgement(ctx, p, resAckData, relayerAddress) require.NoError(t, err) - require.True(t, gasReserved) require.Equal(t, uint64(0), ctx.GasMeter().GasConsumed()) - require.Equal(t, ShouldBeWritten, store.Get(ShouldBeWrittenKey("sudoresponse_non_contract_success"))) // contract ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - gasReserved = false + gasReserved := false cmKeeper.EXPECT().SudoResponse(gomock.AssignableToTypeOf(ctx), contractAddress, p, resACK.GetResult()).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, msg []byte) { if cachedCtx.GasMeter().Limit() == 13000 { gasReserved = true @@ -254,12 +212,11 @@ func TestHandleAcknowledgement(t *testing.T) { require.Equal(t, uint64(13000), ctx.GasMeter().GasConsumed()) require.Equal(t, ShouldBeWritten, store.Get(ShouldBeWrittenKey("sudoresponse_contract_success"))) - // not enough gas to reserve + not enough to make AddContractFailure failure after panic recover + // not enough gas to reserve SudoCallGasLimit + not enough to make AddContractFailure failure after panic recover lowGasCtx := infCtx.WithGasMeter(sdk.NewGasMeter(1000)) cmKeeper.EXPECT().GetParams(lowGasCtx).Return(types.Params{SudoCallGasLimit: 14000}) - // feeKeeper.EXPECT().DistributeAcknowledgementFee(lowGasCtx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) + cmKeeper.EXPECT().HasContractInfo(lowGasCtx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) require.PanicsWithValue(t, sdk.ErrorOutOfGas{Descriptor: "14000gas - reserve for sudo call"}, func() { txModule.HandleAcknowledgement(lowGasCtx, p, resAckData, relayerAddress) }) //nolint:errcheck // this is a test - require.Empty(t, store.Get(ShouldNotBeWrittenKey)) } func TestHandleTimeout(t *testing.T) { @@ -299,8 +256,6 @@ func TestHandleTimeout(t *testing.T) { err = txModule.HandleTimeout(ctx, p, relayerAddress) require.ErrorContains(t, err, "failed to decode address from bech32") - // success non contract - ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) token = transfertypes.FungibleTokenPacketData{ Denom: "stake", Amount: "1000", @@ -310,25 +265,17 @@ func TestHandleTimeout(t *testing.T) { tokenBz, err = ictxtypes.ModuleCdc.MarshalJSON(&token) require.NoError(t, err) p.Data = tokenBz - gasReserved := false - cmKeeper.EXPECT().SudoTimeout(gomock.AssignableToTypeOf(ctx), contractAddress, p).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet) { - if cachedCtx.GasMeter().Limit() == 5000 { - gasReserved = true - } - store := cachedCtx.KVStore(storeKey) - store.Set(ShouldBeWrittenKey("sudotimeout_non_contract_success"), ShouldBeWritten) - }).Return(nil, nil) - cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 5000}) + + // success non contract + ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(false) err = txModule.HandleTimeout(ctx, p, relayerAddress) - require.True(t, gasReserved) require.Equal(t, uint64(0), ctx.GasMeter().GasConsumed()) require.NoError(t, err) - require.Equal(t, ShouldBeWritten, store.Get(ShouldBeWrittenKey("sudotimeout_non_contract_success"))) // success contract ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - gasReserved = false + gasReserved := false cmKeeper.EXPECT().SudoTimeout(gomock.AssignableToTypeOf(ctx), contractAddress, p).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet) { if cachedCtx.GasMeter().Limit() == 5000 { gasReserved = true @@ -347,16 +294,9 @@ func TestHandleTimeout(t *testing.T) { // error during SudoTimeOut non contract ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - cmKeeper.EXPECT().SudoTimeout(gomock.AssignableToTypeOf(ctx), contractAddress, p).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet) { - store := cachedCtx.KVStore(storeKey) - store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) - }).Return(nil, fmt.Errorf("SudoTimeout error")) - cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 6000}) - cmKeeper.EXPECT().AddContractFailure(ctx, "channel-0", contractAddress.String(), p.GetSequence(), "timeout") cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(false) err = txModule.HandleTimeout(ctx, p, relayerAddress) require.NoError(t, err) - require.Empty(t, store.Get(ShouldNotBeWrittenKey)) require.Equal(t, uint64(0), ctx.GasMeter().GasConsumed()) // error during SudoTimeOut contract @@ -376,17 +316,9 @@ func TestHandleTimeout(t *testing.T) { // out of gas during SudoTimeOut non contract ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - cmKeeper.EXPECT().SudoTimeout(gomock.AssignableToTypeOf(ctx), contractAddress, p).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet) { - store := cachedCtx.KVStore(storeKey) - store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) - cachedCtx.GasMeter().ConsumeGas(8001, "out of gas test") - }).Return(nil, fmt.Errorf("SudoTimeout error")) - cmKeeper.EXPECT().AddContractFailure(ctx, "channel-0", contractAddress.String(), p.GetSequence(), "timeout") - cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 8000}) - // cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(false) + cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(false) err = txModule.HandleTimeout(ctx, p, relayerAddress) require.NoError(t, err) - require.Empty(t, store.Get(ShouldNotBeWrittenKey)) require.Equal(t, uint64(0), ctx.GasMeter().GasConsumed()) // out of gas during SudoTimeOut contract @@ -398,11 +330,16 @@ func TestHandleTimeout(t *testing.T) { }).Return(nil, fmt.Errorf("SudoTimeout error")) cmKeeper.EXPECT().AddContractFailure(ctx, "channel-0", contractAddress.String(), p.GetSequence(), "timeout") cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 8000}) - // FIXME: make DistributeTimeoutFee during out of gas - // cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) - // feeKeeper.EXPECT().DistributeTimeoutFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) + cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) + feeKeeper.EXPECT().DistributeTimeoutFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = txModule.HandleTimeout(ctx, p, relayerAddress) require.NoError(t, err) require.Empty(t, store.Get(ShouldNotBeWrittenKey)) - require.Equal(t, uint64(0), ctx.GasMeter().GasConsumed()) + require.Equal(t, uint64(8000), ctx.GasMeter().GasConsumed()) + + // not enough gas to reserve SudoCallGasLimit + not enough to make AddContractFailure failure after panic recover + lowGasCtx := infCtx.WithGasMeter(sdk.NewGasMeter(1000)) + cmKeeper.EXPECT().GetParams(lowGasCtx).Return(types.Params{SudoCallGasLimit: 14000}) + cmKeeper.EXPECT().HasContractInfo(lowGasCtx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) + require.PanicsWithValue(t, sdk.ErrorOutOfGas{Descriptor: "14000gas - reserve for sudo call"}, func() { txModule.HandleTimeout(lowGasCtx, p, relayerAddress) }) //nolint:errcheck // this is a test } From 8d5ea40c705ce085c66384e79f3ca21584e52fc8 Mon Sep 17 00:00:00 2001 From: nhpd Date: Tue, 22 Aug 2023 17:07:38 +0400 Subject: [PATCH 049/307] add interchain suite test --- tests/e2e/rewards_test.go | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 tests/e2e/rewards_test.go diff --git a/tests/e2e/rewards_test.go b/tests/e2e/rewards_test.go new file mode 100644 index 000000000..51b3bcc52 --- /dev/null +++ b/tests/e2e/rewards_test.go @@ -0,0 +1,28 @@ +package e2e + +import ( + "github.com/neutron-org/neutron/testutil" + "github.com/stretchr/testify/suite" + "testing" +) + +type RewardsTestSuite struct { + testutil.IBCConnectionTestSuite +} + +func TestRewards(t *testing.T) { + suite.Run(t, new(RewardsTestSuite)) +} + +func (suite *RewardsTestSuite) TestOnRecvPacketHooks() { + suite.ConfigureTransferChannel() + neutron := suite.GetNeutronZoneApp(suite.ChainA) + + // so we have a connection + suite. + suite.TransferPath.EndpointA.ChannelID + + // we need to make a transaction with non-untrn fees + + // after that check that we transferred fees to the specified address +} From 805576207f819761f2ed424865aba592e8783fd9 Mon Sep 17 00:00:00 2001 From: swelf Date: Tue, 22 Aug 2023 16:34:31 +0300 Subject: [PATCH 050/307] go mod tidy --- go.sum | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/go.sum b/go.sum index ca3af2c87..1f759e18a 100644 --- a/go.sum +++ b/go.sum @@ -807,7 +807,6 @@ github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/u github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= -github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/jsternberg/zap-logfmt v1.0.0/go.mod h1:uvPs/4X51zdkcm5jXl5SYoN+4RK21K8mysFmDaM/h+o= @@ -921,7 +920,6 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= -github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5/go.mod h1:caMODM3PzxT8aQXRPkAt8xlV/e7d7w8GM5g0fa5F0D8= github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae/go.mod h1:qAyveg+e4CE+eKJXWVjKXM4ck2QobLqTDytGJbLLhJg= github.com/mtibben/percent v0.2.1 h1:5gssi8Nqo8QU/r2pynCm+hBQHpkB/uNK7BJCFogWdzs= @@ -942,6 +940,9 @@ github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OS github.com/neilotoole/errgroup v0.1.6/go.mod h1:Q2nLGf+594h0CLBs/Mbg6qOr7GtqDK7C2S41udRnToE= github.com/neutron-org/admin-module v0.0.0-20230705134325-b23404470a1d h1:oexw79znoA0TEo7CGdWHrolbvZqCDD3aI+031CbOq9Y= github.com/neutron-org/admin-module v0.0.0-20230705134325-b23404470a1d/go.mod h1:QuxQ7FJlEAFMRssyEYOrR9ORnYQvBFMTlO8BXny6ntw= +github.com/neutron-org/cosmos-sdk v0.47.5-0.20230808152221-a0e301227957 h1:cl6UqD18qV/QXgT6Yjo2TelfbaOqQGuvL1yX0cWguSs= +github.com/neutron-org/cosmos-sdk v0.47.5-0.20230808152221-a0e301227957/go.mod h1:4xMyIVekAs2OEUz/yh9JwzhLBMk+olM2sxgKuQdlhLg= +github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230808084410-6083b888424e h1:uVJCBWf1vcCYY0pzOA2SCPIZT8WsR8fsOxs57mnJbM4= github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230808084410-6083b888424e/go.mod h1:Oagy36cU49438NzxKG/gmGTG903tiAI7LIUdH7x2qNY= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= From 3a21f420b626ea5bf098b0620931870d335b21a8 Mon Sep 17 00:00:00 2001 From: nhpd Date: Tue, 22 Aug 2023 20:01:42 +0400 Subject: [PATCH 051/307] cleanup --- app/upgrades/nextupgrade/upgrades.go | 4 ++-- x/contractmanager/module.go | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/app/upgrades/nextupgrade/upgrades.go b/app/upgrades/nextupgrade/upgrades.go index ad1c1e387..ebbe74b9b 100644 --- a/app/upgrades/nextupgrade/upgrades.go +++ b/app/upgrades/nextupgrade/upgrades.go @@ -18,8 +18,8 @@ func CreateUpgradeHandler( mm *module.Manager, configurator module.Configurator, keepers *upgrades.UpgradeKeepers, - storeKeys upgrades.StoreKeys, - cdc codec.Codec, + _ upgrades.StoreKeys, + _ codec.Codec, ) upgradetypes.UpgradeHandler { return func(ctx sdk.Context, plan upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) { ctx.Logger().Info("Starting module migrations...") diff --git a/x/contractmanager/module.go b/x/contractmanager/module.go index 9fde1514c..c9f11ba1b 100644 --- a/x/contractmanager/module.go +++ b/x/contractmanager/module.go @@ -156,9 +156,7 @@ func (am AppModule) ExportGenesis(ctx sdk.Context, cdc codec.JSONCodec) json.Raw } // ConsensusVersion is a sequence number for state-breaking change of the module. It should be incremented on each consensus-breaking change introduced by the module. To avoid wrong/empty versions, the initial version should be set to 1 -func (AppModule) ConsensusVersion() uint64 { - return 2 -} +func (AppModule) ConsensusVersion() uint64 { return 2 } // BeginBlock contains the logic that is automatically triggered at the beginning of each block func (am AppModule) BeginBlock(_ sdk.Context, _ abci.RequestBeginBlock) {} From 28e9186db20f53fa4b609e868850bde51f4f0023 Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Wed, 23 Aug 2023 11:38:48 +0400 Subject: [PATCH 052/307] wip --- x/tokenfactory/keeper/keeper.go | 44 +- x/tokenfactory/types/authorityMetadata.pb.go | 20 +- x/tokenfactory/types/before_send.go | 25 + x/tokenfactory/types/codec.go | 20 +- x/tokenfactory/types/constants.go | 5 + x/tokenfactory/types/denoms.go | 33 +- x/tokenfactory/types/denoms_test.go | 117 +- x/tokenfactory/types/errors.go | 24 +- x/tokenfactory/types/events.go | 22 +- x/tokenfactory/types/expected_keepers.go | 23 +- x/tokenfactory/types/genesis.go | 6 +- x/tokenfactory/types/genesis.pb.go | 17 +- x/tokenfactory/types/genesis_test.go | 27 +- x/tokenfactory/types/keys.go | 15 +- x/tokenfactory/types/msgs.go | 219 ++- x/tokenfactory/types/msgs_test.go | 450 +++++ x/tokenfactory/types/params.go | 51 +- x/tokenfactory/types/params.pb.go | 103 +- x/tokenfactory/types/query.pb.go | 547 +++++- x/tokenfactory/types/query.pb.gw.go | 141 +- x/tokenfactory/types/tx.pb.go | 1693 ++++++++++++++++-- 21 files changed, 3056 insertions(+), 546 deletions(-) create mode 100644 x/tokenfactory/types/before_send.go create mode 100644 x/tokenfactory/types/constants.go create mode 100644 x/tokenfactory/types/msgs_test.go diff --git a/x/tokenfactory/keeper/keeper.go b/x/tokenfactory/keeper/keeper.go index 74002c57f..3724efb0c 100644 --- a/x/tokenfactory/keeper/keeper.go +++ b/x/tokenfactory/keeper/keeper.go @@ -3,40 +3,50 @@ package keeper import ( "fmt" - storetypes "github.com/cosmos/cosmos-sdk/store/types" - "github.com/cometbft/cometbft/libs/log" - "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/store/prefix" + storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/neutron-org/neutron/x/tokenfactory/types" - authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" + paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" ) type ( Keeper struct { - cdc codec.Codec - storeKey storetypes.StoreKey - accountKeeper types.AccountKeeper - bankKeeper types.BankKeeper + storeKey storetypes.StoreKey + + paramSpace paramtypes.Subspace + + accountKeeper types.AccountKeeper + bankKeeper types.BankKeeper + contractKeeper types.ContractKeeper + + communityPoolKeeper types.CommunityPoolKeeper } ) // NewKeeper returns a new instance of the x/tokenfactory keeper func NewKeeper( - cdc codec.Codec, storeKey storetypes.StoreKey, + paramSpace paramtypes.Subspace, accountKeeper types.AccountKeeper, bankKeeper types.BankKeeper, + communityPoolKeeper types.CommunityPoolKeeper, ) Keeper { + if !paramSpace.HasKeyTable() { + paramSpace = paramSpace.WithKeyTable(types.ParamKeyTable()) + } + return Keeper{ - cdc: cdc, - storeKey: storeKey, - accountKeeper: accountKeeper, - bankKeeper: bankKeeper, + storeKey: storeKey, + paramSpace: paramSpace, + + accountKeeper: accountKeeper, + bankKeeper: bankKeeper, + communityPoolKeeper: communityPoolKeeper, } } @@ -63,11 +73,15 @@ func (k Keeper) GetCreatorsPrefixStore(ctx sdk.Context) sdk.KVStore { return prefix.NewStore(store, types.GetCreatorsPrefix()) } +// Set the wasm keeper. +func (k *Keeper) SetContractKeeper(contractKeeper types.ContractKeeper) { + k.contractKeeper = contractKeeper +} + // CreateModuleAccount creates a module account with minting and burning capabilities // This account isn't intended to store any coins, // it purely mints and burns them on behalf of the admin of respective denoms, // and sends to the relevant address. func (k Keeper) CreateModuleAccount(ctx sdk.Context) { - moduleAcc := authtypes.NewEmptyModuleAccount(types.ModuleName, authtypes.Minter, authtypes.Burner) - k.accountKeeper.SetModuleAccount(ctx, moduleAcc) + k.accountKeeper.GetModuleAccount(ctx, types.ModuleName) } diff --git a/x/tokenfactory/types/authorityMetadata.pb.go b/x/tokenfactory/types/authorityMetadata.pb.go index 5f0c39198..546b24ead 100644 --- a/x/tokenfactory/types/authorityMetadata.pb.go +++ b/x/tokenfactory/types/authorityMetadata.pb.go @@ -6,8 +6,8 @@ package types import ( fmt "fmt" _ "github.com/cosmos/cosmos-sdk/types" - _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" + _ "github.com/gogo/protobuf/gogoproto" + proto "github.com/gogo/protobuf/proto" io "io" math "math" math_bits "math/bits" @@ -29,7 +29,7 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // permission, but is planned to be extended to the future. type DenomAuthorityMetadata struct { // Can be empty for no admin, or a valid osmosis address - Admin string `protobuf:"bytes,1,opt,name=Admin,proto3" json:"Admin,omitempty" yaml:"admin"` + Admin string `protobuf:"bytes,1,opt,name=admin,proto3" json:"admin,omitempty" yaml:"admin"` } func (m *DenomAuthorityMetadata) Reset() { *m = DenomAuthorityMetadata{} } @@ -89,14 +89,14 @@ var fileDescriptor_99435de88ae175f7 = []byte{ 0x17, 0x92, 0x81, 0xea, 0xd2, 0x43, 0xd6, 0xa5, 0x07, 0xd5, 0x25, 0x25, 0x92, 0x9e, 0x9f, 0x9e, 0x0f, 0x56, 0xa8, 0x0f, 0x62, 0x41, 0xf4, 0x48, 0xc9, 0x25, 0x83, 0x35, 0xe9, 0x27, 0x25, 0x16, 0xa7, 0xc2, 0x2d, 0x48, 0xce, 0xcf, 0xcc, 0x83, 0xc8, 0x2b, 0xb9, 0x71, 0x89, 0xb9, 0xa4, 0xe6, - 0xe5, 0xe7, 0x3a, 0xa2, 0xdb, 0x29, 0xa4, 0xc6, 0xc5, 0xea, 0x98, 0x92, 0x9b, 0x99, 0x27, 0xc1, + 0xe5, 0xe7, 0x3a, 0xa2, 0xdb, 0x29, 0xa4, 0xc6, 0xc5, 0x9a, 0x98, 0x92, 0x9b, 0x99, 0x27, 0xc1, 0xa8, 0xc0, 0xa8, 0xc1, 0xe9, 0x24, 0xf0, 0xe9, 0x9e, 0x3c, 0x4f, 0x65, 0x62, 0x6e, 0x8e, 0x95, - 0x52, 0x22, 0x48, 0x58, 0x29, 0x08, 0x22, 0x6d, 0xc5, 0xf2, 0x62, 0x81, 0x3c, 0xa3, 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, 0x15, 0xa8, 0x81, 0x50, 0x52, 0x59, 0x90, 0x5a, 0x9c, 0xc4, 0x06, 0x76, - 0x9d, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0x08, 0x3a, 0x4a, 0xc1, 0x29, 0x01, 0x00, 0x00, + 0x12, 0x58, 0x58, 0x29, 0x08, 0x22, 0x6d, 0xc5, 0xf2, 0x62, 0x81, 0x3c, 0xa3, 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, 0x3d, 0xa0, 0x9b, 0x93, 0x98, 0x54, 0x0c, 0xe3, 0xe8, 0x97, + 0x19, 0x9a, 0xeb, 0x57, 0xa0, 0x86, 0x44, 0x49, 0x65, 0x41, 0x6a, 0x71, 0x12, 0x1b, 0xd8, 0x89, + 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x2d, 0xa0, 0x40, 0xce, 0x2e, 0x01, 0x00, 0x00, } func (this *DenomAuthorityMetadata) Equal(that interface{}) bool { diff --git a/x/tokenfactory/types/before_send.go b/x/tokenfactory/types/before_send.go new file mode 100644 index 000000000..e816a24e5 --- /dev/null +++ b/x/tokenfactory/types/before_send.go @@ -0,0 +1,25 @@ +package types + +import ( + wasmvmtypes "github.com/CosmWasm/wasmvm/types" +) + +type BlockBeforeSendSudoMsg struct { + BlockBeforeSend BlockBeforeSendMsg `json:"block_before_send,omitempty"` +} + +type TrackBeforeSendSudoMsg struct { + TrackBeforeSend TrackBeforeSendMsg `json:"track_before_send"` +} + +type TrackBeforeSendMsg struct { + From string `json:"from"` + To string `json:"to"` + Amount wasmvmtypes.Coin `json:"amount"` +} + +type BlockBeforeSendMsg struct { + From string `json:"from"` + To string `json:"to"` + Amount wasmvmtypes.Coin `json:"amount"` +} diff --git a/x/tokenfactory/types/codec.go b/x/tokenfactory/types/codec.go index 7b1c1413b..4945c0f1c 100644 --- a/x/tokenfactory/types/codec.go +++ b/x/tokenfactory/types/codec.go @@ -4,6 +4,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" cdctypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" + authzcodec "github.com/cosmos/cosmos-sdk/x/authz/codec" // this line is used by starport scaffolding # 1 "github.com/cosmos/cosmos-sdk/types/msgservice" @@ -13,8 +14,9 @@ func RegisterCodec(cdc *codec.LegacyAmino) { cdc.RegisterConcrete(&MsgCreateDenom{}, "osmosis/tokenfactory/create-denom", nil) cdc.RegisterConcrete(&MsgMint{}, "osmosis/tokenfactory/mint", nil) cdc.RegisterConcrete(&MsgBurn{}, "osmosis/tokenfactory/burn", nil) - // cdc.RegisterConcrete(&MsgForceTransfer{}, "osmosis/tokenfactory/force-transfer", nil) + cdc.RegisterConcrete(&MsgForceTransfer{}, "osmosis/tokenfactory/force-transfer", nil) cdc.RegisterConcrete(&MsgChangeAdmin{}, "osmosis/tokenfactory/change-admin", nil) + cdc.RegisterConcrete(&MsgSetBeforeSendHook{}, "osmosis/tokenfactory/set-beforesend-hook", nil) } func RegisterInterfaces(registry cdctypes.InterfaceRegistry) { @@ -25,8 +27,22 @@ func RegisterInterfaces(registry cdctypes.InterfaceRegistry) { &MsgBurn{}, // &MsgForceTransfer{}, &MsgChangeAdmin{}, + &MsgSetBeforeSendHook{}, ) msgservice.RegisterMsgServiceDesc(registry, &_Msg_serviceDesc) } -var ModuleCdc = codec.NewProtoCodec(cdctypes.NewInterfaceRegistry()) +var ( + amino = codec.NewLegacyAmino() + ModuleCdc = codec.NewProtoCodec(cdctypes.NewInterfaceRegistry()) +) + +func init() { + RegisterCodec(amino) + // Register all Amino interfaces and concrete types on the authz Amino codec so that this can later be + // used to properly serialize MsgGrant and MsgExec instances + sdk.RegisterLegacyAminoCodec(amino) + RegisterCodec(authzcodec.Amino) + + amino.Seal() +} diff --git a/x/tokenfactory/types/constants.go b/x/tokenfactory/types/constants.go new file mode 100644 index 000000000..7cfe7cd30 --- /dev/null +++ b/x/tokenfactory/types/constants.go @@ -0,0 +1,5 @@ +package types + +var ( + TrackBeforeSendGasLimit = uint64(100_000) +) diff --git a/x/tokenfactory/types/denoms.go b/x/tokenfactory/types/denoms.go index 1698c2774..658399856 100644 --- a/x/tokenfactory/types/denoms.go +++ b/x/tokenfactory/types/denoms.go @@ -1,13 +1,10 @@ package types import ( - fmt "fmt" "strings" - "cosmossdk.io/errors" - + errorsmod "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" ) const ( @@ -28,7 +25,7 @@ func GetTokenDenom(creator, subdenom string) (string, error) { if len(subdenom) > MaxSubdenomLength { return "", ErrSubdenomTooLong } - if len(subdenom) > MaxCreatorLength { + if len(creator) > MaxCreatorLength { return "", ErrCreatorTooLong } if strings.Contains(creator, "/") { @@ -41,7 +38,7 @@ func GetTokenDenom(creator, subdenom string) (string, error) { // DeconstructDenom takes a token denom string and verifies that it is a valid // denom of the tokenfactory module, and is of the form `factory/{creator}/{subdenom}` // If valid, it returns the creator address and subdenom -func DeconstructDenom(denom string) (creator, subdenom string, err error) { +func DeconstructDenom(denom string) (creator string, subdenom string, err error) { err = sdk.ValidateDenom(denom) if err != nil { return "", "", err @@ -49,17 +46,17 @@ func DeconstructDenom(denom string) (creator, subdenom string, err error) { strParts := strings.Split(denom, "/") if len(strParts) < 3 { - return "", "", errors.Wrapf(ErrInvalidDenom, "not enough parts of denom %s", denom) + return "", "", errorsmod.Wrapf(ErrInvalidDenom, "not enough parts of denom %s", denom) } if strParts[0] != ModuleDenomPrefix { - return "", "", errors.Wrapf(ErrInvalidDenom, "denom prefix is incorrect. Is: %s. Should be: %s", strParts[0], ModuleDenomPrefix) + return "", "", errorsmod.Wrapf(ErrInvalidDenom, "denom prefix is incorrect. Is: %s. Should be: %s", strParts[0], ModuleDenomPrefix) } creator = strParts[1] - _, err = sdk.AccAddressFromBech32(creator) + creatorAddr, err := sdk.AccAddressFromBech32(creator) if err != nil { - return "", "", errors.Wrapf(ErrInvalidDenom, "Invalid creator address (%s)", err) + return "", "", errorsmod.Wrapf(ErrInvalidDenom, "Invalid creator address (%s)", err) } // Handle the case where a denom has a slash in its subdenom. For example, @@ -67,19 +64,5 @@ func DeconstructDenom(denom string) (creator, subdenom string, err error) { // So we have to join [2:] with a "/" as the delimiter to get back the correct subdenom which should be "atomderivative/sikka" subdenom = strings.Join(strParts[2:], "/") - return creator, subdenom, nil -} - -// NewTokenFactoryDenomMintCoinsRestriction creates and returns a BankMintingRestrictionFn that only allows minting of -// valid tokenfactory denoms -func NewTokenFactoryDenomMintCoinsRestriction() bankkeeper.MintingRestrictionFn { - return func(ctx sdk.Context, coinsToMint sdk.Coins) error { - for _, coin := range coinsToMint { - _, _, err := DeconstructDenom(coin.Denom) - if err != nil { - return fmt.Errorf("does not have permission to mint %s", coin.Denom) - } - } - return nil - } + return creatorAddr.String(), subdenom, nil } diff --git a/x/tokenfactory/types/denoms_test.go b/x/tokenfactory/types/denoms_test.go index 1950dca81..d3f21d28b 100644 --- a/x/tokenfactory/types/denoms_test.go +++ b/x/tokenfactory/types/denoms_test.go @@ -5,55 +5,122 @@ import ( "github.com/stretchr/testify/require" - "github.com/neutron-org/neutron/app" - "github.com/neutron-org/neutron/x/tokenfactory/types" + appparams "github.com/osmosis-labs/osmosis/v17/app/params" + "github.com/osmosis-labs/osmosis/v17/x/tokenfactory/types" ) -func TestDecomposeDenoms(t *testing.T) { - app.GetDefaultConfig() +func TestDeconstructDenom(t *testing.T) { + appparams.SetAddressPrefixes() + for _, tc := range []struct { - desc string - denom string - valid bool + desc string + denom string + expectedSubdenom string + err error }{ { desc: "empty is invalid", denom: "", - valid: false, + err: types.ErrInvalidDenom, }, { - desc: "normal", - denom: "factory/neutron1m9l358xunhhwds0568za49mzhvuxx9ux8xafx2/bitcoin", - valid: true, + desc: "normal", + denom: "factory/osmo1t7egva48prqmzl59x5ngv4zx0dtrwewc9m7z44/bitcoin", + expectedSubdenom: "bitcoin", }, { - desc: "multiple slashes in subdenom", - denom: "factory/neutron1m9l358xunhhwds0568za49mzhvuxx9ux8xafx2/bitcoin/1", - valid: true, + desc: "multiple slashes in subdenom", + denom: "factory/osmo1t7egva48prqmzl59x5ngv4zx0dtrwewc9m7z44/bitcoin/1", + expectedSubdenom: "bitcoin/1", }, { - desc: "no subdenom", - denom: "factory/neutron1m9l358xunhhwds0568za49mzhvuxx9ux8xafx2/", - valid: true, + desc: "no subdenom", + denom: "factory/osmo1t7egva48prqmzl59x5ngv4zx0dtrwewc9m7z44/", + expectedSubdenom: "", }, { desc: "incorrect prefix", - denom: "ibc/neutron1m9l358xunhhwds0568za49mzhvuxx9ux8xafx2/bitcoin", - valid: false, + denom: "ibc/osmo1t7egva48prqmzl59x5ngv4zx0dtrwewc9m7z44/bitcoin", + err: types.ErrInvalidDenom, }, { - desc: "subdenom of only slashes", - denom: "factory/neutron1m9l358xunhhwds0568za49mzhvuxx9ux8xafx2/////", - valid: true, + desc: "subdenom of only slashes", + denom: "factory/osmo1t7egva48prqmzl59x5ngv4zx0dtrwewc9m7z44/////", + expectedSubdenom: "////", }, { desc: "too long name", - denom: "factory/neutron1m9l358xunhhwds0568za49mzhvuxx9ux8xafx2/adsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsf", - valid: false, + denom: "factory/osmo1t7egva48prqmzl59x5ngv4zx0dtrwewc9m7z44/adsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsf", + err: types.ErrInvalidDenom, + }, + } { + t.Run(tc.desc, func(t *testing.T) { + expectedCreator := "osmo1t7egva48prqmzl59x5ngv4zx0dtrwewc9m7z44" + creator, subdenom, err := types.DeconstructDenom(tc.denom) + if tc.err != nil { + require.ErrorContains(t, err, tc.err.Error()) + } else { + require.NoError(t, err) + require.Equal(t, expectedCreator, creator) + require.Equal(t, tc.expectedSubdenom, subdenom) + } + }) + } +} + +func TestGetTokenDenom(t *testing.T) { + appparams.SetAddressPrefixes() + for _, tc := range []struct { + desc string + creator string + subdenom string + valid bool + }{ + { + desc: "normal", + creator: "osmo1t7egva48prqmzl59x5ngv4zx0dtrwewc9m7z44", + subdenom: "bitcoin", + valid: true, + }, + { + desc: "multiple slashes in subdenom", + creator: "osmo1t7egva48prqmzl59x5ngv4zx0dtrwewc9m7z44", + subdenom: "bitcoin/1", + valid: true, + }, + { + desc: "no subdenom", + creator: "osmo1t7egva48prqmzl59x5ngv4zx0dtrwewc9m7z44", + subdenom: "", + valid: true, + }, + { + desc: "subdenom of only slashes", + creator: "osmo1t7egva48prqmzl59x5ngv4zx0dtrwewc9m7z44", + subdenom: "/////", + valid: true, + }, + { + desc: "too long name", + creator: "osmo1t7egva48prqmzl59x5ngv4zx0dtrwewc9m7z44", + subdenom: "adsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsf", + valid: false, + }, + { + desc: "subdenom is exactly max length", + creator: "osmo1t7egva48prqmzl59x5ngv4zx0dtrwewc9m7z44", + subdenom: "bitcoinfsadfsdfeadfsafwefsefsefsdfsdafasefsf", + valid: true, + }, + { + desc: "creator is exactly max length", + creator: "osmo1t7egva48prqmzl59x5ngv4zx0dtrwewc9m7z44jhgjhgkhjklhkjhkjhgjhgjgjghelugt", + subdenom: "bitcoin", + valid: true, }, } { t.Run(tc.desc, func(t *testing.T) { - _, _, err := types.DeconstructDenom(tc.denom) + _, err := types.GetTokenDenom(tc.creator, tc.subdenom) if tc.valid { require.NoError(t, err) } else { diff --git a/x/tokenfactory/types/errors.go b/x/tokenfactory/types/errors.go index ef46d16ca..aa78ca24a 100644 --- a/x/tokenfactory/types/errors.go +++ b/x/tokenfactory/types/errors.go @@ -5,20 +5,20 @@ package types import ( fmt "fmt" - "cosmossdk.io/errors" + errorsmod "cosmossdk.io/errors" ) // x/tokenfactory module sentinel errors var ( - ErrDenomExists = errors.Register(ModuleName, 2, "attempting to create a denom that already exists (has bank metadata)") - ErrUnauthorized = errors.Register(ModuleName, 3, "unauthorized account") - ErrInvalidDenom = errors.Register(ModuleName, 4, "invalid denom") - ErrInvalidCreator = errors.Register(ModuleName, 5, "invalid creator") - ErrInvalidAuthorityMetadata = errors.Register(ModuleName, 6, "invalid authority metadata") - ErrInvalidGenesis = errors.Register(ModuleName, 7, "invalid genesis") - ErrSubdenomTooLong = errors.Register(ModuleName, 8, fmt.Sprintf("subdenom too long, max length is %d bytes", MaxSubdenomLength)) - ErrCreatorTooLong = errors.Register(ModuleName, 9, fmt.Sprintf("creator too long, max length is %d bytes", MaxCreatorLength)) - ErrDenomDoesNotExist = errors.Register(ModuleName, 10, "denom does not exist") - ErrUnableToCharge = errors.Register(ModuleName, 11, "unable to charge for denom creation") - ErrTokenDenom = errors.Register(ModuleName, 13, "wrong token denom") + ErrDenomExists = errorsmod.Register(ModuleName, 2, "attempting to create a denom that already exists (has bank metadata)") + ErrUnauthorized = errorsmod.Register(ModuleName, 3, "unauthorized account") + ErrInvalidDenom = errorsmod.Register(ModuleName, 4, "invalid denom") + ErrInvalidCreator = errorsmod.Register(ModuleName, 5, "invalid creator") + ErrInvalidAuthorityMetadata = errorsmod.Register(ModuleName, 6, "invalid authority metadata") + ErrInvalidGenesis = errorsmod.Register(ModuleName, 7, "invalid genesis") + ErrSubdenomTooLong = errorsmod.Register(ModuleName, 8, fmt.Sprintf("subdenom too long, max length is %d bytes", MaxSubdenomLength)) + ErrCreatorTooLong = errorsmod.Register(ModuleName, 9, fmt.Sprintf("creator too long, max length is %d bytes", MaxCreatorLength)) + ErrDenomDoesNotExist = errorsmod.Register(ModuleName, 10, "denom does not exist") + ErrBurnFromModuleAccount = errorsmod.Register(ModuleName, 11, "burning from Module Account is not allowed") + ErrTrackBeforeSendOutOfGas = errorsmod.Register(ModuleName, 12, "gas meter hit maximum limit") ) diff --git a/x/tokenfactory/types/events.go b/x/tokenfactory/types/events.go index 08666118b..0ccec062f 100644 --- a/x/tokenfactory/types/events.go +++ b/x/tokenfactory/types/events.go @@ -2,14 +2,16 @@ package types // event types const ( - AttributeAmount = "amount" - AttributeCreator = "creator" - AttributeSubdenom = "subdenom" - AttributeNewTokenDenom = "new_token_denom" //nolint:all - AttributeMintToAddress = "mint_to_address" - AttributeBurnFromAddress = "burn_from_address" - AttributeTransferFromAddress = "transfer_from_address" - AttributeTransferToAddress = "transfer_to_address" - AttributeDenom = "denom" - AttributeNewAdmin = "new_admin" + AttributeAmount = "amount" + AttributeCreator = "creator" + AttributeSubdenom = "subdenom" + AttributeNewTokenDenom = "new_token_denom" + AttributeMintToAddress = "mint_to_address" + AttributeBurnFromAddress = "burn_from_address" + AttributeTransferFromAddress = "transfer_from_address" + AttributeTransferToAddress = "transfer_to_address" + AttributeDenom = "denom" + AttributeNewAdmin = "new_admin" + AttributeDenomMetadata = "denom_metadata" + AttributeBeforeSendHookAddress = "before_send_hook_address" ) diff --git a/x/tokenfactory/types/expected_keepers.go b/x/tokenfactory/types/expected_keepers.go index b2c359711..5c3a1491c 100644 --- a/x/tokenfactory/types/expected_keepers.go +++ b/x/tokenfactory/types/expected_keepers.go @@ -15,22 +15,29 @@ type BankKeeper interface { SendCoinsFromModuleToAccount(ctx sdk.Context, senderModule string, recipientAddr sdk.AccAddress, amt sdk.Coins) error SendCoinsFromAccountToModule(ctx sdk.Context, senderAddr sdk.AccAddress, recipientModule string, amt sdk.Coins) error - DelegateCoinsFromAccountToModule(ctx sdk.Context, senderAddr sdk.AccAddress, recipientModule string, amt sdk.Coins) error - UndelegateCoinsFromModuleToAccount(ctx sdk.Context, senderModule string, recipientAddr sdk.AccAddress, amt sdk.Coins) error MintCoins(ctx sdk.Context, moduleName string, amt sdk.Coins) error BurnCoins(ctx sdk.Context, moduleName string, amt sdk.Coins) error - SendCoins(ctx sdk.Context, fromAddr, toAddr sdk.AccAddress, amt sdk.Coins) error - GetAllBalances(ctx sdk.Context, addr sdk.AccAddress) sdk.Coins + SendCoins(ctx sdk.Context, fromAddr sdk.AccAddress, toAddr sdk.AccAddress, amt sdk.Coins) error + HasBalance(ctx sdk.Context, addr sdk.AccAddress, amt sdk.Coin) bool } type AccountKeeper interface { - GetModuleAddress(name string) sdk.AccAddress - SetModuleAccount(ctx sdk.Context, macc authtypes.ModuleAccountI) GetAccount(sdk.Context, sdk.AccAddress) authtypes.AccountI + GetModuleAccount(ctx sdk.Context, moduleName string) authtypes.ModuleAccountI } -// DistrKeeper defines the contract needed to be fulfilled for distribution keeper. -type DistrKeeper interface { +// BankHooks event hooks +type BankHooks interface { + TrackBeforeSend(ctx sdk.Context, from, to sdk.AccAddress, amount sdk.Coins) // Must be before any send is executed + BlockBeforeSend(ctx sdk.Context, from, to sdk.AccAddress, amount sdk.Coins) error // Must be before any send is executed +} + +// CommunityPoolKeeper defines the contract needed to be fulfilled for community pool interactions. +type CommunityPoolKeeper interface { FundCommunityPool(ctx sdk.Context, amount sdk.Coins, sender sdk.AccAddress) error } + +type ContractKeeper interface { + Sudo(ctx sdk.Context, contractAddress sdk.AccAddress, msg []byte) ([]byte, error) +} diff --git a/x/tokenfactory/types/genesis.go b/x/tokenfactory/types/genesis.go index 3c4bdb6da..aef9370cc 100644 --- a/x/tokenfactory/types/genesis.go +++ b/x/tokenfactory/types/genesis.go @@ -1,7 +1,7 @@ package types import ( - "cosmossdk.io/errors" + errorsmod "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" ) @@ -30,7 +30,7 @@ func (gs GenesisState) Validate() error { for _, denom := range gs.GetFactoryDenoms() { if seenDenoms[denom.GetDenom()] { - return errors.Wrapf(ErrInvalidGenesis, "duplicate denom: %s", denom.GetDenom()) + return errorsmod.Wrapf(ErrInvalidGenesis, "duplicate denom: %s", denom.GetDenom()) } seenDenoms[denom.GetDenom()] = true @@ -42,7 +42,7 @@ func (gs GenesisState) Validate() error { if denom.AuthorityMetadata.Admin != "" { _, err = sdk.AccAddressFromBech32(denom.AuthorityMetadata.Admin) if err != nil { - return errors.Wrapf(ErrInvalidAuthorityMetadata, "Invalid admin address (%s)", err) + return errorsmod.Wrapf(ErrInvalidAuthorityMetadata, "Invalid admin address (%s)", err) } } } diff --git a/x/tokenfactory/types/genesis.pb.go b/x/tokenfactory/types/genesis.pb.go index e3471a9ef..2ce6a0384 100644 --- a/x/tokenfactory/types/genesis.pb.go +++ b/x/tokenfactory/types/genesis.pb.go @@ -5,8 +5,8 @@ package types import ( fmt "fmt" - _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" + _ "github.com/gogo/protobuf/gogoproto" + proto "github.com/gogo/protobuf/proto" io "io" math "math" math_bits "math/bits" @@ -77,6 +77,9 @@ func (m *GenesisState) GetFactoryDenoms() []GenesisDenom { return nil } +// GenesisDenom defines a tokenfactory denom that is defined within genesis +// state. The structure contains DenomAuthorityMetadata which defines the +// denom's admin. type GenesisDenom struct { Denom string `protobuf:"bytes,1,opt,name=denom,proto3" json:"denom,omitempty" yaml:"denom"` AuthorityMetadata DenomAuthorityMetadata `protobuf:"bytes,2,opt,name=authority_metadata,json=authorityMetadata,proto3" json:"authority_metadata" yaml:"authority_metadata"` @@ -157,12 +160,12 @@ var fileDescriptor_5749c3f71850298b = []byte{ 0xe0, 0xd3, 0x3d, 0x79, 0x1e, 0x88, 0x49, 0x60, 0x61, 0xa5, 0x20, 0x88, 0xb4, 0x50, 0x1b, 0x23, 0x97, 0x10, 0x3c, 0x18, 0xe3, 0x73, 0xa1, 0xe1, 0x28, 0xc1, 0x04, 0xf6, 0xbb, 0x09, 0x7e, 0xf7, 0x82, 0x6d, 0x72, 0x44, 0x8f, 0x03, 0x27, 0x45, 0xa8, 0xcb, 0x25, 0x21, 0xf6, 0x61, 0x9a, 0xae, - 0x14, 0x24, 0x88, 0x11, 0x73, 0x56, 0x2c, 0x2f, 0x16, 0xc8, 0x33, 0x3a, 0xf9, 0x9e, 0x78, 0x24, + 0x14, 0x24, 0x88, 0x11, 0x73, 0x56, 0x2c, 0x2f, 0x16, 0xc8, 0x33, 0x3a, 0x05, 0x9d, 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, 0x71, 0x7a, 0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, - 0x72, 0x7e, 0xae, 0x7e, 0x5e, 0x6a, 0x69, 0x49, 0x51, 0x7e, 0x9e, 0x6e, 0x7e, 0x51, 0x3a, 0x8c, - 0xad, 0x5f, 0x81, 0x1a, 0xd9, 0x25, 0x95, 0x05, 0xa9, 0xc5, 0x49, 0x6c, 0xe0, 0x48, 0x36, 0x06, - 0x04, 0x00, 0x00, 0xff, 0xff, 0x88, 0xdf, 0xa5, 0xe7, 0xa7, 0x02, 0x00, 0x00, + 0x2c, 0xc7, 0x70, 0xe3, 0xb1, 0x1c, 0x43, 0x94, 0x45, 0x7a, 0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, + 0x72, 0x7e, 0xae, 0x3e, 0xd4, 0x55, 0xba, 0x39, 0x89, 0x49, 0xc5, 0x30, 0x8e, 0x7e, 0x99, 0xa1, + 0xb9, 0x7e, 0x05, 0x6a, 0x8c, 0x97, 0x54, 0x16, 0xa4, 0x16, 0x27, 0xb1, 0x81, 0x63, 0xda, 0x18, + 0x10, 0x00, 0x00, 0xff, 0xff, 0x3e, 0x86, 0xb1, 0xa7, 0xac, 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 5fb4ef794..d9392c26d 100644 --- a/x/tokenfactory/types/genesis_test.go +++ b/x/tokenfactory/types/genesis_test.go @@ -5,13 +5,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/neutron-org/neutron/app" - "github.com/neutron-org/neutron/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v17/x/tokenfactory/types" ) func TestGenesisState_Validate(t *testing.T) { - app.GetDefaultConfig() - for _, tc := range []struct { desc string genState *types.GenesisState @@ -27,9 +24,9 @@ func TestGenesisState_Validate(t *testing.T) { genState: &types.GenesisState{ FactoryDenoms: []types.GenesisDenom{ { - Denom: "factory/neutron1m9l358xunhhwds0568za49mzhvuxx9ux8xafx2/bitcoin", + Denom: "factory/osmo1t7egva48prqmzl59x5ngv4zx0dtrwewc9m7z44/bitcoin", AuthorityMetadata: types.DenomAuthorityMetadata{ - Admin: "neutron1m9l358xunhhwds0568za49mzhvuxx9ux8xafx2", + Admin: "osmo1t7egva48prqmzl59x5ngv4zx0dtrwewc9m7z44", }, }, }, @@ -41,9 +38,9 @@ func TestGenesisState_Validate(t *testing.T) { genState: &types.GenesisState{ FactoryDenoms: []types.GenesisDenom{ { - Denom: "factory/neutron1m9l358xunhhwds0568za49mzhvuxx9ux8xafx2/bitcoin", + Denom: "factory/osmo1t7egva48prqmzl59x5ngv4zx0dtrwewc9m7z44/bitcoin", AuthorityMetadata: types.DenomAuthorityMetadata{ - Admin: "neutron1m9l358xunhhwds0568za49mzhvuxx9ux8xafx2", + Admin: "osmo1ft6e5esdtdegnvcr3djd3ftk4kwpcr6jrx5fj9", }, }, }, @@ -55,7 +52,7 @@ func TestGenesisState_Validate(t *testing.T) { genState: &types.GenesisState{ FactoryDenoms: []types.GenesisDenom{ { - Denom: "factory/neutron1m9l358xunhhwds0568za49mzhvuxx9ux8xafx2/bitcoin", + Denom: "factory/osmo1t7egva48prqmzl59x5ngv4zx0dtrwewc9m7z44/bitcoin", AuthorityMetadata: types.DenomAuthorityMetadata{ Admin: "", }, @@ -69,7 +66,7 @@ func TestGenesisState_Validate(t *testing.T) { genState: &types.GenesisState{ FactoryDenoms: []types.GenesisDenom{ { - Denom: "factory/neutron1m9l358xunhhwds0568za49mzhvuxx9ux8xafx2/bitcoin", + Denom: "factory/osmo1t7egva48prqmzl59x5ngv4zx0dtrwewc9m7z44/bitcoin", }, }, }, @@ -80,7 +77,7 @@ func TestGenesisState_Validate(t *testing.T) { genState: &types.GenesisState{ FactoryDenoms: []types.GenesisDenom{ { - Denom: "factory/neutron1m9l358xunhhwds0568za49mzhvuxx9ux8xafx2/bitcoin", + Denom: "factory/osmo1t7egva48prqmzl59x5ngv4zx0dtrwewc9m7z44/bitcoin", AuthorityMetadata: types.DenomAuthorityMetadata{ Admin: "moose", }, @@ -94,13 +91,13 @@ func TestGenesisState_Validate(t *testing.T) { genState: &types.GenesisState{ FactoryDenoms: []types.GenesisDenom{ { - Denom: "factory/neutron1m9l358xunhhwds0568za49mzhvuxx9ux8xafx2/bitcoin", + Denom: "factory/osmo1t7egva48prqmzl59x5ngv4zx0dtrwewc9m7z44/bitcoin", AuthorityMetadata: types.DenomAuthorityMetadata{ Admin: "", }, }, { - Denom: "factory/neutron1m9l358xunhhwds0568za49mzhvuxx9ux8xafx2/litecoin", + Denom: "factory/osmo1t7egva48prqmzl59x5ngv4zx0dtrwewc9m7z44/litecoin", AuthorityMetadata: types.DenomAuthorityMetadata{ Admin: "", }, @@ -114,13 +111,13 @@ func TestGenesisState_Validate(t *testing.T) { genState: &types.GenesisState{ FactoryDenoms: []types.GenesisDenom{ { - Denom: "factory/neutron1m9l358xunhhwds0568za49mzhvuxx9ux8xafx2/bitcoin", + Denom: "factory/osmo1t7egva48prqmzl59x5ngv4zx0dtrwewc9m7z44/bitcoin", AuthorityMetadata: types.DenomAuthorityMetadata{ Admin: "", }, }, { - Denom: "factory/neutron1m9l358xunhhwds0568za49mzhvuxx9ux8xafx2/bitcoin", + Denom: "factory/osmo1t7egva48prqmzl59x5ngv4zx0dtrwewc9m7z44/bitcoin", AuthorityMetadata: types.DenomAuthorityMetadata{ Admin: "", }, diff --git a/x/tokenfactory/types/keys.go b/x/tokenfactory/types/keys.go index 303966f66..dd2ed9fe4 100644 --- a/x/tokenfactory/types/keys.go +++ b/x/tokenfactory/types/keys.go @@ -22,17 +22,14 @@ const ( ) // KeySeparator is used to combine parts of the keys in the store -const ( - KeySeparator = "|" - prefixParamsKey = iota + 1 -) +const KeySeparator = "|" var ( - DenomAuthorityMetadataKey = "authoritymetadata" - DenomsPrefixKey = "denoms" - CreatorPrefixKey = "creator" - AdminPrefixKey = "admin" - ParamsKey = []byte{prefixParamsKey} + DenomAuthorityMetadataKey = "authoritymetadata" + DenomsPrefixKey = "denoms" + CreatorPrefixKey = "creator" + AdminPrefixKey = "admin" + BeforeSendHookAddressPrefixKey = "beforesendhook" ) // GetDenomPrefixStore returns the store prefix where all the data associated with a specific denom diff --git a/x/tokenfactory/types/msgs.go b/x/tokenfactory/types/msgs.go index ae0a7e057..9ee67c9a5 100644 --- a/x/tokenfactory/types/msgs.go +++ b/x/tokenfactory/types/msgs.go @@ -1,18 +1,21 @@ package types import ( - "cosmossdk.io/errors" + errorsmod "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" ) // constants const ( - TypeMsgCreateDenom = "create_denom" - TypeMsgMint = "mint" - TypeMsgBurn = "burn" - TypeMsgForceTransfer = "force_transfer" - TypeMsgChangeAdmin = "change_admin" + TypeMsgCreateDenom = "create_denom" + TypeMsgMint = "tf_mint" + TypeMsgBurn = "tf_burn" + TypeMsgForceTransfer = "force_transfer" + TypeMsgChangeAdmin = "change_admin" + TypeMsgSetDenomMetadata = "set_denom_metadata" + TypeMsgSetBeforeSendHook = "set_before_send_hook" ) var _ sdk.Msg = &MsgCreateDenom{} @@ -30,12 +33,12 @@ func (m MsgCreateDenom) Type() string { return TypeMsgCreateDenom } func (m MsgCreateDenom) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(m.Sender) if err != nil { - return errors.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid sender address (%s)", err) + return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid sender address (%s)", err) } _, err = GetTokenDenom(m.Sender, m.Subdenom) if err != nil { - return errors.Wrap(ErrInvalidDenom, err.Error()) + return errorsmod.Wrap(ErrInvalidDenom, err.Error()) } return nil @@ -60,16 +63,24 @@ func NewMsgMint(sender string, amount sdk.Coin) *MsgMint { } } +func NewMsgMintTo(sender string, amount sdk.Coin, mintToAddress string) *MsgMint { + return &MsgMint{ + Sender: sender, + Amount: amount, + MintToAddress: mintToAddress, + } +} + func (m MsgMint) Route() string { return RouterKey } func (m MsgMint) Type() string { return TypeMsgMint } func (m MsgMint) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(m.Sender) if err != nil { - return errors.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid sender address (%s)", err) + return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid sender address (%s)", err) } if !m.Amount.IsValid() || m.Amount.Amount.Equal(sdk.ZeroInt()) { - return errors.Wrap(sdkerrors.ErrInvalidCoins, m.Amount.String()) + return errorsmod.Wrap(sdkerrors.ErrInvalidCoins, m.Amount.String()) } return nil @@ -94,16 +105,25 @@ func NewMsgBurn(sender string, amount sdk.Coin) *MsgBurn { } } +// NewMsgBurn creates a message to burn tokens +func NewMsgBurnFrom(sender string, amount sdk.Coin, burnFromAddress string) *MsgBurn { + return &MsgBurn{ + Sender: sender, + Amount: amount, + BurnFromAddress: burnFromAddress, + } +} + func (m MsgBurn) Route() string { return RouterKey } func (m MsgBurn) Type() string { return TypeMsgBurn } func (m MsgBurn) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(m.Sender) if err != nil { - return errors.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid sender address (%s)", err) + return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid sender address (%s)", err) } if !m.Amount.IsValid() || m.Amount.Amount.Equal(sdk.ZeroInt()) { - return errors.Wrap(sdkerrors.ErrInvalidCoins, m.Amount.String()) + return errorsmod.Wrap(sdkerrors.ErrInvalidCoins, m.Amount.String()) } return nil @@ -118,50 +138,50 @@ func (m MsgBurn) GetSigners() []sdk.AccAddress { return []sdk.AccAddress{sender} } -// var _ sdk.Msg = &MsgForceTransfer{} - -// // NewMsgForceTransfer creates a transfer funds from one account to another -// func NewMsgForceTransfer(sender string, amount sdk.Coin, fromAddr, toAddr string) *MsgForceTransfer { -// return &MsgForceTransfer{ -// Sender: sender, -// Amount: amount, -// TransferFromAddress: fromAddr, -// TransferToAddress: toAddr, -// } -// } - -// func (m MsgForceTransfer) Route() string { return RouterKey } -// func (m MsgForceTransfer) Type() string { return TypeMsgForceTransfer } -// func (m MsgForceTransfer) ValidateBasic() error { -// _, err := sdk.AccAddressFromBech32(m.Sender) -// if err != nil { -// return errors.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid sender address (%s)", err) -// } - -// _, err = sdk.AccAddressFromBech32(m.TransferFromAddress) -// if err != nil { -// return errors.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid address (%s)", err) -// } -// _, err = sdk.AccAddressFromBech32(m.TransferToAddress) -// if err != nil { -// return errors.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid address (%s)", err) -// } - -// if !m.Amount.IsValid() { -// return errors.Wrap(sdkerrors.ErrInvalidCoins, m.Amount.String()) -// } - -// return nil -// } - -// func (m MsgForceTransfer) GetSignBytes() []byte { -// return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(&m)) -// } - -// func (m MsgForceTransfer) GetSigners() []sdk.AccAddress { -// sender, _ := sdk.AccAddressFromBech32(m.Sender) -// return []sdk.AccAddress{sender} -// } +var _ sdk.Msg = &MsgForceTransfer{} + +// NewMsgForceTransfer creates a transfer funds from one account to another +func NewMsgForceTransfer(sender string, amount sdk.Coin, fromAddr, toAddr string) *MsgForceTransfer { + return &MsgForceTransfer{ + Sender: sender, + Amount: amount, + TransferFromAddress: fromAddr, + TransferToAddress: toAddr, + } +} + +func (m MsgForceTransfer) Route() string { return RouterKey } +func (m MsgForceTransfer) Type() string { return TypeMsgForceTransfer } +func (m MsgForceTransfer) ValidateBasic() error { + _, err := sdk.AccAddressFromBech32(m.Sender) + if err != nil { + return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid sender address (%s)", err) + } + + _, err = sdk.AccAddressFromBech32(m.TransferFromAddress) + if err != nil { + return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid address (%s)", err) + } + _, err = sdk.AccAddressFromBech32(m.TransferToAddress) + if err != nil { + return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid address (%s)", err) + } + + if !m.Amount.IsValid() { + return errorsmod.Wrap(sdkerrors.ErrInvalidCoins, m.Amount.String()) + } + + return nil +} + +func (m MsgForceTransfer) GetSignBytes() []byte { + return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(&m)) +} + +func (m MsgForceTransfer) GetSigners() []sdk.AccAddress { + sender, _ := sdk.AccAddressFromBech32(m.Sender) + return []sdk.AccAddress{sender} +} var _ sdk.Msg = &MsgChangeAdmin{} @@ -179,12 +199,12 @@ func (m MsgChangeAdmin) Type() string { return TypeMsgChangeAdmin } func (m MsgChangeAdmin) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(m.Sender) if err != nil { - return errors.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid sender address (%s)", err) + return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid sender address (%s)", err) } _, err = sdk.AccAddressFromBech32(m.NewAdmin) if err != nil { - return errors.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid address (%s)", err) + return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid address (%s)", err) } _, _, err = DeconstructDenom(m.Denom) @@ -203,3 +223,86 @@ func (m MsgChangeAdmin) GetSigners() []sdk.AccAddress { sender, _ := sdk.AccAddressFromBech32(m.Sender) return []sdk.AccAddress{sender} } + +var _ sdk.Msg = &MsgSetDenomMetadata{} + +// NewMsgChangeAdmin creates a message to burn tokens +func NewMsgSetDenomMetadata(sender string, metadata banktypes.Metadata) *MsgSetDenomMetadata { + return &MsgSetDenomMetadata{ + Sender: sender, + Metadata: metadata, + } +} + +func (m MsgSetDenomMetadata) Route() string { return RouterKey } +func (m MsgSetDenomMetadata) Type() string { return TypeMsgSetDenomMetadata } +func (m MsgSetDenomMetadata) ValidateBasic() error { + _, err := sdk.AccAddressFromBech32(m.Sender) + if err != nil { + return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid sender address (%s)", err) + } + + err = m.Metadata.Validate() + if err != nil { + return err + } + + _, _, err = DeconstructDenom(m.Metadata.Base) + if err != nil { + return err + } + + return nil +} + +func (m MsgSetDenomMetadata) GetSignBytes() []byte { + return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(&m)) +} + +func (m MsgSetDenomMetadata) GetSigners() []sdk.AccAddress { + sender, _ := sdk.AccAddressFromBech32(m.Sender) + return []sdk.AccAddress{sender} +} + +var _ sdk.Msg = &MsgSetBeforeSendHook{} + +// NewMsgSetBeforeSendHook creates a message to set a new before send hook +func NewMsgSetBeforeSendHook(sender string, denom string, cosmwasmAddress string) *MsgSetBeforeSendHook { + return &MsgSetBeforeSendHook{ + Sender: sender, + Denom: denom, + CosmwasmAddress: cosmwasmAddress, + } +} + +func (m MsgSetBeforeSendHook) Route() string { return RouterKey } +func (m MsgSetBeforeSendHook) Type() string { return TypeMsgSetBeforeSendHook } +func (m MsgSetBeforeSendHook) ValidateBasic() error { + _, err := sdk.AccAddressFromBech32(m.Sender) + if err != nil { + return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid sender address (%s)", err) + } + + if m.CosmwasmAddress != "" { + _, err = sdk.AccAddressFromBech32(m.CosmwasmAddress) + if err != nil { + return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid cosmwasm contract address (%s)", err) + } + } + + _, _, err = DeconstructDenom(m.Denom) + if err != nil { + return ErrInvalidDenom + } + + return nil +} + +func (m MsgSetBeforeSendHook) GetSignBytes() []byte { + return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(&m)) +} + +func (m MsgSetBeforeSendHook) GetSigners() []sdk.AccAddress { + sender, _ := sdk.AccAddressFromBech32(m.Sender) + return []sdk.AccAddress{sender} +} diff --git a/x/tokenfactory/types/msgs_test.go b/x/tokenfactory/types/msgs_test.go new file mode 100644 index 000000000..e8480b58a --- /dev/null +++ b/x/tokenfactory/types/msgs_test.go @@ -0,0 +1,450 @@ +package types_test + +import ( + fmt "fmt" + "testing" + + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/stretchr/testify/require" + + "github.com/osmosis-labs/osmosis/v17/app/apptesting" + "github.com/osmosis-labs/osmosis/v17/x/tokenfactory/types" + + banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" + "github.com/tendermint/tendermint/crypto/ed25519" +) + +// // Test authz serialize and de-serializes for tokenfactory msg. +func TestAuthzMsg(t *testing.T) { + pk1 := ed25519.GenPrivKey().PubKey() + addr1 := sdk.AccAddress(pk1.Address()).String() + coin := sdk.NewCoin("denom", sdk.NewInt(1)) + + testCases := []struct { + name string + msg sdk.Msg + }{ + { + name: "MsgCreateDenom", + msg: &types.MsgCreateDenom{ + Sender: addr1, + Subdenom: "valoper1xyz", + }, + }, + { + name: "MsgBurn", + msg: &types.MsgBurn{ + Sender: addr1, + Amount: coin, + }, + }, + { + name: "MsgMint", + msg: &types.MsgMint{ + Sender: addr1, + Amount: coin, + }, + }, + { + name: "MsgChangeAdmin", + msg: &types.MsgChangeAdmin{ + Sender: addr1, + Denom: "denom", + NewAdmin: "osmo1q8tq5qhrhw6t970egemuuwywhlhpnmdmts6xnu", + }, + }, + } + for _, tc := range testCases { + t.Run(tc.name, func(t *testing.T) { + apptesting.TestMessageAuthzSerialization(t, tc.msg) + }) + } +} + +// TestMsgCreateDenom tests if valid/invalid create denom messages are properly validated/invalidated +func TestMsgCreateDenom(t *testing.T) { + // generate a private/public key pair and get the respective address + pk1 := ed25519.GenPrivKey().PubKey() + addr1 := sdk.AccAddress(pk1.Address()) + + // make a proper createDenom message + createMsg := func(after func(msg types.MsgCreateDenom) types.MsgCreateDenom) types.MsgCreateDenom { + properMsg := *types.NewMsgCreateDenom( + addr1.String(), + "bitcoin", + ) + + return after(properMsg) + } + + // validate createDenom message was created as intended + msg := createMsg(func(msg types.MsgCreateDenom) types.MsgCreateDenom { + return msg + }) + require.Equal(t, msg.Route(), types.RouterKey) + require.Equal(t, msg.Type(), "create_denom") + signers := msg.GetSigners() + require.Equal(t, len(signers), 1) + require.Equal(t, signers[0].String(), addr1.String()) + + tests := []struct { + name string + msg types.MsgCreateDenom + expectPass bool + }{ + { + name: "proper msg", + msg: createMsg(func(msg types.MsgCreateDenom) types.MsgCreateDenom { + return msg + }), + expectPass: true, + }, + { + name: "empty sender", + msg: createMsg(func(msg types.MsgCreateDenom) types.MsgCreateDenom { + msg.Sender = "" + return msg + }), + expectPass: false, + }, + { + name: "invalid subdenom", + msg: createMsg(func(msg types.MsgCreateDenom) types.MsgCreateDenom { + msg.Subdenom = "thissubdenomismuchtoolongasdkfjaasdfdsafsdlkfnmlksadmflksmdlfmlsakmfdsafasdfasdf" + return msg + }), + expectPass: false, + }, + } + + for _, test := range tests { + if test.expectPass { + require.NoError(t, test.msg.ValidateBasic(), "test: %v", test.name) + } else { + require.Error(t, test.msg.ValidateBasic(), "test: %v", test.name) + } + } +} + +// TestMsgMint tests if valid/invalid create denom messages are properly validated/invalidated +func TestMsgMint(t *testing.T) { + // generate a private/public key pair and get the respective address + pk1 := ed25519.GenPrivKey().PubKey() + addr1 := sdk.AccAddress(pk1.Address()) + + // make a proper mint message + createMsg := func(after func(msg types.MsgMint) types.MsgMint) types.MsgMint { + properMsg := *types.NewMsgMint( + addr1.String(), + sdk.NewCoin("bitcoin", sdk.NewInt(500000000)), + ) + + return after(properMsg) + } + + // validate mint message was created as intended + msg := createMsg(func(msg types.MsgMint) types.MsgMint { + return msg + }) + require.Equal(t, msg.Route(), types.RouterKey) + require.Equal(t, msg.Type(), "tf_mint") + signers := msg.GetSigners() + require.Equal(t, len(signers), 1) + require.Equal(t, signers[0].String(), addr1.String()) + + tests := []struct { + name string + msg types.MsgMint + expectPass bool + }{ + { + name: "proper msg", + msg: createMsg(func(msg types.MsgMint) types.MsgMint { + return msg + }), + expectPass: true, + }, + { + name: "empty sender", + msg: createMsg(func(msg types.MsgMint) types.MsgMint { + msg.Sender = "" + return msg + }), + expectPass: false, + }, + { + name: "zero amount", + msg: createMsg(func(msg types.MsgMint) types.MsgMint { + msg.Amount = sdk.NewCoin("bitcoin", sdk.ZeroInt()) + return msg + }), + expectPass: false, + }, + { + name: "negative amount", + msg: createMsg(func(msg types.MsgMint) types.MsgMint { + msg.Amount.Amount = sdk.NewInt(-10000000) + return msg + }), + expectPass: false, + }, + } + + for _, test := range tests { + if test.expectPass { + require.NoError(t, test.msg.ValidateBasic(), "test: %v", test.name) + } else { + require.Error(t, test.msg.ValidateBasic(), "test: %v", test.name) + } + } +} + +// TestMsgBurn tests if valid/invalid create denom messages are properly validated/invalidated +func TestMsgBurn(t *testing.T) { + // generate a private/public key pair and get the respective address + pk1 := ed25519.GenPrivKey().PubKey() + addr1 := sdk.AccAddress(pk1.Address()) + + // make a proper burn message + baseMsg := types.NewMsgBurn( + addr1.String(), + sdk.NewCoin("bitcoin", sdk.NewInt(500000000)), + ) + + // validate burn message was created as intended + require.Equal(t, baseMsg.Route(), types.RouterKey) + require.Equal(t, baseMsg.Type(), "tf_burn") + signers := baseMsg.GetSigners() + require.Equal(t, len(signers), 1) + require.Equal(t, signers[0].String(), addr1.String()) + + tests := []struct { + name string + msg func() *types.MsgBurn + expectPass bool + }{ + { + name: "proper msg", + msg: func() *types.MsgBurn { + msg := baseMsg + return msg + }, + expectPass: true, + }, + { + name: "empty sender", + msg: func() *types.MsgBurn { + msg := baseMsg + msg.Sender = "" + return msg + }, + expectPass: false, + }, + { + name: "zero amount", + msg: func() *types.MsgBurn { + msg := baseMsg + msg.Amount.Amount = sdk.ZeroInt() + return msg + }, + expectPass: false, + }, + { + name: "negative amount", + msg: func() *types.MsgBurn { + msg := baseMsg + msg.Amount.Amount = sdk.NewInt(-10000000) + return msg + }, + expectPass: false, + }, + } + + for _, test := range tests { + if test.expectPass { + require.NoError(t, test.msg().ValidateBasic(), "test: %v", test.name) + } else { + require.Error(t, test.msg().ValidateBasic(), "test: %v", test.name) + } + } +} + +// TestMsgChangeAdmin tests if valid/invalid create denom messages are properly validated/invalidated +func TestMsgChangeAdmin(t *testing.T) { + // generate a private/public key pair and get the respective address + pk1 := ed25519.GenPrivKey().PubKey() + addr1 := sdk.AccAddress(pk1.Address()) + pk2 := ed25519.GenPrivKey().PubKey() + addr2 := sdk.AccAddress(pk2.Address()) + tokenFactoryDenom := fmt.Sprintf("factory/%s/bitcoin", addr1.String()) + + // make a proper changeAdmin message + baseMsg := types.NewMsgChangeAdmin( + addr1.String(), + tokenFactoryDenom, + addr2.String(), + ) + + // validate changeAdmin message was created as intended + require.Equal(t, baseMsg.Route(), types.RouterKey) + require.Equal(t, baseMsg.Type(), "change_admin") + signers := baseMsg.GetSigners() + require.Equal(t, len(signers), 1) + require.Equal(t, signers[0].String(), addr1.String()) + + tests := []struct { + name string + msg func() *types.MsgChangeAdmin + expectPass bool + }{ + { + name: "proper msg", + msg: func() *types.MsgChangeAdmin { + msg := baseMsg + return msg + }, + expectPass: true, + }, + { + name: "empty sender", + msg: func() *types.MsgChangeAdmin { + msg := baseMsg + msg.Sender = "" + return msg + }, + expectPass: false, + }, + { + name: "empty newAdmin", + msg: func() *types.MsgChangeAdmin { + msg := baseMsg + msg.NewAdmin = "" + return msg + }, + expectPass: false, + }, + { + name: "invalid denom", + msg: func() *types.MsgChangeAdmin { + msg := baseMsg + msg.Denom = "bitcoin" + return msg + }, + expectPass: false, + }, + } + + for _, test := range tests { + if test.expectPass { + require.NoError(t, test.msg().ValidateBasic(), "test: %v", test.name) + } else { + require.Error(t, test.msg().ValidateBasic(), "test: %v", test.name) + } + } +} + +// TestMsgSetDenomMetadata tests if valid/invalid create denom messages are properly validated/invalidated +func TestMsgSetDenomMetadata(t *testing.T) { + // generate a private/public key pair and get the respective address + pk1 := ed25519.GenPrivKey().PubKey() + addr1 := sdk.AccAddress(pk1.Address()) + tokenFactoryDenom := fmt.Sprintf("factory/%s/bitcoin", addr1.String()) + denomMetadata := banktypes.Metadata{ + Description: "nakamoto", + DenomUnits: []*banktypes.DenomUnit{ + { + Denom: tokenFactoryDenom, + Exponent: 0, + }, + { + Denom: "sats", + Exponent: 6, + }, + }, + Display: "sats", + Base: tokenFactoryDenom, + Name: "bitcoin", + Symbol: "BTC", + } + invalidDenomMetadata := banktypes.Metadata{ + Description: "nakamoto", + DenomUnits: []*banktypes.DenomUnit{ + { + Denom: "bitcoin", + Exponent: 0, + }, + { + Denom: "sats", + Exponent: 6, + }, + }, + Display: "sats", + Base: "bitcoin", + Name: "bitcoin", + Symbol: "BTC", + } + + // make a proper setDenomMetadata message + baseMsg := types.NewMsgSetDenomMetadata( + addr1.String(), + denomMetadata, + ) + + // validate setDenomMetadata message was created as intended + require.Equal(t, baseMsg.Route(), types.RouterKey) + require.Equal(t, baseMsg.Type(), "set_denom_metadata") + signers := baseMsg.GetSigners() + require.Equal(t, len(signers), 1) + require.Equal(t, signers[0].String(), addr1.String()) + + tests := []struct { + name string + msg func() *types.MsgSetDenomMetadata + expectPass bool + }{ + { + name: "proper msg", + msg: func() *types.MsgSetDenomMetadata { + msg := baseMsg + return msg + }, + expectPass: true, + }, + { + name: "empty sender", + msg: func() *types.MsgSetDenomMetadata { + msg := baseMsg + msg.Sender = "" + return msg + }, + expectPass: false, + }, + { + name: "invalid metadata", + msg: func() *types.MsgSetDenomMetadata { + msg := baseMsg + msg.Metadata.Name = "" + return msg + }, + + expectPass: false, + }, + { + name: "invalid base", + msg: func() *types.MsgSetDenomMetadata { + msg := baseMsg + msg.Metadata = invalidDenomMetadata + return msg + }, + expectPass: false, + }, + } + + for _, test := range tests { + if test.expectPass { + require.NoError(t, test.msg().ValidateBasic(), "test: %v", test.name) + } else { + require.Error(t, test.msg().ValidateBasic(), "test: %v", test.name) + } + } +} diff --git a/x/tokenfactory/types/params.go b/x/tokenfactory/types/params.go index 9bbc18808..09d9cac75 100644 --- a/x/tokenfactory/types/params.go +++ b/x/tokenfactory/types/params.go @@ -1,40 +1,39 @@ package types import ( - fmt "fmt" + "fmt" sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - - "github.com/neutron-org/neutron/app/params" ) // Parameter store keys. var ( - KeyDenomCreationFee = []byte("DenomCreationFee") - DefaultNeutronDenom = params.DefaultDenom - DefaultFeeAmount int64 = 1_000_000 - KeyFeeCollectorAddress = []byte("FeeCollectorAddress") - DefaultFeeCollectorAddress = "" + KeyDenomCreationFee = []byte("DenomCreationFee") + KeyDenomCreationGasConsume = []byte("DenomCreationGasConsume") + + // chosen as an arbitrary large number, less than the max_gas_wanted_per_tx in config. + DefaultCreationGasFee = 1_000_000 ) -// ParamTable for tokenfactory module. +// ParamTable for gamm module. func ParamKeyTable() paramtypes.KeyTable { return paramtypes.NewKeyTable().RegisterParamSet(&Params{}) } -func NewParams(denomCreationFee sdk.Coins, feeCollectorAddress string) Params { +func NewParams(denomCreationFee sdk.Coins, denomCreationGasConsume uint64) Params { return Params{ - DenomCreationFee: denomCreationFee, - FeeCollectorAddress: feeCollectorAddress, + DenomCreationFee: denomCreationFee, + DenomCreationGasConsume: denomCreationGasConsume, } } -// default tokenfactory module parameters. +// default gamm module parameters. func DefaultParams() Params { return Params{ - DenomCreationFee: sdk.NewCoins(sdk.NewInt64Coin(DefaultNeutronDenom, DefaultFeeAmount)), - FeeCollectorAddress: DefaultFeeCollectorAddress, + // For choice, see: https://github.com/osmosis-labs/osmosis/pull/4983 + DenomCreationFee: sdk.NewCoins(), // used to be 10 OSMO at launch. + DenomCreationGasConsume: uint64(DefaultCreationGasFee), } } @@ -44,14 +43,14 @@ func (p Params) Validate() error { return err } - return validateFeeCollectorAddress(p.FeeCollectorAddress) + return nil } // Implements params.ParamSet. func (p *Params) ParamSetPairs() paramtypes.ParamSetPairs { return paramtypes.ParamSetPairs{ paramtypes.NewParamSetPair(KeyDenomCreationFee, &p.DenomCreationFee, validateDenomCreationFee), - paramtypes.NewParamSetPair(KeyFeeCollectorAddress, &p.FeeCollectorAddress, validateFeeCollectorAddress), + paramtypes.NewParamSetPair(KeyDenomCreationGasConsume, &p.DenomCreationGasConsume, validateDenomCreationGasConsume), } } @@ -61,28 +60,18 @@ func validateDenomCreationFee(i interface{}) error { return fmt.Errorf("invalid parameter type: %T", i) } - if err := v.Validate(); err != nil { - return fmt.Errorf("invalid denom creation fee: %+v, %w", i, err) + if v.Validate() != nil { + return fmt.Errorf("invalid denom creation fee: %+v", i) } return nil } -func validateFeeCollectorAddress(i interface{}) error { - v, ok := i.(string) +func validateDenomCreationGasConsume(i interface{}) error { + _, ok := i.(uint64) if !ok { return fmt.Errorf("invalid parameter type: %T", i) } - // Fee collector address might be explicitly empty in test environments - if len(v) == 0 { - return nil - } - - _, err := sdk.AccAddressFromBech32(v) - if err != nil { - return fmt.Errorf("invalid fee collector address: %w", err) - } - return nil } diff --git a/x/tokenfactory/types/params.pb.go b/x/tokenfactory/types/params.pb.go index 3ca6e158d..05037d806 100644 --- a/x/tokenfactory/types/params.pb.go +++ b/x/tokenfactory/types/params.pb.go @@ -8,8 +8,8 @@ import ( _ "github.com/cosmos/cosmos-proto" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" types "github.com/cosmos/cosmos-sdk/types" - _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" + _ "github.com/gogo/protobuf/gogoproto" + proto "github.com/gogo/protobuf/proto" io "io" math "math" math_bits "math/bits" @@ -26,12 +26,17 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package -// Params holds parameters for the tokenfactory module +// Params defines the parameters for the tokenfactory module. type Params struct { - // DenomCreationFee is the fee required to create a new denom using the tokenfactory module + // DenomCreationFee defines the fee to be charged on the creation of a new + // denom. The fee is drawn from the MsgCreateDenom's sender account, and + // transferred to the community pool. DenomCreationFee github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,1,rep,name=denom_creation_fee,json=denomCreationFee,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"denom_creation_fee" yaml:"denom_creation_fee"` - // FeeCollectorAddress is the address where fees collected from denom creation are sent to - FeeCollectorAddress string `protobuf:"bytes,2,opt,name=fee_collector_address,json=feeCollectorAddress,proto3" json:"fee_collector_address,omitempty"` + // DenomCreationGasConsume defines the gas cost for creating a new denom. + // This is intended as a spam deterrence mechanism. + // + // See: https://github.com/CosmWasm/token-factory/issues/11 + DenomCreationGasConsume uint64 `protobuf:"varint,2,opt,name=denom_creation_gas_consume,json=denomCreationGasConsume,proto3" json:"denom_creation_gas_consume,omitempty" yaml:"denom_creation_gas_consume"` } func (m *Params) Reset() { *m = Params{} } @@ -74,11 +79,11 @@ func (m *Params) GetDenomCreationFee() github_com_cosmos_cosmos_sdk_types.Coins return nil } -func (m *Params) GetFeeCollectorAddress() string { +func (m *Params) GetDenomCreationGasConsume() uint64 { if m != nil { - return m.FeeCollectorAddress + return m.DenomCreationGasConsume } - return "" + return 0 } func init() { @@ -90,28 +95,30 @@ func init() { } var fileDescriptor_cc8299d306f3ff47 = []byte{ - // 322 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x91, 0xb1, 0x4e, 0x02, 0x41, - 0x10, 0x86, 0x6f, 0x35, 0x21, 0xf1, 0x6c, 0xcc, 0xa9, 0x09, 0x10, 0xb3, 0x10, 0x2a, 0x2c, 0xb8, - 0x0d, 0xd0, 0xd9, 0x09, 0x89, 0x1d, 0x89, 0xa1, 0xb4, 0xb9, 0xec, 0xdd, 0xcd, 0x9d, 0x17, 0xb8, - 0x1d, 0xb2, 0xbb, 0x18, 0x79, 0x0b, 0x2b, 0x1f, 0xc2, 0x27, 0xa1, 0xa4, 0x31, 0xb1, 0x42, 0x03, - 0x6f, 0xe0, 0x13, 0x18, 0x76, 0x17, 0x83, 0xb1, 0xda, 0x99, 0xfc, 0xff, 0x7c, 0xf3, 0x67, 0xd6, - 0xbf, 0x46, 0x55, 0xa2, 0x2a, 0x14, 0xd3, 0x38, 0x01, 0x91, 0xf1, 0x44, 0xa3, 0x5c, 0xb0, 0xa7, - 0x6e, 0x0c, 0x9a, 0x77, 0xd9, 0x8c, 0x4b, 0x5e, 0xaa, 0x70, 0x26, 0x51, 0x63, 0x70, 0xe5, 0xac, - 0xe1, 0xa1, 0x35, 0x74, 0xd6, 0xfa, 0x45, 0x8e, 0x39, 0x1a, 0x23, 0xdb, 0x55, 0x76, 0xa6, 0x5e, - 0x4b, 0xcc, 0x50, 0x64, 0x05, 0xdb, 0x38, 0x89, 0xda, 0x8e, 0xc5, 0x5c, 0xc1, 0xef, 0xc2, 0x04, - 0x0b, 0x61, 0xf5, 0xd6, 0x3b, 0xf1, 0x2b, 0xf7, 0x66, 0x7f, 0xf0, 0x4a, 0xfc, 0x20, 0x05, 0x81, - 0x65, 0x94, 0x48, 0xe0, 0xba, 0x40, 0x11, 0x65, 0x00, 0x55, 0xd2, 0x3c, 0x6e, 0x9f, 0xf6, 0x6a, - 0xa1, 0xc3, 0xee, 0x40, 0xfb, 0x38, 0xe1, 0x10, 0x0b, 0x31, 0x18, 0x2d, 0xd7, 0x0d, 0xef, 0x7b, - 0xdd, 0xa8, 0x2d, 0x78, 0x39, 0xbd, 0x69, 0xfd, 0x47, 0xb4, 0xde, 0x3e, 0x1b, 0xed, 0xbc, 0xd0, - 0x8f, 0xf3, 0x38, 0x4c, 0xb0, 0x74, 0x01, 0xdd, 0xd3, 0x51, 0xe9, 0x84, 0xe9, 0xc5, 0x0c, 0x94, - 0xa1, 0xa9, 0xf1, 0x99, 0x01, 0x0c, 0xdd, 0xfc, 0x1d, 0x40, 0xd0, 0xf3, 0x2f, 0x33, 0x80, 0x28, - 0xc1, 0xe9, 0x14, 0x76, 0xe7, 0x88, 0x78, 0x9a, 0x4a, 0x50, 0xaa, 0x7a, 0xd4, 0x24, 0xed, 0x93, - 0xf1, 0x79, 0x06, 0x30, 0xdc, 0x6b, 0xb7, 0x56, 0x1a, 0x8c, 0x96, 0x1b, 0x4a, 0x56, 0x1b, 0x4a, - 0xbe, 0x36, 0x94, 0xbc, 0x6c, 0xa9, 0xb7, 0xda, 0x52, 0xef, 0x63, 0x4b, 0xbd, 0x87, 0xfe, 0x41, - 0x12, 0x01, 0x73, 0x2d, 0x51, 0x74, 0x50, 0xe6, 0xfb, 0x9a, 0x3d, 0xff, 0xfd, 0x24, 0x13, 0x2d, - 0xae, 0x98, 0x6b, 0xf5, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x58, 0x8c, 0xda, 0x7f, 0xc9, 0x01, - 0x00, 0x00, + // 355 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0xc1, 0x4e, 0xea, 0x40, + 0x14, 0x86, 0x3b, 0xdc, 0x1b, 0x16, 0xbd, 0x9b, 0x9b, 0xc6, 0x44, 0x20, 0x66, 0x8a, 0x5d, 0xc1, + 0x82, 0x4e, 0x50, 0x13, 0x8d, 0x4b, 0x48, 0x74, 0x45, 0x62, 0x58, 0xba, 0x69, 0x4e, 0xcb, 0x50, + 0x1a, 0x68, 0x0f, 0xe9, 0x0c, 0xc4, 0x3e, 0x82, 0x3b, 0x57, 0x3e, 0x84, 0x4f, 0xc2, 0x92, 0xa5, + 0xab, 0x6a, 0xe0, 0x0d, 0x78, 0x02, 0xc3, 0x74, 0x30, 0xa0, 0xc6, 0xd5, 0xcc, 0xc9, 0xf9, 0xff, + 0x6f, 0xfe, 0x33, 0xc7, 0x6c, 0xa2, 0x88, 0x51, 0x44, 0x82, 0x49, 0x1c, 0xf3, 0x64, 0x08, 0x81, + 0xc4, 0x34, 0x63, 0xf3, 0xb6, 0xcf, 0x25, 0xb4, 0xd9, 0x14, 0x52, 0x88, 0x85, 0x3b, 0x4d, 0x51, + 0xa2, 0x75, 0xa2, 0xa5, 0xee, 0xbe, 0xd4, 0xd5, 0xd2, 0xda, 0x51, 0x88, 0x21, 0x2a, 0x21, 0xdb, + 0xde, 0x0a, 0x4f, 0xed, 0xe2, 0x57, 0x3c, 0xcc, 0xe4, 0x08, 0xd3, 0x48, 0x66, 0x3d, 0x2e, 0x61, + 0x00, 0x12, 0xb4, 0xab, 0x1a, 0x28, 0x9b, 0x57, 0xe0, 0x8a, 0x42, 0xb7, 0x68, 0x51, 0x31, 0x1f, + 0x04, 0xff, 0xe4, 0x04, 0x18, 0x25, 0x45, 0xdf, 0x79, 0x2c, 0x99, 0xe5, 0x3b, 0x95, 0xda, 0x7a, + 0x26, 0xa6, 0x35, 0xe0, 0x09, 0xc6, 0x5e, 0x90, 0x72, 0x90, 0x11, 0x26, 0xde, 0x90, 0xf3, 0x0a, + 0xa9, 0xff, 0x69, 0xfc, 0x3b, 0xab, 0xba, 0x1a, 0xbb, 0x05, 0xed, 0x86, 0x70, 0xbb, 0x18, 0x25, + 0x9d, 0xde, 0x22, 0xb7, 0x8d, 0x4d, 0x6e, 0x57, 0x33, 0x88, 0x27, 0xd7, 0xce, 0x77, 0x84, 0xf3, + 0xf2, 0x66, 0x37, 0xc2, 0x48, 0x8e, 0x66, 0xbe, 0x1b, 0x60, 0xac, 0x03, 0xea, 0xa3, 0x25, 0x06, + 0x63, 0x26, 0xb3, 0x29, 0x17, 0x8a, 0x26, 0xfa, 0xff, 0x15, 0xa0, 0xab, 0xfd, 0x37, 0x9c, 0x5b, + 0x43, 0xb3, 0xf6, 0x05, 0x1a, 0x82, 0xf0, 0x02, 0x4c, 0xc4, 0x2c, 0xe6, 0x95, 0x52, 0x9d, 0x34, + 0xfe, 0x76, 0x9a, 0x8b, 0xdc, 0x26, 0x9b, 0xdc, 0x3e, 0xfd, 0x31, 0xc4, 0x9e, 0xde, 0xe9, 0x1f, + 0x1f, 0x3c, 0x70, 0x0b, 0xa2, 0x5b, 0x74, 0x3a, 0xfd, 0xc5, 0x8a, 0x92, 0xe5, 0x8a, 0x92, 0xf7, + 0x15, 0x25, 0x4f, 0x6b, 0x6a, 0x2c, 0xd7, 0xd4, 0x78, 0x5d, 0x53, 0xe3, 0xfe, 0x6a, 0x2f, 0xbd, + 0xde, 0x50, 0x6b, 0x02, 0xbe, 0xd8, 0x15, 0x6c, 0xde, 0xbe, 0x64, 0x0f, 0x87, 0x4b, 0x53, 0x33, + 0xf9, 0x65, 0xf5, 0xcd, 0xe7, 0x1f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x24, 0x1f, 0x6c, 0xe0, 0x38, + 0x02, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { @@ -134,12 +141,10 @@ func (m *Params) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if len(m.FeeCollectorAddress) > 0 { - i -= len(m.FeeCollectorAddress) - copy(dAtA[i:], m.FeeCollectorAddress) - i = encodeVarintParams(dAtA, i, uint64(len(m.FeeCollectorAddress))) + if m.DenomCreationGasConsume != 0 { + i = encodeVarintParams(dAtA, i, uint64(m.DenomCreationGasConsume)) i-- - dAtA[i] = 0x12 + dAtA[i] = 0x10 } if len(m.DenomCreationFee) > 0 { for iNdEx := len(m.DenomCreationFee) - 1; iNdEx >= 0; iNdEx-- { @@ -181,9 +186,8 @@ func (m *Params) Size() (n int) { n += 1 + l + sovParams(uint64(l)) } } - l = len(m.FeeCollectorAddress) - if l > 0 { - n += 1 + l + sovParams(uint64(l)) + if m.DenomCreationGasConsume != 0 { + n += 1 + sovParams(uint64(m.DenomCreationGasConsume)) } return n } @@ -258,10 +262,10 @@ func (m *Params) Unmarshal(dAtA []byte) error { } iNdEx = postIndex case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field FeeCollectorAddress", wireType) + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field DenomCreationGasConsume", wireType) } - var stringLen uint64 + m.DenomCreationGasConsume = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowParams @@ -271,24 +275,11 @@ func (m *Params) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= uint64(b&0x7F) << shift + m.DenomCreationGasConsume |= 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.FeeCollectorAddress = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipParams(dAtA[iNdEx:]) diff --git a/x/tokenfactory/types/query.pb.go b/x/tokenfactory/types/query.pb.go index bc94c2473..fe5a3f035 100644 --- a/x/tokenfactory/types/query.pb.go +++ b/x/tokenfactory/types/query.pb.go @@ -6,9 +6,10 @@ package types import ( context "context" fmt "fmt" - _ "github.com/cosmos/gogoproto/gogoproto" - grpc1 "github.com/cosmos/gogoproto/grpc" - proto "github.com/cosmos/gogoproto/proto" + _ "github.com/cosmos/cosmos-sdk/types/query" + _ "github.com/gogo/protobuf/gogoproto" + grpc1 "github.com/gogo/protobuf/grpc" + proto "github.com/gogo/protobuf/proto" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" @@ -112,9 +113,10 @@ func (m *QueryParamsResponse) GetParams() Params { return Params{} } +// QueryDenomAuthorityMetadataRequest defines the request structure for the +// DenomAuthorityMetadata gRPC query. type QueryDenomAuthorityMetadataRequest struct { - Creator string `protobuf:"bytes,1,opt,name=creator,proto3" json:"creator,omitempty" yaml:"creator"` - Subdenom string `protobuf:"bytes,2,opt,name=subdenom,proto3" json:"subdenom,omitempty" yaml:"subdenom"` + Denom string `protobuf:"bytes,1,opt,name=denom,proto3" json:"denom,omitempty" yaml:"denom"` } func (m *QueryDenomAuthorityMetadataRequest) Reset() { *m = QueryDenomAuthorityMetadataRequest{} } @@ -150,20 +152,15 @@ func (m *QueryDenomAuthorityMetadataRequest) XXX_DiscardUnknown() { var xxx_messageInfo_QueryDenomAuthorityMetadataRequest proto.InternalMessageInfo -func (m *QueryDenomAuthorityMetadataRequest) GetCreator() string { +func (m *QueryDenomAuthorityMetadataRequest) GetDenom() string { if m != nil { - return m.Creator - } - return "" -} - -func (m *QueryDenomAuthorityMetadataRequest) GetSubdenom() string { - if m != nil { - return m.Subdenom + return m.Denom } return "" } +// QueryDenomAuthorityMetadataResponse defines the response structure for the +// DenomAuthorityMetadata gRPC query. type QueryDenomAuthorityMetadataResponse struct { AuthorityMetadata DenomAuthorityMetadata `protobuf:"bytes,1,opt,name=authority_metadata,json=authorityMetadata,proto3" json:"authority_metadata" yaml:"authority_metadata"` } @@ -208,6 +205,8 @@ func (m *QueryDenomAuthorityMetadataResponse) GetAuthorityMetadata() DenomAuthor return DenomAuthorityMetadata{} } +// QueryDenomsFromCreatorRequest defines the request structure for the +// DenomsFromCreator gRPC query. type QueryDenomsFromCreatorRequest struct { Creator string `protobuf:"bytes,1,opt,name=creator,proto3" json:"creator,omitempty" yaml:"creator"` } @@ -252,6 +251,8 @@ func (m *QueryDenomsFromCreatorRequest) GetCreator() string { return "" } +// QueryDenomsFromCreatorRequest defines the response structure for the +// DenomsFromCreator gRPC query. type QueryDenomsFromCreatorResponse struct { Denoms []string `protobuf:"bytes,1,rep,name=denoms,proto3" json:"denoms,omitempty" yaml:"denoms"` } @@ -296,6 +297,96 @@ func (m *QueryDenomsFromCreatorResponse) GetDenoms() []string { return nil } +type QueryBeforeSendHookAddressRequest struct { + Denom string `protobuf:"bytes,1,opt,name=denom,proto3" json:"denom,omitempty" yaml:"denom"` +} + +func (m *QueryBeforeSendHookAddressRequest) Reset() { *m = QueryBeforeSendHookAddressRequest{} } +func (m *QueryBeforeSendHookAddressRequest) String() string { return proto.CompactTextString(m) } +func (*QueryBeforeSendHookAddressRequest) ProtoMessage() {} +func (*QueryBeforeSendHookAddressRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_6f22013ad0f72e3f, []int{6} +} +func (m *QueryBeforeSendHookAddressRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryBeforeSendHookAddressRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryBeforeSendHookAddressRequest.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 *QueryBeforeSendHookAddressRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryBeforeSendHookAddressRequest.Merge(m, src) +} +func (m *QueryBeforeSendHookAddressRequest) XXX_Size() int { + return m.Size() +} +func (m *QueryBeforeSendHookAddressRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryBeforeSendHookAddressRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryBeforeSendHookAddressRequest proto.InternalMessageInfo + +func (m *QueryBeforeSendHookAddressRequest) GetDenom() string { + if m != nil { + return m.Denom + } + return "" +} + +// QueryBeforeSendHookAddressResponse defines the response structure for the +// DenomBeforeSendHook gRPC query. +type QueryBeforeSendHookAddressResponse struct { + CosmwasmAddress string `protobuf:"bytes,1,opt,name=cosmwasm_address,json=cosmwasmAddress,proto3" json:"cosmwasm_address,omitempty" yaml:"cosmwasm_address"` +} + +func (m *QueryBeforeSendHookAddressResponse) Reset() { *m = QueryBeforeSendHookAddressResponse{} } +func (m *QueryBeforeSendHookAddressResponse) String() string { return proto.CompactTextString(m) } +func (*QueryBeforeSendHookAddressResponse) ProtoMessage() {} +func (*QueryBeforeSendHookAddressResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_6f22013ad0f72e3f, []int{7} +} +func (m *QueryBeforeSendHookAddressResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryBeforeSendHookAddressResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryBeforeSendHookAddressResponse.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 *QueryBeforeSendHookAddressResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryBeforeSendHookAddressResponse.Merge(m, src) +} +func (m *QueryBeforeSendHookAddressResponse) XXX_Size() int { + return m.Size() +} +func (m *QueryBeforeSendHookAddressResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QueryBeforeSendHookAddressResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryBeforeSendHookAddressResponse proto.InternalMessageInfo + +func (m *QueryBeforeSendHookAddressResponse) GetCosmwasmAddress() string { + if m != nil { + return m.CosmwasmAddress + } + return "" +} + func init() { proto.RegisterType((*QueryParamsRequest)(nil), "osmosis.tokenfactory.v1beta1.QueryParamsRequest") proto.RegisterType((*QueryParamsResponse)(nil), "osmosis.tokenfactory.v1beta1.QueryParamsResponse") @@ -303,6 +394,8 @@ func init() { proto.RegisterType((*QueryDenomAuthorityMetadataResponse)(nil), "osmosis.tokenfactory.v1beta1.QueryDenomAuthorityMetadataResponse") proto.RegisterType((*QueryDenomsFromCreatorRequest)(nil), "osmosis.tokenfactory.v1beta1.QueryDenomsFromCreatorRequest") proto.RegisterType((*QueryDenomsFromCreatorResponse)(nil), "osmosis.tokenfactory.v1beta1.QueryDenomsFromCreatorResponse") + proto.RegisterType((*QueryBeforeSendHookAddressRequest)(nil), "osmosis.tokenfactory.v1beta1.QueryBeforeSendHookAddressRequest") + proto.RegisterType((*QueryBeforeSendHookAddressResponse)(nil), "osmosis.tokenfactory.v1beta1.QueryBeforeSendHookAddressResponse") } func init() { @@ -310,43 +403,50 @@ func init() { } var fileDescriptor_6f22013ad0f72e3f = []byte{ - // 566 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x94, 0x41, 0x6b, 0x13, 0x41, - 0x14, 0xc7, 0x33, 0xb5, 0x46, 0x3b, 0xa2, 0x92, 0x69, 0x91, 0x1a, 0xea, 0x46, 0xc7, 0x22, 0x29, - 0xd4, 0x1d, 0xd3, 0xf6, 0x64, 0x15, 0xec, 0x56, 0xbc, 0x48, 0x40, 0x17, 0x11, 0x14, 0x21, 0x4c, - 0xd2, 0xe9, 0x36, 0xd8, 0xdd, 0x97, 0xce, 0xce, 0x8a, 0xa1, 0xf4, 0xa2, 0xe0, 0x59, 0xf0, 0xe8, - 0x77, 0xf0, 0x73, 0xf4, 0x58, 0xe8, 0xc5, 0x53, 0x90, 0xc4, 0x4f, 0x90, 0x9b, 0x78, 0x91, 0xcc, - 0x4c, 0x5a, 0xeb, 0xc6, 0x25, 0xd6, 0xdb, 0x32, 0xef, 0xff, 0xfe, 0xef, 0xfd, 0xde, 0x7b, 0x2c, - 0x2e, 0x43, 0x1c, 0x42, 0xdc, 0x8c, 0x99, 0x82, 0xd7, 0x22, 0xda, 0xe4, 0x0d, 0x05, 0xb2, 0xcd, - 0xde, 0x54, 0xea, 0x42, 0xf1, 0x0a, 0xdb, 0x49, 0x84, 0x6c, 0xbb, 0x2d, 0x09, 0x0a, 0xc8, 0x9c, - 0x55, 0xba, 0xbf, 0x2b, 0x5d, 0xab, 0x2c, 0xce, 0x04, 0x10, 0x80, 0x16, 0xb2, 0xc1, 0x97, 0xc9, - 0x29, 0xce, 0x05, 0x00, 0xc1, 0xb6, 0x60, 0xbc, 0xd5, 0x64, 0x3c, 0x8a, 0x40, 0x71, 0xd5, 0x84, - 0x28, 0xb6, 0xd1, 0x95, 0xcc, 0xda, 0x3c, 0x51, 0x5b, 0x20, 0x9b, 0xaa, 0x5d, 0x15, 0x8a, 0x6f, - 0x70, 0xc5, 0x6d, 0xd6, 0x42, 0x66, 0x56, 0x8b, 0x4b, 0x1e, 0xda, 0x02, 0x74, 0x06, 0x93, 0xa7, - 0x03, 0x82, 0x27, 0xfa, 0xd1, 0x17, 0x3b, 0x89, 0x88, 0x15, 0x7d, 0x81, 0xa7, 0x4f, 0xbc, 0xc6, - 0x2d, 0x88, 0x62, 0x41, 0x3c, 0x9c, 0x37, 0xc9, 0xb3, 0xe8, 0x3a, 0x2a, 0x5f, 0x58, 0x9a, 0x77, - 0xb3, 0x80, 0x5d, 0x93, 0xed, 0x4d, 0xee, 0x77, 0x4a, 0x39, 0xdf, 0x66, 0xd2, 0xf7, 0x08, 0x53, - 0xed, 0xfd, 0x50, 0x44, 0x10, 0xae, 0xfd, 0x49, 0x60, 0x3b, 0x20, 0x8b, 0xf8, 0x5c, 0x43, 0x0a, - 0xae, 0x40, 0xea, 0x5a, 0x53, 0x1e, 0xe9, 0x77, 0x4a, 0x97, 0xda, 0x3c, 0xdc, 0xbe, 0x4b, 0x6d, - 0x80, 0xfa, 0x43, 0x09, 0x61, 0xf8, 0x7c, 0x9c, 0xd4, 0x37, 0x06, 0x8e, 0xb3, 0x13, 0x5a, 0x3e, - 0xdd, 0xef, 0x94, 0x2e, 0x1b, 0xf9, 0x30, 0x42, 0xfd, 0x23, 0x11, 0xfd, 0x82, 0xf0, 0xcd, 0xcc, - 0x2e, 0x2c, 0xf1, 0x07, 0x84, 0xc9, 0xd1, 0x94, 0x6b, 0xa1, 0x0d, 0x5b, 0xfc, 0x95, 0x6c, 0xfc, - 0xd1, 0xd6, 0xde, 0x8d, 0xc1, 0x38, 0xfa, 0x9d, 0xd2, 0x55, 0xd3, 0x5d, 0xda, 0x9d, 0xfa, 0x85, - 0xd4, 0x62, 0x69, 0x15, 0x5f, 0x3b, 0xee, 0x37, 0x7e, 0x24, 0x21, 0x5c, 0x37, 0xec, 0xa7, 0x1a, - 0x18, 0x7d, 0x8c, 0x9d, 0xbf, 0xd9, 0x59, 0xf2, 0x05, 0x9c, 0xd7, 0xa3, 0x1a, 0xec, 0xfa, 0x4c, - 0x79, 0xca, 0x2b, 0xf4, 0x3b, 0xa5, 0x8b, 0xc6, 0xce, 0xbc, 0x53, 0xdf, 0x0a, 0x96, 0x7e, 0x4c, - 0xe2, 0xb3, 0xda, 0x8d, 0x7c, 0x46, 0x38, 0x6f, 0xb6, 0x4e, 0xee, 0x64, 0x0f, 0x27, 0x7d, 0x74, - 0xc5, 0xca, 0x3f, 0x64, 0x98, 0x26, 0xe9, 0xe2, 0xbb, 0xc3, 0xef, 0x9f, 0x26, 0x6e, 0x91, 0x79, - 0x36, 0xc6, 0xc5, 0x93, 0x9f, 0x08, 0x5f, 0x19, 0xbd, 0x14, 0xf2, 0x60, 0x8c, 0xda, 0x99, 0x07, - 0x5b, 0x5c, 0xfb, 0x0f, 0x07, 0x4b, 0xf3, 0x4a, 0xd3, 0x3c, 0x27, 0xcf, 0xb2, 0x69, 0xcc, 0xd4, - 0xd9, 0xf0, 0x79, 0xd7, 0xee, 0x74, 0x8f, 0xed, 0x0e, 0xcf, 0x7b, 0x8f, 0xa5, 0xaf, 0x8a, 0x1c, - 0x22, 0x5c, 0x48, 0xad, 0x9b, 0xac, 0x8e, 0xdb, 0xf6, 0x88, 0x9b, 0x2b, 0xde, 0x3b, 0x5d, 0xb2, - 0xc5, 0x5d, 0xd7, 0xb8, 0xf7, 0xc9, 0xea, 0x38, 0xb8, 0xb5, 0x4d, 0x09, 0x61, 0xcd, 0xa2, 0x1e, - 0x33, 0x7b, 0xd5, 0xfd, 0xae, 0x83, 0x0e, 0xba, 0x0e, 0xfa, 0xd6, 0x75, 0xd0, 0xc7, 0x9e, 0x93, - 0x3b, 0xe8, 0x39, 0xb9, 0xaf, 0x3d, 0x27, 0xf7, 0x72, 0x39, 0x68, 0xaa, 0xad, 0xa4, 0xee, 0x36, - 0x20, 0x64, 0x91, 0x48, 0x94, 0x84, 0xe8, 0x36, 0xc8, 0x60, 0xf8, 0xcd, 0xde, 0x9e, 0x2c, 0xa7, - 0xda, 0x2d, 0x11, 0xd7, 0xf3, 0xfa, 0xaf, 0xb8, 0xfc, 0x2b, 0x00, 0x00, 0xff, 0xff, 0x28, 0x2a, - 0x3f, 0xc8, 0xf4, 0x05, 0x00, 0x00, + // 674 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0xcf, 0x4e, 0x13, 0x5f, + 0x14, 0xee, 0xfc, 0x7e, 0x52, 0xc3, 0xf5, 0x1f, 0x5c, 0xf1, 0x5f, 0xc5, 0xa9, 0x5c, 0x09, 0x01, + 0x83, 0x1d, 0x8b, 0x24, 0x1a, 0x91, 0x40, 0x07, 0x45, 0x13, 0x24, 0xd1, 0x71, 0xa5, 0x9b, 0xe6, + 0xb6, 0xbd, 0x94, 0x86, 0xce, 0x9c, 0x32, 0xf7, 0x16, 0x6d, 0x08, 0x1b, 0x17, 0xae, 0x4d, 0x5c, + 0xfa, 0x0e, 0x3e, 0x07, 0x4b, 0x12, 0x36, 0xae, 0x1a, 0x05, 0xe3, 0x03, 0xf4, 0x09, 0x4c, 0xef, + 0x3d, 0x45, 0xa0, 0x65, 0xd2, 0xe2, 0xaa, 0x93, 0x73, 0xbe, 0xf3, 0x9d, 0xef, 0xbb, 0xe7, 0x9c, + 0x94, 0x8c, 0x83, 0xf4, 0x41, 0x96, 0xa4, 0xa3, 0x60, 0x4d, 0x04, 0x2b, 0x3c, 0xaf, 0x20, 0xac, + 0x39, 0x1b, 0xe9, 0x9c, 0x50, 0x3c, 0xed, 0xac, 0x57, 0x45, 0x58, 0x4b, 0x55, 0x42, 0x50, 0x40, + 0x87, 0x11, 0x99, 0x3a, 0x8c, 0x4c, 0x21, 0x32, 0x31, 0x54, 0x84, 0x22, 0x68, 0xa0, 0xd3, 0xfc, + 0x32, 0x35, 0x89, 0xe1, 0x22, 0x40, 0xb1, 0x2c, 0x1c, 0x5e, 0x29, 0x39, 0x3c, 0x08, 0x40, 0x71, + 0x55, 0x82, 0x40, 0x62, 0xf6, 0x6e, 0x5e, 0x53, 0x3a, 0x39, 0x2e, 0x85, 0x69, 0x75, 0xd0, 0xb8, + 0xc2, 0x8b, 0xa5, 0x40, 0x83, 0x11, 0x3b, 0x1d, 0xa9, 0x93, 0x57, 0xd5, 0x2a, 0x84, 0x25, 0x55, + 0x5b, 0x16, 0x8a, 0x17, 0xb8, 0xe2, 0x58, 0x35, 0x11, 0x59, 0x55, 0xe1, 0x21, 0xf7, 0x51, 0x0c, + 0x1b, 0x22, 0xf4, 0x75, 0x53, 0xc2, 0x2b, 0x1d, 0xf4, 0xc4, 0x7a, 0x55, 0x48, 0xc5, 0xde, 0x92, + 0xcb, 0x47, 0xa2, 0xb2, 0x02, 0x81, 0x14, 0xd4, 0x25, 0x71, 0x53, 0x7c, 0xdd, 0xba, 0x6d, 0x8d, + 0x9f, 0x9b, 0x1a, 0x4d, 0x45, 0x3d, 0x4e, 0xca, 0x54, 0xbb, 0x67, 0xb6, 0xeb, 0xc9, 0x98, 0x87, + 0x95, 0xec, 0x25, 0x61, 0x9a, 0xfa, 0xa9, 0x08, 0xc0, 0xcf, 0x1c, 0x37, 0x80, 0x02, 0xe8, 0x18, + 0xe9, 0x2b, 0x34, 0x01, 0xba, 0x51, 0xbf, 0x3b, 0xd0, 0xa8, 0x27, 0xcf, 0xd7, 0xb8, 0x5f, 0x7e, + 0xcc, 0x74, 0x98, 0x79, 0x26, 0xcd, 0xbe, 0x59, 0xe4, 0x4e, 0x24, 0x1d, 0x2a, 0xff, 0x64, 0x11, + 0x7a, 0xf0, 0x5a, 0x59, 0x1f, 0xd3, 0x68, 0x63, 0x3a, 0xda, 0x46, 0x67, 0x6a, 0x77, 0xa4, 0x69, + 0xab, 0x51, 0x4f, 0xde, 0x30, 0xba, 0xda, 0xd9, 0x99, 0x37, 0xd8, 0x36, 0x20, 0xb6, 0x4c, 0x6e, + 0xfd, 0xd5, 0x2b, 0x17, 0x43, 0xf0, 0x17, 0x42, 0xc1, 0x15, 0x84, 0x2d, 0xe7, 0x93, 0xe4, 0x6c, + 0xde, 0x44, 0xd0, 0x3b, 0x6d, 0xd4, 0x93, 0x17, 0x4d, 0x0f, 0x4c, 0x30, 0xaf, 0x05, 0x61, 0x4b, + 0xc4, 0x3e, 0x89, 0x0e, 0x9d, 0x4f, 0x90, 0xb8, 0x7e, 0xaa, 0xe6, 0xcc, 0xfe, 0x1f, 0xef, 0x77, + 0x07, 0x1b, 0xf5, 0xe4, 0x85, 0x43, 0x4f, 0x29, 0x99, 0x87, 0x00, 0xb6, 0x44, 0x46, 0x34, 0x99, + 0x2b, 0x56, 0x20, 0x14, 0x6f, 0x44, 0x50, 0x78, 0x01, 0xb0, 0x96, 0x29, 0x14, 0x42, 0x21, 0x65, + 0xaf, 0x93, 0x29, 0xe3, 0x9c, 0x4f, 0x20, 0x43, 0x75, 0x8b, 0x64, 0xa0, 0x79, 0x0d, 0xef, 0xb9, + 0xf4, 0xb3, 0xdc, 0xe4, 0x90, 0xf8, 0x66, 0xa3, 0x9e, 0xbc, 0x86, 0xb6, 0x8f, 0x21, 0x98, 0x77, + 0xa9, 0x15, 0x42, 0xbe, 0xa9, 0xed, 0x38, 0xe9, 0xd3, 0xed, 0xe8, 0x57, 0x8b, 0xc4, 0xcd, 0xe2, + 0xd1, 0xfb, 0xd1, 0x73, 0x6d, 0xdf, 0xfb, 0x44, 0xba, 0x87, 0x0a, 0xe3, 0x80, 0x4d, 0x7e, 0xdc, + 0xfd, 0xf5, 0xe5, 0xbf, 0x31, 0x3a, 0xea, 0x74, 0x71, 0x74, 0xf4, 0xb7, 0x45, 0xae, 0x76, 0xde, + 0x27, 0x3a, 0xdf, 0x45, 0xef, 0xc8, 0xa3, 0x49, 0x64, 0xfe, 0x81, 0x01, 0xdd, 0x3c, 0xd7, 0x6e, + 0x32, 0x74, 0x2e, 0xda, 0x8d, 0x59, 0x18, 0x67, 0x53, 0xff, 0x6e, 0x39, 0xed, 0xbb, 0x4f, 0x77, + 0x2d, 0x32, 0xd8, 0xb6, 0x94, 0x74, 0xa6, 0x5b, 0x85, 0x1d, 0x2e, 0x23, 0xf1, 0xe4, 0x74, 0xc5, + 0xe8, 0x6c, 0x41, 0x3b, 0x9b, 0xa5, 0x33, 0xdd, 0x38, 0xcb, 0xae, 0x84, 0xe0, 0x67, 0xf1, 0xc8, + 0x9c, 0x4d, 0xfc, 0xd8, 0xa2, 0x3f, 0x2d, 0x72, 0xa5, 0xe3, 0x42, 0xd3, 0xb9, 0x2e, 0xc4, 0x45, + 0xdd, 0x55, 0x62, 0xfe, 0xf4, 0x04, 0xe8, 0xf0, 0x99, 0x76, 0x38, 0x47, 0x67, 0x7b, 0x9a, 0x5d, + 0x4e, 0x73, 0x66, 0xa5, 0x08, 0x0a, 0xd9, 0x55, 0x80, 0x35, 0xd7, 0xdb, 0xde, 0xb3, 0xad, 0x9d, + 0x3d, 0xdb, 0xfa, 0xb1, 0x67, 0x5b, 0x9f, 0xf7, 0xed, 0xd8, 0xce, 0xbe, 0x1d, 0xfb, 0xbe, 0x6f, + 0xc7, 0xde, 0x3d, 0x2a, 0x96, 0xd4, 0x6a, 0x35, 0x97, 0xca, 0x83, 0xdf, 0x6a, 0x71, 0xaf, 0xcc, + 0x73, 0xf2, 0xa0, 0xdf, 0x46, 0xfa, 0xa1, 0xf3, 0xe1, 0x68, 0x57, 0x55, 0xab, 0x08, 0x99, 0x8b, + 0xeb, 0x3f, 0x9b, 0x07, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x38, 0x22, 0xde, 0x2a, 0x77, 0x07, + 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -361,10 +461,18 @@ const _ = grpc.SupportPackageIsVersion4 // // 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 returns the total set of minting parameters. + // Params defines a gRPC query method that returns the tokenfactory module's + // parameters. Params(ctx context.Context, in *QueryParamsRequest, opts ...grpc.CallOption) (*QueryParamsResponse, error) + // DenomAuthorityMetadata defines a gRPC query method for fetching + // DenomAuthorityMetadata for a particular denom. DenomAuthorityMetadata(ctx context.Context, in *QueryDenomAuthorityMetadataRequest, opts ...grpc.CallOption) (*QueryDenomAuthorityMetadataResponse, error) + // DenomsFromCreator defines a gRPC query method for fetching all + // denominations created by a specific admin/creator. DenomsFromCreator(ctx context.Context, in *QueryDenomsFromCreatorRequest, opts ...grpc.CallOption) (*QueryDenomsFromCreatorResponse, error) + // BeforeSendHookAddress defines a gRPC query method for + // getting the address registered for the before send hook. + BeforeSendHookAddress(ctx context.Context, in *QueryBeforeSendHookAddressRequest, opts ...grpc.CallOption) (*QueryBeforeSendHookAddressResponse, error) } type queryClient struct { @@ -402,12 +510,29 @@ func (c *queryClient) DenomsFromCreator(ctx context.Context, in *QueryDenomsFrom return out, nil } +func (c *queryClient) BeforeSendHookAddress(ctx context.Context, in *QueryBeforeSendHookAddressRequest, opts ...grpc.CallOption) (*QueryBeforeSendHookAddressResponse, error) { + out := new(QueryBeforeSendHookAddressResponse) + err := c.cc.Invoke(ctx, "/osmosis.tokenfactory.v1beta1.Query/BeforeSendHookAddress", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + // QueryServer is the server API for Query service. type QueryServer interface { - // Params returns the total set of minting parameters. + // Params defines a gRPC query method that returns the tokenfactory module's + // parameters. Params(context.Context, *QueryParamsRequest) (*QueryParamsResponse, error) + // DenomAuthorityMetadata defines a gRPC query method for fetching + // DenomAuthorityMetadata for a particular denom. DenomAuthorityMetadata(context.Context, *QueryDenomAuthorityMetadataRequest) (*QueryDenomAuthorityMetadataResponse, error) + // DenomsFromCreator defines a gRPC query method for fetching all + // denominations created by a specific admin/creator. DenomsFromCreator(context.Context, *QueryDenomsFromCreatorRequest) (*QueryDenomsFromCreatorResponse, error) + // BeforeSendHookAddress defines a gRPC query method for + // getting the address registered for the before send hook. + BeforeSendHookAddress(context.Context, *QueryBeforeSendHookAddressRequest) (*QueryBeforeSendHookAddressResponse, error) } // UnimplementedQueryServer can be embedded to have forward compatible implementations. @@ -423,6 +548,9 @@ func (*UnimplementedQueryServer) DenomAuthorityMetadata(ctx context.Context, req func (*UnimplementedQueryServer) DenomsFromCreator(ctx context.Context, req *QueryDenomsFromCreatorRequest) (*QueryDenomsFromCreatorResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method DenomsFromCreator not implemented") } +func (*UnimplementedQueryServer) BeforeSendHookAddress(ctx context.Context, req *QueryBeforeSendHookAddressRequest) (*QueryBeforeSendHookAddressResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method BeforeSendHookAddress not implemented") +} func RegisterQueryServer(s grpc1.Server, srv QueryServer) { s.RegisterService(&_Query_serviceDesc, srv) @@ -482,6 +610,24 @@ func _Query_DenomsFromCreator_Handler(srv interface{}, ctx context.Context, dec return interceptor(ctx, in, info, handler) } +func _Query_BeforeSendHookAddress_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QueryBeforeSendHookAddressRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(QueryServer).BeforeSendHookAddress(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/osmosis.tokenfactory.v1beta1.Query/BeforeSendHookAddress", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(QueryServer).BeforeSendHookAddress(ctx, req.(*QueryBeforeSendHookAddressRequest)) + } + return interceptor(ctx, in, info, handler) +} + var _Query_serviceDesc = grpc.ServiceDesc{ ServiceName: "osmosis.tokenfactory.v1beta1.Query", HandlerType: (*QueryServer)(nil), @@ -498,6 +644,10 @@ var _Query_serviceDesc = grpc.ServiceDesc{ MethodName: "DenomsFromCreator", Handler: _Query_DenomsFromCreator_Handler, }, + { + MethodName: "BeforeSendHookAddress", + Handler: _Query_BeforeSendHookAddress_Handler, + }, }, Streams: []grpc.StreamDesc{}, Metadata: "osmosis/tokenfactory/v1beta1/query.proto", @@ -579,17 +729,10 @@ func (m *QueryDenomAuthorityMetadataRequest) MarshalToSizedBuffer(dAtA []byte) ( _ = i var l int _ = l - if len(m.Subdenom) > 0 { - i -= len(m.Subdenom) - copy(dAtA[i:], m.Subdenom) - i = encodeVarintQuery(dAtA, i, uint64(len(m.Subdenom))) - 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.Denom) > 0 { + i -= len(m.Denom) + copy(dAtA[i:], m.Denom) + i = encodeVarintQuery(dAtA, i, uint64(len(m.Denom))) i-- dAtA[i] = 0xa } @@ -691,6 +834,66 @@ func (m *QueryDenomsFromCreatorResponse) MarshalToSizedBuffer(dAtA []byte) (int, return len(dAtA) - i, nil } +func (m *QueryBeforeSendHookAddressRequest) 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 *QueryBeforeSendHookAddressRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryBeforeSendHookAddressRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Denom) > 0 { + i -= len(m.Denom) + copy(dAtA[i:], m.Denom) + i = encodeVarintQuery(dAtA, i, uint64(len(m.Denom))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *QueryBeforeSendHookAddressResponse) 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 *QueryBeforeSendHookAddressResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryBeforeSendHookAddressResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.CosmwasmAddress) > 0 { + i -= len(m.CosmwasmAddress) + copy(dAtA[i:], m.CosmwasmAddress) + i = encodeVarintQuery(dAtA, i, uint64(len(m.CosmwasmAddress))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + func encodeVarintQuery(dAtA []byte, offset int, v uint64) int { offset -= sovQuery(v) base := offset @@ -728,11 +931,7 @@ func (m *QueryDenomAuthorityMetadataRequest) Size() (n int) { } var l int _ = l - l = len(m.Creator) - if l > 0 { - n += 1 + l + sovQuery(uint64(l)) - } - l = len(m.Subdenom) + l = len(m.Denom) if l > 0 { n += 1 + l + sovQuery(uint64(l)) } @@ -778,6 +977,32 @@ func (m *QueryDenomsFromCreatorResponse) Size() (n int) { return n } +func (m *QueryBeforeSendHookAddressRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Denom) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +func (m *QueryBeforeSendHookAddressResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.CosmwasmAddress) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + func sovQuery(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } @@ -948,7 +1173,7 @@ func (m *QueryDenomAuthorityMetadataRequest) Unmarshal(dAtA []byte) error { switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Creator", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Denom", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -976,11 +1201,144 @@ func (m *QueryDenomAuthorityMetadataRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Creator = string(dAtA[iNdEx:postIndex]) + m.Denom = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 2: + 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 *QueryDenomAuthorityMetadataResponse) 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: QueryDenomAuthorityMetadataResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryDenomAuthorityMetadataResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field AuthorityMetadata", 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.AuthorityMetadata.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 *QueryDenomsFromCreatorRequest) 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: QueryDenomsFromCreatorRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryDenomsFromCreatorRequest: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Subdenom", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Creator", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -1008,7 +1366,7 @@ func (m *QueryDenomAuthorityMetadataRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Subdenom = string(dAtA[iNdEx:postIndex]) + m.Creator = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex default: iNdEx = preIndex @@ -1031,7 +1389,7 @@ func (m *QueryDenomAuthorityMetadataRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryDenomAuthorityMetadataResponse) Unmarshal(dAtA []byte) error { +func (m *QueryDenomsFromCreatorResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -1054,17 +1412,17 @@ func (m *QueryDenomAuthorityMetadataResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryDenomAuthorityMetadataResponse: wiretype end group for non-group") + return fmt.Errorf("proto: QueryDenomsFromCreatorResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryDenomAuthorityMetadataResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryDenomsFromCreatorResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field AuthorityMetadata", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Denoms", wireType) } - var msglen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowQuery @@ -1074,24 +1432,23 @@ func (m *QueryDenomAuthorityMetadataResponse) 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 err := m.AuthorityMetadata.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } + m.Denoms = append(m.Denoms, string(dAtA[iNdEx:postIndex])) iNdEx = postIndex default: iNdEx = preIndex @@ -1114,7 +1471,7 @@ func (m *QueryDenomAuthorityMetadataResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryDenomsFromCreatorRequest) Unmarshal(dAtA []byte) error { +func (m *QueryBeforeSendHookAddressRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -1137,15 +1494,15 @@ func (m *QueryDenomsFromCreatorRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryDenomsFromCreatorRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryBeforeSendHookAddressRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryDenomsFromCreatorRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryBeforeSendHookAddressRequest: 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) + return fmt.Errorf("proto: wrong wireType = %d for field Denom", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -1173,7 +1530,7 @@ func (m *QueryDenomsFromCreatorRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Creator = string(dAtA[iNdEx:postIndex]) + m.Denom = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex default: iNdEx = preIndex @@ -1196,7 +1553,7 @@ func (m *QueryDenomsFromCreatorRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryDenomsFromCreatorResponse) Unmarshal(dAtA []byte) error { +func (m *QueryBeforeSendHookAddressResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -1219,15 +1576,15 @@ func (m *QueryDenomsFromCreatorResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryDenomsFromCreatorResponse: wiretype end group for non-group") + return fmt.Errorf("proto: QueryBeforeSendHookAddressResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryDenomsFromCreatorResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryBeforeSendHookAddressResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Denoms", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field CosmwasmAddress", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -1255,7 +1612,7 @@ func (m *QueryDenomsFromCreatorResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Denoms = append(m.Denoms, string(dAtA[iNdEx:postIndex])) + m.CosmwasmAddress = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex default: iNdEx = preIndex diff --git a/x/tokenfactory/types/query.pb.gw.go b/x/tokenfactory/types/query.pb.gw.go index 2cfb3a2cd..5d75e90ba 100644 --- a/x/tokenfactory/types/query.pb.gw.go +++ b/x/tokenfactory/types/query.pb.gw.go @@ -62,26 +62,15 @@ func request_Query_DenomAuthorityMetadata_0(ctx context.Context, marshaler runti _ = err ) - val, ok = pathParams["creator"] + val, ok = pathParams["denom"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "creator") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "denom") } - protoReq.Creator, err = runtime.String(val) + protoReq.Denom, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "creator", err) - } - - val, ok = pathParams["subdenom"] - if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "subdenom") - } - - protoReq.Subdenom, err = runtime.String(val) - - if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "subdenom", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "denom", err) } msg, err := client.DenomAuthorityMetadata(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) @@ -100,26 +89,15 @@ func local_request_Query_DenomAuthorityMetadata_0(ctx context.Context, marshaler _ = err ) - val, ok = pathParams["creator"] - if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "creator") - } - - protoReq.Creator, err = runtime.String(val) - - if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "creator", err) - } - - val, ok = pathParams["subdenom"] + val, ok = pathParams["denom"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "subdenom") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "denom") } - protoReq.Subdenom, err = runtime.String(val) + protoReq.Denom, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "subdenom", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "denom", err) } msg, err := server.DenomAuthorityMetadata(ctx, &protoReq) @@ -181,6 +159,60 @@ func local_request_Query_DenomsFromCreator_0(ctx context.Context, marshaler runt } +func request_Query_BeforeSendHookAddress_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryBeforeSendHookAddressRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["denom"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "denom") + } + + protoReq.Denom, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "denom", err) + } + + msg, err := client.BeforeSendHookAddress(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Query_BeforeSendHookAddress_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryBeforeSendHookAddressRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["denom"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "denom") + } + + protoReq.Denom, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "denom", err) + } + + msg, err := server.BeforeSendHookAddress(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. @@ -256,6 +288,29 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv }) + mux.Handle("GET", pattern_Query_BeforeSendHookAddress_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_BeforeSendHookAddress_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_BeforeSendHookAddress_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + return nil } @@ -357,15 +412,37 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie }) + mux.Handle("GET", pattern_Query_BeforeSendHookAddress_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_BeforeSendHookAddress_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_BeforeSendHookAddress_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{"osmosis", "tokenfactory", "v1beta1", "params"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_DenomAuthorityMetadata_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 2, 4, 1, 0, 4, 1, 5, 5, 1, 0, 4, 1, 5, 6, 2, 7}, []string{"osmosis", "tokenfactory", "v1beta1", "denoms", "factory", "creator", "subdenom", "authority_metadata"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_DenomAuthorityMetadata_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 2, 5}, []string{"osmosis", "tokenfactory", "v1beta1", "denoms", "denom", "authority_metadata"}, "", runtime.AssumeColonVerbOpt(false))) pattern_Query_DenomsFromCreator_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"osmosis", "tokenfactory", "v1beta1", "denoms_from_creator", "creator"}, "", runtime.AssumeColonVerbOpt(false))) + + pattern_Query_BeforeSendHookAddress_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 2, 5}, []string{"osmosis", "tokenfactory", "v1beta1", "denoms", "denom", "before_send_hook"}, "", runtime.AssumeColonVerbOpt(false))) ) var ( @@ -374,4 +451,6 @@ var ( forward_Query_DenomAuthorityMetadata_0 = runtime.ForwardResponseMessage forward_Query_DenomsFromCreator_0 = runtime.ForwardResponseMessage + + forward_Query_BeforeSendHookAddress_0 = runtime.ForwardResponseMessage ) diff --git a/x/tokenfactory/types/tx.pb.go b/x/tokenfactory/types/tx.pb.go index aea490b5a..dde9c35b6 100644 --- a/x/tokenfactory/types/tx.pb.go +++ b/x/tokenfactory/types/tx.pb.go @@ -7,9 +7,11 @@ import ( context "context" fmt "fmt" types "github.com/cosmos/cosmos-sdk/types" - _ "github.com/cosmos/gogoproto/gogoproto" - grpc1 "github.com/cosmos/gogoproto/grpc" - proto "github.com/cosmos/gogoproto/proto" + _ "github.com/cosmos/cosmos-sdk/types/tx/amino" + types1 "github.com/cosmos/cosmos-sdk/x/bank/types" + _ "github.com/gogo/protobuf/gogoproto" + grpc1 "github.com/gogo/protobuf/grpc" + proto "github.com/gogo/protobuf/proto" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -29,13 +31,15 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package -// MsgCreateDenom is the sdk.Msg type for allowing an account to create -// a new denom. It requires a sender address and a subdenomination. -// The (sender_address, sub_denomination) pair must be unique and cannot be -// re-used. The resulting denom created is `factory/{creator -// address}/{subdenom}`. The resultant denom's admin is originally set to be the -// creator, but this can be changed later. The token denom does not indicate the -// current admin. +// MsgCreateDenom defines the message structure for the CreateDenom gRPC service +// method. It allows an account to create a new denom. It requires a sender +// address and a sub denomination. The (sender_address, sub_denomination) tuple +// must be unique and cannot be re-used. +// +// The resulting denom created is defined as +// . The resulting denom's admin is +// originally set to be the creator, but this can be changed later. The token +// denom does not indicate the current admin. type MsgCreateDenom struct { Sender string `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty" yaml:"sender"` // subdenom can be up to 44 "alphanumeric" characters long. @@ -138,8 +142,9 @@ func (m *MsgCreateDenomResponse) GetNewTokenDenom() string { // MsgMint is the sdk.Msg type for allowing an admin account to mint // more of a token. For now, we only support minting to the sender account type MsgMint struct { - Sender string `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty" yaml:"sender"` - Amount types.Coin `protobuf:"bytes,2,opt,name=amount,proto3" json:"amount" yaml:"amount"` + Sender string `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty" yaml:"sender"` + Amount types.Coin `protobuf:"bytes,2,opt,name=amount,proto3" json:"amount" yaml:"amount"` + MintToAddress string `protobuf:"bytes,3,opt,name=mintToAddress,proto3" json:"mintToAddress,omitempty" yaml:"mint_to_address"` } func (m *MsgMint) Reset() { *m = MsgMint{} } @@ -189,6 +194,13 @@ func (m *MsgMint) GetAmount() types.Coin { return types.Coin{} } +func (m *MsgMint) GetMintToAddress() string { + if m != nil { + return m.MintToAddress + } + return "" +} + type MsgMintResponse struct { } @@ -228,8 +240,9 @@ var xxx_messageInfo_MsgMintResponse proto.InternalMessageInfo // MsgBurn is the sdk.Msg type for allowing an admin account to burn // a token. For now, we only support burning from the sender account. type MsgBurn struct { - Sender string `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty" yaml:"sender"` - Amount types.Coin `protobuf:"bytes,2,opt,name=amount,proto3" json:"amount" yaml:"amount"` + Sender string `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty" yaml:"sender"` + Amount types.Coin `protobuf:"bytes,2,opt,name=amount,proto3" json:"amount" yaml:"amount"` + BurnFromAddress string `protobuf:"bytes,3,opt,name=burnFromAddress,proto3" json:"burnFromAddress,omitempty" yaml:"burn_from_address"` } func (m *MsgBurn) Reset() { *m = MsgBurn{} } @@ -279,6 +292,13 @@ func (m *MsgBurn) GetAmount() types.Coin { return types.Coin{} } +func (m *MsgBurn) GetBurnFromAddress() string { + if m != nil { + return m.BurnFromAddress + } + return "" +} + type MsgBurnResponse struct { } @@ -320,7 +340,7 @@ var xxx_messageInfo_MsgBurnResponse proto.InternalMessageInfo type MsgChangeAdmin struct { Sender string `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty" yaml:"sender"` Denom string `protobuf:"bytes,2,opt,name=denom,proto3" json:"denom,omitempty" yaml:"denom"` - NewAdmin string `protobuf:"bytes,3,opt,name=newAdmin,proto3" json:"newAdmin,omitempty" yaml:"new_admin"` + NewAdmin string `protobuf:"bytes,3,opt,name=new_admin,json=newAdmin,proto3" json:"new_admin,omitempty" yaml:"new_admin"` } func (m *MsgChangeAdmin) Reset() { *m = MsgChangeAdmin{} } @@ -377,6 +397,8 @@ func (m *MsgChangeAdmin) GetNewAdmin() string { return "" } +// MsgChangeAdminResponse defines the response structure for an executed +// MsgChangeAdmin message. type MsgChangeAdminResponse struct { } @@ -413,6 +435,302 @@ func (m *MsgChangeAdminResponse) XXX_DiscardUnknown() { var xxx_messageInfo_MsgChangeAdminResponse proto.InternalMessageInfo +// MsgSetBeforeSendHook is the sdk.Msg type for allowing an admin account to +// assign a CosmWasm contract to call with a BeforeSend hook +type MsgSetBeforeSendHook struct { + Sender string `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty" yaml:"sender"` + Denom string `protobuf:"bytes,2,opt,name=denom,proto3" json:"denom,omitempty" yaml:"denom"` + CosmwasmAddress string `protobuf:"bytes,3,opt,name=cosmwasm_address,json=cosmwasmAddress,proto3" json:"cosmwasm_address,omitempty" yaml:"cosmwasm_address"` +} + +func (m *MsgSetBeforeSendHook) Reset() { *m = MsgSetBeforeSendHook{} } +func (m *MsgSetBeforeSendHook) String() string { return proto.CompactTextString(m) } +func (*MsgSetBeforeSendHook) ProtoMessage() {} +func (*MsgSetBeforeSendHook) Descriptor() ([]byte, []int) { + return fileDescriptor_283b6c9a90a846b4, []int{8} +} +func (m *MsgSetBeforeSendHook) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MsgSetBeforeSendHook) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MsgSetBeforeSendHook.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 *MsgSetBeforeSendHook) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgSetBeforeSendHook.Merge(m, src) +} +func (m *MsgSetBeforeSendHook) XXX_Size() int { + return m.Size() +} +func (m *MsgSetBeforeSendHook) XXX_DiscardUnknown() { + xxx_messageInfo_MsgSetBeforeSendHook.DiscardUnknown(m) +} + +var xxx_messageInfo_MsgSetBeforeSendHook proto.InternalMessageInfo + +func (m *MsgSetBeforeSendHook) GetSender() string { + if m != nil { + return m.Sender + } + return "" +} + +func (m *MsgSetBeforeSendHook) GetDenom() string { + if m != nil { + return m.Denom + } + return "" +} + +func (m *MsgSetBeforeSendHook) GetCosmwasmAddress() string { + if m != nil { + return m.CosmwasmAddress + } + return "" +} + +// MsgSetBeforeSendHookResponse defines the response structure for an executed +// MsgSetBeforeSendHook message. +type MsgSetBeforeSendHookResponse struct { +} + +func (m *MsgSetBeforeSendHookResponse) Reset() { *m = MsgSetBeforeSendHookResponse{} } +func (m *MsgSetBeforeSendHookResponse) String() string { return proto.CompactTextString(m) } +func (*MsgSetBeforeSendHookResponse) ProtoMessage() {} +func (*MsgSetBeforeSendHookResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_283b6c9a90a846b4, []int{9} +} +func (m *MsgSetBeforeSendHookResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MsgSetBeforeSendHookResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MsgSetBeforeSendHookResponse.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 *MsgSetBeforeSendHookResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgSetBeforeSendHookResponse.Merge(m, src) +} +func (m *MsgSetBeforeSendHookResponse) XXX_Size() int { + return m.Size() +} +func (m *MsgSetBeforeSendHookResponse) XXX_DiscardUnknown() { + xxx_messageInfo_MsgSetBeforeSendHookResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_MsgSetBeforeSendHookResponse proto.InternalMessageInfo + +// MsgSetDenomMetadata is the sdk.Msg type for allowing an admin account to set +// the denom's bank metadata +type MsgSetDenomMetadata struct { + Sender string `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty" yaml:"sender"` + Metadata types1.Metadata `protobuf:"bytes,2,opt,name=metadata,proto3" json:"metadata" yaml:"metadata"` +} + +func (m *MsgSetDenomMetadata) Reset() { *m = MsgSetDenomMetadata{} } +func (m *MsgSetDenomMetadata) String() string { return proto.CompactTextString(m) } +func (*MsgSetDenomMetadata) ProtoMessage() {} +func (*MsgSetDenomMetadata) Descriptor() ([]byte, []int) { + return fileDescriptor_283b6c9a90a846b4, []int{10} +} +func (m *MsgSetDenomMetadata) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MsgSetDenomMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MsgSetDenomMetadata.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 *MsgSetDenomMetadata) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgSetDenomMetadata.Merge(m, src) +} +func (m *MsgSetDenomMetadata) XXX_Size() int { + return m.Size() +} +func (m *MsgSetDenomMetadata) XXX_DiscardUnknown() { + xxx_messageInfo_MsgSetDenomMetadata.DiscardUnknown(m) +} + +var xxx_messageInfo_MsgSetDenomMetadata proto.InternalMessageInfo + +func (m *MsgSetDenomMetadata) GetSender() string { + if m != nil { + return m.Sender + } + return "" +} + +func (m *MsgSetDenomMetadata) GetMetadata() types1.Metadata { + if m != nil { + return m.Metadata + } + return types1.Metadata{} +} + +// MsgSetDenomMetadataResponse defines the response structure for an executed +// MsgSetDenomMetadata message. +type MsgSetDenomMetadataResponse struct { +} + +func (m *MsgSetDenomMetadataResponse) Reset() { *m = MsgSetDenomMetadataResponse{} } +func (m *MsgSetDenomMetadataResponse) String() string { return proto.CompactTextString(m) } +func (*MsgSetDenomMetadataResponse) ProtoMessage() {} +func (*MsgSetDenomMetadataResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_283b6c9a90a846b4, []int{11} +} +func (m *MsgSetDenomMetadataResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MsgSetDenomMetadataResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MsgSetDenomMetadataResponse.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 *MsgSetDenomMetadataResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgSetDenomMetadataResponse.Merge(m, src) +} +func (m *MsgSetDenomMetadataResponse) XXX_Size() int { + return m.Size() +} +func (m *MsgSetDenomMetadataResponse) XXX_DiscardUnknown() { + xxx_messageInfo_MsgSetDenomMetadataResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_MsgSetDenomMetadataResponse proto.InternalMessageInfo + +type MsgForceTransfer struct { + Sender string `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty" yaml:"sender"` + Amount types.Coin `protobuf:"bytes,2,opt,name=amount,proto3" json:"amount" yaml:"amount"` + TransferFromAddress string `protobuf:"bytes,3,opt,name=transferFromAddress,proto3" json:"transferFromAddress,omitempty" yaml:"transfer_from_address"` + TransferToAddress string `protobuf:"bytes,4,opt,name=transferToAddress,proto3" json:"transferToAddress,omitempty" yaml:"transfer_to_address"` +} + +func (m *MsgForceTransfer) Reset() { *m = MsgForceTransfer{} } +func (m *MsgForceTransfer) String() string { return proto.CompactTextString(m) } +func (*MsgForceTransfer) ProtoMessage() {} +func (*MsgForceTransfer) Descriptor() ([]byte, []int) { + return fileDescriptor_283b6c9a90a846b4, []int{12} +} +func (m *MsgForceTransfer) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MsgForceTransfer) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MsgForceTransfer.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 *MsgForceTransfer) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgForceTransfer.Merge(m, src) +} +func (m *MsgForceTransfer) XXX_Size() int { + return m.Size() +} +func (m *MsgForceTransfer) XXX_DiscardUnknown() { + xxx_messageInfo_MsgForceTransfer.DiscardUnknown(m) +} + +var xxx_messageInfo_MsgForceTransfer proto.InternalMessageInfo + +func (m *MsgForceTransfer) GetSender() string { + if m != nil { + return m.Sender + } + return "" +} + +func (m *MsgForceTransfer) GetAmount() types.Coin { + if m != nil { + return m.Amount + } + return types.Coin{} +} + +func (m *MsgForceTransfer) GetTransferFromAddress() string { + if m != nil { + return m.TransferFromAddress + } + return "" +} + +func (m *MsgForceTransfer) GetTransferToAddress() string { + if m != nil { + return m.TransferToAddress + } + return "" +} + +type MsgForceTransferResponse struct { +} + +func (m *MsgForceTransferResponse) Reset() { *m = MsgForceTransferResponse{} } +func (m *MsgForceTransferResponse) String() string { return proto.CompactTextString(m) } +func (*MsgForceTransferResponse) ProtoMessage() {} +func (*MsgForceTransferResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_283b6c9a90a846b4, []int{13} +} +func (m *MsgForceTransferResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MsgForceTransferResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MsgForceTransferResponse.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 *MsgForceTransferResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgForceTransferResponse.Merge(m, src) +} +func (m *MsgForceTransferResponse) XXX_Size() int { + return m.Size() +} +func (m *MsgForceTransferResponse) XXX_DiscardUnknown() { + xxx_messageInfo_MsgForceTransferResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_MsgForceTransferResponse proto.InternalMessageInfo + func init() { proto.RegisterType((*MsgCreateDenom)(nil), "osmosis.tokenfactory.v1beta1.MsgCreateDenom") proto.RegisterType((*MsgCreateDenomResponse)(nil), "osmosis.tokenfactory.v1beta1.MsgCreateDenomResponse") @@ -422,6 +740,12 @@ func init() { proto.RegisterType((*MsgBurnResponse)(nil), "osmosis.tokenfactory.v1beta1.MsgBurnResponse") proto.RegisterType((*MsgChangeAdmin)(nil), "osmosis.tokenfactory.v1beta1.MsgChangeAdmin") proto.RegisterType((*MsgChangeAdminResponse)(nil), "osmosis.tokenfactory.v1beta1.MsgChangeAdminResponse") + proto.RegisterType((*MsgSetBeforeSendHook)(nil), "osmosis.tokenfactory.v1beta1.MsgSetBeforeSendHook") + proto.RegisterType((*MsgSetBeforeSendHookResponse)(nil), "osmosis.tokenfactory.v1beta1.MsgSetBeforeSendHookResponse") + proto.RegisterType((*MsgSetDenomMetadata)(nil), "osmosis.tokenfactory.v1beta1.MsgSetDenomMetadata") + proto.RegisterType((*MsgSetDenomMetadataResponse)(nil), "osmosis.tokenfactory.v1beta1.MsgSetDenomMetadataResponse") + proto.RegisterType((*MsgForceTransfer)(nil), "osmosis.tokenfactory.v1beta1.MsgForceTransfer") + proto.RegisterType((*MsgForceTransferResponse)(nil), "osmosis.tokenfactory.v1beta1.MsgForceTransferResponse") } func init() { @@ -429,39 +753,63 @@ func init() { } var fileDescriptor_283b6c9a90a846b4 = []byte{ - // 507 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x94, 0x4f, 0x6e, 0xd3, 0x40, - 0x14, 0xc6, 0x63, 0x02, 0xa1, 0x4c, 0x29, 0x69, 0x4d, 0xa9, 0x82, 0x85, 0x6c, 0x34, 0x52, 0x11, - 0x48, 0x74, 0x4c, 0x5b, 0x56, 0xec, 0x70, 0x59, 0xb0, 0xf1, 0xc6, 0x62, 0x85, 0x2a, 0x55, 0x76, - 0x32, 0xb8, 0x16, 0xf5, 0xbc, 0xe0, 0x19, 0x93, 0x66, 0xc3, 0x19, 0xd8, 0x70, 0x06, 0xae, 0xd2, - 0x65, 0x97, 0xac, 0x2c, 0x94, 0xdc, 0xc0, 0x27, 0x40, 0x9e, 0x99, 0x38, 0x0e, 0x48, 0x24, 0x59, - 0x75, 0x67, 0xf9, 0xfd, 0xde, 0xf7, 0xfe, 0x7c, 0xcf, 0x46, 0xfb, 0xc0, 0x53, 0xe0, 0x09, 0x77, - 0x05, 0x7c, 0xa6, 0xec, 0x53, 0xd8, 0x17, 0x90, 0x8d, 0xdd, 0xaf, 0x87, 0x11, 0x15, 0xe1, 0xa1, - 0x2b, 0x2e, 0xc9, 0x30, 0x03, 0x01, 0xe6, 0x13, 0x8d, 0x91, 0x26, 0x46, 0x34, 0x66, 0xed, 0xc6, - 0x10, 0x83, 0x04, 0xdd, 0xea, 0x49, 0xe5, 0x58, 0x76, 0x5f, 0x26, 0xb9, 0x51, 0xc8, 0x69, 0xad, - 0xd8, 0x87, 0x84, 0xa9, 0x38, 0xbe, 0x40, 0x0f, 0x7c, 0x1e, 0x9f, 0x64, 0x34, 0x14, 0xf4, 0x1d, - 0x65, 0x90, 0x9a, 0x2f, 0x50, 0x87, 0x53, 0x36, 0xa0, 0x59, 0xcf, 0x78, 0x6a, 0x3c, 0xbf, 0xe7, - 0xed, 0x94, 0x85, 0xb3, 0x35, 0x0e, 0xd3, 0x8b, 0x37, 0x58, 0xbd, 0xc7, 0x81, 0x06, 0x4c, 0x17, - 0x6d, 0xf0, 0x3c, 0x1a, 0x54, 0x69, 0xbd, 0x5b, 0x12, 0x7e, 0x58, 0x16, 0x4e, 0x57, 0xc3, 0x3a, - 0x82, 0x83, 0x1a, 0xc2, 0xa7, 0x68, 0x6f, 0xb1, 0x5a, 0x40, 0xf9, 0x10, 0x18, 0xa7, 0xa6, 0x87, - 0xba, 0x8c, 0x8e, 0xce, 0xe4, 0x64, 0x67, 0x4a, 0x51, 0x95, 0xb7, 0xca, 0xc2, 0xd9, 0x53, 0x8a, - 0x7f, 0x01, 0x38, 0xd8, 0x62, 0x74, 0xf4, 0xa1, 0x7a, 0x21, 0xb5, 0xf0, 0x37, 0x74, 0xd7, 0xe7, - 0xb1, 0x9f, 0x30, 0xb1, 0xce, 0x10, 0xef, 0x51, 0x27, 0x4c, 0x21, 0x67, 0x42, 0x8e, 0xb0, 0x79, - 0xf4, 0x98, 0xa8, 0x95, 0x91, 0x6a, 0x65, 0xb3, 0xed, 0x92, 0x13, 0x48, 0x98, 0xf7, 0xe8, 0xaa, - 0x70, 0x5a, 0x73, 0x25, 0x95, 0x86, 0x03, 0x9d, 0x8f, 0x77, 0x50, 0x57, 0xd7, 0x9f, 0x8d, 0xa5, - 0x5b, 0xf2, 0xf2, 0x8c, 0xdd, 0x64, 0x4b, 0x55, 0xfd, 0xba, 0xa5, 0x1f, 0x86, 0xb2, 0xfc, 0x3c, - 0x64, 0x31, 0x7d, 0x3b, 0x48, 0x93, 0xb5, 0x5a, 0x7b, 0x86, 0xee, 0x34, 0xfd, 0xde, 0x2e, 0x0b, - 0xe7, 0xbe, 0x22, 0xb5, 0x27, 0x2a, 0x6c, 0xbe, 0x42, 0x1b, 0x8c, 0x8e, 0xa4, 0x7c, 0xaf, 0x2d, - 0xd1, 0xdd, 0xb2, 0x70, 0xb6, 0xe7, 0x46, 0x86, 0x55, 0x08, 0x07, 0x35, 0x85, 0x7b, 0xea, 0x36, - 0xe6, 0x6d, 0xcd, 0x3a, 0x3e, 0xfa, 0xd9, 0x46, 0x6d, 0x9f, 0xc7, 0xe6, 0x17, 0xb4, 0xd9, 0x3c, - 0xd4, 0x97, 0xe4, 0x7f, 0xdf, 0x03, 0x59, 0x3c, 0x34, 0xeb, 0xf5, 0x3a, 0x74, 0x7d, 0x96, 0xa7, - 0xe8, 0xb6, 0xbc, 0xa7, 0xfd, 0xa5, 0xd9, 0x15, 0x66, 0x1d, 0xac, 0x84, 0x35, 0xd5, 0xe5, 0x69, - 0x2c, 0x57, 0xaf, 0xb0, 0x15, 0xd4, 0x9b, 0x46, 0xcb, 0x75, 0x35, 0x4c, 0x5e, 0x61, 0x5d, 0x73, - 0x7a, 0x95, 0x75, 0xfd, 0xeb, 0x94, 0xe7, 0x5f, 0x4d, 0x6c, 0xe3, 0x7a, 0x62, 0x1b, 0xbf, 0x27, - 0xb6, 0xf1, 0x7d, 0x6a, 0xb7, 0xae, 0xa7, 0x76, 0xeb, 0xd7, 0xd4, 0x6e, 0x7d, 0x3c, 0x8e, 0x13, - 0x71, 0x9e, 0x47, 0xa4, 0x0f, 0xa9, 0xcb, 0x68, 0x2e, 0x32, 0x60, 0x07, 0x90, 0xc5, 0xb3, 0x67, - 0xf7, 0x72, 0xf1, 0xdf, 0x27, 0xc6, 0x43, 0xca, 0xa3, 0x8e, 0xfc, 0x47, 0x1d, 0xff, 0x09, 0x00, - 0x00, 0xff, 0xff, 0xc5, 0xd4, 0x8d, 0xbe, 0x20, 0x05, 0x00, 0x00, + // 895 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x56, 0xbf, 0x6f, 0xdb, 0x46, + 0x14, 0x36, 0x93, 0xd4, 0x75, 0x2e, 0x75, 0x25, 0xd1, 0x6e, 0xa2, 0x30, 0x0e, 0x99, 0x5e, 0x91, + 0xc0, 0x2d, 0x2a, 0x12, 0x72, 0x8b, 0xfe, 0xd0, 0xd4, 0x28, 0x85, 0x91, 0xa1, 0x5a, 0x18, 0x4f, + 0x45, 0x00, 0xe1, 0x28, 0x9d, 0x68, 0x42, 0xe1, 0x9d, 0xcb, 0x3b, 0x45, 0xf1, 0x56, 0xa0, 0x5b, + 0xa7, 0x0e, 0xf9, 0x27, 0xba, 0xf5, 0x2f, 0xe8, 0x9c, 0x31, 0x40, 0x97, 0x4e, 0x84, 0x61, 0x03, + 0xed, 0xce, 0xbf, 0xa0, 0xb8, 0x1f, 0xa4, 0x44, 0x4a, 0xb0, 0xa5, 0xa1, 0xc8, 0x62, 0x98, 0x77, + 0xdf, 0xf7, 0xee, 0x7d, 0xdf, 0xbd, 0xf7, 0x4e, 0xe0, 0x21, 0x65, 0x31, 0x65, 0x11, 0xf3, 0x38, + 0x1d, 0x63, 0x32, 0x42, 0x03, 0x4e, 0x93, 0x53, 0xef, 0x65, 0x3b, 0xc0, 0x1c, 0xb5, 0x3d, 0xfe, + 0xca, 0x3d, 0x49, 0x28, 0xa7, 0xe6, 0x9e, 0x86, 0xb9, 0xf3, 0x30, 0x57, 0xc3, 0xac, 0xdd, 0x90, + 0x86, 0x54, 0x02, 0x3d, 0xf1, 0x9f, 0xe2, 0x58, 0x0d, 0x14, 0x47, 0x84, 0x7a, 0xf2, 0xaf, 0x5e, + 0xb2, 0x07, 0x32, 0x8e, 0x17, 0x20, 0x86, 0x8b, 0x43, 0x06, 0x34, 0x22, 0x0b, 0xfb, 0x64, 0x5c, + 0xec, 0x8b, 0x0f, 0xb5, 0x0f, 0x5f, 0x1b, 0xe0, 0xc3, 0x1e, 0x0b, 0x9f, 0x24, 0x18, 0x71, 0xfc, + 0x3d, 0x26, 0x34, 0x36, 0x3f, 0x05, 0x9b, 0x0c, 0x93, 0x21, 0x4e, 0x9a, 0xc6, 0x03, 0x63, 0xff, + 0x66, 0xb7, 0x91, 0xa5, 0xce, 0xf6, 0x29, 0x8a, 0x5f, 0x74, 0xa0, 0x5a, 0x87, 0xbe, 0x06, 0x98, + 0x1e, 0xd8, 0x62, 0x93, 0x60, 0x28, 0x68, 0xcd, 0x6b, 0x12, 0xbc, 0x93, 0xa5, 0x4e, 0x4d, 0x83, + 0xf5, 0x0e, 0xf4, 0x0b, 0x50, 0xe7, 0xd1, 0xaf, 0xff, 0xfe, 0xf1, 0xd9, 0xc7, 0x4b, 0x1d, 0x1a, + 0xc8, 0x14, 0x5a, 0x8a, 0xf2, 0x1c, 0xdc, 0x2e, 0x67, 0xe5, 0x63, 0x76, 0x42, 0x09, 0xc3, 0x66, + 0x17, 0xd4, 0x08, 0x9e, 0xf6, 0x25, 0xb5, 0xaf, 0x4e, 0x56, 0x69, 0x5a, 0x59, 0xea, 0xdc, 0x56, + 0x27, 0x57, 0x00, 0xd0, 0xdf, 0x26, 0x78, 0x7a, 0x24, 0x16, 0x64, 0x2c, 0x78, 0x66, 0x80, 0xf7, + 0x7b, 0x2c, 0xec, 0x45, 0x84, 0xaf, 0xa3, 0xf6, 0x29, 0xd8, 0x44, 0x31, 0x9d, 0x10, 0x2e, 0xb5, + 0xde, 0x3a, 0xb8, 0xeb, 0x2a, 0x73, 0x5d, 0x61, 0x7e, 0x7e, 0x75, 0xee, 0x13, 0x1a, 0x91, 0xee, + 0x47, 0x6f, 0x52, 0x67, 0x63, 0x16, 0x49, 0xd1, 0xa0, 0xaf, 0xf9, 0xe6, 0x77, 0x60, 0x3b, 0x8e, + 0x08, 0x3f, 0xa2, 0x8f, 0x87, 0xc3, 0x04, 0x33, 0xd6, 0xbc, 0x5e, 0x95, 0x20, 0xb6, 0xfb, 0x9c, + 0xf6, 0x91, 0x02, 0x40, 0xbf, 0x4c, 0xe8, 0xd8, 0xc2, 0xc8, 0xbb, 0x4b, 0x8d, 0x14, 0x40, 0xd8, + 0x00, 0x35, 0xad, 0x30, 0x77, 0x0e, 0xfe, 0xa3, 0x54, 0x77, 0x27, 0x09, 0x79, 0x37, 0xaa, 0x0f, + 0x41, 0x2d, 0x98, 0x24, 0xe4, 0x30, 0xa1, 0x71, 0x59, 0xf7, 0x5e, 0x96, 0x3a, 0x4d, 0xc5, 0x11, + 0x80, 0xfe, 0x28, 0xa1, 0xf1, 0x4c, 0x79, 0x95, 0x74, 0x99, 0x76, 0x01, 0xd5, 0xda, 0x85, 0xce, + 0x42, 0xfb, 0x9f, 0xba, 0xcc, 0x8f, 0x11, 0x09, 0xf1, 0xe3, 0x61, 0x1c, 0xad, 0x65, 0xc1, 0x23, + 0xf0, 0xde, 0x7c, 0x8d, 0xd7, 0xb3, 0xd4, 0xf9, 0x40, 0x21, 0x75, 0x7d, 0xa9, 0x6d, 0xb3, 0x0d, + 0x6e, 0x8a, 0xd2, 0x43, 0x22, 0xbe, 0x96, 0xb6, 0x9b, 0xa5, 0x4e, 0x7d, 0x56, 0x95, 0x72, 0x0b, + 0xfa, 0x5b, 0x04, 0x4f, 0x65, 0x16, 0x97, 0x36, 0x84, 0x4c, 0xb6, 0xa5, 0x28, 0x4d, 0xd5, 0x10, + 0xb3, 0xfc, 0x0b, 0x69, 0x67, 0x06, 0xd8, 0xed, 0xb1, 0xf0, 0x19, 0xe6, 0x5d, 0x3c, 0xa2, 0x09, + 0x7e, 0x86, 0xc9, 0xf0, 0x29, 0xa5, 0xe3, 0xff, 0x43, 0xe0, 0x21, 0xa8, 0x8b, 0xcb, 0x9f, 0x22, + 0x56, 0xdc, 0x8f, 0xd6, 0x79, 0x2f, 0x4b, 0x9d, 0x3b, 0x8a, 0x52, 0x45, 0x40, 0xbf, 0x96, 0x2f, + 0xe5, 0x37, 0xd8, 0x12, 0xaa, 0xf7, 0x97, 0xaa, 0x66, 0x98, 0xb7, 0x02, 0x29, 0x44, 0xe4, 0xd6, + 0x3a, 0xa6, 0x74, 0x0c, 0x6d, 0xb0, 0xb7, 0x4c, 0x61, 0x61, 0xc1, 0x6b, 0x03, 0xec, 0x28, 0x80, + 0xec, 0xef, 0x1e, 0xe6, 0x68, 0x88, 0x38, 0x5a, 0xc7, 0x01, 0x1f, 0x6c, 0xc5, 0x9a, 0xa6, 0xeb, + 0xfc, 0xfe, 0xac, 0xce, 0xc9, 0xb8, 0xa8, 0xf3, 0x3c, 0x76, 0xf7, 0x8e, 0xae, 0x75, 0x3d, 0xec, + 0x72, 0x32, 0xf4, 0x8b, 0x38, 0xf0, 0x3e, 0xb8, 0xb7, 0x24, 0xab, 0x22, 0xeb, 0xbf, 0xae, 0x81, + 0x7a, 0x8f, 0x85, 0x87, 0x34, 0x19, 0xe0, 0xa3, 0x04, 0x11, 0x36, 0xc2, 0xc9, 0xbb, 0x69, 0x4c, + 0x1f, 0xec, 0x70, 0x9d, 0xc0, 0x62, 0x73, 0x3e, 0xc8, 0x52, 0x67, 0x4f, 0xf1, 0x72, 0x50, 0xa5, + 0x41, 0x97, 0x91, 0xcd, 0x1f, 0x40, 0x23, 0x5f, 0x9e, 0x8d, 0xb9, 0x1b, 0x32, 0xa2, 0x9d, 0xa5, + 0x8e, 0x55, 0x89, 0x38, 0x3f, 0xea, 0x16, 0x89, 0x9d, 0x7d, 0x51, 0x30, 0x9f, 0x2c, 0x2d, 0x98, + 0x91, 0xf0, 0xaf, 0x95, 0x53, 0xa0, 0x05, 0x9a, 0x55, 0x53, 0x73, 0xc7, 0x0f, 0x7e, 0xdf, 0x04, + 0xd7, 0x7b, 0x2c, 0x34, 0x7f, 0x02, 0xb7, 0xe6, 0x1f, 0xbc, 0xcf, 0xdd, 0xcb, 0xde, 0x62, 0xb7, + 0xfc, 0x10, 0x59, 0x5f, 0xae, 0x83, 0x2e, 0x9e, 0xad, 0xe7, 0xe0, 0x86, 0x7c, 0x6e, 0x1e, 0x5e, + 0xc9, 0x16, 0x30, 0xab, 0xb5, 0x12, 0x6c, 0x3e, 0xba, 0x1c, 0xeb, 0x57, 0x47, 0x17, 0xb0, 0x15, + 0xa2, 0xcf, 0x0f, 0x4f, 0x69, 0xd7, 0xdc, 0xe0, 0x5c, 0xc1, 0xae, 0x19, 0x7a, 0x15, 0xbb, 0x16, + 0x87, 0x9a, 0xf9, 0xb3, 0x01, 0xea, 0x0b, 0xed, 0xdc, 0xbe, 0x32, 0x54, 0x95, 0x62, 0x7d, 0xbb, + 0x36, 0xa5, 0x48, 0xe1, 0x17, 0x03, 0x34, 0x16, 0x87, 0xea, 0xc1, 0x2a, 0x01, 0xcb, 0x1c, 0xab, + 0xb3, 0x3e, 0xa7, 0xc8, 0x62, 0x0a, 0xb6, 0xcb, 0x03, 0xc2, 0xbd, 0x32, 0x58, 0x09, 0x6f, 0x7d, + 0xb5, 0x1e, 0x3e, 0x3f, 0xb8, 0xeb, 0xbf, 0x39, 0xb7, 0x8d, 0xb7, 0xe7, 0xb6, 0x71, 0x76, 0x6e, + 0x1b, 0xbf, 0x5d, 0xd8, 0x1b, 0x6f, 0x2f, 0xec, 0x8d, 0xbf, 0x2f, 0xec, 0x8d, 0x1f, 0xbf, 0x09, + 0x23, 0x7e, 0x3c, 0x09, 0xdc, 0x01, 0x8d, 0x3d, 0x1d, 0xbb, 0xf5, 0x02, 0x05, 0x2c, 0xff, 0xf0, + 0x5e, 0xb6, 0xbf, 0xf6, 0x5e, 0x95, 0x9b, 0x94, 0x9f, 0x9e, 0x60, 0x16, 0x6c, 0xca, 0xdf, 0x9c, + 0x5f, 0xfc, 0x17, 0x00, 0x00, 0xff, 0xff, 0xba, 0xea, 0x73, 0xcf, 0x23, 0x0b, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -480,6 +828,9 @@ type MsgClient interface { Mint(ctx context.Context, in *MsgMint, opts ...grpc.CallOption) (*MsgMintResponse, error) Burn(ctx context.Context, in *MsgBurn, opts ...grpc.CallOption) (*MsgBurnResponse, error) ChangeAdmin(ctx context.Context, in *MsgChangeAdmin, opts ...grpc.CallOption) (*MsgChangeAdminResponse, error) + SetDenomMetadata(ctx context.Context, in *MsgSetDenomMetadata, opts ...grpc.CallOption) (*MsgSetDenomMetadataResponse, error) + SetBeforeSendHook(ctx context.Context, in *MsgSetBeforeSendHook, opts ...grpc.CallOption) (*MsgSetBeforeSendHookResponse, error) + ForceTransfer(ctx context.Context, in *MsgForceTransfer, opts ...grpc.CallOption) (*MsgForceTransferResponse, error) } type msgClient struct { @@ -526,12 +877,42 @@ func (c *msgClient) ChangeAdmin(ctx context.Context, in *MsgChangeAdmin, opts .. return out, nil } +func (c *msgClient) SetDenomMetadata(ctx context.Context, in *MsgSetDenomMetadata, opts ...grpc.CallOption) (*MsgSetDenomMetadataResponse, error) { + out := new(MsgSetDenomMetadataResponse) + err := c.cc.Invoke(ctx, "/osmosis.tokenfactory.v1beta1.Msg/SetDenomMetadata", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *msgClient) SetBeforeSendHook(ctx context.Context, in *MsgSetBeforeSendHook, opts ...grpc.CallOption) (*MsgSetBeforeSendHookResponse, error) { + out := new(MsgSetBeforeSendHookResponse) + err := c.cc.Invoke(ctx, "/osmosis.tokenfactory.v1beta1.Msg/SetBeforeSendHook", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *msgClient) ForceTransfer(ctx context.Context, in *MsgForceTransfer, opts ...grpc.CallOption) (*MsgForceTransferResponse, error) { + out := new(MsgForceTransferResponse) + err := c.cc.Invoke(ctx, "/osmosis.tokenfactory.v1beta1.Msg/ForceTransfer", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + // MsgServer is the server API for Msg service. type MsgServer interface { CreateDenom(context.Context, *MsgCreateDenom) (*MsgCreateDenomResponse, error) Mint(context.Context, *MsgMint) (*MsgMintResponse, error) Burn(context.Context, *MsgBurn) (*MsgBurnResponse, error) ChangeAdmin(context.Context, *MsgChangeAdmin) (*MsgChangeAdminResponse, error) + SetDenomMetadata(context.Context, *MsgSetDenomMetadata) (*MsgSetDenomMetadataResponse, error) + SetBeforeSendHook(context.Context, *MsgSetBeforeSendHook) (*MsgSetBeforeSendHookResponse, error) + ForceTransfer(context.Context, *MsgForceTransfer) (*MsgForceTransferResponse, error) } // UnimplementedMsgServer can be embedded to have forward compatible implementations. @@ -550,6 +931,15 @@ func (*UnimplementedMsgServer) Burn(ctx context.Context, req *MsgBurn) (*MsgBurn func (*UnimplementedMsgServer) ChangeAdmin(ctx context.Context, req *MsgChangeAdmin) (*MsgChangeAdminResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ChangeAdmin not implemented") } +func (*UnimplementedMsgServer) SetDenomMetadata(ctx context.Context, req *MsgSetDenomMetadata) (*MsgSetDenomMetadataResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method SetDenomMetadata not implemented") +} +func (*UnimplementedMsgServer) SetBeforeSendHook(ctx context.Context, req *MsgSetBeforeSendHook) (*MsgSetBeforeSendHookResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method SetBeforeSendHook not implemented") +} +func (*UnimplementedMsgServer) ForceTransfer(ctx context.Context, req *MsgForceTransfer) (*MsgForceTransferResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method ForceTransfer not implemented") +} func RegisterMsgServer(s grpc1.Server, srv MsgServer) { s.RegisterService(&_Msg_serviceDesc, srv) @@ -627,6 +1017,60 @@ func _Msg_ChangeAdmin_Handler(srv interface{}, ctx context.Context, dec func(int return interceptor(ctx, in, info, handler) } +func _Msg_SetDenomMetadata_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(MsgSetDenomMetadata) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(MsgServer).SetDenomMetadata(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/osmosis.tokenfactory.v1beta1.Msg/SetDenomMetadata", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(MsgServer).SetDenomMetadata(ctx, req.(*MsgSetDenomMetadata)) + } + return interceptor(ctx, in, info, handler) +} + +func _Msg_SetBeforeSendHook_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(MsgSetBeforeSendHook) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(MsgServer).SetBeforeSendHook(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/osmosis.tokenfactory.v1beta1.Msg/SetBeforeSendHook", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(MsgServer).SetBeforeSendHook(ctx, req.(*MsgSetBeforeSendHook)) + } + return interceptor(ctx, in, info, handler) +} + +func _Msg_ForceTransfer_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(MsgForceTransfer) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(MsgServer).ForceTransfer(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/osmosis.tokenfactory.v1beta1.Msg/ForceTransfer", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(MsgServer).ForceTransfer(ctx, req.(*MsgForceTransfer)) + } + return interceptor(ctx, in, info, handler) +} + var _Msg_serviceDesc = grpc.ServiceDesc{ ServiceName: "osmosis.tokenfactory.v1beta1.Msg", HandlerType: (*MsgServer)(nil), @@ -647,6 +1091,18 @@ var _Msg_serviceDesc = grpc.ServiceDesc{ MethodName: "ChangeAdmin", Handler: _Msg_ChangeAdmin_Handler, }, + { + MethodName: "SetDenomMetadata", + Handler: _Msg_SetDenomMetadata_Handler, + }, + { + MethodName: "SetBeforeSendHook", + Handler: _Msg_SetBeforeSendHook_Handler, + }, + { + MethodName: "ForceTransfer", + Handler: _Msg_ForceTransfer_Handler, + }, }, Streams: []grpc.StreamDesc{}, Metadata: "osmosis/tokenfactory/v1beta1/tx.proto", @@ -739,6 +1195,13 @@ func (m *MsgMint) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if len(m.MintToAddress) > 0 { + i -= len(m.MintToAddress) + copy(dAtA[i:], m.MintToAddress) + i = encodeVarintTx(dAtA, i, uint64(len(m.MintToAddress))) + i-- + dAtA[i] = 0x1a + } { size, err := m.Amount.MarshalToSizedBuffer(dAtA[:i]) if err != nil { @@ -802,7 +1265,14 @@ func (m *MsgBurn) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - { + if len(m.BurnFromAddress) > 0 { + i -= len(m.BurnFromAddress) + copy(dAtA[i:], m.BurnFromAddress) + i = encodeVarintTx(dAtA, i, uint64(len(m.BurnFromAddress))) + i-- + dAtA[i] = 0x1a + } + { size, err := m.Amount.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err @@ -912,6 +1382,213 @@ func (m *MsgChangeAdminResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) return len(dAtA) - i, nil } +func (m *MsgSetBeforeSendHook) 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 *MsgSetBeforeSendHook) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MsgSetBeforeSendHook) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.CosmwasmAddress) > 0 { + i -= len(m.CosmwasmAddress) + copy(dAtA[i:], m.CosmwasmAddress) + i = encodeVarintTx(dAtA, i, uint64(len(m.CosmwasmAddress))) + i-- + dAtA[i] = 0x1a + } + if len(m.Denom) > 0 { + i -= len(m.Denom) + copy(dAtA[i:], m.Denom) + i = encodeVarintTx(dAtA, i, uint64(len(m.Denom))) + i-- + dAtA[i] = 0x12 + } + if len(m.Sender) > 0 { + i -= len(m.Sender) + copy(dAtA[i:], m.Sender) + i = encodeVarintTx(dAtA, i, uint64(len(m.Sender))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *MsgSetBeforeSendHookResponse) 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 *MsgSetBeforeSendHookResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MsgSetBeforeSendHookResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + return len(dAtA) - i, nil +} + +func (m *MsgSetDenomMetadata) 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 *MsgSetDenomMetadata) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MsgSetDenomMetadata) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + { + size, err := m.Metadata.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTx(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + if len(m.Sender) > 0 { + i -= len(m.Sender) + copy(dAtA[i:], m.Sender) + i = encodeVarintTx(dAtA, i, uint64(len(m.Sender))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *MsgSetDenomMetadataResponse) 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 *MsgSetDenomMetadataResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MsgSetDenomMetadataResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + return len(dAtA) - i, nil +} + +func (m *MsgForceTransfer) 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 *MsgForceTransfer) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MsgForceTransfer) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.TransferToAddress) > 0 { + i -= len(m.TransferToAddress) + copy(dAtA[i:], m.TransferToAddress) + i = encodeVarintTx(dAtA, i, uint64(len(m.TransferToAddress))) + i-- + dAtA[i] = 0x22 + } + if len(m.TransferFromAddress) > 0 { + i -= len(m.TransferFromAddress) + copy(dAtA[i:], m.TransferFromAddress) + i = encodeVarintTx(dAtA, i, uint64(len(m.TransferFromAddress))) + i-- + dAtA[i] = 0x1a + } + { + size, err := m.Amount.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTx(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + if len(m.Sender) > 0 { + i -= len(m.Sender) + copy(dAtA[i:], m.Sender) + i = encodeVarintTx(dAtA, i, uint64(len(m.Sender))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *MsgForceTransferResponse) 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 *MsgForceTransferResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MsgForceTransferResponse) 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 @@ -965,6 +1642,10 @@ func (m *MsgMint) Size() (n int) { } l = m.Amount.Size() n += 1 + l + sovTx(uint64(l)) + l = len(m.MintToAddress) + if l > 0 { + n += 1 + l + sovTx(uint64(l)) + } return n } @@ -989,6 +1670,10 @@ func (m *MsgBurn) Size() (n int) { } l = m.Amount.Size() n += 1 + l + sovTx(uint64(l)) + l = len(m.BurnFromAddress) + if l > 0 { + n += 1 + l + sovTx(uint64(l)) + } return n } @@ -1019,25 +1704,701 @@ func (m *MsgChangeAdmin) Size() (n int) { if l > 0 { n += 1 + l + sovTx(uint64(l)) } - return n -} + return n +} + +func (m *MsgChangeAdminResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + return n +} + +func (m *MsgSetBeforeSendHook) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Sender) + if l > 0 { + n += 1 + l + sovTx(uint64(l)) + } + l = len(m.Denom) + if l > 0 { + n += 1 + l + sovTx(uint64(l)) + } + l = len(m.CosmwasmAddress) + if l > 0 { + n += 1 + l + sovTx(uint64(l)) + } + return n +} + +func (m *MsgSetBeforeSendHookResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + return n +} + +func (m *MsgSetDenomMetadata) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Sender) + if l > 0 { + n += 1 + l + sovTx(uint64(l)) + } + l = m.Metadata.Size() + n += 1 + l + sovTx(uint64(l)) + return n +} + +func (m *MsgSetDenomMetadataResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + return n +} + +func (m *MsgForceTransfer) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Sender) + if l > 0 { + n += 1 + l + sovTx(uint64(l)) + } + l = m.Amount.Size() + n += 1 + l + sovTx(uint64(l)) + l = len(m.TransferFromAddress) + if l > 0 { + n += 1 + l + sovTx(uint64(l)) + } + l = len(m.TransferToAddress) + if l > 0 { + n += 1 + l + sovTx(uint64(l)) + } + return n +} + +func (m *MsgForceTransferResponse) 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 *MsgCreateDenom) 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: MsgCreateDenom: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MsgCreateDenom: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Sender", 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.Sender = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Subdenom", 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.Subdenom = string(dAtA[iNdEx:postIndex]) + 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 *MsgCreateDenomResponse) 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: MsgCreateDenomResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MsgCreateDenomResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field NewTokenDenom", 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.NewTokenDenom = string(dAtA[iNdEx:postIndex]) + 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 *MsgMint) 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: MsgMint: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MsgMint: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Sender", 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.Sender = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Amount", 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.Amount.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field MintToAddress", 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.MintToAddress = string(dAtA[iNdEx:postIndex]) + 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 *MsgMintResponse) 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: MsgMintResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MsgMintResponse: 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 (m *MsgBurn) 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: MsgBurn: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MsgBurn: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Sender", 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.Sender = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Amount", 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.Amount.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field BurnFromAddress", 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.BurnFromAddress = string(dAtA[iNdEx:postIndex]) + 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 + } + } -func (m *MsgChangeAdminResponse) Size() (n int) { - if m == nil { - return 0 + if iNdEx > l { + return io.ErrUnexpectedEOF } - var l int - _ = l - return n + return nil } +func (m *MsgBurnResponse) 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: MsgBurnResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MsgBurnResponse: 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 + } + } -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)))) + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil } -func (m *MsgCreateDenom) Unmarshal(dAtA []byte) error { +func (m *MsgChangeAdmin) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -1060,10 +2421,10 @@ func (m *MsgCreateDenom) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: MsgCreateDenom: wiretype end group for non-group") + return fmt.Errorf("proto: MsgChangeAdmin: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: MsgCreateDenom: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: MsgChangeAdmin: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -1100,7 +2461,7 @@ func (m *MsgCreateDenom) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Subdenom", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Denom", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -1128,7 +2489,39 @@ func (m *MsgCreateDenom) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Subdenom = string(dAtA[iNdEx:postIndex]) + m.Denom = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field NewAdmin", 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.NewAdmin = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex default: iNdEx = preIndex @@ -1151,7 +2544,7 @@ func (m *MsgCreateDenom) Unmarshal(dAtA []byte) error { } return nil } -func (m *MsgCreateDenomResponse) Unmarshal(dAtA []byte) error { +func (m *MsgChangeAdminResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -1174,44 +2567,12 @@ func (m *MsgCreateDenomResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: MsgCreateDenomResponse: wiretype end group for non-group") + return fmt.Errorf("proto: MsgChangeAdminResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: MsgCreateDenomResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: MsgChangeAdminResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field NewTokenDenom", 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.NewTokenDenom = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTx(dAtA[iNdEx:]) @@ -1233,7 +2594,7 @@ func (m *MsgCreateDenomResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *MsgMint) Unmarshal(dAtA []byte) error { +func (m *MsgSetBeforeSendHook) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -1256,10 +2617,10 @@ func (m *MsgMint) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: MsgMint: wiretype end group for non-group") + return fmt.Errorf("proto: MsgSetBeforeSendHook: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: MsgMint: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: MsgSetBeforeSendHook: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -1296,9 +2657,9 @@ func (m *MsgMint) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Amount", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Denom", wireType) } - var msglen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTx @@ -1308,24 +2669,55 @@ func (m *MsgMint) 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 ErrInvalidLengthTx } - postIndex := iNdEx + msglen + postIndex := iNdEx + intStringLen if postIndex < 0 { return ErrInvalidLengthTx } if postIndex > l { return io.ErrUnexpectedEOF } - if err := m.Amount.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err + m.Denom = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field CosmwasmAddress", 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.CosmwasmAddress = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex default: iNdEx = preIndex @@ -1348,7 +2740,7 @@ func (m *MsgMint) Unmarshal(dAtA []byte) error { } return nil } -func (m *MsgMintResponse) Unmarshal(dAtA []byte) error { +func (m *MsgSetBeforeSendHookResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -1371,10 +2763,10 @@ func (m *MsgMintResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: MsgMintResponse: wiretype end group for non-group") + return fmt.Errorf("proto: MsgSetBeforeSendHookResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: MsgMintResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: MsgSetBeforeSendHookResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { default: @@ -1398,7 +2790,7 @@ func (m *MsgMintResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *MsgBurn) Unmarshal(dAtA []byte) error { +func (m *MsgSetDenomMetadata) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -1421,10 +2813,10 @@ func (m *MsgBurn) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: MsgBurn: wiretype end group for non-group") + return fmt.Errorf("proto: MsgSetDenomMetadata: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: MsgBurn: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: MsgSetDenomMetadata: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -1461,7 +2853,7 @@ func (m *MsgBurn) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Amount", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Metadata", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -1488,7 +2880,7 @@ func (m *MsgBurn) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := m.Amount.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Metadata.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -1513,7 +2905,7 @@ func (m *MsgBurn) Unmarshal(dAtA []byte) error { } return nil } -func (m *MsgBurnResponse) Unmarshal(dAtA []byte) error { +func (m *MsgSetDenomMetadataResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -1536,10 +2928,10 @@ func (m *MsgBurnResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: MsgBurnResponse: wiretype end group for non-group") + return fmt.Errorf("proto: MsgSetDenomMetadataResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: MsgBurnResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: MsgSetDenomMetadataResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { default: @@ -1563,7 +2955,7 @@ func (m *MsgBurnResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *MsgChangeAdmin) Unmarshal(dAtA []byte) error { +func (m *MsgForceTransfer) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -1586,10 +2978,10 @@ func (m *MsgChangeAdmin) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: MsgChangeAdmin: wiretype end group for non-group") + return fmt.Errorf("proto: MsgForceTransfer: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: MsgChangeAdmin: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: MsgForceTransfer: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -1626,7 +3018,40 @@ func (m *MsgChangeAdmin) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Denom", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Amount", 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.Amount.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field TransferFromAddress", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -1654,11 +3079,11 @@ func (m *MsgChangeAdmin) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Denom = string(dAtA[iNdEx:postIndex]) + m.TransferFromAddress = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 3: + case 4: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field NewAdmin", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field TransferToAddress", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -1686,7 +3111,7 @@ func (m *MsgChangeAdmin) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.NewAdmin = string(dAtA[iNdEx:postIndex]) + m.TransferToAddress = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex default: iNdEx = preIndex @@ -1709,7 +3134,7 @@ func (m *MsgChangeAdmin) Unmarshal(dAtA []byte) error { } return nil } -func (m *MsgChangeAdminResponse) Unmarshal(dAtA []byte) error { +func (m *MsgForceTransferResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -1732,10 +3157,10 @@ func (m *MsgChangeAdminResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: MsgChangeAdminResponse: wiretype end group for non-group") + return fmt.Errorf("proto: MsgForceTransferResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: MsgChangeAdminResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: MsgForceTransferResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { default: From 143c6c9865aeb701ddedcc7cd08efd46b7ebff25 Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Wed, 23 Aug 2023 12:30:42 +0400 Subject: [PATCH 053/307] rework to get rid of rudimentary proposals --- app/app.go | 3 +- go.mod | 3 +- go.sum | 4 +- wasmbinding/bindings/msg.go | 59 ++++-------------------- wasmbinding/message_plugin.go | 85 ++++------------------------------- 5 files changed, 20 insertions(+), 134 deletions(-) diff --git a/app/app.go b/app/app.go index 0c2ec4f87..b0f40236d 100644 --- a/app/app.go +++ b/app/app.go @@ -635,7 +635,6 @@ func New( AddRoute(upgradetypes.RouterKey, upgrade.NewSoftwareUpgradeProposalHandler(&app.UpgradeKeeper)). AddRoute(ibchost.RouterKey, ibcclient.NewClientProposalHandler(app.IBCKeeper.ClientKeeper)) - keeperModules := map[string]adminmodulemodulekeeper.RegisteredModuleUpdateParams{wasm.ModuleName: {UpdateParamsMsg: &wasmtypes.MsgUpdateParams{}}} app.AdminmoduleKeeper = *adminmodulemodulekeeper.NewKeeper( appCodec, keys[adminmodulemoduletypes.StoreKey], @@ -643,7 +642,7 @@ func New( adminRouterLegacy, app.MsgServiceRouter(), IsConsumerProposalAllowlisted, - keeperModules, + func(string) bool { return true }, ) adminModule := adminmodulemodule.NewAppModule(appCodec, app.AdminmoduleKeeper) diff --git a/go.mod b/go.mod index 2e330cffc..194b502e9 100644 --- a/go.mod +++ b/go.mod @@ -29,7 +29,6 @@ require ( github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.16.0 github.com/rs/zerolog v1.29.1 - github.com/rs/zerolog v1.29.1 github.com/skip-mev/pob v1.0.3 github.com/spf13/cast v1.5.1 github.com/spf13/cobra v1.7.0 @@ -191,7 +190,7 @@ replace ( github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0 github.com/ChainSafe/go-schnorrkel => github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d github.com/CosmWasm/wasmd => github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230808084410-6083b888424e - github.com/cosmos/admin-module => github.com/neutron-org/admin-module v0.0.0-20230816141742-5c3c1b7b898e + github.com/cosmos/admin-module => github.com/neutron-org/admin-module v0.0.0-20230823081308-b02d1ad105cb github.com/cosmos/cosmos-sdk => github.com/neutron-org/cosmos-sdk v0.47.5-0.20230808152221-a0e301227957 github.com/cosmos/gaia/v11 => github.com/cosmos/gaia/v11 v11.0.0-20230724152830-861ba391c3b4 github.com/cosmos/ledger-cosmos-go => github.com/cosmos/ledger-cosmos-go v0.12.1 diff --git a/go.sum b/go.sum index 642ca1b96..f4fb8a248 100644 --- a/go.sum +++ b/go.sum @@ -938,8 +938,8 @@ github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxzi github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/neilotoole/errgroup v0.1.6/go.mod h1:Q2nLGf+594h0CLBs/Mbg6qOr7GtqDK7C2S41udRnToE= -github.com/neutron-org/admin-module v0.0.0-20230816141742-5c3c1b7b898e h1:VM84Gg+L8etB2RCyLaR/191Z9/HwsGpaJO1bFJoIUUg= -github.com/neutron-org/admin-module v0.0.0-20230816141742-5c3c1b7b898e/go.mod h1:QuxQ7FJlEAFMRssyEYOrR9ORnYQvBFMTlO8BXny6ntw= +github.com/neutron-org/admin-module v0.0.0-20230823081308-b02d1ad105cb h1:lIK75IVEeMOVaaGL5cy73UNqg6evv6LcUewd6JfO+lA= +github.com/neutron-org/admin-module v0.0.0-20230823081308-b02d1ad105cb/go.mod h1:QuxQ7FJlEAFMRssyEYOrR9ORnYQvBFMTlO8BXny6ntw= github.com/neutron-org/cosmos-sdk v0.47.5-0.20230808152221-a0e301227957 h1:cl6UqD18qV/QXgT6Yjo2TelfbaOqQGuvL1yX0cWguSs= github.com/neutron-org/cosmos-sdk v0.47.5-0.20230808152221-a0e301227957/go.mod h1:4xMyIVekAs2OEUz/yh9JwzhLBMk+olM2sxgKuQdlhLg= github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230808084410-6083b888424e h1:uVJCBWf1vcCYY0pzOA2SCPIZT8WsR8fsOxs57mnJbM4= diff --git a/wasmbinding/bindings/msg.go b/wasmbinding/bindings/msg.go index de2058fa0..4e914f7e3 100644 --- a/wasmbinding/bindings/msg.go +++ b/wasmbinding/bindings/msg.go @@ -2,6 +2,8 @@ package bindings import ( + "encoding/json" + "cosmossdk.io/math" cosmostypes "github.com/cosmos/cosmos-sdk/codec/types" paramChange "github.com/cosmos/cosmos-sdk/x/params/types/proposal" @@ -89,16 +91,10 @@ type SubmitAdminProposal struct { } type AdminProposal struct { - ParamChangeProposal *ParamChangeProposal `json:"param_change_proposal,omitempty"` - SoftwareUpgradeProposal *SoftwareUpgradeProposal `json:"software_upgrade_proposal,omitempty"` - CancelSoftwareUpgradeProposal *CancelSoftwareUpgradeProposal `json:"cancel_software_upgrade_proposal,omitempty"` - UpgradeProposal *UpgradeProposal `json:"upgrade_proposal,omitempty"` - ClientUpdateProposal *ClientUpdateProposal `json:"client_update_proposal,omitempty"` - PinCodesProposal *PinCodesProposal `json:"pin_codes_proposal,omitempty"` - UnpinCodesProposal *UnpinCodesProposal `json:"unpin_codes_proposal,omitempty"` - UpdateAdminProposal *UpdateAdminProposal `json:"update_admin_proposal,omitempty"` - ClearAdminProposal *ClearAdminProposal `json:"clear_admin_proposal,omitempty"` - ParamChangeNewProposal *ParamChangeNewProposal `json:"param_change_new_proposal,omitempty"` + ParamChangeProposal *ParamChangeProposal `json:"param_change_proposal,omitempty"` + UpgradeProposal *UpgradeProposal `json:"upgrade_proposal,omitempty"` + ClientUpdateProposal *ClientUpdateProposal `json:"client_update_proposal,omitempty"` + ProposalExecuteMessage *ProposalExecuteMessage `json:"proposal_execute_message,omitempty"` } type ParamChangeProposal struct { @@ -107,19 +103,6 @@ type ParamChangeProposal struct { ParamChanges []paramChange.ParamChange `json:"param_changes"` } -type SoftwareUpgradeProposal struct { - // deprecated - Title string `json:"title"` - // deprecated - Description string `json:"description"` - Plan Plan `json:"plan"` -} - -type CancelSoftwareUpgradeProposal struct { - Title string `json:"title"` - Description string `json:"description"` -} - type Plan struct { Name string `json:"name"` Height int64 `json:"height"` @@ -160,34 +143,8 @@ type ClientUpdateProposal struct { SubstituteClientId string `json:"substitute_client_id,omitempty"` } -type PinCodesProposal struct { - Title string `json:"title,omitempty"` - Description string `json:"description,omitempty"` - CodeIDs []uint64 `json:"code_ids,omitempty"` -} - -type UnpinCodesProposal struct { - Title string `json:"title,omitempty"` - Description string `json:"description,omitempty"` - CodeIDs []uint64 `json:"code_ids,omitempty"` -} - -type UpdateAdminProposal struct { - Title string `json:"title,omitempty"` - Description string `json:"description,omitempty"` - NewAdmin string `json:"new_admin"` - Contract string `json:"contract,omitempty"` -} - -type ClearAdminProposal struct { - Title string `json:"title,omitempty"` - Description string `json:"description,omitempty"` - Contract string `json:"contract,omitempty"` -} - -type ParamChangeNewProposal struct { - Module string `json:"module,omitempty"` - NewParams string `json:"new_params,omitempty"` +type ProposalExecuteMessage struct { + Message json.RawMessage `json:"message,omitempty"` } // CreateDenom creates a new factory denom, of denomination: diff --git a/wasmbinding/message_plugin.go b/wasmbinding/message_plugin.go index a51b8c53d..1eb37dba2 100644 --- a/wasmbinding/message_plugin.go +++ b/wasmbinding/message_plugin.go @@ -9,8 +9,6 @@ import ( crontypes "github.com/neutron-org/neutron/x/cron/types" - wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" - cronkeeper "github.com/neutron-org/neutron/x/cron/keeper" paramChange "github.com/cosmos/cosmos-sdk/x/params/types/proposal" @@ -420,7 +418,7 @@ func (m *CustomMessenger) performSubmitAdminProposalLegacy(ctx sdk.Context, cont func (m *CustomMessenger) performSubmitAdminProposal(ctx sdk.Context, contractAddr sdk.AccAddress, submitAdminProposal *bindings.SubmitAdminProposal) (*admintypes.MsgSubmitProposalResponse, error) { proposal := submitAdminProposal.AdminProposal - authority := authtypes.NewModuleAddress(admintypes.ModuleName).String() + authority := authtypes.NewModuleAddress(admintypes.ModuleName) err := m.validateProposalQty(&proposal) if err != nil { @@ -431,63 +429,14 @@ func (m *CustomMessenger) performSubmitAdminProposal(ctx sdk.Context, contractAd var sdkMsgs []sdk.Msg var sdkMsg sdk.Msg - if proposal.SoftwareUpgradeProposal != nil { - p := proposal.SoftwareUpgradeProposal - sdkMsg = &softwareUpgrade.MsgSoftwareUpgrade{ - Authority: authority, - Plan: softwareUpgrade.Plan{ - Name: p.Plan.Name, - Height: p.Plan.Height, - Info: p.Plan.Info, - }, - } - } - - if proposal.CancelSoftwareUpgradeProposal != nil { - sdkMsg = &softwareUpgrade.MsgCancelUpgrade{Authority: authority} - } - - if proposal.PinCodesProposal != nil { - p := proposal.PinCodesProposal - sdkMsg = &wasmtypes.MsgPinCodes{Authority: authority, CodeIDs: p.CodeIDs} - } - - if proposal.UnpinCodesProposal != nil { - p := proposal.UnpinCodesProposal - sdkMsg = &wasmtypes.MsgUnpinCodes{Authority: authority, CodeIDs: p.CodeIDs} - } - - if proposal.UpdateAdminProposal != nil { - p := proposal.UpdateAdminProposal - sdkMsg = &wasmtypes.MsgUpdateAdmin{ - Sender: authority, - NewAdmin: p.NewAdmin, - Contract: p.Contract, - } - } - - if proposal.ClearAdminProposal != nil { - p := proposal.ClearAdminProposal - sdkMsg = &wasmtypes.MsgClearAdmin{ - Sender: authority, - Contract: p.Contract, - } + cdc := m.AdminKeeper.Codec() + err = cdc.UnmarshalInterfaceJSON(proposal.ProposalExecuteMessage.Message, &sdkMsg) + if err != nil { + return nil, errors.Wrap(err, "failed to unmarshall incoming sdk message") } - - if proposal.ParamChangeNewProposal != nil { - p := proposal.ParamChangeNewProposal - myJsonString := fmt.Sprintf(`{"authority":"%s", "params": "%s"}`, authority, p.NewParams) - module, ok := m.AdminKeeper.RegisteredModulesUpdateParams[p.Module] - if ok { - sdkMsg = module.UpdateParamsMsg - err := json.Unmarshal([]byte(myJsonString), sdkMsg) - if err != nil { - return nil, errors.Wrap(err, "failed to marshal incoming UpdateParams message") - - } - } else { - return nil, errors.Wrap(err, "module is not registered to update params") - } + signers := sdkMsg.GetSigners() + if signers[0].Equals(authority) && len(signers) != 0 { + return nil, errors.Wrap(err, "authority in incoming msg is not equal to admin module") } sdkMsgs = append(sdkMsgs, sdkMsg) msg, err = admintypes.NewMsgSubmitProposal(sdkMsgs, contractAddr) @@ -806,30 +755,12 @@ func (m *CustomMessenger) validateProposalQty(proposal *bindings.AdminProposal) if proposal.ParamChangeProposal != nil { qty++ } - if proposal.SoftwareUpgradeProposal != nil { - qty++ - } - if proposal.CancelSoftwareUpgradeProposal != nil { - qty++ - } if proposal.ClientUpdateProposal != nil { qty++ } if proposal.UpgradeProposal != nil { qty++ } - if proposal.PinCodesProposal != nil { - qty++ - } - if proposal.UnpinCodesProposal != nil { - qty++ - } - if proposal.UpdateAdminProposal != nil { - qty++ - } - if proposal.ClearAdminProposal != nil { - qty++ - } if qty == 0 { return fmt.Errorf("no admin proposal type is present in message") From 44455a1923dd98c2ed9ff0b12c0cf9107651e943 Mon Sep 17 00:00:00 2001 From: nhpd Date: Wed, 23 Aug 2023 14:06:57 +0400 Subject: [PATCH 054/307] fix review --- app/upgrades/nextupgrade/upgrades.go | 5 ++-- app/upgrades/nextupgrade/upgrades_test.go | 9 +++++--- tests/e2e/rewards_test.go | 28 ----------------------- 3 files changed, 9 insertions(+), 33 deletions(-) delete mode 100644 tests/e2e/rewards_test.go diff --git a/app/upgrades/nextupgrade/upgrades.go b/app/upgrades/nextupgrade/upgrades.go index 62b61c92c..1dbbda45b 100644 --- a/app/upgrades/nextupgrade/upgrades.go +++ b/app/upgrades/nextupgrade/upgrades.go @@ -102,8 +102,9 @@ func migrateRewardDenoms(ctx sdk.Context, keepers *upgrades.UpgradeKeepers) erro var denoms []string keepers.CcvConsumerSubspace.Get(ctx, ccvconsumertypes.KeyRewardDenoms, &denoms) - // add new denom - denoms = append(denoms, "ibc/F082B65C88E4B6D5EF1DB243CDA1D331D002759E938A0F5CD3FFDC5D53B3E349") + // add new axlr usdc denom + axlrDenom := "ibc/F082B65C88E4B6D5EF1DB243CDA1D331D002759E938A0F5CD3FFDC5D53B3E349" + denoms = append(denoms, axlrDenom) keepers.CcvConsumerSubspace.Set(ctx, ccvconsumertypes.KeyRewardDenoms, &denoms) diff --git a/app/upgrades/nextupgrade/upgrades_test.go b/app/upgrades/nextupgrade/upgrades_test.go index 00e874aa2..6f57ac2dc 100644 --- a/app/upgrades/nextupgrade/upgrades_test.go +++ b/app/upgrades/nextupgrade/upgrades_test.go @@ -1,6 +1,7 @@ package nextupgrade_test import ( + "github.com/neutron-org/neutron/app/params" "testing" ccvconsumertypes "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types" @@ -79,10 +80,12 @@ func (suite *UpgradeTestSuite) TestRewardDenomsUpgrade() { suite.Require().True(ccvConsumerSubspace.Has(ctx, ccvconsumertypes.KeyRewardDenoms)) + // emulate mainnet/testnet state + ccvConsumerSubspace.Set(ctx, ccvconsumertypes.KeyRewardDenoms, &[]string{params.DefaultDenom}) + var denomsBefore []string ccvConsumerSubspace.Get(ctx, ccvconsumertypes.KeyRewardDenoms, &denomsBefore) - var empty []string = nil - suite.Require().Equal(denomsBefore, empty) + suite.Require().Equal(denomsBefore, []string{params.DefaultDenom}) upgrade := upgradetypes.Plan{ Name: nextupgrade.UpgradeName, @@ -95,6 +98,6 @@ func (suite *UpgradeTestSuite) TestRewardDenomsUpgrade() { var denoms []string ccvConsumerSubspace.Get(ctx, ccvconsumertypes.KeyRewardDenoms, &denoms) - requiredDenoms := []string{"ibc/F082B65C88E4B6D5EF1DB243CDA1D331D002759E938A0F5CD3FFDC5D53B3E349"} + requiredDenoms := []string{params.DefaultDenom, "ibc/F082B65C88E4B6D5EF1DB243CDA1D331D002759E938A0F5CD3FFDC5D53B3E349"} suite.Require().Equal(requiredDenoms, denoms) } diff --git a/tests/e2e/rewards_test.go b/tests/e2e/rewards_test.go deleted file mode 100644 index 51b3bcc52..000000000 --- a/tests/e2e/rewards_test.go +++ /dev/null @@ -1,28 +0,0 @@ -package e2e - -import ( - "github.com/neutron-org/neutron/testutil" - "github.com/stretchr/testify/suite" - "testing" -) - -type RewardsTestSuite struct { - testutil.IBCConnectionTestSuite -} - -func TestRewards(t *testing.T) { - suite.Run(t, new(RewardsTestSuite)) -} - -func (suite *RewardsTestSuite) TestOnRecvPacketHooks() { - suite.ConfigureTransferChannel() - neutron := suite.GetNeutronZoneApp(suite.ChainA) - - // so we have a connection - suite. - suite.TransferPath.EndpointA.ChannelID - - // we need to make a transaction with non-untrn fees - - // after that check that we transferred fees to the specified address -} From fc3e6fc654b87530f0511fea7d532bcf111f1e30 Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Fri, 25 Aug 2023 13:04:16 +0400 Subject: [PATCH 055/307] add whitelisting, fix issues, upd adminmodule --- app/app.go | 2 +- app/proposals_allowlisting.go | 25 +++++++++++++++++-------- go.mod | 2 +- go.sum | 4 ++-- wasmbinding/bindings/msg.go | 4 +--- wasmbinding/message_plugin.go | 13 ++++++++++--- 6 files changed, 32 insertions(+), 18 deletions(-) diff --git a/app/app.go b/app/app.go index b0f40236d..501d2ce38 100644 --- a/app/app.go +++ b/app/app.go @@ -642,7 +642,7 @@ func New( adminRouterLegacy, app.MsgServiceRouter(), IsConsumerProposalAllowlisted, - func(string) bool { return true }, + isSdkMessageWhitelisted, ) adminModule := adminmodulemodule.NewAppModule(appCodec, app.AdminmoduleKeeper) diff --git a/app/proposals_allowlisting.go b/app/proposals_allowlisting.go index 14db9c23d..dd36d5150 100644 --- a/app/proposals_allowlisting.go +++ b/app/proposals_allowlisting.go @@ -2,6 +2,7 @@ package app import ( wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" + sdk "github.com/cosmos/cosmos-sdk/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" "github.com/cosmos/cosmos-sdk/x/params/types/proposal" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" @@ -16,14 +17,8 @@ func IsConsumerProposalAllowlisted(content govtypes.Content) bool { switch c := content.(type) { case *proposal.ParameterChangeProposal: return isConsumerParamChangeWhitelisted(c.Changes) - case *upgradetypes.SoftwareUpgradeProposal, - *upgradetypes.CancelSoftwareUpgradeProposal, - *ibcclienttypes.ClientUpdateProposal, - *ibcclienttypes.UpgradeProposal, - *wasmtypes.PinCodesProposal, - *wasmtypes.UnpinCodesProposal, - *wasmtypes.UpdateAdminProposal, - *wasmtypes.ClearAdminProposal: + case *ibcclienttypes.ClientUpdateProposal, + *ibcclienttypes.UpgradeProposal: return true default: @@ -41,6 +36,20 @@ func isConsumerParamChangeWhitelisted(paramChanges []proposal.ParamChange) bool return true } +func isSdkMessageWhitelisted(msg sdk.Msg) bool { + switch msg.(type) { + case *wasmtypes.MsgClearAdmin, + *wasmtypes.MsgUpdateAdmin, + *wasmtypes.MsgUpdateParams, + *wasmtypes.MsgPinCodes, + *wasmtypes.MsgUnpinCodes, + *upgradetypes.MsgSoftwareUpgrade, + *upgradetypes.MsgCancelUpgrade: + return true + } + return false +} + type paramChangeKey struct { Subspace, Key string } diff --git a/go.mod b/go.mod index 194b502e9..312966dff 100644 --- a/go.mod +++ b/go.mod @@ -190,7 +190,7 @@ replace ( github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0 github.com/ChainSafe/go-schnorrkel => github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d github.com/CosmWasm/wasmd => github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230808084410-6083b888424e - github.com/cosmos/admin-module => github.com/neutron-org/admin-module v0.0.0-20230823081308-b02d1ad105cb + github.com/cosmos/admin-module => github.com/neutron-org/admin-module v0.0.0-20230825075449-97f3b415da45 github.com/cosmos/cosmos-sdk => github.com/neutron-org/cosmos-sdk v0.47.5-0.20230808152221-a0e301227957 github.com/cosmos/gaia/v11 => github.com/cosmos/gaia/v11 v11.0.0-20230724152830-861ba391c3b4 github.com/cosmos/ledger-cosmos-go => github.com/cosmos/ledger-cosmos-go v0.12.1 diff --git a/go.sum b/go.sum index f4fb8a248..b45e8b99e 100644 --- a/go.sum +++ b/go.sum @@ -938,8 +938,8 @@ github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxzi github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/neilotoole/errgroup v0.1.6/go.mod h1:Q2nLGf+594h0CLBs/Mbg6qOr7GtqDK7C2S41udRnToE= -github.com/neutron-org/admin-module v0.0.0-20230823081308-b02d1ad105cb h1:lIK75IVEeMOVaaGL5cy73UNqg6evv6LcUewd6JfO+lA= -github.com/neutron-org/admin-module v0.0.0-20230823081308-b02d1ad105cb/go.mod h1:QuxQ7FJlEAFMRssyEYOrR9ORnYQvBFMTlO8BXny6ntw= +github.com/neutron-org/admin-module v0.0.0-20230825075449-97f3b415da45 h1:7DdiXFwKZXhMBYp32k50q+jhnUkJVrLxNy2AalNqF/U= +github.com/neutron-org/admin-module v0.0.0-20230825075449-97f3b415da45/go.mod h1:QuxQ7FJlEAFMRssyEYOrR9ORnYQvBFMTlO8BXny6ntw= github.com/neutron-org/cosmos-sdk v0.47.5-0.20230808152221-a0e301227957 h1:cl6UqD18qV/QXgT6Yjo2TelfbaOqQGuvL1yX0cWguSs= github.com/neutron-org/cosmos-sdk v0.47.5-0.20230808152221-a0e301227957/go.mod h1:4xMyIVekAs2OEUz/yh9JwzhLBMk+olM2sxgKuQdlhLg= github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230808084410-6083b888424e h1:uVJCBWf1vcCYY0pzOA2SCPIZT8WsR8fsOxs57mnJbM4= diff --git a/wasmbinding/bindings/msg.go b/wasmbinding/bindings/msg.go index 4e914f7e3..e1b4fcff7 100644 --- a/wasmbinding/bindings/msg.go +++ b/wasmbinding/bindings/msg.go @@ -2,8 +2,6 @@ package bindings import ( - "encoding/json" - "cosmossdk.io/math" cosmostypes "github.com/cosmos/cosmos-sdk/codec/types" paramChange "github.com/cosmos/cosmos-sdk/x/params/types/proposal" @@ -144,7 +142,7 @@ type ClientUpdateProposal struct { } type ProposalExecuteMessage struct { - Message json.RawMessage `json:"message,omitempty"` + Message string `json:"message,omitempty"` } // CreateDenom creates a new factory denom, of denomination: diff --git a/wasmbinding/message_plugin.go b/wasmbinding/message_plugin.go index 1eb37dba2..442f18156 100644 --- a/wasmbinding/message_plugin.go +++ b/wasmbinding/message_plugin.go @@ -428,14 +428,17 @@ func (m *CustomMessenger) performSubmitAdminProposal(ctx sdk.Context, contractAd var msg *admintypes.MsgSubmitProposal var sdkMsgs []sdk.Msg var sdkMsg sdk.Msg - cdc := m.AdminKeeper.Codec() - err = cdc.UnmarshalInterfaceJSON(proposal.ProposalExecuteMessage.Message, &sdkMsg) + err = cdc.UnmarshalInterfaceJSON([]byte(proposal.ProposalExecuteMessage.Message), &sdkMsg) if err != nil { return nil, errors.Wrap(err, "failed to unmarshall incoming sdk message") } + signers := sdkMsg.GetSigners() - if signers[0].Equals(authority) && len(signers) != 0 { + if len(signers) != 1 { + return nil, errors.Wrap(err, "should be 1 signer") + } + if !signers[0].Equals(authority) { return nil, errors.Wrap(err, "authority in incoming msg is not equal to admin module") } sdkMsgs = append(sdkMsgs, sdkMsg) @@ -762,6 +765,10 @@ func (m *CustomMessenger) validateProposalQty(proposal *bindings.AdminProposal) qty++ } + if proposal.ProposalExecuteMessage != nil { + qty++ + } + if qty == 0 { return fmt.Errorf("no admin proposal type is present in message") } From 7c2ea7aa212e60f9390a2822abe824173a4f1c20 Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Fri, 25 Aug 2023 13:46:27 +0400 Subject: [PATCH 056/307] rm legacy code --- app/app.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/app.go b/app/app.go index 501d2ce38..31e384d8b 100644 --- a/app/app.go +++ b/app/app.go @@ -698,10 +698,6 @@ func New( app.CronKeeper.WasmMsgServer = wasmkeeper.NewMsgServerImpl(&app.WasmKeeper) cronModule := cron.NewAppModule(appCodec, &app.CronKeeper) - // TODO: enabled proposals? - //if len(enabledProposals) != 0 { - // app.AdminmoduleKeeper.Router().AddRoute(wasm.RouterKey, wasm.NewWasmProposalHandler(app.WasmKeeper, enabledProposals)) - //} transferIBCModule := transferSudo.NewIBCModule(app.TransferKeeper) // receive call order: wasmHooks#OnRecvPacketOverride(transferIbcModule#OnRecvPacket()) ibcHooksMiddleware := ibchooks.NewIBCMiddleware(&transferIBCModule, &app.HooksICS4Wrapper) From 15dbeef65622a9bf4330519e77ffc66305a05b49 Mon Sep 17 00:00:00 2001 From: nhpd Date: Mon, 28 Aug 2023 13:51:03 +0400 Subject: [PATCH 057/307] review fixes --- wasmbinding/bindings/query.go | 18 +++--- wasmbinding/test/custom_message_test.go | 2 +- x/contractmanager/keeper/migrations.go | 2 +- x/contractmanager/migrations/v2/store.go | 39 ++++--------- x/contractmanager/migrations/v2/store_test.go | 55 +++---------------- 5 files changed, 31 insertions(+), 85 deletions(-) diff --git a/wasmbinding/bindings/query.go b/wasmbinding/bindings/query.go index 6bc7c25e7..0d76a9ac2 100644 --- a/wasmbinding/bindings/query.go +++ b/wasmbinding/bindings/query.go @@ -113,10 +113,6 @@ type QueryMinIbcFeeResponse struct { MinFee feerefundertypes.Fee `json:"min_fee"` } -type FailuresResponse struct { - Failures []contractmanagertypes.Failure `json:"failures"` -} - func (rq RegisteredQuery) MarshalJSON() ([]byte, error) { type AliasRQ RegisteredQuery @@ -187,11 +183,6 @@ type DenomAdmin struct { Subdenom string `json:"subdenom"` } -type Failures struct { - Address string `json:"address"` - Pagination *query.PageRequest `json:"pagination,omitempty"` -} - type DenomAdminResponse struct { Admin string `json:"admin"` } @@ -199,3 +190,12 @@ type DenomAdminResponse struct { type FullDenomResponse struct { Denom string `json:"denom"` } + +type Failures struct { + Address string `json:"address"` + Pagination *query.PageRequest `json:"pagination,omitempty"` +} + +type FailuresResponse struct { + Failures []contractmanagertypes.Failure `json:"failures"` +} diff --git a/wasmbinding/test/custom_message_test.go b/wasmbinding/test/custom_message_test.go index fc3a6f6ca..83d433f00 100644 --- a/wasmbinding/test/custom_message_test.go +++ b/wasmbinding/test/custom_message_test.go @@ -676,7 +676,7 @@ func (suite *CustomMessengerTestSuite) TestResubmitFailureFromDifferentContract( Response: &ibcchanneltypes.Acknowledgement_Error{Error: "Error"}, } failureID := suite.messenger.ContractmanagerKeeper.GetNextFailureIDKey(suite.ctx, testutil.TestOwnerAddress) - suite.messenger.ContractmanagerKeeper.AddContractFailure(suite.ctx, &packet, testutil.TestOwnerAddress, "timeout", &ack) + suite.messenger.ContractmanagerKeeper.AddContractFailure(suite.ctx, &packet, testutil.TestOwnerAddress, contractmanagertypes.Ack, &ack) // Craft message msg, err := json.Marshal(bindings.NeutronMsg{ diff --git a/x/contractmanager/keeper/migrations.go b/x/contractmanager/keeper/migrations.go index 4e7bfa951..3ec98b470 100644 --- a/x/contractmanager/keeper/migrations.go +++ b/x/contractmanager/keeper/migrations.go @@ -17,5 +17,5 @@ func NewMigrator(keeper Keeper) Migrator { // Migrate1to2 migrates from version 1 to 2. func (m Migrator) Migrate1to2(ctx sdk.Context) error { - return v2.MigrateStore(ctx, m.keeper.storeKey, m.keeper.cdc) + return v2.MigrateStore(ctx, m.keeper.storeKey) } diff --git a/x/contractmanager/migrations/v2/store.go b/x/contractmanager/migrations/v2/store.go index ca77a5a8d..3b43d4be6 100644 --- a/x/contractmanager/migrations/v2/store.go +++ b/x/contractmanager/migrations/v2/store.go @@ -1,36 +1,29 @@ package v2 import ( - "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/store/prefix" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/neutron-org/neutron/x/contractmanager/types" - v1 "github.com/neutron-org/neutron/x/contractmanager/types/v1" ) // MigrateStore performs in-place store migrations. -// The migration rearranges and adds new fields to the failures -func MigrateStore(ctx sdk.Context, storeKey storetypes.StoreKey, cdc codec.BinaryCodec) error { - if err := migrateFailures(ctx, storeKey, cdc); err != nil { - return err - } - - return nil +// The migration rearranges removes all old failures, +// since they do not have the necessary fields packet and ack for resubmission +func MigrateStore(ctx sdk.Context, storeKey storetypes.StoreKey) error { + return migrateFailures(ctx, storeKey) } -func migrateFailures(ctx sdk.Context, storeKey storetypes.StoreKey, cdc codec.BinaryCodec) error { +func migrateFailures(ctx sdk.Context, storeKey storetypes.StoreKey) error { ctx.Logger().Info("Migrating failures...") - // fetch list of all old failures - oldFailuresList := make([]v1.Failure, 0) + // fetch list of all old failure keys + failureKeys := make([][]byte, 0) iteratorStore := prefix.NewStore(ctx.KVStore(storeKey), types.ContractFailuresKey) iterator := sdk.KVStorePrefixIterator(iteratorStore, []byte{}) for ; iterator.Valid(); iterator.Next() { - var val v1.Failure - cdc.MustUnmarshal(iterator.Value(), &val) - oldFailuresList = append(oldFailuresList, val) + failureKeys = append(failureKeys, iterator.Key()) } err := iterator.Close() @@ -38,18 +31,10 @@ func migrateFailures(ctx sdk.Context, storeKey storetypes.StoreKey, cdc codec.Bi return err } - // migrate - store := ctx.KVStore(storeKey) - for _, oldItem := range oldFailuresList { - failure := types.Failure{ - Address: oldItem.Address, - Id: oldItem.Id, - AckType: oldItem.AckType, - Packet: nil, - Ack: nil, - } - bz := cdc.MustMarshal(&failure) - store.Set(types.GetFailureKey(failure.Address, failure.Id), bz) + // remove failures + store := prefix.NewStore(ctx.KVStore(storeKey), types.ContractFailuresKey) + for _, key := range failureKeys { + store.Delete(key) } ctx.Logger().Info("Finished migrating failures") diff --git a/x/contractmanager/migrations/v2/store_test.go b/x/contractmanager/migrations/v2/store_test.go index 6c2edef15..19fddf3ec 100644 --- a/x/contractmanager/migrations/v2/store_test.go +++ b/x/contractmanager/migrations/v2/store_test.go @@ -51,58 +51,19 @@ func (suite *V2ContractManagerMigrationTestSuite) TestFailuresUpgrade() { } // Run migration - suite.NoError(v2.MigrateStore(ctx, storeKey, cdc)) + suite.NoError(v2.MigrateStore(ctx, storeKey)) - // Check elements migrated properly - suite.Require().ElementsMatch(app.ContractManagerKeeper.GetAllFailures(ctx), []types.Failure{ - { - Address: addressOne, - Id: 0, - AckType: types.Ack, - Packet: nil, - Ack: nil, - }, - { - Address: addressOne, - Id: 1, - AckType: types.Ack, - Packet: nil, - Ack: nil, - }, - { - Address: addressTwo, - Id: 0, - AckType: types.Ack, - Packet: nil, - Ack: nil, - }, - { - Address: addressTwo, - Id: 1, - AckType: types.Ack, - Packet: nil, - Ack: nil, - }, - }) - - // Check getting element works - failure, err := app.ContractManagerKeeper.GetFailure(ctx, sdk.MustAccAddressFromBech32(addressTwo), 1) - suite.Require().NoError(err) - suite.Require().Equal(failure, &types.Failure{ - Address: addressTwo, - Id: 1, - AckType: types.Ack, - Packet: nil, - Ack: nil, - }) + // Check elements should be empty + expected := app.ContractManagerKeeper.GetAllFailures(ctx) + suite.Require().ElementsMatch(expected, []types.Failure{}) // Non-existent returns error - _, err = app.ContractManagerKeeper.GetFailure(ctx, sdk.MustAccAddressFromBech32(addressTwo), 2) + _, err := app.ContractManagerKeeper.GetFailure(ctx, sdk.MustAccAddressFromBech32(addressTwo), 0) suite.Require().Error(err) - // Check next id key is correct + // Check next id key is reset oneKey := app.ContractManagerKeeper.GetNextFailureIDKey(ctx, addressOne) - suite.Require().Equal(oneKey, uint64(2)) + suite.Require().Equal(oneKey, uint64(0)) twoKey := app.ContractManagerKeeper.GetNextFailureIDKey(ctx, addressTwo) - suite.Require().Equal(twoKey, uint64(2)) + suite.Require().Equal(twoKey, uint64(0)) } From a43d862e18b0b7d98d2a0bd9e1d0a9396f5569d0 Mon Sep 17 00:00:00 2001 From: nhpd Date: Mon, 28 Aug 2023 14:20:12 +0400 Subject: [PATCH 058/307] add failure id to response --- wasmbinding/bindings/msg.go | 4 +++- wasmbinding/message_plugin.go | 6 +----- wasmbinding/test/custom_message_test.go | 2 +- x/contractmanager/keeper/failure_test.go | 9 --------- 4 files changed, 5 insertions(+), 16 deletions(-) diff --git a/wasmbinding/bindings/msg.go b/wasmbinding/bindings/msg.go index e79e32d25..13793b11b 100644 --- a/wasmbinding/bindings/msg.go +++ b/wasmbinding/bindings/msg.go @@ -246,4 +246,6 @@ type ResubmitFailure struct { FailureId uint64 `json:"failure_id"` } -type ResubmitFailureResponse struct{} +type ResubmitFailureResponse struct { + FailureId uint64 `json:"failure_id"` +} diff --git a/wasmbinding/message_plugin.go b/wasmbinding/message_plugin.go index 883e0b270..2768ba7a3 100644 --- a/wasmbinding/message_plugin.go +++ b/wasmbinding/message_plugin.go @@ -877,10 +877,6 @@ func (m *CustomMessenger) resubmitFailure(ctx sdk.Context, contractAddr sdk.AccA return nil, nil, errors.Wrap(sdkerrors.ErrNotFound, "no failure found to resubmit") } - if failure.Address != contractAddr.String() { - return nil, nil, errors.Wrap(sdkerrors.ErrUnauthorized, "only contract can resubmitFailure") - } - err = m.ContractmanagerKeeper.ResubmitFailure(ctx, contractAddr, failure) if err != nil { @@ -891,7 +887,7 @@ func (m *CustomMessenger) resubmitFailure(ctx sdk.Context, contractAddr sdk.AccA return nil, nil, errors.Wrap(err, "failed to resubmitFailure") } - resp := bindings.ResubmitFailureResponse{} + resp := bindings.ResubmitFailureResponse{FailureId: failure.Id} data, err := json.Marshal(&resp) if err != nil { ctx.Logger().Error("json.Marshal: failed to marshal remove resubmitFailure response to JSON", diff --git a/wasmbinding/test/custom_message_test.go b/wasmbinding/test/custom_message_test.go index 83d433f00..d802dbe44 100644 --- a/wasmbinding/test/custom_message_test.go +++ b/wasmbinding/test/custom_message_test.go @@ -659,7 +659,7 @@ func (suite *CustomMessengerTestSuite) TestResubmitFailureTimeout() { }) suite.NoError(err) suite.Nil(events) - expected, err := json.Marshal(&bindings.ResubmitFailureResponse{}) + expected, err := json.Marshal(&bindings.ResubmitFailureResponse{FailureId: failureID}) suite.NoError(err) suite.Equal([][]uint8{expected}, data) } diff --git a/x/contractmanager/keeper/failure_test.go b/x/contractmanager/keeper/failure_test.go index 600d16931..606db61c9 100644 --- a/x/contractmanager/keeper/failure_test.go +++ b/x/contractmanager/keeper/failure_test.go @@ -237,13 +237,4 @@ func TestResubmitFailure(t *testing.T) { require.NoError(t, err) err = k.ResubmitFailure(ctx, contractAddr, failure7) require.ErrorContains(t, err, "cannot resubmit failure without acknowledgement") - - // no Failure.Packet found - failureID8 := k.GetNextFailureIDKey(ctx, contractAddr.String()) - k.AddContractFailure(ctx, nil, contractAddr.String(), types.Ack, nil) - - failure8, err := k.GetFailure(ctx, contractAddr, failureID8) - require.NoError(t, err) - err = k.ResubmitFailure(ctx, contractAddr, failure8) - require.ErrorContains(t, err, "cannot resubmit failure without packet info") } From fd889e8a3abec527ca2d0be93f978b921d66a4de Mon Sep 17 00:00:00 2001 From: swelf Date: Tue, 29 Aug 2023 10:39:30 +0300 Subject: [PATCH 059/307] icatx sudocall rework --- x/interchaintxs/keeper/ibc_handlers.go | 67 +++++++++----------- x/interchaintxs/keeper/ibc_handlers_test.go | 46 +++++++------- x/transfer/ibc_handlers.go | 70 +++++++++------------ x/transfer/ibc_handlers_test.go | 36 ++++++++--- 4 files changed, 112 insertions(+), 107 deletions(-) diff --git a/x/interchaintxs/keeper/ibc_handlers.go b/x/interchaintxs/keeper/ibc_handlers.go index 213334e51..0035629a2 100644 --- a/x/interchaintxs/keeper/ibc_handlers.go +++ b/x/interchaintxs/keeper/ibc_handlers.go @@ -1,7 +1,6 @@ package keeper import ( - "fmt" "time" "cosmossdk.io/errors" @@ -34,29 +33,33 @@ func (k *Keeper) HandleAcknowledgement(ctx sdk.Context, packet channeltypes.Pack } cacheCtx, writeFn, newGasMeter := k.createCachedContext(ctx) - // consume all the gas from the cached context - // we call the function this place function because we want to consume all the gas even in case of panic in SudoError/SudoResponse - ctx.GasMeter().ConsumeGas(newGasMeter.Limit(), "consume full gas from cached context") - defer k.outOfGasRecovery(ctx, newGasMeter, icaOwner.GetContract(), packet, "ack") k.feeKeeper.DistributeAcknowledgementFee(ctx, relayer, feetypes.NewPacketID(packet.SourcePort, packet.SourceChannel, packet.Sequence)) - // Actually we have only one kind of error returned from acknowledgement - // maybe later we'll retrieve actual errors from events - errorText := ack.GetError() - if errorText != "" { - _, err = k.contractManagerKeeper.SudoError(cacheCtx, icaOwner.GetContract(), packet, errorText) - } else { - _, err = k.contractManagerKeeper.SudoResponse(cacheCtx, icaOwner.GetContract(), packet, ack.GetResult()) - } + func() { + // early error initialisation, to choose a correct `if` branch right after the closure in case of successfully `out of gas` panic recovered + // if SudoError/SudoResponse successful, then `err` is set to `nil` + defer k.outOfGasRecovery(newGasMeter, &err) + // Actually we have only one kind of error returned from acknowledgement + // maybe later we'll retrieve actual errors from events + errorText := ack.GetError() + if errorText != "" { + _, err = k.contractManagerKeeper.SudoError(cacheCtx, icaOwner.GetContract(), packet, errorText) + } else { + _, err = k.contractManagerKeeper.SudoResponse(cacheCtx, icaOwner.GetContract(), packet, ack.GetResult()) + } + }() if err != nil { + // the contract either returned an error or panicked with `out of gas` k.contractManagerKeeper.AddContractFailure(ctx, packet.SourceChannel, icaOwner.GetContract().String(), packet.GetSequence(), "ack") k.Logger(ctx).Debug("HandleAcknowledgement: failed to Sudo contract on packet acknowledgement", "error", err) } else { writeFn() } + ctx.GasMeter().ConsumeGas(newGasMeter.GasConsumedToLimit(), "consume gas from cached context") + return nil } @@ -73,21 +76,26 @@ func (k *Keeper) HandleTimeout(ctx sdk.Context, packet channeltypes.Packet, rela } cacheCtx, writeFn, newGasMeter := k.createCachedContext(ctx) - // consume all the gas from the cached context - // we call the function this place function because we want to consume all the gas even in case of panic in SudoTimeout - ctx.GasMeter().ConsumeGas(newGasMeter.Limit(), "consume full gas from cached context") - defer k.outOfGasRecovery(ctx, newGasMeter, icaOwner.GetContract(), packet, "timeout") k.feeKeeper.DistributeTimeoutFee(ctx, relayer, feetypes.NewPacketID(packet.SourcePort, packet.SourceChannel, packet.Sequence)) - _, err = k.contractManagerKeeper.SudoTimeout(cacheCtx, icaOwner.GetContract(), packet) + func() { + // early error initialisation, to choose a correct `if` branch right after the closure, in case of successfully `out of gas` panic recovered + // if SudoTimeout successful, then `err` is set to `nil` + defer k.outOfGasRecovery(newGasMeter, &err) + _, err = k.contractManagerKeeper.SudoTimeout(cacheCtx, icaOwner.GetContract(), packet) + }() + if err != nil { + // the contract either returned an error or panicked with `out of gas` k.contractManagerKeeper.AddContractFailure(ctx, packet.SourceChannel, icaOwner.GetContract().String(), packet.GetSequence(), "timeout") k.Logger(ctx).Error("HandleTimeout: failed to Sudo contract on packet timeout", "error", err) } else { writeFn() } + ctx.GasMeter().ConsumeGas(newGasMeter.GasConsumedToLimit(), "consume gas from cached context") + return nil } @@ -125,42 +133,27 @@ func (k *Keeper) HandleChanOpenAck( return nil } +// outOfGasRecovery converts `out of gas` panic into an error +// leave unprocessed any other kinds of panics func (k *Keeper) outOfGasRecovery( - ctx sdk.Context, gasMeter sdk.GasMeter, - senderAddress sdk.AccAddress, - packet channeltypes.Packet, - failureAckType string, + err *error, ) { if r := recover(); r != nil { _, ok := r.(sdk.ErrorOutOfGas) if !ok || !gasMeter.IsOutOfGas() { panic(r) } - - k.Logger(ctx).Debug("Out of gas", "Gas meter", gasMeter.String()) - k.contractManagerKeeper.AddContractFailure(ctx, packet.SourceChannel, senderAddress.String(), packet.GetSequence(), failureAckType) + *err = errors.Wrapf(errors.ErrPanic, "%v", r) } } // createCachedContext creates a cached context for handling Sudo calls to CosmWasm smart-contracts. // If there is an error during Sudo call, we can safely revert changes made in cached context. -// panics if there is no enough gas for sudoCall func (k *Keeper) createCachedContext(ctx sdk.Context) (sdk.Context, func(), sdk.GasMeter) { cacheCtx, writeFn := ctx.CacheContext() - sudoLimit := k.contractManagerKeeper.GetParams(ctx).SudoCallGasLimit - // NOTE: not sure that we really need this special check and panic - // with this kind of panic its clear what is going on by error text - // with this check, handle flow is not changed, but we get general panic during - // call ctx.GasMeter().ConsumeGas(newGasMeter.Limit(), "consume full gas from cached context") - if ctx.GasMeter().GasRemaining() < sudoLimit { - panic(sdk.ErrorOutOfGas{Descriptor: fmt.Sprintf("%dgas - reserve for sudo call", sudoLimit)}) - } - gasMeter := sdk.NewGasMeter(sudoLimit) - cacheCtx = cacheCtx.WithGasMeter(gasMeter) - return cacheCtx, writeFn, gasMeter } diff --git a/x/interchaintxs/keeper/ibc_handlers_test.go b/x/interchaintxs/keeper/ibc_handlers_test.go index 1096a70b0..330666a76 100644 --- a/x/interchaintxs/keeper/ibc_handlers_test.go +++ b/x/interchaintxs/keeper/ibc_handlers_test.go @@ -76,8 +76,7 @@ func TestHandleAcknowledgement(t *testing.T) { err = icak.HandleAcknowledgement(ctx, p, resAckData, relayerAddress) require.NoError(t, err) require.Empty(t, store.Get(ShouldNotBeWrittenKey)) - // response spent only 2990, but we consume all 4000 defined by params - require.Equal(t, uint64(4000), ctx.GasMeter().GasConsumed()) + require.Equal(t, uint64(2990), ctx.GasMeter().GasConsumed()) // error during SudoError ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) @@ -91,7 +90,7 @@ func TestHandleAcknowledgement(t *testing.T) { err = icak.HandleAcknowledgement(ctx, p, errAckData, relayerAddress) require.NoError(t, err) require.Empty(t, store.Get(ShouldNotBeWrittenKey)) - require.Equal(t, uint64(5000), ctx.GasMeter().GasConsumed()) + require.Equal(t, uint64(2990), ctx.GasMeter().GasConsumed()) // success during SudoError ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) @@ -104,7 +103,7 @@ func TestHandleAcknowledgement(t *testing.T) { err = icak.HandleAcknowledgement(ctx, p, errAckData, relayerAddress) require.NoError(t, err) require.Equal(t, ShouldBeWritten, store.Get(ShouldBeWrittenKey("sudoerror"))) - require.Equal(t, uint64(6000), ctx.GasMeter().GasConsumed()) + require.Equal(t, uint64(3050), ctx.GasMeter().GasConsumed()) // out of gas during SudoError ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) @@ -121,15 +120,9 @@ func TestHandleAcknowledgement(t *testing.T) { require.Empty(t, store.Get(ShouldNotBeWrittenKey)) require.Equal(t, uint64(7000), ctx.GasMeter().GasConsumed()) - // check we have SudoCallGasLimit reserved and - // check gas consumption from cachedCtx has added to the main ctx - // one of the ways to check it - make the check during SudoResponse call + // success during SudoResponse ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - gasReserved := false cmKeeper.EXPECT().SudoResponse(gomock.AssignableToTypeOf(ctx), contractAddress, p, resACK.GetResult()).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, msg []byte) { - if cachedCtx.GasMeter().Limit() == 8000 { - gasReserved = true - } store := cachedCtx.KVStore(storeKey) store.Set(ShouldBeWrittenKey("sudoresponse"), ShouldBeWritten) // consumes 3140 gas, 2000 flat write + 30 every byte of key+value }).Return(nil, nil) @@ -137,15 +130,20 @@ func TestHandleAcknowledgement(t *testing.T) { feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = icak.HandleAcknowledgement(ctx, p, resAckData, relayerAddress) require.NoError(t, err) - require.True(t, gasReserved) - require.Equal(t, uint64(8000), ctx.GasMeter().GasConsumed()) + require.Equal(t, uint64(3140), ctx.GasMeter().GasConsumed()) require.Equal(t, ShouldBeWritten, store.Get(ShouldBeWrittenKey("sudoresponse"))) - // not enough gas to reserve, tx aborted + // not enough gas provided by relayer for SudoCallGasLimit ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - lowGasCtx := infCtx.WithGasMeter(sdk.NewGasMeter(9000 - 1)) + lowGasCtx := infCtx.WithGasMeter(sdk.NewGasMeter(1000)) + cmKeeper.EXPECT().SudoResponse(gomock.AssignableToTypeOf(lowGasCtx), contractAddress, p, resACK.GetResult()).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, msg []byte) { + store := cachedCtx.KVStore(storeKey) + store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) + cachedCtx.GasMeter().ConsumeGas(1001, "out of gas test") + }) + feeKeeper.EXPECT().DistributeAcknowledgementFee(lowGasCtx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) cmKeeper.EXPECT().GetParams(lowGasCtx).Return(types.Params{SudoCallGasLimit: 9000}) - require.PanicsWithValue(t, sdk.ErrorOutOfGas{Descriptor: "9000gas - reserve for sudo call"}, func() { icak.HandleAcknowledgement(lowGasCtx, p, resAckData, relayerAddress) }) //nolint:errcheck // this is a panic test + require.PanicsWithValue(t, sdk.ErrorOutOfGas{Descriptor: "consume gas from cached context"}, func() { icak.HandleAcknowledgement(lowGasCtx, p, resAckData, relayerAddress) }) //nolint:errcheck // this is a panic test } func TestHandleTimeout(t *testing.T) { @@ -182,7 +180,7 @@ func TestHandleTimeout(t *testing.T) { feeKeeper.EXPECT().DistributeTimeoutFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = icak.HandleTimeout(ctx, p, relayerAddress) require.True(t, gasReserved) - require.Equal(t, uint64(4000), ctx.GasMeter().GasConsumed()) + require.Equal(t, uint64(3110), ctx.GasMeter().GasConsumed()) require.Equal(t, ShouldBeWritten, store.Get(ShouldBeWrittenKey("sudotimeout"))) require.NoError(t, err) @@ -196,7 +194,7 @@ func TestHandleTimeout(t *testing.T) { cmKeeper.EXPECT().AddContractFailure(ctx, "channel-0", contractAddress.String(), p.GetSequence(), "timeout") feeKeeper.EXPECT().DistributeTimeoutFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) err = icak.HandleTimeout(ctx, p, relayerAddress) - require.Equal(t, uint64(5000), ctx.GasMeter().GasConsumed()) + require.Equal(t, uint64(2990), ctx.GasMeter().GasConsumed()) require.NoError(t, err) require.Empty(t, store.Get(ShouldNotBeWrittenKey)) @@ -215,11 +213,17 @@ func TestHandleTimeout(t *testing.T) { require.NoError(t, err) require.Empty(t, store.Get(ShouldNotBeWrittenKey)) - // not enough gas to reserve, tx aborted + // not enough gas provided by relayer for SudoCallGasLimit ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - lowGasCtx := infCtx.WithGasMeter(sdk.NewGasMeter(9000 - 1)) + lowGasCtx := infCtx.WithGasMeter(sdk.NewGasMeter(1000)) + cmKeeper.EXPECT().SudoTimeout(gomock.AssignableToTypeOf(lowGasCtx), contractAddress, p).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet) { + store := cachedCtx.KVStore(storeKey) + store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) + cachedCtx.GasMeter().ConsumeGas(1001, "out of gas test") + }).Return(nil, nil) cmKeeper.EXPECT().GetParams(lowGasCtx).Return(types.Params{SudoCallGasLimit: 9000}) - require.PanicsWithValue(t, sdk.ErrorOutOfGas{Descriptor: "9000gas - reserve for sudo call"}, func() { icak.HandleTimeout(lowGasCtx, p, relayerAddress) }) //nolint:errcheck // this is a panic test + feeKeeper.EXPECT().DistributeTimeoutFee(lowGasCtx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) + require.PanicsWithValue(t, sdk.ErrorOutOfGas{Descriptor: "consume gas from cached context"}, func() { icak.HandleTimeout(lowGasCtx, p, relayerAddress) }) //nolint:errcheck // this is a panic test } func TestHandleChanOpenAck(t *testing.T) { diff --git a/x/transfer/ibc_handlers.go b/x/transfer/ibc_handlers.go index 939c788fa..c987d9dce 100644 --- a/x/transfer/ibc_handlers.go +++ b/x/transfer/ibc_handlers.go @@ -2,8 +2,6 @@ package transfer import ( "cosmossdk.io/errors" - "fmt" - sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" @@ -33,38 +31,40 @@ func (im IBCModule) HandleAcknowledgement(ctx sdk.Context, packet channeltypes.P } cacheCtx, writeFn, newGasMeter := im.createCachedContext(ctx) - // consume all the gas from the cached context - // we call the function this place function because we want to consume all the gas even in case of panic in SudoResponse/SudoError - ctx.GasMeter().ConsumeGas(newGasMeter.Limit(), "consume full gas from cached context") - defer im.outOfGasRecovery(ctx, newGasMeter, senderAddress, packet, data, "ack") // distribute fee im.wrappedKeeper.FeeKeeper.DistributeAcknowledgementFee(ctx, relayer, feetypes.NewPacketID(packet.SourcePort, packet.SourceChannel, packet.Sequence)) - - if ack.Success() { - _, err = im.ContractManagerKeeper.SudoResponse(cacheCtx, senderAddress, packet, ack.GetResult()) - } else { - // Actually we have only one kind of error returned from acknowledgement - // maybe later we'll retrieve actual errors from events - im.keeper.Logger(cacheCtx).Debug(ack.GetError(), "CheckTx", cacheCtx.IsCheckTx()) - _, err = im.ContractManagerKeeper.SudoError(cacheCtx, senderAddress, packet, ack.GetError()) - } + + func() { + // early error initialisation, to choose a correct `if` branch right after the closure in case of successfully `out of gas` panic recovered + // if SudoResponse/SudoError successful, then `err` is set to `nil` + defer im.outOfGasRecovery(newGasMeter, &err) + if ack.Success() { + _, err = im.ContractManagerKeeper.SudoResponse(cacheCtx, senderAddress, packet, ack.GetResult()) + } else { + // Actually we have only one kind of error returned from acknowledgement + // maybe later we'll retrieve actual errors from events + im.keeper.Logger(cacheCtx).Debug(ack.GetError(), "CheckTx", cacheCtx.IsCheckTx()) + _, err = im.ContractManagerKeeper.SudoError(cacheCtx, senderAddress, packet, ack.GetError()) + } + }() if err != nil { + // the contract either returned an error or panicked with `out of gas` im.ContractManagerKeeper.AddContractFailure(ctx, packet.SourceChannel, senderAddress.String(), packet.GetSequence(), "ack") im.keeper.Logger(ctx).Debug("failed to Sudo contract on packet acknowledgement", err) } else { writeFn() } + ctx.GasMeter().ConsumeGas(newGasMeter.GasConsumedToLimit(), "consume gas from cached context") + im.keeper.Logger(ctx).Debug("acknowledgement received", "Packet data", data, "CheckTx", ctx.IsCheckTx()) return nil } // HandleTimeout passes the timeout data to the appropriate contract via a Sudo call. -// Since all ICA channels are ORDERED, a single timeout shuts down a channel. -// The affected zone should be paused after a timeout. func (im IBCModule) HandleTimeout(ctx sdk.Context, packet channeltypes.Packet, relayer sdk.AccAddress) error { var data transfertypes.FungibleTokenPacketData if err := types.ModuleCdc.UnmarshalJSON(packet.GetData(), &data); err != nil { @@ -80,58 +80,50 @@ func (im IBCModule) HandleTimeout(ctx sdk.Context, packet channeltypes.Packet, r } cacheCtx, writeFn, newGasMeter := im.createCachedContext(ctx) - // consume all the gas from the cached context - // we call the function this place function because we want to consume all the gas even in case of panic in SudoTimeout - ctx.GasMeter().ConsumeGas(newGasMeter.Limit(), "consume full gas from cached context") - defer im.outOfGasRecovery(ctx, newGasMeter, senderAddress, packet, data, "timeout") // distribute fee im.wrappedKeeper.FeeKeeper.DistributeTimeoutFee(ctx, relayer, feetypes.NewPacketID(packet.SourcePort, packet.SourceChannel, packet.Sequence)) + func() { + // early error initialisation, to choose a correct `if` branch right after the closure, in case of successfully `out of gas` panic recovered + // if SudoTimeout successful, then `err` is set to `nil` + defer im.outOfGasRecovery(newGasMeter, &err) + _, err = im.ContractManagerKeeper.SudoTimeout(cacheCtx, senderAddress, packet) + }() - _, err = im.ContractManagerKeeper.SudoTimeout(cacheCtx, senderAddress, packet) if err != nil { + // the contract either returned an error or panicked with `out of gas` im.ContractManagerKeeper.AddContractFailure(ctx, packet.SourceChannel, senderAddress.String(), packet.GetSequence(), "timeout") im.keeper.Logger(ctx).Debug("failed to Sudo contract on packet timeout", err) } else { writeFn() } + ctx.GasMeter().ConsumeGas(newGasMeter.GasConsumedToLimit(), "consume gas from cached context") + return nil } +// outOfGasRecovery converts `out of gas` panic into an error +// leave unprocessed any other kinds of panics func (im IBCModule) outOfGasRecovery( - ctx sdk.Context, gasMeter sdk.GasMeter, - senderAddress sdk.AccAddress, - packet channeltypes.Packet, - data transfertypes.FungibleTokenPacketData, - failureType string, + err *error, ) { if r := recover(); r != nil { _, ok := r.(sdk.ErrorOutOfGas) if !ok || !gasMeter.IsOutOfGas() { panic(r) } - - im.keeper.Logger(ctx).Debug("Out of gas", "Gas meter", gasMeter.String(), "Packet data", data) - im.ContractManagerKeeper.AddContractFailure(ctx, packet.SourceChannel, senderAddress.String(), packet.GetSequence(), failureType) + *err = errors.Wrapf(errors.ErrPanic, "%v", r) } } // createCachedContext creates a cached context for handling Sudo calls to CosmWasm smart-contracts. // If there is an error during Sudo call, we can safely revert changes made in cached context. -// panics if there is no enough gas for sudoCall -func (im *IBCModule) createCachedContext(ctx sdk.Context) (sdk.Context, func(), sdk.GasMeter) { +func (im IBCModule) createCachedContext(ctx sdk.Context) (sdk.Context, func(), sdk.GasMeter) { cacheCtx, writeFn := ctx.CacheContext() - sudoLimit := im.ContractManagerKeeper.GetParams(ctx).SudoCallGasLimit - if ctx.GasMeter().GasRemaining() < sudoLimit { - panic(sdk.ErrorOutOfGas{Descriptor: fmt.Sprintf("%dgas - reserve for sudo call", sudoLimit)}) - } - gasMeter := sdk.NewGasMeter(sudoLimit) - cacheCtx = cacheCtx.WithGasMeter(gasMeter) - return cacheCtx, writeFn, gasMeter } diff --git a/x/transfer/ibc_handlers_test.go b/x/transfer/ibc_handlers_test.go index 5f82e3789..9fd012e48 100644 --- a/x/transfer/ibc_handlers_test.go +++ b/x/transfer/ibc_handlers_test.go @@ -115,7 +115,7 @@ func TestHandleAcknowledgement(t *testing.T) { err = txModule.HandleAcknowledgement(ctx, p, resAckData, relayerAddress) require.NoError(t, err) require.Empty(t, store.Get(ShouldNotBeWrittenKey)) - require.Equal(t, uint64(5000), ctx.GasMeter().GasConsumed()) + require.Equal(t, uint64(2990), ctx.GasMeter().GasConsumed()) // error during SudoError non contract ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) @@ -138,7 +138,7 @@ func TestHandleAcknowledgement(t *testing.T) { err = txModule.HandleAcknowledgement(ctx, p, errAckData, relayerAddress) require.NoError(t, err) require.Empty(t, store.Get(ShouldNotBeWrittenKey)) - require.Equal(t, uint64(7000), ctx.GasMeter().GasConsumed()) + require.Equal(t, uint64(2990), ctx.GasMeter().GasConsumed()) // success during SudoError non contract ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) @@ -159,7 +159,7 @@ func TestHandleAcknowledgement(t *testing.T) { err = txModule.HandleAcknowledgement(ctx, p, errAckData, relayerAddress) require.NoError(t, err) require.Equal(t, ShouldBeWritten, store.Get(ShouldBeWrittenKey("sudoerror_contract"))) - require.Equal(t, uint64(9000), ctx.GasMeter().GasConsumed()) + require.Equal(t, uint64(3320), ctx.GasMeter().GasConsumed()) // recoverable out of gas during SudoError non contract ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) @@ -209,14 +209,22 @@ func TestHandleAcknowledgement(t *testing.T) { err = txModule.HandleAcknowledgement(ctx, p, resAckData, relayerAddress) require.NoError(t, err) require.True(t, gasReserved) - require.Equal(t, uint64(13000), ctx.GasMeter().GasConsumed()) + require.Equal(t, uint64(3650), ctx.GasMeter().GasConsumed()) require.Equal(t, ShouldBeWritten, store.Get(ShouldBeWrittenKey("sudoresponse_contract_success"))) - // not enough gas to reserve SudoCallGasLimit + not enough to make AddContractFailure failure after panic recover + // not enough gas provided by relayer SudoCallGasLimit lowGasCtx := infCtx.WithGasMeter(sdk.NewGasMeter(1000)) + cmKeeper.EXPECT().SudoResponse(gomock.AssignableToTypeOf(lowGasCtx), contractAddress, p, resACK.GetResult()).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, msg []byte) { + store := cachedCtx.KVStore(storeKey) + store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) + cachedCtx.GasMeter().ConsumeGas(1001, "out of gas test") + }).Return(nil, nil) cmKeeper.EXPECT().GetParams(lowGasCtx).Return(types.Params{SudoCallGasLimit: 14000}) cmKeeper.EXPECT().HasContractInfo(lowGasCtx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) - require.PanicsWithValue(t, sdk.ErrorOutOfGas{Descriptor: "14000gas - reserve for sudo call"}, func() { txModule.HandleAcknowledgement(lowGasCtx, p, resAckData, relayerAddress) }) //nolint:errcheck // this is a test + feeKeeper.EXPECT().DistributeAcknowledgementFee(lowGasCtx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) + require.PanicsWithValue(t, sdk.ErrorOutOfGas{Descriptor: "consume gas from cached context"}, func() { txModule.HandleAcknowledgement(lowGasCtx, p, resAckData, relayerAddress) }) //nolint:errcheck // this is a test + // NOTE: looks its impossible to test store reset after panic, because test `require.PanicsWithValue` recovers the panic + // require.Empty(t, store.Get(ShouldNotBeWrittenKey)) } func TestHandleTimeout(t *testing.T) { @@ -289,7 +297,7 @@ func TestHandleTimeout(t *testing.T) { err = txModule.HandleTimeout(ctx, p, relayerAddress) require.True(t, gasReserved) require.NoError(t, err) - require.Equal(t, uint64(5000), ctx.GasMeter().GasConsumed()) + require.Equal(t, uint64(3620), ctx.GasMeter().GasConsumed()) require.Equal(t, ShouldBeWritten, store.Get(ShouldBeWrittenKey("sudotimeout_contract_success"))) // error during SudoTimeOut non contract @@ -312,7 +320,7 @@ func TestHandleTimeout(t *testing.T) { err = txModule.HandleTimeout(ctx, p, relayerAddress) require.NoError(t, err) require.Empty(t, store.Get(ShouldNotBeWrittenKey)) - require.Equal(t, uint64(7000), ctx.GasMeter().GasConsumed()) + require.Equal(t, uint64(2990), ctx.GasMeter().GasConsumed()) // out of gas during SudoTimeOut non contract ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) @@ -337,9 +345,17 @@ func TestHandleTimeout(t *testing.T) { require.Empty(t, store.Get(ShouldNotBeWrittenKey)) require.Equal(t, uint64(8000), ctx.GasMeter().GasConsumed()) - // not enough gas to reserve SudoCallGasLimit + not enough to make AddContractFailure failure after panic recover + // not enough gas provided by relayer for SudoCallGasLimit lowGasCtx := infCtx.WithGasMeter(sdk.NewGasMeter(1000)) + cmKeeper.EXPECT().SudoTimeout(gomock.AssignableToTypeOf(lowGasCtx), contractAddress, p).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet) { + store := cachedCtx.KVStore(storeKey) + store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) + cachedCtx.GasMeter().ConsumeGas(1001, "out of gas test") + }).Return(nil, nil) cmKeeper.EXPECT().GetParams(lowGasCtx).Return(types.Params{SudoCallGasLimit: 14000}) cmKeeper.EXPECT().HasContractInfo(lowGasCtx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) - require.PanicsWithValue(t, sdk.ErrorOutOfGas{Descriptor: "14000gas - reserve for sudo call"}, func() { txModule.HandleTimeout(lowGasCtx, p, relayerAddress) }) //nolint:errcheck // this is a test + feeKeeper.EXPECT().DistributeTimeoutFee(lowGasCtx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) + require.PanicsWithValue(t, sdk.ErrorOutOfGas{Descriptor: "consume gas from cached context"}, func() { txModule.HandleTimeout(lowGasCtx, p, relayerAddress) }) //nolint:errcheck // this is a test + // NOTE: looks its impossible to test store reset after panic, because test `require.PanicsWithValue` recovers the panic + // require.Empty(t, store.Get(ShouldNotBeWrittenKey)) } From 7397bd98d9e37b48531029f150a04b6b07335ae0 Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Tue, 29 Aug 2023 15:17:32 +0400 Subject: [PATCH 060/307] Update wasmbinding/message_plugin.go Co-authored-by: Mike Mozhaev --- wasmbinding/message_plugin.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wasmbinding/message_plugin.go b/wasmbinding/message_plugin.go index 442f18156..3f4c76908 100644 --- a/wasmbinding/message_plugin.go +++ b/wasmbinding/message_plugin.go @@ -439,7 +439,7 @@ func (m *CustomMessenger) performSubmitAdminProposal(ctx sdk.Context, contractAd return nil, errors.Wrap(err, "should be 1 signer") } if !signers[0].Equals(authority) { - return nil, errors.Wrap(err, "authority in incoming msg is not equal to admin module") + return nil, errors.Wrap(sdkerrors.ErrUnauthorized, "authority in incoming msg is not equal to admin module") } sdkMsgs = append(sdkMsgs, sdkMsg) msg, err = admintypes.NewMsgSubmitProposal(sdkMsgs, contractAddr) From 696ad1080bf37cc1fd0ead6ea95c3bdc7ba2aa7b Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Tue, 29 Aug 2023 15:17:44 +0400 Subject: [PATCH 061/307] Update wasmbinding/message_plugin.go Co-authored-by: Mike Mozhaev --- wasmbinding/message_plugin.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wasmbinding/message_plugin.go b/wasmbinding/message_plugin.go index 3f4c76908..524066b90 100644 --- a/wasmbinding/message_plugin.go +++ b/wasmbinding/message_plugin.go @@ -436,7 +436,7 @@ func (m *CustomMessenger) performSubmitAdminProposal(ctx sdk.Context, contractAd signers := sdkMsg.GetSigners() if len(signers) != 1 { - return nil, errors.Wrap(err, "should be 1 signer") + return nil, errors.Wrap(sdkerrors.ErrorInvalidSigner, "should be 1 signer") } if !signers[0].Equals(authority) { return nil, errors.Wrap(sdkerrors.ErrUnauthorized, "authority in incoming msg is not equal to admin module") From ccf0c534ec2ca5306d6445bd29eda6fb35e7c498 Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Tue, 29 Aug 2023 15:17:54 +0400 Subject: [PATCH 062/307] Update wasmbinding/message_plugin.go Co-authored-by: Mike Mozhaev --- wasmbinding/message_plugin.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/wasmbinding/message_plugin.go b/wasmbinding/message_plugin.go index 524066b90..e0a4b7b2a 100644 --- a/wasmbinding/message_plugin.go +++ b/wasmbinding/message_plugin.go @@ -425,9 +425,12 @@ func (m *CustomMessenger) performSubmitAdminProposal(ctx sdk.Context, contractAd return nil, errors.Wrap(err, "failed to validate proposal quantity") } - var msg *admintypes.MsgSubmitProposal - var sdkMsgs []sdk.Msg - var sdkMsg sdk.Msg + var ( + msg *admintypes.MsgSubmitProposal + sdkMsgs []sdk.Msg + sdkMsg sdk.Msg + ) + cdc := m.AdminKeeper.Codec() err = cdc.UnmarshalInterfaceJSON([]byte(proposal.ProposalExecuteMessage.Message), &sdkMsg) if err != nil { From 552a67f8c9cec058bce1191a2ad80b282df187b5 Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Tue, 29 Aug 2023 16:00:32 +0400 Subject: [PATCH 063/307] post-review & small refactor --- app/app.go | 19 ----------------- cmd/neutrond/root.go | 12 ++++------- wasmbinding/message_plugin.go | 39 ++++++++++++++++++----------------- 3 files changed, 24 insertions(+), 46 deletions(-) diff --git a/app/app.go b/app/app.go index 31e384d8b..9650a812d 100644 --- a/app/app.go +++ b/app/app.go @@ -7,7 +7,6 @@ import ( "net/http" "os" "path/filepath" - "strings" "github.com/cosmos/interchain-security/v3/testutil/integration" @@ -170,23 +169,6 @@ var ( EnableSpecificProposals = "" ) -// GetEnabledProposals parses the ProposalsEnabled / EnableSpecificProposals values to -// produce a list of enabled proposals to pass into wasmd app. -func GetEnabledProposals() []wasm.ProposalType { - if EnableSpecificProposals == "" { - if ProposalsEnabled == "true" { - return wasm.EnableAllProposals - } - return wasm.DisableAllProposals - } - chunks := strings.Split(EnableSpecificProposals, ",") - proposals, err := wasm.ConvertToProposals(chunks) - if err != nil { - panic(err) - } - return proposals -} - var ( Upgrades = []upgrades.Upgrade{v3.Upgrade, v044.Upgrade, nextupgrade.Upgrade} @@ -374,7 +356,6 @@ func New( homePath string, invCheckPeriod uint, encodingConfig appparams.EncodingConfig, - enabledProposals []wasm.ProposalType, appOpts servertypes.AppOptions, wasmOpts []wasm.Option, baseAppOptions ...func(*baseapp.BaseApp), diff --git a/cmd/neutrond/root.go b/cmd/neutrond/root.go index 3c392db20..8f5f651a5 100644 --- a/cmd/neutrond/root.go +++ b/cmd/neutrond/root.go @@ -3,6 +3,10 @@ package main import ( "errors" "fmt" + "io" + "os" + "path/filepath" + "github.com/CosmWasm/wasmd/x/wasm" wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" dbm "github.com/cometbft/cometbft-db" @@ -37,9 +41,6 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/spf13/cast" "github.com/spf13/cobra" - "io" - "os" - "path/filepath" ) // NewRootCmd creates a new root command for neutrond. It is called once in the @@ -240,14 +241,10 @@ func (ac appCreator) newApp( chainID = appGenesis.ChainID } - enabledWasmProposals := app.GetEnabledProposals() - logger.Info("Enabled wasm proposals", "proposals", enabledWasmProposals) - return app.New(logger, chainID, db, traceStore, true, skipUpgradeHeights, cast.ToString(appOpts.Get(flags.FlagHome)), cast.ToUint(appOpts.Get(server.FlagInvCheckPeriod)), ac.encCfg, - enabledWasmProposals, appOpts, wasmOpts, baseapp.SetPruning(pruningOpts), @@ -301,7 +298,6 @@ func (ac appCreator) appExport( homePath, cast.ToUint(appOpts.Get(server.FlagInvCheckPeriod)), ac.encCfg, - app.GetEnabledProposals(), appOpts, emptyWasmOpts, ) diff --git a/wasmbinding/message_plugin.go b/wasmbinding/message_plugin.go index e0a4b7b2a..6faaf4ded 100644 --- a/wasmbinding/message_plugin.go +++ b/wasmbinding/message_plugin.go @@ -295,7 +295,12 @@ func (m *CustomMessenger) submitTx(ctx sdk.Context, contractAddr sdk.AccAddress, func (m *CustomMessenger) submitAdminProposal(ctx sdk.Context, contractAddr sdk.AccAddress, submitAdminProposal *bindings.SubmitAdminProposal) ([]sdk.Event, [][]byte, error) { var data []byte - if submitAdminProposal.AdminProposal.ParamChangeProposal != nil || submitAdminProposal.AdminProposal.UpgradeProposal != nil || submitAdminProposal.AdminProposal.ClientUpdateProposal != nil { + err := m.validateProposalQty(&submitAdminProposal.AdminProposal) + if err != nil { + return nil, nil, errors.Wrap(err, "failed to validate proposal quantity") + } + // here we handle pre-sdk47 style of proposals: param change & upgrade/cancel + if m.isLegacyProposal(&submitAdminProposal.AdminProposal) { resp, err := m.performSubmitAdminProposalLegacy(ctx, contractAddr, submitAdminProposal) if err != nil { ctx.Logger().Debug("performSubmitAdminProposalLegacy: failed to submitAdminProposal", @@ -322,7 +327,7 @@ func (m *CustomMessenger) submitAdminProposal(ctx sdk.Context, contractAddr sdk. return nil, [][]byte{data}, nil } - response, err := m.performSubmitAdminProposal(ctx, contractAddr, submitAdminProposal) + resp, err := m.performSubmitAdminProposal(ctx, contractAddr, submitAdminProposal) if err != nil { ctx.Logger().Debug("performSubmitAdminProposal: failed to submitAdminProposal", "from_address", contractAddr.String(), @@ -332,7 +337,7 @@ func (m *CustomMessenger) submitAdminProposal(ctx sdk.Context, contractAddr sdk. return nil, nil, errors.Wrap(err, "failed to submit admin proposal") } - data, err = json.Marshal(response) + data, err = json.Marshal(resp) if err != nil { ctx.Logger().Error("json.Marshal: failed to marshal submitAdminProposal response to JSON", "from_address", contractAddr.String(), @@ -353,13 +358,9 @@ func (m *CustomMessenger) performSubmitAdminProposalLegacy(ctx sdk.Context, cont proposal := submitAdminProposal.AdminProposal msg := admintypes.MsgSubmitProposalLegacy{Proposer: contractAddr.String()} - err := m.validateProposalQty(&proposal) - if err != nil { - return nil, errors.Wrap(err, "failed to validate proposal quantity") - } if submitAdminProposal.AdminProposal.ParamChangeProposal != nil { p := proposal.ParamChangeProposal - err = msg.SetContent(¶mChange.ParameterChangeProposal{ + err := msg.SetContent(¶mChange.ParameterChangeProposal{ Title: p.Title, Description: p.Description, Changes: p.ParamChanges, @@ -419,20 +420,14 @@ func (m *CustomMessenger) performSubmitAdminProposalLegacy(ctx sdk.Context, cont func (m *CustomMessenger) performSubmitAdminProposal(ctx sdk.Context, contractAddr sdk.AccAddress, submitAdminProposal *bindings.SubmitAdminProposal) (*admintypes.MsgSubmitProposalResponse, error) { proposal := submitAdminProposal.AdminProposal authority := authtypes.NewModuleAddress(admintypes.ModuleName) - - err := m.validateProposalQty(&proposal) - if err != nil { - return nil, errors.Wrap(err, "failed to validate proposal quantity") - } - var ( - msg *admintypes.MsgSubmitProposal - sdkMsgs []sdk.Msg - sdkMsg sdk.Msg + msg *admintypes.MsgSubmitProposal + sdkMsgs []sdk.Msg + sdkMsg sdk.Msg ) - + cdc := m.AdminKeeper.Codec() - err = cdc.UnmarshalInterfaceJSON([]byte(proposal.ProposalExecuteMessage.Message), &sdkMsg) + err := cdc.UnmarshalInterfaceJSON([]byte(proposal.ProposalExecuteMessage.Message), &sdkMsg) if err != nil { return nil, errors.Wrap(err, "failed to unmarshall incoming sdk message") } @@ -782,6 +777,12 @@ func (m *CustomMessenger) validateProposalQty(proposal *bindings.AdminProposal) return fmt.Errorf("more than one admin proposal type is present in message") } +func (m *CustomMessenger) isLegacyProposal(proposal *bindings.AdminProposal) bool { + if proposal.ParamChangeProposal != nil || proposal.UpgradeProposal != nil || proposal.ClientUpdateProposal != nil { + return true + } + return false +} func (m *CustomMessenger) addSchedule(ctx sdk.Context, contractAddr sdk.AccAddress, addSchedule *bindings.AddSchedule) ([]sdk.Event, [][]byte, error) { if !m.isAdmin(ctx, contractAddr) { From 427455a669aff7554272e1cc1b8510a538206301 Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Tue, 29 Aug 2023 16:05:51 +0400 Subject: [PATCH 064/307] add comment --- app/proposals_allowlisting.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/proposals_allowlisting.go b/app/proposals_allowlisting.go index dd36d5150..20d54b4bd 100644 --- a/app/proposals_allowlisting.go +++ b/app/proposals_allowlisting.go @@ -36,6 +36,8 @@ func isConsumerParamChangeWhitelisted(paramChanges []proposal.ParamChange) bool return true } +// This function is designed to determine if a given message (of type sdk.Msg) belongs to +// a predefined whitelist of message types which could be executed via admin module. func isSdkMessageWhitelisted(msg sdk.Msg) bool { switch msg.(type) { case *wasmtypes.MsgClearAdmin, From 8dd3c7a415b9a9b7e10defbbb8982e5dfee6f36e Mon Sep 17 00:00:00 2001 From: swelf Date: Tue, 29 Aug 2023 15:58:19 +0300 Subject: [PATCH 065/307] extracted some common code --- neutronutils/errors/errors.go | 21 ++++++++++++++++ neutronutils/utils.go | 11 ++++++++ x/interchaintxs/keeper/ibc_handlers.go | 35 +++++--------------------- x/transfer/ibc_handlers.go | 35 +++++--------------------- 4 files changed, 44 insertions(+), 58 deletions(-) create mode 100644 neutronutils/errors/errors.go create mode 100644 neutronutils/utils.go diff --git a/neutronutils/errors/errors.go b/neutronutils/errors/errors.go new file mode 100644 index 000000000..7aecf5e13 --- /dev/null +++ b/neutronutils/errors/errors.go @@ -0,0 +1,21 @@ +package errors + +import ( + "cosmossdk.io/errors" + sdk "github.com/cosmos/cosmos-sdk/types" +) + +// OutOfGasRecovery converts `out of gas` panic into an error +// leave unprocessed any other kinds of panics +func OutOfGasRecovery( + gasMeter sdk.GasMeter, + err *error, +) { + if r := recover(); r != nil { + _, ok := r.(sdk.ErrorOutOfGas) + if !ok || !gasMeter.IsOutOfGas() { + panic(r) + } + *err = errors.Wrapf(errors.ErrPanic, "%v", r) + } +} diff --git a/neutronutils/utils.go b/neutronutils/utils.go new file mode 100644 index 000000000..0e67d48dd --- /dev/null +++ b/neutronutils/utils.go @@ -0,0 +1,11 @@ +package neutronutils + +import sdk "github.com/cosmos/cosmos-sdk/types" + +// CreateCachedContext creates a cached context for with a limited gas meter. +func CreateCachedContext(ctx sdk.Context, gasLimit uint64) (sdk.Context, func(), sdk.GasMeter) { + cacheCtx, writeFn := ctx.CacheContext() + gasMeter := sdk.NewGasMeter(gasLimit) + cacheCtx = cacheCtx.WithGasMeter(gasMeter) + return cacheCtx, writeFn, gasMeter +} diff --git a/x/interchaintxs/keeper/ibc_handlers.go b/x/interchaintxs/keeper/ibc_handlers.go index 0035629a2..79b79cad5 100644 --- a/x/interchaintxs/keeper/ibc_handlers.go +++ b/x/interchaintxs/keeper/ibc_handlers.go @@ -1,6 +1,8 @@ package keeper import ( + "github.com/neutron-org/neutron/neutronutils" + neutronerrors "github.com/neutron-org/neutron/neutronutils/errors" "time" "cosmossdk.io/errors" @@ -32,14 +34,14 @@ func (k *Keeper) HandleAcknowledgement(ctx sdk.Context, packet channeltypes.Pack return errors.Wrapf(sdkerrors.ErrUnknownRequest, "cannot unmarshal ICS-27 packet acknowledgement: %v", err) } - cacheCtx, writeFn, newGasMeter := k.createCachedContext(ctx) + cacheCtx, writeFn, newGasMeter := neutronutils.CreateCachedContext(ctx, k.contractManagerKeeper.GetParams(ctx).SudoCallGasLimit) k.feeKeeper.DistributeAcknowledgementFee(ctx, relayer, feetypes.NewPacketID(packet.SourcePort, packet.SourceChannel, packet.Sequence)) func() { // early error initialisation, to choose a correct `if` branch right after the closure in case of successfully `out of gas` panic recovered // if SudoError/SudoResponse successful, then `err` is set to `nil` - defer k.outOfGasRecovery(newGasMeter, &err) + defer neutronerrors.OutOfGasRecovery(newGasMeter, &err) // Actually we have only one kind of error returned from acknowledgement // maybe later we'll retrieve actual errors from events errorText := ack.GetError() @@ -75,14 +77,14 @@ func (k *Keeper) HandleTimeout(ctx sdk.Context, packet channeltypes.Packet, rela return errors.Wrap(err, "failed to get ica owner from port") } - cacheCtx, writeFn, newGasMeter := k.createCachedContext(ctx) + cacheCtx, writeFn, newGasMeter := neutronutils.CreateCachedContext(ctx, k.contractManagerKeeper.GetParams(ctx).SudoCallGasLimit) k.feeKeeper.DistributeTimeoutFee(ctx, relayer, feetypes.NewPacketID(packet.SourcePort, packet.SourceChannel, packet.Sequence)) func() { // early error initialisation, to choose a correct `if` branch right after the closure, in case of successfully `out of gas` panic recovered // if SudoTimeout successful, then `err` is set to `nil` - defer k.outOfGasRecovery(newGasMeter, &err) + defer neutronerrors.OutOfGasRecovery(newGasMeter, &err) _, err = k.contractManagerKeeper.SudoTimeout(cacheCtx, icaOwner.GetContract(), packet) }() @@ -132,28 +134,3 @@ func (k *Keeper) HandleChanOpenAck( return nil } - -// outOfGasRecovery converts `out of gas` panic into an error -// leave unprocessed any other kinds of panics -func (k *Keeper) outOfGasRecovery( - gasMeter sdk.GasMeter, - err *error, -) { - if r := recover(); r != nil { - _, ok := r.(sdk.ErrorOutOfGas) - if !ok || !gasMeter.IsOutOfGas() { - panic(r) - } - *err = errors.Wrapf(errors.ErrPanic, "%v", r) - } -} - -// createCachedContext creates a cached context for handling Sudo calls to CosmWasm smart-contracts. -// If there is an error during Sudo call, we can safely revert changes made in cached context. -func (k *Keeper) createCachedContext(ctx sdk.Context) (sdk.Context, func(), sdk.GasMeter) { - cacheCtx, writeFn := ctx.CacheContext() - sudoLimit := k.contractManagerKeeper.GetParams(ctx).SudoCallGasLimit - gasMeter := sdk.NewGasMeter(sudoLimit) - cacheCtx = cacheCtx.WithGasMeter(gasMeter) - return cacheCtx, writeFn, gasMeter -} diff --git a/x/transfer/ibc_handlers.go b/x/transfer/ibc_handlers.go index c987d9dce..37834eada 100644 --- a/x/transfer/ibc_handlers.go +++ b/x/transfer/ibc_handlers.go @@ -6,7 +6,9 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" + "github.com/neutron-org/neutron/neutronutils" + neutronerrors "github.com/neutron-org/neutron/neutronutils/errors" feetypes "github.com/neutron-org/neutron/x/feerefunder/types" "github.com/neutron-org/neutron/x/interchaintxs/types" ) @@ -30,7 +32,7 @@ func (im IBCModule) HandleAcknowledgement(ctx sdk.Context, packet channeltypes.P return nil } - cacheCtx, writeFn, newGasMeter := im.createCachedContext(ctx) + cacheCtx, writeFn, newGasMeter := neutronutils.CreateCachedContext(ctx, im.ContractManagerKeeper.GetParams(ctx).SudoCallGasLimit) // distribute fee im.wrappedKeeper.FeeKeeper.DistributeAcknowledgementFee(ctx, relayer, feetypes.NewPacketID(packet.SourcePort, packet.SourceChannel, packet.Sequence)) @@ -38,7 +40,7 @@ func (im IBCModule) HandleAcknowledgement(ctx sdk.Context, packet channeltypes.P func() { // early error initialisation, to choose a correct `if` branch right after the closure in case of successfully `out of gas` panic recovered // if SudoResponse/SudoError successful, then `err` is set to `nil` - defer im.outOfGasRecovery(newGasMeter, &err) + defer neutronerrors.OutOfGasRecovery(newGasMeter, &err) if ack.Success() { _, err = im.ContractManagerKeeper.SudoResponse(cacheCtx, senderAddress, packet, ack.GetResult()) } else { @@ -79,14 +81,14 @@ func (im IBCModule) HandleTimeout(ctx sdk.Context, packet channeltypes.Packet, r return nil } - cacheCtx, writeFn, newGasMeter := im.createCachedContext(ctx) + cacheCtx, writeFn, newGasMeter := neutronutils.CreateCachedContext(ctx, im.ContractManagerKeeper.GetParams(ctx).SudoCallGasLimit) // distribute fee im.wrappedKeeper.FeeKeeper.DistributeTimeoutFee(ctx, relayer, feetypes.NewPacketID(packet.SourcePort, packet.SourceChannel, packet.Sequence)) func() { // early error initialisation, to choose a correct `if` branch right after the closure, in case of successfully `out of gas` panic recovered // if SudoTimeout successful, then `err` is set to `nil` - defer im.outOfGasRecovery(newGasMeter, &err) + defer neutronerrors.OutOfGasRecovery(newGasMeter, &err) _, err = im.ContractManagerKeeper.SudoTimeout(cacheCtx, senderAddress, packet) }() @@ -102,28 +104,3 @@ func (im IBCModule) HandleTimeout(ctx sdk.Context, packet channeltypes.Packet, r return nil } - -// outOfGasRecovery converts `out of gas` panic into an error -// leave unprocessed any other kinds of panics -func (im IBCModule) outOfGasRecovery( - gasMeter sdk.GasMeter, - err *error, -) { - if r := recover(); r != nil { - _, ok := r.(sdk.ErrorOutOfGas) - if !ok || !gasMeter.IsOutOfGas() { - panic(r) - } - *err = errors.Wrapf(errors.ErrPanic, "%v", r) - } -} - -// createCachedContext creates a cached context for handling Sudo calls to CosmWasm smart-contracts. -// If there is an error during Sudo call, we can safely revert changes made in cached context. -func (im IBCModule) createCachedContext(ctx sdk.Context) (sdk.Context, func(), sdk.GasMeter) { - cacheCtx, writeFn := ctx.CacheContext() - sudoLimit := im.ContractManagerKeeper.GetParams(ctx).SudoCallGasLimit - gasMeter := sdk.NewGasMeter(sudoLimit) - cacheCtx = cacheCtx.WithGasMeter(gasMeter) - return cacheCtx, writeFn, gasMeter -} From cf7b0ecff977fdf85822894a2dabe22c5bf26a30 Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Wed, 30 Aug 2023 13:12:12 +0400 Subject: [PATCH 066/307] post-review --- Makefile | 5 ++-- go.mod | 2 +- go.sum | 4 +-- wasmbinding/message_plugin.go | 49 ++++++++++++++++------------------- 4 files changed, 28 insertions(+), 32 deletions(-) diff --git a/Makefile b/Makefile index 6af490db8..b33b38a56 100644 --- a/Makefile +++ b/Makefile @@ -68,8 +68,7 @@ ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=neutron \ -X github.com/cosmos/cosmos-sdk/version.AppName=neutrond \ -X github.com/cosmos/cosmos-sdk/version.Version=$(VERSION) \ -X github.com/cosmos/cosmos-sdk/version.Commit=$(COMMIT) \ - -X "github.com/cosmos/cosmos-sdk/version.BuildTags=$(build_tags_comma_sep)" \ - -X "github.com/neutron-org/neutron/app.EnableSpecificProposals=$(ENABLED_PROPOSALS)" + -X "github.com/cosmos/cosmos-sdk/version.BuildTags=$(build_tags_comma_sep)" ifeq ($(WITH_CLEVELDB),yes) ldflags += -X github.com/cosmos/cosmos-sdk/types.DBBackend=cleveldb @@ -253,4 +252,4 @@ stop-docker-container: mocks: @echo "Regenerate mocks..." - @go generate ./... \ No newline at end of file + @go generate ./... diff --git a/go.mod b/go.mod index 312966dff..2e0a0dc79 100644 --- a/go.mod +++ b/go.mod @@ -190,7 +190,7 @@ replace ( github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0 github.com/ChainSafe/go-schnorrkel => github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d github.com/CosmWasm/wasmd => github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230808084410-6083b888424e - github.com/cosmos/admin-module => github.com/neutron-org/admin-module v0.0.0-20230825075449-97f3b415da45 + github.com/cosmos/admin-module => github.com/neutron-org/admin-module v0.0.0-20230830083547-1540be1b9432 github.com/cosmos/cosmos-sdk => github.com/neutron-org/cosmos-sdk v0.47.5-0.20230808152221-a0e301227957 github.com/cosmos/gaia/v11 => github.com/cosmos/gaia/v11 v11.0.0-20230724152830-861ba391c3b4 github.com/cosmos/ledger-cosmos-go => github.com/cosmos/ledger-cosmos-go v0.12.1 diff --git a/go.sum b/go.sum index b45e8b99e..e93afe8ed 100644 --- a/go.sum +++ b/go.sum @@ -938,8 +938,8 @@ github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxzi github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/neilotoole/errgroup v0.1.6/go.mod h1:Q2nLGf+594h0CLBs/Mbg6qOr7GtqDK7C2S41udRnToE= -github.com/neutron-org/admin-module v0.0.0-20230825075449-97f3b415da45 h1:7DdiXFwKZXhMBYp32k50q+jhnUkJVrLxNy2AalNqF/U= -github.com/neutron-org/admin-module v0.0.0-20230825075449-97f3b415da45/go.mod h1:QuxQ7FJlEAFMRssyEYOrR9ORnYQvBFMTlO8BXny6ntw= +github.com/neutron-org/admin-module v0.0.0-20230830083547-1540be1b9432 h1:K+nDdYMZSB+4zt3NVSHyvKKxgjRsNyHZRaxFfnwmakg= +github.com/neutron-org/admin-module v0.0.0-20230830083547-1540be1b9432/go.mod h1:QuxQ7FJlEAFMRssyEYOrR9ORnYQvBFMTlO8BXny6ntw= github.com/neutron-org/cosmos-sdk v0.47.5-0.20230808152221-a0e301227957 h1:cl6UqD18qV/QXgT6Yjo2TelfbaOqQGuvL1yX0cWguSs= github.com/neutron-org/cosmos-sdk v0.47.5-0.20230808152221-a0e301227957/go.mod h1:4xMyIVekAs2OEUz/yh9JwzhLBMk+olM2sxgKuQdlhLg= github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230808084410-6083b888424e h1:uVJCBWf1vcCYY0pzOA2SCPIZT8WsR8fsOxs57mnJbM4= diff --git a/wasmbinding/message_plugin.go b/wasmbinding/message_plugin.go index 6faaf4ded..9feb137ff 100644 --- a/wasmbinding/message_plugin.go +++ b/wasmbinding/message_plugin.go @@ -108,7 +108,7 @@ func (m *CustomMessenger) DispatchMsg(ctx sdk.Context, contractAddr sdk.AccAddre return m.ibcTransfer(ctx, contractAddr, *contractMsg.IBCTransfer) } if contractMsg.SubmitAdminProposal != nil { - return m.submitAdminProposal(ctx, contractAddr, contractMsg.SubmitAdminProposal) + return m.submitAdminProposal(ctx, contractAddr, &contractMsg.SubmitAdminProposal.AdminProposal) } if contractMsg.CreateDenom != nil { return m.createDenom(ctx, contractAddr, contractMsg.CreateDenom) @@ -293,19 +293,18 @@ func (m *CustomMessenger) submitTx(ctx sdk.Context, contractAddr sdk.AccAddress, return nil, [][]byte{data}, nil } -func (m *CustomMessenger) submitAdminProposal(ctx sdk.Context, contractAddr sdk.AccAddress, submitAdminProposal *bindings.SubmitAdminProposal) ([]sdk.Event, [][]byte, error) { +func (m *CustomMessenger) submitAdminProposal(ctx sdk.Context, contractAddr sdk.AccAddress, adminProposal *bindings.AdminProposal) ([]sdk.Event, [][]byte, error) { var data []byte - err := m.validateProposalQty(&submitAdminProposal.AdminProposal) + err := m.validateProposalQty(adminProposal) if err != nil { return nil, nil, errors.Wrap(err, "failed to validate proposal quantity") } // here we handle pre-sdk47 style of proposals: param change & upgrade/cancel - if m.isLegacyProposal(&submitAdminProposal.AdminProposal) { - resp, err := m.performSubmitAdminProposalLegacy(ctx, contractAddr, submitAdminProposal) + if m.isLegacyProposal(adminProposal) { + resp, err := m.performSubmitAdminProposalLegacy(ctx, contractAddr, adminProposal) if err != nil { ctx.Logger().Debug("performSubmitAdminProposalLegacy: failed to submitAdminProposal", "from_address", contractAddr.String(), - "creator", contractAddr.String(), "error", err, ) return nil, nil, errors.Wrap(err, "failed to submit admin proposal legacy") @@ -314,7 +313,6 @@ func (m *CustomMessenger) submitAdminProposal(ctx sdk.Context, contractAddr sdk. if err != nil { ctx.Logger().Error("json.Marshal: failed to marshal submitAdminProposalLegacy response to JSON", "from_address", contractAddr.String(), - "creator", contractAddr.String(), "error", err, ) return nil, nil, errors.Wrap(err, "marshal json failed") @@ -322,16 +320,14 @@ func (m *CustomMessenger) submitAdminProposal(ctx sdk.Context, contractAddr sdk. ctx.Logger().Debug("submit proposal legacy submitted", "from_address", contractAddr.String(), - "creator", contractAddr.String(), ) return nil, [][]byte{data}, nil } - resp, err := m.performSubmitAdminProposal(ctx, contractAddr, submitAdminProposal) + resp, err := m.performSubmitAdminProposal(ctx, contractAddr, adminProposal) if err != nil { ctx.Logger().Debug("performSubmitAdminProposal: failed to submitAdminProposal", "from_address", contractAddr.String(), - "creator", contractAddr.String(), "error", err, ) return nil, nil, errors.Wrap(err, "failed to submit admin proposal") @@ -341,7 +337,6 @@ func (m *CustomMessenger) submitAdminProposal(ctx sdk.Context, contractAddr sdk. if err != nil { ctx.Logger().Error("json.Marshal: failed to marshal submitAdminProposal response to JSON", "from_address", contractAddr.String(), - "creator", contractAddr.String(), "error", err, ) return nil, nil, errors.Wrap(err, "marshal json failed") @@ -349,16 +344,15 @@ func (m *CustomMessenger) submitAdminProposal(ctx sdk.Context, contractAddr sdk. ctx.Logger().Debug("submit proposal message submitted", "from_address", contractAddr.String(), - "creator", contractAddr.String(), ) return nil, [][]byte{data}, nil } -func (m *CustomMessenger) performSubmitAdminProposalLegacy(ctx sdk.Context, contractAddr sdk.AccAddress, submitAdminProposal *bindings.SubmitAdminProposal) (*admintypes.MsgSubmitProposalLegacyResponse, error) { - proposal := submitAdminProposal.AdminProposal +func (m *CustomMessenger) performSubmitAdminProposalLegacy(ctx sdk.Context, contractAddr sdk.AccAddress, adminProposal *bindings.AdminProposal) (*admintypes.MsgSubmitProposalLegacyResponse, error) { + proposal := adminProposal msg := admintypes.MsgSubmitProposalLegacy{Proposer: contractAddr.String()} - if submitAdminProposal.AdminProposal.ParamChangeProposal != nil { + if proposal.ParamChangeProposal != nil { p := proposal.ParamChangeProposal err := msg.SetContent(¶mChange.ParameterChangeProposal{ Title: p.Title, @@ -417,8 +411,8 @@ func (m *CustomMessenger) performSubmitAdminProposalLegacy(ctx sdk.Context, cont return response, nil } -func (m *CustomMessenger) performSubmitAdminProposal(ctx sdk.Context, contractAddr sdk.AccAddress, submitAdminProposal *bindings.SubmitAdminProposal) (*admintypes.MsgSubmitProposalResponse, error) { - proposal := submitAdminProposal.AdminProposal +func (m *CustomMessenger) performSubmitAdminProposal(ctx sdk.Context, contractAddr sdk.AccAddress, adminProposal *bindings.AdminProposal) (*admintypes.MsgSubmitProposalResponse, error) { + proposal := adminProposal authority := authtypes.NewModuleAddress(admintypes.ModuleName) var ( msg *admintypes.MsgSubmitProposal @@ -767,21 +761,24 @@ func (m *CustomMessenger) validateProposalQty(proposal *bindings.AdminProposal) qty++ } - if qty == 0 { - return fmt.Errorf("no admin proposal type is present in message") - } - - if qty == 1 { + switch qty { + case 1: return nil + case 0: + return fmt.Errorf("no admin proposal type is present in message") + default: + return fmt.Errorf("more than one admin proposal type is present in message") } - - return fmt.Errorf("more than one admin proposal type is present in message") } func (m *CustomMessenger) isLegacyProposal(proposal *bindings.AdminProposal) bool { - if proposal.ParamChangeProposal != nil || proposal.UpgradeProposal != nil || proposal.ClientUpdateProposal != nil { + switch { + case proposal.ParamChangeProposal != nil, + proposal.UpgradeProposal != nil, + proposal.ClientUpdateProposal != nil: return true + default: + return false } - return false } func (m *CustomMessenger) addSchedule(ctx sdk.Context, contractAddr sdk.AccAddress, addSchedule *bindings.AddSchedule) ([]sdk.Event, [][]byte, error) { From b34a26e9a303c1406cb3b91601b33549a3988a16 Mon Sep 17 00:00:00 2001 From: swelf Date: Wed, 30 Aug 2023 12:36:10 +0300 Subject: [PATCH 067/307] removed outdated comments --- x/interchaintxs/keeper/ibc_handlers.go | 4 ---- x/transfer/ibc_handlers.go | 4 ---- 2 files changed, 8 deletions(-) diff --git a/x/interchaintxs/keeper/ibc_handlers.go b/x/interchaintxs/keeper/ibc_handlers.go index 79b79cad5..535556800 100644 --- a/x/interchaintxs/keeper/ibc_handlers.go +++ b/x/interchaintxs/keeper/ibc_handlers.go @@ -39,8 +39,6 @@ func (k *Keeper) HandleAcknowledgement(ctx sdk.Context, packet channeltypes.Pack k.feeKeeper.DistributeAcknowledgementFee(ctx, relayer, feetypes.NewPacketID(packet.SourcePort, packet.SourceChannel, packet.Sequence)) func() { - // early error initialisation, to choose a correct `if` branch right after the closure in case of successfully `out of gas` panic recovered - // if SudoError/SudoResponse successful, then `err` is set to `nil` defer neutronerrors.OutOfGasRecovery(newGasMeter, &err) // Actually we have only one kind of error returned from acknowledgement // maybe later we'll retrieve actual errors from events @@ -82,8 +80,6 @@ func (k *Keeper) HandleTimeout(ctx sdk.Context, packet channeltypes.Packet, rela k.feeKeeper.DistributeTimeoutFee(ctx, relayer, feetypes.NewPacketID(packet.SourcePort, packet.SourceChannel, packet.Sequence)) func() { - // early error initialisation, to choose a correct `if` branch right after the closure, in case of successfully `out of gas` panic recovered - // if SudoTimeout successful, then `err` is set to `nil` defer neutronerrors.OutOfGasRecovery(newGasMeter, &err) _, err = k.contractManagerKeeper.SudoTimeout(cacheCtx, icaOwner.GetContract(), packet) }() diff --git a/x/transfer/ibc_handlers.go b/x/transfer/ibc_handlers.go index 37834eada..73fac3316 100644 --- a/x/transfer/ibc_handlers.go +++ b/x/transfer/ibc_handlers.go @@ -38,8 +38,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)) func() { - // early error initialisation, to choose a correct `if` branch right after the closure in case of successfully `out of gas` panic recovered - // if SudoResponse/SudoError successful, then `err` is set to `nil` defer neutronerrors.OutOfGasRecovery(newGasMeter, &err) if ack.Success() { _, err = im.ContractManagerKeeper.SudoResponse(cacheCtx, senderAddress, packet, ack.GetResult()) @@ -86,8 +84,6 @@ func (im IBCModule) HandleTimeout(ctx sdk.Context, packet channeltypes.Packet, r // distribute fee im.wrappedKeeper.FeeKeeper.DistributeTimeoutFee(ctx, relayer, feetypes.NewPacketID(packet.SourcePort, packet.SourceChannel, packet.Sequence)) func() { - // early error initialisation, to choose a correct `if` branch right after the closure, in case of successfully `out of gas` panic recovered - // if SudoTimeout successful, then `err` is set to `nil` defer neutronerrors.OutOfGasRecovery(newGasMeter, &err) _, err = im.ContractManagerKeeper.SudoTimeout(cacheCtx, senderAddress, packet) }() From bbc0480b4526e4241a9292db2255290f6d0a1f15 Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Wed, 30 Aug 2023 13:47:32 +0400 Subject: [PATCH 068/307] polishing --- wasmbinding/message_plugin.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/wasmbinding/message_plugin.go b/wasmbinding/message_plugin.go index 9feb137ff..2af5ed310 100644 --- a/wasmbinding/message_plugin.go +++ b/wasmbinding/message_plugin.go @@ -405,7 +405,6 @@ func (m *CustomMessenger) performSubmitAdminProposalLegacy(ctx sdk.Context, cont ctx.Logger().Debug("submit proposal legacy processed in msg server", "from_address", contractAddr.String(), - "creator", contractAddr.String(), ) return response, nil @@ -756,7 +755,6 @@ func (m *CustomMessenger) validateProposalQty(proposal *bindings.AdminProposal) if proposal.UpgradeProposal != nil { qty++ } - if proposal.ProposalExecuteMessage != nil { qty++ } @@ -770,6 +768,7 @@ func (m *CustomMessenger) validateProposalQty(proposal *bindings.AdminProposal) return fmt.Errorf("more than one admin proposal type is present in message") } } + func (m *CustomMessenger) isLegacyProposal(proposal *bindings.AdminProposal) bool { switch { case proposal.ParamChangeProposal != nil, From b5647e2d59a900d5be8dc597ec839bf2b1d111af Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Wed, 30 Aug 2023 13:56:30 +0400 Subject: [PATCH 069/307] rm enabled proposals --- Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Makefile b/Makefile index b33b38a56..b6b749271 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,6 @@ LEDGER_ENABLED ?= true SDK_PACK := $(shell go list -m github.com/cosmos/cosmos-sdk | sed 's/ /\@/g') BINDIR ?= $(GOPATH)/bin SIMAPP = ./app -ENABLED_PROPOSALS := MigrateContract,SudoContract,UpdateAdmin,ClearAdmin,PinCodes,UnpinCodes GO_VERSION=1.20.0 BUILDDIR ?= $(CURDIR)/build @@ -112,7 +111,6 @@ build-static-linux-amd64: go.sum $(BUILDDIR)/ --build-arg GIT_VERSION=$(VERSION) \ --build-arg GIT_COMMIT=$(COMMIT) \ --build-arg BUILD_TAGS=$(build_tags_comma_sep) \ - --build-arg ENABLED_PROPOSALS=$(ENABLED_PROPOSALS) \ --platform linux/amd64 \ -t neutron-amd64 \ --load \ From 2898efb59912cd2833167414745255e1ade67fe0 Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Wed, 30 Aug 2023 15:52:07 +0400 Subject: [PATCH 070/307] small ref & comment --- wasmbinding/message_plugin.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/wasmbinding/message_plugin.go b/wasmbinding/message_plugin.go index 2af5ed310..be8650904 100644 --- a/wasmbinding/message_plugin.go +++ b/wasmbinding/message_plugin.go @@ -299,7 +299,7 @@ func (m *CustomMessenger) submitAdminProposal(ctx sdk.Context, contractAddr sdk. if err != nil { return nil, nil, errors.Wrap(err, "failed to validate proposal quantity") } - // here we handle pre-sdk47 style of proposals: param change & upgrade/cancel + // here we handle pre-sdk47 style of proposals: param change, upgrade, client update if m.isLegacyProposal(adminProposal) { resp, err := m.performSubmitAdminProposalLegacy(ctx, contractAddr, adminProposal) if err != nil { @@ -432,8 +432,11 @@ func (m *CustomMessenger) performSubmitAdminProposal(ctx sdk.Context, contractAd if !signers[0].Equals(authority) { return nil, errors.Wrap(sdkerrors.ErrUnauthorized, "authority in incoming msg is not equal to admin module") } - sdkMsgs = append(sdkMsgs, sdkMsg) - msg, err = admintypes.NewMsgSubmitProposal(sdkMsgs, contractAddr) + + msg, err = admintypes.NewMsgSubmitProposal([]sdk.Msg{sdkMsg}, contractAddr) + if err != nil { + return nil, errors.Wrap(err, "failed to create MsgSubmitProposal ") + } if err := msg.ValidateBasic(); err != nil { return nil, errors.Wrap(err, "failed to validate incoming SubmitAdminProposal message") From 9fc8ea3fa6cf74fbf17a722c6fc40c2b8efe3ed4 Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Thu, 31 Aug 2023 16:53:13 +0400 Subject: [PATCH 071/307] add upd params msgs --- proto/neutron/contractmanager/tx.proto | 42 +++ proto/neutron/cron/tx.proto | 32 +- proto/neutron/feeburner/tx.proto | 43 +++ proto/neutron/feerefunder/tx.proto | 43 +++ proto/neutron/interchainqueries/tx.proto | 29 ++ proto/neutron/interchaintxs/v1/tx.proto | 28 ++ x/tokenfactory/keeper/before_send.go | 155 ++++++++ x/tokenfactory/types/denoms_test.go | 131 ------- x/tokenfactory/types/genesis_test.go | 139 ------- x/tokenfactory/types/msgs_test.go | 450 ----------------------- 10 files changed, 370 insertions(+), 722 deletions(-) create mode 100644 proto/neutron/contractmanager/tx.proto create mode 100644 proto/neutron/feeburner/tx.proto create mode 100644 proto/neutron/feerefunder/tx.proto create mode 100644 x/tokenfactory/keeper/before_send.go delete mode 100644 x/tokenfactory/types/denoms_test.go delete mode 100644 x/tokenfactory/types/genesis_test.go delete mode 100644 x/tokenfactory/types/msgs_test.go diff --git a/proto/neutron/contractmanager/tx.proto b/proto/neutron/contractmanager/tx.proto new file mode 100644 index 000000000..51b4e01fe --- /dev/null +++ b/proto/neutron/contractmanager/tx.proto @@ -0,0 +1,42 @@ +syntax = "proto3"; +package neutron.contractmanager; + +import "neutron/contractmanager/params.proto"; +import "gogoproto/gogo.proto"; +import "cosmos/msg/v1/msg.proto"; +import "cosmos_proto/cosmos.proto"; +import "amino/amino.proto"; + +// this line is used by starport scaffolding # proto/tx/import + +option go_package = "github.com/neutron-org/neutron/x/contractmanager/types"; + +// Msg defines the Msg service. +service Msg { + rpc UpdateParams(MsgUpdateParams) returns (MsgUpdateParamsResponse); + // this line is used by starport scaffolding # proto/tx/rpc +} + +// MsgUpdateParams is the MsgUpdateParams request type. +// +// Since: 0.47 +message MsgUpdateParams { + option (amino.name) = "contractmanager/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/contractmanager parameters to update. + // + // NOTE: All parameters must be supplied. + contractmanager.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/cron/tx.proto b/proto/neutron/cron/tx.proto index 79cf8b235..fef6a57f1 100644 --- a/proto/neutron/cron/tx.proto +++ b/proto/neutron/cron/tx.proto @@ -1,14 +1,42 @@ syntax = "proto3"; package neutron.cron; +import "neutron/cron/params.proto"; +import "gogoproto/gogo.proto"; +import "cosmos/msg/v1/msg.proto"; +import "cosmos_proto/cosmos.proto"; +import "amino/amino.proto"; + // this line is used by starport scaffolding # proto/tx/import option go_package = "github.com/neutron-org/neutron/x/cron/types"; // Msg defines the Msg service. service Msg { -// this line is used by starport scaffolding # proto/tx/rpc + rpc UpdateParams(MsgUpdateParams) returns (MsgUpdateParamsResponse); + // this line is used by starport scaffolding # proto/tx/rpc +} + +// MsgUpdateParams is the MsgUpdateParams request type. +// +// Since: 0.47 +message MsgUpdateParams { + option (amino.name) = "cron/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/cron 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 {} -// this line is used by starport scaffolding # proto/tx/message diff --git a/proto/neutron/feeburner/tx.proto b/proto/neutron/feeburner/tx.proto new file mode 100644 index 000000000..68e804ab1 --- /dev/null +++ b/proto/neutron/feeburner/tx.proto @@ -0,0 +1,43 @@ +syntax = "proto3"; +package neutron.feeburner; + +import "neutron/feeburner/params.proto"; +import "gogoproto/gogo.proto"; +import "cosmos/msg/v1/msg.proto"; +import "cosmos_proto/cosmos.proto"; +import "amino/amino.proto"; + + +// this line is used by starport scaffolding # proto/tx/import + +option go_package = "github.com/neutron-org/neutron/x/feeburner/types"; + +// Msg defines the Msg service. +service Msg { + rpc UpdateParams(MsgUpdateParams) returns (MsgUpdateParamsResponse); + // this line is used by starport scaffolding # proto/tx/rpc +} + +// MsgUpdateParams is the MsgUpdateParams request type. +// +// Since: 0.47 +message MsgUpdateParams { + option (amino.name) = "feeburner/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/feeburner parameters to update. + // + // NOTE: All parameters must be supplied. + feeburner.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/feerefunder/tx.proto b/proto/neutron/feerefunder/tx.proto new file mode 100644 index 000000000..bede834e3 --- /dev/null +++ b/proto/neutron/feerefunder/tx.proto @@ -0,0 +1,43 @@ +syntax = "proto3"; +package neutron.feerefunder; + +import "neutron/feerefunder/params.proto"; +import "gogoproto/gogo.proto"; +import "cosmos/msg/v1/msg.proto"; +import "cosmos_proto/cosmos.proto"; +import "amino/amino.proto"; + + +// this line is used by starport scaffolding # proto/tx/import + +option go_package = "github.com/neutron-org/neutron/x/feerefunder/types"; + +// Msg defines the Msg service. +service Msg { + rpc UpdateParams(MsgUpdateParams) returns (MsgUpdateParamsResponse); + // this line is used by starport scaffolding # proto/tx/rpc +} + +// MsgUpdateParams is the MsgUpdateParams request type. +// +// Since: 0.47 +message MsgUpdateParams { + option (amino.name) = "feerefunder/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/feerefunder parameters to update. + // + // NOTE: All parameters must be supplied. + feerefunder.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/tx.proto b/proto/neutron/interchainqueries/tx.proto index 1385c2dc8..37936f711 100644 --- a/proto/neutron/interchainqueries/tx.proto +++ b/proto/neutron/interchainqueries/tx.proto @@ -1,10 +1,15 @@ syntax = "proto3"; package neutron.interchainqueries; +import "neutron/interchainqueries/params.proto"; import "tendermint/crypto/proof.proto"; import "tendermint/abci/types.proto"; import "google/protobuf/any.proto"; import "neutron/interchainqueries/genesis.proto"; +import "gogoproto/gogo.proto"; +import "cosmos/msg/v1/msg.proto"; +import "cosmos_proto/cosmos.proto"; +import "amino/amino.proto"; option go_package = "github.com/neutron-org/neutron/x/interchainqueries/types"; @@ -18,6 +23,7 @@ service Msg { returns (MsgRemoveInterchainQueryResponse); rpc UpdateInterchainQuery(MsgUpdateInterchainQueryRequest) returns (MsgUpdateInterchainQueryResponse); + rpc UpdateParams(MsgUpdateParams) returns (MsgUpdateParamsResponse); } message MsgRegisterInterchainQuery { @@ -119,3 +125,26 @@ message MsgUpdateInterchainQueryRequest { string sender = 5; // is the signer of the message } message MsgUpdateInterchainQueryResponse {} + +// MsgUpdateParams is the MsgUpdateParams request type. +// +// Since: 0.47 +message MsgUpdateParams { + option (amino.name) = "interchainqueries/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/interchaintxs/v1/tx.proto b/proto/neutron/interchaintxs/v1/tx.proto index c871accd2..3ba09f2e3 100644 --- a/proto/neutron/interchaintxs/v1/tx.proto +++ b/proto/neutron/interchaintxs/v1/tx.proto @@ -4,17 +4,21 @@ package neutron.interchaintxs.v1; option go_package = "github.com/neutron-org/neutron/x/interchaintxs/types"; import "cosmos_proto/cosmos.proto"; +import "neutron/interchaintxs/v1/params.proto"; import "gogoproto/gogo.proto"; import "google/api/http.proto"; import "google/api/annotations.proto"; import "google/protobuf/any.proto"; import "neutron/feerefunder/fee.proto"; +import "cosmos/msg/v1/msg.proto"; +import "amino/amino.proto"; // Msg defines the Msg service. service Msg { rpc RegisterInterchainAccount(MsgRegisterInterchainAccount) returns (MsgRegisterInterchainAccountResponse) {}; rpc SubmitTx(MsgSubmitTx) returns (MsgSubmitTxResponse) {}; + rpc UpdateParams(MsgUpdateParams) returns (MsgUpdateParamsResponse); } // MsgRegisterInterchainAccount is used to register an account on a remote zone. @@ -59,3 +63,27 @@ message MsgSubmitTxResponse { // channel src channel on neutron side trasaction was submitted from string channel = 2; } + +// MsgUpdateParams is the MsgUpdateParams request type. +// +// Since: 0.47 +message MsgUpdateParams { + option (amino.name) = "interchaintxs/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/x/tokenfactory/keeper/before_send.go b/x/tokenfactory/keeper/before_send.go new file mode 100644 index 000000000..bfe4d36e8 --- /dev/null +++ b/x/tokenfactory/keeper/before_send.go @@ -0,0 +1,155 @@ +package keeper + +import ( + "encoding/json" + + sdk "github.com/cosmos/cosmos-sdk/types" + + "github.com/osmosis-labs/osmosis/v17/x/tokenfactory/types" + + errorsmod "cosmossdk.io/errors" + wasmvmtypes "github.com/CosmWasm/wasmvm/types" +) + +func (k Keeper) setBeforeSendHook(ctx sdk.Context, denom string, cosmwasmAddress string) error { + // verify that denom is an x/tokenfactory denom + _, _, err := types.DeconstructDenom(denom) + if err != nil { + return err + } + + store := k.GetDenomPrefixStore(ctx, denom) + + // delete the store for denom prefix store when cosmwasm address is nil + if cosmwasmAddress == "" { + store.Delete([]byte(types.BeforeSendHookAddressPrefixKey)) + return nil + } + + _, err = sdk.AccAddressFromBech32(cosmwasmAddress) + if err != nil { + return err + } + + store.Set([]byte(types.BeforeSendHookAddressPrefixKey), []byte(cosmwasmAddress)) + + return nil +} + +func (k Keeper) GetBeforeSendHook(ctx sdk.Context, denom string) string { + store := k.GetDenomPrefixStore(ctx, denom) + + bz := store.Get([]byte(types.BeforeSendHookAddressPrefixKey)) + if bz == nil { + return "" + } + + return string(bz) +} + +func CWCoinsFromSDKCoins(in sdk.Coins) wasmvmtypes.Coins { + var cwCoins wasmvmtypes.Coins + for _, coin := range in { + cwCoins = append(cwCoins, CWCoinFromSDKCoin(coin)) + } + return cwCoins +} + +func CWCoinFromSDKCoin(in sdk.Coin) wasmvmtypes.Coin { + return wasmvmtypes.Coin{ + Denom: in.GetDenom(), + Amount: in.Amount.String(), + } +} + +// Hooks wrapper struct for bank keeper +type Hooks struct { + k Keeper +} + +var _ types.BankHooks = Hooks{} + +// Return the wrapper struct +func (k Keeper) Hooks() Hooks { + return Hooks{k} +} + +// TrackBeforeSend calls the before send listener contract surpresses any errors +func (h Hooks) TrackBeforeSend(ctx sdk.Context, from, to sdk.AccAddress, amount sdk.Coins) { + _ = h.k.callBeforeSendListener(ctx, from, to, amount, false) +} + +// TrackBeforeSend calls the before send listener contract returns any errors +func (h Hooks) BlockBeforeSend(ctx sdk.Context, from, to sdk.AccAddress, amount sdk.Coins) error { + return h.k.callBeforeSendListener(ctx, from, to, amount, true) +} + +// callBeforeSendListener iterates over each coin and sends corresponding sudo msg to the contract address stored in state. +// If blockBeforeSend is true, sudoMsg wraps BlockBeforeSendMsg, otherwise sudoMsg wraps TrackBeforeSendMsg. +// Note that we gas meter trackBeforeSend to prevent infinite contract calls. +// CONTRACT: this should not be called in beginBlock or endBlock since out of gas will cause this method to panic. +func (k Keeper) callBeforeSendListener(ctx sdk.Context, from, to sdk.AccAddress, amount sdk.Coins, blockBeforeSend bool) (err error) { + defer func() { + if r := recover(); r != nil { + err = types.ErrTrackBeforeSendOutOfGas + } + }() + + for _, coin := range amount { + cosmwasmAddress := k.GetBeforeSendHook(ctx, coin.Denom) + if cosmwasmAddress != "" { + cwAddr, err := sdk.AccAddressFromBech32(cosmwasmAddress) + if err != nil { + return err + } + + var msgBz []byte + + // get msgBz, either BlockBeforeSend or TrackBeforeSend + // Note that for trackBeforeSend, we need to gas meter computations to prevent infinite loop + // specifically because module to module sends are not gas metered. + // We don't need to do this for blockBeforeSend since blockBeforeSend is not called during module to module sends. + if blockBeforeSend { + msg := types.BlockBeforeSendSudoMsg{ + BlockBeforeSend: types.BlockBeforeSendMsg{ + From: from.String(), + To: to.String(), + Amount: CWCoinFromSDKCoin(coin), + }, + } + msgBz, err = json.Marshal(msg) + } else { + msg := types.TrackBeforeSendSudoMsg{ + TrackBeforeSend: types.TrackBeforeSendMsg{ + From: from.String(), + To: to.String(), + Amount: CWCoinFromSDKCoin(coin), + }, + } + msgBz, err = json.Marshal(msg) + } + if err != nil { + return err + } + em := sdk.NewEventManager() + + // if its track before send, apply gas meter to prevent infinite loop + if blockBeforeSend { + _, err = k.contractKeeper.Sudo(ctx.WithEventManager(em), cwAddr, msgBz) + if err != nil { + return errorsmod.Wrapf(err, "failed to call before send hook for denom %s", coin.Denom) + } + } else { + childCtx := ctx.WithGasMeter(sdk.NewGasMeter(types.TrackBeforeSendGasLimit)) + _, err = k.contractKeeper.Sudo(childCtx.WithEventManager(em), cwAddr, msgBz) + if err != nil { + return errorsmod.Wrapf(err, "failed to call before send hook for denom %s", coin.Denom) + } + + // consume gas used for calling contract to the parent ctx + ctx.GasMeter().ConsumeGas(childCtx.GasMeter().GasConsumed(), "track before send gas") + } + } + } + return nil +} diff --git a/x/tokenfactory/types/denoms_test.go b/x/tokenfactory/types/denoms_test.go deleted file mode 100644 index d3f21d28b..000000000 --- a/x/tokenfactory/types/denoms_test.go +++ /dev/null @@ -1,131 +0,0 @@ -package types_test - -import ( - "testing" - - "github.com/stretchr/testify/require" - - appparams "github.com/osmosis-labs/osmosis/v17/app/params" - "github.com/osmosis-labs/osmosis/v17/x/tokenfactory/types" -) - -func TestDeconstructDenom(t *testing.T) { - appparams.SetAddressPrefixes() - - for _, tc := range []struct { - desc string - denom string - expectedSubdenom string - err error - }{ - { - desc: "empty is invalid", - denom: "", - err: types.ErrInvalidDenom, - }, - { - desc: "normal", - denom: "factory/osmo1t7egva48prqmzl59x5ngv4zx0dtrwewc9m7z44/bitcoin", - expectedSubdenom: "bitcoin", - }, - { - desc: "multiple slashes in subdenom", - denom: "factory/osmo1t7egva48prqmzl59x5ngv4zx0dtrwewc9m7z44/bitcoin/1", - expectedSubdenom: "bitcoin/1", - }, - { - desc: "no subdenom", - denom: "factory/osmo1t7egva48prqmzl59x5ngv4zx0dtrwewc9m7z44/", - expectedSubdenom: "", - }, - { - desc: "incorrect prefix", - denom: "ibc/osmo1t7egva48prqmzl59x5ngv4zx0dtrwewc9m7z44/bitcoin", - err: types.ErrInvalidDenom, - }, - { - desc: "subdenom of only slashes", - denom: "factory/osmo1t7egva48prqmzl59x5ngv4zx0dtrwewc9m7z44/////", - expectedSubdenom: "////", - }, - { - desc: "too long name", - denom: "factory/osmo1t7egva48prqmzl59x5ngv4zx0dtrwewc9m7z44/adsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsf", - err: types.ErrInvalidDenom, - }, - } { - t.Run(tc.desc, func(t *testing.T) { - expectedCreator := "osmo1t7egva48prqmzl59x5ngv4zx0dtrwewc9m7z44" - creator, subdenom, err := types.DeconstructDenom(tc.denom) - if tc.err != nil { - require.ErrorContains(t, err, tc.err.Error()) - } else { - require.NoError(t, err) - require.Equal(t, expectedCreator, creator) - require.Equal(t, tc.expectedSubdenom, subdenom) - } - }) - } -} - -func TestGetTokenDenom(t *testing.T) { - appparams.SetAddressPrefixes() - for _, tc := range []struct { - desc string - creator string - subdenom string - valid bool - }{ - { - desc: "normal", - creator: "osmo1t7egva48prqmzl59x5ngv4zx0dtrwewc9m7z44", - subdenom: "bitcoin", - valid: true, - }, - { - desc: "multiple slashes in subdenom", - creator: "osmo1t7egva48prqmzl59x5ngv4zx0dtrwewc9m7z44", - subdenom: "bitcoin/1", - valid: true, - }, - { - desc: "no subdenom", - creator: "osmo1t7egva48prqmzl59x5ngv4zx0dtrwewc9m7z44", - subdenom: "", - valid: true, - }, - { - desc: "subdenom of only slashes", - creator: "osmo1t7egva48prqmzl59x5ngv4zx0dtrwewc9m7z44", - subdenom: "/////", - valid: true, - }, - { - desc: "too long name", - creator: "osmo1t7egva48prqmzl59x5ngv4zx0dtrwewc9m7z44", - subdenom: "adsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsf", - valid: false, - }, - { - desc: "subdenom is exactly max length", - creator: "osmo1t7egva48prqmzl59x5ngv4zx0dtrwewc9m7z44", - subdenom: "bitcoinfsadfsdfeadfsafwefsefsefsdfsdafasefsf", - valid: true, - }, - { - desc: "creator is exactly max length", - creator: "osmo1t7egva48prqmzl59x5ngv4zx0dtrwewc9m7z44jhgjhgkhjklhkjhkjhgjhgjgjghelugt", - subdenom: "bitcoin", - valid: true, - }, - } { - t.Run(tc.desc, func(t *testing.T) { - _, err := types.GetTokenDenom(tc.creator, tc.subdenom) - if tc.valid { - require.NoError(t, err) - } else { - require.Error(t, err) - } - }) - } -} diff --git a/x/tokenfactory/types/genesis_test.go b/x/tokenfactory/types/genesis_test.go deleted file mode 100644 index d9392c26d..000000000 --- a/x/tokenfactory/types/genesis_test.go +++ /dev/null @@ -1,139 +0,0 @@ -package types_test - -import ( - "testing" - - "github.com/stretchr/testify/require" - - "github.com/osmosis-labs/osmosis/v17/x/tokenfactory/types" -) - -func TestGenesisState_Validate(t *testing.T) { - for _, tc := range []struct { - desc string - genState *types.GenesisState - valid bool - }{ - { - desc: "default is valid", - genState: types.DefaultGenesis(), - valid: true, - }, - { - desc: "valid genesis state", - genState: &types.GenesisState{ - FactoryDenoms: []types.GenesisDenom{ - { - Denom: "factory/osmo1t7egva48prqmzl59x5ngv4zx0dtrwewc9m7z44/bitcoin", - AuthorityMetadata: types.DenomAuthorityMetadata{ - Admin: "osmo1t7egva48prqmzl59x5ngv4zx0dtrwewc9m7z44", - }, - }, - }, - }, - valid: true, - }, - { - desc: "different admin from creator", - genState: &types.GenesisState{ - FactoryDenoms: []types.GenesisDenom{ - { - Denom: "factory/osmo1t7egva48prqmzl59x5ngv4zx0dtrwewc9m7z44/bitcoin", - AuthorityMetadata: types.DenomAuthorityMetadata{ - Admin: "osmo1ft6e5esdtdegnvcr3djd3ftk4kwpcr6jrx5fj9", - }, - }, - }, - }, - valid: true, - }, - { - desc: "empty admin", - genState: &types.GenesisState{ - FactoryDenoms: []types.GenesisDenom{ - { - Denom: "factory/osmo1t7egva48prqmzl59x5ngv4zx0dtrwewc9m7z44/bitcoin", - AuthorityMetadata: types.DenomAuthorityMetadata{ - Admin: "", - }, - }, - }, - }, - valid: true, - }, - { - desc: "no admin", - genState: &types.GenesisState{ - FactoryDenoms: []types.GenesisDenom{ - { - Denom: "factory/osmo1t7egva48prqmzl59x5ngv4zx0dtrwewc9m7z44/bitcoin", - }, - }, - }, - valid: true, - }, - { - desc: "invalid admin", - genState: &types.GenesisState{ - FactoryDenoms: []types.GenesisDenom{ - { - Denom: "factory/osmo1t7egva48prqmzl59x5ngv4zx0dtrwewc9m7z44/bitcoin", - AuthorityMetadata: types.DenomAuthorityMetadata{ - Admin: "moose", - }, - }, - }, - }, - valid: false, - }, - { - desc: "multiple denoms", - genState: &types.GenesisState{ - FactoryDenoms: []types.GenesisDenom{ - { - Denom: "factory/osmo1t7egva48prqmzl59x5ngv4zx0dtrwewc9m7z44/bitcoin", - AuthorityMetadata: types.DenomAuthorityMetadata{ - Admin: "", - }, - }, - { - Denom: "factory/osmo1t7egva48prqmzl59x5ngv4zx0dtrwewc9m7z44/litecoin", - AuthorityMetadata: types.DenomAuthorityMetadata{ - Admin: "", - }, - }, - }, - }, - valid: true, - }, - { - desc: "duplicate denoms", - genState: &types.GenesisState{ - FactoryDenoms: []types.GenesisDenom{ - { - Denom: "factory/osmo1t7egva48prqmzl59x5ngv4zx0dtrwewc9m7z44/bitcoin", - AuthorityMetadata: types.DenomAuthorityMetadata{ - Admin: "", - }, - }, - { - Denom: "factory/osmo1t7egva48prqmzl59x5ngv4zx0dtrwewc9m7z44/bitcoin", - AuthorityMetadata: types.DenomAuthorityMetadata{ - Admin: "", - }, - }, - }, - }, - valid: false, - }, - } { - t.Run(tc.desc, func(t *testing.T) { - err := tc.genState.Validate() - if tc.valid { - require.NoError(t, err) - } else { - require.Error(t, err) - } - }) - } -} diff --git a/x/tokenfactory/types/msgs_test.go b/x/tokenfactory/types/msgs_test.go deleted file mode 100644 index e8480b58a..000000000 --- a/x/tokenfactory/types/msgs_test.go +++ /dev/null @@ -1,450 +0,0 @@ -package types_test - -import ( - fmt "fmt" - "testing" - - sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/stretchr/testify/require" - - "github.com/osmosis-labs/osmosis/v17/app/apptesting" - "github.com/osmosis-labs/osmosis/v17/x/tokenfactory/types" - - banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/tendermint/tendermint/crypto/ed25519" -) - -// // Test authz serialize and de-serializes for tokenfactory msg. -func TestAuthzMsg(t *testing.T) { - pk1 := ed25519.GenPrivKey().PubKey() - addr1 := sdk.AccAddress(pk1.Address()).String() - coin := sdk.NewCoin("denom", sdk.NewInt(1)) - - testCases := []struct { - name string - msg sdk.Msg - }{ - { - name: "MsgCreateDenom", - msg: &types.MsgCreateDenom{ - Sender: addr1, - Subdenom: "valoper1xyz", - }, - }, - { - name: "MsgBurn", - msg: &types.MsgBurn{ - Sender: addr1, - Amount: coin, - }, - }, - { - name: "MsgMint", - msg: &types.MsgMint{ - Sender: addr1, - Amount: coin, - }, - }, - { - name: "MsgChangeAdmin", - msg: &types.MsgChangeAdmin{ - Sender: addr1, - Denom: "denom", - NewAdmin: "osmo1q8tq5qhrhw6t970egemuuwywhlhpnmdmts6xnu", - }, - }, - } - for _, tc := range testCases { - t.Run(tc.name, func(t *testing.T) { - apptesting.TestMessageAuthzSerialization(t, tc.msg) - }) - } -} - -// TestMsgCreateDenom tests if valid/invalid create denom messages are properly validated/invalidated -func TestMsgCreateDenom(t *testing.T) { - // generate a private/public key pair and get the respective address - pk1 := ed25519.GenPrivKey().PubKey() - addr1 := sdk.AccAddress(pk1.Address()) - - // make a proper createDenom message - createMsg := func(after func(msg types.MsgCreateDenom) types.MsgCreateDenom) types.MsgCreateDenom { - properMsg := *types.NewMsgCreateDenom( - addr1.String(), - "bitcoin", - ) - - return after(properMsg) - } - - // validate createDenom message was created as intended - msg := createMsg(func(msg types.MsgCreateDenom) types.MsgCreateDenom { - return msg - }) - require.Equal(t, msg.Route(), types.RouterKey) - require.Equal(t, msg.Type(), "create_denom") - signers := msg.GetSigners() - require.Equal(t, len(signers), 1) - require.Equal(t, signers[0].String(), addr1.String()) - - tests := []struct { - name string - msg types.MsgCreateDenom - expectPass bool - }{ - { - name: "proper msg", - msg: createMsg(func(msg types.MsgCreateDenom) types.MsgCreateDenom { - return msg - }), - expectPass: true, - }, - { - name: "empty sender", - msg: createMsg(func(msg types.MsgCreateDenom) types.MsgCreateDenom { - msg.Sender = "" - return msg - }), - expectPass: false, - }, - { - name: "invalid subdenom", - msg: createMsg(func(msg types.MsgCreateDenom) types.MsgCreateDenom { - msg.Subdenom = "thissubdenomismuchtoolongasdkfjaasdfdsafsdlkfnmlksadmflksmdlfmlsakmfdsafasdfasdf" - return msg - }), - expectPass: false, - }, - } - - for _, test := range tests { - if test.expectPass { - require.NoError(t, test.msg.ValidateBasic(), "test: %v", test.name) - } else { - require.Error(t, test.msg.ValidateBasic(), "test: %v", test.name) - } - } -} - -// TestMsgMint tests if valid/invalid create denom messages are properly validated/invalidated -func TestMsgMint(t *testing.T) { - // generate a private/public key pair and get the respective address - pk1 := ed25519.GenPrivKey().PubKey() - addr1 := sdk.AccAddress(pk1.Address()) - - // make a proper mint message - createMsg := func(after func(msg types.MsgMint) types.MsgMint) types.MsgMint { - properMsg := *types.NewMsgMint( - addr1.String(), - sdk.NewCoin("bitcoin", sdk.NewInt(500000000)), - ) - - return after(properMsg) - } - - // validate mint message was created as intended - msg := createMsg(func(msg types.MsgMint) types.MsgMint { - return msg - }) - require.Equal(t, msg.Route(), types.RouterKey) - require.Equal(t, msg.Type(), "tf_mint") - signers := msg.GetSigners() - require.Equal(t, len(signers), 1) - require.Equal(t, signers[0].String(), addr1.String()) - - tests := []struct { - name string - msg types.MsgMint - expectPass bool - }{ - { - name: "proper msg", - msg: createMsg(func(msg types.MsgMint) types.MsgMint { - return msg - }), - expectPass: true, - }, - { - name: "empty sender", - msg: createMsg(func(msg types.MsgMint) types.MsgMint { - msg.Sender = "" - return msg - }), - expectPass: false, - }, - { - name: "zero amount", - msg: createMsg(func(msg types.MsgMint) types.MsgMint { - msg.Amount = sdk.NewCoin("bitcoin", sdk.ZeroInt()) - return msg - }), - expectPass: false, - }, - { - name: "negative amount", - msg: createMsg(func(msg types.MsgMint) types.MsgMint { - msg.Amount.Amount = sdk.NewInt(-10000000) - return msg - }), - expectPass: false, - }, - } - - for _, test := range tests { - if test.expectPass { - require.NoError(t, test.msg.ValidateBasic(), "test: %v", test.name) - } else { - require.Error(t, test.msg.ValidateBasic(), "test: %v", test.name) - } - } -} - -// TestMsgBurn tests if valid/invalid create denom messages are properly validated/invalidated -func TestMsgBurn(t *testing.T) { - // generate a private/public key pair and get the respective address - pk1 := ed25519.GenPrivKey().PubKey() - addr1 := sdk.AccAddress(pk1.Address()) - - // make a proper burn message - baseMsg := types.NewMsgBurn( - addr1.String(), - sdk.NewCoin("bitcoin", sdk.NewInt(500000000)), - ) - - // validate burn message was created as intended - require.Equal(t, baseMsg.Route(), types.RouterKey) - require.Equal(t, baseMsg.Type(), "tf_burn") - signers := baseMsg.GetSigners() - require.Equal(t, len(signers), 1) - require.Equal(t, signers[0].String(), addr1.String()) - - tests := []struct { - name string - msg func() *types.MsgBurn - expectPass bool - }{ - { - name: "proper msg", - msg: func() *types.MsgBurn { - msg := baseMsg - return msg - }, - expectPass: true, - }, - { - name: "empty sender", - msg: func() *types.MsgBurn { - msg := baseMsg - msg.Sender = "" - return msg - }, - expectPass: false, - }, - { - name: "zero amount", - msg: func() *types.MsgBurn { - msg := baseMsg - msg.Amount.Amount = sdk.ZeroInt() - return msg - }, - expectPass: false, - }, - { - name: "negative amount", - msg: func() *types.MsgBurn { - msg := baseMsg - msg.Amount.Amount = sdk.NewInt(-10000000) - return msg - }, - expectPass: false, - }, - } - - for _, test := range tests { - if test.expectPass { - require.NoError(t, test.msg().ValidateBasic(), "test: %v", test.name) - } else { - require.Error(t, test.msg().ValidateBasic(), "test: %v", test.name) - } - } -} - -// TestMsgChangeAdmin tests if valid/invalid create denom messages are properly validated/invalidated -func TestMsgChangeAdmin(t *testing.T) { - // generate a private/public key pair and get the respective address - pk1 := ed25519.GenPrivKey().PubKey() - addr1 := sdk.AccAddress(pk1.Address()) - pk2 := ed25519.GenPrivKey().PubKey() - addr2 := sdk.AccAddress(pk2.Address()) - tokenFactoryDenom := fmt.Sprintf("factory/%s/bitcoin", addr1.String()) - - // make a proper changeAdmin message - baseMsg := types.NewMsgChangeAdmin( - addr1.String(), - tokenFactoryDenom, - addr2.String(), - ) - - // validate changeAdmin message was created as intended - require.Equal(t, baseMsg.Route(), types.RouterKey) - require.Equal(t, baseMsg.Type(), "change_admin") - signers := baseMsg.GetSigners() - require.Equal(t, len(signers), 1) - require.Equal(t, signers[0].String(), addr1.String()) - - tests := []struct { - name string - msg func() *types.MsgChangeAdmin - expectPass bool - }{ - { - name: "proper msg", - msg: func() *types.MsgChangeAdmin { - msg := baseMsg - return msg - }, - expectPass: true, - }, - { - name: "empty sender", - msg: func() *types.MsgChangeAdmin { - msg := baseMsg - msg.Sender = "" - return msg - }, - expectPass: false, - }, - { - name: "empty newAdmin", - msg: func() *types.MsgChangeAdmin { - msg := baseMsg - msg.NewAdmin = "" - return msg - }, - expectPass: false, - }, - { - name: "invalid denom", - msg: func() *types.MsgChangeAdmin { - msg := baseMsg - msg.Denom = "bitcoin" - return msg - }, - expectPass: false, - }, - } - - for _, test := range tests { - if test.expectPass { - require.NoError(t, test.msg().ValidateBasic(), "test: %v", test.name) - } else { - require.Error(t, test.msg().ValidateBasic(), "test: %v", test.name) - } - } -} - -// TestMsgSetDenomMetadata tests if valid/invalid create denom messages are properly validated/invalidated -func TestMsgSetDenomMetadata(t *testing.T) { - // generate a private/public key pair and get the respective address - pk1 := ed25519.GenPrivKey().PubKey() - addr1 := sdk.AccAddress(pk1.Address()) - tokenFactoryDenom := fmt.Sprintf("factory/%s/bitcoin", addr1.String()) - denomMetadata := banktypes.Metadata{ - Description: "nakamoto", - DenomUnits: []*banktypes.DenomUnit{ - { - Denom: tokenFactoryDenom, - Exponent: 0, - }, - { - Denom: "sats", - Exponent: 6, - }, - }, - Display: "sats", - Base: tokenFactoryDenom, - Name: "bitcoin", - Symbol: "BTC", - } - invalidDenomMetadata := banktypes.Metadata{ - Description: "nakamoto", - DenomUnits: []*banktypes.DenomUnit{ - { - Denom: "bitcoin", - Exponent: 0, - }, - { - Denom: "sats", - Exponent: 6, - }, - }, - Display: "sats", - Base: "bitcoin", - Name: "bitcoin", - Symbol: "BTC", - } - - // make a proper setDenomMetadata message - baseMsg := types.NewMsgSetDenomMetadata( - addr1.String(), - denomMetadata, - ) - - // validate setDenomMetadata message was created as intended - require.Equal(t, baseMsg.Route(), types.RouterKey) - require.Equal(t, baseMsg.Type(), "set_denom_metadata") - signers := baseMsg.GetSigners() - require.Equal(t, len(signers), 1) - require.Equal(t, signers[0].String(), addr1.String()) - - tests := []struct { - name string - msg func() *types.MsgSetDenomMetadata - expectPass bool - }{ - { - name: "proper msg", - msg: func() *types.MsgSetDenomMetadata { - msg := baseMsg - return msg - }, - expectPass: true, - }, - { - name: "empty sender", - msg: func() *types.MsgSetDenomMetadata { - msg := baseMsg - msg.Sender = "" - return msg - }, - expectPass: false, - }, - { - name: "invalid metadata", - msg: func() *types.MsgSetDenomMetadata { - msg := baseMsg - msg.Metadata.Name = "" - return msg - }, - - expectPass: false, - }, - { - name: "invalid base", - msg: func() *types.MsgSetDenomMetadata { - msg := baseMsg - msg.Metadata = invalidDenomMetadata - return msg - }, - expectPass: false, - }, - } - - for _, test := range tests { - if test.expectPass { - require.NoError(t, test.msg().ValidateBasic(), "test: %v", test.name) - } else { - require.Error(t, test.msg().ValidateBasic(), "test: %v", test.name) - } - } -} From 8a856f15397f4c1a2c2ebd0fb8a63ca6c86d8872 Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Thu, 31 Aug 2023 16:53:35 +0400 Subject: [PATCH 072/307] renew tokenfactory proto --- proto/osmosis/tokenfactory/v1beta1/tx.proto | 109 +++++++++++++++----- 1 file changed, 83 insertions(+), 26 deletions(-) diff --git a/proto/osmosis/tokenfactory/v1beta1/tx.proto b/proto/osmosis/tokenfactory/v1beta1/tx.proto index 57d4bdc38..8184a0a86 100644 --- a/proto/osmosis/tokenfactory/v1beta1/tx.proto +++ b/proto/osmosis/tokenfactory/v1beta1/tx.proto @@ -1,27 +1,42 @@ syntax = "proto3"; package osmosis.tokenfactory.v1beta1; +import "osmosis/tokenfactory/v1beta1/params.proto"; import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.proto"; +import "cosmos/msg/v1/msg.proto"; +import "cosmos_proto/cosmos.proto"; +import "amino/amino.proto"; +import "cosmos/bank/v1beta1/bank.proto"; option go_package = "github.com/neutron-org/neutron/x/tokenfactory/types"; -// Msg defines the Msg service. + +// Msg defines the tokefactory module's gRPC message service. service Msg { rpc CreateDenom(MsgCreateDenom) returns (MsgCreateDenomResponse); rpc Mint(MsgMint) returns (MsgMintResponse); rpc Burn(MsgBurn) returns (MsgBurnResponse); rpc ChangeAdmin(MsgChangeAdmin) returns (MsgChangeAdminResponse); + rpc SetDenomMetadata(MsgSetDenomMetadata) + returns (MsgSetDenomMetadataResponse); + rpc SetBeforeSendHook(MsgSetBeforeSendHook) + returns (MsgSetBeforeSendHookResponse); + rpc ForceTransfer(MsgForceTransfer) returns (MsgForceTransferResponse); } -// MsgCreateDenom is the sdk.Msg type for allowing an account to create -// a new denom. It requires a sender address and a subdenomination. -// The (sender_address, sub_denomination) pair must be unique and cannot be -// re-used. The resulting denom created is `factory/{creator -// address}/{subdenom}`. The resultant denom's admin is originally set to be the -// creator, but this can be changed later. The token denom does not indicate the -// current admin. +// MsgCreateDenom defines the message structure for the CreateDenom gRPC service +// method. It allows an account to create a new denom. It requires a sender +// address and a sub denomination. The (sender_address, sub_denomination) tuple +// must be unique and cannot be re-used. +// +// The resulting denom created is defined as +// . The resulting denom's admin is +// originally set to be the creator, but this can be changed later. The token +// denom does not indicate the current admin. message MsgCreateDenom { + option (amino.name) = "osmosis/tokenfactory/create-denom"; + string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ]; // subdenom can be up to 44 "alphanumeric" characters long. string subdenom = 2 [ (gogoproto.moretags) = "yaml:\"subdenom\"" ]; @@ -31,17 +46,21 @@ message MsgCreateDenom { // It returns the full string of the newly created denom message MsgCreateDenomResponse { string new_token_denom = 1 - [ (gogoproto.moretags) = "yaml:\"new_token_denom\"" ]; + [ (gogoproto.moretags) = "yaml:\"new_token_denom\"" ]; } // MsgMint is the sdk.Msg type for allowing an admin account to mint // more of a token. For now, we only support minting to the sender account message MsgMint { + option (amino.name) = "osmosis/tokenfactory/mint"; + string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ]; cosmos.base.v1beta1.Coin amount = 2 [ (gogoproto.moretags) = "yaml:\"amount\"", (gogoproto.nullable) = false ]; + string mintToAddress = 3 + [ (gogoproto.moretags) = "yaml:\"mint_to_address\"" ]; } message MsgMintResponse {} @@ -49,36 +68,74 @@ message MsgMintResponse {} // MsgBurn is the sdk.Msg type for allowing an admin account to burn // a token. For now, we only support burning from the sender account. message MsgBurn { + option (amino.name) = "osmosis/tokenfactory/burn"; + string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ]; cosmos.base.v1beta1.Coin amount = 2 [ (gogoproto.moretags) = "yaml:\"amount\"", (gogoproto.nullable) = false ]; + string burnFromAddress = 3 + [ (gogoproto.moretags) = "yaml:\"burn_from_address\"" ]; } message MsgBurnResponse {} -// // ===================== MsgForceTransfer -// message MsgForceTransfer { -// string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ]; -// cosmos.base.v1beta1.Coin amount = 2 [ -// (gogoproto.moretags) = "yaml:\"amount\"", -// (gogoproto.nullable) = false -// ]; -// string transferFromAddress = 3 -// [ (gogoproto.moretags) = "yaml:\"transfer_from_address\"" ]; -// string transferToAddress = 4 -// [ (gogoproto.moretags) = "yaml:\"transfer_to_address\"" ]; -// } - -// message MsgForceTransferResponse {} - // MsgChangeAdmin is the sdk.Msg type for allowing an admin account to reassign // adminship of a denom to a new account message MsgChangeAdmin { + option (amino.name) = "osmosis/tokenfactory/change-admin"; + + string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ]; + string denom = 2 [ (gogoproto.moretags) = "yaml:\"denom\"" ]; + string new_admin = 3 [ (gogoproto.moretags) = "yaml:\"new_admin\"" ]; +} + +// MsgChangeAdminResponse defines the response structure for an executed +// MsgChangeAdmin message. +message MsgChangeAdminResponse {} + +// MsgSetBeforeSendHook is the sdk.Msg type for allowing an admin account to +// assign a CosmWasm contract to call with a BeforeSend hook +message MsgSetBeforeSendHook { + option (amino.name) = "osmosis/tokenfactory/set-beforesend-hook"; + string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ]; string denom = 2 [ (gogoproto.moretags) = "yaml:\"denom\"" ]; - string newAdmin = 3 [ (gogoproto.moretags) = "yaml:\"new_admin\"" ]; + string cosmwasm_address = 3 + [ (gogoproto.moretags) = "yaml:\"cosmwasm_address\"" ]; +} + +// MsgSetBeforeSendHookResponse defines the response structure for an executed +// MsgSetBeforeSendHook message. +message MsgSetBeforeSendHookResponse {} + +// MsgSetDenomMetadata is the sdk.Msg type for allowing an admin account to set +// the denom's bank metadata +message MsgSetDenomMetadata { + string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ]; + cosmos.bank.v1beta1.Metadata metadata = 2 [ + (gogoproto.moretags) = "yaml:\"metadata\"", + (gogoproto.nullable) = false + ]; +} + +// MsgSetDenomMetadataResponse defines the response structure for an executed +// MsgSetDenomMetadata message. +message MsgSetDenomMetadataResponse {} + +message MsgForceTransfer { + option (amino.name) = "osmosis/tokenfactory/force-transfer"; + + string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ]; + cosmos.base.v1beta1.Coin amount = 2 [ + (gogoproto.moretags) = "yaml:\"amount\"", + (gogoproto.nullable) = false + ]; + string transferFromAddress = 3 + [ (gogoproto.moretags) = "yaml:\"transfer_from_address\"" ]; + string transferToAddress = 4 + [ (gogoproto.moretags) = "yaml:\"transfer_to_address\"" ]; } -message MsgChangeAdminResponse {} \ No newline at end of file +message MsgForceTransferResponse {} From f36e9546439f65f27c9474a1ac8af07d3be222e5 Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Thu, 31 Aug 2023 16:54:17 +0400 Subject: [PATCH 073/307] regen proto & update msg servers --- x/contractmanager/types/tx.pb.go | 598 +++++++++++++++++++++++ x/cron/types/tx.pb.go | 537 +++++++++++++++++++- x/feeburner/types/tx.pb.go | 598 +++++++++++++++++++++++ x/feerefunder/types/tx.pb.go | 598 +++++++++++++++++++++++ x/interchainqueries/keeper/keeper.go | 9 + x/interchainqueries/keeper/msg_server.go | 19 +- x/interchainqueries/types/tx.pb.go | 528 +++++++++++++++++--- x/interchaintxs/keeper/keeper.go | 7 + x/interchaintxs/keeper/msg_server.go | 19 +- x/interchaintxs/types/tx.pb.go | 475 ++++++++++++++++-- 10 files changed, 3277 insertions(+), 111 deletions(-) create mode 100644 x/contractmanager/types/tx.pb.go create mode 100644 x/feeburner/types/tx.pb.go create mode 100644 x/feerefunder/types/tx.pb.go diff --git a/x/contractmanager/types/tx.pb.go b/x/contractmanager/types/tx.pb.go new file mode 100644 index 000000000..c83e95d44 --- /dev/null +++ b/x/contractmanager/types/tx.pb.go @@ -0,0 +1,598 @@ +// Code generated by protoc-gen-gogo. DO NOT EDIT. +// source: neutron/contractmanager/tx.proto + +package types + +import ( + context "context" + fmt "fmt" + _ "github.com/cosmos/cosmos-proto" + _ "github.com/cosmos/cosmos-sdk/types/msgservice" + _ "github.com/cosmos/cosmos-sdk/types/tx/amino" + _ "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/contractmanager 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_4dc444ed708d435f, []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_4dc444ed708d435f, []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.contractmanager.MsgUpdateParams") + proto.RegisterType((*MsgUpdateParamsResponse)(nil), "neutron.contractmanager.MsgUpdateParamsResponse") +} + +func init() { proto.RegisterFile("neutron/contractmanager/tx.proto", fileDescriptor_4dc444ed708d435f) } + +var fileDescriptor_4dc444ed708d435f = []byte{ + // 344 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0xc8, 0x4b, 0x2d, 0x2d, + 0x29, 0xca, 0xcf, 0xd3, 0x4f, 0xce, 0xcf, 0x2b, 0x29, 0x4a, 0x4c, 0x2e, 0xc9, 0x4d, 0xcc, 0x4b, + 0x4c, 0x4f, 0x2d, 0xd2, 0x2f, 0xa9, 0xd0, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x87, 0xaa, + 0xd0, 0x43, 0x53, 0x21, 0xa5, 0x82, 0x4b, 0x6b, 0x41, 0x62, 0x51, 0x62, 0x6e, 0x31, 0x44, 0xbb, + 0x94, 0x48, 0x7a, 0x7e, 0x7a, 0x3e, 0x98, 0xa9, 0x0f, 0x62, 0x41, 0x45, 0xc5, 0x93, 0xf3, 0x8b, + 0x73, 0xf3, 0x8b, 0xf5, 0x73, 0x8b, 0xd3, 0xf5, 0xcb, 0x0c, 0x41, 0x14, 0x54, 0x42, 0x12, 0x22, + 0x11, 0x0f, 0xd1, 0x01, 0xe1, 0x40, 0xa5, 0x04, 0x13, 0x73, 0x33, 0xf3, 0xf2, 0xf5, 0xc1, 0x24, + 0x44, 0x48, 0xe9, 0x20, 0x23, 0x17, 0xbf, 0x6f, 0x71, 0x7a, 0x68, 0x41, 0x4a, 0x62, 0x49, 0x6a, + 0x00, 0xd8, 0x5a, 0x21, 0x33, 0x2e, 0xce, 0xc4, 0xd2, 0x92, 0x8c, 0xfc, 0xa2, 0xcc, 0x92, 0x4a, + 0x09, 0x46, 0x05, 0x46, 0x0d, 0x4e, 0x27, 0x89, 0x4b, 0x5b, 0x74, 0x45, 0xa0, 0x66, 0x39, 0xa6, + 0xa4, 0x14, 0xa5, 0x16, 0x17, 0x07, 0x97, 0x14, 0x65, 0xe6, 0xa5, 0x07, 0x21, 0x94, 0x0a, 0x39, + 0x71, 0xb1, 0x41, 0x1c, 0x2e, 0xc1, 0xa4, 0xc0, 0xa8, 0xc1, 0x6d, 0x24, 0xaf, 0x87, 0xc3, 0xe3, + 0x7a, 0x10, 0x8b, 0x9c, 0x38, 0x4f, 0xdc, 0x93, 0x67, 0x58, 0xf1, 0x7c, 0x83, 0x16, 0x63, 0x10, + 0x54, 0xa7, 0x95, 0x51, 0xd3, 0xf3, 0x0d, 0x5a, 0x08, 0x33, 0xbb, 0x9e, 0x6f, 0xd0, 0x92, 0x47, + 0x0f, 0x1d, 0x34, 0xf7, 0x2a, 0x49, 0x72, 0x89, 0xa3, 0x09, 0x05, 0xa5, 0x16, 0x17, 0xe4, 0xe7, + 0x15, 0xa7, 0x1a, 0x15, 0x72, 0x31, 0xfb, 0x16, 0xa7, 0x0b, 0x65, 0x71, 0xf1, 0xa0, 0xf8, 0x50, + 0x03, 0xa7, 0xcb, 0xd0, 0x0c, 0x92, 0x32, 0x20, 0x56, 0x25, 0xcc, 0x4a, 0xa7, 0x80, 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, 0x4b, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, + 0x4b, 0xce, 0xcf, 0xd5, 0x87, 0x9a, 0xaa, 0x9b, 0x5f, 0x94, 0x0e, 0x63, 0xeb, 0x57, 0x60, 0x26, + 0xa1, 0xca, 0x82, 0xd4, 0xe2, 0x24, 0x36, 0x70, 0x54, 0x19, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, + 0xb8, 0x57, 0x30, 0x76, 0x6a, 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.contractmanager.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.contractmanager.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.contractmanager.Msg", + HandlerType: (*MsgServer)(nil), + Methods: []grpc.MethodDesc{ + { + MethodName: "UpdateParams", + Handler: _Msg_UpdateParams_Handler, + }, + }, + Streams: []grpc.StreamDesc{}, + Metadata: "neutron/contractmanager/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/cron/types/tx.pb.go b/x/cron/types/tx.pb.go index 9a342b79f..df3c178d2 100644 --- a/x/cron/types/tx.pb.go +++ b/x/cron/types/tx.pb.go @@ -6,10 +6,18 @@ package types import ( context "context" fmt "fmt" + _ "github.com/cosmos/cosmos-proto" + _ "github.com/cosmos/cosmos-sdk/types/msgservice" + _ "github.com/cosmos/cosmos-sdk/types/tx/amino" + _ "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. @@ -23,18 +31,135 @@ var _ = math.Inf // 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/cron 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_c9e0a673aba8d6fd, []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_c9e0a673aba8d6fd, []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.cron.MsgUpdateParams") + proto.RegisterType((*MsgUpdateParamsResponse)(nil), "neutron.cron.MsgUpdateParamsResponse") +} + func init() { proto.RegisterFile("neutron/cron/tx.proto", fileDescriptor_c9e0a673aba8d6fd) } var fileDescriptor_c9e0a673aba8d6fd = []byte{ - // 120 bytes of a gzipped FileDescriptorProto + // 329 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0xcd, 0x4b, 0x2d, 0x2d, 0x29, 0xca, 0xcf, 0xd3, 0x4f, 0x06, 0x11, 0x25, 0x15, 0x7a, 0x05, 0x45, 0xf9, 0x25, 0xf9, 0x42, - 0x3c, 0x50, 0x61, 0x3d, 0x90, 0xb0, 0x11, 0x2b, 0x17, 0xb3, 0x6f, 0x71, 0xba, 0x93, 0xeb, 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, 0x69, 0xa7, 0x67, 0x96, 0x64, 0x94, 0x26, - 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0x43, 0x75, 0xea, 0xe6, 0x17, 0xa5, 0xc3, 0xd8, 0xfa, 0x15, 0x50, - 0xe3, 0x2b, 0x0b, 0x52, 0x8b, 0x93, 0xd8, 0xc0, 0x56, 0x18, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, - 0xf4, 0x79, 0x03, 0xf3, 0x7b, 0x00, 0x00, 0x00, + 0x3c, 0x50, 0x61, 0x3d, 0x90, 0xb0, 0x94, 0x24, 0x8a, 0xa2, 0x82, 0xc4, 0xa2, 0xc4, 0xdc, 0x62, + 0x88, 0x42, 0x29, 0x91, 0xf4, 0xfc, 0xf4, 0x7c, 0x30, 0x53, 0x1f, 0xc4, 0x82, 0x8a, 0x8a, 0x27, + 0xe7, 0x17, 0xe7, 0xe6, 0x17, 0xeb, 0xe7, 0x16, 0xa7, 0xeb, 0x97, 0x19, 0x82, 0x28, 0xa8, 0x84, + 0x24, 0x44, 0x22, 0x1e, 0xa2, 0x03, 0xc2, 0x81, 0x4a, 0x09, 0x26, 0xe6, 0x66, 0xe6, 0xe5, 0xeb, + 0x83, 0x49, 0x88, 0x90, 0xd2, 0x6a, 0x46, 0x2e, 0x7e, 0xdf, 0xe2, 0xf4, 0xd0, 0x82, 0x94, 0xc4, + 0x92, 0xd4, 0x00, 0xb0, 0xb5, 0x42, 0x66, 0x5c, 0x9c, 0x89, 0xa5, 0x25, 0x19, 0xf9, 0x45, 0x99, + 0x25, 0x95, 0x12, 0x8c, 0x0a, 0x8c, 0x1a, 0x9c, 0x4e, 0x12, 0x97, 0xb6, 0xe8, 0x8a, 0x40, 0xcd, + 0x72, 0x4c, 0x49, 0x29, 0x4a, 0x2d, 0x2e, 0x0e, 0x2e, 0x29, 0xca, 0xcc, 0x4b, 0x0f, 0x42, 0x28, + 0x15, 0x32, 0xe7, 0x62, 0x83, 0x38, 0x5c, 0x82, 0x49, 0x81, 0x51, 0x83, 0xdb, 0x48, 0x44, 0x0f, + 0xd9, 0x8b, 0x7a, 0x10, 0xd3, 0x9d, 0x38, 0x4f, 0xdc, 0x93, 0x67, 0x58, 0xf1, 0x7c, 0x83, 0x16, + 0x63, 0x10, 0x54, 0xb9, 0x95, 0x7a, 0xd3, 0xf3, 0x0d, 0x5a, 0x08, 0x83, 0xba, 0x9e, 0x6f, 0xd0, + 0x12, 0x01, 0x87, 0x03, 0x9a, 0xcb, 0x94, 0x24, 0xb9, 0xc4, 0xd1, 0x84, 0x82, 0x52, 0x8b, 0x0b, + 0xf2, 0xf3, 0x8a, 0x53, 0x8d, 0xa2, 0xb9, 0x98, 0x7d, 0x8b, 0xd3, 0x85, 0x42, 0xb8, 0x78, 0x50, + 0xfc, 0x22, 0x8b, 0xea, 0x06, 0x34, 0xdd, 0x52, 0xaa, 0x78, 0xa5, 0x61, 0x86, 0x3b, 0xb9, 0x9e, + 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, 0x76, 0x7a, 0x66, 0x49, 0x46, 0x69, + 0x92, 0x5e, 0x72, 0x7e, 0xae, 0x3e, 0xd4, 0x28, 0xdd, 0xfc, 0xa2, 0x74, 0x18, 0x5b, 0xbf, 0x02, + 0x1a, 0xeb, 0x95, 0x05, 0xa9, 0xc5, 0x49, 0x6c, 0xe0, 0x30, 0x37, 0x06, 0x04, 0x00, 0x00, 0xff, + 0xff, 0xa3, 0x00, 0xe5, 0xfc, 0x12, 0x02, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -49,6 +174,7 @@ const _ = grpc.SupportPackageIsVersion4 // // 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 { @@ -59,22 +185,413 @@ 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.cron.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.cron.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.cron.Msg", HandlerType: (*MsgServer)(nil), - Methods: []grpc.MethodDesc{}, - Streams: []grpc.StreamDesc{}, - Metadata: "neutron/cron/tx.proto", + Methods: []grpc.MethodDesc{ + { + MethodName: "UpdateParams", + Handler: _Msg_UpdateParams_Handler, + }, + }, + Streams: []grpc.StreamDesc{}, + Metadata: "neutron/cron/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/feeburner/types/tx.pb.go b/x/feeburner/types/tx.pb.go new file mode 100644 index 000000000..27aa64eee --- /dev/null +++ b/x/feeburner/types/tx.pb.go @@ -0,0 +1,598 @@ +// Code generated by protoc-gen-gogo. DO NOT EDIT. +// source: neutron/feeburner/tx.proto + +package types + +import ( + context "context" + fmt "fmt" + _ "github.com/cosmos/cosmos-proto" + _ "github.com/cosmos/cosmos-sdk/types/msgservice" + _ "github.com/cosmos/cosmos-sdk/types/tx/amino" + _ "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/feeburner 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_49e6591b4db80f7f, []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_49e6591b4db80f7f, []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.feeburner.MsgUpdateParams") + proto.RegisterType((*MsgUpdateParamsResponse)(nil), "neutron.feeburner.MsgUpdateParamsResponse") +} + +func init() { proto.RegisterFile("neutron/feeburner/tx.proto", fileDescriptor_49e6591b4db80f7f) } + +var fileDescriptor_49e6591b4db80f7f = []byte{ + // 337 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xca, 0x4b, 0x2d, 0x2d, + 0x29, 0xca, 0xcf, 0xd3, 0x4f, 0x4b, 0x4d, 0x4d, 0x2a, 0x2d, 0xca, 0x4b, 0x2d, 0xd2, 0x2f, 0xa9, + 0xd0, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x84, 0xca, 0xe9, 0xc1, 0xe5, 0xa4, 0xe4, 0x30, + 0x95, 0x17, 0x24, 0x16, 0x25, 0xe6, 0x16, 0x43, 0xb4, 0x48, 0x89, 0xa4, 0xe7, 0xa7, 0xe7, 0x83, + 0x99, 0xfa, 0x20, 0x16, 0x54, 0x54, 0x3c, 0x39, 0xbf, 0x38, 0x37, 0xbf, 0x58, 0x3f, 0xb7, 0x38, + 0x5d, 0xbf, 0xcc, 0x10, 0x44, 0x41, 0x25, 0x24, 0x21, 0x12, 0xf1, 0x10, 0x1d, 0x10, 0x0e, 0x54, + 0x4a, 0x30, 0x31, 0x37, 0x33, 0x2f, 0x5f, 0x1f, 0x4c, 0x42, 0x84, 0x94, 0xb6, 0x32, 0x72, 0xf1, + 0xfb, 0x16, 0xa7, 0x87, 0x16, 0xa4, 0x24, 0x96, 0xa4, 0x06, 0x80, 0xad, 0x15, 0x32, 0xe3, 0xe2, + 0x4c, 0x2c, 0x2d, 0xc9, 0xc8, 0x2f, 0xca, 0x2c, 0xa9, 0x94, 0x60, 0x54, 0x60, 0xd4, 0xe0, 0x74, + 0x92, 0xb8, 0xb4, 0x45, 0x57, 0x04, 0x6a, 0x96, 0x63, 0x4a, 0x4a, 0x51, 0x6a, 0x71, 0x71, 0x70, + 0x49, 0x51, 0x66, 0x5e, 0x7a, 0x10, 0x42, 0xa9, 0x90, 0x0d, 0x17, 0x1b, 0xc4, 0xe1, 0x12, 0x4c, + 0x0a, 0x8c, 0x1a, 0xdc, 0x46, 0x92, 0x7a, 0x18, 0x9e, 0xd5, 0x83, 0x58, 0xe1, 0xc4, 0x79, 0xe2, + 0x9e, 0x3c, 0xc3, 0x8a, 0xe7, 0x1b, 0xb4, 0x18, 0x83, 0xa0, 0x7a, 0xac, 0x74, 0x9a, 0x9e, 0x6f, + 0xd0, 0x42, 0x98, 0xd6, 0xf5, 0x7c, 0x83, 0x96, 0x24, 0x22, 0x44, 0xd0, 0xdc, 0xa8, 0x24, 0xc9, + 0x25, 0x8e, 0x26, 0x14, 0x94, 0x5a, 0x5c, 0x90, 0x9f, 0x57, 0x9c, 0x6a, 0x94, 0xca, 0xc5, 0xec, + 0x5b, 0x9c, 0x2e, 0x14, 0xc7, 0xc5, 0x83, 0xe2, 0x2b, 0x25, 0x2c, 0xae, 0x41, 0x33, 0x42, 0x4a, + 0x8b, 0xb0, 0x1a, 0x98, 0x35, 0x4e, 0x5e, 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, 0x90, 0x9e, 0x59, 0x92, 0x51, 0x9a, 0xa4, 0x97, 0x9c, 0x9f, 0xab, 0x0f, 0x35, 0x4f, + 0x37, 0xbf, 0x28, 0x1d, 0xc6, 0xd6, 0xaf, 0x40, 0x4e, 0x18, 0x95, 0x05, 0xa9, 0xc5, 0x49, 0x6c, + 0xe0, 0xc8, 0x30, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0xdf, 0x4a, 0xc2, 0x1e, 0x3a, 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.feeburner.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.feeburner.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.feeburner.Msg", + HandlerType: (*MsgServer)(nil), + Methods: []grpc.MethodDesc{ + { + MethodName: "UpdateParams", + Handler: _Msg_UpdateParams_Handler, + }, + }, + Streams: []grpc.StreamDesc{}, + Metadata: "neutron/feeburner/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/feerefunder/types/tx.pb.go b/x/feerefunder/types/tx.pb.go new file mode 100644 index 000000000..6e2df44ae --- /dev/null +++ b/x/feerefunder/types/tx.pb.go @@ -0,0 +1,598 @@ +// Code generated by protoc-gen-gogo. DO NOT EDIT. +// source: neutron/feerefunder/tx.proto + +package types + +import ( + context "context" + fmt "fmt" + _ "github.com/cosmos/cosmos-proto" + _ "github.com/cosmos/cosmos-sdk/types/msgservice" + _ "github.com/cosmos/cosmos-sdk/types/tx/amino" + _ "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/feerefunder 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_2e613aff856d34ed, []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_2e613aff856d34ed, []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.feerefunder.MsgUpdateParams") + proto.RegisterType((*MsgUpdateParamsResponse)(nil), "neutron.feerefunder.MsgUpdateParamsResponse") +} + +func init() { proto.RegisterFile("neutron/feerefunder/tx.proto", fileDescriptor_2e613aff856d34ed) } + +var fileDescriptor_2e613aff856d34ed = []byte{ + // 340 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xc9, 0x4b, 0x2d, 0x2d, + 0x29, 0xca, 0xcf, 0xd3, 0x4f, 0x4b, 0x4d, 0x2d, 0x4a, 0x4d, 0x2b, 0xcd, 0x4b, 0x49, 0x2d, 0xd2, + 0x2f, 0xa9, 0xd0, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x86, 0xca, 0xea, 0x21, 0xc9, 0x4a, + 0x29, 0x60, 0xd3, 0x52, 0x90, 0x58, 0x94, 0x98, 0x5b, 0x0c, 0xd1, 0x26, 0x25, 0x92, 0x9e, 0x9f, + 0x9e, 0x0f, 0x66, 0xea, 0x83, 0x58, 0x50, 0x51, 0xf1, 0xe4, 0xfc, 0xe2, 0xdc, 0xfc, 0x62, 0xfd, + 0xdc, 0xe2, 0x74, 0xfd, 0x32, 0x43, 0x10, 0x05, 0x95, 0x90, 0x84, 0x48, 0xc4, 0x43, 0x74, 0x40, + 0x38, 0x50, 0x29, 0xc1, 0xc4, 0xdc, 0xcc, 0xbc, 0x7c, 0x7d, 0x30, 0x09, 0x11, 0x52, 0xda, 0xc9, + 0xc8, 0xc5, 0xef, 0x5b, 0x9c, 0x1e, 0x5a, 0x90, 0x92, 0x58, 0x92, 0x1a, 0x00, 0xb6, 0x56, 0xc8, + 0x8c, 0x8b, 0x33, 0xb1, 0xb4, 0x24, 0x23, 0xbf, 0x28, 0xb3, 0xa4, 0x52, 0x82, 0x51, 0x81, 0x51, + 0x83, 0xd3, 0x49, 0xe2, 0xd2, 0x16, 0x5d, 0x11, 0xa8, 0x59, 0x8e, 0x29, 0x29, 0x45, 0xa9, 0xc5, + 0xc5, 0xc1, 0x25, 0x45, 0x99, 0x79, 0xe9, 0x41, 0x08, 0xa5, 0x42, 0x76, 0x5c, 0x6c, 0x10, 0x87, + 0x4b, 0x30, 0x29, 0x30, 0x6a, 0x70, 0x1b, 0x49, 0xeb, 0x61, 0xf1, 0xb0, 0x1e, 0xc4, 0x12, 0x27, + 0xce, 0x13, 0xf7, 0xe4, 0x19, 0x56, 0x3c, 0xdf, 0xa0, 0xc5, 0x18, 0x04, 0xd5, 0x65, 0xa5, 0xd7, + 0xf4, 0x7c, 0x83, 0x16, 0xc2, 0xbc, 0xae, 0xe7, 0x1b, 0xb4, 0xa4, 0x91, 0x43, 0x05, 0xcd, 0x9d, + 0x4a, 0x92, 0x5c, 0xe2, 0x68, 0x42, 0x41, 0xa9, 0xc5, 0x05, 0xf9, 0x79, 0xc5, 0xa9, 0x46, 0x99, + 0x5c, 0xcc, 0xbe, 0xc5, 0xe9, 0x42, 0x49, 0x5c, 0x3c, 0x28, 0x3e, 0x53, 0xc1, 0xea, 0x22, 0x34, + 0x43, 0xa4, 0x74, 0x88, 0x51, 0x05, 0xb3, 0xca, 0xc9, 0xe7, 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, 0x8c, 0xd2, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xf5, + 0xa1, 0x26, 0xea, 0xe6, 0x17, 0xa5, 0xc3, 0xd8, 0xfa, 0x15, 0xa8, 0xc9, 0xa4, 0xb2, 0x20, 0xb5, + 0x38, 0x89, 0x0d, 0x1c, 0x2d, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0xfd, 0xa2, 0x2c, 0x8a, + 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 + +// 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.feerefunder.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.feerefunder.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.feerefunder.Msg", + HandlerType: (*MsgServer)(nil), + Methods: []grpc.MethodDesc{ + { + MethodName: "UpdateParams", + Handler: _Msg_UpdateParams_Handler, + }, + }, + Streams: []grpc.StreamDesc{}, + Metadata: "neutron/feerefunder/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/keeper/keeper.go b/x/interchainqueries/keeper/keeper.go index 731fcdea1..872eec560 100644 --- a/x/interchainqueries/keeper/keeper.go +++ b/x/interchainqueries/keeper/keeper.go @@ -32,6 +32,9 @@ type ( contractManagerKeeper types.ContractManagerKeeper headerVerifier types.HeaderVerifier transactionVerifier types.TransactionVerifier + // the address capable of executing a MsgUpdateParams message. Typically, this + // should be the x/adminmodule module account. + authority string } ) @@ -44,6 +47,7 @@ func NewKeeper( contractManagerKeeper types.ContractManagerKeeper, headerVerifier types.HeaderVerifier, transactionVerifier types.TransactionVerifier, + authority string, ) *Keeper { return &Keeper{ cdc: cdc, @@ -54,6 +58,7 @@ func NewKeeper( contractManagerKeeper: contractManagerKeeper, headerVerifier: headerVerifier, transactionVerifier: transactionVerifier, + authority: authority, } } @@ -410,6 +415,10 @@ func (k Keeper) calculateTxQueryRemoval(ctx sdk.Context, queryID, limit uint64) return result } +func (k Keeper) GetAuthority() string { + return k.authority +} + // TxQueryToRemove contains data related to a single query listed for removal and needed in the // removal process. type TxQueryToRemove struct { diff --git a/x/interchainqueries/keeper/msg_server.go b/x/interchainqueries/keeper/msg_server.go index 4ce0942a2..414dd83f3 100644 --- a/x/interchainqueries/keeper/msg_server.go +++ b/x/interchainqueries/keeper/msg_server.go @@ -9,7 +9,6 @@ import ( "time" "cosmossdk.io/errors" - tendermint "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" "github.com/cosmos/cosmos-sdk/telemetry" @@ -311,6 +310,24 @@ func (k msgServer) validateUpdateInterchainQueryParams( return nil } +// UpdateParams updates the module parameters +func (m msgServer) UpdateParams(goCtx context.Context, req *types.MsgUpdateParams) (*types.MsgUpdateParamsResponse, error) { + //if err := req.ValidateBasic(); err != nil { + // return nil, err + //} + authority := m.Keeper.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 := m.Keeper.SetParams(ctx, req.Params); err != nil { + return nil, err + } + + return &types.MsgUpdateParamsResponse{}, nil +} + func getEventsQueryUpdated(query *types.RegisteredQuery) sdk.Events { return sdk.Events{ sdk.NewEvent( diff --git a/x/interchainqueries/types/tx.pb.go b/x/interchainqueries/types/tx.pb.go index e3cd4d3bd..4bd4d8f0a 100644 --- a/x/interchainqueries/types/tx.pb.go +++ b/x/interchainqueries/types/tx.pb.go @@ -8,7 +8,11 @@ import ( fmt "fmt" types1 "github.com/cometbft/cometbft/abci/types" crypto "github.com/cometbft/cometbft/proto/tendermint/crypto" + _ "github.com/cosmos/cosmos-proto" types "github.com/cosmos/cosmos-sdk/codec/types" + _ "github.com/cosmos/cosmos-sdk/types/msgservice" + _ "github.com/cosmos/cosmos-sdk/types/tx/amino" + _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" grpc "google.golang.org/grpc" @@ -757,6 +761,105 @@ func (m *MsgUpdateInterchainQueryResponse) XXX_DiscardUnknown() { var xxx_messageInfo_MsgUpdateInterchainQueryResponse proto.InternalMessageInfo +// 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_d4793837a316491e, []int{12} +} +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_d4793837a316491e, []int{13} +} +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((*MsgRegisterInterchainQuery)(nil), "neutron.interchainqueries.MsgRegisterInterchainQuery") proto.RegisterType((*MsgRegisterInterchainQueryResponse)(nil), "neutron.interchainqueries.MsgRegisterInterchainQueryResponse") @@ -770,6 +873,8 @@ func init() { proto.RegisterType((*MsgRemoveInterchainQueryResponse)(nil), "neutron.interchainqueries.MsgRemoveInterchainQueryResponse") proto.RegisterType((*MsgUpdateInterchainQueryRequest)(nil), "neutron.interchainqueries.MsgUpdateInterchainQueryRequest") proto.RegisterType((*MsgUpdateInterchainQueryResponse)(nil), "neutron.interchainqueries.MsgUpdateInterchainQueryResponse") + proto.RegisterType((*MsgUpdateParams)(nil), "neutron.interchainqueries.MsgUpdateParams") + proto.RegisterType((*MsgUpdateParamsResponse)(nil), "neutron.interchainqueries.MsgUpdateParamsResponse") } func init() { @@ -777,68 +882,79 @@ func init() { } var fileDescriptor_d4793837a316491e = []byte{ - // 975 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0x4f, 0x73, 0xdb, 0x44, - 0x14, 0x8f, 0x1c, 0x3b, 0x7f, 0x5e, 0x9c, 0xa4, 0x5d, 0x52, 0xea, 0x38, 0xd4, 0x64, 0xc4, 0x40, - 0x33, 0x4c, 0x91, 0x86, 0x50, 0x0a, 0x43, 0x87, 0x42, 0x0b, 0xd3, 0x21, 0x93, 0xc9, 0x10, 0xb6, - 0x69, 0x0f, 0x5c, 0x34, 0xb2, 0xf4, 0xa2, 0xec, 0x58, 0x59, 0xa9, 0xda, 0x95, 0x6d, 0x1d, 0xb8, - 0x71, 0x27, 0x9f, 0x82, 0x0b, 0x5f, 0x81, 0x0f, 0xc0, 0xb1, 0x47, 0x8e, 0x90, 0x7c, 0x00, 0x4e, - 0xdc, 0x19, 0xed, 0xca, 0x8e, 0x18, 0x5b, 0xce, 0x24, 0x37, 0xbf, 0xf7, 0x7e, 0xef, 0xed, 0xfb, - 0xfb, 0x93, 0xc1, 0xe4, 0x98, 0xca, 0x24, 0xe2, 0x36, 0xe3, 0x12, 0x13, 0xef, 0xc4, 0x65, 0xfc, - 0x75, 0x8a, 0x09, 0x43, 0x61, 0xcb, 0xa1, 0x15, 0x27, 0x91, 0x8c, 0xc8, 0x66, 0x81, 0xb1, 0x26, - 0x30, 0xed, 0x7b, 0x12, 0xb9, 0x8f, 0xc9, 0x29, 0xe3, 0xd2, 0xf6, 0x92, 0x2c, 0x96, 0x91, 0x1d, - 0x27, 0x51, 0x74, 0xac, 0x3d, 0xdb, 0x5b, 0x25, 0xb3, 0xdb, 0xf5, 0x98, 0x2d, 0xb3, 0x18, 0x45, - 0x61, 0xdc, 0x0c, 0xa2, 0x28, 0x08, 0xd1, 0x56, 0x52, 0x37, 0x3d, 0xb6, 0x5d, 0x9e, 0x15, 0xa6, - 0xfb, 0xd5, 0x59, 0x05, 0xc8, 0x51, 0xb0, 0x22, 0x86, 0xf9, 0x73, 0x0d, 0xda, 0x07, 0x22, 0xa0, - 0x18, 0x30, 0x21, 0x31, 0xd9, 0x1b, 0xc3, 0x7f, 0x48, 0x31, 0xc9, 0xc8, 0x3d, 0x80, 0xdc, 0x2f, - 0x73, 0xf2, 0x77, 0x5b, 0xc6, 0xb6, 0xb1, 0xb3, 0x4c, 0x97, 0x95, 0xe6, 0x28, 0x8b, 0x91, 0x3c, - 0x84, 0x7a, 0x0f, 0x33, 0xd1, 0xaa, 0x6d, 0xcf, 0xef, 0xac, 0xec, 0x6e, 0x5b, 0x95, 0x75, 0x5a, - 0xfb, 0xaf, 0xf6, 0x31, 0xa3, 0x0a, 0x4d, 0x6c, 0x78, 0x4b, 0x26, 0x2e, 0x17, 0xae, 0x27, 0x59, - 0xc4, 0x85, 0x73, 0xcc, 0x42, 0x89, 0x49, 0x6b, 0x5e, 0x45, 0x27, 0x65, 0xd3, 0x73, 0x65, 0x21, - 0xef, 0xc1, 0xaa, 0x17, 0x71, 0x8e, 0x4a, 0xe9, 0x30, 0xbf, 0x55, 0x57, 0xd0, 0xe6, 0xa5, 0x72, - 0xcf, 0xcf, 0x41, 0x69, 0xec, 0xbb, 0x12, 0x9d, 0x18, 0x13, 0x16, 0xf9, 0xad, 0xc6, 0xb6, 0xb1, - 0x53, 0xa7, 0x4d, 0xad, 0x3c, 0x54, 0x3a, 0xf2, 0x36, 0x2c, 0x08, 0xd5, 0xd1, 0xd6, 0x82, 0x0a, - 0x51, 0x48, 0xe6, 0x43, 0x30, 0xab, 0xbb, 0x40, 0x51, 0xc4, 0x11, 0x17, 0x48, 0xd6, 0xa0, 0xc6, - 0x7c, 0xd5, 0x85, 0x3a, 0xad, 0x31, 0xdf, 0xfc, 0xd5, 0x80, 0x8d, 0x03, 0x11, 0xbc, 0x48, 0xbb, - 0xa7, 0x4c, 0x8e, 0xa0, 0x69, 0x28, 0xc9, 0x26, 0x2c, 0xe9, 0xb6, 0x8d, 0xe1, 0x8b, 0x4a, 0xde, - 0x2b, 0x67, 0x50, 0x2b, 0x67, 0x40, 0xb6, 0x60, 0xd9, 0x0b, 0x19, 0x72, 0x99, 0xfb, 0xe8, 0x56, - 0x2c, 0x69, 0xc5, 0x9e, 0x4f, 0x9e, 0xc0, 0x42, 0xa2, 0x22, 0xab, 0xca, 0x57, 0x76, 0x3f, 0x98, - 0xd1, 0xe9, 0x52, 0x1e, 0xb4, 0xf0, 0x32, 0xff, 0x31, 0x60, 0xa5, 0x9c, 0xdf, 0x73, 0x80, 0x5e, - 0xdf, 0xd1, 0x46, 0xd1, 0x32, 0xd4, 0xf4, 0xee, 0xcf, 0x88, 0xf9, 0x42, 0x46, 0x89, 0x1b, 0xe0, - 0x2b, 0x37, 0x4c, 0x91, 0x2e, 0xf7, 0xfa, 0x3a, 0x8c, 0x20, 0x8f, 0xa0, 0xd1, 0x0d, 0x23, 0xaf, - 0xa7, 0x6a, 0x99, 0xbd, 0x00, 0xcf, 0x72, 0x1c, 0xd5, 0xf0, 0xbc, 0x09, 0x27, 0xc8, 0x82, 0x13, - 0xa9, 0x2a, 0xad, 0xd3, 0x42, 0x22, 0x6d, 0x58, 0x4a, 0xb0, 0xcf, 0x04, 0x8b, 0xb8, 0xaa, 0xb4, - 0x4e, 0xc7, 0x32, 0x79, 0x00, 0xc4, 0x0d, 0xc3, 0x68, 0xe0, 0xf4, 0xfa, 0x8e, 0xe7, 0x86, 0x61, - 0xd7, 0xf5, 0x7a, 0x42, 0x0d, 0x79, 0x89, 0xde, 0x52, 0x96, 0xfd, 0xfe, 0x37, 0x23, 0xbd, 0x79, - 0x66, 0x40, 0xb3, 0x9c, 0x35, 0x79, 0x1f, 0xd6, 0x84, 0x96, 0x9d, 0x38, 0xc1, 0x63, 0x36, 0x2c, - 0xb6, 0x79, 0xb5, 0xd0, 0x1e, 0x2a, 0x25, 0xb9, 0x05, 0xf3, 0x3d, 0xcc, 0x54, 0x3d, 0x4d, 0x9a, - 0xff, 0x24, 0x1b, 0xd0, 0xe8, 0xe7, 0x11, 0x54, 0xaa, 0x4d, 0xaa, 0x05, 0xf2, 0x31, 0x34, 0x0e, - 0xf3, 0x3b, 0x2d, 0x06, 0xb2, 0x65, 0x5d, 0x1e, 0xaa, 0xa5, 0xef, 0xd8, 0x52, 0xf6, 0xef, 0x63, - 0x41, 0x35, 0xd2, 0xfc, 0xcd, 0x80, 0x86, 0xea, 0x02, 0xf9, 0x1a, 0x6e, 0x73, 0x1c, 0x4a, 0x47, - 0x35, 0xc3, 0x39, 0x41, 0x37, 0x5f, 0x07, 0x43, 0x05, 0xda, 0xb0, 0xf4, 0x51, 0x5b, 0xa3, 0xa3, - 0xb6, 0x9e, 0xf2, 0x8c, 0xae, 0xe7, 0x70, 0xe5, 0xfb, 0x9d, 0x02, 0x93, 0x07, 0x79, 0x03, 0xdd, - 0xd1, 0x16, 0x55, 0xb9, 0x15, 0x18, 0xb2, 0x0b, 0x35, 0x39, 0x54, 0xf9, 0xaf, 0xec, 0x9a, 0x33, - 0x66, 0x74, 0x34, 0xd4, 0x13, 0xae, 0xc9, 0xa1, 0xf9, 0xb7, 0x01, 0x8b, 0x85, 0x4c, 0x9e, 0xe4, - 0x63, 0xd1, 0x37, 0x50, 0xa4, 0x69, 0x96, 0xeb, 0xcd, 0x89, 0xc9, 0x1a, 0x1d, 0xc9, 0xb7, 0x18, - 0xb2, 0x3e, 0x26, 0x47, 0x43, 0x3a, 0xf6, 0x21, 0x5f, 0xc1, 0x9a, 0xaf, 0xd5, 0x99, 0xa3, 0xd8, - 0xad, 0xc8, 0xba, 0x55, 0xd5, 0x35, 0xba, 0x3a, 0xc2, 0x2b, 0x91, 0x3c, 0x85, 0x75, 0xc6, 0xbd, - 0x30, 0xcd, 0x17, 0xa1, 0x88, 0x30, 0x7f, 0x45, 0x84, 0xb5, 0xb1, 0x83, 0x0e, 0x41, 0xa0, 0xee, - 0xbb, 0xd2, 0x55, 0xf3, 0x6a, 0x52, 0xf5, 0xdb, 0xec, 0xc0, 0x3b, 0xd3, 0xce, 0x77, 0x54, 0x8a, - 0x79, 0x04, 0xef, 0x2a, 0x56, 0x38, 0x8d, 0xfa, 0x38, 0xc1, 0x09, 0xaf, 0x53, 0x14, 0x37, 0xb9, - 0x74, 0xd3, 0x84, 0xed, 0xea, 0xa8, 0xc5, 0xcb, 0xff, 0x1a, 0xea, 0xe9, 0x97, 0x8a, 0xbb, 0xae, - 0xff, 0xf4, 0x63, 0x58, 0xe2, 0x38, 0x70, 0xae, 0xc5, 0xcd, 0x8b, 0x1c, 0x07, 0xfb, 0x39, 0x3d, - 0x7f, 0x98, 0x6f, 0xe7, 0xc0, 0xf9, 0x3f, 0x99, 0xea, 0x3b, 0x5d, 0xe7, 0x38, 0x78, 0x59, 0xe6, - 0xd3, 0x47, 0x70, 0x37, 0xc7, 0x4e, 0xa3, 0x73, 0xcd, 0xd1, 0x77, 0x38, 0x0e, 0x8e, 0x26, 0x19, - 0xfd, 0xb2, 0x37, 0x8d, 0x29, 0xbd, 0xa9, 0x28, 0x5b, 0xf7, 0x66, 0xf7, 0xf7, 0x3a, 0xcc, 0x1f, - 0x88, 0x80, 0xfc, 0x62, 0xc0, 0xdd, 0xaa, 0xef, 0xd6, 0xa7, 0x33, 0xca, 0xad, 0x26, 0xfa, 0xf6, - 0x97, 0x37, 0x72, 0x1b, 0x7f, 0x1f, 0x7e, 0x82, 0xdb, 0x93, 0xdf, 0x02, 0x7b, 0x76, 0xcc, 0x09, - 0x87, 0xf6, 0x67, 0xd7, 0x74, 0x18, 0x3f, 0x7f, 0x66, 0xc0, 0x9d, 0xa9, 0x6b, 0x45, 0xbe, 0xb8, - 0xaa, 0xae, 0xea, 0x0d, 0x6f, 0x3f, 0xbe, 0x91, 0x6f, 0x29, 0xa5, 0xa9, 0xd3, 0xbc, 0x2a, 0xa5, - 0x59, 0x9b, 0x7f, 0x55, 0x4a, 0x33, 0xd7, 0xe7, 0x19, 0xfd, 0xe3, 0xbc, 0x63, 0xbc, 0x39, 0xef, - 0x18, 0x7f, 0x9d, 0x77, 0x8c, 0xb3, 0x8b, 0xce, 0xdc, 0x9b, 0x8b, 0xce, 0xdc, 0x9f, 0x17, 0x9d, - 0xb9, 0x1f, 0x3f, 0x0f, 0x98, 0x3c, 0x49, 0xbb, 0x96, 0x17, 0x9d, 0xda, 0xc5, 0x03, 0x1f, 0x45, - 0x49, 0x30, 0xfa, 0x6d, 0x0f, 0xa7, 0xfd, 0xc7, 0xcb, 0xff, 0x8f, 0x75, 0x17, 0x14, 0xed, 0x7e, - 0xf2, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe0, 0xab, 0xbc, 0xc1, 0x0d, 0x0a, 0x00, 0x00, + // 1151 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0x4f, 0x6f, 0x1b, 0x45, + 0x14, 0xcf, 0x3a, 0x76, 0x1a, 0xbf, 0xb8, 0x49, 0x3b, 0xa4, 0xc4, 0x71, 0xa9, 0x9b, 0x2e, 0xa2, + 0xad, 0xa2, 0x76, 0x57, 0x35, 0xa5, 0xa0, 0x56, 0x14, 0x12, 0xaa, 0x8a, 0x28, 0x8a, 0x08, 0x9b, + 0xb4, 0x07, 0x2e, 0xab, 0xf5, 0xee, 0x64, 0x3d, 0xf2, 0x7a, 0xc6, 0xdd, 0x99, 0xb5, 0xbd, 0x07, + 0x2e, 0x88, 0x13, 0x17, 0xf2, 0x29, 0x10, 0x12, 0x1c, 0x72, 0xe0, 0x2b, 0x20, 0xf5, 0x58, 0x71, + 0xe2, 0x84, 0x20, 0x39, 0xe4, 0xc8, 0x89, 0x3b, 0xda, 0x99, 0x5d, 0xc7, 0xad, 0xff, 0xa4, 0xc9, + 0x25, 0xd9, 0xf7, 0xde, 0xef, 0xbd, 0x79, 0xef, 0xcd, 0xbc, 0xdf, 0x33, 0xe8, 0x14, 0x47, 0x22, + 0x64, 0xd4, 0x24, 0x54, 0xe0, 0xd0, 0x6d, 0x38, 0x84, 0xbe, 0x88, 0x70, 0x48, 0x30, 0x37, 0x45, + 0xcf, 0x68, 0x87, 0x4c, 0x30, 0xb4, 0x9c, 0x62, 0x8c, 0x21, 0x4c, 0xe5, 0xe6, 0x78, 0xf7, 0xb6, + 0x13, 0x3a, 0x2d, 0xae, 0x42, 0x54, 0xae, 0x09, 0x4c, 0x3d, 0x1c, 0xb6, 0x08, 0x15, 0xa6, 0x1b, + 0xc6, 0x6d, 0xc1, 0xcc, 0x76, 0xc8, 0xd8, 0x5e, 0x6a, 0xbe, 0x3a, 0x60, 0x76, 0xea, 0x2e, 0x31, + 0x45, 0xdc, 0xc6, 0x99, 0xef, 0xb2, 0xcf, 0x98, 0x1f, 0x60, 0x53, 0x4a, 0xf5, 0x68, 0xcf, 0x74, + 0x68, 0x9c, 0x9a, 0x6e, 0x8d, 0x3f, 0xde, 0xc7, 0x14, 0x73, 0x92, 0xc5, 0x58, 0xf4, 0x99, 0xcf, + 0xe4, 0xa7, 0x99, 0x7c, 0xa5, 0xda, 0x25, 0x97, 0xf1, 0x16, 0xe3, 0x66, 0x8b, 0xfb, 0x66, 0xe7, + 0x5e, 0xf2, 0x2f, 0x3b, 0x52, 0x19, 0x6c, 0xe5, 0xa1, 0x84, 0xd4, 0x74, 0xd9, 0x69, 0x11, 0xca, + 0x4c, 0xf9, 0x57, 0xa9, 0xf4, 0xef, 0x73, 0x50, 0xd9, 0xe2, 0xbe, 0x85, 0x7d, 0xc2, 0x05, 0x0e, + 0x37, 0xfa, 0xb9, 0x7c, 0x1d, 0xe1, 0x30, 0x46, 0xd7, 0x00, 0x92, 0xa4, 0x62, 0x3b, 0x29, 0xaa, + 0xac, 0xad, 0x68, 0xb7, 0x8b, 0x56, 0x51, 0x6a, 0x76, 0xe3, 0x36, 0x46, 0xf7, 0x21, 0xdf, 0xc4, + 0x31, 0x2f, 0xe7, 0x56, 0xa6, 0x6f, 0xcf, 0xd5, 0x56, 0x8c, 0xb1, 0xcd, 0x36, 0x36, 0x9f, 0x6f, + 0xe2, 0xd8, 0x92, 0x68, 0x64, 0xc2, 0x3b, 0x22, 0x74, 0x28, 0x77, 0x5c, 0x41, 0x18, 0xe5, 0xf6, + 0x1e, 0x09, 0x04, 0x0e, 0xcb, 0xd3, 0x32, 0x3a, 0x1a, 0x34, 0x3d, 0x95, 0x16, 0xf4, 0x3e, 0x5c, + 0x74, 0x19, 0xa5, 0x58, 0x2a, 0x6d, 0xe2, 0x95, 0xf3, 0x12, 0x5a, 0x3a, 0x51, 0x6e, 0x78, 0x09, + 0x28, 0x6a, 0x7b, 0x8e, 0xc0, 0x76, 0x1b, 0x87, 0x84, 0x79, 0xe5, 0xc2, 0x8a, 0x76, 0x3b, 0x6f, + 0x95, 0x94, 0x72, 0x5b, 0xea, 0xd0, 0xbb, 0x30, 0xc3, 0xe5, 0x75, 0x95, 0x67, 0x64, 0x88, 0x54, + 0xd2, 0xef, 0x83, 0x3e, 0xbe, 0x0b, 0x16, 0xe6, 0x6d, 0x46, 0x39, 0x46, 0xf3, 0x90, 0x23, 0x9e, + 0xec, 0x42, 0xde, 0xca, 0x11, 0x4f, 0xff, 0x49, 0x83, 0xc5, 0x2d, 0xee, 0xef, 0x44, 0xf5, 0x16, + 0x11, 0x19, 0x34, 0x0a, 0x04, 0x5a, 0x86, 0x59, 0xd5, 0xb6, 0x3e, 0xfc, 0x82, 0x94, 0x37, 0x06, + 0x33, 0xc8, 0x0d, 0x66, 0x80, 0xae, 0x42, 0xd1, 0x0d, 0x08, 0xa6, 0x22, 0xf1, 0x51, 0xad, 0x98, + 0x55, 0x8a, 0x0d, 0x0f, 0x3d, 0x86, 0x99, 0x50, 0x46, 0x96, 0x95, 0xcf, 0xd5, 0x6e, 0x4e, 0xe8, + 0xf4, 0x40, 0x1e, 0x56, 0xea, 0xa5, 0xff, 0xab, 0xc1, 0xdc, 0x60, 0x7e, 0x4f, 0x01, 0x9a, 0x1d, + 0x5b, 0x19, 0x79, 0x59, 0x93, 0xb7, 0x77, 0x6b, 0x42, 0xcc, 0x1d, 0xc1, 0x42, 0xc7, 0xc7, 0xcf, + 0x9d, 0x20, 0xc2, 0x56, 0xb1, 0xd9, 0x51, 0x61, 0x38, 0x7a, 0x00, 0x85, 0x7a, 0xc0, 0xdc, 0xa6, + 0xac, 0x65, 0xf2, 0x03, 0x58, 0x4f, 0x70, 0x96, 0x82, 0x27, 0x4d, 0x68, 0x60, 0xe2, 0x37, 0x84, + 0xac, 0x34, 0x6f, 0xa5, 0x12, 0xaa, 0xc0, 0x6c, 0x88, 0x3b, 0x84, 0x13, 0x46, 0x65, 0xa5, 0x79, + 0xab, 0x2f, 0xa3, 0x3b, 0x80, 0x9c, 0x20, 0x60, 0x5d, 0xbb, 0xd9, 0xb1, 0x5d, 0x27, 0x08, 0xea, + 0x8e, 0xdb, 0xe4, 0xf2, 0x92, 0x67, 0xad, 0x4b, 0xd2, 0xb2, 0xd9, 0xf9, 0x22, 0xd3, 0xeb, 0xfb, + 0x1a, 0x94, 0x06, 0xb3, 0x46, 0x1f, 0xc0, 0x3c, 0x57, 0xb2, 0xdd, 0x0e, 0xf1, 0x1e, 0xe9, 0xa5, + 0xaf, 0xf9, 0x62, 0xaa, 0xdd, 0x96, 0x4a, 0x74, 0x09, 0xa6, 0x9b, 0x38, 0x96, 0xf5, 0x94, 0xac, + 0xe4, 0x13, 0x2d, 0x42, 0xa1, 0x93, 0x44, 0x90, 0xa9, 0x96, 0x2c, 0x25, 0xa0, 0x7b, 0x50, 0xd8, + 0x4e, 0x48, 0x20, 0xbd, 0x90, 0xab, 0xc6, 0x09, 0x0b, 0x18, 0x8a, 0x24, 0x0c, 0x69, 0xff, 0xaa, + 0xcd, 0x2d, 0x85, 0xd4, 0x7f, 0xd1, 0xa0, 0x20, 0xbb, 0x80, 0x3e, 0x87, 0xcb, 0x14, 0xf7, 0x84, + 0x2d, 0x9b, 0x61, 0x37, 0xb0, 0x93, 0x3c, 0x07, 0x4d, 0x06, 0x5a, 0x34, 0x14, 0x63, 0x18, 0x19, + 0x63, 0x18, 0x6b, 0x34, 0xb6, 0x16, 0x12, 0xb8, 0xf4, 0xfd, 0x52, 0x82, 0xd1, 0x9d, 0xa4, 0x81, + 0x4e, 0xf6, 0x8a, 0xc6, 0xb9, 0xa5, 0x18, 0x54, 0x83, 0x9c, 0xe8, 0xc9, 0xfc, 0xe7, 0x6a, 0xfa, + 0x84, 0x3b, 0xda, 0xed, 0xa9, 0x1b, 0xce, 0x89, 0x9e, 0xfe, 0x8f, 0x06, 0x17, 0x52, 0x19, 0x3d, + 0x4e, 0xae, 0x45, 0xcd, 0x40, 0x9a, 0xa6, 0x3e, 0x58, 0x6f, 0xc2, 0x7a, 0x46, 0x36, 0x24, 0x4f, + 0x70, 0x40, 0x3a, 0x38, 0xdc, 0xed, 0x59, 0x7d, 0x1f, 0xf4, 0x19, 0xcc, 0x7b, 0x4a, 0x1d, 0xdb, + 0x92, 0x3a, 0xd3, 0xac, 0xcb, 0xe3, 0xba, 0x66, 0x5d, 0xcc, 0xf0, 0x52, 0x44, 0x6b, 0xb0, 0x40, + 0xa8, 0x1b, 0x44, 0xc9, 0x43, 0x48, 0x23, 0x4c, 0x9f, 0x12, 0x61, 0xbe, 0xef, 0xa0, 0x42, 0x20, + 0xc8, 0x7b, 0x8e, 0x70, 0xe4, 0x7d, 0x95, 0x2c, 0xf9, 0xad, 0x57, 0xe1, 0xbd, 0x51, 0xe3, 0x9b, + 0x95, 0xa2, 0xef, 0xc2, 0x75, 0xc9, 0x0a, 0x2d, 0xd6, 0xc1, 0x43, 0x9c, 0xf0, 0x22, 0xc2, 0xfc, + 0x3c, 0x93, 0xae, 0xeb, 0xb0, 0x32, 0x3e, 0x6a, 0x7a, 0xf2, 0x7f, 0x9a, 0x3c, 0xfa, 0x99, 0xe4, + 0xae, 0xb3, 0x1f, 0xfd, 0x08, 0x66, 0x29, 0xee, 0xda, 0x67, 0xe2, 0xe6, 0x0b, 0x14, 0x77, 0x37, + 0x13, 0x7a, 0x5e, 0x4d, 0x5e, 0x67, 0xd7, 0x7e, 0x9d, 0x4c, 0xd5, 0x9c, 0x2e, 0x50, 0xdc, 0x7d, + 0x36, 0xc8, 0xa7, 0x0f, 0x60, 0x29, 0xc1, 0x8e, 0xa2, 0x73, 0xc5, 0xd1, 0x57, 0x28, 0xee, 0xee, + 0x0e, 0x33, 0xfa, 0x49, 0x6f, 0x0a, 0x23, 0x7a, 0x33, 0xa6, 0xec, 0xb4, 0x37, 0xbf, 0x6b, 0xb0, + 0xd0, 0x07, 0x6d, 0xcb, 0x4d, 0x8d, 0x1e, 0x40, 0xd1, 0x89, 0x44, 0x83, 0x85, 0x44, 0xc4, 0x6a, + 0xb0, 0xd7, 0xcb, 0x7f, 0xfc, 0x76, 0x77, 0x31, 0x5d, 0x7f, 0x6b, 0x9e, 0x17, 0x62, 0xce, 0x77, + 0x44, 0x48, 0xa8, 0x6f, 0x9d, 0x40, 0xd1, 0x13, 0x98, 0x51, 0xbb, 0x3e, 0x7d, 0x91, 0x37, 0x26, + 0xb4, 0x49, 0x1d, 0xb5, 0x5e, 0x7c, 0xf9, 0xd7, 0xf5, 0xa9, 0x9f, 0x8f, 0x0f, 0x56, 0x35, 0x2b, + 0xf5, 0x7d, 0x78, 0xff, 0xbb, 0xe3, 0x83, 0xd5, 0x93, 0xa8, 0x3f, 0x1c, 0x1f, 0xac, 0xde, 0x18, + 0xde, 0xea, 0x6f, 0xe4, 0xac, 0x2f, 0xc3, 0xd2, 0x1b, 0xaa, 0xac, 0xc4, 0xda, 0xaf, 0x05, 0x98, + 0xde, 0xe2, 0x3e, 0xfa, 0x51, 0x83, 0xa5, 0x71, 0xab, 0xf9, 0xa3, 0x09, 0xa9, 0x8e, 0xdf, 0x65, + 0x95, 0x4f, 0xcf, 0xe5, 0xd6, 0x5f, 0x81, 0xdf, 0xc2, 0xe5, 0xe1, 0x75, 0x67, 0x4e, 0x8e, 0x39, + 0xe4, 0x50, 0xf9, 0xf8, 0x8c, 0x0e, 0xfd, 0xe3, 0xf7, 0x35, 0xb8, 0x32, 0x72, 0x72, 0xd0, 0xc3, + 0xd3, 0xea, 0x1a, 0x3f, 0xc4, 0x95, 0x47, 0xe7, 0xf2, 0x1d, 0x48, 0x69, 0xe4, 0x83, 0x3d, 0x2d, + 0xa5, 0x49, 0xc3, 0x7d, 0x5a, 0x4a, 0x13, 0x27, 0x04, 0x51, 0x28, 0xbd, 0x36, 0x1d, 0xab, 0x6f, + 0x13, 0x4c, 0x61, 0x2b, 0xb5, 0xb7, 0xc7, 0x66, 0xe7, 0xad, 0x5b, 0x2f, 0x0f, 0xab, 0xda, 0xab, + 0xc3, 0xaa, 0xf6, 0xf7, 0x61, 0x55, 0xdb, 0x3f, 0xaa, 0x4e, 0xbd, 0x3a, 0xaa, 0x4e, 0xfd, 0x79, + 0x54, 0x9d, 0xfa, 0xe6, 0x13, 0x9f, 0x88, 0x46, 0x54, 0x37, 0x5c, 0xd6, 0x32, 0xd3, 0xb8, 0x77, + 0x59, 0xe8, 0x67, 0xdf, 0x66, 0x6f, 0xd4, 0x6f, 0xf7, 0xe4, 0xf7, 0x73, 0x7d, 0x46, 0x6e, 0xb2, + 0x0f, 0xff, 0x0f, 0x00, 0x00, 0xff, 0xff, 0x69, 0x75, 0x22, 0x83, 0xe5, 0x0b, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -857,6 +973,7 @@ type MsgClient interface { SubmitQueryResult(ctx context.Context, in *MsgSubmitQueryResult, opts ...grpc.CallOption) (*MsgSubmitQueryResultResponse, error) RemoveInterchainQuery(ctx context.Context, in *MsgRemoveInterchainQueryRequest, opts ...grpc.CallOption) (*MsgRemoveInterchainQueryResponse, error) UpdateInterchainQuery(ctx context.Context, in *MsgUpdateInterchainQueryRequest, opts ...grpc.CallOption) (*MsgUpdateInterchainQueryResponse, error) + UpdateParams(ctx context.Context, in *MsgUpdateParams, opts ...grpc.CallOption) (*MsgUpdateParamsResponse, error) } type msgClient struct { @@ -903,12 +1020,22 @@ func (c *msgClient) UpdateInterchainQuery(ctx context.Context, in *MsgUpdateInte return out, nil } +func (c *msgClient) UpdateParams(ctx context.Context, in *MsgUpdateParams, opts ...grpc.CallOption) (*MsgUpdateParamsResponse, error) { + out := new(MsgUpdateParamsResponse) + err := c.cc.Invoke(ctx, "/neutron.interchainqueries.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 { RegisterInterchainQuery(context.Context, *MsgRegisterInterchainQuery) (*MsgRegisterInterchainQueryResponse, error) SubmitQueryResult(context.Context, *MsgSubmitQueryResult) (*MsgSubmitQueryResultResponse, error) RemoveInterchainQuery(context.Context, *MsgRemoveInterchainQueryRequest) (*MsgRemoveInterchainQueryResponse, error) UpdateInterchainQuery(context.Context, *MsgUpdateInterchainQueryRequest) (*MsgUpdateInterchainQueryResponse, error) + UpdateParams(context.Context, *MsgUpdateParams) (*MsgUpdateParamsResponse, error) } // UnimplementedMsgServer can be embedded to have forward compatible implementations. @@ -927,6 +1054,9 @@ func (*UnimplementedMsgServer) RemoveInterchainQuery(ctx context.Context, req *M func (*UnimplementedMsgServer) UpdateInterchainQuery(ctx context.Context, req *MsgUpdateInterchainQueryRequest) (*MsgUpdateInterchainQueryResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method UpdateInterchainQuery not implemented") } +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) @@ -1004,6 +1134,24 @@ func _Msg_UpdateInterchainQuery_Handler(srv interface{}, ctx context.Context, de return interceptor(ctx, in, info, handler) } +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.interchainqueries.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.interchainqueries.Msg", HandlerType: (*MsgServer)(nil), @@ -1024,6 +1172,10 @@ var _Msg_serviceDesc = grpc.ServiceDesc{ MethodName: "UpdateInterchainQuery", Handler: _Msg_UpdateInterchainQuery_Handler, }, + { + MethodName: "UpdateParams", + Handler: _Msg_UpdateParams_Handler, + }, }, Streams: []grpc.StreamDesc{}, Metadata: "neutron/interchainqueries/tx.proto", @@ -1596,6 +1748,69 @@ func (m *MsgUpdateInterchainQueryResponse) MarshalToSizedBuffer(dAtA []byte) (in return len(dAtA) - i, nil } +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 @@ -1848,6 +2063,30 @@ func (m *MsgUpdateInterchainQueryResponse) Size() (n int) { return n } +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 } @@ -3474,6 +3713,171 @@ func (m *MsgUpdateInterchainQueryResponse) Unmarshal(dAtA []byte) error { } return nil } +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 diff --git a/x/interchaintxs/keeper/keeper.go b/x/interchaintxs/keeper/keeper.go index a1032c24c..82b6f090a 100644 --- a/x/interchaintxs/keeper/keeper.go +++ b/x/interchaintxs/keeper/keeper.go @@ -27,6 +27,7 @@ type ( feeKeeper types.FeeRefunderKeeper icaControllerKeeper types.ICAControllerKeeper contractManagerKeeper types.ContractManagerKeeper + authority string } ) @@ -38,6 +39,7 @@ func NewKeeper( icaControllerKeeper types.ICAControllerKeeper, contractManagerKeeper types.ContractManagerKeeper, feeKeeper types.FeeRefunderKeeper, + authority string, ) *Keeper { return &Keeper{ Codec: cdc, @@ -47,9 +49,14 @@ func NewKeeper( icaControllerKeeper: icaControllerKeeper, contractManagerKeeper: contractManagerKeeper, feeKeeper: feeKeeper, + authority: authority, } } func (k *Keeper) Logger(ctx sdk.Context) log.Logger { return ctx.Logger().With("module", fmt.Sprintf("x/%s", types.ModuleName)) } + +func (k Keeper) GetAuthority() string { + return k.authority +} diff --git a/x/interchaintxs/keeper/msg_server.go b/x/interchaintxs/keeper/msg_server.go index 62d3cfe5a..acd5b82c5 100644 --- a/x/interchaintxs/keeper/msg_server.go +++ b/x/interchaintxs/keeper/msg_server.go @@ -6,7 +6,6 @@ import ( "time" "cosmossdk.io/errors" - "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" @@ -172,3 +171,21 @@ func SerializeCosmosTx(cdc codec.BinaryCodec, msgs []*codectypes.Any) (bz []byte return bz, nil } + +// UpdateParams updates the module parameters +func (k Keeper) UpdateParams(goCtx context.Context, req *ictxtypes.MsgUpdateParams) (*ictxtypes.MsgUpdateParamsResponse, error) { + //if err := req.ValidateBasic(); err != nil { + // return nil, err + //} + 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 &ictxtypes.MsgUpdateParamsResponse{}, nil +} diff --git a/x/interchaintxs/types/tx.pb.go b/x/interchaintxs/types/tx.pb.go index 41bf28b30..22d769414 100644 --- a/x/interchaintxs/types/tx.pb.go +++ b/x/interchaintxs/types/tx.pb.go @@ -8,6 +8,8 @@ import ( fmt "fmt" _ "github.com/cosmos/cosmos-proto" types "github.com/cosmos/cosmos-sdk/codec/types" + _ "github.com/cosmos/cosmos-sdk/types/msgservice" + _ "github.com/cosmos/cosmos-sdk/types/tx/amino" _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" @@ -214,53 +216,164 @@ func (m *MsgSubmitTxResponse) GetChannel() string { return "" } +// 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_50f087790e59c806, []int{4} +} +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_50f087790e59c806, []int{5} +} +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((*MsgRegisterInterchainAccount)(nil), "neutron.interchaintxs.v1.MsgRegisterInterchainAccount") proto.RegisterType((*MsgRegisterInterchainAccountResponse)(nil), "neutron.interchaintxs.v1.MsgRegisterInterchainAccountResponse") proto.RegisterType((*MsgSubmitTx)(nil), "neutron.interchaintxs.v1.MsgSubmitTx") proto.RegisterType((*MsgSubmitTxResponse)(nil), "neutron.interchaintxs.v1.MsgSubmitTxResponse") + proto.RegisterType((*MsgUpdateParams)(nil), "neutron.interchaintxs.v1.MsgUpdateParams") + proto.RegisterType((*MsgUpdateParamsResponse)(nil), "neutron.interchaintxs.v1.MsgUpdateParamsResponse") } func init() { proto.RegisterFile("neutron/interchaintxs/v1/tx.proto", fileDescriptor_50f087790e59c806) } var fileDescriptor_50f087790e59c806 = []byte{ - // 576 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0xbd, 0x6f, 0xda, 0x4e, - 0x18, 0xb6, 0x03, 0xbf, 0x24, 0xbf, 0x23, 0x5d, 0x2e, 0x89, 0x64, 0x10, 0xb5, 0x89, 0xfb, 0x21, - 0x96, 0x9c, 0x1b, 0x5a, 0x75, 0x88, 0xd4, 0x4a, 0x30, 0x54, 0x62, 0xa0, 0xaa, 0xdc, 0x4c, 0x5d, - 0x90, 0xb1, 0x5f, 0x0e, 0x4b, 0xf8, 0x8e, 0xfa, 0xce, 0x11, 0x8c, 0xdd, 0x3a, 0x76, 0xe9, 0x58, - 0x29, 0x7f, 0x4e, 0xc6, 0x8c, 0x9d, 0x50, 0x04, 0x4b, 0xe7, 0xfc, 0x05, 0x95, 0xbf, 0x80, 0xa0, - 0x80, 0xa2, 0x6e, 0xef, 0xc7, 0x73, 0xcf, 0x3d, 0xef, 0x73, 0xaf, 0x8d, 0x4e, 0x18, 0x44, 0x32, - 0xe4, 0xcc, 0xf2, 0x99, 0x84, 0xd0, 0x1d, 0x38, 0x3e, 0x93, 0x63, 0x61, 0x5d, 0x9e, 0x59, 0x72, - 0x4c, 0x46, 0x21, 0x97, 0x1c, 0x6b, 0x19, 0x84, 0xdc, 0x83, 0x90, 0xcb, 0xb3, 0x4a, 0xd9, 0xe5, - 0x22, 0xe0, 0xa2, 0x9b, 0xe0, 0xac, 0x34, 0x49, 0x0f, 0x55, 0x8e, 0x28, 0xa7, 0x3c, 0xad, 0xc7, - 0x51, 0x56, 0x3d, 0xa6, 0x9c, 0xd3, 0x21, 0x58, 0xce, 0xc8, 0xb7, 0x06, 0x52, 0x8e, 0xb2, 0x72, - 0x75, 0xa5, 0xec, 0x30, 0xc6, 0xa5, 0x23, 0x7d, 0xce, 0x72, 0xaa, 0x72, 0xd6, 0x4d, 0xb2, 0x5e, - 0xd4, 0xb7, 0x1c, 0x36, 0xc9, 0x5a, 0x4f, 0x73, 0xf5, 0x7d, 0x80, 0x10, 0xfa, 0x11, 0xf3, 0x20, - 0x8c, 0xe3, 0xb4, 0x6d, 0xde, 0xaa, 0xa8, 0xda, 0x11, 0xd4, 0x06, 0xea, 0x0b, 0x09, 0x61, 0x7b, - 0xa1, 0xbf, 0xe9, 0xba, 0x3c, 0x62, 0x12, 0x9f, 0xa0, 0x83, 0x7e, 0xc8, 0x83, 0xae, 0xe3, 0x79, - 0x21, 0x08, 0xa1, 0xa9, 0x35, 0xb5, 0xfe, 0xbf, 0x5d, 0x8a, 0x6b, 0xcd, 0xb4, 0x84, 0xdf, 0xa1, - 0x27, 0x2e, 0x67, 0x0c, 0xdc, 0x58, 0x52, 0xd7, 0xf7, 0xb4, 0x9d, 0x18, 0xd3, 0xd2, 0xee, 0xa6, - 0xc6, 0xd1, 0xc4, 0x09, 0x86, 0xe7, 0xe6, 0xbd, 0xb6, 0x69, 0x1f, 0x2c, 0xf3, 0xb6, 0x87, 0x2f, - 0xd0, 0xf1, 0xd2, 0xb6, 0xae, 0x93, 0xde, 0x1b, 0xd3, 0x14, 0x12, 0x9a, 0xda, 0xdd, 0xd4, 0xa8, - 0xa6, 0x34, 0x0f, 0xc2, 0x4c, 0xfb, 0xd0, 0x5f, 0x57, 0xdd, 0xf6, 0xce, 0xf7, 0xbf, 0x5f, 0x19, - 0xca, 0x9f, 0x2b, 0x43, 0x31, 0x5f, 0xa2, 0xe7, 0xdb, 0x26, 0xb4, 0x41, 0x8c, 0x38, 0x13, 0x60, - 0xfe, 0xda, 0x41, 0xa5, 0x8e, 0xa0, 0x9f, 0xa3, 0x5e, 0xe0, 0xcb, 0x8b, 0xf1, 0x63, 0x26, 0x6f, - 0x6c, 0x92, 0x9e, 0x38, 0xf0, 0xa0, 0x30, 0xfc, 0x6c, 0xdd, 0xad, 0x64, 0xcc, 0x35, 0x4f, 0xea, - 0xa8, 0x18, 0x08, 0x2a, 0xb4, 0x62, 0xad, 0x50, 0x2f, 0x35, 0x8e, 0x48, 0xfa, 0xbe, 0x24, 0x7f, - 0x5f, 0xd2, 0x64, 0x13, 0x3b, 0x41, 0x60, 0x8c, 0x8a, 0x01, 0x04, 0x5c, 0xfb, 0x2f, 0x61, 0x49, - 0x62, 0xac, 0xa1, 0x3d, 0xe9, 0x07, 0xc0, 0x23, 0xa9, 0xed, 0xd6, 0xd4, 0x7a, 0xd1, 0xce, 0x53, - 0xfc, 0x0a, 0x15, 0xfa, 0x00, 0xda, 0x5e, 0x4d, 0xad, 0x97, 0x1a, 0x1a, 0xc9, 0xd7, 0x76, 0x65, - 0x37, 0xc8, 0x07, 0x80, 0x56, 0xf1, 0x7a, 0x6a, 0x28, 0x76, 0x0c, 0x5d, 0xf1, 0xf1, 0x13, 0x3a, - 0x5c, 0xb1, 0x27, 0xb7, 0x0d, 0x1b, 0xa8, 0x24, 0xe0, 0x6b, 0x04, 0xcc, 0x85, 0x78, 0x1a, 0x35, - 0xb9, 0x10, 0xe5, 0xa5, 0xb6, 0x17, 0xab, 0x71, 0x07, 0x0e, 0x63, 0x30, 0xcc, 0x6c, 0xc9, 0xd3, - 0xc6, 0xb7, 0x1d, 0x54, 0xe8, 0x08, 0x8a, 0x7f, 0xaa, 0xa8, 0xbc, 0x79, 0x03, 0xdf, 0x92, 0x4d, - 0x5f, 0x17, 0xd9, 0xf6, 0xae, 0x95, 0xf7, 0xff, 0x76, 0x6e, 0xb1, 0x0f, 0x0a, 0xee, 0xa1, 0xfd, - 0xc5, 0x36, 0xbc, 0xd8, 0xca, 0x96, 0xc3, 0x2a, 0xa7, 0x8f, 0x82, 0x2d, 0xef, 0x68, 0x7d, 0xbc, - 0x9e, 0xe9, 0xea, 0xcd, 0x4c, 0x57, 0x6f, 0x67, 0xba, 0xfa, 0x63, 0xae, 0x2b, 0x37, 0x73, 0x5d, - 0xf9, 0x3d, 0xd7, 0x95, 0x2f, 0x6f, 0xa8, 0x2f, 0x07, 0x51, 0x8f, 0xb8, 0x3c, 0xb0, 0x32, 0xd2, - 0x53, 0x1e, 0xd2, 0x3c, 0xb6, 0xc6, 0x6b, 0x3f, 0x24, 0x39, 0x19, 0x81, 0xe8, 0xed, 0x26, 0x3b, - 0xf2, 0xfa, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x30, 0x09, 0xc8, 0x02, 0xb6, 0x04, 0x00, 0x00, + // 730 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0xbd, 0x4f, 0xdb, 0x4e, + 0x18, 0xb6, 0x49, 0x7e, 0x7c, 0x5c, 0xf8, 0xa9, 0xea, 0x11, 0x84, 0x13, 0x41, 0x12, 0xdc, 0x52, + 0xa5, 0x48, 0xd8, 0x90, 0x56, 0x0c, 0x48, 0xad, 0x4a, 0x86, 0x4a, 0x19, 0x52, 0x21, 0x43, 0x97, + 0x2e, 0xd1, 0xc5, 0xbe, 0x5c, 0x2c, 0xc5, 0x77, 0xae, 0xef, 0x8c, 0x92, 0xb5, 0x53, 0xd5, 0xa9, + 0x4b, 0xc7, 0x4a, 0x8c, 0x1d, 0x19, 0xba, 0x76, 0x67, 0x44, 0x9d, 0x3a, 0x21, 0x04, 0x03, 0xdd, + 0x2a, 0xf1, 0x17, 0x54, 0xfe, 0x22, 0x1f, 0x22, 0x51, 0xd4, 0x25, 0xba, 0x7b, 0xdf, 0xe7, 0x9e, + 0xf7, 0x79, 0x9f, 0xbc, 0xaf, 0xc1, 0x3a, 0xc5, 0xbe, 0xf0, 0x18, 0xd5, 0x6d, 0x2a, 0xb0, 0x67, + 0xb6, 0x91, 0x4d, 0x45, 0x97, 0xeb, 0xc7, 0x3b, 0xba, 0xe8, 0x6a, 0xae, 0xc7, 0x04, 0x83, 0x4a, + 0x0c, 0xd1, 0x86, 0x20, 0xda, 0xf1, 0x4e, 0x3e, 0x67, 0x32, 0xee, 0x30, 0xde, 0x08, 0x71, 0x7a, + 0x74, 0x89, 0x1e, 0xe5, 0x37, 0xc6, 0xf2, 0xba, 0xc8, 0x43, 0x4e, 0x02, 0xcb, 0x12, 0x46, 0x58, + 0xf4, 0x3c, 0x38, 0xc5, 0xd1, 0x65, 0xc2, 0x18, 0xe9, 0x60, 0x1d, 0xb9, 0xb6, 0xde, 0x16, 0xc2, + 0x8d, 0xc3, 0xab, 0x03, 0x61, 0x44, 0x29, 0x13, 0x48, 0xd8, 0x8c, 0x26, 0x54, 0xb9, 0x38, 0x1b, + 0xde, 0x9a, 0x7e, 0x4b, 0x47, 0xb4, 0x17, 0xa7, 0xd6, 0x12, 0x31, 0x2d, 0x8c, 0x3d, 0xdc, 0xf2, + 0xa9, 0x85, 0xbd, 0xe0, 0x1c, 0xa7, 0x57, 0x22, 0xe5, 0xba, 0xc3, 0x49, 0x20, 0xd0, 0xe1, 0x24, + 0x4e, 0x3c, 0x44, 0x8e, 0x4d, 0x99, 0x1e, 0xfe, 0x46, 0x21, 0xf5, 0x52, 0x06, 0xab, 0x75, 0x4e, + 0x0c, 0x4c, 0x6c, 0x2e, 0xb0, 0x57, 0xbb, 0xeb, 0x6e, 0xdf, 0x34, 0x99, 0x4f, 0x05, 0x5c, 0x07, + 0x8b, 0x2d, 0x8f, 0x39, 0x0d, 0x64, 0x59, 0x1e, 0xe6, 0x5c, 0x91, 0x4b, 0x72, 0x79, 0xc1, 0xc8, + 0x04, 0xb1, 0xfd, 0x28, 0x04, 0x5f, 0x80, 0xff, 0x4d, 0x46, 0x29, 0x36, 0x03, 0xf9, 0x0d, 0xdb, + 0x52, 0x66, 0x02, 0x4c, 0x55, 0xb9, 0xbd, 0x28, 0x66, 0x7b, 0xc8, 0xe9, 0xec, 0xa9, 0x43, 0x69, + 0xd5, 0x58, 0xec, 0xdf, 0x6b, 0x16, 0x3c, 0x02, 0xcb, 0x7d, 0x53, 0x1b, 0x28, 0xaa, 0x1b, 0xd0, + 0xa4, 0x42, 0x9a, 0xd2, 0xed, 0x45, 0x71, 0x35, 0xa2, 0xb9, 0x17, 0xa6, 0x1a, 0x4b, 0xf6, 0xa8, + 0xea, 0x9a, 0xb5, 0x37, 0xff, 0xf1, 0xa4, 0x28, 0xfd, 0x3e, 0x29, 0x4a, 0xea, 0x13, 0xf0, 0x78, + 0x52, 0x87, 0x06, 0xe6, 0x2e, 0xa3, 0x1c, 0xab, 0x5f, 0x67, 0x40, 0xa6, 0xce, 0xc9, 0xa1, 0xdf, + 0x74, 0x6c, 0x71, 0xd4, 0x9d, 0xa6, 0xf3, 0xca, 0x38, 0xe9, 0xa1, 0x03, 0xf7, 0x0a, 0x83, 0x8f, + 0x46, 0xdd, 0x0a, 0xdb, 0x1c, 0xf1, 0xa4, 0x0c, 0xd2, 0x0e, 0x27, 0x5c, 0x49, 0x97, 0x52, 0xe5, + 0x4c, 0x25, 0xab, 0x45, 0xb3, 0xa0, 0x25, 0xb3, 0xa0, 0xed, 0xd3, 0x9e, 0x11, 0x22, 0x20, 0x04, + 0x69, 0x07, 0x3b, 0x4c, 0xf9, 0x2f, 0x64, 0x09, 0xcf, 0x50, 0x01, 0x73, 0xc2, 0x76, 0x30, 0xf3, + 0x85, 0x32, 0x5b, 0x92, 0xcb, 0x69, 0x23, 0xb9, 0xc2, 0x6d, 0x90, 0x6a, 0x61, 0xac, 0xcc, 0x95, + 0xe4, 0x72, 0xa6, 0xa2, 0x68, 0xc9, 0x26, 0x0c, 0xcc, 0x91, 0xf6, 0x1a, 0xe3, 0x6a, 0xfa, 0xec, + 0xa2, 0x28, 0x19, 0x01, 0x74, 0xc0, 0xc7, 0x03, 0xb0, 0x34, 0x60, 0x4f, 0x62, 0x1b, 0x2c, 0x82, + 0x0c, 0xc7, 0xef, 0x7d, 0x4c, 0x4d, 0x1c, 0x74, 0x23, 0x87, 0x05, 0x41, 0x12, 0xaa, 0x59, 0x81, + 0x1a, 0xb3, 0x8d, 0x28, 0xc5, 0x9d, 0xd8, 0x96, 0xe4, 0xaa, 0xfe, 0x90, 0xc1, 0x83, 0x3a, 0x27, + 0x6f, 0x5d, 0x0b, 0x09, 0x7c, 0x10, 0xee, 0x11, 0xdc, 0x05, 0x0b, 0xc8, 0x17, 0x6d, 0xe6, 0xd9, + 0xa2, 0x17, 0x59, 0x5e, 0x55, 0x7e, 0x7e, 0xdf, 0xca, 0xc6, 0xdb, 0x18, 0x3b, 0x7f, 0x28, 0x3c, + 0x9b, 0x12, 0xa3, 0x0f, 0x85, 0xaf, 0xc0, 0x6c, 0xb4, 0x89, 0x61, 0x91, 0x4c, 0x65, 0x4d, 0xbb, + 0x7f, 0xcd, 0xa3, 0x32, 0xd5, 0x85, 0xa0, 0xc3, 0x6f, 0x37, 0xa7, 0x9b, 0xb2, 0x11, 0xbf, 0xdb, + 0xdb, 0xfe, 0x70, 0x73, 0xba, 0xd9, 0x67, 0xfc, 0x74, 0x73, 0xba, 0xb9, 0x36, 0xbc, 0xed, 0x23, + 0x5a, 0xd5, 0x1c, 0x58, 0x19, 0x09, 0x25, 0xae, 0x54, 0xfe, 0xcc, 0x80, 0x54, 0x9d, 0x13, 0xf8, + 0x45, 0x06, 0xb9, 0xf1, 0xcb, 0xb5, 0xab, 0x8d, 0xfb, 0x16, 0x69, 0x93, 0x46, 0x36, 0xff, 0xf2, + 0xdf, 0xde, 0xdd, 0x8d, 0xba, 0x04, 0x9b, 0x60, 0xfe, 0x6e, 0xd0, 0x37, 0x26, 0xb2, 0x25, 0xb0, + 0xfc, 0xd6, 0x54, 0xb0, 0x81, 0x1a, 0x1d, 0xb0, 0x38, 0xf4, 0xd7, 0x3e, 0x9d, 0x48, 0x30, 0x08, + 0xcd, 0xef, 0x4c, 0x0d, 0x4d, 0xea, 0x55, 0xdf, 0x9c, 0x5d, 0x15, 0xe4, 0xf3, 0xab, 0x82, 0x7c, + 0x79, 0x55, 0x90, 0x3f, 0x5f, 0x17, 0xa4, 0xf3, 0xeb, 0x82, 0xf4, 0xeb, 0xba, 0x20, 0xbd, 0x7b, + 0x4e, 0x6c, 0xd1, 0xf6, 0x9b, 0x9a, 0xc9, 0x1c, 0x3d, 0xa6, 0xdd, 0x62, 0x1e, 0x49, 0xce, 0x7a, + 0x77, 0xe4, 0xa3, 0x2e, 0x7a, 0x2e, 0xe6, 0xcd, 0xd9, 0x70, 0xd9, 0x9e, 0xfd, 0x0d, 0x00, 0x00, + 0xff, 0xff, 0x3d, 0xc8, 0x4f, 0x3a, 0x52, 0x06, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -277,6 +390,7 @@ const _ = grpc.SupportPackageIsVersion4 type MsgClient interface { RegisterInterchainAccount(ctx context.Context, in *MsgRegisterInterchainAccount, opts ...grpc.CallOption) (*MsgRegisterInterchainAccountResponse, error) SubmitTx(ctx context.Context, in *MsgSubmitTx, opts ...grpc.CallOption) (*MsgSubmitTxResponse, error) + UpdateParams(ctx context.Context, in *MsgUpdateParams, opts ...grpc.CallOption) (*MsgUpdateParamsResponse, error) } type msgClient struct { @@ -305,10 +419,20 @@ func (c *msgClient) SubmitTx(ctx context.Context, in *MsgSubmitTx, opts ...grpc. return out, nil } +func (c *msgClient) UpdateParams(ctx context.Context, in *MsgUpdateParams, opts ...grpc.CallOption) (*MsgUpdateParamsResponse, error) { + out := new(MsgUpdateParamsResponse) + err := c.cc.Invoke(ctx, "/neutron.interchaintxs.v1.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 { RegisterInterchainAccount(context.Context, *MsgRegisterInterchainAccount) (*MsgRegisterInterchainAccountResponse, error) SubmitTx(context.Context, *MsgSubmitTx) (*MsgSubmitTxResponse, error) + UpdateParams(context.Context, *MsgUpdateParams) (*MsgUpdateParamsResponse, error) } // UnimplementedMsgServer can be embedded to have forward compatible implementations. @@ -321,6 +445,9 @@ func (*UnimplementedMsgServer) RegisterInterchainAccount(ctx context.Context, re func (*UnimplementedMsgServer) SubmitTx(ctx context.Context, req *MsgSubmitTx) (*MsgSubmitTxResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method SubmitTx not implemented") } +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) @@ -362,6 +489,24 @@ func _Msg_SubmitTx_Handler(srv interface{}, ctx context.Context, dec func(interf return interceptor(ctx, in, info, handler) } +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.interchaintxs.v1.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.interchaintxs.v1.Msg", HandlerType: (*MsgServer)(nil), @@ -374,6 +519,10 @@ var _Msg_serviceDesc = grpc.ServiceDesc{ MethodName: "SubmitTx", Handler: _Msg_SubmitTx_Handler, }, + { + MethodName: "UpdateParams", + Handler: _Msg_UpdateParams_Handler, + }, }, Streams: []grpc.StreamDesc{}, Metadata: "neutron/interchaintxs/v1/tx.proto", @@ -561,6 +710,69 @@ func (m *MsgSubmitTxResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } +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 @@ -654,6 +866,30 @@ func (m *MsgSubmitTxResponse) Size() (n int) { return n } +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 } @@ -1221,6 +1457,171 @@ func (m *MsgSubmitTxResponse) Unmarshal(dAtA []byte) error { } return nil } +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 From 49601cbebc670bcbcc71d77152709974cac062ff Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Thu, 31 Aug 2023 17:00:25 +0400 Subject: [PATCH 074/307] regen tokenfactory --- x/tokenfactory/types/authorityMetadata.pb.go | 20 +- x/tokenfactory/types/codec.go | 6 +- x/tokenfactory/types/denoms.go | 16 + x/tokenfactory/types/genesis.pb.go | 17 +- x/tokenfactory/types/keys.go | 6 +- x/tokenfactory/types/msgs.go | 5 +- x/tokenfactory/types/params.go | 4 +- x/tokenfactory/types/params.pb.go | 103 ++-- x/tokenfactory/types/query.pb.go | 547 ++++--------------- x/tokenfactory/types/query.pb.gw.go | 141 ++--- x/tokenfactory/types/tx.pb.go | 518 ++++++++++++++++-- 11 files changed, 686 insertions(+), 697 deletions(-) diff --git a/x/tokenfactory/types/authorityMetadata.pb.go b/x/tokenfactory/types/authorityMetadata.pb.go index 546b24ead..5f0c39198 100644 --- a/x/tokenfactory/types/authorityMetadata.pb.go +++ b/x/tokenfactory/types/authorityMetadata.pb.go @@ -6,8 +6,8 @@ package types import ( fmt "fmt" _ "github.com/cosmos/cosmos-sdk/types" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" @@ -29,7 +29,7 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // permission, but is planned to be extended to the future. type DenomAuthorityMetadata struct { // Can be empty for no admin, or a valid osmosis address - Admin string `protobuf:"bytes,1,opt,name=admin,proto3" json:"admin,omitempty" yaml:"admin"` + Admin string `protobuf:"bytes,1,opt,name=Admin,proto3" json:"Admin,omitempty" yaml:"admin"` } func (m *DenomAuthorityMetadata) Reset() { *m = DenomAuthorityMetadata{} } @@ -89,14 +89,14 @@ var fileDescriptor_99435de88ae175f7 = []byte{ 0x17, 0x92, 0x81, 0xea, 0xd2, 0x43, 0xd6, 0xa5, 0x07, 0xd5, 0x25, 0x25, 0x92, 0x9e, 0x9f, 0x9e, 0x0f, 0x56, 0xa8, 0x0f, 0x62, 0x41, 0xf4, 0x48, 0xc9, 0x25, 0x83, 0x35, 0xe9, 0x27, 0x25, 0x16, 0xa7, 0xc2, 0x2d, 0x48, 0xce, 0xcf, 0xcc, 0x83, 0xc8, 0x2b, 0xb9, 0x71, 0x89, 0xb9, 0xa4, 0xe6, - 0xe5, 0xe7, 0x3a, 0xa2, 0xdb, 0x29, 0xa4, 0xc6, 0xc5, 0x9a, 0x98, 0x92, 0x9b, 0x99, 0x27, 0xc1, + 0xe5, 0xe7, 0x3a, 0xa2, 0xdb, 0x29, 0xa4, 0xc6, 0xc5, 0xea, 0x98, 0x92, 0x9b, 0x99, 0x27, 0xc1, 0xa8, 0xc0, 0xa8, 0xc1, 0xe9, 0x24, 0xf0, 0xe9, 0x9e, 0x3c, 0x4f, 0x65, 0x62, 0x6e, 0x8e, 0x95, - 0x12, 0x58, 0x58, 0x29, 0x08, 0x22, 0x6d, 0xc5, 0xf2, 0x62, 0x81, 0x3c, 0xa3, 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, 0x3d, 0xa0, 0x9b, 0x93, 0x98, 0x54, 0x0c, 0xe3, 0xe8, 0x97, - 0x19, 0x9a, 0xeb, 0x57, 0xa0, 0x86, 0x44, 0x49, 0x65, 0x41, 0x6a, 0x71, 0x12, 0x1b, 0xd8, 0x89, - 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x2d, 0xa0, 0x40, 0xce, 0x2e, 0x01, 0x00, 0x00, + 0x52, 0x22, 0x48, 0x58, 0x29, 0x08, 0x22, 0x6d, 0xc5, 0xf2, 0x62, 0x81, 0x3c, 0xa3, 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, 0x15, 0xa8, 0x81, 0x50, 0x52, 0x59, 0x90, 0x5a, 0x9c, 0xc4, 0x06, 0x76, + 0x9d, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0x08, 0x3a, 0x4a, 0xc1, 0x29, 0x01, 0x00, 0x00, } func (this *DenomAuthorityMetadata) Equal(that interface{}) bool { diff --git a/x/tokenfactory/types/codec.go b/x/tokenfactory/types/codec.go index 4945c0f1c..78f7dafa4 100644 --- a/x/tokenfactory/types/codec.go +++ b/x/tokenfactory/types/codec.go @@ -14,9 +14,9 @@ func RegisterCodec(cdc *codec.LegacyAmino) { cdc.RegisterConcrete(&MsgCreateDenom{}, "osmosis/tokenfactory/create-denom", nil) cdc.RegisterConcrete(&MsgMint{}, "osmosis/tokenfactory/mint", nil) cdc.RegisterConcrete(&MsgBurn{}, "osmosis/tokenfactory/burn", nil) - cdc.RegisterConcrete(&MsgForceTransfer{}, "osmosis/tokenfactory/force-transfer", nil) + //cdc.RegisterConcrete(&MsgForceTransfer{}, "osmosis/tokenfactory/force-transfer", nil) cdc.RegisterConcrete(&MsgChangeAdmin{}, "osmosis/tokenfactory/change-admin", nil) - cdc.RegisterConcrete(&MsgSetBeforeSendHook{}, "osmosis/tokenfactory/set-beforesend-hook", nil) + //cdc.RegisterConcrete(&MsgSetBeforeSendHook{}, "osmosis/tokenfactory/set-beforesend-hook", nil) } func RegisterInterfaces(registry cdctypes.InterfaceRegistry) { @@ -27,7 +27,7 @@ func RegisterInterfaces(registry cdctypes.InterfaceRegistry) { &MsgBurn{}, // &MsgForceTransfer{}, &MsgChangeAdmin{}, - &MsgSetBeforeSendHook{}, + //&MsgSetBeforeSendHook{}, ) msgservice.RegisterMsgServiceDesc(registry, &_Msg_serviceDesc) } diff --git a/x/tokenfactory/types/denoms.go b/x/tokenfactory/types/denoms.go index 658399856..4a78e42cb 100644 --- a/x/tokenfactory/types/denoms.go +++ b/x/tokenfactory/types/denoms.go @@ -1,10 +1,12 @@ package types import ( + "fmt" "strings" errorsmod "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" + bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" ) const ( @@ -66,3 +68,17 @@ func DeconstructDenom(denom string) (creator string, subdenom string, err error) return creatorAddr.String(), subdenom, nil } + +// NewTokenFactoryDenomMintCoinsRestriction creates and returns a BankMintingRestrictionFn that only allows minting of +// valid tokenfactory denoms +func NewTokenFactoryDenomMintCoinsRestriction() bankkeeper.MintingRestrictionFn { + return func(ctx sdk.Context, coinsToMint sdk.Coins) error { + for _, coin := range coinsToMint { + _, _, err := DeconstructDenom(coin.Denom) + if err != nil { + return fmt.Errorf("does not have permission to mint %s", coin.Denom) + } + } + return nil + } +} diff --git a/x/tokenfactory/types/genesis.pb.go b/x/tokenfactory/types/genesis.pb.go index 2ce6a0384..e3471a9ef 100644 --- a/x/tokenfactory/types/genesis.pb.go +++ b/x/tokenfactory/types/genesis.pb.go @@ -5,8 +5,8 @@ package types import ( fmt "fmt" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" @@ -77,9 +77,6 @@ func (m *GenesisState) GetFactoryDenoms() []GenesisDenom { return nil } -// GenesisDenom defines a tokenfactory denom that is defined within genesis -// state. The structure contains DenomAuthorityMetadata which defines the -// denom's admin. type GenesisDenom struct { Denom string `protobuf:"bytes,1,opt,name=denom,proto3" json:"denom,omitempty" yaml:"denom"` AuthorityMetadata DenomAuthorityMetadata `protobuf:"bytes,2,opt,name=authority_metadata,json=authorityMetadata,proto3" json:"authority_metadata" yaml:"authority_metadata"` @@ -160,12 +157,12 @@ var fileDescriptor_5749c3f71850298b = []byte{ 0xe0, 0xd3, 0x3d, 0x79, 0x1e, 0x88, 0x49, 0x60, 0x61, 0xa5, 0x20, 0x88, 0xb4, 0x50, 0x1b, 0x23, 0x97, 0x10, 0x3c, 0x18, 0xe3, 0x73, 0xa1, 0xe1, 0x28, 0xc1, 0x04, 0xf6, 0xbb, 0x09, 0x7e, 0xf7, 0x82, 0x6d, 0x72, 0x44, 0x8f, 0x03, 0x27, 0x45, 0xa8, 0xcb, 0x25, 0x21, 0xf6, 0x61, 0x9a, 0xae, - 0x14, 0x24, 0x88, 0x11, 0x73, 0x56, 0x2c, 0x2f, 0x16, 0xc8, 0x33, 0x3a, 0x05, 0x9d, 0x78, 0x24, + 0x14, 0x24, 0x88, 0x11, 0x73, 0x56, 0x2c, 0x2f, 0x16, 0xc8, 0x33, 0x3a, 0xf9, 0x9e, 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, 0x45, 0x7a, 0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, - 0x72, 0x7e, 0xae, 0x3e, 0xd4, 0x55, 0xba, 0x39, 0x89, 0x49, 0xc5, 0x30, 0x8e, 0x7e, 0x99, 0xa1, - 0xb9, 0x7e, 0x05, 0x6a, 0x8c, 0x97, 0x54, 0x16, 0xa4, 0x16, 0x27, 0xb1, 0x81, 0x63, 0xda, 0x18, - 0x10, 0x00, 0x00, 0xff, 0xff, 0x3e, 0x86, 0xb1, 0xa7, 0xac, 0x02, 0x00, 0x00, + 0x2c, 0xc7, 0x70, 0xe3, 0xb1, 0x1c, 0x43, 0x94, 0x71, 0x7a, 0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, + 0x72, 0x7e, 0xae, 0x7e, 0x5e, 0x6a, 0x69, 0x49, 0x51, 0x7e, 0x9e, 0x6e, 0x7e, 0x51, 0x3a, 0x8c, + 0xad, 0x5f, 0x81, 0x1a, 0xd9, 0x25, 0x95, 0x05, 0xa9, 0xc5, 0x49, 0x6c, 0xe0, 0x48, 0x36, 0x06, + 0x04, 0x00, 0x00, 0xff, 0xff, 0x88, 0xdf, 0xa5, 0xe7, 0xa7, 0x02, 0x00, 0x00, } func (this *GenesisDenom) Equal(that interface{}) bool { diff --git a/x/tokenfactory/types/keys.go b/x/tokenfactory/types/keys.go index dd2ed9fe4..8bfeb012c 100644 --- a/x/tokenfactory/types/keys.go +++ b/x/tokenfactory/types/keys.go @@ -22,7 +22,10 @@ const ( ) // KeySeparator is used to combine parts of the keys in the store -const KeySeparator = "|" +const ( + KeySeparator = "|" + prefixParamsKey = iota + 1 +) var ( DenomAuthorityMetadataKey = "authoritymetadata" @@ -30,6 +33,7 @@ var ( CreatorPrefixKey = "creator" AdminPrefixKey = "admin" BeforeSendHookAddressPrefixKey = "beforesendhook" + ParamsKey = []byte{prefixParamsKey} ) // GetDenomPrefixStore returns the store prefix where all the data associated with a specific denom diff --git a/x/tokenfactory/types/msgs.go b/x/tokenfactory/types/msgs.go index 9ee67c9a5..356d6f801 100644 --- a/x/tokenfactory/types/msgs.go +++ b/x/tokenfactory/types/msgs.go @@ -108,9 +108,8 @@ func NewMsgBurn(sender string, amount sdk.Coin) *MsgBurn { // NewMsgBurn creates a message to burn tokens func NewMsgBurnFrom(sender string, amount sdk.Coin, burnFromAddress string) *MsgBurn { return &MsgBurn{ - Sender: sender, - Amount: amount, - BurnFromAddress: burnFromAddress, + Sender: sender, + Amount: amount, } } diff --git a/x/tokenfactory/types/params.go b/x/tokenfactory/types/params.go index 09d9cac75..8ec0c3c75 100644 --- a/x/tokenfactory/types/params.go +++ b/x/tokenfactory/types/params.go @@ -32,8 +32,8 @@ func NewParams(denomCreationFee sdk.Coins, denomCreationGasConsume uint64) Param func DefaultParams() Params { return Params{ // For choice, see: https://github.com/osmosis-labs/osmosis/pull/4983 - DenomCreationFee: sdk.NewCoins(), // used to be 10 OSMO at launch. - DenomCreationGasConsume: uint64(DefaultCreationGasFee), + DenomCreationFee: sdk.NewCoins(), // used to be 10 OSMO at launch. + FeeCollectorAddress: "", } } diff --git a/x/tokenfactory/types/params.pb.go b/x/tokenfactory/types/params.pb.go index 05037d806..3ca6e158d 100644 --- a/x/tokenfactory/types/params.pb.go +++ b/x/tokenfactory/types/params.pb.go @@ -8,8 +8,8 @@ import ( _ "github.com/cosmos/cosmos-proto" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" types "github.com/cosmos/cosmos-sdk/types" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" @@ -26,17 +26,12 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package -// Params defines the parameters for the tokenfactory module. +// Params holds parameters for the tokenfactory module type Params struct { - // DenomCreationFee defines the fee to be charged on the creation of a new - // denom. The fee is drawn from the MsgCreateDenom's sender account, and - // transferred to the community pool. + // DenomCreationFee is the fee required to create a new denom using the tokenfactory module DenomCreationFee github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,1,rep,name=denom_creation_fee,json=denomCreationFee,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"denom_creation_fee" yaml:"denom_creation_fee"` - // DenomCreationGasConsume defines the gas cost for creating a new denom. - // This is intended as a spam deterrence mechanism. - // - // See: https://github.com/CosmWasm/token-factory/issues/11 - DenomCreationGasConsume uint64 `protobuf:"varint,2,opt,name=denom_creation_gas_consume,json=denomCreationGasConsume,proto3" json:"denom_creation_gas_consume,omitempty" yaml:"denom_creation_gas_consume"` + // FeeCollectorAddress is the address where fees collected from denom creation are sent to + FeeCollectorAddress string `protobuf:"bytes,2,opt,name=fee_collector_address,json=feeCollectorAddress,proto3" json:"fee_collector_address,omitempty"` } func (m *Params) Reset() { *m = Params{} } @@ -79,11 +74,11 @@ func (m *Params) GetDenomCreationFee() github_com_cosmos_cosmos_sdk_types.Coins return nil } -func (m *Params) GetDenomCreationGasConsume() uint64 { +func (m *Params) GetFeeCollectorAddress() string { if m != nil { - return m.DenomCreationGasConsume + return m.FeeCollectorAddress } - return 0 + return "" } func init() { @@ -95,30 +90,28 @@ func init() { } var fileDescriptor_cc8299d306f3ff47 = []byte{ - // 355 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0xc1, 0x4e, 0xea, 0x40, - 0x14, 0x86, 0x3b, 0xdc, 0x1b, 0x16, 0xbd, 0x9b, 0x9b, 0xc6, 0x44, 0x20, 0x66, 0x8a, 0x5d, 0xc1, - 0x82, 0x4e, 0x50, 0x13, 0x8d, 0x4b, 0x48, 0x74, 0x45, 0x62, 0x58, 0xba, 0x69, 0x4e, 0xcb, 0x50, - 0x1a, 0x68, 0x0f, 0xe9, 0x0c, 0xc4, 0x3e, 0x82, 0x3b, 0x57, 0x3e, 0x84, 0x4f, 0xc2, 0x92, 0xa5, - 0xab, 0x6a, 0xe0, 0x0d, 0x78, 0x02, 0xc3, 0x74, 0x30, 0xa0, 0xc6, 0xd5, 0xcc, 0xc9, 0xf9, 0xff, - 0x6f, 0xfe, 0x33, 0xc7, 0x6c, 0xa2, 0x88, 0x51, 0x44, 0x82, 0x49, 0x1c, 0xf3, 0x64, 0x08, 0x81, - 0xc4, 0x34, 0x63, 0xf3, 0xb6, 0xcf, 0x25, 0xb4, 0xd9, 0x14, 0x52, 0x88, 0x85, 0x3b, 0x4d, 0x51, - 0xa2, 0x75, 0xa2, 0xa5, 0xee, 0xbe, 0xd4, 0xd5, 0xd2, 0xda, 0x51, 0x88, 0x21, 0x2a, 0x21, 0xdb, - 0xde, 0x0a, 0x4f, 0xed, 0xe2, 0x57, 0x3c, 0xcc, 0xe4, 0x08, 0xd3, 0x48, 0x66, 0x3d, 0x2e, 0x61, - 0x00, 0x12, 0xb4, 0xab, 0x1a, 0x28, 0x9b, 0x57, 0xe0, 0x8a, 0x42, 0xb7, 0x68, 0x51, 0x31, 0x1f, - 0x04, 0xff, 0xe4, 0x04, 0x18, 0x25, 0x45, 0xdf, 0x79, 0x2c, 0x99, 0xe5, 0x3b, 0x95, 0xda, 0x7a, - 0x26, 0xa6, 0x35, 0xe0, 0x09, 0xc6, 0x5e, 0x90, 0x72, 0x90, 0x11, 0x26, 0xde, 0x90, 0xf3, 0x0a, - 0xa9, 0xff, 0x69, 0xfc, 0x3b, 0xab, 0xba, 0x1a, 0xbb, 0x05, 0xed, 0x86, 0x70, 0xbb, 0x18, 0x25, - 0x9d, 0xde, 0x22, 0xb7, 0x8d, 0x4d, 0x6e, 0x57, 0x33, 0x88, 0x27, 0xd7, 0xce, 0x77, 0x84, 0xf3, - 0xf2, 0x66, 0x37, 0xc2, 0x48, 0x8e, 0x66, 0xbe, 0x1b, 0x60, 0xac, 0x03, 0xea, 0xa3, 0x25, 0x06, - 0x63, 0x26, 0xb3, 0x29, 0x17, 0x8a, 0x26, 0xfa, 0xff, 0x15, 0xa0, 0xab, 0xfd, 0x37, 0x9c, 0x5b, - 0x43, 0xb3, 0xf6, 0x05, 0x1a, 0x82, 0xf0, 0x02, 0x4c, 0xc4, 0x2c, 0xe6, 0x95, 0x52, 0x9d, 0x34, - 0xfe, 0x76, 0x9a, 0x8b, 0xdc, 0x26, 0x9b, 0xdc, 0x3e, 0xfd, 0x31, 0xc4, 0x9e, 0xde, 0xe9, 0x1f, - 0x1f, 0x3c, 0x70, 0x0b, 0xa2, 0x5b, 0x74, 0x3a, 0xfd, 0xc5, 0x8a, 0x92, 0xe5, 0x8a, 0x92, 0xf7, - 0x15, 0x25, 0x4f, 0x6b, 0x6a, 0x2c, 0xd7, 0xd4, 0x78, 0x5d, 0x53, 0xe3, 0xfe, 0x6a, 0x2f, 0xbd, - 0xde, 0x50, 0x6b, 0x02, 0xbe, 0xd8, 0x15, 0x6c, 0xde, 0xbe, 0x64, 0x0f, 0x87, 0x4b, 0x53, 0x33, - 0xf9, 0x65, 0xf5, 0xcd, 0xe7, 0x1f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x24, 0x1f, 0x6c, 0xe0, 0x38, - 0x02, 0x00, 0x00, + // 322 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x91, 0xb1, 0x4e, 0x02, 0x41, + 0x10, 0x86, 0x6f, 0x35, 0x21, 0xf1, 0x6c, 0xcc, 0xa9, 0x09, 0x10, 0xb3, 0x10, 0x2a, 0x2c, 0xb8, + 0x0d, 0xd0, 0xd9, 0x09, 0x89, 0x1d, 0x89, 0xa1, 0xb4, 0xb9, 0xec, 0xdd, 0xcd, 0x9d, 0x17, 0xb8, + 0x1d, 0xb2, 0xbb, 0x18, 0x79, 0x0b, 0x2b, 0x1f, 0xc2, 0x27, 0xa1, 0xa4, 0x31, 0xb1, 0x42, 0x03, + 0x6f, 0xe0, 0x13, 0x18, 0x76, 0x17, 0x83, 0xb1, 0xda, 0x99, 0xfc, 0xff, 0x7c, 0xf3, 0x67, 0xd6, + 0xbf, 0x46, 0x55, 0xa2, 0x2a, 0x14, 0xd3, 0x38, 0x01, 0x91, 0xf1, 0x44, 0xa3, 0x5c, 0xb0, 0xa7, + 0x6e, 0x0c, 0x9a, 0x77, 0xd9, 0x8c, 0x4b, 0x5e, 0xaa, 0x70, 0x26, 0x51, 0x63, 0x70, 0xe5, 0xac, + 0xe1, 0xa1, 0x35, 0x74, 0xd6, 0xfa, 0x45, 0x8e, 0x39, 0x1a, 0x23, 0xdb, 0x55, 0x76, 0xa6, 0x5e, + 0x4b, 0xcc, 0x50, 0x64, 0x05, 0xdb, 0x38, 0x89, 0xda, 0x8e, 0xc5, 0x5c, 0xc1, 0xef, 0xc2, 0x04, + 0x0b, 0x61, 0xf5, 0xd6, 0x3b, 0xf1, 0x2b, 0xf7, 0x66, 0x7f, 0xf0, 0x4a, 0xfc, 0x20, 0x05, 0x81, + 0x65, 0x94, 0x48, 0xe0, 0xba, 0x40, 0x11, 0x65, 0x00, 0x55, 0xd2, 0x3c, 0x6e, 0x9f, 0xf6, 0x6a, + 0xa1, 0xc3, 0xee, 0x40, 0xfb, 0x38, 0xe1, 0x10, 0x0b, 0x31, 0x18, 0x2d, 0xd7, 0x0d, 0xef, 0x7b, + 0xdd, 0xa8, 0x2d, 0x78, 0x39, 0xbd, 0x69, 0xfd, 0x47, 0xb4, 0xde, 0x3e, 0x1b, 0xed, 0xbc, 0xd0, + 0x8f, 0xf3, 0x38, 0x4c, 0xb0, 0x74, 0x01, 0xdd, 0xd3, 0x51, 0xe9, 0x84, 0xe9, 0xc5, 0x0c, 0x94, + 0xa1, 0xa9, 0xf1, 0x99, 0x01, 0x0c, 0xdd, 0xfc, 0x1d, 0x40, 0xd0, 0xf3, 0x2f, 0x33, 0x80, 0x28, + 0xc1, 0xe9, 0x14, 0x76, 0xe7, 0x88, 0x78, 0x9a, 0x4a, 0x50, 0xaa, 0x7a, 0xd4, 0x24, 0xed, 0x93, + 0xf1, 0x79, 0x06, 0x30, 0xdc, 0x6b, 0xb7, 0x56, 0x1a, 0x8c, 0x96, 0x1b, 0x4a, 0x56, 0x1b, 0x4a, + 0xbe, 0x36, 0x94, 0xbc, 0x6c, 0xa9, 0xb7, 0xda, 0x52, 0xef, 0x63, 0x4b, 0xbd, 0x87, 0xfe, 0x41, + 0x12, 0x01, 0x73, 0x2d, 0x51, 0x74, 0x50, 0xe6, 0xfb, 0x9a, 0x3d, 0xff, 0xfd, 0x24, 0x13, 0x2d, + 0xae, 0x98, 0x6b, 0xf5, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x58, 0x8c, 0xda, 0x7f, 0xc9, 0x01, + 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { @@ -141,10 +134,12 @@ func (m *Params) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.DenomCreationGasConsume != 0 { - i = encodeVarintParams(dAtA, i, uint64(m.DenomCreationGasConsume)) + if len(m.FeeCollectorAddress) > 0 { + i -= len(m.FeeCollectorAddress) + copy(dAtA[i:], m.FeeCollectorAddress) + i = encodeVarintParams(dAtA, i, uint64(len(m.FeeCollectorAddress))) i-- - dAtA[i] = 0x10 + dAtA[i] = 0x12 } if len(m.DenomCreationFee) > 0 { for iNdEx := len(m.DenomCreationFee) - 1; iNdEx >= 0; iNdEx-- { @@ -186,8 +181,9 @@ func (m *Params) Size() (n int) { n += 1 + l + sovParams(uint64(l)) } } - if m.DenomCreationGasConsume != 0 { - n += 1 + sovParams(uint64(m.DenomCreationGasConsume)) + l = len(m.FeeCollectorAddress) + if l > 0 { + n += 1 + l + sovParams(uint64(l)) } return n } @@ -262,10 +258,10 @@ func (m *Params) Unmarshal(dAtA []byte) error { } iNdEx = postIndex case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field DenomCreationGasConsume", wireType) + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field FeeCollectorAddress", wireType) } - m.DenomCreationGasConsume = 0 + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowParams @@ -275,11 +271,24 @@ func (m *Params) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.DenomCreationGasConsume |= uint64(b&0x7F) << shift + 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.FeeCollectorAddress = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipParams(dAtA[iNdEx:]) diff --git a/x/tokenfactory/types/query.pb.go b/x/tokenfactory/types/query.pb.go index fe5a3f035..bc94c2473 100644 --- a/x/tokenfactory/types/query.pb.go +++ b/x/tokenfactory/types/query.pb.go @@ -6,10 +6,9 @@ package types import ( context "context" fmt "fmt" - _ "github.com/cosmos/cosmos-sdk/types/query" - _ "github.com/gogo/protobuf/gogoproto" - grpc1 "github.com/gogo/protobuf/grpc" - proto "github.com/gogo/protobuf/proto" + _ "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" @@ -113,10 +112,9 @@ func (m *QueryParamsResponse) GetParams() Params { return Params{} } -// QueryDenomAuthorityMetadataRequest defines the request structure for the -// DenomAuthorityMetadata gRPC query. type QueryDenomAuthorityMetadataRequest struct { - Denom string `protobuf:"bytes,1,opt,name=denom,proto3" json:"denom,omitempty" yaml:"denom"` + Creator string `protobuf:"bytes,1,opt,name=creator,proto3" json:"creator,omitempty" yaml:"creator"` + Subdenom string `protobuf:"bytes,2,opt,name=subdenom,proto3" json:"subdenom,omitempty" yaml:"subdenom"` } func (m *QueryDenomAuthorityMetadataRequest) Reset() { *m = QueryDenomAuthorityMetadataRequest{} } @@ -152,15 +150,20 @@ func (m *QueryDenomAuthorityMetadataRequest) XXX_DiscardUnknown() { var xxx_messageInfo_QueryDenomAuthorityMetadataRequest proto.InternalMessageInfo -func (m *QueryDenomAuthorityMetadataRequest) GetDenom() string { +func (m *QueryDenomAuthorityMetadataRequest) GetCreator() string { if m != nil { - return m.Denom + return m.Creator + } + return "" +} + +func (m *QueryDenomAuthorityMetadataRequest) GetSubdenom() string { + if m != nil { + return m.Subdenom } return "" } -// QueryDenomAuthorityMetadataResponse defines the response structure for the -// DenomAuthorityMetadata gRPC query. type QueryDenomAuthorityMetadataResponse struct { AuthorityMetadata DenomAuthorityMetadata `protobuf:"bytes,1,opt,name=authority_metadata,json=authorityMetadata,proto3" json:"authority_metadata" yaml:"authority_metadata"` } @@ -205,8 +208,6 @@ func (m *QueryDenomAuthorityMetadataResponse) GetAuthorityMetadata() DenomAuthor return DenomAuthorityMetadata{} } -// QueryDenomsFromCreatorRequest defines the request structure for the -// DenomsFromCreator gRPC query. type QueryDenomsFromCreatorRequest struct { Creator string `protobuf:"bytes,1,opt,name=creator,proto3" json:"creator,omitempty" yaml:"creator"` } @@ -251,8 +252,6 @@ func (m *QueryDenomsFromCreatorRequest) GetCreator() string { return "" } -// QueryDenomsFromCreatorRequest defines the response structure for the -// DenomsFromCreator gRPC query. type QueryDenomsFromCreatorResponse struct { Denoms []string `protobuf:"bytes,1,rep,name=denoms,proto3" json:"denoms,omitempty" yaml:"denoms"` } @@ -297,96 +296,6 @@ func (m *QueryDenomsFromCreatorResponse) GetDenoms() []string { return nil } -type QueryBeforeSendHookAddressRequest struct { - Denom string `protobuf:"bytes,1,opt,name=denom,proto3" json:"denom,omitempty" yaml:"denom"` -} - -func (m *QueryBeforeSendHookAddressRequest) Reset() { *m = QueryBeforeSendHookAddressRequest{} } -func (m *QueryBeforeSendHookAddressRequest) String() string { return proto.CompactTextString(m) } -func (*QueryBeforeSendHookAddressRequest) ProtoMessage() {} -func (*QueryBeforeSendHookAddressRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_6f22013ad0f72e3f, []int{6} -} -func (m *QueryBeforeSendHookAddressRequest) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *QueryBeforeSendHookAddressRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_QueryBeforeSendHookAddressRequest.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 *QueryBeforeSendHookAddressRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryBeforeSendHookAddressRequest.Merge(m, src) -} -func (m *QueryBeforeSendHookAddressRequest) XXX_Size() int { - return m.Size() -} -func (m *QueryBeforeSendHookAddressRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryBeforeSendHookAddressRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_QueryBeforeSendHookAddressRequest proto.InternalMessageInfo - -func (m *QueryBeforeSendHookAddressRequest) GetDenom() string { - if m != nil { - return m.Denom - } - return "" -} - -// QueryBeforeSendHookAddressResponse defines the response structure for the -// DenomBeforeSendHook gRPC query. -type QueryBeforeSendHookAddressResponse struct { - CosmwasmAddress string `protobuf:"bytes,1,opt,name=cosmwasm_address,json=cosmwasmAddress,proto3" json:"cosmwasm_address,omitempty" yaml:"cosmwasm_address"` -} - -func (m *QueryBeforeSendHookAddressResponse) Reset() { *m = QueryBeforeSendHookAddressResponse{} } -func (m *QueryBeforeSendHookAddressResponse) String() string { return proto.CompactTextString(m) } -func (*QueryBeforeSendHookAddressResponse) ProtoMessage() {} -func (*QueryBeforeSendHookAddressResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_6f22013ad0f72e3f, []int{7} -} -func (m *QueryBeforeSendHookAddressResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *QueryBeforeSendHookAddressResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_QueryBeforeSendHookAddressResponse.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 *QueryBeforeSendHookAddressResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryBeforeSendHookAddressResponse.Merge(m, src) -} -func (m *QueryBeforeSendHookAddressResponse) XXX_Size() int { - return m.Size() -} -func (m *QueryBeforeSendHookAddressResponse) XXX_DiscardUnknown() { - xxx_messageInfo_QueryBeforeSendHookAddressResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_QueryBeforeSendHookAddressResponse proto.InternalMessageInfo - -func (m *QueryBeforeSendHookAddressResponse) GetCosmwasmAddress() string { - if m != nil { - return m.CosmwasmAddress - } - return "" -} - func init() { proto.RegisterType((*QueryParamsRequest)(nil), "osmosis.tokenfactory.v1beta1.QueryParamsRequest") proto.RegisterType((*QueryParamsResponse)(nil), "osmosis.tokenfactory.v1beta1.QueryParamsResponse") @@ -394,8 +303,6 @@ func init() { proto.RegisterType((*QueryDenomAuthorityMetadataResponse)(nil), "osmosis.tokenfactory.v1beta1.QueryDenomAuthorityMetadataResponse") proto.RegisterType((*QueryDenomsFromCreatorRequest)(nil), "osmosis.tokenfactory.v1beta1.QueryDenomsFromCreatorRequest") proto.RegisterType((*QueryDenomsFromCreatorResponse)(nil), "osmosis.tokenfactory.v1beta1.QueryDenomsFromCreatorResponse") - proto.RegisterType((*QueryBeforeSendHookAddressRequest)(nil), "osmosis.tokenfactory.v1beta1.QueryBeforeSendHookAddressRequest") - proto.RegisterType((*QueryBeforeSendHookAddressResponse)(nil), "osmosis.tokenfactory.v1beta1.QueryBeforeSendHookAddressResponse") } func init() { @@ -403,50 +310,43 @@ func init() { } var fileDescriptor_6f22013ad0f72e3f = []byte{ - // 674 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0xcf, 0x4e, 0x13, 0x5f, - 0x14, 0xee, 0xfc, 0x7e, 0x52, 0xc3, 0xf5, 0x1f, 0x5c, 0xf1, 0x5f, 0xc5, 0xa9, 0x5c, 0x09, 0x01, - 0x83, 0x1d, 0x8b, 0x24, 0x1a, 0x91, 0x40, 0x07, 0x45, 0x13, 0x24, 0xd1, 0x71, 0xa5, 0x9b, 0xe6, - 0xb6, 0xbd, 0x94, 0x86, 0xce, 0x9c, 0x32, 0xf7, 0x16, 0x6d, 0x08, 0x1b, 0x17, 0xae, 0x4d, 0x5c, - 0xfa, 0x0e, 0x3e, 0x07, 0x4b, 0x12, 0x36, 0xae, 0x1a, 0x05, 0xe3, 0x03, 0xf4, 0x09, 0x4c, 0xef, - 0x3d, 0x45, 0xa0, 0x65, 0xd2, 0xe2, 0xaa, 0x93, 0x73, 0xbe, 0xf3, 0x9d, 0xef, 0xbb, 0xe7, 0x9c, - 0x94, 0x8c, 0x83, 0xf4, 0x41, 0x96, 0xa4, 0xa3, 0x60, 0x4d, 0x04, 0x2b, 0x3c, 0xaf, 0x20, 0xac, - 0x39, 0x1b, 0xe9, 0x9c, 0x50, 0x3c, 0xed, 0xac, 0x57, 0x45, 0x58, 0x4b, 0x55, 0x42, 0x50, 0x40, - 0x87, 0x11, 0x99, 0x3a, 0x8c, 0x4c, 0x21, 0x32, 0x31, 0x54, 0x84, 0x22, 0x68, 0xa0, 0xd3, 0xfc, - 0x32, 0x35, 0x89, 0xe1, 0x22, 0x40, 0xb1, 0x2c, 0x1c, 0x5e, 0x29, 0x39, 0x3c, 0x08, 0x40, 0x71, - 0x55, 0x82, 0x40, 0x62, 0xf6, 0x6e, 0x5e, 0x53, 0x3a, 0x39, 0x2e, 0x85, 0x69, 0x75, 0xd0, 0xb8, - 0xc2, 0x8b, 0xa5, 0x40, 0x83, 0x11, 0x3b, 0x1d, 0xa9, 0x93, 0x57, 0xd5, 0x2a, 0x84, 0x25, 0x55, - 0x5b, 0x16, 0x8a, 0x17, 0xb8, 0xe2, 0x58, 0x35, 0x11, 0x59, 0x55, 0xe1, 0x21, 0xf7, 0x51, 0x0c, - 0x1b, 0x22, 0xf4, 0x75, 0x53, 0xc2, 0x2b, 0x1d, 0xf4, 0xc4, 0x7a, 0x55, 0x48, 0xc5, 0xde, 0x92, - 0xcb, 0x47, 0xa2, 0xb2, 0x02, 0x81, 0x14, 0xd4, 0x25, 0x71, 0x53, 0x7c, 0xdd, 0xba, 0x6d, 0x8d, - 0x9f, 0x9b, 0x1a, 0x4d, 0x45, 0x3d, 0x4e, 0xca, 0x54, 0xbb, 0x67, 0xb6, 0xeb, 0xc9, 0x98, 0x87, - 0x95, 0xec, 0x25, 0x61, 0x9a, 0xfa, 0xa9, 0x08, 0xc0, 0xcf, 0x1c, 0x37, 0x80, 0x02, 0xe8, 0x18, - 0xe9, 0x2b, 0x34, 0x01, 0xba, 0x51, 0xbf, 0x3b, 0xd0, 0xa8, 0x27, 0xcf, 0xd7, 0xb8, 0x5f, 0x7e, - 0xcc, 0x74, 0x98, 0x79, 0x26, 0xcd, 0xbe, 0x59, 0xe4, 0x4e, 0x24, 0x1d, 0x2a, 0xff, 0x64, 0x11, - 0x7a, 0xf0, 0x5a, 0x59, 0x1f, 0xd3, 0x68, 0x63, 0x3a, 0xda, 0x46, 0x67, 0x6a, 0x77, 0xa4, 0x69, - 0xab, 0x51, 0x4f, 0xde, 0x30, 0xba, 0xda, 0xd9, 0x99, 0x37, 0xd8, 0x36, 0x20, 0xb6, 0x4c, 0x6e, - 0xfd, 0xd5, 0x2b, 0x17, 0x43, 0xf0, 0x17, 0x42, 0xc1, 0x15, 0x84, 0x2d, 0xe7, 0x93, 0xe4, 0x6c, - 0xde, 0x44, 0xd0, 0x3b, 0x6d, 0xd4, 0x93, 0x17, 0x4d, 0x0f, 0x4c, 0x30, 0xaf, 0x05, 0x61, 0x4b, - 0xc4, 0x3e, 0x89, 0x0e, 0x9d, 0x4f, 0x90, 0xb8, 0x7e, 0xaa, 0xe6, 0xcc, 0xfe, 0x1f, 0xef, 0x77, - 0x07, 0x1b, 0xf5, 0xe4, 0x85, 0x43, 0x4f, 0x29, 0x99, 0x87, 0x00, 0xb6, 0x44, 0x46, 0x34, 0x99, - 0x2b, 0x56, 0x20, 0x14, 0x6f, 0x44, 0x50, 0x78, 0x01, 0xb0, 0x96, 0x29, 0x14, 0x42, 0x21, 0x65, - 0xaf, 0x93, 0x29, 0xe3, 0x9c, 0x4f, 0x20, 0x43, 0x75, 0x8b, 0x64, 0xa0, 0x79, 0x0d, 0xef, 0xb9, - 0xf4, 0xb3, 0xdc, 0xe4, 0x90, 0xf8, 0x66, 0xa3, 0x9e, 0xbc, 0x86, 0xb6, 0x8f, 0x21, 0x98, 0x77, - 0xa9, 0x15, 0x42, 0xbe, 0xa9, 0xed, 0x38, 0xe9, 0xd3, 0xed, 0xe8, 0x57, 0x8b, 0xc4, 0xcd, 0xe2, - 0xd1, 0xfb, 0xd1, 0x73, 0x6d, 0xdf, 0xfb, 0x44, 0xba, 0x87, 0x0a, 0xe3, 0x80, 0x4d, 0x7e, 0xdc, - 0xfd, 0xf5, 0xe5, 0xbf, 0x31, 0x3a, 0xea, 0x74, 0x71, 0x74, 0xf4, 0xb7, 0x45, 0xae, 0x76, 0xde, - 0x27, 0x3a, 0xdf, 0x45, 0xef, 0xc8, 0xa3, 0x49, 0x64, 0xfe, 0x81, 0x01, 0xdd, 0x3c, 0xd7, 0x6e, - 0x32, 0x74, 0x2e, 0xda, 0x8d, 0x59, 0x18, 0x67, 0x53, 0xff, 0x6e, 0x39, 0xed, 0xbb, 0x4f, 0x77, - 0x2d, 0x32, 0xd8, 0xb6, 0x94, 0x74, 0xa6, 0x5b, 0x85, 0x1d, 0x2e, 0x23, 0xf1, 0xe4, 0x74, 0xc5, - 0xe8, 0x6c, 0x41, 0x3b, 0x9b, 0xa5, 0x33, 0xdd, 0x38, 0xcb, 0xae, 0x84, 0xe0, 0x67, 0xf1, 0xc8, - 0x9c, 0x4d, 0xfc, 0xd8, 0xa2, 0x3f, 0x2d, 0x72, 0xa5, 0xe3, 0x42, 0xd3, 0xb9, 0x2e, 0xc4, 0x45, - 0xdd, 0x55, 0x62, 0xfe, 0xf4, 0x04, 0xe8, 0xf0, 0x99, 0x76, 0x38, 0x47, 0x67, 0x7b, 0x9a, 0x5d, - 0x4e, 0x73, 0x66, 0xa5, 0x08, 0x0a, 0xd9, 0x55, 0x80, 0x35, 0xd7, 0xdb, 0xde, 0xb3, 0xad, 0x9d, - 0x3d, 0xdb, 0xfa, 0xb1, 0x67, 0x5b, 0x9f, 0xf7, 0xed, 0xd8, 0xce, 0xbe, 0x1d, 0xfb, 0xbe, 0x6f, - 0xc7, 0xde, 0x3d, 0x2a, 0x96, 0xd4, 0x6a, 0x35, 0x97, 0xca, 0x83, 0xdf, 0x6a, 0x71, 0xaf, 0xcc, - 0x73, 0xf2, 0xa0, 0xdf, 0x46, 0xfa, 0xa1, 0xf3, 0xe1, 0x68, 0x57, 0x55, 0xab, 0x08, 0x99, 0x8b, - 0xeb, 0x3f, 0x9b, 0x07, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x38, 0x22, 0xde, 0x2a, 0x77, 0x07, - 0x00, 0x00, + // 566 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x94, 0x41, 0x6b, 0x13, 0x41, + 0x14, 0xc7, 0x33, 0xb5, 0x46, 0x3b, 0xa2, 0x92, 0x69, 0x91, 0x1a, 0xea, 0x46, 0xc7, 0x22, 0x29, + 0xd4, 0x1d, 0xd3, 0xf6, 0x64, 0x15, 0xec, 0x56, 0xbc, 0x48, 0x40, 0x17, 0x11, 0x14, 0x21, 0x4c, + 0xd2, 0xe9, 0x36, 0xd8, 0xdd, 0x97, 0xce, 0xce, 0x8a, 0xa1, 0xf4, 0xa2, 0xe0, 0x59, 0xf0, 0xe8, + 0x77, 0xf0, 0x73, 0xf4, 0x58, 0xe8, 0xc5, 0x53, 0x90, 0xc4, 0x4f, 0x90, 0x9b, 0x78, 0x91, 0xcc, + 0x4c, 0x5a, 0xeb, 0xc6, 0x25, 0xd6, 0xdb, 0x32, 0xef, 0xff, 0xfe, 0xef, 0xfd, 0xde, 0x7b, 0x2c, + 0x2e, 0x43, 0x1c, 0x42, 0xdc, 0x8c, 0x99, 0x82, 0xd7, 0x22, 0xda, 0xe4, 0x0d, 0x05, 0xb2, 0xcd, + 0xde, 0x54, 0xea, 0x42, 0xf1, 0x0a, 0xdb, 0x49, 0x84, 0x6c, 0xbb, 0x2d, 0x09, 0x0a, 0xc8, 0x9c, + 0x55, 0xba, 0xbf, 0x2b, 0x5d, 0xab, 0x2c, 0xce, 0x04, 0x10, 0x80, 0x16, 0xb2, 0xc1, 0x97, 0xc9, + 0x29, 0xce, 0x05, 0x00, 0xc1, 0xb6, 0x60, 0xbc, 0xd5, 0x64, 0x3c, 0x8a, 0x40, 0x71, 0xd5, 0x84, + 0x28, 0xb6, 0xd1, 0x95, 0xcc, 0xda, 0x3c, 0x51, 0x5b, 0x20, 0x9b, 0xaa, 0x5d, 0x15, 0x8a, 0x6f, + 0x70, 0xc5, 0x6d, 0xd6, 0x42, 0x66, 0x56, 0x8b, 0x4b, 0x1e, 0xda, 0x02, 0x74, 0x06, 0x93, 0xa7, + 0x03, 0x82, 0x27, 0xfa, 0xd1, 0x17, 0x3b, 0x89, 0x88, 0x15, 0x7d, 0x81, 0xa7, 0x4f, 0xbc, 0xc6, + 0x2d, 0x88, 0x62, 0x41, 0x3c, 0x9c, 0x37, 0xc9, 0xb3, 0xe8, 0x3a, 0x2a, 0x5f, 0x58, 0x9a, 0x77, + 0xb3, 0x80, 0x5d, 0x93, 0xed, 0x4d, 0xee, 0x77, 0x4a, 0x39, 0xdf, 0x66, 0xd2, 0xf7, 0x08, 0x53, + 0xed, 0xfd, 0x50, 0x44, 0x10, 0xae, 0xfd, 0x49, 0x60, 0x3b, 0x20, 0x8b, 0xf8, 0x5c, 0x43, 0x0a, + 0xae, 0x40, 0xea, 0x5a, 0x53, 0x1e, 0xe9, 0x77, 0x4a, 0x97, 0xda, 0x3c, 0xdc, 0xbe, 0x4b, 0x6d, + 0x80, 0xfa, 0x43, 0x09, 0x61, 0xf8, 0x7c, 0x9c, 0xd4, 0x37, 0x06, 0x8e, 0xb3, 0x13, 0x5a, 0x3e, + 0xdd, 0xef, 0x94, 0x2e, 0x1b, 0xf9, 0x30, 0x42, 0xfd, 0x23, 0x11, 0xfd, 0x82, 0xf0, 0xcd, 0xcc, + 0x2e, 0x2c, 0xf1, 0x07, 0x84, 0xc9, 0xd1, 0x94, 0x6b, 0xa1, 0x0d, 0x5b, 0xfc, 0x95, 0x6c, 0xfc, + 0xd1, 0xd6, 0xde, 0x8d, 0xc1, 0x38, 0xfa, 0x9d, 0xd2, 0x55, 0xd3, 0x5d, 0xda, 0x9d, 0xfa, 0x85, + 0xd4, 0x62, 0x69, 0x15, 0x5f, 0x3b, 0xee, 0x37, 0x7e, 0x24, 0x21, 0x5c, 0x37, 0xec, 0xa7, 0x1a, + 0x18, 0x7d, 0x8c, 0x9d, 0xbf, 0xd9, 0x59, 0xf2, 0x05, 0x9c, 0xd7, 0xa3, 0x1a, 0xec, 0xfa, 0x4c, + 0x79, 0xca, 0x2b, 0xf4, 0x3b, 0xa5, 0x8b, 0xc6, 0xce, 0xbc, 0x53, 0xdf, 0x0a, 0x96, 0x7e, 0x4c, + 0xe2, 0xb3, 0xda, 0x8d, 0x7c, 0x46, 0x38, 0x6f, 0xb6, 0x4e, 0xee, 0x64, 0x0f, 0x27, 0x7d, 0x74, + 0xc5, 0xca, 0x3f, 0x64, 0x98, 0x26, 0xe9, 0xe2, 0xbb, 0xc3, 0xef, 0x9f, 0x26, 0x6e, 0x91, 0x79, + 0x36, 0xc6, 0xc5, 0x93, 0x9f, 0x08, 0x5f, 0x19, 0xbd, 0x14, 0xf2, 0x60, 0x8c, 0xda, 0x99, 0x07, + 0x5b, 0x5c, 0xfb, 0x0f, 0x07, 0x4b, 0xf3, 0x4a, 0xd3, 0x3c, 0x27, 0xcf, 0xb2, 0x69, 0xcc, 0xd4, + 0xd9, 0xf0, 0x79, 0xd7, 0xee, 0x74, 0x8f, 0xed, 0x0e, 0xcf, 0x7b, 0x8f, 0xa5, 0xaf, 0x8a, 0x1c, + 0x22, 0x5c, 0x48, 0xad, 0x9b, 0xac, 0x8e, 0xdb, 0xf6, 0x88, 0x9b, 0x2b, 0xde, 0x3b, 0x5d, 0xb2, + 0xc5, 0x5d, 0xd7, 0xb8, 0xf7, 0xc9, 0xea, 0x38, 0xb8, 0xb5, 0x4d, 0x09, 0x61, 0xcd, 0xa2, 0x1e, + 0x33, 0x7b, 0xd5, 0xfd, 0xae, 0x83, 0x0e, 0xba, 0x0e, 0xfa, 0xd6, 0x75, 0xd0, 0xc7, 0x9e, 0x93, + 0x3b, 0xe8, 0x39, 0xb9, 0xaf, 0x3d, 0x27, 0xf7, 0x72, 0x39, 0x68, 0xaa, 0xad, 0xa4, 0xee, 0x36, + 0x20, 0x64, 0x91, 0x48, 0x94, 0x84, 0xe8, 0x36, 0xc8, 0x60, 0xf8, 0xcd, 0xde, 0x9e, 0x2c, 0xa7, + 0xda, 0x2d, 0x11, 0xd7, 0xf3, 0xfa, 0xaf, 0xb8, 0xfc, 0x2b, 0x00, 0x00, 0xff, 0xff, 0x28, 0x2a, + 0x3f, 0xc8, 0xf4, 0x05, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -461,18 +361,10 @@ const _ = grpc.SupportPackageIsVersion4 // // 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 tokenfactory module's - // parameters. + // Params returns the total set of minting parameters. Params(ctx context.Context, in *QueryParamsRequest, opts ...grpc.CallOption) (*QueryParamsResponse, error) - // DenomAuthorityMetadata defines a gRPC query method for fetching - // DenomAuthorityMetadata for a particular denom. DenomAuthorityMetadata(ctx context.Context, in *QueryDenomAuthorityMetadataRequest, opts ...grpc.CallOption) (*QueryDenomAuthorityMetadataResponse, error) - // DenomsFromCreator defines a gRPC query method for fetching all - // denominations created by a specific admin/creator. DenomsFromCreator(ctx context.Context, in *QueryDenomsFromCreatorRequest, opts ...grpc.CallOption) (*QueryDenomsFromCreatorResponse, error) - // BeforeSendHookAddress defines a gRPC query method for - // getting the address registered for the before send hook. - BeforeSendHookAddress(ctx context.Context, in *QueryBeforeSendHookAddressRequest, opts ...grpc.CallOption) (*QueryBeforeSendHookAddressResponse, error) } type queryClient struct { @@ -510,29 +402,12 @@ func (c *queryClient) DenomsFromCreator(ctx context.Context, in *QueryDenomsFrom return out, nil } -func (c *queryClient) BeforeSendHookAddress(ctx context.Context, in *QueryBeforeSendHookAddressRequest, opts ...grpc.CallOption) (*QueryBeforeSendHookAddressResponse, error) { - out := new(QueryBeforeSendHookAddressResponse) - err := c.cc.Invoke(ctx, "/osmosis.tokenfactory.v1beta1.Query/BeforeSendHookAddress", 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 tokenfactory module's - // parameters. + // Params returns the total set of minting parameters. Params(context.Context, *QueryParamsRequest) (*QueryParamsResponse, error) - // DenomAuthorityMetadata defines a gRPC query method for fetching - // DenomAuthorityMetadata for a particular denom. DenomAuthorityMetadata(context.Context, *QueryDenomAuthorityMetadataRequest) (*QueryDenomAuthorityMetadataResponse, error) - // DenomsFromCreator defines a gRPC query method for fetching all - // denominations created by a specific admin/creator. DenomsFromCreator(context.Context, *QueryDenomsFromCreatorRequest) (*QueryDenomsFromCreatorResponse, error) - // BeforeSendHookAddress defines a gRPC query method for - // getting the address registered for the before send hook. - BeforeSendHookAddress(context.Context, *QueryBeforeSendHookAddressRequest) (*QueryBeforeSendHookAddressResponse, error) } // UnimplementedQueryServer can be embedded to have forward compatible implementations. @@ -548,9 +423,6 @@ func (*UnimplementedQueryServer) DenomAuthorityMetadata(ctx context.Context, req func (*UnimplementedQueryServer) DenomsFromCreator(ctx context.Context, req *QueryDenomsFromCreatorRequest) (*QueryDenomsFromCreatorResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method DenomsFromCreator not implemented") } -func (*UnimplementedQueryServer) BeforeSendHookAddress(ctx context.Context, req *QueryBeforeSendHookAddressRequest) (*QueryBeforeSendHookAddressResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method BeforeSendHookAddress not implemented") -} func RegisterQueryServer(s grpc1.Server, srv QueryServer) { s.RegisterService(&_Query_serviceDesc, srv) @@ -610,24 +482,6 @@ func _Query_DenomsFromCreator_Handler(srv interface{}, ctx context.Context, dec return interceptor(ctx, in, info, handler) } -func _Query_BeforeSendHookAddress_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryBeforeSendHookAddressRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(QueryServer).BeforeSendHookAddress(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/osmosis.tokenfactory.v1beta1.Query/BeforeSendHookAddress", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).BeforeSendHookAddress(ctx, req.(*QueryBeforeSendHookAddressRequest)) - } - return interceptor(ctx, in, info, handler) -} - var _Query_serviceDesc = grpc.ServiceDesc{ ServiceName: "osmosis.tokenfactory.v1beta1.Query", HandlerType: (*QueryServer)(nil), @@ -644,10 +498,6 @@ var _Query_serviceDesc = grpc.ServiceDesc{ MethodName: "DenomsFromCreator", Handler: _Query_DenomsFromCreator_Handler, }, - { - MethodName: "BeforeSendHookAddress", - Handler: _Query_BeforeSendHookAddress_Handler, - }, }, Streams: []grpc.StreamDesc{}, Metadata: "osmosis/tokenfactory/v1beta1/query.proto", @@ -729,10 +579,17 @@ func (m *QueryDenomAuthorityMetadataRequest) MarshalToSizedBuffer(dAtA []byte) ( _ = i var l int _ = l - if len(m.Denom) > 0 { - i -= len(m.Denom) - copy(dAtA[i:], m.Denom) - i = encodeVarintQuery(dAtA, i, uint64(len(m.Denom))) + if len(m.Subdenom) > 0 { + i -= len(m.Subdenom) + copy(dAtA[i:], m.Subdenom) + i = encodeVarintQuery(dAtA, i, uint64(len(m.Subdenom))) + 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 } @@ -834,66 +691,6 @@ func (m *QueryDenomsFromCreatorResponse) MarshalToSizedBuffer(dAtA []byte) (int, return len(dAtA) - i, nil } -func (m *QueryBeforeSendHookAddressRequest) 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 *QueryBeforeSendHookAddressRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *QueryBeforeSendHookAddressRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Denom) > 0 { - i -= len(m.Denom) - copy(dAtA[i:], m.Denom) - i = encodeVarintQuery(dAtA, i, uint64(len(m.Denom))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *QueryBeforeSendHookAddressResponse) 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 *QueryBeforeSendHookAddressResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *QueryBeforeSendHookAddressResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.CosmwasmAddress) > 0 { - i -= len(m.CosmwasmAddress) - copy(dAtA[i:], m.CosmwasmAddress) - i = encodeVarintQuery(dAtA, i, uint64(len(m.CosmwasmAddress))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - func encodeVarintQuery(dAtA []byte, offset int, v uint64) int { offset -= sovQuery(v) base := offset @@ -931,7 +728,11 @@ func (m *QueryDenomAuthorityMetadataRequest) Size() (n int) { } var l int _ = l - l = len(m.Denom) + l = len(m.Creator) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + l = len(m.Subdenom) if l > 0 { n += 1 + l + sovQuery(uint64(l)) } @@ -977,32 +778,6 @@ func (m *QueryDenomsFromCreatorResponse) Size() (n int) { return n } -func (m *QueryBeforeSendHookAddressRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Denom) - if l > 0 { - n += 1 + l + sovQuery(uint64(l)) - } - return n -} - -func (m *QueryBeforeSendHookAddressResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.CosmwasmAddress) - if l > 0 { - n += 1 + l + sovQuery(uint64(l)) - } - return n -} - func sovQuery(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } @@ -1173,7 +948,7 @@ func (m *QueryDenomAuthorityMetadataRequest) Unmarshal(dAtA []byte) error { switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Denom", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Creator", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -1201,144 +976,11 @@ func (m *QueryDenomAuthorityMetadataRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Denom = 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 *QueryDenomAuthorityMetadataResponse) 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: QueryDenomAuthorityMetadataResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: QueryDenomAuthorityMetadataResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field AuthorityMetadata", 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.AuthorityMetadata.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } + m.Creator = 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 *QueryDenomsFromCreatorRequest) 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: QueryDenomsFromCreatorRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: QueryDenomsFromCreatorRequest: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: + case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Creator", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Subdenom", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -1366,7 +1008,7 @@ func (m *QueryDenomsFromCreatorRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Creator = string(dAtA[iNdEx:postIndex]) + m.Subdenom = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex default: iNdEx = preIndex @@ -1389,7 +1031,7 @@ func (m *QueryDenomsFromCreatorRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryDenomsFromCreatorResponse) Unmarshal(dAtA []byte) error { +func (m *QueryDenomAuthorityMetadataResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -1412,17 +1054,17 @@ func (m *QueryDenomsFromCreatorResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryDenomsFromCreatorResponse: wiretype end group for non-group") + return fmt.Errorf("proto: QueryDenomAuthorityMetadataResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryDenomsFromCreatorResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryDenomAuthorityMetadataResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Denoms", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field AuthorityMetadata", wireType) } - var stringLen uint64 + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowQuery @@ -1432,23 +1074,24 @@ func (m *QueryDenomsFromCreatorResponse) 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.Denoms = append(m.Denoms, string(dAtA[iNdEx:postIndex])) + if err := m.AuthorityMetadata.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } iNdEx = postIndex default: iNdEx = preIndex @@ -1471,7 +1114,7 @@ func (m *QueryDenomsFromCreatorResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryBeforeSendHookAddressRequest) Unmarshal(dAtA []byte) error { +func (m *QueryDenomsFromCreatorRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -1494,15 +1137,15 @@ func (m *QueryBeforeSendHookAddressRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryBeforeSendHookAddressRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryDenomsFromCreatorRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryBeforeSendHookAddressRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryDenomsFromCreatorRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Denom", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Creator", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -1530,7 +1173,7 @@ func (m *QueryBeforeSendHookAddressRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Denom = string(dAtA[iNdEx:postIndex]) + m.Creator = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex default: iNdEx = preIndex @@ -1553,7 +1196,7 @@ func (m *QueryBeforeSendHookAddressRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryBeforeSendHookAddressResponse) Unmarshal(dAtA []byte) error { +func (m *QueryDenomsFromCreatorResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -1576,15 +1219,15 @@ func (m *QueryBeforeSendHookAddressResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryBeforeSendHookAddressResponse: wiretype end group for non-group") + return fmt.Errorf("proto: QueryDenomsFromCreatorResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryBeforeSendHookAddressResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryDenomsFromCreatorResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field CosmwasmAddress", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Denoms", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -1612,7 +1255,7 @@ func (m *QueryBeforeSendHookAddressResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.CosmwasmAddress = string(dAtA[iNdEx:postIndex]) + m.Denoms = append(m.Denoms, string(dAtA[iNdEx:postIndex])) iNdEx = postIndex default: iNdEx = preIndex diff --git a/x/tokenfactory/types/query.pb.gw.go b/x/tokenfactory/types/query.pb.gw.go index 5d75e90ba..2cfb3a2cd 100644 --- a/x/tokenfactory/types/query.pb.gw.go +++ b/x/tokenfactory/types/query.pb.gw.go @@ -62,51 +62,35 @@ func request_Query_DenomAuthorityMetadata_0(ctx context.Context, marshaler runti _ = err ) - val, ok = pathParams["denom"] + val, ok = pathParams["creator"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "denom") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "creator") } - protoReq.Denom, err = runtime.String(val) + protoReq.Creator, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "denom", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "creator", err) } - msg, err := client.DenomAuthorityMetadata(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) - return msg, metadata, err - -} - -func local_request_Query_DenomAuthorityMetadata_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryDenomAuthorityMetadataRequest - var metadata runtime.ServerMetadata - - var ( - val string - ok bool - err error - _ = err - ) - - val, ok = pathParams["denom"] + val, ok = pathParams["subdenom"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "denom") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "subdenom") } - protoReq.Denom, err = runtime.String(val) + protoReq.Subdenom, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "denom", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "subdenom", err) } - msg, err := server.DenomAuthorityMetadata(ctx, &protoReq) + msg, err := client.DenomAuthorityMetadata(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } -func request_Query_DenomsFromCreator_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryDenomsFromCreatorRequest +func local_request_Query_DenomAuthorityMetadata_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryDenomAuthorityMetadataRequest var metadata runtime.ServerMetadata var ( @@ -127,40 +111,24 @@ func request_Query_DenomsFromCreator_0(ctx context.Context, marshaler runtime.Ma return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "creator", err) } - msg, err := client.DenomsFromCreator(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) - return msg, metadata, err - -} - -func local_request_Query_DenomsFromCreator_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryDenomsFromCreatorRequest - var metadata runtime.ServerMetadata - - var ( - val string - ok bool - err error - _ = err - ) - - val, ok = pathParams["creator"] + val, ok = pathParams["subdenom"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "creator") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "subdenom") } - protoReq.Creator, err = runtime.String(val) + protoReq.Subdenom, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "creator", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "subdenom", err) } - msg, err := server.DenomsFromCreator(ctx, &protoReq) + msg, err := server.DenomAuthorityMetadata(ctx, &protoReq) return msg, metadata, err } -func request_Query_BeforeSendHookAddress_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryBeforeSendHookAddressRequest +func request_Query_DenomsFromCreator_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryDenomsFromCreatorRequest var metadata runtime.ServerMetadata var ( @@ -170,24 +138,24 @@ func request_Query_BeforeSendHookAddress_0(ctx context.Context, marshaler runtim _ = err ) - val, ok = pathParams["denom"] + val, ok = pathParams["creator"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "denom") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "creator") } - protoReq.Denom, err = runtime.String(val) + protoReq.Creator, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "denom", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "creator", err) } - msg, err := client.BeforeSendHookAddress(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + msg, err := client.DenomsFromCreator(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } -func local_request_Query_BeforeSendHookAddress_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryBeforeSendHookAddressRequest +func local_request_Query_DenomsFromCreator_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryDenomsFromCreatorRequest var metadata runtime.ServerMetadata var ( @@ -197,18 +165,18 @@ func local_request_Query_BeforeSendHookAddress_0(ctx context.Context, marshaler _ = err ) - val, ok = pathParams["denom"] + val, ok = pathParams["creator"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "denom") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "creator") } - protoReq.Denom, err = runtime.String(val) + protoReq.Creator, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "denom", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "creator", err) } - msg, err := server.BeforeSendHookAddress(ctx, &protoReq) + msg, err := server.DenomsFromCreator(ctx, &protoReq) return msg, metadata, err } @@ -288,29 +256,6 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv }) - mux.Handle("GET", pattern_Query_BeforeSendHookAddress_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_BeforeSendHookAddress_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_BeforeSendHookAddress_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - - }) - return nil } @@ -412,37 +357,15 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie }) - mux.Handle("GET", pattern_Query_BeforeSendHookAddress_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_BeforeSendHookAddress_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_BeforeSendHookAddress_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{"osmosis", "tokenfactory", "v1beta1", "params"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_DenomAuthorityMetadata_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 2, 5}, []string{"osmosis", "tokenfactory", "v1beta1", "denoms", "denom", "authority_metadata"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_DenomAuthorityMetadata_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 2, 4, 1, 0, 4, 1, 5, 5, 1, 0, 4, 1, 5, 6, 2, 7}, []string{"osmosis", "tokenfactory", "v1beta1", "denoms", "factory", "creator", "subdenom", "authority_metadata"}, "", runtime.AssumeColonVerbOpt(false))) pattern_Query_DenomsFromCreator_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"osmosis", "tokenfactory", "v1beta1", "denoms_from_creator", "creator"}, "", runtime.AssumeColonVerbOpt(false))) - - pattern_Query_BeforeSendHookAddress_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 2, 5}, []string{"osmosis", "tokenfactory", "v1beta1", "denoms", "denom", "before_send_hook"}, "", runtime.AssumeColonVerbOpt(false))) ) var ( @@ -451,6 +374,4 @@ var ( forward_Query_DenomAuthorityMetadata_0 = runtime.ForwardResponseMessage forward_Query_DenomsFromCreator_0 = runtime.ForwardResponseMessage - - forward_Query_BeforeSendHookAddress_0 = runtime.ForwardResponseMessage ) diff --git a/x/tokenfactory/types/tx.pb.go b/x/tokenfactory/types/tx.pb.go index dde9c35b6..26bcf2095 100644 --- a/x/tokenfactory/types/tx.pb.go +++ b/x/tokenfactory/types/tx.pb.go @@ -6,12 +6,14 @@ package types import ( context "context" fmt "fmt" + _ "github.com/cosmos/cosmos-proto" types "github.com/cosmos/cosmos-sdk/types" + _ "github.com/cosmos/cosmos-sdk/types/msgservice" _ "github.com/cosmos/cosmos-sdk/types/tx/amino" types1 "github.com/cosmos/cosmos-sdk/x/bank/types" - _ "github.com/gogo/protobuf/gogoproto" - grpc1 "github.com/gogo/protobuf/grpc" - proto "github.com/gogo/protobuf/proto" + _ "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" @@ -731,6 +733,105 @@ func (m *MsgForceTransferResponse) XXX_DiscardUnknown() { var xxx_messageInfo_MsgForceTransferResponse proto.InternalMessageInfo +// 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/interchainqueries 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_283b6c9a90a846b4, []int{14} +} +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_283b6c9a90a846b4, []int{15} +} +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((*MsgCreateDenom)(nil), "osmosis.tokenfactory.v1beta1.MsgCreateDenom") proto.RegisterType((*MsgCreateDenomResponse)(nil), "osmosis.tokenfactory.v1beta1.MsgCreateDenomResponse") @@ -746,6 +847,8 @@ func init() { proto.RegisterType((*MsgSetDenomMetadataResponse)(nil), "osmosis.tokenfactory.v1beta1.MsgSetDenomMetadataResponse") proto.RegisterType((*MsgForceTransfer)(nil), "osmosis.tokenfactory.v1beta1.MsgForceTransfer") proto.RegisterType((*MsgForceTransferResponse)(nil), "osmosis.tokenfactory.v1beta1.MsgForceTransferResponse") + proto.RegisterType((*MsgUpdateParams)(nil), "osmosis.tokenfactory.v1beta1.MsgUpdateParams") + proto.RegisterType((*MsgUpdateParamsResponse)(nil), "osmosis.tokenfactory.v1beta1.MsgUpdateParamsResponse") } func init() { @@ -753,63 +856,72 @@ func init() { } var fileDescriptor_283b6c9a90a846b4 = []byte{ - // 895 bytes of a gzipped FileDescriptorProto + // 1040 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x56, 0xbf, 0x6f, 0xdb, 0x46, - 0x14, 0x36, 0x93, 0xd4, 0x75, 0x2e, 0x75, 0x25, 0xd1, 0x6e, 0xa2, 0x30, 0x0e, 0x99, 0x5e, 0x91, - 0xc0, 0x2d, 0x2a, 0x12, 0x72, 0x8b, 0xfe, 0xd0, 0xd4, 0x28, 0x85, 0x91, 0xa1, 0x5a, 0x18, 0x4f, - 0x45, 0x00, 0xe1, 0x28, 0x9d, 0x68, 0x42, 0xe1, 0x9d, 0xcb, 0x3b, 0x45, 0xf1, 0x56, 0xa0, 0x5b, - 0xa7, 0x0e, 0xf9, 0x27, 0xba, 0xf5, 0x2f, 0xe8, 0x9c, 0x31, 0x40, 0x97, 0x4e, 0x84, 0x61, 0x03, - 0xed, 0xce, 0xbf, 0xa0, 0xb8, 0x1f, 0xa4, 0x44, 0x4a, 0xb0, 0xa5, 0xa1, 0xc8, 0x62, 0x98, 0x77, - 0xdf, 0xf7, 0xee, 0x7d, 0xdf, 0xbd, 0xf7, 0x4e, 0xe0, 0x21, 0x65, 0x31, 0x65, 0x11, 0xf3, 0x38, - 0x1d, 0x63, 0x32, 0x42, 0x03, 0x4e, 0x93, 0x53, 0xef, 0x65, 0x3b, 0xc0, 0x1c, 0xb5, 0x3d, 0xfe, - 0xca, 0x3d, 0x49, 0x28, 0xa7, 0xe6, 0x9e, 0x86, 0xb9, 0xf3, 0x30, 0x57, 0xc3, 0xac, 0xdd, 0x90, - 0x86, 0x54, 0x02, 0x3d, 0xf1, 0x9f, 0xe2, 0x58, 0x0d, 0x14, 0x47, 0x84, 0x7a, 0xf2, 0xaf, 0x5e, - 0xb2, 0x07, 0x32, 0x8e, 0x17, 0x20, 0x86, 0x8b, 0x43, 0x06, 0x34, 0x22, 0x0b, 0xfb, 0x64, 0x5c, - 0xec, 0x8b, 0x0f, 0xb5, 0x0f, 0x5f, 0x1b, 0xe0, 0xc3, 0x1e, 0x0b, 0x9f, 0x24, 0x18, 0x71, 0xfc, - 0x3d, 0x26, 0x34, 0x36, 0x3f, 0x05, 0x9b, 0x0c, 0x93, 0x21, 0x4e, 0x9a, 0xc6, 0x03, 0x63, 0xff, - 0x66, 0xb7, 0x91, 0xa5, 0xce, 0xf6, 0x29, 0x8a, 0x5f, 0x74, 0xa0, 0x5a, 0x87, 0xbe, 0x06, 0x98, - 0x1e, 0xd8, 0x62, 0x93, 0x60, 0x28, 0x68, 0xcd, 0x6b, 0x12, 0xbc, 0x93, 0xa5, 0x4e, 0x4d, 0x83, - 0xf5, 0x0e, 0xf4, 0x0b, 0x50, 0xe7, 0xd1, 0xaf, 0xff, 0xfe, 0xf1, 0xd9, 0xc7, 0x4b, 0x1d, 0x1a, - 0xc8, 0x14, 0x5a, 0x8a, 0xf2, 0x1c, 0xdc, 0x2e, 0x67, 0xe5, 0x63, 0x76, 0x42, 0x09, 0xc3, 0x66, - 0x17, 0xd4, 0x08, 0x9e, 0xf6, 0x25, 0xb5, 0xaf, 0x4e, 0x56, 0x69, 0x5a, 0x59, 0xea, 0xdc, 0x56, - 0x27, 0x57, 0x00, 0xd0, 0xdf, 0x26, 0x78, 0x7a, 0x24, 0x16, 0x64, 0x2c, 0x78, 0x66, 0x80, 0xf7, - 0x7b, 0x2c, 0xec, 0x45, 0x84, 0xaf, 0xa3, 0xf6, 0x29, 0xd8, 0x44, 0x31, 0x9d, 0x10, 0x2e, 0xb5, - 0xde, 0x3a, 0xb8, 0xeb, 0x2a, 0x73, 0x5d, 0x61, 0x7e, 0x7e, 0x75, 0xee, 0x13, 0x1a, 0x91, 0xee, - 0x47, 0x6f, 0x52, 0x67, 0x63, 0x16, 0x49, 0xd1, 0xa0, 0xaf, 0xf9, 0xe6, 0x77, 0x60, 0x3b, 0x8e, - 0x08, 0x3f, 0xa2, 0x8f, 0x87, 0xc3, 0x04, 0x33, 0xd6, 0xbc, 0x5e, 0x95, 0x20, 0xb6, 0xfb, 0x9c, - 0xf6, 0x91, 0x02, 0x40, 0xbf, 0x4c, 0xe8, 0xd8, 0xc2, 0xc8, 0xbb, 0x4b, 0x8d, 0x14, 0x40, 0xd8, - 0x00, 0x35, 0xad, 0x30, 0x77, 0x0e, 0xfe, 0xa3, 0x54, 0x77, 0x27, 0x09, 0x79, 0x37, 0xaa, 0x0f, - 0x41, 0x2d, 0x98, 0x24, 0xe4, 0x30, 0xa1, 0x71, 0x59, 0xf7, 0x5e, 0x96, 0x3a, 0x4d, 0xc5, 0x11, - 0x80, 0xfe, 0x28, 0xa1, 0xf1, 0x4c, 0x79, 0x95, 0x74, 0x99, 0x76, 0x01, 0xd5, 0xda, 0x85, 0xce, - 0x42, 0xfb, 0x9f, 0xba, 0xcc, 0x8f, 0x11, 0x09, 0xf1, 0xe3, 0x61, 0x1c, 0xad, 0x65, 0xc1, 0x23, - 0xf0, 0xde, 0x7c, 0x8d, 0xd7, 0xb3, 0xd4, 0xf9, 0x40, 0x21, 0x75, 0x7d, 0xa9, 0x6d, 0xb3, 0x0d, - 0x6e, 0x8a, 0xd2, 0x43, 0x22, 0xbe, 0x96, 0xb6, 0x9b, 0xa5, 0x4e, 0x7d, 0x56, 0x95, 0x72, 0x0b, - 0xfa, 0x5b, 0x04, 0x4f, 0x65, 0x16, 0x97, 0x36, 0x84, 0x4c, 0xb6, 0xa5, 0x28, 0x4d, 0xd5, 0x10, - 0xb3, 0xfc, 0x0b, 0x69, 0x67, 0x06, 0xd8, 0xed, 0xb1, 0xf0, 0x19, 0xe6, 0x5d, 0x3c, 0xa2, 0x09, - 0x7e, 0x86, 0xc9, 0xf0, 0x29, 0xa5, 0xe3, 0xff, 0x43, 0xe0, 0x21, 0xa8, 0x8b, 0xcb, 0x9f, 0x22, - 0x56, 0xdc, 0x8f, 0xd6, 0x79, 0x2f, 0x4b, 0x9d, 0x3b, 0x8a, 0x52, 0x45, 0x40, 0xbf, 0x96, 0x2f, - 0xe5, 0x37, 0xd8, 0x12, 0xaa, 0xf7, 0x97, 0xaa, 0x66, 0x98, 0xb7, 0x02, 0x29, 0x44, 0xe4, 0xd6, - 0x3a, 0xa6, 0x74, 0x0c, 0x6d, 0xb0, 0xb7, 0x4c, 0x61, 0x61, 0xc1, 0x6b, 0x03, 0xec, 0x28, 0x80, - 0xec, 0xef, 0x1e, 0xe6, 0x68, 0x88, 0x38, 0x5a, 0xc7, 0x01, 0x1f, 0x6c, 0xc5, 0x9a, 0xa6, 0xeb, - 0xfc, 0xfe, 0xac, 0xce, 0xc9, 0xb8, 0xa8, 0xf3, 0x3c, 0x76, 0xf7, 0x8e, 0xae, 0x75, 0x3d, 0xec, - 0x72, 0x32, 0xf4, 0x8b, 0x38, 0xf0, 0x3e, 0xb8, 0xb7, 0x24, 0xab, 0x22, 0xeb, 0xbf, 0xae, 0x81, - 0x7a, 0x8f, 0x85, 0x87, 0x34, 0x19, 0xe0, 0xa3, 0x04, 0x11, 0x36, 0xc2, 0xc9, 0xbb, 0x69, 0x4c, - 0x1f, 0xec, 0x70, 0x9d, 0xc0, 0x62, 0x73, 0x3e, 0xc8, 0x52, 0x67, 0x4f, 0xf1, 0x72, 0x50, 0xa5, - 0x41, 0x97, 0x91, 0xcd, 0x1f, 0x40, 0x23, 0x5f, 0x9e, 0x8d, 0xb9, 0x1b, 0x32, 0xa2, 0x9d, 0xa5, - 0x8e, 0x55, 0x89, 0x38, 0x3f, 0xea, 0x16, 0x89, 0x9d, 0x7d, 0x51, 0x30, 0x9f, 0x2c, 0x2d, 0x98, - 0x91, 0xf0, 0xaf, 0x95, 0x53, 0xa0, 0x05, 0x9a, 0x55, 0x53, 0x73, 0xc7, 0x0f, 0x7e, 0xdf, 0x04, - 0xd7, 0x7b, 0x2c, 0x34, 0x7f, 0x02, 0xb7, 0xe6, 0x1f, 0xbc, 0xcf, 0xdd, 0xcb, 0xde, 0x62, 0xb7, - 0xfc, 0x10, 0x59, 0x5f, 0xae, 0x83, 0x2e, 0x9e, 0xad, 0xe7, 0xe0, 0x86, 0x7c, 0x6e, 0x1e, 0x5e, - 0xc9, 0x16, 0x30, 0xab, 0xb5, 0x12, 0x6c, 0x3e, 0xba, 0x1c, 0xeb, 0x57, 0x47, 0x17, 0xb0, 0x15, - 0xa2, 0xcf, 0x0f, 0x4f, 0x69, 0xd7, 0xdc, 0xe0, 0x5c, 0xc1, 0xae, 0x19, 0x7a, 0x15, 0xbb, 0x16, - 0x87, 0x9a, 0xf9, 0xb3, 0x01, 0xea, 0x0b, 0xed, 0xdc, 0xbe, 0x32, 0x54, 0x95, 0x62, 0x7d, 0xbb, - 0x36, 0xa5, 0x48, 0xe1, 0x17, 0x03, 0x34, 0x16, 0x87, 0xea, 0xc1, 0x2a, 0x01, 0xcb, 0x1c, 0xab, - 0xb3, 0x3e, 0xa7, 0xc8, 0x62, 0x0a, 0xb6, 0xcb, 0x03, 0xc2, 0xbd, 0x32, 0x58, 0x09, 0x6f, 0x7d, - 0xb5, 0x1e, 0x3e, 0x3f, 0xb8, 0xeb, 0xbf, 0x39, 0xb7, 0x8d, 0xb7, 0xe7, 0xb6, 0x71, 0x76, 0x6e, - 0x1b, 0xbf, 0x5d, 0xd8, 0x1b, 0x6f, 0x2f, 0xec, 0x8d, 0xbf, 0x2f, 0xec, 0x8d, 0x1f, 0xbf, 0x09, - 0x23, 0x7e, 0x3c, 0x09, 0xdc, 0x01, 0x8d, 0x3d, 0x1d, 0xbb, 0xf5, 0x02, 0x05, 0x2c, 0xff, 0xf0, - 0x5e, 0xb6, 0xbf, 0xf6, 0x5e, 0x95, 0x9b, 0x94, 0x9f, 0x9e, 0x60, 0x16, 0x6c, 0xca, 0xdf, 0x9c, - 0x5f, 0xfc, 0x17, 0x00, 0x00, 0xff, 0xff, 0xba, 0xea, 0x73, 0xcf, 0x23, 0x0b, 0x00, 0x00, + 0x14, 0x36, 0x93, 0xd4, 0xb1, 0x2f, 0x71, 0x6d, 0xd3, 0x6e, 0x2c, 0x33, 0x0e, 0x99, 0xb2, 0x4d, + 0xe0, 0x18, 0x95, 0x08, 0x3b, 0x69, 0x80, 0x6a, 0x6a, 0x94, 0xc2, 0xcd, 0x50, 0x01, 0x05, 0xed, + 0x2e, 0x45, 0x00, 0xe1, 0x24, 0x9d, 0x28, 0x42, 0xe5, 0x9d, 0x72, 0x77, 0x8a, 0xe2, 0xad, 0x68, + 0xb7, 0x4e, 0x1d, 0xb2, 0x77, 0xed, 0xe8, 0xa1, 0x73, 0x67, 0x8f, 0x41, 0xbb, 0x74, 0x22, 0x0c, + 0x1b, 0xa8, 0x77, 0xfd, 0x05, 0xc5, 0xfd, 0x20, 0x25, 0x51, 0x82, 0x7e, 0x0c, 0x45, 0x16, 0x89, + 0xbc, 0xf7, 0x7d, 0xef, 0xde, 0xf7, 0xee, 0xdd, 0x7b, 0x04, 0x0f, 0x08, 0x8b, 0x08, 0x0b, 0x99, + 0xc7, 0x49, 0x0b, 0xe1, 0x06, 0xac, 0x71, 0x42, 0x4f, 0xbc, 0xd7, 0xfb, 0x55, 0xc4, 0xe1, 0xbe, + 0xc7, 0xdf, 0x14, 0xda, 0x94, 0x70, 0x62, 0xee, 0x68, 0x58, 0x61, 0x10, 0x56, 0xd0, 0x30, 0xeb, + 0xd1, 0x44, 0x27, 0x6d, 0x48, 0x61, 0xc4, 0x94, 0x23, 0x6b, 0x33, 0x20, 0x01, 0x91, 0x8f, 0x9e, + 0x78, 0xd2, 0xab, 0x76, 0x4d, 0x7a, 0xf0, 0xaa, 0x90, 0xa1, 0x94, 0x57, 0x23, 0x21, 0xd6, 0xf6, + 0x2d, 0x6d, 0x8f, 0x58, 0xe0, 0xbd, 0xde, 0x17, 0x7f, 0xda, 0xb0, 0xad, 0x0c, 0x15, 0xe5, 0x51, + 0xbd, 0x68, 0xd3, 0x3a, 0x8c, 0x42, 0x4c, 0x3c, 0xf9, 0x3b, 0xb2, 0x0d, 0x6e, 0xa5, 0xdb, 0x88, + 0x17, 0x65, 0x77, 0xdf, 0x1a, 0xe0, 0xc3, 0x32, 0x0b, 0x9e, 0x53, 0x04, 0x39, 0xfa, 0x0a, 0x61, + 0x12, 0x99, 0x8f, 0xc0, 0x22, 0x43, 0xb8, 0x8e, 0x68, 0xce, 0xb8, 0x6f, 0xec, 0x2e, 0x97, 0xd6, + 0x7b, 0xb1, 0xb3, 0x72, 0x02, 0xa3, 0x1f, 0x8a, 0xae, 0x5a, 0x77, 0x7d, 0x0d, 0x30, 0x3d, 0xb0, + 0xc4, 0x3a, 0xd5, 0xba, 0xa0, 0xe5, 0xae, 0x49, 0xf0, 0x46, 0x2f, 0x76, 0x56, 0x35, 0x58, 0x5b, + 0x5c, 0x3f, 0x05, 0x15, 0x1f, 0xfe, 0x72, 0x75, 0xba, 0xf7, 0xf1, 0xd8, 0xdc, 0xd5, 0x64, 0x08, + 0x79, 0x45, 0x79, 0x09, 0xee, 0x0c, 0x47, 0xe5, 0x23, 0xd6, 0x26, 0x98, 0x21, 0xb3, 0x04, 0x56, + 0x31, 0xea, 0x56, 0x24, 0xb5, 0xa2, 0x76, 0x56, 0x61, 0x5a, 0xbd, 0xd8, 0xb9, 0xa3, 0x76, 0xce, + 0x00, 0x5c, 0x7f, 0x05, 0xa3, 0xee, 0xb1, 0x58, 0x90, 0xbe, 0xdc, 0x73, 0x03, 0xdc, 0x2c, 0xb3, + 0xa0, 0x1c, 0x62, 0x3e, 0x8f, 0xda, 0x17, 0x60, 0x11, 0x46, 0xa4, 0x83, 0xb9, 0xd4, 0x7a, 0xeb, + 0x60, 0xbb, 0xa0, 0xb3, 0x2f, 0xce, 0x30, 0xa9, 0x8c, 0xc2, 0x73, 0x12, 0xe2, 0xd2, 0x47, 0x67, + 0xb1, 0xb3, 0xd0, 0xf7, 0xa4, 0x68, 0xae, 0xaf, 0xf9, 0xe6, 0x97, 0x60, 0x25, 0x0a, 0x31, 0x3f, + 0x26, 0xcf, 0xea, 0x75, 0x8a, 0x18, 0xcb, 0x5d, 0xcf, 0x4a, 0x10, 0xe6, 0x0a, 0x27, 0x15, 0xa8, + 0x00, 0xae, 0x3f, 0x4c, 0x28, 0xda, 0x22, 0x91, 0xdb, 0x63, 0x13, 0x29, 0x80, 0xee, 0x3a, 0x58, + 0xd5, 0x0a, 0x93, 0xcc, 0xb9, 0xff, 0x2a, 0xd5, 0xa5, 0x0e, 0xc5, 0xef, 0x47, 0xf5, 0x21, 0x58, + 0xad, 0x76, 0x28, 0x3e, 0xa4, 0x24, 0x1a, 0xd6, 0xbd, 0xd3, 0x8b, 0x9d, 0x9c, 0xe2, 0x08, 0x40, + 0xa5, 0x41, 0x49, 0xd4, 0x57, 0x9e, 0x25, 0x4d, 0xd2, 0x2e, 0xa0, 0x5a, 0xbb, 0xd0, 0x99, 0x6a, + 0xff, 0x53, 0x97, 0x79, 0x13, 0xe2, 0x00, 0x3d, 0xab, 0x47, 0xe1, 0x5c, 0x29, 0x78, 0x08, 0x3e, + 0x18, 0xac, 0xf1, 0xb5, 0x5e, 0xec, 0xdc, 0x56, 0x48, 0x5d, 0x5f, 0xca, 0x6c, 0xee, 0x83, 0x65, + 0x51, 0x7a, 0x50, 0xf8, 0xd7, 0xd2, 0x36, 0x7b, 0xb1, 0xb3, 0xd6, 0xaf, 0x4a, 0x69, 0x72, 0xfd, + 0x25, 0x8c, 0xba, 0x32, 0x8a, 0x89, 0x17, 0x42, 0x06, 0x9b, 0x57, 0x94, 0x9c, 0xba, 0x10, 0xfd, + 0xf8, 0x53, 0x69, 0xe7, 0x06, 0xd8, 0x2c, 0xb3, 0xe0, 0x08, 0xf1, 0x12, 0x6a, 0x10, 0x8a, 0x8e, + 0x10, 0xae, 0xbf, 0x20, 0xa4, 0xf5, 0x7f, 0x08, 0x3c, 0x04, 0x6b, 0xe2, 0xf0, 0xbb, 0x90, 0xa5, + 0xe7, 0xa3, 0x75, 0xde, 0xed, 0xc5, 0xce, 0x96, 0xa2, 0x64, 0x11, 0xae, 0xbf, 0x9a, 0x2c, 0x25, + 0x27, 0x98, 0x17, 0xaa, 0x77, 0xc7, 0xaa, 0x66, 0x88, 0xe7, 0xab, 0x52, 0x88, 0x88, 0x2d, 0xdf, + 0x24, 0xa4, 0xe5, 0xda, 0x60, 0x67, 0x9c, 0xc2, 0x34, 0x05, 0x6f, 0x0d, 0xb0, 0xa1, 0x00, 0xf2, + 0x7e, 0x97, 0x11, 0x87, 0x75, 0xc8, 0xe1, 0x3c, 0x19, 0xf0, 0xc1, 0x52, 0xa4, 0x69, 0xba, 0xce, + 0xef, 0xf5, 0xeb, 0x1c, 0xb7, 0xd2, 0x3a, 0x4f, 0x7c, 0x97, 0xb6, 0x74, 0xad, 0xeb, 0x66, 0x97, + 0x90, 0x5d, 0x3f, 0xf5, 0xe3, 0xde, 0x03, 0x77, 0xc7, 0x44, 0x95, 0x46, 0xfd, 0xf7, 0x35, 0xb0, + 0x56, 0x66, 0xc1, 0x21, 0xa1, 0x35, 0x74, 0x4c, 0x21, 0x66, 0x0d, 0x44, 0xdf, 0xcf, 0xc5, 0xf4, + 0xc1, 0x06, 0xd7, 0x01, 0x8c, 0x5e, 0xce, 0xfb, 0xbd, 0xd8, 0xd9, 0x51, 0xbc, 0x04, 0x94, 0xb9, + 0xa0, 0xe3, 0xc8, 0xe6, 0x37, 0x60, 0x3d, 0x59, 0xee, 0xb7, 0xb9, 0x1b, 0xd2, 0xa3, 0xdd, 0x8b, + 0x1d, 0x2b, 0xe3, 0x71, 0xb0, 0xd5, 0x8d, 0x12, 0x8b, 0xbb, 0xa2, 0x60, 0x3e, 0x19, 0x5b, 0x30, + 0x0d, 0x91, 0xbf, 0x7c, 0x42, 0x71, 0x2d, 0x90, 0xcb, 0x26, 0x35, 0xcd, 0xf8, 0x99, 0x21, 0x3b, + 0xc3, 0x77, 0xed, 0x3a, 0xe4, 0xe8, 0x5b, 0x39, 0xa3, 0xcd, 0xa7, 0x60, 0x19, 0x76, 0x78, 0x93, + 0xd0, 0x90, 0x9f, 0xe8, 0x9c, 0xe7, 0xfe, 0xfa, 0x23, 0xbf, 0xa9, 0x73, 0xa9, 0x03, 0x38, 0xe2, + 0x34, 0xc4, 0x81, 0xdf, 0x87, 0x9a, 0x5f, 0x83, 0x45, 0x35, 0xe5, 0x75, 0xf6, 0x3f, 0x2d, 0x4c, + 0xfa, 0x5e, 0x28, 0xa8, 0xdd, 0x4a, 0xcb, 0xe2, 0x20, 0x7e, 0xbf, 0x3a, 0xdd, 0x33, 0x7c, 0x4d, + 0x2f, 0x3e, 0xf9, 0xe9, 0xea, 0x74, 0xaf, 0xef, 0x58, 0xf6, 0x83, 0x10, 0x73, 0x44, 0x6b, 0x4d, + 0x18, 0xe2, 0x57, 0x1d, 0x44, 0x43, 0xc4, 0xbc, 0x4c, 0xd8, 0xee, 0x36, 0xd8, 0xca, 0x2c, 0x25, + 0x2a, 0x0f, 0x7e, 0xbb, 0x09, 0xae, 0x97, 0x59, 0x60, 0xbe, 0x02, 0xb7, 0x06, 0xc7, 0xfa, 0x67, + 0x93, 0x03, 0x1c, 0x1e, 0xb7, 0xd6, 0x93, 0x79, 0xd0, 0xe9, 0x70, 0x7e, 0x09, 0x6e, 0xc8, 0xa1, + 0xfa, 0x60, 0x2a, 0x5b, 0xc0, 0xac, 0xfc, 0x4c, 0xb0, 0x41, 0xef, 0x72, 0x78, 0x4d, 0xf7, 0x2e, + 0x60, 0x33, 0x78, 0x1f, 0x1c, 0x11, 0x32, 0x5d, 0x03, 0xe3, 0x61, 0x86, 0x74, 0xf5, 0xd1, 0xb3, + 0xa4, 0x6b, 0xb4, 0x75, 0x9b, 0x3f, 0x1a, 0x60, 0x6d, 0xa4, 0x69, 0xed, 0x4f, 0x75, 0x95, 0xa5, + 0x58, 0x5f, 0xcc, 0x4d, 0x49, 0x43, 0xf8, 0xd9, 0x00, 0xeb, 0xa3, 0xa3, 0xe3, 0x60, 0x16, 0x87, + 0xc3, 0x1c, 0xab, 0x38, 0x3f, 0x27, 0x8d, 0xa2, 0x0b, 0x56, 0x86, 0xdb, 0x60, 0x61, 0xaa, 0xb3, + 0x21, 0xbc, 0xf5, 0x74, 0x3e, 0x7c, 0xba, 0x31, 0x07, 0xb7, 0x87, 0xba, 0xc1, 0xf4, 0x9a, 0x19, + 0x84, 0x5b, 0x9f, 0xcf, 0x05, 0x4f, 0x76, 0x2d, 0x95, 0xcf, 0x2e, 0x6c, 0xe3, 0xdd, 0x85, 0x6d, + 0x9c, 0x5f, 0xd8, 0xc6, 0xaf, 0x97, 0xf6, 0xc2, 0xbb, 0x4b, 0x7b, 0xe1, 0x9f, 0x4b, 0x7b, 0xe1, + 0xfb, 0xc7, 0x41, 0xc8, 0x9b, 0x9d, 0x6a, 0xa1, 0x46, 0x22, 0x0f, 0xa3, 0x0e, 0xa7, 0x04, 0xe7, + 0x09, 0x0d, 0x92, 0x67, 0xef, 0xcd, 0x70, 0xef, 0xe3, 0x27, 0x6d, 0xc4, 0xaa, 0x8b, 0xf2, 0x53, + 0xfe, 0xf1, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x82, 0xd8, 0xa2, 0x17, 0xd9, 0x0c, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -831,6 +943,7 @@ type MsgClient interface { SetDenomMetadata(ctx context.Context, in *MsgSetDenomMetadata, opts ...grpc.CallOption) (*MsgSetDenomMetadataResponse, error) SetBeforeSendHook(ctx context.Context, in *MsgSetBeforeSendHook, opts ...grpc.CallOption) (*MsgSetBeforeSendHookResponse, error) ForceTransfer(ctx context.Context, in *MsgForceTransfer, opts ...grpc.CallOption) (*MsgForceTransferResponse, error) + UpdateParams(ctx context.Context, in *MsgUpdateParams, opts ...grpc.CallOption) (*MsgUpdateParamsResponse, error) } type msgClient struct { @@ -904,6 +1017,15 @@ func (c *msgClient) ForceTransfer(ctx context.Context, in *MsgForceTransfer, opt return out, nil } +func (c *msgClient) UpdateParams(ctx context.Context, in *MsgUpdateParams, opts ...grpc.CallOption) (*MsgUpdateParamsResponse, error) { + out := new(MsgUpdateParamsResponse) + err := c.cc.Invoke(ctx, "/osmosis.tokenfactory.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 { CreateDenom(context.Context, *MsgCreateDenom) (*MsgCreateDenomResponse, error) @@ -913,6 +1035,7 @@ type MsgServer interface { SetDenomMetadata(context.Context, *MsgSetDenomMetadata) (*MsgSetDenomMetadataResponse, error) SetBeforeSendHook(context.Context, *MsgSetBeforeSendHook) (*MsgSetBeforeSendHookResponse, error) ForceTransfer(context.Context, *MsgForceTransfer) (*MsgForceTransferResponse, error) + UpdateParams(context.Context, *MsgUpdateParams) (*MsgUpdateParamsResponse, error) } // UnimplementedMsgServer can be embedded to have forward compatible implementations. @@ -940,6 +1063,9 @@ func (*UnimplementedMsgServer) SetBeforeSendHook(ctx context.Context, req *MsgSe func (*UnimplementedMsgServer) ForceTransfer(ctx context.Context, req *MsgForceTransfer) (*MsgForceTransferResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ForceTransfer not implemented") } +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) @@ -1071,6 +1197,24 @@ func _Msg_ForceTransfer_Handler(srv interface{}, ctx context.Context, dec func(i return interceptor(ctx, in, info, handler) } +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: "/osmosis.tokenfactory.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: "osmosis.tokenfactory.v1beta1.Msg", HandlerType: (*MsgServer)(nil), @@ -1103,6 +1247,10 @@ var _Msg_serviceDesc = grpc.ServiceDesc{ MethodName: "ForceTransfer", Handler: _Msg_ForceTransfer_Handler, }, + { + MethodName: "UpdateParams", + Handler: _Msg_UpdateParams_Handler, + }, }, Streams: []grpc.StreamDesc{}, Metadata: "osmosis/tokenfactory/v1beta1/tx.proto", @@ -1589,6 +1737,69 @@ func (m *MsgForceTransferResponse) MarshalToSizedBuffer(dAtA []byte) (int, error return len(dAtA) - i, nil } +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 @@ -1802,6 +2013,30 @@ func (m *MsgForceTransferResponse) Size() (n int) { return n } +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 } @@ -3184,6 +3419,171 @@ func (m *MsgForceTransferResponse) Unmarshal(dAtA []byte) error { } return nil } +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 From c80ed882ea03f3078551a2839bc7264cc300c0aa Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Thu, 31 Aug 2023 17:00:52 +0400 Subject: [PATCH 075/307] update keeper --- x/tokenfactory/keeper/admins.go | 2 +- x/tokenfactory/keeper/admins_test.go | 19 ++-- x/tokenfactory/keeper/bankactions.go | 20 ++++ x/tokenfactory/keeper/before_send.go | 2 +- x/tokenfactory/keeper/createdenom.go | 75 ++++++--------- x/tokenfactory/keeper/createdenom_test.go | 11 +-- x/tokenfactory/keeper/genesis.go | 8 +- x/tokenfactory/keeper/genesis_test.go | 3 +- x/tokenfactory/keeper/grpc_query.go | 15 ++- x/tokenfactory/keeper/keeper.go | 28 ++---- x/tokenfactory/keeper/keeper_test.go | 7 +- x/tokenfactory/keeper/msg_server.go | 108 +++++++++++++++++++++- 12 files changed, 189 insertions(+), 109 deletions(-) diff --git a/x/tokenfactory/keeper/admins.go b/x/tokenfactory/keeper/admins.go index 243ece8c3..744662656 100644 --- a/x/tokenfactory/keeper/admins.go +++ b/x/tokenfactory/keeper/admins.go @@ -37,7 +37,7 @@ func (k Keeper) setAuthorityMetadata(ctx sdk.Context, denom string, metadata typ return nil } -func (k Keeper) setAdmin(ctx sdk.Context, denom, admin string) error { +func (k Keeper) setAdmin(ctx sdk.Context, denom string, admin string) error { metadata, err := k.GetAuthorityMetadata(ctx, denom) if err != nil { return err diff --git a/x/tokenfactory/keeper/admins_test.go b/x/tokenfactory/keeper/admins_test.go index a001c1102..0828ffcef 100644 --- a/x/tokenfactory/keeper/admins_test.go +++ b/x/tokenfactory/keeper/admins_test.go @@ -2,7 +2,6 @@ package keeper_test import ( "fmt" - "strings" sdk "github.com/cosmos/cosmos-sdk/types" @@ -16,10 +15,9 @@ func (suite *KeeperTestSuite) TestAdminMsgs() { suite.Setup() suite.CreateDefaultDenom(suite.ChainA.GetContext()) // Make sure that the admin is set correctly - denom := strings.Split(suite.defaultDenom, "/") + //denom := strings.Split(suite.defaultDenom, "/") queryRes, err := suite.queryClient.DenomAuthorityMetadata(suite.ChainA.GetContext().Context(), &types.QueryDenomAuthorityMetadataRequest{ - Creator: denom[1], - Subdenom: denom[2], + Denom: suite.defaultDenom, }) suite.Require().NoError(err) suite.Require().Equal(suite.TestAccs[0].String(), queryRes.AuthorityMetadata.Admin) @@ -40,10 +38,9 @@ func (suite *KeeperTestSuite) TestAdminMsgs() { // Test Change Admin _, err = suite.msgServer.ChangeAdmin(sdk.WrapSDKContext(suite.ChainA.GetContext()), types.NewMsgChangeAdmin(suite.TestAccs[0].String(), suite.defaultDenom, suite.TestAccs[1].String())) suite.Require().NoError(err) - denom = strings.Split(suite.defaultDenom, "/") + //denom = strings.Split(suite.defaultDenom, "/") queryRes, err = suite.queryClient.DenomAuthorityMetadata(suite.ChainA.GetContext().Context(), &types.QueryDenomAuthorityMetadataRequest{ - Creator: denom[1], - Subdenom: denom[2], + Denom: suite.defaultDenom, }) suite.Require().NoError(err) suite.Require().Equal(suite.TestAccs[1].String(), queryRes.AuthorityMetadata.Admin) @@ -61,10 +58,8 @@ func (suite *KeeperTestSuite) TestAdminMsgs() { // Try setting admin to empty _, err = suite.msgServer.ChangeAdmin(sdk.WrapSDKContext(suite.ChainA.GetContext()), types.NewMsgChangeAdmin(suite.TestAccs[1].String(), suite.defaultDenom, "")) suite.Require().NoError(err) - denom = strings.Split(suite.defaultDenom, "/") queryRes, err = suite.queryClient.DenomAuthorityMetadata(suite.ChainA.GetContext().Context(), &types.QueryDenomAuthorityMetadataRequest{ - Creator: denom[1], - Subdenom: denom[2], + Denom: suite.defaultDenom, }) suite.Require().NoError(err) suite.Require().Equal("", queryRes.AuthorityMetadata.Admin) @@ -251,10 +246,8 @@ func (suite *KeeperTestSuite) TestChangeAdminDenom() { suite.Require().Error(err) } - denom := strings.Split(testDenom, "/") queryRes, err := suite.queryClient.DenomAuthorityMetadata(suite.ChainA.GetContext().Context(), &types.QueryDenomAuthorityMetadataRequest{ - Creator: denom[1], - Subdenom: denom[2], + Denom: testDenom, }) suite.Require().NoError(err) diff --git a/x/tokenfactory/keeper/bankactions.go b/x/tokenfactory/keeper/bankactions.go index bdfe72d86..6cf9309d9 100644 --- a/x/tokenfactory/keeper/bankactions.go +++ b/x/tokenfactory/keeper/bankactions.go @@ -50,3 +50,23 @@ func (k Keeper) burnFrom(ctx sdk.Context, amount sdk.Coin, burnFrom string) erro return k.bankKeeper.BurnCoins(ctx, types.ModuleName, sdk.NewCoins(amount)) } + +func (k Keeper) forceTransfer(ctx sdk.Context, amount sdk.Coin, fromAddr string, toAddr string) error { + // verify that denom is an x/tokenfactory denom + _, _, err := types.DeconstructDenom(amount.Denom) + if err != nil { + return err + } + + fromSdkAddr, err := sdk.AccAddressFromBech32(fromAddr) + if err != nil { + return err + } + + toSdkAddr, err := sdk.AccAddressFromBech32(toAddr) + if err != nil { + return err + } + + return k.bankKeeper.SendCoins(ctx, fromSdkAddr, toSdkAddr, sdk.NewCoins(amount)) +} diff --git a/x/tokenfactory/keeper/before_send.go b/x/tokenfactory/keeper/before_send.go index bfe4d36e8..c8654130a 100644 --- a/x/tokenfactory/keeper/before_send.go +++ b/x/tokenfactory/keeper/before_send.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v17/x/tokenfactory/types" + "github.com/neutron-org/neutron/x/tokenfactory/types" errorsmod "cosmossdk.io/errors" wasmvmtypes "github.com/CosmWasm/wasmvm/types" diff --git a/x/tokenfactory/keeper/createdenom.go b/x/tokenfactory/keeper/createdenom.go index 06ee2a072..37b4cdec5 100644 --- a/x/tokenfactory/keeper/createdenom.go +++ b/x/tokenfactory/keeper/createdenom.go @@ -3,61 +3,57 @@ package keeper import ( "fmt" - "cosmossdk.io/errors" - sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" "github.com/neutron-org/neutron/x/tokenfactory/types" ) -// CreateDenom creates new denom with `factory/{creatorAddr}/{subdenom}` name. -// Charges creatorAddr fee for creation -func (k Keeper) CreateDenom(ctx sdk.Context, creatorAddr, subdenom string) (newTokenDenom string, err error) { - err = k.chargeFeeForDenomCreation(ctx, creatorAddr) - if err != nil { - return "", errors.Wrapf(types.ErrUnableToCharge, "denom fee collection error: %v", err) - } - +// ConvertToBaseToken converts a fee amount in a whitelisted fee token to the base fee token amount +func (k Keeper) CreateDenom(ctx sdk.Context, creatorAddr string, subdenom string) (newTokenDenom string, err error) { denom, err := k.validateCreateDenom(ctx, creatorAddr, subdenom) if err != nil { - return "", errors.Wrapf(types.ErrInvalidDenom, "denom validation error: %v", err) + return "", err } - err = k.createDenomAfterValidation(ctx, creatorAddr, denom) + err = k.chargeForCreateDenom(ctx, creatorAddr) if err != nil { - return "", errors.Wrap(err, "create denom after validation error") + return "", err } - return denom, nil + err = k.createDenomAfterValidation(ctx, creatorAddr, denom) + return denom, err } // Runs CreateDenom logic after the charge and all denom validation has been handled. // Made into a second function for genesis initialization. -func (k Keeper) createDenomAfterValidation(ctx sdk.Context, creatorAddr, denom string) (err error) { - denomMetaData := banktypes.Metadata{ - DenomUnits: []*banktypes.DenomUnit{{ - Denom: denom, - Exponent: 0, - }}, - Base: denom, - } +func (k Keeper) createDenomAfterValidation(ctx sdk.Context, creatorAddr string, denom string) (err error) { + _, exists := k.bankKeeper.GetDenomMetaData(ctx, denom) + if !exists { + denomMetaData := banktypes.Metadata{ + DenomUnits: []*banktypes.DenomUnit{{ + Denom: denom, + Exponent: 0, + }}, + Base: denom, + } - k.bankKeeper.SetDenomMetaData(ctx, denomMetaData) + k.bankKeeper.SetDenomMetaData(ctx, denomMetaData) + } authorityMetadata := types.DenomAuthorityMetadata{ Admin: creatorAddr, } err = k.setAuthorityMetadata(ctx, denom, authorityMetadata) if err != nil { - return errors.Wrapf(types.ErrInvalidAuthorityMetadata, "unable to set authority metadata: %v", err) + return err } k.addDenomFromCreator(ctx, creatorAddr, denom) return nil } -func (k Keeper) validateCreateDenom(ctx sdk.Context, creatorAddr, subdenom string) (newTokenDenom string, err error) { +func (k Keeper) validateCreateDenom(ctx sdk.Context, creatorAddr string, subdenom string) (newTokenDenom string, err error) { // Temporary check until IBC bug is sorted out if k.bankKeeper.HasSupply(ctx, subdenom) { return "", fmt.Errorf("temporary error until IBC bug is sorted out, " + @@ -66,7 +62,7 @@ func (k Keeper) validateCreateDenom(ctx sdk.Context, creatorAddr, subdenom strin denom, err := types.GetTokenDenom(creatorAddr, subdenom) if err != nil { - return "", errors.Wrapf(types.ErrTokenDenom, "wrong denom token: %v", err) + return "", err } _, found := k.bankKeeper.GetDenomMetaData(ctx, denom) @@ -77,31 +73,12 @@ func (k Keeper) validateCreateDenom(ctx sdk.Context, creatorAddr, subdenom strin return denom, nil } -func (k Keeper) chargeFeeForDenomCreation(ctx sdk.Context, creatorAddr string) (err error) { - // Send creation fee to community pool - creationFee := k.GetParams(ctx).DenomCreationFee - accAddr, err := sdk.AccAddressFromBech32(creatorAddr) - if err != nil { - return errors.Wrapf(types.ErrUnableToCharge, "wrong creator address: %v", err) - } - +func (k Keeper) chargeForCreateDenom(ctx sdk.Context, creatorAddr string) (err error) { params := k.GetParams(ctx) - if len(creationFee) > 0 { - feeCollectorAddr, err := sdk.AccAddressFromBech32(params.FeeCollectorAddress) - if err != nil { - return errors.Wrapf(types.ErrUnableToCharge, "wrong fee collector address: %v", err) - } - - err = k.bankKeeper.SendCoins( - ctx, - accAddr, feeCollectorAddr, - creationFee, - ) - - if err != nil { - return errors.Wrap(err, "unable to send coins to fee collector") - } + // if DenomCreationGasConsume is non-zero, consume the gas + if params.DenomCreationGasConsume != 0 { + ctx.GasMeter().ConsumeGas(params.DenomCreationGasConsume, "consume denom creation gas") } return nil diff --git a/x/tokenfactory/keeper/createdenom_test.go b/x/tokenfactory/keeper/createdenom_test.go index 423dc4a1d..0b1c004ea 100644 --- a/x/tokenfactory/keeper/createdenom_test.go +++ b/x/tokenfactory/keeper/createdenom_test.go @@ -2,7 +2,6 @@ package keeper_test import ( "fmt" - "strings" sdk "github.com/cosmos/cosmos-sdk/types" @@ -37,11 +36,10 @@ func (suite *KeeperTestSuite) TestMsgCreateDenom() { suite.Require().Equal(sdk.NewInt(TopUpCoinsAmount), feeCollectorBalance) // Make sure that the admin is set correctly - denom := strings.Split(res.GetNewTokenDenom(), "/") + //denom := strings.Split(res.GetNewTokenDenom(), "/") queryRes, err := suite.queryClient.DenomAuthorityMetadata(suite.ChainA.GetContext().Context(), &types.QueryDenomAuthorityMetadataRequest{ - Creator: denom[1], - Subdenom: denom[2], + Denom: res.GetNewTokenDenom(), }) suite.Require().NoError(err) suite.Require().Equal(suite.TestAccs[0].String(), queryRes.AuthorityMetadata.Admin) @@ -126,12 +124,11 @@ func (suite *KeeperTestSuite) TestCreateDenom() { if tc.valid { suite.Require().NoError(err) - denom := strings.Split(res.GetNewTokenDenom(), "/") + //denom := strings.Split(res.GetNewTokenDenom(), "/") // Make sure that the admin is set correctly queryRes, err := suite.queryClient.DenomAuthorityMetadata(suite.ChainA.GetContext().Context(), &types.QueryDenomAuthorityMetadataRequest{ - Creator: denom[1], - Subdenom: denom[2], + Denom: res.GetNewTokenDenom(), }) suite.Require().NoError(err) diff --git a/x/tokenfactory/keeper/genesis.go b/x/tokenfactory/keeper/genesis.go index b3c950351..288297a8d 100644 --- a/x/tokenfactory/keeper/genesis.go +++ b/x/tokenfactory/keeper/genesis.go @@ -6,15 +6,15 @@ import ( "github.com/neutron-org/neutron/x/tokenfactory/types" ) -// InitGenesis initializes the tokenfactory module's state from a provided genesis +// / InitGenesis initializes the tokenfactory module's state from a provided genesis // state. func (k Keeper) InitGenesis(ctx sdk.Context, genState types.GenesisState) { k.CreateModuleAccount(ctx) - err := k.SetParams(ctx, genState.Params) - if err != nil { - panic(err) + if genState.Params.DenomCreationFee == nil { + genState.Params.DenomCreationFee = sdk.NewCoins() } + k.SetParams(ctx, genState.Params) for _, genDenom := range genState.GetFactoryDenoms() { creator, _, err := types.DeconstructDenom(genDenom.GetDenom()) diff --git a/x/tokenfactory/keeper/genesis_test.go b/x/tokenfactory/keeper/genesis_test.go index 67a38e6f7..707214167 100644 --- a/x/tokenfactory/keeper/genesis_test.go +++ b/x/tokenfactory/keeper/genesis_test.go @@ -40,8 +40,7 @@ func (suite *KeeperTestSuite) TestGenesis() { } } - err := app.TokenFactoryKeeper.SetParams(context, types.Params{}) - suite.Require().NoError(err) + app.TokenFactoryKeeper.SetParams(context, types.Params{}) app.TokenFactoryKeeper.InitGenesis(context, genesisState) exportedGenesis := app.TokenFactoryKeeper.ExportGenesis(context) suite.Require().NotNil(exportedGenesis) diff --git a/x/tokenfactory/keeper/grpc_query.go b/x/tokenfactory/keeper/grpc_query.go index 57750362f..ea2ad259c 100644 --- a/x/tokenfactory/keeper/grpc_query.go +++ b/x/tokenfactory/keeper/grpc_query.go @@ -2,7 +2,6 @@ package keeper import ( "context" - "fmt" sdk "github.com/cosmos/cosmos-sdk/types" @@ -11,7 +10,7 @@ import ( var _ types.QueryServer = Keeper{} -func (k Keeper) Params(ctx context.Context, _ *types.QueryParamsRequest) (*types.QueryParamsResponse, error) { +func (k Keeper) Params(ctx context.Context, req *types.QueryParamsRequest) (*types.QueryParamsResponse, error) { sdkCtx := sdk.UnwrapSDKContext(ctx) params := k.GetParams(sdkCtx) @@ -21,9 +20,7 @@ func (k Keeper) Params(ctx context.Context, _ *types.QueryParamsRequest) (*types func (k Keeper) DenomAuthorityMetadata(ctx context.Context, req *types.QueryDenomAuthorityMetadataRequest) (*types.QueryDenomAuthorityMetadataResponse, error) { sdkCtx := sdk.UnwrapSDKContext(ctx) - denom := fmt.Sprintf("factory/%s/%s", req.GetCreator(), req.GetSubdenom()) - - authorityMetadata, err := k.GetAuthorityMetadata(sdkCtx, denom) + authorityMetadata, err := k.GetAuthorityMetadata(sdkCtx, req.GetDenom()) if err != nil { return nil, err } @@ -36,3 +33,11 @@ func (k Keeper) DenomsFromCreator(ctx context.Context, req *types.QueryDenomsFro denoms := k.getDenomsFromCreator(sdkCtx, req.GetCreator()) return &types.QueryDenomsFromCreatorResponse{Denoms: denoms}, nil } + +func (k Keeper) BeforeSendHookAddress(ctx context.Context, req *types.QueryBeforeSendHookAddressRequest) (*types.QueryBeforeSendHookAddressResponse, error) { + sdkCtx := sdk.UnwrapSDKContext(ctx) + + cosmwasmAddress := k.GetBeforeSendHook(sdkCtx, req.GetDenom()) + + return &types.QueryBeforeSendHookAddressResponse{CosmwasmAddress: cosmwasmAddress}, nil +} diff --git a/x/tokenfactory/keeper/keeper.go b/x/tokenfactory/keeper/keeper.go index 3724efb0c..5e5751486 100644 --- a/x/tokenfactory/keeper/keeper.go +++ b/x/tokenfactory/keeper/keeper.go @@ -4,49 +4,37 @@ import ( "fmt" "github.com/cometbft/cometbft/libs/log" + "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/store/prefix" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/neutron-org/neutron/x/tokenfactory/types" - - paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" ) type ( Keeper struct { - storeKey storetypes.StoreKey - - paramSpace paramtypes.Subspace - + storeKey storetypes.StoreKey + cdc codec.Codec accountKeeper types.AccountKeeper bankKeeper types.BankKeeper contractKeeper types.ContractKeeper - - communityPoolKeeper types.CommunityPoolKeeper } ) // NewKeeper returns a new instance of the x/tokenfactory keeper func NewKeeper( + cdc codec.Codec, storeKey storetypes.StoreKey, - paramSpace paramtypes.Subspace, accountKeeper types.AccountKeeper, bankKeeper types.BankKeeper, - communityPoolKeeper types.CommunityPoolKeeper, ) Keeper { - if !paramSpace.HasKeyTable() { - paramSpace = paramSpace.WithKeyTable(types.ParamKeyTable()) - } - return Keeper{ - storeKey: storeKey, - paramSpace: paramSpace, - - accountKeeper: accountKeeper, - bankKeeper: bankKeeper, - communityPoolKeeper: communityPoolKeeper, + cdc: cdc, + storeKey: storeKey, + accountKeeper: accountKeeper, + bankKeeper: bankKeeper, } } diff --git a/x/tokenfactory/keeper/keeper_test.go b/x/tokenfactory/keeper/keeper_test.go index 7d01bbee1..84db02560 100644 --- a/x/tokenfactory/keeper/keeper_test.go +++ b/x/tokenfactory/keeper/keeper_test.go @@ -52,11 +52,10 @@ func (suite *KeeperTestSuite) Setup() { suite.queryClient = types.NewQueryClient(suite.QueryHelper) tokeFactoryKeeper := suite.GetNeutronZoneApp(suite.ChainA).TokenFactoryKeeper - err := tokeFactoryKeeper.SetParams(suite.ChainA.GetContext(), types.NewParams( - sdktypes.NewCoins(sdktypes.NewInt64Coin(types.DefaultNeutronDenom, TopUpCoinsAmount)), - FeeCollectorAddress, + tokeFactoryKeeper.SetParams(suite.ChainA.GetContext(), types.NewParams( + sdktypes.NewCoins(sdktypes.NewInt64Coin(suite.defaultDenom, TopUpCoinsAmount)), + 100000, )) - suite.Require().NoError(err) suite.msgServer = keeper.NewMsgServerImpl(*tokeFactoryKeeper) } diff --git a/x/tokenfactory/keeper/msg_server.go b/x/tokenfactory/keeper/msg_server.go index eae1e3a73..dfed15f28 100644 --- a/x/tokenfactory/keeper/msg_server.go +++ b/x/tokenfactory/keeper/msg_server.go @@ -4,7 +4,7 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - + authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" "github.com/neutron-org/neutron/x/tokenfactory/types" ) @@ -59,7 +59,11 @@ func (server msgServer) Mint(goCtx context.Context, msg *types.MsgMint) (*types. return nil, types.ErrUnauthorized } - err = server.Keeper.mintTo(ctx, msg.Amount, msg.Sender) + if msg.MintToAddress == "" { + msg.MintToAddress = msg.Sender + } + + err = server.Keeper.mintTo(ctx, msg.Amount, msg.MintToAddress) if err != nil { return nil, err } @@ -87,7 +91,17 @@ func (server msgServer) Burn(goCtx context.Context, msg *types.MsgBurn) (*types. return nil, types.ErrUnauthorized } - err = server.Keeper.burnFrom(ctx, msg.Amount, msg.Sender) + if msg.BurnFromAddress == "" { + msg.BurnFromAddress = msg.Sender + } + + accountI := server.Keeper.accountKeeper.GetAccount(ctx, sdk.AccAddress(msg.BurnFromAddress)) + _, ok := accountI.(authtypes.ModuleAccountI) + if ok { + return nil, types.ErrBurnFromModuleAccount + } + + err = server.Keeper.burnFrom(ctx, msg.Amount, msg.BurnFromAddress) if err != nil { return nil, err } @@ -103,6 +117,35 @@ func (server msgServer) Burn(goCtx context.Context, msg *types.MsgBurn) (*types. return &types.MsgBurnResponse{}, nil } +func (server msgServer) ForceTransfer(goCtx context.Context, msg *types.MsgForceTransfer) (*types.MsgForceTransferResponse, error) { + ctx := sdk.UnwrapSDKContext(goCtx) + + authorityMetadata, err := server.Keeper.GetAuthorityMetadata(ctx, msg.Amount.GetDenom()) + if err != nil { + return nil, err + } + + if msg.Sender != authorityMetadata.GetAdmin() { + return nil, types.ErrUnauthorized + } + + err = server.Keeper.forceTransfer(ctx, msg.Amount, msg.TransferFromAddress, msg.TransferToAddress) + if err != nil { + return nil, err + } + + ctx.EventManager().EmitEvents(sdk.Events{ + sdk.NewEvent( + types.TypeMsgForceTransfer, + sdk.NewAttribute(types.AttributeTransferFromAddress, msg.TransferFromAddress), + sdk.NewAttribute(types.AttributeTransferToAddress, msg.TransferToAddress), + sdk.NewAttribute(types.AttributeAmount, msg.Amount.String()), + ), + }) + + return &types.MsgForceTransferResponse{}, nil +} + func (server msgServer) ChangeAdmin(goCtx context.Context, msg *types.MsgChangeAdmin) (*types.MsgChangeAdminResponse, error) { ctx := sdk.UnwrapSDKContext(goCtx) @@ -129,3 +172,62 @@ func (server msgServer) ChangeAdmin(goCtx context.Context, msg *types.MsgChangeA return &types.MsgChangeAdminResponse{}, nil } + +func (server msgServer) SetDenomMetadata(goCtx context.Context, msg *types.MsgSetDenomMetadata) (*types.MsgSetDenomMetadataResponse, error) { + ctx := sdk.UnwrapSDKContext(goCtx) + + // Defense in depth validation of metadata + err := msg.Metadata.Validate() + if err != nil { + return nil, err + } + + authorityMetadata, err := server.Keeper.GetAuthorityMetadata(ctx, msg.Metadata.Base) + if err != nil { + return nil, err + } + + if msg.Sender != authorityMetadata.GetAdmin() { + return nil, types.ErrUnauthorized + } + + server.Keeper.bankKeeper.SetDenomMetaData(ctx, msg.Metadata) + + ctx.EventManager().EmitEvents(sdk.Events{ + sdk.NewEvent( + types.TypeMsgSetDenomMetadata, + sdk.NewAttribute(types.AttributeDenom, msg.Metadata.Base), + sdk.NewAttribute(types.AttributeDenomMetadata, msg.Metadata.String()), + ), + }) + + return &types.MsgSetDenomMetadataResponse{}, nil +} + +func (server msgServer) SetBeforeSendHook(goCtx context.Context, msg *types.MsgSetBeforeSendHook) (*types.MsgSetBeforeSendHookResponse, error) { + ctx := sdk.UnwrapSDKContext(goCtx) + + authorityMetadata, err := server.Keeper.GetAuthorityMetadata(ctx, msg.Denom) + if err != nil { + return nil, err + } + + if msg.Sender != authorityMetadata.GetAdmin() { + return nil, types.ErrUnauthorized + } + + err = server.Keeper.setBeforeSendHook(ctx, msg.Denom, msg.CosmwasmAddress) + if err != nil { + return nil, err + } + + ctx.EventManager().EmitEvents(sdk.Events{ + sdk.NewEvent( + types.TypeMsgSetBeforeSendHook, + sdk.NewAttribute(types.AttributeDenom, msg.GetDenom()), + sdk.NewAttribute(types.AttributeBeforeSendHookAddress, msg.GetCosmwasmAddress()), + ), + }) + + return &types.MsgSetBeforeSendHookResponse{}, nil +} From 1388d8803a02b6b308a51a4509d1d3dcda097365 Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Thu, 31 Aug 2023 17:01:19 +0400 Subject: [PATCH 076/307] small proto changes --- proto/neutron/interchainqueries/tx.proto | 2 +- proto/osmosis/tokenfactory/v1beta1/tx.proto | 24 +++++++++++++++++++++ x/interchainqueries/types/tx.pb.go | 2 +- x/tokenfactory/client/cli/query.go | 11 +++++----- 4 files changed, 31 insertions(+), 8 deletions(-) diff --git a/proto/neutron/interchainqueries/tx.proto b/proto/neutron/interchainqueries/tx.proto index 37936f711..f4b5e7172 100644 --- a/proto/neutron/interchainqueries/tx.proto +++ b/proto/neutron/interchainqueries/tx.proto @@ -136,7 +136,7 @@ message MsgUpdateParams { // Authority is the address of the governance account. string authority = 1 [ (cosmos_proto.scalar) = "cosmos.AddressString" ]; - // params defines the x/tokenfactory parameters to update. + // params defines the x/interchainqueries parameters to update. // // NOTE: All parameters must be supplied. Params params = 2 diff --git a/proto/osmosis/tokenfactory/v1beta1/tx.proto b/proto/osmosis/tokenfactory/v1beta1/tx.proto index 8184a0a86..83d0fa8ac 100644 --- a/proto/osmosis/tokenfactory/v1beta1/tx.proto +++ b/proto/osmosis/tokenfactory/v1beta1/tx.proto @@ -23,6 +23,7 @@ service Msg { rpc SetBeforeSendHook(MsgSetBeforeSendHook) returns (MsgSetBeforeSendHookResponse); rpc ForceTransfer(MsgForceTransfer) returns (MsgForceTransferResponse); + rpc UpdateParams(MsgUpdateParams) returns (MsgUpdateParamsResponse); } // MsgCreateDenom defines the message structure for the CreateDenom gRPC service @@ -139,3 +140,26 @@ message MsgForceTransfer { } message MsgForceTransferResponse {} + +// MsgUpdateParams is the MsgUpdateParams request type. +// +// Since: 0.47 +message MsgUpdateParams { + option (amino.name) = "interchainqueries/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/interchainqueries 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/x/interchainqueries/types/tx.pb.go b/x/interchainqueries/types/tx.pb.go index 4bd4d8f0a..5298e2ebe 100644 --- a/x/interchainqueries/types/tx.pb.go +++ b/x/interchainqueries/types/tx.pb.go @@ -767,7 +767,7 @@ var xxx_messageInfo_MsgUpdateInterchainQueryResponse proto.InternalMessageInfo 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. + // params defines the x/interchainqueries parameters to update. // // NOTE: All parameters must be supplied. Params Params `protobuf:"bytes,2,opt,name=params,proto3" json:"params"` diff --git a/x/tokenfactory/client/cli/query.go b/x/tokenfactory/client/cli/query.go index 529888069..11e4dc944 100644 --- a/x/tokenfactory/client/cli/query.go +++ b/x/tokenfactory/client/cli/query.go @@ -1,11 +1,11 @@ package cli import ( + // "strings" + "fmt" "strings" - // "strings" - "github.com/spf13/cobra" "github.com/cosmos/cosmos-sdk/client" @@ -84,8 +84,7 @@ func GetCmdDenomAuthorityMetadata() *cobra.Command { } res, err := queryClient.DenomAuthorityMetadata(cmd.Context(), &types.QueryDenomAuthorityMetadataRequest{ - Creator: denom[1], - Subdenom: denom[2], + Denom: args[0], }) if err != nil { return err @@ -113,8 +112,8 @@ func GetCmdDenomsFromCreator() *cobra.Command { } queryClient := types.NewQueryClient(clientCtx) - res, err := queryClient.DenomsFromCreator(cmd.Context(), &types.QueryDenomsFromCreatorRequest{ - Creator: args[0], + res, err := queryClient.BeforeSendHookAddress(cmd.Context(), &types.QueryBeforeSendHookAddressRequest{ + Denom: args[0], }) if err != nil { return err From d071e186b89cf511b0ac07bb65582256fc88aa26 Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Thu, 31 Aug 2023 17:01:46 +0400 Subject: [PATCH 077/307] fix app erros --- app/upgrades/v0.4.4/upgrades.go | 6 +----- app/upgrades/v3/upgrades.go | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/app/upgrades/v0.4.4/upgrades.go b/app/upgrades/v0.4.4/upgrades.go index 63beac5c0..bf05e2dff 100644 --- a/app/upgrades/v0.4.4/upgrades.go +++ b/app/upgrades/v0.4.4/upgrades.go @@ -57,11 +57,7 @@ func CreateUpgradeHandler( ctx.Logger().Info("Migrating TokenFactory Params...") tokenfactoryDefaultParams := tokenfactorytypes.DefaultParams() - tokenfactoryDefaultParams.FeeCollectorAddress = reserveAddress - err = keepers.TokenFactoryKeeper.SetParams(ctx, tokenfactoryDefaultParams) - if err != nil { - return vm, err - } + keepers.TokenFactoryKeeper.SetParams(ctx, tokenfactoryDefaultParams) ctx.Logger().Info("Upgrade complete") return vm, err diff --git a/app/upgrades/v3/upgrades.go b/app/upgrades/v3/upgrades.go index beabd198e..5b0389dd3 100644 --- a/app/upgrades/v3/upgrades.go +++ b/app/upgrades/v3/upgrades.go @@ -33,11 +33,7 @@ func CreateUpgradeHandler( return vm, err } - err = keepers.TokenFactoryKeeper.SetParams(ctx, tokenfactorytypes.DefaultParams()) - if err != nil { - return vm, err - } - + keepers.TokenFactoryKeeper.SetParams(ctx, tokenfactorytypes.DefaultParams()) vm, err = mm.RunMigrations(ctx, configurator, vm) if err != nil { return vm, err From 5aa6e84023c0b875742552aa78f05372e5dbade0 Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Thu, 31 Aug 2023 17:02:01 +0400 Subject: [PATCH 078/307] replace sdk --- go.mod | 10 +--------- go.sum | 22 +++------------------- 2 files changed, 4 insertions(+), 28 deletions(-) diff --git a/go.mod b/go.mod index 3259ca7bb..b70f0e117 100644 --- a/go.mod +++ b/go.mod @@ -57,16 +57,12 @@ require ( github.com/beorn7/perks v1.0.1 // indirect github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 // indirect - github.com/bits-and-blooms/bitset v1.8.0 // indirect github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect github.com/cenkalti/backoff/v4 v4.1.3 // indirect github.com/cespare/xxhash v1.1.0 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/chzyer/readline v1.5.1 // indirect github.com/cockroachdb/apd/v2 v2.0.2 // indirect - github.com/cockroachdb/errors v1.10.0 // indirect - github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect - github.com/cockroachdb/redact v1.1.5 // indirect github.com/coinbase/rosetta-sdk-go v0.7.9 // indirect github.com/confio/ics23/go v0.9.0 // indirect github.com/cosmos/btcutil v1.0.5 // indirect @@ -88,7 +84,6 @@ require ( github.com/dvsekhvalnov/jose2go v1.5.0 // indirect github.com/felixge/httpsnoop v1.0.2 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect - github.com/getsentry/sentry-go v0.21.0 // indirect github.com/go-kit/kit v0.12.0 // indirect github.com/go-kit/log v0.2.1 // indirect github.com/go-logfmt/logfmt v0.6.0 // indirect @@ -126,8 +121,6 @@ require ( github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/jmhodges/levigo v1.0.0 // indirect github.com/klauspost/compress v1.16.5 // indirect - github.com/kr/pretty v0.3.1 // indirect - github.com/kr/text v0.2.0 // indirect github.com/lib/pq v1.10.7 // indirect github.com/libp2p/go-buffer-pool v0.1.0 // indirect github.com/linxGnu/grocksdb v1.8.0 // indirect @@ -152,7 +145,6 @@ require ( github.com/prometheus/procfs v0.10.1 // indirect github.com/rakyll/statik v0.1.7 // indirect github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect - github.com/rogpeppe/go-internal v1.10.0 // indirect github.com/rs/cors v1.8.3 // indirect github.com/sasha-s/go-deadlock v0.3.1 // indirect github.com/spf13/afero v1.9.5 // indirect @@ -191,7 +183,7 @@ replace ( github.com/ChainSafe/go-schnorrkel => github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d github.com/CosmWasm/wasmd => github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230808084410-6083b888424e github.com/cosmos/admin-module => github.com/neutron-org/admin-module v0.0.0-20230705134325-b23404470a1d - github.com/cosmos/cosmos-sdk => github.com/neutron-org/cosmos-sdk v0.47.5-0.20230808152221-a0e301227957 + github.com/cosmos/cosmos-sdk => github.com/neutron-org/cosmos-sdk v0.47.5-0.20230831104547-eda3e09a8b71 github.com/cosmos/gaia/v11 => github.com/cosmos/gaia/v11 v11.0.0-20230724152830-861ba391c3b4 github.com/cosmos/ledger-cosmos-go => github.com/cosmos/ledger-cosmos-go v0.12.1 github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 diff --git a/go.sum b/go.sum index 1f759e18a..7c0b122b7 100644 --- a/go.sum +++ b/go.sum @@ -286,8 +286,6 @@ github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod h1:6QX/PXZ github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 h1:41iFGWnSlI2gVpmOtVTJZNodLdLQLn/KsJqFvXwnd/s= github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= -github.com/bits-and-blooms/bitset v1.8.0 h1:FD+XqgOZDUxxZ8hzoBFuV9+cGWY9CslN6d5MS5JVb4c= -github.com/bits-and-blooms/bitset v1.8.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8= github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40/go.mod h1:8rLXio+WjiTceGBHIoTvn60HIbs7Hm7bcHjyrSqYB9c= github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps= github.com/btcsuite/btcd v0.0.0-20190315201642-aa6e0f35703c/go.mod h1:DrZx5ec/dmnfpw9KyYoQyYo7d0KEvTkk/5M/vbZjAr8= @@ -314,7 +312,7 @@ github.com/btcsuite/snappy-go v0.0.0-20151229074030-0bdef8d06723/go.mod h1:8woku github.com/btcsuite/snappy-go v1.0.0/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc= github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod h1:ghJtEyQwv5/p4Mg4C0fgbePVuGr935/5ddU9Z3TmDRY= github.com/btcsuite/winsvc v1.0.0/go.mod h1:jsenWakMcC0zFBFurPLEAyrnc/teJEM1O46fmI40EZs= -github.com/bufbuild/protocompile v0.5.1 h1:mixz5lJX4Hiz4FpqFREJHIXLfaLBntfaJv1h+/jS+Qg= +github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA= github.com/bwesterb/go-ristretto v1.2.0/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0= github.com/c-bata/go-prompt v0.2.2/go.mod h1:VzqtzE2ksDBcdln8G7mk2RX9QyGjH+OVqOCSiVIqS34= github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= @@ -358,12 +356,6 @@ github.com/cockroachdb/apd/v2 v2.0.2 h1:weh8u7Cneje73dDh+2tEVLUvyBc89iwepWCD8b80 github.com/cockroachdb/apd/v2 v2.0.2/go.mod h1:DDxRlzC2lo3/vSlmSoS7JkqbbrARPuFOGr0B9pvN3Gw= github.com/cockroachdb/apd/v3 v3.1.0 h1:MK3Ow7LH0W8zkd5GMKA1PvS9qG3bWFI95WaVNfyZJ/w= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= -github.com/cockroachdb/errors v1.10.0 h1:lfxS8zZz1+OjtV4MtNWgboi/W5tyLEB6VQZBXN+0VUU= -github.com/cockroachdb/errors v1.10.0/go.mod h1:lknhIsEVQ9Ss/qKDBQS/UqFSvPQjOwNq2qyKAxtHRqE= -github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZeQy818SGhaone5OnYfxFR/+AzdY3sf5aE= -github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs= -github.com/cockroachdb/redact v1.1.5 h1:u1PMllDkdFfPWaNGMyLD1+so+aq3uUItthCFqzwPJ30= -github.com/cockroachdb/redact v1.1.5/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= github.com/coinbase/kryptology v1.8.0/go.mod h1:RYXOAPdzOGUe3qlSFkMGn58i3xUA8hmxYHksuq+8ciI= github.com/coinbase/rosetta-sdk-go v0.7.9 h1:lqllBjMnazTjIqYrOGv8h8jxjg9+hJazIGZr9ZvoCcA= @@ -506,8 +498,6 @@ github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbS github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff/go.mod h1:x7DCsMOv1taUwEWCzT4cmDeAkigA5/QCwUodaVOe8Ww= github.com/getkin/kin-openapi v0.53.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4= github.com/getkin/kin-openapi v0.61.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4= -github.com/getsentry/sentry-go v0.21.0 h1:c9l5F1nPF30JIppulk4veau90PK6Smu3abgVtVQWon4= -github.com/getsentry/sentry-go v0.21.0/go.mod h1:lc76E2QywIyW8WuBnwl8Lc4bkmQH4+w1gwTf25trprY= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= @@ -516,7 +506,6 @@ github.com/gin-gonic/gin v1.8.1 h1:4+fr/el88TOO3ewCmQr8cx/CtZ/umlIRIs5M4NTNjf8= github.com/glycerine/go-unsnap-stream v0.0.0-20180323001048-9f0cb55181dd/go.mod h1:/20jfyN9Y5QPEAprSgKAUr+glWDY39ZiUEAYOEv5dsE= github.com/glycerine/goconvey v0.0.0-20190410193231-58a59202ab31/go.mod h1:Ogl1Tioa0aV7gstGFO7KhffUsb9M4ydbEbbxpcEDc24= github.com/go-chi/chi/v5 v5.0.0/go.mod h1:BBug9lr0cqtdAhsu6R4AAdvufI0/XBzAQSsUqJpoZOs= -github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= @@ -836,7 +825,6 @@ github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFB github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= -github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= @@ -940,8 +928,8 @@ github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OS github.com/neilotoole/errgroup v0.1.6/go.mod h1:Q2nLGf+594h0CLBs/Mbg6qOr7GtqDK7C2S41udRnToE= github.com/neutron-org/admin-module v0.0.0-20230705134325-b23404470a1d h1:oexw79znoA0TEo7CGdWHrolbvZqCDD3aI+031CbOq9Y= github.com/neutron-org/admin-module v0.0.0-20230705134325-b23404470a1d/go.mod h1:QuxQ7FJlEAFMRssyEYOrR9ORnYQvBFMTlO8BXny6ntw= -github.com/neutron-org/cosmos-sdk v0.47.5-0.20230808152221-a0e301227957 h1:cl6UqD18qV/QXgT6Yjo2TelfbaOqQGuvL1yX0cWguSs= -github.com/neutron-org/cosmos-sdk v0.47.5-0.20230808152221-a0e301227957/go.mod h1:4xMyIVekAs2OEUz/yh9JwzhLBMk+olM2sxgKuQdlhLg= +github.com/neutron-org/cosmos-sdk v0.47.5-0.20230831104547-eda3e09a8b71 h1:weRB37YM9y7HFyEn6SNI8AZzawU3h23l6BLFrNNqZak= +github.com/neutron-org/cosmos-sdk v0.47.5-0.20230831104547-eda3e09a8b71/go.mod h1:R5n+uM7vguVPFap4pgkdvQCT1nVo/OtPwrlAU40rvok= github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230808084410-6083b888424e h1:uVJCBWf1vcCYY0pzOA2SCPIZT8WsR8fsOxs57mnJbM4= github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230808084410-6083b888424e/go.mod h1:Oagy36cU49438NzxKG/gmGTG903tiAI7LIUdH7x2qNY= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= @@ -997,8 +985,6 @@ github.com/petermattis/goid v0.0.0-20230518223814-80aa455d8761/go.mod h1:pxMtw7c github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU= github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= -github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= -github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -1057,9 +1043,7 @@ github.com/rjeczalik/notify v0.9.1/go.mod h1:rKwnCoCGeuQnwBtTSPL9Dad03Vh2n40ePRr github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= -github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= github.com/rs/cors v1.8.3 h1:O+qNyWn7Z+F9M0ILBHgMVPuB1xTOucVd5gtaYyXBpRo= github.com/rs/cors v1.8.3/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= From 07944be3626e3e23a0cf2769fcef4e00edcaa814 Mon Sep 17 00:00:00 2001 From: swelf Date: Thu, 31 Aug 2023 16:40:57 +0300 Subject: [PATCH 079/307] merge conflicts --- x/transfer/ibc_handlers.go | 2 -- x/transfer/ibc_handlers_test.go | 2 -- 2 files changed, 4 deletions(-) diff --git a/x/transfer/ibc_handlers.go b/x/transfer/ibc_handlers.go index 85ff59d22..550c7bb37 100644 --- a/x/transfer/ibc_handlers.go +++ b/x/transfer/ibc_handlers.go @@ -1,8 +1,6 @@ package transfer import ( - "strings" - contractmanagertypes "github.com/neutron-org/neutron/x/contractmanager/types" "cosmossdk.io/errors" diff --git a/x/transfer/ibc_handlers_test.go b/x/transfer/ibc_handlers_test.go index 68f6dfa64..294654283 100644 --- a/x/transfer/ibc_handlers_test.go +++ b/x/transfer/ibc_handlers_test.go @@ -5,8 +5,6 @@ import ( "github.com/neutron-org/neutron/x/contractmanager/types" "testing" - "github.com/neutron-org/neutron/x/contractmanager/types" - sdk "github.com/cosmos/cosmos-sdk/types" transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" From 7693c89f79785a6a7e14440c8b1288f60f959ff2 Mon Sep 17 00:00:00 2001 From: swelf19 <62722506+swelf19@users.noreply.github.com> Date: Thu, 31 Aug 2023 19:04:26 +0300 Subject: [PATCH 080/307] Update neutronutils/utils.go Co-authored-by: Dmitry Kolupaev --- neutronutils/utils.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neutronutils/utils.go b/neutronutils/utils.go index 0e67d48dd..fb621d701 100644 --- a/neutronutils/utils.go +++ b/neutronutils/utils.go @@ -2,7 +2,7 @@ package neutronutils import sdk "github.com/cosmos/cosmos-sdk/types" -// CreateCachedContext creates a cached context for with a limited gas meter. +// CreateCachedContext creates a cached context with a limited gas meter. func CreateCachedContext(ctx sdk.Context, gasLimit uint64) (sdk.Context, func(), sdk.GasMeter) { cacheCtx, writeFn := ctx.CacheContext() gasMeter := sdk.NewGasMeter(gasLimit) From 50b8c25f0496f391d0276820976f3858154a347d Mon Sep 17 00:00:00 2001 From: swelf Date: Thu, 31 Aug 2023 19:09:09 +0300 Subject: [PATCH 081/307] review fixes --- network/init-neutrond.sh | 3 ++- x/contractmanager/types/params.go | 6 +++--- x/transfer/ibc_handlers_test.go | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/network/init-neutrond.sh b/network/init-neutrond.sh index 037d2ab7c..390284816 100755 --- a/network/init-neutrond.sh +++ b/network/init-neutrond.sh @@ -637,7 +637,8 @@ set_genesis_param signed_blocks_window "\"$SLASHING_SIGNED_BLO set_genesis_param min_signed_per_window "\"$SLASHING_MIN_SIGNED\"," # slashing set_genesis_param slash_fraction_double_sign "\"$SLASHING_FRACTION_DOUBLE_SIGN\"," # slashing set_genesis_param slash_fraction_downtime "\"$SLASHING_FRACTION_DOWNTIME\"" # slashing -set_genesis_param minimum_gas_prices "$MIN_GAS_PRICES," # globalfeeset_genesis_param max_total_bypass_min_fee_msg_gas_usage "\"$MAX_TOTAL_BYPASS_MIN_FEE_MSG_GAS_USAGE\"" # globalfee +set_genesis_param minimum_gas_prices "$MIN_GAS_PRICES," # globalfee +set_genesis_param max_total_bypass_min_fee_msg_gas_usage "\"$MAX_TOTAL_BYPASS_MIN_FEE_MSG_GAS_USAGE\"" # globalfee set_genesis_param_jq ".app_state.globalfee.params.bypass_min_fee_msg_types" "$BYPASS_MIN_FEE_MSG_TYPES" # globalfee set_genesis_param proposer_fee "\"0.25\"" # builder(POB) set_genesis_param escrow_account_address "\"$DAO_CONTRACT_ADDRESS_B64\"," # builder(POB) diff --git a/x/contractmanager/types/params.go b/x/contractmanager/types/params.go index 5c77ce196..5a2a9c291 100644 --- a/x/contractmanager/types/params.go +++ b/x/contractmanager/types/params.go @@ -15,15 +15,15 @@ func ParamKeyTable() paramtypes.KeyTable { } // NewParams creates a new Params instance -func NewParams() Params { +func NewParams(sudoCallGasLimit uint64) Params { return Params{ - SudoCallGasLimit: DefaultSudoCallGasLimit, + SudoCallGasLimit: sudoCallGasLimit, } } // DefaultParams returns a default set of parameters func DefaultParams() Params { - return NewParams() + return NewParams(DefaultSudoCallGasLimit) } // ParamSetPairs get the params.ParamSet diff --git a/x/transfer/ibc_handlers_test.go b/x/transfer/ibc_handlers_test.go index 294654283..191bbfa8d 100644 --- a/x/transfer/ibc_handlers_test.go +++ b/x/transfer/ibc_handlers_test.go @@ -94,7 +94,7 @@ func TestHandleAcknowledgement(t *testing.T) { require.NoError(t, err) p.Data = tokenBz - //// error during SudoResponse non contract + // error during SudoResponse non contract ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(false) err = txModule.HandleAcknowledgement(ctx, p, resAckData, relayerAddress) From 788b4d77a48f150046b1acb15ff326c01883d1b3 Mon Sep 17 00:00:00 2001 From: swelf Date: Thu, 31 Aug 2023 19:13:18 +0300 Subject: [PATCH 082/307] module alias alter --- app/upgrades/sdk47/upgrades.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/upgrades/sdk47/upgrades.go b/app/upgrades/sdk47/upgrades.go index 9c92d08f0..3beeb8e82 100644 --- a/app/upgrades/sdk47/upgrades.go +++ b/app/upgrades/sdk47/upgrades.go @@ -12,7 +12,7 @@ import ( upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" v6 "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/migrations/v6" "github.com/neutron-org/neutron/app/upgrades" - contractmanagermoduletypes "github.com/neutron-org/neutron/x/contractmanager/types" + contractmanagertypes "github.com/neutron-org/neutron/x/contractmanager/types" crontypes "github.com/neutron-org/neutron/x/cron/types" feeburnertypes "github.com/neutron-org/neutron/x/feeburner/types" feerefundertypes "github.com/neutron-org/neutron/x/feerefunder/types" @@ -93,7 +93,7 @@ func CreateUpgradeHandler( } ctx.Logger().Info("Setting sudo callback limit...") - cmParams := contractmanagermoduletypes.Params{ + cmParams := contractmanagertypes.Params{ SudoCallGasLimit: 1_000_000, } err = keepers.ContractManager.SetParams(ctx, cmParams) From 95adbda01354198376968077aa9546f036240d75 Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Mon, 4 Sep 2023 11:31:18 +0400 Subject: [PATCH 083/307] upd module & small fixes --- app/app.go | 52 ++++++++++++++--------------------- go.mod | 2 +- go.sum | 4 +-- wasmbinding/message_plugin.go | 20 ++++++-------- 4 files changed, 33 insertions(+), 45 deletions(-) diff --git a/app/app.go b/app/app.go index 9650a812d..4b72c53de 100644 --- a/app/app.go +++ b/app/app.go @@ -113,10 +113,10 @@ import ( tokenfactorykeeper "github.com/neutron-org/neutron/x/tokenfactory/keeper" tokenfactorytypes "github.com/neutron-org/neutron/x/tokenfactory/types" - adminmodulemodule "github.com/cosmos/admin-module/x/adminmodule" + "github.com/cosmos/admin-module/x/adminmodule" adminmodulecli "github.com/cosmos/admin-module/x/adminmodule/client/cli" - adminmodulemodulekeeper "github.com/cosmos/admin-module/x/adminmodule/keeper" - adminmodulemoduletypes "github.com/cosmos/admin-module/x/adminmodule/types" + adminmodulekeeper "github.com/cosmos/admin-module/x/adminmodule/keeper" + admintypes "github.com/cosmos/admin-module/x/adminmodule/types" govclient "github.com/cosmos/cosmos-sdk/x/gov/client" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" @@ -159,16 +159,6 @@ const ( Name = "neutrond" ) -var ( - // ProposalsEnabled If EnabledSpecificProposals is "", and this is "true", then enable all x/wasm proposals. - // ProposalsEnabled If EnabledSpecificProposals is "", and this is not "true", then disable all x/wasm proposals. - ProposalsEnabled = "true" - // EnableSpecificProposals If set to non-empty string it must be comma-separated list of values that are all a subset - // of "EnableAllProposals" (takes precedence over ProposalsEnabled) - // https://github.com/CosmWasm/wasmd/blob/02a54d33ff2c064f3539ae12d75d027d9c665f05/x/wasm/internal/types/proposal.go#L28-L34 - EnableSpecificProposals = "" -) - var ( Upgrades = []upgrades.Upgrade{v3.Upgrade, v044.Upgrade, nextupgrade.Upgrade} @@ -204,7 +194,7 @@ var ( feeburner.AppModuleBasic{}, contractmanager.AppModuleBasic{}, cron.AppModuleBasic{}, - adminmodulemodule.NewAppModuleBasic( + adminmodule.NewAppModuleBasic( govclient.NewProposalHandler( adminmodulecli.NewSubmitParamChangeProposalTxCmd, ), @@ -276,7 +266,7 @@ type App struct { // keepers AccountKeeper authkeeper.AccountKeeper - AdminmoduleKeeper adminmodulemodulekeeper.Keeper + AdminmoduleKeeper adminmodulekeeper.Keeper AuthzKeeper authzkeeper.Keeper BankKeeper bankkeeper.BaseKeeper // BuilderKeeper is the keeper that handles processing auction transactions @@ -381,7 +371,7 @@ func New( evidencetypes.StoreKey, ibctransfertypes.StoreKey, icacontrollertypes.StoreKey, icahosttypes.StoreKey, capabilitytypes.StoreKey, interchainqueriesmoduletypes.StoreKey, contractmanagermoduletypes.StoreKey, interchaintxstypes.StoreKey, wasm.StoreKey, feetypes.StoreKey, - feeburnertypes.StoreKey, adminmodulemoduletypes.StoreKey, ccvconsumertypes.StoreKey, tokenfactorytypes.StoreKey, routertypes.StoreKey, + feeburnertypes.StoreKey, admintypes.StoreKey, ccvconsumertypes.StoreKey, tokenfactorytypes.StoreKey, routertypes.StoreKey, crontypes.StoreKey, ibchookstypes.StoreKey, consensusparamtypes.StoreKey, crisistypes.StoreKey, buildertypes.StoreKey, ) tkeys := sdk.NewTransientStoreKeys(paramstypes.TStoreKey) @@ -402,7 +392,7 @@ func New( app.ParamsKeeper = initParamsKeeper(appCodec, legacyAmino, keys[paramstypes.StoreKey], tkeys[paramstypes.TStoreKey]) // set the BaseApp's parameter store - app.ConsensusParamsKeeper = consensusparamkeeper.NewKeeper(appCodec, keys[consensusparamtypes.StoreKey], authtypes.NewModuleAddress(adminmodulemoduletypes.ModuleName).String()) + app.ConsensusParamsKeeper = consensusparamkeeper.NewKeeper(appCodec, keys[consensusparamtypes.StoreKey], authtypes.NewModuleAddress(admintypes.ModuleName).String()) bApp.SetParamStore(&app.ConsensusParamsKeeper) // add capability keeper and ScopeToModule for ibc module @@ -424,7 +414,7 @@ func New( authtypes.ProtoBaseAccount, maccPerms, sdk.GetConfig().GetBech32AccountAddrPrefix(), - authtypes.NewModuleAddress(adminmodulemoduletypes.ModuleName).String(), + authtypes.NewModuleAddress(admintypes.ModuleName).String(), ) app.AuthzKeeper = authzkeeper.NewKeeper( @@ -436,7 +426,7 @@ func New( keys[banktypes.StoreKey], app.AccountKeeper, app.BlockedAddrs(), - authtypes.NewModuleAddress(adminmodulemoduletypes.ModuleName).String(), + authtypes.NewModuleAddress(admintypes.ModuleName).String(), ) app.SlashingKeeper = slashingkeeper.NewKeeper( @@ -444,7 +434,7 @@ func New( legacyAmino, keys[slashingtypes.StoreKey], &app.ConsumerKeeper, - authtypes.NewModuleAddress(adminmodulemoduletypes.ModuleName).String(), + authtypes.NewModuleAddress(admintypes.ModuleName).String(), ) app.CrisisKeeper = *crisiskeeper.NewKeeper( appCodec, @@ -452,7 +442,7 @@ func New( invCheckPeriod, app.BankKeeper, authtypes.FeeCollectorName, - authtypes.NewModuleAddress(adminmodulemoduletypes.ModuleName).String(), + authtypes.NewModuleAddress(admintypes.ModuleName).String(), ) app.FeeGrantKeeper = feegrantkeeper.NewKeeper(appCodec, keys[feegrant.StoreKey], app.AccountKeeper) @@ -462,7 +452,7 @@ func New( appCodec, homePath, app.BaseApp, - authtypes.NewModuleAddress(adminmodulemoduletypes.ModuleName).String(), + authtypes.NewModuleAddress(admintypes.ModuleName).String(), ) // ... other modules keepers @@ -593,7 +583,7 @@ func New( app.BankKeeper, // 25% of rewards should be sent to the redistribute address rewardsaddressprovider.NewFixedAddressRewardsAddressProvider(app.AccountKeeper.GetModuleAddress(ccvconsumertypes.ConsumerRedistributeName)), - authtypes.NewModuleAddress(adminmodulemoduletypes.ModuleName).String(), + authtypes.NewModuleAddress(admintypes.ModuleName).String(), ) wasmDir := filepath.Join(homePath, "wasm") @@ -616,16 +606,16 @@ func New( AddRoute(upgradetypes.RouterKey, upgrade.NewSoftwareUpgradeProposalHandler(&app.UpgradeKeeper)). AddRoute(ibchost.RouterKey, ibcclient.NewClientProposalHandler(app.IBCKeeper.ClientKeeper)) - app.AdminmoduleKeeper = *adminmodulemodulekeeper.NewKeeper( + app.AdminmoduleKeeper = *adminmodulekeeper.NewKeeper( appCodec, - keys[adminmodulemoduletypes.StoreKey], - keys[adminmodulemoduletypes.MemStoreKey], + keys[admintypes.StoreKey], + keys[admintypes.MemStoreKey], adminRouterLegacy, app.MsgServiceRouter(), IsConsumerProposalAllowlisted, isSdkMessageWhitelisted, ) - adminModule := adminmodulemodule.NewAppModule(appCodec, app.AdminmoduleKeeper) + adminModule := adminmodule.NewAppModule(appCodec, app.AdminmoduleKeeper) app.InterchainQueriesKeeper = *interchainqueriesmodulekeeper.NewKeeper( appCodec, @@ -671,7 +661,7 @@ func New( wasmDir, wasmConfig, supportedFeatures, - authtypes.NewModuleAddress(adminmodulemoduletypes.ModuleName).String(), + authtypes.NewModuleAddress(admintypes.ModuleName).String(), wasmOpts..., ) wasmHooks.ContractKeeper = &app.WasmKeeper @@ -789,7 +779,7 @@ func New( wasm.ModuleName, feetypes.ModuleName, feeburnertypes.ModuleName, - adminmodulemoduletypes.ModuleName, + admintypes.ModuleName, ibchookstypes.ModuleName, routertypes.ModuleName, crontypes.ModuleName, @@ -820,7 +810,7 @@ func New( wasm.ModuleName, feetypes.ModuleName, feeburnertypes.ModuleName, - adminmodulemoduletypes.ModuleName, + admintypes.ModuleName, ibchookstypes.ModuleName, routertypes.ModuleName, crontypes.ModuleName, @@ -856,7 +846,7 @@ func New( wasm.ModuleName, feetypes.ModuleName, feeburnertypes.ModuleName, - adminmodulemoduletypes.ModuleName, + admintypes.ModuleName, ibchookstypes.ModuleName, // after auth keeper routertypes.ModuleName, crontypes.ModuleName, diff --git a/go.mod b/go.mod index 2e0a0dc79..e5cc72f36 100644 --- a/go.mod +++ b/go.mod @@ -190,7 +190,7 @@ replace ( github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0 github.com/ChainSafe/go-schnorrkel => github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d github.com/CosmWasm/wasmd => github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230808084410-6083b888424e - github.com/cosmos/admin-module => github.com/neutron-org/admin-module v0.0.0-20230830083547-1540be1b9432 + github.com/cosmos/admin-module => github.com/neutron-org/admin-module v0.0.0-20230904070658-53e6d9fc7035 github.com/cosmos/cosmos-sdk => github.com/neutron-org/cosmos-sdk v0.47.5-0.20230808152221-a0e301227957 github.com/cosmos/gaia/v11 => github.com/cosmos/gaia/v11 v11.0.0-20230724152830-861ba391c3b4 github.com/cosmos/ledger-cosmos-go => github.com/cosmos/ledger-cosmos-go v0.12.1 diff --git a/go.sum b/go.sum index e93afe8ed..5eca99390 100644 --- a/go.sum +++ b/go.sum @@ -938,8 +938,8 @@ github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxzi github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/neilotoole/errgroup v0.1.6/go.mod h1:Q2nLGf+594h0CLBs/Mbg6qOr7GtqDK7C2S41udRnToE= -github.com/neutron-org/admin-module v0.0.0-20230830083547-1540be1b9432 h1:K+nDdYMZSB+4zt3NVSHyvKKxgjRsNyHZRaxFfnwmakg= -github.com/neutron-org/admin-module v0.0.0-20230830083547-1540be1b9432/go.mod h1:QuxQ7FJlEAFMRssyEYOrR9ORnYQvBFMTlO8BXny6ntw= +github.com/neutron-org/admin-module v0.0.0-20230904070658-53e6d9fc7035 h1:D6IibSrjZM7n/VEG+gqxRS1qd1FubhweMzpyTOv+veo= +github.com/neutron-org/admin-module v0.0.0-20230904070658-53e6d9fc7035/go.mod h1:INknneN2W3Fr9Eld7SpfLRdjyHR1muzFbbqXln1ixic= github.com/neutron-org/cosmos-sdk v0.47.5-0.20230808152221-a0e301227957 h1:cl6UqD18qV/QXgT6Yjo2TelfbaOqQGuvL1yX0cWguSs= github.com/neutron-org/cosmos-sdk v0.47.5-0.20230808152221-a0e301227957/go.mod h1:4xMyIVekAs2OEUz/yh9JwzhLBMk+olM2sxgKuQdlhLg= github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230808084410-6083b888424e h1:uVJCBWf1vcCYY0pzOA2SCPIZT8WsR8fsOxs57mnJbM4= diff --git a/wasmbinding/message_plugin.go b/wasmbinding/message_plugin.go index be8650904..00041e3d2 100644 --- a/wasmbinding/message_plugin.go +++ b/wasmbinding/message_plugin.go @@ -297,7 +297,7 @@ func (m *CustomMessenger) submitAdminProposal(ctx sdk.Context, contractAddr sdk. var data []byte err := m.validateProposalQty(adminProposal) if err != nil { - return nil, nil, errors.Wrap(err, "failed to validate proposal quantity") + return nil, nil, errors.Wrap(err, "invalid proposal quantity") } // here we handle pre-sdk47 style of proposals: param change, upgrade, client update if m.isLegacyProposal(adminProposal) { @@ -352,7 +352,8 @@ func (m *CustomMessenger) performSubmitAdminProposalLegacy(ctx sdk.Context, cont proposal := adminProposal msg := admintypes.MsgSubmitProposalLegacy{Proposer: contractAddr.String()} - if proposal.ParamChangeProposal != nil { + switch { + case proposal.ParamChangeProposal != nil: p := proposal.ParamChangeProposal err := msg.SetContent(¶mChange.ParameterChangeProposal{ Title: p.Title, @@ -362,9 +363,7 @@ func (m *CustomMessenger) performSubmitAdminProposalLegacy(ctx sdk.Context, cont if err != nil { return nil, errors.Wrap(err, "failed to set content on ParameterChangeProposal") } - - } - if proposal.UpgradeProposal != nil { + case proposal.UpgradeProposal != nil: p := proposal.UpgradeProposal err := msg.SetContent(&ibcclienttypes.UpgradeProposal{ Title: p.Title, @@ -379,9 +378,7 @@ func (m *CustomMessenger) performSubmitAdminProposalLegacy(ctx sdk.Context, cont if err != nil { return nil, errors.Wrap(err, "failed to set content on UpgradeProposal") } - } - - if proposal.ClientUpdateProposal != nil { + case proposal.ClientUpdateProposal != nil: p := proposal.ClientUpdateProposal err := msg.SetContent(&ibcclienttypes.ClientUpdateProposal{ Title: p.Title, @@ -392,6 +389,8 @@ func (m *CustomMessenger) performSubmitAdminProposalLegacy(ctx sdk.Context, cont if err != nil { return nil, errors.Wrap(err, "failed to set content on ClientUpdateProposal") } + default: + return nil, errors.Wrapf(sdkerrors.ErrInvalidRequest, "unexpected legacy admin proposal structure: %+v", proposal) } if err := msg.ValidateBasic(); err != nil { @@ -414,9 +413,8 @@ func (m *CustomMessenger) performSubmitAdminProposal(ctx sdk.Context, contractAd proposal := adminProposal authority := authtypes.NewModuleAddress(admintypes.ModuleName) var ( - msg *admintypes.MsgSubmitProposal - sdkMsgs []sdk.Msg - sdkMsg sdk.Msg + msg *admintypes.MsgSubmitProposal + sdkMsg sdk.Msg ) cdc := m.AdminKeeper.Codec() From a73dc8aff0ad8be4bcdd2878016e5184e38a489d Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Mon, 4 Sep 2023 15:06:28 +0400 Subject: [PATCH 084/307] upd types --- .../tokenfactory/v1beta1/genesis.proto | 5 +- .../osmosis/tokenfactory/v1beta1/params.proto | 16 +- .../osmosis/tokenfactory/v1beta1/query.proto | 47 +- x/tokenfactory/types/genesis.pb.go | 3 + x/tokenfactory/types/params.go | 4 +- x/tokenfactory/types/params.pb.go | 97 ++-- x/tokenfactory/types/query.pb.go | 538 +++++++++++++++--- x/tokenfactory/types/query.pb.gw.go | 141 ++++- x/tokenfactory/types/tx.go | 33 ++ 9 files changed, 693 insertions(+), 191 deletions(-) create mode 100644 x/tokenfactory/types/tx.go diff --git a/proto/osmosis/tokenfactory/v1beta1/genesis.proto b/proto/osmosis/tokenfactory/v1beta1/genesis.proto index 305ff3d5d..f1c506be0 100644 --- a/proto/osmosis/tokenfactory/v1beta1/genesis.proto +++ b/proto/osmosis/tokenfactory/v1beta1/genesis.proto @@ -18,6 +18,9 @@ message GenesisState { ]; } +// GenesisDenom defines a tokenfactory denom that is defined within genesis +// state. The structure contains DenomAuthorityMetadata which defines the +// denom's admin. message GenesisDenom { option (gogoproto.equal) = true; @@ -26,4 +29,4 @@ message GenesisDenom { (gogoproto.moretags) = "yaml:\"authority_metadata\"", (gogoproto.nullable) = false ]; -} \ No newline at end of file +} diff --git a/proto/osmosis/tokenfactory/v1beta1/params.proto b/proto/osmosis/tokenfactory/v1beta1/params.proto index 4bd96f977..35f08f4c5 100644 --- a/proto/osmosis/tokenfactory/v1beta1/params.proto +++ b/proto/osmosis/tokenfactory/v1beta1/params.proto @@ -7,15 +7,23 @@ option go_package = "github.com/neutron-org/neutron/x/tokenfactory/types"; import "cosmos_proto/cosmos.proto"; import "cosmos/base/v1beta1/coin.proto"; -// Params holds parameters for the tokenfactory module +// Params defines the parameters for the tokenfactory module. message Params { - // DenomCreationFee is the fee required to create a new denom using the tokenfactory module + // DenomCreationFee defines the fee to be charged on the creation of a new + // denom. The fee is drawn from the MsgCreateDenom's sender account, and + // transferred to the community pool. repeated cosmos.base.v1beta1.Coin denom_creation_fee = 1 [ (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins", (gogoproto.moretags) = "yaml:\"denom_creation_fee\"", (gogoproto.nullable) = false ]; - // FeeCollectorAddress is the address where fees collected from denom creation are sent to - string fee_collector_address = 2; + // DenomCreationGasConsume defines the gas cost for creating a new denom. + // This is intended as a spam deterrence mechanism. + // + // See: https://github.com/CosmWasm/token-factory/issues/11 + uint64 denom_creation_gas_consume = 2 [ + (gogoproto.moretags) = "yaml:\"denom_creation_gas_consume\"", + (gogoproto.nullable) = true + ]; } diff --git a/proto/osmosis/tokenfactory/v1beta1/query.proto b/proto/osmosis/tokenfactory/v1beta1/query.proto index a4ee8b4d6..4254767a7 100644 --- a/proto/osmosis/tokenfactory/v1beta1/query.proto +++ b/proto/osmosis/tokenfactory/v1beta1/query.proto @@ -10,21 +10,34 @@ option go_package = "github.com/neutron-org/neutron/x/tokenfactory/types"; // Query defines the gRPC querier service. service Query { - // Params returns the total set of minting parameters. + // Params defines a gRPC query method that returns the tokenfactory module's + // parameters. rpc Params(QueryParamsRequest) returns (QueryParamsResponse) { option (google.api.http).get = "/osmosis/tokenfactory/v1beta1/params"; } + // DenomAuthorityMetadata defines a gRPC query method for fetching + // DenomAuthorityMetadata for a particular denom. rpc DenomAuthorityMetadata(QueryDenomAuthorityMetadataRequest) - returns (QueryDenomAuthorityMetadataResponse) { + returns (QueryDenomAuthorityMetadataResponse) { option (google.api.http).get = - "/osmosis/tokenfactory/v1beta1/denoms/factory/{creator}/{subdenom}/authority_metadata"; + "/osmosis/tokenfactory/v1beta1/denoms/{denom}/authority_metadata"; } + // DenomsFromCreator defines a gRPC query method for fetching all + // denominations created by a specific admin/creator. rpc DenomsFromCreator(QueryDenomsFromCreatorRequest) - returns (QueryDenomsFromCreatorResponse) { + returns (QueryDenomsFromCreatorResponse) { option (google.api.http).get = - "/osmosis/tokenfactory/v1beta1/denoms_from_creator/{creator}"; + "/osmosis/tokenfactory/v1beta1/denoms_from_creator/{creator}"; + } + + // BeforeSendHookAddress defines a gRPC query method for + // getting the address registered for the before send hook. + rpc BeforeSendHookAddress(QueryBeforeSendHookAddressRequest) + returns (QueryBeforeSendHookAddressResponse) { + option (google.api.http).get = + "/osmosis/tokenfactory/v1beta1/denoms/{denom}/before_send_hook"; } } @@ -37,10 +50,14 @@ message QueryParamsResponse { Params params = 1 [ (gogoproto.nullable) = false ]; } +// QueryDenomAuthorityMetadataRequest defines the request structure for the +// DenomAuthorityMetadata gRPC query. message QueryDenomAuthorityMetadataRequest { - string creator = 1 [ (gogoproto.moretags) = "yaml:\"creator\"" ]; - string subdenom = 2 [ (gogoproto.moretags) = "yaml:\"subdenom\"" ]; + string denom = 1 [ (gogoproto.moretags) = "yaml:\"denom\"" ]; } + +// QueryDenomAuthorityMetadataResponse defines the response structure for the +// DenomAuthorityMetadata gRPC query. message QueryDenomAuthorityMetadataResponse { DenomAuthorityMetadata authority_metadata = 1 [ (gogoproto.moretags) = "yaml:\"authority_metadata\"", @@ -48,9 +65,25 @@ message QueryDenomAuthorityMetadataResponse { ]; } +// QueryDenomsFromCreatorRequest defines the request structure for the +// DenomsFromCreator gRPC query. message QueryDenomsFromCreatorRequest { string creator = 1 [ (gogoproto.moretags) = "yaml:\"creator\"" ]; } + +// QueryDenomsFromCreatorRequest defines the response structure for the +// DenomsFromCreator gRPC query. message QueryDenomsFromCreatorResponse { repeated string denoms = 1 [ (gogoproto.moretags) = "yaml:\"denoms\"" ]; } + +message QueryBeforeSendHookAddressRequest { + string denom = 1 [ (gogoproto.moretags) = "yaml:\"denom\"" ]; +} + +// QueryBeforeSendHookAddressResponse defines the response structure for the +// DenomBeforeSendHook gRPC query. +message QueryBeforeSendHookAddressResponse { + string cosmwasm_address = 1 + [ (gogoproto.moretags) = "yaml:\"cosmwasm_address\"" ]; +} diff --git a/x/tokenfactory/types/genesis.pb.go b/x/tokenfactory/types/genesis.pb.go index e3471a9ef..c8d948b77 100644 --- a/x/tokenfactory/types/genesis.pb.go +++ b/x/tokenfactory/types/genesis.pb.go @@ -77,6 +77,9 @@ func (m *GenesisState) GetFactoryDenoms() []GenesisDenom { return nil } +// GenesisDenom defines a tokenfactory denom that is defined within genesis +// state. The structure contains DenomAuthorityMetadata which defines the +// denom's admin. type GenesisDenom struct { Denom string `protobuf:"bytes,1,opt,name=denom,proto3" json:"denom,omitempty" yaml:"denom"` AuthorityMetadata DenomAuthorityMetadata `protobuf:"bytes,2,opt,name=authority_metadata,json=authorityMetadata,proto3" json:"authority_metadata" yaml:"authority_metadata"` diff --git a/x/tokenfactory/types/params.go b/x/tokenfactory/types/params.go index 8ec0c3c75..09d9cac75 100644 --- a/x/tokenfactory/types/params.go +++ b/x/tokenfactory/types/params.go @@ -32,8 +32,8 @@ func NewParams(denomCreationFee sdk.Coins, denomCreationGasConsume uint64) Param func DefaultParams() Params { return Params{ // For choice, see: https://github.com/osmosis-labs/osmosis/pull/4983 - DenomCreationFee: sdk.NewCoins(), // used to be 10 OSMO at launch. - FeeCollectorAddress: "", + DenomCreationFee: sdk.NewCoins(), // used to be 10 OSMO at launch. + DenomCreationGasConsume: uint64(DefaultCreationGasFee), } } diff --git a/x/tokenfactory/types/params.pb.go b/x/tokenfactory/types/params.pb.go index 3ca6e158d..5e9ce1d32 100644 --- a/x/tokenfactory/types/params.pb.go +++ b/x/tokenfactory/types/params.pb.go @@ -26,12 +26,17 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package -// Params holds parameters for the tokenfactory module +// Params defines the parameters for the tokenfactory module. type Params struct { - // DenomCreationFee is the fee required to create a new denom using the tokenfactory module + // DenomCreationFee defines the fee to be charged on the creation of a new + // denom. The fee is drawn from the MsgCreateDenom's sender account, and + // transferred to the community pool. DenomCreationFee github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,1,rep,name=denom_creation_fee,json=denomCreationFee,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"denom_creation_fee" yaml:"denom_creation_fee"` - // FeeCollectorAddress is the address where fees collected from denom creation are sent to - FeeCollectorAddress string `protobuf:"bytes,2,opt,name=fee_collector_address,json=feeCollectorAddress,proto3" json:"fee_collector_address,omitempty"` + // DenomCreationGasConsume defines the gas cost for creating a new denom. + // This is intended as a spam deterrence mechanism. + // + // See: https://github.com/CosmWasm/token-factory/issues/11 + DenomCreationGasConsume uint64 `protobuf:"varint,2,opt,name=denom_creation_gas_consume,json=denomCreationGasConsume,proto3" json:"denom_creation_gas_consume,omitempty" yaml:"denom_creation_gas_consume"` } func (m *Params) Reset() { *m = Params{} } @@ -74,11 +79,11 @@ func (m *Params) GetDenomCreationFee() github_com_cosmos_cosmos_sdk_types.Coins return nil } -func (m *Params) GetFeeCollectorAddress() string { +func (m *Params) GetDenomCreationGasConsume() uint64 { if m != nil { - return m.FeeCollectorAddress + return m.DenomCreationGasConsume } - return "" + return 0 } func init() { @@ -90,28 +95,28 @@ func init() { } var fileDescriptor_cc8299d306f3ff47 = []byte{ - // 322 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x91, 0xb1, 0x4e, 0x02, 0x41, - 0x10, 0x86, 0x6f, 0x35, 0x21, 0xf1, 0x6c, 0xcc, 0xa9, 0x09, 0x10, 0xb3, 0x10, 0x2a, 0x2c, 0xb8, - 0x0d, 0xd0, 0xd9, 0x09, 0x89, 0x1d, 0x89, 0xa1, 0xb4, 0xb9, 0xec, 0xdd, 0xcd, 0x9d, 0x17, 0xb8, - 0x1d, 0xb2, 0xbb, 0x18, 0x79, 0x0b, 0x2b, 0x1f, 0xc2, 0x27, 0xa1, 0xa4, 0x31, 0xb1, 0x42, 0x03, - 0x6f, 0xe0, 0x13, 0x18, 0x76, 0x17, 0x83, 0xb1, 0xda, 0x99, 0xfc, 0xff, 0x7c, 0xf3, 0x67, 0xd6, - 0xbf, 0x46, 0x55, 0xa2, 0x2a, 0x14, 0xd3, 0x38, 0x01, 0x91, 0xf1, 0x44, 0xa3, 0x5c, 0xb0, 0xa7, - 0x6e, 0x0c, 0x9a, 0x77, 0xd9, 0x8c, 0x4b, 0x5e, 0xaa, 0x70, 0x26, 0x51, 0x63, 0x70, 0xe5, 0xac, - 0xe1, 0xa1, 0x35, 0x74, 0xd6, 0xfa, 0x45, 0x8e, 0x39, 0x1a, 0x23, 0xdb, 0x55, 0x76, 0xa6, 0x5e, - 0x4b, 0xcc, 0x50, 0x64, 0x05, 0xdb, 0x38, 0x89, 0xda, 0x8e, 0xc5, 0x5c, 0xc1, 0xef, 0xc2, 0x04, - 0x0b, 0x61, 0xf5, 0xd6, 0x3b, 0xf1, 0x2b, 0xf7, 0x66, 0x7f, 0xf0, 0x4a, 0xfc, 0x20, 0x05, 0x81, - 0x65, 0x94, 0x48, 0xe0, 0xba, 0x40, 0x11, 0x65, 0x00, 0x55, 0xd2, 0x3c, 0x6e, 0x9f, 0xf6, 0x6a, - 0xa1, 0xc3, 0xee, 0x40, 0xfb, 0x38, 0xe1, 0x10, 0x0b, 0x31, 0x18, 0x2d, 0xd7, 0x0d, 0xef, 0x7b, - 0xdd, 0xa8, 0x2d, 0x78, 0x39, 0xbd, 0x69, 0xfd, 0x47, 0xb4, 0xde, 0x3e, 0x1b, 0xed, 0xbc, 0xd0, - 0x8f, 0xf3, 0x38, 0x4c, 0xb0, 0x74, 0x01, 0xdd, 0xd3, 0x51, 0xe9, 0x84, 0xe9, 0xc5, 0x0c, 0x94, - 0xa1, 0xa9, 0xf1, 0x99, 0x01, 0x0c, 0xdd, 0xfc, 0x1d, 0x40, 0xd0, 0xf3, 0x2f, 0x33, 0x80, 0x28, - 0xc1, 0xe9, 0x14, 0x76, 0xe7, 0x88, 0x78, 0x9a, 0x4a, 0x50, 0xaa, 0x7a, 0xd4, 0x24, 0xed, 0x93, - 0xf1, 0x79, 0x06, 0x30, 0xdc, 0x6b, 0xb7, 0x56, 0x1a, 0x8c, 0x96, 0x1b, 0x4a, 0x56, 0x1b, 0x4a, - 0xbe, 0x36, 0x94, 0xbc, 0x6c, 0xa9, 0xb7, 0xda, 0x52, 0xef, 0x63, 0x4b, 0xbd, 0x87, 0xfe, 0x41, - 0x12, 0x01, 0x73, 0x2d, 0x51, 0x74, 0x50, 0xe6, 0xfb, 0x9a, 0x3d, 0xff, 0xfd, 0x24, 0x13, 0x2d, - 0xae, 0x98, 0x6b, 0xf5, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x58, 0x8c, 0xda, 0x7f, 0xc9, 0x01, - 0x00, 0x00, + // 332 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x91, 0x31, 0x4f, 0xc2, 0x40, + 0x14, 0xc7, 0x7b, 0x68, 0x18, 0xea, 0x62, 0x1a, 0x13, 0x81, 0x98, 0x2b, 0x76, 0x82, 0x81, 0x5e, + 0x90, 0xcd, 0x11, 0x12, 0x9d, 0x48, 0x0c, 0xa3, 0x4b, 0x73, 0x2d, 0x8f, 0xda, 0x60, 0xef, 0x91, + 0xde, 0x61, 0xe4, 0x23, 0xb8, 0x39, 0xf9, 0x21, 0xfc, 0x24, 0x8c, 0x8c, 0x4e, 0xd5, 0xc0, 0x37, + 0xe0, 0x13, 0x18, 0xae, 0x87, 0x29, 0xea, 0x74, 0xef, 0xe5, 0xff, 0x7f, 0xbf, 0xf7, 0xbf, 0x3b, + 0xbb, 0x8d, 0x32, 0x45, 0x99, 0x48, 0xa6, 0x70, 0x0a, 0x62, 0xc2, 0x23, 0x85, 0xd9, 0x82, 0x3d, + 0x75, 0x43, 0x50, 0xbc, 0xcb, 0x66, 0x3c, 0xe3, 0xa9, 0xf4, 0x67, 0x19, 0x2a, 0x74, 0x2e, 0x8c, + 0xd5, 0x2f, 0x5b, 0x7d, 0x63, 0x6d, 0x9c, 0xc5, 0x18, 0xa3, 0x36, 0xb2, 0x5d, 0x55, 0xcc, 0x34, + 0xea, 0x91, 0x1e, 0x0a, 0x0a, 0xa1, 0x68, 0x8c, 0x44, 0x8b, 0x8e, 0x85, 0x5c, 0xc2, 0xcf, 0xc2, + 0x08, 0x13, 0x51, 0xe8, 0xde, 0x4b, 0xc5, 0xae, 0xde, 0xe9, 0xfd, 0xce, 0x1b, 0xb1, 0x9d, 0x31, + 0x08, 0x4c, 0x83, 0x28, 0x03, 0xae, 0x12, 0x14, 0xc1, 0x04, 0xa0, 0x46, 0x9a, 0x47, 0xad, 0x93, + 0xab, 0xba, 0x6f, 0xb0, 0x3b, 0xd0, 0x3e, 0x8e, 0x3f, 0xc0, 0x44, 0xf4, 0x87, 0xcb, 0xdc, 0xb5, + 0xb6, 0xb9, 0x5b, 0x5f, 0xf0, 0xf4, 0xf1, 0xda, 0xfb, 0x8b, 0xf0, 0xde, 0x3f, 0xdd, 0x56, 0x9c, + 0xa8, 0x87, 0x79, 0xe8, 0x47, 0x98, 0x9a, 0x80, 0xe6, 0xe8, 0xc8, 0xf1, 0x94, 0xa9, 0xc5, 0x0c, + 0xa4, 0xa6, 0xc9, 0xd1, 0xa9, 0x06, 0x0c, 0xcc, 0xfc, 0x0d, 0x80, 0x33, 0xb1, 0x1b, 0xbf, 0xa0, + 0x31, 0x97, 0x41, 0x84, 0x42, 0xce, 0x53, 0xa8, 0x55, 0x9a, 0xa4, 0x75, 0xdc, 0x6f, 0x2f, 0x73, + 0x97, 0x6c, 0x73, 0xf7, 0xf2, 0xdf, 0x10, 0x25, 0xbf, 0x37, 0x3a, 0x3f, 0x58, 0x70, 0xcb, 0xe5, + 0xa0, 0x50, 0xfa, 0xc3, 0xe5, 0x9a, 0x92, 0xd5, 0x9a, 0x92, 0xaf, 0x35, 0x25, 0xaf, 0x1b, 0x6a, + 0xad, 0x36, 0xd4, 0xfa, 0xd8, 0x50, 0xeb, 0xbe, 0x57, 0x4a, 0x2f, 0x60, 0xae, 0x32, 0x14, 0x1d, + 0xcc, 0xe2, 0x7d, 0xcd, 0x9e, 0x0f, 0x3f, 0x56, 0x5f, 0x27, 0xac, 0xea, 0x17, 0xee, 0x7d, 0x07, + 0x00, 0x00, 0xff, 0xff, 0x32, 0xf6, 0xab, 0x50, 0xfd, 0x01, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { @@ -134,12 +139,10 @@ func (m *Params) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if len(m.FeeCollectorAddress) > 0 { - i -= len(m.FeeCollectorAddress) - copy(dAtA[i:], m.FeeCollectorAddress) - i = encodeVarintParams(dAtA, i, uint64(len(m.FeeCollectorAddress))) + if m.DenomCreationGasConsume != 0 { + i = encodeVarintParams(dAtA, i, uint64(m.DenomCreationGasConsume)) i-- - dAtA[i] = 0x12 + dAtA[i] = 0x10 } if len(m.DenomCreationFee) > 0 { for iNdEx := len(m.DenomCreationFee) - 1; iNdEx >= 0; iNdEx-- { @@ -181,9 +184,8 @@ func (m *Params) Size() (n int) { n += 1 + l + sovParams(uint64(l)) } } - l = len(m.FeeCollectorAddress) - if l > 0 { - n += 1 + l + sovParams(uint64(l)) + if m.DenomCreationGasConsume != 0 { + n += 1 + sovParams(uint64(m.DenomCreationGasConsume)) } return n } @@ -258,10 +260,10 @@ func (m *Params) Unmarshal(dAtA []byte) error { } iNdEx = postIndex case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field FeeCollectorAddress", wireType) + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field DenomCreationGasConsume", wireType) } - var stringLen uint64 + m.DenomCreationGasConsume = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowParams @@ -271,24 +273,11 @@ func (m *Params) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= uint64(b&0x7F) << shift + m.DenomCreationGasConsume |= 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.FeeCollectorAddress = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipParams(dAtA[iNdEx:]) diff --git a/x/tokenfactory/types/query.pb.go b/x/tokenfactory/types/query.pb.go index bc94c2473..126c06e8b 100644 --- a/x/tokenfactory/types/query.pb.go +++ b/x/tokenfactory/types/query.pb.go @@ -112,9 +112,10 @@ func (m *QueryParamsResponse) GetParams() Params { return Params{} } +// QueryDenomAuthorityMetadataRequest defines the request structure for the +// DenomAuthorityMetadata gRPC query. type QueryDenomAuthorityMetadataRequest struct { - Creator string `protobuf:"bytes,1,opt,name=creator,proto3" json:"creator,omitempty" yaml:"creator"` - Subdenom string `protobuf:"bytes,2,opt,name=subdenom,proto3" json:"subdenom,omitempty" yaml:"subdenom"` + Denom string `protobuf:"bytes,1,opt,name=denom,proto3" json:"denom,omitempty" yaml:"denom"` } func (m *QueryDenomAuthorityMetadataRequest) Reset() { *m = QueryDenomAuthorityMetadataRequest{} } @@ -150,20 +151,15 @@ func (m *QueryDenomAuthorityMetadataRequest) XXX_DiscardUnknown() { var xxx_messageInfo_QueryDenomAuthorityMetadataRequest proto.InternalMessageInfo -func (m *QueryDenomAuthorityMetadataRequest) GetCreator() string { +func (m *QueryDenomAuthorityMetadataRequest) GetDenom() string { if m != nil { - return m.Creator - } - return "" -} - -func (m *QueryDenomAuthorityMetadataRequest) GetSubdenom() string { - if m != nil { - return m.Subdenom + return m.Denom } return "" } +// QueryDenomAuthorityMetadataResponse defines the response structure for the +// DenomAuthorityMetadata gRPC query. type QueryDenomAuthorityMetadataResponse struct { AuthorityMetadata DenomAuthorityMetadata `protobuf:"bytes,1,opt,name=authority_metadata,json=authorityMetadata,proto3" json:"authority_metadata" yaml:"authority_metadata"` } @@ -208,6 +204,8 @@ func (m *QueryDenomAuthorityMetadataResponse) GetAuthorityMetadata() DenomAuthor return DenomAuthorityMetadata{} } +// QueryDenomsFromCreatorRequest defines the request structure for the +// DenomsFromCreator gRPC query. type QueryDenomsFromCreatorRequest struct { Creator string `protobuf:"bytes,1,opt,name=creator,proto3" json:"creator,omitempty" yaml:"creator"` } @@ -252,6 +250,8 @@ func (m *QueryDenomsFromCreatorRequest) GetCreator() string { return "" } +// QueryDenomsFromCreatorRequest defines the response structure for the +// DenomsFromCreator gRPC query. type QueryDenomsFromCreatorResponse struct { Denoms []string `protobuf:"bytes,1,rep,name=denoms,proto3" json:"denoms,omitempty" yaml:"denoms"` } @@ -296,6 +296,96 @@ func (m *QueryDenomsFromCreatorResponse) GetDenoms() []string { return nil } +type QueryBeforeSendHookAddressRequest struct { + Denom string `protobuf:"bytes,1,opt,name=denom,proto3" json:"denom,omitempty" yaml:"denom"` +} + +func (m *QueryBeforeSendHookAddressRequest) Reset() { *m = QueryBeforeSendHookAddressRequest{} } +func (m *QueryBeforeSendHookAddressRequest) String() string { return proto.CompactTextString(m) } +func (*QueryBeforeSendHookAddressRequest) ProtoMessage() {} +func (*QueryBeforeSendHookAddressRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_6f22013ad0f72e3f, []int{6} +} +func (m *QueryBeforeSendHookAddressRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryBeforeSendHookAddressRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryBeforeSendHookAddressRequest.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 *QueryBeforeSendHookAddressRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryBeforeSendHookAddressRequest.Merge(m, src) +} +func (m *QueryBeforeSendHookAddressRequest) XXX_Size() int { + return m.Size() +} +func (m *QueryBeforeSendHookAddressRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryBeforeSendHookAddressRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryBeforeSendHookAddressRequest proto.InternalMessageInfo + +func (m *QueryBeforeSendHookAddressRequest) GetDenom() string { + if m != nil { + return m.Denom + } + return "" +} + +// QueryBeforeSendHookAddressResponse defines the response structure for the +// DenomBeforeSendHook gRPC query. +type QueryBeforeSendHookAddressResponse struct { + CosmwasmAddress string `protobuf:"bytes,1,opt,name=cosmwasm_address,json=cosmwasmAddress,proto3" json:"cosmwasm_address,omitempty" yaml:"cosmwasm_address"` +} + +func (m *QueryBeforeSendHookAddressResponse) Reset() { *m = QueryBeforeSendHookAddressResponse{} } +func (m *QueryBeforeSendHookAddressResponse) String() string { return proto.CompactTextString(m) } +func (*QueryBeforeSendHookAddressResponse) ProtoMessage() {} +func (*QueryBeforeSendHookAddressResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_6f22013ad0f72e3f, []int{7} +} +func (m *QueryBeforeSendHookAddressResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryBeforeSendHookAddressResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryBeforeSendHookAddressResponse.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 *QueryBeforeSendHookAddressResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryBeforeSendHookAddressResponse.Merge(m, src) +} +func (m *QueryBeforeSendHookAddressResponse) XXX_Size() int { + return m.Size() +} +func (m *QueryBeforeSendHookAddressResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QueryBeforeSendHookAddressResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryBeforeSendHookAddressResponse proto.InternalMessageInfo + +func (m *QueryBeforeSendHookAddressResponse) GetCosmwasmAddress() string { + if m != nil { + return m.CosmwasmAddress + } + return "" +} + func init() { proto.RegisterType((*QueryParamsRequest)(nil), "osmosis.tokenfactory.v1beta1.QueryParamsRequest") proto.RegisterType((*QueryParamsResponse)(nil), "osmosis.tokenfactory.v1beta1.QueryParamsResponse") @@ -303,6 +393,8 @@ func init() { proto.RegisterType((*QueryDenomAuthorityMetadataResponse)(nil), "osmosis.tokenfactory.v1beta1.QueryDenomAuthorityMetadataResponse") proto.RegisterType((*QueryDenomsFromCreatorRequest)(nil), "osmosis.tokenfactory.v1beta1.QueryDenomsFromCreatorRequest") proto.RegisterType((*QueryDenomsFromCreatorResponse)(nil), "osmosis.tokenfactory.v1beta1.QueryDenomsFromCreatorResponse") + proto.RegisterType((*QueryBeforeSendHookAddressRequest)(nil), "osmosis.tokenfactory.v1beta1.QueryBeforeSendHookAddressRequest") + proto.RegisterType((*QueryBeforeSendHookAddressResponse)(nil), "osmosis.tokenfactory.v1beta1.QueryBeforeSendHookAddressResponse") } func init() { @@ -310,43 +402,48 @@ func init() { } var fileDescriptor_6f22013ad0f72e3f = []byte{ - // 566 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x94, 0x41, 0x6b, 0x13, 0x41, - 0x14, 0xc7, 0x33, 0xb5, 0x46, 0x3b, 0xa2, 0x92, 0x69, 0x91, 0x1a, 0xea, 0x46, 0xc7, 0x22, 0x29, - 0xd4, 0x1d, 0xd3, 0xf6, 0x64, 0x15, 0xec, 0x56, 0xbc, 0x48, 0x40, 0x17, 0x11, 0x14, 0x21, 0x4c, - 0xd2, 0xe9, 0x36, 0xd8, 0xdd, 0x97, 0xce, 0xce, 0x8a, 0xa1, 0xf4, 0xa2, 0xe0, 0x59, 0xf0, 0xe8, - 0x77, 0xf0, 0x73, 0xf4, 0x58, 0xe8, 0xc5, 0x53, 0x90, 0xc4, 0x4f, 0x90, 0x9b, 0x78, 0x91, 0xcc, - 0x4c, 0x5a, 0xeb, 0xc6, 0x25, 0xd6, 0xdb, 0x32, 0xef, 0xff, 0xfe, 0xef, 0xfd, 0xde, 0x7b, 0x2c, - 0x2e, 0x43, 0x1c, 0x42, 0xdc, 0x8c, 0x99, 0x82, 0xd7, 0x22, 0xda, 0xe4, 0x0d, 0x05, 0xb2, 0xcd, - 0xde, 0x54, 0xea, 0x42, 0xf1, 0x0a, 0xdb, 0x49, 0x84, 0x6c, 0xbb, 0x2d, 0x09, 0x0a, 0xc8, 0x9c, - 0x55, 0xba, 0xbf, 0x2b, 0x5d, 0xab, 0x2c, 0xce, 0x04, 0x10, 0x80, 0x16, 0xb2, 0xc1, 0x97, 0xc9, - 0x29, 0xce, 0x05, 0x00, 0xc1, 0xb6, 0x60, 0xbc, 0xd5, 0x64, 0x3c, 0x8a, 0x40, 0x71, 0xd5, 0x84, - 0x28, 0xb6, 0xd1, 0x95, 0xcc, 0xda, 0x3c, 0x51, 0x5b, 0x20, 0x9b, 0xaa, 0x5d, 0x15, 0x8a, 0x6f, - 0x70, 0xc5, 0x6d, 0xd6, 0x42, 0x66, 0x56, 0x8b, 0x4b, 0x1e, 0xda, 0x02, 0x74, 0x06, 0x93, 0xa7, - 0x03, 0x82, 0x27, 0xfa, 0xd1, 0x17, 0x3b, 0x89, 0x88, 0x15, 0x7d, 0x81, 0xa7, 0x4f, 0xbc, 0xc6, - 0x2d, 0x88, 0x62, 0x41, 0x3c, 0x9c, 0x37, 0xc9, 0xb3, 0xe8, 0x3a, 0x2a, 0x5f, 0x58, 0x9a, 0x77, - 0xb3, 0x80, 0x5d, 0x93, 0xed, 0x4d, 0xee, 0x77, 0x4a, 0x39, 0xdf, 0x66, 0xd2, 0xf7, 0x08, 0x53, - 0xed, 0xfd, 0x50, 0x44, 0x10, 0xae, 0xfd, 0x49, 0x60, 0x3b, 0x20, 0x8b, 0xf8, 0x5c, 0x43, 0x0a, - 0xae, 0x40, 0xea, 0x5a, 0x53, 0x1e, 0xe9, 0x77, 0x4a, 0x97, 0xda, 0x3c, 0xdc, 0xbe, 0x4b, 0x6d, - 0x80, 0xfa, 0x43, 0x09, 0x61, 0xf8, 0x7c, 0x9c, 0xd4, 0x37, 0x06, 0x8e, 0xb3, 0x13, 0x5a, 0x3e, - 0xdd, 0xef, 0x94, 0x2e, 0x1b, 0xf9, 0x30, 0x42, 0xfd, 0x23, 0x11, 0xfd, 0x82, 0xf0, 0xcd, 0xcc, - 0x2e, 0x2c, 0xf1, 0x07, 0x84, 0xc9, 0xd1, 0x94, 0x6b, 0xa1, 0x0d, 0x5b, 0xfc, 0x95, 0x6c, 0xfc, - 0xd1, 0xd6, 0xde, 0x8d, 0xc1, 0x38, 0xfa, 0x9d, 0xd2, 0x55, 0xd3, 0x5d, 0xda, 0x9d, 0xfa, 0x85, - 0xd4, 0x62, 0x69, 0x15, 0x5f, 0x3b, 0xee, 0x37, 0x7e, 0x24, 0x21, 0x5c, 0x37, 0xec, 0xa7, 0x1a, - 0x18, 0x7d, 0x8c, 0x9d, 0xbf, 0xd9, 0x59, 0xf2, 0x05, 0x9c, 0xd7, 0xa3, 0x1a, 0xec, 0xfa, 0x4c, - 0x79, 0xca, 0x2b, 0xf4, 0x3b, 0xa5, 0x8b, 0xc6, 0xce, 0xbc, 0x53, 0xdf, 0x0a, 0x96, 0x7e, 0x4c, - 0xe2, 0xb3, 0xda, 0x8d, 0x7c, 0x46, 0x38, 0x6f, 0xb6, 0x4e, 0xee, 0x64, 0x0f, 0x27, 0x7d, 0x74, - 0xc5, 0xca, 0x3f, 0x64, 0x98, 0x26, 0xe9, 0xe2, 0xbb, 0xc3, 0xef, 0x9f, 0x26, 0x6e, 0x91, 0x79, - 0x36, 0xc6, 0xc5, 0x93, 0x9f, 0x08, 0x5f, 0x19, 0xbd, 0x14, 0xf2, 0x60, 0x8c, 0xda, 0x99, 0x07, - 0x5b, 0x5c, 0xfb, 0x0f, 0x07, 0x4b, 0xf3, 0x4a, 0xd3, 0x3c, 0x27, 0xcf, 0xb2, 0x69, 0xcc, 0xd4, - 0xd9, 0xf0, 0x79, 0xd7, 0xee, 0x74, 0x8f, 0xed, 0x0e, 0xcf, 0x7b, 0x8f, 0xa5, 0xaf, 0x8a, 0x1c, - 0x22, 0x5c, 0x48, 0xad, 0x9b, 0xac, 0x8e, 0xdb, 0xf6, 0x88, 0x9b, 0x2b, 0xde, 0x3b, 0x5d, 0xb2, - 0xc5, 0x5d, 0xd7, 0xb8, 0xf7, 0xc9, 0xea, 0x38, 0xb8, 0xb5, 0x4d, 0x09, 0x61, 0xcd, 0xa2, 0x1e, - 0x33, 0x7b, 0xd5, 0xfd, 0xae, 0x83, 0x0e, 0xba, 0x0e, 0xfa, 0xd6, 0x75, 0xd0, 0xc7, 0x9e, 0x93, - 0x3b, 0xe8, 0x39, 0xb9, 0xaf, 0x3d, 0x27, 0xf7, 0x72, 0x39, 0x68, 0xaa, 0xad, 0xa4, 0xee, 0x36, - 0x20, 0x64, 0x91, 0x48, 0x94, 0x84, 0xe8, 0x36, 0xc8, 0x60, 0xf8, 0xcd, 0xde, 0x9e, 0x2c, 0xa7, - 0xda, 0x2d, 0x11, 0xd7, 0xf3, 0xfa, 0xaf, 0xb8, 0xfc, 0x2b, 0x00, 0x00, 0xff, 0xff, 0x28, 0x2a, - 0x3f, 0xc8, 0xf4, 0x05, 0x00, 0x00, + // 653 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x95, 0x4d, 0x4f, 0x53, 0x4d, + 0x14, 0xc7, 0x7b, 0x9f, 0x47, 0x6a, 0x18, 0xdf, 0x60, 0xc4, 0xb7, 0x8a, 0xb7, 0x32, 0x12, 0x02, + 0x09, 0x76, 0xe4, 0x65, 0x25, 0x12, 0xe8, 0x45, 0xd1, 0x04, 0x49, 0xf4, 0xba, 0xd2, 0x4d, 0x33, + 0x6d, 0x87, 0xd2, 0xc0, 0xbd, 0xa7, 0xcc, 0x4c, 0xd5, 0x86, 0xb0, 0x71, 0xe1, 0xda, 0xc4, 0xa5, + 0xdf, 0xc1, 0xcf, 0xc1, 0x92, 0x84, 0x8d, 0xab, 0x46, 0xc1, 0xf8, 0x01, 0xfa, 0x09, 0x4c, 0xe7, + 0x9e, 0x2a, 0xd0, 0x72, 0xd3, 0xe2, 0xaa, 0x37, 0xe7, 0xe5, 0x7f, 0xce, 0x6f, 0xce, 0x39, 0x29, + 0x19, 0x07, 0x1d, 0x80, 0x2e, 0x6b, 0x6e, 0x60, 0x43, 0x86, 0x6b, 0xa2, 0x60, 0x40, 0xd5, 0xf8, + 0xdb, 0xa9, 0xbc, 0x34, 0x62, 0x8a, 0x6f, 0x55, 0xa5, 0xaa, 0x65, 0x2a, 0x0a, 0x0c, 0xd0, 0x61, + 0x8c, 0xcc, 0x1c, 0x8d, 0xcc, 0x60, 0x64, 0x6a, 0xa8, 0x04, 0x25, 0xb0, 0x81, 0xbc, 0xf9, 0x15, + 0xe5, 0xa4, 0x86, 0x4b, 0x00, 0xa5, 0x4d, 0xc9, 0x45, 0xa5, 0xcc, 0x45, 0x18, 0x82, 0x11, 0xa6, + 0x0c, 0xa1, 0x46, 0xef, 0x6c, 0x6c, 0x6d, 0x51, 0x35, 0xeb, 0xa0, 0xca, 0xa6, 0xb6, 0x2a, 0x8d, + 0x28, 0x0a, 0x23, 0x30, 0x6b, 0x22, 0x36, 0xab, 0x22, 0x94, 0x08, 0xb0, 0x00, 0x1b, 0x22, 0xf4, + 0x65, 0x93, 0xe0, 0x85, 0x35, 0xfa, 0x72, 0xab, 0x2a, 0xb5, 0x61, 0xaf, 0xc9, 0xd5, 0x63, 0x56, + 0x5d, 0x81, 0x50, 0x4b, 0xea, 0x91, 0x64, 0x94, 0x7c, 0xd3, 0xb9, 0xeb, 0x8c, 0x5f, 0x98, 0x1e, + 0xcd, 0xc4, 0x01, 0x67, 0xa2, 0x6c, 0xef, 0xdc, 0x6e, 0x3d, 0x9d, 0xf0, 0x31, 0x93, 0x3d, 0x27, + 0xcc, 0x4a, 0x3f, 0x96, 0x21, 0x04, 0xd9, 0x93, 0x00, 0xd8, 0x00, 0x1d, 0x23, 0x7d, 0xc5, 0x66, + 0x80, 0x2d, 0xd4, 0xef, 0x0d, 0x34, 0xea, 0xe9, 0x8b, 0x35, 0x11, 0x6c, 0x3e, 0x64, 0xd6, 0xcc, + 0xfc, 0xc8, 0xcd, 0xbe, 0x3a, 0xe4, 0x5e, 0xac, 0x1c, 0x76, 0xfe, 0xd1, 0x21, 0xf4, 0xcf, 0x6b, + 0xe5, 0x02, 0x74, 0x23, 0xc6, 0x6c, 0x3c, 0x46, 0x67, 0x69, 0x6f, 0xa4, 0x89, 0xd5, 0xa8, 0xa7, + 0x6f, 0x45, 0x7d, 0xb5, 0xab, 0x33, 0x7f, 0xb0, 0x6d, 0x40, 0x6c, 0x95, 0xdc, 0xf9, 0xdb, 0xaf, + 0x5e, 0x56, 0x10, 0x2c, 0x29, 0x29, 0x0c, 0xa8, 0x16, 0xf9, 0x24, 0x39, 0x5f, 0x88, 0x2c, 0xc8, + 0x4e, 0x1b, 0xf5, 0xf4, 0xe5, 0xa8, 0x06, 0x3a, 0x98, 0xdf, 0x0a, 0x61, 0x2b, 0xc4, 0x3d, 0x4d, + 0x0e, 0xc9, 0x27, 0x48, 0xd2, 0x3e, 0x55, 0x73, 0x66, 0xff, 0x8f, 0xf7, 0x7b, 0x83, 0x8d, 0x7a, + 0xfa, 0xd2, 0x91, 0xa7, 0xd4, 0xcc, 0xc7, 0x00, 0xb6, 0x42, 0x46, 0xac, 0x98, 0x27, 0xd7, 0x40, + 0xc9, 0x57, 0x32, 0x2c, 0x3e, 0x03, 0xd8, 0xc8, 0x16, 0x8b, 0x4a, 0x6a, 0xdd, 0xeb, 0x64, 0x36, + 0x71, 0xce, 0xa7, 0x88, 0x61, 0x77, 0xcb, 0x64, 0xa0, 0x00, 0x3a, 0x78, 0x27, 0x74, 0x90, 0x13, + 0x91, 0x0f, 0x85, 0x6f, 0x37, 0xea, 0xe9, 0x1b, 0x88, 0x7d, 0x22, 0x82, 0xf9, 0x57, 0x5a, 0x26, + 0xd4, 0x9b, 0xde, 0x4d, 0x92, 0x3e, 0x5b, 0x8e, 0x7e, 0x71, 0x48, 0x32, 0x5a, 0x3c, 0xfa, 0x20, + 0x7e, 0xae, 0xed, 0x7b, 0x9f, 0x9a, 0xea, 0x21, 0x23, 0x22, 0x60, 0x93, 0x1f, 0xf6, 0x7f, 0x7e, + 0xfe, 0x6f, 0x8c, 0x8e, 0xf2, 0x2e, 0x8e, 0x8e, 0xfe, 0x72, 0xc8, 0xf5, 0xce, 0xfb, 0x44, 0x17, + 0xbb, 0xa8, 0x1d, 0x7b, 0x34, 0xa9, 0xec, 0x3f, 0x28, 0x20, 0xcd, 0x53, 0x4b, 0x93, 0xa5, 0x0b, + 0xf1, 0x34, 0xd1, 0xc2, 0xf0, 0x6d, 0xfb, 0xbb, 0xc3, 0xdb, 0x77, 0x9f, 0xee, 0x3b, 0x64, 0xb0, + 0x6d, 0x29, 0xe9, 0x5c, 0xb7, 0x1d, 0x76, 0xb8, 0x8c, 0xd4, 0xa3, 0xb3, 0x25, 0x23, 0xd9, 0x92, + 0x25, 0x9b, 0xa7, 0x73, 0xdd, 0x90, 0xe5, 0xd6, 0x14, 0x04, 0x39, 0x3c, 0x32, 0xbe, 0x8d, 0x1f, + 0x3b, 0xf4, 0x87, 0x43, 0xae, 0x75, 0x5c, 0x68, 0xba, 0xd0, 0x45, 0x73, 0x71, 0x77, 0x95, 0x5a, + 0x3c, 0xbb, 0x00, 0x12, 0x3e, 0xb1, 0x84, 0x0b, 0x74, 0xbe, 0xa7, 0xd9, 0xe5, 0xad, 0x66, 0x4e, + 0xcb, 0xb0, 0x98, 0x5b, 0x07, 0xd8, 0xf0, 0x56, 0x77, 0x0f, 0x5c, 0x67, 0xef, 0xc0, 0x75, 0xbe, + 0x1f, 0xb8, 0xce, 0xa7, 0x43, 0x37, 0xb1, 0x77, 0xe8, 0x26, 0xbe, 0x1d, 0xba, 0x89, 0x37, 0x33, + 0xa5, 0xb2, 0x59, 0xaf, 0xe6, 0x33, 0x05, 0x08, 0x78, 0x28, 0xab, 0x46, 0x41, 0x78, 0x1f, 0x54, + 0xa9, 0xf5, 0xcd, 0xdf, 0x1f, 0x2f, 0x68, 0x6a, 0x15, 0xa9, 0xf3, 0x49, 0xfb, 0x3f, 0x33, 0xf3, + 0x3b, 0x00, 0x00, 0xff, 0xff, 0x7f, 0x1b, 0x6a, 0xf2, 0x46, 0x07, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -361,10 +458,18 @@ const _ = grpc.SupportPackageIsVersion4 // // 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 returns the total set of minting parameters. + // Params defines a gRPC query method that returns the tokenfactory module's + // parameters. Params(ctx context.Context, in *QueryParamsRequest, opts ...grpc.CallOption) (*QueryParamsResponse, error) + // DenomAuthorityMetadata defines a gRPC query method for fetching + // DenomAuthorityMetadata for a particular denom. DenomAuthorityMetadata(ctx context.Context, in *QueryDenomAuthorityMetadataRequest, opts ...grpc.CallOption) (*QueryDenomAuthorityMetadataResponse, error) + // DenomsFromCreator defines a gRPC query method for fetching all + // denominations created by a specific admin/creator. DenomsFromCreator(ctx context.Context, in *QueryDenomsFromCreatorRequest, opts ...grpc.CallOption) (*QueryDenomsFromCreatorResponse, error) + // BeforeSendHookAddress defines a gRPC query method for + // getting the address registered for the before send hook. + BeforeSendHookAddress(ctx context.Context, in *QueryBeforeSendHookAddressRequest, opts ...grpc.CallOption) (*QueryBeforeSendHookAddressResponse, error) } type queryClient struct { @@ -402,12 +507,29 @@ func (c *queryClient) DenomsFromCreator(ctx context.Context, in *QueryDenomsFrom return out, nil } +func (c *queryClient) BeforeSendHookAddress(ctx context.Context, in *QueryBeforeSendHookAddressRequest, opts ...grpc.CallOption) (*QueryBeforeSendHookAddressResponse, error) { + out := new(QueryBeforeSendHookAddressResponse) + err := c.cc.Invoke(ctx, "/osmosis.tokenfactory.v1beta1.Query/BeforeSendHookAddress", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + // QueryServer is the server API for Query service. type QueryServer interface { - // Params returns the total set of minting parameters. + // Params defines a gRPC query method that returns the tokenfactory module's + // parameters. Params(context.Context, *QueryParamsRequest) (*QueryParamsResponse, error) + // DenomAuthorityMetadata defines a gRPC query method for fetching + // DenomAuthorityMetadata for a particular denom. DenomAuthorityMetadata(context.Context, *QueryDenomAuthorityMetadataRequest) (*QueryDenomAuthorityMetadataResponse, error) + // DenomsFromCreator defines a gRPC query method for fetching all + // denominations created by a specific admin/creator. DenomsFromCreator(context.Context, *QueryDenomsFromCreatorRequest) (*QueryDenomsFromCreatorResponse, error) + // BeforeSendHookAddress defines a gRPC query method for + // getting the address registered for the before send hook. + BeforeSendHookAddress(context.Context, *QueryBeforeSendHookAddressRequest) (*QueryBeforeSendHookAddressResponse, error) } // UnimplementedQueryServer can be embedded to have forward compatible implementations. @@ -423,6 +545,9 @@ func (*UnimplementedQueryServer) DenomAuthorityMetadata(ctx context.Context, req func (*UnimplementedQueryServer) DenomsFromCreator(ctx context.Context, req *QueryDenomsFromCreatorRequest) (*QueryDenomsFromCreatorResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method DenomsFromCreator not implemented") } +func (*UnimplementedQueryServer) BeforeSendHookAddress(ctx context.Context, req *QueryBeforeSendHookAddressRequest) (*QueryBeforeSendHookAddressResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method BeforeSendHookAddress not implemented") +} func RegisterQueryServer(s grpc1.Server, srv QueryServer) { s.RegisterService(&_Query_serviceDesc, srv) @@ -482,6 +607,24 @@ func _Query_DenomsFromCreator_Handler(srv interface{}, ctx context.Context, dec return interceptor(ctx, in, info, handler) } +func _Query_BeforeSendHookAddress_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QueryBeforeSendHookAddressRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(QueryServer).BeforeSendHookAddress(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/osmosis.tokenfactory.v1beta1.Query/BeforeSendHookAddress", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(QueryServer).BeforeSendHookAddress(ctx, req.(*QueryBeforeSendHookAddressRequest)) + } + return interceptor(ctx, in, info, handler) +} + var _Query_serviceDesc = grpc.ServiceDesc{ ServiceName: "osmosis.tokenfactory.v1beta1.Query", HandlerType: (*QueryServer)(nil), @@ -498,6 +641,10 @@ var _Query_serviceDesc = grpc.ServiceDesc{ MethodName: "DenomsFromCreator", Handler: _Query_DenomsFromCreator_Handler, }, + { + MethodName: "BeforeSendHookAddress", + Handler: _Query_BeforeSendHookAddress_Handler, + }, }, Streams: []grpc.StreamDesc{}, Metadata: "osmosis/tokenfactory/v1beta1/query.proto", @@ -579,17 +726,10 @@ func (m *QueryDenomAuthorityMetadataRequest) MarshalToSizedBuffer(dAtA []byte) ( _ = i var l int _ = l - if len(m.Subdenom) > 0 { - i -= len(m.Subdenom) - copy(dAtA[i:], m.Subdenom) - i = encodeVarintQuery(dAtA, i, uint64(len(m.Subdenom))) - 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.Denom) > 0 { + i -= len(m.Denom) + copy(dAtA[i:], m.Denom) + i = encodeVarintQuery(dAtA, i, uint64(len(m.Denom))) i-- dAtA[i] = 0xa } @@ -691,6 +831,66 @@ func (m *QueryDenomsFromCreatorResponse) MarshalToSizedBuffer(dAtA []byte) (int, return len(dAtA) - i, nil } +func (m *QueryBeforeSendHookAddressRequest) 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 *QueryBeforeSendHookAddressRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryBeforeSendHookAddressRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Denom) > 0 { + i -= len(m.Denom) + copy(dAtA[i:], m.Denom) + i = encodeVarintQuery(dAtA, i, uint64(len(m.Denom))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *QueryBeforeSendHookAddressResponse) 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 *QueryBeforeSendHookAddressResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryBeforeSendHookAddressResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.CosmwasmAddress) > 0 { + i -= len(m.CosmwasmAddress) + copy(dAtA[i:], m.CosmwasmAddress) + i = encodeVarintQuery(dAtA, i, uint64(len(m.CosmwasmAddress))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + func encodeVarintQuery(dAtA []byte, offset int, v uint64) int { offset -= sovQuery(v) base := offset @@ -728,11 +928,7 @@ func (m *QueryDenomAuthorityMetadataRequest) Size() (n int) { } var l int _ = l - l = len(m.Creator) - if l > 0 { - n += 1 + l + sovQuery(uint64(l)) - } - l = len(m.Subdenom) + l = len(m.Denom) if l > 0 { n += 1 + l + sovQuery(uint64(l)) } @@ -778,6 +974,32 @@ func (m *QueryDenomsFromCreatorResponse) Size() (n int) { return n } +func (m *QueryBeforeSendHookAddressRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Denom) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +func (m *QueryBeforeSendHookAddressResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.CosmwasmAddress) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + func sovQuery(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } @@ -948,7 +1170,7 @@ func (m *QueryDenomAuthorityMetadataRequest) Unmarshal(dAtA []byte) error { switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Creator", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Denom", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -976,11 +1198,144 @@ func (m *QueryDenomAuthorityMetadataRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Creator = string(dAtA[iNdEx:postIndex]) + m.Denom = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 2: + 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 *QueryDenomAuthorityMetadataResponse) 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: QueryDenomAuthorityMetadataResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryDenomAuthorityMetadataResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field AuthorityMetadata", 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.AuthorityMetadata.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 *QueryDenomsFromCreatorRequest) 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: QueryDenomsFromCreatorRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryDenomsFromCreatorRequest: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Subdenom", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Creator", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -1008,7 +1363,7 @@ func (m *QueryDenomAuthorityMetadataRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Subdenom = string(dAtA[iNdEx:postIndex]) + m.Creator = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex default: iNdEx = preIndex @@ -1031,7 +1386,7 @@ func (m *QueryDenomAuthorityMetadataRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryDenomAuthorityMetadataResponse) Unmarshal(dAtA []byte) error { +func (m *QueryDenomsFromCreatorResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -1054,17 +1409,17 @@ func (m *QueryDenomAuthorityMetadataResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryDenomAuthorityMetadataResponse: wiretype end group for non-group") + return fmt.Errorf("proto: QueryDenomsFromCreatorResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryDenomAuthorityMetadataResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryDenomsFromCreatorResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field AuthorityMetadata", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Denoms", wireType) } - var msglen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowQuery @@ -1074,24 +1429,23 @@ func (m *QueryDenomAuthorityMetadataResponse) 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 err := m.AuthorityMetadata.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } + m.Denoms = append(m.Denoms, string(dAtA[iNdEx:postIndex])) iNdEx = postIndex default: iNdEx = preIndex @@ -1114,7 +1468,7 @@ func (m *QueryDenomAuthorityMetadataResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryDenomsFromCreatorRequest) Unmarshal(dAtA []byte) error { +func (m *QueryBeforeSendHookAddressRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -1137,15 +1491,15 @@ func (m *QueryDenomsFromCreatorRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryDenomsFromCreatorRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryBeforeSendHookAddressRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryDenomsFromCreatorRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryBeforeSendHookAddressRequest: 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) + return fmt.Errorf("proto: wrong wireType = %d for field Denom", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -1173,7 +1527,7 @@ func (m *QueryDenomsFromCreatorRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Creator = string(dAtA[iNdEx:postIndex]) + m.Denom = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex default: iNdEx = preIndex @@ -1196,7 +1550,7 @@ func (m *QueryDenomsFromCreatorRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryDenomsFromCreatorResponse) Unmarshal(dAtA []byte) error { +func (m *QueryBeforeSendHookAddressResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -1219,15 +1573,15 @@ func (m *QueryDenomsFromCreatorResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryDenomsFromCreatorResponse: wiretype end group for non-group") + return fmt.Errorf("proto: QueryBeforeSendHookAddressResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryDenomsFromCreatorResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryBeforeSendHookAddressResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Denoms", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field CosmwasmAddress", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -1255,7 +1609,7 @@ func (m *QueryDenomsFromCreatorResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Denoms = append(m.Denoms, string(dAtA[iNdEx:postIndex])) + m.CosmwasmAddress = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex default: iNdEx = preIndex diff --git a/x/tokenfactory/types/query.pb.gw.go b/x/tokenfactory/types/query.pb.gw.go index 2cfb3a2cd..5d75e90ba 100644 --- a/x/tokenfactory/types/query.pb.gw.go +++ b/x/tokenfactory/types/query.pb.gw.go @@ -62,26 +62,15 @@ func request_Query_DenomAuthorityMetadata_0(ctx context.Context, marshaler runti _ = err ) - val, ok = pathParams["creator"] + val, ok = pathParams["denom"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "creator") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "denom") } - protoReq.Creator, err = runtime.String(val) + protoReq.Denom, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "creator", err) - } - - val, ok = pathParams["subdenom"] - if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "subdenom") - } - - protoReq.Subdenom, err = runtime.String(val) - - if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "subdenom", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "denom", err) } msg, err := client.DenomAuthorityMetadata(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) @@ -100,26 +89,15 @@ func local_request_Query_DenomAuthorityMetadata_0(ctx context.Context, marshaler _ = err ) - val, ok = pathParams["creator"] - if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "creator") - } - - protoReq.Creator, err = runtime.String(val) - - if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "creator", err) - } - - val, ok = pathParams["subdenom"] + val, ok = pathParams["denom"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "subdenom") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "denom") } - protoReq.Subdenom, err = runtime.String(val) + protoReq.Denom, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "subdenom", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "denom", err) } msg, err := server.DenomAuthorityMetadata(ctx, &protoReq) @@ -181,6 +159,60 @@ func local_request_Query_DenomsFromCreator_0(ctx context.Context, marshaler runt } +func request_Query_BeforeSendHookAddress_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryBeforeSendHookAddressRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["denom"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "denom") + } + + protoReq.Denom, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "denom", err) + } + + msg, err := client.BeforeSendHookAddress(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Query_BeforeSendHookAddress_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryBeforeSendHookAddressRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["denom"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "denom") + } + + protoReq.Denom, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "denom", err) + } + + msg, err := server.BeforeSendHookAddress(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. @@ -256,6 +288,29 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv }) + mux.Handle("GET", pattern_Query_BeforeSendHookAddress_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_BeforeSendHookAddress_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_BeforeSendHookAddress_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + return nil } @@ -357,15 +412,37 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie }) + mux.Handle("GET", pattern_Query_BeforeSendHookAddress_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_BeforeSendHookAddress_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_BeforeSendHookAddress_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{"osmosis", "tokenfactory", "v1beta1", "params"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_DenomAuthorityMetadata_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 2, 4, 1, 0, 4, 1, 5, 5, 1, 0, 4, 1, 5, 6, 2, 7}, []string{"osmosis", "tokenfactory", "v1beta1", "denoms", "factory", "creator", "subdenom", "authority_metadata"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_DenomAuthorityMetadata_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 2, 5}, []string{"osmosis", "tokenfactory", "v1beta1", "denoms", "denom", "authority_metadata"}, "", runtime.AssumeColonVerbOpt(false))) pattern_Query_DenomsFromCreator_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"osmosis", "tokenfactory", "v1beta1", "denoms_from_creator", "creator"}, "", runtime.AssumeColonVerbOpt(false))) + + pattern_Query_BeforeSendHookAddress_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 2, 5}, []string{"osmosis", "tokenfactory", "v1beta1", "denoms", "denom", "before_send_hook"}, "", runtime.AssumeColonVerbOpt(false))) ) var ( @@ -374,4 +451,6 @@ var ( forward_Query_DenomAuthorityMetadata_0 = runtime.ForwardResponseMessage forward_Query_DenomsFromCreator_0 = runtime.ForwardResponseMessage + + forward_Query_BeforeSendHookAddress_0 = runtime.ForwardResponseMessage ) diff --git a/x/tokenfactory/types/tx.go b/x/tokenfactory/types/tx.go new file mode 100644 index 000000000..acfad49ba --- /dev/null +++ b/x/tokenfactory/types/tx.go @@ -0,0 +1,33 @@ +package types + +import ( + errorsmod "cosmossdk.io/errors" + sdk "github.com/cosmos/cosmos-sdk/types" +) + +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 sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(&msg)) +} + +func (msg MsgUpdateParams) ValidateBasic() error { + if _, err := sdk.AccAddressFromBech32(msg.Authority); err != nil { + return errorsmod.Wrap(err, "authority") + } + return nil +} From 864b5b8008f26f01eb8a2e68dc47f50e14561d71 Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Mon, 4 Sep 2023 15:06:45 +0400 Subject: [PATCH 085/307] add upd params --- x/tokenfactory/keeper/keeper.go | 8 ++++++++ x/tokenfactory/keeper/keeper_test.go | 2 +- x/tokenfactory/keeper/msg_server.go | 20 ++++++++++++++++++++ 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/x/tokenfactory/keeper/keeper.go b/x/tokenfactory/keeper/keeper.go index 5e5751486..36f3c53f6 100644 --- a/x/tokenfactory/keeper/keeper.go +++ b/x/tokenfactory/keeper/keeper.go @@ -20,6 +20,7 @@ type ( accountKeeper types.AccountKeeper bankKeeper types.BankKeeper contractKeeper types.ContractKeeper + authority string } ) @@ -29,12 +30,14 @@ func NewKeeper( storeKey storetypes.StoreKey, accountKeeper types.AccountKeeper, bankKeeper types.BankKeeper, + authority string, ) Keeper { return Keeper{ cdc: cdc, storeKey: storeKey, accountKeeper: accountKeeper, bankKeeper: bankKeeper, + authority: authority, } } @@ -43,6 +46,11 @@ func (k Keeper) Logger(ctx sdk.Context) log.Logger { return ctx.Logger().With("module", fmt.Sprintf("x/%s", types.ModuleName)) } +// Logger returns a logger for the x/tokenfactory module +func (k Keeper) GetAuthority() string { + return k.authority +} + // GetDenomPrefixStore returns the substore for a specific denom func (k Keeper) GetDenomPrefixStore(ctx sdk.Context, denom string) sdk.KVStore { store := ctx.KVStore(k.storeKey) diff --git a/x/tokenfactory/keeper/keeper_test.go b/x/tokenfactory/keeper/keeper_test.go index 84db02560..dfccb9b4a 100644 --- a/x/tokenfactory/keeper/keeper_test.go +++ b/x/tokenfactory/keeper/keeper_test.go @@ -54,7 +54,7 @@ func (suite *KeeperTestSuite) Setup() { tokeFactoryKeeper := suite.GetNeutronZoneApp(suite.ChainA).TokenFactoryKeeper tokeFactoryKeeper.SetParams(suite.ChainA.GetContext(), types.NewParams( sdktypes.NewCoins(sdktypes.NewInt64Coin(suite.defaultDenom, TopUpCoinsAmount)), - 100000, + "", )) suite.msgServer = keeper.NewMsgServerImpl(*tokeFactoryKeeper) diff --git a/x/tokenfactory/keeper/msg_server.go b/x/tokenfactory/keeper/msg_server.go index dfed15f28..3df06a489 100644 --- a/x/tokenfactory/keeper/msg_server.go +++ b/x/tokenfactory/keeper/msg_server.go @@ -3,7 +3,9 @@ package keeper import ( "context" + "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" + sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" "github.com/neutron-org/neutron/x/tokenfactory/types" ) @@ -231,3 +233,21 @@ func (server msgServer) SetBeforeSendHook(goCtx context.Context, msg *types.MsgS return &types.MsgSetBeforeSendHookResponse{}, nil } + +// UpdateParams updates the module parameters +func (k Keeper) UpdateParams(goCtx context.Context, req *types.MsgUpdateParams) (*types.MsgUpdateParamsResponse, error) { + //if err := req.ValidateBasic(); err != nil { + // return nil, err + //} + 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 +} From d1be5cec5de9d0f14c5ca12c9031e9e0ce247819 Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Mon, 4 Sep 2023 15:06:57 +0400 Subject: [PATCH 086/307] upd bindings --- wasmbinding/bindings/msg.go | 8 +++++++- wasmbinding/message_plugin.go | 28 +++++++++++++++++++++++++++ wasmbinding/test/custom_query_test.go | 2 +- 3 files changed, 36 insertions(+), 2 deletions(-) diff --git a/wasmbinding/bindings/msg.go b/wasmbinding/bindings/msg.go index 8dcccba8f..ba381daf6 100644 --- a/wasmbinding/bindings/msg.go +++ b/wasmbinding/bindings/msg.go @@ -41,7 +41,8 @@ type NeutronMsg struct { /// Contracts can burn native tokens for an existing factory denom /// that they are the admin of. /// Currently, the burn from address must be the admin contract. - BurnTokens *BurnTokens `json:"burn_tokens,omitempty"` + BurnTokens *BurnTokens `json:"burn_tokens,omitempty"` + SetBeforeSend *SetBeforeSend `json:"set_before_send,omitempty"` // Cron types AddSchedule *AddSchedule `json:"add_schedule,omitempty"` @@ -212,6 +213,11 @@ type BurnTokens struct { BurnFromAddress string `json:"burn_from_address"` } +type SetBeforeSend struct { + Denom string `json:"denom"` + CosmWasmAddr string `json:"mint_to_address"` +} + // AddSchedule adds new schedule to the cron module type AddSchedule struct { Name string `json:"name"` diff --git a/wasmbinding/message_plugin.go b/wasmbinding/message_plugin.go index 4fc27b93c..28994786f 100644 --- a/wasmbinding/message_plugin.go +++ b/wasmbinding/message_plugin.go @@ -117,6 +117,9 @@ func (m *CustomMessenger) DispatchMsg(ctx sdk.Context, contractAddr sdk.AccAddre if contractMsg.MintTokens != nil { return m.mintTokens(ctx, contractAddr, contractMsg.MintTokens) } + if contractMsg.SetBeforeSend != nil { + return m.setBeforeSend(ctx, contractAddr, contractMsg.SetBeforeSend) + } if contractMsg.ChangeAdmin != nil { return m.changeAdmin(ctx, contractAddr, contractMsg.ChangeAdmin) } @@ -499,6 +502,15 @@ func (m *CustomMessenger) mintTokens(ctx sdk.Context, contractAddr sdk.AccAddres return nil, nil, nil } +// mintTokens mints tokens of a specified denom to an address. +func (m *CustomMessenger) setBeforeSend(ctx sdk.Context, contractAddr sdk.AccAddress, set *bindings.SetBeforeSend) ([]sdk.Event, [][]byte, error) { + err := PerformSetBeforeSend(m.TokenFactory, ctx, contractAddr, set) + if err != nil { + return nil, nil, errors.Wrap(err, "perform mint") + } + return nil, nil, nil +} + // PerformMint used with mintTokens to validate the mint message and mint through token factory. func PerformMint(f *tokenfactorykeeper.Keeper, b *bankkeeper.BaseKeeper, ctx sdk.Context, contractAddr sdk.AccAddress, mint *bindings.MintTokens) error { rcpt, err := parseAddress(mint.MintToAddress) @@ -527,6 +539,22 @@ func PerformMint(f *tokenfactorykeeper.Keeper, b *bankkeeper.BaseKeeper, ctx sdk return nil } +func PerformSetBeforeSend(f *tokenfactorykeeper.Keeper, ctx sdk.Context, contractAddr sdk.AccAddress, set *bindings.SetBeforeSend) error { + sdkMsg := tokenfactorytypes.NewMsgSetBeforeSendHook(contractAddr.String(), set.Denom, set.CosmWasmAddr) + if err := sdkMsg.ValidateBasic(); err != nil { + return err + } + + // SetBeforeSend through token factory / message server + msgServer := tokenfactorykeeper.NewMsgServerImpl(*f) + _, err := msgServer.SetBeforeSendHook(sdk.WrapSDKContext(ctx), sdkMsg) + if err != nil { + return errors.Wrap(err, "set before send from message") + } + + return nil +} + // changeAdmin changes the admin. func (m *CustomMessenger) changeAdmin(ctx sdk.Context, contractAddr sdk.AccAddress, changeAdmin *bindings.ChangeAdmin) ([]sdk.Event, [][]byte, error) { err := ChangeAdmin(m.TokenFactory, ctx, contractAddr, changeAdmin) diff --git a/wasmbinding/test/custom_query_test.go b/wasmbinding/test/custom_query_test.go index c4b524486..563212905 100644 --- a/wasmbinding/test/custom_query_test.go +++ b/wasmbinding/test/custom_query_test.go @@ -250,7 +250,7 @@ func (suite *CustomQuerierTestSuite) TestDenomAdmin() { ) err := neutron.TokenFactoryKeeper.SetParams(ctx, tokenfactorytypes.NewParams( - sdk.NewCoins(sdk.NewInt64Coin(tokenfactorytypes.DefaultNeutronDenom, 10_000_000)), + sdk.NewCoins(sdk.NewInt64Coin("untrn", 10_000_000)), FeeCollectorAddress, )) suite.Require().NoError(err) From ad436d3db082c404538459ffd0c21301d8903da2 Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Mon, 4 Sep 2023 15:07:08 +0400 Subject: [PATCH 087/307] add authorities --- app/app.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/app.go b/app/app.go index d8f73e7ee..844f10982 100644 --- a/app/app.go +++ b/app/app.go @@ -602,6 +602,7 @@ func New( app.keys[tokenfactorytypes.StoreKey], app.AccountKeeper, app.BankKeeper.WithMintCoinsRestriction(tokenfactorytypes.NewTokenFactoryDenomMintCoinsRestriction()), + authtypes.NewModuleAddress(govtypes.ModuleName).String(), ) app.TokenFactoryKeeper = &tokenFactoryKeeper @@ -653,6 +654,7 @@ func New( app.ContractManagerKeeper, interchainqueriesmodulekeeper.Verifier{}, interchainqueriesmodulekeeper.TransactionVerifier{}, + authtypes.NewModuleAddress(govtypes.ModuleName).String(), ) app.InterchainTxsKeeper = *interchaintxskeeper.NewKeeper( appCodec, @@ -662,6 +664,7 @@ func New( app.ICAControllerKeeper, app.ContractManagerKeeper, app.FeeKeeper, + authtypes.NewModuleAddress(govtypes.ModuleName).String(), ) app.CronKeeper = *cronkeeper.NewKeeper(appCodec, keys[crontypes.StoreKey], keys[crontypes.MemStoreKey], app.AccountKeeper) From 2a88b33c63832d490b94b570358d0b290e139fea Mon Sep 17 00:00:00 2001 From: nhpd Date: Mon, 4 Sep 2023 15:23:57 +0400 Subject: [PATCH 088/307] remove NewHandler unused code --- proto/neutron/interchaintxs/v1/tx.proto | 2 +- x/interchainqueries/handler.go | 36 ------------------------- x/interchaintxs/handler.go | 34 ----------------------- x/transfer/module.go | 31 --------------------- 4 files changed, 1 insertion(+), 102 deletions(-) delete mode 100644 x/interchainqueries/handler.go delete mode 100644 x/interchaintxs/handler.go diff --git a/proto/neutron/interchaintxs/v1/tx.proto b/proto/neutron/interchaintxs/v1/tx.proto index 3ba09f2e3..1ffd51e06 100644 --- a/proto/neutron/interchaintxs/v1/tx.proto +++ b/proto/neutron/interchaintxs/v1/tx.proto @@ -60,7 +60,7 @@ message MsgSubmitTx { message MsgSubmitTxResponse { // channel's sequence_id for outgoing ibc packet. Unique per a channel. uint64 sequence_id = 1; - // channel src channel on neutron side trasaction was submitted from + // channel src channel on neutron side transaction was submitted from string channel = 2; } diff --git a/x/interchainqueries/handler.go b/x/interchainqueries/handler.go deleted file mode 100644 index fbe1c03fe..000000000 --- a/x/interchainqueries/handler.go +++ /dev/null @@ -1,36 +0,0 @@ -package interchainqueries - -import ( - "fmt" - - "cosmossdk.io/errors" - - sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - - "github.com/neutron-org/neutron/x/interchainqueries/keeper" - "github.com/neutron-org/neutron/x/interchainqueries/types" -) - -// NewHandler ... -func NewHandler(k keeper.Keeper) sdk.Handler { - msgServer := keeper.NewMsgServerImpl(k) - - return func(ctx sdk.Context, msg sdk.Msg) (*sdk.Result, error) { - ctx = ctx.WithEventManager(sdk.NewEventManager()) - - switch msg := msg.(type) { - case *types.MsgRegisterInterchainQuery: - res, err := msgServer.RegisterInterchainQuery(sdk.WrapSDKContext(ctx), msg) - return sdk.WrapServiceResult(ctx, res, err) - - case *types.MsgSubmitQueryResult: - res, err := msgServer.SubmitQueryResult(sdk.WrapSDKContext(ctx), msg) - return sdk.WrapServiceResult(ctx, res, err) - - default: - errMsg := fmt.Sprintf("unrecognized %s message type: %T", types.ModuleName, msg) - return nil, errors.Wrap(sdkerrors.ErrUnknownRequest, errMsg) - } - } -} diff --git a/x/interchaintxs/handler.go b/x/interchaintxs/handler.go deleted file mode 100644 index 30a574948..000000000 --- a/x/interchaintxs/handler.go +++ /dev/null @@ -1,34 +0,0 @@ -package interchaintxs - -import ( - "fmt" - - "cosmossdk.io/errors" - - sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - - "github.com/neutron-org/neutron/x/interchaintxs/keeper" - "github.com/neutron-org/neutron/x/interchaintxs/types" -) - -func NewHandler(k keeper.Keeper) sdk.Handler { - msgServer := keeper.NewMsgServerImpl(k) - - return func(ctx sdk.Context, msg sdk.Msg) (*sdk.Result, error) { - ctx = ctx.WithEventManager(sdk.NewEventManager()) - - switch msg := msg.(type) { - case *types.MsgRegisterInterchainAccount: - res, err := msgServer.RegisterInterchainAccount(sdk.WrapSDKContext(ctx), msg) - return sdk.WrapServiceResult(ctx, res, err) - case *types.MsgSubmitTx: - res, err := msgServer.SubmitTx(sdk.WrapSDKContext(ctx), msg) - return sdk.WrapServiceResult(ctx, res, err) - - default: - errMsg := fmt.Sprintf("unrecognized %s message type: %T", types.ModuleName, msg) - return nil, errors.Wrap(sdkerrors.ErrUnknownRequest, errMsg) - } - } -} diff --git a/x/transfer/module.go b/x/transfer/module.go index 967fe459e..b6873db43 100644 --- a/x/transfer/module.go +++ b/x/transfer/module.go @@ -1,22 +1,18 @@ package transfer import ( - "fmt" - "cosmossdk.io/core/appmodule" "cosmossdk.io/errors" "github.com/cosmos/cosmos-sdk/codec" cdctypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/cosmos/cosmos-sdk/types/module" "github.com/cosmos/ibc-go/v7/modules/apps/transfer" "github.com/cosmos/ibc-go/v7/modules/apps/transfer/keeper" "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" - feetypes "github.com/neutron-org/neutron/x/feerefunder/types" wrapkeeper "github.com/neutron-org/neutron/x/transfer/keeper" neutrontypes "github.com/neutron-org/neutron/x/transfer/types" ) @@ -129,30 +125,3 @@ func (am AppModuleBasic) RegisterInterfaces(reg cdctypes.InterfaceRegistry) { func (am AppModule) Name() string { return am.AppModuleBasic.Name() } - -func NewHandler(k wrapkeeper.KeeperTransferWrapper) sdk.Handler { - return func(ctx sdk.Context, msg sdk.Msg) (*sdk.Result, error) { - ctx = ctx.WithEventManager(sdk.NewEventManager()) - - switch msg := msg.(type) { - case *types.MsgTransfer: - neutronMsg := neutrontypes.MsgTransfer{ - SourcePort: msg.SourcePort, - SourceChannel: msg.SourceChannel, - Token: msg.Token, - Sender: msg.Sender, - Receiver: msg.Receiver, - TimeoutHeight: msg.TimeoutHeight, - TimeoutTimestamp: msg.TimeoutTimestamp, - Fee: feetypes.Fee{}, - Memo: msg.Memo, - } - res, err := k.Transfer(sdk.WrapSDKContext(ctx), &neutronMsg) - return sdk.WrapServiceResult(ctx, res, err) - - default: - errMsg := fmt.Sprintf("unrecognized %s message type: %T", types.ModuleName, msg) - return nil, errors.Wrap(sdkerrors.ErrUnknownRequest, errMsg) - } - } -} From 0cbcb329c7fa610b4470eec1664dbbb2694faea2 Mon Sep 17 00:00:00 2001 From: nhpd Date: Mon, 4 Sep 2023 16:02:13 +0400 Subject: [PATCH 089/307] cleanup other msgupdate --- x/interchaintxs/types/tx.go | 20 ++++++++++---------- x/interchaintxs/types/tx.pb.go | 2 +- x/tokenfactory/types/tx.go | 16 +++++++++------- 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/x/interchaintxs/types/tx.go b/x/interchaintxs/types/tx.go index 4f86dd2ab..90687d161 100644 --- a/x/interchaintxs/types/tx.go +++ b/x/interchaintxs/types/tx.go @@ -18,7 +18,7 @@ const interchainAccountIDLimit = 128 - len("neutron1unyuj8qnmygvzuex3dwmg9yzt9alhvyeat0uu0jedg2wj33efl5qmysp02") - // just a random contract address len(".") -var _ codectypes.UnpackInterfacesMessage = MsgSubmitTx{} +var _ codectypes.UnpackInterfacesMessage = &MsgSubmitTx{} func (msg *MsgRegisterInterchainAccount) ValidateBasic() error { if len(msg.ConnectionId) == 0 { @@ -53,13 +53,13 @@ func (msg *MsgRegisterInterchainAccount) Type() string { return "register-interchain-account" } -func (msg MsgRegisterInterchainAccount) GetSignBytes() []byte { - return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(&msg)) +func (msg *MsgRegisterInterchainAccount) GetSignBytes() []byte { + return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(msg)) } //---------------------------------------------------------------- -func (msg MsgSubmitTx) ValidateBasic() error { +func (msg *MsgSubmitTx) ValidateBasic() error { if err := msg.Fee.Validate(); err != nil { return err } @@ -87,21 +87,21 @@ func (msg MsgSubmitTx) ValidateBasic() error { return nil } -func (msg MsgSubmitTx) GetSigners() []sdk.AccAddress { +func (msg *MsgSubmitTx) GetSigners() []sdk.AccAddress { fromAddress, _ := sdk.AccAddressFromBech32(msg.FromAddress) return []sdk.AccAddress{fromAddress} } -func (msg MsgSubmitTx) Route() string { +func (msg *MsgSubmitTx) Route() string { return RouterKey } -func (msg MsgSubmitTx) Type() string { +func (msg *MsgSubmitTx) Type() string { return "submit-tx" } -func (msg MsgSubmitTx) GetSignBytes() []byte { - return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(&msg)) +func (msg *MsgSubmitTx) GetSignBytes() []byte { + return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(msg)) } // PackTxMsgAny marshals the sdk.Msg payload to a protobuf Any type @@ -120,7 +120,7 @@ func PackTxMsgAny(sdkMsg sdk.Msg) (*codectypes.Any, error) { } // implements UnpackInterfacesMessage.UnpackInterfaces (https://github.com/cosmos/cosmos-sdk/blob/d07d35f29e0a0824b489c552753e8798710ff5a8/codec/types/interface_registry.go#L60) -func (msg MsgSubmitTx) UnpackInterfaces(unpacker codectypes.AnyUnpacker) error { +func (msg *MsgSubmitTx) UnpackInterfaces(unpacker codectypes.AnyUnpacker) error { var sdkMsg sdk.Msg for _, m := range msg.Msgs { if err := unpacker.UnpackAny(m, &sdkMsg); err != nil { diff --git a/x/interchaintxs/types/tx.pb.go b/x/interchaintxs/types/tx.pb.go index 22d769414..34a62cb7b 100644 --- a/x/interchaintxs/types/tx.pb.go +++ b/x/interchaintxs/types/tx.pb.go @@ -165,7 +165,7 @@ var xxx_messageInfo_MsgSubmitTx proto.InternalMessageInfo type MsgSubmitTxResponse struct { // channel's sequence_id for outgoing ibc packet. Unique per a channel. SequenceId uint64 `protobuf:"varint,1,opt,name=sequence_id,json=sequenceId,proto3" json:"sequence_id,omitempty"` - // channel src channel on neutron side trasaction was submitted from + // channel src channel on neutron side transaction was submitted from Channel string `protobuf:"bytes,2,opt,name=channel,proto3" json:"channel,omitempty"` } diff --git a/x/tokenfactory/types/tx.go b/x/tokenfactory/types/tx.go index acfad49ba..9c12198b2 100644 --- a/x/tokenfactory/types/tx.go +++ b/x/tokenfactory/types/tx.go @@ -5,15 +5,17 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" ) -func (msg MsgUpdateParams) Route() string { +var _ sdk.Msg = &MsgUpdateParams{} + +func (msg *MsgUpdateParams) Route() string { return RouterKey } -func (msg MsgUpdateParams) Type() string { +func (msg *MsgUpdateParams) Type() string { return "update-params" } -func (msg MsgUpdateParams) GetSigners() []sdk.AccAddress { +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()) @@ -21,13 +23,13 @@ func (msg MsgUpdateParams) GetSigners() []sdk.AccAddress { return []sdk.AccAddress{authority} } -func (msg MsgUpdateParams) GetSignBytes() []byte { - return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(&msg)) +func (msg *MsgUpdateParams) GetSignBytes() []byte { + return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(msg)) } -func (msg MsgUpdateParams) ValidateBasic() error { +func (msg *MsgUpdateParams) ValidateBasic() error { if _, err := sdk.AccAddressFromBech32(msg.Authority); err != nil { - return errorsmod.Wrap(err, "authority") + return errorsmod.Wrap(err, "authority is invalid") } return nil } From 4be0d0a4c33bef17c04bf9a2696d8e8ec2a10a3b Mon Sep 17 00:00:00 2001 From: nhpd Date: Mon, 4 Sep 2023 16:07:50 +0400 Subject: [PATCH 090/307] feat: add MsgUpdateParams to contractmanager --- app/app.go | 1 + proto/neutron/contractmanager/tx.proto | 1 - .../contractmanager/keeper/contractmanager.go | 1 + x/contractmanager/keeper/keeper.go | 7 ++++ x/contractmanager/keeper/msg_server.go | 40 +++++++++++++++++++ x/contractmanager/module.go | 1 + x/contractmanager/types/tx.go | 35 ++++++++++++++++ 7 files changed, 85 insertions(+), 1 deletion(-) create mode 100644 x/contractmanager/keeper/msg_server.go create mode 100644 x/contractmanager/types/tx.go diff --git a/app/app.go b/app/app.go index 844f10982..9a73456a8 100644 --- a/app/app.go +++ b/app/app.go @@ -519,6 +519,7 @@ func New( keys[contractmanagermoduletypes.StoreKey], keys[contractmanagermoduletypes.MemStoreKey], &app.WasmKeeper, + authtypes.NewModuleAddress(adminmodulemoduletypes.ModuleName).String(), ) app.FeeKeeper = feekeeper.NewKeeper(appCodec, keys[feetypes.StoreKey], memKeys[feetypes.MemStoreKey], app.IBCKeeper.ChannelKeeper, app.BankKeeper) diff --git a/proto/neutron/contractmanager/tx.proto b/proto/neutron/contractmanager/tx.proto index 51b4e01fe..e84aaddf0 100644 --- a/proto/neutron/contractmanager/tx.proto +++ b/proto/neutron/contractmanager/tx.proto @@ -39,4 +39,3 @@ message MsgUpdateParams { // // Since: 0.47 message MsgUpdateParamsResponse {} - diff --git a/testutil/contractmanager/keeper/contractmanager.go b/testutil/contractmanager/keeper/contractmanager.go index cfeeff451..70eb3694c 100644 --- a/testutil/contractmanager/keeper/contractmanager.go +++ b/testutil/contractmanager/keeper/contractmanager.go @@ -35,6 +35,7 @@ func ContractManagerKeeper(t testing.TB, wasmKeeper types.WasmKeeper) (*keeper.K storeKey, memStoreKey, wasmKeeper, + "", // TODO ) ctx := sdk.NewContext(stateStore, tmproto.Header{}, false, log.NewNopLogger()) diff --git a/x/contractmanager/keeper/keeper.go b/x/contractmanager/keeper/keeper.go index 6d9c3569f..1a431b6c0 100644 --- a/x/contractmanager/keeper/keeper.go +++ b/x/contractmanager/keeper/keeper.go @@ -16,6 +16,7 @@ type ( storeKey storetypes.StoreKey memKey storetypes.StoreKey wasmKeeper types.WasmKeeper + authority string } ) @@ -24,15 +25,21 @@ func NewKeeper( storeKey, memKey storetypes.StoreKey, wasmKeeper types.WasmKeeper, + authority string, ) *Keeper { return &Keeper{ cdc: cdc, storeKey: storeKey, memKey: memKey, wasmKeeper: wasmKeeper, + authority: authority, } } +func (k Keeper) GetAuthority() string { + return k.authority +} + func (k Keeper) Logger(ctx sdk.Context) log.Logger { return ctx.Logger().With("module", fmt.Sprintf("x/%s", types.ModuleName)) } diff --git a/x/contractmanager/keeper/msg_server.go b/x/contractmanager/keeper/msg_server.go new file mode 100644 index 000000000..5b382dd21 --- /dev/null +++ b/x/contractmanager/keeper/msg_server.go @@ -0,0 +1,40 @@ +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/x/contractmanager/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.ValidateBasic(); err != nil { + return nil, err + } + 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/contractmanager/module.go b/x/contractmanager/module.go index cfecf7588..0ee3cf65a 100644 --- a/x/contractmanager/module.go +++ b/x/contractmanager/module.go @@ -128,6 +128,7 @@ 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 invariants of the module. If an invariant deviates from its predicted value, the InvariantRegistry triggers appropriate logic (most often the chain will be halted) diff --git a/x/contractmanager/types/tx.go b/x/contractmanager/types/tx.go new file mode 100644 index 000000000..9c12198b2 --- /dev/null +++ b/x/contractmanager/types/tx.go @@ -0,0 +1,35 @@ +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 sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(msg)) +} + +func (msg *MsgUpdateParams) ValidateBasic() error { + if _, err := sdk.AccAddressFromBech32(msg.Authority); err != nil { + return errorsmod.Wrap(err, "authority is invalid") + } + return nil +} From be18760ab887dc6df51bba08fe2c27f11a9aca8d Mon Sep 17 00:00:00 2001 From: nhpd Date: Mon, 4 Sep 2023 16:24:11 +0400 Subject: [PATCH 091/307] feat: add cron, feeburner, feerefunder MsgUpdate --- app/app.go | 7 +++--- proto/neutron/cron/tx.proto | 1 - x/cron/keeper/keeper.go | 7 ++++++ x/cron/keeper/msg_server.go | 40 ++++++++++++++++++++++++++++++ x/cron/module.go | 9 ++++--- x/cron/types/tx.go | 35 ++++++++++++++++++++++++++ x/feeburner/keeper/keeper.go | 7 ++++++ x/feeburner/keeper/msg_server.go | 40 ++++++++++++++++++++++++++++++ x/feeburner/module.go | 1 + x/feeburner/types/tx.go | 35 ++++++++++++++++++++++++++ x/feerefunder/keeper/keeper.go | 7 ++++++ x/feerefunder/keeper/msg_server.go | 40 ++++++++++++++++++++++++++++++ x/feerefunder/module.go | 1 + x/feerefunder/types/tx.go | 35 ++++++++++++++++++++++++++ 14 files changed, 257 insertions(+), 8 deletions(-) create mode 100644 x/cron/keeper/msg_server.go create mode 100644 x/cron/types/tx.go create mode 100644 x/feeburner/keeper/msg_server.go create mode 100644 x/feeburner/types/tx.go create mode 100644 x/feerefunder/keeper/msg_server.go create mode 100644 x/feerefunder/types/tx.go diff --git a/app/app.go b/app/app.go index 9a73456a8..156a1ad98 100644 --- a/app/app.go +++ b/app/app.go @@ -522,7 +522,7 @@ func New( authtypes.NewModuleAddress(adminmodulemoduletypes.ModuleName).String(), ) - app.FeeKeeper = feekeeper.NewKeeper(appCodec, keys[feetypes.StoreKey], memKeys[feetypes.MemStoreKey], app.IBCKeeper.ChannelKeeper, app.BankKeeper) + app.FeeKeeper = feekeeper.NewKeeper(appCodec, keys[feetypes.StoreKey], memKeys[feetypes.MemStoreKey], app.IBCKeeper.ChannelKeeper, app.BankKeeper, authtypes.NewModuleAddress(adminmodulemoduletypes.ModuleName).String()) feeModule := feerefunder.NewAppModule(appCodec, *app.FeeKeeper, app.AccountKeeper, app.BankKeeper) app.FeeBurnerKeeper = feeburnerkeeper.NewKeeper( @@ -531,6 +531,7 @@ func New( keys[feeburnertypes.MemStoreKey], app.AccountKeeper, app.BankKeeper, + authtypes.NewModuleAddress(adminmodulemoduletypes.ModuleName).String(), ) feeBurnerModule := feeburner.NewAppModule(appCodec, *app.FeeBurnerKeeper) @@ -668,7 +669,7 @@ func New( authtypes.NewModuleAddress(govtypes.ModuleName).String(), ) - app.CronKeeper = *cronkeeper.NewKeeper(appCodec, keys[crontypes.StoreKey], keys[crontypes.MemStoreKey], app.AccountKeeper) + app.CronKeeper = *cronkeeper.NewKeeper(appCodec, keys[crontypes.StoreKey], keys[crontypes.MemStoreKey], app.AccountKeeper, authtypes.NewModuleAddress(adminmodulemoduletypes.ModuleName).String()) wasmOpts = append(wasmbinding.RegisterCustomPlugins(&app.InterchainTxsKeeper, &app.InterchainQueriesKeeper, app.TransferKeeper, &app.AdminmoduleKeeper, app.FeeBurnerKeeper, app.FeeKeeper, &app.BankKeeper, app.TokenFactoryKeeper, &app.CronKeeper), wasmOpts...) queryPlugins := wasmkeeper.WithQueryPlugins( @@ -698,7 +699,7 @@ func New( wasmHooks.ContractKeeper = &app.WasmKeeper app.CronKeeper.WasmMsgServer = wasmkeeper.NewMsgServerImpl(&app.WasmKeeper) - cronModule := cron.NewAppModule(appCodec, &app.CronKeeper) + cronModule := cron.NewAppModule(appCodec, app.CronKeeper) if len(enabledProposals) != 0 { app.AdminmoduleKeeper.Router().AddRoute(wasm.RouterKey, wasm.NewWasmProposalHandler(app.WasmKeeper, enabledProposals)) diff --git a/proto/neutron/cron/tx.proto b/proto/neutron/cron/tx.proto index fef6a57f1..44681dad1 100644 --- a/proto/neutron/cron/tx.proto +++ b/proto/neutron/cron/tx.proto @@ -39,4 +39,3 @@ message MsgUpdateParams { // // Since: 0.47 message MsgUpdateParamsResponse {} - diff --git a/x/cron/keeper/keeper.go b/x/cron/keeper/keeper.go index f81040e10..c5e582005 100644 --- a/x/cron/keeper/keeper.go +++ b/x/cron/keeper/keeper.go @@ -35,6 +35,7 @@ type ( memKey storetypes.StoreKey accountKeeper types.AccountKeeper WasmMsgServer types.WasmMsgServer + authority string } ) @@ -43,15 +44,21 @@ func NewKeeper( storeKey, memKey storetypes.StoreKey, accountKeeper types.AccountKeeper, + authority string, ) *Keeper { return &Keeper{ cdc: cdc, storeKey: storeKey, memKey: memKey, accountKeeper: accountKeeper, + authority: authority, } } +func (k Keeper) GetAuthority() string { + return k.authority +} + func (k *Keeper) Logger(ctx sdk.Context) log.Logger { return ctx.Logger().With("module", fmt.Sprintf("x/%s", types.ModuleName)) } diff --git a/x/cron/keeper/msg_server.go b/x/cron/keeper/msg_server.go new file mode 100644 index 000000000..6607dd09a --- /dev/null +++ b/x/cron/keeper/msg_server.go @@ -0,0 +1,40 @@ +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/x/cron/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.ValidateBasic(); err != nil { + return nil, err + } + 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/cron/module.go b/x/cron/module.go index 0c911b391..a2ba784fd 100644 --- a/x/cron/module.go +++ b/x/cron/module.go @@ -102,12 +102,12 @@ var _ appmodule.AppModule = AppModule{} type AppModule struct { AppModuleBasic - keeper *keeper.Keeper + keeper keeper.Keeper } func NewAppModule( cdc codec.Codec, - keeper *keeper.Keeper, + keeper keeper.Keeper, ) AppModule { return AppModule{ AppModuleBasic: NewAppModuleBasic(cdc), @@ -129,6 +129,7 @@ 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 invariants of the module. If an invariant deviates from its predicted value, the InvariantRegistry triggers appropriate logic (most often the chain will be halted) @@ -140,14 +141,14 @@ func (am AppModule) InitGenesis(ctx sdk.Context, cdc codec.JSONCodec, gs json.Ra // Initialize global index to index in genesis state cdc.MustUnmarshalJSON(gs, &genState) - InitGenesis(ctx, *am.keeper, genState) + InitGenesis(ctx, am.keeper, genState) return []abci.ValidatorUpdate{} } // ExportGenesis returns the module's exported genesis state as raw JSON bytes. func (am AppModule) ExportGenesis(ctx sdk.Context, cdc codec.JSONCodec) json.RawMessage { - genState := ExportGenesis(ctx, *am.keeper) + genState := ExportGenesis(ctx, am.keeper) return cdc.MustMarshalJSON(genState) } diff --git a/x/cron/types/tx.go b/x/cron/types/tx.go new file mode 100644 index 000000000..9c12198b2 --- /dev/null +++ b/x/cron/types/tx.go @@ -0,0 +1,35 @@ +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 sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(msg)) +} + +func (msg *MsgUpdateParams) ValidateBasic() error { + if _, err := sdk.AccAddressFromBech32(msg.Authority); err != nil { + return errorsmod.Wrap(err, "authority is invalid") + } + return nil +} diff --git a/x/feeburner/keeper/keeper.go b/x/feeburner/keeper/keeper.go index 842baea35..e65220b29 100644 --- a/x/feeburner/keeper/keeper.go +++ b/x/feeburner/keeper/keeper.go @@ -24,6 +24,7 @@ type ( accountKeeper types.AccountKeeper bankKeeper types.BankKeeper + authority string } ) @@ -35,6 +36,7 @@ func NewKeeper( memKey storetypes.StoreKey, accountKeeper types.AccountKeeper, bankKeeper types.BankKeeper, + authority string, ) *Keeper { return &Keeper{ cdc: cdc, @@ -42,9 +44,14 @@ func NewKeeper( memKey: memKey, accountKeeper: accountKeeper, bankKeeper: bankKeeper, + authority: authority, } } +func (k Keeper) GetAuthority() string { + return k.authority +} + // RecordBurnedFees adds `amount` to the total amount of burned NTRN tokens func (k Keeper) RecordBurnedFees(ctx sdk.Context, amount sdk.Coin) { store := ctx.KVStore(k.storeKey) diff --git a/x/feeburner/keeper/msg_server.go b/x/feeburner/keeper/msg_server.go new file mode 100644 index 000000000..8ba291950 --- /dev/null +++ b/x/feeburner/keeper/msg_server.go @@ -0,0 +1,40 @@ +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/x/feeburner/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.ValidateBasic(); err != nil { + return nil, err + } + 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/feeburner/module.go b/x/feeburner/module.go index c17a896b7..4926f74ca 100644 --- a/x/feeburner/module.go +++ b/x/feeburner/module.go @@ -126,6 +126,7 @@ 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 invariants of the module. If an invariant deviates from its predicted value, the InvariantRegistry triggers appropriate logic (most often the chain will be halted) diff --git a/x/feeburner/types/tx.go b/x/feeburner/types/tx.go new file mode 100644 index 000000000..9c12198b2 --- /dev/null +++ b/x/feeburner/types/tx.go @@ -0,0 +1,35 @@ +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 sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(msg)) +} + +func (msg *MsgUpdateParams) ValidateBasic() error { + if _, err := sdk.AccAddressFromBech32(msg.Authority); err != nil { + return errorsmod.Wrap(err, "authority is invalid") + } + return nil +} diff --git a/x/feerefunder/keeper/keeper.go b/x/feerefunder/keeper/keeper.go index a5196a3b4..5322fa3c6 100644 --- a/x/feerefunder/keeper/keeper.go +++ b/x/feerefunder/keeper/keeper.go @@ -23,6 +23,7 @@ type ( storeKey storetypes.StoreKey memKey storetypes.StoreKey channelKeeper types.ChannelKeeper + authority string } ) @@ -32,6 +33,7 @@ func NewKeeper( memKey storetypes.StoreKey, channelKeeper types.ChannelKeeper, bankKeeper types.BankKeeper, + authority string, ) *Keeper { return &Keeper{ cdc: cdc, @@ -39,9 +41,14 @@ func NewKeeper( memKey: memKey, channelKeeper: channelKeeper, bankKeeper: bankKeeper, + authority: authority, } } +func (k Keeper) GetAuthority() string { + return k.authority +} + func (k Keeper) Logger(ctx sdk.Context) log.Logger { return ctx.Logger().With("module", fmt.Sprintf("x/%s", types.ModuleName)) } diff --git a/x/feerefunder/keeper/msg_server.go b/x/feerefunder/keeper/msg_server.go new file mode 100644 index 000000000..e43bd69ba --- /dev/null +++ b/x/feerefunder/keeper/msg_server.go @@ -0,0 +1,40 @@ +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/x/feerefunder/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.ValidateBasic(); err != nil { + return nil, err + } + 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/feerefunder/module.go b/x/feerefunder/module.go index 76b93d50a..ca33f35b6 100644 --- a/x/feerefunder/module.go +++ b/x/feerefunder/module.go @@ -134,6 +134,7 @@ 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 invariants of the module. If an invariant deviates from its predicted value, the InvariantRegistry triggers appropriate logic (most often the chain will be halted) diff --git a/x/feerefunder/types/tx.go b/x/feerefunder/types/tx.go new file mode 100644 index 000000000..9c12198b2 --- /dev/null +++ b/x/feerefunder/types/tx.go @@ -0,0 +1,35 @@ +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 sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(msg)) +} + +func (msg *MsgUpdateParams) ValidateBasic() error { + if _, err := sdk.AccAddressFromBech32(msg.Authority); err != nil { + return errorsmod.Wrap(err, "authority is invalid") + } + return nil +} From fff249f34ad81b7d6ced4687c32ec64876014bf8 Mon Sep 17 00:00:00 2001 From: nhpd Date: Mon, 4 Sep 2023 19:09:02 +0400 Subject: [PATCH 092/307] add missing service registrations for msg types --- app/upgrades/v0.4.4/upgrades.go | 5 +- app/upgrades/v3/upgrades.go | 6 +- .../contractmanager/keeper/contractmanager.go | 4 +- testutil/cron/keeper/cron.go | 3 + testutil/feeburner/keeper/feeburner.go | 3 + testutil/feerefunder/keeper/fee.go | 3 + ...terchainqeries.go => interchainqueries.go} | 3 + .../interchaintxs/keeper/interchaintxs.go | 3 + wasmbinding/test/custom_message_test.go | 4 +- wasmbinding/test/custom_query_test.go | 4 +- x/contractmanager/types/codec.go | 11 +++- x/cron/types/codec.go | 8 +-- x/feeburner/types/codec.go | 12 ++-- x/feerefunder/types/codec.go | 11 +++- x/interchainqueries/keeper/msg_server.go | 6 +- x/interchainqueries/types/codec.go | 8 +++ x/interchainqueries/types/tx.go | 56 ++++++++++++++++--- x/interchaintxs/keeper/msg_server.go | 6 +- x/interchaintxs/types/tx.go | 31 ++++++++++ x/tokenfactory/keeper/admins_test.go | 5 ++ x/tokenfactory/keeper/genesis_test.go | 3 +- x/tokenfactory/keeper/keeper_test.go | 9 +-- x/tokenfactory/module.go | 2 +- x/tokenfactory/types/codec.go | 4 +- x/transfer/module.go | 2 +- 25 files changed, 168 insertions(+), 44 deletions(-) rename testutil/interchainqueries/keeper/{interchainqeries.go => interchainqueries.go} (89%) diff --git a/app/upgrades/v0.4.4/upgrades.go b/app/upgrades/v0.4.4/upgrades.go index bf05e2dff..57c0f0d86 100644 --- a/app/upgrades/v0.4.4/upgrades.go +++ b/app/upgrades/v0.4.4/upgrades.go @@ -57,7 +57,10 @@ func CreateUpgradeHandler( ctx.Logger().Info("Migrating TokenFactory Params...") tokenfactoryDefaultParams := tokenfactorytypes.DefaultParams() - keepers.TokenFactoryKeeper.SetParams(ctx, tokenfactoryDefaultParams) + err = keepers.TokenFactoryKeeper.SetParams(ctx, tokenfactoryDefaultParams) + if err != nil { + return vm, err + } ctx.Logger().Info("Upgrade complete") return vm, err diff --git a/app/upgrades/v3/upgrades.go b/app/upgrades/v3/upgrades.go index 5b0389dd3..beabd198e 100644 --- a/app/upgrades/v3/upgrades.go +++ b/app/upgrades/v3/upgrades.go @@ -33,7 +33,11 @@ func CreateUpgradeHandler( return vm, err } - keepers.TokenFactoryKeeper.SetParams(ctx, tokenfactorytypes.DefaultParams()) + err = keepers.TokenFactoryKeeper.SetParams(ctx, tokenfactorytypes.DefaultParams()) + if err != nil { + return vm, err + } + vm, err = mm.RunMigrations(ctx, configurator, vm) if err != nil { return vm, err diff --git a/testutil/contractmanager/keeper/contractmanager.go b/testutil/contractmanager/keeper/contractmanager.go index 70eb3694c..9ef0b75ec 100644 --- a/testutil/contractmanager/keeper/contractmanager.go +++ b/testutil/contractmanager/keeper/contractmanager.go @@ -1,6 +1,8 @@ package keeper import ( + adminmoduletypes "github.com/cosmos/admin-module/x/adminmodule/types" + authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" "testing" tmdb "github.com/cometbft/cometbft-db" @@ -35,7 +37,7 @@ func ContractManagerKeeper(t testing.TB, wasmKeeper types.WasmKeeper) (*keeper.K storeKey, memStoreKey, wasmKeeper, - "", // TODO + authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String(), ) ctx := sdk.NewContext(stateStore, tmproto.Header{}, false, log.NewNopLogger()) diff --git a/testutil/cron/keeper/cron.go b/testutil/cron/keeper/cron.go index e2fff48dc..85fc35392 100644 --- a/testutil/cron/keeper/cron.go +++ b/testutil/cron/keeper/cron.go @@ -1,6 +1,8 @@ package keeper import ( + adminmoduletypes "github.com/cosmos/admin-module/x/adminmodule/types" + authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" "testing" tmdb "github.com/cometbft/cometbft-db" @@ -34,6 +36,7 @@ func CronKeeper(t testing.TB, wasmMsgServer types.WasmMsgServer, accountKeeper t storeKey, memStoreKey, accountKeeper, + authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String(), ) k.WasmMsgServer = wasmMsgServer diff --git a/testutil/feeburner/keeper/feeburner.go b/testutil/feeburner/keeper/feeburner.go index bea9b73a1..71f1e9e1c 100644 --- a/testutil/feeburner/keeper/feeburner.go +++ b/testutil/feeburner/keeper/feeburner.go @@ -1,6 +1,8 @@ package keeper import ( + adminmoduletypes "github.com/cosmos/admin-module/x/adminmodule/types" + authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" "testing" tmdb "github.com/cometbft/cometbft-db" @@ -39,6 +41,7 @@ func FeeburnerKeeperWithDeps(t testing.TB, accountKeeper types.AccountKeeper, ba memStoreKey, accountKeeper, bankkeeper, + authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String(), ) ctx := sdk.NewContext(stateStore, tmproto.Header{}, false, log.NewNopLogger()) diff --git a/testutil/feerefunder/keeper/fee.go b/testutil/feerefunder/keeper/fee.go index 940732526..d6ecd9a85 100644 --- a/testutil/feerefunder/keeper/fee.go +++ b/testutil/feerefunder/keeper/fee.go @@ -1,6 +1,8 @@ package keeper import ( + adminmoduletypes "github.com/cosmos/admin-module/x/adminmodule/types" + authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" "testing" tmdb "github.com/cometbft/cometbft-db" @@ -36,6 +38,7 @@ func FeeKeeper(t testing.TB, channelKeeper types.ChannelKeeper, bankKeeper types memStoreKey, channelKeeper, bankKeeper, + authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String(), ) ctx := sdk.NewContext(stateStore, tmproto.Header{}, false, log.NewNopLogger()) diff --git a/testutil/interchainqueries/keeper/interchainqeries.go b/testutil/interchainqueries/keeper/interchainqueries.go similarity index 89% rename from testutil/interchainqueries/keeper/interchainqeries.go rename to testutil/interchainqueries/keeper/interchainqueries.go index 1eeddd187..c6d3cebb2 100644 --- a/testutil/interchainqueries/keeper/interchainqeries.go +++ b/testutil/interchainqueries/keeper/interchainqueries.go @@ -1,6 +1,8 @@ package keeper import ( + adminmoduletypes "github.com/cosmos/admin-module/x/adminmodule/types" + authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" "testing" ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper" @@ -47,6 +49,7 @@ func InterchainQueriesKeeper( contractManager, headerVerifier, txVerifier, + authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String(), ) ctx := sdk.NewContext(stateStore, tmproto.Header{}, false, log.NewNopLogger()) diff --git a/testutil/interchaintxs/keeper/interchaintxs.go b/testutil/interchaintxs/keeper/interchaintxs.go index 55c9b43a9..7db23ee53 100644 --- a/testutil/interchaintxs/keeper/interchaintxs.go +++ b/testutil/interchaintxs/keeper/interchaintxs.go @@ -1,6 +1,8 @@ package keeper import ( + adminmoduletypes "github.com/cosmos/admin-module/x/adminmodule/types" + authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" "testing" tmdb "github.com/cometbft/cometbft-db" @@ -38,6 +40,7 @@ func InterchainTxsKeeper(t testing.TB, managerKeeper types.ContractManagerKeeper icaControllerKeeper, managerKeeper, refunderKeeper, + authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String(), ) ctx := sdk.NewContext(stateStore, tmproto.Header{}, false, log.NewNopLogger()) diff --git a/wasmbinding/test/custom_message_test.go b/wasmbinding/test/custom_message_test.go index ada721a6a..1cf2c3a5a 100644 --- a/wasmbinding/test/custom_message_test.go +++ b/wasmbinding/test/custom_message_test.go @@ -60,8 +60,8 @@ func (suite *CustomMessengerTestSuite) SetupTest() { suite.contractOwner = keeper.RandomAccountAddress(suite.T()) err := suite.messenger.TokenFactory.SetParams(suite.ctx, tokenfactorytypes.NewParams( - sdk.NewCoins(sdk.NewInt64Coin(tokenfactorytypes.DefaultNeutronDenom, 10_000_000)), - FeeCollectorAddress, + sdk.NewCoins(sdk.NewInt64Coin(params.DefaultDenom, 10_000_000)), + 0, )) suite.Require().NoError(err) } diff --git a/wasmbinding/test/custom_query_test.go b/wasmbinding/test/custom_query_test.go index 563212905..b358a712e 100644 --- a/wasmbinding/test/custom_query_test.go +++ b/wasmbinding/test/custom_query_test.go @@ -250,8 +250,8 @@ func (suite *CustomQuerierTestSuite) TestDenomAdmin() { ) err := neutron.TokenFactoryKeeper.SetParams(ctx, tokenfactorytypes.NewParams( - sdk.NewCoins(sdk.NewInt64Coin("untrn", 10_000_000)), - FeeCollectorAddress, + sdk.NewCoins(sdk.NewInt64Coin(params.DefaultDenom, 10_000_000)), + 0, )) suite.Require().NoError(err) diff --git a/x/contractmanager/types/codec.go b/x/contractmanager/types/codec.go index 24b7f62e5..a53442a0f 100644 --- a/x/contractmanager/types/codec.go +++ b/x/contractmanager/types/codec.go @@ -3,14 +3,19 @@ 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(_ *codec.LegacyAmino) { - // this line is used by starport scaffolding # 2 } -func RegisterInterfaces(_ cdctypes.InterfaceRegistry) { - // this line is used by starport scaffolding # 3 +func RegisterInterfaces(registry cdctypes.InterfaceRegistry) { + registry.RegisterImplementations( + (*sdk.Msg)(nil), + &MsgUpdateParams{}, + ) + msgservice.RegisterMsgServiceDesc(registry, &_Msg_serviceDesc) } var ( diff --git a/x/cron/types/codec.go b/x/cron/types/codec.go index 5c9dcb6db..a53442a0f 100644 --- a/x/cron/types/codec.go +++ b/x/cron/types/codec.go @@ -8,13 +8,13 @@ import ( ) func RegisterCodec(_ *codec.LegacyAmino) { - // this line is used by starport scaffolding # 2 } func RegisterInterfaces(registry cdctypes.InterfaceRegistry) { - registry.RegisterImplementations((*sdk.Msg)(nil)) - // this line is used by starport scaffolding # 3 - + registry.RegisterImplementations( + (*sdk.Msg)(nil), + &MsgUpdateParams{}, + ) msgservice.RegisterMsgServiceDesc(registry, &_Msg_serviceDesc) } diff --git a/x/feeburner/types/codec.go b/x/feeburner/types/codec.go index 7520c216f..a53442a0f 100644 --- a/x/feeburner/types/codec.go +++ b/x/feeburner/types/codec.go @@ -3,15 +3,19 @@ package types import ( "github.com/cosmos/cosmos-sdk/codec" cdctypes "github.com/cosmos/cosmos-sdk/codec/types" - // this line is used by starport scaffolding # 1 + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/types/msgservice" ) func RegisterCodec(_ *codec.LegacyAmino) { - // this line is used by starport scaffolding # 2 } -func RegisterInterfaces(_ cdctypes.InterfaceRegistry) { - // this line is used by starport scaffolding # 3 +func RegisterInterfaces(registry cdctypes.InterfaceRegistry) { + registry.RegisterImplementations( + (*sdk.Msg)(nil), + &MsgUpdateParams{}, + ) + msgservice.RegisterMsgServiceDesc(registry, &_Msg_serviceDesc) } var ( diff --git a/x/feerefunder/types/codec.go b/x/feerefunder/types/codec.go index 24b7f62e5..a53442a0f 100644 --- a/x/feerefunder/types/codec.go +++ b/x/feerefunder/types/codec.go @@ -3,14 +3,19 @@ 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(_ *codec.LegacyAmino) { - // this line is used by starport scaffolding # 2 } -func RegisterInterfaces(_ cdctypes.InterfaceRegistry) { - // this line is used by starport scaffolding # 3 +func RegisterInterfaces(registry cdctypes.InterfaceRegistry) { + registry.RegisterImplementations( + (*sdk.Msg)(nil), + &MsgUpdateParams{}, + ) + msgservice.RegisterMsgServiceDesc(registry, &_Msg_serviceDesc) } var ( diff --git a/x/interchainqueries/keeper/msg_server.go b/x/interchainqueries/keeper/msg_server.go index 414dd83f3..602a93d31 100644 --- a/x/interchainqueries/keeper/msg_server.go +++ b/x/interchainqueries/keeper/msg_server.go @@ -312,9 +312,9 @@ func (k msgServer) validateUpdateInterchainQueryParams( // UpdateParams updates the module parameters func (m msgServer) UpdateParams(goCtx context.Context, req *types.MsgUpdateParams) (*types.MsgUpdateParamsResponse, error) { - //if err := req.ValidateBasic(); err != nil { - // return nil, err - //} + if err := req.ValidateBasic(); err != nil { + return nil, err + } authority := m.Keeper.GetAuthority() if authority != req.Authority { return nil, errors.Wrapf(sdkerrors.ErrInvalidRequest, "invalid authority; expected %s, got %s", authority, req.Authority) diff --git a/x/interchainqueries/types/codec.go b/x/interchainqueries/types/codec.go index b5530b3b0..770be2dce 100644 --- a/x/interchainqueries/types/codec.go +++ b/x/interchainqueries/types/codec.go @@ -3,6 +3,7 @@ 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" ) @@ -11,6 +12,13 @@ func RegisterCodec(cdc *codec.LegacyAmino) { } func RegisterInterfaces(registry cdctypes.InterfaceRegistry) { + registry.RegisterImplementations( + (*sdk.Msg)(nil), + &MsgSubmitQueryResult{}, + &MsgRegisterInterchainQuery{}, + &MsgUpdateInterchainQueryRequest{}, + &MsgUpdateParams{}, + ) msgservice.RegisterMsgServiceDesc(registry, &_Msg_serviceDesc) } diff --git a/x/interchainqueries/types/tx.go b/x/interchainqueries/types/tx.go index 139698e0e..bb698bf83 100644 --- a/x/interchainqueries/types/tx.go +++ b/x/interchainqueries/types/tx.go @@ -15,6 +15,7 @@ const ( MaxKVQueryKeysCount = 32 ) +var _ sdk.Msg = &MsgSubmitQueryResult{} var _ codectypes.UnpackInterfacesMessage = MsgSubmitQueryResult{} func (msg MsgSubmitQueryResult) Route() string { @@ -65,6 +66,20 @@ func (msg MsgSubmitQueryResult) GetSigners() []sdk.AccAddress { return []sdk.AccAddress{senderAddr} } +// UnpackInterfaces implements UnpackInterfacesMessage.UnpackInterfaces +func (msg MsgSubmitQueryResult) UnpackInterfaces(unpacker codectypes.AnyUnpacker) error { + var header exported.ClientMessage + if err := unpacker.UnpackAny(msg.Result.GetBlock().GetHeader(), &header); err != nil { + return err + } + + return unpacker.UnpackAny(msg.Result.GetBlock().GetNextBlockHeader(), &header) +} + +//---------------------------------------------------------------- + +var _ sdk.Msg = &MsgRegisterInterchainQuery{} + func (msg MsgRegisterInterchainQuery) Route() string { return RouterKey } @@ -123,15 +138,9 @@ func (msg MsgRegisterInterchainQuery) GetSigners() []sdk.AccAddress { return []sdk.AccAddress{senderAddr} } -// UnpackInterfaces implements UnpackInterfacesMessage.UnpackInterfaces -func (msg MsgSubmitQueryResult) UnpackInterfaces(unpacker codectypes.AnyUnpacker) error { - var header exported.ClientMessage - if err := unpacker.UnpackAny(msg.Result.GetBlock().GetHeader(), &header); err != nil { - return err - } +//---------------------------------------------------------------- - return unpacker.UnpackAny(msg.Result.GetBlock().GetNextBlockHeader(), &header) -} +var _ sdk.Msg = &MsgUpdateInterchainQueryRequest{} func (msg MsgUpdateInterchainQueryRequest) ValidateBasic() error { if msg.GetQueryId() == 0 { @@ -188,6 +197,37 @@ func (msg MsgUpdateInterchainQueryRequest) GetSigners() []sdk.AccAddress { return []sdk.AccAddress{senderAddr} } +//---------------------------------------------------------------- + +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 sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(msg)) +} + +func (msg *MsgUpdateParams) ValidateBasic() error { + if _, err := sdk.AccAddressFromBech32(msg.Authority); err != nil { + return errors.Wrap(err, "authority is invalid") + } + return nil +} + func validateKeys(keys []*KVKey) error { if uint64(len(keys)) > MaxKVQueryKeysCount { return errors.Wrapf(ErrTooManyKVQueryKeys, "keys count cannot be more than %d", MaxKVQueryKeysCount) diff --git a/x/interchaintxs/keeper/msg_server.go b/x/interchaintxs/keeper/msg_server.go index acd5b82c5..d3ff22172 100644 --- a/x/interchaintxs/keeper/msg_server.go +++ b/x/interchaintxs/keeper/msg_server.go @@ -174,9 +174,9 @@ func SerializeCosmosTx(cdc codec.BinaryCodec, msgs []*codectypes.Any) (bz []byte // UpdateParams updates the module parameters func (k Keeper) UpdateParams(goCtx context.Context, req *ictxtypes.MsgUpdateParams) (*ictxtypes.MsgUpdateParamsResponse, error) { - //if err := req.ValidateBasic(); err != nil { - // return nil, err - //} + if err := req.ValidateBasic(); err != nil { + return nil, err + } authority := k.GetAuthority() if authority != req.Authority { return nil, errors.Wrapf(sdkerrors.ErrInvalidRequest, "invalid authority; expected %s, got %s", authority, req.Authority) diff --git a/x/interchaintxs/types/tx.go b/x/interchaintxs/types/tx.go index 90687d161..b84bcba36 100644 --- a/x/interchaintxs/types/tx.go +++ b/x/interchaintxs/types/tx.go @@ -129,3 +129,34 @@ func (msg *MsgSubmitTx) UnpackInterfaces(unpacker codectypes.AnyUnpacker) error } return nil } + +//---------------------------------------------------------------- + +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 sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(msg)) +} + +func (msg *MsgUpdateParams) ValidateBasic() error { + if _, err := sdk.AccAddressFromBech32(msg.Authority); err != nil { + return errors.Wrap(err, "authority is invalid") + } + return nil +} diff --git a/x/tokenfactory/keeper/admins_test.go b/x/tokenfactory/keeper/admins_test.go index 0828ffcef..316988309 100644 --- a/x/tokenfactory/keeper/admins_test.go +++ b/x/tokenfactory/keeper/admins_test.go @@ -183,6 +183,11 @@ func (suite *KeeperTestSuite) TestBurnDenom() { } func (suite *KeeperTestSuite) TestChangeAdminDenom() { + //suite.Setup() + + // Create a denom. + //suite.CreateDefaultDenom(suite.ChainA.GetContext()) + for _, tc := range []struct { desc string msgChangeAdmin func(denom string) *types.MsgChangeAdmin diff --git a/x/tokenfactory/keeper/genesis_test.go b/x/tokenfactory/keeper/genesis_test.go index 707214167..67a38e6f7 100644 --- a/x/tokenfactory/keeper/genesis_test.go +++ b/x/tokenfactory/keeper/genesis_test.go @@ -40,7 +40,8 @@ func (suite *KeeperTestSuite) TestGenesis() { } } - app.TokenFactoryKeeper.SetParams(context, types.Params{}) + err := app.TokenFactoryKeeper.SetParams(context, types.Params{}) + suite.Require().NoError(err) app.TokenFactoryKeeper.InitGenesis(context, genesisState) exportedGenesis := app.TokenFactoryKeeper.ExportGenesis(context) suite.Require().NotNil(exportedGenesis) diff --git a/x/tokenfactory/keeper/keeper_test.go b/x/tokenfactory/keeper/keeper_test.go index dfccb9b4a..6bf6e9313 100644 --- a/x/tokenfactory/keeper/keeper_test.go +++ b/x/tokenfactory/keeper/keeper_test.go @@ -51,13 +51,14 @@ func (suite *KeeperTestSuite) Setup() { suite.queryClient = types.NewQueryClient(suite.QueryHelper) - tokeFactoryKeeper := suite.GetNeutronZoneApp(suite.ChainA).TokenFactoryKeeper - tokeFactoryKeeper.SetParams(suite.ChainA.GetContext(), types.NewParams( + tokenFactoryKeeper := suite.GetNeutronZoneApp(suite.ChainA).TokenFactoryKeeper + err := tokenFactoryKeeper.SetParams(suite.ChainA.GetContext(), types.NewParams( sdktypes.NewCoins(sdktypes.NewInt64Coin(suite.defaultDenom, TopUpCoinsAmount)), - "", + 0, // TODO: what value to set? )) + suite.Require().NoError(err) - suite.msgServer = keeper.NewMsgServerImpl(*tokeFactoryKeeper) + suite.msgServer = keeper.NewMsgServerImpl(*tokenFactoryKeeper) } func (suite *KeeperTestSuite) SetupTokenFactory() { diff --git a/x/tokenfactory/module.go b/x/tokenfactory/module.go index db462f23f..71f61e563 100644 --- a/x/tokenfactory/module.go +++ b/x/tokenfactory/module.go @@ -133,8 +133,8 @@ func (AppModule) QuerierRoute() string { return types.QuerierRoute } // RegisterServices registers a GRPC query service to respond to the // module-specific GRPC queries. func (am AppModule) RegisterServices(cfg module.Configurator) { - types.RegisterMsgServer(cfg.MsgServer(), keeper.NewMsgServerImpl(am.keeper)) types.RegisterQueryServer(cfg.QueryServer(), am.keeper) + types.RegisterMsgServer(cfg.MsgServer(), keeper.NewMsgServerImpl(am.keeper)) } // RegisterInvariants registers the tokenfactory module's invariants. diff --git a/x/tokenfactory/types/codec.go b/x/tokenfactory/types/codec.go index 78f7dafa4..687f6047c 100644 --- a/x/tokenfactory/types/codec.go +++ b/x/tokenfactory/types/codec.go @@ -25,9 +25,9 @@ func RegisterInterfaces(registry cdctypes.InterfaceRegistry) { &MsgCreateDenom{}, &MsgMint{}, &MsgBurn{}, - // &MsgForceTransfer{}, + // &MsgForceTransfer{}, // TODO: why commented? &MsgChangeAdmin{}, - //&MsgSetBeforeSendHook{}, + //&MsgSetBeforeSendHook{}, // TODO: why commented? ) msgservice.RegisterMsgServiceDesc(registry, &_Msg_serviceDesc) } diff --git a/x/transfer/module.go b/x/transfer/module.go index b6873db43..0978543ec 100644 --- a/x/transfer/module.go +++ b/x/transfer/module.go @@ -92,8 +92,8 @@ func (am AppModule) IsAppModule() { // marker // RegisterServices registers module services. func (am AppModule) RegisterServices(cfg module.Configurator) { - neutrontypes.RegisterMsgServer(cfg.MsgServer(), am.keeper) types.RegisterQueryServer(cfg.QueryServer(), am.keeper) + neutrontypes.RegisterMsgServer(cfg.MsgServer(), am.keeper) cfg.MsgServer().RegisterService(&neutrontypes.MsgServiceDescOrig, am.keeper) } From 628995aa029e1caf11aaf752e82570b70a7e4ecf Mon Sep 17 00:00:00 2001 From: nhpd Date: Mon, 4 Sep 2023 19:15:36 +0400 Subject: [PATCH 093/307] rename msg service receiver k -> m --- x/interchainqueries/keeper/msg_server.go | 56 ++++++++++++------------ 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/x/interchainqueries/keeper/msg_server.go b/x/interchainqueries/keeper/msg_server.go index 602a93d31..ad9a27e6d 100644 --- a/x/interchainqueries/keeper/msg_server.go +++ b/x/interchainqueries/keeper/msg_server.go @@ -32,7 +32,7 @@ func NewMsgServerImpl(keeper Keeper) types.MsgServer { return &msgServer{Keeper: keeper} } -func (k msgServer) RegisterInterchainQuery(goCtx context.Context, msg *types.MsgRegisterInterchainQuery) (*types.MsgRegisterInterchainQueryResponse, error) { +func (m msgServer) RegisterInterchainQuery(goCtx context.Context, msg *types.MsgRegisterInterchainQuery) (*types.MsgRegisterInterchainQueryResponse, error) { defer telemetry.ModuleMeasureSince(types.ModuleName, time.Now(), LabelRegisterInterchainQuery) ctx := sdk.UnwrapSDKContext(goCtx) @@ -40,24 +40,24 @@ func (k msgServer) RegisterInterchainQuery(goCtx context.Context, msg *types.Msg senderAddr, err := sdk.AccAddressFromBech32(msg.Sender) if err != nil { - k.Logger(ctx).Debug("RegisterInterchainQuery: failed to parse sender address", "sender_address", msg.Sender) + m.Logger(ctx).Debug("RegisterInterchainQuery: failed to parse sender address", "sender_address", msg.Sender) return nil, errors.Wrapf(sdkerrors.ErrInvalidAddress, "failed to parse address: %s", msg.Sender) } - if !k.contractManagerKeeper.HasContractInfo(ctx, senderAddr) { - k.Logger(ctx).Debug("RegisterInterchainQuery: contract not found", "sender_address", msg.Sender) + if !m.contractManagerKeeper.HasContractInfo(ctx, senderAddr) { + m.Logger(ctx).Debug("RegisterInterchainQuery: contract not found", "sender_address", msg.Sender) return nil, errors.Wrapf(types.ErrNotContract, "%s is not a contract address", msg.Sender) } - if _, err := k.ibcKeeper.ConnectionKeeper.Connection(goCtx, &ibcconnectiontypes.QueryConnectionRequest{ConnectionId: msg.ConnectionId}); err != nil { + if _, err := m.ibcKeeper.ConnectionKeeper.Connection(goCtx, &ibcconnectiontypes.QueryConnectionRequest{ConnectionId: msg.ConnectionId}); err != nil { ctx.Logger().Debug("RegisterInterchainQuery: failed to get connection with ID", "message", msg) return nil, errors.Wrapf(types.ErrInvalidConnectionID, "failed to get connection with ID '%s': %v", msg.ConnectionId, err) } - lastID := k.GetLastRegisteredQueryKey(ctx) + lastID := m.GetLastRegisteredQueryKey(ctx) lastID++ - params := k.GetParams(ctx) + params := m.GetParams(ctx) registeredQuery := &types.RegisteredQuery{ Id: lastID, @@ -72,14 +72,14 @@ func (k msgServer) RegisterInterchainQuery(goCtx context.Context, msg *types.Msg RegisteredAtHeight: uint64(ctx.BlockHeader().Height), } - k.SetLastRegisteredQueryKey(ctx, lastID) + m.SetLastRegisteredQueryKey(ctx, lastID) - if err := k.CollectDeposit(ctx, *registeredQuery); err != nil { + if err := m.CollectDeposit(ctx, *registeredQuery); err != nil { ctx.Logger().Debug("RegisterInterchainQuery: failed to collect deposit", "message", &msg, "error", err) return nil, errors.Wrapf(err, "failed to collect deposit") } - if err := k.SaveQuery(ctx, registeredQuery); err != nil { + if err := m.SaveQuery(ctx, registeredQuery); err != nil { ctx.Logger().Debug("RegisterInterchainQuery: failed to save query", "message", &msg, "error", err) return nil, errors.Wrapf(err, "failed to save query: %v", err) } @@ -89,11 +89,11 @@ func (k msgServer) RegisterInterchainQuery(goCtx context.Context, msg *types.Msg return &types.MsgRegisterInterchainQueryResponse{Id: lastID}, nil } -func (k msgServer) RemoveInterchainQuery(goCtx context.Context, msg *types.MsgRemoveInterchainQueryRequest) (*types.MsgRemoveInterchainQueryResponse, error) { +func (m msgServer) RemoveInterchainQuery(goCtx context.Context, msg *types.MsgRemoveInterchainQueryRequest) (*types.MsgRemoveInterchainQueryResponse, error) { ctx := sdk.UnwrapSDKContext(goCtx) ctx.Logger().Debug("RemoveInterchainQuery", "msg", msg) - query, err := k.GetQueryByID(ctx, msg.GetQueryId()) + query, err := m.GetQueryByID(ctx, msg.GetQueryId()) if err != nil { ctx.Logger().Debug("RemoveInterchainQuery: failed to GetQueryByID", "error", err, "query_id", msg.QueryId) @@ -106,17 +106,17 @@ func (k msgServer) RemoveInterchainQuery(goCtx context.Context, msg *types.MsgRe return nil, errors.Wrap(sdkerrors.ErrUnauthorized, err.Error()) } - k.RemoveQuery(ctx, query) - k.MustPayOutDeposit(ctx, query.Deposit, msg.GetSigners()[0]) + m.RemoveQuery(ctx, query) + m.MustPayOutDeposit(ctx, query.Deposit, msg.GetSigners()[0]) ctx.EventManager().EmitEvents(getEventsQueryRemoved(query)) return &types.MsgRemoveInterchainQueryResponse{}, nil } -func (k msgServer) UpdateInterchainQuery(goCtx context.Context, msg *types.MsgUpdateInterchainQueryRequest) (*types.MsgUpdateInterchainQueryResponse, error) { +func (m msgServer) UpdateInterchainQuery(goCtx context.Context, msg *types.MsgUpdateInterchainQueryRequest) (*types.MsgUpdateInterchainQueryResponse, error) { ctx := sdk.UnwrapSDKContext(goCtx) ctx.Logger().Debug("UpdateInterchainQuery", "msg", msg) - query, err := k.GetQueryByID(ctx, msg.GetQueryId()) + query, err := m.GetQueryByID(ctx, msg.GetQueryId()) if err != nil { ctx.Logger().Debug("UpdateInterchainQuery: failed to GetQueryByID", "error", err, "query_id", msg.QueryId) @@ -129,7 +129,7 @@ func (k msgServer) UpdateInterchainQuery(goCtx context.Context, msg *types.MsgUp return nil, errors.Wrap(sdkerrors.ErrUnauthorized, "authorization failed") } - if err := k.validateUpdateInterchainQueryParams(query, msg); err != nil { + if err := m.validateUpdateInterchainQueryParams(query, msg); err != nil { ctx.Logger().Debug("UpdateInterchainQuery: invalid request", "error", err, "query_id", msg.QueryId) return nil, errors.Wrap(sdkerrors.ErrInvalidRequest, err.Error()) @@ -144,7 +144,7 @@ func (k msgServer) UpdateInterchainQuery(goCtx context.Context, msg *types.MsgUp query.TransactionsFilter = msg.GetNewTransactionsFilter() } - if err := k.SaveQuery(ctx, query); err != nil { + if err := m.SaveQuery(ctx, query); err != nil { ctx.Logger().Debug("UpdateInterchainQuery: failed to save query", "message", &msg, "error", err) return nil, errors.Wrapf(err, "failed to save query by query id: %v", err) } @@ -154,13 +154,13 @@ func (k msgServer) UpdateInterchainQuery(goCtx context.Context, msg *types.MsgUp return &types.MsgUpdateInterchainQueryResponse{}, nil } -func (k msgServer) SubmitQueryResult(goCtx context.Context, msg *types.MsgSubmitQueryResult) (*types.MsgSubmitQueryResultResponse, error) { +func (m msgServer) SubmitQueryResult(goCtx context.Context, msg *types.MsgSubmitQueryResult) (*types.MsgSubmitQueryResultResponse, error) { defer telemetry.ModuleMeasureSince(types.ModuleName, time.Now(), LabelRegisterInterchainQuery) ctx := sdk.UnwrapSDKContext(goCtx) ctx.Logger().Debug("SubmitQueryResult", "query_id", msg.QueryId) - query, err := k.GetQueryByID(ctx, msg.QueryId) + query, err := m.GetQueryByID(ctx, msg.QueryId) if err != nil { ctx.Logger().Debug("SubmitQueryResult: failed to GetQueryByID", "error", err, "query_id", msg.QueryId) @@ -178,14 +178,14 @@ func (k msgServer) SubmitQueryResult(goCtx context.Context, msg *types.MsgSubmit if !types.InterchainQueryType(query.QueryType).IsKV() { return nil, errors.Wrapf(types.ErrInvalidType, "invalid query result for query type: %s", query.QueryType) } - if err := k.checkLastRemoteHeight(ctx, *query, ibcclienttypes.NewHeight(msg.Result.Revision, msg.Result.Height)); err != nil { + if err := m.checkLastRemoteHeight(ctx, *query, ibcclienttypes.NewHeight(msg.Result.Revision, msg.Result.Height)); err != nil { return nil, errors.Wrap(types.ErrInvalidHeight, err.Error()) } if len(msg.Result.KvResults) != len(query.Keys) { return nil, errors.Wrapf(types.ErrInvalidSubmittedResult, "KV keys length from result is not equal to registered query keys length: %v != %v", len(msg.Result.KvResults), len(query.Keys)) } - resp, err := k.ibcKeeper.ConnectionConsensusState(goCtx, &ibcconnectiontypes.QueryConnectionConsensusStateRequest{ + resp, err := m.ibcKeeper.ConnectionConsensusState(goCtx, &ibcconnectiontypes.QueryConnectionConsensusStateRequest{ ConnectionId: query.ConnectionId, RevisionNumber: msg.Result.Revision, RevisionHeight: msg.Result.Height + 1, @@ -209,7 +209,7 @@ func (k msgServer) SubmitQueryResult(goCtx context.Context, msg *types.MsgSubmit return nil, errors.Wrapf(sdkerrors.ErrUnpackAny, "failed to cast interface exported.ConsensusState to type *tendermint.ConsensusState") } - clientState, err := k.GetClientState(ctx, msg.ClientId) + clientState, err := m.GetClientState(ctx, msg.ClientId) if err != nil { return nil, err } @@ -253,7 +253,7 @@ func (k msgServer) SubmitQueryResult(goCtx context.Context, msg *types.MsgSubmit } } - if err = k.saveKVQueryResult(ctx, query, msg.Result); err != nil { + if err = m.saveKVQueryResult(ctx, query, msg.Result); err != nil { ctx.Logger().Error("SubmitQueryResult: failed to SaveKVQueryResult", "error", err, "query", query, "message", msg) return nil, errors.Wrapf(err, "failed to SaveKVQueryResult: %v", err) @@ -261,7 +261,7 @@ func (k msgServer) SubmitQueryResult(goCtx context.Context, msg *types.MsgSubmit if msg.Result.GetAllowKvCallbacks() { // Let the query owner contract process the query result. - if _, err := k.contractManagerKeeper.SudoKVQueryResult(ctx, queryOwner, query.Id); err != nil { + if _, err := m.contractManagerKeeper.SudoKVQueryResult(ctx, queryOwner, query.Id); err != nil { ctx.Logger().Debug("SubmitQueryResult: failed to SudoKVQueryResult", "error", err, "query_id", query.GetId()) return nil, errors.Wrapf(err, "contract %s rejected KV query result (query_id: %d)", @@ -276,13 +276,13 @@ func (k msgServer) SubmitQueryResult(goCtx context.Context, msg *types.MsgSubmit return nil, errors.Wrapf(types.ErrInvalidType, "invalid query result for query type: %s", query.QueryType) } - if err := k.ProcessBlock(ctx, queryOwner, msg.QueryId, msg.ClientId, msg.Result.Block); err != nil { + if err := m.ProcessBlock(ctx, queryOwner, msg.QueryId, msg.ClientId, msg.Result.Block); err != nil { ctx.Logger().Debug("SubmitQueryResult: failed to ProcessBlock", "error", err, "query", query, "message", msg) return nil, errors.Wrapf(err, "failed to ProcessBlock: %v", err) } - if err = k.UpdateLastLocalHeight(ctx, query.Id, uint64(ctx.BlockHeight())); err != nil { + if err = m.UpdateLastLocalHeight(ctx, query.Id, uint64(ctx.BlockHeight())); err != nil { return nil, errors.Wrapf(err, "failed to update last local height for a result with id %d: %v", query.Id, err) } @@ -293,7 +293,7 @@ func (k msgServer) SubmitQueryResult(goCtx context.Context, msg *types.MsgSubmit // validateUpdateInterchainQueryParams checks whether the parameters to be updated corresponds // with the query type. -func (k msgServer) validateUpdateInterchainQueryParams( +func (m msgServer) validateUpdateInterchainQueryParams( query *types.RegisteredQuery, msg *types.MsgUpdateInterchainQueryRequest, ) error { From 9b3813d06f737a1dc073991d558c5e7d26489e8e Mon Sep 17 00:00:00 2001 From: nhpd Date: Mon, 4 Sep 2023 20:13:44 +0400 Subject: [PATCH 094/307] add missing registrations --- x/interchainqueries/types/codec.go | 3 ++- x/tokenfactory/keeper/admins_test.go | 5 ----- x/tokenfactory/keeper/keeper_test.go | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/x/interchainqueries/types/codec.go b/x/interchainqueries/types/codec.go index 770be2dce..09c014a75 100644 --- a/x/interchainqueries/types/codec.go +++ b/x/interchainqueries/types/codec.go @@ -14,9 +14,10 @@ func RegisterCodec(cdc *codec.LegacyAmino) { func RegisterInterfaces(registry cdctypes.InterfaceRegistry) { registry.RegisterImplementations( (*sdk.Msg)(nil), - &MsgSubmitQueryResult{}, &MsgRegisterInterchainQuery{}, + &MsgSubmitQueryResult{}, &MsgUpdateInterchainQueryRequest{}, + &MsgRemoveInterchainQueryRequest{}, &MsgUpdateParams{}, ) msgservice.RegisterMsgServiceDesc(registry, &_Msg_serviceDesc) diff --git a/x/tokenfactory/keeper/admins_test.go b/x/tokenfactory/keeper/admins_test.go index 316988309..0828ffcef 100644 --- a/x/tokenfactory/keeper/admins_test.go +++ b/x/tokenfactory/keeper/admins_test.go @@ -183,11 +183,6 @@ func (suite *KeeperTestSuite) TestBurnDenom() { } func (suite *KeeperTestSuite) TestChangeAdminDenom() { - //suite.Setup() - - // Create a denom. - //suite.CreateDefaultDenom(suite.ChainA.GetContext()) - for _, tc := range []struct { desc string msgChangeAdmin func(denom string) *types.MsgChangeAdmin diff --git a/x/tokenfactory/keeper/keeper_test.go b/x/tokenfactory/keeper/keeper_test.go index 6bf6e9313..4b9d546e8 100644 --- a/x/tokenfactory/keeper/keeper_test.go +++ b/x/tokenfactory/keeper/keeper_test.go @@ -54,7 +54,7 @@ func (suite *KeeperTestSuite) Setup() { tokenFactoryKeeper := suite.GetNeutronZoneApp(suite.ChainA).TokenFactoryKeeper err := tokenFactoryKeeper.SetParams(suite.ChainA.GetContext(), types.NewParams( sdktypes.NewCoins(sdktypes.NewInt64Coin(suite.defaultDenom, TopUpCoinsAmount)), - 0, // TODO: what value to set? + 0, )) suite.Require().NoError(err) From 6c9f16c3e4da1a5e273ce9f189105904494b9ccb Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Tue, 5 Sep 2023 14:24:22 +0400 Subject: [PATCH 095/307] register upd params --- x/tokenfactory/types/codec.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/x/tokenfactory/types/codec.go b/x/tokenfactory/types/codec.go index 687f6047c..42f15f0e5 100644 --- a/x/tokenfactory/types/codec.go +++ b/x/tokenfactory/types/codec.go @@ -16,7 +16,8 @@ func RegisterCodec(cdc *codec.LegacyAmino) { cdc.RegisterConcrete(&MsgBurn{}, "osmosis/tokenfactory/burn", nil) //cdc.RegisterConcrete(&MsgForceTransfer{}, "osmosis/tokenfactory/force-transfer", nil) cdc.RegisterConcrete(&MsgChangeAdmin{}, "osmosis/tokenfactory/change-admin", nil) - //cdc.RegisterConcrete(&MsgSetBeforeSendHook{}, "osmosis/tokenfactory/set-beforesend-hook", nil) + cdc.RegisterConcrete(&MsgSetBeforeSendHook{}, "osmosis/tokenfactory/set-beforesend-hook", nil) + cdc.RegisterConcrete(&MsgUpdateParams{}, "osmosis/tokenfactory/update-params", nil) } func RegisterInterfaces(registry cdctypes.InterfaceRegistry) { @@ -27,7 +28,8 @@ func RegisterInterfaces(registry cdctypes.InterfaceRegistry) { &MsgBurn{}, // &MsgForceTransfer{}, // TODO: why commented? &MsgChangeAdmin{}, - //&MsgSetBeforeSendHook{}, // TODO: why commented? + &MsgSetBeforeSendHook{}, + &MsgUpdateParams{}, ) msgservice.RegisterMsgServiceDesc(registry, &_Msg_serviceDesc) } From 0489bc1a581a1e249d6bc84588ae9247ddc17cc8 Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Tue, 5 Sep 2023 16:24:07 +0400 Subject: [PATCH 096/307] upda admin module --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index e5cc72f36..4ec3e1127 100644 --- a/go.mod +++ b/go.mod @@ -190,7 +190,7 @@ replace ( github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0 github.com/ChainSafe/go-schnorrkel => github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d github.com/CosmWasm/wasmd => github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230808084410-6083b888424e - github.com/cosmos/admin-module => github.com/neutron-org/admin-module v0.0.0-20230904070658-53e6d9fc7035 + github.com/cosmos/admin-module => github.com/neutron-org/admin-module v0.0.0-20230905102321-cc97b555fcb0 github.com/cosmos/cosmos-sdk => github.com/neutron-org/cosmos-sdk v0.47.5-0.20230808152221-a0e301227957 github.com/cosmos/gaia/v11 => github.com/cosmos/gaia/v11 v11.0.0-20230724152830-861ba391c3b4 github.com/cosmos/ledger-cosmos-go => github.com/cosmos/ledger-cosmos-go v0.12.1 diff --git a/go.sum b/go.sum index 5eca99390..1c87a12ea 100644 --- a/go.sum +++ b/go.sum @@ -938,8 +938,8 @@ github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxzi github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/neilotoole/errgroup v0.1.6/go.mod h1:Q2nLGf+594h0CLBs/Mbg6qOr7GtqDK7C2S41udRnToE= -github.com/neutron-org/admin-module v0.0.0-20230904070658-53e6d9fc7035 h1:D6IibSrjZM7n/VEG+gqxRS1qd1FubhweMzpyTOv+veo= -github.com/neutron-org/admin-module v0.0.0-20230904070658-53e6d9fc7035/go.mod h1:INknneN2W3Fr9Eld7SpfLRdjyHR1muzFbbqXln1ixic= +github.com/neutron-org/admin-module v0.0.0-20230905102321-cc97b555fcb0 h1:wwRgnEuiGBGiSt8+K557QGTNyNBJ58Mx4vcIjN3yeAo= +github.com/neutron-org/admin-module v0.0.0-20230905102321-cc97b555fcb0/go.mod h1:INknneN2W3Fr9Eld7SpfLRdjyHR1muzFbbqXln1ixic= github.com/neutron-org/cosmos-sdk v0.47.5-0.20230808152221-a0e301227957 h1:cl6UqD18qV/QXgT6Yjo2TelfbaOqQGuvL1yX0cWguSs= github.com/neutron-org/cosmos-sdk v0.47.5-0.20230808152221-a0e301227957/go.mod h1:4xMyIVekAs2OEUz/yh9JwzhLBMk+olM2sxgKuQdlhLg= github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230808084410-6083b888424e h1:uVJCBWf1vcCYY0pzOA2SCPIZT8WsR8fsOxs57mnJbM4= From 101656925d3b4ad719e477eb16d6b287306c07e2 Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Wed, 6 Sep 2023 13:10:14 +0400 Subject: [PATCH 097/307] upd module --- app/app.go | 30 +++++++++++++++--------------- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/app/app.go b/app/app.go index 4b72c53de..70239d7a1 100644 --- a/app/app.go +++ b/app/app.go @@ -116,7 +116,7 @@ import ( "github.com/cosmos/admin-module/x/adminmodule" adminmodulecli "github.com/cosmos/admin-module/x/adminmodule/client/cli" adminmodulekeeper "github.com/cosmos/admin-module/x/adminmodule/keeper" - admintypes "github.com/cosmos/admin-module/x/adminmodule/types" + adminmoduletypes "github.com/cosmos/admin-module/x/adminmodule/types" govclient "github.com/cosmos/cosmos-sdk/x/gov/client" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" @@ -371,7 +371,7 @@ func New( evidencetypes.StoreKey, ibctransfertypes.StoreKey, icacontrollertypes.StoreKey, icahosttypes.StoreKey, capabilitytypes.StoreKey, interchainqueriesmoduletypes.StoreKey, contractmanagermoduletypes.StoreKey, interchaintxstypes.StoreKey, wasm.StoreKey, feetypes.StoreKey, - feeburnertypes.StoreKey, admintypes.StoreKey, ccvconsumertypes.StoreKey, tokenfactorytypes.StoreKey, routertypes.StoreKey, + feeburnertypes.StoreKey, adminmoduletypes.StoreKey, ccvconsumertypes.StoreKey, tokenfactorytypes.StoreKey, routertypes.StoreKey, crontypes.StoreKey, ibchookstypes.StoreKey, consensusparamtypes.StoreKey, crisistypes.StoreKey, buildertypes.StoreKey, ) tkeys := sdk.NewTransientStoreKeys(paramstypes.TStoreKey) @@ -392,7 +392,7 @@ func New( app.ParamsKeeper = initParamsKeeper(appCodec, legacyAmino, keys[paramstypes.StoreKey], tkeys[paramstypes.TStoreKey]) // set the BaseApp's parameter store - app.ConsensusParamsKeeper = consensusparamkeeper.NewKeeper(appCodec, keys[consensusparamtypes.StoreKey], authtypes.NewModuleAddress(admintypes.ModuleName).String()) + app.ConsensusParamsKeeper = consensusparamkeeper.NewKeeper(appCodec, keys[consensusparamtypes.StoreKey], authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String()) bApp.SetParamStore(&app.ConsensusParamsKeeper) // add capability keeper and ScopeToModule for ibc module @@ -414,7 +414,7 @@ func New( authtypes.ProtoBaseAccount, maccPerms, sdk.GetConfig().GetBech32AccountAddrPrefix(), - authtypes.NewModuleAddress(admintypes.ModuleName).String(), + authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String(), ) app.AuthzKeeper = authzkeeper.NewKeeper( @@ -426,7 +426,7 @@ func New( keys[banktypes.StoreKey], app.AccountKeeper, app.BlockedAddrs(), - authtypes.NewModuleAddress(admintypes.ModuleName).String(), + authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String(), ) app.SlashingKeeper = slashingkeeper.NewKeeper( @@ -434,7 +434,7 @@ func New( legacyAmino, keys[slashingtypes.StoreKey], &app.ConsumerKeeper, - authtypes.NewModuleAddress(admintypes.ModuleName).String(), + authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String(), ) app.CrisisKeeper = *crisiskeeper.NewKeeper( appCodec, @@ -442,7 +442,7 @@ func New( invCheckPeriod, app.BankKeeper, authtypes.FeeCollectorName, - authtypes.NewModuleAddress(admintypes.ModuleName).String(), + authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String(), ) app.FeeGrantKeeper = feegrantkeeper.NewKeeper(appCodec, keys[feegrant.StoreKey], app.AccountKeeper) @@ -452,7 +452,7 @@ func New( appCodec, homePath, app.BaseApp, - authtypes.NewModuleAddress(admintypes.ModuleName).String(), + authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String(), ) // ... other modules keepers @@ -583,7 +583,7 @@ func New( app.BankKeeper, // 25% of rewards should be sent to the redistribute address rewardsaddressprovider.NewFixedAddressRewardsAddressProvider(app.AccountKeeper.GetModuleAddress(ccvconsumertypes.ConsumerRedistributeName)), - authtypes.NewModuleAddress(admintypes.ModuleName).String(), + authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String(), ) wasmDir := filepath.Join(homePath, "wasm") @@ -608,8 +608,8 @@ func New( app.AdminmoduleKeeper = *adminmodulekeeper.NewKeeper( appCodec, - keys[admintypes.StoreKey], - keys[admintypes.MemStoreKey], + keys[adminmoduletypes.StoreKey], + keys[adminmoduletypes.MemStoreKey], adminRouterLegacy, app.MsgServiceRouter(), IsConsumerProposalAllowlisted, @@ -661,7 +661,7 @@ func New( wasmDir, wasmConfig, supportedFeatures, - authtypes.NewModuleAddress(admintypes.ModuleName).String(), + authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String(), wasmOpts..., ) wasmHooks.ContractKeeper = &app.WasmKeeper @@ -779,7 +779,7 @@ func New( wasm.ModuleName, feetypes.ModuleName, feeburnertypes.ModuleName, - admintypes.ModuleName, + adminmoduletypes.ModuleName, ibchookstypes.ModuleName, routertypes.ModuleName, crontypes.ModuleName, @@ -810,7 +810,7 @@ func New( wasm.ModuleName, feetypes.ModuleName, feeburnertypes.ModuleName, - admintypes.ModuleName, + adminmoduletypes.ModuleName, ibchookstypes.ModuleName, routertypes.ModuleName, crontypes.ModuleName, @@ -846,7 +846,7 @@ func New( wasm.ModuleName, feetypes.ModuleName, feeburnertypes.ModuleName, - admintypes.ModuleName, + adminmoduletypes.ModuleName, ibchookstypes.ModuleName, // after auth keeper routertypes.ModuleName, crontypes.ModuleName, diff --git a/go.mod b/go.mod index 4ec3e1127..ffb4b04e4 100644 --- a/go.mod +++ b/go.mod @@ -190,7 +190,7 @@ replace ( github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0 github.com/ChainSafe/go-schnorrkel => github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d github.com/CosmWasm/wasmd => github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230808084410-6083b888424e - github.com/cosmos/admin-module => github.com/neutron-org/admin-module v0.0.0-20230905102321-cc97b555fcb0 + github.com/cosmos/admin-module => github.com/neutron-org/admin-module v0.0.0-20230906085030-252c6438f577 github.com/cosmos/cosmos-sdk => github.com/neutron-org/cosmos-sdk v0.47.5-0.20230808152221-a0e301227957 github.com/cosmos/gaia/v11 => github.com/cosmos/gaia/v11 v11.0.0-20230724152830-861ba391c3b4 github.com/cosmos/ledger-cosmos-go => github.com/cosmos/ledger-cosmos-go v0.12.1 diff --git a/go.sum b/go.sum index 1c87a12ea..9895e641a 100644 --- a/go.sum +++ b/go.sum @@ -938,8 +938,8 @@ github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxzi github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/neilotoole/errgroup v0.1.6/go.mod h1:Q2nLGf+594h0CLBs/Mbg6qOr7GtqDK7C2S41udRnToE= -github.com/neutron-org/admin-module v0.0.0-20230905102321-cc97b555fcb0 h1:wwRgnEuiGBGiSt8+K557QGTNyNBJ58Mx4vcIjN3yeAo= -github.com/neutron-org/admin-module v0.0.0-20230905102321-cc97b555fcb0/go.mod h1:INknneN2W3Fr9Eld7SpfLRdjyHR1muzFbbqXln1ixic= +github.com/neutron-org/admin-module v0.0.0-20230906085030-252c6438f577 h1:gN67L3NpEqqJhYlnSjuQfQ3QzL1BKBbE9UEVf0N7Pfs= +github.com/neutron-org/admin-module v0.0.0-20230906085030-252c6438f577/go.mod h1:INknneN2W3Fr9Eld7SpfLRdjyHR1muzFbbqXln1ixic= github.com/neutron-org/cosmos-sdk v0.47.5-0.20230808152221-a0e301227957 h1:cl6UqD18qV/QXgT6Yjo2TelfbaOqQGuvL1yX0cWguSs= github.com/neutron-org/cosmos-sdk v0.47.5-0.20230808152221-a0e301227957/go.mod h1:4xMyIVekAs2OEUz/yh9JwzhLBMk+olM2sxgKuQdlhLg= github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230808084410-6083b888424e h1:uVJCBWf1vcCYY0pzOA2SCPIZT8WsR8fsOxs57mnJbM4= From c288fa96a94d662a07af7c4f8eae607f15698f06 Mon Sep 17 00:00:00 2001 From: swelf Date: Wed, 6 Sep 2023 16:34:31 +0300 Subject: [PATCH 098/307] review fixes --- app/upgrades/sdk47/upgrades.go | 49 ++++++++++++++++---------- neutronutils/errors/errors.go | 2 +- neutronutils/utils.go | 4 +-- x/interchaintxs/keeper/ibc_handlers.go | 16 ++++----- x/transfer/ibc_handlers.go | 19 ++++------ 5 files changed, 46 insertions(+), 44 deletions(-) diff --git a/app/upgrades/sdk47/upgrades.go b/app/upgrades/sdk47/upgrades.go index 3beeb8e82..f0cfaa7e3 100644 --- a/app/upgrades/sdk47/upgrades.go +++ b/app/upgrades/sdk47/upgrades.go @@ -12,13 +12,16 @@ import ( upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" v6 "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/migrations/v6" "github.com/neutron-org/neutron/app/upgrades" + contractmanagerkeeper "github.com/neutron-org/neutron/x/contractmanager/keeper" contractmanagertypes "github.com/neutron-org/neutron/x/contractmanager/types" crontypes "github.com/neutron-org/neutron/x/cron/types" + feeburnerkeeper "github.com/neutron-org/neutron/x/feeburner/keeper" feeburnertypes "github.com/neutron-org/neutron/x/feeburner/types" feerefundertypes "github.com/neutron-org/neutron/x/feerefunder/types" icqtypes "github.com/neutron-org/neutron/x/interchainqueries/types" interchaintxstypes "github.com/neutron-org/neutron/x/interchaintxs/types" tokenfactorytypes "github.com/neutron-org/neutron/x/tokenfactory/types" + builderkeeper "github.com/skip-mev/pob/x/builder/keeper" buildertypes "github.com/skip-mev/pob/x/builder/types" ) @@ -73,30 +76,13 @@ func CreateUpgradeHandler( } ctx.Logger().Info("Setting pob params...") - treasury := keepers.FeeBurnerKeeper.GetParams(ctx).TreasuryAddress - _, data, err := bech32.DecodeAndConvert(treasury) - if err != nil { - return nil, err - } - - builderParams := buildertypes.Params{ - MaxBundleSize: 2, - EscrowAccountAddress: data, - ReserveFee: sdk.Coin{Denom: "untrn", Amount: sdk.NewInt(1_000_000)}, - MinBidIncrement: sdk.Coin{Denom: "untrn", Amount: sdk.NewInt(1_000_000)}, - FrontRunningProtection: true, - ProposerFee: math.LegacyNewDecWithPrec(25, 2), - } - err = keepers.BuilderKeeper.SetParams(ctx, builderParams) + err = setPobParams(ctx, keepers.FeeBurnerKeeper, keepers.BuilderKeeper) if err != nil { return nil, err } ctx.Logger().Info("Setting sudo callback limit...") - cmParams := contractmanagertypes.Params{ - SudoCallGasLimit: 1_000_000, - } - err = keepers.ContractManager.SetParams(ctx, cmParams) + err = setContractManagerParams(ctx, keepers.ContractManager) if err != nil { return nil, err } @@ -106,6 +92,31 @@ func CreateUpgradeHandler( } } +func setPobParams(ctx sdk.Context, feeBurnerKeeper *feeburnerkeeper.Keeper, builderKeeper builderkeeper.Keeper) error { + treasury := feeBurnerKeeper.GetParams(ctx).TreasuryAddress + _, data, err := bech32.DecodeAndConvert(treasury) + if err != nil { + return err + } + + builderParams := buildertypes.Params{ + MaxBundleSize: 2, + EscrowAccountAddress: data, + ReserveFee: sdk.Coin{Denom: "untrn", Amount: sdk.NewInt(1_000_000)}, + MinBidIncrement: sdk.Coin{Denom: "untrn", Amount: sdk.NewInt(1_000_000)}, + FrontRunningProtection: true, + ProposerFee: math.LegacyNewDecWithPrec(25, 2), + } + return builderKeeper.SetParams(ctx, builderParams) +} + +func setContractManagerParams(ctx sdk.Context, keeper contractmanagerkeeper.Keeper) error { + cmParams := contractmanagertypes.Params{ + SudoCallGasLimit: contractmanagertypes.DefaultSudoCallGasLimit, + } + return keeper.SetParams(ctx, cmParams) +} + func migrateCronParams(ctx sdk.Context, paramsKeepers paramskeeper.Keeper, storeKey storetypes.StoreKey, codec codec.Codec) error { store := ctx.KVStore(storeKey) var currParams crontypes.Params diff --git a/neutronutils/errors/errors.go b/neutronutils/errors/errors.go index 7aecf5e13..9dd7574d9 100644 --- a/neutronutils/errors/errors.go +++ b/neutronutils/errors/errors.go @@ -6,7 +6,7 @@ import ( ) // OutOfGasRecovery converts `out of gas` panic into an error -// leave unprocessed any other kinds of panics +// leaving unprocessed any other kinds of panics func OutOfGasRecovery( gasMeter sdk.GasMeter, err *error, diff --git a/neutronutils/utils.go b/neutronutils/utils.go index fb621d701..2308c2a0f 100644 --- a/neutronutils/utils.go +++ b/neutronutils/utils.go @@ -3,9 +3,9 @@ package neutronutils import sdk "github.com/cosmos/cosmos-sdk/types" // CreateCachedContext creates a cached context with a limited gas meter. -func CreateCachedContext(ctx sdk.Context, gasLimit uint64) (sdk.Context, func(), sdk.GasMeter) { +func CreateCachedContext(ctx sdk.Context, gasLimit uint64) (sdk.Context, func()) { cacheCtx, writeFn := ctx.CacheContext() gasMeter := sdk.NewGasMeter(gasLimit) cacheCtx = cacheCtx.WithGasMeter(gasMeter) - return cacheCtx, writeFn, gasMeter + return cacheCtx, writeFn } diff --git a/x/interchaintxs/keeper/ibc_handlers.go b/x/interchaintxs/keeper/ibc_handlers.go index 688150859..d1deab8fa 100644 --- a/x/interchaintxs/keeper/ibc_handlers.go +++ b/x/interchaintxs/keeper/ibc_handlers.go @@ -34,12 +34,11 @@ func (k *Keeper) HandleAcknowledgement(ctx sdk.Context, packet channeltypes.Pack return errors.Wrapf(sdkerrors.ErrUnknownRequest, "cannot unmarshal ICS-27 packet acknowledgement: %v", err) } - cacheCtx, writeFn, newGasMeter := neutronutils.CreateCachedContext(ctx, k.contractManagerKeeper.GetParams(ctx).SudoCallGasLimit) - k.feeKeeper.DistributeAcknowledgementFee(ctx, relayer, feetypes.NewPacketID(packet.SourcePort, packet.SourceChannel, packet.Sequence)) + cacheCtx, writeFn := neutronutils.CreateCachedContext(ctx, k.contractManagerKeeper.GetParams(ctx).SudoCallGasLimit) func() { - defer neutronerrors.OutOfGasRecovery(newGasMeter, &err) + defer neutronerrors.OutOfGasRecovery(cacheCtx.GasMeter(), &err) // Actually we have only one kind of error returned from acknowledgement // maybe later we'll retrieve actual errors from events if ack.GetError() != "" { @@ -49,7 +48,6 @@ func (k *Keeper) HandleAcknowledgement(ctx sdk.Context, packet channeltypes.Pack _, err = k.contractManagerKeeper.SudoResponse(cacheCtx, icaOwner.GetContract(), packet, ack.GetResult()) } }() - if err != nil { // the contract either returned an error or panicked with `out of gas` k.contractManagerKeeper.AddContractFailure(ctx, &packet, icaOwner.GetContract().String(), contractmanagertypes.Ack, &ack) @@ -58,7 +56,7 @@ func (k *Keeper) HandleAcknowledgement(ctx sdk.Context, packet channeltypes.Pack writeFn() } - ctx.GasMeter().ConsumeGas(newGasMeter.GasConsumedToLimit(), "consume gas from cached context") + ctx.GasMeter().ConsumeGas(cacheCtx.GasMeter().GasConsumedToLimit(), "consume gas from cached context") return nil } @@ -75,15 +73,13 @@ func (k *Keeper) HandleTimeout(ctx sdk.Context, packet channeltypes.Packet, rela return errors.Wrap(err, "failed to get ica owner from port") } - cacheCtx, writeFn, newGasMeter := neutronutils.CreateCachedContext(ctx, k.contractManagerKeeper.GetParams(ctx).SudoCallGasLimit) - k.feeKeeper.DistributeTimeoutFee(ctx, relayer, feetypes.NewPacketID(packet.SourcePort, packet.SourceChannel, packet.Sequence)) + cacheCtx, writeFn := neutronutils.CreateCachedContext(ctx, k.contractManagerKeeper.GetParams(ctx).SudoCallGasLimit) func() { - defer neutronerrors.OutOfGasRecovery(newGasMeter, &err) + defer neutronerrors.OutOfGasRecovery(cacheCtx.GasMeter(), &err) _, err = k.contractManagerKeeper.SudoTimeout(cacheCtx, icaOwner.GetContract(), packet) }() - if err != nil { // the contract either returned an error or panicked with `out of gas` k.contractManagerKeeper.AddContractFailure(ctx, &packet, icaOwner.GetContract().String(), contractmanagertypes.Timeout, nil) @@ -92,7 +88,7 @@ func (k *Keeper) HandleTimeout(ctx sdk.Context, packet channeltypes.Packet, rela writeFn() } - ctx.GasMeter().ConsumeGas(newGasMeter.GasConsumedToLimit(), "consume gas from cached context") + ctx.GasMeter().ConsumeGas(cacheCtx.GasMeter().GasConsumedToLimit(), "consume gas from cached context") return nil } diff --git a/x/transfer/ibc_handlers.go b/x/transfer/ibc_handlers.go index 550c7bb37..a3a7b72ed 100644 --- a/x/transfer/ibc_handlers.go +++ b/x/transfer/ibc_handlers.go @@ -34,13 +34,11 @@ func (im IBCModule) HandleAcknowledgement(ctx sdk.Context, packet channeltypes.P return nil } - cacheCtx, writeFn, newGasMeter := neutronutils.CreateCachedContext(ctx, im.ContractManagerKeeper.GetParams(ctx).SudoCallGasLimit) - - // distribute fee im.wrappedKeeper.FeeKeeper.DistributeAcknowledgementFee(ctx, relayer, feetypes.NewPacketID(packet.SourcePort, packet.SourceChannel, packet.Sequence)) + cacheCtx, writeFn := neutronutils.CreateCachedContext(ctx, im.ContractManagerKeeper.GetParams(ctx).SudoCallGasLimit) func() { - defer neutronerrors.OutOfGasRecovery(newGasMeter, &err) + defer neutronerrors.OutOfGasRecovery(cacheCtx.GasMeter(), &err) if ack.Success() { _, err = im.ContractManagerKeeper.SudoResponse(cacheCtx, senderAddress, packet, ack.GetResult()) } else { @@ -50,7 +48,6 @@ func (im IBCModule) HandleAcknowledgement(ctx sdk.Context, packet channeltypes.P _, err = im.ContractManagerKeeper.SudoError(cacheCtx, senderAddress, packet, ack.GetError()) } }() - if err != nil { // the contract either returned an error or panicked with `out of gas` im.ContractManagerKeeper.AddContractFailure(ctx, &packet, senderAddress.String(), contractmanagertypes.Ack, &ack) @@ -59,7 +56,7 @@ func (im IBCModule) HandleAcknowledgement(ctx sdk.Context, packet channeltypes.P writeFn() } - ctx.GasMeter().ConsumeGas(newGasMeter.GasConsumedToLimit(), "consume gas from cached context") + ctx.GasMeter().ConsumeGas(cacheCtx.GasMeter().GasConsumedToLimit(), "consume gas from cached context") im.keeper.Logger(ctx).Debug("acknowledgement received", "Packet data", data, "CheckTx", ctx.IsCheckTx()) @@ -81,15 +78,13 @@ func (im IBCModule) HandleTimeout(ctx sdk.Context, packet channeltypes.Packet, r return nil } - cacheCtx, writeFn, newGasMeter := neutronutils.CreateCachedContext(ctx, im.ContractManagerKeeper.GetParams(ctx).SudoCallGasLimit) - - // distribute fee im.wrappedKeeper.FeeKeeper.DistributeTimeoutFee(ctx, relayer, feetypes.NewPacketID(packet.SourcePort, packet.SourceChannel, packet.Sequence)) + + cacheCtx, writeFn := neutronutils.CreateCachedContext(ctx, im.ContractManagerKeeper.GetParams(ctx).SudoCallGasLimit) func() { - defer neutronerrors.OutOfGasRecovery(newGasMeter, &err) + defer neutronerrors.OutOfGasRecovery(cacheCtx.GasMeter(), &err) _, err = im.ContractManagerKeeper.SudoTimeout(cacheCtx, senderAddress, packet) }() - if err != nil { // the contract either returned an error or panicked with `out of gas` im.ContractManagerKeeper.AddContractFailure(ctx, &packet, senderAddress.String(), contractmanagertypes.Timeout, nil) @@ -98,7 +93,7 @@ func (im IBCModule) HandleTimeout(ctx sdk.Context, packet channeltypes.Packet, r writeFn() } - ctx.GasMeter().ConsumeGas(newGasMeter.GasConsumedToLimit(), "consume gas from cached context") + ctx.GasMeter().ConsumeGas(cacheCtx.GasMeter().GasConsumedToLimit(), "consume gas from cached context") return nil } From 8ad6829667d29c28488b036789eabcb4f2756068 Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Wed, 6 Sep 2023 19:08:39 +0400 Subject: [PATCH 099/307] upd module --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index ffb4b04e4..9f50b18ac 100644 --- a/go.mod +++ b/go.mod @@ -190,7 +190,7 @@ replace ( github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0 github.com/ChainSafe/go-schnorrkel => github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d github.com/CosmWasm/wasmd => github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230808084410-6083b888424e - github.com/cosmos/admin-module => github.com/neutron-org/admin-module v0.0.0-20230906085030-252c6438f577 + github.com/cosmos/admin-module => github.com/neutron-org/admin-module v0.0.0-20230906150724-9ccb75c61fc5 github.com/cosmos/cosmos-sdk => github.com/neutron-org/cosmos-sdk v0.47.5-0.20230808152221-a0e301227957 github.com/cosmos/gaia/v11 => github.com/cosmos/gaia/v11 v11.0.0-20230724152830-861ba391c3b4 github.com/cosmos/ledger-cosmos-go => github.com/cosmos/ledger-cosmos-go v0.12.1 diff --git a/go.sum b/go.sum index 9895e641a..b81ab2072 100644 --- a/go.sum +++ b/go.sum @@ -938,8 +938,8 @@ github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxzi github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/neilotoole/errgroup v0.1.6/go.mod h1:Q2nLGf+594h0CLBs/Mbg6qOr7GtqDK7C2S41udRnToE= -github.com/neutron-org/admin-module v0.0.0-20230906085030-252c6438f577 h1:gN67L3NpEqqJhYlnSjuQfQ3QzL1BKBbE9UEVf0N7Pfs= -github.com/neutron-org/admin-module v0.0.0-20230906085030-252c6438f577/go.mod h1:INknneN2W3Fr9Eld7SpfLRdjyHR1muzFbbqXln1ixic= +github.com/neutron-org/admin-module v0.0.0-20230906150724-9ccb75c61fc5 h1:96ZjLWoN4nCIcFdxrz51Xu2Y8aqpcScy3eva3S5hM60= +github.com/neutron-org/admin-module v0.0.0-20230906150724-9ccb75c61fc5/go.mod h1:INknneN2W3Fr9Eld7SpfLRdjyHR1muzFbbqXln1ixic= github.com/neutron-org/cosmos-sdk v0.47.5-0.20230808152221-a0e301227957 h1:cl6UqD18qV/QXgT6Yjo2TelfbaOqQGuvL1yX0cWguSs= github.com/neutron-org/cosmos-sdk v0.47.5-0.20230808152221-a0e301227957/go.mod h1:4xMyIVekAs2OEUz/yh9JwzhLBMk+olM2sxgKuQdlhLg= github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230808084410-6083b888424e h1:uVJCBWf1vcCYY0pzOA2SCPIZT8WsR8fsOxs57mnJbM4= From f549fc15a1e595aa12050aad29b7af28fef1cf01 Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Thu, 7 Sep 2023 11:21:59 +0400 Subject: [PATCH 100/307] rm getenabledproposals from tests --- testutil/contractmanager/network/network.go | 1 - testutil/cron/network/network.go | 1 - testutil/interchainqueries/network/network.go | 1 - testutil/interchaintxs/network/network.go | 3 +-- testutil/test_helpers.go | 1 - 5 files changed, 1 insertion(+), 6 deletions(-) diff --git a/testutil/contractmanager/network/network.go b/testutil/contractmanager/network/network.go index 10ee719d7..20e2b8d73 100644 --- a/testutil/contractmanager/network/network.go +++ b/testutil/contractmanager/network/network.go @@ -75,7 +75,6 @@ func DefaultConfig() network.Config { return app.New( val.GetCtx().Logger, chainID, tmdb.NewMemDB(), nil, true, map[int64]bool{}, val.GetCtx().Config.RootDir, 0, encoding, - app.GetEnabledProposals(), sims.EmptyAppOptions{}, nil, baseapp.SetPruning(pruningtypes.NewPruningOptionsFromString(val.GetAppConfig().Pruning)), diff --git a/testutil/cron/network/network.go b/testutil/cron/network/network.go index c7c49cb54..b31c16d1b 100644 --- a/testutil/cron/network/network.go +++ b/testutil/cron/network/network.go @@ -77,7 +77,6 @@ func DefaultConfig() network.Config { return app.New( val.GetCtx().Logger, chainID, tmdb.NewMemDB(), nil, true, map[int64]bool{}, val.GetCtx().Config.RootDir, 0, encoding, - app.GetEnabledProposals(), sims.EmptyAppOptions{}, nil, baseapp.SetPruning(pruningtypes.NewPruningOptionsFromString(val.GetAppConfig().Pruning)), diff --git a/testutil/interchainqueries/network/network.go b/testutil/interchainqueries/network/network.go index fa00f6254..d7fa4006d 100644 --- a/testutil/interchainqueries/network/network.go +++ b/testutil/interchainqueries/network/network.go @@ -75,7 +75,6 @@ func DefaultConfig() network.Config { return app.New( val.GetCtx().Logger, chainID, tmdb.NewMemDB(), nil, true, map[int64]bool{}, val.GetCtx().Config.RootDir, 0, encoding, - app.GetEnabledProposals(), sims.EmptyAppOptions{}, nil, baseapp.SetPruning(pruningtypes.NewPruningOptionsFromString(val.GetAppConfig().Pruning)), diff --git a/testutil/interchaintxs/network/network.go b/testutil/interchaintxs/network/network.go index 75e49dd3f..46476e5b2 100644 --- a/testutil/interchaintxs/network/network.go +++ b/testutil/interchaintxs/network/network.go @@ -75,8 +75,7 @@ func DefaultConfig() network.Config { return app.New( val.GetCtx().Logger, chainID, tmdb.NewMemDB(), nil, true, map[int64]bool{}, val.GetCtx().Config.RootDir, 0, - encoding, - app.GetEnabledProposals(), + encoding,, sims.EmptyAppOptions{}, nil, baseapp.SetPruning(pruningtypes.NewPruningOptionsFromString(val.GetAppConfig().Pruning)), diff --git a/testutil/test_helpers.go b/testutil/test_helpers.go index dd5ea39b5..edab3f004 100644 --- a/testutil/test_helpers.go +++ b/testutil/test_helpers.go @@ -387,7 +387,6 @@ func SetupTestingApp(chainID string) func() (ibctesting.TestingApp, map[string]j app.DefaultNodeHome, 0, encoding, - app.GetEnabledProposals(), sims.EmptyAppOptions{}, nil, ) From dda51cd23b358292313d53f31a0bf35a4bd3952e Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Thu, 7 Sep 2023 11:26:18 +0400 Subject: [PATCH 101/307] rm comma --- app/proposals_allowlisting_test.go | 1 - testutil/interchaintxs/network/network.go | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/proposals_allowlisting_test.go b/app/proposals_allowlisting_test.go index 0f87fcc36..a8368f60b 100644 --- a/app/proposals_allowlisting_test.go +++ b/app/proposals_allowlisting_test.go @@ -38,7 +38,6 @@ func SetupTestingAppConsumer() (ibctesting.TestingApp, map[string]json.RawMessag app.DefaultNodeHome, 0, encoding, - app.GetEnabledProposals(), sims.EmptyAppOptions{}, nil, ) diff --git a/testutil/interchaintxs/network/network.go b/testutil/interchaintxs/network/network.go index 46476e5b2..945ee62b3 100644 --- a/testutil/interchaintxs/network/network.go +++ b/testutil/interchaintxs/network/network.go @@ -75,7 +75,7 @@ func DefaultConfig() network.Config { return app.New( val.GetCtx().Logger, chainID, tmdb.NewMemDB(), nil, true, map[int64]bool{}, val.GetCtx().Config.RootDir, 0, - encoding,, + encoding, sims.EmptyAppOptions{}, nil, baseapp.SetPruning(pruningtypes.NewPruningOptionsFromString(val.GetAppConfig().Pruning)), From f881f6d21dfe37c7d0eba2fab9306468cabb3ed0 Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Thu, 7 Sep 2023 11:32:46 +0400 Subject: [PATCH 102/307] wip --- app/app.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/app.go b/app/app.go index afcca9fb5..70bdf1b45 100644 --- a/app/app.go +++ b/app/app.go @@ -490,7 +490,7 @@ func New( keys[contractmanagermoduletypes.StoreKey], keys[contractmanagermoduletypes.MemStoreKey], &app.WasmKeeper, - authtypes.NewModuleAddress(adminmodulemoduletypes.ModuleName).String(), + authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String(), ) app.FeeKeeper = feekeeper.NewKeeper(appCodec, keys[feetypes.StoreKey], memKeys[feetypes.MemStoreKey], app.IBCKeeper.ChannelKeeper, app.BankKeeper, authtypes.NewModuleAddress(adminmodulemoduletypes.ModuleName).String()) @@ -502,7 +502,7 @@ func New( keys[feeburnertypes.MemStoreKey], app.AccountKeeper, app.BankKeeper, - authtypes.NewModuleAddress(adminmodulemoduletypes.ModuleName).String(), + authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String(), ) feeBurnerModule := feeburner.NewAppModule(appCodec, *app.FeeBurnerKeeper) From 01616e603804dc494951110244cc6fcdaecd63e0 Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Thu, 7 Sep 2023 14:17:23 +0400 Subject: [PATCH 103/307] wip --- app/app.go | 6 +++--- x/tokenfactory/types/params.go | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/app.go b/app/app.go index 70bdf1b45..12b69aea4 100644 --- a/app/app.go +++ b/app/app.go @@ -493,7 +493,7 @@ func New( authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String(), ) - app.FeeKeeper = feekeeper.NewKeeper(appCodec, keys[feetypes.StoreKey], memKeys[feetypes.MemStoreKey], app.IBCKeeper.ChannelKeeper, app.BankKeeper, authtypes.NewModuleAddress(adminmodulemoduletypes.ModuleName).String()) + app.FeeKeeper = feekeeper.NewKeeper(appCodec, keys[feetypes.StoreKey], memKeys[feetypes.MemStoreKey], app.IBCKeeper.ChannelKeeper, app.BankKeeper, authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String()) feeModule := feerefunder.NewAppModule(appCodec, *app.FeeKeeper, app.AccountKeeper, app.BankKeeper) app.FeeBurnerKeeper = feeburnerkeeper.NewKeeper( @@ -642,7 +642,7 @@ func New( authtypes.NewModuleAddress(govtypes.ModuleName).String(), ) - app.CronKeeper = *cronkeeper.NewKeeper(appCodec, keys[crontypes.StoreKey], keys[crontypes.MemStoreKey], app.AccountKeeper, authtypes.NewModuleAddress(adminmodulemoduletypes.ModuleName).String()) + app.CronKeeper = *cronkeeper.NewKeeper(appCodec, keys[crontypes.StoreKey], keys[crontypes.MemStoreKey], app.AccountKeeper, authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String()) wasmOpts = append(wasmbinding.RegisterCustomPlugins(&app.InterchainTxsKeeper, &app.InterchainQueriesKeeper, app.TransferKeeper, &app.AdminmoduleKeeper, app.FeeBurnerKeeper, app.FeeKeeper, &app.BankKeeper, app.TokenFactoryKeeper, &app.CronKeeper, &app.ContractManagerKeeper), wasmOpts...) queryPlugins := wasmkeeper.WithQueryPlugins( @@ -1172,7 +1172,7 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino paramsKeeper.Subspace(routertypes.ModuleName).WithKeyTable(routertypes.ParamKeyTable()) paramsKeeper.Subspace(ccvconsumertypes.ModuleName) - paramsKeeper.Subspace(tokenfactorytypes.ModuleName) + //paramsKeeper.Subspace(tokenfactorytypes.ModuleName) paramsKeeper.Subspace(interchainqueriesmoduletypes.ModuleName) paramsKeeper.Subspace(interchaintxstypes.ModuleName) diff --git a/x/tokenfactory/types/params.go b/x/tokenfactory/types/params.go index 09d9cac75..afbae8a49 100644 --- a/x/tokenfactory/types/params.go +++ b/x/tokenfactory/types/params.go @@ -11,9 +11,10 @@ import ( var ( KeyDenomCreationFee = []byte("DenomCreationFee") KeyDenomCreationGasConsume = []byte("DenomCreationGasConsume") - + DefaultNeutronDenom = "untrn" // chosen as an arbitrary large number, less than the max_gas_wanted_per_tx in config. - DefaultCreationGasFee = 1_000_000 + DefaultCreationGasFee = 1_000 + DefaultFeeAmount int64 = 1_000_000 ) // ParamTable for gamm module. @@ -32,7 +33,7 @@ func NewParams(denomCreationFee sdk.Coins, denomCreationGasConsume uint64) Param func DefaultParams() Params { return Params{ // For choice, see: https://github.com/osmosis-labs/osmosis/pull/4983 - DenomCreationFee: sdk.NewCoins(), // used to be 10 OSMO at launch. + DenomCreationFee: sdk.NewCoins(sdk.NewInt64Coin(DefaultNeutronDenom, DefaultFeeAmount)), DenomCreationGasConsume: uint64(DefaultCreationGasFee), } } From b9b41aeae99eb1601fc2ddee1cc8f5737d76a834 Mon Sep 17 00:00:00 2001 From: swelf Date: Fri, 8 Sep 2023 11:02:32 +0300 Subject: [PATCH 104/307] extracted "an executing sudo in cached limited context" into middleware --- app/app.go | 4 +- .../contractmanager/types/expected_keepers.go | 4 +- .../types/expected_keepers.go | 46 ---- .../interchaintxs/types/expected_keepers.go | 16 +- .../mocks/transfer/types/expected_keepers.go | 51 +---- wasmbinding/test/custom_message_test.go | 4 +- x/contractmanager/ibc_middleware.go | 79 +++++++ x/contractmanager/ibc_middleware_test.go | 82 +++++++ x/contractmanager/keeper/failure.go | 4 +- x/contractmanager/keeper/failure_test.go | 12 +- x/contractmanager/keeper/sudo.go | 78 +++---- x/contractmanager/keeper/sudo_test.go | 73 +----- x/contractmanager/types/module.go | 16 ++ x/contractmanager/types/sudo.go | 22 +- x/interchainqueries/types/expected_keepers.go | 4 - x/interchaintxs/keeper/ibc_handlers.go | 72 +++--- x/interchaintxs/keeper/ibc_handlers_test.go | 209 ++++++++---------- x/interchaintxs/types/expected_keepers.go | 6 +- x/transfer/ibc_handlers.go | 53 +---- x/transfer/ibc_handlers_test.go | 188 ++-------------- x/transfer/types/expected_keepers.go | 8 +- 21 files changed, 413 insertions(+), 618 deletions(-) create mode 100644 x/contractmanager/ibc_middleware.go create mode 100644 x/contractmanager/ibc_middleware_test.go create mode 100644 x/contractmanager/types/module.go diff --git a/app/app.go b/app/app.go index aaebe1645..c6dd3a84e 100644 --- a/app/app.go +++ b/app/app.go @@ -563,7 +563,7 @@ func New( app.BankKeeper, scopedTransferKeeper, app.FeeKeeper, - app.ContractManagerKeeper, + contractmanager.NewSudoLimitWrapper(app.ContractManagerKeeper), ) app.RouterKeeper.SetTransferKeeper(app.TransferKeeper.Keeper) @@ -660,7 +660,7 @@ func New( memKeys[interchaintxstypes.MemStoreKey], app.IBCKeeper.ChannelKeeper, app.ICAControllerKeeper, - app.ContractManagerKeeper, + contractmanager.NewSudoLimitWrapper(app.ContractManagerKeeper), app.FeeKeeper, ) diff --git a/testutil/mocks/contractmanager/types/expected_keepers.go b/testutil/mocks/contractmanager/types/expected_keepers.go index 463ef15c4..40b855702 100644 --- a/testutil/mocks/contractmanager/types/expected_keepers.go +++ b/testutil/mocks/contractmanager/types/expected_keepers.go @@ -51,7 +51,7 @@ func (mr *MockWasmKeeperMockRecorder) HasContractInfo(ctx, contractAddress inter // Sudo mocks base method. func (m *MockWasmKeeper) Sudo(ctx types.Context, contractAddress types.AccAddress, msg []byte) ([]byte, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Sudo", ctx, contractAddress, msg) + ret := m.ctrl.Call(m, "sudo", ctx, contractAddress, msg) ret0, _ := ret[0].([]byte) ret1, _ := ret[1].(error) return ret0, ret1 @@ -60,5 +60,5 @@ func (m *MockWasmKeeper) Sudo(ctx types.Context, contractAddress types.AccAddres // Sudo indicates an expected call of Sudo. func (mr *MockWasmKeeperMockRecorder) Sudo(ctx, contractAddress, msg interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Sudo", reflect.TypeOf((*MockWasmKeeper)(nil).Sudo), ctx, contractAddress, msg) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "sudo", reflect.TypeOf((*MockWasmKeeper)(nil).Sudo), ctx, contractAddress, msg) } diff --git a/testutil/mocks/interchainqueries/types/expected_keepers.go b/testutil/mocks/interchainqueries/types/expected_keepers.go index 435a54b05..029ca0135 100644 --- a/testutil/mocks/interchainqueries/types/expected_keepers.go +++ b/testutil/mocks/interchainqueries/types/expected_keepers.go @@ -10,7 +10,6 @@ import ( types "github.com/cosmos/cosmos-sdk/types" types0 "github.com/cosmos/cosmos-sdk/x/auth/types" types1 "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" - types2 "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" gomock "github.com/golang/mock/gomock" ) @@ -153,21 +152,6 @@ func (mr *MockContractManagerKeeperMockRecorder) HasContractInfo(ctx, contractAd return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HasContractInfo", reflect.TypeOf((*MockContractManagerKeeper)(nil).HasContractInfo), ctx, contractAddress) } -// SudoError mocks base method. -func (m *MockContractManagerKeeper) SudoError(ctx types.Context, senderAddress types.AccAddress, request types2.Packet, details string) ([]byte, error) { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "SudoError", ctx, senderAddress, request, details) - ret0, _ := ret[0].([]byte) - ret1, _ := ret[1].(error) - return ret0, ret1 -} - -// SudoError indicates an expected call of SudoError. -func (mr *MockContractManagerKeeperMockRecorder) SudoError(ctx, senderAddress, request, details interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SudoError", reflect.TypeOf((*MockContractManagerKeeper)(nil).SudoError), ctx, senderAddress, request, details) -} - // SudoKVQueryResult mocks base method. func (m *MockContractManagerKeeper) SudoKVQueryResult(ctx types.Context, contractAddress types.AccAddress, queryID uint64) ([]byte, error) { m.ctrl.T.Helper() @@ -183,36 +167,6 @@ func (mr *MockContractManagerKeeperMockRecorder) SudoKVQueryResult(ctx, contract return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SudoKVQueryResult", reflect.TypeOf((*MockContractManagerKeeper)(nil).SudoKVQueryResult), ctx, contractAddress, queryID) } -// SudoResponse mocks base method. -func (m *MockContractManagerKeeper) SudoResponse(ctx types.Context, senderAddress types.AccAddress, request types2.Packet, msg []byte) ([]byte, error) { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "SudoResponse", ctx, senderAddress, request, msg) - ret0, _ := ret[0].([]byte) - ret1, _ := ret[1].(error) - return ret0, ret1 -} - -// SudoResponse indicates an expected call of SudoResponse. -func (mr *MockContractManagerKeeperMockRecorder) SudoResponse(ctx, senderAddress, request, msg interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SudoResponse", reflect.TypeOf((*MockContractManagerKeeper)(nil).SudoResponse), ctx, senderAddress, request, msg) -} - -// SudoTimeout mocks base method. -func (m *MockContractManagerKeeper) SudoTimeout(ctx types.Context, senderAddress types.AccAddress, request types2.Packet) ([]byte, error) { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "SudoTimeout", ctx, senderAddress, request) - ret0, _ := ret[0].([]byte) - ret1, _ := ret[1].(error) - return ret0, ret1 -} - -// SudoTimeout indicates an expected call of SudoTimeout. -func (mr *MockContractManagerKeeperMockRecorder) SudoTimeout(ctx, senderAddress, request interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SudoTimeout", reflect.TypeOf((*MockContractManagerKeeper)(nil).SudoTimeout), ctx, senderAddress, request) -} - // SudoTxQueryResult mocks base method. func (m *MockContractManagerKeeper) SudoTxQueryResult(ctx types.Context, contractAddress types.AccAddress, queryID uint64, height types1.Height, data []byte) ([]byte, error) { m.ctrl.T.Helper() diff --git a/testutil/mocks/interchaintxs/types/expected_keepers.go b/testutil/mocks/interchaintxs/types/expected_keepers.go index e3d9c948a..85fa21af1 100644 --- a/testutil/mocks/interchaintxs/types/expected_keepers.go +++ b/testutil/mocks/interchaintxs/types/expected_keepers.go @@ -156,18 +156,18 @@ func (mr *MockContractManagerKeeperMockRecorder) HasContractInfo(ctx, contractAd } // SudoError mocks base method. -func (m *MockContractManagerKeeper) SudoError(ctx types.Context, senderAddress types.AccAddress, request types3.Packet, details string) ([]byte, error) { +func (m *MockContractManagerKeeper) SudoError(ctx types.Context, senderAddress types.AccAddress, request types3.Packet, ack types3.Acknowledgement) ([]byte, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "SudoError", ctx, senderAddress, request, details) + ret := m.ctrl.Call(m, "SudoError", ctx, senderAddress, request, ack) ret0, _ := ret[0].([]byte) ret1, _ := ret[1].(error) return ret0, ret1 } // SudoError indicates an expected call of SudoError. -func (mr *MockContractManagerKeeperMockRecorder) SudoError(ctx, senderAddress, request, details interface{}) *gomock.Call { +func (mr *MockContractManagerKeeperMockRecorder) SudoError(ctx, senderAddress, request, ack interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SudoError", reflect.TypeOf((*MockContractManagerKeeper)(nil).SudoError), ctx, senderAddress, request, details) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SudoError", reflect.TypeOf((*MockContractManagerKeeper)(nil).SudoError), ctx, senderAddress, request, ack) } // SudoOnChanOpenAck mocks base method. @@ -186,18 +186,18 @@ func (mr *MockContractManagerKeeperMockRecorder) SudoOnChanOpenAck(ctx, contract } // SudoResponse mocks base method. -func (m *MockContractManagerKeeper) SudoResponse(ctx types.Context, senderAddress types.AccAddress, request types3.Packet, msg []byte) ([]byte, error) { +func (m *MockContractManagerKeeper) SudoResponse(ctx types.Context, senderAddress types.AccAddress, request types3.Packet, ack types3.Acknowledgement) ([]byte, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "SudoResponse", ctx, senderAddress, request, msg) + ret := m.ctrl.Call(m, "SudoResponse", ctx, senderAddress, request, ack) ret0, _ := ret[0].([]byte) ret1, _ := ret[1].(error) return ret0, ret1 } // SudoResponse indicates an expected call of SudoResponse. -func (mr *MockContractManagerKeeperMockRecorder) SudoResponse(ctx, senderAddress, request, msg interface{}) *gomock.Call { +func (mr *MockContractManagerKeeperMockRecorder) SudoResponse(ctx, senderAddress, request, ack interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SudoResponse", reflect.TypeOf((*MockContractManagerKeeper)(nil).SudoResponse), ctx, senderAddress, request, msg) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SudoResponse", reflect.TypeOf((*MockContractManagerKeeper)(nil).SudoResponse), ctx, senderAddress, request, ack) } // SudoTimeout mocks base method. diff --git a/testutil/mocks/transfer/types/expected_keepers.go b/testutil/mocks/transfer/types/expected_keepers.go index f5c4d2ab1..122edaeb2 100644 --- a/testutil/mocks/transfer/types/expected_keepers.go +++ b/testutil/mocks/transfer/types/expected_keepers.go @@ -11,8 +11,7 @@ import ( types0 "github.com/cosmos/cosmos-sdk/x/auth/types" types1 "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" gomock "github.com/golang/mock/gomock" - types2 "github.com/neutron-org/neutron/x/contractmanager/types" - types3 "github.com/neutron-org/neutron/x/feerefunder/types" + types2 "github.com/neutron-org/neutron/x/feerefunder/types" ) // MockContractManagerKeeper is a mock of ContractManagerKeeper interface. @@ -38,32 +37,6 @@ func (m *MockContractManagerKeeper) EXPECT() *MockContractManagerKeeperMockRecor return m.recorder } -// AddContractFailure mocks base method. -func (m *MockContractManagerKeeper) AddContractFailure(ctx types.Context, packet *types1.Packet, address, ackType string, ack *types1.Acknowledgement) { - m.ctrl.T.Helper() - m.ctrl.Call(m, "AddContractFailure", ctx, packet, address, ackType, ack) -} - -// AddContractFailure indicates an expected call of AddContractFailure. -func (mr *MockContractManagerKeeperMockRecorder) AddContractFailure(ctx, packet, address, ackType, ack interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddContractFailure", reflect.TypeOf((*MockContractManagerKeeper)(nil).AddContractFailure), ctx, packet, address, ackType, ack) -} - -// GetParams mocks base method. -func (m *MockContractManagerKeeper) GetParams(ctx types.Context) types2.Params { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GetParams", ctx) - ret0, _ := ret[0].(types2.Params) - return ret0 -} - -// GetParams indicates an expected call of GetParams. -func (mr *MockContractManagerKeeperMockRecorder) GetParams(ctx interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetParams", reflect.TypeOf((*MockContractManagerKeeper)(nil).GetParams), ctx) -} - // HasContractInfo mocks base method. func (m *MockContractManagerKeeper) HasContractInfo(ctx types.Context, contractAddress types.AccAddress) bool { m.ctrl.T.Helper() @@ -79,33 +52,33 @@ func (mr *MockContractManagerKeeperMockRecorder) HasContractInfo(ctx, contractAd } // SudoError mocks base method. -func (m *MockContractManagerKeeper) SudoError(ctx types.Context, senderAddress types.AccAddress, request types1.Packet, details string) ([]byte, error) { +func (m *MockContractManagerKeeper) SudoError(ctx types.Context, senderAddress types.AccAddress, request types1.Packet, ack types1.Acknowledgement) ([]byte, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "SudoError", ctx, senderAddress, request, details) + ret := m.ctrl.Call(m, "SudoError", ctx, senderAddress, request, ack) ret0, _ := ret[0].([]byte) ret1, _ := ret[1].(error) return ret0, ret1 } // SudoError indicates an expected call of SudoError. -func (mr *MockContractManagerKeeperMockRecorder) SudoError(ctx, senderAddress, request, details interface{}) *gomock.Call { +func (mr *MockContractManagerKeeperMockRecorder) SudoError(ctx, senderAddress, request, ack interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SudoError", reflect.TypeOf((*MockContractManagerKeeper)(nil).SudoError), ctx, senderAddress, request, details) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SudoError", reflect.TypeOf((*MockContractManagerKeeper)(nil).SudoError), ctx, senderAddress, request, ack) } // SudoResponse mocks base method. -func (m *MockContractManagerKeeper) SudoResponse(ctx types.Context, senderAddress types.AccAddress, request types1.Packet, msg []byte) ([]byte, error) { +func (m *MockContractManagerKeeper) SudoResponse(ctx types.Context, senderAddress types.AccAddress, request types1.Packet, ack types1.Acknowledgement) ([]byte, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "SudoResponse", ctx, senderAddress, request, msg) + ret := m.ctrl.Call(m, "SudoResponse", ctx, senderAddress, request, ack) ret0, _ := ret[0].([]byte) ret1, _ := ret[1].(error) return ret0, ret1 } // SudoResponse indicates an expected call of SudoResponse. -func (mr *MockContractManagerKeeperMockRecorder) SudoResponse(ctx, senderAddress, request, msg interface{}) *gomock.Call { +func (mr *MockContractManagerKeeperMockRecorder) SudoResponse(ctx, senderAddress, request, ack interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SudoResponse", reflect.TypeOf((*MockContractManagerKeeper)(nil).SudoResponse), ctx, senderAddress, request, msg) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SudoResponse", reflect.TypeOf((*MockContractManagerKeeper)(nil).SudoResponse), ctx, senderAddress, request, ack) } // SudoTimeout mocks base method. @@ -147,7 +120,7 @@ func (m *MockFeeRefunderKeeper) EXPECT() *MockFeeRefunderKeeperMockRecorder { } // DistributeAcknowledgementFee mocks base method. -func (m *MockFeeRefunderKeeper) DistributeAcknowledgementFee(ctx types.Context, receiver types.AccAddress, packetID types3.PacketID) { +func (m *MockFeeRefunderKeeper) DistributeAcknowledgementFee(ctx types.Context, receiver types.AccAddress, packetID types2.PacketID) { m.ctrl.T.Helper() m.ctrl.Call(m, "DistributeAcknowledgementFee", ctx, receiver, packetID) } @@ -159,7 +132,7 @@ func (mr *MockFeeRefunderKeeperMockRecorder) DistributeAcknowledgementFee(ctx, r } // DistributeTimeoutFee mocks base method. -func (m *MockFeeRefunderKeeper) DistributeTimeoutFee(ctx types.Context, receiver types.AccAddress, packetID types3.PacketID) { +func (m *MockFeeRefunderKeeper) DistributeTimeoutFee(ctx types.Context, receiver types.AccAddress, packetID types2.PacketID) { m.ctrl.T.Helper() m.ctrl.Call(m, "DistributeTimeoutFee", ctx, receiver, packetID) } @@ -171,7 +144,7 @@ func (mr *MockFeeRefunderKeeperMockRecorder) DistributeTimeoutFee(ctx, receiver, } // LockFees mocks base method. -func (m *MockFeeRefunderKeeper) LockFees(ctx types.Context, payer types.AccAddress, packetID types3.PacketID, fee types3.Fee) error { +func (m *MockFeeRefunderKeeper) LockFees(ctx types.Context, payer types.AccAddress, packetID types2.PacketID, fee types2.Fee) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "LockFees", ctx, payer, packetID, fee) ret0, _ := ret[0].(error) diff --git a/wasmbinding/test/custom_message_test.go b/wasmbinding/test/custom_message_test.go index d802dbe44..384b84cd6 100644 --- a/wasmbinding/test/custom_message_test.go +++ b/wasmbinding/test/custom_message_test.go @@ -640,7 +640,7 @@ func (suite *CustomMessengerTestSuite) TestResubmitFailureTimeout() { // Add failure packet := ibcchanneltypes.Packet{} ack := ibcchanneltypes.Acknowledgement{ - Response: &ibcchanneltypes.Acknowledgement_Error{Error: "Error"}, + Response: &ibcchanneltypes.Acknowledgement_Error{Error: "ErrorSudoPayload"}, } failureID := suite.messenger.ContractmanagerKeeper.GetNextFailureIDKey(suite.ctx, suite.contractAddress.String()) suite.messenger.ContractmanagerKeeper.AddContractFailure(suite.ctx, &packet, suite.contractAddress.String(), "timeout", &ack) @@ -673,7 +673,7 @@ func (suite *CustomMessengerTestSuite) TestResubmitFailureFromDifferentContract( // Add failure packet := ibcchanneltypes.Packet{} ack := ibcchanneltypes.Acknowledgement{ - Response: &ibcchanneltypes.Acknowledgement_Error{Error: "Error"}, + Response: &ibcchanneltypes.Acknowledgement_Error{Error: "ErrorSudoPayload"}, } failureID := suite.messenger.ContractmanagerKeeper.GetNextFailureIDKey(suite.ctx, testutil.TestOwnerAddress) suite.messenger.ContractmanagerKeeper.AddContractFailure(suite.ctx, &packet, testutil.TestOwnerAddress, contractmanagertypes.Ack, &ack) diff --git a/x/contractmanager/ibc_middleware.go b/x/contractmanager/ibc_middleware.go new file mode 100644 index 000000000..237c7f731 --- /dev/null +++ b/x/contractmanager/ibc_middleware.go @@ -0,0 +1,79 @@ +package contractmanager + +import ( + "fmt" + "github.com/cometbft/cometbft/libs/log" + sdk "github.com/cosmos/cosmos-sdk/types" + channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" + "github.com/neutron-org/neutron/neutronutils" + neutronerrors "github.com/neutron-org/neutron/neutronutils/errors" + contractmanagertypes "github.com/neutron-org/neutron/x/contractmanager/types" +) + +type SudoLimitWrapper struct { + contractmanagertypes.ContractManagerWrapper +} + +// NewSudoLimitWrapper suppresses an error from a sudo contract handler and saves it to a store +func NewSudoLimitWrapper(keeper contractmanagertypes.ContractManagerWrapper) contractmanagertypes.ContractManagerWrapper { + return SudoLimitWrapper{ + keeper, + } +} + +func (k SudoLimitWrapper) SudoResponse(ctx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, ack channeltypes.Acknowledgement) ([]byte, error) { + err := k.sudo(ctx, senderAddress, request, &ack) + if err != nil { + k.Logger(ctx).Debug("SudoLimitWrapper: failed to sudo contract", "error", err, "ackType", "Result") + } + return nil, nil +} + +func (k SudoLimitWrapper) SudoError(ctx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, ack channeltypes.Acknowledgement) ([]byte, error) { + err := k.sudo(ctx, senderAddress, request, &ack) + if err != nil { + k.Logger(ctx).Debug("SudoLimitWrapper: failed to sudo contract", "error", err, "ackType", "ErrorSudoPayload") + } + return nil, nil +} + +func (k SudoLimitWrapper) SudoTimeout(ctx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet) ([]byte, error) { + err := k.sudo(ctx, senderAddress, request, nil) + if err != nil { + k.Logger(ctx).Debug("SudoLimitWrapper: failed to sudo contract", "error", err, "ackType", "Timeout") + } + return nil, nil +} + +// sudo calls underlying sudo handlers with a limited amount of gas +// in case of `out of gas` panic it converts the panic into an error and stops `out of gas` panic propagation +func (k SudoLimitWrapper) sudo(ctx sdk.Context, sender sdk.AccAddress, packet channeltypes.Packet, ack *channeltypes.Acknowledgement) (err error) { + ackType := contractmanagertypes.Ack + cacheCtx, writeFn := neutronutils.CreateCachedContext(ctx, k.ContractManagerWrapper.GetParams(ctx).SudoCallGasLimit) + func() { + defer neutronerrors.OutOfGasRecovery(cacheCtx.GasMeter(), &err) + // Actually we have only one kind of error returned from acknowledgement + // maybe later we'll retrieve actual errors from events + if ack == nil { + ackType = contractmanagertypes.Timeout + _, err = k.ContractManagerWrapper.SudoTimeout(cacheCtx, sender, packet) + } else if ack.GetError() != "" { + _, err = k.ContractManagerWrapper.SudoError(cacheCtx, sender, packet, *ack) + } else { + _, err = k.ContractManagerWrapper.SudoResponse(cacheCtx, sender, packet, *ack) + } + }() + if err != nil { + // the contract either returned an error or panicked with `out of gas` + k.ContractManagerWrapper.AddContractFailure(ctx, &packet, sender.String(), ackType, ack) + } else { + writeFn() + } + + ctx.GasMeter().ConsumeGas(cacheCtx.GasMeter().GasConsumedToLimit(), "consume gas from cached context") + return +} + +func (k SudoLimitWrapper) Logger(ctx sdk.Context) log.Logger { + return ctx.Logger().With("module", fmt.Sprintf("x/%s", contractmanagertypes.ModuleName)) +} diff --git a/x/contractmanager/ibc_middleware_test.go b/x/contractmanager/ibc_middleware_test.go new file mode 100644 index 000000000..57012be71 --- /dev/null +++ b/x/contractmanager/ibc_middleware_test.go @@ -0,0 +1,82 @@ +package contractmanager + +import ( + tmdb "github.com/cometbft/cometbft-db" + "github.com/cometbft/cometbft/libs/log" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + "github.com/cosmos/cosmos-sdk/store" + storetypes "github.com/cosmos/cosmos-sdk/store/types" + sdk "github.com/cosmos/cosmos-sdk/types" + icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" + channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" + "github.com/golang/mock/gomock" + mock_types "github.com/neutron-org/neutron/testutil/mocks/interchaintxs/types" + "github.com/neutron-org/neutron/x/contractmanager/types" + "github.com/stretchr/testify/require" + "testing" +) + +var ( + ShouldNotBeWrittenKey = []byte("shouldnotkey") + ShouldNotBeWritten = []byte("should not be written") + ShouldBeWritten = []byte("should be written") + TestOwnerAddress = "neutron17dtl0mjt3t77kpuhg2edqzjpszulwhgzcdvagh" +) + +func ShouldBeWrittenKey(suffix string) []byte { + return append([]byte("shouldkey"), []byte(suffix)...) +} + +func NewSudoLimitMiddleware(t testing.TB, cm types.ContractManagerWrapper) (SudoLimitWrapper, sdk.Context, *storetypes.KVStoreKey) { + storeKey := sdk.NewKVStoreKey(types.StoreKey) + + db := tmdb.NewMemDB() + stateStore := store.NewCommitMultiStore(db) + stateStore.MountStoreWithDB(storeKey, storetypes.StoreTypeIAVL, db) + require.NoError(t, stateStore.LoadLatestVersion()) + + k := SudoLimitWrapper{ContractManagerWrapper: cm} + + ctx := sdk.NewContext(stateStore, tmproto.Header{}, false, log.NewNopLogger()) + + return k, ctx, storeKey +} + +func TestSudo(t *testing.T) { + ctrl := gomock.NewController(t) + defer ctrl.Finish() + cmKeeper := mock_types.NewMockContractManagerKeeper(ctrl) + middleware, infCtx, storeKey := NewSudoLimitMiddleware(t, cmKeeper) + st := infCtx.KVStore(storeKey) + + p := channeltypes.Packet{ + Sequence: 100, + SourcePort: icatypes.ControllerPortPrefix + TestOwnerAddress + ".ica0", + SourceChannel: "channel-0", + } + contractAddress := sdk.AccAddress{} + errACK := channeltypes.Acknowledgement{ + Response: &channeltypes.Acknowledgement_Error{ + Error: "error", + }, + } + //errAckData, err := channeltypes.SubModuleCdc.MarshalJSON(&errACK) + //require.NoError(t, err) + //resACK := channeltypes.Acknowledgement{ + // Response: &channeltypes.Acknowledgement_Result{Result: []byte("Result")}, + //} + //resAckData, err := channeltypes.SubModuleCdc.MarshalJSON(&resACK) + //require.NoError(t, err) + + // success during SudoError + ctx := infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) + cmKeeper.EXPECT().SudoError(gomock.AssignableToTypeOf(ctx), contractAddress, p, errACK).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, errAck channeltypes.Acknowledgement) { + st := cachedCtx.KVStore(storeKey) + st.Set(ShouldBeWrittenKey("sudoerror"), ShouldBeWritten) + }).Return(nil, nil) + cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 6000}) + err := middleware.sudo(ctx, contractAddress, p, &errACK) + require.NoError(t, err) + require.Equal(t, ShouldBeWritten, st.Get(ShouldBeWrittenKey("sudoerror"))) + require.Equal(t, uint64(3050), ctx.GasMeter().GasConsumed()) +} diff --git a/x/contractmanager/keeper/failure.go b/x/contractmanager/keeper/failure.go index 308decb34..581b4f19c 100644 --- a/x/contractmanager/keeper/failure.go +++ b/x/contractmanager/keeper/failure.go @@ -81,11 +81,11 @@ func (k Keeper) ResubmitFailure(ctx sdk.Context, contractAddr sdk.AccAddress, fa return errors.Wrapf(types.IncorrectFailureToResubmit, "cannot resubmit failure without acknowledgement; failureId = %d", failure.Id) } if failure.GetAck().GetError() == "" { - if _, err := k.SudoResponse(ctx, contractAddr, *failure.Packet, failure.Ack.GetResult()); err != nil { + if _, err := k.SudoResponse(ctx, contractAddr, *failure.Packet, *failure.Ack); err != nil { return errors.Wrapf(types.FailedToResubmitFailure, "cannot resubmit failure ack response; failureId = %d; err = %s", failure.Id, err) } } else { - if _, err := k.SudoError(ctx, contractAddr, *failure.Packet, failure.Ack.GetError()); err != nil { + if _, err := k.SudoError(ctx, contractAddr, *failure.Packet, *failure.Ack); err != nil { return errors.Wrapf(types.FailedToResubmitFailure, "cannot resubmit failure ack error; failureId = %d; err = %s", failure.Id, err) } } diff --git a/x/contractmanager/keeper/failure_test.go b/x/contractmanager/keeper/failure_test.go index 606db61c9..aa00b4c91 100644 --- a/x/contractmanager/keeper/failure_test.go +++ b/x/contractmanager/keeper/failure_test.go @@ -138,7 +138,6 @@ func TestResubmitFailure(t *testing.T) { require.NoError(t, err) // case: successful resubmit with ack and ack = response - wk.EXPECT().HasContractInfo(gomock.AssignableToTypeOf(ctx), contractAddr).Return(true) wk.EXPECT().Sudo(gomock.AssignableToTypeOf(ctx), contractAddr, msgSuc).Return([]byte{}, nil) failure, err := k.GetFailure(ctx, contractAddr, failureID) @@ -153,8 +152,7 @@ func TestResubmitFailure(t *testing.T) { failureID2 := k.GetNextFailureIDKey(ctx, contractAddr.String()) k.AddContractFailure(ctx, &packet, contractAddr.String(), types.Ack, &ack) - wk.EXPECT().HasContractInfo(gomock.AssignableToTypeOf(ctx), contractAddr).Return(true) - wk.EXPECT().Sudo(gomock.AssignableToTypeOf(ctx), contractAddr, msgSuc).Return(nil, fmt.Errorf("failed to Sudo")) + wk.EXPECT().Sudo(gomock.AssignableToTypeOf(ctx), contractAddr, msgSuc).Return(nil, fmt.Errorf("failed to sudo")) failure2, err := k.GetFailure(ctx, contractAddr, failureID2) require.NoError(t, err) @@ -170,7 +168,6 @@ func TestResubmitFailure(t *testing.T) { failureID3 := k.GetNextFailureIDKey(ctx, contractAddr.String()) k.AddContractFailure(ctx, &packet, contractAddr.String(), types.Ack, &ackError) - wk.EXPECT().HasContractInfo(gomock.AssignableToTypeOf(ctx), contractAddr).Return(true) wk.EXPECT().Sudo(gomock.AssignableToTypeOf(ctx), contractAddr, msgErr).Return([]byte{}, nil) failure3, err := k.GetFailure(ctx, contractAddr, failureID3) @@ -185,8 +182,7 @@ func TestResubmitFailure(t *testing.T) { failureID4 := k.GetNextFailureIDKey(ctx, contractAddr.String()) k.AddContractFailure(ctx, &packet, contractAddr.String(), types.Ack, &ackError) - wk.EXPECT().HasContractInfo(gomock.AssignableToTypeOf(ctx), contractAddr).Return(true) - wk.EXPECT().Sudo(gomock.AssignableToTypeOf(ctx), contractAddr, msgErr).Return(nil, fmt.Errorf("failed to Sudo")) + wk.EXPECT().Sudo(gomock.AssignableToTypeOf(ctx), contractAddr, msgErr).Return(nil, fmt.Errorf("failed to sudo")) failure4, err := k.GetFailure(ctx, contractAddr, failureID4) require.NoError(t, err) @@ -202,7 +198,6 @@ func TestResubmitFailure(t *testing.T) { failureID5 := k.GetNextFailureIDKey(ctx, contractAddr.String()) k.AddContractFailure(ctx, &packet, contractAddr.String(), "timeout", nil) - wk.EXPECT().HasContractInfo(gomock.AssignableToTypeOf(ctx), contractAddr).Return(true) wk.EXPECT().Sudo(gomock.AssignableToTypeOf(ctx), contractAddr, msgTimeout).Return([]byte{}, nil) failure5, err := k.GetFailure(ctx, contractAddr, failureID5) @@ -217,8 +212,7 @@ func TestResubmitFailure(t *testing.T) { failureID6 := k.GetNextFailureIDKey(ctx, contractAddr.String()) k.AddContractFailure(ctx, &packet, contractAddr.String(), "timeout", nil) - wk.EXPECT().HasContractInfo(gomock.AssignableToTypeOf(ctx), contractAddr).Return(true) - wk.EXPECT().Sudo(gomock.AssignableToTypeOf(ctx), contractAddr, msgTimeout).Return(nil, fmt.Errorf("failed to Sudo")) + wk.EXPECT().Sudo(gomock.AssignableToTypeOf(ctx), contractAddr, msgTimeout).Return(nil, fmt.Errorf("failed to sudo")) failure6, err := k.GetFailure(ctx, contractAddr, failureID6) require.NoError(t, err) diff --git a/x/contractmanager/keeper/sudo.go b/x/contractmanager/keeper/sudo.go index 2feba728a..1b33639cb 100644 --- a/x/contractmanager/keeper/sudo.go +++ b/x/contractmanager/keeper/sudo.go @@ -20,26 +20,25 @@ func (k Keeper) HasContractInfo(ctx sdk.Context, contractAddress sdk.AccAddress) return k.wasmKeeper.HasContractInfo(ctx, contractAddress) } +func prepareSudoCallbackMessage(request channeltypes.Packet, ack *channeltypes.Acknowledgement) types.MessageSudoCallback { + m := types.MessageSudoCallback{ + Response: nil, + Error: nil, + Timeout: nil, + } + return m +} + func (k Keeper) SudoResponse( ctx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, - msg []byte, + ack channeltypes.Acknowledgement, ) ([]byte, error) { - k.Logger(ctx).Debug("SudoResponse", "senderAddress", senderAddress, "request", request, "msg", msg) - - if !k.wasmKeeper.HasContractInfo(ctx, senderAddress) { - if request.SourcePort == types.TransferPort { - // we want to allow non contract account to send the assets via IBC Transfer module - // we can determine the originating module by the source port of the request packet - return nil, nil - } - k.Logger(ctx).Debug("SudoResponse: contract not found", "senderAddress", senderAddress) - return nil, fmt.Errorf("%s is not a contract address and not the Transfer module", senderAddress) - } + k.Logger(ctx).Debug("SudoResponse", "senderAddress", senderAddress, "request", request, "msg", ack.GetResult()) x := types.MessageResponse{} - x.Response.Data = msg + x.Response.Data = ack.GetResult() x.Response.Request = request m, err := json.Marshal(x) if err != nil { @@ -50,9 +49,9 @@ func (k Keeper) SudoResponse( resp, err := k.wasmKeeper.Sudo(ctx, senderAddress, m) if err != nil { - k.Logger(ctx).Debug("SudoResponse: failed to Sudo", + k.Logger(ctx).Debug("SudoResponse: failed to sudo", "error", err, "contract_address", senderAddress) - return nil, fmt.Errorf("failed to Sudo: %v", err) + return nil, fmt.Errorf("failed to sudo: %v", err) } return resp, nil @@ -65,16 +64,6 @@ func (k Keeper) SudoTimeout( ) ([]byte, error) { k.Logger(ctx).Info("SudoTimeout", "senderAddress", senderAddress, "request", request) - if !k.wasmKeeper.HasContractInfo(ctx, senderAddress) { - if request.SourcePort == types.TransferPort { - // we want to allow non contract account to send the assets via IBC Transfer module - // we can determine the originating module by the source port of the request packet - return nil, nil - } - k.Logger(ctx).Debug("SudoTimeout: contract not found", "senderAddress", senderAddress) - return nil, fmt.Errorf("%s is not a contract address and not the Transfer module", senderAddress) - } - x := types.MessageTimeout{} x.Timeout.Request = request m, err := json.Marshal(x) @@ -88,9 +77,9 @@ func (k Keeper) SudoTimeout( resp, err := k.wasmKeeper.Sudo(ctx, senderAddress, m) if err != nil { - k.Logger(ctx).Debug("SudoTimeout: failed to Sudo", + k.Logger(ctx).Debug("SudoTimeout: failed to sudo", "error", err, "contract_address", senderAddress) - return nil, fmt.Errorf("failed to Sudo: %v", err) + return nil, fmt.Errorf("failed to sudo: %v", err) } return resp, nil @@ -100,23 +89,13 @@ func (k Keeper) SudoError( ctx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, - details string, + ack channeltypes.Acknowledgement, ) ([]byte, error) { k.Logger(ctx).Debug("SudoError", "senderAddress", senderAddress, "request", request) - if !k.wasmKeeper.HasContractInfo(ctx, senderAddress) { - if request.SourcePort == types.TransferPort { - // we want to allow non contract account to send the assets via IBC Transfer module - // we can determine the originating module by the source port of the request packet - return nil, nil - } - k.Logger(ctx).Debug("SudoError: contract not found", "senderAddress", senderAddress) - return nil, fmt.Errorf("%s is not a contract address and not the Transfer module", senderAddress) - } - x := types.MessageError{} x.Error.Request = request - x.Error.Details = details + x.Error.Details = ack.GetError() m, err := json.Marshal(x) if err != nil { k.Logger(ctx).Error("SudoError: failed to marshal MessageError message", @@ -126,9 +105,9 @@ func (k Keeper) SudoError( resp, err := k.wasmKeeper.Sudo(ctx, senderAddress, m) if err != nil { - k.Logger(ctx).Debug("SudoError: failed to Sudo", + k.Logger(ctx).Debug("SudoError: failed to sudo", "error", err, "contract_address", senderAddress) - return nil, fmt.Errorf("failed to Sudo: %v", err) + return nil, fmt.Errorf("failed to sudo: %v", err) } return resp, nil @@ -141,11 +120,6 @@ func (k Keeper) SudoOnChanOpenAck( ) ([]byte, error) { k.Logger(ctx).Debug("SudoOnChanOpenAck", "contractAddress", contractAddress) - if !k.wasmKeeper.HasContractInfo(ctx, contractAddress) { - k.Logger(ctx).Debug("SudoOnChanOpenAck: contract not found", "contractAddress", contractAddress) - return nil, fmt.Errorf("%s is not a contract address", contractAddress) - } - x := types.MessageOnChanOpenAck{} x.OpenAck = details m, err := json.Marshal(x) @@ -158,9 +132,9 @@ func (k Keeper) SudoOnChanOpenAck( resp, err := k.wasmKeeper.Sudo(ctx, contractAddress, m) if err != nil { - k.Logger(ctx).Debug("SudoOnChanOpenAck: failed to Sudo", + k.Logger(ctx).Debug("SudoOnChanOpenAck: failed to sudo", "error", err, "contract_address", contractAddress) - return nil, fmt.Errorf("failed to Sudo: %v", err) + return nil, fmt.Errorf("failed to sudo: %v", err) } return resp, nil @@ -198,9 +172,9 @@ func (k Keeper) SudoTxQueryResult( resp, err := k.wasmKeeper.Sudo(ctx, contractAddress, m) if err != nil { - k.Logger(ctx).Debug("SudoTxQueryResult: failed to Sudo", + k.Logger(ctx).Debug("SudoTxQueryResult: failed to sudo", "error", err, "contract_address", contractAddress) - return nil, fmt.Errorf("failed to Sudo: %v", err) + return nil, fmt.Errorf("failed to sudo: %v", err) } return resp, nil @@ -232,9 +206,9 @@ func (k Keeper) SudoKVQueryResult( resp, err := k.wasmKeeper.Sudo(ctx, contractAddress, m) if err != nil { - k.Logger(ctx).Debug("SudoKVQueryResult: failed to Sudo", + k.Logger(ctx).Debug("SudoKVQueryResult: failed to sudo", "error", err, "contract_address", contractAddress) - return nil, fmt.Errorf("failed to Sudo: %v", err) + return nil, fmt.Errorf("failed to sudo: %v", err) } return resp, nil diff --git a/x/contractmanager/keeper/sudo_test.go b/x/contractmanager/keeper/sudo_test.go index b4adc4103..8767acd93 100644 --- a/x/contractmanager/keeper/sudo_test.go +++ b/x/contractmanager/keeper/sudo_test.go @@ -48,34 +48,18 @@ func TestSudoResponse(t *testing.T) { sudoErrorMsg := types.MessageResponse{} p := channeltypes.Packet{} - sudoErrorMsg.Response.Data = []byte("data") + a := channeltypes.Acknowledgement{Response: &channeltypes.Acknowledgement_Result{Result: []byte("data")}} + sudoErrorMsg.Response.Data = a.GetResult() sudoErrorMsg.Response.Request = p wk.EXPECT().Sudo(gomock.Any(), address, mustJSON(sudoErrorMsg)).Return([]byte("success"), nil) - wk.EXPECT().HasContractInfo(gomock.Any(), address).Return(true) - resp, err := k.SudoResponse(ctx, address, sudoErrorMsg.Response.Request, sudoErrorMsg.Response.Data) + resp, err := k.SudoResponse(ctx, address, sudoErrorMsg.Response.Request, a) require.NoError(t, err) require.Equal(t, []byte("success"), resp) wk.EXPECT().Sudo(gomock.Any(), address, mustJSON(sudoErrorMsg)).Return(nil, fmt.Errorf("internal contract error")) - wk.EXPECT().HasContractInfo(gomock.Any(), address).Return(true) - resp, err = k.SudoResponse(ctx, address, sudoErrorMsg.Response.Request, sudoErrorMsg.Response.Data) + resp, err = k.SudoResponse(ctx, address, sudoErrorMsg.Response.Request, a) require.Nil(t, resp) require.ErrorContains(t, err, "internal contract error") - - wk.EXPECT().HasContractInfo(gomock.Any(), address).Return(false) - resp, err = k.SudoResponse(ctx, address, channeltypes.Packet{}, nil) - require.Nil(t, resp) - require.ErrorContains(t, err, "is not a contract address and not the Transfer module") - - sudoResponseTransport := types.MessageResponse{} - p = channeltypes.Packet{SourcePort: types.TransferPort} - sudoResponseTransport.Response.Data = []byte("data") - sudoResponseTransport.Response.Request = p - - wk.EXPECT().HasContractInfo(gomock.Any(), address).Return(false) - _, err = k.SudoResponse(ctx, address, sudoResponseTransport.Response.Request, sudoResponseTransport.Response.Data) - require.Nil(t, err) - require.NoError(t, err) } func TestSudoError(t *testing.T) { @@ -88,34 +72,20 @@ func TestSudoError(t *testing.T) { sudoErrorMsg := types.MessageError{} p := channeltypes.Packet{} - sudoErrorMsg.Error.Details = "details" + a := channeltypes.Acknowledgement{Response: &channeltypes.Acknowledgement_Error{ + Error: "details", + }} + sudoErrorMsg.Error.Details = a.GetError() sudoErrorMsg.Error.Request = p wk.EXPECT().Sudo(gomock.Any(), address, mustJSON(sudoErrorMsg)).Return([]byte("success"), nil) - wk.EXPECT().HasContractInfo(gomock.Any(), address).Return(true) - resp, err := k.SudoError(ctx, address, sudoErrorMsg.Error.Request, sudoErrorMsg.Error.Details) + resp, err := k.SudoError(ctx, address, sudoErrorMsg.Error.Request, a) require.NoError(t, err) require.Equal(t, []byte("success"), resp) wk.EXPECT().Sudo(gomock.Any(), address, mustJSON(sudoErrorMsg)).Return(nil, fmt.Errorf("internal contract error")) - wk.EXPECT().HasContractInfo(gomock.Any(), address).Return(true) - resp, err = k.SudoError(ctx, address, sudoErrorMsg.Error.Request, sudoErrorMsg.Error.Details) + resp, err = k.SudoError(ctx, address, sudoErrorMsg.Error.Request, a) require.Nil(t, resp) require.ErrorContains(t, err, "internal contract error") - - wk.EXPECT().HasContractInfo(gomock.Any(), address).Return(false) - resp, err = k.SudoError(ctx, address, channeltypes.Packet{}, "") - require.Nil(t, resp) - require.ErrorContains(t, err, "is not a contract address and not the Transfer module") - - sudoErrorTransport := types.MessageError{} - p = channeltypes.Packet{SourcePort: types.TransferPort} - sudoErrorTransport.Error.Details = "details" - sudoErrorTransport.Error.Request = p - - wk.EXPECT().HasContractInfo(gomock.Any(), address).Return(false) - resp, err = k.SudoError(ctx, address, sudoErrorTransport.Error.Request, sudoErrorTransport.Error.Details) - require.Nil(t, resp) - require.NoError(t, err) } func TestSudoTimeout(t *testing.T) { @@ -130,30 +100,14 @@ func TestSudoTimeout(t *testing.T) { p := channeltypes.Packet{} sudoTimeoutMsg.Timeout.Request = p wk.EXPECT().Sudo(gomock.Any(), address, mustJSON(sudoTimeoutMsg)).Return([]byte("success"), nil) - wk.EXPECT().HasContractInfo(gomock.Any(), address).Return(true) resp, err := k.SudoTimeout(ctx, address, sudoTimeoutMsg.Timeout.Request) require.NoError(t, err) require.Equal(t, []byte("success"), resp) wk.EXPECT().Sudo(gomock.Any(), address, mustJSON(sudoTimeoutMsg)).Return(nil, fmt.Errorf("internal contract error")) - wk.EXPECT().HasContractInfo(gomock.Any(), address).Return(true) resp, err = k.SudoTimeout(ctx, address, sudoTimeoutMsg.Timeout.Request) require.Nil(t, resp) require.ErrorContains(t, err, "internal contract error") - - wk.EXPECT().HasContractInfo(gomock.Any(), address).Return(false) - resp, err = k.SudoTimeout(ctx, address, channeltypes.Packet{}) - require.Nil(t, resp) - require.ErrorContains(t, err, "is not a contract address and not the Transfer module") - - sudoTimeoutTransport := types.MessageTimeout{} - p = channeltypes.Packet{SourcePort: types.TransferPort} - sudoTimeoutTransport.Timeout.Request = p - - wk.EXPECT().HasContractInfo(gomock.Any(), address).Return(false) - resp, err = k.SudoTimeout(ctx, address, sudoTimeoutTransport.Timeout.Request) - require.Nil(t, resp) - require.NoError(t, err) } func TestSudoOnChanOpen(t *testing.T) { @@ -166,21 +120,14 @@ func TestSudoOnChanOpen(t *testing.T) { sudoOpenAckMsg := types.MessageOnChanOpenAck{} wk.EXPECT().Sudo(gomock.Any(), address, mustJSON(sudoOpenAckMsg)).Return([]byte("success"), nil) - wk.EXPECT().HasContractInfo(gomock.Any(), address).Return(true) resp, err := k.SudoOnChanOpenAck(ctx, address, sudoOpenAckMsg.OpenAck) require.NoError(t, err) require.Equal(t, []byte("success"), resp) wk.EXPECT().Sudo(gomock.Any(), address, mustJSON(sudoOpenAckMsg)).Return(nil, fmt.Errorf("internal contract error")) - wk.EXPECT().HasContractInfo(gomock.Any(), address).Return(true) resp, err = k.SudoOnChanOpenAck(ctx, address, sudoOpenAckMsg.OpenAck) require.Nil(t, resp) require.ErrorContains(t, err, "internal contract error") - - wk.EXPECT().HasContractInfo(gomock.Any(), address).Return(false) - resp, err = k.SudoOnChanOpenAck(ctx, address, sudoOpenAckMsg.OpenAck) - require.Nil(t, resp) - require.ErrorContains(t, err, "is not a contract address") } func TestSudoTxQueryResult(t *testing.T) { diff --git a/x/contractmanager/types/module.go b/x/contractmanager/types/module.go new file mode 100644 index 000000000..540b2afd3 --- /dev/null +++ b/x/contractmanager/types/module.go @@ -0,0 +1,16 @@ +package types + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" + channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" +) + +type ContractManagerWrapper interface { + HasContractInfo(ctx sdk.Context, contractAddress sdk.AccAddress) bool + AddContractFailure(ctx sdk.Context, packet *channeltypes.Packet, address, ackType string, ack *channeltypes.Acknowledgement) + SudoResponse(ctx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, ack channeltypes.Acknowledgement) ([]byte, error) + SudoError(ctx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, ack channeltypes.Acknowledgement) ([]byte, error) + SudoTimeout(ctx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet) ([]byte, error) + SudoOnChanOpenAck(ctx sdk.Context, contractAddress sdk.AccAddress, details OpenAckDetails) ([]byte, error) + GetParams(ctx sdk.Context) (params Params) +} diff --git a/x/contractmanager/types/sudo.go b/x/contractmanager/types/sudo.go index c0564d82a..8b2d0144d 100644 --- a/x/contractmanager/types/sudo.go +++ b/x/contractmanager/types/sudo.go @@ -5,8 +5,6 @@ import ( channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" ) -const TransferPort = "transfer" - // MessageTxQueryResult is passed to a contract's sudo() entrypoint when a tx was submitted // for a transaction query. type MessageTxQueryResult struct { @@ -25,6 +23,26 @@ type MessageKVQueryResult struct { } `json:"kv_query_result"` } +type MessageSudoCallback struct { + Response *ResponseSudoPayload `json:"response"` + Error *ErrorSudoPayload `json:"error"` + Timeout *TimeoutPayload `json:"timeout"` +} + +type ResponseSudoPayload struct { + Request channeltypes.Packet `json:"request"` + Data []byte `json:"data"` // Message data +} + +type ErrorSudoPayload struct { + Request channeltypes.Packet `json:"request"` + Details string `json:"details"` +} + +type TimeoutPayload struct { + Request channeltypes.Packet `json:"request"` +} + // MessageTimeout is passed to a contract's sudo() entrypoint when an interchain // transaction failed with a timeout. type MessageTimeout struct { diff --git a/x/interchainqueries/types/expected_keepers.go b/x/interchainqueries/types/expected_keepers.go index d0cb0332f..820259470 100644 --- a/x/interchainqueries/types/expected_keepers.go +++ b/x/interchainqueries/types/expected_keepers.go @@ -4,7 +4,6 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/auth/types" ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" - channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" ) // AccountKeeper defines the expected account keeper used for simulations (noalias) @@ -23,9 +22,6 @@ type BankKeeper interface { type ContractManagerKeeper interface { HasContractInfo(ctx sdk.Context, contractAddress sdk.AccAddress) bool - SudoResponse(ctx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, msg []byte) ([]byte, error) - SudoError(ctx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, details string) ([]byte, error) - SudoTimeout(ctx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet) ([]byte, error) SudoKVQueryResult(ctx sdk.Context, contractAddress sdk.AccAddress, queryID uint64) ([]byte, error) SudoTxQueryResult(ctx sdk.Context, contractAddress sdk.AccAddress, queryID uint64, height ibcclienttypes.Height, data []byte) ([]byte, error) } diff --git a/x/interchaintxs/keeper/ibc_handlers.go b/x/interchaintxs/keeper/ibc_handlers.go index d1deab8fa..4fe930e1f 100644 --- a/x/interchaintxs/keeper/ibc_handlers.go +++ b/x/interchaintxs/keeper/ibc_handlers.go @@ -1,8 +1,6 @@ package keeper import ( - "github.com/neutron-org/neutron/neutronutils" - neutronerrors "github.com/neutron-org/neutron/neutronutils/errors" "time" "cosmossdk.io/errors" @@ -17,7 +15,7 @@ import ( "github.com/neutron-org/neutron/x/interchaintxs/types" ) -// HandleAcknowledgement passes the acknowledgement data to the appropriate contract via a Sudo call. +// HandleAcknowledgement passes the acknowledgement data to the appropriate contract via a sudo call. func (k *Keeper) HandleAcknowledgement(ctx sdk.Context, packet channeltypes.Packet, acknowledgement []byte, relayer sdk.AccAddress) error { defer telemetry.ModuleMeasureSince(types.ModuleName, time.Now(), LabelHandleAcknowledgment) @@ -34,63 +32,48 @@ func (k *Keeper) HandleAcknowledgement(ctx sdk.Context, packet channeltypes.Pack return errors.Wrapf(sdkerrors.ErrUnknownRequest, "cannot unmarshal ICS-27 packet acknowledgement: %v", err) } + if !k.contractManagerKeeper.HasContractInfo(ctx, icaOwner.GetContract()) { + //return fmt.Errorf("%s is not a contract address", icaOwner.GetContract()) + return nil + } + k.feeKeeper.DistributeAcknowledgementFee(ctx, relayer, feetypes.NewPacketID(packet.SourcePort, packet.SourceChannel, packet.Sequence)) - cacheCtx, writeFn := neutronutils.CreateCachedContext(ctx, k.contractManagerKeeper.GetParams(ctx).SudoCallGasLimit) - func() { - defer neutronerrors.OutOfGasRecovery(cacheCtx.GasMeter(), &err) - // Actually we have only one kind of error returned from acknowledgement - // maybe later we'll retrieve actual errors from events - if ack.GetError() != "" { - - _, err = k.contractManagerKeeper.SudoError(cacheCtx, icaOwner.GetContract(), packet, ack.GetError()) - } else { - _, err = k.contractManagerKeeper.SudoResponse(cacheCtx, icaOwner.GetContract(), packet, ack.GetResult()) - } - }() - if err != nil { - // the contract either returned an error or panicked with `out of gas` - k.contractManagerKeeper.AddContractFailure(ctx, &packet, icaOwner.GetContract().String(), contractmanagertypes.Ack, &ack) - k.Logger(ctx).Debug("HandleAcknowledgement: failed to Sudo contract on packet acknowledgement", "error", err) + // Actually we have only one kind of error returned from acknowledgement + // maybe later we'll retrieve actual errors from events + // `err` value from `SudoError/SudoResponse` should always be nil, since we contractmanager wrapped by `SudoLimitWrapper` + if ack.GetError() != "" { + _, err = k.contractManagerKeeper.SudoError(ctx, icaOwner.GetContract(), packet, ack) } else { - writeFn() + _, err = k.contractManagerKeeper.SudoResponse(ctx, icaOwner.GetContract(), packet, ack) } - ctx.GasMeter().ConsumeGas(cacheCtx.GasMeter().GasConsumedToLimit(), "consume gas from cached context") - - return nil + return err } -// HandleTimeout passes the timeout data to the appropriate contract via a Sudo call. +// HandleTimeout passes the timeout data to the appropriate contract via a sudo call. // Since all ICA channels are ORDERED, a single timeout shuts down a channel. func (k *Keeper) HandleTimeout(ctx sdk.Context, packet channeltypes.Packet, relayer sdk.AccAddress) error { defer telemetry.ModuleMeasureSince(types.ModuleName, time.Now(), LabelHandleTimeout) + k.Logger(ctx).Debug("HandleTimeout") icaOwner, err := types.ICAOwnerFromPort(packet.SourcePort) - k.Logger(ctx).Debug("HandleTimeout") if err != nil { k.Logger(ctx).Error("HandleTimeout: failed to get ica owner from source port", "error", err) return errors.Wrap(err, "failed to get ica owner from port") } - k.feeKeeper.DistributeTimeoutFee(ctx, relayer, feetypes.NewPacketID(packet.SourcePort, packet.SourceChannel, packet.Sequence)) - - cacheCtx, writeFn := neutronutils.CreateCachedContext(ctx, k.contractManagerKeeper.GetParams(ctx).SudoCallGasLimit) - func() { - defer neutronerrors.OutOfGasRecovery(cacheCtx.GasMeter(), &err) - _, err = k.contractManagerKeeper.SudoTimeout(cacheCtx, icaOwner.GetContract(), packet) - }() - if err != nil { - // the contract either returned an error or panicked with `out of gas` - k.contractManagerKeeper.AddContractFailure(ctx, &packet, icaOwner.GetContract().String(), contractmanagertypes.Timeout, nil) - k.Logger(ctx).Error("HandleTimeout: failed to Sudo contract on packet timeout", "error", err) - } else { - writeFn() + if !k.contractManagerKeeper.HasContractInfo(ctx, icaOwner.GetContract()) { + //return fmt.Errorf("%s is not a contract address", icaOwner.GetContract()) + return nil } - ctx.GasMeter().ConsumeGas(cacheCtx.GasMeter().GasConsumedToLimit(), "consume gas from cached context") + k.feeKeeper.DistributeTimeoutFee(ctx, relayer, feetypes.NewPacketID(packet.SourcePort, packet.SourceChannel, packet.Sequence)) + + // `err` value from `SudoTimeout` should always be nil, since we contractmanager wrapped by `SudoLimitWrapper` + _, err = k.contractManagerKeeper.SudoTimeout(ctx, icaOwner.GetContract(), packet) - return nil + return err } // HandleChanOpenAck passes the data about a successfully created channel to the appropriate contract @@ -113,6 +96,11 @@ func (k *Keeper) HandleChanOpenAck( return errors.Wrap(err, "failed to get ica owner from port") } + if !k.contractManagerKeeper.HasContractInfo(ctx, icaOwner.GetContract()) { + //return fmt.Errorf("%s is not a contract address", icaOwner.GetContract()) + return nil + } + _, err = k.contractManagerKeeper.SudoOnChanOpenAck(ctx, icaOwner.GetContract(), contractmanagertypes.OpenAckDetails{ PortID: portID, ChannelID: channelID, @@ -120,8 +108,8 @@ func (k *Keeper) HandleChanOpenAck( CounterpartyVersion: counterpartyVersion, }) if err != nil { - k.Logger(ctx).Debug("HandleChanOpenAck: failed to Sudo contract on packet timeout", "error", err) - return errors.Wrap(err, "failed to Sudo the contract OnChanOpenAck") + k.Logger(ctx).Debug("HandleChanOpenAck: failed to sudo contract on packet timeout", "error", err) + return errors.Wrap(err, "failed to sudo the contract OnChanOpenAck") } return nil diff --git a/x/interchaintxs/keeper/ibc_handlers_test.go b/x/interchaintxs/keeper/ibc_handlers_test.go index 85f435d4b..50e74b2f0 100644 --- a/x/interchaintxs/keeper/ibc_handlers_test.go +++ b/x/interchaintxs/keeper/ibc_handlers_test.go @@ -17,25 +17,15 @@ import ( feetypes "github.com/neutron-org/neutron/x/feerefunder/types" ) -var ( - ShouldNotBeWrittenKey = []byte("shouldnotkey") - ShouldNotBeWritten = []byte("should not be written") - ShouldBeWritten = []byte("should be written") -) - -func ShouldBeWrittenKey(suffix string) []byte { - return append([]byte("shouldkey"), []byte(suffix)...) -} - func TestHandleAcknowledgement(t *testing.T) { ctrl := gomock.NewController(t) defer ctrl.Finish() icaKeeper := mock_types.NewMockICAControllerKeeper(ctrl) cmKeeper := mock_types.NewMockContractManagerKeeper(ctrl) feeKeeper := mock_types.NewMockFeeRefunderKeeper(ctrl) - icak, infCtx, storeKey := testkeeper.InterchainTxsKeeper(t, cmKeeper, feeKeeper, icaKeeper, nil) + icak, infCtx, _ := testkeeper.InterchainTxsKeeper(t, cmKeeper, feeKeeper, icaKeeper, nil) ctx := infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - store := ctx.KVStore(storeKey) + //store := ctx.KVStore(storeKey) errACK := channeltypes.Acknowledgement{ Response: &channeltypes.Acknowledgement_Error{ @@ -64,86 +54,96 @@ func TestHandleAcknowledgement(t *testing.T) { err = icak.HandleAcknowledgement(ctx, p, nil, relayerAddress) require.ErrorContains(t, err, "cannot unmarshal ICS-27 packet acknowledgement") - // error during SudoResponse + // success contract SudoResponse ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - cmKeeper.EXPECT().SudoResponse(gomock.AssignableToTypeOf(ctx), contractAddress, p, resACK.GetResult()).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, msg []byte) { - store := cachedCtx.KVStore(storeKey) - store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) // consumes 2990 - }).Return(nil, fmt.Errorf("SudoResponse error")) - cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 4000}) - cmKeeper.EXPECT().AddContractFailure(ctx, &p, contractAddress.String(), types.Ack, &resACK) + cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) + cmKeeper.EXPECT().SudoResponse(ctx, contractAddress, p, resACK) err = icak.HandleAcknowledgement(ctx, p, resAckData, relayerAddress) require.NoError(t, err) - require.Empty(t, store.Get(ShouldNotBeWrittenKey)) - require.Equal(t, uint64(2990), ctx.GasMeter().GasConsumed()) - // error during SudoError + // success contract SudoError ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - cmKeeper.EXPECT().SudoError(gomock.AssignableToTypeOf(ctx), contractAddress, p, errACK.GetError()).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, err string) { - store := cachedCtx.KVStore(storeKey) - store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) - }).Return(nil, fmt.Errorf("SudoError error")) - cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 5000}) - cmKeeper.EXPECT().AddContractFailure(ctx, &p, contractAddress.String(), types.Ack, &errACK) + cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) + cmKeeper.EXPECT().SudoError(ctx, contractAddress, p, errACK) err = icak.HandleAcknowledgement(ctx, p, errAckData, relayerAddress) require.NoError(t, err) - require.Empty(t, store.Get(ShouldNotBeWrittenKey)) - require.Equal(t, uint64(2990), ctx.GasMeter().GasConsumed()) - // success during SudoError + // error contract SudoResponse ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - cmKeeper.EXPECT().SudoError(gomock.AssignableToTypeOf(ctx), contractAddress, p, errACK.GetError()).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, err string) { - store := cachedCtx.KVStore(storeKey) - store.Set(ShouldBeWrittenKey("sudoerror"), ShouldBeWritten) - }).Return(nil, nil) - cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 6000}) + cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) - err = icak.HandleAcknowledgement(ctx, p, errAckData, relayerAddress) - require.NoError(t, err) - require.Equal(t, ShouldBeWritten, store.Get(ShouldBeWrittenKey("sudoerror"))) - require.Equal(t, uint64(3050), ctx.GasMeter().GasConsumed()) + cmKeeper.EXPECT().SudoResponse(ctx, contractAddress, p, resACK).Return(nil, fmt.Errorf("error sudoResponse")) + err = icak.HandleAcknowledgement(ctx, p, resAckData, relayerAddress) + require.Error(t, err) - // out of gas during SudoError + // error contract SudoError ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - cmKeeper.EXPECT().SudoError(gomock.AssignableToTypeOf(ctx), contractAddress, p, errACK.GetError()).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, error string) { - store := cachedCtx.KVStore(storeKey) - store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) - cachedCtx.GasMeter().ConsumeGas(7001, "out of gas test") - }) - cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 7000}) - cmKeeper.EXPECT().AddContractFailure(ctx, &p, contractAddress.String(), types.Ack, &errACK) + cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) + cmKeeper.EXPECT().SudoError(ctx, contractAddress, p, errACK).Return(nil, fmt.Errorf("error sudoError")) err = icak.HandleAcknowledgement(ctx, p, errAckData, relayerAddress) - require.NoError(t, err) - require.Empty(t, store.Get(ShouldNotBeWrittenKey)) - require.Equal(t, uint64(7000), ctx.GasMeter().GasConsumed()) + require.Error(t, err) - // success during SudoResponse + // no contract SudoError ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - cmKeeper.EXPECT().SudoResponse(gomock.AssignableToTypeOf(ctx), contractAddress, p, resACK.GetResult()).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, msg []byte) { - store := cachedCtx.KVStore(storeKey) - store.Set(ShouldBeWrittenKey("sudoresponse"), ShouldBeWritten) // consumes 3140 gas, 2000 flat write + 30 every byte of key+value - }).Return(nil, nil) - cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 8000}) - feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) - err = icak.HandleAcknowledgement(ctx, p, resAckData, relayerAddress) + cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(false) + err = icak.HandleAcknowledgement(ctx, p, errAckData, relayerAddress) require.NoError(t, err) - require.Equal(t, uint64(3140), ctx.GasMeter().GasConsumed()) - require.Equal(t, ShouldBeWritten, store.Get(ShouldBeWrittenKey("sudoresponse"))) - // not enough gas provided by relayer for SudoCallGasLimit - ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - lowGasCtx := infCtx.WithGasMeter(sdk.NewGasMeter(1000)) - cmKeeper.EXPECT().SudoResponse(gomock.AssignableToTypeOf(lowGasCtx), contractAddress, p, resACK.GetResult()).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, msg []byte) { - store := cachedCtx.KVStore(storeKey) - store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) - cachedCtx.GasMeter().ConsumeGas(1001, "out of gas test") - }) - feeKeeper.EXPECT().DistributeAcknowledgementFee(lowGasCtx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) - cmKeeper.EXPECT().GetParams(lowGasCtx).Return(types.Params{SudoCallGasLimit: 9000}) - require.PanicsWithValue(t, sdk.ErrorOutOfGas{Descriptor: "consume gas from cached context"}, func() { icak.HandleAcknowledgement(lowGasCtx, p, resAckData, relayerAddress) }) //nolint:errcheck // this is a panic test + //// success during SudoError + //ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) + //cmKeeper.EXPECT().SudoError(gomock.AssignableToTypeOf(ctx), contractAddress, p, errACK.GetError()).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, err string) { + // store := cachedCtx.KVStore(storeKey) + // store.Set(ShouldBeWrittenKey("sudoerror"), ShouldBeWritten) + //}).Return(nil, nil) + //cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 6000}) + //feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) + //err = icak.HandleAcknowledgement(ctx, p, errAckData, relayerAddress) + //require.NoError(t, err) + //require.Equal(t, ShouldBeWritten, store.Get(ShouldBeWrittenKey("sudoerror"))) + //require.Equal(t, uint64(3050), ctx.GasMeter().GasConsumed()) + // + //// out of gas during SudoError + //ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) + //cmKeeper.EXPECT().SudoError(gomock.AssignableToTypeOf(ctx), contractAddress, p, errACK.GetError()).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, error string) { + // store := cachedCtx.KVStore(storeKey) + // store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) + // cachedCtx.GasMeter().ConsumeGas(7001, "out of gas test") + //}) + //cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 7000}) + //cmKeeper.EXPECT().AddContractFailure(ctx, &p, contractAddress.String(), types.Ack, &errACK) + //feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) + //err = icak.HandleAcknowledgement(ctx, p, errAckData, relayerAddress) + //require.NoError(t, err) + //require.Empty(t, store.Get(ShouldNotBeWrittenKey)) + //require.Equal(t, uint64(7000), ctx.GasMeter().GasConsumed()) + // + //// success during SudoResponse + //ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) + //cmKeeper.EXPECT().SudoResponse(gomock.AssignableToTypeOf(ctx), contractAddress, p, resACK.GetResult()).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, msg []byte) { + // store := cachedCtx.KVStore(storeKey) + // store.Set(ShouldBeWrittenKey("sudoresponse"), ShouldBeWritten) // consumes 3140 gas, 2000 flat write + 30 every byte of key+value + //}).Return(nil, nil) + //cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 8000}) + //feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) + //err = icak.HandleAcknowledgement(ctx, p, resAckData, relayerAddress) + //require.NoError(t, err) + //require.Equal(t, uint64(3140), ctx.GasMeter().GasConsumed()) + //require.Equal(t, ShouldBeWritten, store.Get(ShouldBeWrittenKey("sudoresponse"))) + // + //// not enough gas provided by relayer for SudoCallGasLimit + //ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) + //lowGasCtx := infCtx.WithGasMeter(sdk.NewGasMeter(1000)) + //cmKeeper.EXPECT().SudoResponse(gomock.AssignableToTypeOf(lowGasCtx), contractAddress, p, resACK.GetResult()).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, msg []byte) { + // store := cachedCtx.KVStore(storeKey) + // store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) + // cachedCtx.GasMeter().ConsumeGas(1001, "out of gas test") + //}) + //feeKeeper.EXPECT().DistributeAcknowledgementFee(lowGasCtx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) + //cmKeeper.EXPECT().GetParams(lowGasCtx).Return(types.Params{SudoCallGasLimit: 9000}) + //require.PanicsWithValue(t, sdk.ErrorOutOfGas{Descriptor: "consume gas from cached context"}, func() { icak.HandleAcknowledgement(lowGasCtx, p, resAckData, relayerAddress) }) //nolint:errcheck // this is a panic test } func TestHandleTimeout(t *testing.T) { @@ -152,9 +152,8 @@ func TestHandleTimeout(t *testing.T) { icaKeeper := mock_types.NewMockICAControllerKeeper(ctrl) cmKeeper := mock_types.NewMockContractManagerKeeper(ctrl) feeKeeper := mock_types.NewMockFeeRefunderKeeper(ctrl) - icak, infCtx, storeKey := testkeeper.InterchainTxsKeeper(t, cmKeeper, feeKeeper, icaKeeper, nil) + icak, infCtx, _ := testkeeper.InterchainTxsKeeper(t, cmKeeper, feeKeeper, icaKeeper, nil) ctx := infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - store := ctx.KVStore(storeKey) contractAddress := sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress) relayerBech32 := "neutron1fxudpred77a0grgh69u0j7y84yks5ev4n5050z45kecz792jnd6scqu98z" relayerAddress := sdk.MustAccAddressFromBech32(relayerBech32) @@ -167,63 +166,27 @@ func TestHandleTimeout(t *testing.T) { err := icak.HandleTimeout(ctx, channeltypes.Packet{}, relayerAddress) require.ErrorContains(t, err, "failed to get ica owner from port") - gasReserved := false + // contract success ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - cmKeeper.EXPECT().SudoTimeout(gomock.AssignableToTypeOf(ctx), contractAddress, p).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet) { - if cachedCtx.GasMeter().Limit() == 4000 { - gasReserved = true - } - store := cachedCtx.KVStore(storeKey) - store.Set(ShouldBeWrittenKey("sudotimeout"), ShouldBeWritten) // consumes 3110 gas, 2000 flat write + 30 every byte of key+value - }).Return(nil, nil) - cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 4000}) + cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) feeKeeper.EXPECT().DistributeTimeoutFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) + cmKeeper.EXPECT().SudoTimeout(ctx, contractAddress, p) err = icak.HandleTimeout(ctx, p, relayerAddress) - require.True(t, gasReserved) - require.Equal(t, uint64(3110), ctx.GasMeter().GasConsumed()) - require.Equal(t, ShouldBeWritten, store.Get(ShouldBeWrittenKey("sudotimeout"))) require.NoError(t, err) - // error during SudoTimeOut + // contract error ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - cmKeeper.EXPECT().SudoTimeout(gomock.AssignableToTypeOf(ctx), contractAddress, p).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet) { - store := cachedCtx.KVStore(storeKey) - store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) - }).Return(nil, fmt.Errorf("SudoTimeout error")) - cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 5000}) - cmKeeper.EXPECT().AddContractFailure(ctx, &p, contractAddress.String(), types.Timeout, nil) + cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) feeKeeper.EXPECT().DistributeTimeoutFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) + cmKeeper.EXPECT().SudoTimeout(ctx, contractAddress, p).Return(nil, fmt.Errorf("SudoTimeout error")) err = icak.HandleTimeout(ctx, p, relayerAddress) - require.Equal(t, uint64(2990), ctx.GasMeter().GasConsumed()) - require.NoError(t, err) - require.Empty(t, store.Get(ShouldNotBeWrittenKey)) + require.Error(t, err) - // out of gas during SudoTimeOut + // no contract ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - cmKeeper.EXPECT().SudoTimeout(gomock.AssignableToTypeOf(ctx), contractAddress, p).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet) { - store := cachedCtx.KVStore(storeKey) - store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) - cachedCtx.GasMeter().ConsumeGas(6001, "out of gas test") - }).Return(nil, fmt.Errorf("SudoTimeout error")) - cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 6000}) - cmKeeper.EXPECT().AddContractFailure(ctx, &p, contractAddress.String(), types.Timeout, nil) - feeKeeper.EXPECT().DistributeTimeoutFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) + cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(false) err = icak.HandleTimeout(ctx, p, relayerAddress) - require.Equal(t, uint64(6000), ctx.GasMeter().GasConsumed()) require.NoError(t, err) - require.Empty(t, store.Get(ShouldNotBeWrittenKey)) - - // not enough gas provided by relayer for SudoCallGasLimit - ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - lowGasCtx := infCtx.WithGasMeter(sdk.NewGasMeter(1000)) - cmKeeper.EXPECT().SudoTimeout(gomock.AssignableToTypeOf(lowGasCtx), contractAddress, p).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet) { - store := cachedCtx.KVStore(storeKey) - store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) - cachedCtx.GasMeter().ConsumeGas(1001, "out of gas test") - }).Return(nil, nil) - cmKeeper.EXPECT().GetParams(lowGasCtx).Return(types.Params{SudoCallGasLimit: 9000}) - feeKeeper.EXPECT().DistributeTimeoutFee(lowGasCtx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) - require.PanicsWithValue(t, sdk.ErrorOutOfGas{Descriptor: "consume gas from cached context"}, func() { icak.HandleTimeout(lowGasCtx, p, relayerAddress) }) //nolint:errcheck // this is a panic test } func TestHandleChanOpenAck(t *testing.T) { @@ -239,6 +202,7 @@ func TestHandleChanOpenAck(t *testing.T) { err := icak.HandleChanOpenAck(ctx, "", channelID, counterpartyChannelID, "1") require.ErrorContains(t, err, "failed to get ica owner from port") + cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) cmKeeper.EXPECT().SudoOnChanOpenAck(ctx, contractAddress, types.OpenAckDetails{ PortID: portID, ChannelID: channelID, @@ -246,8 +210,9 @@ func TestHandleChanOpenAck(t *testing.T) { CounterpartyVersion: "1", }).Return(nil, fmt.Errorf("SudoOnChanOpenAck error")) err = icak.HandleChanOpenAck(ctx, portID, channelID, counterpartyChannelID, "1") - require.ErrorContains(t, err, "failed to Sudo the contract OnChanOpenAck") + require.ErrorContains(t, err, "failed to sudo the contract OnChanOpenAck") + cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) cmKeeper.EXPECT().SudoOnChanOpenAck(ctx, contractAddress, types.OpenAckDetails{ PortID: portID, ChannelID: channelID, @@ -256,4 +221,8 @@ func TestHandleChanOpenAck(t *testing.T) { }).Return(nil, nil) err = icak.HandleChanOpenAck(ctx, portID, channelID, counterpartyChannelID, "1") require.NoError(t, err) + + cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(false) + err = icak.HandleChanOpenAck(ctx, portID, channelID, counterpartyChannelID, "1") + require.NoError(t, err) } diff --git a/x/interchaintxs/types/expected_keepers.go b/x/interchaintxs/types/expected_keepers.go index a9be5877b..13d7f7cf3 100644 --- a/x/interchaintxs/types/expected_keepers.go +++ b/x/interchaintxs/types/expected_keepers.go @@ -26,11 +26,11 @@ type BankKeeper interface { type ContractManagerKeeper interface { HasContractInfo(ctx sdk.Context, contractAddress sdk.AccAddress) bool - AddContractFailure(ctx sdk.Context, packet *channeltypes.Packet, address, ackType string, ack *channeltypes.Acknowledgement) - SudoResponse(ctx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, msg []byte) ([]byte, error) - SudoError(ctx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, details string) ([]byte, error) + SudoResponse(ctx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, ack channeltypes.Acknowledgement) ([]byte, error) + SudoError(ctx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, ack channeltypes.Acknowledgement) ([]byte, error) SudoTimeout(ctx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet) ([]byte, error) SudoOnChanOpenAck(ctx sdk.Context, contractAddress sdk.AccAddress, details contractmanagertypes.OpenAckDetails) ([]byte, error) + AddContractFailure(ctx sdk.Context, packet *channeltypes.Packet, address, ackType string, ack *channeltypes.Acknowledgement) GetParams(ctx sdk.Context) (params contractmanagertypes.Params) } diff --git a/x/transfer/ibc_handlers.go b/x/transfer/ibc_handlers.go index a3a7b72ed..efecb0cff 100644 --- a/x/transfer/ibc_handlers.go +++ b/x/transfer/ibc_handlers.go @@ -1,21 +1,16 @@ package transfer import ( - contractmanagertypes "github.com/neutron-org/neutron/x/contractmanager/types" - "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" - "github.com/neutron-org/neutron/neutronutils" - - neutronerrors "github.com/neutron-org/neutron/neutronutils/errors" feetypes "github.com/neutron-org/neutron/x/feerefunder/types" "github.com/neutron-org/neutron/x/interchaintxs/types" ) -// HandleAcknowledgement passes the acknowledgement data to the appropriate contract via a Sudo call. +// HandleAcknowledgement passes the acknowledgement data to the appropriate contract via a sudo call. func (im IBCModule) HandleAcknowledgement(ctx sdk.Context, packet channeltypes.Packet, acknowledgement []byte, relayer sdk.AccAddress) error { var ack channeltypes.Acknowledgement if err := channeltypes.SubModuleCdc.UnmarshalJSON(acknowledgement, &ack); err != nil { @@ -36,34 +31,21 @@ func (im IBCModule) HandleAcknowledgement(ctx sdk.Context, packet channeltypes.P im.wrappedKeeper.FeeKeeper.DistributeAcknowledgementFee(ctx, relayer, feetypes.NewPacketID(packet.SourcePort, packet.SourceChannel, packet.Sequence)) - cacheCtx, writeFn := neutronutils.CreateCachedContext(ctx, im.ContractManagerKeeper.GetParams(ctx).SudoCallGasLimit) - func() { - defer neutronerrors.OutOfGasRecovery(cacheCtx.GasMeter(), &err) - if ack.Success() { - _, err = im.ContractManagerKeeper.SudoResponse(cacheCtx, senderAddress, packet, ack.GetResult()) - } else { - // Actually we have only one kind of error returned from acknowledgement - // maybe later we'll retrieve actual errors from events - im.keeper.Logger(cacheCtx).Debug(ack.GetError(), "CheckTx", cacheCtx.IsCheckTx()) - _, err = im.ContractManagerKeeper.SudoError(cacheCtx, senderAddress, packet, ack.GetError()) - } - }() - if err != nil { - // the contract either returned an error or panicked with `out of gas` - im.ContractManagerKeeper.AddContractFailure(ctx, &packet, senderAddress.String(), contractmanagertypes.Ack, &ack) - im.keeper.Logger(ctx).Debug("failed to Sudo contract on packet acknowledgement", err) + if ack.Success() { + _, err = im.ContractManagerKeeper.SudoResponse(ctx, senderAddress, packet, ack) } else { - writeFn() + // Actually we have only one kind of error returned from acknowledgement + // maybe later we'll retrieve actual errors from events + im.keeper.Logger(ctx).Debug(ack.GetError(), "CheckTx", ctx.IsCheckTx()) + _, err = im.ContractManagerKeeper.SudoError(ctx, senderAddress, packet, ack) } - ctx.GasMeter().ConsumeGas(cacheCtx.GasMeter().GasConsumedToLimit(), "consume gas from cached context") - im.keeper.Logger(ctx).Debug("acknowledgement received", "Packet data", data, "CheckTx", ctx.IsCheckTx()) - return nil + return err } -// HandleTimeout passes the timeout data to the appropriate contract via a Sudo call. +// HandleTimeout passes the timeout data to the appropriate contract via a sudo call. func (im IBCModule) HandleTimeout(ctx sdk.Context, packet channeltypes.Packet, relayer sdk.AccAddress) error { var data transfertypes.FungibleTokenPacketData if err := types.ModuleCdc.UnmarshalJSON(packet.GetData(), &data); err != nil { @@ -80,20 +62,7 @@ func (im IBCModule) HandleTimeout(ctx sdk.Context, packet channeltypes.Packet, r im.wrappedKeeper.FeeKeeper.DistributeTimeoutFee(ctx, relayer, feetypes.NewPacketID(packet.SourcePort, packet.SourceChannel, packet.Sequence)) - cacheCtx, writeFn := neutronutils.CreateCachedContext(ctx, im.ContractManagerKeeper.GetParams(ctx).SudoCallGasLimit) - func() { - defer neutronerrors.OutOfGasRecovery(cacheCtx.GasMeter(), &err) - _, err = im.ContractManagerKeeper.SudoTimeout(cacheCtx, senderAddress, packet) - }() - if err != nil { - // the contract either returned an error or panicked with `out of gas` - im.ContractManagerKeeper.AddContractFailure(ctx, &packet, senderAddress.String(), contractmanagertypes.Timeout, nil) - im.keeper.Logger(ctx).Debug("failed to Sudo contract on packet timeout", err) - } else { - writeFn() - } - - ctx.GasMeter().ConsumeGas(cacheCtx.GasMeter().GasConsumedToLimit(), "consume gas from cached context") + _, err = im.ContractManagerKeeper.SudoTimeout(ctx, senderAddress, packet) - return nil + return err } diff --git a/x/transfer/ibc_handlers_test.go b/x/transfer/ibc_handlers_test.go index 191bbfa8d..e93d91c97 100644 --- a/x/transfer/ibc_handlers_test.go +++ b/x/transfer/ibc_handlers_test.go @@ -2,7 +2,6 @@ package transfer_test import ( "fmt" - "github.com/neutron-org/neutron/x/contractmanager/types" "testing" sdk "github.com/cosmos/cosmos-sdk/types" @@ -39,10 +38,9 @@ func TestHandleAcknowledgement(t *testing.T) { authKeeper := mock_types.NewMockAccountKeeper(ctrl) // required to initialize keeper authKeeper.EXPECT().GetModuleAddress(transfertypes.ModuleName).Return([]byte("address")) - txKeeper, infCtx, storeKey := testkeeper.TransferKeeper(t, cmKeeper, feeKeeper, chanKeeper, authKeeper) + txKeeper, infCtx, _ := testkeeper.TransferKeeper(t, cmKeeper, feeKeeper, chanKeeper, authKeeper) txModule := transfer.NewIBCModule(*txKeeper) ctx := infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - store := ctx.KVStore(storeKey) errACK := channeltypes.Acknowledgement{ Response: &channeltypes.Acknowledgement_Error{ @@ -94,137 +92,43 @@ func TestHandleAcknowledgement(t *testing.T) { require.NoError(t, err) p.Data = tokenBz - // error during SudoResponse non contract + // non contract ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(false) err = txModule.HandleAcknowledgement(ctx, p, resAckData, relayerAddress) require.NoError(t, err) - require.Empty(t, store.Get(ShouldNotBeWrittenKey)) - require.Equal(t, uint64(0), ctx.GasMeter().GasConsumed()) // error during SudoResponse contract ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - cmKeeper.EXPECT().SudoResponse(gomock.AssignableToTypeOf(ctx), contractAddress, p, resACK.GetResult()).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, msg []byte) { - store := cachedCtx.KVStore(storeKey) - store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) // consumes 2990 - }).Return(nil, fmt.Errorf("SudoResponse error")) - cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 5000}) - cmKeeper.EXPECT().AddContractFailure(ctx, &p, contractAddress.String(), types.Ack, &resACK) cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) + cmKeeper.EXPECT().SudoResponse(ctx, contractAddress, p, resACK).Return(nil, fmt.Errorf("SudoResponse error")) err = txModule.HandleAcknowledgement(ctx, p, resAckData, relayerAddress) - require.NoError(t, err) - require.Empty(t, store.Get(ShouldNotBeWrittenKey)) - require.Equal(t, uint64(2990), ctx.GasMeter().GasConsumed()) - - // error during SudoError non contract - ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(false) - err = txModule.HandleAcknowledgement(ctx, p, errAckData, relayerAddress) - require.NoError(t, err) - require.Empty(t, store.Get(ShouldNotBeWrittenKey)) - require.Equal(t, uint64(0), ctx.GasMeter().GasConsumed()) + require.Error(t, err) // error during SudoError contract ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - cmKeeper.EXPECT().SudoError(gomock.AssignableToTypeOf(ctx), contractAddress, p, errACK.GetError()).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, msg string) { - store := cachedCtx.KVStore(storeKey) - store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) // consumes 2990 - }).Return(nil, fmt.Errorf("SudoError error")) - cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 7000}) - cmKeeper.EXPECT().AddContractFailure(ctx, &p, contractAddress.String(), types.Ack, &errACK) cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) + cmKeeper.EXPECT().SudoError(ctx, contractAddress, p, errACK).Return(nil, fmt.Errorf("SudoError error")) err = txModule.HandleAcknowledgement(ctx, p, errAckData, relayerAddress) - require.NoError(t, err) - require.Empty(t, store.Get(ShouldNotBeWrittenKey)) - require.Equal(t, uint64(2990), ctx.GasMeter().GasConsumed()) + require.Error(t, err) - // success during SudoError non contract + // success during SudoError ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(false) - err = txModule.HandleAcknowledgement(ctx, p, errAckData, relayerAddress) - require.NoError(t, err) - require.Equal(t, uint64(0), ctx.GasMeter().GasConsumed()) - - // success during SudoError contract - ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - cmKeeper.EXPECT().SudoError(gomock.AssignableToTypeOf(ctx), contractAddress, p, errACK.GetError()).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, err string) { - store := cachedCtx.KVStore(storeKey) - store.Set(ShouldBeWrittenKey("sudoerror_contract"), ShouldBeWritten) - }).Return(nil, nil) - cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 9000}) - cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) - feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) - err = txModule.HandleAcknowledgement(ctx, p, errAckData, relayerAddress) - require.NoError(t, err) - require.Equal(t, ShouldBeWritten, store.Get(ShouldBeWrittenKey("sudoerror_contract"))) - require.Equal(t, uint64(3320), ctx.GasMeter().GasConsumed()) - - // recoverable out of gas during SudoError non contract - ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - require.NoError(t, err) - require.Equal(t, uint64(0), ctx.GasMeter().GasConsumed()) - - // recoverable out of gas during SudoError contract - ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - cmKeeper.EXPECT().SudoError(gomock.AssignableToTypeOf(ctx), contractAddress, p, errACK.GetError()).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, error string) { - store := cachedCtx.KVStore(storeKey) - store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) - cachedCtx.GasMeter().ConsumeGas(11001, "out of gas test") - }).Return(nil, fmt.Errorf("SudoError error")) - cmKeeper.EXPECT().AddContractFailure(ctx, &p, contractAddress.String(), types.Ack, &errACK) - cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 11000}) - // FIXME: fix distribution during outofgas cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) + cmKeeper.EXPECT().SudoError(ctx, contractAddress, p, errACK) err = txModule.HandleAcknowledgement(ctx, p, errAckData, relayerAddress) require.NoError(t, err) - require.Empty(t, store.Get(ShouldNotBeWrittenKey)) - require.Equal(t, uint64(11000), ctx.GasMeter().GasConsumed()) - // check we have ReserveGas reserved and - // check gas consumption from cachedCtx has added to the main ctx - // one of the ways to check it - make the check during SudoResponse call - // non contract - ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(false) - err = txModule.HandleAcknowledgement(ctx, p, resAckData, relayerAddress) - require.NoError(t, err) - require.Equal(t, uint64(0), ctx.GasMeter().GasConsumed()) - - // contract + // success during SudoError contract ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - gasReserved := false - cmKeeper.EXPECT().SudoResponse(gomock.AssignableToTypeOf(ctx), contractAddress, p, resACK.GetResult()).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, msg []byte) { - if cachedCtx.GasMeter().Limit() == 13000 { - gasReserved = true - } - store := cachedCtx.KVStore(storeKey) - store.Set(ShouldBeWrittenKey("sudoresponse_contract_success"), ShouldBeWritten) - }).Return(nil, nil) - cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 13000}) cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) + cmKeeper.EXPECT().SudoResponse(ctx, contractAddress, p, resACK) err = txModule.HandleAcknowledgement(ctx, p, resAckData, relayerAddress) require.NoError(t, err) - require.True(t, gasReserved) - require.Equal(t, uint64(3650), ctx.GasMeter().GasConsumed()) - require.Equal(t, ShouldBeWritten, store.Get(ShouldBeWrittenKey("sudoresponse_contract_success"))) - - // not enough gas provided by relayer SudoCallGasLimit - lowGasCtx := infCtx.WithGasMeter(sdk.NewGasMeter(1000)) - cmKeeper.EXPECT().SudoResponse(gomock.AssignableToTypeOf(lowGasCtx), contractAddress, p, resACK.GetResult()).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, msg []byte) { - store := cachedCtx.KVStore(storeKey) - store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) - cachedCtx.GasMeter().ConsumeGas(1001, "out of gas test") - }).Return(nil, nil) - cmKeeper.EXPECT().GetParams(lowGasCtx).Return(types.Params{SudoCallGasLimit: 14000}) - cmKeeper.EXPECT().HasContractInfo(lowGasCtx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) - feeKeeper.EXPECT().DistributeAcknowledgementFee(lowGasCtx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) - require.PanicsWithValue(t, sdk.ErrorOutOfGas{Descriptor: "consume gas from cached context"}, func() { txModule.HandleAcknowledgement(lowGasCtx, p, resAckData, relayerAddress) }) //nolint:errcheck // this is a test - // NOTE: looks its impossible to test store reset after panic, because test `require.PanicsWithValue` recovers the panic - // require.Empty(t, store.Get(ShouldNotBeWrittenKey)) } func TestHandleTimeout(t *testing.T) { @@ -236,10 +140,9 @@ func TestHandleTimeout(t *testing.T) { authKeeper := mock_types.NewMockAccountKeeper(ctrl) // required to initialize keeper authKeeper.EXPECT().GetModuleAddress(transfertypes.ModuleName).Return([]byte("address")) - txKeeper, infCtx, storeKey := testkeeper.TransferKeeper(t, cmKeeper, feeKeeper, chanKeeper, authKeeper) + txKeeper, infCtx, _ := testkeeper.TransferKeeper(t, cmKeeper, feeKeeper, chanKeeper, authKeeper) txModule := transfer.NewIBCModule(*txKeeper) ctx := infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - store := ctx.KVStore(storeKey) contractAddress := sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress) relayerBech32 := "neutron1fxudpred77a0grgh69u0j7y84yks5ev4n5050z45kecz792jnd6scqu98z" relayerAddress := sdk.MustAccAddressFromBech32(relayerBech32) @@ -278,84 +181,21 @@ func TestHandleTimeout(t *testing.T) { ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(false) err = txModule.HandleTimeout(ctx, p, relayerAddress) - require.Equal(t, uint64(0), ctx.GasMeter().GasConsumed()) require.NoError(t, err) // success contract ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - gasReserved := false - cmKeeper.EXPECT().SudoTimeout(gomock.AssignableToTypeOf(ctx), contractAddress, p).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet) { - if cachedCtx.GasMeter().Limit() == 5000 { - gasReserved = true - } - store := cachedCtx.KVStore(storeKey) - store.Set(ShouldBeWrittenKey("sudotimeout_contract_success"), ShouldBeWritten) - }).Return(nil, nil) - cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 5000}) cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) feeKeeper.EXPECT().DistributeTimeoutFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) + cmKeeper.EXPECT().SudoTimeout(ctx, contractAddress, p).Return(nil, nil) err = txModule.HandleTimeout(ctx, p, relayerAddress) - require.True(t, gasReserved) require.NoError(t, err) - require.Equal(t, uint64(3620), ctx.GasMeter().GasConsumed()) - require.Equal(t, ShouldBeWritten, store.Get(ShouldBeWrittenKey("sudotimeout_contract_success"))) - - // error during SudoTimeOut non contract - ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(false) - err = txModule.HandleTimeout(ctx, p, relayerAddress) - require.NoError(t, err) - require.Equal(t, uint64(0), ctx.GasMeter().GasConsumed()) // error during SudoTimeOut contract ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - cmKeeper.EXPECT().SudoTimeout(gomock.AssignableToTypeOf(ctx), contractAddress, p).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet) { - store := cachedCtx.KVStore(storeKey) - store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) - }).Return(nil, fmt.Errorf("SudoTimeout error")) - cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 7000}) - cmKeeper.EXPECT().AddContractFailure(ctx, &p, contractAddress.String(), types.Timeout, nil) - cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) - feeKeeper.EXPECT().DistributeTimeoutFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) - err = txModule.HandleTimeout(ctx, p, relayerAddress) - require.NoError(t, err) - require.Empty(t, store.Get(ShouldNotBeWrittenKey)) - require.Equal(t, uint64(2990), ctx.GasMeter().GasConsumed()) - - // out of gas during SudoTimeOut non contract - ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(false) - err = txModule.HandleTimeout(ctx, p, relayerAddress) - require.NoError(t, err) - require.Equal(t, uint64(0), ctx.GasMeter().GasConsumed()) - - // out of gas during SudoTimeOut contract - ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - cmKeeper.EXPECT().SudoTimeout(gomock.AssignableToTypeOf(ctx), contractAddress, p).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet) { - store := cachedCtx.KVStore(storeKey) - store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) - cachedCtx.GasMeter().ConsumeGas(8001, "out of gas test") - }).Return(nil, fmt.Errorf("SudoTimeout error")) - cmKeeper.EXPECT().AddContractFailure(ctx, &p, contractAddress.String(), types.Timeout, nil) - cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 8000}) cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) feeKeeper.EXPECT().DistributeTimeoutFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) + cmKeeper.EXPECT().SudoTimeout(ctx, contractAddress, p).Return(nil, fmt.Errorf("SudoTimeout error")) err = txModule.HandleTimeout(ctx, p, relayerAddress) - require.NoError(t, err) - require.Empty(t, store.Get(ShouldNotBeWrittenKey)) - require.Equal(t, uint64(8000), ctx.GasMeter().GasConsumed()) - - // not enough gas provided by relayer for SudoCallGasLimit - lowGasCtx := infCtx.WithGasMeter(sdk.NewGasMeter(1000)) - cmKeeper.EXPECT().SudoTimeout(gomock.AssignableToTypeOf(lowGasCtx), contractAddress, p).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet) { - store := cachedCtx.KVStore(storeKey) - store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) - cachedCtx.GasMeter().ConsumeGas(1001, "out of gas test") - }).Return(nil, nil) - cmKeeper.EXPECT().GetParams(lowGasCtx).Return(types.Params{SudoCallGasLimit: 14000}) - cmKeeper.EXPECT().HasContractInfo(lowGasCtx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) - feeKeeper.EXPECT().DistributeTimeoutFee(lowGasCtx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) - require.PanicsWithValue(t, sdk.ErrorOutOfGas{Descriptor: "consume gas from cached context"}, func() { txModule.HandleTimeout(lowGasCtx, p, relayerAddress) }) //nolint:errcheck // this is a test - // NOTE: looks its impossible to test store reset after panic, because test `require.PanicsWithValue` recovers the panic - // require.Empty(t, store.Get(ShouldNotBeWrittenKey)) + require.Error(t, err) } diff --git a/x/transfer/types/expected_keepers.go b/x/transfer/types/expected_keepers.go index af269e1d8..774daf841 100644 --- a/x/transfer/types/expected_keepers.go +++ b/x/transfer/types/expected_keepers.go @@ -4,19 +4,15 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/auth/types" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" - contractmanagertypes "github.com/neutron-org/neutron/x/contractmanager/types" - feerefundertypes "github.com/neutron-org/neutron/x/feerefunder/types" ) // ContractManagerKeeper defines the expected interface needed to add ack information about sudo failure. type ContractManagerKeeper interface { HasContractInfo(ctx sdk.Context, contractAddress sdk.AccAddress) bool - AddContractFailure(ctx sdk.Context, packet *channeltypes.Packet, address, ackType string, ack *channeltypes.Acknowledgement) - SudoResponse(ctx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, msg []byte) ([]byte, error) - SudoError(ctx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, details string) ([]byte, error) + SudoResponse(ctx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, ack channeltypes.Acknowledgement) ([]byte, error) + SudoError(ctx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, ack channeltypes.Acknowledgement) ([]byte, error) SudoTimeout(ctx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet) ([]byte, error) - GetParams(ctx sdk.Context) (params contractmanagertypes.Params) } type FeeRefunderKeeper interface { From 6d36314d8237c4bf28ebf097f567dd867f6a613c Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Fri, 8 Sep 2023 12:56:49 +0400 Subject: [PATCH 105/307] upd keeper, whitelist msgs --- app/proposals_allowlisting.go | 16 +++++++++++++++- wasmbinding/bindings/msg.go | 2 +- x/tokenfactory/keeper/keeper.go | 2 +- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/app/proposals_allowlisting.go b/app/proposals_allowlisting.go index 20d54b4bd..a5853cf30 100644 --- a/app/proposals_allowlisting.go +++ b/app/proposals_allowlisting.go @@ -11,6 +11,13 @@ import ( icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types" ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" + contractmanagertypes "github.com/neutron-org/neutron/x/contractmanager/types" + crontypes "github.com/neutron-org/neutron/x/cron/types" + feeburnertypes "github.com/neutron-org/neutron/x/feeburner/types" + feerefundertypes "github.com/neutron-org/neutron/x/feerefunder/types" + interchainqueriestypes "github.com/neutron-org/neutron/x/interchainqueries/types" + interchaintxstypes "github.com/neutron-org/neutron/x/interchaintxs/types" + tokenfactorytypes "github.com/neutron-org/neutron/x/tokenfactory/types" ) func IsConsumerProposalAllowlisted(content govtypes.Content) bool { @@ -46,7 +53,14 @@ func isSdkMessageWhitelisted(msg sdk.Msg) bool { *wasmtypes.MsgPinCodes, *wasmtypes.MsgUnpinCodes, *upgradetypes.MsgSoftwareUpgrade, - *upgradetypes.MsgCancelUpgrade: + *upgradetypes.MsgCancelUpgrade, + *tokenfactorytypes.MsgUpdateParams, + *interchainqueriestypes.MsgUpdateParams, + *interchaintxstypes.MsgUpdateParams, + *feeburnertypes.MsgUpdateParams, + *feerefundertypes.MsgUpdateParams, + *crontypes.MsgUpdateParams, + *contractmanagertypes.MsgUpdateParams: return true } return false diff --git a/wasmbinding/bindings/msg.go b/wasmbinding/bindings/msg.go index dc9096b6e..d4b3cb7cc 100644 --- a/wasmbinding/bindings/msg.go +++ b/wasmbinding/bindings/msg.go @@ -182,7 +182,7 @@ type BurnTokens struct { type SetBeforeSend struct { Denom string `json:"denom"` - CosmWasmAddr string `json:"mint_to_address"` + CosmWasmAddr string `json:"cosm_wasm_addr"` } // AddSchedule adds new schedule to the cron module diff --git a/x/tokenfactory/keeper/keeper.go b/x/tokenfactory/keeper/keeper.go index 36f3c53f6..9f4641cd6 100644 --- a/x/tokenfactory/keeper/keeper.go +++ b/x/tokenfactory/keeper/keeper.go @@ -46,7 +46,7 @@ func (k Keeper) Logger(ctx sdk.Context) log.Logger { return ctx.Logger().With("module", fmt.Sprintf("x/%s", types.ModuleName)) } -// Logger returns a logger for the x/tokenfactory module +// GetAuthority returns an authority for the x/tokenfactory module func (k Keeper) GetAuthority() string { return k.authority } From b332e03e84bac0d36e14f235537850a255f5ae2e Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Fri, 8 Sep 2023 17:26:50 +0400 Subject: [PATCH 106/307] rewrite proto, fix authorities & queries --- app/app.go | 4 +- .../osmosis/tokenfactory/v1beta1/query.proto | 10 +- wasmbinding/bindings/msg.go | 6 +- wasmbinding/bindings/query.go | 10 + wasmbinding/custom_querier.go | 13 + wasmbinding/message_plugin.go | 14 +- wasmbinding/queries.go | 7 + x/tokenfactory/client/cli/query.go | 4 +- x/tokenfactory/keeper/grpc_query.go | 7 +- x/tokenfactory/types/query.pb.go | 227 +++++++++++++----- x/tokenfactory/types/query.pb.gw.go | 80 ++++-- 11 files changed, 282 insertions(+), 100 deletions(-) diff --git a/app/app.go b/app/app.go index 12b69aea4..8e1b61e75 100644 --- a/app/app.go +++ b/app/app.go @@ -629,7 +629,7 @@ func New( app.ContractManagerKeeper, interchainqueriesmodulekeeper.Verifier{}, interchainqueriesmodulekeeper.TransactionVerifier{}, - authtypes.NewModuleAddress(govtypes.ModuleName).String(), + authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String(), ) app.InterchainTxsKeeper = *interchaintxskeeper.NewKeeper( appCodec, @@ -639,7 +639,7 @@ func New( app.ICAControllerKeeper, app.ContractManagerKeeper, app.FeeKeeper, - authtypes.NewModuleAddress(govtypes.ModuleName).String(), + authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String(), ) app.CronKeeper = *cronkeeper.NewKeeper(appCodec, keys[crontypes.StoreKey], keys[crontypes.MemStoreKey], app.AccountKeeper, authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String()) diff --git a/proto/osmosis/tokenfactory/v1beta1/query.proto b/proto/osmosis/tokenfactory/v1beta1/query.proto index 4254767a7..09864e8a1 100644 --- a/proto/osmosis/tokenfactory/v1beta1/query.proto +++ b/proto/osmosis/tokenfactory/v1beta1/query.proto @@ -21,7 +21,7 @@ service Query { rpc DenomAuthorityMetadata(QueryDenomAuthorityMetadataRequest) returns (QueryDenomAuthorityMetadataResponse) { option (google.api.http).get = - "/osmosis/tokenfactory/v1beta1/denoms/{denom}/authority_metadata"; + "/osmosis/tokenfactory/v1beta1/denoms/factory/{creator}/{subdenom}/authority_metadata"; } // DenomsFromCreator defines a gRPC query method for fetching all @@ -37,7 +37,7 @@ service Query { rpc BeforeSendHookAddress(QueryBeforeSendHookAddressRequest) returns (QueryBeforeSendHookAddressResponse) { option (google.api.http).get = - "/osmosis/tokenfactory/v1beta1/denoms/{denom}/before_send_hook"; + "/osmosis/tokenfactory/v1beta1/denoms/factory/{creator}/{subdenom}/before_send_hook"; } } @@ -53,7 +53,8 @@ message QueryParamsResponse { // QueryDenomAuthorityMetadataRequest defines the request structure for the // DenomAuthorityMetadata gRPC query. message QueryDenomAuthorityMetadataRequest { - string denom = 1 [ (gogoproto.moretags) = "yaml:\"denom\"" ]; + string creator = 1 [ (gogoproto.moretags) = "yaml:\"creator\"" ]; + string subdenom = 2 [ (gogoproto.moretags) = "yaml:\"subdenom\"" ]; } // QueryDenomAuthorityMetadataResponse defines the response structure for the @@ -78,7 +79,8 @@ message QueryDenomsFromCreatorResponse { } message QueryBeforeSendHookAddressRequest { - string denom = 1 [ (gogoproto.moretags) = "yaml:\"denom\"" ]; + string creator = 1 [ (gogoproto.moretags) = "yaml:\"creator\"" ]; + string subdenom = 2 [ (gogoproto.moretags) = "yaml:\"subdenom\"" ]; } // QueryBeforeSendHookAddressResponse defines the response structure for the diff --git a/wasmbinding/bindings/msg.go b/wasmbinding/bindings/msg.go index d4b3cb7cc..dfd1e1529 100644 --- a/wasmbinding/bindings/msg.go +++ b/wasmbinding/bindings/msg.go @@ -41,8 +41,8 @@ type NeutronMsg struct { /// Contracts can burn native tokens for an existing factory denom /// that they are the admin of. /// Currently, the burn from address must be the admin contract. - BurnTokens *BurnTokens `json:"burn_tokens,omitempty"` - SetBeforeSend *SetBeforeSend `json:"set_before_send,omitempty"` + BurnTokens *BurnTokens `json:"burn_tokens,omitempty"` + SetBeforeSendHook *SetBeforeSendHook `json:"set_before_send_hook,omitempty"` // Cron types AddSchedule *AddSchedule `json:"add_schedule,omitempty"` @@ -180,7 +180,7 @@ type BurnTokens struct { BurnFromAddress string `json:"burn_from_address"` } -type SetBeforeSend struct { +type SetBeforeSendHook struct { Denom string `json:"denom"` CosmWasmAddr string `json:"cosm_wasm_addr"` } diff --git a/wasmbinding/bindings/query.go b/wasmbinding/bindings/query.go index 0d76a9ac2..b9e0438f7 100644 --- a/wasmbinding/bindings/query.go +++ b/wasmbinding/bindings/query.go @@ -34,6 +34,8 @@ type NeutronQuery struct { FullDenom *FullDenom `json:"full_denom,omitempty"` // Returns the admin of a denom, if the denom is a Token Factory denom. DenomAdmin *DenomAdmin `json:"denom_admin,omitempty"` + // + BeforeSendHook *BeforeSendHook `json:"before_send_hook,omitempty"` // Contractmanager queries // Query all failures for address Failures *Failures `json:"failures,omitempty"` @@ -183,6 +185,14 @@ type DenomAdmin struct { Subdenom string `json:"subdenom"` } +type BeforeSendHook struct { + Denom string `json:"denom"` +} + +type BeforeSendHookResponse struct { + CosmWasmAddr string `json:"cosm_wasm_addr"` +} + type DenomAdminResponse struct { Admin string `json:"admin"` } diff --git a/wasmbinding/custom_querier.go b/wasmbinding/custom_querier.go index 385ab69e8..36d0d6c63 100644 --- a/wasmbinding/custom_querier.go +++ b/wasmbinding/custom_querier.go @@ -128,6 +128,19 @@ func CustomQuerier(qp *QueryPlugin) func(ctx sdk.Context, request json.RawMessag return bz, nil + case contractQuery.BeforeSendHook != nil: + res, err := qp.GetBeforeSendHook(ctx, contractQuery.BeforeSendHook.Denom) + if err != nil { + return nil, errors.Wrap(err, "unable to get denom before send hook") + } + + bz, err := json.Marshal(res) + if err != nil { + return nil, errors.Wrap(err, "failed to JSON marshal BeforeSendHookResponse response") + } + + return bz, nil + case contractQuery.Failures != nil: res, err := qp.GetFailures(ctx, contractQuery.Failures.Address, contractQuery.Failures.Pagination) if err != nil { diff --git a/wasmbinding/message_plugin.go b/wasmbinding/message_plugin.go index 68d7b5670..c11ae3931 100644 --- a/wasmbinding/message_plugin.go +++ b/wasmbinding/message_plugin.go @@ -121,8 +121,8 @@ func (m *CustomMessenger) DispatchMsg(ctx sdk.Context, contractAddr sdk.AccAddre if contractMsg.MintTokens != nil { return m.mintTokens(ctx, contractAddr, contractMsg.MintTokens) } - if contractMsg.SetBeforeSend != nil { - return m.setBeforeSend(ctx, contractAddr, contractMsg.SetBeforeSend) + if contractMsg.SetBeforeSendHook != nil { + return m.setBeforeSendHook(ctx, contractAddr, contractMsg.SetBeforeSendHook) } if contractMsg.ChangeAdmin != nil { return m.changeAdmin(ctx, contractAddr, contractMsg.ChangeAdmin) @@ -499,10 +499,10 @@ func (m *CustomMessenger) mintTokens(ctx sdk.Context, contractAddr sdk.AccAddres } // mintTokens mints tokens of a specified denom to an address. -func (m *CustomMessenger) setBeforeSend(ctx sdk.Context, contractAddr sdk.AccAddress, set *bindings.SetBeforeSend) ([]sdk.Event, [][]byte, error) { - err := PerformSetBeforeSend(m.TokenFactory, ctx, contractAddr, set) +func (m *CustomMessenger) setBeforeSendHook(ctx sdk.Context, contractAddr sdk.AccAddress, set *bindings.SetBeforeSendHook) ([]sdk.Event, [][]byte, error) { + err := PerformSetBeforeSendHook(m.TokenFactory, ctx, contractAddr, set) if err != nil { - return nil, nil, errors.Wrap(err, "perform mint") + return nil, nil, errors.Wrap(err, "perform set before send hook") } return nil, nil, nil } @@ -535,13 +535,13 @@ func PerformMint(f *tokenfactorykeeper.Keeper, b *bankkeeper.BaseKeeper, ctx sdk return nil } -func PerformSetBeforeSend(f *tokenfactorykeeper.Keeper, ctx sdk.Context, contractAddr sdk.AccAddress, set *bindings.SetBeforeSend) error { +func PerformSetBeforeSendHook(f *tokenfactorykeeper.Keeper, ctx sdk.Context, contractAddr sdk.AccAddress, set *bindings.SetBeforeSendHook) error { sdkMsg := tokenfactorytypes.NewMsgSetBeforeSendHook(contractAddr.String(), set.Denom, set.CosmWasmAddr) if err := sdkMsg.ValidateBasic(); err != nil { return err } - // SetBeforeSend through token factory / message server + // SetBeforeSendHook through token factory / message server msgServer := tokenfactorykeeper.NewMsgServerImpl(*f) _, err := msgServer.SetBeforeSendHook(sdk.WrapSDKContext(ctx), sdkMsg) if err != nil { diff --git a/wasmbinding/queries.go b/wasmbinding/queries.go index ef5930b0d..1d3cf42c6 100644 --- a/wasmbinding/queries.go +++ b/wasmbinding/queries.go @@ -95,6 +95,13 @@ func (qp QueryPlugin) GetDenomAdmin(ctx sdk.Context, denom string) (*bindings.De return &bindings.DenomAdminResponse{Admin: metadata.Admin}, nil } +// GetBeforeSendHook is a query to get denom before send hook. +func (qp QueryPlugin) GetBeforeSendHook(ctx sdk.Context, denom string) (*bindings.BeforeSendHookResponse, error) { + cosmWasmAddr := qp.tokenFactoryKeeper.GetBeforeSendHook(ctx, denom) + + return &bindings.BeforeSendHookResponse{CosmWasmAddr: cosmWasmAddr}, nil +} + func (qp *QueryPlugin) GetTotalBurnedNeutronsAmount(ctx sdk.Context, _ *bindings.QueryTotalBurnedNeutronsAmountRequest) (*bindings.QueryTotalBurnedNeutronsAmountResponse, error) { grpcResp := qp.feeBurnerKeeper.GetTotalBurnedNeutronsAmount(ctx) return &bindings.QueryTotalBurnedNeutronsAmountResponse{Coin: grpcResp.Coin}, nil diff --git a/x/tokenfactory/client/cli/query.go b/x/tokenfactory/client/cli/query.go index 11e4dc944..425bf783d 100644 --- a/x/tokenfactory/client/cli/query.go +++ b/x/tokenfactory/client/cli/query.go @@ -84,7 +84,7 @@ func GetCmdDenomAuthorityMetadata() *cobra.Command { } res, err := queryClient.DenomAuthorityMetadata(cmd.Context(), &types.QueryDenomAuthorityMetadataRequest{ - Denom: args[0], + Subdenom: args[0], }) if err != nil { return err @@ -113,7 +113,7 @@ func GetCmdDenomsFromCreator() *cobra.Command { queryClient := types.NewQueryClient(clientCtx) res, err := queryClient.BeforeSendHookAddress(cmd.Context(), &types.QueryBeforeSendHookAddressRequest{ - Denom: args[0], + Subdenom: args[0], }) if err != nil { return err diff --git a/x/tokenfactory/keeper/grpc_query.go b/x/tokenfactory/keeper/grpc_query.go index ea2ad259c..59c62a1e4 100644 --- a/x/tokenfactory/keeper/grpc_query.go +++ b/x/tokenfactory/keeper/grpc_query.go @@ -2,6 +2,7 @@ package keeper import ( "context" + "fmt" sdk "github.com/cosmos/cosmos-sdk/types" @@ -20,7 +21,8 @@ func (k Keeper) Params(ctx context.Context, req *types.QueryParamsRequest) (*typ func (k Keeper) DenomAuthorityMetadata(ctx context.Context, req *types.QueryDenomAuthorityMetadataRequest) (*types.QueryDenomAuthorityMetadataResponse, error) { sdkCtx := sdk.UnwrapSDKContext(ctx) - authorityMetadata, err := k.GetAuthorityMetadata(sdkCtx, req.GetDenom()) + denom := fmt.Sprintf("factory/%s/%s", req.GetCreator(), req.GetSubdenom()) + authorityMetadata, err := k.GetAuthorityMetadata(sdkCtx, denom) if err != nil { return nil, err } @@ -37,7 +39,8 @@ func (k Keeper) DenomsFromCreator(ctx context.Context, req *types.QueryDenomsFro func (k Keeper) BeforeSendHookAddress(ctx context.Context, req *types.QueryBeforeSendHookAddressRequest) (*types.QueryBeforeSendHookAddressResponse, error) { sdkCtx := sdk.UnwrapSDKContext(ctx) - cosmwasmAddress := k.GetBeforeSendHook(sdkCtx, req.GetDenom()) + denom := fmt.Sprintf("factory/%s/%s", req.GetCreator(), req.GetSubdenom()) + cosmwasmAddress := k.GetBeforeSendHook(sdkCtx, denom) return &types.QueryBeforeSendHookAddressResponse{CosmwasmAddress: cosmwasmAddress}, nil } diff --git a/x/tokenfactory/types/query.pb.go b/x/tokenfactory/types/query.pb.go index 126c06e8b..1d06ab5fd 100644 --- a/x/tokenfactory/types/query.pb.go +++ b/x/tokenfactory/types/query.pb.go @@ -115,7 +115,8 @@ func (m *QueryParamsResponse) GetParams() Params { // QueryDenomAuthorityMetadataRequest defines the request structure for the // DenomAuthorityMetadata gRPC query. type QueryDenomAuthorityMetadataRequest struct { - Denom string `protobuf:"bytes,1,opt,name=denom,proto3" json:"denom,omitempty" yaml:"denom"` + Creator string `protobuf:"bytes,1,opt,name=creator,proto3" json:"creator,omitempty" yaml:"creator"` + Subdenom string `protobuf:"bytes,2,opt,name=subdenom,proto3" json:"subdenom,omitempty" yaml:"subdenom"` } func (m *QueryDenomAuthorityMetadataRequest) Reset() { *m = QueryDenomAuthorityMetadataRequest{} } @@ -151,9 +152,16 @@ func (m *QueryDenomAuthorityMetadataRequest) XXX_DiscardUnknown() { var xxx_messageInfo_QueryDenomAuthorityMetadataRequest proto.InternalMessageInfo -func (m *QueryDenomAuthorityMetadataRequest) GetDenom() string { +func (m *QueryDenomAuthorityMetadataRequest) GetCreator() string { if m != nil { - return m.Denom + return m.Creator + } + return "" +} + +func (m *QueryDenomAuthorityMetadataRequest) GetSubdenom() string { + if m != nil { + return m.Subdenom } return "" } @@ -297,7 +305,8 @@ func (m *QueryDenomsFromCreatorResponse) GetDenoms() []string { } type QueryBeforeSendHookAddressRequest struct { - Denom string `protobuf:"bytes,1,opt,name=denom,proto3" json:"denom,omitempty" yaml:"denom"` + Creator string `protobuf:"bytes,1,opt,name=creator,proto3" json:"creator,omitempty" yaml:"creator"` + Subdenom string `protobuf:"bytes,2,opt,name=subdenom,proto3" json:"subdenom,omitempty" yaml:"subdenom"` } func (m *QueryBeforeSendHookAddressRequest) Reset() { *m = QueryBeforeSendHookAddressRequest{} } @@ -333,9 +342,16 @@ func (m *QueryBeforeSendHookAddressRequest) XXX_DiscardUnknown() { var xxx_messageInfo_QueryBeforeSendHookAddressRequest proto.InternalMessageInfo -func (m *QueryBeforeSendHookAddressRequest) GetDenom() string { +func (m *QueryBeforeSendHookAddressRequest) GetCreator() string { + if m != nil { + return m.Creator + } + return "" +} + +func (m *QueryBeforeSendHookAddressRequest) GetSubdenom() string { if m != nil { - return m.Denom + return m.Subdenom } return "" } @@ -402,48 +418,49 @@ func init() { } var fileDescriptor_6f22013ad0f72e3f = []byte{ - // 653 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x95, 0x4d, 0x4f, 0x53, 0x4d, - 0x14, 0xc7, 0x7b, 0x9f, 0x47, 0x6a, 0x18, 0xdf, 0x60, 0xc4, 0xb7, 0x8a, 0xb7, 0x32, 0x12, 0x02, - 0x09, 0x76, 0xe4, 0x65, 0x25, 0x12, 0xe8, 0x45, 0xd1, 0x04, 0x49, 0xf4, 0xba, 0xd2, 0x4d, 0x33, - 0x6d, 0x87, 0xd2, 0xc0, 0xbd, 0xa7, 0xcc, 0x4c, 0xd5, 0x86, 0xb0, 0x71, 0xe1, 0xda, 0xc4, 0xa5, - 0xdf, 0xc1, 0xcf, 0xc1, 0x92, 0x84, 0x8d, 0xab, 0x46, 0xc1, 0xf8, 0x01, 0xfa, 0x09, 0x4c, 0xe7, - 0x9e, 0x2a, 0xd0, 0x72, 0xd3, 0xe2, 0xaa, 0x37, 0xe7, 0xe5, 0x7f, 0xce, 0x6f, 0xce, 0x39, 0x29, - 0x19, 0x07, 0x1d, 0x80, 0x2e, 0x6b, 0x6e, 0x60, 0x43, 0x86, 0x6b, 0xa2, 0x60, 0x40, 0xd5, 0xf8, - 0xdb, 0xa9, 0xbc, 0x34, 0x62, 0x8a, 0x6f, 0x55, 0xa5, 0xaa, 0x65, 0x2a, 0x0a, 0x0c, 0xd0, 0x61, - 0x8c, 0xcc, 0x1c, 0x8d, 0xcc, 0x60, 0x64, 0x6a, 0xa8, 0x04, 0x25, 0xb0, 0x81, 0xbc, 0xf9, 0x15, - 0xe5, 0xa4, 0x86, 0x4b, 0x00, 0xa5, 0x4d, 0xc9, 0x45, 0xa5, 0xcc, 0x45, 0x18, 0x82, 0x11, 0xa6, - 0x0c, 0xa1, 0x46, 0xef, 0x6c, 0x6c, 0x6d, 0x51, 0x35, 0xeb, 0xa0, 0xca, 0xa6, 0xb6, 0x2a, 0x8d, - 0x28, 0x0a, 0x23, 0x30, 0x6b, 0x22, 0x36, 0xab, 0x22, 0x94, 0x08, 0xb0, 0x00, 0x1b, 0x22, 0xf4, - 0x65, 0x93, 0xe0, 0x85, 0x35, 0xfa, 0x72, 0xab, 0x2a, 0xb5, 0x61, 0xaf, 0xc9, 0xd5, 0x63, 0x56, - 0x5d, 0x81, 0x50, 0x4b, 0xea, 0x91, 0x64, 0x94, 0x7c, 0xd3, 0xb9, 0xeb, 0x8c, 0x5f, 0x98, 0x1e, - 0xcd, 0xc4, 0x01, 0x67, 0xa2, 0x6c, 0xef, 0xdc, 0x6e, 0x3d, 0x9d, 0xf0, 0x31, 0x93, 0x3d, 0x27, - 0xcc, 0x4a, 0x3f, 0x96, 0x21, 0x04, 0xd9, 0x93, 0x00, 0xd8, 0x00, 0x1d, 0x23, 0x7d, 0xc5, 0x66, - 0x80, 0x2d, 0xd4, 0xef, 0x0d, 0x34, 0xea, 0xe9, 0x8b, 0x35, 0x11, 0x6c, 0x3e, 0x64, 0xd6, 0xcc, - 0xfc, 0xc8, 0xcd, 0xbe, 0x3a, 0xe4, 0x5e, 0xac, 0x1c, 0x76, 0xfe, 0xd1, 0x21, 0xf4, 0xcf, 0x6b, - 0xe5, 0x02, 0x74, 0x23, 0xc6, 0x6c, 0x3c, 0x46, 0x67, 0x69, 0x6f, 0xa4, 0x89, 0xd5, 0xa8, 0xa7, - 0x6f, 0x45, 0x7d, 0xb5, 0xab, 0x33, 0x7f, 0xb0, 0x6d, 0x40, 0x6c, 0x95, 0xdc, 0xf9, 0xdb, 0xaf, - 0x5e, 0x56, 0x10, 0x2c, 0x29, 0x29, 0x0c, 0xa8, 0x16, 0xf9, 0x24, 0x39, 0x5f, 0x88, 0x2c, 0xc8, - 0x4e, 0x1b, 0xf5, 0xf4, 0xe5, 0xa8, 0x06, 0x3a, 0x98, 0xdf, 0x0a, 0x61, 0x2b, 0xc4, 0x3d, 0x4d, - 0x0e, 0xc9, 0x27, 0x48, 0xd2, 0x3e, 0x55, 0x73, 0x66, 0xff, 0x8f, 0xf7, 0x7b, 0x83, 0x8d, 0x7a, - 0xfa, 0xd2, 0x91, 0xa7, 0xd4, 0xcc, 0xc7, 0x00, 0xb6, 0x42, 0x46, 0xac, 0x98, 0x27, 0xd7, 0x40, - 0xc9, 0x57, 0x32, 0x2c, 0x3e, 0x03, 0xd8, 0xc8, 0x16, 0x8b, 0x4a, 0x6a, 0xdd, 0xeb, 0x64, 0x36, - 0x71, 0xce, 0xa7, 0x88, 0x61, 0x77, 0xcb, 0x64, 0xa0, 0x00, 0x3a, 0x78, 0x27, 0x74, 0x90, 0x13, - 0x91, 0x0f, 0x85, 0x6f, 0x37, 0xea, 0xe9, 0x1b, 0x88, 0x7d, 0x22, 0x82, 0xf9, 0x57, 0x5a, 0x26, - 0xd4, 0x9b, 0xde, 0x4d, 0x92, 0x3e, 0x5b, 0x8e, 0x7e, 0x71, 0x48, 0x32, 0x5a, 0x3c, 0xfa, 0x20, - 0x7e, 0xae, 0xed, 0x7b, 0x9f, 0x9a, 0xea, 0x21, 0x23, 0x22, 0x60, 0x93, 0x1f, 0xf6, 0x7f, 0x7e, - 0xfe, 0x6f, 0x8c, 0x8e, 0xf2, 0x2e, 0x8e, 0x8e, 0xfe, 0x72, 0xc8, 0xf5, 0xce, 0xfb, 0x44, 0x17, - 0xbb, 0xa8, 0x1d, 0x7b, 0x34, 0xa9, 0xec, 0x3f, 0x28, 0x20, 0xcd, 0x53, 0x4b, 0x93, 0xa5, 0x0b, - 0xf1, 0x34, 0xd1, 0xc2, 0xf0, 0x6d, 0xfb, 0xbb, 0xc3, 0xdb, 0x77, 0x9f, 0xee, 0x3b, 0x64, 0xb0, - 0x6d, 0x29, 0xe9, 0x5c, 0xb7, 0x1d, 0x76, 0xb8, 0x8c, 0xd4, 0xa3, 0xb3, 0x25, 0x23, 0xd9, 0x92, - 0x25, 0x9b, 0xa7, 0x73, 0xdd, 0x90, 0xe5, 0xd6, 0x14, 0x04, 0x39, 0x3c, 0x32, 0xbe, 0x8d, 0x1f, - 0x3b, 0xf4, 0x87, 0x43, 0xae, 0x75, 0x5c, 0x68, 0xba, 0xd0, 0x45, 0x73, 0x71, 0x77, 0x95, 0x5a, - 0x3c, 0xbb, 0x00, 0x12, 0x3e, 0xb1, 0x84, 0x0b, 0x74, 0xbe, 0xa7, 0xd9, 0xe5, 0xad, 0x66, 0x4e, - 0xcb, 0xb0, 0x98, 0x5b, 0x07, 0xd8, 0xf0, 0x56, 0x77, 0x0f, 0x5c, 0x67, 0xef, 0xc0, 0x75, 0xbe, - 0x1f, 0xb8, 0xce, 0xa7, 0x43, 0x37, 0xb1, 0x77, 0xe8, 0x26, 0xbe, 0x1d, 0xba, 0x89, 0x37, 0x33, - 0xa5, 0xb2, 0x59, 0xaf, 0xe6, 0x33, 0x05, 0x08, 0x78, 0x28, 0xab, 0x46, 0x41, 0x78, 0x1f, 0x54, - 0xa9, 0xf5, 0xcd, 0xdf, 0x1f, 0x2f, 0x68, 0x6a, 0x15, 0xa9, 0xf3, 0x49, 0xfb, 0x3f, 0x33, 0xf3, - 0x3b, 0x00, 0x00, 0xff, 0xff, 0x7f, 0x1b, 0x6a, 0xf2, 0x46, 0x07, 0x00, 0x00, + // 671 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x95, 0x4f, 0x4f, 0x53, 0x4d, + 0x14, 0xc6, 0x3b, 0xbc, 0xaf, 0x55, 0xc6, 0x28, 0x32, 0xa0, 0x62, 0xc5, 0x5b, 0x19, 0x89, 0x81, + 0x04, 0x3b, 0xf2, 0x67, 0x25, 0x1a, 0xe1, 0x62, 0x88, 0x89, 0x21, 0xd1, 0x2b, 0x31, 0x91, 0x98, + 0x34, 0xd3, 0x76, 0x28, 0x0d, 0xdc, 0x7b, 0xca, 0xcc, 0x54, 0x6d, 0x08, 0x1b, 0x4c, 0x5c, 0x9b, + 0xb8, 0xf4, 0x3b, 0xf8, 0x39, 0x58, 0x92, 0xb0, 0x71, 0xd5, 0x18, 0xf0, 0x13, 0x74, 0xe1, 0xc6, + 0x8d, 0xe9, 0xcc, 0x14, 0x84, 0x96, 0x9b, 0x0a, 0x89, 0xbb, 0x9b, 0x99, 0x73, 0x9e, 0xf3, 0xfc, + 0xe6, 0x9c, 0x93, 0x8b, 0x47, 0x40, 0x85, 0xa0, 0x4a, 0x8a, 0x69, 0x58, 0x15, 0xd1, 0x32, 0xcf, + 0x6b, 0x90, 0x55, 0xf6, 0x76, 0x3c, 0x27, 0x34, 0x1f, 0x67, 0xeb, 0x15, 0x21, 0xab, 0x99, 0xb2, + 0x04, 0x0d, 0x64, 0xd0, 0x45, 0x66, 0xfe, 0x8c, 0xcc, 0xb8, 0xc8, 0x54, 0x7f, 0x11, 0x8a, 0x60, + 0x02, 0x59, 0xe3, 0xcb, 0xe6, 0xa4, 0x06, 0x8b, 0x00, 0xc5, 0x35, 0xc1, 0x78, 0xb9, 0xc4, 0x78, + 0x14, 0x81, 0xe6, 0xba, 0x04, 0x91, 0x72, 0xb7, 0x53, 0xb1, 0xb5, 0x79, 0x45, 0xaf, 0x80, 0x2c, + 0xe9, 0xea, 0x82, 0xd0, 0xbc, 0xc0, 0x35, 0x77, 0x59, 0xa3, 0xb1, 0x59, 0x65, 0x2e, 0x79, 0xe8, + 0x0a, 0xd0, 0x7e, 0x4c, 0x5e, 0x34, 0x08, 0x9e, 0x9b, 0xc3, 0x40, 0xac, 0x57, 0x84, 0xd2, 0xf4, + 0x35, 0xee, 0x3b, 0x72, 0xaa, 0xca, 0x10, 0x29, 0x41, 0x7c, 0x9c, 0xb4, 0xc9, 0x03, 0xe8, 0x36, + 0x1a, 0xb9, 0x38, 0x31, 0x9c, 0x89, 0x03, 0xce, 0xd8, 0x6c, 0xff, 0xff, 0xed, 0x5a, 0x3a, 0x11, + 0xb8, 0x4c, 0xfa, 0x01, 0x61, 0x6a, 0xb4, 0x9f, 0x88, 0x08, 0xc2, 0xd9, 0xe3, 0x04, 0xce, 0x01, + 0x19, 0xc3, 0xe7, 0xf3, 0x52, 0x70, 0x0d, 0xd2, 0xd4, 0xea, 0xf6, 0x49, 0xbd, 0x96, 0xbe, 0x5c, + 0xe5, 0xe1, 0xda, 0x03, 0xea, 0x2e, 0x68, 0xd0, 0x0c, 0x21, 0x0c, 0x5f, 0x50, 0x95, 0x5c, 0xa1, + 0xa1, 0x38, 0xd0, 0x65, 0xc2, 0xfb, 0xea, 0xb5, 0x74, 0x8f, 0x0d, 0x6f, 0xde, 0xd0, 0xe0, 0x20, + 0x88, 0x7e, 0x45, 0xf8, 0x4e, 0xac, 0x0b, 0x47, 0xfc, 0x11, 0x61, 0x72, 0xf0, 0xca, 0xd9, 0xd0, + 0x5d, 0x3b, 0xfc, 0xa9, 0x78, 0xfc, 0xf6, 0xd2, 0xfe, 0x50, 0xe3, 0x39, 0xea, 0xb5, 0xf4, 0x0d, + 0xeb, 0xae, 0x55, 0x9d, 0x06, 0xbd, 0x2d, 0x8d, 0xa5, 0x0b, 0xf8, 0xd6, 0xa1, 0x5f, 0x35, 0x2f, + 0x21, 0x9c, 0xb3, 0xec, 0xa7, 0x7a, 0x30, 0xfa, 0x0c, 0x7b, 0x27, 0xc9, 0x39, 0xf2, 0x51, 0x9c, + 0x34, 0x4f, 0xd5, 0xe8, 0xf5, 0x7f, 0x23, 0xdd, 0x7e, 0x6f, 0xbd, 0x96, 0xbe, 0x64, 0xe5, 0xec, + 0x39, 0x0d, 0x5c, 0x00, 0xdd, 0x42, 0x78, 0xc8, 0xa8, 0xf9, 0x62, 0x19, 0xa4, 0x78, 0x29, 0xa2, + 0xc2, 0x53, 0x80, 0xd5, 0xd9, 0x42, 0x41, 0x0a, 0xa5, 0xfe, 0x51, 0x47, 0xd7, 0xdc, 0x58, 0x9d, + 0xe0, 0xc1, 0x51, 0xcd, 0xe3, 0x2b, 0x79, 0x50, 0xe1, 0x3b, 0xae, 0xc2, 0x2c, 0xb7, 0x77, 0xce, + 0xcd, 0xcd, 0x7a, 0x2d, 0x7d, 0xdd, 0xb9, 0x39, 0x16, 0x41, 0x83, 0x9e, 0xe6, 0x91, 0xd3, 0x9b, + 0xa8, 0x27, 0xf1, 0x39, 0x53, 0x8e, 0x7c, 0x41, 0x38, 0x69, 0x07, 0x9d, 0xdc, 0x8f, 0x9f, 0x87, + 0xd6, 0x3d, 0x4b, 0x8d, 0xff, 0x45, 0x86, 0x25, 0xa0, 0x63, 0x5b, 0xbb, 0x3f, 0x3e, 0x77, 0xdd, + 0x25, 0xc3, 0xac, 0x83, 0x25, 0x27, 0xbf, 0x10, 0xbe, 0xd6, 0x7e, 0x0e, 0xc9, 0x4c, 0x07, 0xb5, + 0x63, 0x77, 0x34, 0x35, 0x7b, 0x06, 0x05, 0x47, 0xf3, 0xc6, 0xd0, 0xbc, 0x22, 0x8b, 0xf1, 0x34, + 0x76, 0xd0, 0x58, 0xf3, 0x78, 0xc3, 0x4d, 0xc9, 0x26, 0xdb, 0x68, 0xf6, 0x7f, 0x93, 0xb5, 0x2e, + 0x12, 0xd9, 0x45, 0xb8, 0xb7, 0x65, 0xc2, 0xc9, 0x74, 0xa7, 0xb6, 0xdb, 0xac, 0x59, 0xea, 0xe1, + 0xe9, 0x92, 0x1d, 0xee, 0x9c, 0xc1, 0x7d, 0x44, 0xa6, 0x3b, 0xc1, 0xcd, 0x2e, 0x4b, 0x08, 0xb3, + 0x0e, 0xf5, 0x90, 0x99, 0xfc, 0x44, 0xf8, 0x6a, 0xdb, 0x29, 0x27, 0x8f, 0x3b, 0x30, 0x17, 0xb7, + 0xa3, 0xa9, 0x99, 0xd3, 0x0b, 0x38, 0xc2, 0x25, 0x43, 0xb8, 0x48, 0x82, 0xb3, 0x37, 0x34, 0x67, + 0x0a, 0x65, 0x95, 0x88, 0x0a, 0xd9, 0x15, 0x80, 0x55, 0x7f, 0x61, 0x7b, 0xcf, 0x43, 0x3b, 0x7b, + 0x1e, 0xfa, 0xbe, 0xe7, 0xa1, 0x4f, 0xfb, 0x5e, 0x62, 0x67, 0xdf, 0x4b, 0x7c, 0xdb, 0xf7, 0x12, + 0x4b, 0x93, 0xc5, 0x92, 0x5e, 0xa9, 0xe4, 0x32, 0x79, 0x08, 0x59, 0x24, 0x2a, 0x5a, 0x42, 0x74, + 0x0f, 0x64, 0xb1, 0xf9, 0xcd, 0xde, 0x1f, 0x75, 0xa1, 0xab, 0x65, 0xa1, 0x72, 0x49, 0xf3, 0x07, + 0x9c, 0xfc, 0x1d, 0x00, 0x00, 0xff, 0xff, 0x90, 0xae, 0xbc, 0xc7, 0xe0, 0x07, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -726,10 +743,17 @@ func (m *QueryDenomAuthorityMetadataRequest) MarshalToSizedBuffer(dAtA []byte) ( _ = i var l int _ = l - if len(m.Denom) > 0 { - i -= len(m.Denom) - copy(dAtA[i:], m.Denom) - i = encodeVarintQuery(dAtA, i, uint64(len(m.Denom))) + if len(m.Subdenom) > 0 { + i -= len(m.Subdenom) + copy(dAtA[i:], m.Subdenom) + i = encodeVarintQuery(dAtA, i, uint64(len(m.Subdenom))) + 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 } @@ -851,10 +875,17 @@ func (m *QueryBeforeSendHookAddressRequest) MarshalToSizedBuffer(dAtA []byte) (i _ = i var l int _ = l - if len(m.Denom) > 0 { - i -= len(m.Denom) - copy(dAtA[i:], m.Denom) - i = encodeVarintQuery(dAtA, i, uint64(len(m.Denom))) + if len(m.Subdenom) > 0 { + i -= len(m.Subdenom) + copy(dAtA[i:], m.Subdenom) + i = encodeVarintQuery(dAtA, i, uint64(len(m.Subdenom))) + 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 } @@ -928,7 +959,11 @@ func (m *QueryDenomAuthorityMetadataRequest) Size() (n int) { } var l int _ = l - l = len(m.Denom) + l = len(m.Creator) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + l = len(m.Subdenom) if l > 0 { n += 1 + l + sovQuery(uint64(l)) } @@ -980,7 +1015,11 @@ func (m *QueryBeforeSendHookAddressRequest) Size() (n int) { } var l int _ = l - l = len(m.Denom) + l = len(m.Creator) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + l = len(m.Subdenom) if l > 0 { n += 1 + l + sovQuery(uint64(l)) } @@ -1170,7 +1209,39 @@ func (m *QueryDenomAuthorityMetadataRequest) Unmarshal(dAtA []byte) error { switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Denom", wireType) + 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 Subdenom", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -1198,7 +1269,7 @@ func (m *QueryDenomAuthorityMetadataRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Denom = string(dAtA[iNdEx:postIndex]) + m.Subdenom = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex default: iNdEx = preIndex @@ -1499,7 +1570,39 @@ func (m *QueryBeforeSendHookAddressRequest) Unmarshal(dAtA []byte) error { switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Denom", wireType) + 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 Subdenom", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -1527,7 +1630,7 @@ func (m *QueryBeforeSendHookAddressRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Denom = string(dAtA[iNdEx:postIndex]) + m.Subdenom = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex default: iNdEx = preIndex diff --git a/x/tokenfactory/types/query.pb.gw.go b/x/tokenfactory/types/query.pb.gw.go index 5d75e90ba..3da3e9e6d 100644 --- a/x/tokenfactory/types/query.pb.gw.go +++ b/x/tokenfactory/types/query.pb.gw.go @@ -62,15 +62,26 @@ func request_Query_DenomAuthorityMetadata_0(ctx context.Context, marshaler runti _ = err ) - val, ok = pathParams["denom"] + val, ok = pathParams["creator"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "creator") + } + + protoReq.Creator, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "creator", err) + } + + val, ok = pathParams["subdenom"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "denom") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "subdenom") } - protoReq.Denom, err = runtime.String(val) + protoReq.Subdenom, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "denom", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "subdenom", err) } msg, err := client.DenomAuthorityMetadata(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) @@ -89,15 +100,26 @@ func local_request_Query_DenomAuthorityMetadata_0(ctx context.Context, marshaler _ = err ) - val, ok = pathParams["denom"] + val, ok = pathParams["creator"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "creator") + } + + protoReq.Creator, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "creator", err) + } + + val, ok = pathParams["subdenom"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "denom") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "subdenom") } - protoReq.Denom, err = runtime.String(val) + protoReq.Subdenom, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "denom", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "subdenom", err) } msg, err := server.DenomAuthorityMetadata(ctx, &protoReq) @@ -170,15 +192,26 @@ func request_Query_BeforeSendHookAddress_0(ctx context.Context, marshaler runtim _ = err ) - val, ok = pathParams["denom"] + val, ok = pathParams["creator"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "creator") + } + + protoReq.Creator, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "creator", err) + } + + val, ok = pathParams["subdenom"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "denom") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "subdenom") } - protoReq.Denom, err = runtime.String(val) + protoReq.Subdenom, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "denom", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "subdenom", err) } msg, err := client.BeforeSendHookAddress(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) @@ -197,15 +230,26 @@ func local_request_Query_BeforeSendHookAddress_0(ctx context.Context, marshaler _ = err ) - val, ok = pathParams["denom"] + val, ok = pathParams["creator"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "creator") + } + + protoReq.Creator, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "creator", err) + } + + val, ok = pathParams["subdenom"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "denom") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "subdenom") } - protoReq.Denom, err = runtime.String(val) + protoReq.Subdenom, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "denom", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "subdenom", err) } msg, err := server.BeforeSendHookAddress(ctx, &protoReq) @@ -438,11 +482,11 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie var ( pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"osmosis", "tokenfactory", "v1beta1", "params"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_DenomAuthorityMetadata_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 2, 5}, []string{"osmosis", "tokenfactory", "v1beta1", "denoms", "denom", "authority_metadata"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_DenomAuthorityMetadata_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 2, 4, 1, 0, 4, 1, 5, 5, 1, 0, 4, 1, 5, 6, 2, 7}, []string{"osmosis", "tokenfactory", "v1beta1", "denoms", "factory", "creator", "subdenom", "authority_metadata"}, "", runtime.AssumeColonVerbOpt(false))) pattern_Query_DenomsFromCreator_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"osmosis", "tokenfactory", "v1beta1", "denoms_from_creator", "creator"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_BeforeSendHookAddress_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 2, 5}, []string{"osmosis", "tokenfactory", "v1beta1", "denoms", "denom", "before_send_hook"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_BeforeSendHookAddress_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 2, 4, 1, 0, 4, 1, 5, 5, 1, 0, 4, 1, 5, 6, 2, 7}, []string{"osmosis", "tokenfactory", "v1beta1", "denoms", "factory", "creator", "subdenom", "before_send_hook"}, "", runtime.AssumeColonVerbOpt(false))) ) var ( From 3df403915b2a9292fd330b891524f9a001eeb381 Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Mon, 11 Sep 2023 13:23:55 +0400 Subject: [PATCH 107/307] return tests --- x/tokenfactory/types/denoms_test.go | 64 ++++++++++++ x/tokenfactory/types/genesis_test.go | 142 +++++++++++++++++++++++++++ 2 files changed, 206 insertions(+) create mode 100644 x/tokenfactory/types/denoms_test.go create mode 100644 x/tokenfactory/types/genesis_test.go diff --git a/x/tokenfactory/types/denoms_test.go b/x/tokenfactory/types/denoms_test.go new file mode 100644 index 000000000..1950dca81 --- /dev/null +++ b/x/tokenfactory/types/denoms_test.go @@ -0,0 +1,64 @@ +package types_test + +import ( + "testing" + + "github.com/stretchr/testify/require" + + "github.com/neutron-org/neutron/app" + "github.com/neutron-org/neutron/x/tokenfactory/types" +) + +func TestDecomposeDenoms(t *testing.T) { + app.GetDefaultConfig() + for _, tc := range []struct { + desc string + denom string + valid bool + }{ + { + desc: "empty is invalid", + denom: "", + valid: false, + }, + { + desc: "normal", + denom: "factory/neutron1m9l358xunhhwds0568za49mzhvuxx9ux8xafx2/bitcoin", + valid: true, + }, + { + desc: "multiple slashes in subdenom", + denom: "factory/neutron1m9l358xunhhwds0568za49mzhvuxx9ux8xafx2/bitcoin/1", + valid: true, + }, + { + desc: "no subdenom", + denom: "factory/neutron1m9l358xunhhwds0568za49mzhvuxx9ux8xafx2/", + valid: true, + }, + { + desc: "incorrect prefix", + denom: "ibc/neutron1m9l358xunhhwds0568za49mzhvuxx9ux8xafx2/bitcoin", + valid: false, + }, + { + desc: "subdenom of only slashes", + denom: "factory/neutron1m9l358xunhhwds0568za49mzhvuxx9ux8xafx2/////", + valid: true, + }, + { + desc: "too long name", + denom: "factory/neutron1m9l358xunhhwds0568za49mzhvuxx9ux8xafx2/adsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsfadsf", + valid: false, + }, + } { + t.Run(tc.desc, func(t *testing.T) { + _, _, err := types.DeconstructDenom(tc.denom) + if tc.valid { + require.NoError(t, err) + } else { + require.Error(t, err) + } + }) + } +} diff --git a/x/tokenfactory/types/genesis_test.go b/x/tokenfactory/types/genesis_test.go new file mode 100644 index 000000000..5fb4ef794 --- /dev/null +++ b/x/tokenfactory/types/genesis_test.go @@ -0,0 +1,142 @@ +package types_test + +import ( + "testing" + + "github.com/stretchr/testify/require" + + "github.com/neutron-org/neutron/app" + "github.com/neutron-org/neutron/x/tokenfactory/types" +) + +func TestGenesisState_Validate(t *testing.T) { + app.GetDefaultConfig() + + for _, tc := range []struct { + desc string + genState *types.GenesisState + valid bool + }{ + { + desc: "default is valid", + genState: types.DefaultGenesis(), + valid: true, + }, + { + desc: "valid genesis state", + genState: &types.GenesisState{ + FactoryDenoms: []types.GenesisDenom{ + { + Denom: "factory/neutron1m9l358xunhhwds0568za49mzhvuxx9ux8xafx2/bitcoin", + AuthorityMetadata: types.DenomAuthorityMetadata{ + Admin: "neutron1m9l358xunhhwds0568za49mzhvuxx9ux8xafx2", + }, + }, + }, + }, + valid: true, + }, + { + desc: "different admin from creator", + genState: &types.GenesisState{ + FactoryDenoms: []types.GenesisDenom{ + { + Denom: "factory/neutron1m9l358xunhhwds0568za49mzhvuxx9ux8xafx2/bitcoin", + AuthorityMetadata: types.DenomAuthorityMetadata{ + Admin: "neutron1m9l358xunhhwds0568za49mzhvuxx9ux8xafx2", + }, + }, + }, + }, + valid: true, + }, + { + desc: "empty admin", + genState: &types.GenesisState{ + FactoryDenoms: []types.GenesisDenom{ + { + Denom: "factory/neutron1m9l358xunhhwds0568za49mzhvuxx9ux8xafx2/bitcoin", + AuthorityMetadata: types.DenomAuthorityMetadata{ + Admin: "", + }, + }, + }, + }, + valid: true, + }, + { + desc: "no admin", + genState: &types.GenesisState{ + FactoryDenoms: []types.GenesisDenom{ + { + Denom: "factory/neutron1m9l358xunhhwds0568za49mzhvuxx9ux8xafx2/bitcoin", + }, + }, + }, + valid: true, + }, + { + desc: "invalid admin", + genState: &types.GenesisState{ + FactoryDenoms: []types.GenesisDenom{ + { + Denom: "factory/neutron1m9l358xunhhwds0568za49mzhvuxx9ux8xafx2/bitcoin", + AuthorityMetadata: types.DenomAuthorityMetadata{ + Admin: "moose", + }, + }, + }, + }, + valid: false, + }, + { + desc: "multiple denoms", + genState: &types.GenesisState{ + FactoryDenoms: []types.GenesisDenom{ + { + Denom: "factory/neutron1m9l358xunhhwds0568za49mzhvuxx9ux8xafx2/bitcoin", + AuthorityMetadata: types.DenomAuthorityMetadata{ + Admin: "", + }, + }, + { + Denom: "factory/neutron1m9l358xunhhwds0568za49mzhvuxx9ux8xafx2/litecoin", + AuthorityMetadata: types.DenomAuthorityMetadata{ + Admin: "", + }, + }, + }, + }, + valid: true, + }, + { + desc: "duplicate denoms", + genState: &types.GenesisState{ + FactoryDenoms: []types.GenesisDenom{ + { + Denom: "factory/neutron1m9l358xunhhwds0568za49mzhvuxx9ux8xafx2/bitcoin", + AuthorityMetadata: types.DenomAuthorityMetadata{ + Admin: "", + }, + }, + { + Denom: "factory/neutron1m9l358xunhhwds0568za49mzhvuxx9ux8xafx2/bitcoin", + AuthorityMetadata: types.DenomAuthorityMetadata{ + Admin: "", + }, + }, + }, + }, + valid: false, + }, + } { + t.Run(tc.desc, func(t *testing.T) { + err := tc.genState.Validate() + if tc.valid { + require.NoError(t, err) + } else { + require.Error(t, err) + } + }) + } +} From 21227c3a65a33dd7c7c612816892bca5bc1f03b7 Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Mon, 11 Sep 2023 13:33:08 +0400 Subject: [PATCH 108/307] add cli command for new msg --- x/tokenfactory/client/cli/tx.go | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/x/tokenfactory/client/cli/tx.go b/x/tokenfactory/client/cli/tx.go index 357e089a4..450207d27 100644 --- a/x/tokenfactory/client/cli/tx.go +++ b/x/tokenfactory/client/cli/tx.go @@ -30,6 +30,7 @@ func GetTxCmd() *cobra.Command { NewBurnCmd(), // NewForceTransferCmd(), NewChangeAdminCmd(), + NewSetBeforeSendHook(), ) return cmd @@ -199,3 +200,34 @@ func NewChangeAdminCmd() *cobra.Command { flags.AddTxFlagsToCmd(cmd) return cmd } + +// NewChangeAdminCmd broadcast MsgChangeAdmin +func NewSetBeforeSendHook() *cobra.Command { + cmd := &cobra.Command{ + Use: "set-before-send-hook [denom] [cosm-wasm-addr] [flags]", + Short: "Sets the before send hook for a factory-created denom. Must have admin authority to do so.", + Args: cobra.ExactArgs(2), + RunE: func(cmd *cobra.Command, args []string) error { + clientCtx, err := client.GetClientTxContext(cmd) + if err != nil { + return err + } + + txf, err := tx.NewFactoryCLI(clientCtx, cmd.Flags()) + if err != nil { + return err + } + + msg := types.NewMsgSetBeforeSendHook( + clientCtx.GetFromAddress().String(), + args[0], + args[1], + ) + + return tx.GenerateOrBroadcastTxWithFactory(clientCtx, txf.WithTxConfig(clientCtx.TxConfig).WithAccountRetriever(clientCtx.AccountRetriever), msg) + }, + } + + flags.AddTxFlagsToCmd(cmd) + return cmd +} From b6cd7baebbd2c6b9e97d9bdc63716e0fde02f0f1 Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Mon, 11 Sep 2023 18:08:52 +0400 Subject: [PATCH 109/307] comments --- app/app.go | 2 +- wasmbinding/bindings/query.go | 2 +- x/tokenfactory/keeper/admins_test.go | 19 +++++++++++++------ x/tokenfactory/keeper/createdenom_test.go | 11 +++++++---- x/tokenfactory/keeper/genesis.go | 2 +- x/tokenfactory/types/codec.go | 2 +- x/tokenfactory/types/params.go | 2 +- 7 files changed, 25 insertions(+), 15 deletions(-) diff --git a/app/app.go b/app/app.go index 8e1b61e75..abf093ee5 100644 --- a/app/app.go +++ b/app/app.go @@ -575,7 +575,7 @@ func New( app.keys[tokenfactorytypes.StoreKey], app.AccountKeeper, app.BankKeeper.WithMintCoinsRestriction(tokenfactorytypes.NewTokenFactoryDenomMintCoinsRestriction()), - authtypes.NewModuleAddress(govtypes.ModuleName).String(), + authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String(), ) app.TokenFactoryKeeper = &tokenFactoryKeeper diff --git a/wasmbinding/bindings/query.go b/wasmbinding/bindings/query.go index b9e0438f7..7305a1007 100644 --- a/wasmbinding/bindings/query.go +++ b/wasmbinding/bindings/query.go @@ -34,7 +34,7 @@ type NeutronQuery struct { FullDenom *FullDenom `json:"full_denom,omitempty"` // Returns the admin of a denom, if the denom is a Token Factory denom. DenomAdmin *DenomAdmin `json:"denom_admin,omitempty"` - // + // Returns the before send hook if it was set before BeforeSendHook *BeforeSendHook `json:"before_send_hook,omitempty"` // Contractmanager queries // Query all failures for address diff --git a/x/tokenfactory/keeper/admins_test.go b/x/tokenfactory/keeper/admins_test.go index 0828ffcef..a001c1102 100644 --- a/x/tokenfactory/keeper/admins_test.go +++ b/x/tokenfactory/keeper/admins_test.go @@ -2,6 +2,7 @@ package keeper_test import ( "fmt" + "strings" sdk "github.com/cosmos/cosmos-sdk/types" @@ -15,9 +16,10 @@ func (suite *KeeperTestSuite) TestAdminMsgs() { suite.Setup() suite.CreateDefaultDenom(suite.ChainA.GetContext()) // Make sure that the admin is set correctly - //denom := strings.Split(suite.defaultDenom, "/") + denom := strings.Split(suite.defaultDenom, "/") queryRes, err := suite.queryClient.DenomAuthorityMetadata(suite.ChainA.GetContext().Context(), &types.QueryDenomAuthorityMetadataRequest{ - Denom: suite.defaultDenom, + Creator: denom[1], + Subdenom: denom[2], }) suite.Require().NoError(err) suite.Require().Equal(suite.TestAccs[0].String(), queryRes.AuthorityMetadata.Admin) @@ -38,9 +40,10 @@ func (suite *KeeperTestSuite) TestAdminMsgs() { // Test Change Admin _, err = suite.msgServer.ChangeAdmin(sdk.WrapSDKContext(suite.ChainA.GetContext()), types.NewMsgChangeAdmin(suite.TestAccs[0].String(), suite.defaultDenom, suite.TestAccs[1].String())) suite.Require().NoError(err) - //denom = strings.Split(suite.defaultDenom, "/") + denom = strings.Split(suite.defaultDenom, "/") queryRes, err = suite.queryClient.DenomAuthorityMetadata(suite.ChainA.GetContext().Context(), &types.QueryDenomAuthorityMetadataRequest{ - Denom: suite.defaultDenom, + Creator: denom[1], + Subdenom: denom[2], }) suite.Require().NoError(err) suite.Require().Equal(suite.TestAccs[1].String(), queryRes.AuthorityMetadata.Admin) @@ -58,8 +61,10 @@ func (suite *KeeperTestSuite) TestAdminMsgs() { // Try setting admin to empty _, err = suite.msgServer.ChangeAdmin(sdk.WrapSDKContext(suite.ChainA.GetContext()), types.NewMsgChangeAdmin(suite.TestAccs[1].String(), suite.defaultDenom, "")) suite.Require().NoError(err) + denom = strings.Split(suite.defaultDenom, "/") queryRes, err = suite.queryClient.DenomAuthorityMetadata(suite.ChainA.GetContext().Context(), &types.QueryDenomAuthorityMetadataRequest{ - Denom: suite.defaultDenom, + Creator: denom[1], + Subdenom: denom[2], }) suite.Require().NoError(err) suite.Require().Equal("", queryRes.AuthorityMetadata.Admin) @@ -246,8 +251,10 @@ func (suite *KeeperTestSuite) TestChangeAdminDenom() { suite.Require().Error(err) } + denom := strings.Split(testDenom, "/") queryRes, err := suite.queryClient.DenomAuthorityMetadata(suite.ChainA.GetContext().Context(), &types.QueryDenomAuthorityMetadataRequest{ - Denom: testDenom, + Creator: denom[1], + Subdenom: denom[2], }) suite.Require().NoError(err) diff --git a/x/tokenfactory/keeper/createdenom_test.go b/x/tokenfactory/keeper/createdenom_test.go index 0b1c004ea..423dc4a1d 100644 --- a/x/tokenfactory/keeper/createdenom_test.go +++ b/x/tokenfactory/keeper/createdenom_test.go @@ -2,6 +2,7 @@ package keeper_test import ( "fmt" + "strings" sdk "github.com/cosmos/cosmos-sdk/types" @@ -36,10 +37,11 @@ func (suite *KeeperTestSuite) TestMsgCreateDenom() { suite.Require().Equal(sdk.NewInt(TopUpCoinsAmount), feeCollectorBalance) // Make sure that the admin is set correctly - //denom := strings.Split(res.GetNewTokenDenom(), "/") + denom := strings.Split(res.GetNewTokenDenom(), "/") queryRes, err := suite.queryClient.DenomAuthorityMetadata(suite.ChainA.GetContext().Context(), &types.QueryDenomAuthorityMetadataRequest{ - Denom: res.GetNewTokenDenom(), + Creator: denom[1], + Subdenom: denom[2], }) suite.Require().NoError(err) suite.Require().Equal(suite.TestAccs[0].String(), queryRes.AuthorityMetadata.Admin) @@ -124,11 +126,12 @@ func (suite *KeeperTestSuite) TestCreateDenom() { if tc.valid { suite.Require().NoError(err) - //denom := strings.Split(res.GetNewTokenDenom(), "/") + denom := strings.Split(res.GetNewTokenDenom(), "/") // Make sure that the admin is set correctly queryRes, err := suite.queryClient.DenomAuthorityMetadata(suite.ChainA.GetContext().Context(), &types.QueryDenomAuthorityMetadataRequest{ - Denom: res.GetNewTokenDenom(), + Creator: denom[1], + Subdenom: denom[2], }) suite.Require().NoError(err) diff --git a/x/tokenfactory/keeper/genesis.go b/x/tokenfactory/keeper/genesis.go index 288297a8d..8bd6e28ec 100644 --- a/x/tokenfactory/keeper/genesis.go +++ b/x/tokenfactory/keeper/genesis.go @@ -6,7 +6,7 @@ import ( "github.com/neutron-org/neutron/x/tokenfactory/types" ) -// / InitGenesis initializes the tokenfactory module's state from a provided genesis +// InitGenesis initializes the tokenfactory module's state from a provided genesis // state. func (k Keeper) InitGenesis(ctx sdk.Context, genState types.GenesisState) { k.CreateModuleAccount(ctx) diff --git a/x/tokenfactory/types/codec.go b/x/tokenfactory/types/codec.go index 42f15f0e5..a4ae0b61f 100644 --- a/x/tokenfactory/types/codec.go +++ b/x/tokenfactory/types/codec.go @@ -26,7 +26,7 @@ func RegisterInterfaces(registry cdctypes.InterfaceRegistry) { &MsgCreateDenom{}, &MsgMint{}, &MsgBurn{}, - // &MsgForceTransfer{}, // TODO: why commented? + // &MsgForceTransfer{}, &MsgChangeAdmin{}, &MsgSetBeforeSendHook{}, &MsgUpdateParams{}, diff --git a/x/tokenfactory/types/params.go b/x/tokenfactory/types/params.go index afbae8a49..a0120bfd6 100644 --- a/x/tokenfactory/types/params.go +++ b/x/tokenfactory/types/params.go @@ -17,7 +17,7 @@ var ( DefaultFeeAmount int64 = 1_000_000 ) -// ParamTable for gamm module. +// ParamTable for tokenfactory module. func ParamKeyTable() paramtypes.KeyTable { return paramtypes.NewKeyTable().RegisterParamSet(&Params{}) } From 04e94ba8c43f5f2b8bfb0f24c55ce539ebcbad10 Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Mon, 11 Sep 2023 18:11:01 +0400 Subject: [PATCH 110/307] fix osmo comments --- x/tokenfactory/types/params.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x/tokenfactory/types/params.go b/x/tokenfactory/types/params.go index a0120bfd6..a30342c32 100644 --- a/x/tokenfactory/types/params.go +++ b/x/tokenfactory/types/params.go @@ -29,7 +29,7 @@ func NewParams(denomCreationFee sdk.Coins, denomCreationGasConsume uint64) Param } } -// default gamm module parameters. +// default tokenfactory module parameters. func DefaultParams() Params { return Params{ // For choice, see: https://github.com/osmosis-labs/osmosis/pull/4983 From 112b268777c3a23a9c66b952b161d469ddffe80d Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Tue, 12 Sep 2023 15:41:46 +0400 Subject: [PATCH 111/307] post-review --- app/app.go | 12 +----- proto/neutron/interchaintxs/v1/tx.proto | 2 +- proto/osmosis/tokenfactory/v1beta1/tx.proto | 2 +- wasmbinding/bindings/msg.go | 5 ++- wasmbinding/custom_querier.go | 2 +- wasmbinding/message_plugin.go | 4 +- x/contractmanager/module.go | 1 + x/interchainqueries/keeper/msg_server.go | 6 +-- x/interchaintxs/types/codec.go | 1 + x/interchaintxs/types/tx.pb.go | 2 +- x/tokenfactory/client/cli/query.go | 46 +++++++++++++++++---- x/tokenfactory/keeper/createdenom.go | 15 +++++++ x/tokenfactory/keeper/keeper.go | 12 +++--- x/tokenfactory/types/tx.pb.go | 2 +- 14 files changed, 78 insertions(+), 34 deletions(-) diff --git a/app/app.go b/app/app.go index abf093ee5..d05ac1d8c 100644 --- a/app/app.go +++ b/app/app.go @@ -575,6 +575,7 @@ func New( app.keys[tokenfactorytypes.StoreKey], app.AccountKeeper, app.BankKeeper.WithMintCoinsRestriction(tokenfactorytypes.NewTokenFactoryDenomMintCoinsRestriction()), + app.WasmKeeper, authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String(), ) app.TokenFactoryKeeper = &tokenFactoryKeeper @@ -1161,7 +1162,6 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino paramsKeeper := paramskeeper.NewKeeper(appCodec, legacyAmino, key, tkey) paramsKeeper.Subspace(authtypes.ModuleName) - paramsKeeper.Subspace(banktypes.ModuleName) paramsKeeper.Subspace(slashingtypes.ModuleName) paramsKeeper.Subspace(crisistypes.ModuleName) paramsKeeper.Subspace(ibctransfertypes.ModuleName) @@ -1172,16 +1172,6 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino paramsKeeper.Subspace(routertypes.ModuleName).WithKeyTable(routertypes.ParamKeyTable()) paramsKeeper.Subspace(ccvconsumertypes.ModuleName) - //paramsKeeper.Subspace(tokenfactorytypes.ModuleName) - - paramsKeeper.Subspace(interchainqueriesmoduletypes.ModuleName) - paramsKeeper.Subspace(interchaintxstypes.ModuleName) - paramsKeeper.Subspace(wasm.ModuleName) - paramsKeeper.Subspace(feetypes.ModuleName) - paramsKeeper.Subspace(feeburnertypes.ModuleName) - paramsKeeper.Subspace(crontypes.ModuleName) - paramsKeeper.Subspace(globalfee.ModuleName) - return paramsKeeper } diff --git a/proto/neutron/interchaintxs/v1/tx.proto b/proto/neutron/interchaintxs/v1/tx.proto index 1ffd51e06..535fa81f6 100644 --- a/proto/neutron/interchaintxs/v1/tx.proto +++ b/proto/neutron/interchaintxs/v1/tx.proto @@ -74,7 +74,7 @@ message MsgUpdateParams { // Authority is the address of the governance account. string authority = 1 [ (cosmos_proto.scalar) = "cosmos.AddressString" ]; - // params defines the x/tokenfactory parameters to update. + // params defines the x/interchaintxs parameters to update. // // NOTE: All parameters must be supplied. Params params = 2 diff --git a/proto/osmosis/tokenfactory/v1beta1/tx.proto b/proto/osmosis/tokenfactory/v1beta1/tx.proto index 83d0fa8ac..7f4ce2fb3 100644 --- a/proto/osmosis/tokenfactory/v1beta1/tx.proto +++ b/proto/osmosis/tokenfactory/v1beta1/tx.proto @@ -151,7 +151,7 @@ message MsgUpdateParams { // Authority is the address of the governance account. string authority = 1 [ (cosmos_proto.scalar) = "cosmos.AddressString" ]; - // params defines the x/interchainqueries parameters to update. + // params defines the x/tokenfactory parameters to update. // // NOTE: All parameters must be supplied. Params params = 2 diff --git a/wasmbinding/bindings/msg.go b/wasmbinding/bindings/msg.go index dfd1e1529..fd9ca9236 100644 --- a/wasmbinding/bindings/msg.go +++ b/wasmbinding/bindings/msg.go @@ -41,7 +41,10 @@ type NeutronMsg struct { /// Contracts can burn native tokens for an existing factory denom /// that they are the admin of. /// Currently, the burn from address must be the admin contract. - BurnTokens *BurnTokens `json:"burn_tokens,omitempty"` + BurnTokens *BurnTokens `json:"burn_tokens,omitempty"` + /// Contracts can set before send hook for an existing factory denom + // that they are the admin of. + // Currently, the set before hook call should be performed from address that must be the admin contract. SetBeforeSendHook *SetBeforeSendHook `json:"set_before_send_hook,omitempty"` // Cron types diff --git a/wasmbinding/custom_querier.go b/wasmbinding/custom_querier.go index 36d0d6c63..4709551ac 100644 --- a/wasmbinding/custom_querier.go +++ b/wasmbinding/custom_querier.go @@ -131,7 +131,7 @@ func CustomQuerier(qp *QueryPlugin) func(ctx sdk.Context, request json.RawMessag case contractQuery.BeforeSendHook != nil: res, err := qp.GetBeforeSendHook(ctx, contractQuery.BeforeSendHook.Denom) if err != nil { - return nil, errors.Wrap(err, "unable to get denom before send hook") + return nil, errors.Wrap(err, "unable to get denom before_send_hook") } bz, err := json.Marshal(res) diff --git a/wasmbinding/message_plugin.go b/wasmbinding/message_plugin.go index c11ae3931..5b78a2a5e 100644 --- a/wasmbinding/message_plugin.go +++ b/wasmbinding/message_plugin.go @@ -498,11 +498,11 @@ func (m *CustomMessenger) mintTokens(ctx sdk.Context, contractAddr sdk.AccAddres return nil, nil, nil } -// mintTokens mints tokens of a specified denom to an address. +// setBeforeSendHook sets before send hook for a specified denom. func (m *CustomMessenger) setBeforeSendHook(ctx sdk.Context, contractAddr sdk.AccAddress, set *bindings.SetBeforeSendHook) ([]sdk.Event, [][]byte, error) { err := PerformSetBeforeSendHook(m.TokenFactory, ctx, contractAddr, set) if err != nil { - return nil, nil, errors.Wrap(err, "perform set before send hook") + return nil, nil, errors.Wrap(err, "failed to perform set before send hook") } return nil, nil, nil } diff --git a/x/contractmanager/module.go b/x/contractmanager/module.go index c9f11ba1b..e12420b7b 100644 --- a/x/contractmanager/module.go +++ b/x/contractmanager/module.go @@ -128,6 +128,7 @@ 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)) m := keeper.NewMigrator(am.keeper) if err := cfg.RegisterMigration(types.ModuleName, 1, m.Migrate1to2); err != nil { diff --git a/x/interchainqueries/keeper/msg_server.go b/x/interchainqueries/keeper/msg_server.go index ad9a27e6d..219c07e21 100644 --- a/x/interchainqueries/keeper/msg_server.go +++ b/x/interchainqueries/keeper/msg_server.go @@ -311,17 +311,17 @@ func (m msgServer) validateUpdateInterchainQueryParams( } // UpdateParams updates the module parameters -func (m msgServer) UpdateParams(goCtx context.Context, req *types.MsgUpdateParams) (*types.MsgUpdateParamsResponse, error) { +func (k Keeper) UpdateParams(goCtx context.Context, req *types.MsgUpdateParams) (*types.MsgUpdateParamsResponse, error) { if err := req.ValidateBasic(); err != nil { return nil, err } - authority := m.Keeper.GetAuthority() + 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 := m.Keeper.SetParams(ctx, req.Params); err != nil { + if err := k.SetParams(ctx, req.Params); err != nil { return nil, err } diff --git a/x/interchaintxs/types/codec.go b/x/interchaintxs/types/codec.go index 5257c05a6..95fb1ccd7 100644 --- a/x/interchaintxs/types/codec.go +++ b/x/interchaintxs/types/codec.go @@ -18,6 +18,7 @@ func RegisterInterfaces(registry cdctypes.InterfaceRegistry) { registry.RegisterImplementations((*sdk.Msg)(nil), &MsgRegisterInterchainAccount{}, &MsgSubmitTx{}, + &MsgUpdateParams{}, ) msgservice.RegisterMsgServiceDesc(registry, &_Msg_serviceDesc) diff --git a/x/interchaintxs/types/tx.pb.go b/x/interchaintxs/types/tx.pb.go index 34a62cb7b..bd723ca24 100644 --- a/x/interchaintxs/types/tx.pb.go +++ b/x/interchaintxs/types/tx.pb.go @@ -222,7 +222,7 @@ func (m *MsgSubmitTxResponse) GetChannel() string { 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. + // params defines the x/interchaintxs parameters to update. // // NOTE: All parameters must be supplied. Params Params `protobuf:"bytes,2,opt,name=params,proto3" json:"params"` diff --git a/x/tokenfactory/client/cli/query.go b/x/tokenfactory/client/cli/query.go index 425bf783d..59a457975 100644 --- a/x/tokenfactory/client/cli/query.go +++ b/x/tokenfactory/client/cli/query.go @@ -1,8 +1,6 @@ package cli import ( - // "strings" - "fmt" "strings" @@ -11,9 +9,6 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - // "github.com/cosmos/cosmos-sdk/client/flags" - // sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/x/tokenfactory/types" ) @@ -84,7 +79,8 @@ func GetCmdDenomAuthorityMetadata() *cobra.Command { } res, err := queryClient.DenomAuthorityMetadata(cmd.Context(), &types.QueryDenomAuthorityMetadataRequest{ - Subdenom: args[0], + Creator: args[1], + Subdenom: args[2], }) if err != nil { return err @@ -112,8 +108,44 @@ func GetCmdDenomsFromCreator() *cobra.Command { } queryClient := types.NewQueryClient(clientCtx) + res, err := queryClient.DenomsFromCreator(cmd.Context(), &types.QueryDenomsFromCreatorRequest{ + Creator: args[0], + }) + if err != nil { + return err + } + + return clientCtx.PrintProto(res) + }, + } + + flags.AddQueryFlagsToCmd(cmd) + + return cmd +} + +// GetCmdDenomAuthorityMetadata returns the authority metadata for a queried denom +func GetCmdBeforeSendHook() *cobra.Command { + cmd := &cobra.Command{ + Use: "before-send-hiik [denom] [flags]", + Short: "Get the before send hook for a specific denom", + Args: cobra.ExactArgs(1), + RunE: func(cmd *cobra.Command, args []string) error { + clientCtx, err := client.GetClientQueryContext(cmd) + if err != nil { + return err + } + queryClient := types.NewQueryClient(clientCtx) + + denom := strings.Split(args[0], "/") + + if len(denom) != 3 { + return fmt.Errorf("invalid denom format, expected format: factory/[creator]/[subdenom]") + } + res, err := queryClient.BeforeSendHookAddress(cmd.Context(), &types.QueryBeforeSendHookAddressRequest{ - Subdenom: args[0], + Creator: denom[1], + Subdenom: denom[2], }) if err != nil { return err diff --git a/x/tokenfactory/keeper/createdenom.go b/x/tokenfactory/keeper/createdenom.go index 37b4cdec5..4cfff3b21 100644 --- a/x/tokenfactory/keeper/createdenom.go +++ b/x/tokenfactory/keeper/createdenom.go @@ -76,6 +76,21 @@ func (k Keeper) validateCreateDenom(ctx sdk.Context, creatorAddr string, subdeno func (k Keeper) chargeForCreateDenom(ctx sdk.Context, creatorAddr string) (err error) { params := k.GetParams(ctx) + // if DenomCreationFee is non-zero, transfer the tokens from the creator + // account to community pool + if params.DenomCreationFee != nil { + // NEUTRON IMPORTANT: We commented this section because we removed community pool keeper from the module + + //accAddr, err := sdk.AccAddressFromBech32(creatorAddr) + //if err != nil { + // return err + //} + // + //if err := k.communityPoolKeeper.FundCommunityPool(ctx, params.DenomCreationFee, accAddr); err != nil { + // return err + //} + } + // if DenomCreationGasConsume is non-zero, consume the gas if params.DenomCreationGasConsume != 0 { ctx.GasMeter().ConsumeGas(params.DenomCreationGasConsume, "consume denom creation gas") diff --git a/x/tokenfactory/keeper/keeper.go b/x/tokenfactory/keeper/keeper.go index 9f4641cd6..1bea2bcca 100644 --- a/x/tokenfactory/keeper/keeper.go +++ b/x/tokenfactory/keeper/keeper.go @@ -30,14 +30,16 @@ func NewKeeper( storeKey storetypes.StoreKey, accountKeeper types.AccountKeeper, bankKeeper types.BankKeeper, + contractKeeper types.ContractKeeper, authority string, ) Keeper { return Keeper{ - cdc: cdc, - storeKey: storeKey, - accountKeeper: accountKeeper, - bankKeeper: bankKeeper, - authority: authority, + cdc: cdc, + storeKey: storeKey, + accountKeeper: accountKeeper, + bankKeeper: bankKeeper, + contractKeeper: contractKeeper, + authority: authority, } } diff --git a/x/tokenfactory/types/tx.pb.go b/x/tokenfactory/types/tx.pb.go index 26bcf2095..2a887b635 100644 --- a/x/tokenfactory/types/tx.pb.go +++ b/x/tokenfactory/types/tx.pb.go @@ -739,7 +739,7 @@ var xxx_messageInfo_MsgForceTransferResponse proto.InternalMessageInfo 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/interchainqueries parameters to update. + // 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"` From c198c2d2e91dfd3f64c01a3725fb83e26df9b18b Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Tue, 12 Sep 2023 15:51:45 +0400 Subject: [PATCH 112/307] fix-comment --- x/tokenfactory/client/cli/tx.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x/tokenfactory/client/cli/tx.go b/x/tokenfactory/client/cli/tx.go index 450207d27..ec42a0463 100644 --- a/x/tokenfactory/client/cli/tx.go +++ b/x/tokenfactory/client/cli/tx.go @@ -201,7 +201,7 @@ func NewChangeAdminCmd() *cobra.Command { return cmd } -// NewChangeAdminCmd broadcast MsgChangeAdmin +// NewSetBeforeSendHook broadcast MsgSetBeforeSendHook func NewSetBeforeSendHook() *cobra.Command { cmd := &cobra.Command{ Use: "set-before-send-hook [denom] [cosm-wasm-addr] [flags]", From e884a287255a3a3145b463217c995b731d3fffcb Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Tue, 12 Sep 2023 15:57:58 +0400 Subject: [PATCH 113/307] rm community pool mentions --- x/tokenfactory/types/expected_keepers.go | 5 ----- 1 file changed, 5 deletions(-) diff --git a/x/tokenfactory/types/expected_keepers.go b/x/tokenfactory/types/expected_keepers.go index 5c3a1491c..928915056 100644 --- a/x/tokenfactory/types/expected_keepers.go +++ b/x/tokenfactory/types/expected_keepers.go @@ -33,11 +33,6 @@ type BankHooks interface { BlockBeforeSend(ctx sdk.Context, from, to sdk.AccAddress, amount sdk.Coins) error // Must be before any send is executed } -// CommunityPoolKeeper defines the contract needed to be fulfilled for community pool interactions. -type CommunityPoolKeeper interface { - FundCommunityPool(ctx sdk.Context, amount sdk.Coins, sender sdk.AccAddress) error -} - type ContractKeeper interface { Sudo(ctx sdk.Context, contractAddress sdk.AccAddress, msg []byte) ([]byte, error) } From 26d6c6fb0b7617532ea26ac566fbea551a0ca1f9 Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Tue, 12 Sep 2023 16:24:25 +0400 Subject: [PATCH 114/307] comment + add important commennt about chargeForCreateDenom; change wasmbindings query --- wasmbinding/bindings/query.go | 2 +- wasmbinding/queries.go | 2 +- x/tokenfactory/keeper/createdenom.go | 24 ++++++++++++------------ x/tokenfactory/types/params.go | 6 +++--- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/wasmbinding/bindings/query.go b/wasmbinding/bindings/query.go index 7305a1007..7e0e32f06 100644 --- a/wasmbinding/bindings/query.go +++ b/wasmbinding/bindings/query.go @@ -190,7 +190,7 @@ type BeforeSendHook struct { } type BeforeSendHookResponse struct { - CosmWasmAddr string `json:"cosm_wasm_addr"` + ContractAddr string `json:"contract_addr"` } type DenomAdminResponse struct { diff --git a/wasmbinding/queries.go b/wasmbinding/queries.go index 1d3cf42c6..95739bb46 100644 --- a/wasmbinding/queries.go +++ b/wasmbinding/queries.go @@ -99,7 +99,7 @@ func (qp QueryPlugin) GetDenomAdmin(ctx sdk.Context, denom string) (*bindings.De func (qp QueryPlugin) GetBeforeSendHook(ctx sdk.Context, denom string) (*bindings.BeforeSendHookResponse, error) { cosmWasmAddr := qp.tokenFactoryKeeper.GetBeforeSendHook(ctx, denom) - return &bindings.BeforeSendHookResponse{CosmWasmAddr: cosmWasmAddr}, nil + return &bindings.BeforeSendHookResponse{ContractAddr: cosmWasmAddr}, nil } func (qp *QueryPlugin) GetTotalBurnedNeutronsAmount(ctx sdk.Context, _ *bindings.QueryTotalBurnedNeutronsAmountRequest) (*bindings.QueryTotalBurnedNeutronsAmountResponse, error) { diff --git a/x/tokenfactory/keeper/createdenom.go b/x/tokenfactory/keeper/createdenom.go index 4cfff3b21..91080fe45 100644 --- a/x/tokenfactory/keeper/createdenom.go +++ b/x/tokenfactory/keeper/createdenom.go @@ -76,20 +76,20 @@ func (k Keeper) validateCreateDenom(ctx sdk.Context, creatorAddr string, subdeno func (k Keeper) chargeForCreateDenom(ctx sdk.Context, creatorAddr string) (err error) { params := k.GetParams(ctx) + // NEUTRON IMPORTANT: We commented this section because we removed community pool keeper from the modules section + // if DenomCreationFee is non-zero, transfer the tokens from the creator // account to community pool - if params.DenomCreationFee != nil { - // NEUTRON IMPORTANT: We commented this section because we removed community pool keeper from the module - - //accAddr, err := sdk.AccAddressFromBech32(creatorAddr) - //if err != nil { - // return err - //} - // - //if err := k.communityPoolKeeper.FundCommunityPool(ctx, params.DenomCreationFee, accAddr); err != nil { - // return err - //} - } + //if params.DenomCreationFee != nil { + // accAddr, err := sdk.AccAddressFromBech32(creatorAddr) + // if err != nil { + // return err + // } + // + // if err := k.communityPoolKeeper.FundCommunityPool(ctx, params.DenomCreationFee, accAddr); err != nil { + // return err + // } + //} // if DenomCreationGasConsume is non-zero, consume the gas if params.DenomCreationGasConsume != 0 { diff --git a/x/tokenfactory/types/params.go b/x/tokenfactory/types/params.go index a30342c32..648426319 100644 --- a/x/tokenfactory/types/params.go +++ b/x/tokenfactory/types/params.go @@ -32,9 +32,9 @@ func NewParams(denomCreationFee sdk.Coins, denomCreationGasConsume uint64) Param // default tokenfactory module parameters. func DefaultParams() Params { return Params{ - // For choice, see: https://github.com/osmosis-labs/osmosis/pull/4983 - DenomCreationFee: sdk.NewCoins(sdk.NewInt64Coin(DefaultNeutronDenom, DefaultFeeAmount)), - DenomCreationGasConsume: uint64(DefaultCreationGasFee), + // We don't want to charge users for denom creation + DenomCreationFee: nil, + DenomCreationGasConsume: 0, } } From b69d2f3f85cd18ebebafd8ce70612a26bde5e088 Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Tue, 12 Sep 2023 16:34:46 +0400 Subject: [PATCH 115/307] upd upgrade handler --- app/upgrades/sdk47/upgrades.go | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/app/upgrades/sdk47/upgrades.go b/app/upgrades/sdk47/upgrades.go index b962ec819..6821978ca 100644 --- a/app/upgrades/sdk47/upgrades.go +++ b/app/upgrades/sdk47/upgrades.go @@ -52,7 +52,7 @@ func CreateUpgradeHandler( } ctx.Logger().Info("Migrating tokenfactory module parameters...") - if err := migrateTokenFactoryParams(ctx, keepers.ParamsKeeper, storeKeys.GetKey(tokenfactorytypes.StoreKey), codec); err != nil { + if err := migrateTokenFactoryParams(ctx, storeKeys.GetKey(tokenfactorytypes.StoreKey), codec); err != nil { return nil, err } @@ -126,17 +126,15 @@ func migrateFeeRefunderParams(ctx sdk.Context, paramsKeepers paramskeeper.Keeper return nil } -func migrateTokenFactoryParams(ctx sdk.Context, paramsKeepers paramskeeper.Keeper, storeKey storetypes.StoreKey, codec codec.Codec) error { +func migrateTokenFactoryParams(ctx sdk.Context, storeKey storetypes.StoreKey, codec codec.Codec) error { store := ctx.KVStore(storeKey) - var currParams tokenfactorytypes.Params - subspace, _ := paramsKeepers.GetSubspace(tokenfactorytypes.StoreKey) - subspace.GetParamSet(ctx, &currParams) + newParams := tokenfactorytypes.Params{DenomCreationFee: nil, DenomCreationGasConsume: 0} - if err := currParams.Validate(); err != nil { + if err := newParams.Validate(); err != nil { return err } - bz := codec.MustMarshal(&currParams) + bz := codec.MustMarshal(&newParams) store.Set(tokenfactorytypes.ParamsKey, bz) return nil } From 49a500eb1ddd18e0cc1d19e89ce342b572548f4e Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Wed, 13 Sep 2023 13:50:37 +0400 Subject: [PATCH 116/307] upd interchaintxs queries --- proto/neutron/interchaintxs/v1/query.proto | 8 +- x/interchaintxs/types/query.pb.go | 60 +++++---- x/interchaintxs/types/query.pb.gw.go | 149 ++++++++++++++++++++- 3 files changed, 184 insertions(+), 33 deletions(-) diff --git a/proto/neutron/interchaintxs/v1/query.proto b/proto/neutron/interchaintxs/v1/query.proto index ee32847e8..2960849f6 100644 --- a/proto/neutron/interchaintxs/v1/query.proto +++ b/proto/neutron/interchaintxs/v1/query.proto @@ -11,9 +11,13 @@ option go_package = "github.com/neutron-org/neutron/x/interchaintxs/types"; // Query defines the gRPC querier service. service Query { // Parameters queries the parameters of the module. - rpc Params(QueryParamsRequest) returns (QueryParamsResponse) {} + rpc Params(QueryParamsRequest) returns (QueryParamsResponse) { + option (google.api.http).get = "/neutron/interchaintxs/v1/params"; + } rpc InterchainAccountAddress(QueryInterchainAccountAddressRequest) - returns (QueryInterchainAccountAddressResponse) {} + returns (QueryInterchainAccountAddressResponse) { + option (google.api.http).get = "/neutron/interchaintxs/v1/{owner_address}/{interchain_account_id}/{connection_id}/interchain_account_address"; + } } // QueryParamsRequest is request type for the Query/Params RPC method. diff --git a/x/interchaintxs/types/query.pb.go b/x/interchaintxs/types/query.pb.go index 0695f6c26..705885213 100644 --- a/x/interchaintxs/types/query.pb.go +++ b/x/interchaintxs/types/query.pb.go @@ -216,35 +216,37 @@ func init() { } var fileDescriptor_6130c5f6c54e2428 = []byte{ - // 434 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x92, 0x31, 0x6f, 0xd3, 0x40, - 0x1c, 0xc5, 0xed, 0x02, 0x11, 0x1c, 0xb0, 0x5c, 0x5b, 0xc9, 0xb2, 0xc0, 0x41, 0xa6, 0x95, 0xa0, - 0x12, 0x3e, 0x25, 0x30, 0xd1, 0x2e, 0xed, 0x96, 0x05, 0x81, 0x47, 0x96, 0xe8, 0x6c, 0x9f, 0xdc, - 0x93, 0xc8, 0xfd, 0xdd, 0xbb, 0x73, 0x69, 0x77, 0x06, 0x46, 0x36, 0xd6, 0x7c, 0x02, 0x3e, 0x47, - 0xc6, 0x8c, 0x4c, 0x08, 0x25, 0x0b, 0x1f, 0x03, 0xf9, 0xee, 0x42, 0x94, 0x10, 0x13, 0xd4, 0xcd, - 0x7a, 0xfe, 0xfd, 0xdf, 0x7b, 0xf7, 0xbf, 0x43, 0x07, 0x82, 0xd5, 0x5a, 0x82, 0x20, 0x5c, 0x68, - 0x26, 0xf3, 0x73, 0xca, 0x85, 0xbe, 0x52, 0xe4, 0xb2, 0x47, 0x2e, 0x6a, 0x26, 0xaf, 0x93, 0x4a, - 0x82, 0x06, 0xbc, 0xef, 0xa8, 0x64, 0x85, 0x0a, 0xf7, 0x4a, 0x28, 0xc1, 0x10, 0xa4, 0xf9, 0xb2, - 0x70, 0xf8, 0xa8, 0x04, 0x28, 0x3f, 0x30, 0x42, 0x2b, 0x4e, 0xa8, 0x10, 0xa0, 0xa9, 0xe6, 0x20, - 0x94, 0xfb, 0x7b, 0x94, 0x83, 0x1a, 0x81, 0x22, 0x19, 0x55, 0xcc, 0x66, 0x90, 0xcb, 0x5e, 0xc6, - 0x34, 0xed, 0x91, 0x8a, 0x96, 0x5c, 0x18, 0xd8, 0xb1, 0x87, 0xad, 0xe5, 0x2a, 0x2a, 0xe9, 0xc8, - 0x59, 0xc6, 0x7b, 0x08, 0xbf, 0x6b, 0x8c, 0xde, 0x1a, 0x31, 0x65, 0x17, 0x35, 0x53, 0x3a, 0x4e, - 0xd1, 0xee, 0x8a, 0xaa, 0x2a, 0x10, 0x8a, 0xe1, 0x63, 0xd4, 0xb1, 0xc3, 0x81, 0xff, 0xc4, 0x7f, - 0x76, 0xbf, 0xff, 0x38, 0xd9, 0x78, 0xb6, 0xc4, 0x8e, 0x9d, 0xdd, 0x9e, 0xfc, 0xe8, 0x7a, 0xa9, - 0x1b, 0x89, 0xbf, 0xf9, 0xe8, 0xc0, 0x98, 0x0e, 0xfe, 0xb0, 0xa7, 0x79, 0x0e, 0xb5, 0xd0, 0xa7, - 0x45, 0x21, 0x99, 0x5a, 0x84, 0xe3, 0xa7, 0xe8, 0x21, 0x7c, 0x14, 0x4c, 0x0e, 0xa9, 0xd5, 0x4d, - 0xd8, 0xbd, 0xf4, 0x81, 0x11, 0x1d, 0x8b, 0xfb, 0x68, 0x7f, 0x99, 0x39, 0xa4, 0xd6, 0x68, 0xc8, - 0x8b, 0x60, 0xc7, 0xc0, 0xbb, 0x7c, 0x3d, 0x64, 0x50, 0x34, 0xc6, 0x39, 0x08, 0xc1, 0xf2, 0x66, - 0x4d, 0x0d, 0x7b, 0xcb, 0x1a, 0x2f, 0xc5, 0x41, 0xf1, 0xfa, 0xee, 0xe7, 0x71, 0xd7, 0xfb, 0x35, - 0xee, 0x7a, 0x31, 0x43, 0x87, 0x5b, 0xfa, 0xba, 0xb5, 0x9c, 0xa0, 0x70, 0x43, 0x97, 0xd5, 0xf6, - 0x01, 0x6f, 0x71, 0xe9, 0x7f, 0xda, 0x41, 0x77, 0x4c, 0x0e, 0xa6, 0xa8, 0x63, 0x37, 0x87, 0x9f, - 0xb7, 0x2c, 0xf6, 0xef, 0xab, 0x0a, 0x8f, 0xfe, 0x07, 0xb5, 0x45, 0x63, 0x0f, 0x7f, 0xf5, 0x51, - 0xd0, 0x76, 0x1e, 0x7c, 0xfc, 0x2f, 0xab, 0x2d, 0xb7, 0x16, 0x9e, 0xdc, 0x6c, 0x78, 0xd1, 0xec, - 0xec, 0xcd, 0x64, 0x16, 0xf9, 0xd3, 0x59, 0xe4, 0xff, 0x9c, 0x45, 0xfe, 0x97, 0x79, 0xe4, 0x4d, - 0xe7, 0x91, 0xf7, 0x7d, 0x1e, 0x79, 0xef, 0x5f, 0x95, 0x5c, 0x9f, 0xd7, 0x59, 0x92, 0xc3, 0x88, - 0xb8, 0x8c, 0x17, 0x20, 0xcb, 0xc5, 0x37, 0xb9, 0x5a, 0x7b, 0xe2, 0xfa, 0xba, 0x62, 0x2a, 0xeb, - 0x98, 0xf7, 0xfd, 0xf2, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0x4b, 0x28, 0xcd, 0x3d, 0xa5, 0x03, - 0x00, 0x00, + // 478 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x93, 0x31, 0x6f, 0xd3, 0x40, + 0x14, 0xc7, 0xed, 0x14, 0x22, 0x38, 0x60, 0xb9, 0xb6, 0x52, 0x64, 0x81, 0x53, 0x99, 0x56, 0x2a, + 0x95, 0xf0, 0x29, 0x81, 0x89, 0x76, 0x69, 0xb7, 0x2c, 0x08, 0x32, 0xb2, 0x44, 0x17, 0xfb, 0xe4, + 0x9e, 0xd4, 0xdc, 0x73, 0xef, 0xce, 0xa5, 0x55, 0x94, 0x85, 0x09, 0xc4, 0x82, 0xc4, 0x17, 0x28, + 0x5f, 0x80, 0xcf, 0xd1, 0xb1, 0x12, 0x0b, 0x13, 0x42, 0x09, 0x03, 0x1f, 0x03, 0xf9, 0xee, 0xda, + 0xca, 0x25, 0x26, 0xa8, 0x5b, 0xf4, 0xf2, 0x7b, 0xff, 0xff, 0xff, 0xbd, 0x7b, 0x46, 0xeb, 0x82, + 0x15, 0x5a, 0x82, 0x20, 0x5c, 0x68, 0x26, 0x93, 0x7d, 0xca, 0x85, 0x3e, 0x56, 0xe4, 0xa8, 0x43, + 0x0e, 0x0b, 0x26, 0x4f, 0xe2, 0x5c, 0x82, 0x06, 0xbc, 0xea, 0xa8, 0xb8, 0x42, 0x05, 0x2b, 0x19, + 0x64, 0x60, 0x08, 0x52, 0xfe, 0xb2, 0x70, 0xf0, 0x30, 0x03, 0xc8, 0x0e, 0x18, 0xa1, 0x39, 0x27, + 0x54, 0x08, 0xd0, 0x54, 0x73, 0x10, 0xca, 0xfd, 0xbb, 0x95, 0x80, 0x1a, 0x81, 0x22, 0x43, 0xaa, + 0x98, 0xf5, 0x20, 0x47, 0x9d, 0x21, 0xd3, 0xb4, 0x43, 0x72, 0x9a, 0x71, 0x61, 0x60, 0xc7, 0x6e, + 0xd4, 0x86, 0xcb, 0xa9, 0xa4, 0x23, 0x27, 0x19, 0xad, 0x20, 0xfc, 0xba, 0x14, 0x7a, 0x65, 0x8a, + 0x7d, 0x76, 0x58, 0x30, 0xa5, 0xa3, 0x3e, 0x5a, 0xae, 0x54, 0x55, 0x0e, 0x42, 0x31, 0xbc, 0x8d, + 0x9a, 0xb6, 0xb9, 0xe5, 0xaf, 0xf9, 0x9b, 0xf7, 0xba, 0x8f, 0xe2, 0xb9, 0xb3, 0xc5, 0xb6, 0x6d, + 0xef, 0xd6, 0xd9, 0x8f, 0xb6, 0xd7, 0x77, 0x2d, 0xd1, 0x57, 0x1f, 0xad, 0x1b, 0xd1, 0xde, 0x25, + 0xbb, 0x9b, 0x24, 0x50, 0x08, 0xbd, 0x9b, 0xa6, 0x92, 0xa9, 0x0b, 0x73, 0xfc, 0x18, 0x3d, 0x80, + 0xb7, 0x82, 0xc9, 0x01, 0xb5, 0x75, 0x63, 0x76, 0xb7, 0x7f, 0xdf, 0x14, 0x1d, 0x8b, 0xbb, 0x68, + 0xf5, 0xca, 0x73, 0x40, 0xad, 0xd0, 0x80, 0xa7, 0xad, 0x86, 0x81, 0x97, 0xf9, 0x75, 0x93, 0x5e, + 0x5a, 0x0a, 0x27, 0x20, 0x04, 0x4b, 0xca, 0x35, 0x95, 0xec, 0x92, 0x15, 0xbe, 0x2a, 0xf6, 0xd2, + 0x17, 0x77, 0xde, 0x9f, 0xb6, 0xbd, 0xdf, 0xa7, 0x6d, 0x2f, 0x62, 0x68, 0x63, 0x41, 0x5e, 0xb7, + 0x96, 0x1d, 0x14, 0xcc, 0xc9, 0x52, 0x4d, 0xdf, 0xe2, 0x35, 0x2a, 0xdd, 0x2f, 0x4b, 0xe8, 0xb6, + 0xf1, 0xc1, 0x1f, 0x7c, 0xd4, 0xb4, 0xab, 0xc3, 0x4f, 0x6a, 0x36, 0xfb, 0xf7, 0x5b, 0x05, 0x5b, + 0xff, 0x83, 0xda, 0xa4, 0xd1, 0xe6, 0xbb, 0x6f, 0xbf, 0x3e, 0x37, 0x22, 0xbc, 0x46, 0x16, 0x5c, + 0x07, 0xfe, 0xd8, 0x40, 0xad, 0xba, 0xc1, 0xf1, 0xf6, 0xbf, 0x2c, 0x17, 0x3c, 0x6f, 0xb0, 0x73, + 0xb3, 0x66, 0x37, 0x81, 0x36, 0x13, 0x08, 0x7c, 0x50, 0x3f, 0xc1, 0xb8, 0x72, 0x3d, 0x13, 0x32, + 0x9e, 0x7b, 0x28, 0x13, 0x32, 0xae, 0x1c, 0xc3, 0x84, 0xd4, 0xbf, 0xe1, 0xde, 0xcb, 0xb3, 0x69, + 0xe8, 0x9f, 0x4f, 0x43, 0xff, 0xe7, 0x34, 0xf4, 0x3f, 0xcd, 0x42, 0xef, 0x7c, 0x16, 0x7a, 0xdf, + 0x67, 0xa1, 0xf7, 0xe6, 0x79, 0xc6, 0xf5, 0x7e, 0x31, 0x8c, 0x13, 0x18, 0x5d, 0x24, 0x7a, 0x0a, + 0x32, 0xbb, 0x4c, 0x77, 0x7c, 0x2d, 0x9f, 0x3e, 0xc9, 0x99, 0x1a, 0x36, 0xcd, 0xc7, 0xf7, 0xec, + 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x5d, 0x7b, 0x94, 0x66, 0x42, 0x04, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/interchaintxs/types/query.pb.gw.go b/x/interchaintxs/types/query.pb.gw.go index d029f8ab9..2375a7805 100644 --- a/x/interchaintxs/types/query.pb.gw.go +++ b/x/interchaintxs/types/query.pb.gw.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-grpc-gateway. DO NOT EDIT. -// source: interchaintxs/v1/query.proto +// source: neutron/interchaintxs/v1/query.proto /* Package types is a reverse proxy. @@ -51,6 +51,104 @@ func local_request_Query_Params_0(ctx context.Context, marshaler runtime.Marshal } +func request_Query_InterchainAccountAddress_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryInterchainAccountAddressRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["owner_address"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "owner_address") + } + + protoReq.OwnerAddress, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "owner_address", err) + } + + val, ok = pathParams["interchain_account_id"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "interchain_account_id") + } + + protoReq.InterchainAccountId, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "interchain_account_id", err) + } + + val, ok = pathParams["connection_id"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "connection_id") + } + + protoReq.ConnectionId, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "connection_id", err) + } + + msg, err := client.InterchainAccountAddress(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Query_InterchainAccountAddress_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryInterchainAccountAddressRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["owner_address"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "owner_address") + } + + protoReq.OwnerAddress, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "owner_address", err) + } + + val, ok = pathParams["interchain_account_id"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "interchain_account_id") + } + + protoReq.InterchainAccountId, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "interchain_account_id", err) + } + + val, ok = pathParams["connection_id"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "connection_id") + } + + protoReq.ConnectionId, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "connection_id", err) + } + + msg, err := server.InterchainAccountAddress(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. @@ -80,6 +178,29 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv }) + mux.Handle("GET", pattern_Query_InterchainAccountAddress_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_InterchainAccountAddress_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_InterchainAccountAddress_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + return nil } @@ -141,13 +262,37 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie }) + mux.Handle("GET", pattern_Query_InterchainAccountAddress_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_InterchainAccountAddress_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_InterchainAccountAddress_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, 1, 2, 2}, []string{"neutron", "interchaintxs", "params"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"neutron", "interchaintxs", "v1", "params"}, "", runtime.AssumeColonVerbOpt(false))) + + pattern_Query_InterchainAccountAddress_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5, 2, 6}, []string{"neutron", "interchaintxs", "v1", "owner_address", "interchain_account_id", "connection_id", "interchain_account_address"}, "", runtime.AssumeColonVerbOpt(false))) ) var ( forward_Query_Params_0 = runtime.ForwardResponseMessage + + forward_Query_InterchainAccountAddress_0 = runtime.ForwardResponseMessage ) From c16d42e9da4f049c6f25984486ca5ea722aa6c53 Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Wed, 13 Sep 2023 13:51:12 +0400 Subject: [PATCH 117/307] modify charge for denom & upd upgrade handler --- app/upgrades/sdk47/upgrades.go | 13 ++- .../osmosis/tokenfactory/v1beta1/params.proto | 3 + x/tokenfactory/keeper/createdenom.go | 42 +++++--- x/tokenfactory/types/params.pb.go | 98 ++++++++++++++----- 4 files changed, 116 insertions(+), 40 deletions(-) diff --git a/app/upgrades/sdk47/upgrades.go b/app/upgrades/sdk47/upgrades.go index 6821978ca..30817dc77 100644 --- a/app/upgrades/sdk47/upgrades.go +++ b/app/upgrades/sdk47/upgrades.go @@ -52,7 +52,7 @@ func CreateUpgradeHandler( } ctx.Logger().Info("Migrating tokenfactory module parameters...") - if err := migrateTokenFactoryParams(ctx, storeKeys.GetKey(tokenfactorytypes.StoreKey), codec); err != nil { + if err := migrateTokenFactoryParams(ctx, keepers.ParamsKeeper, storeKeys.GetKey(tokenfactorytypes.StoreKey), codec); err != nil { return nil, err } @@ -126,15 +126,18 @@ func migrateFeeRefunderParams(ctx sdk.Context, paramsKeepers paramskeeper.Keeper return nil } -func migrateTokenFactoryParams(ctx sdk.Context, storeKey storetypes.StoreKey, codec codec.Codec) error { +func migrateTokenFactoryParams(ctx sdk.Context, paramsKeepers paramskeeper.Keeper, storeKey storetypes.StoreKey, codec codec.Codec) error { store := ctx.KVStore(storeKey) - newParams := tokenfactorytypes.Params{DenomCreationFee: nil, DenomCreationGasConsume: 0} + var currParams tokenfactorytypes.Params + subspace, _ := paramsKeepers.GetSubspace(tokenfactorytypes.StoreKey) + subspace.GetParamSet(ctx, &currParams) + currParams.DenomCreationGasConsume = 0 - if err := newParams.Validate(); err != nil { + if err := currParams.Validate(); err != nil { return err } - bz := codec.MustMarshal(&newParams) + bz := codec.MustMarshal(&currParams) store.Set(tokenfactorytypes.ParamsKey, bz) return nil } diff --git a/proto/osmosis/tokenfactory/v1beta1/params.proto b/proto/osmosis/tokenfactory/v1beta1/params.proto index 35f08f4c5..422dbd65e 100644 --- a/proto/osmosis/tokenfactory/v1beta1/params.proto +++ b/proto/osmosis/tokenfactory/v1beta1/params.proto @@ -26,4 +26,7 @@ message Params { (gogoproto.moretags) = "yaml:\"denom_creation_gas_consume\"", (gogoproto.nullable) = true ]; + + // FeeCollectorAddress is the address where fees collected from denom creation are sent to + string fee_collector_address = 3; } diff --git a/x/tokenfactory/keeper/createdenom.go b/x/tokenfactory/keeper/createdenom.go index 91080fe45..92b7533cc 100644 --- a/x/tokenfactory/keeper/createdenom.go +++ b/x/tokenfactory/keeper/createdenom.go @@ -4,6 +4,7 @@ import ( "fmt" sdk "github.com/cosmos/cosmos-sdk/types" + sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" "github.com/neutron-org/neutron/x/tokenfactory/types" @@ -76,20 +77,35 @@ func (k Keeper) validateCreateDenom(ctx sdk.Context, creatorAddr string, subdeno func (k Keeper) chargeForCreateDenom(ctx sdk.Context, creatorAddr string) (err error) { params := k.GetParams(ctx) - // NEUTRON IMPORTANT: We commented this section because we removed community pool keeper from the modules section - - // if DenomCreationFee is non-zero, transfer the tokens from the creator + // ORIGINAL: if DenomCreationFee is non-zero, transfer the tokens from the creator // account to community pool - //if params.DenomCreationFee != nil { - // accAddr, err := sdk.AccAddressFromBech32(creatorAddr) - // if err != nil { - // return err - // } - // - // if err := k.communityPoolKeeper.FundCommunityPool(ctx, params.DenomCreationFee, accAddr); err != nil { - // return err - // } - //} + // MODIFIED: if DenomCreationFee is non-zero, transfer the tokens from the creator + // account to feeCollectorAddr + if params.DenomCreationFee != nil { + accAddr, err := sdk.AccAddressFromBech32(creatorAddr) + if err != nil { + return err + } + // Instead of funding community pool we send funds to fee collector addr + //if err := k.communityPoolKeeper.FundCommunityPool(ctx, params.DenomCreationFee, accAddr); err != nil { + // return err + //} + + feeCollectorAddr, err := sdk.AccAddressFromBech32(params.FeeCollectorAddress) + if err != nil { + return sdkerrors.Wrapf(err, "wrong fee collector address: %v", err) + } + + err = k.bankKeeper.SendCoins( + ctx, + accAddr, feeCollectorAddr, + params.DenomCreationFee, + ) + + if err != nil { + return sdkerrors.Wrap(err, "unable to send coins to fee collector") + } + } // if DenomCreationGasConsume is non-zero, consume the gas if params.DenomCreationGasConsume != 0 { diff --git a/x/tokenfactory/types/params.pb.go b/x/tokenfactory/types/params.pb.go index 5e9ce1d32..8bea9d12b 100644 --- a/x/tokenfactory/types/params.pb.go +++ b/x/tokenfactory/types/params.pb.go @@ -37,6 +37,8 @@ type Params struct { // // See: https://github.com/CosmWasm/token-factory/issues/11 DenomCreationGasConsume uint64 `protobuf:"varint,2,opt,name=denom_creation_gas_consume,json=denomCreationGasConsume,proto3" json:"denom_creation_gas_consume,omitempty" yaml:"denom_creation_gas_consume"` + // FeeCollectorAddress is the address where fees collected from denom creation are sent to + FeeCollectorAddress string `protobuf:"bytes,3,opt,name=fee_collector_address,json=feeCollectorAddress,proto3" json:"fee_collector_address,omitempty"` } func (m *Params) Reset() { *m = Params{} } @@ -86,6 +88,13 @@ func (m *Params) GetDenomCreationGasConsume() uint64 { return 0 } +func (m *Params) GetFeeCollectorAddress() string { + if m != nil { + return m.FeeCollectorAddress + } + return "" +} + func init() { proto.RegisterType((*Params)(nil), "osmosis.tokenfactory.v1beta1.Params") } @@ -95,28 +104,30 @@ func init() { } var fileDescriptor_cc8299d306f3ff47 = []byte{ - // 332 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x91, 0x31, 0x4f, 0xc2, 0x40, - 0x14, 0xc7, 0x7b, 0x68, 0x18, 0xea, 0x62, 0x1a, 0x13, 0x81, 0x98, 0x2b, 0x76, 0x82, 0x81, 0x5e, - 0x90, 0xcd, 0x11, 0x12, 0x9d, 0x48, 0x0c, 0xa3, 0x4b, 0x73, 0x2d, 0x8f, 0xda, 0x60, 0xef, 0x91, - 0xde, 0x61, 0xe4, 0x23, 0xb8, 0x39, 0xf9, 0x21, 0xfc, 0x24, 0x8c, 0x8c, 0x4e, 0xd5, 0xc0, 0x37, - 0xe0, 0x13, 0x18, 0xae, 0x87, 0x29, 0xea, 0x74, 0xef, 0xe5, 0xff, 0x7f, 0xbf, 0xf7, 0xbf, 0x3b, - 0xbb, 0x8d, 0x32, 0x45, 0x99, 0x48, 0xa6, 0x70, 0x0a, 0x62, 0xc2, 0x23, 0x85, 0xd9, 0x82, 0x3d, - 0x75, 0x43, 0x50, 0xbc, 0xcb, 0x66, 0x3c, 0xe3, 0xa9, 0xf4, 0x67, 0x19, 0x2a, 0x74, 0x2e, 0x8c, - 0xd5, 0x2f, 0x5b, 0x7d, 0x63, 0x6d, 0x9c, 0xc5, 0x18, 0xa3, 0x36, 0xb2, 0x5d, 0x55, 0xcc, 0x34, - 0xea, 0x91, 0x1e, 0x0a, 0x0a, 0xa1, 0x68, 0x8c, 0x44, 0x8b, 0x8e, 0x85, 0x5c, 0xc2, 0xcf, 0xc2, - 0x08, 0x13, 0x51, 0xe8, 0xde, 0x4b, 0xc5, 0xae, 0xde, 0xe9, 0xfd, 0xce, 0x1b, 0xb1, 0x9d, 0x31, - 0x08, 0x4c, 0x83, 0x28, 0x03, 0xae, 0x12, 0x14, 0xc1, 0x04, 0xa0, 0x46, 0x9a, 0x47, 0xad, 0x93, - 0xab, 0xba, 0x6f, 0xb0, 0x3b, 0xd0, 0x3e, 0x8e, 0x3f, 0xc0, 0x44, 0xf4, 0x87, 0xcb, 0xdc, 0xb5, - 0xb6, 0xb9, 0x5b, 0x5f, 0xf0, 0xf4, 0xf1, 0xda, 0xfb, 0x8b, 0xf0, 0xde, 0x3f, 0xdd, 0x56, 0x9c, - 0xa8, 0x87, 0x79, 0xe8, 0x47, 0x98, 0x9a, 0x80, 0xe6, 0xe8, 0xc8, 0xf1, 0x94, 0xa9, 0xc5, 0x0c, - 0xa4, 0xa6, 0xc9, 0xd1, 0xa9, 0x06, 0x0c, 0xcc, 0xfc, 0x0d, 0x80, 0x33, 0xb1, 0x1b, 0xbf, 0xa0, - 0x31, 0x97, 0x41, 0x84, 0x42, 0xce, 0x53, 0xa8, 0x55, 0x9a, 0xa4, 0x75, 0xdc, 0x6f, 0x2f, 0x73, - 0x97, 0x6c, 0x73, 0xf7, 0xf2, 0xdf, 0x10, 0x25, 0xbf, 0x37, 0x3a, 0x3f, 0x58, 0x70, 0xcb, 0xe5, - 0xa0, 0x50, 0xfa, 0xc3, 0xe5, 0x9a, 0x92, 0xd5, 0x9a, 0x92, 0xaf, 0x35, 0x25, 0xaf, 0x1b, 0x6a, - 0xad, 0x36, 0xd4, 0xfa, 0xd8, 0x50, 0xeb, 0xbe, 0x57, 0x4a, 0x2f, 0x60, 0xae, 0x32, 0x14, 0x1d, - 0xcc, 0xe2, 0x7d, 0xcd, 0x9e, 0x0f, 0x3f, 0x56, 0x5f, 0x27, 0xac, 0xea, 0x17, 0xee, 0x7d, 0x07, - 0x00, 0x00, 0xff, 0xff, 0x32, 0xf6, 0xab, 0x50, 0xfd, 0x01, 0x00, 0x00, + // 367 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x92, 0xc1, 0x4e, 0xf2, 0x40, + 0x10, 0xc7, 0xbb, 0xf0, 0x85, 0xe4, 0xab, 0x17, 0x53, 0x35, 0x02, 0x31, 0x2d, 0xf6, 0x54, 0x0e, + 0xb4, 0x01, 0x6e, 0xde, 0xa4, 0x89, 0x9e, 0x48, 0x0c, 0x47, 0x2f, 0xcd, 0xb6, 0x9d, 0xd6, 0x06, + 0xba, 0x43, 0xba, 0x8b, 0x91, 0xb7, 0xf0, 0xe4, 0x43, 0xf8, 0x0e, 0xde, 0x39, 0x72, 0xf4, 0x54, + 0x0d, 0xbc, 0x01, 0x4f, 0x60, 0x68, 0x17, 0x03, 0xea, 0x69, 0x67, 0xf2, 0xff, 0xcf, 0x6f, 0x66, + 0x67, 0x57, 0x6d, 0x23, 0x4f, 0x91, 0x27, 0xdc, 0x11, 0x38, 0x06, 0x16, 0xd1, 0x40, 0x60, 0x36, + 0x77, 0x1e, 0xbb, 0x3e, 0x08, 0xda, 0x75, 0xa6, 0x34, 0xa3, 0x29, 0xb7, 0xa7, 0x19, 0x0a, 0xd4, + 0x2e, 0xa4, 0xd5, 0xde, 0xb7, 0xda, 0xd2, 0xda, 0x3c, 0x8d, 0x31, 0xc6, 0xc2, 0xe8, 0x6c, 0xa3, + 0xb2, 0xa6, 0xd9, 0x08, 0x8a, 0x22, 0xaf, 0x14, 0xca, 0x44, 0x4a, 0x7a, 0x99, 0x39, 0x3e, 0xe5, + 0xf0, 0xdd, 0x30, 0xc0, 0x84, 0x95, 0xba, 0xf9, 0x56, 0x51, 0x6b, 0x77, 0x45, 0x7f, 0xed, 0x85, + 0xa8, 0x5a, 0x08, 0x0c, 0x53, 0x2f, 0xc8, 0x80, 0x8a, 0x04, 0x99, 0x17, 0x01, 0xd4, 0x49, 0xab, + 0x6a, 0x1d, 0xf5, 0x1a, 0xb6, 0xc4, 0x6e, 0x41, 0xbb, 0x71, 0x6c, 0x17, 0x13, 0x36, 0x18, 0x2e, + 0x72, 0x43, 0xd9, 0xe4, 0x46, 0x63, 0x4e, 0xd3, 0xc9, 0x95, 0xf9, 0x1b, 0x61, 0xbe, 0x7e, 0x18, + 0x56, 0x9c, 0x88, 0x87, 0x99, 0x6f, 0x07, 0x98, 0xca, 0x01, 0xe5, 0xd1, 0xe1, 0xe1, 0xd8, 0x11, + 0xf3, 0x29, 0xf0, 0x82, 0xc6, 0x47, 0xc7, 0x05, 0xc0, 0x95, 0xf5, 0x37, 0x00, 0x5a, 0xa4, 0x36, + 0x7f, 0x40, 0x63, 0xca, 0xbd, 0x00, 0x19, 0x9f, 0xa5, 0x50, 0xaf, 0xb4, 0x88, 0xf5, 0x6f, 0xd0, + 0x5e, 0xe4, 0x06, 0xd9, 0xe4, 0xc6, 0xe5, 0x9f, 0x43, 0xec, 0xf9, 0xcd, 0xd1, 0xf9, 0x41, 0x83, + 0x5b, 0xca, 0xdd, 0x52, 0xd1, 0x7a, 0xea, 0x59, 0x04, 0xe0, 0x05, 0x38, 0x99, 0xc0, 0x76, 0xed, + 0x1e, 0x0d, 0xc3, 0x0c, 0x38, 0xaf, 0x57, 0x5b, 0xc4, 0xfa, 0x3f, 0x3a, 0x89, 0x00, 0xdc, 0x9d, + 0x76, 0x5d, 0x4a, 0x83, 0xe1, 0x62, 0xa5, 0x93, 0xe5, 0x4a, 0x27, 0x9f, 0x2b, 0x9d, 0x3c, 0xaf, + 0x75, 0x65, 0xb9, 0xd6, 0x95, 0xf7, 0xb5, 0xae, 0xdc, 0xf7, 0xf7, 0x6e, 0xcc, 0x60, 0x26, 0x32, + 0x64, 0x1d, 0xcc, 0xe2, 0x5d, 0xec, 0x3c, 0x1d, 0x7e, 0x86, 0x62, 0x05, 0x7e, 0xad, 0x78, 0x95, + 0xfe, 0x57, 0x00, 0x00, 0x00, 0xff, 0xff, 0x24, 0xb6, 0xa7, 0xfa, 0x31, 0x02, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { @@ -139,6 +150,13 @@ func (m *Params) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if len(m.FeeCollectorAddress) > 0 { + i -= len(m.FeeCollectorAddress) + copy(dAtA[i:], m.FeeCollectorAddress) + i = encodeVarintParams(dAtA, i, uint64(len(m.FeeCollectorAddress))) + i-- + dAtA[i] = 0x1a + } if m.DenomCreationGasConsume != 0 { i = encodeVarintParams(dAtA, i, uint64(m.DenomCreationGasConsume)) i-- @@ -187,6 +205,10 @@ func (m *Params) Size() (n int) { if m.DenomCreationGasConsume != 0 { n += 1 + sovParams(uint64(m.DenomCreationGasConsume)) } + l = len(m.FeeCollectorAddress) + if l > 0 { + n += 1 + l + sovParams(uint64(l)) + } return n } @@ -278,6 +300,38 @@ func (m *Params) Unmarshal(dAtA []byte) error { break } } + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field FeeCollectorAddress", 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.FeeCollectorAddress = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipParams(dAtA[iNdEx:]) From 98d673a4da73e86a619b3d3a0dda96c59e0e382a Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Wed, 13 Sep 2023 16:05:51 +0400 Subject: [PATCH 118/307] polish --- app/app.go | 2 ++ wasmbinding/stargate_allowlist.go | 1 + 2 files changed, 3 insertions(+) diff --git a/app/app.go b/app/app.go index d05ac1d8c..ddee72c45 100644 --- a/app/app.go +++ b/app/app.go @@ -1171,6 +1171,8 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino paramsKeeper.Subspace(routertypes.ModuleName).WithKeyTable(routertypes.ParamKeyTable()) + paramsKeeper.Subspace(globalfee.ModuleName) + paramsKeeper.Subspace(ccvconsumertypes.ModuleName) return paramsKeeper } diff --git a/wasmbinding/stargate_allowlist.go b/wasmbinding/stargate_allowlist.go index e054f0008..f09b9372a 100644 --- a/wasmbinding/stargate_allowlist.go +++ b/wasmbinding/stargate_allowlist.go @@ -24,6 +24,7 @@ func AcceptedStargateQueries() wasmkeeper.AcceptedStargateQueries { "/osmosis.tokenfactory.v1beta1.Query/Params": &tokenfactorytypes.QueryParamsResponse{}, "/osmosis.tokenfactory.v1beta1.Query/DenomAuthorityMetadata": &tokenfactorytypes.QueryDenomAuthorityMetadataResponse{}, "/osmosis.tokenfactory.v1beta1.Query/DenomsFromCreator": &tokenfactorytypes.QueryDenomsFromCreatorResponse{}, + "/osmosis.tokenfactory.v1beta1.Query/BeforeSendHookAddress": &tokenfactorytypes.QueryBeforeSendHookAddressResponse{}, // transfer "/ibc.applications.transfer.v1.Query/DenomTrace": &ibctransfertypes.QueryDenomTraceResponse{}, From fd4df0d3eb67337823b10bf5c7c9e5b7ff9ba060 Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Wed, 13 Sep 2023 16:59:53 +0400 Subject: [PATCH 119/307] add legacy codec registration (just in case); --- x/contractmanager/types/codec.go | 3 ++- x/cron/types/codec.go | 3 ++- x/feeburner/types/codec.go | 3 ++- x/feerefunder/types/codec.go | 3 ++- x/interchainqueries/types/codec.go | 1 + x/interchaintxs/types/codec.go | 1 + 6 files changed, 10 insertions(+), 4 deletions(-) diff --git a/x/contractmanager/types/codec.go b/x/contractmanager/types/codec.go index a53442a0f..14f5aff7e 100644 --- a/x/contractmanager/types/codec.go +++ b/x/contractmanager/types/codec.go @@ -7,7 +7,8 @@ import ( "github.com/cosmos/cosmos-sdk/types/msgservice" ) -func RegisterCodec(_ *codec.LegacyAmino) { +func RegisterCodec(cdc *codec.LegacyAmino) { + cdc.RegisterConcrete(&MsgUpdateParams{}, "neutron.contractmanager.v1.MsgUpdateParams", nil) } func RegisterInterfaces(registry cdctypes.InterfaceRegistry) { diff --git a/x/cron/types/codec.go b/x/cron/types/codec.go index a53442a0f..a52eff2c6 100644 --- a/x/cron/types/codec.go +++ b/x/cron/types/codec.go @@ -7,7 +7,8 @@ import ( "github.com/cosmos/cosmos-sdk/types/msgservice" ) -func RegisterCodec(_ *codec.LegacyAmino) { +func RegisterCodec(cdc *codec.LegacyAmino) { + cdc.RegisterConcrete(&MsgUpdateParams{}, "neutron.cron.MsgUpdateParams", nil) } func RegisterInterfaces(registry cdctypes.InterfaceRegistry) { diff --git a/x/feeburner/types/codec.go b/x/feeburner/types/codec.go index a53442a0f..2ad579f19 100644 --- a/x/feeburner/types/codec.go +++ b/x/feeburner/types/codec.go @@ -7,7 +7,8 @@ import ( "github.com/cosmos/cosmos-sdk/types/msgservice" ) -func RegisterCodec(_ *codec.LegacyAmino) { +func RegisterCodec(cdc *codec.LegacyAmino) { + cdc.RegisterConcrete(&MsgUpdateParams{}, "neutron.feeburner.MsgUpdateParams", nil) } func RegisterInterfaces(registry cdctypes.InterfaceRegistry) { diff --git a/x/feerefunder/types/codec.go b/x/feerefunder/types/codec.go index a53442a0f..81d2f74b0 100644 --- a/x/feerefunder/types/codec.go +++ b/x/feerefunder/types/codec.go @@ -7,7 +7,8 @@ import ( "github.com/cosmos/cosmos-sdk/types/msgservice" ) -func RegisterCodec(_ *codec.LegacyAmino) { +func RegisterCodec(cdc *codec.LegacyAmino) { + cdc.RegisterConcrete(&MsgUpdateParams{}, "neutron.feerefunder.MsgUpdateParams", nil) } func RegisterInterfaces(registry cdctypes.InterfaceRegistry) { diff --git a/x/interchainqueries/types/codec.go b/x/interchainqueries/types/codec.go index 09c014a75..985707a3e 100644 --- a/x/interchainqueries/types/codec.go +++ b/x/interchainqueries/types/codec.go @@ -9,6 +9,7 @@ import ( func RegisterCodec(cdc *codec.LegacyAmino) { cdc.RegisterConcrete(&MsgRegisterInterchainQuery{}, "interchainqueries/RegisterQuery", nil) + cdc.RegisterConcrete(&MsgUpdateParams{}, "interchainqueries/MsgUpdateParams", nil) } func RegisterInterfaces(registry cdctypes.InterfaceRegistry) { diff --git a/x/interchaintxs/types/codec.go b/x/interchaintxs/types/codec.go index 95fb1ccd7..6cf813604 100644 --- a/x/interchaintxs/types/codec.go +++ b/x/interchaintxs/types/codec.go @@ -12,6 +12,7 @@ import ( func RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) { cdc.RegisterConcrete(&MsgRegisterInterchainAccount{}, "/neutron.interchaintxs.v1.MsgRegisterInterchainAccount", nil) cdc.RegisterConcrete(&MsgSubmitTx{}, "/neutron.interchaintxs.v1.MsgSubmitTx", nil) + cdc.RegisterConcrete(&MsgUpdateParams{}, "/neutron.interchaintxs.v1.MsgUpdateParams", nil) } func RegisterInterfaces(registry cdctypes.InterfaceRegistry) { From d8546f82144e2e78986a6d916e2ded0688593716 Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Wed, 13 Sep 2023 18:00:32 +0400 Subject: [PATCH 120/307] implement http query --- proto/neutron/interchaintxs/v1/query.proto | 4 +- x/interchaintxs/module.go | 6 ++- x/interchaintxs/types/query.pb.go | 60 +++++++++++----------- x/interchaintxs/types/query.pb.gw.go | 4 +- 4 files changed, 39 insertions(+), 35 deletions(-) diff --git a/proto/neutron/interchaintxs/v1/query.proto b/proto/neutron/interchaintxs/v1/query.proto index 2960849f6..9af74de0c 100644 --- a/proto/neutron/interchaintxs/v1/query.proto +++ b/proto/neutron/interchaintxs/v1/query.proto @@ -12,11 +12,11 @@ option go_package = "github.com/neutron-org/neutron/x/interchaintxs/types"; service Query { // Parameters queries the parameters of the module. rpc Params(QueryParamsRequest) returns (QueryParamsResponse) { - option (google.api.http).get = "/neutron/interchaintxs/v1/params"; + option (google.api.http).get = "/neutron/interchaintxs/params"; } rpc InterchainAccountAddress(QueryInterchainAccountAddressRequest) returns (QueryInterchainAccountAddressResponse) { - option (google.api.http).get = "/neutron/interchaintxs/v1/{owner_address}/{interchain_account_id}/{connection_id}/interchain_account_address"; + option (google.api.http).get = "/neutron/interchaintxs/{owner_address}/{interchain_account_id}/{connection_id}/interchain_account_address"; } } diff --git a/x/interchaintxs/module.go b/x/interchaintxs/module.go index 125ca7bb4..cbbc934ad 100644 --- a/x/interchaintxs/module.go +++ b/x/interchaintxs/module.go @@ -1,6 +1,7 @@ package interchaintxs import ( + "context" "encoding/json" "fmt" @@ -76,7 +77,10 @@ func (AppModuleBasic) RegisterRESTRoutes(_ client.Context, _ *mux.Router) { } // RegisterGRPCGatewayRoutes registers the gRPC Gateway routes for the module. -func (AppModuleBasic) RegisterGRPCGatewayRoutes(_ client.Context, _ *runtime.ServeMux) { +func (AppModuleBasic) RegisterGRPCGatewayRoutes(clientCtx client.Context, mux *runtime.ServeMux) { + if err := types.RegisterQueryHandlerClient(context.Background(), mux, types.NewQueryClient(clientCtx)); err != nil { + return + } } // GetTxCmd returns the capability module's root tx command. diff --git a/x/interchaintxs/types/query.pb.go b/x/interchaintxs/types/query.pb.go index 705885213..34432afb6 100644 --- a/x/interchaintxs/types/query.pb.go +++ b/x/interchaintxs/types/query.pb.go @@ -216,37 +216,37 @@ func init() { } var fileDescriptor_6130c5f6c54e2428 = []byte{ - // 478 bytes of a gzipped FileDescriptorProto + // 479 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x93, 0x31, 0x6f, 0xd3, 0x40, - 0x14, 0xc7, 0xed, 0x14, 0x22, 0x38, 0x60, 0xb9, 0xb6, 0x52, 0x64, 0x81, 0x53, 0x99, 0x56, 0x2a, - 0x95, 0xf0, 0x29, 0x81, 0x89, 0x76, 0x69, 0xb7, 0x2c, 0x08, 0x32, 0xb2, 0x44, 0x17, 0xfb, 0xe4, - 0x9e, 0xd4, 0xdc, 0x73, 0xef, 0xce, 0xa5, 0x55, 0x94, 0x85, 0x09, 0xc4, 0x82, 0xc4, 0x17, 0x28, - 0x5f, 0x80, 0xcf, 0xd1, 0xb1, 0x12, 0x0b, 0x13, 0x42, 0x09, 0x03, 0x1f, 0x03, 0xf9, 0xee, 0xda, - 0xca, 0x25, 0x26, 0xa8, 0x5b, 0xf4, 0xf2, 0x7b, 0xff, 0xff, 0xff, 0xbd, 0x7b, 0x46, 0xeb, 0x82, - 0x15, 0x5a, 0x82, 0x20, 0x5c, 0x68, 0x26, 0x93, 0x7d, 0xca, 0x85, 0x3e, 0x56, 0xe4, 0xa8, 0x43, - 0x0e, 0x0b, 0x26, 0x4f, 0xe2, 0x5c, 0x82, 0x06, 0xbc, 0xea, 0xa8, 0xb8, 0x42, 0x05, 0x2b, 0x19, - 0x64, 0x60, 0x08, 0x52, 0xfe, 0xb2, 0x70, 0xf0, 0x30, 0x03, 0xc8, 0x0e, 0x18, 0xa1, 0x39, 0x27, - 0x54, 0x08, 0xd0, 0x54, 0x73, 0x10, 0xca, 0xfd, 0xbb, 0x95, 0x80, 0x1a, 0x81, 0x22, 0x43, 0xaa, - 0x98, 0xf5, 0x20, 0x47, 0x9d, 0x21, 0xd3, 0xb4, 0x43, 0x72, 0x9a, 0x71, 0x61, 0x60, 0xc7, 0x6e, - 0xd4, 0x86, 0xcb, 0xa9, 0xa4, 0x23, 0x27, 0x19, 0xad, 0x20, 0xfc, 0xba, 0x14, 0x7a, 0x65, 0x8a, - 0x7d, 0x76, 0x58, 0x30, 0xa5, 0xa3, 0x3e, 0x5a, 0xae, 0x54, 0x55, 0x0e, 0x42, 0x31, 0xbc, 0x8d, - 0x9a, 0xb6, 0xb9, 0xe5, 0xaf, 0xf9, 0x9b, 0xf7, 0xba, 0x8f, 0xe2, 0xb9, 0xb3, 0xc5, 0xb6, 0x6d, - 0xef, 0xd6, 0xd9, 0x8f, 0xb6, 0xd7, 0x77, 0x2d, 0xd1, 0x57, 0x1f, 0xad, 0x1b, 0xd1, 0xde, 0x25, - 0xbb, 0x9b, 0x24, 0x50, 0x08, 0xbd, 0x9b, 0xa6, 0x92, 0xa9, 0x0b, 0x73, 0xfc, 0x18, 0x3d, 0x80, - 0xb7, 0x82, 0xc9, 0x01, 0xb5, 0x75, 0x63, 0x76, 0xb7, 0x7f, 0xdf, 0x14, 0x1d, 0x8b, 0xbb, 0x68, - 0xf5, 0xca, 0x73, 0x40, 0xad, 0xd0, 0x80, 0xa7, 0xad, 0x86, 0x81, 0x97, 0xf9, 0x75, 0x93, 0x5e, - 0x5a, 0x0a, 0x27, 0x20, 0x04, 0x4b, 0xca, 0x35, 0x95, 0xec, 0x92, 0x15, 0xbe, 0x2a, 0xf6, 0xd2, - 0x17, 0x77, 0xde, 0x9f, 0xb6, 0xbd, 0xdf, 0xa7, 0x6d, 0x2f, 0x62, 0x68, 0x63, 0x41, 0x5e, 0xb7, - 0x96, 0x1d, 0x14, 0xcc, 0xc9, 0x52, 0x4d, 0xdf, 0xe2, 0x35, 0x2a, 0xdd, 0x2f, 0x4b, 0xe8, 0xb6, - 0xf1, 0xc1, 0x1f, 0x7c, 0xd4, 0xb4, 0xab, 0xc3, 0x4f, 0x6a, 0x36, 0xfb, 0xf7, 0x5b, 0x05, 0x5b, - 0xff, 0x83, 0xda, 0xa4, 0xd1, 0xe6, 0xbb, 0x6f, 0xbf, 0x3e, 0x37, 0x22, 0xbc, 0x46, 0x16, 0x5c, - 0x07, 0xfe, 0xd8, 0x40, 0xad, 0xba, 0xc1, 0xf1, 0xf6, 0xbf, 0x2c, 0x17, 0x3c, 0x6f, 0xb0, 0x73, - 0xb3, 0x66, 0x37, 0x81, 0x36, 0x13, 0x08, 0x7c, 0x50, 0x3f, 0xc1, 0xb8, 0x72, 0x3d, 0x13, 0x32, - 0x9e, 0x7b, 0x28, 0x13, 0x32, 0xae, 0x1c, 0xc3, 0x84, 0xd4, 0xbf, 0xe1, 0xde, 0xcb, 0xb3, 0x69, - 0xe8, 0x9f, 0x4f, 0x43, 0xff, 0xe7, 0x34, 0xf4, 0x3f, 0xcd, 0x42, 0xef, 0x7c, 0x16, 0x7a, 0xdf, - 0x67, 0xa1, 0xf7, 0xe6, 0x79, 0xc6, 0xf5, 0x7e, 0x31, 0x8c, 0x13, 0x18, 0x5d, 0x24, 0x7a, 0x0a, - 0x32, 0xbb, 0x4c, 0x77, 0x7c, 0x2d, 0x9f, 0x3e, 0xc9, 0x99, 0x1a, 0x36, 0xcd, 0xc7, 0xf7, 0xec, - 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x5d, 0x7b, 0x94, 0x66, 0x42, 0x04, 0x00, 0x00, + 0x14, 0xc7, 0xed, 0x14, 0x22, 0x38, 0x60, 0xb9, 0xb6, 0x52, 0x64, 0x51, 0x07, 0x99, 0x46, 0x82, + 0x4a, 0xf8, 0x94, 0xc0, 0x44, 0xbb, 0xb4, 0x5b, 0x16, 0x04, 0x19, 0x59, 0xa2, 0x8b, 0x7d, 0x72, + 0x4f, 0x90, 0x7b, 0xce, 0xdd, 0xb9, 0xb4, 0x8a, 0xb2, 0x30, 0xa0, 0x8e, 0x48, 0x8c, 0x2c, 0xfd, + 0x04, 0x7c, 0x8e, 0x8e, 0x95, 0x58, 0x98, 0x10, 0x4a, 0x18, 0xf8, 0x18, 0xc8, 0x77, 0xd7, 0x56, + 0x2e, 0x31, 0x45, 0x6c, 0xd1, 0xcb, 0xff, 0xfd, 0xff, 0xbf, 0x7b, 0xef, 0x19, 0x6d, 0x0a, 0x56, + 0x68, 0x09, 0x82, 0x70, 0xa1, 0x99, 0x4c, 0xf6, 0x29, 0x17, 0xfa, 0x50, 0x91, 0x83, 0x2e, 0x99, + 0x14, 0x4c, 0x1e, 0xc5, 0xb9, 0x04, 0x0d, 0x78, 0xdd, 0xa9, 0xe2, 0x8a, 0x2a, 0x58, 0xcb, 0x20, + 0x03, 0xa3, 0x20, 0xe5, 0x2f, 0x2b, 0x0e, 0xee, 0x67, 0x00, 0xd9, 0x5b, 0x46, 0x68, 0xce, 0x09, + 0x15, 0x02, 0x34, 0xd5, 0x1c, 0x84, 0x72, 0xff, 0x6e, 0x25, 0xa0, 0xc6, 0xa0, 0xc8, 0x88, 0x2a, + 0x66, 0x33, 0xc8, 0x41, 0x77, 0xc4, 0x34, 0xed, 0x92, 0x9c, 0x66, 0x5c, 0x18, 0xb1, 0xd3, 0x76, + 0x6a, 0xe1, 0x72, 0x2a, 0xe9, 0xd8, 0x59, 0x46, 0x6b, 0x08, 0xbf, 0x2a, 0x8d, 0x5e, 0x9a, 0xe2, + 0x80, 0x4d, 0x0a, 0xa6, 0x74, 0x34, 0x40, 0xab, 0x95, 0xaa, 0xca, 0x41, 0x28, 0x86, 0xb7, 0x51, + 0xd3, 0x36, 0xb7, 0xfc, 0x07, 0xfe, 0xa3, 0x3b, 0xbd, 0x8d, 0x78, 0xe9, 0xdb, 0x62, 0xdb, 0xb6, + 0x77, 0xe3, 0xf4, 0x7b, 0xdb, 0x1b, 0xb8, 0x96, 0xe8, 0x8b, 0x8f, 0x36, 0x8d, 0x69, 0xff, 0x42, + 0xbb, 0x9b, 0x24, 0x50, 0x08, 0xbd, 0x9b, 0xa6, 0x92, 0xa9, 0xf3, 0x70, 0xfc, 0x10, 0xdd, 0x83, + 0x77, 0x82, 0xc9, 0x21, 0xb5, 0x75, 0x13, 0x76, 0x7b, 0x70, 0xd7, 0x14, 0x9d, 0x16, 0xf7, 0xd0, + 0xfa, 0x65, 0xe6, 0x90, 0x5a, 0xa3, 0x21, 0x4f, 0x5b, 0x0d, 0x23, 0x5e, 0xe5, 0x57, 0x43, 0xfa, + 0x69, 0x69, 0x9c, 0x80, 0x10, 0x2c, 0x29, 0xc7, 0x54, 0x6a, 0x57, 0xac, 0xf1, 0x65, 0xb1, 0x9f, + 0x3e, 0xbf, 0x75, 0x7c, 0xd2, 0xf6, 0x7e, 0x9d, 0xb4, 0xbd, 0x88, 0xa1, 0xce, 0x35, 0xbc, 0x6e, + 0x2c, 0x3b, 0x28, 0x58, 0xc2, 0x52, 0xa5, 0x6f, 0xf1, 0x1a, 0x97, 0xde, 0xe7, 0x15, 0x74, 0xd3, + 0xe4, 0xe0, 0x0f, 0x3e, 0x6a, 0xda, 0xd1, 0xe1, 0xc7, 0x35, 0x93, 0xfd, 0x73, 0x57, 0xc1, 0xd6, + 0xbf, 0x48, 0x2d, 0x69, 0xd4, 0x79, 0xff, 0xf5, 0xe7, 0xa7, 0x46, 0x1b, 0x6f, 0x90, 0xe5, 0xd7, + 0x61, 0x57, 0x85, 0x8f, 0x1b, 0xa8, 0x55, 0xf7, 0x6a, 0xbc, 0xfd, 0xb7, 0xbc, 0x6b, 0x76, 0x1b, + 0xec, 0xfc, 0x5f, 0xb3, 0xc3, 0x9f, 0x18, 0xfc, 0x37, 0x98, 0xd7, 0xe0, 0x4f, 0x2b, 0x77, 0x33, + 0x23, 0xd3, 0xa5, 0x27, 0x32, 0x23, 0xd3, 0xca, 0x19, 0xcc, 0x48, 0xfd, 0xf6, 0xf6, 0x5e, 0x9c, + 0xce, 0x43, 0xff, 0x6c, 0x1e, 0xfa, 0x3f, 0xe6, 0xa1, 0xff, 0x71, 0x11, 0x7a, 0x67, 0x8b, 0xd0, + 0xfb, 0xb6, 0x08, 0xbd, 0xd7, 0xcf, 0x32, 0xae, 0xf7, 0x8b, 0x51, 0x9c, 0xc0, 0xf8, 0x1c, 0xe7, + 0x09, 0xc8, 0xec, 0x02, 0xed, 0xf0, 0x0a, 0x9c, 0x3e, 0xca, 0x99, 0x1a, 0x35, 0xcd, 0x67, 0xf7, + 0xf4, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0x82, 0x97, 0x0f, 0x98, 0x3c, 0x04, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/interchaintxs/types/query.pb.gw.go b/x/interchaintxs/types/query.pb.gw.go index 2375a7805..943b58aab 100644 --- a/x/interchaintxs/types/query.pb.gw.go +++ b/x/interchaintxs/types/query.pb.gw.go @@ -286,9 +286,9 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } var ( - pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"neutron", "interchaintxs", "v1", "params"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"neutron", "interchaintxs", "params"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_InterchainAccountAddress_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5, 2, 6}, []string{"neutron", "interchaintxs", "v1", "owner_address", "interchain_account_id", "connection_id", "interchain_account_address"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_InterchainAccountAddress_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4, 2, 5}, []string{"neutron", "interchaintxs", "owner_address", "interchain_account_id", "connection_id", "interchain_account_address"}, "", runtime.AssumeColonVerbOpt(false))) ) var ( From 5bdacb494033abc0e2518459899321df214d68e0 Mon Sep 17 00:00:00 2001 From: swelf Date: Thu, 14 Sep 2023 12:33:58 +0300 Subject: [PATCH 121/307] combined SudoResponse/Error/Timeout into Sudo --- Makefile | 2 +- app/app.go | 9 +- proto/neutron/contractmanager/failure.proto | 8 +- .../interchaintxs/keeper/interchaintxs.go | 2 +- .../contractmanager/types/expected_keepers.go | 4 +- .../interchaintxs/types/expected_keepers.go | 120 +++-------- .../mocks/transfer/types/expected_keepers.go | 70 ++----- testutil/transfer/keeper/keeper.go | 2 +- wasmbinding/test/custom_message_test.go | 18 +- .../client/cli/query_failure_test.go | 6 +- x/contractmanager/genesis.go | 2 +- x/contractmanager/genesis_test.go | 33 +-- x/contractmanager/ibc_middleware.go | 56 ++--- x/contractmanager/ibc_middleware_test.go | 161 +++++++-------- x/contractmanager/keeper/failure.go | 37 +--- x/contractmanager/keeper/failure_test.go | 76 +++---- x/contractmanager/keeper/sudo.go | 104 ++-------- x/contractmanager/keeper/sudo_test.go | 110 ---------- x/contractmanager/types/failure.pb.go | 191 ++++-------------- x/contractmanager/types/module.go | 11 +- x/contractmanager/types/sudo.go | 34 +--- x/interchaintxs/keeper/ibc_handlers.go | 46 ++--- x/interchaintxs/keeper/ibc_handlers_test.go | 108 ++++------ x/interchaintxs/keeper/keeper.go | 30 +-- x/interchaintxs/keeper/msg_server.go | 4 +- x/interchaintxs/keeper/msg_server_test.go | 30 +-- x/interchaintxs/types/expected_keepers.go | 10 +- x/transfer/ibc_handlers.go | 34 ++-- x/transfer/ibc_handlers_test.go | 79 +++----- x/transfer/keeper/keeper.go | 14 +- x/transfer/module.go | 16 +- x/transfer/types/expected_keepers.go | 7 +- 32 files changed, 454 insertions(+), 980 deletions(-) diff --git a/Makefile b/Makefile index 6af490db8..1bdcceca1 100644 --- a/Makefile +++ b/Makefile @@ -123,7 +123,7 @@ build-static-linux-amd64: go.sum $(BUILDDIR)/ $(DOCKER) cp neutronbinary:/bin/neutrond $(BUILDDIR)/neutrond-linux-amd64 $(DOCKER) rm -f neutronbinary -install-test-binary: check_version go.sum +install-test-binary: go.sum go install -mod=readonly $(BUILD_FLAGS_TEST_BINARY) ./cmd/neutrond ######################################## diff --git a/app/app.go b/app/app.go index c6dd3a84e..6804471df 100644 --- a/app/app.go +++ b/app/app.go @@ -563,7 +563,7 @@ func New( app.BankKeeper, scopedTransferKeeper, app.FeeKeeper, - contractmanager.NewSudoLimitWrapper(app.ContractManagerKeeper), + contractmanager.NewSudoLimitWrapper(app.ContractManagerKeeper, &app.WasmKeeper), ) app.RouterKeeper.SetTransferKeeper(app.TransferKeeper.Keeper) @@ -660,7 +660,7 @@ func New( memKeys[interchaintxstypes.MemStoreKey], app.IBCKeeper.ChannelKeeper, app.ICAControllerKeeper, - contractmanager.NewSudoLimitWrapper(app.ContractManagerKeeper), + contractmanager.NewSudoLimitWrapper(app.ContractManagerKeeper, &app.WasmKeeper), app.FeeKeeper, ) @@ -699,7 +699,10 @@ func New( if len(enabledProposals) != 0 { app.AdminmoduleKeeper.Router().AddRoute(wasm.RouterKey, wasm.NewWasmProposalHandler(app.WasmKeeper, enabledProposals)) } - transferIBCModule := transferSudo.NewIBCModule(app.TransferKeeper) + 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 diff --git a/proto/neutron/contractmanager/failure.proto b/proto/neutron/contractmanager/failure.proto index 2ac24a5a6..d18386884 100644 --- a/proto/neutron/contractmanager/failure.proto +++ b/proto/neutron/contractmanager/failure.proto @@ -13,10 +13,6 @@ message Failure { string address = 1; // Id of the failure under specific address uint64 id = 2; - // Acknowledgement type - string ack_type = 3; - // IBC Packet - ibc.core.channel.v1.Packet packet = 4; - // Acknowledgement - ibc.core.channel.v1.Acknowledgement ack = 5; + // Serialized MessageSudoCallback with Packet and Ack(if exists) + bytes sudo_payload = 3; } diff --git a/testutil/interchaintxs/keeper/interchaintxs.go b/testutil/interchaintxs/keeper/interchaintxs.go index 55c9b43a9..4961a46f9 100644 --- a/testutil/interchaintxs/keeper/interchaintxs.go +++ b/testutil/interchaintxs/keeper/interchaintxs.go @@ -17,7 +17,7 @@ import ( "github.com/neutron-org/neutron/x/interchaintxs/types" ) -func InterchainTxsKeeper(t testing.TB, managerKeeper types.ContractManagerKeeper, refunderKeeper types.FeeRefunderKeeper, icaControllerKeeper types.ICAControllerKeeper, channelKeeper types.ChannelKeeper) (*keeper.Keeper, sdk.Context, *storetypes.KVStoreKey) { +func InterchainTxsKeeper(t testing.TB, managerKeeper types.WasmKeeper, refunderKeeper types.FeeRefunderKeeper, icaControllerKeeper types.ICAControllerKeeper, channelKeeper types.ChannelKeeper) (*keeper.Keeper, sdk.Context, *storetypes.KVStoreKey) { storeKey := sdk.NewKVStoreKey(types.StoreKey) memStoreKey := storetypes.NewMemoryStoreKey(types.MemStoreKey) diff --git a/testutil/mocks/contractmanager/types/expected_keepers.go b/testutil/mocks/contractmanager/types/expected_keepers.go index 40b855702..463ef15c4 100644 --- a/testutil/mocks/contractmanager/types/expected_keepers.go +++ b/testutil/mocks/contractmanager/types/expected_keepers.go @@ -51,7 +51,7 @@ func (mr *MockWasmKeeperMockRecorder) HasContractInfo(ctx, contractAddress inter // Sudo mocks base method. func (m *MockWasmKeeper) Sudo(ctx types.Context, contractAddress types.AccAddress, msg []byte) ([]byte, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "sudo", ctx, contractAddress, msg) + ret := m.ctrl.Call(m, "Sudo", ctx, contractAddress, msg) ret0, _ := ret[0].([]byte) ret1, _ := ret[1].(error) return ret0, ret1 @@ -60,5 +60,5 @@ func (m *MockWasmKeeper) Sudo(ctx types.Context, contractAddress types.AccAddres // Sudo indicates an expected call of Sudo. func (mr *MockWasmKeeperMockRecorder) Sudo(ctx, contractAddress, msg interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "sudo", reflect.TypeOf((*MockWasmKeeper)(nil).Sudo), ctx, contractAddress, msg) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Sudo", reflect.TypeOf((*MockWasmKeeper)(nil).Sudo), ctx, contractAddress, msg) } diff --git a/testutil/mocks/interchaintxs/types/expected_keepers.go b/testutil/mocks/interchaintxs/types/expected_keepers.go index 85fa21af1..d42f778a0 100644 --- a/testutil/mocks/interchaintxs/types/expected_keepers.go +++ b/testutil/mocks/interchaintxs/types/expected_keepers.go @@ -14,8 +14,7 @@ import ( types3 "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" exported "github.com/cosmos/ibc-go/v7/modules/core/exported" gomock "github.com/golang/mock/gomock" - types4 "github.com/neutron-org/neutron/x/contractmanager/types" - types5 "github.com/neutron-org/neutron/x/feerefunder/types" + types4 "github.com/neutron-org/neutron/x/feerefunder/types" ) // MockAccountKeeper is a mock of AccountKeeper interface. @@ -92,57 +91,31 @@ func (mr *MockBankKeeperMockRecorder) SpendableCoins(ctx, addr interface{}) *gom return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SpendableCoins", reflect.TypeOf((*MockBankKeeper)(nil).SpendableCoins), ctx, addr) } -// MockContractManagerKeeper is a mock of ContractManagerKeeper interface. -type MockContractManagerKeeper struct { +// MockWasmKeeper is a mock of WasmKeeper interface. +type MockWasmKeeper struct { ctrl *gomock.Controller - recorder *MockContractManagerKeeperMockRecorder + recorder *MockWasmKeeperMockRecorder } -// MockContractManagerKeeperMockRecorder is the mock recorder for MockContractManagerKeeper. -type MockContractManagerKeeperMockRecorder struct { - mock *MockContractManagerKeeper +// MockWasmKeeperMockRecorder is the mock recorder for MockWasmKeeper. +type MockWasmKeeperMockRecorder struct { + mock *MockWasmKeeper } -// NewMockContractManagerKeeper creates a new mock instance. -func NewMockContractManagerKeeper(ctrl *gomock.Controller) *MockContractManagerKeeper { - mock := &MockContractManagerKeeper{ctrl: ctrl} - mock.recorder = &MockContractManagerKeeperMockRecorder{mock} +// NewMockWasmKeeper creates a new mock instance. +func NewMockWasmKeeper(ctrl *gomock.Controller) *MockWasmKeeper { + mock := &MockWasmKeeper{ctrl: ctrl} + mock.recorder = &MockWasmKeeperMockRecorder{mock} return mock } // EXPECT returns an object that allows the caller to indicate expected use. -func (m *MockContractManagerKeeper) EXPECT() *MockContractManagerKeeperMockRecorder { +func (m *MockWasmKeeper) EXPECT() *MockWasmKeeperMockRecorder { return m.recorder } -// AddContractFailure mocks base method. -func (m *MockContractManagerKeeper) AddContractFailure(ctx types.Context, packet *types3.Packet, address, ackType string, ack *types3.Acknowledgement) { - m.ctrl.T.Helper() - m.ctrl.Call(m, "AddContractFailure", ctx, packet, address, ackType, ack) -} - -// AddContractFailure indicates an expected call of AddContractFailure. -func (mr *MockContractManagerKeeperMockRecorder) AddContractFailure(ctx, packet, address, ackType, ack interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddContractFailure", reflect.TypeOf((*MockContractManagerKeeper)(nil).AddContractFailure), ctx, packet, address, ackType, ack) -} - -// GetParams mocks base method. -func (m *MockContractManagerKeeper) GetParams(ctx types.Context) types4.Params { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GetParams", ctx) - ret0, _ := ret[0].(types4.Params) - return ret0 -} - -// GetParams indicates an expected call of GetParams. -func (mr *MockContractManagerKeeperMockRecorder) GetParams(ctx interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetParams", reflect.TypeOf((*MockContractManagerKeeper)(nil).GetParams), ctx) -} - // HasContractInfo mocks base method. -func (m *MockContractManagerKeeper) HasContractInfo(ctx types.Context, contractAddress types.AccAddress) bool { +func (m *MockWasmKeeper) HasContractInfo(ctx types.Context, contractAddress types.AccAddress) bool { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "HasContractInfo", ctx, contractAddress) ret0, _ := ret[0].(bool) @@ -150,69 +123,24 @@ func (m *MockContractManagerKeeper) HasContractInfo(ctx types.Context, contractA } // HasContractInfo indicates an expected call of HasContractInfo. -func (mr *MockContractManagerKeeperMockRecorder) HasContractInfo(ctx, contractAddress interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HasContractInfo", reflect.TypeOf((*MockContractManagerKeeper)(nil).HasContractInfo), ctx, contractAddress) -} - -// SudoError mocks base method. -func (m *MockContractManagerKeeper) SudoError(ctx types.Context, senderAddress types.AccAddress, request types3.Packet, ack types3.Acknowledgement) ([]byte, error) { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "SudoError", ctx, senderAddress, request, ack) - ret0, _ := ret[0].([]byte) - ret1, _ := ret[1].(error) - return ret0, ret1 -} - -// SudoError indicates an expected call of SudoError. -func (mr *MockContractManagerKeeperMockRecorder) SudoError(ctx, senderAddress, request, ack interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SudoError", reflect.TypeOf((*MockContractManagerKeeper)(nil).SudoError), ctx, senderAddress, request, ack) -} - -// SudoOnChanOpenAck mocks base method. -func (m *MockContractManagerKeeper) SudoOnChanOpenAck(ctx types.Context, contractAddress types.AccAddress, details types4.OpenAckDetails) ([]byte, error) { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "SudoOnChanOpenAck", ctx, contractAddress, details) - ret0, _ := ret[0].([]byte) - ret1, _ := ret[1].(error) - return ret0, ret1 -} - -// SudoOnChanOpenAck indicates an expected call of SudoOnChanOpenAck. -func (mr *MockContractManagerKeeperMockRecorder) SudoOnChanOpenAck(ctx, contractAddress, details interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SudoOnChanOpenAck", reflect.TypeOf((*MockContractManagerKeeper)(nil).SudoOnChanOpenAck), ctx, contractAddress, details) -} - -// SudoResponse mocks base method. -func (m *MockContractManagerKeeper) SudoResponse(ctx types.Context, senderAddress types.AccAddress, request types3.Packet, ack types3.Acknowledgement) ([]byte, error) { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "SudoResponse", ctx, senderAddress, request, ack) - ret0, _ := ret[0].([]byte) - ret1, _ := ret[1].(error) - return ret0, ret1 -} - -// SudoResponse indicates an expected call of SudoResponse. -func (mr *MockContractManagerKeeperMockRecorder) SudoResponse(ctx, senderAddress, request, ack interface{}) *gomock.Call { +func (mr *MockWasmKeeperMockRecorder) HasContractInfo(ctx, contractAddress interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SudoResponse", reflect.TypeOf((*MockContractManagerKeeper)(nil).SudoResponse), ctx, senderAddress, request, ack) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HasContractInfo", reflect.TypeOf((*MockWasmKeeper)(nil).HasContractInfo), ctx, contractAddress) } -// SudoTimeout mocks base method. -func (m *MockContractManagerKeeper) SudoTimeout(ctx types.Context, senderAddress types.AccAddress, request types3.Packet) ([]byte, error) { +// Sudo mocks base method. +func (m *MockWasmKeeper) Sudo(ctx types.Context, contractAddress types.AccAddress, msg []byte) ([]byte, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "SudoTimeout", ctx, senderAddress, request) + ret := m.ctrl.Call(m, "Sudo", ctx, contractAddress, msg) ret0, _ := ret[0].([]byte) ret1, _ := ret[1].(error) return ret0, ret1 } -// SudoTimeout indicates an expected call of SudoTimeout. -func (mr *MockContractManagerKeeperMockRecorder) SudoTimeout(ctx, senderAddress, request interface{}) *gomock.Call { +// Sudo indicates an expected call of Sudo. +func (mr *MockWasmKeeperMockRecorder) Sudo(ctx, contractAddress, msg interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SudoTimeout", reflect.TypeOf((*MockContractManagerKeeper)(nil).SudoTimeout), ctx, senderAddress, request) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Sudo", reflect.TypeOf((*MockWasmKeeper)(nil).Sudo), ctx, contractAddress, msg) } // MockICAControllerKeeper is a mock of ICAControllerKeeper interface. @@ -321,7 +249,7 @@ func (m *MockFeeRefunderKeeper) EXPECT() *MockFeeRefunderKeeperMockRecorder { } // DistributeAcknowledgementFee mocks base method. -func (m *MockFeeRefunderKeeper) DistributeAcknowledgementFee(ctx types.Context, receiver types.AccAddress, packetID types5.PacketID) { +func (m *MockFeeRefunderKeeper) DistributeAcknowledgementFee(ctx types.Context, receiver types.AccAddress, packetID types4.PacketID) { m.ctrl.T.Helper() m.ctrl.Call(m, "DistributeAcknowledgementFee", ctx, receiver, packetID) } @@ -333,7 +261,7 @@ func (mr *MockFeeRefunderKeeperMockRecorder) DistributeAcknowledgementFee(ctx, r } // DistributeTimeoutFee mocks base method. -func (m *MockFeeRefunderKeeper) DistributeTimeoutFee(ctx types.Context, receiver types.AccAddress, packetID types5.PacketID) { +func (m *MockFeeRefunderKeeper) DistributeTimeoutFee(ctx types.Context, receiver types.AccAddress, packetID types4.PacketID) { m.ctrl.T.Helper() m.ctrl.Call(m, "DistributeTimeoutFee", ctx, receiver, packetID) } @@ -345,7 +273,7 @@ func (mr *MockFeeRefunderKeeperMockRecorder) DistributeTimeoutFee(ctx, receiver, } // LockFees mocks base method. -func (m *MockFeeRefunderKeeper) LockFees(ctx types.Context, payer types.AccAddress, packetID types5.PacketID, fee types5.Fee) error { +func (m *MockFeeRefunderKeeper) LockFees(ctx types.Context, payer types.AccAddress, packetID types4.PacketID, fee types4.Fee) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "LockFees", ctx, payer, packetID, fee) ret0, _ := ret[0].(error) diff --git a/testutil/mocks/transfer/types/expected_keepers.go b/testutil/mocks/transfer/types/expected_keepers.go index 122edaeb2..3123b6eb5 100644 --- a/testutil/mocks/transfer/types/expected_keepers.go +++ b/testutil/mocks/transfer/types/expected_keepers.go @@ -14,31 +14,31 @@ import ( types2 "github.com/neutron-org/neutron/x/feerefunder/types" ) -// MockContractManagerKeeper is a mock of ContractManagerKeeper interface. -type MockContractManagerKeeper struct { +// MockWasmKeeper is a mock of WasmKeeper interface. +type MockWasmKeeper struct { ctrl *gomock.Controller - recorder *MockContractManagerKeeperMockRecorder + recorder *MockWasmKeeperMockRecorder } -// MockContractManagerKeeperMockRecorder is the mock recorder for MockContractManagerKeeper. -type MockContractManagerKeeperMockRecorder struct { - mock *MockContractManagerKeeper +// MockWasmKeeperMockRecorder is the mock recorder for MockWasmKeeper. +type MockWasmKeeperMockRecorder struct { + mock *MockWasmKeeper } -// NewMockContractManagerKeeper creates a new mock instance. -func NewMockContractManagerKeeper(ctrl *gomock.Controller) *MockContractManagerKeeper { - mock := &MockContractManagerKeeper{ctrl: ctrl} - mock.recorder = &MockContractManagerKeeperMockRecorder{mock} +// NewMockWasmKeeper creates a new mock instance. +func NewMockWasmKeeper(ctrl *gomock.Controller) *MockWasmKeeper { + mock := &MockWasmKeeper{ctrl: ctrl} + mock.recorder = &MockWasmKeeperMockRecorder{mock} return mock } // EXPECT returns an object that allows the caller to indicate expected use. -func (m *MockContractManagerKeeper) EXPECT() *MockContractManagerKeeperMockRecorder { +func (m *MockWasmKeeper) EXPECT() *MockWasmKeeperMockRecorder { return m.recorder } // HasContractInfo mocks base method. -func (m *MockContractManagerKeeper) HasContractInfo(ctx types.Context, contractAddress types.AccAddress) bool { +func (m *MockWasmKeeper) HasContractInfo(ctx types.Context, contractAddress types.AccAddress) bool { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "HasContractInfo", ctx, contractAddress) ret0, _ := ret[0].(bool) @@ -46,54 +46,24 @@ func (m *MockContractManagerKeeper) HasContractInfo(ctx types.Context, contractA } // HasContractInfo indicates an expected call of HasContractInfo. -func (mr *MockContractManagerKeeperMockRecorder) HasContractInfo(ctx, contractAddress interface{}) *gomock.Call { +func (mr *MockWasmKeeperMockRecorder) HasContractInfo(ctx, contractAddress interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HasContractInfo", reflect.TypeOf((*MockContractManagerKeeper)(nil).HasContractInfo), ctx, contractAddress) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HasContractInfo", reflect.TypeOf((*MockWasmKeeper)(nil).HasContractInfo), ctx, contractAddress) } -// SudoError mocks base method. -func (m *MockContractManagerKeeper) SudoError(ctx types.Context, senderAddress types.AccAddress, request types1.Packet, ack types1.Acknowledgement) ([]byte, error) { +// Sudo mocks base method. +func (m *MockWasmKeeper) Sudo(ctx types.Context, contractAddress types.AccAddress, msg []byte) ([]byte, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "SudoError", ctx, senderAddress, request, ack) + ret := m.ctrl.Call(m, "Sudo", ctx, contractAddress, msg) ret0, _ := ret[0].([]byte) ret1, _ := ret[1].(error) return ret0, ret1 } -// SudoError indicates an expected call of SudoError. -func (mr *MockContractManagerKeeperMockRecorder) SudoError(ctx, senderAddress, request, ack interface{}) *gomock.Call { +// Sudo indicates an expected call of Sudo. +func (mr *MockWasmKeeperMockRecorder) Sudo(ctx, contractAddress, msg interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SudoError", reflect.TypeOf((*MockContractManagerKeeper)(nil).SudoError), ctx, senderAddress, request, ack) -} - -// SudoResponse mocks base method. -func (m *MockContractManagerKeeper) SudoResponse(ctx types.Context, senderAddress types.AccAddress, request types1.Packet, ack types1.Acknowledgement) ([]byte, error) { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "SudoResponse", ctx, senderAddress, request, ack) - ret0, _ := ret[0].([]byte) - ret1, _ := ret[1].(error) - return ret0, ret1 -} - -// SudoResponse indicates an expected call of SudoResponse. -func (mr *MockContractManagerKeeperMockRecorder) SudoResponse(ctx, senderAddress, request, ack interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SudoResponse", reflect.TypeOf((*MockContractManagerKeeper)(nil).SudoResponse), ctx, senderAddress, request, ack) -} - -// SudoTimeout mocks base method. -func (m *MockContractManagerKeeper) SudoTimeout(ctx types.Context, senderAddress types.AccAddress, request types1.Packet) ([]byte, error) { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "SudoTimeout", ctx, senderAddress, request) - ret0, _ := ret[0].([]byte) - ret1, _ := ret[1].(error) - return ret0, ret1 -} - -// SudoTimeout indicates an expected call of SudoTimeout. -func (mr *MockContractManagerKeeperMockRecorder) SudoTimeout(ctx, senderAddress, request interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SudoTimeout", reflect.TypeOf((*MockContractManagerKeeper)(nil).SudoTimeout), ctx, senderAddress, request) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Sudo", reflect.TypeOf((*MockWasmKeeper)(nil).Sudo), ctx, contractAddress, msg) } // MockFeeRefunderKeeper is a mock of FeeRefunderKeeper interface. diff --git a/testutil/transfer/keeper/keeper.go b/testutil/transfer/keeper/keeper.go index 8f35aa8a6..532701629 100644 --- a/testutil/transfer/keeper/keeper.go +++ b/testutil/transfer/keeper/keeper.go @@ -22,7 +22,7 @@ import ( "github.com/neutron-org/neutron/x/transfer/types" ) -func TransferKeeper(t testing.TB, managerKeeper types.ContractManagerKeeper, refunderKeeper types.FeeRefunderKeeper, channelKeeper types.ChannelKeeper, authKeeper types.AccountKeeper) (*keeper.KeeperTransferWrapper, sdk.Context, *storetypes.KVStoreKey) { +func TransferKeeper(t testing.TB, managerKeeper types.WasmKeeper, refunderKeeper types.FeeRefunderKeeper, channelKeeper types.ChannelKeeper, authKeeper types.AccountKeeper) (*keeper.KeeperTransferWrapper, sdk.Context, *storetypes.KVStoreKey) { storeKey := sdk.NewKVStoreKey(transfertypes.StoreKey) memStoreKey := storetypes.NewMemoryStoreKey("mem_" + transfertypes.StoreKey) diff --git a/wasmbinding/test/custom_message_test.go b/wasmbinding/test/custom_message_test.go index 384b84cd6..1f5d11d5b 100644 --- a/wasmbinding/test/custom_message_test.go +++ b/wasmbinding/test/custom_message_test.go @@ -3,10 +3,9 @@ package test import ( "encoding/json" "fmt" + keeper2 "github.com/neutron-org/neutron/x/contractmanager/keeper" "testing" - contractmanagertypes "github.com/neutron-org/neutron/x/contractmanager/types" - ibcchanneltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" "github.com/stretchr/testify/suite" @@ -609,8 +608,10 @@ func (suite *CustomMessengerTestSuite) TestResubmitFailureAck() { ack := ibcchanneltypes.Acknowledgement{ Response: &ibcchanneltypes.Acknowledgement_Result{Result: []byte("Result")}, } + payload, err := keeper2.PrepareSudoCallbackMessage(packet, &ack) + require.NoError(suite.T(), err) failureID := suite.messenger.ContractmanagerKeeper.GetNextFailureIDKey(suite.ctx, suite.contractAddress.String()) - suite.messenger.ContractmanagerKeeper.AddContractFailure(suite.ctx, &packet, suite.contractAddress.String(), contractmanagertypes.Ack, &ack) + suite.messenger.ContractmanagerKeeper.AddContractFailure(suite.ctx, suite.contractAddress.String(), payload) // Craft message msg, err := json.Marshal(bindings.NeutronMsg{ @@ -639,11 +640,10 @@ func (suite *CustomMessengerTestSuite) TestResubmitFailureTimeout() { // Add failure packet := ibcchanneltypes.Packet{} - ack := ibcchanneltypes.Acknowledgement{ - Response: &ibcchanneltypes.Acknowledgement_Error{Error: "ErrorSudoPayload"}, - } + payload, err := keeper2.PrepareSudoCallbackMessage(packet, nil) + require.NoError(suite.T(), err) failureID := suite.messenger.ContractmanagerKeeper.GetNextFailureIDKey(suite.ctx, suite.contractAddress.String()) - suite.messenger.ContractmanagerKeeper.AddContractFailure(suite.ctx, &packet, suite.contractAddress.String(), "timeout", &ack) + suite.messenger.ContractmanagerKeeper.AddContractFailure(suite.ctx, suite.contractAddress.String(), payload) // Craft message msg, err := json.Marshal(bindings.NeutronMsg{ @@ -676,7 +676,9 @@ func (suite *CustomMessengerTestSuite) TestResubmitFailureFromDifferentContract( Response: &ibcchanneltypes.Acknowledgement_Error{Error: "ErrorSudoPayload"}, } failureID := suite.messenger.ContractmanagerKeeper.GetNextFailureIDKey(suite.ctx, testutil.TestOwnerAddress) - suite.messenger.ContractmanagerKeeper.AddContractFailure(suite.ctx, &packet, testutil.TestOwnerAddress, contractmanagertypes.Ack, &ack) + payload, err := keeper2.PrepareSudoCallbackMessage(packet, &ack) + require.NoError(suite.T(), err) + suite.messenger.ContractmanagerKeeper.AddContractFailure(suite.ctx, testutil.TestOwnerAddress, payload) // Craft message msg, err := json.Marshal(bindings.NeutronMsg{ diff --git a/x/contractmanager/client/cli/query_failure_test.go b/x/contractmanager/client/cli/query_failure_test.go index f76d69a44..d590d39e3 100644 --- a/x/contractmanager/client/cli/query_failure_test.go +++ b/x/contractmanager/client/cli/query_failure_test.go @@ -6,8 +6,6 @@ import ( "strconv" "testing" - channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" - "github.com/neutron-org/neutron/app" tmcli "github.com/cometbft/cometbft/libs/cli" @@ -40,8 +38,8 @@ func networkWithFailureObjects(t *testing.T, n int) (*network.Network, []types.F require.NoError(t, err) acc := sdktypes.AccAddress(pub.Address()) failure := types.Failure{ - Address: acc.String(), - Packet: &channeltypes.Packet{}, + Address: acc.String(), + SudoPayload: []byte("&channeltypes.Packet{}"), } nullify.Fill(&failure) state.FailuresList = append(state.FailuresList, failure) diff --git a/x/contractmanager/genesis.go b/x/contractmanager/genesis.go index 35604dfe4..fd5751c6b 100644 --- a/x/contractmanager/genesis.go +++ b/x/contractmanager/genesis.go @@ -11,7 +11,7 @@ import ( func InitGenesis(ctx sdk.Context, k keeper.Keeper, genState types.GenesisState) { // Set all the failure for _, elem := range genState.FailuresList { - k.AddContractFailure(ctx, elem.Packet, elem.Address, elem.AckType, elem.Ack) + k.AddContractFailure(ctx, elem.Address, elem.SudoPayload) } // this line is used by starport scaffolding # genesis/module/init err := k.SetParams(ctx, genState.Params) diff --git a/x/contractmanager/genesis_test.go b/x/contractmanager/genesis_test.go index feb3ff00a..ddfa24682 100644 --- a/x/contractmanager/genesis_test.go +++ b/x/contractmanager/genesis_test.go @@ -1,6 +1,7 @@ package contractmanager_test import ( + "github.com/neutron-org/neutron/x/contractmanager/keeper" "testing" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" @@ -14,25 +15,33 @@ import ( ) func TestGenesis(t *testing.T) { + payload1, err := keeper.PrepareSudoCallbackMessage( + channeltypes.Packet{ + Sequence: 1, + }, + &channeltypes.Acknowledgement{ + Response: &channeltypes.Acknowledgement_Result{ + Result: []byte("Result"), + }, + }) + require.NoError(t, err) + payload2, err := keeper.PrepareSudoCallbackMessage( + channeltypes.Packet{ + Sequence: 2, + }, nil) genesisState := types.GenesisState{ Params: types.DefaultParams(), FailuresList: []types.Failure{ { - Address: "address1", - Id: 1, - AckType: types.Ack, - Packet: &channeltypes.Packet{ - Sequence: 1, - }, + Address: "address1", + Id: 1, + SudoPayload: payload1, }, { - Address: "address1", - Id: 2, - AckType: "timeout", - Packet: &channeltypes.Packet{ - Sequence: 2, - }, + Address: "address1", + Id: 2, + SudoPayload: payload2, }, }, // this line is used by starport scaffolding # genesis/test/state diff --git a/x/contractmanager/ibc_middleware.go b/x/contractmanager/ibc_middleware.go index 237c7f731..841897459 100644 --- a/x/contractmanager/ibc_middleware.go +++ b/x/contractmanager/ibc_middleware.go @@ -4,68 +4,40 @@ import ( "fmt" "github.com/cometbft/cometbft/libs/log" sdk "github.com/cosmos/cosmos-sdk/types" - channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" "github.com/neutron-org/neutron/neutronutils" neutronerrors "github.com/neutron-org/neutron/neutronutils/errors" + "github.com/neutron-org/neutron/x/contractmanager/keeper" contractmanagertypes "github.com/neutron-org/neutron/x/contractmanager/types" ) type SudoLimitWrapper struct { - contractmanagertypes.ContractManagerWrapper + contractManager keeper.Keeper + contractmanagertypes.WasmKeeper } -// NewSudoLimitWrapper suppresses an error from a sudo contract handler and saves it to a store -func NewSudoLimitWrapper(keeper contractmanagertypes.ContractManagerWrapper) contractmanagertypes.ContractManagerWrapper { +// NewSudoLimitWrapper suppresses an error from a Sudo contract handler and saves it to a store +func NewSudoLimitWrapper(contractManager keeper.Keeper, sudoKeeper contractmanagertypes.WasmKeeper) contractmanagertypes.WasmKeeper { return SudoLimitWrapper{ - keeper, + contractManager, + sudoKeeper, } } -func (k SudoLimitWrapper) SudoResponse(ctx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, ack channeltypes.Acknowledgement) ([]byte, error) { - err := k.sudo(ctx, senderAddress, request, &ack) - if err != nil { - k.Logger(ctx).Debug("SudoLimitWrapper: failed to sudo contract", "error", err, "ackType", "Result") - } - return nil, nil -} - -func (k SudoLimitWrapper) SudoError(ctx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, ack channeltypes.Acknowledgement) ([]byte, error) { - err := k.sudo(ctx, senderAddress, request, &ack) - if err != nil { - k.Logger(ctx).Debug("SudoLimitWrapper: failed to sudo contract", "error", err, "ackType", "ErrorSudoPayload") - } - return nil, nil -} - -func (k SudoLimitWrapper) SudoTimeout(ctx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet) ([]byte, error) { - err := k.sudo(ctx, senderAddress, request, nil) - if err != nil { - k.Logger(ctx).Debug("SudoLimitWrapper: failed to sudo contract", "error", err, "ackType", "Timeout") - } - return nil, nil -} - -// sudo calls underlying sudo handlers with a limited amount of gas +// Sudo calls underlying Sudo handlers with a limited amount of gas // in case of `out of gas` panic it converts the panic into an error and stops `out of gas` panic propagation -func (k SudoLimitWrapper) sudo(ctx sdk.Context, sender sdk.AccAddress, packet channeltypes.Packet, ack *channeltypes.Acknowledgement) (err error) { - ackType := contractmanagertypes.Ack - cacheCtx, writeFn := neutronutils.CreateCachedContext(ctx, k.ContractManagerWrapper.GetParams(ctx).SudoCallGasLimit) +// if error happens during the Sudo call, we store the data that raised the error, and return the error +func (k SudoLimitWrapper) Sudo(ctx sdk.Context, contractAddress sdk.AccAddress, msg []byte) (resp []byte, err error) { + cacheCtx, writeFn := neutronutils.CreateCachedContext(ctx, k.contractManager.GetParams(ctx).SudoCallGasLimit) func() { defer neutronerrors.OutOfGasRecovery(cacheCtx.GasMeter(), &err) // Actually we have only one kind of error returned from acknowledgement // maybe later we'll retrieve actual errors from events - if ack == nil { - ackType = contractmanagertypes.Timeout - _, err = k.ContractManagerWrapper.SudoTimeout(cacheCtx, sender, packet) - } else if ack.GetError() != "" { - _, err = k.ContractManagerWrapper.SudoError(cacheCtx, sender, packet, *ack) - } else { - _, err = k.ContractManagerWrapper.SudoResponse(cacheCtx, sender, packet, *ack) - } + resp, err = k.WasmKeeper.Sudo(cacheCtx, contractAddress, msg) + }() if err != nil { // the contract either returned an error or panicked with `out of gas` - k.ContractManagerWrapper.AddContractFailure(ctx, &packet, sender.String(), ackType, ack) + k.contractManager.AddContractFailure(ctx, contractAddress.String(), msg) } else { writeFn() } diff --git a/x/contractmanager/ibc_middleware_test.go b/x/contractmanager/ibc_middleware_test.go index 57012be71..b1b964fbf 100644 --- a/x/contractmanager/ibc_middleware_test.go +++ b/x/contractmanager/ibc_middleware_test.go @@ -1,82 +1,83 @@ package contractmanager -import ( - tmdb "github.com/cometbft/cometbft-db" - "github.com/cometbft/cometbft/libs/log" - tmproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cosmos/cosmos-sdk/store" - storetypes "github.com/cosmos/cosmos-sdk/store/types" - sdk "github.com/cosmos/cosmos-sdk/types" - icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" - channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" - "github.com/golang/mock/gomock" - mock_types "github.com/neutron-org/neutron/testutil/mocks/interchaintxs/types" - "github.com/neutron-org/neutron/x/contractmanager/types" - "github.com/stretchr/testify/require" - "testing" -) - -var ( - ShouldNotBeWrittenKey = []byte("shouldnotkey") - ShouldNotBeWritten = []byte("should not be written") - ShouldBeWritten = []byte("should be written") - TestOwnerAddress = "neutron17dtl0mjt3t77kpuhg2edqzjpszulwhgzcdvagh" -) - -func ShouldBeWrittenKey(suffix string) []byte { - return append([]byte("shouldkey"), []byte(suffix)...) -} - -func NewSudoLimitMiddleware(t testing.TB, cm types.ContractManagerWrapper) (SudoLimitWrapper, sdk.Context, *storetypes.KVStoreKey) { - storeKey := sdk.NewKVStoreKey(types.StoreKey) - - db := tmdb.NewMemDB() - stateStore := store.NewCommitMultiStore(db) - stateStore.MountStoreWithDB(storeKey, storetypes.StoreTypeIAVL, db) - require.NoError(t, stateStore.LoadLatestVersion()) - - k := SudoLimitWrapper{ContractManagerWrapper: cm} - - ctx := sdk.NewContext(stateStore, tmproto.Header{}, false, log.NewNopLogger()) - - return k, ctx, storeKey -} - -func TestSudo(t *testing.T) { - ctrl := gomock.NewController(t) - defer ctrl.Finish() - cmKeeper := mock_types.NewMockContractManagerKeeper(ctrl) - middleware, infCtx, storeKey := NewSudoLimitMiddleware(t, cmKeeper) - st := infCtx.KVStore(storeKey) - - p := channeltypes.Packet{ - Sequence: 100, - SourcePort: icatypes.ControllerPortPrefix + TestOwnerAddress + ".ica0", - SourceChannel: "channel-0", - } - contractAddress := sdk.AccAddress{} - errACK := channeltypes.Acknowledgement{ - Response: &channeltypes.Acknowledgement_Error{ - Error: "error", - }, - } - //errAckData, err := channeltypes.SubModuleCdc.MarshalJSON(&errACK) - //require.NoError(t, err) - //resACK := channeltypes.Acknowledgement{ - // Response: &channeltypes.Acknowledgement_Result{Result: []byte("Result")}, - //} - //resAckData, err := channeltypes.SubModuleCdc.MarshalJSON(&resACK) - //require.NoError(t, err) - - // success during SudoError - ctx := infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - cmKeeper.EXPECT().SudoError(gomock.AssignableToTypeOf(ctx), contractAddress, p, errACK).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, errAck channeltypes.Acknowledgement) { - st := cachedCtx.KVStore(storeKey) - st.Set(ShouldBeWrittenKey("sudoerror"), ShouldBeWritten) - }).Return(nil, nil) - cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 6000}) - err := middleware.sudo(ctx, contractAddress, p, &errACK) - require.NoError(t, err) - require.Equal(t, ShouldBeWritten, st.Get(ShouldBeWrittenKey("sudoerror"))) - require.Equal(t, uint64(3050), ctx.GasMeter().GasConsumed()) -} +// +//import ( +// tmdb "github.com/cometbft/cometbft-db" +// "github.com/cometbft/cometbft/libs/log" +// tmproto "github.com/cometbft/cometbft/proto/tendermint/types" +// "github.com/cosmos/cosmos-sdk/store" +// storetypes "github.com/cosmos/cosmos-sdk/store/types" +// sdk "github.com/cosmos/cosmos-sdk/types" +// icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" +// channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" +// "github.com/golang/mock/gomock" +// mock_types "github.com/neutron-org/neutron/testutil/mocks/interchaintxs/types" +// "github.com/neutron-org/neutron/x/contractmanager/types" +// "github.com/stretchr/testify/require" +// "testing" +//) +// +//var ( +// ShouldNotBeWrittenKey = []byte("shouldnotkey") +// ShouldNotBeWritten = []byte("should not be written") +// ShouldBeWritten = []byte("should be written") +// TestOwnerAddress = "neutron17dtl0mjt3t77kpuhg2edqzjpszulwhgzcdvagh" +//) +// +//func ShouldBeWrittenKey(suffix string) []byte { +// return append([]byte("shouldkey"), []byte(suffix)...) +//} +// +//func NewSudoLimitMiddleware(t testing.TB, cm types.SudoWrapper) (SudoLimitWrapper, sdk.Context, *storetypes.KVStoreKey) { +// storeKey := sdk.NewKVStoreKey(types.StoreKey) +// +// db := tmdb.NewMemDB() +// stateStore := store.NewCommitMultiStore(db) +// stateStore.MountStoreWithDB(storeKey, storetypes.StoreTypeIAVL, db) +// require.NoError(t, stateStore.LoadLatestVersion()) +// +// k := SudoLimitWrapper{SudoWrapper: cm} +// +// ctx := sdk.NewContext(stateStore, tmproto.Header{}, false, log.NewNopLogger()) +// +// return k, ctx, storeKey +//} +// +//func TestSudo(t *testing.T) { +// ctrl := gomock.NewController(t) +// defer ctrl.Finish() +// cmKeeper := mock_types.NewMockContractManagerKeeper(ctrl) +// middleware, infCtx, storeKey := NewSudoLimitMiddleware(t, cmKeeper) +// st := infCtx.KVStore(storeKey) +// +// p := channeltypes.Packet{ +// Sequence: 100, +// SourcePort: icatypes.ControllerPortPrefix + TestOwnerAddress + ".ica0", +// SourceChannel: "channel-0", +// } +// contractAddress := sdk.AccAddress{} +// errACK := channeltypes.Acknowledgement{ +// Response: &channeltypes.Acknowledgement_Error{ +// Error: "error", +// }, +// } +// //errAckData, err := channeltypes.SubModuleCdc.MarshalJSON(&errACK) +// //require.NoError(t, err) +// //resACK := channeltypes.Acknowledgement{ +// // Response: &channeltypes.Acknowledgement_Result{Result: []byte("Result")}, +// //} +// //resAckData, err := channeltypes.SubModuleCdc.MarshalJSON(&resACK) +// //require.NoError(t, err) +// +// // success during SudoError +// ctx := infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) +// cmKeeper.EXPECT().SudoError(gomock.AssignableToTypeOf(ctx), contractAddress, p, errACK).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, errAck channeltypes.Acknowledgement) { +// st := cachedCtx.KVStore(storeKey) +// st.Set(ShouldBeWrittenKey("sudoerror"), ShouldBeWritten) +// }).Return(nil, nil) +// cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 6000}) +// err := middleware.Sudo(ctx, contractAddress, p, &errACK) +// require.NoError(t, err) +// require.Equal(t, ShouldBeWritten, st.Get(ShouldBeWrittenKey("sudoerror"))) +// require.Equal(t, uint64(3050), ctx.GasMeter().GasConsumed()) +//} diff --git a/x/contractmanager/keeper/failure.go b/x/contractmanager/keeper/failure.go index 581b4f19c..038227591 100644 --- a/x/contractmanager/keeper/failure.go +++ b/x/contractmanager/keeper/failure.go @@ -5,17 +5,14 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - ibcchanneltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" "github.com/neutron-org/neutron/x/contractmanager/types" ) // AddContractFailure adds a specific failure to the store using address as the key -func (k Keeper) AddContractFailure(ctx sdk.Context, packet *ibcchanneltypes.Packet, address, ackType string, ack *ibcchanneltypes.Acknowledgement) { +func (k Keeper) AddContractFailure(ctx sdk.Context, address string, sudoPayload []byte) { failure := types.Failure{ - Address: address, - AckType: ackType, - Packet: packet, - Ack: ack, + Address: address, + SudoPayload: sudoPayload, } nextFailureID := k.GetNextFailureIDKey(ctx, failure.GetAddress()) failure.Id = nextFailureID @@ -40,7 +37,7 @@ func (k Keeper) GetNextFailureIDKey(ctx sdk.Context, address string) uint64 { return 0 } -// GetAllFailure returns all failures +// GetAllFailures returns all failures func (k Keeper) GetAllFailures(ctx sdk.Context) (list []types.Failure) { store := prefix.NewStore(ctx.KVStore(k.storeKey), types.ContractFailuresKey) iterator := sdk.KVStorePrefixIterator(store, []byte{}) @@ -71,30 +68,12 @@ func (k Keeper) GetFailure(ctx sdk.Context, contractAddr sdk.AccAddress, id uint // ResubmitFailure tries to call sudo handler for contract with same parameters as initially. func (k Keeper) ResubmitFailure(ctx sdk.Context, contractAddr sdk.AccAddress, failure *types.Failure) error { - if failure.Packet == nil { - return errors.Wrapf(types.IncorrectFailureToResubmit, "cannot resubmit failure without packet info; failureId = %d", failure.Id) + if failure.SudoPayload == nil { + return errors.Wrapf(types.IncorrectFailureToResubmit, "cannot resubmit failure without sudo payload; failureId = %d", failure.Id) } - switch failure.GetAckType() { - case types.Ack: - if failure.GetAck() == nil { - return errors.Wrapf(types.IncorrectFailureToResubmit, "cannot resubmit failure without acknowledgement; failureId = %d", failure.Id) - } - if failure.GetAck().GetError() == "" { - if _, err := k.SudoResponse(ctx, contractAddr, *failure.Packet, *failure.Ack); err != nil { - return errors.Wrapf(types.FailedToResubmitFailure, "cannot resubmit failure ack response; failureId = %d; err = %s", failure.Id, err) - } - } else { - if _, err := k.SudoError(ctx, contractAddr, *failure.Packet, *failure.Ack); err != nil { - return errors.Wrapf(types.FailedToResubmitFailure, "cannot resubmit failure ack error; failureId = %d; err = %s", failure.Id, err) - } - } - case types.Timeout: - if _, err := k.SudoTimeout(ctx, contractAddr, *failure.Packet); err != nil { - return errors.Wrapf(types.FailedToResubmitFailure, "cannot resubmit failure ack timeout; failureId = %d; err = %s", failure.Id, err) - } - default: - return errors.Wrapf(types.IncorrectAckType, "cannot resubmit failure with incorrect ackType = %s", failure.GetAckType()) + if _, err := k.wasmKeeper.Sudo(ctx, contractAddr, failure.SudoPayload); err != nil { + return errors.Wrapf(types.FailedToResubmitFailure, "cannot resubmit failure ack; failureId = %d; err = %s", failure.Id, err) } // Cleanup failure since we resubmitted it successfully diff --git a/x/contractmanager/keeper/failure_test.go b/x/contractmanager/keeper/failure_test.go index aa00b4c91..5edd064c3 100644 --- a/x/contractmanager/keeper/failure_test.go +++ b/x/contractmanager/keeper/failure_test.go @@ -26,7 +26,7 @@ import ( // Prevent strconv unused error var _ = strconv.IntSize -func createNFailure(keeper *keeper.Keeper, ctx sdk.Context, addresses, failures int) [][]types.Failure { +func createNFailure(k *keeper.Keeper, ctx sdk.Context, addresses, failures int) [][]types.Failure { pubBz := make([]byte, ed25519.PubKeySize) pub := &ed25519.PubKey{Key: pubBz} @@ -43,9 +43,12 @@ func createNFailure(keeper *keeper.Keeper, ctx sdk.Context, addresses, failures } items[i][c].Address = acc.String() items[i][c].Id = uint64(c) - items[i][c].Packet = &p - items[i][c].Ack = nil - keeper.AddContractFailure(ctx, &p, items[i][c].Address, "", nil) + sudo, err := keeper.PrepareSudoCallbackMessage(p, nil) + if err != nil { + panic(err) + } + items[i][c].SudoPayload = sudo + k.AddContractFailure(ctx, items[i][c].Address, sudo) } } return items @@ -83,11 +86,12 @@ func TestAddGetFailure(t *testing.T) { contractAddress := sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress) k, ctx := keepertest.ContractManagerKeeper(t, nil) failureID := k.GetNextFailureIDKey(ctx, contractAddress.String()) - k.AddContractFailure(ctx, &channeltypes.Packet{}, contractAddress.String(), types.Ack, &channeltypes.Acknowledgement{}) + sudoPayload := []byte("payload") + k.AddContractFailure(ctx, contractAddress.String(), sudoPayload) failure, err := k.GetFailure(ctx, contractAddress, failureID) require.NoError(t, err) require.Equal(t, failureID, failure.Id) - require.Equal(t, types.Ack, failure.AckType) + require.Equal(t, sudoPayload, failure.SudoPayload) // non-existent id _, err = k.GetFailure(ctx, contractAddress, failureID+1) @@ -117,28 +121,31 @@ func TestResubmitFailure(t *testing.T) { // add ack failure packet := channeltypes.Packet{} failureID := k.GetNextFailureIDKey(ctx, contractAddr.String()) - k.AddContractFailure(ctx, &packet, contractAddr.String(), types.Ack, &ack) + payload, err := keeper.PrepareSudoCallbackMessage(packet, &ack) + require.NoError(t, err) + k.AddContractFailure(ctx, contractAddr.String(), payload) // success response - xSuc := types.MessageResponse{} - xSuc.Response.Data = data - xSuc.Response.Request = channeltypes.Packet{} + xSuc := types.MessageSudoCallback{Response: &types.ResponseSudoPayload{ + Request: channeltypes.Packet{}, + Data: data, + }} msgSuc, err := json.Marshal(xSuc) require.NoError(t, err) // error response - xErr := types.MessageError{} - xErr.Error.Request = channeltypes.Packet{} - xErr.Error.Details = "not able to do IBC tx" + xErr := types.MessageSudoCallback{Error: &types.ErrorSudoPayload{ + Request: channeltypes.Packet{}, + Details: "not able to do IBC tx", + }} msgErr, err := json.Marshal(xErr) require.NoError(t, err) // timeout response - xTimeout := types.MessageTimeout{} - xTimeout.Timeout.Request = channeltypes.Packet{} + xTimeout := types.MessageSudoCallback{Timeout: &types.TimeoutPayload{Request: channeltypes.Packet{}}} msgTimeout, err := json.Marshal(xTimeout) require.NoError(t, err) // case: successful resubmit with ack and ack = response - wk.EXPECT().Sudo(gomock.AssignableToTypeOf(ctx), contractAddr, msgSuc).Return([]byte{}, nil) + wk.EXPECT().Sudo(ctx, contractAddr, msgSuc).Return([]byte{}, nil) failure, err := k.GetFailure(ctx, contractAddr, failureID) require.NoError(t, err) @@ -150,14 +157,16 @@ func TestResubmitFailure(t *testing.T) { // case: failed resubmit with ack and ack = response failureID2 := k.GetNextFailureIDKey(ctx, contractAddr.String()) - k.AddContractFailure(ctx, &packet, contractAddr.String(), types.Ack, &ack) + payload, err = keeper.PrepareSudoCallbackMessage(packet, &ack) + require.NoError(t, err) + k.AddContractFailure(ctx, contractAddr.String(), payload) - wk.EXPECT().Sudo(gomock.AssignableToTypeOf(ctx), contractAddr, msgSuc).Return(nil, fmt.Errorf("failed to sudo")) + wk.EXPECT().Sudo(ctx, contractAddr, msgSuc).Return(nil, fmt.Errorf("failed to sudo")) failure2, err := k.GetFailure(ctx, contractAddr, failureID2) require.NoError(t, err) err = k.ResubmitFailure(ctx, contractAddr, failure2) - require.ErrorContains(t, err, "cannot resubmit failure ack response") + require.ErrorContains(t, err, "cannot resubmit failure ack") // failure is still there failureAfter2, err := k.GetFailure(ctx, contractAddr, failureID2) require.NoError(t, err) @@ -166,7 +175,9 @@ func TestResubmitFailure(t *testing.T) { // case: successful resubmit with ack and ack = error // add error failure failureID3 := k.GetNextFailureIDKey(ctx, contractAddr.String()) - k.AddContractFailure(ctx, &packet, contractAddr.String(), types.Ack, &ackError) + payload, err = keeper.PrepareSudoCallbackMessage(packet, &ackError) + require.NoError(t, err) + k.AddContractFailure(ctx, contractAddr.String(), payload) wk.EXPECT().Sudo(gomock.AssignableToTypeOf(ctx), contractAddr, msgErr).Return([]byte{}, nil) @@ -180,14 +191,16 @@ func TestResubmitFailure(t *testing.T) { // case: failed resubmit with ack and ack = error failureID4 := k.GetNextFailureIDKey(ctx, contractAddr.String()) - k.AddContractFailure(ctx, &packet, contractAddr.String(), types.Ack, &ackError) + payload, err = keeper.PrepareSudoCallbackMessage(packet, &ackError) + require.NoError(t, err) + k.AddContractFailure(ctx, contractAddr.String(), payload) wk.EXPECT().Sudo(gomock.AssignableToTypeOf(ctx), contractAddr, msgErr).Return(nil, fmt.Errorf("failed to sudo")) failure4, err := k.GetFailure(ctx, contractAddr, failureID4) require.NoError(t, err) err = k.ResubmitFailure(ctx, contractAddr, failure4) - require.ErrorContains(t, err, "cannot resubmit failure ack error") + require.ErrorContains(t, err, "cannot resubmit failure ack") // failure is still there failureAfter4, err := k.GetFailure(ctx, contractAddr, failureID4) require.NoError(t, err) @@ -196,7 +209,9 @@ func TestResubmitFailure(t *testing.T) { // case: successful resubmit with timeout // add error failure failureID5 := k.GetNextFailureIDKey(ctx, contractAddr.String()) - k.AddContractFailure(ctx, &packet, contractAddr.String(), "timeout", nil) + payload, err = keeper.PrepareSudoCallbackMessage(packet, nil) + require.NoError(t, err) + k.AddContractFailure(ctx, contractAddr.String(), payload) wk.EXPECT().Sudo(gomock.AssignableToTypeOf(ctx), contractAddr, msgTimeout).Return([]byte{}, nil) @@ -210,25 +225,18 @@ func TestResubmitFailure(t *testing.T) { // case: failed resubmit with timeout failureID6 := k.GetNextFailureIDKey(ctx, contractAddr.String()) - k.AddContractFailure(ctx, &packet, contractAddr.String(), "timeout", nil) + payload, err = keeper.PrepareSudoCallbackMessage(packet, nil) + require.NoError(t, err) + k.AddContractFailure(ctx, contractAddr.String(), payload) wk.EXPECT().Sudo(gomock.AssignableToTypeOf(ctx), contractAddr, msgTimeout).Return(nil, fmt.Errorf("failed to sudo")) failure6, err := k.GetFailure(ctx, contractAddr, failureID6) require.NoError(t, err) err = k.ResubmitFailure(ctx, contractAddr, failure6) - require.ErrorContains(t, err, "cannot resubmit failure ack timeout") + require.ErrorContains(t, err, "cannot resubmit failure ack") // failure is still there failureAfter6, err := k.GetFailure(ctx, contractAddr, failureID6) require.NoError(t, err) require.Equal(t, failureAfter6.Id, failure6.Id) - - // no Failure.Ack field found for ackType = 'ack' - failureID7 := k.GetNextFailureIDKey(ctx, contractAddr.String()) - k.AddContractFailure(ctx, &packet, contractAddr.String(), types.Ack, nil) - - failure7, err := k.GetFailure(ctx, contractAddr, failureID7) - require.NoError(t, err) - err = k.ResubmitFailure(ctx, contractAddr, failure7) - require.ErrorContains(t, err, "cannot resubmit failure without acknowledgement") } diff --git a/x/contractmanager/keeper/sudo.go b/x/contractmanager/keeper/sudo.go index 1b33639cb..4c5a24402 100644 --- a/x/contractmanager/keeper/sudo.go +++ b/x/contractmanager/keeper/sudo.go @@ -20,97 +20,37 @@ func (k Keeper) HasContractInfo(ctx sdk.Context, contractAddress sdk.AccAddress) return k.wasmKeeper.HasContractInfo(ctx, contractAddress) } -func prepareSudoCallbackMessage(request channeltypes.Packet, ack *channeltypes.Acknowledgement) types.MessageSudoCallback { - m := types.MessageSudoCallback{ - Response: nil, - Error: nil, - Timeout: nil, +func PrepareSudoCallbackMessage(request channeltypes.Packet, ack *channeltypes.Acknowledgement) ([]byte, error) { + m := types.MessageSudoCallback{} + if ack != nil && ack.GetError() == "" { + m.Response = &types.ResponseSudoPayload{ + Data: ack.GetResult(), + Request: request, + } + } else if ack != nil { + m.Error = &types.ErrorSudoPayload{ + Request: request, + Details: ack.GetError(), + } + } else { + m.Timeout = &types.TimeoutPayload{Request: request} } - return m -} - -func (k Keeper) SudoResponse( - ctx sdk.Context, - senderAddress sdk.AccAddress, - request channeltypes.Packet, - ack channeltypes.Acknowledgement, -) ([]byte, error) { - k.Logger(ctx).Debug("SudoResponse", "senderAddress", senderAddress, "request", request, "msg", ack.GetResult()) - - x := types.MessageResponse{} - x.Response.Data = ack.GetResult() - x.Response.Request = request - m, err := json.Marshal(x) - if err != nil { - k.Logger(ctx).Error("SudoResponse: failed to marshal MessageResponse message", - "error", err, "request", request, "contract_address", senderAddress) - return nil, fmt.Errorf("failed to marshal MessageResponse: %v", err) - } - - resp, err := k.wasmKeeper.Sudo(ctx, senderAddress, m) + data, err := json.Marshal(m) if err != nil { - k.Logger(ctx).Debug("SudoResponse: failed to sudo", - "error", err, "contract_address", senderAddress) - return nil, fmt.Errorf("failed to sudo: %v", err) + return nil, fmt.Errorf("failed to marshal MessageSudoCallback: %v", err) } - - return resp, nil + return data, nil } -func (k Keeper) SudoTimeout( - ctx sdk.Context, - senderAddress sdk.AccAddress, - request channeltypes.Packet, -) ([]byte, error) { - k.Logger(ctx).Info("SudoTimeout", "senderAddress", senderAddress, "request", request) - - x := types.MessageTimeout{} - x.Timeout.Request = request - m, err := json.Marshal(x) - if err != nil { - k.Logger(ctx).Error("failed to marshal MessageTimeout message", - "error", err, "request", request, "contract_address", senderAddress) - return nil, fmt.Errorf("failed to marshal MessageTimeout: %v", err) - } - - k.Logger(ctx).Info("SudoTimeout sending request", "data", string(m)) - - resp, err := k.wasmKeeper.Sudo(ctx, senderAddress, m) - if err != nil { - k.Logger(ctx).Debug("SudoTimeout: failed to sudo", - "error", err, "contract_address", senderAddress) - return nil, fmt.Errorf("failed to sudo: %v", err) +func PrepareOpenAckCallbackMessage(details types.OpenAckDetails) ([]byte, error) { + x := types.MessageOnChanOpenAck{ + OpenAck: details, } - - return resp, nil -} - -func (k Keeper) SudoError( - ctx sdk.Context, - senderAddress sdk.AccAddress, - request channeltypes.Packet, - ack channeltypes.Acknowledgement, -) ([]byte, error) { - k.Logger(ctx).Debug("SudoError", "senderAddress", senderAddress, "request", request) - - x := types.MessageError{} - x.Error.Request = request - x.Error.Details = ack.GetError() m, err := json.Marshal(x) if err != nil { - k.Logger(ctx).Error("SudoError: failed to marshal MessageError message", - "error", err, "contract_address", senderAddress, "request", request) - return nil, fmt.Errorf("failed to marshal MessageError: %v", err) - } - - resp, err := k.wasmKeeper.Sudo(ctx, senderAddress, m) - if err != nil { - k.Logger(ctx).Debug("SudoError: failed to sudo", - "error", err, "contract_address", senderAddress) - return nil, fmt.Errorf("failed to sudo: %v", err) + return nil, fmt.Errorf("failed to marshal MessageOnChanOpenAck: %v", err) } - - return resp, nil + return m, nil } func (k Keeper) SudoOnChanOpenAck( diff --git a/x/contractmanager/keeper/sudo_test.go b/x/contractmanager/keeper/sudo_test.go index 8767acd93..12862b4de 100644 --- a/x/contractmanager/keeper/sudo_test.go +++ b/x/contractmanager/keeper/sudo_test.go @@ -6,7 +6,6 @@ import ( "testing" sdk "github.com/cosmos/cosmos-sdk/types" - channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" "github.com/golang/mock/gomock" "github.com/stretchr/testify/require" @@ -21,115 +20,6 @@ func init() { app.GetDefaultConfig() } -func TestSudoHasAddress(t *testing.T) { - ctrl := gomock.NewController(t) - defer ctrl.Finish() - wk := mock_types.NewMockWasmKeeper(ctrl) - - k, ctx := keepertest.ContractManagerKeeper(t, wk) - address := sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress) - - wk.EXPECT().HasContractInfo(gomock.Any(), address).Return(true) - has := k.HasContractInfo(ctx, address) - require.Equal(t, true, has) - - wk.EXPECT().HasContractInfo(gomock.Any(), address).Return(false) - has = k.HasContractInfo(ctx, address) - require.Equal(t, false, has) -} - -func TestSudoResponse(t *testing.T) { - ctrl := gomock.NewController(t) - defer ctrl.Finish() - wk := mock_types.NewMockWasmKeeper(ctrl) - - k, ctx := keepertest.ContractManagerKeeper(t, wk) - address := sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress) - - sudoErrorMsg := types.MessageResponse{} - p := channeltypes.Packet{} - a := channeltypes.Acknowledgement{Response: &channeltypes.Acknowledgement_Result{Result: []byte("data")}} - sudoErrorMsg.Response.Data = a.GetResult() - sudoErrorMsg.Response.Request = p - wk.EXPECT().Sudo(gomock.Any(), address, mustJSON(sudoErrorMsg)).Return([]byte("success"), nil) - resp, err := k.SudoResponse(ctx, address, sudoErrorMsg.Response.Request, a) - require.NoError(t, err) - require.Equal(t, []byte("success"), resp) - - wk.EXPECT().Sudo(gomock.Any(), address, mustJSON(sudoErrorMsg)).Return(nil, fmt.Errorf("internal contract error")) - resp, err = k.SudoResponse(ctx, address, sudoErrorMsg.Response.Request, a) - require.Nil(t, resp) - require.ErrorContains(t, err, "internal contract error") -} - -func TestSudoError(t *testing.T) { - ctrl := gomock.NewController(t) - defer ctrl.Finish() - wk := mock_types.NewMockWasmKeeper(ctrl) - - k, ctx := keepertest.ContractManagerKeeper(t, wk) - address := sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress) - - sudoErrorMsg := types.MessageError{} - p := channeltypes.Packet{} - a := channeltypes.Acknowledgement{Response: &channeltypes.Acknowledgement_Error{ - Error: "details", - }} - sudoErrorMsg.Error.Details = a.GetError() - sudoErrorMsg.Error.Request = p - wk.EXPECT().Sudo(gomock.Any(), address, mustJSON(sudoErrorMsg)).Return([]byte("success"), nil) - resp, err := k.SudoError(ctx, address, sudoErrorMsg.Error.Request, a) - require.NoError(t, err) - require.Equal(t, []byte("success"), resp) - - wk.EXPECT().Sudo(gomock.Any(), address, mustJSON(sudoErrorMsg)).Return(nil, fmt.Errorf("internal contract error")) - resp, err = k.SudoError(ctx, address, sudoErrorMsg.Error.Request, a) - require.Nil(t, resp) - require.ErrorContains(t, err, "internal contract error") -} - -func TestSudoTimeout(t *testing.T) { - ctrl := gomock.NewController(t) - defer ctrl.Finish() - wk := mock_types.NewMockWasmKeeper(ctrl) - - k, ctx := keepertest.ContractManagerKeeper(t, wk) - address := sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress) - - sudoTimeoutMsg := types.MessageTimeout{} - p := channeltypes.Packet{} - sudoTimeoutMsg.Timeout.Request = p - wk.EXPECT().Sudo(gomock.Any(), address, mustJSON(sudoTimeoutMsg)).Return([]byte("success"), nil) - resp, err := k.SudoTimeout(ctx, address, sudoTimeoutMsg.Timeout.Request) - require.NoError(t, err) - require.Equal(t, []byte("success"), resp) - - wk.EXPECT().Sudo(gomock.Any(), address, mustJSON(sudoTimeoutMsg)).Return(nil, fmt.Errorf("internal contract error")) - resp, err = k.SudoTimeout(ctx, address, sudoTimeoutMsg.Timeout.Request) - require.Nil(t, resp) - require.ErrorContains(t, err, "internal contract error") -} - -func TestSudoOnChanOpen(t *testing.T) { - ctrl := gomock.NewController(t) - defer ctrl.Finish() - wk := mock_types.NewMockWasmKeeper(ctrl) - - k, ctx := keepertest.ContractManagerKeeper(t, wk) - address := sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress) - - sudoOpenAckMsg := types.MessageOnChanOpenAck{} - wk.EXPECT().Sudo(gomock.Any(), address, mustJSON(sudoOpenAckMsg)).Return([]byte("success"), nil) - resp, err := k.SudoOnChanOpenAck(ctx, address, sudoOpenAckMsg.OpenAck) - require.NoError(t, err) - require.Equal(t, []byte("success"), resp) - - wk.EXPECT().Sudo(gomock.Any(), address, mustJSON(sudoOpenAckMsg)).Return(nil, fmt.Errorf("internal contract error")) - resp, err = k.SudoOnChanOpenAck(ctx, address, sudoOpenAckMsg.OpenAck) - require.Nil(t, resp) - require.ErrorContains(t, err, "internal contract error") -} - func TestSudoTxQueryResult(t *testing.T) { ctrl := gomock.NewController(t) defer ctrl.Finish() diff --git a/x/contractmanager/types/failure.pb.go b/x/contractmanager/types/failure.pb.go index abc19b1a4..063afa74f 100644 --- a/x/contractmanager/types/failure.pb.go +++ b/x/contractmanager/types/failure.pb.go @@ -6,7 +6,7 @@ package types import ( fmt "fmt" proto "github.com/cosmos/gogoproto/proto" - types "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" + _ "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" io "io" math "math" math_bits "math/bits" @@ -31,12 +31,8 @@ type Failure struct { Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` // Id of the failure under specific address Id uint64 `protobuf:"varint,2,opt,name=id,proto3" json:"id,omitempty"` - // Acknowledgement type - AckType string `protobuf:"bytes,3,opt,name=ack_type,json=ackType,proto3" json:"ack_type,omitempty"` - // IBC Packet - Packet *types.Packet `protobuf:"bytes,4,opt,name=packet,proto3" json:"packet,omitempty"` - // Acknowledgement - Ack *types.Acknowledgement `protobuf:"bytes,5,opt,name=ack,proto3" json:"ack,omitempty"` + // Serialized MessageSudoCallback with Packet and Ack(if exists) + SudoPayload []byte `protobuf:"bytes,3,opt,name=sudo_payload,json=sudoPayload,proto3" json:"sudo_payload,omitempty"` } func (m *Failure) Reset() { *m = Failure{} } @@ -86,23 +82,9 @@ func (m *Failure) GetId() uint64 { return 0 } -func (m *Failure) GetAckType() string { +func (m *Failure) GetSudoPayload() []byte { if m != nil { - return m.AckType - } - return "" -} - -func (m *Failure) GetPacket() *types.Packet { - if m != nil { - return m.Packet - } - return nil -} - -func (m *Failure) GetAck() *types.Acknowledgement { - if m != nil { - return m.Ack + return m.SudoPayload } return nil } @@ -116,25 +98,22 @@ func init() { } var fileDescriptor_fba0c26e85dad46e = []byte{ - // 288 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x90, 0xb1, 0x4e, 0xeb, 0x30, - 0x14, 0x86, 0xeb, 0xb6, 0xb7, 0xbd, 0x18, 0x89, 0xc1, 0x0b, 0x06, 0x24, 0xab, 0x20, 0x90, 0xba, - 0x60, 0xab, 0x54, 0xea, 0x0e, 0x03, 0x73, 0x15, 0x31, 0xb1, 0x20, 0xe7, 0xe4, 0x90, 0x5a, 0x69, - 0xed, 0xc8, 0x75, 0x0b, 0x7d, 0x0b, 0xde, 0x87, 0x17, 0x60, 0xec, 0xc8, 0x88, 0x9a, 0x17, 0x41, - 0x49, 0x93, 0x05, 0xd8, 0x7e, 0x4b, 0xdf, 0xe7, 0x73, 0xce, 0x4f, 0xaf, 0x2c, 0xae, 0x82, 0x77, - 0x56, 0x81, 0xb3, 0xc1, 0x6b, 0x08, 0x0b, 0x6d, 0x75, 0x8a, 0x5e, 0x3d, 0x6b, 0x33, 0x5f, 0x79, - 0x94, 0xb9, 0x77, 0xc1, 0xb1, 0xe3, 0x1a, 0x93, 0x3f, 0xb0, 0xd3, 0x73, 0x13, 0x83, 0x02, 0xe7, - 0x51, 0xc1, 0x4c, 0x5b, 0x8b, 0x73, 0xb5, 0x1e, 0x35, 0x71, 0xef, 0x5e, 0xbc, 0x13, 0xda, 0xbf, - 0xdf, 0xff, 0xc6, 0x38, 0xed, 0xeb, 0x24, 0xf1, 0xb8, 0x5c, 0x72, 0x32, 0x20, 0xc3, 0x83, 0xa8, - 0x79, 0xb2, 0x23, 0xda, 0x36, 0x09, 0x6f, 0x0f, 0xc8, 0xb0, 0x1b, 0xb5, 0x4d, 0xc2, 0x4e, 0xe8, - 0x7f, 0x0d, 0xd9, 0x53, 0xd8, 0xe4, 0xc8, 0x3b, 0x35, 0x0a, 0xd9, 0xc3, 0x26, 0x47, 0x36, 0xa6, - 0xbd, 0x5c, 0x43, 0x86, 0x81, 0x77, 0x07, 0x64, 0x78, 0x78, 0x73, 0x26, 0x4d, 0x0c, 0xb2, 0x5c, - 0x42, 0x36, 0x93, 0xd7, 0x23, 0x39, 0xad, 0x90, 0xa8, 0x46, 0xd9, 0x84, 0x76, 0x34, 0x64, 0xfc, - 0x5f, 0x65, 0x5c, 0xfe, 0x69, 0xdc, 0x42, 0x66, 0xdd, 0xcb, 0x1c, 0x93, 0x14, 0x17, 0x68, 0x43, - 0x54, 0x0a, 0x77, 0xd3, 0x8f, 0x9d, 0x20, 0xdb, 0x9d, 0x20, 0x5f, 0x3b, 0x41, 0xde, 0x0a, 0xd1, - 0xda, 0x16, 0xa2, 0xf5, 0x59, 0x88, 0xd6, 0xe3, 0x24, 0x35, 0x61, 0xb6, 0x8a, 0x25, 0xb8, 0x85, - 0xaa, 0xeb, 0xb9, 0x76, 0x3e, 0x6d, 0xb2, 0x7a, 0xfd, 0xd5, 0x69, 0x79, 0xcc, 0x32, 0xee, 0x55, - 0xb5, 0x8c, 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, 0x40, 0x42, 0xfd, 0x80, 0x7b, 0x01, 0x00, 0x00, + // 230 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, 0x4f, 0xce, 0xcf, 0x2b, 0x29, 0x4a, 0x4c, 0x2e, 0xc9, 0x4d, 0xcc, 0x4b, + 0x4c, 0x4f, 0x2d, 0xd2, 0x4f, 0x4b, 0xcc, 0xcc, 0x29, 0x2d, 0x4a, 0xd5, 0x2b, 0x28, 0xca, 0x2f, + 0xc9, 0x17, 0x12, 0x87, 0x2a, 0xd3, 0x43, 0x53, 0x26, 0xa5, 0x98, 0x99, 0x94, 0xac, 0x9f, 0x9c, + 0x5f, 0x94, 0xaa, 0x9f, 0x9c, 0x91, 0x98, 0x97, 0x97, 0x9a, 0xa3, 0x5f, 0x66, 0x08, 0x63, 0x42, + 0xf4, 0x2a, 0x85, 0x71, 0xb1, 0xbb, 0x41, 0x0c, 0x13, 0x92, 0xe0, 0x62, 0x4f, 0x4c, 0x49, 0x29, + 0x4a, 0x2d, 0x2e, 0x96, 0x60, 0x54, 0x60, 0xd4, 0xe0, 0x0c, 0x82, 0x71, 0x85, 0xf8, 0xb8, 0x98, + 0x32, 0x53, 0x24, 0x98, 0x14, 0x18, 0x35, 0x58, 0x82, 0x98, 0x32, 0x53, 0x84, 0x14, 0xb9, 0x78, + 0x8a, 0x4b, 0x53, 0xf2, 0xe3, 0x0b, 0x12, 0x2b, 0x73, 0xf2, 0x13, 0x53, 0x24, 0x98, 0x15, 0x18, + 0x35, 0x78, 0x82, 0xb8, 0x41, 0x62, 0x01, 0x10, 0x21, 0xa7, 0x80, 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, 0x4b, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, + 0xd5, 0x87, 0x3a, 0x5c, 0x37, 0xbf, 0x28, 0x1d, 0xc6, 0xd6, 0xaf, 0xc0, 0xf0, 0x6d, 0x49, 0x65, + 0x41, 0x6a, 0x71, 0x12, 0x1b, 0xd8, 0xc1, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc1, 0xf7, + 0xe5, 0xa7, 0x15, 0x01, 0x00, 0x00, } func (m *Failure) Marshal() (dAtA []byte, err error) { @@ -157,34 +136,10 @@ func (m *Failure) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.Ack != nil { - { - size, err := m.Ack.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintFailure(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x2a - } - if m.Packet != nil { - { - size, err := m.Packet.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintFailure(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x22 - } - if len(m.AckType) > 0 { - i -= len(m.AckType) - copy(dAtA[i:], m.AckType) - i = encodeVarintFailure(dAtA, i, uint64(len(m.AckType))) + if len(m.SudoPayload) > 0 { + i -= len(m.SudoPayload) + copy(dAtA[i:], m.SudoPayload) + i = encodeVarintFailure(dAtA, i, uint64(len(m.SudoPayload))) i-- dAtA[i] = 0x1a } @@ -227,18 +182,10 @@ func (m *Failure) Size() (n int) { if m.Id != 0 { n += 1 + sovFailure(uint64(m.Id)) } - l = len(m.AckType) + l = len(m.SudoPayload) if l > 0 { n += 1 + l + sovFailure(uint64(l)) } - if m.Packet != nil { - l = m.Packet.Size() - n += 1 + l + sovFailure(uint64(l)) - } - if m.Ack != nil { - l = m.Ack.Size() - n += 1 + l + sovFailure(uint64(l)) - } return n } @@ -330,77 +277,9 @@ func (m *Failure) Unmarshal(dAtA []byte) error { } case 3: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field AckType", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFailure - } - 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 ErrInvalidLengthFailure - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthFailure - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.AckType = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Packet", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFailure - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthFailure - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthFailure - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Packet == nil { - m.Packet = &types.Packet{} - } - if err := m.Packet.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 5: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Ack", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field SudoPayload", wireType) } - var msglen int + var byteLen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowFailure @@ -410,26 +289,24 @@ func (m *Failure) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + byteLen |= int(b&0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { + if byteLen < 0 { return ErrInvalidLengthFailure } - postIndex := iNdEx + msglen + postIndex := iNdEx + byteLen if postIndex < 0 { return ErrInvalidLengthFailure } if postIndex > l { return io.ErrUnexpectedEOF } - if m.Ack == nil { - m.Ack = &types.Acknowledgement{} - } - if err := m.Ack.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err + m.SudoPayload = append(m.SudoPayload[:0], dAtA[iNdEx:postIndex]...) + if m.SudoPayload == nil { + m.SudoPayload = []byte{} } iNdEx = postIndex default: diff --git a/x/contractmanager/types/module.go b/x/contractmanager/types/module.go index 540b2afd3..e7efcf2d9 100644 --- a/x/contractmanager/types/module.go +++ b/x/contractmanager/types/module.go @@ -2,15 +2,8 @@ package types import ( sdk "github.com/cosmos/cosmos-sdk/types" - channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" ) -type ContractManagerWrapper interface { - HasContractInfo(ctx sdk.Context, contractAddress sdk.AccAddress) bool - AddContractFailure(ctx sdk.Context, packet *channeltypes.Packet, address, ackType string, ack *channeltypes.Acknowledgement) - SudoResponse(ctx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, ack channeltypes.Acknowledgement) ([]byte, error) - SudoError(ctx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, ack channeltypes.Acknowledgement) ([]byte, error) - SudoTimeout(ctx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet) ([]byte, error) - SudoOnChanOpenAck(ctx sdk.Context, contractAddress sdk.AccAddress, details OpenAckDetails) ([]byte, error) - GetParams(ctx sdk.Context) (params Params) +type Sudo interface { + Sudo(ctx sdk.Context, contractAddress sdk.AccAddress, msg []byte) ([]byte, error) } diff --git a/x/contractmanager/types/sudo.go b/x/contractmanager/types/sudo.go index 8b2d0144d..a5745fcbb 100644 --- a/x/contractmanager/types/sudo.go +++ b/x/contractmanager/types/sudo.go @@ -23,10 +23,12 @@ type MessageKVQueryResult struct { } `json:"kv_query_result"` } +// MessageSudoCallback is passed to a contract's sudo() entrypoint when an interchain +// transaction failed with a timeout. type MessageSudoCallback struct { - Response *ResponseSudoPayload `json:"response"` - Error *ErrorSudoPayload `json:"error"` - Timeout *TimeoutPayload `json:"timeout"` + Response *ResponseSudoPayload `json:"response,omitempty"` + Error *ErrorSudoPayload `json:"error,omitempty"` + Timeout *TimeoutPayload `json:"timeout,omitempty"` } type ResponseSudoPayload struct { @@ -43,32 +45,6 @@ type TimeoutPayload struct { Request channeltypes.Packet `json:"request"` } -// MessageTimeout is passed to a contract's sudo() entrypoint when an interchain -// transaction failed with a timeout. -type MessageTimeout struct { - Timeout struct { - Request channeltypes.Packet `json:"request"` - } `json:"timeout"` -} - -// MessageResponse is passed to a contract's sudo() entrypoint when an interchain -// transaction was executed successfully. -type MessageResponse struct { - Response struct { - Request channeltypes.Packet `json:"request"` - Data []byte `json:"data"` // Message data - } `json:"response"` -} - -// MessageError is passed to a contract's sudo() entrypoint when an interchain -// transaction was executed with an error. -type MessageError struct { - Error struct { - Request channeltypes.Packet `json:"request"` - Details string `json:"details"` - } `json:"error"` -} - // MessageOnChanOpenAck is passed to a contract's sudo() entrypoint when an interchain // account was successfully registered. type MessageOnChanOpenAck struct { diff --git a/x/interchaintxs/keeper/ibc_handlers.go b/x/interchaintxs/keeper/ibc_handlers.go index 4fe930e1f..1540a8c9a 100644 --- a/x/interchaintxs/keeper/ibc_handlers.go +++ b/x/interchaintxs/keeper/ibc_handlers.go @@ -1,6 +1,7 @@ package keeper import ( + "github.com/neutron-org/neutron/x/contractmanager/keeper" "time" "cosmossdk.io/errors" @@ -18,7 +19,6 @@ import ( // HandleAcknowledgement passes the acknowledgement data to the appropriate contract via a sudo call. func (k *Keeper) HandleAcknowledgement(ctx sdk.Context, packet channeltypes.Packet, acknowledgement []byte, relayer sdk.AccAddress) error { defer telemetry.ModuleMeasureSince(types.ModuleName, time.Now(), LabelHandleAcknowledgment) - k.Logger(ctx).Debug("Handling acknowledgement") icaOwner, err := types.ICAOwnerFromPort(packet.SourcePort) if err != nil { @@ -31,24 +31,21 @@ func (k *Keeper) HandleAcknowledgement(ctx sdk.Context, packet channeltypes.Pack k.Logger(ctx).Error("HandleAcknowledgement: cannot unmarshal ICS-27 packet acknowledgement", "error", err) return errors.Wrapf(sdkerrors.ErrUnknownRequest, "cannot unmarshal ICS-27 packet acknowledgement: %v", err) } - - if !k.contractManagerKeeper.HasContractInfo(ctx, icaOwner.GetContract()) { - //return fmt.Errorf("%s is not a contract address", icaOwner.GetContract()) - return nil + msg, err := keeper.PrepareSudoCallbackMessage(packet, &ack) + if err != nil { + return errors.Wrapf(sdkerrors.ErrJSONMarshal, "failed to marshal Packet/Acknowledgment: %v", err) } k.feeKeeper.DistributeAcknowledgementFee(ctx, relayer, feetypes.NewPacketID(packet.SourcePort, packet.SourceChannel, packet.Sequence)) // Actually we have only one kind of error returned from acknowledgement // maybe later we'll retrieve actual errors from events - // `err` value from `SudoError/SudoResponse` should always be nil, since we contractmanager wrapped by `SudoLimitWrapper` - if ack.GetError() != "" { - _, err = k.contractManagerKeeper.SudoError(ctx, icaOwner.GetContract(), packet, ack) - } else { - _, err = k.contractManagerKeeper.SudoResponse(ctx, icaOwner.GetContract(), packet, ack) + _, err = k.sudoKeeper.Sudo(ctx, icaOwner.GetContract(), msg) + if err != nil { + k.Logger(ctx).Debug("HandleAcknowledgement: failed to Sudo contract on packet acknowledgement", "error", err) } - return err + return nil } // HandleTimeout passes the timeout data to the appropriate contract via a sudo call. @@ -56,24 +53,25 @@ func (k *Keeper) HandleAcknowledgement(ctx sdk.Context, packet channeltypes.Pack func (k *Keeper) HandleTimeout(ctx sdk.Context, packet channeltypes.Packet, relayer sdk.AccAddress) error { defer telemetry.ModuleMeasureSince(types.ModuleName, time.Now(), LabelHandleTimeout) k.Logger(ctx).Debug("HandleTimeout") - icaOwner, err := types.ICAOwnerFromPort(packet.SourcePort) if err != nil { k.Logger(ctx).Error("HandleTimeout: failed to get ica owner from source port", "error", err) return errors.Wrap(err, "failed to get ica owner from port") } - if !k.contractManagerKeeper.HasContractInfo(ctx, icaOwner.GetContract()) { - //return fmt.Errorf("%s is not a contract address", icaOwner.GetContract()) - return nil + msg, err := keeper.PrepareSudoCallbackMessage(packet, nil) + if err != nil { + return errors.Wrapf(sdkerrors.ErrJSONMarshal, "failed to marshal Packet: %v", err) } k.feeKeeper.DistributeTimeoutFee(ctx, relayer, feetypes.NewPacketID(packet.SourcePort, packet.SourceChannel, packet.Sequence)) - // `err` value from `SudoTimeout` should always be nil, since we contractmanager wrapped by `SudoLimitWrapper` - _, err = k.contractManagerKeeper.SudoTimeout(ctx, icaOwner.GetContract(), packet) + _, err = k.sudoKeeper.Sudo(ctx, icaOwner.GetContract(), msg) + if err != nil { + k.Logger(ctx).Debug("HandleTimeout: failed to Sudo contract on packet timeout", "error", err) + } - return err + return nil } // HandleChanOpenAck passes the data about a successfully created channel to the appropriate contract @@ -96,20 +94,16 @@ func (k *Keeper) HandleChanOpenAck( return errors.Wrap(err, "failed to get ica owner from port") } - if !k.contractManagerKeeper.HasContractInfo(ctx, icaOwner.GetContract()) { - //return fmt.Errorf("%s is not a contract address", icaOwner.GetContract()) - return nil - } - - _, err = k.contractManagerKeeper.SudoOnChanOpenAck(ctx, icaOwner.GetContract(), contractmanagertypes.OpenAckDetails{ + payload, err := keeper.PrepareOpenAckCallbackMessage(contractmanagertypes.OpenAckDetails{ PortID: portID, ChannelID: channelID, CounterpartyChannelID: counterpartyChannelID, CounterpartyVersion: counterpartyVersion, }) + + _, err = k.sudoKeeper.Sudo(ctx, icaOwner.GetContract(), payload) if err != nil { - k.Logger(ctx).Debug("HandleChanOpenAck: failed to sudo contract on packet timeout", "error", err) - return errors.Wrap(err, "failed to sudo the contract OnChanOpenAck") + k.Logger(ctx).Debug("HandleChanOpenAck: failed to sudo contract on channel open acknowledgement", "error", err) } return nil diff --git a/x/interchaintxs/keeper/ibc_handlers_test.go b/x/interchaintxs/keeper/ibc_handlers_test.go index 50e74b2f0..3785f7906 100644 --- a/x/interchaintxs/keeper/ibc_handlers_test.go +++ b/x/interchaintxs/keeper/ibc_handlers_test.go @@ -2,6 +2,7 @@ package keeper_test import ( "fmt" + "github.com/neutron-org/neutron/x/contractmanager/keeper" "testing" sdk "github.com/cosmos/cosmos-sdk/types" @@ -21,19 +22,11 @@ func TestHandleAcknowledgement(t *testing.T) { ctrl := gomock.NewController(t) defer ctrl.Finish() icaKeeper := mock_types.NewMockICAControllerKeeper(ctrl) - cmKeeper := mock_types.NewMockContractManagerKeeper(ctrl) + wmKeeper := mock_types.NewMockWasmKeeper(ctrl) feeKeeper := mock_types.NewMockFeeRefunderKeeper(ctrl) - icak, infCtx, _ := testkeeper.InterchainTxsKeeper(t, cmKeeper, feeKeeper, icaKeeper, nil) + icak, infCtx, _ := testkeeper.InterchainTxsKeeper(t, wmKeeper, feeKeeper, icaKeeper, nil) ctx := infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - //store := ctx.KVStore(storeKey) - errACK := channeltypes.Acknowledgement{ - Response: &channeltypes.Acknowledgement_Error{ - Error: "error", - }, - } - errAckData, err := channeltypes.SubModuleCdc.MarshalJSON(&errACK) - require.NoError(t, err) resACK := channeltypes.Acknowledgement{ Response: &channeltypes.Acknowledgement_Result{Result: []byte("Result")}, } @@ -54,51 +47,30 @@ func TestHandleAcknowledgement(t *testing.T) { err = icak.HandleAcknowledgement(ctx, p, nil, relayerAddress) require.ErrorContains(t, err, "cannot unmarshal ICS-27 packet acknowledgement") - // success contract SudoResponse - ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) - feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) - cmKeeper.EXPECT().SudoResponse(ctx, contractAddress, p, resACK) - err = icak.HandleAcknowledgement(ctx, p, resAckData, relayerAddress) + msgAck, err := keeper.PrepareSudoCallbackMessage(p, &resACK) require.NoError(t, err) - // success contract SudoError + // success contract SudoResponse ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) - cmKeeper.EXPECT().SudoError(ctx, contractAddress, p, errACK) - err = icak.HandleAcknowledgement(ctx, p, errAckData, relayerAddress) + wmKeeper.EXPECT().Sudo(ctx, contractAddress, msgAck) + err = icak.HandleAcknowledgement(ctx, p, resAckData, relayerAddress) require.NoError(t, err) // error contract SudoResponse ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) - cmKeeper.EXPECT().SudoResponse(ctx, contractAddress, p, resACK).Return(nil, fmt.Errorf("error sudoResponse")) + wmKeeper.EXPECT().Sudo(ctx, contractAddress, msgAck).Return(nil, fmt.Errorf("error sudoResponse")) err = icak.HandleAcknowledgement(ctx, p, resAckData, relayerAddress) - require.Error(t, err) - - // error contract SudoError - ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) - feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) - cmKeeper.EXPECT().SudoError(ctx, contractAddress, p, errACK).Return(nil, fmt.Errorf("error sudoError")) - err = icak.HandleAcknowledgement(ctx, p, errAckData, relayerAddress) - require.Error(t, err) - - // no contract SudoError - ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(false) - err = icak.HandleAcknowledgement(ctx, p, errAckData, relayerAddress) require.NoError(t, err) //// success during SudoError //ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - //cmKeeper.EXPECT().SudoError(gomock.AssignableToTypeOf(ctx), contractAddress, p, errACK.GetError()).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, err string) { + //wmKeeper.EXPECT().SudoError(gomock.AssignableToTypeOf(ctx), contractAddress, p, errACK.GetError()).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, err string) { // store := cachedCtx.KVStore(storeKey) // store.Set(ShouldBeWrittenKey("sudoerror"), ShouldBeWritten) //}).Return(nil, nil) - //cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 6000}) + //wmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 6000}) //feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) //err = icak.HandleAcknowledgement(ctx, p, errAckData, relayerAddress) //require.NoError(t, err) @@ -107,13 +79,13 @@ func TestHandleAcknowledgement(t *testing.T) { // //// out of gas during SudoError //ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - //cmKeeper.EXPECT().SudoError(gomock.AssignableToTypeOf(ctx), contractAddress, p, errACK.GetError()).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, error string) { + //wmKeeper.EXPECT().SudoError(gomock.AssignableToTypeOf(ctx), contractAddress, p, errACK.GetError()).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, error string) { // store := cachedCtx.KVStore(storeKey) // store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) // cachedCtx.GasMeter().ConsumeGas(7001, "out of gas test") //}) - //cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 7000}) - //cmKeeper.EXPECT().AddContractFailure(ctx, &p, contractAddress.String(), types.Ack, &errACK) + //wmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 7000}) + //wmKeeper.EXPECT().AddContractFailure(ctx, &p, contractAddress.String(), types.Ack, &errACK) //feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) //err = icak.HandleAcknowledgement(ctx, p, errAckData, relayerAddress) //require.NoError(t, err) @@ -122,11 +94,11 @@ func TestHandleAcknowledgement(t *testing.T) { // //// success during SudoResponse //ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - //cmKeeper.EXPECT().SudoResponse(gomock.AssignableToTypeOf(ctx), contractAddress, p, resACK.GetResult()).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, msg []byte) { + //wmKeeper.EXPECT().SudoResponse(gomock.AssignableToTypeOf(ctx), contractAddress, p, resACK.GetResult()).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, msg []byte) { // store := cachedCtx.KVStore(storeKey) // store.Set(ShouldBeWrittenKey("sudoresponse"), ShouldBeWritten) // consumes 3140 gas, 2000 flat write + 30 every byte of key+value //}).Return(nil, nil) - //cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 8000}) + //wmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 8000}) //feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) //err = icak.HandleAcknowledgement(ctx, p, resAckData, relayerAddress) //require.NoError(t, err) @@ -136,13 +108,13 @@ func TestHandleAcknowledgement(t *testing.T) { //// not enough gas provided by relayer for SudoCallGasLimit //ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) //lowGasCtx := infCtx.WithGasMeter(sdk.NewGasMeter(1000)) - //cmKeeper.EXPECT().SudoResponse(gomock.AssignableToTypeOf(lowGasCtx), contractAddress, p, resACK.GetResult()).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, msg []byte) { + //wmKeeper.EXPECT().SudoResponse(gomock.AssignableToTypeOf(lowGasCtx), contractAddress, p, resACK.GetResult()).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, msg []byte) { // store := cachedCtx.KVStore(storeKey) // store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) // cachedCtx.GasMeter().ConsumeGas(1001, "out of gas test") //}) //feeKeeper.EXPECT().DistributeAcknowledgementFee(lowGasCtx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) - //cmKeeper.EXPECT().GetParams(lowGasCtx).Return(types.Params{SudoCallGasLimit: 9000}) + //wmKeeper.EXPECT().GetParams(lowGasCtx).Return(types.Params{SudoCallGasLimit: 9000}) //require.PanicsWithValue(t, sdk.ErrorOutOfGas{Descriptor: "consume gas from cached context"}, func() { icak.HandleAcknowledgement(lowGasCtx, p, resAckData, relayerAddress) }) //nolint:errcheck // this is a panic test } @@ -150,9 +122,9 @@ func TestHandleTimeout(t *testing.T) { ctrl := gomock.NewController(t) defer ctrl.Finish() icaKeeper := mock_types.NewMockICAControllerKeeper(ctrl) - cmKeeper := mock_types.NewMockContractManagerKeeper(ctrl) + wmKeeper := mock_types.NewMockWasmKeeper(ctrl) feeKeeper := mock_types.NewMockFeeRefunderKeeper(ctrl) - icak, infCtx, _ := testkeeper.InterchainTxsKeeper(t, cmKeeper, feeKeeper, icaKeeper, nil) + icak, infCtx, _ := testkeeper.InterchainTxsKeeper(t, wmKeeper, feeKeeper, icaKeeper, nil) ctx := infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) contractAddress := sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress) relayerBech32 := "neutron1fxudpred77a0grgh69u0j7y84yks5ev4n5050z45kecz792jnd6scqu98z" @@ -163,37 +135,33 @@ func TestHandleTimeout(t *testing.T) { SourceChannel: "channel-0", } - err := icak.HandleTimeout(ctx, channeltypes.Packet{}, relayerAddress) + msgAck, err := keeper.PrepareSudoCallbackMessage(p, nil) + require.NoError(t, err) + + err = icak.HandleTimeout(ctx, channeltypes.Packet{}, relayerAddress) require.ErrorContains(t, err, "failed to get ica owner from port") // contract success ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) feeKeeper.EXPECT().DistributeTimeoutFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) - cmKeeper.EXPECT().SudoTimeout(ctx, contractAddress, p) + wmKeeper.EXPECT().Sudo(ctx, contractAddress, msgAck) err = icak.HandleTimeout(ctx, p, relayerAddress) require.NoError(t, err) // contract error ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) feeKeeper.EXPECT().DistributeTimeoutFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) - cmKeeper.EXPECT().SudoTimeout(ctx, contractAddress, p).Return(nil, fmt.Errorf("SudoTimeout error")) - err = icak.HandleTimeout(ctx, p, relayerAddress) - require.Error(t, err) - - // no contract - ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(false) + wmKeeper.EXPECT().Sudo(ctx, contractAddress, msgAck).Return(nil, fmt.Errorf("SudoTimeout error")) err = icak.HandleTimeout(ctx, p, relayerAddress) require.NoError(t, err) + } func TestHandleChanOpenAck(t *testing.T) { ctrl := gomock.NewController(t) defer ctrl.Finish() - cmKeeper := mock_types.NewMockContractManagerKeeper(ctrl) - icak, ctx, _ := testkeeper.InterchainTxsKeeper(t, cmKeeper, nil, nil, nil) + wmKeeper := mock_types.NewMockWasmKeeper(ctrl) + icak, ctx, _ := testkeeper.InterchainTxsKeeper(t, wmKeeper, nil, nil, nil) portID := icatypes.ControllerPortPrefix + testutil.TestOwnerAddress + ".ica0" contractAddress := sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress) channelID := "channel-0" @@ -202,27 +170,21 @@ func TestHandleChanOpenAck(t *testing.T) { err := icak.HandleChanOpenAck(ctx, "", channelID, counterpartyChannelID, "1") require.ErrorContains(t, err, "failed to get ica owner from port") - cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) - cmKeeper.EXPECT().SudoOnChanOpenAck(ctx, contractAddress, types.OpenAckDetails{ + msg, err := keeper.PrepareOpenAckCallbackMessage(types.OpenAckDetails{ PortID: portID, ChannelID: channelID, CounterpartyChannelID: counterpartyChannelID, CounterpartyVersion: "1", - }).Return(nil, fmt.Errorf("SudoOnChanOpenAck error")) - err = icak.HandleChanOpenAck(ctx, portID, channelID, counterpartyChannelID, "1") - require.ErrorContains(t, err, "failed to sudo the contract OnChanOpenAck") + }) + require.NoError(t, err) - cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) - cmKeeper.EXPECT().SudoOnChanOpenAck(ctx, contractAddress, types.OpenAckDetails{ - PortID: portID, - ChannelID: channelID, - CounterpartyChannelID: counterpartyChannelID, - CounterpartyVersion: "1", - }).Return(nil, nil) + // sudo error + wmKeeper.EXPECT().Sudo(ctx, contractAddress, msg).Return(nil, fmt.Errorf("SudoOnChanOpenAck error")) err = icak.HandleChanOpenAck(ctx, portID, channelID, counterpartyChannelID, "1") require.NoError(t, err) - cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(false) + // sudo success + wmKeeper.EXPECT().Sudo(ctx, contractAddress, msg) err = icak.HandleChanOpenAck(ctx, portID, channelID, counterpartyChannelID, "1") require.NoError(t, err) } diff --git a/x/interchaintxs/keeper/keeper.go b/x/interchaintxs/keeper/keeper.go index a1032c24c..737a874b5 100644 --- a/x/interchaintxs/keeper/keeper.go +++ b/x/interchaintxs/keeper/keeper.go @@ -20,13 +20,13 @@ const ( type ( Keeper struct { - Codec codec.BinaryCodec - storeKey storetypes.StoreKey - memKey storetypes.StoreKey - channelKeeper types.ChannelKeeper - feeKeeper types.FeeRefunderKeeper - icaControllerKeeper types.ICAControllerKeeper - contractManagerKeeper types.ContractManagerKeeper + Codec codec.BinaryCodec + storeKey storetypes.StoreKey + memKey storetypes.StoreKey + channelKeeper types.ChannelKeeper + feeKeeper types.FeeRefunderKeeper + icaControllerKeeper types.ICAControllerKeeper + sudoKeeper types.WasmKeeper } ) @@ -36,17 +36,17 @@ func NewKeeper( memKey storetypes.StoreKey, channelKeeper types.ChannelKeeper, icaControllerKeeper types.ICAControllerKeeper, - contractManagerKeeper types.ContractManagerKeeper, + contractManagerKeeper types.WasmKeeper, feeKeeper types.FeeRefunderKeeper, ) *Keeper { return &Keeper{ - Codec: cdc, - storeKey: storeKey, - memKey: memKey, - channelKeeper: channelKeeper, - icaControllerKeeper: icaControllerKeeper, - contractManagerKeeper: contractManagerKeeper, - feeKeeper: feeKeeper, + Codec: cdc, + storeKey: storeKey, + memKey: memKey, + channelKeeper: channelKeeper, + icaControllerKeeper: icaControllerKeeper, + sudoKeeper: contractManagerKeeper, + feeKeeper: feeKeeper, } } diff --git a/x/interchaintxs/keeper/msg_server.go b/x/interchaintxs/keeper/msg_server.go index 62d3cfe5a..efc3a42d9 100644 --- a/x/interchaintxs/keeper/msg_server.go +++ b/x/interchaintxs/keeper/msg_server.go @@ -43,7 +43,7 @@ func (k Keeper) RegisterInterchainAccount(goCtx context.Context, msg *ictxtypes. return nil, errors.Wrapf(sdkerrors.ErrInvalidAddress, "failed to parse address: %s", msg.FromAddress) } - if !k.contractManagerKeeper.HasContractInfo(ctx, senderAddr) { + if !k.sudoKeeper.HasContractInfo(ctx, senderAddr) { k.Logger(ctx).Debug("RegisterInterchainAccount: contract not found", "from_address", msg.FromAddress) return nil, errors.Wrapf(ictxtypes.ErrNotContract, "%s is not a contract address", msg.FromAddress) } @@ -79,7 +79,7 @@ func (k Keeper) SubmitTx(goCtx context.Context, msg *ictxtypes.MsgSubmitTx) (*ic return nil, errors.Wrapf(sdkerrors.ErrInvalidAddress, "failed to parse address: %s", msg.FromAddress) } - if !k.contractManagerKeeper.HasContractInfo(ctx, senderAddr) { + if !k.sudoKeeper.HasContractInfo(ctx, senderAddr) { k.Logger(ctx).Debug("SubmitTx: contract not found", "from_address", msg.FromAddress) return nil, errors.Wrapf(ictxtypes.ErrNotContract, "%s is not a contract address", msg.FromAddress) } diff --git a/x/interchaintxs/keeper/msg_server_test.go b/x/interchaintxs/keeper/msg_server_test.go index 3879525ac..c662dd8da 100644 --- a/x/interchaintxs/keeper/msg_server_test.go +++ b/x/interchaintxs/keeper/msg_server_test.go @@ -25,8 +25,8 @@ func TestRegisterInterchainAccount(t *testing.T) { ctrl := gomock.NewController(t) defer ctrl.Finish() icaKeeper := mock_types.NewMockICAControllerKeeper(ctrl) - cmKeeper := mock_types.NewMockContractManagerKeeper(ctrl) - icak, ctx, _ := testkeeper.InterchainTxsKeeper(t, cmKeeper, nil, icaKeeper, nil) + wmKeeper := mock_types.NewMockWasmKeeper(ctrl) + icak, ctx, _ := testkeeper.InterchainTxsKeeper(t, wmKeeper, nil, icaKeeper, nil) goCtx := sdk.WrapSDKContext(ctx) msgRegAcc := types.MsgRegisterInterchainAccount{ @@ -41,18 +41,18 @@ func TestRegisterInterchainAccount(t *testing.T) { require.ErrorContains(t, err, "failed to parse address") require.Nil(t, resp) - cmKeeper.EXPECT().HasContractInfo(ctx, contractAddress).Return(false) + wmKeeper.EXPECT().HasContractInfo(ctx, contractAddress).Return(false) resp, err = icak.RegisterInterchainAccount(goCtx, &msgRegAcc) require.ErrorContains(t, err, "is not a contract address") require.Nil(t, resp) - cmKeeper.EXPECT().HasContractInfo(ctx, contractAddress).Return(true) + wmKeeper.EXPECT().HasContractInfo(ctx, contractAddress).Return(true) icaKeeper.EXPECT().RegisterInterchainAccount(ctx, msgRegAcc.ConnectionId, icaOwner.String(), "").Return(fmt.Errorf("failed to register ica")) resp, err = icak.RegisterInterchainAccount(goCtx, &msgRegAcc) require.ErrorContains(t, err, "failed to RegisterInterchainAccount") require.Nil(t, resp) - cmKeeper.EXPECT().HasContractInfo(ctx, contractAddress).Return(true) + wmKeeper.EXPECT().HasContractInfo(ctx, contractAddress).Return(true) icaKeeper.EXPECT().RegisterInterchainAccount(ctx, msgRegAcc.ConnectionId, icaOwner.String(), "").Return(nil) resp, err = icak.RegisterInterchainAccount(goCtx, &msgRegAcc) require.NoError(t, err) @@ -63,10 +63,10 @@ func TestSubmitTx(t *testing.T) { ctrl := gomock.NewController(t) defer ctrl.Finish() icaKeeper := mock_types.NewMockICAControllerKeeper(ctrl) - cmKeeper := mock_types.NewMockContractManagerKeeper(ctrl) + wmKeeper := mock_types.NewMockWasmKeeper(ctrl) refundKeeper := mock_types.NewMockFeeRefunderKeeper(ctrl) channelKeeper := mock_types.NewMockChannelKeeper(ctrl) - icak, ctx, _ := testkeeper.InterchainTxsKeeper(t, cmKeeper, refundKeeper, icaKeeper, channelKeeper) + icak, ctx, _ := testkeeper.InterchainTxsKeeper(t, wmKeeper, refundKeeper, icaKeeper, channelKeeper) goCtx := sdk.WrapSDKContext(ctx) cosmosMsg := codectypes.Any{ @@ -97,7 +97,7 @@ func TestSubmitTx(t *testing.T) { require.Nil(t, resp) require.ErrorContains(t, err, "failed to parse address") - cmKeeper.EXPECT().HasContractInfo(ctx, contractAddress).Return(false) + wmKeeper.EXPECT().HasContractInfo(ctx, contractAddress).Return(false) resp, err = icak.SubmitTx(goCtx, &submitMsg) require.Nil(t, resp) require.ErrorContains(t, err, "is not a contract address") @@ -105,21 +105,21 @@ func TestSubmitTx(t *testing.T) { params := icak.GetParams(ctx) maxMsgs := params.GetMsgSubmitTxMaxMessages() submitMsg.Msgs = make([]*codectypes.Any, maxMsgs+1) - cmKeeper.EXPECT().HasContractInfo(ctx, contractAddress).Return(true) + wmKeeper.EXPECT().HasContractInfo(ctx, contractAddress).Return(true) resp, err = icak.SubmitTx(goCtx, &submitMsg) require.Nil(t, resp) require.ErrorContains(t, err, "MsgSubmitTx contains more messages than allowed") submitMsg.Msgs = []*codectypes.Any{&cosmosMsg} portID := "icacontroller-" + testutil.TestOwnerAddress + ".ica0" - cmKeeper.EXPECT().HasContractInfo(ctx, contractAddress).Return(true) + wmKeeper.EXPECT().HasContractInfo(ctx, contractAddress).Return(true) icaKeeper.EXPECT().GetActiveChannelID(ctx, "connection-0", portID).Return("", false) resp, err = icak.SubmitTx(goCtx, &submitMsg) require.Nil(t, resp) require.ErrorContains(t, err, "failed to GetActiveChannelID for port") activeChannel := "channel-0" - // cmKeeper.EXPECT().HasContractInfo(ctx, contractAddress).Return(true) + // wmKeeper.EXPECT().HasContractInfo(ctx, contractAddress).Return(true) // icaKeeper.EXPECT().GetActiveChannelID(ctx, "connection-0", portID).Return(activeChannel, true) // currCodec := icak.Codec // icak.Codec = &codec.AminoCodec{} @@ -128,7 +128,7 @@ func TestSubmitTx(t *testing.T) { // require.Nil(t, resp) // require.ErrorContains(t, err, "only ProtoCodec is supported for receiving messages on the host chain") - cmKeeper.EXPECT().HasContractInfo(ctx, contractAddress).Return(true) + wmKeeper.EXPECT().HasContractInfo(ctx, contractAddress).Return(true) icaKeeper.EXPECT().GetActiveChannelID(ctx, "connection-0", portID).Return(activeChannel, true) channelKeeper.EXPECT().GetNextSequenceSend(ctx, portID, activeChannel).Return(uint64(0), false) resp, err = icak.SubmitTx(goCtx, &submitMsg) @@ -136,7 +136,7 @@ func TestSubmitTx(t *testing.T) { require.ErrorContains(t, err, "sequence send not found") sequence := uint64(100) - cmKeeper.EXPECT().HasContractInfo(ctx, contractAddress).Return(true) + wmKeeper.EXPECT().HasContractInfo(ctx, contractAddress).Return(true) icaKeeper.EXPECT().GetActiveChannelID(ctx, "connection-0", portID).Return(activeChannel, true) channelKeeper.EXPECT().GetNextSequenceSend(ctx, portID, activeChannel).Return(sequence, true) refundKeeper.EXPECT().LockFees(ctx, contractAddress, feerefundertypes.NewPacketID(portID, activeChannel, sequence), submitMsg.Fee).Return(fmt.Errorf("failed to lock fees")) @@ -153,7 +153,7 @@ func TestSubmitTx(t *testing.T) { } timeoutTimestamp := ctx.BlockTime().Add(time.Duration(submitMsg.Timeout) * time.Second).UnixNano() - cmKeeper.EXPECT().HasContractInfo(ctx, contractAddress).Return(true) + wmKeeper.EXPECT().HasContractInfo(ctx, contractAddress).Return(true) icaKeeper.EXPECT().GetActiveChannelID(ctx, "connection-0", portID).Return(activeChannel, true) channelKeeper.EXPECT().GetNextSequenceSend(ctx, portID, activeChannel).Return(sequence, true) refundKeeper.EXPECT().LockFees(ctx, contractAddress, feerefundertypes.NewPacketID(portID, activeChannel, sequence), submitMsg.Fee).Return(nil) @@ -162,7 +162,7 @@ func TestSubmitTx(t *testing.T) { require.Nil(t, resp) require.ErrorContains(t, err, "failed to SendTx") - cmKeeper.EXPECT().HasContractInfo(ctx, contractAddress).Return(true) + wmKeeper.EXPECT().HasContractInfo(ctx, contractAddress).Return(true) icaKeeper.EXPECT().GetActiveChannelID(ctx, "connection-0", portID).Return(activeChannel, true) channelKeeper.EXPECT().GetNextSequenceSend(ctx, portID, activeChannel).Return(sequence, true) refundKeeper.EXPECT().LockFees(ctx, contractAddress, feerefundertypes.NewPacketID(portID, activeChannel, sequence), submitMsg.Fee).Return(nil) diff --git a/x/interchaintxs/types/expected_keepers.go b/x/interchaintxs/types/expected_keepers.go index 13d7f7cf3..3e57253ed 100644 --- a/x/interchaintxs/types/expected_keepers.go +++ b/x/interchaintxs/types/expected_keepers.go @@ -8,7 +8,6 @@ import ( channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" - contractmanagertypes "github.com/neutron-org/neutron/x/contractmanager/types" feerefundertypes "github.com/neutron-org/neutron/x/feerefunder/types" ) @@ -24,14 +23,9 @@ type BankKeeper interface { // Methods imported from bank should be defined here } -type ContractManagerKeeper interface { +type WasmKeeper interface { HasContractInfo(ctx sdk.Context, contractAddress sdk.AccAddress) bool - SudoResponse(ctx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, ack channeltypes.Acknowledgement) ([]byte, error) - SudoError(ctx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, ack channeltypes.Acknowledgement) ([]byte, error) - SudoTimeout(ctx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet) ([]byte, error) - SudoOnChanOpenAck(ctx sdk.Context, contractAddress sdk.AccAddress, details contractmanagertypes.OpenAckDetails) ([]byte, error) - AddContractFailure(ctx sdk.Context, packet *channeltypes.Packet, address, ackType string, ack *channeltypes.Acknowledgement) - GetParams(ctx sdk.Context) (params contractmanagertypes.Params) + Sudo(ctx sdk.Context, contractAddress sdk.AccAddress, msg []byte) ([]byte, error) } type ICAControllerKeeper interface { diff --git a/x/transfer/ibc_handlers.go b/x/transfer/ibc_handlers.go index efecb0cff..30ad94af3 100644 --- a/x/transfer/ibc_handlers.go +++ b/x/transfer/ibc_handlers.go @@ -6,6 +6,7 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" + "github.com/neutron-org/neutron/x/contractmanager/keeper" feetypes "github.com/neutron-org/neutron/x/feerefunder/types" "github.com/neutron-org/neutron/x/interchaintxs/types" ) @@ -25,24 +26,25 @@ func (im IBCModule) HandleAcknowledgement(ctx sdk.Context, packet channeltypes.P if err != nil { return errors.Wrapf(sdkerrors.ErrInvalidAddress, "failed to decode address from bech32: %v", err) } - if !im.ContractManagerKeeper.HasContractInfo(ctx, senderAddress) { + if !im.sudoKeeper.HasContractInfo(ctx, senderAddress) { return nil } im.wrappedKeeper.FeeKeeper.DistributeAcknowledgementFee(ctx, relayer, feetypes.NewPacketID(packet.SourcePort, packet.SourceChannel, packet.Sequence)) - if ack.Success() { - _, err = im.ContractManagerKeeper.SudoResponse(ctx, senderAddress, packet, ack) - } else { - // Actually we have only one kind of error returned from acknowledgement - // maybe later we'll retrieve actual errors from events - im.keeper.Logger(ctx).Debug(ack.GetError(), "CheckTx", ctx.IsCheckTx()) - _, err = im.ContractManagerKeeper.SudoError(ctx, senderAddress, packet, ack) + msg, err := keeper.PrepareSudoCallbackMessage(packet, &ack) + if err != nil { + return errors.Wrapf(sdkerrors.ErrJSONMarshal, "failed to marshal Packet/Acknowledgment: %v", err) + } + + _, err = im.sudoKeeper.Sudo(ctx, senderAddress, msg) + if err != nil { + im.keeper.Logger(ctx).Debug("HandleAcknowledgement: failed to Sudo contract on packet acknowledgement", "error", err) } im.keeper.Logger(ctx).Debug("acknowledgement received", "Packet data", data, "CheckTx", ctx.IsCheckTx()) - return err + return nil } // HandleTimeout passes the timeout data to the appropriate contract via a sudo call. @@ -56,13 +58,21 @@ func (im IBCModule) HandleTimeout(ctx sdk.Context, packet channeltypes.Packet, r if err != nil { return errors.Wrapf(sdkerrors.ErrInvalidAddress, "failed to decode address from bech32: %v", err) } - if !im.ContractManagerKeeper.HasContractInfo(ctx, senderAddress) { + if !im.sudoKeeper.HasContractInfo(ctx, senderAddress) { return nil } + msg, err := keeper.PrepareSudoCallbackMessage(packet, nil) + if err != nil { + return errors.Wrapf(sdkerrors.ErrJSONMarshal, "failed to marshal Packet: %v", err) + } + im.wrappedKeeper.FeeKeeper.DistributeTimeoutFee(ctx, relayer, feetypes.NewPacketID(packet.SourcePort, packet.SourceChannel, packet.Sequence)) - _, err = im.ContractManagerKeeper.SudoTimeout(ctx, senderAddress, packet) + _, err = im.sudoKeeper.Sudo(ctx, senderAddress, msg) + if err != nil { + im.keeper.Logger(ctx).Debug("HandleAcknowledgement: failed to Sudo contract on packet acknowledgement", "error", err) + } - return err + return nil } diff --git a/x/transfer/ibc_handlers_test.go b/x/transfer/ibc_handlers_test.go index e93d91c97..03ebab6f7 100644 --- a/x/transfer/ibc_handlers_test.go +++ b/x/transfer/ibc_handlers_test.go @@ -2,6 +2,7 @@ package transfer_test import ( "fmt" + "github.com/neutron-org/neutron/x/contractmanager/keeper" "testing" sdk "github.com/cosmos/cosmos-sdk/types" @@ -19,36 +20,19 @@ import ( const TestCosmosAddress = "cosmos10h9stc5v6ntgeygf5xf945njqq5h32r53uquvw" -var ( - ShouldNotBeWrittenKey = []byte("shouldnotkey") - ShouldNotBeWritten = []byte("should not be written") - ShouldBeWritten = []byte("should be written") -) - -func ShouldBeWrittenKey(suffix string) []byte { - return append([]byte("shouldkey"), []byte(suffix)...) -} - func TestHandleAcknowledgement(t *testing.T) { ctrl := gomock.NewController(t) defer ctrl.Finish() - cmKeeper := mock_types.NewMockContractManagerKeeper(ctrl) + wmKeeper := mock_types.NewMockWasmKeeper(ctrl) feeKeeper := mock_types.NewMockFeeRefunderKeeper(ctrl) chanKeeper := mock_types.NewMockChannelKeeper(ctrl) authKeeper := mock_types.NewMockAccountKeeper(ctrl) // required to initialize keeper authKeeper.EXPECT().GetModuleAddress(transfertypes.ModuleName).Return([]byte("address")) - txKeeper, infCtx, _ := testkeeper.TransferKeeper(t, cmKeeper, feeKeeper, chanKeeper, authKeeper) - txModule := transfer.NewIBCModule(*txKeeper) + txKeeper, infCtx, _ := testkeeper.TransferKeeper(t, wmKeeper, feeKeeper, chanKeeper, authKeeper) + txModule := transfer.NewIBCModule(*txKeeper, wmKeeper) ctx := infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - errACK := channeltypes.Acknowledgement{ - Response: &channeltypes.Acknowledgement_Error{ - Error: "error", - }, - } - errAckData, err := channeltypes.SubModuleCdc.MarshalJSON(&errACK) - require.NoError(t, err) resACK := channeltypes.Acknowledgement{ Response: &channeltypes.Acknowledgement_Result{Result: []byte("Result")}, } @@ -59,6 +43,7 @@ func TestHandleAcknowledgement(t *testing.T) { SourcePort: "transfer", SourceChannel: "channel-0", } + contractAddress := sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress) relayerBech32 := "neutron1fxudpred77a0grgh69u0j7y84yks5ev4n5050z45kecz792jnd6scqu98z" relayerAddress := sdk.MustAccAddressFromBech32(relayerBech32) @@ -92,41 +77,28 @@ func TestHandleAcknowledgement(t *testing.T) { require.NoError(t, err) p.Data = tokenBz + msgAck, err := keeper.PrepareSudoCallbackMessage(p, &resACK) + require.NoError(t, err) + // non contract ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(false) + wmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(false) err = txModule.HandleAcknowledgement(ctx, p, resAckData, relayerAddress) require.NoError(t, err) - // error during SudoResponse contract + // error during Sudo contract ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) + wmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) - cmKeeper.EXPECT().SudoResponse(ctx, contractAddress, p, resACK).Return(nil, fmt.Errorf("SudoResponse error")) + wmKeeper.EXPECT().Sudo(ctx, contractAddress, msgAck).Return(nil, fmt.Errorf("SudoResponse error")) err = txModule.HandleAcknowledgement(ctx, p, resAckData, relayerAddress) - require.Error(t, err) - - // error during SudoError contract - ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) - feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) - cmKeeper.EXPECT().SudoError(ctx, contractAddress, p, errACK).Return(nil, fmt.Errorf("SudoError error")) - err = txModule.HandleAcknowledgement(ctx, p, errAckData, relayerAddress) - require.Error(t, err) - - // success during SudoError - ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) - feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) - cmKeeper.EXPECT().SudoError(ctx, contractAddress, p, errACK) - err = txModule.HandleAcknowledgement(ctx, p, errAckData, relayerAddress) require.NoError(t, err) - // success during SudoError contract + // success during Sudo contract ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) + wmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) - cmKeeper.EXPECT().SudoResponse(ctx, contractAddress, p, resACK) + wmKeeper.EXPECT().Sudo(ctx, contractAddress, msgAck) err = txModule.HandleAcknowledgement(ctx, p, resAckData, relayerAddress) require.NoError(t, err) } @@ -134,14 +106,14 @@ func TestHandleAcknowledgement(t *testing.T) { func TestHandleTimeout(t *testing.T) { ctrl := gomock.NewController(t) defer ctrl.Finish() - cmKeeper := mock_types.NewMockContractManagerKeeper(ctrl) + wmKeeper := mock_types.NewMockWasmKeeper(ctrl) feeKeeper := mock_types.NewMockFeeRefunderKeeper(ctrl) chanKeeper := mock_types.NewMockChannelKeeper(ctrl) authKeeper := mock_types.NewMockAccountKeeper(ctrl) // required to initialize keeper authKeeper.EXPECT().GetModuleAddress(transfertypes.ModuleName).Return([]byte("address")) - txKeeper, infCtx, _ := testkeeper.TransferKeeper(t, cmKeeper, feeKeeper, chanKeeper, authKeeper) - txModule := transfer.NewIBCModule(*txKeeper) + txKeeper, infCtx, _ := testkeeper.TransferKeeper(t, wmKeeper, feeKeeper, chanKeeper, authKeeper) + txModule := transfer.NewIBCModule(*txKeeper, wmKeeper) ctx := infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) contractAddress := sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress) relayerBech32 := "neutron1fxudpred77a0grgh69u0j7y84yks5ev4n5050z45kecz792jnd6scqu98z" @@ -177,25 +149,28 @@ func TestHandleTimeout(t *testing.T) { require.NoError(t, err) p.Data = tokenBz + msg, err := keeper.PrepareSudoCallbackMessage(p, nil) + require.NoError(t, err) + // success non contract ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(false) + wmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(false) err = txModule.HandleTimeout(ctx, p, relayerAddress) require.NoError(t, err) // success contract ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) + wmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) feeKeeper.EXPECT().DistributeTimeoutFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) - cmKeeper.EXPECT().SudoTimeout(ctx, contractAddress, p).Return(nil, nil) + wmKeeper.EXPECT().Sudo(ctx, contractAddress, msg).Return(nil, nil) err = txModule.HandleTimeout(ctx, p, relayerAddress) require.NoError(t, err) // error during SudoTimeOut contract ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - cmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) + wmKeeper.EXPECT().HasContractInfo(ctx, sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress)).Return(true) feeKeeper.EXPECT().DistributeTimeoutFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) - cmKeeper.EXPECT().SudoTimeout(ctx, contractAddress, p).Return(nil, fmt.Errorf("SudoTimeout error")) + wmKeeper.EXPECT().Sudo(ctx, contractAddress, msg).Return(nil, fmt.Errorf("SudoTimeout error")) err = txModule.HandleTimeout(ctx, p, relayerAddress) - require.Error(t, err) + require.NoError(t, err) } diff --git a/x/transfer/keeper/keeper.go b/x/transfer/keeper/keeper.go index 90f672939..50729540a 100644 --- a/x/transfer/keeper/keeper.go +++ b/x/transfer/keeper/keeper.go @@ -22,9 +22,9 @@ import ( // KeeperTransferWrapper is a wrapper for original ibc keeper to override response for "Transfer" method type KeeperTransferWrapper struct { keeper.Keeper - channelKeeper wrappedtypes.ChannelKeeper - FeeKeeper wrappedtypes.FeeRefunderKeeper - ContractManagerKeeper wrappedtypes.ContractManagerKeeper + channelKeeper wrappedtypes.ChannelKeeper + FeeKeeper wrappedtypes.FeeRefunderKeeper + SudoKeeper wrappedtypes.WasmKeeper } func (k KeeperTransferWrapper) Transfer(goCtx context.Context, msg *wrappedtypes.MsgTransfer) (*wrappedtypes.MsgTransferResponse, error) { @@ -46,7 +46,7 @@ func (k KeeperTransferWrapper) Transfer(goCtx context.Context, msg *wrappedtypes // if the sender is a contract, lock fees. // Because contracts are required to pay fees for the acknowledgements - if k.ContractManagerKeeper.HasContractInfo(ctx, senderAddr) { + if k.SudoKeeper.HasContractInfo(ctx, senderAddr) { if err := k.FeeKeeper.LockFees(ctx, senderAddr, feetypes.NewPacketID(msg.SourcePort, msg.SourceChannel, sequence), msg.Fee); err != nil { return nil, errors.Wrapf(err, "failed to lock fees to pay for transfer msg: %v", msg) } @@ -70,13 +70,13 @@ func NewKeeper( ics4Wrapper porttypes.ICS4Wrapper, channelKeeper wrappedtypes.ChannelKeeper, portKeeper types.PortKeeper, authKeeper types.AccountKeeper, bankKeeper types.BankKeeper, scopedKeeper capabilitykeeper.ScopedKeeper, feeKeeper wrappedtypes.FeeRefunderKeeper, - contractManagerKeeper wrappedtypes.ContractManagerKeeper, + sudoKeeper wrappedtypes.WasmKeeper, ) KeeperTransferWrapper { return KeeperTransferWrapper{ channelKeeper: channelKeeper, Keeper: keeper.NewKeeper(cdc, key, paramSpace, ics4Wrapper, channelKeeper, portKeeper, authKeeper, bankKeeper, scopedKeeper), - FeeKeeper: feeKeeper, - ContractManagerKeeper: contractManagerKeeper, + FeeKeeper: feeKeeper, + SudoKeeper: sudoKeeper, } } diff --git a/x/transfer/module.go b/x/transfer/module.go index 967fe459e..5b6bd8d82 100644 --- a/x/transfer/module.go +++ b/x/transfer/module.go @@ -27,19 +27,19 @@ import ( */ type IBCModule struct { - wrappedKeeper wrapkeeper.KeeperTransferWrapper - keeper keeper.Keeper - ContractManagerKeeper neutrontypes.ContractManagerKeeper + wrappedKeeper wrapkeeper.KeeperTransferWrapper + keeper keeper.Keeper + sudoKeeper neutrontypes.WasmKeeper transfer.IBCModule } // NewIBCModule creates a new IBCModule given the keeper -func NewIBCModule(k wrapkeeper.KeeperTransferWrapper) IBCModule { +func NewIBCModule(k wrapkeeper.KeeperTransferWrapper, sudoKeeper neutrontypes.WasmKeeper) IBCModule { return IBCModule{ - wrappedKeeper: k, - keeper: k.Keeper, - ContractManagerKeeper: k.ContractManagerKeeper, - IBCModule: transfer.NewIBCModule(k.Keeper), + wrappedKeeper: k, + keeper: k.Keeper, + sudoKeeper: sudoKeeper, + IBCModule: transfer.NewIBCModule(k.Keeper), } } diff --git a/x/transfer/types/expected_keepers.go b/x/transfer/types/expected_keepers.go index 774daf841..854b8e490 100644 --- a/x/transfer/types/expected_keepers.go +++ b/x/transfer/types/expected_keepers.go @@ -7,12 +7,9 @@ import ( feerefundertypes "github.com/neutron-org/neutron/x/feerefunder/types" ) -// ContractManagerKeeper defines the expected interface needed to add ack information about sudo failure. -type ContractManagerKeeper interface { +type WasmKeeper interface { HasContractInfo(ctx sdk.Context, contractAddress sdk.AccAddress) bool - SudoResponse(ctx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, ack channeltypes.Acknowledgement) ([]byte, error) - SudoError(ctx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, ack channeltypes.Acknowledgement) ([]byte, error) - SudoTimeout(ctx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet) ([]byte, error) + Sudo(ctx sdk.Context, contractAddress sdk.AccAddress, msg []byte) ([]byte, error) } type FeeRefunderKeeper interface { From 7db0608a02672c38b79f791902a59123b3b22515 Mon Sep 17 00:00:00 2001 From: swelf Date: Thu, 14 Sep 2023 19:51:50 +0300 Subject: [PATCH 122/307] added fee charging for ica creation --- app/app.go | 2 + app/upgrades/sdk47/upgrades.go | 3 +- proto/neutron/interchaintxs/v1/params.proto | 3 + proto/neutron/interchaintxs/v1/tx.proto | 5 + .../interchaintxs/keeper/interchaintxs.go | 13 +- .../interchaintxs/types/expected_keepers.go | 60 ++++++- wasmbinding/bindings/msg.go | 6 +- wasmbinding/message_plugin.go | 1 + wasmbinding/test/custom_message_test.go | 13 ++ x/interchaintxs/genesis_test.go | 2 +- .../grpc_query_interchainaccount_test.go | 2 +- .../keeper/grpc_query_params_test.go | 2 +- x/interchaintxs/keeper/ibc_handlers_test.go | 12 +- x/interchaintxs/keeper/keeper.go | 30 ++++ x/interchaintxs/keeper/msg_server.go | 4 + x/interchaintxs/keeper/msg_server_test.go | 38 ++++- x/interchaintxs/keeper/params_test.go | 2 +- x/interchaintxs/types/expected_keepers.go | 7 +- x/interchaintxs/types/params.go | 21 +-- x/interchaintxs/types/params.pb.go | 98 +++++++++-- x/interchaintxs/types/tx.pb.go | 158 ++++++++++++------ 21 files changed, 386 insertions(+), 96 deletions(-) diff --git a/app/app.go b/app/app.go index 6804471df..5a5e71871 100644 --- a/app/app.go +++ b/app/app.go @@ -662,6 +662,8 @@ func New( app.ICAControllerKeeper, contractmanager.NewSudoLimitWrapper(app.ContractManagerKeeper, &app.WasmKeeper), app.FeeKeeper, + app.BankKeeper, + app.FeeBurnerKeeper, ) app.CronKeeper = *cronkeeper.NewKeeper(appCodec, keys[crontypes.StoreKey], keys[crontypes.MemStoreKey], app.AccountKeeper) diff --git a/app/upgrades/sdk47/upgrades.go b/app/upgrades/sdk47/upgrades.go index f0cfaa7e3..54529d9d6 100644 --- a/app/upgrades/sdk47/upgrades.go +++ b/app/upgrades/sdk47/upgrades.go @@ -135,7 +135,7 @@ func migrateCronParams(ctx sdk.Context, paramsKeepers paramskeeper.Keeper, store func migrateFeeRefunderParams(ctx sdk.Context, paramsKeepers paramskeeper.Keeper, storeKey storetypes.StoreKey, codec codec.Codec) error { store := ctx.KVStore(storeKey) var currParams feerefundertypes.Params - subspace, _ := paramsKeepers.GetSubspace(crontypes.StoreKey) + subspace, _ := paramsKeepers.GetSubspace(feerefundertypes.StoreKey) subspace.GetParamSet(ctx, &currParams) if err := currParams.Validate(); err != nil { @@ -197,6 +197,7 @@ func migrateInterchainTxsParams(ctx sdk.Context, paramsKeepers paramskeeper.Keep var currParams interchaintxstypes.Params subspace, _ := paramsKeepers.GetSubspace(interchaintxstypes.StoreKey) subspace.GetParamSet(ctx, &currParams) + currParams.RegisterFee = interchaintxstypes.DefaultRegisterFee if err := currParams.Validate(); err != nil { return err diff --git a/proto/neutron/interchaintxs/v1/params.proto b/proto/neutron/interchaintxs/v1/params.proto index c25893eef..734e7cb2e 100644 --- a/proto/neutron/interchaintxs/v1/params.proto +++ b/proto/neutron/interchaintxs/v1/params.proto @@ -2,6 +2,7 @@ syntax = "proto3"; package neutron.interchaintxs; import "gogoproto/gogo.proto"; +import "cosmos/base/v1beta1/coin.proto"; option go_package = "github.com/neutron-org/neutron/x/interchaintxs/types"; @@ -10,4 +11,6 @@ message Params { option (gogoproto.goproto_stringer) = false; // Defines maximum amount of messages to be passed in MsgSubmitTx uint64 msg_submit_tx_max_messages = 1; + // Defines a minimum fee required to register interchain account + repeated cosmos.base.v1beta1.Coin register_fee = 2 [ (gogoproto.nullable) = false ]; } diff --git a/proto/neutron/interchaintxs/v1/tx.proto b/proto/neutron/interchaintxs/v1/tx.proto index c871accd2..8fd53b3f4 100644 --- a/proto/neutron/interchaintxs/v1/tx.proto +++ b/proto/neutron/interchaintxs/v1/tx.proto @@ -4,6 +4,7 @@ package neutron.interchaintxs.v1; option go_package = "github.com/neutron-org/neutron/x/interchaintxs/types"; import "cosmos_proto/cosmos.proto"; +import "cosmos/base/v1beta1/coin.proto"; import "gogoproto/gogo.proto"; import "google/api/http.proto"; import "google/api/annotations.proto"; @@ -26,6 +27,10 @@ message MsgRegisterInterchainAccount { string connection_id = 2 [ (gogoproto.moretags) = "yaml:\"connection_id\"" ]; string interchain_account_id = 3 [ (gogoproto.moretags) = "yaml:\"interchain_account_id\"" ]; + repeated cosmos.base.v1beta1.Coin register_fee = 4 [ + (gogoproto.nullable) = false, + (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" + ]; } // MsgRegisterInterchainAccountResponse is the response type for diff --git a/testutil/interchaintxs/keeper/interchaintxs.go b/testutil/interchaintxs/keeper/interchaintxs.go index 4961a46f9..51d23413f 100644 --- a/testutil/interchaintxs/keeper/interchaintxs.go +++ b/testutil/interchaintxs/keeper/interchaintxs.go @@ -17,7 +17,14 @@ import ( "github.com/neutron-org/neutron/x/interchaintxs/types" ) -func InterchainTxsKeeper(t testing.TB, managerKeeper types.WasmKeeper, refunderKeeper types.FeeRefunderKeeper, icaControllerKeeper types.ICAControllerKeeper, channelKeeper types.ChannelKeeper) (*keeper.Keeper, sdk.Context, *storetypes.KVStoreKey) { +func InterchainTxsKeeper( + t testing.TB, + managerKeeper types.WasmKeeper, + refunderKeeper types.FeeRefunderKeeper, + icaControllerKeeper types.ICAControllerKeeper, + channelKeeper types.ChannelKeeper, + bankKeeper types.BankKeeper, + feeburnerKeeper types.FeeBurnerKeeper) (*keeper.Keeper, sdk.Context) { storeKey := sdk.NewKVStoreKey(types.StoreKey) memStoreKey := storetypes.NewMemoryStoreKey(types.MemStoreKey) @@ -38,6 +45,8 @@ func InterchainTxsKeeper(t testing.TB, managerKeeper types.WasmKeeper, refunderK icaControllerKeeper, managerKeeper, refunderKeeper, + bankKeeper, + feeburnerKeeper, ) ctx := sdk.NewContext(stateStore, tmproto.Header{}, false, log.NewNopLogger()) @@ -46,5 +55,5 @@ func InterchainTxsKeeper(t testing.TB, managerKeeper types.WasmKeeper, refunderK err := k.SetParams(ctx, types.DefaultParams()) require.NoError(t, err) - return k, ctx, storeKey + return k, ctx } diff --git a/testutil/mocks/interchaintxs/types/expected_keepers.go b/testutil/mocks/interchaintxs/types/expected_keepers.go index d42f778a0..97633afb9 100644 --- a/testutil/mocks/interchaintxs/types/expected_keepers.go +++ b/testutil/mocks/interchaintxs/types/expected_keepers.go @@ -14,7 +14,8 @@ import ( types3 "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" exported "github.com/cosmos/ibc-go/v7/modules/core/exported" gomock "github.com/golang/mock/gomock" - types4 "github.com/neutron-org/neutron/x/feerefunder/types" + types4 "github.com/neutron-org/neutron/x/feeburner/types" + types5 "github.com/neutron-org/neutron/x/feerefunder/types" ) // MockAccountKeeper is a mock of AccountKeeper interface. @@ -77,6 +78,20 @@ func (m *MockBankKeeper) EXPECT() *MockBankKeeperMockRecorder { return m.recorder } +// SendCoins mocks base method. +func (m *MockBankKeeper) SendCoins(ctx types.Context, fromAddr, toAddr types.AccAddress, amt types.Coins) error { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "SendCoins", ctx, fromAddr, toAddr, amt) + ret0, _ := ret[0].(error) + return ret0 +} + +// SendCoins indicates an expected call of SendCoins. +func (mr *MockBankKeeperMockRecorder) SendCoins(ctx, fromAddr, toAddr, amt interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SendCoins", reflect.TypeOf((*MockBankKeeper)(nil).SendCoins), ctx, fromAddr, toAddr, amt) +} + // SpendableCoins mocks base method. func (m *MockBankKeeper) SpendableCoins(ctx types.Context, addr types.AccAddress) types.Coins { m.ctrl.T.Helper() @@ -249,7 +264,7 @@ func (m *MockFeeRefunderKeeper) EXPECT() *MockFeeRefunderKeeperMockRecorder { } // DistributeAcknowledgementFee mocks base method. -func (m *MockFeeRefunderKeeper) DistributeAcknowledgementFee(ctx types.Context, receiver types.AccAddress, packetID types4.PacketID) { +func (m *MockFeeRefunderKeeper) DistributeAcknowledgementFee(ctx types.Context, receiver types.AccAddress, packetID types5.PacketID) { m.ctrl.T.Helper() m.ctrl.Call(m, "DistributeAcknowledgementFee", ctx, receiver, packetID) } @@ -261,7 +276,7 @@ func (mr *MockFeeRefunderKeeperMockRecorder) DistributeAcknowledgementFee(ctx, r } // DistributeTimeoutFee mocks base method. -func (m *MockFeeRefunderKeeper) DistributeTimeoutFee(ctx types.Context, receiver types.AccAddress, packetID types4.PacketID) { +func (m *MockFeeRefunderKeeper) DistributeTimeoutFee(ctx types.Context, receiver types.AccAddress, packetID types5.PacketID) { m.ctrl.T.Helper() m.ctrl.Call(m, "DistributeTimeoutFee", ctx, receiver, packetID) } @@ -273,7 +288,7 @@ func (mr *MockFeeRefunderKeeperMockRecorder) DistributeTimeoutFee(ctx, receiver, } // LockFees mocks base method. -func (m *MockFeeRefunderKeeper) LockFees(ctx types.Context, payer types.AccAddress, packetID types4.PacketID, fee types4.Fee) error { +func (m *MockFeeRefunderKeeper) LockFees(ctx types.Context, payer types.AccAddress, packetID types5.PacketID, fee types5.Fee) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "LockFees", ctx, payer, packetID, fee) ret0, _ := ret[0].(error) @@ -353,3 +368,40 @@ func (mr *MockChannelKeeperMockRecorder) GetNextSequenceSend(ctx, portID, channe mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetNextSequenceSend", reflect.TypeOf((*MockChannelKeeper)(nil).GetNextSequenceSend), ctx, portID, channelID) } + +// MockFeeBurnerKeeper is a mock of FeeBurnerKeeper interface. +type MockFeeBurnerKeeper struct { + ctrl *gomock.Controller + recorder *MockFeeBurnerKeeperMockRecorder +} + +// MockFeeBurnerKeeperMockRecorder is the mock recorder for MockFeeBurnerKeeper. +type MockFeeBurnerKeeperMockRecorder struct { + mock *MockFeeBurnerKeeper +} + +// NewMockFeeBurnerKeeper creates a new mock instance. +func NewMockFeeBurnerKeeper(ctrl *gomock.Controller) *MockFeeBurnerKeeper { + mock := &MockFeeBurnerKeeper{ctrl: ctrl} + mock.recorder = &MockFeeBurnerKeeperMockRecorder{mock} + return mock +} + +// EXPECT returns an object that allows the caller to indicate expected use. +func (m *MockFeeBurnerKeeper) EXPECT() *MockFeeBurnerKeeperMockRecorder { + return m.recorder +} + +// GetParams mocks base method. +func (m *MockFeeBurnerKeeper) GetParams(ctx types.Context) types4.Params { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "GetParams", ctx) + ret0, _ := ret[0].(types4.Params) + return ret0 +} + +// GetParams indicates an expected call of GetParams. +func (mr *MockFeeBurnerKeeperMockRecorder) GetParams(ctx interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetParams", reflect.TypeOf((*MockFeeBurnerKeeper)(nil).GetParams), ctx) +} diff --git a/wasmbinding/bindings/msg.go b/wasmbinding/bindings/msg.go index 13793b11b..b2fd53f51 100644 --- a/wasmbinding/bindings/msg.go +++ b/wasmbinding/bindings/msg.go @@ -4,6 +4,7 @@ package bindings import ( "cosmossdk.io/math" cosmostypes "github.com/cosmos/cosmos-sdk/codec/types" + sdk "github.com/cosmos/cosmos-sdk/types" paramChange "github.com/cosmos/cosmos-sdk/x/params/types/proposal" feetypes "github.com/neutron-org/neutron/x/feerefunder/types" @@ -72,8 +73,9 @@ type SubmitTxResponse struct { // RegisterInterchainAccount creates account on remote chain. type RegisterInterchainAccount struct { - ConnectionId string `json:"connection_id"` - InterchainAccountId string `json:"interchain_account_id"` + ConnectionId string `json:"connection_id"` + InterchainAccountId string `json:"interchain_account_id"` + RegisterFee sdk.Coins `json:"register_fee"` } // RegisterInterchainAccountResponse holds response for RegisterInterchainAccount. diff --git a/wasmbinding/message_plugin.go b/wasmbinding/message_plugin.go index 2768ba7a3..383ac6d48 100644 --- a/wasmbinding/message_plugin.go +++ b/wasmbinding/message_plugin.go @@ -691,6 +691,7 @@ func (m *CustomMessenger) performRegisterInterchainAccount(ctx sdk.Context, cont FromAddress: contractAddr.String(), ConnectionId: reg.ConnectionId, InterchainAccountId: reg.InterchainAccountId, + RegisterFee: reg.RegisterFee, } if err := msg.ValidateBasic(); err != nil { return nil, errors.Wrap(err, "failed to validate incoming RegisterInterchainAccount message") diff --git a/wasmbinding/test/custom_message_test.go b/wasmbinding/test/custom_message_test.go index 1f5d11d5b..5346823d7 100644 --- a/wasmbinding/test/custom_message_test.go +++ b/wasmbinding/test/custom_message_test.go @@ -4,6 +4,7 @@ import ( "encoding/json" "fmt" keeper2 "github.com/neutron-org/neutron/x/contractmanager/keeper" + feeburnertypes "github.com/neutron-org/neutron/x/feeburner/types" "testing" ibcchanneltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" @@ -76,15 +77,27 @@ func (suite *CustomMessengerTestSuite) TestRegisterInterchainAccount() { suite.contractAddress = suite.InstantiateReflectContract(suite.ctx, suite.contractOwner, codeID) suite.Require().NotEmpty(suite.contractAddress) + err := suite.neutron.FeeBurnerKeeper.SetParams(suite.ctx, feeburnertypes.Params{ + NeutronDenom: "untrn", + TreasuryAddress: "neutron13jrwrtsyjjuynlug65r76r2zvfw5xjcq6532h2", + }) + suite.Require().NoError(err) + // Craft RegisterInterchainAccount message msg, err := json.Marshal(bindings.NeutronMsg{ RegisterInterchainAccount: &bindings.RegisterInterchainAccount{ ConnectionId: suite.Path.EndpointA.ConnectionID, InterchainAccountId: testutil.TestInterchainID, + RegisterFee: sdk.NewCoins(sdk.NewCoin(params.DefaultDenom, sdk.NewInt(1000))), }, }) suite.NoError(err) + bankKeeper := suite.neutron.BankKeeper + senderAddress := suite.ChainA.SenderAccounts[0].SenderAccount.GetAddress() + err = bankKeeper.SendCoins(suite.ctx, senderAddress, suite.contractAddress, sdk.NewCoins(sdk.NewCoin(params.DefaultDenom, sdk.NewInt(1000)))) + suite.NoError(err) + // Dispatch RegisterInterchainAccount message events, data, err := suite.messenger.DispatchMsg(suite.ctx, suite.contractAddress, suite.Path.EndpointA.ChannelConfig.PortID, types.CosmosMsg{ Custom: msg, diff --git a/x/interchaintxs/genesis_test.go b/x/interchaintxs/genesis_test.go index 88cb68297..2adc3476d 100644 --- a/x/interchaintxs/genesis_test.go +++ b/x/interchaintxs/genesis_test.go @@ -16,7 +16,7 @@ func TestGenesis(t *testing.T) { Params: types.DefaultParams(), } - k, ctx, _ := keepertest.InterchainTxsKeeper(t, nil, nil, nil, nil) + k, ctx := keepertest.InterchainTxsKeeper(t, nil, nil, nil, nil, nil, nil) interchaintxs.InitGenesis(ctx, *k, genesisState) got := interchaintxs.ExportGenesis(ctx, *k) require.NotNil(t, got) diff --git a/x/interchaintxs/keeper/grpc_query_interchainaccount_test.go b/x/interchaintxs/keeper/grpc_query_interchainaccount_test.go index 1c631682f..5de39ad40 100644 --- a/x/interchaintxs/keeper/grpc_query_interchainaccount_test.go +++ b/x/interchaintxs/keeper/grpc_query_interchainaccount_test.go @@ -20,7 +20,7 @@ func TestKeeper_InterchainAccountAddress(t *testing.T) { ctrl := gomock.NewController(t) defer ctrl.Finish() icaKeeper := mock_types.NewMockICAControllerKeeper(ctrl) - keeper, ctx, _ := testkeeper.InterchainTxsKeeper(t, nil, nil, icaKeeper, nil) + keeper, ctx := testkeeper.InterchainTxsKeeper(t, nil, nil, icaKeeper, nil, nil, nil) wctx := sdk.WrapSDKContext(ctx) resp, err := keeper.InterchainAccountAddress(wctx, nil) diff --git a/x/interchaintxs/keeper/grpc_query_params_test.go b/x/interchaintxs/keeper/grpc_query_params_test.go index 90df327c3..5fa31e0c3 100644 --- a/x/interchaintxs/keeper/grpc_query_params_test.go +++ b/x/interchaintxs/keeper/grpc_query_params_test.go @@ -11,7 +11,7 @@ import ( ) func TestParamsQuery(t *testing.T) { - keeper, ctx, _ := testkeeper.InterchainTxsKeeper(t, nil, nil, nil, nil) + keeper, ctx := testkeeper.InterchainTxsKeeper(t, nil, nil, nil, nil, nil, nil) wctx := sdk.WrapSDKContext(ctx) params := types.DefaultParams() err := keeper.SetParams(ctx, params) diff --git a/x/interchaintxs/keeper/ibc_handlers_test.go b/x/interchaintxs/keeper/ibc_handlers_test.go index 3785f7906..50cc29fd8 100644 --- a/x/interchaintxs/keeper/ibc_handlers_test.go +++ b/x/interchaintxs/keeper/ibc_handlers_test.go @@ -24,7 +24,9 @@ func TestHandleAcknowledgement(t *testing.T) { icaKeeper := mock_types.NewMockICAControllerKeeper(ctrl) wmKeeper := mock_types.NewMockWasmKeeper(ctrl) feeKeeper := mock_types.NewMockFeeRefunderKeeper(ctrl) - icak, infCtx, _ := testkeeper.InterchainTxsKeeper(t, wmKeeper, feeKeeper, icaKeeper, nil) + bankKeeper := mock_types.NewMockBankKeeper(ctrl) + feeburnerKeeper := mock_types.NewMockFeeBurnerKeeper(ctrl) + icak, infCtx := testkeeper.InterchainTxsKeeper(t, wmKeeper, feeKeeper, icaKeeper, nil, bankKeeper, feeburnerKeeper) ctx := infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) resACK := channeltypes.Acknowledgement{ @@ -124,7 +126,9 @@ func TestHandleTimeout(t *testing.T) { icaKeeper := mock_types.NewMockICAControllerKeeper(ctrl) wmKeeper := mock_types.NewMockWasmKeeper(ctrl) feeKeeper := mock_types.NewMockFeeRefunderKeeper(ctrl) - icak, infCtx, _ := testkeeper.InterchainTxsKeeper(t, wmKeeper, feeKeeper, icaKeeper, nil) + bankKeeper := mock_types.NewMockBankKeeper(ctrl) + feeburnerKeeper := mock_types.NewMockFeeBurnerKeeper(ctrl) + icak, infCtx := testkeeper.InterchainTxsKeeper(t, wmKeeper, feeKeeper, icaKeeper, nil, bankKeeper, feeburnerKeeper) ctx := infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) contractAddress := sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress) relayerBech32 := "neutron1fxudpred77a0grgh69u0j7y84yks5ev4n5050z45kecz792jnd6scqu98z" @@ -161,7 +165,9 @@ func TestHandleChanOpenAck(t *testing.T) { ctrl := gomock.NewController(t) defer ctrl.Finish() wmKeeper := mock_types.NewMockWasmKeeper(ctrl) - icak, ctx, _ := testkeeper.InterchainTxsKeeper(t, wmKeeper, nil, nil, nil) + bankKeeper := mock_types.NewMockBankKeeper(ctrl) + feeburnerKeeper := mock_types.NewMockFeeBurnerKeeper(ctrl) + icak, ctx := testkeeper.InterchainTxsKeeper(t, wmKeeper, nil, nil, nil, bankKeeper, feeburnerKeeper) portID := icatypes.ControllerPortPrefix + testutil.TestOwnerAddress + ".ica0" contractAddress := sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress) channelID := "channel-0" diff --git a/x/interchaintxs/keeper/keeper.go b/x/interchaintxs/keeper/keeper.go index 737a874b5..e27d294d2 100644 --- a/x/interchaintxs/keeper/keeper.go +++ b/x/interchaintxs/keeper/keeper.go @@ -1,7 +1,9 @@ package keeper import ( + "cosmossdk.io/errors" "fmt" + sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/cometbft/cometbft/libs/log" "github.com/cosmos/cosmos-sdk/codec" @@ -27,6 +29,8 @@ type ( feeKeeper types.FeeRefunderKeeper icaControllerKeeper types.ICAControllerKeeper sudoKeeper types.WasmKeeper + bankKeeper types.BankKeeper + feeBurnerKeeper types.FeeBurnerKeeper } ) @@ -38,6 +42,8 @@ func NewKeeper( icaControllerKeeper types.ICAControllerKeeper, contractManagerKeeper types.WasmKeeper, feeKeeper types.FeeRefunderKeeper, + bankKeeper types.BankKeeper, + feeBurnerKeeper types.FeeBurnerKeeper, ) *Keeper { return &Keeper{ Codec: cdc, @@ -47,9 +53,33 @@ func NewKeeper( icaControllerKeeper: icaControllerKeeper, sudoKeeper: contractManagerKeeper, feeKeeper: feeKeeper, + bankKeeper: bankKeeper, + feeBurnerKeeper: feeBurnerKeeper, } } func (k *Keeper) Logger(ctx sdk.Context) log.Logger { return ctx.Logger().With("module", fmt.Sprintf("x/%s", types.ModuleName)) } + +func (k Keeper) ChargeFee(ctx sdk.Context, payer sdk.AccAddress, fee sdk.Coins) error { + k.Logger(ctx).Debug("Trying to change fees", "payer", payer, "fee", fee) + + params := k.GetParams(ctx) + + if !fee.IsAnyGTE(params.RegisterFee) { + return errors.Wrapf(sdkerrors.ErrInsufficientFee, "provided fee is less than min governance set ack fee: %v < %v", fee, params.RegisterFee) + } + + treasury := k.feeBurnerKeeper.GetParams(ctx).TreasuryAddress + treasuryAddress, err := sdk.AccAddressFromBech32(treasury) + if err != nil { + return errors.Wrapf(sdkerrors.ErrInvalidAddress, "failed to convert treasury, bech32 to AccAddress: %v: %v", treasury, err) + } + + err = k.bankKeeper.SendCoins(ctx, payer, treasuryAddress, fee) + if err != nil { + return errors.Wrapf(err, "failed send fee(%v) from %v to %v", fee, payer, treasury) + } + return nil +} diff --git a/x/interchaintxs/keeper/msg_server.go b/x/interchaintxs/keeper/msg_server.go index efc3a42d9..4c23bfbef 100644 --- a/x/interchaintxs/keeper/msg_server.go +++ b/x/interchaintxs/keeper/msg_server.go @@ -48,6 +48,10 @@ func (k Keeper) RegisterInterchainAccount(goCtx context.Context, msg *ictxtypes. return nil, errors.Wrapf(ictxtypes.ErrNotContract, "%s is not a contract address", msg.FromAddress) } + if err := k.ChargeFee(ctx, senderAddr, msg.RegisterFee); err != nil { + return nil, errors.Wrapf(err, "failed to charge fees to pay for RegisterInterchainAccount msg: %s", msg) + } + icaOwner := ictxtypes.NewICAOwnerFromAddress(senderAddr, msg.InterchainAccountId) // FIXME: empty version string doesn't look good diff --git a/x/interchaintxs/keeper/msg_server_test.go b/x/interchaintxs/keeper/msg_server_test.go index c662dd8da..635464474 100644 --- a/x/interchaintxs/keeper/msg_server_test.go +++ b/x/interchaintxs/keeper/msg_server_test.go @@ -2,6 +2,8 @@ package keeper_test import ( "fmt" + "github.com/neutron-org/neutron/app/params" + feeburnertypes "github.com/neutron-org/neutron/x/feeburner/types" "testing" "time" @@ -21,12 +23,16 @@ import ( "github.com/neutron-org/neutron/x/interchaintxs/types" ) +const TestTreasury = "neutron1dua3d89szsmd3vwg0y5a2689ah0g4x68ps8vew" + func TestRegisterInterchainAccount(t *testing.T) { ctrl := gomock.NewController(t) defer ctrl.Finish() icaKeeper := mock_types.NewMockICAControllerKeeper(ctrl) wmKeeper := mock_types.NewMockWasmKeeper(ctrl) - icak, ctx, _ := testkeeper.InterchainTxsKeeper(t, wmKeeper, nil, icaKeeper, nil) + bankKeeper := mock_types.NewMockBankKeeper(ctrl) + feeburnerKeeper := mock_types.NewMockFeeBurnerKeeper(ctrl) + icak, ctx := testkeeper.InterchainTxsKeeper(t, wmKeeper, nil, icaKeeper, nil, bankKeeper, feeburnerKeeper) goCtx := sdk.WrapSDKContext(ctx) msgRegAcc := types.MsgRegisterInterchainAccount{ @@ -47,12 +53,38 @@ func TestRegisterInterchainAccount(t *testing.T) { require.Nil(t, resp) wmKeeper.EXPECT().HasContractInfo(ctx, contractAddress).Return(true) + resp, err = icak.RegisterInterchainAccount(goCtx, &msgRegAcc) + require.ErrorContains(t, err, "failed to charge fees to pay for RegisterInterchainAccount msg") + require.Nil(t, resp) + + msgRegAcc.RegisterFee = sdk.NewCoins(sdk.NewCoin(params.DefaultDenom, sdk.NewInt(1000))) + + wmKeeper.EXPECT().HasContractInfo(ctx, contractAddress).Return(true) + feeburnerKeeper.EXPECT().GetParams(ctx).Return(feeburnertypes.Params{ + TreasuryAddress: TestTreasury, + }) + bankKeeper.EXPECT().SendCoins(ctx, sdk.MustAccAddressFromBech32(msgRegAcc.FromAddress), sdk.MustAccAddressFromBech32(TestTreasury), msgRegAcc.RegisterFee) icaKeeper.EXPECT().RegisterInterchainAccount(ctx, msgRegAcc.ConnectionId, icaOwner.String(), "").Return(fmt.Errorf("failed to register ica")) resp, err = icak.RegisterInterchainAccount(goCtx, &msgRegAcc) require.ErrorContains(t, err, "failed to RegisterInterchainAccount") require.Nil(t, resp) wmKeeper.EXPECT().HasContractInfo(ctx, contractAddress).Return(true) + feeburnerKeeper.EXPECT().GetParams(ctx).Return(feeburnertypes.Params{ + TreasuryAddress: TestTreasury, + }) + bankKeeper.EXPECT(). + SendCoins(ctx, sdk.MustAccAddressFromBech32(msgRegAcc.FromAddress), sdk.MustAccAddressFromBech32(TestTreasury), msgRegAcc.RegisterFee). + Return(fmt.Errorf("failed to send coins")) + resp, err = icak.RegisterInterchainAccount(goCtx, &msgRegAcc) + require.ErrorContains(t, err, "failed to send coins") + require.Nil(t, resp) + + wmKeeper.EXPECT().HasContractInfo(ctx, contractAddress).Return(true) + feeburnerKeeper.EXPECT().GetParams(ctx).Return(feeburnertypes.Params{ + TreasuryAddress: TestTreasury, + }) + bankKeeper.EXPECT().SendCoins(ctx, sdk.MustAccAddressFromBech32(msgRegAcc.FromAddress), sdk.MustAccAddressFromBech32(TestTreasury), msgRegAcc.RegisterFee) icaKeeper.EXPECT().RegisterInterchainAccount(ctx, msgRegAcc.ConnectionId, icaOwner.String(), "").Return(nil) resp, err = icak.RegisterInterchainAccount(goCtx, &msgRegAcc) require.NoError(t, err) @@ -66,7 +98,9 @@ func TestSubmitTx(t *testing.T) { wmKeeper := mock_types.NewMockWasmKeeper(ctrl) refundKeeper := mock_types.NewMockFeeRefunderKeeper(ctrl) channelKeeper := mock_types.NewMockChannelKeeper(ctrl) - icak, ctx, _ := testkeeper.InterchainTxsKeeper(t, wmKeeper, refundKeeper, icaKeeper, channelKeeper) + bankKeeper := mock_types.NewMockBankKeeper(ctrl) + feeburnerKeeper := mock_types.NewMockFeeBurnerKeeper(ctrl) + icak, ctx := testkeeper.InterchainTxsKeeper(t, wmKeeper, refundKeeper, icaKeeper, channelKeeper, bankKeeper, feeburnerKeeper) goCtx := sdk.WrapSDKContext(ctx) cosmosMsg := codectypes.Any{ diff --git a/x/interchaintxs/keeper/params_test.go b/x/interchaintxs/keeper/params_test.go index 0ecf910fc..0899ac765 100644 --- a/x/interchaintxs/keeper/params_test.go +++ b/x/interchaintxs/keeper/params_test.go @@ -10,7 +10,7 @@ import ( ) func TestGetParams(t *testing.T) { - k, ctx, _ := testkeeper.InterchainTxsKeeper(t, nil, nil, nil, nil) + k, ctx := testkeeper.InterchainTxsKeeper(t, nil, nil, nil, nil, nil, nil) params := types.DefaultParams() err := k.SetParams(ctx, params) diff --git a/x/interchaintxs/types/expected_keepers.go b/x/interchaintxs/types/expected_keepers.go index 3e57253ed..23648d88d 100644 --- a/x/interchaintxs/types/expected_keepers.go +++ b/x/interchaintxs/types/expected_keepers.go @@ -7,6 +7,7 @@ import ( icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" + feeburnertypes "github.com/neutron-org/neutron/x/feeburner/types" feerefundertypes "github.com/neutron-org/neutron/x/feerefunder/types" ) @@ -20,7 +21,7 @@ type AccountKeeper interface { // BankKeeper defines the expected interface needed to retrieve account balances. type BankKeeper interface { SpendableCoins(ctx sdk.Context, addr sdk.AccAddress) sdk.Coins - // Methods imported from bank should be defined here + SendCoins(ctx sdk.Context, fromAddr, toAddr sdk.AccAddress, amt sdk.Coins) error } type WasmKeeper interface { @@ -47,3 +48,7 @@ type ChannelKeeper interface { GetNextSequenceSend(ctx sdk.Context, portID, channelID string) (uint64, bool) GetConnection(ctx sdk.Context, connectionID string) (ibcexported.ConnectionI, error) } + +type FeeBurnerKeeper interface { + GetParams(ctx sdk.Context) feeburnertypes.Params +} diff --git a/x/interchaintxs/types/params.go b/x/interchaintxs/types/params.go index c9216156e..7a9f54638 100644 --- a/x/interchaintxs/types/params.go +++ b/x/interchaintxs/types/params.go @@ -2,8 +2,10 @@ package types import ( "fmt" - + sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" + "github.com/neutron-org/neutron/app/params" + "gopkg.in/yaml.v2" ) @@ -12,29 +14,20 @@ var _ paramtypes.ParamSet = (*Params)(nil) var ( KeyMsgSubmitTxMaxMessages = []byte("MsgSubmitTxMaxMessages") DefaultMsgSubmitTxMaxMessages = uint64(16) + DefaultRegisterFee = sdk.NewCoins(sdk.NewCoin(params.DefaultDenom, sdk.NewInt(1000))) ) -// ParamKeyTable the param key table for launch module -func ParamKeyTable() paramtypes.KeyTable { - return paramtypes.NewKeyTable( - paramtypes.NewParamSetPair( - KeyMsgSubmitTxMaxMessages, - DefaultMsgSubmitTxMaxMessages, - validateMsgSubmitTxMaxMessages, - ), - ) -} - // NewParams creates a new Params instance -func NewParams(msgSubmitTxMaxMessages uint64) Params { +func NewParams(msgSubmitTxMaxMessages uint64, registerFee sdk.Coins) Params { return Params{ MsgSubmitTxMaxMessages: msgSubmitTxMaxMessages, + RegisterFee: registerFee, } } // DefaultParams returns a default set of parameters func DefaultParams() Params { - return NewParams(DefaultMsgSubmitTxMaxMessages) + return NewParams(DefaultMsgSubmitTxMaxMessages, DefaultRegisterFee) } // ParamSetPairs get the params.ParamSet diff --git a/x/interchaintxs/types/params.pb.go b/x/interchaintxs/types/params.pb.go index e43702998..00f396fe7 100644 --- a/x/interchaintxs/types/params.pb.go +++ b/x/interchaintxs/types/params.pb.go @@ -5,6 +5,7 @@ package types import ( fmt "fmt" + types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" io "io" @@ -27,6 +28,8 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type Params struct { // Defines maximum amount of messages to be passed in MsgSubmitTx MsgSubmitTxMaxMessages uint64 `protobuf:"varint,1,opt,name=msg_submit_tx_max_messages,json=msgSubmitTxMaxMessages,proto3" json:"msg_submit_tx_max_messages,omitempty"` + // Defines a minimum fee required to register interchain account + RegisterFee []types.Coin `protobuf:"bytes,2,rep,name=register_fee,json=registerFee,proto3" json:"register_fee"` } func (m *Params) Reset() { *m = Params{} } @@ -68,6 +71,13 @@ func (m *Params) GetMsgSubmitTxMaxMessages() uint64 { return 0 } +func (m *Params) GetRegisterFee() []types.Coin { + if m != nil { + return m.RegisterFee + } + return nil +} + func init() { proto.RegisterType((*Params)(nil), "neutron.interchaintxs.Params") } @@ -77,21 +87,25 @@ func init() { } var fileDescriptor_52b0ced89d3fa9c6 = []byte{ - // 211 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, 0xcc, 0x2b, 0x49, 0x2d, 0x4a, 0xce, 0x48, 0xcc, 0xcc, 0x2b, 0xa9, - 0x28, 0xd6, 0x2f, 0x33, 0xd4, 0x2f, 0x48, 0x2c, 0x4a, 0xcc, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, - 0xc9, 0x17, 0x12, 0x85, 0x2a, 0xd3, 0x43, 0x51, 0x26, 0x25, 0x92, 0x9e, 0x9f, 0x9e, 0x0f, 0x56, - 0xa1, 0x0f, 0x62, 0x41, 0x14, 0x2b, 0x79, 0x71, 0xb1, 0x05, 0x80, 0x35, 0x0b, 0x59, 0x71, 0x49, - 0xe5, 0x16, 0xa7, 0xc7, 0x17, 0x97, 0x26, 0xe5, 0x66, 0x96, 0xc4, 0x97, 0x54, 0xc4, 0xe7, 0x26, - 0x56, 0xc4, 0xe7, 0xa6, 0x16, 0x17, 0x27, 0xa6, 0xa7, 0x16, 0x4b, 0x30, 0x2a, 0x30, 0x6a, 0xb0, - 0x04, 0x89, 0xe5, 0x16, 0xa7, 0x07, 0x83, 0x15, 0x84, 0x54, 0xf8, 0x26, 0x56, 0xf8, 0x42, 0x65, - 0xad, 0x58, 0x66, 0x2c, 0x90, 0x67, 0x70, 0xf2, 0x3b, 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, 0x93, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0x7d, 0xa8, - 0xeb, 0x74, 0xf3, 0x8b, 0xd2, 0x61, 0x6c, 0xfd, 0x0a, 0x34, 0x2f, 0x95, 0x54, 0x16, 0xa4, 0x16, - 0x27, 0xb1, 0x81, 0x9d, 0x68, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x61, 0xb1, 0xdd, 0xe6, 0xf8, - 0x00, 0x00, 0x00, + // 285 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x90, 0x31, 0x4b, 0x03, 0x31, + 0x18, 0x86, 0x2f, 0x5a, 0x3a, 0x5c, 0x9d, 0x8a, 0x4a, 0xed, 0x90, 0x16, 0x41, 0xe8, 0x62, 0x42, + 0xd5, 0xa9, 0x63, 0x05, 0xb7, 0x8a, 0x54, 0x27, 0x97, 0x23, 0x77, 0x7c, 0xa6, 0x19, 0x92, 0x1c, + 0xf9, 0x72, 0x25, 0xfe, 0x09, 0x71, 0x74, 0xf4, 0xe7, 0x74, 0xec, 0xe8, 0x24, 0x72, 0xf7, 0x47, + 0xa4, 0x77, 0xd7, 0x41, 0xb7, 0x17, 0xde, 0x27, 0x79, 0xf8, 0xde, 0xf8, 0xc2, 0x40, 0xe1, 0x9d, + 0x35, 0x5c, 0x19, 0x0f, 0x2e, 0x5b, 0x09, 0x65, 0x7c, 0x40, 0xbe, 0x9e, 0xf2, 0x5c, 0x38, 0xa1, + 0x91, 0xe5, 0xce, 0x7a, 0xdb, 0x3f, 0x69, 0x31, 0xf6, 0x07, 0x1b, 0x1e, 0x4b, 0x2b, 0x6d, 0x4d, + 0xf0, 0x5d, 0x6a, 0xe0, 0x21, 0xcd, 0x2c, 0x6a, 0x8b, 0x3c, 0x15, 0x08, 0x7c, 0x3d, 0x4d, 0xc1, + 0x8b, 0x29, 0xcf, 0xac, 0x32, 0x4d, 0x7f, 0xfe, 0x46, 0xe2, 0xee, 0x43, 0xfd, 0x7b, 0x7f, 0x16, + 0x0f, 0x35, 0xca, 0x04, 0x8b, 0x54, 0x2b, 0x9f, 0xf8, 0x90, 0x68, 0x11, 0x12, 0x0d, 0x88, 0x42, + 0x02, 0x0e, 0xc8, 0x98, 0x4c, 0x3a, 0xcb, 0x53, 0x8d, 0xf2, 0xb1, 0x06, 0x9e, 0xc2, 0x42, 0x84, + 0x45, 0xdb, 0xf6, 0xe7, 0xf1, 0x91, 0x03, 0xa9, 0xd0, 0x83, 0x4b, 0x5e, 0x00, 0x06, 0x07, 0xe3, + 0xc3, 0x49, 0xef, 0xea, 0x8c, 0x35, 0x76, 0xb6, 0xb3, 0xb3, 0xd6, 0xce, 0x6e, 0xad, 0x32, 0xf3, + 0xce, 0xe6, 0x7b, 0x14, 0x2d, 0x7b, 0xfb, 0x47, 0x77, 0x00, 0xb3, 0xce, 0xc7, 0xe7, 0x28, 0x9a, + 0xdf, 0x6f, 0x4a, 0x4a, 0xb6, 0x25, 0x25, 0x3f, 0x25, 0x25, 0xef, 0x15, 0x8d, 0xb6, 0x15, 0x8d, + 0xbe, 0x2a, 0x1a, 0x3d, 0xdf, 0x48, 0xe5, 0x57, 0x45, 0xca, 0x32, 0xab, 0x79, 0x3b, 0xc1, 0xa5, + 0x75, 0x72, 0x9f, 0x79, 0xf8, 0xb7, 0x9b, 0x7f, 0xcd, 0x01, 0xd3, 0x6e, 0x7d, 0xe7, 0xf5, 0x6f, + 0x00, 0x00, 0x00, 0xff, 0xff, 0x81, 0x7b, 0xd6, 0x7d, 0x5d, 0x01, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { @@ -114,6 +128,20 @@ func (m *Params) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if len(m.RegisterFee) > 0 { + for iNdEx := len(m.RegisterFee) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.RegisterFee[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintParams(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } + } if m.MsgSubmitTxMaxMessages != 0 { i = encodeVarintParams(dAtA, i, uint64(m.MsgSubmitTxMaxMessages)) i-- @@ -142,6 +170,12 @@ func (m *Params) Size() (n int) { if m.MsgSubmitTxMaxMessages != 0 { n += 1 + sovParams(uint64(m.MsgSubmitTxMaxMessages)) } + if len(m.RegisterFee) > 0 { + for _, e := range m.RegisterFee { + l = e.Size() + n += 1 + l + sovParams(uint64(l)) + } + } return n } @@ -199,6 +233,40 @@ func (m *Params) Unmarshal(dAtA []byte) error { break } } + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field RegisterFee", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowParams + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthParams + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthParams + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.RegisterFee = append(m.RegisterFee, types.Coin{}) + if err := m.RegisterFee[len(m.RegisterFee)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipParams(dAtA[iNdEx:]) diff --git a/x/interchaintxs/types/tx.pb.go b/x/interchaintxs/types/tx.pb.go index 41bf28b30..80aa5ff45 100644 --- a/x/interchaintxs/types/tx.pb.go +++ b/x/interchaintxs/types/tx.pb.go @@ -7,11 +7,13 @@ import ( context "context" fmt "fmt" _ "github.com/cosmos/cosmos-proto" - types "github.com/cosmos/cosmos-sdk/codec/types" + types1 "github.com/cosmos/cosmos-sdk/codec/types" + github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" + types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" - types1 "github.com/neutron-org/neutron/x/feerefunder/types" + types2 "github.com/neutron-org/neutron/x/feerefunder/types" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" @@ -34,9 +36,10 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // MsgRegisterInterchainAccount is used to register an account on a remote zone. type MsgRegisterInterchainAccount struct { - FromAddress string `protobuf:"bytes,1,opt,name=from_address,json=fromAddress,proto3" json:"from_address,omitempty"` - ConnectionId string `protobuf:"bytes,2,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty" yaml:"connection_id"` - InterchainAccountId string `protobuf:"bytes,3,opt,name=interchain_account_id,json=interchainAccountId,proto3" json:"interchain_account_id,omitempty" yaml:"interchain_account_id"` + FromAddress string `protobuf:"bytes,1,opt,name=from_address,json=fromAddress,proto3" json:"from_address,omitempty"` + ConnectionId string `protobuf:"bytes,2,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty" yaml:"connection_id"` + InterchainAccountId string `protobuf:"bytes,3,opt,name=interchain_account_id,json=interchainAccountId,proto3" json:"interchain_account_id,omitempty" yaml:"interchain_account_id"` + RegisterFee github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,4,rep,name=register_fee,json=registerFee,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"register_fee"` } func (m *MsgRegisterInterchainAccount) Reset() { *m = MsgRegisterInterchainAccount{} } @@ -117,13 +120,13 @@ type MsgSubmitTx struct { // lido/kava. This allows contracts to have more than one interchain accounts // on remote zone This identifier will be a part of the portID that we'll // claim our capability for. - InterchainAccountId string `protobuf:"bytes,2,opt,name=interchain_account_id,json=interchainAccountId,proto3" json:"interchain_account_id,omitempty"` - ConnectionId string `protobuf:"bytes,3,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty"` - Msgs []*types.Any `protobuf:"bytes,4,rep,name=msgs,proto3" json:"msgs,omitempty"` - Memo string `protobuf:"bytes,5,opt,name=memo,proto3" json:"memo,omitempty"` + InterchainAccountId string `protobuf:"bytes,2,opt,name=interchain_account_id,json=interchainAccountId,proto3" json:"interchain_account_id,omitempty"` + ConnectionId string `protobuf:"bytes,3,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty"` + Msgs []*types1.Any `protobuf:"bytes,4,rep,name=msgs,proto3" json:"msgs,omitempty"` + Memo string `protobuf:"bytes,5,opt,name=memo,proto3" json:"memo,omitempty"` // timeout in seconds after which the packet times out Timeout uint64 `protobuf:"varint,6,opt,name=timeout,proto3" json:"timeout,omitempty"` - Fee types1.Fee `protobuf:"bytes,7,opt,name=fee,proto3" json:"fee"` + Fee types2.Fee `protobuf:"bytes,7,opt,name=fee,proto3" json:"fee"` } func (m *MsgSubmitTx) Reset() { *m = MsgSubmitTx{} } @@ -224,43 +227,48 @@ func init() { func init() { proto.RegisterFile("neutron/interchaintxs/v1/tx.proto", fileDescriptor_50f087790e59c806) } var fileDescriptor_50f087790e59c806 = []byte{ - // 576 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0xbd, 0x6f, 0xda, 0x4e, - 0x18, 0xb6, 0x03, 0xbf, 0x24, 0xbf, 0x23, 0x5d, 0x2e, 0x89, 0x64, 0x10, 0xb5, 0x89, 0xfb, 0x21, - 0x96, 0x9c, 0x1b, 0x5a, 0x75, 0x88, 0xd4, 0x4a, 0x30, 0x54, 0x62, 0xa0, 0xaa, 0xdc, 0x4c, 0x5d, - 0x90, 0xb1, 0x5f, 0x0e, 0x4b, 0xf8, 0x8e, 0xfa, 0xce, 0x11, 0x8c, 0xdd, 0x3a, 0x76, 0xe9, 0x58, - 0x29, 0x7f, 0x4e, 0xc6, 0x8c, 0x9d, 0x50, 0x04, 0x4b, 0xe7, 0xfc, 0x05, 0x95, 0xbf, 0x80, 0xa0, - 0x80, 0xa2, 0x6e, 0xef, 0xc7, 0x73, 0xcf, 0x3d, 0xef, 0x73, 0xaf, 0x8d, 0x4e, 0x18, 0x44, 0x32, - 0xe4, 0xcc, 0xf2, 0x99, 0x84, 0xd0, 0x1d, 0x38, 0x3e, 0x93, 0x63, 0x61, 0x5d, 0x9e, 0x59, 0x72, - 0x4c, 0x46, 0x21, 0x97, 0x1c, 0x6b, 0x19, 0x84, 0xdc, 0x83, 0x90, 0xcb, 0xb3, 0x4a, 0xd9, 0xe5, - 0x22, 0xe0, 0xa2, 0x9b, 0xe0, 0xac, 0x34, 0x49, 0x0f, 0x55, 0x8e, 0x28, 0xa7, 0x3c, 0xad, 0xc7, - 0x51, 0x56, 0x3d, 0xa6, 0x9c, 0xd3, 0x21, 0x58, 0xce, 0xc8, 0xb7, 0x06, 0x52, 0x8e, 0xb2, 0x72, - 0x75, 0xa5, 0xec, 0x30, 0xc6, 0xa5, 0x23, 0x7d, 0xce, 0x72, 0xaa, 0x72, 0xd6, 0x4d, 0xb2, 0x5e, - 0xd4, 0xb7, 0x1c, 0x36, 0xc9, 0x5a, 0x4f, 0x73, 0xf5, 0x7d, 0x80, 0x10, 0xfa, 0x11, 0xf3, 0x20, - 0x8c, 0xe3, 0xb4, 0x6d, 0xde, 0xaa, 0xa8, 0xda, 0x11, 0xd4, 0x06, 0xea, 0x0b, 0x09, 0x61, 0x7b, - 0xa1, 0xbf, 0xe9, 0xba, 0x3c, 0x62, 0x12, 0x9f, 0xa0, 0x83, 0x7e, 0xc8, 0x83, 0xae, 0xe3, 0x79, - 0x21, 0x08, 0xa1, 0xa9, 0x35, 0xb5, 0xfe, 0xbf, 0x5d, 0x8a, 0x6b, 0xcd, 0xb4, 0x84, 0xdf, 0xa1, - 0x27, 0x2e, 0x67, 0x0c, 0xdc, 0x58, 0x52, 0xd7, 0xf7, 0xb4, 0x9d, 0x18, 0xd3, 0xd2, 0xee, 0xa6, - 0xc6, 0xd1, 0xc4, 0x09, 0x86, 0xe7, 0xe6, 0xbd, 0xb6, 0x69, 0x1f, 0x2c, 0xf3, 0xb6, 0x87, 0x2f, - 0xd0, 0xf1, 0xd2, 0xb6, 0xae, 0x93, 0xde, 0x1b, 0xd3, 0x14, 0x12, 0x9a, 0xda, 0xdd, 0xd4, 0xa8, - 0xa6, 0x34, 0x0f, 0xc2, 0x4c, 0xfb, 0xd0, 0x5f, 0x57, 0xdd, 0xf6, 0xce, 0xf7, 0xbf, 0x5f, 0x19, - 0xca, 0x9f, 0x2b, 0x43, 0x31, 0x5f, 0xa2, 0xe7, 0xdb, 0x26, 0xb4, 0x41, 0x8c, 0x38, 0x13, 0x60, - 0xfe, 0xda, 0x41, 0xa5, 0x8e, 0xa0, 0x9f, 0xa3, 0x5e, 0xe0, 0xcb, 0x8b, 0xf1, 0x63, 0x26, 0x6f, - 0x6c, 0x92, 0x9e, 0x38, 0xf0, 0xa0, 0x30, 0xfc, 0x6c, 0xdd, 0xad, 0x64, 0xcc, 0x35, 0x4f, 0xea, - 0xa8, 0x18, 0x08, 0x2a, 0xb4, 0x62, 0xad, 0x50, 0x2f, 0x35, 0x8e, 0x48, 0xfa, 0xbe, 0x24, 0x7f, - 0x5f, 0xd2, 0x64, 0x13, 0x3b, 0x41, 0x60, 0x8c, 0x8a, 0x01, 0x04, 0x5c, 0xfb, 0x2f, 0x61, 0x49, - 0x62, 0xac, 0xa1, 0x3d, 0xe9, 0x07, 0xc0, 0x23, 0xa9, 0xed, 0xd6, 0xd4, 0x7a, 0xd1, 0xce, 0x53, - 0xfc, 0x0a, 0x15, 0xfa, 0x00, 0xda, 0x5e, 0x4d, 0xad, 0x97, 0x1a, 0x1a, 0xc9, 0xd7, 0x76, 0x65, - 0x37, 0xc8, 0x07, 0x80, 0x56, 0xf1, 0x7a, 0x6a, 0x28, 0x76, 0x0c, 0x5d, 0xf1, 0xf1, 0x13, 0x3a, - 0x5c, 0xb1, 0x27, 0xb7, 0x0d, 0x1b, 0xa8, 0x24, 0xe0, 0x6b, 0x04, 0xcc, 0x85, 0x78, 0x1a, 0x35, - 0xb9, 0x10, 0xe5, 0xa5, 0xb6, 0x17, 0xab, 0x71, 0x07, 0x0e, 0x63, 0x30, 0xcc, 0x6c, 0xc9, 0xd3, - 0xc6, 0xb7, 0x1d, 0x54, 0xe8, 0x08, 0x8a, 0x7f, 0xaa, 0xa8, 0xbc, 0x79, 0x03, 0xdf, 0x92, 0x4d, - 0x5f, 0x17, 0xd9, 0xf6, 0xae, 0x95, 0xf7, 0xff, 0x76, 0x6e, 0xb1, 0x0f, 0x0a, 0xee, 0xa1, 0xfd, - 0xc5, 0x36, 0xbc, 0xd8, 0xca, 0x96, 0xc3, 0x2a, 0xa7, 0x8f, 0x82, 0x2d, 0xef, 0x68, 0x7d, 0xbc, - 0x9e, 0xe9, 0xea, 0xcd, 0x4c, 0x57, 0x6f, 0x67, 0xba, 0xfa, 0x63, 0xae, 0x2b, 0x37, 0x73, 0x5d, - 0xf9, 0x3d, 0xd7, 0x95, 0x2f, 0x6f, 0xa8, 0x2f, 0x07, 0x51, 0x8f, 0xb8, 0x3c, 0xb0, 0x32, 0xd2, - 0x53, 0x1e, 0xd2, 0x3c, 0xb6, 0xc6, 0x6b, 0x3f, 0x24, 0x39, 0x19, 0x81, 0xe8, 0xed, 0x26, 0x3b, - 0xf2, 0xfa, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x30, 0x09, 0xc8, 0x02, 0xb6, 0x04, 0x00, 0x00, + // 645 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0xbf, 0x4f, 0xdb, 0x40, + 0x14, 0xb6, 0x93, 0x14, 0xe8, 0x85, 0x2e, 0x06, 0x24, 0x27, 0xa2, 0x76, 0x48, 0x7f, 0xc8, 0x0b, + 0x67, 0x92, 0x56, 0x1d, 0x90, 0x5a, 0x89, 0x54, 0x42, 0xca, 0x40, 0x55, 0xb9, 0x4c, 0x5d, 0x22, + 0xff, 0x78, 0x71, 0xac, 0xe2, 0xbb, 0xd4, 0x77, 0x46, 0xc9, 0xd8, 0xad, 0x63, 0x97, 0x8e, 0x95, + 0x98, 0xfb, 0x97, 0x30, 0x32, 0x76, 0xa2, 0x15, 0x2c, 0x9d, 0xf9, 0x0b, 0xaa, 0x3b, 0x9f, 0x21, + 0x44, 0x80, 0x50, 0x27, 0xdf, 0x7b, 0xef, 0x7b, 0xef, 0xdd, 0xfb, 0xde, 0x77, 0x46, 0x1b, 0x04, + 0x72, 0x9e, 0x51, 0xe2, 0x26, 0x84, 0x43, 0x16, 0x8e, 0xfc, 0x84, 0xf0, 0x09, 0x73, 0x0f, 0x3b, + 0x2e, 0x9f, 0xe0, 0x71, 0x46, 0x39, 0x35, 0x4c, 0x05, 0xc1, 0xd7, 0x20, 0xf8, 0xb0, 0xd3, 0x6c, + 0x84, 0x94, 0xa5, 0x94, 0x0d, 0x24, 0xce, 0x2d, 0x8c, 0x22, 0xa9, 0x69, 0x15, 0x96, 0x1b, 0xf8, + 0x0c, 0xdc, 0xc3, 0x4e, 0x00, 0xdc, 0xef, 0xb8, 0x21, 0x4d, 0x88, 0x8a, 0xaf, 0xc6, 0x34, 0xa6, + 0x45, 0x9e, 0x38, 0x29, 0xef, 0x5a, 0x4c, 0x69, 0x7c, 0x00, 0xae, 0x3f, 0x4e, 0xdc, 0x11, 0xe7, + 0x63, 0xe5, 0x5e, 0x9f, 0x71, 0xfb, 0x84, 0x50, 0xee, 0xf3, 0x84, 0x92, 0xb2, 0x55, 0x43, 0x45, + 0xa5, 0x15, 0xe4, 0x43, 0xd7, 0x27, 0x53, 0x15, 0x7a, 0x5c, 0x4e, 0x37, 0x04, 0xc8, 0x60, 0x98, + 0x93, 0x08, 0x32, 0x71, 0x2e, 0xc2, 0xed, 0x93, 0x0a, 0x5a, 0xdf, 0x63, 0xb1, 0x07, 0x71, 0xc2, + 0x38, 0x64, 0xfd, 0xcb, 0xf9, 0x76, 0xc2, 0x90, 0xe6, 0x84, 0x1b, 0x1b, 0x68, 0x79, 0x98, 0xd1, + 0x74, 0xe0, 0x47, 0x51, 0x06, 0x8c, 0x99, 0x7a, 0x4b, 0x77, 0x1e, 0x7a, 0x75, 0xe1, 0xdb, 0x29, + 0x5c, 0xc6, 0x6b, 0xf4, 0x28, 0xa4, 0x84, 0x40, 0x28, 0xae, 0x34, 0x48, 0x22, 0xb3, 0x22, 0x30, + 0x3d, 0xf3, 0xe2, 0xd4, 0x5e, 0x9d, 0xfa, 0xe9, 0xc1, 0x76, 0xfb, 0x5a, 0xb8, 0xed, 0x2d, 0x5f, + 0xd9, 0xfd, 0xc8, 0xd8, 0x47, 0x6b, 0x57, 0xb4, 0x0e, 0xfc, 0xa2, 0xaf, 0x28, 0x53, 0x95, 0x65, + 0x5a, 0x17, 0xa7, 0xf6, 0x7a, 0x51, 0xe6, 0x46, 0x58, 0xdb, 0x5b, 0x49, 0xe6, 0x6f, 0xdd, 0x8f, + 0x0c, 0x82, 0x96, 0x33, 0x35, 0xd4, 0x60, 0x08, 0x60, 0xd6, 0x5a, 0x55, 0xa7, 0xde, 0x6d, 0x60, + 0xb5, 0x22, 0xb1, 0x14, 0xac, 0x96, 0x82, 0xdf, 0xd2, 0x84, 0xf4, 0xb6, 0x8e, 0x4f, 0x6d, 0xed, + 0xe7, 0x6f, 0xdb, 0x89, 0x13, 0x3e, 0xca, 0x03, 0x1c, 0xd2, 0x54, 0xed, 0x53, 0x7d, 0x36, 0x59, + 0xf4, 0xc9, 0xe5, 0xd3, 0x31, 0x30, 0x99, 0xc0, 0xbc, 0x7a, 0xd9, 0x60, 0x17, 0x60, 0x7b, 0xe9, + 0xeb, 0x91, 0xad, 0xfd, 0x3d, 0xb2, 0xb5, 0xf6, 0x73, 0xf4, 0xf4, 0x2e, 0x46, 0x3d, 0x60, 0x63, + 0x4a, 0x18, 0xb4, 0x7f, 0x54, 0x50, 0x7d, 0x8f, 0xc5, 0x1f, 0xf2, 0x20, 0x4d, 0xf8, 0xfe, 0xe4, + 0x3e, 0x4c, 0x77, 0x6f, 0xa3, 0x4a, 0x32, 0x7e, 0x33, 0x11, 0x4f, 0xe6, 0xb7, 0x23, 0x69, 0x9d, + 0xdb, 0x81, 0x83, 0x6a, 0x29, 0x8b, 0x99, 0x62, 0x69, 0x15, 0x17, 0x7a, 0xc2, 0xa5, 0x9e, 0xf0, + 0x0e, 0x99, 0x7a, 0x12, 0x61, 0x18, 0xa8, 0x96, 0x42, 0x4a, 0xcd, 0x07, 0xb2, 0x8a, 0x3c, 0x1b, + 0x26, 0x5a, 0xe4, 0x49, 0x0a, 0x34, 0xe7, 0xe6, 0x42, 0x4b, 0x77, 0x6a, 0x5e, 0x69, 0x1a, 0x5b, + 0xa8, 0x2a, 0xc8, 0x5f, 0x6c, 0xe9, 0x4e, 0xbd, 0x6b, 0xe2, 0xf2, 0x19, 0xcd, 0x68, 0x11, 0xef, + 0x02, 0xf4, 0x6a, 0x82, 0x7b, 0x4f, 0x40, 0x67, 0x78, 0x7c, 0x8f, 0x56, 0x66, 0xe8, 0x29, 0x69, + 0x33, 0x6c, 0x54, 0x67, 0xf0, 0x39, 0x07, 0x12, 0x82, 0x98, 0x46, 0x97, 0x0d, 0x51, 0xe9, 0xea, + 0x47, 0xe2, 0x36, 0xe1, 0xc8, 0x27, 0x04, 0x0e, 0x14, 0x2d, 0xa5, 0xd9, 0xfd, 0x52, 0x41, 0xd5, + 0x3d, 0x16, 0x1b, 0xdf, 0x75, 0xd4, 0xb8, 0x5d, 0xf1, 0xaf, 0xf0, 0x6d, 0xaf, 0x1d, 0xdf, 0xb5, + 0xd7, 0xe6, 0x9b, 0xff, 0xcb, 0xbb, 0xd4, 0x83, 0x66, 0x04, 0x68, 0xe9, 0x52, 0x0d, 0xcf, 0xee, + 0xac, 0x56, 0xc2, 0x9a, 0x9b, 0xf7, 0x82, 0x5d, 0xf5, 0xe8, 0xbd, 0x3b, 0x3e, 0xb3, 0xf4, 0x93, + 0x33, 0x4b, 0xff, 0x73, 0x66, 0xe9, 0xdf, 0xce, 0x2d, 0xed, 0xe4, 0xdc, 0xd2, 0x7e, 0x9d, 0x5b, + 0xda, 0xc7, 0x97, 0x33, 0xc2, 0x57, 0x45, 0x37, 0x69, 0x16, 0x97, 0x67, 0x77, 0x32, 0xf7, 0x83, + 0x94, 0x4f, 0x21, 0x58, 0x90, 0x1a, 0x79, 0xf1, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x6a, 0x12, 0xe8, + 0x47, 0x46, 0x05, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -399,6 +407,20 @@ func (m *MsgRegisterInterchainAccount) MarshalToSizedBuffer(dAtA []byte) (int, e _ = i var l int _ = l + if len(m.RegisterFee) > 0 { + for iNdEx := len(m.RegisterFee) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.RegisterFee[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTx(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x22 + } + } if len(m.InterchainAccountId) > 0 { i -= len(m.InterchainAccountId) copy(dAtA[i:], m.InterchainAccountId) @@ -590,6 +612,12 @@ func (m *MsgRegisterInterchainAccount) Size() (n int) { if l > 0 { n += 1 + l + sovTx(uint64(l)) } + if len(m.RegisterFee) > 0 { + for _, e := range m.RegisterFee { + l = e.Size() + n += 1 + l + sovTx(uint64(l)) + } + } return n } @@ -785,6 +813,40 @@ func (m *MsgRegisterInterchainAccount) Unmarshal(dAtA []byte) error { } m.InterchainAccountId = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field RegisterFee", 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.RegisterFee = append(m.RegisterFee, types.Coin{}) + if err := m.RegisterFee[len(m.RegisterFee)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTx(dAtA[iNdEx:]) @@ -1010,7 +1072,7 @@ func (m *MsgSubmitTx) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Msgs = append(m.Msgs, &types.Any{}) + m.Msgs = append(m.Msgs, &types1.Any{}) if err := m.Msgs[len(m.Msgs)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } From 4499f5af31ed1b63cadcdf1e82171fe33e9a75ed Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Fri, 15 Sep 2023 13:45:11 +0400 Subject: [PATCH 123/307] set hooks --- app/app.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/app.go b/app/app.go index ddee72c45..efb12b324 100644 --- a/app/app.go +++ b/app/app.go @@ -580,6 +580,11 @@ func New( ) app.TokenFactoryKeeper = &tokenFactoryKeeper + app.BankKeeper.BaseSendKeeper = *app.BankKeeper.BaseSendKeeper.SetHooks( + banktypes.NewMultiBankHooks( + app.TokenFactoryKeeper.Hooks(), + )) + app.BuilderKeeper = builderkeeper.NewKeeperWithRewardsAddressProvider( appCodec, keys[buildertypes.StoreKey], From 70c599554f42beac36f4b49f6b8c167c82349699 Mon Sep 17 00:00:00 2001 From: swelf Date: Fri, 15 Sep 2023 16:49:36 +0300 Subject: [PATCH 124/307] review fixes: extra tests, removed commented/dead code --- Makefile | 2 +- neutronutils/errors/errors.go | 21 --- neutronutils/utils.go | 11 -- .../interchaintxs/keeper/sudo_middleware.go | 27 ++++ .../contractmanager/types/expected_keepers.go | 50 ++++++ x/contractmanager/ibc_middleware.go | 35 +++- x/contractmanager/ibc_middleware_test.go | 153 ++++++++---------- x/contractmanager/types/expected_keepers.go | 5 + x/interchaintxs/handler.go | 34 ---- x/interchaintxs/keeper/ibc_handlers_test.go | 53 ------ 10 files changed, 182 insertions(+), 209 deletions(-) delete mode 100644 neutronutils/errors/errors.go delete mode 100644 neutronutils/utils.go create mode 100644 testutil/interchaintxs/keeper/sudo_middleware.go delete mode 100644 x/interchaintxs/handler.go diff --git a/Makefile b/Makefile index 1bdcceca1..6af490db8 100644 --- a/Makefile +++ b/Makefile @@ -123,7 +123,7 @@ build-static-linux-amd64: go.sum $(BUILDDIR)/ $(DOCKER) cp neutronbinary:/bin/neutrond $(BUILDDIR)/neutrond-linux-amd64 $(DOCKER) rm -f neutronbinary -install-test-binary: go.sum +install-test-binary: check_version go.sum go install -mod=readonly $(BUILD_FLAGS_TEST_BINARY) ./cmd/neutrond ######################################## diff --git a/neutronutils/errors/errors.go b/neutronutils/errors/errors.go deleted file mode 100644 index 9dd7574d9..000000000 --- a/neutronutils/errors/errors.go +++ /dev/null @@ -1,21 +0,0 @@ -package errors - -import ( - "cosmossdk.io/errors" - sdk "github.com/cosmos/cosmos-sdk/types" -) - -// OutOfGasRecovery converts `out of gas` panic into an error -// leaving unprocessed any other kinds of panics -func OutOfGasRecovery( - gasMeter sdk.GasMeter, - err *error, -) { - if r := recover(); r != nil { - _, ok := r.(sdk.ErrorOutOfGas) - if !ok || !gasMeter.IsOutOfGas() { - panic(r) - } - *err = errors.Wrapf(errors.ErrPanic, "%v", r) - } -} diff --git a/neutronutils/utils.go b/neutronutils/utils.go deleted file mode 100644 index 2308c2a0f..000000000 --- a/neutronutils/utils.go +++ /dev/null @@ -1,11 +0,0 @@ -package neutronutils - -import sdk "github.com/cosmos/cosmos-sdk/types" - -// CreateCachedContext creates a cached context with a limited gas meter. -func CreateCachedContext(ctx sdk.Context, gasLimit uint64) (sdk.Context, func()) { - cacheCtx, writeFn := ctx.CacheContext() - gasMeter := sdk.NewGasMeter(gasLimit) - cacheCtx = cacheCtx.WithGasMeter(gasMeter) - return cacheCtx, writeFn -} diff --git a/testutil/interchaintxs/keeper/sudo_middleware.go b/testutil/interchaintxs/keeper/sudo_middleware.go new file mode 100644 index 000000000..5d586f342 --- /dev/null +++ b/testutil/interchaintxs/keeper/sudo_middleware.go @@ -0,0 +1,27 @@ +package keeper + +import ( + tmdb "github.com/cometbft/cometbft-db" + "github.com/cometbft/cometbft/libs/log" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + "github.com/cosmos/cosmos-sdk/store" + storetypes "github.com/cosmos/cosmos-sdk/store/types" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/neutron-org/neutron/x/contractmanager" + "github.com/neutron-org/neutron/x/contractmanager/types" + "github.com/stretchr/testify/require" + "testing" +) + +func NewSudoLimitWrapper(t testing.TB, cmKeeper types.ContractManagerKeeper, wasmKeeper types.WasmKeeper) (types.WasmKeeper, sdk.Context, *storetypes.KVStoreKey) { + storeKey := sdk.NewKVStoreKey(types.StoreKey) + db := tmdb.NewMemDB() + stateStore := store.NewCommitMultiStore(db) + stateStore.MountStoreWithDB(storeKey, storetypes.StoreTypeIAVL, db) + require.NoError(t, stateStore.LoadLatestVersion()) + + limitWrapper := contractmanager.NewSudoLimitWrapper(cmKeeper, wasmKeeper) + ctx := sdk.NewContext(stateStore, tmproto.Header{}, false, log.NewNopLogger()) + + return limitWrapper, ctx, storeKey +} diff --git a/testutil/mocks/contractmanager/types/expected_keepers.go b/testutil/mocks/contractmanager/types/expected_keepers.go index 463ef15c4..d27f64e5f 100644 --- a/testutil/mocks/contractmanager/types/expected_keepers.go +++ b/testutil/mocks/contractmanager/types/expected_keepers.go @@ -9,6 +9,7 @@ import ( types "github.com/cosmos/cosmos-sdk/types" gomock "github.com/golang/mock/gomock" + types0 "github.com/neutron-org/neutron/x/contractmanager/types" ) // MockWasmKeeper is a mock of WasmKeeper interface. @@ -62,3 +63,52 @@ func (mr *MockWasmKeeperMockRecorder) Sudo(ctx, contractAddress, msg interface{} mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Sudo", reflect.TypeOf((*MockWasmKeeper)(nil).Sudo), ctx, contractAddress, msg) } + +// MockContractManagerKeeper is a mock of ContractManagerKeeper interface. +type MockContractManagerKeeper struct { + ctrl *gomock.Controller + recorder *MockContractManagerKeeperMockRecorder +} + +// MockContractManagerKeeperMockRecorder is the mock recorder for MockContractManagerKeeper. +type MockContractManagerKeeperMockRecorder struct { + mock *MockContractManagerKeeper +} + +// NewMockContractManagerKeeper creates a new mock instance. +func NewMockContractManagerKeeper(ctrl *gomock.Controller) *MockContractManagerKeeper { + mock := &MockContractManagerKeeper{ctrl: ctrl} + mock.recorder = &MockContractManagerKeeperMockRecorder{mock} + return mock +} + +// EXPECT returns an object that allows the caller to indicate expected use. +func (m *MockContractManagerKeeper) EXPECT() *MockContractManagerKeeperMockRecorder { + return m.recorder +} + +// AddContractFailure mocks base method. +func (m *MockContractManagerKeeper) AddContractFailure(ctx types.Context, address string, sudoPayload []byte) { + m.ctrl.T.Helper() + m.ctrl.Call(m, "AddContractFailure", ctx, address, sudoPayload) +} + +// AddContractFailure indicates an expected call of AddContractFailure. +func (mr *MockContractManagerKeeperMockRecorder) AddContractFailure(ctx, address, sudoPayload interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddContractFailure", reflect.TypeOf((*MockContractManagerKeeper)(nil).AddContractFailure), ctx, address, sudoPayload) +} + +// GetParams mocks base method. +func (m *MockContractManagerKeeper) GetParams(ctx types.Context) types0.Params { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "GetParams", ctx) + ret0, _ := ret[0].(types0.Params) + return ret0 +} + +// GetParams indicates an expected call of GetParams. +func (mr *MockContractManagerKeeperMockRecorder) GetParams(ctx interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetParams", reflect.TypeOf((*MockContractManagerKeeper)(nil).GetParams), ctx) +} diff --git a/x/contractmanager/ibc_middleware.go b/x/contractmanager/ibc_middleware.go index 841897459..739de0860 100644 --- a/x/contractmanager/ibc_middleware.go +++ b/x/contractmanager/ibc_middleware.go @@ -1,22 +1,20 @@ package contractmanager import ( + "cosmossdk.io/errors" "fmt" "github.com/cometbft/cometbft/libs/log" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/neutronutils" - neutronerrors "github.com/neutron-org/neutron/neutronutils/errors" - "github.com/neutron-org/neutron/x/contractmanager/keeper" contractmanagertypes "github.com/neutron-org/neutron/x/contractmanager/types" ) type SudoLimitWrapper struct { - contractManager keeper.Keeper + contractManager contractmanagertypes.ContractManagerKeeper contractmanagertypes.WasmKeeper } // NewSudoLimitWrapper suppresses an error from a Sudo contract handler and saves it to a store -func NewSudoLimitWrapper(contractManager keeper.Keeper, sudoKeeper contractmanagertypes.WasmKeeper) contractmanagertypes.WasmKeeper { +func NewSudoLimitWrapper(contractManager contractmanagertypes.ContractManagerKeeper, sudoKeeper contractmanagertypes.WasmKeeper) contractmanagertypes.WasmKeeper { return SudoLimitWrapper{ contractManager, sudoKeeper, @@ -27,9 +25,9 @@ func NewSudoLimitWrapper(contractManager keeper.Keeper, sudoKeeper contractmanag // in case of `out of gas` panic it converts the panic into an error and stops `out of gas` panic propagation // if error happens during the Sudo call, we store the data that raised the error, and return the error func (k SudoLimitWrapper) Sudo(ctx sdk.Context, contractAddress sdk.AccAddress, msg []byte) (resp []byte, err error) { - cacheCtx, writeFn := neutronutils.CreateCachedContext(ctx, k.contractManager.GetParams(ctx).SudoCallGasLimit) + cacheCtx, writeFn := createCachedContext(ctx, k.contractManager.GetParams(ctx).SudoCallGasLimit) func() { - defer neutronerrors.OutOfGasRecovery(cacheCtx.GasMeter(), &err) + defer outOfGasRecovery(cacheCtx.GasMeter(), &err) // Actually we have only one kind of error returned from acknowledgement // maybe later we'll retrieve actual errors from events resp, err = k.WasmKeeper.Sudo(cacheCtx, contractAddress, msg) @@ -49,3 +47,26 @@ func (k SudoLimitWrapper) Sudo(ctx sdk.Context, contractAddress sdk.AccAddress, func (k SudoLimitWrapper) Logger(ctx sdk.Context) log.Logger { return ctx.Logger().With("module", fmt.Sprintf("x/%s", contractmanagertypes.ModuleName)) } + +// outOfGasRecovery converts `out of gas` panic into an error +// leaving unprocessed any other kinds of panics +func outOfGasRecovery( + gasMeter sdk.GasMeter, + err *error, +) { + if r := recover(); r != nil { + _, ok := r.(sdk.ErrorOutOfGas) + if !ok || !gasMeter.IsOutOfGas() { + panic(r) + } + *err = errors.Wrapf(errors.ErrPanic, "%v", r) + } +} + +// createCachedContext creates a cached context with a limited gas meter. +func createCachedContext(ctx sdk.Context, gasLimit uint64) (sdk.Context, func()) { + cacheCtx, writeFn := ctx.CacheContext() + gasMeter := sdk.NewGasMeter(gasLimit) + cacheCtx = cacheCtx.WithGasMeter(gasMeter) + return cacheCtx, writeFn +} diff --git a/x/contractmanager/ibc_middleware_test.go b/x/contractmanager/ibc_middleware_test.go index b1b964fbf..0815be992 100644 --- a/x/contractmanager/ibc_middleware_test.go +++ b/x/contractmanager/ibc_middleware_test.go @@ -1,83 +1,72 @@ -package contractmanager +package contractmanager_test -// -//import ( -// tmdb "github.com/cometbft/cometbft-db" -// "github.com/cometbft/cometbft/libs/log" -// tmproto "github.com/cometbft/cometbft/proto/tendermint/types" -// "github.com/cosmos/cosmos-sdk/store" -// storetypes "github.com/cosmos/cosmos-sdk/store/types" -// sdk "github.com/cosmos/cosmos-sdk/types" -// icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" -// channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" -// "github.com/golang/mock/gomock" -// mock_types "github.com/neutron-org/neutron/testutil/mocks/interchaintxs/types" -// "github.com/neutron-org/neutron/x/contractmanager/types" -// "github.com/stretchr/testify/require" -// "testing" -//) -// -//var ( -// ShouldNotBeWrittenKey = []byte("shouldnotkey") -// ShouldNotBeWritten = []byte("should not be written") -// ShouldBeWritten = []byte("should be written") -// TestOwnerAddress = "neutron17dtl0mjt3t77kpuhg2edqzjpszulwhgzcdvagh" -//) -// -//func ShouldBeWrittenKey(suffix string) []byte { -// return append([]byte("shouldkey"), []byte(suffix)...) -//} -// -//func NewSudoLimitMiddleware(t testing.TB, cm types.SudoWrapper) (SudoLimitWrapper, sdk.Context, *storetypes.KVStoreKey) { -// storeKey := sdk.NewKVStoreKey(types.StoreKey) -// -// db := tmdb.NewMemDB() -// stateStore := store.NewCommitMultiStore(db) -// stateStore.MountStoreWithDB(storeKey, storetypes.StoreTypeIAVL, db) -// require.NoError(t, stateStore.LoadLatestVersion()) -// -// k := SudoLimitWrapper{SudoWrapper: cm} -// -// ctx := sdk.NewContext(stateStore, tmproto.Header{}, false, log.NewNopLogger()) -// -// return k, ctx, storeKey -//} -// -//func TestSudo(t *testing.T) { -// ctrl := gomock.NewController(t) -// defer ctrl.Finish() -// cmKeeper := mock_types.NewMockContractManagerKeeper(ctrl) -// middleware, infCtx, storeKey := NewSudoLimitMiddleware(t, cmKeeper) -// st := infCtx.KVStore(storeKey) -// -// p := channeltypes.Packet{ -// Sequence: 100, -// SourcePort: icatypes.ControllerPortPrefix + TestOwnerAddress + ".ica0", -// SourceChannel: "channel-0", -// } -// contractAddress := sdk.AccAddress{} -// errACK := channeltypes.Acknowledgement{ -// Response: &channeltypes.Acknowledgement_Error{ -// Error: "error", -// }, -// } -// //errAckData, err := channeltypes.SubModuleCdc.MarshalJSON(&errACK) -// //require.NoError(t, err) -// //resACK := channeltypes.Acknowledgement{ -// // Response: &channeltypes.Acknowledgement_Result{Result: []byte("Result")}, -// //} -// //resAckData, err := channeltypes.SubModuleCdc.MarshalJSON(&resACK) -// //require.NoError(t, err) -// -// // success during SudoError -// ctx := infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) -// cmKeeper.EXPECT().SudoError(gomock.AssignableToTypeOf(ctx), contractAddress, p, errACK).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, errAck channeltypes.Acknowledgement) { -// st := cachedCtx.KVStore(storeKey) -// st.Set(ShouldBeWrittenKey("sudoerror"), ShouldBeWritten) -// }).Return(nil, nil) -// cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 6000}) -// err := middleware.Sudo(ctx, contractAddress, p, &errACK) -// require.NoError(t, err) -// require.Equal(t, ShouldBeWritten, st.Get(ShouldBeWrittenKey("sudoerror"))) -// require.Equal(t, uint64(3050), ctx.GasMeter().GasConsumed()) -//} +import ( + "fmt" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/golang/mock/gomock" + test_keeper "github.com/neutron-org/neutron/testutil/interchaintxs/keeper" + mock_types "github.com/neutron-org/neutron/testutil/mocks/contractmanager/types" + "github.com/neutron-org/neutron/x/contractmanager/types" + "github.com/stretchr/testify/require" + "testing" +) + +var ( + ShouldNotBeWrittenKey = []byte("shouldnotkey") + ShouldNotBeWritten = []byte("should not be written") + ShouldBeWritten = []byte("should be written") + TestOwnerAddress = "neutron17dtl0mjt3t77kpuhg2edqzjpszulwhgzcdvagh" +) + +func ShouldBeWrittenKey(suffix string) []byte { + return append([]byte("shouldkey"), []byte(suffix)...) +} + +func TestSudo(t *testing.T) { + ctrl := gomock.NewController(t) + defer ctrl.Finish() + cmKeeper := mock_types.NewMockContractManagerKeeper(ctrl) + wmKeeper := mock_types.NewMockWasmKeeper(ctrl) + middleware, infCtx, storeKey := test_keeper.NewSudoLimitWrapper(t, cmKeeper, wmKeeper) + st := infCtx.KVStore(storeKey) + + // at this point the payload struct does not matter + msg := []byte("sudo_payload") + contractAddress := sdk.AccAddress{} + + // success during Sudo + ctx := infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) + cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 10000}) + wmKeeper.EXPECT().Sudo(gomock.AssignableToTypeOf(ctx), contractAddress, msg).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, msg []byte) { + st := cachedCtx.KVStore(storeKey) + st.Set(ShouldBeWrittenKey("sudo"), ShouldBeWritten) + }).Return(nil, nil) + _, err := middleware.Sudo(ctx, contractAddress, msg) + require.NoError(t, err) + require.Equal(t, ShouldBeWritten, st.Get(ShouldBeWrittenKey("sudo"))) + + // error during Sudo + ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) + cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 10000}) + cmKeeper.EXPECT().AddContractFailure(ctx, contractAddress.String(), msg) + wmKeeper.EXPECT().Sudo(gomock.AssignableToTypeOf(ctx), contractAddress, msg).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, msg []byte) { + st := cachedCtx.KVStore(storeKey) + st.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) + }).Return(nil, fmt.Errorf("sudo error")) + _, err = middleware.Sudo(ctx, contractAddress, msg) + require.Error(t, err) + require.Nil(t, st.Get(ShouldNotBeWrittenKey)) + + // ou of gas during Sudo + ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) + cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 10000}) + cmKeeper.EXPECT().AddContractFailure(ctx, contractAddress.String(), msg) + wmKeeper.EXPECT().Sudo(gomock.AssignableToTypeOf(ctx), contractAddress, msg).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, msg []byte) { + st := cachedCtx.KVStore(storeKey) + st.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) + cachedCtx.GasMeter().ConsumeGas(10001, "heavy calculations") + }) + _, err = middleware.Sudo(ctx, contractAddress, msg) + require.ErrorContains(t, err, "{heavy calculations}: panic") + require.Nil(t, st.Get(ShouldNotBeWrittenKey)) +} diff --git a/x/contractmanager/types/expected_keepers.go b/x/contractmanager/types/expected_keepers.go index a30614c63..88db20887 100644 --- a/x/contractmanager/types/expected_keepers.go +++ b/x/contractmanager/types/expected_keepers.go @@ -9,3 +9,8 @@ type WasmKeeper interface { HasContractInfo(ctx sdk.Context, contractAddress sdk.AccAddress) bool Sudo(ctx sdk.Context, contractAddress sdk.AccAddress, msg []byte) ([]byte, error) } + +type ContractManagerKeeper interface { + AddContractFailure(ctx sdk.Context, address string, sudoPayload []byte) + GetParams(ctx sdk.Context) (params Params) +} diff --git a/x/interchaintxs/handler.go b/x/interchaintxs/handler.go deleted file mode 100644 index 30a574948..000000000 --- a/x/interchaintxs/handler.go +++ /dev/null @@ -1,34 +0,0 @@ -package interchaintxs - -import ( - "fmt" - - "cosmossdk.io/errors" - - sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - - "github.com/neutron-org/neutron/x/interchaintxs/keeper" - "github.com/neutron-org/neutron/x/interchaintxs/types" -) - -func NewHandler(k keeper.Keeper) sdk.Handler { - msgServer := keeper.NewMsgServerImpl(k) - - return func(ctx sdk.Context, msg sdk.Msg) (*sdk.Result, error) { - ctx = ctx.WithEventManager(sdk.NewEventManager()) - - switch msg := msg.(type) { - case *types.MsgRegisterInterchainAccount: - res, err := msgServer.RegisterInterchainAccount(sdk.WrapSDKContext(ctx), msg) - return sdk.WrapServiceResult(ctx, res, err) - case *types.MsgSubmitTx: - res, err := msgServer.SubmitTx(sdk.WrapSDKContext(ctx), msg) - return sdk.WrapServiceResult(ctx, res, err) - - default: - errMsg := fmt.Sprintf("unrecognized %s message type: %T", types.ModuleName, msg) - return nil, errors.Wrap(sdkerrors.ErrUnknownRequest, errMsg) - } - } -} diff --git a/x/interchaintxs/keeper/ibc_handlers_test.go b/x/interchaintxs/keeper/ibc_handlers_test.go index 50cc29fd8..c0a8c40b6 100644 --- a/x/interchaintxs/keeper/ibc_handlers_test.go +++ b/x/interchaintxs/keeper/ibc_handlers_test.go @@ -65,59 +65,6 @@ func TestHandleAcknowledgement(t *testing.T) { wmKeeper.EXPECT().Sudo(ctx, contractAddress, msgAck).Return(nil, fmt.Errorf("error sudoResponse")) err = icak.HandleAcknowledgement(ctx, p, resAckData, relayerAddress) require.NoError(t, err) - - //// success during SudoError - //ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - //wmKeeper.EXPECT().SudoError(gomock.AssignableToTypeOf(ctx), contractAddress, p, errACK.GetError()).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, err string) { - // store := cachedCtx.KVStore(storeKey) - // store.Set(ShouldBeWrittenKey("sudoerror"), ShouldBeWritten) - //}).Return(nil, nil) - //wmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 6000}) - //feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) - //err = icak.HandleAcknowledgement(ctx, p, errAckData, relayerAddress) - //require.NoError(t, err) - //require.Equal(t, ShouldBeWritten, store.Get(ShouldBeWrittenKey("sudoerror"))) - //require.Equal(t, uint64(3050), ctx.GasMeter().GasConsumed()) - // - //// out of gas during SudoError - //ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - //wmKeeper.EXPECT().SudoError(gomock.AssignableToTypeOf(ctx), contractAddress, p, errACK.GetError()).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, error string) { - // store := cachedCtx.KVStore(storeKey) - // store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) - // cachedCtx.GasMeter().ConsumeGas(7001, "out of gas test") - //}) - //wmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 7000}) - //wmKeeper.EXPECT().AddContractFailure(ctx, &p, contractAddress.String(), types.Ack, &errACK) - //feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) - //err = icak.HandleAcknowledgement(ctx, p, errAckData, relayerAddress) - //require.NoError(t, err) - //require.Empty(t, store.Get(ShouldNotBeWrittenKey)) - //require.Equal(t, uint64(7000), ctx.GasMeter().GasConsumed()) - // - //// success during SudoResponse - //ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - //wmKeeper.EXPECT().SudoResponse(gomock.AssignableToTypeOf(ctx), contractAddress, p, resACK.GetResult()).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, msg []byte) { - // store := cachedCtx.KVStore(storeKey) - // store.Set(ShouldBeWrittenKey("sudoresponse"), ShouldBeWritten) // consumes 3140 gas, 2000 flat write + 30 every byte of key+value - //}).Return(nil, nil) - //wmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 8000}) - //feeKeeper.EXPECT().DistributeAcknowledgementFee(ctx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) - //err = icak.HandleAcknowledgement(ctx, p, resAckData, relayerAddress) - //require.NoError(t, err) - //require.Equal(t, uint64(3140), ctx.GasMeter().GasConsumed()) - //require.Equal(t, ShouldBeWritten, store.Get(ShouldBeWrittenKey("sudoresponse"))) - // - //// not enough gas provided by relayer for SudoCallGasLimit - //ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) - //lowGasCtx := infCtx.WithGasMeter(sdk.NewGasMeter(1000)) - //wmKeeper.EXPECT().SudoResponse(gomock.AssignableToTypeOf(lowGasCtx), contractAddress, p, resACK.GetResult()).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, request channeltypes.Packet, msg []byte) { - // store := cachedCtx.KVStore(storeKey) - // store.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) - // cachedCtx.GasMeter().ConsumeGas(1001, "out of gas test") - //}) - //feeKeeper.EXPECT().DistributeAcknowledgementFee(lowGasCtx, relayerAddress, feetypes.NewPacketID(p.SourcePort, p.SourceChannel, p.Sequence)) - //wmKeeper.EXPECT().GetParams(lowGasCtx).Return(types.Params{SudoCallGasLimit: 9000}) - //require.PanicsWithValue(t, sdk.ErrorOutOfGas{Descriptor: "consume gas from cached context"}, func() { icak.HandleAcknowledgement(lowGasCtx, p, resAckData, relayerAddress) }) //nolint:errcheck // this is a panic test } func TestHandleTimeout(t *testing.T) { From 13b5273f5e4db63522ac9028e8e016a19a68a4bb Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Fri, 15 Sep 2023 18:32:27 +0400 Subject: [PATCH 125/307] fix wasm panic --- app/app.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/app/app.go b/app/app.go index efb12b324..0cc185c38 100644 --- a/app/app.go +++ b/app/app.go @@ -440,7 +440,7 @@ func New( appCodec, keys[crisistypes.StoreKey], invCheckPeriod, - app.BankKeeper, + &app.BankKeeper, authtypes.FeeCollectorName, authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String(), ) @@ -501,7 +501,7 @@ func New( keys[feeburnertypes.StoreKey], keys[feeburnertypes.MemStoreKey], app.AccountKeeper, - app.BankKeeper, + &app.BankKeeper, authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String(), ) feeBurnerModule := feeburner.NewAppModule(appCodec, *app.FeeBurnerKeeper) @@ -514,7 +514,7 @@ func New( app.TransferKeeper.Keeper, app.IBCKeeper.ChannelKeeper, app.FeeBurnerKeeper, - app.BankKeeper, + &app.BankKeeper, app.IBCKeeper.ChannelKeeper, ) wasmHooks := ibchooks.NewWasmHooks(nil, sdk.GetConfig().GetBech32AccountAddrPrefix()) // The contract keeper needs to be set later @@ -533,7 +533,7 @@ func New( app.IBCKeeper.ChannelKeeper, &app.IBCKeeper.PortKeeper, app.AccountKeeper, - app.BankKeeper, + &app.BankKeeper, scopedTransferKeeper, app.FeeKeeper, app.ContractManagerKeeper, @@ -560,7 +560,7 @@ func New( app.IBCKeeper.ConnectionKeeper, app.IBCKeeper.ClientKeeper, app.SlashingKeeper, - app.BankKeeper, + &app.BankKeeper, app.AccountKeeper, app.TransferKeeper.Keeper, // we cant use our transfer wrapper type here because of interface incompatibility, it looks safe to use underlying transfer keeper. // Since the keeper is only used to send reward to provider chain @@ -575,7 +575,7 @@ func New( app.keys[tokenfactorytypes.StoreKey], app.AccountKeeper, app.BankKeeper.WithMintCoinsRestriction(tokenfactorytypes.NewTokenFactoryDenomMintCoinsRestriction()), - app.WasmKeeper, + &app.WasmKeeper, authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String(), ) app.TokenFactoryKeeper = &tokenFactoryKeeper @@ -589,7 +589,7 @@ func New( appCodec, keys[buildertypes.StoreKey], app.AccountKeeper, - app.BankKeeper, + &app.BankKeeper, // 25% of rewards should be sent to the redistribute address rewardsaddressprovider.NewFixedAddressRewardsAddressProvider(app.AccountKeeper.GetModuleAddress(ccvconsumertypes.ConsumerRedistributeName)), authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String(), @@ -631,7 +631,7 @@ func New( keys[interchainqueriesmoduletypes.StoreKey], keys[interchainqueriesmoduletypes.MemStoreKey], app.IBCKeeper, - app.BankKeeper, + &app.BankKeeper, app.ContractManagerKeeper, interchainqueriesmodulekeeper.Verifier{}, interchainqueriesmodulekeeper.TransactionVerifier{}, @@ -659,7 +659,7 @@ func New( appCodec, keys[wasm.StoreKey], app.AccountKeeper, - app.BankKeeper, + &app.BankKeeper, nil, nil, app.IBCKeeper.ChannelKeeper, // may be replaced with middleware such as ics29 feerefunder From 0c26b8e4febf36517626a221dc267fcce12e09e5 Mon Sep 17 00:00:00 2001 From: swelf Date: Fri, 15 Sep 2023 19:20:47 +0300 Subject: [PATCH 126/307] comment typo --- x/contractmanager/types/sudo.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x/contractmanager/types/sudo.go b/x/contractmanager/types/sudo.go index a5745fcbb..8951b7c7d 100644 --- a/x/contractmanager/types/sudo.go +++ b/x/contractmanager/types/sudo.go @@ -24,7 +24,7 @@ type MessageKVQueryResult struct { } // MessageSudoCallback is passed to a contract's sudo() entrypoint when an interchain -// transaction failed with a timeout. +// transaction failed. type MessageSudoCallback struct { Response *ResponseSudoPayload `json:"response,omitempty"` Error *ErrorSudoPayload `json:"error,omitempty"` From c235d069182b1f78c29160ccf14e09f73b254fc0 Mon Sep 17 00:00:00 2001 From: sotnikov-s Date: Mon, 18 Sep 2023 17:36:11 +0300 Subject: [PATCH 127/307] replace DenomCreationFee nil check with empty check --- x/tokenfactory/keeper/createdenom.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x/tokenfactory/keeper/createdenom.go b/x/tokenfactory/keeper/createdenom.go index 92b7533cc..a57a44af8 100644 --- a/x/tokenfactory/keeper/createdenom.go +++ b/x/tokenfactory/keeper/createdenom.go @@ -81,13 +81,13 @@ func (k Keeper) chargeForCreateDenom(ctx sdk.Context, creatorAddr string) (err e // account to community pool // MODIFIED: if DenomCreationFee is non-zero, transfer the tokens from the creator // account to feeCollectorAddr - if params.DenomCreationFee != nil { + if len(params.DenomCreationFee) != 0 { accAddr, err := sdk.AccAddressFromBech32(creatorAddr) if err != nil { return err } // Instead of funding community pool we send funds to fee collector addr - //if err := k.communityPoolKeeper.FundCommunityPool(ctx, params.DenomCreationFee, accAddr); err != nil { + // if err := k.communityPoolKeeper.FundCommunityPool(ctx, params.DenomCreationFee, accAddr); err != nil { // return err //} From 3dfb8deaed971c257788d6843003bced535184a2 Mon Sep 17 00:00:00 2001 From: swelf Date: Tue, 19 Sep 2023 11:26:22 +0300 Subject: [PATCH 128/307] review fixes --- x/contractmanager/keeper/failure.go | 2 +- x/contractmanager/types/module.go | 9 --------- x/contractmanager/types/sudo.go | 2 +- x/interchaintxs/keeper/keeper.go | 10 +++++----- 4 files changed, 7 insertions(+), 16 deletions(-) delete mode 100644 x/contractmanager/types/module.go diff --git a/x/contractmanager/keeper/failure.go b/x/contractmanager/keeper/failure.go index 038227591..02e653655 100644 --- a/x/contractmanager/keeper/failure.go +++ b/x/contractmanager/keeper/failure.go @@ -73,7 +73,7 @@ func (k Keeper) ResubmitFailure(ctx sdk.Context, contractAddr sdk.AccAddress, fa } if _, err := k.wasmKeeper.Sudo(ctx, contractAddr, failure.SudoPayload); err != nil { - return errors.Wrapf(types.FailedToResubmitFailure, "cannot resubmit failure ack; failureId = %d; err = %s", failure.Id, err) + return errors.Wrapf(types.FailedToResubmitFailure, "cannot resubmit failure; failureId = %d; err = %s", failure.Id, err) } // Cleanup failure since we resubmitted it successfully diff --git a/x/contractmanager/types/module.go b/x/contractmanager/types/module.go deleted file mode 100644 index e7efcf2d9..000000000 --- a/x/contractmanager/types/module.go +++ /dev/null @@ -1,9 +0,0 @@ -package types - -import ( - sdk "github.com/cosmos/cosmos-sdk/types" -) - -type Sudo interface { - Sudo(ctx sdk.Context, contractAddress sdk.AccAddress, msg []byte) ([]byte, error) -} diff --git a/x/contractmanager/types/sudo.go b/x/contractmanager/types/sudo.go index 8951b7c7d..0670a1696 100644 --- a/x/contractmanager/types/sudo.go +++ b/x/contractmanager/types/sudo.go @@ -24,7 +24,7 @@ type MessageKVQueryResult struct { } // MessageSudoCallback is passed to a contract's sudo() entrypoint when an interchain -// transaction failed. +// transaction ended up with Success/Error or timed out. type MessageSudoCallback struct { Response *ResponseSudoPayload `json:"response,omitempty"` Error *ErrorSudoPayload `json:"error,omitempty"` diff --git a/x/interchaintxs/keeper/keeper.go b/x/interchaintxs/keeper/keeper.go index e27d294d2..0cf14c884 100644 --- a/x/interchaintxs/keeper/keeper.go +++ b/x/interchaintxs/keeper/keeper.go @@ -40,7 +40,7 @@ func NewKeeper( memKey storetypes.StoreKey, channelKeeper types.ChannelKeeper, icaControllerKeeper types.ICAControllerKeeper, - contractManagerKeeper types.WasmKeeper, + sudoKeeper types.WasmKeeper, feeKeeper types.FeeRefunderKeeper, bankKeeper types.BankKeeper, feeBurnerKeeper types.FeeBurnerKeeper, @@ -51,7 +51,7 @@ func NewKeeper( memKey: memKey, channelKeeper: channelKeeper, icaControllerKeeper: icaControllerKeeper, - sudoKeeper: contractManagerKeeper, + sudoKeeper: sudoKeeper, feeKeeper: feeKeeper, bankKeeper: bankKeeper, feeBurnerKeeper: feeBurnerKeeper, @@ -68,18 +68,18 @@ func (k Keeper) ChargeFee(ctx sdk.Context, payer sdk.AccAddress, fee sdk.Coins) params := k.GetParams(ctx) if !fee.IsAnyGTE(params.RegisterFee) { - return errors.Wrapf(sdkerrors.ErrInsufficientFee, "provided fee is less than min governance set ack fee: %v < %v", fee, params.RegisterFee) + return errors.Wrapf(sdkerrors.ErrInsufficientFee, "provided fee is less than min governance set ack fee: %s < %s", fee, params.RegisterFee) } treasury := k.feeBurnerKeeper.GetParams(ctx).TreasuryAddress treasuryAddress, err := sdk.AccAddressFromBech32(treasury) if err != nil { - return errors.Wrapf(sdkerrors.ErrInvalidAddress, "failed to convert treasury, bech32 to AccAddress: %v: %v", treasury, err) + return errors.Wrapf(sdkerrors.ErrInvalidAddress, "failed to convert treasury, bech32 to AccAddress: %s: %w", treasury, err) } err = k.bankKeeper.SendCoins(ctx, payer, treasuryAddress, fee) if err != nil { - return errors.Wrapf(err, "failed send fee(%v) from %v to %v", fee, payer, treasury) + return errors.Wrapf(err, "failed send fee(%s) from %s to %s", fee, payer, treasury) } return nil } From c10286b50f26319044e5d4016d0da996d18c8f58 Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Tue, 19 Sep 2023 11:53:07 +0300 Subject: [PATCH 129/307] whitelist interchain account query --- wasmbinding/stargate_allowlist.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/wasmbinding/stargate_allowlist.go b/wasmbinding/stargate_allowlist.go index e054f0008..844dc06a2 100644 --- a/wasmbinding/stargate_allowlist.go +++ b/wasmbinding/stargate_allowlist.go @@ -4,9 +4,11 @@ import ( wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" + "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/types" ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" ibcconnectiontypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" + feeburnertypes "github.com/neutron-org/neutron/x/feeburner/types" interchainqueriestypes "github.com/neutron-org/neutron/x/interchainqueries/types" interchaintxstypes "github.com/neutron-org/neutron/x/interchaintxs/types" @@ -16,9 +18,10 @@ import ( func AcceptedStargateQueries() wasmkeeper.AcceptedStargateQueries { return wasmkeeper.AcceptedStargateQueries{ // ibc - "/ibc.core.client.v1.Query/ClientState": &ibcclienttypes.QueryClientStateResponse{}, - "/ibc.core.client.v1.Query/ConsensusState": &ibcclienttypes.QueryConsensusStateResponse{}, - "/ibc.core.connection.v1.Query/Connection": &ibcconnectiontypes.QueryConnectionResponse{}, + "/ibc.core.client.v1.Query/ClientState": &ibcclienttypes.QueryClientStateResponse{}, + "/ibc.core.client.v1.Query/ConsensusState": &ibcclienttypes.QueryConsensusStateResponse{}, + "/ibc.core.connection.v1.Query/Connection": &ibcconnectiontypes.QueryConnectionResponse{}, + "/ibc.applications.interchain_accounts.controller.v1.Query/InterchainAccount": &types.QueryInterchainAccountResponse{}, // token factory "/osmosis.tokenfactory.v1beta1.Query/Params": &tokenfactorytypes.QueryParamsResponse{}, From 8445ca860905ed818000bb0c9173d59ea8fcc69d Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Tue, 19 Sep 2023 11:54:57 +0300 Subject: [PATCH 130/307] refactor --- wasmbinding/stargate_allowlist.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/wasmbinding/stargate_allowlist.go b/wasmbinding/stargate_allowlist.go index 844dc06a2..f0dc72bb9 100644 --- a/wasmbinding/stargate_allowlist.go +++ b/wasmbinding/stargate_allowlist.go @@ -18,16 +18,18 @@ import ( func AcceptedStargateQueries() wasmkeeper.AcceptedStargateQueries { return wasmkeeper.AcceptedStargateQueries{ // ibc - "/ibc.core.client.v1.Query/ClientState": &ibcclienttypes.QueryClientStateResponse{}, - "/ibc.core.client.v1.Query/ConsensusState": &ibcclienttypes.QueryConsensusStateResponse{}, - "/ibc.core.connection.v1.Query/Connection": &ibcconnectiontypes.QueryConnectionResponse{}, - "/ibc.applications.interchain_accounts.controller.v1.Query/InterchainAccount": &types.QueryInterchainAccountResponse{}, + "/ibc.core.client.v1.Query/ClientState": &ibcclienttypes.QueryClientStateResponse{}, + "/ibc.core.client.v1.Query/ConsensusState": &ibcclienttypes.QueryConsensusStateResponse{}, + "/ibc.core.connection.v1.Query/Connection": &ibcconnectiontypes.QueryConnectionResponse{}, // token factory "/osmosis.tokenfactory.v1beta1.Query/Params": &tokenfactorytypes.QueryParamsResponse{}, "/osmosis.tokenfactory.v1beta1.Query/DenomAuthorityMetadata": &tokenfactorytypes.QueryDenomAuthorityMetadataResponse{}, "/osmosis.tokenfactory.v1beta1.Query/DenomsFromCreator": &tokenfactorytypes.QueryDenomsFromCreatorResponse{}, + // interchain accounts + "/ibc.applications.interchain_accounts.controller.v1.Query/InterchainAccount": &types.QueryInterchainAccountResponse{}, + // transfer "/ibc.applications.transfer.v1.Query/DenomTrace": &ibctransfertypes.QueryDenomTraceResponse{}, From 2331798dc85dbaa0353b364f556dd87d48afa351 Mon Sep 17 00:00:00 2001 From: swelf Date: Tue, 19 Sep 2023 12:16:58 +0300 Subject: [PATCH 131/307] removed unused method --- x/contractmanager/keeper/sudo.go | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/x/contractmanager/keeper/sudo.go b/x/contractmanager/keeper/sudo.go index 4c5a24402..13a5e9e50 100644 --- a/x/contractmanager/keeper/sudo.go +++ b/x/contractmanager/keeper/sudo.go @@ -53,33 +53,6 @@ func PrepareOpenAckCallbackMessage(details types.OpenAckDetails) ([]byte, error) return m, nil } -func (k Keeper) SudoOnChanOpenAck( - ctx sdk.Context, - contractAddress sdk.AccAddress, - details types.OpenAckDetails, -) ([]byte, error) { - k.Logger(ctx).Debug("SudoOnChanOpenAck", "contractAddress", contractAddress) - - x := types.MessageOnChanOpenAck{} - x.OpenAck = details - m, err := json.Marshal(x) - if err != nil { - k.Logger(ctx).Error("SudoOnChanOpenAck: failed to marshal MessageOnChanOpenAck message", - "error", err, "contract_address", contractAddress) - return nil, fmt.Errorf("failed to marshal MessageOnChanOpenAck: %v", err) - } - k.Logger(ctx).Info("SudoOnChanOpenAck sending request", "data", string(m)) - - resp, err := k.wasmKeeper.Sudo(ctx, contractAddress, m) - if err != nil { - k.Logger(ctx).Debug("SudoOnChanOpenAck: failed to sudo", - "error", err, "contract_address", contractAddress) - return nil, fmt.Errorf("failed to sudo: %v", err) - } - - return resp, nil -} - // SudoTxQueryResult is used to pass a tx query result to the contract that registered the query // to: // 1. check whether the transaction actually satisfies the initial query arguments; From f54c2f00709468218b1e70bfd95aab9ff4385dea Mon Sep 17 00:00:00 2001 From: nhpd Date: Tue, 19 Sep 2023 18:27:22 +0400 Subject: [PATCH 132/307] review fixes --- .../osmosis/tokenfactory/v1beta1/query.proto | 4 +- proto/osmosis/tokenfactory/v1beta1/tx.proto | 4 +- wasmbinding/bindings/msg.go | 2 +- wasmbinding/message_plugin.go | 2 +- wasmbinding/queries.go | 4 +- x/tokenfactory/client/cli/query.go | 4 +- x/tokenfactory/client/cli/tx.go | 2 +- x/tokenfactory/keeper/admins.go | 2 +- x/tokenfactory/keeper/bankactions.go | 2 +- x/tokenfactory/keeper/before_send.go | 14 +- x/tokenfactory/keeper/createdenom.go | 6 +- x/tokenfactory/keeper/grpc_query.go | 4 +- x/tokenfactory/keeper/keeper.go | 1 + x/tokenfactory/keeper/msg_server.go | 10 +- x/tokenfactory/types/codec.go | 2 +- x/tokenfactory/types/constants.go | 4 +- x/tokenfactory/types/denoms.go | 2 +- x/tokenfactory/types/expected_keepers.go | 2 +- x/tokenfactory/types/msgs.go | 12 +- x/tokenfactory/types/params.go | 57 +++++-- x/tokenfactory/types/query.pb.go | 106 ++++++------ x/tokenfactory/types/tx.pb.go | 157 +++++++++--------- 22 files changed, 216 insertions(+), 187 deletions(-) diff --git a/proto/osmosis/tokenfactory/v1beta1/query.proto b/proto/osmosis/tokenfactory/v1beta1/query.proto index 09864e8a1..b278d8805 100644 --- a/proto/osmosis/tokenfactory/v1beta1/query.proto +++ b/proto/osmosis/tokenfactory/v1beta1/query.proto @@ -86,6 +86,6 @@ message QueryBeforeSendHookAddressRequest { // QueryBeforeSendHookAddressResponse defines the response structure for the // DenomBeforeSendHook gRPC query. message QueryBeforeSendHookAddressResponse { - string cosmwasm_address = 1 - [ (gogoproto.moretags) = "yaml:\"cosmwasm_address\"" ]; + string contract_addr = 1 + [ (gogoproto.moretags) = "yaml:\"contract_addr\"" ]; } diff --git a/proto/osmosis/tokenfactory/v1beta1/tx.proto b/proto/osmosis/tokenfactory/v1beta1/tx.proto index 7f4ce2fb3..43dd79d33 100644 --- a/proto/osmosis/tokenfactory/v1beta1/tx.proto +++ b/proto/osmosis/tokenfactory/v1beta1/tx.proto @@ -103,8 +103,8 @@ message MsgSetBeforeSendHook { string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ]; string denom = 2 [ (gogoproto.moretags) = "yaml:\"denom\"" ]; - string cosmwasm_address = 3 - [ (gogoproto.moretags) = "yaml:\"cosmwasm_address\"" ]; + string contract_addr = 3 + [ (gogoproto.moretags) = "yaml:\"contract_addr\"" ]; } // MsgSetBeforeSendHookResponse defines the response structure for an executed diff --git a/wasmbinding/bindings/msg.go b/wasmbinding/bindings/msg.go index fd9ca9236..56b6994de 100644 --- a/wasmbinding/bindings/msg.go +++ b/wasmbinding/bindings/msg.go @@ -185,7 +185,7 @@ type BurnTokens struct { type SetBeforeSendHook struct { Denom string `json:"denom"` - CosmWasmAddr string `json:"cosm_wasm_addr"` + ContractAddr string `json:"contract_addr"` } // AddSchedule adds new schedule to the cron module diff --git a/wasmbinding/message_plugin.go b/wasmbinding/message_plugin.go index 5b78a2a5e..8f1858521 100644 --- a/wasmbinding/message_plugin.go +++ b/wasmbinding/message_plugin.go @@ -536,7 +536,7 @@ func PerformMint(f *tokenfactorykeeper.Keeper, b *bankkeeper.BaseKeeper, ctx sdk } func PerformSetBeforeSendHook(f *tokenfactorykeeper.Keeper, ctx sdk.Context, contractAddr sdk.AccAddress, set *bindings.SetBeforeSendHook) error { - sdkMsg := tokenfactorytypes.NewMsgSetBeforeSendHook(contractAddr.String(), set.Denom, set.CosmWasmAddr) + sdkMsg := tokenfactorytypes.NewMsgSetBeforeSendHook(contractAddr.String(), set.Denom, set.ContractAddr) if err := sdkMsg.ValidateBasic(); err != nil { return err } diff --git a/wasmbinding/queries.go b/wasmbinding/queries.go index 95739bb46..d0cc9ce09 100644 --- a/wasmbinding/queries.go +++ b/wasmbinding/queries.go @@ -97,9 +97,9 @@ func (qp QueryPlugin) GetDenomAdmin(ctx sdk.Context, denom string) (*bindings.De // GetBeforeSendHook is a query to get denom before send hook. func (qp QueryPlugin) GetBeforeSendHook(ctx sdk.Context, denom string) (*bindings.BeforeSendHookResponse, error) { - cosmWasmAddr := qp.tokenFactoryKeeper.GetBeforeSendHook(ctx, denom) + contractAddr := qp.tokenFactoryKeeper.GetBeforeSendHook(ctx, denom) - return &bindings.BeforeSendHookResponse{ContractAddr: cosmWasmAddr}, nil + return &bindings.BeforeSendHookResponse{ContractAddr: contractAddr}, nil } func (qp *QueryPlugin) GetTotalBurnedNeutronsAmount(ctx sdk.Context, _ *bindings.QueryTotalBurnedNeutronsAmountRequest) (*bindings.QueryTotalBurnedNeutronsAmountResponse, error) { diff --git a/x/tokenfactory/client/cli/query.go b/x/tokenfactory/client/cli/query.go index 59a457975..929e72172 100644 --- a/x/tokenfactory/client/cli/query.go +++ b/x/tokenfactory/client/cli/query.go @@ -79,8 +79,8 @@ func GetCmdDenomAuthorityMetadata() *cobra.Command { } res, err := queryClient.DenomAuthorityMetadata(cmd.Context(), &types.QueryDenomAuthorityMetadataRequest{ - Creator: args[1], - Subdenom: args[2], + Creator: denom[1], + Subdenom: denom[2], }) if err != nil { return err diff --git a/x/tokenfactory/client/cli/tx.go b/x/tokenfactory/client/cli/tx.go index ec42a0463..16d15224e 100644 --- a/x/tokenfactory/client/cli/tx.go +++ b/x/tokenfactory/client/cli/tx.go @@ -204,7 +204,7 @@ func NewChangeAdminCmd() *cobra.Command { // NewSetBeforeSendHook broadcast MsgSetBeforeSendHook func NewSetBeforeSendHook() *cobra.Command { cmd := &cobra.Command{ - Use: "set-before-send-hook [denom] [cosm-wasm-addr] [flags]", + Use: "set-before-send-hook [denom] [contract-addr] [flags]", Short: "Sets the before send hook for a factory-created denom. Must have admin authority to do so.", Args: cobra.ExactArgs(2), RunE: func(cmd *cobra.Command, args []string) error { diff --git a/x/tokenfactory/keeper/admins.go b/x/tokenfactory/keeper/admins.go index 744662656..243ece8c3 100644 --- a/x/tokenfactory/keeper/admins.go +++ b/x/tokenfactory/keeper/admins.go @@ -37,7 +37,7 @@ func (k Keeper) setAuthorityMetadata(ctx sdk.Context, denom string, metadata typ return nil } -func (k Keeper) setAdmin(ctx sdk.Context, denom string, admin string) error { +func (k Keeper) setAdmin(ctx sdk.Context, denom, admin string) error { metadata, err := k.GetAuthorityMetadata(ctx, denom) if err != nil { return err diff --git a/x/tokenfactory/keeper/bankactions.go b/x/tokenfactory/keeper/bankactions.go index 6cf9309d9..4685334be 100644 --- a/x/tokenfactory/keeper/bankactions.go +++ b/x/tokenfactory/keeper/bankactions.go @@ -51,7 +51,7 @@ func (k Keeper) burnFrom(ctx sdk.Context, amount sdk.Coin, burnFrom string) erro return k.bankKeeper.BurnCoins(ctx, types.ModuleName, sdk.NewCoins(amount)) } -func (k Keeper) forceTransfer(ctx sdk.Context, amount sdk.Coin, fromAddr string, toAddr string) error { +func (k Keeper) forceTransfer(ctx sdk.Context, amount sdk.Coin, fromAddr, toAddr string) error { // verify that denom is an x/tokenfactory denom _, _, err := types.DeconstructDenom(amount.Denom) if err != nil { diff --git a/x/tokenfactory/keeper/before_send.go b/x/tokenfactory/keeper/before_send.go index c8654130a..d746ba3b2 100644 --- a/x/tokenfactory/keeper/before_send.go +++ b/x/tokenfactory/keeper/before_send.go @@ -11,7 +11,7 @@ import ( wasmvmtypes "github.com/CosmWasm/wasmvm/types" ) -func (k Keeper) setBeforeSendHook(ctx sdk.Context, denom string, cosmwasmAddress string) error { +func (k Keeper) setBeforeSendHook(ctx sdk.Context, denom, contractAddr string) error { // verify that denom is an x/tokenfactory denom _, _, err := types.DeconstructDenom(denom) if err != nil { @@ -21,17 +21,17 @@ func (k Keeper) setBeforeSendHook(ctx sdk.Context, denom string, cosmwasmAddress store := k.GetDenomPrefixStore(ctx, denom) // delete the store for denom prefix store when cosmwasm address is nil - if cosmwasmAddress == "" { + if contractAddr == "" { store.Delete([]byte(types.BeforeSendHookAddressPrefixKey)) return nil } - _, err = sdk.AccAddressFromBech32(cosmwasmAddress) + _, err = sdk.AccAddressFromBech32(contractAddr) if err != nil { return err } - store.Set([]byte(types.BeforeSendHookAddressPrefixKey), []byte(cosmwasmAddress)) + store.Set([]byte(types.BeforeSendHookAddressPrefixKey), []byte(contractAddr)) return nil } @@ -96,9 +96,9 @@ func (k Keeper) callBeforeSendListener(ctx sdk.Context, from, to sdk.AccAddress, }() for _, coin := range amount { - cosmwasmAddress := k.GetBeforeSendHook(ctx, coin.Denom) - if cosmwasmAddress != "" { - cwAddr, err := sdk.AccAddressFromBech32(cosmwasmAddress) + contractAddr := k.GetBeforeSendHook(ctx, coin.Denom) + if contractAddr != "" { + cwAddr, err := sdk.AccAddressFromBech32(contractAddr) if err != nil { return err } diff --git a/x/tokenfactory/keeper/createdenom.go b/x/tokenfactory/keeper/createdenom.go index a57a44af8..ff84e935c 100644 --- a/x/tokenfactory/keeper/createdenom.go +++ b/x/tokenfactory/keeper/createdenom.go @@ -11,7 +11,7 @@ import ( ) // ConvertToBaseToken converts a fee amount in a whitelisted fee token to the base fee token amount -func (k Keeper) CreateDenom(ctx sdk.Context, creatorAddr string, subdenom string) (newTokenDenom string, err error) { +func (k Keeper) CreateDenom(ctx sdk.Context, creatorAddr, subdenom string) (newTokenDenom string, err error) { denom, err := k.validateCreateDenom(ctx, creatorAddr, subdenom) if err != nil { return "", err @@ -28,7 +28,7 @@ func (k Keeper) CreateDenom(ctx sdk.Context, creatorAddr string, subdenom string // Runs CreateDenom logic after the charge and all denom validation has been handled. // Made into a second function for genesis initialization. -func (k Keeper) createDenomAfterValidation(ctx sdk.Context, creatorAddr string, denom string) (err error) { +func (k Keeper) createDenomAfterValidation(ctx sdk.Context, creatorAddr, denom string) (err error) { _, exists := k.bankKeeper.GetDenomMetaData(ctx, denom) if !exists { denomMetaData := banktypes.Metadata{ @@ -54,7 +54,7 @@ func (k Keeper) createDenomAfterValidation(ctx sdk.Context, creatorAddr string, return nil } -func (k Keeper) validateCreateDenom(ctx sdk.Context, creatorAddr string, subdenom string) (newTokenDenom string, err error) { +func (k Keeper) validateCreateDenom(ctx sdk.Context, creatorAddr, subdenom string) (newTokenDenom string, err error) { // Temporary check until IBC bug is sorted out if k.bankKeeper.HasSupply(ctx, subdenom) { return "", fmt.Errorf("temporary error until IBC bug is sorted out, " + diff --git a/x/tokenfactory/keeper/grpc_query.go b/x/tokenfactory/keeper/grpc_query.go index 59c62a1e4..ba8fd43cc 100644 --- a/x/tokenfactory/keeper/grpc_query.go +++ b/x/tokenfactory/keeper/grpc_query.go @@ -40,7 +40,7 @@ func (k Keeper) BeforeSendHookAddress(ctx context.Context, req *types.QueryBefor sdkCtx := sdk.UnwrapSDKContext(ctx) denom := fmt.Sprintf("factory/%s/%s", req.GetCreator(), req.GetSubdenom()) - cosmwasmAddress := k.GetBeforeSendHook(sdkCtx, denom) + contractAddr := k.GetBeforeSendHook(sdkCtx, denom) - return &types.QueryBeforeSendHookAddressResponse{CosmwasmAddress: cosmwasmAddress}, nil + return &types.QueryBeforeSendHookAddressResponse{ContractAddr: contractAddr}, nil } diff --git a/x/tokenfactory/keeper/keeper.go b/x/tokenfactory/keeper/keeper.go index 1bea2bcca..ebb88ea02 100644 --- a/x/tokenfactory/keeper/keeper.go +++ b/x/tokenfactory/keeper/keeper.go @@ -81,5 +81,6 @@ func (k *Keeper) SetContractKeeper(contractKeeper types.ContractKeeper) { // it purely mints and burns them on behalf of the admin of respective denoms, // and sends to the relevant address. func (k Keeper) CreateModuleAccount(ctx sdk.Context) { + // GetModuleAccount creates new module account if not present under the hood k.accountKeeper.GetModuleAccount(ctx, types.ModuleName) } diff --git a/x/tokenfactory/keeper/msg_server.go b/x/tokenfactory/keeper/msg_server.go index 3df06a489..fb29abf3b 100644 --- a/x/tokenfactory/keeper/msg_server.go +++ b/x/tokenfactory/keeper/msg_server.go @@ -218,7 +218,7 @@ func (server msgServer) SetBeforeSendHook(goCtx context.Context, msg *types.MsgS return nil, types.ErrUnauthorized } - err = server.Keeper.setBeforeSendHook(ctx, msg.Denom, msg.CosmwasmAddress) + err = server.Keeper.setBeforeSendHook(ctx, msg.Denom, msg.ContractAddr) if err != nil { return nil, err } @@ -227,7 +227,7 @@ func (server msgServer) SetBeforeSendHook(goCtx context.Context, msg *types.MsgS sdk.NewEvent( types.TypeMsgSetBeforeSendHook, sdk.NewAttribute(types.AttributeDenom, msg.GetDenom()), - sdk.NewAttribute(types.AttributeBeforeSendHookAddress, msg.GetCosmwasmAddress()), + sdk.NewAttribute(types.AttributeBeforeSendHookAddress, msg.GetContractAddr()), ), }) @@ -236,9 +236,9 @@ func (server msgServer) SetBeforeSendHook(goCtx context.Context, msg *types.MsgS // UpdateParams updates the module parameters func (k Keeper) UpdateParams(goCtx context.Context, req *types.MsgUpdateParams) (*types.MsgUpdateParamsResponse, error) { - //if err := req.ValidateBasic(); err != nil { - // return nil, err - //} + if err := req.ValidateBasic(); err != nil { + return nil, err + } authority := k.GetAuthority() if authority != req.Authority { return nil, errors.Wrapf(sdkerrors.ErrInvalidRequest, "invalid authority; expected %s, got %s", authority, req.Authority) diff --git a/x/tokenfactory/types/codec.go b/x/tokenfactory/types/codec.go index a4ae0b61f..176834acb 100644 --- a/x/tokenfactory/types/codec.go +++ b/x/tokenfactory/types/codec.go @@ -14,7 +14,7 @@ func RegisterCodec(cdc *codec.LegacyAmino) { cdc.RegisterConcrete(&MsgCreateDenom{}, "osmosis/tokenfactory/create-denom", nil) cdc.RegisterConcrete(&MsgMint{}, "osmosis/tokenfactory/mint", nil) cdc.RegisterConcrete(&MsgBurn{}, "osmosis/tokenfactory/burn", nil) - //cdc.RegisterConcrete(&MsgForceTransfer{}, "osmosis/tokenfactory/force-transfer", nil) + // cdc.RegisterConcrete(&MsgForceTransfer{}, "osmosis/tokenfactory/force-transfer", nil) cdc.RegisterConcrete(&MsgChangeAdmin{}, "osmosis/tokenfactory/change-admin", nil) cdc.RegisterConcrete(&MsgSetBeforeSendHook{}, "osmosis/tokenfactory/set-beforesend-hook", nil) cdc.RegisterConcrete(&MsgUpdateParams{}, "osmosis/tokenfactory/update-params", nil) diff --git a/x/tokenfactory/types/constants.go b/x/tokenfactory/types/constants.go index 7cfe7cd30..ba0108ee2 100644 --- a/x/tokenfactory/types/constants.go +++ b/x/tokenfactory/types/constants.go @@ -1,5 +1,3 @@ package types -var ( - TrackBeforeSendGasLimit = uint64(100_000) -) +var TrackBeforeSendGasLimit = uint64(100_000) diff --git a/x/tokenfactory/types/denoms.go b/x/tokenfactory/types/denoms.go index 4a78e42cb..23ad5fa43 100644 --- a/x/tokenfactory/types/denoms.go +++ b/x/tokenfactory/types/denoms.go @@ -40,7 +40,7 @@ func GetTokenDenom(creator, subdenom string) (string, error) { // DeconstructDenom takes a token denom string and verifies that it is a valid // denom of the tokenfactory module, and is of the form `factory/{creator}/{subdenom}` // If valid, it returns the creator address and subdenom -func DeconstructDenom(denom string) (creator string, subdenom string, err error) { +func DeconstructDenom(denom string) (creator, subdenom string, err error) { err = sdk.ValidateDenom(denom) if err != nil { return "", "", err diff --git a/x/tokenfactory/types/expected_keepers.go b/x/tokenfactory/types/expected_keepers.go index 928915056..9da7b744d 100644 --- a/x/tokenfactory/types/expected_keepers.go +++ b/x/tokenfactory/types/expected_keepers.go @@ -18,7 +18,7 @@ type BankKeeper interface { MintCoins(ctx sdk.Context, moduleName string, amt sdk.Coins) error BurnCoins(ctx sdk.Context, moduleName string, amt sdk.Coins) error - SendCoins(ctx sdk.Context, fromAddr sdk.AccAddress, toAddr sdk.AccAddress, amt sdk.Coins) error + SendCoins(ctx sdk.Context, fromAddr, toAddr sdk.AccAddress, amt sdk.Coins) error HasBalance(ctx sdk.Context, addr sdk.AccAddress, amt sdk.Coin) bool } diff --git a/x/tokenfactory/types/msgs.go b/x/tokenfactory/types/msgs.go index 356d6f801..eafdc8547 100644 --- a/x/tokenfactory/types/msgs.go +++ b/x/tokenfactory/types/msgs.go @@ -266,11 +266,11 @@ func (m MsgSetDenomMetadata) GetSigners() []sdk.AccAddress { var _ sdk.Msg = &MsgSetBeforeSendHook{} // NewMsgSetBeforeSendHook creates a message to set a new before send hook -func NewMsgSetBeforeSendHook(sender string, denom string, cosmwasmAddress string) *MsgSetBeforeSendHook { +func NewMsgSetBeforeSendHook(sender, denom, contractAddr string) *MsgSetBeforeSendHook { return &MsgSetBeforeSendHook{ - Sender: sender, - Denom: denom, - CosmwasmAddress: cosmwasmAddress, + Sender: sender, + Denom: denom, + ContractAddr: contractAddr, } } @@ -282,8 +282,8 @@ func (m MsgSetBeforeSendHook) ValidateBasic() error { return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid sender address (%s)", err) } - if m.CosmwasmAddress != "" { - _, err = sdk.AccAddressFromBech32(m.CosmwasmAddress) + if m.ContractAddr != "" { + _, err = sdk.AccAddressFromBech32(m.ContractAddr) if err != nil { return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid cosmwasm contract address (%s)", err) } diff --git a/x/tokenfactory/types/params.go b/x/tokenfactory/types/params.go index 648426319..14743767d 100644 --- a/x/tokenfactory/types/params.go +++ b/x/tokenfactory/types/params.go @@ -11,47 +11,58 @@ import ( var ( KeyDenomCreationFee = []byte("DenomCreationFee") KeyDenomCreationGasConsume = []byte("DenomCreationGasConsume") - DefaultNeutronDenom = "untrn" - // chosen as an arbitrary large number, less than the max_gas_wanted_per_tx in config. - DefaultCreationGasFee = 1_000 - DefaultFeeAmount int64 = 1_000_000 + KeyFeeCollectorAddress = []byte("FeeCollectorAddress") + // We don't want to charge users for denom creation + DefaultDenomCreationFee sdk.Coins = nil + DefaultDenomCreationGasConsume uint64 = 0 + DefaultFeeCollectorAddress = "" ) -// ParamTable for tokenfactory module. +// ParamKeyTable the param key table for tokenfactory module. func ParamKeyTable() paramtypes.KeyTable { return paramtypes.NewKeyTable().RegisterParamSet(&Params{}) } -func NewParams(denomCreationFee sdk.Coins, denomCreationGasConsume uint64) Params { +func NewParams(denomCreationFee sdk.Coins, denomCreationGasConsume uint64, feeCollectorAddress string) Params { return Params{ DenomCreationFee: denomCreationFee, DenomCreationGasConsume: denomCreationGasConsume, + FeeCollectorAddress: feeCollectorAddress, } } -// default tokenfactory module parameters. +// DefaultParams returns a default set of parameters func DefaultParams() Params { - return Params{ - // We don't want to charge users for denom creation - DenomCreationFee: nil, - DenomCreationGasConsume: 0, - } + return NewParams(DefaultDenomCreationFee, DefaultDenomCreationGasConsume, DefaultFeeCollectorAddress) } -// validate params. +// Validate validates params func (p Params) Validate() error { + // DenomCreationFee and FeeCollectorAddress must be both set, or both unset + hasDenomCreationFee := len(p.DenomCreationFee) > 0 + hasFeeCollectorAddress := p.FeeCollectorAddress != "" + + if hasDenomCreationFee != hasFeeCollectorAddress { + return fmt.Errorf("DenomCreationFee and FeeCollectorAddr must be both set or both unset") + } + if err := validateDenomCreationFee(p.DenomCreationFee); err != nil { return err } + if err := validateAddress(p.FeeCollectorAddress); err != nil { + return err + } + return nil } -// Implements params.ParamSet. +// ParamSetPairs get the params.ParamSet func (p *Params) ParamSetPairs() paramtypes.ParamSetPairs { return paramtypes.ParamSetPairs{ paramtypes.NewParamSetPair(KeyDenomCreationFee, &p.DenomCreationFee, validateDenomCreationFee), paramtypes.NewParamSetPair(KeyDenomCreationGasConsume, &p.DenomCreationGasConsume, validateDenomCreationGasConsume), + paramtypes.NewParamSetPair(KeyFeeCollectorAddress, &p.FeeCollectorAddress, validateAddress), } } @@ -76,3 +87,21 @@ func validateDenomCreationGasConsume(i interface{}) error { return nil } + +func validateAddress(i interface{}) error { + v, ok := i.(string) + if !ok { + return fmt.Errorf("invalid parameter type: %T", i) + } + + if len(v) == 0 { + return nil + } + + _, err := sdk.AccAddressFromBech32(v) + if err != nil { + return fmt.Errorf("invalid address: %w", err) + } + + return nil +} diff --git a/x/tokenfactory/types/query.pb.go b/x/tokenfactory/types/query.pb.go index 1d06ab5fd..4b58f82a1 100644 --- a/x/tokenfactory/types/query.pb.go +++ b/x/tokenfactory/types/query.pb.go @@ -359,7 +359,7 @@ func (m *QueryBeforeSendHookAddressRequest) GetSubdenom() string { // QueryBeforeSendHookAddressResponse defines the response structure for the // DenomBeforeSendHook gRPC query. type QueryBeforeSendHookAddressResponse struct { - CosmwasmAddress string `protobuf:"bytes,1,opt,name=cosmwasm_address,json=cosmwasmAddress,proto3" json:"cosmwasm_address,omitempty" yaml:"cosmwasm_address"` + ContractAddr string `protobuf:"bytes,1,opt,name=contract_addr,json=contractAddr,proto3" json:"contract_addr,omitempty" yaml:"contract_addr"` } func (m *QueryBeforeSendHookAddressResponse) Reset() { *m = QueryBeforeSendHookAddressResponse{} } @@ -395,9 +395,9 @@ func (m *QueryBeforeSendHookAddressResponse) XXX_DiscardUnknown() { var xxx_messageInfo_QueryBeforeSendHookAddressResponse proto.InternalMessageInfo -func (m *QueryBeforeSendHookAddressResponse) GetCosmwasmAddress() string { +func (m *QueryBeforeSendHookAddressResponse) GetContractAddr() string { if m != nil { - return m.CosmwasmAddress + return m.ContractAddr } return "" } @@ -418,49 +418,49 @@ func init() { } var fileDescriptor_6f22013ad0f72e3f = []byte{ - // 671 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x95, 0x4f, 0x4f, 0x53, 0x4d, - 0x14, 0xc6, 0x3b, 0xbc, 0xaf, 0x55, 0xc6, 0x28, 0x32, 0xa0, 0x62, 0xc5, 0x5b, 0x19, 0x89, 0x81, - 0x04, 0x3b, 0xf2, 0x67, 0x25, 0x1a, 0xe1, 0x62, 0x88, 0x89, 0x21, 0xd1, 0x2b, 0x31, 0x91, 0x98, - 0x34, 0xd3, 0x76, 0x28, 0x0d, 0xdc, 0x7b, 0xca, 0xcc, 0x54, 0x6d, 0x08, 0x1b, 0x4c, 0x5c, 0x9b, - 0xb8, 0xf4, 0x3b, 0xf8, 0x39, 0x58, 0x92, 0xb0, 0x71, 0xd5, 0x18, 0xf0, 0x13, 0x74, 0xe1, 0xc6, - 0x8d, 0xe9, 0xcc, 0x14, 0x84, 0x96, 0x9b, 0x0a, 0x89, 0xbb, 0x9b, 0x99, 0x73, 0x9e, 0xf3, 0xfc, - 0xe6, 0x9c, 0x93, 0x8b, 0x47, 0x40, 0x85, 0xa0, 0x4a, 0x8a, 0x69, 0x58, 0x15, 0xd1, 0x32, 0xcf, - 0x6b, 0x90, 0x55, 0xf6, 0x76, 0x3c, 0x27, 0x34, 0x1f, 0x67, 0xeb, 0x15, 0x21, 0xab, 0x99, 0xb2, - 0x04, 0x0d, 0x64, 0xd0, 0x45, 0x66, 0xfe, 0x8c, 0xcc, 0xb8, 0xc8, 0x54, 0x7f, 0x11, 0x8a, 0x60, - 0x02, 0x59, 0xe3, 0xcb, 0xe6, 0xa4, 0x06, 0x8b, 0x00, 0xc5, 0x35, 0xc1, 0x78, 0xb9, 0xc4, 0x78, - 0x14, 0x81, 0xe6, 0xba, 0x04, 0x91, 0x72, 0xb7, 0x53, 0xb1, 0xb5, 0x79, 0x45, 0xaf, 0x80, 0x2c, - 0xe9, 0xea, 0x82, 0xd0, 0xbc, 0xc0, 0x35, 0x77, 0x59, 0xa3, 0xb1, 0x59, 0x65, 0x2e, 0x79, 0xe8, - 0x0a, 0xd0, 0x7e, 0x4c, 0x5e, 0x34, 0x08, 0x9e, 0x9b, 0xc3, 0x40, 0xac, 0x57, 0x84, 0xd2, 0xf4, - 0x35, 0xee, 0x3b, 0x72, 0xaa, 0xca, 0x10, 0x29, 0x41, 0x7c, 0x9c, 0xb4, 0xc9, 0x03, 0xe8, 0x36, - 0x1a, 0xb9, 0x38, 0x31, 0x9c, 0x89, 0x03, 0xce, 0xd8, 0x6c, 0xff, 0xff, 0xed, 0x5a, 0x3a, 0x11, - 0xb8, 0x4c, 0xfa, 0x01, 0x61, 0x6a, 0xb4, 0x9f, 0x88, 0x08, 0xc2, 0xd9, 0xe3, 0x04, 0xce, 0x01, - 0x19, 0xc3, 0xe7, 0xf3, 0x52, 0x70, 0x0d, 0xd2, 0xd4, 0xea, 0xf6, 0x49, 0xbd, 0x96, 0xbe, 0x5c, - 0xe5, 0xe1, 0xda, 0x03, 0xea, 0x2e, 0x68, 0xd0, 0x0c, 0x21, 0x0c, 0x5f, 0x50, 0x95, 0x5c, 0xa1, - 0xa1, 0x38, 0xd0, 0x65, 0xc2, 0xfb, 0xea, 0xb5, 0x74, 0x8f, 0x0d, 0x6f, 0xde, 0xd0, 0xe0, 0x20, - 0x88, 0x7e, 0x45, 0xf8, 0x4e, 0xac, 0x0b, 0x47, 0xfc, 0x11, 0x61, 0x72, 0xf0, 0xca, 0xd9, 0xd0, - 0x5d, 0x3b, 0xfc, 0xa9, 0x78, 0xfc, 0xf6, 0xd2, 0xfe, 0x50, 0xe3, 0x39, 0xea, 0xb5, 0xf4, 0x0d, - 0xeb, 0xae, 0x55, 0x9d, 0x06, 0xbd, 0x2d, 0x8d, 0xa5, 0x0b, 0xf8, 0xd6, 0xa1, 0x5f, 0x35, 0x2f, - 0x21, 0x9c, 0xb3, 0xec, 0xa7, 0x7a, 0x30, 0xfa, 0x0c, 0x7b, 0x27, 0xc9, 0x39, 0xf2, 0x51, 0x9c, - 0x34, 0x4f, 0xd5, 0xe8, 0xf5, 0x7f, 0x23, 0xdd, 0x7e, 0x6f, 0xbd, 0x96, 0xbe, 0x64, 0xe5, 0xec, - 0x39, 0x0d, 0x5c, 0x00, 0xdd, 0x42, 0x78, 0xc8, 0xa8, 0xf9, 0x62, 0x19, 0xa4, 0x78, 0x29, 0xa2, - 0xc2, 0x53, 0x80, 0xd5, 0xd9, 0x42, 0x41, 0x0a, 0xa5, 0xfe, 0x51, 0x47, 0xd7, 0xdc, 0x58, 0x9d, - 0xe0, 0xc1, 0x51, 0xcd, 0xe3, 0x2b, 0x79, 0x50, 0xe1, 0x3b, 0xae, 0xc2, 0x2c, 0xb7, 0x77, 0xce, - 0xcd, 0xcd, 0x7a, 0x2d, 0x7d, 0xdd, 0xb9, 0x39, 0x16, 0x41, 0x83, 0x9e, 0xe6, 0x91, 0xd3, 0x9b, - 0xa8, 0x27, 0xf1, 0x39, 0x53, 0x8e, 0x7c, 0x41, 0x38, 0x69, 0x07, 0x9d, 0xdc, 0x8f, 0x9f, 0x87, - 0xd6, 0x3d, 0x4b, 0x8d, 0xff, 0x45, 0x86, 0x25, 0xa0, 0x63, 0x5b, 0xbb, 0x3f, 0x3e, 0x77, 0xdd, - 0x25, 0xc3, 0xac, 0x83, 0x25, 0x27, 0xbf, 0x10, 0xbe, 0xd6, 0x7e, 0x0e, 0xc9, 0x4c, 0x07, 0xb5, - 0x63, 0x77, 0x34, 0x35, 0x7b, 0x06, 0x05, 0x47, 0xf3, 0xc6, 0xd0, 0xbc, 0x22, 0x8b, 0xf1, 0x34, - 0x76, 0xd0, 0x58, 0xf3, 0x78, 0xc3, 0x4d, 0xc9, 0x26, 0xdb, 0x68, 0xf6, 0x7f, 0x93, 0xb5, 0x2e, - 0x12, 0xd9, 0x45, 0xb8, 0xb7, 0x65, 0xc2, 0xc9, 0x74, 0xa7, 0xb6, 0xdb, 0xac, 0x59, 0xea, 0xe1, - 0xe9, 0x92, 0x1d, 0xee, 0x9c, 0xc1, 0x7d, 0x44, 0xa6, 0x3b, 0xc1, 0xcd, 0x2e, 0x4b, 0x08, 0xb3, - 0x0e, 0xf5, 0x90, 0x99, 0xfc, 0x44, 0xf8, 0x6a, 0xdb, 0x29, 0x27, 0x8f, 0x3b, 0x30, 0x17, 0xb7, - 0xa3, 0xa9, 0x99, 0xd3, 0x0b, 0x38, 0xc2, 0x25, 0x43, 0xb8, 0x48, 0x82, 0xb3, 0x37, 0x34, 0x67, - 0x0a, 0x65, 0x95, 0x88, 0x0a, 0xd9, 0x15, 0x80, 0x55, 0x7f, 0x61, 0x7b, 0xcf, 0x43, 0x3b, 0x7b, - 0x1e, 0xfa, 0xbe, 0xe7, 0xa1, 0x4f, 0xfb, 0x5e, 0x62, 0x67, 0xdf, 0x4b, 0x7c, 0xdb, 0xf7, 0x12, - 0x4b, 0x93, 0xc5, 0x92, 0x5e, 0xa9, 0xe4, 0x32, 0x79, 0x08, 0x59, 0x24, 0x2a, 0x5a, 0x42, 0x74, - 0x0f, 0x64, 0xb1, 0xf9, 0xcd, 0xde, 0x1f, 0x75, 0xa1, 0xab, 0x65, 0xa1, 0x72, 0x49, 0xf3, 0x07, - 0x9c, 0xfc, 0x1d, 0x00, 0x00, 0xff, 0xff, 0x90, 0xae, 0xbc, 0xc7, 0xe0, 0x07, 0x00, 0x00, + // 670 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x95, 0xcf, 0x6b, 0x13, 0x41, + 0x14, 0xc7, 0x33, 0x55, 0xa3, 0x1d, 0xad, 0xd2, 0x69, 0x95, 0x1a, 0xea, 0xc6, 0x8e, 0x45, 0x5a, + 0xa8, 0x19, 0xfb, 0xe3, 0x64, 0x2d, 0xb6, 0x5b, 0x11, 0x41, 0x0a, 0xba, 0x16, 0xc1, 0x22, 0x84, + 0x49, 0x76, 0x9a, 0x86, 0x76, 0xf7, 0xa5, 0x33, 0x13, 0x31, 0x94, 0x5e, 0x2a, 0x78, 0x16, 0x3c, + 0xfa, 0x3f, 0xf8, 0x77, 0xf4, 0x58, 0xe8, 0xc5, 0x53, 0x90, 0xd6, 0xbf, 0x20, 0x07, 0x2f, 0x5e, + 0x24, 0xb3, 0xb3, 0xfd, 0x61, 0xd2, 0x25, 0xa6, 0xe0, 0x6d, 0x33, 0xf3, 0xde, 0xf7, 0x7d, 0x3f, + 0xf3, 0xde, 0x23, 0x78, 0x0c, 0x54, 0x00, 0xaa, 0xac, 0x98, 0x86, 0x75, 0x11, 0xae, 0xf2, 0xa2, + 0x06, 0x59, 0x63, 0xef, 0x27, 0x0b, 0x42, 0xf3, 0x49, 0xb6, 0x59, 0x15, 0xb2, 0x96, 0xab, 0x48, + 0xd0, 0x40, 0x86, 0x6d, 0x64, 0xee, 0x64, 0x64, 0xce, 0x46, 0x66, 0x06, 0x4b, 0x50, 0x02, 0x13, + 0xc8, 0x9a, 0x5f, 0x51, 0x4e, 0x66, 0xb8, 0x04, 0x50, 0xda, 0x10, 0x8c, 0x57, 0xca, 0x8c, 0x87, + 0x21, 0x68, 0xae, 0xcb, 0x10, 0x2a, 0x7b, 0x3b, 0x93, 0x58, 0x9b, 0x57, 0xf5, 0x1a, 0xc8, 0xb2, + 0xae, 0x2d, 0x09, 0xcd, 0x7d, 0xae, 0xb9, 0xcd, 0x1a, 0x4f, 0xcc, 0xaa, 0x70, 0xc9, 0x03, 0x5b, + 0x80, 0x0e, 0x62, 0xf2, 0xaa, 0x49, 0xf0, 0xd2, 0x1c, 0x7a, 0x62, 0xb3, 0x2a, 0x94, 0xa6, 0x6f, + 0xf1, 0xc0, 0xa9, 0x53, 0x55, 0x81, 0x50, 0x09, 0xe2, 0xe2, 0x74, 0x94, 0x3c, 0x84, 0xee, 0xa2, + 0xb1, 0xab, 0x53, 0xa3, 0xb9, 0x24, 0xe0, 0x5c, 0x94, 0xed, 0x5e, 0xdc, 0xad, 0x67, 0x53, 0x9e, + 0xcd, 0xa4, 0x1f, 0x11, 0xa6, 0x46, 0xfb, 0xa9, 0x08, 0x21, 0x58, 0xf8, 0x9b, 0xc0, 0x3a, 0x20, + 0x13, 0xf8, 0x72, 0x51, 0x0a, 0xae, 0x41, 0x9a, 0x5a, 0xbd, 0x2e, 0x69, 0xd4, 0xb3, 0xd7, 0x6b, + 0x3c, 0xd8, 0x78, 0x44, 0xed, 0x05, 0xf5, 0xe2, 0x10, 0xc2, 0xf0, 0x15, 0x55, 0x2d, 0xf8, 0x4d, + 0xc5, 0xa1, 0x1e, 0x13, 0x3e, 0xd0, 0xa8, 0x67, 0x6f, 0x44, 0xe1, 0xf1, 0x0d, 0xf5, 0x8e, 0x82, + 0xe8, 0x37, 0x84, 0xef, 0x25, 0xba, 0xb0, 0xc4, 0x9f, 0x10, 0x26, 0x47, 0xaf, 0x9c, 0x0f, 0xec, + 0xb5, 0xc5, 0x9f, 0x49, 0xc6, 0x6f, 0x2f, 0xed, 0x8e, 0x34, 0x9f, 0xa3, 0x51, 0xcf, 0xde, 0x8e, + 0xdc, 0xb5, 0xaa, 0x53, 0xaf, 0xbf, 0xa5, 0xb1, 0x74, 0x09, 0xdf, 0x39, 0xf6, 0xab, 0x9e, 0x49, + 0x08, 0x16, 0x23, 0xf6, 0xae, 0x1e, 0x8c, 0xbe, 0xc0, 0xce, 0x59, 0x72, 0x96, 0x7c, 0x1c, 0xa7, + 0xcd, 0x53, 0x35, 0x7b, 0x7d, 0x61, 0xac, 0xd7, 0xed, 0x6f, 0xd4, 0xb3, 0x7d, 0x91, 0x5c, 0x74, + 0x4e, 0x3d, 0x1b, 0x40, 0x77, 0x10, 0x1e, 0x31, 0x6a, 0xae, 0x58, 0x05, 0x29, 0x5e, 0x8b, 0xd0, + 0x7f, 0x0e, 0xb0, 0xbe, 0xe0, 0xfb, 0x52, 0x28, 0xf5, 0x9f, 0x3a, 0x5a, 0xb4, 0x63, 0x75, 0x86, + 0x07, 0x4b, 0x35, 0x87, 0xfb, 0x8a, 0x10, 0x6a, 0xc9, 0x8b, 0x3a, 0xcf, 0x7d, 0x3f, 0xb6, 0x32, + 0xd4, 0xa8, 0x67, 0x07, 0xad, 0x95, 0x93, 0xd7, 0xd4, 0xbb, 0x16, 0xff, 0x6e, 0x2a, 0x4d, 0x35, + 0xd2, 0xf8, 0x92, 0xa9, 0x42, 0xbe, 0x22, 0x9c, 0x8e, 0xe6, 0x9b, 0x3c, 0x4c, 0x1e, 0x83, 0xd6, + 0xf5, 0xca, 0x4c, 0xfe, 0x43, 0x46, 0x64, 0x9c, 0x4e, 0xec, 0xec, 0xff, 0xfc, 0xd2, 0x73, 0x9f, + 0x8c, 0xb2, 0x0e, 0x76, 0x9b, 0xfc, 0x46, 0xf8, 0x56, 0xfb, 0xf1, 0x23, 0xf3, 0x1d, 0xd4, 0x4e, + 0x5c, 0xcd, 0xcc, 0xc2, 0x39, 0x14, 0x2c, 0xcd, 0x3b, 0x43, 0xf3, 0x86, 0x2c, 0x27, 0xd3, 0x44, + 0xf3, 0xc5, 0xe2, 0xe3, 0x2d, 0x3b, 0x1c, 0xdb, 0x6c, 0x2b, 0x6e, 0xfb, 0x36, 0x6b, 0xdd, 0x1f, + 0xb2, 0x8f, 0x70, 0x7f, 0xcb, 0x60, 0x93, 0xd9, 0x4e, 0x6d, 0xb7, 0xd9, 0xae, 0xcc, 0xe3, 0xee, + 0x92, 0x2d, 0xee, 0xa2, 0xc1, 0x9d, 0x23, 0xb3, 0x9d, 0xe0, 0xe6, 0x57, 0x25, 0x04, 0x79, 0x8b, + 0x7a, 0xcc, 0x4c, 0x7e, 0x21, 0x7c, 0xb3, 0xed, 0x70, 0x93, 0x27, 0x1d, 0x98, 0x4b, 0x5a, 0xcd, + 0xcc, 0x7c, 0xf7, 0x02, 0x96, 0x70, 0xc5, 0x10, 0x2e, 0x13, 0xef, 0xfc, 0x0d, 0x2d, 0x98, 0x42, + 0x79, 0x25, 0x42, 0x3f, 0xbf, 0x06, 0xb0, 0xee, 0x2e, 0xed, 0x1e, 0x38, 0x68, 0xef, 0xc0, 0x41, + 0x3f, 0x0e, 0x1c, 0xf4, 0xf9, 0xd0, 0x49, 0xed, 0x1d, 0x3a, 0xa9, 0xef, 0x87, 0x4e, 0x6a, 0x65, + 0xba, 0x54, 0xd6, 0x6b, 0xd5, 0x42, 0xae, 0x08, 0x01, 0x0b, 0x45, 0x55, 0x4b, 0x08, 0x1f, 0x80, + 0x2c, 0xc5, 0xdf, 0xec, 0xc3, 0x69, 0x17, 0xba, 0x56, 0x11, 0xaa, 0x90, 0x36, 0x7f, 0x7c, 0xd3, + 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0xcf, 0x15, 0xaa, 0xec, 0xd7, 0x07, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -912,10 +912,10 @@ func (m *QueryBeforeSendHookAddressResponse) MarshalToSizedBuffer(dAtA []byte) ( _ = i var l int _ = l - if len(m.CosmwasmAddress) > 0 { - i -= len(m.CosmwasmAddress) - copy(dAtA[i:], m.CosmwasmAddress) - i = encodeVarintQuery(dAtA, i, uint64(len(m.CosmwasmAddress))) + if len(m.ContractAddr) > 0 { + i -= len(m.ContractAddr) + copy(dAtA[i:], m.ContractAddr) + i = encodeVarintQuery(dAtA, i, uint64(len(m.ContractAddr))) i-- dAtA[i] = 0xa } @@ -1032,7 +1032,7 @@ func (m *QueryBeforeSendHookAddressResponse) Size() (n int) { } var l int _ = l - l = len(m.CosmwasmAddress) + l = len(m.ContractAddr) if l > 0 { n += 1 + l + sovQuery(uint64(l)) } @@ -1684,7 +1684,7 @@ func (m *QueryBeforeSendHookAddressResponse) Unmarshal(dAtA []byte) error { switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field CosmwasmAddress", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field ContractAddr", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -1712,7 +1712,7 @@ func (m *QueryBeforeSendHookAddressResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.CosmwasmAddress = string(dAtA[iNdEx:postIndex]) + m.ContractAddr = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex default: iNdEx = preIndex diff --git a/x/tokenfactory/types/tx.pb.go b/x/tokenfactory/types/tx.pb.go index 2a887b635..61a23a8a0 100644 --- a/x/tokenfactory/types/tx.pb.go +++ b/x/tokenfactory/types/tx.pb.go @@ -440,9 +440,9 @@ var xxx_messageInfo_MsgChangeAdminResponse proto.InternalMessageInfo // MsgSetBeforeSendHook is the sdk.Msg type for allowing an admin account to // assign a CosmWasm contract to call with a BeforeSend hook type MsgSetBeforeSendHook struct { - Sender string `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty" yaml:"sender"` - Denom string `protobuf:"bytes,2,opt,name=denom,proto3" json:"denom,omitempty" yaml:"denom"` - CosmwasmAddress string `protobuf:"bytes,3,opt,name=cosmwasm_address,json=cosmwasmAddress,proto3" json:"cosmwasm_address,omitempty" yaml:"cosmwasm_address"` + Sender string `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty" yaml:"sender"` + Denom string `protobuf:"bytes,2,opt,name=denom,proto3" json:"denom,omitempty" yaml:"denom"` + ContractAddr string `protobuf:"bytes,3,opt,name=contract_addr,json=contractAddr,proto3" json:"contract_addr,omitempty" yaml:"contract_addr"` } func (m *MsgSetBeforeSendHook) Reset() { *m = MsgSetBeforeSendHook{} } @@ -492,9 +492,9 @@ func (m *MsgSetBeforeSendHook) GetDenom() string { return "" } -func (m *MsgSetBeforeSendHook) GetCosmwasmAddress() string { +func (m *MsgSetBeforeSendHook) GetContractAddr() string { if m != nil { - return m.CosmwasmAddress + return m.ContractAddr } return "" } @@ -856,72 +856,73 @@ func init() { } var fileDescriptor_283b6c9a90a846b4 = []byte{ - // 1040 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x56, 0xbf, 0x6f, 0xdb, 0x46, - 0x14, 0x36, 0x93, 0xd4, 0xb1, 0x2f, 0x71, 0x6d, 0xd3, 0x6e, 0x2c, 0x33, 0x0e, 0x99, 0xb2, 0x4d, - 0xe0, 0x18, 0x95, 0x08, 0x3b, 0x69, 0x80, 0x6a, 0x6a, 0x94, 0xc2, 0xcd, 0x50, 0x01, 0x05, 0xed, - 0x2e, 0x45, 0x00, 0xe1, 0x24, 0x9d, 0x28, 0x42, 0xe5, 0x9d, 0x72, 0x77, 0x8a, 0xe2, 0xad, 0x68, - 0xb7, 0x4e, 0x1d, 0xb2, 0x77, 0xed, 0xe8, 0xa1, 0x73, 0x67, 0x8f, 0x41, 0xbb, 0x74, 0x22, 0x0c, - 0x1b, 0xa8, 0x77, 0xfd, 0x05, 0xc5, 0xfd, 0x20, 0x25, 0x51, 0x82, 0x7e, 0x0c, 0x45, 0x16, 0x89, - 0xbc, 0xf7, 0x7d, 0xef, 0xde, 0xf7, 0xee, 0xdd, 0x7b, 0x04, 0x0f, 0x08, 0x8b, 0x08, 0x0b, 0x99, - 0xc7, 0x49, 0x0b, 0xe1, 0x06, 0xac, 0x71, 0x42, 0x4f, 0xbc, 0xd7, 0xfb, 0x55, 0xc4, 0xe1, 0xbe, - 0xc7, 0xdf, 0x14, 0xda, 0x94, 0x70, 0x62, 0xee, 0x68, 0x58, 0x61, 0x10, 0x56, 0xd0, 0x30, 0xeb, - 0xd1, 0x44, 0x27, 0x6d, 0x48, 0x61, 0xc4, 0x94, 0x23, 0x6b, 0x33, 0x20, 0x01, 0x91, 0x8f, 0x9e, - 0x78, 0xd2, 0xab, 0x76, 0x4d, 0x7a, 0xf0, 0xaa, 0x90, 0xa1, 0x94, 0x57, 0x23, 0x21, 0xd6, 0xf6, - 0x2d, 0x6d, 0x8f, 0x58, 0xe0, 0xbd, 0xde, 0x17, 0x7f, 0xda, 0xb0, 0xad, 0x0c, 0x15, 0xe5, 0x51, - 0xbd, 0x68, 0xd3, 0x3a, 0x8c, 0x42, 0x4c, 0x3c, 0xf9, 0x3b, 0xb2, 0x0d, 0x6e, 0xa5, 0xdb, 0x88, - 0x17, 0x65, 0x77, 0xdf, 0x1a, 0xe0, 0xc3, 0x32, 0x0b, 0x9e, 0x53, 0x04, 0x39, 0xfa, 0x0a, 0x61, - 0x12, 0x99, 0x8f, 0xc0, 0x22, 0x43, 0xb8, 0x8e, 0x68, 0xce, 0xb8, 0x6f, 0xec, 0x2e, 0x97, 0xd6, - 0x7b, 0xb1, 0xb3, 0x72, 0x02, 0xa3, 0x1f, 0x8a, 0xae, 0x5a, 0x77, 0x7d, 0x0d, 0x30, 0x3d, 0xb0, - 0xc4, 0x3a, 0xd5, 0xba, 0xa0, 0xe5, 0xae, 0x49, 0xf0, 0x46, 0x2f, 0x76, 0x56, 0x35, 0x58, 0x5b, - 0x5c, 0x3f, 0x05, 0x15, 0x1f, 0xfe, 0x72, 0x75, 0xba, 0xf7, 0xf1, 0xd8, 0xdc, 0xd5, 0x64, 0x08, - 0x79, 0x45, 0x79, 0x09, 0xee, 0x0c, 0x47, 0xe5, 0x23, 0xd6, 0x26, 0x98, 0x21, 0xb3, 0x04, 0x56, - 0x31, 0xea, 0x56, 0x24, 0xb5, 0xa2, 0x76, 0x56, 0x61, 0x5a, 0xbd, 0xd8, 0xb9, 0xa3, 0x76, 0xce, - 0x00, 0x5c, 0x7f, 0x05, 0xa3, 0xee, 0xb1, 0x58, 0x90, 0xbe, 0xdc, 0x73, 0x03, 0xdc, 0x2c, 0xb3, - 0xa0, 0x1c, 0x62, 0x3e, 0x8f, 0xda, 0x17, 0x60, 0x11, 0x46, 0xa4, 0x83, 0xb9, 0xd4, 0x7a, 0xeb, - 0x60, 0xbb, 0xa0, 0xb3, 0x2f, 0xce, 0x30, 0xa9, 0x8c, 0xc2, 0x73, 0x12, 0xe2, 0xd2, 0x47, 0x67, - 0xb1, 0xb3, 0xd0, 0xf7, 0xa4, 0x68, 0xae, 0xaf, 0xf9, 0xe6, 0x97, 0x60, 0x25, 0x0a, 0x31, 0x3f, - 0x26, 0xcf, 0xea, 0x75, 0x8a, 0x18, 0xcb, 0x5d, 0xcf, 0x4a, 0x10, 0xe6, 0x0a, 0x27, 0x15, 0xa8, - 0x00, 0xae, 0x3f, 0x4c, 0x28, 0xda, 0x22, 0x91, 0xdb, 0x63, 0x13, 0x29, 0x80, 0xee, 0x3a, 0x58, - 0xd5, 0x0a, 0x93, 0xcc, 0xb9, 0xff, 0x2a, 0xd5, 0xa5, 0x0e, 0xc5, 0xef, 0x47, 0xf5, 0x21, 0x58, - 0xad, 0x76, 0x28, 0x3e, 0xa4, 0x24, 0x1a, 0xd6, 0xbd, 0xd3, 0x8b, 0x9d, 0x9c, 0xe2, 0x08, 0x40, - 0xa5, 0x41, 0x49, 0xd4, 0x57, 0x9e, 0x25, 0x4d, 0xd2, 0x2e, 0xa0, 0x5a, 0xbb, 0xd0, 0x99, 0x6a, - 0xff, 0x53, 0x97, 0x79, 0x13, 0xe2, 0x00, 0x3d, 0xab, 0x47, 0xe1, 0x5c, 0x29, 0x78, 0x08, 0x3e, - 0x18, 0xac, 0xf1, 0xb5, 0x5e, 0xec, 0xdc, 0x56, 0x48, 0x5d, 0x5f, 0xca, 0x6c, 0xee, 0x83, 0x65, - 0x51, 0x7a, 0x50, 0xf8, 0xd7, 0xd2, 0x36, 0x7b, 0xb1, 0xb3, 0xd6, 0xaf, 0x4a, 0x69, 0x72, 0xfd, - 0x25, 0x8c, 0xba, 0x32, 0x8a, 0x89, 0x17, 0x42, 0x06, 0x9b, 0x57, 0x94, 0x9c, 0xba, 0x10, 0xfd, - 0xf8, 0x53, 0x69, 0xe7, 0x06, 0xd8, 0x2c, 0xb3, 0xe0, 0x08, 0xf1, 0x12, 0x6a, 0x10, 0x8a, 0x8e, - 0x10, 0xae, 0xbf, 0x20, 0xa4, 0xf5, 0x7f, 0x08, 0x3c, 0x04, 0x6b, 0xe2, 0xf0, 0xbb, 0x90, 0xa5, - 0xe7, 0xa3, 0x75, 0xde, 0xed, 0xc5, 0xce, 0x96, 0xa2, 0x64, 0x11, 0xae, 0xbf, 0x9a, 0x2c, 0x25, - 0x27, 0x98, 0x17, 0xaa, 0x77, 0xc7, 0xaa, 0x66, 0x88, 0xe7, 0xab, 0x52, 0x88, 0x88, 0x2d, 0xdf, - 0x24, 0xa4, 0xe5, 0xda, 0x60, 0x67, 0x9c, 0xc2, 0x34, 0x05, 0x6f, 0x0d, 0xb0, 0xa1, 0x00, 0xf2, - 0x7e, 0x97, 0x11, 0x87, 0x75, 0xc8, 0xe1, 0x3c, 0x19, 0xf0, 0xc1, 0x52, 0xa4, 0x69, 0xba, 0xce, - 0xef, 0xf5, 0xeb, 0x1c, 0xb7, 0xd2, 0x3a, 0x4f, 0x7c, 0x97, 0xb6, 0x74, 0xad, 0xeb, 0x66, 0x97, - 0x90, 0x5d, 0x3f, 0xf5, 0xe3, 0xde, 0x03, 0x77, 0xc7, 0x44, 0x95, 0x46, 0xfd, 0xf7, 0x35, 0xb0, - 0x56, 0x66, 0xc1, 0x21, 0xa1, 0x35, 0x74, 0x4c, 0x21, 0x66, 0x0d, 0x44, 0xdf, 0xcf, 0xc5, 0xf4, - 0xc1, 0x06, 0xd7, 0x01, 0x8c, 0x5e, 0xce, 0xfb, 0xbd, 0xd8, 0xd9, 0x51, 0xbc, 0x04, 0x94, 0xb9, - 0xa0, 0xe3, 0xc8, 0xe6, 0x37, 0x60, 0x3d, 0x59, 0xee, 0xb7, 0xb9, 0x1b, 0xd2, 0xa3, 0xdd, 0x8b, - 0x1d, 0x2b, 0xe3, 0x71, 0xb0, 0xd5, 0x8d, 0x12, 0x8b, 0xbb, 0xa2, 0x60, 0x3e, 0x19, 0x5b, 0x30, - 0x0d, 0x91, 0xbf, 0x7c, 0x42, 0x71, 0x2d, 0x90, 0xcb, 0x26, 0x35, 0xcd, 0xf8, 0x99, 0x21, 0x3b, - 0xc3, 0x77, 0xed, 0x3a, 0xe4, 0xe8, 0x5b, 0x39, 0xa3, 0xcd, 0xa7, 0x60, 0x19, 0x76, 0x78, 0x93, - 0xd0, 0x90, 0x9f, 0xe8, 0x9c, 0xe7, 0xfe, 0xfa, 0x23, 0xbf, 0xa9, 0x73, 0xa9, 0x03, 0x38, 0xe2, - 0x34, 0xc4, 0x81, 0xdf, 0x87, 0x9a, 0x5f, 0x83, 0x45, 0x35, 0xe5, 0x75, 0xf6, 0x3f, 0x2d, 0x4c, - 0xfa, 0x5e, 0x28, 0xa8, 0xdd, 0x4a, 0xcb, 0xe2, 0x20, 0x7e, 0xbf, 0x3a, 0xdd, 0x33, 0x7c, 0x4d, - 0x2f, 0x3e, 0xf9, 0xe9, 0xea, 0x74, 0xaf, 0xef, 0x58, 0xf6, 0x83, 0x10, 0x73, 0x44, 0x6b, 0x4d, - 0x18, 0xe2, 0x57, 0x1d, 0x44, 0x43, 0xc4, 0xbc, 0x4c, 0xd8, 0xee, 0x36, 0xd8, 0xca, 0x2c, 0x25, - 0x2a, 0x0f, 0x7e, 0xbb, 0x09, 0xae, 0x97, 0x59, 0x60, 0xbe, 0x02, 0xb7, 0x06, 0xc7, 0xfa, 0x67, - 0x93, 0x03, 0x1c, 0x1e, 0xb7, 0xd6, 0x93, 0x79, 0xd0, 0xe9, 0x70, 0x7e, 0x09, 0x6e, 0xc8, 0xa1, - 0xfa, 0x60, 0x2a, 0x5b, 0xc0, 0xac, 0xfc, 0x4c, 0xb0, 0x41, 0xef, 0x72, 0x78, 0x4d, 0xf7, 0x2e, - 0x60, 0x33, 0x78, 0x1f, 0x1c, 0x11, 0x32, 0x5d, 0x03, 0xe3, 0x61, 0x86, 0x74, 0xf5, 0xd1, 0xb3, - 0xa4, 0x6b, 0xb4, 0x75, 0x9b, 0x3f, 0x1a, 0x60, 0x6d, 0xa4, 0x69, 0xed, 0x4f, 0x75, 0x95, 0xa5, - 0x58, 0x5f, 0xcc, 0x4d, 0x49, 0x43, 0xf8, 0xd9, 0x00, 0xeb, 0xa3, 0xa3, 0xe3, 0x60, 0x16, 0x87, - 0xc3, 0x1c, 0xab, 0x38, 0x3f, 0x27, 0x8d, 0xa2, 0x0b, 0x56, 0x86, 0xdb, 0x60, 0x61, 0xaa, 0xb3, - 0x21, 0xbc, 0xf5, 0x74, 0x3e, 0x7c, 0xba, 0x31, 0x07, 0xb7, 0x87, 0xba, 0xc1, 0xf4, 0x9a, 0x19, - 0x84, 0x5b, 0x9f, 0xcf, 0x05, 0x4f, 0x76, 0x2d, 0x95, 0xcf, 0x2e, 0x6c, 0xe3, 0xdd, 0x85, 0x6d, - 0x9c, 0x5f, 0xd8, 0xc6, 0xaf, 0x97, 0xf6, 0xc2, 0xbb, 0x4b, 0x7b, 0xe1, 0x9f, 0x4b, 0x7b, 0xe1, - 0xfb, 0xc7, 0x41, 0xc8, 0x9b, 0x9d, 0x6a, 0xa1, 0x46, 0x22, 0x0f, 0xa3, 0x0e, 0xa7, 0x04, 0xe7, - 0x09, 0x0d, 0x92, 0x67, 0xef, 0xcd, 0x70, 0xef, 0xe3, 0x27, 0x6d, 0xc4, 0xaa, 0x8b, 0xf2, 0x53, - 0xfe, 0xf1, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x82, 0xd8, 0xa2, 0x17, 0xd9, 0x0c, 0x00, 0x00, + // 1045 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x56, 0xbd, 0x6f, 0xdb, 0xc6, + 0x1b, 0x36, 0x93, 0xfc, 0x1c, 0xfb, 0x62, 0xff, 0x6c, 0xd3, 0x6e, 0x2c, 0xb3, 0x0e, 0x99, 0xb2, + 0x4d, 0xe0, 0x18, 0x95, 0x08, 0x39, 0x69, 0x80, 0x0a, 0x28, 0xd0, 0x28, 0x85, 0x9b, 0xa1, 0x02, + 0x0a, 0xda, 0x5d, 0x8a, 0x00, 0xc2, 0x49, 0x3a, 0x51, 0x84, 0xca, 0x3b, 0xe5, 0xee, 0x14, 0xc7, + 0x5b, 0xd1, 0x6e, 0x9d, 0x3a, 0x64, 0xef, 0xda, 0xd1, 0x43, 0xe7, 0xce, 0x1e, 0x83, 0x76, 0x68, + 0x27, 0x22, 0xb0, 0x81, 0x7a, 0xd7, 0x5f, 0x50, 0xdc, 0x07, 0x29, 0x51, 0x12, 0xf4, 0x31, 0x14, + 0x59, 0x6c, 0xf2, 0xde, 0xe7, 0x79, 0xee, 0x7d, 0x5e, 0xbe, 0x77, 0xaf, 0xc0, 0x3d, 0xc2, 0x22, + 0xc2, 0x42, 0xe6, 0x71, 0xd2, 0x46, 0xb8, 0x09, 0xeb, 0x9c, 0xd0, 0x53, 0xef, 0x65, 0xb1, 0x86, + 0x38, 0x2c, 0x7a, 0xfc, 0x55, 0xa1, 0x43, 0x09, 0x27, 0xe6, 0xae, 0x86, 0x15, 0x06, 0x61, 0x05, + 0x0d, 0xb3, 0x1e, 0x4c, 0x14, 0xe9, 0x40, 0x0a, 0x23, 0xa6, 0x84, 0xac, 0xad, 0x80, 0x04, 0x44, + 0x3e, 0x7a, 0xe2, 0x49, 0xaf, 0xda, 0x75, 0xa9, 0xe0, 0xd5, 0x20, 0x43, 0x29, 0xaf, 0x4e, 0x42, + 0xac, 0xe3, 0xdb, 0x3a, 0x1e, 0xb1, 0xc0, 0x7b, 0x59, 0x14, 0xff, 0x74, 0x60, 0x47, 0x05, 0xaa, + 0x4a, 0x51, 0xbd, 0xe8, 0xd0, 0x06, 0x8c, 0x42, 0x4c, 0x3c, 0xf9, 0x77, 0x64, 0x1b, 0xdc, 0x4e, + 0xb7, 0x11, 0x2f, 0x2a, 0xee, 0xbe, 0x36, 0xc0, 0xff, 0x2b, 0x2c, 0x78, 0x4a, 0x11, 0xe4, 0xe8, + 0x0b, 0x84, 0x49, 0x64, 0x3e, 0x00, 0x8b, 0x0c, 0xe1, 0x06, 0xa2, 0x39, 0xe3, 0xae, 0xb1, 0xb7, + 0x5c, 0xde, 0xe8, 0xc5, 0xce, 0xea, 0x29, 0x8c, 0xbe, 0x2b, 0xb9, 0x6a, 0xdd, 0xf5, 0x35, 0xc0, + 0xf4, 0xc0, 0x12, 0xeb, 0xd6, 0x1a, 0x82, 0x96, 0xbb, 0x26, 0xc1, 0x9b, 0xbd, 0xd8, 0x59, 0xd3, + 0x60, 0x1d, 0x71, 0xfd, 0x14, 0x54, 0xba, 0xff, 0xd3, 0xd5, 0xd9, 0xfe, 0x07, 0x63, 0x6b, 0x57, + 0x97, 0x29, 0xe4, 0x15, 0xe5, 0x39, 0xb8, 0x9d, 0xcd, 0xca, 0x47, 0xac, 0x43, 0x30, 0x43, 0x66, + 0x19, 0xac, 0x61, 0x74, 0x52, 0x95, 0xd4, 0xaa, 0xda, 0x59, 0xa5, 0x69, 0xf5, 0x62, 0xe7, 0xb6, + 0xda, 0x79, 0x08, 0xe0, 0xfa, 0xab, 0x18, 0x9d, 0x1c, 0x8b, 0x05, 0xa9, 0xe5, 0xbe, 0x35, 0xc0, + 0xcd, 0x0a, 0x0b, 0x2a, 0x21, 0xe6, 0xf3, 0xb8, 0x7d, 0x06, 0x16, 0x61, 0x44, 0xba, 0x98, 0x4b, + 0xaf, 0xb7, 0x0e, 0x76, 0x0a, 0xba, 0xfa, 0xe2, 0x1b, 0x26, 0x9d, 0x51, 0x78, 0x4a, 0x42, 0x5c, + 0x7e, 0xef, 0x3c, 0x76, 0x16, 0xfa, 0x4a, 0x8a, 0xe6, 0xfa, 0x9a, 0x6f, 0x7e, 0x0e, 0x56, 0xa3, + 0x10, 0xf3, 0x63, 0xf2, 0xa4, 0xd1, 0xa0, 0x88, 0xb1, 0xdc, 0xf5, 0x61, 0x0b, 0x22, 0x5c, 0xe5, + 0xa4, 0x0a, 0x15, 0xc0, 0xf5, 0xb3, 0x84, 0x92, 0x2d, 0x0a, 0xb9, 0x33, 0xb6, 0x90, 0x02, 0xe8, + 0x6e, 0x80, 0x35, 0xed, 0x30, 0xa9, 0x9c, 0xfb, 0x8f, 0x72, 0x5d, 0xee, 0x52, 0xfc, 0x6e, 0x5c, + 0x1f, 0x82, 0xb5, 0x5a, 0x97, 0xe2, 0x43, 0x4a, 0xa2, 0xac, 0xef, 0xdd, 0x5e, 0xec, 0xe4, 0x14, + 0x47, 0x00, 0xaa, 0x4d, 0x4a, 0xa2, 0xbe, 0xf3, 0x61, 0xd2, 0x24, 0xef, 0x02, 0xaa, 0xbd, 0x0b, + 0x9f, 0xa9, 0xf7, 0xdf, 0x75, 0x9b, 0xb7, 0x20, 0x0e, 0xd0, 0x93, 0x46, 0x14, 0xce, 0x55, 0x82, + 0xfb, 0xe0, 0x7f, 0x83, 0x3d, 0xbe, 0xde, 0x8b, 0x9d, 0x15, 0x85, 0xd4, 0xfd, 0xa5, 0xc2, 0x66, + 0x11, 0x2c, 0x8b, 0xd6, 0x83, 0x42, 0x5f, 0x5b, 0xdb, 0xea, 0xc5, 0xce, 0x7a, 0xbf, 0x2b, 0x65, + 0xc8, 0xf5, 0x97, 0x30, 0x3a, 0x91, 0x59, 0x4c, 0x3c, 0x10, 0x32, 0xd9, 0xbc, 0xa2, 0xe4, 0xd4, + 0x81, 0xe8, 0xe7, 0x9f, 0x5a, 0xfb, 0xcb, 0x00, 0x5b, 0x15, 0x16, 0x1c, 0x21, 0x5e, 0x46, 0x4d, + 0x42, 0xd1, 0x11, 0xc2, 0x8d, 0x67, 0x84, 0xb4, 0xff, 0x0b, 0x83, 0x9f, 0x81, 0xd5, 0x3a, 0xc1, + 0x9c, 0xc2, 0x3a, 0x97, 0xdf, 0x47, 0x9b, 0xcc, 0xf5, 0x62, 0x67, 0x4b, 0xe1, 0x33, 0x61, 0xd7, + 0x5f, 0x49, 0xde, 0xc5, 0xb7, 0x2b, 0xe5, 0x85, 0xd9, 0xbd, 0xb1, 0x66, 0x19, 0xe2, 0xf9, 0x9a, + 0xcc, 0x5f, 0xa4, 0x94, 0x6f, 0x11, 0xd2, 0x76, 0x6d, 0xb0, 0x3b, 0xce, 0x58, 0xea, 0xfc, 0xb5, + 0x01, 0x36, 0x15, 0x40, 0x1e, 0xeb, 0x0a, 0xe2, 0xb0, 0x01, 0x39, 0x9c, 0xc7, 0xb8, 0x0f, 0x96, + 0x22, 0x4d, 0xd3, 0xed, 0x7d, 0xa7, 0xdf, 0xde, 0xb8, 0x9d, 0xb6, 0x77, 0xa2, 0x5d, 0xde, 0xd6, + 0x2d, 0xae, 0xef, 0xb8, 0x84, 0xec, 0xfa, 0xa9, 0x8e, 0x7b, 0x07, 0xbc, 0x3f, 0x26, 0xab, 0x34, + 0xeb, 0x3f, 0xaf, 0x81, 0xf5, 0x0a, 0x0b, 0x0e, 0x09, 0xad, 0xa3, 0x63, 0x0a, 0x31, 0x6b, 0x22, + 0xfa, 0x6e, 0xce, 0xa3, 0x0f, 0x36, 0xb9, 0x4e, 0x60, 0xf4, 0x4c, 0xde, 0xed, 0xc5, 0xce, 0xae, + 0xe2, 0x25, 0xa0, 0xa1, 0x73, 0x39, 0x8e, 0x6c, 0x7e, 0x05, 0x36, 0x92, 0xe5, 0xfe, 0xed, 0x76, + 0x43, 0x2a, 0xda, 0xbd, 0xd8, 0xb1, 0x86, 0x14, 0x07, 0x6f, 0xb8, 0x51, 0x62, 0x69, 0x4f, 0x34, + 0xcc, 0x87, 0x63, 0x1b, 0xa6, 0x29, 0xea, 0x97, 0x4f, 0x28, 0xae, 0x05, 0x72, 0xc3, 0x45, 0x4d, + 0x2b, 0x7e, 0x6e, 0xc8, 0x0b, 0xe1, 0x9b, 0x4e, 0x03, 0x72, 0xf4, 0xb5, 0x1c, 0xcd, 0xe6, 0x63, + 0xb0, 0x0c, 0xbb, 0xbc, 0x45, 0x68, 0xc8, 0x4f, 0x75, 0xcd, 0x73, 0x7f, 0xfc, 0x96, 0xdf, 0xd2, + 0xb5, 0xd4, 0x09, 0x1c, 0x71, 0x1a, 0xe2, 0xc0, 0xef, 0x43, 0xcd, 0x2f, 0xc1, 0xa2, 0x1a, 0xee, + 0xba, 0xfa, 0x1f, 0x15, 0x26, 0xfd, 0x4c, 0x28, 0xa8, 0xdd, 0xca, 0xcb, 0xe2, 0x43, 0xfc, 0x7a, + 0x75, 0xb6, 0x6f, 0xf8, 0x9a, 0x5e, 0x7a, 0xf4, 0xc3, 0xd5, 0xd9, 0x7e, 0x5f, 0x58, 0x5e, 0x03, + 0x21, 0xe6, 0x88, 0xd6, 0x5b, 0x30, 0xc4, 0x2f, 0xba, 0x88, 0x86, 0x88, 0x79, 0x43, 0x69, 0xbb, + 0x3b, 0x60, 0x7b, 0x68, 0x29, 0x71, 0x79, 0xf0, 0xcb, 0x4d, 0x70, 0xbd, 0xc2, 0x02, 0xf3, 0x05, + 0xb8, 0x35, 0x38, 0xcd, 0x3f, 0x9e, 0x9c, 0x60, 0x76, 0xca, 0x5a, 0x8f, 0xe6, 0x41, 0xa7, 0x33, + 0xf9, 0x39, 0xb8, 0x21, 0x67, 0xe9, 0xbd, 0xa9, 0x6c, 0x01, 0xb3, 0xf2, 0x33, 0xc1, 0x06, 0xd5, + 0xe5, 0xcc, 0x9a, 0xae, 0x2e, 0x60, 0x33, 0xa8, 0x0f, 0x4e, 0x06, 0x59, 0xae, 0x81, 0xa9, 0x30, + 0x43, 0xb9, 0xfa, 0xe8, 0x59, 0xca, 0x35, 0x7a, 0x63, 0x9b, 0xdf, 0x1b, 0x60, 0x7d, 0xe4, 0xd2, + 0x2a, 0x4e, 0x95, 0x1a, 0xa6, 0x58, 0x9f, 0xce, 0x4d, 0x49, 0x53, 0xf8, 0xd1, 0x00, 0x1b, 0xa3, + 0x13, 0xe3, 0x60, 0x16, 0xc1, 0x2c, 0xc7, 0x2a, 0xcd, 0xcf, 0x49, 0xb3, 0x38, 0x01, 0xab, 0xd9, + 0x6b, 0xb0, 0x30, 0x55, 0x2c, 0x83, 0xb7, 0x1e, 0xcf, 0x87, 0x4f, 0x37, 0xe6, 0x60, 0x25, 0x73, + 0x1b, 0x4c, 0xef, 0x99, 0x41, 0xb8, 0xf5, 0xc9, 0x5c, 0xf0, 0x64, 0xd7, 0x72, 0xe5, 0xfc, 0xc2, + 0x36, 0xde, 0x5c, 0xd8, 0xc6, 0xdb, 0x0b, 0xdb, 0xf8, 0xf9, 0xd2, 0x5e, 0x78, 0x73, 0x69, 0x2f, + 0xfc, 0x7d, 0x69, 0x2f, 0x7c, 0xfb, 0x30, 0x08, 0x79, 0xab, 0x5b, 0x2b, 0xd4, 0x49, 0xe4, 0x61, + 0xd4, 0xe5, 0x94, 0xe0, 0x3c, 0xa1, 0x41, 0xf2, 0xec, 0xbd, 0xca, 0xde, 0x7d, 0xfc, 0xb4, 0x83, + 0x58, 0x6d, 0x51, 0xfe, 0x82, 0x7f, 0xf8, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x50, 0x90, 0x4a, + 0xf5, 0xd0, 0x0c, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1550,10 +1551,10 @@ func (m *MsgSetBeforeSendHook) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if len(m.CosmwasmAddress) > 0 { - i -= len(m.CosmwasmAddress) - copy(dAtA[i:], m.CosmwasmAddress) - i = encodeVarintTx(dAtA, i, uint64(len(m.CosmwasmAddress))) + if len(m.ContractAddr) > 0 { + i -= len(m.ContractAddr) + copy(dAtA[i:], m.ContractAddr) + i = encodeVarintTx(dAtA, i, uint64(len(m.ContractAddr))) i-- dAtA[i] = 0x1a } @@ -1941,7 +1942,7 @@ func (m *MsgSetBeforeSendHook) Size() (n int) { if l > 0 { n += 1 + l + sovTx(uint64(l)) } - l = len(m.CosmwasmAddress) + l = len(m.ContractAddr) if l > 0 { n += 1 + l + sovTx(uint64(l)) } @@ -2924,7 +2925,7 @@ func (m *MsgSetBeforeSendHook) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 3: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field CosmwasmAddress", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field ContractAddr", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -2952,7 +2953,7 @@ func (m *MsgSetBeforeSendHook) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.CosmwasmAddress = string(dAtA[iNdEx:postIndex]) + m.ContractAddr = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex default: iNdEx = preIndex From 39c639a4351483991aa1c6d7f33e31c9a67dfba7 Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Tue, 19 Sep 2023 17:39:24 +0300 Subject: [PATCH 133/307] fix unit tests --- wasmbinding/test/custom_message_test.go | 57 ++++++++++++++--------- wasmbinding/test/custom_query_test.go | 1 + x/tokenfactory/keeper/createdenom_test.go | 3 +- x/tokenfactory/keeper/keeper_test.go | 4 +- 4 files changed, 40 insertions(+), 25 deletions(-) diff --git a/wasmbinding/test/custom_message_test.go b/wasmbinding/test/custom_message_test.go index ebb4f87b1..d3727bba5 100644 --- a/wasmbinding/test/custom_message_test.go +++ b/wasmbinding/test/custom_message_test.go @@ -67,6 +67,7 @@ func (suite *CustomMessengerTestSuite) SetupTest() { err := suite.messenger.TokenFactory.SetParams(suite.ctx, tokenfactorytypes.NewParams( sdk.NewCoins(sdk.NewInt64Coin(params.DefaultDenom, 10_000_000)), 0, + FeeCollectorAddress, )) suite.Require().NoError(err) } @@ -418,18 +419,23 @@ func (suite *CustomMessengerTestSuite) TestSoftwareUpgradeProposal() { // Set admin so that we can execute this proposal without permission error suite.neutron.AdminmoduleKeeper.SetAdmin(suite.ctx, suite.contractAddress.String()) + executeMsg := fmt.Sprintf(` +{ + "@type": "/cosmos.upgrade.v1beta1.MsgSoftwareUpgrade", + "authority": "%s", + "plan": { + "name": "TestPlane", + "height": "150", + "info": "TestInfo" + } +} +`, suite.neutron.BankKeeper.GetAuthority()) // Craft SubmitAdminProposal message msg, err := json.Marshal(bindings.NeutronMsg{ SubmitAdminProposal: &bindings.SubmitAdminProposal{ AdminProposal: bindings.AdminProposal{ - SoftwareUpgradeProposal: &bindings.SoftwareUpgradeProposal{ - Title: "Test", - Description: "Test", - Plan: bindings.Plan{ - Name: "TestPlan", - Height: 150, - Info: "TestInfo", - }, + ProposalExecuteMessage: &bindings.ProposalExecuteMessage{ + Message: executeMsg, }, }, }, @@ -459,16 +465,16 @@ func (suite *CustomMessengerTestSuite) TestSoftwareUpgradeProposal() { // Check CancelSubmitAdminProposal + executeMsg = fmt.Sprintf(` + { + "@type": "/cosmos.upgrade.v1beta1.MsgCancelUpgrade", + "authority": "%s" +} +`, suite.neutron.BankKeeper.GetAuthority()) // Craft CancelSubmitAdminProposal message msg, err = json.Marshal(bindings.NeutronMsg{ SubmitAdminProposal: &bindings.SubmitAdminProposal{ - AdminProposal: bindings.AdminProposal{ - CancelSoftwareUpgradeProposal: &bindings.CancelSoftwareUpgradeProposal{ - Title: "Test", - Description: "Test", - }, - }, - }, + AdminProposal: bindings.AdminProposal{ProposalExecuteMessage: &bindings.ProposalExecuteMessage{Message: executeMsg}}}, }) suite.NoError(err) @@ -494,19 +500,24 @@ func (suite *CustomMessengerTestSuite) TestTooMuchProposals() { err := testutil.SetupICAPath(suite.Path, suite.contractAddress.String()) suite.Require().NoError(err) + executeMsg := fmt.Sprintf(` + { + "@type": "/cosmos.upgrade.v1beta1.MsgCancelUpgrade", + "authority": "%s" +} +`, suite.neutron.BankKeeper.GetAuthority()) + // Craft message with 2 proposals msg, err := json.Marshal(bindings.NeutronMsg{ SubmitAdminProposal: &bindings.SubmitAdminProposal{ AdminProposal: bindings.AdminProposal{ - CancelSoftwareUpgradeProposal: &bindings.CancelSoftwareUpgradeProposal{ - Title: "Test", - Description: "Test", - }, - ClearAdminProposal: &bindings.ClearAdminProposal{ - Title: "Test", - Description: "Test", - Contract: "Test", + ClientUpdateProposal: &bindings.ClientUpdateProposal{ + Title: "aaa", + Description: "ddafds", + SubjectClientId: "sdfsdf", + SubstituteClientId: "sdfsd", }, + ProposalExecuteMessage: &bindings.ProposalExecuteMessage{Message: executeMsg}, }, }, }) diff --git a/wasmbinding/test/custom_query_test.go b/wasmbinding/test/custom_query_test.go index b358a712e..9180bf079 100644 --- a/wasmbinding/test/custom_query_test.go +++ b/wasmbinding/test/custom_query_test.go @@ -252,6 +252,7 @@ func (suite *CustomQuerierTestSuite) TestDenomAdmin() { err := neutron.TokenFactoryKeeper.SetParams(ctx, tokenfactorytypes.NewParams( sdk.NewCoins(sdk.NewInt64Coin(params.DefaultDenom, 10_000_000)), 0, + FeeCollectorAddress, )) suite.Require().NoError(err) diff --git a/x/tokenfactory/keeper/createdenom_test.go b/x/tokenfactory/keeper/createdenom_test.go index 423dc4a1d..31f86593f 100644 --- a/x/tokenfactory/keeper/createdenom_test.go +++ b/x/tokenfactory/keeper/createdenom_test.go @@ -5,6 +5,7 @@ import ( "strings" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/types/errors" "github.com/neutron-org/neutron/x/tokenfactory/types" ) @@ -14,7 +15,7 @@ func (suite *KeeperTestSuite) TestMsgCreateDenom() { // Create denom without enough funds _, err := suite.msgServer.CreateDenom(sdk.WrapSDKContext(suite.ChainA.GetContext()), types.NewMsgCreateDenom(suite.TestAccs[0].String(), "bitcoin")) - suite.Require().ErrorContains(err, "unable to charge for denom creation") + suite.Require().ErrorIs(err, errors.ErrInsufficientFunds) // Creating a denom should work senderAddress := suite.ChainA.SenderAccounts[0].SenderAccount.GetAddress() diff --git a/x/tokenfactory/keeper/keeper_test.go b/x/tokenfactory/keeper/keeper_test.go index 4b9d546e8..8bd85595d 100644 --- a/x/tokenfactory/keeper/keeper_test.go +++ b/x/tokenfactory/keeper/keeper_test.go @@ -11,6 +11,7 @@ import ( "github.com/stretchr/testify/suite" sdktypes "github.com/cosmos/cosmos-sdk/types" + "github.com/neutron-org/neutron/app/params" "github.com/neutron-org/neutron/testutil" "github.com/neutron-org/neutron/x/tokenfactory/keeper" @@ -53,8 +54,9 @@ func (suite *KeeperTestSuite) Setup() { tokenFactoryKeeper := suite.GetNeutronZoneApp(suite.ChainA).TokenFactoryKeeper err := tokenFactoryKeeper.SetParams(suite.ChainA.GetContext(), types.NewParams( - sdktypes.NewCoins(sdktypes.NewInt64Coin(suite.defaultDenom, TopUpCoinsAmount)), + sdktypes.NewCoins(sdktypes.NewInt64Coin(params.DefaultDenom, TopUpCoinsAmount)), 0, + FeeCollectorAddress, )) suite.Require().NoError(err) From 36a87f3f41692de81c3686738a818ce5f6e513a2 Mon Sep 17 00:00:00 2001 From: nhpd Date: Wed, 20 Sep 2023 13:44:03 +0400 Subject: [PATCH 134/307] fix unit tests after merge --- x/contractmanager/keeper/failure_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/x/contractmanager/keeper/failure_test.go b/x/contractmanager/keeper/failure_test.go index 5edd064c3..b76ef3013 100644 --- a/x/contractmanager/keeper/failure_test.go +++ b/x/contractmanager/keeper/failure_test.go @@ -166,7 +166,7 @@ func TestResubmitFailure(t *testing.T) { failure2, err := k.GetFailure(ctx, contractAddr, failureID2) require.NoError(t, err) err = k.ResubmitFailure(ctx, contractAddr, failure2) - require.ErrorContains(t, err, "cannot resubmit failure ack") + require.ErrorContains(t, err, "cannot resubmit failure") // failure is still there failureAfter2, err := k.GetFailure(ctx, contractAddr, failureID2) require.NoError(t, err) @@ -200,7 +200,7 @@ func TestResubmitFailure(t *testing.T) { failure4, err := k.GetFailure(ctx, contractAddr, failureID4) require.NoError(t, err) err = k.ResubmitFailure(ctx, contractAddr, failure4) - require.ErrorContains(t, err, "cannot resubmit failure ack") + require.ErrorContains(t, err, "cannot resubmit failure") // failure is still there failureAfter4, err := k.GetFailure(ctx, contractAddr, failureID4) require.NoError(t, err) @@ -234,7 +234,7 @@ func TestResubmitFailure(t *testing.T) { failure6, err := k.GetFailure(ctx, contractAddr, failureID6) require.NoError(t, err) err = k.ResubmitFailure(ctx, contractAddr, failure6) - require.ErrorContains(t, err, "cannot resubmit failure ack") + require.ErrorContains(t, err, "cannot resubmit failure") // failure is still there failureAfter6, err := k.GetFailure(ctx, contractAddr, failureID6) require.NoError(t, err) From 8ff65bf7781e9661c3a3f20094ee94874fcfc0c1 Mon Sep 17 00:00:00 2001 From: nhpd Date: Wed, 20 Sep 2023 13:54:05 +0400 Subject: [PATCH 135/307] cleanup --- x/tokenfactory/types/params.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/x/tokenfactory/types/params.go b/x/tokenfactory/types/params.go index 14743767d..4a109cf73 100644 --- a/x/tokenfactory/types/params.go +++ b/x/tokenfactory/types/params.go @@ -50,7 +50,7 @@ func (p Params) Validate() error { return err } - if err := validateAddress(p.FeeCollectorAddress); err != nil { + if err := validateFeeCollectorAddress(p.FeeCollectorAddress); err != nil { return err } @@ -62,7 +62,7 @@ func (p *Params) ParamSetPairs() paramtypes.ParamSetPairs { return paramtypes.ParamSetPairs{ paramtypes.NewParamSetPair(KeyDenomCreationFee, &p.DenomCreationFee, validateDenomCreationFee), paramtypes.NewParamSetPair(KeyDenomCreationGasConsume, &p.DenomCreationGasConsume, validateDenomCreationGasConsume), - paramtypes.NewParamSetPair(KeyFeeCollectorAddress, &p.FeeCollectorAddress, validateAddress), + paramtypes.NewParamSetPair(KeyFeeCollectorAddress, &p.FeeCollectorAddress, validateFeeCollectorAddress), } } @@ -88,7 +88,7 @@ func validateDenomCreationGasConsume(i interface{}) error { return nil } -func validateAddress(i interface{}) error { +func validateFeeCollectorAddress(i interface{}) error { v, ok := i.(string) if !ok { return fmt.Errorf("invalid parameter type: %T", i) @@ -100,7 +100,7 @@ func validateAddress(i interface{}) error { _, err := sdk.AccAddressFromBech32(v) if err != nil { - return fmt.Errorf("invalid address: %w", err) + return fmt.Errorf("invalid fee collector address: %w", err) } return nil From b15a3aa47ec9cb91a4d41557124643d837a70053 Mon Sep 17 00:00:00 2001 From: swelf Date: Wed, 20 Sep 2023 18:31:56 +0300 Subject: [PATCH 136/307] merged upgrades --- app/app.go | 11 ++ app/upgrades/nextupgrade/constants.go | 8 - app/upgrades/nextupgrade/upgrades.go | 211 ++++++++++++++++++++-- app/upgrades/nextupgrade/upgrades_test.go | 36 ++++ app/upgrades/sdk47/constants.go | 15 -- app/upgrades/sdk47/upgrades.go | 210 --------------------- wasmbinding/message_plugin.go | 2 +- x/interchaintxs/types/params.go | 10 + 8 files changed, 254 insertions(+), 249 deletions(-) delete mode 100644 app/upgrades/sdk47/constants.go delete mode 100644 app/upgrades/sdk47/upgrades.go diff --git a/app/app.go b/app/app.go index 33b5f1d55..2194e8f09 100644 --- a/app/app.go +++ b/app/app.go @@ -1018,6 +1018,8 @@ func (app *App) setupUpgradeHandlers() { SlashingKeeper: app.SlashingKeeper, ParamsKeeper: app.ParamsKeeper, CapabilityKeeper: app.CapabilityKeeper, + BuilderKeeper: app.BuilderKeeper, + ContractManager: app.ContractManagerKeeper, GlobalFeeSubspace: app.GetSubspace(globalfee.ModuleName), CcvConsumerSubspace: app.GetSubspace(ccvconsumertypes.ModuleName), }, @@ -1184,6 +1186,15 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino paramsKeeper.Subspace(globalfee.ModuleName) paramsKeeper.Subspace(ccvconsumertypes.ModuleName) + + // MOTE: legacy subspaces for migration sdk47 only + paramsKeeper.Subspace(crontypes.StoreKey).WithKeyTable(crontypes.ParamKeyTable()) + paramsKeeper.Subspace(feeburnertypes.StoreKey).WithKeyTable(feeburnertypes.ParamKeyTable()) + paramsKeeper.Subspace(feetypes.StoreKey).WithKeyTable(feetypes.ParamKeyTable()) + paramsKeeper.Subspace(tokenfactorytypes.StoreKey).WithKeyTable(tokenfactorytypes.ParamKeyTable()) + paramsKeeper.Subspace(interchainqueriesmoduletypes.StoreKey).WithKeyTable(interchainqueriesmoduletypes.ParamKeyTable()) + paramsKeeper.Subspace(interchaintxstypes.StoreKey).WithKeyTable(interchaintxstypes.ParamKeyTable()) + return paramsKeeper } diff --git a/app/upgrades/nextupgrade/constants.go b/app/upgrades/nextupgrade/constants.go index 11ddc35b9..e180e71ef 100644 --- a/app/upgrades/nextupgrade/constants.go +++ b/app/upgrades/nextupgrade/constants.go @@ -1,9 +1,6 @@ package nextupgrade import ( - store "github.com/cosmos/cosmos-sdk/store/types" - - "github.com/cosmos/gaia/v11/x/globalfee" "github.com/neutron-org/neutron/app/upgrades" ) @@ -15,9 +12,4 @@ const ( var Upgrade = upgrades.Upgrade{ UpgradeName: UpgradeName, CreateUpgradeHandler: CreateUpgradeHandler, - StoreUpgrades: store.StoreUpgrades{ - Added: []string{ - globalfee.ModuleName, - }, - }, } diff --git a/app/upgrades/nextupgrade/upgrades.go b/app/upgrades/nextupgrade/upgrades.go index 656a5c8c6..eeb484e9a 100644 --- a/app/upgrades/nextupgrade/upgrades.go +++ b/app/upgrades/nextupgrade/upgrades.go @@ -1,27 +1,41 @@ package nextupgrade import ( - "errors" - - ccvconsumertypes "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types" - - ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" - ibcchanneltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" - + "cosmossdk.io/math" + "fmt" "github.com/cosmos/cosmos-sdk/codec" + storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/types/bech32" "github.com/cosmos/cosmos-sdk/types/module" + capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" + paramskeeper "github.com/cosmos/cosmos-sdk/x/params/keeper" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" "github.com/cosmos/gaia/v11/x/globalfee/types" + v6 "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/migrations/v6" + ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" + ibcchanneltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" + ccvconsumertypes "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types" "github.com/neutron-org/neutron/app/upgrades" + contractmanagerkeeper "github.com/neutron-org/neutron/x/contractmanager/keeper" + contractmanagertypes "github.com/neutron-org/neutron/x/contractmanager/types" + crontypes "github.com/neutron-org/neutron/x/cron/types" + feeburnerkeeper "github.com/neutron-org/neutron/x/feeburner/keeper" + feeburnertypes "github.com/neutron-org/neutron/x/feeburner/types" + feerefundertypes "github.com/neutron-org/neutron/x/feerefunder/types" + icqtypes "github.com/neutron-org/neutron/x/interchainqueries/types" + interchaintxstypes "github.com/neutron-org/neutron/x/interchaintxs/types" + tokenfactorytypes "github.com/neutron-org/neutron/x/tokenfactory/types" + builderkeeper "github.com/skip-mev/pob/x/builder/keeper" + buildertypes "github.com/skip-mev/pob/x/builder/types" ) func CreateUpgradeHandler( mm *module.Manager, configurator module.Configurator, keepers *upgrades.UpgradeKeepers, - _ upgrades.StoreKeys, - _ codec.Codec, + storeKeys upgrades.StoreKeys, + codec codec.Codec, ) upgradetypes.UpgradeHandler { return func(ctx sdk.Context, plan upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) { ctx.Logger().Info("Starting module migrations...") @@ -30,36 +44,203 @@ func CreateUpgradeHandler( return vm, err } + ctx.Logger().Info("Migrating channel capability...") + // https://github.com/cosmos/ibc-go/blob/v7.0.1/docs/migrations/v5-to-v6.md#upgrade-proposal + if err := v6.MigrateICS27ChannelCapability(ctx, codec, storeKeys.GetKey(capabilitytypes.StoreKey), keepers.CapabilityKeeper, interchaintxstypes.ModuleName); err != nil { + return nil, err + } + + ctx.Logger().Info("Migrating cron module parameters...") + if err := migrateCronParams(ctx, keepers.ParamsKeeper, storeKeys.GetKey(crontypes.StoreKey), codec); err != nil { + return nil, err + } + + ctx.Logger().Info("Migrating feerefunder module parameters...") + if err := migrateFeeRefunderParams(ctx, keepers.ParamsKeeper, storeKeys.GetKey(feerefundertypes.StoreKey), codec); err != nil { + return nil, err + } + + ctx.Logger().Info("Migrating tokenfactory module parameters...") + if err := migrateTokenFactoryParams(ctx, keepers.ParamsKeeper, storeKeys.GetKey(tokenfactorytypes.StoreKey), codec); err != nil { + return nil, err + } + + ctx.Logger().Info("Migrating feeburner module parameters...") + if err := migrateFeeburnerParams(ctx, keepers.ParamsKeeper, storeKeys.GetKey(feeburnertypes.StoreKey), codec); err != nil { + return nil, err + } + + ctx.Logger().Info("Migrating interchainqueries module parameters...") + if err := migrateInterchainQueriesParams(ctx, keepers.ParamsKeeper, storeKeys.GetKey(icqtypes.StoreKey), codec); err != nil { + return nil, err + } + + ctx.Logger().Info("Migrating interchaintxs module parameters...") + if err := setInterchainTxsParams(ctx, keepers.ParamsKeeper, storeKeys.GetKey(interchaintxstypes.StoreKey), codec); err != nil { + return nil, err + } + + ctx.Logger().Info("Setting pob params...") + err = setPobParams(ctx, keepers.FeeBurnerKeeper, keepers.BuilderKeeper) + if err != nil { + return nil, err + } + + ctx.Logger().Info("Setting sudo callback limit...") + err = setContractManagerParams(ctx, keepers.ContractManager) + if err != nil { + return nil, err + } + + ctx.Logger().Info("Migrating globalminfees module parameters...") err = migrateGlobalFees(ctx, keepers) if err != nil { ctx.Logger().Error("failed to migrate GlobalFees", "err", err) return vm, err } + ctx.Logger().Info("Updating ccv reward denoms...") err = migrateRewardDenoms(ctx, keepers) if err != nil { - ctx.Logger().Error("failed to migrate reward denoms", "err", err) + ctx.Logger().Error("failed to update reward denoms", "err", err) return vm, err } ctx.Logger().Info("Upgrade complete") - return vm, err + return vm, nil + } +} + +func setPobParams(ctx sdk.Context, feeBurnerKeeper *feeburnerkeeper.Keeper, builderKeeper builderkeeper.Keeper) error { + treasury := feeBurnerKeeper.GetParams(ctx).TreasuryAddress + _, data, err := bech32.DecodeAndConvert(treasury) + if err != nil { + return err + } + + builderParams := buildertypes.Params{ + MaxBundleSize: 2, + EscrowAccountAddress: data, + ReserveFee: sdk.Coin{Denom: "untrn", Amount: sdk.NewInt(1_000_000)}, + MinBidIncrement: sdk.Coin{Denom: "untrn", Amount: sdk.NewInt(1_000_000)}, + FrontRunningProtection: true, + ProposerFee: math.LegacyNewDecWithPrec(25, 2), + } + return builderKeeper.SetParams(ctx, builderParams) +} + +func setContractManagerParams(ctx sdk.Context, keeper contractmanagerkeeper.Keeper) error { + cmParams := contractmanagertypes.Params{ + SudoCallGasLimit: contractmanagertypes.DefaultSudoCallGasLimit, } + return keeper.SetParams(ctx, cmParams) +} + +func migrateCronParams(ctx sdk.Context, paramsKeepers paramskeeper.Keeper, storeKey storetypes.StoreKey, codec codec.Codec) error { + store := ctx.KVStore(storeKey) + var currParams crontypes.Params + subspace, _ := paramsKeepers.GetSubspace(crontypes.StoreKey) + subspace.GetParamSet(ctx, &currParams) + + if err := currParams.Validate(); err != nil { + return err + } + + bz := codec.MustMarshal(&currParams) + store.Set(crontypes.ParamsKey, bz) + return nil +} + +func migrateFeeRefunderParams(ctx sdk.Context, paramsKeepers paramskeeper.Keeper, storeKey storetypes.StoreKey, codec codec.Codec) error { + store := ctx.KVStore(storeKey) + var currParams feerefundertypes.Params + subspace, _ := paramsKeepers.GetSubspace(feerefundertypes.StoreKey) + subspace.GetParamSet(ctx, &currParams) + + if err := currParams.Validate(); err != nil { + return err + } + + bz := codec.MustMarshal(&currParams) + store.Set(feerefundertypes.ParamsKey, bz) + return nil +} + +func migrateTokenFactoryParams(ctx sdk.Context, paramsKeepers paramskeeper.Keeper, storeKey storetypes.StoreKey, codec codec.Codec) error { + store := ctx.KVStore(storeKey) + var currParams tokenfactorytypes.Params + subspace, _ := paramsKeepers.GetSubspace(tokenfactorytypes.StoreKey) + subspace.GetParamSet(ctx, &currParams) + currParams.DenomCreationGasConsume = 0 + + if err := currParams.Validate(); err != nil { + return err + } + + bz := codec.MustMarshal(&currParams) + store.Set(tokenfactorytypes.ParamsKey, bz) + return nil +} + +func migrateFeeburnerParams(ctx sdk.Context, paramsKeepers paramskeeper.Keeper, storeKey storetypes.StoreKey, codec codec.Codec) error { + store := ctx.KVStore(storeKey) + var currParams feeburnertypes.Params + subspace, _ := paramsKeepers.GetSubspace(feeburnertypes.StoreKey) + subspace.GetParamSet(ctx, &currParams) + + if err := currParams.Validate(); err != nil { + return err + } + + bz := codec.MustMarshal(&currParams) + store.Set(feeburnertypes.ParamsKey, bz) + return nil +} + +func migrateInterchainQueriesParams(ctx sdk.Context, paramsKeepers paramskeeper.Keeper, storeKey storetypes.StoreKey, codec codec.Codec) error { + store := ctx.KVStore(storeKey) + var currParams icqtypes.Params + subspace, _ := paramsKeepers.GetSubspace(icqtypes.StoreKey) + subspace.GetParamSet(ctx, &currParams) + + if err := currParams.Validate(); err != nil { + return err + } + + bz := codec.MustMarshal(&currParams) + store.Set(icqtypes.ParamsKey, bz) + return nil +} + +func setInterchainTxsParams(ctx sdk.Context, paramsKeepers paramskeeper.Keeper, storeKey storetypes.StoreKey, codec codec.Codec) error { + store := ctx.KVStore(storeKey) + var currParams interchaintxstypes.Params + subspace, _ := paramsKeepers.GetSubspace(interchaintxstypes.StoreKey) + subspace.GetParamSet(ctx, &currParams) + currParams.RegisterFee = interchaintxstypes.DefaultRegisterFee + + if err := currParams.Validate(); err != nil { + return err + } + + bz := codec.MustMarshal(&currParams) + store.Set(interchaintxstypes.ParamsKey, bz) + return nil } func migrateGlobalFees(ctx sdk.Context, keepers *upgrades.UpgradeKeepers) error { ctx.Logger().Info("Implementing GlobalFee Params...") if !keepers.GlobalFeeSubspace.Has(ctx, types.ParamStoreKeyMinGasPrices) { - return errors.New("minimum_gas_prices param not found") + return fmt.Errorf("minimum_gas_prices param not found") } if !keepers.GlobalFeeSubspace.Has(ctx, types.ParamStoreKeyBypassMinFeeMsgTypes) { - return errors.New("bypass_min_fee_msg_types param not found") + return fmt.Errorf("bypass_min_fee_msg_types param not found") } if !keepers.GlobalFeeSubspace.Has(ctx, types.ParamStoreKeyMaxTotalBypassMinFeeMsgGasUsage) { - return errors.New("max_total_bypass_min_fee_msg_gas_usage param not found") + return fmt.Errorf("max_total_bypass_min_fee_msg_gas_usage param not found") } // global fee is empty set, set global fee to equal to 0.05 USD (for 200k of gas) in appropriate coin @@ -96,7 +277,7 @@ func migrateRewardDenoms(ctx sdk.Context, keepers *upgrades.UpgradeKeepers) erro ctx.Logger().Info("Migrating reword denoms...") if !keepers.CcvConsumerSubspace.Has(ctx, ccvconsumertypes.KeyRewardDenoms) { - return errors.New("key_reward_denoms param not found") + return fmt.Errorf("key_reward_denoms param not found") } var denoms []string diff --git a/app/upgrades/nextupgrade/upgrades_test.go b/app/upgrades/nextupgrade/upgrades_test.go index 4a056b036..07fb6ea7d 100644 --- a/app/upgrades/nextupgrade/upgrades_test.go +++ b/app/upgrades/nextupgrade/upgrades_test.go @@ -1,6 +1,12 @@ package nextupgrade_test import ( + crontypes "github.com/neutron-org/neutron/x/cron/types" + feeburnertypes "github.com/neutron-org/neutron/x/feeburner/types" + feerefundertypes "github.com/neutron-org/neutron/x/feerefunder/types" + icqtypes "github.com/neutron-org/neutron/x/interchainqueries/types" + interchaintxstypes "github.com/neutron-org/neutron/x/interchaintxs/types" + tokenfactorytypes "github.com/neutron-org/neutron/x/tokenfactory/types" "testing" "github.com/neutron-org/neutron/app/params" @@ -20,12 +26,42 @@ import ( type UpgradeTestSuite struct { testutil.IBCConnectionTestSuite + ctx sdk.Context } func TestKeeperTestSuite(t *testing.T) { suite.Run(t, new(UpgradeTestSuite)) } +func (suite *UpgradeTestSuite) SetupTest() { + suite.IBCConnectionTestSuite.SetupTest() + app := suite.GetNeutronZoneApp(suite.ChainA) + ctx := suite.ChainA.GetContext() + subspace, _ := app.ParamsKeeper.GetSubspace(crontypes.StoreKey) + pcron := crontypes.DefaultParams() + subspace.SetParamSet(ctx, &pcron) + + subspace, _ = app.ParamsKeeper.GetSubspace(feeburnertypes.StoreKey) + p := feeburnertypes.NewParams(feeburnertypes.DefaultNeutronDenom, "neutron17dtl0mjt3t77kpuhg2edqzjpszulwhgzcdvagh") + subspace.SetParamSet(ctx, &p) + + subspace, _ = app.ParamsKeeper.GetSubspace(feerefundertypes.StoreKey) + pFeeRefunder := feerefundertypes.DefaultParams() + subspace.SetParamSet(ctx, &pFeeRefunder) + + subspace, _ = app.ParamsKeeper.GetSubspace(tokenfactorytypes.StoreKey) + pTokenfactory := tokenfactorytypes.DefaultParams() + subspace.SetParamSet(ctx, &pTokenfactory) + + subspace, _ = app.ParamsKeeper.GetSubspace(icqtypes.StoreKey) + pICQTypes := icqtypes.DefaultParams() + subspace.SetParamSet(ctx, &pICQTypes) + + subspace, _ = app.ParamsKeeper.GetSubspace(interchaintxstypes.StoreKey) + pICAtx := interchaintxstypes.DefaultParams() + subspace.SetParamSet(ctx, &pICAtx) +} + func (suite *UpgradeTestSuite) TestGlobalFeesUpgrade() { var ( app = suite.GetNeutronZoneApp(suite.ChainA) diff --git a/app/upgrades/sdk47/constants.go b/app/upgrades/sdk47/constants.go deleted file mode 100644 index d92b1e06f..000000000 --- a/app/upgrades/sdk47/constants.go +++ /dev/null @@ -1,15 +0,0 @@ -package sdk47 - -import ( - "github.com/neutron-org/neutron/app/upgrades" -) - -const ( - // UpgradeName defines the on-chain upgrades name. - UpgradeName = "cosmos-sdk47" -) - -var Upgrade = upgrades.Upgrade{ - UpgradeName: UpgradeName, - CreateUpgradeHandler: CreateUpgradeHandler, -} diff --git a/app/upgrades/sdk47/upgrades.go b/app/upgrades/sdk47/upgrades.go deleted file mode 100644 index 0c4b81cf6..000000000 --- a/app/upgrades/sdk47/upgrades.go +++ /dev/null @@ -1,210 +0,0 @@ -package sdk47 - -import ( - "cosmossdk.io/math" - "github.com/cosmos/cosmos-sdk/codec" - storetypes "github.com/cosmos/cosmos-sdk/store/types" - sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/types/bech32" - "github.com/cosmos/cosmos-sdk/types/module" - capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" - paramskeeper "github.com/cosmos/cosmos-sdk/x/params/keeper" - upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - v6 "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/migrations/v6" - "github.com/neutron-org/neutron/app/upgrades" - contractmanagerkeeper "github.com/neutron-org/neutron/x/contractmanager/keeper" - contractmanagertypes "github.com/neutron-org/neutron/x/contractmanager/types" - crontypes "github.com/neutron-org/neutron/x/cron/types" - feeburnerkeeper "github.com/neutron-org/neutron/x/feeburner/keeper" - feeburnertypes "github.com/neutron-org/neutron/x/feeburner/types" - feerefundertypes "github.com/neutron-org/neutron/x/feerefunder/types" - icqtypes "github.com/neutron-org/neutron/x/interchainqueries/types" - interchaintxstypes "github.com/neutron-org/neutron/x/interchaintxs/types" - tokenfactorytypes "github.com/neutron-org/neutron/x/tokenfactory/types" - builderkeeper "github.com/skip-mev/pob/x/builder/keeper" - buildertypes "github.com/skip-mev/pob/x/builder/types" -) - -func CreateUpgradeHandler( - mm *module.Manager, - configurator module.Configurator, - keepers *upgrades.UpgradeKeepers, - storeKeys upgrades.StoreKeys, - codec codec.Codec, -) upgradetypes.UpgradeHandler { - return func(ctx sdk.Context, plan upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) { - ctx.Logger().Info("Starting module migrations...") - vm, err := mm.RunMigrations(ctx, configurator, vm) - if err != nil { - return vm, err - } - - ctx.Logger().Info("Migrating channel capability...") - // https://github.com/cosmos/ibc-go/blob/v7.0.1/docs/migrations/v5-to-v6.md#upgrade-proposal - if err := v6.MigrateICS27ChannelCapability(ctx, codec, storeKeys.GetKey(capabilitytypes.StoreKey), keepers.CapabilityKeeper, interchaintxstypes.ModuleName); err != nil { - return nil, err - } - - ctx.Logger().Info("Migrating cron module parameters...") - if err := migrateCronParams(ctx, keepers.ParamsKeeper, storeKeys.GetKey(crontypes.StoreKey), codec); err != nil { - return nil, err - } - - ctx.Logger().Info("Migrating feerefunder module parameters...") - if err := migrateFeeRefunderParams(ctx, keepers.ParamsKeeper, storeKeys.GetKey(feerefundertypes.StoreKey), codec); err != nil { - return nil, err - } - - ctx.Logger().Info("Migrating tokenfactory module parameters...") - if err := migrateTokenFactoryParams(ctx, keepers.ParamsKeeper, storeKeys.GetKey(tokenfactorytypes.StoreKey), codec); err != nil { - return nil, err - } - - ctx.Logger().Info("Migrating feeburner module parameters...") - if err := migrateFeeburnerParams(ctx, keepers.ParamsKeeper, storeKeys.GetKey(feeburnertypes.StoreKey), codec); err != nil { - return nil, err - } - - ctx.Logger().Info("Migrating interchainqueries module parameters...") - if err := migrateInterchainQueriesParams(ctx, keepers.ParamsKeeper, storeKeys.GetKey(icqtypes.StoreKey), codec); err != nil { - return nil, err - } - - ctx.Logger().Info("Migrating interchaintxs module parameters...") - if err := migrateInterchainTxsParams(ctx, keepers.ParamsKeeper, storeKeys.GetKey(interchaintxstypes.StoreKey), codec); err != nil { - return nil, err - } - - ctx.Logger().Info("Setting pob params...") - err = setPobParams(ctx, keepers.FeeBurnerKeeper, keepers.BuilderKeeper) - if err != nil { - return nil, err - } - - ctx.Logger().Info("Setting sudo callback limit...") - err = setContractManagerParams(ctx, keepers.ContractManager) - if err != nil { - return nil, err - } - - ctx.Logger().Info("Upgrade complete") - return vm, nil - } -} - -func setPobParams(ctx sdk.Context, feeBurnerKeeper *feeburnerkeeper.Keeper, builderKeeper builderkeeper.Keeper) error { - treasury := feeBurnerKeeper.GetParams(ctx).TreasuryAddress - _, data, err := bech32.DecodeAndConvert(treasury) - if err != nil { - return err - } - - builderParams := buildertypes.Params{ - MaxBundleSize: 2, - EscrowAccountAddress: data, - ReserveFee: sdk.Coin{Denom: "untrn", Amount: sdk.NewInt(1_000_000)}, - MinBidIncrement: sdk.Coin{Denom: "untrn", Amount: sdk.NewInt(1_000_000)}, - FrontRunningProtection: true, - ProposerFee: math.LegacyNewDecWithPrec(25, 2), - } - return builderKeeper.SetParams(ctx, builderParams) -} - -func setContractManagerParams(ctx sdk.Context, keeper contractmanagerkeeper.Keeper) error { - cmParams := contractmanagertypes.Params{ - SudoCallGasLimit: contractmanagertypes.DefaultSudoCallGasLimit, - } - return keeper.SetParams(ctx, cmParams) -} - -func migrateCronParams(ctx sdk.Context, paramsKeepers paramskeeper.Keeper, storeKey storetypes.StoreKey, codec codec.Codec) error { - store := ctx.KVStore(storeKey) - var currParams crontypes.Params - subspace, _ := paramsKeepers.GetSubspace(crontypes.StoreKey) - subspace.GetParamSet(ctx, &currParams) - - if err := currParams.Validate(); err != nil { - return err - } - - bz := codec.MustMarshal(&currParams) - store.Set(crontypes.ParamsKey, bz) - return nil -} - -func migrateFeeRefunderParams(ctx sdk.Context, paramsKeepers paramskeeper.Keeper, storeKey storetypes.StoreKey, codec codec.Codec) error { - store := ctx.KVStore(storeKey) - var currParams feerefundertypes.Params - subspace, _ := paramsKeepers.GetSubspace(feerefundertypes.StoreKey) - subspace.GetParamSet(ctx, &currParams) - - if err := currParams.Validate(); err != nil { - return err - } - - bz := codec.MustMarshal(&currParams) - store.Set(feerefundertypes.ParamsKey, bz) - return nil -} - -func migrateTokenFactoryParams(ctx sdk.Context, paramsKeepers paramskeeper.Keeper, storeKey storetypes.StoreKey, codec codec.Codec) error { - store := ctx.KVStore(storeKey) - var currParams tokenfactorytypes.Params - subspace, _ := paramsKeepers.GetSubspace(tokenfactorytypes.StoreKey) - subspace.GetParamSet(ctx, &currParams) - currParams.DenomCreationGasConsume = 0 - - if err := currParams.Validate(); err != nil { - return err - } - - bz := codec.MustMarshal(&currParams) - store.Set(tokenfactorytypes.ParamsKey, bz) - return nil -} - -func migrateFeeburnerParams(ctx sdk.Context, paramsKeepers paramskeeper.Keeper, storeKey storetypes.StoreKey, codec codec.Codec) error { - store := ctx.KVStore(storeKey) - var currParams feeburnertypes.Params - subspace, _ := paramsKeepers.GetSubspace(feeburnertypes.StoreKey) - subspace.GetParamSet(ctx, &currParams) - - if err := currParams.Validate(); err != nil { - return err - } - - bz := codec.MustMarshal(&currParams) - store.Set(feeburnertypes.ParamsKey, bz) - return nil -} - -func migrateInterchainQueriesParams(ctx sdk.Context, paramsKeepers paramskeeper.Keeper, storeKey storetypes.StoreKey, codec codec.Codec) error { - store := ctx.KVStore(storeKey) - var currParams icqtypes.Params - subspace, _ := paramsKeepers.GetSubspace(icqtypes.StoreKey) - subspace.GetParamSet(ctx, &currParams) - - if err := currParams.Validate(); err != nil { - return err - } - - bz := codec.MustMarshal(&currParams) - store.Set(icqtypes.ParamsKey, bz) - return nil -} - -func migrateInterchainTxsParams(ctx sdk.Context, paramsKeepers paramskeeper.Keeper, storeKey storetypes.StoreKey, codec codec.Codec) error { - store := ctx.KVStore(storeKey) - var currParams interchaintxstypes.Params - subspace, _ := paramsKeepers.GetSubspace(interchaintxstypes.StoreKey) - subspace.GetParamSet(ctx, &currParams) - currParams.RegisterFee = interchaintxstypes.DefaultRegisterFee - - if err := currParams.Validate(); err != nil { - return err - } - - bz := codec.MustMarshal(&currParams) - store.Set(interchaintxstypes.ParamsKey, bz) - return nil -} diff --git a/wasmbinding/message_plugin.go b/wasmbinding/message_plugin.go index 1b1017b20..a130dae31 100644 --- a/wasmbinding/message_plugin.go +++ b/wasmbinding/message_plugin.go @@ -310,7 +310,7 @@ func (m *CustomMessenger) submitAdminProposal(ctx sdk.Context, contractAddr sdk. if err != nil { return nil, nil, errors.Wrap(err, "invalid proposal quantity") } - // here we handle pre-sdk47 style of proposals: param change, upgrade, client update + // here we handle pre-nextupgrade style of proposals: param change, upgrade, client update if m.isLegacyProposal(adminProposal) { resp, err := m.performSubmitAdminProposalLegacy(ctx, contractAddr, adminProposal) if err != nil { diff --git a/x/interchaintxs/types/params.go b/x/interchaintxs/types/params.go index 7a9f54638..8c9ad0e9f 100644 --- a/x/interchaintxs/types/params.go +++ b/x/interchaintxs/types/params.go @@ -17,6 +17,16 @@ var ( DefaultRegisterFee = sdk.NewCoins(sdk.NewCoin(params.DefaultDenom, sdk.NewInt(1000))) ) +func ParamKeyTable() paramtypes.KeyTable { + return paramtypes.NewKeyTable( + paramtypes.NewParamSetPair( + KeyMsgSubmitTxMaxMessages, + DefaultMsgSubmitTxMaxMessages, + validateMsgSubmitTxMaxMessages, + ), + ) +} + // NewParams creates a new Params instance func NewParams(msgSubmitTxMaxMessages uint64, registerFee sdk.Coins) Params { return Params{ From 2bcd25a62b73e505bb1efaf5e7072049ec85fb30 Mon Sep 17 00:00:00 2001 From: swelf Date: Wed, 20 Sep 2023 18:51:26 +0300 Subject: [PATCH 137/307] linter fixes --- app/app.go | 52 +++++++++---------- app/upgrades/nextupgrade/upgrades.go | 4 +- app/upgrades/nextupgrade/upgrades_test.go | 4 +- cmd/neutrond/root.go | 4 +- .../contractmanager/keeper/contractmanager.go | 3 +- testutil/cron/keeper/cron.go | 3 +- testutil/feeburner/keeper/feeburner.go | 3 +- testutil/feerefunder/keeper/fee.go | 3 +- .../keeper/interchainqueries.go | 3 +- .../interchaintxs/keeper/interchaintxs.go | 6 ++- .../interchaintxs/keeper/sudo_middleware.go | 5 +- wasmbinding/test/custom_message_test.go | 6 ++- wasmbinding/wasm.go | 3 +- x/contractmanager/genesis_test.go | 4 +- x/contractmanager/ibc_middleware.go | 5 +- x/contractmanager/ibc_middleware_test.go | 3 +- x/cron/module_simulation.go | 2 +- x/feeburner/module_simulation.go | 2 +- x/interchainqueries/module_simulation.go | 2 +- x/interchainqueries/types/tx.go | 6 ++- x/interchaintxs/keeper/ibc_handlers.go | 6 ++- x/interchaintxs/keeper/ibc_handlers_test.go | 4 +- x/interchaintxs/keeper/keeper.go | 4 +- x/interchaintxs/keeper/msg_server_test.go | 5 +- x/interchaintxs/module_simulation.go | 2 +- x/interchaintxs/types/params.go | 1 + x/tokenfactory/keeper/createdenom.go | 7 +-- x/tokenfactory/keeper/genesis.go | 5 +- x/tokenfactory/keeper/grpc_query.go | 2 +- x/tokenfactory/types/msgs.go | 2 +- x/tokenfactory/types/params.go | 10 ++-- x/transfer/ibc_handlers_test.go | 3 +- 32 files changed, 102 insertions(+), 72 deletions(-) diff --git a/app/app.go b/app/app.go index 2194e8f09..f4421740d 100644 --- a/app/app.go +++ b/app/app.go @@ -217,7 +217,7 @@ var ( buildertypes.ModuleName: nil, ibctransfertypes.ModuleName: {authtypes.Minter, authtypes.Burner}, icatypes.ModuleName: nil, - wasm.ModuleName: {authtypes.Burner}, + wasmtypes.ModuleName: {authtypes.Burner}, interchainqueriesmoduletypes.ModuleName: nil, feetypes.ModuleName: nil, feeburnertypes.ModuleName: nil, @@ -307,7 +307,7 @@ type App struct { ConsensusParamsKeeper consensusparamkeeper.Keeper - WasmKeeper wasm.Keeper + WasmKeeper wasmkeeper.Keeper // mm is the module manager mm *module.Manager @@ -347,30 +347,30 @@ func New( invCheckPeriod uint, encodingConfig appparams.EncodingConfig, appOpts servertypes.AppOptions, - wasmOpts []wasm.Option, + wasmOpts []wasmkeeper.Option, baseAppOptions ...func(*baseapp.BaseApp), ) *App { appCodec := encodingConfig.Marshaler legacyAmino := encodingConfig.Amino interfaceRegistry := encodingConfig.InterfaceRegistry - config := mempool.NewDefaultAuctionFactory(encodingConfig.TxConfig.TxDecoder()) + cfg := mempool.NewDefaultAuctionFactory(encodingConfig.TxConfig.TxDecoder()) // 0 - unlimited amount of txs maxTx := 0 - mempool := mempool.NewAuctionMempool(encodingConfig.TxConfig.TxDecoder(), encodingConfig.TxConfig.TxEncoder(), maxTx, config) + memPool := mempool.NewAuctionMempool(encodingConfig.TxConfig.TxDecoder(), encodingConfig.TxConfig.TxEncoder(), maxTx, cfg) bApp := baseapp.NewBaseApp(Name, logger, db, encodingConfig.TxConfig.TxDecoder(), baseAppOptions...) bApp.SetCommitMultiStoreTracer(traceStore) bApp.SetVersion(version.Version) bApp.SetInterfaceRegistry(interfaceRegistry) - bApp.SetMempool(mempool) + bApp.SetMempool(memPool) keys := sdk.NewKVStoreKeys( authzkeeper.StoreKey, authtypes.StoreKey, banktypes.StoreKey, slashingtypes.StoreKey, paramstypes.StoreKey, ibchost.StoreKey, upgradetypes.StoreKey, feegrant.StoreKey, evidencetypes.StoreKey, ibctransfertypes.StoreKey, icacontrollertypes.StoreKey, icahosttypes.StoreKey, capabilitytypes.StoreKey, - interchainqueriesmoduletypes.StoreKey, contractmanagermoduletypes.StoreKey, interchaintxstypes.StoreKey, wasm.StoreKey, feetypes.StoreKey, + interchainqueriesmoduletypes.StoreKey, contractmanagermoduletypes.StoreKey, interchaintxstypes.StoreKey, wasmtypes.StoreKey, feetypes.StoreKey, feeburnertypes.StoreKey, adminmoduletypes.StoreKey, ccvconsumertypes.StoreKey, tokenfactorytypes.StoreKey, routertypes.StoreKey, crontypes.StoreKey, ibchookstypes.StoreKey, consensusparamtypes.StoreKey, crisistypes.StoreKey, buildertypes.StoreKey, ) @@ -403,7 +403,7 @@ func New( scopedICAControllerKeeper := app.CapabilityKeeper.ScopeToModule(icacontrollertypes.SubModuleName) scopedICAHostKeeper := app.CapabilityKeeper.ScopeToModule(icahosttypes.SubModuleName) scopedTransferKeeper := app.CapabilityKeeper.ScopeToModule(ibctransfertypes.ModuleName) - scopedWasmKeeper := app.CapabilityKeeper.ScopeToModule(wasm.ModuleName) + scopedWasmKeeper := app.CapabilityKeeper.ScopeToModule(wasmtypes.ModuleName) scopedInterTxKeeper := app.CapabilityKeeper.ScopeToModule(interchaintxstypes.ModuleName) scopedCCVConsumerKeeper := app.CapabilityKeeper.ScopeToModule(ccvconsumertypes.ModuleName) @@ -598,7 +598,7 @@ func New( wasmDir := filepath.Join(homePath, "wasm") wasmConfig, err := wasm.ReadWasmConfig(appOpts) if err != nil { - panic(fmt.Sprintf("error while reading wasm config: %s", err)) + panic(fmt.Sprintf("error while reading wasm cfg: %s", err)) } // The last arguments can contain custom message handlers, and custom query handlers, @@ -657,9 +657,9 @@ func New( &wasmkeeper.QueryPlugins{Stargate: wasmkeeper.AcceptListStargateQuerier(wasmbinding.AcceptedStargateQueries(), app.GRPCQueryRouter(), appCodec)}) wasmOpts = append(wasmOpts, queryPlugins) - app.WasmKeeper = wasm.NewKeeper( + app.WasmKeeper = wasmkeeper.NewKeeper( appCodec, - keys[wasm.StoreKey], + keys[wasmtypes.StoreKey], app.AccountKeeper, &app.BankKeeper, nil, @@ -721,7 +721,7 @@ func New( AddRoute(icahosttypes.SubModuleName, icaHostIBCModule). AddRoute(ibctransfertypes.ModuleName, ibcStack). AddRoute(interchaintxstypes.ModuleName, icaControllerStack). - AddRoute(wasm.ModuleName, wasm.NewIBCHandler(app.WasmKeeper, app.IBCKeeper.ChannelKeeper, app.IBCKeeper.ChannelKeeper)). + AddRoute(wasmtypes.ModuleName, wasm.NewIBCHandler(app.WasmKeeper, app.IBCKeeper.ChannelKeeper, app.IBCKeeper.ChannelKeeper)). AddRoute(ccvconsumertypes.ModuleName, consumerModule) app.IBCKeeper.SetRouter(ibcRouter) @@ -792,7 +792,7 @@ func New( interchainqueriesmoduletypes.ModuleName, interchaintxstypes.ModuleName, contractmanagermoduletypes.ModuleName, - wasm.ModuleName, + wasmtypes.ModuleName, feetypes.ModuleName, feeburnertypes.ModuleName, adminmoduletypes.ModuleName, @@ -823,7 +823,7 @@ func New( interchainqueriesmoduletypes.ModuleName, interchaintxstypes.ModuleName, contractmanagermoduletypes.ModuleName, - wasm.ModuleName, + wasmtypes.ModuleName, feetypes.ModuleName, feeburnertypes.ModuleName, adminmoduletypes.ModuleName, @@ -859,7 +859,7 @@ func New( interchainqueriesmoduletypes.ModuleName, interchaintxstypes.ModuleName, contractmanagermoduletypes.ModuleName, - wasm.ModuleName, + wasmtypes.ModuleName, feetypes.ModuleName, feeburnertypes.ModuleName, adminmoduletypes.ModuleName, @@ -918,10 +918,10 @@ func New( }, IBCKeeper: app.IBCKeeper, WasmConfig: &wasmConfig, - TXCounterStoreKey: keys[wasm.StoreKey], + TXCounterStoreKey: keys[wasmtypes.StoreKey], ConsumerKeeper: app.ConsumerKeeper, buildKeeper: app.BuilderKeeper, - mempool: mempool, + mempool: memPool, GlobalFeeSubspace: app.GetSubspace(globalfee.ModuleName), }, app.Logger(), @@ -934,7 +934,7 @@ func New( app.SetEndBlocker(app.EndBlocker) handler := proposalhandler.NewProposalHandler( - mempool, + memPool, bApp.Logger(), anteHandler, encodingConfig.TxConfig.TxEncoder(), @@ -946,7 +946,7 @@ func New( checkTxHandler := proposalhandler.NewCheckTxHandler( app.BaseApp, encodingConfig.TxConfig.TxDecoder(), - mempool, + memPool, anteHandler, chainID, ) @@ -989,25 +989,25 @@ func New( func (app *App) setupUpgradeStoreLoaders() { upgradeInfo, err := app.UpgradeKeeper.ReadUpgradeInfoFromDisk() if err != nil { - panic(fmt.Sprintf("failed to read upgrade info from disk %s", err)) + panic(fmt.Sprintf("failed to read upgrd info from disk %s", err)) } if app.UpgradeKeeper.IsSkipHeight(upgradeInfo.Height) { return } - for _, upgrade := range Upgrades { - if upgradeInfo.Name == upgrade.UpgradeName { - app.SetStoreLoader(upgradetypes.UpgradeStoreLoader(upgradeInfo.Height, &upgrade.StoreUpgrades)) + for _, upgrd := range Upgrades { + if upgradeInfo.Name == upgrd.UpgradeName { + app.SetStoreLoader(upgradetypes.UpgradeStoreLoader(upgradeInfo.Height, &upgrd.StoreUpgrades)) } } } func (app *App) setupUpgradeHandlers() { - for _, upgrade := range Upgrades { + for _, upgrd := range Upgrades { app.UpgradeKeeper.SetUpgradeHandler( - upgrade.UpgradeName, - upgrade.CreateUpgradeHandler( + upgrd.UpgradeName, + upgrd.CreateUpgradeHandler( app.mm, app.configurator, &upgrades.UpgradeKeepers{ diff --git a/app/upgrades/nextupgrade/upgrades.go b/app/upgrades/nextupgrade/upgrades.go index eeb484e9a..0b6334df7 100644 --- a/app/upgrades/nextupgrade/upgrades.go +++ b/app/upgrades/nextupgrade/upgrades.go @@ -1,8 +1,10 @@ package nextupgrade import ( - "cosmossdk.io/math" "fmt" + + "cosmossdk.io/math" + "github.com/cosmos/cosmos-sdk/codec" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/app/upgrades/nextupgrade/upgrades_test.go b/app/upgrades/nextupgrade/upgrades_test.go index 07fb6ea7d..55d5fd6a2 100644 --- a/app/upgrades/nextupgrade/upgrades_test.go +++ b/app/upgrades/nextupgrade/upgrades_test.go @@ -1,13 +1,14 @@ package nextupgrade_test import ( + "testing" + crontypes "github.com/neutron-org/neutron/x/cron/types" feeburnertypes "github.com/neutron-org/neutron/x/feeburner/types" feerefundertypes "github.com/neutron-org/neutron/x/feerefunder/types" icqtypes "github.com/neutron-org/neutron/x/interchainqueries/types" interchaintxstypes "github.com/neutron-org/neutron/x/interchaintxs/types" tokenfactorytypes "github.com/neutron-org/neutron/x/tokenfactory/types" - "testing" "github.com/neutron-org/neutron/app/params" @@ -26,7 +27,6 @@ import ( type UpgradeTestSuite struct { testutil.IBCConnectionTestSuite - ctx sdk.Context } func TestKeeperTestSuite(t *testing.T) { diff --git a/cmd/neutrond/root.go b/cmd/neutrond/root.go index 8f5f651a5..7674d3652 100644 --- a/cmd/neutrond/root.go +++ b/cmd/neutrond/root.go @@ -225,7 +225,7 @@ func (ac appCreator) newApp( if err != nil { panic(err) } - var wasmOpts []wasm.Option + var wasmOpts []wasmkeeper.Option if cast.ToBool(appOpts.Get("telemetry.enabled")) { wasmOpts = append(wasmOpts, wasmkeeper.WithVMCacheMetrics(prometheus.DefaultRegisterer)) } @@ -287,7 +287,7 @@ func (ac appCreator) appExport( } loadLatest := height == -1 - var emptyWasmOpts []wasm.Option + var emptyWasmOpts []wasmkeeper.Option interchainapp = app.New( logger, chainID, diff --git a/testutil/contractmanager/keeper/contractmanager.go b/testutil/contractmanager/keeper/contractmanager.go index 9ef0b75ec..f23aa3282 100644 --- a/testutil/contractmanager/keeper/contractmanager.go +++ b/testutil/contractmanager/keeper/contractmanager.go @@ -1,9 +1,10 @@ package keeper import ( + "testing" + adminmoduletypes "github.com/cosmos/admin-module/x/adminmodule/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - "testing" tmdb "github.com/cometbft/cometbft-db" "github.com/cometbft/cometbft/libs/log" diff --git a/testutil/cron/keeper/cron.go b/testutil/cron/keeper/cron.go index 85fc35392..04987958c 100644 --- a/testutil/cron/keeper/cron.go +++ b/testutil/cron/keeper/cron.go @@ -1,9 +1,10 @@ package keeper import ( + "testing" + adminmoduletypes "github.com/cosmos/admin-module/x/adminmodule/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - "testing" tmdb "github.com/cometbft/cometbft-db" "github.com/cometbft/cometbft/libs/log" diff --git a/testutil/feeburner/keeper/feeburner.go b/testutil/feeburner/keeper/feeburner.go index 71f1e9e1c..c5e0c51b9 100644 --- a/testutil/feeburner/keeper/feeburner.go +++ b/testutil/feeburner/keeper/feeburner.go @@ -1,9 +1,10 @@ package keeper import ( + "testing" + adminmoduletypes "github.com/cosmos/admin-module/x/adminmodule/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - "testing" tmdb "github.com/cometbft/cometbft-db" "github.com/cometbft/cometbft/libs/log" diff --git a/testutil/feerefunder/keeper/fee.go b/testutil/feerefunder/keeper/fee.go index d6ecd9a85..71de9bb33 100644 --- a/testutil/feerefunder/keeper/fee.go +++ b/testutil/feerefunder/keeper/fee.go @@ -1,9 +1,10 @@ package keeper import ( + "testing" + adminmoduletypes "github.com/cosmos/admin-module/x/adminmodule/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - "testing" tmdb "github.com/cometbft/cometbft-db" "github.com/cometbft/cometbft/libs/log" diff --git a/testutil/interchainqueries/keeper/interchainqueries.go b/testutil/interchainqueries/keeper/interchainqueries.go index c6d3cebb2..eb51ce57d 100644 --- a/testutil/interchainqueries/keeper/interchainqueries.go +++ b/testutil/interchainqueries/keeper/interchainqueries.go @@ -1,9 +1,10 @@ package keeper import ( + "testing" + adminmoduletypes "github.com/cosmos/admin-module/x/adminmodule/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - "testing" ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper" diff --git a/testutil/interchaintxs/keeper/interchaintxs.go b/testutil/interchaintxs/keeper/interchaintxs.go index 8f1c62333..83d4114c2 100644 --- a/testutil/interchaintxs/keeper/interchaintxs.go +++ b/testutil/interchaintxs/keeper/interchaintxs.go @@ -1,9 +1,10 @@ package keeper import ( + "testing" + adminmoduletypes "github.com/cosmos/admin-module/x/adminmodule/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - "testing" tmdb "github.com/cometbft/cometbft-db" "github.com/cometbft/cometbft/libs/log" @@ -26,7 +27,8 @@ func InterchainTxsKeeper( icaControllerKeeper types.ICAControllerKeeper, channelKeeper types.ChannelKeeper, bankKeeper types.BankKeeper, - feeburnerKeeper types.FeeBurnerKeeper) (*keeper.Keeper, sdk.Context) { + feeburnerKeeper types.FeeBurnerKeeper, +) (*keeper.Keeper, sdk.Context) { storeKey := sdk.NewKVStoreKey(types.StoreKey) memStoreKey := storetypes.NewMemoryStoreKey(types.MemStoreKey) diff --git a/testutil/interchaintxs/keeper/sudo_middleware.go b/testutil/interchaintxs/keeper/sudo_middleware.go index 5d586f342..8ab8742e1 100644 --- a/testutil/interchaintxs/keeper/sudo_middleware.go +++ b/testutil/interchaintxs/keeper/sudo_middleware.go @@ -1,6 +1,8 @@ package keeper import ( + "testing" + tmdb "github.com/cometbft/cometbft-db" "github.com/cometbft/cometbft/libs/log" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" @@ -10,7 +12,6 @@ import ( "github.com/neutron-org/neutron/x/contractmanager" "github.com/neutron-org/neutron/x/contractmanager/types" "github.com/stretchr/testify/require" - "testing" ) func NewSudoLimitWrapper(t testing.TB, cmKeeper types.ContractManagerKeeper, wasmKeeper types.WasmKeeper) (types.WasmKeeper, sdk.Context, *storetypes.KVStoreKey) { @@ -19,7 +20,7 @@ func NewSudoLimitWrapper(t testing.TB, cmKeeper types.ContractManagerKeeper, was stateStore := store.NewCommitMultiStore(db) stateStore.MountStoreWithDB(storeKey, storetypes.StoreTypeIAVL, db) require.NoError(t, stateStore.LoadLatestVersion()) - + limitWrapper := contractmanager.NewSudoLimitWrapper(cmKeeper, wasmKeeper) ctx := sdk.NewContext(stateStore, tmproto.Header{}, false, log.NewNopLogger()) diff --git a/wasmbinding/test/custom_message_test.go b/wasmbinding/test/custom_message_test.go index 8b6db4bf0..6008a058f 100644 --- a/wasmbinding/test/custom_message_test.go +++ b/wasmbinding/test/custom_message_test.go @@ -3,9 +3,10 @@ package test import ( "encoding/json" "fmt" + "testing" + keeper2 "github.com/neutron-org/neutron/x/contractmanager/keeper" feeburnertypes "github.com/neutron-org/neutron/x/feeburner/types" - "testing" ibcchanneltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" @@ -486,7 +487,8 @@ func (suite *CustomMessengerTestSuite) TestSoftwareUpgradeProposal() { // Craft CancelSubmitAdminProposal message msg, err = json.Marshal(bindings.NeutronMsg{ SubmitAdminProposal: &bindings.SubmitAdminProposal{ - AdminProposal: bindings.AdminProposal{ProposalExecuteMessage: &bindings.ProposalExecuteMessage{Message: executeMsg}}}, + AdminProposal: bindings.AdminProposal{ProposalExecuteMessage: &bindings.ProposalExecuteMessage{Message: executeMsg}}, + }, }) suite.NoError(err) diff --git a/wasmbinding/wasm.go b/wasmbinding/wasm.go index cdb9ec5dd..19312011f 100644 --- a/wasmbinding/wasm.go +++ b/wasmbinding/wasm.go @@ -1,7 +1,6 @@ package wasmbinding import ( - "github.com/CosmWasm/wasmd/x/wasm" wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" contractmanagerkeeper "github.com/neutron-org/neutron/x/contractmanager/keeper" @@ -39,7 +38,7 @@ func RegisterCustomPlugins( CustomMessageDecorator(ictxKeeper, icqKeeper, transfer, adminKeeper, bank, tfk, cronKeeper, contractmanagerKeeper), ) - return []wasm.Option{ + return []wasmkeeper.Option{ queryPluginOpt, messagePluginOpt, } diff --git a/x/contractmanager/genesis_test.go b/x/contractmanager/genesis_test.go index ddfa24682..e7633402a 100644 --- a/x/contractmanager/genesis_test.go +++ b/x/contractmanager/genesis_test.go @@ -1,9 +1,10 @@ package contractmanager_test import ( - "github.com/neutron-org/neutron/x/contractmanager/keeper" "testing" + "github.com/neutron-org/neutron/x/contractmanager/keeper" + channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" "github.com/stretchr/testify/require" @@ -29,6 +30,7 @@ func TestGenesis(t *testing.T) { channeltypes.Packet{ Sequence: 2, }, nil) + require.NoError(t, err) genesisState := types.GenesisState{ Params: types.DefaultParams(), diff --git a/x/contractmanager/ibc_middleware.go b/x/contractmanager/ibc_middleware.go index 739de0860..1b3370f86 100644 --- a/x/contractmanager/ibc_middleware.go +++ b/x/contractmanager/ibc_middleware.go @@ -1,8 +1,10 @@ package contractmanager import ( - "cosmossdk.io/errors" "fmt" + + "cosmossdk.io/errors" + "github.com/cometbft/cometbft/libs/log" sdk "github.com/cosmos/cosmos-sdk/types" contractmanagertypes "github.com/neutron-org/neutron/x/contractmanager/types" @@ -31,7 +33,6 @@ func (k SudoLimitWrapper) Sudo(ctx sdk.Context, contractAddress sdk.AccAddress, // Actually we have only one kind of error returned from acknowledgement // maybe later we'll retrieve actual errors from events resp, err = k.WasmKeeper.Sudo(cacheCtx, contractAddress, msg) - }() if err != nil { // the contract either returned an error or panicked with `out of gas` diff --git a/x/contractmanager/ibc_middleware_test.go b/x/contractmanager/ibc_middleware_test.go index 0815be992..991d93af7 100644 --- a/x/contractmanager/ibc_middleware_test.go +++ b/x/contractmanager/ibc_middleware_test.go @@ -2,13 +2,14 @@ package contractmanager_test import ( "fmt" + "testing" + sdk "github.com/cosmos/cosmos-sdk/types" "github.com/golang/mock/gomock" test_keeper "github.com/neutron-org/neutron/testutil/interchaintxs/keeper" mock_types "github.com/neutron-org/neutron/testutil/mocks/contractmanager/types" "github.com/neutron-org/neutron/x/contractmanager/types" "github.com/stretchr/testify/require" - "testing" ) var ( diff --git a/x/cron/module_simulation.go b/x/cron/module_simulation.go index 45f4ace31..bd9023e3e 100644 --- a/x/cron/module_simulation.go +++ b/x/cron/module_simulation.go @@ -36,7 +36,7 @@ func (AppModule) GenerateGenesisState(simState *module.SimulationState) { } // ProposalContents doesn't return any content functions for governance proposals -func (AppModule) ProposalContents(_ module.SimulationState) []simtypes.WeightedProposalContent { +func (AppModule) ProposalContents(_ module.SimulationState) []simtypes.WeightedProposalMsg { return nil } diff --git a/x/feeburner/module_simulation.go b/x/feeburner/module_simulation.go index 7eefd95cb..80ab87783 100644 --- a/x/feeburner/module_simulation.go +++ b/x/feeburner/module_simulation.go @@ -39,7 +39,7 @@ func (AppModule) GenerateGenesisState(simState *module.SimulationState) { } // ProposalContents doesn't return any content functions for governance proposals -func (AppModule) ProposalContents(_ module.SimulationState) []simtypes.WeightedProposalContent { +func (AppModule) ProposalContents(_ module.SimulationState) []simtypes.WeightedProposalMsg { return nil } diff --git a/x/interchainqueries/module_simulation.go b/x/interchainqueries/module_simulation.go index 55cef2305..51af522ef 100644 --- a/x/interchainqueries/module_simulation.go +++ b/x/interchainqueries/module_simulation.go @@ -35,7 +35,7 @@ func (AppModule) GenerateGenesisState(simState *module.SimulationState) { } // ProposalContents doesn't return any content functions for governance proposals -func (AppModule) ProposalContents(_ module.SimulationState) []simtypes.WeightedProposalContent { +func (AppModule) ProposalContents(_ module.SimulationState) []simtypes.WeightedProposalMsg { return nil } diff --git a/x/interchainqueries/types/tx.go b/x/interchainqueries/types/tx.go index bb698bf83..eafe7de7d 100644 --- a/x/interchainqueries/types/tx.go +++ b/x/interchainqueries/types/tx.go @@ -15,8 +15,10 @@ const ( MaxKVQueryKeysCount = 32 ) -var _ sdk.Msg = &MsgSubmitQueryResult{} -var _ codectypes.UnpackInterfacesMessage = MsgSubmitQueryResult{} +var ( + _ sdk.Msg = &MsgSubmitQueryResult{} + _ codectypes.UnpackInterfacesMessage = MsgSubmitQueryResult{} +) func (msg MsgSubmitQueryResult) Route() string { return RouterKey diff --git a/x/interchaintxs/keeper/ibc_handlers.go b/x/interchaintxs/keeper/ibc_handlers.go index 1540a8c9a..f9aacea39 100644 --- a/x/interchaintxs/keeper/ibc_handlers.go +++ b/x/interchaintxs/keeper/ibc_handlers.go @@ -1,9 +1,10 @@ package keeper import ( - "github.com/neutron-org/neutron/x/contractmanager/keeper" "time" + "github.com/neutron-org/neutron/x/contractmanager/keeper" + "cosmossdk.io/errors" "github.com/cosmos/cosmos-sdk/telemetry" @@ -100,6 +101,9 @@ func (k *Keeper) HandleChanOpenAck( CounterpartyChannelID: counterpartyChannelID, CounterpartyVersion: counterpartyVersion, }) + if err != nil { + return errors.Wrapf(sdkerrors.ErrJSONMarshal, "failed to marshal OpenAckDetails: %v", err) + } _, err = k.sudoKeeper.Sudo(ctx, icaOwner.GetContract(), payload) if err != nil { diff --git a/x/interchaintxs/keeper/ibc_handlers_test.go b/x/interchaintxs/keeper/ibc_handlers_test.go index c0a8c40b6..d6fd0d88b 100644 --- a/x/interchaintxs/keeper/ibc_handlers_test.go +++ b/x/interchaintxs/keeper/ibc_handlers_test.go @@ -2,9 +2,10 @@ package keeper_test import ( "fmt" - "github.com/neutron-org/neutron/x/contractmanager/keeper" "testing" + "github.com/neutron-org/neutron/x/contractmanager/keeper" + sdk "github.com/cosmos/cosmos-sdk/types" icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" @@ -105,7 +106,6 @@ func TestHandleTimeout(t *testing.T) { wmKeeper.EXPECT().Sudo(ctx, contractAddress, msgAck).Return(nil, fmt.Errorf("SudoTimeout error")) err = icak.HandleTimeout(ctx, p, relayerAddress) require.NoError(t, err) - } func TestHandleChanOpenAck(t *testing.T) { diff --git a/x/interchaintxs/keeper/keeper.go b/x/interchaintxs/keeper/keeper.go index 43e909e7d..fe13695f3 100644 --- a/x/interchaintxs/keeper/keeper.go +++ b/x/interchaintxs/keeper/keeper.go @@ -1,8 +1,10 @@ package keeper import ( - "cosmossdk.io/errors" "fmt" + + "cosmossdk.io/errors" + sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/cometbft/cometbft/libs/log" diff --git a/x/interchaintxs/keeper/msg_server_test.go b/x/interchaintxs/keeper/msg_server_test.go index 635464474..bbb3d8d04 100644 --- a/x/interchaintxs/keeper/msg_server_test.go +++ b/x/interchaintxs/keeper/msg_server_test.go @@ -2,11 +2,12 @@ package keeper_test import ( "fmt" - "github.com/neutron-org/neutron/app/params" - feeburnertypes "github.com/neutron-org/neutron/x/feeburner/types" "testing" "time" + "github.com/neutron-org/neutron/app/params" + feeburnertypes "github.com/neutron-org/neutron/x/feeburner/types" + icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" feerefundertypes "github.com/neutron-org/neutron/x/feerefunder/types" "github.com/neutron-org/neutron/x/interchaintxs/keeper" diff --git a/x/interchaintxs/module_simulation.go b/x/interchaintxs/module_simulation.go index be6fb51e8..9bc6f895f 100644 --- a/x/interchaintxs/module_simulation.go +++ b/x/interchaintxs/module_simulation.go @@ -33,7 +33,7 @@ func (AppModule) GenerateGenesisState(simState *module.SimulationState) { } // ProposalContents doesn't return any content functions for governance proposals -func (AppModule) ProposalContents(_ module.SimulationState) []simtypes.WeightedProposalContent { +func (AppModule) ProposalContents(_ module.SimulationState) []simtypes.WeightedProposalMsg { return nil } diff --git a/x/interchaintxs/types/params.go b/x/interchaintxs/types/params.go index 8c9ad0e9f..58ae59bbe 100644 --- a/x/interchaintxs/types/params.go +++ b/x/interchaintxs/types/params.go @@ -2,6 +2,7 @@ package types import ( "fmt" + sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" "github.com/neutron-org/neutron/app/params" diff --git a/x/tokenfactory/keeper/createdenom.go b/x/tokenfactory/keeper/createdenom.go index ff84e935c..8123dc2ce 100644 --- a/x/tokenfactory/keeper/createdenom.go +++ b/x/tokenfactory/keeper/createdenom.go @@ -3,8 +3,9 @@ package keeper import ( "fmt" + "cosmossdk.io/errors" + sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" "github.com/neutron-org/neutron/x/tokenfactory/types" @@ -93,7 +94,7 @@ func (k Keeper) chargeForCreateDenom(ctx sdk.Context, creatorAddr string) (err e feeCollectorAddr, err := sdk.AccAddressFromBech32(params.FeeCollectorAddress) if err != nil { - return sdkerrors.Wrapf(err, "wrong fee collector address: %v", err) + return errors.Wrapf(err, "wrong fee collector address: %v", err) } err = k.bankKeeper.SendCoins( @@ -103,7 +104,7 @@ func (k Keeper) chargeForCreateDenom(ctx sdk.Context, creatorAddr string) (err e ) if err != nil { - return sdkerrors.Wrap(err, "unable to send coins to fee collector") + return errors.Wrap(err, "unable to send coins to fee collector") } } diff --git a/x/tokenfactory/keeper/genesis.go b/x/tokenfactory/keeper/genesis.go index 8bd6e28ec..9b44f2413 100644 --- a/x/tokenfactory/keeper/genesis.go +++ b/x/tokenfactory/keeper/genesis.go @@ -14,7 +14,10 @@ func (k Keeper) InitGenesis(ctx sdk.Context, genState types.GenesisState) { if genState.Params.DenomCreationFee == nil { genState.Params.DenomCreationFee = sdk.NewCoins() } - k.SetParams(ctx, genState.Params) + err := k.SetParams(ctx, genState.Params) + if err != nil { + panic("failed to init params") + } for _, genDenom := range genState.GetFactoryDenoms() { creator, _, err := types.DeconstructDenom(genDenom.GetDenom()) diff --git a/x/tokenfactory/keeper/grpc_query.go b/x/tokenfactory/keeper/grpc_query.go index ba8fd43cc..30b910749 100644 --- a/x/tokenfactory/keeper/grpc_query.go +++ b/x/tokenfactory/keeper/grpc_query.go @@ -11,7 +11,7 @@ import ( var _ types.QueryServer = Keeper{} -func (k Keeper) Params(ctx context.Context, req *types.QueryParamsRequest) (*types.QueryParamsResponse, error) { +func (k Keeper) Params(ctx context.Context, _ *types.QueryParamsRequest) (*types.QueryParamsResponse, error) { sdkCtx := sdk.UnwrapSDKContext(ctx) params := k.GetParams(sdkCtx) diff --git a/x/tokenfactory/types/msgs.go b/x/tokenfactory/types/msgs.go index eafdc8547..4020c3cf2 100644 --- a/x/tokenfactory/types/msgs.go +++ b/x/tokenfactory/types/msgs.go @@ -106,7 +106,7 @@ func NewMsgBurn(sender string, amount sdk.Coin) *MsgBurn { } // NewMsgBurn creates a message to burn tokens -func NewMsgBurnFrom(sender string, amount sdk.Coin, burnFromAddress string) *MsgBurn { +func NewMsgBurnFrom(sender string, amount sdk.Coin, _ string) *MsgBurn { return &MsgBurn{ Sender: sender, Amount: amount, diff --git a/x/tokenfactory/types/params.go b/x/tokenfactory/types/params.go index 4a109cf73..2e587c27a 100644 --- a/x/tokenfactory/types/params.go +++ b/x/tokenfactory/types/params.go @@ -13,9 +13,9 @@ var ( KeyDenomCreationGasConsume = []byte("DenomCreationGasConsume") KeyFeeCollectorAddress = []byte("FeeCollectorAddress") // We don't want to charge users for denom creation - DefaultDenomCreationFee sdk.Coins = nil - DefaultDenomCreationGasConsume uint64 = 0 - DefaultFeeCollectorAddress = "" + DefaultDenomCreationFee sdk.Coins + DefaultDenomCreationGasConsume uint64 + DefaultFeeCollectorAddress = "" ) // ParamKeyTable the param key table for tokenfactory module. @@ -47,11 +47,11 @@ func (p Params) Validate() error { } if err := validateDenomCreationFee(p.DenomCreationFee); err != nil { - return err + return fmt.Errorf("failed to validate params: %w", err) } if err := validateFeeCollectorAddress(p.FeeCollectorAddress); err != nil { - return err + return fmt.Errorf("failed to validate params: %w", err) } return nil diff --git a/x/transfer/ibc_handlers_test.go b/x/transfer/ibc_handlers_test.go index 03ebab6f7..bdb763b56 100644 --- a/x/transfer/ibc_handlers_test.go +++ b/x/transfer/ibc_handlers_test.go @@ -2,9 +2,10 @@ package transfer_test import ( "fmt" - "github.com/neutron-org/neutron/x/contractmanager/keeper" "testing" + "github.com/neutron-org/neutron/x/contractmanager/keeper" + sdk "github.com/cosmos/cosmos-sdk/types" transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" From 2dc47ebc3404c1e3a216564b752e6e979693f9ef Mon Sep 17 00:00:00 2001 From: swelf Date: Wed, 20 Sep 2023 19:05:40 +0300 Subject: [PATCH 138/307] linter fixes --- app/simulation_test.go | 4 ++-- x/contractmanager/keeper/sudo.go | 2 +- x/tokenfactory/types/events.go | 2 +- x/transfer/types/tx.go | 2 ++ 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/simulation_test.go b/app/simulation_test.go index ebd049780..1645ec375 100644 --- a/app/simulation_test.go +++ b/app/simulation_test.go @@ -26,7 +26,7 @@ package app_test // simapp.GetSimulatorFlags() // } // -//type SimApp interface { +// type SimApp interface { // GetBaseApp() *baseapp.BaseApp // AppCodec() codec.Codec // SimulationManager() *module.SimulationManager @@ -51,7 +51,7 @@ package app_test //// `starport chain simulate -v --numBlocks 200 --blockSize 50` //// Running as go benchmark test: //// `go test -benchmem -run=^$ -bench ^BenchmarkSimulation ./app -NumBlocks=200 -BlockSize 50 -Commit=true -Verbose=true -Enabled=true` -//func BenchmarkSimulation(b *testing.B) { +// func BenchmarkSimulation(b *testing.B) { // simapp.FlagEnabledValue = true // simapp.FlagCommitValue = true // diff --git a/x/contractmanager/keeper/sudo.go b/x/contractmanager/keeper/sudo.go index 13a5e9e50..b5e574f57 100644 --- a/x/contractmanager/keeper/sudo.go +++ b/x/contractmanager/keeper/sudo.go @@ -22,7 +22,7 @@ func (k Keeper) HasContractInfo(ctx sdk.Context, contractAddress sdk.AccAddress) func PrepareSudoCallbackMessage(request channeltypes.Packet, ack *channeltypes.Acknowledgement) ([]byte, error) { m := types.MessageSudoCallback{} - if ack != nil && ack.GetError() == "" { + if ack != nil && ack.GetError() == "" { //nolint:gocritic // m.Response = &types.ResponseSudoPayload{ Data: ack.GetResult(), Request: request, diff --git a/x/tokenfactory/types/events.go b/x/tokenfactory/types/events.go index 0ccec062f..d6b18483f 100644 --- a/x/tokenfactory/types/events.go +++ b/x/tokenfactory/types/events.go @@ -5,7 +5,7 @@ const ( AttributeAmount = "amount" AttributeCreator = "creator" AttributeSubdenom = "subdenom" - AttributeNewTokenDenom = "new_token_denom" + AttributeNewTokenDenom = "new_token_denom" //nolint:gosec // token name, not a credential AttributeMintToAddress = "mint_to_address" AttributeBurnFromAddress = "burn_from_address" AttributeTransferFromAddress = "transfer_from_address" diff --git a/x/transfer/types/tx.go b/x/transfer/types/tx.go index 661f74b3f..1d1e1ebb2 100644 --- a/x/transfer/types/tx.go +++ b/x/transfer/types/tx.go @@ -26,6 +26,8 @@ func (msg *MsgTransfer) GetSigners() []sdk.AccAddress { // MsgOrigTransferHandler - 1) helps to bind `/neutron.transfer.Msg/Transfer` as a handler for `ibc.applications.transfer.v1.MsgTransfer` // 2) converts `ibc.applications.transfer.v1.MsgTransfer` into neutron.transfer.MsgTransfer` before processing. +// +//nolint:revive // we cant rearrange arguments since we need to meet the type requirement func MsgOrigTransferHandler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(types.MsgTransfer) if err := dec(in); err != nil { From 66f22723b99b84aeff44d530473d6d157a5d3af8 Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Thu, 21 Sep 2023 12:56:44 +0300 Subject: [PATCH 139/307] bump cosmos-sdk fork version --- go.mod | 10 +++++++++- go.sum | 22 +++++++++++++++++++--- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 3e0034c2f..1f7a107c9 100644 --- a/go.mod +++ b/go.mod @@ -57,12 +57,16 @@ require ( github.com/beorn7/perks v1.0.1 // indirect github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 // indirect + github.com/bits-and-blooms/bitset v1.8.0 // indirect github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect github.com/cenkalti/backoff/v4 v4.1.3 // indirect github.com/cespare/xxhash v1.1.0 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/chzyer/readline v1.5.1 // indirect github.com/cockroachdb/apd/v2 v2.0.2 // indirect + github.com/cockroachdb/errors v1.10.0 // indirect + github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect + github.com/cockroachdb/redact v1.1.5 // indirect github.com/coinbase/rosetta-sdk-go v0.7.9 // indirect github.com/confio/ics23/go v0.9.0 // indirect github.com/cosmos/btcutil v1.0.5 // indirect @@ -84,6 +88,7 @@ require ( github.com/dvsekhvalnov/jose2go v1.5.0 // indirect github.com/felixge/httpsnoop v1.0.2 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect + github.com/getsentry/sentry-go v0.21.0 // indirect github.com/go-kit/kit v0.12.0 // indirect github.com/go-kit/log v0.2.1 // indirect github.com/go-logfmt/logfmt v0.6.0 // indirect @@ -121,6 +126,8 @@ require ( github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/jmhodges/levigo v1.0.0 // indirect github.com/klauspost/compress v1.16.5 // indirect + github.com/kr/pretty v0.3.1 // indirect + github.com/kr/text v0.2.0 // indirect github.com/lib/pq v1.10.7 // indirect github.com/libp2p/go-buffer-pool v0.1.0 // indirect github.com/linxGnu/grocksdb v1.8.0 // indirect @@ -145,6 +152,7 @@ require ( github.com/prometheus/procfs v0.10.1 // indirect github.com/rakyll/statik v0.1.7 // indirect github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect + github.com/rogpeppe/go-internal v1.10.0 // indirect github.com/rs/cors v1.8.3 // indirect github.com/sasha-s/go-deadlock v0.3.1 // indirect github.com/spf13/afero v1.9.5 // indirect @@ -183,7 +191,7 @@ replace ( github.com/ChainSafe/go-schnorrkel => github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d github.com/CosmWasm/wasmd => github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230808084410-6083b888424e github.com/cosmos/admin-module => github.com/neutron-org/admin-module v0.0.0-20230906150724-9ccb75c61fc5 - github.com/cosmos/cosmos-sdk => github.com/neutron-org/cosmos-sdk v0.47.5-0.20230831104547-eda3e09a8b71 + github.com/cosmos/cosmos-sdk => github.com/neutron-org/cosmos-sdk v0.47.5-0.20230921074823-5d5ff8b93265 github.com/cosmos/gaia/v11 => github.com/cosmos/gaia/v11 v11.0.0-20230724152830-861ba391c3b4 github.com/cosmos/ledger-cosmos-go => github.com/cosmos/ledger-cosmos-go v0.12.1 github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 diff --git a/go.sum b/go.sum index d81a204f4..e75dab952 100644 --- a/go.sum +++ b/go.sum @@ -286,6 +286,8 @@ github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod h1:6QX/PXZ github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 h1:41iFGWnSlI2gVpmOtVTJZNodLdLQLn/KsJqFvXwnd/s= github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= +github.com/bits-and-blooms/bitset v1.8.0 h1:FD+XqgOZDUxxZ8hzoBFuV9+cGWY9CslN6d5MS5JVb4c= +github.com/bits-and-blooms/bitset v1.8.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8= github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40/go.mod h1:8rLXio+WjiTceGBHIoTvn60HIbs7Hm7bcHjyrSqYB9c= github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps= github.com/btcsuite/btcd v0.0.0-20190315201642-aa6e0f35703c/go.mod h1:DrZx5ec/dmnfpw9KyYoQyYo7d0KEvTkk/5M/vbZjAr8= @@ -312,7 +314,7 @@ github.com/btcsuite/snappy-go v0.0.0-20151229074030-0bdef8d06723/go.mod h1:8woku github.com/btcsuite/snappy-go v1.0.0/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc= github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod h1:ghJtEyQwv5/p4Mg4C0fgbePVuGr935/5ddU9Z3TmDRY= github.com/btcsuite/winsvc v1.0.0/go.mod h1:jsenWakMcC0zFBFurPLEAyrnc/teJEM1O46fmI40EZs= -github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA= +github.com/bufbuild/protocompile v0.5.1 h1:mixz5lJX4Hiz4FpqFREJHIXLfaLBntfaJv1h+/jS+Qg= github.com/bwesterb/go-ristretto v1.2.0/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0= github.com/c-bata/go-prompt v0.2.2/go.mod h1:VzqtzE2ksDBcdln8G7mk2RX9QyGjH+OVqOCSiVIqS34= github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= @@ -356,6 +358,12 @@ github.com/cockroachdb/apd/v2 v2.0.2 h1:weh8u7Cneje73dDh+2tEVLUvyBc89iwepWCD8b80 github.com/cockroachdb/apd/v2 v2.0.2/go.mod h1:DDxRlzC2lo3/vSlmSoS7JkqbbrARPuFOGr0B9pvN3Gw= github.com/cockroachdb/apd/v3 v3.1.0 h1:MK3Ow7LH0W8zkd5GMKA1PvS9qG3bWFI95WaVNfyZJ/w= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= +github.com/cockroachdb/errors v1.10.0 h1:lfxS8zZz1+OjtV4MtNWgboi/W5tyLEB6VQZBXN+0VUU= +github.com/cockroachdb/errors v1.10.0/go.mod h1:lknhIsEVQ9Ss/qKDBQS/UqFSvPQjOwNq2qyKAxtHRqE= +github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZeQy818SGhaone5OnYfxFR/+AzdY3sf5aE= +github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs= +github.com/cockroachdb/redact v1.1.5 h1:u1PMllDkdFfPWaNGMyLD1+so+aq3uUItthCFqzwPJ30= +github.com/cockroachdb/redact v1.1.5/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= github.com/coinbase/kryptology v1.8.0/go.mod h1:RYXOAPdzOGUe3qlSFkMGn58i3xUA8hmxYHksuq+8ciI= github.com/coinbase/rosetta-sdk-go v0.7.9 h1:lqllBjMnazTjIqYrOGv8h8jxjg9+hJazIGZr9ZvoCcA= @@ -498,6 +506,8 @@ github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbS github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff/go.mod h1:x7DCsMOv1taUwEWCzT4cmDeAkigA5/QCwUodaVOe8Ww= github.com/getkin/kin-openapi v0.53.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4= github.com/getkin/kin-openapi v0.61.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4= +github.com/getsentry/sentry-go v0.21.0 h1:c9l5F1nPF30JIppulk4veau90PK6Smu3abgVtVQWon4= +github.com/getsentry/sentry-go v0.21.0/go.mod h1:lc76E2QywIyW8WuBnwl8Lc4bkmQH4+w1gwTf25trprY= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= @@ -506,6 +516,7 @@ github.com/gin-gonic/gin v1.8.1 h1:4+fr/el88TOO3ewCmQr8cx/CtZ/umlIRIs5M4NTNjf8= github.com/glycerine/go-unsnap-stream v0.0.0-20180323001048-9f0cb55181dd/go.mod h1:/20jfyN9Y5QPEAprSgKAUr+glWDY39ZiUEAYOEv5dsE= github.com/glycerine/goconvey v0.0.0-20190410193231-58a59202ab31/go.mod h1:Ogl1Tioa0aV7gstGFO7KhffUsb9M4ydbEbbxpcEDc24= github.com/go-chi/chi/v5 v5.0.0/go.mod h1:BBug9lr0cqtdAhsu6R4AAdvufI0/XBzAQSsUqJpoZOs= +github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= @@ -825,6 +836,7 @@ github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFB github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= @@ -928,8 +940,8 @@ github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OS github.com/neilotoole/errgroup v0.1.6/go.mod h1:Q2nLGf+594h0CLBs/Mbg6qOr7GtqDK7C2S41udRnToE= github.com/neutron-org/admin-module v0.0.0-20230906150724-9ccb75c61fc5 h1:96ZjLWoN4nCIcFdxrz51Xu2Y8aqpcScy3eva3S5hM60= github.com/neutron-org/admin-module v0.0.0-20230906150724-9ccb75c61fc5/go.mod h1:INknneN2W3Fr9Eld7SpfLRdjyHR1muzFbbqXln1ixic= -github.com/neutron-org/cosmos-sdk v0.47.5-0.20230831104547-eda3e09a8b71 h1:weRB37YM9y7HFyEn6SNI8AZzawU3h23l6BLFrNNqZak= -github.com/neutron-org/cosmos-sdk v0.47.5-0.20230831104547-eda3e09a8b71/go.mod h1:R5n+uM7vguVPFap4pgkdvQCT1nVo/OtPwrlAU40rvok= +github.com/neutron-org/cosmos-sdk v0.47.5-0.20230921074823-5d5ff8b93265 h1:CIyjGN+/WTIgGyUEAiL7HcxQ2/XYX3r2Nv4RWBbhl8o= +github.com/neutron-org/cosmos-sdk v0.47.5-0.20230921074823-5d5ff8b93265/go.mod h1:4xMyIVekAs2OEUz/yh9JwzhLBMk+olM2sxgKuQdlhLg= github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230808084410-6083b888424e h1:uVJCBWf1vcCYY0pzOA2SCPIZT8WsR8fsOxs57mnJbM4= github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230808084410-6083b888424e/go.mod h1:Oagy36cU49438NzxKG/gmGTG903tiAI7LIUdH7x2qNY= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= @@ -985,6 +997,8 @@ github.com/petermattis/goid v0.0.0-20230518223814-80aa455d8761/go.mod h1:pxMtw7c github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU= github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= +github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= +github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -1043,7 +1057,9 @@ github.com/rjeczalik/notify v0.9.1/go.mod h1:rKwnCoCGeuQnwBtTSPL9Dad03Vh2n40ePRr github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= +github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= github.com/rs/cors v1.8.3 h1:O+qNyWn7Z+F9M0ILBHgMVPuB1xTOucVd5gtaYyXBpRo= github.com/rs/cors v1.8.3/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= From e4a00b79b7598cecafaaafe531893e4d0ada3096 Mon Sep 17 00:00:00 2001 From: swelf Date: Thu, 21 Sep 2023 13:28:31 +0300 Subject: [PATCH 140/307] added storeupgrades --- app/upgrades/nextupgrade/constants.go | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/app/upgrades/nextupgrade/constants.go b/app/upgrades/nextupgrade/constants.go index e180e71ef..7747b7d51 100644 --- a/app/upgrades/nextupgrade/constants.go +++ b/app/upgrades/nextupgrade/constants.go @@ -1,7 +1,11 @@ package nextupgrade import ( + "github.com/cosmos/cosmos-sdk/store/types" + consensusparamtypes "github.com/cosmos/cosmos-sdk/x/consensus/types" + crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types" "github.com/neutron-org/neutron/app/upgrades" + buildertypes "github.com/skip-mev/pob/x/builder/types" ) const ( @@ -12,4 +16,11 @@ const ( var Upgrade = upgrades.Upgrade{ UpgradeName: UpgradeName, CreateUpgradeHandler: CreateUpgradeHandler, + StoreUpgrades: types.StoreUpgrades{ + Added: []string{ + consensusparamtypes.ModuleName, + crisistypes.ModuleName, + buildertypes.ModuleName, + }, + }, } From ef3177ef00cb909363225fae2dddf4af11595f9b Mon Sep 17 00:00:00 2001 From: swelf Date: Thu, 21 Sep 2023 13:52:51 +0300 Subject: [PATCH 141/307] added subspaces --- app/app.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/app.go b/app/app.go index f4421740d..0793f220e 100644 --- a/app/app.go +++ b/app/app.go @@ -1174,6 +1174,7 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino paramsKeeper := paramskeeper.NewKeeper(appCodec, legacyAmino, key, tkey) paramsKeeper.Subspace(authtypes.ModuleName) + paramsKeeper.Subspace(banktypes.ModuleName) paramsKeeper.Subspace(slashingtypes.ModuleName) paramsKeeper.Subspace(crisistypes.ModuleName) paramsKeeper.Subspace(ibctransfertypes.ModuleName) @@ -1188,6 +1189,7 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino paramsKeeper.Subspace(ccvconsumertypes.ModuleName) // MOTE: legacy subspaces for migration sdk47 only + paramsKeeper.Subspace(wasmtypes.ModuleName) paramsKeeper.Subspace(crontypes.StoreKey).WithKeyTable(crontypes.ParamKeyTable()) paramsKeeper.Subspace(feeburnertypes.StoreKey).WithKeyTable(feeburnertypes.ParamKeyTable()) paramsKeeper.Subspace(feetypes.StoreKey).WithKeyTable(feetypes.ParamKeyTable()) From 248e4cc83c0f5a3d3e4674e52d856c6cdbec2978 Mon Sep 17 00:00:00 2001 From: swelf Date: Thu, 21 Sep 2023 13:54:54 +0300 Subject: [PATCH 142/307] added subspaces --- app/app.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/app.go b/app/app.go index 0793f220e..2a5d0559f 100644 --- a/app/app.go +++ b/app/app.go @@ -1174,7 +1174,7 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino paramsKeeper := paramskeeper.NewKeeper(appCodec, legacyAmino, key, tkey) paramsKeeper.Subspace(authtypes.ModuleName) - paramsKeeper.Subspace(banktypes.ModuleName) + paramsKeeper.Subspace(banktypes.ModuleName).WithKeyTable(banktypes.ParamKeyTable()) paramsKeeper.Subspace(slashingtypes.ModuleName) paramsKeeper.Subspace(crisistypes.ModuleName) paramsKeeper.Subspace(ibctransfertypes.ModuleName) @@ -1189,7 +1189,7 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino paramsKeeper.Subspace(ccvconsumertypes.ModuleName) // MOTE: legacy subspaces for migration sdk47 only - paramsKeeper.Subspace(wasmtypes.ModuleName) + paramsKeeper.Subspace(wasmtypes.ModuleName).WithKeyTable(wasmtypes.ParamKeyTable()) paramsKeeper.Subspace(crontypes.StoreKey).WithKeyTable(crontypes.ParamKeyTable()) paramsKeeper.Subspace(feeburnertypes.StoreKey).WithKeyTable(feeburnertypes.ParamKeyTable()) paramsKeeper.Subspace(feetypes.StoreKey).WithKeyTable(feetypes.ParamKeyTable()) From 02604918907503572431132ad62dfaac546c2502 Mon Sep 17 00:00:00 2001 From: swelf Date: Thu, 21 Sep 2023 13:58:49 +0300 Subject: [PATCH 143/307] initialized tables --- app/app.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/app.go b/app/app.go index 2a5d0559f..e07cbaa6d 100644 --- a/app/app.go +++ b/app/app.go @@ -1173,20 +1173,20 @@ func (app *App) RegisterTendermintService(clientCtx client.Context) { func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino, key, tkey storetypes.StoreKey) paramskeeper.Keeper { paramsKeeper := paramskeeper.NewKeeper(appCodec, legacyAmino, key, tkey) - paramsKeeper.Subspace(authtypes.ModuleName) + paramsKeeper.Subspace(authtypes.ModuleName).WithKeyTable(authtypes.ParamKeyTable()) paramsKeeper.Subspace(banktypes.ModuleName).WithKeyTable(banktypes.ParamKeyTable()) - paramsKeeper.Subspace(slashingtypes.ModuleName) - paramsKeeper.Subspace(crisistypes.ModuleName) - paramsKeeper.Subspace(ibctransfertypes.ModuleName) + paramsKeeper.Subspace(slashingtypes.ModuleName).WithKeyTable(slashingtypes.ParamKeyTable()) + paramsKeeper.Subspace(crisistypes.ModuleName).WithKeyTable(crisistypes.ParamKeyTable()) + paramsKeeper.Subspace(ibctransfertypes.ModuleName).WithKeyTable(ibctransfertypes.ParamKeyTable()) paramsKeeper.Subspace(ibchost.ModuleName) - paramsKeeper.Subspace(icacontrollertypes.SubModuleName) - paramsKeeper.Subspace(icahosttypes.SubModuleName) + paramsKeeper.Subspace(icacontrollertypes.SubModuleName).WithKeyTable(icacontrollertypes.ParamKeyTable()) + paramsKeeper.Subspace(icahosttypes.SubModuleName).WithKeyTable(icahosttypes.ParamKeyTable()) paramsKeeper.Subspace(routertypes.ModuleName).WithKeyTable(routertypes.ParamKeyTable()) paramsKeeper.Subspace(globalfee.ModuleName) - paramsKeeper.Subspace(ccvconsumertypes.ModuleName) + paramsKeeper.Subspace(ccvconsumertypes.ModuleName).WithKeyTable(ccvconsumertypes.ParamKeyTable()) // MOTE: legacy subspaces for migration sdk47 only paramsKeeper.Subspace(wasmtypes.ModuleName).WithKeyTable(wasmtypes.ParamKeyTable()) From febf3cfd60e930affa18c895700c431e12b5c8aa Mon Sep 17 00:00:00 2001 From: swelf Date: Thu, 21 Sep 2023 14:19:19 +0300 Subject: [PATCH 144/307] upgrade fix --- app/upgrades/nextupgrade/upgrades.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/upgrades/nextupgrade/upgrades.go b/app/upgrades/nextupgrade/upgrades.go index 0b6334df7..05961ad3d 100644 --- a/app/upgrades/nextupgrade/upgrades.go +++ b/app/upgrades/nextupgrade/upgrades.go @@ -2,6 +2,7 @@ package nextupgrade import ( "fmt" + icacontrollertypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/types" "cosmossdk.io/math" @@ -48,7 +49,7 @@ func CreateUpgradeHandler( ctx.Logger().Info("Migrating channel capability...") // https://github.com/cosmos/ibc-go/blob/v7.0.1/docs/migrations/v5-to-v6.md#upgrade-proposal - if err := v6.MigrateICS27ChannelCapability(ctx, codec, storeKeys.GetKey(capabilitytypes.StoreKey), keepers.CapabilityKeeper, interchaintxstypes.ModuleName); err != nil { + if err := v6.MigrateICS27ChannelCapability(ctx, codec, storeKeys.GetKey(capabilitytypes.StoreKey), keepers.CapabilityKeeper, icacontrollertypes.SubModuleName); err != nil { return nil, err } From 15a6188e0b7aca7228586b4a3fc4f5486548b808 Mon Sep 17 00:00:00 2001 From: swelf Date: Thu, 21 Sep 2023 16:24:54 +0300 Subject: [PATCH 145/307] upgrades fixes --- app/app.go | 3 ++- app/upgrades/nextupgrade/upgrades.go | 35 ++++++++-------------------- x/transfer/module.go | 10 ++++++++ 3 files changed, 22 insertions(+), 26 deletions(-) diff --git a/app/app.go b/app/app.go index e07cbaa6d..370bfc0b2 100644 --- a/app/app.go +++ b/app/app.go @@ -2,6 +2,7 @@ package app import ( "fmt" + globalfeetypes "github.com/cosmos/gaia/v11/x/globalfee/types" "io" "io/fs" "net/http" @@ -1184,7 +1185,7 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino paramsKeeper.Subspace(routertypes.ModuleName).WithKeyTable(routertypes.ParamKeyTable()) - paramsKeeper.Subspace(globalfee.ModuleName) + paramsKeeper.Subspace(globalfee.ModuleName).WithKeyTable(globalfeetypes.ParamKeyTable()) paramsKeeper.Subspace(ccvconsumertypes.ModuleName).WithKeyTable(ccvconsumertypes.ParamKeyTable()) diff --git a/app/upgrades/nextupgrade/upgrades.go b/app/upgrades/nextupgrade/upgrades.go index 05961ad3d..dd635148b 100644 --- a/app/upgrades/nextupgrade/upgrades.go +++ b/app/upgrades/nextupgrade/upgrades.go @@ -1,11 +1,8 @@ package nextupgrade import ( - "fmt" - icacontrollertypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/types" - "cosmossdk.io/math" - + "fmt" "github.com/cosmos/cosmos-sdk/codec" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" @@ -41,15 +38,9 @@ func CreateUpgradeHandler( codec codec.Codec, ) upgradetypes.UpgradeHandler { return func(ctx sdk.Context, plan upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) { - ctx.Logger().Info("Starting module migrations...") - vm, err := mm.RunMigrations(ctx, configurator, vm) - if err != nil { - return vm, err - } - ctx.Logger().Info("Migrating channel capability...") // https://github.com/cosmos/ibc-go/blob/v7.0.1/docs/migrations/v5-to-v6.md#upgrade-proposal - if err := v6.MigrateICS27ChannelCapability(ctx, codec, storeKeys.GetKey(capabilitytypes.StoreKey), keepers.CapabilityKeeper, icacontrollertypes.SubModuleName); err != nil { + if err := v6.MigrateICS27ChannelCapability(ctx, codec, storeKeys.GetKey(capabilitytypes.StoreKey), keepers.CapabilityKeeper, interchaintxstypes.ModuleName); err != nil { return nil, err } @@ -84,7 +75,7 @@ func CreateUpgradeHandler( } ctx.Logger().Info("Setting pob params...") - err = setPobParams(ctx, keepers.FeeBurnerKeeper, keepers.BuilderKeeper) + err := setPobParams(ctx, keepers.FeeBurnerKeeper, keepers.BuilderKeeper) if err != nil { return nil, err } @@ -109,6 +100,12 @@ func CreateUpgradeHandler( return vm, err } + ctx.Logger().Info("Starting module migrations...") + vm, err = mm.RunMigrations(ctx, configurator, vm) + if err != nil { + return vm, err + } + ctx.Logger().Info("Upgrade complete") return vm, nil } @@ -173,8 +170,8 @@ func migrateTokenFactoryParams(ctx sdk.Context, paramsKeepers paramskeeper.Keepe store := ctx.KVStore(storeKey) var currParams tokenfactorytypes.Params subspace, _ := paramsKeepers.GetSubspace(tokenfactorytypes.StoreKey) + subspace.Set(ctx, tokenfactorytypes.KeyDenomCreationGasConsume, uint64(0)) subspace.GetParamSet(ctx, &currParams) - currParams.DenomCreationGasConsume = 0 if err := currParams.Validate(); err != nil { return err @@ -234,18 +231,6 @@ func setInterchainTxsParams(ctx sdk.Context, paramsKeepers paramskeeper.Keeper, func migrateGlobalFees(ctx sdk.Context, keepers *upgrades.UpgradeKeepers) error { ctx.Logger().Info("Implementing GlobalFee Params...") - if !keepers.GlobalFeeSubspace.Has(ctx, types.ParamStoreKeyMinGasPrices) { - return fmt.Errorf("minimum_gas_prices param not found") - } - - if !keepers.GlobalFeeSubspace.Has(ctx, types.ParamStoreKeyBypassMinFeeMsgTypes) { - return fmt.Errorf("bypass_min_fee_msg_types param not found") - } - - if !keepers.GlobalFeeSubspace.Has(ctx, types.ParamStoreKeyMaxTotalBypassMinFeeMsgGasUsage) { - return fmt.Errorf("max_total_bypass_min_fee_msg_gas_usage param not found") - } - // global fee is empty set, set global fee to equal to 0.05 USD (for 200k of gas) in appropriate coin // As of June 22nd, 2023 this is // 0.9untrn,0.026ibc/C4CFF46FD6DE35CA4CF4CE031E643C8FDC9BA4B99AE598E9B0ED98FE3A2319F9,0.25ibc/F082B65C88E4B6D5EF1DB243CDA1D331D002759E938A0F5CD3FFDC5D53B3E349 diff --git a/x/transfer/module.go b/x/transfer/module.go index 00a0cda63..10da394eb 100644 --- a/x/transfer/module.go +++ b/x/transfer/module.go @@ -3,6 +3,7 @@ package transfer import ( "cosmossdk.io/core/appmodule" "cosmossdk.io/errors" + "fmt" "github.com/cosmos/cosmos-sdk/codec" cdctypes "github.com/cosmos/cosmos-sdk/codec/types" @@ -96,6 +97,15 @@ func (am AppModule) RegisterServices(cfg module.Configurator) { neutrontypes.RegisterMsgServer(cfg.MsgServer(), am.keeper) cfg.MsgServer().RegisterService(&neutrontypes.MsgServiceDescOrig, am.keeper) + + m := keeper.NewMigrator(am.keeper.Keeper) + if err := cfg.RegisterMigration(types.ModuleName, 1, m.MigrateTraces); err != nil { + panic(fmt.Sprintf("failed to migrate transfer app from version 1 to 2: %v", err)) + } + + if err := cfg.RegisterMigration(types.ModuleName, 2, m.MigrateTotalEscrowForDenom); err != nil { + panic(fmt.Sprintf("failed to migrate transfer app from version 2 to 3: %v", err)) + } } type AppModuleBasic struct { From 8b7cbf363bd238f2eccaddb359dc734022b33736 Mon Sep 17 00:00:00 2001 From: swelf Date: Thu, 21 Sep 2023 16:39:02 +0300 Subject: [PATCH 146/307] upgrade fixes --- app/upgrades/nextupgrade/upgrades.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/upgrades/nextupgrade/upgrades.go b/app/upgrades/nextupgrade/upgrades.go index dd635148b..22d90ee68 100644 --- a/app/upgrades/nextupgrade/upgrades.go +++ b/app/upgrades/nextupgrade/upgrades.go @@ -44,6 +44,12 @@ func CreateUpgradeHandler( return nil, err } + ctx.Logger().Info("Starting module migrations...") + vm, err := mm.RunMigrations(ctx, configurator, vm) + if err != nil { + return vm, err + } + ctx.Logger().Info("Migrating cron module parameters...") if err := migrateCronParams(ctx, keepers.ParamsKeeper, storeKeys.GetKey(crontypes.StoreKey), codec); err != nil { return nil, err @@ -75,7 +81,7 @@ func CreateUpgradeHandler( } ctx.Logger().Info("Setting pob params...") - err := setPobParams(ctx, keepers.FeeBurnerKeeper, keepers.BuilderKeeper) + err = setPobParams(ctx, keepers.FeeBurnerKeeper, keepers.BuilderKeeper) if err != nil { return nil, err } @@ -100,12 +106,6 @@ func CreateUpgradeHandler( return vm, err } - ctx.Logger().Info("Starting module migrations...") - vm, err = mm.RunMigrations(ctx, configurator, vm) - if err != nil { - return vm, err - } - ctx.Logger().Info("Upgrade complete") return vm, nil } From 261f47c30dcfc7cd51eef2b78bd770abd059208b Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Thu, 21 Sep 2023 19:13:29 +0300 Subject: [PATCH 147/307] AdminModule upgrade handler and tests --- app/app.go | 4 ++- app/upgrades/nextupgrade/upgrades.go | 24 +++++++++++++++--- app/upgrades/nextupgrade/upgrades_test.go | 30 ++++++++++++++++++++++- app/upgrades/types.go | 5 +++- 4 files changed, 57 insertions(+), 6 deletions(-) diff --git a/app/app.go b/app/app.go index 370bfc0b2..9d4527ad7 100644 --- a/app/app.go +++ b/app/app.go @@ -2,13 +2,14 @@ package app import ( "fmt" - globalfeetypes "github.com/cosmos/gaia/v11/x/globalfee/types" "io" "io/fs" "net/http" "os" "path/filepath" + globalfeetypes "github.com/cosmos/gaia/v11/x/globalfee/types" + "github.com/cosmos/interchain-security/v3/testutil/integration" wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" @@ -1021,6 +1022,7 @@ func (app *App) setupUpgradeHandlers() { CapabilityKeeper: app.CapabilityKeeper, BuilderKeeper: app.BuilderKeeper, ContractManager: app.ContractManagerKeeper, + AdminModule: app.AdminmoduleKeeper, GlobalFeeSubspace: app.GetSubspace(globalfee.ModuleName), CcvConsumerSubspace: app.GetSubspace(ccvconsumertypes.ModuleName), }, diff --git a/app/upgrades/nextupgrade/upgrades.go b/app/upgrades/nextupgrade/upgrades.go index 22d90ee68..e022bbc91 100644 --- a/app/upgrades/nextupgrade/upgrades.go +++ b/app/upgrades/nextupgrade/upgrades.go @@ -1,8 +1,9 @@ package nextupgrade import ( - "cosmossdk.io/math" "fmt" + + "cosmossdk.io/math" "github.com/cosmos/cosmos-sdk/codec" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" @@ -16,6 +17,9 @@ import ( ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" ibcchanneltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" ccvconsumertypes "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types" + builderkeeper "github.com/skip-mev/pob/x/builder/keeper" + buildertypes "github.com/skip-mev/pob/x/builder/types" + "github.com/neutron-org/neutron/app/upgrades" contractmanagerkeeper "github.com/neutron-org/neutron/x/contractmanager/keeper" contractmanagertypes "github.com/neutron-org/neutron/x/contractmanager/types" @@ -26,8 +30,6 @@ import ( icqtypes "github.com/neutron-org/neutron/x/interchainqueries/types" interchaintxstypes "github.com/neutron-org/neutron/x/interchaintxs/types" tokenfactorytypes "github.com/neutron-org/neutron/x/tokenfactory/types" - builderkeeper "github.com/skip-mev/pob/x/builder/keeper" - buildertypes "github.com/skip-mev/pob/x/builder/types" ) func CreateUpgradeHandler( @@ -106,6 +108,12 @@ func CreateUpgradeHandler( return vm, err } + err = migrateAdminModule(ctx, keepers) + if err != nil { + ctx.Logger().Error("failed to migrate admin module", "err", err) + return vm, err + } + ctx.Logger().Info("Upgrade complete") return vm, nil } @@ -281,3 +289,13 @@ func migrateRewardDenoms(ctx sdk.Context, keepers *upgrades.UpgradeKeepers) erro return nil } + +func migrateAdminModule(ctx sdk.Context, keepers *upgrades.UpgradeKeepers) error { + ctx.Logger().Info("Migrating admin module...") + + keepers.AdminModule.SetProposalID(ctx, 1) + + ctx.Logger().Info("Finished migrating admin module") + + return nil +} diff --git a/app/upgrades/nextupgrade/upgrades_test.go b/app/upgrades/nextupgrade/upgrades_test.go index 55d5fd6a2..f3146ae7a 100644 --- a/app/upgrades/nextupgrade/upgrades_test.go +++ b/app/upgrades/nextupgrade/upgrades_test.go @@ -3,6 +3,8 @@ package nextupgrade_test import ( "testing" + adminmoduletypes "github.com/cosmos/admin-module/x/adminmodule/types" + crontypes "github.com/neutron-org/neutron/x/cron/types" feeburnertypes "github.com/neutron-org/neutron/x/feeburner/types" feerefundertypes "github.com/neutron-org/neutron/x/feerefunder/types" @@ -20,9 +22,10 @@ import ( globalfeetypes "github.com/cosmos/gaia/v11/x/globalfee/types" ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" ibcchanneltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" + "github.com/stretchr/testify/suite" + "github.com/neutron-org/neutron/app/upgrades/nextupgrade" "github.com/neutron-org/neutron/testutil" - "github.com/stretchr/testify/suite" ) type UpgradeTestSuite struct { @@ -138,3 +141,28 @@ func (suite *UpgradeTestSuite) TestRewardDenomsUpgrade() { requiredDenoms := []string{params.DefaultDenom, "ibc/F082B65C88E4B6D5EF1DB243CDA1D331D002759E938A0F5CD3FFDC5D53B3E349"} suite.Require().Equal(requiredDenoms, denoms) } + +func (suite *UpgradeTestSuite) TestAdminModuleUpgrade() { + var ( + app = suite.GetNeutronZoneApp(suite.ChainA) + ctx = suite.ChainA.GetContext() + ) + + //emulate lack of ProposalIDKey like on a real mainnet + store := ctx.KVStore(app.GetKey(adminmoduletypes.StoreKey)) + store.Delete(adminmoduletypes.ProposalIDKey) + + _, err := app.AdminmoduleKeeper.GetProposalID(ctx) + suite.Require().Error(err) + + upgrade := upgradetypes.Plan{ + Name: nextupgrade.UpgradeName, + Info: "some text here", + Height: 100, + } + app.UpgradeKeeper.ApplyUpgrade(ctx, upgrade) + + id, err := app.AdminmoduleKeeper.GetProposalID(ctx) + suite.Require().NoError(err) + suite.Require().Equal(uint64(1), id) +} diff --git a/app/upgrades/types.go b/app/upgrades/types.go index da3ed055d..6b545d098 100644 --- a/app/upgrades/types.go +++ b/app/upgrades/types.go @@ -1,6 +1,7 @@ package upgrades import ( + adminmodulekeeper "github.com/cosmos/admin-module/x/adminmodule/keeper" "github.com/cosmos/cosmos-sdk/codec" store "github.com/cosmos/cosmos-sdk/store/types" "github.com/cosmos/cosmos-sdk/types/module" @@ -8,12 +9,13 @@ import ( paramskeeper "github.com/cosmos/cosmos-sdk/x/params/keeper" slashingkeeper "github.com/cosmos/cosmos-sdk/x/slashing/keeper" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" + builderkeeper "github.com/skip-mev/pob/x/builder/keeper" + contractmanagerkeeper "github.com/neutron-org/neutron/x/contractmanager/keeper" cronkeeper "github.com/neutron-org/neutron/x/cron/keeper" feeburnerkeeper "github.com/neutron-org/neutron/x/feeburner/keeper" icqkeeper "github.com/neutron-org/neutron/x/interchainqueries/keeper" tokenfactorykeeper "github.com/neutron-org/neutron/x/tokenfactory/keeper" - builderkeeper "github.com/skip-mev/pob/x/builder/keeper" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" ) @@ -44,6 +46,7 @@ type UpgradeKeepers struct { CapabilityKeeper *capabilitykeeper.Keeper BuilderKeeper builderkeeper.Keeper ContractManager contractmanagerkeeper.Keeper + AdminModule adminmodulekeeper.Keeper // subspaces GlobalFeeSubspace paramtypes.Subspace CcvConsumerSubspace paramtypes.Subspace From ae6d38e1e3fdc597ec20764526854386e9d7bd33 Mon Sep 17 00:00:00 2001 From: nhpd Date: Wed, 27 Sep 2023 19:31:11 +0400 Subject: [PATCH 148/307] feat: increase limit of wasm contracts size to 3mb --- app/app.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/app/app.go b/app/app.go index 9d4527ad7..1299b528c 100644 --- a/app/app.go +++ b/app/app.go @@ -352,6 +352,8 @@ func New( wasmOpts []wasmkeeper.Option, baseAppOptions ...func(*baseapp.BaseApp), ) *App { + overrideWasmVariables() + appCodec := encodingConfig.Marshaler legacyAmino := encodingConfig.Amino interfaceRegistry := encodingConfig.InterfaceRegistry @@ -1249,3 +1251,11 @@ func (app *App) GetConsumerKeeper() ccvconsumerkeeper.Keeper { func (app *App) RegisterNodeService(clientCtx client.Context) { nodeservice.RegisterNodeService(clientCtx, app.GRPCQueryRouter()) } + +// overrideWasmVariables overrides the wasm variables to: +// - allow for larger wasm files +func overrideWasmVariables() { + // Override Wasm size limitation from WASMD. + wasmtypes.MaxWasmSize = 3 * 1024 * 1024 + wasmtypes.MaxProposalWasmSize = wasmtypes.MaxWasmSize +} From 9b627a018e98d6601aa6d606da365fec20835985 Mon Sep 17 00:00:00 2001 From: Nikhil Vasan Date: Tue, 3 Oct 2023 13:29:57 -0700 Subject: [PATCH 149/307] block-sdk integration --- app/ante_handler.go | 39 +++++--- app/app.go | 123 ++++++++++++++++++-------- app/upgrades/nextupgrade/constants.go | 4 +- app/upgrades/nextupgrade/upgrades.go | 12 +-- app/upgrades/types.go | 4 +- go.mod | 51 +++++------ go.sum | 113 +++++++++++------------ 7 files changed, 205 insertions(+), 141 deletions(-) diff --git a/app/ante_handler.go b/app/ante_handler.go index 88a1845fe..8c966d971 100644 --- a/app/ante_handler.go +++ b/app/ante_handler.go @@ -15,9 +15,9 @@ import ( ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper" consumerante "github.com/cosmos/interchain-security/v3/app/consumer/ante" ibcconsumerkeeper "github.com/cosmos/interchain-security/v3/x/ccv/consumer/keeper" - "github.com/skip-mev/pob/mempool" - ante2 "github.com/skip-mev/pob/x/builder/ante" - builderkeeper "github.com/skip-mev/pob/x/builder/keeper" + auctionante "github.com/skip-mev/block-sdk/x/auction/ante" + auctionkeeper "github.com/skip-mev/block-sdk/x/auction/keeper" + blocksdkanteignore "github.com/skip-mev/block-sdk/block/utils" ) // HandlerOptions extend the SDK's AnteHandler options by requiring the IBC @@ -29,9 +29,14 @@ type HandlerOptions struct { ConsumerKeeper ibcconsumerkeeper.Keeper WasmConfig *wasmTypes.WasmConfig TXCounterStoreKey storetypes.StoreKey - buildKeeper builderkeeper.Keeper - txEncoder sdk.TxEncoder - mempool *mempool.AuctionMempool + + // block-sdk deps + // Auction deps + AuctionKeeper auctionkeeper.Keeper + TxEncoder sdk.TxEncoder + MEVLane auctionante.MEVLane + FreeLanes []blocksdkanteignore.Lane + Mempool auctionante.Mempool // globalFee GlobalFeeSubspace paramtypes.Subspace @@ -57,6 +62,13 @@ func NewAnteHandler(options HandlerOptions, logger log.Logger) (sdk.AnteHandler, return nil, errors.Wrap(gaiaerrors.ErrNotFound, "globalfee param store is required for AnteHandler") } + if options.Mempool == nil { + return nil, errors.Wrap(gaiaerrors.ErrLogic, "mempool is required for AnteHandler") + } + if options.MEVLane == nil { + return nil, errors.Wrap(gaiaerrors.ErrLogic, "mev lane is required for AnteHandler") + } + sigGasConsumer := options.SigGasConsumer if sigGasConsumer == nil { sigGasConsumer = ante.DefaultSigVerificationGasConsumer @@ -78,7 +90,11 @@ func NewAnteHandler(options HandlerOptions, logger log.Logger) (sdk.AnteHandler, // otherwise you will get panic globalfeeante.NewFeeDecorator(options.GlobalFeeSubspace, nil), - ante.NewDeductFeeDecorator(options.AccountKeeper, options.BankKeeper, options.FeegrantKeeper, options.TxFeeChecker), + // we ignore the fee-deductor for any transactions that match the given free lanes + blocksdkanteignore.NewIgnoreDecorator( + ante.NewDeductFeeDecorator(options.AccountKeeper, options.BankKeeper, options.FeegrantKeeper, options.TxFeeChecker), + options.FreeLanes... + ), // SetPubKeyDecorator must be called before all signature verification decorators ante.NewSetPubKeyDecorator(options.AccountKeeper), ante.NewValidateSigCountDecorator(options.AccountKeeper), @@ -86,10 +102,11 @@ func NewAnteHandler(options HandlerOptions, logger log.Logger) (sdk.AnteHandler, ante.NewSigVerificationDecorator(options.AccountKeeper, options.SignModeHandler), ante.NewIncrementSequenceDecorator(options.AccountKeeper), ibcante.NewRedundantRelayDecorator(options.IBCKeeper), - ante2.NewBuilderDecorator( - options.buildKeeper, - options.txEncoder, - options.mempool, + auctionante.NewAuctionDecorator( + options.AuctionKeeper, + options.TxEncoder, + options.MEVLane, + options.Mempool, ), } diff --git a/app/app.go b/app/app.go index 9d4527ad7..250860717 100644 --- a/app/app.go +++ b/app/app.go @@ -17,12 +17,6 @@ import ( "github.com/cosmos/cosmos-sdk/x/genutil" genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types" tendermint "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" - proposalhandler "github.com/skip-mev/pob/abci" - "github.com/skip-mev/pob/mempool" - "github.com/skip-mev/pob/x/builder" - builderkeeper "github.com/skip-mev/pob/x/builder/keeper" - rewardsaddressprovider "github.com/skip-mev/pob/x/builder/rewards_address_provider" - buildertypes "github.com/skip-mev/pob/x/builder/types" "github.com/neutron-org/neutron/docs" @@ -155,6 +149,23 @@ import ( "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router" routerkeeper "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router/keeper" routertypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router/types" + + // Block-sdk imports + blocksdkabci "github.com/skip-mev/block-sdk/abci" + blocksdk "github.com/skip-mev/block-sdk/block" + "github.com/skip-mev/block-sdk/block/base" + blocksdkbase "github.com/skip-mev/block-sdk/block/base" + blocksdkanteignore "github.com/skip-mev/block-sdk/block/utils" + base_lane "github.com/skip-mev/block-sdk/lanes/base" + "github.com/skip-mev/block-sdk/lanes/free" + free_lane "github.com/skip-mev/block-sdk/lanes/free" + mev_lane "github.com/skip-mev/block-sdk/lanes/mev" + "github.com/skip-mev/block-sdk/x/auction" + auctionante "github.com/skip-mev/block-sdk/x/auction/ante" + auctionkeeper "github.com/skip-mev/block-sdk/x/auction/keeper" + rewardsaddressprovider "github.com/skip-mev/block-sdk/x/auction/rewards" + auctiontypes "github.com/skip-mev/block-sdk/x/auction/types" + signer_extraction_adapter "github.com/skip-mev/block-sdk/adapters/signer_extraction_adapter" ) const ( @@ -209,14 +220,14 @@ var ( ), ibchooks.AppModuleBasic{}, router.AppModuleBasic{}, - builder.AppModuleBasic{}, + auction.AppModuleBasic{}, globalfee.AppModule{}, ) // module account permissions maccPerms = map[string][]string{ authtypes.FeeCollectorName: nil, - buildertypes.ModuleName: nil, + auctiontypes.ModuleName: nil, ibctransfertypes.ModuleName: {authtypes.Minter, authtypes.Burner}, icatypes.ModuleName: nil, wasmtypes.ModuleName: {authtypes.Burner}, @@ -271,8 +282,8 @@ type App struct { AdminmoduleKeeper adminmodulekeeper.Keeper AuthzKeeper authzkeeper.Keeper BankKeeper bankkeeper.BaseKeeper - // BuilderKeeper is the keeper that handles processing auction transactions - BuilderKeeper builderkeeper.Keeper + // AuctionKeeper is the keeper that handles processing auction transactions + AuctionKeeper auctionkeeper.Keeper CapabilityKeeper *capabilitykeeper.Keeper SlashingKeeper slashingkeeper.Keeper CrisisKeeper crisiskeeper.Keeper @@ -318,7 +329,12 @@ type App struct { sm *module.SimulationManager // Custom checkTx handler - checkTxHandler proposalhandler.CheckTx + checkTxHandler mev_lane.CheckTx + + // Lanes + Mempool auctionante.Mempool + MEVLane auctionante.MEVLane + FreeLanes []blocksdkanteignore.Lane } func (app *App) GetTestBankKeeper() integration.TestBankKeeper { @@ -356,16 +372,10 @@ func New( legacyAmino := encodingConfig.Amino interfaceRegistry := encodingConfig.InterfaceRegistry - cfg := mempool.NewDefaultAuctionFactory(encodingConfig.TxConfig.TxDecoder()) - // 0 - unlimited amount of txs - maxTx := 0 - memPool := mempool.NewAuctionMempool(encodingConfig.TxConfig.TxDecoder(), encodingConfig.TxConfig.TxEncoder(), maxTx, cfg) - bApp := baseapp.NewBaseApp(Name, logger, db, encodingConfig.TxConfig.TxDecoder(), baseAppOptions...) bApp.SetCommitMultiStoreTracer(traceStore) bApp.SetVersion(version.Version) bApp.SetInterfaceRegistry(interfaceRegistry) - bApp.SetMempool(memPool) keys := sdk.NewKVStoreKeys( authzkeeper.StoreKey, authtypes.StoreKey, banktypes.StoreKey, slashingtypes.StoreKey, @@ -374,7 +384,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, routertypes.StoreKey, - crontypes.StoreKey, ibchookstypes.StoreKey, consensusparamtypes.StoreKey, crisistypes.StoreKey, buildertypes.StoreKey, + crontypes.StoreKey, ibchookstypes.StoreKey, consensusparamtypes.StoreKey, crisistypes.StoreKey, auctiontypes.StoreKey, ) tkeys := sdk.NewTransientStoreKeys(paramstypes.TStoreKey) memKeys := sdk.NewMemoryStoreKeys(capabilitytypes.MemStoreKey, feetypes.MemStoreKey) @@ -587,9 +597,9 @@ func New( app.TokenFactoryKeeper.Hooks(), )) - app.BuilderKeeper = builderkeeper.NewKeeperWithRewardsAddressProvider( + app.AuctionKeeper = auctionkeeper.NewKeeperWithRewardsAddressProvider( appCodec, - keys[buildertypes.StoreKey], + keys[auctiontypes.StoreKey], app.AccountKeeper, &app.BankKeeper, // 25% of rewards should be sent to the redistribute address @@ -765,7 +775,7 @@ func New( tokenfactory.NewAppModule(appCodec, *app.TokenFactoryKeeper, app.AccountKeeper, app.BankKeeper), cronModule, globalfee.NewAppModule(app.GetSubspace(globalfee.ModuleName)), - builder.NewAppModule(appCodec, app.BuilderKeeper), + auction.NewAppModule(appCodec, app.AuctionKeeper), crisis.NewAppModule(&app.CrisisKeeper, skipGenesisInvariants, app.GetSubspace(crisistypes.ModuleName)), // always be last to make sure that it checks for all invariants and not only part of them ) @@ -774,7 +784,7 @@ func New( // CanWithdrawInvariant invariant. // NOTE: staking module is required if HistoricalEntries param > 0 app.mm.SetOrderBeginBlockers( - buildertypes.ModuleName, + auctiontypes.ModuleName, upgradetypes.ModuleName, capabilitytypes.ModuleName, slashingtypes.ModuleName, @@ -805,7 +815,7 @@ func New( ) app.mm.SetOrderEndBlockers( - buildertypes.ModuleName, + auctiontypes.ModuleName, crisistypes.ModuleName, capabilitytypes.ModuleName, authtypes.ModuleName, @@ -841,7 +851,7 @@ func New( // so that other modules that want to create or claim capabilities afterwards in InitChain // can do so safely. app.mm.SetOrderInitGenesis( - buildertypes.ModuleName, + auctiontypes.ModuleName, capabilitytypes.ModuleName, authtypes.ModuleName, ibctransfertypes.ModuleName, @@ -909,6 +919,46 @@ func New( app.SetInitChainer(app.InitChainer) app.SetBeginBlocker(app.BeginBlocker) + // initialize block-sdk Mempool + maxTxs := 0 // no limit + cfg := blocksdkbase.LaneConfig{ + Logger: app.Logger(), + TxDecoder: app.GetTxConfig().TxDecoder(), + TxEncoder: app.GetTxConfig().TxEncoder(), + SignerExtractor: signer_extraction_adapter.NewDefaultAdapter(), + MaxBlockSpace: sdk.ZeroDec(), + MaxTxs: maxTxs, + } + + baseLane := base_lane.NewDefaultLane(cfg) + + freeLane := free_lane.NewFreeLane( + cfg, + base.DefaultTxPriority(), + free.DefaultMatchHandler(), // modify this match-handler to determine any other transactions that the chain would like to be free + ) + app.FreeLanes = []blocksdkanteignore.Lane{freeLane} + + mevLane := mev_lane.NewMEVLane( + cfg, + mev_lane.NewDefaultAuctionFactory(app.GetTxConfig().TxDecoder(), signer_extraction_adapter.NewDefaultAdapter()), + ) + app.MEVLane = mevLane + // initialize mempool + mempool := blocksdk.NewLanedMempool( + app.Logger(), + true, + []blocksdk.Lane{ + mevLane, // mev-lane is first to prioritize bids being placed at the TOB + freeLane, // free-lane is second to prioritize free txs + baseLane, // finally, all the rest of txs... + }..., + ) + + // set the mempool first + app.SetMempool(mempool) + app.Mempool = mempool + anteHandler, err := NewAnteHandler( HandlerOptions{ HandlerOptions: ante.HandlerOptions{ @@ -922,9 +972,12 @@ func New( WasmConfig: &wasmConfig, TXCounterStoreKey: keys[wasmtypes.StoreKey], ConsumerKeeper: app.ConsumerKeeper, - buildKeeper: app.BuilderKeeper, - mempool: memPool, GlobalFeeSubspace: app.GetSubspace(globalfee.ModuleName), + AuctionKeeper: app.AuctionKeeper, + TxEncoder: app.GetTxConfig().TxEncoder(), + Mempool: app.Mempool, + MEVLane: app.MEVLane, + FreeLanes: app.FreeLanes, }, app.Logger(), ) @@ -935,20 +988,18 @@ func New( app.SetAnteHandler(anteHandler) app.SetEndBlocker(app.EndBlocker) - handler := proposalhandler.NewProposalHandler( - memPool, - bApp.Logger(), - anteHandler, - encodingConfig.TxConfig.TxEncoder(), - encodingConfig.TxConfig.TxDecoder(), + handler := blocksdkabci.NewProposalHandler( + app.Logger(), + app.GetTxConfig().TxDecoder(), + mempool, ) app.SetPrepareProposal(handler.PrepareProposalHandler()) app.SetProcessProposal(handler.ProcessProposalHandler()) - checkTxHandler := proposalhandler.NewCheckTxHandler( + checkTxHandler := mev_lane.NewCheckTxHandler( app.BaseApp, encodingConfig.TxConfig.TxDecoder(), - memPool, + mevLane, anteHandler, chainID, ) @@ -1020,7 +1071,7 @@ func (app *App) setupUpgradeHandlers() { SlashingKeeper: app.SlashingKeeper, ParamsKeeper: app.ParamsKeeper, CapabilityKeeper: app.CapabilityKeeper, - BuilderKeeper: app.BuilderKeeper, + AuctionKeeper: app.AuctionKeeper, ContractManager: app.ContractManagerKeeper, AdminModule: app.AdminmoduleKeeper, GlobalFeeSubspace: app.GetSubspace(globalfee.ModuleName), @@ -1042,7 +1093,7 @@ func (app *App) CheckTx(req abci.RequestCheckTx) abci.ResponseCheckTx { } // SetCheckTx sets the checkTxHandler for the app. -func (app *App) SetCheckTx(handler proposalhandler.CheckTx) { +func (app *App) SetCheckTx(handler mev_lane.CheckTx) { app.checkTxHandler = handler } diff --git a/app/upgrades/nextupgrade/constants.go b/app/upgrades/nextupgrade/constants.go index 7747b7d51..e082115a3 100644 --- a/app/upgrades/nextupgrade/constants.go +++ b/app/upgrades/nextupgrade/constants.go @@ -5,7 +5,7 @@ import ( consensusparamtypes "github.com/cosmos/cosmos-sdk/x/consensus/types" crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types" "github.com/neutron-org/neutron/app/upgrades" - buildertypes "github.com/skip-mev/pob/x/builder/types" + auctiontypes "github.com/skip-mev/block-sdk/x/auction/types" ) const ( @@ -20,7 +20,7 @@ var Upgrade = upgrades.Upgrade{ Added: []string{ consensusparamtypes.ModuleName, crisistypes.ModuleName, - buildertypes.ModuleName, + auctiontypes.ModuleName, }, }, } diff --git a/app/upgrades/nextupgrade/upgrades.go b/app/upgrades/nextupgrade/upgrades.go index e022bbc91..883627b1d 100644 --- a/app/upgrades/nextupgrade/upgrades.go +++ b/app/upgrades/nextupgrade/upgrades.go @@ -17,8 +17,8 @@ import ( ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" ibcchanneltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" ccvconsumertypes "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types" - builderkeeper "github.com/skip-mev/pob/x/builder/keeper" - buildertypes "github.com/skip-mev/pob/x/builder/types" + auctionkeeper "github.com/skip-mev/block-sdk/x/auction/keeper" + auctiontypes "github.com/skip-mev/block-sdk/x/auction/types" "github.com/neutron-org/neutron/app/upgrades" contractmanagerkeeper "github.com/neutron-org/neutron/x/contractmanager/keeper" @@ -83,7 +83,7 @@ func CreateUpgradeHandler( } ctx.Logger().Info("Setting pob params...") - err = setPobParams(ctx, keepers.FeeBurnerKeeper, keepers.BuilderKeeper) + err = setAuctionParams(ctx, keepers.FeeBurnerKeeper, keepers.AuctionKeeper) if err != nil { return nil, err } @@ -119,14 +119,14 @@ func CreateUpgradeHandler( } } -func setPobParams(ctx sdk.Context, feeBurnerKeeper *feeburnerkeeper.Keeper, builderKeeper builderkeeper.Keeper) error { +func setAuctionParams(ctx sdk.Context, feeBurnerKeeper *feeburnerkeeper.Keeper, auctionKeeper auctionkeeper.Keeper) error { treasury := feeBurnerKeeper.GetParams(ctx).TreasuryAddress _, data, err := bech32.DecodeAndConvert(treasury) if err != nil { return err } - builderParams := buildertypes.Params{ + auctionParams := auctiontypes.Params{ MaxBundleSize: 2, EscrowAccountAddress: data, ReserveFee: sdk.Coin{Denom: "untrn", Amount: sdk.NewInt(1_000_000)}, @@ -134,7 +134,7 @@ func setPobParams(ctx sdk.Context, feeBurnerKeeper *feeburnerkeeper.Keeper, buil FrontRunningProtection: true, ProposerFee: math.LegacyNewDecWithPrec(25, 2), } - return builderKeeper.SetParams(ctx, builderParams) + return auctionKeeper.SetParams(ctx, auctionParams) } func setContractManagerParams(ctx sdk.Context, keeper contractmanagerkeeper.Keeper) error { diff --git a/app/upgrades/types.go b/app/upgrades/types.go index 6b545d098..406e31e4a 100644 --- a/app/upgrades/types.go +++ b/app/upgrades/types.go @@ -9,7 +9,7 @@ import ( paramskeeper "github.com/cosmos/cosmos-sdk/x/params/keeper" slashingkeeper "github.com/cosmos/cosmos-sdk/x/slashing/keeper" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - builderkeeper "github.com/skip-mev/pob/x/builder/keeper" + auctionkeeper "github.com/skip-mev/block-sdk/x/auction/keeper" contractmanagerkeeper "github.com/neutron-org/neutron/x/contractmanager/keeper" cronkeeper "github.com/neutron-org/neutron/x/cron/keeper" @@ -44,7 +44,7 @@ type UpgradeKeepers struct { SlashingKeeper slashingkeeper.Keeper ParamsKeeper paramskeeper.Keeper CapabilityKeeper *capabilitykeeper.Keeper - BuilderKeeper builderkeeper.Keeper + AuctionKeeper auctionkeeper.Keeper ContractManager contractmanagerkeeper.Keeper AdminModule adminmodulekeeper.Keeper // subspaces diff --git a/go.mod b/go.mod index 1f7a107c9..25335358b 100644 --- a/go.mod +++ b/go.mod @@ -5,8 +5,8 @@ go 1.20 require ( cosmossdk.io/core v0.5.1 cosmossdk.io/errors v1.0.0 - cosmossdk.io/log v1.1.1-0.20230704160919-88f2c830b0ca - cosmossdk.io/math v1.0.1 + cosmossdk.io/log v1.2.1 + cosmossdk.io/math v1.1.2 github.com/CosmWasm/wasmd v0.41.0 github.com/CosmWasm/wasmvm v1.3.0 github.com/armon/go-metrics v0.4.1 @@ -14,7 +14,7 @@ require ( github.com/cometbft/cometbft-db v0.8.0 github.com/cosmos/admin-module v0.0.0-20220204080909-475a98e03f31 github.com/cosmos/cosmos-proto v1.0.0-beta.2 - github.com/cosmos/cosmos-sdk v0.47.4 + github.com/cosmos/cosmos-sdk v0.47.5 github.com/cosmos/gaia/v11 v11.0.0-00010101000000-000000000000 github.com/cosmos/gogoproto v1.4.10 github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.0-20230803181732-7c8f814d3b79 @@ -28,38 +28,38 @@ require ( github.com/grpc-ecosystem/grpc-gateway v1.16.0 github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.16.0 - github.com/rs/zerolog v1.29.1 - github.com/skip-mev/pob v1.0.3 + github.com/rs/zerolog v1.30.0 + github.com/skip-mev/block-sdk v1.0.0 github.com/spf13/cast v1.5.1 github.com/spf13/cobra v1.7.0 github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.16.0 github.com/stretchr/testify v1.8.4 - google.golang.org/genproto/googleapis/api v0.0.0-20230629202037-9506855d4529 - google.golang.org/grpc v1.56.2 + google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98 + google.golang.org/grpc v1.58.2 gopkg.in/yaml.v2 v2.4.0 ) require ( cloud.google.com/go v0.110.4 // indirect - cloud.google.com/go/compute v1.20.1 // indirect + cloud.google.com/go/compute v1.21.0 // indirect cloud.google.com/go/compute/metadata v0.2.3 // indirect - cloud.google.com/go/iam v1.1.0 // indirect + cloud.google.com/go/iam v1.1.1 // indirect cloud.google.com/go/storage v1.30.1 // indirect cosmossdk.io/api v0.3.1 // indirect - cosmossdk.io/depinject v1.0.0-alpha.3 // indirect + cosmossdk.io/depinject v1.0.0-alpha.4 // indirect cosmossdk.io/tools/rosetta v0.2.1 // indirect filippo.io/edwards25519 v1.0.0 // indirect github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect github.com/99designs/keyring v1.2.2 // indirect github.com/ChainSafe/go-schnorrkel v1.0.0 // indirect - github.com/aws/aws-sdk-go v1.44.203 // indirect + github.com/aws/aws-sdk-go v1.44.224 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 // indirect github.com/bits-and-blooms/bitset v1.8.0 // indirect github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect - github.com/cenkalti/backoff/v4 v4.1.3 // indirect + github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/cespare/xxhash v1.1.0 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/chzyer/readline v1.5.1 // indirect @@ -88,7 +88,7 @@ require ( github.com/dvsekhvalnov/jose2go v1.5.0 // indirect github.com/felixge/httpsnoop v1.0.2 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect - github.com/getsentry/sentry-go v0.21.0 // indirect + github.com/getsentry/sentry-go v0.23.0 // indirect github.com/go-kit/kit v0.12.0 // indirect github.com/go-kit/log v0.2.1 // indirect github.com/go-logfmt/logfmt v0.6.0 // indirect @@ -125,10 +125,10 @@ require ( github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/jmhodges/levigo v1.0.0 // indirect - github.com/klauspost/compress v1.16.5 // indirect + github.com/klauspost/compress v1.16.7 // indirect github.com/kr/pretty v0.3.1 // indirect github.com/kr/text v0.2.0 // indirect - github.com/lib/pq v1.10.7 // indirect + github.com/lib/pq v1.10.9 // indirect github.com/libp2p/go-buffer-pool v0.1.0 // indirect github.com/linxGnu/grocksdb v1.8.0 // indirect github.com/magiconair/properties v1.8.7 // indirect @@ -149,10 +149,10 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_model v0.4.0 // indirect github.com/prometheus/common v0.44.0 // indirect - github.com/prometheus/procfs v0.10.1 // indirect + github.com/prometheus/procfs v0.11.0 // indirect github.com/rakyll/statik v0.1.7 // indirect github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect - github.com/rogpeppe/go-internal v1.10.0 // indirect + github.com/rogpeppe/go-internal v1.11.0 // indirect github.com/rs/cors v1.8.3 // indirect github.com/sasha-s/go-deadlock v0.3.1 // indirect github.com/spf13/afero v1.9.5 // indirect @@ -166,17 +166,18 @@ require ( github.com/zondax/ledger-go v0.14.1 // indirect go.etcd.io/bbolt v1.3.7 // indirect go.opencensus.io v0.24.0 // indirect - golang.org/x/crypto v0.11.0 // indirect - golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 // indirect - golang.org/x/net v0.12.0 // indirect - golang.org/x/oauth2 v0.8.0 // indirect - golang.org/x/sys v0.10.0 // indirect - golang.org/x/term v0.10.0 // indirect - golang.org/x/text v0.11.0 // indirect + golang.org/x/crypto v0.12.0 // indirect + golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb // indirect + golang.org/x/net v0.14.0 // indirect + golang.org/x/oauth2 v0.10.0 // indirect + golang.org/x/sync v0.3.0 // indirect + golang.org/x/sys v0.11.0 // indirect + golang.org/x/term v0.11.0 // indirect + golang.org/x/text v0.12.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect google.golang.org/api v0.126.0 // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto v0.0.0-20230706204954-ccb25ca9f130 // indirect + google.golang.org/genproto v0.0.0-20230711160842-782d3b101e98 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect google.golang.org/protobuf v1.31.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect diff --git a/go.sum b/go.sum index e75dab952..d561fd9fa 100644 --- a/go.sum +++ b/go.sum @@ -73,8 +73,8 @@ cloud.google.com/go/compute v1.6.0/go.mod h1:T29tfhtVbq1wvAPo0E3+7vhgmkOYeXjhFvz cloud.google.com/go/compute v1.6.1/go.mod h1:g85FgpzFvNULZ+S8AYq87axRKuf2Kh7deLqV/jJ3thU= cloud.google.com/go/compute v1.7.0/go.mod h1:435lt8av5oL9P3fv1OEzSbSUe+ybHXGMPQHHZWZxy9U= cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU= -cloud.google.com/go/compute v1.20.1 h1:6aKEtlUiwEpJzM001l0yFkpXmUVXaN8W+fbkb2AZNbg= -cloud.google.com/go/compute v1.20.1/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM= +cloud.google.com/go/compute v1.21.0 h1:JNBsyXVoOoNJtTQcnEY5uYpZIbeCTYIeDe0Xh1bySMk= +cloud.google.com/go/compute v1.21.0/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM= cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= cloud.google.com/go/containeranalysis v0.5.1/go.mod h1:1D92jd8gRR/c0fGMlymRgxWD3Qw9C1ff6/T7mLgVL8I= @@ -114,8 +114,8 @@ cloud.google.com/go/gkehub v0.10.0/go.mod h1:UIPwxI0DsrpsVoWpLB0stwKCP+WFVG9+y97 cloud.google.com/go/grafeas v0.2.0/go.mod h1:KhxgtF2hb0P191HlY5besjYm6MqTSTj3LSI+M+ByZHc= cloud.google.com/go/iam v0.3.0/go.mod h1:XzJPvDayI+9zsASAFO68Hk07u3z+f+JrT2xXNdp4bnY= cloud.google.com/go/iam v0.5.0/go.mod h1:wPU9Vt0P4UmCux7mqtRu6jcpPAb74cP1fh50J3QpkUc= -cloud.google.com/go/iam v1.1.0 h1:67gSqaPukx7O8WLLHMa0PNs3EBGd2eE4d+psbO/CO94= -cloud.google.com/go/iam v1.1.0/go.mod h1:nxdHjaKfCr7fNYx/HJMM8LgiMugmveWlkatear5gVyk= +cloud.google.com/go/iam v1.1.1 h1:lW7fzj15aVIXYHREOqjRBV9PsH0Z6u8Y46a1YGvQP4Y= +cloud.google.com/go/iam v1.1.1/go.mod h1:A5avdyVL2tCppe4unb0951eI9jreack+RJ0/d+KUZOU= cloud.google.com/go/language v1.4.0/go.mod h1:F9dRpNFQmJbkaop6g0JhSBXCNlO90e1KWx5iDdxbWic= cloud.google.com/go/language v1.6.0/go.mod h1:6dJ8t3B+lUYfStgls25GusK04NLh3eDLQnWM3mdEbhI= cloud.google.com/go/lifesciences v0.5.0/go.mod h1:3oIKy8ycWGPUyZDR/8RNnTOYevhaMLqh5vLUXs9zvT8= @@ -195,14 +195,14 @@ cosmossdk.io/api v0.3.1 h1:NNiOclKRR0AOlO4KIqeaG6PS6kswOMhHD0ir0SscNXE= cosmossdk.io/api v0.3.1/go.mod h1:DfHfMkiNA2Uhy8fj0JJlOCYOBp4eWUUJ1te5zBGNyIw= cosmossdk.io/core v0.5.1 h1:vQVtFrIYOQJDV3f7rw4pjjVqc1id4+mE0L9hHP66pyI= cosmossdk.io/core v0.5.1/go.mod h1:KZtwHCLjcFuo0nmDc24Xy6CRNEL9Vl/MeimQ2aC7NLE= -cosmossdk.io/depinject v1.0.0-alpha.3 h1:6evFIgj//Y3w09bqOUOzEpFj5tsxBqdc5CfkO7z+zfw= -cosmossdk.io/depinject v1.0.0-alpha.3/go.mod h1:eRbcdQ7MRpIPEM5YUJh8k97nxHpYbc3sMUnEtt8HPWU= +cosmossdk.io/depinject v1.0.0-alpha.4 h1:PLNp8ZYAMPTUKyG9IK2hsbciDWqna2z1Wsl98okJopc= +cosmossdk.io/depinject v1.0.0-alpha.4/go.mod h1:HeDk7IkR5ckZ3lMGs/o91AVUc7E596vMaOmslGFM3yU= cosmossdk.io/errors v1.0.0 h1:nxF07lmlBbB8NKQhtJ+sJm6ef5uV1XkvPXG2bUntb04= cosmossdk.io/errors v1.0.0/go.mod h1:+hJZLuhdDE0pYN8HkOrVNwrIOYvUGnn6+4fjnJs/oV0= -cosmossdk.io/log v1.1.1-0.20230704160919-88f2c830b0ca h1:msenprh2BLLRwNT7zN56TbBHOGk/7ARQckXHxXyvjoQ= -cosmossdk.io/log v1.1.1-0.20230704160919-88f2c830b0ca/go.mod h1:PkIAKXZvaxrTRc++z53XMRvFk8AcGGWYHcMIPzVYX9c= -cosmossdk.io/math v1.0.1 h1:Qx3ifyOPaMLNH/89WeZFH268yCvU4xEcnPLu3sJqPPg= -cosmossdk.io/math v1.0.1/go.mod h1:Ygz4wBHrgc7g0N+8+MrnTfS9LLn9aaTGa9hKopuym5k= +cosmossdk.io/log v1.2.1 h1:Xc1GgTCicniwmMiKwDxUjO4eLhPxoVdI9vtMW8Ti/uk= +cosmossdk.io/log v1.2.1/go.mod h1:GNSCc/6+DhFIj1aLn/j7Id7PaO8DzNylUZoOYBL9+I4= +cosmossdk.io/math v1.1.2 h1:ORZetZCTyWkI5GlZ6CZS28fMHi83ZYf+A2vVnHNzZBM= +cosmossdk.io/math v1.1.2/go.mod h1:l2Gnda87F0su8a/7FEKJfFdJrM0JZRXQaohlgJeyQh0= cosmossdk.io/tools/rosetta v0.2.1 h1:ddOMatOH+pbxWbrGJKRAawdBkPYLfKXutK9IETnjYxw= cosmossdk.io/tools/rosetta v0.2.1/go.mod h1:Pqdc1FdvkNV3LcNIkYWt2RQY6IP1ge6YWZk8MhhO9Hw= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= @@ -242,7 +242,6 @@ github.com/adlio/schema v1.3.3 h1:oBJn8I02PyTB466pZO1UZEn1TV5XLlifBSyMrmHl/1I= github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII= github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c= github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw= -github.com/alecthomas/participle/v2 v2.0.0-alpha7 h1:cK4vjj0VSgb3lN1nuKA5F7dw+1s1pWBe5bx7nNCnN+c= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= @@ -264,8 +263,8 @@ github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6l github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.44.122/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= -github.com/aws/aws-sdk-go v1.44.203 h1:pcsP805b9acL3wUqa4JR2vg1k2wnItkDYNvfmcy6F+U= -github.com/aws/aws-sdk-go v1.44.203/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= +github.com/aws/aws-sdk-go v1.44.224 h1:09CiaaF35nRmxrzWZ2uRq5v6Ghg/d2RiPjZnSgtt+RQ= +github.com/aws/aws-sdk-go v1.44.224/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= github.com/aws/aws-sdk-go-v2 v1.2.0/go.mod h1:zEQs02YRBw1DjK0PoJv3ygDYOFTre1ejlJWl8FwAuQo= github.com/aws/aws-sdk-go-v2/config v1.1.1/go.mod h1:0XsVy9lBI/BCXm+2Tuvt39YmdHwS5unDQmxZOYe8F5Y= @@ -321,8 +320,8 @@ github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4= github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= github.com/cenkalti/backoff/v4 v4.1.1/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= -github.com/cenkalti/backoff/v4 v4.1.3 h1:cFAlzYUlVYDysBEH2T5hyJZMh3+5+WCBvSnK6Q8UtC4= -github.com/cenkalti/backoff/v4 v4.1.3/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= +github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM= +github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/cp v0.1.0/go.mod h1:SOGHArjBr4JWaSDEVpWpo/hNg6RoKrls6Oh40hiwW+s= github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= @@ -356,7 +355,6 @@ github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWH github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cockroachdb/apd/v2 v2.0.2 h1:weh8u7Cneje73dDh+2tEVLUvyBc89iwepWCD8b8034E= github.com/cockroachdb/apd/v2 v2.0.2/go.mod h1:DDxRlzC2lo3/vSlmSoS7JkqbbrARPuFOGr0B9pvN3Gw= -github.com/cockroachdb/apd/v3 v3.1.0 h1:MK3Ow7LH0W8zkd5GMKA1PvS9qG3bWFI95WaVNfyZJ/w= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= github.com/cockroachdb/errors v1.10.0 h1:lfxS8zZz1+OjtV4MtNWgboi/W5tyLEB6VQZBXN+0VUU= github.com/cockroachdb/errors v1.10.0/go.mod h1:lknhIsEVQ9Ss/qKDBQS/UqFSvPQjOwNq2qyKAxtHRqE= @@ -422,8 +420,6 @@ github.com/creachadair/taskgroup v0.4.2 h1:jsBLdAJE42asreGss2xZGZ8fJra7WtwnHWeJF github.com/creachadair/taskgroup v0.4.2/go.mod h1:qiXUOSrbwAY3u0JPGTzObbE3yf9hcXHDKBZ2ZjpCbgM= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/cucumber/common/gherkin/go/v22 v22.0.0 h1:4K8NqptbvdOrjL9DEea6HFjSpbdT9+Q5kgLpmmsHYl0= -github.com/cucumber/common/messages/go/v17 v17.1.1 h1:RNqopvIFyLWnKv0LfATh34SWBhXeoFTJnSrgm9cT/Ts= github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4= github.com/danieljoos/wincred v1.2.0 h1:ozqKHaLK0W/ii4KVbbvluM91W2H3Sh0BncbUNPS7jLE= github.com/danieljoos/wincred v1.2.0/go.mod h1:FzQLLMKBFdvu+osBrnFODiv32YGwCfx0SkRa/eYHgec= @@ -506,8 +502,8 @@ github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbS github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff/go.mod h1:x7DCsMOv1taUwEWCzT4cmDeAkigA5/QCwUodaVOe8Ww= github.com/getkin/kin-openapi v0.53.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4= github.com/getkin/kin-openapi v0.61.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4= -github.com/getsentry/sentry-go v0.21.0 h1:c9l5F1nPF30JIppulk4veau90PK6Smu3abgVtVQWon4= -github.com/getsentry/sentry-go v0.21.0/go.mod h1:lc76E2QywIyW8WuBnwl8Lc4bkmQH4+w1gwTf25trprY= +github.com/getsentry/sentry-go v0.23.0 h1:dn+QRCeJv4pPt9OjVXiMcGIBIefaTJPw/h0bZWO05nE= +github.com/getsentry/sentry-go v0.23.0/go.mod h1:lc76E2QywIyW8WuBnwl8Lc4bkmQH4+w1gwTf25trprY= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= @@ -558,7 +554,6 @@ github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 h1:ZpnhV/YsD2/4cESfV5+ github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gofrs/uuid v3.3.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= -github.com/gofrs/uuid v4.3.0+incompatible h1:CaSVZxm5B+7o45rtab4jC2G37WGYX1zQfuU2i6DSvnc= github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= github.com/gogo/googleapis v1.4.1-0.20201022092350-68b0159b7869/go.mod h1:5YRNX2z1oM5gXdAkurHa942MDgEJyk02w4OecKY87+c= github.com/gogo/googleapis v1.4.1 h1:1Yx4Myt7BxzvUr5ldGSbwYiZG6t9wGBZ+8/fX3Wvtq0= @@ -824,8 +819,8 @@ github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYs github.com/klauspost/compress v1.11.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.12.3/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= github.com/klauspost/compress v1.15.11/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM= -github.com/klauspost/compress v1.16.5 h1:IFV2oUNUzZaz+XyusxpLzpzS8Pt5rh0Z16For/djlyI= -github.com/klauspost/compress v1.16.5/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I= +github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= github.com/klauspost/cpuid v0.0.0-20170728055534-ae7887de9fa5/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= github.com/klauspost/crc32 v0.0.0-20161016154125-cb6bfca970f6/go.mod h1:+ZoRqAPRLkC4NPOvfYeR5KNOrY6TD+/sAC3HXPZgDYg= github.com/klauspost/pgzip v1.0.2-0.20170402124221-0bf5dcad4ada/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs= @@ -848,8 +843,8 @@ github.com/leanovate/gopter v0.2.9/go.mod h1:U2L/78B+KVFIx2VmW6onHJQzXtFb+p5y3y2 github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w= github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/lib/pq v1.10.7 h1:p7ZhMD+KsSRozJr34udlUrhboJwWAgCg34+/ZZNvZZw= -github.com/lib/pq v1.10.7/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= +github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= +github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/libp2p/go-buffer-pool v0.1.0 h1:oK4mSFcQz7cTQIfqbe4MIj9gLW+mnanjyFtc6cdF0Y8= github.com/libp2p/go-buffer-pool v0.1.0/go.mod h1:N+vh8gMqimBzdKkSMVuydVDq+UV5QTWy5HSiZacSbPg= github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM= @@ -1041,15 +1036,14 @@ github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsT github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.3.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= -github.com/prometheus/procfs v0.10.1 h1:kYK1Va/YMlutzCGazswoHKo//tZVlFpKYh+PymziUAg= -github.com/prometheus/procfs v0.10.1/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM= +github.com/prometheus/procfs v0.11.0 h1:5EAgkfkMl659uZPbe9AS2N68a7Cc1TJbPEuGzFuRbyk= +github.com/prometheus/procfs v0.11.0/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/rakyll/statik v0.1.7 h1:OF3QCZUuyPxuGEP7B4ypUa7sB/iHtqOTDYZXGM8KOdQ= github.com/rakyll/statik v0.1.7/go.mod h1:AlZONWzMtEnMs7W4e/1LURLiI49pIMmp6V9Unghqrcc= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= -github.com/regen-network/gocuke v0.6.2 h1:pHviZ0kKAq2U2hN2q3smKNxct6hS0mGByFMHGnWA97M= github.com/regen-network/protobuf v1.3.3-alpha.regen.1 h1:OHEc+q5iIAXpqiqFKeLpu5NwTIkVXUs48vFMwzqpqY4= github.com/regen-network/protobuf v1.3.3-alpha.regen.1/go.mod h1:2DjTFR1HhMQhiWC5sZ4OhQ3+NtdbZ6oBDKQwq5Ou+FI= github.com/retailnext/hllpp v1.0.1-0.20180308014038-101a6d2f8b52/go.mod h1:RDpi1RftBQPUCDRw6SmxeaREsAaRKnOclghuzp/WRzc= @@ -1058,14 +1052,14 @@ github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6So github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= -github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= -github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= +github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= +github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= github.com/rs/cors v1.8.3 h1:O+qNyWn7Z+F9M0ILBHgMVPuB1xTOucVd5gtaYyXBpRo= github.com/rs/cors v1.8.3/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= -github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= -github.com/rs/zerolog v1.29.1 h1:cO+d60CHkknCbvzEWxP0S9K6KqyTjrCNUy1LdQLCGPc= -github.com/rs/zerolog v1.29.1/go.mod h1:Le6ESbR7hc+DP6Lt1THiV8CQSdkkNrd3R0XbEgp3ZBU= +github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= +github.com/rs/zerolog v1.30.0 h1:SymVODrcRsaRaSInD9yQtKbtWqwsfoPcRff/oRXLj4c= +github.com/rs/zerolog v1.30.0/go.mod h1:/tk+P47gFdPXq4QYjvCmT5/Gsug2nagsFWBWhAiSi1w= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= @@ -1084,9 +1078,9 @@ github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPx github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= -github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= -github.com/skip-mev/pob v1.0.3 h1:cipN/WUU+xfYbcfUQ4EefSvl3ItocsKgRn3tOtRF2OE= -github.com/skip-mev/pob v1.0.3/go.mod h1:PMs/dqcWOQruSN6zLExU0TzlBfBmGA8iTy+FJhxn0T8= +github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= +github.com/skip-mev/block-sdk v1.0.0 h1:unp9laTgcePHPRm5TCr0xHmytDmTnqAwlivsn/LqTWI= +github.com/skip-mev/block-sdk v1.0.0/go.mod h1:+yIvnG/K0o/fnWkX4Iw/Wt7m1ofUO67uz0rsbULuSAY= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= @@ -1240,8 +1234,8 @@ golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220314234659-1baeb1ce4c0b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA= -golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio= +golang.org/x/crypto v0.12.0 h1:tFM/ta59kqch6LlvYnPa0yx5a83cL2nHflFhYKvv9Yk= +golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -1256,8 +1250,8 @@ golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw= -golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 h1:k/i9J1pBpvlfR+9QsetwPyERsqu1GIbi967PQMq3Ivc= -golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w= +golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb h1:xIApU0ow1zwMa2uL1VDNeQlNVFTWMQxZUZCMDy0Q4Us= +golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= @@ -1285,7 +1279,7 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs= +golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc= golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1352,8 +1346,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= -golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50= -golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= +golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14= +golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1379,8 +1373,8 @@ golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094/go.mod h1:h4gKUeWbJ4rQPri golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= golang.org/x/oauth2 v0.1.0/go.mod h1:G9FE4dLTsbXUu90h/Pf85g4w1D+SSAgR+q46nJZ8M4A= -golang.org/x/oauth2 v0.8.0 h1:6dkIjl3j3LtZ/O3sTgZTMsLKSftL/B8Zgq4huOIIUu8= -golang.org/x/oauth2 v0.8.0/go.mod h1:yr7u4HXZRm1R1kBWqr/xKNqewf0plRYoB7sla+BCIXE= +golang.org/x/oauth2 v0.10.0 h1:zHCpF2Khkwy4mMB4bv0U37YtJdTGW8jI0glAApi0Kh8= +golang.org/x/oauth2 v0.10.0/go.mod h1:kTpgurOux7LqtuxjuyZa4Gj2gdezIt/jQtGnNFfypQI= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -1395,7 +1389,8 @@ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI= +golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= +golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -1504,14 +1499,14 @@ golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20221010170243-090e33056c14/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA= -golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM= +golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.10.0 h1:3R7pNqamzBraeqj/Tj8qt1aQ2HpmlC+Cx/qL/7hn4/c= -golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o= +golang.org/x/term v0.11.0 h1:F9tnn/DA/Im8nCwm+fX+1/eBwi4qFjRT++MhtVC4ZX0= +golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1523,8 +1518,8 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4= -golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc= +golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -1595,7 +1590,7 @@ golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4= +golang.org/x/tools v0.12.0 h1:YW6HUoUmYBpwSgyaGaZq1fHjrBjX1rlpZ54T6mu2kss= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -1782,10 +1777,10 @@ google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqw google.golang.org/genproto v0.0.0-20221014173430-6e2ab493f96b/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221025140454-527a21cfbd71/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s= -google.golang.org/genproto v0.0.0-20230706204954-ccb25ca9f130 h1:Au6te5hbKUV8pIYWHqOUZ1pva5qK/rwbIhoXEUB9Lu8= -google.golang.org/genproto v0.0.0-20230706204954-ccb25ca9f130/go.mod h1:O9kGHb51iE/nOGvQaDUuadVYqovW56s5emA88lQnj6Y= -google.golang.org/genproto/googleapis/api v0.0.0-20230629202037-9506855d4529 h1:s5YSX+ZH5b5vS9rnpGymvIyMpLRJizowqDlOuyjXnTk= -google.golang.org/genproto/googleapis/api v0.0.0-20230629202037-9506855d4529/go.mod h1:vHYtlOoi6TsQ3Uk2yxR7NI5z8uoV+3pZtR4jmHIkRig= +google.golang.org/genproto v0.0.0-20230711160842-782d3b101e98 h1:Z0hjGZePRE0ZBWotvtrwxFNrNE9CUAGtplaDK5NNI/g= +google.golang.org/genproto v0.0.0-20230711160842-782d3b101e98/go.mod h1:S7mY02OqCJTD0E1OiQy1F72PWFB4bZJ87cAtLPYgDR0= +google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98 h1:FmF5cCW94Ij59cfpoLiwTgodWmm60eEV0CjlsVg2fuw= +google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98/go.mod h1:rsr7RhLuwsDKL7RmgDDCUc6yaGr1iqceVb5Wv6f6YvQ= google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 h1:bVf09lpb+OJbByTj913DRJioFFAjf/ZGxEz7MajTp2U= google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= @@ -1829,8 +1824,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.56.2 h1:fVRFRnXvU+x6C4IlHZewvJOVHoOv1TUuQyoRsYnB4bI= -google.golang.org/grpc v1.56.2/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s= +google.golang.org/grpc v1.58.2 h1:SXUpjxeVF3FKrTYQI4f4KvbGD5u2xccdYdurwowix5I= +google.golang.org/grpc v1.58.2/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0= 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= From 4f285beee5b00b94ae9ee03c7e28089db65038f9 Mon Sep 17 00:00:00 2001 From: swelf Date: Wed, 4 Oct 2023 16:58:38 +0300 Subject: [PATCH 150/307] added consensus migration --- app/app.go | 1 + app/upgrades/nextupgrade/upgrades.go | 12 ++++++++++++ app/upgrades/types.go | 2 ++ 3 files changed, 15 insertions(+) diff --git a/app/app.go b/app/app.go index 9d4527ad7..1265d44f8 100644 --- a/app/app.go +++ b/app/app.go @@ -1023,6 +1023,7 @@ func (app *App) setupUpgradeHandlers() { BuilderKeeper: app.BuilderKeeper, ContractManager: app.ContractManagerKeeper, AdminModule: app.AdminmoduleKeeper, + ConsensusKeeper: &app.ConsensusParamsKeeper, GlobalFeeSubspace: app.GetSubspace(globalfee.ModuleName), CcvConsumerSubspace: app.GetSubspace(ccvconsumertypes.ModuleName), }, diff --git a/app/upgrades/nextupgrade/upgrades.go b/app/upgrades/nextupgrade/upgrades.go index e022bbc91..6a17963e6 100644 --- a/app/upgrades/nextupgrade/upgrades.go +++ b/app/upgrades/nextupgrade/upgrades.go @@ -2,6 +2,9 @@ package nextupgrade import ( "fmt" + "github.com/cosmos/cosmos-sdk/baseapp" + consensuskeeper "github.com/cosmos/cosmos-sdk/x/consensus/keeper" + paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" "cosmossdk.io/math" "github.com/cosmos/cosmos-sdk/codec" @@ -108,12 +111,16 @@ func CreateUpgradeHandler( return vm, err } + ctx.Logger().Info("migrating adminmodule...") err = migrateAdminModule(ctx, keepers) if err != nil { ctx.Logger().Error("failed to migrate admin module", "err", err) return vm, err } + ctx.Logger().Info("Migrating consensus params...") + migrateConsensusParams(ctx, keepers.ParamsKeeper, keepers.ConsensusKeeper) + ctx.Logger().Info("Upgrade complete") return vm, nil } @@ -299,3 +306,8 @@ func migrateAdminModule(ctx sdk.Context, keepers *upgrades.UpgradeKeepers) error return nil } + +func migrateConsensusParams(ctx sdk.Context, paramsKeepers paramskeeper.Keeper, keeper *consensuskeeper.Keeper) { + baseAppLegacySS := paramsKeepers.Subspace(baseapp.Paramspace).WithKeyTable(paramstypes.ConsensusParamsKeyTable()) + baseapp.MigrateParams(ctx, baseAppLegacySS, keeper) +} diff --git a/app/upgrades/types.go b/app/upgrades/types.go index 6b545d098..f8460bf25 100644 --- a/app/upgrades/types.go +++ b/app/upgrades/types.go @@ -6,6 +6,7 @@ import ( store "github.com/cosmos/cosmos-sdk/store/types" "github.com/cosmos/cosmos-sdk/types/module" capabilitykeeper "github.com/cosmos/cosmos-sdk/x/capability/keeper" + consensuskeeper "github.com/cosmos/cosmos-sdk/x/consensus/keeper" paramskeeper "github.com/cosmos/cosmos-sdk/x/params/keeper" slashingkeeper "github.com/cosmos/cosmos-sdk/x/slashing/keeper" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" @@ -47,6 +48,7 @@ type UpgradeKeepers struct { BuilderKeeper builderkeeper.Keeper ContractManager contractmanagerkeeper.Keeper AdminModule adminmodulekeeper.Keeper + ConsensusKeeper *consensuskeeper.Keeper // subspaces GlobalFeeSubspace paramtypes.Subspace CcvConsumerSubspace paramtypes.Subspace From ea42c9af01189246ce2c3d506cb845ca50d915ec Mon Sep 17 00:00:00 2001 From: Nikhil Vasan Date: Wed, 4 Oct 2023 08:39:16 -0700 Subject: [PATCH 151/307] linting --- app/ante_handler.go | 12 ++++++------ app/app.go | 19 ++++++++++++------- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/app/ante_handler.go b/app/ante_handler.go index 8c966d971..1fce699c7 100644 --- a/app/ante_handler.go +++ b/app/ante_handler.go @@ -15,9 +15,9 @@ import ( ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper" consumerante "github.com/cosmos/interchain-security/v3/app/consumer/ante" ibcconsumerkeeper "github.com/cosmos/interchain-security/v3/x/ccv/consumer/keeper" + blocksdkanteignore "github.com/skip-mev/block-sdk/block/utils" auctionante "github.com/skip-mev/block-sdk/x/auction/ante" auctionkeeper "github.com/skip-mev/block-sdk/x/auction/keeper" - blocksdkanteignore "github.com/skip-mev/block-sdk/block/utils" ) // HandlerOptions extend the SDK's AnteHandler options by requiring the IBC @@ -33,10 +33,10 @@ type HandlerOptions struct { // block-sdk deps // Auction deps AuctionKeeper auctionkeeper.Keeper - TxEncoder sdk.TxEncoder - MEVLane auctionante.MEVLane - FreeLanes []blocksdkanteignore.Lane - Mempool auctionante.Mempool + TxEncoder sdk.TxEncoder + MEVLane auctionante.MEVLane + FreeLanes []blocksdkanteignore.Lane + Mempool auctionante.Mempool // globalFee GlobalFeeSubspace paramtypes.Subspace @@ -93,7 +93,7 @@ func NewAnteHandler(options HandlerOptions, logger log.Logger) (sdk.AnteHandler, // we ignore the fee-deductor for any transactions that match the given free lanes blocksdkanteignore.NewIgnoreDecorator( ante.NewDeductFeeDecorator(options.AccountKeeper, options.BankKeeper, options.FeegrantKeeper, options.TxFeeChecker), - options.FreeLanes... + options.FreeLanes..., ), // SetPubKeyDecorator must be called before all signature verification decorators ante.NewSetPubKeyDecorator(options.AccountKeeper), diff --git a/app/app.go b/app/app.go index 250860717..bef2486dc 100644 --- a/app/app.go +++ b/app/app.go @@ -152,6 +152,7 @@ import ( // Block-sdk imports blocksdkabci "github.com/skip-mev/block-sdk/abci" + signer_extraction_adapter "github.com/skip-mev/block-sdk/adapters/signer_extraction_adapter" blocksdk "github.com/skip-mev/block-sdk/block" "github.com/skip-mev/block-sdk/block/base" blocksdkbase "github.com/skip-mev/block-sdk/block/base" @@ -165,7 +166,6 @@ import ( auctionkeeper "github.com/skip-mev/block-sdk/x/auction/keeper" rewardsaddressprovider "github.com/skip-mev/block-sdk/x/auction/rewards" auctiontypes "github.com/skip-mev/block-sdk/x/auction/types" - signer_extraction_adapter "github.com/skip-mev/block-sdk/adapters/signer_extraction_adapter" ) const ( @@ -973,11 +973,11 @@ func New( TXCounterStoreKey: keys[wasmtypes.StoreKey], ConsumerKeeper: app.ConsumerKeeper, GlobalFeeSubspace: app.GetSubspace(globalfee.ModuleName), - AuctionKeeper: app.AuctionKeeper, - TxEncoder: app.GetTxConfig().TxEncoder(), - Mempool: app.Mempool, - MEVLane: app.MEVLane, - FreeLanes: app.FreeLanes, + AuctionKeeper: app.AuctionKeeper, + TxEncoder: app.GetTxConfig().TxEncoder(), + Mempool: app.Mempool, + MEVLane: app.MEVLane, + FreeLanes: app.FreeLanes, }, app.Logger(), ) @@ -986,10 +986,15 @@ func New( } app.SetAnteHandler(anteHandler) + mevLane.SetAnteHandler(anteHandler) + freeLane.SetAnteHandler(anteHandler) + baseLane.SetAnteHandler(anteHandler) + + app.SetEndBlocker(app.EndBlocker) handler := blocksdkabci.NewProposalHandler( - app.Logger(), + app.Logger(), app.GetTxConfig().TxDecoder(), mempool, ) From 45904a7162289482793bf287a8531003a47264ef Mon Sep 17 00:00:00 2001 From: swelf Date: Thu, 5 Oct 2023 03:44:35 +0300 Subject: [PATCH 152/307] updated cosmos-sdk --- go.mod | 2 +- go.sum | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 1f7a107c9..8edb12b45 100644 --- a/go.mod +++ b/go.mod @@ -191,7 +191,7 @@ replace ( github.com/ChainSafe/go-schnorrkel => github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d github.com/CosmWasm/wasmd => github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230808084410-6083b888424e github.com/cosmos/admin-module => github.com/neutron-org/admin-module v0.0.0-20230906150724-9ccb75c61fc5 - github.com/cosmos/cosmos-sdk => github.com/neutron-org/cosmos-sdk v0.47.5-0.20230921074823-5d5ff8b93265 + github.com/cosmos/cosmos-sdk => github.com/neutron-org/cosmos-sdk v0.47.5-0.20230929200416-6c59762e84ad github.com/cosmos/gaia/v11 => github.com/cosmos/gaia/v11 v11.0.0-20230724152830-861ba391c3b4 github.com/cosmos/ledger-cosmos-go => github.com/cosmos/ledger-cosmos-go v0.12.1 github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 diff --git a/go.sum b/go.sum index e75dab952..20a82ff6f 100644 --- a/go.sum +++ b/go.sum @@ -942,6 +942,7 @@ github.com/neutron-org/admin-module v0.0.0-20230906150724-9ccb75c61fc5 h1:96ZjLW github.com/neutron-org/admin-module v0.0.0-20230906150724-9ccb75c61fc5/go.mod h1:INknneN2W3Fr9Eld7SpfLRdjyHR1muzFbbqXln1ixic= github.com/neutron-org/cosmos-sdk v0.47.5-0.20230921074823-5d5ff8b93265 h1:CIyjGN+/WTIgGyUEAiL7HcxQ2/XYX3r2Nv4RWBbhl8o= github.com/neutron-org/cosmos-sdk v0.47.5-0.20230921074823-5d5ff8b93265/go.mod h1:4xMyIVekAs2OEUz/yh9JwzhLBMk+olM2sxgKuQdlhLg= +github.com/neutron-org/cosmos-sdk v0.47.5-0.20230929200416-6c59762e84ad/go.mod h1:4xMyIVekAs2OEUz/yh9JwzhLBMk+olM2sxgKuQdlhLg= github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230808084410-6083b888424e h1:uVJCBWf1vcCYY0pzOA2SCPIZT8WsR8fsOxs57mnJbM4= github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230808084410-6083b888424e/go.mod h1:Oagy36cU49438NzxKG/gmGTG903tiAI7LIUdH7x2qNY= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= From 0b93ac440d90a0d6f1d4ef235a8cd0938aa00673 Mon Sep 17 00:00:00 2001 From: swelf Date: Sat, 7 Oct 2023 00:18:01 +0300 Subject: [PATCH 153/307] updated go.sum --- go.sum | 1 + 1 file changed, 1 insertion(+) diff --git a/go.sum b/go.sum index 20a82ff6f..3408f4581 100644 --- a/go.sum +++ b/go.sum @@ -942,6 +942,7 @@ github.com/neutron-org/admin-module v0.0.0-20230906150724-9ccb75c61fc5 h1:96ZjLW github.com/neutron-org/admin-module v0.0.0-20230906150724-9ccb75c61fc5/go.mod h1:INknneN2W3Fr9Eld7SpfLRdjyHR1muzFbbqXln1ixic= github.com/neutron-org/cosmos-sdk v0.47.5-0.20230921074823-5d5ff8b93265 h1:CIyjGN+/WTIgGyUEAiL7HcxQ2/XYX3r2Nv4RWBbhl8o= github.com/neutron-org/cosmos-sdk v0.47.5-0.20230921074823-5d5ff8b93265/go.mod h1:4xMyIVekAs2OEUz/yh9JwzhLBMk+olM2sxgKuQdlhLg= +github.com/neutron-org/cosmos-sdk v0.47.5-0.20230929200416-6c59762e84ad h1:BvYliP3KHiay2VLQwUSmDNCXm380TSTLDud8PH4RV6A= github.com/neutron-org/cosmos-sdk v0.47.5-0.20230929200416-6c59762e84ad/go.mod h1:4xMyIVekAs2OEUz/yh9JwzhLBMk+olM2sxgKuQdlhLg= github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230808084410-6083b888424e h1:uVJCBWf1vcCYY0pzOA2SCPIZT8WsR8fsOxs57mnJbM4= github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230808084410-6083b888424e/go.mod h1:Oagy36cU49438NzxKG/gmGTG903tiAI7LIUdH7x2qNY= From 7f42c767591bae9313a784f61a1c3bbe7c28c157 Mon Sep 17 00:00:00 2001 From: nhpd Date: Tue, 10 Oct 2023 16:40:10 +0400 Subject: [PATCH 154/307] change to ~1.6 mb --- app/app.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/app.go b/app/app.go index 1299b528c..21b1761dd 100644 --- a/app/app.go +++ b/app/app.go @@ -1256,6 +1256,6 @@ func (app *App) RegisterNodeService(clientCtx client.Context) { // - allow for larger wasm files func overrideWasmVariables() { // Override Wasm size limitation from WASMD. - wasmtypes.MaxWasmSize = 3 * 1024 * 1024 + wasmtypes.MaxWasmSize = 1_677_722 // ~1.6 mb (1024 * 1024 * 1.6) wasmtypes.MaxProposalWasmSize = wasmtypes.MaxWasmSize } From f9115bdffe48b83e42eef10698587e95ae12a15e Mon Sep 17 00:00:00 2001 From: Nikhil Vasan Date: Tue, 10 Oct 2023 09:15:15 -0700 Subject: [PATCH 155/307] remove free lanes --- app/ante_handler.go | 8 +------- app/app.go | 17 +---------------- 2 files changed, 2 insertions(+), 23 deletions(-) diff --git a/app/ante_handler.go b/app/ante_handler.go index 1fce699c7..422b37866 100644 --- a/app/ante_handler.go +++ b/app/ante_handler.go @@ -15,7 +15,6 @@ import ( ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper" consumerante "github.com/cosmos/interchain-security/v3/app/consumer/ante" ibcconsumerkeeper "github.com/cosmos/interchain-security/v3/x/ccv/consumer/keeper" - blocksdkanteignore "github.com/skip-mev/block-sdk/block/utils" auctionante "github.com/skip-mev/block-sdk/x/auction/ante" auctionkeeper "github.com/skip-mev/block-sdk/x/auction/keeper" ) @@ -35,7 +34,6 @@ type HandlerOptions struct { AuctionKeeper auctionkeeper.Keeper TxEncoder sdk.TxEncoder MEVLane auctionante.MEVLane - FreeLanes []blocksdkanteignore.Lane Mempool auctionante.Mempool // globalFee @@ -90,11 +88,7 @@ func NewAnteHandler(options HandlerOptions, logger log.Logger) (sdk.AnteHandler, // otherwise you will get panic globalfeeante.NewFeeDecorator(options.GlobalFeeSubspace, nil), - // we ignore the fee-deductor for any transactions that match the given free lanes - blocksdkanteignore.NewIgnoreDecorator( - ante.NewDeductFeeDecorator(options.AccountKeeper, options.BankKeeper, options.FeegrantKeeper, options.TxFeeChecker), - options.FreeLanes..., - ), + ante.NewDeductFeeDecorator(options.AccountKeeper, options.BankKeeper, options.FeegrantKeeper, options.TxFeeChecker), // SetPubKeyDecorator must be called before all signature verification decorators ante.NewSetPubKeyDecorator(options.AccountKeeper), ante.NewValidateSigCountDecorator(options.AccountKeeper), diff --git a/app/app.go b/app/app.go index bef2486dc..065db5eca 100644 --- a/app/app.go +++ b/app/app.go @@ -154,12 +154,8 @@ import ( blocksdkabci "github.com/skip-mev/block-sdk/abci" signer_extraction_adapter "github.com/skip-mev/block-sdk/adapters/signer_extraction_adapter" blocksdk "github.com/skip-mev/block-sdk/block" - "github.com/skip-mev/block-sdk/block/base" blocksdkbase "github.com/skip-mev/block-sdk/block/base" - blocksdkanteignore "github.com/skip-mev/block-sdk/block/utils" base_lane "github.com/skip-mev/block-sdk/lanes/base" - "github.com/skip-mev/block-sdk/lanes/free" - free_lane "github.com/skip-mev/block-sdk/lanes/free" mev_lane "github.com/skip-mev/block-sdk/lanes/mev" "github.com/skip-mev/block-sdk/x/auction" auctionante "github.com/skip-mev/block-sdk/x/auction/ante" @@ -334,7 +330,6 @@ type App struct { // Lanes Mempool auctionante.Mempool MEVLane auctionante.MEVLane - FreeLanes []blocksdkanteignore.Lane } func (app *App) GetTestBankKeeper() integration.TestBankKeeper { @@ -932,13 +927,6 @@ func New( baseLane := base_lane.NewDefaultLane(cfg) - freeLane := free_lane.NewFreeLane( - cfg, - base.DefaultTxPriority(), - free.DefaultMatchHandler(), // modify this match-handler to determine any other transactions that the chain would like to be free - ) - app.FreeLanes = []blocksdkanteignore.Lane{freeLane} - mevLane := mev_lane.NewMEVLane( cfg, mev_lane.NewDefaultAuctionFactory(app.GetTxConfig().TxDecoder(), signer_extraction_adapter.NewDefaultAdapter()), @@ -950,7 +938,6 @@ func New( true, []blocksdk.Lane{ mevLane, // mev-lane is first to prioritize bids being placed at the TOB - freeLane, // free-lane is second to prioritize free txs baseLane, // finally, all the rest of txs... }..., ) @@ -977,7 +964,6 @@ func New( TxEncoder: app.GetTxConfig().TxEncoder(), Mempool: app.Mempool, MEVLane: app.MEVLane, - FreeLanes: app.FreeLanes, }, app.Logger(), ) @@ -987,9 +973,8 @@ func New( app.SetAnteHandler(anteHandler) mevLane.SetAnteHandler(anteHandler) - freeLane.SetAnteHandler(anteHandler) baseLane.SetAnteHandler(anteHandler) - + app.SetEndBlocker(app.EndBlocker) From 4612ced68501bf18f8aff3f5238f8300d8425c7b Mon Sep 17 00:00:00 2001 From: swelf Date: Wed, 11 Oct 2023 12:04:38 +0300 Subject: [PATCH 156/307] empty bypassMinFee list --- app/upgrades/nextupgrade/upgrades.go | 9 +-------- app/upgrades/nextupgrade/upgrades_test.go | 9 +-------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/app/upgrades/nextupgrade/upgrades.go b/app/upgrades/nextupgrade/upgrades.go index 6a17963e6..3efecdbc2 100644 --- a/app/upgrades/nextupgrade/upgrades.go +++ b/app/upgrades/nextupgrade/upgrades.go @@ -17,8 +17,6 @@ import ( upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" "github.com/cosmos/gaia/v11/x/globalfee/types" v6 "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/migrations/v6" - ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" - ibcchanneltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" ccvconsumertypes "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types" builderkeeper "github.com/skip-mev/pob/x/builder/keeper" buildertypes "github.com/skip-mev/pob/x/builder/types" @@ -260,12 +258,7 @@ func migrateGlobalFees(ctx sdk.Context, keepers *upgrades.UpgradeKeepers) error ctx.Logger().Info("Global fees was set successfully") - defaultBypassFeeMessages := []string{ - sdk.MsgTypeURL(&ibcchanneltypes.MsgRecvPacket{}), - sdk.MsgTypeURL(&ibcchanneltypes.MsgAcknowledgement{}), - sdk.MsgTypeURL(&ibcclienttypes.MsgUpdateClient{}), - } - keepers.GlobalFeeSubspace.Set(ctx, types.ParamStoreKeyBypassMinFeeMsgTypes, &defaultBypassFeeMessages) + keepers.GlobalFeeSubspace.Set(ctx, types.ParamStoreKeyBypassMinFeeMsgTypes, &[]string{}) ctx.Logger().Info("Bypass min fee msg types was set successfully") diff --git a/app/upgrades/nextupgrade/upgrades_test.go b/app/upgrades/nextupgrade/upgrades_test.go index f3146ae7a..453aae2e1 100644 --- a/app/upgrades/nextupgrade/upgrades_test.go +++ b/app/upgrades/nextupgrade/upgrades_test.go @@ -20,8 +20,6 @@ import ( upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" "github.com/cosmos/gaia/v11/x/globalfee" globalfeetypes "github.com/cosmos/gaia/v11/x/globalfee/types" - ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" - ibcchanneltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" "github.com/stretchr/testify/suite" "github.com/neutron-org/neutron/app/upgrades/nextupgrade" @@ -98,12 +96,7 @@ func (suite *UpgradeTestSuite) TestGlobalFeesUpgrade() { var actualBypassFeeMessages []string globalFeeSubspace.Get(ctx, globalfeetypes.ParamStoreKeyBypassMinFeeMsgTypes, &actualBypassFeeMessages) - requiredBypassMinFeeMsgTypes := []string{ - sdk.MsgTypeURL(&ibcchanneltypes.MsgRecvPacket{}), - sdk.MsgTypeURL(&ibcchanneltypes.MsgAcknowledgement{}), - sdk.MsgTypeURL(&ibcclienttypes.MsgUpdateClient{}), - } - suite.Require().Equal(requiredBypassMinFeeMsgTypes, actualBypassFeeMessages) + suite.Require().Equal(0, len(actualBypassFeeMessages)) var actualTotalBypassMinFeeMsgGasUsage uint64 globalFeeSubspace.Get(ctx, globalfeetypes.ParamStoreKeyMaxTotalBypassMinFeeMsgGasUsage, &actualTotalBypassMinFeeMsgGasUsage) From 72bfd51eedde1b2708bc2b8fc19e5787fe795e76 Mon Sep 17 00:00:00 2001 From: Nikhil Vasan Date: Fri, 20 Oct 2023 10:27:39 -0700 Subject: [PATCH 157/307] block-sdk update --- app/ante_handler.go | 4 ++-- app/app.go | 3 ++- go.mod | 20 ++++++++++---------- go.sum | 41 ++++++++++++++++++++--------------------- 4 files changed, 34 insertions(+), 34 deletions(-) diff --git a/app/ante_handler.go b/app/ante_handler.go index 422b37866..7d67d7d9e 100644 --- a/app/ante_handler.go +++ b/app/ante_handler.go @@ -17,6 +17,7 @@ import ( ibcconsumerkeeper "github.com/cosmos/interchain-security/v3/x/ccv/consumer/keeper" auctionante "github.com/skip-mev/block-sdk/x/auction/ante" auctionkeeper "github.com/skip-mev/block-sdk/x/auction/keeper" + blocksdk "github.com/skip-mev/block-sdk/block" ) // HandlerOptions extend the SDK's AnteHandler options by requiring the IBC @@ -34,7 +35,7 @@ type HandlerOptions struct { AuctionKeeper auctionkeeper.Keeper TxEncoder sdk.TxEncoder MEVLane auctionante.MEVLane - Mempool auctionante.Mempool + Mempool blocksdk.Mempool // globalFee GlobalFeeSubspace paramtypes.Subspace @@ -100,7 +101,6 @@ func NewAnteHandler(options HandlerOptions, logger log.Logger) (sdk.AnteHandler, options.AuctionKeeper, options.TxEncoder, options.MEVLane, - options.Mempool, ), } diff --git a/app/app.go b/app/app.go index 02943caa4..798cc7f48 100644 --- a/app/app.go +++ b/app/app.go @@ -328,7 +328,7 @@ type App struct { checkTxHandler mev_lane.CheckTx // Lanes - Mempool auctionante.Mempool + Mempool blocksdk.Mempool MEVLane auctionante.MEVLane } @@ -983,6 +983,7 @@ func New( handler := blocksdkabci.NewProposalHandler( app.Logger(), app.GetTxConfig().TxDecoder(), + app.GetTxConfig().TxEncoder(), mempool, ) app.SetPrepareProposal(handler.PrepareProposalHandler()) diff --git a/go.mod b/go.mod index 884d1ebe1..f60adf450 100644 --- a/go.mod +++ b/go.mod @@ -29,20 +29,20 @@ require ( github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.16.0 github.com/rs/zerolog v1.30.0 - github.com/skip-mev/block-sdk v1.0.0 + github.com/skip-mev/block-sdk v1.1.0 github.com/spf13/cast v1.5.1 github.com/spf13/cobra v1.7.0 github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.16.0 github.com/stretchr/testify v1.8.4 - google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98 - google.golang.org/grpc v1.58.2 + google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d + google.golang.org/grpc v1.59.0 gopkg.in/yaml.v2 v2.4.0 ) require ( - cloud.google.com/go v0.110.4 // indirect - cloud.google.com/go/compute v1.21.0 // indirect + cloud.google.com/go v0.110.7 // indirect + cloud.google.com/go/compute v1.23.0 // indirect cloud.google.com/go/compute/metadata v0.2.3 // indirect cloud.google.com/go/iam v1.1.1 // indirect cloud.google.com/go/storage v1.30.1 // indirect @@ -94,7 +94,7 @@ require ( github.com/go-logfmt/logfmt v0.6.0 // indirect github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect github.com/gogo/googleapis v1.4.1 // indirect - github.com/golang/glog v1.1.1 // indirect + github.com/golang/glog v1.1.2 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/btree v1.1.2 // indirect @@ -102,7 +102,7 @@ require ( github.com/google/gofuzz v1.2.0 // indirect github.com/google/orderedcode v0.0.1 // indirect github.com/google/s2a-go v0.1.4 // indirect - github.com/google/uuid v1.3.0 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect github.com/googleapis/gax-go/v2 v2.11.0 // indirect github.com/gorilla/handlers v1.5.1 // indirect @@ -169,7 +169,7 @@ require ( golang.org/x/crypto v0.12.0 // indirect golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb // indirect golang.org/x/net v0.14.0 // indirect - golang.org/x/oauth2 v0.10.0 // indirect + golang.org/x/oauth2 v0.11.0 // indirect golang.org/x/sync v0.3.0 // indirect golang.org/x/sys v0.11.0 // indirect golang.org/x/term v0.11.0 // indirect @@ -177,8 +177,8 @@ require ( golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect google.golang.org/api v0.126.0 // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto v0.0.0-20230711160842-782d3b101e98 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect + google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect google.golang.org/protobuf v1.31.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index 15b257047..cd8dbb486 100644 --- a/go.sum +++ b/go.sum @@ -34,8 +34,8 @@ cloud.google.com/go v0.100.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w9 cloud.google.com/go v0.102.0/go.mod h1:oWcCzKlqJ5zgHQt9YsaeTY9KzIvjyy0ArmiBUgpQ+nc= cloud.google.com/go v0.102.1/go.mod h1:XZ77E9qnTEnrgEOvr4xzfdX5TRo7fB4T2F4O6+34hIU= cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA= -cloud.google.com/go v0.110.4 h1:1JYyxKMN9hd5dR2MYTPWkGUgcoxVVhg0LKNKEo0qvmk= -cloud.google.com/go v0.110.4/go.mod h1:+EYjdK8e5RME/VY/qLCAtuyALQ9q67dvuum8i+H5xsI= +cloud.google.com/go v0.110.7 h1:rJyC7nWRg2jWGZ4wSJ5nY65GTdYJkg0cd/uXb+ACI6o= +cloud.google.com/go v0.110.7/go.mod h1:+EYjdK8e5RME/VY/qLCAtuyALQ9q67dvuum8i+H5xsI= cloud.google.com/go/aiplatform v1.22.0/go.mod h1:ig5Nct50bZlzV6NvKaTwmplLLddFx0YReh9WfTO5jKw= cloud.google.com/go/aiplatform v1.24.0/go.mod h1:67UUvRBKG6GTayHKV8DBv2RtR1t93YRu5B1P3x99mYY= cloud.google.com/go/analytics v0.11.0/go.mod h1:DjEWCu41bVbYcKyvlws9Er60YE4a//bK6mnhWvQeFNI= @@ -73,8 +73,8 @@ cloud.google.com/go/compute v1.6.0/go.mod h1:T29tfhtVbq1wvAPo0E3+7vhgmkOYeXjhFvz cloud.google.com/go/compute v1.6.1/go.mod h1:g85FgpzFvNULZ+S8AYq87axRKuf2Kh7deLqV/jJ3thU= cloud.google.com/go/compute v1.7.0/go.mod h1:435lt8av5oL9P3fv1OEzSbSUe+ybHXGMPQHHZWZxy9U= cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU= -cloud.google.com/go/compute v1.21.0 h1:JNBsyXVoOoNJtTQcnEY5uYpZIbeCTYIeDe0Xh1bySMk= -cloud.google.com/go/compute v1.21.0/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM= +cloud.google.com/go/compute v1.23.0 h1:tP41Zoavr8ptEqaW6j+LQOnyBBhO7OkOMAGrgLopTwY= +cloud.google.com/go/compute v1.23.0/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM= cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= cloud.google.com/go/containeranalysis v0.5.1/go.mod h1:1D92jd8gRR/c0fGMlymRgxWD3Qw9C1ff6/T7mLgVL8I= @@ -562,8 +562,8 @@ github.com/golang-jwt/jwt/v4 v4.3.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzw github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= github.com/golang/geo v0.0.0-20190916061304-5b978397cfec/go.mod h1:QZ0nwyI2jOfgRAoBvP+ab5aRr7c9x7lhGEJrKvBwjWI= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/glog v1.1.1 h1:jxpi2eWoU84wbX9iIEyAeeoac3FLuifZpY9tcNUD9kw= -github.com/golang/glog v1.1.1/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/rLQ= +github.com/golang/glog v1.1.2 h1:DVjP2PbBOzHyzA+dn3WhHIq4NdVu3Q+pvivFICf/7fo= +github.com/golang/glog v1.1.2/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/rLQ= github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -661,8 +661,9 @@ github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+ github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/enterprise-certificate-proxy v0.1.0/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg= @@ -935,8 +936,6 @@ github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OS github.com/neilotoole/errgroup v0.1.6/go.mod h1:Q2nLGf+594h0CLBs/Mbg6qOr7GtqDK7C2S41udRnToE= github.com/neutron-org/admin-module v0.0.0-20230906150724-9ccb75c61fc5 h1:96ZjLWoN4nCIcFdxrz51Xu2Y8aqpcScy3eva3S5hM60= github.com/neutron-org/admin-module v0.0.0-20230906150724-9ccb75c61fc5/go.mod h1:INknneN2W3Fr9Eld7SpfLRdjyHR1muzFbbqXln1ixic= -github.com/neutron-org/cosmos-sdk v0.47.5-0.20230921074823-5d5ff8b93265 h1:CIyjGN+/WTIgGyUEAiL7HcxQ2/XYX3r2Nv4RWBbhl8o= -github.com/neutron-org/cosmos-sdk v0.47.5-0.20230921074823-5d5ff8b93265/go.mod h1:4xMyIVekAs2OEUz/yh9JwzhLBMk+olM2sxgKuQdlhLg= github.com/neutron-org/cosmos-sdk v0.47.5-0.20230929200416-6c59762e84ad h1:BvYliP3KHiay2VLQwUSmDNCXm380TSTLDud8PH4RV6A= github.com/neutron-org/cosmos-sdk v0.47.5-0.20230929200416-6c59762e84ad/go.mod h1:4xMyIVekAs2OEUz/yh9JwzhLBMk+olM2sxgKuQdlhLg= github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230808084410-6083b888424e h1:uVJCBWf1vcCYY0pzOA2SCPIZT8WsR8fsOxs57mnJbM4= @@ -1081,8 +1080,8 @@ github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6Mwd github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= -github.com/skip-mev/block-sdk v1.0.0 h1:unp9laTgcePHPRm5TCr0xHmytDmTnqAwlivsn/LqTWI= -github.com/skip-mev/block-sdk v1.0.0/go.mod h1:+yIvnG/K0o/fnWkX4Iw/Wt7m1ofUO67uz0rsbULuSAY= +github.com/skip-mev/block-sdk v1.1.0 h1:cYEO/ASxhtasdRStMXhw1cWOjCJ78Z3J+K01n++OHkU= +github.com/skip-mev/block-sdk v1.1.0/go.mod h1:G/ryMdo70R1xOJehV1RqDyTH0x7gffwB1wU9MLMzIHE= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= @@ -1375,8 +1374,8 @@ golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094/go.mod h1:h4gKUeWbJ4rQPri golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= golang.org/x/oauth2 v0.1.0/go.mod h1:G9FE4dLTsbXUu90h/Pf85g4w1D+SSAgR+q46nJZ8M4A= -golang.org/x/oauth2 v0.10.0 h1:zHCpF2Khkwy4mMB4bv0U37YtJdTGW8jI0glAApi0Kh8= -golang.org/x/oauth2 v0.10.0/go.mod h1:kTpgurOux7LqtuxjuyZa4Gj2gdezIt/jQtGnNFfypQI= +golang.org/x/oauth2 v0.11.0 h1:vPL4xzxBM4niKCW6g9whtaWVXTJf1U5e4aZxxFx/gbU= +golang.org/x/oauth2 v0.11.0/go.mod h1:LdF7O/8bLR/qWK9DrpXmbHLTouvRHK0SgJl0GmDBchk= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -1779,12 +1778,12 @@ google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqw google.golang.org/genproto v0.0.0-20221014173430-6e2ab493f96b/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221025140454-527a21cfbd71/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s= -google.golang.org/genproto v0.0.0-20230711160842-782d3b101e98 h1:Z0hjGZePRE0ZBWotvtrwxFNrNE9CUAGtplaDK5NNI/g= -google.golang.org/genproto v0.0.0-20230711160842-782d3b101e98/go.mod h1:S7mY02OqCJTD0E1OiQy1F72PWFB4bZJ87cAtLPYgDR0= -google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98 h1:FmF5cCW94Ij59cfpoLiwTgodWmm60eEV0CjlsVg2fuw= -google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98/go.mod h1:rsr7RhLuwsDKL7RmgDDCUc6yaGr1iqceVb5Wv6f6YvQ= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 h1:bVf09lpb+OJbByTj913DRJioFFAjf/ZGxEz7MajTp2U= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM= +google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d h1:VBu5YqKPv6XiJ199exd8Br+Aetz+o08F+PLMnwJQHAY= +google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d/go.mod h1:yZTlhN0tQnXo3h00fuXNCxJdLdIdnVFVBaRJ5LWBbw4= +google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d h1:DoPTO70H+bcDXcd39vOqb2viZxgqeBeSGtZ55yZU4/Q= +google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d/go.mod h1:KjSP20unUpOx5kyQUFa7k4OJg0qeJ7DEZflGDu2p6Bk= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d h1:uvYuEyMHKNt+lT4K3bN6fGswmK8qSvcreM3BwjDh+y4= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= @@ -1826,8 +1825,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.58.2 h1:SXUpjxeVF3FKrTYQI4f4KvbGD5u2xccdYdurwowix5I= -google.golang.org/grpc v1.58.2/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0= +google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk= +google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98= 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= From bf6d0105c84c095451a796880bdc87456633432a Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Tue, 24 Oct 2023 13:01:34 +0400 Subject: [PATCH 158/307] enable backwards compat feat --- app/app.go | 5 +- app/upgrades/nextupgrade/upgrades.go | 14 ++++- app/upgrades/nextupgrade/upgrades_test.go | 50 +++++++++++++++++ go.sum | 2 - testutil/test_helpers.go | 5 +- wasmbinding/bindings/msg.go | 2 +- wasmbinding/message_plugin.go | 9 ++- wasmbinding/test/custom_message_test.go | 52 +++++++++--------- wasmbinding/test/custom_query_test.go | 28 +++++----- .../testdata/neutron_interchain_txs.wasm | Bin 0 -> 430188 bytes x/contractmanager/types/expected_keepers.go | 2 + x/interchainqueries/keeper/grpc_query_test.go | 4 +- x/interchainqueries/keeper/keeper_test.go | 30 +++++----- .../keeper/process_block_results_test.go | 4 +- x/interchaintxs/keeper/keeper.go | 16 ++++++ x/interchaintxs/keeper/msg_server.go | 6 +- x/interchaintxs/types/expected_keepers.go | 2 + x/interchaintxs/types/keys.go | 4 +- x/transfer/keeper/keeper_test.go | 4 +- 19 files changed, 164 insertions(+), 75 deletions(-) create mode 100644 wasmbinding/testdata/neutron_interchain_txs.wasm diff --git a/app/app.go b/app/app.go index 02943caa4..ea20c0b78 100644 --- a/app/app.go +++ b/app/app.go @@ -328,8 +328,8 @@ type App struct { checkTxHandler mev_lane.CheckTx // Lanes - Mempool auctionante.Mempool - MEVLane auctionante.MEVLane + Mempool auctionante.Mempool + MEVLane auctionante.MEVLane } func (app *App) GetTestBankKeeper() integration.TestBankKeeper { @@ -977,7 +977,6 @@ func New( mevLane.SetAnteHandler(anteHandler) baseLane.SetAnteHandler(anteHandler) - app.SetEndBlocker(app.EndBlocker) handler := blocksdkabci.NewProposalHandler( diff --git a/app/upgrades/nextupgrade/upgrades.go b/app/upgrades/nextupgrade/upgrades.go index 92a94d7d6..ee062bbd0 100644 --- a/app/upgrades/nextupgrade/upgrades.go +++ b/app/upgrades/nextupgrade/upgrades.go @@ -2,6 +2,8 @@ package nextupgrade import ( "fmt" + + wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" "github.com/cosmos/cosmos-sdk/baseapp" consensuskeeper "github.com/cosmos/cosmos-sdk/x/consensus/keeper" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" @@ -79,7 +81,7 @@ func CreateUpgradeHandler( } ctx.Logger().Info("Migrating interchaintxs module parameters...") - if err := setInterchainTxsParams(ctx, keepers.ParamsKeeper, storeKeys.GetKey(interchaintxstypes.StoreKey), codec); err != nil { + if err := setInterchainTxsParams(ctx, keepers.ParamsKeeper, storeKeys.GetKey(interchaintxstypes.StoreKey), storeKeys.GetKey(wasmtypes.StoreKey), codec); err != nil { return nil, err } @@ -225,7 +227,7 @@ func migrateInterchainQueriesParams(ctx sdk.Context, paramsKeepers paramskeeper. return nil } -func setInterchainTxsParams(ctx sdk.Context, paramsKeepers paramskeeper.Keeper, storeKey storetypes.StoreKey, codec codec.Codec) error { +func setInterchainTxsParams(ctx sdk.Context, paramsKeepers paramskeeper.Keeper, storeKey storetypes.StoreKey, wasmStoreKey storetypes.StoreKey, codec codec.Codec) error { store := ctx.KVStore(storeKey) var currParams interchaintxstypes.Params subspace, _ := paramsKeepers.GetSubspace(interchaintxstypes.StoreKey) @@ -238,6 +240,14 @@ func setInterchainTxsParams(ctx sdk.Context, paramsKeepers paramskeeper.Keeper, bz := codec.MustMarshal(&currParams) store.Set(interchaintxstypes.ParamsKey, bz) + + wasmStore := ctx.KVStore(wasmStoreKey) + bzWasm := wasmStore.Get(wasmtypes.KeyLastCodeID) + if bzWasm == nil { + return fmt.Errorf("last code ID not found during the upgrade") + } + + store.Set(interchaintxstypes.LastCodeIdBeforeUpgrade, bzWasm) return nil } diff --git a/app/upgrades/nextupgrade/upgrades_test.go b/app/upgrades/nextupgrade/upgrades_test.go index 453aae2e1..9763feec8 100644 --- a/app/upgrades/nextupgrade/upgrades_test.go +++ b/app/upgrades/nextupgrade/upgrades_test.go @@ -3,6 +3,7 @@ package nextupgrade_test import ( "testing" + "github.com/CosmWasm/wasmd/x/wasm/keeper" adminmoduletypes "github.com/cosmos/admin-module/x/adminmodule/types" crontypes "github.com/neutron-org/neutron/x/cron/types" @@ -54,6 +55,9 @@ func (suite *UpgradeTestSuite) SetupTest() { pTokenfactory := tokenfactorytypes.DefaultParams() subspace.SetParamSet(ctx, &pTokenfactory) + pWasmTypes := icqtypes.DefaultParams() + subspace.SetParamSet(ctx, &pWasmTypes) + subspace, _ = app.ParamsKeeper.GetSubspace(icqtypes.StoreKey) pICQTypes := icqtypes.DefaultParams() subspace.SetParamSet(ctx, &pICQTypes) @@ -159,3 +163,49 @@ func (suite *UpgradeTestSuite) TestAdminModuleUpgrade() { suite.Require().NoError(err) suite.Require().Equal(uint64(1), id) } + +func (suite *UpgradeTestSuite) TestRegisterInterchainAccountCreationFee() { + var ( + app = suite.GetNeutronZoneApp(suite.ChainA) + ccvConsumerSubspace = app.GetSubspace(ccvconsumertypes.ModuleName) + ctx = suite.ChainA.GetContext() + ) + + suite.Require().True(ccvConsumerSubspace.Has(ctx, ccvconsumertypes.KeyRewardDenoms)) + + // emulate mainnet/testnet state + ccvConsumerSubspace.Set(ctx, ccvconsumertypes.KeyRewardDenoms, &[]string{params.DefaultDenom}) + + var denomsBefore []string + ccvConsumerSubspace.Get(ctx, ccvconsumertypes.KeyRewardDenoms, &denomsBefore) + suite.Require().Equal(denomsBefore, []string{params.DefaultDenom}) + contractKeeper := keeper.NewDefaultPermissionKeeper(app.WasmKeeper) + codeIDBefore := suite.StoreTestCode(ctx, sdk.AccAddress("neutron1weweewe"), "../../wasmbiding/testdata/neutron_interchain_txs.wasm.wasm") + contractAddressBefore := suite.InstantiateTestContract(ctx, sdk.AccAddress("neutron1weweewe"), codeIDBefore) + + upgrade := upgradetypes.Plan{ + Name: nextupgrade.UpgradeName, + Info: "some text here", + Height: 100, + } + app.UpgradeKeeper.ApplyUpgrade(ctx, upgrade) + + // Store code and instantiate reflect contract + codeID := suite.StoreTestCode(ctx, sdk.AccAddress("neutron1weweewe"), "../../wasmbinding/testdata/neutron_interchain_txs.wasm") + contractAddressAfter := suite.InstantiateTestContract(ctx, sdk.AccAddress("neutron1weweewe"), codeID) + // register w/o actual fees + jsonStringBefore := `{"connection_id":"1","interchain_account_id":"test-1"}` + byteEncodedMsgBefore := []byte(jsonStringBefore) + _, err := contractKeeper.Execute(ctx, contractAddressBefore, sdk.AccAddress("neutron1weweewe"), byteEncodedMsgBefore, nil) + suite.Require().Error(err) + + // register with fees + jsonStringAfter := `{"connection_id":"1","interchain_account_id":"test-2"}` + byteEncodedMsgAfter := []byte(jsonStringAfter) + _, err = contractKeeper.Execute(ctx, contractAddressAfter, sdk.AccAddress("neutron1weweewe"), byteEncodedMsgAfter, sdk.NewCoins(sdk.NewCoin("untrn", sdk.NewInt(1000)))) + suite.Require().NoError(err) + + // failed register due lack of fees + _, err = contractKeeper.Execute(ctx, contractAddressAfter, sdk.AccAddress("neutron1weweewe"), byteEncodedMsgAfter, nil) + suite.Require().Error(err) +} diff --git a/go.sum b/go.sum index 15b257047..d4361788f 100644 --- a/go.sum +++ b/go.sum @@ -935,8 +935,6 @@ github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OS github.com/neilotoole/errgroup v0.1.6/go.mod h1:Q2nLGf+594h0CLBs/Mbg6qOr7GtqDK7C2S41udRnToE= github.com/neutron-org/admin-module v0.0.0-20230906150724-9ccb75c61fc5 h1:96ZjLWoN4nCIcFdxrz51Xu2Y8aqpcScy3eva3S5hM60= github.com/neutron-org/admin-module v0.0.0-20230906150724-9ccb75c61fc5/go.mod h1:INknneN2W3Fr9Eld7SpfLRdjyHR1muzFbbqXln1ixic= -github.com/neutron-org/cosmos-sdk v0.47.5-0.20230921074823-5d5ff8b93265 h1:CIyjGN+/WTIgGyUEAiL7HcxQ2/XYX3r2Nv4RWBbhl8o= -github.com/neutron-org/cosmos-sdk v0.47.5-0.20230921074823-5d5ff8b93265/go.mod h1:4xMyIVekAs2OEUz/yh9JwzhLBMk+olM2sxgKuQdlhLg= github.com/neutron-org/cosmos-sdk v0.47.5-0.20230929200416-6c59762e84ad h1:BvYliP3KHiay2VLQwUSmDNCXm380TSTLDud8PH4RV6A= github.com/neutron-org/cosmos-sdk v0.47.5-0.20230929200416-6c59762e84ad/go.mod h1:4xMyIVekAs2OEUz/yh9JwzhLBMk+olM2sxgKuQdlhLg= github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230808084410-6083b888424e h1:uVJCBWf1vcCYY0pzOA2SCPIZT8WsR8fsOxs57mnJbM4= diff --git a/testutil/test_helpers.go b/testutil/test_helpers.go index edab3f004..54ad72935 100644 --- a/testutil/test_helpers.go +++ b/testutil/test_helpers.go @@ -281,8 +281,9 @@ func (suite *IBCConnectionTestSuite) GetNeutronZoneApp(chain *ibctesting.TestCha return testApp } -func (suite *IBCConnectionTestSuite) StoreReflectCode(ctx sdk.Context, addr sdk.AccAddress, path string) uint64 { +func (suite *IBCConnectionTestSuite) StoreTestCode(ctx sdk.Context, addr sdk.AccAddress, path string) uint64 { // wasm file built with https://github.com/neutron-org/neutron-contracts/tree/main/contracts/reflect + // wasm file built with https://github.com/neutron-org/neutron-dev/tree/feat/ica-register-fee-update/contracts/neutron_interchain_txs wasmCode, err := os.ReadFile(path) suite.Require().NoError(err) @@ -292,7 +293,7 @@ func (suite *IBCConnectionTestSuite) StoreReflectCode(ctx sdk.Context, addr sdk. return codeID } -func (suite *IBCConnectionTestSuite) InstantiateReflectContract(ctx sdk.Context, funder sdk.AccAddress, codeID uint64) sdk.AccAddress { +func (suite *IBCConnectionTestSuite) InstantiateTestContract(ctx sdk.Context, funder sdk.AccAddress, codeID uint64) sdk.AccAddress { initMsgBz := []byte("{}") contractKeeper := keeper.NewDefaultPermissionKeeper(suite.GetNeutronZoneApp(suite.ChainA).WasmKeeper) addr, _, err := contractKeeper.Instantiate(ctx, codeID, funder, funder, initMsgBz, "demo contract", nil) diff --git a/wasmbinding/bindings/msg.go b/wasmbinding/bindings/msg.go index 83ff57763..e4d8142f1 100644 --- a/wasmbinding/bindings/msg.go +++ b/wasmbinding/bindings/msg.go @@ -79,7 +79,7 @@ type SubmitTxResponse struct { type RegisterInterchainAccount struct { ConnectionId string `json:"connection_id"` InterchainAccountId string `json:"interchain_account_id"` - RegisterFee sdk.Coins `json:"register_fee"` + RegisterFee sdk.Coins `json:"register_fee,omitempty"` } // RegisterInterchainAccountResponse holds response for RegisterInterchainAccount. diff --git a/wasmbinding/message_plugin.go b/wasmbinding/message_plugin.go index a130dae31..3a12a7e4f 100644 --- a/wasmbinding/message_plugin.go +++ b/wasmbinding/message_plugin.go @@ -707,7 +707,7 @@ func (m *CustomMessenger) performRegisterInterchainAccount(ctx sdk.Context, cont FromAddress: contractAddr.String(), ConnectionId: reg.ConnectionId, InterchainAccountId: reg.InterchainAccountId, - RegisterFee: reg.RegisterFee, + RegisterFee: getRegisterFee(reg.RegisterFee), } if err := msg.ValidateBasic(); err != nil { return nil, errors.Wrap(err, "failed to validate incoming RegisterInterchainAccount message") @@ -921,3 +921,10 @@ func (m *CustomMessenger) isAdmin(ctx sdk.Context, contractAddr sdk.AccAddress) return false } + +func getRegisterFee(fee sdk.Coins) sdk.Coins { + if fee == nil { + return make(sdk.Coins, 0) + } + return fee +} diff --git a/wasmbinding/test/custom_message_test.go b/wasmbinding/test/custom_message_test.go index 6008a058f..a79dd73db 100644 --- a/wasmbinding/test/custom_message_test.go +++ b/wasmbinding/test/custom_message_test.go @@ -75,8 +75,8 @@ func (suite *CustomMessengerTestSuite) SetupTest() { func (suite *CustomMessengerTestSuite) TestRegisterInterchainAccount() { // Store code and instantiate reflect contract - codeID := suite.StoreReflectCode(suite.ctx, suite.contractOwner, "../testdata/reflect.wasm") - suite.contractAddress = suite.InstantiateReflectContract(suite.ctx, suite.contractOwner, codeID) + codeID := suite.StoreTestCode(suite.ctx, suite.contractOwner, "../testdata/reflect.wasm") + suite.contractAddress = suite.InstantiateTestContract(suite.ctx, suite.contractOwner, codeID) suite.Require().NotEmpty(suite.contractAddress) err := suite.neutron.FeeBurnerKeeper.SetParams(suite.ctx, feeburnertypes.Params{ @@ -111,8 +111,8 @@ func (suite *CustomMessengerTestSuite) TestRegisterInterchainAccount() { func (suite *CustomMessengerTestSuite) TestRegisterInterchainAccountLongID() { // Store code and instantiate reflect contract - codeID := suite.StoreReflectCode(suite.ctx, suite.contractOwner, "../testdata/reflect.wasm") - suite.contractAddress = suite.InstantiateReflectContract(suite.ctx, suite.contractOwner, codeID) + codeID := suite.StoreTestCode(suite.ctx, suite.contractOwner, "../testdata/reflect.wasm") + suite.contractAddress = suite.InstantiateTestContract(suite.ctx, suite.contractOwner, codeID) suite.Require().NotEmpty(suite.contractAddress) // Craft RegisterInterchainAccount message @@ -135,8 +135,8 @@ func (suite *CustomMessengerTestSuite) TestRegisterInterchainAccountLongID() { func (suite *CustomMessengerTestSuite) TestRegisterInterchainQuery() { // Store code and instantiate reflect contract - codeID := suite.StoreReflectCode(suite.ctx, suite.contractOwner, "../testdata/reflect.wasm") - suite.contractAddress = suite.InstantiateReflectContract(suite.ctx, suite.contractOwner, codeID) + codeID := suite.StoreTestCode(suite.ctx, suite.contractOwner, "../testdata/reflect.wasm") + suite.contractAddress = suite.InstantiateTestContract(suite.ctx, suite.contractOwner, codeID) suite.Require().NotEmpty(suite.contractAddress) err := testutil.SetupICAPath(suite.Path, suite.contractAddress.String()) @@ -173,8 +173,8 @@ func (suite *CustomMessengerTestSuite) TestRegisterInterchainQuery() { } func (suite *CustomMessengerTestSuite) TestCreateDenomMsg() { - codeID := suite.StoreReflectCode(suite.ctx, suite.contractOwner, "../testdata/reflect.wasm") - suite.contractAddress = suite.InstantiateReflectContract(suite.ctx, suite.contractOwner, codeID) + codeID := suite.StoreTestCode(suite.ctx, suite.contractOwner, "../testdata/reflect.wasm") + suite.contractAddress = suite.InstantiateTestContract(suite.ctx, suite.contractOwner, codeID) suite.Require().NotEmpty(suite.contractAddress) senderAddress := suite.ChainA.SenderAccounts[0].SenderAccount.GetAddress() @@ -201,8 +201,8 @@ func (suite *CustomMessengerTestSuite) TestMintMsg() { lucky = keeper.RandomAccountAddress(suite.T()) // We don't care what this address is ) - codeID := suite.StoreReflectCode(suite.ctx, suite.contractOwner, "../testdata/reflect.wasm") - suite.contractAddress = suite.InstantiateReflectContract(suite.ctx, suite.contractOwner, codeID) + codeID := suite.StoreTestCode(suite.ctx, suite.contractOwner, "../testdata/reflect.wasm") + suite.contractAddress = suite.InstantiateTestContract(suite.ctx, suite.contractOwner, codeID) suite.Require().NotEmpty(suite.contractAddress) senderAddress := suite.ChainA.SenderAccounts[0].SenderAccount.GetAddress() @@ -377,8 +377,8 @@ func (suite *CustomMessengerTestSuite) TestRemoveInterchainQueryFailed() { func (suite *CustomMessengerTestSuite) TestSubmitTx() { // Store code and instantiate reflect contract - codeID := suite.StoreReflectCode(suite.ctx, suite.contractOwner, "../testdata/reflect.wasm") - suite.contractAddress = suite.InstantiateReflectContract(suite.ctx, suite.contractOwner, codeID) + codeID := suite.StoreTestCode(suite.ctx, suite.contractOwner, "../testdata/reflect.wasm") + suite.contractAddress = suite.InstantiateTestContract(suite.ctx, suite.contractOwner, codeID) suite.Require().NotEmpty(suite.contractAddress) senderAddress := suite.ChainA.SenderAccounts[0].SenderAccount.GetAddress() @@ -410,8 +410,8 @@ func (suite *CustomMessengerTestSuite) TestSubmitTx() { func (suite *CustomMessengerTestSuite) TestSubmitTxTooMuchTxs() { // Store code and instantiate reflect contract - codeID := suite.StoreReflectCode(suite.ctx, suite.contractOwner, "../testdata/reflect.wasm") - suite.contractAddress = suite.InstantiateReflectContract(suite.ctx, suite.contractOwner, codeID) + codeID := suite.StoreTestCode(suite.ctx, suite.contractOwner, "../testdata/reflect.wasm") + suite.contractAddress = suite.InstantiateTestContract(suite.ctx, suite.contractOwner, codeID) suite.Require().NotEmpty(suite.contractAddress) err := testutil.SetupICAPath(suite.Path, suite.contractAddress.String()) @@ -507,8 +507,8 @@ func (suite *CustomMessengerTestSuite) TestSoftwareUpgradeProposal() { func (suite *CustomMessengerTestSuite) TestTooMuchProposals() { // Store code and instantiate reflect contract - codeID := suite.StoreReflectCode(suite.ctx, suite.contractOwner, "../testdata/reflect.wasm") - suite.contractAddress = suite.InstantiateReflectContract(suite.ctx, suite.contractOwner, codeID) + codeID := suite.StoreTestCode(suite.ctx, suite.contractOwner, "../testdata/reflect.wasm") + suite.contractAddress = suite.InstantiateTestContract(suite.ctx, suite.contractOwner, codeID) suite.Require().NotEmpty(suite.contractAddress) err := testutil.SetupICAPath(suite.Path, suite.contractAddress.String()) @@ -547,8 +547,8 @@ func (suite *CustomMessengerTestSuite) TestTooMuchProposals() { func (suite *CustomMessengerTestSuite) TestNoProposals() { // Store code and instantiate reflect contract - codeID := suite.StoreReflectCode(suite.ctx, suite.contractOwner, "../testdata/reflect.wasm") - suite.contractAddress = suite.InstantiateReflectContract(suite.ctx, suite.contractOwner, codeID) + codeID := suite.StoreTestCode(suite.ctx, suite.contractOwner, "../testdata/reflect.wasm") + suite.contractAddress = suite.InstantiateTestContract(suite.ctx, suite.contractOwner, codeID) suite.Require().NotEmpty(suite.contractAddress) err := testutil.SetupICAPath(suite.Path, suite.contractAddress.String()) @@ -572,8 +572,8 @@ func (suite *CustomMessengerTestSuite) TestNoProposals() { func (suite *CustomMessengerTestSuite) TestAddRemoveSchedule() { // Store code and instantiate reflect contract - codeID := suite.StoreReflectCode(suite.ctx, suite.contractOwner, "../testdata/reflect.wasm") - suite.contractAddress = suite.InstantiateReflectContract(suite.ctx, suite.contractOwner, codeID) + codeID := suite.StoreTestCode(suite.ctx, suite.contractOwner, "../testdata/reflect.wasm") + suite.contractAddress = suite.InstantiateTestContract(suite.ctx, suite.contractOwner, codeID) suite.Require().NotEmpty(suite.contractAddress) // Set admin so that we can execute this proposal without permission error @@ -625,8 +625,8 @@ func (suite *CustomMessengerTestSuite) TestAddRemoveSchedule() { func (suite *CustomMessengerTestSuite) TestResubmitFailureAck() { // Store code and instantiate reflect contract - codeID := suite.StoreReflectCode(suite.ctx, suite.contractOwner, "../testdata/reflect.wasm") - suite.contractAddress = suite.InstantiateReflectContract(suite.ctx, suite.contractOwner, codeID) + codeID := suite.StoreTestCode(suite.ctx, suite.contractOwner, "../testdata/reflect.wasm") + suite.contractAddress = suite.InstantiateTestContract(suite.ctx, suite.contractOwner, codeID) suite.Require().NotEmpty(suite.contractAddress) // Add failure @@ -660,8 +660,8 @@ func (suite *CustomMessengerTestSuite) TestResubmitFailureAck() { func (suite *CustomMessengerTestSuite) TestResubmitFailureTimeout() { // Store code and instantiate reflect contract - codeID := suite.StoreReflectCode(suite.ctx, suite.contractOwner, "../testdata/reflect.wasm") - suite.contractAddress = suite.InstantiateReflectContract(suite.ctx, suite.contractOwner, codeID) + codeID := suite.StoreTestCode(suite.ctx, suite.contractOwner, "../testdata/reflect.wasm") + suite.contractAddress = suite.InstantiateTestContract(suite.ctx, suite.contractOwner, codeID) suite.Require().NotEmpty(suite.contractAddress) // Add failure @@ -692,8 +692,8 @@ func (suite *CustomMessengerTestSuite) TestResubmitFailureTimeout() { func (suite *CustomMessengerTestSuite) TestResubmitFailureFromDifferentContract() { // Store code and instantiate reflect contract - codeID := suite.StoreReflectCode(suite.ctx, suite.contractOwner, "../testdata/reflect.wasm") - suite.contractAddress = suite.InstantiateReflectContract(suite.ctx, suite.contractOwner, codeID) + codeID := suite.StoreTestCode(suite.ctx, suite.contractOwner, "../testdata/reflect.wasm") + suite.contractAddress = suite.InstantiateTestContract(suite.ctx, suite.contractOwner, codeID) suite.Require().NotEmpty(suite.contractAddress) // Add failure diff --git a/wasmbinding/test/custom_query_test.go b/wasmbinding/test/custom_query_test.go index 9180bf079..cdc185060 100644 --- a/wasmbinding/test/custom_query_test.go +++ b/wasmbinding/test/custom_query_test.go @@ -37,8 +37,8 @@ func (suite *CustomQuerierTestSuite) TestInterchainQueryResult() { ) // Store code and instantiate reflect contract - codeID := suite.StoreReflectCode(ctx, owner, "../testdata/reflect.wasm") - contractAddress := suite.InstantiateReflectContract(ctx, owner, codeID) + codeID := suite.StoreTestCode(ctx, owner, "../testdata/reflect.wasm") + contractAddress := suite.InstantiateTestContract(ctx, owner, codeID) suite.Require().NotEmpty(contractAddress) // Register and submit query result @@ -109,8 +109,8 @@ func (suite *CustomQuerierTestSuite) TestInterchainQueryResultNotFound() { ) // Store code and instantiate reflect contract - codeID := suite.StoreReflectCode(ctx, owner, "../testdata/reflect.wasm") - contractAddress := suite.InstantiateReflectContract(ctx, owner, codeID) + codeID := suite.StoreTestCode(ctx, owner, "../testdata/reflect.wasm") + contractAddress := suite.InstantiateTestContract(ctx, owner, codeID) suite.Require().NotEmpty(contractAddress) // Query interchain query result @@ -132,8 +132,8 @@ func (suite *CustomQuerierTestSuite) TestInterchainAccountAddress() { ) // Store code and instantiate reflect contract - codeID := suite.StoreReflectCode(ctx, owner, "../testdata/reflect.wasm") - contractAddress := suite.InstantiateReflectContract(ctx, owner, codeID) + codeID := suite.StoreTestCode(ctx, owner, "../testdata/reflect.wasm") + contractAddress := suite.InstantiateTestContract(ctx, owner, codeID) suite.Require().NotEmpty(contractAddress) err := testutil.SetupICAPath(suite.Path, contractAddress.String()) @@ -164,8 +164,8 @@ func (suite *CustomQuerierTestSuite) TestUnknownInterchainAcc() { ) // Store code and instantiate reflect contract - codeID := suite.StoreReflectCode(ctx, owner, "../testdata/reflect.wasm") - contractAddress := suite.InstantiateReflectContract(ctx, owner, codeID) + codeID := suite.StoreTestCode(ctx, owner, "../testdata/reflect.wasm") + contractAddress := suite.InstantiateTestContract(ctx, owner, codeID) suite.Require().NotEmpty(contractAddress) err := testutil.SetupICAPath(suite.Path, contractAddress.String()) @@ -192,8 +192,8 @@ func (suite *CustomQuerierTestSuite) TestMinIbcFee() { ) // Store code and instantiate reflect contract - codeID := suite.StoreReflectCode(ctx, owner, "../testdata/reflect.wasm") - contractAddress := suite.InstantiateReflectContract(ctx, owner, codeID) + codeID := suite.StoreTestCode(ctx, owner, "../testdata/reflect.wasm") + contractAddress := suite.InstantiateTestContract(ctx, owner, codeID) suite.Require().NotEmpty(contractAddress) query := bindings.NeutronQuery{ @@ -224,8 +224,8 @@ func (suite *CustomQuerierTestSuite) TestFullDenom() { ) // Store code and instantiate reflect contract - codeID := suite.StoreReflectCode(ctx, owner, "../testdata/reflect.wasm") - contractAddress := suite.InstantiateReflectContract(ctx, owner, codeID) + codeID := suite.StoreTestCode(ctx, owner, "../testdata/reflect.wasm") + contractAddress := suite.InstantiateTestContract(ctx, owner, codeID) suite.Require().NotEmpty(contractAddress) query := bindings.NeutronQuery{ @@ -257,8 +257,8 @@ func (suite *CustomQuerierTestSuite) TestDenomAdmin() { suite.Require().NoError(err) // Store code and instantiate reflect contract - codeID := suite.StoreReflectCode(ctx, owner, "../testdata/reflect.wasm") - contractAddress := suite.InstantiateReflectContract(ctx, owner, codeID) + codeID := suite.StoreTestCode(ctx, owner, "../testdata/reflect.wasm") + contractAddress := suite.InstantiateTestContract(ctx, owner, codeID) suite.Require().NotEmpty(contractAddress) senderAddress := suite.ChainA.SenderAccounts[0].SenderAccount.GetAddress() diff --git a/wasmbinding/testdata/neutron_interchain_txs.wasm b/wasmbinding/testdata/neutron_interchain_txs.wasm new file mode 100644 index 0000000000000000000000000000000000000000..6f3dc56be1f8351a518f68cc9fe4ac3417f169d1 GIT binary patch literal 430188 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
    K2I;DoM$(X9I$+4oZ72qM!Yv#5a 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

    t+FWCNG$U~#zW#`t zY1Hlt+iWUhr-6~g9E4)}DE5ti;mg4-sppqamwTsUc`l_%d)cxTb}%dROAvz23PtXVVp zB4uB-xMO0cXzyO$7qS7H1Go{04+4ecOFokUG_FQ_^AX>n+IB@Wu zWjH6nNvgGZ1@CZtjCy2f*lfUaBSI5`&A+QdD?%#}+1J|FR)?xrfK0Ny#v{#mzCs_o zg1rW);hbJ_P}*_h=!e`y-Jv@Cj6hvOU1MESU2|PaU29!iU3-09eSLjHePex7eRF+F zeQSMNeS1S)Lw!R-Lt{fzLvuq*Lu*4@LwjRgV|`;oV`F1eV{>CmV{2nuV|!CwQ+-oI zQ)5$8Q*%>GQ)^ROQ+sn=bA59|b7ON;b8~Y`b8B;3b9+l&OMOd2OJhq@OLI$0OKVG8 zOM7cwYkg}&Yh!CuYjbN$Yiny;YkON=TYXzYTVq>OTXS1WTWeceTYEc(*pBYo(R4ei zwd2*~tvsL5Y_GNJ+YLj{``@uX#D(rPYr(r#gf;{R@VOBAPs1om+Q4!e*H^ppXCsre zLYH5NG_@!4HmI~cNDzcqh5%NXL&Lp1C4gTkt=eB7lW_S1#8tUA_=N`9Ld79zv(@>s zzRVLn35Q$(`KTlk*jMRevk@_Iqxt{&&**sQ*I?cnt>gZAivGO(Gdf;o)i2Mb4~Y1} zykloG1GpAXgrBnoNt`EF1-|9uQkvJOQ&!M+BO(vYr0{d_vesRwLtgRYh>0hR%WG2j5@mS~$PZIzG^wnz-_?%tld@E#0J)&tOQ?4)Vsh`~J#?Du+Ja!1 z9-q(ew*vlPpk!8PQR)1$1?3ep%4T{iJZGG7X2~3Lu6Ld}-?JdF&|G9Konw10@T@GY zG3z|_R)hJl^+D@H-VX==X#L6eXX`JXS4%#6X#A~jf1qyfo8J1i+ZO%HjG0@u{^^yP z+6(tx(fi}0Z@=aCcYN@%&wc(YPk-$ne(>^7Up2h5&RAaG)EZv3X7j~Y9K8jZpZwhC zpZHAuYKd$@>$FAYV+R9_g#rE1ik(C52DIf zzV^eHe|oHZ)&^L7CXRmm@h?8{!ncq8=M6W$^}&a}_{3Mf`t0|a*Ye;d|HJ zc~{-7OaJ+s-*|QVj>|3&1ZP$(tNrD#63Nyz7j|yA?e^}$>@#0`?)mS0_h)~3)v$Z3 zuK%I;`t`wuUjM8kADJ=nVc*h{BMUwAgQmCE+vE*+%z!^IE3|Xw8G+pak9Se1#1r%c zJQhx3nb+qj^_w%!@@)?+4D1b9{<&p4yuPe?!+^`>mT(j z@L&ID&!vGmCG$#Vm(4EQ?+^JG_%97y;M*8l;Vtu;p8C=i-Ua?r&%{TNRa?K!Gx1<> zwP&Vhb)YSHf$#cPXUz-N&RXfIoLM<@;%(mR@0?$H*3EbLYJIB$){J>26JM;#ludkV zL78vjRo}!9%YJ>Yr?uqBzS$F>2~PZ@FEnqJC**GnZVZhm;rhUF2xo`JQe9^PeGqW5bpoz&@zCgeV z21~4vuhg31tuSXLw4XTIe7k@Yk0&#hnD$Gm^A{^9izR>*A8GrSbTi%xgM#AFu9WiI$r#`)KQ6Ly9ojtdu zJ^XYe`3tJfU3=lre(|eUzw)%#KKtDBsvFzFn=anE zvwQa*!d_q0890zWbnSJ2{oscldGyKWKK4i=`Nel$S#`C~<6Y?)@R+qV6W1^H)X!Yx zJ*Q-e?*iX??~L;&KIA{gdycm{*i^c`>qu+KoKSGystxU)Xt1Pij<3?Q&}Xh|^KS9g zdP9Mdz&d-Gx2&Ya6ZS0#c*_DiH@7yHHwJ2gp(E$*+Hyhg{5cEGTQqxa$#!(GzI=Wl z zWt&Pu8#gT66zneF90*PPeq(5{=c3K6o*BWAzdaB-(lS4=%Cl&XIkTbshPwx{r4vv6 z_10+l(YlH`w|?mQi|+sI_3eT4z5D#?(=;h89Z+l?YI)cQVe+VA^*7+q5 z{Om~MOmne+hBtWRZEx`&@RfT?0u}G*yQn0ydgAw?ba3>njaTs~>@Ar;@mEJK^4!=t z^Q@ygm-_t^FI?bTTWOB2^epgNN7gN!7514&o;&~gf1UWRD}#H*km1--;Z}^UPmZ#h^=I!<4e9bKLwqbJB!K&>? zdde1KEG@wqC|VMj_{VcYNBz^{aD~fzc?ke$Jb$53UOJpqFK@UtUYw9Lvk9o3eAT|} z)wy^5NS}?MKh@yox!OTj-03jVLN?0@X+ndI-x0%))(Po^A0;ZRvkG+{ME}+3VLX@&KHzLiV<)K_Et z#cp}ut9>nhHhQM&V+&5)7Dy zf99sry0a=w2iVlIOz+v|l7*L-hD%D!d0w*w$j5hqXLa!Wd8XZp3f>^FW*}rOHp8s$ z4WdZMT3}jMJFt}30+u$HSRS*KX&(xhv#mM6VJMBZgJ!@JvX+>uP`3;PLl|w?O7SoHYc8pK=ve?{YdT|@nG=t_PrWGg)_M28oX<)Op5bc>}>kJb;`by1n zO3VST>Bpd~`IgsH;Vs9b-<)Y;?LCXFCHS|_G6O-=DlIWVJIt(AWghf+trFAk`92l_ zqYbb{E9ehdX5G?yZynM;v$~|rvN1{1(}qk`^n`D? zyMuhQpX-5K$AeAv86~FmJM26l!n_Urc}+W1?H4=cw>&jia4>2py=xAJf>y5bqXVot zpp9Lb26nf}=i`&%GOYq*PvF1WJz@6V<&Hq)$ literal 0 HcmV?d00001 diff --git a/x/contractmanager/types/expected_keepers.go b/x/contractmanager/types/expected_keepers.go index 88db20887..f30e346b8 100644 --- a/x/contractmanager/types/expected_keepers.go +++ b/x/contractmanager/types/expected_keepers.go @@ -1,12 +1,14 @@ package types import ( + wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" sdk "github.com/cosmos/cosmos-sdk/types" ) // WasmKeeper defines the expected interface needed to cam cosmwasm contracts. type WasmKeeper interface { HasContractInfo(ctx sdk.Context, contractAddress sdk.AccAddress) bool + GetContractInfo(ctx sdk.Context, contractAddress sdk.AccAddress) *wasmtypes.ContractInfo Sudo(ctx sdk.Context, contractAddress sdk.AccAddress, msg []byte) ([]byte, error) } diff --git a/x/interchainqueries/keeper/grpc_query_test.go b/x/interchainqueries/keeper/grpc_query_test.go index ee3eb7a5c..391d58d0f 100644 --- a/x/interchainqueries/keeper/grpc_query_test.go +++ b/x/interchainqueries/keeper/grpc_query_test.go @@ -476,8 +476,8 @@ func (suite *KeeperTestSuite) TestQueryResult() { clientKey := host.FullClientStateKey(suite.Path.EndpointB.ClientID) ctx := suite.ChainA.GetContext() contractOwner := wasmKeeper.RandomAccountAddress(suite.T()) - codeID := suite.StoreReflectCode(ctx, contractOwner, reflectContractPath) - contractAddress := suite.InstantiateReflectContract(ctx, contractOwner, codeID) + codeID := suite.StoreTestCode(ctx, contractOwner, reflectContractPath) + contractAddress := suite.InstantiateTestContract(ctx, contractOwner, codeID) registerMsg := iqtypes.MsgRegisterInterchainQuery{ ConnectionId: suite.Path.EndpointA.ConnectionID, Keys: []*iqtypes.KVKey{ diff --git a/x/interchainqueries/keeper/keeper_test.go b/x/interchainqueries/keeper/keeper_test.go index beaca0287..704815240 100644 --- a/x/interchainqueries/keeper/keeper_test.go +++ b/x/interchainqueries/keeper/keeper_test.go @@ -126,8 +126,8 @@ func (suite *KeeperTestSuite) TestRegisterInterchainQuery() { ) // Store code and instantiate reflect contract. - codeID := suite.StoreReflectCode(ctx, contractOwner, reflectContractPath) - contractAddress := suite.InstantiateReflectContract(ctx, contractOwner, codeID) + codeID := suite.StoreTestCode(ctx, contractOwner, reflectContractPath) + contractAddress := suite.InstantiateTestContract(ctx, contractOwner, codeID) suite.Require().NotEmpty(contractAddress) err := testutil.SetupICAPath(suite.Path, contractAddress.String()) @@ -383,8 +383,8 @@ func (suite *KeeperTestSuite) TestUpdateInterchainQuery() { ctx = suite.ChainA.GetContext() contractOwner = wasmKeeper.RandomAccountAddress(suite.T()) ) - codeID := suite.StoreReflectCode(ctx, contractOwner, reflectContractPath) - newContractAddress := suite.InstantiateReflectContract(ctx, contractOwner, codeID) + codeID := suite.StoreTestCode(ctx, contractOwner, reflectContractPath) + newContractAddress := suite.InstantiateTestContract(ctx, contractOwner, codeID) suite.Require().NotEmpty(newContractAddress) msg = iqtypes.MsgUpdateInterchainQueryRequest{ QueryId: 1, @@ -411,8 +411,8 @@ func (suite *KeeperTestSuite) TestUpdateInterchainQuery() { ) // Store code and instantiate reflect contract. - codeID := suite.StoreReflectCode(ctx, contractOwner, reflectContractPath) - contractAddress := suite.InstantiateReflectContract(ctx, contractOwner, codeID) + codeID := suite.StoreTestCode(ctx, contractOwner, reflectContractPath) + contractAddress := suite.InstantiateTestContract(ctx, contractOwner, codeID) suite.Require().NotEmpty(contractAddress) err := testutil.SetupICAPath(suite.Path, contractAddress.String()) @@ -553,8 +553,8 @@ func (suite *KeeperTestSuite) TestRemoveInterchainQuery() { ctx = suite.ChainA.GetContext() contractOwner = wasmKeeper.RandomAccountAddress(suite.T()) ) - codeID := suite.StoreReflectCode(ctx, contractOwner, reflectContractPath) - newContractAddress := suite.InstantiateReflectContract(ctx, contractOwner, codeID) + codeID := suite.StoreTestCode(ctx, contractOwner, reflectContractPath) + newContractAddress := suite.InstantiateTestContract(ctx, contractOwner, codeID) suite.Require().NotEmpty(newContractAddress) msg = iqtypes.MsgRemoveInterchainQueryRequest{ QueryId: 1, @@ -583,8 +583,8 @@ func (suite *KeeperTestSuite) TestRemoveInterchainQuery() { ) // Store code and instantiate reflect contract. - codeID := suite.StoreReflectCode(ctx, contractOwner, reflectContractPath) - contractAddress := suite.InstantiateReflectContract(ctx, contractOwner, codeID) + codeID := suite.StoreTestCode(ctx, contractOwner, reflectContractPath) + contractAddress := suite.InstantiateTestContract(ctx, contractOwner, codeID) suite.Require().NotEmpty(contractAddress) err := testutil.SetupICAPath(suite.Path, contractAddress.String()) @@ -1421,8 +1421,8 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { ) // Store code and instantiate reflect contract. - codeID := suite.StoreReflectCode(ctx, contractOwner, reflectContractPath) - contractAddress := suite.InstantiateReflectContract(ctx, contractOwner, codeID) + codeID := suite.StoreTestCode(ctx, contractOwner, reflectContractPath) + contractAddress := suite.InstantiateTestContract(ctx, contractOwner, codeID) suite.Require().NotEmpty(contractAddress) err := testutil.SetupICAPath(suite.Path, contractAddress.String()) @@ -1691,8 +1691,8 @@ func (suite *KeeperTestSuite) TestRemoveFreshlyCreatedICQ() { ) // Store code and instantiate reflect contract. - codeID := suite.StoreReflectCode(ctx, contractOwner, reflectContractPath) - contractAddress := suite.InstantiateReflectContract(ctx, contractOwner, codeID) + codeID := suite.StoreTestCode(ctx, contractOwner, reflectContractPath) + contractAddress := suite.InstantiateTestContract(ctx, contractOwner, codeID) suite.Require().NotEmpty(contractAddress) // Top up contract address with native coins for deposit @@ -1724,7 +1724,7 @@ func (suite *KeeperTestSuite) TestRemoveFreshlyCreatedICQ() { suite.Require().Equal(params.QuerySubmitTimeout, registeredQuery.SubmitTimeout) suite.Require().Greater(uint64(ctx.BlockHeight()), registeredQuery.LastSubmittedResultLocalHeight+registeredQuery.SubmitTimeout) - newContractAddress := suite.InstantiateReflectContract(ctx, contractOwner, codeID) + newContractAddress := suite.InstantiateTestContract(ctx, contractOwner, codeID) suite.Require().NotEmpty(newContractAddress) resp, err := msgSrv.RemoveInterchainQuery(sdk.WrapSDKContext(ctx), &iqtypes.MsgRemoveInterchainQueryRequest{ QueryId: 1, diff --git a/x/interchainqueries/keeper/process_block_results_test.go b/x/interchainqueries/keeper/process_block_results_test.go index 8313f6a71..198acffca 100644 --- a/x/interchainqueries/keeper/process_block_results_test.go +++ b/x/interchainqueries/keeper/process_block_results_test.go @@ -272,8 +272,8 @@ func (suite *KeeperTestSuite) TestUnpackAndVerifyHeaders() { ) // Store code and instantiate reflect contract. - codeID := suite.StoreReflectCode(ctx, contractOwner, reflectContractPath) - contractAddress := suite.InstantiateReflectContract(ctx, contractOwner, codeID) + codeID := suite.StoreTestCode(ctx, contractOwner, reflectContractPath) + contractAddress := suite.InstantiateTestContract(ctx, contractOwner, codeID) suite.Require().NotEmpty(contractAddress) err := testutil.SetupICAPath(suite.Path, contractAddress.String()) diff --git a/x/interchaintxs/keeper/keeper.go b/x/interchaintxs/keeper/keeper.go index fe13695f3..2bc4aff43 100644 --- a/x/interchaintxs/keeper/keeper.go +++ b/x/interchaintxs/keeper/keeper.go @@ -92,3 +92,19 @@ func (k Keeper) ChargeFee(ctx sdk.Context, payer sdk.AccAddress, fee sdk.Coins) func (k Keeper) GetAuthority() string { return k.authority } + +func (k Keeper) GetLastCodeIDBeforeUpgrade(ctx sdk.Context) (codeID uint64) { + store := ctx.KVStore(k.storeKey) + bytes := store.Get(types.LastCodeIdBeforeUpgrade) + + if bytes == nil { + k.Logger(ctx).Debug("Last code id key don't exists, GetLastCodeID returns 0") + return 0 + } + return sdk.BigEndianToUint64(bytes) +} + +func (k Keeper) SetLastCodeIDBeforeUpgrade(ctx sdk.Context, id uint64) { + store := ctx.KVStore(k.storeKey) + store.Set(types.LastCodeIdBeforeUpgrade, sdk.Uint64ToBigEndian(id)) +} diff --git a/x/interchaintxs/keeper/msg_server.go b/x/interchaintxs/keeper/msg_server.go index 9e79b0690..f940deeba 100644 --- a/x/interchaintxs/keeper/msg_server.go +++ b/x/interchaintxs/keeper/msg_server.go @@ -47,8 +47,10 @@ func (k Keeper) RegisterInterchainAccount(goCtx context.Context, msg *ictxtypes. return nil, errors.Wrapf(ictxtypes.ErrNotContract, "%s is not a contract address", msg.FromAddress) } - if err := k.ChargeFee(ctx, senderAddr, msg.RegisterFee); err != nil { - return nil, errors.Wrapf(err, "failed to charge fees to pay for RegisterInterchainAccount msg: %s", msg) + if k.sudoKeeper.GetContractInfo(ctx, senderAddr).CodeID > k.GetLastCodeIDBeforeUpgrade(ctx) { + if err := k.ChargeFee(ctx, senderAddr, msg.RegisterFee); err != nil { + return nil, errors.Wrapf(err, "failed to charge fees to pay for RegisterInterchainAccount msg: %s", msg) + } } icaOwner := ictxtypes.NewICAOwnerFromAddress(senderAddr, msg.InterchainAccountId) diff --git a/x/interchaintxs/types/expected_keepers.go b/x/interchaintxs/types/expected_keepers.go index 23648d88d..8cb3e813b 100644 --- a/x/interchaintxs/types/expected_keepers.go +++ b/x/interchaintxs/types/expected_keepers.go @@ -1,6 +1,7 @@ package types import ( + wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/auth/types" capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" @@ -26,6 +27,7 @@ type BankKeeper interface { type WasmKeeper interface { HasContractInfo(ctx sdk.Context, contractAddress sdk.AccAddress) bool + GetContractInfo(ctx sdk.Context, contractAddress sdk.AccAddress) *wasmtypes.ContractInfo Sudo(ctx sdk.Context, contractAddress sdk.AccAddress, msg []byte) ([]byte, error) } diff --git a/x/interchaintxs/types/keys.go b/x/interchaintxs/types/keys.go index beaf14ae2..aa4a6f048 100644 --- a/x/interchaintxs/types/keys.go +++ b/x/interchaintxs/types/keys.go @@ -18,7 +18,9 @@ const ( ) const ( - prefixParamsKey = iota + 1 + prefixParamsKey = iota + 1 + prefixLastCodeIdBeforeUpgrade = iota + 2 ) var ParamsKey = []byte{prefixParamsKey} +var LastCodeIdBeforeUpgrade = []byte{prefixLastCodeIdBeforeUpgrade} diff --git a/x/transfer/keeper/keeper_test.go b/x/transfer/keeper/keeper_test.go index f9636cf35..c8b857836 100644 --- a/x/transfer/keeper/keeper_test.go +++ b/x/transfer/keeper/keeper_test.go @@ -90,8 +90,8 @@ func (suite KeeperTestSuite) TestTransfer() { //nolint:govet // it's a test so i testOwner := sdktypes.MustAccAddressFromBech32(testutil.TestOwnerAddress) // Store code and instantiate reflect contract. - codeID := suite.StoreReflectCode(ctx, testOwner, reflectContractPath) - contractAddress := suite.InstantiateReflectContract(ctx, testOwner, codeID) + codeID := suite.StoreTestCode(ctx, testOwner, reflectContractPath) + contractAddress := suite.InstantiateTestContract(ctx, testOwner, codeID) suite.Require().NotEmpty(contractAddress) ctx = suite.ChainA.GetContext() From f48eafc66685d56b06e3d1010602a9a2f489f070 Mon Sep 17 00:00:00 2001 From: swelf Date: Tue, 24 Oct 2023 16:23:13 +0300 Subject: [PATCH 159/307] update wasmd to v0.43 --- go.mod | 34 +++++++++++++++--------------- go.sum | 65 +++++++++++++++++++++++++++++----------------------------- 2 files changed, 51 insertions(+), 48 deletions(-) diff --git a/go.mod b/go.mod index 884d1ebe1..b0a297a10 100644 --- a/go.mod +++ b/go.mod @@ -7,8 +7,8 @@ require ( cosmossdk.io/errors v1.0.0 cosmossdk.io/log v1.2.1 cosmossdk.io/math v1.1.2 - github.com/CosmWasm/wasmd v0.41.0 - github.com/CosmWasm/wasmvm v1.3.0 + github.com/CosmWasm/wasmd v0.43.0 + github.com/CosmWasm/wasmvm v1.4.1 github.com/armon/go-metrics v0.4.1 github.com/cometbft/cometbft v0.37.2 github.com/cometbft/cometbft-db v0.8.0 @@ -18,7 +18,7 @@ require ( github.com/cosmos/gaia/v11 v11.0.0-00010101000000-000000000000 github.com/cosmos/gogoproto v1.4.10 github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.0-20230803181732-7c8f814d3b79 - github.com/cosmos/ibc-go/v7 v7.2.0 + github.com/cosmos/ibc-go/v7 v7.3.0 github.com/cosmos/ics23/go v0.10.0 github.com/cosmos/interchain-security/v3 v3.1.0 github.com/gogo/protobuf v1.3.3 @@ -26,6 +26,7 @@ require ( github.com/golang/protobuf v1.5.3 github.com/gorilla/mux v1.8.0 github.com/grpc-ecosystem/grpc-gateway v1.16.0 + github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0 github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.16.0 github.com/rs/zerolog v1.30.0 @@ -35,14 +36,14 @@ require ( github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.16.0 github.com/stretchr/testify v1.8.4 - google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98 + google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d google.golang.org/grpc v1.58.2 gopkg.in/yaml.v2 v2.4.0 ) require ( - cloud.google.com/go v0.110.4 // indirect - cloud.google.com/go/compute v1.21.0 // indirect + cloud.google.com/go v0.110.6 // indirect + cloud.google.com/go/compute v1.23.0 // indirect cloud.google.com/go/compute/metadata v0.2.3 // indirect cloud.google.com/go/iam v1.1.1 // indirect cloud.google.com/go/storage v1.30.1 // indirect @@ -72,7 +73,7 @@ require ( github.com/cosmos/btcutil v1.0.5 // indirect github.com/cosmos/go-bip39 v1.0.0 // indirect github.com/cosmos/gogogateway v1.2.0 // indirect - github.com/cosmos/iavl v0.20.0 // indirect + github.com/cosmos/iavl v0.20.1 // indirect github.com/cosmos/ledger-cosmos-go v0.13.0 // indirect github.com/cosmos/rosetta-sdk-go v0.10.0 // indirect github.com/creachadair/taskgroup v0.4.2 // indirect @@ -89,6 +90,7 @@ require ( github.com/felixge/httpsnoop v1.0.2 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect github.com/getsentry/sentry-go v0.23.0 // indirect + github.com/ghodss/yaml v1.0.0 // indirect github.com/go-kit/kit v0.12.0 // indirect github.com/go-kit/log v0.2.1 // indirect github.com/go-logfmt/logfmt v0.6.0 // indirect @@ -166,19 +168,19 @@ require ( github.com/zondax/ledger-go v0.14.1 // indirect go.etcd.io/bbolt v1.3.7 // indirect go.opencensus.io v0.24.0 // indirect - golang.org/x/crypto v0.12.0 // indirect + golang.org/x/crypto v0.13.0 // indirect golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb // indirect - golang.org/x/net v0.14.0 // indirect - golang.org/x/oauth2 v0.10.0 // indirect + golang.org/x/net v0.15.0 // indirect + golang.org/x/oauth2 v0.12.0 // indirect golang.org/x/sync v0.3.0 // indirect - golang.org/x/sys v0.11.0 // indirect - golang.org/x/term v0.11.0 // indirect - golang.org/x/text v0.12.0 // indirect + golang.org/x/sys v0.12.0 // indirect + golang.org/x/term v0.12.0 // indirect + golang.org/x/text v0.13.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect google.golang.org/api v0.126.0 // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto v0.0.0-20230711160842-782d3b101e98 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect + google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect google.golang.org/protobuf v1.31.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect @@ -190,7 +192,7 @@ require ( replace ( github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0 github.com/ChainSafe/go-schnorrkel => github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d - github.com/CosmWasm/wasmd => github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230808084410-6083b888424e + github.com/CosmWasm/wasmd => github.com/neutron-org/wasmd v0.41.1-0.20231024125505-4e32ed6dc344 github.com/cosmos/admin-module => github.com/neutron-org/admin-module v0.0.0-20230906150724-9ccb75c61fc5 github.com/cosmos/cosmos-sdk => github.com/neutron-org/cosmos-sdk v0.47.5-0.20230929200416-6c59762e84ad github.com/cosmos/gaia/v11 => github.com/cosmos/gaia/v11 v11.0.0-20230724152830-861ba391c3b4 diff --git a/go.sum b/go.sum index 15b257047..9d6202982 100644 --- a/go.sum +++ b/go.sum @@ -34,8 +34,8 @@ cloud.google.com/go v0.100.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w9 cloud.google.com/go v0.102.0/go.mod h1:oWcCzKlqJ5zgHQt9YsaeTY9KzIvjyy0ArmiBUgpQ+nc= cloud.google.com/go v0.102.1/go.mod h1:XZ77E9qnTEnrgEOvr4xzfdX5TRo7fB4T2F4O6+34hIU= cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA= -cloud.google.com/go v0.110.4 h1:1JYyxKMN9hd5dR2MYTPWkGUgcoxVVhg0LKNKEo0qvmk= -cloud.google.com/go v0.110.4/go.mod h1:+EYjdK8e5RME/VY/qLCAtuyALQ9q67dvuum8i+H5xsI= +cloud.google.com/go v0.110.6 h1:8uYAkj3YHTP/1iwReuHPxLSbdcyc+dSBbzFMrVwDR6Q= +cloud.google.com/go v0.110.6/go.mod h1:+EYjdK8e5RME/VY/qLCAtuyALQ9q67dvuum8i+H5xsI= cloud.google.com/go/aiplatform v1.22.0/go.mod h1:ig5Nct50bZlzV6NvKaTwmplLLddFx0YReh9WfTO5jKw= cloud.google.com/go/aiplatform v1.24.0/go.mod h1:67UUvRBKG6GTayHKV8DBv2RtR1t93YRu5B1P3x99mYY= cloud.google.com/go/analytics v0.11.0/go.mod h1:DjEWCu41bVbYcKyvlws9Er60YE4a//bK6mnhWvQeFNI= @@ -73,8 +73,8 @@ cloud.google.com/go/compute v1.6.0/go.mod h1:T29tfhtVbq1wvAPo0E3+7vhgmkOYeXjhFvz cloud.google.com/go/compute v1.6.1/go.mod h1:g85FgpzFvNULZ+S8AYq87axRKuf2Kh7deLqV/jJ3thU= cloud.google.com/go/compute v1.7.0/go.mod h1:435lt8av5oL9P3fv1OEzSbSUe+ybHXGMPQHHZWZxy9U= cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU= -cloud.google.com/go/compute v1.21.0 h1:JNBsyXVoOoNJtTQcnEY5uYpZIbeCTYIeDe0Xh1bySMk= -cloud.google.com/go/compute v1.21.0/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM= +cloud.google.com/go/compute v1.23.0 h1:tP41Zoavr8ptEqaW6j+LQOnyBBhO7OkOMAGrgLopTwY= +cloud.google.com/go/compute v1.23.0/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM= cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= cloud.google.com/go/containeranalysis v0.5.1/go.mod h1:1D92jd8gRR/c0fGMlymRgxWD3Qw9C1ff6/T7mLgVL8I= @@ -221,8 +221,8 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d h1:nalkkPQcITbvhmL4+C4cKA87NW0tfm3Kl9VXRoPywFg= github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d/go.mod h1:URdX5+vg25ts3aCh8H5IFZybJYKWhJHYMTnf+ULtoC4= -github.com/CosmWasm/wasmvm v1.3.0 h1:x12X4bKlUPS7TT9QQP45+fJo2sp30GEbiSSgb9jsec8= -github.com/CosmWasm/wasmvm v1.3.0/go.mod h1:vW/E3h8j9xBQs9bCoijDuawKo9kCtxOaS8N8J7KFtkc= +github.com/CosmWasm/wasmvm v1.4.1 h1:YgodVlBrXa2HJZzOXjWDH0EIRwQzK3zuA73dDPRRLS4= +github.com/CosmWasm/wasmvm v1.4.1/go.mod h1:fXB+m2gyh4v9839zlIXdMZGeLAxqUdYdFQqYsTha2hc= github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/DataDog/zstd v1.5.0/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= @@ -397,12 +397,12 @@ github.com/cosmos/gogogateway v1.2.0/go.mod h1:iQpLkGWxYcnCdz5iAdLcRBSw3h7NXeOkZ github.com/cosmos/gogoproto v1.4.2/go.mod h1:cLxOsn1ljAHSV527CHOtaIP91kK6cCrZETRBrkzItWU= github.com/cosmos/gogoproto v1.4.10 h1:QH/yT8X+c0F4ZDacDv3z+xE3WU1P1Z3wQoLMBRJoKuI= github.com/cosmos/gogoproto v1.4.10/go.mod h1:3aAZzeRWpAwr+SS/LLkICX2/kDFyaYVzckBDzygIxek= -github.com/cosmos/iavl v0.20.0 h1:fTVznVlepH0KK8NyKq8w+U7c2L6jofa27aFX6YGlm38= -github.com/cosmos/iavl v0.20.0/go.mod h1:WO7FyvaZJoH65+HFOsDir7xU9FWk2w9cHXNW1XHcl7A= +github.com/cosmos/iavl v0.20.1 h1:rM1kqeG3/HBT85vsZdoSNsehciqUQPWrR4BYmqE2+zg= +github.com/cosmos/iavl v0.20.1/go.mod h1:WO7FyvaZJoH65+HFOsDir7xU9FWk2w9cHXNW1XHcl7A= github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.0-20230803181732-7c8f814d3b79 h1:n+PjYB3JnbKN+sGmX6khST4xMP+D0UdrMNj7O91fuOg= github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.0-20230803181732-7c8f814d3b79/go.mod h1:fctjEnz9xaBFOlmYYPdKL8Hs1Y3GUKilSwsJdqBb5QU= -github.com/cosmos/ibc-go/v7 v7.2.0 h1:dx0DLUl7rxdyZ8NiT6UsrbzKOJx/w7s+BOaewFRH6cg= -github.com/cosmos/ibc-go/v7 v7.2.0/go.mod h1:OOcjKIRku/j1Xs1RgKK0yvKRrJ5iFuZYMetR1n3yMlc= +github.com/cosmos/ibc-go/v7 v7.3.0 h1:QtGeVMi/3JeLWuvEuC60sBHpAF40Oenx/y+bP8+wRRw= +github.com/cosmos/ibc-go/v7 v7.3.0/go.mod h1:mUmaHFXpXrEdcxfdXyau+utZf14pGKVUiXwYftRZZfQ= github.com/cosmos/ics23/go v0.10.0 h1:iXqLLgp2Lp+EdpIuwXTYIQU+AiHj9mOC2X9ab++bZDM= github.com/cosmos/ics23/go v0.10.0/go.mod h1:ZfJSmng/TBNTBkFemHHHj5YY7VAU/MBU980F4VU1NG0= github.com/cosmos/interchain-security/v3 v3.1.0 h1:EKDJCIKIDLG45tvKwfoANrRPgqvqfUt/f1TNKx3b7Uo= @@ -504,6 +504,7 @@ github.com/getkin/kin-openapi v0.53.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW github.com/getkin/kin-openapi v0.61.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4= github.com/getsentry/sentry-go v0.23.0 h1:dn+QRCeJv4pPt9OjVXiMcGIBIefaTJPw/h0bZWO05nE= github.com/getsentry/sentry-go v0.23.0/go.mod h1:lc76E2QywIyW8WuBnwl8Lc4bkmQH4+w1gwTf25trprY= +github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= @@ -703,6 +704,8 @@ github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgf github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0 h1:RtRsiaGvWxcwd8y3BiRZxsylPT8hLWZ5SPcfI+3IDNk= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0/go.mod h1:TzP6duP4Py2pHLVPPQp42aoYI92+PCrVotyR5e8Vqlk= github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c h1:6rhixN/i8ZofjG1Y75iExal34USq5p+wiN1tpie8IrU= github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c/go.mod h1:NMPJylDgVpX0MLRlPy15sqSwOFv/U1GZ2m21JhFfek0= github.com/gtank/merlin v0.1.1-0.20191105220539-8318aed1a79f/go.mod h1:T86dnYJhcGOh5BjZFCJWTDeTK7XW8uE+E21Cy/bIQ+s= @@ -935,12 +938,10 @@ github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OS github.com/neilotoole/errgroup v0.1.6/go.mod h1:Q2nLGf+594h0CLBs/Mbg6qOr7GtqDK7C2S41udRnToE= github.com/neutron-org/admin-module v0.0.0-20230906150724-9ccb75c61fc5 h1:96ZjLWoN4nCIcFdxrz51Xu2Y8aqpcScy3eva3S5hM60= github.com/neutron-org/admin-module v0.0.0-20230906150724-9ccb75c61fc5/go.mod h1:INknneN2W3Fr9Eld7SpfLRdjyHR1muzFbbqXln1ixic= -github.com/neutron-org/cosmos-sdk v0.47.5-0.20230921074823-5d5ff8b93265 h1:CIyjGN+/WTIgGyUEAiL7HcxQ2/XYX3r2Nv4RWBbhl8o= -github.com/neutron-org/cosmos-sdk v0.47.5-0.20230921074823-5d5ff8b93265/go.mod h1:4xMyIVekAs2OEUz/yh9JwzhLBMk+olM2sxgKuQdlhLg= github.com/neutron-org/cosmos-sdk v0.47.5-0.20230929200416-6c59762e84ad h1:BvYliP3KHiay2VLQwUSmDNCXm380TSTLDud8PH4RV6A= github.com/neutron-org/cosmos-sdk v0.47.5-0.20230929200416-6c59762e84ad/go.mod h1:4xMyIVekAs2OEUz/yh9JwzhLBMk+olM2sxgKuQdlhLg= -github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230808084410-6083b888424e h1:uVJCBWf1vcCYY0pzOA2SCPIZT8WsR8fsOxs57mnJbM4= -github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230808084410-6083b888424e/go.mod h1:Oagy36cU49438NzxKG/gmGTG903tiAI7LIUdH7x2qNY= +github.com/neutron-org/wasmd v0.41.1-0.20231024125505-4e32ed6dc344 h1:5Nl05LZIk13ek1i3fuZlj4rDu47VQrx3DWN1Cn1hIk0= +github.com/neutron-org/wasmd v0.41.1-0.20231024125505-4e32ed6dc344/go.mod h1:GEWnDHjbx7qtVHQ+5ocrNe1sIHNiXcTlSocXyLQNnRY= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= @@ -1236,8 +1237,8 @@ golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220314234659-1baeb1ce4c0b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.12.0 h1:tFM/ta59kqch6LlvYnPa0yx5a83cL2nHflFhYKvv9Yk= -golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw= +golang.org/x/crypto v0.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck= +golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -1348,8 +1349,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= -golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14= -golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= +golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8= +golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1375,8 +1376,8 @@ golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094/go.mod h1:h4gKUeWbJ4rQPri golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= golang.org/x/oauth2 v0.1.0/go.mod h1:G9FE4dLTsbXUu90h/Pf85g4w1D+SSAgR+q46nJZ8M4A= -golang.org/x/oauth2 v0.10.0 h1:zHCpF2Khkwy4mMB4bv0U37YtJdTGW8jI0glAApi0Kh8= -golang.org/x/oauth2 v0.10.0/go.mod h1:kTpgurOux7LqtuxjuyZa4Gj2gdezIt/jQtGnNFfypQI= +golang.org/x/oauth2 v0.12.0 h1:smVPGxink+n1ZI5pkQa8y6fZT0RW0MgCO5bFpepy4B4= +golang.org/x/oauth2 v0.12.0/go.mod h1:A74bZ3aGXgCY0qaIC9Ahg6Lglin4AMAco8cIv9baba4= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -1501,14 +1502,14 @@ golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20221010170243-090e33056c14/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM= -golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o= +golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.11.0 h1:F9tnn/DA/Im8nCwm+fX+1/eBwi4qFjRT++MhtVC4ZX0= -golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU= +golang.org/x/term v0.12.0 h1:/ZfYdc3zq+q02Rv9vGqTeSItdzZTSNDmfTi0mBAuidU= +golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1520,8 +1521,8 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc= -golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= +golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -1779,12 +1780,12 @@ google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqw google.golang.org/genproto v0.0.0-20221014173430-6e2ab493f96b/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221025140454-527a21cfbd71/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s= -google.golang.org/genproto v0.0.0-20230711160842-782d3b101e98 h1:Z0hjGZePRE0ZBWotvtrwxFNrNE9CUAGtplaDK5NNI/g= -google.golang.org/genproto v0.0.0-20230711160842-782d3b101e98/go.mod h1:S7mY02OqCJTD0E1OiQy1F72PWFB4bZJ87cAtLPYgDR0= -google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98 h1:FmF5cCW94Ij59cfpoLiwTgodWmm60eEV0CjlsVg2fuw= -google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98/go.mod h1:rsr7RhLuwsDKL7RmgDDCUc6yaGr1iqceVb5Wv6f6YvQ= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 h1:bVf09lpb+OJbByTj913DRJioFFAjf/ZGxEz7MajTp2U= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM= +google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 h1:L6iMMGrtzgHsWofoFcihmDEMYeDR9KN/ThbPWGrh++g= +google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5/go.mod h1:oH/ZOT02u4kWEp7oYBGYFFkCdKS/uYR9Z7+0/xuuFp8= +google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d h1:DoPTO70H+bcDXcd39vOqb2viZxgqeBeSGtZ55yZU4/Q= +google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d/go.mod h1:KjSP20unUpOx5kyQUFa7k4OJg0qeJ7DEZflGDu2p6Bk= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d h1:uvYuEyMHKNt+lT4K3bN6fGswmK8qSvcreM3BwjDh+y4= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= From dc0a52a3f0739ed6b9b1b8c93ab8a9d56b09463f Mon Sep 17 00:00:00 2001 From: swelf Date: Wed, 25 Oct 2023 00:34:51 +0300 Subject: [PATCH 160/307] removed key escape --- x/interchainqueries/keeper/msg_server.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/x/interchainqueries/keeper/msg_server.go b/x/interchainqueries/keeper/msg_server.go index 219c07e21..ca9c9ce13 100644 --- a/x/interchainqueries/keeper/msg_server.go +++ b/x/interchainqueries/keeper/msg_server.go @@ -4,7 +4,6 @@ import ( "bytes" "context" "fmt" - "net/url" "strconv" "time" @@ -230,7 +229,7 @@ func (m msgServer) SubmitQueryResult(goCtx context.Context, msg *types.MsgSubmit return nil, errors.Wrapf(types.ErrInvalidSubmittedResult, "KV path from result is not equal to registered query storage prefix: %v != %v", result.StoragePrefix, query.Keys[index].Path) } - path := ibccommitmenttypes.NewMerklePath(result.StoragePrefix, url.PathEscape(string(result.Key))) + path := ibccommitmenttypes.NewMerklePath(result.StoragePrefix, string(result.Key)) // identify what kind proofs (non-existence proof always has *ics23.CommitmentProof_Nonexist as the first item) we got // and call corresponding method to verify it switch proof.GetProofs()[0].GetProof().(type) { From 0cbcf88c4a603b66ae1c5047178b17ec820ac8c3 Mon Sep 17 00:00:00 2001 From: Lockwarr Date: Wed, 25 Oct 2023 09:15:10 +0300 Subject: [PATCH 161/307] fix: modify interchain keeper's accepted parameteres --- go.sum | 2 - .../interchaintxs/keeper/interchaintxs.go | 4 +- .../interchaintxs/types/expected_keepers.go | 45 +++++++++---------- x/feeburner/keeper/keeper.go | 6 +++ x/interchaintxs/keeper/ibc_handlers_test.go | 12 ++--- x/interchaintxs/keeper/keeper.go | 8 ++-- x/interchaintxs/keeper/msg_server_test.go | 21 +++------ x/interchaintxs/types/expected_keepers.go | 7 +-- 8 files changed, 51 insertions(+), 54 deletions(-) diff --git a/go.sum b/go.sum index 15b257047..d4361788f 100644 --- a/go.sum +++ b/go.sum @@ -935,8 +935,6 @@ github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OS github.com/neilotoole/errgroup v0.1.6/go.mod h1:Q2nLGf+594h0CLBs/Mbg6qOr7GtqDK7C2S41udRnToE= github.com/neutron-org/admin-module v0.0.0-20230906150724-9ccb75c61fc5 h1:96ZjLWoN4nCIcFdxrz51Xu2Y8aqpcScy3eva3S5hM60= github.com/neutron-org/admin-module v0.0.0-20230906150724-9ccb75c61fc5/go.mod h1:INknneN2W3Fr9Eld7SpfLRdjyHR1muzFbbqXln1ixic= -github.com/neutron-org/cosmos-sdk v0.47.5-0.20230921074823-5d5ff8b93265 h1:CIyjGN+/WTIgGyUEAiL7HcxQ2/XYX3r2Nv4RWBbhl8o= -github.com/neutron-org/cosmos-sdk v0.47.5-0.20230921074823-5d5ff8b93265/go.mod h1:4xMyIVekAs2OEUz/yh9JwzhLBMk+olM2sxgKuQdlhLg= github.com/neutron-org/cosmos-sdk v0.47.5-0.20230929200416-6c59762e84ad h1:BvYliP3KHiay2VLQwUSmDNCXm380TSTLDud8PH4RV6A= github.com/neutron-org/cosmos-sdk v0.47.5-0.20230929200416-6c59762e84ad/go.mod h1:4xMyIVekAs2OEUz/yh9JwzhLBMk+olM2sxgKuQdlhLg= github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230808084410-6083b888424e h1:uVJCBWf1vcCYY0pzOA2SCPIZT8WsR8fsOxs57mnJbM4= diff --git a/testutil/interchaintxs/keeper/interchaintxs.go b/testutil/interchaintxs/keeper/interchaintxs.go index 83d4114c2..412297b09 100644 --- a/testutil/interchaintxs/keeper/interchaintxs.go +++ b/testutil/interchaintxs/keeper/interchaintxs.go @@ -27,7 +27,7 @@ func InterchainTxsKeeper( icaControllerKeeper types.ICAControllerKeeper, channelKeeper types.ChannelKeeper, bankKeeper types.BankKeeper, - feeburnerKeeper types.FeeBurnerKeeper, + treasuryKeeper types.TreasuryKeeper, ) (*keeper.Keeper, sdk.Context) { storeKey := sdk.NewKVStoreKey(types.StoreKey) memStoreKey := storetypes.NewMemoryStoreKey(types.MemStoreKey) @@ -50,7 +50,7 @@ func InterchainTxsKeeper( managerKeeper, refunderKeeper, bankKeeper, - feeburnerKeeper, + treasuryKeeper, authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String(), ) diff --git a/testutil/mocks/interchaintxs/types/expected_keepers.go b/testutil/mocks/interchaintxs/types/expected_keepers.go index 97633afb9..1d9fb7aa3 100644 --- a/testutil/mocks/interchaintxs/types/expected_keepers.go +++ b/testutil/mocks/interchaintxs/types/expected_keepers.go @@ -14,8 +14,7 @@ import ( types3 "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" exported "github.com/cosmos/ibc-go/v7/modules/core/exported" gomock "github.com/golang/mock/gomock" - types4 "github.com/neutron-org/neutron/x/feeburner/types" - types5 "github.com/neutron-org/neutron/x/feerefunder/types" + types4 "github.com/neutron-org/neutron/x/feerefunder/types" ) // MockAccountKeeper is a mock of AccountKeeper interface. @@ -264,7 +263,7 @@ func (m *MockFeeRefunderKeeper) EXPECT() *MockFeeRefunderKeeperMockRecorder { } // DistributeAcknowledgementFee mocks base method. -func (m *MockFeeRefunderKeeper) DistributeAcknowledgementFee(ctx types.Context, receiver types.AccAddress, packetID types5.PacketID) { +func (m *MockFeeRefunderKeeper) DistributeAcknowledgementFee(ctx types.Context, receiver types.AccAddress, packetID types4.PacketID) { m.ctrl.T.Helper() m.ctrl.Call(m, "DistributeAcknowledgementFee", ctx, receiver, packetID) } @@ -276,7 +275,7 @@ func (mr *MockFeeRefunderKeeperMockRecorder) DistributeAcknowledgementFee(ctx, r } // DistributeTimeoutFee mocks base method. -func (m *MockFeeRefunderKeeper) DistributeTimeoutFee(ctx types.Context, receiver types.AccAddress, packetID types5.PacketID) { +func (m *MockFeeRefunderKeeper) DistributeTimeoutFee(ctx types.Context, receiver types.AccAddress, packetID types4.PacketID) { m.ctrl.T.Helper() m.ctrl.Call(m, "DistributeTimeoutFee", ctx, receiver, packetID) } @@ -288,7 +287,7 @@ func (mr *MockFeeRefunderKeeperMockRecorder) DistributeTimeoutFee(ctx, receiver, } // LockFees mocks base method. -func (m *MockFeeRefunderKeeper) LockFees(ctx types.Context, payer types.AccAddress, packetID types5.PacketID, fee types5.Fee) error { +func (m *MockFeeRefunderKeeper) LockFees(ctx types.Context, payer types.AccAddress, packetID types4.PacketID, fee types4.Fee) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "LockFees", ctx, payer, packetID, fee) ret0, _ := ret[0].(error) @@ -369,39 +368,39 @@ func (mr *MockChannelKeeperMockRecorder) GetNextSequenceSend(ctx, portID, channe return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetNextSequenceSend", reflect.TypeOf((*MockChannelKeeper)(nil).GetNextSequenceSend), ctx, portID, channelID) } -// MockFeeBurnerKeeper is a mock of FeeBurnerKeeper interface. -type MockFeeBurnerKeeper struct { +// MockTreasuryKeeper is a mock of TreasuryKeeper interface. +type MockTreasuryKeeper struct { ctrl *gomock.Controller - recorder *MockFeeBurnerKeeperMockRecorder + recorder *MockTreasuryKeeperMockRecorder } -// MockFeeBurnerKeeperMockRecorder is the mock recorder for MockFeeBurnerKeeper. -type MockFeeBurnerKeeperMockRecorder struct { - mock *MockFeeBurnerKeeper +// MockTreasuryKeeperMockRecorder is the mock recorder for MockTreasuryKeeper. +type MockTreasuryKeeperMockRecorder struct { + mock *MockTreasuryKeeper } -// NewMockFeeBurnerKeeper creates a new mock instance. -func NewMockFeeBurnerKeeper(ctrl *gomock.Controller) *MockFeeBurnerKeeper { - mock := &MockFeeBurnerKeeper{ctrl: ctrl} - mock.recorder = &MockFeeBurnerKeeperMockRecorder{mock} +// NewMockTreasuryKeeper creates a new mock instance. +func NewMockTreasuryKeeper(ctrl *gomock.Controller) *MockTreasuryKeeper { + mock := &MockTreasuryKeeper{ctrl: ctrl} + mock.recorder = &MockTreasuryKeeperMockRecorder{mock} return mock } // EXPECT returns an object that allows the caller to indicate expected use. -func (m *MockFeeBurnerKeeper) EXPECT() *MockFeeBurnerKeeperMockRecorder { +func (m *MockTreasuryKeeper) EXPECT() *MockTreasuryKeeperMockRecorder { return m.recorder } -// GetParams mocks base method. -func (m *MockFeeBurnerKeeper) GetParams(ctx types.Context) types4.Params { +// GetTreasury mocks base method. +func (m *MockTreasuryKeeper) GetTreasury(ctx types.Context) string { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GetParams", ctx) - ret0, _ := ret[0].(types4.Params) + ret := m.ctrl.Call(m, "GetTreasury", ctx) + ret0, _ := ret[0].(string) return ret0 } -// GetParams indicates an expected call of GetParams. -func (mr *MockFeeBurnerKeeperMockRecorder) GetParams(ctx interface{}) *gomock.Call { +// GetTreasury indicates an expected call of GetTreasury. +func (mr *MockTreasuryKeeperMockRecorder) GetTreasury(ctx interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetParams", reflect.TypeOf((*MockFeeBurnerKeeper)(nil).GetParams), ctx) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetTreasury", reflect.TypeOf((*MockTreasuryKeeper)(nil).GetTreasury), ctx) } diff --git a/x/feeburner/keeper/keeper.go b/x/feeburner/keeper/keeper.go index e65220b29..32f65b525 100644 --- a/x/feeburner/keeper/keeper.go +++ b/x/feeburner/keeper/keeper.go @@ -142,3 +142,9 @@ func (k Keeper) Logger(ctx sdk.Context) log.Logger { func (k Keeper) FundCommunityPool(ctx sdk.Context, amount sdk.Coins, sender sdk.AccAddress) error { return k.bankKeeper.SendCoinsFromAccountToModule(ctx, sender, authtypes.FeeCollectorName, amount) } + +// GetTreasury is used to satisfy the interface requirement for interchaintxs module. +// The single point of truth for the treasury address is in the feeburner module params. +func (k Keeper) GetTreasury(ctx sdk.Context) string { + return k.GetParams(ctx).TreasuryAddress +} diff --git a/x/interchaintxs/keeper/ibc_handlers_test.go b/x/interchaintxs/keeper/ibc_handlers_test.go index d6fd0d88b..d1ab98bae 100644 --- a/x/interchaintxs/keeper/ibc_handlers_test.go +++ b/x/interchaintxs/keeper/ibc_handlers_test.go @@ -26,8 +26,8 @@ func TestHandleAcknowledgement(t *testing.T) { wmKeeper := mock_types.NewMockWasmKeeper(ctrl) feeKeeper := mock_types.NewMockFeeRefunderKeeper(ctrl) bankKeeper := mock_types.NewMockBankKeeper(ctrl) - feeburnerKeeper := mock_types.NewMockFeeBurnerKeeper(ctrl) - icak, infCtx := testkeeper.InterchainTxsKeeper(t, wmKeeper, feeKeeper, icaKeeper, nil, bankKeeper, feeburnerKeeper) + treasuryKeeper := mock_types.NewMockTreasuryKeeper(ctrl) + icak, infCtx := testkeeper.InterchainTxsKeeper(t, wmKeeper, feeKeeper, icaKeeper, nil, bankKeeper, treasuryKeeper) ctx := infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) resACK := channeltypes.Acknowledgement{ @@ -75,8 +75,8 @@ func TestHandleTimeout(t *testing.T) { wmKeeper := mock_types.NewMockWasmKeeper(ctrl) feeKeeper := mock_types.NewMockFeeRefunderKeeper(ctrl) bankKeeper := mock_types.NewMockBankKeeper(ctrl) - feeburnerKeeper := mock_types.NewMockFeeBurnerKeeper(ctrl) - icak, infCtx := testkeeper.InterchainTxsKeeper(t, wmKeeper, feeKeeper, icaKeeper, nil, bankKeeper, feeburnerKeeper) + treasuryKeeper := mock_types.NewMockTreasuryKeeper(ctrl) + icak, infCtx := testkeeper.InterchainTxsKeeper(t, wmKeeper, feeKeeper, icaKeeper, nil, bankKeeper, treasuryKeeper) ctx := infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) contractAddress := sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress) relayerBech32 := "neutron1fxudpred77a0grgh69u0j7y84yks5ev4n5050z45kecz792jnd6scqu98z" @@ -113,8 +113,8 @@ func TestHandleChanOpenAck(t *testing.T) { defer ctrl.Finish() wmKeeper := mock_types.NewMockWasmKeeper(ctrl) bankKeeper := mock_types.NewMockBankKeeper(ctrl) - feeburnerKeeper := mock_types.NewMockFeeBurnerKeeper(ctrl) - icak, ctx := testkeeper.InterchainTxsKeeper(t, wmKeeper, nil, nil, nil, bankKeeper, feeburnerKeeper) + treasuryKeeper := mock_types.NewMockTreasuryKeeper(ctrl) + icak, ctx := testkeeper.InterchainTxsKeeper(t, wmKeeper, nil, nil, nil, bankKeeper, treasuryKeeper) portID := icatypes.ControllerPortPrefix + testutil.TestOwnerAddress + ".ica0" contractAddress := sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress) channelID := "channel-0" diff --git a/x/interchaintxs/keeper/keeper.go b/x/interchaintxs/keeper/keeper.go index fe13695f3..7e2238b0a 100644 --- a/x/interchaintxs/keeper/keeper.go +++ b/x/interchaintxs/keeper/keeper.go @@ -32,7 +32,7 @@ type ( icaControllerKeeper types.ICAControllerKeeper sudoKeeper types.WasmKeeper bankKeeper types.BankKeeper - feeBurnerKeeper types.FeeBurnerKeeper + treasuryKeeper types.TreasuryKeeper authority string } ) @@ -46,7 +46,7 @@ func NewKeeper( sudoKeeper types.WasmKeeper, feeKeeper types.FeeRefunderKeeper, bankKeeper types.BankKeeper, - feeBurnerKeeper types.FeeBurnerKeeper, + treasuryKeeper types.TreasuryKeeper, authority string, ) *Keeper { return &Keeper{ @@ -58,7 +58,7 @@ func NewKeeper( sudoKeeper: sudoKeeper, feeKeeper: feeKeeper, bankKeeper: bankKeeper, - feeBurnerKeeper: feeBurnerKeeper, + treasuryKeeper: treasuryKeeper, authority: authority, } } @@ -76,7 +76,7 @@ func (k Keeper) ChargeFee(ctx sdk.Context, payer sdk.AccAddress, fee sdk.Coins) return errors.Wrapf(sdkerrors.ErrInsufficientFee, "provided fee is less than min governance set ack fee: %s < %s", fee, params.RegisterFee) } - treasury := k.feeBurnerKeeper.GetParams(ctx).TreasuryAddress + treasury := k.treasuryKeeper.GetTreasury(ctx) treasuryAddress, err := sdk.AccAddressFromBech32(treasury) if err != nil { return errors.Wrapf(sdkerrors.ErrInvalidAddress, "failed to convert treasury, bech32 to AccAddress: %s: %s", treasury, err.Error()) diff --git a/x/interchaintxs/keeper/msg_server_test.go b/x/interchaintxs/keeper/msg_server_test.go index bbb3d8d04..b38b511ff 100644 --- a/x/interchaintxs/keeper/msg_server_test.go +++ b/x/interchaintxs/keeper/msg_server_test.go @@ -6,7 +6,6 @@ import ( "time" "github.com/neutron-org/neutron/app/params" - feeburnertypes "github.com/neutron-org/neutron/x/feeburner/types" icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" feerefundertypes "github.com/neutron-org/neutron/x/feerefunder/types" @@ -32,8 +31,8 @@ func TestRegisterInterchainAccount(t *testing.T) { icaKeeper := mock_types.NewMockICAControllerKeeper(ctrl) wmKeeper := mock_types.NewMockWasmKeeper(ctrl) bankKeeper := mock_types.NewMockBankKeeper(ctrl) - feeburnerKeeper := mock_types.NewMockFeeBurnerKeeper(ctrl) - icak, ctx := testkeeper.InterchainTxsKeeper(t, wmKeeper, nil, icaKeeper, nil, bankKeeper, feeburnerKeeper) + treasuryKeeper := mock_types.NewMockTreasuryKeeper(ctrl) + icak, ctx := testkeeper.InterchainTxsKeeper(t, wmKeeper, nil, icaKeeper, nil, bankKeeper, treasuryKeeper) goCtx := sdk.WrapSDKContext(ctx) msgRegAcc := types.MsgRegisterInterchainAccount{ @@ -61,9 +60,7 @@ func TestRegisterInterchainAccount(t *testing.T) { msgRegAcc.RegisterFee = sdk.NewCoins(sdk.NewCoin(params.DefaultDenom, sdk.NewInt(1000))) wmKeeper.EXPECT().HasContractInfo(ctx, contractAddress).Return(true) - feeburnerKeeper.EXPECT().GetParams(ctx).Return(feeburnertypes.Params{ - TreasuryAddress: TestTreasury, - }) + treasuryKeeper.EXPECT().GetTreasury(ctx).Return(TestTreasury) bankKeeper.EXPECT().SendCoins(ctx, sdk.MustAccAddressFromBech32(msgRegAcc.FromAddress), sdk.MustAccAddressFromBech32(TestTreasury), msgRegAcc.RegisterFee) icaKeeper.EXPECT().RegisterInterchainAccount(ctx, msgRegAcc.ConnectionId, icaOwner.String(), "").Return(fmt.Errorf("failed to register ica")) resp, err = icak.RegisterInterchainAccount(goCtx, &msgRegAcc) @@ -71,9 +68,7 @@ func TestRegisterInterchainAccount(t *testing.T) { require.Nil(t, resp) wmKeeper.EXPECT().HasContractInfo(ctx, contractAddress).Return(true) - feeburnerKeeper.EXPECT().GetParams(ctx).Return(feeburnertypes.Params{ - TreasuryAddress: TestTreasury, - }) + treasuryKeeper.EXPECT().GetTreasury(ctx).Return(TestTreasury) bankKeeper.EXPECT(). SendCoins(ctx, sdk.MustAccAddressFromBech32(msgRegAcc.FromAddress), sdk.MustAccAddressFromBech32(TestTreasury), msgRegAcc.RegisterFee). Return(fmt.Errorf("failed to send coins")) @@ -82,9 +77,7 @@ func TestRegisterInterchainAccount(t *testing.T) { require.Nil(t, resp) wmKeeper.EXPECT().HasContractInfo(ctx, contractAddress).Return(true) - feeburnerKeeper.EXPECT().GetParams(ctx).Return(feeburnertypes.Params{ - TreasuryAddress: TestTreasury, - }) + treasuryKeeper.EXPECT().GetTreasury(ctx).Return(TestTreasury) bankKeeper.EXPECT().SendCoins(ctx, sdk.MustAccAddressFromBech32(msgRegAcc.FromAddress), sdk.MustAccAddressFromBech32(TestTreasury), msgRegAcc.RegisterFee) icaKeeper.EXPECT().RegisterInterchainAccount(ctx, msgRegAcc.ConnectionId, icaOwner.String(), "").Return(nil) resp, err = icak.RegisterInterchainAccount(goCtx, &msgRegAcc) @@ -100,8 +93,8 @@ func TestSubmitTx(t *testing.T) { refundKeeper := mock_types.NewMockFeeRefunderKeeper(ctrl) channelKeeper := mock_types.NewMockChannelKeeper(ctrl) bankKeeper := mock_types.NewMockBankKeeper(ctrl) - feeburnerKeeper := mock_types.NewMockFeeBurnerKeeper(ctrl) - icak, ctx := testkeeper.InterchainTxsKeeper(t, wmKeeper, refundKeeper, icaKeeper, channelKeeper, bankKeeper, feeburnerKeeper) + treasuryKeeper := mock_types.NewMockTreasuryKeeper(ctrl) + icak, ctx := testkeeper.InterchainTxsKeeper(t, wmKeeper, refundKeeper, icaKeeper, channelKeeper, bankKeeper, treasuryKeeper) goCtx := sdk.WrapSDKContext(ctx) cosmosMsg := codectypes.Any{ diff --git a/x/interchaintxs/types/expected_keepers.go b/x/interchaintxs/types/expected_keepers.go index 23648d88d..5b054d857 100644 --- a/x/interchaintxs/types/expected_keepers.go +++ b/x/interchaintxs/types/expected_keepers.go @@ -7,7 +7,6 @@ import ( icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" - feeburnertypes "github.com/neutron-org/neutron/x/feeburner/types" feerefundertypes "github.com/neutron-org/neutron/x/feerefunder/types" ) @@ -49,6 +48,8 @@ type ChannelKeeper interface { GetConnection(ctx sdk.Context, connectionID string) (ibcexported.ConnectionI, error) } -type FeeBurnerKeeper interface { - GetParams(ctx sdk.Context) feeburnertypes.Params +// TreasuryKeeper is a keeper of a module that keeps and maintains the treasury address. +// This could be different module for each chain. +type TreasuryKeeper interface { + GetTreasury(ctx sdk.Context) string } From 41fa1a4f98dd55ef848006f6c19d3ccbd40eb7ad Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Tue, 24 Oct 2023 16:10:30 +0400 Subject: [PATCH 162/307] rm rudiment --- .../testdata/neutron_interchain_txs.wasm | Bin app/upgrades/nextupgrade/upgrades.go | 1 - app/upgrades/nextupgrade/upgrades_test.go | 45 ++++++++++-------- x/interchaintxs/keeper/msg_server.go | 2 +- 4 files changed, 27 insertions(+), 21 deletions(-) rename {wasmbinding => app/upgrades/nextupgrade}/testdata/neutron_interchain_txs.wasm (100%) diff --git a/wasmbinding/testdata/neutron_interchain_txs.wasm b/app/upgrades/nextupgrade/testdata/neutron_interchain_txs.wasm similarity index 100% rename from wasmbinding/testdata/neutron_interchain_txs.wasm rename to app/upgrades/nextupgrade/testdata/neutron_interchain_txs.wasm diff --git a/app/upgrades/nextupgrade/upgrades.go b/app/upgrades/nextupgrade/upgrades.go index ee062bbd0..29c439db6 100644 --- a/app/upgrades/nextupgrade/upgrades.go +++ b/app/upgrades/nextupgrade/upgrades.go @@ -246,7 +246,6 @@ func setInterchainTxsParams(ctx sdk.Context, paramsKeepers paramskeeper.Keeper, if bzWasm == nil { return fmt.Errorf("last code ID not found during the upgrade") } - store.Set(interchaintxstypes.LastCodeIdBeforeUpgrade, bzWasm) return nil } diff --git a/app/upgrades/nextupgrade/upgrades_test.go b/app/upgrades/nextupgrade/upgrades_test.go index 9763feec8..9ace8ba4a 100644 --- a/app/upgrades/nextupgrade/upgrades_test.go +++ b/app/upgrades/nextupgrade/upgrades_test.go @@ -55,9 +55,6 @@ func (suite *UpgradeTestSuite) SetupTest() { pTokenfactory := tokenfactorytypes.DefaultParams() subspace.SetParamSet(ctx, &pTokenfactory) - pWasmTypes := icqtypes.DefaultParams() - subspace.SetParamSet(ctx, &pWasmTypes) - subspace, _ = app.ParamsKeeper.GetSubspace(icqtypes.StoreKey) pICQTypes := icqtypes.DefaultParams() subspace.SetParamSet(ctx, &pICQTypes) @@ -65,6 +62,9 @@ func (suite *UpgradeTestSuite) SetupTest() { subspace, _ = app.ParamsKeeper.GetSubspace(interchaintxstypes.StoreKey) pICAtx := interchaintxstypes.DefaultParams() subspace.SetParamSet(ctx, &pICAtx) + + codeIDBefore := suite.StoreTestCode(ctx, sdk.AccAddress("neutron1weweewe"), "testdata/neutron_interchain_txs.wasm") + suite.InstantiateTestContract(ctx, sdk.AccAddress("neutron1weweewe"), codeIDBefore) } func (suite *UpgradeTestSuite) TestGlobalFeesUpgrade() { @@ -172,7 +172,7 @@ func (suite *UpgradeTestSuite) TestRegisterInterchainAccountCreationFee() { ) suite.Require().True(ccvConsumerSubspace.Has(ctx, ccvconsumertypes.KeyRewardDenoms)) - + suite.FundAcc(sdk.AccAddress("neutron1weweewe"), sdk.NewCoins(sdk.NewCoin("untrn", sdk.NewInt(10000)))) // emulate mainnet/testnet state ccvConsumerSubspace.Set(ctx, ccvconsumertypes.KeyRewardDenoms, &[]string{params.DefaultDenom}) @@ -180,8 +180,11 @@ func (suite *UpgradeTestSuite) TestRegisterInterchainAccountCreationFee() { ccvConsumerSubspace.Get(ctx, ccvconsumertypes.KeyRewardDenoms, &denomsBefore) suite.Require().Equal(denomsBefore, []string{params.DefaultDenom}) contractKeeper := keeper.NewDefaultPermissionKeeper(app.WasmKeeper) - codeIDBefore := suite.StoreTestCode(ctx, sdk.AccAddress("neutron1weweewe"), "../../wasmbiding/testdata/neutron_interchain_txs.wasm.wasm") - contractAddressBefore := suite.InstantiateTestContract(ctx, sdk.AccAddress("neutron1weweewe"), codeIDBefore) + // store contract just to increase code_id + _ = suite.StoreTestCode(ctx, sdk.AccAddress("neutron1_ica"), "testdata/neutron_interchain_txs.wasm") + // store contract for register ica w/o fees + codeIDBefore := suite.StoreTestCode(ctx, sdk.AccAddress("neutron1_ica"), "testdata/neutron_interchain_txs.wasm") + contractAddressBeforeUpgrade := suite.InstantiateTestContract(ctx, sdk.AccAddress("neutron1_ica"), codeIDBefore) upgrade := upgradetypes.Plan{ Name: nextupgrade.UpgradeName, @@ -190,22 +193,26 @@ func (suite *UpgradeTestSuite) TestRegisterInterchainAccountCreationFee() { } app.UpgradeKeeper.ApplyUpgrade(ctx, upgrade) - // Store code and instantiate reflect contract - codeID := suite.StoreTestCode(ctx, sdk.AccAddress("neutron1weweewe"), "../../wasmbinding/testdata/neutron_interchain_txs.wasm") - contractAddressAfter := suite.InstantiateTestContract(ctx, sdk.AccAddress("neutron1weweewe"), codeID) + lastCodeID := app.InterchainTxsKeeper.GetLastCodeIDBeforeUpgrade(ctx) + // ensure that wasm module stores next code id + suite.Require().Equal(lastCodeID, codeIDBefore+1) + + // store contract after upgrade + codeID := suite.StoreTestCode(ctx, sdk.AccAddress("neutron1_ica"), "testdata/neutron_interchain_txs.wasm") + contractAddressAfterUpgrade := suite.InstantiateTestContract(ctx, sdk.AccAddress("neutron1_ica"), codeID) // register w/o actual fees - jsonStringBefore := `{"connection_id":"1","interchain_account_id":"test-1"}` - byteEncodedMsgBefore := []byte(jsonStringBefore) - _, err := contractKeeper.Execute(ctx, contractAddressBefore, sdk.AccAddress("neutron1weweewe"), byteEncodedMsgBefore, nil) - suite.Require().Error(err) + jsonStringBeforeUpgrade := `{"register": {"connection_id":"connection-1","interchain_account_id":"test-2"}}` + byteEncodedMsgBeforeUpgrade := []byte(jsonStringBeforeUpgrade) + _, err := contractKeeper.Execute(ctx, contractAddressBeforeUpgrade, sdk.AccAddress("neutron1_ica"), byteEncodedMsgBeforeUpgrade, nil) + suite.Require().NoError(err) // register with fees - jsonStringAfter := `{"connection_id":"1","interchain_account_id":"test-2"}` - byteEncodedMsgAfter := []byte(jsonStringAfter) - _, err = contractKeeper.Execute(ctx, contractAddressAfter, sdk.AccAddress("neutron1weweewe"), byteEncodedMsgAfter, sdk.NewCoins(sdk.NewCoin("untrn", sdk.NewInt(1000)))) + jsonStringAfterUpgrade := `{"register": {"connection_id":"connection-1","interchain_account_id":"test-3"}}` + byteEncodedMsgAfterUpgrade := []byte(jsonStringAfterUpgrade) + _, err = contractKeeper.Execute(ctx, contractAddressAfterUpgrade, sdk.AccAddress("neutron1weweewe"), byteEncodedMsgAfterUpgrade, sdk.NewCoins(sdk.NewCoin("untrn", sdk.NewInt(1000)))) suite.Require().NoError(err) - // failed register due lack of fees - _, err = contractKeeper.Execute(ctx, contractAddressAfter, sdk.AccAddress("neutron1weweewe"), byteEncodedMsgAfter, nil) - suite.Require().Error(err) + // failed register due lack of fees (fees required) + _, err = contractKeeper.Execute(ctx, contractAddressAfterUpgrade, sdk.AccAddress("neutron1weweewe"), byteEncodedMsgAfterUpgrade, nil) + suite.Error(err) } diff --git a/x/interchaintxs/keeper/msg_server.go b/x/interchaintxs/keeper/msg_server.go index f940deeba..ddfee769b 100644 --- a/x/interchaintxs/keeper/msg_server.go +++ b/x/interchaintxs/keeper/msg_server.go @@ -47,7 +47,7 @@ func (k Keeper) RegisterInterchainAccount(goCtx context.Context, msg *ictxtypes. return nil, errors.Wrapf(ictxtypes.ErrNotContract, "%s is not a contract address", msg.FromAddress) } - if k.sudoKeeper.GetContractInfo(ctx, senderAddr).CodeID > k.GetLastCodeIDBeforeUpgrade(ctx) { + if k.sudoKeeper.GetContractInfo(ctx, senderAddr).CodeID >= k.GetLastCodeIDBeforeUpgrade(ctx) { if err := k.ChargeFee(ctx, senderAddr, msg.RegisterFee); err != nil { return nil, errors.Wrapf(err, "failed to charge fees to pay for RegisterInterchainAccount msg: %s", msg) } From 54ab137ffc79dca212a97dee3a9ebcdd9273f8ab Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Wed, 25 Oct 2023 12:50:24 +0400 Subject: [PATCH 163/307] fix expected keepers --- testutil/mocks/contractmanager/types/expected_keepers.go | 6 ++++++ testutil/mocks/interchaintxs/types/expected_keepers.go | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/testutil/mocks/contractmanager/types/expected_keepers.go b/testutil/mocks/contractmanager/types/expected_keepers.go index d27f64e5f..c69dcf649 100644 --- a/testutil/mocks/contractmanager/types/expected_keepers.go +++ b/testutil/mocks/contractmanager/types/expected_keepers.go @@ -7,6 +7,7 @@ package mock_types import ( reflect "reflect" + wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" types "github.com/cosmos/cosmos-sdk/types" gomock "github.com/golang/mock/gomock" types0 "github.com/neutron-org/neutron/x/contractmanager/types" @@ -18,6 +19,11 @@ type MockWasmKeeper struct { recorder *MockWasmKeeperMockRecorder } +func (m *MockWasmKeeper) GetContractInfo(ctx types.Context, contractAddress types.AccAddress) *wasmtypes.ContractInfo { + //TODO implement me + panic("implement me") +} + // MockWasmKeeperMockRecorder is the mock recorder for MockWasmKeeper. type MockWasmKeeperMockRecorder struct { mock *MockWasmKeeper diff --git a/testutil/mocks/interchaintxs/types/expected_keepers.go b/testutil/mocks/interchaintxs/types/expected_keepers.go index 97633afb9..e5ee509bf 100644 --- a/testutil/mocks/interchaintxs/types/expected_keepers.go +++ b/testutil/mocks/interchaintxs/types/expected_keepers.go @@ -7,6 +7,7 @@ package mock_types import ( reflect "reflect" + wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" types "github.com/cosmos/cosmos-sdk/types" types0 "github.com/cosmos/cosmos-sdk/x/auth/types" types1 "github.com/cosmos/cosmos-sdk/x/capability/types" @@ -112,6 +113,10 @@ type MockWasmKeeper struct { recorder *MockWasmKeeperMockRecorder } +func (m *MockWasmKeeper) GetContractInfo(ctx types.Context, contractAddress types.AccAddress) *wasmtypes.ContractInfo { + return &wasmtypes.ContractInfo{CodeID: 1} +} + // MockWasmKeeperMockRecorder is the mock recorder for MockWasmKeeper. type MockWasmKeeperMockRecorder struct { mock *MockWasmKeeper From fc94bbe2ab714dc150eaf10980f851e8035b41a8 Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Wed, 25 Oct 2023 13:35:57 +0300 Subject: [PATCH 164/307] uniform import name --- wasmbinding/stargate_allowlist.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wasmbinding/stargate_allowlist.go b/wasmbinding/stargate_allowlist.go index 3c3eac22a..1a1ca5483 100644 --- a/wasmbinding/stargate_allowlist.go +++ b/wasmbinding/stargate_allowlist.go @@ -4,7 +4,7 @@ import ( wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/types" + icacontrollertypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/types" ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" ibcconnectiontypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" @@ -29,7 +29,7 @@ func AcceptedStargateQueries() wasmkeeper.AcceptedStargateQueries { "/osmosis.tokenfactory.v1beta1.Query/BeforeSendHookAddress": &tokenfactorytypes.QueryBeforeSendHookAddressResponse{}, // interchain accounts - "/ibc.applications.interchain_accounts.controller.v1.Query/InterchainAccount": &types.QueryInterchainAccountResponse{}, + "/ibc.applications.interchain_accounts.controller.v1.Query/InterchainAccount": &icacontrollertypes.QueryInterchainAccountResponse{}, // transfer "/ibc.applications.transfer.v1.Query/DenomTrace": &ibctransfertypes.QueryDenomTraceResponse{}, From 7e91506fb6d733163bab7a4a20960558c1674d97 Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Mon, 30 Oct 2023 11:24:57 +0400 Subject: [PATCH 165/307] rm unused --- x/interchaintxs/keeper/keeper.go | 5 ----- 1 file changed, 5 deletions(-) diff --git a/x/interchaintxs/keeper/keeper.go b/x/interchaintxs/keeper/keeper.go index 2bc4aff43..8bc17a709 100644 --- a/x/interchaintxs/keeper/keeper.go +++ b/x/interchaintxs/keeper/keeper.go @@ -103,8 +103,3 @@ func (k Keeper) GetLastCodeIDBeforeUpgrade(ctx sdk.Context) (codeID uint64) { } return sdk.BigEndianToUint64(bytes) } - -func (k Keeper) SetLastCodeIDBeforeUpgrade(ctx sdk.Context, id uint64) { - store := ctx.KVStore(k.storeKey) - store.Set(types.LastCodeIdBeforeUpgrade, sdk.Uint64ToBigEndian(id)) -} From 86dc405e4388c9bdce88780146a23261916384f0 Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Mon, 30 Oct 2023 18:10:28 +0200 Subject: [PATCH 166/307] bump cosmos-sdk --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index f60adf450..a0f9c16f7 100644 --- a/go.mod +++ b/go.mod @@ -192,7 +192,7 @@ replace ( github.com/ChainSafe/go-schnorrkel => github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d github.com/CosmWasm/wasmd => github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230808084410-6083b888424e github.com/cosmos/admin-module => github.com/neutron-org/admin-module v0.0.0-20230906150724-9ccb75c61fc5 - github.com/cosmos/cosmos-sdk => github.com/neutron-org/cosmos-sdk v0.47.5-0.20230929200416-6c59762e84ad + github.com/cosmos/cosmos-sdk => github.com/neutron-org/cosmos-sdk v0.47.5 github.com/cosmos/gaia/v11 => github.com/cosmos/gaia/v11 v11.0.0-20230724152830-861ba391c3b4 github.com/cosmos/ledger-cosmos-go => github.com/cosmos/ledger-cosmos-go v0.12.1 github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 diff --git a/go.sum b/go.sum index cd8dbb486..1d2952b0f 100644 --- a/go.sum +++ b/go.sum @@ -936,8 +936,8 @@ github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OS github.com/neilotoole/errgroup v0.1.6/go.mod h1:Q2nLGf+594h0CLBs/Mbg6qOr7GtqDK7C2S41udRnToE= github.com/neutron-org/admin-module v0.0.0-20230906150724-9ccb75c61fc5 h1:96ZjLWoN4nCIcFdxrz51Xu2Y8aqpcScy3eva3S5hM60= github.com/neutron-org/admin-module v0.0.0-20230906150724-9ccb75c61fc5/go.mod h1:INknneN2W3Fr9Eld7SpfLRdjyHR1muzFbbqXln1ixic= -github.com/neutron-org/cosmos-sdk v0.47.5-0.20230929200416-6c59762e84ad h1:BvYliP3KHiay2VLQwUSmDNCXm380TSTLDud8PH4RV6A= -github.com/neutron-org/cosmos-sdk v0.47.5-0.20230929200416-6c59762e84ad/go.mod h1:4xMyIVekAs2OEUz/yh9JwzhLBMk+olM2sxgKuQdlhLg= +github.com/neutron-org/cosmos-sdk v0.47.5 h1:BUBqUPI5I8rF9ql3RfSCo9XkpZBJPhTZSIWexyxutA4= +github.com/neutron-org/cosmos-sdk v0.47.5/go.mod h1:3uZbdGpMOT5usEich5wHANLxz0VbKE9lL1PUq+rzkS4= github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230808084410-6083b888424e h1:uVJCBWf1vcCYY0pzOA2SCPIZT8WsR8fsOxs57mnJbM4= github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230808084410-6083b888424e/go.mod h1:Oagy36cU49438NzxKG/gmGTG903tiAI7LIUdH7x2qNY= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= From 04ffcb4610a283169624d2d581d156345869b2ba Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Tue, 31 Oct 2023 12:17:31 +0400 Subject: [PATCH 167/307] rename getter & prefix, rm unnec step, check error explicitly --- app/upgrades/nextupgrade/upgrades.go | 2 +- app/upgrades/nextupgrade/upgrades_test.go | 19 +++++-------------- x/interchaintxs/keeper/keeper.go | 4 ++-- x/interchaintxs/keeper/msg_server.go | 2 +- x/interchaintxs/types/keys.go | 6 +++--- 5 files changed, 12 insertions(+), 21 deletions(-) diff --git a/app/upgrades/nextupgrade/upgrades.go b/app/upgrades/nextupgrade/upgrades.go index 29c439db6..409a7e1ad 100644 --- a/app/upgrades/nextupgrade/upgrades.go +++ b/app/upgrades/nextupgrade/upgrades.go @@ -246,7 +246,7 @@ func setInterchainTxsParams(ctx sdk.Context, paramsKeepers paramskeeper.Keeper, if bzWasm == nil { return fmt.Errorf("last code ID not found during the upgrade") } - store.Set(interchaintxstypes.LastCodeIdBeforeUpgrade, bzWasm) + store.Set(interchaintxstypes.LastFreeRegisterICACodeID, bzWasm) return nil } diff --git a/app/upgrades/nextupgrade/upgrades_test.go b/app/upgrades/nextupgrade/upgrades_test.go index 9ace8ba4a..af355651b 100644 --- a/app/upgrades/nextupgrade/upgrades_test.go +++ b/app/upgrades/nextupgrade/upgrades_test.go @@ -5,6 +5,7 @@ import ( "github.com/CosmWasm/wasmd/x/wasm/keeper" adminmoduletypes "github.com/cosmos/admin-module/x/adminmodule/types" + "github.com/cosmos/cosmos-sdk/types/errors" crontypes "github.com/neutron-org/neutron/x/cron/types" feeburnertypes "github.com/neutron-org/neutron/x/feeburner/types" @@ -166,22 +167,12 @@ func (suite *UpgradeTestSuite) TestAdminModuleUpgrade() { func (suite *UpgradeTestSuite) TestRegisterInterchainAccountCreationFee() { var ( - app = suite.GetNeutronZoneApp(suite.ChainA) - ccvConsumerSubspace = app.GetSubspace(ccvconsumertypes.ModuleName) - ctx = suite.ChainA.GetContext() + app = suite.GetNeutronZoneApp(suite.ChainA) + ctx = suite.ChainA.GetContext() ) - suite.Require().True(ccvConsumerSubspace.Has(ctx, ccvconsumertypes.KeyRewardDenoms)) suite.FundAcc(sdk.AccAddress("neutron1weweewe"), sdk.NewCoins(sdk.NewCoin("untrn", sdk.NewInt(10000)))) - // emulate mainnet/testnet state - ccvConsumerSubspace.Set(ctx, ccvconsumertypes.KeyRewardDenoms, &[]string{params.DefaultDenom}) - - var denomsBefore []string - ccvConsumerSubspace.Get(ctx, ccvconsumertypes.KeyRewardDenoms, &denomsBefore) - suite.Require().Equal(denomsBefore, []string{params.DefaultDenom}) contractKeeper := keeper.NewDefaultPermissionKeeper(app.WasmKeeper) - // store contract just to increase code_id - _ = suite.StoreTestCode(ctx, sdk.AccAddress("neutron1_ica"), "testdata/neutron_interchain_txs.wasm") // store contract for register ica w/o fees codeIDBefore := suite.StoreTestCode(ctx, sdk.AccAddress("neutron1_ica"), "testdata/neutron_interchain_txs.wasm") contractAddressBeforeUpgrade := suite.InstantiateTestContract(ctx, sdk.AccAddress("neutron1_ica"), codeIDBefore) @@ -193,7 +184,7 @@ func (suite *UpgradeTestSuite) TestRegisterInterchainAccountCreationFee() { } app.UpgradeKeeper.ApplyUpgrade(ctx, upgrade) - lastCodeID := app.InterchainTxsKeeper.GetLastCodeIDBeforeUpgrade(ctx) + lastCodeID := app.InterchainTxsKeeper.GetLastFreeRegisterICACodeID(ctx) // ensure that wasm module stores next code id suite.Require().Equal(lastCodeID, codeIDBefore+1) @@ -214,5 +205,5 @@ func (suite *UpgradeTestSuite) TestRegisterInterchainAccountCreationFee() { // failed register due lack of fees (fees required) _, err = contractKeeper.Execute(ctx, contractAddressAfterUpgrade, sdk.AccAddress("neutron1weweewe"), byteEncodedMsgAfterUpgrade, nil) - suite.Error(err) + suite.ErrorIs(err, errors.ErrInsufficientFunds) } diff --git a/x/interchaintxs/keeper/keeper.go b/x/interchaintxs/keeper/keeper.go index 8bc17a709..8856fac89 100644 --- a/x/interchaintxs/keeper/keeper.go +++ b/x/interchaintxs/keeper/keeper.go @@ -93,9 +93,9 @@ func (k Keeper) GetAuthority() string { return k.authority } -func (k Keeper) GetLastCodeIDBeforeUpgrade(ctx sdk.Context) (codeID uint64) { +func (k Keeper) GetLastFreeRegisterICACodeID(ctx sdk.Context) (codeID uint64) { store := ctx.KVStore(k.storeKey) - bytes := store.Get(types.LastCodeIdBeforeUpgrade) + bytes := store.Get(types.LastFreeRegisterICACodeID) if bytes == nil { k.Logger(ctx).Debug("Last code id key don't exists, GetLastCodeID returns 0") diff --git a/x/interchaintxs/keeper/msg_server.go b/x/interchaintxs/keeper/msg_server.go index ddfee769b..2da974f0c 100644 --- a/x/interchaintxs/keeper/msg_server.go +++ b/x/interchaintxs/keeper/msg_server.go @@ -47,7 +47,7 @@ func (k Keeper) RegisterInterchainAccount(goCtx context.Context, msg *ictxtypes. return nil, errors.Wrapf(ictxtypes.ErrNotContract, "%s is not a contract address", msg.FromAddress) } - if k.sudoKeeper.GetContractInfo(ctx, senderAddr).CodeID >= k.GetLastCodeIDBeforeUpgrade(ctx) { + if k.sudoKeeper.GetContractInfo(ctx, senderAddr).CodeID >= k.GetLastFreeRegisterICACodeID(ctx) { if err := k.ChargeFee(ctx, senderAddr, msg.RegisterFee); err != nil { return nil, errors.Wrapf(err, "failed to charge fees to pay for RegisterInterchainAccount msg: %s", msg) } diff --git a/x/interchaintxs/types/keys.go b/x/interchaintxs/types/keys.go index aa4a6f048..4838bae12 100644 --- a/x/interchaintxs/types/keys.go +++ b/x/interchaintxs/types/keys.go @@ -18,9 +18,9 @@ const ( ) const ( - prefixParamsKey = iota + 1 - prefixLastCodeIdBeforeUpgrade = iota + 2 + prefixParamsKey = iota + 1 + prefixLastFreeRegisterICACodeID = iota + 2 ) var ParamsKey = []byte{prefixParamsKey} -var LastCodeIdBeforeUpgrade = []byte{prefixLastCodeIdBeforeUpgrade} +var LastFreeRegisterICACodeID = []byte{prefixLastFreeRegisterICACodeID} From 3bb84e08edc98cc4fdbdef81d3a49fe1da325a99 Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Tue, 31 Oct 2023 12:23:07 +0400 Subject: [PATCH 168/307] add couple of comments --- x/interchaintxs/keeper/msg_server.go | 1 + x/interchaintxs/types/keys.go | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/x/interchaintxs/keeper/msg_server.go b/x/interchaintxs/keeper/msg_server.go index 2da974f0c..b4487921b 100644 --- a/x/interchaintxs/keeper/msg_server.go +++ b/x/interchaintxs/keeper/msg_server.go @@ -47,6 +47,7 @@ func (k Keeper) RegisterInterchainAccount(goCtx context.Context, msg *ictxtypes. return nil, errors.Wrapf(ictxtypes.ErrNotContract, "%s is not a contract address", msg.FromAddress) } + // if contract is stored after [last] upgrade, we're not going charge fees for register ICA if k.sudoKeeper.GetContractInfo(ctx, senderAddr).CodeID >= k.GetLastFreeRegisterICACodeID(ctx) { if err := k.ChargeFee(ctx, senderAddr, msg.RegisterFee); err != nil { return nil, errors.Wrapf(err, "failed to charge fees to pay for RegisterInterchainAccount msg: %s", msg) diff --git a/x/interchaintxs/types/keys.go b/x/interchaintxs/types/keys.go index 4838bae12..b9cd3b80b 100644 --- a/x/interchaintxs/types/keys.go +++ b/x/interchaintxs/types/keys.go @@ -18,7 +18,9 @@ const ( ) const ( - prefixParamsKey = iota + 1 + // parameters key + prefixParamsKey = iota + 1 + // prefix of code id, starting from which we charge fee for ICA registration prefixLastFreeRegisterICACodeID = iota + 2 ) From 5c4484c7d0137bb56b3d67155385a90b8caec663 Mon Sep 17 00:00:00 2001 From: swelf Date: Tue, 31 Oct 2023 13:09:42 +0300 Subject: [PATCH 169/307] merged update-sdk47 branch --- go.mod | 2 +- go.sum | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index c76de410c..d8f0a0f8b 100644 --- a/go.mod +++ b/go.mod @@ -179,7 +179,7 @@ require ( golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect google.golang.org/api v0.126.0 // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect + google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect google.golang.org/protobuf v1.31.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect diff --git a/go.sum b/go.sum index 9d6202982..e58113803 100644 --- a/go.sum +++ b/go.sum @@ -36,6 +36,7 @@ cloud.google.com/go v0.102.1/go.mod h1:XZ77E9qnTEnrgEOvr4xzfdX5TRo7fB4T2F4O6+34h cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA= cloud.google.com/go v0.110.6 h1:8uYAkj3YHTP/1iwReuHPxLSbdcyc+dSBbzFMrVwDR6Q= cloud.google.com/go v0.110.6/go.mod h1:+EYjdK8e5RME/VY/qLCAtuyALQ9q67dvuum8i+H5xsI= +cloud.google.com/go v0.110.7/go.mod h1:+EYjdK8e5RME/VY/qLCAtuyALQ9q67dvuum8i+H5xsI= cloud.google.com/go/aiplatform v1.22.0/go.mod h1:ig5Nct50bZlzV6NvKaTwmplLLddFx0YReh9WfTO5jKw= cloud.google.com/go/aiplatform v1.24.0/go.mod h1:67UUvRBKG6GTayHKV8DBv2RtR1t93YRu5B1P3x99mYY= cloud.google.com/go/analytics v0.11.0/go.mod h1:DjEWCu41bVbYcKyvlws9Er60YE4a//bK6mnhWvQeFNI= @@ -565,6 +566,7 @@ github.com/golang/geo v0.0.0-20190916061304-5b978397cfec/go.mod h1:QZ0nwyI2jOfgR github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/glog v1.1.1 h1:jxpi2eWoU84wbX9iIEyAeeoac3FLuifZpY9tcNUD9kw= github.com/golang/glog v1.1.1/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/rLQ= +github.com/golang/glog v1.1.2/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/rLQ= github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -664,6 +666,7 @@ github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+ github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/enterprise-certificate-proxy v0.1.0/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg= @@ -1084,6 +1087,7 @@ github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/skip-mev/block-sdk v1.0.0 h1:unp9laTgcePHPRm5TCr0xHmytDmTnqAwlivsn/LqTWI= github.com/skip-mev/block-sdk v1.0.0/go.mod h1:+yIvnG/K0o/fnWkX4Iw/Wt7m1ofUO67uz0rsbULuSAY= +github.com/skip-mev/block-sdk v1.1.0/go.mod h1:G/ryMdo70R1xOJehV1RqDyTH0x7gffwB1wU9MLMzIHE= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= @@ -1782,6 +1786,7 @@ google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a/go.mod h1:1vXfmgAz google.golang.org/genproto v0.0.0-20221025140454-527a21cfbd71/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s= google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 h1:L6iMMGrtzgHsWofoFcihmDEMYeDR9KN/ThbPWGrh++g= google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5/go.mod h1:oH/ZOT02u4kWEp7oYBGYFFkCdKS/uYR9Z7+0/xuuFp8= +google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d/go.mod h1:yZTlhN0tQnXo3h00fuXNCxJdLdIdnVFVBaRJ5LWBbw4= google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d h1:DoPTO70H+bcDXcd39vOqb2viZxgqeBeSGtZ55yZU4/Q= google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d/go.mod h1:KjSP20unUpOx5kyQUFa7k4OJg0qeJ7DEZflGDu2p6Bk= google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d h1:uvYuEyMHKNt+lT4K3bN6fGswmK8qSvcreM3BwjDh+y4= @@ -1829,6 +1834,7 @@ google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCD google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.58.2 h1:SXUpjxeVF3FKrTYQI4f4KvbGD5u2xccdYdurwowix5I= google.golang.org/grpc v1.58.2/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0= +google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98= 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= From 8cbc90bab9a5a414783ff8b664c4c80b1d91e1b8 Mon Sep 17 00:00:00 2001 From: swelf Date: Tue, 31 Oct 2023 13:32:52 +0300 Subject: [PATCH 170/307] updated go.sum --- go.sum | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/go.sum b/go.sum index e58113803..280f420be 100644 --- a/go.sum +++ b/go.sum @@ -36,6 +36,7 @@ cloud.google.com/go v0.102.1/go.mod h1:XZ77E9qnTEnrgEOvr4xzfdX5TRo7fB4T2F4O6+34h cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA= cloud.google.com/go v0.110.6 h1:8uYAkj3YHTP/1iwReuHPxLSbdcyc+dSBbzFMrVwDR6Q= cloud.google.com/go v0.110.6/go.mod h1:+EYjdK8e5RME/VY/qLCAtuyALQ9q67dvuum8i+H5xsI= +cloud.google.com/go v0.110.7 h1:rJyC7nWRg2jWGZ4wSJ5nY65GTdYJkg0cd/uXb+ACI6o= cloud.google.com/go v0.110.7/go.mod h1:+EYjdK8e5RME/VY/qLCAtuyALQ9q67dvuum8i+H5xsI= cloud.google.com/go/aiplatform v1.22.0/go.mod h1:ig5Nct50bZlzV6NvKaTwmplLLddFx0YReh9WfTO5jKw= cloud.google.com/go/aiplatform v1.24.0/go.mod h1:67UUvRBKG6GTayHKV8DBv2RtR1t93YRu5B1P3x99mYY= @@ -566,6 +567,7 @@ github.com/golang/geo v0.0.0-20190916061304-5b978397cfec/go.mod h1:QZ0nwyI2jOfgR github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/glog v1.1.1 h1:jxpi2eWoU84wbX9iIEyAeeoac3FLuifZpY9tcNUD9kw= github.com/golang/glog v1.1.1/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/rLQ= +github.com/golang/glog v1.1.2 h1:DVjP2PbBOzHyzA+dn3WhHIq4NdVu3Q+pvivFICf/7fo= github.com/golang/glog v1.1.2/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/rLQ= github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -666,6 +668,7 @@ github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+ github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/enterprise-certificate-proxy v0.1.0/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= @@ -1087,6 +1090,7 @@ github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/skip-mev/block-sdk v1.0.0 h1:unp9laTgcePHPRm5TCr0xHmytDmTnqAwlivsn/LqTWI= github.com/skip-mev/block-sdk v1.0.0/go.mod h1:+yIvnG/K0o/fnWkX4Iw/Wt7m1ofUO67uz0rsbULuSAY= +github.com/skip-mev/block-sdk v1.1.0 h1:cYEO/ASxhtasdRStMXhw1cWOjCJ78Z3J+K01n++OHkU= github.com/skip-mev/block-sdk v1.1.0/go.mod h1:G/ryMdo70R1xOJehV1RqDyTH0x7gffwB1wU9MLMzIHE= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= @@ -1786,6 +1790,7 @@ google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a/go.mod h1:1vXfmgAz google.golang.org/genproto v0.0.0-20221025140454-527a21cfbd71/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s= google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 h1:L6iMMGrtzgHsWofoFcihmDEMYeDR9KN/ThbPWGrh++g= google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5/go.mod h1:oH/ZOT02u4kWEp7oYBGYFFkCdKS/uYR9Z7+0/xuuFp8= +google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d h1:VBu5YqKPv6XiJ199exd8Br+Aetz+o08F+PLMnwJQHAY= google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d/go.mod h1:yZTlhN0tQnXo3h00fuXNCxJdLdIdnVFVBaRJ5LWBbw4= google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d h1:DoPTO70H+bcDXcd39vOqb2viZxgqeBeSGtZ55yZU4/Q= google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d/go.mod h1:KjSP20unUpOx5kyQUFa7k4OJg0qeJ7DEZflGDu2p6Bk= @@ -1834,6 +1839,7 @@ google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCD google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.58.2 h1:SXUpjxeVF3FKrTYQI4f4KvbGD5u2xccdYdurwowix5I= google.golang.org/grpc v1.58.2/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0= +google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk= google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98= 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= From 09bfbcf608a068811ac4567f2a06c830152f8e1e Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Wed, 1 Nov 2023 13:00:23 +0400 Subject: [PATCH 171/307] rename method and prefix --- app/upgrades/nextupgrade/upgrades.go | 2 +- app/upgrades/nextupgrade/upgrades_test.go | 2 +- x/interchaintxs/keeper/keeper.go | 6 +++--- x/interchaintxs/keeper/msg_server.go | 2 +- x/interchaintxs/types/keys.go | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/upgrades/nextupgrade/upgrades.go b/app/upgrades/nextupgrade/upgrades.go index 409a7e1ad..34f26a21d 100644 --- a/app/upgrades/nextupgrade/upgrades.go +++ b/app/upgrades/nextupgrade/upgrades.go @@ -246,7 +246,7 @@ func setInterchainTxsParams(ctx sdk.Context, paramsKeepers paramskeeper.Keeper, if bzWasm == nil { return fmt.Errorf("last code ID not found during the upgrade") } - store.Set(interchaintxstypes.LastFreeRegisterICACodeID, bzWasm) + store.Set(interchaintxstypes.FeeRegisterICACodeID, bzWasm) return nil } diff --git a/app/upgrades/nextupgrade/upgrades_test.go b/app/upgrades/nextupgrade/upgrades_test.go index af355651b..80aaf32b3 100644 --- a/app/upgrades/nextupgrade/upgrades_test.go +++ b/app/upgrades/nextupgrade/upgrades_test.go @@ -184,7 +184,7 @@ func (suite *UpgradeTestSuite) TestRegisterInterchainAccountCreationFee() { } app.UpgradeKeeper.ApplyUpgrade(ctx, upgrade) - lastCodeID := app.InterchainTxsKeeper.GetLastFreeRegisterICACodeID(ctx) + lastCodeID := app.InterchainTxsKeeper.GetFeeRegisterICACodeID(ctx) // ensure that wasm module stores next code id suite.Require().Equal(lastCodeID, codeIDBefore+1) diff --git a/x/interchaintxs/keeper/keeper.go b/x/interchaintxs/keeper/keeper.go index 8856fac89..74fd546ea 100644 --- a/x/interchaintxs/keeper/keeper.go +++ b/x/interchaintxs/keeper/keeper.go @@ -93,12 +93,12 @@ func (k Keeper) GetAuthority() string { return k.authority } -func (k Keeper) GetLastFreeRegisterICACodeID(ctx sdk.Context) (codeID uint64) { +func (k Keeper) GetFeeRegisterICACodeID(ctx sdk.Context) (codeID uint64) { store := ctx.KVStore(k.storeKey) - bytes := store.Get(types.LastFreeRegisterICACodeID) + bytes := store.Get(types.FeeRegisterICACodeID) if bytes == nil { - k.Logger(ctx).Debug("Last code id key don't exists, GetLastCodeID returns 0") + k.Logger(ctx).Debug("Fee register ICA code id key don't exists, GetLastCodeID returns 0") return 0 } return sdk.BigEndianToUint64(bytes) diff --git a/x/interchaintxs/keeper/msg_server.go b/x/interchaintxs/keeper/msg_server.go index b4487921b..07baf510c 100644 --- a/x/interchaintxs/keeper/msg_server.go +++ b/x/interchaintxs/keeper/msg_server.go @@ -48,7 +48,7 @@ func (k Keeper) RegisterInterchainAccount(goCtx context.Context, msg *ictxtypes. } // if contract is stored after [last] upgrade, we're not going charge fees for register ICA - if k.sudoKeeper.GetContractInfo(ctx, senderAddr).CodeID >= k.GetLastFreeRegisterICACodeID(ctx) { + if k.sudoKeeper.GetContractInfo(ctx, senderAddr).CodeID >= k.GetFeeRegisterICACodeID(ctx) { if err := k.ChargeFee(ctx, senderAddr, msg.RegisterFee); err != nil { return nil, errors.Wrapf(err, "failed to charge fees to pay for RegisterInterchainAccount msg: %s", msg) } diff --git a/x/interchaintxs/types/keys.go b/x/interchaintxs/types/keys.go index b9cd3b80b..8b4d7a499 100644 --- a/x/interchaintxs/types/keys.go +++ b/x/interchaintxs/types/keys.go @@ -21,8 +21,8 @@ const ( // parameters key prefixParamsKey = iota + 1 // prefix of code id, starting from which we charge fee for ICA registration - prefixLastFreeRegisterICACodeID = iota + 2 + prefixFeeRegisterICACodeID = iota + 2 ) var ParamsKey = []byte{prefixParamsKey} -var LastFreeRegisterICACodeID = []byte{prefixLastFreeRegisterICACodeID} +var FeeRegisterICACodeID = []byte{prefixFeeRegisterICACodeID} From 90c64f095b52da2c5173dce678acba2261e667f2 Mon Sep 17 00:00:00 2001 From: Lockwarr Date: Wed, 1 Nov 2023 14:45:19 +0200 Subject: [PATCH 172/307] fix: make module more independent --- app/app.go | 7 ++-- .../interchaintxs/keeper/interchaintxs.go | 4 +- .../interchaintxs/types/expected_keepers.go | 37 ------------------- x/feeburner/keeper/keeper.go | 6 --- x/interchaintxs/keeper/ibc_handlers_test.go | 15 +++++--- x/interchaintxs/keeper/keeper.go | 16 ++++---- x/interchaintxs/keeper/msg_server_test.go | 21 +++++------ x/interchaintxs/types/expected_keepers.go | 6 --- x/interchaintxs/types/types.go | 3 ++ 9 files changed, 35 insertions(+), 80 deletions(-) diff --git a/app/app.go b/app/app.go index 798cc7f48..738fd1ec6 100644 --- a/app/app.go +++ b/app/app.go @@ -328,8 +328,8 @@ type App struct { checkTxHandler mev_lane.CheckTx // Lanes - Mempool blocksdk.Mempool - MEVLane auctionante.MEVLane + Mempool blocksdk.Mempool + MEVLane auctionante.MEVLane } func (app *App) GetTestBankKeeper() integration.TestBankKeeper { @@ -655,7 +655,7 @@ func New( contractmanager.NewSudoLimitWrapper(app.ContractManagerKeeper, &app.WasmKeeper), app.FeeKeeper, app.BankKeeper, - app.FeeBurnerKeeper, + func(ctx sdk.Context) string { return app.FeeBurnerKeeper.GetParams(ctx).TreasuryAddress }, authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String(), ) @@ -977,7 +977,6 @@ func New( mevLane.SetAnteHandler(anteHandler) baseLane.SetAnteHandler(anteHandler) - app.SetEndBlocker(app.EndBlocker) handler := blocksdkabci.NewProposalHandler( diff --git a/testutil/interchaintxs/keeper/interchaintxs.go b/testutil/interchaintxs/keeper/interchaintxs.go index 412297b09..9a98022e1 100644 --- a/testutil/interchaintxs/keeper/interchaintxs.go +++ b/testutil/interchaintxs/keeper/interchaintxs.go @@ -27,7 +27,7 @@ func InterchainTxsKeeper( icaControllerKeeper types.ICAControllerKeeper, channelKeeper types.ChannelKeeper, bankKeeper types.BankKeeper, - treasuryKeeper types.TreasuryKeeper, + getFeeCollectorAddr types.GetFeeCollectorAddr, ) (*keeper.Keeper, sdk.Context) { storeKey := sdk.NewKVStoreKey(types.StoreKey) memStoreKey := storetypes.NewMemoryStoreKey(types.MemStoreKey) @@ -50,7 +50,7 @@ func InterchainTxsKeeper( managerKeeper, refunderKeeper, bankKeeper, - treasuryKeeper, + getFeeCollectorAddr, authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String(), ) diff --git a/testutil/mocks/interchaintxs/types/expected_keepers.go b/testutil/mocks/interchaintxs/types/expected_keepers.go index 1d9fb7aa3..4b098863c 100644 --- a/testutil/mocks/interchaintxs/types/expected_keepers.go +++ b/testutil/mocks/interchaintxs/types/expected_keepers.go @@ -367,40 +367,3 @@ func (mr *MockChannelKeeperMockRecorder) GetNextSequenceSend(ctx, portID, channe mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetNextSequenceSend", reflect.TypeOf((*MockChannelKeeper)(nil).GetNextSequenceSend), ctx, portID, channelID) } - -// MockTreasuryKeeper is a mock of TreasuryKeeper interface. -type MockTreasuryKeeper struct { - ctrl *gomock.Controller - recorder *MockTreasuryKeeperMockRecorder -} - -// MockTreasuryKeeperMockRecorder is the mock recorder for MockTreasuryKeeper. -type MockTreasuryKeeperMockRecorder struct { - mock *MockTreasuryKeeper -} - -// NewMockTreasuryKeeper creates a new mock instance. -func NewMockTreasuryKeeper(ctrl *gomock.Controller) *MockTreasuryKeeper { - mock := &MockTreasuryKeeper{ctrl: ctrl} - mock.recorder = &MockTreasuryKeeperMockRecorder{mock} - return mock -} - -// EXPECT returns an object that allows the caller to indicate expected use. -func (m *MockTreasuryKeeper) EXPECT() *MockTreasuryKeeperMockRecorder { - return m.recorder -} - -// GetTreasury mocks base method. -func (m *MockTreasuryKeeper) GetTreasury(ctx types.Context) string { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GetTreasury", ctx) - ret0, _ := ret[0].(string) - return ret0 -} - -// GetTreasury indicates an expected call of GetTreasury. -func (mr *MockTreasuryKeeperMockRecorder) GetTreasury(ctx interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetTreasury", reflect.TypeOf((*MockTreasuryKeeper)(nil).GetTreasury), ctx) -} diff --git a/x/feeburner/keeper/keeper.go b/x/feeburner/keeper/keeper.go index 32f65b525..e65220b29 100644 --- a/x/feeburner/keeper/keeper.go +++ b/x/feeburner/keeper/keeper.go @@ -142,9 +142,3 @@ func (k Keeper) Logger(ctx sdk.Context) log.Logger { func (k Keeper) FundCommunityPool(ctx sdk.Context, amount sdk.Coins, sender sdk.AccAddress) error { return k.bankKeeper.SendCoinsFromAccountToModule(ctx, sender, authtypes.FeeCollectorName, amount) } - -// GetTreasury is used to satisfy the interface requirement for interchaintxs module. -// The single point of truth for the treasury address is in the feeburner module params. -func (k Keeper) GetTreasury(ctx sdk.Context) string { - return k.GetParams(ctx).TreasuryAddress -} diff --git a/x/interchaintxs/keeper/ibc_handlers_test.go b/x/interchaintxs/keeper/ibc_handlers_test.go index d1ab98bae..4b8e0d546 100644 --- a/x/interchaintxs/keeper/ibc_handlers_test.go +++ b/x/interchaintxs/keeper/ibc_handlers_test.go @@ -26,8 +26,9 @@ func TestHandleAcknowledgement(t *testing.T) { wmKeeper := mock_types.NewMockWasmKeeper(ctrl) feeKeeper := mock_types.NewMockFeeRefunderKeeper(ctrl) bankKeeper := mock_types.NewMockBankKeeper(ctrl) - treasuryKeeper := mock_types.NewMockTreasuryKeeper(ctrl) - icak, infCtx := testkeeper.InterchainTxsKeeper(t, wmKeeper, feeKeeper, icaKeeper, nil, bankKeeper, treasuryKeeper) + icak, infCtx := testkeeper.InterchainTxsKeeper(t, wmKeeper, feeKeeper, icaKeeper, nil, bankKeeper, func(ctx sdk.Context) string { + return TestFeeCollectorAddr + }) ctx := infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) resACK := channeltypes.Acknowledgement{ @@ -75,8 +76,9 @@ func TestHandleTimeout(t *testing.T) { wmKeeper := mock_types.NewMockWasmKeeper(ctrl) feeKeeper := mock_types.NewMockFeeRefunderKeeper(ctrl) bankKeeper := mock_types.NewMockBankKeeper(ctrl) - treasuryKeeper := mock_types.NewMockTreasuryKeeper(ctrl) - icak, infCtx := testkeeper.InterchainTxsKeeper(t, wmKeeper, feeKeeper, icaKeeper, nil, bankKeeper, treasuryKeeper) + icak, infCtx := testkeeper.InterchainTxsKeeper(t, wmKeeper, feeKeeper, icaKeeper, nil, bankKeeper, func(ctx sdk.Context) string { + return TestFeeCollectorAddr + }) ctx := infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) contractAddress := sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress) relayerBech32 := "neutron1fxudpred77a0grgh69u0j7y84yks5ev4n5050z45kecz792jnd6scqu98z" @@ -113,8 +115,9 @@ func TestHandleChanOpenAck(t *testing.T) { defer ctrl.Finish() wmKeeper := mock_types.NewMockWasmKeeper(ctrl) bankKeeper := mock_types.NewMockBankKeeper(ctrl) - treasuryKeeper := mock_types.NewMockTreasuryKeeper(ctrl) - icak, ctx := testkeeper.InterchainTxsKeeper(t, wmKeeper, nil, nil, nil, bankKeeper, treasuryKeeper) + icak, ctx := testkeeper.InterchainTxsKeeper(t, wmKeeper, nil, nil, nil, bankKeeper, func(ctx sdk.Context) string { + return TestFeeCollectorAddr + }) portID := icatypes.ControllerPortPrefix + testutil.TestOwnerAddress + ".ica0" contractAddress := sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress) channelID := "channel-0" diff --git a/x/interchaintxs/keeper/keeper.go b/x/interchaintxs/keeper/keeper.go index 7e2238b0a..ac0cc37ce 100644 --- a/x/interchaintxs/keeper/keeper.go +++ b/x/interchaintxs/keeper/keeper.go @@ -32,7 +32,7 @@ type ( icaControllerKeeper types.ICAControllerKeeper sudoKeeper types.WasmKeeper bankKeeper types.BankKeeper - treasuryKeeper types.TreasuryKeeper + getFeeCollectorAddr types.GetFeeCollectorAddr authority string } ) @@ -46,7 +46,7 @@ func NewKeeper( sudoKeeper types.WasmKeeper, feeKeeper types.FeeRefunderKeeper, bankKeeper types.BankKeeper, - treasuryKeeper types.TreasuryKeeper, + getFeeCollectorAddr types.GetFeeCollectorAddr, authority string, ) *Keeper { return &Keeper{ @@ -58,7 +58,7 @@ func NewKeeper( sudoKeeper: sudoKeeper, feeKeeper: feeKeeper, bankKeeper: bankKeeper, - treasuryKeeper: treasuryKeeper, + getFeeCollectorAddr: getFeeCollectorAddr, authority: authority, } } @@ -76,15 +76,15 @@ func (k Keeper) ChargeFee(ctx sdk.Context, payer sdk.AccAddress, fee sdk.Coins) return errors.Wrapf(sdkerrors.ErrInsufficientFee, "provided fee is less than min governance set ack fee: %s < %s", fee, params.RegisterFee) } - treasury := k.treasuryKeeper.GetTreasury(ctx) - treasuryAddress, err := sdk.AccAddressFromBech32(treasury) + feeCollector := k.getFeeCollectorAddr(ctx) + feeCollectorAddress, err := sdk.AccAddressFromBech32(feeCollector) if err != nil { - return errors.Wrapf(sdkerrors.ErrInvalidAddress, "failed to convert treasury, bech32 to AccAddress: %s: %s", treasury, err.Error()) + return errors.Wrapf(sdkerrors.ErrInvalidAddress, "failed to convert fee collecor, bech32 to AccAddress: %s: %s", feeCollector, err.Error()) } - err = k.bankKeeper.SendCoins(ctx, payer, treasuryAddress, fee) + err = k.bankKeeper.SendCoins(ctx, payer, feeCollectorAddress, fee) if err != nil { - return errors.Wrapf(err, "failed send fee(%s) from %s to %s", fee, payer, treasury) + return errors.Wrapf(err, "failed send fee(%s) from %s to %s", fee, payer, feeCollectorAddress) } return nil } diff --git a/x/interchaintxs/keeper/msg_server_test.go b/x/interchaintxs/keeper/msg_server_test.go index b38b511ff..c4c173deb 100644 --- a/x/interchaintxs/keeper/msg_server_test.go +++ b/x/interchaintxs/keeper/msg_server_test.go @@ -23,7 +23,7 @@ import ( "github.com/neutron-org/neutron/x/interchaintxs/types" ) -const TestTreasury = "neutron1dua3d89szsmd3vwg0y5a2689ah0g4x68ps8vew" +const TestFeeCollectorAddr = "neutron1dua3d89szsmd3vwg0y5a2689ah0g4x68ps8vew" func TestRegisterInterchainAccount(t *testing.T) { ctrl := gomock.NewController(t) @@ -31,8 +31,9 @@ func TestRegisterInterchainAccount(t *testing.T) { icaKeeper := mock_types.NewMockICAControllerKeeper(ctrl) wmKeeper := mock_types.NewMockWasmKeeper(ctrl) bankKeeper := mock_types.NewMockBankKeeper(ctrl) - treasuryKeeper := mock_types.NewMockTreasuryKeeper(ctrl) - icak, ctx := testkeeper.InterchainTxsKeeper(t, wmKeeper, nil, icaKeeper, nil, bankKeeper, treasuryKeeper) + icak, ctx := testkeeper.InterchainTxsKeeper(t, wmKeeper, nil, icaKeeper, nil, bankKeeper, func(ctx sdk.Context) string { + return TestFeeCollectorAddr + }) goCtx := sdk.WrapSDKContext(ctx) msgRegAcc := types.MsgRegisterInterchainAccount{ @@ -60,25 +61,22 @@ func TestRegisterInterchainAccount(t *testing.T) { msgRegAcc.RegisterFee = sdk.NewCoins(sdk.NewCoin(params.DefaultDenom, sdk.NewInt(1000))) wmKeeper.EXPECT().HasContractInfo(ctx, contractAddress).Return(true) - treasuryKeeper.EXPECT().GetTreasury(ctx).Return(TestTreasury) - bankKeeper.EXPECT().SendCoins(ctx, sdk.MustAccAddressFromBech32(msgRegAcc.FromAddress), sdk.MustAccAddressFromBech32(TestTreasury), msgRegAcc.RegisterFee) + bankKeeper.EXPECT().SendCoins(ctx, sdk.MustAccAddressFromBech32(msgRegAcc.FromAddress), sdk.MustAccAddressFromBech32(TestFeeCollectorAddr), msgRegAcc.RegisterFee) icaKeeper.EXPECT().RegisterInterchainAccount(ctx, msgRegAcc.ConnectionId, icaOwner.String(), "").Return(fmt.Errorf("failed to register ica")) resp, err = icak.RegisterInterchainAccount(goCtx, &msgRegAcc) require.ErrorContains(t, err, "failed to RegisterInterchainAccount") require.Nil(t, resp) wmKeeper.EXPECT().HasContractInfo(ctx, contractAddress).Return(true) - treasuryKeeper.EXPECT().GetTreasury(ctx).Return(TestTreasury) bankKeeper.EXPECT(). - SendCoins(ctx, sdk.MustAccAddressFromBech32(msgRegAcc.FromAddress), sdk.MustAccAddressFromBech32(TestTreasury), msgRegAcc.RegisterFee). + SendCoins(ctx, sdk.MustAccAddressFromBech32(msgRegAcc.FromAddress), sdk.MustAccAddressFromBech32(TestFeeCollectorAddr), msgRegAcc.RegisterFee). Return(fmt.Errorf("failed to send coins")) resp, err = icak.RegisterInterchainAccount(goCtx, &msgRegAcc) require.ErrorContains(t, err, "failed to send coins") require.Nil(t, resp) wmKeeper.EXPECT().HasContractInfo(ctx, contractAddress).Return(true) - treasuryKeeper.EXPECT().GetTreasury(ctx).Return(TestTreasury) - bankKeeper.EXPECT().SendCoins(ctx, sdk.MustAccAddressFromBech32(msgRegAcc.FromAddress), sdk.MustAccAddressFromBech32(TestTreasury), msgRegAcc.RegisterFee) + bankKeeper.EXPECT().SendCoins(ctx, sdk.MustAccAddressFromBech32(msgRegAcc.FromAddress), sdk.MustAccAddressFromBech32(TestFeeCollectorAddr), msgRegAcc.RegisterFee) icaKeeper.EXPECT().RegisterInterchainAccount(ctx, msgRegAcc.ConnectionId, icaOwner.String(), "").Return(nil) resp, err = icak.RegisterInterchainAccount(goCtx, &msgRegAcc) require.NoError(t, err) @@ -93,8 +91,9 @@ func TestSubmitTx(t *testing.T) { refundKeeper := mock_types.NewMockFeeRefunderKeeper(ctrl) channelKeeper := mock_types.NewMockChannelKeeper(ctrl) bankKeeper := mock_types.NewMockBankKeeper(ctrl) - treasuryKeeper := mock_types.NewMockTreasuryKeeper(ctrl) - icak, ctx := testkeeper.InterchainTxsKeeper(t, wmKeeper, refundKeeper, icaKeeper, channelKeeper, bankKeeper, treasuryKeeper) + icak, ctx := testkeeper.InterchainTxsKeeper(t, wmKeeper, refundKeeper, icaKeeper, channelKeeper, bankKeeper, func(ctx sdk.Context) string { + return TestFeeCollectorAddr + }) goCtx := sdk.WrapSDKContext(ctx) cosmosMsg := codectypes.Any{ diff --git a/x/interchaintxs/types/expected_keepers.go b/x/interchaintxs/types/expected_keepers.go index 5b054d857..6c777acbf 100644 --- a/x/interchaintxs/types/expected_keepers.go +++ b/x/interchaintxs/types/expected_keepers.go @@ -47,9 +47,3 @@ type ChannelKeeper interface { GetNextSequenceSend(ctx sdk.Context, portID, channelID string) (uint64, bool) GetConnection(ctx sdk.Context, connectionID string) (ibcexported.ConnectionI, error) } - -// TreasuryKeeper is a keeper of a module that keeps and maintains the treasury address. -// This could be different module for each chain. -type TreasuryKeeper interface { - GetTreasury(ctx sdk.Context) string -} diff --git a/x/interchaintxs/types/types.go b/x/interchaintxs/types/types.go index 247c7821d..0f417c613 100644 --- a/x/interchaintxs/types/types.go +++ b/x/interchaintxs/types/types.go @@ -54,3 +54,6 @@ func (i ICAOwner) GetContract() sdk.AccAddress { func (i ICAOwner) GetInterchainAccountID() string { return i.interchainAccountID } + +// GetFeeCollectorAddr is a function to return the current fee collector address +type GetFeeCollectorAddr func(ctx sdk.Context) string From 6cdcbf2ea85edda5ce1cd1524ddaac4d9f8cb2af Mon Sep 17 00:00:00 2001 From: Julian Compagni Portis Date: Fri, 22 Sep 2023 09:02:27 -0600 Subject: [PATCH 173/307] copy over duality files --- proto/neutron/dex/deposit_record.proto | 20 + proto/neutron/dex/genesis.proto | 26 + .../neutron/dex/limit_order_expiration.proto | 18 + proto/neutron/dex/limit_order_tranche.proto | 60 + .../dex/limit_order_tranche_user.proto | 34 + proto/neutron/dex/pair_id.proto | 9 + proto/neutron/dex/params.proto | 12 + proto/neutron/dex/pool.proto | 14 + proto/neutron/dex/pool_metadata.proto | 13 + proto/neutron/dex/pool_reserves.proto | 35 + proto/neutron/dex/query.proto | 327 + proto/neutron/dex/tick_liquidity.proto | 17 + proto/neutron/dex/trade_pair_id.proto | 9 + proto/neutron/dex/tx.proto | 186 + proto/neutron/epochs/genesis.proto | 72 + proto/neutron/epochs/query.proto | 30 + .../neutron/incentives/account_history.proto | 19 + proto/neutron/incentives/gauge.proto | 115 + proto/neutron/incentives/genesis.proto | 26 + proto/neutron/incentives/params.proto | 17 + proto/neutron/incentives/query.proto | 161 + proto/neutron/incentives/stake.proto | 41 + proto/neutron/incentives/tx.proto | 96 + tests/ibc/gmp_swap_forward_test.go | 117 + tests/ibc/ibc_setup_test.go | 392 + tests/ibc/swap_forward_test.go | 481 + tests/ibc/swap_test.go | 214 + testutil/apptesting/events.go | 41 + testutil/apptesting/test_suite.go | 153 + testutil/common/sample/sample.go | 13 + testutil/dex/keeper/dex.go | 89 + testutil/dex/nullify/nullify.go | 57 + testutil/integration_test_setup.go | 308 + utils/bank.go | 110 + utils/cache_ctx.go | 79 + utils/cli_helpers.go | 68 + utils/dcli/cli_tester.go | 111 + utils/dcli/flag_advice.go | 79 + utils/dcli/index_cmd.go | 31 + utils/dcli/parsers.go | 366 + utils/dcli/parsers_test.go | 167 + utils/dcli/query_cmd_wrap.go | 181 + utils/dcli/string_formatter.go | 49 + utils/dcli/tx_cmd_wrap.go | 103 + utils/generic_helper.go | 17 + utils/math/prec_dec.go | 970 ++ utils/slice_helper.go | 51 + wasmbinding/stargate_allowlist.go | 29 +- x/dex/client/cli/flags.go | 13 + x/dex/client/cli/query.go | 50 + .../cli/query_inactive_limit_order_tranche.go | 90 + x/dex/client/cli/query_limit_order_tranche.go | 98 + .../cli/query_limit_order_tranche_user.go | 73 + x/dex/client/cli/query_params.go | 34 + x/dex/client/cli/query_pool.go | 95 + x/dex/client/cli/query_pool_metadata.go | 82 + x/dex/client/cli/query_pool_reserves.go | 105 + x/dex/client/cli/query_test.go | 450 + x/dex/client/cli/query_tick_liquidity.go | 50 + x/dex/client/cli/query_user_deposits.go | 43 + x/dex/client/cli/query_user_limit_orders.go | 43 + x/dex/client/cli/tx.go | 34 + x/dex/client/cli/tx_cancel_limit_order.go | 38 + x/dex/client/cli/tx_deposit.go | 121 + x/dex/client/cli/tx_multi_hop_swap.go | 75 + x/dex/client/cli/tx_place_limit_order.go | 107 + x/dex/client/cli/tx_test.go | 657 ++ x/dex/client/cli/tx_withdrawl.go | 91 + .../cli/tx_withdrawl_filled_limit_order.go | 38 + x/dex/genesis.go | 54 + x/dex/genesis_test.go | 125 + x/dex/keeper/core.go | 581 ++ x/dex/keeper/core_helper.go | 106 + x/dex/keeper/core_helper_test.go | 159 + x/dex/keeper/deposit_record.go | 38 + x/dex/keeper/deposit_record_test.go | 61 + x/dex/keeper/grpc_query.go | 7 + .../grpc_query_estimate_multi_hop_swap.go | 50 + ...grpc_query_estimate_multi_hop_swap_test.go | 365 + .../grpc_query_estimate_place_limit_order.go | 70 + ...grpc_query_inactive_limit_order_tranche.go | 74 + ...query_inactive_limit_order_tranche_test.go | 135 + .../keeper/grpc_query_limit_order_tranche.go | 90 + .../grpc_query_limit_order_tranche_test.go | 135 + .../grpc_query_limit_order_tranche_user.go | 102 + ...rpc_query_limit_order_tranche_user_test.go | 185 + x/dex/keeper/grpc_query_params.go | 19 + x/dex/keeper/grpc_query_params_test.go | 21 + x/dex/keeper/grpc_query_pool.go | 51 + x/dex/keeper/grpc_query_pool_metadata.go | 54 + x/dex/keeper/grpc_query_pool_metadata_test.go | 118 + x/dex/keeper/grpc_query_pool_reserves.go | 87 + x/dex/keeper/grpc_query_pool_reserves_test.go | 135 + x/dex/keeper/grpc_query_pool_test.go | 122 + x/dex/keeper/grpc_query_tick_liquidity.go | 53 + .../keeper/grpc_query_tick_liquidity_test.go | 72 + x/dex/keeper/grpc_query_user_deposits.go | 71 + x/dex/keeper/grpc_query_user_deposits_test.go | 142 + x/dex/keeper/inactive_limit_order_tranche.go | 68 + .../inactive_limit_order_tranche_test.go | 73 + .../integration_cancellimitorder_test.go | 286 + .../integration_deposit_autoswap_unit_test.go | 108 + .../integration_deposit_doublesided_test.go | 248 + .../keeper/integration_deposit_multi_test.go | 45 + .../integration_deposit_singlesided_test.go | 435 + x/dex/keeper/integration_multihopswap_test.go | 389 + .../integration_placelimitorder_test.go | 771 ++ .../keeper/integration_withdraw_multi_test.go | 54 + x/dex/keeper/integration_withdraw_test.go | 263 + .../keeper/integration_withdrawfilled_test.go | 229 + .../keeper/internal/testutils/test_helpers.go | 23 + x/dex/keeper/keeper.go | 50 + x/dex/keeper/limit_order_expiration.go | 155 + x/dex/keeper/limit_order_expiration_test.go | 227 + x/dex/keeper/limit_order_tranche.go | 241 + x/dex/keeper/limit_order_tranche_test.go | 60 + x/dex/keeper/limit_order_tranche_user.go | 129 + x/dex/keeper/limit_order_tranche_user_test.go | 109 + x/dex/keeper/liquidity.go | 108 + x/dex/keeper/liquidity_iterator.go | 94 + x/dex/keeper/liquidity_test.go | 746 ++ x/dex/keeper/msg_server.go | 183 + x/dex/keeper/msg_server_test.go | 1543 +++ x/dex/keeper/multihop_swap.go | 167 + x/dex/keeper/pair_helper.go | 34 + x/dex/keeper/params.go | 17 + x/dex/keeper/params_test.go | 26 + x/dex/keeper/pool.go | 163 + x/dex/keeper/pool_metadata.go | 71 + x/dex/keeper/pool_metadata_test.go | 54 + x/dex/keeper/pool_reserves.go | 41 + x/dex/keeper/pool_reserves_test.go | 44 + x/dex/keeper/pool_test.go | 92 + x/dex/keeper/tick_iterator.go | 42 + x/dex/keeper/tick_liquidity.go | 23 + x/dex/keeper/tick_liquidity_test.go | 46 + x/dex/module.go | 180 + x/dex/module_simulation.go | 167 + x/dex/simulation/cancel_limit_order.go | 28 + x/dex/simulation/deposit.go | 28 + x/dex/simulation/multi_hop_swap.go | 28 + x/dex/simulation/place_limit_order.go | 28 + x/dex/simulation/simap.go | 16 + x/dex/simulation/withdrawl.go | 28 + .../withdrawl_filled_limit_order.go | 28 + x/dex/types/branchable_cache.go | 34 + x/dex/types/codec.go | 50 + x/dex/types/deposit_record.pb.go | 524 + x/dex/types/errors.go | 163 + x/dex/types/events.go | 227 + x/dex/types/expected_keepers.go | 17 + x/dex/types/genesis.go | 74 + x/dex/types/genesis.pb.go | 616 ++ x/dex/types/genesis_test.go | 196 + x/dex/types/keys.go | 296 + x/dex/types/limit_order_expiration.pb.go | 381 + x/dex/types/limit_order_tranche.go | 162 + x/dex/types/limit_order_tranche.pb.go | 918 ++ x/dex/types/limit_order_tranche_key.go | 75 + x/dex/types/limit_order_tranche_user.go | 6 + x/dex/types/limit_order_tranche_user.pb.go | 658 ++ x/dex/types/limit_order_type.go | 29 + x/dex/types/liquidity.go | 11 + x/dex/types/message_cancel_limit_order.go | 48 + .../types/message_cancel_limit_order_test.go | 43 + x/dex/types/message_deposit.go | 90 + x/dex/types/message_deposit_test.go | 137 + x/dex/types/message_multi_hop_swap.go | 85 + x/dex/types/message_multi_hop_swap_test.go | 85 + x/dex/types/message_place_limit_order.go | 105 + x/dex/types/message_place_limit_order_test.go | 107 + x/dex/types/message_withdrawl.go | 81 + .../message_withdrawl_filled_limit_order.go | 48 + ...ssage_withdrawl_filled_limit_order_test.go | 43 + x/dex/types/message_withdrawl_test.go | 117 + x/dex/types/pair_id.go | 95 + x/dex/types/pair_id.pb.go | 365 + x/dex/types/params.go | 67 + x/dex/types/params.pb.go | 374 + x/dex/types/pool.go | 291 + x/dex/types/pool.pb.go | 424 + x/dex/types/pool_denom.go | 41 + x/dex/types/pool_denom_test.go | 55 + x/dex/types/pool_liquidity.go | 26 + x/dex/types/pool_metadata.go | 5 + x/dex/types/pool_metadata.pb.go | 432 + x/dex/types/pool_reserves.go | 52 + x/dex/types/pool_reserves.pb.go | 734 ++ x/dex/types/pool_reserves_key.go | 87 + x/dex/types/pool_test.go | 208 + x/dex/types/price.go | 37 + x/dex/types/price_test.go | 11 + x/dex/types/query.pb.go | 9224 +++++++++++++++++ x/dex/types/query.pb.gw.go | 2200 ++++ x/dex/types/tick_liquidity.go | 44 + x/dex/types/tick_liquidity.pb.go | 469 + x/dex/types/tick_liquidity_key.go | 8 + x/dex/types/tick_liquidity_test.go | 34 + x/dex/types/trade_pair_id.go | 103 + x/dex/types/trade_pair_id.pb.go | 366 + x/dex/types/tx.pb.go | 4608 ++++++++ x/dex/types/types.go | 1 + x/dex/utils/abci.go | 28 + x/dex/utils/errors.go | 15 + x/dex/utils/math.go | 67 + x/epochs/README.md | 187 + x/epochs/client/cli/cli_test.go | 33 + x/epochs/client/cli/query.go | 36 + x/epochs/keeper/abci.go | 81 + x/epochs/keeper/abci_test.go | 300 + x/epochs/keeper/epoch.go | 114 + x/epochs/keeper/epoch_test.go | 97 + x/epochs/keeper/genesis.go | 24 + x/epochs/keeper/genesis_test.go | 96 + x/epochs/keeper/grpc_query.go | 60 + x/epochs/keeper/grpc_query_test.go | 30 + x/epochs/keeper/hooks.go | 22 + x/epochs/keeper/keeper.go | 41 + x/epochs/keeper/keeper_test.go | 24 + x/epochs/module.go | 173 + x/epochs/types/doc.go | 4 + x/epochs/types/events.go | 9 + x/epochs/types/genesis.go | 68 + x/epochs/types/genesis.pb.go | 821 ++ x/epochs/types/hooks.go | 67 + x/epochs/types/hooks_test.go | 167 + x/epochs/types/identifier.go | 23 + x/epochs/types/keys.go | 18 + x/epochs/types/query.pb.go | 912 ++ x/epochs/types/query.pb.gw.go | 236 + x/gmp/ibc_middleware.go | 148 + x/gmp/types.go | 21 + x/ibcswap/ibc_middleware.go | 373 + x/ibcswap/keeper/keeper.go | 188 + x/ibcswap/module.go | 133 + x/ibcswap/types/errors.go | 9 + x/ibcswap/types/expected_keepers.go | 14 + x/ibcswap/types/keys.go | 8 + x/ibcswap/types/swap.go | 102 + x/ibcswap/types/swap_test.go | 243 + x/incentives/README GAUGES.md | 651 ++ x/incentives/README LOCKUP.md | 1054 ++ x/incentives/client/cli/cli_test.go | 351 + x/incentives/client/cli/flags.go | 22 + x/incentives/client/cli/query.go | 113 + x/incentives/client/cli/query_test.go | 131 + x/incentives/client/cli/tx.go | 173 + x/incentives/keeper/account_history.go | 83 + x/incentives/keeper/distribute.go | 184 + x/incentives/keeper/distribute_test.go | 362 + x/incentives/keeper/distributor.go | 91 + x/incentives/keeper/distributor_test.go | 140 + x/incentives/keeper/export_test.go | 44 + x/incentives/keeper/gas_test.go | 77 + x/incentives/keeper/gauge.go | 309 + x/incentives/keeper/gauge_test.go | 280 + x/incentives/keeper/genesis.go | 78 + x/incentives/keeper/genesis_test.go | 57 + x/incentives/keeper/hooks.go | 60 + x/incentives/keeper/iterator.go | 58 + x/incentives/keeper/keeper.go | 81 + x/incentives/keeper/keeper_test.go | 52 + x/incentives/keeper/msg_server.go | 183 + x/incentives/keeper/params.go | 18 + x/incentives/keeper/query_server.go | 267 + x/incentives/keeper/query_server_test.go | 126 + x/incentives/keeper/stake.go | 249 + x/incentives/keeper/stake_refs.go | 72 + x/incentives/keeper/stake_test.go | 120 + x/incentives/keeper/store_test.go | 54 + x/incentives/keeper/suite_test.go | 123 + x/incentives/keeper/utils.go | 78 + x/incentives/keeper/utils_test.go | 126 + x/incentives/module.go | 212 + x/incentives/types/account.pb.go | 391 + x/incentives/types/account_history.pb.go | 391 + x/incentives/types/codec.go | 35 + x/incentives/types/distribution_spec.go | 25 + x/incentives/types/distribution_spec_test.go | 44 + x/incentives/types/errors.go | 43 + x/incentives/types/events.go | 21 + x/incentives/types/expected_keepers.go | 34 + x/incentives/types/gauge.go | 82 + x/incentives/types/gauge.pb.go | 1021 ++ x/incentives/types/gauge_test.go | 65 + x/incentives/types/gauges.go | 24 + x/incentives/types/genesis.go | 23 + x/incentives/types/genesis.pb.go | 590 ++ x/incentives/types/hooks.go | 82 + x/incentives/types/keys.go | 175 + x/incentives/types/keys_test.go | 18 + x/incentives/types/msgs.go | 230 + x/incentives/types/msgs_test.go | 323 + x/incentives/types/params.go | 50 + x/incentives/types/params.pb.go | 359 + x/incentives/types/query.pb.go | 3584 +++++++ x/incentives/types/query.pb.gw.go | 842 ++ x/incentives/types/query_condition.go | 18 + x/incentives/types/query_condition_test.go | 62 + x/incentives/types/stake.go | 53 + x/incentives/types/stake.pb.go | 531 + x/incentives/types/stakes.go | 16 + x/incentives/types/tx.pb.go | 2314 +++++ 303 files changed, 67593 insertions(+), 1 deletion(-) create mode 100644 proto/neutron/dex/deposit_record.proto create mode 100644 proto/neutron/dex/genesis.proto create mode 100644 proto/neutron/dex/limit_order_expiration.proto create mode 100644 proto/neutron/dex/limit_order_tranche.proto create mode 100644 proto/neutron/dex/limit_order_tranche_user.proto create mode 100644 proto/neutron/dex/pair_id.proto create mode 100644 proto/neutron/dex/params.proto create mode 100644 proto/neutron/dex/pool.proto create mode 100644 proto/neutron/dex/pool_metadata.proto create mode 100644 proto/neutron/dex/pool_reserves.proto create mode 100644 proto/neutron/dex/query.proto create mode 100644 proto/neutron/dex/tick_liquidity.proto create mode 100644 proto/neutron/dex/trade_pair_id.proto create mode 100644 proto/neutron/dex/tx.proto create mode 100644 proto/neutron/epochs/genesis.proto create mode 100644 proto/neutron/epochs/query.proto create mode 100644 proto/neutron/incentives/account_history.proto create mode 100644 proto/neutron/incentives/gauge.proto create mode 100644 proto/neutron/incentives/genesis.proto create mode 100644 proto/neutron/incentives/params.proto create mode 100644 proto/neutron/incentives/query.proto create mode 100644 proto/neutron/incentives/stake.proto create mode 100644 proto/neutron/incentives/tx.proto create mode 100644 tests/ibc/gmp_swap_forward_test.go create mode 100644 tests/ibc/ibc_setup_test.go create mode 100644 tests/ibc/swap_forward_test.go create mode 100644 tests/ibc/swap_test.go create mode 100644 testutil/apptesting/events.go create mode 100644 testutil/apptesting/test_suite.go create mode 100644 testutil/common/sample/sample.go create mode 100644 testutil/dex/keeper/dex.go create mode 100644 testutil/dex/nullify/nullify.go create mode 100644 testutil/integration_test_setup.go create mode 100644 utils/bank.go create mode 100644 utils/cache_ctx.go create mode 100644 utils/cli_helpers.go create mode 100644 utils/dcli/cli_tester.go create mode 100644 utils/dcli/flag_advice.go create mode 100644 utils/dcli/index_cmd.go create mode 100644 utils/dcli/parsers.go create mode 100644 utils/dcli/parsers_test.go create mode 100644 utils/dcli/query_cmd_wrap.go create mode 100644 utils/dcli/string_formatter.go create mode 100644 utils/dcli/tx_cmd_wrap.go create mode 100644 utils/generic_helper.go create mode 100644 utils/math/prec_dec.go create mode 100644 utils/slice_helper.go create mode 100644 x/dex/client/cli/flags.go create mode 100644 x/dex/client/cli/query.go create mode 100644 x/dex/client/cli/query_inactive_limit_order_tranche.go create mode 100644 x/dex/client/cli/query_limit_order_tranche.go create mode 100644 x/dex/client/cli/query_limit_order_tranche_user.go create mode 100644 x/dex/client/cli/query_params.go create mode 100644 x/dex/client/cli/query_pool.go create mode 100644 x/dex/client/cli/query_pool_metadata.go create mode 100644 x/dex/client/cli/query_pool_reserves.go create mode 100644 x/dex/client/cli/query_test.go create mode 100644 x/dex/client/cli/query_tick_liquidity.go create mode 100644 x/dex/client/cli/query_user_deposits.go create mode 100644 x/dex/client/cli/query_user_limit_orders.go create mode 100644 x/dex/client/cli/tx.go create mode 100644 x/dex/client/cli/tx_cancel_limit_order.go create mode 100644 x/dex/client/cli/tx_deposit.go create mode 100644 x/dex/client/cli/tx_multi_hop_swap.go create mode 100644 x/dex/client/cli/tx_place_limit_order.go create mode 100644 x/dex/client/cli/tx_test.go create mode 100644 x/dex/client/cli/tx_withdrawl.go create mode 100644 x/dex/client/cli/tx_withdrawl_filled_limit_order.go create mode 100644 x/dex/genesis.go create mode 100644 x/dex/genesis_test.go create mode 100644 x/dex/keeper/core.go create mode 100644 x/dex/keeper/core_helper.go create mode 100644 x/dex/keeper/core_helper_test.go create mode 100644 x/dex/keeper/deposit_record.go create mode 100644 x/dex/keeper/deposit_record_test.go create mode 100644 x/dex/keeper/grpc_query.go create mode 100644 x/dex/keeper/grpc_query_estimate_multi_hop_swap.go create mode 100644 x/dex/keeper/grpc_query_estimate_multi_hop_swap_test.go create mode 100644 x/dex/keeper/grpc_query_estimate_place_limit_order.go create mode 100644 x/dex/keeper/grpc_query_inactive_limit_order_tranche.go create mode 100644 x/dex/keeper/grpc_query_inactive_limit_order_tranche_test.go create mode 100644 x/dex/keeper/grpc_query_limit_order_tranche.go create mode 100644 x/dex/keeper/grpc_query_limit_order_tranche_test.go create mode 100644 x/dex/keeper/grpc_query_limit_order_tranche_user.go create mode 100644 x/dex/keeper/grpc_query_limit_order_tranche_user_test.go create mode 100644 x/dex/keeper/grpc_query_params.go create mode 100644 x/dex/keeper/grpc_query_params_test.go create mode 100644 x/dex/keeper/grpc_query_pool.go create mode 100644 x/dex/keeper/grpc_query_pool_metadata.go create mode 100644 x/dex/keeper/grpc_query_pool_metadata_test.go create mode 100644 x/dex/keeper/grpc_query_pool_reserves.go create mode 100644 x/dex/keeper/grpc_query_pool_reserves_test.go create mode 100644 x/dex/keeper/grpc_query_pool_test.go create mode 100644 x/dex/keeper/grpc_query_tick_liquidity.go create mode 100644 x/dex/keeper/grpc_query_tick_liquidity_test.go create mode 100644 x/dex/keeper/grpc_query_user_deposits.go create mode 100644 x/dex/keeper/grpc_query_user_deposits_test.go create mode 100644 x/dex/keeper/inactive_limit_order_tranche.go create mode 100644 x/dex/keeper/inactive_limit_order_tranche_test.go create mode 100644 x/dex/keeper/integration_cancellimitorder_test.go create mode 100644 x/dex/keeper/integration_deposit_autoswap_unit_test.go create mode 100644 x/dex/keeper/integration_deposit_doublesided_test.go create mode 100644 x/dex/keeper/integration_deposit_multi_test.go create mode 100644 x/dex/keeper/integration_deposit_singlesided_test.go create mode 100644 x/dex/keeper/integration_multihopswap_test.go create mode 100644 x/dex/keeper/integration_placelimitorder_test.go create mode 100644 x/dex/keeper/integration_withdraw_multi_test.go create mode 100644 x/dex/keeper/integration_withdraw_test.go create mode 100644 x/dex/keeper/integration_withdrawfilled_test.go create mode 100644 x/dex/keeper/internal/testutils/test_helpers.go create mode 100644 x/dex/keeper/keeper.go create mode 100644 x/dex/keeper/limit_order_expiration.go create mode 100644 x/dex/keeper/limit_order_expiration_test.go create mode 100644 x/dex/keeper/limit_order_tranche.go create mode 100644 x/dex/keeper/limit_order_tranche_test.go create mode 100644 x/dex/keeper/limit_order_tranche_user.go create mode 100644 x/dex/keeper/limit_order_tranche_user_test.go create mode 100644 x/dex/keeper/liquidity.go create mode 100644 x/dex/keeper/liquidity_iterator.go create mode 100644 x/dex/keeper/liquidity_test.go create mode 100644 x/dex/keeper/msg_server.go create mode 100644 x/dex/keeper/msg_server_test.go create mode 100644 x/dex/keeper/multihop_swap.go create mode 100644 x/dex/keeper/pair_helper.go create mode 100644 x/dex/keeper/params.go create mode 100644 x/dex/keeper/params_test.go create mode 100644 x/dex/keeper/pool.go create mode 100644 x/dex/keeper/pool_metadata.go create mode 100644 x/dex/keeper/pool_metadata_test.go create mode 100644 x/dex/keeper/pool_reserves.go create mode 100644 x/dex/keeper/pool_reserves_test.go create mode 100644 x/dex/keeper/pool_test.go create mode 100644 x/dex/keeper/tick_iterator.go create mode 100644 x/dex/keeper/tick_liquidity.go create mode 100644 x/dex/keeper/tick_liquidity_test.go create mode 100644 x/dex/module.go create mode 100644 x/dex/module_simulation.go create mode 100644 x/dex/simulation/cancel_limit_order.go create mode 100644 x/dex/simulation/deposit.go create mode 100644 x/dex/simulation/multi_hop_swap.go create mode 100644 x/dex/simulation/place_limit_order.go create mode 100644 x/dex/simulation/simap.go create mode 100644 x/dex/simulation/withdrawl.go create mode 100644 x/dex/simulation/withdrawl_filled_limit_order.go create mode 100644 x/dex/types/branchable_cache.go create mode 100644 x/dex/types/codec.go create mode 100644 x/dex/types/deposit_record.pb.go create mode 100644 x/dex/types/errors.go create mode 100644 x/dex/types/events.go create mode 100644 x/dex/types/expected_keepers.go create mode 100644 x/dex/types/genesis.go create mode 100644 x/dex/types/genesis.pb.go create mode 100644 x/dex/types/genesis_test.go create mode 100644 x/dex/types/keys.go create mode 100644 x/dex/types/limit_order_expiration.pb.go create mode 100644 x/dex/types/limit_order_tranche.go create mode 100644 x/dex/types/limit_order_tranche.pb.go create mode 100644 x/dex/types/limit_order_tranche_key.go create mode 100644 x/dex/types/limit_order_tranche_user.go create mode 100644 x/dex/types/limit_order_tranche_user.pb.go create mode 100644 x/dex/types/limit_order_type.go create mode 100644 x/dex/types/liquidity.go create mode 100644 x/dex/types/message_cancel_limit_order.go create mode 100644 x/dex/types/message_cancel_limit_order_test.go create mode 100644 x/dex/types/message_deposit.go create mode 100644 x/dex/types/message_deposit_test.go create mode 100644 x/dex/types/message_multi_hop_swap.go create mode 100644 x/dex/types/message_multi_hop_swap_test.go create mode 100644 x/dex/types/message_place_limit_order.go create mode 100644 x/dex/types/message_place_limit_order_test.go create mode 100644 x/dex/types/message_withdrawl.go create mode 100644 x/dex/types/message_withdrawl_filled_limit_order.go create mode 100644 x/dex/types/message_withdrawl_filled_limit_order_test.go create mode 100644 x/dex/types/message_withdrawl_test.go create mode 100644 x/dex/types/pair_id.go create mode 100644 x/dex/types/pair_id.pb.go create mode 100644 x/dex/types/params.go create mode 100644 x/dex/types/params.pb.go create mode 100644 x/dex/types/pool.go create mode 100644 x/dex/types/pool.pb.go create mode 100644 x/dex/types/pool_denom.go create mode 100644 x/dex/types/pool_denom_test.go create mode 100644 x/dex/types/pool_liquidity.go create mode 100644 x/dex/types/pool_metadata.go create mode 100644 x/dex/types/pool_metadata.pb.go create mode 100644 x/dex/types/pool_reserves.go create mode 100644 x/dex/types/pool_reserves.pb.go create mode 100644 x/dex/types/pool_reserves_key.go create mode 100644 x/dex/types/pool_test.go create mode 100644 x/dex/types/price.go create mode 100644 x/dex/types/price_test.go create mode 100644 x/dex/types/query.pb.go create mode 100644 x/dex/types/query.pb.gw.go create mode 100644 x/dex/types/tick_liquidity.go create mode 100644 x/dex/types/tick_liquidity.pb.go create mode 100644 x/dex/types/tick_liquidity_key.go create mode 100644 x/dex/types/tick_liquidity_test.go create mode 100644 x/dex/types/trade_pair_id.go create mode 100644 x/dex/types/trade_pair_id.pb.go create mode 100644 x/dex/types/tx.pb.go create mode 100644 x/dex/types/types.go create mode 100644 x/dex/utils/abci.go create mode 100644 x/dex/utils/errors.go create mode 100644 x/dex/utils/math.go create mode 100644 x/epochs/README.md create mode 100644 x/epochs/client/cli/cli_test.go create mode 100644 x/epochs/client/cli/query.go create mode 100644 x/epochs/keeper/abci.go create mode 100644 x/epochs/keeper/abci_test.go create mode 100644 x/epochs/keeper/epoch.go create mode 100644 x/epochs/keeper/epoch_test.go create mode 100644 x/epochs/keeper/genesis.go create mode 100644 x/epochs/keeper/genesis_test.go create mode 100644 x/epochs/keeper/grpc_query.go create mode 100644 x/epochs/keeper/grpc_query_test.go create mode 100644 x/epochs/keeper/hooks.go create mode 100644 x/epochs/keeper/keeper.go create mode 100644 x/epochs/keeper/keeper_test.go create mode 100644 x/epochs/module.go create mode 100644 x/epochs/types/doc.go create mode 100644 x/epochs/types/events.go create mode 100644 x/epochs/types/genesis.go create mode 100644 x/epochs/types/genesis.pb.go create mode 100644 x/epochs/types/hooks.go create mode 100644 x/epochs/types/hooks_test.go create mode 100644 x/epochs/types/identifier.go create mode 100644 x/epochs/types/keys.go create mode 100644 x/epochs/types/query.pb.go create mode 100644 x/epochs/types/query.pb.gw.go create mode 100644 x/gmp/ibc_middleware.go create mode 100644 x/gmp/types.go create mode 100644 x/ibcswap/ibc_middleware.go create mode 100644 x/ibcswap/keeper/keeper.go create mode 100644 x/ibcswap/module.go create mode 100644 x/ibcswap/types/errors.go create mode 100644 x/ibcswap/types/expected_keepers.go create mode 100644 x/ibcswap/types/keys.go create mode 100644 x/ibcswap/types/swap.go create mode 100644 x/ibcswap/types/swap_test.go create mode 100644 x/incentives/README GAUGES.md create mode 100644 x/incentives/README LOCKUP.md create mode 100644 x/incentives/client/cli/cli_test.go create mode 100644 x/incentives/client/cli/flags.go create mode 100644 x/incentives/client/cli/query.go create mode 100644 x/incentives/client/cli/query_test.go create mode 100644 x/incentives/client/cli/tx.go create mode 100644 x/incentives/keeper/account_history.go create mode 100644 x/incentives/keeper/distribute.go create mode 100644 x/incentives/keeper/distribute_test.go create mode 100644 x/incentives/keeper/distributor.go create mode 100644 x/incentives/keeper/distributor_test.go create mode 100644 x/incentives/keeper/export_test.go create mode 100644 x/incentives/keeper/gas_test.go create mode 100644 x/incentives/keeper/gauge.go create mode 100644 x/incentives/keeper/gauge_test.go create mode 100644 x/incentives/keeper/genesis.go create mode 100644 x/incentives/keeper/genesis_test.go create mode 100644 x/incentives/keeper/hooks.go create mode 100644 x/incentives/keeper/iterator.go create mode 100644 x/incentives/keeper/keeper.go create mode 100644 x/incentives/keeper/keeper_test.go create mode 100644 x/incentives/keeper/msg_server.go create mode 100644 x/incentives/keeper/params.go create mode 100644 x/incentives/keeper/query_server.go create mode 100644 x/incentives/keeper/query_server_test.go create mode 100644 x/incentives/keeper/stake.go create mode 100644 x/incentives/keeper/stake_refs.go create mode 100644 x/incentives/keeper/stake_test.go create mode 100644 x/incentives/keeper/store_test.go create mode 100644 x/incentives/keeper/suite_test.go create mode 100644 x/incentives/keeper/utils.go create mode 100644 x/incentives/keeper/utils_test.go create mode 100644 x/incentives/module.go create mode 100644 x/incentives/types/account.pb.go create mode 100644 x/incentives/types/account_history.pb.go create mode 100644 x/incentives/types/codec.go create mode 100644 x/incentives/types/distribution_spec.go create mode 100644 x/incentives/types/distribution_spec_test.go create mode 100644 x/incentives/types/errors.go create mode 100644 x/incentives/types/events.go create mode 100644 x/incentives/types/expected_keepers.go create mode 100644 x/incentives/types/gauge.go create mode 100644 x/incentives/types/gauge.pb.go create mode 100644 x/incentives/types/gauge_test.go create mode 100644 x/incentives/types/gauges.go create mode 100644 x/incentives/types/genesis.go create mode 100644 x/incentives/types/genesis.pb.go create mode 100644 x/incentives/types/hooks.go create mode 100644 x/incentives/types/keys.go create mode 100644 x/incentives/types/keys_test.go create mode 100644 x/incentives/types/msgs.go create mode 100644 x/incentives/types/msgs_test.go create mode 100644 x/incentives/types/params.go create mode 100644 x/incentives/types/params.pb.go create mode 100644 x/incentives/types/query.pb.go create mode 100644 x/incentives/types/query.pb.gw.go create mode 100644 x/incentives/types/query_condition.go create mode 100644 x/incentives/types/query_condition_test.go create mode 100644 x/incentives/types/stake.go create mode 100644 x/incentives/types/stake.pb.go create mode 100644 x/incentives/types/stakes.go create mode 100644 x/incentives/types/tx.pb.go diff --git a/proto/neutron/dex/deposit_record.proto b/proto/neutron/dex/deposit_record.proto new file mode 100644 index 000000000..a637d24b9 --- /dev/null +++ b/proto/neutron/dex/deposit_record.proto @@ -0,0 +1,20 @@ +syntax = "proto3"; +package duality.dex; + +option go_package = "github.com/neutron-org/neutron/x/dex/types"; +import "gogoproto/gogo.proto"; +import "duality/dex/pair_id.proto"; + +message DepositRecord { + PairID pairID = 1; + string sharesOwned = 2 [ + (gogoproto.moretags) = "yaml:\"totalShares\"", + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.nullable) = false, + (gogoproto.jsontag) = "totalShares" + ]; + int64 centerTickIndex = 3; + int64 lowerTickIndex = 4; + int64 upperTickIndex = 5; + uint64 fee = 6; +} diff --git a/proto/neutron/dex/genesis.proto b/proto/neutron/dex/genesis.proto new file mode 100644 index 000000000..da8d5add4 --- /dev/null +++ b/proto/neutron/dex/genesis.proto @@ -0,0 +1,26 @@ +syntax = "proto3"; + +package duality.dex; + +import "gogoproto/gogo.proto"; +import "duality/dex/params.proto"; +import "duality/dex/limit_order_tranche_user.proto"; +import "duality/dex/limit_order_tranche.proto"; +import "duality/dex/tick_liquidity.proto"; +import "duality/dex/pool_metadata.proto"; + +// this line is used by starport scaffolding # genesis/proto/import + +option go_package = "github.com/neutron-org/neutron/x/dex/types"; + +// GenesisState defines the dex module's genesis state. +message GenesisState { + Params params = 1 [(gogoproto.nullable) = false]; + repeated TickLiquidity tickLiquidityList = 2 [(gogoproto.nullable) = true ]; + repeated LimitOrderTranche inactiveLimitOrderTrancheList = 3 [(gogoproto.nullable) = true ]; + repeated LimitOrderTrancheUser limitOrderTrancheUserList = 4 [(gogoproto.nullable) = true ]; + repeated PoolMetadata poolMetadataList = 5 [(gogoproto.nullable) = false]; + uint64 poolCount = 6; + // this line is used by starport scaffolding # genesis/proto/state +} + diff --git a/proto/neutron/dex/limit_order_expiration.proto b/proto/neutron/dex/limit_order_expiration.proto new file mode 100644 index 000000000..2c7f1af5c --- /dev/null +++ b/proto/neutron/dex/limit_order_expiration.proto @@ -0,0 +1,18 @@ +syntax = "proto3"; +package duality.dex; + +option go_package = "github.com/neutron-org/neutron/x/dex/types"; +import "google/protobuf/timestamp.proto"; + +import "gogoproto/gogo.proto"; + +message LimitOrderExpiration { + // see limitOrderTranche.proto for details on goodTilDate + google.protobuf.Timestamp expirationTime = 1 [ + (gogoproto.stdtime) = true, + (gogoproto.nullable) = false + ]; + bytes trancheRef = 2; + +} + diff --git a/proto/neutron/dex/limit_order_tranche.proto b/proto/neutron/dex/limit_order_tranche.proto new file mode 100644 index 000000000..b2ffd2749 --- /dev/null +++ b/proto/neutron/dex/limit_order_tranche.proto @@ -0,0 +1,60 @@ +syntax = "proto3"; +package duality.dex; + +option go_package = "github.com/neutron-org/neutron/x/dex/types"; +import "google/protobuf/timestamp.proto"; + +import "duality/dex/trade_pair_id.proto"; +import "gogoproto/gogo.proto"; +import "duality/dex/pair_id.proto"; + +message LimitOrderTrancheKey { + TradePairID tradePairID = 1; + int64 tickIndexTakerToMaker = 2; + string trancheKey = 3; +} + +message LimitOrderTranche { + LimitOrderTrancheKey key = 1; + string reservesMakerDenom = 2 [ + (gogoproto.moretags) = "yaml:\"reservesMakerDenom\"", + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.nullable) = false, + (gogoproto.jsontag) = "reservesMakerDenom" + ]; + string reservesTakerDenom = 3 [ + (gogoproto.moretags) = "yaml:\"reservesTakerDenom\"", + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.nullable) = false, + (gogoproto.jsontag) = "reservesTakerDenom" + ]; + string totalMakerDenom = 4 [ + (gogoproto.moretags) = "yaml:\"totalMakerDenom\"", + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.nullable) = false, + (gogoproto.jsontag) = "totalTokenIn" + ]; + string totalTakerDenom = 5 [ + (gogoproto.moretags) = "yaml:\"totalTakerDenom\"", + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.nullable) = false, + (gogoproto.jsontag) = "totalTakerDenom" + ]; + // GoodTilDate is represented as seconds since January 1, year 1, 00:00:00.00 UTC + // LimitOrders with goodTilDate set are valid as long as blockTime <= goodTilDate + + // JIT orders also use goodTilDate to handle deletion but represent a special case + // All JIT orders have a goodTilDate of 0 and an exception is made to still still treat these orders as live + // Order deletion still functions the same and the orders will be deleted at the end of the block + google.protobuf.Timestamp expirationTime = 6 [ + (gogoproto.stdtime) = true, + (gogoproto.nullable) = true + ]; + string priceTakerToMaker = 7 [ + (gogoproto.moretags) = "yaml:\"priceTakerToMaker\"", + (gogoproto.customtype) = "github.com/neutron-org/neutron/utils/math.PrecDec", + (gogoproto.nullable) = false, + (gogoproto.jsontag) = "priceTakerToMaker" + ]; +} + diff --git a/proto/neutron/dex/limit_order_tranche_user.proto b/proto/neutron/dex/limit_order_tranche_user.proto new file mode 100644 index 000000000..e316b08ce --- /dev/null +++ b/proto/neutron/dex/limit_order_tranche_user.proto @@ -0,0 +1,34 @@ +syntax = "proto3"; +package duality.dex; + +option go_package = "github.com/neutron-org/neutron/x/dex/types"; +import "gogoproto/gogo.proto"; +import "duality/dex/trade_pair_id.proto"; +import "duality/dex/tx.proto"; + +message LimitOrderTrancheUser { + TradePairID tradePairID = 1; + int64 tickIndexTakerToMaker = 2; + string trancheKey = 3; + string address = 4; + string sharesOwned = 5 [ + (gogoproto.moretags) = "yaml:\"sharesOwned\"", + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.nullable) = false, + (gogoproto.jsontag) = "sharesOwned" + ]; + string sharesWithdrawn = 6 [ + (gogoproto.moretags) = "yaml:\"sharesWithdrawn\"", + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.nullable) = false, + (gogoproto.jsontag) = "sharesWithdrawn" + ]; + string sharesCancelled = 7 [ + (gogoproto.moretags) = "yaml:\"sharesCancelled\"", + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.nullable) = false, + (gogoproto.jsontag) = "sharesCancelled" + ]; + LimitOrderType orderType = 8; +} + diff --git a/proto/neutron/dex/pair_id.proto b/proto/neutron/dex/pair_id.proto new file mode 100644 index 000000000..65a675ba3 --- /dev/null +++ b/proto/neutron/dex/pair_id.proto @@ -0,0 +1,9 @@ +syntax = "proto3"; +package duality.dex; + +option go_package = "github.com/neutron-org/neutron/x/dex/types"; + +message PairID { + string token0 = 1; + string token1 = 2; +} diff --git a/proto/neutron/dex/params.proto b/proto/neutron/dex/params.proto new file mode 100644 index 000000000..4545c871d --- /dev/null +++ b/proto/neutron/dex/params.proto @@ -0,0 +1,12 @@ +syntax = "proto3"; +package duality.dex; + +import "gogoproto/gogo.proto"; + +option go_package = "github.com/neutron-org/neutron/x/dex/types"; + +// Params defines the parameters for the module. +message Params { + option (gogoproto.goproto_stringer) = false; + repeated uint64 fee_tiers = 1; +} diff --git a/proto/neutron/dex/pool.proto b/proto/neutron/dex/pool.proto new file mode 100644 index 000000000..56ec8d8b3 --- /dev/null +++ b/proto/neutron/dex/pool.proto @@ -0,0 +1,14 @@ +syntax = "proto3"; +package duality.dex; + +option go_package = "github.com/neutron-org/neutron/x/dex/types"; +import "gogoproto/gogo.proto"; +import "duality/dex/pool_reserves.proto"; + +// NOTE: This struct is never actually stored in the KV store. It is merely a convenience wrapper for holding both sides of a pool. + +message Pool { + uint64 ID = 1; + PoolReserves lower_tick0 = 2; + PoolReserves upper_tick1 = 3; +} diff --git a/proto/neutron/dex/pool_metadata.proto b/proto/neutron/dex/pool_metadata.proto new file mode 100644 index 000000000..f54d42303 --- /dev/null +++ b/proto/neutron/dex/pool_metadata.proto @@ -0,0 +1,13 @@ +syntax = "proto3"; +package duality.dex; + +option go_package = "github.com/neutron-org/neutron/x/dex/types"; + +import "duality/dex/pair_id.proto"; + +message PoolMetadata { + uint64 ID = 1; + int64 tick = 2; + uint64 fee = 3; + PairID pairID = 4; +} diff --git a/proto/neutron/dex/pool_reserves.proto b/proto/neutron/dex/pool_reserves.proto new file mode 100644 index 000000000..7bab4ab8e --- /dev/null +++ b/proto/neutron/dex/pool_reserves.proto @@ -0,0 +1,35 @@ +syntax = "proto3"; +package duality.dex; + +option go_package = "github.com/neutron-org/neutron/x/dex/types"; +import "gogoproto/gogo.proto"; +import "duality/dex/trade_pair_id.proto"; + +message PoolReservesKey { + TradePairID tradePairID = 1; + int64 TickIndexTakerToMaker = 2; + uint64 Fee = 3; +} + +message PoolReserves { + PoolReservesKey key = 1; + string reservesMakerDenom = 2 [ + (gogoproto.moretags) = "yaml:\"reservesMakerDenom\"", + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.jsontag) = "reservesMakerDenom", + (gogoproto.nullable) = false + ]; + string priceTakerToMaker = 3 [ + (gogoproto.moretags) = "yaml:\"priceTakerToMaker\"", + (gogoproto.customtype) = "github.com/neutron-org/neutron/utils/math.PrecDec", + (gogoproto.nullable) = false, + (gogoproto.jsontag) = "priceTakerToMaker" + ]; + string priceOppositeTakerToMaker = 4 [ + (gogoproto.moretags) = "yaml:\"priceOppositeTakerToMaker\"", + (gogoproto.customtype) = "github.com/neutron-org/neutron/utils/math.PrecDec", + (gogoproto.nullable) = false, + (gogoproto.jsontag) = "priceOppositeTakerToMaker" + ]; +} + diff --git a/proto/neutron/dex/query.proto b/proto/neutron/dex/query.proto new file mode 100644 index 000000000..69a055ea8 --- /dev/null +++ b/proto/neutron/dex/query.proto @@ -0,0 +1,327 @@ +syntax = "proto3"; + +package duality.dex; + +import "gogoproto/gogo.proto"; +import "google/api/annotations.proto"; +import "cosmos/base/query/v1beta1/pagination.proto"; +import "duality/dex/params.proto"; +import "duality/dex/limit_order_tranche_user.proto"; +import "duality/dex/limit_order_tranche.proto"; +import "duality/dex/deposit_record.proto"; +import "duality/dex/tick_liquidity.proto"; +import "duality/dex/pool_reserves.proto"; +import "duality/dex/tx.proto"; +import "cosmos/base/v1beta1/coin.proto"; +import "google/protobuf/timestamp.proto"; +import "duality/dex/pool.proto"; +import "duality/dex/pool_metadata.proto"; + +// this line is used by starport scaffolding # 1 + +option go_package = "github.com/neutron-org/neutron/x/dex/types"; + +// Query defines the gRPC querier service. +service Query { + // Parameters queries the parameters of the module. + rpc Params (QueryParamsRequest) returns (QueryParamsResponse) { + option (google.api.http).get = "/duality/dex/params"; + + } + + // Queries a LimitOrderTrancheUser by index. + rpc LimitOrderTrancheUser (QueryGetLimitOrderTrancheUserRequest) returns (QueryGetLimitOrderTrancheUserResponse) { + option (google.api.http).get = "/duality/dex/limit_order_tranche_user/{address}/{trancheKey}"; + + } + + // Queries a list of LimitOrderTrancheMap items. + rpc LimitOrderTrancheUserAll (QueryAllLimitOrderTrancheUserRequest) returns (QueryAllLimitOrderTrancheUserResponse) { + option (google.api.http).get = "/duality/dex/limit_order_tranche_user"; + + } + + // Queries a list of LimitOrderTrancheUser items for a given address. + rpc LimitOrderTrancheUserAllByAddress(QueryAllUserLimitOrdersRequest) returns (QueryAllUserLimitOrdersResponse) { + option (google.api.http).get = "/duality/dex/user/limit_orders/{address}"; + } + + // Queries a LimitOrderTranche by index. + rpc LimitOrderTranche (QueryGetLimitOrderTrancheRequest) returns (QueryGetLimitOrderTrancheResponse) { + option (google.api.http).get = "/duality/dex/limit_order_tranche/{pairID}/{tokenIn}/{tickIndex}/{trancheKey}"; + } + + // Queries a list of LimitOrderTranche items for a given pairID / TokenIn combination. + rpc LimitOrderTrancheAll (QueryAllLimitOrderTrancheRequest) returns (QueryAllLimitOrderTrancheResponse) { + option (google.api.http).get = "/duality/dex/limit_order_tranche/{pairID}/{tokenIn}"; + } + + // Queries a list of UserDeposits items. + rpc UserDepositsAll (QueryAllUserDepositsRequest) returns (QueryAllUserDepositsResponse) { + option (google.api.http).get = "/duality/dex/user/deposits/{address}"; + } + + // Queries a list of TickLiquidity items. + rpc TickLiquidityAll (QueryAllTickLiquidityRequest) returns (QueryAllTickLiquidityResponse) { + option (google.api.http).get = "/duality/dex/tick_liquidity/{pairID}/{tokenIn}"; + } + + // Queries a InactiveLimitOrderTranche by index. + rpc InactiveLimitOrderTranche (QueryGetInactiveLimitOrderTrancheRequest) returns (QueryGetInactiveLimitOrderTrancheResponse) { + option (google.api.http).get = "/duality/dex/filled_limit_order_tranche/{pairID}/{tokenIn}/{tickIndex}/{trancheKey}"; + } + + // Queries a list of InactiveLimitOrderTranche items. + rpc InactiveLimitOrderTrancheAll (QueryAllInactiveLimitOrderTrancheRequest) returns (QueryAllInactiveLimitOrderTrancheResponse) { + option (google.api.http).get = "/duality/dex/filled_limit_order_tranche"; + } + + // Queries a list of PoolReserves items. + rpc PoolReservesAll (QueryAllPoolReservesRequest) returns (QueryAllPoolReservesResponse) { + option (google.api.http).get = "/duality/dex/pool_reserves/{pairID}/{tokenIn}"; + } + + // Queries a PoolReserve by index + rpc PoolReserves (QueryGetPoolReservesRequest) returns (QueryGetPoolReservesResponse) { + option (google.api.http).get = "/duality/dex/pool_reserves/{pairID}/{tokenIn}/{tickIndex}/{fee}"; + } + + // Queries the simulated result of a multihop swap + rpc EstimateMultiHopSwap (QueryEstimateMultiHopSwapRequest) returns (QueryEstimateMultiHopSwapResponse) { + option (google.api.http).get = "/duality/dex/estimate_multi_hop_swap"; + } + + // Queries the simulated result of a multihop swap + rpc EstimatePlaceLimitOrder (QueryEstimatePlaceLimitOrderRequest) returns (QueryEstimatePlaceLimitOrderResponse) { + option (google.api.http).get = "/duality/dex/estimate_place_limit_order"; + } + + // Queries a pool by pair, tick and fee + rpc Pool (QueryPoolRequest) returns (QueryPoolResponse) { + option (google.api.http).get = "/duality/dex/pool/{pairID}/{tickIndex}/{fee}"; + + } + + // Queries a pool by ID + rpc PoolByID (QueryPoolByIDRequest) returns (QueryPoolResponse) { + option (google.api.http).get = "/duality/dex/pool/{poolID}"; + + } + + // Queries a PoolMetadata by ID + rpc PoolMetadata (QueryGetPoolMetadataRequest) returns (QueryGetPoolMetadataResponse) { + option (google.api.http).get = "/duality/dex/pool_metadata/{id}"; + + } + + // Queries a list of PoolMetadata items. + rpc PoolMetadataAll (QueryAllPoolMetadataRequest) returns (QueryAllPoolMetadataResponse) { + option (google.api.http).get = "/duality/dex/pool_metadata"; + + } + +// this line is used by starport scaffolding # 2 + +} +// QueryParamsRequest is request type for the Query/Params RPC method. +message QueryParamsRequest {} + +// QueryParamsResponse is response type for the Query/Params RPC method. +message QueryParamsResponse { + + // params holds all the parameters of this module. + Params params = 1 [(gogoproto.nullable) = false]; +} + +message QueryGetLimitOrderTrancheUserRequest { + string address = 1; + string trancheKey = 2; +} + +message QueryGetLimitOrderTrancheUserResponse { + LimitOrderTrancheUser LimitOrderTrancheUser = 1 [(gogoproto.nullable) = true]; +} + +message QueryAllLimitOrderTrancheUserRequest { + cosmos.base.query.v1beta1.PageRequest pagination = 1; +} + +message QueryAllLimitOrderTrancheUserResponse { + repeated LimitOrderTrancheUser LimitOrderTrancheUser = 1 [(gogoproto.nullable) = true]; + cosmos.base.query.v1beta1.PageResponse pagination = 2; +} + +message QueryGetLimitOrderTrancheRequest { + string pairID = 1; + int64 tickIndex = 2; + string tokenIn = 3; + string trancheKey = 4; +} + +message QueryGetLimitOrderTrancheResponse { + LimitOrderTranche LimitOrderTranche = 1 [(gogoproto.nullable) = true]; +} + +message QueryAllLimitOrderTrancheRequest { + string pairID = 1; + string tokenIn = 2; + cosmos.base.query.v1beta1.PageRequest pagination = 3; +} + +message QueryAllLimitOrderTrancheResponse { + repeated LimitOrderTranche LimitOrderTranche = 1 [(gogoproto.nullable) = true]; + cosmos.base.query.v1beta1.PageResponse pagination = 2; +} + +message QueryAllUserDepositsRequest { + string address = 1; + cosmos.base.query.v1beta1.PageRequest pagination = 2; +} + +message QueryAllUserDepositsResponse { + repeated DepositRecord Deposits = 1 [(gogoproto.nullable) = true]; + cosmos.base.query.v1beta1.PageResponse pagination = 2; +} + +message QueryAllUserLimitOrdersRequest { + string address = 1; + cosmos.base.query.v1beta1.PageRequest pagination = 2; +} + +message QueryAllUserLimitOrdersResponse { + repeated LimitOrderTrancheUser limitOrders = 1 [(gogoproto.nullable) = true]; + cosmos.base.query.v1beta1.PageResponse pagination = 2; +} + +message QueryAllTickLiquidityRequest { + string pairID = 1; + string tokenIn = 2; + cosmos.base.query.v1beta1.PageRequest pagination = 3; +} + +message QueryAllTickLiquidityResponse { + repeated TickLiquidity tickLiquidity = 1 [(gogoproto.nullable) = true]; + cosmos.base.query.v1beta1.PageResponse pagination = 2; +} + +message QueryGetInactiveLimitOrderTrancheRequest { + string pairID = 1; + string tokenIn = 2; + int64 tickIndex = 3; + string trancheKey = 4; +} + +message QueryGetInactiveLimitOrderTrancheResponse { + LimitOrderTranche inactiveLimitOrderTranche = 1 [(gogoproto.nullable) = true]; +} + +message QueryAllInactiveLimitOrderTrancheRequest { + cosmos.base.query.v1beta1.PageRequest pagination = 1; +} + +message QueryAllInactiveLimitOrderTrancheResponse { + repeated LimitOrderTranche inactiveLimitOrderTranche = 1 [(gogoproto.nullable) = true]; + cosmos.base.query.v1beta1.PageResponse pagination = 2; +} + +message QueryAllPoolReservesRequest { + string pairID = 1; + string tokenIn = 2; + cosmos.base.query.v1beta1.PageRequest pagination = 3; +} + +message QueryAllPoolReservesResponse { + repeated PoolReserves poolReserves = 1 [(gogoproto.nullable) = true]; + cosmos.base.query.v1beta1.PageResponse pagination = 2; +} + +message QueryGetPoolReservesRequest { + string pairID = 1; + string tokenIn = 2; + int64 tickIndex = 3; + uint64 fee = 4; +} + +message QueryGetPoolReservesResponse { + PoolReserves poolReserves = 1 [(gogoproto.nullable) = true]; +} + +message QueryEstimateMultiHopSwapRequest { + string creator = 1; + string receiver = 2; + repeated MultiHopRoute routes = 3; + string amountIn = 4 [(gogoproto.moretags) = "yaml:\"amountIn\"" , (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false, (gogoproto.jsontag) = "amountIn" ]; + string exitLimitPrice = 5 [(gogoproto.moretags) = "yaml:\"exitLimitPrice\"", (gogoproto.customtype) = "github.com/neutron-org/neutron/utils/math.PrecDec", (gogoproto.nullable) = false, (gogoproto.jsontag) = "exitLimitPrice"]; + + // If pickBestRoute == true then all routes are run and the route with the best price is chosen + // otherwise, the first succesful route is used. + bool pickBestRoute = 6; +} + +message QueryEstimateMultiHopSwapResponse { + cosmos.base.v1beta1.Coin coinOut = 1 [(gogoproto.nullable) = false, (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Coin", (gogoproto.jsontag) = "coinOut"]; +} + +message QueryEstimatePlaceLimitOrderRequest { + string creator = 1; + string receiver = 2; + string tokenIn = 3; + string tokenOut = 4; + int64 tickIndexInToOut = 5; + string amountIn = 6 [(gogoproto.moretags) = "yaml:\"amountIn\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false, (gogoproto.jsontag) = "amountIn"]; + LimitOrderType orderType = 7; + + // expirationTime is only valid iff orderType == GOOD_TIL_TIME. + google.protobuf.Timestamp expirationTime = 8 [(gogoproto.stdtime) = true , (gogoproto.nullable) = true ] ; + string maxAmountOut = 9 [(gogoproto.moretags) = "yaml:\"maxAmountOut\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = true, (gogoproto.jsontag) = "maxAmountOut"]; +} + +message QueryEstimatePlaceLimitOrderResponse { + + // Total amount of coin used for the limit order + // You can derive makerLimitInCoin using the equation: totalInCoin = swapInCoin + makerLimitInCoin + cosmos.base.v1beta1.Coin totalInCoin = 1 [(gogoproto.moretags) = "yaml:\"totalInCoin\"", (gogoproto.nullable) = false, (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Coin", (gogoproto.jsontag) = "totalInCoin"]; + + // Total amount of the token in that was immediately swapped for swapOutCoin + cosmos.base.v1beta1.Coin swapInCoin = 2 [(gogoproto.moretags) = "yaml:\"swapInCoin\"", (gogoproto.nullable) = false, (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Coin", (gogoproto.jsontag) = "swapInCoin"]; + + // 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 + cosmos.base.v1beta1.Coin swapOutCoin = 3 [(gogoproto.moretags) = "yaml:\"swapOutCoin\"", (gogoproto.nullable) = false, (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Coin", (gogoproto.jsontag) = "swapOutCoin"]; +} + +message QueryPoolRequest { + string pairID = 1; + int64 tickIndex = 2; + uint64 fee = 3; +} + +message QueryPoolByIDRequest { + uint64 poolID = 1; +} + +message QueryPoolResponse { + Pool pool = 1 [(gogoproto.nullable) = true]; +} + + +message QueryGetPoolMetadataRequest { + uint64 id = 1; +} + +message QueryGetPoolMetadataResponse { + PoolMetadata PoolMetadata = 1 [(gogoproto.nullable) = false]; +} + +message QueryAllPoolMetadataRequest { + cosmos.base.query.v1beta1.PageRequest pagination = 1; +} + +message QueryAllPoolMetadataResponse { + repeated PoolMetadata PoolMetadata = 1 [(gogoproto.nullable) = false]; + cosmos.base.query.v1beta1.PageResponse pagination = 2; +} + +// this line is used by starport scaffolding # 3 + diff --git a/proto/neutron/dex/tick_liquidity.proto b/proto/neutron/dex/tick_liquidity.proto new file mode 100644 index 000000000..3fec914bc --- /dev/null +++ b/proto/neutron/dex/tick_liquidity.proto @@ -0,0 +1,17 @@ +syntax = "proto3"; +package duality.dex; + +option go_package = "github.com/neutron-org/neutron/x/dex/types"; +import "gogoproto/gogo.proto"; +import "duality/dex/limit_order_tranche.proto"; +import "duality/dex/pool_reserves.proto"; + + +message TickLiquidity { + oneof liquidity { + PoolReserves poolReserves = 1; + LimitOrderTranche limitOrderTranche = 2; + } + +} + diff --git a/proto/neutron/dex/trade_pair_id.proto b/proto/neutron/dex/trade_pair_id.proto new file mode 100644 index 000000000..bd66e0e25 --- /dev/null +++ b/proto/neutron/dex/trade_pair_id.proto @@ -0,0 +1,9 @@ +syntax = "proto3"; +package duality.dex; + +option go_package = "github.com/neutron-org/neutron/x/dex/types"; + +message TradePairID { + string makerDenom = 2; + string takerDenom = 3; +} diff --git a/proto/neutron/dex/tx.proto b/proto/neutron/dex/tx.proto new file mode 100644 index 000000000..8cf92c529 --- /dev/null +++ b/proto/neutron/dex/tx.proto @@ -0,0 +1,186 @@ +syntax = "proto3"; +package duality.dex; + +// this line is used by starport scaffolding # proto/tx/import + +option go_package = "github.com/neutron-org/neutron/x/dex/types"; +import "gogoproto/gogo.proto"; +import "cosmos/base/v1beta1/coin.proto"; +import "google/protobuf/timestamp.proto"; + +// Msg defines the Msg service. +service Msg { + rpc Deposit(MsgDeposit) returns (MsgDepositResponse); + rpc Withdrawal(MsgWithdrawal) returns (MsgWithdrawalResponse); + rpc PlaceLimitOrder(MsgPlaceLimitOrder) returns (MsgPlaceLimitOrderResponse); + rpc WithdrawFilledLimitOrder(MsgWithdrawFilledLimitOrder) returns (MsgWithdrawFilledLimitOrderResponse); + rpc CancelLimitOrder(MsgCancelLimitOrder) returns (MsgCancelLimitOrderResponse); + rpc MultiHopSwap(MsgMultiHopSwap) returns (MsgMultiHopSwapResponse); +// this line is used by starport scaffolding # proto/tx/rpc +} + +message DepositOptions { + bool disable_autoswap = 1; +} + +message MsgDeposit { + string creator = 1; + string receiver = 2; + string tokenA = 3; + string tokenB = 4; + repeated string amountsA = 5 [ + (gogoproto.moretags) = "yaml:\"amountsA\"", + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.nullable) = false, + (gogoproto.jsontag) = "amountA" + ]; + repeated string amountsB = 6 [ + (gogoproto.moretags) = "yaml:\"amountsB\"", + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.nullable) = false, + (gogoproto.jsontag) = "amountB" + ]; + repeated int64 tickIndexesAToB = 7; + repeated uint64 fees = 8; + repeated DepositOptions Options = 9; +} + +message MsgDepositResponse { + repeated string Reserve0Deposited = 1 [ + (gogoproto.moretags) = "yaml:\"reserve0Deposited\"", + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.nullable) = false, + (gogoproto.jsontag) = "reserve0Deposited" + ]; + repeated string Reserve1Deposited = 2[ + (gogoproto.moretags) = "yaml:\"reserve1Deposited\"", + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.nullable) = false, + (gogoproto.jsontag) = "reserve1Deposited" + ]; +} + +message MsgWithdrawal { + string creator = 1; + string receiver = 2; + string tokenA = 3; + string tokenB = 4; + repeated string sharesToRemove = 5 [ + (gogoproto.moretags) = "yaml:\"sharesToRemove\"", + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.nullable) = false, + (gogoproto.jsontag) = "sharesToRemove" + ]; + repeated int64 tickIndexesAToB = 6; + repeated uint64 fees = 7; + +} + +message MsgWithdrawalResponse { +} + +enum LimitOrderType{ + GOOD_TIL_CANCELLED = 0; + FILL_OR_KILL = 1; + IMMEDIATE_OR_CANCEL = 2; + JUST_IN_TIME = 3; + GOOD_TIL_TIME = 4; +} + +message MsgPlaceLimitOrder { + string creator = 1; + string receiver = 2; + string tokenIn = 3; + string tokenOut = 4; + int64 tickIndexInToOut = 5; + string amountIn = 7 [ + (gogoproto.moretags) = "yaml:\"amountIn\"", + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.nullable) = false, + (gogoproto.jsontag) = "amountIn" + ]; + LimitOrderType orderType = 8; + // expirationTime is only valid iff orderType == GOOD_TIL_TIME. + google.protobuf.Timestamp expirationTime = 9 [ + (gogoproto.stdtime) = true, + (gogoproto.nullable) = true + ]; + string maxAmountOut = 10 [ + (gogoproto.moretags) = "yaml:\"maxAmountOut\"", + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.nullable) = true, + (gogoproto.jsontag) = "maxAmountOut" + ]; +} + +message MsgPlaceLimitOrderResponse { + string trancheKey = 1; + // Total amount of coin used for the limit order + cosmos.base.v1beta1.Coin coinIn = 2 [ + (gogoproto.moretags) = "yaml:\"coinIn\"", + (gogoproto.nullable) = false, + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Coin", + (gogoproto.jsontag) = "coinIn" + ]; + // 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 + cosmos.base.v1beta1.Coin takerCoinOut = 3 [ + (gogoproto.moretags) = "yaml:\"takerCoinOut\"", + (gogoproto.nullable) = false, + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Coin", + (gogoproto.jsontag) = "takerCoinOut" + ]; + +} + +message MsgWithdrawFilledLimitOrder { + string creator = 1; + string trancheKey = 2; +} + +message MsgWithdrawFilledLimitOrderResponse { +} + +message MsgCancelLimitOrder { + string creator = 1; + string trancheKey = 2; +} + +message MsgCancelLimitOrderResponse { +} + +message MultiHopRoute { + repeated string hops = 1; +} + +message MsgMultiHopSwap { + string creator = 1; + string receiver = 2; + repeated MultiHopRoute routes = 3; + string amountIn = 4 [ + (gogoproto.moretags) = "yaml:\"amountIn\"", + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.nullable) = false, + (gogoproto.jsontag) = "amountIn" + ]; + string exitLimitPrice = 5 [ + (gogoproto.moretags) = "yaml:\"exitLimitPrice\"", + (gogoproto.customtype) = "github.com/neutron-org/neutron/utils/math.PrecDec", + (gogoproto.nullable) = false, + (gogoproto.jsontag) = "exitLimitPrice" + ]; + // If pickBestRoute == true then all routes are run and the route with the best price is chosen + // otherwise, the first succesful route is used. + bool pickBestRoute = 6; +} + +message MsgMultiHopSwapResponse { + cosmos.base.v1beta1.Coin coinOut = 1 [ + (gogoproto.nullable) = false, + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Coin", + (gogoproto.jsontag) = "coinOut" + ]; +} + +// this line is used by starport scaffolding # proto/tx/message diff --git a/proto/neutron/epochs/genesis.proto b/proto/neutron/epochs/genesis.proto new file mode 100644 index 000000000..97bc08221 --- /dev/null +++ b/proto/neutron/epochs/genesis.proto @@ -0,0 +1,72 @@ +syntax = "proto3"; +package duality.epochs; + +import "gogoproto/gogo.proto"; +import "google/protobuf/duration.proto"; +import "google/protobuf/timestamp.proto"; + +option go_package = "github.com/neutron-org/neutron/x/epochs/types"; + +// EpochInfo is a struct that describes the data going into +// a timer defined by the x/epochs module. +message EpochInfo { + // identifier is a unique reference to this particular timer. + string identifier = 1; + // start_time is the time at which the timer first ever ticks. + // If start_time is in the future, the epoch will not begin until the start + // time. + google.protobuf.Timestamp start_time = 2 [ + (gogoproto.stdtime) = true, + (gogoproto.nullable) = false, + (gogoproto.moretags) = "yaml:\"start_time\"" + ]; + // duration is the time in between epoch ticks. + // In order for intended behavior to be met, duration should + // be greater than the chains expected block time. + // Duration must be non-zero. + google.protobuf.Duration duration = 3 [ + (gogoproto.nullable) = false, + (gogoproto.stdduration) = true, + (gogoproto.jsontag) = "duration,omitempty", + (gogoproto.moretags) = "yaml:\"duration\"" + ]; + // current_epoch is the current epoch number, or in other words, + // how many times has the timer 'ticked'. + // The first tick (current_epoch=1) is defined as + // the first block whose blocktime is greater than the EpochInfo start_time. + int64 current_epoch = 4; + // current_epoch_start_time describes the start time of the current timer + // interval. The interval is (current_epoch_start_time, + // current_epoch_start_time + duration] When the timer ticks, this is set to + // current_epoch_start_time = last_epoch_start_time + duration only one timer + // tick for a given identifier can occur per block. + // + // NOTE! The current_epoch_start_time may diverge significantly from the + // wall-clock time the epoch began at. Wall-clock time of epoch start may be + // >> current_epoch_start_time. Suppose current_epoch_start_time = 10, + // duration = 5. Suppose the chain goes offline at t=14, and comes back online + // at t=30, and produces blocks at every successive time. (t=31, 32, etc.) + // * The t=30 block will start the epoch for (10, 15] + // * The t=31 block will start the epoch for (15, 20] + // * The t=32 block will start the epoch for (20, 25] + // * The t=33 block will start the epoch for (25, 30] + // * The t=34 block will start the epoch for (30, 35] + // * The **t=36** block will start the epoch for (35, 40] + google.protobuf.Timestamp current_epoch_start_time = 5 [ + (gogoproto.stdtime) = true, + (gogoproto.nullable) = false, + (gogoproto.moretags) = "yaml:\"current_epoch_start_time\"" + ]; + // epoch_counting_started is a boolean, that indicates whether this + // epoch timer has began yet. + bool epoch_counting_started = 6; + reserved 7; + // current_epoch_start_height is the block height at which the current epoch + // started. (The block height at which the timer last ticked) + int64 current_epoch_start_height = 8; +} + +// GenesisState defines the epochs module's genesis state. +message GenesisState { + repeated EpochInfo epochs = 1 [ (gogoproto.nullable) = false ]; +} diff --git a/proto/neutron/epochs/query.proto b/proto/neutron/epochs/query.proto new file mode 100644 index 000000000..cb9a8c3c7 --- /dev/null +++ b/proto/neutron/epochs/query.proto @@ -0,0 +1,30 @@ +syntax = "proto3"; +package duality.epochs; + +import "gogoproto/gogo.proto"; +import "google/api/annotations.proto"; +import "cosmos/base/query/v1beta1/pagination.proto"; +import "duality/epochs/genesis.proto"; + +option go_package = "github.com/neutron-org/neutron/x/epochs/types"; + +// Query defines the gRPC querier service. +service Query { + // EpochInfos provide running epochInfos + rpc EpochInfos(QueryEpochsInfoRequest) returns (QueryEpochsInfoResponse) { + option (google.api.http).get = "/duality/epochs/epochs"; + } + // CurrentEpoch provide current epoch of specified identifier + rpc CurrentEpoch(QueryCurrentEpochRequest) + returns (QueryCurrentEpochResponse) { + option (google.api.http).get = "/duality/epochs/current_epoch"; + } +} + +message QueryEpochsInfoRequest {} +message QueryEpochsInfoResponse { + repeated EpochInfo epochs = 1 [ (gogoproto.nullable) = false ]; +} + +message QueryCurrentEpochRequest { string identifier = 1; } +message QueryCurrentEpochResponse { int64 current_epoch = 1; } \ No newline at end of file diff --git a/proto/neutron/incentives/account_history.proto b/proto/neutron/incentives/account_history.proto new file mode 100644 index 000000000..bd0866436 --- /dev/null +++ b/proto/neutron/incentives/account_history.proto @@ -0,0 +1,19 @@ +syntax = "proto3"; +package duality.incentives; + +import "gogoproto/gogo.proto"; +import "cosmos/base/v1beta1/coin.proto"; + +option go_package = "github.com/neutron-org/neutron/x/incentives/types"; + +// Describes the total distributions to an account over time +message AccountHistory { + // the address of this account + string account = 1; + + // coins describes the total amount of coins that have been distributed to this user over time + repeated cosmos.base.v1beta1.Coin coins = 2 [ + (gogoproto.nullable) = false, + (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" + ]; +} diff --git a/proto/neutron/incentives/gauge.proto b/proto/neutron/incentives/gauge.proto new file mode 100644 index 000000000..bb5a4714e --- /dev/null +++ b/proto/neutron/incentives/gauge.proto @@ -0,0 +1,115 @@ +syntax = "proto3"; +package duality.incentives; + +import "gogoproto/gogo.proto"; +import "google/protobuf/duration.proto"; +import "google/protobuf/timestamp.proto"; +import "cosmos/base/v1beta1/coin.proto"; +import "duality/dex/pair_id.proto"; + +option go_package = "github.com/neutron-org/neutron/x/incentives/types"; + +// Gauge is an object that describes an LP incentivization plan and its state. +message Gauge { + // id is the unique ID of a Gauge + uint64 id = 1; + + // There are two kinds of gauges: perpetual and non-perpetual. Perpetual + // gauges describe an incentivization program for which the token rewards + // distributed on any given day must be added to the gauge prior to that day's + // distribution using an AddToGauge message. When distribute is called on a + // perpetual gauge, all of the remaining rewards in the gauge are distributed. + // Because of this, all perpetual gauges must have `num_epochs_paid_over` set + // to 1. A non-perpetual gauge by contrast distributes its rewards over a + // schedule as determined by `num_epochs_paid_over`. If a non-perpetual gauge + // is created with coins=[100atom] and num_epochs_paid_over=10, this means + // that for 10 days (10 epochs) the gauge will distribute 10atom each day to + // the staked LP positions qualifying for the gauge. + bool is_perpetual = 2; + + // distribute_to describes a set of staked LP positions that should be + // distributed to from this gauge. + QueryCondition distribute_to = 3 + [ (gogoproto.nullable) = false ]; + + // coins describes the total amount of coins that have been added to this + // gauge for distribution. + repeated cosmos.base.v1beta1.Coin coins = 4 [ + (gogoproto.nullable) = false, + (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" + ]; + + // start_time describes when this gauge should begin distributing rewards. + // This allows gauge creators to schedule gauges into the future, in the event + // that an earlier gauge is expected to expire. + google.protobuf.Timestamp start_time = 5 [ + (gogoproto.stdtime) = true, + (gogoproto.nullable) = false, + (gogoproto.moretags) = "yaml:\"start_time\"" + ]; + + // num_epochs_paid_over is the number of total epochs (days) the rewards in + // this gauge will be distributed over. + uint64 num_epochs_paid_over = 6; + + // filled_epochs describes the number of epochs distribution have been completed + // already + uint64 filled_epochs = 7; + + // distributed_coins describes coins that have been distributed already from + // this gauge. + repeated cosmos.base.v1beta1.Coin distributed_coins = 8 [ + (gogoproto.nullable) = false, + (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" + ]; + + // pricing_tick is necessary for fairly distributing rewards over a range of + // ticks. Without pricing_tick, we might naively distribute rewards in + // proportion to the number of deposit shares staked within the gauge's + // qualifying tick range. + // + // For example, a gauge with a distribute_to tick range of [-10, 10] would + // distribute to staked LP tokens where both tick-fee and tick+fee are within + // [-10, 10]. Let's say for pair "tokenA<>tokenB", the current trading tick is + // 0. If Alice were to LP (10tokenA, 0tokenB) @ tick -8, fee 2, this would + // mean Alice would be issued 10 shares (10 + 0 * 1.0001^-8), since shares are + // in terms of token0. Let's further assume Bob LPs (0tokenA, 10tokenB) @ tick + // 8, fee 2, such that Bob is issued 10.008 shares (0 + 10 * 1.0001^8). Under + // this naive approach, if Alice and Bob were to stake their shares, Bob would + // receive more in rewards, purely on the basis of the relative locations of + // their liquidity. + // + // This disparity originates in the fact that LP deposit denominations are not + // fungible across ticks. To avoid this, we can use a single price throughout + // the gauge's tick range for relating the relative value of token0 and + // token1, as specified by pricing_tick. + // + // Let's run through the earier example using the more sophisticated approach, + // where the gauge has pricing_tick set to 0. For the purpose of calculating + // reward distribution weight, Alice's shares are worth 10 + 0 * 1.0001^0 = 10 + // and Bob's shares are worth 0 + 10 * 1.0001^0 = 10. With the distribution + // weight of both shares set according to a gauge-specific tick, we do not + // distribute more or less rewards according to the relative location of + // liquidity within the gauge's tick range, freeing users to place liquidity + // whereever they deem most profitable in the gauge's range and still equally + // qualify for rewards. + int64 pricing_tick = 9; +} + +// QueryCondition describes a set of staked LP positions that a gauge is +// configured to distribute to. LP tokens qualifying for a given QueryCondition +// must have both tick-fee and tick+fee fall within the range [startTick, endTick], +// such that all of the tradable liquidity for the pool is within that range. +message QueryCondition { + + // pairID is the token pair which should be distributed to. + duality.dex.PairID pairID = 1; + + // start_tick is the inclusive lower bound on the location of LP tokens that + // qualify for a gauge's distribution. + int64 startTick = 2; + + // end_tick is the inclusive upper bound on the location of LP tokens that + // qualify for a gauge's distribution. + int64 endTick = 3; +} \ No newline at end of file diff --git a/proto/neutron/incentives/genesis.proto b/proto/neutron/incentives/genesis.proto new file mode 100644 index 000000000..dfbf299a3 --- /dev/null +++ b/proto/neutron/incentives/genesis.proto @@ -0,0 +1,26 @@ +syntax = "proto3"; +package duality.incentives; + +import "gogoproto/gogo.proto"; +import "duality/incentives/params.proto"; +import "duality/incentives/gauge.proto"; +import "duality/incentives/stake.proto"; +import "duality/incentives/account_history.proto"; + +option go_package = "github.com/neutron-org/neutron/x/incentives/types"; + +// GenesisState defines the incentives module's various parameters when first +// initialized +message GenesisState { + // params are all the parameters of the module + Params params = 1 [ (gogoproto.nullable) = false ]; + // gauges are all gauges that should exist at genesis + repeated Gauge gauges = 2; + // last_gauge_id is what the gauge number will increment from when creating + // the next gauge after genesis + uint64 last_gauge_id = 3; + + uint64 last_stake_id = 4; + repeated Stake stakes = 5; + repeated AccountHistory accountHistories = 6; +} diff --git a/proto/neutron/incentives/params.proto b/proto/neutron/incentives/params.proto new file mode 100644 index 000000000..25311f0f9 --- /dev/null +++ b/proto/neutron/incentives/params.proto @@ -0,0 +1,17 @@ +syntax = "proto3"; +package duality.incentives; + +import "gogoproto/gogo.proto"; + +option go_package = "github.com/neutron-org/neutron/x/incentives/types"; + +// Params holds parameters for the incentives module +message Params { + // distr_epoch_identifier is what epoch type distribution will be triggered by + // (day, week, etc.) + string distr_epoch_identifier = 1 + [ (gogoproto.moretags) = "yaml:\"distr_epoch_identifier\"" ]; + + uint64 max_gauges = 2 + [ (gogoproto.moretags) = "yaml:\"max_gauges\"" ]; +} diff --git a/proto/neutron/incentives/query.proto b/proto/neutron/incentives/query.proto new file mode 100644 index 000000000..4cb3875a3 --- /dev/null +++ b/proto/neutron/incentives/query.proto @@ -0,0 +1,161 @@ +syntax = "proto3"; +package duality.incentives; + +import "gogoproto/gogo.proto"; +import "google/api/annotations.proto"; +import "cosmos/base/v1beta1/coin.proto"; +import "cosmos/base/query/v1beta1/pagination.proto"; +import "duality/incentives/gauge.proto"; +import "duality/incentives/stake.proto"; +import "duality/incentives/params.proto"; + +option go_package = "github.com/neutron-org/neutron/x/incentives/types"; + +// Query defines the gRPC querier service +service Query { + // GetModuleStatus returns a rundown of coins in the module and their status + rpc GetModuleStatus(GetModuleStatusRequest) + returns (GetModuleStatusResponse) { + option (google.api.http).get = + "/duality/incentives/v1beta1/module_status"; + } + + // GetGaugeByID returns a gauge by its ID + rpc GetGaugeByID(GetGaugeByIDRequest) returns (GetGaugeByIDResponse) { + option (google.api.http).get = + "/duality/incentives/v1beta1/gauges/{id}"; + } + + // GetGauges returns gauges according to the filter provided + rpc GetGauges(GetGaugesRequest) returns (GetGaugesResponse) { + option (google.api.http).get = "/duality/incentives/v1beta1/gauges"; + } + + // GetStakeByID returns a stake by its ID + rpc GetStakeByID(GetStakeByIDRequest) returns (GetStakeByIDResponse) { + option (google.api.http).get = + "/duality/incentives/stakes/{stake_id}"; + } + + // GetStakes returns stakes by the filter provided. At least one filter must be provided. + rpc GetStakes(GetStakesRequest) returns (GetStakesResponse) { + option (google.api.http).get = + "/duality/incentives/stakes"; + } + + // GetFutureRewardsEstimate returns an estimate of the rewards from now until a specified + // time in the future. The requestor either provides an address or a set of locks + // for which they want to find the associated rewards. + rpc GetFutureRewardEstimate(GetFutureRewardEstimateRequest) returns (GetFutureRewardEstimateResponse) { + option (google.api.http).get = + "/duality/incentives/v1beta1/future_rewards_estimate/{owner}"; + } + + // GetAccountHistory returns the total accumulated rewards per denom for a given user. + rpc GetAccountHistory(GetAccountHistoryRequest) returns (GetAccountHistoryResponse) { + option (google.api.http).get = + "/duality/incentives/v1beta1/account_history/{account}"; + } + + // Returns the total amount of value currently qualifying for the gauge. This is useful for calculating + // the prospective future rewards of staking. + rpc GetGaugeQualifyingValue(GetGaugeQualifyingValueRequest) returns (GetGaugeQualifyingValueResponse) { + option (google.api.http).get = + "/duality/incentives/v1beta1/get_gauge_qualifying_value/{id}"; + } +} + +message GetModuleStatusRequest {} +message GetModuleStatusResponse { + // Coins that have yet to be distributed + repeated cosmos.base.v1beta1.Coin reward_coins = 1 [ + (gogoproto.nullable) = false, + (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" + ]; + repeated cosmos.base.v1beta1.Coin staked_coins = 2 [ + (gogoproto.nullable) = false, + (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" + ]; + Params params = 3 [ (gogoproto.nullable) = false ]; +} + +message GetGaugeByIDRequest { + // Gague ID being queried + uint64 id = 1; +} +message GetGaugeByIDResponse { + // Gauge that corresponds to provided gague ID + Gauge gauge = 1; +} + +message GetGaugeQualifyingValueRequest { + // Gague ID being queried + uint64 id = 1; +} +message GetGaugeQualifyingValueResponse { + // The amount of value at the gauge's pricing tick currently qualifying for the gauge. + uint64 qualifying_value = 1; +} + +enum GaugeStatus { + ACTIVE_UPCOMING = 0; + ACTIVE = 1; + UPCOMING = 2; + FINISHED = 3; +} + +message GetGaugesRequest { + // Pagination defines pagination for the request + + GaugeStatus status = 1; + string denom = 2; +} +message GetGaugesResponse { + // Upcoming and active gauges + repeated Gauge gauges = 1; +} + +message GetStakeByIDRequest { + uint64 stake_id = 1; +}; +message GetStakeByIDResponse { + Stake stake = 1; +}; + +message GetStakesRequest { + string owner = 1 [ (gogoproto.moretags) = "yaml:\"owner\"" ]; +}; + +message GetStakesResponse { + repeated Stake stakes = 1; +}; + +message GetFutureRewardEstimateRequest { + // Address that is being queried for future estimated rewards + string owner = 1 [ (gogoproto.moretags) = "yaml:\"owner\"" ]; + // Stake IDs included in future reward estimation + repeated uint64 stake_ids = 2; + // Determines upper time limit of reward estimation + // reward estimation goes up to current_epoch + num_epochs + int64 num_epochs = 3; +} +message GetFutureRewardEstimateResponse { + // Estimated coin rewards that will be recieved at provided address + // from specified locks between current time and end epoch + repeated cosmos.base.v1beta1.Coin coins = 1 [ + (gogoproto.nullable) = false, + (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" + ]; +} + +message GetAccountHistoryRequest { + // Address that is being queried for account history + string account = 1 [ (gogoproto.moretags) = "yaml:\"account\"" ]; +} +message GetAccountHistoryResponse { + // Gauge rewards that have been distributed to this address to date + repeated cosmos.base.v1beta1.Coin coins = 1 [ + (gogoproto.nullable) = false, + (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" + ]; +} diff --git a/proto/neutron/incentives/stake.proto b/proto/neutron/incentives/stake.proto new file mode 100644 index 000000000..16e26fde2 --- /dev/null +++ b/proto/neutron/incentives/stake.proto @@ -0,0 +1,41 @@ +syntax = "proto3"; +package duality.incentives; + +import "gogoproto/gogo.proto"; +import "google/protobuf/timestamp.proto"; +import "cosmos/base/v1beta1/coin.proto"; + +option go_package = "github.com/neutron-org/neutron/x/incentives/types"; + +// Stake records what coins are staked when by who for the purpose of +// calculating gauge reward distributions. +message Stake { + + // ID is the "autoincrementing" id of the stake, assigned at creation. + uint64 ID = 1; + + // owner is the account originating the stake. Only the owner can withdraw + // coins from the stake. + string owner = 2 [ (gogoproto.moretags) = "yaml:\"owner\"" ]; + + // start_time is the time at which the coins in the lock were staked. + google.protobuf.Timestamp start_time = 3 [ + (gogoproto.stdtime) = true, + (gogoproto.nullable) = false, + (gogoproto.jsontag) = "start_time,omitempty", + (gogoproto.moretags) = "yaml:\"start_time\"" + ]; + + // coins are the tokens staked, and managed by the module account. + repeated cosmos.base.v1beta1.Coin coins = 4 [ + (gogoproto.nullable) = false, + (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" + ]; + + // start_dist_epoch is the dist epoch (defaulting to the day) at which the + // coins in the lock were staked. This is used by distribution logic to filter + // on stakes that have existed for longer than the distribution period (you + // can only qualify for today's rewards if you staked your LP tokens + // yesterday). We use int64 instead of uint64 to make testing easier. + int64 start_dist_epoch = 5; +} \ No newline at end of file diff --git a/proto/neutron/incentives/tx.proto b/proto/neutron/incentives/tx.proto new file mode 100644 index 000000000..50f38c892 --- /dev/null +++ b/proto/neutron/incentives/tx.proto @@ -0,0 +1,96 @@ +syntax = "proto3"; +package duality.incentives; + +import "gogoproto/gogo.proto"; +import "google/protobuf/timestamp.proto"; +import "cosmos/base/v1beta1/coin.proto"; +import "duality/incentives/gauge.proto"; +import "duality/incentives/stake.proto"; +import "google/protobuf/duration.proto"; + +option go_package = "github.com/neutron-org/neutron/x/incentives/types"; + +service Msg { + // Create an incentive program + rpc CreateGauge(MsgCreateGauge) returns (MsgCreateGaugeResponse); + // Add rewards to an existing incentives program + rpc AddToGauge(MsgAddToGauge) returns (MsgAddToGaugeResponse); + // Deposit LP tokens to the module, qualifying for rewards from gauges + rpc Stake(MsgStake) returns (MsgStakeResponse); + // Withdraw LP tokens from the module, forfeiting future rewards from gauges + rpc Unstake(MsgUnstake) returns (MsgUnstakeResponse); +} + +// MsgCreateGauge creates a gague to distribute rewards to users +message MsgCreateGauge { + // is_perpetual shows if it's a perpetual or non-perpetual gauge + // Non-perpetual gauges distribute their tokens equally per epoch while the + // gauge is in the active period. Perpetual gauges distribute all their tokens + // at a single time and only distribute their tokens again once the gauge is + // refilled + bool is_perpetual = 1; + + // owner is the address of gauge creator, should be the module authority + string owner = 2 [ (gogoproto.moretags) = "yaml:\"owner\"" ]; + + // distribute_to show which lock the gauge should distribute to by time + // duration or by timestamp + QueryCondition distribute_to = 3 + [ (gogoproto.nullable) = false ]; + // coins are coin(s) to be distributed by the gauge + repeated cosmos.base.v1beta1.Coin coins = 4 [ + (gogoproto.nullable) = false, + (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" + ]; + // start_time is the distribution start time + google.protobuf.Timestamp start_time = 5 [ + (gogoproto.stdtime) = true, + (gogoproto.nullable) = false, + (gogoproto.moretags) = "yaml:\"timestamp\"" + ]; + // num_epochs_paid_over is the number of epochs distribution will be completed + // over + uint64 num_epochs_paid_over = 6; + + // pricing_tick is the price that liquidity within the gauge range will be priced at + int64 pricing_tick = 7; +} +message MsgCreateGaugeResponse {} + +// MsgAddToGauge adds coins to a previously created gauge +message MsgAddToGauge { + // owner is the gauge owner's address + string owner = 1 [ (gogoproto.moretags) = "yaml:\"owner\"" ]; + // gauge_id is the ID of gauge that rewards are getting added to + uint64 gauge_id = 2; + // rewards are the coin(s) to add to gauge + repeated cosmos.base.v1beta1.Coin rewards = 3 [ + (gogoproto.nullable) = false, + (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" + ]; +} +message MsgAddToGaugeResponse {} + +message MsgStake { + string owner = 1 [ (gogoproto.moretags) = "yaml:\"owner\"" ]; + repeated cosmos.base.v1beta1.Coin coins = 2 [ + (gogoproto.nullable) = false, + (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" + ]; +} +message MsgStakeResponse { uint64 ID = 1; } + +message MsgUnstake { + message UnstakeDescriptor { + uint64 ID = 1; + repeated cosmos.base.v1beta1.Coin coins = 2 [ + (gogoproto.nullable) = false, + (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" + ]; + } + string owner = 1 [ (gogoproto.moretags) = "yaml:\"owner\"" ]; + + // If unstake is left empty, this is interpreted as "unstake all" + repeated UnstakeDescriptor unstakes = 2; +} +message MsgUnstakeResponse {} \ No newline at end of file diff --git a/tests/ibc/gmp_swap_forward_test.go b/tests/ibc/gmp_swap_forward_test.go new file mode 100644 index 000000000..023c957a5 --- /dev/null +++ b/tests/ibc/gmp_swap_forward_test.go @@ -0,0 +1,117 @@ +package ibc_test + +import ( + "encoding/json" + "time" + + sdk "github.com/cosmos/cosmos-sdk/types" + forwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router/types" + transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" + "github.com/duality-labs/duality/x/dex/types" + "github.com/duality-labs/duality/x/gmp" + swaptypes "github.com/duality-labs/duality/x/ibcswap/types" +) + +// TestSwapAndForward_Success asserts that the swap and forward middleware stack works as intended with Duality running as a +// consumer chain connected to two other chains via IBC. +func (s *IBCTestSuite) TestGMPSwapAndForward_Success() { + // Send an IBC transfer from provider to Duality, so we can initialize a pool with the IBC denom token + native Duality token + s.IBCTransferProviderToDuality(s.providerAddr, s.dualityAddr, nativeDenom, ibcTransferAmount, "") + + // Assert that the funds are gone from the acc on provider and present in the acc on Duality + newProviderBalNative := genesisWalletAmount.Sub(ibcTransferAmount) + s.assertProviderBalance(s.providerAddr, nativeDenom, newProviderBalNative) + + s.assertDualityBalance(s.dualityAddr, s.providerToDualityDenom, ibcTransferAmount) + + // deposit stake<>ibcTransferToken to initialize the pool on Duality + depositAmount := sdk.NewInt(100_000) + s.dualityDeposit( + nativeDenom, + s.providerToDualityDenom, + depositAmount, + depositAmount, + 0, + 1, + s.dualityAddr) + + // Compose the IBC transfer memo metadata to be used in the swap and forward + swapAmount := sdk.NewInt(100000) + expectedAmountOut := sdk.NewInt(99990) + chainBAddr := s.bundleB.Chain.SenderAccount.GetAddress() + + retries := uint8(0) + forwardMetadata := forwardtypes.PacketMetadata{ + Forward: &forwardtypes.ForwardMetadata{ + Receiver: chainBAddr.String(), + Port: s.dualityChainBPath.EndpointA.ChannelConfig.PortID, + Channel: s.dualityChainBPath.EndpointA.ChannelID, + Timeout: forwardtypes.Duration(5 * time.Minute), + Retries: &retries, + Next: nil, + }, + } + + forwardBz, err := json.Marshal(forwardMetadata) + s.Require().NoError(err) + + forwardNextJSON := new(swaptypes.JSONObject) + err = json.Unmarshal(forwardBz, forwardNextJSON) + s.Require().NoError(err) + + swapMetadata := swaptypes.PacketMetadata{ + Swap: &swaptypes.SwapMetadata{ + MsgPlaceLimitOrder: &types.MsgPlaceLimitOrder{ + Creator: s.dualityAddr.String(), + Receiver: s.dualityAddr.String(), + TokenIn: s.providerToDualityDenom, + TokenOut: nativeDenom, + AmountIn: swapAmount, + TickIndexInToOut: 2, + OrderType: types.LimitOrderType_FILL_OR_KILL, + }, + Next: forwardNextJSON, + }, + } + swapMetadataBz, err := json.Marshal(swapMetadata) + + s.Require().NoError(err) + + gmpMetadata := gmp.Message{ + SourceChain: "axelar", + SourceAddress: "alice", + Payload: swapMetadataBz, + Type: gmp.TypeGeneralMessageWithToken, + } + + gmpMetadataBz, err := json.Marshal(gmpMetadata) + s.Require().NoError(err) + + // Send an IBC transfer from chainA to chainB with packet memo containing the swap metadata + + s.IBCTransferProviderToDuality(s.providerAddr, s.dualityAddr, nativeDenom, ibcTransferAmount, string(gmpMetadataBz)) + + // Relay the packet + err = s.RelayAllPacketsAToB(s.dualityChainBPath) + s.Assert().NoError(err) + + // Check that the funds are moved out of the acc on providerChain + s.assertProviderBalance(s.providerAddr, nativeDenom, newProviderBalNative.Sub(ibcTransferAmount)) + + // Check that the amountIn is deduced from the duality account + s.assertDualityBalance(s.dualityAddr, s.providerToDualityDenom, sdk.ZeroInt()) + // Check that duality account did not keep any of the transfer denom + s.assertDualityBalance(s.dualityAddr, nativeDenom, genesisWalletAmount.Sub(swapAmount)) + + transferDenomPath := transfertypes.GetPrefixedDenom( + transfertypes.PortID, + s.dualityChainBPath.EndpointA.ChannelID, + nativeDenom, + ) + transferDenomDuality_B := transfertypes.ParseDenomTrace(transferDenomPath).IBCDenom() + + // Check that the funds are now present in the acc on chainB + s.assertChainBBalance(chainBAddr, transferDenomDuality_B, expectedAmountOut) + + s.Assert().NoError(err) +} diff --git a/tests/ibc/ibc_setup_test.go b/tests/ibc/ibc_setup_test.go new file mode 100644 index 000000000..98b50c608 --- /dev/null +++ b/tests/ibc/ibc_setup_test.go @@ -0,0 +1,392 @@ +package ibc_test + +import ( + "encoding/json" + "fmt" + "testing" + + sdk "github.com/cosmos/cosmos-sdk/types" + transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" + clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" + channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" + + ibctesting "github.com/cosmos/ibc-go/v7/testing" + icsibctesting "github.com/cosmos/interchain-security/v3/legacy_ibc_testing/testing" + + dbm "github.com/cometbft/cometbft-db" + "github.com/cometbft/cometbft/libs/log" + icstestingutils "github.com/cosmos/interchain-security/v3/testutil/ibc_testing" + testutil "github.com/cosmos/interchain-security/v3/testutil/integration" + ccvconsumertypes "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types" + ccv "github.com/cosmos/interchain-security/v3/x/ccv/types" + appduality "github.com/duality-labs/duality/app" + dextypes "github.com/duality-labs/duality/x/dex/types" + "github.com/stretchr/testify/suite" +) + +var ( + nativeDenom = sdk.DefaultBondDenom + ibcTransferAmount = sdk.NewInt(100_000) + genesisWalletAmount, _ = sdk.NewIntFromString("10000000000000000000") +) + +type IBCTestSuite struct { + suite.Suite + + coordinator *icsibctesting.Coordinator + providerChain *icsibctesting.TestChain + providerApp testutil.ProviderApp + dualityChain *icsibctesting.TestChain // aka chainA + dualityApp testutil.ConsumerApp + bundleB *icstestingutils.ConsumerBundle + bundleC *icstestingutils.ConsumerBundle + + dualityCCVPath *icsibctesting.Path + dualityTransferPath *icsibctesting.Path + dualityChainBPath *icsibctesting.Path + chainBChainCPath *icsibctesting.Path + + providerAddr sdk.AccAddress + dualityAddr sdk.AccAddress + providerToDualityDenom string +} + +func TestIBCTestSuite(t *testing.T) { + suite.Run(t, new(IBCTestSuite)) +} + +func (s *IBCTestSuite) SetupTest() { + // Create coordinator + s.coordinator = icsibctesting.NewCoordinator(s.T(), 0) + s.providerChain, s.providerApp = icstestingutils.AddProvider[testutil.ProviderApp]( + s.T(), + s.coordinator, + icstestingutils.ProviderAppIniter, + ) + + // Setup duality as a consumer chain + dualityBundle := s.addConsumerChain(dualityAppIniter, 1) + s.dualityChain = dualityBundle.Chain + s.dualityApp = dualityBundle.App + s.dualityCCVPath = dualityBundle.Path + s.dualityTransferPath = dualityBundle.TransferPath + + // Setup consumer chainB + // NOTE: using dualityAppIniter otherwise the consumer chain doesn't have the packetForwarding middleware + s.bundleB = s.addConsumerChain(dualityAppIniter, 2) + // Setup consumer chainC + s.bundleC = s.addConsumerChain(icstestingutils.ConsumerAppIniter, 3) + + // setup transfer channel between duality and consumerChainB + s.dualityChainBPath = s.setupConsumerToConsumerTransferChannel(dualityBundle, s.bundleB) + + // setup transfer channel between consumerChainB and consumerChainC + s.chainBChainCPath = s.setupConsumerToConsumerTransferChannel(s.bundleB, s.bundleC) + + // Store ibc transfer denom for providerChain=>duality for test convenience + fullTransferDenomPath := transfertypes.GetPrefixedDenom( + transfertypes.PortID, + s.dualityTransferPath.EndpointB.ChannelID, + nativeDenom, + ) + transferDenom := transfertypes.ParseDenomTrace(fullTransferDenomPath).IBCDenom() + s.providerToDualityDenom = transferDenom + + // Store default addresses from duality and provider chain for test convenience + s.providerAddr = s.providerChain.SenderAccount.GetAddress() + s.dualityAddr = s.dualityChain.SenderAccount.GetAddress() + + // ensure genesis balances are as expected + s.assertDualityBalance(s.dualityAddr, nativeDenom, genesisWalletAmount) + s.assertProviderBalance(s.providerAddr, nativeDenom, genesisWalletAmount) +} + +func (s *IBCTestSuite) addConsumerChain( + appIniter icsibctesting.AppIniter, + chainIdx int, +) *icstestingutils.ConsumerBundle { + bundle := icstestingutils.AddConsumer[testutil.ProviderApp, testutil.ConsumerApp]( + s.coordinator, + &s.Suite, + chainIdx, + appIniter, + ) + providerKeeper := s.providerApp.GetProviderKeeper() + consumerKeeper := bundle.GetKeeper() + genesisState, found := providerKeeper.GetConsumerGenesis( + s.providerCtx(), + bundle.Chain.ChainID, + ) + s.Require().True(found, "consumer genesis not found") + consumerKeeper.InitGenesis(bundle.GetCtx(), &genesisState) + bundle.Path = s.setupCCVChannel(bundle) + bundle.TransferPath = s.setupTransferChannel( + bundle.Path, + bundle.App, + bundle.Chain, + s.providerChain, + ) + + return bundle +} + +func (s *IBCTestSuite) setupCCVChannel(bundle *icstestingutils.ConsumerBundle) *icsibctesting.Path { + ccvPath := icsibctesting.NewPath(bundle.Chain, s.providerChain) + + providerKeeper := s.providerApp.GetProviderKeeper() + dualityKeeper := bundle.GetKeeper() + + providerEndpointClientID, found := providerKeeper.GetConsumerClientId( + s.providerCtx(), + bundle.Chain.ChainID, + ) + s.Require().True(found, "provider endpoint clientID not found") + ccvPath.EndpointB.ClientID = providerEndpointClientID + + consumerEndpointClientID, found := dualityKeeper.GetProviderClientID(bundle.GetCtx()) + s.Require().True(found, "consumer endpoint clientID not found") + ccvPath.EndpointA.ClientID = consumerEndpointClientID + + ccvPath.EndpointA.ChannelConfig.PortID = ccv.ConsumerPortID + ccvPath.EndpointB.ChannelConfig.PortID = ccv.ProviderPortID + ccvPath.EndpointA.ChannelConfig.Version = ccv.Version + ccvPath.EndpointB.ChannelConfig.Version = ccv.Version + ccvPath.EndpointA.ChannelConfig.Order = channeltypes.ORDERED + ccvPath.EndpointB.ChannelConfig.Order = channeltypes.ORDERED + + // Create ccv connection + s.coordinator.CreateConnections(ccvPath) + + // create ccv channel + s.coordinator.CreateChannels(ccvPath) + + return ccvPath +} + +func (s *IBCTestSuite) setupConsumerToConsumerTransferChannel( + bundleA, bundleB *icstestingutils.ConsumerBundle, +) *icsibctesting.Path { + path := icsibctesting.NewPath(bundleA.Chain, bundleB.Chain) + + // Set the correct client unbonding period + clientConfig := icsibctesting.NewTendermintConfig() + clientConfig.UnbondingPeriod = ccvconsumertypes.DefaultConsumerUnbondingPeriod + path.EndpointA.ClientConfig = clientConfig + path.EndpointB.ClientConfig = clientConfig + + path.EndpointA.ChannelConfig.PortID = "transfer" + path.EndpointB.ChannelConfig.PortID = "transfer" + path.EndpointA.ChannelConfig.Version = transfertypes.Version + path.EndpointB.ChannelConfig.Version = transfertypes.Version + + s.coordinator.Setup(path) + + return path +} + +func (s *IBCTestSuite) setupTransferChannel( + ccvPath *icsibctesting.Path, + appA testutil.ConsumerApp, + chainA, chainB *icsibctesting.TestChain, +) *icsibctesting.Path { + // transfer path will use the same connection as ibc path + transferPath := icsibctesting.NewPath(chainA, chainB) + transferPath.EndpointA.ChannelConfig.PortID = transfertypes.PortID + transferPath.EndpointB.ChannelConfig.PortID = transfertypes.PortID + transferPath.EndpointA.ChannelConfig.Version = transfertypes.Version + transferPath.EndpointB.ChannelConfig.Version = transfertypes.Version + transferPath.EndpointA.ClientID = ccvPath.EndpointA.ClientID + transferPath.EndpointA.ConnectionID = ccvPath.EndpointA.ConnectionID + transferPath.EndpointB.ClientID = ccvPath.EndpointB.ClientID + transferPath.EndpointB.ConnectionID = ccvPath.EndpointB.ConnectionID + + // IBC channel handshake will automatically initiate transfer channel handshake on ACK + // so transfer channel will be on stage INIT when CompleteSetupIBCChannel returns + destinationChannelID := appA.GetConsumerKeeper(). + GetDistributionTransmissionChannel(chainA.GetContext()) + transferPath.EndpointA.ChannelID = destinationChannelID + + // Complete TRY, ACK, CONFIRM for transfer path + err := transferPath.EndpointB.ChanOpenTry() + s.Require().NoError(err) + + err = transferPath.EndpointA.ChanOpenAck() + s.Require().NoError(err) + + err = transferPath.EndpointB.ChanOpenConfirm() + s.Require().NoError(err) + + // ensure counterparty is up to date + err = transferPath.EndpointA.UpdateClient() + s.Require().NoError(err) + + return transferPath +} + +func dualityAppIniter() (icsibctesting.TestingApp, map[string]json.RawMessage) { + encoding := appduality.MakeEncodingConfig() + testApp := appduality.NewApp( + log.NewNopLogger(), + dbm.NewMemDB(), + nil, + true, + map[int64]bool{}, + appduality.DefaultNodeHome, + 5, + appduality.EmptyAppOptions{}, + encoding, + nil, + ) + + return testApp, appduality.NewDefaultGenesisState(testApp.AppCodec()) +} + +func (s *IBCTestSuite) providerCtx() sdk.Context { + return s.providerChain.GetContext() +} + +func (s *IBCTestSuite) dualityCtx() sdk.Context { + return s.dualityChain.GetContext() +} + +// Helper Methods ///////////////////////////////////////////////////////////// + +func (s *IBCTestSuite) IBCTransfer( + path *icsibctesting.Path, + sourceEndpoint *icsibctesting.Endpoint, + fromAddr sdk.AccAddress, + toAddr sdk.AccAddress, + transferDenom string, + transferAmount sdk.Int, + memo string, +) { + timeoutHeight := clienttypes.NewHeight(1, 110) + + // Create Transfer Msg + transferMsg := transfertypes.NewMsgTransfer(sourceEndpoint.ChannelConfig.PortID, + sourceEndpoint.ChannelID, + sdk.NewCoin(transferDenom, transferAmount), + fromAddr.String(), + toAddr.String(), + timeoutHeight, + 0, + memo, + ) + + // Send message from provider chain + res, err := sourceEndpoint.Chain.SendMsgs(transferMsg) + s.Assert().NoError(err) + + // Relay transfer msg to Duality chain + packet, err := ibctesting.ParsePacketFromEvents(res.GetEvents()) + s.Require().NoError(err) + + path.RelayPacket(packet) + s.Assert().NoError(err) +} + +func (s *IBCTestSuite) IBCTransferProviderToDuality( + providerAddr sdk.AccAddress, + dualityAddr sdk.AccAddress, + transferDenom string, + transferAmount sdk.Int, + memo string, +) { + s.IBCTransfer( + s.dualityTransferPath, + s.dualityTransferPath.EndpointB, + providerAddr, + dualityAddr, + transferDenom, + transferAmount, + memo, + ) +} + +func (s *IBCTestSuite) getBalance( + bk testutil.TestBankKeeper, + chain *icsibctesting.TestChain, + addr sdk.AccAddress, + denom string, +) sdk.Coin { + ctx := chain.GetContext() + return bk.GetBalance(ctx, addr, denom) +} + +func (s *IBCTestSuite) assertBalance( + bk testutil.TestBankKeeper, + chain *icsibctesting.TestChain, + addr sdk.AccAddress, + denom string, + expectedAmt sdk.Int, +) { + actualAmt := s.getBalance(bk, chain, addr, denom).Amount + s.Assert(). + Equal(expectedAmt, actualAmt, "Expected amount of %s: %s; Got: %s", denom, expectedAmt, actualAmt) +} + +func (s *IBCTestSuite) assertDualityBalance( + addr sdk.AccAddress, + denom string, + expectedAmt sdk.Int, +) { + s.assertBalance(s.dualityApp.GetTestBankKeeper(), s.dualityChain, addr, denom, expectedAmt) +} + +func (s *IBCTestSuite) assertProviderBalance( + addr sdk.AccAddress, + denom string, + expectedAmt sdk.Int, +) { + s.assertBalance(s.providerApp.GetTestBankKeeper(), s.providerChain, addr, denom, expectedAmt) +} + +func (s *IBCTestSuite) assertChainBBalance(addr sdk.AccAddress, denom string, expectedAmt sdk.Int) { + s.assertBalance(s.bundleB.App.GetTestBankKeeper(), s.bundleB.Chain, addr, denom, expectedAmt) +} + +func (s *IBCTestSuite) assertChainCBalance(addr sdk.AccAddress, denom string, expectedAmt sdk.Int) { + s.assertBalance(s.bundleC.App.GetTestBankKeeper(), s.bundleC.Chain, addr, denom, expectedAmt) +} + +func (s *IBCTestSuite) dualityDeposit( + token0 string, + token1 string, + depositAmount0 sdk.Int, + depositAmount1 sdk.Int, + tickIndex int64, + fee uint64, + creator sdk.AccAddress, +) { + // create deposit msg + msgDeposit := dextypes.NewMsgDeposit( + creator.String(), + creator.String(), + token0, + token1, + []sdk.Int{depositAmount0}, + []sdk.Int{depositAmount1}, + []int64{tickIndex}, + []uint64{fee}, + []*dextypes.DepositOptions{{false}}, + ) + + // execute deposit msg + _, err := s.dualityChain.SendMsgs(msgDeposit) + s.Assert().NoError(err, "Deposit Failed") +} + +func (s *IBCTestSuite) RelayAllPacketsAToB(path *icsibctesting.Path) error { + sentPackets := path.EndpointA.Chain.SentPackets + if len(sentPackets) == 0 { + return fmt.Errorf("No packets to send") + } + + for _, packet := range sentPackets { + err := path.RelayPacket(packet) + if err != nil { + return err + } + } + return nil +} diff --git a/tests/ibc/swap_forward_test.go b/tests/ibc/swap_forward_test.go new file mode 100644 index 000000000..522db1a72 --- /dev/null +++ b/tests/ibc/swap_forward_test.go @@ -0,0 +1,481 @@ +package ibc_test + +import ( + "encoding/json" + "time" + + sdk "github.com/cosmos/cosmos-sdk/types" + forwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router/types" + transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" + "github.com/duality-labs/duality/x/dex/types" + swaptypes "github.com/duality-labs/duality/x/ibcswap/types" + "github.com/iancoleman/orderedmap" + "golang.org/x/exp/maps" +) + +func (s *IBCTestSuite) TestSwapAndForward_Success() { + // Send an IBC transfer from provider chain to duality, so we can initialize a pool with the IBC denom token + native Duality token + s.IBCTransferProviderToDuality( + s.providerAddr, + s.dualityAddr, + nativeDenom, + ibcTransferAmount, + "", + ) + + // Assert that the funds are gone from the acc on provider and present in the acc on Duality + newProviderBalNative := genesisWalletAmount.Sub(ibcTransferAmount) + s.assertProviderBalance(s.providerAddr, nativeDenom, newProviderBalNative) + + s.assertDualityBalance(s.dualityAddr, s.providerToDualityDenom, ibcTransferAmount) + + // deposit stake<>ibcTransferToken to initialize the pool on Duality + depositAmount := sdk.NewInt(100_000) + s.dualityDeposit( + nativeDenom, + s.providerToDualityDenom, + depositAmount, + depositAmount, + 0, + 1, + s.dualityAddr) + + // Assert that the deposit was successful and the funds are moved out of the Duality user acc + s.assertDualityBalance(s.dualityAddr, s.providerToDualityDenom, sdk.ZeroInt()) + postDepositDualityBalNative := genesisWalletAmount.Sub(depositAmount) + s.assertDualityBalance(s.dualityAddr, nativeDenom, postDepositDualityBalNative) + + // Compose the IBC transfer memo metadata to be used in the swap and forward + swapAmount := sdk.NewInt(100000) + expectedAmountOut := sdk.NewInt(99990) + chainBAddr := s.bundleB.Chain.SenderAccount.GetAddress() + + retries := uint8(0) + + forwardMetadata := forwardtypes.PacketMetadata{ + Forward: &forwardtypes.ForwardMetadata{ + Receiver: chainBAddr.String(), + Port: s.dualityChainBPath.EndpointA.ChannelConfig.PortID, + Channel: s.dualityChainBPath.EndpointA.ChannelID, + Timeout: forwardtypes.Duration(5 * time.Minute), + Retries: &retries, + Next: nil, + }, + } + + bz, err := json.Marshal(forwardMetadata) + s.Assert().NoError(err) + + nextJSON := new(swaptypes.JSONObject) + err = json.Unmarshal(bz, nextJSON) + s.Assert().NoError(err) + + metadata := swaptypes.PacketMetadata{ + Swap: &swaptypes.SwapMetadata{ + MsgPlaceLimitOrder: &types.MsgPlaceLimitOrder{ + Creator: s.dualityAddr.String(), + Receiver: s.dualityAddr.String(), + TokenIn: s.providerToDualityDenom, + TokenOut: nativeDenom, + AmountIn: swapAmount, + TickIndexInToOut: 2, + OrderType: types.LimitOrderType_FILL_OR_KILL, + }, + Next: nextJSON, + }, + } + + metadataBz, err := json.Marshal(metadata) + s.Require().NoError(err) + + // Send an IBC transfer from provider to duality with packet memo containing the swap metadata + s.IBCTransferProviderToDuality( + s.providerAddr, + s.dualityAddr, + nativeDenom, + ibcTransferAmount, + string(metadataBz), + ) + + // Relay the packets + err = s.RelayAllPacketsAToB(s.dualityChainBPath) + s.Assert().NoError(err) + + // Check that the funds are moved out of the acc on providerChain + s.assertProviderBalance( + s.providerAddr, + nativeDenom, + newProviderBalNative.Sub(ibcTransferAmount), + ) + + // Check that the amountIn is deduced from the duality account + s.assertDualityBalance(s.dualityAddr, s.providerToDualityDenom, sdk.ZeroInt()) + // Check that duality account did not keep any of the transfer denom + s.assertDualityBalance(s.dualityAddr, nativeDenom, genesisWalletAmount.Sub(swapAmount)) + + transferDenomPath := transfertypes.GetPrefixedDenom( + transfertypes.PortID, + s.dualityChainBPath.EndpointA.ChannelID, + nativeDenom, + ) + transferDenomDuality_B := transfertypes.ParseDenomTrace(transferDenomPath).IBCDenom() + + // Check that the funds are now present in the acc on chainB + s.assertChainBBalance(chainBAddr, transferDenomDuality_B, expectedAmountOut) + + s.Assert().NoError(err) +} + +func (s *IBCTestSuite) TestSwapAndForward_MultiHopSuccess() { + // Send an IBC transfer from provider chain to duality, so we can initialize a pool with the IBC denom token + native Duality token + s.IBCTransferProviderToDuality( + s.providerAddr, + s.dualityAddr, + nativeDenom, + ibcTransferAmount, + "", + ) + + // Assert that the funds are gone from the acc on provider and present in the acc on Duality + newProviderBalNative := genesisWalletAmount.Sub(ibcTransferAmount) + s.assertProviderBalance(s.providerAddr, nativeDenom, newProviderBalNative) + + s.assertDualityBalance(s.dualityAddr, s.providerToDualityDenom, ibcTransferAmount) + + // deposit stake<>ibcTransferToken to initialize the pool on Duality + depositAmount := sdk.NewInt(100_000) + s.dualityDeposit( + nativeDenom, + s.providerToDualityDenom, + depositAmount, + depositAmount, + 0, + 1, + s.dualityAddr) + + // Assert that the deposit was successful and the funds are moved out of the Duality user acc + s.assertDualityBalance(s.dualityAddr, s.providerToDualityDenom, sdk.ZeroInt()) + postDepositDualityBalNative := genesisWalletAmount.Sub(depositAmount) + s.assertDualityBalance(s.dualityAddr, nativeDenom, postDepositDualityBalNative) + + // Compose the IBC transfer memo metadata to be used in the swap and forward + swapAmount := sdk.NewInt(100000) + + expectedOut := sdk.NewInt(99_990) + + chainBAddr := s.bundleB.Chain.SenderAccount.GetAddress() + chainCAddr := s.bundleC.Chain.SenderAccount.GetAddress() + + retries := uint8(0) + nextForward := forwardtypes.PacketMetadata{ + Forward: &forwardtypes.ForwardMetadata{ + Receiver: chainCAddr.String(), + Port: s.chainBChainCPath.EndpointA.ChannelConfig.PortID, + Channel: s.chainBChainCPath.EndpointA.ChannelID, + Timeout: forwardtypes.Duration(5 * time.Minute), + Retries: &retries, + Next: nil, + }, + } + nextForwardBz, err := json.Marshal(nextForward) + s.Assert().NoError(err) + nextForwardJSON := forwardtypes.NewJSONObject(false, nextForwardBz, orderedmap.OrderedMap{}) + + forwardMetadata := forwardtypes.PacketMetadata{ + Forward: &forwardtypes.ForwardMetadata{ + Receiver: chainBAddr.String(), + Port: s.dualityChainBPath.EndpointA.ChannelConfig.PortID, + Channel: s.dualityChainBPath.EndpointA.ChannelID, + Timeout: forwardtypes.Duration(5 * time.Minute), + Retries: &retries, + Next: nextForwardJSON, + }, + } + bz, err := json.Marshal(forwardMetadata) + s.Assert().NoError(err) + + nextJSON := new(swaptypes.JSONObject) + err = json.Unmarshal(bz, nextJSON) + s.Assert().NoError(err) + + metadata := swaptypes.PacketMetadata{ + Swap: &swaptypes.SwapMetadata{ + MsgPlaceLimitOrder: &types.MsgPlaceLimitOrder{ + Creator: s.dualityAddr.String(), + Receiver: s.dualityAddr.String(), + TokenIn: s.providerToDualityDenom, + TokenOut: nativeDenom, + AmountIn: swapAmount, + TickIndexInToOut: 2, + OrderType: types.LimitOrderType_FILL_OR_KILL, + }, + Next: nextJSON, + }, + } + + metadataBz, err := json.Marshal(metadata) + s.Assert().NoError(err) + + // Send an IBC transfer from provider to duality with packet memo containing the swap metadata + s.IBCTransferProviderToDuality( + s.providerAddr, + s.dualityAddr, + nativeDenom, + ibcTransferAmount, + string(metadataBz), + ) + + dualityPacket := maps.Values(s.dualityChain.SentPackets)[0] + err = s.dualityChainBPath.EndpointB.UpdateClient() + s.Require().NoError(err) + err = s.dualityChainBPath.EndpointB.RecvPacket(dualityPacket) + s.Require().NoError(err) + err = s.RelayAllPacketsAToB(s.chainBChainCPath) + s.Require().NoError(err) + + transferDenomPathDuality_B := transfertypes.GetPrefixedDenom( + transfertypes.PortID, + s.dualityChainBPath.EndpointB.ChannelID, + nativeDenom, + ) + transferDenomDuality_B := transfertypes.ParseDenomTrace(transferDenomPathDuality_B).IBCDenom() + transferDenomPathB_C := transfertypes.GetPrefixedDenom( + transfertypes.PortID, + s.chainBChainCPath.EndpointB.ChannelID, + transferDenomPathDuality_B, + ) + transferDenomB_C := transfertypes.ParseDenomTrace(transferDenomPathB_C).IBCDenom() + + // Check that the funds are moved out of the acc on chainA + s.assertProviderBalance( + s.providerAddr, + nativeDenom, + newProviderBalNative.Sub(ibcTransferAmount), + ) + // Check that chain B balance is unchanged + s.assertChainBBalance(chainBAddr, transferDenomDuality_B, sdk.ZeroInt()) + + // Check that funds made it to chainC + s.assertChainCBalance(chainCAddr, transferDenomB_C, expectedOut) +} + +// TestSwapAndForward_UnwindIBCDenomSuccess asserts that the swap and forward middleware stack works as intended in the +// case that a native token from ChainB is sent to ChainA and then ChainA initiates a swap and forward with the token. +// This asserts that denom unwinding works as intended when going provider->duality->provider +func (s *IBCTestSuite) TestSwapAndForward_UnwindIBCDenomSuccess() { + // Send an IBC transfer from provider chain to duality, so we can initialize a pool with the IBC denom token + native Duality token + s.IBCTransferProviderToDuality( + s.providerAddr, + s.dualityAddr, + nativeDenom, + ibcTransferAmount, + "", + ) + + // Assert that the funds are gone from the acc on provider and present in the acc on Duality + newProviderBalNative := genesisWalletAmount.Sub(ibcTransferAmount) + s.assertProviderBalance(s.providerAddr, nativeDenom, newProviderBalNative) + + s.assertDualityBalance(s.dualityAddr, s.providerToDualityDenom, ibcTransferAmount) + + // deposit stake<>ibcTransferToken to initialize the pool on Duality + depositAmount := sdk.NewInt(100_000) + s.dualityDeposit( + nativeDenom, + s.providerToDualityDenom, + depositAmount, + depositAmount, + 0, + 1, + s.dualityAddr) + + // Assert that the deposit was successful and the funds are moved out of the Duality user acc + s.assertDualityBalance(s.dualityAddr, s.providerToDualityDenom, sdk.ZeroInt()) + postDepositDualityBalNative := genesisWalletAmount.Sub(depositAmount) + s.assertDualityBalance(s.dualityAddr, nativeDenom, postDepositDualityBalNative) + + swapAmount := sdk.NewInt(100000) + expectedAmountOut := sdk.NewInt(99990) + + retries := uint8(0) + + forwardMetadata := forwardtypes.PacketMetadata{ + Forward: &forwardtypes.ForwardMetadata{ + Receiver: s.providerAddr.String(), + Port: s.dualityTransferPath.EndpointA.ChannelConfig.PortID, + Channel: s.dualityTransferPath.EndpointA.ChannelID, + Timeout: forwardtypes.Duration(5 * time.Minute), + Retries: &retries, + Next: nil, + }, + } + + bz, err := json.Marshal(forwardMetadata) + s.Assert().NoError(err) + + nextJSON := new(swaptypes.JSONObject) + err = json.Unmarshal(bz, nextJSON) + s.Assert().NoError(err) + + metadata := swaptypes.PacketMetadata{ + Swap: &swaptypes.SwapMetadata{ + MsgPlaceLimitOrder: &types.MsgPlaceLimitOrder{ + Creator: s.dualityAddr.String(), + Receiver: s.dualityAddr.String(), + TokenIn: nativeDenom, + TokenOut: s.providerToDualityDenom, + AmountIn: swapAmount, + TickIndexInToOut: 2, + OrderType: types.LimitOrderType_FILL_OR_KILL, + }, + Next: nextJSON, + }, + } + + metadataBz, err := json.Marshal(metadata) + s.Require().NoError(err) + + // Send an IBC transfer from provider to duality with packet memo containing the swap metadata + s.IBCTransferProviderToDuality( + s.providerAddr, + s.dualityAddr, + nativeDenom, + ibcTransferAmount, + string(metadataBz), + ) + + // Relay the packets + s.RelayAllPacketsAToB(s.dualityTransferPath) + s.coordinator.CommitBlock(s.dualityChain) + + // Check that the amountIn is deduced from the duality account + s.assertDualityBalance(s.dualityAddr, nativeDenom, postDepositDualityBalNative.Sub(swapAmount)) + // Check that the amountIn has been deducted from the duality chain + s.assertDualityBalance(s.dualityAddr, nativeDenom, postDepositDualityBalNative.Sub(swapAmount)) + // Check that the funds are now present on the provider chainer + s.assertProviderBalance( + s.providerAddr, + nativeDenom, + newProviderBalNative.Sub(ibcTransferAmount).Add(expectedAmountOut), + ) + + s.Assert().NoError(err) +} + +// TestSwapAndForward_ForwardFails asserts that the swap and forward middleware stack works as intended in the case +// that an incoming IBC swap succeeds but the forward fails. +func (s *IBCTestSuite) TestSwapAndForward_ForwardFails() { + // Send an IBC transfer from provider chain to duality, so we can initialize a pool with the IBC denom token + native Duality token + s.IBCTransferProviderToDuality( + s.providerAddr, + s.dualityAddr, + nativeDenom, + ibcTransferAmount, + "", + ) + + // Assert that the funds are gone from the acc on provider and present in the acc on Duality + newProviderBalNative := genesisWalletAmount.Sub(ibcTransferAmount) + s.assertProviderBalance(s.providerAddr, nativeDenom, newProviderBalNative) + + s.assertDualityBalance(s.dualityAddr, s.providerToDualityDenom, ibcTransferAmount) + + // deposit stake<>ibcTransferToken to initialize the pool on Duality + depositAmount := sdk.NewInt(100_000) + s.dualityDeposit( + nativeDenom, + s.providerToDualityDenom, + depositAmount, + depositAmount, + 0, + 1, + s.dualityAddr) + + // Assert that the deposit was successful and the funds are moved out of the Duality user acc + s.assertDualityBalance(s.dualityAddr, s.providerToDualityDenom, sdk.ZeroInt()) + postDepositDualityBalNative := genesisWalletAmount.Sub(depositAmount) + s.assertDualityBalance(s.dualityAddr, nativeDenom, postDepositDualityBalNative) + + // Compose the IBC transfer memo metadata to be used in the swap and forward + swapAmount := sdk.NewInt(100000) + expectedAmountOut := sdk.NewInt(99990) + chainBAddr := s.bundleB.Chain.SenderAccount.GetAddress() + + retries := uint8(0) + + forwardMetadata := forwardtypes.PacketMetadata{ + Forward: &forwardtypes.ForwardMetadata{ + Receiver: chainBAddr.String(), + Port: s.dualityChainBPath.EndpointA.ChannelConfig.PortID, + Channel: "invalid-channel", // add an invalid channel identifier so the forward fails + Timeout: forwardtypes.Duration(5 * time.Minute), + Retries: &retries, + Next: nil, + }, + } + + bz, err := json.Marshal(forwardMetadata) + s.Assert().NoError(err) + + nextJSON := new(swaptypes.JSONObject) + err = json.Unmarshal(bz, nextJSON) + s.Assert().NoError(err) + + metadata := swaptypes.PacketMetadata{ + Swap: &swaptypes.SwapMetadata{ + MsgPlaceLimitOrder: &types.MsgPlaceLimitOrder{ + Creator: s.dualityAddr.String(), + Receiver: s.dualityAddr.String(), + TokenIn: s.providerToDualityDenom, + TokenOut: nativeDenom, + AmountIn: swapAmount, + TickIndexInToOut: 2, + OrderType: types.LimitOrderType_FILL_OR_KILL, + }, + Next: nextJSON, + }, + } + + metadataBz, err := json.Marshal(metadata) + s.Require().NoError(err) + + // Send an IBC transfer from provider to duality with packet memo containing the swap metadata + s.IBCTransferProviderToDuality( + s.providerAddr, + s.dualityAddr, + nativeDenom, + ibcTransferAmount, + string(metadataBz), + ) + + // Relay the packets from duality => ChainB + err = s.RelayAllPacketsAToB(s.dualityChainBPath) + // Relay Fails + s.Assert().Error(err) + + // Check that the funds are moved out of the acc on providerChain + s.assertProviderBalance( + s.providerAddr, + nativeDenom, + newProviderBalNative.Sub(ibcTransferAmount), + ) + + // Check that the amountIn is deduced from the duality account + s.assertDualityBalance(s.dualityAddr, s.providerToDualityDenom, sdk.ZeroInt()) + // Check that the amountOut stays on the dualitychain + s.assertDualityBalance( + s.dualityAddr, + nativeDenom, + postDepositDualityBalNative.Add(expectedAmountOut), + ) + + // Check that nothing made it to chainB + transferDenomPath := transfertypes.GetPrefixedDenom( + transfertypes.PortID, + s.dualityChainBPath.EndpointA.ChannelID, + nativeDenom, + ) + transferDenomDuality_B := transfertypes.ParseDenomTrace(transferDenomPath).IBCDenom() + + s.assertChainBBalance(chainBAddr, transferDenomDuality_B, sdk.ZeroInt()) +} diff --git a/tests/ibc/swap_test.go b/tests/ibc/swap_test.go new file mode 100644 index 000000000..8cb1a8c0f --- /dev/null +++ b/tests/ibc/swap_test.go @@ -0,0 +1,214 @@ +package ibc_test + +import ( + "encoding/json" + + sdk "github.com/cosmos/cosmos-sdk/types" + dextypes "github.com/duality-labs/duality/x/dex/types" + swaptypes "github.com/duality-labs/duality/x/ibcswap/types" +) + +// TestIBCSwapMiddleware_Success asserts that the IBC swap middleware works as intended with Duality running as a +// consumer chain connected to the Cosmos Hub. +func (s *IBCTestSuite) TestIBCSwapMiddleware_Success() { + // Send an IBC transfer from provider to Duality, so we can initialize a pool with the IBC denom token + native Duality token + s.IBCTransferProviderToDuality( + s.providerAddr, + s.dualityAddr, + nativeDenom, + ibcTransferAmount, + "", + ) + + // Assert that the funds are gone from the acc on provider and present in the acc on Duality + newProviderBalNative := genesisWalletAmount.Sub(ibcTransferAmount) + s.assertProviderBalance(s.providerAddr, nativeDenom, newProviderBalNative) + + s.assertDualityBalance(s.dualityAddr, s.providerToDualityDenom, ibcTransferAmount) + + // deposit stake<>ibcTransferToken to initialize the pool on Duality + depositAmount := sdk.NewInt(100_000) + s.dualityDeposit( + nativeDenom, + s.providerToDualityDenom, + depositAmount, + depositAmount, + 0, + 1, + s.dualityAddr) + + // Assert that the deposit was successful and the funds are moved out of the Duality user acc + s.assertDualityBalance(s.dualityAddr, s.providerToDualityDenom, sdk.ZeroInt()) + postDepositDualityBalNative := genesisWalletAmount.Sub(depositAmount) + s.assertDualityBalance(s.dualityAddr, nativeDenom, postDepositDualityBalNative) + + // Send an IBC transfer from providerChain to Duality with packet memo containing the swap metadata + swapAmount := sdk.NewInt(100000) + expectedOut := sdk.NewInt(99_990) + + metadata := swaptypes.PacketMetadata{ + Swap: &swaptypes.SwapMetadata{ + MsgPlaceLimitOrder: &dextypes.MsgPlaceLimitOrder{ + Creator: s.dualityAddr.String(), + Receiver: s.dualityAddr.String(), + TokenIn: s.providerToDualityDenom, + TokenOut: nativeDenom, + AmountIn: swapAmount, + TickIndexInToOut: 1, + OrderType: dextypes.LimitOrderType_FILL_OR_KILL, + }, + Next: nil, + }, + } + + metadataBz, err := json.Marshal(metadata) + s.Require().NoError(err) + + s.IBCTransferProviderToDuality( + s.providerAddr, + s.dualityAddr, + nativeDenom, + ibcTransferAmount, + string(metadataBz), + ) + + // Check that the funds are moved out of the acc on providerChain + s.assertProviderBalance( + s.providerAddr, + nativeDenom, + newProviderBalNative.Sub(ibcTransferAmount), + ) + + // Check that the swap funds are now present in the acc on Duality + s.assertDualityBalance(s.dualityAddr, nativeDenom, postDepositDualityBalNative.Add(expectedOut)) + + // Check that all of the IBC transfer denom have been used up + s.assertDualityBalance(s.dualityAddr, s.providerToDualityDenom, sdk.ZeroInt()) +} + +// TestIBCSwapMiddleware_FailRefund asserts that the IBC swap middleware works as intended with Duality running as a +// consumer chain connected to the Cosmos Hub. The swap should fail and a refund to the src chain should take place. +func (s *IBCTestSuite) TestIBCSwapMiddleware_FailRefund() { + // Compose the swap metadata, this swap will fail because there is no pool initialized for this pair + swapAmount := sdk.NewInt(100000) + metadata := swaptypes.PacketMetadata{ + Swap: &swaptypes.SwapMetadata{ + MsgPlaceLimitOrder: &dextypes.MsgPlaceLimitOrder{ + Creator: s.dualityAddr.String(), + Receiver: s.dualityAddr.String(), + TokenIn: s.providerToDualityDenom, + TokenOut: nativeDenom, + AmountIn: swapAmount, + TickIndexInToOut: 1, + OrderType: dextypes.LimitOrderType_FILL_OR_KILL, + }, + NonRefundable: false, + Next: nil, + }, + } + + metadataBz, err := json.Marshal(metadata) + s.Require().NoError(err) + + // Send (failing) IBC transfer with swap metadata + s.IBCTransferProviderToDuality( + s.providerAddr, + s.dualityAddr, + nativeDenom, + ibcTransferAmount, + string(metadataBz), + ) + + // Check that the funds are not present in the account on Duality + s.assertDualityBalance(s.dualityAddr, nativeDenom, genesisWalletAmount) + s.assertDualityBalance(s.dualityAddr, s.providerToDualityDenom, sdk.ZeroInt()) + + // Check that the refund takes place and the funds are moved back to the account on Gaia + s.assertProviderBalance(s.providerAddr, nativeDenom, genesisWalletAmount) +} + +// TestIBCSwapMiddleware_FailNoRefund asserts that the IBC swap middleware works as intended with Duality running as a +// consumer chain connected to the Cosmos Hub. The swap should fail and funds should remain on Duality. +func (s *IBCTestSuite) TestIBCSwapMiddleware_FailNoRefund() { + // Compose the swap metadata, this swap will fail because there is no pool initialized for this pair + swapAmount := sdk.NewInt(100000) + metadata := swaptypes.PacketMetadata{ + Swap: &swaptypes.SwapMetadata{ + MsgPlaceLimitOrder: &dextypes.MsgPlaceLimitOrder{ + Creator: s.dualityAddr.String(), + Receiver: s.dualityAddr.String(), + TokenIn: s.providerToDualityDenom, + TokenOut: nativeDenom, + AmountIn: swapAmount, + TickIndexInToOut: 1, + OrderType: dextypes.LimitOrderType_FILL_OR_KILL, + }, + NonRefundable: true, + Next: nil, + }, + } + + metadataBz, err := json.Marshal(metadata) + s.Require().NoError(err) + + // Send (failing) IBC transfer with swap metadata + s.IBCTransferProviderToDuality( + s.providerAddr, + s.dualityAddr, + nativeDenom, + ibcTransferAmount, + string(metadataBz), + ) + + // Check that the funds are present in the account on Duality + s.assertDualityBalance(s.dualityAddr, nativeDenom, genesisWalletAmount) + s.assertDualityBalance(s.dualityAddr, s.providerToDualityDenom, ibcTransferAmount) + + // Check that no refund takes place and the funds are not in the account on provider + s.assertProviderBalance(s.providerAddr, nativeDenom, genesisWalletAmount.Sub(ibcTransferAmount)) +} + +// TestIBCSwapMiddleware_FailWithRefundAddr asserts that the IBC swap middleware works as intended with Duality running as a +// consumer chain connected to the Cosmos Hub. The swap should fail and funds should remain on Duality but be moved +// to the refund address. + +func (s *IBCTestSuite) TestIBCSwapMiddleware_FailWithRefundAddr() { + // Compose the swap metadata, this swap will fail because there is no pool initialized for this pair + refundAddr := s.dualityChain.SenderAccounts[1].SenderAccount.GetAddress() + swapAmount := sdk.NewInt(100000) + metadata := swaptypes.PacketMetadata{ + Swap: &swaptypes.SwapMetadata{ + MsgPlaceLimitOrder: &dextypes.MsgPlaceLimitOrder{ + Creator: s.dualityAddr.String(), + Receiver: s.dualityAddr.String(), + TokenIn: s.providerToDualityDenom, + TokenOut: nativeDenom, + AmountIn: swapAmount, + TickIndexInToOut: 1, + OrderType: dextypes.LimitOrderType_FILL_OR_KILL, + }, + RefundAddress: refundAddr.String(), + NonRefundable: true, + Next: nil, + }, + } + + metadataBz, err := json.Marshal(metadata) + s.Require().NoError(err) + + // Send (failing) IBC transfer with swap metadata + s.IBCTransferProviderToDuality( + s.providerAddr, + s.dualityAddr, + nativeDenom, + ibcTransferAmount, + string(metadataBz), + ) + + // Check that the funds have been moved to the refund address + s.assertDualityBalance(refundAddr, nativeDenom, genesisWalletAmount) + s.assertDualityBalance(refundAddr, s.providerToDualityDenom, ibcTransferAmount) + + // Check that no refund takes place and the funds are not in the account on provider + s.assertProviderBalance(s.providerAddr, nativeDenom, genesisWalletAmount.Sub(ibcTransferAmount)) +} diff --git a/testutil/apptesting/events.go b/testutil/apptesting/events.go new file mode 100644 index 000000000..354f87a9e --- /dev/null +++ b/testutil/apptesting/events.go @@ -0,0 +1,41 @@ +package apptesting + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" + "golang.org/x/exp/slices" +) + +// AssertEventEmitted asserts that ctx's event manager has emitted the given number of events +// of the given type. +func (s *KeeperTestHelper) 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) + } + } + s.Equal(numEventsExpected, len(actualEvents)) +} + +func (s *KeeperTestHelper) FindEvent(events []sdk.Event, name string) sdk.Event { + index := slices.IndexFunc(events, func(e sdk.Event) bool { return e.Type == name }) + if index == -1 { + return sdk.Event{} + } + + return events[index] +} + +func (s *KeeperTestHelper) ExtractAttributes(event sdk.Event) map[string]string { + attrs := make(map[string]string) + if event.Attributes == nil { + return attrs + } + for _, a := range event.Attributes { + attrs[string(a.Key)] = string(a.Value) + } + + return attrs +} diff --git a/testutil/apptesting/test_suite.go b/testutil/apptesting/test_suite.go new file mode 100644 index 000000000..4d11c3cbc --- /dev/null +++ b/testutil/apptesting/test_suite.go @@ -0,0 +1,153 @@ +package apptesting + +import ( + "context" + "crypto/rand" + "fmt" + "time" + + dbm "github.com/cometbft/cometbft-db" + abci "github.com/cometbft/cometbft/abci/types" + "github.com/cometbft/cometbft/crypto/ed25519" + "github.com/cometbft/cometbft/libs/log" + tmtypes "github.com/cometbft/cometbft/proto/tendermint/types" + "github.com/cosmos/cosmos-sdk/baseapp" + "github.com/cosmos/cosmos-sdk/store/rootmulti" + sdk "github.com/cosmos/cosmos-sdk/types" + banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" + "github.com/neutron-org/neutron/app" + "github.com/neutron-org/neutron/testutil" + "github.com/stretchr/testify/suite" +) + +type KeeperTestHelper struct { + suite.Suite + + App *app.App + Ctx sdk.Context + GoCtx context.Context + // Used for testing queries end to end. + // You can wrap this in a module-specific QueryClient() + // and then make calls as you would a normal GRPC client. + QueryHelper *baseapp.QueryServiceTestHelper +} + +// Setup sets up basic environment for suite (App, Ctx, and test accounts) +func (s *KeeperTestHelper) Setup() { + s.App, _ = testutil.SetupTestingApp("neutron-1")() + s.Ctx = s.App.BaseApp.NewContext( + false, + tmtypes.Header{Height: 1, ChainID: "neutron-1", Time: time.Now().UTC()}, + ) + s.GoCtx = sdk.WrapSDKContext(s.Ctx) + s.QueryHelper = &baseapp.QueryServiceTestHelper{ + GRPCQueryRouter: s.App.GRPCQueryRouter(), + Ctx: s.Ctx, + } + + s.SetEpochStartTime() +} + +// func (s *KeeperTestHelper) SetupTestForInitGenesis() { +// // Setting to True, leads to init genesis not running +// s.App = app.Setup(true) +// s.Ctx = s.App.BaseApp.NewContext(true, tmtypes.Header{}) +// } + +func (s *KeeperTestHelper) SetEpochStartTime() { + epochsKeeper := s.App.EpochsKeeper + + for _, epoch := range epochsKeeper.AllEpochInfos(s.Ctx) { + epoch.StartTime = s.Ctx.BlockTime() + epochsKeeper.DeleteEpochInfo(s.Ctx, epoch.Identifier) + err := epochsKeeper.AddEpochInfo(s.Ctx, epoch) + if err != nil { + panic(err) + } + } +} + +// setupAddr takes a balance, prefix, and address number. Then returns the respective account address byte array. +// If prefix is left blank, it will be replaced with a random prefix. +func SetupAddr(index int) sdk.AccAddress { + prefixBz := make([]byte, 8) + _, _ = rand.Read(prefixBz) + prefix := string(prefixBz) + addr := sdk.AccAddress([]byte(fmt.Sprintf("addr%s%8d", prefix, index))) + return addr +} + +func (s *KeeperTestHelper) SetupAddr(index int) sdk.AccAddress { + return SetupAddr(index) +} + +func SetupAddrs(numAddrs int) []sdk.AccAddress { + addrs := make([]sdk.AccAddress, numAddrs) + for i := 0; i < numAddrs; i++ { + addrs[i] = SetupAddr(i) + } + return addrs +} + +func (s *KeeperTestHelper) SetupAddrs(numAddrs int) []sdk.AccAddress { + return SetupAddrs(numAddrs) +} + +// These are for testing msg.ValidateBasic() functions +// which need to validate for valid/invalid addresses. +// Should not be used for anything else because these addresses +// are totally uninterpretable (100% random). +func GenerateTestAddrs() (string, string) { + pk1 := ed25519.GenPrivKey().PubKey() + validAddr := sdk.AccAddress(pk1.Address()).String() + invalidAddr := sdk.AccAddress("").String() + return validAddr, invalidAddr +} + +// CreateTestContext creates a test context. +func (s *KeeperTestHelper) CreateTestContext() sdk.Context { + ctx, _ := s.CreateTestContextWithMultiStore() + return ctx +} + +// CreateTestContextWithMultiStore creates a test context and returns it together with multi store. +func (s *KeeperTestHelper) CreateTestContextWithMultiStore() (sdk.Context, sdk.CommitMultiStore) { + db := dbm.NewMemDB() + logger := log.NewNopLogger() + + ms := rootmulti.NewStore(db, logger) + + return sdk.NewContext(ms, tmtypes.Header{}, false, logger), ms +} + +// CreateTestContext creates a test context. +func (s *KeeperTestHelper) Commit() { + s.App.EndBlock(abci.RequestEndBlock{Height: s.Ctx.BlockHeight()}) + oldHeight := s.Ctx.BlockHeight() + oldHeader := s.Ctx.BlockHeader() + s.App.Commit() + newHeader := tmtypes.Header{ + Height: oldHeight + 1, + ChainID: oldHeader.ChainID, + Time: oldHeader.Time.Add(time.Minute), + } + s.App.BeginBlock(abci.RequestBeginBlock{Header: newHeader}) + s.Ctx = s.App.GetBaseApp().NewContext(false, newHeader) +} + +// FundAcc funds target address with specified amount. +func (s *KeeperTestHelper) FundAcc(acc sdk.AccAddress, amounts sdk.Coins) { + err := s.App.BankKeeper.MintCoins(s.Ctx, banktypes.ModuleName, amounts) + s.Require().NoError(err) + + err = s.App.BankKeeper.SendCoinsFromModuleToAccount(s.Ctx, banktypes.ModuleName, acc, amounts) + s.Require().NoError(err) +} + +// StateNotAltered validates that app state is not altered. Fails if it is. +func (s *KeeperTestHelper) StateNotAltered() { + oldState := s.App.ExportState(s.Ctx) + s.App.Commit() + newState := s.App.ExportState(s.Ctx) + s.Require().Equal(oldState, newState) +} diff --git a/testutil/common/sample/sample.go b/testutil/common/sample/sample.go new file mode 100644 index 000000000..98f2153ed --- /dev/null +++ b/testutil/common/sample/sample.go @@ -0,0 +1,13 @@ +package sample + +import ( + "github.com/cosmos/cosmos-sdk/crypto/keys/ed25519" + sdk "github.com/cosmos/cosmos-sdk/types" +) + +// AccAddress returns a sample account address +func AccAddress() string { + pk := ed25519.GenPrivKey().PubKey() + addr := pk.Address() + return sdk.AccAddress(addr).String() +} diff --git a/testutil/dex/keeper/dex.go b/testutil/dex/keeper/dex.go new file mode 100644 index 000000000..65c078c17 --- /dev/null +++ b/testutil/dex/keeper/dex.go @@ -0,0 +1,89 @@ +package keeper + +import ( + "testing" + + cmdb "github.com/cometbft/cometbft-db" + "github.com/cometbft/cometbft/libs/log" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + "github.com/cosmos/cosmos-sdk/codec" + codectypes "github.com/cosmos/cosmos-sdk/codec/types" + "github.com/cosmos/cosmos-sdk/store" + storetypes "github.com/cosmos/cosmos-sdk/store/types" + sdk "github.com/cosmos/cosmos-sdk/types" + typesparams "github.com/cosmos/cosmos-sdk/x/params/types" + "github.com/neutron-org/neutron/x/dex/keeper" + "github.com/neutron-org/neutron/x/dex/types" + "github.com/stretchr/testify/require" +) + +func DexKeeper(t testing.TB) (*keeper.Keeper, sdk.Context) { + storeKey := sdk.NewKVStoreKey(types.StoreKey) + memStoreKey := storetypes.NewMemoryStoreKey(types.MemStoreKey) + + db := cmdb.NewMemDB() + stateStore := store.NewCommitMultiStore(db) + stateStore.MountStoreWithDB(storeKey, storetypes.StoreTypeIAVL, db) + stateStore.MountStoreWithDB(memStoreKey, storetypes.StoreTypeMemory, nil) + require.NoError(t, stateStore.LoadLatestVersion()) + + registry := codectypes.NewInterfaceRegistry() + cdc := codec.NewProtoCodec(registry) + + paramsSubspace := typesparams.NewSubspace(cdc, + types.Amino, + storeKey, + memStoreKey, + "DexParams", + ) + k := keeper.NewKeeper( + cdc, + storeKey, + memStoreKey, + paramsSubspace, + nil, + ) + + ctx := sdk.NewContext(stateStore, tmproto.Header{}, false, log.NewNopLogger()) + + // Initialize params + k.SetParams(ctx, types.DefaultParams()) + + return k, ctx +} + +func AssertEventEmitted(t *testing.T, ctx sdk.Context, eventValue, message string) { + allEvents := ctx.EventManager().Events() + for _, event := range allEvents { + for _, attr := range event.Attributes { + if string(attr.Value) == eventValue { + return + } + } + } + require.Fail(t, message) +} + +func AssertNEventsEmitted(t *testing.T, ctx sdk.Context, eventValue string, nEvents int) { + emissions := 0 + allEvents := ctx.EventManager().Events() + for _, event := range allEvents { + for _, attr := range event.Attributes { + if string(attr.Value) == eventValue { + emissions++ + } + } + } + require.Equal(t, nEvents, emissions, "Expected %v events, got %v", nEvents, emissions) +} + +func AssertEventNotEmitted(t *testing.T, ctx sdk.Context, eventValue, message string) { + allEvents := ctx.EventManager().Events() + if len(allEvents) != 0 { + for _, attr := range allEvents[len(allEvents)-1].Attributes { + if string(attr.Value) == eventValue { + require.Fail(t, message) + } + } + } +} diff --git a/testutil/dex/nullify/nullify.go b/testutil/dex/nullify/nullify.go new file mode 100644 index 000000000..3b968c09c --- /dev/null +++ b/testutil/dex/nullify/nullify.go @@ -0,0 +1,57 @@ +// Package nullify provides methods to init nil values structs for test assertion. +package nullify + +import ( + "reflect" + "unsafe" + + sdk "github.com/cosmos/cosmos-sdk/types" +) + +var ( + coinType = reflect.TypeOf(sdk.Coin{}) + coinsType = reflect.TypeOf(sdk.Coins{}) +) + +// Fill analyze all struct fields and slices with +// reflection and initialize the nil and empty slices, +// structs, and pointers. +func Fill(x interface{}) interface{} { + v := reflect.Indirect(reflect.ValueOf(x)) + switch v.Kind() { + case reflect.Slice: + for i := 0; i < v.Len(); i++ { + obj := v.Index(i) + objPt := reflect.NewAt(obj.Type(), unsafe.Pointer(obj.UnsafeAddr())).Interface() + objPt = Fill(objPt) + obj.Set(reflect.ValueOf(objPt)) + } + case reflect.Struct: + for i := 0; i < v.NumField(); i++ { + f := reflect.Indirect(v.Field(i)) + if !f.CanSet() { + continue + } + switch f.Kind() { + case reflect.Slice: + f.Set(reflect.MakeSlice(f.Type(), 0, 0)) + case reflect.Struct: + switch f.Type() { + case coinType: + coin := reflect.New(coinType).Interface() + s := reflect.ValueOf(coin).Elem() + f.Set(s) + case coinsType: + coins := reflect.New(coinsType).Interface() + s := reflect.ValueOf(coins).Elem() + f.Set(s) + default: + objPt := reflect.NewAt(f.Type(), unsafe.Pointer(f.UnsafeAddr())).Interface() + s := Fill(objPt) + f.Set(reflect.ValueOf(s)) + } + } + } + } + return reflect.Indirect(v).Interface() +} diff --git a/testutil/integration_test_setup.go b/testutil/integration_test_setup.go new file mode 100644 index 000000000..4e2189617 --- /dev/null +++ b/testutil/integration_test_setup.go @@ -0,0 +1,308 @@ +package testutil + +import ( + "encoding/json" + "fmt" + "testing" + "time" + + "cosmossdk.io/math" + dbm "github.com/cometbft/cometbft-db" + abci "github.com/cometbft/cometbft/abci/types" + "github.com/cometbft/cometbft/libs/log" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + tmtypes "github.com/cometbft/cometbft/types" + "github.com/cosmos/cosmos-sdk/codec" + codectypes "github.com/cosmos/cosmos-sdk/codec/types" + cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" + "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1" + "github.com/cosmos/cosmos-sdk/testutil/mock" + "github.com/cosmos/cosmos-sdk/testutil/sims" + sdk "github.com/cosmos/cosmos-sdk/types" + authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" + banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" + stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" + consumertypes "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types" + "github.com/neutron-org/neutron/app" + "github.com/neutron-org/neutron/testutil/consumer" + + "github.com/stretchr/testify/require" +) + +func setup(withGenesis bool, invCheckPeriod uint) (*app.App, app.GenesisState) { + encoding := app.MakeEncodingConfig() + db := dbm.NewMemDB() + testApp := app.New( + log.NewNopLogger(), + "neutron-1", + db, + nil, + true, + map[int64]bool{}, + app.DefaultNodeHome, + 0, + encoding, + sims.EmptyAppOptions{}, + nil, + ) + if withGenesis { + return testApp, app.NewDefaultGenesisState(encoding.Marshaler) + } + + return testApp, app.GenesisState{} +} + +func Setup(t *testing.T, isCheckTx bool) *app.App { + t.Helper() + + privVal := mock.NewPV() + pubKey, err := privVal.GetPubKey() + require.NoError(t, err) + + // JCP TODO: need? + // // Give bank module minter permissions for testing (ie. KeeperTestHelper.FundAcc) + // maccPerms[banktypes.ModuleName] = []string{authtypes.Minter} + + // create validator set with single validator + validator := tmtypes.NewValidator(pubKey, 1) + valSet := tmtypes.NewValidatorSet([]*tmtypes.Validator{validator}) + + // generate genesis account + senderPrivKey := secp256k1.GenPrivKey() + acc := authtypes.NewBaseAccount( + senderPrivKey.PubKey().Address().Bytes(), + senderPrivKey.PubKey(), + 0, + 0, + ) + balance := banktypes.Balance{ + Address: acc.GetAddress().String(), + Coins: sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(100000000000000))), + } + + app := SetupWithGenesisValSet(t, valSet, []authtypes.GenesisAccount{acc}, balance) + + return app +} + +// SetupWithGenesisValSet initializes a new SimApp with a validator set and genesis accounts +// that also act as delegators. For simplicity, each validator is bonded with a delegation +// of one consensus engine unit in the default token of the simapp from first genesis +// account. A Nop logger is set in SimApp. +func SetupWithGenesisValSet( + t *testing.T, + valSet *tmtypes.ValidatorSet, + genAccs []authtypes.GenesisAccount, + balances ...banktypes.Balance, +) *app.App { + t.Helper() + + app, genesisState := setup(true, 5) + genesisState, err := GenesisStateWithValSet( + app.AppCodec(), + genesisState, + valSet, + genAccs, + balances...) + require.NoError(t, err) + + stateBytes, err := json.MarshalIndent(genesisState, "", " ") + require.NoError(t, err) + + // init chain will set the validator set and initialize the genesis accounts + app.InitChain( + abci.RequestInitChain{ + Validators: []abci.ValidatorUpdate{}, + ConsensusParams: sims.DefaultConsensusParams, + AppStateBytes: stateBytes, + }, + ) + + // commit genesis changes + app.Commit() + app.BeginBlock(abci.RequestBeginBlock{Header: tmproto.Header{ + Height: app.LastBlockHeight() + 1, + AppHash: app.LastCommitID().Hash, + ValidatorsHash: valSet.Hash(), + NextValidatorsHash: valSet.Hash(), + }}) + + return app +} + +// GenesisStateWithValSet returns a new genesis state with the validator set +func GenesisStateWithValSet( + codec codec.Codec, + genesisState map[string]json.RawMessage, + valSet *tmtypes.ValidatorSet, + genAccs []authtypes.GenesisAccount, + balances ...banktypes.Balance, +) (map[string]json.RawMessage, error) { + // set genesis accounts + authGenesis := authtypes.NewGenesisState(authtypes.DefaultParams(), genAccs) + genesisState[authtypes.ModuleName] = codec.MustMarshalJSON(authGenesis) + + validators := make([]stakingtypes.Validator, 0, len(valSet.Validators)) + delegations := make([]stakingtypes.Delegation, 0, len(valSet.Validators)) + + bondAmt := sdk.DefaultPowerReduction + initValPowers := []abci.ValidatorUpdate{} + + for _, val := range valSet.Validators { + pk, err := cryptocodec.FromTmPubKeyInterface(val.PubKey) + if err != nil { + return nil, fmt.Errorf("failed to convert pubkey: %w", err) + } + + pkAny, err := codectypes.NewAnyWithValue(pk) + if err != nil { + return nil, fmt.Errorf("failed to create new any: %w", err) + } + + validator := stakingtypes.Validator{ + OperatorAddress: sdk.ValAddress(val.Address).String(), + ConsensusPubkey: pkAny, + Jailed: false, + Status: stakingtypes.Bonded, + Tokens: bondAmt, + DelegatorShares: math.LegacyOneDec(), + Description: stakingtypes.Description{}, + UnbondingHeight: int64(0), + UnbondingTime: time.Unix(0, 0).UTC(), + Commission: stakingtypes.NewCommission( + math.LegacyZeroDec(), + math.LegacyZeroDec(), + math.LegacyZeroDec(), + ), + MinSelfDelegation: math.ZeroInt(), + } + validators = append(validators, validator) + delegations = append( + delegations, + stakingtypes.NewDelegation( + genAccs[0].GetAddress(), + val.Address.Bytes(), + math.LegacyOneDec(), + ), + ) + + // add initial validator powers so consumer InitGenesis runs correctly + pub, _ := val.ToProto() + initValPowers = append(initValPowers, abci.ValidatorUpdate{ + Power: val.VotingPower, + PubKey: pub.PubKey, + }) + } + + // set validators and delegations + stakingGenesis := stakingtypes.NewGenesisState( + stakingtypes.DefaultParams(), + validators, + delegations, + ) + genesisState[stakingtypes.ModuleName] = codec.MustMarshalJSON(stakingGenesis) + + totalSupply := sdk.NewCoins() + for _, b := range balances { + // add genesis acc tokens to total supply + totalSupply = totalSupply.Add(b.Coins...) + } + + for range delegations { + // add delegated tokens to total supply + totalSupply = totalSupply.Add(sdk.NewCoin(sdk.DefaultBondDenom, bondAmt)) + } + + // add bonded amount to bonded pool module account + balances = append(balances, banktypes.Balance{ + Address: authtypes.NewModuleAddress(stakingtypes.BondedPoolName).String(), + Coins: sdk.Coins{sdk.NewCoin(sdk.DefaultBondDenom, bondAmt)}, + }) + + // update total supply + bankGenesis := banktypes.NewGenesisState( + banktypes.DefaultGenesisState().Params, + balances, + totalSupply, + []banktypes.Metadata{}, + []banktypes.SendEnabled{}, + ) + genesisState[banktypes.ModuleName] = codec.MustMarshalJSON(bankGenesis) + + vals, err := tmtypes.PB2TM.ValidatorUpdates(initValPowers) + if err != nil { + panic("failed to get vals") + } + + consumerGenesisState := consumer.CreateMinimalConsumerTestGenesis() + consumerGenesisState.InitialValSet = initValPowers + consumerGenesisState.ProviderConsensusState.NextValidatorsHash = tmtypes.NewValidatorSet(vals). + Hash() + consumerGenesisState.Params.Enabled = true + genesisState[consumertypes.ModuleName] = codec.MustMarshalJSON(consumerGenesisState) + + return genesisState, nil +} + +// type EmptyAppOptions struct { +// servertypes.AppOptions +// } + +// // Get implements AppOptions +// func (ao EmptyAppOptions) Get(_ string) interface{} { +// return nil +// } + +// var _ network.TestFixtureFactory = NewTestNetworkFixture + +// func NewTestNetworkFixture() network.TestFixture { +// dir, err := os.MkdirTemp("", "duality") +// if err != nil { +// panic(fmt.Sprintf("failed creating temporary directory: %v", err)) +// } +// defer os.RemoveAll(dir) + +// encConfig := MakeEncodingConfig() + +// app := NewApp( +// log.NewNopLogger(), +// dbm.NewMemDB(), +// nil, +// true, +// map[int64]bool{}, +// DefaultNodeHome, +// 5, +// EmptyAppOptions{}, +// encConfig, +// nil, +// ) + +// appCtr := func(val network.ValidatorI) servertypes.Application { +// return NewApp( +// val.GetCtx().Logger, +// dbm.NewMemDB(), +// nil, +// true, +// map[int64]bool{}, +// DefaultNodeHome, +// 5, +// EmptyAppOptions{}, +// encConfig, +// nil, +// bam.SetPruning(pruningtypes.NewPruningOptionsFromString(val.GetAppConfig().Pruning)), +// bam.SetMinGasPrices(val.GetAppConfig().MinGasPrices), +// bam.SetChainID(val.GetCtx().Viper.GetString(flags.FlagChainID)), +// ) +// } + +// return network.TestFixture{ +// AppConstructor: appCtr, +// GenesisState: NewDefaultGenesisState(app.AppCodec()), +// EncodingConfig: moduletestutil.TestEncodingConfig{ +// InterfaceRegistry: app.InterfaceRegistry(), +// Codec: app.AppCodec(), +// TxConfig: encConfig.TxConfig, +// Amino: app.LegacyAmino(), +// }, +// } +// } diff --git a/utils/bank.go b/utils/bank.go new file mode 100644 index 000000000..a9740a8fa --- /dev/null +++ b/utils/bank.go @@ -0,0 +1,110 @@ +package utils + +import ( + "fmt" + + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/neutron-org/neutron/x/dex/types" + + "github.com/cosmos/cosmos-sdk/types/query" +) + +func FilteredPaginateAccountBalances( + ctx sdk.Context, + bankKeeper types.BankKeeper, + address sdk.AccAddress, + pageRequest *query.PageRequest, + onResult func(coin sdk.Coin, accumulate bool) bool, +) (*query.PageResponse, error) { + // if the PageRequest is nil, use default PageRequest + if pageRequest == nil { + pageRequest = &query.PageRequest{} + } + + offset := pageRequest.Offset + key := pageRequest.Key + limit := pageRequest.Limit + countTotal := pageRequest.CountTotal + + if pageRequest.Reverse { + return nil, fmt.Errorf("invalid request, reverse pagination is not enabled") + } + if offset > 0 && key != nil { + return nil, fmt.Errorf("invalid request, either offset or key is expected, got both") + } + + if limit == 0 { + limit = query.DefaultLimit + + // count total results when the limit is zero/not supplied + countTotal = true + } + + if len(key) != 0 { + // paginate with key + var ( + numHits uint64 + nextKey []byte + ) + startAccum := false + + bankKeeper.IterateAccountBalances(ctx, address, func(coin sdk.Coin) bool { + if coin.Denom == string(key) { + startAccum = true + } + if numHits == limit { + nextKey = []byte(coin.Denom) + return true + } + if startAccum { + hit := onResult(coin, true) + if hit { + numHits++ + } + } + + return false + }) + + return &query.PageResponse{ + NextKey: nextKey, + }, nil + } else { + // default pagination (with offset) + + end := offset + limit + + var ( + numHits uint64 + nextKey []byte + ) + + bankKeeper.IterateAccountBalances(ctx, address, func(coin sdk.Coin) bool { + accumulate := numHits >= offset && numHits < end + hit := onResult(coin, accumulate) + + if hit { + numHits++ + } + + if numHits == end+1 { + if nextKey == nil { + nextKey = []byte(coin.Denom) + } + + if !countTotal { + return true + } + } + + return false + }) + + res := &query.PageResponse{NextKey: nextKey} + if countTotal { + res.Total = numHits + } + + return res, nil + } +} diff --git a/utils/cache_ctx.go b/utils/cache_ctx.go new file mode 100644 index 000000000..9924bba1f --- /dev/null +++ b/utils/cache_ctx.go @@ -0,0 +1,79 @@ +package utils + +import ( + "errors" + "fmt" + "runtime" + "runtime/debug" + + "github.com/cosmos/cosmos-sdk/store/types" + sdk "github.com/cosmos/cosmos-sdk/types" +) + +// This function lets you run the function f, but if theres an error or panic +// drop the state machine change and log the error. +// If there is no error, proceeds as normal (but with some slowdown due to SDK store weirdness) +// Try to avoid usage of iterators in f. +// +// If its an out of gas panic, this function will also panic like in normal tx execution flow. +// This is still safe for beginblock / endblock code though, as they do not have out of gas panics. +func ApplyFuncIfNoError(ctx sdk.Context, f func(ctx sdk.Context) error) (err error) { + // Add a panic safeguard + defer func() { + if recoveryError := recover(); recoveryError != nil { + if isErr, _ := IsOutOfGasError(recoveryError); isErr { + // We panic with the same error, to replicate the normal tx execution flow. + panic(recoveryError) + } else { + PrintPanicRecoveryError(ctx, recoveryError) + err = errors.New("panic occurred during execution") + } + } + }() + // makes a new cache context, which all state changes get wrapped inside of. + cacheCtx, write := ctx.CacheContext() + err = f(cacheCtx) + if err != nil { + ctx.Logger().Error(err.Error()) + } else { + // no error, write the output of f + write() + } + return err +} + +// Frustratingly, this has to return the error descriptor, not an actual error itself +// because the SDK errors here are not actually errors. (They don't implement error interface) +func IsOutOfGasError(err any) (bool, string) { + switch e := err.(type) { + case types.ErrorOutOfGas: + return true, e.Descriptor + case types.ErrorGasOverflow: + return true, e.Descriptor + default: + return false, "" + } +} + +// PrintPanicRecoveryError error logs the recoveryError, along with the stacktrace, if it can be parsed. +// If not emits them to stdout. +func PrintPanicRecoveryError(ctx sdk.Context, recoveryError interface{}) { + errStackTrace := string(debug.Stack()) + switch e := recoveryError.(type) { + case types.ErrorOutOfGas: + ctx.Logger().Debug("out of gas error inside panic recovery block: " + e.Descriptor) + return + case string: + ctx.Logger().Error("Recovering from (string) panic: " + e) + case runtime.Error: + ctx.Logger().Error("recovered (runtime.Error) panic: " + e.Error()) + case error: + ctx.Logger().Error("recovered (error) panic: " + e.Error()) + default: + ctx.Logger().Error("recovered (default) panic. Could not capture logs in ctx, see stdout") + fmt.Println("Recovering from panic ", recoveryError) + debug.PrintStack() + return + } + ctx.Logger().Error("stack trace: " + errStackTrace) +} diff --git a/utils/cli_helpers.go b/utils/cli_helpers.go new file mode 100644 index 000000000..8dc123204 --- /dev/null +++ b/utils/cli_helpers.go @@ -0,0 +1,68 @@ +package utils + +import ( + "strconv" + "strings" + + "github.com/cometbft/cometbft/crypto/ed25519" + sdk "github.com/cosmos/cosmos-sdk/types" +) + +const ( + base = 10 + bitlen = 64 +) + +func ParseUint64SliceFromString(s, separator string) ([]uint64, error) { + var parsedInts []uint64 + for _, s := range strings.Split(s, separator) { + s = strings.TrimSpace(s) + + parsed, err := strconv.ParseUint(s, base, bitlen) + if err != nil { + return []uint64{}, err + } + parsedInts = append(parsedInts, parsed) + } + return parsedInts, nil +} + +func ParseSdkIntFromString(s, separator string) ([]sdk.Int, error) { + var parsedInts []sdk.Int + for _, weightStr := range strings.Split(s, separator) { + weightStr = strings.TrimSpace(weightStr) + + parsed, err := strconv.ParseUint(weightStr, base, bitlen) + if err != nil { + return parsedInts, err + } + parsedInts = append(parsedInts, sdk.NewIntFromUint64(parsed)) + } + return parsedInts, nil +} + +func ParseSdkDecFromString(s, separator string) ([]sdk.Dec, error) { + var parsedDec []sdk.Dec + for _, weightStr := range strings.Split(s, separator) { + weightStr = strings.TrimSpace(weightStr) + + parsed, err := sdk.NewDecFromStr(weightStr) + if err != nil { + return parsedDec, err + } + + parsedDec = append(parsedDec, parsed) + } + return parsedDec, nil +} + +// CreateRandomAccounts is a function return a list of randomly generated AccAddresses +func CreateRandomAccounts(numAccts int) []sdk.AccAddress { + testAddrs := make([]sdk.AccAddress, numAccts) + for i := 0; i < numAccts; i++ { + pk := ed25519.GenPrivKey().PubKey() + testAddrs[i] = sdk.AccAddress(pk.Address()) + } + + return testAddrs +} diff --git a/utils/dcli/cli_tester.go b/utils/dcli/cli_tester.go new file mode 100644 index 000000000..7c16aac5d --- /dev/null +++ b/utils/dcli/cli_tester.go @@ -0,0 +1,111 @@ +package dcli + +import ( + "strings" + "testing" + + "github.com/cosmos/cosmos-sdk/client" + "github.com/cosmos/cosmos-sdk/client/flags" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/gogoproto/proto" + "github.com/spf13/cobra" + "github.com/spf13/pflag" + "github.com/stretchr/testify/require" +) + +type TxCliTestCase[M sdk.Msg] struct { + Cmd string + ExpectedMsg M + ExpectedErr bool + OnlyCheckValidateBasic bool +} + +type QueryCliTestCase[Q proto.Message] struct { + Cmd string + ExpectedQuery Q + ExpectedErr bool +} + +func RunTxTestCases[M sdk.Msg](t *testing.T, desc *TxCliDesc, testcases map[string]TxCliTestCase[M]) { + for name, tc := range testcases { + t.Run(name, func(t *testing.T) { + RunTxTestCase(t, desc, &tc) + }) + } +} + +func RunQueryTestCases[Q proto.Message](t *testing.T, desc *QueryDescriptor, testcases map[string]QueryCliTestCase[Q]) { + for name, tc := range testcases { + t.Run(name, func(t *testing.T) { + RunQueryTestCase(t, desc, &tc) + }) + } +} + +func RunTxTestCase[M sdk.Msg](t *testing.T, desc *TxCliDesc, tc *TxCliTestCase[M]) { + cmd := BuildTxCli[M](desc) + err := resetCommandFlagValues(cmd) + require.NoError(t, err, "error in resetCommandFlagValues") + args := strings.Split(tc.Cmd, " ") + err = cmd.Flags().Parse(args) + require.NoError(t, err, "error in cmd.Flags().Parse(args)") + clientCtx := newClientContextWithFrom(t, cmd.Flags()) + + msg, err := desc.ParseAndBuildMsg(clientCtx, args, cmd.Flags()) + if tc.ExpectedErr { + require.Error(t, err) + return + } + require.NoError(t, err, "error in desc.ParseAndBuildMsg") + if tc.OnlyCheckValidateBasic { + require.NoError(t, msg.ValidateBasic()) + return + } + + require.Equal(t, tc.ExpectedMsg, msg) +} + +func RunQueryTestCase[Q proto.Message](t *testing.T, desc *QueryDescriptor, tc *QueryCliTestCase[Q]) { + cmd := BuildQueryCli[Q, int](desc, nil) + err := resetCommandFlagValues(cmd) + require.NoError(t, err, "error in resetCommandFlagValues") + args := strings.Split(tc.Cmd, " ") + err = cmd.Flags().Parse(args) + require.NoError(t, err, "error in cmd.Flags().Parse(args)") + + req, err := desc.ParseQuery(args, cmd.Flags()) + if tc.ExpectedErr { + require.Error(t, err) + return + } + require.NoError(t, err, "error in desc.ParseQuery") + require.Equal(t, tc.ExpectedQuery, req) +} + +// This logic is copied from the SDK, it should've just been publicly exposed. +// But instead its buried within a mega-method. +func newClientContextWithFrom(t *testing.T, fs *pflag.FlagSet) client.Context { + clientCtx := client.Context{GenerateOnly: true} + from, _ := fs.GetString(flags.FlagFrom) + fromAddr, fromName, _, err := client.GetFromFields(clientCtx, nil, from) + require.NoError(t, err) + + clientCtx = clientCtx.WithFrom(from).WithFromAddress(fromAddr).WithFromName(fromName) + return clientCtx +} + +// taken from https://github.com/golang/debug/pull/8, +// due to no cobra command for resetting flag value +func resetCommandFlagValues(cmd *cobra.Command) error { + var retErr error = nil + cmd.Flags().VisitAll(func(f *pflag.Flag) { + if f.Changed { + err := f.Value.Set(f.DefValue) + if err != nil { + retErr = err + } + f.Changed = false + } + }) + return retErr +} diff --git a/utils/dcli/flag_advice.go b/utils/dcli/flag_advice.go new file mode 100644 index 000000000..a3fd1ef29 --- /dev/null +++ b/utils/dcli/flag_advice.go @@ -0,0 +1,79 @@ +package dcli + +import ( + "strings" + + "github.com/spf13/cobra" + "github.com/spf13/pflag" +) + +type FlagAdvice struct { + HasPagination bool + + // Map of FieldName -> FlagName + CustomFlagOverrides map[string]string + CustomFieldParsers map[string]CustomFieldParserFn + + // Tx sender value + IsTx bool + TxSenderFieldName string + FromValue string +} + +type FlagDesc struct { + RequiredFlags []*pflag.FlagSet + OptionalFlags []*pflag.FlagSet +} + +type FieldReadLocation = bool + +const ( + UsedArg FieldReadLocation = true + UsedFlag FieldReadLocation = false +) + +// CustomFieldParser function. +type CustomFieldParserFn = func(arg string, flags *pflag.FlagSet) (valueToSet any, usedArg FieldReadLocation, err error) + +func (f FlagAdvice) Sanitize() FlagAdvice { + // map CustomFlagOverrides & CustomFieldParser keys to lower-case + // initialize if uninitialized + newFlagOverrides := make(map[string]string, len(f.CustomFlagOverrides)) + for k, v := range f.CustomFlagOverrides { + newFlagOverrides[strings.ToLower(k)] = v + } + f.CustomFlagOverrides = newFlagOverrides + newFlagParsers := make(map[string]CustomFieldParserFn, len(f.CustomFieldParsers)) + for k, v := range f.CustomFieldParsers { + newFlagParsers[strings.ToLower(k)] = v + } + f.CustomFieldParsers = newFlagParsers + return f +} + +func FlagOnlyParser[v any](f func(fs *pflag.FlagSet) (v, error)) CustomFieldParserFn { + return func(_arg string, fs *pflag.FlagSet) (any, FieldReadLocation, error) { + t, err := f(fs) + return t, UsedFlag, err + } +} + +// AddFlags from desc to cmd. +// Required flags are marked as required. +func AddFlags(cmd *cobra.Command, desc FlagDesc) { + for i := 0; i < len(desc.OptionalFlags); i++ { + cmd.Flags().AddFlagSet(desc.OptionalFlags[i]) + } + for i := 0; i < len(desc.RequiredFlags); i++ { + fs := desc.RequiredFlags[i] + cmd.Flags().AddFlagSet(fs) + + // mark all these flags as required. + fs.VisitAll(func(flag *pflag.Flag) { + err := cmd.MarkFlagRequired(flag.Name) + if err != nil { + panic(err) + } + }) + } +} diff --git a/utils/dcli/index_cmd.go b/utils/dcli/index_cmd.go new file mode 100644 index 000000000..b332189f1 --- /dev/null +++ b/utils/dcli/index_cmd.go @@ -0,0 +1,31 @@ +package dcli + +import ( + "fmt" + + "github.com/spf13/cobra" +) + +// Index command, but short is not set. That is left to caller. +func IndexCmd(moduleName string) *cobra.Command { + return &cobra.Command{ + Use: moduleName, + Short: fmt.Sprintf("Querying commands for the %s module", moduleName), + DisableFlagParsing: true, + SuggestionsMinimumDistance: 2, + RunE: indexRunCmd, + } +} + +func indexRunCmd(cmd *cobra.Command, args []string) error { + usageTemplate := `Usage:{{if .HasAvailableSubCommands}} + {{.CommandPath}} [command]{{end}} + +{{if .HasAvailableSubCommands}}Available Commands:{{range .Commands}}{{if .IsAvailableCommand}} + {{rpad .Name .NamePadding }} {{.Short}}{{end}}{{end}} + +Use "{{.CommandPath}} [command] --help" for more information about a command.{{end}} +` + cmd.SetUsageTemplate(usageTemplate) + return cmd.Help() +} diff --git a/utils/dcli/parsers.go b/utils/dcli/parsers.go new file mode 100644 index 000000000..0575ded5c --- /dev/null +++ b/utils/dcli/parsers.go @@ -0,0 +1,366 @@ +package dcli + +import ( + "encoding/json" + "fmt" + "reflect" + "strconv" + "strings" + "time" + + "github.com/cosmos/cosmos-sdk/client" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/spf13/pflag" + + utils "github.com/neutron-org/neutron/utils" +) + +// Parses arguments 1-1 from args +// makes an exception, where it allows Pagination to come from flags. +func ParseFieldsFromFlagsAndArgs[reqP any](flagAdvice FlagAdvice, flags *pflag.FlagSet, args []string) (reqP, error) { + req := utils.MakeNew[reqP]() + v := reflect.ValueOf(req).Elem() + t := v.Type() + + argIndexOffset := 0 + // Iterate over the fields in the struct + for i := 0; i < t.NumField(); i++ { + arg := "" + if len(args) > i+argIndexOffset { + arg = args[i+argIndexOffset] + } + usedArg, err := ParseField(v, t, i, arg, flagAdvice, flags) + if err != nil { + return req, err + } + if !usedArg { + argIndexOffset-- + } + } + return req, nil +} + +func ParseNumFields[reqP any]() int { + req := utils.MakeNew[reqP]() + v := reflect.ValueOf(req).Elem() + t := v.Type() + return t.NumField() +} + +func ParseExpectedQueryFnName[reqP any]() string { + req := utils.MakeNew[reqP]() + v := reflect.ValueOf(req).Elem() + s := v.Type().String() + // handle some non-std queries + var prefixTrimmed string + if strings.Contains(s, "Query") { + prefixTrimmed = strings.Split(s, "Query")[1] + } else { + prefixTrimmed = strings.Split(s, ".")[1] + } + suffixTrimmed := strings.TrimSuffix(prefixTrimmed, "Request") + return suffixTrimmed +} + +func ParseHasPagination[reqP any]() bool { + req := utils.MakeNew[reqP]() + t := reflect.ValueOf(req).Elem().Type() + for i := 0; i < t.NumField(); i++ { + fType := t.Field(i) + if fType.Type.String() == paginationType { + return true + } + } + return false +} + +const paginationType = "*query.PageRequest" + +// ParseField parses field #fieldIndex from either an arg or a flag. +// Returns true if it was parsed from an argument. +// Returns error if there was an issue in parsing this field. +func ParseField( + v reflect.Value, + t reflect.Type, + fieldIndex int, + arg string, + flagAdvice FlagAdvice, + flags *pflag.FlagSet, +) (bool, error) { + fVal := v.Field(fieldIndex) + fType := t.Field(fieldIndex) + // fmt.Printf("Field %d: %s %s %s\n", fieldIndex, fType.Name, fType.Type, fType.Type.Kind()) + + lowercaseFieldNameStr := strings.ToLower(fType.Name) + if parseFn, ok := flagAdvice.CustomFieldParsers[lowercaseFieldNameStr]; ok { + v, usedArg, err := parseFn(arg, flags) + if err == nil { + fVal.Set(reflect.ValueOf(v)) + } + return usedArg, err + } + + parsedFromFlag, err := ParseFieldFromFlag(fVal, fType, flagAdvice, flags) + if err != nil { + return false, err + } + if parsedFromFlag { + return false, nil + } + return true, ParseFieldFromArg(fVal, fType, arg) +} + +// ParseFieldFromFlag attempts to parses the value of a field in a struct from a flag. +// The field is identified by the provided `reflect.StructField`. +// The flag advice and `pflag.FlagSet` are used to determine the flag to parse the field from. +// If the field corresponds to a value from a flag, true is returned. +// Otherwise, `false` is returned. +// In the true case, the parsed value is set on the provided `reflect.Value`. +// An error is returned if there is an issue parsing the field from the flag. +func ParseFieldFromFlag( + fVal reflect.Value, + fType reflect.StructField, + flagAdvice FlagAdvice, + flags *pflag.FlagSet, +) (bool, error) { + lowercaseFieldNameStr := strings.ToLower(fType.Name) + if flagName, ok := flagAdvice.CustomFlagOverrides[lowercaseFieldNameStr]; ok { + return true, parseFieldFromDirectlySetFlag(fVal, fType, flagAdvice, flagName, flags) + } + + kind := fType.Type.Kind() + switch kind { + case reflect.String: + if flagAdvice.IsTx { + // matchesFieldName is true if lowercaseFieldNameStr is the same as TxSenderFieldName, + // or if TxSenderFieldName is left blank, then matches fields named "sender" or "owner" + matchesFieldName := (flagAdvice.TxSenderFieldName == lowercaseFieldNameStr) || + (flagAdvice.TxSenderFieldName == "" && (lowercaseFieldNameStr == "sender" || lowercaseFieldNameStr == "owner")) + if matchesFieldName { + fVal.SetString(flagAdvice.FromValue) + return true, nil + } + } + case reflect.Ptr: + if flagAdvice.HasPagination { + typeStr := fType.Type.String() + if typeStr == paginationType { + pageReq, err := client.ReadPageRequest(flags) + if err != nil { + return true, err + } + fVal.Set(reflect.ValueOf(pageReq)) + return true, nil + } + } + } + return false, nil +} + +func parseFieldFromDirectlySetFlag( + fVal reflect.Value, + fType reflect.StructField, + _ FlagAdvice, + flagName string, + flags *pflag.FlagSet, +) error { + // get string. If its a string great, run through arg parser. Otherwise try setting directly + s, err := flags.GetString(flagName) + if err != nil { + flag := flags.Lookup(flagName) + if flag == nil { + return fmt.Errorf("programmer set the flag name wrong. Flag %s does not exist", flagName) + } + t := flag.Value.Type() + if t == "uint64" { + u, err := flags.GetUint64(flagName) + if err != nil { + return err + } + fVal.SetUint(u) + return nil + } + } + return ParseFieldFromArg(fVal, fType, s) +} + +func ParseFieldFromArg(fVal reflect.Value, fType reflect.StructField, arg string) error { + // We cant pass in a negative number due to the way pflags works... + // This is an (extraordinarily ridiculous) workaround that checks if a negative int is encapsulated in square brackets, + // and if so, trims the square brackets + if strings.HasPrefix(arg, "[") && strings.HasSuffix(arg, "]") && arg[1] == '-' { + arg = strings.TrimPrefix(arg, "[") + arg = strings.TrimSuffix(arg, "]") + } + + switch fType.Type.Kind() { + // SetUint allows anyof type u8, u16, u32, u64, and uint + case reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uint: + u, err := ParseUint(arg, fType.Name) + if err != nil { + return err + } + fVal.SetUint(u) + return nil + // SetInt allows anyof type i8,i16,i32,i64 and int + case reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64, reflect.Int: + typeStr := fType.Type.String() + var i int64 + var err error + if typeStr == "time.Duration" { + dur, err2 := time.ParseDuration(arg) + i, err = int64(dur), err2 + } else { + i, err = ParseInt(arg, fType.Name) + } + if err != nil { + return err + } + fVal.SetInt(i) + return nil + case reflect.Float32, reflect.Float64: + typeStr := fType.Type.String() + f, err := ParseFloat(arg, typeStr) + if err != nil { + return err + } + fVal.SetFloat(f) + return nil + case reflect.String: + s, err := ParseDenom(arg, fType.Name) + if err != nil { + return err + } + fVal.SetString(s) + return nil + case reflect.Ptr: + case reflect.Slice: + typeStr := fType.Type.String() + if typeStr == "types.Coins" { + coins, err := ParseCoins(arg, fType.Name) + if err != nil { + return err + } + fVal.Set(reflect.ValueOf(coins)) + return nil + } + case reflect.Struct: + typeStr := fType.Type.String() + var v any + var err error + if typeStr == "types.Coin" { + v, err = ParseCoin(arg, fType.Name) + } else if typeStr == "types.Int" { + v, err = ParseSdkInt(arg, fType.Name) + } else if typeStr == "time.Time" { + v, err = ParseUnixTime(arg, fType.Name) + } else if typeStr == "math.LegacyDec" { + v, err = ParseSdkDec(arg, fType.Name) + } else { + return fmt.Errorf("struct field type not recognized. Got type %v", fType) + } + + if err != nil { + return err + } + fVal.Set(reflect.ValueOf(v)) + return nil + } + return fmt.Errorf("field type not recognized. Got type %v", fType) +} + +func ParseUint(arg, fieldName string) (uint64, error) { + v, err := strconv.ParseUint(arg, 10, 64) + if err != nil { + return 0, fmt.Errorf("could not parse %s as uint for field %s: %w", arg, fieldName, err) + } + return v, nil +} + +func ParseFloat(arg, fieldName string) (float64, error) { + v, err := strconv.ParseFloat(arg, 64) + if err != nil { + return 0, fmt.Errorf("could not parse %s as float for field %s: %w", arg, fieldName, err) + } + return v, nil +} + +func ParseInt(arg, fieldName string) (int64, error) { + v, err := strconv.ParseInt(arg, 10, 64) + if err != nil { + return 0, fmt.Errorf("could not parse %s as int for field %s: %w", arg, fieldName, err) + } + return v, nil +} + +func ParseIntMaybeNegative(arg, fieldName string) (int64, error) { + if strings.HasPrefix(arg, "[") && strings.HasSuffix(arg, "]") { + arg = strings.TrimPrefix(arg, "[") + arg = strings.TrimSuffix(arg, "]") + } + + return ParseInt(arg, fieldName) +} + +func ParseUnixTime(arg, fieldName string) (time.Time, error) { + timeUnix, err := strconv.ParseInt(arg, 10, 64) + if err != nil { + parsedTime, err := time.Parse(sdk.SortableTimeFormat, arg) + if err != nil { + return time.Time{}, fmt.Errorf("could not parse %s as time for field %s: %w", arg, fieldName, err) + } + + return parsedTime, nil + } + startTime := time.Unix(timeUnix, 0) + return startTime, nil +} + +func ParseDenom(arg, fieldName string) (string, error) { + return strings.TrimSpace(arg), nil +} + +// TODO: Make this able to read from some local alias file for denoms. +func ParseCoin(arg, fieldName string) (sdk.Coin, error) { + coin, err := sdk.ParseCoinNormalized(arg) + if err != nil { + return sdk.Coin{}, fmt.Errorf("could not parse %s as sdk.Coin for field %s: %w", arg, fieldName, err) + } + return coin, nil +} + +// TODO: Make this able to read from some local alias file for denoms. +func ParseCoins(arg, fieldName string) (sdk.Coins, error) { + coins, err := sdk.ParseCoinsNormalized(arg) + if err != nil { + return sdk.Coins{}, fmt.Errorf("could not parse %s as sdk.Coins for field %s: %w", arg, fieldName, err) + } + return coins, nil +} + +// TODO: This really shouldn't be getting used in the CLI, its misdesign on the CLI ux +func ParseSdkInt(arg, fieldName string) (sdk.Int, error) { + i, ok := sdk.NewIntFromString(arg) + if !ok { + return sdk.Int{}, fmt.Errorf("could not parse %s as sdk.Int for field %s", arg, fieldName) + } + return i, nil +} + +func ParseSdkDec(arg, fieldName string) (sdk.Dec, error) { + i, err := sdk.NewDecFromStr(arg) + if err != nil { + return sdk.Dec{}, fmt.Errorf("could not parse %s as sdk.Dec for field %s: %w", arg, fieldName, err) + } + return i, nil +} + +func ParseUintArray(arg string, _ *pflag.FlagSet) (any, FieldReadLocation, error) { + var arr []uint64 + err := json.Unmarshal([]byte(arg), &arr) + if err != nil { + return nil, UsedArg, err + } + + return arr, UsedArg, err +} diff --git a/utils/dcli/parsers_test.go b/utils/dcli/parsers_test.go new file mode 100644 index 000000000..5748dc6d6 --- /dev/null +++ b/utils/dcli/parsers_test.go @@ -0,0 +1,167 @@ +package dcli_test + +import ( + "reflect" + "testing" + "time" + + sdk "github.com/cosmos/cosmos-sdk/types" + . "github.com/neutron-org/neutron/utils/dcli" + "github.com/stretchr/testify/require" +) + +type testingStruct struct { + Int int64 + UInt uint64 + String string + Float float64 + Duration time.Duration + Pointer *testingStruct + Slice sdk.Coins + Struct interface{} + Dec sdk.Dec +} + +func TestParseFieldFromArg(t *testing.T) { + tests := map[string]struct { + testingStruct + arg string + fieldIndex int + + expectedStruct testingStruct + expectingErr bool + }{ + "Int value changes from -20 to 10": { + testingStruct: testingStruct{Int: -20}, + arg: "10", + fieldIndex: 0, + expectedStruct: testingStruct{Int: 10}, + }, + "Attempt to change Int value 20 to string value": { // does not return error, simply does not change the struct + testingStruct: testingStruct{Int: 20}, + arg: "hello", + fieldIndex: 0, + expectedStruct: testingStruct{Int: 20}, + }, + "UInt value changes from 20 to 10": { + testingStruct: testingStruct{UInt: 20}, + arg: "10", + fieldIndex: 1, + expectedStruct: testingStruct{UInt: 10}, + }, + "String value change": { + testingStruct: testingStruct{String: "hello"}, + arg: "world", + fieldIndex: 2, + expectedStruct: testingStruct{String: "world"}, + }, + "Changing unset value (simply sets the value)": { + testingStruct: testingStruct{Int: 20}, + arg: "hello", + fieldIndex: 2, + expectedStruct: testingStruct{Int: 20, String: "hello"}, + }, + "Float value change": { + testingStruct: testingStruct{Float: 20.0}, + arg: "30.0", + fieldIndex: 3, + expectedStruct: testingStruct{Float: 30.0}, + }, + "Duration value changes from .Hour to .Second": { + testingStruct: testingStruct{Duration: time.Hour}, + arg: "1s", + fieldIndex: 4, + expectedStruct: testingStruct{Duration: time.Second}, + }, + "Attempt to change pointer": { // for reflect.Ptr kind ParseFieldFromArg does nothing, hence no changes take place + testingStruct: testingStruct{Pointer: &testingStruct{}}, + arg: "*whatever", + fieldIndex: 5, + expectedStruct: testingStruct{Pointer: &testingStruct{}}, + }, + "Slice change": { + testingStruct: testingStruct{Slice: sdk.Coins{ + sdk.NewCoin("foo", sdk.NewInt(100)), + sdk.NewCoin("bar", sdk.NewInt(100)), + }}, + arg: "10foo,10bar", // Should be of a format suitable for ParseCoinsNormalized + fieldIndex: 6, + expectedStruct: testingStruct{Slice: sdk.Coins{ // swapped places due to lexicographic order + sdk.NewCoin("bar", sdk.NewInt(10)), + sdk.NewCoin("foo", sdk.NewInt(10)), + }}, + }, + "Struct (sdk.Coin) change": { + testingStruct: testingStruct{Struct: sdk.NewCoin("bar", sdk.NewInt(10))}, // only supports sdk.Int, sdk.Coin or time.Time, other structs are not recognized + arg: "100bar", + fieldIndex: 7, + expectedStruct: testingStruct{Struct: sdk.NewCoin("bar", sdk.NewInt(10))}, + }, + "Unrecognizable struct": { + testingStruct: testingStruct{Struct: testingStruct{}}, // only supports sdk.Int, sdk.Coin or time.Time, other structs are not recognized + arg: "whatever", + fieldIndex: 7, + expectingErr: true, + }, + "Multiple fields in struct are set": { + testingStruct: testingStruct{Int: 20, UInt: 10, String: "hello", Pointer: &testingStruct{}}, + arg: "world", + fieldIndex: 2, + expectedStruct: testingStruct{Int: 20, UInt: 10, String: "world", Pointer: &testingStruct{}}, + }, + "All fields in struct set": { + testingStruct: testingStruct{ + Int: 20, + UInt: 10, + String: "hello", + Float: 30.0, + Duration: time.Second, + Pointer: &testingStruct{}, + Slice: sdk.Coins{ + sdk.NewCoin("foo", sdk.NewInt(100)), + sdk.NewCoin("bar", sdk.NewInt(100)), + }, + Struct: sdk.NewCoin("bar", sdk.NewInt(10)), + }, + arg: "1foo,15bar", + fieldIndex: 6, + expectedStruct: testingStruct{ + Int: 20, + UInt: 10, + String: "hello", + Float: 30.0, + Duration: time.Second, + Pointer: &testingStruct{}, + Slice: sdk.Coins{ + sdk.NewCoin("bar", sdk.NewInt(15)), + sdk.NewCoin("foo", sdk.NewInt(1)), + }, + Struct: sdk.NewCoin("bar", sdk.NewInt(10)), + }, + }, + "Dec struct": { + testingStruct: testingStruct{Dec: sdk.MustNewDecFromStr("100")}, + arg: "10", + fieldIndex: 8, + expectedStruct: testingStruct{Dec: sdk.MustNewDecFromStr("10")}, + }, + } + + for name, tc := range tests { + t.Run(name, func(t *testing.T) { + val := reflect.ValueOf(&tc.testingStruct).Elem() + typ := reflect.TypeOf(&tc.testingStruct).Elem() + + fVal := val.Field(tc.fieldIndex) + fType := typ.Field(tc.fieldIndex) + + err := ParseFieldFromArg(fVal, fType, tc.arg) + + if !tc.expectingErr { + require.Equal(t, tc.expectedStruct, tc.testingStruct) + } else { + require.Error(t, err) + } + }) + } +} diff --git a/utils/dcli/query_cmd_wrap.go b/utils/dcli/query_cmd_wrap.go new file mode 100644 index 000000000..2dbfb8b9a --- /dev/null +++ b/utils/dcli/query_cmd_wrap.go @@ -0,0 +1,181 @@ +package dcli + +import ( + "context" + "fmt" + "reflect" + "strings" + + "github.com/cosmos/cosmos-sdk/client" + "github.com/cosmos/cosmos-sdk/client/flags" + grpc1 "github.com/cosmos/gogoproto/grpc" + "github.com/cosmos/gogoproto/proto" + "github.com/spf13/cobra" + "github.com/spf13/pflag" +) + +// global variable set on index command. +// helps populate Longs, when not set in QueryDescriptor. +var lastQueryModuleName string + +type QueryDescriptor struct { + Use string + Short string + Long string + + HasPagination bool + + QueryFnName string + + Flags FlagDesc + // Map of FieldName -> FlagName + CustomFlagOverrides map[string]string + // Map of FieldName -> CustomParseFn + CustomFieldParsers map[string]CustomFieldParserFn + + ParseQuery func(args []string, flags *pflag.FlagSet) (proto.Message, error) + + ModuleName string + numArgs int +} + +func QueryIndexCmd(moduleName string) *cobra.Command { + cmd := IndexCmd(moduleName) + cmd.Short = fmt.Sprintf("Querying commands for the %s module", moduleName) + lastQueryModuleName = moduleName + return cmd +} + +func AddQueryCmd[Q proto.Message, querier any](cmd *cobra.Command, newQueryClientFn func(grpc1.ClientConn) querier, f func() (*QueryDescriptor, Q)) { + desc, _ := f() + subCmd := BuildQueryCli[Q](desc, newQueryClientFn) + cmd.AddCommand(subCmd) +} + +func (desc *QueryDescriptor) FormatLong(moduleName string) { + desc.Long = FormatLongDesc(desc.Long, NewLongMetadata(moduleName).WithShort(desc.Short)) +} + +func prepareDescriptor[reqP proto.Message](desc *QueryDescriptor) { + if !desc.HasPagination { + desc.HasPagination = ParseHasPagination[reqP]() + } + if desc.QueryFnName == "" { + desc.QueryFnName = ParseExpectedQueryFnName[reqP]() + } + if strings.Contains(desc.Long, "{") { + if desc.ModuleName == "" { + desc.ModuleName = lastQueryModuleName + } + desc.FormatLong(desc.ModuleName) + } + + desc.numArgs = ParseNumFields[reqP]() - len(desc.CustomFlagOverrides) + if desc.HasPagination { + desc.numArgs = desc.numArgs - 1 + } +} + +func BuildQueryCli[reqP proto.Message, querier any](desc *QueryDescriptor, newQueryClientFn func(grpc1.ClientConn) querier) *cobra.Command { + prepareDescriptor[reqP](desc) + if desc.ParseQuery == nil { + desc.ParseQuery = func(args []string, fs *pflag.FlagSet) (proto.Message, error) { + flagAdvice := FlagAdvice{ + HasPagination: desc.HasPagination, + CustomFlagOverrides: desc.CustomFlagOverrides, + CustomFieldParsers: desc.CustomFieldParsers, + }.Sanitize() + return ParseFieldsFromFlagsAndArgs[reqP](flagAdvice, fs, args) + } + } + + cmd := &cobra.Command{ + Use: desc.Use, + Short: desc.Short, + Long: desc.Long, + Args: cobra.ExactArgs(desc.numArgs), + RunE: queryLogic(desc, newQueryClientFn), + } + flags.AddQueryFlagsToCmd(cmd) + AddFlags(cmd, desc.Flags) + if desc.HasPagination { + cmdName := strings.Split(desc.Use, " ")[0] + flags.AddPaginationFlagsToCmd(cmd, cmdName) + } + + return cmd +} + +// SimpleQueryCmd builds a query, for the common, simple case. +// It detects that the querier function name is the same as the ProtoMessage name, +// with just the "Query" and "Request" args chopped off. +// It expects all proto fields to appear as arguments, in order. +func SimpleQueryCmd[reqP proto.Message, querier any](use, short, long string, + moduleName string, newQueryClientFn func(grpc1.ClientConn) querier, +) *cobra.Command { + desc := QueryDescriptor{ + Use: use, + Short: short, + Long: FormatLongDesc(long, NewLongMetadata(moduleName).WithShort(short)), + } + return BuildQueryCli[reqP](&desc, newQueryClientFn) +} + +func GetParams[reqP proto.Message, querier any](moduleName string, + newQueryClientFn func(grpc1.ClientConn) querier, +) *cobra.Command { + return BuildQueryCli[reqP](&QueryDescriptor{ + Use: "params [flags]", + Short: fmt.Sprintf("Get the params for the x/%s module", moduleName), + QueryFnName: "Params", + }, newQueryClientFn) +} + +func callQueryClientFn(ctx context.Context, fnName string, req proto.Message, q any) (res proto.Message, err error) { + qVal := reflect.ValueOf(q) + method := qVal.MethodByName(fnName) + if (method == reflect.Value{}) { + return nil, fmt.Errorf("Method %s does not exist on the querier."+ + " You likely need to override QueryFnName in your Query descriptor", fnName) + } + args := []reflect.Value{ + reflect.ValueOf(ctx), + reflect.ValueOf(req), + } + results := method.Call(args) + if len(results) != 2 { + panic("We got something wrong") + } + if !results[1].IsNil() { + //nolint:forcetypeassert + err = results[1].Interface().(error) + return res, err + } + //nolint:forcetypeassert + res = results[0].Interface().(proto.Message) + return res, nil +} + +func queryLogic[querier any](desc *QueryDescriptor, + newQueryClientFn func(grpc1.ClientConn) querier, +) func(cmd *cobra.Command, args []string) error { + return func(cmd *cobra.Command, args []string) error { + clientCtx, err := client.GetClientQueryContext(cmd) + if err != nil { + return err + } + queryClient := newQueryClientFn(clientCtx) + + req, err := desc.ParseQuery(args, cmd.Flags()) + if err != nil { + return err + } + + res, err := callQueryClientFn(cmd.Context(), desc.QueryFnName, req, queryClient) + if err != nil { + return err + } + + return clientCtx.PrintProto(res) + } +} diff --git a/utils/dcli/string_formatter.go b/utils/dcli/string_formatter.go new file mode 100644 index 000000000..279ef4666 --- /dev/null +++ b/utils/dcli/string_formatter.go @@ -0,0 +1,49 @@ +package dcli + +import ( + "fmt" + "strings" + "text/template" + + "github.com/cosmos/cosmos-sdk/version" +) + +type LongMetadata struct { + BinaryName string + CommandPrefix string + Short string + + // Newline Example: + ExampleHeader string +} + +func NewLongMetadata(moduleName string) *LongMetadata { + commandPrefix := fmt.Sprintf("$ %s q %s", version.AppName, moduleName) + return &LongMetadata{ + BinaryName: version.AppName, + CommandPrefix: commandPrefix, + } +} + +func (m *LongMetadata) WithShort(short string) *LongMetadata { + m.Short = short + return m +} + +func FormatLongDesc(longString string, meta *LongMetadata) string { + template, err := template.New("long_description").Parse(longString) + if err != nil { + panic("incorrectly configured long message") + } + bld := strings.Builder{} + meta.ExampleHeader = "\n\nExample:" + err = template.Execute(&bld, meta) + if err != nil { + panic("incorrectly configured long message") + } + return strings.TrimSpace(bld.String()) +} + +func FormatLongDescDirect(longString, moduleName string) string { + return FormatLongDesc(longString, NewLongMetadata(moduleName)) +} diff --git a/utils/dcli/tx_cmd_wrap.go b/utils/dcli/tx_cmd_wrap.go new file mode 100644 index 000000000..f1a68cf1b --- /dev/null +++ b/utils/dcli/tx_cmd_wrap.go @@ -0,0 +1,103 @@ +package dcli + +import ( + "fmt" + "strings" + + "github.com/cosmos/cosmos-sdk/client" + "github.com/cosmos/cosmos-sdk/client/flags" + "github.com/cosmos/cosmos-sdk/client/tx" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/spf13/cobra" + "github.com/spf13/pflag" +) + +func TxIndexCmd(moduleName string) *cobra.Command { + cmd := IndexCmd(moduleName) + cmd.Short = fmt.Sprintf("%s transactions subcommands", moduleName) + return cmd +} + +type TxCliDesc struct { + Use string + Short string + Long string + Example string + + NumArgs int + // Contract: len(args) = NumArgs + ParseAndBuildMsg func(clientCtx client.Context, args []string, flags *pflag.FlagSet) (sdk.Msg, error) + TxSignerFieldName string + + Flags FlagDesc + // Map of FieldName -> FlagName + CustomFlagOverrides map[string]string + // Map of FieldName -> CustomParseFn + CustomFieldParsers map[string]CustomFieldParserFn +} + +func AddTxCmd[M sdk.Msg](cmd *cobra.Command, f func() (*TxCliDesc, M)) { + desc, _ := f() + subCmd := BuildTxCli[M](desc) + cmd.AddCommand(subCmd) +} + +func BuildTxCli[M sdk.Msg](desc *TxCliDesc) *cobra.Command { + desc.TxSignerFieldName = strings.ToLower(desc.TxSignerFieldName) + if desc.NumArgs == 0 { + // NumArgs = NumFields - 1, since 1 field is from the msg + desc.NumArgs = ParseNumFields[M]() - 1 - len(desc.CustomFlagOverrides) - len(desc.CustomFieldParsers) + } + if desc.ParseAndBuildMsg == nil { + desc.ParseAndBuildMsg = func(clientCtx client.Context, args []string, flags *pflag.FlagSet) (sdk.Msg, error) { + flagAdvice := FlagAdvice{ + IsTx: true, + TxSenderFieldName: desc.TxSignerFieldName, + FromValue: clientCtx.GetFromAddress().String(), + CustomFlagOverrides: desc.CustomFlagOverrides, + CustomFieldParsers: desc.CustomFieldParsers, + }.Sanitize() + return ParseFieldsFromFlagsAndArgs[M](flagAdvice, flags, args) + } + } + return desc.BuildCommandCustomFn() +} + +// Creates a new cobra command given the description. +// Its up to then caller to add CLI flags, aside from `flags.AddTxFlagsToCmd(cmd)` +func (desc TxCliDesc) BuildCommandCustomFn() *cobra.Command { + cmd := &cobra.Command{ + Use: desc.Use, + Short: desc.Short, + Args: cobra.ExactArgs(desc.NumArgs), + RunE: func(cmd *cobra.Command, args []string) error { + clientCtx, err := client.GetClientTxContext(cmd) + if err != nil { + return err + } + + txf, err := tx.NewFactoryCLI(clientCtx, cmd.Flags()) + if err != nil { + return err + } + txf = txf.WithTxConfig(clientCtx.TxConfig).WithAccountRetriever(clientCtx.AccountRetriever) + + msg, err := desc.ParseAndBuildMsg(clientCtx, args, cmd.Flags()) + if err != nil { + return err + } + + return tx.GenerateOrBroadcastTxWithFactory(clientCtx, txf, msg) + }, + } + if desc.Example != "" { + cmd.Example = desc.Example + } + if desc.Long != "" { + cmd.Long = desc.Long + } + + flags.AddTxFlagsToCmd(cmd) + AddFlags(cmd, desc.Flags) + return cmd +} diff --git a/utils/generic_helper.go b/utils/generic_helper.go new file mode 100644 index 000000000..e05ead8ae --- /dev/null +++ b/utils/generic_helper.go @@ -0,0 +1,17 @@ +package utils + +import "reflect" + +// MakeNew makes a new instance of generic T. +// if T is a pointer, makes a new instance of the underlying struct via reflection, +// and then a pointer to it. +func MakeNew[T any]() T { + var v T + if typ := reflect.TypeOf(v); typ.Kind() == reflect.Ptr { + elem := typ.Elem() + //nolint:forcetypeassert + return reflect.New(elem).Interface().(T) // must use reflect + } else { + return *new(T) // v is not ptr, alloc with new + } +} diff --git a/utils/math/prec_dec.go b/utils/math/prec_dec.go new file mode 100644 index 000000000..f0cb85370 --- /dev/null +++ b/utils/math/prec_dec.go @@ -0,0 +1,970 @@ +package math_utils + +import ( + "encoding/json" + "errors" + "fmt" + "math/big" + "strconv" + "strings" + "testing" + + "cosmossdk.io/math" + + sdk "github.com/cosmos/cosmos-sdk/types" +) + +// NOTE: This file is nearly direct copy from cosmossdk.io/math/dec.go @v1.01 +// The Precesion has been changed from 18 to 26 + +// NOTE: never use new(Dec) or else we will panic unmarshalling into the +// nil embedded big.Int +type PrecDec struct { + i *big.Int +} + +const ( + // number of decimal places + Precision = 26 + + // bits required to represent the above precision + // Ceiling[Log2[10^Precision - 1]] + PrecDecimalPrecisionBits = 87 + + // decimalTruncateBits is the minimum number of bits removed + // by a truncate operation. It is equal to + // Floor[Log2[10^Precision - 1]]. + decimalTruncateBits = PrecDecimalPrecisionBits - 1 + + MaxBitLen = 256 + + maxPrecDecBitLen = MaxBitLen + decimalTruncateBits + + // max number of iterations in ApproxRoot function + maxApproxRootIterations = 300 +) + +var ( + precisionReuse = new(big.Int).Exp(big.NewInt(10), big.NewInt(Precision), nil) + fivePrecision = new(big.Int).Quo(precisionReuse, big.NewInt(2)) + precisionMultipliers []*big.Int + zeroInt = big.NewInt(0) + oneInt = big.NewInt(1) + tenInt = big.NewInt(10) +) + +// PrecDecimal errors +var ( + ErrEmptyPrecDecimalStr = errors.New("decimal string cannot be empty") + ErrInvalidPrecDecimalLength = errors.New("invalid decimal length") + ErrInvalidPrecDecimalStr = errors.New("invalid decimal string") +) + +// Set precision multipliers +func init() { + precisionMultipliers = make([]*big.Int, Precision+1) + for i := 0; i <= Precision; i++ { + precisionMultipliers[i] = calcPrecisionMultiplier(int64(i)) + } +} + +func precisionInt() *big.Int { + return new(big.Int).Set(precisionReuse) +} + +func ZeroPrecDec() PrecDec { return PrecDec{new(big.Int).Set(zeroInt)} } +func OnePrecDec() PrecDec { return PrecDec{precisionInt()} } +func SmallestPrecDec() PrecDec { return PrecDec{new(big.Int).Set(oneInt)} } + +// calculate the precision multiplier +func calcPrecisionMultiplier(prec int64) *big.Int { + if prec < 0 { + panic(fmt.Sprintf("negative precision %v", prec)) + } + + if prec > Precision { + panic(fmt.Sprintf("too much precision, maximum %v, provided %v", Precision, prec)) + } + zerosToAdd := Precision - prec + multiplier := new(big.Int).Exp(tenInt, big.NewInt(zerosToAdd), nil) + return multiplier +} + +// get the precision multiplier, do not mutate result +func precisionMultiplier(prec int64) *big.Int { + if prec < 0 { + panic(fmt.Sprintf("negative precision %v", prec)) + } + + if prec > Precision { + panic(fmt.Sprintf("too much precision, maximum %v, provided %v", Precision, prec)) + } + return precisionMultipliers[prec] +} + +// create a new PrecDec from integer assuming whole number +func NewPrecDec(i int64) PrecDec { + return NewPrecDecWithPrec(i, 0) +} + +// create a new PrecDec from integer with decimal place at prec +// CONTRACT: prec <= Precision +func NewPrecDecWithPrec(i, prec int64) PrecDec { + return PrecDec{ + new(big.Int).Mul(big.NewInt(i), precisionMultiplier(prec)), + } +} + +// create a new PrecDec from big integer assuming whole numbers +// CONTRACT: prec <= Precision +func NewPrecDecFromBigInt(i *big.Int) PrecDec { + return NewPrecDecFromBigIntWithPrec(i, 0) +} + +// create a new PrecDec from big integer assuming whole numbers +// CONTRACT: prec <= Precision +func NewPrecDecFromBigIntWithPrec(i *big.Int, prec int64) PrecDec { + return PrecDec{ + new(big.Int).Mul(i, precisionMultiplier(prec)), + } +} + +// create a new PrecDec from big integer assuming whole numbers +// CONTRACT: prec <= Precision +func NewPrecDecFromInt(i sdk.Int) PrecDec { + return NewPrecDecFromIntWithPrec(i, 0) +} + +// create a new PrecDec from big integer with decimal place at prec +// CONTRACT: prec <= Precision +func NewPrecDecFromIntWithPrec(i sdk.Int, prec int64) PrecDec { + return PrecDec{ + new(big.Int).Mul(i.BigInt(), precisionMultiplier(prec)), + } +} + +// create a decimal from an input decimal string. +// valid must come in the form: +// +// (-) whole integers (.) decimal integers +// +// examples of acceptable input include: +// +// -123.456 +// 456.7890 +// 345 +// -456789 +// +// NOTE - An error will return if more decimal places +// are provided in the string than the constant Precision. +// +// CONTRACT - This function does not mutate the input str. +func NewPrecDecFromStr(str string) (PrecDec, error) { + // first extract any negative symbol + neg := false + if len(str) > 0 && str[0] == '-' { + neg = true + str = str[1:] + } + + if len(str) == 0 { + return PrecDec{}, ErrEmptyPrecDecimalStr + } + + strs := strings.Split(str, ".") + lenPrecDecs := 0 + combinedStr := strs[0] + + if len(strs) == 2 { // has a decimal place + lenPrecDecs = len(strs[1]) + if lenPrecDecs == 0 || len(combinedStr) == 0 { + return PrecDec{}, ErrInvalidPrecDecimalLength + } + combinedStr += strs[1] + } else if len(strs) > 2 { + return PrecDec{}, ErrInvalidPrecDecimalStr + } + + if lenPrecDecs > Precision { + return PrecDec{}, fmt.Errorf("value '%s' exceeds max precision by %d decimal places: max precision %d", str, Precision-lenPrecDecs, Precision) + } + + // add some extra zero's to correct to the Precision factor + zerosToAdd := Precision - lenPrecDecs + zeros := strings.Repeat("0", zerosToAdd) + combinedStr += zeros + + combined, ok := new(big.Int).SetString(combinedStr, 10) // base 10 + if !ok { + return PrecDec{}, fmt.Errorf("failed to set decimal string with base 10: %s", combinedStr) + } + if combined.BitLen() > maxPrecDecBitLen { + return PrecDec{}, fmt.Errorf("decimal '%s' out of range; bitLen: got %d, max %d", str, combined.BitLen(), maxPrecDecBitLen) + } + if neg { + combined = new(big.Int).Neg(combined) + } + + return PrecDec{combined}, nil +} + +// PrecDecimal from string, panic on error +func MustNewPrecDecFromStr(s string) PrecDec { + dec, err := NewPrecDecFromStr(s) + if err != nil { + panic(err) + } + return dec +} + +func (d PrecDec) IsNil() bool { return d.i == nil } // is decimal nil +func (d PrecDec) IsZero() bool { return (d.i).Sign() == 0 } // is equal to zero +func (d PrecDec) IsNegative() bool { return (d.i).Sign() == -1 } // is negative +func (d PrecDec) IsPositive() bool { return (d.i).Sign() == 1 } // is positive +func (d PrecDec) Equal(d2 PrecDec) bool { return (d.i).Cmp(d2.i) == 0 } // equal decimals +func (d PrecDec) GT(d2 PrecDec) bool { return (d.i).Cmp(d2.i) > 0 } // greater than +func (d PrecDec) GTE(d2 PrecDec) bool { return (d.i).Cmp(d2.i) >= 0 } // greater than or equal +func (d PrecDec) LT(d2 PrecDec) bool { return (d.i).Cmp(d2.i) < 0 } // less than +func (d PrecDec) LTE(d2 PrecDec) bool { return (d.i).Cmp(d2.i) <= 0 } // less than or equal +func (d PrecDec) Neg() PrecDec { return PrecDec{new(big.Int).Neg(d.i)} } // reverse the decimal sign +func (d PrecDec) NegMut() PrecDec { d.i.Neg(d.i); return d } // reverse the decimal sign, mutable +func (d PrecDec) Abs() PrecDec { return PrecDec{new(big.Int).Abs(d.i)} } // absolute value +func (d PrecDec) AbsMut() PrecDec { d.i.Abs(d.i); return d } // absolute value, mutable +func (d PrecDec) Set(d2 PrecDec) PrecDec { d.i.Set(d2.i); return d } // set to existing dec value +func (d PrecDec) Clone() PrecDec { return PrecDec{new(big.Int).Set(d.i)} } // clone new dec + +// BigInt returns a copy of the underlying big.Int. +func (d PrecDec) BigInt() *big.Int { + if d.IsNil() { + return nil + } + + cp := new(big.Int) + return cp.Set(d.i) +} + +func (d PrecDec) ImmutOp(op func(PrecDec, PrecDec) PrecDec, d2 PrecDec) PrecDec { + return op(d.Clone(), d2) +} + +func (d PrecDec) ImmutOpInt(op func(PrecDec, sdk.Int) PrecDec, d2 sdk.Int) PrecDec { + return op(d.Clone(), d2) +} + +func (d PrecDec) ImmutOpInt64(op func(PrecDec, int64) PrecDec, d2 int64) PrecDec { + // TODO: use already allocated operand bigint to avoid + // newint each time, add mutex for race condition + // Issue: https://github.com/cosmos/cosmos-sdk/issues/11166 + return op(d.Clone(), d2) +} + +func (d PrecDec) SetInt64(i int64) PrecDec { + d.i.SetInt64(i) + d.i.Mul(d.i, precisionReuse) + return d +} + +// addition +func (d PrecDec) Add(d2 PrecDec) PrecDec { + return d.ImmutOp(PrecDec.AddMut, d2) +} + +// mutable addition +func (d PrecDec) AddMut(d2 PrecDec) PrecDec { + d.i.Add(d.i, d2.i) + + if d.i.BitLen() > maxPrecDecBitLen { + panic("Int overflow") + } + return d +} + +// subtraction +func (d PrecDec) Sub(d2 PrecDec) PrecDec { + return d.ImmutOp(PrecDec.SubMut, d2) +} + +// mutable subtraction +func (d PrecDec) SubMut(d2 PrecDec) PrecDec { + d.i.Sub(d.i, d2.i) + + if d.i.BitLen() > maxPrecDecBitLen { + panic("Int overflow") + } + return d +} + +// multiplication +func (d PrecDec) Mul(d2 PrecDec) PrecDec { + return d.ImmutOp(PrecDec.MulMut, d2) +} + +// mutable multiplication +func (d PrecDec) MulMut(d2 PrecDec) PrecDec { + d.i.Mul(d.i, d2.i) + chopped := chopPrecisionAndRound(d.i) + + if chopped.BitLen() > maxPrecDecBitLen { + panic("Int overflow") + } + *d.i = *chopped + return d +} + +// multiplication truncate +func (d PrecDec) MulTruncate(d2 PrecDec) PrecDec { + return d.ImmutOp(PrecDec.MulTruncateMut, d2) +} + +// mutable multiplication truncage +func (d PrecDec) MulTruncateMut(d2 PrecDec) PrecDec { + d.i.Mul(d.i, d2.i) + chopPrecisionAndTruncate(d.i) + + if d.i.BitLen() > maxPrecDecBitLen { + panic("Int overflow") + } + return d +} + +// multiplication +func (d PrecDec) MulInt(i sdk.Int) PrecDec { + return d.ImmutOpInt(PrecDec.MulIntMut, i) +} + +func (d PrecDec) MulIntMut(i sdk.Int) PrecDec { + d.i.Mul(d.i, i.BigInt()) + if d.i.BitLen() > maxPrecDecBitLen { + panic("Int overflow") + } + return d +} + +// MulInt64 - multiplication with int64 +func (d PrecDec) MulInt64(i int64) PrecDec { + return d.ImmutOpInt64(PrecDec.MulInt64Mut, i) +} + +func (d PrecDec) MulInt64Mut(i int64) PrecDec { + d.i.Mul(d.i, big.NewInt(i)) + + if d.i.BitLen() > maxPrecDecBitLen { + panic("Int overflow") + } + return d +} + +// quotient +func (d PrecDec) Quo(d2 PrecDec) PrecDec { + return d.ImmutOp(PrecDec.QuoMut, d2) +} + +var squaredPrecisionReuse = new(big.Int).Mul(precisionReuse, precisionReuse) + +// mutable quotient +func (d PrecDec) QuoMut(d2 PrecDec) PrecDec { + // multiply by precision twice + d.i.Mul(d.i, squaredPrecisionReuse) + d.i.Quo(d.i, d2.i) + + chopPrecisionAndRound(d.i) + if d.i.BitLen() > maxPrecDecBitLen { + panic("Int overflow") + } + return d +} + +// quotient truncate +func (d PrecDec) QuoTruncate(d2 PrecDec) PrecDec { + return d.ImmutOp(PrecDec.QuoTruncateMut, d2) +} + +// mutable quotient truncate +func (d PrecDec) QuoTruncateMut(d2 PrecDec) PrecDec { + // multiply precision twice + d.i.Mul(d.i, squaredPrecisionReuse) + d.i.Quo(d.i, d2.i) + + chopPrecisionAndTruncate(d.i) + if d.i.BitLen() > maxPrecDecBitLen { + panic("Int overflow") + } + return d +} + +// quotient, round up +func (d PrecDec) QuoRoundUp(d2 PrecDec) PrecDec { + return d.ImmutOp(PrecDec.QuoRoundupMut, d2) +} + +// mutable quotient, round up +func (d PrecDec) QuoRoundupMut(d2 PrecDec) PrecDec { + // multiply precision twice + d.i.Mul(d.i, squaredPrecisionReuse) + d.i.Quo(d.i, d2.i) + + chopPrecisionAndRoundUp(d.i) + if d.i.BitLen() > maxPrecDecBitLen { + panic("Int overflow") + } + return d +} + +// quotient +func (d PrecDec) QuoInt(i sdk.Int) PrecDec { + return d.ImmutOpInt(PrecDec.QuoIntMut, i) +} + +func (d PrecDec) QuoIntMut(i sdk.Int) PrecDec { + d.i.Quo(d.i, i.BigInt()) + return d +} + +// QuoInt64 - quotient with int64 +func (d PrecDec) QuoInt64(i int64) PrecDec { + return d.ImmutOpInt64(PrecDec.QuoInt64Mut, i) +} + +func (d PrecDec) QuoInt64Mut(i int64) PrecDec { + d.i.Quo(d.i, big.NewInt(i)) + return d +} + +// ApproxRoot returns an approximate estimation of a PrecDec's positive real nth root +// using Newton's method (where n is positive). The algorithm starts with some guess and +// computes the sequence of improved guesses until an answer converges to an +// approximate answer. It returns `|d|.ApproxRoot() * -1` if input is negative. +// A maximum number of 100 iterations is used a backup boundary condition for +// cases where the answer never converges enough to satisfy the main condition. +func (d PrecDec) ApproxRoot(root uint64) (guess PrecDec, err error) { + defer func() { + if r := recover(); r != nil { + var ok bool + err, ok = r.(error) + if !ok { + err = errors.New("out of bounds") + } + } + }() + + if d.IsNegative() { + absRoot, err := d.Neg().ApproxRoot(root) + return absRoot.NegMut(), err + } + + // One decimal, that we invalidate later. Helps us save a heap allocation. + scratchOnePrecDec := OnePrecDec() + if root == 1 || d.IsZero() || d.Equal(scratchOnePrecDec) { + return d, nil + } + + if root == 0 { + return scratchOnePrecDec, nil + } + + guess, delta := scratchOnePrecDec, OnePrecDec() + smallestPrecDec := SmallestPrecDec() + + for iter := 0; delta.AbsMut().GT(smallestPrecDec) && iter < maxApproxRootIterations; iter++ { + // Set prev = guess^{root - 1}, with an optimization for sqrt + // where root=2 => prev = guess. (And thus no extra heap allocations) + prev := guess + if root != 2 { + prev = guess.Power(root - 1) + } + if prev.IsZero() { + prev = smallestPrecDec + } + delta.Set(d).QuoMut(prev) + delta.SubMut(guess) + // delta = delta / root. + // We optimize for sqrt, where root=2 => delta = delta >> 1 + if root == 2 { + delta.i.Rsh(delta.i, 1) + } else { + delta.QuoInt64Mut(int64(root)) + } + + guess.AddMut(delta) + } + + return guess, nil +} + +// Power returns a the result of raising to a positive integer power +func (d PrecDec) Power(power uint64) PrecDec { + res := PrecDec{new(big.Int).Set(d.i)} + return res.PowerMut(power) +} + +func (d PrecDec) PowerMut(power uint64) PrecDec { + if power == 0 { + d.SetInt64(1) + return d + } + tmp := OnePrecDec() + + for i := power; i > 1; { + if i%2 != 0 { + tmp.MulMut(d) + } + i /= 2 + d.MulMut(d) + } + + return d.MulMut(tmp) +} + +// ApproxSqrt is a wrapper around ApproxRoot for the common special case +// of finding the square root of a number. It returns -(sqrt(abs(d)) if input is negative. +func (d PrecDec) ApproxSqrt() (PrecDec, error) { + return d.ApproxRoot(2) +} + +// is integer, e.g. decimals are zero +func (d PrecDec) IsInteger() bool { + return new(big.Int).Rem(d.i, precisionReuse).Sign() == 0 +} + +// format decimal state +func (d PrecDec) Format(s fmt.State, verb rune) { + _, err := s.Write([]byte(d.String())) + if err != nil { + panic(err) + } +} + +func (d PrecDec) String() string { + if d.i == nil { + return d.i.String() + } + + isNeg := d.IsNegative() + + if isNeg { + d = d.Neg() + } + + bzInt, err := d.i.MarshalText() + if err != nil { + return "" + } + inputSize := len(bzInt) + + var bzStr []byte + + // TODO: Remove trailing zeros + // case 1, purely decimal + if inputSize <= Precision { + bzStr = make([]byte, Precision+2) + + // 0. prefix + bzStr[0] = byte('0') + bzStr[1] = byte('.') + + // set relevant digits to 0 + for i := 0; i < Precision-inputSize; i++ { + bzStr[i+2] = byte('0') + } + + // set final digits + copy(bzStr[2+(Precision-inputSize):], bzInt) + } else { + // inputSize + 1 to account for the decimal point that is being added + bzStr = make([]byte, inputSize+1) + decPointPlace := inputSize - Precision + + copy(bzStr, bzInt[:decPointPlace]) // pre-decimal digits + bzStr[decPointPlace] = byte('.') // decimal point + copy(bzStr[decPointPlace+1:], bzInt[decPointPlace:]) // post-decimal digits + } + + if isNeg { + return "-" + string(bzStr) + } + + return string(bzStr) +} + +// Float64 returns the float64 representation of a PrecDec. +// Will return the error if the conversion failed. +func (d PrecDec) Float64() (float64, error) { + return strconv.ParseFloat(d.String(), 64) +} + +// MustFloat64 returns the float64 representation of a PrecDec. +// Would panic if the conversion failed. +func (d PrecDec) MustFloat64() float64 { + if value, err := strconv.ParseFloat(d.String(), 64); err != nil { + panic(err) + } else { + return value + } +} + +// ____ +// __| |__ "chop 'em +// ` \ round!" +// ___|| ~ _ -bankers +// | | __ +// | | | __|__|__ +// |_____: / | $$$ | +// |________| + +// Remove a Precision amount of rightmost digits and perform bankers rounding +// on the remainder (gaussian rounding) on the digits which have been removed. +// +// Mutates the input. Use the non-mutative version if that is undesired +func chopPrecisionAndRound(d *big.Int) *big.Int { + // remove the negative and add it back when returning + if d.Sign() == -1 { + // make d positive, compute chopped value, and then un-mutate d + d = d.Neg(d) + d = chopPrecisionAndRound(d) + d = d.Neg(d) + return d + } + + // get the truncated quotient and remainder + quo, rem := d, big.NewInt(0) + quo, rem = quo.QuoRem(d, precisionReuse, rem) + + if rem.Sign() == 0 { // remainder is zero + return quo + } + + switch rem.Cmp(fivePrecision) { + case -1: + return quo + case 1: + return quo.Add(quo, oneInt) + default: // bankers rounding must take place + // always round to an even number + if quo.Bit(0) == 0 { + return quo + } + return quo.Add(quo, oneInt) + } +} + +func chopPrecisionAndRoundUp(d *big.Int) *big.Int { + // remove the negative and add it back when returning + if d.Sign() == -1 { + // make d positive, compute chopped value, and then un-mutate d + d = d.Neg(d) + // truncate since d is negative... + chopPrecisionAndTruncate(d) + d = d.Neg(d) + return d + } + + // get the truncated quotient and remainder + quo, rem := d, big.NewInt(0) + quo, rem = quo.QuoRem(d, precisionReuse, rem) + + if rem.Sign() == 0 { // remainder is zero + return quo + } + + return quo.Add(quo, oneInt) +} + +func chopPrecisionAndRoundNonMutative(d *big.Int) *big.Int { + tmp := new(big.Int).Set(d) + return chopPrecisionAndRound(tmp) +} + +// RoundInt64 rounds the decimal using bankers rounding +func (d PrecDec) RoundInt64() int64 { + chopped := chopPrecisionAndRoundNonMutative(d.i) + if !chopped.IsInt64() { + panic("Int64() out of bound") + } + return chopped.Int64() +} + +// RoundInt round the decimal using bankers rounding +func (d PrecDec) RoundInt() sdk.Int { + return sdk.NewIntFromBigInt(chopPrecisionAndRoundNonMutative(d.i)) +} + +// chopPrecisionAndTruncate is similar to chopPrecisionAndRound, +// but always rounds down. It does not mutate the input. +func chopPrecisionAndTruncate(d *big.Int) { + d.Quo(d, precisionReuse) +} + +func chopPrecisionAndTruncateNonMutative(d *big.Int) *big.Int { + tmp := new(big.Int).Set(d) + chopPrecisionAndTruncate(tmp) + return tmp +} + +// TruncateInt64 truncates the decimals from the number and returns an int64 +func (d PrecDec) TruncateInt64() int64 { + chopped := chopPrecisionAndTruncateNonMutative(d.i) + if !chopped.IsInt64() { + panic("Int64() out of bound") + } + return chopped.Int64() +} + +// TruncateInt truncates the decimals from the number and returns an Int +func (d PrecDec) TruncateInt() sdk.Int { + return sdk.NewIntFromBigInt(chopPrecisionAndTruncateNonMutative(d.i)) +} + +// TruncatePrecDec truncates the decimals from the number and returns a PrecDec +func (d PrecDec) TruncatePrecDec() PrecDec { + return NewPrecDecFromBigInt(chopPrecisionAndTruncateNonMutative(d.i)) +} + +// Ceil returns the smallest interger value (as a decimal) that is greater than +// or equal to the given decimal. +func (d PrecDec) Ceil() PrecDec { + tmp := new(big.Int).Set(d.i) + + quo, rem := tmp, big.NewInt(0) + quo, rem = quo.QuoRem(tmp, precisionReuse, rem) + + // no need to round with a zero remainder regardless of sign + if rem.Cmp(zeroInt) == 0 { + return NewPrecDecFromBigInt(quo) + } + + if rem.Sign() == -1 { + return NewPrecDecFromBigInt(quo) + } + + return NewPrecDecFromBigInt(quo.Add(quo, oneInt)) +} + +// MaxSortablePrecDec is the largest PrecDec that can be passed into SortablePrecDecBytes() +// Its negative form is the least PrecDec that can be passed in. +var MaxSortablePrecDec PrecDec + +func init() { + MaxSortablePrecDec = OnePrecDec().Quo(SmallestPrecDec()) +} + +// ValidSortablePrecDec ensures that a PrecDec is within the sortable bounds, +// a PrecDec can't have a precision of less than 10^-18. +// Max sortable decimal was set to the reciprocal of SmallestPrecDec. +func ValidSortablePrecDec(dec PrecDec) bool { + return dec.Abs().LTE(MaxSortablePrecDec) +} + +// SortablePrecDecBytes returns a byte slice representation of a PrecDec that can be sorted. +// Left and right pads with 0s so there are 18 digits to left and right of the decimal point. +// For this reason, there is a maximum and minimum value for this, enforced by ValidSortablePrecDec. +func SortablePrecDecBytes(dec PrecDec) []byte { + if !ValidSortablePrecDec(dec) { + panic("dec must be within bounds") + } + // Instead of adding an extra byte to all sortable decs in order to handle max sortable, we just + // makes its bytes be "max" which comes after all numbers in ASCIIbetical order + if dec.Equal(MaxSortablePrecDec) { + return []byte("max") + } + // For the same reason, we make the bytes of minimum sortable dec be --, which comes before all numbers. + if dec.Equal(MaxSortablePrecDec.Neg()) { + return []byte("--") + } + // We move the negative sign to the front of all the left padded 0s, to make negative numbers come before positive numbers + if dec.IsNegative() { + return append([]byte("-"), []byte(fmt.Sprintf(fmt.Sprintf("%%0%ds", Precision*2+1), dec.Abs().String()))...) + } + return []byte(fmt.Sprintf(fmt.Sprintf("%%0%ds", Precision*2+1), dec.String())) +} + +// reuse nil values +var nilJSON []byte + +func init() { + empty := new(big.Int) + bz, _ := empty.MarshalText() + nilJSON, _ = json.Marshal(string(bz)) +} + +// MarshalJSON marshals the decimal +func (d PrecDec) MarshalJSON() ([]byte, error) { + if d.i == nil { + return nilJSON, nil + } + return json.Marshal(d.String()) +} + +// UnmarshalJSON defines custom decoding scheme +func (d *PrecDec) UnmarshalJSON(bz []byte) error { + if d.i == nil { + d.i = new(big.Int) + } + + var text string + err := json.Unmarshal(bz, &text) + if err != nil { + return err + } + + // TODO: Reuse dec allocation + newPrecDec, err := NewPrecDecFromStr(text) + if err != nil { + return err + } + + d.i = newPrecDec.i + return nil +} + +// MarshalYAML returns the YAML representation. +func (d PrecDec) MarshalYAML() (interface{}, error) { + return d.String(), nil +} + +// Marshal implements the gogo proto custom type interface. +func (d PrecDec) Marshal() ([]byte, error) { + i := d.i + if i == nil { + i = new(big.Int) + } + return i.MarshalText() +} + +// MarshalTo implements the gogo proto custom type interface. +func (d *PrecDec) MarshalTo(data []byte) (n int, err error) { + i := d.i + if i == nil { + i = new(big.Int) + } + + if i.Cmp(zeroInt) == 0 { + copy(data, []byte{0x30}) + return 1, nil + } + + bz, err := d.Marshal() + if err != nil { + return 0, err + } + + copy(data, bz) + return len(bz), nil +} + +// Unmarshal implements the gogo proto custom type interface. +func (d *PrecDec) Unmarshal(data []byte) error { + if len(data) == 0 { + d = nil + return nil + } + + if d.i == nil { + d.i = new(big.Int) + } + + if err := d.i.UnmarshalText(data); err != nil { + return err + } + + if d.i.BitLen() > maxPrecDecBitLen { + return fmt.Errorf("decimal out of range; got: %d, max: %d", d.i.BitLen(), maxPrecDecBitLen) + } + + return nil +} + +// Size implements the gogo proto custom type interface. +func (d *PrecDec) Size() int { + bz, _ := d.Marshal() + return len(bz) +} + +// Override Amino binary serialization by proxying to protobuf. +func (d PrecDec) MarshalAmino() ([]byte, error) { return d.Marshal() } +func (d *PrecDec) UnmarshalAmino(bz []byte) error { return d.Unmarshal(bz) } + +// helpers + +// test if two decimal arrays are equal +func PrecDecsEqual(d1s, d2s []PrecDec) bool { + if len(d1s) != len(d2s) { + return false + } + + for i, d1 := range d1s { + if !d1.Equal(d2s[i]) { + return false + } + } + return true +} + +// minimum decimal between two +func MinPrecDec(d1, d2 PrecDec) PrecDec { + if d1.LT(d2) { + return d1 + } + return d2 +} + +// maximum decimal between two +func MaxPrecDec(d1, d2 PrecDec) PrecDec { + if d1.LT(d2) { + return d2 + } + return d1 +} + +// intended to be used with require/assert: require.True(PrecDecEq(...)) +func PrecDecEq(t *testing.T, exp, got PrecDec) (*testing.T, bool, string, string, string) { + return t, exp.Equal(got), "expected:\t%v\ngot:\t\t%v", exp.String(), got.String() +} + +func PrecDecApproxEq(t *testing.T, d1, d2, tol PrecDec) (*testing.T, bool, string, string, string) { + diff := d1.Sub(d2).Abs() + return t, diff.LTE(tol), "expected |d1 - d2| <:\t%v\ngot |d1 - d2| = \t\t%v", tol.String(), diff.String() +} + +func hasOnlyDigits(s string) bool { + if s == "" { + return false + } + for _, r := range s { + if r < '0' || r > '9' { + return false + } + } + return true +} + +// FormatPrecDec formats a decimal (as encoded in protobuf) into a value-rendered +// string following ADR-050. This function operates with string manipulation +// (instead of manipulating the sdk.PrecDec object). +func FormatPrecDec(v string) (string, error) { + parts := strings.Split(v, ".") + if len(parts) > 2 { + return "", fmt.Errorf("invalid decimal: too many points in %s", v) + } + + intPart, err := math.FormatInt(parts[0]) + if err != nil { + return "", err + } + + if len(parts) == 1 { + return intPart, nil + } + + decPart := strings.TrimRight(parts[1], "0") + if len(decPart) == 0 { + return intPart, nil + } + + // Ensure that the decimal part has only digits. + // https://github.com/cosmos/cosmos-sdk/issues/12811 + if !hasOnlyDigits(decPart) { + return "", fmt.Errorf("non-digits detected after decimal point in: %q", decPart) + } + + return intPart + "." + decPart, nil +} diff --git a/utils/slice_helper.go b/utils/slice_helper.go new file mode 100644 index 000000000..933542e62 --- /dev/null +++ b/utils/slice_helper.go @@ -0,0 +1,51 @@ +package utils + +import ( + "sort" + + "golang.org/x/exp/constraints" +) + +// SortSlice sorts a slice of type T elements that implement constraints.Ordered. +// Mutates input slice s +func SortSlice[T constraints.Ordered](s []T) { + sort.Slice(s, func(i, j int) bool { + return s[i] < s[j] + }) +} + +func Filter[T interface{}](filter func(T) bool, s []T) []T { + filteredSlice := []T{} + for _, s := range s { + if filter(s) { + filteredSlice = append(filteredSlice, s) + } + } + return filteredSlice +} + +// ReverseSlice reverses the input slice in place. +// Does mutate argument. +func ReverseSlice[T any](s []T) []T { + maxIndex := len(s) + for i := 0; i < maxIndex/2; i++ { + temp := s[i] + s[i] = s[maxIndex-i-1] + s[maxIndex-1-i] = temp + } + return s +} + +// ContainsDuplicate checks if there are any duplicate +// elements in the slice. +func ContainsDuplicate[T any](arr []T) bool { + visited := make(map[any]bool, 0) + for i := 0; i < len(arr); i++ { + if visited[arr[i]] { + return true + } else { + visited[arr[i]] = true + } + } + return false +} diff --git a/wasmbinding/stargate_allowlist.go b/wasmbinding/stargate_allowlist.go index 1a1ca5483..2526ca97b 100644 --- a/wasmbinding/stargate_allowlist.go +++ b/wasmbinding/stargate_allowlist.go @@ -8,8 +8,10 @@ import ( ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" ibcconnectiontypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" - + dextypes "github.com/neutron-org/neutron/x/dex/types" + epochstypes "github.com/neutron-org/neutron/x/epochs/types" feeburnertypes "github.com/neutron-org/neutron/x/feeburner/types" + incentivestypes "github.com/neutron-org/neutron/x/incentives/types" interchainqueriestypes "github.com/neutron-org/neutron/x/interchainqueries/types" interchaintxstypes "github.com/neutron-org/neutron/x/interchaintxs/types" tokenfactorytypes "github.com/neutron-org/neutron/x/tokenfactory/types" @@ -52,5 +54,30 @@ func AcceptedStargateQueries() wasmkeeper.AcceptedStargateQueries { // feeburner "/neutron.feeburner.Query/Params": &feeburnertypes.QueryParamsResponse{}, + + // dex + "/dualitylabs.duality.dex.Query/Params": &dextypes.QueryParamsResponse{}, + "/dualitylabs.duality.dex.Query/LimitOrderTrancheUser": &dextypes.QueryGetLimitOrderTrancheUserResponse{}, + "/dualitylabs.duality.dex.Query/LimitOrderTranche": &dextypes.QueryGetLimitOrderTrancheResponse{}, + "/dualitylabs.duality.dex.Query/UserDepositsAll": &dextypes.QueryAllUserDepositsResponse{}, + "/dualitylabs.duality.dex.Query/UserLimitOrdersAll": &dextypes.QueryAllUserLimitOrdersResponse{}, + "/dualitylabs.duality.dex.Query/InactiveLimitOrderTranche": &dextypes.QueryGetInactiveLimitOrderTrancheResponse{}, + "/dualitylabs.duality.dex.Query/PoolReserves": &dextypes.QueryGetPoolReservesResponse{}, + "/dualitylabs.duality.dex.Query/EstimateMultiHopSwap": &dextypes.QueryEstimateMultiHopSwapResponse{}, + "/dualitylabs.duality.dex.Query/EstimatePlaceLimitOrder": &dextypes.QueryEstimatePlaceLimitOrderResponse{}, + + // incentives + "/dualitylabs.duality.incentives.Query/GetModuleStatus": &incentivestypes.GetModuleStatusResponse{}, + "/dualitylabs.duality.incentives.Query/GetGaugeByID": &incentivestypes.GetGaugeByIDResponse{}, + "/dualitylabs.duality.incentives.Query/GetGauges": &incentivestypes.GetGaugesResponse{}, + "/dualitylabs.duality.incentives.Query/GetStakeByID": &incentivestypes.GetStakeByIDResponse{}, + "/dualitylabs.duality.incentives.Query/GetStakes": &incentivestypes.GetStakesResponse{}, + "/dualitylabs.duality.incentives.Query/GetFutureRewardEstimate": &incentivestypes.GetFutureRewardEstimateResponse{}, + "/dualitylabs.duality.incentives.Query/GetAccountHistory": &incentivestypes.GetAccountHistoryResponse{}, + "/dualitylabs.duality.incentives.Query/GetGaugeQualifyingValue": &incentivestypes.GetGaugeQualifyingValueResponse{}, + + // epochs + "/dualitylabs.duality.epochs.Query/EpochInfos": &epochstypes.QueryEpochsInfoResponse{}, + "/dualitylabs.duality.epochs.Query/CurrentEpoch": &epochstypes.QueryCurrentEpochResponse{}, } } diff --git a/x/dex/client/cli/flags.go b/x/dex/client/cli/flags.go new file mode 100644 index 000000000..d2e060f6c --- /dev/null +++ b/x/dex/client/cli/flags.go @@ -0,0 +1,13 @@ +package cli + +import flag "github.com/spf13/pflag" + +const ( + FlagMaxAmountOut = "max-amount-out" +) + +func FlagSetMaxAmountOut() *flag.FlagSet { + fs := flag.NewFlagSet("", flag.ContinueOnError) + fs.String(FlagMaxAmountOut, "", "Max amount to be returned from trade") + return fs +} diff --git a/x/dex/client/cli/query.go b/x/dex/client/cli/query.go new file mode 100644 index 000000000..40609ab72 --- /dev/null +++ b/x/dex/client/cli/query.go @@ -0,0 +1,50 @@ +package cli + +import ( + "fmt" + // "strings" + + "github.com/spf13/cobra" + + "github.com/cosmos/cosmos-sdk/client" + // "github.com/cosmos/cosmos-sdk/client/flags" + // sdk "github.com/cosmos/cosmos-sdk/types" + + "github.com/neutron-org/neutron/x/dex/types" +) + +// GetQueryCmd returns the cli query commands for this module +func GetQueryCmd(_ string) *cobra.Command { + // Group dex 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(CmdQueryParams()) + cmd.AddCommand(CmdListLimitOrderTrancheUser()) + cmd.AddCommand(CmdShowLimitOrderTrancheUser()) + cmd.AddCommand(CmdListLimitOrderTranche()) + cmd.AddCommand(CmdShowLimitOrderTranche()) + cmd.AddCommand(CmdListUserDeposits()) + cmd.AddCommand(CmdListUserLimitOrders()) + cmd.AddCommand(CmdListTickLiquidity()) + cmd.AddCommand(CmdListInactiveLimitOrderTranche()) + cmd.AddCommand(CmdShowInactiveLimitOrderTranche()) + cmd.AddCommand(CmdListPoolReserves()) + cmd.AddCommand(CmdShowPoolReserves()) + cmd.AddCommand(CmdShowPool()) + cmd.AddCommand(CmdShowPoolByID()) + + cmd.AddCommand(CmdListPoolMetadata()) + cmd.AddCommand(CmdShowPoolMetadata()) + // this line is used by starport scaffolding # 1 + + return cmd +} diff --git a/x/dex/client/cli/query_inactive_limit_order_tranche.go b/x/dex/client/cli/query_inactive_limit_order_tranche.go new file mode 100644 index 000000000..f3a29df7e --- /dev/null +++ b/x/dex/client/cli/query_inactive_limit_order_tranche.go @@ -0,0 +1,90 @@ +package cli + +import ( + "context" + "strings" + + "github.com/cosmos/cosmos-sdk/client" + "github.com/cosmos/cosmos-sdk/client/flags" + "github.com/neutron-org/neutron/x/dex/types" + "github.com/spf13/cast" + "github.com/spf13/cobra" +) + +func CmdListInactiveLimitOrderTranche() *cobra.Command { + cmd := &cobra.Command{ + Use: "list-filled-limit-order-tranche", + Short: "list all InactiveLimitOrderTranche", + RunE: func(cmd *cobra.Command, args []string) error { + clientCtx := client.GetClientContextFromCmd(cmd) + + pageReq, err := client.ReadPageRequest(cmd.Flags()) + if err != nil { + return err + } + + queryClient := types.NewQueryClient(clientCtx) + + params := &types.QueryAllInactiveLimitOrderTrancheRequest{ + Pagination: pageReq, + } + + res, err := queryClient.InactiveLimitOrderTrancheAll(context.Background(), params) + if err != nil { + return err + } + + return clientCtx.PrintProto(res) + }, + } + + flags.AddPaginationFlagsToCmd(cmd, cmd.Use) + flags.AddQueryFlagsToCmd(cmd) + + return cmd +} + +func CmdShowInactiveLimitOrderTranche() *cobra.Command { + cmd := &cobra.Command{ + Use: "show-filled-limit-order-tranche [pair-id] [token-in] [tick-index] [tranche-key]", + Short: "shows a InactiveLimitOrderTranche", + Example: "show-filled limit-order-tranche tokenA<>tokenB tokenA [10] 0", + Args: cobra.ExactArgs(4), + RunE: func(cmd *cobra.Command, args []string) (err error) { + clientCtx := client.GetClientContextFromCmd(cmd) + + queryClient := types.NewQueryClient(clientCtx) + + argPairID := args[0] + argTokenIn := args[1] + + if strings.HasPrefix(args[2], "[") && strings.HasSuffix(args[2], "]") { + args[2] = strings.TrimPrefix(args[2], "[") + args[2] = strings.TrimSuffix(args[2], "]") + } + argTickIndex, err := cast.ToInt64E(args[2]) + argTrancheKey := args[3] + if err != nil { + return err + } + + params := &types.QueryGetInactiveLimitOrderTrancheRequest{ + PairID: argPairID, + TokenIn: argTokenIn, + TickIndex: argTickIndex, + TrancheKey: argTrancheKey, + } + + res, err := queryClient.InactiveLimitOrderTranche(context.Background(), params) + if err != nil { + return err + } + + return clientCtx.PrintProto(res) + }, + } + + flags.AddQueryFlagsToCmd(cmd) + + return cmd +} diff --git a/x/dex/client/cli/query_limit_order_tranche.go b/x/dex/client/cli/query_limit_order_tranche.go new file mode 100644 index 000000000..8185f0b23 --- /dev/null +++ b/x/dex/client/cli/query_limit_order_tranche.go @@ -0,0 +1,98 @@ +package cli + +import ( + "context" + "strconv" + "strings" + + "github.com/cosmos/cosmos-sdk/client" + "github.com/cosmos/cosmos-sdk/client/flags" + "github.com/neutron-org/neutron/x/dex/types" + "github.com/spf13/cobra" +) + +func CmdListLimitOrderTranche() *cobra.Command { + cmd := &cobra.Command{ + Use: "list-limit-order-tranche [pair-id] [token-in]", + Short: "list all LimitOrderTranches", + Example: "list-limit-order-tranche tokenA<>tokenB tokenA", + Args: cobra.ExactArgs(2), + RunE: func(cmd *cobra.Command, args []string) error { + clientCtx := client.GetClientContextFromCmd(cmd) + + pageReq, err := client.ReadPageRequest(cmd.Flags()) + if err != nil { + return err + } + + argPairID := args[0] + argTokenIn := args[1] + + queryClient := types.NewQueryClient(clientCtx) + + params := &types.QueryAllLimitOrderTrancheRequest{ + Pagination: pageReq, + PairID: argPairID, + TokenIn: argTokenIn, + } + + res, err := queryClient.LimitOrderTrancheAll(context.Background(), params) + if err != nil { + return err + } + + return clientCtx.PrintProto(res) + }, + } + + flags.AddPaginationFlagsToCmd(cmd, cmd.Use) + flags.AddQueryFlagsToCmd(cmd) + + return cmd +} + +func CmdShowLimitOrderTranche() *cobra.Command { + cmd := &cobra.Command{ + Use: "show-limit-order-tranche [pair-id] [tick-index] [token-in] [tranche-key]", + Short: "shows a LimitOrderTranche", + Example: "show-limit-order-tranche tokenA<>tokenB [5] tokenA 0", + Args: cobra.ExactArgs(4), + RunE: func(cmd *cobra.Command, args []string) (err error) { + clientCtx := client.GetClientContextFromCmd(cmd) + + queryClient := types.NewQueryClient(clientCtx) + + argPairID := args[0] + if strings.HasPrefix(args[1], "[") && strings.HasSuffix(args[1], "]") { + args[1] = strings.TrimPrefix(args[1], "[") + args[1] = strings.TrimSuffix(args[1], "]") + } + argTickIndex := args[1] + argTokenIn := args[2] + argTrancheKey := args[3] + + argTickIndexInt, err := strconv.ParseInt(argTickIndex, 10, 0) + if err != nil { + return err + } + + params := &types.QueryGetLimitOrderTrancheRequest{ + PairID: argPairID, + TickIndex: argTickIndexInt, + TokenIn: argTokenIn, + TrancheKey: argTrancheKey, + } + + res, err := queryClient.LimitOrderTranche(context.Background(), params) + if err != nil { + return err + } + + return clientCtx.PrintProto(res) + }, + } + + flags.AddQueryFlagsToCmd(cmd) + + return cmd +} diff --git a/x/dex/client/cli/query_limit_order_tranche_user.go b/x/dex/client/cli/query_limit_order_tranche_user.go new file mode 100644 index 000000000..c273e5d50 --- /dev/null +++ b/x/dex/client/cli/query_limit_order_tranche_user.go @@ -0,0 +1,73 @@ +package cli + +import ( + "context" + + "github.com/cosmos/cosmos-sdk/client" + "github.com/cosmos/cosmos-sdk/client/flags" + "github.com/neutron-org/neutron/x/dex/types" + "github.com/spf13/cobra" +) + +func CmdListLimitOrderTrancheUser() *cobra.Command { + cmd := &cobra.Command{ + Use: "list-limit-order-tranche-user", + Short: "list all LimitOrderTrancheUser", + RunE: func(cmd *cobra.Command, args []string) error { + clientCtx := client.GetClientContextFromCmd(cmd) + + pageReq, err := client.ReadPageRequest(cmd.Flags()) + if err != nil { + return err + } + + queryClient := types.NewQueryClient(clientCtx) + + params := &types.QueryAllLimitOrderTrancheUserRequest{ + Pagination: pageReq, + } + + res, err := queryClient.LimitOrderTrancheUserAll(context.Background(), params) + if err != nil { + return err + } + + return clientCtx.PrintProto(res) + }, + } + + flags.AddPaginationFlagsToCmd(cmd, cmd.Use) + flags.AddQueryFlagsToCmd(cmd) + + return cmd +} + +func CmdShowLimitOrderTrancheUser() *cobra.Command { + cmd := &cobra.Command{ + Use: "show-limit-order-tranche-user [address] [tranche-key]", + Short: "shows a LimitOrderTrancheUser", + Example: "show-limit-order-tranche-user TRANCHEKEY123 alice", + Args: cobra.ExactArgs(2), + RunE: func(cmd *cobra.Command, args []string) (err error) { + clientCtx := client.GetClientContextFromCmd(cmd) + + queryClient := types.NewQueryClient(clientCtx) + + params := &types.QueryGetLimitOrderTrancheUserRequest{ + Address: args[0], + TrancheKey: args[1], + } + + res, err := queryClient.LimitOrderTrancheUser(context.Background(), params) + if err != nil { + return err + } + + return clientCtx.PrintProto(res) + }, + } + + flags.AddQueryFlagsToCmd(cmd) + + return cmd +} diff --git a/x/dex/client/cli/query_params.go b/x/dex/client/cli/query_params.go new file mode 100644 index 000000000..2deda9bd7 --- /dev/null +++ b/x/dex/client/cli/query_params.go @@ -0,0 +1,34 @@ +package cli + +import ( + "context" + + "github.com/cosmos/cosmos-sdk/client" + "github.com/cosmos/cosmos-sdk/client/flags" + "github.com/neutron-org/neutron/x/dex/types" + "github.com/spf13/cobra" +) + +func CmdQueryParams() *cobra.Command { + cmd := &cobra.Command{ + Use: "params", + Short: "shows the parameters of the module", + Args: cobra.NoArgs, + RunE: func(cmd *cobra.Command, args []string) error { + clientCtx := client.GetClientContextFromCmd(cmd) + + queryClient := types.NewQueryClient(clientCtx) + + res, err := queryClient.Params(context.Background(), &types.QueryParamsRequest{}) + if err != nil { + return err + } + + return clientCtx.PrintProto(res) + }, + } + + flags.AddQueryFlagsToCmd(cmd) + + return cmd +} diff --git a/x/dex/client/cli/query_pool.go b/x/dex/client/cli/query_pool.go new file mode 100644 index 000000000..44c4914fd --- /dev/null +++ b/x/dex/client/cli/query_pool.go @@ -0,0 +1,95 @@ +package cli + +import ( + "context" + "strconv" + "strings" + + "github.com/cosmos/cosmos-sdk/client" + "github.com/cosmos/cosmos-sdk/client/flags" + "github.com/neutron-org/neutron/x/dex/types" + "github.com/spf13/cobra" +) + +func CmdShowPool() *cobra.Command { + cmd := &cobra.Command{ + Use: "show-pool '[pair-id]' [tick-index] [fee]", + Short: "shows a pool. Make sure to wrap your pair-id in quotes otherwise the shell will interpret <> as a separator token", + Example: "show-pool 'tokenA<>tokenB' [-5] 1", + Args: cobra.ExactArgs(3), + RunE: func(cmd *cobra.Command, args []string) (err error) { + clientCtx := client.GetClientContextFromCmd(cmd) + + queryClient := types.NewQueryClient(clientCtx) + + argPairID := args[0] + if strings.HasPrefix(args[1], "[") && strings.HasSuffix(args[1], "]") { + args[1] = strings.TrimPrefix(args[1], "[") + args[1] = strings.TrimSuffix(args[1], "]") + } + argTickIndex := args[1] + argFee := args[2] + + argFeeInt, err := strconv.ParseUint(argFee, 10, 0) + if err != nil { + return err + } + + argTickIndexInt, err := strconv.ParseInt(argTickIndex, 10, 0) + if err != nil { + return err + } + + params := &types.QueryPoolRequest{ + PairID: argPairID, + TickIndex: argTickIndexInt, + Fee: argFeeInt, + } + + res, err := queryClient.Pool(context.Background(), params) + if err != nil { + return err + } + + return clientCtx.PrintProto(res) + }, + } + + flags.AddQueryFlagsToCmd(cmd) + + return cmd +} + +func CmdShowPoolByID() *cobra.Command { + cmd := &cobra.Command{ + Use: "show-pool-by-id [poolID]", + Short: "shows a pool by poolID", + Example: "show-pool-by-id 5", + Args: cobra.ExactArgs(1), + RunE: func(cmd *cobra.Command, args []string) (err error) { + clientCtx := client.GetClientContextFromCmd(cmd) + + queryClient := types.NewQueryClient(clientCtx) + + argPoolID, err := strconv.ParseUint(args[0], 10, 0) + if err != nil { + return err + } + + params := &types.QueryPoolByIDRequest{ + PoolID: argPoolID, + } + + res, err := queryClient.PoolByID(context.Background(), params) + if err != nil { + return err + } + + return clientCtx.PrintProto(res) + }, + } + + flags.AddQueryFlagsToCmd(cmd) + + return cmd +} diff --git a/x/dex/client/cli/query_pool_metadata.go b/x/dex/client/cli/query_pool_metadata.go new file mode 100644 index 000000000..5412f789d --- /dev/null +++ b/x/dex/client/cli/query_pool_metadata.go @@ -0,0 +1,82 @@ +package cli + +import ( + "strconv" + + "github.com/cosmos/cosmos-sdk/client" + "github.com/cosmos/cosmos-sdk/client/flags" + "github.com/neutron-org/neutron/x/dex/types" + "github.com/spf13/cobra" +) + +func CmdListPoolMetadata() *cobra.Command { + cmd := &cobra.Command{ + Use: "list-pool-metadata", + Short: "list all PoolMetadata", + RunE: func(cmd *cobra.Command, args []string) error { + clientCtx, err := client.GetClientQueryContext(cmd) + if err != nil { + return err + } + + pageReq, err := client.ReadPageRequest(cmd.Flags()) + if err != nil { + return err + } + + queryClient := types.NewQueryClient(clientCtx) + + params := &types.QueryAllPoolMetadataRequest{ + Pagination: pageReq, + } + + res, err := queryClient.PoolMetadataAll(cmd.Context(), params) + if err != nil { + return err + } + + return clientCtx.PrintProto(res) + }, + } + + flags.AddPaginationFlagsToCmd(cmd, cmd.Use) + flags.AddQueryFlagsToCmd(cmd) + + return cmd +} + +func CmdShowPoolMetadata() *cobra.Command { + cmd := &cobra.Command{ + Use: "show-pool-metadata [id]", + Short: "shows a PoolMetadata", + Args: cobra.ExactArgs(1), + RunE: func(cmd *cobra.Command, args []string) error { + clientCtx, err := client.GetClientQueryContext(cmd) + if err != nil { + return err + } + + queryClient := types.NewQueryClient(clientCtx) + + id, err := strconv.ParseUint(args[0], 10, 64) + if err != nil { + return err + } + + params := &types.QueryGetPoolMetadataRequest{ + Id: id, + } + + res, err := queryClient.PoolMetadata(cmd.Context(), params) + if err != nil { + return err + } + + return clientCtx.PrintProto(res) + }, + } + + flags.AddQueryFlagsToCmd(cmd) + + return cmd +} diff --git a/x/dex/client/cli/query_pool_reserves.go b/x/dex/client/cli/query_pool_reserves.go new file mode 100644 index 000000000..ce36eb937 --- /dev/null +++ b/x/dex/client/cli/query_pool_reserves.go @@ -0,0 +1,105 @@ +package cli + +import ( + "context" + "strconv" + "strings" + + "github.com/cosmos/cosmos-sdk/client" + "github.com/cosmos/cosmos-sdk/client/flags" + "github.com/neutron-org/neutron/x/dex/types" + "github.com/spf13/cobra" +) + +func CmdListPoolReserves() *cobra.Command { + cmd := &cobra.Command{ + Use: "list-pool-reserves [pair-id] [token-in]", + Short: "Query AllPoolReserves", + Example: "list-pool-reserves tokenA<>tokenB tokenA", + Args: cobra.ExactArgs(2), + RunE: func(cmd *cobra.Command, args []string) (err error) { + reqPairID := args[0] + reqTokenIn := args[1] + + clientCtx, err := client.GetClientQueryContext(cmd) + if err != nil { + return err + } + + queryClient := types.NewQueryClient(clientCtx) + + params := &types.QueryAllPoolReservesRequest{ + PairID: reqPairID, + TokenIn: reqTokenIn, + } + + pageReq, err := client.ReadPageRequest(cmd.Flags()) + if err != nil { + return err + } + params.Pagination = pageReq + + res, err := queryClient.PoolReservesAll(cmd.Context(), params) + if err != nil { + return err + } + + return clientCtx.PrintProto(res) + }, + } + + flags.AddQueryFlagsToCmd(cmd) + + return cmd +} + +func CmdShowPoolReserves() *cobra.Command { + cmd := &cobra.Command{ + Use: "show-pool-reserves [pair-id] [tick-index] [token-in] [fee]", + Short: "shows a PoolReserves", + Example: "show-pool-reserves tokenA<>tokenB [-5] tokenA 1", + Args: cobra.ExactArgs(4), + RunE: func(cmd *cobra.Command, args []string) (err error) { + clientCtx := client.GetClientContextFromCmd(cmd) + + queryClient := types.NewQueryClient(clientCtx) + + argPairID := args[0] + if strings.HasPrefix(args[1], "[") && strings.HasSuffix(args[1], "]") { + args[1] = strings.TrimPrefix(args[1], "[") + args[1] = strings.TrimSuffix(args[1], "]") + } + argTickIndex := args[1] + argTokenIn := args[2] + argFee := args[3] + + argTrancheKeyInt, err := strconv.ParseUint(argFee, 10, 0) + if err != nil { + return err + } + + argTickIndexInt, err := strconv.ParseInt(argTickIndex, 10, 0) + if err != nil { + return err + } + + params := &types.QueryGetPoolReservesRequest{ + PairID: argPairID, + TickIndex: argTickIndexInt, + TokenIn: argTokenIn, + Fee: argTrancheKeyInt, + } + + res, err := queryClient.PoolReserves(context.Background(), params) + if err != nil { + return err + } + + return clientCtx.PrintProto(res) + }, + } + + flags.AddQueryFlagsToCmd(cmd) + + return cmd +} diff --git a/x/dex/client/cli/query_test.go b/x/dex/client/cli/query_test.go new file mode 100644 index 000000000..bccd16375 --- /dev/null +++ b/x/dex/client/cli/query_test.go @@ -0,0 +1,450 @@ +package cli + +// import ( +// "testing" + +// "github.com/cosmos/cosmos-sdk/testutil/cli" +// "github.com/cosmos/cosmos-sdk/testutil/network" +// sdk "github.com/cosmos/cosmos-sdk/types" +// "github.com/neutron-org/neutron/app" +// dexclient "github.com/neutron-org/neutron/x/dex/client/cli" +// "github.com/neutron-org/neutron/x/dex/types" +// "github.com/stretchr/testify/require" +// "github.com/stretchr/testify/suite" +// ) + +// type QueryTestSuite struct { +// suite.Suite + +// cfg network.Config +// network *network.Network + +// addr1 sdk.AccAddress +// addr2 sdk.AccAddress +// } + +// func (s *QueryTestSuite) SetupSuite() { +// var err error +// s.T().Log("setting up integration test suite") + +// s.cfg = network.DefaultConfig(app.NewTestNetworkFixture) +// s.cfg.NumValidators = 1 + +// s.network, err = network.New(s.T(), s.T().TempDir(), s.cfg) +// s.Require().NoError(err) + +// _, err = s.network.WaitForHeight(2) +// s.Require().NoError(err) +// } + +// func TestQueryTestSuite(t *testing.T) { +// suite.Run(t, new(QueryTestSuite)) +// } + +// var testAddress = sdk.AccAddress([]byte("testAddr")) + +// var limitOrderTrancheList = []types.TickLiquidity{ +// { +// Liquidity: &types.TickLiquidity_LimitOrderTranche{ +// LimitOrderTranche: &types.LimitOrderTranche{ +// PairID: &types.PairID{ +// Token0: "TokenA", +// Token1: "TokenB", +// }, +// TokenIn: "TokenB", +// TickIndex: 1, +// TrancheKey: "0", +// ReservesTokenIn: sdk.NewInt(10), +// ReservesTokenOut: sdk.ZeroInt(), +// TotalTokenIn: sdk.NewInt(10), +// TotalTokenOut: sdk.ZeroInt(), +// }, +// }, +// }, +// { +// Liquidity: &types.TickLiquidity_LimitOrderTranche{ +// LimitOrderTranche: &types.LimitOrderTranche{ +// PairID: &types.PairID{ +// Token0: "TokenA", +// Token1: "TokenB", +// }, +// TokenIn: "TokenB", +// TickIndex: 2, +// TrancheKey: "1", +// ReservesTokenIn: sdk.NewInt(10), +// ReservesTokenOut: sdk.ZeroInt(), +// TotalTokenIn: sdk.NewInt(10), +// TotalTokenOut: sdk.ZeroInt(), +// }, +// }, +// }, +// } + +// var inactiveLimitOrderTrancheList = []types.LimitOrderTranche{ +// { +// PairID: &types.PairID{Token0: "TokenA", Token1: "TokenB"}, +// TokenIn: "TokenB", +// TickIndex: 0, +// TrancheKey: "0", +// TotalTokenIn: sdk.NewInt(10), +// TotalTokenOut: sdk.NewInt(10), +// ReservesTokenOut: sdk.NewInt(10), +// ReservesTokenIn: sdk.NewInt(0), +// }, +// { +// PairID: &types.PairID{Token0: "TokenA", Token1: "TokenB"}, +// TokenIn: "TokenB", +// TickIndex: 0, +// TrancheKey: "1", +// TotalTokenIn: sdk.NewInt(10), +// TotalTokenOut: sdk.NewInt(10), +// ReservesTokenOut: sdk.NewInt(10), +// ReservesTokenIn: sdk.NewInt(0), +// }, +// } + +// var poolReservesList = []types.TickLiquidity{ +// { +// Liquidity: &types.TickLiquidity_PoolReserves{ +// PoolReserves: &types.PoolReserves{ +// PairID: &types.PairID{ +// Token0: "TokenA", +// Token1: "TokenB", +// }, +// TokenIn: "TokenB", +// TickIndex: 0, +// Fee: 1, +// Reserves: sdk.NewInt(10), +// }, +// }, +// }, +// { +// Liquidity: &types.TickLiquidity_PoolReserves{ +// PoolReserves: &types.PoolReserves{ +// PairID: &types.PairID{ +// Token0: "TokenA", +// Token1: "TokenB", +// }, +// TokenIn: "TokenB", +// TickIndex: 0, +// Fee: 3, +// Reserves: sdk.NewInt(10), +// }, +// }, +// }, +// } + +// var limitOrderTrancheUserList = []types.LimitOrderTrancheUser{ +// { +// PairID: &types.PairID{Token0: "TokenA", Token1: "TokenB"}, +// Token: "TokenA", +// TickIndex: 1, +// TrancheKey: "0", +// Address: testAddress.String(), +// SharesOwned: sdk.NewInt(10), +// SharesWithdrawn: sdk.NewInt(0), +// SharesCancelled: sdk.NewInt(0), +// }, +// { +// PairID: &types.PairID{Token0: "TokenA", Token1: "TokenB"}, +// Token: "TokenB", +// TickIndex: 20, +// TrancheKey: "1", +// Address: testAddress.String(), +// SharesOwned: sdk.NewInt(10), +// SharesWithdrawn: sdk.NewInt(0), +// SharesCancelled: sdk.NewInt(0), +// }, +// } + +// var genesisState types.GenesisState = types.GenesisState{ +// TickLiquidityList: append(poolReservesList, limitOrderTrancheList...), +// LimitOrderTrancheUserList: limitOrderTrancheUserList, +// InactiveLimitOrderTrancheList: inactiveLimitOrderTrancheList, +// } + +// func (s *QueryTestSuite) TestQueryCmdListTickLiquidity() { +// val := s.network.Validators[0] +// clientCtx := val.ClientCtx +// testCases := []struct { +// name string +// args []string +// expErr bool +// expErrMsg string +// expOutput []types.TickLiquidity +// }{ +// { +// name: "valid", +// args: []string{"TokenA<>TokenB", "TokenB"}, +// expOutput: append(poolReservesList, limitOrderTrancheList...), +// }, +// } + +// for _, tc := range testCases { +// s.Run(tc.name, func() { +// cmd := dexclient.CmdListTickLiquidity() +// out, err := cli.ExecTestCLICmd(clientCtx, cmd, tc.args) +// if tc.expErr { +// require.Error(s.T(), err) +// require.Contains(s.T(), out.String(), tc.expErrMsg) +// } else { +// require.NoError(s.T(), err) +// var res types.QueryAllTickLiquidityResponse +// require.NoError(s.T(), clientCtx.Codec.UnmarshalJSON(out.Bytes(), &res)) +// require.NotEmpty(s.T(), res) +// require.Equal(s.T(), tc.expOutput, res.TickLiquidity) +// } +// }) +// } +// } + +// func (s *QueryTestSuite) TestQueryCmdShowLimitOrderTranche() { +// val := s.network.Validators[0] +// clientCtx := val.ClientCtx +// testCases := []struct { +// name string +// args []string +// expErr bool +// expErrMsg string +// expOutput types.LimitOrderTranche +// }{ +// // show-limit-order-tranche [pair-id] [tick-index] [token-in] [tranche-key] +// { +// name: "valid", +// args: []string{"TokenA<>TokenB", "1", "TokenB", "0"}, +// expOutput: *limitOrderTrancheList[0].GetLimitOrderTranche(), +// }, +// { +// name: "invalid pair", +// args: []string{"TokenC<>TokenB", "20", "TokenB", "1"}, +// expErr: true, +// expErrMsg: "key not found", +// }, +// { +// name: "too many parameters", +// args: []string{"TokenA<>B", "20", "TokenB", "1", "10"}, +// expErr: true, +// expErrMsg: "Error: accepts 4 arg(s), received 5", +// }, +// { +// name: "no parameters", +// args: []string{}, +// expErr: true, +// expErrMsg: "Error: accepts 4 arg(s), received 0", +// }, +// { +// name: "too few parameters", +// args: []string{"TokenA<>B", "20", "TokenB"}, +// expErr: true, +// expErrMsg: "Error: accepts 4 arg(s), received 3", +// }, +// } +// for _, tc := range testCases { +// s.Run(tc.name, func() { +// cmd := dexclient.CmdShowLimitOrderTranche() +// out, err := cli.ExecTestCLICmd(clientCtx, cmd, tc.args) +// if tc.expErr { +// require.Error(s.T(), err) +// require.Contains(s.T(), out.String(), tc.expErrMsg) +// } else { +// require.NoError(s.T(), err) +// var res types.QueryGetLimitOrderTrancheResponse +// require.NoError(s.T(), clientCtx.Codec.UnmarshalJSON(out.Bytes(), &res)) +// require.NotEmpty(s.T(), res) +// require.Equal(s.T(), tc.expOutput, res.LimitOrderTranche) +// } +// }) +// } +// } + +// func (s *QueryTestSuite) TestQueryCmdShowLimitOrderTrancheUser() { +// val := s.network.Validators[0] +// clientCtx := val.ClientCtx +// testCases := []struct { +// name string +// args []string +// expErr bool +// expErrMsg string +// expOutput types.LimitOrderTrancheUser +// }{ +// // "show-limit-order-tranche-user [address] [tranche-key]" +// { +// name: "valid", +// args: []string{testAddress.String(), "0"}, +// expOutput: limitOrderTrancheUserList[0], +// }, +// { +// name: "invalid pair", +// args: []string{testAddress.String(), "BADKEY"}, +// expErr: true, +// expErrMsg: "key not found", +// }, +// { +// name: "too many parameters", +// args: []string{testAddress.String(), "0", "EXTRAARG"}, +// expErr: true, +// expErrMsg: "Error: accepts 2 arg(s), received 3", +// }, +// { +// name: "no parameters", +// args: []string{}, +// expErr: true, +// expErrMsg: "Error: accepts 2 arg(s), received 0", +// }, +// { +// name: "too few parameters", +// args: []string{testAddress.String()}, +// expErr: true, +// expErrMsg: "Error: accepts 2 arg(s), received 1", +// }, +// } + +// for _, tc := range testCases { +// s.Run(tc.name, func() { +// cmd := dexclient.CmdShowLimitOrderTrancheUser() +// out, err := cli.ExecTestCLICmd(clientCtx, cmd, tc.args) +// if tc.expErr { +// require.Error(s.T(), err) +// require.Contains(s.T(), out.String(), tc.expErrMsg) +// } else { +// require.NoError(s.T(), err) + +// var res types.QueryGetLimitOrderTrancheUserResponse +// require.NoError(s.T(), clientCtx.Codec.UnmarshalJSON(out.Bytes(), &res)) +// require.NotEmpty(s.T(), res) +// require.Equal(s.T(), tc.expOutput, res.LimitOrderTrancheUser) +// } +// }) +// } +// } + +// func (s *QueryTestSuite) TestQueryCmdListLimitOrderTrancheUser() { +// val := s.network.Validators[0] +// clientCtx := val.ClientCtx +// testCases := []struct { +// name string +// args []string +// expErr bool +// expErrMsg string +// expOutput []types.LimitOrderTrancheUser +// }{ +// { +// name: "valid", +// args: []string{}, +// expOutput: limitOrderTrancheUserList, +// }, +// } + +// for _, tc := range testCases { +// s.Run(tc.name, func() { +// cmd := dexclient.CmdListLimitOrderTrancheUser() +// out, err := cli.ExecTestCLICmd(clientCtx, cmd, tc.args) +// if tc.expErr { +// require.Error(s.T(), err) +// require.Contains(s.T(), out.String(), tc.expErrMsg) +// } else { +// require.NoError(s.T(), err) + +// var res types.QueryAllLimitOrderTrancheUserResponse +// require.NoError(s.T(), clientCtx.Codec.UnmarshalJSON(out.Bytes(), &res)) +// require.NotEmpty(s.T(), res) +// require.Equal(s.T(), tc.expOutput, res.LimitOrderTrancheUser) +// } +// }) +// } +// } + +// func (s *QueryTestSuite) TestQueryCmdListInactiveLimitOrderTranche() { +// val := s.network.Validators[0] +// clientCtx := val.ClientCtx +// testCases := []struct { +// name string +// args []string +// expErr bool +// expErrMsg string +// expOutput []types.LimitOrderTranche +// }{ +// { +// name: "valid", +// args: []string{}, +// expOutput: inactiveLimitOrderTrancheList, +// }, +// } + +// for _, tc := range testCases { +// s.Run(tc.name, func() { +// cmd := dexclient.CmdListInactiveLimitOrderTranche() +// out, err := cli.ExecTestCLICmd(clientCtx, cmd, tc.args) +// if tc.expErr { +// require.Error(s.T(), err) +// require.Contains(s.T(), out.String(), tc.expErrMsg) +// } else { +// require.NoError(s.T(), err) + +// var res types.QueryAllInactiveLimitOrderTrancheResponse +// require.NoError(s.T(), clientCtx.Codec.UnmarshalJSON(out.Bytes(), &res)) +// require.NotEmpty(s.T(), res) +// require.Equal(s.T(), tc.expOutput, res.InactiveLimitOrderTranche) +// } +// }) +// } +// } + +// func (s *QueryTestSuite) TestQueryCmdShowInactiveLimitOrderTranche() { +// val := s.network.Validators[0] +// clientCtx := val.ClientCtx +// testCases := []struct { +// name string +// args []string +// expErr bool +// expErrMsg string +// expOutput types.LimitOrderTranche +// }{ +// // show-filled-limit-order-tranche [pair-id] [token-in] [tick-index] [tranche-index]", +// { +// name: "valid", +// args: []string{"TokenA<>TokenB", "TokenB", "0", "0"}, +// expOutput: inactiveLimitOrderTrancheList[0], +// }, +// { +// name: "invalid pair", +// args: []string{"TokenC<>TokenB", "TokenB", "0", "0"}, +// expErr: true, +// expErrMsg: "key not found", +// }, +// { +// name: "too many parameters", +// args: []string{"TokenC<>TokenB", "TokenB", "0", "0", "Extra arg"}, +// expErr: true, +// expErrMsg: "Error: accepts 4 arg(s), received 5", +// }, +// { +// name: "no parameters", +// args: []string{}, +// expErr: true, +// expErrMsg: "Error: accepts 4 arg(s), received 0", +// }, +// { +// name: "too few parameters", +// args: []string{"TokenC<>TokenB", "TokenB", "0"}, +// expErr: true, +// expErrMsg: "Error: accepts 4 arg(s), received 3", +// }, +// } +// for _, tc := range testCases { +// s.Run(tc.name, func() { +// cmd := dexclient.CmdShowInactiveLimitOrderTranche() +// out, err := cli.ExecTestCLICmd(clientCtx, cmd, tc.args) +// if tc.expErr { +// require.Error(s.T(), err) +// require.Contains(s.T(), out.String(), tc.expErrMsg) +// } else { +// require.NoError(s.T(), err) +// var res types.QueryGetInactiveLimitOrderTrancheResponse +// require.NoError(s.T(), clientCtx.Codec.UnmarshalJSON(out.Bytes(), &res)) +// require.NotEmpty(s.T(), res) +// require.Equal(s.T(), tc.expOutput, res.InactiveLimitOrderTranche) +// } +// }) +// } +// } diff --git a/x/dex/client/cli/query_tick_liquidity.go b/x/dex/client/cli/query_tick_liquidity.go new file mode 100644 index 000000000..2076f5d34 --- /dev/null +++ b/x/dex/client/cli/query_tick_liquidity.go @@ -0,0 +1,50 @@ +package cli + +import ( + "context" + + "github.com/cosmos/cosmos-sdk/client" + "github.com/cosmos/cosmos-sdk/client/flags" + "github.com/neutron-org/neutron/x/dex/types" + "github.com/spf13/cobra" +) + +func CmdListTickLiquidity() *cobra.Command { + cmd := &cobra.Command{ + Use: "list-tick-liquidity [pair-id] [token-in]", + Short: "list all tickLiquidity", + Example: "list-tick-liquidity tokenA<>tokenB tokenA", + Args: cobra.ExactArgs(2), + RunE: func(cmd *cobra.Command, args []string) error { + clientCtx := client.GetClientContextFromCmd(cmd) + + argPairID := args[0] + argTokenIn := args[1] + + pageReq, err := client.ReadPageRequest(cmd.Flags()) + if err != nil { + return err + } + + queryClient := types.NewQueryClient(clientCtx) + + params := &types.QueryAllTickLiquidityRequest{ + PairID: argPairID, + TokenIn: argTokenIn, + Pagination: pageReq, + } + + res, err := queryClient.TickLiquidityAll(context.Background(), params) + if err != nil { + return err + } + + return clientCtx.PrintProto(res) + }, + } + + flags.AddPaginationFlagsToCmd(cmd, cmd.Use) + flags.AddQueryFlagsToCmd(cmd) + + return cmd +} diff --git a/x/dex/client/cli/query_user_deposits.go b/x/dex/client/cli/query_user_deposits.go new file mode 100644 index 000000000..410e44f63 --- /dev/null +++ b/x/dex/client/cli/query_user_deposits.go @@ -0,0 +1,43 @@ +package cli + +import ( + "github.com/cosmos/cosmos-sdk/client" + "github.com/cosmos/cosmos-sdk/client/flags" + "github.com/neutron-org/neutron/x/dex/types" + "github.com/spf13/cobra" +) + +func CmdListUserDeposits() *cobra.Command { + cmd := &cobra.Command{ + Use: "list-user-deposits [address]", + Short: "list all users deposits", + Example: "list-user-deposits alice", + Args: cobra.ExactArgs(1), + RunE: func(cmd *cobra.Command, args []string) (err error) { + reqAddress := args[0] + + clientCtx, err := client.GetClientQueryContext(cmd) + if err != nil { + return err + } + + queryClient := types.NewQueryClient(clientCtx) + + params := &types.QueryAllUserDepositsRequest{ + Address: reqAddress, + } + + res, err := queryClient.UserDepositsAll(cmd.Context(), params) + if err != nil { + return err + } + + return clientCtx.PrintProto(res) + }, + } + + flags.AddQueryFlagsToCmd(cmd) + flags.AddPaginationFlagsToCmd(cmd, cmd.Use) + + return cmd +} diff --git a/x/dex/client/cli/query_user_limit_orders.go b/x/dex/client/cli/query_user_limit_orders.go new file mode 100644 index 000000000..2800a6943 --- /dev/null +++ b/x/dex/client/cli/query_user_limit_orders.go @@ -0,0 +1,43 @@ +package cli + +import ( + "github.com/cosmos/cosmos-sdk/client" + "github.com/cosmos/cosmos-sdk/client/flags" + "github.com/neutron-org/neutron/x/dex/types" + "github.com/spf13/cobra" +) + +func CmdListUserLimitOrders() *cobra.Command { + cmd := &cobra.Command{ + Use: "list-user-limit-orders [address]", + Short: "list all users limit orders", + Example: "list-user-limit-orders alice", + Args: cobra.ExactArgs(1), + RunE: func(cmd *cobra.Command, args []string) (err error) { + reqAddress := args[0] + + clientCtx, err := client.GetClientQueryContext(cmd) + if err != nil { + return err + } + + queryClient := types.NewQueryClient(clientCtx) + + params := &types.QueryAllUserLimitOrdersRequest{ + Address: reqAddress, + } + + res, err := queryClient.LimitOrderTrancheUserAllByAddress(cmd.Context(), params) + if err != nil { + return err + } + + return clientCtx.PrintProto(res) + }, + } + + flags.AddQueryFlagsToCmd(cmd) + flags.AddPaginationFlagsToCmd(cmd, cmd.Use) + + return cmd +} diff --git a/x/dex/client/cli/tx.go b/x/dex/client/cli/tx.go new file mode 100644 index 000000000..7628cad30 --- /dev/null +++ b/x/dex/client/cli/tx.go @@ -0,0 +1,34 @@ +package cli + +import ( + "fmt" + "time" + + "github.com/spf13/cobra" + + "github.com/cosmos/cosmos-sdk/client" + "github.com/neutron-org/neutron/x/dex/types" +) + +var DefaultRelativePacketTimeoutTimestamp = uint64((time.Duration(10) * time.Minute).Nanoseconds()) + +// GetTxCmd returns the transaction commands for this module +func GetTxCmd() *cobra.Command { + cmd := &cobra.Command{ + Use: types.ModuleName, + Short: fmt.Sprintf("%s transactions subcommands", types.ModuleName), + DisableFlagParsing: true, + SuggestionsMinimumDistance: 2, + RunE: client.ValidateCmd, + } + + cmd.AddCommand(CmdDeposit()) + cmd.AddCommand(CmdWithdrawal()) + cmd.AddCommand(CmdPlaceLimitOrder()) + cmd.AddCommand(CmdWithdrawFilledLimitOrder()) + cmd.AddCommand(CmdCancelLimitOrder()) + cmd.AddCommand(CmdMultiHopSwap()) + // this line is used by starport scaffolding # 1 + + return cmd +} diff --git a/x/dex/client/cli/tx_cancel_limit_order.go b/x/dex/client/cli/tx_cancel_limit_order.go new file mode 100644 index 000000000..2eb7340f3 --- /dev/null +++ b/x/dex/client/cli/tx_cancel_limit_order.go @@ -0,0 +1,38 @@ +package cli + +import ( + "github.com/cosmos/cosmos-sdk/client" + "github.com/cosmos/cosmos-sdk/client/flags" + "github.com/cosmos/cosmos-sdk/client/tx" + "github.com/neutron-org/neutron/x/dex/types" + "github.com/spf13/cobra" +) + +func CmdCancelLimitOrder() *cobra.Command { + cmd := &cobra.Command{ + Use: "cancel-limit-order [tranche-key]", + Short: "Broadcast message CancelLimitOrder", + Example: "cancel-limit-order TRANCHEKEY123 --from alice", + Args: cobra.ExactArgs(1), + RunE: func(cmd *cobra.Command, args []string) (err error) { + clientCtx, err := client.GetClientTxContext(cmd) + if err != nil { + return err + } + + msg := types.NewMsgCancelLimitOrder( + clientCtx.GetFromAddress().String(), + args[0], + ) + if err := msg.ValidateBasic(); err != nil { + return err + } + + return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg) + }, + } + + flags.AddTxFlagsToCmd(cmd) + + return cmd +} diff --git a/x/dex/client/cli/tx_deposit.go b/x/dex/client/cli/tx_deposit.go new file mode 100644 index 000000000..23c6300e4 --- /dev/null +++ b/x/dex/client/cli/tx_deposit.go @@ -0,0 +1,121 @@ +package cli + +import ( + "log" + "strconv" + "strings" + + "github.com/cosmos/cosmos-sdk/client" + "github.com/cosmos/cosmos-sdk/client/flags" + "github.com/cosmos/cosmos-sdk/client/tx" + sdk "github.com/cosmos/cosmos-sdk/types" + sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/neutron-org/neutron/x/dex/types" + "github.com/spf13/cobra" +) + +func CmdDeposit() *cobra.Command { + cmd := &cobra.Command{ + //nolint:lll + Use: "deposit [receiver] [token-a] [token-b] [list of amount-0] [list of amount-1] [list of tick-index] [list of fees] [disable_autoswap]", + Short: "Broadcast message deposit", + Example: "deposit alice tokenA tokenB 100,0 0,50 [-10,5] 1,1 false,false --from alice", + Args: cobra.ExactArgs(8), + RunE: func(cmd *cobra.Command, args []string) (err error) { + argReceiver := args[0] + argTokenA := args[1] + argTokenB := args[2] + argAmountsA := strings.Split(args[3], ",") + argAmountsB := strings.Split(args[4], ",") + + if args[5] == "-" { + log.Printf("\"this is a test\": %v\n", "this is a test") + } + + if strings.HasPrefix(args[5], "[") && strings.HasSuffix(args[5], "]") { + args[5] = strings.TrimPrefix(args[5], "[") + args[5] = strings.TrimSuffix(args[5], "]") + } + argTicksIndexes := strings.Split(args[5], ",") + + argFees := strings.Split(args[6], ",") + argDepositOptions := strings.Split(args[7], ",") + + var AmountsA []sdk.Int + var AmountsB []sdk.Int + var TicksIndexesInt []int64 + var FeesUint []uint64 + var DepositOptions []*types.DepositOptions + + for _, s := range argAmountsA { + amountA, ok := sdk.NewIntFromString(s) + if !ok { + return sdkerrors.Wrapf(types.ErrIntOverflowTx, "Integer overflow for amountsA") + } + + AmountsA = append(AmountsA, amountA) + } + + for _, s := range argAmountsB { + amountB, ok := sdk.NewIntFromString(s) + if !ok { + return sdkerrors.Wrapf(types.ErrIntOverflowTx, "Integer overflow for amountsB") + } + + AmountsB = append(AmountsB, amountB) + } + + for _, s := range argTicksIndexes { + TickIndexInt, err := strconv.ParseInt(s, 10, 0) + if err != nil { + return err + } + + TicksIndexesInt = append(TicksIndexesInt, TickIndexInt) + } + + for _, s := range argFees { + FeeInt, err := strconv.ParseUint(s, 10, 0) + if err != nil { + return err + } + + FeesUint = append(FeesUint, FeeInt) + } + + for _, s := range argDepositOptions { + disableAutoswap, err := strconv.ParseBool(s) + if err != nil { + return err + } + DepositOptions = append(DepositOptions, &types.DepositOptions{DisableAutoswap: disableAutoswap}) + } + + clientCtx, err := client.GetClientTxContext(cmd) + if err != nil { + return err + } + + msg := types.NewMsgDeposit( + clientCtx.GetFromAddress().String(), + argReceiver, + argTokenA, + argTokenB, + AmountsA, + AmountsB, + TicksIndexesInt, + FeesUint, + DepositOptions, + ) + if err := msg.ValidateBasic(); err != nil { + return err + } + + return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg) + }, + } + + flags.AddTxFlagsToCmd(cmd) + + return cmd +} diff --git a/x/dex/client/cli/tx_multi_hop_swap.go b/x/dex/client/cli/tx_multi_hop_swap.go new file mode 100644 index 000000000..ff3eb34f9 --- /dev/null +++ b/x/dex/client/cli/tx_multi_hop_swap.go @@ -0,0 +1,75 @@ +package cli + +import ( + "strconv" + "strings" + + "github.com/cosmos/cosmos-sdk/client" + "github.com/cosmos/cosmos-sdk/client/flags" + "github.com/cosmos/cosmos-sdk/client/tx" + sdk "github.com/cosmos/cosmos-sdk/types" + sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + math_utils "github.com/neutron-org/neutron/utils/math" + "github.com/neutron-org/neutron/x/dex/types" + "github.com/spf13/cobra" +) + +var _ = strconv.Itoa(0) + +func CmdMultiHopSwap() *cobra.Command { + cmd := &cobra.Command{ + Use: "multi-hop-swap [receiver] [routes] [amount-in] [exit-limit-price] [pick-best-route]", + Short: "Broadcast message multiHopSwap", + Args: cobra.ExactArgs(5), + RunE: func(cmd *cobra.Command, args []string) (err error) { + argReceiever := args[0] + argRoutes := strings.Split(args[1], ";") + argAmountIn := args[2] + argExitLimitPrice := args[3] + argPickBest := args[4] + + routesArr := make([][]string, len(argRoutes)) + for i, route := range argRoutes { + routesArr[i] = strings.Split(route, ",") + } + + amountInInt, ok := sdk.NewIntFromString(argAmountIn) + if !ok { + return sdkerrors.Wrapf(types.ErrIntOverflowTx, "Invalid value for amount-in") + } + + exitLimitPriceDec, err := math_utils.NewPrecDecFromStr(argExitLimitPrice) + if err != nil { + return sdkerrors.Wrapf(types.ErrIntOverflowTx, "Invalid value for exit-limit-price") + } + + pickBest, err := strconv.ParseBool(argPickBest) + if err != nil { + return err + } + + clientCtx, err := client.GetClientTxContext(cmd) + if err != nil { + return err + } + + msg := types.NewMsgMultiHopSwap( + clientCtx.GetFromAddress().String(), + argReceiever, + routesArr, + amountInInt, + exitLimitPriceDec, + pickBest, + ) + if err := msg.ValidateBasic(); err != nil { + return err + } + + return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg) + }, + } + + flags.AddTxFlagsToCmd(cmd) + + return cmd +} diff --git a/x/dex/client/cli/tx_place_limit_order.go b/x/dex/client/cli/tx_place_limit_order.go new file mode 100644 index 000000000..4e4faa95d --- /dev/null +++ b/x/dex/client/cli/tx_place_limit_order.go @@ -0,0 +1,107 @@ +package cli + +import ( + "strconv" + "strings" + "time" + + "github.com/cosmos/cosmos-sdk/client" + "github.com/cosmos/cosmos-sdk/client/flags" + "github.com/cosmos/cosmos-sdk/client/tx" + sdk "github.com/cosmos/cosmos-sdk/types" + sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/neutron-org/neutron/x/dex/types" + "github.com/spf13/cobra" +) + +func CmdPlaceLimitOrder() *cobra.Command { + cmd := &cobra.Command{ + //nolint:lll + Use: "place-limit-order [receiver] [token-in] [token-out] [tick-index] [amount-in] ?[order-type] ?[expirationTime] ?(--max-amout-out)", + Short: "Broadcast message PlaceLimitOrder", + Example: "place-limit-order alice tokenA tokenB [-10] tokenA 50 GOOD_TIL_TIME '01/02/2006 15:04:05' --max-amount-out 20 --from alice", + Args: cobra.RangeArgs(5, 7), + RunE: func(cmd *cobra.Command, args []string) (err error) { + argReceiver := args[0] + argTokenIn := args[1] + argTokenOut := args[2] + if strings.HasPrefix(args[3], "[") && strings.HasSuffix(args[3], "]") { + args[3] = strings.TrimPrefix(args[3], "[") + args[3] = strings.TrimSuffix(args[3], "]") + } + argTickIndex := args[3] + argTickIndexInt, err := strconv.ParseInt(argTickIndex, 10, 0) + if err != nil { + return err + } + argAmountIn := args[4] + + amountInInt, ok := sdk.NewIntFromString(argAmountIn) + if !ok { + return sdkerrors.Wrapf(types.ErrIntOverflowTx, "Integer overflow for amount-in") + } + + orderType := types.LimitOrderType_GOOD_TIL_CANCELLED + if len(args) >= 6 { + orderTypeInt, ok := types.LimitOrderType_value[args[5]] + if !ok { + return types.ErrInvalidOrderType + } + orderType = types.LimitOrderType(orderTypeInt) + } + + var goodTil *time.Time + if len(args) == 7 { + const timeFormat = "01/02/2006 15:04:05" + tm, err := time.Parse(timeFormat, args[6]) + if err != nil { + return sdkerrors.Wrapf(types.ErrInvalidTimeString, err.Error()) + } + goodTil = &tm + } + + maxAmountOutArg, err := cmd.Flags().GetString(FlagMaxAmountOut) + if err != nil { + return err + } + var maxAmountOutIntP *sdk.Int = nil + if maxAmountOutArg != "" { + maxAmountOutInt, ok := sdk.NewIntFromString(maxAmountOutArg) + if !ok { + return sdkerrors.Wrapf( + types.ErrIntOverflowTx, + "Integer overflow for max-amount-out", + ) + } + maxAmountOutIntP = &maxAmountOutInt + } + + clientCtx, err := client.GetClientTxContext(cmd) + if err != nil { + return err + } + + msg := types.NewMsgPlaceLimitOrder( + clientCtx.GetFromAddress().String(), + argReceiver, + argTokenIn, + argTokenOut, + argTickIndexInt, + amountInInt, + orderType, + goodTil, + maxAmountOutIntP, + ) + if err := msg.ValidateBasic(); err != nil { + return err + } + + return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg) + }, + } + + flags.AddTxFlagsToCmd(cmd) + cmd.Flags().AddFlagSet(FlagSetMaxAmountOut()) + + return cmd +} diff --git a/x/dex/client/cli/tx_test.go b/x/dex/client/cli/tx_test.go new file mode 100644 index 000000000..389138114 --- /dev/null +++ b/x/dex/client/cli/tx_test.go @@ -0,0 +1,657 @@ +package cli + +// import ( +// "fmt" +// "regexp" +// "testing" + +// "github.com/cosmos/cosmos-sdk/client" +// "github.com/cosmos/cosmos-sdk/client/flags" +// "github.com/cosmos/cosmos-sdk/crypto/hd" +// "github.com/cosmos/cosmos-sdk/crypto/keyring" +// kmultisig "github.com/cosmos/cosmos-sdk/crypto/keys/multisig" +// "github.com/cosmos/cosmos-sdk/testutil" +// "github.com/cosmos/cosmos-sdk/testutil/cli" +// clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli" +// "github.com/cosmos/cosmos-sdk/testutil/network" +// sdk "github.com/cosmos/cosmos-sdk/types" + +// // "github.com/neutron-org/neutron/testutil/network" +// cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" +// "github.com/neutron-org/neutron/app" +// dexClient "github.com/neutron-org/neutron/x/dex/client/cli" +// "github.com/neutron-org/neutron/x/dex/types" +// "github.com/stretchr/testify/require" +// "github.com/stretchr/testify/suite" +// ) + +// type TxTestSuite struct { +// suite.Suite + +// kr *keyring.Keyring +// cfg network.Config +// network *network.Network + +// addrs []sdk.AccAddress +// trancheKey string +// } + +// func NewTxTestSuite(cfg network.Config) *TxTestSuite { +// return &TxTestSuite{cfg: cfg} +// } + +// func TestTxTestSuite(t *testing.T) { +// cfg := network.DefaultConfig(app.NewTestNetworkFixture) +// cfg.NumValidators = 1 +// suite.Run(t, NewTxTestSuite(cfg)) +// } + +// func findTrancheKeyInTx(tx string) string { +// re := regexp.MustCompile(`TrancheKey.*?:\\"([a-z0-9]+)`) +// return re.FindStringSubmatch(tx)[1] +// } + +// func (s *TxTestSuite) SetupSuite() { +// s.T().Log("setting up e2e test suite") +// var err error +// s.network, err = network.New(s.T(), s.T().TempDir(), s.cfg) +// s.Require().NoError(err) + +// kb := s.network.Validators[0].ClientCtx.Keyring +// _, _, err = kb.NewMnemonic( +// "newAccount", +// keyring.English, +// sdk.FullFundraiserPath, +// keyring.DefaultBIP39Passphrase, +// hd.Secp256k1, +// ) +// s.Require().NoError(err) + +// account1, _, err := kb.NewMnemonic( +// "newAccount1", +// keyring.English, +// sdk.FullFundraiserPath, +// keyring.DefaultBIP39Passphrase, +// hd.Secp256k1, +// ) +// s.Require().NoError(err) + +// account2, _, err := kb.NewMnemonic( +// "newAccount2", +// keyring.English, +// sdk.FullFundraiserPath, +// keyring.DefaultBIP39Passphrase, +// hd.Secp256k1, +// ) +// s.Require().NoError(err) +// pub1, err := account1.GetPubKey() +// s.Require().NoError(err) +// pub2, err := account2.GetPubKey() +// s.Require().NoError(err) + +// // Create a dummy account for testing purpose +// _, _, err = kb.NewMnemonic( +// "dummyAccount", +// keyring.English, +// sdk.FullFundraiserPath, +// keyring.DefaultBIP39Passphrase, +// hd.Secp256k1, +// ) +// s.Require().NoError(err) + +// multi := kmultisig.NewLegacyAminoPubKey(2, []cryptotypes.PubKey{pub1, pub2}) +// _, err = kb.SaveMultisig("multi", multi) +// s.Require().NoError(err) +// s.Require().NoError(s.network.WaitForNextBlock()) + +// // s.encCfg = app.MakeEncodingConfig() +// // s.kr = keyring.NewInMemory(s.encCfg.Marshaler) +// // s.baseCtx = client.Context{}. +// // WithKeyring(s.kr). +// // WithTxConfig(s.encCfg.TxConfig). +// // WithCodec(s.encCfg.Marshaler). +// // WithClient(clitestutil.MockTendermintRPC{Client: rpcclientmock.Client{}}). +// // WithAccountRetriever(client.MockAccountRetriever{}). +// // WithOutput(io.Discard). +// // WithChainID("test-chain") + +// // ctxGen := func() client.Context { +// // bz, _ := s.encCfg.Marshaler.Marshal(&sdk.TxResponse{}) +// // c := clitestutil.NewMockTendermintRPC(abci.ResponseQuery{ +// // Value: bz, +// // }) +// // return s.baseCtx.WithClient(c) +// // } +// // s.clientCtx = ctxGen() + +// // s.addrs = make([]sdk.AccAddress, 0) +// // for i := 0; i < 3; i++ { +// // k, _, err := s.clientCtx.Keyring.NewMnemonic( +// // "NewValidator", +// // keyring.English, +// // sdk.FullFundraiserPath, +// // keyring.DefaultBIP39Passphrase, +// // hd.Secp256k1, +// // ) +// // s.Require().NoError(err) + +// // pub, err := k.GetPubKey() +// // s.Require().NoError(err) + +// // newAddr := sdk.AccAddress(pub.Address()) +// // s.addrs = append(s.addrs, newAddr) +// // } +// } + +// func (s *TxTestSuite) fundAccount( +// clientCtx client.Context, +// from, to sdk.AccAddress, +// coins sdk.Coins, +// ) { +// require := s.Require() + +// commonFlags := []string{ +// fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), +// fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), +// fmt.Sprintf( +// "--%s=%s", +// flags.FlagFees, +// sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(10))).String(), +// ), +// } +// out, err := clitestutil.MsgSendExec( +// clientCtx, +// from, +// to, +// coins, +// commonFlags..., +// ) +// require.NoError(err) +// var res sdk.TxResponse +// require.NoError(clientCtx.Codec.UnmarshalJSON(out.Bytes(), &res)) +// require.Zero(res.Code, res.RawLog) +// } + +// func (s *TxTestSuite) TestTxCmdDeposit() { +// val := testutil.CreateKeyringAccounts(s.T(), s.kr, 1) +// commonFlags := []string{ +// fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), +// fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), +// fmt.Sprintf( +// "--%s=%s", +// flags.FlagFees, +// sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(10))).String(), +// ), +// fmt.Sprintf("--%s=%s", flags.FlagGas, "200000000"), +// fmt.Sprintf("--%s=%s", flags.FlagFrom, val[0].Address.String()), +// } + +// testCases := []struct { +// name string +// args []string +// expErr bool +// expErrMsg string +// errInRes bool +// }{ +// { +// name: "missing arguments", +// args: []string{ +// val[0].Address.String(), +// "TokenA", +// "TokenB", +// "10", +// "10", +// "[0]", +// "false", +// }, +// expErr: true, +// expErrMsg: "Error: accepts 8 arg(s), received 7", +// }, +// { +// name: "too many arguments", +// args: []string{ +// val[0].Address.String(), +// "TokenA", +// "TokenB", +// "10", +// "10", +// "[0]", +// "1", +// "false", +// s.addrs[0].String(), +// }, +// expErr: true, +// expErrMsg: "Error: accepts 8 arg(s), received 9", +// }, +// { +// name: "valid", +// args: []string{ +// val[0].Address.String(), +// "TokenA", +// "TokenB", +// "10", +// "10", +// "[0]", +// "1", +// "false", +// }, +// errInRes: false, +// }, +// { +// name: "valid: multiple case", +// args: []string{ +// val[0].Address.String(), +// "TokenA", +// "TokenB", +// "0,0", +// "10,10", +// "[25,25]", +// "1,1", +// "false,false", +// }, +// errInRes: false, +// }, +// } + +// for _, tc := range testCases { +// s.Run(tc.name, func() { +// cmd := dexClient.CmdDeposit() +// args := append(tc.args, commonFlags...) +// out, err := cli.ExecTestCLICmd(s.clientCtx, cmd, args) +// if tc.expErr { +// require.Error(s.T(), err) +// require.Contains(s.T(), out.String(), tc.expErrMsg) +// } else { +// if tc.errInRes { +// require.Contains(s.T(), out.String(), tc.expErrMsg) +// } else { +// require.NoError(s.T(), err) +// var res sdk.TxResponse +// require.NoError(s.T(), s.clientCtx.Codec.UnmarshalJSON(out.Bytes(), &res)) +// require.Zero(s.T(), res.Code, res.RawLog) +// } +// } +// }) +// } +// } + +// func (s *TxTestSuite) TestTx2CmdWithdraw() { +// val := testutil.CreateKeyringAccounts(s.T(), s.kr, 1) +// commonFlags := []string{ +// fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), +// fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), +// fmt.Sprintf( +// "--%s=%s", +// flags.FlagFees, +// sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(10))).String(), +// ), +// fmt.Sprintf("--%s=%s", flags.FlagGas, "200000000"), +// fmt.Sprintf("--%s=%s", flags.FlagFrom, val[0].Address.String()), +// } + +// // Deposit Funds +// args := append( +// []string{ +// val[0].Address.String(), +// "TokenA", +// "TokenB", +// "10", +// "10", +// "[0]", +// "0", +// "false", +// }, +// commonFlags...) +// cmd := dexClient.CmdDeposit() +// _, err := cli.ExecTestCLICmd(s.clientCtx, cmd, args) +// require.NoError(s.T(), err) + +// testCases := []struct { +// name string +// args []string +// expErr bool +// expErrMsg string +// errInRes bool +// }{ +// { +// // "withdrawal [receiver] [token-a] [token-b] [list of shares-to-remove] [list of tick-index] [list of fee indexes] ", +// name: "missing arguments", +// args: []string{ +// val[0].Address.String(), +// "TokenA", +// "TokenB", +// "[10]", +// "0", +// }, +// expErr: true, +// expErrMsg: "Error: accepts 6 arg(s), received 5", +// }, +// { +// name: "too many arguments", +// args: []string{ +// val[0].Address.String(), +// "TokenA", +// "TokenB", +// "10", +// "[0]", +// "1", +// s.addrs[0].String(), +// }, +// expErr: true, +// expErrMsg: "Error: accepts 6 arg(s), received 7", +// }, +// { +// name: "valid", +// args: []string{ +// val[0].Address.String(), +// "TokenA", +// "TokenB", +// "10", +// "[0]", +// "1", +// }, +// errInRes: false, +// }, +// { +// name: "valid: multiple case", +// args: []string{ +// val[0].Address.String(), +// "TokenA", +// "TokenB", +// "2,2", +// "[0,0]", +// "0,1", +// }, +// errInRes: false, +// }, +// } + +// for _, tc := range testCases { +// s.Run(tc.name, func() { +// cmd := dexClient.CmdWithdrawal() +// args := append(tc.args, commonFlags...) +// out, err := cli.ExecTestCLICmd(s.clientCtx, cmd, args) +// if tc.expErr { +// require.Error(s.T(), err) +// require.Contains(s.T(), out.String(), tc.expErrMsg) +// } else { +// if tc.errInRes { +// require.Contains(s.T(), out.String(), tc.expErrMsg) +// } else { +// require.NoError(s.T(), err) +// var res sdk.TxResponse +// require.NoError(s.T(), s.clientCtx.Codec.UnmarshalJSON(out.Bytes(), &res)) +// require.Zero(s.T(), res.Code, res.RawLog) +// } +// } +// }) +// } +// } + +// func (s *TxTestSuite) TestTx4Cmd4PlaceLimitOrder() { +// val := testutil.CreateKeyringAccounts(s.T(), s.kr, 1) +// commonFlags := []string{ +// fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), +// fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), +// fmt.Sprintf( +// "--%s=%s", +// flags.FlagFees, +// sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(10))).String(), +// ), +// fmt.Sprintf("--%s=%s", flags.FlagGas, "200000000"), +// fmt.Sprintf("--%s=%s", flags.FlagFrom, val[0].Address.String()), +// } + +// testCases := []struct { +// name string +// args []string +// expErr bool +// expErrMsg string +// errInRes bool +// }{ +// { +// // "place-limit-order [receiver] [token-in] [token-out] [tick-index] [amount-in] ?[order-type] ?[expirationTime] ?(--max-amout-out)" +// name: "missing arguments", +// args: []string{s.addrs[0].String(), "TokenA", "TokenB", "[0]"}, +// expErr: true, +// expErrMsg: "Error: accepts between 5 and 7 arg(s), received 4", +// }, +// { +// name: "too many arguments", +// args: []string{ +// s.addrs[0].String(), +// "TokenA", +// "TokenB", +// "[0]", +// "10", +// "1", +// "1", +// "BAD", +// }, +// expErr: true, +// expErrMsg: "Error: accepts between 5 and 7 arg(s), received 8", +// }, +// { +// name: "invalid orderType", +// args: []string{ +// s.addrs[0].String(), +// "TokenA", +// "TokenB", +// "[0]", +// "10", +// "JUST_SEND_IT", +// }, +// expErr: true, +// expErrMsg: types.ErrInvalidOrderType.Error(), +// }, +// { +// name: "invalid goodTil", +// args: []string{ +// s.addrs[0].String(), +// "TokenA", +// "TokenB", +// "[0]", +// "10", +// "GOOD_TIL_TIME", +// "january", +// }, +// expErr: true, +// expErrMsg: types.ErrInvalidTimeString.Error(), +// }, +// { +// name: "valid", +// args: []string{s.addrs[0].String(), "TokenB", "TokenA", "[0]", "10"}, +// errInRes: false, +// }, +// { +// name: "valid goodTil", +// args: []string{ +// s.addrs[0].String(), +// "TokenB", +// "TokenA", +// "[0]", +// "10", +// "GOOD_TIL_TIME", +// "06/15/2025 02:00:00", +// }, +// errInRes: false, +// }, +// { +// name: "valid with maxAmountOut", +// args: []string{ +// s.addrs[0].String(), +// "TokenB", +// "TokenA", +// "[2]", +// "10", +// "FILL_OR_KILL", +// "--max-amount-out=10", +// }, +// errInRes: false, +// }, +// } + +// for _, tc := range testCases { +// s.Run(tc.name, func() { +// cmd := dexClient.CmdPlaceLimitOrder() +// args := append(tc.args, commonFlags...) +// out, err := cli.ExecTestCLICmd(s.clientCtx, cmd, args) +// if tc.expErr { +// require.Error(s.T(), err) +// require.Contains(s.T(), out.String(), tc.expErrMsg) +// } else { +// if tc.errInRes { +// require.Contains(s.T(), out.String(), tc.expErrMsg) +// } else { +// require.NoError(s.T(), err) +// var res sdk.TxResponse +// require.NoError(s.T(), s.clientCtx.Codec.UnmarshalJSON(out.Bytes(), &res)) +// require.Zero(s.T(), res.Code, res.RawLog) +// } +// } +// }) +// } +// } + +// func (s *TxTestSuite) TestTx5CmdCancelLimitOrder() { +// val := testutil.CreateKeyringAccounts(s.T(), s.kr, 1) +// commonFlags := []string{ +// fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), +// fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), +// fmt.Sprintf( +// "--%s=%s", +// flags.FlagFees, +// sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(10))).String(), +// ), +// fmt.Sprintf("--%s=%s", flags.FlagGas, "200000000"), +// fmt.Sprintf("--%s=%s", flags.FlagFrom, val[0].Address.String()), +// } + +// testCases := []struct { +// name string +// args []string +// expErr bool +// expErrMsg string +// errInRes bool +// }{ +// { +// // "cancel-limit-order [tranche-key]" +// name: "missing arguments", +// args: []string{}, +// expErr: true, +// expErrMsg: "Error: accepts 1 arg(s), received 0", +// }, +// { +// name: "too many arguments", +// args: []string{"trancheKey123", "extraarg"}, +// expErr: true, +// expErrMsg: "Error: accepts 1 arg(s), received 2", +// }, +// { +// name: "valid", +// args: []string{s.trancheKey}, +// errInRes: false, +// }, +// } + +// for _, tc := range testCases { +// s.Run(tc.name, func() { +// cmd := dexClient.CmdCancelLimitOrder() +// args := append(tc.args, commonFlags...) +// out, err := cli.ExecTestCLICmd(s.clientCtx, cmd, args) +// if tc.expErr { +// require.Error(s.T(), err) +// require.Contains(s.T(), out.String(), tc.expErrMsg) +// } else { +// if tc.errInRes { +// require.Contains(s.T(), out.String(), tc.expErrMsg) +// } else { +// require.NoError(s.T(), err) +// var res sdk.TxResponse +// require.NoError(s.T(), s.clientCtx.Codec.UnmarshalJSON(out.Bytes(), &res)) +// require.Zero(s.T(), res.Code, res.RawLog) +// } +// } +// }) +// } +// } + +// func (s *TxTestSuite) TestTx6CmdWithdrawFilledLimitOrder() { +// val := testutil.CreateKeyringAccounts(s.T(), s.kr, 1) + +// commonFlags := []string{ +// fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), +// fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), +// fmt.Sprintf( +// "--%s=%s", +// flags.FlagFees, +// sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(10))).String(), +// ), +// fmt.Sprintf("--%s=%s", flags.FlagGas, "200000000"), +// fmt.Sprintf("--%s=%s", flags.FlagFrom, val[0].Address.String()), +// } + +// // Place Limit Order +// args := append( +// []string{val[0].Address.String(), "TokenB", "TokenA", "[0]", "10"}, +// commonFlags...) +// cmd := dexClient.CmdPlaceLimitOrder() +// txBuff, err := cli.ExecTestCLICmd(s.clientCtx, cmd, args) +// require.NoError(s.T(), err) +// trancheKey := findTrancheKeyInTx(txBuff.String()) + +// argsSwap := append( +// []string{s.addrs[0].String(), "TokenA", "TokenB", "0", "30", "IMMEDIATE_OR_CANCEL"}, +// commonFlags...) +// cmd = dexClient.CmdPlaceLimitOrder() +// _, err = cli.ExecTestCLICmd(s.clientCtx, cmd, argsSwap) +// require.NoError(s.T(), err) + +// testCases := []struct { +// name string +// args []string +// expErr bool +// expErrMsg string +// errInRes bool +// }{ +// { +// // "withdraw-filled-limit-order [tranche-key]" +// name: "missing arguments", +// args: []string{}, +// expErr: true, +// expErrMsg: "Error: accepts 1 arg(s), received 0", +// }, +// { +// name: "too many arguments", +// args: []string{"trancheKey123", "EXTRA-ARG"}, +// expErr: true, +// expErrMsg: "Error: accepts 1 arg(s), received 2", +// }, +// { +// name: "valid", +// args: []string{trancheKey}, +// errInRes: false, +// }, +// } + +// for _, tc := range testCases { +// s.Run(tc.name, func() { +// cmd := dexClient.CmdWithdrawFilledLimitOrder() +// args := append(tc.args, commonFlags...) +// out, err := cli.ExecTestCLICmd(s.clientCtx, cmd, args) +// if tc.expErr { +// require.Error(s.T(), err) +// require.Contains(s.T(), out.String(), tc.expErrMsg) +// } else { +// if tc.errInRes { +// require.Contains(s.T(), out.String(), tc.expErrMsg) +// } else { +// require.NoError(s.T(), err) +// var res sdk.TxResponse +// require.NoError(s.T(), s.clientCtx.Codec.UnmarshalJSON(out.Bytes(), &res)) +// require.Zero(s.T(), res.Code, res.RawLog) +// } +// } +// }) +// } +// } diff --git a/x/dex/client/cli/tx_withdrawl.go b/x/dex/client/cli/tx_withdrawl.go new file mode 100644 index 000000000..534ee2613 --- /dev/null +++ b/x/dex/client/cli/tx_withdrawl.go @@ -0,0 +1,91 @@ +package cli + +import ( + "strconv" + "strings" + + "github.com/cosmos/cosmos-sdk/client" + "github.com/cosmos/cosmos-sdk/client/flags" + "github.com/cosmos/cosmos-sdk/client/tx" + sdk "github.com/cosmos/cosmos-sdk/types" + sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/neutron-org/neutron/x/dex/types" + "github.com/spf13/cobra" +) + +func CmdWithdrawal() *cobra.Command { + cmd := &cobra.Command{ + Use: "withdrawal [receiver] [token-a] [token-b] [list of shares-to-remove] [list of tick-index] [list of fees] ", + Short: "Broadcast message withdrawal", + Example: "withdrawal alice tokenA tokenB 100,50 [-10,5] 1,1 --from alice", + Args: cobra.ExactArgs(6), + RunE: func(cmd *cobra.Command, args []string) (err error) { + argReceiver := args[0] + argTokenA := args[1] + argTokenB := args[2] + argSharesToRemove := strings.Split(args[3], ",") + + if strings.HasPrefix(args[4], "[") && strings.HasSuffix(args[4], "]") { + args[4] = strings.TrimPrefix(args[4], "[") + args[4] = strings.TrimSuffix(args[4], "]") + } + argTickIndexes := strings.Split(args[4], ",") + argFees := strings.Split(args[5], ",") + + var SharesToRemoveInt []sdk.Int + var TicksIndexesInt []int64 + var FeesUint []uint64 + for _, s := range argSharesToRemove { + sharesToRemoveInt, ok := sdk.NewIntFromString(s) + + if !ok { + return sdkerrors.Wrapf(types.ErrIntOverflowTx, "Integer Overflow for shares-to-remove") + } + + SharesToRemoveInt = append(SharesToRemoveInt, sharesToRemoveInt) + } + + for _, s := range argTickIndexes { + TickIndexInt, err := strconv.ParseInt(s, 10, 0) + if err != nil { + return err + } + + TicksIndexesInt = append(TicksIndexesInt, TickIndexInt) + } + + for _, s := range argFees { + feeInt, err := strconv.ParseUint(s, 10, 0) + if err != nil { + return err + } + + FeesUint = append(FeesUint, feeInt) + } + + clientCtx, err := client.GetClientTxContext(cmd) + if err != nil { + return err + } + + msg := types.NewMsgWithdrawal( + clientCtx.GetFromAddress().String(), + argReceiver, + argTokenA, + argTokenB, + SharesToRemoveInt, + TicksIndexesInt, + FeesUint, + ) + if err := msg.ValidateBasic(); err != nil { + return err + } + + return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg) + }, + } + + flags.AddTxFlagsToCmd(cmd) + + return cmd +} diff --git a/x/dex/client/cli/tx_withdrawl_filled_limit_order.go b/x/dex/client/cli/tx_withdrawl_filled_limit_order.go new file mode 100644 index 000000000..9809c1cd5 --- /dev/null +++ b/x/dex/client/cli/tx_withdrawl_filled_limit_order.go @@ -0,0 +1,38 @@ +package cli + +import ( + "github.com/cosmos/cosmos-sdk/client" + "github.com/cosmos/cosmos-sdk/client/flags" + "github.com/cosmos/cosmos-sdk/client/tx" + "github.com/neutron-org/neutron/x/dex/types" + "github.com/spf13/cobra" +) + +func CmdWithdrawFilledLimitOrder() *cobra.Command { + cmd := &cobra.Command{ + Use: "withdraw-filled-limit-order [tranche-key]", + Short: "Broadcast message WithdrawFilledLimitOrder", + Example: "withdraw-filled-limit-order TRANCHEKEY123 --from alice", + Args: cobra.ExactArgs(1), + RunE: func(cmd *cobra.Command, args []string) (err error) { + clientCtx, err := client.GetClientTxContext(cmd) + if err != nil { + return err + } + + msg := types.NewMsgWithdrawFilledLimitOrder( + clientCtx.GetFromAddress().String(), + args[0], + ) + if err := msg.ValidateBasic(); err != nil { + return err + } + + return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg) + }, + } + + flags.AddTxFlagsToCmd(cmd) + + return cmd +} diff --git a/x/dex/genesis.go b/x/dex/genesis.go new file mode 100644 index 000000000..d0d9ff1b2 --- /dev/null +++ b/x/dex/genesis.go @@ -0,0 +1,54 @@ +package dex + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/neutron-org/neutron/x/dex/keeper" + + "github.com/neutron-org/neutron/x/dex/types" +) + +// InitGenesis initializes the capability module's state from a provided genesis +// state. +func InitGenesis(ctx sdk.Context, k keeper.Keeper, genState types.GenesisState) { + // Set all the tickLiquidity + for _, elem := range genState.TickLiquidityList { + switch elem.Liquidity.(type) { + case *types.TickLiquidity_PoolReserves: + k.SetPoolReserves(ctx, elem.GetPoolReserves()) + case *types.TickLiquidity_LimitOrderTranche: + k.SetLimitOrderTranche(ctx, elem.GetLimitOrderTranche()) + } + } + // Set all the inactiveLimitOrderTranche + for _, elem := range genState.InactiveLimitOrderTrancheList { + k.SetInactiveLimitOrderTranche(ctx, elem) + } + + // Set all the LimitOrderTrancheUser + for _, elem := range genState.LimitOrderTrancheUserList { + k.SetLimitOrderTrancheUser(ctx, elem) + } + // Set all the poolMetadata + for _, elem := range genState.PoolMetadataList { + k.SetPoolMetadata(ctx, elem) + } + + // Set poolMetadata count + k.SetPoolCount(ctx, genState.PoolCount) + // this line is used by starport scaffolding # genesis/module/init + k.SetParams(ctx, genState.Params) +} + +// ExportGenesis returns the capability module's exported genesis. +func ExportGenesis(ctx sdk.Context, k keeper.Keeper) *types.GenesisState { + genesis := types.DefaultGenesis() + genesis.Params = k.GetParams(ctx) + genesis.LimitOrderTrancheUserList = k.GetAllLimitOrderTrancheUser(ctx) + genesis.TickLiquidityList = k.GetAllTickLiquidity(ctx) + genesis.InactiveLimitOrderTrancheList = k.GetAllInactiveLimitOrderTranche(ctx) + genesis.PoolMetadataList = k.GetAllPoolMetadata(ctx) + genesis.PoolCount = k.GetPoolCount(ctx) + // this line is used by starport scaffolding # genesis/module/export + + return genesis +} diff --git a/x/dex/genesis_test.go b/x/dex/genesis_test.go new file mode 100644 index 000000000..3984887c7 --- /dev/null +++ b/x/dex/genesis_test.go @@ -0,0 +1,125 @@ +package dex_test + +import ( + "testing" + + sdk "github.com/cosmos/cosmos-sdk/types" + keepertest "github.com/neutron-org/neutron/testutil/dex/keeper" + "github.com/neutron-org/neutron/testutil/dex/nullify" + "github.com/neutron-org/neutron/x/dex" + "github.com/neutron-org/neutron/x/dex/types" + "github.com/stretchr/testify/require" +) + +func TestGenesis(t *testing.T) { + genesisState := types.GenesisState{ + Params: types.DefaultParams(), + LimitOrderTrancheUserList: []*types.LimitOrderTrancheUser{ + { + TradePairID: &types.TradePairID{ + TakerDenom: "TokenA", + MakerDenom: "TokenB", + }, + TickIndexTakerToMaker: 1, + TrancheKey: "0", + Address: "fakeAddr", + SharesOwned: sdk.NewInt(10), + SharesWithdrawn: sdk.NewInt(0), + SharesCancelled: sdk.NewInt(0), + }, + { + TradePairID: &types.TradePairID{ + TakerDenom: "TokenB", + MakerDenom: "TokenA", + }, + TickIndexTakerToMaker: 20, + TrancheKey: "0", + Address: "fakeAddr", + SharesOwned: sdk.NewInt(10), + SharesWithdrawn: sdk.NewInt(0), + SharesCancelled: sdk.NewInt(0), + }, + }, + TickLiquidityList: []*types.TickLiquidity{ + { + Liquidity: &types.TickLiquidity_LimitOrderTranche{ + LimitOrderTranche: types.MustNewLimitOrderTranche( + "TokenB", + "TokenA", + "0", + 0, + sdk.ZeroInt(), + sdk.ZeroInt(), + sdk.ZeroInt(), + sdk.ZeroInt(), + ), + }, + }, + { + Liquidity: &types.TickLiquidity_LimitOrderTranche{ + LimitOrderTranche: types.MustNewLimitOrderTranche( + "TokenB", + "TokenA", + "0", + 0, + sdk.ZeroInt(), + sdk.ZeroInt(), + sdk.ZeroInt(), + sdk.ZeroInt(), + ), + }, + }, + }, + InactiveLimitOrderTrancheList: []*types.LimitOrderTranche{ + { + Key: &types.LimitOrderTrancheKey{ + TradePairID: &types.TradePairID{ + TakerDenom: "TokenA", + MakerDenom: "TokenB", + }, + TickIndexTakerToMaker: 0, + TrancheKey: "0", + }, + }, + { + Key: &types.LimitOrderTrancheKey{ + TradePairID: &types.TradePairID{ + TakerDenom: "TokenA", + MakerDenom: "TokenB", + }, + TickIndexTakerToMaker: 1, + TrancheKey: "1", + }, + }, + }, + PoolMetadataList: []types.PoolMetadata{ + { + ID: 0, + }, + { + ID: 1, + }, + }, + PoolCount: 2, + // this line is used by starport scaffolding # genesis/test/state + } + + k, ctx := keepertest.DexKeeper(t) + dex.InitGenesis(ctx, *k, genesisState) + got := dex.ExportGenesis(ctx, *k) + require.NotNil(t, got) + + nullify.Fill(&genesisState) + nullify.Fill(got) + + require.ElementsMatch(t, genesisState.LimitOrderTrancheUserList, got.LimitOrderTrancheUserList) + require.ElementsMatch(t, genesisState.TickLiquidityList, got.TickLiquidityList) + require.ElementsMatch( + t, + genesisState.InactiveLimitOrderTrancheList, + got.InactiveLimitOrderTrancheList, + ) + require.ElementsMatch(t, genesisState.PoolMetadataList, got.PoolMetadataList) + require.Equal(t, genesisState.PoolCount, got.PoolCount) + // this line is used by starport scaffolding # genesis/test/assert +} diff --git a/x/dex/keeper/core.go b/x/dex/keeper/core.go new file mode 100644 index 000000000..5e35eae1a --- /dev/null +++ b/x/dex/keeper/core.go @@ -0,0 +1,581 @@ +package keeper + +import ( + "context" + "time" + + sdk "github.com/cosmos/cosmos-sdk/types" + sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + math_utils "github.com/neutron-org/neutron/utils/math" + "github.com/neutron-org/neutron/x/dex/types" + "github.com/neutron-org/neutron/x/dex/utils" +) + +// NOTE: Currently we are using TruncateInt in multiple places for converting Decs back into sdk.Ints. +// This may create some accounting anomalies but seems preferable to other alternatives. +// See full ADR here: https://www.notion.so/dualityxyz/A-Modest-Proposal-For-Truncating-696a919d59254876a617f82fb9567895 + +// Handles core logic for MsgDeposit, checking and initializing data structures (tick, pair), calculating +// shares based on amount deposited, and sending funds to moduleAddress. +func (k Keeper) DepositCore( + goCtx context.Context, + pairID *types.PairID, + callerAddr sdk.AccAddress, + receiverAddr sdk.AccAddress, + amounts0 []sdk.Int, + amounts1 []sdk.Int, + tickIndices []int64, + fees []uint64, + options []*types.DepositOptions, +) (amounts0Deposit, amounts1Deposit []sdk.Int, sharesIssued sdk.Coins, err error) { + ctx := sdk.UnwrapSDKContext(goCtx) + + totalAmountReserve0 := sdk.ZeroInt() + totalAmountReserve1 := sdk.ZeroInt() + amounts0Deposited := make([]sdk.Int, len(amounts0)) + amounts1Deposited := make([]sdk.Int, len(amounts1)) + sharesIssued = sdk.Coins{} + + for i := 0; i < len(amounts0); i++ { + amounts0Deposited[i] = sdk.ZeroInt() + amounts1Deposited[i] = sdk.ZeroInt() + } + + for i, amount0 := range amounts0 { + amount1 := amounts1[i] + tickIndex := tickIndices[i] + fee := fees[i] + + if err := k.ValidateFee(ctx, fee); err != nil { + return nil, nil, nil, err + } + autoswap := !options[i].DisableAutoswap + + pool, err := k.GetOrInitPool( + ctx, + pairID, + tickIndex, + fee, + ) + if err != nil { + return nil, nil, nil, err + } + + existingShares := k.bankKeeper.GetSupply(ctx, pool.GetPoolDenom()).Amount + + inAmount0, inAmount1, outShares := pool.Deposit(amount0, amount1, existingShares, autoswap) + + k.SetPool(ctx, pool) + + if inAmount0.IsZero() && inAmount1.IsZero() { + return nil, nil, nil, types.ErrZeroTrueDeposit + } + + if outShares.IsZero() { + return nil, nil, nil, types.ErrDepositShareUnderflow + } + + if err := k.MintShares(ctx, receiverAddr, outShares); err != nil { + return nil, nil, nil, err + } + sharesIssued = sharesIssued.Add(outShares) + + amounts0Deposited[i] = inAmount0 + amounts1Deposited[i] = inAmount1 + totalAmountReserve0 = totalAmountReserve0.Add(inAmount0) + totalAmountReserve1 = totalAmountReserve1.Add(inAmount1) + + ctx.EventManager().EmitEvent(types.CreateDepositEvent( + callerAddr, + receiverAddr, + pairID.Token0, + pairID.Token1, + tickIndex, + fee, + inAmount0, + inAmount1, + outShares.Amount, + )) + } + + if totalAmountReserve0.IsPositive() { + coin0 := sdk.NewCoin(pairID.Token0, totalAmountReserve0) + if err := k.bankKeeper.SendCoinsFromAccountToModule(ctx, callerAddr, types.ModuleName, sdk.Coins{coin0}); err != nil { + return nil, nil, nil, err + } + } + + if totalAmountReserve1.IsPositive() { + coin1 := sdk.NewCoin(pairID.Token1, totalAmountReserve1) + if err := k.bankKeeper.SendCoinsFromAccountToModule(ctx, callerAddr, types.ModuleName, sdk.Coins{coin1}); err != nil { + return nil, nil, nil, err + } + } + + return amounts0Deposited, amounts1Deposited, sharesIssued, nil +} + +// Handles core logic for MsgWithdrawal; calculating and withdrawing reserve0,reserve1 from a specified tick +// given a specfied number of shares to remove. +// Calculates the amount of reserve0, reserve1 to withdraw based on the percentage of the desired +// number of shares to remove compared to the total number of shares at the given tick. +func (k Keeper) WithdrawCore( + goCtx context.Context, + pairID *types.PairID, + callerAddr sdk.AccAddress, + receiverAddr sdk.AccAddress, + sharesToRemoveList []sdk.Int, + tickIndicesNormalized []int64, + fees []uint64, +) error { + ctx := sdk.UnwrapSDKContext(goCtx) + totalReserve0ToRemove := sdk.ZeroInt() + totalReserve1ToRemove := sdk.ZeroInt() + + for i, fee := range fees { + sharesToRemove := sharesToRemoveList[i] + tickIndex := tickIndicesNormalized[i] + + pool, err := k.GetOrInitPool(ctx, pairID, tickIndex, fee) + if err != nil { + return err + } + + poolDenom := pool.GetPoolDenom() + + totalShares := k.bankKeeper.GetSupply(ctx, poolDenom).Amount + if totalShares.LT(sharesToRemove) { + return sdkerrors.Wrapf( + types.ErrInsufficientShares, + "%s does not have %s shares of type %s", + callerAddr, + sharesToRemove, + poolDenom, + ) + } + + outAmount0, outAmount1 := pool.Withdraw(sharesToRemove, totalShares) + k.SetPool(ctx, pool) + + if sharesToRemove.IsPositive() { + if err := k.BurnShares(ctx, callerAddr, sharesToRemove, poolDenom); err != nil { + return err + } + } + + totalReserve0ToRemove = totalReserve0ToRemove.Add(outAmount0) + totalReserve1ToRemove = totalReserve1ToRemove.Add(outAmount1) + + ctx.EventManager().EmitEvent(types.CreateWithdrawEvent( + callerAddr, + receiverAddr, + pairID.Token0, + pairID.Token1, + tickIndex, + fee, + outAmount0, + outAmount1, + sharesToRemove, + )) + } + + if totalReserve0ToRemove.IsPositive() { + coin0 := sdk.NewCoin(pairID.Token0, totalReserve0ToRemove) + + err := k.bankKeeper.SendCoinsFromModuleToAccount( + ctx, + types.ModuleName, + receiverAddr, + sdk.Coins{coin0}, + ) + if err != nil { + return err + } + } + + // sends totalReserve1ToRemove to receiverAddr + if totalReserve1ToRemove.IsPositive() { + coin1 := sdk.NewCoin(pairID.Token1, totalReserve1ToRemove) + err := k.bankKeeper.SendCoinsFromModuleToAccount( + ctx, + types.ModuleName, + receiverAddr, + sdk.Coins{coin1}, + ) + if err != nil { + return err + } + } + + return nil +} + +func (k Keeper) MultiHopSwapCore( + goCtx context.Context, + amountIn sdk.Int, + routes []*types.MultiHopRoute, + exitLimitPrice math_utils.PrecDec, + pickBestRoute bool, + callerAddr sdk.AccAddress, + receiverAddr sdk.AccAddress, +) (coinOut sdk.Coin, err error) { + ctx := sdk.UnwrapSDKContext(goCtx) + var routeErrors []error + initialInCoin := sdk.NewCoin(routes[0].Hops[0], amountIn) + stepCache := make(map[multihopCacheKey]StepResult) + var bestRoute struct { + write func() + coinOut sdk.Coin + route []string + } + bestRoute.coinOut = sdk.Coin{Amount: sdk.ZeroInt()} + + for _, route := range routes { + routeCoinOut, writeRoute, err := k.RunMultihopRoute( + ctx, + *route, + initialInCoin, + exitLimitPrice, + stepCache, + ) + if err != nil { + routeErrors = append(routeErrors, err) + continue + } + + if !pickBestRoute || bestRoute.coinOut.Amount.LT(routeCoinOut.Amount) { + bestRoute.coinOut = routeCoinOut + bestRoute.write = writeRoute + bestRoute.route = route.Hops + } + if !pickBestRoute { + break + } + } + + if len(routeErrors) == len(routes) { + // All routes have failed + + allErr := utils.JoinErrors(types.ErrAllMultiHopRoutesFailed, routeErrors...) + + return sdk.Coin{}, allErr + } + + bestRoute.write() + err = k.bankKeeper.SendCoinsFromAccountToModule( + ctx, + callerAddr, + types.ModuleName, + sdk.Coins{initialInCoin}, + ) + if err != nil { + return sdk.Coin{}, err + } + + err = k.bankKeeper.SendCoinsFromModuleToAccount( + ctx, + types.ModuleName, + receiverAddr, + sdk.Coins{bestRoute.coinOut}, + ) + if err != nil { + return sdk.Coin{}, err + } + ctx.EventManager().EmitEvent(types.CreateMultihopSwapEvent( + callerAddr, + receiverAddr, + initialInCoin.Denom, + bestRoute.coinOut.Denom, + initialInCoin.Amount, + bestRoute.coinOut.Amount, + bestRoute.route, + )) + + return bestRoute.coinOut, nil +} + +// Handles MsgPlaceLimitOrder, initializing (tick, pair) data structures if needed, calculating and +// storing information for a new limit order at a specific tick. +func (k Keeper) PlaceLimitOrderCore( + goCtx context.Context, + tokenIn string, + tokenOut string, + amountIn sdk.Int, + tickIndexInToOut int64, + orderType types.LimitOrderType, + goodTil *time.Time, + maxAmountOut *sdk.Int, + callerAddr sdk.AccAddress, + receiverAddr sdk.AccAddress, +) (trancheKey string, totalInCoin sdk.Coin, swapInCoin sdk.Coin, swapOutCoin sdk.Coin, err error) { + ctx := sdk.UnwrapSDKContext(goCtx) + + var pairID *types.PairID + pairID, err = types.NewPairIDFromUnsorted(tokenIn, tokenOut) + if err != nil { + return + } + + amountLeft, totalIn := amountIn, sdk.ZeroInt() + + // For everything except just-in-time (JIT) orders try to execute as a swap first + if !orderType.IsJIT() { + // This is ok because tokenOut is provided to the constructor of PairID above + takerTradePairID := pairID.MustTradePairIDFromMaker(tokenOut) + var limitPrice math_utils.PrecDec + limitPrice, err = types.CalcPrice(tickIndexInToOut) + err = err + if err != nil { + return + } + + var orderFilled bool + swapInCoin, swapOutCoin, orderFilled, err = k.SwapWithCache( + ctx, + takerTradePairID, + amountIn, + maxAmountOut, + &limitPrice, + ) + if err != nil { + return + } + + if orderType.IsFoK() && !orderFilled { + err = types.ErrFoKLimitOrderNotFilled + return + } + + totalIn = swapInCoin.Amount + amountLeft = amountLeft.Sub(swapInCoin.Amount) + + if swapOutCoin.IsPositive() { + err = k.bankKeeper.SendCoinsFromModuleToAccount( + ctx, + types.ModuleName, + receiverAddr, + sdk.Coins{swapOutCoin}, + ) + if err != nil { + return + } + } + } + + // This is ok because pairID was constructed from tokenIn above. + makerTradePairID := pairID.MustTradePairIDFromMaker(tokenIn) + makerTickIndexTakerToMaker := tickIndexInToOut * -1 + var placeTranche *types.LimitOrderTranche + placeTranche, err = k.GetOrInitPlaceTranche( + ctx, + makerTradePairID, + makerTickIndexTakerToMaker, + goodTil, + orderType, + ) + if err != nil { + return + } + + trancheKey = placeTranche.Key.TrancheKey + trancheUser := k.GetOrInitLimitOrderTrancheUser( + ctx, + makerTradePairID, + makerTickIndexTakerToMaker, + trancheKey, + orderType, + receiverAddr.String(), + ) + + sharesIssued := sdk.ZeroInt() + // FOR GTC, JIT & GoodTil try to place a maker limitOrder with remaining Amount + if amountLeft.IsPositive() && + (orderType.IsGTC() || orderType.IsJIT() || orderType.IsGoodTil()) { + placeTranche.PlaceMakerLimitOrder(amountLeft) + trancheUser.SharesOwned = trancheUser.SharesOwned.Add(amountLeft) + + if orderType.HasExpiration() { + goodTilRecord := NewLimitOrderExpiration(placeTranche) + k.SetLimitOrderExpiration(ctx, goodTilRecord) + ctx.GasMeter().ConsumeGas(types.ExpiringLimitOrderGas, "Expiring LimitOrder Fee") + } + + k.SaveTranche(ctx, placeTranche) + + totalIn = totalIn.Add(amountLeft) + sharesIssued = amountLeft + } + + k.SaveTrancheUser(ctx, trancheUser) + + if totalIn.IsPositive() { + totalInCoin = sdk.NewCoin(tokenIn, totalIn) + + err = k.bankKeeper.SendCoinsFromAccountToModule( + ctx, + callerAddr, + types.ModuleName, + sdk.Coins{totalInCoin}, + ) + if err != nil { + return + } + } + + ctx.EventManager().EmitEvent(types.CreatePlaceLimitOrderEvent( + callerAddr, + receiverAddr, + pairID.Token0, + pairID.Token1, + tokenIn, + tokenOut, + totalIn, + tickIndexInToOut, + orderType.String(), + sharesIssued, + trancheKey, + )) + + return +} + +// Handles MsgCancelLimitOrder, removing a specified number of shares from a limit order +// and returning the respective amount in terms of the reserve to the user. +func (k Keeper) CancelLimitOrderCore( + goCtx context.Context, + trancheKey string, + callerAddr sdk.AccAddress, +) error { + ctx := sdk.UnwrapSDKContext(goCtx) + + trancheUser, found := k.GetLimitOrderTrancheUser(ctx, callerAddr.String(), trancheKey) + if !found { + return types.ErrActiveLimitOrderNotFound + } + + tradePairID, tickIndex := trancheUser.TradePairID, trancheUser.TickIndexTakerToMaker + tranche := k.GetLimitOrderTranche( + ctx, + &types.LimitOrderTrancheKey{ + TradePairID: tradePairID, + TickIndexTakerToMaker: tickIndex, + TrancheKey: trancheKey, + }, + ) + if tranche == nil { + return types.ErrActiveLimitOrderNotFound + } + + amountToCancel := tranche.RemoveTokenIn(trancheUser) + trancheUser.SharesCancelled = trancheUser.SharesCancelled.Add(amountToCancel) + + if amountToCancel.IsPositive() { + coinOut := sdk.NewCoin(tradePairID.MakerDenom, amountToCancel) + + err := k.bankKeeper.SendCoinsFromModuleToAccount( + ctx, + types.ModuleName, + callerAddr, + sdk.Coins{coinOut}, + ) + if err != nil { + return err + } + + k.SaveTrancheUser(ctx, trancheUser) + k.SaveTranche(ctx, tranche) + + if trancheUser.OrderType.HasExpiration() { + k.RemoveLimitOrderExpiration(ctx, *tranche.ExpirationTime, tranche.Key.KeyMarshal()) + } + } else { + return sdkerrors.Wrapf(types.ErrCancelEmptyLimitOrder, "%s", tranche.Key.TrancheKey) + } + + pairID := tradePairID.MustPairID() + ctx.EventManager().EmitEvent(types.CancelLimitOrderEvent( + callerAddr, + pairID.Token0, + pairID.Token1, + tradePairID.MakerDenom, + tradePairID.TakerDenom, + amountToCancel, + trancheKey, + )) + + return nil +} + +// Handles MsgWithdrawFilledLimitOrder, calculates and sends filled liqudity from module to user +// for a limit order based on amount wished to receive. +func (k Keeper) WithdrawFilledLimitOrderCore( + goCtx context.Context, + trancheKey string, + callerAddr sdk.AccAddress, +) error { + ctx := sdk.UnwrapSDKContext(goCtx) + + trancheUser, found := k.GetLimitOrderTrancheUser( + ctx, + callerAddr.String(), + trancheKey, + ) + if !found { + return sdkerrors.Wrapf(types.ErrValidLimitOrderTrancheNotFound, "%s", trancheKey) + } + + tradePairID, tickIndex := trancheUser.TradePairID, trancheUser.TickIndexTakerToMaker + pairID := tradePairID.MustPairID() + + tranche, wasFilled, found := k.FindLimitOrderTranche( + ctx, + &types.LimitOrderTrancheKey{ + TradePairID: tradePairID, + TickIndexTakerToMaker: tickIndex, + TrancheKey: trancheKey, + }, + ) + + amountOutTokenOut := math_utils.ZeroPrecDec() + remainingTokenIn := sdk.ZeroInt() + // It's possible that a TrancheUser exists but tranche does not if LO was filled entirely through a swap + if found { + var amountOutTokenIn sdk.Int + amountOutTokenIn, amountOutTokenOut = tranche.Withdraw(trancheUser) + + if wasFilled { + // This is only relevant for inactive JIT and GoodTil limit orders + remainingTokenIn = tranche.RemoveTokenIn(trancheUser) + k.SaveInactiveTranche(ctx, tranche) + } else { + k.SetLimitOrderTranche(ctx, tranche) + } + + trancheUser.SharesWithdrawn = trancheUser.SharesWithdrawn.Add(amountOutTokenIn) + } + + k.SaveTrancheUser(ctx, trancheUser) + + if amountOutTokenOut.IsPositive() || remainingTokenIn.IsPositive() { + coinTakerDenomOut := sdk.NewCoin(tradePairID.TakerDenom, amountOutTokenOut.TruncateInt()) + coinMakerDenomRefund := sdk.NewCoin(tradePairID.MakerDenom, remainingTokenIn) + coins := sdk.NewCoins(coinTakerDenomOut, coinMakerDenomRefund) + if err := k.bankKeeper.SendCoinsFromModuleToAccount(ctx, types.ModuleName, callerAddr, coins); err != nil { + return err + } + } else { + return types.ErrWithdrawEmptyLimitOrder + } + + ctx.EventManager().EmitEvent(types.WithdrawFilledLimitOrderEvent( + callerAddr, + pairID.Token0, + pairID.Token1, + tradePairID.MakerDenom, + tradePairID.TakerDenom, + amountOutTokenOut.TruncateInt(), + trancheKey, + )) + + return nil +} diff --git a/x/dex/keeper/core_helper.go b/x/dex/keeper/core_helper.go new file mode 100644 index 000000000..b6089cf83 --- /dev/null +++ b/x/dex/keeper/core_helper.go @@ -0,0 +1,106 @@ +package keeper + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" + sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + math_utils "github.com/neutron-org/neutron/utils/math" + "github.com/neutron-org/neutron/x/dex/types" + "golang.org/x/exp/slices" +) + +/////////////////////////////////////////////////////////////////////////////// +// STATE CALCULATIONS // +/////////////////////////////////////////////////////////////////////////////// + +func (k Keeper) GetCurrPrice(ctx sdk.Context, tradePairID *types.TradePairID) (math_utils.PrecDec, bool) { + liq := k.GetCurrLiq(ctx, tradePairID) + if liq != nil { + return liq.Price(), true + } + return math_utils.ZeroPrecDec(), false +} + +// Returns a takerToMaker tick index +func (k Keeper) GetCurrTickIndexTakerToMaker( + ctx sdk.Context, + tradePairID *types.TradePairID, +) (int64, bool) { + liq := k.GetCurrLiq(ctx, tradePairID) + if liq != nil { + return liq.TickIndex(), true + } + return 0, false +} + +// Returns a takerToMaker tick index +func (k Keeper) GetCurrTickIndexTakerToMakerNormalized( + ctx sdk.Context, + tradePairID *types.TradePairID, +) (int64, bool) { + tickIndexTakerToMaker, found := k.GetCurrTickIndexTakerToMaker(ctx, tradePairID) + if found { + tickIndexTakerToMakerNormalized := tradePairID.TickIndexNormalized(tickIndexTakerToMaker) + return tickIndexTakerToMakerNormalized, true + } + + return 0, false +} + +func (k Keeper) GetCurrLiq(ctx sdk.Context, tradePairID *types.TradePairID) *types.TickLiquidity { + ti := k.NewTickIterator(ctx, tradePairID) + defer ti.Close() + for ; ti.Valid(); ti.Next() { + tick := ti.Value() + if tick.HasToken() { + return &tick + } + } + + return nil +} + +func (k Keeper) GetValidFees(ctx sdk.Context) []uint64 { + return k.GetParams(ctx).FeeTiers +} + +func (k Keeper) ValidateFee(ctx sdk.Context, fee uint64) error { + validFees := k.GetValidFees(ctx) + if !slices.Contains(validFees, fee) { + return sdkerrors.Wrapf(types.ErrInvalidFee, "%s", validFees) + } + + return nil +} + +/////////////////////////////////////////////////////////////////////////////// +// TOKENIZER UTILS // +/////////////////////////////////////////////////////////////////////////////// + +func (k Keeper) MintShares(ctx sdk.Context, addr sdk.AccAddress, shareCoin sdk.Coin) error { + // mint share tokens + sharesCoins := sdk.Coins{shareCoin} + if err := k.bankKeeper.MintCoins(ctx, types.ModuleName, sharesCoins); err != nil { + return err + } + // transfer them to addr + err := k.bankKeeper.SendCoinsFromModuleToAccount(ctx, types.ModuleName, addr, sharesCoins) + + return err +} + +func (k Keeper) BurnShares( + ctx sdk.Context, + addr sdk.AccAddress, + amount sdk.Int, + sharesID string, +) error { + sharesCoins := sdk.Coins{sdk.NewCoin(sharesID, amount)} + // transfer tokens to module + if err := k.bankKeeper.SendCoinsFromAccountToModule(ctx, addr, types.ModuleName, sharesCoins); err != nil { + return err + } + // burn tokens + err := k.bankKeeper.BurnCoins(ctx, types.ModuleName, sharesCoins) + + return err +} diff --git a/x/dex/keeper/core_helper_test.go b/x/dex/keeper/core_helper_test.go new file mode 100644 index 000000000..6735567fc --- /dev/null +++ b/x/dex/keeper/core_helper_test.go @@ -0,0 +1,159 @@ +package keeper_test + +import ( + "testing" + + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + "github.com/cosmos/cosmos-sdk/baseapp" + sdk "github.com/cosmos/cosmos-sdk/types" + authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" + banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" + dualityapp "github.com/neutron-org/neutron/app" + . "github.com/neutron-org/neutron/x/dex/keeper" + "github.com/neutron-org/neutron/x/dex/types" + "github.com/stretchr/testify/suite" +) + +// Test Suite /////////////////////////////////////////////////////////////// +type CoreHelpersTestSuite struct { + suite.Suite + app *dualityapp.App + msgServer types.MsgServer + ctx sdk.Context + queryClient types.QueryClient + alice sdk.AccAddress + bob sdk.AccAddress + carol sdk.AccAddress + dan sdk.AccAddress +} + +func TestCoreHelpersTestSuite(t *testing.T) { + suite.Run(t, new(CoreHelpersTestSuite)) +} + +func (s *CoreHelpersTestSuite) SetupTest() { + app := dualityapp.Setup(s.T(), false) + ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + + app.AccountKeeper.SetParams(ctx, authtypes.DefaultParams()) + app.BankKeeper.SetParams(ctx, banktypes.DefaultParams()) + + queryHelper := baseapp.NewQueryServerTestHelper(ctx, app.InterfaceRegistry()) + types.RegisterQueryServer(queryHelper, app.DexKeeper) + queryClient := types.NewQueryClient(queryHelper) + + accAlice := app.AccountKeeper.NewAccountWithAddress(ctx, s.alice) + app.AccountKeeper.SetAccount(ctx, accAlice) + accBob := app.AccountKeeper.NewAccountWithAddress(ctx, s.bob) + app.AccountKeeper.SetAccount(ctx, accBob) + accCarol := app.AccountKeeper.NewAccountWithAddress(ctx, s.carol) + app.AccountKeeper.SetAccount(ctx, accCarol) + accDan := app.AccountKeeper.NewAccountWithAddress(ctx, s.dan) + app.AccountKeeper.SetAccount(ctx, accDan) + + s.app = app + s.msgServer = NewMsgServerImpl(app.DexKeeper) + s.ctx = ctx + s.queryClient = queryClient + s.alice = sdk.AccAddress([]byte("alice")) + s.bob = sdk.AccAddress([]byte("bob")) + s.carol = sdk.AccAddress([]byte("carol")) + s.dan = sdk.AccAddress([]byte("dan")) +} + +func (s *CoreHelpersTestSuite) setLPAtFee1Pool(tickIndex int64, amountA int, amountB int) { + pairID := &types.PairID{Token0: "TokenA", Token1: "TokenB"} + pool, err := s.app.DexKeeper.GetOrInitPool(s.ctx, pairID, tickIndex, 1) + if err != nil { + panic(err) + } + lowerTick, upperTick := pool.LowerTick0, pool.UpperTick1 + amountAInt := sdk.NewInt(int64(amountA)) + amountBInt := sdk.NewInt(int64(amountB)) + + existingShares := s.app.BankKeeper.GetSupply(s.ctx, pool.GetPoolDenom()).Amount + + totalShares := pool.CalcSharesMinted(amountAInt, amountBInt, existingShares) + + s.app.DexKeeper.MintShares(s.ctx, s.alice, totalShares) + + lowerTick.ReservesMakerDenom = amountAInt + upperTick.ReservesMakerDenom = amountBInt + s.app.DexKeeper.SetPool(s.ctx, pool) +} + +// FindNextTick //////////////////////////////////////////////////// + +func (s *CoreHelpersTestSuite) TestFindNextTick1To0NoLiq() { + // GIVEN there is no ticks with token0 in the pool + + s.setLPAtFee1Pool(1, 0, 10) + + // THEN GetCurrTick1To0 doesn't find a tick + + _, found := s.app.DexKeeper.GetCurrTickIndexTakerToMaker(s.ctx, defaultTradePairID1To0) + s.Assert().False(found) +} + +func (s *CoreHelpersTestSuite) TestGetCurrTick1To0WithLiq() { + // Given multiple locations of token0 + s.setLPAtFee1Pool(-1, 10, 0) + s.setLPAtFee1Pool(0, 10, 0) + + // THEN GetCurrTick1To0 finds the tick at -1 + + tickIdx, found := s.app.DexKeeper.GetCurrTickIndexTakerToMakerNormalized(s.ctx, defaultTradePairID1To0) + s.Require().True(found) + s.Assert().Equal(int64(-1), tickIdx) +} + +func (s *CoreHelpersTestSuite) TestGetCurrTick1To0WithMinLiq() { + // GIVEN tick with token0 @ index -1 + s.setLPAtFee1Pool(-1, 10, 0) + s.setLPAtFee1Pool(1, 0, 0) + + // THEN GetCurrTick1To0 finds the tick at -2 + + tickIdx, found := s.app.DexKeeper.GetCurrTickIndexTakerToMakerNormalized(s.ctx, defaultTradePairID1To0) + s.Require().True(found) + s.Assert().Equal(int64(-2), tickIdx) +} + +// GetCurrTick0To1 /////////////////////////////////////////////////////////// + +func (s *CoreHelpersTestSuite) TestGetCurrTick0To1NoLiq() { + // GIVEN there are no tick with Token1 in the pool + + s.setLPAtFee1Pool(0, 10, 0) + + // THEN GetCurrTick0To1 doesn't find a tick + + _, found := s.app.DexKeeper.GetCurrTickIndexTakerToMakerNormalized(s.ctx, defaultTradePairID0To1) + s.Assert().False(found) +} + +func (s *CoreHelpersTestSuite) TestGetCurrTick0To1WithLiq() { + // GIVEN multiple locations of token1 + + s.setLPAtFee1Pool(-1, 10, 0) + s.setLPAtFee1Pool(0, 0, 10) + s.setLPAtFee1Pool(1, 0, 10) + + // THEN GetCurrTick0To1 finds the tick at 1 + + tickIdx, found := s.app.DexKeeper.GetCurrTickIndexTakerToMakerNormalized(s.ctx, defaultTradePairID0To1) + s.Require().True(found) + s.Assert().Equal(int64(1), tickIdx) +} + +func (s *CoreHelpersTestSuite) TestGetCurrTick0To1WithMinLiq() { + // WHEN tick with token1 @ index 1 + s.setLPAtFee1Pool(-1, 0, 0) + s.setLPAtFee1Pool(1, 0, 10) + + // THEN GetCurrTick0To1 finds the tick at 2 + + tickIdx, found := s.app.DexKeeper.GetCurrTickIndexTakerToMakerNormalized(s.ctx, defaultTradePairID0To1) + s.Require().True(found) + s.Assert().Equal(int64(2), tickIdx) +} diff --git a/x/dex/keeper/deposit_record.go b/x/dex/keeper/deposit_record.go new file mode 100644 index 000000000..5b2673368 --- /dev/null +++ b/x/dex/keeper/deposit_record.go @@ -0,0 +1,38 @@ +package keeper + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/neutron-org/neutron/x/dex/types" + "github.com/neutron-org/neutron/x/dex/utils" +) + +func (k Keeper) GetAllDepositsForAddress(ctx sdk.Context, addr sdk.AccAddress) []*types.DepositRecord { + var depositArr []*types.DepositRecord + k.bankKeeper.IterateAccountBalances(ctx, addr, + func(sharesMaybe sdk.Coin) bool { + err := types.ValidatePoolDenom(sharesMaybe.Denom) + if err != nil { + return false + } + + poolMetadata, err := k.GetPoolMetadataByDenom(ctx, sharesMaybe.Denom) + if err != nil { + panic("Can't get info for PoolDenom") + } + fee := utils.MustSafeUint64ToInt64(poolMetadata.Fee) + depositRecord := &types.DepositRecord{ + PairID: poolMetadata.PairID, + SharesOwned: sharesMaybe.Amount, + CenterTickIndex: poolMetadata.Tick, + LowerTickIndex: poolMetadata.Tick - fee, + UpperTickIndex: poolMetadata.Tick + fee, + Fee: poolMetadata.Fee, + } + depositArr = append(depositArr, depositRecord) + + return false + }, + ) + + return depositArr +} diff --git a/x/dex/keeper/deposit_record_test.go b/x/dex/keeper/deposit_record_test.go new file mode 100644 index 000000000..aed7bcc1d --- /dev/null +++ b/x/dex/keeper/deposit_record_test.go @@ -0,0 +1,61 @@ +package keeper_test + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/neutron-org/neutron/x/dex/types" +) + +func (s *MsgServerTestSuite) TestGetAllDeposits() { + s.fundAliceBalances(20, 20) + // GIVEN Alice Deposits 3 positions and withdraws the first + s.aliceDeposits( + &Deposit{ + AmountA: sdk.NewInt(1), + AmountB: sdk.NewInt(0), + TickIndex: -50, + Fee: 1, + }, + &Deposit{ + AmountA: sdk.NewInt(5), + AmountB: sdk.NewInt(5), + TickIndex: 0, + Fee: 1, + }, + &Deposit{ + AmountA: sdk.NewInt(0), + AmountB: sdk.NewInt(10), + TickIndex: 2, + Fee: 1, + }, + ) + s.aliceWithdraws(&Withdrawal{ + TickIndex: -50, + Fee: 1, + Shares: sdk.NewInt(1), + }, + ) + + // THEN GetAllDeposits returns the two remaining LP positions + depositList := s.app.DexKeeper.GetAllDepositsForAddress(s.ctx, s.alice) + s.Assert().Equal(2, len(depositList)) + s.Assert().Equal(&types.DepositRecord{ + PairID: defaultPairID, + SharesOwned: sdk.NewInt(10), + CenterTickIndex: 0, + LowerTickIndex: -1, + UpperTickIndex: 1, + Fee: 1, + }, + depositList[0], + ) + s.Assert().Equal(&types.DepositRecord{ + PairID: defaultPairID, + SharesOwned: sdk.NewInt(10), + CenterTickIndex: 2, + LowerTickIndex: 1, + UpperTickIndex: 3, + Fee: 1, + }, + depositList[1], + ) +} diff --git a/x/dex/keeper/grpc_query.go b/x/dex/keeper/grpc_query.go new file mode 100644 index 000000000..456161826 --- /dev/null +++ b/x/dex/keeper/grpc_query.go @@ -0,0 +1,7 @@ +package keeper + +import ( + "github.com/neutron-org/neutron/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 new file mode 100644 index 000000000..a178f5ca4 --- /dev/null +++ b/x/dex/keeper/grpc_query_estimate_multi_hop_swap.go @@ -0,0 +1,50 @@ +package keeper + +import ( + "context" + + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/neutron-org/neutron/x/dex/types" +) + +// TODO: This doesn't run ValidateBasic() checks. +func (k Keeper) EstimateMultiHopSwap( + goCtx context.Context, + req *types.QueryEstimateMultiHopSwapRequest, +) (*types.QueryEstimateMultiHopSwapResponse, error) { + msg := types.MsgMultiHopSwap{ + Creator: req.Creator, + Receiver: req.Receiver, + Routes: req.Routes, + AmountIn: req.AmountIn, + ExitLimitPrice: req.ExitLimitPrice, + PickBestRoute: req.PickBestRoute, + } + if err := msg.ValidateBasic(); err != nil { + return nil, err + } + + ctx := sdk.UnwrapSDKContext(goCtx) + cacheCtx, _ := ctx.CacheContext() + cacheGoCtx := sdk.WrapSDKContext(cacheCtx) + + callerAddr := sdk.MustAccAddressFromBech32(req.Creator) + receiverAddr := sdk.MustAccAddressFromBech32(req.Receiver) + + coinOut, err := k.MultiHopSwapCore( + cacheGoCtx, + req.AmountIn, + req.Routes, + req.ExitLimitPrice, + req.PickBestRoute, + callerAddr, + receiverAddr, + ) + if err != nil { + return nil, err + } + + // NB: Critically, we do not write the best route's buffered state context since this is only an estimate. + + return &types.QueryEstimateMultiHopSwapResponse{CoinOut: coinOut}, nil +} 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 new file mode 100644 index 000000000..c2830469e --- /dev/null +++ b/x/dex/keeper/grpc_query_estimate_multi_hop_swap_test.go @@ -0,0 +1,365 @@ +package keeper_test + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" + keepertest "github.com/neutron-org/neutron/testutil/keeper" + math_utils "github.com/neutron-org/neutron/utils/math" + "github.com/neutron-org/neutron/x/dex/types" +) + +func (s *MsgServerTestSuite) TestEstimateMultiHopSwapSingleRoute() { + s.fundAliceBalances(100, 0) + + // 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 := [][]string{{"TokenA", "TokenB", "TokenC", "TokenD"}} + coinOut := s.aliceEstimatesMultiHopSwap(route, 100, math_utils.MustNewPrecDecFromStr("0.9"), false) + + // THEN alice would get out 99 TokenD + s.Assert().Equal(sdk.NewInt(97), coinOut.Amount) + s.assertAccountBalanceWithDenom(s.alice, "TokenA", 100) + s.assertAccountBalanceWithDenom(s.alice, "TokenD", 0) + + s.assertDexBalanceWithDenom("TokenA", 0) + s.assertDexBalanceWithDenom("TokenB", 100) + s.assertDexBalanceWithDenom("TokenC", 100) + s.assertDexBalanceWithDenom("TokenD", 100) +} + +func (s *MsgServerTestSuite) TestEstimateMultiHopSwapInsufficientLiquiditySingleRoute() { + s.fundAliceBalances(100, 0) + + // GIVEN liquidity in pools A<>B, B<>C, C<>D with insufficient liquidity in C<>D + s.SetupMultiplePools( + NewPoolSetup("TokenA", "TokenB", 0, 100, 0, 1), + NewPoolSetup("TokenB", "TokenC", 0, 100, 0, 1), + NewPoolSetup("TokenC", "TokenD", 0, 50, 0, 1), + ) + + // THEN estimate multihopswap fails + route := [][]string{{"TokenA", "TokenB", "TokenC", "TokenD"}} + s.aliceEstimatesMultiHopSwapFails( + types.ErrInsufficientLiquidity, + route, + 100, + math_utils.MustNewPrecDecFromStr("0.9"), + false, + ) +} + +func (s *MsgServerTestSuite) TestEstimateMultiHopSwapLimitPriceNotMetSingleRoute() { + s.fundAliceBalances(100, 0) + + // GIVEN liquidity in pools A<>B, B<>C, C<>D with insufficient liquidity in C<>D + s.SetupMultiplePools( + NewPoolSetup("TokenA", "TokenB", 0, 100, 0, 1), + NewPoolSetup("TokenB", "TokenC", 0, 100, 0, 1), + NewPoolSetup("TokenC", "TokenD", 0, 100, 1200, 1), + ) + + // THEN estimate multihopswap fails + route := [][]string{{"TokenA", "TokenB", "TokenC", "TokenD"}} + s.aliceEstimatesMultiHopSwapFails( + types.ErrExitLimitPriceHit, + route, + 50, + math_utils.MustNewPrecDecFromStr("0.9"), + false, + ) +} + +func (s *MsgServerTestSuite) TestEstimateMultiHopSwapMultiRouteOneGood() { + s.fundAliceBalances(100, 0) + + // GIVEN viable liquidity in pools A<>B, B<>E, E<>X + s.SetupMultiplePools( + NewPoolSetup("TokenA", "TokenB", 0, 100, 0, 1), + NewPoolSetup("TokenB", "TokenC", 0, 100, 0, 1), + NewPoolSetup("TokenC", "TokenX", 0, 50, 0, 1), + NewPoolSetup("TokenC", "TokenX", 0, 50, 2200, 1), + NewPoolSetup("TokenB", "TokenD", 0, 100, 0, 1), + NewPoolSetup("TokenD", "TokenX", 0, 50, 0, 1), + NewPoolSetup("TokenD", "TokenX", 0, 50, 2200, 1), + NewPoolSetup("TokenB", "TokenE", 0, 100, 0, 1), + NewPoolSetup("TokenE", "TokenX", 0, 100, 0, 1), + ) + + // WHEN estimate multihopswaps with three routes the first two routes fail and the third works + routes := [][]string{ + {"TokenA", "TokenB", "TokenC", "TokenX"}, + {"TokenA", "TokenB", "TokenD", "TokenX"}, + {"TokenA", "TokenB", "TokenE", "TokenX"}, + } + + s.assertLiquidityAtTickWithDenom( + &types.PairID{Token0: "TokenA", Token1: "TokenB"}, + sdk.NewInt(0), + sdk.NewInt(100), + 0, + 1, + ) + + coinOut := s.aliceEstimatesMultiHopSwap(routes, 100, math_utils.MustNewPrecDecFromStr("0.9"), false) + _ = coinOut + + // THEN swap estimation succeeds through route A<>B, B<>E, E<>X + + s.Assert().Equal(sdk.NewInt(97), coinOut.Amount) + s.assertAccountBalanceWithDenom(s.alice, "TokenA", 100) + s.assertAccountBalanceWithDenom(s.alice, "TokenX", 0) + s.assertLiquidityAtTickWithDenom( + &types.PairID{Token0: "TokenA", Token1: "TokenB"}, + sdk.NewInt(0), + sdk.NewInt(100), + 0, + 1, + ) + s.assertLiquidityAtTickWithDenom( + &types.PairID{Token0: "TokenB", Token1: "TokenE"}, + sdk.NewInt(0), + sdk.NewInt(100), + 0, + 1, + ) + s.assertLiquidityAtTickWithDenom( + &types.PairID{Token0: "TokenE", Token1: "TokenX"}, + sdk.NewInt(0), + sdk.NewInt(100), + 0, + 1, + ) + + // Other pools are unaffected + s.assertLiquidityAtTickWithDenom( + &types.PairID{Token0: "TokenB", Token1: "TokenC"}, + sdk.NewInt(0), + sdk.NewInt(100), + 0, + 1, + ) + s.assertLiquidityAtTickWithDenom( + &types.PairID{Token0: "TokenC", Token1: "TokenX"}, + sdk.NewInt(0), + sdk.NewInt(50), + 0, + 1, + ) + s.assertLiquidityAtTickWithDenom( + &types.PairID{Token0: "TokenC", Token1: "TokenX"}, + sdk.NewInt(0), + sdk.NewInt(50), + 2200, + 1, + ) + s.assertLiquidityAtTickWithDenom( + &types.PairID{Token0: "TokenB", Token1: "TokenD"}, + sdk.NewInt(0), + sdk.NewInt(100), + 0, + 1, + ) + s.assertLiquidityAtTickWithDenom( + &types.PairID{Token0: "TokenD", Token1: "TokenX"}, + sdk.NewInt(0), + sdk.NewInt(50), + 0, + 1, + ) + s.assertLiquidityAtTickWithDenom( + &types.PairID{Token0: "TokenD", Token1: "TokenX"}, + sdk.NewInt(0), + sdk.NewInt(50), + 2200, + 1, + ) +} + +func (s *MsgServerTestSuite) TestEstimateMultiHopSwapMultiRouteAllFail() { + s.fundAliceBalances(100, 0) + + // GIVEN liquidity in sufficient liquidity but inadequate prices + s.SetupMultiplePools( + NewPoolSetup("TokenA", "TokenB", 0, 100, 0, 1), + NewPoolSetup("TokenB", "TokenC", 0, 100, 0, 1), + NewPoolSetup("TokenC", "TokenX", 0, 50, 0, 1), + NewPoolSetup("TokenC", "TokenX", 0, 50, 2200, 1), + NewPoolSetup("TokenB", "TokenD", 0, 100, 0, 1), + NewPoolSetup("TokenD", "TokenX", 0, 50, 0, 1), + NewPoolSetup("TokenD", "TokenX", 0, 50, 2200, 1), + NewPoolSetup("TokenB", "TokenE", 0, 50, 0, 1), + NewPoolSetup("TokenE", "TokenX", 0, 50, 2200, 1), + ) + + // WHEN alice multihopswaps with three routes they all fail + routes := [][]string{ + {"TokenA", "TokenB", "TokenC", "TokenX"}, + {"TokenA", "TokenB", "TokenD", "TokenX"}, + {"TokenA", "TokenB", "TokenE", "TokenX"}, + } + + // Then fails with findBestRoute + s.aliceEstimatesMultiHopSwapFails( + types.ErrExitLimitPriceHit, + routes, + 100, + math_utils.MustNewPrecDecFromStr("0.9"), + true, + ) + + // and with findFirstRoute + + s.aliceEstimatesMultiHopSwapFails( + types.ErrExitLimitPriceHit, + routes, + 100, + math_utils.MustNewPrecDecFromStr("0.9"), + false, + ) +} + +func (s *MsgServerTestSuite) TestEstimateMultiHopSwapMultiRouteFindBestRoute() { + s.fundAliceBalances(100, 0) + + // GIVEN viable liquidity in pools but with a best route through E<>X + s.SetupMultiplePools( + NewPoolSetup("TokenA", "TokenB", 0, 100, 0, 1), + NewPoolSetup("TokenB", "TokenC", 0, 100, 0, 1), + NewPoolSetup("TokenC", "TokenX", 0, 1000, -1000, 1), + NewPoolSetup("TokenB", "TokenD", 0, 100, 0, 1), + NewPoolSetup("TokenD", "TokenX", 0, 1000, -2000, 1), + NewPoolSetup("TokenB", "TokenE", 0, 100, 0, 1), + NewPoolSetup("TokenE", "TokenX", 0, 1000, -3000, 1), + ) + + // WHEN alice multihopswaps with three routes + routes := [][]string{ + {"TokenA", "TokenB", "TokenC", "TokenX"}, + {"TokenA", "TokenB", "TokenD", "TokenX"}, + {"TokenA", "TokenB", "TokenE", "TokenX"}, + } + coinOut := s.aliceEstimatesMultiHopSwap(routes, 100, math_utils.MustNewPrecDecFromStr("0.9"), true) + + // THEN swap succeeds through route A<>B, B<>E, E<>X + + s.Assert().Equal(sdk.NewCoin("TokenX", sdk.NewInt(132)), coinOut) + s.assertLiquidityAtTickWithDenom( + &types.PairID{Token0: "TokenA", Token1: "TokenB"}, + sdk.NewInt(0), + sdk.NewInt(100), + 0, + 1, + ) + s.assertLiquidityAtTickWithDenom( + &types.PairID{Token0: "TokenB", Token1: "TokenE"}, + sdk.NewInt(0), + sdk.NewInt(100), + 0, + 1, + ) + s.assertLiquidityAtTickWithDenom( + &types.PairID{Token0: "TokenE", Token1: "TokenX"}, + sdk.NewInt(0), + sdk.NewInt(1000), + -3000, + 1, + ) + + // Other pools are unaffected + s.assertLiquidityAtTickWithDenom( + &types.PairID{Token0: "TokenB", Token1: "TokenC"}, + sdk.NewInt(0), + sdk.NewInt(100), + 0, + 1, + ) + s.assertLiquidityAtTickWithDenom( + &types.PairID{Token0: "TokenC", Token1: "TokenX"}, + sdk.NewInt(0), + sdk.NewInt(1000), + -1000, + 1, + ) + s.assertLiquidityAtTickWithDenom( + &types.PairID{Token0: "TokenB", Token1: "TokenD"}, + sdk.NewInt(0), + sdk.NewInt(100), + 0, + 1, + ) + s.assertLiquidityAtTickWithDenom( + &types.PairID{Token0: "TokenD", Token1: "TokenX"}, + sdk.NewInt(0), + sdk.NewInt(1000), + -2000, + 1, + ) +} + +func (s *MsgServerTestSuite) TestEstimateMultiHopSwapLongRouteWithCache() { + s.fundAliceBalances(100, 0) + + // GIVEN viable route from A->B->C...->L but last leg to X only possible through K->M->X + s.SetupMultiplePools( + NewPoolSetup("TokenA", "TokenB", 0, 100, 0, 1), + NewPoolSetup("TokenB", "TokenC", 0, 100, 0, 1), + NewPoolSetup("TokenC", "TokenD", 0, 100, 0, 1), + NewPoolSetup("TokenD", "TokenE", 0, 100, 0, 1), + NewPoolSetup("TokenE", "TokenF", 0, 100, 0, 1), + NewPoolSetup("TokenF", "TokenG", 0, 100, 0, 1), + NewPoolSetup("TokenG", "TokenH", 0, 100, 0, 1), + NewPoolSetup("TokenH", "TokenI", 0, 100, 0, 1), + NewPoolSetup("TokenI", "TokenJ", 0, 100, 0, 1), + NewPoolSetup("TokenJ", "TokenK", 0, 100, 0, 1), + NewPoolSetup("TokenK", "TokenL", 0, 100, 0, 1), + NewPoolSetup("TokenL", "TokenX", 0, 50, 0, 1), + NewPoolSetup("TokenL", "TokenX", 0, 50, 100, 1), + + NewPoolSetup("TokenK", "TokenM", 0, 100, 0, 1), + NewPoolSetup("TokenM", "TokenX", 0, 100, 0, 1), + ) + + // WHEN alice multihopswaps with two overlapping routes with only the last leg different + routes := [][]string{ + { + "TokenA", "TokenB", "TokenC", "TokenD", "TokenE", "TokenF", + "TokenG", "TokenH", "TokenI", "TokenJ", "TokenK", "TokenL", "TokenX", + }, + { + "TokenA", "TokenB", "TokenC", "TokenD", "TokenE", "TokenF", + "TokenG", "TokenH", "TokenI", "TokenJ", "TokenK", "TokenM", "TokenX", + }, + } + coinOut := s.aliceEstimatesMultiHopSwap(routes, 100, math_utils.MustNewPrecDecFromStr("0.8"), true) + + // THEN swap succeeds with second route + s.Assert().Equal(coinOut, sdk.NewCoin("TokenX", sdk.NewInt(88))) + s.assertAccountBalanceWithDenom(s.alice, "TokenA", 100) + s.assertLiquidityAtTickWithDenom( + &types.PairID{Token0: "TokenM", Token1: "TokenX"}, + sdk.NewInt(0), + sdk.NewInt(100), + 0, + 1, + ) +} + +func (s *MsgServerTestSuite) TestEstimateMultiHopSwapEventsEmitted() { + s.fundAliceBalances(100, 0) + + s.SetupMultiplePools( + NewPoolSetup("TokenA", "TokenB", 0, 100, 0, 1), + NewPoolSetup("TokenB", "TokenC", 0, 100, 0, 1), + ) + + route := [][]string{{"TokenA", "TokenB", "TokenC"}} + _ = s.aliceEstimatesMultiHopSwap(route, 100, math_utils.MustNewPrecDecFromStr("0.9"), false) + + // 8 tickUpdateEvents are emitted 4x for pool setup 4x for two swaps + keepertest.AssertEventNotEmitted(s.T(), s.ctx, types.TickUpdateEventKey, "Expected no events") +} diff --git a/x/dex/keeper/grpc_query_estimate_place_limit_order.go b/x/dex/keeper/grpc_query_estimate_place_limit_order.go new file mode 100644 index 000000000..26069379e --- /dev/null +++ b/x/dex/keeper/grpc_query_estimate_place_limit_order.go @@ -0,0 +1,70 @@ +package keeper + +import ( + "context" + + sdk "github.com/cosmos/cosmos-sdk/types" + sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/neutron-org/neutron/x/dex/types" +) + +// TODO: This doesn't run ValidateBasic() checks. +func (k Keeper) EstimatePlaceLimitOrder( + goCtx context.Context, + req *types.QueryEstimatePlaceLimitOrderRequest, +) (*types.QueryEstimatePlaceLimitOrderResponse, error) { + msg := types.MsgPlaceLimitOrder{ + Creator: req.Creator, + Receiver: req.Receiver, + TokenIn: req.TokenIn, + TokenOut: req.TokenOut, + TickIndexInToOut: req.TickIndexInToOut, + AmountIn: req.AmountIn, + OrderType: req.OrderType, + ExpirationTime: req.ExpirationTime, + MaxAmountOut: req.MaxAmountOut, + } + if err := msg.ValidateBasic(); err != nil { + return nil, err + } + + ctx := sdk.UnwrapSDKContext(goCtx) + cacheCtx, _ := ctx.CacheContext() + cacheGoCtx := sdk.WrapSDKContext(cacheCtx) + + callerAddr := sdk.MustAccAddressFromBech32(req.Creator) + receiverAddr := sdk.MustAccAddressFromBech32(req.Receiver) + + blockTime := cacheCtx.BlockTime() + if req.OrderType.IsGoodTil() && !req.ExpirationTime.After(blockTime) { + return nil, sdkerrors.Wrapf(types.ErrExpirationTimeInPast, + "Current BlockTime: %s; Provided ExpirationTime: %s", + blockTime.String(), + req.ExpirationTime.String(), + ) + } + + _, totalInCoin, swapInCoin, swapOutCoin, err := k.PlaceLimitOrderCore( + cacheGoCtx, + req.TokenIn, + req.TokenOut, + req.AmountIn, + req.TickIndexInToOut, + req.OrderType, + req.ExpirationTime, + req.MaxAmountOut, + callerAddr, + receiverAddr, + ) + if err != nil { + return nil, err + } + + // NB: We're only using a cache context so we don't expect any writes to happen. + + return &types.QueryEstimatePlaceLimitOrderResponse{ + TotalInCoin: totalInCoin, + SwapInCoin: swapInCoin, + SwapOutCoin: swapOutCoin, + }, nil +} diff --git a/x/dex/keeper/grpc_query_inactive_limit_order_tranche.go b/x/dex/keeper/grpc_query_inactive_limit_order_tranche.go new file mode 100644 index 000000000..d33740e2b --- /dev/null +++ b/x/dex/keeper/grpc_query_inactive_limit_order_tranche.go @@ -0,0 +1,74 @@ +package keeper + +import ( + "context" + + "github.com/cosmos/cosmos-sdk/store/prefix" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/types/query" + "github.com/neutron-org/neutron/x/dex/types" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" +) + +func (k Keeper) InactiveLimitOrderTrancheAll( + c context.Context, + req *types.QueryAllInactiveLimitOrderTrancheRequest, +) (*types.QueryAllInactiveLimitOrderTrancheResponse, error) { + if req == nil { + return nil, status.Error(codes.InvalidArgument, "invalid request") + } + + var inactiveLimitOrderTranches []*types.LimitOrderTranche + ctx := sdk.UnwrapSDKContext(c) + + store := ctx.KVStore(k.storeKey) + inactiveLimitOrderTrancheStore := prefix.NewStore(store, types.KeyPrefix(types.InactiveLimitOrderTrancheKeyPrefix)) + + pageRes, err := query.Paginate(inactiveLimitOrderTrancheStore, req.Pagination, func(key, value []byte) error { + inactiveLimitOrderTranche := &types.LimitOrderTranche{} + if err := k.cdc.Unmarshal(value, inactiveLimitOrderTranche); err != nil { + return err + } + + inactiveLimitOrderTranches = append(inactiveLimitOrderTranches, inactiveLimitOrderTranche) + + return nil + }) + if err != nil { + return nil, status.Error(codes.Internal, err.Error()) + } + + return &types.QueryAllInactiveLimitOrderTrancheResponse{ + InactiveLimitOrderTranche: inactiveLimitOrderTranches, + Pagination: pageRes, + }, nil +} + +func (k Keeper) InactiveLimitOrderTranche( + c context.Context, + req *types.QueryGetInactiveLimitOrderTrancheRequest, +) (*types.QueryGetInactiveLimitOrderTrancheResponse, error) { + if req == nil { + return nil, status.Error(codes.InvalidArgument, "invalid request") + } + ctx := sdk.UnwrapSDKContext(c) + pairID, err := types.NewPairIDFromCanonicalString(req.PairID) + if err != nil { + return nil, err + } + tradePairID := types.NewTradePairIDFromMaker(pairID, req.TokenIn) + val, found := k.GetInactiveLimitOrderTranche( + ctx, + &types.LimitOrderTrancheKey{ + TradePairID: tradePairID, + TickIndexTakerToMaker: req.TickIndex, + TrancheKey: req.TrancheKey, + }, + ) + if !found { + return nil, status.Error(codes.NotFound, "not found") + } + + return &types.QueryGetInactiveLimitOrderTrancheResponse{InactiveLimitOrderTranche: val}, nil +} 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 new file mode 100644 index 000000000..66a694709 --- /dev/null +++ b/x/dex/keeper/grpc_query_inactive_limit_order_tranche_test.go @@ -0,0 +1,135 @@ +package keeper_test + +import ( + "strconv" + "testing" + + sdk "github.com/cosmos/cosmos-sdk/types" + "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/testutil/dex/keeper" + "github.com/neutron-org/neutron/testutil/dex/nullify" + "github.com/neutron-org/neutron/x/dex/types" +) + +// Prevent strconv unused error +var _ = strconv.IntSize + +func TestInactiveLimitOrderTrancheQuerySingle(t *testing.T) { + keeper, ctx := keepertest.DexKeeper(t) + wctx := sdk.WrapSDKContext(ctx) + msgs := createNInactiveLimitOrderTranche(keeper, ctx, 2) + for _, tc := range []struct { + desc string + request *types.QueryGetInactiveLimitOrderTrancheRequest + response *types.QueryGetInactiveLimitOrderTrancheResponse + err error + }{ + { + desc: "First", + request: &types.QueryGetInactiveLimitOrderTrancheRequest{ + PairID: msgs[0].Key.TradePairID.MustPairID().CanonicalString(), + TokenIn: msgs[0].Key.TradePairID.MakerDenom, + TickIndex: msgs[0].Key.TickIndexTakerToMaker, + TrancheKey: msgs[0].Key.TrancheKey, + }, + response: &types.QueryGetInactiveLimitOrderTrancheResponse{InactiveLimitOrderTranche: msgs[0]}, + }, + { + desc: "Second", + request: &types.QueryGetInactiveLimitOrderTrancheRequest{ + PairID: msgs[1].Key.TradePairID.MustPairID().CanonicalString(), + TokenIn: msgs[1].Key.TradePairID.MakerDenom, + TickIndex: msgs[1].Key.TickIndexTakerToMaker, + TrancheKey: msgs[1].Key.TrancheKey, + }, + response: &types.QueryGetInactiveLimitOrderTrancheResponse{InactiveLimitOrderTranche: msgs[1]}, + }, + { + desc: "KeyNotFound", + request: &types.QueryGetInactiveLimitOrderTrancheRequest{ + PairID: "TokenZ<>TokenQ", + TokenIn: strconv.Itoa(100000), + TickIndex: 100000, + TrancheKey: "100000", + }, + err: status.Error(codes.NotFound, "not found"), + }, + { + desc: "InvalidRequest", + err: status.Error(codes.InvalidArgument, "invalid request"), + }, + } { + t.Run(tc.desc, func(t *testing.T) { + response, err := keeper.InactiveLimitOrderTranche(wctx, tc.request) + if tc.err != nil { + require.ErrorIs(t, err, tc.err) + } else { + require.NoError(t, err) + require.Equal(t, + nullify.Fill(tc.response), + nullify.Fill(response), + ) + } + }) + } +} + +func TestInactiveLimitOrderTrancheQueryPaginated(t *testing.T) { + keeper, ctx := keepertest.DexKeeper(t) + wctx := sdk.WrapSDKContext(ctx) + msgs := createNInactiveLimitOrderTranche(keeper, ctx, 5) + + request := func(next []byte, offset, limit uint64, total bool) *types.QueryAllInactiveLimitOrderTrancheRequest { + return &types.QueryAllInactiveLimitOrderTrancheRequest{ + Pagination: &query.PageRequest{ + Key: next, + Offset: offset, + Limit: limit, + CountTotal: total, + }, + } + } + t.Run("ByOffset", func(t *testing.T) { + step := 2 + for i := 0; i < len(msgs); i += step { + resp, err := keeper.InactiveLimitOrderTrancheAll(wctx, request(nil, uint64(i), uint64(step), false)) + require.NoError(t, err) + require.LessOrEqual(t, len(resp.InactiveLimitOrderTranche), step) + require.Subset(t, + msgs, + resp.InactiveLimitOrderTranche, + ) + } + }) + t.Run("ByKey", func(t *testing.T) { + step := 2 + var next []byte + for i := 0; i < len(msgs); i += step { + resp, err := keeper.InactiveLimitOrderTrancheAll(wctx, request(next, 0, uint64(step), false)) + require.NoError(t, err) + require.LessOrEqual(t, len(resp.InactiveLimitOrderTranche), step) + require.Subset(t, + msgs, + resp.InactiveLimitOrderTranche, + ) + next = resp.Pagination.NextKey + } + }) + t.Run("Total", func(t *testing.T) { + resp, err := keeper.InactiveLimitOrderTrancheAll(wctx, request(nil, 0, 0, true)) + require.NoError(t, err) + require.Equal(t, len(msgs), int(resp.Pagination.Total)) + require.ElementsMatch(t, + msgs, + resp.InactiveLimitOrderTranche, + ) + }) + t.Run("InvalidRequest", func(t *testing.T) { + _, err := keeper.InactiveLimitOrderTrancheAll(wctx, nil) + require.ErrorIs(t, err, status.Error(codes.InvalidArgument, "invalid request")) + }) +} diff --git a/x/dex/keeper/grpc_query_limit_order_tranche.go b/x/dex/keeper/grpc_query_limit_order_tranche.go new file mode 100644 index 000000000..0665dd481 --- /dev/null +++ b/x/dex/keeper/grpc_query_limit_order_tranche.go @@ -0,0 +1,90 @@ +package keeper + +import ( + "context" + + "github.com/cosmos/cosmos-sdk/store/prefix" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/types/query" + "github.com/neutron-org/neutron/x/dex/types" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" +) + +// Returns all ACTIVE limit order tranches for a given pairID/tokenIn combination +// Does NOT return inactiveLimitOrderTranches +func (k Keeper) LimitOrderTrancheAll( + c context.Context, + req *types.QueryAllLimitOrderTrancheRequest, +) (*types.QueryAllLimitOrderTrancheResponse, error) { + if req == nil { + return nil, status.Error(codes.InvalidArgument, "invalid request") + } + + var limitOrderTranches []*types.LimitOrderTranche + ctx := sdk.UnwrapSDKContext(c) + + pairID, err := types.NewPairIDFromCanonicalString(req.PairID) + if err != nil { + return nil, err + } + tradePairID := types.NewTradePairIDFromMaker(pairID, req.TokenIn) + + store := ctx.KVStore(k.storeKey) + limitOrderTrancheStore := prefix.NewStore(store, types.TickLiquidityPrefix(tradePairID)) + + pageRes, err := query.FilteredPaginate( + limitOrderTrancheStore, + req.Pagination, func(key, value []byte, accum bool) (hit bool, err error) { + var tick types.TickLiquidity + + if err := k.cdc.Unmarshal(value, &tick); err != nil { + return false, err + } + tranche := tick.GetLimitOrderTranche() + // Check if this is a LimitOrderTranche and not PoolReserves + if tranche != nil { + if accum { + limitOrderTranches = append(limitOrderTranches, tranche) + } + + return true, nil + } + + return false, nil + }) + if err != nil { + return nil, status.Error(codes.Internal, err.Error()) + } + + return &types.QueryAllLimitOrderTrancheResponse{LimitOrderTranche: limitOrderTranches, Pagination: pageRes}, nil +} + +// Returns a specific limit order tranche either from the tickLiquidity index or from the FillLimitOrderTranche index +func (k Keeper) LimitOrderTranche( + c context.Context, + req *types.QueryGetLimitOrderTrancheRequest, +) (*types.QueryGetLimitOrderTrancheResponse, error) { + if req == nil { + return nil, status.Error(codes.InvalidArgument, "invalid request") + } + ctx := sdk.UnwrapSDKContext(c) + pairID, err := types.NewPairIDFromCanonicalString(req.PairID) + if err != nil { + return nil, err + } + tradePairID := types.NewTradePairIDFromMaker(pairID, req.TokenIn) + val, _, found := k.FindLimitOrderTranche( + ctx, + &types.LimitOrderTrancheKey{ + TradePairID: tradePairID, + TickIndexTakerToMaker: req.TickIndex, + TrancheKey: req.TrancheKey, + }, + ) + if !found { + return nil, status.Error(codes.NotFound, "not found") + } + + return &types.QueryGetLimitOrderTrancheResponse{LimitOrderTranche: val}, nil +} diff --git a/x/dex/keeper/grpc_query_limit_order_tranche_test.go b/x/dex/keeper/grpc_query_limit_order_tranche_test.go new file mode 100644 index 000000000..448777e57 --- /dev/null +++ b/x/dex/keeper/grpc_query_limit_order_tranche_test.go @@ -0,0 +1,135 @@ +package keeper_test + +import ( + "testing" + + sdk "github.com/cosmos/cosmos-sdk/types" + "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/testutil/dex/keeper" + "github.com/neutron-org/neutron/testutil/dex/nullify" + "github.com/neutron-org/neutron/x/dex/types" +) + +func TestLimitOrderTrancheQuerySingle(t *testing.T) { + keeper, ctx := keepertest.DexKeeper(t) + wctx := sdk.WrapSDKContext(ctx) + msgs := createNLimitOrderTranches(keeper, ctx, 2) + for _, tc := range []struct { + desc string + request *types.QueryGetLimitOrderTrancheRequest + response *types.QueryGetLimitOrderTrancheResponse + err error + }{ + { + desc: "First", + request: &types.QueryGetLimitOrderTrancheRequest{ + PairID: "TokenA<>TokenB", + TickIndex: msgs[0].Key.TickIndexTakerToMaker, + TokenIn: "TokenA", + TrancheKey: msgs[0].Key.TrancheKey, + }, + response: &types.QueryGetLimitOrderTrancheResponse{LimitOrderTranche: msgs[0]}, + }, + { + desc: "Second", + request: &types.QueryGetLimitOrderTrancheRequest{ + PairID: "TokenA<>TokenB", + TickIndex: msgs[1].Key.TickIndexTakerToMaker, + TokenIn: "TokenA", + TrancheKey: msgs[1].Key.TrancheKey, + }, + response: &types.QueryGetLimitOrderTrancheResponse{LimitOrderTranche: msgs[1]}, + }, + { + desc: "KeyNotFound", + request: &types.QueryGetLimitOrderTrancheRequest{ + PairID: "TokenA<>TokenB", + TickIndex: 0, + TokenIn: "TokenA", + TrancheKey: "100000", + }, + err: status.Error(codes.NotFound, "not found"), + }, + { + desc: "InvalidRequest", + err: status.Error(codes.InvalidArgument, "invalid request"), + }, + } { + t.Run(tc.desc, func(t *testing.T) { + response, err := keeper.LimitOrderTranche(wctx, tc.request) + if tc.err != nil { + require.ErrorIs(t, err, tc.err) + } else { + require.NoError(t, err) + require.Equal(t, + nullify.Fill(tc.response), + nullify.Fill(response), + ) + } + }) + } +} + +func TestLimitOrderTrancheQueryPaginated(t *testing.T) { + keeper, ctx := keepertest.DexKeeper(t) + wctx := sdk.WrapSDKContext(ctx) + msgs := createNLimitOrderTranches(keeper, ctx, 2) + // Add more data to make sure only LO tranches are returned + createNPoolReserves(keeper, ctx, 2) + + request := func(next []byte, offset, limit uint64, total bool) *types.QueryAllLimitOrderTrancheRequest { + return &types.QueryAllLimitOrderTrancheRequest{ + PairID: "TokenA<>TokenB", + TokenIn: "TokenA", + Pagination: &query.PageRequest{ + Key: next, + Offset: offset, + Limit: limit, + CountTotal: total, + }, + } + } + t.Run("ByOffset", func(t *testing.T) { + step := 2 + for i := 0; i < len(msgs); i += step { + resp, err := keeper.LimitOrderTrancheAll(wctx, request(nil, uint64(i), uint64(step), false)) + require.NoError(t, err) + require.LessOrEqual(t, len(resp.LimitOrderTranche), step) + require.Subset(t, + msgs, + resp.LimitOrderTranche, + ) + } + }) + t.Run("ByKey", func(t *testing.T) { + step := 2 + var next []byte + for i := 0; i < len(msgs); i += step { + resp, err := keeper.LimitOrderTrancheAll(wctx, request(next, 0, uint64(step), false)) + require.NoError(t, err) + require.LessOrEqual(t, len(resp.LimitOrderTranche), step) + require.Subset(t, + msgs, + resp.LimitOrderTranche, + ) + next = resp.Pagination.NextKey + } + }) + t.Run("Total", func(t *testing.T) { + resp, err := keeper.LimitOrderTrancheAll(wctx, request(nil, 0, 0, true)) + require.NoError(t, err) + require.Equal(t, len(msgs), int(resp.Pagination.Total)) + require.ElementsMatch(t, + msgs, + resp.LimitOrderTranche, + ) + }) + t.Run("InvalidRequest", func(t *testing.T) { + _, err := keeper.LimitOrderTrancheAll(wctx, nil) + require.ErrorIs(t, err, status.Error(codes.InvalidArgument, "invalid request")) + }) +} diff --git a/x/dex/keeper/grpc_query_limit_order_tranche_user.go b/x/dex/keeper/grpc_query_limit_order_tranche_user.go new file mode 100644 index 000000000..7d89ae772 --- /dev/null +++ b/x/dex/keeper/grpc_query_limit_order_tranche_user.go @@ -0,0 +1,102 @@ +package keeper + +import ( + "context" + + "github.com/cosmos/cosmos-sdk/store/prefix" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/types/query" + "github.com/neutron-org/neutron/x/dex/types" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" +) + +func (k Keeper) LimitOrderTrancheUserAll( + c context.Context, + req *types.QueryAllLimitOrderTrancheUserRequest, +) (*types.QueryAllLimitOrderTrancheUserResponse, error) { + if req == nil { + return nil, status.Error(codes.InvalidArgument, "invalid request") + } + + var limitOrderTrancheUsers []*types.LimitOrderTrancheUser + ctx := sdk.UnwrapSDKContext(c) + + store := ctx.KVStore(k.storeKey) + limitOrderTrancheUserStore := prefix.NewStore(store, types.KeyPrefix(types.LimitOrderTrancheUserKeyPrefix)) + + pageRes, err := query.Paginate(limitOrderTrancheUserStore, req.Pagination, func(key, value []byte) error { + limitOrderTrancheUser := &types.LimitOrderTrancheUser{} + if err := k.cdc.Unmarshal(value, limitOrderTrancheUser); err != nil { + return err + } + + limitOrderTrancheUsers = append(limitOrderTrancheUsers, limitOrderTrancheUser) + + return nil + }) + if err != nil { + return nil, status.Error(codes.Internal, err.Error()) + } + + return &types.QueryAllLimitOrderTrancheUserResponse{ + LimitOrderTrancheUser: limitOrderTrancheUsers, + Pagination: pageRes, + }, nil +} + +func (k Keeper) LimitOrderTrancheUser(c context.Context, + req *types.QueryGetLimitOrderTrancheUserRequest, +) (*types.QueryGetLimitOrderTrancheUserResponse, error) { + if req == nil { + return nil, status.Error(codes.InvalidArgument, "invalid request") + } + ctx := sdk.UnwrapSDKContext(c) + val, found := k.GetLimitOrderTrancheUser( + ctx, + req.Address, + req.TrancheKey, + ) + if !found { + return nil, status.Error(codes.NotFound, "not found") + } + + return &types.QueryGetLimitOrderTrancheUserResponse{LimitOrderTrancheUser: val}, nil +} + +func (k Keeper) LimitOrderTrancheUserAllByAddress( + goCtx context.Context, + req *types.QueryAllUserLimitOrdersRequest, +) (*types.QueryAllUserLimitOrdersResponse, error) { + if req == nil { + return nil, status.Error(codes.InvalidArgument, "invalid request") + } + + addr, err := sdk.AccAddressFromBech32(req.Address) + if err != nil { + return nil, err + } + ctx := sdk.UnwrapSDKContext(goCtx) + var limitOrderTrancheUserList []*types.LimitOrderTrancheUser + addressPrefix := types.LimitOrderTrancheUserAddressPrefix(addr.String()) + store := prefix.NewStore(ctx.KVStore(k.storeKey), addressPrefix) + + pageRes, err := query.Paginate(store, req.Pagination, func(key, value []byte) error { + trancheUser := &types.LimitOrderTrancheUser{} + if err := k.cdc.Unmarshal(value, trancheUser); err != nil { + return err + } + + limitOrderTrancheUserList = append(limitOrderTrancheUserList, trancheUser) + + return nil + }) + if err != nil { + return nil, status.Error(codes.Internal, err.Error()) + } + + return &types.QueryAllUserLimitOrdersResponse{ + LimitOrders: limitOrderTrancheUserList, + Pagination: pageRes, + }, nil +} 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 new file mode 100644 index 000000000..0780777b0 --- /dev/null +++ b/x/dex/keeper/grpc_query_limit_order_tranche_user_test.go @@ -0,0 +1,185 @@ +package keeper_test + +import ( + "strconv" + "testing" + + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/types/query" + "github.com/stretchr/testify/require" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" + + "github.com/neutron-org/neutron/testutil/common/sample" + keepertest "github.com/neutron-org/neutron/testutil/dex/keeper" + "github.com/neutron-org/neutron/testutil/dex/nullify" + "github.com/neutron-org/neutron/x/dex/types" +) + +func TestLimitOrderTrancheUserQuerySingle(t *testing.T) { + keeper, ctx := keepertest.DexKeeper(t) + wctx := sdk.WrapSDKContext(ctx) + msgs := createNLimitOrderTrancheUser(keeper, ctx, 2) + for _, tc := range []struct { + desc string + request *types.QueryGetLimitOrderTrancheUserRequest + response *types.QueryGetLimitOrderTrancheUserResponse + err error + }{ + { + desc: "First", + request: &types.QueryGetLimitOrderTrancheUserRequest{ + TrancheKey: msgs[0].TrancheKey, + Address: msgs[0].Address, + }, + response: &types.QueryGetLimitOrderTrancheUserResponse{LimitOrderTrancheUser: msgs[0]}, + }, + { + desc: "Second", + request: &types.QueryGetLimitOrderTrancheUserRequest{ + TrancheKey: msgs[1].TrancheKey, + Address: msgs[1].Address, + }, + response: &types.QueryGetLimitOrderTrancheUserResponse{LimitOrderTrancheUser: msgs[1]}, + }, + { + desc: "KeyNotFound", + request: &types.QueryGetLimitOrderTrancheUserRequest{ + TrancheKey: "100000", + Address: strconv.Itoa(100000), + }, + err: status.Error(codes.NotFound, "not found"), + }, + { + desc: "InvalidRequest", + err: status.Error(codes.InvalidArgument, "invalid request"), + }, + } { + t.Run(tc.desc, func(t *testing.T) { + response, err := keeper.LimitOrderTrancheUser(wctx, tc.request) + if tc.err != nil { + require.ErrorIs(t, err, tc.err) + } else { + require.NoError(t, err) + require.Equal(t, + nullify.Fill(tc.response), + nullify.Fill(response), + ) + } + }) + } +} + +func TestLimitOrderTrancheUserQueryPaginated(t *testing.T) { + keeper, ctx := keepertest.DexKeeper(t) + wctx := sdk.WrapSDKContext(ctx) + msgs := createNLimitOrderTrancheUser(keeper, ctx, 5) + + request := func(next []byte, offset, limit uint64, total bool) *types.QueryAllLimitOrderTrancheUserRequest { + return &types.QueryAllLimitOrderTrancheUserRequest{ + Pagination: &query.PageRequest{ + Key: next, + Offset: offset, + Limit: limit, + CountTotal: total, + }, + } + } + t.Run("ByOffset", func(t *testing.T) { + step := 2 + for i := 0; i < len(msgs); i += step { + resp, err := keeper.LimitOrderTrancheUserAll(wctx, request(nil, uint64(i), uint64(step), false)) + require.NoError(t, err) + require.LessOrEqual(t, len(resp.LimitOrderTrancheUser), step) + require.Subset(t, + msgs, + resp.LimitOrderTrancheUser, + ) + } + }) + t.Run("ByKey", func(t *testing.T) { + step := 2 + var next []byte + for i := 0; i < len(msgs); i += step { + resp, err := keeper.LimitOrderTrancheUserAll(wctx, request(next, 0, uint64(step), false)) + require.NoError(t, err) + require.LessOrEqual(t, len(resp.LimitOrderTrancheUser), step) + require.Subset(t, + msgs, + resp.LimitOrderTrancheUser, + ) + next = resp.Pagination.NextKey + } + }) + t.Run("Total", func(t *testing.T) { + resp, err := keeper.LimitOrderTrancheUserAll(wctx, request(nil, 0, 0, true)) + require.NoError(t, err) + require.Equal(t, len(msgs), int(resp.Pagination.Total)) + require.ElementsMatch(t, + msgs, + resp.LimitOrderTrancheUser, + ) + }) + t.Run("InvalidRequest", func(t *testing.T) { + _, err := keeper.LimitOrderTrancheUserAll(wctx, nil) + require.ErrorIs(t, err, status.Error(codes.InvalidArgument, "invalid request")) + }) +} + +func TestLimitOrderTrancheUserAllByAddress(t *testing.T) { + keeper, ctx := keepertest.DexKeeper(t) + wctx := sdk.WrapSDKContext(ctx) + address := sample.AccAddress() + msgs := createNLimitOrderTrancheUserWithAddress(keeper, ctx, address, 5) + + request := func(next []byte, offset, limit uint64, total bool) *types.QueryAllUserLimitOrdersRequest { + return &types.QueryAllUserLimitOrdersRequest{ + Address: address, + Pagination: &query.PageRequest{ + Key: next, + Offset: offset, + Limit: limit, + CountTotal: total, + }, + } + } + t.Run("ByOffset", func(t *testing.T) { + step := 2 + for i := 0; i < len(msgs); i += step { + resp, err := keeper.LimitOrderTrancheUserAllByAddress(wctx, request(nil, uint64(i), uint64(step), false)) + require.NoError(t, err) + require.LessOrEqual(t, len(resp.LimitOrders), step) + require.Subset(t, + msgs, + resp.LimitOrders, + ) + } + }) + t.Run("ByKey", func(t *testing.T) { + step := 2 + var next []byte + for i := 0; i < len(msgs); i += step { + resp, err := keeper.LimitOrderTrancheUserAllByAddress(wctx, request(next, 0, uint64(step), false)) + require.NoError(t, err) + require.LessOrEqual(t, len(resp.LimitOrders), step) + require.Subset(t, + msgs, + resp.LimitOrders, + ) + next = resp.Pagination.NextKey + } + }) + t.Run("Total", func(t *testing.T) { + resp, err := keeper.LimitOrderTrancheUserAllByAddress(wctx, request(nil, 0, 0, true)) + require.NoError(t, err) + require.Equal(t, len(msgs), int(resp.Pagination.Total)) + require.ElementsMatch(t, + msgs, + resp.LimitOrders, + ) + }) + t.Run("InvalidRequest", func(t *testing.T) { + _, err := keeper.LimitOrderTrancheUserAllByAddress(wctx, nil) + require.ErrorIs(t, err, status.Error(codes.InvalidArgument, "invalid request")) + }) +} diff --git a/x/dex/keeper/grpc_query_params.go b/x/dex/keeper/grpc_query_params.go new file mode 100644 index 000000000..0ea6f35ab --- /dev/null +++ b/x/dex/keeper/grpc_query_params.go @@ -0,0 +1,19 @@ +package keeper + +import ( + "context" + + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/neutron-org/neutron/x/dex/types" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" +) + +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/dex/keeper/grpc_query_params_test.go b/x/dex/keeper/grpc_query_params_test.go new file mode 100644 index 000000000..daa26bd2e --- /dev/null +++ b/x/dex/keeper/grpc_query_params_test.go @@ -0,0 +1,21 @@ +package keeper_test + +import ( + "testing" + + sdk "github.com/cosmos/cosmos-sdk/types" + testkeeper "github.com/neutron-org/neutron/testutil/dex/keeper" + "github.com/neutron-org/neutron/x/dex/types" + "github.com/stretchr/testify/require" +) + +func TestParamsQuery(t *testing.T) { + keeper, ctx := testkeeper.DexKeeper(t) + wctx := sdk.WrapSDKContext(ctx) + params := types.DefaultParams() + keeper.SetParams(ctx, params) + + response, err := keeper.Params(wctx, &types.QueryParamsRequest{}) + require.NoError(t, err) + require.Equal(t, &types.QueryParamsResponse{Params: params}, response) +} diff --git a/x/dex/keeper/grpc_query_pool.go b/x/dex/keeper/grpc_query_pool.go new file mode 100644 index 000000000..6783dac68 --- /dev/null +++ b/x/dex/keeper/grpc_query_pool.go @@ -0,0 +1,51 @@ +package keeper + +import ( + "context" + + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/neutron-org/neutron/x/dex/types" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" +) + +func (k Keeper) Pool( + goCtx context.Context, + req *types.QueryPoolRequest, +) (*types.QueryPoolResponse, error) { + if req == nil { + return nil, status.Error(codes.InvalidArgument, "invalid request") + } + + ctx := sdk.UnwrapSDKContext(goCtx) + + pairID, err := types.NewPairIDFromCanonicalString(req.PairID) + if err != nil { + return nil, err + } + + pool, found := k.GetPool(ctx, pairID, req.TickIndex, req.Fee) + if !found { + return nil, status.Error(codes.NotFound, "not found") + } + + return &types.QueryPoolResponse{Pool: pool}, nil +} + +func (k Keeper) PoolByID( + goCtx context.Context, + req *types.QueryPoolByIDRequest, +) (*types.QueryPoolResponse, error) { + if req == nil { + return nil, status.Error(codes.InvalidArgument, "invalid request") + } + + ctx := sdk.UnwrapSDKContext(goCtx) + + pool, found := k.GetPoolByID(ctx, req.PoolID) + if !found { + return nil, status.Error(codes.NotFound, "not found") + } + + return &types.QueryPoolResponse{Pool: pool}, nil +} diff --git a/x/dex/keeper/grpc_query_pool_metadata.go b/x/dex/keeper/grpc_query_pool_metadata.go new file mode 100644 index 000000000..628d2bf2a --- /dev/null +++ b/x/dex/keeper/grpc_query_pool_metadata.go @@ -0,0 +1,54 @@ +package keeper + +import ( + "context" + + "github.com/cosmos/cosmos-sdk/store/prefix" + sdk "github.com/cosmos/cosmos-sdk/types" + sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/query" + "github.com/neutron-org/neutron/x/dex/types" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" +) + +func (k Keeper) PoolMetadataAll(goCtx context.Context, req *types.QueryAllPoolMetadataRequest) (*types.QueryAllPoolMetadataResponse, error) { + if req == nil { + return nil, status.Error(codes.InvalidArgument, "invalid request") + } + + var poolMetadatas []types.PoolMetadata + ctx := sdk.UnwrapSDKContext(goCtx) + + store := ctx.KVStore(k.storeKey) + poolMetadataStore := prefix.NewStore(store, types.KeyPrefix(types.PoolMetadataKeyPrefix)) + + pageRes, err := query.Paginate(poolMetadataStore, req.Pagination, func(key []byte, value []byte) error { + var poolMetadata types.PoolMetadata + if err := k.cdc.Unmarshal(value, &poolMetadata); err != nil { + return err + } + + poolMetadatas = append(poolMetadatas, poolMetadata) + return nil + }) + if err != nil { + return nil, status.Error(codes.Internal, err.Error()) + } + + return &types.QueryAllPoolMetadataResponse{PoolMetadata: poolMetadatas, Pagination: pageRes}, nil +} + +func (k Keeper) PoolMetadata(goCtx context.Context, req *types.QueryGetPoolMetadataRequest) (*types.QueryGetPoolMetadataResponse, error) { + if req == nil { + return nil, status.Error(codes.InvalidArgument, "invalid request") + } + + ctx := sdk.UnwrapSDKContext(goCtx) + poolMetadata, found := k.GetPoolMetadata(ctx, req.Id) + if !found { + return nil, sdkerrors.ErrKeyNotFound + } + + return &types.QueryGetPoolMetadataResponse{PoolMetadata: poolMetadata}, nil +} diff --git a/x/dex/keeper/grpc_query_pool_metadata_test.go b/x/dex/keeper/grpc_query_pool_metadata_test.go new file mode 100644 index 000000000..13153e102 --- /dev/null +++ b/x/dex/keeper/grpc_query_pool_metadata_test.go @@ -0,0 +1,118 @@ +package keeper_test + +import ( + "testing" + + sdk "github.com/cosmos/cosmos-sdk/types" + sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "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/testutil/dex/keeper" + "github.com/neutron-org/neutron/testutil/dex/nullify" + "github.com/neutron-org/neutron/x/dex/types" +) + +func TestPoolMetadataQuerySingle(t *testing.T) { + keeper, ctx := keepertest.DexKeeper(t) + wctx := sdk.WrapSDKContext(ctx) + msgs := createNPoolMetadata(keeper, ctx, 2) + tests := []struct { + desc string + request *types.QueryGetPoolMetadataRequest + response *types.QueryGetPoolMetadataResponse + err error + }{ + { + desc: "First", + request: &types.QueryGetPoolMetadataRequest{Id: msgs[0].ID}, + response: &types.QueryGetPoolMetadataResponse{PoolMetadata: msgs[0]}, + }, + { + desc: "Second", + request: &types.QueryGetPoolMetadataRequest{Id: msgs[1].ID}, + response: &types.QueryGetPoolMetadataResponse{PoolMetadata: msgs[1]}, + }, + { + desc: "KeyNotFound", + request: &types.QueryGetPoolMetadataRequest{Id: uint64(len(msgs))}, + err: sdkerrors.ErrKeyNotFound, + }, + { + desc: "InvalidRequest", + err: status.Error(codes.InvalidArgument, "invalid request"), + }, + } + for _, tc := range tests { + t.Run(tc.desc, func(t *testing.T) { + response, err := keeper.PoolMetadata(wctx, tc.request) + if tc.err != nil { + require.ErrorIs(t, err, tc.err) + } else { + require.NoError(t, err) + require.Equal(t, + nullify.Fill(tc.response), + nullify.Fill(response), + ) + } + }) + } +} + +func TestPoolMetadataQueryPaginated(t *testing.T) { + keeper, ctx := keepertest.DexKeeper(t) + wctx := sdk.WrapSDKContext(ctx) + msgs := createNPoolMetadata(keeper, ctx, 5) + + request := func(next []byte, offset, limit uint64, total bool) *types.QueryAllPoolMetadataRequest { + return &types.QueryAllPoolMetadataRequest{ + Pagination: &query.PageRequest{ + Key: next, + Offset: offset, + Limit: limit, + CountTotal: total, + }, + } + } + t.Run("ByOffset", func(t *testing.T) { + step := 2 + for i := 0; i < len(msgs); i += step { + resp, err := keeper.PoolMetadataAll(wctx, request(nil, uint64(i), uint64(step), false)) + require.NoError(t, err) + require.LessOrEqual(t, len(resp.PoolMetadata), step) + require.Subset(t, + nullify.Fill(msgs), + nullify.Fill(resp.PoolMetadata), + ) + } + }) + t.Run("ByKey", func(t *testing.T) { + step := 2 + var next []byte + for i := 0; i < len(msgs); i += step { + resp, err := keeper.PoolMetadataAll(wctx, request(next, 0, uint64(step), false)) + require.NoError(t, err) + require.LessOrEqual(t, len(resp.PoolMetadata), step) + require.Subset(t, + nullify.Fill(msgs), + nullify.Fill(resp.PoolMetadata), + ) + next = resp.Pagination.NextKey + } + }) + t.Run("Total", func(t *testing.T) { + resp, err := keeper.PoolMetadataAll(wctx, request(nil, 0, 0, true)) + require.NoError(t, err) + require.Equal(t, len(msgs), int(resp.Pagination.Total)) + require.ElementsMatch(t, + nullify.Fill(msgs), + nullify.Fill(resp.PoolMetadata), + ) + }) + t.Run("InvalidRequest", func(t *testing.T) { + _, err := keeper.PoolMetadataAll(wctx, nil) + require.ErrorIs(t, err, status.Error(codes.InvalidArgument, "invalid request")) + }) +} diff --git a/x/dex/keeper/grpc_query_pool_reserves.go b/x/dex/keeper/grpc_query_pool_reserves.go new file mode 100644 index 000000000..b44af3958 --- /dev/null +++ b/x/dex/keeper/grpc_query_pool_reserves.go @@ -0,0 +1,87 @@ +package keeper + +import ( + "context" + + "github.com/cosmos/cosmos-sdk/store/prefix" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/types/query" + "github.com/neutron-org/neutron/x/dex/types" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" +) + +func (k Keeper) PoolReservesAll( + goCtx context.Context, + req *types.QueryAllPoolReservesRequest, +) (*types.QueryAllPoolReservesResponse, error) { + if req == nil { + return nil, status.Error(codes.InvalidArgument, "invalid request") + } + + ctx := sdk.UnwrapSDKContext(goCtx) + + pairID, err := types.NewPairIDFromCanonicalString(req.PairID) + if err != nil { + return nil, err + } + tradePairID := types.NewTradePairIDFromMaker(pairID, req.TokenIn) + + store := ctx.KVStore(k.storeKey) + PoolReservesStore := prefix.NewStore(store, types.TickLiquidityPrefix(tradePairID)) + + var poolReserves []*types.PoolReserves + pageRes, err := query.FilteredPaginate( + PoolReservesStore, + req.Pagination, + func(key, value []byte, accum bool) (hit bool, err error) { + var tick types.TickLiquidity + + if err := k.cdc.Unmarshal(value, &tick); err != nil { + return false, err + } + reserves := tick.GetPoolReserves() + // Check if this is a LimitOrderTranche and not PoolReserves + if reserves != nil { + if accum { + poolReserves = append(poolReserves, reserves) + } + + return true, nil + } + + return false, nil + }) + if err != nil { + return nil, status.Error(codes.Internal, err.Error()) + } + + return &types.QueryAllPoolReservesResponse{PoolReserves: poolReserves, Pagination: pageRes}, nil +} + +func (k Keeper) PoolReserves( + goCtx context.Context, + req *types.QueryGetPoolReservesRequest, +) (*types.QueryGetPoolReservesResponse, error) { + if req == nil { + return nil, status.Error(codes.InvalidArgument, "invalid request") + } + ctx := sdk.UnwrapSDKContext(goCtx) + pairID, err := types.NewPairIDFromCanonicalString(req.PairID) + if err != nil { + return nil, err + } + tradePairID := types.NewTradePairIDFromMaker(pairID, req.TokenIn) + + poolReservesID := &types.PoolReservesKey{ + tradePairID, + req.TickIndex, + req.Fee, + } + val, found := k.GetPoolReserves(ctx, poolReservesID) + if !found { + return nil, status.Error(codes.NotFound, "not found") + } + + return &types.QueryGetPoolReservesResponse{PoolReserves: val}, nil +} diff --git a/x/dex/keeper/grpc_query_pool_reserves_test.go b/x/dex/keeper/grpc_query_pool_reserves_test.go new file mode 100644 index 000000000..60d197dd4 --- /dev/null +++ b/x/dex/keeper/grpc_query_pool_reserves_test.go @@ -0,0 +1,135 @@ +package keeper_test + +import ( + "testing" + + sdk "github.com/cosmos/cosmos-sdk/types" + "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/testutil/dex/keeper" + "github.com/neutron-org/neutron/testutil/dex/nullify" + "github.com/neutron-org/neutron/x/dex/types" +) + +func TestPoolReservesQuerySingle(t *testing.T) { + keeper, ctx := keepertest.DexKeeper(t) + wctx := sdk.WrapSDKContext(ctx) + msgs := createNPoolReserves(keeper, ctx, 2) + for _, tc := range []struct { + desc string + request *types.QueryGetPoolReservesRequest + response *types.QueryGetPoolReservesResponse + err error + }{ + { + desc: "First", + request: &types.QueryGetPoolReservesRequest{ + PairID: "TokenA<>TokenB", + TickIndex: msgs[0].Key.TickIndexTakerToMaker, + TokenIn: "TokenA", + Fee: msgs[0].Key.Fee, + }, + response: &types.QueryGetPoolReservesResponse{PoolReserves: msgs[0]}, + }, + { + desc: "Second", + request: &types.QueryGetPoolReservesRequest{ + PairID: "TokenA<>TokenB", + TickIndex: msgs[1].Key.TickIndexTakerToMaker, + TokenIn: "TokenA", + Fee: msgs[1].Key.Fee, + }, + response: &types.QueryGetPoolReservesResponse{PoolReserves: msgs[1]}, + }, + { + desc: "KeyNotFound", + request: &types.QueryGetPoolReservesRequest{ + PairID: "TokenA<>TokenB", + TickIndex: 0, + TokenIn: "TokenA", + Fee: 100000, + }, + err: status.Error(codes.NotFound, "not found"), + }, + { + desc: "InvalidRequest", + err: status.Error(codes.InvalidArgument, "invalid request"), + }, + } { + t.Run(tc.desc, func(t *testing.T) { + response, err := keeper.PoolReserves(wctx, tc.request) + if tc.err != nil { + require.ErrorIs(t, err, tc.err) + } else { + require.NoError(t, err) + require.Equal(t, + nullify.Fill(tc.response), + nullify.Fill(response), + ) + } + }) + } +} + +func TestPoolReservesQueryPaginated(t *testing.T) { + keeper, ctx := keepertest.DexKeeper(t) + wctx := sdk.WrapSDKContext(ctx) + msgs := createNPoolReserves(keeper, ctx, 2) + // Add more data to make sure only LO tranches are returned + createNLimitOrderTranches(keeper, ctx, 2) + + request := func(next []byte, offset, limit uint64, total bool) *types.QueryAllPoolReservesRequest { + return &types.QueryAllPoolReservesRequest{ + PairID: "TokenA<>TokenB", + TokenIn: "TokenA", + Pagination: &query.PageRequest{ + Key: next, + Offset: offset, + Limit: limit, + CountTotal: total, + }, + } + } + t.Run("ByOffset", func(t *testing.T) { + step := 2 + for i := 0; i < len(msgs); i += step { + resp, err := keeper.PoolReservesAll(wctx, request(nil, uint64(i), uint64(step), false)) + require.NoError(t, err) + require.LessOrEqual(t, len(resp.PoolReserves), step) + require.Subset(t, + msgs, + resp.PoolReserves, + ) + } + }) + t.Run("ByKey", func(t *testing.T) { + step := 2 + var next []byte + for i := 0; i < len(msgs); i += step { + resp, err := keeper.PoolReservesAll(wctx, request(next, 0, uint64(step), false)) + require.NoError(t, err) + require.LessOrEqual(t, len(resp.PoolReserves), step) + require.Subset(t, + msgs, + resp.PoolReserves, + ) + next = resp.Pagination.NextKey + } + }) + t.Run("Total", func(t *testing.T) { + resp, err := keeper.PoolReservesAll(wctx, request(nil, 0, 0, true)) + require.NoError(t, err) + require.Equal(t, len(msgs), int(resp.Pagination.Total)) + require.ElementsMatch(t, + msgs, + resp.PoolReserves, + ) + }) + t.Run("InvalidRequest", func(t *testing.T) { + _, err := keeper.PoolReservesAll(wctx, nil) + require.ErrorIs(t, err, status.Error(codes.InvalidArgument, "invalid request")) + }) +} diff --git a/x/dex/keeper/grpc_query_pool_test.go b/x/dex/keeper/grpc_query_pool_test.go new file mode 100644 index 000000000..634df80dd --- /dev/null +++ b/x/dex/keeper/grpc_query_pool_test.go @@ -0,0 +1,122 @@ +package keeper_test + +import ( + "testing" + + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/stretchr/testify/require" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" + + keepertest "github.com/neutron-org/neutron/testutil/dex/keeper" + "github.com/neutron-org/neutron/testutil/dex/nullify" + "github.com/neutron-org/neutron/x/dex/types" +) + +func TestPoolQuerySingle(t *testing.T) { + keeper, ctx := keepertest.DexKeeper(t) + wctx := sdk.WrapSDKContext(ctx) + msgs := createNPools(keeper, ctx, 2) + for _, tc := range []struct { + desc string + request *types.QueryPoolRequest + response *types.QueryPoolResponse + err error + }{ + { + desc: "First", + request: &types.QueryPoolRequest{ + PairID: "TokenA<>TokenB", + TickIndex: msgs[0].CenterTickIndex(), + Fee: msgs[0].Fee(), + }, + response: &types.QueryPoolResponse{Pool: msgs[0]}, + }, + { + desc: "Second", + request: &types.QueryPoolRequest{ + PairID: "TokenA<>TokenB", + TickIndex: msgs[1].CenterTickIndex(), + Fee: msgs[1].Fee(), + }, + response: &types.QueryPoolResponse{Pool: msgs[1]}, + }, + { + desc: "KeyNotFound", + request: &types.QueryPoolRequest{ + PairID: "TokenA<>TokenB", + TickIndex: 0, + Fee: 100000, + }, + err: status.Error(codes.NotFound, "not found"), + }, + { + desc: "InvalidRequest", + err: status.Error(codes.InvalidArgument, "invalid request"), + }, + } { + t.Run(tc.desc, func(t *testing.T) { + response, err := keeper.Pool(wctx, tc.request) + if tc.err != nil { + require.ErrorIs(t, err, tc.err) + } else { + require.NoError(t, err) + require.Equal(t, + nullify.Fill(tc.response), + nullify.Fill(response), + ) + } + }) + } +} + +func TestPoolQueryByID(t *testing.T) { + keeper, ctx := keepertest.DexKeeper(t) + wctx := sdk.WrapSDKContext(ctx) + msgs := createNPools(keeper, ctx, 2) + for _, tc := range []struct { + desc string + request *types.QueryPoolByIDRequest + response *types.QueryPoolResponse + err error + }{ + { + desc: "First", + request: &types.QueryPoolByIDRequest{ + PoolID: 0, + }, + response: &types.QueryPoolResponse{Pool: msgs[0]}, + }, + { + desc: "Second", + request: &types.QueryPoolByIDRequest{ + PoolID: 1, + }, + response: &types.QueryPoolResponse{Pool: msgs[1]}, + }, + { + desc: "KeyNotFound", + request: &types.QueryPoolByIDRequest{ + PoolID: 100, + }, + err: status.Error(codes.NotFound, "not found"), + }, + { + desc: "InvalidRequest", + err: status.Error(codes.InvalidArgument, "invalid request"), + }, + } { + t.Run(tc.desc, func(t *testing.T) { + response, err := keeper.PoolByID(wctx, tc.request) + if tc.err != nil { + require.ErrorIs(t, err, tc.err) + } else { + require.NoError(t, err) + require.Equal(t, + nullify.Fill(tc.response), + nullify.Fill(response), + ) + } + }) + } +} diff --git a/x/dex/keeper/grpc_query_tick_liquidity.go b/x/dex/keeper/grpc_query_tick_liquidity.go new file mode 100644 index 000000000..6da6a9640 --- /dev/null +++ b/x/dex/keeper/grpc_query_tick_liquidity.go @@ -0,0 +1,53 @@ +package keeper + +import ( + "context" + + "github.com/cosmos/cosmos-sdk/store/prefix" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/types/query" + "github.com/neutron-org/neutron/x/dex/types" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" +) + +// NOTE: For single queries of tick liquidity use explicty typed queries +// (ie. the k.LimitOrderTranche & k.PoolReserves) + +func (k Keeper) TickLiquidityAll( + c context.Context, + req *types.QueryAllTickLiquidityRequest, +) (*types.QueryAllTickLiquidityResponse, error) { + if req == nil { + return nil, status.Error(codes.InvalidArgument, "invalid request") + } + + var tickLiquidities []*types.TickLiquidity + ctx := sdk.UnwrapSDKContext(c) + + pairID, err := types.NewPairIDFromCanonicalString(req.PairID) + if err != nil { + return nil, err + } + + tradePairID := types.NewTradePairIDFromMaker(pairID, req.TokenIn) + + store := ctx.KVStore(k.storeKey) + tickLiquidityStore := prefix.NewStore(store, types.TickLiquidityPrefix(tradePairID)) + + pageRes, err := query.Paginate(tickLiquidityStore, req.Pagination, func(key, value []byte) error { + tickLiquidity := &types.TickLiquidity{} + if err := k.cdc.Unmarshal(value, tickLiquidity); err != nil { + return err + } + + tickLiquidities = append(tickLiquidities, tickLiquidity) + + return nil + }) + if err != nil { + return nil, status.Error(codes.Internal, err.Error()) + } + + return &types.QueryAllTickLiquidityResponse{TickLiquidity: tickLiquidities, Pagination: pageRes}, nil +} diff --git a/x/dex/keeper/grpc_query_tick_liquidity_test.go b/x/dex/keeper/grpc_query_tick_liquidity_test.go new file mode 100644 index 000000000..0de6968b1 --- /dev/null +++ b/x/dex/keeper/grpc_query_tick_liquidity_test.go @@ -0,0 +1,72 @@ +package keeper_test + +import ( + "testing" + + sdk "github.com/cosmos/cosmos-sdk/types" + "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/testutil/dex/keeper" + "github.com/neutron-org/neutron/x/dex/types" +) + +func TestTickLiquidityQueryPaginated(t *testing.T) { + keeper, ctx := keepertest.DexKeeper(t) + wctx := sdk.WrapSDKContext(ctx) + msgs := CreateNTickLiquidity(keeper, ctx, 5) + + request := func(next []byte, offset, limit uint64, total bool) *types.QueryAllTickLiquidityRequest { + return &types.QueryAllTickLiquidityRequest{ + PairID: "TokenA<>TokenB", + TokenIn: "TokenA", + Pagination: &query.PageRequest{ + Key: next, + Offset: offset, + Limit: limit, + CountTotal: total, + }, + } + } + t.Run("ByOffset", func(t *testing.T) { + step := 2 + for i := 0; i < len(msgs); i += step { + resp, err := keeper.TickLiquidityAll(wctx, request(nil, uint64(i), uint64(step), false)) + require.NoError(t, err) + require.LessOrEqual(t, len(resp.TickLiquidity), step) + require.Subset(t, + msgs, + resp.TickLiquidity, + ) + } + }) + t.Run("ByKey", func(t *testing.T) { + step := 2 + var next []byte + for i := 0; i < len(msgs); i += step { + resp, err := keeper.TickLiquidityAll(wctx, request(next, 0, uint64(step), false)) + require.NoError(t, err) + require.LessOrEqual(t, len(resp.TickLiquidity), step) + require.Subset(t, + msgs, + resp.TickLiquidity, + ) + next = resp.Pagination.NextKey + } + }) + t.Run("Total", func(t *testing.T) { + resp, err := keeper.TickLiquidityAll(wctx, request(nil, 0, 0, true)) + require.NoError(t, err) + require.Equal(t, len(msgs), int(resp.Pagination.Total)) + require.ElementsMatch(t, + msgs, + resp.TickLiquidity, + ) + }) + t.Run("InvalidRequest", func(t *testing.T) { + _, err := keeper.TickLiquidityAll(wctx, nil) + require.ErrorIs(t, err, status.Error(codes.InvalidArgument, "invalid request")) + }) +} diff --git a/x/dex/keeper/grpc_query_user_deposits.go b/x/dex/keeper/grpc_query_user_deposits.go new file mode 100644 index 000000000..a94fe3ff1 --- /dev/null +++ b/x/dex/keeper/grpc_query_user_deposits.go @@ -0,0 +1,71 @@ +package keeper + +import ( + "context" + + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/neutron-org/neutron/utils" + "github.com/neutron-org/neutron/x/dex/types" + dexutils "github.com/neutron-org/neutron/x/dex/utils" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" +) + +func (k Keeper) UserDepositsAll( + goCtx context.Context, + req *types.QueryAllUserDepositsRequest, +) (*types.QueryAllUserDepositsResponse, error) { + if req == nil { + return nil, status.Error(codes.InvalidArgument, "invalid request") + } + + addr, err := sdk.AccAddressFromBech32(req.Address) + if err != nil { + return nil, err + } + ctx := sdk.UnwrapSDKContext(goCtx) + + var depositArr []*types.DepositRecord + + pageRes, err := utils.FilteredPaginateAccountBalances( + ctx, + k.bankKeeper, + addr, + req.Pagination, + func(poolCoinMaybe sdk.Coin, accumulate bool) bool { + err := types.ValidatePoolDenom(poolCoinMaybe.Denom) + if err != nil { + return false + } + + poolMetadata, err := k.GetPoolMetadataByDenom(ctx, poolCoinMaybe.Denom) + if err != nil { + panic("Can't get info for PoolDenom") + } + + fee := dexutils.MustSafeUint64ToInt64(poolMetadata.Fee) + + if accumulate { + depositRecord := &types.DepositRecord{ + PairID: poolMetadata.PairID, + SharesOwned: poolCoinMaybe.Amount, + CenterTickIndex: poolMetadata.Tick, + LowerTickIndex: poolMetadata.Tick - fee, + UpperTickIndex: poolMetadata.Tick + fee, + Fee: poolMetadata.Fee, + } + + depositArr = append(depositArr, depositRecord) + } + + return true + }) + if err != nil { + return nil, status.Error(codes.Internal, err.Error()) + } + + return &types.QueryAllUserDepositsResponse{ + Deposits: depositArr, + Pagination: pageRes, + }, nil +} diff --git a/x/dex/keeper/grpc_query_user_deposits_test.go b/x/dex/keeper/grpc_query_user_deposits_test.go new file mode 100644 index 000000000..d9fe413ac --- /dev/null +++ b/x/dex/keeper/grpc_query_user_deposits_test.go @@ -0,0 +1,142 @@ +package keeper_test + +import ( + "testing" + + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/types/query" + dualityapp "github.com/neutron-org/neutron/app" + keepertest "github.com/neutron-org/neutron/x/dex/keeper/internal/testutils" + "github.com/neutron-org/neutron/x/dex/types" + "github.com/stretchr/testify/require" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" +) + +func simulateDeposit(ctx sdk.Context, app *dualityapp.App, addr sdk.AccAddress, deposit *types.DepositRecord) { + // NOTE: For simplicyt sake, we are not actually doing a deposit, we are just initializing + // the pool and adding the poolDenom to the users account + pool, err := app.DexKeeper.InitPool(ctx, deposit.PairID, deposit.CenterTickIndex, deposit.Fee) + if err != nil { + panic("Cannot init pool") + } + coin := sdk.NewCoin(pool.GetPoolDenom(), deposit.SharesOwned) + keepertest.FundAccount(app.BankKeeper, ctx, addr, sdk.Coins{coin}) +} + +func TestUserDepositsAllQueryPaginated(t *testing.T) { + app := dualityapp.Setup(t, false) + keeper := app.DexKeeper + ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + wctx := sdk.WrapSDKContext(ctx) + addr := sdk.AccAddress([]byte("test_addr")) + msgs := []*types.DepositRecord{ + { + PairID: defaultPairID, + SharesOwned: sdk.NewInt(10), + CenterTickIndex: 2, + LowerTickIndex: 1, + UpperTickIndex: 3, + Fee: 1, + }, + { + PairID: defaultPairID, + SharesOwned: sdk.NewInt(10), + CenterTickIndex: 3, + LowerTickIndex: 2, + UpperTickIndex: 4, + Fee: 1, + }, + { + PairID: defaultPairID, + SharesOwned: sdk.NewInt(10), + CenterTickIndex: 4, + LowerTickIndex: 3, + UpperTickIndex: 5, + Fee: 1, + }, + { + PairID: defaultPairID, + SharesOwned: sdk.NewInt(10), + CenterTickIndex: 5, + LowerTickIndex: 4, + UpperTickIndex: 6, + Fee: 1, + }, + { + PairID: defaultPairID, + SharesOwned: sdk.NewInt(10), + CenterTickIndex: 6, + LowerTickIndex: 5, + UpperTickIndex: 7, + Fee: 1, + }, + } + + for _, d := range msgs { + simulateDeposit(ctx, app, addr, d) + } + + // Add random noise to make sure only pool denoms are picked up + randomCoins := sdk.Coins{sdk.NewInt64Coin("TokenA", 10), sdk.NewInt64Coin("TokenZ", 10)} + keepertest.FundAccount(app.BankKeeper, ctx, addr, randomCoins) + + request := func(next []byte, offset, limit uint64, total bool) *types.QueryAllUserDepositsRequest { + return &types.QueryAllUserDepositsRequest{ + Address: addr.String(), + Pagination: &query.PageRequest{ + Key: next, + Offset: offset, + Limit: limit, + CountTotal: total, + }, + } + } + t.Run("ByOffset", func(t *testing.T) { + step := 2 + for i := 0; i < len(msgs); i += step { + resp, err := keeper.UserDepositsAll(wctx, request(nil, uint64(i), uint64(step), false)) + require.NoError(t, err) + require.LessOrEqual(t, len(resp.Deposits), step) + require.Subset(t, + msgs, + resp.Deposits, + ) + } + }) + t.Run("ByKey", func(t *testing.T) { + step := 2 + var next []byte + var allRecords []*types.DepositRecord + for i := 0; i < len(msgs); i += step { + resp, err := keeper.UserDepositsAll(wctx, request(next, 0, uint64(step), false)) + require.NoError(t, err) + require.LessOrEqual(t, len(resp.Deposits), step) + require.Subset(t, + msgs, + resp.Deposits, + ) + + allRecords = append(allRecords, resp.Deposits...) + next = resp.Pagination.NextKey + } + require.ElementsMatch(t, + msgs, + allRecords, + ) + }) + t.Run("Total", func(t *testing.T) { + resp, err := keeper.UserDepositsAll(wctx, request(nil, 0, 0, true)) + require.NoError(t, err) + require.Equal(t, len(msgs), int(resp.Pagination.Total)) + require.ElementsMatch(t, + msgs, + resp.Deposits, + ) + }) + t.Run("InvalidRequest", func(t *testing.T) { + _, err := keeper.UserDepositsAll(wctx, nil) + require.ErrorIs(t, err, status.Error(codes.InvalidArgument, "invalid request")) + }) +} diff --git a/x/dex/keeper/inactive_limit_order_tranche.go b/x/dex/keeper/inactive_limit_order_tranche.go new file mode 100644 index 000000000..339be79c4 --- /dev/null +++ b/x/dex/keeper/inactive_limit_order_tranche.go @@ -0,0 +1,68 @@ +package keeper + +import ( + "github.com/cosmos/cosmos-sdk/store/prefix" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/neutron-org/neutron/x/dex/types" +) + +// SetInactiveLimitOrderTranche set a specific inactiveLimitOrderTranche in the store from its index +func (k Keeper) SetInactiveLimitOrderTranche(ctx sdk.Context, limitOrderTranche *types.LimitOrderTranche) { + store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefix(types.InactiveLimitOrderTrancheKeyPrefix)) + b := k.cdc.MustMarshal(limitOrderTranche) + store.Set(limitOrderTranche.Key.KeyMarshal(), b) +} + +// GetInactiveLimitOrderTranche returns a inactiveLimitOrderTranche from its index +func (k Keeper) GetInactiveLimitOrderTranche( + ctx sdk.Context, + limitOrderTrancheKey *types.LimitOrderTrancheKey, +) (val *types.LimitOrderTranche, found bool) { + store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefix(types.InactiveLimitOrderTrancheKeyPrefix)) + + b := store.Get(limitOrderTrancheKey.KeyMarshal()) + if b == nil { + return val, false + } + + val = &types.LimitOrderTranche{} + k.cdc.MustUnmarshal(b, val) + + return val, true +} + +// RemoveInactiveLimitOrderTranche removes a inactiveLimitOrderTranche from the store +func (k Keeper) RemoveInactiveLimitOrderTranche( + ctx sdk.Context, + limitOrderTrancheKey *types.LimitOrderTrancheKey, +) { + store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefix(types.InactiveLimitOrderTrancheKeyPrefix)) + store.Delete(limitOrderTrancheKey.KeyMarshal()) +} + +// GetAllInactiveLimitOrderTranche returns all inactiveLimitOrderTranche +func (k Keeper) GetAllInactiveLimitOrderTranche(ctx sdk.Context) (list []*types.LimitOrderTranche) { + store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefix(types.InactiveLimitOrderTrancheKeyPrefix)) + iterator := sdk.KVStorePrefixIterator(store, []byte{}) + + defer iterator.Close() + + for ; iterator.Valid(); iterator.Next() { + val := &types.LimitOrderTranche{} + k.cdc.MustUnmarshal(iterator.Value(), val) + list = append(list, val) + } + + return +} + +func (k Keeper) SaveInactiveTranche(sdkCtx sdk.Context, tranche *types.LimitOrderTranche) { + if tranche.HasTokenIn() || tranche.HasTokenOut() { + k.SetInactiveLimitOrderTranche(sdkCtx, tranche) + } else { + k.RemoveInactiveLimitOrderTranche( + sdkCtx, + tranche.Key, + ) + } +} diff --git a/x/dex/keeper/inactive_limit_order_tranche_test.go b/x/dex/keeper/inactive_limit_order_tranche_test.go new file mode 100644 index 000000000..4dc47b2cc --- /dev/null +++ b/x/dex/keeper/inactive_limit_order_tranche_test.go @@ -0,0 +1,73 @@ +package keeper_test + +import ( + "strconv" + "testing" + + math "cosmossdk.io/math" + sdk "github.com/cosmos/cosmos-sdk/types" + keepertest "github.com/neutron-org/neutron/testutil/dex/keeper" + "github.com/neutron-org/neutron/testutil/dex/nullify" + "github.com/neutron-org/neutron/x/dex/keeper" + "github.com/neutron-org/neutron/x/dex/types" + "github.com/stretchr/testify/require" +) + +func createNInactiveLimitOrderTranche( + keeper *keeper.Keeper, + ctx sdk.Context, + n int, +) []*types.LimitOrderTranche { + items := make([]*types.LimitOrderTranche, n) + for i := range items { + items[i] = types.MustNewLimitOrderTranche( + "TokenA", + "TokenB", + strconv.Itoa(i), + int64(i), + math.ZeroInt(), + math.ZeroInt(), + math.ZeroInt(), + math.ZeroInt(), + ) + keeper.SetInactiveLimitOrderTranche(ctx, items[i]) + } + + return items +} + +func TestInactiveLimitOrderTrancheGet(t *testing.T) { + keeper, ctx := keepertest.DexKeeper(t) + items := createNInactiveLimitOrderTranche(keeper, ctx, 10) + for _, item := range items { + rst, found := keeper.GetInactiveLimitOrderTranche(ctx, item.Key) + require.True(t, found) + require.Equal(t, + nullify.Fill(&item), + nullify.Fill(&rst), + ) + } +} + +func TestInactiveLimitOrderTrancheRemove(t *testing.T) { + keeper, ctx := keepertest.DexKeeper(t) + items := createNInactiveLimitOrderTranche(keeper, ctx, 10) + for _, item := range items { + keeper.RemoveInactiveLimitOrderTranche(ctx, item.Key) + _, found := keeper.GetInactiveLimitOrderTranche(ctx, item.Key) + require.False(t, found) + } +} + +func TestInactiveLimitOrderTrancheGetAll(t *testing.T) { + keeper, ctx := keepertest.DexKeeper(t) + items := createNInactiveLimitOrderTranche(keeper, ctx, 10) + pointerItems := make([]*types.LimitOrderTranche, len(items)) + for i := range items { + pointerItems[i] = items[i] + } + require.ElementsMatch(t, + pointerItems, + keeper.GetAllInactiveLimitOrderTranche(ctx), + ) +} diff --git a/x/dex/keeper/integration_cancellimitorder_test.go b/x/dex/keeper/integration_cancellimitorder_test.go new file mode 100644 index 000000000..00aadff0b --- /dev/null +++ b/x/dex/keeper/integration_cancellimitorder_test.go @@ -0,0 +1,286 @@ +package keeper_test + +import ( + "math" + "time" + + abci "github.com/cometbft/cometbft/abci/types" + "github.com/neutron-org/neutron/x/dex/types" +) + +func (s *MsgServerTestSuite) TestCancelEntireLimitOrderAOneExists() { + s.fundAliceBalances(50, 50) + // CASE + // Alice adds a limit order of A for B and cancels it right away + + trancheKey := s.aliceLimitSells("TokenA", 0, 10) + + s.assertAliceBalances(40, 50) + s.assertDexBalances(10, 0) + s.assertCurr1To0(0) + s.assertCurr0To1(math.MaxInt64) + + s.aliceCancelsLimitSell(trancheKey) + + s.assertAliceBalances(50, 50) + s.assertDexBalances(0, 0) + s.assertCurr1To0(math.MinInt64) + s.assertCurr0To1(math.MaxInt64) + + // Assert that the LimitOrderTrancheUser has been deleted + _, found := s.app.DexKeeper.GetLimitOrderTrancheUser(s.ctx, s.alice.String(), trancheKey) + s.Assert().False(found) +} + +func (s *MsgServerTestSuite) TestCancelEntireLimitOrderBOneExists() { + s.fundAliceBalances(50, 50) + // CASE + // Alice adds a limit order of B for A and cancels it right away + + trancheKey := s.aliceLimitSells("TokenB", 0, 10) + + s.assertAliceBalances(50, 40) + s.assertDexBalances(0, 10) + s.assertCurr1To0(math.MinInt64) + s.assertCurr0To1(0) + + s.aliceCancelsLimitSell(trancheKey) + + s.assertAliceBalances(50, 50) + s.assertDexBalances(0, 0) + s.assertCurr1To0(math.MinInt64) + s.assertCurr0To1(math.MaxInt64) +} + +func (s *MsgServerTestSuite) TestCancelHigherEntireLimitOrderATwoExistDiffTicksSameDirection() { + s.fundAliceBalances(50, 50) + // CASE + // Alice adds two limit orders from A to B and removes the one at the higher tick (0) + + trancheKey := s.aliceLimitSells("TokenA", 0, 10) + s.aliceLimitSells("TokenA", -1, 10) + + s.assertAliceBalances(30, 50) + s.assertDexBalances(20, 0) + s.assertCurr1To0(0) + s.assertCurr0To1(math.MaxInt64) + + s.aliceCancelsLimitSell(trancheKey) + + s.assertAliceBalances(40, 50) + s.assertDexBalances(10, 0) + s.assertCurr1To0(-1) + s.assertCurr0To1(math.MaxInt64) +} + +func (s *MsgServerTestSuite) TestCancelLowerEntireLimitOrderATwoExistDiffTicksSameDirection() { + s.fundAliceBalances(50, 50) + // CASE + // Alice adds two limit orders from A to B and removes the one at the lower tick (-1) + + s.aliceLimitSells("TokenA", 0, 10) + trancheKey := s.aliceLimitSells("TokenA", -1, 10) + + s.assertAliceBalances(30, 50) + s.assertDexBalances(20, 0) + s.assertCurr1To0(0) + s.assertCurr0To1(math.MaxInt64) + + s.aliceCancelsLimitSell(trancheKey) + + s.assertAliceBalances(40, 50) + s.assertDexBalances(10, 0) + s.assertCurr1To0(0) + s.assertCurr0To1(math.MaxInt64) +} + +func (s *MsgServerTestSuite) TestCancelLowerEntireLimitOrderATwoExistDiffTicksDiffDirection() { + s.fundAliceBalances(50, 50) + // CASE + // Alice adds one limit orders from A to B and one from B to A and removes the one from A to B + + trancheKey := s.aliceLimitSells("TokenA", 0, 10) + s.aliceLimitSells("TokenB", 1, 10) + + s.assertAliceBalances(40, 40) + s.assertDexBalances(10, 10) + s.assertCurr1To0(0) + s.assertCurr0To1(1) + + s.aliceCancelsLimitSell(trancheKey) + + s.assertAliceBalances(50, 40) + s.assertDexBalances(0, 10) + s.assertCurr1To0(math.MinInt64) + s.assertCurr0To1(1) +} + +func (s *MsgServerTestSuite) TestCancelHigherEntireLimitOrderBTwoExistDiffTicksSameDirection() { + s.fundAliceBalances(50, 50) + // CASE + // Alice adds two limit orders from B to A and removes the one at tick 0 + + trancheKey := s.aliceLimitSells("TokenB", 0, 10) + s.aliceLimitSells("TokenB", -1, 10) + + s.assertAliceBalances(50, 30) + s.assertDexBalances(0, 20) + s.assertCurr1To0(math.MinInt64) + s.assertCurr0To1(-1) + + s.aliceCancelsLimitSell(trancheKey) + + s.assertAliceBalances(50, 40) + s.assertDexBalances(0, 10) + s.assertCurr1To0(math.MinInt64) + s.assertCurr0To1(-1) +} + +func (s *MsgServerTestSuite) TestCancelLowerEntireLimitOrderBTwoExistDiffTicksSameDirection() { + s.fundAliceBalances(50, 50) + // CASE + // Alice adds two limit orders from B to A and removes the one at tick 0 + + s.aliceLimitSells("TokenB", 0, 10) + trancheKey := s.aliceLimitSells("TokenB", -1, 10) + + s.assertAliceBalances(50, 30) + s.assertDexBalances(0, 20) + s.assertCurr1To0(math.MinInt64) + s.assertCurr0To1(-1) + + s.aliceCancelsLimitSell(trancheKey) + + s.assertAliceBalances(50, 40) + s.assertDexBalances(0, 10) + s.assertCurr1To0(math.MinInt64) + s.assertCurr0To1(0) +} + +func (s *MsgServerTestSuite) TestCancelTwiceFails() { + s.fundAliceBalances(50, 50) + // CASE + // Alice tries to cancel the same limit order twice + + trancheKey := s.aliceLimitSells("TokenB", 0, 10) + + s.assertAliceBalances(50, 40) + s.assertDexBalances(0, 10) + + s.aliceCancelsLimitSell(trancheKey) + + s.assertAliceBalances(50, 50) + s.assertDexBalances(0, 0) + + s.aliceCancelsLimitSellFails(trancheKey, types.ErrActiveLimitOrderNotFound) +} + +func (s *MsgServerTestSuite) TestCancelPartiallyFilled() { + s.fundAliceBalances(50, 0) + s.fundBobBalances(0, 50) + + // GIVEN alice limit sells 50 TokenA + trancheKey := s.aliceLimitSells("TokenA", 0, 50) + // Bob swaps 25 TokenB for TokenA + s.bobLimitSells("TokenB", -10, 25, types.LimitOrderType_FILL_OR_KILL) + + s.assertDexBalances(25, 25) + s.assertAliceBalances(0, 0) + + // WHEN alice cancels her limit order + s.aliceCancelsLimitSell(trancheKey) + + // Then alice gets back remaining 25 TokenA LO reserves + s.assertAliceBalances(25, 0) + s.assertDexBalances(0, 25) +} + +func (s *MsgServerTestSuite) TestCancelPartiallyFilledMultiUser() { + s.fundAliceBalances(50, 0) + s.fundBobBalances(0, 50) + s.fundCarolBalances(100, 0) + + // GIVEN alice limit sells 50 TokenA; carol sells 100 tokenA + trancheKey := s.aliceLimitSells("TokenA", 0, 50) + s.carolLimitSells("TokenA", 0, 100) + // Bob swaps 25 TokenB for TokenA + s.bobLimitSells("TokenB", -10, 25, types.LimitOrderType_FILL_OR_KILL) + + s.assertLimitLiquidityAtTick("TokenA", 0, 125) + s.assertDexBalances(125, 25) + s.assertAliceBalances(0, 0) + + // WHEN alice and carol cancel their limit orders + s.aliceCancelsLimitSell(trancheKey) + s.carolCancelsLimitSell(trancheKey) + + // THEN alice gets back 41 TokenA (125 * 1/3) + s.assertAliceBalances(41, 0) + + // Carol gets back 83 TokenA (125 * 2/3) + s.assertCarolBalances(83, 0) + s.assertDexBalances(1, 25) +} + +func (s *MsgServerTestSuite) TestCancelGoodTil() { + s.fundAliceBalances(50, 0) + tomorrow := time.Now().AddDate(0, 0, 1) + // GIVEN alice limit sells 50 TokenA with goodTil date of tommrow + trancheKey := s.aliceLimitSellsGoodTil("TokenA", 0, 50, tomorrow) + s.assertLimitLiquidityAtTick("TokenA", 0, 50) + s.assertNLimitOrderExpiration(1) + + // WHEN alice cancels the limit order + s.aliceCancelsLimitSell(trancheKey) + // THEN there is no liquidity left + s.assertLimitLiquidityAtTick("TokenA", 0, 0) + // and the LimitOrderExpiration has been removed + s.assertNLimitOrderExpiration(0) +} + +func (s *MsgServerTestSuite) TestCancelGoodTilAfterExpirationFails() { + s.fundAliceBalances(50, 0) + tomorrow := time.Now().AddDate(0, 0, 1) + // GIVEN alice limit sells 50 TokenA with goodTil date of tommrow + trancheKey := s.aliceLimitSellsGoodTil("TokenA", 0, 50, tomorrow) + s.assertLimitLiquidityAtTick("TokenA", 0, 50) + s.assertNLimitOrderExpiration(1) + + // WHEN expiration date has passed + s.nextBlockWithTime(time.Now().AddDate(0, 0, 2)) + s.app.EndBlock(abci.RequestEndBlock{Height: 0}) + + // THEN alice cancellation fails + s.aliceCancelsLimitSellFails(trancheKey, types.ErrActiveLimitOrderNotFound) +} + +func (s *MsgServerTestSuite) TestCancelJITSameBlock() { + s.fundAliceBalances(50, 0) + // GIVEN alice limit sells 50 TokenA as JIT + trancheKey := s.aliceLimitSells("TokenA", 0, 50, types.LimitOrderType_JUST_IN_TIME) + s.assertLimitLiquidityAtTick("TokenA", 0, 50) + s.assertNLimitOrderExpiration(1) + + // WHEN alice cancels the limit order + s.aliceCancelsLimitSell(trancheKey) + // THEN there is no liquidity left + s.assertLimitLiquidityAtTick("TokenA", 0, 0) + // and the LimitOrderExpiration has been removed + s.assertNLimitOrderExpiration(0) +} + +func (s *MsgServerTestSuite) TestCancelJITNextBlock() { + s.fundAliceBalances(50, 0) + // GIVEN alice limit sells 50 TokenA as JIT + trancheKey := s.aliceLimitSells("TokenA", 0, 50, types.LimitOrderType_JUST_IN_TIME) + s.assertLimitLiquidityAtTick("TokenA", 0, 50) + s.assertNLimitOrderExpiration(1) + + // WHEN we move to block N+1 + s.nextBlockWithTime(time.Now()) + s.app.EndBlock(abci.RequestEndBlock{Height: 0}) + + // THEN alice cancellation fails + s.aliceCancelsLimitSellFails(trancheKey, types.ErrActiveLimitOrderNotFound) + s.assertAliceBalances(0, 0) +} diff --git a/x/dex/keeper/integration_deposit_autoswap_unit_test.go b/x/dex/keeper/integration_deposit_autoswap_unit_test.go new file mode 100644 index 000000000..e7236da73 --- /dev/null +++ b/x/dex/keeper/integration_deposit_autoswap_unit_test.go @@ -0,0 +1,108 @@ +package keeper_test + +func (s *MsgServerTestSuite) TestAutoswapperWithdraws() { + s.fundAliceBalances(50, 50) + s.fundBobBalances(50, 50) + + // GIVEN + // create spread around -1, 1 + bobDep0 := 10 + bobDep1 := 10 + tickIndex := 200 + fee := 5 + + bobSharesMinted := s.calcSharesMinted(int64(tickIndex), int64(bobDep0), int64(bobDep1)) + + s.bobDeposits(NewDeposit(bobDep0, bobDep1, tickIndex, fee)) + s.assertBobBalances(40, 40) + s.assertDexBalances(10, 10) + + // Alice deposits at a different balance ratio + s.aliceDepositsWithOptions(NewDepositWithOptions(12, 5, tickIndex, fee, DepositOptions{DisableAutoswap: false})) + s.assertAliceBalances(38, 45) + s.assertDexBalances(22, 15) + + // Calculated expected amounts out + autoswapSharesMinted := s.calcAutoswapSharesMinted(int64(tickIndex), uint64(fee), 7, 0, 5, 5, bobSharesMinted.Int64(), bobSharesMinted.Int64()) + // totalShares := autoswapSharesMinted.Add(sdk.NewInt(20)) + + aliceExpectedBalance0, aliceExpectedBalance1, dexExpectedBalance0, dexExpectedBalance1 := s.calcExpectedBalancesAfterWithdrawOnePool(autoswapSharesMinted, s.alice, int64(tickIndex), uint64(fee)) + + s.aliceWithdraws(NewWithdrawalInt(autoswapSharesMinted, int64(tickIndex), uint64(fee))) + + s.assertAliceBalances(aliceExpectedBalance0.Int64(), aliceExpectedBalance1.Int64()) + s.assertDexBalances(dexExpectedBalance0.Int64(), dexExpectedBalance1.Int64()) +} + +func (s *MsgServerTestSuite) TestAutoswapOtherDepositorWithdraws() { + s.fundAliceBalances(50, 50) + s.fundBobBalances(50, 50) + + // GIVEN + // create spread around -1, 1 + bobDep0 := 10 + bobDep1 := 10 + tickIndex := 150 + fee := 10 + + bobSharesMinted := s.calcSharesMinted(int64(tickIndex), int64(bobDep0), int64(bobDep1)) + + s.bobDeposits(NewDeposit(bobDep0, bobDep1, tickIndex, fee)) + s.assertBobBalances(40, 40) + s.assertDexBalances(10, 10) + + // Alice deposits at a different balance ratio + s.aliceDepositsWithOptions(NewDepositWithOptions(10, 7, tickIndex, fee, DepositOptions{DisableAutoswap: false})) + s.assertAliceBalances(40, 43) + s.assertDexBalances(20, 17) + + // Calculated expected amounts out + + bobExpectedBalance0, bobExpectedBalance1, dexExpectedBalance0, dexExpectedBalance1 := s.calcExpectedBalancesAfterWithdrawOnePool(bobSharesMinted, s.bob, int64(tickIndex), uint64(fee)) + + s.bobWithdraws(NewWithdrawal(bobSharesMinted.Int64(), int64(tickIndex), uint64(fee))) + + s.assertBobBalances(bobExpectedBalance0.Int64(), bobExpectedBalance1.Int64()) + s.assertDexBalances(dexExpectedBalance0.Int64(), dexExpectedBalance1.Int64()) +} + +func (s *MsgServerTestSuite) TestAutoswapBothWithdraws() { + s.fundAliceBalances(50, 50) + s.fundBobBalances(50, 50) + + // GIVEN + // create spread around -1, 1 + bobDep0 := 10 + bobDep1 := 10 + tickIndex := 10000 + fee := 5 + + bobSharesMinted := s.calcSharesMinted(int64(tickIndex), int64(bobDep0), int64(bobDep1)) + + s.bobDeposits(NewDeposit(bobDep0, bobDep1, tickIndex, fee)) + s.assertBobBalances(40, 40) + s.assertDexBalances(10, 10) + + // Alice deposits at a different balance ratio + s.aliceDepositsWithOptions(NewDepositWithOptions(10, 5, tickIndex, fee, DepositOptions{DisableAutoswap: false})) + s.assertAliceBalances(40, 45) + s.assertDexBalances(20, 15) + + // Calculated expected amounts out + autoswapSharesMinted := s.calcAutoswapSharesMinted(int64(tickIndex), uint64(fee), 5, 0, 5, 5, bobSharesMinted.Int64(), bobSharesMinted.Int64()) + // totalShares := autoswapSharesMinted.Add(sdk.NewInt(20)) + + bobExpectedBalance0, bobExpectedBalance1, dexExpectedBalance0, dexExpectedBalance1 := s.calcExpectedBalancesAfterWithdrawOnePool(bobSharesMinted, s.bob, int64(tickIndex), uint64(fee)) + + s.bobWithdraws(NewWithdrawal(bobSharesMinted.Int64(), int64(tickIndex), uint64(fee))) + + s.assertBobBalances(bobExpectedBalance0.Int64(), bobExpectedBalance1.Int64()) + s.assertDexBalances(dexExpectedBalance0.Int64(), dexExpectedBalance1.Int64()) + + aliceExpectedBalance0, aliceExpectedBalance1, dexExpectedBalance0, dexExpectedBalance1 := s.calcExpectedBalancesAfterWithdrawOnePool(autoswapSharesMinted, s.alice, int64(tickIndex), uint64(fee)) + + s.aliceWithdraws(NewWithdrawalInt(autoswapSharesMinted, int64(tickIndex), uint64(fee))) + + s.assertAliceBalances(aliceExpectedBalance0.Int64(), aliceExpectedBalance1.Int64()) + s.assertDexBalances(dexExpectedBalance0.Int64(), dexExpectedBalance1.Int64()) +} diff --git a/x/dex/keeper/integration_deposit_doublesided_test.go b/x/dex/keeper/integration_deposit_doublesided_test.go new file mode 100644 index 000000000..dc03f571f --- /dev/null +++ b/x/dex/keeper/integration_deposit_doublesided_test.go @@ -0,0 +1,248 @@ +package keeper_test + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/neutron-org/neutron/x/dex/types" +) + +func (s *MsgServerTestSuite) TestDepositDoubleSidedInSpreadCurrTickAdjusted() { + s.fundAliceBalances(50, 50) + + // GIVEN + // create spread around -5, 5 + s.aliceDeposits(NewDeposit(10, 10, 0, 5)) + s.assertAliceBalances(40, 40) + s.assertDexBalances(10, 10) + s.assertCurr1To0(-5) + s.assertCurr0To1(5) + + // WHEN + // deposit in spread (10 of A,B at tick 0 fee 1) + s.aliceDeposits(NewDeposit(10, 10, 0, 1)) + s.assertAliceBalances(30, 30) + s.assertDexBalances(20, 20) + + // THEN + // assert currentTick1To0, currTick0to1 moved + s.assertCurr1To0(-1) + s.assertCurr0To1(1) +} + +func (s *MsgServerTestSuite) TestDepositDoubleSidedAroundSpreadCurrTickNotAdjusted() { + s.fundAliceBalances(50, 50) + + // GIVEN + // create spread around -1, 1 + s.aliceDeposits(NewDeposit(10, 10, 0, 1)) + s.assertAliceBalances(40, 40) + s.assertDexBalances(10, 10) + s.assertCurr1To0(-1) + s.assertCurr0To1(1) + + // WHEN + // deposit around spread (10 of A,B at tick 0 fee 3) + s.aliceDeposits(NewDeposit(10, 10, 0, 3)) + s.assertAliceBalances(30, 30) + s.assertDexBalances(20, 20) + + // THEN + // assert CurrentTick0To1, CurrentTick1To0 unchanged + s.assertCurr1To0(-1) + s.assertCurr0To1(1) +} + +func (s *MsgServerTestSuite) TestDepositDoubleSidedHalfInSpreadCurrTick0To1Adjusted() { + s.fundAliceBalances(50, 50) + + // GIVEN + // create spread around -5, 5 + s.aliceDeposits(NewDeposit(10, 10, 0, 5)) + s.assertAliceBalances(40, 40) + s.assertDexBalances(10, 10) + s.assertCurr1To0(-5) + s.assertCurr0To1(5) + + // WHEN + // deposit half in spread (10 of A,B at tick 1 fee 5) + s.aliceDeposits(NewDeposit(10, 10, 1, 5)) + s.assertAliceBalances(30, 30) + s.assertDexBalances(20, 20) + + // THEN + // assert CurrTick1to0 unchanged, CurrTick0to1 adjusted + s.assertCurr1To0(-4) + s.assertCurr0To1(5) +} + +func (s *MsgServerTestSuite) TestDepositDoubleSidedHalfInSpreadCurrTick1To0Adjusted() { + s.fundAliceBalances(50, 50) + + // GIVEN + // create spread around -5, 5 + s.aliceDeposits(NewDeposit(10, 10, 0, 5)) + s.assertAliceBalances(40, 40) + s.assertDexBalances(10, 10) + s.assertCurr1To0(-5) + s.assertCurr0To1(5) + + // WHEN + // deposit half in spread (10 of A,B at tick -1 fee 5) + s.aliceDeposits(NewDeposit(10, 10, -1, 5)) + s.assertAliceBalances(30, 30) + s.assertDexBalances(20, 20) + + // THEN + // assert CurrTick0to1 unchanged, CurrTick1to0 adjusted + s.assertCurr1To0(-5) + s.assertCurr0To1(4) +} + +func (s *MsgServerTestSuite) TestDepositDoubleSidedCreatingArbBelow() { + s.fundAliceBalances(50, 50) + s.fundBobBalances(50, 50) + + // GIVEN + // deposit 10 of token A at tick 0 fee 1 + s.aliceDeposits(NewDeposit(10, 0, 0, 1)) + s.assertAliceBalances(40, 50) + s.assertDexBalances(10, 0) + s.assertPoolLiquidity(10, 0, 0, 1) + + // WHEN + // depositing below enemy lines at tick -5 + // THEN + // deposit should not fail with BEL error, balances and liquidity should not change at deposited tick + + s.aliceDeposits(NewDeposit(10, 10, -5, 1)) + + // buying liquidity behind enemy lines doesn't break anything + s.bobLimitSells("TokenA", 0, 10, types.LimitOrderType_FILL_OR_KILL) +} + +func (s *MsgServerTestSuite) TestDepositDoubleSidedCreatingArbAbove() { + s.fundAliceBalances(50, 50) + s.fundBobBalances(50, 50) + + // GIVEN + // deposit 10 of token A at tick 0 fee 1 + s.aliceDeposits(NewDeposit(0, 10, 0, 1)) + s.assertAliceBalances(50, 40) + s.assertDexBalances(0, 10) + s.assertPoolLiquidity(0, 10, 0, 1) + + // WHEN + // depositing above enemy lines at tick 5 + // THEN + // deposit should not fail with BEL error, balances and liquidity should not change at deposited tick + + s.aliceDeposits(NewDeposit(10, 10, 5, 1)) + + // buying liquidity behind enemy lines doesn't break anything + s.bobLimitSells("TokenB", 0, 10, types.LimitOrderType_FILL_OR_KILL) +} + +func (s *MsgServerTestSuite) TestDepositDoubleSidedFirstSharesMintedTotal() { + s.fundAliceBalances(50, 50) + + // GIVEN + // empty pool + s.assertPoolShares(0, 1, 0) + s.assertPoolLiquidity(0, 0, 0, 1) + + // WHEN + // depositing 10, 5 at tick 0 fee 1 + s.aliceDeposits(NewDeposit(10, 5, 0, 1)) + + // THEN + // 15 shares are minted and are the total + s.assertPoolShares(0, 1, 15) +} + +func (s *MsgServerTestSuite) TestDepositDoubleSidedFirstSharesMintedUser() { + s.fundAliceBalances(50, 50) + + // GIVEN + // empty pool + s.assertAliceShares(0, 1, 0) + s.assertPoolLiquidity(0, 0, 0, 1) + s.assertAliceShares(0, 1, 0) + + // WHEN + // depositing 10, 5 at tick 0 fee 1 + s.aliceDeposits(NewDeposit(10, 5, 0, 1)) + + // THEN + // 15 shares are minted for alice + s.assertAliceShares(0, 1, 15) +} + +func (s *MsgServerTestSuite) TestDepositDoubleSidedExistingSharesMintedTotal() { + s.fundAliceBalances(50, 50) + + // GIVEN + // tick 0 fee 1 has existing liquidity of 10 tokenA and 5 tokenB, shares are 15 + s.aliceDeposits(NewDeposit(10, 5, 0, 1)) + s.assertPoolShares(0, 1, 15) + s.assertPoolLiquidity(10, 5, 0, 1) + + // WHEN + // depositing 10, 5 at tick 0 fee 1 + s.aliceDeposits(NewDeposit(10, 5, 0, 1)) + + // THEN + // 15 more shares are minted and the total is 30 + s.assertPoolShares(0, 1, 30) +} + +func (s *MsgServerTestSuite) TestDepositDoubleSidedExistingSharesMintedUser() { + s.fundAliceBalances(50, 50) + + // GIVEN + // tick 0 fee 1 has existing liquidity of 10 tokenA and 5 tokenB, shares are 15 + s.aliceDeposits(NewDeposit(10, 5, 0, 1)) + s.assertAliceShares(0, 1, 15) + s.assertPoolShares(0, 1, 15) + s.assertPoolLiquidity(10, 5, 0, 1) + + // WHEN + // alice deposits 6, 3 at tick 0 fee 1 + s.aliceDeposits(NewDeposit(6, 3, 0, 1)) + + // THEN + // 9 more shares are minted for alice for a total of 24 + s.assertAliceShares(0, 1, 24) +} + +func (s *MsgServerTestSuite) TestDepositValueAccural() { + s.fundAliceBalances(100, 0) + s.fundBobBalances(1000, 1000) + s.fundCarolBalances(100, 1) + + // Alice deposits 100TokenA @ tick0 => 100 shares + s.aliceDeposits(NewDeposit(100, 0, 0, 10)) + s.assertAliceShares(0, 10, 100) + s.assertLiquidityAtTick(sdk.NewInt(100), sdk.ZeroInt(), 0, 10) + + // Lots of trade activity => ~200 ExistingValueToken0 + + for i := 0; i < 100; i++ { + liquidityA, liquidityB := s.getLiquidityAtTick(0, 10) + if i%2 == 0 { + s.bobLimitSells("TokenB", -10, int(liquidityA.Int64())+10, types.LimitOrderType_IMMEDIATE_OR_CANCEL) + } else { + s.bobLimitSells("TokenA", 10, int(liquidityB.Int64())+10, types.LimitOrderType_IMMEDIATE_OR_CANCEL) + } + } + s.assertLiquidityAtTick(sdk.NewInt(200), sdk.NewInt(0), 0, 10) + s.assertDexBalances(200, 0) + + // Carol deposits 100TokenA @tick0 + s.carolDeposits(NewDeposit(100, 1, 0, 10)) + s.assertCarolShares(0, 10, 50) + + s.aliceWithdraws(NewWithdrawal(100, 0, 10)) + s.assertAliceBalances(200, 0) + + s.carolWithdraws(NewWithdrawal(50, 0, 10)) + s.assertCarolBalances(100, 1) +} diff --git a/x/dex/keeper/integration_deposit_multi_test.go b/x/dex/keeper/integration_deposit_multi_test.go new file mode 100644 index 000000000..330ab70d9 --- /dev/null +++ b/x/dex/keeper/integration_deposit_multi_test.go @@ -0,0 +1,45 @@ +package keeper_test + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/neutron-org/neutron/x/dex/types" +) + +func (s *MsgServerTestSuite) TestDepositMultiCompleteFailure() { + s.fundAliceBalances(50, 50) + + // GIVEN + // no existing liquidity + + // WHEN + // alice deposits 0 A, 5 B at tick 0 fee 0 and 5 A, 0 B at tick 0 fee 0 + // THEN + // second deposit's ratio is different than pool after the first, so amounts will be rounded to 0,0 and tx will fail + + err := types.ErrZeroTrueDeposit + s.assertAliceDepositFails( + err, + NewDeposit(5, 0, 0, 1), + NewDeposit(0, 5, 0, 1), + ) +} + +func (s *MsgServerTestSuite) TestDepositMultiSuccess() { + s.fundAliceBalances(50, 50) + + // GIVEN + // no existing liquidity + + // WHEN + // alice deposits 5 A, 5 B at tick 0 fee 0 and then 10 A, 10 B at tick 5 fee 0 + s.aliceDeposits( + NewDeposit(5, 5, 0, 1), + NewDeposit(10, 10, 0, 1), + ) + + // THEN + // both deposits should go through + s.assertAliceBalances(35, 35) + s.assertLiquidityAtTick(sdk.NewInt(15), sdk.NewInt(15), 0, 1) + s.assertDexBalances(15, 15) +} diff --git a/x/dex/keeper/integration_deposit_singlesided_test.go b/x/dex/keeper/integration_deposit_singlesided_test.go new file mode 100644 index 000000000..a7a85e3df --- /dev/null +++ b/x/dex/keeper/integration_deposit_singlesided_test.go @@ -0,0 +1,435 @@ +package keeper_test + +import ( + "math" + + "github.com/neutron-org/neutron/x/dex/types" +) + +func (s *MsgServerTestSuite) TestDepositSingleSidedInSpread1To0() { + s.fundAliceBalances(50, 50) + + // GIVEN + // create spread around -5, 5 + s.aliceDeposits(NewDeposit(10, 10, 0, 5)) + s.assertAliceBalances(40, 40) + s.assertDexBalances(10, 10) + s.assertCurr1To0(-5) + s.assertCurr0To1(5) + + // WHEN + // deposit in spread (10 of A at tick 0 fee 1) + s.aliceDeposits(NewDeposit(10, 0, 0, 1)) + s.assertAliceBalances(30, 40) + s.assertDexBalances(20, 10) + + // THEN + // assert currentTick1To0 moved + s.assertCurr1To0(-1) +} + +func (s *MsgServerTestSuite) TestDepositSingleSidedInSpread0To1() { + s.fundAliceBalances(50, 50) + + // GIVEN + // create spread around -5, 5 + s.aliceDeposits(NewDeposit(10, 10, 0, 5)) + s.assertAliceBalances(40, 40) + s.assertDexBalances(10, 10) + s.assertCurr1To0(-5) + s.assertCurr0To1(5) + + // WHEN + // deposit in spread (10 of B at tick 0 fee 1) + s.aliceDeposits(NewDeposit(0, 10, 0, 1)) + s.assertAliceBalances(40, 30) + s.assertDexBalances(10, 20) + + // THEN + // assert currentTick0To1 moved + s.assertCurr0To1(1) +} + +func (s *MsgServerTestSuite) TestDepositSingleSidedInSpreadMinMaxNotAdjusted() { + s.fundAliceBalances(50, 50) + + // GIVEN + // create spread around -5, 5 + s.aliceDeposits(NewDeposit(10, 10, 0, 5)) + s.assertAliceBalances(40, 40) + s.assertDexBalances(10, 10) + + // WHEN + // deposit in spread (10 of A at tick 0 fee 1) + s.aliceDeposits(NewDeposit(10, 0, 0, 1)) + s.assertAliceBalances(30, 40) + s.assertDexBalances(20, 10) + + // THEN + // assert min, max not moved +} + +func (s *MsgServerTestSuite) TestDepositSingleSidedOutOfSpread0To1NotAdjusted() { + s.fundAliceBalances(50, 50) + + // GIVEN + // create spread around -1, 1 + s.aliceDeposits(NewDeposit(10, 10, 0, 1)) + s.assertAliceBalances(40, 40) + s.assertDexBalances(10, 10) + s.assertCurr1To0(-1) + s.assertCurr0To1(1) + + // WHEN + // deposit out of spread (10 of B at tick 0 fee 3) + s.aliceDeposits(NewDeposit(0, 10, 0, 3)) + s.assertAliceBalances(40, 30) + s.assertDexBalances(10, 20) + + // THEN + // assert currentTick0To1 not moved + s.assertCurr0To1(1) +} + +func (s *MsgServerTestSuite) TestDepositSingleSidedOutOfSpread1To0NotAdjusted() { + s.fundAliceBalances(50, 50) + + // GIVEN + // create spread around -1, 1 + s.aliceDeposits(NewDeposit(10, 10, 0, 1)) + s.assertAliceBalances(40, 40) + s.assertDexBalances(10, 10) + s.assertCurr1To0(-1) + s.assertCurr0To1(1) + + // WHEN + // deposit out of spread (10 of A at tick 0 fee 3) + s.aliceDeposits(NewDeposit(10, 0, 0, 3)) + s.assertAliceBalances(30, 40) + s.assertDexBalances(20, 10) + + // THEN + // assert currentTick1To0 not moved + s.assertCurr1To0(-1) +} + +func (s *MsgServerTestSuite) TestDepositSingleSidedOutOfSpreadMinAdjusted() { + s.fundAliceBalances(50, 50) + + // GIVEN + // create spread around -1, 1 + s.aliceDeposits(NewDeposit(10, 10, 0, 1)) + s.assertAliceBalances(40, 40) + s.assertDexBalances(10, 10) + s.assertCurr1To0(-1) + s.assertCurr0To1(1) + + // WHEN + // deposit out of spread (10 of A at tick 0 fee 3) + s.aliceDeposits(NewDeposit(10, 0, 0, 3)) + s.assertAliceBalances(30, 40) + s.assertDexBalances(20, 10) + + // THEN + // assert min moved +} + +func (s *MsgServerTestSuite) TestDepositSingleSidedOutOfSpreadMaxAdjusted() { + s.fundAliceBalances(50, 50) + + // GIVEN + // create spread around -1, 1 + s.aliceDeposits(NewDeposit(10, 10, 0, 1)) + s.assertAliceBalances(40, 40) + s.assertDexBalances(10, 10) + s.assertCurr1To0(-1) + s.assertCurr0To1(1) + + // WHEN + // deposit out of spread (10 of B at tick 0 fee 3) + s.aliceDeposits(NewDeposit(0, 10, 0, 3)) + s.assertAliceBalances(40, 30) + s.assertDexBalances(10, 20) + + // THEN + // assert max moved +} + +func (s *MsgServerTestSuite) TestDepositSingleSidedOutOfSpreadMinNotAdjusted() { + s.fundAliceBalances(50, 50) + + // GIVEN + // create spread around -1, 1 + s.aliceDeposits(NewDeposit(10, 10, 0, 1)) + s.assertAliceBalances(40, 40) + s.assertDexBalances(10, 10) + s.assertCurr1To0(-1) + s.assertCurr0To1(1) + // deposit new min at -5 + s.aliceDeposits(NewDeposit(10, 0, 0, 5)) + s.assertAliceBalances(30, 40) + s.assertDexBalances(20, 10) + + // WHEN + // deposit in spread (10 of A at tick 0 fee 3) + s.aliceDeposits(NewDeposit(10, 0, 0, 3)) + s.assertAliceBalances(20, 40) + s.assertDexBalances(30, 10) + + // THEN + // assert min not moved +} + +func (s *MsgServerTestSuite) TestDepositSingleSidedOutOfSpreadMaxNotAdjusted() { + s.fundAliceBalances(50, 50) + + // GIVEN + // create spread around -1, 1 + s.aliceDeposits(NewDeposit(10, 10, 0, 1)) + s.assertAliceBalances(40, 40) + s.assertDexBalances(10, 10) + s.assertCurr1To0(-1) + s.assertCurr0To1(1) + // deposit new max at 5 + s.aliceDeposits(NewDeposit(0, 10, 0, 5)) + s.assertAliceBalances(40, 30) + s.assertDexBalances(10, 20) + + // WHEN + // deposit out of spread (10 of B at tick 0 fee 3) + s.aliceDeposits(NewDeposit(0, 10, 0, 3)) + s.assertAliceBalances(40, 20) + s.assertDexBalances(10, 30) + + // THEN + // assert max not moved +} + +func (s *MsgServerTestSuite) TestDepositSingleSidedExistingLiquidityA() { + s.fundAliceBalances(50, 50) + + // GIVEN + // deposit 10 of token A at tick 0 fee 1 + s.aliceDeposits(NewDeposit(10, 0, 0, 1)) + s.assertAliceBalances(40, 50) + s.assertDexBalances(10, 0) + s.assertPoolLiquidity(10, 0, 0, 1) + s.assertCurr1To0(-1) + s.assertCurr0To1(math.MaxInt64) + + // WHEN + // deposit 10 of token A on the same tick + s.aliceDeposits(NewDeposit(10, 0, 0, 1)) + + // THEN + // assert 20 of token A deposited at tick 0 fee 0 and ticks unchanged + s.assertAliceBalances(30, 50) + s.assertDexBalances(20, 0) + s.assertPoolLiquidity(20, 0, 0, 1) + s.assertCurr1To0(-1) + s.assertCurr0To1(math.MaxInt64) +} + +func (s *MsgServerTestSuite) TestDepositSingleSidedExistingLiquidityB() { + s.fundAliceBalances(50, 50) + + // GIVEN + // deposit 10 of token B at tick 1 fee 0 + s.aliceDeposits(NewDeposit(0, 10, 0, 1)) + s.assertAliceBalances(50, 40) + s.assertDexBalances(0, 10) + s.assertPoolLiquidity(0, 10, 0, 1) + s.assertCurr1To0(math.MinInt64) + s.assertCurr0To1(1) + + // WHEN + // deposit 10 of token B on the same tick + s.aliceDeposits(NewDeposit(0, 10, 0, 1)) + + // THEN + // assert 20 of token B deposited at tick 0 fee 0 and ticks unchanged + s.assertPoolLiquidity(0, 20, 0, 1) + s.assertAliceBalances(50, 30) + s.assertDexBalances(0, 20) + s.assertCurr1To0(math.MinInt64) + s.assertCurr0To1(1) +} + +func (s *MsgServerTestSuite) TestDepositSingleSidedCreatingArbToken0() { + s.fundAliceBalances(50, 50) + s.fundBobBalances(50, 50) + + // GIVEN + // deposit 10 of token B at tick 0 fee 1 + s.aliceDeposits(NewDeposit(0, 10, 0, 1)) + s.assertAliceBalances(50, 40) + s.assertDexBalances(0, 10) + s.assertPoolLiquidity(0, 10, 0, 1) + s.assertCurr0To1(1) + + // WHEN + // depositing above enemy lines at tick 1 + // THEN + // deposit should not fail with BEL error, balances and liquidity should not change at deposited tick + s.aliceDeposits(NewDeposit(10, 0, 4000, 1)) + + // Bob arbs + s.bobLimitSells("TokenB", -1, 50, types.LimitOrderType_IMMEDIATE_OR_CANCEL) + s.bobLimitSells("TokenA", 1, 10) + s.assertBobBalances(50, 52) +} + +func (s *MsgServerTestSuite) TestDepositSingleSidedCreatingArbToken1() { + s.fundAliceBalances(50, 50) + s.fundBobBalances(50, 50) + + // GIVEN + // deposit 10 of token A at tick 0 fee 1 + s.aliceDeposits(NewDeposit(10, 0, 0, 1)) + s.assertAliceBalances(40, 50) + s.assertDexBalances(10, 0) + s.assertPoolLiquidity(10, 0, 0, 1) + s.assertCurr1To0(-1) + + // WHEN + // depositing above enemy lines at tick -1 + // THEN + // deposit should not fail with BEL error, balances and liquidity should not change at deposited tick + + s.aliceDeposits(NewDeposit(0, 10, -4000, 0)) + + // Bob arbs + s.bobLimitSells("TokenA", -1, 50, types.LimitOrderType_IMMEDIATE_OR_CANCEL) + s.bobLimitSells("TokenB", -1, 10) + s.assertBobBalances(52, 50) +} + +func (s *MsgServerTestSuite) TestDepositSingleSidedMultiA() { + s.fundAliceBalances(50, 50) + + // GIVEN + // deposit 10 of token A at tick 0 fee 1 + s.aliceDeposits(NewDeposit(10, 0, 0, 1)) + s.assertAliceBalances(40, 50) + s.assertDexBalances(10, 0) + s.assertPoolLiquidity(10, 0, 0, 1) + s.assertCurr1To0(-1) + s.assertCurr0To1(math.MaxInt64) + + // WHEN + // multi deposit + s.aliceDeposits( + NewDeposit(10, 0, 0, 1), + NewDeposit(10, 0, 0, 3), + ) + + // THEN + // assert 20 of token B deposited at tick 1 fee 0 and ticks unchanged + s.assertAliceBalances(20, 50) + s.assertDexBalances(30, 0) + s.assertPoolLiquidity(20, 0, 0, 1) + s.assertPoolLiquidity(10, 0, 0, 3) + s.assertCurr1To0(-1) + s.assertCurr0To1(math.MaxInt64) +} + +func (s *MsgServerTestSuite) TestDepositSingleSidedMultiB() { + s.fundAliceBalances(50, 50) + + // GIVEN + // deposit 10 of token B at tick 1 fee 0 + s.aliceDeposits(NewDeposit(0, 10, 0, 1)) + s.assertAliceBalances(50, 40) + s.assertDexBalances(0, 10) + s.assertPoolLiquidity(0, 10, 0, 1) + s.assertCurr1To0(math.MinInt64) + s.assertCurr0To1(1) + + // WHEN + // multi deposit at + s.aliceDeposits( + NewDeposit(0, 10, 0, 1), + NewDeposit(0, 10, 0, 3), + ) + + // THEN + // assert 20 of token B deposited at tick 1 fee 0 and ticks unchanged + s.assertAliceBalances(50, 20) + s.assertDexBalances(0, 30) + s.assertPoolLiquidity(0, 20, 0, 1) + s.assertPoolLiquidity(0, 10, 0, 3) + s.assertCurr1To0(math.MinInt64) + s.assertCurr0To1(1) +} + +func (s *MsgServerTestSuite) TestDepositSingleSidedLowerTickOutsideRange() { + s.fundAliceBalances(50, 50) + + // GIVEN + // no existing liquidity + + // WHEN + // depositing at the lower end of the acceptable range for ticks + // THEN + // deposit should fail with TickOutsideRange + + tickIndex := -1 * int(types.MaxTickExp) + err := types.ErrTickOutsideRange + s.assertAliceDepositFails(err, NewDeposit(10, 0, tickIndex, 1)) +} + +func (s *MsgServerTestSuite) TestDepositSingleSidedUpperTickOutsideRange() { + s.fundAliceBalances(50, 50) + + // GIVEN + // no existing liquidity + + // WHEN + // depositing at the lower end of the acceptable range for ticks + // THEN + // deposit should fail with TickOutsideRange + + tickIndex := int(types.MaxTickExp) + err := types.ErrTickOutsideRange + s.assertAliceDepositFails(err, NewDeposit(0, 10, tickIndex, 1)) +} + +func (s *MsgServerTestSuite) TestDepositSingleSidedZeroTrueAmountsFail() { + s.fundAliceBalances(50, 50) + + // GIVEN + // alice deposits 5 A, 0 B at tick 0 fee 0 + s.aliceDeposits(NewDeposit(5, 0, 0, 1)) + + // WHEN + // alice deposits 0 A, 5 B at tick 0 fee 0 + // THEN + // second deposit's ratio is different than pool after the first, so amounts will be rounded to 0,0 and tx will fail + + err := types.ErrZeroTrueDeposit + s.assertAliceDepositFails(err, NewDeposit(0, 5, 0, 1)) +} + +func (s *MsgServerTestSuite) TestDepositSingleLowTickUnderflowFails() { + s.fundAliceBalances(0, 50) + + // GIVEN + // deposit 50 of token B at tick -352436 fee 0 + // THEN 0 shares would be issued so deposit fails + s.assertAliceDepositFails( + types.ErrDepositShareUnderflow, + NewDeposit(0, 50, -352436, 0), + ) +} + +func (s *MsgServerTestSuite) TestDepositSingleInvalidFeeFails() { + s.fundAliceBalances(0, 50) + + // GIVEN + // Deposit at fee 43 (invalid) + // THEN FAILURE + s.assertAliceDepositFails( + types.ErrInvalidFee, + NewDeposit(0, 50, 10, 43), + ) +} diff --git a/x/dex/keeper/integration_multihopswap_test.go b/x/dex/keeper/integration_multihopswap_test.go new file mode 100644 index 000000000..08b28dbf2 --- /dev/null +++ b/x/dex/keeper/integration_multihopswap_test.go @@ -0,0 +1,389 @@ +package keeper_test + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" + keepertest "github.com/neutron-org/neutron/testutil/keeper" + math_utils "github.com/neutron-org/neutron/utils/math" + "github.com/neutron-org/neutron/x/dex/types" +) + +type PoolSetup struct { + TokenA string + TokenB string + AmountA int + AmountB int + TickIndex int + Fee int +} + +func NewPoolSetup(tokenA, tokenB string, amountA, amountB, tickIndex, fee int) PoolSetup { + return PoolSetup{ + TokenA: tokenA, + TokenB: tokenB, + AmountA: amountA, + AmountB: amountB, + TickIndex: tickIndex, + Fee: fee, + } +} + +func (s *MsgServerTestSuite) SetupMultiplePools(poolSetups ...PoolSetup) { + for _, p := range poolSetups { + coins := sdk.NewCoins( + sdk.NewCoin(p.TokenA, sdk.NewInt(int64(p.AmountA))), + sdk.NewCoin(p.TokenB, sdk.NewInt(int64(p.AmountB))), + ) + s.fundAccountBalancesWithDenom(s.bob, coins) + pairID := types.PairID{Token0: p.TokenA, Token1: p.TokenB} + s.deposits( + s.bob, + []*Deposit{NewDeposit(p.AmountA, p.AmountB, p.TickIndex, p.Fee)}, + pairID, + ) + } +} + +func (s *MsgServerTestSuite) TestMultiHopSwapSingleRoute() { + s.fundAliceBalances(100, 0) + + // 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 := [][]string{{"TokenA", "TokenB", "TokenC", "TokenD"}} + s.aliceMultiHopSwaps(route, 100, math_utils.MustNewPrecDecFromStr("0.9"), false) + + // THEN alice gets out 99 TokenD + s.assertAccountBalanceWithDenom(s.alice, "TokenA", 0) + s.assertAccountBalanceWithDenom(s.alice, "TokenD", 97) + + s.assertDexBalanceWithDenom("TokenA", 100) + s.assertDexBalanceWithDenom("TokenB", 100) + s.assertDexBalanceWithDenom("TokenC", 100) + s.assertDexBalanceWithDenom("TokenD", 3) +} + +func (s *MsgServerTestSuite) TestMultiHopSwapInsufficientLiquiditySingleRoute() { + s.fundAliceBalances(100, 0) + + // GIVEN liquidity in pools A<>B, B<>C, C<>D with insufficient liquidity in C<>D + s.SetupMultiplePools( + NewPoolSetup("TokenA", "TokenB", 0, 100, 0, 1), + NewPoolSetup("TokenB", "TokenC", 0, 100, 0, 1), + NewPoolSetup("TokenC", "TokenD", 0, 50, 0, 1), + ) + + // THEN alice multihopswap fails + route := [][]string{{"TokenA", "TokenB", "TokenC", "TokenD"}} + s.aliceMultiHopSwapFails( + types.ErrInsufficientLiquidity, + route, + 100, + math_utils.MustNewPrecDecFromStr("0.9"), + false, + ) +} + +func (s *MsgServerTestSuite) TestMultiHopSwapLimitPriceNotMetSingleRoute() { + s.fundAliceBalances(100, 0) + + // GIVEN liquidity in pools A<>B, B<>C, C<>D with insufficient liquidity in C<>D + s.SetupMultiplePools( + NewPoolSetup("TokenA", "TokenB", 0, 100, 0, 1), + NewPoolSetup("TokenB", "TokenC", 0, 100, 0, 1), + NewPoolSetup("TokenC", "TokenD", 0, 100, 1200, 1), + ) + + // THEN alice multihopswap fails + route := [][]string{{"TokenA", "TokenB", "TokenC", "TokenD"}} + s.aliceMultiHopSwapFails( + types.ErrExitLimitPriceHit, + route, + 50, + math_utils.MustNewPrecDecFromStr("0.9"), + false, + ) +} + +func (s *MsgServerTestSuite) TestMultiHopSwapMultiRouteOneGood() { + s.fundAliceBalances(100, 0) + + // GIVEN viable liquidity in pools A<>B, B<>E, E<>X + s.SetupMultiplePools( + NewPoolSetup("TokenA", "TokenB", 0, 100, 0, 1), + NewPoolSetup("TokenB", "TokenC", 0, 100, 0, 1), + NewPoolSetup("TokenC", "TokenX", 0, 50, 0, 1), + NewPoolSetup("TokenC", "TokenX", 0, 50, 2200, 1), + NewPoolSetup("TokenB", "TokenD", 0, 100, 0, 1), + NewPoolSetup("TokenD", "TokenX", 0, 50, 0, 1), + NewPoolSetup("TokenD", "TokenX", 0, 50, 2200, 1), + NewPoolSetup("TokenB", "TokenE", 0, 100, 0, 1), + NewPoolSetup("TokenE", "TokenX", 0, 100, 0, 1), + ) + + // WHEN alice multihopswaps with three routes the first two routes fail and the third works + routes := [][]string{ + {"TokenA", "TokenB", "TokenC", "TokenX"}, + {"TokenA", "TokenB", "TokenD", "TokenX"}, + {"TokenA", "TokenB", "TokenE", "TokenX"}, + } + s.aliceMultiHopSwaps(routes, 100, math_utils.MustNewPrecDecFromStr("0.9"), false) + + // THEN swap succeeds through route A<>B, B<>E, E<>X + s.assertAccountBalanceWithDenom(s.alice, "TokenA", 0) + s.assertAccountBalanceWithDenom(s.alice, "TokenX", 97) + s.assertLiquidityAtTickWithDenom( + &types.PairID{Token0: "TokenA", Token1: "TokenB"}, + sdk.NewInt(100), + sdk.NewInt(1), + 0, + 1, + ) + s.assertLiquidityAtTickWithDenom( + &types.PairID{Token0: "TokenB", Token1: "TokenE"}, + sdk.NewInt(99), + sdk.NewInt(2), + 0, + 1, + ) + s.assertLiquidityAtTickWithDenom( + &types.PairID{Token0: "TokenE", Token1: "TokenX"}, + sdk.NewInt(98), + sdk.NewInt(3), + 0, + 1, + ) + + // Other pools are unaffected + s.assertLiquidityAtTickWithDenom( + &types.PairID{Token0: "TokenB", Token1: "TokenC"}, + sdk.NewInt(0), + sdk.NewInt(100), + 0, + 1, + ) + s.assertLiquidityAtTickWithDenom( + &types.PairID{Token0: "TokenC", Token1: "TokenX"}, + sdk.NewInt(0), + sdk.NewInt(50), + 0, + 1, + ) + s.assertLiquidityAtTickWithDenom( + &types.PairID{Token0: "TokenC", Token1: "TokenX"}, + sdk.NewInt(0), + sdk.NewInt(50), + 2200, + 1, + ) + s.assertLiquidityAtTickWithDenom( + &types.PairID{Token0: "TokenB", Token1: "TokenD"}, + sdk.NewInt(0), + sdk.NewInt(100), + 0, + 1, + ) + s.assertLiquidityAtTickWithDenom( + &types.PairID{Token0: "TokenD", Token1: "TokenX"}, + sdk.NewInt(0), + sdk.NewInt(50), + 0, + 1, + ) + s.assertLiquidityAtTickWithDenom( + &types.PairID{Token0: "TokenD", Token1: "TokenX"}, + sdk.NewInt(0), + sdk.NewInt(50), + 2200, + 1, + ) +} + +func (s *MsgServerTestSuite) TestMultiHopSwapMultiRouteAllFail() { + s.fundAliceBalances(100, 0) + + // GIVEN liquidity in sufficient liquidity but inadequate prices + s.SetupMultiplePools( + NewPoolSetup("TokenA", "TokenB", 0, 100, 0, 1), + NewPoolSetup("TokenB", "TokenC", 0, 100, 0, 1), + NewPoolSetup("TokenC", "TokenX", 0, 50, 0, 1), + NewPoolSetup("TokenC", "TokenX", 0, 50, 2200, 1), + NewPoolSetup("TokenB", "TokenD", 0, 100, 0, 1), + NewPoolSetup("TokenD", "TokenX", 0, 50, 0, 1), + NewPoolSetup("TokenD", "TokenX", 0, 50, 2200, 1), + NewPoolSetup("TokenB", "TokenE", 0, 50, 0, 1), + NewPoolSetup("TokenE", "TokenX", 0, 50, 2200, 1), + ) + + // WHEN alice multihopswaps with three routes they all fail + routes := [][]string{ + {"TokenA", "TokenB", "TokenC", "TokenX"}, + {"TokenA", "TokenB", "TokenD", "TokenX"}, + {"TokenA", "TokenB", "TokenE", "TokenX"}, + } + + // Then fails with findBestRoute + s.aliceMultiHopSwapFails( + types.ErrExitLimitPriceHit, + routes, + 100, + math_utils.MustNewPrecDecFromStr("0.9"), + true, + ) + + // and with findFirstRoute + + s.aliceMultiHopSwapFails( + types.ErrExitLimitPriceHit, + routes, + 100, + math_utils.MustNewPrecDecFromStr("0.9"), + false, + ) +} + +func (s *MsgServerTestSuite) TestMultiHopSwapMultiRouteFindBestRoute() { + s.fundAliceBalances(100, 0) + + // GIVEN viable liquidity in pools but with a best route through E<>X + s.SetupMultiplePools( + NewPoolSetup("TokenA", "TokenB", 0, 100, 0, 1), + NewPoolSetup("TokenB", "TokenC", 0, 100, 0, 1), + NewPoolSetup("TokenC", "TokenX", 0, 1000, -1000, 1), + NewPoolSetup("TokenB", "TokenD", 0, 100, 0, 1), + NewPoolSetup("TokenD", "TokenX", 0, 1000, -2000, 1), + NewPoolSetup("TokenB", "TokenE", 0, 100, 0, 1), + NewPoolSetup("TokenE", "TokenX", 0, 1000, -3000, 1), + ) + + // WHEN alice multihopswaps with three routes + routes := [][]string{ + {"TokenA", "TokenB", "TokenC", "TokenX"}, + {"TokenA", "TokenB", "TokenD", "TokenX"}, + {"TokenA", "TokenB", "TokenE", "TokenX"}, + } + s.aliceMultiHopSwaps(routes, 100, math_utils.MustNewPrecDecFromStr("0.9"), true) + + // THEN swap succeeds through route A<>B, B<>E, E<>X + + s.assertAccountBalanceWithDenom(s.alice, "TokenA", 0) + s.assertAccountBalanceWithDenom(s.alice, "TokenX", 132) + s.assertLiquidityAtTickWithDenom( + &types.PairID{Token0: "TokenA", Token1: "TokenB"}, + sdk.NewInt(100), + sdk.NewInt(1), + 0, + 1, + ) + s.assertLiquidityAtTickWithDenom( + &types.PairID{Token0: "TokenB", Token1: "TokenE"}, + sdk.NewInt(99), + sdk.NewInt(2), + 0, + 1, + ) + s.assertLiquidityAtTickWithDenom( + &types.PairID{Token0: "TokenE", Token1: "TokenX"}, + sdk.NewInt(98), + sdk.NewInt(868), + -3000, + 1, + ) + + // Other pools are unaffected + s.assertLiquidityAtTickWithDenom( + &types.PairID{Token0: "TokenB", Token1: "TokenC"}, + sdk.NewInt(0), + sdk.NewInt(100), + 0, + 1, + ) + s.assertLiquidityAtTickWithDenom( + &types.PairID{Token0: "TokenC", Token1: "TokenX"}, + sdk.NewInt(0), + sdk.NewInt(1000), + -1000, + 1, + ) + s.assertLiquidityAtTickWithDenom( + &types.PairID{Token0: "TokenB", Token1: "TokenD"}, + sdk.NewInt(0), + sdk.NewInt(100), + 0, + 1, + ) + s.assertLiquidityAtTickWithDenom( + &types.PairID{Token0: "TokenD", Token1: "TokenX"}, + sdk.NewInt(0), + sdk.NewInt(1000), + -2000, + 1, + ) +} + +func (s *MsgServerTestSuite) TestMultiHopSwapLongRouteWithCache() { + s.fundAliceBalances(100, 0) + + // GIVEN viable route from A->B->C...->L but last leg to X only possible through K->M->X + s.SetupMultiplePools( + NewPoolSetup("TokenA", "TokenB", 0, 100, 0, 1), + NewPoolSetup("TokenB", "TokenC", 0, 100, 0, 1), + NewPoolSetup("TokenC", "TokenD", 0, 100, 0, 1), + NewPoolSetup("TokenD", "TokenE", 0, 100, 0, 1), + NewPoolSetup("TokenE", "TokenF", 0, 100, 0, 1), + NewPoolSetup("TokenF", "TokenG", 0, 100, 0, 1), + NewPoolSetup("TokenG", "TokenH", 0, 100, 0, 1), + NewPoolSetup("TokenH", "TokenI", 0, 100, 0, 1), + NewPoolSetup("TokenI", "TokenJ", 0, 100, 0, 1), + NewPoolSetup("TokenJ", "TokenK", 0, 100, 0, 1), + NewPoolSetup("TokenK", "TokenL", 0, 100, 0, 1), + NewPoolSetup("TokenL", "TokenX", 0, 50, 0, 1), + NewPoolSetup("TokenL", "TokenX", 0, 50, 100, 1), + + NewPoolSetup("TokenK", "TokenM", 0, 100, 0, 1), + NewPoolSetup("TokenM", "TokenX", 0, 100, 0, 1), + ) + + // WHEN alice multihopswaps with two overlapping routes with only the last leg different + routes := [][]string{ + { + "TokenA", "TokenB", "TokenC", "TokenD", "TokenE", "TokenF", + "TokenG", "TokenH", "TokenI", "TokenJ", "TokenK", "TokenL", "TokenX", + }, + { + "TokenA", "TokenB", "TokenC", "TokenD", "TokenE", "TokenF", + "TokenG", "TokenH", "TokenI", "TokenJ", "TokenK", "TokenM", "TokenX", + }, + } + s.aliceMultiHopSwaps(routes, 100, math_utils.MustNewPrecDecFromStr("0.8"), true) + + // THEN swap succeeds with second route + s.assertAccountBalanceWithDenom(s.alice, "TokenA", 0) + s.assertAccountBalanceWithDenom(s.alice, "TokenX", 88) + s.assertLiquidityAtTickWithDenom( + &types.PairID{Token0: "TokenM", Token1: "TokenX"}, + sdk.NewInt(89), + sdk.NewInt(12), + 0, + 1, + ) +} + +func (s *MsgServerTestSuite) TestMultiHopSwapEventsEmitted() { + s.fundAliceBalances(100, 0) + + s.SetupMultiplePools( + NewPoolSetup("TokenA", "TokenB", 0, 100, 0, 1), + NewPoolSetup("TokenB", "TokenC", 0, 100, 0, 1), + ) + + route := [][]string{{"TokenA", "TokenB", "TokenC"}} + s.aliceMultiHopSwaps(route, 100, math_utils.MustNewPrecDecFromStr("0.9"), false) + + // 8 tickUpdateEvents are emitted 4x for pool setup 4x for two swaps + keepertest.AssertNEventsEmitted(s.T(), s.ctx, types.TickUpdateEventKey, 8) +} diff --git a/x/dex/keeper/integration_placelimitorder_test.go b/x/dex/keeper/integration_placelimitorder_test.go new file mode 100644 index 000000000..59ce4ad3f --- /dev/null +++ b/x/dex/keeper/integration_placelimitorder_test.go @@ -0,0 +1,771 @@ +package keeper_test + +import ( + "math" + "time" + + abci "github.com/cometbft/cometbft/abci/types" + sdk "github.com/cosmos/cosmos-sdk/types" + sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/neutron-org/neutron/x/dex/types" +) + +// Core tests w/ GTC limitOrders ////////////////////////////////////////////// +func (s *MsgServerTestSuite) TestPlaceLimitOrderInSpread1To0() { + s.fundAliceBalances(50, 50) + + // GIVEN + // create spread around -5, 5 + s.aliceDeposits(NewDeposit(10, 10, 0, 5)) + s.assertAliceBalances(40, 40) + s.assertDexBalances(10, 10) + s.assertCurr1To0(-5) + s.assertCurr0To1(5) + + // WHEN + // place limit order for B at tick -1 + s.aliceLimitSells("TokenA", -1, 10) + s.assertAliceBalances(30, 40) + s.assertDexBalances(20, 10) + + // THEN + // assert currentTick1To0 moved + s.assertCurr1To0(-1) +} + +func (s *MsgServerTestSuite) TestPlaceLimitOrderInSpread0To1() { + s.fundAliceBalances(50, 50) + + // GIVEN + // create spread around -5, 5 + s.aliceDeposits(NewDeposit(10, 10, 0, 5)) + s.assertAliceBalances(40, 40) + s.assertDexBalances(10, 10) + s.assertCurr1To0(-5) + s.assertCurr0To1(5) + + // WHEN + // place limit order for A at tick 1 + s.aliceLimitSells("TokenB", 1, 10) + s.assertAliceBalances(40, 30) + s.assertDexBalances(10, 20) + + // THEN + // assert currentTick0To1 moved + s.assertCurr0To1(1) +} + +func (s *MsgServerTestSuite) TestPlaceLimitOrderInSpreadMinMaxNotAdjusted() { + s.fundAliceBalances(50, 50) + + // GIVEN + // create spread around -5, 5 + s.aliceDeposits(NewDeposit(10, 10, 0, 5)) + s.assertAliceBalances(40, 40) + s.assertDexBalances(10, 10) + + // WHEN + // place limit order for B at tick -1 + s.aliceLimitSells("TokenA", -1, 10) + s.assertAliceBalances(30, 40) + s.assertDexBalances(20, 10) + + // THEN + // assert min, max not moved +} + +func (s *MsgServerTestSuite) TestPlaceLimitOrderOutOfSpread0To1NotAdjusted() { + s.fundAliceBalances(50, 50) + + // GIVEN + // create spread around -1, 1 + s.aliceDeposits(NewDeposit(10, 10, 0, 1)) + s.assertAliceBalances(40, 40) + s.assertDexBalances(10, 10) + s.assertCurr1To0(-1) + s.assertCurr0To1(1) + + // WHEN + // place limit order out of spread (for A at tick 3) + s.aliceLimitSells("TokenB", 3, 10) + s.assertAliceBalances(40, 30) + s.assertDexBalances(10, 20) + + // THEN + // assert currentTick0To1 not moved + s.assertCurr0To1(1) +} + +func (s *MsgServerTestSuite) TestPlaceLimitOrderOutOfSpread1To0NotAdjusted() { + s.fundAliceBalances(50, 50) + + // GIVEN + // create spread around -1, 1 + s.aliceDeposits(NewDeposit(10, 10, 0, 1)) + s.assertAliceBalances(40, 40) + s.assertDexBalances(10, 10) + s.assertCurr1To0(-1) + s.assertCurr0To1(1) + + // WHEN + // place limit order out of spread (for B at tick -3) + s.aliceLimitSells("TokenA", -3, 10) + s.assertAliceBalances(30, 40) + s.assertDexBalances(20, 10) + + // THEN + // assert currentTick1To0 not moved + s.assertCurr1To0(-1) +} + +func (s *MsgServerTestSuite) TestPlaceLimitOrderOutOfSpreadMinAdjusted() { + s.fundAliceBalances(50, 50) + + // GIVEN + // create spread around -1, 1 + s.aliceDeposits(NewDeposit(10, 10, 0, 1)) + s.assertAliceBalances(40, 40) + s.assertDexBalances(10, 10) + s.assertCurr1To0(-1) + s.assertCurr0To1(1) + + // WHEN + // place limit order out of spread (for B at tick -3) + s.aliceLimitSells("TokenA", -3, 10) + s.assertAliceBalances(30, 40) + s.assertDexBalances(20, 10) + + // THEN + // assert min moved +} + +func (s *MsgServerTestSuite) TestPlaceLimitOrderOutOfSpreadMaxAdjusted() { + s.fundAliceBalances(50, 50) + + // GIVEN + // create spread around -1, 1 + s.aliceDeposits(NewDeposit(10, 10, 0, 1)) + s.assertAliceBalances(40, 40) + s.assertDexBalances(10, 10) + s.assertCurr1To0(-1) + s.assertCurr0To1(1) + + // WHEN + // place limit order out of spread (for A at tick 3) + s.aliceLimitSells("TokenB", 3, 10) + s.assertAliceBalances(40, 30) + s.assertDexBalances(10, 20) + + // THEN + // assert max moved +} + +func (s *MsgServerTestSuite) TestPlaceLimitOrderOutOfSpreadMinNotAdjusted() { + s.fundAliceBalances(50, 50) + + // GIVEN + // create spread around -1, 1 + s.aliceDeposits(NewDeposit(10, 10, 0, 1)) + s.assertAliceBalances(40, 40) + s.assertDexBalances(10, 10) + s.assertCurr1To0(-1) + s.assertCurr0To1(1) + // deposit new min at -5 + s.aliceDeposits(NewDeposit(10, 0, 0, 5)) + s.assertAliceBalances(30, 40) + s.assertDexBalances(20, 10) + + // WHEN + // place limit order in spread (for B at tick -3) + s.aliceLimitSells("TokenA", -3, 10) + s.assertAliceBalances(20, 40) + s.assertDexBalances(30, 10) + + // THEN + // assert min not moved +} + +func (s *MsgServerTestSuite) TestPlaceLimitOrderOutOfSpreadMaxNotAdjusted() { + s.fundAliceBalances(50, 50) + + // GIVEN + // create spread around -1, 1 + s.aliceDeposits(NewDeposit(10, 10, 0, 1)) + s.assertAliceBalances(40, 40) + s.assertDexBalances(10, 10) + s.assertCurr1To0(-1) + s.assertCurr0To1(1) + // deposit new max at 5 + s.aliceDeposits(NewDeposit(0, 10, 0, 5)) + s.assertAliceBalances(40, 30) + s.assertDexBalances(10, 20) + + // WHEN + // place limit order in spread (for A at tick 3) + s.aliceLimitSells("TokenB", 3, 10) + s.assertAliceBalances(40, 20) + s.assertDexBalances(10, 30) + + // THEN + // assert max not moved +} + +func (s *MsgServerTestSuite) TestPlaceLimitOrderExistingLiquidityA() { + s.fundAliceBalances(50, 50) + + // GIVEN + // deposit 10 of token A at tick 0 fee 1 + s.aliceLimitSells("TokenA", -1, 10) + s.assertAliceBalances(40, 50) + s.assertDexBalances(10, 0) + s.assertLimitLiquidityAtTick("TokenA", -1, 10) + s.assertAliceLimitLiquidityAtTick("TokenA", 10, -1) + s.assertCurr1To0(-1) + s.assertCurr0To1(math.MaxInt64) + + // // WHEN + // // place limit order on same tick (for B at tick -1) + // s.aliceLimitSells("TokenA", -1, 10) + + // // THEN + // // assert 20 of token A deposited at tick 0 fee 0 and ticks unchanged + // s.assertLimitLiquidityAtTick("TokenA", -1, 20) + // s.assertAliceLimitLiquidityAtTick("TokenA", 20, -1) + // s.assertAliceBalances(30, 50) + // s.assertDexBalances(20, 0) + // s.assertCurr1To0(-1) + // s.assertCurr0To1(math.MaxInt64) +} + +func (s *MsgServerTestSuite) TestPlaceLimitOrderExistingLiquidityB() { + s.fundAliceBalances(50, 50) + + // GIVEN + // deposit 10 of token B at tick 1 fee 0 + s.aliceLimitSells("TokenB", 1, 10) + s.assertAliceBalances(50, 40) + s.assertDexBalances(0, 10) + s.assertLimitLiquidityAtTick("TokenB", 1, 10) + s.assertAliceLimitLiquidityAtTick("TokenB", 10, 1) + s.assertCurr1To0(math.MinInt64) + s.assertCurr0To1(1) + + // WHEN + // place limit order on same tick (for A at tick 1) + s.aliceLimitSells("TokenB", 1, 10) + + // THEN + // assert 20 of token B deposited at tick 0 fee 0 and ticks unchanged + s.assertLimitLiquidityAtTick("TokenB", 1, 20) + s.assertAliceLimitLiquidityAtTick("TokenB", 20, 1) + s.assertAliceBalances(50, 30) + s.assertDexBalances(0, 20) + s.assertCurr1To0(math.MinInt64) + s.assertCurr0To1(1) +} + +func (s *MsgServerTestSuite) TestPlaceLimitOrderNoLOPlaceLODoesntIncrementPlaceTrancheKey() { + s.fundAliceBalances(50, 50) + + // GIVEN + // no previous LO on existing tick + s.aliceDeposits(NewDeposit(10, 0, 0, 1)) + s.assertPoolLiquidity(10, 0, 0, 1) + s.assertFillAndPlaceTrancheKeys("TokenA", -1, "", "") + + // WHEN + // placing order on same tick + trancheKey := s.aliceLimitSells("TokenA", -1, 10) + + // THEN + // fill and place tranche keys don't change + s.assertFillAndPlaceTrancheKeys("TokenA", -1, trancheKey, trancheKey) +} + +func (s *MsgServerTestSuite) TestPlaceLimitOrderUnfilledLOPlaceLODoesntIncrementPlaceTrancheKey() { + s.fundAliceBalances(50, 50) + + // GIVEN + // unfilled limit order exists on tick -1 + trancheKey := s.aliceLimitSells("TokenA", -1, 10) + s.assertLimitLiquidityAtTick("TokenA", -1, 10) + s.assertFillAndPlaceTrancheKeys("TokenA", -1, trancheKey, trancheKey) + + // WHEN + // placing order on same tick + s.aliceLimitSells("TokenA", -1, 10) + + // THEN + // fill and place tranche keys don't change + s.assertFillAndPlaceTrancheKeys("TokenA", -1, trancheKey, trancheKey) +} + +func (s *MsgServerTestSuite) TestPlaceLimitOrderPartiallyFilledLOPlaceLOIncrementsPlaceTrancheKey() { + s.fundAliceBalances(50, 50) + s.fundBobBalances(50, 50) + + // GIVEN + // partially filled limit order exists on tick -1 + trancheKey0 := s.aliceLimitSells("TokenA", -1, 10) + s.bobLimitSells("TokenB", -10, 5, types.LimitOrderType_FILL_OR_KILL) + s.assertFillAndPlaceTrancheKeys("TokenA", -1, trancheKey0, "") + + // WHEN + // placing order on same tick + trancheKey1 := s.aliceLimitSells("TokenA", -1, 10) + + // THEN + // place tranche key changes + s.assertFillAndPlaceTrancheKeys("TokenA", -1, trancheKey0, trancheKey1) +} + +func (s *MsgServerTestSuite) TestPlaceLimitOrderFilledLOPlaceLODoesntIncrementsPlaceTrancheKey() { + s.fundAliceBalances(50, 50) + s.fundBobBalances(50, 50) + + // GIVEN + // filled LO with partially filled place tranche + trancheKey0 := s.aliceLimitSells("TokenA", -1, 10) + s.bobLimitSells("TokenB", -10, 10, types.LimitOrderType_FILL_OR_KILL) + trancheKey1 := s.aliceLimitSells("TokenA", -1, 10) + s.assertFillAndPlaceTrancheKeys("TokenA", -1, trancheKey0, trancheKey1) + + // WHEN + // placing order on same tick + s.aliceLimitSells("TokenA", -1, 5) + + // THEN + // fill and place tranche keys don't change + s.assertFillAndPlaceTrancheKeys("TokenA", -1, trancheKey0, trancheKey1) +} + +func (s *MsgServerTestSuite) TestPlaceLimitOrderInsufficientFunds() { + // GIVEN + // alice has no funds + s.assertAliceBalances(0, 0) + + // WHEN + // place limit order selling non zero amount of token A for token B + // THEN + // deposit should fail with InsufficientFunds error + + err := sdkerrors.ErrInsufficientFunds + s.assertAliceLimitSellFails(err, "TokenA", 0, 10) +} + +func (s *MsgServerTestSuite) TestLimitOrderPartialFillDepositCancel() { + s.fundAliceBalances(100, 100) + s.fundBobBalances(100, 100) + s.assertDexBalances(0, 0) + + trancheKey0 := s.aliceLimitSells("TokenB", 0, 50) + + s.assertAliceBalances(100, 50) + s.assertBobBalances(100, 100) + s.assertDexBalances(0, 50) + s.assertCurrentTicks(math.MinInt64, 0) + + s.bobLimitSells("TokenA", 10, 10, types.LimitOrderType_IMMEDIATE_OR_CANCEL) + + s.assertAliceBalances(100, 50) + s.assertBobBalances(90, 110) + s.assertDexBalances(10, 40) + s.assertCurrentTicks(math.MinInt64, 0) + + trancheKey1 := s.aliceLimitSells("TokenB", 0, 50) + + s.assertAliceBalances(100, 0) + s.assertBobBalances(90, 110) + s.assertDexBalances(10, 90) + s.assertCurrentTicks(math.MinInt64, 0) + + s.aliceCancelsLimitSell(trancheKey0) + + s.assertAliceBalances(100, 40) + s.assertBobBalances(90, 110) + s.assertDexBalances(10, 50) + s.assertCurrentTicks(math.MinInt64, 0) + + s.bobLimitSells("TokenA", 10, 10, types.LimitOrderType_FILL_OR_KILL) + + s.assertAliceBalances(100, 40) + s.assertBobBalances(80, 120) + s.assertDexBalances(20, 40) + + s.aliceCancelsLimitSell(trancheKey1) + + s.assertAliceBalances(100, 80) + s.assertBobBalances(80, 120) + s.assertDexBalances(20, 0) + + s.aliceWithdrawsLimitSell(trancheKey0) + + s.assertAliceBalances(110, 80) + s.assertBobBalances(80, 120) + s.assertDexBalances(10, 0) + + s.aliceWithdrawsLimitSell(trancheKey1) + + s.assertAliceBalances(120, 80) + s.assertBobBalances(80, 120) + s.assertDexBalances(0, 0) +} + +// Fill Or Kill limit orders /////////////////////////////////////////////////////////// +func (s *MsgServerTestSuite) TestPlaceLimitOrderFoKNoLiq() { + s.fundAliceBalances(10, 0) + // GIVEN no liquidity + // THEN alice's LimitOrder fails + s.assertAliceLimitSellFails( + types.ErrFoKLimitOrderNotFilled, + "TokenA", + 0, + 10, + types.LimitOrderType_FILL_OR_KILL, + ) + + s.assertDexBalances(0, 0) + s.assertAliceBalances(10, 0) +} + +func (s *MsgServerTestSuite) TestPlaceLimitOrderFoKWithLPFills() { + s.fundAliceBalances(10, 0) + s.fundBobBalances(0, 20) + // GIVEN LP liq at tick -1 + s.bobDeposits(NewDeposit(0, 20, -1, 1)) + // WHEN alice submits FoK limitOrder + s.aliceLimitSells("TokenA", 0, 10, types.LimitOrderType_FILL_OR_KILL) + // THEN alice's LimitOrder fills via swap and auto-withdraws + s.assertDexBalances(10, 10) + s.assertAliceBalances(0, 10) + + // No maker LO is placed + s.assertFillAndPlaceTrancheKeys("TokenA", 1, "", "") + s.assertLimitLiquidityAtTick("TokenA", 1, 0) +} + +func (s *MsgServerTestSuite) TestPlaceLimitOrderFoKFailsWithInsufficientLiq() { + s.fundAliceBalances(10, 0) + s.fundBobBalances(0, 20) + // GIVEN LP liq at tick -1 of 9 tokenB + s.bobDeposits(NewDeposit(0, 9, -1, 1)) + // WHEN alice submits FoK limitOrder for 10 at tick 0 it fails + s.assertAliceLimitSellFails( + types.ErrFoKLimitOrderNotFilled, + "TokenA", + 0, + 10, + types.LimitOrderType_FILL_OR_KILL, + ) +} + +func (s *MsgServerTestSuite) TestPlaceLimitOrder0FoKFailsWithLowLimit() { + s.fundAliceBalances(10, 0) + s.fundBobBalances(0, 20) + // GIVEN LP liq at tick -1 of 20 tokenB + s.bobDeposits(NewDeposit(0, 20, -1, 1)) + // WHEN alice submits FoK limitOrder for 10 at tick -1 it fails + s.assertAliceLimitSellFails( + types.ErrFoKLimitOrderNotFilled, + "TokenA", + -1, + 10, + types.LimitOrderType_FILL_OR_KILL, + ) +} + +func (s *MsgServerTestSuite) TestPlaceLimitOrder1FoKFailsWithHighLimit() { + s.fundAliceBalances(0, 10) + s.fundBobBalances(20, 0) + // GIVEN LP liq at tick 20 of 20 tokenA + s.bobDeposits(NewDeposit(20, 0, 20, 1)) + // WHEN alice submits FoK limitOrder for 10 at tick -1 it fails + s.assertAliceLimitSellFails( + types.ErrFoKLimitOrderNotFilled, + "TokenB", + 21, + 10, + types.LimitOrderType_FILL_OR_KILL, + ) +} + +func (s *MsgServerTestSuite) TestPlaceLimitOrderFoK0TotalAmountInNotUsed() { + s.fundAliceBalances(9998, 0) + s.fundBobBalances(0, 5000) + // GIVEN LP liq at tick 20,000 & 20,001 of 1000 TokenB + s.bobDeposits( + NewDeposit(0, 1000, 20000, 1), + NewDeposit(0, 1000, 20001, 1), + ) + // WHEN alice submits FoK limitOrder for 9998 it succeeds + // even though trueAmountIn < specifiedAmountIn due to rounding + s.aliceLimitSells("TokenA", 21000, 9998, types.LimitOrderType_FILL_OR_KILL) + s.assertAliceBalances(6, 1352) +} + +func (s *MsgServerTestSuite) TestPlaceLimitOrderFoK1TotalAmountInNotUsed() { + s.fundAliceBalances(0, 9998) + s.fundBobBalances(5000, 0) + // GIVEN LP liq at tick -20,000 & -20,001 of 1000 tokenA + s.bobDeposits( + NewDeposit(1000, 0, -20000, 1), + NewDeposit(1000, 0, -20001, 1), + ) + // WHEN alice submits FoK limitOrder for 9998 it succeeds + // even though trueAmountIn < specifiedAmountIn due to rounding + s.aliceLimitSells("TokenB", -21000, 9998, types.LimitOrderType_FILL_OR_KILL) + s.assertAliceBalances(1352, 6) +} + +func (s *MsgServerTestSuite) TestPlaceLimitOrderFoKMaxOutUsed() { + s.fundAliceBalances(0, 50) + s.fundBobBalances(50, 0) + // GIVEN LP 50 TokenA at tick 600 + s.bobDeposits( + NewDeposit(50, 0, 600, 1), + ) + // WHEN alice submits FoK limitOrder of 50 TokenB with maxOut of 20 + s.aliceLimitSellsWithMaxOut("TokenB", 0, 50, 20) + + // THEN alice swap 19 TokenB and gets back 20 TokenA + s.assertAliceBalances(20, 31) +} + +func (s *MsgServerTestSuite) TestPlaceLimitOrderFoKMaxOutUsedMultiTick() { + s.fundAliceBalances(0, 50) + s.fundBobBalances(50, 0) + // GIVEN LP 30 TokenA at tick 600-602 + s.bobDeposits( + NewDeposit(10, 0, 600, 1), + NewDeposit(10, 0, 601, 1), + NewDeposit(10, 0, 602, 1), + ) + // WHEN alice submits FoK limitOrder of 50 TokenB with maxOut of 20 + s.aliceLimitSellsWithMaxOut("TokenB", 0, 50, 20) + + // THEN alice swap 20 TokenB and gets back 20 TokenA + s.assertAliceBalances(20, 30) +} + +// Immediate Or Cancel LimitOrders //////////////////////////////////////////////////////////////////// + +func (s *MsgServerTestSuite) TestPlaceLimitOrderIoCNoLiq() { + s.fundAliceBalances(10, 0) + // GIVEN no liquidity + // WHEN alice submits IoC limitOrder + s.aliceLimitSells("TokenA", 0, 10, types.LimitOrderType_IMMEDIATE_OR_CANCEL) + + // THEN alice's LimitOrder is not filled + s.assertDexBalances(0, 0) + s.assertAliceBalances(10, 0) + + // No maker LO is placed + s.assertLimitLiquidityAtTick("TokenA", 1, 0) + s.assertFillAndPlaceTrancheKeys("TokenA", 1, "", "") +} + +func (s *MsgServerTestSuite) TestPlaceLimitOrderIoCWithLPFills() { + s.fundAliceBalances(10, 0) + s.fundBobBalances(0, 20) + // GIVEN LP liq at tick -1 + s.bobDeposits(NewDeposit(0, 20, -1, 1)) + // WHEN alice submits IoC limitOrder + s.aliceLimitSells("TokenA", 0, 10, types.LimitOrderType_IMMEDIATE_OR_CANCEL) + + // THEN alice's LimitOrder fills via swap and auto-withdraws + s.assertDexBalances(10, 10) + s.assertAliceBalances(0, 10) + + // No maker LO is placed + s.assertLimitLiquidityAtTick("TokenA", 1, 0) + s.assertFillAndPlaceTrancheKeys("TokenA", 1, "", "") +} + +func (s *MsgServerTestSuite) TestPlaceLimitOrderIoCWithLPPartialFill() { + s.fundAliceBalances(10, 0) + s.fundBobBalances(0, 20) + // GIVEN LP of 5 tokenB at tick -1 + s.bobDeposits(NewDeposit(0, 5, -1, 1)) + // WHEN alice submits IoC limitOrder for 10 tokenA + s.aliceLimitSells("TokenA", 0, 10, types.LimitOrderType_IMMEDIATE_OR_CANCEL) + + // THEN alice's LimitOrder swaps 5 TokenA and auto-withdraws + s.assertDexBalances(5, 0) + s.assertAliceBalances(5, 5) + + // No maker LO is placed + s.assertFillAndPlaceTrancheKeys("TokenA", 1, "", "") + s.assertLimitLiquidityAtTick("TokenA", 1, 0) +} + +func (s *MsgServerTestSuite) TestPlaceLimitOrderIoCWithLPNoFill() { + s.fundAliceBalances(10, 0) + s.fundBobBalances(0, 20) + // GIVEN LP of 5 tokenB at tick -1 + s.bobDeposits(NewDeposit(0, 5, -1, 1)) + // WHEN alice submits IoC limitOrder for 10 tokenA below current 0To1 price + s.aliceLimitSells("TokenA", -1, 10, types.LimitOrderType_IMMEDIATE_OR_CANCEL) + + // THEN alice's LimitOrder doesn't fill and is canceled + s.assertDexBalances(0, 5) + s.assertAliceBalances(10, 0) + // No maker LO is placed + s.assertFillAndPlaceTrancheKeys("TokenA", 1, "", "") + s.assertLimitLiquidityAtTick("TokenA", 1, 0) +} + +// Just In Time Limit Orders ////////////////////////////////////////////////// + +func (s *MsgServerTestSuite) TestPlaceLimitOrderJITFills() { + s.fundAliceBalances(10, 0) + s.fundBobBalances(0, 20) + + // GIVEN Alice submits JIT limitOrder for 10 tokenA at tick 0 + trancheKey := s.aliceLimitSells("TokenA", 0, 10, types.LimitOrderType_JUST_IN_TIME) + s.assertLimitLiquidityAtTick("TokenA", 0, 10) + s.assertAliceBalances(0, 0) + + // WHEN bob swaps through all the liquidity + s.bobLimitSells("TokenB", -10, 10, types.LimitOrderType_FILL_OR_KILL) + + // THEN all liquidity is depleted + s.assertLimitLiquidityAtTick("TokenA", 0, 0) + // Alice can withdraw 10 TokenB + s.aliceWithdrawsLimitSell(trancheKey) + s.assertAliceBalances(0, 10) +} + +func (s *MsgServerTestSuite) TestPlaceLimitOrderJITBehindEnemyLines() { + s.fundAliceBalances(10, 0) + s.fundBobBalances(0, 20) + + // GIVEN 10 LP liquidity for token exists at tick 0 + s.bobDeposits(NewDeposit(0, 10, 0, 1)) + + // WHEN alice places a JIT limit order for TokenA at tick 1 (above enemy lines) + trancheKey := s.aliceLimitSells("TokenA", 1, 10, types.LimitOrderType_JUST_IN_TIME) + s.assertLimitLiquidityAtTick("TokenA", 1, 10) + s.assertAliceBalances(0, 0) + // AND bob swaps through all the liquidity + s.bobLimitSells("TokenB", -10, 10, types.LimitOrderType_FILL_OR_KILL) + + // THEN all liquidity is depleted + s.assertLimitLiquidityAtTick("TokenA", 1, 0) + // Alice can withdraw 9 TokenB + s.aliceWithdrawsLimitSell(trancheKey) + s.assertAliceBalances(0, 9) +} + +func (s *MsgServerTestSuite) TestPlaceLimitOrderJITNextBlock() { + s.fundAliceBalances(10, 0) + s.fundBobBalances(0, 20) + + // GIVEN Alice submits JIT limitOrder for 10 tokenA at tick 0 for block N + trancheKey := s.aliceLimitSells("TokenA", 0, 10, types.LimitOrderType_JUST_IN_TIME) + s.assertLimitLiquidityAtTick("TokenA", 0, 10) + s.assertAliceBalances(0, 0) + + // WHEN we move to block N+1 + s.nextBlockWithTime(time.Now()) + s.app.EndBlock(abci.RequestEndBlock{Height: 0}) + + // THEN there is no liquidity available + s.assertLimitLiquidityAtTick("TokenA", 0, 0) + // Alice can withdraw the entirety of the unfilled limitOrder + s.aliceWithdrawsLimitSell(trancheKey) + s.assertAliceBalances(10, 0) +} + +// GoodTilLimitOrders ////////////////////////////////////////////////// + +func (s *MsgServerTestSuite) TestPlaceLimitOrderGoodTilFills() { + s.fundAliceBalances(10, 0) + s.fundBobBalances(0, 20) + tomorrow := time.Now().AddDate(0, 0, 1) + // GIVEN Alice submits JIT limitOrder for 10 tokenA expiring tomorrow + trancheKey := s.aliceLimitSellsGoodTil("TokenA", 0, 10, tomorrow) + s.assertLimitLiquidityAtTick("TokenA", 0, 10) + s.assertAliceBalances(0, 0) + + // WHEN bob swaps through all the liquidity + s.bobLimitSells("TokenB", -10, 10, types.LimitOrderType_FILL_OR_KILL) + + // THEN all liquidity is depleted + s.assertLimitLiquidityAtTick("TokenA", 0, 0) + // Alice can withdraw 10 TokenB + s.aliceWithdrawsLimitSell(trancheKey) + s.assertAliceBalances(0, 10) +} + +func (s *MsgServerTestSuite) TestPlaceLimitOrderGoodTilExpires() { + s.fundAliceBalances(10, 0) + s.fundBobBalances(0, 20) + tomorrow := time.Now().AddDate(0, 0, 1) + // GIVEN Alice submits JIT limitOrder for 10 tokenA expiring tomorrow + trancheKey := s.aliceLimitSellsGoodTil("TokenA", 0, 10, tomorrow) + s.assertLimitLiquidityAtTick("TokenA", 0, 10) + s.assertAliceBalances(0, 0) + + // When two days go by and multiple blocks are created (ie. purge is run) + s.nextBlockWithTime(time.Now().AddDate(0, 0, 2)) + s.app.EndBlock(abci.RequestEndBlock{Height: 0}) + // THEN there is no liquidity available + s.assertLimitLiquidityAtTick("TokenA", 0, 0) + // Alice can withdraw the entirety of the unfilled limitOrder + s.aliceWithdrawsLimitSell(trancheKey) + s.assertAliceBalances(10, 0) +} + +func (s *MsgServerTestSuite) TestPlaceLimitOrderGoodTilExpiresNotPurged() { + // This is testing the case where the limitOrder has expired but has not yet been purged + s.fundAliceBalances(10, 0) + s.fundBobBalances(0, 20) + tomorrow := time.Now().AddDate(0, 0, 1) + // GIVEN Alice submits JIT limitOrder for 10 tokenA expiring tomorrow + trancheKey := s.aliceLimitSellsGoodTil("TokenA", 0, 10, tomorrow) + s.assertLimitLiquidityAtTick("TokenA", 0, 10) + s.assertAliceBalances(0, 0) + + // When two days go by + // for simplicity sake we never run endBlock, it reality it would be run, but gas limit would be hit + s.nextBlockWithTime(time.Now().AddDate(0, 0, 2)) + + // THEN there is no liquidity available + s.assertLimitLiquidityAtTick("TokenA", 0, 0) + // Alice can cancel the entirety of the unfilled limitOrder + s.aliceCancelsLimitSell(trancheKey) + s.assertAliceBalances(10, 0) +} + +func (s *MsgServerTestSuite) TestPlaceLimitOrderGoodTilHandlesTimezoneCorrectly() { + s.fundAliceBalances(10, 0) + timeInPST, _ := time.Parse(time.RFC3339, "2050-01-02T15:04:05-08:00") + trancheKey := s.aliceLimitSellsGoodTil("TokenA", 0, 10, timeInPST) + tranche := s.app.DexKeeper.GetLimitOrderTranche(s.ctx, &types.LimitOrderTrancheKey{ + TradePairID: defaultTradePairID1To0, + TickIndexTakerToMaker: 0, + TrancheKey: trancheKey, + }) + + s.Assert().Equal(tranche.ExpirationTime.Unix(), timeInPST.Unix()) +} + +func (s *MsgServerTestSuite) TestPlaceLimitOrderGoodTilAlreadyExpiredFails() { + s.fundAliceBalances(10, 0) + + now := time.Now() + yesterday := time.Now().AddDate(0, 0, -1) + s.nextBlockWithTime(now) + + _, err := s.msgServer.PlaceLimitOrder(s.goCtx, &types.MsgPlaceLimitOrder{ + Creator: s.alice.String(), + Receiver: s.alice.String(), + TokenIn: "TokenA", + TokenOut: "TokenB", + TickIndexInToOut: 0, + AmountIn: sdk.NewInt(50), + OrderType: types.LimitOrderType_GOOD_TIL_TIME, + ExpirationTime: &yesterday, + }) + s.Assert().ErrorIs(err, types.ErrExpirationTimeInPast) +} diff --git a/x/dex/keeper/integration_withdraw_multi_test.go b/x/dex/keeper/integration_withdraw_multi_test.go new file mode 100644 index 000000000..ae4485ff9 --- /dev/null +++ b/x/dex/keeper/integration_withdraw_multi_test.go @@ -0,0 +1,54 @@ +package keeper_test + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/neutron-org/neutron/x/dex/types" +) + +func (s *MsgServerTestSuite) TestWithdrawMultiFailure() { + s.fundAliceBalances(50, 50) + // GIVEN + // alice deposits 5 A, 5 B in tick 0 fee 0 + s.aliceDeposits(NewDeposit(5, 5, 0, 1)) + s.assertAliceShares(0, 1, 10) + s.assertLiquidityAtTick(sdk.NewInt(5), sdk.NewInt(5), 0, 1) + s.assertAliceBalances(45, 45) + s.assertDexBalances(5, 5) + + // WHEN + // alice withdraws 6 shares, then 10 shares + // THEN + // failure on second withdraw (insufficient shares) will trigger ErrNotEnoughShares + err := types.ErrInsufficientShares + s.aliceWithdrawFails(err, + NewWithdrawal(6, 0, 1), + NewWithdrawal(10, 0, 1), + ) +} + +func (s *MsgServerTestSuite) TestWithdrawMultiSuccess() { + s.fundAliceBalances(50, 50) + + // GIVEN + // alice deposits 5 A, 5 B in tick 0 fee 1 + s.aliceDeposits(NewDeposit(5, 5, 0, 1)) + s.assertAliceShares(0, 1, 10) + s.assertLiquidityAtTick(sdk.NewInt(5), sdk.NewInt(5), 0, 1) + s.assertAliceBalances(45, 45) + s.assertDexBalances(5, 5) + + // WHEN + // alice withdraws 6 shares, then 4 shares + s.aliceWithdraws( + NewWithdrawal(6, 0, 1), + NewWithdrawal(4, 0, 1), + ) + + // THEN + // both withdraws should work + // i.e. no shares remaining and entire balance transferred out + s.assertAliceShares(0, 1, 0) + s.assertLiquidityAtTick(sdk.ZeroInt(), sdk.ZeroInt(), 0, 1) + s.assertAliceBalances(50, 50) + s.assertDexBalances(0, 0) +} diff --git a/x/dex/keeper/integration_withdraw_test.go b/x/dex/keeper/integration_withdraw_test.go new file mode 100644 index 000000000..afd7f4ece --- /dev/null +++ b/x/dex/keeper/integration_withdraw_test.go @@ -0,0 +1,263 @@ +package keeper_test + +import ( + "math" + + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/neutron-org/neutron/x/dex/types" +) + +func (s *MsgServerTestSuite) TestPartialWithdrawOnlyA() { + s.fundAliceBalances(50, 50) + // CASE + // Alice deposits 10 of A at tick 0, fee tier 0 + // and then withdraws only 5 shares of A + + // DATA + // Alice should be credited 10 total shares + // Shares = amount0 + price1to0 * amount1 + // Shares = 10 + 0 * 0 = 10 + s.aliceDeposits(NewDeposit(10, 0, 0, 1)) + + s.assertAliceBalances(40, 50) + s.assertDexBalances(10, 0) + s.assertCurr1To0(-1) + s.assertCurr0To1(math.MaxInt64) + + s.aliceWithdraws(NewWithdrawal(5, 0, 1)) + + s.assertAliceBalances(45, 50) + s.assertDexBalances(5, 0) + s.assertCurr1To0(-1) + s.assertCurr0To1(math.MaxInt64) +} + +func (s *MsgServerTestSuite) TestPartialWithdrawOnlyB() { + s.fundAliceBalances(50, 50) + // CASE + // Alice deposits 10 of B at tick 0, fee tier 0 + // and then withdraws only 5 shares of B + + // DATA + // Alice should be credited 10 total shares + // Shares = amount0 + price1to0 * amount1 + // Shares = 10 + 0 * 0 = 10 + s.aliceDeposits(NewDeposit(0, 10, 0, 1)) + + s.assertAliceBalances(50, 40) + s.assertDexBalances(0, 10) + s.assertCurr1To0(math.MinInt64) + s.assertCurr0To1(1) + + s.aliceWithdraws(NewWithdrawal(5, 0, 1)) + + s.assertAliceBalances(50, 45) + s.assertDexBalances(0, 5) + s.assertCurr1To0(math.MinInt64) + s.assertCurr0To1(1) +} + +func (s *MsgServerTestSuite) TestFullWithdrawOnlyB() { + s.fundAliceBalances(50, 50) + // CASE + // Alice deposits 10 of B at tick 0, fee tier 0 + // and then withdraws 10 shares of B + + // DATA + // Alice should be credited 10 total shares + // Shares = amount0 + price1to0 * amount1 + // Shares = 10 + 0 * 0 = 10 + s.aliceDeposits(NewDeposit(0, 10, 0, 1)) + + s.assertAliceBalances(50, 40) + s.assertDexBalances(0, 10) + s.assertCurr1To0(math.MinInt64) + s.assertCurr0To1(1) + + s.aliceWithdraws(NewWithdrawal(10, 0, 1)) + + s.assertAliceBalances(50, 50) + s.assertDexBalances(0, 0) + s.assertCurr1To0(math.MinInt64) + s.assertCurr0To1(math.MaxInt64) +} + +func (s *MsgServerTestSuite) TestCurrentTickUpdatesAfterDoubleSidedThenSingleSidedDepositAndPartialWithdrawal() { + s.fundAliceBalances(50, 50) + // CASE + // Alice deposits 10 of A and B with a spread (fee) of +- 3 ticks + // Alice then deposits 10 A with a spread (fee) of -1 ticks + // Finally Alice withdraws from the first pool they deposited to + + s.aliceDeposits(NewDeposit(10, 10, 0, 3)) + + s.assertAliceBalances(40, 40) + s.assertDexBalances(10, 10) + s.assertCurr1To0(-3) + s.assertCurr0To1(3) + + s.aliceDeposits(NewDeposit(10, 0, 0, 1)) + + s.assertAliceBalances(30, 40) + s.assertDexBalances(20, 10) + s.assertCurr1To0(-1) + s.assertCurr0To1(3) + + // DEBUG + s.aliceWithdraws(NewWithdrawal(10, 0, 3)) + + s.assertAliceBalances(35, 45) + s.assertDexBalances(15, 5) + s.assertCurr1To0(-1) + s.assertCurr0To1(3) +} + +func (s *MsgServerTestSuite) TestCurrentTickUpdatesAfterDoubleSidedThenSingleSidedDepositAndFulllWithdrawal() { + s.fundAliceBalances(50, 50) + // CASE + // Alice deposits 10 of A and B with a spread (fee) of +- 3 ticks + // Alice then deposits 10 A with a spread (fee) of -1 ticks + // Finally Alice withdraws from the first pool they deposited to + + s.aliceDeposits(NewDeposit(10, 10, 0, 3)) + + s.assertAliceBalances(40, 40) + s.assertDexBalances(10, 10) + s.assertCurr1To0(-3) + s.assertCurr0To1(3) + + s.aliceDeposits(NewDeposit(10, 0, 0, 1)) + + s.assertAliceBalances(30, 40) + s.assertDexBalances(20, 10) + s.assertCurr1To0(-1) + s.assertCurr0To1(3) + + s.aliceWithdraws(NewWithdrawal(20, 0, 3)) + + s.assertAliceBalances(40, 50) + s.assertDexBalances(10, 0) + s.assertCurr1To0(-1) + s.assertCurr0To1(math.MaxInt64) +} + +func (s *MsgServerTestSuite) TestTwoFullDoubleSidedRebalancedAtooMuchTick0() { + s.fundAliceBalances(50, 50) + s.fundBobBalances(50, 50) + // CASE + // Alice deposits 5 of A and 10 of B at tick 0, fee tier 0 + // Bob tries to deposit 10 of A and 10 of B + // Thus Bob should only end up depositing 5 of A and 10 of B + // Alice then withdraws + // David then withdraws + + s.aliceDepositsWithOptions(NewDepositWithOptions(5, 10, 0, 1, DepositOptions{DisableAutoswap: true})) + + s.assertAliceBalances(45, 40) + s.assertBobBalances(50, 50) + s.assertDexBalances(5, 10) + s.assertCurr1To0(-1) + s.assertCurr0To1(1) + + s.bobDepositsWithOptions(NewDepositWithOptions(10, 10, 0, 1, DepositOptions{DisableAutoswap: true})) + + s.assertAliceBalances(45, 40) + s.assertBobBalances(45, 40) + s.assertDexBalances(10, 20) + s.assertCurr1To0(-1) + s.assertCurr0To1(1) + + s.aliceWithdraws(NewWithdrawal(15, 0, 1)) + + s.assertAliceBalances(50, 50) + s.assertBobBalances(45, 40) + s.assertDexBalances(5, 10) + s.assertCurr1To0(-1) + s.assertCurr0To1(1) + + s.bobWithdraws(NewWithdrawal(15, 0, 1)) + + s.assertAliceBalances(50, 50) + s.assertBobBalances(50, 50) + s.assertDexBalances(0, 0) + s.assertCurr1To0(math.MinInt64) + s.assertCurr0To1(math.MaxInt64) +} + +func (s *MsgServerTestSuite) TestTwoFullDoubleSidedRebalancedBtooMuchTick0() { + s.fundAliceBalances(50, 50) + s.fundBobBalances(50, 50) + // CASE + // Alice deposits 10 of B and 5 of Aat tick 0, fee tier 0 + // Bob tries to deposit 10 of A and 10 of B + // Thus Bob should only end up depositing 5 of A and 10 of B + // Alice then withdraws + // David then withdraws + + s.aliceDepositsWithOptions(NewDepositWithOptions(10, 5, 0, 1, DepositOptions{DisableAutoswap: true})) + + s.assertAliceBalances(40, 45) + s.assertBobBalances(50, 50) + s.assertDexBalances(10, 5) + s.assertCurr1To0(-1) + s.assertCurr0To1(1) + + s.bobDepositsWithOptions(NewDepositWithOptions(10, 10, 0, 1, DepositOptions{DisableAutoswap: true})) + + s.assertAliceBalances(40, 45) + s.assertBobBalances(40, 45) + s.assertDexBalances(20, 10) + s.assertCurr1To0(-1) + s.assertCurr0To1(1) + + s.aliceWithdraws(NewWithdrawal(15, 0, 1)) + + s.assertAliceBalances(50, 50) + s.assertBobBalances(40, 45) + s.assertDexBalances(10, 5) + s.assertCurr1To0(-1) + s.assertCurr0To1(1) + + s.bobWithdraws(NewWithdrawal(15, 0, 1)) + + s.assertAliceBalances(50, 50) + s.assertBobBalances(50, 50) + s.assertDexBalances(0, 0) + s.assertCurr1To0(math.MinInt64) + s.assertCurr0To1(math.MaxInt64) +} + +func (s *MsgServerTestSuite) TestWithdrawalFailsWhenNotEnoughShares() { + s.fundAliceBalances(100, 0) + + // IF Alice deposits 100 + s.aliceDeposits(NewDeposit(100, 0, 0, 1)) + + // WHEN Alice tries to withdraw 200 + // THEN ensure error is thrown and Alice and Dex balances remain unchanged + err := types.ErrInsufficientShares + s.aliceWithdrawFails(err, NewWithdrawal(200, 0, 1)) +} + +func (s *MsgServerTestSuite) TestWithdrawalFailsWithNonExistentPair() { + s.fundAliceBalances(100, 0) + + // IF Alice Deposists 100 + s.aliceDeposits(NewDeposit(100, 0, 0, 1)) + + // WHEN Alice tries to withdraw from a nonexistent tokenPair + _, err := s.msgServer.Withdrawal(s.goCtx, &types.MsgWithdrawal{ + Creator: s.alice.String(), + Receiver: s.alice.String(), + TokenA: "TokenX", + TokenB: "TokenZ", + SharesToRemove: []sdk.Int{sdk.NewInt(10)}, + TickIndexesAToB: []int64{0}, + Fees: []uint64{0}, + }) + + // NOTE: As code is currently written we hit not enough shares check + // before validating pair existence. This is correct from a + // UX perspective --users should not care whether tick is initialized + s.Assert().ErrorIs(err, types.ErrInsufficientShares) +} diff --git a/x/dex/keeper/integration_withdrawfilled_test.go b/x/dex/keeper/integration_withdrawfilled_test.go new file mode 100644 index 000000000..2ff2cd1a1 --- /dev/null +++ b/x/dex/keeper/integration_withdrawfilled_test.go @@ -0,0 +1,229 @@ +package keeper_test + +import ( + "math" + + "github.com/neutron-org/neutron/x/dex/types" +) + +func (s *MsgServerTestSuite) TestWithdrawFilledSimpleFull() { + s.fundAliceBalances(50, 50) + s.fundBobBalances(50, 50) + // CASE + // Alice places a limit order of A for B + // Bob swaps from B to A + // Alice withdraws the limit order + + trancheKey := s.aliceLimitSells("TokenA", 0, 10) + + s.assertAliceBalances(40, 50) + s.assertBobBalances(50, 50) + s.assertDexBalances(10, 0) + s.assertCurr1To0(0) + s.assertCurr0To1(math.MaxInt64) + + s.bobLimitSells("TokenB", -10, 10, types.LimitOrderType_FILL_OR_KILL) + + s.assertAliceBalances(40, 50) + s.assertBobBalances(60, 40) + s.assertDexBalances(0, 10) + s.assertCurr1To0(math.MinInt64) + s.assertCurr0To1(math.MaxInt64) + + s.aliceWithdrawsLimitSell(trancheKey) + + s.assertAliceBalances(40, 60) + s.assertBobBalances(60, 40) + s.assertDexBalances(0, 0) + s.assertCurr1To0(math.MinInt64) + s.assertCurr0To1(math.MaxInt64) + + // Assert that the LimitOrderTrancheUser has been deleted + _, found := s.app.DexKeeper.GetLimitOrderTrancheUser(s.ctx, s.alice.String(), trancheKey) + s.Assert().False(found) +} + +func (s *MsgServerTestSuite) TestWithdrawFilledPartial() { + s.fundAliceBalances(100, 100) + s.fundBobBalances(100, 100) + + // GIVEN + // alice limit sells 50 B at tick 0 + trancheKey := s.aliceLimitSells("TokenB", 0, 50) + s.assertAliceLimitLiquidityAtTick("TokenB", 50, 0) + // bob market sells 10 A + s.bobLimitSells("TokenA", 10, 10, types.LimitOrderType_FILL_OR_KILL) + // alice has 10 A filled + s.assertAliceLimitFilledAtTickAtIndex("TokenB", 10, 0, trancheKey) + // balances are 50, 100 for alice and 90, 100 for bob + s.assertAliceBalances(100, 50) + s.assertBobBalances(90, 110) + + // WHEN + // alice withdraws filled limit order proceeds from tick 0 tranche 0 + s.aliceWithdrawsLimitSell(trancheKey) + + // THEN + // limit order has been partially filled + s.assertAliceLimitLiquidityAtTick("TokenB", 40, 0) + // the filled reserved have been withdrawn from + s.assertAliceLimitFilledAtTickAtIndex("TokenB", 0, 0, trancheKey) + // balances are 110, 100 for alice and 90, 100 for bob + s.assertAliceBalances(110, 50) + s.assertBobBalances(90, 110) + + // the LimitOrderTrancheUser still exists + _, found := s.app.DexKeeper.GetLimitOrderTrancheUser(s.ctx, s.alice.String(), trancheKey) + s.Assert().True(found) +} + +func (s *MsgServerTestSuite) TestWithdrawFilledTwiceFullSameDirection() { + s.fundAliceBalances(50, 50) + s.fundBobBalances(50, 50) + // CASE + // Alice places a limit order of A for B + // Bob swaps through + // Alice withdraws the limit order and places a new one + // Bob swaps through again + // Alice withdraws the limit order + + trancheKey0 := s.aliceLimitSells("TokenA", 0, 10) + + s.assertAliceBalances(40, 50) + s.assertBobBalances(50, 50) + s.assertDexBalances(10, 0) + s.assertCurr1To0(0) + s.assertCurr0To1(math.MaxInt64) + + s.bobLimitSells("TokenB", -10, 10, types.LimitOrderType_FILL_OR_KILL) + + s.assertAliceBalances(40, 50) + s.assertBobBalances(60, 40) + s.assertDexBalances(0, 10) + s.assertCurr1To0(math.MinInt64) + s.assertCurr0To1(math.MaxInt64) + + s.aliceWithdrawsLimitSell(trancheKey0) + trancheKey1 := s.aliceLimitSells("TokenA", 0, 10) + + s.assertAliceBalances(30, 60) + s.assertBobBalances(60, 40) + s.assertDexBalances(10, 0) + s.assertCurr1To0(0) + s.assertCurr0To1(math.MaxInt64) + + s.bobLimitSells("TokenB", -10, 10, types.LimitOrderType_FILL_OR_KILL) + + s.assertAliceBalances(30, 60) + s.assertBobBalances(70, 30) + s.assertDexBalances(0, 10) + s.assertCurr1To0(math.MinInt64) + s.assertCurr0To1(math.MaxInt64) + + s.aliceWithdrawsLimitSell(trancheKey1) + + s.assertAliceBalances(30, 70) + s.assertBobBalances(70, 30) + s.assertDexBalances(0, 0) + s.assertCurr1To0(math.MinInt64) + s.assertCurr0To1(math.MaxInt64) +} + +func (s *MsgServerTestSuite) TestWithdrawFilledTwiceFullDifferentDirection() { + s.fundAliceBalances(50, 50) + s.fundBobBalances(50, 50) + // CASE + // Alice places a limit order of A for B + // Bob swaps through + // Alice withdraws the limit order and places a new one + // Bob swaps through again + // Alice withdraws the limit order + + trancheKeyA := s.aliceLimitSells("TokenA", 0, 10) + + s.assertAliceBalances(40, 50) + s.assertBobBalances(50, 50) + s.assertDexBalances(10, 0) + s.assertCurr1To0(0) + s.assertCurr0To1(math.MaxInt64) + + s.bobLimitSells("TokenB", 0, 10, types.LimitOrderType_IMMEDIATE_OR_CANCEL) + + s.assertAliceBalances(40, 50) + s.assertBobBalances(60, 40) + s.assertDexBalances(0, 10) + s.assertCurr1To0(math.MinInt64) + s.assertCurr0To1(math.MaxInt64) + + s.aliceWithdrawsLimitSell(trancheKeyA) + trancheKeyB := s.aliceLimitSells("TokenB", 0, 10) + + s.assertAliceBalances(40, 50) + s.assertBobBalances(60, 40) + s.assertDexBalances(0, 10) + s.assertCurr1To0(math.MinInt64) + s.assertCurr0To1(0) + + s.bobLimitSells("TokenA", 10, 10, types.LimitOrderType_IMMEDIATE_OR_CANCEL) + + s.assertAliceBalances(40, 50) + s.assertBobBalances(50, 50) + s.assertDexBalances(10, 0) + s.assertCurr1To0(math.MinInt64) + s.assertCurr0To1(math.MaxInt64) + + s.aliceWithdrawsLimitSell(trancheKeyB) + + s.assertAliceBalances(50, 50) + s.assertBobBalances(50, 50) + s.assertDexBalances(0, 0) + s.assertCurr1To0(math.MinInt64) + s.assertCurr0To1(math.MaxInt64) +} + +func (s *MsgServerTestSuite) TestWithdrawFilledEmptyFilled() { + s.fundAliceBalances(50, 50) + + // GIVEN + // alice places limit order selling A for B at tick 0 + trancheKey := s.aliceLimitSells("TokenA", 0, 10) + + // WHEN + // order is unfilled, i.e. trachne.filled = 0 + // THEN + + err := types.ErrWithdrawEmptyLimitOrder + s.aliceWithdrawLimitSellFails(err, trancheKey) +} + +func (s *MsgServerTestSuite) TestWithdrawFilledNoExistingOrderByUser() { + s.fundAliceBalances(50, 50) + s.fundBobBalances(50, 50) + + // GIVEN + // only alice has an existing order placed + trancheKey := s.aliceLimitSells("TokenA", 0, 10) + + // WHEN + // bob tries to withdraw filled from tick 0 tranche 0 + // THEN + + err := types.ErrValidLimitOrderTrancheNotFound + s.bobWithdrawLimitSellFails(err, trancheKey) +} + +func (s *MsgServerTestSuite) TestWithdrawFilledOtherUserOrder() { + s.fundAliceBalances(50, 50) + s.fundBobBalances(50, 50) + + // GIVEN + // only alice has a single existing order placed + trancheKey := s.aliceLimitSells("TokenA", 0, 10) + + // WHEN + // bob tries to withdraw with allice's TrancheKey + // THEN + + err := types.ErrValidLimitOrderTrancheNotFound + s.bobWithdrawLimitSellFails(err, trancheKey) +} diff --git a/x/dex/keeper/internal/testutils/test_helpers.go b/x/dex/keeper/internal/testutils/test_helpers.go new file mode 100644 index 000000000..fc72286eb --- /dev/null +++ b/x/dex/keeper/internal/testutils/test_helpers.go @@ -0,0 +1,23 @@ +package keeper + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" + bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" + dexmoduletypes "github.com/neutron-org/neutron/x/dex/types" +) + +func NewACoin(amt sdk.Int) sdk.Coin { + return sdk.NewCoin("TokenA", amt) +} + +func NewBCoin(amt sdk.Int) sdk.Coin { + return sdk.NewCoin("TokenB", amt) +} + +func FundAccount(bankKeeper bankkeeper.Keeper, ctx sdk.Context, addr sdk.AccAddress, amounts sdk.Coins) error { + if err := bankKeeper.MintCoins(ctx, dexmoduletypes.ModuleName, amounts); err != nil { + return err + } + + return bankKeeper.SendCoinsFromModuleToAccount(ctx, dexmoduletypes.ModuleName, addr, amounts) +} diff --git a/x/dex/keeper/keeper.go b/x/dex/keeper/keeper.go new file mode 100644 index 000000000..082084f62 --- /dev/null +++ b/x/dex/keeper/keeper.go @@ -0,0 +1,50 @@ +package keeper + +import ( + "fmt" + + "github.com/cometbft/cometbft/libs/log" + + "github.com/cosmos/cosmos-sdk/codec" + storetypes "github.com/cosmos/cosmos-sdk/store/types" + sdk "github.com/cosmos/cosmos-sdk/types" + paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" + "github.com/neutron-org/neutron/x/dex/types" +) + +type ( + Keeper struct { + cdc codec.BinaryCodec + storeKey storetypes.StoreKey + memKey storetypes.StoreKey + paramstore paramtypes.Subspace + + bankKeeper types.BankKeeper + } +) + +func NewKeeper( + cdc codec.BinaryCodec, + storeKey, + memKey storetypes.StoreKey, + ps paramtypes.Subspace, + + bankKeeper types.BankKeeper, +) *Keeper { + // set KeyTable if it has not already been set + if !ps.HasKeyTable() { + ps = ps.WithKeyTable(types.ParamKeyTable()) + } + + return &Keeper{ + cdc: cdc, + storeKey: storeKey, + memKey: memKey, + paramstore: ps, + bankKeeper: bankKeeper, + } +} + +func (k Keeper) Logger(ctx sdk.Context) log.Logger { + return ctx.Logger().With("module", fmt.Sprintf("x/%s", types.ModuleName)) +} diff --git a/x/dex/keeper/limit_order_expiration.go b/x/dex/keeper/limit_order_expiration.go new file mode 100644 index 000000000..a06886131 --- /dev/null +++ b/x/dex/keeper/limit_order_expiration.go @@ -0,0 +1,155 @@ +package keeper + +import ( + "time" + + "github.com/cosmos/cosmos-sdk/store/prefix" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/neutron-org/neutron/x/dex/types" +) + +func NewLimitOrderExpiration(tranche *types.LimitOrderTranche) *types.LimitOrderExpiration { + trancheExpiry := tranche.ExpirationTime + if trancheExpiry == nil { + panic("Cannot create LimitOrderExpiration from tranche with nil ExpirationTime") + } + + return &types.LimitOrderExpiration{ + TrancheRef: tranche.Key.KeyMarshal(), + ExpirationTime: *tranche.ExpirationTime, + } +} + +// SetLimitOrderExpiration set a specific goodTilRecord in the store from its index +func (k Keeper) SetLimitOrderExpiration( + ctx sdk.Context, + goodTilRecord *types.LimitOrderExpiration, +) { + store := prefix.NewStore( + ctx.KVStore(k.storeKey), + types.KeyPrefix(types.LimitOrderExpirationKeyPrefix), + ) + b := k.cdc.MustMarshal(goodTilRecord) + store.Set(types.LimitOrderExpirationKey( + goodTilRecord.ExpirationTime, + goodTilRecord.TrancheRef, + ), b) +} + +// GetLimitOrderExpiration returns a goodTilRecord from its index +func (k Keeper) GetLimitOrderExpiration( + ctx sdk.Context, + goodTilDate time.Time, + trancheRef []byte, +) (val *types.LimitOrderExpiration, found bool) { + store := prefix.NewStore( + ctx.KVStore(k.storeKey), + types.KeyPrefix(types.LimitOrderExpirationKeyPrefix), + ) + + b := store.Get(types.LimitOrderExpirationKey( + goodTilDate, + trancheRef, + )) + if b == nil { + return val, false + } + + val = &types.LimitOrderExpiration{} + k.cdc.MustUnmarshal(b, val) + + return val, true +} + +// RemoveLimitOrderExpiration removes a goodTilRecord from the store +func (k Keeper) RemoveLimitOrderExpiration( + ctx sdk.Context, + goodTilDate time.Time, + trancheRef []byte, +) { + store := prefix.NewStore( + ctx.KVStore(k.storeKey), + types.KeyPrefix(types.LimitOrderExpirationKeyPrefix), + ) + store.Delete(types.LimitOrderExpirationKey( + goodTilDate, + trancheRef, + )) +} + +func (k Keeper) RemoveLimitOrderExpirationByKey(ctx sdk.Context, key []byte) { + store := prefix.NewStore( + ctx.KVStore(k.storeKey), + types.KeyPrefix(types.LimitOrderExpirationKeyPrefix), + ) + store.Delete(key) +} + +// GetAllLimitOrderExpiration returns all goodTilRecord +func (k Keeper) GetAllLimitOrderExpiration(ctx sdk.Context) (list []*types.LimitOrderExpiration) { + store := prefix.NewStore( + ctx.KVStore(k.storeKey), + types.KeyPrefix(types.LimitOrderExpirationKeyPrefix), + ) + iterator := sdk.KVStorePrefixIterator(store, []byte{}) + + defer iterator.Close() + + for ; iterator.Valid(); iterator.Next() { + val := &types.LimitOrderExpiration{} + k.cdc.MustUnmarshal(iterator.Value(), val) + list = append(list, val) + } + + return +} + +func (k Keeper) PurgeExpiredLimitOrders(ctx sdk.Context, curTime time.Time) { + store := prefix.NewStore( + ctx.KVStore(k.storeKey), + types.KeyPrefix(types.LimitOrderExpirationKeyPrefix), + ) + iterator := sdk.KVStorePrefixIterator(store, []byte{}) + inGoodTilSegment := false + + archivedTranches := make(map[string]bool) + defer iterator.Close() + + gasCutoff := ctx.BlockGasMeter().Limit() - types.GoodTilPurgeGasBuffer + curBlockGas := ctx.BlockGasMeter().GasConsumed() + + for ; iterator.Valid(); iterator.Next() { + var val types.LimitOrderExpiration + k.cdc.MustUnmarshal(iterator.Value(), &val) + if val.ExpirationTime.After(curTime) { + return + } + + inGoodTilSegment = inGoodTilSegment || val.ExpirationTime != types.JITGoodTilTime() + gasConsumed := curBlockGas + ctx.GasMeter().GasConsumed() + if inGoodTilSegment && gasConsumed >= gasCutoff { + // If we hit our gas cutoff stop deleting so as not to timeout the block. + // We can only do this if we are proccesing normal GT limitOrders + // and not JIT limit orders, since there is not protection in place + // to prevent JIT order from being traded on the next block. + // This is ok since only GT limit orders pose a meaningful attack + // vector since there is no upper bound on how many GT limit orders can be + // canceled in a single block. + ctx.EventManager().EmitEvent(types.GoodTilPurgeHitLimitEvent(gasConsumed)) + + return + } + + if _, ok := archivedTranches[string(val.TrancheRef)]; !ok { + tranche, found := k.GetLimitOrderTrancheByKey(ctx, val.TrancheRef) + if found { + // Convert the tranche to an inactiveTranche + k.SetInactiveLimitOrderTranche(ctx, tranche) + k.RemoveLimitOrderTranche(ctx, tranche.Key) + archivedTranches[string(val.TrancheRef)] = true + } + } + + k.RemoveLimitOrderExpirationByKey(ctx, iterator.Key()) + } +} diff --git a/x/dex/keeper/limit_order_expiration_test.go b/x/dex/keeper/limit_order_expiration_test.go new file mode 100644 index 000000000..9e5b2c6af --- /dev/null +++ b/x/dex/keeper/limit_order_expiration_test.go @@ -0,0 +1,227 @@ +package keeper_test + +import ( + "strconv" + "testing" + "time" + + sdk "github.com/cosmos/cosmos-sdk/types" + keepertest "github.com/neutron-org/neutron/testutil/dex/keeper" + "github.com/neutron-org/neutron/x/dex/keeper" + "github.com/neutron-org/neutron/x/dex/types" + "github.com/stretchr/testify/require" +) + +// Prevent strconv unused error +var _ = strconv.IntSize + +func createNLimitOrderExpiration( + keeper *keeper.Keeper, + ctx sdk.Context, + n int, +) []types.LimitOrderExpiration { + items := make([]types.LimitOrderExpiration, n) + for i := range items { + items[i].ExpirationTime = time.Unix(int64(i), 10).UTC() + items[i].TrancheRef = []byte(strconv.Itoa(i)) + + keeper.SetLimitOrderExpiration(ctx, &items[i]) + } + + return items +} + +func createLimitOrderExpirationAndTranches( + keeper *keeper.Keeper, + ctx sdk.Context, + expTimes []time.Time, +) { + items := make([]types.LimitOrderExpiration, len(expTimes)) + for i := range items { + tranche := &types.LimitOrderTranche{ + Key: &types.LimitOrderTrancheKey{ + TradePairID: &types.TradePairID{ + MakerDenom: "TokenA", + TakerDenom: "TokenB", + }, + TickIndexTakerToMaker: 0, + TrancheKey: strconv.Itoa(i), + }, + ReservesMakerDenom: sdk.NewInt(10), + ReservesTakerDenom: sdk.NewInt(10), + TotalMakerDenom: sdk.NewInt(10), + TotalTakerDenom: sdk.NewInt(10), + ExpirationTime: &expTimes[i], + } + items[i].ExpirationTime = expTimes[i] + items[i].TrancheRef = tranche.Key.KeyMarshal() + + keeper.SetLimitOrderExpiration(ctx, &items[i]) + keeper.SetLimitOrderTranche(ctx, tranche) + } +} + +func TestLimitOrderExpirationGet(t *testing.T) { + keeper, ctx := keepertest.DexKeeper(t) + items := createNLimitOrderExpiration(keeper, ctx, 10) + for _, item := range items { + rst, found := keeper.GetLimitOrderExpiration(ctx, + item.ExpirationTime, + item.TrancheRef, + ) + require.True(t, found) + require.Equal(t, + item, + *rst, + ) + } +} + +func TestLimitOrderExpirationRemove(t *testing.T) { + keeper, ctx := keepertest.DexKeeper(t) + items := createNLimitOrderExpiration(keeper, ctx, 10) + for _, item := range items { + keeper.RemoveLimitOrderExpiration(ctx, + item.ExpirationTime, + item.TrancheRef, + ) + _, found := keeper.GetLimitOrderExpiration(ctx, + item.ExpirationTime, + item.TrancheRef, + ) + require.False(t, found) + } +} + +func TestLimitOrderExpirationGetAll(t *testing.T) { + keeper, ctx := keepertest.DexKeeper(t) + items := createNLimitOrderExpiration(keeper, ctx, 10) + pointerItems := make([]*types.LimitOrderExpiration, len(items)) + for i := range items { + pointerItems[i] = &items[i] + } + require.ElementsMatch(t, + pointerItems, + keeper.GetAllLimitOrderExpiration(ctx), + ) +} + +func TestPurgeExpiredLimitOrders(t *testing.T) { + keeper, ctx := keepertest.DexKeeper(t) + now := time.Now().UTC() + ctx = ctx.WithBlockTime(now) + ctx = ctx.WithBlockGasMeter(sdk.NewGasMeter(1000000)) + + yesterday := now.AddDate(0, 0, -1) + tomorrow := now.AddDate(0, 0, 1) + nextWeek := now.AddDate(0, 0, 7) + + expTimes := []time.Time{ + yesterday, + yesterday, + now, + tomorrow, + nextWeek, + } + + createLimitOrderExpirationAndTranches(keeper, ctx, expTimes) + keeper.PurgeExpiredLimitOrders(ctx, now) + + // Only future LimitOrderExpiration items still exist + expList := keeper.GetAllLimitOrderExpiration(ctx) + require.Equal(t, 2, len(expList)) + require.Equal(t, tomorrow, expList[0].ExpirationTime) + require.Equal(t, nextWeek, expList[1].ExpirationTime) + + // Only future LimitOrderTranches Exist + trancheList := keeper.GetAllLimitOrderTrancheAtIndex(ctx, defaultTradePairID1To0, 0) + require.Equal(t, 2, len(trancheList)) + require.Equal(t, tomorrow, *trancheList[0].ExpirationTime) + require.Equal(t, nextWeek, *trancheList[1].ExpirationTime) + + // InactiveLimitOrderTranches have been created for the expired tranched + inactiveTrancheList := keeper.GetAllInactiveLimitOrderTranche(ctx) + require.Equal(t, 3, len(inactiveTrancheList)) + require.Equal(t, yesterday, *inactiveTrancheList[0].ExpirationTime) + require.Equal(t, yesterday, *inactiveTrancheList[1].ExpirationTime) + require.Equal(t, now, *inactiveTrancheList[2].ExpirationTime) +} + +func TestPurgeExpiredLimitOrdersAtBlockGasLimit(t *testing.T) { + keeper, ctx := keepertest.DexKeeper(t) + now := time.Now().UTC() + ctx = ctx.WithBlockTime(now) + gasLimit := 1000000 + ctx = ctx.WithBlockGasMeter(sdk.NewGasMeter(uint64(gasLimit))) + timeRequiredToPurgeOneNonJIT := 35000 + gasUsed := gasLimit - types.GoodTilPurgeGasBuffer - timeRequiredToPurgeOneNonJIT + + yesterday := now.AddDate(0, 0, -1) + + expTimes := []time.Time{ + types.JITGoodTilTime(), + types.JITGoodTilTime(), + yesterday, + yesterday, + yesterday, + } + createLimitOrderExpirationAndTranches(keeper, ctx, expTimes) + + // IF blockGasMeter is nearing the GoodTilPurgeBuffer + ctx = ctx.WithGasMeter(sdk.NewGasMeter(uint64(gasLimit))) + ctx.BlockGasMeter().ConsumeGas(uint64(gasUsed), "stub block gas usage") + + // WHEN PurgeExpiredLimitOrders is run + keeper.PurgeExpiredLimitOrders(ctx, now) + + // THEN GoodTilPurgeHitGasLimit event is emitted + keepertest.AssertEventEmitted( + t, + ctx, + types.GoodTilPurgeHitGasLimitEventKey, + "Gas Limit Event not emitted", + ) + + // All JIT expirations are purged but other expirations remain + expList := keeper.GetAllLimitOrderExpiration(ctx) + // NOTE: this test is very brittle because it relies on an estimated cost + // for deleting expirations. If this cost changes the number of remaining + // expirations may change + require.Equal(t, 1, len(expList)) +} + +func TestPurgeExpiredLimitOrdersAtBlockGasLimitOnlyJIT(t *testing.T) { + keeper, ctx := keepertest.DexKeeper(t) + now := time.Now().UTC() + ctx = ctx.WithBlockTime(now) + gasLimt := 1000000 + ctx = ctx.WithBlockGasMeter(sdk.NewGasMeter(uint64(gasLimt))) + gasUsed := gasLimt - types.GoodTilPurgeGasBuffer - 30000 + + expTimes := []time.Time{ + types.JITGoodTilTime(), + types.JITGoodTilTime(), + types.JITGoodTilTime(), + types.JITGoodTilTime(), + types.JITGoodTilTime(), + types.JITGoodTilTime(), + types.JITGoodTilTime(), + } + + createLimitOrderExpirationAndTranches(keeper, ctx, expTimes) + ctx = ctx.WithGasMeter(sdk.NewGasMeter(100000)) + ctx.BlockGasMeter().ConsumeGas(uint64(gasUsed), "stub block gas usage") + keeper.PurgeExpiredLimitOrders(ctx, now) + + // GoodTilPurgeHitGasLimit event is not been emitted + keepertest.AssertEventNotEmitted( + t, + ctx, + types.GoodTilPurgeHitGasLimitEventGas, + "Hit gas limit purging JIT expirations", + ) + + // All JIT expirations are purged + expList := keeper.GetAllLimitOrderExpiration(ctx) + require.Equal(t, 0, len(expList)) +} diff --git a/x/dex/keeper/limit_order_tranche.go b/x/dex/keeper/limit_order_tranche.go new file mode 100644 index 000000000..6628c4e12 --- /dev/null +++ b/x/dex/keeper/limit_order_tranche.go @@ -0,0 +1,241 @@ +package keeper + +import ( + "fmt" + "time" + + "github.com/cosmos/cosmos-sdk/store/prefix" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/neutron-org/neutron/x/dex/types" + "github.com/neutron-org/neutron/x/dex/utils" +) + +func NewLimitOrderTranche( + limitOrderTrancheKey *types.LimitOrderTrancheKey, + goodTil *time.Time, +) (*types.LimitOrderTranche, error) { + priceTakerToMaker, err := limitOrderTrancheKey.PriceTakerToMaker() + if err != nil { + return nil, err + } + return &types.LimitOrderTranche{ + Key: limitOrderTrancheKey, + ReservesMakerDenom: sdk.ZeroInt(), + ReservesTakerDenom: sdk.ZeroInt(), + TotalMakerDenom: sdk.ZeroInt(), + TotalTakerDenom: sdk.ZeroInt(), + ExpirationTime: goodTil, + PriceTakerToMaker: priceTakerToMaker, + }, nil +} + +func (k Keeper) FindLimitOrderTranche( + ctx sdk.Context, + limitOrderTrancheKey *types.LimitOrderTrancheKey, +) (val *types.LimitOrderTranche, fromFilled, found bool) { + // Try to find the tranche in the active liq index + tick := k.GetLimitOrderTranche(ctx, limitOrderTrancheKey) + if tick != nil { + return tick, false, true + } + // Look for filled limit orders + tranche, found := k.GetInactiveLimitOrderTranche(ctx, limitOrderTrancheKey) + if found { + return tranche, true, true + } + + return nil, false, false +} + +func (k Keeper) SaveTranche(ctx sdk.Context, tranche *types.LimitOrderTranche) { + if tranche.HasTokenIn() { + k.SetLimitOrderTranche(ctx, tranche) + } else { + k.SetInactiveLimitOrderTranche(ctx, tranche) + k.RemoveLimitOrderTranche(ctx, tranche.Key) + } + + ctx.EventManager().EmitEvent(types.CreateTickUpdateLimitOrderTranche(tranche)) +} + +func (k Keeper) SetLimitOrderTranche(ctx sdk.Context, tranche *types.LimitOrderTranche) { + // Wrap tranche back into TickLiquidity + tick := types.TickLiquidity{ + Liquidity: &types.TickLiquidity_LimitOrderTranche{ + LimitOrderTranche: tranche, + }, + } + store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefix(types.TickLiquidityKeyPrefix)) + b := k.cdc.MustMarshal(&tick) + store.Set(tranche.Key.KeyMarshal(), b) +} + +func (k Keeper) GetLimitOrderTranche( + ctx sdk.Context, + limitOrderTrancheKey *types.LimitOrderTrancheKey, +) (tranche *types.LimitOrderTranche) { + store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefix(types.TickLiquidityKeyPrefix)) + b := store.Get(limitOrderTrancheKey.KeyMarshal()) + + if b == nil { + return nil + } + + var tick types.TickLiquidity + k.cdc.MustUnmarshal(b, &tick) + + return tick.GetLimitOrderTranche() +} + +func (k Keeper) GetLimitOrderTrancheByKey( + ctx sdk.Context, + key []byte, +) (tranche *types.LimitOrderTranche, found bool) { + store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefix(types.TickLiquidityKeyPrefix)) + b := store.Get(key) + + if b == nil { + return nil, false + } + + var tick types.TickLiquidity + k.cdc.MustUnmarshal(b, &tick) + + return tick.GetLimitOrderTranche(), true +} + +func (k Keeper) RemoveLimitOrderTranche(ctx sdk.Context, trancheKey *types.LimitOrderTrancheKey) { + store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefix(types.TickLiquidityKeyPrefix)) + store.Delete(trancheKey.KeyMarshal()) +} + +func (k Keeper) GetPlaceTranche( + sdkCtx sdk.Context, + tradePairID *types.TradePairID, + tickIndexTakerToMaker int64, +) *types.LimitOrderTranche { + prefixStore := prefix.NewStore( + sdkCtx.KVStore(k.storeKey), + types.TickLiquidityLimitOrderPrefix(tradePairID, tickIndexTakerToMaker), + ) + iter := prefixStore.Iterator(nil, nil) + + defer iter.Close() + for ; iter.Valid(); iter.Next() { + var tick types.TickLiquidity + k.cdc.MustUnmarshal(iter.Value(), &tick) + tranche := tick.GetLimitOrderTranche() + if tranche.IsPlaceTranche() { + return tranche + } + } + + return nil +} + +func (k Keeper) GetFillTranche( + sdkCtx sdk.Context, + tradePairID *types.TradePairID, + tickIndexTakerToMaker int64, +) (*types.LimitOrderTranche, bool) { + prefixStore := prefix.NewStore( + sdkCtx.KVStore(k.storeKey), + types.TickLiquidityLimitOrderPrefix(tradePairID, tickIndexTakerToMaker), + ) + iter := sdk.KVStorePrefixIterator(prefixStore, []byte{}) + + defer iter.Close() + for ; iter.Valid(); iter.Next() { + var tick types.TickLiquidity + k.cdc.MustUnmarshal(iter.Value(), &tick) + + return tick.GetLimitOrderTranche(), true + } + + return &types.LimitOrderTranche{}, false +} + +func (k Keeper) GetAllLimitOrderTrancheAtIndex( + sdkCtx sdk.Context, + tradePairID *types.TradePairID, + tickIndexTakerToMaker int64, +) (trancheList []types.LimitOrderTranche) { + prefixStore := prefix.NewStore( + sdkCtx.KVStore(k.storeKey), + types.TickLiquidityLimitOrderPrefix(tradePairID, tickIndexTakerToMaker), + ) + iter := sdk.KVStorePrefixIterator(prefixStore, []byte{}) + + defer iter.Close() + for ; iter.Valid(); iter.Next() { + var tick types.TickLiquidity + k.cdc.MustUnmarshal(iter.Value(), &tick) + maybeTranche := tick.GetLimitOrderTranche() + if maybeTranche != nil { + trancheList = append(trancheList, *maybeTranche) + } + } + + return trancheList +} + +func NewTrancheKey(ctx sdk.Context) string { + blockHeight := ctx.BlockHeight() + txGas := ctx.GasMeter().GasConsumed() + blockGas := utils.MustGetBlockGasUsed(ctx) + totalGas := blockGas + txGas + + blockStr := utils.Uint64ToSortableString(uint64(blockHeight)) + gasStr := utils.Uint64ToSortableString(totalGas) + + return fmt.Sprintf("%s%s", blockStr, gasStr) +} + +func (k Keeper) GetOrInitPlaceTranche(ctx sdk.Context, + tradePairID *types.TradePairID, + tickIndexTakerToMaker int64, + goodTil *time.Time, + orderType types.LimitOrderType, +) (placeTranche *types.LimitOrderTranche, err error) { + // NOTE: Right now we are not indexing by goodTil date so we can't easily check if there's already a tranche + // with the same goodTil date so instead we create a new tranche for each goodTil order + // if there is a large number of limitOrders with the same goodTilTime (most likely JIT) + // aggregating might be more efficient particularly for deletion, but if they are relatively sparse + // it will incur fewer lookups to just create a new limitOrderTranche + // Also trying to cancel aggregated good_til orders will be a PITA + JITGoodTilTime := types.JITGoodTilTime() + switch orderType { + case types.LimitOrderType_JUST_IN_TIME: + limitOrderTrancheKey := &types.LimitOrderTrancheKey{ + TradePairID: tradePairID, + TickIndexTakerToMaker: tickIndexTakerToMaker, + TrancheKey: NewTrancheKey(ctx), + } + placeTranche, err = NewLimitOrderTranche(limitOrderTrancheKey, &JITGoodTilTime) + case types.LimitOrderType_GOOD_TIL_TIME: + limitOrderTrancheKey := &types.LimitOrderTrancheKey{ + TradePairID: tradePairID, + TickIndexTakerToMaker: tickIndexTakerToMaker, + TrancheKey: NewTrancheKey(ctx), + } + placeTranche, err = NewLimitOrderTranche(limitOrderTrancheKey, goodTil) + default: + placeTranche = k.GetPlaceTranche(ctx, tradePairID, tickIndexTakerToMaker) + if placeTranche == nil { + limitOrderTrancheKey := &types.LimitOrderTrancheKey{ + TradePairID: tradePairID, + TickIndexTakerToMaker: tickIndexTakerToMaker, + TrancheKey: NewTrancheKey(ctx), + } + placeTranche, err = NewLimitOrderTranche(limitOrderTrancheKey, nil) + if err != nil { + return nil, err + } + } + } + if err != nil { + return nil, err + } + + return placeTranche, nil +} diff --git a/x/dex/keeper/limit_order_tranche_test.go b/x/dex/keeper/limit_order_tranche_test.go new file mode 100644 index 000000000..36e9374af --- /dev/null +++ b/x/dex/keeper/limit_order_tranche_test.go @@ -0,0 +1,60 @@ +package keeper_test + +import ( + "strconv" + "testing" + + math "cosmossdk.io/math" + sdk "github.com/cosmos/cosmos-sdk/types" + keepertest "github.com/neutron-org/neutron/testutil/dex/keeper" + "github.com/neutron-org/neutron/testutil/dex/nullify" + "github.com/neutron-org/neutron/x/dex/keeper" + "github.com/neutron-org/neutron/x/dex/types" + "github.com/stretchr/testify/require" +) + +func createNLimitOrderTranches( + keeper *keeper.Keeper, + ctx sdk.Context, + n int, +) []*types.LimitOrderTranche { + items := make([]*types.LimitOrderTranche, n) + for i := range items { + items[i] = types.MustNewLimitOrderTranche( + "TokenA", + "TokenB", + strconv.Itoa(i), + int64(i), + math.ZeroInt(), + math.ZeroInt(), + math.ZeroInt(), + math.ZeroInt(), + ) + keeper.SetLimitOrderTranche(ctx, items[i]) + } + + return items +} + +func TestGetLimitOrderTranche(t *testing.T) { + keeper, ctx := keepertest.DexKeeper(t) + items := createNLimitOrderTranches(keeper, ctx, 10) + for _, item := range items { + rst := keeper.GetLimitOrderTranche(ctx, item.Key) + require.NotNil(t, rst) + require.Equal(t, + nullify.Fill(&item), + nullify.Fill(&rst), + ) + } +} + +func TestRemoveLimitOrderTranche(t *testing.T) { + keeper, ctx := keepertest.DexKeeper(t) + items := createNLimitOrderTranches(keeper, ctx, 10) + for _, item := range items { + keeper.RemoveLimitOrderTranche(ctx, item.Key) + rst := keeper.GetLimitOrderTranche(ctx, item.Key) + require.Nil(t, rst) + } +} diff --git a/x/dex/keeper/limit_order_tranche_user.go b/x/dex/keeper/limit_order_tranche_user.go new file mode 100644 index 000000000..077982a41 --- /dev/null +++ b/x/dex/keeper/limit_order_tranche_user.go @@ -0,0 +1,129 @@ +package keeper + +import ( + "github.com/cosmos/cosmos-sdk/store/prefix" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/neutron-org/neutron/x/dex/types" +) + +func (k Keeper) GetOrInitLimitOrderTrancheUser( + ctx sdk.Context, + tradePairID *types.TradePairID, + tickIndex int64, + trancheKey string, + orderType types.LimitOrderType, + receiver string, +) *types.LimitOrderTrancheUser { + userShareData, found := k.GetLimitOrderTrancheUser(ctx, receiver, trancheKey) + + if !found { + return &types.LimitOrderTrancheUser{ + TrancheKey: trancheKey, + Address: receiver, + SharesOwned: sdk.ZeroInt(), + SharesWithdrawn: sdk.ZeroInt(), + SharesCancelled: sdk.ZeroInt(), + TickIndexTakerToMaker: tickIndex, + TradePairID: tradePairID, + OrderType: orderType, + } + } + + return userShareData +} + +// SetLimitOrderTrancheUser set a specific LimitOrderTrancheUser in the store from its index +func (k Keeper) SetLimitOrderTrancheUser(ctx sdk.Context, limitOrderTrancheUser *types.LimitOrderTrancheUser) { + store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefix(types.LimitOrderTrancheUserKeyPrefix)) + b := k.cdc.MustMarshal(limitOrderTrancheUser) + store.Set(types.LimitOrderTrancheUserKey( + limitOrderTrancheUser.Address, + limitOrderTrancheUser.TrancheKey, + ), b) +} + +// GetLimitOrderTrancheUser returns a LimitOrderTrancheUser from its index +func (k Keeper) GetLimitOrderTrancheUser( + ctx sdk.Context, + address string, + trancheKey string, +) (val *types.LimitOrderTrancheUser, found bool) { + store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefix(types.LimitOrderTrancheUserKeyPrefix)) + + b := store.Get(types.LimitOrderTrancheUserKey( + address, + trancheKey, + )) + if b == nil { + return nil, false + } + + val = &types.LimitOrderTrancheUser{} + k.cdc.MustUnmarshal(b, val) + + return val, true +} + +// RemoveLimitOrderTrancheUserByKey removes a LimitOrderTrancheUser from the store +func (k Keeper) RemoveLimitOrderTrancheUserByKey( + ctx sdk.Context, + trancheKey string, + address string, +) { + store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefix(types.LimitOrderTrancheUserKeyPrefix)) + store.Delete(types.LimitOrderTrancheUserKey( + address, + trancheKey, + )) +} + +func (k Keeper) RemoveLimitOrderTrancheUser(ctx sdk.Context, trancheUser *types.LimitOrderTrancheUser) { + k.RemoveLimitOrderTrancheUserByKey( + ctx, + trancheUser.TrancheKey, + trancheUser.Address, + ) +} + +func (k Keeper) SaveTrancheUser(ctx sdk.Context, trancheUser *types.LimitOrderTrancheUser) { + if trancheUser.IsEmpty() { + k.RemoveLimitOrderTrancheUser(ctx, trancheUser) + } else { + k.SetLimitOrderTrancheUser(ctx, trancheUser) + } +} + +// GetAllLimitOrderTrancheUser returns all LimitOrderTrancheUser +func (k Keeper) GetAllLimitOrderTrancheUser(ctx sdk.Context) (list []*types.LimitOrderTrancheUser) { + store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefix(types.LimitOrderTrancheUserKeyPrefix)) + iterator := sdk.KVStorePrefixIterator(store, []byte{}) + + defer iterator.Close() + + for ; iterator.Valid(); iterator.Next() { + val := &types.LimitOrderTrancheUser{} + k.cdc.MustUnmarshal(iterator.Value(), val) + list = append(list, val) + } + + return +} + +func (k Keeper) GetAllLimitOrderTrancheUserForAddress( + ctx sdk.Context, + address sdk.AccAddress, +) (list []*types.LimitOrderTrancheUser) { + addressPrefix := types.LimitOrderTrancheUserAddressPrefix(address.String()) + store := prefix.NewStore(ctx.KVStore(k.storeKey), addressPrefix) + iterator := sdk.KVStorePrefixIterator(store, []byte{}) + + defer iterator.Close() + + for ; iterator.Valid(); iterator.Next() { + val := &types.LimitOrderTrancheUser{} + k.cdc.MustUnmarshal(iterator.Value(), val) + list = append(list, val) + } + + return +} diff --git a/x/dex/keeper/limit_order_tranche_user_test.go b/x/dex/keeper/limit_order_tranche_user_test.go new file mode 100644 index 000000000..7ac9acbbc --- /dev/null +++ b/x/dex/keeper/limit_order_tranche_user_test.go @@ -0,0 +1,109 @@ +package keeper_test + +import ( + "strconv" + "testing" + + sdk "github.com/cosmos/cosmos-sdk/types" + keepertest "github.com/neutron-org/neutron/testutil/dex/keeper" + "github.com/neutron-org/neutron/testutil/dex/nullify" + "github.com/neutron-org/neutron/x/dex/keeper" + "github.com/neutron-org/neutron/x/dex/types" + "github.com/stretchr/testify/require" +) + +func createNLimitOrderTrancheUser(keeper *keeper.Keeper, ctx sdk.Context, n int) []*types.LimitOrderTrancheUser { + items := make([]*types.LimitOrderTrancheUser, n) + for i := range items { + val := &types.LimitOrderTrancheUser{ + TrancheKey: strconv.Itoa(i), + Address: strconv.Itoa(i), + TradePairID: &types.TradePairID{MakerDenom: "TokenA", TakerDenom: "TokenB"}, + TickIndexTakerToMaker: 0, + SharesOwned: sdk.ZeroInt(), + SharesWithdrawn: sdk.ZeroInt(), + SharesCancelled: sdk.ZeroInt(), + } + items[i] = val + keeper.SetLimitOrderTrancheUser(ctx, items[i]) + } + + return items +} + +func createNLimitOrderTrancheUserWithAddress(keeper *keeper.Keeper, ctx sdk.Context, address string, n int) []*types.LimitOrderTrancheUser { + items := make([]*types.LimitOrderTrancheUser, n) + for i := range items { + val := &types.LimitOrderTrancheUser{ + TrancheKey: strconv.Itoa(i), + Address: address, + TradePairID: &types.TradePairID{MakerDenom: "TokenA", TakerDenom: "TokenB"}, + TickIndexTakerToMaker: 0, + SharesOwned: sdk.ZeroInt(), + SharesWithdrawn: sdk.ZeroInt(), + SharesCancelled: sdk.ZeroInt(), + } + items[i] = val + keeper.SetLimitOrderTrancheUser(ctx, items[i]) + } + + return items +} + +func TestLimitOrderTrancheUserGet(t *testing.T) { + keeper, ctx := keepertest.DexKeeper(t) + items := createNLimitOrderTrancheUser(keeper, ctx, 10) + for _, item := range items { + rst, found := keeper.GetLimitOrderTrancheUser(ctx, item.Address, item.TrancheKey) + require.True(t, found) + require.Equal(t, + nullify.Fill(&item), + nullify.Fill(&rst), + ) + } +} + +func TestLimitOrderTrancheUserRemove(t *testing.T) { + keeper, ctx := keepertest.DexKeeper(t) + items := createNLimitOrderTrancheUser(keeper, ctx, 10) + for _, item := range items { + keeper.RemoveLimitOrderTrancheUserByKey(ctx, item.TrancheKey, item.Address) + _, found := keeper.GetLimitOrderTrancheUser(ctx, item.Address, item.TrancheKey) + require.False(t, found) + } +} + +func (s *MsgServerTestSuite) TestGetAllLimitOrders() { + // WHEN Alice places 2 limit orders + s.fundAliceBalances(20, 20) + s.fundBobBalances(20, 20) + trancheKeyA := s.aliceLimitSells("TokenA", -1, 10) + trancheKeyB := s.aliceLimitSells("TokenB", 0, 10) + s.bobLimitSells("TokenA", -1, 10) + + // THEN GetAllLimitOrders returns alice's same two orders + LOList := s.app.DexKeeper.GetAllLimitOrderTrancheUserForAddress(s.ctx, s.alice) + s.Assert().Equal(2, len(LOList)) + s.Assert().Equal(&types.LimitOrderTrancheUser{ + TradePairID: defaultTradePairID1To0, + TickIndexTakerToMaker: 1, + TrancheKey: trancheKeyA, + Address: s.alice.String(), + SharesOwned: sdk.NewInt(10), + SharesWithdrawn: sdk.NewInt(0), + SharesCancelled: sdk.NewInt(0), + }, + LOList[0], + ) + s.Assert().Equal(&types.LimitOrderTrancheUser{ + TradePairID: defaultTradePairID0To1, + TickIndexTakerToMaker: 0, + TrancheKey: trancheKeyB, + Address: s.alice.String(), + SharesOwned: sdk.NewInt(10), + SharesWithdrawn: sdk.NewInt(0), + SharesCancelled: sdk.NewInt(0), + }, + LOList[1], + ) +} diff --git a/x/dex/keeper/liquidity.go b/x/dex/keeper/liquidity.go new file mode 100644 index 000000000..4615f7741 --- /dev/null +++ b/x/dex/keeper/liquidity.go @@ -0,0 +1,108 @@ +package keeper + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" + math_utils "github.com/neutron-org/neutron/utils/math" + "github.com/neutron-org/neutron/x/dex/types" +) + +func (k Keeper) Swap( + ctx sdk.Context, + tradePairID *types.TradePairID, + maxAmountTakerDenom sdk.Int, + maxAmountMakerDenom *sdk.Int, + limitPrice *math_utils.PrecDec, +) (totalTakerCoin, totalMakerCoin sdk.Coin, orderFilled bool, err error) { + useMaxOut := maxAmountMakerDenom != nil + var remainingMakerDenom *sdk.Int + if useMaxOut { + copy := *maxAmountMakerDenom + remainingMakerDenom = © + } + + remainingTakerDenom := maxAmountTakerDenom + totalMakerDenom := sdk.ZeroInt() + orderFilled = false + + // verify that amount left is not zero and that there are additional valid ticks to check + liqIter := k.NewLiquidityIterator(ctx, tradePairID) + defer liqIter.Close() + for { + liq := liqIter.Next() + if liq == nil { + break + } + + // break as soon as we iterated past limitPrice + if limitPrice != nil && liq.Price().LT(*limitPrice) { + break + } + + inAmount, outAmount := liq.Swap(remainingTakerDenom, remainingMakerDenom) + k.SaveLiquidity(ctx, liq) + + remainingTakerDenom = remainingTakerDenom.Sub(inAmount) + totalMakerDenom = totalMakerDenom.Add(outAmount) + + // break if remainingTakerDenom will yield less than 1 tokenOut at current price + // this avoids unnecessary iteration since outAmount will always be 0 going forward + // this also catches the normal exit case where remainingTakerDenom == 0 + if liq.Price().MulInt(remainingTakerDenom).LT(math_utils.OnePrecDec()) { + orderFilled = true + break + } + + if useMaxOut { + copy := remainingMakerDenom.Sub(outAmount) + remainingMakerDenom = © + + // if maxAmountOut has been used up then exit + if remainingMakerDenom.LTE(sdk.ZeroInt()) { + orderFilled = true + break + } + } + } + totalTakerDenom := maxAmountTakerDenom.Sub(remainingTakerDenom) + + return sdk.NewCoin( + tradePairID.TakerDenom, + totalTakerDenom, + ), sdk.NewCoin( + tradePairID.MakerDenom, + totalMakerDenom, + ), orderFilled, nil +} + +func (k Keeper) SwapWithCache( + ctx sdk.Context, + tradePairID *types.TradePairID, + maxAmountIn sdk.Int, + maxAmountOut *sdk.Int, + limitPrice *math_utils.PrecDec, +) (totalIn, totalOut sdk.Coin, orderFilled bool, err error) { + cacheCtx, writeCache := ctx.CacheContext() + totalIn, totalOut, orderFilled, err = k.Swap( + cacheCtx, + tradePairID, + maxAmountIn, + maxAmountOut, + limitPrice, + ) + + writeCache() + + return totalIn, totalOut, orderFilled, err +} + +func (k Keeper) SaveLiquidity(sdkCtx sdk.Context, liquidityI types.Liquidity) { + switch liquidity := liquidityI.(type) { + case *types.LimitOrderTranche: + k.SaveTranche(sdkCtx, liquidity) + + case *types.PoolLiquidity: + k.SetPool(sdkCtx, liquidity.Pool) + default: + panic("Invalid liquidity type") + } +} diff --git a/x/dex/keeper/liquidity_iterator.go b/x/dex/keeper/liquidity_iterator.go new file mode 100644 index 000000000..64420363c --- /dev/null +++ b/x/dex/keeper/liquidity_iterator.go @@ -0,0 +1,94 @@ +package keeper + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/neutron-org/neutron/x/dex/types" +) + +type LiquidityIterator struct { + keeper *Keeper + tradePairID *types.TradePairID + ctx sdk.Context + iter TickIterator +} + +func (k Keeper) NewLiquidityIterator( + ctx sdk.Context, + tradePairID *types.TradePairID, +) *LiquidityIterator { + return &LiquidityIterator{ + iter: k.NewTickIterator(ctx, tradePairID), + keeper: &k, + ctx: ctx, + tradePairID: tradePairID, + } +} + +func (s *LiquidityIterator) Next() types.Liquidity { + // Move iterator to the next tick after each call + // iter must be in valid state to call next + defer func() { + if s.iter.Valid() { + s.iter.Next() + } + }() + + for ; s.iter.Valid(); s.iter.Next() { + tick := s.iter.Value() + // Don't bother to look up pool counter-liquidities if there's no liquidity here + if !tick.HasToken() { + continue + } + + liq := s.WrapTickLiquidity(tick) + if liq != nil { + return liq + } + } + + return nil +} + +func (s *LiquidityIterator) Close() { + s.iter.Close() +} + +func (s *LiquidityIterator) WrapTickLiquidity(tick types.TickLiquidity) types.Liquidity { + switch liquidity := tick.Liquidity.(type) { + case *types.TickLiquidity_PoolReserves: + poolReserves := liquidity.PoolReserves + counterpartKey := poolReserves.Key.Counterpart() + counterpartReserves, counterpartReservesFound := s.keeper.GetPoolReserves(s.ctx, counterpartKey) + if !counterpartReservesFound { + counterpartReserves = types.NewPoolReservesFromCounterpart(poolReserves) + } + + var lowerTick0, upperTick1 *types.PoolReserves + if s.tradePairID.IsTakerDenomToken0() { + lowerTick0 = counterpartReserves + upperTick1 = poolReserves + } else { + lowerTick0 = poolReserves + upperTick1 = counterpartReserves + } + return &types.PoolLiquidity{ + TradePairID: s.tradePairID, + Pool: &types.Pool{ + LowerTick0: lowerTick0, + UpperTick1: upperTick1, + }, + } + + case *types.TickLiquidity_LimitOrderTranche: + tranche := liquidity.LimitOrderTranche + // If we hit a tranche with an expired goodTil date keep iterating + if tranche.IsExpired(s.ctx) { + return nil + } + + return tranche + + default: + panic("Tick does not have liquidity") + } +} diff --git a/x/dex/keeper/liquidity_test.go b/x/dex/keeper/liquidity_test.go new file mode 100644 index 000000000..013080f4c --- /dev/null +++ b/x/dex/keeper/liquidity_test.go @@ -0,0 +1,746 @@ +package keeper_test + +import ( + "math" + "testing" + + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + sdk "github.com/cosmos/cosmos-sdk/types" + dualityapp "github.com/neutron-org/neutron/app" + keepertest "github.com/neutron-org/neutron/testutil/dex/keeper" + "github.com/neutron-org/neutron/x/dex/types" + "github.com/stretchr/testify/suite" +) + +type LiquidityTestSuite struct { + suite.Suite + app *dualityapp.App + ctx sdk.Context +} + +// TODO: In an ideal world, there should be enough lower level testing that the swap tests +// don't need to test both LO and LP. At the level of swap testing these should be indistinguishable. + +func (s *LiquidityTestSuite) SetupTest() { + s.app = dualityapp.Setup(s.T(), false) + ctx := s.app.BaseApp.NewContext(false, tmproto.Header{}) + ctx = ctx.WithBlockGasMeter(sdk.NewInfiniteGasMeter()) + s.ctx = ctx +} + +func TestLiquidityTestSuite(t *testing.T) { + suite.Run(t, new(LiquidityTestSuite)) +} + +func (s *LiquidityTestSuite) TestSwap0To1NoLiquidity() { + // GIVEN no liqudity of token B (deposit only token A and LO of token A) + s.addDeposit(NewDeposit(10, 0, 0, 1)) + s.placeGTCLimitOrder("TokenA", 1000, 10) + + // WHEN swap 10 of tokenB + tokenIn, tokenOut := s.swap("TokenA", "TokenB", 10) + + // THEN swap should do nothing + s.assertSwapOutput(tokenIn, 0, tokenOut, 0) + s.assertDexBalances(1010, 0) + + s.assertCurr0To1(math.MaxInt64) +} + +func (s *LiquidityTestSuite) TestSwap1To0NoLiquidity() { + // GIVEN no liqudity of token A (deposit only token B and LO of token B) + s.addDeposit(NewDeposit(0, 10, 0, 1)) + s.placeGTCLimitOrder("TokenB", 1000, 10) + + // WHEN swap 10 of tokenB + tokenIn, tokenOut := s.swap("TokenB", "TokenA", 10) + + // THEN swap should do nothing + s.assertSwapOutput(tokenIn, 0, tokenOut, 0) + s.assertDexBalances(0, 1010) + + s.assertCurr1To0(math.MinInt64) +} + +// swaps against LPs only ///////////////////////////////////////////////////// + +func (s *LiquidityTestSuite) TestSwap0To1PartialFillLP() { + // GIVEN 10 tokenB LP @ tick 0 fee 1 + s.addDeposit(NewDeposit(0, 10, 0, 1)) + + // WHEN swap 20 of tokenA + tokenIn, tokenOut := s.swap("TokenA", "TokenB", 20) + + // THEN swap should return 11 TokenA in and 10 TokenB out + s.Assert().Equal("TokenA", tokenIn.Denom) + s.Assert().Equal("TokenB", tokenOut.Denom) + s.assertSwapOutput(tokenIn, 11, tokenOut, 10) + s.assertDexBalances(11, 0) + + s.assertCurr0To1(math.MaxInt64) + s.assertCurr1To0(-1) +} + +func (s *LiquidityTestSuite) TestSwap1To0PartialFillLP() { + // GIVEN 10 tokenA LP @ tick 0 fee 1 + s.addDeposit(NewDeposit(10, 0, 0, 1)) + + // WHEN swap 20 of tokenB + tokenIn, tokenOut := s.swap("TokenB", "TokenA", 20) + + // THEN swap should return 11 TokenB in and 10 TokenA out + s.Assert().Equal("TokenB", tokenIn.Denom) + s.Assert().Equal("TokenA", tokenOut.Denom) + s.assertSwapOutput(tokenIn, 11, tokenOut, 10) + s.assertDexBalances(0, 11) + + s.assertCurr0To1(1) + s.assertCurr1To0(math.MinInt64) +} + +func (s *LiquidityTestSuite) TestSwap0To1FillLP() { + // GIVEN 100 tokenB LP @ tick 200 fee 5 + s.addDeposit(NewDeposit(0, 100, 200, 5)) + + // WHEN swap 100 of tokenA + tokenIn, tokenOut := s.swap("TokenA", "TokenB", 100) + + // THEN swap should return 100 TokenA in and 97 TokenB out + s.Assert().Equal("TokenA", tokenIn.Denom) + s.Assert().Equal("TokenB", tokenOut.Denom) + s.assertSwapOutput(tokenIn, 100, tokenOut, 97) + s.assertDexBalances(100, 3) + + s.assertCurr0To1(205) + s.assertCurr1To0(195) +} + +func (s *LiquidityTestSuite) TestSwap1To0FillLP() { + // GIVEN 100 tokenA LP @ tick -20,000 fee 1 + s.addDeposit(NewDeposit(100, 0, -20_000, 1)) + + // WHEN swap 100 of tokenB + tokenIn, tokenOut := s.swap("TokenB", "TokenA", 100) + + // THEN swap should return 97 TokenB in and 13 TokenA out + s.Assert().Equal("TokenB", tokenIn.Denom) + s.Assert().Equal("TokenA", tokenOut.Denom) + // NOTE: Given rounding for amountOut, amountIn does not use the full maxAmount + s.assertSwapOutput(tokenIn, 97, tokenOut, 13) + s.assertDexBalances(87, 97) + + s.assertCurr0To1(-19_999) + s.assertCurr1To0(-20_001) +} + +func (s *LiquidityTestSuite) TestSwap0To1FillLPHighFee() { + // GIVEN 100 tokenB LP @ tick 20,000 fee 1,000 + s.addDeposit(NewDeposit(0, 100, 20_000, 1_000)) + + // WHEN swap 100 of tokenA + tokenIn, tokenOut := s.swap("TokenA", "TokenB", 100) + + // THEN swap should return 98 TokenA in and 12 TokenB out + s.Assert().Equal("TokenA", tokenIn.Denom) + s.Assert().Equal("TokenB", tokenOut.Denom) + s.assertSwapOutput(tokenIn, 98, tokenOut, 12) + s.assertDexBalances(98, 88) + + s.assertCurr0To1(21_000) + s.assertCurr1To0(19_000) +} + +func (s *LiquidityTestSuite) TestSwap1To0FillLPHighFee() { + // GIVEN 1000 tokenA LP @ tick 20,000 fee 1000 + s.addDeposit(NewDeposit(1000, 0, 20_000, 1000)) + + // WHEN swap 100 of tokenB + tokenIn, tokenOut := s.swap("TokenB", "TokenA", 100) + + // THEN swap should return 100 TokenB in and 668 TokenA out + s.Assert().Equal("TokenB", tokenIn.Denom) + s.Assert().Equal("TokenA", tokenOut.Denom) + s.assertSwapOutput(tokenIn, 100, tokenOut, 668) + s.assertDexBalances(332, 100) + + s.assertCurr0To1(21_000) + s.assertCurr1To0(19_000) +} + +func (s *LiquidityTestSuite) TestSwap0To1PartialFillMultipleLP() { + // GIVEN 300 worth of tokenB LPs + s.addDeposits( + NewDeposit(0, 100, -20_000, 1), + NewDeposit(0, 100, -20_001, 1), + NewDeposit(0, 100, -20_002, 1), + ) + + // WHEN swap 100 of tokenA + tokenIn, tokenOut := s.swap("TokenA", "TokenB", 100) + + // THEN swap should return 42 TokenA in and 300 TokenB out + s.Assert().Equal("TokenA", tokenIn.Denom) + s.Assert().Equal("TokenB", tokenOut.Denom) + s.assertSwapOutput(tokenIn, 42, tokenOut, 300) + s.assertDexBalances(42, 0) + + s.assertCurr0To1(math.MaxInt64) + s.assertCurr1To0(-20_001) +} + +func (s *LiquidityTestSuite) TestSwap1To0PartialFillMultipleLP() { + // GIVEN 300 worth of tokenA LPs + s.addDeposits( + NewDeposit(100, 0, 20_000, 1), + NewDeposit(100, 0, 20_001, 1), + NewDeposit(100, 0, 20_002, 1), + ) + + // WHEN swap 100 of tokenB + tokenIn, tokenOut := s.swap("TokenB", "TokenA", 100) + + // THEN swap should return 42 TokenB in and 300 TokenA out + s.Assert().Equal("TokenB", tokenIn.Denom) + s.Assert().Equal("TokenA", tokenOut.Denom) + s.assertSwapOutput(tokenIn, 42, tokenOut, 300) + s.assertDexBalances(0, 42) + + s.assertCurr0To1(20_001) + s.assertCurr1To0(math.MinInt64) +} + +func (s *LiquidityTestSuite) TestSwap0To1FillMultipleLP() { + // GIVEN 400 worth of tokenB LPs + s.addDeposits( + NewDeposit(0, 100, -20, 1), + NewDeposit(0, 100, -21, 1), + NewDeposit(0, 100, -22, 1), + NewDeposit(0, 100, -23, 1), + ) + + // WHEN swap 100 of tokenA + tokenIn, tokenOut := s.swap("TokenA", "TokenB", 400) + + // THEN swap should return 400 TokenA in and 400 TokenB out + s.Assert().Equal("TokenA", tokenIn.Denom) + s.Assert().Equal("TokenB", tokenOut.Denom) + s.assertSwapOutput(tokenIn, 400, tokenOut, 400) + s.assertDexBalances(400, 0) + + s.assertCurr0To1(math.MaxInt64) + s.assertCurr1To0(-21) +} + +func (s *LiquidityTestSuite) TestSwap1To0FillMultipleLP() { + // GIVEN 400 worth of tokenA LPs + s.addDeposits( + NewDeposit(100, 0, 20, 1), + NewDeposit(100, 0, 21, 1), + NewDeposit(100, 0, 22, 1), + NewDeposit(100, 0, 23, 1), + ) + + // WHEN swap 400 of tokenB + tokenIn, tokenOut := s.swap("TokenB", "TokenA", 400) + + // THEN swap should return 400 TokenB in and 400 TokenA out + s.Assert().Equal("TokenB", tokenIn.Denom) + s.Assert().Equal("TokenA", tokenOut.Denom) + s.assertSwapOutput(tokenIn, 400, tokenOut, 400) + s.assertDexBalances(0, 400) + + s.assertCurr0To1(21) + s.assertCurr1To0(math.MinInt64) +} + +func (s *LiquidityTestSuite) TestSwap0To1LPMaxAmountUsed() { + // GIVEN 10 TokenB available + s.addDeposits(NewDeposit(0, 10, 0, 1)) + + // WHEN swap 50 TokenA with maxOut of 5 + tokenIn, tokenOut := s.swapWithMaxOut("TokenA", "TokenB", 50, 5) + + // THEN swap should return 6 TokenA in and 5 TokenB out + s.assertSwapOutput(tokenIn, 6, tokenOut, 5) + s.assertDexBalances(6, 5) +} + +func (s *LiquidityTestSuite) TestSwap1To0LPMaxAmountUsed() { + // GIVEN 10 TokenA available + s.addDeposits(NewDeposit(10, 0, 0, 1)) + + // WHEN swap 50 TokenB with maxOut of 5 + tokenIn, tokenOut := s.swapWithMaxOut("TokenB", "TokenA", 50, 5) + + // THEN swap should return 6 TokenB in and 5 TokenA out + s.assertSwapOutput(tokenIn, 6, tokenOut, 5) + s.assertDexBalances(5, 6) +} + +func (s *LiquidityTestSuite) TestSwap0To1LPMaxAmountNotUsed() { + // GIVEN 10 TokenB available + s.addDeposits(NewDeposit(0, 10, 0, 1)) + + // WHEN swap 8 with maxOut of 15 + tokenIn, tokenOut := s.swapWithMaxOut("TokenA", "TokenB", 8, 15) + + // THEN swap should return 8 TokenA in and 7 TokenB out + s.assertSwapOutput(tokenIn, 8, tokenOut, 7) + s.assertDexBalances(8, 3) +} + +func (s *LiquidityTestSuite) TestSwap1To0LPMaxAmountNotUsed() { + // GIVEN 10 TokenA available + s.addDeposits(NewDeposit(10, 0, 0, 1)) + + // WHEN swap 8 with maxOut of 15 + tokenIn, tokenOut := s.swapWithMaxOut("TokenB", "TokenA", 8, 15) + + // THEN swap should return 8 TokenB in and 7 TokenA out + s.assertSwapOutput(tokenIn, 8, tokenOut, 7) + s.assertDexBalances(3, 8) +} + +func (s *LiquidityTestSuite) TestSwap0To1LPMaxAmountUsedMultiTick() { + // GIVEN 50 TokenB available + s.addDeposits( + NewDeposit(0, 5, 0, 1), + NewDeposit(0, 5, 1, 1), + NewDeposit(0, 5, 2, 1), + NewDeposit(0, 5, 3, 1), + NewDeposit(0, 30, 4, 1), + ) + + // WHEN swap 50 TokenA with maxOut of 20 + tokenIn, tokenOut := s.swapWithMaxOut("TokenA", "TokenB", 50, 20) + + // THEN swap should return 24 TokenA in and 20 TokenB out + s.assertSwapOutput(tokenIn, 24, tokenOut, 20) + s.assertDexBalances(24, 30) +} + +func (s *LiquidityTestSuite) TestSwap1To0LPMaxAmountUsedMultiTick() { + // GIVEN 50 TokenA available + s.addDeposits( + NewDeposit(5, 0, 0, 1), + NewDeposit(5, 0, 1, 1), + NewDeposit(5, 0, 2, 1), + NewDeposit(5, 0, 3, 1), + NewDeposit(30, 0, 4, 1), + ) + + // WHEN swap 50 TokenB with maxOut of 20 + tokenIn, tokenOut := s.swapWithMaxOut("TokenB", "TokenA", 50, 20) + + // THEN swap should return 20 TokenB in and 20 TokenA out + s.assertSwapOutput(tokenIn, 20, tokenOut, 20) + s.assertDexBalances(30, 20) +} + +func (s *LiquidityTestSuite) TestSwap0To1LPMaxAmountNotUsedMultiTick() { + // GIVEN 50 TokenB available + s.addDeposits( + NewDeposit(0, 5, 0, 1), + NewDeposit(0, 5, 1, 1), + NewDeposit(0, 5, 2, 1), + NewDeposit(0, 5, 3, 1), + NewDeposit(0, 30, 4, 1), + ) + + // WHEN swap 19 TokenA with maxOut of 20 + tokenIn, tokenOut := s.swapWithMaxOut("TokenA", "TokenB", 19, 20) + + // THEN swap should return 19 TokenA in and 15 TokenB out + s.assertSwapOutput(tokenIn, 18, tokenOut, 15) + s.assertDexBalances(18, 35) +} + +// swaps against LOs only ///////////////////////////////////////////////////// + +func (s *LiquidityTestSuite) TestSwap0To1PartialFillLO() { + // GIVEN 10 tokenB LO @ tick 1,000 + s.placeGTCLimitOrder("TokenB", 10, 1_000) + + // WHEN swap 20 of tokenA + tokenIn, tokenOut := s.swap("TokenA", "TokenB", 20) + + // THEN swap should return 12 TokenA in and 10 TokenB out + s.Assert().Equal("TokenA", tokenIn.Denom) + s.Assert().Equal("TokenB", tokenOut.Denom) + s.assertSwapOutput(tokenIn, 12, tokenOut, 10) + s.assertDexBalances(12, 0) +} + +func (s *LiquidityTestSuite) TestSwap1To0PartialFillLO() { + // GIVEN 10 tokenA LO @ tick -1,000 + s.placeGTCLimitOrder("TokenA", 10, -1_000) + + // WHEN swap 20 of tokenB + tokenIn, tokenOut := s.swap("TokenB", "TokenA", 20) + + // THEN swap should return 12 TokenB in and 10 TokenA out + s.Assert().Equal("TokenB", tokenIn.Denom) + s.Assert().Equal("TokenA", tokenOut.Denom) + s.assertSwapOutput(tokenIn, 12, tokenOut, 10) + s.assertDexBalances(0, 12) + + s.assertCurr0To1(math.MaxInt64) + s.assertCurr1To0(math.MinInt64) +} + +func (s *LiquidityTestSuite) TestSwap0To1FillLO() { + // GIVEN 100 tokenB LO @ tick 10,000 + s.placeGTCLimitOrder("TokenB", 100, 10_000) + + // WHEN swap 100 of tokenA + tokenIn, tokenOut := s.swap("TokenA", "TokenB", 100) + + // THEN swap should return 98 TokenA in and 36 TokenB out + s.Assert().Equal("TokenA", tokenIn.Denom) + s.Assert().Equal("TokenB", tokenOut.Denom) + s.assertSwapOutput(tokenIn, 98, tokenOut, 36) + s.assertDexBalances(98, 64) + + s.assertCurr0To1(10_000) + s.assertCurr1To0(math.MinInt64) +} + +func (s *LiquidityTestSuite) TestSwap1To0FillLO() { + // GIVEN 100 tokenA LO @ tick 10,000 + s.placeGTCLimitOrder("TokenA", 100, -10_000) + + // WHEN swap 10 of tokenB + tokenIn, tokenOut := s.swap("TokenB", "TokenA", 10) + + // THEN swap should return 9 TokenB in and 3 TokenA out + s.Assert().Equal("TokenB", tokenIn.Denom) + s.Assert().Equal("TokenA", tokenOut.Denom) + s.assertSwapOutput(tokenIn, 9, tokenOut, 3) + s.assertDexBalances(97, 9) + + s.assertCurr0To1(math.MaxInt64) + s.assertCurr1To0(-10_000) +} + +func (s *LiquidityTestSuite) TestSwap0To1FillMultipleLO() { + // GIVEN 300 tokenB across multiple LOs + s.placeGTCLimitOrder("TokenB", 100, 1_000) + s.placeGTCLimitOrder("TokenB", 100, 1_001) + s.placeGTCLimitOrder("TokenB", 100, 1_002) + + // WHEN swap 300 of tokenA + tokenIn, tokenOut := s.swap("TokenA", "TokenB", 300) + + // THEN swap should return 300 TokenA in and 270 TokenB out + s.Assert().Equal("TokenA", tokenIn.Denom) + s.Assert().Equal("TokenB", tokenOut.Denom) + s.assertSwapOutput(tokenIn, 300, tokenOut, 270) + s.assertDexBalances(300, 30) + + s.assertCurr0To1(1_002) + s.assertCurr1To0(math.MinInt64) +} + +func (s *LiquidityTestSuite) TestSwap1To0FillMultipleLO() { + // GIVEN 300 tokenA across multiple LOs + s.placeGTCLimitOrder("TokenA", 100, -1_000) + s.placeGTCLimitOrder("TokenA", 100, -1_001) + s.placeGTCLimitOrder("TokenA", 100, -1_002) + + // WHEN swap 300 of tokenB + tokenIn, tokenOut := s.swap("TokenB", "TokenA", 300) + + // THEN swap should return 300 TokenB in and 270 TokenB out + s.Assert().Equal("TokenB", tokenIn.Denom) + s.Assert().Equal("TokenA", tokenOut.Denom) + s.assertSwapOutput(tokenIn, 300, tokenOut, 270) + s.assertDexBalances(30, 300) + + s.assertCurr0To1(math.MaxInt64) + s.assertCurr1To0(-1_002) +} + +func (s *LiquidityTestSuite) TestSwap0To1LOMaxAmountUsed() { + // GIVEN 10 TokenB available + s.placeGTCLimitOrder("TokenB", 10, 1) + + // WHEN swap 50 TokenA with maxOut of 5 + tokenIn, tokenOut := s.swapWithMaxOut("TokenA", "TokenB", 50, 5) + + // THEN swap should return 6 TokenA in and 5 TokenB out + s.assertSwapOutput(tokenIn, 6, tokenOut, 5) + s.assertDexBalances(6, 5) +} + +func (s *LiquidityTestSuite) TestSwap1To0LOMaxAmountUsed() { + // GIVEN 10 TokenA available + s.placeGTCLimitOrder("TokenA", 10, 0) + + // WHEN swap 50 TokenB with maxOut of 5 + tokenIn, tokenOut := s.swapWithMaxOut("TokenB", "TokenA", 50, 5) + + // THEN swap should return 5 TokenB in and 5 TokenA out + s.assertSwapOutput(tokenIn, 5, tokenOut, 5) + s.assertDexBalances(5, 5) +} + +func (s *LiquidityTestSuite) TestSwap0To1LOMaxAmountNotUsed() { + // GIVEN 10 TokenB available + s.placeGTCLimitOrder("TokenB", 10, 1) + + // WHEN swap 8 with maxOut of 15 + tokenIn, tokenOut := s.swapWithMaxOut("TokenA", "TokenB", 8, 15) + + // THEN swap should return 8 TokenA in and 7 TokenB out + s.assertSwapOutput(tokenIn, 8, tokenOut, 7) + s.assertDexBalances(8, 3) +} + +func (s *LiquidityTestSuite) TestSwap1To0LOMaxAmountNotUsed() { + // GIVEN 10 TokenA available + s.placeGTCLimitOrder("TokenA", 10, 1) + + // WHEN swap 8 with maxOut of 15 + tokenIn, tokenOut := s.swapWithMaxOut("TokenB", "TokenA", 8, 15) + + // THEN swap should return 8 TokenB in and 8 TokenA out + s.assertSwapOutput(tokenIn, 8, tokenOut, 8) + s.assertDexBalances(2, 8) +} + +func (s *LiquidityTestSuite) TestSwap0To1LOMaxAmountUsedMultiTick() { + // GIVEN 50 TokenB available + s.placeGTCLimitOrder("TokenB", 5, 0) + s.placeGTCLimitOrder("TokenB", 5, 1) + s.placeGTCLimitOrder("TokenB", 5, 2) + s.placeGTCLimitOrder("TokenB", 5, 3) + s.placeGTCLimitOrder("TokenB", 30, 4) + + // WHEN swap 50 TokenA with maxOut of 20 + tokenIn, tokenOut := s.swapWithMaxOut("TokenA", "TokenB", 50, 20) + + // THEN swap should return 23 TokenA in and 20 TokenB out + s.assertSwapOutput(tokenIn, 23, tokenOut, 20) + s.assertDexBalances(23, 30) +} + +func (s *LiquidityTestSuite) TestSwap1To0LOMaxAmountUsedMultiTick() { + // GIVEN 50 TokenA available + s.placeGTCLimitOrder("TokenA", 5, 0) + s.placeGTCLimitOrder("TokenA", 5, 1) + s.placeGTCLimitOrder("TokenA", 5, 2) + s.placeGTCLimitOrder("TokenA", 5, 3) + s.placeGTCLimitOrder("TokenA", 30, 4) + + // WHEN swap 50 TokenB with maxOut of 20 + tokenIn, tokenOut := s.swapWithMaxOut("TokenB", "TokenA", 50, 20) + + // THEN swap should return 20 TokenB in and 20 TokenA out + s.assertSwapOutput(tokenIn, 20, tokenOut, 20) + s.assertDexBalances(30, 20) +} + +func (s *LiquidityTestSuite) TestSwap0To1LOMaxAmountNotUsedMultiTick() { + // GIVEN 50 TokenB available + s.placeGTCLimitOrder("TokenB", 5, 0) + s.placeGTCLimitOrder("TokenB", 5, 1) + s.placeGTCLimitOrder("TokenB", 5, 2) + s.placeGTCLimitOrder("TokenB", 5, 3) + s.placeGTCLimitOrder("TokenB", 30, 4) + + // WHEN swap 19 TokenA with maxOut of 20 + tokenIn, tokenOut := s.swapWithMaxOut("TokenA", "TokenB", 19, 20) + + // THEN swap should return 19 TokenA in and 16 TokenB out + s.assertSwapOutput(tokenIn, 19, tokenOut, 16) + s.assertDexBalances(19, 34) +} + +// Swap LO and LP //////////////////////////////////////////////////////////// + +func (s *LiquidityTestSuite) TestSwapExhaustsLOAndLP() { + s.placeGTCLimitOrder("TokenB", 10, 0) + + s.addDeposits(NewDeposit(0, 10, 0, 1)) + + s.swapWithMaxOut("TokenA", "TokenB", 19, 20) + + // There should be total of 6 tick updates + // (limitOrder, 2x deposit, 2x swap LP, swap LO) + keepertest.AssertNEventsEmitted(s.T(), s.ctx, types.TickUpdateEventKey, 6) +} + +// Test helpers /////////////////////////////////////////////////////////////// + +func (s *LiquidityTestSuite) addDeposit(deposit *Deposit) { + pool, err := s.app.DexKeeper.GetOrInitPool(s.ctx, defaultPairID, deposit.TickIndex, deposit.Fee) + s.Assert().NoError(err) + pool.LowerTick0.ReservesMakerDenom = pool.LowerTick0.ReservesMakerDenom.Add(deposit.AmountA) + pool.UpperTick1.ReservesMakerDenom = pool.UpperTick1.ReservesMakerDenom.Add(deposit.AmountB) + s.app.DexKeeper.SetPool(s.ctx, pool) +} + +func (s *LiquidityTestSuite) addDeposits(deposits ...*Deposit) { + for _, deposit := range deposits { + s.addDeposit(deposit) + } +} + +func (s *LiquidityTestSuite) placeGTCLimitOrder( + makerDenom string, + amountIn int64, + tickIndex int64, +) { + tradePairID := defaultPairID.MustTradePairIDFromMaker(makerDenom) + tickIndexTakerToMaker := tradePairID.TickIndexTakerToMaker(tickIndex) + tranche, err := s.app.DexKeeper.GetOrInitPlaceTranche( + s.ctx, + tradePairID, + tickIndexTakerToMaker, + nil, + types.LimitOrderType_GOOD_TIL_CANCELLED, + ) + s.Assert().NoError(err) + tranche.PlaceMakerLimitOrder(sdk.NewInt(amountIn)) + s.app.DexKeeper.SaveTranche(s.ctx, tranche) +} + +func (s *LiquidityTestSuite) swap( + tokenIn string, + tokenOut string, + maxAmountIn int64, +) (coinIn, coinOut sdk.Coin) { + tradePairID, err := types.NewTradePairID(tokenIn, tokenOut) + s.Assert().NoError(err) + coinIn, coinOut, _, err = s.app.DexKeeper.Swap( + s.ctx, + tradePairID, + sdk.NewInt(maxAmountIn), + nil, + nil, + ) + s.Assert().NoError(err) + return coinIn, coinOut +} + +func (s *LiquidityTestSuite) swapWithMaxOut( + tokenIn string, + tokenOut string, + maxAmountIn int64, + maxAmountOut int64, +) (coinIn, coinOut sdk.Coin) { + tradePairID := types.MustNewTradePairID(tokenIn, tokenOut) + maxAmountOutInt := sdk.NewInt(maxAmountOut) + coinIn, coinOut, _, err := s.app.DexKeeper.Swap( + s.ctx, + tradePairID, + sdk.NewInt(maxAmountIn), + &maxAmountOutInt, + nil, + ) + s.Assert().NoError(err) + + return coinIn, coinOut +} + +func (s *LiquidityTestSuite) assertSwapOutput( + actualIn sdk.Coin, + expectedIn int64, + actualOut sdk.Coin, + expectedOut int64, +) { + amtIn := actualIn.Amount + amtOut := actualOut.Amount + + s.Assert(). + True(amtIn.Equal(sdk.NewInt(expectedIn)), "Expected amountIn %d != %s", expectedIn, amtIn) + s.Assert(). + True(amtOut.Equal(sdk.NewInt(expectedOut)), "Expected amountOut %d != %s", expectedOut, amtOut) +} + +func (s *LiquidityTestSuite) assertDexBalances(expectedABalance int64, expectedBBalance int64) { + // NOTE: We can't just check the actual DEX bank balances since we are testing swap + // before any transfers take place. Instead we have to sum up the total amount of coins + // at each tick + expectedAInt := sdk.NewInt(expectedABalance) + expectedBInt := sdk.NewInt(expectedBBalance) + allCoins := sdk.Coins{} + ticks := s.app.DexKeeper.GetAllTickLiquidity(s.ctx) + inactiveLOs := s.app.DexKeeper.GetAllInactiveLimitOrderTranche(s.ctx) + + for _, tick := range ticks { + switch liquidity := tick.Liquidity.(type) { + case *types.TickLiquidity_LimitOrderTranche: + tokenIn := liquidity.LimitOrderTranche.Key.TradePairID.MakerDenom + amountIn := liquidity.LimitOrderTranche.ReservesMakerDenom + allCoins = allCoins.Add(sdk.NewCoin(tokenIn, amountIn)) + + tokenOut := liquidity.LimitOrderTranche.Key.TradePairID.TakerDenom + amountOut := liquidity.LimitOrderTranche.ReservesTakerDenom + allCoins = allCoins.Add(sdk.NewCoin(tokenOut, amountOut)) + + case *types.TickLiquidity_PoolReserves: + tokenIn := liquidity.PoolReserves.Key.TradePairID.MakerDenom + reserves := liquidity.PoolReserves.ReservesMakerDenom + allCoins = allCoins.Add(sdk.NewCoin(tokenIn, reserves)) + } + } + + for _, lo := range inactiveLOs { + tokenOut := lo.Key.TradePairID.TakerDenom + amountOut := lo.ReservesTakerDenom + allCoins = allCoins.Add(sdk.NewCoin(tokenOut, amountOut)) + } + + actualA := allCoins.AmountOf("TokenA") + actualB := allCoins.AmountOf("TokenB") + + s.Assert(). + True(actualA.Equal(expectedAInt), "TokenA: expected %s != actual %s", expectedAInt, actualA) + s.Assert(). + True(actualB.Equal(expectedBInt), "TokenB: expected %s != actual %s", expectedBInt, actualB) +} + +func (s *LiquidityTestSuite) assertCurr0To1(curr0To1Expected int64) { + curr0To1Actual, found := s.app.DexKeeper.GetCurrTickIndexTakerToMakerNormalized( + s.ctx, + defaultTradePairID0To1, + ) + if curr0To1Expected == math.MaxInt64 { + s.Assert().False(found) + } else { + s.Assert().Equal(curr0To1Expected, curr0To1Actual) + } +} + +func (s *LiquidityTestSuite) assertCurr1To0(curr1To0Expected int64) { + curr1to0Actual, found := s.app.DexKeeper.GetCurrTickIndexTakerToMakerNormalized( + s.ctx, + defaultTradePairID1To0, + ) + if curr1To0Expected == math.MinInt64 { + s.Assert().False(found) + } else { + s.Assert().Equal(curr1To0Expected, curr1to0Actual) + } +} + +func (s *LiquidityTestSuite) assertFillAndPlaceTrancheKeys( + selling string, + tickIndex int64, + expectedFill, expectedPlace string, +) { + tradePairID := defaultPairID.MustTradePairIDFromMaker(selling) + placeTranche := s.app.DexKeeper.GetPlaceTranche(s.ctx, tradePairID, tickIndex) + fillTranche, foundFill := s.app.DexKeeper.GetFillTranche(s.ctx, tradePairID, tickIndex) + placeKey, fillKey := "", "" + if placeTranche != nil { + placeKey = placeTranche.Key.TrancheKey + } + + if foundFill { + fillKey = fillTranche.Key.TrancheKey + } + s.Assert().Equal(expectedFill, fillKey) + s.Assert().Equal(expectedPlace, placeKey) +} diff --git a/x/dex/keeper/msg_server.go b/x/dex/keeper/msg_server.go new file mode 100644 index 000000000..1f36797b0 --- /dev/null +++ b/x/dex/keeper/msg_server.go @@ -0,0 +1,183 @@ +package keeper + +import ( + "context" + + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/neutron-org/neutron/x/dex/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{} + +func (k MsgServer) Deposit( + goCtx context.Context, + msg *types.MsgDeposit, +) (*types.MsgDepositResponse, error) { + callerAddr := sdk.MustAccAddressFromBech32(msg.Creator) + receiverAddr := sdk.MustAccAddressFromBech32(msg.Receiver) + + pairID, err := types.NewPairIDFromUnsorted(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) + + Amounts0Deposit, Amounts1Deposit, _, err := k.DepositCore( + goCtx, + pairID, + callerAddr, + receiverAddr, + amounts0, + amounts1, + tickIndexes, + msg.Fees, + msg.Options, + ) + if err != nil { + return nil, err + } + + return &types.MsgDepositResponse{ + Reserve0Deposited: Amounts0Deposit, + Reserve1Deposited: Amounts1Deposit, + }, nil +} + +func (k MsgServer) Withdrawal( + goCtx context.Context, + msg *types.MsgWithdrawal, +) (*types.MsgWithdrawalResponse, error) { + callerAddr := sdk.MustAccAddressFromBech32(msg.Creator) + receiverAddr := sdk.MustAccAddressFromBech32(msg.Receiver) + + pairID, err := types.NewPairIDFromUnsorted(msg.TokenA, msg.TokenB) + if err != nil { + return nil, err + } + + tickIndexes := NormalizeAllTickIndexes(msg.TokenA, pairID.Token0, msg.TickIndexesAToB) + + err = k.WithdrawCore( + goCtx, + pairID, + callerAddr, + receiverAddr, + msg.SharesToRemove, + tickIndexes, + msg.Fees, + ) + if err != nil { + return nil, err + } + + return &types.MsgWithdrawalResponse{}, nil +} + +func (k MsgServer) PlaceLimitOrder( + goCtx context.Context, + msg *types.MsgPlaceLimitOrder, +) (*types.MsgPlaceLimitOrderResponse, error) { + ctx := sdk.UnwrapSDKContext(goCtx) + + callerAddr := sdk.MustAccAddressFromBech32(msg.Creator) + receiverAddr := sdk.MustAccAddressFromBech32(msg.Receiver) + + err := msg.ValidateGoodTilExpiration(ctx.BlockTime()) + if err != nil { + return &types.MsgPlaceLimitOrderResponse{}, err + } + trancheKey, coinIn, _, coinOutSwap, err := k.PlaceLimitOrderCore( + goCtx, + msg.TokenIn, + msg.TokenOut, + msg.AmountIn, + msg.TickIndexInToOut, + msg.OrderType, + msg.ExpirationTime, + msg.MaxAmountOut, + callerAddr, + receiverAddr, + ) + if err != nil { + return &types.MsgPlaceLimitOrderResponse{}, err + } + + return &types.MsgPlaceLimitOrderResponse{ + TrancheKey: trancheKey, + CoinIn: coinIn, + TakerCoinOut: coinOutSwap, + }, nil +} + +func (k MsgServer) WithdrawFilledLimitOrder( + goCtx context.Context, + msg *types.MsgWithdrawFilledLimitOrder, +) (*types.MsgWithdrawFilledLimitOrderResponse, error) { + callerAddr := sdk.MustAccAddressFromBech32(msg.Creator) + + err := k.WithdrawFilledLimitOrderCore( + goCtx, + msg.TrancheKey, + callerAddr, + ) + if err != nil { + return &types.MsgWithdrawFilledLimitOrderResponse{}, err + } + + return &types.MsgWithdrawFilledLimitOrderResponse{}, nil +} + +func (k MsgServer) CancelLimitOrder( + goCtx context.Context, + msg *types.MsgCancelLimitOrder, +) (*types.MsgCancelLimitOrderResponse, error) { + callerAddr := sdk.MustAccAddressFromBech32(msg.Creator) + + err := k.CancelLimitOrderCore( + goCtx, + msg.TrancheKey, + callerAddr, + ) + if err != nil { + return &types.MsgCancelLimitOrderResponse{}, err + } + + return &types.MsgCancelLimitOrderResponse{}, nil +} + +func (k MsgServer) MultiHopSwap( + goCtx context.Context, + msg *types.MsgMultiHopSwap, +) (*types.MsgMultiHopSwapResponse, error) { + callerAddr := sdk.MustAccAddressFromBech32(msg.Creator) + receiverAddr := sdk.MustAccAddressFromBech32(msg.Receiver) + + coinOut, err := k.MultiHopSwapCore( + goCtx, + msg.AmountIn, + msg.Routes, + msg.ExitLimitPrice, + msg.PickBestRoute, + callerAddr, + receiverAddr, + ) + if err != nil { + return &types.MsgMultiHopSwapResponse{}, err + } + + return &types.MsgMultiHopSwapResponse{CoinOut: coinOut}, nil +} diff --git a/x/dex/keeper/msg_server_test.go b/x/dex/keeper/msg_server_test.go new file mode 100644 index 000000000..51955b5e4 --- /dev/null +++ b/x/dex/keeper/msg_server_test.go @@ -0,0 +1,1543 @@ +package keeper_test + +import ( + "context" + "math" + "testing" + "time" + + abci "github.com/cometbft/cometbft/abci/types" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + "github.com/cosmos/cosmos-sdk/baseapp" + sdk "github.com/cosmos/cosmos-sdk/types" + authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" + banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" + dualityapp "github.com/neutron-org/neutron/app" + math_utils "github.com/neutron-org/neutron/utils/math" + . "github.com/neutron-org/neutron/x/dex/keeper" + . "github.com/neutron-org/neutron/x/dex/keeper/internal/testutils" + "github.com/neutron-org/neutron/x/dex/types" + "github.com/stretchr/testify/suite" +) + +// / Test suite +type MsgServerTestSuite struct { + suite.Suite + app *dualityapp.App + msgServer types.MsgServer + ctx sdk.Context + queryClient types.QueryClient + alice sdk.AccAddress + bob sdk.AccAddress + carol sdk.AccAddress + dan sdk.AccAddress + goCtx context.Context +} + +var defaultPairID *types.PairID = &types.PairID{Token0: "TokenA", Token1: "TokenB"} + +var defaultTradePairID0To1 *types.TradePairID = &types.TradePairID{ + TakerDenom: "TokenA", + MakerDenom: "TokenB", +} + +var defaultTradePairID1To0 *types.TradePairID = &types.TradePairID{ + TakerDenom: "TokenB", + MakerDenom: "TokenA", +} + +func TestMsgServerTestSuite(t *testing.T) { + suite.Run(t, new(MsgServerTestSuite)) +} + +func (s *MsgServerTestSuite) SetupTest() { + app := dualityapp.Setup(s.T(), false) + ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx = ctx.WithBlockGasMeter(sdk.NewInfiniteGasMeter()) + + app.AccountKeeper.SetParams(ctx, authtypes.DefaultParams()) + app.BankKeeper.SetParams(ctx, banktypes.DefaultParams()) + + queryHelper := baseapp.NewQueryServerTestHelper(ctx, app.InterfaceRegistry()) + types.RegisterQueryServer(queryHelper, app.DexKeeper) + queryClient := types.NewQueryClient(queryHelper) + + accAlice := app.AccountKeeper.NewAccountWithAddress(ctx, s.alice) + app.AccountKeeper.SetAccount(ctx, accAlice) + accBob := app.AccountKeeper.NewAccountWithAddress(ctx, s.bob) + app.AccountKeeper.SetAccount(ctx, accBob) + accCarol := app.AccountKeeper.NewAccountWithAddress(ctx, s.carol) + app.AccountKeeper.SetAccount(ctx, accCarol) + accDan := app.AccountKeeper.NewAccountWithAddress(ctx, s.dan) + app.AccountKeeper.SetAccount(ctx, accDan) + + s.app = app + s.msgServer = NewMsgServerImpl(app.DexKeeper) + s.ctx = ctx + s.goCtx = sdk.WrapSDKContext(ctx) + s.queryClient = queryClient + s.alice = sdk.AccAddress([]byte("alice")) + s.bob = sdk.AccAddress([]byte("bob")) + s.carol = sdk.AccAddress([]byte("carol")) + s.dan = sdk.AccAddress([]byte("dan")) +} + +/// Fund accounts + +func (s *MsgServerTestSuite) fundAccountBalances(account sdk.AccAddress, aBalance, bBalance int64) { + aBalanceInt := sdk.NewInt(aBalance) + bBalanceInt := sdk.NewInt(bBalance) + balances := sdk.NewCoins(NewACoin(aBalanceInt), NewBCoin(bBalanceInt)) + err := FundAccount(s.app.BankKeeper, s.ctx, account, balances) + s.Assert().NoError(err) + s.assertAccountBalances(account, aBalance, bBalance) +} + +func (s *MsgServerTestSuite) fundAccountBalancesWithDenom( + addr sdk.AccAddress, + amounts sdk.Coins, +) error { + if err := s.app.BankKeeper.MintCoins(s.ctx, types.ModuleName, amounts); err != nil { + return err + } + + return s.app.BankKeeper.SendCoinsFromModuleToAccount(s.ctx, types.ModuleName, addr, amounts) +} + +func (s *MsgServerTestSuite) fundAliceBalances(a, b int64) { + s.fundAccountBalances(s.alice, a, b) +} + +func (s *MsgServerTestSuite) fundBobBalances(a, b int64) { + s.fundAccountBalances(s.bob, a, b) +} + +func (s *MsgServerTestSuite) fundCarolBalances(a, b int64) { + s.fundAccountBalances(s.carol, a, b) +} + +func (s *MsgServerTestSuite) fundDanBalances(a, b int64) { + s.fundAccountBalances(s.dan, a, b) +} + +/// Assert balances + +func (s *MsgServerTestSuite) assertAccountBalancesInt( + account sdk.AccAddress, + aBalance sdk.Int, + bBalance sdk.Int, +) { + aActual := s.app.BankKeeper.GetBalance(s.ctx, account, "TokenA").Amount + s.Assert().True(aBalance.Equal(aActual), "expected %s != actual %s", aBalance, aActual) + + bActual := s.app.BankKeeper.GetBalance(s.ctx, account, "TokenB").Amount + s.Assert().True(bBalance.Equal(bActual), "expected %s != actual %s", bBalance, bActual) +} + +func (s *MsgServerTestSuite) assertAccountBalances( + account sdk.AccAddress, + aBalance int64, + bBalance int64, +) { + s.assertAccountBalancesInt(account, sdk.NewInt(aBalance), sdk.NewInt(bBalance)) +} + +func (s *MsgServerTestSuite) assertAccountBalanceWithDenom( + account sdk.AccAddress, + denom string, + expBalance int64, +) { + actualBalance := s.app.BankKeeper.GetBalance(s.ctx, account, denom).Amount + expBalanceInt := sdk.NewInt(expBalance) + s.Assert(). + True(expBalanceInt.Equal(actualBalance), "expected %s != actual %s", expBalance, actualBalance) +} + +func (s *MsgServerTestSuite) assertAliceBalances(a, b int64) { + s.assertAccountBalances(s.alice, a, b) +} + +func (s *MsgServerTestSuite) assertAliceBalancesInt(a, b sdk.Int) { + s.assertAccountBalancesInt(s.alice, a, b) +} + +func (s *MsgServerTestSuite) assertBobBalances(a, b int64) { + s.assertAccountBalances(s.bob, a, b) +} + +func (s *MsgServerTestSuite) assertBobBalancesInt(a, b sdk.Int) { + s.assertAccountBalancesInt(s.bob, a, b) +} + +func (s *MsgServerTestSuite) assertCarolBalances(a, b int64) { + s.assertAccountBalances(s.carol, a, b) +} + +func (s *MsgServerTestSuite) assertCarolBalancesInt(a, b sdk.Int) { + s.assertAccountBalancesInt(s.carol, a, b) +} + +func (s *MsgServerTestSuite) assertDanBalances(a, b int64) { + s.assertAccountBalances(s.dan, a, b) +} + +func (s *MsgServerTestSuite) assertDanBalancesInt(a, b sdk.Int) { + s.assertAccountBalancesInt(s.dan, a, b) +} + +func (s *MsgServerTestSuite) assertDexBalances(a, b int64) { + s.assertAccountBalances(s.app.AccountKeeper.GetModuleAddress("dex"), a, b) +} + +func (s *MsgServerTestSuite) assertDexBalanceWithDenom(denom string, expectedAmount int64) { + s.assertAccountBalanceWithDenom( + s.app.AccountKeeper.GetModuleAddress("dex"), + denom, + expectedAmount, + ) +} + +func (s *MsgServerTestSuite) assertDexBalancesInt(a, b sdk.Int) { + s.assertAccountBalancesInt(s.app.AccountKeeper.GetModuleAddress("dex"), a, b) +} + +func (s *MsgServerTestSuite) traceBalances() { + aliceA := s.app.BankKeeper.GetBalance(s.ctx, s.alice, "TokenA") + aliceB := s.app.BankKeeper.GetBalance(s.ctx, s.alice, "TokenB") + bobA := s.app.BankKeeper.GetBalance(s.ctx, s.bob, "TokenA") + bobB := s.app.BankKeeper.GetBalance(s.ctx, s.bob, "TokenB") + carolA := s.app.BankKeeper.GetBalance(s.ctx, s.carol, "TokenA") + carolB := s.app.BankKeeper.GetBalance(s.ctx, s.carol, "TokenB") + danA := s.app.BankKeeper.GetBalance(s.ctx, s.dan, "TokenA") + danB := s.app.BankKeeper.GetBalance(s.ctx, s.dan, "TokenB") + s.T().Logf( + "Alice: %+v %+v\nBob: %+v %+v\nCarol: %+v %+v\nDan: %+v %+v", + aliceA, aliceB, + bobA, bobB, + carolA, carolB, + danA, danB, + ) +} + +/// Place limit order + +func (s *MsgServerTestSuite) aliceLimitSells( + selling string, + tick, amountIn int, + orderTypeOpt ...types.LimitOrderType, +) string { + return s.limitSellsSuccess(s.alice, selling, tick, amountIn, orderTypeOpt...) +} + +func (s *MsgServerTestSuite) bobLimitSells( + selling string, + tick, amountIn int, + orderTypeOpt ...types.LimitOrderType, +) string { + return s.limitSellsSuccess(s.bob, selling, tick, amountIn, orderTypeOpt...) +} + +func (s *MsgServerTestSuite) carolLimitSells( + selling string, + tick, amountIn int, + orderTypeOpt ...types.LimitOrderType, +) string { + return s.limitSellsSuccess(s.carol, selling, tick, amountIn, orderTypeOpt...) +} + +func (s *MsgServerTestSuite) danLimitSells( + selling string, + tick, amountIn int, + orderTypeOpt ...types.LimitOrderType, +) string { + return s.limitSellsSuccess(s.dan, selling, tick, amountIn, orderTypeOpt...) +} + +func (s *MsgServerTestSuite) limitSellsSuccess( + account sdk.AccAddress, + tokenIn string, + tick, amountIn int, + orderTypeOpt ...types.LimitOrderType, +) string { + trancheKey, err := s.limitSells(account, tokenIn, tick, amountIn, orderTypeOpt...) + s.Assert().Nil(err) + return trancheKey +} + +func (s *MsgServerTestSuite) aliceLimitSellsGoodTil( + selling string, + tick, amountIn int, + goodTil time.Time, +) string { + return s.limitSellsGoodTil(s.alice, selling, tick, amountIn, goodTil) +} + +func (s *MsgServerTestSuite) bobLimitSellsGoodTil( + selling string, + tick, amountIn int, + goodTil time.Time, +) string { + return s.limitSellsGoodTil(s.bob, selling, tick, amountIn, goodTil) +} + +func (s *MsgServerTestSuite) carolLimitSellsGoodTil( + selling string, + tick, amountIn int, + goodTil time.Time, +) string { + return s.limitSellsGoodTil(s.carol, selling, tick, amountIn, goodTil) +} + +func (s *MsgServerTestSuite) danLimitSellsGoodTil( + selling string, + tick, amountIn int, + goodTil time.Time, +) string { + return s.limitSellsGoodTil(s.dan, selling, tick, amountIn, goodTil) +} + +func (s *MsgServerTestSuite) assertAliceLimitSellFails( + err error, + selling string, + tickIndexNormalized, amountIn int, + orderTypeOpt ...types.LimitOrderType, +) { + s.assertLimitSellFails(s.alice, err, selling, tickIndexNormalized, amountIn, orderTypeOpt...) +} + +func (s *MsgServerTestSuite) assertBobLimitSellFails( + err error, + selling string, + tickIndexNormalized, amountIn int, + orderTypeOpt ...types.LimitOrderType, +) { + s.assertLimitSellFails(s.bob, err, selling, tickIndexNormalized, amountIn, orderTypeOpt...) +} + +func (s *MsgServerTestSuite) assertCarolLimitSellFails( + err error, + selling string, + tickIndexNormalized, amountIn int, + orderTypeOpt ...types.LimitOrderType, +) { + s.assertLimitSellFails(s.carol, err, selling, tickIndexNormalized, amountIn, orderTypeOpt...) +} + +func (s *MsgServerTestSuite) assertDanLimitSellFails( + err error, + selling string, + tickIndexNormalized, amountIn int, + orderTypeOpt ...types.LimitOrderType, +) { + s.assertLimitSellFails(s.dan, err, selling, tickIndexNormalized, amountIn, orderTypeOpt...) +} + +func (s *MsgServerTestSuite) assertLimitSellFails( + account sdk.AccAddress, + expectedErr error, + tokenIn string, + tickIndexNormalized, amountIn int, + orderTypeOpt ...types.LimitOrderType, +) { + _, err := s.limitSells(account, tokenIn, tickIndexNormalized, amountIn, orderTypeOpt...) + s.Assert().ErrorIs(err, expectedErr) +} + +func (s *MsgServerTestSuite) aliceLimitSellsWithMaxOut( + selling string, + tick, amountIn, maxAmountOut int, +) string { + return s.limitSellsWithMaxOut(s.alice, selling, tick, amountIn, maxAmountOut) +} + +func (s *MsgServerTestSuite) bobLimitSellsWithMaxOut( + selling string, + tick, amountIn, maxAmountOut int, +) string { + return s.limitSellsWithMaxOut(s.bob, selling, tick, amountIn, maxAmountOut) +} + +func (s *MsgServerTestSuite) carolLimitSellsWithMaxOut( + selling string, + tick, amountIn, maxAmountOut int, +) string { + return s.limitSellsWithMaxOut(s.carol, selling, tick, amountIn, maxAmountOut) +} + +func (s *MsgServerTestSuite) danLimitSellsWithMaxOut( + selling string, + tick, amountIn, maxAmountOut int, +) string { + return s.limitSellsWithMaxOut(s.dan, selling, tick, amountIn, maxAmountOut) +} + +func (s *MsgServerTestSuite) limitSellsWithMaxOut( + account sdk.AccAddress, + tokenIn string, + tick, amountIn int, + maxAmoutOut int, +) string { + tokenIn, tokenOut := GetInOutTokens(tokenIn, "TokenA", "TokenB") + maxAmountOutInt := sdk.NewInt(int64(maxAmoutOut)) + + msg, err := s.msgServer.PlaceLimitOrder(s.goCtx, &types.MsgPlaceLimitOrder{ + Creator: account.String(), + Receiver: account.String(), + TokenIn: tokenIn, + TokenOut: tokenOut, + TickIndexInToOut: int64(tick), + AmountIn: sdk.NewInt(int64(amountIn)), + OrderType: types.LimitOrderType_FILL_OR_KILL, + MaxAmountOut: &maxAmountOutInt, + }) + + s.Assert().NoError(err) + + return msg.TrancheKey +} + +func (s *MsgServerTestSuite) limitSells( + account sdk.AccAddress, + tokenIn string, + tickIndexNormalized, amountIn int, + orderTypeOpt ...types.LimitOrderType, +) (string, error) { + var orderType types.LimitOrderType + if len(orderTypeOpt) == 0 { + orderType = types.LimitOrderType_GOOD_TIL_CANCELLED + } else { + orderType = orderTypeOpt[0] + } + + tradePairID := types.NewTradePairIDFromTaker(defaultPairID, tokenIn) + tickIndexTakerToMaker := tradePairID.TickIndexTakerToMaker(int64(tickIndexNormalized)) + msg, err := s.msgServer.PlaceLimitOrder(s.goCtx, &types.MsgPlaceLimitOrder{ + Creator: account.String(), + Receiver: account.String(), + TokenIn: tradePairID.TakerDenom, + TokenOut: tradePairID.MakerDenom, + TickIndexInToOut: tickIndexTakerToMaker, + AmountIn: sdk.NewInt(int64(amountIn)), + OrderType: orderType, + }) + + return msg.TrancheKey, err +} + +func (s *MsgServerTestSuite) limitSellsGoodTil( + account sdk.AccAddress, + tokenIn string, + tick, amountIn int, + goodTil time.Time, +) string { + tradePairID := types.NewTradePairIDFromTaker(defaultPairID, tokenIn) + tickIndexTakerToMaker := tradePairID.TickIndexTakerToMaker(int64(tick)) + + msg, err := s.msgServer.PlaceLimitOrder(s.goCtx, &types.MsgPlaceLimitOrder{ + Creator: account.String(), + Receiver: account.String(), + TokenIn: tradePairID.TakerDenom, + TokenOut: tradePairID.MakerDenom, + TickIndexInToOut: tickIndexTakerToMaker, + AmountIn: sdk.NewInt(int64(amountIn)), + OrderType: types.LimitOrderType_GOOD_TIL_TIME, + ExpirationTime: &goodTil, + }) + + s.Assert().NoError(err) + + return msg.TrancheKey +} + +// / Deposit +type Deposit struct { + AmountA sdk.Int + AmountB sdk.Int + TickIndex int64 + Fee uint64 +} + +type DepositOptions struct { + DisableAutoswap bool +} + +type DepositWithOptions struct { + AmountA sdk.Int + AmountB sdk.Int + TickIndex int64 + Fee uint64 + Options DepositOptions +} + +func NewDeposit(amountA, amountB, tickIndex, fee int) *Deposit { + return &Deposit{ + AmountA: sdk.NewInt(int64(amountA)), + AmountB: sdk.NewInt(int64(amountB)), + TickIndex: int64(tickIndex), + Fee: uint64(fee), + } +} + +func NewDepositWithOptions( + amountA, amountB, tickIndex, fee int, + options DepositOptions, +) *DepositWithOptions { + return &DepositWithOptions{ + AmountA: sdk.NewInt(int64(amountA)), + AmountB: sdk.NewInt(int64(amountB)), + TickIndex: int64(tickIndex), + Fee: uint64(fee), + Options: options, + } +} + +func (s *MsgServerTestSuite) aliceDeposits(deposits ...*Deposit) { + s.deposits(s.alice, deposits) +} + +func (s *MsgServerTestSuite) aliceDepositsWithOptions(deposits ...*DepositWithOptions) { + s.depositsWithOptions(s.alice, deposits...) +} + +func (s *MsgServerTestSuite) bobDeposits(deposits ...*Deposit) { + s.deposits(s.bob, deposits) +} + +func (s *MsgServerTestSuite) bobDepositsWithOptions(deposits ...*DepositWithOptions) { + s.depositsWithOptions(s.bob, deposits...) +} + +func (s *MsgServerTestSuite) carolDeposits(deposits ...*Deposit) { + s.deposits(s.carol, deposits) +} + +func (s *MsgServerTestSuite) danDeposits(deposits ...*Deposit) { + s.deposits(s.dan, deposits) +} + +func (s *MsgServerTestSuite) deposits( + account sdk.AccAddress, + deposits []*Deposit, + pairID ...types.PairID, +) { + amountsA := make([]sdk.Int, len(deposits)) + amountsB := make([]sdk.Int, len(deposits)) + tickIndexes := make([]int64, len(deposits)) + fees := make([]uint64, len(deposits)) + options := make([]*types.DepositOptions, len(deposits)) + for i, e := range deposits { + amountsA[i] = e.AmountA + amountsB[i] = e.AmountB + tickIndexes[i] = e.TickIndex + fees[i] = e.Fee + options[i] = &types.DepositOptions{DisableAutoswap: false} + } + + var tokenA, tokenB string + switch { + case len(pairID) == 0: + tokenA = "TokenA" + tokenB = "TokenB" + case len(pairID) == 1: + tokenA = pairID[0].Token0 + tokenB = pairID[0].Token1 + case len(pairID) > 1: + s.Assert().Fail("Only 1 pairID can be provided") + } + + _, err := s.msgServer.Deposit(s.goCtx, &types.MsgDeposit{ + Creator: account.String(), + Receiver: account.String(), + TokenA: tokenA, + TokenB: tokenB, + AmountsA: amountsA, + AmountsB: amountsB, + TickIndexesAToB: tickIndexes, + Fees: fees, + Options: options, + }) + s.Assert().Nil(err) +} + +func (s *MsgServerTestSuite) depositsWithOptions( + account sdk.AccAddress, + deposits ...*DepositWithOptions, +) { + amountsA := make([]sdk.Int, len(deposits)) + amountsB := make([]sdk.Int, len(deposits)) + tickIndexes := make([]int64, len(deposits)) + fees := make([]uint64, len(deposits)) + options := make([]*types.DepositOptions, len(deposits)) + for i, e := range deposits { + amountsA[i] = e.AmountA + amountsB[i] = e.AmountB + tickIndexes[i] = e.TickIndex + fees[i] = e.Fee + options[i] = &types.DepositOptions{ + DisableAutoswap: e.Options.DisableAutoswap, + } + } + + _, err := s.msgServer.Deposit(s.goCtx, &types.MsgDeposit{ + Creator: account.String(), + Receiver: account.String(), + TokenA: "TokenA", + TokenB: "TokenB", + AmountsA: amountsA, + AmountsB: amountsB, + TickIndexesAToB: tickIndexes, + Fees: fees, + Options: options, + }) + s.Assert().Nil(err) +} + +func (s *MsgServerTestSuite) getLiquidityAtTick(tickIndex int64, fee uint64) (sdk.Int, sdk.Int) { + pool, err := s.app.DexKeeper.GetOrInitPool(s.ctx, defaultPairID, tickIndex, fee) + s.Assert().NoError(err) + + liquidityA := pool.LowerTick0.ReservesMakerDenom + liquidityB := pool.UpperTick1.ReservesMakerDenom + + return liquidityA, liquidityB +} + +func (s *MsgServerTestSuite) getLiquidityAtTickWithDenom( + pairID *types.PairID, + tickIndex int64, + fee uint64, +) (sdk.Int, sdk.Int) { + pool, err := s.app.DexKeeper.GetOrInitPool(s.ctx, pairID, tickIndex, fee) + s.Assert().NoError(err) + + liquidityA := pool.LowerTick0.ReservesMakerDenom + liquidityB := pool.UpperTick1.ReservesMakerDenom + + return liquidityA, liquidityB +} + +func (s *MsgServerTestSuite) assertAliceDepositFails(err error, deposits ...*Deposit) { + s.assertDepositFails(s.alice, err, deposits...) +} + +func (s *MsgServerTestSuite) assertBobDepositFails(err error, deposits ...*Deposit) { + s.assertDepositFails(s.bob, err, deposits...) +} + +func (s *MsgServerTestSuite) assertCarolDepositFails(err error, deposits ...*Deposit) { + s.assertDepositFails(s.carol, err, deposits...) +} + +func (s *MsgServerTestSuite) assertDanDepositFails(err error, deposits ...*Deposit) { + s.assertDepositFails(s.dan, err, deposits...) +} + +func (s *MsgServerTestSuite) assertDepositFails( + account sdk.AccAddress, + expectedErr error, + deposits ...*Deposit, +) { + amountsA := make([]sdk.Int, len(deposits)) + amountsB := make([]sdk.Int, len(deposits)) + tickIndexes := make([]int64, len(deposits)) + fees := make([]uint64, len(deposits)) + options := make([]*types.DepositOptions, len(deposits)) + for i, e := range deposits { + amountsA[i] = e.AmountA + amountsB[i] = e.AmountB + tickIndexes[i] = e.TickIndex + fees[i] = e.Fee + options[i] = &types.DepositOptions{DisableAutoswap: true} + } + + _, err := s.msgServer.Deposit(s.goCtx, &types.MsgDeposit{ + Creator: account.String(), + Receiver: account.String(), + TokenA: "TokenA", + TokenB: "TokenB", + AmountsA: amountsA, + AmountsB: amountsB, + TickIndexesAToB: tickIndexes, + Fees: fees, + Options: options, + }) + s.Assert().NotNil(err) + s.Assert().ErrorIs(err, expectedErr) +} + +func (s *MsgServerTestSuite) assertDepositReponse( + depositResponse, expectedDepositResponse DepositReponse, +) { + for i := range expectedDepositResponse.amountsA { + s.Assert().Equal( + depositResponse.amountsA[i], + expectedDepositResponse.amountsA[i], + "Assertion failed for response.amountsA[%d]", i, + ) + s.Assert().Equal( + depositResponse.amountsB[i], + expectedDepositResponse.amountsB[i], + "Assertion failed for response.amountsB[%d]", i, + ) + } +} + +type DepositReponse struct { + amountsA []sdk.Int + amountsB []sdk.Int +} + +// Withdraw +type Withdrawal struct { + TickIndex int64 + Fee uint64 + Shares sdk.Int +} + +func NewWithdrawalInt(shares sdk.Int, tick int64, fee uint64) *Withdrawal { + return &Withdrawal{ + Shares: shares, + Fee: fee, + TickIndex: tick, + } +} + +func NewWithdrawal(shares, tick int64, fee uint64) *Withdrawal { + return NewWithdrawalInt(sdk.NewInt(shares), tick, fee) +} + +func (s *MsgServerTestSuite) aliceWithdraws(withdrawals ...*Withdrawal) { + s.withdraws(s.alice, withdrawals...) +} + +func (s *MsgServerTestSuite) bobWithdraws(withdrawals ...*Withdrawal) { + s.withdraws(s.bob, withdrawals...) +} + +func (s *MsgServerTestSuite) carolWithdraws(withdrawals ...*Withdrawal) { + s.withdraws(s.carol, withdrawals...) +} + +func (s *MsgServerTestSuite) danWithdraws(withdrawals ...*Withdrawal) { + s.withdraws(s.dan, withdrawals...) +} + +func (s *MsgServerTestSuite) withdraws(account sdk.AccAddress, withdrawals ...*Withdrawal) { + tickIndexes := make([]int64, len(withdrawals)) + fee := make([]uint64, len(withdrawals)) + sharesToRemove := make([]sdk.Int, len(withdrawals)) + for i, e := range withdrawals { + tickIndexes[i] = e.TickIndex + fee[i] = e.Fee + sharesToRemove[i] = e.Shares + } + + _, err := s.msgServer.Withdrawal(s.goCtx, &types.MsgWithdrawal{ + Creator: account.String(), + Receiver: account.String(), + TokenA: "TokenA", + TokenB: "TokenB", + SharesToRemove: sharesToRemove, + TickIndexesAToB: tickIndexes, + Fees: fee, + }) + s.Assert().Nil(err) +} + +func (s *MsgServerTestSuite) aliceWithdrawFails(expectedErr error, withdrawals ...*Withdrawal) { + s.withdrawFails(s.alice, expectedErr, withdrawals...) +} + +func (s *MsgServerTestSuite) bobWithdrawFails(expectedErr error, withdrawals ...*Withdrawal) { + s.withdrawFails(s.bob, expectedErr, withdrawals...) +} + +func (s *MsgServerTestSuite) carolWithdrawFails(expectedErr error, withdrawals ...*Withdrawal) { + s.withdrawFails(s.carol, expectedErr, withdrawals...) +} + +func (s *MsgServerTestSuite) danWithdrawFails(expectedErr error, withdrawals ...*Withdrawal) { + s.withdrawFails(s.dan, expectedErr, withdrawals...) +} + +func (s *MsgServerTestSuite) withdrawFails( + account sdk.AccAddress, + expectedErr error, + withdrawals ...*Withdrawal, +) { + tickIndexes := make([]int64, len(withdrawals)) + fee := make([]uint64, len(withdrawals)) + sharesToRemove := make([]sdk.Int, len(withdrawals)) + for i, e := range withdrawals { + tickIndexes[i] = e.TickIndex + fee[i] = e.Fee + sharesToRemove[i] = e.Shares + } + + _, err := s.msgServer.Withdrawal(s.goCtx, &types.MsgWithdrawal{ + Creator: account.String(), + Receiver: account.String(), + TokenA: "TokenA", + TokenB: "TokenB", + SharesToRemove: sharesToRemove, + TickIndexesAToB: tickIndexes, + Fees: fee, + }) + s.Assert().NotNil(err) + s.Assert().ErrorIs(err, expectedErr) +} + +/// Cancel limit order + +func (s *MsgServerTestSuite) aliceCancelsLimitSell(trancheKey string) { + s.cancelsLimitSell(s.alice, trancheKey) +} + +func (s *MsgServerTestSuite) bobCancelsLimitSell(trancheKey string) { + s.cancelsLimitSell(s.bob, trancheKey) +} + +func (s *MsgServerTestSuite) carolCancelsLimitSell(trancheKey string) { + s.cancelsLimitSell(s.carol, trancheKey) +} + +func (s *MsgServerTestSuite) danCancelsLimitSell(trancheKey string) { + s.cancelsLimitSell(s.dan, trancheKey) +} + +func (s *MsgServerTestSuite) cancelsLimitSell(account sdk.AccAddress, trancheKey string) { + _, err := s.msgServer.CancelLimitOrder(s.goCtx, &types.MsgCancelLimitOrder{ + Creator: account.String(), + TrancheKey: trancheKey, + }) + s.Assert().Nil(err) +} + +func (s *MsgServerTestSuite) aliceCancelsLimitSellFails(trancheKey string, expectedErr error) { + s.cancelsLimitSellFails(s.alice, trancheKey, expectedErr) +} + +func (s *MsgServerTestSuite) bobCancelsLimitSellFails(trancheKey string, expectedErr error) { + s.cancelsLimitSellFails(s.bob, trancheKey, expectedErr) +} + +func (s *MsgServerTestSuite) carolCancelsLimitSellFails(trancheKey string, expectedErr error) { + s.cancelsLimitSellFails(s.carol, trancheKey, expectedErr) +} + +func (s *MsgServerTestSuite) danCancelsLimitSellFails(trancheKey string, expectedErr error) { + s.cancelsLimitSellFails(s.dan, trancheKey, expectedErr) +} + +func (s *MsgServerTestSuite) cancelsLimitSellFails( + account sdk.AccAddress, + trancheKey string, + expectedErr error, +) { + _, err := s.msgServer.CancelLimitOrder(s.goCtx, &types.MsgCancelLimitOrder{ + Creator: account.String(), + TrancheKey: trancheKey, + }) + s.Assert().ErrorIs(err, expectedErr) +} + +/// MultiHopSwap + +func (s *MsgServerTestSuite) aliceMultiHopSwaps( + routes [][]string, + amountIn int, + exitLimitPrice math_utils.PrecDec, + pickBest bool, +) { + s.multiHopSwaps(s.alice, routes, amountIn, exitLimitPrice, pickBest) +} + +func (s *MsgServerTestSuite) bobMultiHopSwaps( + routes [][]string, + amountIn int, + exitLimitPrice math_utils.PrecDec, + pickBest bool, +) { + s.multiHopSwaps(s.bob, routes, amountIn, exitLimitPrice, pickBest) +} + +func (s *MsgServerTestSuite) carolMultiHopSwaps( + routes [][]string, + amountIn int, + exitLimitPrice math_utils.PrecDec, + pickBest bool, +) { + s.multiHopSwaps(s.carol, routes, amountIn, exitLimitPrice, pickBest) +} + +func (s *MsgServerTestSuite) danMultiHopSwaps( + routes [][]string, + amountIn int, + exitLimitPrice math_utils.PrecDec, + pickBest bool, +) { + s.multiHopSwaps(s.dan, routes, amountIn, exitLimitPrice, pickBest) +} + +func (s *MsgServerTestSuite) multiHopSwaps( + account sdk.AccAddress, + routes [][]string, + amountIn int, + exitLimitPrice math_utils.PrecDec, + pickBest bool, +) { + msg := types.NewMsgMultiHopSwap( + account.String(), + account.String(), + routes, + sdk.NewInt(int64(amountIn)), + exitLimitPrice, + pickBest, + ) + _, err := s.msgServer.MultiHopSwap(s.goCtx, msg) + s.Assert().Nil(err) +} + +func (s *MsgServerTestSuite) aliceEstimatesMultiHopSwap( + routes [][]string, + amountIn int, + exitLimitPrice math_utils.PrecDec, + pickBest bool, +) (coinOut sdk.Coin) { + multiHopRoutes := make([]*types.MultiHopRoute, len(routes)) + for i, hops := range routes { + multiHopRoutes[i] = &types.MultiHopRoute{Hops: hops} + } + msg := &types.QueryEstimateMultiHopSwapRequest{ + Creator: s.alice.String(), + Receiver: s.alice.String(), + Routes: multiHopRoutes, + AmountIn: sdk.NewInt(int64(amountIn)), + ExitLimitPrice: exitLimitPrice, + PickBestRoute: pickBest, + } + res, err := s.queryClient.EstimateMultiHopSwap(s.goCtx, msg) + s.Require().Nil(err) + return res.CoinOut +} + +func (s *MsgServerTestSuite) aliceEstimatesMultiHopSwapFails( + expectedErr error, + routes [][]string, + amountIn int, + exitLimitPrice math_utils.PrecDec, + pickBest bool, +) { + multiHopRoutes := make([]*types.MultiHopRoute, len(routes)) + for i, hops := range routes { + multiHopRoutes[i] = &types.MultiHopRoute{Hops: hops} + } + msg := &types.QueryEstimateMultiHopSwapRequest{ + Creator: s.alice.String(), + Receiver: s.alice.String(), + Routes: multiHopRoutes, + AmountIn: sdk.NewInt(int64(amountIn)), + ExitLimitPrice: exitLimitPrice, + PickBestRoute: pickBest, + } + _, err := s.queryClient.EstimateMultiHopSwap(s.goCtx, msg) + s.Assert().ErrorIs(err, expectedErr) +} + +func (s *MsgServerTestSuite) aliceMultiHopSwapFails( + err error, + routes [][]string, + amountIn int, + exitLimitPrice math_utils.PrecDec, + pickBest bool, +) { + s.multiHopSwapFails(s.alice, err, routes, amountIn, exitLimitPrice, pickBest) +} + +func (s *MsgServerTestSuite) bobMultiHopSwapFails( + err error, + routes [][]string, + amountIn int, + exitLimitPrice math_utils.PrecDec, + pickBest bool, +) { + s.multiHopSwapFails(s.bob, err, routes, amountIn, exitLimitPrice, pickBest) +} + +func (s *MsgServerTestSuite) carolMultiHopSwapFails( + err error, + routes [][]string, + amountIn int, + exitLimitPrice math_utils.PrecDec, + pickBest bool, +) { + s.multiHopSwapFails(s.carol, err, routes, amountIn, exitLimitPrice, pickBest) +} + +func (s *MsgServerTestSuite) danMultiHopSwapFails( + err error, + routes [][]string, + amountIn int, + exitLimitPrice math_utils.PrecDec, + pickBest bool, +) { + s.multiHopSwapFails(s.dan, err, routes, amountIn, exitLimitPrice, pickBest) +} + +func (s *MsgServerTestSuite) multiHopSwapFails( + account sdk.AccAddress, + expectedErr error, + routes [][]string, + amountIn int, + exitLimitPrice math_utils.PrecDec, + pickBest bool, +) { + msg := types.NewMsgMultiHopSwap( + account.String(), + account.String(), + routes, + sdk.NewInt(int64(amountIn)), + exitLimitPrice, + pickBest, + ) + _, err := s.msgServer.MultiHopSwap(s.goCtx, msg) + s.Assert().ErrorIs(err, expectedErr) +} + +/// Withdraw filled limit order + +func (s *MsgServerTestSuite) aliceWithdrawsLimitSell(trancheKey string) { + s.withdrawsLimitSell(s.alice, trancheKey) +} + +func (s *MsgServerTestSuite) bobWithdrawsLimitSell(trancheKey string) { + s.withdrawsLimitSell(s.bob, trancheKey) +} + +func (s *MsgServerTestSuite) carolWithdrawsLimitSell(trancheKey string) { + s.withdrawsLimitSell(s.carol, trancheKey) +} + +func (s *MsgServerTestSuite) danWithdrawsLimitSell(trancheKey string) { + s.withdrawsLimitSell(s.dan, trancheKey) +} + +func (s *MsgServerTestSuite) withdrawsLimitSell(account sdk.AccAddress, trancheKey string) { + _, err := s.msgServer.WithdrawFilledLimitOrder(s.goCtx, &types.MsgWithdrawFilledLimitOrder{ + Creator: account.String(), + TrancheKey: trancheKey, + }) + s.Assert().Nil(err) +} + +func (s *MsgServerTestSuite) aliceWithdrawLimitSellFails(expectedErr error, trancheKey string) { + s.withdrawLimitSellFails(s.alice, expectedErr, trancheKey) +} + +func (s *MsgServerTestSuite) bobWithdrawLimitSellFails(expectedErr error, trancheKey string) { + s.withdrawLimitSellFails(s.bob, expectedErr, trancheKey) +} + +func (s *MsgServerTestSuite) carolWithdrawLimitSellFails(expectedErr error, trancheKey string) { + s.withdrawLimitSellFails(s.carol, expectedErr, trancheKey) +} + +func (s *MsgServerTestSuite) danWithdrawLimitSellFails(expectedErr error, trancheKey string) { + s.withdrawLimitSellFails(s.dan, expectedErr, trancheKey) +} + +func (s *MsgServerTestSuite) withdrawLimitSellFails( + account sdk.AccAddress, + expectedErr error, + trancheKey string, +) { + _, err := s.msgServer.WithdrawFilledLimitOrder(s.goCtx, &types.MsgWithdrawFilledLimitOrder{ + Creator: account.String(), + TrancheKey: trancheKey, + }) + s.Assert().ErrorIs(err, expectedErr) +} + +// Shares +func (s *MsgServerTestSuite) getPoolShares( + token0 string, + token1 string, + tick int64, + fee uint64, +) (shares sdk.Int) { + poolID, found := s.app.DexKeeper.GetPoolIDByParams(s.ctx, &types.PairID{Token0: token0, Token1: token1}, tick, fee) + if !found { + return sdk.ZeroInt() + } + poolDenom := types.NewPoolDenom(poolID) + return s.app.BankKeeper.GetSupply(s.ctx, poolDenom).Amount +} + +func (s *MsgServerTestSuite) assertPoolShares( + tick int64, + fee uint64, + sharesExpected uint64, +) { + sharesExpectedInt := sdk.NewIntFromUint64(sharesExpected) + sharesOwned := s.getPoolShares("TokenA", "TokenB", tick, fee) + s.Assert().Equal(sharesExpectedInt, sharesOwned) +} + +func (s *MsgServerTestSuite) getAccountShares( + account sdk.AccAddress, + token0 string, + token1 string, + tick int64, + fee uint64, +) (shares sdk.Int) { + id, found := s.app.DexKeeper.GetPoolIDByParams(s.ctx, types.MustNewPairID(token0, token1), tick, fee) + if !found { + return sdk.ZeroInt() + } + + poolDenom := types.NewPoolDenom(id) + return s.app.BankKeeper.GetBalance(s.ctx, account, poolDenom).Amount +} + +func (s *MsgServerTestSuite) assertAccountShares( + account sdk.AccAddress, + tick int64, + fee uint64, + sharesExpected uint64, +) { + sharesExpectedInt := sdk.NewIntFromUint64(sharesExpected) + sharesOwned := s.getAccountShares(account, "TokenA", "TokenB", tick, fee) + s.Assert(). + Equal(sharesExpectedInt, sharesOwned, "expected %s != actual %s", sharesExpected, sharesOwned) +} + +func (s *MsgServerTestSuite) assertAliceShares(tick int64, fee, sharesExpected uint64) { + s.assertAccountShares(s.alice, tick, fee, sharesExpected) +} + +func (s *MsgServerTestSuite) assertBobShares(tick int64, fee, sharesExpected uint64) { + s.assertAccountShares(s.bob, tick, fee, sharesExpected) +} + +func (s *MsgServerTestSuite) assertCarolShares(tick int64, fee, sharesExpected uint64) { + s.assertAccountShares(s.carol, tick, fee, sharesExpected) +} + +func (s *MsgServerTestSuite) assertDanShares(tick int64, fee, sharesExpected uint64) { + s.assertAccountShares(s.dan, tick, fee, sharesExpected) +} + +// Ticks +func (s *MsgServerTestSuite) assertCurrentTicks( + expected1To0 int64, + expected0To1 int64, +) { + s.assertCurr0To1(expected0To1) + s.assertCurr1To0(expected1To0) +} + +func (s *MsgServerTestSuite) assertCurr0To1(curr0To1Expected int64) { + curr0To1Actual, found := s.app.DexKeeper.GetCurrTickIndexTakerToMakerNormalized( + s.ctx, + defaultTradePairID0To1, + ) + if curr0To1Expected == math.MaxInt64 { + s.Assert().False(found) + } else { + s.Assert().Equal(curr0To1Expected, curr0To1Actual) + } +} + +func (s *MsgServerTestSuite) assertCurr1To0(curr1To0Expected int64) { + curr1to0Actual, found := s.app.DexKeeper.GetCurrTickIndexTakerToMakerNormalized( + s.ctx, + defaultTradePairID1To0, + ) + if curr1To0Expected == math.MinInt64 { + s.Assert().False(found) + } else { + s.Assert().Equal(curr1To0Expected, curr1to0Actual) + } +} + +// Pool liquidity (i.e. deposited rather than LO) +func (s *MsgServerTestSuite) assertLiquidityAtTick( + amountA, amountB sdk.Int, + tickIndex int64, + fee uint64, +) { + liquidityA, liquidityB := s.getLiquidityAtTick(tickIndex, fee) + s.Assert(). + True(amountA.Equal(liquidityA), "liquidity A: actual %s, expected %s", liquidityA, amountA) + s.Assert(). + True(amountB.Equal(liquidityB), "liquidity B: actual %s, expected %s", liquidityB, amountB) +} + +func (s *MsgServerTestSuite) assertLiquidityAtTickWithDenom( + pairID *types.PairID, + expected0, expected1 sdk.Int, + tickIndex int64, + fee uint64, +) { + liquidity0, liquidity1 := s.getLiquidityAtTickWithDenom(pairID, tickIndex, fee) + s.Assert(). + True(expected0.Equal(liquidity0), "liquidity 0: actual %s, expected %s", liquidity0, expected0) + s.Assert(). + True(expected1.Equal(liquidity1), "liquidity 1: actual %s, expected %s", liquidity1, expected1) +} + +func (s *MsgServerTestSuite) assertPoolLiquidity( + amountA, amountB int, + tickIndex int64, + fee uint64, +) { + s.assertLiquidityAtTick(sdk.NewInt(int64(amountA)), sdk.NewInt(int64(amountB)), tickIndex, fee) +} + +func (s *MsgServerTestSuite) assertNoLiquidityAtTick(tickIndex int64, fee uint64) { + s.assertLiquidityAtTick(sdk.ZeroInt(), sdk.ZeroInt(), tickIndex, fee) +} + +// Filled limit liquidity +func (s *MsgServerTestSuite) assertAliceLimitFilledAtTickAtIndex( + selling string, + amount int, + tickIndex int64, + trancheKey string, +) { + s.assertLimitFilledAtTickAtIndex(s.alice, selling, amount, tickIndex, trancheKey) +} + +func (s *MsgServerTestSuite) assertBobLimitFilledAtTickAtIndex( + selling string, + amount int, + tickIndex int64, + trancheKey string, +) { + s.assertLimitFilledAtTickAtIndex(s.bob, selling, amount, tickIndex, trancheKey) +} + +func (s *MsgServerTestSuite) assertCarolLimitFilledAtTickAtIndex( + selling string, + amount int, + tickIndex int64, + trancheKey string, +) { + s.assertLimitFilledAtTickAtIndex(s.carol, selling, amount, tickIndex, trancheKey) +} + +func (s *MsgServerTestSuite) assertDanLimitFilledAtTickAtIndex( + selling string, + amount int, + tickIndex int64, + trancheKey string, +) { + s.assertLimitFilledAtTickAtIndex(s.dan, selling, amount, tickIndex, trancheKey) +} + +func (s *MsgServerTestSuite) assertLimitFilledAtTickAtIndex( + account sdk.AccAddress, + selling string, + amount int, + tickIndex int64, + trancheKey string, +) { + userShares, totalShares := s.getLimitUserSharesAtTick( + account, + selling, + tickIndex, + ), s.getLimitTotalSharesAtTick( + selling, + tickIndex, + ) + userRatio := math_utils.NewPrecDecFromInt(userShares).QuoInt(totalShares) + filled := s.getLimitFilledLiquidityAtTickAtIndex(selling, tickIndex, trancheKey) + amt := sdk.NewInt(int64(amount)) + userFilled := userRatio.MulInt(filled).RoundInt() + s.Assert().True(amt.Equal(userFilled)) +} + +// Limit liquidity +func (s *MsgServerTestSuite) assertAliceLimitLiquidityAtTick( + selling string, + amount int, + tickIndex int64, +) { + s.assertAccountLimitLiquidityAtTick(s.alice, selling, amount, tickIndex) +} + +func (s *MsgServerTestSuite) assertBobLimitLiquidityAtTick( + selling string, + amount int, + tickIndex int64, +) { + s.assertAccountLimitLiquidityAtTick(s.bob, selling, amount, tickIndex) +} + +func (s *MsgServerTestSuite) assertCarolLimitLiquidityAtTick( + selling string, + amount int, + tickIndex int64, +) { + s.assertAccountLimitLiquidityAtTick(s.carol, selling, amount, tickIndex) +} + +func (s *MsgServerTestSuite) assertDanLimitLiquidityAtTick( + selling string, + amount int, + tickIndex int64, +) { + s.assertAccountLimitLiquidityAtTick(s.dan, selling, amount, tickIndex) +} + +func (s *MsgServerTestSuite) assertAccountLimitLiquidityAtTick( + account sdk.AccAddress, + selling string, + amount int, + tickIndexNormalized int64, +) { + userShares := s.getLimitUserSharesAtTick(account, selling, tickIndexNormalized) + totalShares := s.getLimitTotalSharesAtTick(selling, tickIndexNormalized) + userRatio := math_utils.NewPrecDecFromInt(userShares).QuoInt(totalShares) + userLiquidity := userRatio.MulInt64(int64(amount)).TruncateInt() + + s.assertLimitLiquidityAtTick(selling, tickIndexNormalized, userLiquidity.Int64()) +} + +func (s *MsgServerTestSuite) assertLimitLiquidityAtTick( + selling string, + tickIndexNormalized, amount int64, +) { + s.assertLimitLiquidityAtTickInt(selling, tickIndexNormalized, sdk.NewInt(amount)) +} + +func (s *MsgServerTestSuite) assertLimitLiquidityAtTickInt( + selling string, + tickIndexNormalized int64, + amount sdk.Int, +) { + tradePairID := defaultPairID.MustTradePairIDFromMaker(selling) + tickIndexTakerToMaker := tradePairID.TickIndexTakerToMaker(tickIndexNormalized) + tranches := s.app.DexKeeper.GetAllLimitOrderTrancheAtIndex( + s.ctx, + tradePairID, + tickIndexTakerToMaker, + ) + liquidity := sdk.ZeroInt() + for _, t := range tranches { + if !t.IsExpired(s.ctx) { + liquidity = liquidity.Add(t.ReservesMakerDenom) + } + } + + s.Assert(). + True(amount.Equal(liquidity), "Incorrect liquidity: expected %s, have %s", amount.String(), liquidity.String()) +} + +func (s *MsgServerTestSuite) assertFillAndPlaceTrancheKeys( + selling string, + tickIndexNormalized int64, + expectedFill, expectedPlace string, +) { + tradePairID := defaultPairID.MustTradePairIDFromMaker(selling) + tickIndexTakerToMaker := tradePairID.TickIndexTakerToMaker(tickIndexNormalized) + placeTranche := s.app.DexKeeper.GetPlaceTranche(s.ctx, tradePairID, tickIndexTakerToMaker) + fillTranche, foundFill := s.app.DexKeeper.GetFillTranche( + s.ctx, + tradePairID, + tickIndexTakerToMaker, + ) + placeKey, fillKey := "", "" + if placeTranche != nil { + placeKey = placeTranche.Key.TrancheKey + } + + if foundFill { + fillKey = fillTranche.Key.TrancheKey + } + s.Assert().Equal(expectedFill, fillKey) + s.Assert().Equal(expectedPlace, placeKey) +} + +// Limit order map helpers +func (s *MsgServerTestSuite) getLimitUserSharesAtTick( + account sdk.AccAddress, + selling string, + tickIndexNormalized int64, +) sdk.Int { + tradePairID := defaultPairID.MustTradePairIDFromMaker(selling) + tickIndexTakerToMaker := tradePairID.TickIndexTakerToMaker(tickIndexNormalized) + tranches := s.app.DexKeeper.GetAllLimitOrderTrancheAtIndex( + s.ctx, + tradePairID, + tickIndexTakerToMaker, + ) + fillTranche := tranches[0] + // get user shares and total shares + userShares := s.getLimitUserSharesAtTickAtIndex(account, fillTranche.Key.TrancheKey) + if len(tranches) >= 2 { + userShares = userShares.Add( + s.getLimitUserSharesAtTickAtIndex(account, tranches[1].Key.TrancheKey), + ) + } + + return userShares +} + +func (s *MsgServerTestSuite) getLimitUserSharesAtTickAtIndex( + account sdk.AccAddress, + trancheKey string, +) sdk.Int { + userShares, found := s.app.DexKeeper.GetLimitOrderTrancheUser( + s.ctx, + account.String(), + trancheKey, + ) + s.Assert().True(found, "Failed to get limit order user shares for index %s", trancheKey) + return userShares.SharesOwned +} + +func (s *MsgServerTestSuite) getLimitTotalSharesAtTick( + selling string, + tickIndexNormalized int64, +) sdk.Int { + tradePairID := defaultPairID.MustTradePairIDFromMaker(selling) + tickIndexTakerToMaker := tradePairID.TickIndexTakerToMaker(tickIndexNormalized) + tranches := s.app.DexKeeper.GetAllLimitOrderTrancheAtIndex( + s.ctx, + tradePairID, + tickIndexTakerToMaker, + ) + // get user shares and total shares + totalShares := sdk.ZeroInt() + for _, t := range tranches { + totalShares = totalShares.Add(t.TotalMakerDenom) + } + + return totalShares +} + +func (s *MsgServerTestSuite) getLimitFilledLiquidityAtTickAtIndex( + selling string, + tickIndex int64, + trancheKey string, +) sdk.Int { + // grab fill tranche reserves and shares + tradePairID := defaultPairID.MustTradePairIDFromMaker(selling) + tranche, _, found := s.app.DexKeeper.FindLimitOrderTranche(s.ctx, &types.LimitOrderTrancheKey{ + tradePairID, + tickIndex, + trancheKey, + }) + s.Assert().True(found, "Failed to get limit order filled reserves for index %s", trancheKey) + + return tranche.ReservesTakerDenom +} + +func (s *MsgServerTestSuite) getLimitReservesAtTickAtKey( + selling string, + tickIndex int64, + trancheKey string, +) sdk.Int { + // grab fill tranche reserves and shares + tradePairID := defaultPairID.MustTradePairIDFromMaker(selling) + tranche, _, found := s.app.DexKeeper.FindLimitOrderTranche(s.ctx, &types.LimitOrderTrancheKey{ + tradePairID, tickIndex, trancheKey, + }) + s.Assert().True(found, "Failed to get limit order reserves for index %s", trancheKey) + + return tranche.ReservesMakerDenom +} + +func (s *MsgServerTestSuite) assertNLimitOrderExpiration(expected int) { + exps := s.app.DexKeeper.GetAllLimitOrderExpiration(s.ctx) + s.Assert().Equal(expected, len(exps)) +} + +func (s *MsgServerTestSuite) calcAutoswapSharesMinted( + centerTick int64, + fee uint64, + residual0, residual1, balanced0, balanced1, totalShares, valuePool int64, +) sdk.Int { + residual0Int, residual1Int, balanced0Int, balanced1Int, totalSharesInt, valuePoolInt := sdk.NewInt( + residual0, + ), sdk.NewInt( + residual1, + ), sdk.NewInt( + balanced0, + ), sdk.NewInt( + balanced1, + ), sdk.NewInt( + totalShares, + ), sdk.NewInt( + valuePool, + ) + + // residualValue = 1.0001^-f * residualAmount0 + 1.0001^{i-f} * residualAmount1 + // balancedValue = balancedAmount0 + 1.0001^{i} * balancedAmount1 + // value = residualValue + balancedValue + // shares minted = value * totalShares / valuePool + + centerPrice := types.MustCalcPrice(-1 * centerTick) + leftPrice := types.MustCalcPrice(-1 * (centerTick - int64(fee))) + discountPrice := types.MustCalcPrice(-1 * int64(fee)) + + balancedValue := math_utils.NewPrecDecFromInt(balanced0Int). + Add(centerPrice.MulInt(balanced1Int)). + TruncateInt() + residualValue := discountPrice.MulInt(residual0Int). + Add(leftPrice.Mul(math_utils.NewPrecDecFromInt(residual1Int))). + TruncateInt() + valueMint := balancedValue.Add(residualValue) + + return valueMint.Mul(totalSharesInt).Quo(valuePoolInt) +} + +func (s *MsgServerTestSuite) calcSharesMinted(centerTick, amount0Int, amount1Int int64) sdk.Int { + amount0, amount1 := sdk.NewInt(amount0Int), sdk.NewInt(amount1Int) + centerPrice := types.MustCalcPrice(-1 * centerTick) + + return math_utils.NewPrecDecFromInt(amount0).Add(centerPrice.Mul(math_utils.NewPrecDecFromInt(amount1))).TruncateInt() +} + +func (s *MsgServerTestSuite) calcExpectedBalancesAfterWithdrawOnePool( + sharesMinted sdk.Int, + account sdk.AccAddress, + tickIndex int64, + fee uint64, +) (sdk.Int, sdk.Int, sdk.Int, sdk.Int) { + dexCurrentBalance0 := s.app.BankKeeper.GetBalance( + s.ctx, + s.app.AccountKeeper.GetModuleAddress("dex"), + "TokenA", + ).Amount + dexCurrentBalance1 := s.app.BankKeeper.GetBalance( + s.ctx, + s.app.AccountKeeper.GetModuleAddress("dex"), + "TokenB", + ).Amount + currentBalance0 := s.app.BankKeeper.GetBalance(s.ctx, account, "TokenA").Amount + currentBalance1 := s.app.BankKeeper.GetBalance(s.ctx, account, "TokenB").Amount + amountPool0, amountPool1 := s.getLiquidityAtTick(tickIndex, fee) + poolShares := s.getPoolShares("TokenA", "TokenB", tickIndex, fee) + + amountOut0 := amountPool0.Mul(sharesMinted).Quo(poolShares) + amountOut1 := amountPool1.Mul(sharesMinted).Quo(poolShares) + + expectedBalance0 := currentBalance0.Add(amountOut0) + expectedBalance1 := currentBalance1.Add(amountOut1) + dexExpectedBalance0 := dexCurrentBalance0.Sub(amountOut0) + dexExpectedBalance1 := dexCurrentBalance1.Sub(amountOut1) + + return expectedBalance0, expectedBalance1, dexExpectedBalance0, dexExpectedBalance1 +} + +func (s *MsgServerTestSuite) nextBlockWithTime(blockTime time.Time) { + newCtx := s.ctx.WithBlockTime(blockTime) + s.ctx = newCtx + s.goCtx = sdk.WrapSDKContext(newCtx) + s.app.BeginBlock(abci.RequestBeginBlock{Header: tmproto.Header{ + Height: s.app.LastBlockHeight() + 1, AppHash: s.app.LastCommitID().Hash, + Time: blockTime, + }}) +} diff --git a/x/dex/keeper/multihop_swap.go b/x/dex/keeper/multihop_swap.go new file mode 100644 index 000000000..e26321290 --- /dev/null +++ b/x/dex/keeper/multihop_swap.go @@ -0,0 +1,167 @@ +package keeper + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" + sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + math_utils "github.com/neutron-org/neutron/utils/math" + "github.com/neutron-org/neutron/x/dex/types" +) + +type MultihopStep struct { + RemainingBestPrice math_utils.PrecDec + tradePairID *types.TradePairID +} + +func (k Keeper) HopsToRouteData( + ctx sdk.Context, + hops []string, + exitLimitPrice math_utils.PrecDec, +) ([]MultihopStep, error) { + nPairs := len(hops) - 1 + routeArr := make([]MultihopStep, nPairs) + priceAcc := math_utils.OnePrecDec() + for i := range routeArr { + index := len(routeArr) - 1 - i + tokenIn := hops[index] + tokenOut := hops[index+1] + tradePairID, err := types.NewTradePairID(tokenIn, tokenOut) + if err != nil { + return routeArr, err + } + price, found := k.GetCurrPrice(ctx, tradePairID) + if !found { + return routeArr, types.ErrInsufficientLiquidity + } + priceAcc = priceAcc.Mul(price) + routeArr[index] = MultihopStep{ + tradePairID: tradePairID, + RemainingBestPrice: priceAcc, + } + } + + return routeArr, nil +} + +type StepResult struct { + Ctx *types.BranchableCache + CoinOut sdk.Coin + Err error +} + +type multihopCacheKey struct { + TokenIn string + TokenOut string + InAmount sdk.Int +} + +func newCacheKey(tokenIn, tokenOut string, inAmount sdk.Int) multihopCacheKey { + return multihopCacheKey{ + TokenIn: tokenIn, + TokenOut: tokenOut, + InAmount: inAmount, + } +} + +func (k Keeper) MultihopStep( + bctx *types.BranchableCache, + step MultihopStep, + inCoin sdk.Coin, + exitLimitPrice math_utils.PrecDec, + currentPrice math_utils.PrecDec, + remainingSteps []MultihopStep, + stepCache map[multihopCacheKey]StepResult, +) (sdk.Coin, *types.BranchableCache, error) { + cacheKey := newCacheKey(step.tradePairID.TakerDenom, step.tradePairID.MakerDenom, inCoin.Amount) + val, ok := stepCache[cacheKey] + if ok { + ctxBranchCopy := val.Ctx.Branch() + return val.CoinOut, ctxBranchCopy, val.Err + } + + // TODO: Due to rounding on swap it is possible to leak tokens at each hop. + // In these cases the user will end up with trace amounts of tokens from intermediary steps. + // To fix this we would have to pre-calculate the route such that the amount + // in will be used completely at each step + coinOut, err := k.SwapExactAmountIn(bctx.Ctx, step.tradePairID, inCoin.Amount) + ctxBranch := bctx.Branch() + stepCache[cacheKey] = StepResult{Ctx: bctx, CoinOut: coinOut, Err: err} + if err != nil { + return sdk.Coin{}, bctx, err + } + + return coinOut, ctxBranch, nil +} + +func (k Keeper) RunMultihopRoute( + ctx sdk.Context, + route types.MultiHopRoute, + initialInCoin sdk.Coin, + exitLimitPrice math_utils.PrecDec, + stepCache map[multihopCacheKey]StepResult, +) (sdk.Coin, func(), error) { + routeData, err := k.HopsToRouteData(ctx, route.Hops, exitLimitPrice) + if err != nil { + return sdk.Coin{}, nil, err + } + currentPrice := math_utils.OnePrecDec() + + var currentOutCoin sdk.Coin + inCoin := initialInCoin + bCacheCtx := types.NewBranchableCache(ctx) + + for i, step := range routeData { + // If we can't hit the best possible price we can greedily abort + priceUpperbound := currentPrice.Mul(step.RemainingBestPrice) + if exitLimitPrice.GT(priceUpperbound) { + return sdk.Coin{}, bCacheCtx.WriteCache, types.ErrExitLimitPriceHit + } + + currentOutCoin, bCacheCtx, err = k.MultihopStep( + bCacheCtx, + step, + inCoin, + exitLimitPrice, + currentPrice, + routeData[i:], + stepCache, + ) + inCoin = currentOutCoin + if err != nil { + return sdk.Coin{}, nil, sdkerrors.Wrapf( + err, + "Failed at pair: %s", + step.tradePairID.MustPairID().CanonicalString(), + ) + } + + currentPrice = math_utils.NewPrecDecFromInt(currentOutCoin.Amount). + Quo(math_utils.NewPrecDecFromInt(initialInCoin.Amount)) + } + + if exitLimitPrice.GT(currentPrice) { + return sdk.Coin{}, nil, types.ErrExitLimitPriceHit + } + + return currentOutCoin, bCacheCtx.WriteCache, nil +} + +func (k Keeper) SwapExactAmountIn(ctx sdk.Context, + tradePairID *types.TradePairID, + amountIn sdk.Int, +) (totalOut sdk.Coin, err error) { + _, swapAmountMakerDenom, orderFilled, err := k.Swap( + ctx, + tradePairID, + amountIn, + nil, + nil, + ) + if err != nil { + return sdk.Coin{}, err + } + if !orderFilled { + return sdk.Coin{}, types.ErrInsufficientLiquidity + } + + return swapAmountMakerDenom, err +} diff --git a/x/dex/keeper/pair_helper.go b/x/dex/keeper/pair_helper.go new file mode 100644 index 000000000..82ce6b6b0 --- /dev/null +++ b/x/dex/keeper/pair_helper.go @@ -0,0 +1,34 @@ +package keeper + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" +) + +func SortAmounts(tokenA, token0 string, amountsA, amountsB []sdk.Int) ([]sdk.Int, []sdk.Int) { + if tokenA == token0 { + return amountsA, amountsB + } + + return amountsB, amountsA +} + +func GetInOutTokens(tokenIn, tokenA, tokenB string) (_, tokenOut string) { + if tokenIn == tokenA { + return tokenA, tokenB + } + + return tokenB, tokenA +} + +func NormalizeAllTickIndexes(takerDenom, token0 string, tickIndexes []int64) []int64 { + if takerDenom != token0 { + result := make([]int64, len(tickIndexes)) + for i, idx := range tickIndexes { + result[i] = idx * -1 + } + return result + } + + // NB: does not return a different slice because no change + return tickIndexes +} diff --git a/x/dex/keeper/params.go b/x/dex/keeper/params.go new file mode 100644 index 000000000..4e37fd76f --- /dev/null +++ b/x/dex/keeper/params.go @@ -0,0 +1,17 @@ +package keeper + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/neutron-org/neutron/x/dex/types" +) + +// GetParams get all parameters as types.Params +func (k Keeper) GetParams(ctx sdk.Context) (params types.Params) { + k.paramstore.GetParamSet(ctx, ¶ms) + return params +} + +// SetParams set the params +func (k Keeper) SetParams(ctx sdk.Context, params types.Params) { + k.paramstore.SetParamSet(ctx, ¶ms) +} diff --git a/x/dex/keeper/params_test.go b/x/dex/keeper/params_test.go new file mode 100644 index 000000000..21529526d --- /dev/null +++ b/x/dex/keeper/params_test.go @@ -0,0 +1,26 @@ +package keeper_test + +import ( + "testing" + + testkeeper "github.com/neutron-org/neutron/testutil/dex/keeper" + "github.com/neutron-org/neutron/x/dex/types" + "github.com/stretchr/testify/require" +) + +func TestGetParams(t *testing.T) { + k, ctx := testkeeper.DexKeeper(t) + params := types.DefaultParams() + + k.SetParams(ctx, params) + + require.EqualValues(t, params, k.GetParams(ctx)) +} + +func TestValidateParams(t *testing.T) { + goodFees := []uint64{1, 2, 3, 4, 5, 200} + require.NoError(t, types.Params{FeeTiers: goodFees}.Validate()) + + badFees := []uint64{1, 2, 3, 3} + require.Error(t, types.Params{FeeTiers: badFees}.Validate()) +} diff --git a/x/dex/keeper/pool.go b/x/dex/keeper/pool.go new file mode 100644 index 000000000..6bc34a26e --- /dev/null +++ b/x/dex/keeper/pool.go @@ -0,0 +1,163 @@ +package keeper + +import ( + "encoding/binary" + + "github.com/cosmos/cosmos-sdk/store/prefix" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/neutron-org/neutron/x/dex/types" + "github.com/neutron-org/neutron/x/dex/utils" +) + +func (k Keeper) GetOrInitPool( + ctx sdk.Context, + pairID *types.PairID, + centerTickIndexNormalized int64, + fee uint64, +) (*types.Pool, error) { + pool, found := k.GetPool(ctx, pairID, centerTickIndexNormalized, fee) + if found { + return pool, nil + } + + return k.InitPool(ctx, pairID, centerTickIndexNormalized, fee) +} + +func (k Keeper) InitPool( + ctx sdk.Context, + pairID *types.PairID, + centerTickIndexNormalized int64, + fee uint64, +) (pool *types.Pool, err error) { + poolMetadata := types.PoolMetadata{PairID: pairID, Tick: centerTickIndexNormalized, Fee: fee} + + // Get current poolID + poolID := k.GetPoolCount(ctx) + poolMetadata.ID = poolID + + // Store poolMetadata + k.SetPoolMetadata(ctx, poolMetadata) + + // Create a reference so poolID can be looked up by poolMetadata + poolIDBz := sdk.Uint64ToBigEndian(poolID) + poolIDKey := types.PoolIDKey(pairID, centerTickIndexNormalized, fee) + + poolIDStore := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefix(types.PoolIDKeyPrefix)) + poolIDStore.Set(poolIDKey, poolIDBz) + + // Update poolCount + k.SetPoolCount(ctx, poolID+1) + + return types.NewPool(pairID, centerTickIndexNormalized, fee, poolID) +} + +// GetNextPoolId get ID for the next pool to be created +func (k Keeper) GetNextPoolID(ctx sdk.Context) uint64 { + return k.GetPoolCount(ctx) +} + +func (k Keeper) GetPool( + ctx sdk.Context, + pairID *types.PairID, + centerTickIndexNormalized int64, + fee uint64, +) (*types.Pool, bool) { + feeInt64 := utils.MustSafeUint64ToInt64(fee) + + id0To1 := &types.PoolReservesKey{ + TradePairID: types.NewTradePairIDFromMaker(pairID, pairID.Token1), + TickIndexTakerToMaker: centerTickIndexNormalized + feeInt64, + Fee: fee, + } + + poolID, found := k.GetPoolIDByParams(ctx, pairID, centerTickIndexNormalized, fee) + if !found { + return nil, false + } + + upperTick, upperTickFound := k.GetPoolReserves(ctx, id0To1) + lowerTick, lowerTickFound := k.GetPoolReserves(ctx, id0To1.Counterpart()) + + if !lowerTickFound && upperTickFound { + lowerTick = types.NewPoolReservesFromCounterpart(upperTick) + } else if lowerTickFound && !upperTickFound { + upperTick = types.NewPoolReservesFromCounterpart(lowerTick) + } else if !lowerTickFound && !upperTickFound { + // Pool has already been initialized before so we can safely assume that pool creation doesn't throw an error + return types.MustNewPool(pairID, centerTickIndexNormalized, fee, poolID), true + } + + return &types.Pool{ + ID: poolID, + LowerTick0: lowerTick, + UpperTick1: upperTick, + }, true +} + +func (k Keeper) GetPoolByID(ctx sdk.Context, poolID uint64) (pool *types.Pool, found bool) { + poolMetadata, found := k.GetPoolMetadata(ctx, poolID) + if !found { + return pool, false + } + + return k.GetPool(ctx, poolMetadata.PairID, poolMetadata.Tick, poolMetadata.Fee) +} + +func (k Keeper) GetPoolIDByParams( + ctx sdk.Context, + pairID *types.PairID, + centerTickIndexNormalized int64, + fee uint64, +) (id uint64, found bool) { + poolIDKey := types.PoolIDKey(pairID, centerTickIndexNormalized, fee) + store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefix(types.PoolIDKeyPrefix)) + b := store.Get(poolIDKey) + if b == nil { + return 0, false + } + + poolID := sdk.BigEndianToUint64(b) + return poolID, true +} + +func (k Keeper) SetPool(ctx sdk.Context, pool *types.Pool) { + if pool.LowerTick0.HasToken() { + k.SetPoolReserves(ctx, pool.LowerTick0) + } else { + k.RemovePoolReserves(ctx, pool.LowerTick0.Key) + } + if pool.UpperTick1.HasToken() { + k.SetPoolReserves(ctx, pool.UpperTick1) + } else { + k.RemovePoolReserves(ctx, pool.UpperTick1.Key) + } + + // TODO: this will create a bit of extra noise since not every Save is updating both ticks + // This should be solved upstream by better tracking of dirty ticks + ctx.EventManager().EmitEvent(types.CreateTickUpdatePoolReserves(*pool.LowerTick0)) + ctx.EventManager().EmitEvent(types.CreateTickUpdatePoolReserves(*pool.UpperTick1)) +} + +// GetPoolCount get the total number of pools +func (k Keeper) GetPoolCount(ctx sdk.Context) uint64 { + store := prefix.NewStore(ctx.KVStore(k.storeKey), []byte{}) + byteKey := types.KeyPrefix(types.PoolCountKeyPrefix) + bz := store.Get(byteKey) + + // Count doesn't exist: no element + if bz == nil { + return 0 + } + + // Parse bytes + return binary.BigEndian.Uint64(bz) +} + +// SetPoolCount set the total number of pools +func (k Keeper) SetPoolCount(ctx sdk.Context, count uint64) { + store := prefix.NewStore(ctx.KVStore(k.storeKey), []byte{}) + byteKey := types.KeyPrefix(types.PoolCountKeyPrefix) + bz := make([]byte, 8) + binary.BigEndian.PutUint64(bz, count) + store.Set(byteKey, bz) +} diff --git a/x/dex/keeper/pool_metadata.go b/x/dex/keeper/pool_metadata.go new file mode 100644 index 000000000..2d3c0f141 --- /dev/null +++ b/x/dex/keeper/pool_metadata.go @@ -0,0 +1,71 @@ +package keeper + +import ( + "encoding/binary" + + "github.com/cosmos/cosmos-sdk/store/prefix" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/neutron-org/neutron/x/dex/types" +) + +// SetPoolMetadata set a specific poolMetadata in the store +func (k Keeper) SetPoolMetadata(ctx sdk.Context, poolMetadata types.PoolMetadata) { + store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefix(types.PoolMetadataKeyPrefix)) + b := k.cdc.MustMarshal(&poolMetadata) + store.Set(GetPoolMetadataIDBytes(poolMetadata.ID), b) +} + +// GetPoolMetadata returns a poolMetadata from its id +func (k Keeper) GetPoolMetadata(ctx sdk.Context, id uint64) (val types.PoolMetadata, found bool) { + store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefix(types.PoolMetadataKeyPrefix)) + b := store.Get(GetPoolMetadataIDBytes(id)) + if b == nil { + return val, false + } + k.cdc.MustUnmarshal(b, &val) + return val, true +} + +func (k Keeper) GetPoolMetadataByDenom( + ctx sdk.Context, + denom string, +) (pm types.PoolMetadata, err error) { + poolID, err := types.ParsePoolIDFromDenom(denom) + if err != nil { + return pm, err + } + pm, found := k.GetPoolMetadata(ctx, poolID) + if !found { + return pm, types.ErrInvalidPoolDenom + } + return pm, nil +} + +// RemovePoolMetadata removes a poolMetadata from the store +func (k Keeper) RemovePoolMetadata(ctx sdk.Context, id uint64) { + store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefix(types.PoolMetadataKeyPrefix)) + store.Delete(GetPoolMetadataIDBytes(id)) +} + +// GetAllPoolMetadata returns all poolMetadata +func (k Keeper) GetAllPoolMetadata(ctx sdk.Context) (list []types.PoolMetadata) { + store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefix(types.PoolMetadataKeyPrefix)) + iterator := sdk.KVStorePrefixIterator(store, []byte{}) + + defer iterator.Close() + + for ; iterator.Valid(); iterator.Next() { + var val types.PoolMetadata + k.cdc.MustUnmarshal(iterator.Value(), &val) + list = append(list, val) + } + + return +} + +// GetPoolMetadataIDBytes returns the byte representation of the ID +func GetPoolMetadataIDBytes(id uint64) []byte { + bz := make([]byte, 8) + binary.BigEndian.PutUint64(bz, id) + return bz +} diff --git a/x/dex/keeper/pool_metadata_test.go b/x/dex/keeper/pool_metadata_test.go new file mode 100644 index 000000000..bc41fcb40 --- /dev/null +++ b/x/dex/keeper/pool_metadata_test.go @@ -0,0 +1,54 @@ +package keeper_test + +import ( + "testing" + + sdk "github.com/cosmos/cosmos-sdk/types" + keepertest "github.com/neutron-org/neutron/testutil/dex/keeper" + "github.com/neutron-org/neutron/testutil/dex/nullify" + "github.com/neutron-org/neutron/x/dex/keeper" + "github.com/neutron-org/neutron/x/dex/types" + "github.com/stretchr/testify/require" +) + +func createNPoolMetadata(keeper *keeper.Keeper, ctx sdk.Context, n int) []types.PoolMetadata { + items := make([]types.PoolMetadata, n) + for i := range items { + items[i].ID = uint64(i) + keeper.SetPoolMetadata(ctx, items[i]) + } + + return items +} + +func TestPoolMetadataGet(t *testing.T) { + keeper, ctx := keepertest.DexKeeper(t) + items := createNPoolMetadata(keeper, ctx, 10) + for _, item := range items { + got, found := keeper.GetPoolMetadata(ctx, item.ID) + require.True(t, found) + require.Equal(t, + nullify.Fill(&item), + nullify.Fill(&got), + ) + } +} + +func TestPoolMetadataRemove(t *testing.T) { + keeper, ctx := keepertest.DexKeeper(t) + items := createNPoolMetadata(keeper, ctx, 10) + for _, item := range items { + keeper.RemovePoolMetadata(ctx, item.ID) + _, found := keeper.GetPoolMetadata(ctx, item.ID) + require.False(t, found) + } +} + +func TestPoolMetadataGetAll(t *testing.T) { + keeper, ctx := keepertest.DexKeeper(t) + items := createNPoolMetadata(keeper, ctx, 10) + require.ElementsMatch(t, + nullify.Fill(items), + nullify.Fill(keeper.GetAllPoolMetadata(ctx)), + ) +} diff --git a/x/dex/keeper/pool_reserves.go b/x/dex/keeper/pool_reserves.go new file mode 100644 index 000000000..7c9f44c89 --- /dev/null +++ b/x/dex/keeper/pool_reserves.go @@ -0,0 +1,41 @@ +package keeper + +import ( + "github.com/cosmos/cosmos-sdk/store/prefix" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/neutron-org/neutron/x/dex/types" +) + +func (k Keeper) SetPoolReserves(ctx sdk.Context, poolReserves *types.PoolReserves) { + tick := types.TickLiquidity{ + Liquidity: &types.TickLiquidity_PoolReserves{ + PoolReserves: poolReserves, + }, + } + + store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefix(types.TickLiquidityKeyPrefix)) + b := k.cdc.MustMarshal(&tick) + store.Set(poolReserves.Key.KeyMarshal(), b) +} + +func (k Keeper) GetPoolReserves( + ctx sdk.Context, + poolReservesID *types.PoolReservesKey, +) (pool *types.PoolReserves, found bool) { + store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefix(types.TickLiquidityKeyPrefix)) + b := store.Get(poolReservesID.KeyMarshal()) + if b == nil { + return nil, false + } + + var tick types.TickLiquidity + k.cdc.MustUnmarshal(b, &tick) + + return tick.GetPoolReserves(), true +} + +// RemoveTickLiquidity removes a tickLiquidity from the store +func (k Keeper) RemovePoolReserves(ctx sdk.Context, poolReservesID *types.PoolReservesKey) { + store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefix(types.TickLiquidityKeyPrefix)) + store.Delete(poolReservesID.KeyMarshal()) +} diff --git a/x/dex/keeper/pool_reserves_test.go b/x/dex/keeper/pool_reserves_test.go new file mode 100644 index 000000000..13e361128 --- /dev/null +++ b/x/dex/keeper/pool_reserves_test.go @@ -0,0 +1,44 @@ +package keeper_test + +import ( + "testing" + + sdk "github.com/cosmos/cosmos-sdk/types" + keepertest "github.com/neutron-org/neutron/testutil/dex/keeper" + "github.com/neutron-org/neutron/testutil/dex/nullify" + "github.com/neutron-org/neutron/x/dex/keeper" + "github.com/neutron-org/neutron/x/dex/types" + "github.com/stretchr/testify/require" +) + +func createNPoolReserves(k *keeper.Keeper, ctx sdk.Context, n int) []*types.PoolReserves { + items := make([]*types.PoolReserves, n) + pools := createNPools(k, ctx, n) + for i, pool := range pools { + items[i] = pool.LowerTick0 + } + return items +} + +func TestGetPoolReserves(t *testing.T) { + keeper, ctx := keepertest.DexKeeper(t) + items := createNPoolReserves(keeper, ctx, 10) + for _, item := range items { + rst, found := keeper.GetPoolReserves(ctx, item.Key) + require.True(t, found) + require.Equal(t, + nullify.Fill(&item), + nullify.Fill(&rst), + ) + } +} + +func TestRemovePoolReserves(t *testing.T) { + keeper, ctx := keepertest.DexKeeper(t) + items := createNPoolReserves(keeper, ctx, 10) + for _, item := range items { + keeper.RemovePoolReserves(ctx, item.Key) + _, found := keeper.GetPoolReserves(ctx, item.Key) + require.False(t, found) + } +} diff --git a/x/dex/keeper/pool_test.go b/x/dex/keeper/pool_test.go new file mode 100644 index 000000000..ecb231ff9 --- /dev/null +++ b/x/dex/keeper/pool_test.go @@ -0,0 +1,92 @@ +package keeper_test + +import ( + "testing" + + sdk "github.com/cosmos/cosmos-sdk/types" + keepertest "github.com/neutron-org/neutron/testutil/dex/keeper" + "github.com/neutron-org/neutron/x/dex/keeper" + "github.com/neutron-org/neutron/x/dex/types" + "github.com/stretchr/testify/require" +) + +func createNPools(k *keeper.Keeper, ctx sdk.Context, n int) []*types.Pool { + items := make([]*types.Pool, n) + for i := range items { + pool, err := k.InitPool(ctx, types.MustNewPairID("TokenA", "TokenB"), int64(i), uint64(i)) + if err != nil { + panic("failed to create pool") + } + pool.Deposit(sdk.NewInt(10), sdk.NewInt(0), sdk.ZeroInt(), true) + k.SetPool(ctx, pool) + items[i] = pool + } + + return items +} + +func TestPoolInit(t *testing.T) { + keeper, ctx := keepertest.DexKeeper(t) + + pool, err := keeper.InitPool(ctx, defaultPairID, 0, 1) + require.NoError(t, err) + pool.Deposit(sdk.NewInt(100), sdk.NewInt(100), sdk.NewInt(0), true) + keeper.SetPool(ctx, pool) + + dbPool, found := keeper.GetPool(ctx, defaultPairID, 0, 1) + + require.True(t, found) + + require.Equal(t, pool.ID, dbPool.ID) + require.Equal(t, pool.LowerTick0, dbPool.LowerTick0) + require.Equal(t, pool.UpperTick1, dbPool.UpperTick1) +} + +func TestPoolCount(t *testing.T) { + keeper, ctx := keepertest.DexKeeper(t) + items := createNPools(keeper, ctx, 10) + count := uint64(len(items)) + require.Equal(t, count, keeper.GetPoolCount(ctx)) +} + +func TestGetPoolByID(t *testing.T) { + keeper, ctx := keepertest.DexKeeper(t) + items := createNPools(keeper, ctx, 2) + + pool0, found := keeper.GetPoolByID(ctx, items[0].ID) + require.True(t, found) + require.Equal(t, items[0], pool0) + + pool1, found := keeper.GetPoolByID(ctx, items[1].ID) + require.True(t, found) + require.Equal(t, items[1], pool1) + + _, found = keeper.GetPoolByID(ctx, 99) + require.False(t, found) +} + +func TestGetPoolIDByParams(t *testing.T) { + keeper, ctx := keepertest.DexKeeper(t) + items := createNPools(keeper, ctx, 2) + + id0, found := keeper.GetPoolIDByParams( + ctx, + items[0].LowerTick0.Key.TradePairID.MustPairID(), + items[0].CenterTickIndex(), + items[0].Fee(), + ) + require.True(t, found) + require.Equal(t, items[0].ID, id0) + + id1, found := keeper.GetPoolIDByParams( + ctx, + items[1].LowerTick0.Key.TradePairID.MustPairID(), + items[1].CenterTickIndex(), + items[1].Fee(), + ) + require.True(t, found) + require.Equal(t, items[1].ID, id1) + + _, found = keeper.GetPoolIDByParams(ctx, defaultPairID, 99, 2) + require.False(t, found) +} diff --git a/x/dex/keeper/tick_iterator.go b/x/dex/keeper/tick_iterator.go new file mode 100644 index 000000000..b011565dd --- /dev/null +++ b/x/dex/keeper/tick_iterator.go @@ -0,0 +1,42 @@ +package keeper + +import ( + "github.com/cosmos/cosmos-sdk/codec" + "github.com/cosmos/cosmos-sdk/store/prefix" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/neutron-org/neutron/x/dex/types" +) + +type TickIterator struct { + iter sdk.Iterator + cdc codec.BinaryCodec +} + +func (k Keeper) NewTickIterator( + ctx sdk.Context, + tradePairID *types.TradePairID, +) TickIterator { + prefixStore := prefix.NewStore(ctx.KVStore(k.storeKey), types.TickLiquidityPrefix(tradePairID)) + + return TickIterator{ + iter: prefixStore.Iterator(nil, nil), + cdc: k.cdc, + } +} + +func (ti TickIterator) Valid() bool { + return ti.iter.Valid() +} + +func (ti TickIterator) Close() error { + return ti.iter.Close() +} + +func (ti TickIterator) Value() (tick types.TickLiquidity) { + ti.cdc.MustUnmarshal(ti.iter.Value(), &tick) + return tick +} + +func (ti TickIterator) Next() { + ti.iter.Next() +} diff --git a/x/dex/keeper/tick_liquidity.go b/x/dex/keeper/tick_liquidity.go new file mode 100644 index 000000000..44687403c --- /dev/null +++ b/x/dex/keeper/tick_liquidity.go @@ -0,0 +1,23 @@ +package keeper + +import ( + "github.com/cosmos/cosmos-sdk/store/prefix" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/neutron-org/neutron/x/dex/types" +) + +// GetAllTickLiquidity returns all tickLiquidity +func (k Keeper) GetAllTickLiquidity(ctx sdk.Context) (list []*types.TickLiquidity) { + store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefix(types.TickLiquidityKeyPrefix)) + iterator := sdk.KVStorePrefixIterator(store, []byte{}) + + defer iterator.Close() + + for ; iterator.Valid(); iterator.Next() { + val := &types.TickLiquidity{} + k.cdc.MustUnmarshal(iterator.Value(), val) + list = append(list, val) + } + + return +} diff --git a/x/dex/keeper/tick_liquidity_test.go b/x/dex/keeper/tick_liquidity_test.go new file mode 100644 index 000000000..2fb663128 --- /dev/null +++ b/x/dex/keeper/tick_liquidity_test.go @@ -0,0 +1,46 @@ +package keeper_test + +import ( + "strconv" + "testing" + + math "cosmossdk.io/math" + sdk "github.com/cosmos/cosmos-sdk/types" + keepertest "github.com/neutron-org/neutron/testutil/dex/keeper" + "github.com/neutron-org/neutron/x/dex/keeper" + "github.com/neutron-org/neutron/x/dex/types" + "github.com/stretchr/testify/require" +) + +func CreateNTickLiquidity(keeper *keeper.Keeper, ctx sdk.Context, n int) []*types.TickLiquidity { + items := make([]*types.TickLiquidity, n) + for i := range items { + tick := types.TickLiquidity{ + Liquidity: &types.TickLiquidity_LimitOrderTranche{ + LimitOrderTranche: types.MustNewLimitOrderTranche( + "TokenA", + "TokenB", + strconv.Itoa(i), + int64(i), + math.NewInt(10), + math.NewInt(10), + math.NewInt(10), + math.NewInt(10), + ), + }, + } + keeper.SetLimitOrderTranche(ctx, tick.GetLimitOrderTranche()) + items[i] = &tick + } + + return items +} + +func TestTickLiquidityGetAll(t *testing.T) { + keeper, ctx := keepertest.DexKeeper(t) + items := CreateNTickLiquidity(keeper, ctx, 10) + require.ElementsMatch(t, + items, + keeper.GetAllTickLiquidity(ctx), + ) +} diff --git a/x/dex/module.go b/x/dex/module.go new file mode 100644 index 000000000..85a67a439 --- /dev/null +++ b/x/dex/module.go @@ -0,0 +1,180 @@ +package dex + +import ( + "context" + "encoding/json" + "fmt" + + "github.com/gorilla/mux" + "github.com/grpc-ecosystem/grpc-gateway/runtime" + "github.com/spf13/cobra" + + abci "github.com/cometbft/cometbft/abci/types" + + "github.com/cosmos/cosmos-sdk/client" + "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/module" + "github.com/neutron-org/neutron/x/dex/client/cli" + "github.com/neutron-org/neutron/x/dex/keeper" + "github.com/neutron-org/neutron/x/dex/types" +) + +var ( + _ module.AppModule = AppModule{} + _ module.AppModuleBasic = AppModuleBasic{} +) + +// ---------------------------------------------------------------------------- +// AppModuleBasic +// ---------------------------------------------------------------------------- + +// AppModuleBasic implements the AppModuleBasic interface for the capability module. +type AppModuleBasic struct { + cdc codec.BinaryCodec +} + +func NewAppModuleBasic(cdc codec.BinaryCodec) AppModuleBasic { + return AppModuleBasic{cdc: cdc} +} + +// Name returns the capability module's name. +func (AppModuleBasic) Name() string { + return types.ModuleName +} + +func (AppModuleBasic) RegisterCodec(cdc *codec.LegacyAmino) { + types.RegisterCodec(cdc) +} + +func (AppModuleBasic) RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) { + types.RegisterCodec(cdc) +} + +// RegisterInterfaces registers the module's interface types +func (a AppModuleBasic) RegisterInterfaces(reg cdctypes.InterfaceRegistry) { + types.RegisterInterfaces(reg) +} + +// DefaultGenesis returns the capability module's default genesis state. +func (AppModuleBasic) DefaultGenesis(cdc codec.JSONCodec) json.RawMessage { + return cdc.MustMarshalJSON(types.DefaultGenesis()) +} + +// ValidateGenesis performs genesis state validation for the capability module. +func (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() +} + +// RegisterRESTRoutes registers the capability module's REST service handlers. +func (AppModuleBasic) RegisterRESTRoutes(_ client.Context, _ *mux.Router) { +} + +// RegisterGRPCGatewayRoutes registers the gRPC Gateway routes for the module. +func (AppModuleBasic) RegisterGRPCGatewayRoutes(clientCtx client.Context, mux *runtime.ServeMux) { + err := types.RegisterQueryHandlerClient( + context.Background(), + mux, + types.NewQueryClient(clientCtx), + ) + if err != nil { + panic(err) + } +} + +// GetTxCmd returns the capability module's root tx command. +func (a AppModuleBasic) GetTxCmd() *cobra.Command { + return cli.GetTxCmd() +} + +// GetQueryCmd returns the capability module's root query command. +func (AppModuleBasic) GetQueryCmd() *cobra.Command { + return cli.GetQueryCmd(types.StoreKey) +} + +// ---------------------------------------------------------------------------- +// AppModule +// ---------------------------------------------------------------------------- + +// AppModule implements the AppModule interface for the capability module. +type AppModule struct { + AppModuleBasic + + keeper keeper.Keeper + bankKeeper types.BankKeeper +} + +func NewAppModule( + cdc codec.Codec, + keeper keeper.Keeper, + bankKeeper types.BankKeeper, +) AppModule { + return AppModule{ + AppModuleBasic: NewAppModuleBasic(cdc), + keeper: keeper, + bankKeeper: bankKeeper, + } +} + +// Name returns the capability module's name. +func (am AppModule) Name() string { + return am.AppModuleBasic.Name() +} + +// QuerierRoute returns the capability module's query routing key. +func (AppModule) QuerierRoute() string { return types.QuerierRoute } + +// 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 capability module's invariants. +func (am AppModule) RegisterInvariants(_ sdk.InvariantRegistry) {} + +// InitGenesis performs the capability module's genesis initialization It returns +// no validator updates. +func (am AppModule) InitGenesis( + ctx sdk.Context, + cdc codec.JSONCodec, + gs json.RawMessage, +) []abci.ValidatorUpdate { + var genState types.GenesisState + // Initialize global index to index in genesis state + cdc.MustUnmarshalJSON(gs, &genState) + + InitGenesis(ctx, am.keeper, genState) + + return []abci.ValidatorUpdate{} +} + +// ExportGenesis returns the capability module's exported genesis state as raw JSON bytes. +func (am AppModule) ExportGenesis(ctx sdk.Context, cdc codec.JSONCodec) json.RawMessage { + genState := ExportGenesis(ctx, am.keeper) + return cdc.MustMarshalJSON(genState) +} + +// ConsensusVersion implements ConsensusVersion. +func (AppModule) ConsensusVersion() uint64 { return 2 } + +// BeginBlock executes all ABCI BeginBlock logic respective to the capability module. +func (am AppModule) BeginBlock(_ sdk.Context, _ abci.RequestBeginBlock) {} + +// EndBlock executes all ABCI EndBlock logic respective to the capability module. It +// returns no validator updates. +func (am AppModule) EndBlock(ctx sdk.Context, _ abci.RequestEndBlock) []abci.ValidatorUpdate { + am.keeper.PurgeExpiredLimitOrders(ctx, ctx.BlockTime()) + return []abci.ValidatorUpdate{} +} diff --git a/x/dex/module_simulation.go b/x/dex/module_simulation.go new file mode 100644 index 000000000..f83b5ac42 --- /dev/null +++ b/x/dex/module_simulation.go @@ -0,0 +1,167 @@ +package dex + +import ( + "math/rand" + + "github.com/cosmos/cosmos-sdk/baseapp" + sdk "github.com/cosmos/cosmos-sdk/types" + "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/testutil/common/sample" + dexsimulation "github.com/neutron-org/neutron/x/dex/simulation" + "github.com/neutron-org/neutron/x/dex/types" +) + +// avoid unused import issue +var ( + _ = sample.AccAddress + _ = dexsimulation.FindAccount + _ = simulation.MsgEntryKind + _ = baseapp.Paramspace +) + +const ( + opWeightMsgDeposit = "op_weight_msg_deposit" + // TODO: Determine the simulation weight value + defaultWeightMsgDeposit int = 100 + + opWeightMsgWithdrawal = "op_weight_msg_withdrawal" + // TODO: Determine the simulation weight value + defaultWeightMsgWithdrawal int = 100 + + opWeightMsgPlaceLimitOrder = "op_weight_msg_place_limit_order" + // TODO: Determine the simulation weight value + defaultWeightMsgPlaceLimitOrder int = 100 + + opWeightMsgWithdrawFilledLimitOrder = "op_weight_msg_withdrawal_withdrawn_limit_order" + // TODO: Determine the simulation weight value + defaultWeightMsgWithdrawFilledLimitOrder int = 100 + + opWeightMsgCancelLimitOrder = "op_weight_msg_cancel_limit_order" + // TODO: Determine the simulation weight value + defaultWeightMsgCancelLimitOrder int = 100 + + opWeightMsgMultiHopSwap = "op_weight_msg_multi_hop_swap" + // TODO: Determine the simulation weight value + defaultWeightMsgMultiHopSwap int = 100 + + // this line is used by starport scaffolding # simapp/module/const +) + +// 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() + } + dexGenesis := types.GenesisState{ + Params: types.DefaultParams(), + // this line is used by starport scaffolding # simapp/module/genesisState + } + simState.GenState[types.ModuleName] = simState.Cdc.MustMarshalJSON(&dexGenesis) +} + +// ProposalContents doesn't return any content functions for governance proposals +func (AppModule) ProposalContents(_ module.SimulationState) []simtypes.WeightedProposalContent { + return nil +} + +// RegisterStoreDecoder registers a decoder +func (am AppModule) RegisterStoreDecoder(_ sdk.StoreDecoderRegistry) {} + +// WeightedOperations returns the all the gov module operations with their respective weights. +func (am AppModule) WeightedOperations( + simState module.SimulationState, +) []simtypes.WeightedOperation { + operations := make([]simtypes.WeightedOperation, 0) + + var weightMsgDeposit int + simState.AppParams.GetOrGenerate(simState.Cdc, opWeightMsgDeposit, &weightMsgDeposit, nil, + func(_ *rand.Rand) { + weightMsgDeposit = defaultWeightMsgDeposit + }, + ) + operations = append(operations, simulation.NewWeightedOperation( + weightMsgDeposit, + dexsimulation.SimulateMsgDeposit(am.bankKeeper, am.keeper), + )) + + var weightMsgWithdrawal int + simState.AppParams.GetOrGenerate(simState.Cdc, opWeightMsgWithdrawal, &weightMsgWithdrawal, nil, + func(_ *rand.Rand) { + weightMsgWithdrawal = defaultWeightMsgWithdrawal + }, + ) + operations = append(operations, simulation.NewWeightedOperation( + weightMsgWithdrawal, + dexsimulation.SimulateMsgWithdrawal(am.bankKeeper, am.keeper), + )) + + var weightMsgPlaceLimitOrder int + simState.AppParams.GetOrGenerate( + simState.Cdc, + opWeightMsgPlaceLimitOrder, + &weightMsgPlaceLimitOrder, + nil, + func(_ *rand.Rand) { + weightMsgPlaceLimitOrder = defaultWeightMsgPlaceLimitOrder + }, + ) + operations = append(operations, simulation.NewWeightedOperation( + weightMsgPlaceLimitOrder, + dexsimulation.SimulateMsgPlaceLimitOrder(am.bankKeeper, am.keeper), + )) + + var weightMsgWithdrawFilledLimitOrder int + simState.AppParams.GetOrGenerate( + simState.Cdc, + opWeightMsgWithdrawFilledLimitOrder, + &weightMsgWithdrawFilledLimitOrder, + nil, + func(_ *rand.Rand) { + weightMsgWithdrawFilledLimitOrder = defaultWeightMsgWithdrawFilledLimitOrder + }, + ) + operations = append(operations, simulation.NewWeightedOperation( + weightMsgWithdrawFilledLimitOrder, + dexsimulation.SimulateMsgWithdrawFilledLimitOrder( + am.bankKeeper, + am.keeper, + ), + )) + + var weightMsgCancelLimitOrder int + simState.AppParams.GetOrGenerate( + simState.Cdc, + opWeightMsgCancelLimitOrder, + &weightMsgCancelLimitOrder, + nil, + func(_ *rand.Rand) { + weightMsgCancelLimitOrder = defaultWeightMsgCancelLimitOrder + }, + ) + operations = append(operations, simulation.NewWeightedOperation( + weightMsgCancelLimitOrder, + dexsimulation.SimulateMsgCancelLimitOrder(am.bankKeeper, am.keeper), + )) + + var weightMsgMultiHopSwap int + simState.AppParams.GetOrGenerate( + simState.Cdc, + opWeightMsgMultiHopSwap, + &weightMsgMultiHopSwap, + nil, + func(_ *rand.Rand) { + weightMsgMultiHopSwap = defaultWeightMsgMultiHopSwap + }, + ) + operations = append(operations, simulation.NewWeightedOperation( + weightMsgMultiHopSwap, + dexsimulation.SimulateMsgMultiHopSwap(am.bankKeeper, am.keeper), + )) + + // this line is used by starport scaffolding # simapp/module/operation + + return operations +} diff --git a/x/dex/simulation/cancel_limit_order.go b/x/dex/simulation/cancel_limit_order.go new file mode 100644 index 000000000..6e4081eac --- /dev/null +++ b/x/dex/simulation/cancel_limit_order.go @@ -0,0 +1,28 @@ +package simulation + +import ( + "math/rand" + + "github.com/cosmos/cosmos-sdk/baseapp" + sdk "github.com/cosmos/cosmos-sdk/types" + simtypes "github.com/cosmos/cosmos-sdk/types/simulation" + "github.com/neutron-org/neutron/x/dex/keeper" + "github.com/neutron-org/neutron/x/dex/types" +) + +func SimulateMsgCancelLimitOrder( + _ types.BankKeeper, + _ keeper.Keeper, +) simtypes.Operation { + return func(r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, accs []simtypes.Account, chainID string, + ) (simtypes.OperationMsg, []simtypes.FutureOperation, error) { + simAccount, _ := simtypes.RandomAcc(r, accs) + msg := &types.MsgCancelLimitOrder{ + Creator: simAccount.Address.String(), + } + + // TODO: Handling the CancelLimitOrder simulation + + return simtypes.NoOpMsg(types.ModuleName, msg.Type(), "CancelLimitOrder simulation not implemented"), nil, nil + } +} diff --git a/x/dex/simulation/deposit.go b/x/dex/simulation/deposit.go new file mode 100644 index 000000000..186aa0a1e --- /dev/null +++ b/x/dex/simulation/deposit.go @@ -0,0 +1,28 @@ +package simulation + +import ( + "math/rand" + + "github.com/cosmos/cosmos-sdk/baseapp" + sdk "github.com/cosmos/cosmos-sdk/types" + simtypes "github.com/cosmos/cosmos-sdk/types/simulation" + "github.com/neutron-org/neutron/x/dex/keeper" + "github.com/neutron-org/neutron/x/dex/types" +) + +func SimulateMsgDeposit( + _ types.BankKeeper, + _ keeper.Keeper, +) simtypes.Operation { + return func(r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, accs []simtypes.Account, chainID string, + ) (simtypes.OperationMsg, []simtypes.FutureOperation, error) { + simAccount, _ := simtypes.RandomAcc(r, accs) + msg := &types.MsgDeposit{ + Creator: simAccount.Address.String(), + } + + // TODO: Handling the Deposit simulation + + return simtypes.NoOpMsg(types.ModuleName, msg.Type(), "Deposit simulation not implemented"), nil, nil + } +} diff --git a/x/dex/simulation/multi_hop_swap.go b/x/dex/simulation/multi_hop_swap.go new file mode 100644 index 000000000..7e73559e4 --- /dev/null +++ b/x/dex/simulation/multi_hop_swap.go @@ -0,0 +1,28 @@ +package simulation + +import ( + "math/rand" + + "github.com/cosmos/cosmos-sdk/baseapp" + sdk "github.com/cosmos/cosmos-sdk/types" + simtypes "github.com/cosmos/cosmos-sdk/types/simulation" + "github.com/neutron-org/neutron/x/dex/keeper" + "github.com/neutron-org/neutron/x/dex/types" +) + +func SimulateMsgMultiHopSwap( + _ types.BankKeeper, + _ keeper.Keeper, +) simtypes.Operation { + return func(r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, accs []simtypes.Account, chainID string, + ) (simtypes.OperationMsg, []simtypes.FutureOperation, error) { + simAccount, _ := simtypes.RandomAcc(r, accs) + msg := &types.MsgMultiHopSwap{ + Creator: simAccount.Address.String(), + } + + // TODO: Handling the MultiHopSwap simulation + + return simtypes.NoOpMsg(types.ModuleName, msg.Type(), "MultiHopSwap simulation not implemented"), nil, nil + } +} diff --git a/x/dex/simulation/place_limit_order.go b/x/dex/simulation/place_limit_order.go new file mode 100644 index 000000000..9f8063124 --- /dev/null +++ b/x/dex/simulation/place_limit_order.go @@ -0,0 +1,28 @@ +package simulation + +import ( + "math/rand" + + "github.com/cosmos/cosmos-sdk/baseapp" + sdk "github.com/cosmos/cosmos-sdk/types" + simtypes "github.com/cosmos/cosmos-sdk/types/simulation" + "github.com/neutron-org/neutron/x/dex/keeper" + "github.com/neutron-org/neutron/x/dex/types" +) + +func SimulateMsgPlaceLimitOrder( + _ types.BankKeeper, + _ keeper.Keeper, +) simtypes.Operation { + return func(r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, accs []simtypes.Account, chainID string, + ) (simtypes.OperationMsg, []simtypes.FutureOperation, error) { + simAccount, _ := simtypes.RandomAcc(r, accs) + msg := &types.MsgPlaceLimitOrder{ + Creator: simAccount.Address.String(), + } + + // TODO: Handling the PlaceLimitOrder simulation + + return simtypes.NoOpMsg(types.ModuleName, msg.Type(), "PlaceLimitOrder simulation not implemented"), nil, nil + } +} diff --git a/x/dex/simulation/simap.go b/x/dex/simulation/simap.go new file mode 100644 index 000000000..e31c6e3b1 --- /dev/null +++ b/x/dex/simulation/simap.go @@ -0,0 +1,16 @@ +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/dex/simulation/withdrawl.go b/x/dex/simulation/withdrawl.go new file mode 100644 index 000000000..bf62fe5ec --- /dev/null +++ b/x/dex/simulation/withdrawl.go @@ -0,0 +1,28 @@ +package simulation + +import ( + "math/rand" + + "github.com/cosmos/cosmos-sdk/baseapp" + sdk "github.com/cosmos/cosmos-sdk/types" + simtypes "github.com/cosmos/cosmos-sdk/types/simulation" + "github.com/neutron-org/neutron/x/dex/keeper" + "github.com/neutron-org/neutron/x/dex/types" +) + +func SimulateMsgWithdrawal( + _ types.BankKeeper, + _ keeper.Keeper, +) simtypes.Operation { + return func(r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, accs []simtypes.Account, chainID string, + ) (simtypes.OperationMsg, []simtypes.FutureOperation, error) { + simAccount, _ := simtypes.RandomAcc(r, accs) + msg := &types.MsgWithdrawal{ + Creator: simAccount.Address.String(), + } + + // TODO: Handling the Withdrawal simulation + + return simtypes.NoOpMsg(types.ModuleName, msg.Type(), "Withdrawal simulation not implemented"), nil, nil + } +} diff --git a/x/dex/simulation/withdrawl_filled_limit_order.go b/x/dex/simulation/withdrawl_filled_limit_order.go new file mode 100644 index 000000000..ed013038e --- /dev/null +++ b/x/dex/simulation/withdrawl_filled_limit_order.go @@ -0,0 +1,28 @@ +package simulation + +import ( + "math/rand" + + "github.com/cosmos/cosmos-sdk/baseapp" + sdk "github.com/cosmos/cosmos-sdk/types" + simtypes "github.com/cosmos/cosmos-sdk/types/simulation" + "github.com/neutron-org/neutron/x/dex/keeper" + "github.com/neutron-org/neutron/x/dex/types" +) + +func SimulateMsgWithdrawFilledLimitOrder( + _ types.BankKeeper, + _ keeper.Keeper, +) simtypes.Operation { + return func(r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, accs []simtypes.Account, chainID string, + ) (simtypes.OperationMsg, []simtypes.FutureOperation, error) { + simAccount, _ := simtypes.RandomAcc(r, accs) + msg := &types.MsgWithdrawFilledLimitOrder{ + Creator: simAccount.Address.String(), + } + + // TODO: Handling the WithdrawFilledLimitOrder simulation + + return simtypes.NoOpMsg(types.ModuleName, msg.Type(), "WithdrawFilledLimitOrder simulation not implemented"), nil, nil + } +} diff --git a/x/dex/types/branchable_cache.go b/x/dex/types/branchable_cache.go new file mode 100644 index 000000000..30e0459ae --- /dev/null +++ b/x/dex/types/branchable_cache.go @@ -0,0 +1,34 @@ +package types + +import sdk "github.com/cosmos/cosmos-sdk/types" + +type BranchableCache struct { + Parent *BranchableCache + Ctx sdk.Context + writeCache func() +} + +func (bc *BranchableCache) Branch() *BranchableCache { + cacheCtx, writeCache := bc.Ctx.CacheContext() + return &BranchableCache{ + Parent: bc, + Ctx: cacheCtx, + writeCache: writeCache, + } +} + +func (bc *BranchableCache) WriteCache() { + bc.writeCache() + if bc.Parent != nil { + bc.Parent.WriteCache() + } +} + +func NewBranchableCache(ctx sdk.Context) *BranchableCache { + cacheCtx, writeCache := ctx.CacheContext() + return &BranchableCache{ + Parent: nil, + Ctx: cacheCtx, + writeCache: writeCache, + } +} diff --git a/x/dex/types/codec.go b/x/dex/types/codec.go new file mode 100644 index 000000000..c7401e6cd --- /dev/null +++ b/x/dex/types/codec.go @@ -0,0 +1,50 @@ +//nolint:all +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(&MsgDeposit{}, "dex/Deposit", nil) + cdc.RegisterConcrete(&MsgWithdrawal{}, "dex/Withdrawal", nil) + cdc.RegisterConcrete(&MsgPlaceLimitOrder{}, "dex/PlaceLimitOrder", nil) + cdc.RegisterConcrete(&MsgWithdrawFilledLimitOrder{}, "dex/WithdrawFilledLimitOrder", nil) + cdc.RegisterConcrete(&MsgCancelLimitOrder{}, "dex/CancelLimitOrder", nil) + cdc.RegisterConcrete(&MsgMultiHopSwap{}, "dex/MultiHopSwap", nil) + // this line is used by starport scaffolding # 2 +} + +func RegisterInterfaces(registry cdctypes.InterfaceRegistry) { + registry.RegisterImplementations((*sdk.Msg)(nil), + &MsgDeposit{}, + ) + registry.RegisterImplementations((*sdk.Msg)(nil), + &MsgWithdrawal{}, + ) + registry.RegisterImplementations((*sdk.Msg)(nil), + &MsgPlaceLimitOrder{}, + ) + registry.RegisterImplementations((*sdk.Msg)(nil), + &MsgWithdrawFilledLimitOrder{}, + ) + registry.RegisterImplementations((*sdk.Msg)(nil), + &MsgCancelLimitOrder{}, + ) + registry.RegisterImplementations((*sdk.Msg)(nil), + &MsgMultiHopSwap{}, + ) + // this line is used by starport scaffolding # 3 + + msgservice.RegisterMsgServiceDesc(registry, &_Msg_serviceDesc) + + msgservice.RegisterMsgServiceDesc(registry, &_Msg_serviceDesc) +} + +var ( + Amino = codec.NewLegacyAmino() + ModuleCdc = codec.NewProtoCodec(cdctypes.NewInterfaceRegistry()) +) diff --git a/x/dex/types/deposit_record.pb.go b/x/dex/types/deposit_record.pb.go new file mode 100644 index 000000000..27084d1a0 --- /dev/null +++ b/x/dex/types/deposit_record.pb.go @@ -0,0 +1,524 @@ +// Code generated by protoc-gen-gogo. DO NOT EDIT. +// source: duality/dex/deposit_record.proto + +package types + +import ( + fmt "fmt" + github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/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 + +type DepositRecord struct { + PairID *PairID `protobuf:"bytes,1,opt,name=pairID,proto3" json:"pairID,omitempty"` + SharesOwned github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,opt,name=sharesOwned,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"totalShares" yaml:"totalShares"` + CenterTickIndex int64 `protobuf:"varint,3,opt,name=centerTickIndex,proto3" json:"centerTickIndex,omitempty"` + LowerTickIndex int64 `protobuf:"varint,4,opt,name=lowerTickIndex,proto3" json:"lowerTickIndex,omitempty"` + UpperTickIndex int64 `protobuf:"varint,5,opt,name=upperTickIndex,proto3" json:"upperTickIndex,omitempty"` + Fee uint64 `protobuf:"varint,6,opt,name=fee,proto3" json:"fee,omitempty"` +} + +func (m *DepositRecord) Reset() { *m = DepositRecord{} } +func (m *DepositRecord) String() string { return proto.CompactTextString(m) } +func (*DepositRecord) ProtoMessage() {} +func (*DepositRecord) Descriptor() ([]byte, []int) { + return fileDescriptor_9d7c76d21a5add72, []int{0} +} +func (m *DepositRecord) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *DepositRecord) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_DepositRecord.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 *DepositRecord) XXX_Merge(src proto.Message) { + xxx_messageInfo_DepositRecord.Merge(m, src) +} +func (m *DepositRecord) XXX_Size() int { + return m.Size() +} +func (m *DepositRecord) XXX_DiscardUnknown() { + xxx_messageInfo_DepositRecord.DiscardUnknown(m) +} + +var xxx_messageInfo_DepositRecord proto.InternalMessageInfo + +func (m *DepositRecord) GetPairID() *PairID { + if m != nil { + return m.PairID + } + return nil +} + +func (m *DepositRecord) GetCenterTickIndex() int64 { + if m != nil { + return m.CenterTickIndex + } + return 0 +} + +func (m *DepositRecord) GetLowerTickIndex() int64 { + if m != nil { + return m.LowerTickIndex + } + return 0 +} + +func (m *DepositRecord) GetUpperTickIndex() int64 { + if m != nil { + return m.UpperTickIndex + } + return 0 +} + +func (m *DepositRecord) GetFee() uint64 { + if m != nil { + return m.Fee + } + return 0 +} + +func init() { + proto.RegisterType((*DepositRecord)(nil), "duality.dex.DepositRecord") +} + +func init() { proto.RegisterFile("duality/dex/deposit_record.proto", fileDescriptor_9d7c76d21a5add72) } + +var fileDescriptor_9d7c76d21a5add72 = []byte{ + // 340 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x91, 0x3f, 0x4f, 0xc2, 0x40, + 0x18, 0x87, 0x7b, 0x80, 0x24, 0x5e, 0xe3, 0x9f, 0x9c, 0x0e, 0x95, 0xa1, 0x6d, 0x18, 0x48, 0x13, + 0x42, 0x9b, 0xe8, 0xe6, 0x48, 0x70, 0x60, 0xd2, 0x14, 0x27, 0x17, 0x52, 0x7a, 0x27, 0x34, 0x94, + 0x5e, 0x73, 0x77, 0x0d, 0xe5, 0x5b, 0xf8, 0x8d, 0x5c, 0x19, 0x19, 0x8d, 0x43, 0x63, 0x60, 0x73, + 0xf4, 0x13, 0x98, 0x5e, 0x6b, 0x72, 0x32, 0xf5, 0xed, 0x73, 0xcf, 0xfd, 0xde, 0xdc, 0xfb, 0x42, + 0x1b, 0x67, 0x41, 0x1c, 0x89, 0x8d, 0x87, 0x49, 0xee, 0x61, 0x92, 0x52, 0x1e, 0x89, 0x29, 0x23, + 0x21, 0x65, 0xd8, 0x4d, 0x19, 0x15, 0x14, 0xe9, 0xb5, 0xe1, 0x62, 0x92, 0x77, 0xae, 0xe7, 0x74, + 0x4e, 0x25, 0xf7, 0xca, 0xaa, 0x52, 0x3a, 0x37, 0x6a, 0x48, 0x1a, 0x44, 0x6c, 0x1a, 0xd5, 0xb7, + 0xbb, 0xef, 0x0d, 0x78, 0x36, 0xaa, 0x62, 0x7d, 0x99, 0x8a, 0xfa, 0xb0, 0x5d, 0x2a, 0xe3, 0x91, + 0x01, 0x6c, 0xe0, 0xe8, 0xb7, 0x57, 0xae, 0xd2, 0xc0, 0x7d, 0x92, 0x47, 0x7e, 0xad, 0xa0, 0x0c, + 0xea, 0x7c, 0x11, 0x30, 0xc2, 0x1f, 0xd7, 0x09, 0xc1, 0x46, 0xc3, 0x06, 0xce, 0xe9, 0x70, 0xb2, + 0x2d, 0x2c, 0xed, 0xb3, 0xb0, 0x7a, 0xf3, 0x48, 0x2c, 0xb2, 0x99, 0x1b, 0xd2, 0x95, 0x17, 0x52, + 0xbe, 0xa2, 0xbc, 0xfe, 0x0c, 0x38, 0x5e, 0x7a, 0x62, 0x93, 0x12, 0xee, 0x8e, 0x13, 0xf1, 0x5d, + 0x58, 0xba, 0xa0, 0x22, 0x88, 0x27, 0x32, 0xe9, 0xa7, 0xb0, 0xd0, 0x26, 0x58, 0xc5, 0xf7, 0x5d, + 0x05, 0x76, 0x7d, 0xb5, 0x0f, 0x72, 0xe0, 0x45, 0x48, 0x12, 0x41, 0xd8, 0x73, 0x14, 0x2e, 0xc7, + 0x09, 0x26, 0xb9, 0xd1, 0xb4, 0x81, 0xd3, 0xf4, 0x8f, 0x31, 0xea, 0xc1, 0xf3, 0x98, 0xae, 0x55, + 0xb1, 0x25, 0xc5, 0x23, 0x5a, 0x7a, 0x59, 0x9a, 0xaa, 0xde, 0x49, 0xe5, 0xfd, 0xa7, 0xe8, 0x12, + 0x36, 0x5f, 0x09, 0x31, 0xda, 0x36, 0x70, 0x5a, 0x7e, 0x59, 0x0e, 0x1f, 0xb6, 0x7b, 0x13, 0xec, + 0xf6, 0x26, 0xf8, 0xda, 0x9b, 0xe0, 0xed, 0x60, 0x6a, 0xbb, 0x83, 0xa9, 0x7d, 0x1c, 0x4c, 0xed, + 0xa5, 0xaf, 0xbc, 0xbf, 0x9e, 0xe1, 0x20, 0x0e, 0x66, 0xfc, 0xef, 0xc7, 0xcb, 0xe5, 0x42, 0xe4, + 0x20, 0x66, 0x6d, 0xb9, 0x8f, 0xbb, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x43, 0x9c, 0x66, 0x85, + 0xf1, 0x01, 0x00, 0x00, +} + +func (m *DepositRecord) 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 *DepositRecord) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *DepositRecord) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.Fee != 0 { + i = encodeVarintDepositRecord(dAtA, i, uint64(m.Fee)) + i-- + dAtA[i] = 0x30 + } + if m.UpperTickIndex != 0 { + i = encodeVarintDepositRecord(dAtA, i, uint64(m.UpperTickIndex)) + i-- + dAtA[i] = 0x28 + } + if m.LowerTickIndex != 0 { + i = encodeVarintDepositRecord(dAtA, i, uint64(m.LowerTickIndex)) + i-- + dAtA[i] = 0x20 + } + if m.CenterTickIndex != 0 { + i = encodeVarintDepositRecord(dAtA, i, uint64(m.CenterTickIndex)) + i-- + dAtA[i] = 0x18 + } + { + size := m.SharesOwned.Size() + i -= size + if _, err := m.SharesOwned.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintDepositRecord(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + if m.PairID != nil { + { + size, err := m.PairID.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintDepositRecord(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func encodeVarintDepositRecord(dAtA []byte, offset int, v uint64) int { + offset -= sovDepositRecord(v) + base := offset + for v >= 1<<7 { + dAtA[offset] = uint8(v&0x7f | 0x80) + v >>= 7 + offset++ + } + dAtA[offset] = uint8(v) + return base +} +func (m *DepositRecord) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.PairID != nil { + l = m.PairID.Size() + n += 1 + l + sovDepositRecord(uint64(l)) + } + l = m.SharesOwned.Size() + n += 1 + l + sovDepositRecord(uint64(l)) + if m.CenterTickIndex != 0 { + n += 1 + sovDepositRecord(uint64(m.CenterTickIndex)) + } + if m.LowerTickIndex != 0 { + n += 1 + sovDepositRecord(uint64(m.LowerTickIndex)) + } + if m.UpperTickIndex != 0 { + n += 1 + sovDepositRecord(uint64(m.UpperTickIndex)) + } + if m.Fee != 0 { + n += 1 + sovDepositRecord(uint64(m.Fee)) + } + return n +} + +func sovDepositRecord(x uint64) (n int) { + return (math_bits.Len64(x|1) + 6) / 7 +} +func sozDepositRecord(x uint64) (n int) { + return sovDepositRecord(uint64((x << 1) ^ uint64((int64(x) >> 63)))) +} +func (m *DepositRecord) 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 ErrIntOverflowDepositRecord + } + 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: DepositRecord: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: DepositRecord: 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 msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowDepositRecord + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthDepositRecord + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthDepositRecord + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.PairID == nil { + m.PairID = &PairID{} + } + if err := m.PairID.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field SharesOwned", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowDepositRecord + } + 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 ErrInvalidLengthDepositRecord + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDepositRecord + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.SharesOwned.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 3: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field CenterTickIndex", wireType) + } + m.CenterTickIndex = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowDepositRecord + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.CenterTickIndex |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 4: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field LowerTickIndex", wireType) + } + m.LowerTickIndex = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowDepositRecord + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.LowerTickIndex |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 5: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field UpperTickIndex", wireType) + } + m.UpperTickIndex = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowDepositRecord + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.UpperTickIndex |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 6: + 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 ErrIntOverflowDepositRecord + } + 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 := skipDepositRecord(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthDepositRecord + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func skipDepositRecord(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, ErrIntOverflowDepositRecord + } + 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, ErrIntOverflowDepositRecord + } + 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, ErrIntOverflowDepositRecord + } + 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, ErrInvalidLengthDepositRecord + } + iNdEx += length + case 3: + depth++ + case 4: + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupDepositRecord + } + depth-- + case 5: + iNdEx += 4 + default: + return 0, fmt.Errorf("proto: illegal wireType %d", wireType) + } + if iNdEx < 0 { + return 0, ErrInvalidLengthDepositRecord + } + if depth == 0 { + return iNdEx, nil + } + } + return 0, io.ErrUnexpectedEOF +} + +var ( + ErrInvalidLengthDepositRecord = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowDepositRecord = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupDepositRecord = fmt.Errorf("proto: unexpected end of group") +) diff --git a/x/dex/types/errors.go b/x/dex/types/errors.go new file mode 100644 index 000000000..7aad622ad --- /dev/null +++ b/x/dex/types/errors.go @@ -0,0 +1,163 @@ +package types + +// DONTCOVER + +import ( + sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" +) + +// x/dex module sentinel errors + +//nolint:all +var ( + ErrInvalidTradingPair = sdkerrors.Register( + ModuleName, + 1102, + "Invalid token pair:", + ) // "%s<>%s", tokenA, tokenB + ErrInsufficientShares = sdkerrors.Register( + ModuleName, + 1104, + "Insufficient shares:", + ) // "%s does not have %s shares of type %s", address, shares, sharesID + ErrUnbalancedTxArray = sdkerrors.Register( + ModuleName, + 1110, + "Transaction input arrays are not of the same length.", + ) + ErrValidLimitOrderTrancheNotFound = sdkerrors.Register( + ModuleName, + 1111, + "Limit order trache not found:", + ) // "%d", trancheKey + ErrCancelEmptyLimitOrder = sdkerrors.Register( + ModuleName, + 1112, + "Cannot cancel additional liquidity from limit order tranche:", + ) // "%d", tranche.TrancheKey + ErrInsufficientLiquidity = sdkerrors.Register( + ModuleName, + 1114, + "Not enough liquidity to complete trade", + ) + ErrTickOutsideRange = sdkerrors.Register( + ModuleName, + 1117, + "Supplying a tick > 559,680 is not allowed", + ) + ErrInvalidPoolDenom = sdkerrors.Register( + ModuleName, + 1118, + "Denom is not an instance of Duality PoolDenom", + ) + ErrInvalidPairIDStr = sdkerrors.Register( + ModuleName, + 1119, + "PairID does not conform to pattern TokenA<>TokenB", + ) + ErrZeroDeposit = sdkerrors.Register( + ModuleName, + 1120, + "At least one deposit amount must be > 0.", + ) + ErrZeroTrueDeposit = sdkerrors.Register( + ModuleName, + 1121, + "Cannot deposit double-sided liquidity in tick with prexisting single-sided liquidity.", + ) + ErrWithdrawEmptyLimitOrder = sdkerrors.Register( + ModuleName, + 1124, + "Cannot withdraw additional liqudity from this limit order at this time.", + ) + ErrZeroSwap = sdkerrors.Register( + ModuleName, + 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, + "Withdraw amount must be > 0.", + ) + ErrZeroLimitOrder = sdkerrors.Register( + ModuleName, + 1130, + "Limit order amount must be > 0.", + ) + ErrDepositShareUnderflow = sdkerrors.Register( + ModuleName, + 1133, + "Deposit amount is too small to issue shares", + ) + ErrFoKLimitOrderNotFilled = sdkerrors.Register( + ModuleName, + 1134, + "Fill Or Kill limit order couldn't be executed in its entirety.", + ) + ErrInvalidTimeString = sdkerrors.Register( + ModuleName, + 1135, + "Time string must be formatted as MM/dd/yyyy HH:mm:ss (ex. 02/05/2023 15:34:56) ", + ) + ErrGoodTilOrderWithoutExpiration = sdkerrors.Register( + ModuleName, + 1136, + "Limit orders of type GOOD_TIL_TIME must supply an ExpirationTime.", + ) + ErrExpirationOnWrongOrderType = sdkerrors.Register( + ModuleName, + 1137, + "Only Limit orders of type GOOD_TIL_TIME can supply an ExpirationTime.", + ) + ErrInvalidOrderType = sdkerrors.Register( + ModuleName, + 1138, + "Order type must be one of: GOOD_TIL_CANCELLED, FILL_OR_KILL, IMMEDIATE_OR_CANCEL, JUST_IN_TIME, or GOOD_TIL_TIME.", + ) + ErrExpirationTimeInPast = sdkerrors.Register( + ModuleName, + 1139, + "Limit order expiration time must be greater than current block time:", + ) + ErrExitLimitPriceHit = sdkerrors.Register( + ModuleName, + 1140, + "ExitLimitPrice cannot be satisfied.", + ) + ErrAllMultiHopRoutesFailed = sdkerrors.Register( + ModuleName, + 1141, + "All multihop routes failed limitPrice check or had insufficient liquidity", + ) + ErrMultihopExitTokensMismatch = sdkerrors.Register( + ModuleName, + 1142, + "All multihop routes must have the same exit token", + ) + ErrMissingMultihopRoute = sdkerrors.Register( + ModuleName, + 1143, + "Must supply at least 1 route for multihop swap", + ) + ErrZeroMaxAmountOut = sdkerrors.Register( + ModuleName, + 1144, + "MaxAmountOut must be nil or > 0.", + ) + ErrInvalidMaxAmountOutForMaker = sdkerrors.Register( + ModuleName, + 1145, + "MaxAmountOut can only be set for taker only limit orders.", + ) + ErrInvalidFee = sdkerrors.Register( + ModuleName, + 1148, + "Fee must must a legal fee amount:", + ) +) diff --git a/x/dex/types/events.go b/x/dex/types/events.go new file mode 100644 index 000000000..1d428f844 --- /dev/null +++ b/x/dex/types/events.go @@ -0,0 +1,227 @@ +package types + +import ( + "strconv" + "strings" + + sdk "github.com/cosmos/cosmos-sdk/types" +) + +func CreateDepositEvent( + creator sdk.AccAddress, + receiver sdk.AccAddress, + token0 string, + token1 string, + tickIndex int64, + fee uint64, + depositAmountReserve0 sdk.Int, + depositAmountReserve1 sdk.Int, + sharesMinted sdk.Int, +) sdk.Event { + attrs := []sdk.Attribute{ + sdk.NewAttribute(sdk.AttributeKeyModule, "dex"), + sdk.NewAttribute(sdk.AttributeKeyAction, DepositEventKey), + sdk.NewAttribute(DepositEventCreator, creator.String()), + sdk.NewAttribute(DepositEventReceiver, receiver.String()), + sdk.NewAttribute(DepositEventToken0, token0), + sdk.NewAttribute(DepositEventToken1, token1), + sdk.NewAttribute(DepositEventPrice, strconv.FormatInt(tickIndex, 10)), + sdk.NewAttribute(DepositEventFee, strconv.FormatUint(fee, 10)), + sdk.NewAttribute(DepositEventReserves0Deposited, depositAmountReserve0.String()), + sdk.NewAttribute(DepositEventReserves1Deposited, depositAmountReserve1.String()), + sdk.NewAttribute(DepositEventSharesMinted, sharesMinted.String()), + } + + return sdk.NewEvent(sdk.EventTypeMessage, attrs...) +} + +func CreateWithdrawEvent( + creator sdk.AccAddress, + receiver sdk.AccAddress, + token0 string, + token1 string, + tickIndex int64, + fee uint64, + withdrawAmountReserve0 sdk.Int, + withdrawAmountReserve1 sdk.Int, + sharesRemoved sdk.Int, +) sdk.Event { + attrs := []sdk.Attribute{ + sdk.NewAttribute(sdk.AttributeKeyModule, "dex"), + sdk.NewAttribute(sdk.AttributeKeyAction, WithdrawEventKey), + sdk.NewAttribute(WithdrawEventCreator, creator.String()), + sdk.NewAttribute(WithdrawEventReceiver, receiver.String()), + sdk.NewAttribute(WithdrawEventToken0, token0), + sdk.NewAttribute(WithdrawEventToken1, token1), + sdk.NewAttribute(WithdrawEventPrice, strconv.FormatInt(tickIndex, 10)), + sdk.NewAttribute(WithdrawEventFee, strconv.FormatUint(fee, 10)), + sdk.NewAttribute(WithdrawEventReserves0Withdrawn, withdrawAmountReserve0.String()), + sdk.NewAttribute(WithdrawEventReserves1Withdrawn, withdrawAmountReserve1.String()), + sdk.NewAttribute(WithdrawEventSharesRemoved, sharesRemoved.String()), + } + + return sdk.NewEvent(sdk.EventTypeMessage, attrs...) +} + +func CreateMultihopSwapEvent( + creator sdk.AccAddress, + receiver sdk.AccAddress, + makerDenom string, + tokenOut string, + amountIn sdk.Int, + amountOut sdk.Int, + route []string, +) sdk.Event { + attrs := []sdk.Attribute{ + sdk.NewAttribute(sdk.AttributeKeyModule, "dex"), + sdk.NewAttribute(sdk.AttributeKeyAction, MultihopSwapEventKey), + sdk.NewAttribute(MultihopSwapEventCreator, creator.String()), + sdk.NewAttribute(MultihopSwapEventReceiver, receiver.String()), + sdk.NewAttribute(MultihopSwapEventTokenIn, makerDenom), + sdk.NewAttribute(MultihopSwapEventTokenOut, tokenOut), + sdk.NewAttribute(MultihopSwapEventAmountIn, amountIn.String()), + sdk.NewAttribute(MultihopSwapEventAmountOut, amountOut.String()), + sdk.NewAttribute(MultihopSwapEventRoute, strings.Join(route, ",")), + } + + return sdk.NewEvent(sdk.EventTypeMessage, attrs...) +} + +func CreatePlaceLimitOrderEvent( + creator sdk.AccAddress, + receiver sdk.AccAddress, + token0 string, + token1 string, + makerDenom string, + tokenOut string, + amountIn sdk.Int, + limitTick int64, + orderType string, + shares sdk.Int, + trancheKey string, +) sdk.Event { + attrs := []sdk.Attribute{ + sdk.NewAttribute(sdk.AttributeKeyModule, "dex"), + sdk.NewAttribute(sdk.AttributeKeyAction, PlaceLimitOrderEventKey), + sdk.NewAttribute(PlaceLimitOrderEventCreator, creator.String()), + sdk.NewAttribute(PlaceLimitOrderEventReceiver, receiver.String()), + sdk.NewAttribute(PlaceLimitOrderEventToken0, token0), + sdk.NewAttribute(PlaceLimitOrderEventToken1, token1), + sdk.NewAttribute(PlaceLimitOrderEventTokenIn, makerDenom), + sdk.NewAttribute(PlaceLimitOrderEventTokenOut, tokenOut), + sdk.NewAttribute(PlaceLimitOrderEventAmountIn, amountIn.String()), + sdk.NewAttribute(PlaceLimitOrderEventLimitTick, strconv.FormatInt(limitTick, 10)), + sdk.NewAttribute(PlaceLimitOrderEventOrderType, orderType), + sdk.NewAttribute(PlaceLimitOrderEventShares, shares.String()), + sdk.NewAttribute(PlaceLimitOrderEventTrancheKey, trancheKey), + } + + return sdk.NewEvent(sdk.EventTypeMessage, attrs...) +} + +func WithdrawFilledLimitOrderEvent( + creator sdk.AccAddress, + token0 string, + token1 string, + makerDenom string, + tokenOut string, + amountOut sdk.Int, + trancheKey string, +) sdk.Event { + attrs := []sdk.Attribute{ + sdk.NewAttribute(sdk.AttributeKeyModule, "dex"), + sdk.NewAttribute(sdk.AttributeKeyAction, WithdrawFilledLimitOrderEventKey), + sdk.NewAttribute(WithdrawFilledLimitOrderEventCreator, creator.String()), + sdk.NewAttribute(WithdrawFilledLimitOrderEventToken0, token0), + sdk.NewAttribute(WithdrawFilledLimitOrderEventToken1, token1), + sdk.NewAttribute(WithdrawFilledLimitOrderEventTokenIn, makerDenom), + sdk.NewAttribute(WithdrawFilledLimitOrderEventTokenOut, tokenOut), + sdk.NewAttribute(WithdrawFilledLimitOrderEventTrancheKey, trancheKey), + sdk.NewAttribute(WithdrawFilledLimitOrderEventAmountOut, amountOut.String()), + } + + return sdk.NewEvent(sdk.EventTypeMessage, attrs...) +} + +func CancelLimitOrderEvent( + creator sdk.AccAddress, + token0 string, + token1 string, + makerDenom string, + tokenOut string, + amountOut sdk.Int, + trancheKey string, +) sdk.Event { + attrs := []sdk.Attribute{ + sdk.NewAttribute(sdk.AttributeKeyModule, "dex"), + sdk.NewAttribute(sdk.AttributeKeyAction, CancelLimitOrderEventKey), + sdk.NewAttribute(CancelLimitOrderEventCreator, creator.String()), + sdk.NewAttribute(CancelLimitOrderEventToken0, token0), + sdk.NewAttribute(CancelLimitOrderEventToken1, token1), + sdk.NewAttribute(CancelLimitOrderEventTokenIn, makerDenom), + sdk.NewAttribute(CancelLimitOrderEventTokenOut, tokenOut), + sdk.NewAttribute(CancelLimitOrderEventAmountOut, amountOut.String()), + sdk.NewAttribute(CancelLimitOrderEventTrancheKey, trancheKey), + } + + return sdk.NewEvent(sdk.EventTypeMessage, attrs...) +} + +func TickUpdateEvent( + token0 string, + token1 string, + makerDenom string, + tickIndex int64, + reserves sdk.Int, + otherAttrs ...sdk.Attribute, +) sdk.Event { + attrs := []sdk.Attribute{ + sdk.NewAttribute(sdk.AttributeKeyModule, "dex"), + sdk.NewAttribute(sdk.AttributeKeyAction, TickUpdateEventKey), + sdk.NewAttribute(TickUpdateEventToken0, token0), + sdk.NewAttribute(TickUpdateEventToken1, token1), + sdk.NewAttribute(TickUpdateEventTokenIn, makerDenom), + sdk.NewAttribute(TickUpdateEventTickIndex, strconv.FormatInt(tickIndex, 10)), + sdk.NewAttribute(TickUpdateEventFee, strconv.FormatInt(tickIndex, 10)), + sdk.NewAttribute(TickUpdateEventReserves, reserves.String()), + } + attrs = append(attrs, otherAttrs...) + + return sdk.NewEvent(EventTypeTickUpdate, attrs...) +} + +func CreateTickUpdatePoolReserves(tick PoolReserves) sdk.Event { + tradePairID := tick.Key.TradePairID + pairID := tradePairID.MustPairID() + return TickUpdateEvent( + pairID.Token0, + pairID.Token1, + tradePairID.MakerDenom, + tick.Key.TickIndexTakerToMaker, + tick.ReservesMakerDenom, + sdk.NewAttribute(TickUpdateEventFee, strconv.FormatUint(tick.Key.Fee, 10)), + ) +} + +func CreateTickUpdateLimitOrderTranche(tranche *LimitOrderTranche) sdk.Event { + tradePairID := tranche.Key.TradePairID + pairID := tradePairID.MustPairID() + return TickUpdateEvent( + pairID.Token0, + pairID.Token1, + tradePairID.MakerDenom, + tranche.Key.TickIndexTakerToMaker, + tranche.ReservesMakerDenom, + sdk.NewAttribute(TickUpdateEventTrancheKey, tranche.Key.TrancheKey), + ) +} + +func GoodTilPurgeHitLimitEvent(gas sdk.Gas) sdk.Event { + attrs := []sdk.Attribute{ + sdk.NewAttribute(sdk.AttributeKeyModule, "dex"), + sdk.NewAttribute(sdk.AttributeKeyAction, GoodTilPurgeHitGasLimitEventKey), + sdk.NewAttribute(GoodTilPurgeHitGasLimitEventGas, strconv.FormatUint(gas, 10)), + } + + return sdk.NewEvent(sdk.EventTypeMessage, attrs...) +} diff --git a/x/dex/types/expected_keepers.go b/x/dex/types/expected_keepers.go new file mode 100644 index 000000000..22d02f63c --- /dev/null +++ b/x/dex/types/expected_keepers.go @@ -0,0 +1,17 @@ +package types + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" +) + +// BankKeeper defines the expected interface needed to retrieve account balances. +type BankKeeper interface { + // Methods imported from bank should be defined here + SendCoinsFromAccountToModule(ctx sdk.Context, senderAddr sdk.AccAddress, recipientModule string, amt sdk.Coins) error + SendCoinsFromModuleToAccount(ctx sdk.Context, senderModule string, recipientAddr sdk.AccAddress, amt sdk.Coins) error + MintCoins(ctx sdk.Context, moduleName string, amt sdk.Coins) error + BurnCoins(ctx sdk.Context, moduleName string, amt sdk.Coins) error + IterateAccountBalances(ctx sdk.Context, addr sdk.AccAddress, cb func(sdk.Coin) bool) + SpendableCoins(ctx sdk.Context, addr sdk.AccAddress) sdk.Coins + GetSupply(ctx sdk.Context, denom string) sdk.Coin +} diff --git a/x/dex/types/genesis.go b/x/dex/types/genesis.go new file mode 100644 index 000000000..645614e97 --- /dev/null +++ b/x/dex/types/genesis.go @@ -0,0 +1,74 @@ +package types + +import ( + "fmt" +) + +// DefaultGenesis returns the default Capability genesis state +func DefaultGenesis() *GenesisState { + return &GenesisState{ + LimitOrderTrancheUserList: []*LimitOrderTrancheUser{}, + TickLiquidityList: []*TickLiquidity{}, + InactiveLimitOrderTrancheList: []*LimitOrderTranche{}, + PoolMetadataList: []PoolMetadata{}, + // this line is used by starport scaffolding # genesis/types/default + Params: DefaultParams(), + } +} + +// Validate performs basic genesis state validation returning an error upon any +// failure. +func (gs GenesisState) Validate() error { + // Check for duplicated index in LimitOrderTrancheUser + LimitOrderTrancheUserIndexMap := make(map[string]struct{}) + + for _, elem := range gs.LimitOrderTrancheUserList { + index := string(LimitOrderTrancheUserKey(elem.Address, elem.TrancheKey)) + if _, ok := LimitOrderTrancheUserIndexMap[index]; ok { + return fmt.Errorf("duplicated index for LimitOrderTrancheUser") + } + LimitOrderTrancheUserIndexMap[index] = struct{}{} + } + + // Check for duplicated index in tickLiquidity + tickLiquidityIndexMap := make(map[string]struct{}) + + for _, elem := range gs.TickLiquidityList { + var index string + switch liquidity := elem.Liquidity.(type) { + case *TickLiquidity_PoolReserves: + index = string(liquidity.PoolReserves.Key.KeyMarshal()) + case *TickLiquidity_LimitOrderTranche: + index = string(liquidity.LimitOrderTranche.Key.KeyMarshal()) + } + if _, ok := tickLiquidityIndexMap[index]; ok { + return fmt.Errorf("duplicated index for tickLiquidity") + } + tickLiquidityIndexMap[index] = struct{}{} + } + // Check for duplicated index in inactiveLimitOrderTranche + inactiveLimitOrderTrancheKeyMap := make(map[string]struct{}) + + for _, elem := range gs.InactiveLimitOrderTrancheList { + index := string(elem.Key.KeyMarshal()) + if _, ok := inactiveLimitOrderTrancheKeyMap[index]; ok { + return fmt.Errorf("duplicated index for inactiveLimitOrderTranche") + } + inactiveLimitOrderTrancheKeyMap[index] = struct{}{} + } + // Check for duplicated ID in poolMetadata + poolMetadataIDMap := make(map[uint64]bool) + poolMetadataCount := gs.GetPoolCount() + for _, elem := range gs.PoolMetadataList { + if _, ok := poolMetadataIDMap[elem.ID]; ok { + return fmt.Errorf("duplicated id for poolMetadata") + } + if elem.ID >= poolMetadataCount { + return fmt.Errorf("poolMetadata id should be lower or equal than the last id") + } + poolMetadataIDMap[elem.ID] = true + } + // this line is used by starport scaffolding # genesis/types/validate + + return gs.Params.Validate() +} diff --git a/x/dex/types/genesis.pb.go b/x/dex/types/genesis.pb.go new file mode 100644 index 000000000..d1469d8d6 --- /dev/null +++ b/x/dex/types/genesis.pb.go @@ -0,0 +1,616 @@ +// Code generated by protoc-gen-gogo. DO NOT EDIT. +// source: duality/dex/genesis.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 + +// GenesisState defines the dex module's genesis state. +type GenesisState struct { + Params Params `protobuf:"bytes,1,opt,name=params,proto3" json:"params"` + TickLiquidityList []*TickLiquidity `protobuf:"bytes,2,rep,name=tickLiquidityList,proto3" json:"tickLiquidityList,omitempty"` + InactiveLimitOrderTrancheList []*LimitOrderTranche `protobuf:"bytes,3,rep,name=inactiveLimitOrderTrancheList,proto3" json:"inactiveLimitOrderTrancheList,omitempty"` + LimitOrderTrancheUserList []*LimitOrderTrancheUser `protobuf:"bytes,4,rep,name=limitOrderTrancheUserList,proto3" json:"limitOrderTrancheUserList,omitempty"` + PoolMetadataList []PoolMetadata `protobuf:"bytes,5,rep,name=poolMetadataList,proto3" json:"poolMetadataList"` + PoolCount uint64 `protobuf:"varint,6,opt,name=poolCount,proto3" json:"poolCount,omitempty"` +} + +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_6ccf50bb6779a67a, []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 (m *GenesisState) GetTickLiquidityList() []*TickLiquidity { + if m != nil { + return m.TickLiquidityList + } + return nil +} + +func (m *GenesisState) GetInactiveLimitOrderTrancheList() []*LimitOrderTranche { + if m != nil { + return m.InactiveLimitOrderTrancheList + } + return nil +} + +func (m *GenesisState) GetLimitOrderTrancheUserList() []*LimitOrderTrancheUser { + if m != nil { + return m.LimitOrderTrancheUserList + } + return nil +} + +func (m *GenesisState) GetPoolMetadataList() []PoolMetadata { + if m != nil { + return m.PoolMetadataList + } + return nil +} + +func (m *GenesisState) GetPoolCount() uint64 { + if m != nil { + return m.PoolCount + } + return 0 +} + +func init() { + proto.RegisterType((*GenesisState)(nil), "duality.dex.GenesisState") +} + +func init() { proto.RegisterFile("duality/dex/genesis.proto", fileDescriptor_6ccf50bb6779a67a) } + +var fileDescriptor_6ccf50bb6779a67a = []byte{ + // 392 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0xcf, 0x4e, 0xea, 0x40, + 0x14, 0xc6, 0xdb, 0x0b, 0x97, 0xe4, 0x0e, 0x77, 0x71, 0x6f, 0x75, 0x51, 0x1a, 0x2d, 0x0d, 0x89, + 0x09, 0xd1, 0xd8, 0x46, 0x7c, 0x03, 0x8c, 0x71, 0x21, 0xfe, 0x09, 0xe2, 0xc6, 0x4d, 0x33, 0xb4, + 0x63, 0x19, 0x6d, 0x3b, 0xd8, 0x99, 0x1a, 0x78, 0x0b, 0x1f, 0x8b, 0x25, 0x4b, 0x57, 0xc6, 0xc0, + 0x8b, 0x98, 0xf9, 0x43, 0x6c, 0x25, 0xe2, 0xae, 0x3d, 0xe7, 0x77, 0xbe, 0xef, 0x7c, 0x27, 0x03, + 0x1a, 0x61, 0x0e, 0x63, 0xcc, 0xa6, 0x5e, 0x88, 0x26, 0x5e, 0x84, 0x52, 0x44, 0x31, 0x75, 0xc7, + 0x19, 0x61, 0xc4, 0xa8, 0xab, 0x96, 0x1b, 0xa2, 0x89, 0xb5, 0x1d, 0x91, 0x88, 0x88, 0xba, 0xc7, + 0xbf, 0x24, 0x62, 0x99, 0xc5, 0xe9, 0x31, 0xcc, 0x60, 0xa2, 0x86, 0xad, 0xfd, 0x62, 0x27, 0xc6, + 0x09, 0x66, 0x3e, 0xc9, 0x42, 0x94, 0xf9, 0x2c, 0x83, 0x69, 0x30, 0x42, 0x7e, 0x4e, 0x51, 0xa6, + 0xd8, 0xbd, 0x1f, 0x58, 0x85, 0x39, 0x45, 0x8c, 0xe1, 0xe0, 0xd1, 0x8f, 0xf1, 0x53, 0x8e, 0x43, + 0xbe, 0xa2, 0x24, 0x9a, 0xa5, 0x75, 0x08, 0x89, 0xfd, 0x04, 0x31, 0x18, 0x42, 0x06, 0x25, 0xd0, + 0x9a, 0x57, 0xc0, 0xdf, 0x33, 0x19, 0xf2, 0x86, 0x41, 0x86, 0x8c, 0x23, 0x50, 0x93, 0x6b, 0x9b, + 0xba, 0xa3, 0xb7, 0xeb, 0x9d, 0x2d, 0xb7, 0x10, 0xda, 0xbd, 0x16, 0xad, 0x6e, 0x75, 0xf6, 0xd6, + 0xd4, 0xfa, 0x0a, 0x34, 0x2e, 0xc1, 0x7f, 0x6e, 0xde, 0x5b, 0x79, 0xf7, 0x30, 0x65, 0xe6, 0x2f, + 0xa7, 0xd2, 0xae, 0x77, 0xac, 0xd2, 0xf4, 0xa0, 0x48, 0x09, 0x11, 0xbd, 0xbf, 0x3e, 0x6a, 0x3c, + 0x80, 0x5d, 0x9c, 0xc2, 0x80, 0xe1, 0x67, 0xd4, 0xe3, 0xd9, 0xaf, 0x78, 0xf4, 0x81, 0x4c, 0x2e, + 0xb4, 0x2b, 0x42, 0xdb, 0x2e, 0x69, 0xaf, 0x91, 0x4a, 0x7f, 0xb3, 0x94, 0x71, 0x0f, 0x1a, 0xf1, + 0xd7, 0xc6, 0x2d, 0x45, 0x99, 0xf0, 0xa9, 0x0a, 0x9f, 0xd6, 0x66, 0x1f, 0x4e, 0x2b, 0xaf, 0xef, + 0xa5, 0x8c, 0x73, 0xf0, 0x8f, 0x9f, 0xff, 0x42, 0x5d, 0x5f, 0xc8, 0xff, 0x16, 0xf2, 0x8d, 0xf2, + 0x81, 0x0b, 0x90, 0x3a, 0xf3, 0xda, 0xa0, 0xb1, 0x03, 0xfe, 0xf0, 0xda, 0x09, 0xc9, 0x53, 0x66, + 0xd6, 0x1c, 0xbd, 0x5d, 0xed, 0x7f, 0x16, 0xba, 0xa7, 0xb3, 0x85, 0xad, 0xcf, 0x17, 0xb6, 0xfe, + 0xbe, 0xb0, 0xf5, 0x97, 0xa5, 0xad, 0xcd, 0x97, 0xb6, 0xf6, 0xba, 0xb4, 0xb5, 0xbb, 0x83, 0x08, + 0xb3, 0x51, 0x3e, 0x74, 0x03, 0x92, 0x78, 0xca, 0xf4, 0x30, 0x86, 0x43, 0xba, 0xfa, 0xf1, 0x26, + 0xf2, 0x25, 0x4d, 0xc7, 0x88, 0x0e, 0x6b, 0xe2, 0x81, 0x1c, 0x7f, 0x04, 0x00, 0x00, 0xff, 0xff, + 0xb6, 0x99, 0x5f, 0x53, 0x10, 0x03, 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 + if m.PoolCount != 0 { + i = encodeVarintGenesis(dAtA, i, uint64(m.PoolCount)) + i-- + dAtA[i] = 0x30 + } + if len(m.PoolMetadataList) > 0 { + for iNdEx := len(m.PoolMetadataList) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.PoolMetadataList[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintGenesis(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x2a + } + } + if len(m.LimitOrderTrancheUserList) > 0 { + for iNdEx := len(m.LimitOrderTrancheUserList) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.LimitOrderTrancheUserList[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintGenesis(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x22 + } + } + if len(m.InactiveLimitOrderTrancheList) > 0 { + for iNdEx := len(m.InactiveLimitOrderTrancheList) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.InactiveLimitOrderTrancheList[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintGenesis(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1a + } + } + if len(m.TickLiquidityList) > 0 { + for iNdEx := len(m.TickLiquidityList) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.TickLiquidityList[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintGenesis(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } + } + { + 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)) + if len(m.TickLiquidityList) > 0 { + for _, e := range m.TickLiquidityList { + l = e.Size() + n += 1 + l + sovGenesis(uint64(l)) + } + } + if len(m.InactiveLimitOrderTrancheList) > 0 { + for _, e := range m.InactiveLimitOrderTrancheList { + l = e.Size() + n += 1 + l + sovGenesis(uint64(l)) + } + } + if len(m.LimitOrderTrancheUserList) > 0 { + for _, e := range m.LimitOrderTrancheUserList { + l = e.Size() + n += 1 + l + sovGenesis(uint64(l)) + } + } + if len(m.PoolMetadataList) > 0 { + for _, e := range m.PoolMetadataList { + l = e.Size() + n += 1 + l + sovGenesis(uint64(l)) + } + } + if m.PoolCount != 0 { + n += 1 + sovGenesis(uint64(m.PoolCount)) + } + 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 + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field TickLiquidityList", 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 + } + m.TickLiquidityList = append(m.TickLiquidityList, &TickLiquidity{}) + if err := m.TickLiquidityList[len(m.TickLiquidityList)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field InactiveLimitOrderTrancheList", 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 + } + m.InactiveLimitOrderTrancheList = append(m.InactiveLimitOrderTrancheList, &LimitOrderTranche{}) + if err := m.InactiveLimitOrderTrancheList[len(m.InactiveLimitOrderTrancheList)-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 LimitOrderTrancheUserList", 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 + } + m.LimitOrderTrancheUserList = append(m.LimitOrderTrancheUserList, &LimitOrderTrancheUser{}) + if err := m.LimitOrderTrancheUserList[len(m.LimitOrderTrancheUserList)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 5: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field PoolMetadataList", 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 + } + m.PoolMetadataList = append(m.PoolMetadataList, PoolMetadata{}) + if err := m.PoolMetadataList[len(m.PoolMetadataList)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 6: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field PoolCount", wireType) + } + m.PoolCount = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenesis + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.PoolCount |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + 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/dex/types/genesis_test.go b/x/dex/types/genesis_test.go new file mode 100644 index 000000000..4a86c25d8 --- /dev/null +++ b/x/dex/types/genesis_test.go @@ -0,0 +1,196 @@ +package types_test + +import ( + "testing" + + "github.com/neutron-org/neutron/x/dex/types" + "github.com/stretchr/testify/require" +) + +func TestGenesisState_Validate(t *testing.T) { + for _, tc := range []struct { + desc string + genState *types.GenesisState + valid bool + }{ + { + desc: "default is valid", + genState: types.DefaultGenesis(), + valid: true, + }, + { + desc: "valid genesis state", + genState: &types.GenesisState{ + LimitOrderTrancheUserList: []*types.LimitOrderTrancheUser{ + { + TrancheKey: "0", + Address: "0", + TradePairID: &types.TradePairID{MakerDenom: "TokenA", TakerDenom: "TokenB"}, + }, + { + TrancheKey: "1", + Address: "1", + TradePairID: &types.TradePairID{MakerDenom: "TokenA", TakerDenom: "TokenB"}, + }, + }, + TickLiquidityList: []*types.TickLiquidity{ + { + Liquidity: &types.TickLiquidity_LimitOrderTranche{ + LimitOrderTranche: &types.LimitOrderTranche{ + Key: &types.LimitOrderTrancheKey{ + TradePairID: &types.TradePairID{MakerDenom: "TokenA", TakerDenom: "TokenB"}, + TickIndexTakerToMaker: 0, + TrancheKey: "0", + }, + }, + }, + }, + { + Liquidity: &types.TickLiquidity_PoolReserves{ + PoolReserves: &types.PoolReserves{ + Key: &types.PoolReservesKey{ + TradePairID: &types.TradePairID{MakerDenom: "TokenA", TakerDenom: "TokenB"}, + TickIndexTakerToMaker: 0, + Fee: 0, + }, + }, + }, + }, + }, + InactiveLimitOrderTrancheList: []*types.LimitOrderTranche{ + { + Key: &types.LimitOrderTrancheKey{ + TradePairID: &types.TradePairID{MakerDenom: "TokenA", TakerDenom: "TokenB"}, + TickIndexTakerToMaker: 0, + TrancheKey: "0", + }, + }, + { + Key: &types.LimitOrderTrancheKey{ + TradePairID: &types.TradePairID{TakerDenom: "TokenA", MakerDenom: "TokenB"}, + TickIndexTakerToMaker: 1, + TrancheKey: "1", + }, + }, + }, + PoolMetadataList: []types.PoolMetadata{ + { + ID: 0, + }, + { + ID: 1, + }, + }, + PoolCount: 2, + // this line is used by starport scaffolding # types/genesis/validField + }, + valid: true, + }, + { + desc: "duplicated LimitOrderTrancheUser", + genState: &types.GenesisState{ + LimitOrderTrancheUserList: []*types.LimitOrderTrancheUser{ + { + TrancheKey: "0", + Address: "0", + TradePairID: &types.TradePairID{MakerDenom: "TokenA", TakerDenom: "TokenB"}, + }, + { + TrancheKey: "0", + Address: "0", + TradePairID: &types.TradePairID{MakerDenom: "TokenA", TakerDenom: "TokenB"}, + }, + }, + }, + valid: false, + }, + { + desc: "duplicated tickLiquidity", + genState: &types.GenesisState{ + TickLiquidityList: []*types.TickLiquidity{ + { + Liquidity: &types.TickLiquidity_LimitOrderTranche{ + LimitOrderTranche: &types.LimitOrderTranche{ + Key: &types.LimitOrderTrancheKey{ + TradePairID: &types.TradePairID{MakerDenom: "TokenA", TakerDenom: "TokenB"}, + TickIndexTakerToMaker: 0, + TrancheKey: "0", + }, + }, + }, + }, + { + Liquidity: &types.TickLiquidity_LimitOrderTranche{ + LimitOrderTranche: &types.LimitOrderTranche{ + Key: &types.LimitOrderTrancheKey{ + TradePairID: &types.TradePairID{MakerDenom: "TokenA", TakerDenom: "TokenB"}, + TickIndexTakerToMaker: 0, + TrancheKey: "0", + }, + }, + }, + }, + }, + }, + valid: false, + }, + { + desc: "duplicated inactiveLimitOrderTranche", + genState: &types.GenesisState{ + InactiveLimitOrderTrancheList: []*types.LimitOrderTranche{ + { + Key: &types.LimitOrderTrancheKey{ + TradePairID: &types.TradePairID{MakerDenom: "TokenA", TakerDenom: "TokenB"}, + TickIndexTakerToMaker: 0, + TrancheKey: "0", + }, + }, + { + Key: &types.LimitOrderTrancheKey{ + TradePairID: &types.TradePairID{MakerDenom: "TokenA", TakerDenom: "TokenB"}, + TickIndexTakerToMaker: 0, + TrancheKey: "0", + }, + }, + }, + }, + valid: false, + }, + { + desc: "duplicated poolMetadata", + genState: &types.GenesisState{ + PoolMetadataList: []types.PoolMetadata{ + { + ID: 0, + }, + { + ID: 0, + }, + }, + }, + valid: false, + }, + { + desc: "invalid poolCount", + genState: &types.GenesisState{ + PoolMetadataList: []types.PoolMetadata{ + { + ID: 1, + }, + }, + PoolCount: 0, + }, + valid: false, + }, + // this line is used by starport scaffolding # types/genesis/testcase + } { + t.Run(tc.desc, func(t *testing.T) { + err := tc.genState.Validate() + if tc.valid { + require.NoError(t, err) + } else { + require.Error(t, err) + } + }) + } +} diff --git a/x/dex/types/keys.go b/x/dex/types/keys.go new file mode 100644 index 000000000..a00a6b0bf --- /dev/null +++ b/x/dex/types/keys.go @@ -0,0 +1,296 @@ +package types + +import ( + "errors" + "time" + + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/neutron-org/neutron/x/dex/utils" +) + +const ( + // ModuleName defines the module name + ModuleName = "dex" + + // StoreKey defines the primary module store key + StoreKey = ModuleName + + // RouterKey is the message route for slashing + RouterKey = ModuleName + + // QuerierRoute defines the module's query routing key + QuerierRoute = ModuleName + + // MemStoreKey defines the in-memory store key + MemStoreKey = "mem_dex" +) + +const ( + // TickLiquidityKeyPrefix is the prefix to retrieve all TickLiquidity + TickLiquidityKeyPrefix = "TickLiquidity/value/" + + // LimitOrderTrancheUserKeyPrefix is the prefix to retrieve all LimitOrderTrancheUser + LimitOrderTrancheUserKeyPrefix = "LimitOrderTrancheUser/value" + + // InactiveLimitOrderTrancheKeyPrefix is the prefix to retrieve all InactiveLimitOrderTranche + InactiveLimitOrderTrancheKeyPrefix = "InactiveLimitOrderTranche/value/" + + // LimitOrderExpirationKeyPrefix is the prefix to retrieve all LimitOrderExpiration + LimitOrderExpirationKeyPrefix = "LimitOrderExpiration/value/" + + // PoolIDKeyPrefix is the prefix to retrieve all PoolIds or retrieve a specific pool by pair+tick+fee + PoolIDKeyPrefix = "Pool/id/" + + // PoolMetadataKeyPrefix is the prefix to retrieve all PoolMetadata + PoolMetadataKeyPrefix = "PoolMetadata/value/" + + // PoolCountKeyPrefix is the prefix to retrieve the Pool count + PoolCountKeyPrefix = "Pool/count/" +) + +func KeyPrefix(p string) []byte { + key := []byte(p) + key = append(key, []byte("/")...) + return key +} + +func TickIndexToBytes(tickTakerToMaker int64) []byte { + key := make([]byte, 9) + if tickTakerToMaker < 0 { + copy(key[1:], sdk.Uint64ToBigEndian(uint64(tickTakerToMaker))) + } else { + copy(key[:1], []byte{0x01}) + copy(key[1:], sdk.Uint64ToBigEndian(uint64(tickTakerToMaker))) + } + + return key +} + +func BytesToTickIndex(bz []byte) (int64, error) { + if len(bz) != 9 { + return 0, errors.New("input should be 9 bytes long") + } + + isNegative := bz[0] == 0 + tickTakerToMaker := sdk.BigEndianToUint64(bz[1:]) + + if isNegative { + return int64(-tickTakerToMaker), nil + } else { + return int64(tickTakerToMaker), nil + } +} + +// LimitOrderTrancheUserKey returns the store key to retrieve a LimitOrderTrancheUser from the index fields +func LimitOrderTrancheUserKey(address, trancheKey string) []byte { + var key []byte + + addressBytes := []byte(address) + key = append(key, addressBytes...) + key = append(key, []byte("/")...) + + trancheKeyBytes := []byte(trancheKey) + key = append(key, trancheKeyBytes...) + key = append(key, []byte("/")...) + + return key +} + +func LimitOrderTrancheUserAddressPrefix(address string) []byte { + key := KeyPrefix(LimitOrderTrancheUserKeyPrefix) + addressBytes := []byte(address) + key = append(key, addressBytes...) + key = append(key, []byte("/")...) + + return key +} + +func TimeBytes(timestamp time.Time) []byte { + unixMs := uint64(timestamp.UnixMilli()) + str := utils.Uint64ToSortableString(unixMs) + return []byte(str) +} + +func TickLiquidityLimitOrderPrefix( + tradePairID *TradePairID, + tickIndexTakerTomMaker int64, +) []byte { + key := KeyPrefix(TickLiquidityKeyPrefix) + + pairIDBytes := []byte(tradePairID.MustPairID().CanonicalString()) + key = append(key, pairIDBytes...) + key = append(key, []byte("/")...) + + makerDenomBytes := []byte(tradePairID.MakerDenom) + key = append(key, makerDenomBytes...) + key = append(key, []byte("/")...) + + tickIndexBytes := TickIndexToBytes(tickIndexTakerTomMaker) + key = append(key, tickIndexBytes...) + key = append(key, []byte("/")...) + + liquidityTypeBytes := []byte(LiquidityTypeLimitOrder) + key = append(key, liquidityTypeBytes...) + key = append(key, []byte("/")...) + + return key +} + +func TickLiquidityPrefix(tradePairID *TradePairID) []byte { + var key []byte + key = append(KeyPrefix(TickLiquidityKeyPrefix), KeyPrefix(tradePairID.MustPairID().CanonicalString())...) + key = append(key, KeyPrefix(tradePairID.MakerDenom)...) + + return key +} + +func LimitOrderExpirationKey( + goodTilDate time.Time, + trancheRef []byte, +) []byte { + var key []byte + + goodTilDateBytes := TimeBytes(goodTilDate) + key = append(key, goodTilDateBytes...) + key = append(key, []byte("/")...) + + key = append(key, trancheRef...) + key = append(key, []byte("/")...) + + return key +} + +func PoolIDKey( + pairID *PairID, + tickIndex int64, + fee uint64, +) []byte { + key := []byte(pairID.CanonicalString()) + key = append(key, []byte("/")...) + + tickIndexBytes := TickIndexToBytes(tickIndex) + key = append(key, tickIndexBytes...) + key = append(key, []byte("/")...) + + feeBytes := sdk.Uint64ToBigEndian(fee) + key = append(key, feeBytes...) + key = append(key, []byte("/")...) + + return key +} + +// Deposit Event Attributes +const ( + DepositEventKey = "DepositLP" + DepositEventCreator = "Creator" + DepositEventToken0 = "TokenZero" + DepositEventToken1 = "TokenOne" + DepositEventPrice = "TickIndex" + DepositEventFee = "Fee" + DepositEventReceiver = "Receiver" + DepositEventReserves0Deposited = "ReservesZeroDeposited" + DepositEventReserves1Deposited = "ReservesOneDeposited" + DepositEventSharesMinted = "SharesMinted" +) + +// Withdraw Event Attributes +const ( + WithdrawEventKey = "WithdrawLP" + WithdrawEventCreator = "Creator" + WithdrawEventToken0 = "TokenZero" + WithdrawEventToken1 = "TokenOne" + WithdrawEventPrice = "TickIndex" + WithdrawEventFee = "Fee" + WithdrawEventReceiver = "Receiver" + WithdrawEventReserves0Withdrawn = "ReservesZeroWithdrawn" + WithdrawEventReserves1Withdrawn = "ReservesOneWithdrawn" + WithdrawEventSharesRemoved = "SharesRemoved" +) + +// Multihop-Swap Event Attributes +const ( + MultihopSwapEventKey = "MultihopSwap" + MultihopSwapEventCreator = "Creator" + MultihopSwapEventReceiver = "Receiver" + MultihopSwapEventTokenIn = "TokenIn" + MultihopSwapEventTokenOut = "TokenOut" + MultihopSwapEventAmountIn = "AmountIn" + MultihopSwapEventAmountOut = "AmountOut" + MultihopSwapEventRoute = "Route" +) + +// Place LimitOrder Event Attributes +const ( + PlaceLimitOrderEventKey = "PlaceLimitOrder" + PlaceLimitOrderEventCreator = "Creator" + PlaceLimitOrderEventReceiver = "Receiver" + PlaceLimitOrderEventToken0 = "TokenZero" + PlaceLimitOrderEventToken1 = "TokenOne" + PlaceLimitOrderEventTokenIn = "TokenIn" + PlaceLimitOrderEventTokenOut = "TokenOut" + PlaceLimitOrderEventAmountIn = "AmountIn" + PlaceLimitOrderEventLimitTick = "LimitTick" + PlaceLimitOrderEventOrderType = "OrderType" + PlaceLimitOrderEventShares = "Shares" + PlaceLimitOrderEventTrancheKey = "TrancheKey" +) + +// Withdraw LimitOrder Event Attributes +const ( + WithdrawFilledLimitOrderEventKey = "WithdrawLimitOrder" + WithdrawFilledLimitOrderEventCreator = "Creator" + WithdrawFilledLimitOrderEventToken0 = "TokenZero" + WithdrawFilledLimitOrderEventToken1 = "TokenOne" + WithdrawFilledLimitOrderEventTokenIn = "TokenIn" + WithdrawFilledLimitOrderEventTokenOut = "TokenOut" + WithdrawFilledLimitOrderEventTrancheKey = "TrancheKey" + WithdrawFilledLimitOrderEventAmountOut = "AmountOut" +) + +// Cancel LimitOrder Event Attributes +const ( + CancelLimitOrderEventKey = "CancelLimitOrder" + CancelLimitOrderEventCreator = "Creator" + CancelLimitOrderEventToken0 = "TokenZero" + CancelLimitOrderEventToken1 = "TokenOne" + CancelLimitOrderEventTokenIn = "TokenIn" + CancelLimitOrderEventTokenOut = "TokenOut" + CancelLimitOrderEventTrancheKey = "TrancheKey" + CancelLimitOrderEventAmountOut = "AmountOut" +) + +// Tick Update Event Attributes +const ( + EventTypeTickUpdate = "TickUpdate" + TickUpdateEventKey = "TickUpdate" + TickUpdateEventToken0 = "TokenZero" + TickUpdateEventToken1 = "TokenOne" + TickUpdateEventTokenIn = "TokenIn" + TickUpdateEventTickIndex = "TickIndex" + TickUpdateEventFee = "Fee" + TickUpdateEventTrancheKey = "TrancheKey" + TickUpdateEventReserves = "Reserves" +) + +const ( + GoodTilPurgeHitGasLimitEventKey = "GoodTilPurgeHitGasLimit" + GoodTilPurgeHitGasLimitEventGas = "Gas" +) + +const ( + // NOTE: have to add letter so that LP deposits are indexed ahead of LimitOrders + LiquidityTypePoolReserves = "A_PoolDeposit" + LiquidityTypeLimitOrder = "B_LODeposit" +) + +func JITGoodTilTime() time.Time { + return time.Time{} +} + +const ( + // NOTE: This number is based current cost of all operations in EndBlock, + // if that changes this value must be updated to ensure there is enough + // remaining gas (weak proxy for timeoutPrepareProposal) to complete endBlock + GoodTilPurgeGasBuffer = 50_000 + ExpiringLimitOrderGas = 10_000 +) diff --git a/x/dex/types/limit_order_expiration.pb.go b/x/dex/types/limit_order_expiration.pb.go new file mode 100644 index 000000000..06347e92e --- /dev/null +++ b/x/dex/types/limit_order_expiration.pb.go @@ -0,0 +1,381 @@ +// Code generated by protoc-gen-gogo. DO NOT EDIT. +// source: duality/dex/limit_order_expiration.proto + +package types + +import ( + fmt "fmt" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" + github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" + _ "google.golang.org/protobuf/types/known/timestamppb" + io "io" + math "math" + math_bits "math/bits" + time "time" +) + +// Reference imports to suppress errors if they are not otherwise used. +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf +var _ = time.Kitchen + +// 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 + +type LimitOrderExpiration struct { + // see limitOrderTranche.proto for details on goodTilDate + ExpirationTime time.Time `protobuf:"bytes,1,opt,name=expirationTime,proto3,stdtime" json:"expirationTime"` + TrancheRef []byte `protobuf:"bytes,2,opt,name=trancheRef,proto3" json:"trancheRef,omitempty"` +} + +func (m *LimitOrderExpiration) Reset() { *m = LimitOrderExpiration{} } +func (m *LimitOrderExpiration) String() string { return proto.CompactTextString(m) } +func (*LimitOrderExpiration) ProtoMessage() {} +func (*LimitOrderExpiration) Descriptor() ([]byte, []int) { + return fileDescriptor_8874a00326735ee6, []int{0} +} +func (m *LimitOrderExpiration) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *LimitOrderExpiration) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_LimitOrderExpiration.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 *LimitOrderExpiration) XXX_Merge(src proto.Message) { + xxx_messageInfo_LimitOrderExpiration.Merge(m, src) +} +func (m *LimitOrderExpiration) XXX_Size() int { + return m.Size() +} +func (m *LimitOrderExpiration) XXX_DiscardUnknown() { + xxx_messageInfo_LimitOrderExpiration.DiscardUnknown(m) +} + +var xxx_messageInfo_LimitOrderExpiration proto.InternalMessageInfo + +func (m *LimitOrderExpiration) GetExpirationTime() time.Time { + if m != nil { + return m.ExpirationTime + } + return time.Time{} +} + +func (m *LimitOrderExpiration) GetTrancheRef() []byte { + if m != nil { + return m.TrancheRef + } + return nil +} + +func init() { + proto.RegisterType((*LimitOrderExpiration)(nil), "duality.dex.LimitOrderExpiration") +} + +func init() { + proto.RegisterFile("duality/dex/limit_order_expiration.proto", fileDescriptor_8874a00326735ee6) +} + +var fileDescriptor_8874a00326735ee6 = []byte{ + // 256 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0x48, 0x29, 0x4d, 0xcc, + 0xc9, 0x2c, 0xa9, 0xd4, 0x4f, 0x49, 0xad, 0xd0, 0xcf, 0xc9, 0xcc, 0xcd, 0x2c, 0x89, 0xcf, 0x2f, + 0x4a, 0x49, 0x2d, 0x8a, 0x4f, 0xad, 0x28, 0xc8, 0x2c, 0x4a, 0x2c, 0xc9, 0xcc, 0xcf, 0xd3, 0x2b, + 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x86, 0xaa, 0xd4, 0x4b, 0x49, 0xad, 0x90, 0x92, 0x4f, 0xcf, + 0xcf, 0x4f, 0xcf, 0x49, 0xd5, 0x07, 0x4b, 0x25, 0x95, 0xa6, 0xe9, 0x97, 0x64, 0xe6, 0xa6, 0x16, + 0x97, 0x24, 0xe6, 0x16, 0x40, 0x54, 0x4b, 0x89, 0xa4, 0xe7, 0xa7, 0xe7, 0x83, 0x99, 0xfa, 0x20, + 0x16, 0x44, 0x54, 0xa9, 0x85, 0x91, 0x4b, 0xc4, 0x07, 0x64, 0x89, 0x3f, 0xc8, 0x0e, 0x57, 0xb8, + 0x15, 0x42, 0x3e, 0x5c, 0x7c, 0x08, 0x0b, 0x43, 0x32, 0x73, 0x53, 0x25, 0x18, 0x15, 0x18, 0x35, + 0xb8, 0x8d, 0xa4, 0xf4, 0x20, 0x16, 0xe9, 0xc1, 0x2c, 0xd2, 0x0b, 0x81, 0x59, 0xe4, 0xc4, 0x71, + 0xe2, 0x9e, 0x3c, 0xc3, 0x84, 0xfb, 0xf2, 0x8c, 0x41, 0x68, 0x7a, 0x85, 0xe4, 0xb8, 0xb8, 0x4a, + 0x8a, 0x12, 0xf3, 0x92, 0x33, 0x52, 0x83, 0x52, 0xd3, 0x24, 0x98, 0x14, 0x18, 0x35, 0x78, 0x82, + 0x90, 0x44, 0x9c, 0x5c, 0x4f, 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, 0x3b, + 0x3d, 0xb3, 0x24, 0xa3, 0x34, 0x49, 0x2f, 0x39, 0x3f, 0x57, 0x1f, 0xea, 0x5f, 0xdd, 0x9c, 0xc4, + 0xa4, 0x62, 0x18, 0x47, 0xbf, 0x02, 0x1c, 0x50, 0x25, 0x95, 0x05, 0xa9, 0xc5, 0x49, 0x6c, 0x60, + 0x47, 0x19, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x9a, 0xb3, 0x50, 0x04, 0x44, 0x01, 0x00, 0x00, +} + +func (m *LimitOrderExpiration) 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 *LimitOrderExpiration) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *LimitOrderExpiration) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.TrancheRef) > 0 { + i -= len(m.TrancheRef) + copy(dAtA[i:], m.TrancheRef) + i = encodeVarintLimitOrderExpiration(dAtA, i, uint64(len(m.TrancheRef))) + i-- + dAtA[i] = 0x12 + } + n1, err1 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.ExpirationTime, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.ExpirationTime):]) + if err1 != nil { + return 0, err1 + } + i -= n1 + i = encodeVarintLimitOrderExpiration(dAtA, i, uint64(n1)) + i-- + dAtA[i] = 0xa + return len(dAtA) - i, nil +} + +func encodeVarintLimitOrderExpiration(dAtA []byte, offset int, v uint64) int { + offset -= sovLimitOrderExpiration(v) + base := offset + for v >= 1<<7 { + dAtA[offset] = uint8(v&0x7f | 0x80) + v >>= 7 + offset++ + } + dAtA[offset] = uint8(v) + return base +} +func (m *LimitOrderExpiration) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = github_com_cosmos_gogoproto_types.SizeOfStdTime(m.ExpirationTime) + n += 1 + l + sovLimitOrderExpiration(uint64(l)) + l = len(m.TrancheRef) + if l > 0 { + n += 1 + l + sovLimitOrderExpiration(uint64(l)) + } + return n +} + +func sovLimitOrderExpiration(x uint64) (n int) { + return (math_bits.Len64(x|1) + 6) / 7 +} +func sozLimitOrderExpiration(x uint64) (n int) { + return sovLimitOrderExpiration(uint64((x << 1) ^ uint64((int64(x) >> 63)))) +} +func (m *LimitOrderExpiration) 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 ErrIntOverflowLimitOrderExpiration + } + 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: LimitOrderExpiration: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: LimitOrderExpiration: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + 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 ErrIntOverflowLimitOrderExpiration + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthLimitOrderExpiration + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthLimitOrderExpiration + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(&m.ExpirationTime, dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field TrancheRef", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowLimitOrderExpiration + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthLimitOrderExpiration + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthLimitOrderExpiration + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.TrancheRef = append(m.TrancheRef[:0], dAtA[iNdEx:postIndex]...) + if m.TrancheRef == nil { + m.TrancheRef = []byte{} + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipLimitOrderExpiration(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthLimitOrderExpiration + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func skipLimitOrderExpiration(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, ErrIntOverflowLimitOrderExpiration + } + 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, ErrIntOverflowLimitOrderExpiration + } + 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, ErrIntOverflowLimitOrderExpiration + } + 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, ErrInvalidLengthLimitOrderExpiration + } + iNdEx += length + case 3: + depth++ + case 4: + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupLimitOrderExpiration + } + depth-- + case 5: + iNdEx += 4 + default: + return 0, fmt.Errorf("proto: illegal wireType %d", wireType) + } + if iNdEx < 0 { + return 0, ErrInvalidLengthLimitOrderExpiration + } + if depth == 0 { + return iNdEx, nil + } + } + return 0, io.ErrUnexpectedEOF +} + +var ( + ErrInvalidLengthLimitOrderExpiration = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowLimitOrderExpiration = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupLimitOrderExpiration = fmt.Errorf("proto: unexpected end of group") +) diff --git a/x/dex/types/limit_order_tranche.go b/x/dex/types/limit_order_tranche.go new file mode 100644 index 000000000..dc6b69f03 --- /dev/null +++ b/x/dex/types/limit_order_tranche.go @@ -0,0 +1,162 @@ +package types + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" + math_utils "github.com/neutron-org/neutron/utils/math" + "github.com/neutron-org/neutron/x/dex/utils" +) + +func NewLimitOrderTranche( + makerDenom string, + takerDenom string, + trancheKey string, + tickIndex int64, + reservesMakerDenom sdk.Int, + reservesTakerDenom sdk.Int, + totalMakerDenom sdk.Int, + totalTakerDenom sdk.Int, +) (*LimitOrderTranche, error) { + tradePairID, err := NewTradePairID(takerDenom, makerDenom) + if err != nil { + return nil, err + } + priceTakerToMaker, err := tradePairID.PriceTakerToMaker(tickIndex) + if err != nil { + return nil, err + } + return &LimitOrderTranche{ + Key: &LimitOrderTrancheKey{ + TradePairID: tradePairID, + TrancheKey: trancheKey, + TickIndexTakerToMaker: tickIndex, + }, + ReservesMakerDenom: reservesMakerDenom, + ReservesTakerDenom: reservesTakerDenom, + TotalMakerDenom: totalMakerDenom, + TotalTakerDenom: totalTakerDenom, + PriceTakerToMaker: priceTakerToMaker, + }, nil +} + +// Useful for testing +func MustNewLimitOrderTranche( + makerDenom string, + takerDenom string, + trancheKey string, + tickIndex int64, + reservesMakerDenom sdk.Int, + reservesTakerDenom sdk.Int, + totalMakerDenom sdk.Int, + totalTakerDenom sdk.Int, +) *LimitOrderTranche { + limitOrderTranche, err := NewLimitOrderTranche( + makerDenom, + takerDenom, + trancheKey, + tickIndex, + reservesMakerDenom, + reservesTakerDenom, + totalMakerDenom, + totalTakerDenom, + ) + if err != nil { + panic(err) + } + return limitOrderTranche +} + +func (t LimitOrderTranche) IsPlaceTranche() bool { + return t.ReservesMakerDenom.Equal(t.TotalMakerDenom) +} + +func (t LimitOrderTranche) IsFilled() bool { + return t.ReservesMakerDenom.IsZero() +} + +func (t LimitOrderTranche) IsJIT() bool { + return t.ExpirationTime != nil && *t.ExpirationTime == JITGoodTilTime() +} + +func (t LimitOrderTranche) IsExpired(ctx sdk.Context) bool { + return t.ExpirationTime != nil && !t.IsJIT() && !t.ExpirationTime.After(ctx.BlockTime()) +} + +func (t LimitOrderTranche) HasTokenIn() bool { + return t.ReservesMakerDenom.GT(sdk.ZeroInt()) +} + +func (t LimitOrderTranche) HasTokenOut() bool { + return t.ReservesTakerDenom.GT(sdk.ZeroInt()) +} + +func (t LimitOrderTranche) Price() math_utils.PrecDec { + return t.PriceTakerToMaker +} + +func (t LimitOrderTranche) RatioFilled() math_utils.PrecDec { + amountFilled := t.PriceTakerToMaker.MulInt(t.TotalTakerDenom) + ratioFilled := amountFilled.QuoInt(t.TotalMakerDenom) + return ratioFilled +} + +func (t LimitOrderTranche) AmountUnfilled() math_utils.PrecDec { + amountFilled := t.PriceTakerToMaker.MulInt(t.TotalTakerDenom) + return math_utils.NewPrecDecFromInt(t.TotalMakerDenom).Sub(amountFilled) +} + +func (t LimitOrderTranche) HasLiquidity() bool { + return t.ReservesMakerDenom.GT(sdk.ZeroInt()) +} + +func (t *LimitOrderTranche) RemoveTokenIn( + trancheUser *LimitOrderTrancheUser, +) (amountToRemove sdk.Int) { + amountUnfilled := t.AmountUnfilled() + maxAmountToRemove := amountUnfilled.MulInt(trancheUser.SharesOwned). + QuoInt(t.TotalMakerDenom). + TruncateInt() + amountToRemove = maxAmountToRemove.Sub(trancheUser.SharesCancelled) + t.ReservesMakerDenom = t.ReservesMakerDenom.Sub(amountToRemove) + + return amountToRemove +} + +func (t *LimitOrderTranche) Withdraw(trancheUser *LimitOrderTrancheUser) (sdk.Int, math_utils.PrecDec) { + reservesTokenOutDec := math_utils.NewPrecDecFromInt(t.ReservesTakerDenom) + + ratioFilled := t.RatioFilled() + maxAllowedToWithdraw := ratioFilled.MulInt(trancheUser.SharesOwned).TruncateInt() + amountOutTokenIn := maxAllowedToWithdraw.Sub(trancheUser.SharesWithdrawn) + amountOutTokenOut := math_utils.NewPrecDecFromInt(amountOutTokenIn).Quo(t.PriceTakerToMaker) + t.ReservesTakerDenom = reservesTokenOutDec.Sub(amountOutTokenOut).TruncateInt() + + return amountOutTokenIn, amountOutTokenOut +} + +func (t *LimitOrderTranche) Swap(maxAmountTakerIn sdk.Int, maxAmountMakerOut *sdk.Int) ( + inAmount sdk.Int, + outAmount sdk.Int, +) { + reservesTokenOut := &t.ReservesMakerDenom + fillTokenIn := &t.ReservesTakerDenom + totalTokenIn := &t.TotalTakerDenom + maxOutGivenIn := t.PriceTakerToMaker.MulInt(maxAmountTakerIn).TruncateInt() + possibleOutAmounts := []sdk.Int{*reservesTokenOut, maxOutGivenIn} + if maxAmountMakerOut != nil { + possibleOutAmounts = append(possibleOutAmounts, *maxAmountMakerOut) + } + outAmount = utils.MinIntArr(possibleOutAmounts) + + inAmount = math_utils.NewPrecDecFromInt(outAmount).Quo(t.PriceTakerToMaker).Ceil().TruncateInt() + + *fillTokenIn = fillTokenIn.Add(inAmount) + *totalTokenIn = totalTokenIn.Add(inAmount) + *reservesTokenOut = reservesTokenOut.Sub(outAmount) + + return inAmount, outAmount +} + +func (t *LimitOrderTranche) PlaceMakerLimitOrder(amountIn sdk.Int) { + t.ReservesMakerDenom = t.ReservesMakerDenom.Add(amountIn) + t.TotalMakerDenom = t.TotalMakerDenom.Add(amountIn) +} diff --git a/x/dex/types/limit_order_tranche.pb.go b/x/dex/types/limit_order_tranche.pb.go new file mode 100644 index 000000000..3984c5926 --- /dev/null +++ b/x/dex/types/limit_order_tranche.pb.go @@ -0,0 +1,918 @@ +// Code generated by protoc-gen-gogo. DO NOT EDIT. +// source: duality/dex/limit_order_tranche.proto + +package types + +import ( + fmt "fmt" + github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" + github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" + github_com_duality_labs_duality_utils_math "github.com/neutron-org/neutron/utils/math" + _ "google.golang.org/protobuf/types/known/timestamppb" + io "io" + math "math" + math_bits "math/bits" + time "time" +) + +// Reference imports to suppress errors if they are not otherwise used. +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf +var _ = time.Kitchen + +// 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 + +type LimitOrderTrancheKey struct { + TradePairID *TradePairID `protobuf:"bytes,1,opt,name=tradePairID,proto3" json:"tradePairID,omitempty"` + TickIndexTakerToMaker int64 `protobuf:"varint,2,opt,name=tickIndexTakerToMaker,proto3" json:"tickIndexTakerToMaker,omitempty"` + TrancheKey string `protobuf:"bytes,3,opt,name=trancheKey,proto3" json:"trancheKey,omitempty"` +} + +func (m *LimitOrderTrancheKey) Reset() { *m = LimitOrderTrancheKey{} } +func (m *LimitOrderTrancheKey) String() string { return proto.CompactTextString(m) } +func (*LimitOrderTrancheKey) ProtoMessage() {} +func (*LimitOrderTrancheKey) Descriptor() ([]byte, []int) { + return fileDescriptor_49e73267811ad014, []int{0} +} +func (m *LimitOrderTrancheKey) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *LimitOrderTrancheKey) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_LimitOrderTrancheKey.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 *LimitOrderTrancheKey) XXX_Merge(src proto.Message) { + xxx_messageInfo_LimitOrderTrancheKey.Merge(m, src) +} +func (m *LimitOrderTrancheKey) XXX_Size() int { + return m.Size() +} +func (m *LimitOrderTrancheKey) XXX_DiscardUnknown() { + xxx_messageInfo_LimitOrderTrancheKey.DiscardUnknown(m) +} + +var xxx_messageInfo_LimitOrderTrancheKey proto.InternalMessageInfo + +func (m *LimitOrderTrancheKey) GetTradePairID() *TradePairID { + if m != nil { + return m.TradePairID + } + return nil +} + +func (m *LimitOrderTrancheKey) GetTickIndexTakerToMaker() int64 { + if m != nil { + return m.TickIndexTakerToMaker + } + return 0 +} + +func (m *LimitOrderTrancheKey) GetTrancheKey() string { + if m != nil { + return m.TrancheKey + } + return "" +} + +type LimitOrderTranche struct { + Key *LimitOrderTrancheKey `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"` + ReservesMakerDenom github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,opt,name=reservesMakerDenom,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"reservesMakerDenom" yaml:"reservesMakerDenom"` + ReservesTakerDenom github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,3,opt,name=reservesTakerDenom,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"reservesTakerDenom" yaml:"reservesTakerDenom"` + TotalMakerDenom github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,4,opt,name=totalMakerDenom,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"totalTokenIn" yaml:"totalMakerDenom"` + TotalTakerDenom github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,5,opt,name=totalTakerDenom,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"totalTakerDenom" yaml:"totalTakerDenom"` + // JIT orders also use goodTilDate to handle deletion but represent a special case + // All JIT orders have a goodTilDate of 0 and an exception is made to still 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=expirationTime,proto3,stdtime" json:"expirationTime,omitempty"` + PriceTakerToMaker github_com_duality_labs_duality_utils_math.PrecDec `protobuf:"bytes,7,opt,name=priceTakerToMaker,proto3,customtype=github.com/neutron-org/neutron/utils/math.PrecDec" json:"priceTakerToMaker" yaml:"priceTakerToMaker"` +} + +func (m *LimitOrderTranche) Reset() { *m = LimitOrderTranche{} } +func (m *LimitOrderTranche) String() string { return proto.CompactTextString(m) } +func (*LimitOrderTranche) ProtoMessage() {} +func (*LimitOrderTranche) Descriptor() ([]byte, []int) { + return fileDescriptor_49e73267811ad014, []int{1} +} +func (m *LimitOrderTranche) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *LimitOrderTranche) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_LimitOrderTranche.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 *LimitOrderTranche) XXX_Merge(src proto.Message) { + xxx_messageInfo_LimitOrderTranche.Merge(m, src) +} +func (m *LimitOrderTranche) XXX_Size() int { + return m.Size() +} +func (m *LimitOrderTranche) XXX_DiscardUnknown() { + xxx_messageInfo_LimitOrderTranche.DiscardUnknown(m) +} + +var xxx_messageInfo_LimitOrderTranche proto.InternalMessageInfo + +func (m *LimitOrderTranche) GetKey() *LimitOrderTrancheKey { + if m != nil { + return m.Key + } + return nil +} + +func (m *LimitOrderTranche) GetExpirationTime() *time.Time { + if m != nil { + return m.ExpirationTime + } + return nil +} + +func init() { + proto.RegisterType((*LimitOrderTrancheKey)(nil), "duality.dex.LimitOrderTrancheKey") + proto.RegisterType((*LimitOrderTranche)(nil), "duality.dex.LimitOrderTranche") +} + +func init() { + proto.RegisterFile("duality/dex/limit_order_tranche.proto", fileDescriptor_49e73267811ad014) +} + +var fileDescriptor_49e73267811ad014 = []byte{ + // 560 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x94, 0x4f, 0x8b, 0xd3, 0x4e, + 0x18, 0xc7, 0x3b, 0xbf, 0xfe, 0x5c, 0xdd, 0xa9, 0x28, 0x1b, 0x56, 0xc9, 0xf6, 0x90, 0xd4, 0x80, + 0x52, 0x90, 0x4d, 0x60, 0xd7, 0xd3, 0x1e, 0x4b, 0x3d, 0x14, 0x57, 0x5c, 0x42, 0x0e, 0xa2, 0x87, + 0x32, 0x4d, 0x1e, 0xdb, 0x21, 0x7f, 0x26, 0x4c, 0xa6, 0xd2, 0x5e, 0x05, 0xef, 0xeb, 0xd1, 0x77, + 0xe0, 0x4b, 0xe9, 0x71, 0x8f, 0xe2, 0x21, 0x4a, 0x7b, 0x10, 0xf6, 0xd8, 0x57, 0x20, 0x99, 0xa4, + 0x36, 0x6d, 0x8a, 0xb2, 0x78, 0x9a, 0xc9, 0xf3, 0xe7, 0xfb, 0x7c, 0x9e, 0x87, 0x79, 0x82, 0x1f, + 0x7b, 0x63, 0x12, 0x50, 0x31, 0xb5, 0x3c, 0x98, 0x58, 0x01, 0x0d, 0xa9, 0xe8, 0x33, 0xee, 0x01, + 0xef, 0x0b, 0x4e, 0x22, 0x77, 0x04, 0x66, 0xcc, 0x99, 0x60, 0x4a, 0xa3, 0x08, 0x33, 0x3d, 0x98, + 0x34, 0xf5, 0x21, 0x63, 0xc3, 0x00, 0x2c, 0xe9, 0x1a, 0x8c, 0xdf, 0x59, 0x82, 0x86, 0x90, 0x08, + 0x12, 0xc6, 0x79, 0x74, 0x53, 0x2f, 0x8b, 0x0a, 0x4e, 0x3c, 0xe8, 0xc7, 0x84, 0xf2, 0x3e, 0xf5, + 0x8a, 0x80, 0xc3, 0x21, 0x1b, 0x32, 0x79, 0xb5, 0xb2, 0x5b, 0x61, 0x3d, 0x2a, 0xa7, 0x6d, 0x24, + 0x18, 0x5f, 0x10, 0x3e, 0x3c, 0xcf, 0xe8, 0x5e, 0x65, 0x70, 0x4e, 0xce, 0xf6, 0x02, 0xa6, 0xca, + 0x19, 0x6e, 0xc8, 0x02, 0x17, 0x84, 0xf2, 0x5e, 0x57, 0x45, 0x2d, 0xd4, 0x6e, 0x9c, 0xa8, 0x66, + 0x09, 0xd7, 0x74, 0xd6, 0x7e, 0xbb, 0x1c, 0xac, 0x3c, 0xc3, 0x0f, 0x04, 0x75, 0xfd, 0x5e, 0xe4, + 0xc1, 0xc4, 0x21, 0x3e, 0x70, 0x87, 0xbd, 0xcc, 0x0e, 0xf5, 0xbf, 0x16, 0x6a, 0xd7, 0xed, 0xdd, + 0x4e, 0x45, 0xc3, 0x58, 0xfc, 0xae, 0xaf, 0xd6, 0x5b, 0xa8, 0xbd, 0x6f, 0x97, 0x2c, 0xc6, 0xcf, + 0x3d, 0x7c, 0x50, 0x41, 0x55, 0x4e, 0x71, 0xdd, 0x87, 0x69, 0xc1, 0xf7, 0x68, 0x83, 0x6f, 0x57, + 0x5f, 0x76, 0x16, 0xad, 0x7c, 0x42, 0x58, 0xe1, 0x90, 0x00, 0x7f, 0x0f, 0x89, 0x2c, 0xde, 0x85, + 0x88, 0x85, 0x12, 0x6f, 0xbf, 0x43, 0x66, 0xa9, 0x5e, 0xfb, 0x96, 0xea, 0x4f, 0x86, 0x54, 0x8c, + 0xc6, 0x03, 0xd3, 0x65, 0xa1, 0xe5, 0xb2, 0x24, 0x64, 0x49, 0x71, 0x1c, 0x27, 0x9e, 0x6f, 0x89, + 0x69, 0x0c, 0x89, 0xd9, 0x8b, 0xc4, 0x75, 0xaa, 0xef, 0xd0, 0x5a, 0xa6, 0xfa, 0xd1, 0x94, 0x84, + 0xc1, 0x99, 0x51, 0xf5, 0x19, 0xf6, 0x8e, 0x84, 0x0d, 0x26, 0x67, 0xcd, 0x54, 0xff, 0x57, 0x26, + 0xe7, 0x0f, 0x4c, 0xce, 0x2e, 0xa6, 0xb5, 0x51, 0xf9, 0x80, 0xf0, 0x7d, 0xc1, 0x04, 0x09, 0x4a, + 0x43, 0xfa, 0x5f, 0x02, 0xbd, 0xbe, 0x31, 0xd0, 0x5d, 0x29, 0xe4, 0x30, 0x1f, 0xa2, 0x5e, 0xb4, + 0x4c, 0xf5, 0x87, 0x39, 0xca, 0x96, 0xbc, 0x61, 0x6f, 0x17, 0x54, 0x3e, 0xae, 0x20, 0x4a, 0x53, + 0xb9, 0x25, 0x21, 0xde, 0xde, 0x18, 0x62, 0x5b, 0x68, 0x8b, 0xc3, 0xa9, 0x70, 0x94, 0x86, 0x71, + 0x8e, 0xef, 0xc1, 0x24, 0xa6, 0x9c, 0x08, 0xca, 0x22, 0x87, 0x86, 0xa0, 0xee, 0xc9, 0x47, 0xd7, + 0x34, 0xf3, 0xb5, 0x35, 0x57, 0x6b, 0x6b, 0x3a, 0xab, 0xb5, 0xed, 0xdc, 0x99, 0xa5, 0x3a, 0xba, + 0xfc, 0xae, 0x23, 0x7b, 0x2b, 0x57, 0xf9, 0x8c, 0xf0, 0x41, 0xcc, 0xa9, 0x0b, 0x1b, 0x0b, 0x72, + 0x5b, 0xf6, 0xe5, 0x17, 0x7d, 0x9d, 0x94, 0xfa, 0x2a, 0x1e, 0xf6, 0x71, 0x40, 0x06, 0xc9, 0xea, + 0xc3, 0x1a, 0x0b, 0x1a, 0x24, 0x56, 0x48, 0xc4, 0xc8, 0xbc, 0xe0, 0xe0, 0x76, 0xc1, 0xbd, 0x4e, + 0xf5, 0xaa, 0xec, 0x32, 0xd5, 0xd5, 0xbc, 0xcb, 0x8a, 0xcb, 0xb0, 0xab, 0xe1, 0x9d, 0xe7, 0xb3, + 0xb9, 0x86, 0xae, 0xe6, 0x1a, 0xfa, 0x31, 0xd7, 0xd0, 0xe5, 0x42, 0xab, 0x5d, 0x2d, 0xb4, 0xda, + 0xd7, 0x85, 0x56, 0x7b, 0xf3, 0xf4, 0x6f, 0x44, 0x93, 0xfc, 0xd7, 0x94, 0x8d, 0x7c, 0xb0, 0x27, + 0x07, 0x72, 0xfa, 0x2b, 0x00, 0x00, 0xff, 0xff, 0x7a, 0x12, 0x2d, 0x9d, 0x0b, 0x05, 0x00, 0x00, +} + +func (m *LimitOrderTrancheKey) 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 *LimitOrderTrancheKey) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *LimitOrderTrancheKey) 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 = encodeVarintLimitOrderTranche(dAtA, i, uint64(len(m.TrancheKey))) + i-- + dAtA[i] = 0x1a + } + if m.TickIndexTakerToMaker != 0 { + i = encodeVarintLimitOrderTranche(dAtA, i, uint64(m.TickIndexTakerToMaker)) + i-- + dAtA[i] = 0x10 + } + if m.TradePairID != nil { + { + size, err := m.TradePairID.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintLimitOrderTranche(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *LimitOrderTranche) 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 *LimitOrderTranche) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *LimitOrderTranche) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + { + size := m.PriceTakerToMaker.Size() + i -= size + if _, err := m.PriceTakerToMaker.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintLimitOrderTranche(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x3a + if m.ExpirationTime != nil { + n2, err2 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(*m.ExpirationTime, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(*m.ExpirationTime):]) + if err2 != nil { + return 0, err2 + } + i -= n2 + i = encodeVarintLimitOrderTranche(dAtA, i, uint64(n2)) + i-- + dAtA[i] = 0x32 + } + { + size := m.TotalTakerDenom.Size() + i -= size + if _, err := m.TotalTakerDenom.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintLimitOrderTranche(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x2a + { + size := m.TotalMakerDenom.Size() + i -= size + if _, err := m.TotalMakerDenom.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintLimitOrderTranche(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x22 + { + size := m.ReservesTakerDenom.Size() + i -= size + if _, err := m.ReservesTakerDenom.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintLimitOrderTranche(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1a + { + size := m.ReservesMakerDenom.Size() + i -= size + if _, err := m.ReservesMakerDenom.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintLimitOrderTranche(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + if m.Key != nil { + { + size, err := m.Key.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintLimitOrderTranche(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func encodeVarintLimitOrderTranche(dAtA []byte, offset int, v uint64) int { + offset -= sovLimitOrderTranche(v) + base := offset + for v >= 1<<7 { + dAtA[offset] = uint8(v&0x7f | 0x80) + v >>= 7 + offset++ + } + dAtA[offset] = uint8(v) + return base +} +func (m *LimitOrderTrancheKey) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.TradePairID != nil { + l = m.TradePairID.Size() + n += 1 + l + sovLimitOrderTranche(uint64(l)) + } + if m.TickIndexTakerToMaker != 0 { + n += 1 + sovLimitOrderTranche(uint64(m.TickIndexTakerToMaker)) + } + l = len(m.TrancheKey) + if l > 0 { + n += 1 + l + sovLimitOrderTranche(uint64(l)) + } + return n +} + +func (m *LimitOrderTranche) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Key != nil { + l = m.Key.Size() + n += 1 + l + sovLimitOrderTranche(uint64(l)) + } + l = m.ReservesMakerDenom.Size() + n += 1 + l + sovLimitOrderTranche(uint64(l)) + l = m.ReservesTakerDenom.Size() + n += 1 + l + sovLimitOrderTranche(uint64(l)) + l = m.TotalMakerDenom.Size() + n += 1 + l + sovLimitOrderTranche(uint64(l)) + l = m.TotalTakerDenom.Size() + n += 1 + l + sovLimitOrderTranche(uint64(l)) + if m.ExpirationTime != nil { + l = github_com_cosmos_gogoproto_types.SizeOfStdTime(*m.ExpirationTime) + n += 1 + l + sovLimitOrderTranche(uint64(l)) + } + l = m.PriceTakerToMaker.Size() + n += 1 + l + sovLimitOrderTranche(uint64(l)) + return n +} + +func sovLimitOrderTranche(x uint64) (n int) { + return (math_bits.Len64(x|1) + 6) / 7 +} +func sozLimitOrderTranche(x uint64) (n int) { + return sovLimitOrderTranche(uint64((x << 1) ^ uint64((int64(x) >> 63)))) +} +func (m *LimitOrderTrancheKey) 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 ErrIntOverflowLimitOrderTranche + } + 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: LimitOrderTrancheKey: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: LimitOrderTrancheKey: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field TradePairID", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowLimitOrderTranche + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthLimitOrderTranche + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthLimitOrderTranche + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.TradePairID == nil { + m.TradePairID = &TradePairID{} + } + if err := m.TradePairID.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 2: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field TickIndexTakerToMaker", wireType) + } + m.TickIndexTakerToMaker = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowLimitOrderTranche + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.TickIndexTakerToMaker |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 3: + 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 ErrIntOverflowLimitOrderTranche + } + 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 ErrInvalidLengthLimitOrderTranche + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthLimitOrderTranche + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.TrancheKey = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipLimitOrderTranche(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthLimitOrderTranche + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *LimitOrderTranche) 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 ErrIntOverflowLimitOrderTranche + } + 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: LimitOrderTranche: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: LimitOrderTranche: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Key", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowLimitOrderTranche + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthLimitOrderTranche + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthLimitOrderTranche + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Key == nil { + m.Key = &LimitOrderTrancheKey{} + } + if err := m.Key.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ReservesMakerDenom", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowLimitOrderTranche + } + 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 ErrInvalidLengthLimitOrderTranche + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthLimitOrderTranche + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.ReservesMakerDenom.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ReservesTakerDenom", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowLimitOrderTranche + } + 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 ErrInvalidLengthLimitOrderTranche + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthLimitOrderTranche + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.ReservesTakerDenom.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field TotalMakerDenom", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowLimitOrderTranche + } + 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 ErrInvalidLengthLimitOrderTranche + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthLimitOrderTranche + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.TotalMakerDenom.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 5: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field TotalTakerDenom", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowLimitOrderTranche + } + 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 ErrInvalidLengthLimitOrderTranche + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthLimitOrderTranche + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.TotalTakerDenom.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 6: + 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 ErrIntOverflowLimitOrderTranche + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthLimitOrderTranche + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthLimitOrderTranche + } + if postIndex > 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 + } + iNdEx = postIndex + case 7: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field PriceTakerToMaker", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowLimitOrderTranche + } + 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 ErrInvalidLengthLimitOrderTranche + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthLimitOrderTranche + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.PriceTakerToMaker.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipLimitOrderTranche(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthLimitOrderTranche + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func skipLimitOrderTranche(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, ErrIntOverflowLimitOrderTranche + } + 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, ErrIntOverflowLimitOrderTranche + } + 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, ErrIntOverflowLimitOrderTranche + } + 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, ErrInvalidLengthLimitOrderTranche + } + iNdEx += length + case 3: + depth++ + case 4: + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupLimitOrderTranche + } + depth-- + case 5: + iNdEx += 4 + default: + return 0, fmt.Errorf("proto: illegal wireType %d", wireType) + } + if iNdEx < 0 { + return 0, ErrInvalidLengthLimitOrderTranche + } + if depth == 0 { + return iNdEx, nil + } + } + return 0, io.ErrUnexpectedEOF +} + +var ( + ErrInvalidLengthLimitOrderTranche = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowLimitOrderTranche = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupLimitOrderTranche = fmt.Errorf("proto: unexpected end of group") +) diff --git a/x/dex/types/limit_order_tranche_key.go b/x/dex/types/limit_order_tranche_key.go new file mode 100644 index 000000000..d05342989 --- /dev/null +++ b/x/dex/types/limit_order_tranche_key.go @@ -0,0 +1,75 @@ +package types + +import ( + "errors" + "strings" + + math_utils "github.com/neutron-org/neutron/utils/math" +) + +var _ TickLiquidityKey = (*LimitOrderTrancheKey)(nil) + +func (p LimitOrderTrancheKey) KeyMarshal() []byte { + var key []byte + + pairKeyBytes := []byte(p.TradePairID.MustPairID().CanonicalString()) + key = append(key, pairKeyBytes...) + key = append(key, []byte("/")...) + + makerDenomBytes := []byte(p.TradePairID.MakerDenom) + key = append(key, makerDenomBytes...) + key = append(key, []byte("/")...) + + tickIndexBytes := TickIndexToBytes(p.TickIndexTakerToMaker) + key = append(key, tickIndexBytes...) + key = append(key, []byte("/")...) + + liquidityTypeBytes := []byte(LiquidityTypeLimitOrder) + key = append(key, liquidityTypeBytes...) + key = append(key, []byte("/")...) + + key = append(key, []byte(p.TrancheKey)...) + key = append(key, []byte("/")...) + + return key +} + +func (p LimitOrderTrancheKey) KeyUnmarshal(bz []byte) error { + split := strings.Split(string(bz), "/") + + if len(split) != 5 { + return errors.New("invalid input length") + } + + pairKey, err := NewPairIDFromCanonicalString(split[0]) + if err != nil { + return err + } + p.TradePairID = pairKey.MustTradePairIDFromMaker(split[1]) + + tickIndex, err := BytesToTickIndex([]byte(split[2])) + if err != nil { + return err + } + p.TickIndexTakerToMaker = tickIndex + + if split[3] != LiquidityTypeLimitOrder { + return errors.New("unexpected liquidity type") + } + + p.TrancheKey = split[4] + + return nil +} + +func (p LimitOrderTrancheKey) PriceTakerToMaker() (priceTakerToMaker math_utils.PrecDec, err error) { + return CalcPrice(p.TickIndexTakerToMaker) +} + +func (p LimitOrderTrancheKey) MustPriceTakerToMaker() (priceTakerToMaker math_utils.PrecDec) { + price, err := p.PriceTakerToMaker() + if err != nil { + panic(err) + } + return price +} diff --git a/x/dex/types/limit_order_tranche_user.go b/x/dex/types/limit_order_tranche_user.go new file mode 100644 index 000000000..90dcf34ac --- /dev/null +++ b/x/dex/types/limit_order_tranche_user.go @@ -0,0 +1,6 @@ +package types + +func (l LimitOrderTrancheUser) IsEmpty() bool { + sharesRemoved := l.SharesCancelled.Add(l.SharesWithdrawn) + return sharesRemoved.Equal(l.SharesOwned) +} diff --git a/x/dex/types/limit_order_tranche_user.pb.go b/x/dex/types/limit_order_tranche_user.pb.go new file mode 100644 index 000000000..51228fda7 --- /dev/null +++ b/x/dex/types/limit_order_tranche_user.pb.go @@ -0,0 +1,658 @@ +// Code generated by protoc-gen-gogo. DO NOT EDIT. +// source: duality/dex/limit_order_tranche_user.proto + +package types + +import ( + fmt "fmt" + github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/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 + +type LimitOrderTrancheUser struct { + TradePairID *TradePairID `protobuf:"bytes,1,opt,name=tradePairID,proto3" json:"tradePairID,omitempty"` + TickIndexTakerToMaker int64 `protobuf:"varint,2,opt,name=tickIndexTakerToMaker,proto3" json:"tickIndexTakerToMaker,omitempty"` + TrancheKey string `protobuf:"bytes,3,opt,name=trancheKey,proto3" json:"trancheKey,omitempty"` + Address string `protobuf:"bytes,4,opt,name=address,proto3" json:"address,omitempty"` + SharesOwned github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,5,opt,name=sharesOwned,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"sharesOwned" yaml:"sharesOwned"` + SharesWithdrawn github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,6,opt,name=sharesWithdrawn,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"sharesWithdrawn" yaml:"sharesWithdrawn"` + SharesCancelled github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,7,opt,name=sharesCancelled,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"sharesCancelled" yaml:"sharesCancelled"` + OrderType LimitOrderType `protobuf:"varint,8,opt,name=orderType,proto3,enum=duality.dex.LimitOrderType" json:"orderType,omitempty"` +} + +func (m *LimitOrderTrancheUser) Reset() { *m = LimitOrderTrancheUser{} } +func (m *LimitOrderTrancheUser) String() string { return proto.CompactTextString(m) } +func (*LimitOrderTrancheUser) ProtoMessage() {} +func (*LimitOrderTrancheUser) Descriptor() ([]byte, []int) { + return fileDescriptor_896ef6766d8ff3c4, []int{0} +} +func (m *LimitOrderTrancheUser) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *LimitOrderTrancheUser) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_LimitOrderTrancheUser.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 *LimitOrderTrancheUser) XXX_Merge(src proto.Message) { + xxx_messageInfo_LimitOrderTrancheUser.Merge(m, src) +} +func (m *LimitOrderTrancheUser) XXX_Size() int { + return m.Size() +} +func (m *LimitOrderTrancheUser) XXX_DiscardUnknown() { + xxx_messageInfo_LimitOrderTrancheUser.DiscardUnknown(m) +} + +var xxx_messageInfo_LimitOrderTrancheUser proto.InternalMessageInfo + +func (m *LimitOrderTrancheUser) GetTradePairID() *TradePairID { + if m != nil { + return m.TradePairID + } + return nil +} + +func (m *LimitOrderTrancheUser) GetTickIndexTakerToMaker() int64 { + if m != nil { + return m.TickIndexTakerToMaker + } + return 0 +} + +func (m *LimitOrderTrancheUser) GetTrancheKey() string { + if m != nil { + return m.TrancheKey + } + return "" +} + +func (m *LimitOrderTrancheUser) GetAddress() string { + if m != nil { + return m.Address + } + return "" +} + +func (m *LimitOrderTrancheUser) GetOrderType() LimitOrderType { + if m != nil { + return m.OrderType + } + return LimitOrderType_GOOD_TIL_CANCELLED +} + +func init() { + proto.RegisterType((*LimitOrderTrancheUser)(nil), "duality.dex.LimitOrderTrancheUser") +} + +func init() { + proto.RegisterFile("duality/dex/limit_order_tranche_user.proto", fileDescriptor_896ef6766d8ff3c4) +} + +var fileDescriptor_896ef6766d8ff3c4 = []byte{ + // 445 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x52, 0x4f, 0x6b, 0xd4, 0x40, + 0x1c, 0xdd, 0xb1, 0xb6, 0xb5, 0xb3, 0xa0, 0x30, 0xb4, 0x32, 0x54, 0x48, 0x96, 0x3d, 0xc8, 0xa2, + 0x34, 0x81, 0xea, 0xc5, 0x1e, 0xab, 0x1e, 0x16, 0x95, 0x4a, 0x8c, 0x08, 0x7a, 0x08, 0xb3, 0x99, + 0x1f, 0xbb, 0xc3, 0x66, 0x33, 0x61, 0x66, 0x96, 0x26, 0x1f, 0xa0, 0x77, 0x3f, 0x56, 0x8f, 0x3d, + 0x8a, 0x87, 0x20, 0xbb, 0x37, 0x8f, 0xfd, 0x04, 0x92, 0x3f, 0x4d, 0xa7, 0x8b, 0x17, 0xf1, 0x94, + 0xfc, 0xde, 0x7b, 0xbc, 0xf7, 0x06, 0x1e, 0x7e, 0xc6, 0x97, 0x2c, 0x11, 0xa6, 0xf0, 0x39, 0xe4, + 0x7e, 0x22, 0x16, 0xc2, 0x44, 0x52, 0x71, 0x50, 0x91, 0x51, 0x2c, 0x8d, 0x67, 0x10, 0x2d, 0x35, + 0x28, 0x2f, 0x53, 0xd2, 0x48, 0xd2, 0x6f, 0xb5, 0x1e, 0x87, 0xfc, 0x70, 0x7f, 0x2a, 0xa7, 0xb2, + 0xc6, 0xfd, 0xea, 0xaf, 0x91, 0x1c, 0xba, 0xb6, 0x9d, 0x51, 0x8c, 0x43, 0x94, 0x31, 0xa1, 0x22, + 0xc1, 0x5b, 0xc1, 0xfe, 0x1d, 0x41, 0xde, 0xa0, 0xc3, 0x8b, 0x6d, 0x7c, 0xf0, 0xbe, 0x0a, 0x3f, + 0xab, 0xb2, 0xc3, 0x26, 0xfa, 0xb3, 0x06, 0x45, 0x4e, 0x70, 0xbf, 0xb6, 0xf9, 0xc8, 0x84, 0x1a, + 0xbf, 0xa1, 0x68, 0x80, 0x46, 0xfd, 0x63, 0xea, 0x59, 0x4d, 0xbc, 0xf0, 0x96, 0x0f, 0x6c, 0x31, + 0x79, 0x89, 0x0f, 0x8c, 0x88, 0xe7, 0xe3, 0x94, 0x43, 0x1e, 0xb2, 0x39, 0xa8, 0x50, 0x7e, 0xa8, + 0x3e, 0xf4, 0xde, 0x00, 0x8d, 0xb6, 0x82, 0xbf, 0x93, 0xc4, 0xc1, 0xb8, 0x7d, 0xfb, 0x3b, 0x28, + 0xe8, 0xd6, 0x00, 0x8d, 0xf6, 0x02, 0x0b, 0x21, 0x14, 0xef, 0x32, 0xce, 0x15, 0x68, 0x4d, 0xef, + 0xd7, 0xe4, 0xcd, 0x49, 0x96, 0xb8, 0xaf, 0x67, 0x4c, 0x81, 0x3e, 0x3b, 0x4f, 0x81, 0xd3, 0xed, + 0x8a, 0x3d, 0xfd, 0x74, 0x59, 0xba, 0xbd, 0x9f, 0xa5, 0xfb, 0x74, 0x2a, 0xcc, 0x6c, 0x39, 0xf1, + 0x62, 0xb9, 0xf0, 0x63, 0xa9, 0x17, 0x52, 0xb7, 0x9f, 0x23, 0xcd, 0xe7, 0xbe, 0x29, 0x32, 0xd0, + 0xde, 0x38, 0x35, 0xbf, 0x4b, 0xd7, 0x36, 0xb9, 0x2e, 0x5d, 0x52, 0xb0, 0x45, 0x72, 0x32, 0xb4, + 0xc0, 0x61, 0x60, 0x4b, 0xc8, 0x05, 0xc2, 0x8f, 0x9a, 0xfb, 0x8b, 0x30, 0x33, 0xae, 0xd8, 0x79, + 0x4a, 0x77, 0xea, 0xec, 0x6f, 0xff, 0x9c, 0xbd, 0x69, 0x74, 0x5d, 0xba, 0x8f, 0xed, 0xfc, 0x8e, + 0x18, 0x06, 0x9b, 0x52, 0xab, 0xc7, 0x6b, 0x96, 0xc6, 0x90, 0x24, 0xc0, 0xe9, 0xee, 0xff, 0xf5, + 0xe8, 0x8c, 0x36, 0x7b, 0x74, 0x44, 0xd7, 0xa3, 0x43, 0xc8, 0x2b, 0xbc, 0x57, 0x4f, 0x38, 0x2c, + 0x32, 0xa0, 0x0f, 0x06, 0x68, 0xf4, 0xf0, 0xf8, 0xc9, 0x9d, 0xc1, 0x58, 0x4b, 0x2b, 0x32, 0x08, + 0x6e, 0xd5, 0xa7, 0x6f, 0x2f, 0x57, 0x0e, 0xba, 0x5a, 0x39, 0xe8, 0xd7, 0xca, 0x41, 0xdf, 0xd7, + 0x4e, 0xef, 0x6a, 0xed, 0xf4, 0x7e, 0xac, 0x9d, 0xde, 0xd7, 0xe7, 0x56, 0xf5, 0xd6, 0xeb, 0x28, + 0x61, 0x13, 0x7d, 0x73, 0xf8, 0x79, 0xb3, 0xe8, 0xea, 0x0d, 0x93, 0x9d, 0x7a, 0xd5, 0x2f, 0xfe, + 0x04, 0x00, 0x00, 0xff, 0xff, 0xa7, 0x69, 0xfa, 0xa6, 0x5d, 0x03, 0x00, 0x00, +} + +func (m *LimitOrderTrancheUser) 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 *LimitOrderTrancheUser) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *LimitOrderTrancheUser) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.OrderType != 0 { + i = encodeVarintLimitOrderTrancheUser(dAtA, i, uint64(m.OrderType)) + i-- + dAtA[i] = 0x40 + } + { + size := m.SharesCancelled.Size() + i -= size + if _, err := m.SharesCancelled.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintLimitOrderTrancheUser(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x3a + { + size := m.SharesWithdrawn.Size() + i -= size + if _, err := m.SharesWithdrawn.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintLimitOrderTrancheUser(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x32 + { + size := m.SharesOwned.Size() + i -= size + if _, err := m.SharesOwned.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintLimitOrderTrancheUser(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x2a + if len(m.Address) > 0 { + i -= len(m.Address) + copy(dAtA[i:], m.Address) + i = encodeVarintLimitOrderTrancheUser(dAtA, i, uint64(len(m.Address))) + i-- + dAtA[i] = 0x22 + } + if len(m.TrancheKey) > 0 { + i -= len(m.TrancheKey) + copy(dAtA[i:], m.TrancheKey) + i = encodeVarintLimitOrderTrancheUser(dAtA, i, uint64(len(m.TrancheKey))) + i-- + dAtA[i] = 0x1a + } + if m.TickIndexTakerToMaker != 0 { + i = encodeVarintLimitOrderTrancheUser(dAtA, i, uint64(m.TickIndexTakerToMaker)) + i-- + dAtA[i] = 0x10 + } + if m.TradePairID != nil { + { + size, err := m.TradePairID.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintLimitOrderTrancheUser(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func encodeVarintLimitOrderTrancheUser(dAtA []byte, offset int, v uint64) int { + offset -= sovLimitOrderTrancheUser(v) + base := offset + for v >= 1<<7 { + dAtA[offset] = uint8(v&0x7f | 0x80) + v >>= 7 + offset++ + } + dAtA[offset] = uint8(v) + return base +} +func (m *LimitOrderTrancheUser) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.TradePairID != nil { + l = m.TradePairID.Size() + n += 1 + l + sovLimitOrderTrancheUser(uint64(l)) + } + if m.TickIndexTakerToMaker != 0 { + n += 1 + sovLimitOrderTrancheUser(uint64(m.TickIndexTakerToMaker)) + } + l = len(m.TrancheKey) + if l > 0 { + n += 1 + l + sovLimitOrderTrancheUser(uint64(l)) + } + l = len(m.Address) + if l > 0 { + n += 1 + l + sovLimitOrderTrancheUser(uint64(l)) + } + l = m.SharesOwned.Size() + n += 1 + l + sovLimitOrderTrancheUser(uint64(l)) + l = m.SharesWithdrawn.Size() + n += 1 + l + sovLimitOrderTrancheUser(uint64(l)) + l = m.SharesCancelled.Size() + n += 1 + l + sovLimitOrderTrancheUser(uint64(l)) + if m.OrderType != 0 { + n += 1 + sovLimitOrderTrancheUser(uint64(m.OrderType)) + } + return n +} + +func sovLimitOrderTrancheUser(x uint64) (n int) { + return (math_bits.Len64(x|1) + 6) / 7 +} +func sozLimitOrderTrancheUser(x uint64) (n int) { + return sovLimitOrderTrancheUser(uint64((x << 1) ^ uint64((int64(x) >> 63)))) +} +func (m *LimitOrderTrancheUser) 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 ErrIntOverflowLimitOrderTrancheUser + } + 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: LimitOrderTrancheUser: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: LimitOrderTrancheUser: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field TradePairID", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowLimitOrderTrancheUser + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthLimitOrderTrancheUser + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthLimitOrderTrancheUser + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.TradePairID == nil { + m.TradePairID = &TradePairID{} + } + if err := m.TradePairID.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 2: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field TickIndexTakerToMaker", wireType) + } + m.TickIndexTakerToMaker = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowLimitOrderTrancheUser + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.TickIndexTakerToMaker |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 3: + 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 ErrIntOverflowLimitOrderTrancheUser + } + 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 ErrInvalidLengthLimitOrderTrancheUser + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthLimitOrderTrancheUser + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.TrancheKey = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 4: + 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 ErrIntOverflowLimitOrderTrancheUser + } + 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 ErrInvalidLengthLimitOrderTrancheUser + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthLimitOrderTrancheUser + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Address = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 5: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field SharesOwned", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowLimitOrderTrancheUser + } + 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 ErrInvalidLengthLimitOrderTrancheUser + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthLimitOrderTrancheUser + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.SharesOwned.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 6: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field SharesWithdrawn", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowLimitOrderTrancheUser + } + 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 ErrInvalidLengthLimitOrderTrancheUser + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthLimitOrderTrancheUser + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.SharesWithdrawn.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 7: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field SharesCancelled", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowLimitOrderTrancheUser + } + 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 ErrInvalidLengthLimitOrderTrancheUser + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthLimitOrderTrancheUser + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.SharesCancelled.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 8: + 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 ErrIntOverflowLimitOrderTrancheUser + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.OrderType |= LimitOrderType(b&0x7F) << shift + if b < 0x80 { + break + } + } + default: + iNdEx = preIndex + skippy, err := skipLimitOrderTrancheUser(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthLimitOrderTrancheUser + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func skipLimitOrderTrancheUser(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, ErrIntOverflowLimitOrderTrancheUser + } + 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, ErrIntOverflowLimitOrderTrancheUser + } + 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, ErrIntOverflowLimitOrderTrancheUser + } + 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, ErrInvalidLengthLimitOrderTrancheUser + } + iNdEx += length + case 3: + depth++ + case 4: + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupLimitOrderTrancheUser + } + depth-- + case 5: + iNdEx += 4 + default: + return 0, fmt.Errorf("proto: illegal wireType %d", wireType) + } + if iNdEx < 0 { + return 0, ErrInvalidLengthLimitOrderTrancheUser + } + if depth == 0 { + return iNdEx, nil + } + } + return 0, io.ErrUnexpectedEOF +} + +var ( + ErrInvalidLengthLimitOrderTrancheUser = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowLimitOrderTrancheUser = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupLimitOrderTrancheUser = fmt.Errorf("proto: unexpected end of group") +) diff --git a/x/dex/types/limit_order_type.go b/x/dex/types/limit_order_type.go new file mode 100644 index 000000000..a43c75dcd --- /dev/null +++ b/x/dex/types/limit_order_type.go @@ -0,0 +1,29 @@ +package types + +func (l LimitOrderType) IsGTC() bool { + return l == LimitOrderType_GOOD_TIL_CANCELLED +} + +func (l LimitOrderType) IsFoK() bool { + return l == LimitOrderType_FILL_OR_KILL +} + +func (l LimitOrderType) IsIoC() bool { + return l == LimitOrderType_IMMEDIATE_OR_CANCEL +} + +func (l LimitOrderType) IsJIT() bool { + return l == LimitOrderType_JUST_IN_TIME +} + +func (l LimitOrderType) IsGoodTil() bool { + return l == LimitOrderType_GOOD_TIL_TIME +} + +func (l LimitOrderType) IsTakerOnly() bool { + return l.IsIoC() || l.IsFoK() +} + +func (l LimitOrderType) HasExpiration() bool { + return l.IsGoodTil() || l.IsJIT() +} diff --git a/x/dex/types/liquidity.go b/x/dex/types/liquidity.go new file mode 100644 index 000000000..60cc306b4 --- /dev/null +++ b/x/dex/types/liquidity.go @@ -0,0 +1,11 @@ +package types + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" + math_utils "github.com/neutron-org/neutron/utils/math" +) + +type Liquidity interface { + Swap(maxAmountTakerIn sdk.Int, maxAmountMakerOut *sdk.Int) (inAmount, outAmount sdk.Int) + Price() math_utils.PrecDec +} diff --git a/x/dex/types/message_cancel_limit_order.go b/x/dex/types/message_cancel_limit_order.go new file mode 100644 index 000000000..7b8433ffe --- /dev/null +++ b/x/dex/types/message_cancel_limit_order.go @@ -0,0 +1,48 @@ +package types + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" + sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" +) + +const TypeMsgCancelLimitOrder = "cancel_limit_order" + +var _ sdk.Msg = &MsgCancelLimitOrder{} + +func NewMsgCancelLimitOrder(creator, trancheKey string) *MsgCancelLimitOrder { + return &MsgCancelLimitOrder{ + Creator: creator, + TrancheKey: trancheKey, + } +} + +func (msg *MsgCancelLimitOrder) Route() string { + return RouterKey +} + +func (msg *MsgCancelLimitOrder) Type() string { + return TypeMsgCancelLimitOrder +} + +func (msg *MsgCancelLimitOrder) GetSigners() []sdk.AccAddress { + creator, err := sdk.AccAddressFromBech32(msg.Creator) + if err != nil { + panic(err) + } + + return []sdk.AccAddress{creator} +} + +func (msg *MsgCancelLimitOrder) GetSignBytes() []byte { + bz := ModuleCdc.MustMarshalJSON(msg) + return sdk.MustSortJSON(bz) +} + +func (msg *MsgCancelLimitOrder) ValidateBasic() error { + _, err := sdk.AccAddressFromBech32(msg.Creator) + if err != nil { + return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err) + } + + return nil +} diff --git a/x/dex/types/message_cancel_limit_order_test.go b/x/dex/types/message_cancel_limit_order_test.go new file mode 100644 index 000000000..6e87664fb --- /dev/null +++ b/x/dex/types/message_cancel_limit_order_test.go @@ -0,0 +1,43 @@ +package types_test + +import ( + "testing" + + sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/neutron-org/neutron/testutil/common/sample" + . "github.com/neutron-org/neutron/x/dex/types" + "github.com/stretchr/testify/require" +) + +func TestMsgCancelLimitOrder_ValidateBasic(t *testing.T) { + tests := []struct { + name string + msg MsgCancelLimitOrder + err error + }{ + { + name: "invalid creator", + msg: MsgCancelLimitOrder{ + Creator: "invalid_address", + TrancheKey: "ORDER123", + }, + err: sdkerrors.ErrInvalidAddress, + }, { + name: "valid msg", + msg: MsgCancelLimitOrder{ + Creator: sample.AccAddress(), + TrancheKey: "ORDER123", + }, + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + err := tt.msg.ValidateBasic() + if tt.err != nil { + require.ErrorIs(t, err, tt.err) + return + } + require.NoError(t, err) + }) + } +} diff --git a/x/dex/types/message_deposit.go b/x/dex/types/message_deposit.go new file mode 100644 index 000000000..f05fd015e --- /dev/null +++ b/x/dex/types/message_deposit.go @@ -0,0 +1,90 @@ +package types + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" + sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" +) + +const TypeMsgDeposit = "deposit" + +var _ sdk.Msg = &MsgDeposit{} + +func NewMsgDeposit( + creator, + receiver, + tokenA, + tokenB string, + amountsA, + amountsB []sdk.Int, + tickIndexes []int64, + fees []uint64, + depositOptions []*DepositOptions, +) *MsgDeposit { + return &MsgDeposit{ + Creator: creator, + Receiver: receiver, + TokenA: tokenA, + TokenB: tokenB, + AmountsA: amountsA, + AmountsB: amountsB, + TickIndexesAToB: tickIndexes, + Fees: fees, + Options: depositOptions, + } +} + +func (msg *MsgDeposit) Route() string { + return RouterKey +} + +func (msg *MsgDeposit) Type() string { + return TypeMsgDeposit +} + +func (msg *MsgDeposit) GetSigners() []sdk.AccAddress { + creator, err := sdk.AccAddressFromBech32(msg.Creator) + if err != nil { + panic(err) + } + + return []sdk.AccAddress{creator} +} + +func (msg *MsgDeposit) GetSignBytes() []byte { + bz := ModuleCdc.MustMarshalJSON(msg) + return sdk.MustSortJSON(bz) +} + +func (msg *MsgDeposit) ValidateBasic() error { + _, err := sdk.AccAddressFromBech32(msg.Creator) + if err != nil { + return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err) + } + + _, err = sdk.AccAddressFromBech32(msg.Receiver) + if err != nil { + return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid receiver address (%s)", err) + } + + // Verify that the lengths of TickIndexes, Fees, AmountsA, AmountsB are all equal + numDeposits := len(msg.AmountsA) + if numDeposits != len(msg.Fees) || + numDeposits != len(msg.TickIndexesAToB) || + numDeposits != len(msg.AmountsB) { + return ErrUnbalancedTxArray + } + if numDeposits == 0 { + return ErrZeroDeposit + } + + for i := 0; i < numDeposits; i++ { + if msg.AmountsA[i].LT(sdk.ZeroInt()) || msg.AmountsB[i].LT(sdk.ZeroInt()) { + return ErrZeroDeposit + } + if msg.AmountsA[i].Equal(sdk.ZeroInt()) && msg.AmountsB[i].Equal(sdk.ZeroInt()) { + return ErrZeroDeposit + } + } + + return nil +} diff --git a/x/dex/types/message_deposit_test.go b/x/dex/types/message_deposit_test.go new file mode 100644 index 000000000..590444805 --- /dev/null +++ b/x/dex/types/message_deposit_test.go @@ -0,0 +1,137 @@ +package types_test + +import ( + "testing" + + sdk "github.com/cosmos/cosmos-sdk/types" + sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/neutron-org/neutron/testutil/common/sample" + . "github.com/neutron-org/neutron/x/dex/types" + "github.com/stretchr/testify/require" +) + +func TestMsgDeposit_ValidateBasic(t *testing.T) { + tests := []struct { + name string + msg MsgDeposit + err error + }{ + { + name: "invalid creator", + msg: MsgDeposit{ + Creator: "invalid_address", + Receiver: sample.AccAddress(), + Fees: []uint64{0}, + TickIndexesAToB: []int64{0}, + AmountsA: []sdk.Int{sdk.OneInt()}, + AmountsB: []sdk.Int{sdk.OneInt()}, + }, + err: sdkerrors.ErrInvalidAddress, + }, + { + name: "invalid receiver", + msg: MsgDeposit{ + Creator: sample.AccAddress(), + Receiver: "invalid address", + Fees: []uint64{0}, + TickIndexesAToB: []int64{0}, + AmountsA: []sdk.Int{sdk.OneInt()}, + AmountsB: []sdk.Int{sdk.OneInt()}, + }, + err: sdkerrors.ErrInvalidAddress, + }, + { + name: "invalid fee indexes length", + msg: MsgDeposit{ + Creator: sample.AccAddress(), + Receiver: sample.AccAddress(), + Fees: []uint64{0}, + TickIndexesAToB: []int64{}, + AmountsA: []sdk.Int{}, + AmountsB: []sdk.Int{}, + }, + err: ErrUnbalancedTxArray, + }, + { + name: "invalid tick indexes length", + msg: MsgDeposit{ + Creator: sample.AccAddress(), + Receiver: sample.AccAddress(), + Fees: []uint64{}, + TickIndexesAToB: []int64{0}, + AmountsA: []sdk.Int{}, + AmountsB: []sdk.Int{}, + }, + err: ErrUnbalancedTxArray, + }, + { + name: "invalid amounts A length", + msg: MsgDeposit{ + Creator: sample.AccAddress(), + Receiver: sample.AccAddress(), + Fees: []uint64{}, + TickIndexesAToB: []int64{}, + AmountsA: []sdk.Int{sdk.OneInt()}, + AmountsB: []sdk.Int{}, + }, + err: ErrUnbalancedTxArray, + }, + { + name: "invalid amounts B length", + msg: MsgDeposit{ + Creator: sample.AccAddress(), + Receiver: sample.AccAddress(), + Fees: []uint64{}, + TickIndexesAToB: []int64{}, + AmountsA: []sdk.Int{}, + AmountsB: []sdk.Int{sdk.OneInt()}, + }, + err: ErrUnbalancedTxArray, + }, + { + name: "invalid no deposit", + msg: MsgDeposit{ + Creator: sample.AccAddress(), + Receiver: sample.AccAddress(), + Fees: []uint64{}, + TickIndexesAToB: []int64{}, + AmountsA: []sdk.Int{}, + AmountsB: []sdk.Int{}, + }, + err: ErrZeroDeposit, + }, + { + name: "invalid no deposit", + msg: MsgDeposit{ + Creator: sample.AccAddress(), + Receiver: sample.AccAddress(), + Fees: []uint64{0}, + TickIndexesAToB: []int64{0}, + AmountsA: []sdk.Int{sdk.ZeroInt()}, + AmountsB: []sdk.Int{sdk.ZeroInt()}, + }, + err: ErrZeroDeposit, + }, + { + name: "valid msg", + msg: MsgDeposit{ + Creator: sample.AccAddress(), + Receiver: sample.AccAddress(), + Fees: []uint64{0}, + TickIndexesAToB: []int64{0}, + AmountsA: []sdk.Int{sdk.OneInt()}, + AmountsB: []sdk.Int{sdk.OneInt()}, + }, + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + err := tt.msg.ValidateBasic() + if tt.err != nil { + require.ErrorIs(t, err, tt.err) + return + } + require.NoError(t, err) + }) + } +} diff --git a/x/dex/types/message_multi_hop_swap.go b/x/dex/types/message_multi_hop_swap.go new file mode 100644 index 000000000..c9c292884 --- /dev/null +++ b/x/dex/types/message_multi_hop_swap.go @@ -0,0 +1,85 @@ +package types + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" + sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + math_utils "github.com/neutron-org/neutron/utils/math" +) + +const TypeMsgMultiHopSwap = "multi_hop_swap" + +var _ sdk.Msg = &MsgMultiHopSwap{} + +func NewMsgMultiHopSwap( + creator string, + receiever string, + routesArr [][]string, + amountIn sdk.Int, + exitLimitPrice math_utils.PrecDec, + pickBestRoute bool, +) *MsgMultiHopSwap { + routes := make([]*MultiHopRoute, len(routesArr)) + for i, hops := range routesArr { + routes[i] = &MultiHopRoute{Hops: hops} + } + + return &MsgMultiHopSwap{ + Creator: creator, + Receiver: receiever, + Routes: routes, + AmountIn: amountIn, + ExitLimitPrice: exitLimitPrice, + PickBestRoute: pickBestRoute, + } +} + +func (msg *MsgMultiHopSwap) Route() string { + return RouterKey +} + +func (msg *MsgMultiHopSwap) Type() string { + return TypeMsgMultiHopSwap +} + +func (msg *MsgMultiHopSwap) GetSigners() []sdk.AccAddress { + creator, err := sdk.AccAddressFromBech32(msg.Creator) + if err != nil { + panic(err) + } + + return []sdk.AccAddress{creator} +} + +func (msg *MsgMultiHopSwap) GetSignBytes() []byte { + bz := ModuleCdc.MustMarshalJSON(msg) + return sdk.MustSortJSON(bz) +} + +func (msg *MsgMultiHopSwap) ValidateBasic() error { + _, err := sdk.AccAddressFromBech32(msg.Creator) + if err != nil { + return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err) + } + _, err = sdk.AccAddressFromBech32(msg.Receiver) + if err != nil { + return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid receiver address (%s)", err) + } + + if len(msg.Routes) == 0 { + return ErrMissingMultihopRoute + } + + expectedExitToken := msg.Routes[0].Hops[len(msg.Routes[0].Hops)-1] + for _, route := range msg.Routes[1:] { + hops := route.Hops + if expectedExitToken != hops[len(hops)-1] { + return ErrMultihopExitTokensMismatch + } + } + + if msg.AmountIn.LTE(sdk.ZeroInt()) { + return ErrZeroSwap + } + + return nil +} diff --git a/x/dex/types/message_multi_hop_swap_test.go b/x/dex/types/message_multi_hop_swap_test.go new file mode 100644 index 000000000..b9fc67acc --- /dev/null +++ b/x/dex/types/message_multi_hop_swap_test.go @@ -0,0 +1,85 @@ +package types_test + +import ( + "testing" + + sdk "github.com/cosmos/cosmos-sdk/types" + sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/neutron-org/neutron/testutil/common/sample" + . "github.com/neutron-org/neutron/x/dex/types" + "github.com/stretchr/testify/require" +) + +func TestMsgMultiHopSwap_ValidateBasic(t *testing.T) { + tests := []struct { + name string + msg MsgMultiHopSwap + err error + }{ + { + name: "invalid creator address", + msg: MsgMultiHopSwap{ + Creator: "invalid_address", + Receiver: sample.AccAddress(), + }, + err: sdkerrors.ErrInvalidAddress, + }, + { + name: "invalid receiver address", + msg: MsgMultiHopSwap{ + Creator: sample.AccAddress(), + Receiver: "invalid_address", + }, + err: sdkerrors.ErrInvalidAddress, + }, + { + name: "missing route", + msg: MsgMultiHopSwap{ + Creator: sample.AccAddress(), + Receiver: sample.AccAddress(), + }, + err: ErrMissingMultihopRoute, + }, + { + name: "invalid exit tokens", + msg: MsgMultiHopSwap{ + Creator: sample.AccAddress(), + Receiver: sample.AccAddress(), + Routes: []*MultiHopRoute{ + {Hops: []string{"A", "B", "C"}}, + {Hops: []string{"A", "B", "Z"}}, + }, + }, + err: ErrMultihopExitTokensMismatch, + }, + { + name: "invalid amountIn", + msg: MsgMultiHopSwap{ + Creator: sample.AccAddress(), + Receiver: sample.AccAddress(), + Routes: []*MultiHopRoute{{Hops: []string{"A", "B", "C"}}}, + AmountIn: sdk.NewInt(-1), + }, + err: ErrZeroSwap, + }, + { + name: "valid", + msg: MsgMultiHopSwap{ + Routes: []*MultiHopRoute{{Hops: []string{"A", "B", "C"}}}, + Creator: sample.AccAddress(), + Receiver: sample.AccAddress(), + AmountIn: sdk.OneInt(), + }, + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + err := tt.msg.ValidateBasic() + if tt.err != nil { + require.ErrorIs(t, err, tt.err) + return + } + require.NoError(t, err) + }) + } +} diff --git a/x/dex/types/message_place_limit_order.go b/x/dex/types/message_place_limit_order.go new file mode 100644 index 000000000..23135d2f5 --- /dev/null +++ b/x/dex/types/message_place_limit_order.go @@ -0,0 +1,105 @@ +package types + +import ( + "time" + + sdk "github.com/cosmos/cosmos-sdk/types" + sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" +) + +const TypeMsgPlaceLimitOrder = "place_limit_order" + +var _ sdk.Msg = &MsgPlaceLimitOrder{} + +func NewMsgPlaceLimitOrder( + creator, + receiver, + tokenIn, + tokenOut string, + tickIndex int64, + amountIn sdk.Int, + orderType LimitOrderType, + goodTil *time.Time, + maxAmountOut *sdk.Int, +) *MsgPlaceLimitOrder { + return &MsgPlaceLimitOrder{ + Creator: creator, + Receiver: receiver, + TokenIn: tokenIn, + TokenOut: tokenOut, + TickIndexInToOut: tickIndex, + AmountIn: amountIn, + OrderType: orderType, + ExpirationTime: goodTil, + MaxAmountOut: maxAmountOut, + } +} + +func (msg *MsgPlaceLimitOrder) Route() string { + return RouterKey +} + +func (msg *MsgPlaceLimitOrder) Type() string { + return TypeMsgPlaceLimitOrder +} + +func (msg *MsgPlaceLimitOrder) GetSigners() []sdk.AccAddress { + creator, err := sdk.AccAddressFromBech32(msg.Creator) + if err != nil { + panic(err) + } + + return []sdk.AccAddress{creator} +} + +func (msg *MsgPlaceLimitOrder) GetSignBytes() []byte { + bz := ModuleCdc.MustMarshalJSON(msg) + return sdk.MustSortJSON(bz) +} + +func (msg *MsgPlaceLimitOrder) ValidateBasic() error { + _, err := sdk.AccAddressFromBech32(msg.Creator) + if err != nil { + return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err) + } + + _, err = sdk.AccAddressFromBech32(msg.Receiver) + if err != nil { + return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid receiver address (%s)", err) + } + + if msg.AmountIn.LTE(sdk.ZeroInt()) { + return ErrZeroLimitOrder + } + + if msg.OrderType.IsGoodTil() && msg.ExpirationTime == nil { + return ErrGoodTilOrderWithoutExpiration + } + + if !msg.OrderType.IsGoodTil() && msg.ExpirationTime != nil { + return ErrExpirationOnWrongOrderType + } + + if msg.MaxAmountOut != nil { + if !msg.MaxAmountOut.IsPositive() { + return ErrZeroMaxAmountOut + } + if !msg.OrderType.IsTakerOnly() { + return ErrInvalidMaxAmountOutForMaker + } + } + + return nil +} + +func (msg *MsgPlaceLimitOrder) ValidateGoodTilExpiration(blockTime time.Time) error { + if msg.OrderType.IsGoodTil() && !msg.ExpirationTime.After(blockTime) { + return sdkerrors.Wrapf(ErrExpirationTimeInPast, + "Current BlockTime: %s; Provided ExpirationTime: %s", + blockTime.String(), + msg.ExpirationTime.String(), + ) + } + + return nil +} diff --git a/x/dex/types/message_place_limit_order_test.go b/x/dex/types/message_place_limit_order_test.go new file mode 100644 index 000000000..bdbaeda59 --- /dev/null +++ b/x/dex/types/message_place_limit_order_test.go @@ -0,0 +1,107 @@ +package types_test + +import ( + "testing" + + sdk "github.com/cosmos/cosmos-sdk/types" + sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/neutron-org/neutron/testutil/common/sample" + . "github.com/neutron-org/neutron/x/dex/types" + "github.com/stretchr/testify/require" +) + +func TestMsgPlaceLimitOrder_ValidateBasic(t *testing.T) { + ZEROINT := sdk.ZeroInt() + ONEINT := sdk.OneInt() + tests := []struct { + name string + msg MsgPlaceLimitOrder + err error + }{ + { + name: "invalid creator", + msg: MsgPlaceLimitOrder{ + Creator: "invalid_address", + Receiver: sample.AccAddress(), + TokenIn: "TokenA", + TokenOut: "TokenB", + TickIndexInToOut: 0, + AmountIn: sdk.OneInt(), + }, + err: sdkerrors.ErrInvalidAddress, + }, + { + name: "invalid receiver", + msg: MsgPlaceLimitOrder{ + Creator: sample.AccAddress(), + Receiver: "invalid_address", + TokenIn: "TokenA", + TokenOut: "TokenB", + TickIndexInToOut: 0, + AmountIn: sdk.OneInt(), + }, + err: sdkerrors.ErrInvalidAddress, + }, + { + name: "invalid zero limit order", + msg: MsgPlaceLimitOrder{ + Creator: sample.AccAddress(), + Receiver: sample.AccAddress(), + TokenIn: "TokenA", + TokenOut: "TokenB", + TickIndexInToOut: 0, + AmountIn: sdk.ZeroInt(), + }, + err: ErrZeroLimitOrder, + }, + { + name: "zero maxOut", + msg: MsgPlaceLimitOrder{ + Creator: sample.AccAddress(), + Receiver: sample.AccAddress(), + TokenIn: "TokenA", + TokenOut: "TokenB", + TickIndexInToOut: 0, + AmountIn: sdk.OneInt(), + MaxAmountOut: &ZEROINT, + OrderType: LimitOrderType_FILL_OR_KILL, + }, + err: ErrZeroMaxAmountOut, + }, + { + name: "max out with maker order", + msg: MsgPlaceLimitOrder{ + Creator: sample.AccAddress(), + Receiver: sample.AccAddress(), + TokenIn: "TokenA", + TokenOut: "TokenB", + TickIndexInToOut: 0, + AmountIn: sdk.OneInt(), + MaxAmountOut: &ONEINT, + OrderType: LimitOrderType_GOOD_TIL_CANCELLED, + }, + err: ErrInvalidMaxAmountOutForMaker, + }, + { + name: "valid msg", + msg: MsgPlaceLimitOrder{ + Creator: sample.AccAddress(), + Receiver: sample.AccAddress(), + TokenIn: "TokenA", + TokenOut: "TokenB", + TickIndexInToOut: 0, + AmountIn: sdk.OneInt(), + }, + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + err := tt.msg.ValidateBasic() + if tt.err != nil { + require.ErrorIs(t, err, tt.err) + return + } + require.NoError(t, err) + }) + } +} diff --git a/x/dex/types/message_withdrawl.go b/x/dex/types/message_withdrawl.go new file mode 100644 index 000000000..3448d2f1d --- /dev/null +++ b/x/dex/types/message_withdrawl.go @@ -0,0 +1,81 @@ +package types + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" + sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" +) + +const TypeMsgWithdrawal = "withdrawal" + +var _ sdk.Msg = &MsgWithdrawal{} + +func NewMsgWithdrawal(creator, + receiver, + tokenA, + tokenB string, + sharesToRemove []sdk.Int, + tickIndexes []int64, + fees []uint64, +) *MsgWithdrawal { + return &MsgWithdrawal{ + Creator: creator, + Receiver: receiver, + TokenA: tokenA, + TokenB: tokenB, + SharesToRemove: sharesToRemove, + TickIndexesAToB: tickIndexes, + Fees: fees, + } +} + +func (msg *MsgWithdrawal) Route() string { + return RouterKey +} + +func (msg *MsgWithdrawal) Type() string { + return TypeMsgWithdrawal +} + +func (msg *MsgWithdrawal) GetSigners() []sdk.AccAddress { + creator, err := sdk.AccAddressFromBech32(msg.Creator) + if err != nil { + panic(err) + } + + return []sdk.AccAddress{creator} +} + +func (msg *MsgWithdrawal) GetSignBytes() []byte { + bz := ModuleCdc.MustMarshalJSON(msg) + return sdk.MustSortJSON(bz) +} + +func (msg *MsgWithdrawal) ValidateBasic() error { + _, err := sdk.AccAddressFromBech32(msg.Creator) + if err != nil { + return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err) + } + + _, err = sdk.AccAddressFromBech32(msg.Receiver) + if err != nil { + return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid receiver address (%s)", err) + } + + // Verify that the lengths of TickIndexes, Fees, SharesToRemove are all equal + if len(msg.Fees) != len(msg.TickIndexesAToB) || + len(msg.SharesToRemove) != len(msg.TickIndexesAToB) { + return ErrUnbalancedTxArray + } + + if len(msg.Fees) == 0 { + return ErrZeroWithdraw + } + + for i := 0; i < len(msg.Fees); i++ { + if msg.SharesToRemove[i].LTE(sdk.ZeroInt()) { + return ErrZeroWithdraw + } + } + + return nil +} diff --git a/x/dex/types/message_withdrawl_filled_limit_order.go b/x/dex/types/message_withdrawl_filled_limit_order.go new file mode 100644 index 000000000..929329650 --- /dev/null +++ b/x/dex/types/message_withdrawl_filled_limit_order.go @@ -0,0 +1,48 @@ +package types + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" + sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" +) + +const TypeMsgWithdrawFilledLimitOrder = "withdrawal_withdrawn_limit_order" + +var _ sdk.Msg = &MsgWithdrawFilledLimitOrder{} + +func NewMsgWithdrawFilledLimitOrder(creator, trancheKey string) *MsgWithdrawFilledLimitOrder { + return &MsgWithdrawFilledLimitOrder{ + Creator: creator, + TrancheKey: trancheKey, + } +} + +func (msg *MsgWithdrawFilledLimitOrder) Route() string { + return RouterKey +} + +func (msg *MsgWithdrawFilledLimitOrder) Type() string { + return TypeMsgWithdrawFilledLimitOrder +} + +func (msg *MsgWithdrawFilledLimitOrder) GetSigners() []sdk.AccAddress { + creator, err := sdk.AccAddressFromBech32(msg.Creator) + if err != nil { + panic(err) + } + + return []sdk.AccAddress{creator} +} + +func (msg *MsgWithdrawFilledLimitOrder) GetSignBytes() []byte { + bz := ModuleCdc.MustMarshalJSON(msg) + return sdk.MustSortJSON(bz) +} + +func (msg *MsgWithdrawFilledLimitOrder) ValidateBasic() error { + _, err := sdk.AccAddressFromBech32(msg.Creator) + if err != nil { + return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err) + } + + return nil +} diff --git a/x/dex/types/message_withdrawl_filled_limit_order_test.go b/x/dex/types/message_withdrawl_filled_limit_order_test.go new file mode 100644 index 000000000..e1fceeec1 --- /dev/null +++ b/x/dex/types/message_withdrawl_filled_limit_order_test.go @@ -0,0 +1,43 @@ +package types_test + +import ( + "testing" + + sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/neutron-org/neutron/testutil/common/sample" + . "github.com/neutron-org/neutron/x/dex/types" + "github.com/stretchr/testify/require" +) + +func TestMsgWithdrawFilledLimitOrder_ValidateBasic(t *testing.T) { + tests := []struct { + name string + msg MsgWithdrawFilledLimitOrder + err error + }{ + { + name: "invalid creator", + msg: MsgWithdrawFilledLimitOrder{ + Creator: "invalid_address", + TrancheKey: "ORDER123", + }, + err: sdkerrors.ErrInvalidAddress, + }, { + name: "valid msg", + msg: MsgWithdrawFilledLimitOrder{ + Creator: sample.AccAddress(), + TrancheKey: "ORDER123", + }, + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + err := tt.msg.ValidateBasic() + if tt.err != nil { + require.ErrorIs(t, err, tt.err) + return + } + require.NoError(t, err) + }) + } +} diff --git a/x/dex/types/message_withdrawl_test.go b/x/dex/types/message_withdrawl_test.go new file mode 100644 index 000000000..288fc3bbe --- /dev/null +++ b/x/dex/types/message_withdrawl_test.go @@ -0,0 +1,117 @@ +package types_test + +import ( + "testing" + + sdk "github.com/cosmos/cosmos-sdk/types" + sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/neutron-org/neutron/testutil/common/sample" + . "github.com/neutron-org/neutron/x/dex/types" + "github.com/stretchr/testify/require" +) + +func TestMsgWithdrawal_ValidateBasic(t *testing.T) { + tests := []struct { + name string + msg MsgWithdrawal + err error + }{ + { + name: "invalid creator", + msg: MsgWithdrawal{ + Creator: "invalid_address", + Receiver: sample.AccAddress(), + Fees: []uint64{0}, + TickIndexesAToB: []int64{0}, + SharesToRemove: []sdk.Int{sdk.OneInt()}, + }, + err: sdkerrors.ErrInvalidAddress, + }, + { + name: "invalid receiver", + msg: MsgWithdrawal{ + Creator: sample.AccAddress(), + Receiver: "invalid_address", + Fees: []uint64{0}, + TickIndexesAToB: []int64{0}, + SharesToRemove: []sdk.Int{sdk.OneInt()}, + }, + err: sdkerrors.ErrInvalidAddress, + }, + { + name: "invalid fee indexes length", + msg: MsgWithdrawal{ + Creator: sample.AccAddress(), + Receiver: sample.AccAddress(), + Fees: []uint64{}, + TickIndexesAToB: []int64{0}, + SharesToRemove: []sdk.Int{sdk.OneInt()}, + }, + err: ErrUnbalancedTxArray, + }, + { + name: "invalid tick indexes length", + msg: MsgWithdrawal{ + Creator: sample.AccAddress(), + Receiver: sample.AccAddress(), + Fees: []uint64{0}, + TickIndexesAToB: []int64{}, + SharesToRemove: []sdk.Int{sdk.OneInt()}, + }, + err: ErrUnbalancedTxArray, + }, + { + name: "invalid shares to remove length", + msg: MsgWithdrawal{ + Creator: sample.AccAddress(), + Receiver: sample.AccAddress(), + Fees: []uint64{0}, + TickIndexesAToB: []int64{0}, + SharesToRemove: []sdk.Int{}, + }, + err: ErrUnbalancedTxArray, + }, + { + name: "no withdraw specs", + msg: MsgWithdrawal{ + Creator: sample.AccAddress(), + Receiver: sample.AccAddress(), + Fees: []uint64{}, + TickIndexesAToB: []int64{}, + SharesToRemove: []sdk.Int{}, + }, + err: ErrZeroWithdraw, + }, + { + name: "no withdraw specs", + msg: MsgWithdrawal{ + Creator: sample.AccAddress(), + Receiver: sample.AccAddress(), + Fees: []uint64{0}, + TickIndexesAToB: []int64{0}, + SharesToRemove: []sdk.Int{sdk.ZeroInt()}, + }, + err: ErrZeroWithdraw, + }, + { + name: "valid msg", + msg: MsgWithdrawal{ + Creator: sample.AccAddress(), + Receiver: sample.AccAddress(), + Fees: []uint64{0}, + TickIndexesAToB: []int64{0}, + SharesToRemove: []sdk.Int{sdk.OneInt()}, + }, + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + err := tt.msg.ValidateBasic() + if tt.err != nil { + require.ErrorIs(t, err, tt.err) + return + } + require.NoError(t, err) + }) + } +} diff --git a/x/dex/types/pair_id.go b/x/dex/types/pair_id.go new file mode 100644 index 000000000..4f18aadfe --- /dev/null +++ b/x/dex/types/pair_id.go @@ -0,0 +1,95 @@ +package types + +import ( + "fmt" + "strings" + + sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" +) + +func NewPairID(token0, token1 string) (*PairID, error) { + if token0 == token1 { + return nil, sdkerrors.Wrapf(ErrInvalidTradingPair, "%s<>%s", token0, token1) + } + return &PairID{ + Token0: token0, + Token1: token1, + }, nil +} + +func MustNewPairID(token0, token1 string) *PairID { + pairID, err := NewPairID(token0, token1) + 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) +} + +func (p *PairID) OppositeToken(token string) (oppToken string, ok bool) { + switch token { + case p.Token0: + return p.Token1, true + case p.Token1: + return p.Token0, true + default: + return "", false + } +} + +func (p *PairID) MustOppositeToken(token string) string { + if oppToken, ok := p.OppositeToken(token); ok { + return oppToken + } + panic("Supplied token matches neither side of pair") +} + +func NewPairIDFromCanonicalString(pairIDStr string) (*PairID, error) { + tokens := strings.Split(pairIDStr, "<>") + + if len(tokens) == 2 { + return NewPairID(tokens[0], tokens[1]) + } + + return &PairID{}, sdkerrors.Wrapf(ErrInvalidPairIDStr, pairIDStr) +} + +func SortTokens(tokenA, tokenB string) (string, string) { + if tokenA < tokenB { + return tokenA, tokenB + } else { + return tokenB, tokenA + } +} + +func (p *PairID) MustTradePairIDFromMaker(maker string) *TradePairID { + if p.Token0 == maker { + return MustNewTradePairID(p.Token1, p.Token0) + } else if p.Token1 == maker { + return MustNewTradePairID(p.Token0, p.Token1) + } else { + panic(fmt.Errorf("pair.TradePairIDFromMaker(maker string) called where maker does not equal either pair.Token0 or pair.Token1")) + } +} + +func (p *PairID) MustTradePairIDFromTaker(taker string) *TradePairID { + if p.Token0 == taker { + return MustNewTradePairID(p.Token0, p.Token1) + } else if p.Token1 == taker { + return MustNewTradePairID(p.Token1, p.Token0) + } else { + panic(fmt.Errorf("pair.TradePairIDFromMaker(maker string) called where maker does not equal either pair.Token0 or pair.Token1")) + } +} + +func (p *PairID) Equal(otherPairID *PairID) bool { + return *p == *otherPairID +} diff --git a/x/dex/types/pair_id.pb.go b/x/dex/types/pair_id.pb.go new file mode 100644 index 000000000..4b65c4207 --- /dev/null +++ b/x/dex/types/pair_id.pb.go @@ -0,0 +1,365 @@ +// Code generated by protoc-gen-gogo. DO NOT EDIT. +// source: duality/dex/pair_id.proto + +package types + +import ( + fmt "fmt" + 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 + +type PairID struct { + Token0 string `protobuf:"bytes,1,opt,name=token0,proto3" json:"token0,omitempty"` + Token1 string `protobuf:"bytes,2,opt,name=token1,proto3" json:"token1,omitempty"` +} + +func (m *PairID) Reset() { *m = PairID{} } +func (m *PairID) String() string { return proto.CompactTextString(m) } +func (*PairID) ProtoMessage() {} +func (*PairID) Descriptor() ([]byte, []int) { + return fileDescriptor_1919813da3dc14c8, []int{0} +} +func (m *PairID) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *PairID) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_PairID.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 *PairID) XXX_Merge(src proto.Message) { + xxx_messageInfo_PairID.Merge(m, src) +} +func (m *PairID) XXX_Size() int { + return m.Size() +} +func (m *PairID) XXX_DiscardUnknown() { + xxx_messageInfo_PairID.DiscardUnknown(m) +} + +var xxx_messageInfo_PairID proto.InternalMessageInfo + +func (m *PairID) GetToken0() string { + if m != nil { + return m.Token0 + } + return "" +} + +func (m *PairID) GetToken1() string { + if m != nil { + return m.Token1 + } + return "" +} + +func init() { + proto.RegisterType((*PairID)(nil), "duality.dex.PairID") +} + +func init() { proto.RegisterFile("duality/dex/pair_id.proto", fileDescriptor_1919813da3dc14c8) } + +var fileDescriptor_1919813da3dc14c8 = []byte{ + // 159 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4c, 0x29, 0x4d, 0xcc, + 0xc9, 0x2c, 0xa9, 0xd4, 0x4f, 0x49, 0xad, 0xd0, 0x2f, 0x48, 0xcc, 0x2c, 0x8a, 0xcf, 0x4c, 0xd1, + 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x86, 0x4a, 0xe9, 0xa5, 0xa4, 0x56, 0x28, 0x59, 0x70, + 0xb1, 0x05, 0x24, 0x66, 0x16, 0x79, 0xba, 0x08, 0x89, 0x71, 0xb1, 0x95, 0xe4, 0x67, 0xa7, 0xe6, + 0x19, 0x48, 0x30, 0x2a, 0x30, 0x6a, 0x70, 0x06, 0x41, 0x79, 0x70, 0x71, 0x43, 0x09, 0x26, 0x24, + 0x71, 0x43, 0x27, 0xd7, 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, 0x4e, + 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x87, 0xda, 0xa5, 0x9b, 0x93, 0x98, + 0x54, 0x0c, 0xe3, 0xe8, 0x57, 0x80, 0x5d, 0x55, 0x52, 0x59, 0x90, 0x5a, 0x9c, 0xc4, 0x06, 0x76, + 0x94, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0x72, 0x4e, 0xb2, 0x90, 0xb1, 0x00, 0x00, 0x00, +} + +func (m *PairID) 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 *PairID) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *PairID) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Token1) > 0 { + i -= len(m.Token1) + copy(dAtA[i:], m.Token1) + i = encodeVarintPairId(dAtA, i, uint64(len(m.Token1))) + i-- + dAtA[i] = 0x12 + } + if len(m.Token0) > 0 { + i -= len(m.Token0) + copy(dAtA[i:], m.Token0) + i = encodeVarintPairId(dAtA, i, uint64(len(m.Token0))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func encodeVarintPairId(dAtA []byte, offset int, v uint64) int { + offset -= sovPairId(v) + base := offset + for v >= 1<<7 { + dAtA[offset] = uint8(v&0x7f | 0x80) + v >>= 7 + offset++ + } + dAtA[offset] = uint8(v) + return base +} +func (m *PairID) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Token0) + if l > 0 { + n += 1 + l + sovPairId(uint64(l)) + } + l = len(m.Token1) + if l > 0 { + n += 1 + l + sovPairId(uint64(l)) + } + return n +} + +func sovPairId(x uint64) (n int) { + return (math_bits.Len64(x|1) + 6) / 7 +} +func sozPairId(x uint64) (n int) { + return sovPairId(uint64((x << 1) ^ uint64((int64(x) >> 63)))) +} +func (m *PairID) 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 ErrIntOverflowPairId + } + 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: PairID: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: PairID: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Token0", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowPairId + } + 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 ErrInvalidLengthPairId + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthPairId + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Token0 = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Token1", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowPairId + } + 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 ErrInvalidLengthPairId + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthPairId + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Token1 = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipPairId(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthPairId + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func skipPairId(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, ErrIntOverflowPairId + } + 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, ErrIntOverflowPairId + } + 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, ErrIntOverflowPairId + } + 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, ErrInvalidLengthPairId + } + iNdEx += length + case 3: + depth++ + case 4: + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupPairId + } + depth-- + case 5: + iNdEx += 4 + default: + return 0, fmt.Errorf("proto: illegal wireType %d", wireType) + } + if iNdEx < 0 { + return 0, ErrInvalidLengthPairId + } + if depth == 0 { + return iNdEx, nil + } + } + return 0, io.ErrUnexpectedEOF +} + +var ( + ErrInvalidLengthPairId = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowPairId = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupPairId = fmt.Errorf("proto: unexpected end of group") +) diff --git a/x/dex/types/params.go b/x/dex/types/params.go new file mode 100644 index 000000000..fbd7d08d8 --- /dev/null +++ b/x/dex/types/params.go @@ -0,0 +1,67 @@ +package types + +import ( + fmt "fmt" + + paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" + "gopkg.in/yaml.v2" +) + +var _ paramtypes.ParamSet = (*Params)(nil) + +var ( + KeyFeeTiers = []byte("FeeTiers") + DefaultFeeTiers []uint64 = []uint64{0, 1, 2, 3, 4, 5, 10, 20, 50, 100, 150, 200} +) + +// ParamKeyTable the param key table for launch module +func ParamKeyTable() paramtypes.KeyTable { + return paramtypes.NewKeyTable().RegisterParamSet(&Params{}) +} + +// NewParams creates a new Params instance +func NewParams(feeTiers []uint64) Params { + return Params{FeeTiers: feeTiers} +} + +// DefaultParams returns a default set of parameters +func DefaultParams() Params { + return NewParams(DefaultFeeTiers) +} + +// ParamSetPairs get the params.ParamSet +func (p *Params) ParamSetPairs() paramtypes.ParamSetPairs { + return paramtypes.ParamSetPairs{ + paramtypes.NewParamSetPair(KeyFeeTiers, &p.FeeTiers, validateFeeTiers), + } +} + +// String implements the Stringer interface. +func (p Params) String() string { + out, _ := yaml.Marshal(p) + return string(out) +} + +// Validate validates the set of params +func (p Params) Validate() error { + if err := validateFeeTiers(p.FeeTiers); err != nil { + return err + } + return nil +} + +func validateFeeTiers(v interface{}) error { + feeTiers, ok := v.([]uint64) + if !ok { + return fmt.Errorf("invalid parameter type: %T", v) + } + + feeTierMap := make(map[uint64]bool) + for _, f := range feeTiers { + if _, ok := feeTierMap[f]; ok { + return fmt.Errorf("duplicate fee tier found") + } + feeTierMap[f] = true + } + return nil +} diff --git a/x/dex/types/params.pb.go b/x/dex/types/params.pb.go new file mode 100644 index 000000000..968ad5740 --- /dev/null +++ b/x/dex/types/params.pb.go @@ -0,0 +1,374 @@ +// Code generated by protoc-gen-gogo. DO NOT EDIT. +// source: duality/dex/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 module. +type Params struct { + FeeTiers []uint64 `protobuf:"varint,1,rep,packed,name=fee_tiers,json=feeTiers,proto3" json:"fee_tiers,omitempty"` +} + +func (m *Params) Reset() { *m = Params{} } +func (*Params) ProtoMessage() {} +func (*Params) Descriptor() ([]byte, []int) { + return fileDescriptor_0d9808a9c3c4a621, []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) GetFeeTiers() []uint64 { + if m != nil { + return m.FeeTiers + } + return nil +} + +func init() { + proto.RegisterType((*Params)(nil), "duality.dex.Params") +} + +func init() { proto.RegisterFile("duality/dex/params.proto", fileDescriptor_0d9808a9c3c4a621) } + +var fileDescriptor_0d9808a9c3c4a621 = []byte{ + // 174 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x48, 0x29, 0x4d, 0xcc, + 0xc9, 0x2c, 0xa9, 0xd4, 0x4f, 0x49, 0xad, 0xd0, 0x2f, 0x48, 0x2c, 0x4a, 0xcc, 0x2d, 0xd6, 0x2b, + 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x86, 0xca, 0xe8, 0xa5, 0xa4, 0x56, 0x48, 0x89, 0xa4, 0xe7, + 0xa7, 0xe7, 0x83, 0xc5, 0xf5, 0x41, 0x2c, 0x88, 0x12, 0x25, 0x6d, 0x2e, 0xb6, 0x00, 0xb0, 0x16, + 0x21, 0x69, 0x2e, 0xce, 0xb4, 0xd4, 0xd4, 0xf8, 0x92, 0xcc, 0xd4, 0xa2, 0x62, 0x09, 0x46, 0x05, + 0x66, 0x0d, 0x96, 0x20, 0x8e, 0xb4, 0xd4, 0xd4, 0x10, 0x10, 0xdf, 0x8a, 0x65, 0xc6, 0x02, 0x79, + 0x06, 0x27, 0xd7, 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, 0x4e, 0xcf, + 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x87, 0x5a, 0xaa, 0x9b, 0x93, 0x98, 0x54, + 0x0c, 0xe3, 0xe8, 0x57, 0x80, 0x5d, 0x57, 0x52, 0x59, 0x90, 0x5a, 0x9c, 0xc4, 0x06, 0xb6, 0xda, + 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0x16, 0x5d, 0xd1, 0xc7, 0xb9, 0x00, 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.FeeTiers) > 0 { + dAtA2 := make([]byte, len(m.FeeTiers)*10) + var j1 int + for _, num := range m.FeeTiers { + for num >= 1<<7 { + dAtA2[j1] = uint8(uint64(num)&0x7f | 0x80) + num >>= 7 + j1++ + } + dAtA2[j1] = uint8(num) + j1++ + } + i -= j1 + copy(dAtA[i:], dAtA2[:j1]) + i = encodeVarintParams(dAtA, i, uint64(j1)) + 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 + if len(m.FeeTiers) > 0 { + l = 0 + for _, e := range m.FeeTiers { + l += sovParams(uint64(e)) + } + n += 1 + sovParams(uint64(l)) + 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 == 0 { + var v uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowParams + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.FeeTiers = append(m.FeeTiers, v) + } else if wireType == 2 { + var packedLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowParams + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + packedLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if packedLen < 0 { + return ErrInvalidLengthParams + } + postIndex := iNdEx + packedLen + if postIndex < 0 { + return ErrInvalidLengthParams + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + var elementCount int + var count int + for _, integer := range dAtA[iNdEx:postIndex] { + if integer < 128 { + count++ + } + } + elementCount = count + if elementCount != 0 && len(m.FeeTiers) == 0 { + m.FeeTiers = make([]uint64, 0, elementCount) + } + for iNdEx < postIndex { + var v uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowParams + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.FeeTiers = append(m.FeeTiers, v) + } + } else { + return fmt.Errorf("proto: wrong wireType = %d for field FeeTiers", wireType) + } + 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/dex/types/pool.go b/x/dex/types/pool.go new file mode 100644 index 000000000..8c320277b --- /dev/null +++ b/x/dex/types/pool.go @@ -0,0 +1,291 @@ +package types + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" + math_utils "github.com/neutron-org/neutron/utils/math" + "github.com/neutron-org/neutron/x/dex/utils" +) + +func NewPool( + pairID *PairID, + centerTickIndexNormalized int64, + fee uint64, + id uint64, +) (*Pool, error) { + feeInt64 := utils.MustSafeUint64ToInt64(fee) + + id0To1 := &PoolReservesKey{ + TradePairID: NewTradePairIDFromMaker(pairID, pairID.Token1), + TickIndexTakerToMaker: centerTickIndexNormalized + feeInt64, + Fee: fee, + } + + upperTick, err := NewPoolReserves(id0To1) + if err != nil { + return nil, err + } + + lowerTick := NewPoolReservesFromCounterpart(upperTick) + + return &Pool{ + LowerTick0: lowerTick, + UpperTick1: upperTick, + ID: id, + }, nil +} + +func MustNewPool( + pairID *PairID, + centerTickIndexNormalized int64, + fee uint64, + id uint64, +) *Pool { + pool, err := NewPool(pairID, centerTickIndexNormalized, fee, id) + if err != nil { + panic("Error while creating new pool: " + err.Error()) + } + return pool +} + +func (p *Pool) CenterTickIndex() int64 { + feeInt64 := utils.MustSafeUint64ToInt64(p.Fee()) + return p.UpperTick1.Key.TickIndexTakerToMaker - feeInt64 +} + +func (p *Pool) Fee() uint64 { + return p.UpperTick1.Key.Fee +} + +func (p *Pool) GetLowerReserve0() sdk.Int { + return p.LowerTick0.ReservesMakerDenom +} + +func (p *Pool) GetUpperReserve1() sdk.Int { + return p.UpperTick1.ReservesMakerDenom +} + +func (p *Pool) Swap( + tradePairID *TradePairID, + maxAmountTakerIn sdk.Int, + maxAmountMakerOut *sdk.Int, +) (amountTakerIn, amountMakerOut sdk.Int) { + var takerReserves, makerReserves *PoolReserves + if tradePairID.IsMakerDenomToken0() { + makerReserves = p.LowerTick0 + takerReserves = p.UpperTick1 + } else { + makerReserves = p.UpperTick1 + takerReserves = p.LowerTick0 + } + + if maxAmountTakerIn.Equal(sdk.ZeroInt()) || + makerReserves.ReservesMakerDenom.Equal(sdk.ZeroInt()) { + return sdk.ZeroInt(), sdk.ZeroInt() + } + + maxOutGivenTakerIn := makerReserves.PriceTakerToMaker.MulInt(maxAmountTakerIn).TruncateInt() + possibleAmountsMakerOut := []sdk.Int{makerReserves.ReservesMakerDenom, maxOutGivenTakerIn} + if maxAmountMakerOut != nil { + possibleAmountsMakerOut = append(possibleAmountsMakerOut, *maxAmountMakerOut) + } + + // outAmount will be the smallest value of: + // a.) The available reserves1 + // b.) The most the user could get out given maxAmountIn0 (maxOutGivenIn1) + // c.) The maximum amount the user wants out (maxAmountOut1) + amountMakerOut = utils.MinIntArr(possibleAmountsMakerOut) + amountTakerIn = math_utils.NewPrecDecFromInt(amountMakerOut). + Quo(makerReserves.PriceTakerToMaker). + Ceil(). + TruncateInt() + + takerReserves.ReservesMakerDenom = takerReserves.ReservesMakerDenom.Add(amountTakerIn) + makerReserves.ReservesMakerDenom = makerReserves.ReservesMakerDenom.Sub(amountMakerOut) + + return amountTakerIn, amountMakerOut +} + +// Mutates the Pool object and returns relevant change variables. Deposit is not committed until +// pool.save() is called or the underlying ticks are saved; this method does not use any keeper methods. +func (p *Pool) Deposit( + maxAmount0, + maxAmount1, + existingShares sdk.Int, + autoswap bool, +) (inAmount0, inAmount1 sdk.Int, outShares sdk.Coin) { + lowerReserve0 := &p.LowerTick0.ReservesMakerDenom + upperReserve1 := &p.UpperTick1.ReservesMakerDenom + + inAmount0, inAmount1 = CalcGreatestMatchingRatio( + *lowerReserve0, + *upperReserve1, + maxAmount0, + maxAmount1, + ) + + if inAmount0.Equal(sdk.ZeroInt()) && inAmount1.Equal(sdk.ZeroInt()) { + return sdk.ZeroInt(), sdk.ZeroInt(), sdk.Coin{Denom: p.GetPoolDenom()} + } + + outShares = p.CalcSharesMinted(inAmount0, inAmount1, existingShares) + + if autoswap { + residualAmount0 := maxAmount0.Sub(inAmount0) + residualAmount1 := maxAmount1.Sub(inAmount1) + + // NOTE: Currently not doing anything with the error, + // but added error handling to all of the new functions for autoswap. + // Open to changing it however. + residualShares, _ := p.CalcResidualSharesMinted(residualAmount0, residualAmount1) + + outShares = outShares.Add(residualShares) + + inAmount0 = maxAmount0 + inAmount1 = maxAmount1 + } + + *lowerReserve0 = lowerReserve0.Add(inAmount0) + *upperReserve1 = upperReserve1.Add(inAmount1) + + return inAmount0, inAmount1, outShares +} + +func (p *Pool) GetPoolDenom() string { + return NewPoolDenom(p.ID) +} + +func (p *Pool) Price(tradePairID *TradePairID) math_utils.PrecDec { + if tradePairID.IsTakerDenomToken0() { + return p.UpperTick1.PriceTakerToMaker + } + + return p.LowerTick0.PriceTakerToMaker +} + +func (p *Pool) MustCalcPrice1To0Center() math_utils.PrecDec { + // NOTE: We can safely call the error-less version of CalcPrice here because the pool object + // has already been initialized with an upper and lower tick which satisfy a check for IsTickOutOfRange + return MustCalcPrice(-1 * p.CenterTickIndex()) +} + +func (p *Pool) CalcSharesMinted( + amount0 sdk.Int, + amount1 sdk.Int, + existingShares sdk.Int, +) (sharesMinted sdk.Coin) { + price1To0Center := p.MustCalcPrice1To0Center() + valueMintedToken0 := CalcAmountAsToken0(amount0, amount1, price1To0Center) + + valueExistingToken0 := CalcAmountAsToken0( + p.LowerTick0.ReservesMakerDenom, + p.UpperTick1.ReservesMakerDenom, + price1To0Center, + ) + var sharesMintedAmount sdk.Int + if valueExistingToken0.GT(math_utils.ZeroPrecDec()) { + sharesMintedAmount = valueMintedToken0.MulInt(existingShares). + Quo(valueExistingToken0). + TruncateInt() + } else { + sharesMintedAmount = valueMintedToken0.TruncateInt() + } + + return sdk.Coin{Denom: p.GetPoolDenom(), Amount: sharesMintedAmount} +} + +func (p *Pool) CalcResidualSharesMinted( + residualAmount0 sdk.Int, + residualAmount1 sdk.Int, +) (sharesMinted sdk.Coin, err error) { + fee := CalcFee(p.UpperTick1.Key.TickIndexTakerToMaker, p.LowerTick0.Key.TickIndexTakerToMaker) + valueMintedToken0, err := CalcResidualValue( + residualAmount0, + residualAmount1, + p.LowerTick0.PriceTakerToMaker, + fee, + ) + if err != nil { + return sdk.Coin{Denom: p.GetPoolDenom()}, err + } + + return sdk.Coin{Denom: p.GetPoolDenom(), Amount: valueMintedToken0.TruncateInt()}, nil +} + +func (p *Pool) RedeemValue(sharesToRemove, totalShares sdk.Int) (outAmount0, outAmount1 sdk.Int) { + reserves0 := &p.LowerTick0.ReservesMakerDenom + reserves1 := &p.UpperTick1.ReservesMakerDenom + // outAmount1 = ownershipRatio * reserves1 + // = (sharesToRemove / totalShares) * reserves1 + // = (reserves1 * sharesToRemove ) / totalShares + outAmount1 = sdk.NewDecFromInt(reserves1.Mul(sharesToRemove)).QuoInt(totalShares).TruncateInt() + // outAmount0 = ownershipRatio * reserves1 + // = (sharesToRemove / totalShares) * reserves1 + // = (reserves1 * sharesToRemove ) / totalShares + outAmount0 = sdk.NewDecFromInt(reserves0.Mul(sharesToRemove)).QuoInt(totalShares).TruncateInt() + + return outAmount0, outAmount1 +} + +func (p *Pool) Withdraw(sharesToRemove, totalShares sdk.Int) (outAmount0, outAmount1 sdk.Int) { + reserves0 := &p.LowerTick0.ReservesMakerDenom + reserves1 := &p.UpperTick1.ReservesMakerDenom + outAmount0, outAmount1 = p.RedeemValue(sharesToRemove, totalShares) + *reserves0 = reserves0.Sub(outAmount0) + *reserves1 = reserves1.Sub(outAmount1) + + return outAmount0, outAmount1 +} + +// Balance trueAmount1 to the pool ratio +func CalcGreatestMatchingRatio( + targetAmount0 sdk.Int, + targetAmount1 sdk.Int, + amount0 sdk.Int, + amount1 sdk.Int, +) (resultAmount0, resultAmount1 sdk.Int) { + targetAmount0Dec := sdk.NewDecFromInt(targetAmount0) + targetAmount1Dec := sdk.NewDecFromInt(targetAmount1) + + // See spec: https://www.notion.so/dualityxyz/Autoswap-Spec-e856fa7b2438403c95147010d479b98c + if targetAmount1.GT(sdk.ZeroInt()) { + resultAmount0 = sdk.MinInt( + amount0, + sdk.NewDecFromInt(amount1).Mul(targetAmount0Dec).Quo(targetAmount1Dec).TruncateInt()) + } else { + resultAmount0 = amount0 + } + + if targetAmount0.GT(sdk.ZeroInt()) { + resultAmount1 = sdk.MinInt( + amount1, + sdk.NewDecFromInt(amount0).Mul(targetAmount1Dec).Quo(targetAmount0Dec).TruncateInt()) + } else { + resultAmount1 = amount1 + } + + return resultAmount0, resultAmount1 +} + +func CalcResidualValue( + amount0, amount1 sdk.Int, + priceLowerTakerToMaker math_utils.PrecDec, + fee int64, +) (math_utils.PrecDec, error) { + // ResidualValue = Amount0 * (Price1to0Center / Price1to0Upper) + Amount1 * Price1to0Lower + amount0Discount, err := CalcPrice(-fee) + if err != nil { + return math_utils.ZeroPrecDec(), err + } + + return amount0Discount.MulInt(amount0).Add(priceLowerTakerToMaker.MulInt(amount1)), nil +} + +func CalcFee(upperTickIndex, lowerTickIndex int64) int64 { + return (upperTickIndex - lowerTickIndex) / 2 +} + +func CalcAmountAsToken0(amount0, amount1 sdk.Int, price1To0 math_utils.PrecDec) math_utils.PrecDec { + amount0Dec := math_utils.NewPrecDecFromInt(amount0) + + return amount0Dec.Add(price1To0.MulInt(amount1)) +} diff --git a/x/dex/types/pool.pb.go b/x/dex/types/pool.pb.go new file mode 100644 index 000000000..bfacf593e --- /dev/null +++ b/x/dex/types/pool.pb.go @@ -0,0 +1,424 @@ +// Code generated by protoc-gen-gogo. DO NOT EDIT. +// source: duality/dex/pool.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 + +type Pool struct { + ID uint64 `protobuf:"varint,1,opt,name=ID,proto3" json:"ID,omitempty"` + LowerTick0 *PoolReserves `protobuf:"bytes,2,opt,name=lower_tick0,json=lowerTick0,proto3" json:"lower_tick0,omitempty"` + UpperTick1 *PoolReserves `protobuf:"bytes,3,opt,name=upper_tick1,json=upperTick1,proto3" json:"upper_tick1,omitempty"` +} + +func (m *Pool) Reset() { *m = Pool{} } +func (m *Pool) String() string { return proto.CompactTextString(m) } +func (*Pool) ProtoMessage() {} +func (*Pool) Descriptor() ([]byte, []int) { + return fileDescriptor_458bee7d4cc3fc09, []int{0} +} +func (m *Pool) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Pool) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Pool.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 *Pool) XXX_Merge(src proto.Message) { + xxx_messageInfo_Pool.Merge(m, src) +} +func (m *Pool) XXX_Size() int { + return m.Size() +} +func (m *Pool) XXX_DiscardUnknown() { + xxx_messageInfo_Pool.DiscardUnknown(m) +} + +var xxx_messageInfo_Pool proto.InternalMessageInfo + +func (m *Pool) GetID() uint64 { + if m != nil { + return m.ID + } + return 0 +} + +func (m *Pool) GetLowerTick0() *PoolReserves { + if m != nil { + return m.LowerTick0 + } + return nil +} + +func (m *Pool) GetUpperTick1() *PoolReserves { + if m != nil { + return m.UpperTick1 + } + return nil +} + +func init() { + proto.RegisterType((*Pool)(nil), "duality.dex.Pool") +} + +func init() { proto.RegisterFile("duality/dex/pool.proto", fileDescriptor_458bee7d4cc3fc09) } + +var fileDescriptor_458bee7d4cc3fc09 = []byte{ + // 229 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x4b, 0x29, 0x4d, 0xcc, + 0xc9, 0x2c, 0xa9, 0xd4, 0x4f, 0x49, 0xad, 0xd0, 0x2f, 0xc8, 0xcf, 0xcf, 0xd1, 0x2b, 0x28, 0xca, + 0x2f, 0xc9, 0x17, 0xe2, 0x86, 0x8a, 0xeb, 0xa5, 0xa4, 0x56, 0x48, 0x89, 0xa4, 0xe7, 0xa7, 0xe7, + 0x83, 0xc5, 0xf5, 0x41, 0x2c, 0x88, 0x12, 0x29, 0x79, 0x74, 0xad, 0xf1, 0x45, 0xa9, 0xc5, 0xa9, + 0x45, 0x65, 0xa9, 0xc5, 0x10, 0x05, 0x4a, 0x7d, 0x8c, 0x5c, 0x2c, 0x01, 0xf9, 0xf9, 0x39, 0x42, + 0x7c, 0x5c, 0x4c, 0x9e, 0x2e, 0x12, 0x8c, 0x0a, 0x8c, 0x1a, 0x2c, 0x41, 0x4c, 0x9e, 0x2e, 0x42, + 0x56, 0x5c, 0xdc, 0x39, 0xf9, 0xe5, 0xa9, 0x45, 0xf1, 0x25, 0x99, 0xc9, 0xd9, 0x06, 0x12, 0x4c, + 0x0a, 0x8c, 0x1a, 0xdc, 0x46, 0x92, 0x7a, 0x48, 0x56, 0xea, 0x81, 0xf4, 0x05, 0x41, 0x8d, 0x0b, + 0xe2, 0x02, 0xab, 0x0e, 0x01, 0x29, 0x06, 0xe9, 0x2d, 0x2d, 0x28, 0x80, 0xea, 0x35, 0x94, 0x60, + 0x26, 0xa8, 0x17, 0xac, 0x1a, 0xa4, 0xd7, 0xd0, 0xc9, 0xf5, 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, 0xb4, 0xd3, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xf5, + 0xa1, 0x46, 0xe9, 0xe6, 0x24, 0x26, 0x15, 0xc3, 0x38, 0xfa, 0x15, 0x60, 0x5f, 0x96, 0x54, 0x16, + 0xa4, 0x16, 0x27, 0xb1, 0x81, 0xbd, 0x67, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x8e, 0x0b, 0xf6, + 0xad, 0x3c, 0x01, 0x00, 0x00, +} + +func (m *Pool) 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 *Pool) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Pool) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.UpperTick1 != nil { + { + size, err := m.UpperTick1.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintPool(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1a + } + if m.LowerTick0 != nil { + { + size, err := m.LowerTick0.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintPool(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } + if m.ID != 0 { + i = encodeVarintPool(dAtA, i, uint64(m.ID)) + i-- + dAtA[i] = 0x8 + } + return len(dAtA) - i, nil +} + +func encodeVarintPool(dAtA []byte, offset int, v uint64) int { + offset -= sovPool(v) + base := offset + for v >= 1<<7 { + dAtA[offset] = uint8(v&0x7f | 0x80) + v >>= 7 + offset++ + } + dAtA[offset] = uint8(v) + return base +} +func (m *Pool) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.ID != 0 { + n += 1 + sovPool(uint64(m.ID)) + } + if m.LowerTick0 != nil { + l = m.LowerTick0.Size() + n += 1 + l + sovPool(uint64(l)) + } + if m.UpperTick1 != nil { + l = m.UpperTick1.Size() + n += 1 + l + sovPool(uint64(l)) + } + return n +} + +func sovPool(x uint64) (n int) { + return (math_bits.Len64(x|1) + 6) / 7 +} +func sozPool(x uint64) (n int) { + return sovPool(uint64((x << 1) ^ uint64((int64(x) >> 63)))) +} +func (m *Pool) 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 ErrIntOverflowPool + } + 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: Pool: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: Pool: 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 ErrIntOverflowPool + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.ID |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field LowerTick0", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowPool + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthPool + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthPool + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.LowerTick0 == nil { + m.LowerTick0 = &PoolReserves{} + } + if err := m.LowerTick0.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field UpperTick1", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowPool + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthPool + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthPool + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.UpperTick1 == nil { + m.UpperTick1 = &PoolReserves{} + } + if err := m.UpperTick1.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipPool(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthPool + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func skipPool(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, ErrIntOverflowPool + } + 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, ErrIntOverflowPool + } + 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, ErrIntOverflowPool + } + 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, ErrInvalidLengthPool + } + iNdEx += length + case 3: + depth++ + case 4: + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupPool + } + depth-- + case 5: + iNdEx += 4 + default: + return 0, fmt.Errorf("proto: illegal wireType %d", wireType) + } + if iNdEx < 0 { + return 0, ErrInvalidLengthPool + } + if depth == 0 { + return iNdEx, nil + } + } + return 0, io.ErrUnexpectedEOF +} + +var ( + ErrInvalidLengthPool = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowPool = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupPool = fmt.Errorf("proto: unexpected end of group") +) diff --git a/x/dex/types/pool_denom.go b/x/dex/types/pool_denom.go new file mode 100644 index 000000000..f27660d7d --- /dev/null +++ b/x/dex/types/pool_denom.go @@ -0,0 +1,41 @@ +package types + +import ( + "fmt" + "regexp" + "strconv" +) + +const ( + PoolDenomPrefix = "duality/pool/" + PoolDenomRegexpStr = "^" + PoolDenomPrefix + `(\d+)` + "$" +) + +var PoolDenomRegexp = regexp.MustCompile(PoolDenomRegexpStr) + +func NewPoolDenom(poolID uint64) string { + return fmt.Sprintf("%s%d", PoolDenomPrefix, poolID) +} + +func ValidatePoolDenom(denom string) error { + if !PoolDenomRegexp.MatchString(denom) { + return ErrInvalidPoolDenom + } + + return nil +} + +func ParsePoolIDFromDenom(denom string) (uint64, error) { + res := PoolDenomRegexp.FindStringSubmatch(denom) + if len(res) != 2 { + return 0, ErrInvalidPoolDenom + } + idStr := res[1] + + idInt, err := strconv.ParseUint(idStr, 10, 0) + if err != nil { + return 0, ErrInvalidPoolDenom + } + + return idInt, nil +} diff --git a/x/dex/types/pool_denom_test.go b/x/dex/types/pool_denom_test.go new file mode 100644 index 000000000..9c609e797 --- /dev/null +++ b/x/dex/types/pool_denom_test.go @@ -0,0 +1,55 @@ +package types_test + +import ( + "testing" + + . "github.com/neutron-org/neutron/x/dex/types" + "github.com/stretchr/testify/require" +) + +func TestParsePoolIDFromDenom(t *testing.T) { + for _, tc := range []struct { + desc string + denom string + expected uint64 + valid bool + }{ + { + desc: "valid denom", + denom: "duality/pool/0", + expected: 0, + valid: true, + }, + { + desc: "valid denom long", + denom: "duality/pool/999999999", + expected: 999999999, + valid: true, + }, + { + desc: "invalid format 1", + denom: "/duality/pool/0", + valid: false, + }, + { + desc: "invalid format 2", + denom: "duality/pool/0/", + valid: false, + }, + { + desc: "invalid denom prefix", + denom: "INVALID/pool/0", + valid: false, + }, + } { + t.Run(tc.desc, func(t *testing.T) { + id, err := ParsePoolIDFromDenom(tc.denom) + if tc.valid { + require.NoError(t, err) + require.Equal(t, tc.expected, id) + } else { + require.Error(t, err) + } + }) + } +} diff --git a/x/dex/types/pool_liquidity.go b/x/dex/types/pool_liquidity.go new file mode 100644 index 000000000..47e2eefd6 --- /dev/null +++ b/x/dex/types/pool_liquidity.go @@ -0,0 +1,26 @@ +package types + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" + math_utils "github.com/neutron-org/neutron/utils/math" +) + +type PoolLiquidity struct { + TradePairID *TradePairID + Pool *Pool +} + +func (pl *PoolLiquidity) Swap( + maxAmountTakerDenomIn sdk.Int, + maxAmountMakerDenomOut *sdk.Int, +) (inAmount, outAmount sdk.Int) { + return pl.Pool.Swap( + pl.TradePairID, + maxAmountTakerDenomIn, + maxAmountMakerDenomOut, + ) +} + +func (pl *PoolLiquidity) Price() math_utils.PrecDec { + return pl.Pool.Price(pl.TradePairID) +} diff --git a/x/dex/types/pool_metadata.go b/x/dex/types/pool_metadata.go new file mode 100644 index 000000000..eff09212b --- /dev/null +++ b/x/dex/types/pool_metadata.go @@ -0,0 +1,5 @@ +package types + +func NewPoolMetadata(pairID *PairID, tick int64, fee uint64, poolID uint64) PoolMetadata { + return PoolMetadata{PairID: pairID, Tick: tick, Fee: fee, ID: poolID} +} diff --git a/x/dex/types/pool_metadata.pb.go b/x/dex/types/pool_metadata.pb.go new file mode 100644 index 000000000..610f79cfc --- /dev/null +++ b/x/dex/types/pool_metadata.pb.go @@ -0,0 +1,432 @@ +// Code generated by protoc-gen-gogo. DO NOT EDIT. +// source: duality/dex/pool_metadata.proto + +package types + +import ( + fmt "fmt" + 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 + +type PoolMetadata struct { + ID uint64 `protobuf:"varint,1,opt,name=ID,proto3" json:"ID,omitempty"` + Tick int64 `protobuf:"varint,2,opt,name=tick,proto3" json:"tick,omitempty"` + Fee uint64 `protobuf:"varint,3,opt,name=fee,proto3" json:"fee,omitempty"` + PairID *PairID `protobuf:"bytes,4,opt,name=pairID,proto3" json:"pairID,omitempty"` +} + +func (m *PoolMetadata) Reset() { *m = PoolMetadata{} } +func (m *PoolMetadata) String() string { return proto.CompactTextString(m) } +func (*PoolMetadata) ProtoMessage() {} +func (*PoolMetadata) Descriptor() ([]byte, []int) { + return fileDescriptor_20ad68f12715e384, []int{0} +} +func (m *PoolMetadata) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *PoolMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_PoolMetadata.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 *PoolMetadata) XXX_Merge(src proto.Message) { + xxx_messageInfo_PoolMetadata.Merge(m, src) +} +func (m *PoolMetadata) XXX_Size() int { + return m.Size() +} +func (m *PoolMetadata) XXX_DiscardUnknown() { + xxx_messageInfo_PoolMetadata.DiscardUnknown(m) +} + +var xxx_messageInfo_PoolMetadata proto.InternalMessageInfo + +func (m *PoolMetadata) GetID() uint64 { + if m != nil { + return m.ID + } + return 0 +} + +func (m *PoolMetadata) GetTick() int64 { + if m != nil { + return m.Tick + } + return 0 +} + +func (m *PoolMetadata) GetFee() uint64 { + if m != nil { + return m.Fee + } + return 0 +} + +func (m *PoolMetadata) GetPairID() *PairID { + if m != nil { + return m.PairID + } + return nil +} + +func init() { + proto.RegisterType((*PoolMetadata)(nil), "duality.dex.PoolMetadata") +} + +func init() { proto.RegisterFile("duality/dex/pool_metadata.proto", fileDescriptor_20ad68f12715e384) } + +var fileDescriptor_20ad68f12715e384 = []byte{ + // 224 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4f, 0x29, 0x4d, 0xcc, + 0xc9, 0x2c, 0xa9, 0xd4, 0x4f, 0x49, 0xad, 0xd0, 0x2f, 0xc8, 0xcf, 0xcf, 0x89, 0xcf, 0x4d, 0x2d, + 0x49, 0x4c, 0x49, 0x2c, 0x49, 0xd4, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x86, 0x2a, 0xd0, + 0x4b, 0x49, 0xad, 0x90, 0x92, 0x44, 0x51, 0x9d, 0x98, 0x59, 0x14, 0x9f, 0x99, 0x02, 0x51, 0xa7, + 0x54, 0xc8, 0xc5, 0x13, 0x90, 0x9f, 0x9f, 0xe3, 0x0b, 0xd5, 0x2d, 0xc4, 0xc7, 0xc5, 0xe4, 0xe9, + 0x22, 0xc1, 0xa8, 0xc0, 0xa8, 0xc1, 0x12, 0xc4, 0xe4, 0xe9, 0x22, 0x24, 0xc4, 0xc5, 0x52, 0x92, + 0x99, 0x9c, 0x2d, 0xc1, 0xa4, 0xc0, 0xa8, 0xc1, 0x1c, 0x04, 0x66, 0x0b, 0x09, 0x70, 0x31, 0xa7, + 0xa5, 0xa6, 0x4a, 0x30, 0x83, 0x15, 0x81, 0x98, 0x42, 0xda, 0x5c, 0x6c, 0x20, 0x63, 0x3d, 0x5d, + 0x24, 0x58, 0x14, 0x18, 0x35, 0xb8, 0x8d, 0x84, 0xf5, 0x90, 0xac, 0xd7, 0x0b, 0x00, 0x4b, 0x05, + 0x41, 0x95, 0x38, 0xb9, 0x9e, 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, 0x76, + 0x7a, 0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, 0x7e, 0xae, 0x3e, 0xd4, 0x00, 0xdd, 0x9c, 0xc4, + 0xa4, 0x62, 0x18, 0x47, 0xbf, 0x02, 0xec, 0x83, 0x92, 0xca, 0x82, 0xd4, 0xe2, 0x24, 0x36, 0xb0, + 0x07, 0x8c, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x45, 0x67, 0x83, 0xda, 0x0b, 0x01, 0x00, 0x00, +} + +func (m *PoolMetadata) 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 *PoolMetadata) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *PoolMetadata) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.PairID != nil { + { + size, err := m.PairID.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintPoolMetadata(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x22 + } + if m.Fee != 0 { + i = encodeVarintPoolMetadata(dAtA, i, uint64(m.Fee)) + i-- + dAtA[i] = 0x18 + } + if m.Tick != 0 { + i = encodeVarintPoolMetadata(dAtA, i, uint64(m.Tick)) + i-- + dAtA[i] = 0x10 + } + if m.ID != 0 { + i = encodeVarintPoolMetadata(dAtA, i, uint64(m.ID)) + i-- + dAtA[i] = 0x8 + } + return len(dAtA) - i, nil +} + +func encodeVarintPoolMetadata(dAtA []byte, offset int, v uint64) int { + offset -= sovPoolMetadata(v) + base := offset + for v >= 1<<7 { + dAtA[offset] = uint8(v&0x7f | 0x80) + v >>= 7 + offset++ + } + dAtA[offset] = uint8(v) + return base +} +func (m *PoolMetadata) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.ID != 0 { + n += 1 + sovPoolMetadata(uint64(m.ID)) + } + if m.Tick != 0 { + n += 1 + sovPoolMetadata(uint64(m.Tick)) + } + if m.Fee != 0 { + n += 1 + sovPoolMetadata(uint64(m.Fee)) + } + if m.PairID != nil { + l = m.PairID.Size() + n += 1 + l + sovPoolMetadata(uint64(l)) + } + return n +} + +func sovPoolMetadata(x uint64) (n int) { + return (math_bits.Len64(x|1) + 6) / 7 +} +func sozPoolMetadata(x uint64) (n int) { + return sovPoolMetadata(uint64((x << 1) ^ uint64((int64(x) >> 63)))) +} +func (m *PoolMetadata) 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 ErrIntOverflowPoolMetadata + } + 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: PoolMetadata: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: PoolMetadata: 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 ErrIntOverflowPoolMetadata + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.ID |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 2: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Tick", wireType) + } + m.Tick = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowPoolMetadata + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Tick |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 3: + 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 ErrIntOverflowPoolMetadata + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Fee |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field PairID", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowPoolMetadata + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthPoolMetadata + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthPoolMetadata + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.PairID == nil { + m.PairID = &PairID{} + } + if err := m.PairID.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipPoolMetadata(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthPoolMetadata + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func skipPoolMetadata(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, ErrIntOverflowPoolMetadata + } + 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, ErrIntOverflowPoolMetadata + } + 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, ErrIntOverflowPoolMetadata + } + 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, ErrInvalidLengthPoolMetadata + } + iNdEx += length + case 3: + depth++ + case 4: + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupPoolMetadata + } + depth-- + case 5: + iNdEx += 4 + default: + return 0, fmt.Errorf("proto: illegal wireType %d", wireType) + } + if iNdEx < 0 { + return 0, ErrInvalidLengthPoolMetadata + } + if depth == 0 { + return iNdEx, nil + } + } + return 0, io.ErrUnexpectedEOF +} + +var ( + ErrInvalidLengthPoolMetadata = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowPoolMetadata = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupPoolMetadata = fmt.Errorf("proto: unexpected end of group") +) diff --git a/x/dex/types/pool_reserves.go b/x/dex/types/pool_reserves.go new file mode 100644 index 000000000..0d523338a --- /dev/null +++ b/x/dex/types/pool_reserves.go @@ -0,0 +1,52 @@ +package types + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" +) + +func (p PoolReserves) HasToken() bool { + return p.ReservesMakerDenom.GT(sdk.ZeroInt()) +} + +func NewPoolReservesFromCounterpart( + counterpart *PoolReserves, +) *PoolReserves { + thisID := counterpart.Key.Counterpart() + return &PoolReserves{ + Key: thisID, + ReservesMakerDenom: sdk.ZeroInt(), + PriceTakerToMaker: counterpart.PriceOppositeTakerToMaker, + PriceOppositeTakerToMaker: counterpart.PriceTakerToMaker, + } +} + +func NewPoolReserves( + poolReservesID *PoolReservesKey, +) (*PoolReserves, error) { + priceTakerToMaker, err := poolReservesID.PriceTakerToMaker() + if err != nil { + return nil, err + } + counterpartID := poolReservesID.Counterpart() + priceOppositeTakerToMaker, err := counterpartID.PriceTakerToMaker() + if err != nil { + return nil, err + } + + return &PoolReserves{ + Key: poolReservesID, + ReservesMakerDenom: sdk.ZeroInt(), + PriceTakerToMaker: priceTakerToMaker, + PriceOppositeTakerToMaker: priceOppositeTakerToMaker, + }, nil +} + +func MustNewPoolReserves( + poolReservesID *PoolReservesKey, +) *PoolReserves { + poolReserves, err := NewPoolReserves(poolReservesID) + if err != nil { + panic(err) + } + return poolReserves +} diff --git a/x/dex/types/pool_reserves.pb.go b/x/dex/types/pool_reserves.pb.go new file mode 100644 index 000000000..b2020007b --- /dev/null +++ b/x/dex/types/pool_reserves.pb.go @@ -0,0 +1,734 @@ +// Code generated by protoc-gen-gogo. DO NOT EDIT. +// source: duality/dex/pool_reserves.proto + +package types + +import ( + fmt "fmt" + github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" + github_com_duality_labs_duality_utils_math "github.com/neutron-org/neutron/utils/math" + 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 + +type PoolReservesKey struct { + TradePairID *TradePairID `protobuf:"bytes,1,opt,name=tradePairID,proto3" json:"tradePairID,omitempty"` + TickIndexTakerToMaker int64 `protobuf:"varint,2,opt,name=TickIndexTakerToMaker,proto3" json:"TickIndexTakerToMaker,omitempty"` + Fee uint64 `protobuf:"varint,3,opt,name=Fee,proto3" json:"Fee,omitempty"` +} + +func (m *PoolReservesKey) Reset() { *m = PoolReservesKey{} } +func (m *PoolReservesKey) String() string { return proto.CompactTextString(m) } +func (*PoolReservesKey) ProtoMessage() {} +func (*PoolReservesKey) Descriptor() ([]byte, []int) { + return fileDescriptor_d37077b416662cb1, []int{0} +} +func (m *PoolReservesKey) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *PoolReservesKey) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_PoolReservesKey.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 *PoolReservesKey) XXX_Merge(src proto.Message) { + xxx_messageInfo_PoolReservesKey.Merge(m, src) +} +func (m *PoolReservesKey) XXX_Size() int { + return m.Size() +} +func (m *PoolReservesKey) XXX_DiscardUnknown() { + xxx_messageInfo_PoolReservesKey.DiscardUnknown(m) +} + +var xxx_messageInfo_PoolReservesKey proto.InternalMessageInfo + +func (m *PoolReservesKey) GetTradePairID() *TradePairID { + if m != nil { + return m.TradePairID + } + return nil +} + +func (m *PoolReservesKey) GetTickIndexTakerToMaker() int64 { + if m != nil { + return m.TickIndexTakerToMaker + } + return 0 +} + +func (m *PoolReservesKey) GetFee() uint64 { + if m != nil { + return m.Fee + } + return 0 +} + +type PoolReserves struct { + Key *PoolReservesKey `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"` + ReservesMakerDenom github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,opt,name=reservesMakerDenom,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"reservesMakerDenom" yaml:"reservesMakerDenom"` + PriceTakerToMaker github_com_duality_labs_duality_utils_math.PrecDec `protobuf:"bytes,3,opt,name=priceTakerToMaker,proto3,customtype=github.com/neutron-org/neutron/utils/math.PrecDec" json:"priceTakerToMaker" yaml:"priceTakerToMaker"` + PriceOppositeTakerToMaker github_com_duality_labs_duality_utils_math.PrecDec `protobuf:"bytes,4,opt,name=priceOppositeTakerToMaker,proto3,customtype=github.com/neutron-org/neutron/utils/math.PrecDec" json:"priceOppositeTakerToMaker" yaml:"priceOppositeTakerToMaker"` +} + +func (m *PoolReserves) Reset() { *m = PoolReserves{} } +func (m *PoolReserves) String() string { return proto.CompactTextString(m) } +func (*PoolReserves) ProtoMessage() {} +func (*PoolReserves) Descriptor() ([]byte, []int) { + return fileDescriptor_d37077b416662cb1, []int{1} +} +func (m *PoolReserves) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *PoolReserves) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_PoolReserves.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 *PoolReserves) XXX_Merge(src proto.Message) { + xxx_messageInfo_PoolReserves.Merge(m, src) +} +func (m *PoolReserves) XXX_Size() int { + return m.Size() +} +func (m *PoolReserves) XXX_DiscardUnknown() { + xxx_messageInfo_PoolReserves.DiscardUnknown(m) +} + +var xxx_messageInfo_PoolReserves proto.InternalMessageInfo + +func (m *PoolReserves) GetKey() *PoolReservesKey { + if m != nil { + return m.Key + } + return nil +} + +func init() { + proto.RegisterType((*PoolReservesKey)(nil), "duality.dex.PoolReservesKey") + proto.RegisterType((*PoolReserves)(nil), "duality.dex.PoolReserves") +} + +func init() { proto.RegisterFile("duality/dex/pool_reserves.proto", fileDescriptor_d37077b416662cb1) } + +var fileDescriptor_d37077b416662cb1 = []byte{ + // 441 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x93, 0xc1, 0x8a, 0xd3, 0x40, + 0x18, 0xc7, 0x3b, 0xa6, 0x08, 0x4e, 0x05, 0x75, 0x50, 0xc8, 0x2e, 0x92, 0x94, 0x1c, 0xa4, 0x20, + 0x3b, 0x81, 0xd5, 0xd3, 0x1e, 0x97, 0x2a, 0x14, 0x11, 0xcb, 0xd0, 0x93, 0x97, 0x32, 0x4d, 0x3e, + 0xba, 0x43, 0x92, 0x4e, 0x98, 0x99, 0x4a, 0x83, 0x2f, 0xa1, 0x07, 0x0f, 0xbe, 0x82, 0x6f, 0xe0, + 0x1b, 0xec, 0x71, 0x8f, 0xe2, 0x21, 0x48, 0x7b, 0xdb, 0x63, 0x9f, 0x40, 0x32, 0xcd, 0x62, 0x6a, + 0xb3, 0x78, 0xf0, 0x34, 0x93, 0xf9, 0x7e, 0xf3, 0x9f, 0x5f, 0x66, 0xf8, 0xb0, 0x1f, 0x2f, 0x79, + 0x2a, 0x4c, 0x11, 0xc6, 0xb0, 0x0a, 0x73, 0x29, 0xd3, 0xa9, 0x02, 0x0d, 0xea, 0x03, 0x68, 0x9a, + 0x2b, 0x69, 0x24, 0xe9, 0xd5, 0x00, 0x8d, 0x61, 0x75, 0xfc, 0x78, 0x2e, 0xe7, 0xd2, 0xae, 0x87, + 0xd5, 0x6c, 0x87, 0x1c, 0xef, 0x65, 0x18, 0xc5, 0x63, 0x98, 0xe6, 0x5c, 0xa8, 0xa9, 0x88, 0x77, + 0x40, 0xf0, 0x05, 0xe1, 0x07, 0x63, 0x29, 0x53, 0x56, 0x47, 0xbf, 0x81, 0x82, 0x9c, 0xe1, 0x9e, + 0x45, 0xc7, 0x5c, 0xa8, 0xd1, 0xd0, 0x45, 0x7d, 0x34, 0xe8, 0x9d, 0xba, 0xb4, 0x71, 0x1a, 0x9d, + 0xfc, 0xa9, 0xb3, 0x26, 0x4c, 0x5e, 0xe2, 0x27, 0x13, 0x11, 0x25, 0xa3, 0x45, 0x0c, 0xab, 0x09, + 0x4f, 0x40, 0x4d, 0xe4, 0xdb, 0x6a, 0x70, 0xef, 0xf4, 0xd1, 0xc0, 0x61, 0xed, 0x45, 0xf2, 0x10, + 0x3b, 0xaf, 0x01, 0x5c, 0xa7, 0x8f, 0x06, 0x5d, 0x56, 0x4d, 0x83, 0x6f, 0x5d, 0x7c, 0xbf, 0xe9, + 0x45, 0x28, 0x76, 0x12, 0x28, 0x6a, 0x99, 0xa7, 0x7b, 0x32, 0x7f, 0xf9, 0xb3, 0x0a, 0x24, 0x9f, + 0x11, 0x26, 0x37, 0xf7, 0x65, 0x0f, 0x19, 0xc2, 0x42, 0x66, 0x56, 0xe3, 0xde, 0x39, 0xbf, 0x2c, + 0xfd, 0xce, 0xcf, 0xd2, 0x7f, 0x36, 0x17, 0xe6, 0x62, 0x39, 0xa3, 0x91, 0xcc, 0xc2, 0x48, 0xea, + 0x4c, 0xea, 0x7a, 0x38, 0xd1, 0x71, 0x12, 0x9a, 0x22, 0x07, 0x4d, 0x47, 0x0b, 0x73, 0x5d, 0xfa, + 0x2d, 0x59, 0xdb, 0xd2, 0x3f, 0x2a, 0x78, 0x96, 0x9e, 0x05, 0x87, 0xb5, 0x80, 0xb5, 0x6c, 0x20, + 0x5f, 0x11, 0x7e, 0x94, 0x2b, 0x11, 0xc1, 0xde, 0xcd, 0x38, 0x56, 0x29, 0xa9, 0x95, 0x4e, 0x1b, + 0x4a, 0xf5, 0x4f, 0x9e, 0xa4, 0x7c, 0xa6, 0x6f, 0x3e, 0xc2, 0xa5, 0x11, 0xa9, 0x0e, 0x33, 0x6e, + 0x2e, 0xe8, 0x58, 0x41, 0x34, 0x84, 0xe8, 0xba, 0xf4, 0x0f, 0x63, 0xb7, 0xa5, 0xef, 0xee, 0xec, + 0x0e, 0x4a, 0x01, 0x3b, 0xc4, 0xc9, 0x77, 0x84, 0x8f, 0xec, 0xea, 0xbb, 0x3c, 0x97, 0x5a, 0x98, + 0x7d, 0xc7, 0xae, 0x75, 0xfc, 0xf8, 0x5f, 0x8e, 0xb7, 0xc7, 0x6f, 0x4b, 0xbf, 0xdf, 0x70, 0x6d, + 0x43, 0x02, 0x76, 0xfb, 0xf6, 0xf3, 0x57, 0x97, 0x6b, 0x0f, 0x5d, 0xad, 0x3d, 0xf4, 0x6b, 0xed, + 0xa1, 0x4f, 0x1b, 0xaf, 0x73, 0xb5, 0xf1, 0x3a, 0x3f, 0x36, 0x5e, 0xe7, 0xfd, 0xf3, 0x7f, 0x99, + 0xae, 0x76, 0x9d, 0x51, 0xbd, 0xf4, 0xec, 0xae, 0x6d, 0x89, 0x17, 0xbf, 0x03, 0x00, 0x00, 0xff, + 0xff, 0x92, 0xad, 0x36, 0xbf, 0x79, 0x03, 0x00, 0x00, +} + +func (m *PoolReservesKey) 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 *PoolReservesKey) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *PoolReservesKey) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.Fee != 0 { + i = encodeVarintPoolReserves(dAtA, i, uint64(m.Fee)) + i-- + dAtA[i] = 0x18 + } + if m.TickIndexTakerToMaker != 0 { + i = encodeVarintPoolReserves(dAtA, i, uint64(m.TickIndexTakerToMaker)) + i-- + dAtA[i] = 0x10 + } + if m.TradePairID != nil { + { + size, err := m.TradePairID.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintPoolReserves(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *PoolReserves) 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 *PoolReserves) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *PoolReserves) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + { + size := m.PriceOppositeTakerToMaker.Size() + i -= size + if _, err := m.PriceOppositeTakerToMaker.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintPoolReserves(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x22 + { + size := m.PriceTakerToMaker.Size() + i -= size + if _, err := m.PriceTakerToMaker.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintPoolReserves(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1a + { + size := m.ReservesMakerDenom.Size() + i -= size + if _, err := m.ReservesMakerDenom.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintPoolReserves(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + if m.Key != nil { + { + size, err := m.Key.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintPoolReserves(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func encodeVarintPoolReserves(dAtA []byte, offset int, v uint64) int { + offset -= sovPoolReserves(v) + base := offset + for v >= 1<<7 { + dAtA[offset] = uint8(v&0x7f | 0x80) + v >>= 7 + offset++ + } + dAtA[offset] = uint8(v) + return base +} +func (m *PoolReservesKey) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.TradePairID != nil { + l = m.TradePairID.Size() + n += 1 + l + sovPoolReserves(uint64(l)) + } + if m.TickIndexTakerToMaker != 0 { + n += 1 + sovPoolReserves(uint64(m.TickIndexTakerToMaker)) + } + if m.Fee != 0 { + n += 1 + sovPoolReserves(uint64(m.Fee)) + } + return n +} + +func (m *PoolReserves) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Key != nil { + l = m.Key.Size() + n += 1 + l + sovPoolReserves(uint64(l)) + } + l = m.ReservesMakerDenom.Size() + n += 1 + l + sovPoolReserves(uint64(l)) + l = m.PriceTakerToMaker.Size() + n += 1 + l + sovPoolReserves(uint64(l)) + l = m.PriceOppositeTakerToMaker.Size() + n += 1 + l + sovPoolReserves(uint64(l)) + return n +} + +func sovPoolReserves(x uint64) (n int) { + return (math_bits.Len64(x|1) + 6) / 7 +} +func sozPoolReserves(x uint64) (n int) { + return sovPoolReserves(uint64((x << 1) ^ uint64((int64(x) >> 63)))) +} +func (m *PoolReservesKey) 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 ErrIntOverflowPoolReserves + } + 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: PoolReservesKey: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: PoolReservesKey: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field TradePairID", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowPoolReserves + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthPoolReserves + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthPoolReserves + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.TradePairID == nil { + m.TradePairID = &TradePairID{} + } + if err := m.TradePairID.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 2: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field TickIndexTakerToMaker", wireType) + } + m.TickIndexTakerToMaker = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowPoolReserves + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.TickIndexTakerToMaker |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 3: + 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 ErrIntOverflowPoolReserves + } + 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 := skipPoolReserves(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthPoolReserves + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *PoolReserves) 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 ErrIntOverflowPoolReserves + } + 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: PoolReserves: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: PoolReserves: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Key", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowPoolReserves + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthPoolReserves + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthPoolReserves + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Key == nil { + m.Key = &PoolReservesKey{} + } + if err := m.Key.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ReservesMakerDenom", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowPoolReserves + } + 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 ErrInvalidLengthPoolReserves + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthPoolReserves + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.ReservesMakerDenom.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field PriceTakerToMaker", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowPoolReserves + } + 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 ErrInvalidLengthPoolReserves + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthPoolReserves + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.PriceTakerToMaker.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field PriceOppositeTakerToMaker", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowPoolReserves + } + 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 ErrInvalidLengthPoolReserves + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthPoolReserves + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.PriceOppositeTakerToMaker.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipPoolReserves(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthPoolReserves + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func skipPoolReserves(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, ErrIntOverflowPoolReserves + } + 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, ErrIntOverflowPoolReserves + } + 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, ErrIntOverflowPoolReserves + } + 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, ErrInvalidLengthPoolReserves + } + iNdEx += length + case 3: + depth++ + case 4: + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupPoolReserves + } + depth-- + case 5: + iNdEx += 4 + default: + return 0, fmt.Errorf("proto: illegal wireType %d", wireType) + } + if iNdEx < 0 { + return 0, ErrInvalidLengthPoolReserves + } + if depth == 0 { + return iNdEx, nil + } + } + return 0, io.ErrUnexpectedEOF +} + +var ( + ErrInvalidLengthPoolReserves = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowPoolReserves = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupPoolReserves = fmt.Errorf("proto: unexpected end of group") +) diff --git a/x/dex/types/pool_reserves_key.go b/x/dex/types/pool_reserves_key.go new file mode 100644 index 000000000..0560f9fa1 --- /dev/null +++ b/x/dex/types/pool_reserves_key.go @@ -0,0 +1,87 @@ +package types + +import ( + "errors" + "strings" + + sdk "github.com/cosmos/cosmos-sdk/types" + math_utils "github.com/neutron-org/neutron/utils/math" + "github.com/neutron-org/neutron/x/dex/utils" +) + +var _ TickLiquidityKey = (*PoolReservesKey)(nil) + +func (p PoolReservesKey) KeyMarshal() []byte { + var key []byte + + pairKeyBytes := []byte(p.TradePairID.MustPairID().CanonicalString()) + key = append(key, pairKeyBytes...) + key = append(key, []byte("/")...) + + makerDenomBytes := []byte(p.TradePairID.MakerDenom) + key = append(key, makerDenomBytes...) + key = append(key, []byte("/")...) + + tickIndexBytes := TickIndexToBytes(p.TickIndexTakerToMaker) + key = append(key, tickIndexBytes...) + key = append(key, []byte("/")...) + + liquidityTypeBytes := []byte(LiquidityTypePoolReserves) + key = append(key, liquidityTypeBytes...) + key = append(key, []byte("/")...) + + feeBytes := sdk.Uint64ToBigEndian(p.Fee) + key = append(key, feeBytes...) + key = append(key, []byte("/")...) + + return key +} + +func (p PoolReservesKey) KeyUnmarshal(bz []byte) error { + split := strings.Split(string(bz), "/") + + if len(split) != 5 { + return errors.New("invalid input length") + } + + pairKey, err := NewPairIDFromCanonicalString(split[0]) + if err != nil { + return err + } + p.TradePairID = pairKey.MustTradePairIDFromMaker(split[1]) + + tickIndex, err := BytesToTickIndex([]byte(split[2])) + if err != nil { + return err + } + p.TickIndexTakerToMaker = tickIndex + + if split[3] != LiquidityTypePoolReserves { + return errors.New("unexpected liquidity type") + } + + p.Fee = sdk.BigEndianToUint64([]byte(split[4])) + + return nil +} + +func (p PoolReservesKey) Counterpart() *PoolReservesKey { + feeInt64 := utils.MustSafeUint64ToInt64(p.Fee) + return &PoolReservesKey{ + TradePairID: p.TradePairID.Reversed(), + TickIndexTakerToMaker: p.TickIndexTakerToMaker*-1 + 2*feeInt64, + Fee: p.Fee, + } +} + +func (p PoolReservesKey) PriceTakerToMaker() (priceTakerToMaker math_utils.PrecDec, err error) { + return CalcPrice(p.TickIndexTakerToMaker) +} + +func (p PoolReservesKey) MustPriceTakerToMaker() (priceTakerToMaker math_utils.PrecDec) { + price, err := p.PriceTakerToMaker() + if err != nil { + panic(err) + } + return price +} diff --git a/x/dex/types/pool_test.go b/x/dex/types/pool_test.go new file mode 100644 index 000000000..98f721143 --- /dev/null +++ b/x/dex/types/pool_test.go @@ -0,0 +1,208 @@ +package types_test + +import ( + "testing" + + sdk "github.com/cosmos/cosmos-sdk/types" + . "github.com/neutron-org/neutron/x/dex/types" + "github.com/stretchr/testify/assert" +) + +func TestCalcGreatestMatchingRatioBothReservesNonZero(t *testing.T) { + trueAmount0, trueAmount1 := CalcGreatestMatchingRatio( + sdk.NewInt(10), + sdk.NewInt(40), + sdk.NewInt(100), + sdk.NewInt(100), + ) + assert.Equal(t, sdk.NewInt(25), trueAmount0) + assert.Equal(t, sdk.NewInt(100), trueAmount1) +} + +func TestCalcGreatestMatchingRatioBothReservesZero(t *testing.T) { + trueAmount0, trueAmount1 := CalcGreatestMatchingRatio( + sdk.NewInt(0), + sdk.NewInt(0), + sdk.NewInt(100), + sdk.NewInt(100), + ) + assert.Equal(t, sdk.NewInt(100), trueAmount0) + assert.Equal(t, sdk.NewInt(100), trueAmount1) +} + +func TestCalcGreatestMatchingRatioWrongCoinDeposited(t *testing.T) { + trueAmount0, trueAmount1 := CalcGreatestMatchingRatio( + sdk.NewInt(100), + sdk.NewInt(0), + sdk.NewInt(0), + sdk.NewInt(100), + ) + assert.Equal(t, sdk.NewInt(0), trueAmount0) + assert.Equal(t, sdk.NewInt(0), trueAmount1) + + trueAmount0, trueAmount1 = CalcGreatestMatchingRatio( + sdk.NewInt(0), + sdk.NewInt(100), + sdk.NewInt(100), + sdk.NewInt(0), + ) + assert.Equal(t, sdk.NewInt(0), trueAmount0) + assert.Equal(t, sdk.NewInt(0), trueAmount1) +} + +func TestCalcGreatestMatchingRatioOneReserveZero(t *testing.T) { + trueAmount0, trueAmount1 := CalcGreatestMatchingRatio( + sdk.NewInt(100), + sdk.NewInt(0), + sdk.NewInt(100), + sdk.NewInt(100), + ) + assert.Equal(t, sdk.NewInt(100), trueAmount0) + assert.Equal(t, sdk.NewInt(0), trueAmount1) + + trueAmount0, trueAmount1 = CalcGreatestMatchingRatio( + sdk.NewInt(0), + sdk.NewInt(100), + sdk.NewInt(100), + sdk.NewInt(100), + ) + assert.Equal(t, sdk.NewInt(0), trueAmount0) + assert.Equal(t, sdk.NewInt(100), trueAmount1) +} + +func TestCalcGreatestMatchingRatio2SidedPoolBothSidesRightRatio(t *testing.T) { + // WHEN deposit into a pool with a ratio of 2:5 with the same ratio all of the tokens are used + trueAmount0, trueAmount1 := CalcGreatestMatchingRatio( + sdk.NewInt(20), + sdk.NewInt(50), + sdk.NewInt(4), + sdk.NewInt(10), + ) + + // THEN both amounts are fully user + + assert.Equal(t, sdk.NewInt(4), trueAmount0) + assert.Equal(t, sdk.NewInt(10), trueAmount1) +} + +func TestCalcGreatestMatchingRatio2SidedPoolBothSidesWrongRatio(t *testing.T) { + // WHEN deposit into a pool with a ratio of 3:2 with a ratio of 2:1 + trueAmount0, trueAmount1 := CalcGreatestMatchingRatio( + sdk.NewInt(3), + sdk.NewInt(2), + sdk.NewInt(20), + sdk.NewInt(10), + ) + + // THEN all of Token1 is used and 3/4 of token0 is used + + assert.Equal(t, sdk.NewInt(15), trueAmount0) + assert.Equal(t, sdk.NewInt(10), trueAmount1) +} + +func TestCalcGreatestMatchingRatio2SidedPoolBothSidesWrongRatio2(t *testing.T) { + // IF deposit into a pool with a ratio of 2:3 with a ratio of 1:2 + trueAmount0, trueAmount1 := CalcGreatestMatchingRatio( + sdk.NewInt(2), + sdk.NewInt(3), + sdk.NewInt(10), + sdk.NewInt(20), + ) + + // THEN all of Token0 is used and 3/4 of token1 is used + + assert.Equal(t, sdk.NewInt(10), trueAmount0) + assert.Equal(t, sdk.NewInt(15), trueAmount1) +} + +func TestCalcGreatestMatchingRatio1SidedPoolBothSides(t *testing.T) { + // WHEN deposit Token0 and Token1 into a pool with only Token0 + trueAmount0, trueAmount1 := CalcGreatestMatchingRatio( + sdk.NewInt(10), + sdk.NewInt(0), + sdk.NewInt(10), + sdk.NewInt(10), + ) + + // THEN only Token0 is used + + assert.Equal(t, sdk.NewInt(10), trueAmount0) + assert.Equal(t, sdk.NewInt(0), trueAmount1) +} + +func TestCalcGreatestMatchingRatio1SidedPoolBothSides2(t *testing.T) { + // WHEN deposit Token0 and Token1 into a pool with only Token1 + trueAmount0, trueAmount1 := CalcGreatestMatchingRatio( + + sdk.NewInt(0), + sdk.NewInt(10), + sdk.NewInt(10), + sdk.NewInt(10), + ) + + // THEN only Token1 is used + + assert.Equal(t, sdk.NewInt(0), trueAmount0) + assert.Equal(t, sdk.NewInt(10), trueAmount1) +} + +func TestCalcGreatestMatchingRatio1SidedPool1SidedToken0(t *testing.T) { + // WHEN deposit Token0 into a pool with only Token1 + trueAmount0, trueAmount1 := CalcGreatestMatchingRatio( + + sdk.NewInt(0), + sdk.NewInt(10), + sdk.NewInt(10), + sdk.NewInt(0), + ) + + // THEN no amounts are used + + assert.Equal(t, sdk.NewInt(0), trueAmount0) + assert.Equal(t, sdk.NewInt(0), trueAmount1) +} + +func TestCalcGreatestMatchingRatio1SidedPool1SidedToken0B(t *testing.T) { + // WHEN deposit Token0 into a pool with only Token0 + trueAmount0, trueAmount1 := CalcGreatestMatchingRatio( + sdk.NewInt(10), + sdk.NewInt(0), + sdk.NewInt(10), + sdk.NewInt(0), + ) + + // THEN all of Token0 is used + + assert.Equal(t, sdk.NewInt(10), trueAmount0) + assert.Equal(t, sdk.NewInt(0), trueAmount1) +} + +func TestCalcGreatestMatchingRatio1SidedPool1SidedToken1(t *testing.T) { + // WHEN deposit Token1 into a pool with only Token0 + trueAmount0, trueAmount1 := CalcGreatestMatchingRatio( + sdk.NewInt(10), + sdk.NewInt(0), + sdk.NewInt(0), + sdk.NewInt(1), + ) + + // THEN no amounts are used + + assert.Equal(t, sdk.NewInt(0), trueAmount0) + assert.Equal(t, sdk.NewInt(0), trueAmount1) +} + +func TestCalcGreatestMatchingRatio1SidedPool1SidedToken1B(t *testing.T) { + // WHEN deposit Token1 into a pool with only Token1 + trueAmount0, trueAmount1 := CalcGreatestMatchingRatio( + sdk.NewInt(0), + sdk.NewInt(10), + sdk.NewInt(0), + sdk.NewInt(10), + ) + + // THEN all of Token1 is used + + assert.Equal(t, sdk.NewInt(0), trueAmount0) + assert.Equal(t, sdk.NewInt(10), trueAmount1) +} diff --git a/x/dex/types/price.go b/x/dex/types/price.go new file mode 100644 index 000000000..cd799dd41 --- /dev/null +++ b/x/dex/types/price.go @@ -0,0 +1,37 @@ +package types + +import ( + math_utils "github.com/neutron-org/neutron/utils/math" + "github.com/neutron-org/neutron/x/dex/utils" +) + +// NOTE: 559_680 is the highest possible tick at which price can be calculated with a < 1% error +// when using 26 digit decimal precision (via prec_dec). +// The error rate for very negative ticks approaches zero, so there is no concern there +const MaxTickExp uint64 = 559_680 + +// Calculates the price for a swap from token 0 to token 1 given a relative tick +// tickIndex refers to the index of a specified tick such that x * 1.0001 ^(-1 * t) = y +// Lower ticks offer better prices. +func CalcPrice(relativeTickIndex int64) (math_utils.PrecDec, error) { + if IsTickOutOfRange(relativeTickIndex) { + return math_utils.ZeroPrecDec(), ErrTickOutsideRange + } + if relativeTickIndex < 0 { + return utils.BasePrice().Power(uint64(-1 * relativeTickIndex)), nil + } else { + return math_utils.OnePrecDec().Quo(utils.BasePrice().Power(uint64(relativeTickIndex))), nil + } +} + +func MustCalcPrice(relativeTickIndex int64) math_utils.PrecDec { + price, err := CalcPrice(relativeTickIndex) + if err != nil { + panic(err) + } + return price +} + +func IsTickOutOfRange(tickIndex int64) bool { + return tickIndex > 0 && uint64(tickIndex) > MaxTickExp +} diff --git a/x/dex/types/price_test.go b/x/dex/types/price_test.go new file mode 100644 index 000000000..b2f350cbf --- /dev/null +++ b/x/dex/types/price_test.go @@ -0,0 +1,11 @@ +package types_test + +// This will continue to fail until we upgrade away from sdk.Dec +// func TestPriceMath(t *testing.T) { +// tick := 352437 +// amount := sdk.MustNewDecFromStr("1000000000000000000000") +// basePrice := utils.BasePrice() +// expected := amount.Quo(basePrice.Power(uint64(tick))).TruncateInt() +// result := types.MustCalcPrice(int64(tick)).Mul(amount).TruncateInt() +// assert.Equal(t, expected.Int64(), result.Int64()) +// } diff --git a/x/dex/types/query.pb.go b/x/dex/types/query.pb.go new file mode 100644 index 000000000..dc5b5d9ac --- /dev/null +++ b/x/dex/types/query.pb.go @@ -0,0 +1,9224 @@ +// Code generated by protoc-gen-gogo. DO NOT EDIT. +// source: duality/dex/query.proto + +package types + +import ( + context "context" + fmt "fmt" + _ "github.com/cosmos/cosmos-sdk/types" + github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" + query "github.com/cosmos/cosmos-sdk/types/query" + _ "github.com/cosmos/gogoproto/gogoproto" + grpc1 "github.com/cosmos/gogoproto/grpc" + proto "github.com/cosmos/gogoproto/proto" + github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" + github_com_duality_labs_duality_utils_math "github.com/neutron-org/neutron/utils/math" + _ "google.golang.org/genproto/googleapis/api/annotations" + grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" + _ "google.golang.org/protobuf/types/known/timestamppb" + io "io" + math "math" + math_bits "math/bits" + time "time" +) + +// Reference imports to suppress errors if they are not otherwise used. +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf +var _ = time.Kitchen + +// 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 + +// QueryParamsRequest is 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_4664128fddcf2b7a, []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 + +// QueryParamsResponse is response type for the Query/Params RPC method. +type QueryParamsResponse struct { + // params holds all the parameters of this 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_4664128fddcf2b7a, []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{} +} + +type QueryGetLimitOrderTrancheUserRequest struct { + Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` + TrancheKey string `protobuf:"bytes,2,opt,name=trancheKey,proto3" json:"trancheKey,omitempty"` +} + +func (m *QueryGetLimitOrderTrancheUserRequest) Reset() { *m = QueryGetLimitOrderTrancheUserRequest{} } +func (m *QueryGetLimitOrderTrancheUserRequest) String() string { return proto.CompactTextString(m) } +func (*QueryGetLimitOrderTrancheUserRequest) ProtoMessage() {} +func (*QueryGetLimitOrderTrancheUserRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_4664128fddcf2b7a, []int{2} +} +func (m *QueryGetLimitOrderTrancheUserRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryGetLimitOrderTrancheUserRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryGetLimitOrderTrancheUserRequest.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 *QueryGetLimitOrderTrancheUserRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryGetLimitOrderTrancheUserRequest.Merge(m, src) +} +func (m *QueryGetLimitOrderTrancheUserRequest) XXX_Size() int { + return m.Size() +} +func (m *QueryGetLimitOrderTrancheUserRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryGetLimitOrderTrancheUserRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryGetLimitOrderTrancheUserRequest proto.InternalMessageInfo + +func (m *QueryGetLimitOrderTrancheUserRequest) GetAddress() string { + if m != nil { + return m.Address + } + return "" +} + +func (m *QueryGetLimitOrderTrancheUserRequest) GetTrancheKey() string { + if m != nil { + return m.TrancheKey + } + return "" +} + +type QueryGetLimitOrderTrancheUserResponse struct { + LimitOrderTrancheUser *LimitOrderTrancheUser `protobuf:"bytes,1,opt,name=LimitOrderTrancheUser,proto3" json:"LimitOrderTrancheUser,omitempty"` +} + +func (m *QueryGetLimitOrderTrancheUserResponse) Reset() { *m = QueryGetLimitOrderTrancheUserResponse{} } +func (m *QueryGetLimitOrderTrancheUserResponse) String() string { return proto.CompactTextString(m) } +func (*QueryGetLimitOrderTrancheUserResponse) ProtoMessage() {} +func (*QueryGetLimitOrderTrancheUserResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_4664128fddcf2b7a, []int{3} +} +func (m *QueryGetLimitOrderTrancheUserResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryGetLimitOrderTrancheUserResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryGetLimitOrderTrancheUserResponse.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 *QueryGetLimitOrderTrancheUserResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryGetLimitOrderTrancheUserResponse.Merge(m, src) +} +func (m *QueryGetLimitOrderTrancheUserResponse) XXX_Size() int { + return m.Size() +} +func (m *QueryGetLimitOrderTrancheUserResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QueryGetLimitOrderTrancheUserResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryGetLimitOrderTrancheUserResponse proto.InternalMessageInfo + +func (m *QueryGetLimitOrderTrancheUserResponse) GetLimitOrderTrancheUser() *LimitOrderTrancheUser { + if m != nil { + return m.LimitOrderTrancheUser + } + return nil +} + +type QueryAllLimitOrderTrancheUserRequest struct { + Pagination *query.PageRequest `protobuf:"bytes,1,opt,name=pagination,proto3" json:"pagination,omitempty"` +} + +func (m *QueryAllLimitOrderTrancheUserRequest) Reset() { *m = QueryAllLimitOrderTrancheUserRequest{} } +func (m *QueryAllLimitOrderTrancheUserRequest) String() string { return proto.CompactTextString(m) } +func (*QueryAllLimitOrderTrancheUserRequest) ProtoMessage() {} +func (*QueryAllLimitOrderTrancheUserRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_4664128fddcf2b7a, []int{4} +} +func (m *QueryAllLimitOrderTrancheUserRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryAllLimitOrderTrancheUserRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryAllLimitOrderTrancheUserRequest.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 *QueryAllLimitOrderTrancheUserRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryAllLimitOrderTrancheUserRequest.Merge(m, src) +} +func (m *QueryAllLimitOrderTrancheUserRequest) XXX_Size() int { + return m.Size() +} +func (m *QueryAllLimitOrderTrancheUserRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryAllLimitOrderTrancheUserRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryAllLimitOrderTrancheUserRequest proto.InternalMessageInfo + +func (m *QueryAllLimitOrderTrancheUserRequest) GetPagination() *query.PageRequest { + if m != nil { + return m.Pagination + } + return nil +} + +type QueryAllLimitOrderTrancheUserResponse struct { + LimitOrderTrancheUser []*LimitOrderTrancheUser `protobuf:"bytes,1,rep,name=LimitOrderTrancheUser,proto3" json:"LimitOrderTrancheUser,omitempty"` + Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` +} + +func (m *QueryAllLimitOrderTrancheUserResponse) Reset() { *m = QueryAllLimitOrderTrancheUserResponse{} } +func (m *QueryAllLimitOrderTrancheUserResponse) String() string { return proto.CompactTextString(m) } +func (*QueryAllLimitOrderTrancheUserResponse) ProtoMessage() {} +func (*QueryAllLimitOrderTrancheUserResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_4664128fddcf2b7a, []int{5} +} +func (m *QueryAllLimitOrderTrancheUserResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryAllLimitOrderTrancheUserResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryAllLimitOrderTrancheUserResponse.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 *QueryAllLimitOrderTrancheUserResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryAllLimitOrderTrancheUserResponse.Merge(m, src) +} +func (m *QueryAllLimitOrderTrancheUserResponse) XXX_Size() int { + return m.Size() +} +func (m *QueryAllLimitOrderTrancheUserResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QueryAllLimitOrderTrancheUserResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryAllLimitOrderTrancheUserResponse proto.InternalMessageInfo + +func (m *QueryAllLimitOrderTrancheUserResponse) GetLimitOrderTrancheUser() []*LimitOrderTrancheUser { + if m != nil { + return m.LimitOrderTrancheUser + } + return nil +} + +func (m *QueryAllLimitOrderTrancheUserResponse) GetPagination() *query.PageResponse { + if m != nil { + return m.Pagination + } + return nil +} + +type QueryGetLimitOrderTrancheRequest struct { + PairID string `protobuf:"bytes,1,opt,name=pairID,proto3" json:"pairID,omitempty"` + TickIndex int64 `protobuf:"varint,2,opt,name=tickIndex,proto3" json:"tickIndex,omitempty"` + TokenIn string `protobuf:"bytes,3,opt,name=tokenIn,proto3" json:"tokenIn,omitempty"` + TrancheKey string `protobuf:"bytes,4,opt,name=trancheKey,proto3" json:"trancheKey,omitempty"` +} + +func (m *QueryGetLimitOrderTrancheRequest) Reset() { *m = QueryGetLimitOrderTrancheRequest{} } +func (m *QueryGetLimitOrderTrancheRequest) String() string { return proto.CompactTextString(m) } +func (*QueryGetLimitOrderTrancheRequest) ProtoMessage() {} +func (*QueryGetLimitOrderTrancheRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_4664128fddcf2b7a, []int{6} +} +func (m *QueryGetLimitOrderTrancheRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryGetLimitOrderTrancheRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryGetLimitOrderTrancheRequest.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 *QueryGetLimitOrderTrancheRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryGetLimitOrderTrancheRequest.Merge(m, src) +} +func (m *QueryGetLimitOrderTrancheRequest) XXX_Size() int { + return m.Size() +} +func (m *QueryGetLimitOrderTrancheRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryGetLimitOrderTrancheRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryGetLimitOrderTrancheRequest proto.InternalMessageInfo + +func (m *QueryGetLimitOrderTrancheRequest) GetPairID() string { + if m != nil { + return m.PairID + } + return "" +} + +func (m *QueryGetLimitOrderTrancheRequest) GetTickIndex() int64 { + if m != nil { + return m.TickIndex + } + return 0 +} + +func (m *QueryGetLimitOrderTrancheRequest) GetTokenIn() string { + if m != nil { + return m.TokenIn + } + return "" +} + +func (m *QueryGetLimitOrderTrancheRequest) GetTrancheKey() string { + if m != nil { + return m.TrancheKey + } + return "" +} + +type QueryGetLimitOrderTrancheResponse struct { + LimitOrderTranche *LimitOrderTranche `protobuf:"bytes,1,opt,name=LimitOrderTranche,proto3" json:"LimitOrderTranche,omitempty"` +} + +func (m *QueryGetLimitOrderTrancheResponse) Reset() { *m = QueryGetLimitOrderTrancheResponse{} } +func (m *QueryGetLimitOrderTrancheResponse) String() string { return proto.CompactTextString(m) } +func (*QueryGetLimitOrderTrancheResponse) ProtoMessage() {} +func (*QueryGetLimitOrderTrancheResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_4664128fddcf2b7a, []int{7} +} +func (m *QueryGetLimitOrderTrancheResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryGetLimitOrderTrancheResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryGetLimitOrderTrancheResponse.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 *QueryGetLimitOrderTrancheResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryGetLimitOrderTrancheResponse.Merge(m, src) +} +func (m *QueryGetLimitOrderTrancheResponse) XXX_Size() int { + return m.Size() +} +func (m *QueryGetLimitOrderTrancheResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QueryGetLimitOrderTrancheResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryGetLimitOrderTrancheResponse proto.InternalMessageInfo + +func (m *QueryGetLimitOrderTrancheResponse) GetLimitOrderTranche() *LimitOrderTranche { + if m != nil { + return m.LimitOrderTranche + } + return nil +} + +type QueryAllLimitOrderTrancheRequest struct { + PairID string `protobuf:"bytes,1,opt,name=pairID,proto3" json:"pairID,omitempty"` + TokenIn string `protobuf:"bytes,2,opt,name=tokenIn,proto3" json:"tokenIn,omitempty"` + Pagination *query.PageRequest `protobuf:"bytes,3,opt,name=pagination,proto3" json:"pagination,omitempty"` +} + +func (m *QueryAllLimitOrderTrancheRequest) Reset() { *m = QueryAllLimitOrderTrancheRequest{} } +func (m *QueryAllLimitOrderTrancheRequest) String() string { return proto.CompactTextString(m) } +func (*QueryAllLimitOrderTrancheRequest) ProtoMessage() {} +func (*QueryAllLimitOrderTrancheRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_4664128fddcf2b7a, []int{8} +} +func (m *QueryAllLimitOrderTrancheRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryAllLimitOrderTrancheRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryAllLimitOrderTrancheRequest.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 *QueryAllLimitOrderTrancheRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryAllLimitOrderTrancheRequest.Merge(m, src) +} +func (m *QueryAllLimitOrderTrancheRequest) XXX_Size() int { + return m.Size() +} +func (m *QueryAllLimitOrderTrancheRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryAllLimitOrderTrancheRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryAllLimitOrderTrancheRequest proto.InternalMessageInfo + +func (m *QueryAllLimitOrderTrancheRequest) GetPairID() string { + if m != nil { + return m.PairID + } + return "" +} + +func (m *QueryAllLimitOrderTrancheRequest) GetTokenIn() string { + if m != nil { + return m.TokenIn + } + return "" +} + +func (m *QueryAllLimitOrderTrancheRequest) GetPagination() *query.PageRequest { + if m != nil { + return m.Pagination + } + return nil +} + +type QueryAllLimitOrderTrancheResponse struct { + LimitOrderTranche []*LimitOrderTranche `protobuf:"bytes,1,rep,name=LimitOrderTranche,proto3" json:"LimitOrderTranche,omitempty"` + Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` +} + +func (m *QueryAllLimitOrderTrancheResponse) Reset() { *m = QueryAllLimitOrderTrancheResponse{} } +func (m *QueryAllLimitOrderTrancheResponse) String() string { return proto.CompactTextString(m) } +func (*QueryAllLimitOrderTrancheResponse) ProtoMessage() {} +func (*QueryAllLimitOrderTrancheResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_4664128fddcf2b7a, []int{9} +} +func (m *QueryAllLimitOrderTrancheResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryAllLimitOrderTrancheResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryAllLimitOrderTrancheResponse.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 *QueryAllLimitOrderTrancheResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryAllLimitOrderTrancheResponse.Merge(m, src) +} +func (m *QueryAllLimitOrderTrancheResponse) XXX_Size() int { + return m.Size() +} +func (m *QueryAllLimitOrderTrancheResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QueryAllLimitOrderTrancheResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryAllLimitOrderTrancheResponse proto.InternalMessageInfo + +func (m *QueryAllLimitOrderTrancheResponse) GetLimitOrderTranche() []*LimitOrderTranche { + if m != nil { + return m.LimitOrderTranche + } + return nil +} + +func (m *QueryAllLimitOrderTrancheResponse) GetPagination() *query.PageResponse { + if m != nil { + return m.Pagination + } + return nil +} + +type QueryAllUserDepositsRequest struct { + Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` + Pagination *query.PageRequest `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` +} + +func (m *QueryAllUserDepositsRequest) Reset() { *m = QueryAllUserDepositsRequest{} } +func (m *QueryAllUserDepositsRequest) String() string { return proto.CompactTextString(m) } +func (*QueryAllUserDepositsRequest) ProtoMessage() {} +func (*QueryAllUserDepositsRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_4664128fddcf2b7a, []int{10} +} +func (m *QueryAllUserDepositsRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryAllUserDepositsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryAllUserDepositsRequest.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 *QueryAllUserDepositsRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryAllUserDepositsRequest.Merge(m, src) +} +func (m *QueryAllUserDepositsRequest) XXX_Size() int { + return m.Size() +} +func (m *QueryAllUserDepositsRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryAllUserDepositsRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryAllUserDepositsRequest proto.InternalMessageInfo + +func (m *QueryAllUserDepositsRequest) GetAddress() string { + if m != nil { + return m.Address + } + return "" +} + +func (m *QueryAllUserDepositsRequest) GetPagination() *query.PageRequest { + if m != nil { + return m.Pagination + } + return nil +} + +type QueryAllUserDepositsResponse struct { + Deposits []*DepositRecord `protobuf:"bytes,1,rep,name=Deposits,proto3" json:"Deposits,omitempty"` + Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` +} + +func (m *QueryAllUserDepositsResponse) Reset() { *m = QueryAllUserDepositsResponse{} } +func (m *QueryAllUserDepositsResponse) String() string { return proto.CompactTextString(m) } +func (*QueryAllUserDepositsResponse) ProtoMessage() {} +func (*QueryAllUserDepositsResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_4664128fddcf2b7a, []int{11} +} +func (m *QueryAllUserDepositsResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryAllUserDepositsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryAllUserDepositsResponse.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 *QueryAllUserDepositsResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryAllUserDepositsResponse.Merge(m, src) +} +func (m *QueryAllUserDepositsResponse) XXX_Size() int { + return m.Size() +} +func (m *QueryAllUserDepositsResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QueryAllUserDepositsResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryAllUserDepositsResponse proto.InternalMessageInfo + +func (m *QueryAllUserDepositsResponse) GetDeposits() []*DepositRecord { + if m != nil { + return m.Deposits + } + return nil +} + +func (m *QueryAllUserDepositsResponse) GetPagination() *query.PageResponse { + if m != nil { + return m.Pagination + } + return nil +} + +type QueryAllUserLimitOrdersRequest struct { + Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` + Pagination *query.PageRequest `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` +} + +func (m *QueryAllUserLimitOrdersRequest) Reset() { *m = QueryAllUserLimitOrdersRequest{} } +func (m *QueryAllUserLimitOrdersRequest) String() string { return proto.CompactTextString(m) } +func (*QueryAllUserLimitOrdersRequest) ProtoMessage() {} +func (*QueryAllUserLimitOrdersRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_4664128fddcf2b7a, []int{12} +} +func (m *QueryAllUserLimitOrdersRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryAllUserLimitOrdersRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryAllUserLimitOrdersRequest.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 *QueryAllUserLimitOrdersRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryAllUserLimitOrdersRequest.Merge(m, src) +} +func (m *QueryAllUserLimitOrdersRequest) XXX_Size() int { + return m.Size() +} +func (m *QueryAllUserLimitOrdersRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryAllUserLimitOrdersRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryAllUserLimitOrdersRequest proto.InternalMessageInfo + +func (m *QueryAllUserLimitOrdersRequest) GetAddress() string { + if m != nil { + return m.Address + } + return "" +} + +func (m *QueryAllUserLimitOrdersRequest) GetPagination() *query.PageRequest { + if m != nil { + return m.Pagination + } + return nil +} + +type QueryAllUserLimitOrdersResponse struct { + LimitOrders []*LimitOrderTrancheUser `protobuf:"bytes,1,rep,name=limitOrders,proto3" json:"limitOrders,omitempty"` + Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` +} + +func (m *QueryAllUserLimitOrdersResponse) Reset() { *m = QueryAllUserLimitOrdersResponse{} } +func (m *QueryAllUserLimitOrdersResponse) String() string { return proto.CompactTextString(m) } +func (*QueryAllUserLimitOrdersResponse) ProtoMessage() {} +func (*QueryAllUserLimitOrdersResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_4664128fddcf2b7a, []int{13} +} +func (m *QueryAllUserLimitOrdersResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryAllUserLimitOrdersResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryAllUserLimitOrdersResponse.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 *QueryAllUserLimitOrdersResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryAllUserLimitOrdersResponse.Merge(m, src) +} +func (m *QueryAllUserLimitOrdersResponse) XXX_Size() int { + return m.Size() +} +func (m *QueryAllUserLimitOrdersResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QueryAllUserLimitOrdersResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryAllUserLimitOrdersResponse proto.InternalMessageInfo + +func (m *QueryAllUserLimitOrdersResponse) GetLimitOrders() []*LimitOrderTrancheUser { + if m != nil { + return m.LimitOrders + } + return nil +} + +func (m *QueryAllUserLimitOrdersResponse) GetPagination() *query.PageResponse { + if m != nil { + return m.Pagination + } + return nil +} + +type QueryAllTickLiquidityRequest struct { + PairID string `protobuf:"bytes,1,opt,name=pairID,proto3" json:"pairID,omitempty"` + TokenIn string `protobuf:"bytes,2,opt,name=tokenIn,proto3" json:"tokenIn,omitempty"` + Pagination *query.PageRequest `protobuf:"bytes,3,opt,name=pagination,proto3" json:"pagination,omitempty"` +} + +func (m *QueryAllTickLiquidityRequest) Reset() { *m = QueryAllTickLiquidityRequest{} } +func (m *QueryAllTickLiquidityRequest) String() string { return proto.CompactTextString(m) } +func (*QueryAllTickLiquidityRequest) ProtoMessage() {} +func (*QueryAllTickLiquidityRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_4664128fddcf2b7a, []int{14} +} +func (m *QueryAllTickLiquidityRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryAllTickLiquidityRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryAllTickLiquidityRequest.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 *QueryAllTickLiquidityRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryAllTickLiquidityRequest.Merge(m, src) +} +func (m *QueryAllTickLiquidityRequest) XXX_Size() int { + return m.Size() +} +func (m *QueryAllTickLiquidityRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryAllTickLiquidityRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryAllTickLiquidityRequest proto.InternalMessageInfo + +func (m *QueryAllTickLiquidityRequest) GetPairID() string { + if m != nil { + return m.PairID + } + return "" +} + +func (m *QueryAllTickLiquidityRequest) GetTokenIn() string { + if m != nil { + return m.TokenIn + } + return "" +} + +func (m *QueryAllTickLiquidityRequest) GetPagination() *query.PageRequest { + if m != nil { + return m.Pagination + } + return nil +} + +type QueryAllTickLiquidityResponse struct { + TickLiquidity []*TickLiquidity `protobuf:"bytes,1,rep,name=tickLiquidity,proto3" json:"tickLiquidity,omitempty"` + Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` +} + +func (m *QueryAllTickLiquidityResponse) Reset() { *m = QueryAllTickLiquidityResponse{} } +func (m *QueryAllTickLiquidityResponse) String() string { return proto.CompactTextString(m) } +func (*QueryAllTickLiquidityResponse) ProtoMessage() {} +func (*QueryAllTickLiquidityResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_4664128fddcf2b7a, []int{15} +} +func (m *QueryAllTickLiquidityResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryAllTickLiquidityResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryAllTickLiquidityResponse.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 *QueryAllTickLiquidityResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryAllTickLiquidityResponse.Merge(m, src) +} +func (m *QueryAllTickLiquidityResponse) XXX_Size() int { + return m.Size() +} +func (m *QueryAllTickLiquidityResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QueryAllTickLiquidityResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryAllTickLiquidityResponse proto.InternalMessageInfo + +func (m *QueryAllTickLiquidityResponse) GetTickLiquidity() []*TickLiquidity { + if m != nil { + return m.TickLiquidity + } + return nil +} + +func (m *QueryAllTickLiquidityResponse) GetPagination() *query.PageResponse { + if m != nil { + return m.Pagination + } + return nil +} + +type QueryGetInactiveLimitOrderTrancheRequest struct { + PairID string `protobuf:"bytes,1,opt,name=pairID,proto3" json:"pairID,omitempty"` + TokenIn string `protobuf:"bytes,2,opt,name=tokenIn,proto3" json:"tokenIn,omitempty"` + TickIndex int64 `protobuf:"varint,3,opt,name=tickIndex,proto3" json:"tickIndex,omitempty"` + TrancheKey string `protobuf:"bytes,4,opt,name=trancheKey,proto3" json:"trancheKey,omitempty"` +} + +func (m *QueryGetInactiveLimitOrderTrancheRequest) Reset() { + *m = QueryGetInactiveLimitOrderTrancheRequest{} +} +func (m *QueryGetInactiveLimitOrderTrancheRequest) String() string { return proto.CompactTextString(m) } +func (*QueryGetInactiveLimitOrderTrancheRequest) ProtoMessage() {} +func (*QueryGetInactiveLimitOrderTrancheRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_4664128fddcf2b7a, []int{16} +} +func (m *QueryGetInactiveLimitOrderTrancheRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryGetInactiveLimitOrderTrancheRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryGetInactiveLimitOrderTrancheRequest.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 *QueryGetInactiveLimitOrderTrancheRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryGetInactiveLimitOrderTrancheRequest.Merge(m, src) +} +func (m *QueryGetInactiveLimitOrderTrancheRequest) XXX_Size() int { + return m.Size() +} +func (m *QueryGetInactiveLimitOrderTrancheRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryGetInactiveLimitOrderTrancheRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryGetInactiveLimitOrderTrancheRequest proto.InternalMessageInfo + +func (m *QueryGetInactiveLimitOrderTrancheRequest) GetPairID() string { + if m != nil { + return m.PairID + } + return "" +} + +func (m *QueryGetInactiveLimitOrderTrancheRequest) GetTokenIn() string { + if m != nil { + return m.TokenIn + } + return "" +} + +func (m *QueryGetInactiveLimitOrderTrancheRequest) GetTickIndex() int64 { + if m != nil { + return m.TickIndex + } + return 0 +} + +func (m *QueryGetInactiveLimitOrderTrancheRequest) GetTrancheKey() string { + if m != nil { + return m.TrancheKey + } + return "" +} + +type QueryGetInactiveLimitOrderTrancheResponse struct { + InactiveLimitOrderTranche *LimitOrderTranche `protobuf:"bytes,1,opt,name=inactiveLimitOrderTranche,proto3" json:"inactiveLimitOrderTranche,omitempty"` +} + +func (m *QueryGetInactiveLimitOrderTrancheResponse) Reset() { + *m = QueryGetInactiveLimitOrderTrancheResponse{} +} +func (m *QueryGetInactiveLimitOrderTrancheResponse) String() string { + return proto.CompactTextString(m) +} +func (*QueryGetInactiveLimitOrderTrancheResponse) ProtoMessage() {} +func (*QueryGetInactiveLimitOrderTrancheResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_4664128fddcf2b7a, []int{17} +} +func (m *QueryGetInactiveLimitOrderTrancheResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryGetInactiveLimitOrderTrancheResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryGetInactiveLimitOrderTrancheResponse.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 *QueryGetInactiveLimitOrderTrancheResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryGetInactiveLimitOrderTrancheResponse.Merge(m, src) +} +func (m *QueryGetInactiveLimitOrderTrancheResponse) XXX_Size() int { + return m.Size() +} +func (m *QueryGetInactiveLimitOrderTrancheResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QueryGetInactiveLimitOrderTrancheResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryGetInactiveLimitOrderTrancheResponse proto.InternalMessageInfo + +func (m *QueryGetInactiveLimitOrderTrancheResponse) GetInactiveLimitOrderTranche() *LimitOrderTranche { + if m != nil { + return m.InactiveLimitOrderTranche + } + return nil +} + +type QueryAllInactiveLimitOrderTrancheRequest struct { + Pagination *query.PageRequest `protobuf:"bytes,1,opt,name=pagination,proto3" json:"pagination,omitempty"` +} + +func (m *QueryAllInactiveLimitOrderTrancheRequest) Reset() { + *m = QueryAllInactiveLimitOrderTrancheRequest{} +} +func (m *QueryAllInactiveLimitOrderTrancheRequest) String() string { return proto.CompactTextString(m) } +func (*QueryAllInactiveLimitOrderTrancheRequest) ProtoMessage() {} +func (*QueryAllInactiveLimitOrderTrancheRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_4664128fddcf2b7a, []int{18} +} +func (m *QueryAllInactiveLimitOrderTrancheRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryAllInactiveLimitOrderTrancheRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryAllInactiveLimitOrderTrancheRequest.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 *QueryAllInactiveLimitOrderTrancheRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryAllInactiveLimitOrderTrancheRequest.Merge(m, src) +} +func (m *QueryAllInactiveLimitOrderTrancheRequest) XXX_Size() int { + return m.Size() +} +func (m *QueryAllInactiveLimitOrderTrancheRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryAllInactiveLimitOrderTrancheRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryAllInactiveLimitOrderTrancheRequest proto.InternalMessageInfo + +func (m *QueryAllInactiveLimitOrderTrancheRequest) GetPagination() *query.PageRequest { + if m != nil { + return m.Pagination + } + return nil +} + +type QueryAllInactiveLimitOrderTrancheResponse struct { + InactiveLimitOrderTranche []*LimitOrderTranche `protobuf:"bytes,1,rep,name=inactiveLimitOrderTranche,proto3" json:"inactiveLimitOrderTranche,omitempty"` + Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` +} + +func (m *QueryAllInactiveLimitOrderTrancheResponse) Reset() { + *m = QueryAllInactiveLimitOrderTrancheResponse{} +} +func (m *QueryAllInactiveLimitOrderTrancheResponse) String() string { + return proto.CompactTextString(m) +} +func (*QueryAllInactiveLimitOrderTrancheResponse) ProtoMessage() {} +func (*QueryAllInactiveLimitOrderTrancheResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_4664128fddcf2b7a, []int{19} +} +func (m *QueryAllInactiveLimitOrderTrancheResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryAllInactiveLimitOrderTrancheResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryAllInactiveLimitOrderTrancheResponse.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 *QueryAllInactiveLimitOrderTrancheResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryAllInactiveLimitOrderTrancheResponse.Merge(m, src) +} +func (m *QueryAllInactiveLimitOrderTrancheResponse) XXX_Size() int { + return m.Size() +} +func (m *QueryAllInactiveLimitOrderTrancheResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QueryAllInactiveLimitOrderTrancheResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryAllInactiveLimitOrderTrancheResponse proto.InternalMessageInfo + +func (m *QueryAllInactiveLimitOrderTrancheResponse) GetInactiveLimitOrderTranche() []*LimitOrderTranche { + if m != nil { + return m.InactiveLimitOrderTranche + } + return nil +} + +func (m *QueryAllInactiveLimitOrderTrancheResponse) GetPagination() *query.PageResponse { + if m != nil { + return m.Pagination + } + return nil +} + +type QueryAllPoolReservesRequest struct { + PairID string `protobuf:"bytes,1,opt,name=pairID,proto3" json:"pairID,omitempty"` + TokenIn string `protobuf:"bytes,2,opt,name=tokenIn,proto3" json:"tokenIn,omitempty"` + Pagination *query.PageRequest `protobuf:"bytes,3,opt,name=pagination,proto3" json:"pagination,omitempty"` +} + +func (m *QueryAllPoolReservesRequest) Reset() { *m = QueryAllPoolReservesRequest{} } +func (m *QueryAllPoolReservesRequest) String() string { return proto.CompactTextString(m) } +func (*QueryAllPoolReservesRequest) ProtoMessage() {} +func (*QueryAllPoolReservesRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_4664128fddcf2b7a, []int{20} +} +func (m *QueryAllPoolReservesRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryAllPoolReservesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryAllPoolReservesRequest.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 *QueryAllPoolReservesRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryAllPoolReservesRequest.Merge(m, src) +} +func (m *QueryAllPoolReservesRequest) XXX_Size() int { + return m.Size() +} +func (m *QueryAllPoolReservesRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryAllPoolReservesRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryAllPoolReservesRequest proto.InternalMessageInfo + +func (m *QueryAllPoolReservesRequest) GetPairID() string { + if m != nil { + return m.PairID + } + return "" +} + +func (m *QueryAllPoolReservesRequest) GetTokenIn() string { + if m != nil { + return m.TokenIn + } + return "" +} + +func (m *QueryAllPoolReservesRequest) GetPagination() *query.PageRequest { + if m != nil { + return m.Pagination + } + return nil +} + +type QueryAllPoolReservesResponse struct { + PoolReserves []*PoolReserves `protobuf:"bytes,1,rep,name=poolReserves,proto3" json:"poolReserves,omitempty"` + Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` +} + +func (m *QueryAllPoolReservesResponse) Reset() { *m = QueryAllPoolReservesResponse{} } +func (m *QueryAllPoolReservesResponse) String() string { return proto.CompactTextString(m) } +func (*QueryAllPoolReservesResponse) ProtoMessage() {} +func (*QueryAllPoolReservesResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_4664128fddcf2b7a, []int{21} +} +func (m *QueryAllPoolReservesResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryAllPoolReservesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryAllPoolReservesResponse.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 *QueryAllPoolReservesResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryAllPoolReservesResponse.Merge(m, src) +} +func (m *QueryAllPoolReservesResponse) XXX_Size() int { + return m.Size() +} +func (m *QueryAllPoolReservesResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QueryAllPoolReservesResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryAllPoolReservesResponse proto.InternalMessageInfo + +func (m *QueryAllPoolReservesResponse) GetPoolReserves() []*PoolReserves { + if m != nil { + return m.PoolReserves + } + return nil +} + +func (m *QueryAllPoolReservesResponse) GetPagination() *query.PageResponse { + if m != nil { + return m.Pagination + } + return nil +} + +type QueryGetPoolReservesRequest struct { + PairID string `protobuf:"bytes,1,opt,name=pairID,proto3" json:"pairID,omitempty"` + TokenIn string `protobuf:"bytes,2,opt,name=tokenIn,proto3" json:"tokenIn,omitempty"` + TickIndex int64 `protobuf:"varint,3,opt,name=tickIndex,proto3" json:"tickIndex,omitempty"` + Fee uint64 `protobuf:"varint,4,opt,name=fee,proto3" json:"fee,omitempty"` +} + +func (m *QueryGetPoolReservesRequest) Reset() { *m = QueryGetPoolReservesRequest{} } +func (m *QueryGetPoolReservesRequest) String() string { return proto.CompactTextString(m) } +func (*QueryGetPoolReservesRequest) ProtoMessage() {} +func (*QueryGetPoolReservesRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_4664128fddcf2b7a, []int{22} +} +func (m *QueryGetPoolReservesRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryGetPoolReservesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryGetPoolReservesRequest.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 *QueryGetPoolReservesRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryGetPoolReservesRequest.Merge(m, src) +} +func (m *QueryGetPoolReservesRequest) XXX_Size() int { + return m.Size() +} +func (m *QueryGetPoolReservesRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryGetPoolReservesRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryGetPoolReservesRequest proto.InternalMessageInfo + +func (m *QueryGetPoolReservesRequest) GetPairID() string { + if m != nil { + return m.PairID + } + return "" +} + +func (m *QueryGetPoolReservesRequest) GetTokenIn() string { + if m != nil { + return m.TokenIn + } + return "" +} + +func (m *QueryGetPoolReservesRequest) GetTickIndex() int64 { + if m != nil { + return m.TickIndex + } + return 0 +} + +func (m *QueryGetPoolReservesRequest) GetFee() uint64 { + if m != nil { + return m.Fee + } + return 0 +} + +type QueryGetPoolReservesResponse struct { + PoolReserves *PoolReserves `protobuf:"bytes,1,opt,name=poolReserves,proto3" json:"poolReserves,omitempty"` +} + +func (m *QueryGetPoolReservesResponse) Reset() { *m = QueryGetPoolReservesResponse{} } +func (m *QueryGetPoolReservesResponse) String() string { return proto.CompactTextString(m) } +func (*QueryGetPoolReservesResponse) ProtoMessage() {} +func (*QueryGetPoolReservesResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_4664128fddcf2b7a, []int{23} +} +func (m *QueryGetPoolReservesResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryGetPoolReservesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryGetPoolReservesResponse.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 *QueryGetPoolReservesResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryGetPoolReservesResponse.Merge(m, src) +} +func (m *QueryGetPoolReservesResponse) XXX_Size() int { + return m.Size() +} +func (m *QueryGetPoolReservesResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QueryGetPoolReservesResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryGetPoolReservesResponse proto.InternalMessageInfo + +func (m *QueryGetPoolReservesResponse) GetPoolReserves() *PoolReserves { + if m != nil { + return m.PoolReserves + } + return nil +} + +type QueryEstimateMultiHopSwapRequest struct { + 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 github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,4,opt,name=amountIn,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"amountIn" yaml:"amountIn"` + ExitLimitPrice github_com_duality_labs_duality_utils_math.PrecDec `protobuf:"bytes,5,opt,name=exitLimitPrice,proto3,customtype=github.com/neutron-org/neutron/utils/math.PrecDec" json:"exitLimitPrice" yaml:"exitLimitPrice"` + // 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=pickBestRoute,proto3" json:"pickBestRoute,omitempty"` +} + +func (m *QueryEstimateMultiHopSwapRequest) Reset() { *m = QueryEstimateMultiHopSwapRequest{} } +func (m *QueryEstimateMultiHopSwapRequest) String() string { return proto.CompactTextString(m) } +func (*QueryEstimateMultiHopSwapRequest) ProtoMessage() {} +func (*QueryEstimateMultiHopSwapRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_4664128fddcf2b7a, []int{24} +} +func (m *QueryEstimateMultiHopSwapRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryEstimateMultiHopSwapRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryEstimateMultiHopSwapRequest.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 *QueryEstimateMultiHopSwapRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryEstimateMultiHopSwapRequest.Merge(m, src) +} +func (m *QueryEstimateMultiHopSwapRequest) XXX_Size() int { + return m.Size() +} +func (m *QueryEstimateMultiHopSwapRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryEstimateMultiHopSwapRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryEstimateMultiHopSwapRequest proto.InternalMessageInfo + +func (m *QueryEstimateMultiHopSwapRequest) GetCreator() string { + if m != nil { + return m.Creator + } + return "" +} + +func (m *QueryEstimateMultiHopSwapRequest) GetReceiver() string { + if m != nil { + return m.Receiver + } + return "" +} + +func (m *QueryEstimateMultiHopSwapRequest) GetRoutes() []*MultiHopRoute { + if m != nil { + return m.Routes + } + return nil +} + +func (m *QueryEstimateMultiHopSwapRequest) GetPickBestRoute() bool { + if m != nil { + return m.PickBestRoute + } + return false +} + +type QueryEstimateMultiHopSwapResponse struct { + CoinOut github_com_cosmos_cosmos_sdk_types.Coin `protobuf:"bytes,1,opt,name=coinOut,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Coin" json:"coinOut"` +} + +func (m *QueryEstimateMultiHopSwapResponse) Reset() { *m = QueryEstimateMultiHopSwapResponse{} } +func (m *QueryEstimateMultiHopSwapResponse) String() string { return proto.CompactTextString(m) } +func (*QueryEstimateMultiHopSwapResponse) ProtoMessage() {} +func (*QueryEstimateMultiHopSwapResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_4664128fddcf2b7a, []int{25} +} +func (m *QueryEstimateMultiHopSwapResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryEstimateMultiHopSwapResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryEstimateMultiHopSwapResponse.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 *QueryEstimateMultiHopSwapResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryEstimateMultiHopSwapResponse.Merge(m, src) +} +func (m *QueryEstimateMultiHopSwapResponse) XXX_Size() int { + return m.Size() +} +func (m *QueryEstimateMultiHopSwapResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QueryEstimateMultiHopSwapResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryEstimateMultiHopSwapResponse proto.InternalMessageInfo + +type QueryEstimatePlaceLimitOrderRequest struct { + 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=tokenIn,proto3" json:"tokenIn,omitempty"` + TokenOut string `protobuf:"bytes,4,opt,name=tokenOut,proto3" json:"tokenOut,omitempty"` + TickIndexInToOut int64 `protobuf:"varint,5,opt,name=tickIndexInToOut,proto3" json:"tickIndexInToOut,omitempty"` + AmountIn github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,6,opt,name=amountIn,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"amountIn" yaml:"amountIn"` + OrderType LimitOrderType `protobuf:"varint,7,opt,name=orderType,proto3,enum=duality.dex.LimitOrderType" json:"orderType,omitempty"` + // expirationTime is only valid iff orderType == GOOD_TIL_TIME. + ExpirationTime *time.Time `protobuf:"bytes,8,opt,name=expirationTime,proto3,stdtime" json:"expirationTime,omitempty"` + MaxAmountOut *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,9,opt,name=maxAmountOut,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"maxAmountOut" yaml:"maxAmountOut"` +} + +func (m *QueryEstimatePlaceLimitOrderRequest) Reset() { *m = QueryEstimatePlaceLimitOrderRequest{} } +func (m *QueryEstimatePlaceLimitOrderRequest) String() string { return proto.CompactTextString(m) } +func (*QueryEstimatePlaceLimitOrderRequest) ProtoMessage() {} +func (*QueryEstimatePlaceLimitOrderRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_4664128fddcf2b7a, []int{26} +} +func (m *QueryEstimatePlaceLimitOrderRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryEstimatePlaceLimitOrderRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryEstimatePlaceLimitOrderRequest.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 *QueryEstimatePlaceLimitOrderRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryEstimatePlaceLimitOrderRequest.Merge(m, src) +} +func (m *QueryEstimatePlaceLimitOrderRequest) XXX_Size() int { + return m.Size() +} +func (m *QueryEstimatePlaceLimitOrderRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryEstimatePlaceLimitOrderRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryEstimatePlaceLimitOrderRequest proto.InternalMessageInfo + +func (m *QueryEstimatePlaceLimitOrderRequest) GetCreator() string { + if m != nil { + return m.Creator + } + return "" +} + +func (m *QueryEstimatePlaceLimitOrderRequest) GetReceiver() string { + if m != nil { + return m.Receiver + } + return "" +} + +func (m *QueryEstimatePlaceLimitOrderRequest) GetTokenIn() string { + if m != nil { + return m.TokenIn + } + return "" +} + +func (m *QueryEstimatePlaceLimitOrderRequest) GetTokenOut() string { + if m != nil { + return m.TokenOut + } + return "" +} + +func (m *QueryEstimatePlaceLimitOrderRequest) GetTickIndexInToOut() int64 { + if m != nil { + return m.TickIndexInToOut + } + return 0 +} + +func (m *QueryEstimatePlaceLimitOrderRequest) GetOrderType() LimitOrderType { + if m != nil { + return m.OrderType + } + return LimitOrderType_GOOD_TIL_CANCELLED +} + +func (m *QueryEstimatePlaceLimitOrderRequest) GetExpirationTime() *time.Time { + if m != nil { + return m.ExpirationTime + } + return nil +} + +type QueryEstimatePlaceLimitOrderResponse struct { + // Total amount of coin used for the limit order + // You can derive makerLimitInCoin using the equation: totalInCoin = swapInCoin + makerLimitInCoin + TotalInCoin github_com_cosmos_cosmos_sdk_types.Coin `protobuf:"bytes,1,opt,name=totalInCoin,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Coin" json:"totalInCoin" yaml:"totalInCoin"` + // Total amount of the token in that was immediately swapped for swapOutCoin + SwapInCoin github_com_cosmos_cosmos_sdk_types.Coin `protobuf:"bytes,2,opt,name=swapInCoin,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Coin" json:"swapInCoin" yaml:"swapInCoin"` + // 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 + SwapOutCoin github_com_cosmos_cosmos_sdk_types.Coin `protobuf:"bytes,3,opt,name=swapOutCoin,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Coin" json:"swapOutCoin" yaml:"swapOutCoin"` +} + +func (m *QueryEstimatePlaceLimitOrderResponse) Reset() { *m = QueryEstimatePlaceLimitOrderResponse{} } +func (m *QueryEstimatePlaceLimitOrderResponse) String() string { return proto.CompactTextString(m) } +func (*QueryEstimatePlaceLimitOrderResponse) ProtoMessage() {} +func (*QueryEstimatePlaceLimitOrderResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_4664128fddcf2b7a, []int{27} +} +func (m *QueryEstimatePlaceLimitOrderResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryEstimatePlaceLimitOrderResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryEstimatePlaceLimitOrderResponse.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 *QueryEstimatePlaceLimitOrderResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryEstimatePlaceLimitOrderResponse.Merge(m, src) +} +func (m *QueryEstimatePlaceLimitOrderResponse) XXX_Size() int { + return m.Size() +} +func (m *QueryEstimatePlaceLimitOrderResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QueryEstimatePlaceLimitOrderResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryEstimatePlaceLimitOrderResponse proto.InternalMessageInfo + +type QueryPoolRequest struct { + PairID string `protobuf:"bytes,1,opt,name=pairID,proto3" json:"pairID,omitempty"` + TickIndex int64 `protobuf:"varint,2,opt,name=tickIndex,proto3" json:"tickIndex,omitempty"` + Fee uint64 `protobuf:"varint,3,opt,name=fee,proto3" json:"fee,omitempty"` +} + +func (m *QueryPoolRequest) Reset() { *m = QueryPoolRequest{} } +func (m *QueryPoolRequest) String() string { return proto.CompactTextString(m) } +func (*QueryPoolRequest) ProtoMessage() {} +func (*QueryPoolRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_4664128fddcf2b7a, []int{28} +} +func (m *QueryPoolRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryPoolRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryPoolRequest.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 *QueryPoolRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryPoolRequest.Merge(m, src) +} +func (m *QueryPoolRequest) XXX_Size() int { + return m.Size() +} +func (m *QueryPoolRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryPoolRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryPoolRequest proto.InternalMessageInfo + +func (m *QueryPoolRequest) GetPairID() string { + if m != nil { + return m.PairID + } + return "" +} + +func (m *QueryPoolRequest) GetTickIndex() int64 { + if m != nil { + return m.TickIndex + } + return 0 +} + +func (m *QueryPoolRequest) GetFee() uint64 { + if m != nil { + return m.Fee + } + return 0 +} + +type QueryPoolByIDRequest struct { + PoolID uint64 `protobuf:"varint,1,opt,name=poolID,proto3" json:"poolID,omitempty"` +} + +func (m *QueryPoolByIDRequest) Reset() { *m = QueryPoolByIDRequest{} } +func (m *QueryPoolByIDRequest) String() string { return proto.CompactTextString(m) } +func (*QueryPoolByIDRequest) ProtoMessage() {} +func (*QueryPoolByIDRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_4664128fddcf2b7a, []int{29} +} +func (m *QueryPoolByIDRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryPoolByIDRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryPoolByIDRequest.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 *QueryPoolByIDRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryPoolByIDRequest.Merge(m, src) +} +func (m *QueryPoolByIDRequest) XXX_Size() int { + return m.Size() +} +func (m *QueryPoolByIDRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryPoolByIDRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryPoolByIDRequest proto.InternalMessageInfo + +func (m *QueryPoolByIDRequest) GetPoolID() uint64 { + if m != nil { + return m.PoolID + } + return 0 +} + +type QueryPoolResponse struct { + Pool *Pool `protobuf:"bytes,1,opt,name=pool,proto3" json:"pool,omitempty"` +} + +func (m *QueryPoolResponse) Reset() { *m = QueryPoolResponse{} } +func (m *QueryPoolResponse) String() string { return proto.CompactTextString(m) } +func (*QueryPoolResponse) ProtoMessage() {} +func (*QueryPoolResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_4664128fddcf2b7a, []int{30} +} +func (m *QueryPoolResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryPoolResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryPoolResponse.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 *QueryPoolResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryPoolResponse.Merge(m, src) +} +func (m *QueryPoolResponse) XXX_Size() int { + return m.Size() +} +func (m *QueryPoolResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QueryPoolResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryPoolResponse proto.InternalMessageInfo + +func (m *QueryPoolResponse) GetPool() *Pool { + if m != nil { + return m.Pool + } + return nil +} + +type QueryGetPoolMetadataRequest struct { + Id uint64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` +} + +func (m *QueryGetPoolMetadataRequest) Reset() { *m = QueryGetPoolMetadataRequest{} } +func (m *QueryGetPoolMetadataRequest) String() string { return proto.CompactTextString(m) } +func (*QueryGetPoolMetadataRequest) ProtoMessage() {} +func (*QueryGetPoolMetadataRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_4664128fddcf2b7a, []int{31} +} +func (m *QueryGetPoolMetadataRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryGetPoolMetadataRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryGetPoolMetadataRequest.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 *QueryGetPoolMetadataRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryGetPoolMetadataRequest.Merge(m, src) +} +func (m *QueryGetPoolMetadataRequest) XXX_Size() int { + return m.Size() +} +func (m *QueryGetPoolMetadataRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryGetPoolMetadataRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryGetPoolMetadataRequest proto.InternalMessageInfo + +func (m *QueryGetPoolMetadataRequest) GetId() uint64 { + if m != nil { + return m.Id + } + return 0 +} + +type QueryGetPoolMetadataResponse struct { + PoolMetadata PoolMetadata `protobuf:"bytes,1,opt,name=PoolMetadata,proto3" json:"PoolMetadata"` +} + +func (m *QueryGetPoolMetadataResponse) Reset() { *m = QueryGetPoolMetadataResponse{} } +func (m *QueryGetPoolMetadataResponse) String() string { return proto.CompactTextString(m) } +func (*QueryGetPoolMetadataResponse) ProtoMessage() {} +func (*QueryGetPoolMetadataResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_4664128fddcf2b7a, []int{32} +} +func (m *QueryGetPoolMetadataResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryGetPoolMetadataResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryGetPoolMetadataResponse.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 *QueryGetPoolMetadataResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryGetPoolMetadataResponse.Merge(m, src) +} +func (m *QueryGetPoolMetadataResponse) XXX_Size() int { + return m.Size() +} +func (m *QueryGetPoolMetadataResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QueryGetPoolMetadataResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryGetPoolMetadataResponse proto.InternalMessageInfo + +func (m *QueryGetPoolMetadataResponse) GetPoolMetadata() PoolMetadata { + if m != nil { + return m.PoolMetadata + } + return PoolMetadata{} +} + +type QueryAllPoolMetadataRequest struct { + Pagination *query.PageRequest `protobuf:"bytes,1,opt,name=pagination,proto3" json:"pagination,omitempty"` +} + +func (m *QueryAllPoolMetadataRequest) Reset() { *m = QueryAllPoolMetadataRequest{} } +func (m *QueryAllPoolMetadataRequest) String() string { return proto.CompactTextString(m) } +func (*QueryAllPoolMetadataRequest) ProtoMessage() {} +func (*QueryAllPoolMetadataRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_4664128fddcf2b7a, []int{33} +} +func (m *QueryAllPoolMetadataRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryAllPoolMetadataRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryAllPoolMetadataRequest.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 *QueryAllPoolMetadataRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryAllPoolMetadataRequest.Merge(m, src) +} +func (m *QueryAllPoolMetadataRequest) XXX_Size() int { + return m.Size() +} +func (m *QueryAllPoolMetadataRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryAllPoolMetadataRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryAllPoolMetadataRequest proto.InternalMessageInfo + +func (m *QueryAllPoolMetadataRequest) GetPagination() *query.PageRequest { + if m != nil { + return m.Pagination + } + return nil +} + +type QueryAllPoolMetadataResponse struct { + PoolMetadata []PoolMetadata `protobuf:"bytes,1,rep,name=PoolMetadata,proto3" json:"PoolMetadata"` + Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` +} + +func (m *QueryAllPoolMetadataResponse) Reset() { *m = QueryAllPoolMetadataResponse{} } +func (m *QueryAllPoolMetadataResponse) String() string { return proto.CompactTextString(m) } +func (*QueryAllPoolMetadataResponse) ProtoMessage() {} +func (*QueryAllPoolMetadataResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_4664128fddcf2b7a, []int{34} +} +func (m *QueryAllPoolMetadataResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryAllPoolMetadataResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryAllPoolMetadataResponse.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 *QueryAllPoolMetadataResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryAllPoolMetadataResponse.Merge(m, src) +} +func (m *QueryAllPoolMetadataResponse) XXX_Size() int { + return m.Size() +} +func (m *QueryAllPoolMetadataResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QueryAllPoolMetadataResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryAllPoolMetadataResponse proto.InternalMessageInfo + +func (m *QueryAllPoolMetadataResponse) GetPoolMetadata() []PoolMetadata { + if m != nil { + return m.PoolMetadata + } + return nil +} + +func (m *QueryAllPoolMetadataResponse) GetPagination() *query.PageResponse { + if m != nil { + return m.Pagination + } + return nil +} + +func init() { + proto.RegisterType((*QueryParamsRequest)(nil), "duality.dex.QueryParamsRequest") + proto.RegisterType((*QueryParamsResponse)(nil), "duality.dex.QueryParamsResponse") + proto.RegisterType((*QueryGetLimitOrderTrancheUserRequest)(nil), "duality.dex.QueryGetLimitOrderTrancheUserRequest") + proto.RegisterType((*QueryGetLimitOrderTrancheUserResponse)(nil), "duality.dex.QueryGetLimitOrderTrancheUserResponse") + proto.RegisterType((*QueryAllLimitOrderTrancheUserRequest)(nil), "duality.dex.QueryAllLimitOrderTrancheUserRequest") + proto.RegisterType((*QueryAllLimitOrderTrancheUserResponse)(nil), "duality.dex.QueryAllLimitOrderTrancheUserResponse") + proto.RegisterType((*QueryGetLimitOrderTrancheRequest)(nil), "duality.dex.QueryGetLimitOrderTrancheRequest") + proto.RegisterType((*QueryGetLimitOrderTrancheResponse)(nil), "duality.dex.QueryGetLimitOrderTrancheResponse") + proto.RegisterType((*QueryAllLimitOrderTrancheRequest)(nil), "duality.dex.QueryAllLimitOrderTrancheRequest") + proto.RegisterType((*QueryAllLimitOrderTrancheResponse)(nil), "duality.dex.QueryAllLimitOrderTrancheResponse") + proto.RegisterType((*QueryAllUserDepositsRequest)(nil), "duality.dex.QueryAllUserDepositsRequest") + proto.RegisterType((*QueryAllUserDepositsResponse)(nil), "duality.dex.QueryAllUserDepositsResponse") + proto.RegisterType((*QueryAllUserLimitOrdersRequest)(nil), "duality.dex.QueryAllUserLimitOrdersRequest") + proto.RegisterType((*QueryAllUserLimitOrdersResponse)(nil), "duality.dex.QueryAllUserLimitOrdersResponse") + proto.RegisterType((*QueryAllTickLiquidityRequest)(nil), "duality.dex.QueryAllTickLiquidityRequest") + proto.RegisterType((*QueryAllTickLiquidityResponse)(nil), "duality.dex.QueryAllTickLiquidityResponse") + proto.RegisterType((*QueryGetInactiveLimitOrderTrancheRequest)(nil), "duality.dex.QueryGetInactiveLimitOrderTrancheRequest") + proto.RegisterType((*QueryGetInactiveLimitOrderTrancheResponse)(nil), "duality.dex.QueryGetInactiveLimitOrderTrancheResponse") + proto.RegisterType((*QueryAllInactiveLimitOrderTrancheRequest)(nil), "duality.dex.QueryAllInactiveLimitOrderTrancheRequest") + proto.RegisterType((*QueryAllInactiveLimitOrderTrancheResponse)(nil), "duality.dex.QueryAllInactiveLimitOrderTrancheResponse") + proto.RegisterType((*QueryAllPoolReservesRequest)(nil), "duality.dex.QueryAllPoolReservesRequest") + proto.RegisterType((*QueryAllPoolReservesResponse)(nil), "duality.dex.QueryAllPoolReservesResponse") + proto.RegisterType((*QueryGetPoolReservesRequest)(nil), "duality.dex.QueryGetPoolReservesRequest") + proto.RegisterType((*QueryGetPoolReservesResponse)(nil), "duality.dex.QueryGetPoolReservesResponse") + proto.RegisterType((*QueryEstimateMultiHopSwapRequest)(nil), "duality.dex.QueryEstimateMultiHopSwapRequest") + proto.RegisterType((*QueryEstimateMultiHopSwapResponse)(nil), "duality.dex.QueryEstimateMultiHopSwapResponse") + proto.RegisterType((*QueryEstimatePlaceLimitOrderRequest)(nil), "duality.dex.QueryEstimatePlaceLimitOrderRequest") + proto.RegisterType((*QueryEstimatePlaceLimitOrderResponse)(nil), "duality.dex.QueryEstimatePlaceLimitOrderResponse") + proto.RegisterType((*QueryPoolRequest)(nil), "duality.dex.QueryPoolRequest") + proto.RegisterType((*QueryPoolByIDRequest)(nil), "duality.dex.QueryPoolByIDRequest") + proto.RegisterType((*QueryPoolResponse)(nil), "duality.dex.QueryPoolResponse") + proto.RegisterType((*QueryGetPoolMetadataRequest)(nil), "duality.dex.QueryGetPoolMetadataRequest") + proto.RegisterType((*QueryGetPoolMetadataResponse)(nil), "duality.dex.QueryGetPoolMetadataResponse") + proto.RegisterType((*QueryAllPoolMetadataRequest)(nil), "duality.dex.QueryAllPoolMetadataRequest") + proto.RegisterType((*QueryAllPoolMetadataResponse)(nil), "duality.dex.QueryAllPoolMetadataResponse") +} + +func init() { proto.RegisterFile("duality/dex/query.proto", fileDescriptor_4664128fddcf2b7a) } + +var fileDescriptor_4664128fddcf2b7a = []byte{ + // 2098 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x5a, 0xcf, 0x6f, 0x1c, 0x49, + 0x15, 0x4e, 0x79, 0x1c, 0xc7, 0xa9, 0xec, 0xe6, 0x47, 0xc5, 0xd9, 0x4c, 0x26, 0xde, 0x19, 0xa7, + 0x49, 0x62, 0xe7, 0x87, 0xbb, 0x63, 0x2f, 0x59, 0x89, 0x65, 0x05, 0xd8, 0xeb, 0x4d, 0x76, 0x20, + 0x21, 0xa6, 0x77, 0x72, 0x59, 0x24, 0x86, 0xf6, 0x4c, 0xc5, 0x6e, 0xb9, 0xa7, 0xbb, 0xd3, 0x5d, + 0x93, 0x78, 0x64, 0x59, 0x48, 0x7b, 0x41, 0x42, 0x20, 0x16, 0x58, 0x09, 0x84, 0xe0, 0x80, 0x10, + 0xb7, 0x20, 0x56, 0x1c, 0xe0, 0x86, 0x38, 0x70, 0xc8, 0x31, 0x12, 0x97, 0x15, 0x87, 0x01, 0x25, + 0x48, 0x48, 0x39, 0xfa, 0x2f, 0x40, 0x55, 0xfd, 0x7a, 0xa6, 0x7a, 0xa6, 0x7a, 0x7a, 0x26, 0x99, + 0xdd, 0x3d, 0xb9, 0xbb, 0xfa, 0x55, 0xbd, 0xef, 0x7d, 0xf5, 0x55, 0xbd, 0xaa, 0x37, 0xc6, 0xa7, + 0xeb, 0x4d, 0xcb, 0xb1, 0x59, 0xcb, 0xa8, 0xd3, 0x1d, 0xe3, 0x7e, 0x93, 0x06, 0x2d, 0xdd, 0x0f, + 0x3c, 0xe6, 0x91, 0x23, 0xf0, 0x41, 0xaf, 0xd3, 0x9d, 0xc2, 0xcc, 0xa6, 0xb7, 0xe9, 0x89, 0x76, + 0x83, 0x3f, 0x45, 0x26, 0x85, 0xd9, 0x4d, 0xcf, 0xdb, 0x74, 0xa8, 0x61, 0xf9, 0xb6, 0x61, 0xb9, + 0xae, 0xc7, 0x2c, 0x66, 0x7b, 0x6e, 0x08, 0x5f, 0x2f, 0xd7, 0xbc, 0xb0, 0xe1, 0x85, 0xc6, 0x86, + 0x15, 0xd2, 0x68, 0x64, 0xe3, 0xc1, 0xd2, 0x06, 0x65, 0xd6, 0x92, 0xe1, 0x5b, 0x9b, 0xb6, 0x2b, + 0x8c, 0xc1, 0x36, 0x2f, 0xa3, 0xf0, 0xad, 0xc0, 0x6a, 0x74, 0x46, 0x91, 0xbf, 0x38, 0x76, 0xc3, + 0x66, 0x55, 0x2f, 0xa8, 0xd3, 0xa0, 0xca, 0x02, 0xcb, 0xad, 0x6d, 0xd1, 0x6a, 0x33, 0xa4, 0x01, + 0xd8, 0x5e, 0xc8, 0xb0, 0x05, 0xb3, 0x39, 0xd9, 0xac, 0x4e, 0x7d, 0x2f, 0xb4, 0x59, 0x35, 0xa0, + 0x35, 0x2f, 0xa8, 0xab, 0x2c, 0x98, 0x5d, 0xdb, 0xae, 0x3a, 0xf6, 0xfd, 0xa6, 0x5d, 0xe7, 0x74, + 0x44, 0x16, 0xa5, 0x04, 0x60, 0xcf, 0x73, 0xaa, 0x01, 0x0d, 0x69, 0xf0, 0x80, 0xc6, 0xb8, 0x67, + 0x12, 0x43, 0xec, 0x40, 0x6b, 0x51, 0xe6, 0x24, 0x66, 0xa3, 0xe6, 0xd9, 0x31, 0x0f, 0x25, 0x60, + 0x54, 0xbc, 0x6d, 0x34, 0xef, 0x19, 0xcc, 0x6e, 0xd0, 0x90, 0x59, 0x0d, 0x1f, 0x0c, 0x5e, 0xeb, + 0xf5, 0x9b, 0x8a, 0xa7, 0x41, 0x99, 0x55, 0xb7, 0x98, 0x15, 0x19, 0x68, 0x33, 0x98, 0x7c, 0x87, + 0xcf, 0xc1, 0xba, 0x20, 0xd7, 0xa4, 0xf7, 0x9b, 0x34, 0x64, 0xda, 0x7b, 0xf8, 0x64, 0xa2, 0x35, + 0xf4, 0x3d, 0x37, 0xa4, 0x64, 0x09, 0x4f, 0x45, 0x93, 0x90, 0x47, 0x73, 0x68, 0xe1, 0xc8, 0xf2, + 0x49, 0x5d, 0x12, 0x83, 0x1e, 0x19, 0xaf, 0x4e, 0x3e, 0x6e, 0x97, 0x0e, 0x98, 0x60, 0xa8, 0x7d, + 0x1f, 0x9f, 0x17, 0x23, 0xdd, 0xa4, 0xec, 0x16, 0x67, 0xfe, 0x0e, 0x27, 0xbe, 0x12, 0xf1, 0x7e, + 0x37, 0xa4, 0x01, 0x78, 0x24, 0x79, 0x7c, 0xc8, 0xaa, 0xd7, 0x03, 0x1a, 0x46, 0x63, 0x1f, 0x36, + 0xe3, 0x57, 0x52, 0xc4, 0x18, 0xe6, 0xe9, 0x5b, 0xb4, 0x95, 0x9f, 0x10, 0x1f, 0xa5, 0x16, 0xed, + 0x87, 0x08, 0x5f, 0xc8, 0x70, 0x01, 0xf0, 0xbf, 0x87, 0x4f, 0x29, 0x0d, 0x20, 0x1a, 0x2d, 0x11, + 0x8d, 0xd2, 0x52, 0x04, 0x87, 0x4c, 0xf5, 0x30, 0x9a, 0x0b, 0xb1, 0xae, 0x38, 0xce, 0xc0, 0x58, + 0x6f, 0x60, 0xdc, 0x55, 0x3a, 0x38, 0xbf, 0xa8, 0x47, 0x12, 0xd0, 0xb9, 0x04, 0xf4, 0x68, 0xc1, + 0x81, 0x10, 0xf4, 0x75, 0x6b, 0x93, 0x42, 0x5f, 0x53, 0xea, 0xa9, 0x3d, 0x89, 0x23, 0x4f, 0x77, + 0x98, 0x1d, 0x79, 0x6e, 0x0c, 0x91, 0x93, 0x9b, 0x89, 0x88, 0x26, 0x44, 0x44, 0xf3, 0x99, 0x11, + 0x45, 0xe0, 0x12, 0x21, 0xfd, 0x1c, 0xe1, 0xb9, 0xd4, 0xc9, 0x8c, 0xf9, 0x7b, 0x8d, 0xcb, 0xd0, + 0x0e, 0xca, 0x6b, 0x20, 0x15, 0x78, 0x23, 0xb3, 0xf8, 0x30, 0x5f, 0x94, 0x65, 0xb7, 0x4e, 0x77, + 0x04, 0x88, 0x9c, 0xd9, 0x6d, 0xe0, 0x0a, 0x63, 0xde, 0x36, 0x75, 0xcb, 0x6e, 0x3e, 0x17, 0x29, + 0x0c, 0x5e, 0x7b, 0x14, 0x36, 0xd9, 0xa7, 0xb0, 0x87, 0xf8, 0xdc, 0x00, 0x4c, 0x40, 0xb1, 0x89, + 0x4f, 0xf4, 0x7d, 0x84, 0xb9, 0x2d, 0x0e, 0xa6, 0x17, 0xa8, 0xed, 0xef, 0xae, 0xfd, 0x26, 0x66, + 0x43, 0x35, 0xc1, 0x59, 0x6c, 0x48, 0xf1, 0x4e, 0x24, 0xe3, 0x4d, 0xea, 0x2f, 0xf7, 0xc2, 0xfa, + 0xfb, 0x3b, 0x02, 0x62, 0xd4, 0xf0, 0x06, 0x13, 0x93, 0x7b, 0x09, 0x62, 0xc6, 0xa7, 0xb7, 0x1f, + 0xe0, 0xb3, 0x71, 0x04, 0x5c, 0xc8, 0x6b, 0xd1, 0xae, 0x1f, 0x66, 0xef, 0x4a, 0x37, 0x14, 0x08, + 0x5e, 0x84, 0xc3, 0x3f, 0x20, 0x3c, 0xab, 0x46, 0x00, 0xf4, 0xbd, 0x8d, 0xa7, 0xe3, 0x36, 0x60, + 0xad, 0x90, 0x60, 0x0d, 0x3e, 0x9a, 0x22, 0x4f, 0x01, 0x63, 0x9d, 0x1e, 0xe3, 0x23, 0xea, 0x43, + 0x84, 0x8b, 0x32, 0xce, 0xee, 0x9c, 0x7c, 0x8e, 0x64, 0xfd, 0x05, 0xe1, 0x52, 0x2a, 0x08, 0xe0, + 0xeb, 0x9b, 0xf8, 0x88, 0xd3, 0x6d, 0x1e, 0x79, 0x83, 0x93, 0x3b, 0x8f, 0x8f, 0xbd, 0x5f, 0x49, + 0xb3, 0x5c, 0xb1, 0x6b, 0xdb, 0xb7, 0xe2, 0x63, 0xc3, 0x17, 0xbf, 0x88, 0x3f, 0x41, 0xf8, 0xf5, + 0x14, 0x68, 0xc0, 0xe8, 0x0d, 0xfc, 0x2a, 0x93, 0x3f, 0x28, 0x65, 0x98, 0xe8, 0x0a, 0x5c, 0x26, + 0xbb, 0x8d, 0x8f, 0xcd, 0x5f, 0x23, 0xbc, 0x10, 0x6f, 0xc8, 0x65, 0xd7, 0xaa, 0x31, 0xfb, 0x01, + 0x1d, 0xe3, 0xf6, 0x98, 0x48, 0x23, 0xb9, 0xde, 0x34, 0x92, 0x95, 0x2c, 0x7e, 0x8a, 0xf0, 0xa5, + 0x21, 0xc0, 0x01, 0xb7, 0x1b, 0xf8, 0x8c, 0x9d, 0x66, 0x34, 0x52, 0xf6, 0x48, 0x1f, 0x46, 0x0b, + 0x80, 0xad, 0x15, 0xc7, 0xc9, 0x64, 0x6b, 0x5c, 0x47, 0x93, 0x4f, 0x63, 0x16, 0x06, 0x3b, 0x1d, + 0x8e, 0x85, 0xdc, 0x18, 0x58, 0x18, 0x9f, 0xfa, 0x7e, 0x89, 0xba, 0x39, 0x63, 0xdd, 0xf3, 0x1c, + 0x13, 0x0e, 0xf8, 0x5f, 0xfc, 0x52, 0x7e, 0x24, 0xed, 0x32, 0x49, 0x64, 0xc0, 0xf3, 0x3b, 0xf8, + 0x15, 0x5f, 0x6a, 0x07, 0x6a, 0xcf, 0x24, 0x4f, 0xf1, 0x92, 0x01, 0xb0, 0x9a, 0xe8, 0x34, 0xfe, + 0xdc, 0x7b, 0x93, 0xb2, 0xf1, 0xf0, 0x38, 0x78, 0xe1, 0x1e, 0xc7, 0xb9, 0x7b, 0x94, 0x8a, 0x15, + 0x3b, 0x69, 0xf2, 0x47, 0xad, 0x06, 0x74, 0xf5, 0x01, 0x48, 0xa5, 0x0b, 0x8d, 0x4c, 0x97, 0xf6, + 0xc7, 0x1c, 0x9c, 0xe1, 0xde, 0x0d, 0x99, 0xdd, 0xb0, 0x18, 0xbd, 0xdd, 0x74, 0x98, 0xfd, 0x9e, + 0xe7, 0xbf, 0xff, 0xd0, 0xf2, 0xa5, 0xd4, 0x59, 0x0b, 0xa8, 0xc5, 0xbc, 0x20, 0x4e, 0x9d, 0xf0, + 0x4a, 0x0a, 0x78, 0x3a, 0xa0, 0x35, 0x6a, 0x3f, 0xa0, 0x01, 0x84, 0xdb, 0x79, 0x27, 0xcb, 0x78, + 0x2a, 0xf0, 0x9a, 0x8c, 0x86, 0xf9, 0x9c, 0x62, 0x47, 0x8e, 0xfd, 0x98, 0xdc, 0xc4, 0x04, 0x4b, + 0x62, 0xe3, 0x69, 0xab, 0xe1, 0x35, 0x5d, 0x56, 0x76, 0xa3, 0xcd, 0x6b, 0xf5, 0x36, 0xbf, 0xaf, + 0xfd, 0xab, 0x5d, 0xba, 0xb8, 0x69, 0xb3, 0xad, 0xe6, 0x86, 0x5e, 0xf3, 0x1a, 0x06, 0x5c, 0x47, + 0xa3, 0x3f, 0x8b, 0x61, 0x7d, 0xdb, 0x60, 0x2d, 0x9f, 0x86, 0x7a, 0xd9, 0x65, 0xcf, 0xdb, 0xa5, + 0xce, 0x08, 0xfb, 0xed, 0xd2, 0xb1, 0x96, 0xd5, 0x70, 0xde, 0xd2, 0xe2, 0x16, 0xcd, 0xec, 0x7c, + 0x24, 0x3f, 0x41, 0xf8, 0x28, 0xdd, 0xb1, 0xa3, 0x33, 0xf3, 0x7a, 0x60, 0xd7, 0x68, 0xfe, 0xa0, + 0xf0, 0x48, 0xc1, 0xe3, 0xb2, 0xe4, 0x11, 0x90, 0x2f, 0x3a, 0xd6, 0x46, 0x18, 0xbf, 0x18, 0x4d, + 0x66, 0x3b, 0xa1, 0xd1, 0xb0, 0xd8, 0x96, 0xbe, 0x1e, 0xd0, 0xda, 0x1a, 0xad, 0x3d, 0x6f, 0x97, + 0x7a, 0xc6, 0xdc, 0x6f, 0x97, 0x4e, 0x45, 0x18, 0x92, 0xed, 0x9a, 0xd9, 0x63, 0x48, 0xce, 0xe3, + 0x57, 0x7d, 0xbb, 0xb6, 0xbd, 0xca, 0x97, 0x0d, 0x27, 0x23, 0x3f, 0x35, 0x87, 0x16, 0xa6, 0xcd, + 0x64, 0xa3, 0xf6, 0x71, 0x7c, 0xa8, 0x55, 0xcf, 0x17, 0x48, 0xc3, 0xc3, 0x87, 0xf8, 0xf5, 0xfc, + 0x4e, 0x93, 0x75, 0x54, 0x21, 0xaf, 0x80, 0x58, 0xfb, 0xef, 0x78, 0xb6, 0xbb, 0xfa, 0x16, 0x84, + 0x3b, 0x3f, 0x04, 0xc1, 0xbc, 0xc3, 0xf3, 0x76, 0x29, 0x1e, 0xdc, 0x8c, 0x1f, 0xb4, 0x47, 0x93, + 0xf8, 0x4b, 0x09, 0x58, 0xeb, 0x8e, 0x55, 0x93, 0xb6, 0xb9, 0x97, 0x53, 0x52, 0xfa, 0xdd, 0xa8, + 0x80, 0xa7, 0xc5, 0x23, 0x8f, 0x34, 0x4a, 0x76, 0x9d, 0x77, 0x72, 0x19, 0x1f, 0xef, 0x2c, 0xaf, + 0xb2, 0x5b, 0xf1, 0xb8, 0xcd, 0x41, 0xb1, 0xec, 0xfa, 0xda, 0x13, 0xba, 0x9b, 0xfa, 0x6c, 0x75, + 0xf7, 0x15, 0x7c, 0x58, 0x94, 0x77, 0x2a, 0x2d, 0x9f, 0xe6, 0x0f, 0xcd, 0xa1, 0x85, 0xa3, 0xcb, + 0x67, 0xd3, 0xb2, 0x47, 0xcb, 0xa7, 0x66, 0xd7, 0x9a, 0xdc, 0xe2, 0x8a, 0xf5, 0xed, 0x40, 0x6c, + 0x50, 0x15, 0xbb, 0x41, 0xf3, 0xd3, 0x62, 0x76, 0x0b, 0x7a, 0x54, 0x80, 0xd1, 0xe3, 0x02, 0x8c, + 0x5e, 0x89, 0x0b, 0x30, 0xab, 0xd3, 0x7c, 0xd1, 0x7f, 0xf4, 0xef, 0x12, 0x32, 0x7b, 0xfa, 0x92, + 0x16, 0x7e, 0xa5, 0x61, 0xed, 0xac, 0x08, 0x5c, 0x9c, 0x9b, 0xc3, 0x22, 0xee, 0xbb, 0xdc, 0x7e, + 0xa4, 0xb8, 0x13, 0xa3, 0xec, 0xb7, 0x4b, 0x27, 0xa3, 0xd8, 0xe5, 0x56, 0xcd, 0x4c, 0x18, 0x69, + 0xed, 0x1c, 0xd4, 0x22, 0x52, 0xe5, 0x02, 0x42, 0xfe, 0x19, 0xc2, 0x47, 0x98, 0xc7, 0x2c, 0xa7, + 0xec, 0x72, 0xed, 0x65, 0xab, 0xb9, 0x32, 0xba, 0x9a, 0x65, 0x07, 0xfb, 0xed, 0x12, 0x89, 0xe0, + 0x4b, 0x8d, 0x9a, 0x29, 0x9b, 0xf0, 0x8d, 0x03, 0x87, 0x0f, 0x2d, 0x1f, 0x20, 0x4d, 0x64, 0x41, + 0x32, 0x47, 0x87, 0x24, 0x8d, 0xbf, 0xdf, 0x2e, 0x9d, 0x88, 0x10, 0x75, 0xdb, 0x34, 0x53, 0x32, + 0x10, 0x1c, 0xf1, 0xd7, 0x3b, 0x4d, 0x26, 0x00, 0xe5, 0x3e, 0x0b, 0x8e, 0x24, 0x07, 0x5d, 0x8e, + 0xa4, 0x46, 0xcd, 0x94, 0x4d, 0xb4, 0x0f, 0xf0, 0xf1, 0xa8, 0x42, 0x27, 0x72, 0xcd, 0xcb, 0xd4, + 0x45, 0x20, 0x2f, 0xe6, 0xba, 0x79, 0x51, 0xc7, 0x33, 0x9d, 0xb1, 0x57, 0x5b, 0xe5, 0x35, 0x79, + 0x7c, 0xcf, 0x73, 0x60, 0xfc, 0x49, 0x13, 0xde, 0xb4, 0x6f, 0xe0, 0x13, 0x12, 0x16, 0x10, 0xd6, + 0x15, 0x3c, 0xc9, 0x3f, 0x83, 0xa0, 0x4e, 0xf4, 0x25, 0x4d, 0x48, 0x96, 0xc2, 0x48, 0x5b, 0x4c, + 0x1e, 0x05, 0x6e, 0x43, 0x8d, 0x32, 0x76, 0x7c, 0x14, 0x4f, 0xd8, 0x75, 0x70, 0x3a, 0x61, 0xd7, + 0x7b, 0x13, 0x77, 0xd7, 0xbc, 0x9b, 0xb8, 0xe5, 0xf6, 0xd4, 0xc4, 0x1d, 0x1b, 0x40, 0xcd, 0x32, + 0xd1, 0x49, 0xa3, 0xc9, 0x63, 0x5e, 0x2f, 0xa6, 0x71, 0x9d, 0x94, 0x7b, 0x0f, 0x6d, 0x43, 0x04, + 0x93, 0x1b, 0x39, 0x98, 0xb1, 0x1d, 0xda, 0x96, 0xff, 0x7a, 0x1a, 0x1f, 0x14, 0x70, 0xc9, 0x16, + 0x9e, 0x8a, 0x2a, 0xbe, 0xa4, 0x94, 0xc0, 0xd2, 0x5f, 0x4e, 0x2e, 0xcc, 0xa5, 0x1b, 0x44, 0x2e, + 0xb4, 0xb3, 0x1f, 0xfe, 0xf3, 0xbf, 0xbf, 0x98, 0x38, 0x45, 0x4e, 0x1a, 0xfd, 0x15, 0x7f, 0xf2, + 0x0f, 0x94, 0x52, 0xbe, 0x24, 0x4b, 0xfd, 0x03, 0x67, 0x14, 0x9a, 0x0b, 0xcb, 0xa3, 0x74, 0x01, + 0x74, 0x6b, 0x02, 0xdd, 0xd7, 0xc8, 0xdb, 0xc6, 0x30, 0xbf, 0x3a, 0x18, 0xbb, 0x50, 0xf7, 0xd8, + 0x33, 0x76, 0xbb, 0x17, 0xc3, 0x3d, 0xf2, 0x09, 0xc2, 0x79, 0xa5, 0x9f, 0x15, 0xc7, 0x51, 0x45, + 0x92, 0x51, 0x46, 0x56, 0x45, 0x92, 0x55, 0x08, 0xd6, 0x16, 0x45, 0x24, 0xf3, 0xe4, 0xc2, 0x50, + 0x91, 0x70, 0xc8, 0xe7, 0xd2, 0x20, 0xaf, 0xb6, 0x56, 0xa0, 0xbc, 0x73, 0x45, 0x09, 0x44, 0x5d, + 0x25, 0x2a, 0x5c, 0x1d, 0xce, 0x18, 0xf0, 0x5e, 0x13, 0x78, 0x2f, 0x93, 0x85, 0x04, 0x5e, 0xc1, + 0xb2, 0x04, 0x3a, 0xec, 0x52, 0x4e, 0x1e, 0x23, 0x45, 0xbd, 0x91, 0x2c, 0x0e, 0x37, 0xeb, 0x31, + 0x48, 0x7d, 0x58, 0x73, 0x80, 0x59, 0x11, 0x30, 0xbf, 0x4d, 0x6e, 0x65, 0xd1, 0x6a, 0xec, 0x46, + 0x7b, 0x32, 0x97, 0x46, 0x74, 0xc2, 0xe2, 0x4f, 0xf1, 0x5e, 0xdc, 0x23, 0x98, 0x3f, 0x23, 0x3c, + 0xd3, 0xe7, 0x93, 0x8b, 0x65, 0x71, 0xb8, 0x99, 0x1f, 0x10, 0xcd, 0xa0, 0x8a, 0xad, 0xf6, 0x55, + 0x11, 0xcd, 0x75, 0xf2, 0xc6, 0x0b, 0x44, 0x43, 0x3e, 0x46, 0xf8, 0x98, 0x5c, 0xc8, 0xe4, 0x78, + 0x17, 0x52, 0xe7, 0xbc, 0xa7, 0xe0, 0x5a, 0xb8, 0x34, 0x84, 0x25, 0xa0, 0xbc, 0x2a, 0x50, 0x5e, + 0x24, 0xe7, 0xfb, 0xa5, 0x01, 0x3f, 0xde, 0xc9, 0xb2, 0xf8, 0x1d, 0xc2, 0xc7, 0x13, 0x35, 0x2a, + 0x8e, 0x4b, 0xed, 0x4d, 0x55, 0xa0, 0x2b, 0x5c, 0x1e, 0xc6, 0x14, 0x90, 0xbd, 0x29, 0x90, 0x5d, + 0x23, 0xba, 0x91, 0xfe, 0x7b, 0xa1, 0x8a, 0xba, 0xff, 0x21, 0x7c, 0x26, 0xb5, 0x58, 0x42, 0xae, + 0x2b, 0x35, 0x99, 0x55, 0xd1, 0x29, 0xbc, 0x39, 0x6a, 0x37, 0x08, 0xe2, 0xbb, 0x22, 0x88, 0xbb, + 0xe4, 0xfd, 0x44, 0x10, 0xf7, 0x6c, 0xc7, 0xa1, 0xf5, 0xea, 0xcb, 0x2a, 0xfb, 0x6f, 0x08, 0xcf, + 0xa6, 0x42, 0xe0, 0x33, 0x73, 0x5d, 0x49, 0xf7, 0x8b, 0x04, 0x3b, 0x4c, 0x01, 0x4a, 0x33, 0x44, + 0xb0, 0x97, 0xc8, 0xfc, 0x90, 0xc1, 0x92, 0xdf, 0x22, 0x7c, 0x4c, 0xbe, 0xfa, 0xa7, 0xab, 0x5c, + 0x51, 0xda, 0x48, 0x51, 0xb9, 0xaa, 0x06, 0xa1, 0x5d, 0x17, 0xc8, 0x0c, 0xb2, 0x68, 0xa4, 0xfe, + 0xb2, 0xac, 0x92, 0xd2, 0x23, 0x14, 0x9d, 0x1a, 0x3a, 0x55, 0x9b, 0x05, 0xa5, 0x0c, 0x86, 0x04, + 0x97, 0x52, 0x20, 0xd1, 0x6e, 0x0a, 0x70, 0x2b, 0xe4, 0xeb, 0x23, 0x81, 0x4b, 0xca, 0xe2, 0x1e, + 0xa5, 0x7b, 0xe4, 0xf7, 0x08, 0xcf, 0xa8, 0xee, 0xdb, 0xaa, 0x9d, 0x6e, 0x40, 0x1d, 0x45, 0xb5, + 0xd3, 0x0d, 0xba, 0xc6, 0xa7, 0xec, 0x21, 0x14, 0xba, 0x54, 0x1b, 0xbc, 0x4f, 0x75, 0xcb, 0xf3, + 0xab, 0xfc, 0xe8, 0x4d, 0xfe, 0x84, 0xf0, 0xe9, 0x94, 0xfb, 0x14, 0xb9, 0x96, 0xee, 0x59, 0x7d, + 0x53, 0x2f, 0x2c, 0x8d, 0xd0, 0x63, 0xa0, 0x4c, 0x3b, 0x70, 0x7d, 0xde, 0x4d, 0x96, 0x2b, 0xd9, + 0xc5, 0x93, 0x7c, 0xe2, 0xc8, 0xeb, 0x8a, 0x03, 0x58, 0xf7, 0xe2, 0x50, 0x28, 0xa6, 0x7d, 0x06, + 0xbf, 0x5f, 0x16, 0x7e, 0x75, 0x72, 0xb5, 0x6f, 0x9e, 0xe5, 0xe9, 0xed, 0x9d, 0xd4, 0xfb, 0x78, + 0x3a, 0xbe, 0x41, 0x90, 0x73, 0x6a, 0x0f, 0xd2, 0xed, 0x22, 0x13, 0x84, 0x26, 0x40, 0xcc, 0x92, + 0x82, 0x0a, 0x84, 0xb8, 0x88, 0xec, 0x91, 0x1f, 0xa3, 0xe4, 0x61, 0x79, 0x80, 0xec, 0x7b, 0xce, + 0xf3, 0x03, 0x64, 0xdf, 0x7b, 0x22, 0xd7, 0xe6, 0x05, 0x92, 0x73, 0xa4, 0x64, 0xa4, 0xfe, 0x77, + 0x85, 0xb1, 0x6b, 0xd7, 0xf7, 0xc8, 0x8f, 0x60, 0x97, 0x88, 0x47, 0x18, 0xbc, 0x4b, 0x0c, 0x81, + 0x28, 0xe5, 0x8e, 0x30, 0x80, 0x9b, 0x0e, 0xa2, 0xd5, 0x77, 0x1f, 0x3f, 0x2d, 0xa2, 0x27, 0x4f, + 0x8b, 0xe8, 0x3f, 0x4f, 0x8b, 0xe8, 0xa3, 0x67, 0xc5, 0x03, 0x4f, 0x9e, 0x15, 0x0f, 0x7c, 0xfa, + 0xac, 0x78, 0xe0, 0x83, 0x2b, 0x59, 0x75, 0xb8, 0x9d, 0x28, 0x81, 0xf1, 0xfb, 0xea, 0xc6, 0x94, + 0x28, 0x81, 0xbc, 0xf1, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc0, 0x56, 0x4c, 0xd7, 0x21, 0x24, + 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 LimitOrderTrancheMap 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 *QueryAllUserLimitOrdersRequest, opts ...grpc.CallOption) (*QueryAllUserLimitOrdersResponse, 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 multihop swap + 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) +} + +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, "/duality.dex.Query/Params", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *queryClient) LimitOrderTrancheUser(ctx context.Context, in *QueryGetLimitOrderTrancheUserRequest, opts ...grpc.CallOption) (*QueryGetLimitOrderTrancheUserResponse, error) { + out := new(QueryGetLimitOrderTrancheUserResponse) + err := c.cc.Invoke(ctx, "/duality.dex.Query/LimitOrderTrancheUser", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *queryClient) LimitOrderTrancheUserAll(ctx context.Context, in *QueryAllLimitOrderTrancheUserRequest, opts ...grpc.CallOption) (*QueryAllLimitOrderTrancheUserResponse, error) { + out := new(QueryAllLimitOrderTrancheUserResponse) + err := c.cc.Invoke(ctx, "/duality.dex.Query/LimitOrderTrancheUserAll", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *queryClient) LimitOrderTrancheUserAllByAddress(ctx context.Context, in *QueryAllUserLimitOrdersRequest, opts ...grpc.CallOption) (*QueryAllUserLimitOrdersResponse, error) { + out := new(QueryAllUserLimitOrdersResponse) + err := c.cc.Invoke(ctx, "/duality.dex.Query/LimitOrderTrancheUserAllByAddress", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *queryClient) LimitOrderTranche(ctx context.Context, in *QueryGetLimitOrderTrancheRequest, opts ...grpc.CallOption) (*QueryGetLimitOrderTrancheResponse, error) { + out := new(QueryGetLimitOrderTrancheResponse) + err := c.cc.Invoke(ctx, "/duality.dex.Query/LimitOrderTranche", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *queryClient) LimitOrderTrancheAll(ctx context.Context, in *QueryAllLimitOrderTrancheRequest, opts ...grpc.CallOption) (*QueryAllLimitOrderTrancheResponse, error) { + out := new(QueryAllLimitOrderTrancheResponse) + err := c.cc.Invoke(ctx, "/duality.dex.Query/LimitOrderTrancheAll", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *queryClient) UserDepositsAll(ctx context.Context, in *QueryAllUserDepositsRequest, opts ...grpc.CallOption) (*QueryAllUserDepositsResponse, error) { + out := new(QueryAllUserDepositsResponse) + err := c.cc.Invoke(ctx, "/duality.dex.Query/UserDepositsAll", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *queryClient) TickLiquidityAll(ctx context.Context, in *QueryAllTickLiquidityRequest, opts ...grpc.CallOption) (*QueryAllTickLiquidityResponse, error) { + out := new(QueryAllTickLiquidityResponse) + err := c.cc.Invoke(ctx, "/duality.dex.Query/TickLiquidityAll", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *queryClient) InactiveLimitOrderTranche(ctx context.Context, in *QueryGetInactiveLimitOrderTrancheRequest, opts ...grpc.CallOption) (*QueryGetInactiveLimitOrderTrancheResponse, error) { + out := new(QueryGetInactiveLimitOrderTrancheResponse) + err := c.cc.Invoke(ctx, "/duality.dex.Query/InactiveLimitOrderTranche", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *queryClient) InactiveLimitOrderTrancheAll(ctx context.Context, in *QueryAllInactiveLimitOrderTrancheRequest, opts ...grpc.CallOption) (*QueryAllInactiveLimitOrderTrancheResponse, error) { + out := new(QueryAllInactiveLimitOrderTrancheResponse) + err := c.cc.Invoke(ctx, "/duality.dex.Query/InactiveLimitOrderTrancheAll", in, out, opts...) + if err != nil { + return nil, err + } + 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, "/duality.dex.Query/PoolReservesAll", in, out, opts...) + if err != nil { + return nil, err + } + 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, "/duality.dex.Query/PoolReserves", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *queryClient) EstimateMultiHopSwap(ctx context.Context, in *QueryEstimateMultiHopSwapRequest, opts ...grpc.CallOption) (*QueryEstimateMultiHopSwapResponse, error) { + out := new(QueryEstimateMultiHopSwapResponse) + err := c.cc.Invoke(ctx, "/duality.dex.Query/EstimateMultiHopSwap", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *queryClient) EstimatePlaceLimitOrder(ctx context.Context, in *QueryEstimatePlaceLimitOrderRequest, opts ...grpc.CallOption) (*QueryEstimatePlaceLimitOrderResponse, error) { + out := new(QueryEstimatePlaceLimitOrderResponse) + err := c.cc.Invoke(ctx, "/duality.dex.Query/EstimatePlaceLimitOrder", in, out, opts...) + if err != nil { + return nil, err + } + 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, "/duality.dex.Query/Pool", in, out, opts...) + if err != nil { + return nil, err + } + 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, "/duality.dex.Query/PoolByID", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *queryClient) PoolMetadata(ctx context.Context, in *QueryGetPoolMetadataRequest, opts ...grpc.CallOption) (*QueryGetPoolMetadataResponse, error) { + out := new(QueryGetPoolMetadataResponse) + err := c.cc.Invoke(ctx, "/duality.dex.Query/PoolMetadata", in, out, opts...) + if err != nil { + return nil, err + } + 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, "/duality.dex.Query/PoolMetadataAll", in, out, opts...) + if err != nil { + return nil, err + } + 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 LimitOrderTrancheMap items. + LimitOrderTrancheUserAll(context.Context, *QueryAllLimitOrderTrancheUserRequest) (*QueryAllLimitOrderTrancheUserResponse, error) + // Queries a list of LimitOrderTrancheUser items for a given address. + LimitOrderTrancheUserAllByAddress(context.Context, *QueryAllUserLimitOrdersRequest) (*QueryAllUserLimitOrdersResponse, 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 multihop swap + 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) +} + +// 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 (*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 *QueryAllUserLimitOrdersRequest) (*QueryAllUserLimitOrdersResponse, 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 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: "/duality.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 _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: "/duality.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 _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: "/duality.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 _Query_LimitOrderTrancheUserAllByAddress_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QueryAllUserLimitOrdersRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(QueryServer).LimitOrderTrancheUserAllByAddress(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/duality.dex.Query/LimitOrderTrancheUserAllByAddress", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(QueryServer).LimitOrderTrancheUserAllByAddress(ctx, req.(*QueryAllUserLimitOrdersRequest)) + } + return interceptor(ctx, in, info, handler) +} + +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) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/duality.dex.Query/LimitOrderTranche", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(QueryServer).LimitOrderTranche(ctx, req.(*QueryGetLimitOrderTrancheRequest)) + } + return interceptor(ctx, in, info, handler) +} + +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 + } + if interceptor == nil { + return srv.(QueryServer).LimitOrderTrancheAll(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/duality.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) +} + +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 + } + if interceptor == nil { + return srv.(QueryServer).UserDepositsAll(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/duality.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 _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 + } + if interceptor == nil { + return srv.(QueryServer).TickLiquidityAll(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/duality.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) +} + +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 + } + if interceptor == nil { + return srv.(QueryServer).InactiveLimitOrderTranche(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/duality.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 _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 interceptor == nil { + return srv.(QueryServer).InactiveLimitOrderTrancheAll(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/duality.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) +} + +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 + } + if interceptor == nil { + return srv.(QueryServer).PoolReservesAll(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/duality.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 _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 + } + if interceptor == nil { + return srv.(QueryServer).PoolReserves(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/duality.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 _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 + } + if interceptor == nil { + return srv.(QueryServer).EstimateMultiHopSwap(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/duality.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 _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: "/duality.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 _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 interceptor == nil { + return srv.(QueryServer).Pool(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/duality.dex.Query/Pool", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(QueryServer).Pool(ctx, req.(*QueryPoolRequest)) + } + return interceptor(ctx, in, info, handler) +} + +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 + } + if interceptor == nil { + return srv.(QueryServer).PoolByID(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/duality.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 _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: "/duality.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 _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 interceptor == nil { + return srv.(QueryServer).PoolMetadataAll(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/duality.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) +} + +var _Query_serviceDesc = grpc.ServiceDesc{ + ServiceName: "duality.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: "duality/dex/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 (m *QueryGetLimitOrderTrancheUserRequest) 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 *QueryGetLimitOrderTrancheUserRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryGetLimitOrderTrancheUserRequest) 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] = 0x12 + } + 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 *QueryGetLimitOrderTrancheUserResponse) 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 *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.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 + } + return len(dAtA) - i, nil +} + +func (m *QueryAllLimitOrderTrancheUserRequest) 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 *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 + } + return len(dAtA) - i, nil +} + +func (m *QueryAllLimitOrderTrancheUserResponse) 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 *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 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 + } + } + return len(dAtA) - i, nil +} + +func (m *QueryGetLimitOrderTrancheRequest) 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 *QueryGetLimitOrderTrancheRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +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 + } + 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 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))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *QueryGetLimitOrderTrancheResponse) 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 *QueryGetLimitOrderTrancheResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +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 + } + return len(dAtA) - i, nil +} + +func (m *QueryAllLimitOrderTrancheRequest) 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 *QueryAllLimitOrderTrancheRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +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 + } + 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 *QueryAllLimitOrderTrancheResponse) 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 *QueryAllLimitOrderTrancheResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +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 + } + 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 + } + } + return len(dAtA) - i, nil +} + +func (m *QueryAllUserDepositsRequest) 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 *QueryAllUserDepositsRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryAllUserDepositsRequest) 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 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 *QueryAllUserDepositsResponse) 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 *QueryAllUserDepositsResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryAllUserDepositsResponse) 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 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 len(dAtA) - i, nil +} + +func (m *QueryAllUserLimitOrdersRequest) 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 *QueryAllUserLimitOrdersRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryAllUserLimitOrdersRequest) 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 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 *QueryAllUserLimitOrdersResponse) 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 *QueryAllUserLimitOrdersResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryAllUserLimitOrdersResponse) 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 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 *QueryAllTickLiquidityRequest) 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 *QueryAllTickLiquidityRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryAllTickLiquidityRequest) 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 + } + 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) { + 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 *QueryAllTickLiquidityResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryAllTickLiquidityResponse) 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 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 + } + } + return len(dAtA) - i, nil +} + +func (m *QueryGetInactiveLimitOrderTrancheRequest) 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 *QueryGetInactiveLimitOrderTrancheRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryGetInactiveLimitOrderTrancheRequest) 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 + } + 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 + } + return len(dAtA) - i, nil +} + +func (m *QueryGetInactiveLimitOrderTrancheResponse) 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 *QueryGetInactiveLimitOrderTrancheResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryGetInactiveLimitOrderTrancheResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + 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-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *QueryAllInactiveLimitOrderTrancheRequest) 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 *QueryAllInactiveLimitOrderTrancheRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryAllInactiveLimitOrderTrancheRequest) 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 + } + return len(dAtA) - i, nil +} + +func (m *QueryAllInactiveLimitOrderTrancheResponse) 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 *QueryAllInactiveLimitOrderTrancheResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryAllInactiveLimitOrderTrancheResponse) 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 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 *QueryAllPoolReservesRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryAllPoolReservesRequest) 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 + } + 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 *QueryAllPoolReservesResponse) 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 *QueryAllPoolReservesResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryAllPoolReservesResponse) 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 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 *QueryGetPoolReservesRequest) 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 *QueryGetPoolReservesRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryGetPoolReservesRequest) 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))) + 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 *QueryGetPoolReservesResponse) 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 *QueryGetPoolReservesResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryGetPoolReservesResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.PoolReserves != nil { + { + size, err := m.PoolReserves.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) { + 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 *QueryEstimateMultiHopSwapRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryEstimateMultiHopSwapRequest) 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 + } + 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)) + } + 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))) + 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 (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 + } + return dAtA[:n], nil +} + +func (m *QueryEstimateMultiHopSwapResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryEstimateMultiHopSwapResponse) 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 + } + i = encodeVarintQuery(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + return len(dAtA) - i, nil +} + +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 dAtA[:n], nil +} + +func (m *QueryEstimatePlaceLimitOrderRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryEstimatePlaceLimitOrderRequest) 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)) + i-- + dAtA[i] = 0x28 + } + 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 + } + 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))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +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 dAtA[:n], nil +} + +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 + { + 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 + } + i = encodeVarintQuery(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + return len(dAtA) - i, nil +} + +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 + 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))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +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 dAtA[:n], nil +} + +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 + if m.PoolID != 0 { + i = encodeVarintQuery(dAtA, i, uint64(m.PoolID)) + 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 + } + 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 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 + } + return len(dAtA) - i, nil +} + +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 + if m.Id != 0 { + i = encodeVarintQuery(dAtA, i, uint64(m.Id)) + i-- + dAtA[i] = 0x8 + } + return len(dAtA) - i, nil +} + +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 + { + size, err := m.PoolMetadata.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 *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 dAtA[:n], nil +} + +func (m *QueryAllPoolMetadataRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryAllPoolMetadataRequest) 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 + } + return len(dAtA) - i, nil +} + +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 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.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 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 (m *QueryGetLimitOrderTrancheUserRequest) 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)) + } + l = len(m.TrancheKey) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +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)) + } + 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)) + } + 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 *QueryAllUserLimitOrdersRequest) 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 *QueryAllUserLimitOrdersResponse) 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 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 + 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 + 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 iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *QueryAllUserDepositsRequest) 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: QueryAllUserDepositsRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + 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 + 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 *QueryAllUserDepositsResponse) 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 postIndex > 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 + } + 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 *QueryAllUserLimitOrdersRequest) 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: QueryAllUserLimitOrdersRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryAllUserLimitOrdersRequest: 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 + 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 *QueryAllUserLimitOrdersResponse) 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: QueryAllUserLimitOrdersResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryAllUserLimitOrdersResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field LimitOrders", 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.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 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 *QueryAllTickLiquidityRequest) 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: QueryAllTickLiquidityRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + 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) + } + 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 *QueryAllTickLiquidityResponse) 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: QueryAllTickLiquidityResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + 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 TickLiquidity", 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.TickLiquidity = append(m.TickLiquidity, &TickLiquidity{}) + if err := m.TickLiquidity[len(m.TickLiquidity)-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 *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: + 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 != 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 != 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 *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 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.InactiveLimitOrderTranche == nil { + m.InactiveLimitOrderTranche = &LimitOrderTranche{} + } + if err := m.InactiveLimitOrderTranche.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 *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 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 *QueryAllInactiveLimitOrderTrancheResponse) 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: QueryAllInactiveLimitOrderTrancheResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + 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 InactiveLimitOrderTranche", 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.InactiveLimitOrderTranche = append(m.InactiveLimitOrderTranche, &LimitOrderTranche{}) + if err := m.InactiveLimitOrderTranche[len(m.InactiveLimitOrderTranche)-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 *QueryAllPoolReservesRequest) 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: QueryAllPoolReservesRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryAllPoolReservesRequest: 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 *QueryAllPoolReservesResponse) 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: QueryAllPoolReservesResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + 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 PoolReserves", 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.PoolReserves = append(m.PoolReserves, &PoolReserves{}) + if err := m.PoolReserves[len(m.PoolReserves)-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 *QueryGetPoolReservesRequest) 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: QueryGetPoolReservesRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + 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 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 != 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:]) + 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 *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: 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 PoolReserves", 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.PoolReserves == nil { + m.PoolReserves = &PoolReserves{} + } + if err := m.PoolReserves.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 *QueryEstimateMultiHopSwapRequest) 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: QueryEstimateMultiHopSwapRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + 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 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) + } + 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.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 { + return err + } + iNdEx = postIndex + case 5: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ExitLimitPrice", 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.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:]) + 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 *QueryEstimateMultiHopSwapResponse) 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: QueryEstimateMultiHopSwapResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + 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 CoinOut", 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.CoinOut.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 *QueryEstimatePlaceLimitOrderRequest) 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: QueryEstimatePlaceLimitOrderRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + 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 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) + } + 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 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 postIndex > l { + return io.ErrUnexpectedEOF + } + 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 + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > 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 + } + if postIndex > 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 + } + iNdEx = postIndex + case 9: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field MaxAmountOut", 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 github_com_cosmos_cosmos_sdk_types.Int + m.MaxAmountOut = &v + if err := m.MaxAmountOut.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 *QueryEstimatePlaceLimitOrderResponse) 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: QueryEstimatePlaceLimitOrderResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + 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 TotalInCoin", 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.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 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 + } + } + if msglen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.SwapInCoin.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + 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 + 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 *QueryPoolRequest) 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: QueryPoolRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryPoolRequest: 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 != 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:]) + 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 *QueryPoolByIDRequest) 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: QueryPoolByIDRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryPoolByIDRequest: 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) + } + m.PoolID = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.PoolID |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + 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 *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 + } + 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 Pool", 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.Pool == nil { + m.Pool = &Pool{} + } + 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 + } + 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:]) + 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 *QueryGetPoolMetadataResponse) 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: QueryGetPoolMetadataResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + 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 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 + } + if err := m.PoolMetadata.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 *QueryAllPoolMetadataRequest) 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: QueryAllPoolMetadataRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + 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 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 *QueryAllPoolMetadataResponse) 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: QueryAllPoolMetadataResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + 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 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) + } + 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 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/dex/types/query.pb.gw.go b/x/dex/types/query.pb.gw.go new file mode 100644 index 000000000..2392b6c0e --- /dev/null +++ b/x/dex/types/query.pb.gw.go @@ -0,0 +1,2200 @@ +// Code generated by protoc-gen-grpc-gateway. DO NOT EDIT. +// source: duality/dex/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 + +} + +func request_Query_LimitOrderTrancheUser_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryGetLimitOrderTrancheUserRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["address"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "address") + } + + protoReq.Address, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "address", err) + } + + val, ok = pathParams["trancheKey"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "trancheKey") + } + + protoReq.TrancheKey, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "trancheKey", err) + } + + msg, err := client.LimitOrderTrancheUser(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Query_LimitOrderTrancheUser_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryGetLimitOrderTrancheUserRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["address"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "address") + } + + protoReq.Address, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "address", err) + } + + val, ok = pathParams["trancheKey"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "trancheKey") + } + + protoReq.TrancheKey, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "trancheKey", err) + } + + msg, err := server.LimitOrderTrancheUser(ctx, &protoReq) + return msg, metadata, err + +} + +var ( + filter_Query_LimitOrderTrancheUserAll_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} +) + +func request_Query_LimitOrderTrancheUserAll_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryAllLimitOrderTrancheUserRequest + 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_LimitOrderTrancheUserAll_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := client.LimitOrderTrancheUserAll(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Query_LimitOrderTrancheUserAll_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryAllLimitOrderTrancheUserRequest + 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_LimitOrderTrancheUserAll_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := server.LimitOrderTrancheUserAll(ctx, &protoReq) + return msg, metadata, err + +} + +var ( + filter_Query_LimitOrderTrancheUserAllByAddress_0 = &utilities.DoubleArray{Encoding: map[string]int{"address": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}} +) + +func request_Query_LimitOrderTrancheUserAllByAddress_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryAllUserLimitOrdersRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["address"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "address") + } + + protoReq.Address, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "address", err) + } + + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_LimitOrderTrancheUserAllByAddress_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := client.LimitOrderTrancheUserAllByAddress(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Query_LimitOrderTrancheUserAllByAddress_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryAllUserLimitOrdersRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["address"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "address") + } + + protoReq.Address, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "address", err) + } + + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_LimitOrderTrancheUserAllByAddress_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := server.LimitOrderTrancheUserAllByAddress(ctx, &protoReq) + return msg, metadata, err + +} + +func request_Query_LimitOrderTranche_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryGetLimitOrderTrancheRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["pairID"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "pairID") + } + + protoReq.PairID, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "pairID", err) + } + + val, ok = pathParams["tokenIn"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "tokenIn") + } + + protoReq.TokenIn, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "tokenIn", err) + } + + val, ok = pathParams["tickIndex"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "tickIndex") + } + + protoReq.TickIndex, err = runtime.Int64(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "tickIndex", err) + } + + val, ok = pathParams["trancheKey"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "trancheKey") + } + + protoReq.TrancheKey, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "trancheKey", err) + } + + msg, err := client.LimitOrderTranche(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Query_LimitOrderTranche_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryGetLimitOrderTrancheRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["pairID"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "pairID") + } + + protoReq.PairID, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "pairID", err) + } + + val, ok = pathParams["tokenIn"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "tokenIn") + } + + protoReq.TokenIn, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "tokenIn", err) + } + + val, ok = pathParams["tickIndex"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "tickIndex") + } + + protoReq.TickIndex, err = runtime.Int64(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "tickIndex", err) + } + + val, ok = pathParams["trancheKey"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "trancheKey") + } + + protoReq.TrancheKey, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "trancheKey", err) + } + + msg, err := server.LimitOrderTranche(ctx, &protoReq) + return msg, metadata, err + +} + +var ( + filter_Query_LimitOrderTrancheAll_0 = &utilities.DoubleArray{Encoding: map[string]int{"pairID": 0, "tokenIn": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}} +) + +func request_Query_LimitOrderTrancheAll_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryAllLimitOrderTrancheRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["pairID"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "pairID") + } + + protoReq.PairID, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "pairID", err) + } + + val, ok = pathParams["tokenIn"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "tokenIn") + } + + protoReq.TokenIn, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "tokenIn", err) + } + + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_LimitOrderTrancheAll_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := client.LimitOrderTrancheAll(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Query_LimitOrderTrancheAll_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryAllLimitOrderTrancheRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["pairID"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "pairID") + } + + protoReq.PairID, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "pairID", err) + } + + val, ok = pathParams["tokenIn"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "tokenIn") + } + + protoReq.TokenIn, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "tokenIn", err) + } + + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_LimitOrderTrancheAll_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := server.LimitOrderTrancheAll(ctx, &protoReq) + return msg, metadata, err + +} + +var ( + filter_Query_UserDepositsAll_0 = &utilities.DoubleArray{Encoding: map[string]int{"address": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}} +) + +func request_Query_UserDepositsAll_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryAllUserDepositsRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["address"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "address") + } + + protoReq.Address, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "address", err) + } + + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_UserDepositsAll_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := client.UserDepositsAll(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Query_UserDepositsAll_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryAllUserDepositsRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["address"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "address") + } + + protoReq.Address, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "address", err) + } + + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_UserDepositsAll_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := server.UserDepositsAll(ctx, &protoReq) + return msg, metadata, err + +} + +var ( + filter_Query_TickLiquidityAll_0 = &utilities.DoubleArray{Encoding: map[string]int{"pairID": 0, "tokenIn": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}} +) + +func request_Query_TickLiquidityAll_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryAllTickLiquidityRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["pairID"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "pairID") + } + + protoReq.PairID, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "pairID", err) + } + + val, ok = pathParams["tokenIn"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "tokenIn") + } + + protoReq.TokenIn, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "tokenIn", err) + } + + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_TickLiquidityAll_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := client.TickLiquidityAll(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Query_TickLiquidityAll_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryAllTickLiquidityRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["pairID"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "pairID") + } + + protoReq.PairID, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "pairID", err) + } + + val, ok = pathParams["tokenIn"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "tokenIn") + } + + protoReq.TokenIn, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "tokenIn", err) + } + + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_TickLiquidityAll_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := server.TickLiquidityAll(ctx, &protoReq) + return msg, metadata, err + +} + +func request_Query_InactiveLimitOrderTranche_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryGetInactiveLimitOrderTrancheRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["pairID"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "pairID") + } + + protoReq.PairID, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "pairID", err) + } + + val, ok = pathParams["tokenIn"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "tokenIn") + } + + protoReq.TokenIn, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "tokenIn", err) + } + + val, ok = pathParams["tickIndex"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "tickIndex") + } + + protoReq.TickIndex, err = runtime.Int64(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "tickIndex", err) + } + + val, ok = pathParams["trancheKey"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "trancheKey") + } + + protoReq.TrancheKey, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "trancheKey", err) + } + + msg, err := client.InactiveLimitOrderTranche(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Query_InactiveLimitOrderTranche_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryGetInactiveLimitOrderTrancheRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["pairID"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "pairID") + } + + protoReq.PairID, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "pairID", err) + } + + val, ok = pathParams["tokenIn"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "tokenIn") + } + + protoReq.TokenIn, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "tokenIn", err) + } + + val, ok = pathParams["tickIndex"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "tickIndex") + } + + protoReq.TickIndex, err = runtime.Int64(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "tickIndex", err) + } + + val, ok = pathParams["trancheKey"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "trancheKey") + } + + protoReq.TrancheKey, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "trancheKey", err) + } + + msg, err := server.InactiveLimitOrderTranche(ctx, &protoReq) + return msg, metadata, err + +} + +var ( + filter_Query_InactiveLimitOrderTrancheAll_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} +) + +func request_Query_InactiveLimitOrderTrancheAll_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryAllInactiveLimitOrderTrancheRequest + 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_InactiveLimitOrderTrancheAll_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := client.InactiveLimitOrderTrancheAll(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Query_InactiveLimitOrderTrancheAll_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryAllInactiveLimitOrderTrancheRequest + 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_InactiveLimitOrderTrancheAll_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := server.InactiveLimitOrderTrancheAll(ctx, &protoReq) + return msg, metadata, err + +} + +var ( + filter_Query_PoolReservesAll_0 = &utilities.DoubleArray{Encoding: map[string]int{"pairID": 0, "tokenIn": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}} +) + +func request_Query_PoolReservesAll_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryAllPoolReservesRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["pairID"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "pairID") + } + + protoReq.PairID, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "pairID", err) + } + + val, ok = pathParams["tokenIn"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "tokenIn") + } + + protoReq.TokenIn, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "tokenIn", err) + } + + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_PoolReservesAll_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := client.PoolReservesAll(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Query_PoolReservesAll_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryAllPoolReservesRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["pairID"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "pairID") + } + + protoReq.PairID, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "pairID", err) + } + + val, ok = pathParams["tokenIn"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "tokenIn") + } + + protoReq.TokenIn, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "tokenIn", err) + } + + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_PoolReservesAll_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := server.PoolReservesAll(ctx, &protoReq) + return msg, metadata, err + +} + +func request_Query_PoolReserves_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryGetPoolReservesRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["pairID"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "pairID") + } + + protoReq.PairID, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "pairID", err) + } + + val, ok = pathParams["tokenIn"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "tokenIn") + } + + protoReq.TokenIn, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "tokenIn", err) + } + + val, ok = pathParams["tickIndex"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "tickIndex") + } + + protoReq.TickIndex, err = runtime.Int64(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "tickIndex", err) + } + + val, ok = pathParams["fee"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "fee") + } + + protoReq.Fee, err = runtime.Uint64(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "fee", err) + } + + msg, err := client.PoolReserves(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Query_PoolReserves_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryGetPoolReservesRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["pairID"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "pairID") + } + + protoReq.PairID, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "pairID", err) + } + + val, ok = pathParams["tokenIn"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "tokenIn") + } + + protoReq.TokenIn, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "tokenIn", err) + } + + val, ok = pathParams["tickIndex"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "tickIndex") + } + + protoReq.TickIndex, err = runtime.Int64(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "tickIndex", err) + } + + val, ok = pathParams["fee"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "fee") + } + + protoReq.Fee, err = runtime.Uint64(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "fee", err) + } + + msg, err := server.PoolReserves(ctx, &protoReq) + return msg, metadata, err + +} + +var ( + filter_Query_EstimateMultiHopSwap_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} +) + +func request_Query_EstimateMultiHopSwap_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryEstimateMultiHopSwapRequest + 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_EstimateMultiHopSwap_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := client.EstimateMultiHopSwap(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Query_EstimateMultiHopSwap_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryEstimateMultiHopSwapRequest + 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_EstimateMultiHopSwap_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := server.EstimateMultiHopSwap(ctx, &protoReq) + return msg, metadata, err + +} + +var ( + filter_Query_EstimatePlaceLimitOrder_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} +) + +func request_Query_EstimatePlaceLimitOrder_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryEstimatePlaceLimitOrderRequest + 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_EstimatePlaceLimitOrder_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := client.EstimatePlaceLimitOrder(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Query_EstimatePlaceLimitOrder_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryEstimatePlaceLimitOrderRequest + 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_EstimatePlaceLimitOrder_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := server.EstimatePlaceLimitOrder(ctx, &protoReq) + return msg, metadata, err + +} + +func request_Query_Pool_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryPoolRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["pairID"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "pairID") + } + + protoReq.PairID, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "pairID", err) + } + + val, ok = pathParams["tickIndex"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "tickIndex") + } + + protoReq.TickIndex, err = runtime.Int64(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "tickIndex", err) + } + + val, ok = pathParams["fee"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "fee") + } + + protoReq.Fee, err = runtime.Uint64(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "fee", err) + } + + msg, err := client.Pool(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Query_Pool_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryPoolRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["pairID"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "pairID") + } + + protoReq.PairID, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "pairID", err) + } + + val, ok = pathParams["tickIndex"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "tickIndex") + } + + protoReq.TickIndex, err = runtime.Int64(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "tickIndex", err) + } + + val, ok = pathParams["fee"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "fee") + } + + protoReq.Fee, err = runtime.Uint64(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "fee", err) + } + + msg, err := server.Pool(ctx, &protoReq) + return msg, metadata, err + +} + +func request_Query_PoolByID_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryPoolByIDRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["poolID"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "poolID") + } + + protoReq.PoolID, err = runtime.Uint64(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "poolID", err) + } + + msg, err := client.PoolByID(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Query_PoolByID_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryPoolByIDRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["poolID"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "poolID") + } + + protoReq.PoolID, err = runtime.Uint64(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "poolID", err) + } + + msg, err := server.PoolByID(ctx, &protoReq) + return msg, metadata, err + +} + +func request_Query_PoolMetadata_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryGetPoolMetadataRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["id"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") + } + + protoReq.Id, err = runtime.Uint64(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id", err) + } + + msg, err := client.PoolMetadata(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Query_PoolMetadata_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryGetPoolMetadataRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["id"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") + } + + protoReq.Id, err = runtime.Uint64(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id", err) + } + + msg, err := server.PoolMetadata(ctx, &protoReq) + return msg, metadata, err + +} + +var ( + filter_Query_PoolMetadataAll_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} +) + +func request_Query_PoolMetadataAll_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryAllPoolMetadataRequest + 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_PoolMetadataAll_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := client.PoolMetadataAll(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Query_PoolMetadataAll_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryAllPoolMetadataRequest + 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_PoolMetadataAll_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := server.PoolMetadataAll(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()...) + + }) + + mux.Handle("GET", pattern_Query_LimitOrderTrancheUser_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_LimitOrderTrancheUser_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_LimitOrderTrancheUser_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_LimitOrderTrancheUserAll_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_LimitOrderTrancheUserAll_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_LimitOrderTrancheUserAll_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_LimitOrderTrancheUserAllByAddress_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_LimitOrderTrancheUserAllByAddress_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_LimitOrderTrancheUserAllByAddress_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_LimitOrderTranche_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_LimitOrderTranche_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_LimitOrderTranche_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_LimitOrderTrancheAll_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_LimitOrderTrancheAll_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_LimitOrderTrancheAll_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_UserDepositsAll_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_UserDepositsAll_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_UserDepositsAll_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_TickLiquidityAll_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_TickLiquidityAll_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_TickLiquidityAll_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_InactiveLimitOrderTranche_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_InactiveLimitOrderTranche_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_InactiveLimitOrderTranche_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_InactiveLimitOrderTrancheAll_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_InactiveLimitOrderTrancheAll_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_InactiveLimitOrderTrancheAll_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_PoolReservesAll_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_PoolReservesAll_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_PoolReservesAll_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_PoolReserves_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_PoolReserves_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_PoolReserves_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_EstimateMultiHopSwap_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_EstimateMultiHopSwap_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_EstimateMultiHopSwap_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_EstimatePlaceLimitOrder_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_EstimatePlaceLimitOrder_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_EstimatePlaceLimitOrder_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_Pool_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_Pool_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_Pool_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_PoolByID_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_PoolByID_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_PoolByID_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_PoolMetadata_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_PoolMetadata_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_PoolMetadata_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_PoolMetadataAll_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_PoolMetadataAll_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_PoolMetadataAll_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()...) + + }) + + mux.Handle("GET", pattern_Query_LimitOrderTrancheUser_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_LimitOrderTrancheUser_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_LimitOrderTrancheUser_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_LimitOrderTrancheUserAll_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_LimitOrderTrancheUserAll_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_LimitOrderTrancheUserAll_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_LimitOrderTrancheUserAllByAddress_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_LimitOrderTrancheUserAllByAddress_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_LimitOrderTrancheUserAllByAddress_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_LimitOrderTranche_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_LimitOrderTranche_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_LimitOrderTranche_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_LimitOrderTrancheAll_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_LimitOrderTrancheAll_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_LimitOrderTrancheAll_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_UserDepositsAll_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_UserDepositsAll_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_UserDepositsAll_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_TickLiquidityAll_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_TickLiquidityAll_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_TickLiquidityAll_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_InactiveLimitOrderTranche_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_InactiveLimitOrderTranche_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_InactiveLimitOrderTranche_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_InactiveLimitOrderTrancheAll_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_InactiveLimitOrderTrancheAll_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_InactiveLimitOrderTrancheAll_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_PoolReservesAll_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_PoolReservesAll_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_PoolReservesAll_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_PoolReserves_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_PoolReserves_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_PoolReserves_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_EstimateMultiHopSwap_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_EstimateMultiHopSwap_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_EstimateMultiHopSwap_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_EstimatePlaceLimitOrder_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_EstimatePlaceLimitOrder_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_EstimatePlaceLimitOrder_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_Pool_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_Pool_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_Pool_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_PoolByID_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_PoolByID_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_PoolByID_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_PoolMetadata_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_PoolMetadata_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_PoolMetadata_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_PoolMetadataAll_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_PoolMetadataAll_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_PoolMetadataAll_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}, []string{"duality", "dex", "params"}, "", runtime.AssumeColonVerbOpt(true))) + + pattern_Query_LimitOrderTrancheUser_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4}, []string{"duality", "dex", "limit_order_tranche_user", "address", "trancheKey"}, "", runtime.AssumeColonVerbOpt(true))) + + pattern_Query_LimitOrderTrancheUserAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"duality", "dex", "limit_order_tranche_user"}, "", runtime.AssumeColonVerbOpt(true))) + + pattern_Query_LimitOrderTrancheUserAllByAddress_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"duality", "dex", "user", "limit_orders", "address"}, "", runtime.AssumeColonVerbOpt(true))) + + pattern_Query_LimitOrderTranche_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5, 1, 0, 4, 1, 5, 6}, []string{"duality", "dex", "limit_order_tranche", "pairID", "tokenIn", "tickIndex", "trancheKey"}, "", runtime.AssumeColonVerbOpt(true))) + + pattern_Query_LimitOrderTrancheAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4}, []string{"duality", "dex", "limit_order_tranche", "pairID", "tokenIn"}, "", runtime.AssumeColonVerbOpt(true))) + + pattern_Query_UserDepositsAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"duality", "dex", "user", "deposits", "address"}, "", runtime.AssumeColonVerbOpt(true))) + + pattern_Query_TickLiquidityAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4}, []string{"duality", "dex", "tick_liquidity", "pairID", "tokenIn"}, "", runtime.AssumeColonVerbOpt(true))) + + pattern_Query_InactiveLimitOrderTranche_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5, 1, 0, 4, 1, 5, 6}, []string{"duality", "dex", "filled_limit_order_tranche", "pairID", "tokenIn", "tickIndex", "trancheKey"}, "", runtime.AssumeColonVerbOpt(true))) + + pattern_Query_InactiveLimitOrderTrancheAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"duality", "dex", "filled_limit_order_tranche"}, "", runtime.AssumeColonVerbOpt(true))) + + pattern_Query_PoolReservesAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4}, []string{"duality", "dex", "pool_reserves", "pairID", "tokenIn"}, "", runtime.AssumeColonVerbOpt(true))) + + pattern_Query_PoolReserves_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5, 1, 0, 4, 1, 5, 6}, []string{"duality", "dex", "pool_reserves", "pairID", "tokenIn", "tickIndex", "fee"}, "", runtime.AssumeColonVerbOpt(true))) + + pattern_Query_EstimateMultiHopSwap_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"duality", "dex", "estimate_multi_hop_swap"}, "", runtime.AssumeColonVerbOpt(true))) + + pattern_Query_EstimatePlaceLimitOrder_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"duality", "dex", "estimate_place_limit_order"}, "", runtime.AssumeColonVerbOpt(true))) + + pattern_Query_Pool_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5}, []string{"duality", "dex", "pool", "pairID", "tickIndex", "fee"}, "", runtime.AssumeColonVerbOpt(true))) + + pattern_Query_PoolByID_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"duality", "dex", "pool", "poolID"}, "", runtime.AssumeColonVerbOpt(true))) + + pattern_Query_PoolMetadata_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"duality", "dex", "pool_metadata", "id"}, "", runtime.AssumeColonVerbOpt(true))) + + pattern_Query_PoolMetadataAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"duality", "dex", "pool_metadata"}, "", runtime.AssumeColonVerbOpt(true))) +) + +var ( + forward_Query_Params_0 = runtime.ForwardResponseMessage + + forward_Query_LimitOrderTrancheUser_0 = runtime.ForwardResponseMessage + + forward_Query_LimitOrderTrancheUserAll_0 = runtime.ForwardResponseMessage + + forward_Query_LimitOrderTrancheUserAllByAddress_0 = runtime.ForwardResponseMessage + + forward_Query_LimitOrderTranche_0 = runtime.ForwardResponseMessage + + forward_Query_LimitOrderTrancheAll_0 = runtime.ForwardResponseMessage + + forward_Query_UserDepositsAll_0 = runtime.ForwardResponseMessage + + forward_Query_TickLiquidityAll_0 = runtime.ForwardResponseMessage + + forward_Query_InactiveLimitOrderTranche_0 = runtime.ForwardResponseMessage + + forward_Query_InactiveLimitOrderTrancheAll_0 = runtime.ForwardResponseMessage + + forward_Query_PoolReservesAll_0 = runtime.ForwardResponseMessage + + forward_Query_PoolReserves_0 = runtime.ForwardResponseMessage + + forward_Query_EstimateMultiHopSwap_0 = runtime.ForwardResponseMessage + + forward_Query_EstimatePlaceLimitOrder_0 = runtime.ForwardResponseMessage + + forward_Query_Pool_0 = runtime.ForwardResponseMessage + + forward_Query_PoolByID_0 = runtime.ForwardResponseMessage + + forward_Query_PoolMetadata_0 = runtime.ForwardResponseMessage + + forward_Query_PoolMetadataAll_0 = runtime.ForwardResponseMessage +) diff --git a/x/dex/types/tick_liquidity.go b/x/dex/types/tick_liquidity.go new file mode 100644 index 000000000..c9e7d944d --- /dev/null +++ b/x/dex/types/tick_liquidity.go @@ -0,0 +1,44 @@ +package types + +import ( + math_utils "github.com/neutron-org/neutron/utils/math" +) + +// NOTE: These methods should be avoided if possible. +// Generally default to dealing with LimitOrderTranche or PoolReserves explicitly + +func (t TickLiquidity) Price() math_utils.PrecDec { + switch liquidity := t.Liquidity.(type) { + case *TickLiquidity_LimitOrderTranche: + return liquidity.LimitOrderTranche.PriceTakerToMaker + + case *TickLiquidity_PoolReserves: + return liquidity.PoolReserves.PriceTakerToMaker + default: + panic("Tick does not contain valid liqudityType") + } +} + +func (t TickLiquidity) TickIndex() int64 { + switch liquidity := t.Liquidity.(type) { + case *TickLiquidity_LimitOrderTranche: + return liquidity.LimitOrderTranche.Key.TickIndexTakerToMaker + + case *TickLiquidity_PoolReserves: + return liquidity.PoolReserves.Key.TickIndexTakerToMaker + default: + panic("Tick does not contain valid liqudityType") + } +} + +func (t TickLiquidity) HasToken() bool { + switch liquidity := t.Liquidity.(type) { + case *TickLiquidity_LimitOrderTranche: + return liquidity.LimitOrderTranche.HasTokenIn() + + case *TickLiquidity_PoolReserves: + return liquidity.PoolReserves.HasToken() + default: + panic("Tick does not contain valid liqudityType") + } +} diff --git a/x/dex/types/tick_liquidity.pb.go b/x/dex/types/tick_liquidity.pb.go new file mode 100644 index 000000000..d545fde99 --- /dev/null +++ b/x/dex/types/tick_liquidity.pb.go @@ -0,0 +1,469 @@ +// Code generated by protoc-gen-gogo. DO NOT EDIT. +// source: duality/dex/tick_liquidity.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 + +type TickLiquidity struct { + // Types that are valid to be assigned to Liquidity: + // *TickLiquidity_PoolReserves + // *TickLiquidity_LimitOrderTranche + Liquidity isTickLiquidity_Liquidity `protobuf_oneof:"liquidity"` +} + +func (m *TickLiquidity) Reset() { *m = TickLiquidity{} } +func (m *TickLiquidity) String() string { return proto.CompactTextString(m) } +func (*TickLiquidity) ProtoMessage() {} +func (*TickLiquidity) Descriptor() ([]byte, []int) { + return fileDescriptor_1bf4777d3c75e20c, []int{0} +} +func (m *TickLiquidity) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *TickLiquidity) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_TickLiquidity.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 *TickLiquidity) XXX_Merge(src proto.Message) { + xxx_messageInfo_TickLiquidity.Merge(m, src) +} +func (m *TickLiquidity) XXX_Size() int { + return m.Size() +} +func (m *TickLiquidity) XXX_DiscardUnknown() { + xxx_messageInfo_TickLiquidity.DiscardUnknown(m) +} + +var xxx_messageInfo_TickLiquidity proto.InternalMessageInfo + +type isTickLiquidity_Liquidity interface { + isTickLiquidity_Liquidity() + MarshalTo([]byte) (int, error) + Size() int +} + +type TickLiquidity_PoolReserves struct { + PoolReserves *PoolReserves `protobuf:"bytes,1,opt,name=poolReserves,proto3,oneof" json:"poolReserves,omitempty"` +} +type TickLiquidity_LimitOrderTranche struct { + LimitOrderTranche *LimitOrderTranche `protobuf:"bytes,2,opt,name=limitOrderTranche,proto3,oneof" json:"limitOrderTranche,omitempty"` +} + +func (*TickLiquidity_PoolReserves) isTickLiquidity_Liquidity() {} +func (*TickLiquidity_LimitOrderTranche) isTickLiquidity_Liquidity() {} + +func (m *TickLiquidity) GetLiquidity() isTickLiquidity_Liquidity { + if m != nil { + return m.Liquidity + } + return nil +} + +func (m *TickLiquidity) GetPoolReserves() *PoolReserves { + if x, ok := m.GetLiquidity().(*TickLiquidity_PoolReserves); ok { + return x.PoolReserves + } + return nil +} + +func (m *TickLiquidity) GetLimitOrderTranche() *LimitOrderTranche { + if x, ok := m.GetLiquidity().(*TickLiquidity_LimitOrderTranche); ok { + return x.LimitOrderTranche + } + return nil +} + +// XXX_OneofWrappers is for the internal use of the proto package. +func (*TickLiquidity) XXX_OneofWrappers() []interface{} { + return []interface{}{ + (*TickLiquidity_PoolReserves)(nil), + (*TickLiquidity_LimitOrderTranche)(nil), + } +} + +func init() { + proto.RegisterType((*TickLiquidity)(nil), "duality.dex.TickLiquidity") +} + +func init() { proto.RegisterFile("duality/dex/tick_liquidity.proto", fileDescriptor_1bf4777d3c75e20c) } + +var fileDescriptor_1bf4777d3c75e20c = []byte{ + // 262 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x48, 0x29, 0x4d, 0xcc, + 0xc9, 0x2c, 0xa9, 0xd4, 0x4f, 0x49, 0xad, 0xd0, 0x2f, 0xc9, 0x4c, 0xce, 0x8e, 0xcf, 0xc9, 0x2c, + 0x2c, 0xcd, 0x4c, 0xc9, 0x2c, 0xa9, 0xd4, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x86, 0xaa, + 0xd0, 0x4b, 0x49, 0xad, 0x90, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0x8b, 0xeb, 0x83, 0x58, 0x10, + 0x25, 0x52, 0xaa, 0xc8, 0x86, 0xe4, 0x64, 0xe6, 0x66, 0x96, 0xc4, 0xe7, 0x17, 0xa5, 0xa4, 0x16, + 0xc5, 0x97, 0x14, 0x25, 0xe6, 0x25, 0x67, 0xa4, 0x42, 0x95, 0xc9, 0x23, 0x2b, 0x2b, 0xc8, 0xcf, + 0xcf, 0x89, 0x2f, 0x4a, 0x2d, 0x4e, 0x2d, 0x2a, 0x4b, 0x2d, 0x86, 0x28, 0x50, 0x5a, 0xcb, 0xc8, + 0xc5, 0x1b, 0x92, 0x99, 0x9c, 0xed, 0x03, 0x73, 0x82, 0x90, 0x3d, 0x17, 0x0f, 0x48, 0x61, 0x10, + 0x54, 0x9d, 0x04, 0xa3, 0x02, 0xa3, 0x06, 0xb7, 0x91, 0xa4, 0x1e, 0x92, 0x9b, 0xf4, 0x02, 0x90, + 0x14, 0x78, 0x30, 0x04, 0xa1, 0x68, 0x10, 0xf2, 0xe3, 0x12, 0x04, 0x3b, 0xc8, 0x1f, 0xe4, 0x9e, + 0x10, 0x88, 0x73, 0x24, 0x98, 0xc0, 0xa6, 0xc8, 0xa1, 0x98, 0xe2, 0x83, 0xae, 0xca, 0x83, 0x21, + 0x08, 0x53, 0xab, 0x13, 0x37, 0x17, 0x27, 0x3c, 0x80, 0x9c, 0x5c, 0x4f, 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, 0x3b, 0x3d, 0xb3, 0x24, 0xa3, 0x34, 0x49, 0x2f, 0x39, 0x3f, + 0x57, 0x1f, 0x6a, 0x8b, 0x6e, 0x4e, 0x62, 0x52, 0x31, 0x8c, 0xa3, 0x5f, 0x01, 0x09, 0xf0, 0xca, + 0x82, 0xd4, 0xe2, 0x24, 0x36, 0xb0, 0xef, 0x8d, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0xf9, 0x4a, + 0xd5, 0x5a, 0x8c, 0x01, 0x00, 0x00, +} + +func (m *TickLiquidity) 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 *TickLiquidity) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *TickLiquidity) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.Liquidity != nil { + { + size := m.Liquidity.Size() + i -= size + if _, err := m.Liquidity.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + } + } + return len(dAtA) - i, nil +} + +func (m *TickLiquidity_PoolReserves) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *TickLiquidity_PoolReserves) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + if m.PoolReserves != nil { + { + size, err := m.PoolReserves.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTickLiquidity(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} +func (m *TickLiquidity_LimitOrderTranche) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *TickLiquidity_LimitOrderTranche) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + if m.LimitOrderTranche != nil { + { + size, err := m.LimitOrderTranche.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTickLiquidity(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } + return len(dAtA) - i, nil +} +func encodeVarintTickLiquidity(dAtA []byte, offset int, v uint64) int { + offset -= sovTickLiquidity(v) + base := offset + for v >= 1<<7 { + dAtA[offset] = uint8(v&0x7f | 0x80) + v >>= 7 + offset++ + } + dAtA[offset] = uint8(v) + return base +} +func (m *TickLiquidity) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Liquidity != nil { + n += m.Liquidity.Size() + } + return n +} + +func (m *TickLiquidity_PoolReserves) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.PoolReserves != nil { + l = m.PoolReserves.Size() + n += 1 + l + sovTickLiquidity(uint64(l)) + } + return n +} +func (m *TickLiquidity_LimitOrderTranche) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.LimitOrderTranche != nil { + l = m.LimitOrderTranche.Size() + n += 1 + l + sovTickLiquidity(uint64(l)) + } + return n +} + +func sovTickLiquidity(x uint64) (n int) { + return (math_bits.Len64(x|1) + 6) / 7 +} +func sozTickLiquidity(x uint64) (n int) { + return sovTickLiquidity(uint64((x << 1) ^ uint64((int64(x) >> 63)))) +} +func (m *TickLiquidity) 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 ErrIntOverflowTickLiquidity + } + 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: TickLiquidity: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: TickLiquidity: 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) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTickLiquidity + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTickLiquidity + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTickLiquidity + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + v := &PoolReserves{} + if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + m.Liquidity = &TickLiquidity_PoolReserves{v} + iNdEx = postIndex + case 2: + 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 ErrIntOverflowTickLiquidity + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTickLiquidity + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTickLiquidity + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + v := &LimitOrderTranche{} + if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + m.Liquidity = &TickLiquidity_LimitOrderTranche{v} + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipTickLiquidity(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthTickLiquidity + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func skipTickLiquidity(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, ErrIntOverflowTickLiquidity + } + 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, ErrIntOverflowTickLiquidity + } + 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, ErrIntOverflowTickLiquidity + } + 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, ErrInvalidLengthTickLiquidity + } + iNdEx += length + case 3: + depth++ + case 4: + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupTickLiquidity + } + depth-- + case 5: + iNdEx += 4 + default: + return 0, fmt.Errorf("proto: illegal wireType %d", wireType) + } + if iNdEx < 0 { + return 0, ErrInvalidLengthTickLiquidity + } + if depth == 0 { + return iNdEx, nil + } + } + return 0, io.ErrUnexpectedEOF +} + +var ( + ErrInvalidLengthTickLiquidity = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowTickLiquidity = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupTickLiquidity = fmt.Errorf("proto: unexpected end of group") +) diff --git a/x/dex/types/tick_liquidity_key.go b/x/dex/types/tick_liquidity_key.go new file mode 100644 index 000000000..6ec6ab598 --- /dev/null +++ b/x/dex/types/tick_liquidity_key.go @@ -0,0 +1,8 @@ +package types + +import math_utils "github.com/neutron-org/neutron/utils/math" + +type TickLiquidityKey interface { + KeyMarshal() []byte + PriceTakerToMaker() (priceTakerToMaker math_utils.PrecDec, err error) +} diff --git a/x/dex/types/tick_liquidity_test.go b/x/dex/types/tick_liquidity_test.go new file mode 100644 index 000000000..01aeeea58 --- /dev/null +++ b/x/dex/types/tick_liquidity_test.go @@ -0,0 +1,34 @@ +package types_test + +import ( + "testing" + + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/neutron-org/neutron/x/dex/types" + "github.com/stretchr/testify/assert" +) + +func TestHasTokenEmptyReserves(t *testing.T) { + // WHEN has no reserves + tick := &types.PoolReserves{ReservesMakerDenom: sdk.ZeroInt()} + assert.False(t, tick.HasToken()) +} + +func TestHasTokenEmptyLO(t *testing.T) { + // WHEN has no limits orders + tick := &types.LimitOrderTranche{ReservesMakerDenom: sdk.NewInt(0)} + assert.False(t, tick.HasTokenIn()) +} + +func TestHasToken0HasReserves(t *testing.T) { + // WHEN tick has Reserves + tick := &types.PoolReserves{ReservesMakerDenom: sdk.NewInt(10)} + + assert.True(t, tick.HasToken()) +} + +func TestHasTokenHasLO(t *testing.T) { + // WHEN has limit ordeers + tick := &types.LimitOrderTranche{ReservesMakerDenom: sdk.NewInt(10)} + assert.True(t, tick.HasTokenIn()) +} diff --git a/x/dex/types/trade_pair_id.go b/x/dex/types/trade_pair_id.go new file mode 100644 index 000000000..591017f3b --- /dev/null +++ b/x/dex/types/trade_pair_id.go @@ -0,0 +1,103 @@ +package types + +import ( + sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + math_utils "github.com/neutron-org/neutron/utils/math" +) + +func NewTradePairID(takerDenom, makerDenom string) (*TradePairID, error) { + if takerDenom == makerDenom { + return nil, sdkerrors.Wrapf(ErrInvalidTradingPair, "%s, %s", takerDenom, makerDenom) + } + return &TradePairID{ + TakerDenom: takerDenom, + MakerDenom: makerDenom, + }, nil +} + +func MustNewTradePairID(takerDenom, makerDenom string) *TradePairID { + tradePairID, err := NewTradePairID(takerDenom, makerDenom) + if err != nil { + panic(err) + } + return tradePairID +} + +func NewTradePairIDFromMaker(pairID *PairID, makerDenom string) *TradePairID { + var takerDenom string + if pairID.Token0 == makerDenom { + takerDenom = pairID.Token1 + } else { + takerDenom = pairID.Token0 + } + return &TradePairID{ + TakerDenom: takerDenom, + MakerDenom: makerDenom, + } +} + +func NewTradePairIDFromTaker(pairID *PairID, takerDenom string) *TradePairID { + var makerDenom string + if pairID.Token0 == takerDenom { + makerDenom = pairID.Token1 + } else { + makerDenom = pairID.Token0 + } + return &TradePairID{ + TakerDenom: takerDenom, + MakerDenom: makerDenom, + } +} + +func (p TradePairID) IsTakerDenomToken0() bool { + return p.TakerDenom == p.MustPairID().Token0 +} + +func (p TradePairID) IsMakerDenomToken0() bool { + return p.MakerDenom == p.MustPairID().Token0 +} + +func (p TradePairID) MustPairID() *PairID { + pairID, err := p.PairID() + if err != nil { + panic(err) + } + + return pairID +} + +func (p TradePairID) PairID() (*PairID, error) { + return NewPairIDFromUnsorted(p.MakerDenom, p.TakerDenom) +} + +func (p TradePairID) Reversed() *TradePairID { + return &TradePairID{ + MakerDenom: p.TakerDenom, + TakerDenom: p.MakerDenom, + } +} + +func (p TradePairID) TickIndexTakerToMaker(tickIndexNormalized int64) int64 { + pairID := p.MustPairID() + if pairID.Token1 == p.MakerDenom { + return tickIndexNormalized + } else { + return -1 * tickIndexNormalized + } +} + +func (p TradePairID) TickIndexNormalized(tickIndexTakerToMaker int64) int64 { + return p.TickIndexTakerToMaker(tickIndexTakerToMaker) +} + +func (p TradePairID) PriceTakerToMaker(tickIndexNormalized int64) (priceTakerToMaker math_utils.PrecDec, err error) { + return CalcPrice(p.TickIndexTakerToMaker(tickIndexNormalized)) +} + +func (p TradePairID) MustPriceTakerToMaker(tickIndexNormalized int64) (priceTakerToMaker math_utils.PrecDec) { + price, err := p.PriceTakerToMaker(tickIndexNormalized) + if err != nil { + panic(err) + } + return price +} diff --git a/x/dex/types/trade_pair_id.pb.go b/x/dex/types/trade_pair_id.pb.go new file mode 100644 index 000000000..0a29660ee --- /dev/null +++ b/x/dex/types/trade_pair_id.pb.go @@ -0,0 +1,366 @@ +// Code generated by protoc-gen-gogo. DO NOT EDIT. +// source: duality/dex/trade_pair_id.proto + +package types + +import ( + fmt "fmt" + 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 + +type TradePairID struct { + MakerDenom string `protobuf:"bytes,2,opt,name=makerDenom,proto3" json:"makerDenom,omitempty"` + TakerDenom string `protobuf:"bytes,3,opt,name=takerDenom,proto3" json:"takerDenom,omitempty"` +} + +func (m *TradePairID) Reset() { *m = TradePairID{} } +func (m *TradePairID) String() string { return proto.CompactTextString(m) } +func (*TradePairID) ProtoMessage() {} +func (*TradePairID) Descriptor() ([]byte, []int) { + return fileDescriptor_9a4de11785745a60, []int{0} +} +func (m *TradePairID) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *TradePairID) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_TradePairID.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 *TradePairID) XXX_Merge(src proto.Message) { + xxx_messageInfo_TradePairID.Merge(m, src) +} +func (m *TradePairID) XXX_Size() int { + return m.Size() +} +func (m *TradePairID) XXX_DiscardUnknown() { + xxx_messageInfo_TradePairID.DiscardUnknown(m) +} + +var xxx_messageInfo_TradePairID proto.InternalMessageInfo + +func (m *TradePairID) GetMakerDenom() string { + if m != nil { + return m.MakerDenom + } + return "" +} + +func (m *TradePairID) GetTakerDenom() string { + if m != nil { + return m.TakerDenom + } + return "" +} + +func init() { + proto.RegisterType((*TradePairID)(nil), "duality.dex.TradePairID") +} + +func init() { proto.RegisterFile("duality/dex/trade_pair_id.proto", fileDescriptor_9a4de11785745a60) } + +var fileDescriptor_9a4de11785745a60 = []byte{ + // 174 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4f, 0x29, 0x4d, 0xcc, + 0xc9, 0x2c, 0xa9, 0xd4, 0x4f, 0x49, 0xad, 0xd0, 0x2f, 0x29, 0x4a, 0x4c, 0x49, 0x8d, 0x2f, 0x48, + 0xcc, 0x2c, 0x8a, 0xcf, 0x4c, 0xd1, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x86, 0x2a, 0xd0, + 0x4b, 0x49, 0xad, 0x50, 0xf2, 0xe5, 0xe2, 0x0e, 0x01, 0xa9, 0x09, 0x48, 0xcc, 0x2c, 0xf2, 0x74, + 0x11, 0x92, 0xe3, 0xe2, 0xca, 0x4d, 0xcc, 0x4e, 0x2d, 0x72, 0x49, 0xcd, 0xcb, 0xcf, 0x95, 0x60, + 0x52, 0x60, 0xd4, 0xe0, 0x0c, 0x42, 0x12, 0x01, 0xc9, 0x97, 0x20, 0xe4, 0x99, 0x21, 0xf2, 0x08, + 0x11, 0x27, 0xd7, 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, 0x4e, 0xcf, + 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x87, 0x3a, 0x40, 0x37, 0x27, 0x31, 0xa9, + 0x18, 0xc6, 0xd1, 0xaf, 0x80, 0x38, 0xb8, 0xb2, 0x20, 0xb5, 0x38, 0x89, 0x0d, 0xec, 0x52, 0x63, + 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0xf8, 0xf7, 0xc6, 0xed, 0xcc, 0x00, 0x00, 0x00, +} + +func (m *TradePairID) 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 *TradePairID) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *TradePairID) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.TakerDenom) > 0 { + i -= len(m.TakerDenom) + copy(dAtA[i:], m.TakerDenom) + i = encodeVarintTradePairId(dAtA, i, uint64(len(m.TakerDenom))) + i-- + dAtA[i] = 0x1a + } + if len(m.MakerDenom) > 0 { + i -= len(m.MakerDenom) + copy(dAtA[i:], m.MakerDenom) + i = encodeVarintTradePairId(dAtA, i, uint64(len(m.MakerDenom))) + i-- + dAtA[i] = 0x12 + } + return len(dAtA) - i, nil +} + +func encodeVarintTradePairId(dAtA []byte, offset int, v uint64) int { + offset -= sovTradePairId(v) + base := offset + for v >= 1<<7 { + dAtA[offset] = uint8(v&0x7f | 0x80) + v >>= 7 + offset++ + } + dAtA[offset] = uint8(v) + return base +} +func (m *TradePairID) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.MakerDenom) + if l > 0 { + n += 1 + l + sovTradePairId(uint64(l)) + } + l = len(m.TakerDenom) + if l > 0 { + n += 1 + l + sovTradePairId(uint64(l)) + } + return n +} + +func sovTradePairId(x uint64) (n int) { + return (math_bits.Len64(x|1) + 6) / 7 +} +func sozTradePairId(x uint64) (n int) { + return sovTradePairId(uint64((x << 1) ^ uint64((int64(x) >> 63)))) +} +func (m *TradePairID) 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 ErrIntOverflowTradePairId + } + 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: TradePairID: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: TradePairID: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field MakerDenom", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTradePairId + } + 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 ErrInvalidLengthTradePairId + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthTradePairId + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.MakerDenom = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field TakerDenom", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTradePairId + } + 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 ErrInvalidLengthTradePairId + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthTradePairId + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.TakerDenom = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipTradePairId(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthTradePairId + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func skipTradePairId(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, ErrIntOverflowTradePairId + } + 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, ErrIntOverflowTradePairId + } + 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, ErrIntOverflowTradePairId + } + 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, ErrInvalidLengthTradePairId + } + iNdEx += length + case 3: + depth++ + case 4: + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupTradePairId + } + depth-- + case 5: + iNdEx += 4 + default: + return 0, fmt.Errorf("proto: illegal wireType %d", wireType) + } + if iNdEx < 0 { + return 0, ErrInvalidLengthTradePairId + } + if depth == 0 { + return iNdEx, nil + } + } + return 0, io.ErrUnexpectedEOF +} + +var ( + ErrInvalidLengthTradePairId = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowTradePairId = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupTradePairId = fmt.Errorf("proto: unexpected end of group") +) diff --git a/x/dex/types/tx.pb.go b/x/dex/types/tx.pb.go new file mode 100644 index 000000000..a01cef797 --- /dev/null +++ b/x/dex/types/tx.pb.go @@ -0,0 +1,4608 @@ +// Code generated by protoc-gen-gogo. DO NOT EDIT. +// source: duality/dex/tx.proto + +package types + +import ( + context "context" + fmt "fmt" + _ "github.com/cosmos/cosmos-sdk/types" + github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" + _ "github.com/cosmos/gogoproto/gogoproto" + grpc1 "github.com/cosmos/gogoproto/grpc" + proto "github.com/cosmos/gogoproto/proto" + github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" + github_com_duality_labs_duality_utils_math "github.com/neutron-org/neutron/utils/math" + grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" + _ "google.golang.org/protobuf/types/known/timestamppb" + io "io" + math "math" + math_bits "math/bits" + time "time" +) + +// Reference imports to suppress errors if they are not otherwise used. +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf +var _ = time.Kitchen + +// 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 + +type LimitOrderType int32 + +const ( + LimitOrderType_GOOD_TIL_CANCELLED LimitOrderType = 0 + LimitOrderType_FILL_OR_KILL LimitOrderType = 1 + LimitOrderType_IMMEDIATE_OR_CANCEL LimitOrderType = 2 + LimitOrderType_JUST_IN_TIME LimitOrderType = 3 + LimitOrderType_GOOD_TIL_TIME LimitOrderType = 4 +) + +var LimitOrderType_name = map[int32]string{ + 0: "GOOD_TIL_CANCELLED", + 1: "FILL_OR_KILL", + 2: "IMMEDIATE_OR_CANCEL", + 3: "JUST_IN_TIME", + 4: "GOOD_TIL_TIME", +} + +var LimitOrderType_value = map[string]int32{ + "GOOD_TIL_CANCELLED": 0, + "FILL_OR_KILL": 1, + "IMMEDIATE_OR_CANCEL": 2, + "JUST_IN_TIME": 3, + "GOOD_TIL_TIME": 4, +} + +func (x LimitOrderType) String() string { + return proto.EnumName(LimitOrderType_name, int32(x)) +} + +func (LimitOrderType) EnumDescriptor() ([]byte, []int) { + return fileDescriptor_0012bae7d4530cbb, []int{0} +} + +type DepositOptions struct { + DisableAutoswap bool `protobuf:"varint,1,opt,name=disable_autoswap,json=disableAutoswap,proto3" json:"disable_autoswap,omitempty"` +} + +func (m *DepositOptions) Reset() { *m = DepositOptions{} } +func (m *DepositOptions) String() string { return proto.CompactTextString(m) } +func (*DepositOptions) ProtoMessage() {} +func (*DepositOptions) Descriptor() ([]byte, []int) { + return fileDescriptor_0012bae7d4530cbb, []int{0} +} +func (m *DepositOptions) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *DepositOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_DepositOptions.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 *DepositOptions) XXX_Merge(src proto.Message) { + xxx_messageInfo_DepositOptions.Merge(m, src) +} +func (m *DepositOptions) XXX_Size() int { + return m.Size() +} +func (m *DepositOptions) XXX_DiscardUnknown() { + xxx_messageInfo_DepositOptions.DiscardUnknown(m) +} + +var xxx_messageInfo_DepositOptions proto.InternalMessageInfo + +func (m *DepositOptions) GetDisableAutoswap() bool { + if m != nil { + return m.DisableAutoswap + } + return false +} + +type MsgDeposit struct { + Creator string `protobuf:"bytes,1,opt,name=creator,proto3" json:"creator,omitempty"` + Receiver string `protobuf:"bytes,2,opt,name=receiver,proto3" json:"receiver,omitempty"` + TokenA string `protobuf:"bytes,3,opt,name=tokenA,proto3" json:"tokenA,omitempty"` + TokenB string `protobuf:"bytes,4,opt,name=tokenB,proto3" json:"tokenB,omitempty"` + AmountsA []github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,5,rep,name=amountsA,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"amountA" yaml:"amountsA"` + AmountsB []github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,6,rep,name=amountsB,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"amountB" yaml:"amountsB"` + TickIndexesAToB []int64 `protobuf:"varint,7,rep,packed,name=tickIndexesAToB,proto3" json:"tickIndexesAToB,omitempty"` + Fees []uint64 `protobuf:"varint,8,rep,packed,name=fees,proto3" json:"fees,omitempty"` + Options []*DepositOptions `protobuf:"bytes,9,rep,name=Options,proto3" json:"Options,omitempty"` +} + +func (m *MsgDeposit) Reset() { *m = MsgDeposit{} } +func (m *MsgDeposit) String() string { return proto.CompactTextString(m) } +func (*MsgDeposit) ProtoMessage() {} +func (*MsgDeposit) Descriptor() ([]byte, []int) { + return fileDescriptor_0012bae7d4530cbb, []int{1} +} +func (m *MsgDeposit) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MsgDeposit) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MsgDeposit.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 *MsgDeposit) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgDeposit.Merge(m, src) +} +func (m *MsgDeposit) XXX_Size() int { + return m.Size() +} +func (m *MsgDeposit) XXX_DiscardUnknown() { + xxx_messageInfo_MsgDeposit.DiscardUnknown(m) +} + +var xxx_messageInfo_MsgDeposit proto.InternalMessageInfo + +func (m *MsgDeposit) GetCreator() string { + if m != nil { + return m.Creator + } + return "" +} + +func (m *MsgDeposit) GetReceiver() string { + if m != nil { + return m.Receiver + } + return "" +} + +func (m *MsgDeposit) GetTokenA() string { + if m != nil { + return m.TokenA + } + return "" +} + +func (m *MsgDeposit) GetTokenB() string { + if m != nil { + return m.TokenB + } + return "" +} + +func (m *MsgDeposit) GetTickIndexesAToB() []int64 { + if m != nil { + return m.TickIndexesAToB + } + return nil +} + +func (m *MsgDeposit) GetFees() []uint64 { + if m != nil { + return m.Fees + } + return nil +} + +func (m *MsgDeposit) GetOptions() []*DepositOptions { + if m != nil { + return m.Options + } + return nil +} + +type MsgDepositResponse struct { + Reserve0Deposited []github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,1,rep,name=Reserve0Deposited,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"reserve0Deposited" yaml:"reserve0Deposited"` + Reserve1Deposited []github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,rep,name=Reserve1Deposited,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"reserve1Deposited" yaml:"reserve1Deposited"` +} + +func (m *MsgDepositResponse) Reset() { *m = MsgDepositResponse{} } +func (m *MsgDepositResponse) String() string { return proto.CompactTextString(m) } +func (*MsgDepositResponse) ProtoMessage() {} +func (*MsgDepositResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_0012bae7d4530cbb, []int{2} +} +func (m *MsgDepositResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MsgDepositResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MsgDepositResponse.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 *MsgDepositResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgDepositResponse.Merge(m, src) +} +func (m *MsgDepositResponse) XXX_Size() int { + return m.Size() +} +func (m *MsgDepositResponse) XXX_DiscardUnknown() { + xxx_messageInfo_MsgDepositResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_MsgDepositResponse proto.InternalMessageInfo + +type MsgWithdrawal struct { + Creator string `protobuf:"bytes,1,opt,name=creator,proto3" json:"creator,omitempty"` + Receiver string `protobuf:"bytes,2,opt,name=receiver,proto3" json:"receiver,omitempty"` + TokenA string `protobuf:"bytes,3,opt,name=tokenA,proto3" json:"tokenA,omitempty"` + TokenB string `protobuf:"bytes,4,opt,name=tokenB,proto3" json:"tokenB,omitempty"` + SharesToRemove []github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,5,rep,name=sharesToRemove,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"sharesToRemove" yaml:"sharesToRemove"` + TickIndexesAToB []int64 `protobuf:"varint,6,rep,packed,name=tickIndexesAToB,proto3" json:"tickIndexesAToB,omitempty"` + Fees []uint64 `protobuf:"varint,7,rep,packed,name=fees,proto3" json:"fees,omitempty"` +} + +func (m *MsgWithdrawal) Reset() { *m = MsgWithdrawal{} } +func (m *MsgWithdrawal) String() string { return proto.CompactTextString(m) } +func (*MsgWithdrawal) ProtoMessage() {} +func (*MsgWithdrawal) Descriptor() ([]byte, []int) { + return fileDescriptor_0012bae7d4530cbb, []int{3} +} +func (m *MsgWithdrawal) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MsgWithdrawal) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MsgWithdrawal.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 *MsgWithdrawal) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgWithdrawal.Merge(m, src) +} +func (m *MsgWithdrawal) XXX_Size() int { + return m.Size() +} +func (m *MsgWithdrawal) XXX_DiscardUnknown() { + xxx_messageInfo_MsgWithdrawal.DiscardUnknown(m) +} + +var xxx_messageInfo_MsgWithdrawal proto.InternalMessageInfo + +func (m *MsgWithdrawal) GetCreator() string { + if m != nil { + return m.Creator + } + return "" +} + +func (m *MsgWithdrawal) GetReceiver() string { + if m != nil { + return m.Receiver + } + return "" +} + +func (m *MsgWithdrawal) GetTokenA() string { + if m != nil { + return m.TokenA + } + return "" +} + +func (m *MsgWithdrawal) GetTokenB() string { + if m != nil { + return m.TokenB + } + return "" +} + +func (m *MsgWithdrawal) GetTickIndexesAToB() []int64 { + if m != nil { + return m.TickIndexesAToB + } + return nil +} + +func (m *MsgWithdrawal) GetFees() []uint64 { + if m != nil { + return m.Fees + } + return nil +} + +type MsgWithdrawalResponse struct { +} + +func (m *MsgWithdrawalResponse) Reset() { *m = MsgWithdrawalResponse{} } +func (m *MsgWithdrawalResponse) String() string { return proto.CompactTextString(m) } +func (*MsgWithdrawalResponse) ProtoMessage() {} +func (*MsgWithdrawalResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_0012bae7d4530cbb, []int{4} +} +func (m *MsgWithdrawalResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MsgWithdrawalResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MsgWithdrawalResponse.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 *MsgWithdrawalResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgWithdrawalResponse.Merge(m, src) +} +func (m *MsgWithdrawalResponse) XXX_Size() int { + return m.Size() +} +func (m *MsgWithdrawalResponse) XXX_DiscardUnknown() { + xxx_messageInfo_MsgWithdrawalResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_MsgWithdrawalResponse proto.InternalMessageInfo + +type MsgPlaceLimitOrder struct { + 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=tokenIn,proto3" json:"tokenIn,omitempty"` + TokenOut string `protobuf:"bytes,4,opt,name=tokenOut,proto3" json:"tokenOut,omitempty"` + TickIndexInToOut int64 `protobuf:"varint,5,opt,name=tickIndexInToOut,proto3" json:"tickIndexInToOut,omitempty"` + AmountIn github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,7,opt,name=amountIn,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"amountIn" yaml:"amountIn"` + OrderType LimitOrderType `protobuf:"varint,8,opt,name=orderType,proto3,enum=duality.dex.LimitOrderType" json:"orderType,omitempty"` + // expirationTime is only valid iff orderType == GOOD_TIL_TIME. + ExpirationTime *time.Time `protobuf:"bytes,9,opt,name=expirationTime,proto3,stdtime" json:"expirationTime,omitempty"` + MaxAmountOut *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,10,opt,name=maxAmountOut,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"maxAmountOut" yaml:"maxAmountOut"` +} + +func (m *MsgPlaceLimitOrder) Reset() { *m = MsgPlaceLimitOrder{} } +func (m *MsgPlaceLimitOrder) String() string { return proto.CompactTextString(m) } +func (*MsgPlaceLimitOrder) ProtoMessage() {} +func (*MsgPlaceLimitOrder) Descriptor() ([]byte, []int) { + return fileDescriptor_0012bae7d4530cbb, []int{5} +} +func (m *MsgPlaceLimitOrder) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MsgPlaceLimitOrder) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MsgPlaceLimitOrder.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 *MsgPlaceLimitOrder) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgPlaceLimitOrder.Merge(m, src) +} +func (m *MsgPlaceLimitOrder) XXX_Size() int { + return m.Size() +} +func (m *MsgPlaceLimitOrder) XXX_DiscardUnknown() { + xxx_messageInfo_MsgPlaceLimitOrder.DiscardUnknown(m) +} + +var xxx_messageInfo_MsgPlaceLimitOrder proto.InternalMessageInfo + +func (m *MsgPlaceLimitOrder) GetCreator() string { + if m != nil { + return m.Creator + } + return "" +} + +func (m *MsgPlaceLimitOrder) GetReceiver() string { + if m != nil { + return m.Receiver + } + return "" +} + +func (m *MsgPlaceLimitOrder) GetTokenIn() string { + if m != nil { + return m.TokenIn + } + return "" +} + +func (m *MsgPlaceLimitOrder) GetTokenOut() string { + if m != nil { + return m.TokenOut + } + return "" +} + +func (m *MsgPlaceLimitOrder) GetTickIndexInToOut() int64 { + if m != nil { + return m.TickIndexInToOut + } + return 0 +} + +func (m *MsgPlaceLimitOrder) GetOrderType() LimitOrderType { + if m != nil { + return m.OrderType + } + return LimitOrderType_GOOD_TIL_CANCELLED +} + +func (m *MsgPlaceLimitOrder) GetExpirationTime() *time.Time { + if m != nil { + return m.ExpirationTime + } + return nil +} + +type MsgPlaceLimitOrderResponse struct { + TrancheKey string `protobuf:"bytes,1,opt,name=trancheKey,proto3" json:"trancheKey,omitempty"` + // Total amount of coin used for the limit order + CoinIn github_com_cosmos_cosmos_sdk_types.Coin `protobuf:"bytes,2,opt,name=coinIn,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Coin" json:"coinIn" yaml:"coinIn"` + // 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 + TakerCoinOut github_com_cosmos_cosmos_sdk_types.Coin `protobuf:"bytes,3,opt,name=takerCoinOut,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Coin" json:"takerCoinOut" yaml:"takerCoinOut"` +} + +func (m *MsgPlaceLimitOrderResponse) Reset() { *m = MsgPlaceLimitOrderResponse{} } +func (m *MsgPlaceLimitOrderResponse) String() string { return proto.CompactTextString(m) } +func (*MsgPlaceLimitOrderResponse) ProtoMessage() {} +func (*MsgPlaceLimitOrderResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_0012bae7d4530cbb, []int{6} +} +func (m *MsgPlaceLimitOrderResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MsgPlaceLimitOrderResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MsgPlaceLimitOrderResponse.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 *MsgPlaceLimitOrderResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgPlaceLimitOrderResponse.Merge(m, src) +} +func (m *MsgPlaceLimitOrderResponse) XXX_Size() int { + return m.Size() +} +func (m *MsgPlaceLimitOrderResponse) XXX_DiscardUnknown() { + xxx_messageInfo_MsgPlaceLimitOrderResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_MsgPlaceLimitOrderResponse proto.InternalMessageInfo + +func (m *MsgPlaceLimitOrderResponse) GetTrancheKey() string { + if m != nil { + return m.TrancheKey + } + return "" +} + +type MsgWithdrawFilledLimitOrder struct { + Creator string `protobuf:"bytes,1,opt,name=creator,proto3" json:"creator,omitempty"` + TrancheKey string `protobuf:"bytes,2,opt,name=trancheKey,proto3" json:"trancheKey,omitempty"` +} + +func (m *MsgWithdrawFilledLimitOrder) Reset() { *m = MsgWithdrawFilledLimitOrder{} } +func (m *MsgWithdrawFilledLimitOrder) String() string { return proto.CompactTextString(m) } +func (*MsgWithdrawFilledLimitOrder) ProtoMessage() {} +func (*MsgWithdrawFilledLimitOrder) Descriptor() ([]byte, []int) { + return fileDescriptor_0012bae7d4530cbb, []int{7} +} +func (m *MsgWithdrawFilledLimitOrder) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MsgWithdrawFilledLimitOrder) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MsgWithdrawFilledLimitOrder.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 *MsgWithdrawFilledLimitOrder) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgWithdrawFilledLimitOrder.Merge(m, src) +} +func (m *MsgWithdrawFilledLimitOrder) XXX_Size() int { + return m.Size() +} +func (m *MsgWithdrawFilledLimitOrder) XXX_DiscardUnknown() { + xxx_messageInfo_MsgWithdrawFilledLimitOrder.DiscardUnknown(m) +} + +var xxx_messageInfo_MsgWithdrawFilledLimitOrder proto.InternalMessageInfo + +func (m *MsgWithdrawFilledLimitOrder) GetCreator() string { + if m != nil { + return m.Creator + } + return "" +} + +func (m *MsgWithdrawFilledLimitOrder) GetTrancheKey() string { + if m != nil { + return m.TrancheKey + } + return "" +} + +type MsgWithdrawFilledLimitOrderResponse struct { +} + +func (m *MsgWithdrawFilledLimitOrderResponse) Reset() { *m = MsgWithdrawFilledLimitOrderResponse{} } +func (m *MsgWithdrawFilledLimitOrderResponse) String() string { return proto.CompactTextString(m) } +func (*MsgWithdrawFilledLimitOrderResponse) ProtoMessage() {} +func (*MsgWithdrawFilledLimitOrderResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_0012bae7d4530cbb, []int{8} +} +func (m *MsgWithdrawFilledLimitOrderResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MsgWithdrawFilledLimitOrderResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MsgWithdrawFilledLimitOrderResponse.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 *MsgWithdrawFilledLimitOrderResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgWithdrawFilledLimitOrderResponse.Merge(m, src) +} +func (m *MsgWithdrawFilledLimitOrderResponse) XXX_Size() int { + return m.Size() +} +func (m *MsgWithdrawFilledLimitOrderResponse) XXX_DiscardUnknown() { + xxx_messageInfo_MsgWithdrawFilledLimitOrderResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_MsgWithdrawFilledLimitOrderResponse proto.InternalMessageInfo + +type MsgCancelLimitOrder struct { + Creator string `protobuf:"bytes,1,opt,name=creator,proto3" json:"creator,omitempty"` + TrancheKey string `protobuf:"bytes,2,opt,name=trancheKey,proto3" json:"trancheKey,omitempty"` +} + +func (m *MsgCancelLimitOrder) Reset() { *m = MsgCancelLimitOrder{} } +func (m *MsgCancelLimitOrder) String() string { return proto.CompactTextString(m) } +func (*MsgCancelLimitOrder) ProtoMessage() {} +func (*MsgCancelLimitOrder) Descriptor() ([]byte, []int) { + return fileDescriptor_0012bae7d4530cbb, []int{9} +} +func (m *MsgCancelLimitOrder) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MsgCancelLimitOrder) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MsgCancelLimitOrder.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 *MsgCancelLimitOrder) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgCancelLimitOrder.Merge(m, src) +} +func (m *MsgCancelLimitOrder) XXX_Size() int { + return m.Size() +} +func (m *MsgCancelLimitOrder) XXX_DiscardUnknown() { + xxx_messageInfo_MsgCancelLimitOrder.DiscardUnknown(m) +} + +var xxx_messageInfo_MsgCancelLimitOrder proto.InternalMessageInfo + +func (m *MsgCancelLimitOrder) GetCreator() string { + if m != nil { + return m.Creator + } + return "" +} + +func (m *MsgCancelLimitOrder) GetTrancheKey() string { + if m != nil { + return m.TrancheKey + } + return "" +} + +type MsgCancelLimitOrderResponse struct { +} + +func (m *MsgCancelLimitOrderResponse) Reset() { *m = MsgCancelLimitOrderResponse{} } +func (m *MsgCancelLimitOrderResponse) String() string { return proto.CompactTextString(m) } +func (*MsgCancelLimitOrderResponse) ProtoMessage() {} +func (*MsgCancelLimitOrderResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_0012bae7d4530cbb, []int{10} +} +func (m *MsgCancelLimitOrderResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MsgCancelLimitOrderResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MsgCancelLimitOrderResponse.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 *MsgCancelLimitOrderResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgCancelLimitOrderResponse.Merge(m, src) +} +func (m *MsgCancelLimitOrderResponse) XXX_Size() int { + return m.Size() +} +func (m *MsgCancelLimitOrderResponse) XXX_DiscardUnknown() { + xxx_messageInfo_MsgCancelLimitOrderResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_MsgCancelLimitOrderResponse proto.InternalMessageInfo + +type MultiHopRoute struct { + Hops []string `protobuf:"bytes,1,rep,name=hops,proto3" json:"hops,omitempty"` +} + +func (m *MultiHopRoute) Reset() { *m = MultiHopRoute{} } +func (m *MultiHopRoute) String() string { return proto.CompactTextString(m) } +func (*MultiHopRoute) ProtoMessage() {} +func (*MultiHopRoute) Descriptor() ([]byte, []int) { + return fileDescriptor_0012bae7d4530cbb, []int{11} +} +func (m *MultiHopRoute) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MultiHopRoute) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MultiHopRoute.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 *MultiHopRoute) XXX_Merge(src proto.Message) { + xxx_messageInfo_MultiHopRoute.Merge(m, src) +} +func (m *MultiHopRoute) XXX_Size() int { + return m.Size() +} +func (m *MultiHopRoute) XXX_DiscardUnknown() { + xxx_messageInfo_MultiHopRoute.DiscardUnknown(m) +} + +var xxx_messageInfo_MultiHopRoute proto.InternalMessageInfo + +func (m *MultiHopRoute) GetHops() []string { + if m != nil { + return m.Hops + } + return nil +} + +type MsgMultiHopSwap struct { + 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 github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,4,opt,name=amountIn,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"amountIn" yaml:"amountIn"` + ExitLimitPrice github_com_duality_labs_duality_utils_math.PrecDec `protobuf:"bytes,5,opt,name=exitLimitPrice,proto3,customtype=github.com/neutron-org/neutron/utils/math.PrecDec" json:"exitLimitPrice" yaml:"exitLimitPrice"` + // 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=pickBestRoute,proto3" json:"pickBestRoute,omitempty"` +} + +func (m *MsgMultiHopSwap) Reset() { *m = MsgMultiHopSwap{} } +func (m *MsgMultiHopSwap) String() string { return proto.CompactTextString(m) } +func (*MsgMultiHopSwap) ProtoMessage() {} +func (*MsgMultiHopSwap) Descriptor() ([]byte, []int) { + return fileDescriptor_0012bae7d4530cbb, []int{12} +} +func (m *MsgMultiHopSwap) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MsgMultiHopSwap) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MsgMultiHopSwap.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 *MsgMultiHopSwap) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgMultiHopSwap.Merge(m, src) +} +func (m *MsgMultiHopSwap) XXX_Size() int { + return m.Size() +} +func (m *MsgMultiHopSwap) XXX_DiscardUnknown() { + xxx_messageInfo_MsgMultiHopSwap.DiscardUnknown(m) +} + +var xxx_messageInfo_MsgMultiHopSwap proto.InternalMessageInfo + +func (m *MsgMultiHopSwap) GetCreator() string { + if m != nil { + return m.Creator + } + return "" +} + +func (m *MsgMultiHopSwap) GetReceiver() string { + if m != nil { + return m.Receiver + } + return "" +} + +func (m *MsgMultiHopSwap) GetRoutes() []*MultiHopRoute { + if m != nil { + return m.Routes + } + return nil +} + +func (m *MsgMultiHopSwap) GetPickBestRoute() bool { + if m != nil { + return m.PickBestRoute + } + return false +} + +type MsgMultiHopSwapResponse struct { + CoinOut github_com_cosmos_cosmos_sdk_types.Coin `protobuf:"bytes,1,opt,name=coinOut,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Coin" json:"coinOut"` +} + +func (m *MsgMultiHopSwapResponse) Reset() { *m = MsgMultiHopSwapResponse{} } +func (m *MsgMultiHopSwapResponse) String() string { return proto.CompactTextString(m) } +func (*MsgMultiHopSwapResponse) ProtoMessage() {} +func (*MsgMultiHopSwapResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_0012bae7d4530cbb, []int{13} +} +func (m *MsgMultiHopSwapResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MsgMultiHopSwapResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MsgMultiHopSwapResponse.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 *MsgMultiHopSwapResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgMultiHopSwapResponse.Merge(m, src) +} +func (m *MsgMultiHopSwapResponse) XXX_Size() int { + return m.Size() +} +func (m *MsgMultiHopSwapResponse) XXX_DiscardUnknown() { + xxx_messageInfo_MsgMultiHopSwapResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_MsgMultiHopSwapResponse proto.InternalMessageInfo + +func init() { + proto.RegisterEnum("duality.dex.LimitOrderType", LimitOrderType_name, LimitOrderType_value) + proto.RegisterType((*DepositOptions)(nil), "duality.dex.DepositOptions") + proto.RegisterType((*MsgDeposit)(nil), "duality.dex.MsgDeposit") + proto.RegisterType((*MsgDepositResponse)(nil), "duality.dex.MsgDepositResponse") + proto.RegisterType((*MsgWithdrawal)(nil), "duality.dex.MsgWithdrawal") + proto.RegisterType((*MsgWithdrawalResponse)(nil), "duality.dex.MsgWithdrawalResponse") + proto.RegisterType((*MsgPlaceLimitOrder)(nil), "duality.dex.MsgPlaceLimitOrder") + proto.RegisterType((*MsgPlaceLimitOrderResponse)(nil), "duality.dex.MsgPlaceLimitOrderResponse") + proto.RegisterType((*MsgWithdrawFilledLimitOrder)(nil), "duality.dex.MsgWithdrawFilledLimitOrder") + proto.RegisterType((*MsgWithdrawFilledLimitOrderResponse)(nil), "duality.dex.MsgWithdrawFilledLimitOrderResponse") + proto.RegisterType((*MsgCancelLimitOrder)(nil), "duality.dex.MsgCancelLimitOrder") + proto.RegisterType((*MsgCancelLimitOrderResponse)(nil), "duality.dex.MsgCancelLimitOrderResponse") + proto.RegisterType((*MultiHopRoute)(nil), "duality.dex.MultiHopRoute") + proto.RegisterType((*MsgMultiHopSwap)(nil), "duality.dex.MsgMultiHopSwap") + proto.RegisterType((*MsgMultiHopSwapResponse)(nil), "duality.dex.MsgMultiHopSwapResponse") +} + +func init() { proto.RegisterFile("duality/dex/tx.proto", fileDescriptor_0012bae7d4530cbb) } + +var fileDescriptor_0012bae7d4530cbb = []byte{ + // 1273 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0x4b, 0x8f, 0xdb, 0xd4, + 0x17, 0x1f, 0xc7, 0x69, 0x32, 0x73, 0xe6, 0x95, 0xde, 0x3e, 0xc6, 0x7f, 0xf7, 0x4f, 0x1c, 0xb9, + 0x85, 0x86, 0xa2, 0x3a, 0x9d, 0x41, 0x2c, 0x28, 0xab, 0x78, 0x66, 0x0a, 0x6e, 0x93, 0xa6, 0x72, + 0x53, 0x2a, 0x40, 0x22, 0x72, 0x9c, 0xdb, 0xc4, 0x9a, 0xc4, 0xd7, 0xf2, 0xbd, 0x99, 0x66, 0x16, + 0x2c, 0xd8, 0x22, 0x55, 0xea, 0x86, 0x15, 0x6c, 0xf8, 0x0e, 0x48, 0x2c, 0xf8, 0x02, 0x5d, 0x56, + 0x62, 0x83, 0x58, 0x04, 0xd4, 0xee, 0xba, 0x9c, 0x4f, 0x80, 0xfc, 0x8c, 0xed, 0x74, 0x3a, 0x9d, + 0x16, 0x58, 0xc5, 0xf7, 0x9c, 0xdf, 0xfd, 0x9d, 0x73, 0xcf, 0x3d, 0x8f, 0x1b, 0x38, 0xdb, 0x1b, + 0x1b, 0x43, 0x8b, 0x1d, 0xd4, 0x7a, 0x78, 0x52, 0x63, 0x13, 0xc5, 0x71, 0x09, 0x23, 0x68, 0x39, + 0x94, 0x2a, 0x3d, 0x3c, 0x11, 0xcf, 0xf6, 0x49, 0x9f, 0xf8, 0xf2, 0x9a, 0xf7, 0x15, 0x40, 0xc4, + 0xb2, 0x49, 0xe8, 0x88, 0xd0, 0x5a, 0xd7, 0xa0, 0xb8, 0xb6, 0xbf, 0xd9, 0xc5, 0xcc, 0xd8, 0xac, + 0x99, 0xc4, 0xb2, 0x43, 0xbd, 0xd4, 0x27, 0xa4, 0x3f, 0xc4, 0x35, 0x7f, 0xd5, 0x1d, 0x3f, 0xa8, + 0x31, 0x6b, 0x84, 0x29, 0x33, 0x46, 0x4e, 0x00, 0x90, 0x3f, 0x81, 0xb5, 0x1d, 0xec, 0x10, 0x6a, + 0xb1, 0x96, 0xc3, 0x2c, 0x62, 0x53, 0xf4, 0x3e, 0x94, 0x7a, 0x16, 0x35, 0xba, 0x43, 0xdc, 0x31, + 0xc6, 0x8c, 0xd0, 0x87, 0x86, 0x23, 0x70, 0x15, 0xae, 0xba, 0xa8, 0xaf, 0x87, 0xf2, 0x7a, 0x28, + 0x96, 0x7f, 0xe5, 0x01, 0x9a, 0xb4, 0x1f, 0x12, 0x20, 0x01, 0x8a, 0xa6, 0x8b, 0x0d, 0x46, 0x5c, + 0x7f, 0xc3, 0x92, 0x1e, 0x2d, 0x91, 0x08, 0x8b, 0x2e, 0x36, 0xb1, 0xb5, 0x8f, 0x5d, 0x21, 0xe7, + 0xab, 0xe2, 0x35, 0x3a, 0x0f, 0x05, 0x46, 0xf6, 0xb0, 0x5d, 0x17, 0x78, 0x5f, 0x13, 0xae, 0x62, + 0xb9, 0x2a, 0xe4, 0x13, 0x72, 0x15, 0x0d, 0x60, 0xd1, 0x18, 0x91, 0xb1, 0xcd, 0x68, 0x5d, 0x38, + 0x55, 0xe1, 0xab, 0x4b, 0x6a, 0xe3, 0xc9, 0x54, 0x5a, 0xf8, 0x63, 0x2a, 0xbd, 0xd7, 0xb7, 0xd8, + 0x60, 0xdc, 0x55, 0x4c, 0x32, 0xaa, 0x85, 0x71, 0x09, 0x7e, 0xae, 0xd2, 0xde, 0x5e, 0x8d, 0x1d, + 0x38, 0x98, 0x2a, 0x9a, 0xcd, 0x5e, 0x4c, 0xa5, 0x62, 0xc0, 0x50, 0x3f, 0x9c, 0x4a, 0xeb, 0x07, + 0xc6, 0x68, 0x78, 0x5d, 0x8e, 0x28, 0x65, 0x3d, 0x66, 0x4f, 0x58, 0x52, 0x85, 0xc2, 0xdb, 0x59, + 0x52, 0xe7, 0x2c, 0xa9, 0x33, 0x4b, 0x2a, 0xaa, 0xc2, 0x3a, 0xb3, 0xcc, 0x3d, 0xcd, 0xee, 0xe1, + 0x09, 0xa6, 0xf5, 0x36, 0x51, 0x85, 0x62, 0x85, 0xaf, 0xf2, 0x7a, 0x56, 0x8c, 0x10, 0xe4, 0x1f, + 0x60, 0x4c, 0x85, 0xc5, 0x0a, 0x5f, 0xcd, 0xeb, 0xfe, 0x37, 0xfa, 0x08, 0x8a, 0xe1, 0xe5, 0x09, + 0x4b, 0x15, 0xbe, 0xba, 0xbc, 0x75, 0x41, 0x49, 0x64, 0x8e, 0x92, 0xbe, 0x5f, 0x3d, 0xc2, 0xca, + 0x3f, 0xe7, 0x00, 0xcd, 0x6e, 0x4f, 0xc7, 0xd4, 0x21, 0x36, 0xc5, 0xe8, 0x11, 0x07, 0xa7, 0x75, + 0x4c, 0xb1, 0xbb, 0x8f, 0xaf, 0x85, 0x3a, 0xdc, 0x13, 0x38, 0xff, 0xfc, 0x9d, 0x13, 0x9f, 0xff, + 0xb4, 0x9b, 0xa5, 0x3a, 0x9c, 0x4a, 0x42, 0x10, 0x89, 0x39, 0x95, 0xac, 0xcf, 0x5b, 0x4e, 0xfa, + 0xb3, 0x39, 0xf3, 0x27, 0xf7, 0x96, 0xfe, 0x6c, 0x1e, 0xed, 0xcf, 0xe6, 0x4b, 0xfc, 0x49, 0xc8, + 0x7e, 0xc9, 0xc1, 0x6a, 0x93, 0xf6, 0xef, 0x5b, 0x6c, 0xd0, 0x73, 0x8d, 0x87, 0xc6, 0xf0, 0x3f, + 0xca, 0xfb, 0x6f, 0x39, 0x58, 0xa3, 0x03, 0xc3, 0xc5, 0xb4, 0x4d, 0x74, 0x3c, 0x22, 0xfb, 0x38, + 0x4c, 0xff, 0x2f, 0x4e, 0x1c, 0x84, 0x0c, 0xcf, 0xe1, 0x54, 0x3a, 0x17, 0x44, 0x20, 0x2d, 0x97, + 0xf5, 0x0c, 0xf0, 0x65, 0x79, 0x5a, 0x78, 0x75, 0x9e, 0x16, 0x67, 0x79, 0x2a, 0x6f, 0xc0, 0xb9, + 0x54, 0xe0, 0xa2, 0x94, 0x93, 0x7f, 0xc8, 0xfb, 0x99, 0x78, 0x67, 0x68, 0x98, 0xb8, 0x61, 0x8d, + 0x2c, 0xd6, 0x72, 0x7b, 0xd8, 0x7d, 0xc3, 0xb8, 0x0a, 0x50, 0xf4, 0x23, 0xa6, 0xd9, 0x61, 0x60, + 0xa3, 0xa5, 0xb7, 0xcb, 0xff, 0x6c, 0x8d, 0x59, 0x18, 0xdb, 0x78, 0x8d, 0xae, 0x40, 0x29, 0x3e, + 0x82, 0x66, 0xb7, 0x89, 0x87, 0x39, 0x55, 0xe1, 0xaa, 0xbc, 0x3e, 0x27, 0x47, 0x56, 0xd4, 0x17, + 0x34, 0x5b, 0x28, 0x7a, 0x3c, 0x6a, 0xf3, 0xc4, 0x57, 0x10, 0x33, 0x64, 0x1b, 0x83, 0x66, 0xc7, + 0x8d, 0x41, 0xb3, 0xd1, 0xc7, 0xb0, 0x44, 0xbc, 0x58, 0xb4, 0x0f, 0x1c, 0x2c, 0x2c, 0x56, 0xb8, + 0xea, 0x5a, 0xa6, 0xb8, 0x67, 0xe1, 0xf2, 0x20, 0xfa, 0x0c, 0x8d, 0x1a, 0xb0, 0x86, 0x27, 0x8e, + 0xe5, 0x1a, 0x5e, 0xb5, 0xb7, 0xad, 0x11, 0x16, 0x96, 0x2a, 0x5c, 0x75, 0x79, 0x4b, 0x54, 0x82, + 0x99, 0xa0, 0x44, 0x33, 0x41, 0x69, 0x47, 0x33, 0x41, 0x5d, 0x7c, 0x32, 0x95, 0xb8, 0xc7, 0x7f, + 0x4a, 0x9c, 0x9e, 0xd9, 0x8b, 0x0e, 0x60, 0x65, 0x64, 0x4c, 0xea, 0xbe, 0x5f, 0x5e, 0x6c, 0xc0, + 0x3f, 0xf7, 0x3d, 0x0f, 0x7f, 0xa2, 0x73, 0xa7, 0x58, 0x0e, 0xa7, 0xd2, 0x99, 0xe0, 0xec, 0x49, + 0xa9, 0xac, 0xa7, 0x40, 0xf2, 0x6f, 0x39, 0x10, 0xe7, 0xb3, 0x23, 0xee, 0x57, 0x65, 0x00, 0xe6, + 0x1a, 0xb6, 0x39, 0xc0, 0xb7, 0xf0, 0x41, 0x98, 0x28, 0x09, 0x09, 0xfa, 0x06, 0x0a, 0xde, 0x40, + 0xd4, 0x6c, 0x3f, 0x53, 0x96, 0xb7, 0xfe, 0xa7, 0x04, 0xae, 0x29, 0xde, 0xcc, 0x54, 0xc2, 0x99, + 0xa9, 0x6c, 0x13, 0xcb, 0x56, 0x6f, 0x86, 0xd7, 0x78, 0xf9, 0x35, 0x8e, 0xe3, 0x6d, 0x78, 0x31, + 0x95, 0x42, 0xee, 0xc3, 0xa9, 0xb4, 0x1a, 0x9c, 0x24, 0x58, 0xcb, 0x7a, 0xa8, 0x40, 0xdf, 0x73, + 0xb0, 0xc2, 0x8c, 0x3d, 0xec, 0x7a, 0x1b, 0xbc, 0xc8, 0xf1, 0xc7, 0x79, 0xf1, 0xf9, 0xc9, 0xbd, + 0x48, 0x59, 0x98, 0x45, 0x35, 0x29, 0x95, 0xf5, 0x14, 0x48, 0xbe, 0x0f, 0x17, 0x12, 0xc5, 0x78, + 0xc3, 0x1a, 0x0e, 0x71, 0xef, 0xb5, 0x6a, 0x2f, 0x1d, 0xef, 0x5c, 0x36, 0xde, 0xf2, 0xbb, 0x70, + 0xf1, 0x15, 0xc4, 0x71, 0xcd, 0xb7, 0xe0, 0x4c, 0x93, 0xf6, 0xb7, 0x0d, 0xdb, 0xc4, 0xc3, 0x7f, + 0xc4, 0xee, 0x3b, 0xfe, 0x81, 0xb2, 0x84, 0xb1, 0xbd, 0x8b, 0xb0, 0xda, 0x1c, 0x0f, 0x99, 0xf5, + 0x19, 0x71, 0x74, 0x32, 0x66, 0xd8, 0xeb, 0x50, 0x03, 0xe2, 0xd0, 0x60, 0xb2, 0xe9, 0xfe, 0xb7, + 0xfc, 0x23, 0x0f, 0xeb, 0x4d, 0xda, 0x8f, 0x80, 0x77, 0x1f, 0x1a, 0xce, 0x1b, 0x76, 0xa1, 0x2d, + 0x28, 0xb8, 0x9e, 0x19, 0x2a, 0xf0, 0xfe, 0x48, 0x16, 0x53, 0x55, 0x9b, 0xf2, 0x44, 0x0f, 0x91, + 0xa9, 0xbe, 0x92, 0xff, 0x77, 0xfb, 0xca, 0x23, 0xce, 0xeb, 0x0e, 0x16, 0xf3, 0x03, 0x75, 0xc7, + 0xb5, 0x4c, 0xec, 0x77, 0xbb, 0x25, 0x15, 0x87, 0x16, 0xb7, 0x12, 0x16, 0x43, 0xcf, 0xaf, 0x0e, + 0x8d, 0x2e, 0x8d, 0x16, 0xb5, 0x31, 0xb3, 0x86, 0xb4, 0x36, 0x32, 0xd8, 0x40, 0xb9, 0xe3, 0x62, + 0x73, 0x07, 0x9b, 0xde, 0x60, 0x49, 0x73, 0xce, 0x06, 0x4b, 0x5a, 0x2e, 0xeb, 0x19, 0x20, 0xba, + 0x04, 0xab, 0x8e, 0x65, 0xee, 0xa9, 0x98, 0x32, 0x3f, 0x26, 0x42, 0xc1, 0x7f, 0x71, 0xa6, 0x85, + 0xf2, 0x77, 0x1c, 0x6c, 0x64, 0xae, 0x27, 0x6e, 0x03, 0x04, 0x8a, 0x66, 0x58, 0x61, 0xdc, 0x71, + 0x15, 0x76, 0xfd, 0xe4, 0x15, 0x16, 0x91, 0xeb, 0xd1, 0xc7, 0x95, 0x09, 0xac, 0xa5, 0x9b, 0x2f, + 0x3a, 0x0f, 0xe8, 0xd3, 0x56, 0x6b, 0xa7, 0xd3, 0xd6, 0x1a, 0x9d, 0xed, 0xfa, 0xed, 0xed, 0xdd, + 0x46, 0x63, 0x77, 0xa7, 0xb4, 0x80, 0x4a, 0xb0, 0x72, 0x43, 0x6b, 0x34, 0x3a, 0x2d, 0xbd, 0x73, + 0x4b, 0x6b, 0x34, 0x4a, 0x1c, 0xda, 0x80, 0x33, 0x5a, 0xb3, 0xb9, 0xbb, 0xa3, 0xd5, 0xdb, 0xbb, + 0x9e, 0x38, 0x40, 0x97, 0x72, 0x1e, 0xf4, 0xe6, 0xbd, 0xbb, 0xed, 0x8e, 0x76, 0xbb, 0xd3, 0xd6, + 0x9a, 0xbb, 0x25, 0x1e, 0x9d, 0x86, 0xd5, 0x98, 0xd4, 0x17, 0xe5, 0xb7, 0x7e, 0xca, 0x03, 0xdf, + 0xa4, 0x7d, 0xb4, 0x0d, 0xc5, 0xe8, 0xe9, 0xbd, 0x91, 0x4e, 0xaf, 0xf8, 0x55, 0x27, 0x4a, 0x47, + 0x28, 0xe2, 0xb8, 0x35, 0x00, 0x12, 0x4f, 0x19, 0x31, 0x0b, 0x9f, 0xe9, 0x44, 0xf9, 0x68, 0x5d, + 0xcc, 0xf6, 0x15, 0xac, 0x67, 0xa7, 0xf8, 0x9c, 0x07, 0x19, 0x80, 0x78, 0xf9, 0x18, 0x40, 0x4c, + 0xbe, 0x0f, 0xc2, 0x91, 0xfd, 0xaa, 0x7a, 0x94, 0x73, 0x59, 0xa4, 0x78, 0xed, 0x75, 0x91, 0xb1, + 0xdd, 0xaf, 0xa1, 0x34, 0xd7, 0xa7, 0x2a, 0x59, 0x96, 0x2c, 0x42, 0xac, 0x1e, 0x87, 0x88, 0xf9, + 0x75, 0x58, 0x49, 0x75, 0x9c, 0xff, 0x67, 0x77, 0x26, 0xb5, 0xe2, 0xa5, 0x57, 0x69, 0x23, 0x4e, + 0x75, 0xf7, 0xc9, 0xb3, 0x32, 0xf7, 0xf4, 0x59, 0x99, 0xfb, 0xeb, 0x59, 0x99, 0x7b, 0xfc, 0xbc, + 0xbc, 0xf0, 0xf4, 0x79, 0x79, 0xe1, 0xf7, 0xe7, 0xe5, 0x85, 0x2f, 0x3f, 0x38, 0xae, 0xb2, 0x27, + 0xc1, 0xbf, 0x50, 0x2f, 0xfb, 0xbb, 0x05, 0xff, 0x91, 0xf0, 0xe1, 0xdf, 0x01, 0x00, 0x00, 0xff, + 0xff, 0x3e, 0x98, 0x48, 0x57, 0xa1, 0x0e, 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 { + Deposit(ctx context.Context, in *MsgDeposit, opts ...grpc.CallOption) (*MsgDepositResponse, error) + Withdrawal(ctx context.Context, in *MsgWithdrawal, opts ...grpc.CallOption) (*MsgWithdrawalResponse, error) + PlaceLimitOrder(ctx context.Context, in *MsgPlaceLimitOrder, opts ...grpc.CallOption) (*MsgPlaceLimitOrderResponse, error) + WithdrawFilledLimitOrder(ctx context.Context, in *MsgWithdrawFilledLimitOrder, opts ...grpc.CallOption) (*MsgWithdrawFilledLimitOrderResponse, error) + CancelLimitOrder(ctx context.Context, in *MsgCancelLimitOrder, opts ...grpc.CallOption) (*MsgCancelLimitOrderResponse, error) + MultiHopSwap(ctx context.Context, in *MsgMultiHopSwap, opts ...grpc.CallOption) (*MsgMultiHopSwapResponse, error) +} + +type msgClient struct { + cc grpc1.ClientConn +} + +func NewMsgClient(cc grpc1.ClientConn) MsgClient { + return &msgClient{cc} +} + +func (c *msgClient) Deposit(ctx context.Context, in *MsgDeposit, opts ...grpc.CallOption) (*MsgDepositResponse, error) { + out := new(MsgDepositResponse) + err := c.cc.Invoke(ctx, "/duality.dex.Msg/Deposit", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *msgClient) Withdrawal(ctx context.Context, in *MsgWithdrawal, opts ...grpc.CallOption) (*MsgWithdrawalResponse, error) { + out := new(MsgWithdrawalResponse) + err := c.cc.Invoke(ctx, "/duality.dex.Msg/Withdrawal", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *msgClient) PlaceLimitOrder(ctx context.Context, in *MsgPlaceLimitOrder, opts ...grpc.CallOption) (*MsgPlaceLimitOrderResponse, error) { + out := new(MsgPlaceLimitOrderResponse) + err := c.cc.Invoke(ctx, "/duality.dex.Msg/PlaceLimitOrder", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *msgClient) WithdrawFilledLimitOrder(ctx context.Context, in *MsgWithdrawFilledLimitOrder, opts ...grpc.CallOption) (*MsgWithdrawFilledLimitOrderResponse, error) { + out := new(MsgWithdrawFilledLimitOrderResponse) + err := c.cc.Invoke(ctx, "/duality.dex.Msg/WithdrawFilledLimitOrder", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *msgClient) CancelLimitOrder(ctx context.Context, in *MsgCancelLimitOrder, opts ...grpc.CallOption) (*MsgCancelLimitOrderResponse, error) { + out := new(MsgCancelLimitOrderResponse) + err := c.cc.Invoke(ctx, "/duality.dex.Msg/CancelLimitOrder", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *msgClient) MultiHopSwap(ctx context.Context, in *MsgMultiHopSwap, opts ...grpc.CallOption) (*MsgMultiHopSwapResponse, error) { + out := new(MsgMultiHopSwapResponse) + err := c.cc.Invoke(ctx, "/duality.dex.Msg/MultiHopSwap", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +// MsgServer is the server API for Msg service. +type MsgServer interface { + Deposit(context.Context, *MsgDeposit) (*MsgDepositResponse, error) + Withdrawal(context.Context, *MsgWithdrawal) (*MsgWithdrawalResponse, error) + PlaceLimitOrder(context.Context, *MsgPlaceLimitOrder) (*MsgPlaceLimitOrderResponse, error) + WithdrawFilledLimitOrder(context.Context, *MsgWithdrawFilledLimitOrder) (*MsgWithdrawFilledLimitOrderResponse, error) + CancelLimitOrder(context.Context, *MsgCancelLimitOrder) (*MsgCancelLimitOrderResponse, error) + MultiHopSwap(context.Context, *MsgMultiHopSwap) (*MsgMultiHopSwapResponse, error) +} + +// UnimplementedMsgServer can be embedded to have forward compatible implementations. +type UnimplementedMsgServer struct { +} + +func (*UnimplementedMsgServer) Deposit(ctx context.Context, req *MsgDeposit) (*MsgDepositResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Deposit not implemented") +} +func (*UnimplementedMsgServer) Withdrawal(ctx context.Context, req *MsgWithdrawal) (*MsgWithdrawalResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Withdrawal not implemented") +} +func (*UnimplementedMsgServer) PlaceLimitOrder(ctx context.Context, req *MsgPlaceLimitOrder) (*MsgPlaceLimitOrderResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method PlaceLimitOrder not implemented") +} +func (*UnimplementedMsgServer) WithdrawFilledLimitOrder(ctx context.Context, req *MsgWithdrawFilledLimitOrder) (*MsgWithdrawFilledLimitOrderResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method WithdrawFilledLimitOrder not implemented") +} +func (*UnimplementedMsgServer) CancelLimitOrder(ctx context.Context, req *MsgCancelLimitOrder) (*MsgCancelLimitOrderResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method CancelLimitOrder not implemented") +} +func (*UnimplementedMsgServer) MultiHopSwap(ctx context.Context, req *MsgMultiHopSwap) (*MsgMultiHopSwapResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method MultiHopSwap not implemented") +} + +func RegisterMsgServer(s grpc1.Server, srv MsgServer) { + s.RegisterService(&_Msg_serviceDesc, srv) +} + +func _Msg_Deposit_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(MsgDeposit) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(MsgServer).Deposit(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/duality.dex.Msg/Deposit", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(MsgServer).Deposit(ctx, req.(*MsgDeposit)) + } + return interceptor(ctx, in, info, handler) +} + +func _Msg_Withdrawal_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(MsgWithdrawal) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(MsgServer).Withdrawal(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/duality.dex.Msg/Withdrawal", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(MsgServer).Withdrawal(ctx, req.(*MsgWithdrawal)) + } + return interceptor(ctx, in, info, handler) +} + +func _Msg_PlaceLimitOrder_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(MsgPlaceLimitOrder) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(MsgServer).PlaceLimitOrder(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/duality.dex.Msg/PlaceLimitOrder", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(MsgServer).PlaceLimitOrder(ctx, req.(*MsgPlaceLimitOrder)) + } + return interceptor(ctx, in, info, handler) +} + +func _Msg_WithdrawFilledLimitOrder_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(MsgWithdrawFilledLimitOrder) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(MsgServer).WithdrawFilledLimitOrder(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/duality.dex.Msg/WithdrawFilledLimitOrder", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(MsgServer).WithdrawFilledLimitOrder(ctx, req.(*MsgWithdrawFilledLimitOrder)) + } + return interceptor(ctx, in, info, handler) +} + +func _Msg_CancelLimitOrder_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(MsgCancelLimitOrder) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(MsgServer).CancelLimitOrder(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/duality.dex.Msg/CancelLimitOrder", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(MsgServer).CancelLimitOrder(ctx, req.(*MsgCancelLimitOrder)) + } + return interceptor(ctx, in, info, handler) +} + +func _Msg_MultiHopSwap_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(MsgMultiHopSwap) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(MsgServer).MultiHopSwap(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/duality.dex.Msg/MultiHopSwap", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(MsgServer).MultiHopSwap(ctx, req.(*MsgMultiHopSwap)) + } + return interceptor(ctx, in, info, handler) +} + +var _Msg_serviceDesc = grpc.ServiceDesc{ + ServiceName: "duality.dex.Msg", + HandlerType: (*MsgServer)(nil), + Methods: []grpc.MethodDesc{ + { + MethodName: "Deposit", + Handler: _Msg_Deposit_Handler, + }, + { + MethodName: "Withdrawal", + Handler: _Msg_Withdrawal_Handler, + }, + { + MethodName: "PlaceLimitOrder", + Handler: _Msg_PlaceLimitOrder_Handler, + }, + { + MethodName: "WithdrawFilledLimitOrder", + Handler: _Msg_WithdrawFilledLimitOrder_Handler, + }, + { + MethodName: "CancelLimitOrder", + Handler: _Msg_CancelLimitOrder_Handler, + }, + { + MethodName: "MultiHopSwap", + Handler: _Msg_MultiHopSwap_Handler, + }, + }, + Streams: []grpc.StreamDesc{}, + Metadata: "duality/dex/tx.proto", +} + +func (m *DepositOptions) 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 *DepositOptions) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *DepositOptions) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.DisableAutoswap { + i-- + if m.DisableAutoswap { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- + dAtA[i] = 0x8 + } + return len(dAtA) - i, nil +} + +func (m *MsgDeposit) 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 *MsgDeposit) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MsgDeposit) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Options) > 0 { + for iNdEx := len(m.Options) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Options[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTx(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x4a + } + } + if len(m.Fees) > 0 { + dAtA2 := make([]byte, len(m.Fees)*10) + var j1 int + for _, num := range m.Fees { + for num >= 1<<7 { + dAtA2[j1] = uint8(uint64(num)&0x7f | 0x80) + num >>= 7 + j1++ + } + dAtA2[j1] = uint8(num) + j1++ + } + i -= j1 + copy(dAtA[i:], dAtA2[:j1]) + i = encodeVarintTx(dAtA, i, uint64(j1)) + i-- + dAtA[i] = 0x42 + } + if len(m.TickIndexesAToB) > 0 { + dAtA4 := make([]byte, len(m.TickIndexesAToB)*10) + var j3 int + for _, num1 := range m.TickIndexesAToB { + num := uint64(num1) + for num >= 1<<7 { + dAtA4[j3] = uint8(uint64(num)&0x7f | 0x80) + num >>= 7 + j3++ + } + dAtA4[j3] = uint8(num) + j3++ + } + i -= j3 + copy(dAtA[i:], dAtA4[:j3]) + i = encodeVarintTx(dAtA, i, uint64(j3)) + i-- + dAtA[i] = 0x3a + } + if len(m.AmountsB) > 0 { + for iNdEx := len(m.AmountsB) - 1; iNdEx >= 0; iNdEx-- { + { + size := m.AmountsB[iNdEx].Size() + i -= size + if _, err := m.AmountsB[iNdEx].MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintTx(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x32 + } + } + if len(m.AmountsA) > 0 { + for iNdEx := len(m.AmountsA) - 1; iNdEx >= 0; iNdEx-- { + { + size := m.AmountsA[iNdEx].Size() + i -= size + if _, err := m.AmountsA[iNdEx].MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintTx(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x2a + } + } + if len(m.TokenB) > 0 { + i -= len(m.TokenB) + copy(dAtA[i:], m.TokenB) + i = encodeVarintTx(dAtA, i, uint64(len(m.TokenB))) + i-- + dAtA[i] = 0x22 + } + if len(m.TokenA) > 0 { + i -= len(m.TokenA) + copy(dAtA[i:], m.TokenA) + i = encodeVarintTx(dAtA, i, uint64(len(m.TokenA))) + i-- + dAtA[i] = 0x1a + } + if len(m.Receiver) > 0 { + i -= len(m.Receiver) + copy(dAtA[i:], m.Receiver) + i = encodeVarintTx(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 = encodeVarintTx(dAtA, i, uint64(len(m.Creator))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *MsgDepositResponse) 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 *MsgDepositResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MsgDepositResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Reserve1Deposited) > 0 { + for iNdEx := len(m.Reserve1Deposited) - 1; iNdEx >= 0; iNdEx-- { + { + size := m.Reserve1Deposited[iNdEx].Size() + i -= size + if _, err := m.Reserve1Deposited[iNdEx].MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintTx(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } + } + if len(m.Reserve0Deposited) > 0 { + for iNdEx := len(m.Reserve0Deposited) - 1; iNdEx >= 0; iNdEx-- { + { + size := m.Reserve0Deposited[iNdEx].Size() + i -= size + if _, err := m.Reserve0Deposited[iNdEx].MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintTx(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } + } + return len(dAtA) - i, nil +} + +func (m *MsgWithdrawal) 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 *MsgWithdrawal) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MsgWithdrawal) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Fees) > 0 { + dAtA6 := make([]byte, len(m.Fees)*10) + var j5 int + for _, num := range m.Fees { + for num >= 1<<7 { + dAtA6[j5] = uint8(uint64(num)&0x7f | 0x80) + num >>= 7 + j5++ + } + dAtA6[j5] = uint8(num) + j5++ + } + i -= j5 + copy(dAtA[i:], dAtA6[:j5]) + i = encodeVarintTx(dAtA, i, uint64(j5)) + i-- + dAtA[i] = 0x3a + } + if len(m.TickIndexesAToB) > 0 { + dAtA8 := make([]byte, len(m.TickIndexesAToB)*10) + var j7 int + for _, num1 := range m.TickIndexesAToB { + num := uint64(num1) + for num >= 1<<7 { + dAtA8[j7] = uint8(uint64(num)&0x7f | 0x80) + num >>= 7 + j7++ + } + dAtA8[j7] = uint8(num) + j7++ + } + i -= j7 + copy(dAtA[i:], dAtA8[:j7]) + i = encodeVarintTx(dAtA, i, uint64(j7)) + i-- + dAtA[i] = 0x32 + } + if len(m.SharesToRemove) > 0 { + for iNdEx := len(m.SharesToRemove) - 1; iNdEx >= 0; iNdEx-- { + { + size := m.SharesToRemove[iNdEx].Size() + i -= size + if _, err := m.SharesToRemove[iNdEx].MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintTx(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x2a + } + } + if len(m.TokenB) > 0 { + i -= len(m.TokenB) + copy(dAtA[i:], m.TokenB) + i = encodeVarintTx(dAtA, i, uint64(len(m.TokenB))) + i-- + dAtA[i] = 0x22 + } + if len(m.TokenA) > 0 { + i -= len(m.TokenA) + copy(dAtA[i:], m.TokenA) + i = encodeVarintTx(dAtA, i, uint64(len(m.TokenA))) + i-- + dAtA[i] = 0x1a + } + if len(m.Receiver) > 0 { + i -= len(m.Receiver) + copy(dAtA[i:], m.Receiver) + i = encodeVarintTx(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 = encodeVarintTx(dAtA, i, uint64(len(m.Creator))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *MsgWithdrawalResponse) 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 *MsgWithdrawalResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MsgWithdrawalResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + return len(dAtA) - i, nil +} + +func (m *MsgPlaceLimitOrder) 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 *MsgPlaceLimitOrder) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MsgPlaceLimitOrder) 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 = encodeVarintTx(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x52 + } + if m.ExpirationTime != nil { + n9, err9 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(*m.ExpirationTime, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(*m.ExpirationTime):]) + if err9 != nil { + return 0, err9 + } + i -= n9 + i = encodeVarintTx(dAtA, i, uint64(n9)) + i-- + dAtA[i] = 0x4a + } + if m.OrderType != 0 { + i = encodeVarintTx(dAtA, i, uint64(m.OrderType)) + i-- + dAtA[i] = 0x40 + } + { + size := m.AmountIn.Size() + i -= size + if _, err := m.AmountIn.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintTx(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x3a + if m.TickIndexInToOut != 0 { + i = encodeVarintTx(dAtA, i, uint64(m.TickIndexInToOut)) + i-- + dAtA[i] = 0x28 + } + if len(m.TokenOut) > 0 { + i -= len(m.TokenOut) + copy(dAtA[i:], m.TokenOut) + i = encodeVarintTx(dAtA, i, uint64(len(m.TokenOut))) + i-- + dAtA[i] = 0x22 + } + if len(m.TokenIn) > 0 { + i -= len(m.TokenIn) + copy(dAtA[i:], m.TokenIn) + i = encodeVarintTx(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 = encodeVarintTx(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 = encodeVarintTx(dAtA, i, uint64(len(m.Creator))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *MsgPlaceLimitOrderResponse) 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 *MsgPlaceLimitOrderResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MsgPlaceLimitOrderResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + { + 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] = 0x1a + { + size := m.CoinIn.Size() + i -= size + if _, err := m.CoinIn.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintTx(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + if len(m.TrancheKey) > 0 { + i -= len(m.TrancheKey) + copy(dAtA[i:], m.TrancheKey) + i = encodeVarintTx(dAtA, i, uint64(len(m.TrancheKey))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *MsgWithdrawFilledLimitOrder) 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 *MsgWithdrawFilledLimitOrder) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MsgWithdrawFilledLimitOrder) 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 = encodeVarintTx(dAtA, i, uint64(len(m.TrancheKey))) + i-- + dAtA[i] = 0x12 + } + if len(m.Creator) > 0 { + i -= len(m.Creator) + copy(dAtA[i:], m.Creator) + i = encodeVarintTx(dAtA, i, uint64(len(m.Creator))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *MsgWithdrawFilledLimitOrderResponse) 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 *MsgWithdrawFilledLimitOrderResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MsgWithdrawFilledLimitOrderResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + return len(dAtA) - i, nil +} + +func (m *MsgCancelLimitOrder) 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 *MsgCancelLimitOrder) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MsgCancelLimitOrder) 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 = encodeVarintTx(dAtA, i, uint64(len(m.TrancheKey))) + i-- + dAtA[i] = 0x12 + } + if len(m.Creator) > 0 { + i -= len(m.Creator) + copy(dAtA[i:], m.Creator) + i = encodeVarintTx(dAtA, i, uint64(len(m.Creator))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *MsgCancelLimitOrderResponse) 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 *MsgCancelLimitOrderResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MsgCancelLimitOrderResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + return len(dAtA) - i, nil +} + +func (m *MultiHopRoute) 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 *MultiHopRoute) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MultiHopRoute) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Hops) > 0 { + for iNdEx := len(m.Hops) - 1; iNdEx >= 0; iNdEx-- { + i -= len(m.Hops[iNdEx]) + copy(dAtA[i:], m.Hops[iNdEx]) + i = encodeVarintTx(dAtA, i, uint64(len(m.Hops[iNdEx]))) + i-- + dAtA[i] = 0xa + } + } + return len(dAtA) - i, nil +} + +func (m *MsgMultiHopSwap) 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 *MsgMultiHopSwap) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MsgMultiHopSwap) 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 + } + i-- + dAtA[i] = 0x30 + } + { + size := m.ExitLimitPrice.Size() + i -= size + if _, err := m.ExitLimitPrice.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintTx(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 = encodeVarintTx(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 = encodeVarintTx(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1a + } + } + if len(m.Receiver) > 0 { + i -= len(m.Receiver) + copy(dAtA[i:], m.Receiver) + i = encodeVarintTx(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 = encodeVarintTx(dAtA, i, uint64(len(m.Creator))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *MsgMultiHopSwapResponse) 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 *MsgMultiHopSwapResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MsgMultiHopSwapResponse) 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 + } + i = encodeVarintTx(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + 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 *DepositOptions) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.DisableAutoswap { + n += 2 + } + return n +} + +func (m *MsgDeposit) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Creator) + if l > 0 { + n += 1 + l + sovTx(uint64(l)) + } + l = len(m.Receiver) + if l > 0 { + n += 1 + l + sovTx(uint64(l)) + } + l = len(m.TokenA) + if l > 0 { + n += 1 + l + sovTx(uint64(l)) + } + l = len(m.TokenB) + if l > 0 { + n += 1 + l + sovTx(uint64(l)) + } + if len(m.AmountsA) > 0 { + for _, e := range m.AmountsA { + l = e.Size() + n += 1 + l + sovTx(uint64(l)) + } + } + if len(m.AmountsB) > 0 { + for _, e := range m.AmountsB { + l = e.Size() + n += 1 + l + sovTx(uint64(l)) + } + } + if len(m.TickIndexesAToB) > 0 { + l = 0 + for _, e := range m.TickIndexesAToB { + l += sovTx(uint64(e)) + } + n += 1 + sovTx(uint64(l)) + l + } + if len(m.Fees) > 0 { + l = 0 + for _, e := range m.Fees { + l += sovTx(uint64(e)) + } + n += 1 + sovTx(uint64(l)) + l + } + if len(m.Options) > 0 { + for _, e := range m.Options { + l = e.Size() + n += 1 + l + sovTx(uint64(l)) + } + } + return n +} + +func (m *MsgDepositResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if len(m.Reserve0Deposited) > 0 { + for _, e := range m.Reserve0Deposited { + l = e.Size() + n += 1 + l + sovTx(uint64(l)) + } + } + if len(m.Reserve1Deposited) > 0 { + for _, e := range m.Reserve1Deposited { + l = e.Size() + n += 1 + l + sovTx(uint64(l)) + } + } + return n +} + +func (m *MsgWithdrawal) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Creator) + if l > 0 { + n += 1 + l + sovTx(uint64(l)) + } + l = len(m.Receiver) + if l > 0 { + n += 1 + l + sovTx(uint64(l)) + } + l = len(m.TokenA) + if l > 0 { + n += 1 + l + sovTx(uint64(l)) + } + l = len(m.TokenB) + if l > 0 { + n += 1 + l + sovTx(uint64(l)) + } + if len(m.SharesToRemove) > 0 { + for _, e := range m.SharesToRemove { + l = e.Size() + n += 1 + l + sovTx(uint64(l)) + } + } + if len(m.TickIndexesAToB) > 0 { + l = 0 + for _, e := range m.TickIndexesAToB { + l += sovTx(uint64(e)) + } + n += 1 + sovTx(uint64(l)) + l + } + if len(m.Fees) > 0 { + l = 0 + for _, e := range m.Fees { + l += sovTx(uint64(e)) + } + n += 1 + sovTx(uint64(l)) + l + } + return n +} + +func (m *MsgWithdrawalResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + return n +} + +func (m *MsgPlaceLimitOrder) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Creator) + if l > 0 { + n += 1 + l + sovTx(uint64(l)) + } + l = len(m.Receiver) + if l > 0 { + n += 1 + l + sovTx(uint64(l)) + } + l = len(m.TokenIn) + if l > 0 { + n += 1 + l + sovTx(uint64(l)) + } + l = len(m.TokenOut) + if l > 0 { + n += 1 + l + sovTx(uint64(l)) + } + if m.TickIndexInToOut != 0 { + n += 1 + sovTx(uint64(m.TickIndexInToOut)) + } + l = m.AmountIn.Size() + n += 1 + l + sovTx(uint64(l)) + if m.OrderType != 0 { + n += 1 + sovTx(uint64(m.OrderType)) + } + if m.ExpirationTime != nil { + l = github_com_cosmos_gogoproto_types.SizeOfStdTime(*m.ExpirationTime) + n += 1 + l + sovTx(uint64(l)) + } + if m.MaxAmountOut != nil { + l = m.MaxAmountOut.Size() + n += 1 + l + sovTx(uint64(l)) + } + return n +} + +func (m *MsgPlaceLimitOrderResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.TrancheKey) + if l > 0 { + n += 1 + l + sovTx(uint64(l)) + } + l = m.CoinIn.Size() + n += 1 + l + sovTx(uint64(l)) + l = m.TakerCoinOut.Size() + n += 1 + l + sovTx(uint64(l)) + return n +} + +func (m *MsgWithdrawFilledLimitOrder) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Creator) + if l > 0 { + n += 1 + l + sovTx(uint64(l)) + } + l = len(m.TrancheKey) + if l > 0 { + n += 1 + l + sovTx(uint64(l)) + } + return n +} + +func (m *MsgWithdrawFilledLimitOrderResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + return n +} + +func (m *MsgCancelLimitOrder) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Creator) + if l > 0 { + n += 1 + l + sovTx(uint64(l)) + } + l = len(m.TrancheKey) + if l > 0 { + n += 1 + l + sovTx(uint64(l)) + } + return n +} + +func (m *MsgCancelLimitOrderResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + return n +} + +func (m *MultiHopRoute) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if len(m.Hops) > 0 { + for _, s := range m.Hops { + l = len(s) + n += 1 + l + sovTx(uint64(l)) + } + } + return n +} + +func (m *MsgMultiHopSwap) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Creator) + if l > 0 { + n += 1 + l + sovTx(uint64(l)) + } + l = len(m.Receiver) + if l > 0 { + n += 1 + l + sovTx(uint64(l)) + } + if len(m.Routes) > 0 { + for _, e := range m.Routes { + l = e.Size() + n += 1 + l + sovTx(uint64(l)) + } + } + l = m.AmountIn.Size() + n += 1 + l + sovTx(uint64(l)) + l = m.ExitLimitPrice.Size() + n += 1 + l + sovTx(uint64(l)) + if m.PickBestRoute { + n += 2 + } + return n +} + +func (m *MsgMultiHopSwapResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = m.CoinOut.Size() + n += 1 + l + sovTx(uint64(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 *DepositOptions) 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: DepositOptions: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: DepositOptions: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field DisableAutoswap", wireType) + } + var v int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.DisableAutoswap = bool(v != 0) + 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 *MsgDeposit) 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: MsgDeposit: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MsgDeposit: 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 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.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 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.Receiver = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field TokenA", 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.TokenA = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field TokenB", 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.TokenB = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 5: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field AmountsA", 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 + } + var v github_com_cosmos_cosmos_sdk_types.Int + m.AmountsA = append(m.AmountsA, v) + if err := m.AmountsA[len(m.AmountsA)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 6: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field AmountsB", 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 + } + var v github_com_cosmos_cosmos_sdk_types.Int + m.AmountsB = append(m.AmountsB, v) + if err := m.AmountsB[len(m.AmountsB)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 7: + if wireType == 0 { + var v int64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.TickIndexesAToB = append(m.TickIndexesAToB, v) + } else if wireType == 2 { + var packedLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + packedLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if packedLen < 0 { + return ErrInvalidLengthTx + } + postIndex := iNdEx + packedLen + if postIndex < 0 { + return ErrInvalidLengthTx + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + var elementCount int + var count int + for _, integer := range dAtA[iNdEx:postIndex] { + if integer < 128 { + count++ + } + } + elementCount = count + if elementCount != 0 && len(m.TickIndexesAToB) == 0 { + m.TickIndexesAToB = make([]int64, 0, elementCount) + } + for iNdEx < postIndex { + var v int64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.TickIndexesAToB = append(m.TickIndexesAToB, v) + } + } else { + return fmt.Errorf("proto: wrong wireType = %d for field TickIndexesAToB", wireType) + } + case 8: + if wireType == 0 { + var v uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.Fees = append(m.Fees, v) + } else if wireType == 2 { + var packedLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + packedLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if packedLen < 0 { + return ErrInvalidLengthTx + } + postIndex := iNdEx + packedLen + if postIndex < 0 { + return ErrInvalidLengthTx + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + var elementCount int + var count int + for _, integer := range dAtA[iNdEx:postIndex] { + if integer < 128 { + count++ + } + } + elementCount = count + if elementCount != 0 && len(m.Fees) == 0 { + m.Fees = make([]uint64, 0, elementCount) + } + for iNdEx < postIndex { + var v uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.Fees = append(m.Fees, v) + } + } else { + return fmt.Errorf("proto: wrong wireType = %d for field Fees", wireType) + } + case 9: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Options", 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.Options = append(m.Options, &DepositOptions{}) + if err := m.Options[len(m.Options)-1].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 *MsgDepositResponse) 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: MsgDepositResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MsgDepositResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Reserve0Deposited", 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 + } + var v github_com_cosmos_cosmos_sdk_types.Int + m.Reserve0Deposited = append(m.Reserve0Deposited, v) + if err := m.Reserve0Deposited[len(m.Reserve0Deposited)-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 Reserve1Deposited", 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 + } + var v github_com_cosmos_cosmos_sdk_types.Int + m.Reserve1Deposited = append(m.Reserve1Deposited, v) + if err := m.Reserve1Deposited[len(m.Reserve1Deposited)-1].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 *MsgWithdrawal) 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: MsgWithdrawal: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MsgWithdrawal: 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 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.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 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.Receiver = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field TokenA", 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.TokenA = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field TokenB", 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.TokenB = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 5: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field SharesToRemove", 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 + } + var v github_com_cosmos_cosmos_sdk_types.Int + m.SharesToRemove = append(m.SharesToRemove, v) + if err := m.SharesToRemove[len(m.SharesToRemove)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 6: + if wireType == 0 { + var v int64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.TickIndexesAToB = append(m.TickIndexesAToB, v) + } else if wireType == 2 { + var packedLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + packedLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if packedLen < 0 { + return ErrInvalidLengthTx + } + postIndex := iNdEx + packedLen + if postIndex < 0 { + return ErrInvalidLengthTx + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + var elementCount int + var count int + for _, integer := range dAtA[iNdEx:postIndex] { + if integer < 128 { + count++ + } + } + elementCount = count + if elementCount != 0 && len(m.TickIndexesAToB) == 0 { + m.TickIndexesAToB = make([]int64, 0, elementCount) + } + for iNdEx < postIndex { + var v int64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.TickIndexesAToB = append(m.TickIndexesAToB, v) + } + } else { + return fmt.Errorf("proto: wrong wireType = %d for field TickIndexesAToB", wireType) + } + case 7: + if wireType == 0 { + var v uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.Fees = append(m.Fees, v) + } else if wireType == 2 { + var packedLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + packedLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if packedLen < 0 { + return ErrInvalidLengthTx + } + postIndex := iNdEx + packedLen + if postIndex < 0 { + return ErrInvalidLengthTx + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + var elementCount int + var count int + for _, integer := range dAtA[iNdEx:postIndex] { + if integer < 128 { + count++ + } + } + elementCount = count + if elementCount != 0 && len(m.Fees) == 0 { + m.Fees = make([]uint64, 0, elementCount) + } + for iNdEx < postIndex { + var v uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.Fees = append(m.Fees, v) + } + } else { + return fmt.Errorf("proto: wrong wireType = %d for field Fees", wireType) + } + 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 *MsgWithdrawalResponse) 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: MsgWithdrawalResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MsgWithdrawalResponse: 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 (m *MsgPlaceLimitOrder) 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: MsgPlaceLimitOrder: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MsgPlaceLimitOrder: 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 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.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 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.Receiver = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + 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 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.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 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.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 ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.TickIndexInToOut |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 7: + 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 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.AmountIn.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 8: + 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 ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.OrderType |= LimitOrderType(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 9: + 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 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.ExpirationTime == nil { + m.ExpirationTime = new(time.Time) + } + if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(m.ExpirationTime, dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 10: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field MaxAmountOut", 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 + } + var v github_com_cosmos_cosmos_sdk_types.Int + m.MaxAmountOut = &v + if err := m.MaxAmountOut.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 *MsgPlaceLimitOrderResponse) 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: MsgPlaceLimitOrderResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MsgPlaceLimitOrderResponse: 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) + } + 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.TrancheKey = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field CoinIn", 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.CoinIn.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 3: + 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 + 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 *MsgWithdrawFilledLimitOrder) 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: MsgWithdrawFilledLimitOrder: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MsgWithdrawFilledLimitOrder: 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 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.Creator = 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 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.TrancheKey = string(dAtA[iNdEx:postIndex]) + 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 *MsgWithdrawFilledLimitOrderResponse) 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: MsgWithdrawFilledLimitOrderResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MsgWithdrawFilledLimitOrderResponse: 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 (m *MsgCancelLimitOrder) 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: MsgCancelLimitOrder: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MsgCancelLimitOrder: 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 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.Creator = 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 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.TrancheKey = string(dAtA[iNdEx:postIndex]) + 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 *MsgCancelLimitOrderResponse) 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: MsgCancelLimitOrderResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MsgCancelLimitOrderResponse: 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 (m *MultiHopRoute) 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: MultiHopRoute: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MultiHopRoute: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Hops", 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.Hops = append(m.Hops, string(dAtA[iNdEx:postIndex])) + 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 *MsgMultiHopSwap) 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: MsgMultiHopSwap: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MsgMultiHopSwap: 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 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.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 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.Receiver = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Routes", 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.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 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.AmountIn.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 5: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ExitLimitPrice", 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.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 ErrIntOverflowTx + } + 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 := 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 *MsgMultiHopSwapResponse) 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: MsgMultiHopSwapResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MsgMultiHopSwapResponse: 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) + } + 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.CoinOut.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 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/dex/types/types.go b/x/dex/types/types.go new file mode 100644 index 000000000..ab1254f4c --- /dev/null +++ b/x/dex/types/types.go @@ -0,0 +1 @@ +package types diff --git a/x/dex/utils/abci.go b/x/dex/utils/abci.go new file mode 100644 index 000000000..ec96f9534 --- /dev/null +++ b/x/dex/utils/abci.go @@ -0,0 +1,28 @@ +package utils + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" + sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" +) + +func GetBlockGasUsed(ctx sdk.Context) (gasUsed uint64, err error) { + switch { + case ctx.BlockGasMeter() != nil: + return ctx.BlockGasMeter().GasConsumed(), nil + case ctx.IsCheckTx(): + // If we are checking a TX or this is a simulation we can return whatever + return 0, nil + default: + // Otherwise, BlockGasMeter should probably be initialized + return 0, sdkerrors.Wrap(sdkerrors.ErrAppConfig, "Block Gas Meter is not initialized") + } +} + +func MustGetBlockGasUsed(ctx sdk.Context) uint64 { + gasUsed, err := GetBlockGasUsed(ctx) + if err != nil { + panic(err) + } + + return gasUsed +} diff --git a/x/dex/utils/errors.go b/x/dex/utils/errors.go new file mode 100644 index 000000000..e46b0eb5f --- /dev/null +++ b/x/dex/utils/errors.go @@ -0,0 +1,15 @@ +package utils + +import ( + "fmt" +) + +func JoinErrors(parentError error, errs ...error) error { + // TODO: switch to errors.Join when we bump to golang 1.20 + fullError := fmt.Errorf("errors: %w", parentError) + for _, err := range errs { + fullError = fmt.Errorf("%w", err) + } + + return fullError +} diff --git a/x/dex/utils/math.go b/x/dex/utils/math.go new file mode 100644 index 000000000..6fe67f632 --- /dev/null +++ b/x/dex/utils/math.go @@ -0,0 +1,67 @@ +package utils + +import ( + "fmt" + "math" + "strconv" + + sdk "github.com/cosmos/cosmos-sdk/types" + math_utils "github.com/neutron-org/neutron/utils/math" +) + +// Return the base value for price, 1.0001 +func BasePrice() math_utils.PrecDec { + return math_utils.MustNewPrecDecFromStr("1.0001") +} + +func Abs(x int64) uint64 { + if x < 0 { + return uint64(-x) + } + + return uint64(x) +} + +func MinIntArr(vals []sdk.Int) sdk.Int { + min := vals[0] + for _, val := range vals { + if val.LT(min) { + min = val + } + } + + return min +} + +func MaxIntArr(vals []sdk.Int) sdk.Int { + max := vals[0] + for _, val := range vals { + if val.GT(max) { + max = val + } + } + + return max +} + +func Uint64ToSortableString(i uint64) string { + // Converts a Uint to a string that sorts lexogrpahically in integer order + intStr := strconv.FormatUint(i, 36) + lenStr := len(intStr) + lenChar := strconv.FormatUint(uint64(lenStr), 36) + + return fmt.Sprintf("%s%s", lenChar, intStr) +} + +func SafeUint64ToInt64(in uint64) (out int64, overflow bool) { + return int64(in), in > math.MaxInt64 +} + +func MustSafeUint64ToInt64(in uint64) (out int64) { + safeInt64, overflow := SafeUint64ToInt64(in) + if overflow { + panic("Overflow while casting uint64 to int64") + } + + return safeInt64 +} diff --git a/x/epochs/README.md b/x/epochs/README.md new file mode 100644 index 000000000..ae92f0529 --- /dev/null +++ b/x/epochs/README.md @@ -0,0 +1,187 @@ +# Epochs + +## Abstract + +Often in the SDK, we would like to run certain code every-so often. The +purpose of `epochs` module is to allow other modules to set that they +would like to be signaled once every period. So another module can +specify it wants to execute code once a week, starting at UTC-time = x. +`epochs` creates a generalized epoch interface to other modules so that +they can easily be signalled upon such events. + +## Contents + +1. **[Concept](#concepts)** +2. **[State](#state)** +3. **[Events](#events)** +4. **[Keeper](#keepers)** +5. **[Hooks](#hooks)** +6. **[Queries](#queries)** + +## Concepts + +The epochs module defines on-chain timers, that execute at fixed time intervals. +Other SDK modules can then register logic to be executed at the timer ticks. +We refer to the period in between two timer ticks as an "epoch". + +Every timer has a unique identifier. +Every epoch will have a start time, and an end time, where `end time = start time + timer interval`. +On Duality mainnet, we only utilize one identifier, with a time interval of `one day`. + +The timer will tick at the first block whose blocktime is greater than the timer end time, +and set the start as the prior timer end time. (Notably, its not set to the block time!) +This means that if the chain has been down for awhile, you will get one timer tick per block, +until the timer has caught up. + +## State + +The Epochs module keeps a single [`EpochInfo`](https://github.com/osmosis-labs/osmosis/blob/b4befe4f3eb97ebb477323234b910c4afafab9b7/proto/osmosis/epochs/genesis.proto#L12) per identifier. +This contains the current state of the timer with the corresponding identifier. +Its fields are modified at every timer tick. +EpochInfos are initialized as part of genesis initialization or upgrade logic, +and are only modified on begin blockers. + +## Events + +The `epochs` module emits the following events: + +### BeginBlocker + +| Type | Attribute Key | Attribute Value | +| ----------- | ------------- | --------------- | +| epoch_start | epoch_number | {epoch_number} | +| epoch_start | start_time | {start_time} | + +### EndBlocker + +| Type | Attribute Key | Attribute Value | +| --------- | ------------- | --------------- | +| epoch_end | epoch_number | {epoch_number} | + +## Keepers + +### Keeper functions + +Epochs keeper module provides utility functions to manage epochs. + +```go +// Keeper is the interface for lockup module keeper +type Keeper interface { + // GetEpochInfo returns epoch info by identifier + GetEpochInfo(ctx sdk.Context, identifier string) types.EpochInfo + // SetEpochInfo set epoch info + SetEpochInfo(ctx sdk.Context, epoch types.EpochInfo) + // DeleteEpochInfo delete epoch info + DeleteEpochInfo(ctx sdk.Context, identifier string) + // IterateEpochInfo iterate through epochs + IterateEpochInfo(ctx sdk.Context, fn func(index int64, epochInfo types.EpochInfo) (stop bool)) + // Get all epoch infos + AllEpochInfos(ctx sdk.Context) []types.EpochInfo +} +``` + +## Hooks + +```go + // the first block whose timestamp is after the duration is counted as the end of the epoch + AfterEpochEnd(ctx sdk.Context, epochIdentifier string, epochNumber int64) + // new epoch is next block of epoch end block + BeforeEpochStart(ctx sdk.Context, epochIdentifier string, epochNumber int64) +``` + +### How modules receive hooks + +On hook receiver function of other modules, they need to filter +`epochIdentifier` and only do executions for only specific +epochIdentifier. Filtering epochIdentifier could be in `Params` of other +modules so that they can be modified by governance. + +This is the standard dev UX of this: + +```golang +func (k MyModuleKeeper) AfterEpochEnd(ctx sdk.Context, epochIdentifier string, epochNumber int64) { + params := k.GetParams(ctx) + if epochIdentifier == params.DistrEpochIdentifier { + // my logic + } +} +``` + +### Panic isolation + +If a given epoch hook panics, its state update is reverted, but we keep +proceeding through the remaining hooks. This allows more advanced epoch +logic to be used, without concern over state machine halting, or halting +subsequent modules. + +This does mean that if there is behavior you expect from a prior epoch +hook, and that epoch hook reverted, your hook may also have an issue. So +do keep in mind "what if a prior hook didn't get executed" in the safety +checks you consider for a new epoch hook. + +## Queries + +Epochs module is providing below queries to check the module's state. + +```protobuf +service Query { + // EpochInfos provide running epochInfos + rpc EpochInfos(QueryEpochsInfoRequest) returns (QueryEpochsInfoResponse) {} + // CurrentEpoch provide current epoch of specified identifier + rpc CurrentEpoch(QueryCurrentEpochRequest) returns (QueryCurrentEpochResponse) {} +} +``` + +### Epoch Infos + +Query the currently running epochInfos + +```sh +dualityd query epochs epoch-infos +``` + +::: details Example + +An example output: + +```sh +epochs: +- current_epoch: "183" + current_epoch_start_height: "2438409" + current_epoch_start_time: "2021-12-18T17:16:09.898160996Z" + duration: 86400s + epoch_counting_started: true + identifier: day + start_time: "2021-06-18T17:00:00Z" +- current_epoch: "26" + current_epoch_start_height: "2424854" + current_epoch_start_time: "2021-12-17T17:02:07.229632445Z" + duration: 604800s + epoch_counting_started: true + identifier: week + start_time: "2021-06-18T17:00:00Z" +``` + +::: + +### Current Epoch + +Query the current epoch by the specified identifier + +```sh +dualityd query epochs current-epoch [identifier] +``` + +::: details Example + +Query the current `day` epoch: + +```sh +dualityd query epochs current-epoch day +``` + +Which in this example outputs: + +```sh +current_epoch: "183" +``` diff --git a/x/epochs/client/cli/cli_test.go b/x/epochs/client/cli/cli_test.go new file mode 100644 index 000000000..b8406fa5d --- /dev/null +++ b/x/epochs/client/cli/cli_test.go @@ -0,0 +1,33 @@ +package cli_test + +import ( + "testing" + + "github.com/neutron-org/neutron/utils/dcli" + "github.com/neutron-org/neutron/x/epochs/client/cli" + "github.com/neutron-org/neutron/x/epochs/types" +) + +func TestGetCmdCurrentEpoch(t *testing.T) { + desc, _ := cli.GetCmdCurrentEpoch() + tcs := map[string]dcli.QueryCliTestCase[*types.QueryCurrentEpochRequest]{ + "basic test": { + Cmd: "day", + ExpectedQuery: &types.QueryCurrentEpochRequest{ + Identifier: "day", + }, + }, + } + dcli.RunQueryTestCases(t, desc, tcs) +} + +func TestGetCmdEpochsInfo(t *testing.T) { + desc, _ := cli.GetCmdEpochInfos() + tcs := map[string]dcli.QueryCliTestCase[*types.QueryEpochsInfoRequest]{ + "basic test": { + Cmd: "", + ExpectedQuery: &types.QueryEpochsInfoRequest{}, + }, + } + dcli.RunQueryTestCases(t, desc, tcs) +} diff --git a/x/epochs/client/cli/query.go b/x/epochs/client/cli/query.go new file mode 100644 index 000000000..e9bcf2238 --- /dev/null +++ b/x/epochs/client/cli/query.go @@ -0,0 +1,36 @@ +package cli + +import ( + "github.com/spf13/cobra" + + "github.com/neutron-org/neutron/utils/dcli" + "github.com/neutron-org/neutron/x/epochs/types" +) + +// GetQueryCmd returns the cli query commands for this module. +func GetQueryCmd() *cobra.Command { + cmd := dcli.QueryIndexCmd(types.ModuleName) + dcli.AddQueryCmd(cmd, types.NewQueryClient, GetCmdEpochInfos) + dcli.AddQueryCmd(cmd, types.NewQueryClient, GetCmdCurrentEpoch) + + return cmd +} + +func GetCmdEpochInfos() (*dcli.QueryDescriptor, *types.QueryEpochsInfoRequest) { + return &dcli.QueryDescriptor{ + Use: "epoch-infos", + Short: "Query running epoch infos.", + Long: `{{.Short}}{{.ExampleHeader}} +{{.CommandPrefix}}`, + QueryFnName: "EpochInfos", + }, &types.QueryEpochsInfoRequest{} +} + +func GetCmdCurrentEpoch() (*dcli.QueryDescriptor, *types.QueryCurrentEpochRequest) { + return &dcli.QueryDescriptor{ + Use: "current-epoch", + Short: "Query current epoch by specified identifier.", + Long: `{{.Short}}{{.ExampleHeader}} +{{.CommandPrefix}} day`, + }, &types.QueryCurrentEpochRequest{} +} diff --git a/x/epochs/keeper/abci.go b/x/epochs/keeper/abci.go new file mode 100644 index 000000000..c8eedc570 --- /dev/null +++ b/x/epochs/keeper/abci.go @@ -0,0 +1,81 @@ +package keeper + +import ( + "fmt" + "time" + + "github.com/neutron-org/neutron/x/epochs/types" + + "github.com/cosmos/cosmos-sdk/telemetry" + sdk "github.com/cosmos/cosmos-sdk/types" +) + +// BeginBlocker of epochs module. +func (k Keeper) BeginBlocker(ctx sdk.Context) { + defer telemetry.ModuleMeasureSince( + types.ModuleName, + time.Now(), + telemetry.MetricKeyBeginBlocker, + ) + k.IterateEpochInfo(ctx, func(index int64, epochInfo types.EpochInfo) (stop bool) { + logger := k.Logger(ctx) + + // If blocktime < initial epoch start time, return + if ctx.BlockTime().Before(epochInfo.StartTime) { + return + } + // if epoch counting hasn't started, signal we need to start. + shouldInitialEpochStart := !epochInfo.EpochCountingStarted + + epochEndTime := epochInfo.CurrentEpochStartTime.Add(epochInfo.Duration) + shouldEpochStart := (ctx.BlockTime().After(epochEndTime)) || shouldInitialEpochStart + + if !shouldEpochStart { + return false + } + epochInfo.CurrentEpochStartHeight = ctx.BlockHeight() + + if shouldInitialEpochStart { + epochInfo.EpochCountingStarted = true + epochInfo.CurrentEpoch = 1 + epochInfo.CurrentEpochStartTime = epochInfo.StartTime + logger.Info( + "Starting epoch", + "Identifier", + epochInfo.Identifier, + "CurEpoch", + epochInfo.CurrentEpoch, + ) + } else { + ctx.EventManager().EmitEvent( + sdk.NewEvent( + types.EventTypeEpochEnd, + sdk.NewAttribute(types.AttributeEpochNumber, fmt.Sprintf("%d", epochInfo.CurrentEpoch)), + ), + ) + k.AfterEpochEnd(ctx, epochInfo.Identifier, epochInfo.CurrentEpoch) + epochInfo.CurrentEpoch++ + epochInfo.CurrentEpochStartTime = epochInfo.CurrentEpochStartTime.Add(epochInfo.Duration) + logger.Info("Starting epoch", "Identifier", epochInfo.Identifier, "CurEpoch", epochInfo.CurrentEpoch) + } + + // emit new epoch start event, set epoch info, and run BeforeEpochStart hook + ctx.EventManager().EmitEvent( + sdk.NewEvent( + types.EventTypeEpochStart, + sdk.NewAttribute( + types.AttributeEpochNumber, + fmt.Sprintf("%d", epochInfo.CurrentEpoch), + ), + sdk.NewAttribute( + types.AttributeEpochStartTime, + fmt.Sprintf("%d", epochInfo.CurrentEpochStartTime.Unix()), + ), + ), + ) + k.setEpochInfo(ctx, epochInfo) + k.BeforeEpochStart(ctx, epochInfo.Identifier, epochInfo.CurrentEpoch) + + return false + }) +} diff --git a/x/epochs/keeper/abci_test.go b/x/epochs/keeper/abci_test.go new file mode 100644 index 000000000..44304ae11 --- /dev/null +++ b/x/epochs/keeper/abci_test.go @@ -0,0 +1,300 @@ +package keeper_test + +import ( + "testing" + "time" + + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + "github.com/stretchr/testify/require" + + "github.com/neutron-org/neutron/app" + "github.com/neutron-org/neutron/x/epochs/types" + + "golang.org/x/exp/maps" + + "github.com/neutron-org/neutron/utils" +) + +// This test is responsible for testing how epochs increment based off +// of their initial conditions, and subsequent block height / times. +func (suite KeeperTestSuite) TestEpochInfoBeginBlockChanges() { + block1Time := time.Unix(1656907200, 0).UTC() + const defaultIdentifier = "hourly" + const defaultDuration = time.Hour + // eps is short for epsilon - in this case a negligible amount of time. + const eps = time.Nanosecond + + tests := map[string]struct { + // if identifier, duration is not set, we make it defaultIdentifier and defaultDuration. + // EpochCountingStarted, if unspecified, is inferred by CurrentEpoch == 0 + // StartTime is inferred to be block1Time if left blank. + initialEpochInfo types.EpochInfo + blockHeightTimePairs map[int]time.Time + expEpochInfo types.EpochInfo + }{ + "First block running at exactly start time sets epoch tick": { + initialEpochInfo: types.EpochInfo{ + StartTime: block1Time, + CurrentEpoch: 0, + CurrentEpochStartTime: time.Time{}, + }, + expEpochInfo: types.EpochInfo{ + StartTime: block1Time, + CurrentEpoch: 1, + CurrentEpochStartTime: block1Time, + CurrentEpochStartHeight: 1, + }, + }, + "First block run sets start time, subsequent blocks within timer interval do not cause timer tick": { + initialEpochInfo: types.EpochInfo{ + StartTime: block1Time, + CurrentEpoch: 0, + CurrentEpochStartTime: time.Time{}, + }, + blockHeightTimePairs: map[int]time.Time{ + 2: block1Time.Add(time.Second), + 3: block1Time.Add(time.Minute), + 4: block1Time.Add(30 * time.Minute), + }, + expEpochInfo: types.EpochInfo{ + StartTime: block1Time, + CurrentEpoch: 1, + CurrentEpochStartTime: block1Time, + CurrentEpochStartHeight: 1, + }, + }, + "Second block at exactly timer interval later does not tick": { + initialEpochInfo: types.EpochInfo{ + StartTime: block1Time, + CurrentEpoch: 0, + CurrentEpochStartTime: time.Time{}, + }, + blockHeightTimePairs: map[int]time.Time{2: block1Time.Add(defaultDuration)}, + expEpochInfo: types.EpochInfo{ + StartTime: block1Time, + CurrentEpoch: 1, + CurrentEpochStartTime: block1Time, + CurrentEpochStartHeight: 1, + }, + }, + "Second block at timer interval + epsilon later does tick": { + initialEpochInfo: types.EpochInfo{ + StartTime: block1Time, + CurrentEpoch: 0, + CurrentEpochStartTime: time.Time{}, + }, + blockHeightTimePairs: map[int]time.Time{2: block1Time.Add(defaultDuration).Add(eps)}, + expEpochInfo: types.EpochInfo{ + StartTime: block1Time, + CurrentEpoch: 2, + CurrentEpochStartTime: block1Time.Add(time.Hour), + CurrentEpochStartHeight: 2, + }, + }, + "Downtime recovery (many intervals), first block causes 1 tick and sets current start time 1 interval ahead": { + initialEpochInfo: types.EpochInfo{ + StartTime: block1Time, + CurrentEpoch: 0, + CurrentEpochStartTime: time.Time{}, + }, + blockHeightTimePairs: map[int]time.Time{2: block1Time.Add(24 * time.Hour)}, + expEpochInfo: types.EpochInfo{ + StartTime: block1Time, + CurrentEpoch: 2, + CurrentEpochStartTime: block1Time.Add(time.Hour), + CurrentEpochStartHeight: 2, + }, + }, + "Downtime recovery (many intervals), second block is at tick 2, w/ start time 2 intervals ahead": { + initialEpochInfo: types.EpochInfo{ + StartTime: block1Time, + CurrentEpoch: 0, + CurrentEpochStartTime: time.Time{}, + }, + blockHeightTimePairs: map[int]time.Time{ + 2: block1Time.Add(24 * time.Hour), + 3: block1Time.Add(24 * time.Hour).Add(eps), + }, + expEpochInfo: types.EpochInfo{ + StartTime: block1Time, + CurrentEpoch: 3, + CurrentEpochStartTime: block1Time.Add(2 * time.Hour), + CurrentEpochStartHeight: 3, + }, + }, + "Many blocks between first and second tick": { + initialEpochInfo: types.EpochInfo{ + StartTime: block1Time, + CurrentEpoch: 1, + CurrentEpochStartTime: block1Time, + }, + blockHeightTimePairs: map[int]time.Time{ + 2: block1Time.Add(time.Second), + 3: block1Time.Add(2 * time.Second), + 4: block1Time.Add(time.Hour).Add(eps), + }, + expEpochInfo: types.EpochInfo{ + StartTime: block1Time, + CurrentEpoch: 2, + CurrentEpochStartTime: block1Time.Add(time.Hour), + CurrentEpochStartHeight: 4, + }, + }, + "Distinct identifier and duration still works": { + initialEpochInfo: types.EpochInfo{ + Identifier: "hello", + Duration: time.Minute, + StartTime: block1Time, + CurrentEpoch: 0, + CurrentEpochStartTime: time.Time{}, + }, + blockHeightTimePairs: map[int]time.Time{ + 2: block1Time.Add(time.Second), + 3: block1Time.Add(time.Minute).Add(eps), + }, + expEpochInfo: types.EpochInfo{ + Identifier: "hello", + Duration: time.Minute, + StartTime: block1Time, + CurrentEpoch: 2, + CurrentEpochStartTime: block1Time.Add(time.Minute), + CurrentEpochStartHeight: 3, + }, + }, + "StartTime in future won't get ticked on first block": { + initialEpochInfo: types.EpochInfo{ + StartTime: block1Time.Add(time.Second), + CurrentEpoch: 0, + CurrentEpochStartTime: time.Time{}, + }, + // currentEpochStartHeight is 1 because thats when the timer was created on-chain + expEpochInfo: types.EpochInfo{ + StartTime: block1Time.Add(time.Second), + CurrentEpoch: 0, + CurrentEpochStartTime: time.Time{}, + CurrentEpochStartHeight: 1, + }, + }, + "StartTime in past will get ticked on first block": { + initialEpochInfo: types.EpochInfo{ + StartTime: block1Time.Add(-time.Second), + CurrentEpoch: 0, + CurrentEpochStartTime: time.Time{}, + }, + expEpochInfo: types.EpochInfo{ + StartTime: block1Time.Add(-time.Second), + CurrentEpoch: 1, + CurrentEpochStartTime: block1Time.Add(-time.Second), + CurrentEpochStartHeight: 1, + }, + }, + } + for name, test := range tests { + suite.Run(name, func() { + suite.SetupTest() + suite.Ctx = suite.Ctx.WithBlockHeight(1).WithBlockTime(block1Time) + initialEpoch := initializeBlankEpochInfoFields( + test.initialEpochInfo, + defaultIdentifier, + defaultDuration, + ) + suite.App.EpochsKeeper.AddEpochInfo(suite.Ctx, initialEpoch) + suite.App.EpochsKeeper.BeginBlocker(suite.Ctx) + + // get sorted heights + heights := maps.Keys(test.blockHeightTimePairs) + utils.SortSlice(heights) + for _, h := range heights { + // for each height in order, run begin block + suite.Ctx = suite.Ctx.WithBlockHeight(int64(h)). + WithBlockTime(test.blockHeightTimePairs[h]) + suite.App.EpochsKeeper.BeginBlocker(suite.Ctx) + } + expEpoch := initializeBlankEpochInfoFields( + test.expEpochInfo, + initialEpoch.Identifier, + initialEpoch.Duration, + ) + actEpoch := suite.App.EpochsKeeper.GetEpochInfo(suite.Ctx, initialEpoch.Identifier) + suite.Require().Equal(expEpoch, actEpoch) + }) + } +} + +// initializeBlankEpochInfoFields set identifier, duration and epochCountingStarted if blank in epoch +func initializeBlankEpochInfoFields( + epoch types.EpochInfo, + identifier string, + duration time.Duration, +) types.EpochInfo { + if epoch.Identifier == "" { + epoch.Identifier = identifier + } + if epoch.Duration == time.Duration(0) { + epoch.Duration = duration + } + epoch.EpochCountingStarted = (epoch.CurrentEpoch != 0) + + return epoch +} + +func TestEpochStartingOneMonthAfterInitGenesis(t *testing.T) { + app := app.Setup(t, false) + ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + + // On init genesis, default epochs information is set + // To check init genesis again, should make it fresh status + epochInfos := app.EpochsKeeper.AllEpochInfos(ctx) + for _, epochInfo := range epochInfos { + app.EpochsKeeper.DeleteEpochInfo(ctx, epochInfo.Identifier) + } + + now := time.Now() + week := time.Hour * 24 * 7 + month := time.Hour * 24 * 30 + initialBlockHeight := int64(1) + ctx = ctx.WithBlockHeight(initialBlockHeight).WithBlockTime(now) + + app.EpochsKeeper.InitGenesis(ctx, types.GenesisState{ + Epochs: []types.EpochInfo{ + { + Identifier: "monthly", + StartTime: now.Add(month), + Duration: time.Hour * 24 * 30, + CurrentEpoch: 0, + CurrentEpochStartHeight: ctx.BlockHeight(), + CurrentEpochStartTime: time.Time{}, + EpochCountingStarted: false, + }, + }, + }) + + // epoch not started yet + epochInfo := app.EpochsKeeper.GetEpochInfo(ctx, "monthly") + require.Equal(t, epochInfo.CurrentEpoch, int64(0)) + require.Equal(t, epochInfo.CurrentEpochStartHeight, initialBlockHeight) + require.Equal(t, epochInfo.CurrentEpochStartTime, time.Time{}) + require.Equal(t, epochInfo.EpochCountingStarted, false) + + // after 1 week + ctx = ctx.WithBlockHeight(2).WithBlockTime(now.Add(week)) + app.EpochsKeeper.BeginBlocker(ctx) + + // epoch not started yet + epochInfo = app.EpochsKeeper.GetEpochInfo(ctx, "monthly") + require.Equal(t, epochInfo.CurrentEpoch, int64(0)) + require.Equal(t, epochInfo.CurrentEpochStartHeight, initialBlockHeight) + require.Equal(t, epochInfo.CurrentEpochStartTime, time.Time{}) + require.Equal(t, epochInfo.EpochCountingStarted, false) + + // after 1 month + ctx = ctx.WithBlockHeight(3).WithBlockTime(now.Add(month)) + app.EpochsKeeper.BeginBlocker(ctx) + + // epoch started + epochInfo = app.EpochsKeeper.GetEpochInfo(ctx, "monthly") + require.Equal(t, epochInfo.CurrentEpoch, int64(1)) + require.Equal(t, epochInfo.CurrentEpochStartHeight, ctx.BlockHeight()) + require.Equal(t, epochInfo.CurrentEpochStartTime.UTC().String(), now.Add(month).UTC().String()) + require.Equal(t, epochInfo.EpochCountingStarted, true) +} diff --git a/x/epochs/keeper/epoch.go b/x/epochs/keeper/epoch.go new file mode 100644 index 000000000..6bd2a3f43 --- /dev/null +++ b/x/epochs/keeper/epoch.go @@ -0,0 +1,114 @@ +package keeper + +import ( + "fmt" + "time" + + "github.com/cosmos/gogoproto/proto" + + "github.com/neutron-org/neutron/x/epochs/types" + + sdk "github.com/cosmos/cosmos-sdk/types" +) + +// GetEpochInfo returns epoch info by identifier. +func (k Keeper) GetEpochInfo(ctx sdk.Context, identifier string) types.EpochInfo { + epoch := types.EpochInfo{} + store := ctx.KVStore(k.storeKey) + b := store.Get(append(types.KeyPrefixEpoch, []byte(identifier)...)) + if b == nil { + return epoch + } + err := proto.Unmarshal(b, &epoch) + if err != nil { + panic(err) + } + + return epoch +} + +// AddEpochInfo adds a new epoch info. Will return an error if the epoch fails validation, +// or re-uses an existing identifier. +// This method also sets the start time if left unset, and sets the epoch start height. +func (k Keeper) AddEpochInfo(ctx sdk.Context, epoch types.EpochInfo) error { + if err := epoch.Validate(); err != nil { + return err + } + // Check if identifier already exists + if (k.GetEpochInfo(ctx, epoch.Identifier) != types.EpochInfo{}) { + return fmt.Errorf("epoch with identifier %s already exists", epoch.Identifier) + } + + // Initialize empty and default epoch values + if epoch.StartTime.Equal(time.Time{}) { + epoch.StartTime = ctx.BlockTime() + } + epoch.CurrentEpochStartHeight = ctx.BlockHeight() + k.setEpochInfo(ctx, epoch) + + return nil +} + +// setEpochInfo set epoch info. +func (k Keeper) setEpochInfo(ctx sdk.Context, epoch types.EpochInfo) { + store := ctx.KVStore(k.storeKey) + value, err := proto.Marshal(&epoch) + if err != nil { + panic(err) + } + store.Set(append(types.KeyPrefixEpoch, []byte(epoch.Identifier)...), value) +} + +// DeleteEpochInfo delete epoch info. +func (k Keeper) DeleteEpochInfo(ctx sdk.Context, identifier string) { + store := ctx.KVStore(k.storeKey) + store.Delete(append(types.KeyPrefixEpoch, []byte(identifier)...)) +} + +// IterateEpochInfo iterate through epochs. +func (k Keeper) IterateEpochInfo(ctx sdk.Context, fn func(index int64, epochInfo types.EpochInfo) (stop bool)) { + store := ctx.KVStore(k.storeKey) + + iterator := sdk.KVStorePrefixIterator(store, types.KeyPrefixEpoch) + defer iterator.Close() + + i := int64(0) + + for ; iterator.Valid(); iterator.Next() { + epoch := types.EpochInfo{} + err := proto.Unmarshal(iterator.Value(), &epoch) + if err != nil { + panic(err) + } + stop := fn(i, epoch) + + if stop { + break + } + i++ + } +} + +// AllEpochInfos iterate through epochs to return all epochs info. +func (k Keeper) AllEpochInfos(ctx sdk.Context) []types.EpochInfo { + epochs := []types.EpochInfo{} + k.IterateEpochInfo(ctx, func(index int64, epochInfo types.EpochInfo) (stop bool) { + epochs = append(epochs, epochInfo) + return false + }) + + return epochs +} + +// NumBlocksSinceEpochStart returns the number of blocks since the epoch started. +// if the epoch started on block N, then calling this during block N (after BeforeEpochStart) +// would return 0. +// Calling it any point in block N+1 (assuming the epoch doesn't increment) would return 1. +func (k Keeper) NumBlocksSinceEpochStart(ctx sdk.Context, identifier string) (int64, error) { + epoch := k.GetEpochInfo(ctx, identifier) + if (epoch == types.EpochInfo{}) { + return 0, fmt.Errorf("epoch with identifier %s not found", identifier) + } + + return ctx.BlockHeight() - epoch.CurrentEpochStartHeight, nil +} diff --git a/x/epochs/keeper/epoch_test.go b/x/epochs/keeper/epoch_test.go new file mode 100644 index 000000000..536ea9392 --- /dev/null +++ b/x/epochs/keeper/epoch_test.go @@ -0,0 +1,97 @@ +package keeper_test + +import ( + "time" + + "github.com/neutron-org/neutron/x/epochs/types" +) + +func (suite *KeeperTestSuite) TestAddEpochInfo() { + defaultIdentifier := "default_add_epoch_info_id" + defaultDuration := time.Hour + startBlockHeight := int64(100) + startBlockTime := time.Unix(1656907200, 0).UTC() + tests := map[string]struct { + addedEpochInfo types.EpochInfo + expErr bool + expEpochInfo types.EpochInfo + }{ + "simple_add": { + addedEpochInfo: types.EpochInfo{ + Identifier: defaultIdentifier, + StartTime: time.Time{}, + Duration: defaultDuration, + CurrentEpoch: 0, + CurrentEpochStartHeight: 0, + CurrentEpochStartTime: time.Time{}, + EpochCountingStarted: false, + }, + expErr: false, + expEpochInfo: types.EpochInfo{ + Identifier: defaultIdentifier, + StartTime: startBlockTime, + Duration: defaultDuration, + CurrentEpoch: 0, + CurrentEpochStartHeight: startBlockHeight, + CurrentEpochStartTime: time.Time{}, + EpochCountingStarted: false, + }, + }, + "zero_duration": { + addedEpochInfo: types.EpochInfo{ + Identifier: defaultIdentifier, + StartTime: time.Time{}, + Duration: time.Duration(0), + CurrentEpoch: 0, + CurrentEpochStartHeight: 0, + CurrentEpochStartTime: time.Time{}, + EpochCountingStarted: false, + }, + expErr: true, + }, + } + for name, test := range tests { + suite.Run(name, func() { + suite.SetupTest() + suite.Ctx = suite.Ctx.WithBlockHeight(startBlockHeight).WithBlockTime(startBlockTime) + err := suite.App.EpochsKeeper.AddEpochInfo(suite.Ctx, test.addedEpochInfo) + if !test.expErr { + suite.Require().NoError(err) + actualEpochInfo := suite.App.EpochsKeeper.GetEpochInfo(suite.Ctx, test.addedEpochInfo.Identifier) + suite.Require().Equal(test.expEpochInfo, actualEpochInfo) + } else { + suite.Require().Error(err) + } + }) + } +} + +func (suite *KeeperTestSuite) TestDuplicateAddEpochInfo() { + identifier := "duplicate_add_epoch_info" + epochInfo := types.NewGenesisEpochInfo(identifier, time.Hour*24*30) + err := suite.App.EpochsKeeper.AddEpochInfo(suite.Ctx, epochInfo) + suite.Require().NoError(err) + err = suite.App.EpochsKeeper.AddEpochInfo(suite.Ctx, epochInfo) + suite.Require().Error(err) +} + +func (suite *KeeperTestSuite) TestEpochLifeCycle() { + suite.SetupTest() + + epochInfo := types.NewGenesisEpochInfo("monthly", time.Hour*24*30) + suite.App.EpochsKeeper.AddEpochInfo(suite.Ctx, epochInfo) + epochInfoSaved := suite.App.EpochsKeeper.GetEpochInfo(suite.Ctx, "monthly") + + // setup expected epoch info + expectedEpochInfo := epochInfo + expectedEpochInfo.StartTime = suite.Ctx.BlockTime() + expectedEpochInfo.CurrentEpochStartHeight = suite.Ctx.BlockHeight() + suite.Require().Equal(expectedEpochInfo, epochInfoSaved) + + allEpochs := suite.App.EpochsKeeper.AllEpochInfos(suite.Ctx) + suite.Require().Len(allEpochs, 4) + suite.Require().Equal(allEpochs[0].Identifier, "day") // alphabetical order + suite.Require().Equal(allEpochs[1].Identifier, "hour") + suite.Require().Equal(allEpochs[2].Identifier, "monthly") + suite.Require().Equal(allEpochs[3].Identifier, "week") +} diff --git a/x/epochs/keeper/genesis.go b/x/epochs/keeper/genesis.go new file mode 100644 index 000000000..00fd79188 --- /dev/null +++ b/x/epochs/keeper/genesis.go @@ -0,0 +1,24 @@ +package keeper + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" + + "github.com/neutron-org/neutron/x/epochs/types" +) + +// InitGenesis sets epoch info from genesis +func (k Keeper) InitGenesis(ctx sdk.Context, genState types.GenesisState) { + for _, epoch := range genState.Epochs { + err := k.AddEpochInfo(ctx, epoch) + if err != nil { + panic(err) + } + } +} + +// ExportGenesis returns the capability module's exported genesis. +func (k Keeper) ExportGenesis(ctx sdk.Context) *types.GenesisState { + genesis := types.DefaultGenesis() + genesis.Epochs = k.AllEpochInfos(ctx) + return genesis +} diff --git a/x/epochs/keeper/genesis_test.go b/x/epochs/keeper/genesis_test.go new file mode 100644 index 000000000..574632ad3 --- /dev/null +++ b/x/epochs/keeper/genesis_test.go @@ -0,0 +1,96 @@ +package keeper_test + +import ( + "testing" + "time" + + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + "github.com/stretchr/testify/require" + + "github.com/neutron-org/neutron/app" + "github.com/neutron-org/neutron/x/epochs/types" +) + +func TestEpochsExportGenesis(t *testing.T) { + app := app.Setup(t, false) + ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + + chainStartTime := ctx.BlockTime() + + genesis := app.EpochsKeeper.ExportGenesis(ctx) + require.Len(t, genesis.Epochs, 3) + + expectedEpochs := types.DefaultGenesis().Epochs + for i := 0; i < len(expectedEpochs); i++ { + expectedEpochs[i].CurrentEpochStartHeight = 2 + expectedEpochs[i].CurrentEpochStartTime = chainStartTime + expectedEpochs[i].EpochCountingStarted = true + expectedEpochs[i].CurrentEpoch = 1 + } + require.Equal(t, expectedEpochs, genesis.Epochs) +} + +func TestEpochsInitGenesis(t *testing.T) { + app := app.Setup(t, false) + ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + + // On init genesis, default epochs information is set + // To check init genesis again, should make it fresh status + epochInfos := app.EpochsKeeper.AllEpochInfos(ctx) + for _, epochInfo := range epochInfos { + app.EpochsKeeper.DeleteEpochInfo(ctx, epochInfo.Identifier) + } + + now := time.Now() + ctx = ctx.WithBlockHeight(1) + ctx = ctx.WithBlockTime(now) + + // test genesisState validation + genesisState := types.GenesisState{ + Epochs: []types.EpochInfo{ + { + Identifier: "monthly", + StartTime: time.Time{}, + Duration: time.Hour * 24, + CurrentEpoch: 0, + CurrentEpochStartHeight: ctx.BlockHeight(), + CurrentEpochStartTime: time.Time{}, + EpochCountingStarted: true, + }, + { + Identifier: "monthly", + StartTime: time.Time{}, + Duration: time.Hour * 24, + CurrentEpoch: 0, + CurrentEpochStartHeight: ctx.BlockHeight(), + CurrentEpochStartTime: time.Time{}, + EpochCountingStarted: true, + }, + }, + } + require.EqualError(t, genesisState.Validate(), "epoch identifier should be unique") + + genesisState = types.GenesisState{ + Epochs: []types.EpochInfo{ + { + Identifier: "monthly", + StartTime: time.Time{}, + Duration: time.Hour * 24, + CurrentEpoch: 0, + CurrentEpochStartHeight: ctx.BlockHeight(), + CurrentEpochStartTime: time.Time{}, + EpochCountingStarted: true, + }, + }, + } + + app.EpochsKeeper.InitGenesis(ctx, genesisState) + epochInfo := app.EpochsKeeper.GetEpochInfo(ctx, "monthly") + require.Equal(t, epochInfo.Identifier, "monthly") + require.Equal(t, epochInfo.StartTime.UTC().String(), now.UTC().String()) + require.Equal(t, epochInfo.Duration, time.Hour*24) + require.Equal(t, epochInfo.CurrentEpoch, int64(0)) + require.Equal(t, epochInfo.CurrentEpochStartHeight, ctx.BlockHeight()) + require.Equal(t, epochInfo.CurrentEpochStartTime.UTC().String(), time.Time{}.String()) + require.Equal(t, epochInfo.EpochCountingStarted, true) +} diff --git a/x/epochs/keeper/grpc_query.go b/x/epochs/keeper/grpc_query.go new file mode 100644 index 000000000..283bf32ae --- /dev/null +++ b/x/epochs/keeper/grpc_query.go @@ -0,0 +1,60 @@ +package keeper + +import ( + "context" + "errors" + + sdk "github.com/cosmos/cosmos-sdk/types" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" + + "github.com/neutron-org/neutron/x/epochs/types" +) + +var _ types.QueryServer = Querier{} + +// Querier defines a wrapper around the x/epochs keeper providing gRPC method +// handlers. +type Querier struct { + Keeper +} + +// NewQuerier initializes new querier. +func NewQuerier(k Keeper) Querier { + return Querier{Keeper: k} +} + +// EpochInfos provide running epochInfos. +func (q Querier) EpochInfos( + c context.Context, + _ *types.QueryEpochsInfoRequest, +) (*types.QueryEpochsInfoResponse, error) { + ctx := sdk.UnwrapSDKContext(c) + + return &types.QueryEpochsInfoResponse{ + Epochs: q.Keeper.AllEpochInfos(ctx), + }, nil +} + +// CurrentEpoch provides current epoch of specified identifier. +func (q Querier) CurrentEpoch(c context.Context, + req *types.QueryCurrentEpochRequest, +) (*types.QueryCurrentEpochResponse, error) { + if req == nil { + return nil, status.Error(codes.InvalidArgument, "empty request") + } + if req.Identifier == "" { + return nil, status.Error(codes.InvalidArgument, "identifier is empty") + } + + ctx := sdk.UnwrapSDKContext(c) + + info := q.Keeper.GetEpochInfo(ctx, req.Identifier) + if info.Identifier != req.Identifier { + return nil, errors.New("not available identifier") + } + + return &types.QueryCurrentEpochResponse{ + CurrentEpoch: info.CurrentEpoch, + }, nil +} diff --git a/x/epochs/keeper/grpc_query_test.go b/x/epochs/keeper/grpc_query_test.go new file mode 100644 index 000000000..20029a17e --- /dev/null +++ b/x/epochs/keeper/grpc_query_test.go @@ -0,0 +1,30 @@ +package keeper_test + +import ( + gocontext "context" + + "github.com/neutron-org/neutron/x/epochs/types" +) + +func (suite *KeeperTestSuite) TestQueryEpochInfos() { + suite.SetupTest() + queryClient := suite.queryClient + + // Check that querying epoch infos on default genesis returns the default genesis epoch infos + epochInfosResponse, err := queryClient.EpochInfos( + gocontext.Background(), + &types.QueryEpochsInfoRequest{}, + ) + suite.Require().NoError(err) + suite.Require().Len(epochInfosResponse.Epochs, 3) + + expectedEpochs := types.DefaultGenesis().Epochs + for id := range expectedEpochs { + expectedEpochs[id].StartTime = suite.Ctx.BlockTime() + expectedEpochs[id].CurrentEpochStartHeight = suite.Ctx.BlockHeight() + expectedEpochs[id].CurrentEpoch = 1 + expectedEpochs[id].EpochCountingStarted = true + } + + suite.Require().Equal(expectedEpochs, epochInfosResponse.Epochs) +} diff --git a/x/epochs/keeper/hooks.go b/x/epochs/keeper/hooks.go new file mode 100644 index 000000000..f1d36ff17 --- /dev/null +++ b/x/epochs/keeper/hooks.go @@ -0,0 +1,22 @@ +package keeper + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" +) + +// AfterEpochEnd gets called at the end of the epoch, +// end of epoch is the timestamp of first block produced after epoch duration. +func (k Keeper) AfterEpochEnd(ctx sdk.Context, identifier string, epochNumber int64) { + // Error is not handled as AfterEpochEnd Hooks use utils.ApplyFuncIfNoError() + if k.hooks != nil { + _ = k.hooks.AfterEpochEnd(ctx, identifier, epochNumber) + } +} + +// BeforeEpochStart new epoch is next block of epoch end block +func (k Keeper) BeforeEpochStart(ctx sdk.Context, identifier string, epochNumber int64) { + // Error is not handled as BeforeEpochStart Hooks use utils.ApplyFuncIfNoError() + if k.hooks != nil { + _ = k.hooks.BeforeEpochStart(ctx, identifier, epochNumber) + } +} diff --git a/x/epochs/keeper/keeper.go b/x/epochs/keeper/keeper.go new file mode 100644 index 000000000..583d4f598 --- /dev/null +++ b/x/epochs/keeper/keeper.go @@ -0,0 +1,41 @@ +package keeper + +import ( + "fmt" + + "github.com/cometbft/cometbft/libs/log" + + "github.com/neutron-org/neutron/x/epochs/types" + + storetypes "github.com/cosmos/cosmos-sdk/store/types" + sdk "github.com/cosmos/cosmos-sdk/types" +) + +type ( + Keeper struct { + storeKey storetypes.StoreKey + hooks types.EpochHooks + } +) + +// NewKeeper returns a new keeper by codec and storeKey inputs. +func NewKeeper(storeKey storetypes.StoreKey) *Keeper { + return &Keeper{ + storeKey: storeKey, + } +} + +// Set the gamm hooks. +func (k *Keeper) SetHooks(eh types.EpochHooks) *Keeper { + if k.hooks != nil { + panic("cannot set epochs hooks twice") + } + + k.hooks = eh + + return k +} + +func (k Keeper) Logger(ctx sdk.Context) log.Logger { + return ctx.Logger().With("module", fmt.Sprintf("x/%s", types.ModuleName)) +} diff --git a/x/epochs/keeper/keeper_test.go b/x/epochs/keeper/keeper_test.go new file mode 100644 index 000000000..988287c5b --- /dev/null +++ b/x/epochs/keeper/keeper_test.go @@ -0,0 +1,24 @@ +package keeper_test + +import ( + "testing" + + "github.com/stretchr/testify/suite" + + "github.com/neutron-org/neutron/testutil/apptesting" + "github.com/neutron-org/neutron/x/epochs/types" +) + +type KeeperTestSuite struct { + apptesting.KeeperTestHelper + queryClient types.QueryClient +} + +func (suite *KeeperTestSuite) SetupTest() { + suite.Setup() + suite.queryClient = types.NewQueryClient(suite.QueryHelper) +} + +func TestKeeperTestSuite(t *testing.T) { + suite.Run(t, new(KeeperTestSuite)) +} diff --git a/x/epochs/module.go b/x/epochs/module.go new file mode 100644 index 000000000..c6a4f8b4f --- /dev/null +++ b/x/epochs/module.go @@ -0,0 +1,173 @@ +/* +Often in the SDK, we would like to run certain code every-so often. The +purpose of `epochs` module is to allow other modules to set that they +would like to be signaled once every period. So another module can +specify it wants to execute code once a week, starting at UTC-time = x. +`epochs` creates a generalized epoch interface to other modules so that +they can easily be signalled upon such events. + - Contains functionality for querying epoch. + - Events for BeginBlock and EndBlock. + - Initialization for epoch-related infos. +*/ + +package epochs + +import ( + "context" + "encoding/json" + "fmt" + + abci "github.com/cometbft/cometbft/abci/types" + "github.com/gorilla/mux" + "github.com/grpc-ecosystem/grpc-gateway/runtime" + "github.com/spf13/cobra" + + "github.com/cosmos/cosmos-sdk/client" + "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/module" + + "github.com/neutron-org/neutron/x/epochs/client/cli" + "github.com/neutron-org/neutron/x/epochs/keeper" + "github.com/neutron-org/neutron/x/epochs/types" +) + +var ( + _ module.AppModule = AppModule{} + _ module.AppModuleBasic = AppModuleBasic{} +) + +// ---------------------------------------------------------------------------- +// AppModuleBasic +// ---------------------------------------------------------------------------- + +// AppModuleBasic implements the AppModuleBasic interface for the capability module. +type AppModuleBasic struct{} + +func NewAppModuleBasic() AppModuleBasic { + return AppModuleBasic{} +} + +// Name returns the capability module's name. +func (AppModuleBasic) Name() string { + return types.ModuleName +} + +// RegisterLegacyAminoCodec registers the module's Amino codec that properly handles protobuf types with Any's. +func (AppModuleBasic) RegisterLegacyAminoCodec(_ *codec.LegacyAmino) {} + +// RegisterInterfaces registers the module's interface types. +func (a AppModuleBasic) RegisterInterfaces(_ cdctypes.InterfaceRegistry) {} + +// DefaultGenesis returns the capability module's default genesis state. +func (AppModuleBasic) DefaultGenesis(cdc codec.JSONCodec) json.RawMessage { + return cdc.MustMarshalJSON(types.DefaultGenesis()) +} + +// ValidateGenesis performs genesis state validation for the capability module. +func (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() +} + +// RegisterRESTRoutes registers the capability module's REST service handlers. +func (AppModuleBasic) RegisterRESTRoutes(_ client.Context, _ *mux.Router) {} + +// RegisterGRPCGatewayRoutes registers the gRPC Gateway routes for the module. +func (AppModuleBasic) RegisterGRPCGatewayRoutes(clientCtx client.Context, mux *runtime.ServeMux) { + types.RegisterQueryHandlerClient( + context.Background(), + mux, + types.NewQueryClient(clientCtx), + ) //nolint:errcheck +} + +// GetTxCmd returns the capability module's root tx command. +func (a AppModuleBasic) GetTxCmd() *cobra.Command { + return nil +} + +// GetQueryCmd returns the capability module's root query command. +func (AppModuleBasic) GetQueryCmd() *cobra.Command { + return cli.GetQueryCmd() +} + +// ---------------------------------------------------------------------------- +// AppModule +// ---------------------------------------------------------------------------- + +// AppModule implements the AppModule interface for the capability module. +type AppModule struct { + AppModuleBasic + + keeper keeper.Keeper +} + +func NewAppModule(keeper keeper.Keeper) AppModule { + return AppModule{ + AppModuleBasic: NewAppModuleBasic(), + keeper: keeper, + } +} + +// Name returns the capability module's name. +func (am AppModule) Name() string { + return am.AppModuleBasic.Name() +} + +// QuerierRoute returns the capability module's query routing key. +func (AppModule) QuerierRoute() string { return types.QuerierRoute } + +// 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(), keeper.NewQuerier(am.keeper)) +} + +// RegisterInvariants registers the capability module's invariants. +func (am AppModule) RegisterInvariants(_ sdk.InvariantRegistry) {} + +// InitGenesis performs the capability module's genesis initialization It returns +// no validator updates. +func (am AppModule) InitGenesis( + ctx sdk.Context, + cdc codec.JSONCodec, + gs json.RawMessage, +) []abci.ValidatorUpdate { + var genState types.GenesisState + // Initialize global index to index in genesis state + cdc.MustUnmarshalJSON(gs, &genState) + + am.keeper.InitGenesis(ctx, genState) + + return []abci.ValidatorUpdate{} +} + +// ExportGenesis returns the capability module's exported genesis state as raw JSON bytes. +func (am AppModule) ExportGenesis(ctx sdk.Context, cdc codec.JSONCodec) json.RawMessage { + genState := am.keeper.ExportGenesis(ctx) + return cdc.MustMarshalJSON(genState) +} + +// BeginBlock executes all ABCI BeginBlock logic respective to the capability module. +func (am AppModule) BeginBlock(ctx sdk.Context, _ abci.RequestBeginBlock) { + am.keeper.BeginBlocker(ctx) +} + +// EndBlock executes all ABCI EndBlock logic respective to the capability module. It +// returns no validator updates. +func (am AppModule) EndBlock(_ sdk.Context, _ abci.RequestEndBlock) []abci.ValidatorUpdate { + return []abci.ValidatorUpdate{} +} + +// ConsensusVersion implements AppModule/ConsensusVersion. +func (AppModule) ConsensusVersion() uint64 { return 1 } diff --git a/x/epochs/types/doc.go b/x/epochs/types/doc.go new file mode 100644 index 000000000..c1b138dfb --- /dev/null +++ b/x/epochs/types/doc.go @@ -0,0 +1,4 @@ +/* +Package types translates gRPC into RESTful JSON APIs. +*/ +package types diff --git a/x/epochs/types/events.go b/x/epochs/types/events.go new file mode 100644 index 000000000..da0ac836e --- /dev/null +++ b/x/epochs/types/events.go @@ -0,0 +1,9 @@ +package types + +const ( + EventTypeEpochEnd = "epoch_end" + EventTypeEpochStart = "epoch_start" + + AttributeEpochNumber = "epoch_number" + AttributeEpochStartTime = "start_time" +) diff --git a/x/epochs/types/genesis.go b/x/epochs/types/genesis.go new file mode 100644 index 000000000..3aadcce3b --- /dev/null +++ b/x/epochs/types/genesis.go @@ -0,0 +1,68 @@ +package types + +import ( + "errors" + "time" +) + +func NewGenesisState(epochs []EpochInfo) *GenesisState { + return &GenesisState{Epochs: epochs} +} + +// DefaultGenesis returns the default Capability genesis state. +func DefaultGenesis() *GenesisState { + epochs := []EpochInfo{ + NewGenesisEpochInfo("day", time.Hour*24), // alphabetical order + NewGenesisEpochInfo("hour", time.Hour), + NewGenesisEpochInfo("week", time.Hour*24*7), + } + + return NewGenesisState(epochs) +} + +// Validate performs basic genesis state validation returning an error upon any +// failure. +func (gs GenesisState) Validate() error { + epochIdentifiers := map[string]bool{} + for _, epoch := range gs.Epochs { + if err := epoch.Validate(); err != nil { + return err + } + if epochIdentifiers[epoch.Identifier] { + return errors.New("epoch identifier should be unique") + } + epochIdentifiers[epoch.Identifier] = true + } + + return nil +} + +// Validate also validates epoch info. +func (epoch EpochInfo) Validate() error { + if epoch.Identifier == "" { + return errors.New("epoch identifier should NOT be empty") + } + if epoch.Duration == 0 { + return errors.New("epoch duration should NOT be 0") + } + if epoch.CurrentEpoch < 0 { + return errors.New("epoch CurrentEpoch must be non-negative") + } + if epoch.CurrentEpochStartHeight < 0 { + return errors.New("epoch CurrentEpoch must be non-negative") + } + + return nil +} + +func NewGenesisEpochInfo(identifier string, duration time.Duration) EpochInfo { + return EpochInfo{ + Identifier: identifier, + StartTime: time.Time{}, + Duration: duration, + CurrentEpoch: 0, + CurrentEpochStartHeight: 0, + CurrentEpochStartTime: time.Time{}, + EpochCountingStarted: false, + } +} diff --git a/x/epochs/types/genesis.pb.go b/x/epochs/types/genesis.pb.go new file mode 100644 index 000000000..b0253a65a --- /dev/null +++ b/x/epochs/types/genesis.pb.go @@ -0,0 +1,821 @@ +// Code generated by protoc-gen-gogo. DO NOT EDIT. +// source: duality/epochs/genesis.proto + +package types + +import ( + fmt "fmt" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" + github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" + _ "google.golang.org/protobuf/types/known/durationpb" + _ "google.golang.org/protobuf/types/known/timestamppb" + io "io" + math "math" + math_bits "math/bits" + time "time" +) + +// Reference imports to suppress errors if they are not otherwise used. +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf +var _ = time.Kitchen + +// 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 + +// EpochInfo is a struct that describes the data going into +// a timer defined by the x/epochs module. +type EpochInfo struct { + // identifier is a unique reference to this particular timer. + Identifier string `protobuf:"bytes,1,opt,name=identifier,proto3" json:"identifier,omitempty"` + // start_time is the time at which the timer first ever ticks. + // If start_time is in the future, the epoch will not begin until the start + // time. + StartTime time.Time `protobuf:"bytes,2,opt,name=start_time,json=startTime,proto3,stdtime" json:"start_time" yaml:"start_time"` + // duration is the time in between epoch ticks. + // In order for intended behavior to be met, duration should + // be greater than the chains expected block time. + // Duration must be non-zero. + Duration time.Duration `protobuf:"bytes,3,opt,name=duration,proto3,stdduration" json:"duration,omitempty" yaml:"duration"` + // current_epoch is the current epoch number, or in other words, + // how many times has the timer 'ticked'. + // The first tick (current_epoch=1) is defined as + // the first block whose blocktime is greater than the EpochInfo start_time. + CurrentEpoch int64 `protobuf:"varint,4,opt,name=current_epoch,json=currentEpoch,proto3" json:"current_epoch,omitempty"` + // current_epoch_start_time describes the start time of the current timer + // interval. The interval is (current_epoch_start_time, + // current_epoch_start_time + duration] When the timer ticks, this is set to + // current_epoch_start_time = last_epoch_start_time + duration only one timer + // tick for a given identifier can occur per block. + // + // NOTE! The current_epoch_start_time may diverge significantly from the + // wall-clock time the epoch began at. Wall-clock time of epoch start may be + // >> current_epoch_start_time. Suppose current_epoch_start_time = 10, + // duration = 5. Suppose the chain goes offline at t=14, and comes back online + // at t=30, and produces blocks at every successive time. (t=31, 32, etc.) + // * The t=30 block will start the epoch for (10, 15] + // * The t=31 block will start the epoch for (15, 20] + // * The t=32 block will start the epoch for (20, 25] + // * The t=33 block will start the epoch for (25, 30] + // * The t=34 block will start the epoch for (30, 35] + // * The **t=36** block will start the epoch for (35, 40] + CurrentEpochStartTime time.Time `protobuf:"bytes,5,opt,name=current_epoch_start_time,json=currentEpochStartTime,proto3,stdtime" json:"current_epoch_start_time" yaml:"current_epoch_start_time"` + // epoch_counting_started is a boolean, that indicates whether this + // epoch timer has began yet. + EpochCountingStarted bool `protobuf:"varint,6,opt,name=epoch_counting_started,json=epochCountingStarted,proto3" json:"epoch_counting_started,omitempty"` + // current_epoch_start_height is the block height at which the current epoch + // started. (The block height at which the timer last ticked) + CurrentEpochStartHeight int64 `protobuf:"varint,8,opt,name=current_epoch_start_height,json=currentEpochStartHeight,proto3" json:"current_epoch_start_height,omitempty"` +} + +func (m *EpochInfo) Reset() { *m = EpochInfo{} } +func (m *EpochInfo) String() string { return proto.CompactTextString(m) } +func (*EpochInfo) ProtoMessage() {} +func (*EpochInfo) Descriptor() ([]byte, []int) { + return fileDescriptor_865ee7616311a8aa, []int{0} +} +func (m *EpochInfo) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *EpochInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_EpochInfo.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 *EpochInfo) XXX_Merge(src proto.Message) { + xxx_messageInfo_EpochInfo.Merge(m, src) +} +func (m *EpochInfo) XXX_Size() int { + return m.Size() +} +func (m *EpochInfo) XXX_DiscardUnknown() { + xxx_messageInfo_EpochInfo.DiscardUnknown(m) +} + +var xxx_messageInfo_EpochInfo proto.InternalMessageInfo + +func (m *EpochInfo) GetIdentifier() string { + if m != nil { + return m.Identifier + } + return "" +} + +func (m *EpochInfo) GetStartTime() time.Time { + if m != nil { + return m.StartTime + } + return time.Time{} +} + +func (m *EpochInfo) GetDuration() time.Duration { + if m != nil { + return m.Duration + } + return 0 +} + +func (m *EpochInfo) GetCurrentEpoch() int64 { + if m != nil { + return m.CurrentEpoch + } + return 0 +} + +func (m *EpochInfo) GetCurrentEpochStartTime() time.Time { + if m != nil { + return m.CurrentEpochStartTime + } + return time.Time{} +} + +func (m *EpochInfo) GetEpochCountingStarted() bool { + if m != nil { + return m.EpochCountingStarted + } + return false +} + +func (m *EpochInfo) GetCurrentEpochStartHeight() int64 { + if m != nil { + return m.CurrentEpochStartHeight + } + return 0 +} + +// GenesisState defines the epochs module's genesis state. +type GenesisState struct { + Epochs []EpochInfo `protobuf:"bytes,1,rep,name=epochs,proto3" json:"epochs"` +} + +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_865ee7616311a8aa, []int{1} +} +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) GetEpochs() []EpochInfo { + if m != nil { + return m.Epochs + } + return nil +} + +func init() { + proto.RegisterType((*EpochInfo)(nil), "duality.epochs.EpochInfo") + proto.RegisterType((*GenesisState)(nil), "duality.epochs.GenesisState") +} + +func init() { proto.RegisterFile("duality/epochs/genesis.proto", fileDescriptor_865ee7616311a8aa) } + +var fileDescriptor_865ee7616311a8aa = []byte{ + // 465 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x53, 0x4d, 0x8f, 0xd3, 0x30, + 0x10, 0xad, 0x69, 0x29, 0xa9, 0x59, 0xbe, 0xac, 0x05, 0x42, 0x05, 0x49, 0x14, 0x2e, 0x95, 0x00, + 0x47, 0x7c, 0x48, 0x48, 0x70, 0x2b, 0xa0, 0x5d, 0x38, 0xa6, 0x1c, 0x10, 0x97, 0x2a, 0x6d, 0x5d, + 0xc7, 0x52, 0x13, 0x47, 0xc9, 0x44, 0xa2, 0x37, 0x7e, 0x42, 0x8f, 0xfc, 0xa4, 0x3d, 0xee, 0x91, + 0x53, 0x40, 0xed, 0x8d, 0xe3, 0xfe, 0x02, 0x14, 0xdb, 0x29, 0x5d, 0x0a, 0xda, 0x5b, 0x3c, 0xef, + 0xcd, 0x7b, 0x9e, 0x97, 0x31, 0xbe, 0x3f, 0x2b, 0xa3, 0x85, 0x80, 0x65, 0xc0, 0x32, 0x39, 0x8d, + 0x8b, 0x80, 0xb3, 0x94, 0x15, 0xa2, 0xa0, 0x59, 0x2e, 0x41, 0x92, 0xeb, 0x06, 0xa5, 0x1a, 0xed, + 0x1f, 0x72, 0xc9, 0xa5, 0x82, 0x82, 0xfa, 0x4b, 0xb3, 0xfa, 0x0e, 0x97, 0x92, 0x2f, 0x58, 0xa0, + 0x4e, 0x93, 0x72, 0x1e, 0xcc, 0xca, 0x3c, 0x02, 0x21, 0x53, 0x83, 0xbb, 0x7f, 0xe3, 0x20, 0x12, + 0x56, 0x40, 0x94, 0x64, 0x9a, 0xe0, 0xaf, 0x3a, 0xb8, 0xf7, 0xae, 0x76, 0x78, 0x9f, 0xce, 0x25, + 0x71, 0x30, 0x16, 0x33, 0x96, 0x82, 0x98, 0x0b, 0x96, 0xdb, 0xc8, 0x43, 0x83, 0x5e, 0xb8, 0x53, + 0x21, 0x9f, 0x30, 0x2e, 0x20, 0xca, 0x61, 0x5c, 0xcb, 0xd8, 0x97, 0x3c, 0x34, 0xb8, 0xfa, 0xac, + 0x4f, 0xb5, 0x07, 0x6d, 0x3c, 0xe8, 0xc7, 0xc6, 0x63, 0xf8, 0xe0, 0xa4, 0x72, 0x5b, 0x67, 0x95, + 0x7b, 0x6b, 0x19, 0x25, 0x8b, 0x57, 0xfe, 0x9f, 0x5e, 0x7f, 0xf5, 0xc3, 0x45, 0x61, 0x4f, 0x15, + 0x6a, 0x3a, 0x89, 0xb1, 0xd5, 0x5c, 0xdd, 0x6e, 0x2b, 0xdd, 0x7b, 0x7b, 0xba, 0x6f, 0x0d, 0x61, + 0xf8, 0xb4, 0x96, 0xfd, 0x55, 0xb9, 0xa4, 0x69, 0x79, 0x2c, 0x13, 0x01, 0x2c, 0xc9, 0x60, 0x79, + 0x56, 0xb9, 0x37, 0xb4, 0x59, 0x83, 0xf9, 0xdf, 0x6a, 0xab, 0xad, 0x3a, 0x79, 0x88, 0xaf, 0x4d, + 0xcb, 0x3c, 0x67, 0x29, 0x8c, 0x55, 0xb4, 0x76, 0xc7, 0x43, 0x83, 0x76, 0x78, 0x60, 0x8a, 0x2a, + 0x0c, 0xf2, 0x15, 0x61, 0xfb, 0x1c, 0x6b, 0xbc, 0x33, 0xf7, 0xe5, 0x0b, 0xe7, 0x7e, 0x64, 0xe6, + 0x76, 0xf5, 0x55, 0xfe, 0xa7, 0xa4, 0x53, 0xb8, 0xbd, 0xeb, 0x3c, 0xda, 0x26, 0xf2, 0x02, 0xdf, + 0xd1, 0xfc, 0xa9, 0x2c, 0x53, 0x10, 0x29, 0xd7, 0x8d, 0x6c, 0x66, 0x77, 0x3d, 0x34, 0xb0, 0xc2, + 0x43, 0x85, 0xbe, 0x31, 0xe0, 0x48, 0x63, 0xe4, 0x35, 0xee, 0xff, 0xcb, 0x2d, 0x66, 0x82, 0xc7, + 0x60, 0x5b, 0x6a, 0xd4, 0xbb, 0x7b, 0x86, 0xc7, 0x0a, 0xfe, 0xd0, 0xb1, 0xae, 0xdc, 0xb4, 0xfc, + 0x23, 0x7c, 0x70, 0xa4, 0x57, 0x71, 0x04, 0x11, 0x30, 0xf2, 0x12, 0x77, 0xf5, 0x0e, 0xda, 0xc8, + 0x6b, 0xab, 0x1f, 0x73, 0x7e, 0x35, 0xe9, 0x76, 0x7f, 0x86, 0x9d, 0x7a, 0xee, 0xd0, 0xd0, 0x87, + 0xc7, 0x27, 0x6b, 0x07, 0x9d, 0xae, 0x1d, 0xf4, 0x73, 0xed, 0xa0, 0xd5, 0xc6, 0x69, 0x9d, 0x6e, + 0x9c, 0xd6, 0xf7, 0x8d, 0xd3, 0xfa, 0x4c, 0xb9, 0x80, 0xb8, 0x9c, 0xd0, 0xa9, 0x4c, 0x02, 0x23, + 0xf6, 0x64, 0x11, 0x4d, 0x8a, 0xe6, 0x10, 0x7c, 0x69, 0x1e, 0x05, 0x2c, 0x33, 0x56, 0x4c, 0xba, + 0x2a, 0xe3, 0xe7, 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, 0xb7, 0x72, 0xb3, 0x24, 0x33, 0x03, 0x00, + 0x00, +} + +func (m *EpochInfo) 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 *EpochInfo) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *EpochInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.CurrentEpochStartHeight != 0 { + i = encodeVarintGenesis(dAtA, i, uint64(m.CurrentEpochStartHeight)) + i-- + dAtA[i] = 0x40 + } + if m.EpochCountingStarted { + i-- + if m.EpochCountingStarted { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- + dAtA[i] = 0x30 + } + n1, err1 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.CurrentEpochStartTime, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.CurrentEpochStartTime):]) + if err1 != nil { + return 0, err1 + } + i -= n1 + i = encodeVarintGenesis(dAtA, i, uint64(n1)) + i-- + dAtA[i] = 0x2a + if m.CurrentEpoch != 0 { + i = encodeVarintGenesis(dAtA, i, uint64(m.CurrentEpoch)) + i-- + dAtA[i] = 0x20 + } + n2, err2 := github_com_cosmos_gogoproto_types.StdDurationMarshalTo(m.Duration, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdDuration(m.Duration):]) + if err2 != nil { + return 0, err2 + } + i -= n2 + i = encodeVarintGenesis(dAtA, i, uint64(n2)) + i-- + dAtA[i] = 0x1a + n3, err3 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.StartTime, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.StartTime):]) + if err3 != nil { + return 0, err3 + } + i -= n3 + i = encodeVarintGenesis(dAtA, i, uint64(n3)) + i-- + dAtA[i] = 0x12 + if len(m.Identifier) > 0 { + i -= len(m.Identifier) + copy(dAtA[i:], m.Identifier) + i = encodeVarintGenesis(dAtA, i, uint64(len(m.Identifier))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +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 + if len(m.Epochs) > 0 { + for iNdEx := len(m.Epochs) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Epochs[iNdEx].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 *EpochInfo) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Identifier) + if l > 0 { + n += 1 + l + sovGenesis(uint64(l)) + } + l = github_com_cosmos_gogoproto_types.SizeOfStdTime(m.StartTime) + n += 1 + l + sovGenesis(uint64(l)) + l = github_com_cosmos_gogoproto_types.SizeOfStdDuration(m.Duration) + n += 1 + l + sovGenesis(uint64(l)) + if m.CurrentEpoch != 0 { + n += 1 + sovGenesis(uint64(m.CurrentEpoch)) + } + l = github_com_cosmos_gogoproto_types.SizeOfStdTime(m.CurrentEpochStartTime) + n += 1 + l + sovGenesis(uint64(l)) + if m.EpochCountingStarted { + n += 2 + } + if m.CurrentEpochStartHeight != 0 { + n += 1 + sovGenesis(uint64(m.CurrentEpochStartHeight)) + } + return n +} + +func (m *GenesisState) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if len(m.Epochs) > 0 { + for _, e := range m.Epochs { + l = e.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 *EpochInfo) 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: EpochInfo: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: EpochInfo: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Identifier", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenesis + } + 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 ErrInvalidLengthGenesis + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthGenesis + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Identifier = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field StartTime", 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 := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(&m.StartTime, dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Duration", 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 := github_com_cosmos_gogoproto_types.StdDurationUnmarshal(&m.Duration, dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 4: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field CurrentEpoch", wireType) + } + m.CurrentEpoch = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenesis + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.CurrentEpoch |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 5: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field CurrentEpochStartTime", 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 := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(&m.CurrentEpochStartTime, dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 6: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field EpochCountingStarted", wireType) + } + var v int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenesis + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.EpochCountingStarted = bool(v != 0) + case 8: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field CurrentEpochStartHeight", wireType) + } + m.CurrentEpochStartHeight = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenesis + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.CurrentEpochStartHeight |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } + 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 (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 Epochs", 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 + } + m.Epochs = append(m.Epochs, EpochInfo{}) + if err := m.Epochs[len(m.Epochs)-1].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/epochs/types/hooks.go b/x/epochs/types/hooks.go new file mode 100644 index 000000000..77b76bd11 --- /dev/null +++ b/x/epochs/types/hooks.go @@ -0,0 +1,67 @@ +package types + +import ( + fmt "fmt" + + sdk "github.com/cosmos/cosmos-sdk/types" + + "github.com/neutron-org/neutron/utils" +) + +type EpochHooks interface { + // the first block whose timestamp is after the duration is counted as the end of the epoch + AfterEpochEnd(ctx sdk.Context, epochIdentifier string, epochNumber int64) error + // new epoch is next block of epoch end block + BeforeEpochStart(ctx sdk.Context, epochIdentifier string, epochNumber int64) error +} + +var _ EpochHooks = MultiEpochHooks{} + +// combine multiple gamm hooks, all hook functions are run in array sequence. +type MultiEpochHooks []EpochHooks + +func NewMultiEpochHooks(hooks ...EpochHooks) MultiEpochHooks { + return hooks +} + +// AfterEpochEnd is called when epoch is going to be ended, epochNumber is the number of epoch that is ending. +func (h MultiEpochHooks) AfterEpochEnd( + ctx sdk.Context, + epochIdentifier string, + epochNumber int64, +) error { + for i := range h { + panicCatchingEpochHook(ctx, h[i].AfterEpochEnd, epochIdentifier, epochNumber) + } + + return nil +} + +// BeforeEpochStart is called when epoch is going to be started, epochNumber is the number of epoch that is starting. +func (h MultiEpochHooks) BeforeEpochStart( + ctx sdk.Context, + epochIdentifier string, + epochNumber int64, +) error { + for i := range h { + panicCatchingEpochHook(ctx, h[i].BeforeEpochStart, epochIdentifier, epochNumber) + } + + return nil +} + +func panicCatchingEpochHook( + ctx sdk.Context, + hookFn func(ctx sdk.Context, epochIdentifier string, epochNumber int64) error, + epochIdentifier string, + epochNumber int64, +) { + wrappedHookFn := func(ctx sdk.Context) error { + return hookFn(ctx, epochIdentifier, epochNumber) + } + // TODO: Thread info for which hook this is, may be dependent on larger hook system refactoring + err := utils.ApplyFuncIfNoError(ctx, wrappedHookFn) + if err != nil { + ctx.Logger().Error(fmt.Sprintf("error in epoch hook %v", err)) + } +} diff --git a/x/epochs/types/hooks_test.go b/x/epochs/types/hooks_test.go new file mode 100644 index 000000000..b1cf86396 --- /dev/null +++ b/x/epochs/types/hooks_test.go @@ -0,0 +1,167 @@ +package types_test + +import ( + "strconv" + "testing" + + "github.com/cosmos/cosmos-sdk/testutil" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/stretchr/testify/suite" + + "github.com/neutron-org/neutron/x/epochs/types" +) + +type KeeperTestSuite struct { + suite.Suite + Ctx sdk.Context +} + +func TestKeeperTestSuite(t *testing.T) { + suite.Run(t, new(KeeperTestSuite)) +} + +func (s *KeeperTestSuite) SetupTest() { + s.Ctx = testutil.DefaultContext( + sdk.NewKVStoreKey(types.StoreKey), + sdk.NewTransientStoreKey("transient_test"), + ) +} + +func dummyAfterEpochEndEvent(epochIdentifier string, epochNumber int64) sdk.Event { + return sdk.NewEvent( + "afterEpochEnd", + sdk.NewAttribute("epochIdentifier", epochIdentifier), + sdk.NewAttribute("epochNumber", strconv.FormatInt(epochNumber, 10)), + ) +} + +func dummyBeforeEpochStartEvent(epochIdentifier string, epochNumber int64) sdk.Event { + return sdk.NewEvent( + "beforeEpochStart", + sdk.NewAttribute("epochIdentifier", epochIdentifier), + sdk.NewAttribute("epochNumber", strconv.FormatInt(epochNumber, 10)), + ) +} + +var errDummy = errors.New("9", 9, "dummyError") + +// dummyEpochHook is a struct satisfying the epoch hook interface, +// that maintains a counter for how many times its been successfully called, +// and a boolean for whether it should panic during its execution. +type dummyEpochHook struct { + successCounter int + shouldPanic bool + shouldError bool +} + +func (hook *dummyEpochHook) AfterEpochEnd( + ctx sdk.Context, + epochIdentifier string, + epochNumber int64, +) error { + if hook.shouldPanic { + panic("dummyEpochHook is panicking") + } + if hook.shouldError { + return errDummy + } + hook.successCounter++ + ctx.EventManager().EmitEvent(dummyAfterEpochEndEvent(epochIdentifier, epochNumber)) + + return nil +} + +func (hook *dummyEpochHook) BeforeEpochStart( + ctx sdk.Context, + epochIdentifier string, + epochNumber int64, +) error { + if hook.shouldPanic { + panic("dummyEpochHook is panicking") + } + if hook.shouldError { + return errDummy + } + hook.successCounter++ + ctx.EventManager().EmitEvent(dummyBeforeEpochStartEvent(epochIdentifier, epochNumber)) + + return nil +} + +func (hook *dummyEpochHook) Clone() *dummyEpochHook { + newHook := dummyEpochHook{ + shouldPanic: hook.shouldPanic, + successCounter: hook.successCounter, + shouldError: hook.shouldError, + } + return &newHook +} + +var _ types.EpochHooks = &dummyEpochHook{} + +func (suite *KeeperTestSuite) TestHooksPanicRecovery() { + // panicHook := dummyEpochHook{shouldPanic: true} + noPanicHook := dummyEpochHook{shouldPanic: false} + // errorHook := dummyEpochHook{shouldError: true} + // noErrorHook := dummyEpochHook{shouldError: false} // same as nopanic + // simpleHooks := []dummyEpochHook{panicHook, noPanicHook, errorHook, noErrorHook} + + tests := []struct { + hooks []dummyEpochHook + expectedCounterValues []int + lenEvents int + }{ + {[]dummyEpochHook{noPanicHook}, []int{1}, 1}, + // {[]dummyEpochHook{panicHook}, []int{0}, 0}, + // {[]dummyEpochHook{errorHook}, []int{0}, 0}, + // {simpleHooks, []int{0, 1, 0, 1}, 2}, + } + + for tcIndex, tc := range tests { + for epochActionSelector := 0; epochActionSelector < 2; epochActionSelector++ { + suite.SetupTest() + hookRefs := []types.EpochHooks{} + + for _, hook := range tc.hooks { + hookRefs = append(hookRefs, hook.Clone()) + } + + hooks := types.NewMultiEpochHooks(hookRefs...) + + events := func(epochID string, epochNumber int64, dummyEvent func(id string, number int64) sdk.Event) sdk.Events { + evts := make(sdk.Events, tc.lenEvents) + for i := 0; i < tc.lenEvents; i++ { + evts[i] = dummyEvent(epochID, epochNumber) + } + + return evts + } + + suite.NotPanics(func() { + if epochActionSelector == 0 { + hooks.BeforeEpochStart(suite.Ctx, "id", 0) + suite.Require().Equal( + events( + "id", + 0, + dummyBeforeEpochStartEvent, + ), + suite.Ctx.EventManager().Events(), + "test case index %d, before epoch event check", tcIndex, + ) + } else if epochActionSelector == 1 { + hooks.AfterEpochEnd(suite.Ctx, "id", 0) + suite.Require().Equal(events("id", 0, dummyAfterEpochEndEvent), suite.Ctx.EventManager().Events(), + "test case index %d, after epoch event check", tcIndex) + } + }) + + for i := 0; i < len(hooks); i++ { + epochHook := hookRefs[i].(*dummyEpochHook) + suite.Require(). + Equal(tc.expectedCounterValues[i], epochHook.successCounter, "test case index %d", tcIndex) + } + } + } +} diff --git a/x/epochs/types/identifier.go b/x/epochs/types/identifier.go new file mode 100644 index 000000000..1cd154fa0 --- /dev/null +++ b/x/epochs/types/identifier.go @@ -0,0 +1,23 @@ +package types + +import ( + "fmt" +) + +func ValidateEpochIdentifierInterface(i interface{}) error { + v, ok := i.(string) + if !ok { + return fmt.Errorf("invalid parameter type: %T", i) + } + err := ValidateEpochIdentifierString(v) + + return err +} + +func ValidateEpochIdentifierString(s string) error { + if s == "" { + return fmt.Errorf("empty distribution epoch identifier: %+v", s) + } + + return nil +} diff --git a/x/epochs/types/keys.go b/x/epochs/types/keys.go new file mode 100644 index 000000000..4c6186fe5 --- /dev/null +++ b/x/epochs/types/keys.go @@ -0,0 +1,18 @@ +package types + +const ( + // ModuleName defines the module name. + ModuleName = "epochs" + + // StoreKey defines the primary module store key. + StoreKey = ModuleName + + // RouterKey is the message route for slashing. + RouterKey = ModuleName + + // QuerierRoute defines the module's query routing key. + QuerierRoute = ModuleName +) + +// KeyPrefixEpoch defines prefix key for storing epochs. +var KeyPrefixEpoch = []byte{0x01} diff --git a/x/epochs/types/query.pb.go b/x/epochs/types/query.pb.go new file mode 100644 index 000000000..e11a1f169 --- /dev/null +++ b/x/epochs/types/query.pb.go @@ -0,0 +1,912 @@ +// Code generated by protoc-gen-gogo. DO NOT EDIT. +// source: duality/epochs/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 + +type QueryEpochsInfoRequest struct { +} + +func (m *QueryEpochsInfoRequest) Reset() { *m = QueryEpochsInfoRequest{} } +func (m *QueryEpochsInfoRequest) String() string { return proto.CompactTextString(m) } +func (*QueryEpochsInfoRequest) ProtoMessage() {} +func (*QueryEpochsInfoRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_46bcc0d8d0692f49, []int{0} +} +func (m *QueryEpochsInfoRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryEpochsInfoRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryEpochsInfoRequest.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 *QueryEpochsInfoRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryEpochsInfoRequest.Merge(m, src) +} +func (m *QueryEpochsInfoRequest) XXX_Size() int { + return m.Size() +} +func (m *QueryEpochsInfoRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryEpochsInfoRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryEpochsInfoRequest proto.InternalMessageInfo + +type QueryEpochsInfoResponse struct { + Epochs []EpochInfo `protobuf:"bytes,1,rep,name=epochs,proto3" json:"epochs"` +} + +func (m *QueryEpochsInfoResponse) Reset() { *m = QueryEpochsInfoResponse{} } +func (m *QueryEpochsInfoResponse) String() string { return proto.CompactTextString(m) } +func (*QueryEpochsInfoResponse) ProtoMessage() {} +func (*QueryEpochsInfoResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_46bcc0d8d0692f49, []int{1} +} +func (m *QueryEpochsInfoResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryEpochsInfoResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryEpochsInfoResponse.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 *QueryEpochsInfoResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryEpochsInfoResponse.Merge(m, src) +} +func (m *QueryEpochsInfoResponse) XXX_Size() int { + return m.Size() +} +func (m *QueryEpochsInfoResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QueryEpochsInfoResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryEpochsInfoResponse proto.InternalMessageInfo + +func (m *QueryEpochsInfoResponse) GetEpochs() []EpochInfo { + if m != nil { + return m.Epochs + } + return nil +} + +type QueryCurrentEpochRequest struct { + Identifier string `protobuf:"bytes,1,opt,name=identifier,proto3" json:"identifier,omitempty"` +} + +func (m *QueryCurrentEpochRequest) Reset() { *m = QueryCurrentEpochRequest{} } +func (m *QueryCurrentEpochRequest) String() string { return proto.CompactTextString(m) } +func (*QueryCurrentEpochRequest) ProtoMessage() {} +func (*QueryCurrentEpochRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_46bcc0d8d0692f49, []int{2} +} +func (m *QueryCurrentEpochRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryCurrentEpochRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryCurrentEpochRequest.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 *QueryCurrentEpochRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryCurrentEpochRequest.Merge(m, src) +} +func (m *QueryCurrentEpochRequest) XXX_Size() int { + return m.Size() +} +func (m *QueryCurrentEpochRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryCurrentEpochRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryCurrentEpochRequest proto.InternalMessageInfo + +func (m *QueryCurrentEpochRequest) GetIdentifier() string { + if m != nil { + return m.Identifier + } + return "" +} + +type QueryCurrentEpochResponse struct { + CurrentEpoch int64 `protobuf:"varint,1,opt,name=current_epoch,json=currentEpoch,proto3" json:"current_epoch,omitempty"` +} + +func (m *QueryCurrentEpochResponse) Reset() { *m = QueryCurrentEpochResponse{} } +func (m *QueryCurrentEpochResponse) String() string { return proto.CompactTextString(m) } +func (*QueryCurrentEpochResponse) ProtoMessage() {} +func (*QueryCurrentEpochResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_46bcc0d8d0692f49, []int{3} +} +func (m *QueryCurrentEpochResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryCurrentEpochResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryCurrentEpochResponse.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 *QueryCurrentEpochResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryCurrentEpochResponse.Merge(m, src) +} +func (m *QueryCurrentEpochResponse) XXX_Size() int { + return m.Size() +} +func (m *QueryCurrentEpochResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QueryCurrentEpochResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryCurrentEpochResponse proto.InternalMessageInfo + +func (m *QueryCurrentEpochResponse) GetCurrentEpoch() int64 { + if m != nil { + return m.CurrentEpoch + } + return 0 +} + +func init() { + proto.RegisterType((*QueryEpochsInfoRequest)(nil), "duality.epochs.QueryEpochsInfoRequest") + proto.RegisterType((*QueryEpochsInfoResponse)(nil), "duality.epochs.QueryEpochsInfoResponse") + proto.RegisterType((*QueryCurrentEpochRequest)(nil), "duality.epochs.QueryCurrentEpochRequest") + proto.RegisterType((*QueryCurrentEpochResponse)(nil), "duality.epochs.QueryCurrentEpochResponse") +} + +func init() { proto.RegisterFile("duality/epochs/query.proto", fileDescriptor_46bcc0d8d0692f49) } + +var fileDescriptor_46bcc0d8d0692f49 = []byte{ + // 402 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0x41, 0x6b, 0xdb, 0x30, + 0x1c, 0xc5, 0xed, 0x64, 0x0b, 0x4c, 0xcb, 0x76, 0x10, 0x23, 0x73, 0xcc, 0xa6, 0x04, 0x8f, 0x6d, + 0xd9, 0x60, 0x16, 0xc9, 0x0e, 0x85, 0x9e, 0x4a, 0x4a, 0xa1, 0x3d, 0xd6, 0xc7, 0x5e, 0x8a, 0xec, + 0x28, 0x8e, 0x20, 0x91, 0x1c, 0x4b, 0x2e, 0xcd, 0xa1, 0x97, 0x1e, 0x7b, 0x2a, 0xe4, 0x4b, 0xe5, + 0x18, 0xe8, 0xa5, 0xa7, 0x52, 0x92, 0x7e, 0x90, 0x12, 0xd9, 0x09, 0x89, 0x6b, 0x68, 0x4f, 0x36, + 0x7a, 0xef, 0xfd, 0xf4, 0xfe, 0x7f, 0x04, 0xec, 0x5e, 0x42, 0x86, 0x4c, 0x4d, 0x30, 0x8d, 0x44, + 0x30, 0x90, 0x78, 0x9c, 0xd0, 0x78, 0xe2, 0x46, 0xb1, 0x50, 0x02, 0x7e, 0xce, 0x34, 0x37, 0xd5, + 0xec, 0x2f, 0xa1, 0x08, 0x85, 0x96, 0xf0, 0xea, 0x2f, 0x75, 0xd9, 0xdf, 0x42, 0x21, 0xc2, 0x21, + 0xc5, 0x24, 0x62, 0x98, 0x70, 0x2e, 0x14, 0x51, 0x4c, 0x70, 0x99, 0xa9, 0x7f, 0x03, 0x21, 0x47, + 0x42, 0x62, 0x9f, 0x48, 0x9a, 0xc2, 0xf1, 0x45, 0xdb, 0xa7, 0x8a, 0xb4, 0x71, 0x44, 0x42, 0xc6, + 0xb5, 0x79, 0x4d, 0xca, 0x75, 0x09, 0x29, 0xa7, 0x92, 0x65, 0x24, 0xc7, 0x02, 0xb5, 0xd3, 0x55, + 0xfe, 0x48, 0x8b, 0x27, 0xbc, 0x2f, 0x3c, 0x3a, 0x4e, 0xa8, 0x54, 0x8e, 0x07, 0xbe, 0xbe, 0x50, + 0x64, 0x24, 0xb8, 0xa4, 0x70, 0x0f, 0x54, 0x52, 0x98, 0x65, 0x36, 0xcb, 0xad, 0x8f, 0x9d, 0xba, + 0xbb, 0x3b, 0x93, 0xab, 0x33, 0xab, 0x48, 0xf7, 0xdd, 0xec, 0xa1, 0x61, 0x78, 0x99, 0xdd, 0xd9, + 0x07, 0x96, 0x66, 0x1e, 0x26, 0x71, 0x4c, 0xb9, 0xd2, 0xb6, 0xec, 0x3e, 0x88, 0x00, 0x60, 0x3d, + 0xca, 0x15, 0xeb, 0x33, 0x1a, 0x5b, 0x66, 0xd3, 0x6c, 0x7d, 0xf0, 0xb6, 0x4e, 0x9c, 0x03, 0x50, + 0x2f, 0xc8, 0x66, 0x8d, 0x7e, 0x80, 0x4f, 0x41, 0x7a, 0x7e, 0xae, 0xaf, 0xd2, 0xf9, 0xb2, 0x57, + 0x0d, 0xb6, 0xcc, 0x9d, 0x69, 0x09, 0xbc, 0xd7, 0x08, 0x78, 0x05, 0xc0, 0xa6, 0xa2, 0x84, 0xbf, + 0xf2, 0xf5, 0x8b, 0x37, 0x62, 0xff, 0x7e, 0xd5, 0x97, 0xb6, 0x71, 0xd0, 0xf5, 0xdd, 0xd3, 0xb4, + 0x64, 0xc1, 0x1a, 0xce, 0xed, 0x3e, 0xfd, 0xc0, 0x1b, 0x13, 0x54, 0xb7, 0xc7, 0x80, 0xad, 0x42, + 0x72, 0xc1, 0x96, 0xec, 0x3f, 0x6f, 0x70, 0x66, 0x2d, 0x7e, 0xea, 0x16, 0x0d, 0xf8, 0x3d, 0xdf, + 0x62, 0x67, 0x53, 0xdd, 0xe3, 0xd9, 0x02, 0x99, 0xf3, 0x05, 0x32, 0x1f, 0x17, 0xc8, 0xbc, 0x5d, + 0x22, 0x63, 0xbe, 0x44, 0xc6, 0xfd, 0x12, 0x19, 0x67, 0x6e, 0xc8, 0xd4, 0x20, 0xf1, 0xdd, 0x40, + 0x8c, 0xd6, 0x88, 0x7f, 0x43, 0xe2, 0xcb, 0x0d, 0xef, 0x72, 0x4d, 0x54, 0x93, 0x88, 0x4a, 0xbf, + 0xa2, 0x9f, 0xd4, 0xff, 0xe7, 0x00, 0x00, 0x00, 0xff, 0xff, 0x49, 0x4a, 0x4c, 0xc9, 0xfe, 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 { + // EpochInfos provide running epochInfos + EpochInfos(ctx context.Context, in *QueryEpochsInfoRequest, opts ...grpc.CallOption) (*QueryEpochsInfoResponse, error) + // CurrentEpoch provide current epoch of specified identifier + CurrentEpoch(ctx context.Context, in *QueryCurrentEpochRequest, opts ...grpc.CallOption) (*QueryCurrentEpochResponse, error) +} + +type queryClient struct { + cc grpc1.ClientConn +} + +func NewQueryClient(cc grpc1.ClientConn) QueryClient { + return &queryClient{cc} +} + +func (c *queryClient) EpochInfos(ctx context.Context, in *QueryEpochsInfoRequest, opts ...grpc.CallOption) (*QueryEpochsInfoResponse, error) { + out := new(QueryEpochsInfoResponse) + err := c.cc.Invoke(ctx, "/duality.epochs.Query/EpochInfos", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *queryClient) CurrentEpoch(ctx context.Context, in *QueryCurrentEpochRequest, opts ...grpc.CallOption) (*QueryCurrentEpochResponse, error) { + out := new(QueryCurrentEpochResponse) + err := c.cc.Invoke(ctx, "/duality.epochs.Query/CurrentEpoch", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +// QueryServer is the server API for Query service. +type QueryServer interface { + // EpochInfos provide running epochInfos + EpochInfos(context.Context, *QueryEpochsInfoRequest) (*QueryEpochsInfoResponse, error) + // CurrentEpoch provide current epoch of specified identifier + CurrentEpoch(context.Context, *QueryCurrentEpochRequest) (*QueryCurrentEpochResponse, error) +} + +// UnimplementedQueryServer can be embedded to have forward compatible implementations. +type UnimplementedQueryServer struct { +} + +func (*UnimplementedQueryServer) EpochInfos(ctx context.Context, req *QueryEpochsInfoRequest) (*QueryEpochsInfoResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method EpochInfos not implemented") +} +func (*UnimplementedQueryServer) CurrentEpoch(ctx context.Context, req *QueryCurrentEpochRequest) (*QueryCurrentEpochResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method CurrentEpoch not implemented") +} + +func RegisterQueryServer(s grpc1.Server, srv QueryServer) { + s.RegisterService(&_Query_serviceDesc, srv) +} + +func _Query_EpochInfos_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QueryEpochsInfoRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(QueryServer).EpochInfos(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/duality.epochs.Query/EpochInfos", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(QueryServer).EpochInfos(ctx, req.(*QueryEpochsInfoRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Query_CurrentEpoch_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QueryCurrentEpochRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(QueryServer).CurrentEpoch(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/duality.epochs.Query/CurrentEpoch", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(QueryServer).CurrentEpoch(ctx, req.(*QueryCurrentEpochRequest)) + } + return interceptor(ctx, in, info, handler) +} + +var _Query_serviceDesc = grpc.ServiceDesc{ + ServiceName: "duality.epochs.Query", + HandlerType: (*QueryServer)(nil), + Methods: []grpc.MethodDesc{ + { + MethodName: "EpochInfos", + Handler: _Query_EpochInfos_Handler, + }, + { + MethodName: "CurrentEpoch", + Handler: _Query_CurrentEpoch_Handler, + }, + }, + Streams: []grpc.StreamDesc{}, + Metadata: "duality/epochs/query.proto", +} + +func (m *QueryEpochsInfoRequest) 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 *QueryEpochsInfoRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryEpochsInfoRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + return len(dAtA) - i, nil +} + +func (m *QueryEpochsInfoResponse) 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 *QueryEpochsInfoResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryEpochsInfoResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Epochs) > 0 { + for iNdEx := len(m.Epochs) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Epochs[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 *QueryCurrentEpochRequest) 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 *QueryCurrentEpochRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryCurrentEpochRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Identifier) > 0 { + i -= len(m.Identifier) + copy(dAtA[i:], m.Identifier) + i = encodeVarintQuery(dAtA, i, uint64(len(m.Identifier))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *QueryCurrentEpochResponse) 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 *QueryCurrentEpochResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryCurrentEpochResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.CurrentEpoch != 0 { + i = encodeVarintQuery(dAtA, i, uint64(m.CurrentEpoch)) + i-- + dAtA[i] = 0x8 + } + 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 *QueryEpochsInfoRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + return n +} + +func (m *QueryEpochsInfoResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if len(m.Epochs) > 0 { + for _, e := range m.Epochs { + l = e.Size() + n += 1 + l + sovQuery(uint64(l)) + } + } + return n +} + +func (m *QueryCurrentEpochRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Identifier) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +func (m *QueryCurrentEpochResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.CurrentEpoch != 0 { + n += 1 + sovQuery(uint64(m.CurrentEpoch)) + } + 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 *QueryEpochsInfoRequest) 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: QueryEpochsInfoRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryEpochsInfoRequest: 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 *QueryEpochsInfoResponse) 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: QueryEpochsInfoResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryEpochsInfoResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Epochs", 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.Epochs = append(m.Epochs, EpochInfo{}) + if err := m.Epochs[len(m.Epochs)-1].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 *QueryCurrentEpochRequest) 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: QueryCurrentEpochRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryCurrentEpochRequest: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Identifier", 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.Identifier = 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 *QueryCurrentEpochResponse) 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: QueryCurrentEpochResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryCurrentEpochResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field CurrentEpoch", wireType) + } + m.CurrentEpoch = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.CurrentEpoch |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } + 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/epochs/types/query.pb.gw.go b/x/epochs/types/query.pb.gw.go new file mode 100644 index 000000000..a20817322 --- /dev/null +++ b/x/epochs/types/query.pb.gw.go @@ -0,0 +1,236 @@ +// Code generated by protoc-gen-grpc-gateway. DO NOT EDIT. +// source: duality/epochs/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_EpochInfos_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryEpochsInfoRequest + var metadata runtime.ServerMetadata + + msg, err := client.EpochInfos(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Query_EpochInfos_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryEpochsInfoRequest + var metadata runtime.ServerMetadata + + msg, err := server.EpochInfos(ctx, &protoReq) + return msg, metadata, err + +} + +var ( + filter_Query_CurrentEpoch_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} +) + +func request_Query_CurrentEpoch_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryCurrentEpochRequest + 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_CurrentEpoch_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := client.CurrentEpoch(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Query_CurrentEpoch_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryCurrentEpochRequest + 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_CurrentEpoch_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := server.CurrentEpoch(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_EpochInfos_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_EpochInfos_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_EpochInfos_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_CurrentEpoch_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_CurrentEpoch_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_CurrentEpoch_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_EpochInfos_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_EpochInfos_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_EpochInfos_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_CurrentEpoch_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_CurrentEpoch_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_CurrentEpoch_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + return nil +} + +var ( + pattern_Query_EpochInfos_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 1}, []string{"duality", "epochs"}, "", runtime.AssumeColonVerbOpt(true))) + + pattern_Query_CurrentEpoch_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"duality", "epochs", "current_epoch"}, "", runtime.AssumeColonVerbOpt(true))) +) + +var ( + forward_Query_EpochInfos_0 = runtime.ForwardResponseMessage + + forward_Query_CurrentEpoch_0 = runtime.ForwardResponseMessage +) diff --git a/x/gmp/ibc_middleware.go b/x/gmp/ibc_middleware.go new file mode 100644 index 000000000..4d28b23b2 --- /dev/null +++ b/x/gmp/ibc_middleware.go @@ -0,0 +1,148 @@ +package gmp + +import ( + "encoding/json" + "fmt" + + sdk "github.com/cosmos/cosmos-sdk/types" + capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" + "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" + transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" + channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" + porttypes "github.com/cosmos/ibc-go/v7/modules/core/05-port/types" + ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" +) + +type IBCMiddleware struct { + app porttypes.IBCModule +} + +func NewIBCMiddleware(app porttypes.IBCModule) IBCMiddleware { + return IBCMiddleware{ + app: app, + } +} + +// OnChanOpenInit implements the IBCModule interface +func (im IBCMiddleware) OnChanOpenInit( + ctx sdk.Context, + order channeltypes.Order, + connectionHops []string, + portID string, + channelID string, + chanCap *capabilitytypes.Capability, + counterparty channeltypes.Counterparty, + version string, +) (string, error) { + // call underlying callback + return im.app.OnChanOpenInit(ctx, order, connectionHops, portID, channelID, chanCap, counterparty, version) +} + +// OnChanOpenTry implements the IBCMiddleware interface +func (im IBCMiddleware) 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 IBCMiddleware interface +func (im IBCMiddleware) OnChanOpenAck( + ctx sdk.Context, + portID, + channelID string, + counterpartyChannelID string, + counterpartyVersion string, +) error { + return im.app.OnChanOpenAck(ctx, portID, channelID, counterpartyChannelID, counterpartyVersion) +} + +// OnChanOpenConfirm implements the IBCMiddleware interface +func (im IBCMiddleware) OnChanOpenConfirm( + ctx sdk.Context, + portID, + channelID string, +) error { + return im.app.OnChanOpenConfirm(ctx, portID, channelID) +} + +// OnChanCloseInit implements the IBCMiddleware interface +func (im IBCMiddleware) OnChanCloseInit( + ctx sdk.Context, + portID, + channelID string, +) error { + return im.app.OnChanCloseInit(ctx, portID, channelID) +} + +// OnChanCloseConfirm implements the IBCMiddleware interface +func (im IBCMiddleware) OnChanCloseConfirm( + ctx sdk.Context, + portID, + channelID string, +) error { + return im.app.OnChanCloseConfirm(ctx, portID, channelID) +} + +// OnRecvPacket implements the IBCMiddleware interface +func (im IBCMiddleware) OnRecvPacket( + ctx sdk.Context, + packet channeltypes.Packet, + relayer sdk.AccAddress, +) ibcexported.Acknowledgement { + var data transfertypes.FungibleTokenPacketData + if err := types.ModuleCdc.UnmarshalJSON(packet.GetData(), &data); err != nil { + return channeltypes.NewErrorAcknowledgement(fmt.Errorf("cannot unmarshal ICS-20 transfer packet data")) + } + + var msg Message + var err error + err = json.Unmarshal([]byte(data.GetMemo()), &msg) + if err != nil || len(msg.Payload) == 0 { + // Not a packet that should be handled by the GMP middleware + return im.app.OnRecvPacket(ctx, packet, relayer) + } + + switch msg.Type { + case TypeGeneralMessage: + // let the next layer deal with this + // the rest of the data fields should be normal + fallthrough + case TypeGeneralMessageWithToken: + // we throw out the rest of the msg.Payload fields here, for better or worse + data.Memo = string(msg.Payload) + var dataBytes []byte + if dataBytes, err = types.ModuleCdc.MarshalJSON(&data); err != nil { + return channeltypes.NewErrorAcknowledgement(fmt.Errorf("cannot marshal ICS-20 post-processed transfer packet data")) + } + packet.Data = dataBytes + return im.app.OnRecvPacket(ctx, packet, relayer) + default: + return channeltypes.NewErrorAcknowledgement(fmt.Errorf("unrecognized mesasge type: %d", msg.Type)) + } +} + +// OnAcknowledgementPacket implements the IBCMiddleware interface +func (im IBCMiddleware) OnAcknowledgementPacket( + ctx sdk.Context, + packet channeltypes.Packet, + acknowledgement []byte, + relayer sdk.AccAddress, +) error { + return im.app.OnAcknowledgementPacket(ctx, packet, acknowledgement, relayer) +} + +// OnTimeoutPacket implements the IBCMiddleware interface +func (im IBCMiddleware) OnTimeoutPacket( + ctx sdk.Context, + packet channeltypes.Packet, + relayer sdk.AccAddress, +) error { + return im.app.OnTimeoutPacket(ctx, packet, relayer) +} diff --git a/x/gmp/types.go b/x/gmp/types.go new file mode 100644 index 000000000..ed497174e --- /dev/null +++ b/x/gmp/types.go @@ -0,0 +1,21 @@ +package gmp + +const AxelarGMPAcc = "axelar1dv4u5k73pzqrxlzujxg3qp8kvc3pje7jtdvu72npnt5zhq05ejcsn5qme5" + +// Message is attached in ICS20 packet memo field +type Message struct { + SourceChain string `json:"source_chain"` + SourceAddress string `json:"source_address"` + Payload []byte `json:"payload"` + Type int64 `json:"type"` +} + +type MessageType int + +const ( + // TypeUnrecognized means coin type is unrecognized + TypeUnrecognized = iota + TypeGeneralMessage + // TypeGeneralMessageWithToken is a general message with token + TypeGeneralMessageWithToken +) diff --git a/x/ibcswap/ibc_middleware.go b/x/ibcswap/ibc_middleware.go new file mode 100644 index 000000000..f1273e315 --- /dev/null +++ b/x/ibcswap/ibc_middleware.go @@ -0,0 +1,373 @@ +package ibcswap + +import ( + "context" + "encoding/json" + "strings" + + sdk "github.com/cosmos/cosmos-sdk/types" + sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" + forwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router/types" + transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" + clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" + channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" + porttypes "github.com/cosmos/ibc-go/v7/modules/core/05-port/types" + ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" + "github.com/neutron-org/neutron/x/ibcswap/keeper" + "github.com/neutron-org/neutron/x/ibcswap/types" +) + +var _ porttypes.Middleware = &IBCMiddleware{} + +// IBCMiddleware implements the ICS26 callbacks for the swap middleware given the +// swap keeper and the underlying application. +type IBCMiddleware struct { + app porttypes.IBCModule + keeper keeper.Keeper +} + +// NewIBCMiddleware creates a new IBCMiddleware given the keeper and underlying application. +func NewIBCMiddleware(app porttypes.IBCModule, k keeper.Keeper) IBCMiddleware { + return IBCMiddleware{ + app: app, + keeper: k, + } +} + +// OnChanOpenInit implements the IBCModule interface. +func (im IBCMiddleware) OnChanOpenInit( + ctx sdk.Context, + order channeltypes.Order, + connectionHops []string, + portID string, + channelID string, + chanCap *capabilitytypes.Capability, + counterparty channeltypes.Counterparty, + version string, +) (string, error) { + return im.app.OnChanOpenInit( + ctx, + order, + connectionHops, + portID, + channelID, + chanCap, + counterparty, + version, + ) +} + +// OnChanOpenTry implements the IBCModule interface. +func (im IBCMiddleware) OnChanOpenTry( + ctx sdk.Context, + order channeltypes.Order, + connectionHops []string, + portID, channelID string, + chanCap *capabilitytypes.Capability, + counterparty channeltypes.Counterparty, + counterpartyVersion string, +) (version string, err error) { + return im.app.OnChanOpenTry( + ctx, + order, + connectionHops, + portID, + channelID, + chanCap, + counterparty, + counterpartyVersion, + ) +} + +// OnChanOpenAck implements the IBCModule interface. +func (im IBCMiddleware) OnChanOpenAck( + ctx sdk.Context, + portID, channelID string, + counterpartyChannelID string, + counterpartyVersion string, +) error { + return im.app.OnChanOpenAck(ctx, portID, channelID, counterpartyChannelID, counterpartyVersion) +} + +// OnChanOpenConfirm implements the IBCModule interface. +func (im IBCMiddleware) OnChanOpenConfirm(ctx sdk.Context, portID, channelID string) error { + return im.app.OnChanOpenConfirm(ctx, portID, channelID) +} + +// OnChanCloseInit implements the IBCModule interface. +func (im IBCMiddleware) OnChanCloseInit(ctx sdk.Context, portID, channelID string) error { + return im.app.OnChanCloseInit(ctx, portID, channelID) +} + +// OnChanCloseConfirm implements the IBCModule interface. +func (im IBCMiddleware) OnChanCloseConfirm(ctx sdk.Context, portID, channelID string) error { + return im.app.OnChanCloseConfirm(ctx, portID, channelID) +} + +// OnRecvPacket checks the memo field on this packet and if the metadata inside's root key indicates this packet +// should be handled by the swap middleware it attempts to perform a swap. If the swap is successful +// the underlying application's OnRecvPacket callback is invoked. +func (im IBCMiddleware) OnRecvPacket( + ctx sdk.Context, + packet channeltypes.Packet, + relayer sdk.AccAddress, +) ibcexported.Acknowledgement { + var data transfertypes.FungibleTokenPacketData + if err := transfertypes.ModuleCdc.UnmarshalJSON(packet.GetData(), &data); err != nil { + return channeltypes.NewErrorAcknowledgement(err) + } + + m := &types.PacketMetadata{} + err := json.Unmarshal([]byte(data.Memo), m) + if err != nil || m.Swap == nil { + // Not a packet that should be handled by the swap middleware + return im.app.OnRecvPacket(ctx, packet, relayer) + } + + metadata := m.Swap + if err := metadata.Validate(); err != nil { + return channeltypes.NewErrorAcknowledgement(err) + } + + // Compose our context with values that will be used to pass through to the forward middleware + ctxWithForwardFlags := context.WithValue(ctx.Context(), forwardtypes.ProcessedKey{}, true) + ctxWithForwardFlags = context.WithValue( + ctxWithForwardFlags, + forwardtypes.NonrefundableKey{}, + true, + ) + ctxWithForwardFlags = context.WithValue( + ctxWithForwardFlags, + forwardtypes.DisableDenomCompositionKey{}, + true, + ) + wrappedSdkCtx := ctx.WithContext(ctxWithForwardFlags) + + ack := im.app.OnRecvPacket(wrappedSdkCtx, packet, relayer) + if ack == nil || !ack.Success() { + return ack + } + + // Attempt to perform a swap since this packets memo included swap metadata. + res, err := im.keeper.Swap(ctx, metadata.MsgPlaceLimitOrder) + if err != nil { + return im.handleFailedSwap(ctx, packet, data, metadata, err) + } + + // If there is no next field set in the metadata return ack + if metadata.Next == nil { + return ack + } + + // We need to reset the packets memo field so that the root key in the metadata is the + // next field from the current metadata. + memoBz, err := json.Marshal(metadata.Next) + if err != nil { + return ack + } + + data.Memo = string(memoBz) + + // Override the packet data to include the token denom and amount that was received from the swap. + data.Denom = res.TakerCoinOut.Denom + data.Amount = res.TakerCoinOut.Amount.String() + + // After a successful swap funds are now in the receiver account from the MsgPlaceLimitOrder so, + // we need to override the packets receiver field before invoking the forward middlewares OnRecvPacket. + data.Receiver = m.Swap.Receiver + + dataBz, err := transfertypes.ModuleCdc.MarshalJSON(&data) + if err != nil { + return ack + } + + packet.Data = dataBz + + // The forward middleware should return a nil ack if the forward is initiated properly. + // If not an error occurred, and we return the original ack. + newAck := im.app.OnRecvPacket(wrappedSdkCtx, packet, relayer) + if newAck != nil { + return ack + } + + return nil +} + +// OnAcknowledgementPacket implements the IBCModule interface. +func (im IBCMiddleware) OnAcknowledgementPacket( + ctx sdk.Context, + packet channeltypes.Packet, + acknowledgement []byte, + relayer sdk.AccAddress, +) error { + return im.app.OnAcknowledgementPacket(ctx, packet, acknowledgement, relayer) +} + +// OnTimeoutPacket implements the IBCModule interface. +func (im IBCMiddleware) OnTimeoutPacket( + ctx sdk.Context, + packet channeltypes.Packet, + relayer sdk.AccAddress, +) error { + return im.app.OnTimeoutPacket(ctx, packet, relayer) +} + +func (im IBCMiddleware) SendPacket( + ctx sdk.Context, + chanCap *capabilitytypes.Capability, + sourcePort string, + sourceChannel string, + timeoutHeight clienttypes.Height, + timeoutTimestamp uint64, + data []byte, +) (sequence uint64, err error) { + return im.keeper.SendPacket( + ctx, + chanCap, + sourceChannel, + sourceChannel, + timeoutHeight, + timeoutTimestamp, + data, + ) +} + +// WriteAcknowledgement implements the ICS4 Wrapper interface. +func (im IBCMiddleware) WriteAcknowledgement( + ctx sdk.Context, + chanCap *capabilitytypes.Capability, + packet ibcexported.PacketI, + ack ibcexported.Acknowledgement, +) error { + return im.keeper.WriteAcknowledgement(ctx, chanCap, packet, ack) +} + +func (im IBCMiddleware) GetAppVersion( + ctx sdk.Context, + portID string, + channelID string, +) (string, bool) { + return im.keeper.GetAppVersion(ctx, portID, channelID) +} + +// handleFailedSwap will invoke the appropriate failover logic depending on if this swap was marked refundable +// or non-refundable in the SwapMetadata. +func (im IBCMiddleware) handleFailedSwap( + ctx sdk.Context, + packet channeltypes.Packet, + data transfertypes.FungibleTokenPacketData, + metadata *types.SwapMetadata, + err error, +) ibcexported.Acknowledgement { + swapErr := sdkerrors.Wrap(types.ErrSwapFailed, err.Error()) + im.keeper.Logger(ctx).Error( + "ibc swap failed", + "err", swapErr, + "creator", metadata.Creator, + "receiver", metadata.Receiver, + "tokenIn", metadata.TokenIn, + "tokenOut", metadata.TokenOut, + "AmountIn", metadata.AmountIn, + "TickIndexInToOut", metadata.TickIndexInToOut, + "OrderType", metadata.OrderType, + "refundable", metadata.NonRefundable, + "refund address", metadata.RefundAddress, + ) + + // The current denom is from the sender chains perspective, we need to compose the appropriate denom for this side + denomOnThisChain := getDenomForThisChain( + packet.DestinationPort, packet.DestinationChannel, + packet.SourcePort, packet.SourceChannel, + data.Denom, + ) + + if metadata.NonRefundable { + return im.handleNoRefund(ctx, data, metadata, denomOnThisChain, err) + } + + return im.handleRefund(ctx, packet, data, denomOnThisChain, err) +} + +// handleNoRefund will compose a successful ack to send back to the counterparty chain containing any error messages. +// Returning a successful ack ensures that a refund is not issued on the counterparty chain. +// See: https://github.com/cosmos/ibc-go/blob/3ecc7dd3aef5790ec5d906936a297b34adf1ee41/modules/apps/transfer/keeper/relay.go#L320 +func (im IBCMiddleware) handleNoRefund( + ctx sdk.Context, + data transfertypes.FungibleTokenPacketData, + metadata *types.SwapMetadata, + newDenom string, + swapErr error, +) ibcexported.Acknowledgement { + if metadata.RefundAddress == "" { + return channeltypes.NewResultAcknowledgement([]byte(swapErr.Error())) + } + + amount, ok := sdk.NewIntFromString(data.Amount) + if !ok { + wrappedErr := sdkerrors.Wrapf( + transfertypes.ErrInvalidAmount, + "unable to parse transfer amount (%s) into math.Int", + data.Amount, + ) + wrappedErr = sdkerrors.Wrap(swapErr, wrappedErr.Error()) + return channeltypes.NewResultAcknowledgement([]byte(wrappedErr.Error())) + } + + token := sdk.NewCoin(newDenom, amount) + err := im.keeper.SendCoins(ctx, data.Receiver, metadata.RefundAddress, sdk.NewCoins(token)) + if err != nil { + wrappedErr := sdkerrors.Wrap(err, "failed to move funds to refund address") + wrappedErr = sdkerrors.Wrap(swapErr, wrappedErr.Error()) + return channeltypes.NewResultAcknowledgement([]byte(wrappedErr.Error())) + } + + return channeltypes.NewResultAcknowledgement([]byte(swapErr.Error())) +} + +// handleRefund will either burn or transfer the funds back to the appropriate escrow account. +// When a packet comes in the transfer module's OnRecvPacket callback is invoked which either +// mints or unescrows funds on this side so if the swap fails an explicit refund is required. +func (im IBCMiddleware) handleRefund( + ctx sdk.Context, + packet channeltypes.Packet, + data transfertypes.FungibleTokenPacketData, + newDenom string, + swapErr error, +) ibcexported.Acknowledgement { + data.Denom = newDenom + + err := im.keeper.RefundPacketToken(ctx, packet, data) + if err != nil { + wrappedErr := sdkerrors.Wrap(swapErr, err.Error()) + + // If the refund fails on this side we want to make sure that the refund does not happen on the counterparty, + // so we return a successful ack containing the error + return channeltypes.NewResultAcknowledgement([]byte(wrappedErr.Error())) + } + + return channeltypes.NewErrorAcknowledgement(swapErr) +} + +// getDenomForThisChain composes a new token denom by either unwinding or prefixing the specified token denom appropriately. +// This is necessary because the token denom in the packet data is from the perspective of the counterparty chain. +func getDenomForThisChain( + port, channel, counterpartyPort, counterpartyChannel, denom string, +) string { + counterpartyPrefix := transfertypes.GetDenomPrefix(counterpartyPort, counterpartyChannel) + if strings.HasPrefix(denom, counterpartyPrefix) { + // unwind denom + unwoundDenom := denom[len(counterpartyPrefix):] + denomTrace := transfertypes.ParseDenomTrace(unwoundDenom) + if denomTrace.Path == "" { + // denom is now unwound back to native denom + return unwoundDenom + } + // denom is still IBC denom + return denomTrace.IBCDenom() + } + + // append port and channel from this chain to denom + prefixedDenom := transfertypes.GetDenomPrefix(port, channel) + denom + return transfertypes.ParseDenomTrace(prefixedDenom).IBCDenom() +} diff --git a/x/ibcswap/keeper/keeper.go b/x/ibcswap/keeper/keeper.go new file mode 100644 index 000000000..d71c683ab --- /dev/null +++ b/x/ibcswap/keeper/keeper.go @@ -0,0 +1,188 @@ +package keeper + +import ( + "fmt" + + "github.com/cometbft/cometbft/libs/log" + "github.com/cosmos/cosmos-sdk/baseapp" + "github.com/cosmos/cosmos-sdk/codec" + sdk "github.com/cosmos/cosmos-sdk/types" + sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" + "github.com/cosmos/gogoproto/proto" + transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" + clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" + channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" + porttypes "github.com/cosmos/ibc-go/v7/modules/core/05-port/types" + ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" + dextypes "github.com/neutron-org/neutron/x/dex/types" + "github.com/neutron-org/neutron/x/ibcswap/types" +) + +// Keeper defines the swap middleware keeper. +type Keeper struct { + cdc codec.BinaryCodec + msgServiceRouter *baseapp.MsgServiceRouter + + ics4Wrapper porttypes.ICS4Wrapper + bankKeeper types.BankKeeper +} + +// NewKeeper creates a new swap Keeper instance. +func NewKeeper( + cdc codec.BinaryCodec, + msgServiceRouter *baseapp.MsgServiceRouter, + ics4Wrapper porttypes.ICS4Wrapper, + bankKeeper types.BankKeeper, +) Keeper { + return Keeper{ + cdc: cdc, + msgServiceRouter: msgServiceRouter, + + ics4Wrapper: ics4Wrapper, + bankKeeper: bankKeeper, + } +} + +// Logger returns a module-specific logger. +func (k Keeper) Logger(ctx sdk.Context) log.Logger { + return ctx.Logger().With("module", "x/"+ibcexported.ModuleName+"-"+types.ModuleName) +} + +// Swap calls into the base app's msg service router so that the appropriate handler is called when sending the swap msg. +func (k Keeper) Swap( + ctx sdk.Context, + msg *dextypes.MsgPlaceLimitOrder, +) (*dextypes.MsgPlaceLimitOrderResponse, error) { + swapHandler := k.msgServiceRouter.Handler(msg) + if swapHandler == nil { + return nil, sdkerrors.Wrap( + types.ErrMsgHandlerInvalid, + fmt.Sprintf("could not find the handler for %T", msg), + ) + } + + res, err := swapHandler(ctx, msg) + if err != nil { + return nil, err + } + + msgSwapRes := &dextypes.MsgPlaceLimitOrderResponse{} + if err := proto.Unmarshal(res.Data, msgSwapRes); err != nil { + return nil, err + } + + return msgSwapRes, nil +} + +// SendPacket wraps IBC ChannelKeeper's SendPacket function. +func (k Keeper) SendPacket( + ctx sdk.Context, + chanCap *capabilitytypes.Capability, + sourcePort string, + sourceChannel string, + timeoutHeight clienttypes.Height, + timeoutTimestamp uint64, + data []byte, +) (sequence uint64, err error) { + return k.ics4Wrapper.SendPacket( + ctx, + chanCap, + sourcePort, + sourceChannel, + timeoutHeight, + timeoutTimestamp, + data, + ) +} + +// WriteAcknowledgement wraps IBC ChannelKeeper's WriteAcknowledgement function. +func (k Keeper) WriteAcknowledgement( + ctx sdk.Context, + chanCap *capabilitytypes.Capability, + packet ibcexported.PacketI, + acknowledgement ibcexported.Acknowledgement, +) error { + return k.ics4Wrapper.WriteAcknowledgement(ctx, chanCap, packet, acknowledgement) +} + +// RefundPacketToken handles the burning or escrow lock up of vouchers when an asset should be refunded. +// This is only used in the case where we call into the transfer modules OnRecvPacket callback but then the swap fails. +func (k Keeper) RefundPacketToken( + ctx sdk.Context, + packet channeltypes.Packet, + data transfertypes.FungibleTokenPacketData, +) error { + // parse the denomination from the full denom path + trace := transfertypes.ParseDenomTrace(data.Denom) + + // parse the transfer amount + transferAmount, ok := sdk.NewIntFromString(data.Amount) + if !ok { + return sdkerrors.Wrapf( + transfertypes.ErrInvalidAmount, + "unable to parse transfer amount (%s) into math.Int", + data.Amount, + ) + } + token := sdk.NewCoin(trace.IBCDenom(), transferAmount) + + // decode the receiver address + receiver, err := sdk.AccAddressFromBech32(data.Receiver) + if err != nil { + return err + } + + // if the sender chain is source that means a voucher was minted on Duality when the ics20 transfer took place + if transfertypes.SenderChainIsSource(packet.SourcePort, packet.SourceChannel, data.Denom) { + // transfer coins from user account to transfer module + err = k.bankKeeper.SendCoinsFromAccountToModule( + ctx, + receiver, + transfertypes.ModuleName, + sdk.NewCoins(token), + ) + if err != nil { + return err + } + + // burn the coins + err = k.bankKeeper.BurnCoins(ctx, transfertypes.ModuleName, sdk.NewCoins(token)) + if err != nil { + return err + } + + return nil + } + + // transfer coins from user account to escrow address + escrowAddress := transfertypes.GetEscrowAddress( + packet.GetSourcePort(), + packet.GetSourceChannel(), + ) + err = k.bankKeeper.SendCoins(ctx, receiver, escrowAddress, sdk.NewCoins(token)) + if err != nil { + return err + } + + return nil +} + +// SendCoins wraps the BankKeepers SendCoins function so it can be invoked from the middleware. +func (k Keeper) SendCoins(ctx sdk.Context, fromAddr string, toAddr string, amt sdk.Coins) error { + from, err := sdk.AccAddressFromBech32(fromAddr) + if err != nil { + return err + } + + to, err := sdk.AccAddressFromBech32(toAddr) + if err != nil { + return err + } + + return k.bankKeeper.SendCoins(ctx, from, to, amt) +} + +func (k Keeper) GetAppVersion(ctx sdk.Context, portID string, channelID string) (string, bool) { + return k.ics4Wrapper.GetAppVersion(ctx, portID, channelID) +} diff --git a/x/ibcswap/module.go b/x/ibcswap/module.go new file mode 100644 index 000000000..ad5e25176 --- /dev/null +++ b/x/ibcswap/module.go @@ -0,0 +1,133 @@ +package ibcswap + +import ( + "encoding/json" + + abci "github.com/cometbft/cometbft/abci/types" + "github.com/cosmos/cosmos-sdk/client" + "github.com/cosmos/cosmos-sdk/codec" + codectypes "github.com/cosmos/cosmos-sdk/codec/types" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/types/module" + simtypes "github.com/cosmos/cosmos-sdk/types/simulation" + "github.com/neutron-org/neutron/x/ibcswap/keeper" + "github.com/neutron-org/neutron/x/ibcswap/types" + "github.com/gorilla/mux" + "github.com/grpc-ecosystem/grpc-gateway/runtime" + "github.com/spf13/cobra" +) + +var ( + _ module.AppModuleBasic = AppModuleBasic{} + _ module.AppModule = AppModule{} + _ module.AppModuleSimulation = AppModule{} +) + +// AppModuleBasic is the swap middleware AppModuleBasic. +type AppModuleBasic struct{} + +// Name implements AppModuleBasic interface. +func (AppModuleBasic) Name() string { + return types.ModuleName +} + +// RegisterLegacyAminoCodec implements AppModuleBasic interface. +func (AppModuleBasic) RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) {} + +// RegisterInterfaces registers module concrete types into protobuf Any. +func (AppModuleBasic) RegisterInterfaces(registry codectypes.InterfaceRegistry) {} + +// DefaultGenesis returns default genesis state as raw bytes for the swap module. +func (AppModuleBasic) DefaultGenesis(cdc codec.JSONCodec) json.RawMessage { + return nil +} + +// ValidateGenesis performs genesis state validation for the swap module. +func (AppModuleBasic) ValidateGenesis( + cdc codec.JSONCodec, + config client.TxEncodingConfig, + bz json.RawMessage, +) error { + return nil +} + +// RegisterRESTRoutes implements AppModuleBasic interface. +func (AppModuleBasic) RegisterRESTRoutes(clientCtx client.Context, rtr *mux.Router) {} + +// RegisterGRPCGatewayRoutes registers the gRPC Gateway routes for the swap module. +func (AppModuleBasic) RegisterGRPCGatewayRoutes(clientCtx client.Context, mux *runtime.ServeMux) {} + +// GetTxCmd implements AppModuleBasic interface. +func (AppModuleBasic) GetTxCmd() *cobra.Command { + return nil +} + +// GetQueryCmd implements AppModuleBasic interface. +func (AppModuleBasic) GetQueryCmd() *cobra.Command { + return nil +} + +// AppModule implements the module.AppModule +type AppModule struct { + AppModuleBasic + keeper keeper.Keeper +} + +func NewAppModule(keeper keeper.Keeper) *AppModule { + return &AppModule{ + keeper: keeper, + } +} + +// RegisterInvariants implements the AppModule interface. +func (AppModule) RegisterInvariants(ir sdk.InvariantRegistry) {} + +// QuerierRoute implements the AppModule interface. +func (AppModule) QuerierRoute() string { + return "" +} + +// RegisterServices registers module services. +func (am AppModule) RegisterServices(cfg module.Configurator) {} + +// InitGenesis performs genesis initialization for the ibc-router module. It returns +// no validator updates. +func (am AppModule) InitGenesis( + ctx sdk.Context, + cdc codec.JSONCodec, + data json.RawMessage, +) []abci.ValidatorUpdate { + return []abci.ValidatorUpdate{} +} + +// ExportGenesis returns the exported genesis state as raw bytes for the swap module. +func (am AppModule) ExportGenesis(ctx sdk.Context, cdc codec.JSONCodec) json.RawMessage { + return nil +} + +// ConsensusVersion returns the consensus state breaking version for the swap module. +func (AppModule) ConsensusVersion() uint64 { return 1 } + +// BeginBlock implements the AppModule interface. +func (am AppModule) BeginBlock(ctx sdk.Context, req abci.RequestBeginBlock) {} + +// EndBlock implements the AppModule interface. +func (am AppModule) EndBlock(ctx sdk.Context, req abci.RequestEndBlock) []abci.ValidatorUpdate { + return []abci.ValidatorUpdate{} +} + +// GenerateGenesisState implements the AppModuleSimulation interface. +func (AppModule) GenerateGenesisState(simState *module.SimulationState) {} + +// ProposalContents implements the AppModuleSimulation interface. +func (AppModule) ProposalContents(_ module.SimulationState) []simtypes.WeightedProposalContent { + return nil +} + +// RegisterStoreDecoder implements the AppModuleSimulation interface. +func (am AppModule) RegisterStoreDecoder(sdr sdk.StoreDecoderRegistry) {} + +// WeightedOperations implements the AppModuleSimulation interface. +func (am AppModule) WeightedOperations(_ module.SimulationState) []simtypes.WeightedOperation { + return nil +} diff --git a/x/ibcswap/types/errors.go b/x/ibcswap/types/errors.go new file mode 100644 index 000000000..68037f2f1 --- /dev/null +++ b/x/ibcswap/types/errors.go @@ -0,0 +1,9 @@ +package types + +import sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + +var ( + ErrInvalidSwapMetadata = sdkerrors.Register(ModuleName, 2, "invalid swap metadata") + ErrSwapFailed = sdkerrors.Register(ModuleName, 3, "ibc swap failed") + ErrMsgHandlerInvalid = sdkerrors.Register(ModuleName, 4, "msg service handler not found") +) diff --git a/x/ibcswap/types/expected_keepers.go b/x/ibcswap/types/expected_keepers.go new file mode 100644 index 000000000..0ea6192ea --- /dev/null +++ b/x/ibcswap/types/expected_keepers.go @@ -0,0 +1,14 @@ +package types + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" +) + +// BankKeeper defines the expected interface that the swap middleware needs in order to facilitate refunds. +type BankKeeper interface { + SendCoins(ctx sdk.Context, fromAddr sdk.AccAddress, toAddr sdk.AccAddress, amt sdk.Coins) error + MintCoins(ctx sdk.Context, moduleName string, amt sdk.Coins) error + BurnCoins(ctx sdk.Context, moduleName string, amt sdk.Coins) error + SendCoinsFromModuleToAccount(ctx sdk.Context, senderModule string, recipientAddr sdk.AccAddress, amt sdk.Coins) error + SendCoinsFromAccountToModule(ctx sdk.Context, senderAddr sdk.AccAddress, recipientModule string, amt sdk.Coins) error +} diff --git a/x/ibcswap/types/keys.go b/x/ibcswap/types/keys.go new file mode 100644 index 000000000..9a88fc669 --- /dev/null +++ b/x/ibcswap/types/keys.go @@ -0,0 +1,8 @@ +package types + +// ModuleName defines the name for the swap middleware. +const ModuleName = "swap-middleware" + +// ProcessedKey is used to signal to the swap middleware that a packet has already been processed by some other +// middleware and so invoking the transfer modules OnRecvPacket callback should be avoided. +type ProcessedKey struct{} diff --git a/x/ibcswap/types/swap.go b/x/ibcswap/types/swap.go new file mode 100644 index 000000000..45b360394 --- /dev/null +++ b/x/ibcswap/types/swap.go @@ -0,0 +1,102 @@ +package types + +import ( + "encoding/json" + + sdk "github.com/cosmos/cosmos-sdk/types" + sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + dextypes "github.com/neutron-org/neutron/x/dex/types" + "github.com/iancoleman/orderedmap" +) + +// PacketMetadata wraps the SwapMetadata. The root key in the incoming ICS20 transfer packet's memo needs to be set to the same +// value as the json tag in order for the swap middleware to process the swap. +type PacketMetadata struct { + Swap *SwapMetadata `json:"swap"` +} + +// SwapMetadata defines the parameters necessary to perform a swap utilizing the memo field from an incoming ICS20 +// transfer packet. The next field is a string so that you can nest any arbitrary metadata to be handled +// further in the middleware stack or on the counterparty. +type SwapMetadata struct { + *dextypes.MsgPlaceLimitOrder + NonRefundable bool `json:"non-refundable,omitempty"` + RefundAddress string `json:"refund-address,omitempty"` + + // Using JSONObject so that objects for next property will not be mutated by golang's lexicographic key sort on map keys during Marshal. + // Supports primitives for Unmarshal/Marshal so that an escaped JSON-marshaled string is also valid. + Next *JSONObject `json:"next,omitempty"` +} + +// Validate ensures that all the required fields are present in the SwapMetadata and contain valid values. +func (sm SwapMetadata) Validate() error { + if err := sm.ValidateBasic(); err != nil { + return sdkerrors.Wrap(ErrInvalidSwapMetadata, err.Error()) + } + if sm.TokenIn == "" { + return sdkerrors.Wrap(ErrInvalidSwapMetadata, "limit order tokenIn cannot be an empty string") + } + if sm.TokenOut == "" { + return sdkerrors.Wrap(ErrInvalidSwapMetadata, "limit order tokenOut cannot be an empty string") + } + if sm.RefundAddress != "" { + _, err := sdk.AccAddressFromBech32(sm.RefundAddress) + if err != nil { + return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "%s is not a valid Duality address", sm.RefundAddress) + } + } + + if !sm.OrderType.IsFoK() { + return sdkerrors.Wrap(ErrInvalidSwapMetadata, "Limit Order type must be FILL_OR_KILL") + } + + return nil +} + +// JSONObject is a wrapper type to allow either a primitive type or a JSON object. +// In the case the value is a JSON object, OrderedMap type is used so that key order +// is retained across Unmarshal/Marshal. +type JSONObject struct { + obj bool + primitive []byte + orderedMap orderedmap.OrderedMap +} + +// NewJSONObject is a constructor used for tests. +// The usage of JSONObject in the middleware is only json Marshal/Unmarshal +func NewJSONObject(object bool, primitive []byte, orderedMap orderedmap.OrderedMap) *JSONObject { + return &JSONObject{ + obj: object, + primitive: primitive, + orderedMap: orderedMap, + } +} + +// UnmarshalJSON overrides the default json.Unmarshal behavior +func (o *JSONObject) UnmarshalJSON(b []byte) error { + if err := o.orderedMap.UnmarshalJSON(b); err != nil { + // If ordered map unmarshal fails, this is a primitive value + o.obj = false + // Attempt to unmarshal as string, this removes extra JSON escaping + var primitiveStr string + if err := json.Unmarshal(b, &primitiveStr); err != nil { + o.primitive = b + return nil + } + o.primitive = []byte(primitiveStr) + return nil + } + // This is a JSON object, now stored as an ordered map to retain key order. + o.obj = true + return nil +} + +// MarshalJSON overrides the default json.Marshal behavior +func (o *JSONObject) MarshalJSON() ([]byte, error) { + if o.obj { + // non-primitive, return marshaled ordered map. + return o.orderedMap.MarshalJSON() + } + // primitive, return raw bytes. + return o.primitive, nil +} diff --git a/x/ibcswap/types/swap_test.go b/x/ibcswap/types/swap_test.go new file mode 100644 index 000000000..f64a70a01 --- /dev/null +++ b/x/ibcswap/types/swap_test.go @@ -0,0 +1,243 @@ +package types + +import ( + "encoding/json" + "testing" + + sdk "github.com/cosmos/cosmos-sdk/types" + forwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router/types" + appparams "github.com/neutron-org/neutron/app/params" + "github.com/neutron-org/neutron/x/dex/types" + "github.com/iancoleman/orderedmap" + "github.com/stretchr/testify/require" +) + +// Load appparams so that we correctly init acc prefixes +var _ appparams.EncodingConfig + +// TestPacketMetadata_Marshal asserts that the marshaling of the swap metadata works as intended. +func TestPacketMetadata_Marshal(t *testing.T) { + pm := PacketMetadata{ + &SwapMetadata{ + MsgPlaceLimitOrder: &types.MsgPlaceLimitOrder{ + Creator: "test-1", + Receiver: "test-1", + TokenIn: "token-a", + TokenOut: "token-b", + AmountIn: sdk.NewInt(123), + TickIndexInToOut: 0, + OrderType: types.LimitOrderType_FILL_OR_KILL, + }, + Next: nil, + }, + } + _, err := json.Marshal(pm) + require.NoError(t, err) +} + +// TestPacketMetadata_MarshalWithNext asserts that the marshaling of the swap metadata works as intended with next field initialized. +func TestPacketMetadata_MarshalWithNext(t *testing.T) { + forwardMedata := &forwardtypes.PacketMetadata{ + Forward: &forwardtypes.ForwardMetadata{ + Receiver: "cosmos14zde8usc4ur04y3aqnufzzmv2uqdpwwttr5uwv", + Port: "transfer", + Channel: "channel-0", + Timeout: 0, + Retries: nil, + Next: nil, + }, + } + nextBz, err := json.Marshal(forwardMedata) + require.NoError(t, err) + + pm := PacketMetadata{ + &SwapMetadata{ + MsgPlaceLimitOrder: &types.MsgPlaceLimitOrder{ + Creator: "test-1", + Receiver: "test-1", + TokenIn: "token-a", + TokenOut: "token-b", + TickIndexInToOut: 0, + AmountIn: sdk.NewInt(123), + OrderType: types.LimitOrderType_FILL_OR_KILL, + // MaxAmountOut: sdk.NewInt(456), + }, + Next: NewJSONObject(false, nextBz, orderedmap.OrderedMap{}), + }, + } + _, err = json.Marshal(pm) + require.NoError(t, err) +} + +// TestPacketMetadata_Unmarshal asserts that unmarshaling works as intended. +func TestPacketMetadata_Unmarshal(t *testing.T) { + metadata := "{\n \"swap\": {\n \"creator\": \"test-1\",\n \"TickIndexInToOut\": 0,\n \"orderType\": 1,\n \"receiver\": \"test-1\",\n \"tokenIn\": \"token-a\",\n \"tokenOut\": \"token-b\",\n \"AmountIn\": \"123\",\n \"next\": \"\"\n }\n}" + pm := &PacketMetadata{} + err := json.Unmarshal([]byte(metadata), pm) + require.NoError(t, err) +} + +// TestPacketMetadata_UnmarshalStringNext asserts that unmarshaling works as intended when next is escaped json string. +func TestPacketMetadata_UnmarshalStringNext(t *testing.T) { + metadata := "{\n \"swap\": {\n \"creator\": \"test-1\",\n \"receiver\": \"test-1\",\n \"tokenIn\": \"token-a\",\n \"tokenOut\": \"token-b\",\n \"AmountIn\": \"123\",\n \"TickIndexInToOut\": 0,\n \"orderType\": 1,\n \"next\": \" {\\\"forward\\\":{\\\"receiver\\\":\\\"cosmos1f4cur2krsua2th9kkp7n0zje4stea4p9tu70u8\\\",\\\"port\\\":\\\"transfer\\\",\\\"channel\\\":\\\"channel-0\\\",\\\"timeout\\\":0,\\\"next\\\":{\\\"forward\\\":{\\\"receiver\\\":\\\"cosmos1l505zhahp24v5jsmps9vs5asah759fdce06sfp\\\",\\\"port\\\":\\\"transfer\\\",\\\"channel\\\":\\\"channel-0\\\",\\\"timeout\\\":0}}}}\"\n }\n}" + pm := &PacketMetadata{} + err := json.Unmarshal([]byte(metadata), pm) + require.NoError(t, err) +} + +// TestPacketMetadata_UnmarshalJSONNext asserts that unmarshaling works as intended when next is a raw json object. +func TestPacketMetadata_UnmarshalJSONNext(t *testing.T) { + metadata := "{\"swap\":{\"creator\":\"test-1\",\"receiver\":\"test-1\",\"tokenIn\":\"token-a\",\"tokenOut\":\"token-b\",\"AmountIn\":\"123\",\"TickIndexInToOut\":0, \"orderType\": 1, \"tokenIn\":\"token-in\",\"next\":{\"forward\":{\"receiver\":\"cosmos14zde8usc4ur04y3aqnufzzmv2uqdpwwttr5uwv\",\"port\":\"transfer\",\"channel\":\"channel-0\"}}}}" + pm := &PacketMetadata{} + err := json.Unmarshal([]byte(metadata), pm) + require.NoError(t, err) +} + +func TestSwapMetadata_ValidatePass(t *testing.T) { + pm := PacketMetadata{ + &SwapMetadata{ + MsgPlaceLimitOrder: &types.MsgPlaceLimitOrder{ + Creator: "dual1lyaz7emmzreenas4fpz49a49958kye7wxuvsdr", + Receiver: "dual1lyaz7emmzreenas4fpz49a49958kye7wxuvsdr", + TokenIn: "token-a", + TokenOut: "token-b", + AmountIn: sdk.NewInt(123), + TickIndexInToOut: 0, + OrderType: types.LimitOrderType_FILL_OR_KILL, + }, + Next: nil, + }, + } + _, err := json.Marshal(pm) + require.NoError(t, err) + + require.NoError(t, pm.Swap.Validate()) +} + +func TestSwapMetadata_ValidateFail(t *testing.T) { + pm := PacketMetadata{ + &SwapMetadata{ + MsgPlaceLimitOrder: &types.MsgPlaceLimitOrder{ + Creator: "", + Receiver: "test-1", + TokenIn: "token-a", + TokenOut: "token-b", + AmountIn: sdk.NewInt(123), + TickIndexInToOut: 0, + OrderType: types.LimitOrderType_FILL_OR_KILL, + }, + Next: nil, + }, + } + _, err := json.Marshal(pm) + require.NoError(t, err) + require.Error(t, pm.Swap.Validate()) + + pm = PacketMetadata{ + &SwapMetadata{ + MsgPlaceLimitOrder: &types.MsgPlaceLimitOrder{ + Creator: "creator", + Receiver: "", + TokenIn: "token-a", + TokenOut: "token-b", + AmountIn: sdk.NewInt(123), + TickIndexInToOut: 0, + OrderType: types.LimitOrderType_FILL_OR_KILL, + }, + Next: nil, + }, + } + _, err = json.Marshal(pm) + require.NoError(t, err) + require.Error(t, pm.Swap.Validate()) + + pm = PacketMetadata{ + &SwapMetadata{ + MsgPlaceLimitOrder: &types.MsgPlaceLimitOrder{ + Creator: "creator", + Receiver: "test-1", + TokenIn: "", + TokenOut: "token-b", + AmountIn: sdk.NewInt(123), + TickIndexInToOut: 0, + OrderType: types.LimitOrderType_FILL_OR_KILL, + }, + Next: nil, + }, + } + _, err = json.Marshal(pm) + require.NoError(t, err) + require.Error(t, pm.Swap.Validate()) + + pm = PacketMetadata{ + &SwapMetadata{ + MsgPlaceLimitOrder: &types.MsgPlaceLimitOrder{ + Creator: "creator", + Receiver: "receiver", + TokenIn: "token-a", + TokenOut: "", + AmountIn: sdk.NewInt(123), + TickIndexInToOut: 0, + OrderType: types.LimitOrderType_FILL_OR_KILL, + }, + Next: nil, + }, + } + _, err = json.Marshal(pm) + require.NoError(t, err) + require.Error(t, pm.Swap.Validate()) + + pm = PacketMetadata{ + &SwapMetadata{ + MsgPlaceLimitOrder: &types.MsgPlaceLimitOrder{ + Creator: "creator", + Receiver: "receiver", + TokenIn: "token-a", + TokenOut: "token-b", + AmountIn: sdk.NewInt(0), + TickIndexInToOut: 0, + OrderType: types.LimitOrderType_FILL_OR_KILL, + }, + Next: nil, + }, + } + _, err = json.Marshal(pm) + require.NoError(t, err) + require.Error(t, pm.Swap.Validate()) + + pm = PacketMetadata{ + &SwapMetadata{ + MsgPlaceLimitOrder: &types.MsgPlaceLimitOrder{ + Creator: "creator", + Receiver: "receiver", + TokenIn: "token-a", + TokenOut: "token-b", + AmountIn: sdk.NewInt(-1), + TickIndexInToOut: 0, + OrderType: types.LimitOrderType_FILL_OR_KILL, + }, + Next: nil, + }, + } + _, err = json.Marshal(pm) + require.NoError(t, err) + require.Error(t, pm.Swap.Validate()) + + pm = PacketMetadata{ + &SwapMetadata{ + MsgPlaceLimitOrder: &types.MsgPlaceLimitOrder{ + Creator: "creator", + Receiver: "receiver", + TokenIn: "token-a", + TokenOut: "token-b", + AmountIn: sdk.NewInt(123), + TickIndexInToOut: 0, + OrderType: types.LimitOrderType_GOOD_TIL_CANCELLED, + }, + Next: nil, + }, + } + _, err = json.Marshal(pm) + require.NoError(t, err) + require.Error(t, pm.Swap.Validate()) +} diff --git a/x/incentives/README GAUGES.md b/x/incentives/README GAUGES.md new file mode 100644 index 000000000..c7bbd8f52 --- /dev/null +++ b/x/incentives/README GAUGES.md @@ -0,0 +1,651 @@ +# Incentives + +## Abstract + +Incentives module provides general interface to give yield to stakers. + +The yield to be given to stakers are stored in `gauge` and it is distributed on epoch basis to the stakers who meet specific conditions. + +Anyone can create gauge and add rewards to the gauge, there is no way to take it out other than distribution. + +There are two kinds of `gauges`, perpetual and non-perpetual ones. + +- Non perpetual ones get removed from active queue after the the distribution period finish but perpetual ones persist. +- For non perpetual ones, they distribute the tokens equally per epoch during the `gauge` is in the active period. +- For perpetual ones, it distribute all the tokens at a single time and somewhere else put the tokens regularly to distribute the tokens, it's mainly used to distribute minted OSMO tokens to LP token stakers. + +## Contents + +1. **[Concept](#concepts)** +2. **[State](#state)** +3. **[Messages](#messages)** +4. **[Events](#events)** +5. **[Hooks](#hooks)** +6. **[Params](#parameters)** +7. **[Transactions](#transactions)** +8. **[Queries](#queries)** + +## Concepts + +The purpose of `incentives` module is to provide incentives to the users +who stake specific token for specific period of time. + +Staked tokens can be of any denomination, including LP tokens (gamm/pool/x), IBC tokens (tokens sent through IBC such as ibc/27394FB092D2ECCD56123C74F36E4C1F926001CEADA9CA97EA622B25F41E5EB2), and native tokens (such as ATOM or LUNA). + +The incentive amount is entered by the gauge creator. Rewards for a given pool of staked up tokens are pooled into a gauge until the disbursement time. At the disbursement time, they are distributed pro-rata (proportionally) to members of the pool. + +Anyone can create a gauge and add rewards to the gauge. There is no way to withdraw gauge rewards other than distribution. Governance proposals can be raised to match the external incentive tokens with equivalent Osmo incentives (see for example: [proposal 47](https://www.mintscan.io/osmosis/proposals/47)). + +There are two kinds of gauges: **`perpetual`** and **`non-perpetual`**: + +- **`Non-perpetual`** gauges distribute their tokens equally per epoch while the gauge is in the active period. These gauges get removed from the active queue after the distribution period finishes + +- **`Perpetual gauges`** distribute all their tokens at a single time and only distribute their tokens again once the gauge is refilled (this is mainly used to distribute minted OSMO tokens to LP token stakers). Perpetual gauges persist and will re-disburse tokens when refilled (there is no "active" period) + +## State + +### Incentives management + +All the incentives that are going to be provided are staked into +`IncentivePool` until released to the appropriate recipients after a +specific period of time. + +### Gauge + +Rewards to be distributed are organized by `Gauge`. The `Gauge` +describes how users can get reward, stores the amount of coins in the +gauge, the cadence at which rewards are to be distributed, and the +number of epochs to distribute the reward over. + +```protobuf +enum StakeQueryType { + option (gogoproto.goproto_enum_prefix) = false; + + ByDuration = 0; // stakes which has more than specific duration + ByTime = 1; // stakes which are started before specific time +} + +message QueryCondition { + StakeQueryType stake_query_type = 1; // type of stake, ByStakeDuration | ByStakeTime + string denom = 2; // stake denom + google.protobuf.Duration duration = 3; // condition for stake duration, only valid if positive + google.protobuf.Timestamp timestamp = 4; // condition for stake start time, not valid if unset value +} + +message Gauge { + uint64 id = 1; // unique ID of a Gauge + QueryCondition distribute_to = 2; // distribute condition of a stake which meet one of these conditions + repeated cosmos.base.v1beta1.Coin coins = 3; // can distribute multiple coins + google.protobuf.Timestamp start_time = 4; // condition for stake start time, not valid if unset value + uint64 num_epochs_paid_over = 5; // number of epochs distribution will be done +} +``` + +### Gauge queues + +#### Upcoming queue + +To start release `Gauges` at a specific time, we schedule distribution +start time with time key queue. + +#### Active queue + +Active queue has all the `Gauges` that are distributing and after +distribution period finish, it's removed from the queue. + +#### Active by Denom queue + +To speed up the distribution process, module introduces the active +`Gauges` by denom. + +#### Finished queue + +Finished queue saves the `Gauges` that has finished distribution to keep +in track. + +#### Module state + +The state of the module is expressed by `params`, `stakeable_durations` +and `gauges`. + +```protobuf +// GenesisState defines the incentives module's genesis state. +message GenesisState { + // params defines all the parameters of the module + Params params = 1 [ (gogoproto.nullable) = false ]; + repeated Gauge gauges = 2 [ (gogoproto.nullable) = false ]; + repeated google.protobuf.Duration stakeable_durations = 3 [ + (gogoproto.nullable) = false, + (gogoproto.stdduration) = true, + (gogoproto.moretags) = "yaml:\"stakeable_durations\"" + ]; +} +``` + +## Messages + +### Create Gauge + +`MsgCreateGauge` can be submitted by any account to create a `Gauge`. + +```go +type MsgCreateGauge struct { + Owner sdk.AccAddress + DistributeTo QueryCondition + Rewards sdk.Coins + StartTime time.Time // start time to start distribution + NumEpochsPaidOver uint64 // number of epochs distribution will be done +} +``` + +**State modifications:** + +- Validate `Owner` has enough tokens for rewards +- Generate new `Gauge` record +- Save the record inside the keeper's time basis unstake queue +- Transfer the tokens from the `Owner` to incentives `ModuleAccount`. + +### Adding balance to Gauge + +`MsgAddToGauge` can be submitted by any account to add more incentives +to a `Gauge`. + +```go +type MsgAddToGauge struct { + GaugeID uint64 + Rewards sdk.Coins +} +``` + +**State modifications:** + +- Validate `Owner` has enough tokens for rewards +- Check if `Gauge` with specified `msg.GaugeID` is available +- Modify the `Gauge` record by adding `msg.Rewards` +- Transfer the tokens from the `Owner` to incentives `ModuleAccount`. + +## Events + +The incentives module emits the following events: + +### Handlers + +#### MsgCreateGauge + +| Type | Attribute Key | Attribute Value | +| ------------ | -------------------- | ------------------- | +| create_gauge | gauge_id | {gaugeID} | +| create_gauge | distribute_to | {owner} | +| create_gauge | rewards | {rewards} | +| create_gauge | start_time | {startTime} | +| create_gauge | num_epochs_paid_over | {numEpochsPaidOver} | +| message | action | create_gauge | +| message | sender | {owner} | +| transfer | recipient | {moduleAccount} | +| transfer | sender | {owner} | +| transfer | amount | {amount} | + +#### MsgAddToGauge + +| Type | Attribute Key | Attribute Value | +| ------------ | ------------- | --------------- | +| add_to_gauge | gauge_id | {gaugeID} | +| create_gauge | rewards | {rewards} | +| message | action | create_gauge | +| message | sender | {owner} | +| transfer | recipient | {moduleAccount} | +| transfer | sender | {owner} | +| transfer | amount | {amount} | + +### EndBlockers + +#### Incentives distribution + +| Type | Attribute Key | Attribute Value | +| ------------ | ------------- | --------------- | +| transfer\[\] | recipient | {receiver} | +| transfer\[\] | sender | {moduleAccount} | +| transfer\[\] | amount | {distrAmount} | + +## Hooks + +In this section we describe the "hooks" that `incentives` module provide +for other modules. + +If there's no usecase for this, we could ignore this. + +```go + AfterCreateGauge(ctx sdk.Context, gaugeId uint64) + AfterAddToGauge(ctx sdk.Context, gaugeId uint64) + AfterStartDistribution(ctx sdk.Context, gaugeId uint64) + AfterFinishDistribution(ctx sdk.Context, gaugeId uint64) + AfterDistribute(ctx sdk.Context, gaugeId uint64) +``` + +## Parameters + +The incentives module contains the following parameters: + +| Key | Type | Example | +| -------------------- | ------ | -------- | +| DistrEpochIdentifier | string | "weekly" | + +Note: DistrEpochIdentifier is a epoch identifier, and module distribute +rewards at the end of epochs. As `epochs` module is handling multiple +epochs, the identifier is required to check if distribution should be +done at `AfterEpochEnd` hook + +
    +
    + +## Transactions + +### create-gauge + +Create a gauge to distribute rewards to users + +```sh +osmosisd tx incentives create-gauge [stake_denom] [reward] [flags] +``` + +::: details Example 1 + +I want to make incentives for LP tokens of pool 3, namely gamm/pool/3 that have been staked up for at least 1 day. +I want to reward 100 AKT to this pool over 2 days (2 epochs). (50 rewarded on each day) +I want the rewards to start dispersing on 21 December 2021 (1640081402 UNIX time) + +```bash +osmosisd tx incentives create-gauge gamm/pool/3 10000ibc/1480B8FD20AD5FCAE81EA87584D269547DD4D436843C1D20F15E00EB64743EF4 \ +--duration 24h --start-time 1640081402 --epochs 2 --from WALLET_NAME --chain-id osmosis-1 +``` + +::: + +::: details Example 2 + +I want to make incentives for ATOM (ibc/27394FB092D2ECCD56123C74F36E4C1F926001CEADA9CA97EA622B25F41E5EB2) that have been staked up for at least 1 week (164h). +I want to reward 1000 JUNO (ibc/46B44899322F3CD854D2D46DEEF881958467CDD4B3B10086DA49296BBED94BED) to ATOM holders perpetually (perpetually meaning I must add more tokens to this gauge myself every epoch). I want the reward to start dispersing immediately. + +```bash +osmosisd tx incentives create-gauge ibc/27394FB092D2ECCD56123C74F36E4C1F926001CEADA9CA97EA622B25F41E5EB2 \ +1000000000ibc/46B44899322F3CD854D2D46DEEF881958467CDD4B3B10086DA49296BBED94BED --perpetual --duration 168h \ +--from WALLET_NAME --chain-id osmosis-1 +``` + +::: + +### add-to-gauge + +Add coins to a gauge previously created to distribute more rewards to users + +```sh +osmosisd tx incentives add-to-gauge [gauge_id] [rewards] [flags] +``` + +::: details Example + +I want to refill the gauge with 500 JUNO to a previously created gauge (gauge ID 1914) after the distribution. + +```bash +osmosisd tx incentives add-to-gauge 1914 500000000ibc/46B44899322F3CD854D2D46DEEF881958467CDD4B3B10086DA49296BBED94BED \ +--from WALLET_NAME --chain-id osmosis-1 +``` + +::: + +## Queries + +In this section we describe the queries required on grpc server. + +```protobuf +// Query defines the gRPC QueryServer service. +service Query { + // returns coins that is going to be distributed + rpc GetModuleCoinsToBeDistributed(GetModuleCoinsToBeDistributedRequest) returns (GetModuleCoinsToBeDistributedResponse) {} + // returns Gauge by id + rpc GetGaugeByID(GetGaugeByIDRequest) returns (GetGaugeByIDResponse) {} + // returns gauges both upcoming and active + rpc Gauges(GetGaugesActiveUpcomingRequest) returns (GetGaugesActiveUpcomingResponse) {} + // returns active gauges + rpc ActiveGauges(ActiveGetGaugesActiveUpcomingRequest) returns (ActiveGetGaugesActiveUpcomingResponse) {} + // returns scheduled gauges + rpc UpcomingGauges(UpcomingGetGaugesActiveUpcomingRequest) returns (UpcomingGetGaugesActiveUpcomingResponse) {} + // RewardsEst returns an estimate of the rewards at a future specific time. + // The QueryServer either provides an address or a set of stakes + // for which they want to find the associated rewards. + rpc RewardsEst(RewardsEstRequest) returns (RewardsEstResponse) {} + // returns stakeable durations that are valid to give incentives + rpc StakeableDurations(QueryStakeableDurationsRequest) returns (QueryStakeableDurationsResponse) {} +} +``` + +### active-gauges + +Query active gauges + +```sh +osmosisd query incentives active-gauges [flags] +``` + +::: details Example + +```bash +osmosisd query incentives active-gauges +``` + +An example output + +```sh +- coins: [] + distribute_to: + denom: gamm/pool/99 + duration: 604800s + stake_query_type: ByDuration + timestamp: "0001-01-01T00:00:00Z" + distributed_coins: [] + filled_epochs: "0" + id: "297" + is_perpetual: true + num_epochs_paid_over: "1" + start_time: "2021-07-03T12:27:09.323840990Z" +- coins: [] + distribute_to: + denom: gamm/pool/99 + duration: 1209600s + stake_query_type: ByDuration + timestamp: "0001-01-01T00:00:00Z" + distributed_coins: [] + filled_epochs: "0" + id: "298" + is_perpetual: true + num_epochs_paid_over: "1" + start_time: "2021-07-03T12:27:09.323840990Z" +pagination: + next_key: BwEAAAAAAAAAHTIwMjEtMDctMDNUMTI6Mjc6MDkuMzIzODQwOTkw + total: "0" +... +``` + +::: + +### active-gauges-per-denom + +Query active gauges per denom + +```sh +osmosisd query incentives active-gauges-per-denom [denom] [flags] +``` + +::: details Example + +Query all active gauges distributing incentives to holders of gamm/pool/341 + +```bash +osmosisd query incentives active-gauges-per-denom gamm/pool/341 +``` + +An example output: + +```sh +- coins: [] + distribute_to: + denom: gamm/pool/341 + duration: 604800s + stake_query_type: ByDuration + timestamp: "0001-01-01T00:00:00Z" + distributed_coins: [] + filled_epochs: "0" + id: "1033" + is_perpetual: true + num_epochs_paid_over: "1" + start_time: "2021-09-06T22:42:52.139465318Z" +- coins: [] + distribute_to: + denom: gamm/pool/341 + duration: 1209600s + stake_query_type: ByDuration + timestamp: "0001-01-01T00:00:00Z" + distributed_coins: [] + filled_epochs: "0" + id: "1034" + is_perpetual: true + num_epochs_paid_over: "1" + start_time: "2021-09-06T22:42:52.139465318Z" +pagination: + next_key: BwEAAAAAAAAAHTIwMjEtMDctMDNUMTI6Mjc6MDkuMzIzODQwOTkw + total: "0" +... +``` + +::: + +### distributed-coins + +Query coins distributed so far + +```sh +osmosisd query incentives distributed-coins [flags] +``` + +::: details Example + +```bash +osmosisd query incentives distributed-coins +``` + +An example output: + +```sh +coins: +- amount: "27632051924" + denom: ibc/0954E1C28EB7AF5B72D24F3BC2B47BBB2FDF91BDDFD57B74B99E133AED40972A +- amount: "3975960654" + denom: ibc/0EF15DF2F02480ADE0BB6E85D9EBB5DAEA2836D3860E9F97F9AADE4F57A31AA0 +- amount: "125999980901" + denom: ibc/1480B8FD20AD5FCAE81EA87584D269547DD4D436843C1D20F15E00EB64743EF4 +- amount: "434999992789" + denom: ibc/1DC495FCEFDA068A3820F903EDBD78B942FBD204D7E93D3BA2B432E9669D1A59 +- amount: "3001296" + denom: ibc/27394FB092D2ECCD56123C74F36E4C1F926001CEADA9CA97EA622B25F41E5EB2 +- amount: "1493887986685" + denom: ibc/3BCCC93AD5DF58D11A6F8A05FA8BC801CBA0BA61A981F57E91B8B598BF8061CB +- amount: "372218215714" + denom: ibc/46B44899322F3CD854D2D46DEEF881958467CDD4B3B10086DA49296BBED94BED +- amount: "1049999973206" + denom: ibc/4E5444C35610CC76FC94E7F7886B93121175C28262DDFDDE6F84E82BF2425452 +- amount: "11666666665116" + denom: ibc/7A08C6F11EF0F59EB841B9F788A87EC9F2361C7D9703157EC13D940DC53031FA +- amount: "13199999715662" + denom: ibc/9712DBB13B9631EDFA9BF61B55F1B2D290B2ADB67E3A4EB3A875F3B6081B3B84 +- amount: "1177777428443" + denom: ibc/D805F1DA50D31B96E4282C1D4181EDDFB1A44A598BFF5666F4B43E4B8BEA95A5 +- amount: "466666567747" + denom: ibc/EA3E1640F9B1532AB129A571203A0B9F789A7F14BB66E350DCBFA18E1A1931F0 +- amount: "79999999178" + denom: ibc/F3FF7A84A73B62921538642F9797C423D2B4C4ACB3C7FCFFCE7F12AA69909C4B +- amount: "65873607694598" + denom: uosmo +``` + +::: + +### gauge-by-id + +Query gauge by id + +```sh +osmosisd query incentives gauge-by-id [id] [flags] +``` + +::: details Example + +Query the incentive distribution for gauge ID 1: + +```sh +osmosisd query incentives gauge-by-id 1 +``` + +```bash +gauge: + coins: + - amount: "16654747773959" + denom: uosmo + distribute_to: + denom: gamm/pool/1 + duration: 86400s + stake_query_type: ByDuration + timestamp: "0001-01-01T00:00:00Z" + distributed_coins: + - amount: "16589795315655" + denom: uosmo + filled_epochs: "182" + id: "1" + is_perpetual: true + num_epochs_paid_over: "1" + start_time: "2021-06-19T04:30:19.082462364Z" +``` + +::: + +### gauges + +Query available gauges + +```sh +osmosisd query incentives gauges [flags] +``` + +::: details Example + +Query ALL gauges (by default the limit is 100, so here I will define a much larger number to output all gauges) + +```bash +osmosisd query incentives gauges --limit 2000 +``` + +An example output: + +```sh +- coins: + - amount: "1924196414964" + denom: uosmo + distribute_to: + denom: gamm/pool/348 + duration: 604800s + stake_query_type: ByDuration + timestamp: "0001-01-01T00:00:00Z" + distributed_coins: [] + filled_epochs: "0" + id: "8" + is_perpetual: true + num_epochs_paid_over: "1" + start_time: "2021-10-04T13:59:02.142175968Z" +- coins: + - amount: "641398804181" + denom: uosmo + distribute_to: + denom: gamm/pool/348 + duration: 1209600s + stake_query_type: ByDuration + timestamp: "0001-01-01T00:00:00Z" + distributed_coins: [] + filled_epochs: "0" + id: "9" + is_perpetual: true + num_epochs_paid_over: "1" + start_time: "2021-10-04T13:59:02.142175968Z" +pagination: + next_key: null + total: "0" +... +``` + +::: + +### rewards-estimation + +Query rewards estimation + +// Error: strconv.ParseUint: parsing "": invalid syntax + +### to-distribute-coins + +Query coins that is going to be distributed + +```sh +osmosisd query incentives to-distribute-coins [flags] +``` + +::: details Example + +```bash +osmosisd query incentives to-distribute-coins +``` + +An example output: + +```sh +coins: +- amount: "20000000" + denom: gamm/pool/87 +- amount: "90791948076" + denom: ibc/0954E1C28EB7AF5B72D24F3BC2B47BBB2FDF91BDDFD57B74B99E133AED40972A +- amount: "10000" + denom: ibc/1480B8FD20AD5FCAE81EA87584D269547DD4D436843C1D20F15E00EB64743EF4 +- amount: "1000" + denom: ibc/27394FB092D2ECCD56123C74F36E4C1F926001CEADA9CA97EA622B25F41E5EB2 +- amount: "10728832013315" + denom: ibc/3BCCC93AD5DF58D11A6F8A05FA8BC801CBA0BA61A981F57E91B8B598BF8061CB +- amount: "627782783496" + denom: ibc/46B44899322F3CD854D2D46DEEF881958467CDD4B3B10086DA49296BBED94BED +- amount: "450000026794" + denom: ibc/4E5444C35610CC76FC94E7F7886B93121175C28262DDFDDE6F84E82BF2425452 +- amount: "38333333334884" + denom: ibc/7A08C6F11EF0F59EB841B9F788A87EC9F2361C7D9703157EC13D940DC53031FA +- amount: "46800000284338" + denom: ibc/9712DBB13B9631EDFA9BF61B55F1B2D290B2ADB67E3A4EB3A875F3B6081B3B84 +- amount: "2822222571557" + denom: ibc/D805F1DA50D31B96E4282C1D4181EDDFB1A44A598BFF5666F4B43E4B8BEA95A5 +- amount: "2533333432253" + denom: ibc/EA3E1640F9B1532AB129A571203A0B9F789A7F14BB66E350DCBFA18E1A1931F0 +- amount: "366164843847" + denom: uosmo +``` + +::: + +### upcoming-gauges + +Query scheduled gauges (gauges whose `start_time` has not yet occurred) + +```sh +osmosisd query incentives upcoming-gauges [flags] +``` + +::: details Example + +```bash +osmosisd query incentives upcoming-gauges +``` + +Using this command, we will see the gauge we created earlier, among all other upcoming gauges: + +```sh +- coins: + - amount: "10000" + denom: ibc/1480B8FD20AD5FCAE81EA87584D269547DD4D436843C1D20F15E00EB64743EF4 + distribute_to: + denom: gamm/pool/3 + duration: 86400s + stake_query_type: ByDuration + timestamp: "1970-01-01T00:00:00Z" + distributed_coins: [] + filled_epochs: "0" + id: "1914" + is_perpetual: false + num_epochs_paid_over: "2" + start_time: "2021-12-21T10:10:02Z" +... +``` + +::: diff --git a/x/incentives/README LOCKUP.md b/x/incentives/README LOCKUP.md new file mode 100644 index 000000000..fbd2e8184 --- /dev/null +++ b/x/incentives/README LOCKUP.md @@ -0,0 +1,1054 @@ +# Stakeup + +## Abstract + +Stakeup module provides an interface for users to stake tokens (also known as bonding) into the module to get incentives. + +After tokens have been added to a specific pool and turned into LP shares through the GAMM module, users can then stake these LP shares with a specific duration in order to begin earing rewards. + +To unstake these LP shares, users must trigger the unstake timer and wait for the unstake period that was set initially to be completed. After the unstake period is over, users can turn LP shares back into their respective share of tokens. + +This module provides interfaces for other modules to iterate the stakes efficiently and grpc query to check the status of staked coins. + +## Contents + +1. **[Concept](#concepts)** +2. **[State](#state)** +3. **[Messages](#messages)** +4. **[Events](#events)** +5. **[Keeper](#keeper)** +6. **[Hooks](#hooks)** +7. **[Queries](#queries)** +8. **[Transactions](#transactions)** +9. **[Params](#params)** +10. **[Endbstakeer](#endbstakeer)** + +## Concepts + +The purpose of `stakeup` module is to provide the functionality to stake +tokens for specific period of time for LP token stakers to get +incentives. + +To unstake these LP shares, users must trigger the unstake timer and wait for the unstake period that was set initially to be completed. After the unstake period is over, users can turn LP shares back into their respective share of tokens. + +This module provides interfaces for other modules to iterate the stakes efficiently and grpc query to check the status of staked coins. + +There are currently three incentivize stakeup periods; `1 day` (24h), `1 week` (168h), and `2 weeks` (336h). When staking tokens in the 2 week period, the liquidity provider is effectively earning rewards for a combination of the 1 day, 1 week, and 2 week bonding periods. + +The 2 week period refers to how long it takes to unbond the LP shares. The liquidity provider can keep their LP shares bonded to the 2 week stakeup period indefinitely. Unbonding is only required when the liquidity provider desires access to the underlying assets. + +If the liquidity provider begins the unbonding process for their 2 week bonded LP shares, they will earn rewards for all three bonding periods during the first day of unbonding. + +After the first day passes, they will only receive rewards for the 1 day and 1 week stakeup periods. After seven days pass, they will only receive the 1 day rewards until the 2 weeks is complete and their LP shares are unstaked. The below chart is a visual example of what was just explained. + +
    +

    + +

    + +
    +
    + +## State + +### Staked coins management + +Staked coins are all stored in module account for `stakeup` module which +is called `StakePool`. When user stake coins within `stakeup` module, it's +moved from user account to `StakePool` and a record (`PeriodStake` struct) +is created. + +Once the period is over, user can withdraw it at anytime from +`StakePool`. User can withdraw by PeriodStake ID or withdraw all +`UnstakeableCoins` at a time. + +### Period Stake + +A `PeriodStake` is a single unit of stake by period. It's a record of +staked coin at a specific time. It stores owner, duration, unstake time +and the amount of coins staked. + +``` {.go} +type PeriodStake struct { + ID uint64 + Owner sdk.AccAddress + Duration time.Duration + UnstakeTime time.Time + Coins sdk.Coins +} +``` + +All stakes are stored on the KVStore as value at +`{KeyPrefixPeriodStake}{ID}` key. + +### Period stake reference queues + +To provide time efficient queries, several reference queues are managed +by denom, unstake time, and duration. There are two big queues to store +the stake references. (`a_prefix_key`) + +1. Stake references that hasn't started with unstaking yet has prefix of + `KeyPrefixNotUnstaking`. +2. Stake references that has started unstaking already has prefix of + `KeyPrefixUnstaking`. +3. Stake references that has withdrawn, it's removed from the store. + +Regardless the stake has started unstaking or not, it stores below +references. (`b_prefix_key`) + +1. `{KeyPrefixStakeDuration}{Duration}` +2. `{KeyPrefixAccountStakeDuration}{Owner}{Duration}` +3. `{KeyPrefixDenomStakeDuration}{Denom}{Duration}` +4. `{KeyPrefixAccountDenomStakeDuration}{Owner}{Denom}{Duration}` + +If the stake is unstaking, it also stores the below references. + +1. `{KeyPrefixStakeTimestamp}{StakeEndTime}` +2. `{KeyPrefixAccountStakeTimestamp}{Owner}{StakeEndTime}` +3. `{KeyPrefixDenomStakeTimestamp}{Denom}{StakeEndTime}` +4. `{KeyPrefixAccountDenomStakeTimestamp}{Owner}{Denom}{StakeEndTime}` + +For end time keys, they are converted to sortable string by using +`sdk.FormatTimeBytes` function. + +**Note:** Additionally, for stakes that hasn't started unstaking yet, it +stores accumulation store for efficient rewards distribution mechanism. + +For reference management, `addStakeRefByKey` function is used a lot. Here +key is the prefix key to be used for iteration. It is combination of two +prefix keys.(`{a_prefix_key}{b_prefix_key}`) + +``` {.go} +// addStakeRefByKey make a stakeID iterable with the prefix `key` +func (k Keeper) addStakeRefByKey(ctx sdk.Context, key []byte, stakeID uint64) error { + store := ctx.KVStore(k.storeKey) + stakeIDBz := sdk.Uint64ToBigEndian(stakeID) + endKey := combineKeys(key, stakeIDBz) + if store.Has(endKey) { + return fmt.Errorf("stake with same ID exist: %d", stakeID) + } + store.Set(endKey, stakeIDBz) + return nil +} +``` + +## Messages + +### Stake Tokens + +`MsgStake` can be submitted by any token holder via a +`MsgStake` transaction. + +``` {.go} +type MsgStake struct { + Owner sdk.AccAddress + Duration time.Duration + Coins sdk.Coins +} +``` + +**State modifications:** + +- Validate `Owner` has enough tokens +- Generate new `PeriodStake` record +- Save the record inside the keeper's time basis unstake queue +- Transfer the tokens from the `Owner` to stakeup `ModuleAccount`. + +### Begin Unstake of all stakes + +Once time is over, users can withdraw unstaked coins from stakeup +`ModuleAccount`. + +``` {.go} +type MsgBeginUnstakingAll struct { + Owner string +} +``` + +**State modifications:** + +- Fetch all unstakeable `PeriodStake`s that has not started unstaking + yet +- Set `PeriodStake`'s unstake time +- Remove stake references from `NotUnstaking` queue +- Add stake references to `Unstaking` queue + +### Begin unstake for a stake + +Once time is over, users can withdraw unstaked coins from stakeup +`ModuleAccount`. + +``` {.go} +type MsgUnstake struct { + Owner string + ID uint64 +} +``` + +**State modifications:** + +- Check `PeriodStake` with `ID` specified by `MsgUnstake` is not + started unstaking yet +- Set `PeriodStake`'s unstake time +- Remove stake references from `NotUnstaking` queue +- Add stake references to `Unstaking` queue + +Note: If another module needs past `PeriodStake` item, it can log the +details themselves using the hooks. + +## Events + +The stakeup module emits the following events: + +### Handlers + +#### MsgStake + +| Type | Attribute Key | Attribute Value | +| --------------| ------------------| -----------------| +| stake\_tokens | period\_stake\_id | {periodStakeID} | +| stake\_tokens | owner | {owner} | +| stake\_tokens | amount | {amount} | +| stake\_tokens | duration | {duration} | +| stake\_tokens | unstake\_time | {unstakeTime} | +| message | action | stake\_tokens | +| message | sender | {owner} | +| transfer | recipient | {moduleAccount} | +| transfer | sender | {owner} | +| transfer | amount | {amount} | + +#### MsgUnstake + +| Type | Attribute Key | Attribute Value | +| ---------------| ------------------| ------------------| +| begin\_unstake | period\_stake\_id | {periodStakeID} | +| begin\_unstake | owner | {owner} | +| begin\_unstake | amount | {amount} | +| begin\_unstake | duration | {duration} | +| begin\_unstake | unstake\_time | {unstakeTime} | +| message | action | begin\_unstaking | +| message | sender | {owner} | + +#### MsgBeginUnstakingAll + +| Type | Attribute Key | Attribute Value | +| --------------------| ------------------| -----------------------| +| begin\_unstake\_all | owner | {owner} | +| begin\_unstake\_all | unstaked\_coins | {unstakedCoins} | +| begin\_unstake | period\_stake\_id | {periodStakeID} | +| begin\_unstake | owner | {owner} | +| begin\_unstake | amount | {amount} | +| begin\_unstake | duration | {duration} | +| begin\_unstake | unstake\_time | {unstakeTime} | +| message | action | begin\_unstaking\_all | +| message | sender | {owner} | + +### Endbstakeer + +#### Automatic withdraw when unstake time mature + +| Type | Attribute Key | Attribute Value | +| ----------------| ------------------| -----------------| +| message | action | unstake\_tokens | +| message | sender | {owner} | +| transfer\[\] | recipient | {owner} | +| transfer\[\] | sender | {moduleAccount} | +| transfer\[\] | amount | {unstakeAmount} | +| unstake\[\] | period\_stake\_id | {owner} | +| unstake\[\] | owner | {stakeID} | +| unstake\[\] | duration | {stakeDuration} | +| unstake\[\] | unstake\_time | {unstakeTime} | +| unstake\_tokens | owner | {owner} | +| unstake\_tokens | unstaked\_coins | {totalAmount} | + +## Keepers + +### Stakeup Keeper + +Stakeup keeper provides utility functions to store stake queues and query +stakes. + +```go +// Keeper is the interface for stakeup module keeper +type Keeper interface { + // GetModuleBalance Returns full balance of the module + GetModuleBalance(sdk.Context) sdk.Coins + // GetModuleStakedCoins Returns staked balance of the module + GetModuleStakedCoins(sdk.Context) sdk.Coins + // GetAccountUnstakeableCoins Returns whole unstakeable coins which are not withdrawn yet + GetAccountUnstakeableCoins(sdk.Context, addr sdk.AccAddress) sdk.Coins + // GetAccountUnstakingCoins Returns whole unstaking coins + GetAccountUnstakingCoins(sdk.Context, addr sdk.AccAddress) sdk.Coins + // GetAccountStakedCoins Returns a staked coins that can't be withdrawn + GetAccountStakedCoins(sdk.Context, addr sdk.AccAddress) sdk.Coins + // GetAccountStakedPastTime Returns the total stakes of an account whose unstake time is beyond timestamp + GetAccountStakedPastTime(sdk.Context, addr sdk.AccAddress, timestamp time.Time) []types.PeriodStake + // GetAccountUnstakedBeforeTime Returns the total unstakes of an account whose unstake time is before timestamp + GetAccountUnstakedBeforeTime(sdk.Context, addr sdk.AccAddress, timestamp time.Time) []types.PeriodStake + // GetAccountStakedPastTimeDenom is equal to GetAccountStakedPastTime but denom specific + GetAccountStakedPastTimeDenom(ctx sdk.Context, addr sdk.AccAddress, denom string, timestamp time.Time) []types.PeriodStake + + // GetAccountStakedLongerDuration Returns account staked with duration longer than specified + GetAccountStakedLongerDuration(sdk.Context, addr sdk.AccAddress, duration time.Duration) []types.PeriodStake + // GetAccountStakedLongerDurationDenom Returns account staked with duration longer than specified with specific denom + GetAccountStakedLongerDurationDenom(sdk.Context, addr sdk.AccAddress, denom string, duration time.Duration) []types.PeriodStake + // GetStakesPastTimeDenom Returns the stakes whose unstake time is beyond timestamp + GetStakesPastTimeDenom(ctx sdk.Context, addr sdk.AccAddress, denom string, timestamp time.Time) []types.PeriodStake + // GetStakesLongerThanDurationDenom Returns the stakes whose unstake duration is longer than duration + GetStakesLongerThanDurationDenom(ctx sdk.Context, addr sdk.AccAddress, denom string, duration time.Duration) []types.PeriodStake + // GetStakeByID Returns stake from stakeID + GetStakeByID(sdk.Context, stakeID uint64) (*types.PeriodStake, error) + // GetPeriodStakes Returns the period stakes on pool + GetPeriodStakes(sdk.Context) ([]types.PeriodStake, error) + // UnstakeAllUnstakeableCoins Unstake all unstakeable coins + UnstakeAllUnstakeableCoins(sdk.Context, account sdk.AccAddress) (sdk.Coins, error) + // StakeTokens stake tokens from an account for specified duration + StakeTokens(sdk.Context, owner sdk.AccAddress, coins sdk.Coins, duration time.Duration) (types.PeriodStake, error) + // AddTokensToStake stakes more tokens into a stakeup + AddTokensToStake(ctx sdk.Context, owner sdk.AccAddress, stakeID uint64, coins sdk.Coins) (*types.PeriodStake, error) + // Stake is a utility to stake coins into module account + Stake(sdk.Context, stake types.PeriodStake) error + // Unstake is a utility to unstake coins from module account + Unstake(sdk.Context, stake types.PeriodStake) error +``` + +## Hooks + +In this section we describe the "hooks" that `stakeup` module provide for +other modules. + +### Tokens Staked + +On stake/unstake events, stakeup module execute hooks for other modules to +make following actions. + +``` go + OnTokenStaked(ctx sdk.Context, address sdk.AccAddress, stakeID uint64, amount sdk.Coins, stakeDuration time.Duration, unstakeTime time.Time) + OnTokenUnstaked(ctx sdk.Context, address sdk.AccAddress, stakeID uint64, amount sdk.Coins, stakeDuration time.Duration, unstakeTime time.Time) +``` + +## Parameters + +The stakeup module contains the following parameters: + +| Key | Type | Example | +| ---------------------- | --------------- | ------- | + +Note: Currently no parameters are set for `stakeup` module, we will need +to move stakeable durations from incentives module to stakeup module. + +## Endbstakeer + +### Withdraw tokens after unstake time mature + +Once time is over, endbstakeer withdraw coins from matured stakes and +coins are sent from stakeup `ModuleAccount`. + +**State modifications:** + +- Fetch all unstakeable `PeriodStake`s that `Owner` has not withdrawn + yet +- Remove `PeriodStake` records from the state +- Transfer the tokens from stakeup `ModuleAccount` to the + `MsgUnstakeTokens.Owner`. + +### Remove synthetic stakes after removal time mature + +For synthetic stakes, no coin movement is made, but stakeup record and +reference queues are removed. + + +## Transactions + +### stake-tokens + +Bond tokens in a LP for a set duration + +```sh +dualityd tx stakeup stake-tokens [tokens] --duration --from --chain-id +``` + +::: details Example + +To stakeup `15.527546134174465309gamm/pool/3` tokens for a `one day` bonding period from `WALLET_NAME` on the osmosis mainnet: + +```bash +dualityd tx stakeup stake-tokens 15527546134174465309gamm/pool/3 --duration="24h" --from WALLET_NAME --chain-id osmosis-1 +``` + +To stakeup `25.527546134174465309gamm/pool/13` tokens for a `one week` bonding period from `WALLET_NAME` on the osmosis testnet: + +```bash +dualityd tx stakeup stake-tokens 25527546134174465309gamm/pool/13 --duration="168h" --from WALLET_NAME --chain-id osmo-test-4 +``` + +To stakeup `35.527546134174465309 gamm/pool/197` tokens for a `two week` bonding period from `WALLET_NAME` on the osmosis mainnet: + +```bash +dualityd tx stakeup stake-tokens 35527546134174465309gamm/pool/197 --duration="336h" --from WALLET_NAME --chain-id osmosis-1 +``` +::: + + +### begin-unstake-by-id + +Begin the unbonding process for tokens given their unique stake ID + +```sh +dualityd tx stakeup begin-unstake-by-id [id] --from --chain-id +``` + +::: details Example + +To begin the unbonding time for all bonded tokens under id `75` from `WALLET_NAME` on the osmosis mainnet: + +```bash +dualityd tx stakeup begin-unstake-by-id 75 --from WALLET_NAME --chain-id osmosis-1 +``` +::: +::: warning Note +The ID corresponds to the unique ID given to your stakeup transaction (explained more in stake-by-id section) +::: + +### begin-unstake-tokens + +Begin unbonding process for all bonded tokens in a wallet + +```sh +dualityd tx stakeup begin-unstake-tokens --from --chain-id +``` + +::: details Example + +To begin unbonding time for ALL pools and ALL bonded tokens in `WALLET_NAME` on the osmosis mainnet: + + +```bash +dualityd tx stakeup begin-unstake-tokens --from=WALLET_NAME --chain-id=osmosis-1 --yes +``` +::: + +## Queries + +In this section we describe the queries required on grpc server. + +``` protobuf +// Query defines the gRPC QueryServer service. +service Query { + // Return full balance of the module + rpc ModuleBalance(ModuleBalanceRequest) returns (ModuleBalanceResponse); + // Return staked balance of the module + rpc ModuleStakedAmount(ModuleStakedAmountRequest) returns (ModuleStakedAmountResponse); + + // Returns unstakeable coins which are not withdrawn yet + rpc AccountUnstakeableCoins(AccountUnstakeableCoinsRequest) returns (AccountUnstakeableCoinsResponse); + // Returns unstaking coins + rpc AccountUnstakingCoins(AccountUnstakingCoinsRequest) returns (AccountUnstakingCoinsResponse) {} + // Return a staked coins that can't be withdrawn + rpc AccountStakedCoins(AccountStakedCoinsRequest) returns (AccountStakedCoinsResponse); + + // Returns staked records of an account with unstake time beyond timestamp + rpc AccountStakedPastTime(AccountStakedPastTimeRequest) returns (AccountStakedPastTimeResponse); + // Returns staked records of an account with unstake time beyond timestamp excluding tokens started unstaking + rpc AccountStakedPastTimeNotUnstakingOnly(AccountStakedPastTimeNotUnstakingOnlyRequest) returns (AccountStakedPastTimeNotUnstakingOnlyResponse) {} + // Returns unstaked records with unstake time before timestamp + rpc AccountUnstakedBeforeTime(AccountUnstakedBeforeTimeRequest) returns (AccountUnstakedBeforeTimeResponse); + + // Returns stake records by address, timestamp, denom + rpc AccountStakedPastTimeDenom(AccountStakedPastTimeDenomRequest) returns (AccountStakedPastTimeDenomResponse); + // Returns stake record by id + rpc StakedByID(StakedRequest) returns (StakedResponse); + + // Returns account staked records with longer duration + rpc AccountStakedLongerDuration(AccountStakedLongerDurationRequest) returns (AccountStakedLongerDurationResponse); + // Returns account staked records with longer duration excluding tokens started unstaking + rpc AccountStakedLongerDurationNotUnstakingOnly(AccountStakedLongerDurationNotUnstakingOnlyRequest) returns (AccountStakedLongerDurationNotUnstakingOnlyResponse) {} + // Returns account's staked records for a denom with longer duration + rpc AccountStakedLongerDurationDenom(AccountStakedLongerDurationDenomRequest) returns (AccountStakedLongerDurationDenomResponse); + + // Returns account staked records with a specific duration + rpc AccountStakedDuration(AccountStakedDurationRequest) returns (AccountStakedDurationResponse); +} +``` + +### account-staked-beforetime + +Query an account's unstaked records after a specified time (UNIX) has passed + +In other words, if an account unstaked all their bonded tokens the moment the query was executed, only the stakes that would have completed their bond time requirement by the time the `TIMESTAMP` is reached will be returned. + +::: details Example + +In this example, the current UNIX time is `1639776682`, 2 days from now is approx `1639971082`, and 15 days from now is approx `1641094282`. + +An account's `ADDRESS` is staked in both the `1 day` and `1 week` gamm/pool/3. To query the `ADDRESS` with a timestamp 2 days from now `1639971082`: + +```bash +dualityd query stakeup account-staked-beforetime ADDRESS 1639971082 +``` + +In this example will output the `1 day` stake but not the `1 week` stake: + +```bash +stakes: +- ID: "571839" + coins: + - amount: "15527546134174465309" + denom: gamm/pool/3 + duration: 24h + end_time: "2021-12-18T23:32:58.900715388Z" + owner: osmo1xqhlshlhs5g0acqgrkafdemvf5kz4pp4c2x259 +``` + +If querying the same `ADDRESS` with a timestamp 15 days from now `1641094282`: + +```bash +dualityd query stakeup account-staked-beforetime ADDRESS 1641094282 +``` + +In this example will output both the `1 day` and `1 week` stake: + +```bash +stakes: +- ID: "572027" + coins: + - amount: "16120691802759484268" + denom: gamm/pool/3 + duration: 604800.000006193s + end_time: "0001-01-01T00:00:00Z" + owner: osmo1xqhlshlhs5g0acqgrkafdemvf5kz4pp4c2x259 +- ID: "571839" + coins: + - amount: "15527546134174465309" + denom: gamm/pool/3 + duration: 24h + end_time: "2021-12-18T23:32:58.900715388Z" + owner: osmo1xqhlshlhs5g0acqgrkafdemvf5kz4pp4c2x259 +``` +::: + + +### account-staked-coins + +Query an account's staked (bonded) LP tokens + +```sh +dualityd query stakeup account-staked-coins [address] +``` + +:::: details Example + +```bash +dualityd query stakeup account-staked-coins osmo1xqhlshlhs5g0acqgrkafdemvf5kz4pp4c2x259 +``` + +An example output: + +```bash +coins: +- amount: "413553955105681228583" + denom: gamm/pool/1 +- amount: "32155370994266157441309" + denom: gamm/pool/10 +- amount: "220957857520769912023" + denom: gamm/pool/3 +- amount: "31648237936933949577" + denom: gamm/pool/42 +- amount: "14162624050980051053569" + denom: gamm/pool/5 +- amount: "1023186951315714985896914" + denom: gamm/pool/9 +``` +::: warning Note +All GAMM amounts listed are 10^18. Move the decimal place to the left 18 places to get the GAMM amount listed in the GUI. + +You may also specify a --height flag to see bonded LP tokens at a specified height (note: if running a pruned node, this may result in an error) +::: +:::: + +### account-staked-longer-duration + +Query an account's staked records that are greater than or equal to a specified stake duration + +```sh +dualityd query stakeup account-staked-longer-duration [address] [duration] +``` + +::: details Example + +Here is an example of querying an `ADDRESS` for all `1 day` or greater bonding periods: + +```bash +dualityd query stakeup account-staked-longer-duration osmo1xqhlshlhs5g0acqgrkafdemvf5kz4pp4c2x259 24h +``` + +An example output: + +```bash +stakes: +- ID: "572027" + coins: + - amount: "16120691802759484268" + denom: gamm/pool/3 + duration: 604800.000006193s + end_time: "0001-01-01T00:00:00Z" + owner: osmo1xqhlshlhs5g0acqgrkafdemvf5kz4pp4c2x259 +- ID: "571839" + coins: + - amount: "15527546134174465309" + denom: gamm/pool/3 + duration: 24h + end_time: "2021-12-18T23:32:58.900715388Z" + owner: osmo1xqhlshlhs5g0acqgrkafdemvf5kz4pp4c2x259 +``` +::: + + +### account-staked-longer-duration-denom + +Query an account's staked records for a denom that is staked equal to or greater than the specified duration AND match a specified denom + +```sh +dualityd query stakeup account-staked-longer-duration-denom [address] [duration] [denom] +``` + +::: details Example + +Here is an example of an `ADDRESS` that is staked in both the `1 day` and `1 week` for both the gamm/pool/3 and gamm/pool/1, then queries the `ADDRESS` for all bonding periods equal to or greater than `1 day` for just the gamm/pool/3: + +```bash +dualityd query stakeup account-staked-longer-duration-denom osmo1xqhlshlhs5g0acqgrkafdemvf5kz4pp4c2x259 24h gamm/pool/3 +``` + +An example output: + +```bash +stakes: +- ID: "571839" + coins: + - amount: "15527546134174465309" + denom: gamm/pool/3 + duration: 24h + end_time: "0001-01-01T00:00:00Z" + owner: osmo1xqhlshlhs5g0acqgrkafdemvf5kz4pp4c2x259 +- ID: "572027" + coins: + - amount: "16120691802759484268" + denom: gamm/pool/3 + duration: 604800.000006193s + end_time: "0001-01-01T00:00:00Z" + owner: osmo1xqhlshlhs5g0acqgrkafdemvf5kz4pp4c2x259 +``` + +As shown, the gamm/pool/3 is returned but not the gamm/pool/1 due to the denom filter. +::: + + +### account-staked-longer-duration-not-unstaking + +Query an account's staked records for a denom that is staked equal to or greater than the specified duration AND is not in the process of being unstaked + +```sh +dualityd query stakeup account-staked-longer-duration-not-unstaking [address] [duration] +``` + +::: details Example + +Here is an example of an `ADDRESS` that is staked in both the `1 day` and `1 week` gamm/pool/3, begins unstaking process for the `1 day` bond, and queries the `ADDRESS` for all bonding periods equal to or greater than `1 day` that are not unbonding: + +```bash +dualityd query stakeup account-staked-longer-duration-not-unstaking osmo1xqhlshlhs5g0acqgrkafdemvf5kz4pp4c2x259 24h +``` + +An example output: + +```bash +stakes: +- ID: "571839" + coins: + - amount: "16120691802759484268" + denom: gamm/pool/3 + duration: 604800.000006193s + end_time: "0001-01-01T00:00:00Z" + owner: osmo1xqhlshlhs5g0acqgrkafdemvf5kz4pp4c2x259 +``` + +The `1 day` bond does not show since it is in the process of unbonding. +::: + + +### account-staked-pasttime + +Query the staked records of an account with the unstake time beyond timestamp (UNIX) + +```bash +dualityd query stakeup account-staked-pasttime [address] [timestamp] +``` + +::: details Example + +Here is an example of an account that is staked in both the `1 day` and `1 week` gamm/pool/3. In this example, the UNIX time is currently `1639776682` and queries an `ADDRESS` for UNIX time two days later from the current time (which in this example would be `1639971082`) + +```bash +dualityd query stakeup account-staked-pasttime osmo1xqhlshlhs5g0acqgrkafdemvf5kz4pp4c2x259 1639971082 +``` + +The example output: + +```bash +stakes: +- ID: "572027" + coins: + - amount: "16120691802759484268" + denom: gamm/pool/3 + duration: 604800.000006193s + end_time: "0001-01-01T00:00:00Z" + owner: osmo1xqhlshlhs5g0acqgrkafdemvf5kz4pp4c2x259 +``` + +Note that the `1 day` stake ID did not display because, if the unbonding time began counting down from the time the command was executed, the bonding period would be complete before the two day window given by the UNIX timestamp input. +::: + + +### account-staked-pasttime-denom + +Query the staked records of an account with the unstake time beyond timestamp (unix) and filter by a specific denom + +```bash +dualityd query stakeup account-staked-pasttime-denom osmo1xqhlshlhs5g0acqgrkafdemvf5kz4pp4c2x259 [timestamp] [denom] +``` + +::: details Example + +Here is an example of an account that is staked in both the `1 day` and `1 week` gamm/pool/3 and `1 day` and `1 week` gamm/pool/1. In this example, the UNIX time is currently `1639776682` and queries an `ADDRESS` for UNIX time two days later from the current time (which in this example would be `1639971082`) and filters for gamm/pool/3 + +```bash +dualityd query stakeup account-staked-pasttime-denom osmo1xqhlshlhs5g0acqgrkafdemvf5kz4pp4c2x259 1639971082 gamm/pool/3 +``` + +The example output: + +```bash +stakes: +- ID: "572027" + coins: + - amount: "16120691802759484268" + denom: gamm/pool/3 + duration: 604800.000006193s + end_time: "0001-01-01T00:00:00Z" + owner: osmo1xqhlshlhs5g0acqgrkafdemvf5kz4pp4c2x259 +``` + +Note that the `1 day` stake ID did not display because, if the unbonding time began counting down from the time the command was executed, the bonding period would be complete before the two day window given by the UNIX timestamp input. Additionally, neither of the `1 day` or `1 week` stake IDs for gamm/pool/1 showed due to the denom filter. +::: + + +### account-staked-pasttime-not-unstaking + +Query the staked records of an account with the unstake time beyond timestamp (unix) AND is not in the process of unstaking + +```sh +dualityd query stakeup account-staked-pasttime [address] [timestamp] +``` + +::: details Example + +Here is an example of an account that is staked in both the `1 day` and `1 week` gamm/pool/3. In this example, the UNIX time is currently `1639776682` and queries an `ADDRESS` for UNIX time two days later from the current time (which in this example would be `1639971082`) AND is not unstaking: + +```bash +dualityd query stakeup account-staked-pasttime osmo1xqhlshlhs5g0acqgrkafdemvf5kz4pp4c2x259 1639971082 +``` + +The example output: + +```bash +stakes: +- ID: "572027" + coins: + - amount: "16120691802759484268" + denom: gamm/pool/3 + duration: 604800.000006193s + end_time: "0001-01-01T00:00:00Z" + owner: osmo1xqhlshlhs5g0acqgrkafdemvf5kz4pp4c2x259 +``` + +Note that the `1 day` stake ID did not display because, if the unbonding time began counting down from the time the command was executed, the bonding period would be complete before the two day window given by the UNIX timestamp input. Additionally, if ID 572027 were to begin the unstaking process, the query would have returned blank. +::: + + +### account-unstakeable-coins + +Query an address's LP shares that have completed the unstaking period and are ready to be withdrawn + +```bash +dualityd query stakeup account-unstakeable-coins ADDRESS +``` + + + +### account-unstaking-coins + +Query an address's LP shares that are currently unstaking + +```sh +dualityd query stakeup account-unstaking-coins [address] +``` + +::: details Example + +```bash +dualityd query stakeup account-unstaking-coins osmo1xqhlshlhs5g0acqgrkafdemvf5kz4pp4c2x259 +``` + +Example output: + +```bash +coins: +- amount: "15527546134174465309" + denom: gamm/pool/3 +``` +::: + + +### stake-by-id + +Query a stake record by its ID + +```sh +dualityd query stakeup stake-by-id [id] +``` + +::: details Example + +Every time a user bonds tokens to an LP, a unique stake ID is created for that transaction. + +Here is an example viewing the stake record for ID 9: + +```bash +dualityd query stakeup stake-by-id 9 +``` + +And its output: + +```bash +stake: + ID: "9" + coins: + - amount: "2449472670508255020346507" + denom: gamm/pool/2 + duration: 336h + end_time: "0001-01-01T00:00:00Z" + owner: osmo16r39ghhwqjcwxa8q3yswlz8jhzldygy66vlm82 +``` + +In summary, this shows wallet `osmo16r39ghhwqjcwxa8q3yswlz8jhzldygy66vlm82` bonded `2449472.670 gamm/pool/2` LP shares for a `2 week` staking period. +::: + + +### module-balance + +Query the balance of all LP shares (bonded and unbonded) + +```sh +dualityd query stakeup module-balance +``` + +::: details Example + +```bash +dualityd query stakeup module-balance +``` + +An example output: + +```bash +coins: +- amount: "118851922644152734549498647" + denom: gamm/pool/1 +- amount: "2165392672114512349039263626" + denom: gamm/pool/10 +- amount: "9346769826591025900804" + denom: gamm/pool/13 +- amount: "229347389639275840044722315" + denom: gamm/pool/15 +- amount: "81217698776012800247869" + denom: gamm/pool/183 +- amount: "284253336860259874753775" + denom: gamm/pool/197 +- amount: "664300804648059580124426710" + denom: gamm/pool/2 +- amount: "5087102794776326441530430" + denom: gamm/pool/22 +- amount: "178900843925960029029567880" + denom: gamm/pool/3 +- amount: "64845148811263846652326124" + denom: gamm/pool/4 +- amount: "177831279847453210600513" + denom: gamm/pool/42 +- amount: "18685913727862493301261661338" + denom: gamm/pool/5 +- amount: "23579028640963777558149250419" + denom: gamm/pool/6 +- amount: "1273329284855460149381904976" + denom: gamm/pool/7 +- amount: "625252103927082207683116933" + denom: gamm/pool/8 +- amount: "1148475247281090606949382402" + denom: gamm/pool/9 +``` +::: + + +### module-staked-amount + +Query the balance of all bonded LP shares + +```sh +dualityd query stakeup module-staked-amount +``` + +::: details Example + +```bash +dualityd query stakeup module-staked-amount +``` + +An example output: + +```bash + + "coins": + { + "denom": "gamm/pool/1", + "amount": "247321084020868094262821308" + }, + { + "denom": "gamm/pool/10", + "amount": "2866946821820635047398966697" + }, + { + "denom": "gamm/pool/13", + "amount": "9366580741745176812984" + }, + { + "denom": "gamm/pool/15", + "amount": "193294911294343602187680438" + }, + { + "denom": "gamm/pool/183", + "amount": "196722012808526595790871" + }, + { + "denom": "gamm/pool/197", + "amount": "1157025085661167198918241" + }, + { + "denom": "gamm/pool/2", + "amount": "633051132033131378888258047" + }, + { + "denom": "gamm/pool/22", + "amount": "3622601406125950733194696" + }, +... + +``` + +NOTE: This command seems to only work on gRPC and on CLI returns an EOF error. +::: + + + +### output-all-stakes + +Output all stakes into a json file + +```sh +dualityd query stakeup output-all-stakes [max stake ID] +``` + +:::: details Example + +This example command outputs stakes 1-1000 and saves to a json file: + +```bash +dualityd query stakeup output-all-stakes 1000 +``` +::: warning Note +If a stakeup has been completed, the stakeup status will show as "0" (or successful) and no further information will be available. To get further information on a completed stake, run the stake-by-id query. +::: +:::: + + +### total-staked-of-denom + +Query staked amount for a specific denom in the duration provided + +```sh +dualityd query stakeup total-staked-of-denom [denom] --min-duration +``` + +:::: details Example + +This example command outputs the amount of `gamm/pool/2` LP shares that staked in the `2 week` bonding period: + +```bash +dualityd query stakeup total-staked-of-denom gamm/pool/2 --min-duration "336h" +``` + +Which, at the time of this writing outputs `14106985399822075248947045` which is equivalent to `14106985.3998 gamm/pool/2` + +NOTE: As of this writing, there is a bug that defaults the min duration to days instead of seconds. Ensure you specify the time in seconds to get the correct response. +::: + +## Commands + +```sh +# 1 day 100stake stake-tokens command +dualityd tx stakeup stake-tokens 200stake --duration="86400s" --from=validator --chain-id=testing --keyring-backend=test --yes + +# 5s 100stake stake-tokens command +dualityd tx stakeup stake-tokens 100stake --duration="5s" --from=validator --chain-id=testing --keyring-backend=test --yes + +# begin unstake tokens, NOTE: add more gas when unstaking more than two stakes in a same command +dualityd tx stakeup begin-unstake-tokens --from=validator --gas=500000 --chain-id=testing --keyring-backend=test --yes + +# unstake tokens, NOTE: add more gas when unstaking more than two stakes in a same command +dualityd tx stakeup unstake-tokens --from=validator --gas=500000 --chain-id=testing --keyring-backend=test --yes + +# unstake specific period stake +dualityd tx stakeup unstake-by-id 1 --from=validator --chain-id=testing --keyring-backend=test --yes + +# account balance +dualityd query bank balances $(dualityd keys show -a validator --keyring-backend=test) + +# query module balance +dualityd query stakeup module-balance + +# query staked amount +dualityd query stakeup module-staked-amount + +# query stake by id +dualityd query stakeup stake-by-id 1 + +# query account unstakeable coins +dualityd query stakeup account-unstakeable-coins $(dualityd keys show -a validator --keyring-backend=test) + +# query account stakes by denom past time +dualityd query stakeup account-staked-pasttime-denom $(dualityd keys show -a validator --keyring-backend=test) 1611879610 stake + +# query account stakes past time +dualityd query stakeup account-staked-pasttime $(dualityd keys show -a validator --keyring-backend=test) 1611879610 + +# query account stakes by denom with longer duration +dualityd query stakeup account-staked-longer-duration-denom $(dualityd keys show -a validator --keyring-backend=test) 5.1s stake + +# query account stakes with longer duration +dualityd query stakeup account-staked-longer-duration $(dualityd keys show -a validator --keyring-backend=test) 5.1s + +# query account staked coins +dualityd query stakeup account-staked-coins $(dualityd keys show -a validator --keyring-backend=test) + +# query account stakes before time +dualityd query stakeup account-staked-beforetime $(dualityd keys show -a validator --keyring-backend=test) 1611879610 +``` diff --git a/x/incentives/client/cli/cli_test.go b/x/incentives/client/cli/cli_test.go new file mode 100644 index 000000000..473b37297 --- /dev/null +++ b/x/incentives/client/cli/cli_test.go @@ -0,0 +1,351 @@ +package cli_test + +import ( + "fmt" + "testing" + "time" + + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/neutron-org/neutron/utils" + "github.com/neutron-org/neutron/utils/dcli" + dextypes "github.com/neutron-org/neutron/x/dex/types" + "github.com/neutron-org/neutron/x/incentives/client/cli" + "github.com/neutron-org/neutron/x/incentives/types" +) + +var testAddresses = utils.CreateRandomAccounts(3) + +// Queries //////////////////////////////////////////////////////////////////// + +func TestGetCmdGetModuleStatus(t *testing.T) { + desc, _ := cli.GetCmdGetModuleStatus() + tcs := map[string]dcli.QueryCliTestCase[*types.GetModuleStatusRequest]{ + "basic test": { + ExpectedQuery: &types.GetModuleStatusRequest{}, + }, + } + dcli.RunQueryTestCases(t, desc, tcs) +} + +func TestGetCmdGetGaugeByID(t *testing.T) { + desc, _ := cli.GetCmdGetGaugeByID() + tcs := map[string]dcli.QueryCliTestCase[*types.GetGaugeByIDRequest]{ + "basic test": { + Cmd: "1", ExpectedQuery: &types.GetGaugeByIDRequest{Id: 1}, + }, + } + dcli.RunQueryTestCases(t, desc, tcs) +} + +func TestGetCmdGauges(t *testing.T) { + desc, _ := cli.GetCmdGauges() + tcs := map[string]dcli.QueryCliTestCase[*types.GetGaugesRequest]{ + "test ACTIVE_UPCOMING": { + Cmd: "ACTIVE_UPCOMING TokenA", + ExpectedQuery: &types.GetGaugesRequest{ + Status: types.GaugeStatus_ACTIVE_UPCOMING, + Denom: "TokenA", + }, + }, + "test UPCOMING": { + Cmd: "UPCOMING TokenA", + ExpectedQuery: &types.GetGaugesRequest{ + Status: types.GaugeStatus_UPCOMING, + Denom: "TokenA", + }, + }, + "test FINISHED": { + Cmd: "FINISHED TokenA", + ExpectedQuery: &types.GetGaugesRequest{ + Status: types.GaugeStatus_FINISHED, + Denom: "TokenA", + }, + }, + } + dcli.RunQueryTestCases(t, desc, tcs) +} + +func TestGetCmdGetStakeByID(t *testing.T) { + desc, _ := cli.GetCmdGetStakeByID() + tcs := map[string]dcli.QueryCliTestCase[*types.GetStakeByIDRequest]{ + "basic test": { + Cmd: "1", ExpectedQuery: &types.GetStakeByIDRequest{StakeId: 1}, + }, + } + dcli.RunQueryTestCases(t, desc, tcs) +} + +func TestGetCmdStakes(t *testing.T) { + desc, _ := cli.GetCmdStakes() + tcs := map[string]dcli.QueryCliTestCase[*types.GetStakesRequest]{ + "basic test": { + Cmd: fmt.Sprintf("%s", testAddresses[0]), + ExpectedQuery: &types.GetStakesRequest{ + Owner: testAddresses[0].String(), + }, + }, + } + dcli.RunQueryTestCases(t, desc, tcs) +} + +func TestGetCmdFutureRewardEstimate(t *testing.T) { + desc, _ := cli.GetCmdGetFutureRewardEstimate() + tcs := map[string]dcli.QueryCliTestCase[*types.GetFutureRewardEstimateRequest]{ + "basic test": { + Cmd: fmt.Sprintf("%s [1,2,3] 1000", testAddresses[0]), + ExpectedQuery: &types.GetFutureRewardEstimateRequest{ + Owner: testAddresses[0].String(), + StakeIds: []uint64{1, 2, 3}, + NumEpochs: 1000, + }, + }, + } + dcli.RunQueryTestCases(t, desc, tcs) +} + +func TestGetAccountHistory(t *testing.T) { + desc, _ := cli.GetCmdGetAccountHistory() + tcs := map[string]dcli.QueryCliTestCase[*types.GetAccountHistoryRequest]{ + "basic test": { + Cmd: fmt.Sprintf("%s", testAddresses[0]), + ExpectedQuery: &types.GetAccountHistoryRequest{ + Account: testAddresses[0].String(), + }, + }, + } + dcli.RunQueryTestCases(t, desc, tcs) +} + +func TestGetGaugeQualifyingValue(t *testing.T) { + desc, _ := cli.GetCmdGaugeQualifyingValue() + tcs := map[string]dcli.QueryCliTestCase[*types.GetGaugeQualifyingValueRequest]{ + "basic test": { + Cmd: "1", + ExpectedQuery: &types.GetGaugeQualifyingValueRequest{ + Id: 1, + }, + }, + } + dcli.RunQueryTestCases(t, desc, tcs) +} + +// TXS //////////////////////////////////////////////////////////////////////// + +func TestNewCreateGaugeCmd(t *testing.T) { + testTime := time.Unix(1681505514, 0).UTC() + desc, _ := cli.NewCreateGaugeCmd() + tcs := map[string]dcli.TxCliTestCase[*types.MsgCreateGauge]{ + "basic test": { + Cmd: fmt.Sprintf( + "TokenA TokenB 0 100 100TokenA,100TokenB 50 0 --from %s", + testAddresses[0], + ), + ExpectedMsg: &types.MsgCreateGauge{ + IsPerpetual: false, + Owner: testAddresses[0].String(), + DistributeTo: types.QueryCondition{ + PairID: &dextypes.PairID{Token0: "TokenA", Token1: "TokenB"}, + StartTick: 0, + EndTick: 100, + }, + Coins: sdk.NewCoins( + sdk.NewCoin("TokenA", sdk.NewInt(100)), + sdk.NewCoin("TokenB", sdk.NewInt(100)), + ), + StartTime: time.Unix(0, 0).UTC(), + NumEpochsPaidOver: 50, + PricingTick: 0, + }, + }, + "tests with time (RFC3339)": { + Cmd: fmt.Sprintf( + "TokenA TokenB [-20] 20 100TokenA,100TokenB 50 0 --start-time %s --from %s", + testTime.Format(time.RFC3339), + testAddresses[0], + ), + ExpectedMsg: &types.MsgCreateGauge{ + IsPerpetual: false, + Owner: testAddresses[0].String(), + DistributeTo: types.QueryCondition{ + PairID: &dextypes.PairID{Token0: "TokenA", Token1: "TokenB"}, + StartTick: -20, + EndTick: 20, + }, + Coins: sdk.NewCoins( + sdk.NewCoin("TokenA", sdk.NewInt(100)), + sdk.NewCoin("TokenB", sdk.NewInt(100)), + ), + StartTime: testTime, + NumEpochsPaidOver: 50, + PricingTick: 0, + }, + }, + "tests with time (unix int)": { + Cmd: fmt.Sprintf( + "TokenA TokenB [-20] 20 100TokenA,100TokenB 50 0 --start-time %d --from %s", + testTime.Unix(), + testAddresses[0], + ), + ExpectedMsg: &types.MsgCreateGauge{ + IsPerpetual: false, + Owner: testAddresses[0].String(), + DistributeTo: types.QueryCondition{ + PairID: &dextypes.PairID{Token0: "TokenA", Token1: "TokenB"}, + StartTick: -20, + EndTick: 20, + }, + Coins: sdk.NewCoins( + sdk.NewCoin("TokenA", sdk.NewInt(100)), + sdk.NewCoin("TokenB", sdk.NewInt(100)), + ), + StartTime: testTime, + NumEpochsPaidOver: 50, + PricingTick: 0, + }, + }, + "tests with perpetual": { + Cmd: fmt.Sprintf( + "TokenA TokenB [-20] 20 100TokenA,100TokenB 50 0 --perpetual --from %s", + testAddresses[0], + ), + ExpectedMsg: &types.MsgCreateGauge{ + IsPerpetual: true, + Owner: testAddresses[0].String(), + DistributeTo: types.QueryCondition{ + PairID: &dextypes.PairID{Token0: "TokenA", Token1: "TokenB"}, + StartTick: -20, + EndTick: 20, + }, + Coins: sdk.NewCoins( + sdk.NewCoin("TokenA", sdk.NewInt(100)), + sdk.NewCoin("TokenB", sdk.NewInt(100)), + ), + StartTime: time.Unix(0, 0).UTC(), + NumEpochsPaidOver: 1, + PricingTick: 0, + }, + }, + } + dcli.RunTxTestCases(t, desc, tcs) +} + +func TestNewAddToGaugeCmd(t *testing.T) { + desc, _ := cli.NewAddToGaugeCmd() + tcs := map[string]dcli.TxCliTestCase[*types.MsgAddToGauge]{ + "basic test": { + Cmd: fmt.Sprintf("1 1000TokenA --from %s", testAddresses[0]), + ExpectedMsg: &types.MsgAddToGauge{ + Owner: testAddresses[0].String(), + GaugeId: 1, + Rewards: sdk.NewCoins(sdk.NewCoin("TokenA", sdk.NewInt(1000))), + }, + }, + "multiple tokens": { + Cmd: fmt.Sprintf("1 1000TokenA,1TokenZ --from %s", testAddresses[0]), + ExpectedMsg: &types.MsgAddToGauge{ + Owner: testAddresses[0].String(), + GaugeId: 1, + Rewards: sdk.NewCoins( + sdk.NewCoin("TokenA", sdk.NewInt(1000)), + sdk.NewCoin("TokenZ", sdk.NewInt(1)), + ), + }, + }, + } + dcli.RunTxTestCases(t, desc, tcs) +} + +func TestNewStakeCmd(t *testing.T) { + desc, _ := cli.NewStakeCmd() + tcs := map[string]dcli.TxCliTestCase[*types.MsgStake]{ + "basic test": { + Cmd: fmt.Sprintf("1000TokenA --from %s", testAddresses[0]), + ExpectedMsg: &types.MsgStake{ + Owner: testAddresses[0].String(), + Coins: sdk.NewCoins(sdk.NewCoin("TokenA", sdk.NewInt(1000))), + }, + }, + "multiple tokens": { + Cmd: fmt.Sprintf("1000TokenA,1TokenZ --from %s", testAddresses[0]), + ExpectedMsg: &types.MsgStake{ + Owner: testAddresses[0].String(), + Coins: sdk.NewCoins( + sdk.NewCoin("TokenA", sdk.NewInt(1000)), + sdk.NewCoin("TokenZ", sdk.NewInt(1)), + ), + }, + }, + "tokenized share test": { + Cmd: fmt.Sprintf( + "1000DualityPoolShares-tokenA-tokenB-t123-f30 --from %s", + testAddresses[0], + ), + ExpectedMsg: &types.MsgStake{ + Owner: testAddresses[0].String(), + Coins: sdk.NewCoins( + sdk.NewCoin("DualityPoolShares-tokenA-tokenB-t123-f30", sdk.NewInt(1000)), + ), + }, + }, + "tokenized share negative tick index test": { + Cmd: fmt.Sprintf( + "1000DualityPoolShares-tokenA-tokenB-t-123-f30 --from %s", + testAddresses[0], + ), + ExpectedMsg: &types.MsgStake{ + Owner: testAddresses[0].String(), + Coins: sdk.NewCoins( + sdk.NewCoin("DualityPoolShares-tokenA-tokenB-t-123-f30", sdk.NewInt(1000)), + ), + }, + }, + "multiple tokenized shares": { + Cmd: fmt.Sprintf( + "1000DualityPoolShares-tokenA-tokenB-t-123-f30,1DualityPoolShares-tokenA-tokenB-t-124-f30 --from %s", + testAddresses[0], + ), + ExpectedMsg: &types.MsgStake{ + Owner: testAddresses[0].String(), + Coins: sdk.NewCoins( + sdk.NewCoin("DualityPoolShares-tokenA-tokenB-t-123-f30", sdk.NewInt(1000)), + sdk.NewCoin("DualityPoolShares-tokenA-tokenB-t-124-f30", sdk.NewInt(1)), + ), + }, + }, + } + dcli.RunTxTestCases(t, desc, tcs) +} + +func TestNewUnstakeCmd(t *testing.T) { + desc, _ := cli.NewUnstakeCmd() + tcs := map[string]dcli.TxCliTestCase[*types.MsgUnstake]{ + "basic test": { + Cmd: fmt.Sprintf("--from %s", testAddresses[0]), + ExpectedMsg: &types.MsgUnstake{ + Owner: testAddresses[0].String(), + Unstakes: []*types.MsgUnstake_UnstakeDescriptor{}, + }, + }, + "with coins": { + Cmd: fmt.Sprintf("1:10TokenA 10:10TokenA,10TokenC --from %s", testAddresses[0]), + ExpectedMsg: &types.MsgUnstake{ + Owner: testAddresses[0].String(), + Unstakes: []*types.MsgUnstake_UnstakeDescriptor{ + { + ID: 1, + Coins: sdk.NewCoins( + sdk.NewCoin("TokenA", sdk.NewInt(10)), + ), + }, { + ID: 10, + Coins: sdk.NewCoins( + sdk.NewCoin("TokenA", sdk.NewInt(10)), + sdk.NewCoin("TokenC", sdk.NewInt(10)), + ), + }, + }, + }, + }, + } + dcli.RunTxTestCases(t, desc, tcs) +} diff --git a/x/incentives/client/cli/flags.go b/x/incentives/client/cli/flags.go new file mode 100644 index 000000000..fa3467e0f --- /dev/null +++ b/x/incentives/client/cli/flags.go @@ -0,0 +1,22 @@ +package cli + +import ( + flag "github.com/spf13/pflag" +) + +// Flags for incentives module tx commands. +const ( + FlagStartTime = "start-time" + FlagPerpetual = "perpetual" + FlagAmount = "amount" +) + +// FlagSetCreateGauge returns flags for creating gauges. +func FlagSetCreateGauge() *flag.FlagSet { + fs := flag.NewFlagSet("", flag.ContinueOnError) + + fs.String(FlagStartTime, "", "Timestamp to begin distribution") + fs.Bool(FlagPerpetual, false, "Perpetual distribution") + + return fs +} diff --git a/x/incentives/client/cli/query.go b/x/incentives/client/cli/query.go new file mode 100644 index 000000000..b2d7c2fe4 --- /dev/null +++ b/x/incentives/client/cli/query.go @@ -0,0 +1,113 @@ +package cli + +import ( + "github.com/spf13/cobra" + "github.com/spf13/pflag" + + "github.com/neutron-org/neutron/utils/dcli" + "github.com/neutron-org/neutron/x/incentives/types" +) + +// GetQueryCmd returns the query commands for this module. +func GetQueryCmd() *cobra.Command { + // group incentives queries under a subcommand + cmd := dcli.QueryIndexCmd(types.ModuleName) + qcGetter := types.NewQueryClient + dcli.AddQueryCmd(cmd, qcGetter, GetCmdGetModuleStatus) + dcli.AddQueryCmd(cmd, qcGetter, GetCmdGetGaugeByID) + dcli.AddQueryCmd(cmd, qcGetter, GetCmdGauges) + dcli.AddQueryCmd(cmd, qcGetter, GetCmdGetStakeByID) + dcli.AddQueryCmd(cmd, qcGetter, GetCmdStakes) + dcli.AddQueryCmd(cmd, qcGetter, GetCmdGetFutureRewardEstimate) + dcli.AddQueryCmd(cmd, qcGetter, GetCmdGetAccountHistory) + dcli.AddQueryCmd(cmd, qcGetter, GetCmdGaugeQualifyingValue) + + return cmd +} + +// GetCmdGetModuleStatus returns status of incentive module. +func GetCmdGetModuleStatus() (*dcli.QueryDescriptor, *types.GetModuleStatusRequest) { + return &dcli.QueryDescriptor{ + Use: "module-status", + Short: "Query module status.", + Long: `{{.Short}}`, + }, &types.GetModuleStatusRequest{} +} + +// GetCmdGetGaugeByID returns a gauge by ID. +func GetCmdGetGaugeByID() (*dcli.QueryDescriptor, *types.GetGaugeByIDRequest) { + return &dcli.QueryDescriptor{ + Use: "gauge-by-id [id]", + Short: "Query gauge by id.", + Long: `{{.Short}}{{.ExampleHeader}} gauge-by-id 1`, + }, &types.GetGaugeByIDRequest{} +} + +func parseGaugeStatus(arg string, _ *pflag.FlagSet) (any, dcli.FieldReadLocation, error) { + gaugeStatusInt, ok := types.GaugeStatus_value[arg] + if !ok { + return 0, dcli.UsedArg, types.ErrInvalidGaugeStatus + } + gaugeStatus := types.GaugeStatus(gaugeStatusInt) + + return gaugeStatus, dcli.UsedArg, nil +} + +// GetCmdGauges returns all gauges for a given status and denom. +func GetCmdGauges() (*dcli.QueryDescriptor, *types.GetGaugesRequest) { + return &dcli.QueryDescriptor{ + Use: "list-gauges [status] [denom]", + Short: "Query gauges", + Long: `{{.Short}}{{.ExampleHeader}} list-gauges UPCOMING DualityPoolShares-stake-token-t0-f1`, + CustomFieldParsers: map[string]dcli.CustomFieldParserFn{ + "Status": parseGaugeStatus, + }, + }, &types.GetGaugesRequest{} +} + +// GetCmdGetStakeByID returns a lock by ID. +func GetCmdGetStakeByID() (*dcli.QueryDescriptor, *types.GetStakeByIDRequest) { + return &dcli.QueryDescriptor{ + Use: "stake-by-id [stakeID]", + Short: "Query stake by id.", + Long: `{{.Short}}{{.ExampleHeader}} Stake-by-id 1`, + }, &types.GetStakeByIDRequest{} +} + +// GetCmdStakes returns all gauges for a given status and owner. +func GetCmdStakes() (*dcli.QueryDescriptor, *types.GetStakesRequest) { + return &dcli.QueryDescriptor{ + Use: "list-stakes [owner]", + Short: "Query stakes", + Long: `{{.Short}}{{.ExampleHeader}} list-stakes cosmos1chl62vc593p99z2tfh2pp8tl4anm0w4l8h8svx`, + }, &types.GetStakesRequest{} +} + +// GetCmdGetFutureRewardsEstimate returns a rewards estimate for a given set of stakes. +func GetCmdGetFutureRewardEstimate() (*dcli.QueryDescriptor, *types.GetFutureRewardEstimateRequest) { + return &dcli.QueryDescriptor{ + Use: "reward-estimate [owner] [stakeIDs] [numEpochs]", + Short: "Get rewards estimate for set of stakes", + Long: `{{.Short}}{{.ExampleHeader}} reward-estimate cosmos1chl62vc593p99z2tfh2pp8tl4anm0w4l8h8svx [1,2,3] 365`, + CustomFieldParsers: map[string]dcli.CustomFieldParserFn{ + "StakeIDs": dcli.ParseUintArray, + }, + }, &types.GetFutureRewardEstimateRequest{} +} + +// GetCmdGetFutureRewardsEstimate returns a rewards estimate for a given set of stakes. +func GetCmdGetAccountHistory() (*dcli.QueryDescriptor, *types.GetAccountHistoryRequest) { + return &dcli.QueryDescriptor{ + Use: "account-history [account]", + Short: "Get rewards distribution history for an address", + Long: `{{.Short}}{{.ExampleHeader}} account-history cosmos1chl62vc593p99z2tfh2pp8tl4anm0w4l8h8svx`, + }, &types.GetAccountHistoryRequest{} +} + +func GetCmdGaugeQualifyingValue() (*dcli.QueryDescriptor, *types.GetGaugeQualifyingValueRequest) { + return &dcli.QueryDescriptor{ + Use: "gauge-qualifying-value [gaugeID]", + Short: "Query the qualifying value of a gauge by gauge id.", + Long: `{{.Short}}{{.ExampleHeader}} gauge-qualifying-value 1`, + }, &types.GetGaugeQualifyingValueRequest{} +} diff --git a/x/incentives/client/cli/query_test.go b/x/incentives/client/cli/query_test.go new file mode 100644 index 000000000..657944430 --- /dev/null +++ b/x/incentives/client/cli/query_test.go @@ -0,0 +1,131 @@ +package cli_test + +import ( + "testing" + "time" + + "github.com/stretchr/testify/suite" + + "github.com/neutron-org/neutron/testutil/apptesting" + dextypes "github.com/neutron-org/neutron/x/dex/types" + "github.com/neutron-org/neutron/x/incentives/keeper" + "github.com/neutron-org/neutron/x/incentives/types" + + sdk "github.com/cosmos/cosmos-sdk/types" +) + +type QueryTestSuite struct { + apptesting.KeeperTestHelper + queryClient types.QueryClient +} + +// StakeTokens funds an account, stakes tokens and returns a stakeID. +func (s *QueryTestSuite) SetupStake( + addr sdk.AccAddress, + coins sdk.Coins, + duration time.Duration, +) (stakeID uint64) { + msgServer := keeper.NewMsgServerImpl(s.App.IncentivesKeeper) + s.FundAcc(addr, coins) + + msgResponse, err := msgServer.Stake( + sdk.WrapSDKContext(s.Ctx), + types.NewMsgSetupStake(addr, duration, coins), + ) + s.Require().NoError(err) + + return msgResponse.ID +} + +func (s *QueryTestSuite) SetupSuite() { + s.Setup() + s.queryClient = types.NewQueryClient(s.QueryHelper) + + pool, _ := s.App.DexKeeper.InitPool(s.Ctx, dextypes.MustNewPairID("tokenA", "tokenB"), 0, 1) + denom := pool.GetPoolDenom() + + // set up stake with id = 1 + addr := apptesting.SetupAddr(0) + s.SetupStake(addr, sdk.Coins{sdk.NewCoin(denom, sdk.NewInt(1000000))}, time.Hour*24) + + s.Commit() +} + +// func (s *QueryTestSuite) TestQueriesNeverAlterState() { +// testCases := []struct { +// name string +// query string +// input interface{} +// output interface{} +// }{ +// // { +// // "Query active gauges", +// // "/duality.incentives.Query/ActiveGauges", +// // &types.ActiveGetGaugesActiveUpcomingRequest{}, +// // &types.ActiveGetGaugesActiveUpcomingResponse{}, +// // }, +// // { +// // "Query active gauges per denom", +// // "/duality.incentives.Query/ActiveGaugesPerDenom", +// // &types.ActiveGaugesPerDenomRequest{Denom: "stake"}, +// // &types.ActiveGaugesPerDenomResponse{}, +// // }, +// // { +// // "Query gauge by id", +// // "/duality.incentives.Query/GetGaugeByID", +// // &types.GetGaugeByIDRequest{Id: 1}, +// // &types.GetGaugeByIDResponse{}, +// // }, +// // { +// // "Query all gauges", +// // "/duality.incentives.Query/Gauges", +// // &types.GetGaugesActiveUpcomingRequest{}, +// // &types.GetGaugesActiveUpcomingResponse{}, +// // }, +// // { +// // "Query stakeable durations", +// // "/duality.incentives.Query/StakeableDurations", +// // &types.QueryStakeableDurationsRequest{}, +// // &types.QueryStakeableDurationsResponse{}, +// // }, +// // { +// // "Query module to distibute coins", +// // "/duality.incentives.Query/GetModuleCoinsToBeDistributed", +// // &types.GetModuleCoinsToBeDistributedRequest{}, +// // &types.GetModuleCoinsToBeDistributedResponse{}, +// // }, +// // { +// // "Query reward estimate", +// // "/duality.incentives.Query/RewardsEst", +// // &types.RewardsEstRequest{Owner: s.TestAccs[0].String()}, +// // &types.RewardsEstResponse{}, +// // }, +// // { +// // "Query upcoming gauges", +// // "/duality.incentives.Query/UpcomingGauges", +// // &types.UpcomingGetGaugesActiveUpcomingRequest{}, +// // &types.UpcomingGetGaugesActiveUpcomingResponse{}, +// // }, +// // { +// // "Query upcoming gauges", +// // "/duality.incentives.Query/UpcomingGaugesPerDenom", +// // &types.UpcomingGaugesPerDenomRequest{Denom: "stake"}, +// // &types.UpcomingGaugesPerDenomResponse{}, +// // }, +// } + +// for _, tc := range testCases { +// tc := tc + +// s.Run(tc.name, func() { +// s.SetupSuite() +// err := s.QueryHelper.Invoke(gocontext.Background(), tc.query, tc.input, tc.output) +// s.Require().NoError(err) +// s.StateNotAltered() +// }) +// } +// } + +func TestQueryTestSuite(t *testing.T) { + suite.Run(t, new(QueryTestSuite)) +} diff --git a/x/incentives/client/cli/tx.go b/x/incentives/client/cli/tx.go new file mode 100644 index 000000000..0c9517923 --- /dev/null +++ b/x/incentives/client/cli/tx.go @@ -0,0 +1,173 @@ +package cli + +import ( + "errors" + "fmt" + "strconv" + "strings" + "time" + + "github.com/cosmos/cosmos-sdk/client" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/spf13/cobra" + "github.com/spf13/pflag" + + "github.com/neutron-org/neutron/utils/dcli" + dextypes "github.com/neutron-org/neutron/x/dex/types" + "github.com/neutron-org/neutron/x/incentives/types" +) + +// GetTxCmd returns the transaction commands for this module. +func GetTxCmd() *cobra.Command { + cmd := dcli.TxIndexCmd(types.ModuleName) + + dcli.AddTxCmd(cmd, NewCreateGaugeCmd) + dcli.AddTxCmd(cmd, NewAddToGaugeCmd) + dcli.AddTxCmd(cmd, NewStakeCmd) + dcli.AddTxCmd(cmd, NewUnstakeCmd) + + return cmd +} + +func CreateGaugeCmdBuilder( + clientCtx client.Context, + args []string, + flags *pflag.FlagSet, +) (sdk.Msg, error) { + // "create-gauge [pairTokenA] [pairTokenB] [startTick] [endTick] [coins] [numEpochs] [pricingTick]" + pairID, err := dextypes.NewPairIDFromUnsorted(args[0], args[1]) + if err != nil { + return &types.MsgCreateGauge{}, err + } + + startTick, err := dcli.ParseIntMaybeNegative(args[2], "startTick") + if err != nil { + return &types.MsgCreateGauge{}, err + } + + endTick, err := dcli.ParseIntMaybeNegative(args[3], "endTick") + if err != nil { + return &types.MsgCreateGauge{}, err + } + + coins, err := sdk.ParseCoinsNormalized(args[4]) + if err != nil { + return &types.MsgCreateGauge{}, err + } + + var startTime time.Time + timeStr, err := flags.GetString(FlagStartTime) + if err != nil { + return &types.MsgCreateGauge{}, err + } + if timeStr == "" { // empty start time + startTime = time.Unix(0, 0).UTC() + } else if timeUnix, err := strconv.ParseInt(timeStr, 10, 64); err == nil { // unix time + startTime = time.Unix(timeUnix, 0).UTC() + } else if timeRFC, err := time.Parse(time.RFC3339, timeStr); err == nil { // RFC time + startTime = timeRFC + } else { // invalid input + return &types.MsgCreateGauge{}, errors.New("invalid start time format") + } + + epochs, err := dcli.ParseUint(args[5], "numEpochs") + if err != nil { + return &types.MsgCreateGauge{}, err + } + + perpetual, err := flags.GetBool(FlagPerpetual) + if err != nil { + return &types.MsgCreateGauge{}, err + } + + if perpetual { + epochs = 1 + } + + pricingTick, err := dcli.ParseIntMaybeNegative(args[6], "pricingTick") + if err != nil { + return &types.MsgCreateGauge{}, err + } + + distributeTo := types.QueryCondition{ + PairID: pairID, + StartTick: startTick, + EndTick: endTick, + } + + msg := types.NewMsgCreateGauge( + epochs == 1, + clientCtx.GetFromAddress(), + distributeTo, + coins, + startTime, + epochs, + pricingTick, + ) + + return msg, nil +} + +func NewCreateGaugeCmd() (*dcli.TxCliDesc, *types.MsgCreateGauge) { + return &dcli.TxCliDesc{ + ParseAndBuildMsg: CreateGaugeCmdBuilder, + Use: "create-gauge [pairTokenA] [pairTokenB] [startTick] [endTick] [coins] [numEpochs] [pricingTick]", + Short: "create a gauge to distribute rewards to users", + Long: `{{.Short}}{{.ExampleHeader}} create-gauge TokenA TokenB [-10] 200 100TokenA,200TokenB 6 0 --start-time 2006-01-02T15:04:05Z07:00 --perpetual true`, + Flags: dcli.FlagDesc{OptionalFlags: []*pflag.FlagSet{FlagSetCreateGauge()}}, + NumArgs: 7, + }, &types.MsgCreateGauge{} +} + +func NewAddToGaugeCmd() (*dcli.TxCliDesc, *types.MsgAddToGauge) { + return &dcli.TxCliDesc{ + Use: "add-to-gauge [gauge_id] [coins]", + Short: "add coins to gauge to distribute more rewards to users", + Long: `{{.Short}}{{.ExampleHeader}} add-to-gauge 1 TokenA,TokenB`, + }, &types.MsgAddToGauge{} +} + +func NewStakeCmd() (*dcli.TxCliDesc, *types.MsgStake) { + return &dcli.TxCliDesc{ + Use: "stake-tokens [coins]", + Short: "stake tokens into stake pool from user account", + }, &types.MsgStake{} +} + +func UnstakeCmdBuilder(clientCtx client.Context, args []string, _ *pflag.FlagSet) (sdk.Msg, error) { + // "unstake-tokens [poolID]:[coins] [poolID]:[coins] ..." + unstakes := make([]*types.MsgUnstake_UnstakeDescriptor, 0, len(args)) + for i, unstake := range args { + if strings.HasPrefix(unstake, "-") { + // no more unstakes left, only flags + break + } + + parts := strings.Split(unstake, ":") + if len(parts) != 2 { + return &types.MsgUnstake{}, errors.New("invalid syntax for unstake tokens") + } + poolID, err := dcli.ParseUint(parts[0], fmt.Sprintf("poolID[%d]", i)) + if err != nil { + return &types.MsgUnstake{}, err + } + + coins, err := dcli.ParseCoins(parts[1], fmt.Sprintf("coins[%d]", i)) + if err != nil { + return &types.MsgUnstake{}, err + } + + unstakes = append(unstakes, types.NewMsgUnstakeDescriptor(poolID, coins)) + } + + return types.NewMsgUnstake(clientCtx.GetFromAddress(), unstakes), nil +} + +func NewUnstakeCmd() (*dcli.TxCliDesc, *types.MsgUnstake) { + return &dcli.TxCliDesc{ + Use: "unstake-tokens [poolID]:[coins] [poolID]:[coins] ...", + Short: "Unstake tokens", + ParseAndBuildMsg: UnstakeCmdBuilder, + Long: `{{.Short}}{{.ExampleHeader}} unstake-tokens 1:100TokenA 2:10TokenZ,20TokenB`, + }, &types.MsgUnstake{} +} diff --git a/x/incentives/keeper/account_history.go b/x/incentives/keeper/account_history.go new file mode 100644 index 000000000..27d787b2b --- /dev/null +++ b/x/incentives/keeper/account_history.go @@ -0,0 +1,83 @@ +package keeper + +import ( + "github.com/cosmos/cosmos-sdk/store/prefix" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/gogoproto/proto" + "github.com/neutron-org/neutron/x/incentives/types" +) + +func NewAccountHistory(account string, coins sdk.Coins) *types.AccountHistory { + return &types.AccountHistory{ + Account: account, + Coins: coins, + } +} + +// SetAccountHistory set a specific goodTilRecord in the store from its index +func (k Keeper) SetAccountHistory( + ctx sdk.Context, + accountHistory *types.AccountHistory, +) error { + store := ctx.KVStore(k.storeKey) + b, err := proto.Marshal(accountHistory) + if err != nil { + return err + } + store.Set(types.GetKeyAccountHistory( + accountHistory.Account, + ), b) + return nil +} + +// GetAccountHistory returns a goodTilRecord from its index +func (k Keeper) GetAccountHistory( + ctx sdk.Context, + account string, +) (val *types.AccountHistory, found bool) { + store := ctx.KVStore(k.storeKey) + + b := store.Get(types.GetKeyAccountHistory(account)) + if b == nil { + return val, false + } + + val = &types.AccountHistory{} + err := proto.Unmarshal(b, val) + if err != nil { + panic(err) + } + + return val, true +} + +// RemoveAccountHistory removes a goodTilRecord from the store +func (k Keeper) RemoveAccountHistory( + ctx sdk.Context, + account string, +) { + store := ctx.KVStore(k.storeKey) + store.Delete(types.GetKeyAccountHistory(account)) +} + +// GetAllAccountHistory returns all goodTilRecord +func (k Keeper) GetAllAccountHistory(ctx sdk.Context) (list []*types.AccountHistory) { + store := prefix.NewStore( + ctx.KVStore(k.storeKey), + types.KeyPrefixAccountHistory, + ) + iterator := sdk.KVStorePrefixIterator(store, []byte{}) + + defer iterator.Close() + + for ; iterator.Valid(); iterator.Next() { + val := &types.AccountHistory{} + err := proto.Unmarshal(iterator.Value(), val) + if err != nil { + panic(err) + } + list = append(list, val) + } + + return +} diff --git a/x/incentives/keeper/distribute.go b/x/incentives/keeper/distribute.go new file mode 100644 index 000000000..9dff4b39d --- /dev/null +++ b/x/incentives/keeper/distribute.go @@ -0,0 +1,184 @@ +package keeper + +import ( + "fmt" + "time" + + math_utils "github.com/neutron-org/neutron/utils/math" + dextypes "github.com/neutron-org/neutron/x/dex/types" + "github.com/neutron-org/neutron/x/incentives/types" + + sdk "github.com/cosmos/cosmos-sdk/types" +) + +var _ DistributorKeeper = Keeper{} + +func (k Keeper) ValueForShares(ctx sdk.Context, coin sdk.Coin, tick int64) (sdk.Int, error) { + totalShares := k.bk.GetSupply(ctx, coin.Denom).Amount + poolMetadata, err := k.dk.GetPoolMetadataByDenom(ctx, coin.Denom) + if err != nil { + return sdk.ZeroInt(), err + } + + pool, err := k.dk.GetOrInitPool( + ctx, + poolMetadata.PairID, + poolMetadata.Tick, + poolMetadata.Fee, + ) + if err != nil { + return sdk.ZeroInt(), err + } + amount0, amount1 := pool.RedeemValue(coin.Amount, totalShares) + price1To0Center, err := dextypes.CalcPrice(-1 * tick) + if err != nil { + return sdk.ZeroInt(), err + } + return math_utils.NewPrecDecFromInt(amount0).Add(price1To0Center.MulInt(amount1)).TruncateInt(), nil +} + +// Distribute distributes coins from an array of gauges to all eligible stakes. +func (k Keeper) Distribute(ctx sdk.Context, gauges types.Gauges) (types.DistributionSpec, error) { + distSpec := types.DistributionSpec{} + for _, gauge := range gauges { + gaugeDistSpec, err := k.distributor.Distribute(ctx, gauge, nil) + if err != nil { + return nil, err + } + distSpec = distSpec.Add(gaugeDistSpec) + + err = k.setGauge(ctx, gauge) + if err != nil { + return nil, err + } + if gauge.IsFinishedGauge(ctx.BlockTime()) { + if err := k.moveActiveGaugeToFinishedGauge(ctx, gauge); err != nil { + return nil, err + } + } + } + + ctx.Logger().Debug(fmt.Sprintf("Beginning distribution to %d users", len(distSpec))) + for addr, rewards := range distSpec { + decodedAddr, err := sdk.AccAddressFromBech32(addr) + if err != nil { + return nil, err + } + err = k.bk.SendCoinsFromModuleToAccount( + ctx, + types.ModuleName, + decodedAddr, + rewards) + if err != nil { + return nil, err + } + + // Accumulate to account history + accHistory, found := k.GetAccountHistory(ctx, addr) + if found { + accHistory.Coins = accHistory.Coins.Add(rewards...) + } else { + accHistory = NewAccountHistory(addr, rewards) + } + k.SetAccountHistory(ctx, accHistory) + + // Emit events + ctx.EventManager().EmitEvents(sdk.Events{ + sdk.NewEvent( + types.TypeEvtDistribution, + sdk.NewAttribute(types.AttributeReceiver, addr), + sdk.NewAttribute(types.AttributeAmount, rewards.String()), + ), + }) + } + ctx.Logger().Debug(fmt.Sprintf("Finished Distributing to %d users", len(distSpec))) + k.hooks.AfterEpochDistribution(ctx) + return distSpec, nil +} + +// GetModuleCoinsToBeDistributed returns sum of coins yet to be distributed for all of the module. +func (k Keeper) GetModuleCoinsToBeDistributed(ctx sdk.Context) sdk.Coins { + activeGaugesDistr := k.GetActiveGauges(ctx).GetCoinsRemaining() + upcomingGaugesDistr := k.GetUpcomingGauges(ctx).GetCoinsRemaining() + return activeGaugesDistr.Add(upcomingGaugesDistr...) +} + +// GetModuleDistributedCoins returns sum of coins that have been distributed so far for all of the module. +func (k Keeper) GetModuleDistributedCoins(ctx sdk.Context) sdk.Coins { + activeGaugesDistr := k.GetActiveGauges(ctx).GetCoinsDistributed() + finishedGaugesDistr := k.GetFinishedGauges(ctx).GetCoinsDistributed() + return activeGaugesDistr.Add(finishedGaugesDistr...) +} + +// GetRewardsEstimate returns rewards estimation at a future specific time (by epoch) +// If stakes are nil, it returns the rewards between now and the end epoch associated with address. +// If stakes are not nil, it returns all the rewards for the given stakes between now and end epoch. +func (k Keeper) GetRewardsEstimate( + ctx sdk.Context, + addr sdk.AccAddress, + filterStakes types.Stakes, + numEpochs int64, +) (sdk.Coins, error) { + // if stakes are nil, populate with all stakes associated with the address + if len(filterStakes) == 0 { + filterStakes = k.GetStakesByAccount(ctx, addr) + } + + // for each specified stake get associated pairs + pairSet := map[dextypes.PairID]bool{} + for _, l := range filterStakes { + for _, c := range l.Coins { + poolMetadata, err := k.dk.GetPoolMetadataByDenom(ctx, c.Denom) + if err != nil { + panic("all stakes should be valid deposit denoms") + } + pairSet[*poolMetadata.PairID] = true + } + } + + // for each pair get associated gauges + gauges := types.Gauges{} + for s := range pairSet { + gauges = append(gauges, k.GetGaugesByPair(ctx, &s)...) + } + + // estimate rewards + estimatedRewards := sdk.Coins{} + epochInfo := k.GetEpochInfo(ctx) + + // ensure we don't change storage while doing estimation + cacheCtx, _ := ctx.CacheContext() + for _, gauge := range gauges { + distrBeginEpoch := epochInfo.CurrentEpoch + endEpoch := epochInfo.CurrentEpoch + numEpochs + bstakeTime := ctx.BlockTime() + if gauge.StartTime.After(bstakeTime) { + distrBeginEpoch = epochInfo.CurrentEpoch + 1 + int64( + gauge.StartTime.Sub(bstakeTime)/epochInfo.Duration, + ) + } + + // TODO: Make more efficient by making it possible to call distribute with this + // gaugeStakes := k.GetStakesByQueryCondition(cacheCtx, &gauge.DistributeTo) + gaugeRewards := sdk.Coins{} + for epoch := distrBeginEpoch; epoch <= endEpoch; epoch++ { + epochTime := epochInfo.StartTime.Add( + time.Duration(epoch-epochInfo.CurrentEpoch) * epochInfo.Duration, + ) + if !gauge.IsActiveGauge(epochTime) { + break + } + + futureCtx := cacheCtx.WithBlockTime(epochTime) + distSpec, err := k.distributor.Distribute(futureCtx, gauge, filterStakes) + if err != nil { + return nil, err + } + + gaugeRewards = gaugeRewards.Add(distSpec.GetTotal()...) + } + estimatedRewards = estimatedRewards.Add(gaugeRewards...) + } + + return estimatedRewards, nil +} diff --git a/x/incentives/keeper/distribute_test.go b/x/incentives/keeper/distribute_test.go new file mode 100644 index 000000000..b699bcf2e --- /dev/null +++ b/x/incentives/keeper/distribute_test.go @@ -0,0 +1,362 @@ +package keeper_test + +import ( + "testing" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/stretchr/testify/suite" + + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/neutron-org/neutron/testutil/apptesting" + dextypes "github.com/neutron-org/neutron/x/dex/types" + "github.com/neutron-org/neutron/x/incentives/types" +) + +var _ = suite.TestingSuite(nil) + +type balanceAssertion struct { + addr sdk.AccAddress + balances sdk.Coins +} + +func (suite *KeeperTestSuite) TestValueForShares() { + addrs := apptesting.SetupAddrs(3) + + tests := []struct { + name string + deposits []depositSpec + coin sdk.Coin + tick int64 + expectation sdk.Int + err error + }{ + // gauge 1 gives 3k coins. three stakes, all eligible. 1k coins per stake. + // 1k should go to oneStakeUser and 2k to twoStakeUser. + { + name: "one deposit", + deposits: []depositSpec{ + { + addr: addrs[0], + token0: sdk.NewInt64Coin("TokenA", 10), + token1: sdk.NewInt64Coin("TokenB", 10), + tick: 0, + fee: 1, + }, + }, + coin: sdk.NewInt64Coin(dextypes.NewPoolDenom(0), 20), + tick: 1000, + expectation: sdk.NewInt(21), + }, + { + name: "one deposit: no adjustment", + deposits: []depositSpec{ + { + addr: addrs[0], + token0: sdk.NewInt64Coin("TokenA", 10), + token1: sdk.NewInt64Coin("TokenB", 10), + tick: 0, + fee: 1, + }, + }, + coin: sdk.NewInt64Coin(dextypes.NewPoolDenom(0), 20), + tick: 0, + expectation: sdk.NewInt(20), + }, + { + name: "two deposits: one extraneous", + deposits: []depositSpec{ + { + addr: addrs[0], + token0: sdk.NewInt64Coin("TokenA", 10), + token1: sdk.NewInt64Coin("TokenB", 10), + tick: 0, + fee: 1, + }, + { + addr: addrs[0], + token0: sdk.NewInt64Coin("TokenA", 10), + token1: sdk.NewInt64Coin("TokenB", 10), + tick: 0, + fee: 2, + }, + }, + coin: sdk.NewInt64Coin(dextypes.NewPoolDenom(0), 20), + tick: 1000, + expectation: sdk.NewInt(21), + }, + { + name: "two deposits: both relevant", + deposits: []depositSpec{ + { + addr: addrs[0], + token0: sdk.NewInt64Coin("TokenA", 10), + token1: sdk.NewInt64Coin("TokenB", 10), + tick: 0, + fee: 1, + }, + { + addr: addrs[0], + token0: sdk.NewInt64Coin("TokenA", 10), + token1: sdk.NewInt64Coin("TokenB", 10), + tick: 0, + fee: 1, + }, + }, + coin: sdk.NewInt64Coin(dextypes.NewPoolDenom(0), 20), + tick: 1000, + expectation: sdk.NewInt(21), + }, + } + for _, tc := range tests { + suite.T().Run(tc.name, func(t *testing.T) { + suite.SetupTest() + _ = suite.SetupDeposit(tc.deposits) + value, err := suite.App.IncentivesKeeper.ValueForShares(suite.Ctx, tc.coin, tc.tick) + if tc.err == nil { + require.NoError(t, err) + require.Equal(t, tc.expectation, value) + } else { + require.Error(t, err) + } + }) + } +} + +// TestDistribute tests that when the distribute command is executed on a provided gauge +// that the correct amount of rewards is sent to the correct stake owners. +func (suite *KeeperTestSuite) TestDistribute() { + addrs := apptesting.SetupAddrs(3) + tests := []struct { + name string + addrs []sdk.AccAddress + depositStakeSpecs []depositStakeSpec + gaugeSpecs []gaugeSpec + assertions []balanceAssertion + }{ + { + name: "one gauge", + depositStakeSpecs: []depositStakeSpec{ + { + depositSpecs: []depositSpec{ + { + addr: addrs[0], + token0: sdk.NewInt64Coin("TokenA", 10), + token1: sdk.NewInt64Coin("TokenB", 10), + tick: 0, + fee: 1, + }, + }, + stakeDistEpochOffset: -2, + }, + { + depositSpecs: []depositSpec{ + { + addr: addrs[1], + token0: sdk.NewInt64Coin("TokenA", 10), + token1: sdk.NewInt64Coin("TokenB", 10), + tick: 0, + fee: 1, + }, + }, + stakeDistEpochOffset: -2, + }, + { + depositSpecs: []depositSpec{ + { + addr: addrs[1], + token0: sdk.NewInt64Coin("TokenA", 10), + token1: sdk.NewInt64Coin("TokenB", 10), + tick: 0, + fee: 1, + }, + }, + stakeDistEpochOffset: -2, + }, + }, + gaugeSpecs: []gaugeSpec{ + { + isPerpetual: false, + rewards: sdk.Coins{sdk.NewInt64Coin("reward", 3000)}, + startTick: -10, + endTick: 10, + paidOver: 1, + pricingTick: 0, + }, + }, + assertions: []balanceAssertion{ + {addr: addrs[0], balances: sdk.Coins{sdk.NewInt64Coin("reward", 1000)}}, + {addr: addrs[1], balances: sdk.Coins{sdk.NewInt64Coin("reward", 2000)}}, + }, + }, + { + name: "two gauges", + depositStakeSpecs: []depositStakeSpec{ + { + depositSpecs: []depositSpec{ + { + addr: addrs[0], + token0: sdk.NewInt64Coin("TokenA", 10), + token1: sdk.NewInt64Coin("TokenB", 10), + tick: 0, + fee: 1, + }, + }, + stakeDistEpochOffset: -2, + }, + { + depositSpecs: []depositSpec{ + { + addr: addrs[1], + token0: sdk.NewInt64Coin("TokenA", 10), + token1: sdk.NewInt64Coin("TokenB", 10), + tick: 0, + fee: 1, + }, + }, + stakeDistEpochOffset: -2, + }, + { + depositSpecs: []depositSpec{ + { + addr: addrs[1], + token0: sdk.NewInt64Coin("TokenA", 10), + token1: sdk.NewInt64Coin("TokenB", 10), + tick: 0, + fee: 1, + }, + }, + stakeDistEpochOffset: -2, + }, + { + depositSpecs: []depositSpec{ + { + addr: addrs[0], + token0: sdk.NewInt64Coin("TokenA", 10), + token1: sdk.NewInt64Coin("TokenB", 10), + tick: 0, + fee: 1, + }, + }, + stakeDistEpochOffset: -1, + }, + }, + gaugeSpecs: []gaugeSpec{ + { + isPerpetual: false, + rewards: sdk.Coins{sdk.NewInt64Coin("reward", 3000)}, + startTick: -10, + endTick: 10, + paidOver: 1, + pricingTick: 0, + }, + { + isPerpetual: false, + rewards: sdk.Coins{sdk.NewInt64Coin("reward", 3000)}, + startTick: -10, + endTick: 10, + paidOver: 2, + pricingTick: 0, + }, + }, + assertions: []balanceAssertion{ + {addr: addrs[0], balances: sdk.Coins{sdk.NewInt64Coin("reward", 1500)}}, + {addr: addrs[1], balances: sdk.Coins{sdk.NewInt64Coin("reward", 3000)}}, + }, + }, + { + name: "one stake with adjustment", + depositStakeSpecs: []depositStakeSpec{ + { + depositSpecs: []depositSpec{ + { + addr: addrs[0], + token0: sdk.NewInt64Coin("TokenA", 10), + token1: sdk.NewInt64Coin("TokenB", 10), + tick: 999, + fee: 1, + }, + }, + stakeDistEpochOffset: -2, + }, + { + depositSpecs: []depositSpec{ + { + addr: addrs[1], + token0: sdk.NewInt64Coin("TokenA", 10), + token1: sdk.NewInt64Coin("TokenB", 10), + tick: 999, + fee: 1, + }, + }, + stakeDistEpochOffset: -2, + }, + { + depositSpecs: []depositSpec{ + { + addr: addrs[1], + token0: sdk.NewInt64Coin("TokenA", 10), + token1: sdk.NewInt64Coin("TokenB", 10), + tick: 999, + fee: 50, + }, + }, + stakeDistEpochOffset: -2, + }, + { + depositSpecs: []depositSpec{ + { + addr: addrs[1], + token0: sdk.NewInt64Coin("TokenA", 10), + token1: sdk.NewInt64Coin("TokenB", 10), + tick: 999, + fee: 50, + }, + }, + stakeDistEpochOffset: -1, + }, + }, + gaugeSpecs: []gaugeSpec{ + { + isPerpetual: false, + rewards: sdk.Coins{sdk.NewInt64Coin("reward", 3000)}, + startTick: -1000, + endTick: 1000, + paidOver: 1, + pricingTick: 0, + }, + }, + assertions: []balanceAssertion{ + {addr: addrs[0], balances: sdk.Coins{sdk.NewInt64Coin("reward", 1500)}}, + {addr: addrs[1], balances: sdk.Coins{sdk.NewInt64Coin("reward", 1500)}}, + }, + }, + } + for _, tc := range tests { + suite.T().Run(tc.name, func(t *testing.T) { + suite.SetupTest() + for _, depositSpec := range tc.depositStakeSpecs { + suite.SetupDepositAndStake(depositSpec) + } + gauges := make(types.Gauges, len(tc.gaugeSpecs)) + for i, gaugeSpec := range tc.gaugeSpecs { + gauge := suite.SetupGauge(gaugeSpec) + gauges[i] = gauge + } + _, err := suite.App.IncentivesKeeper.Distribute(suite.Ctx, gauges) + require.NoError(t, err) + // check expected rewards against actual rewards received + for i, assertion := range tc.assertions { + bal := suite.App.BankKeeper.GetAllBalances(suite.Ctx, assertion.addr) + assert.Equal( + t, + assertion.balances.String(), + bal.String(), + "test %v, person %d", + tc.name, + i, + ) + } + }) + } +} diff --git a/x/incentives/keeper/distributor.go b/x/incentives/keeper/distributor.go new file mode 100644 index 000000000..837986dd5 --- /dev/null +++ b/x/incentives/keeper/distributor.go @@ -0,0 +1,91 @@ +package keeper + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/neutron-org/neutron/x/incentives/types" +) + +type DistributorKeeper interface { + ValueForShares(ctx sdk.Context, coin sdk.Coin, tick int64) (sdk.Int, error) + GetStakesByQueryCondition(ctx sdk.Context, distrTo *types.QueryCondition) types.Stakes + StakeCoinsPassingQueryCondition(ctx sdk.Context, stake *types.Stake, distrTo types.QueryCondition) sdk.Coins +} + +type Distributor struct { + keeper DistributorKeeper +} + +func NewDistributor(keeper DistributorKeeper) Distributor { + return Distributor{ + keeper: keeper, + } +} + +func (d Distributor) Distribute( + ctx sdk.Context, + gauge *types.Gauge, + filterStakes types.Stakes, +) (types.DistributionSpec, error) { + if !gauge.IsActiveGauge(ctx.BlockTime()) { + return nil, types.ErrGaugeNotActive + } + + distSpec := types.DistributionSpec{} + + rewardsNextEpoch := gauge.RewardsNextEpoch() + + adjustedGaugeTotal := sdk.ZeroInt() + + gaugeStakes := d.keeper.GetStakesByQueryCondition(ctx, &gauge.DistributeTo) + if filterStakes == nil { + filterStakes = gaugeStakes + } + + stakeSumCache := make(map[uint64]sdk.Int, len(gaugeStakes)) + for _, stake := range gaugeStakes { + stakeCoins := d.keeper.StakeCoinsPassingQueryCondition(ctx, stake, gauge.DistributeTo) + stakeTotal := sdk.ZeroInt() + for _, stakeCoin := range stakeCoins { + adjustedPositionValue, err := d.keeper.ValueForShares(ctx, stakeCoin, gauge.PricingTick) + if err != nil { + return nil, err + } + stakeTotal = stakeTotal.Add(adjustedPositionValue) + } + adjustedGaugeTotal = adjustedGaugeTotal.Add(stakeTotal) + stakeSumCache[stake.ID] = stakeTotal + } + + if adjustedGaugeTotal.IsZero() { + return distSpec, nil + } + + for _, stake := range filterStakes { + stakeAmt := stakeSumCache[stake.ID] + distCoins := sdk.Coins{} + for _, epochRewards := range rewardsNextEpoch { + // distribution amount = gauge_size * denom_stake_amount / (total_denom_stake_amount * remain_epochs) + amount := sdk.NewDecFromInt(epochRewards.Amount). + Mul(sdk.NewDecFromInt(stakeAmt)). + Quo(sdk.NewDecFromInt(adjustedGaugeTotal)). + TruncateInt() + reward := sdk.Coin{Denom: epochRewards.Denom, Amount: amount} + distCoins = distCoins.Add(reward) + } + + // update the amount for that address + if distCoins.Empty() { + continue + } + + if spec, ok := distSpec[stake.Owner]; ok { + distSpec[stake.Owner] = spec.Add(distCoins...) + } else { + distSpec[stake.Owner] = distCoins + } + } + + gauge.DistributedCoins = gauge.DistributedCoins.Add(rewardsNextEpoch...) + gauge.FilledEpochs++ + return distSpec, nil +} diff --git a/x/incentives/keeper/distributor_test.go b/x/incentives/keeper/distributor_test.go new file mode 100644 index 000000000..a7b0f9895 --- /dev/null +++ b/x/incentives/keeper/distributor_test.go @@ -0,0 +1,140 @@ +package keeper_test + +import ( + "testing" + time "time" + + tmtypes "github.com/cometbft/cometbft/proto/tendermint/types" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/neutron-org/neutron/app" + dextypes "github.com/neutron-org/neutron/x/dex/types" + . "github.com/neutron-org/neutron/x/incentives/keeper" + "github.com/neutron-org/neutron/x/incentives/types" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" +) + +var _ DistributorKeeper = MockKeeper{} + +type MockKeeper struct { + stakes types.Stakes + keeper DistributorKeeper +} + +func NewMockKeeper(keeper DistributorKeeper, stakes types.Stakes) MockKeeper { + return MockKeeper{ + stakes: stakes, + keeper: keeper, + } +} + +func (k MockKeeper) ValueForShares(_ sdk.Context, coin sdk.Coin, tick int64) (sdk.Int, error) { + return coin.Amount.Mul(sdk.NewInt(2)), nil +} + +func (k MockKeeper) GetStakesByQueryCondition( + _ sdk.Context, + distrTo *types.QueryCondition, +) types.Stakes { + return k.stakes +} + +func (k MockKeeper) StakeCoinsPassingQueryCondition(ctx sdk.Context, stake *types.Stake, distrTo types.QueryCondition) sdk.Coins { + return k.keeper.StakeCoinsPassingQueryCondition(ctx, stake, distrTo) +} + +func TestDistributor(t *testing.T) { + app := app.Setup(t, false) + ctx := app.BaseApp.NewContext( + false, + tmtypes.Header{Height: 1, ChainID: "duality-1", Time: time.Now().UTC()}, + ) + + gauge := types.NewGauge( + 1, + false, + types.QueryCondition{ + PairID: &dextypes.PairID{ + Token0: "TokenA", + Token1: "TokenB", + }, + StartTick: -10, + EndTick: 10, + }, + sdk.Coins{sdk.NewCoin("coin1", sdk.NewInt(100))}, + ctx.BlockTime(), + 10, + 0, + sdk.Coins{}, + 0, + ) + rewardPool, _ := app.DexKeeper.GetOrInitPool(ctx, &dextypes.PairID{Token0: "TokenA", Token1: "TokenB"}, 5, 1) + rewardedDenom := rewardPool.GetPoolDenom() + nonRewardPool, _ := app.DexKeeper.GetOrInitPool(ctx, &dextypes.PairID{Token0: "TokenA", Token1: "TokenB"}, 12, 1) + nonRewardedDenom := nonRewardPool.GetPoolDenom() + allStakes := types.Stakes{ + {1, "addr1", ctx.BlockTime(), sdk.Coins{sdk.NewCoin(rewardedDenom, sdk.NewInt(50))}, 0}, + {2, "addr2", ctx.BlockTime(), sdk.Coins{sdk.NewCoin(rewardedDenom, sdk.NewInt(25))}, 0}, + {3, "addr2", ctx.BlockTime(), sdk.Coins{sdk.NewCoin(rewardedDenom, sdk.NewInt(25))}, 0}, + {4, "addr3", ctx.BlockTime(), sdk.Coins{sdk.NewCoin(nonRewardedDenom, sdk.NewInt(50))}, 0}, + } + + distributor := NewDistributor(NewMockKeeper(app.IncentivesKeeper, allStakes)) + + testCases := []struct { + name string + timeOffset time.Duration + filterStakes types.Stakes + expected types.DistributionSpec + expectedErr error + }{ + { + name: "Error case: gauge not active", + timeOffset: -1 * time.Minute, + filterStakes: allStakes, + expected: nil, + expectedErr: types.ErrGaugeNotActive, + }, + { + name: "Successful case: distribute to all stakes", + timeOffset: 0, + filterStakes: allStakes, + expected: types.DistributionSpec{ + "addr1": sdk.Coins{sdk.NewCoin("coin1", sdk.NewInt(5))}, + "addr2": sdk.Coins{sdk.NewCoin("coin1", sdk.NewInt(4))}, + }, + expectedErr: nil, + }, + { + name: "Successful case: distribute to one stake", + timeOffset: 0, + filterStakes: types.Stakes{allStakes[0]}, + expected: types.DistributionSpec{ + "addr1": sdk.Coins{sdk.NewCoin("coin1", sdk.NewInt(5))}, + }, + expectedErr: nil, + }, + { + name: "No distribution: empty filterStakes", + filterStakes: types.Stakes{}, + expected: types.DistributionSpec{}, + expectedErr: nil, + }, + } + + for _, tc := range testCases { + t.Run(tc.name, func(t *testing.T) { + distSpec, err := distributor.Distribute( + ctx.WithBlockTime(ctx.BlockTime().Add(tc.timeOffset)), + &gauge, + tc.filterStakes, + ) + if tc.expectedErr != nil { + assert.Equal(t, tc.expectedErr, err) + } else { + require.NoError(t, err) + } + assert.Equal(t, tc.expected, distSpec) + }) + } +} diff --git a/x/incentives/keeper/export_test.go b/x/incentives/keeper/export_test.go new file mode 100644 index 000000000..71baec5fe --- /dev/null +++ b/x/incentives/keeper/export_test.go @@ -0,0 +1,44 @@ +package keeper + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" + + "github.com/neutron-org/neutron/x/incentives/types" +) + +// AddGaugeRefByKey appends the provided gauge ID into an array associated with the provided key. +func (k Keeper) AddRefByKey(ctx sdk.Context, key []byte, gaugeID uint64) error { + return k.addRefByKey(ctx, key, gaugeID) +} + +// DeleteGaugeRefByKey removes the provided gauge ID from an array associated with the provided key. +func (k Keeper) DeleteRefByKey(ctx sdk.Context, key []byte, guageID uint64) error { + return k.deleteRefByKey(ctx, key, guageID) +} + +// GetGaugeRefs returns the gauge IDs specified by the provided key. +func (k Keeper) GetRefs(ctx sdk.Context, key []byte) []uint64 { + return k.getRefs(ctx, key) +} + +// MoveUpcomingGaugeToActiveGauge moves a gauge that has reached it's start time from an upcoming to an active status. +func (k Keeper) MoveUpcomingGaugeToActiveGauge(ctx sdk.Context, gauge *types.Gauge) error { + return k.moveUpcomingGaugeToActiveGauge(ctx, gauge) +} + +// MoveActiveGaugeToFinishedGauge moves a gauge that has completed its distribution from an active to a finished status. +func (k Keeper) MoveActiveGaugeToFinishedGauge(ctx sdk.Context, gauge *types.Gauge) error { + return k.moveActiveGaugeToFinishedGauge(ctx, gauge) +} + +func (k Keeper) GetStakeRefKeys(ctx sdk.Context, stake *types.Stake) ([][]byte, error) { + return k.getStakeRefKeys(ctx, stake) +} + +func RemoveValue(ids []uint64, id uint64) ([]uint64, int) { + return removeValue(ids, id) +} + +func FindIndex(ids []uint64, id uint64) int { + return findIndex(ids, id) +} diff --git a/x/incentives/keeper/gas_test.go b/x/incentives/keeper/gas_test.go new file mode 100644 index 000000000..70d052fa7 --- /dev/null +++ b/x/incentives/keeper/gas_test.go @@ -0,0 +1,77 @@ +package keeper_test + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" +) + +var ( + defaultAddr sdk.AccAddress = sdk.AccAddress([]byte("addr1---------------")) + defaultCoins sdk.Coins = sdk.Coins{sdk.NewInt64Coin("stake", 10)} +) + +// func (suite *KeeperTestSuite) measureStakeGas(addr sdk.AccAddress, coins sdk.Coins, dur time.Duration) uint64 { +// // fundAccount outside of gas measurement +// suite.FundAcc(addr, coins) +// // start measuring gas +// alreadySpent := suite.Ctx.GasMeter().GasConsumed() +// _, err := suite.App.IncentivesKeeper.CreateStake(suite.Ctx, addr, coins, dur) +// suite.Require().NoError(err) +// newSpent := suite.Ctx.GasMeter().GasConsumed() +// spentNow := newSpent - alreadySpent +// return spentNow +// } + +// func (suite *KeeperTestSuite) measureAvgAndMaxStakeGas( +// numIterations int, +// addr sdk.AccAddress, +// coinsFn func(int) sdk.Coins, +// durFn func(int) time.Duration, +// ) (avg uint64, maxGas uint64) { +// runningTotal := uint64(0) +// maxGas = uint64(0) +// for i := 1; i <= numIterations; i++ { +// stakeGas := suite.measureStakeGas(addr, coinsFn(i), durFn(i)) +// runningTotal += stakeGas +// if stakeGas > maxGas { +// maxGas = stakeGas +// // fmt.Println(suite.Ctx.GasMeter().String()) +// } +// } +// avg = runningTotal / uint64(numIterations) +// return avg, maxGas +// } + +// // This maintains hard coded gas test vector changes, +// // so we can easily track changes +// func (suite *KeeperTestSuite) TestRepeatedStakeTokensGas() { +// suite.SetupTest() + +// coinsFn := func(int) sdk.Coins { return defaultCoins } +// durFn := func(int) time.Duration { return time.Second } +// startAveragingAt := 1000 +// totalNumStakes := 10000 + +// firstStakeGasAmount := suite.measureStakeGas(defaultAddr, defaultCoins, time.Second) +// suite.Assert().LessOrEqual(int(firstStakeGasAmount), 100000) + +// for i := 1; i < startAveragingAt; i++ { +// suite.SetupStake(defaultAddr, defaultCoins) +// } +// avgGas, maxGas := suite.measureAvgAndMaxStakeGas(totalNumStakes-startAveragingAt, defaultAddr, coinsFn, durFn) +// fmt.Printf("test deets: total stakes created %d, begin average at %d\n", totalNumStakes, startAveragingAt) +// suite.Assert().LessOrEqual(int(avgGas), 100000, "average gas / stake") +// suite.Assert().LessOrEqual(int(maxGas), 100000, "max gas / stake") +// } + +// func (suite *KeeperTestSuite) TestRepeatedStakeTokensDistinctDurationGas() { +// suite.SetupTest() + +// coinsFn := func(int) sdk.Coins { return defaultCoins } +// durFn := func(i int) time.Duration { return time.Duration(i+1) * time.Second } +// totalNumStakes := 10000 + +// avgGas, maxGas := suite.measureAvgAndMaxStakeGas(totalNumStakes, defaultAddr, coinsFn, durFn) +// fmt.Printf("test deets: total stakes created %d\n", totalNumStakes) +// suite.Assert().LessOrEqual(int(avgGas), 150000, "average gas / stake") +// suite.Assert().LessOrEqual(int(maxGas), 300000, "max gas / stake") +// } diff --git a/x/incentives/keeper/gauge.go b/x/incentives/keeper/gauge.go new file mode 100644 index 000000000..3ffa3c7ca --- /dev/null +++ b/x/incentives/keeper/gauge.go @@ -0,0 +1,309 @@ +package keeper + +import ( + "encoding/json" + "errors" + "fmt" + "time" + + db "github.com/cometbft/cometbft-db" + "github.com/cosmos/gogoproto/proto" + + dextypes "github.com/neutron-org/neutron/x/dex/types" + epochtypes "github.com/neutron-org/neutron/x/epochs/types" + "github.com/neutron-org/neutron/x/incentives/types" + + sdk "github.com/cosmos/cosmos-sdk/types" +) + +// GetLastGaugeID returns the last used gauge ID. +func (k Keeper) GetLastGaugeID(ctx sdk.Context) uint64 { + store := ctx.KVStore(k.storeKey) + + bz := store.Get(types.KeyLastGaugeID) + if bz == nil { + return 0 + } + + return sdk.BigEndianToUint64(bz) +} + +// SetLastGaugeID sets the last used gauge ID to the provided ID. +func (k Keeper) SetLastGaugeID(ctx sdk.Context, id uint64) { + store := ctx.KVStore(k.storeKey) + store.Set(types.KeyLastGaugeID, sdk.Uint64ToBigEndian(id)) +} + +// getGaugesFromIterator iterates over everything in a gauge's iterator, until it reaches the end. Return all gauges iterated over. +func (k Keeper) getGaugesFromIterator(ctx sdk.Context, iterator db.Iterator) types.Gauges { + gauges := []*types.Gauge{} + defer iterator.Close() + for ; iterator.Valid(); iterator.Next() { + gaugeIDs := []uint64{} + err := json.Unmarshal(iterator.Value(), &gaugeIDs) + if err != nil { + panic(err) + } + for _, gaugeID := range gaugeIDs { + gauge, err := k.GetGaugeByID(ctx, gaugeID) + if err != nil { + panic(err) + } + gauges = append(gauges, gauge) + } + } + return gauges +} + +func (k Keeper) setGaugeRefs(ctx sdk.Context, gauge *types.Gauge) error { + if gauge.IsUpcomingGauge(ctx.BlockTime()) { + if err := k.addRefByKey(ctx, types.CombineKeys(types.KeyPrefixGaugeIndexUpcoming, types.GetTimeKey(gauge.StartTime)), gauge.Id); err != nil { + return err + } + err := k.addRefByKey( + ctx, + types.GetKeyGaugeIndexByPair(gauge.DistributeTo.PairID.CanonicalString()), + gauge.Id, + ) + if err != nil { + return err + } + } else if gauge.IsActiveGauge(ctx.BlockTime()) { + err := k.addRefByKey(ctx, types.CombineKeys(types.KeyPrefixGaugeIndexActive, types.GetTimeKey(gauge.StartTime)), gauge.Id) + if err != nil { + return err + } + err = k.addRefByKey(ctx, types.GetKeyGaugeIndexByPair(gauge.DistributeTo.PairID.CanonicalString()), gauge.Id) + if err != nil { + return err + } + } else { // finished gauge + err := k.addRefByKey(ctx, types.CombineKeys(types.KeyPrefixGaugeIndexFinished, types.GetTimeKey(gauge.StartTime)), gauge.Id) + if err != nil { + return err + } + } + return nil +} + +// setGauge set the gauge inside store. +func (k Keeper) setGauge(ctx sdk.Context, gauge *types.Gauge) error { + store := ctx.KVStore(k.storeKey) + bz, err := proto.Marshal(gauge) + if err != nil { + return err + } + store.Set(types.GetKeyGaugeStore(gauge.Id), bz) + return nil +} + +// CreateGauge creates a gauge and sends coins to the gauge. +func (k Keeper) CreateGauge( + ctx sdk.Context, + isPerpetual bool, + owner sdk.AccAddress, + coins sdk.Coins, + distrTo types.QueryCondition, + startTime time.Time, + numEpochsPaidOver uint64, + pricingTick int64, +) (*types.Gauge, error) { + numGauges := k.GetLastGaugeID(ctx) + params := k.GetParams(ctx) + if params.MaxGauges < numGauges+1 { + return nil, types.ErrMaxGaugesReached + } + + // Perhaps overly defensive checks, these validations are also being performed + // in the ValidateBasic() for CreateGaugeMsg. + if dextypes.IsTickOutOfRange(pricingTick) { + return nil, types.ErrGaugePricingTickOutOfRange + } + + if dextypes.IsTickOutOfRange(distrTo.StartTick) { + return nil, types.ErrGaugeDistrToTickOutOfRange + } + + if dextypes.IsTickOutOfRange(distrTo.EndTick) { + return nil, types.ErrGaugeDistrToTickOutOfRange + } + + gauge := &types.Gauge{ + Id: numGauges + 1, + IsPerpetual: isPerpetual, + DistributeTo: distrTo, + Coins: coins, + StartTime: startTime, + NumEpochsPaidOver: numEpochsPaidOver, + // If this is outside the tick range then the distribution step will fail + PricingTick: pricingTick, + } + + if err := k.bk.SendCoinsFromAccountToModule(ctx, owner, types.ModuleName, gauge.Coins); err != nil { + return nil, err + } + + err := k.setGauge(ctx, gauge) + if err != nil { + return nil, err + } + + k.SetLastGaugeID(ctx, gauge.Id) + + err = k.setGaugeRefs(ctx, gauge) + if err != nil { + return nil, err + } + + k.hooks.AfterCreateGauge(ctx, gauge.Id) + return gauge, nil +} + +// AddToGaugeRewards adds coins to gauge. +func (k Keeper) AddToGaugeRewards( + ctx sdk.Context, + owner sdk.AccAddress, + coins sdk.Coins, + gaugeID uint64, +) error { + gauge, err := k.GetGaugeByID(ctx, gaugeID) + if err != nil { + return err + } + if gauge.IsFinishedGauge(ctx.BlockTime()) { + return errors.New("gauge is already completed") + } + if err := k.bk.SendCoinsFromAccountToModule(ctx, owner, types.ModuleName, coins); err != nil { + return err + } + + gauge.Coins = gauge.Coins.Add(coins...) + err = k.setGauge(ctx, gauge) + if err != nil { + return err + } + k.hooks.AfterAddToGauge(ctx, gauge.Id) + return nil +} + +// GetGaugeByID returns gauge from gauge ID. +func (k Keeper) GetGaugeByID(ctx sdk.Context, gaugeID uint64) (*types.Gauge, error) { + gauge := types.Gauge{} + store := ctx.KVStore(k.storeKey) + gaugeKey := types.GetKeyGaugeStore(gaugeID) + if !store.Has(gaugeKey) { + return nil, fmt.Errorf("gauge with ID %d does not exist", gaugeID) + } + bz := store.Get(gaugeKey) + if err := proto.Unmarshal(bz, &gauge); err != nil { + return nil, err + } + return &gauge, nil +} + +// GetGaugeQualifyingValue returns gauge qualifying value from gauge ID. +func (k Keeper) GetGaugeQualifyingValue(ctx sdk.Context, gaugeID uint64) (uint64, error) { + gauge := types.Gauge{} + store := ctx.KVStore(k.storeKey) + gaugeKey := types.GetKeyGaugeStore(gaugeID) + if !store.Has(gaugeKey) { + return 0, fmt.Errorf("gauge with ID %d does not exist", gaugeID) + } + bz := store.Get(gaugeKey) + if err := proto.Unmarshal(bz, &gauge); err != nil { + return 0, err + } + var value uint64 = 0 + stakes := k.GetStakesByQueryCondition(ctx, &gauge.DistributeTo) + for _, stake := range stakes { + stakeCoins := k.StakeCoinsPassingQueryCondition(ctx, stake, gauge.DistributeTo) + for _, stakeCoin := range stakeCoins { + adjustedPositionValue, err := k.ValueForShares(ctx, stakeCoin, gauge.PricingTick) + if err != nil { + return 0, err + } + value += value + adjustedPositionValue.Uint64() + } + } + return value, nil +} + +// GetGauges returns upcoming, active, and finished gauges. +func (k Keeper) GetGauges(ctx sdk.Context) types.Gauges { + return k.getGaugesFromIterator(ctx, k.iterator(ctx, types.KeyPrefixGaugeIndex)) +} + +// GetNotFinishedGauges returns both upcoming and active gauges. +func (k Keeper) GetNotFinishedGauges(ctx sdk.Context) types.Gauges { + return append(k.GetActiveGauges(ctx), k.GetUpcomingGauges(ctx)...) +} + +// GetEpochInfo returns EpochInfo struct given context. +func (k Keeper) GetEpochInfo(ctx sdk.Context) epochtypes.EpochInfo { + params := k.GetParams(ctx) + return k.ek.GetEpochInfo(ctx, params.DistrEpochIdentifier) +} + +// moveUpcomingGaugeToActiveGauge moves a gauge that has reached it's start time from an upcoming to an active status. +func (k Keeper) moveUpcomingGaugeToActiveGauge(ctx sdk.Context, gauge *types.Gauge) error { + // validation for current time and distribution start time + if ctx.BlockTime().Before(gauge.StartTime) { + return fmt.Errorf( + "gauge is not able to start distribution yet: %s >= %s", + ctx.BlockTime().String(), + gauge.StartTime.String(), + ) + } + + timeKey := types.GetTimeKey(gauge.StartTime) + if err := k.deleteRefByKey(ctx, types.CombineKeys(types.KeyPrefixGaugeIndexUpcoming, timeKey), gauge.Id); err != nil { + return err + } + if err := k.addRefByKey(ctx, types.CombineKeys(types.KeyPrefixGaugeIndexActive, timeKey), gauge.Id); err != nil { + return err + } + return nil +} + +// moveActiveGaugeToFinishedGauge moves a gauge that has completed its distribution from an active to a finished status. +func (k Keeper) moveActiveGaugeToFinishedGauge(ctx sdk.Context, gauge *types.Gauge) error { + timeKey := types.GetTimeKey(gauge.StartTime) + if err := k.deleteRefByKey(ctx, types.CombineKeys(types.KeyPrefixGaugeIndexActive, timeKey), gauge.Id); err != nil { + return err + } + if err := k.addRefByKey(ctx, types.CombineKeys(types.KeyPrefixGaugeIndexFinished, timeKey), gauge.Id); err != nil { + return err + } + err := k.deleteRefByKey( + ctx, + types.GetKeyGaugeIndexByPair(gauge.DistributeTo.PairID.CanonicalString()), + gauge.Id, + ) + if err != nil { + return err + } + k.hooks.AfterFinishDistribution(ctx, gauge.Id) + return nil +} + +// GetActiveGauges returns active gauges. +func (k Keeper) GetActiveGauges(ctx sdk.Context) types.Gauges { + return k.getGaugesFromIterator(ctx, k.iterator(ctx, types.KeyPrefixGaugeIndexActive)) +} + +// GetUpcomingGauges returns upcoming gauges. +func (k Keeper) GetUpcomingGauges(ctx sdk.Context) types.Gauges { + return k.getGaugesFromIterator(ctx, k.iterator(ctx, types.KeyPrefixGaugeIndexUpcoming)) +} + +// GetFinishedGauges returns finished gauges. +func (k Keeper) GetFinishedGauges(ctx sdk.Context) types.Gauges { + return k.getGaugesFromIterator(ctx, k.iterator(ctx, types.KeyPrefixGaugeIndexFinished)) +} + +func (k Keeper) GetGaugesByPair(ctx sdk.Context, pair *dextypes.PairID) []*types.Gauge { + return k.getGaugesFromIterator( + ctx, + k.iterator(ctx, types.GetKeyGaugeIndexByPair(pair.CanonicalString())), + ) +} diff --git a/x/incentives/keeper/gauge_test.go b/x/incentives/keeper/gauge_test.go new file mode 100644 index 000000000..9258f7954 --- /dev/null +++ b/x/incentives/keeper/gauge_test.go @@ -0,0 +1,280 @@ +package keeper_test + +import ( + "testing" + "time" + + "github.com/neutron-org/neutron/testutil/apptesting" + dextypes "github.com/neutron-org/neutron/x/dex/types" + "github.com/neutron-org/neutron/x/incentives/types" + "github.com/stretchr/testify/require" + "github.com/stretchr/testify/suite" + + sdk "github.com/cosmos/cosmos-sdk/types" +) + +var _ = suite.TestingSuite(nil) + +func (suite *KeeperTestSuite) TestGaugeLifecycle() { + addr0 := suite.SetupAddr(0) + + // setup dex deposit and stake of those shares + suite.SetupDepositAndStake(depositStakeSpec{ + depositSpecs: []depositSpec{ + { + addr: addr0, + token0: sdk.NewInt64Coin("TokenA", 10), + token1: sdk.NewInt64Coin("TokenB", 10), + tick: 0, + fee: 1, + }, + }, + stakeDistEpochOffset: -2, + }) + + // setup gauge starting 24 hours in the future + suite.SetupGauge(gaugeSpec{ + startTime: suite.Ctx.BlockTime().Add(24 * time.Hour), + isPerpetual: false, + rewards: sdk.NewCoins(sdk.NewInt64Coin("foocoin", 10)), + paidOver: 2, + startTick: -10, + endTick: 10, + pricingTick: 0, + }) + + // assert that the gauge is not in effect yet by triggering an epoch end before gauge start + suite.App.IncentivesKeeper.AfterEpochEnd(suite.Ctx, "day", 1) + // no distribution yet + require.Equal( + suite.T(), + "0foocoin", + suite.App.BankKeeper.GetBalance(suite.Ctx, addr0, "foocoin").String(), + ) + // assert that gauge state is well-managed + require.Equal(suite.T(), len(suite.QueryServer.GetUpcomingGauges(suite.Ctx)), 1) + require.Equal(suite.T(), len(suite.QueryServer.GetActiveGauges(suite.Ctx)), 0) + require.Equal(suite.T(), len(suite.QueryServer.GetFinishedGauges(suite.Ctx)), 0) + + // advance time to epoch at or after the gauge starts, triggering distribution + suite.Ctx = suite.Ctx.WithBlockTime(suite.Ctx.BlockTime().Add(24 * time.Hour)) + suite.App.IncentivesKeeper.AfterEpochEnd(suite.Ctx, "day", 2) + + // assert that the gauge distributed + require.Equal( + suite.T(), + "5foocoin", + suite.App.BankKeeper.GetBalance(suite.Ctx, addr0, "foocoin").String(), + ) + // assert that gauge state is well-managed + require.Equal(suite.T(), len(suite.QueryServer.GetUpcomingGauges(suite.Ctx)), 0) + require.Equal(suite.T(), len(suite.QueryServer.GetActiveGauges(suite.Ctx)), 1) + require.Equal(suite.T(), len(suite.QueryServer.GetFinishedGauges(suite.Ctx)), 0) + + // advance to next epoch + suite.Ctx = suite.Ctx.WithBlockTime(suite.Ctx.BlockTime().Add(24 * time.Hour)) + suite.App.IncentivesKeeper.AfterEpochEnd(suite.Ctx, "day", 3) + + // assert new distribution + require.Equal( + suite.T(), + "10foocoin", + suite.App.BankKeeper.GetBalance(suite.Ctx, addr0, "foocoin").String(), + ) + // assert that gauge state is well-managed + require.Equal(suite.T(), len(suite.QueryServer.GetUpcomingGauges(suite.Ctx)), 0) + require.Equal(suite.T(), len(suite.QueryServer.GetActiveGauges(suite.Ctx)), 0) + require.Equal(suite.T(), len(suite.QueryServer.GetFinishedGauges(suite.Ctx)), 1) + + // repeat advancing to next epoch until gauge should be finished + suite.Ctx = suite.Ctx.WithBlockTime(suite.Ctx.BlockTime().Add(24 * time.Hour)) + suite.App.IncentivesKeeper.AfterEpochEnd(suite.Ctx, "day", 4) + + // assert no additional distribution from finished gauge + require.Equal( + suite.T(), + "10foocoin", + suite.App.BankKeeper.GetBalance(suite.Ctx, addr0, "foocoin").String(), + ) + // assert that gauge state is well-managed + require.Equal(suite.T(), len(suite.QueryServer.GetUpcomingGauges(suite.Ctx)), 0) + require.Equal(suite.T(), len(suite.QueryServer.GetActiveGauges(suite.Ctx)), 0) + require.Equal(suite.T(), len(suite.QueryServer.GetFinishedGauges(suite.Ctx)), 1) + // fin. +} + +func (suite *KeeperTestSuite) TestGaugeLimit() { + // We set the gauge limit to 20. On the 21st gauge, we should encounter an error. + params := suite.App.IncentivesKeeper.GetParams(suite.Ctx) + params.MaxGauges = 20 + suite.App.IncentivesKeeper.SetParams(suite.Ctx, params) + + addr0 := suite.SetupAddr(0) + + // setup dex deposit and stake of those shares + suite.SetupDepositAndStake(depositStakeSpec{ + depositSpecs: []depositSpec{ + { + addr: addr0, + token0: sdk.NewInt64Coin("TokenA", 10), + token1: sdk.NewInt64Coin("TokenB", 10), + tick: 0, + fee: 1, + }, + }, + stakeDistEpochOffset: -2, + }) + + for i := 0; i < 20; i++ { + // setup gauge starting 24 hours in the future + suite.SetupGauge(gaugeSpec{ + startTime: suite.Ctx.BlockTime().Add(24 * time.Hour), + isPerpetual: false, + rewards: sdk.NewCoins(sdk.NewInt64Coin("foocoin", 10)), + paidOver: 2, + startTick: -10, + endTick: 10, + pricingTick: 0, + }) + } + + addr := sdk.AccAddress([]byte("Gauge_Creation_Addr_")) + + // fund reward tokens + suite.FundAcc(addr, sdk.NewCoins(sdk.NewInt64Coin("foocoin", 10))) + + // create gauge + _, err := suite.App.IncentivesKeeper.CreateGauge( + suite.Ctx, + false, + addr, + sdk.NewCoins(sdk.NewInt64Coin("foocoin", 10)), + types.QueryCondition{ + PairID: &dextypes.PairID{ + Token0: "TokenA", + Token1: "TokenB", + }, + StartTick: -10, + EndTick: 10, + }, + suite.Ctx.BlockTime().Add(24*time.Hour), + 2, + 0, + ) + suite.Require().Error(err) +} + +// TestGaugeCreateFails tests that when the distribute command is executed on a provided bad gauge +// that the step fails gracefully. +func (suite *KeeperTestSuite) TestGaugeCreateFails() { + addrs := apptesting.SetupAddrs(3) + tests := []struct { + name string + addrs []sdk.AccAddress + depositStakeSpecs []depositStakeSpec + gaugeSpecs []gaugeSpec + assertions []balanceAssertion + }{ + { + name: "one stake with bad gauge", + depositStakeSpecs: []depositStakeSpec{ + { + depositSpecs: []depositSpec{ + { + addr: addrs[0], + token0: sdk.NewInt64Coin("TokenA", 10), + token1: sdk.NewInt64Coin("TokenB", 10), + tick: 999, + fee: 1, + }, + }, + stakeDistEpochOffset: -2, + }, + { + depositSpecs: []depositSpec{ + { + addr: addrs[1], + token0: sdk.NewInt64Coin("TokenA", 10), + token1: sdk.NewInt64Coin("TokenB", 10), + tick: 999, + fee: 1, + }, + }, + stakeDistEpochOffset: -2, + }, + { + depositSpecs: []depositSpec{ + { + addr: addrs[1], + token0: sdk.NewInt64Coin("TokenA", 10), + token1: sdk.NewInt64Coin("TokenB", 10), + tick: 999, + fee: 50, + }, + }, + stakeDistEpochOffset: -2, + }, + { + depositSpecs: []depositSpec{ + { + addr: addrs[1], + token0: sdk.NewInt64Coin("TokenA", 10), + token1: sdk.NewInt64Coin("TokenB", 10), + tick: 999, + fee: 50, + }, + }, + stakeDistEpochOffset: -1, + }, + }, + gaugeSpecs: []gaugeSpec{ + { + isPerpetual: false, + rewards: sdk.Coins{sdk.NewInt64Coin("reward", 3000)}, + startTick: -1000, + endTick: 1000, + paidOver: 1, + pricingTick: 9999999, + }, + }, + assertions: []balanceAssertion{ + {addr: addrs[0], balances: sdk.Coins{sdk.NewInt64Coin("reward", 1500)}}, + {addr: addrs[1], balances: sdk.Coins{sdk.NewInt64Coin("reward", 1500)}}, + }, + }, + } + for _, tc := range tests { + suite.T().Run(tc.name, func(t *testing.T) { + suite.SetupTest() + for _, depositSpec := range tc.depositStakeSpecs { + suite.SetupDepositAndStake(depositSpec) + } + for _, s := range tc.gaugeSpecs { + addr := sdk.AccAddress([]byte("Gauge_Creation_Addr_")) + + // fund reward tokens + suite.FundAcc(addr, s.rewards) + + // create gauge + _, err := suite.App.IncentivesKeeper.CreateGauge( + suite.Ctx, + s.isPerpetual, + addr, + s.rewards, + types.QueryCondition{ + PairID: &dextypes.PairID{ + Token0: "TokenA", + Token1: "TokenB", + }, + StartTick: s.startTick, + EndTick: s.endTick, + }, + s.startTime, + s.paidOver, + s.pricingTick, + ) + require.Error(t, err) + } + }) + } +} diff --git a/x/incentives/keeper/genesis.go b/x/incentives/keeper/genesis.go new file mode 100644 index 000000000..1943cd7a1 --- /dev/null +++ b/x/incentives/keeper/genesis.go @@ -0,0 +1,78 @@ +package keeper + +import ( + "fmt" + + sdk "github.com/cosmos/cosmos-sdk/types" + + "github.com/neutron-org/neutron/x/incentives/types" +) + +// InitGenesis initializes the incentives module's state from a provided genesis state. +func (k Keeper) InitGenesis(ctx sdk.Context, genState types.GenesisState) { + k.SetParams(ctx, genState.Params) + if err := k.InitializeAllStakes(ctx, genState.Stakes); err != nil { + panic(err) + } + if err := k.InitializeAllGauges(ctx, genState.Gauges); err != nil { + panic(err) + } + k.SetLastStakeID(ctx, genState.LastStakeId) + k.SetLastGaugeID(ctx, genState.LastGaugeId) + for _, accountHistory := range genState.AccountHistories { + err := k.SetAccountHistory(ctx, accountHistory) + if err != nil { + panic(err) + } + } +} + +// ExportGenesis returns the x/incentives module's exported genesis. +func (k Keeper) ExportGenesis(ctx sdk.Context) *types.GenesisState { + return &types.GenesisState{ + Params: k.GetParams(ctx), + Gauges: k.GetNotFinishedGauges(ctx), + LastGaugeId: k.GetLastGaugeID(ctx), + LastStakeId: k.GetLastStakeID(ctx), + Stakes: k.GetStakes(ctx), + AccountHistories: k.GetAllAccountHistory(ctx), + } +} + +// InitializeAllStakes takes a set of stakes, and initializes state to be storing +// them all correctly. +func (k Keeper) InitializeAllStakes(ctx sdk.Context, stakes types.Stakes) error { + for i, stake := range stakes { + if i%25000 == 0 { + msg := fmt.Sprintf("Reset %d stake refs, cur stake ID %d", i, stake.ID) + ctx.Logger().Info(msg) + } + err := k.setStake(ctx, stake) + if err != nil { + return err + } + + err = k.addStakeRefs(ctx, stake) + if err != nil { + return err + } + } + + return nil +} + +// InitializeAllGauges takes a set of gauges, and initializes state to be storing +// them all correctly. +func (k Keeper) InitializeAllGauges(ctx sdk.Context, gauges types.Gauges) error { + for _, gauge := range gauges { + err := k.setGauge(ctx, gauge) + if err != nil { + return err + } + err = k.setGaugeRefs(ctx, gauge) + if err != nil { + return err + } + } + return nil +} diff --git a/x/incentives/keeper/genesis_test.go b/x/incentives/keeper/genesis_test.go new file mode 100644 index 000000000..efeac77cb --- /dev/null +++ b/x/incentives/keeper/genesis_test.go @@ -0,0 +1,57 @@ +package keeper_test + +import ( + "time" + + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/neutron-org/neutron/testutil/apptesting" + "github.com/neutron-org/neutron/testutil/dex/nullify" + dextypes "github.com/neutron-org/neutron/x/dex/types" + "github.com/neutron-org/neutron/x/incentives/types" + "github.com/stretchr/testify/require" +) + +// TestIncentivesExportGenesis tests export genesis command for the incentives module. +func (suite *KeeperTestSuite) TestGenesis() { + validAddr, _ := apptesting.GenerateTestAddrs() + genesisState := types.GenesisState{ + Params: types.DefaultParams(), + LastStakeId: 10, + Stakes: []*types.Stake{ + { + ID: 0, + Owner: validAddr, + StartTime: time.Time{}, + Coins: sdk.NewCoins(sdk.NewInt64Coin(suite.LPDenom0, 10)), + }, + }, + LastGaugeId: 10, + Gauges: []*types.Gauge{ + { + IsPerpetual: false, + Coins: sdk.Coins{sdk.NewInt64Coin("reward", 3000)}, + DistributeTo: types.QueryCondition{ + StartTick: -10, + EndTick: 10, + PairID: &dextypes.PairID{ + Token0: "TokenA", + Token1: "TokenB", + }, + }, + NumEpochsPaidOver: 1, + PricingTick: 0, + }, + }, + } + suite.App.IncentivesKeeper.InitGenesis(suite.Ctx, genesisState) + got := suite.App.IncentivesKeeper.ExportGenesis(suite.Ctx) + require.NotNil(suite.T(), got) + + nullify.Fill(&genesisState) + nullify.Fill(got) + + require.ElementsMatch(suite.T(), genesisState.Gauges, got.Gauges) + require.ElementsMatch(suite.T(), genesisState.Stakes, got.Stakes) + require.Equal(suite.T(), genesisState.LastStakeId, got.LastStakeId) + require.Equal(suite.T(), genesisState.LastGaugeId, got.LastGaugeId) +} diff --git a/x/incentives/keeper/hooks.go b/x/incentives/keeper/hooks.go new file mode 100644 index 000000000..4fd1c92fa --- /dev/null +++ b/x/incentives/keeper/hooks.go @@ -0,0 +1,60 @@ +package keeper + +import ( + epochstypes "github.com/neutron-org/neutron/x/epochs/types" + + sdk "github.com/cosmos/cosmos-sdk/types" +) + +// BeforeEpochStart is the epoch start hook. +func (k Keeper) BeforeEpochStart(ctx sdk.Context, epochIdentifier string, epochNumber int64) error { + return nil +} + +// AfterEpochEnd is the epoch end hook. +func (k Keeper) AfterEpochEnd(ctx sdk.Context, epochIdentifier string, epochNumber int64) error { + params := k.GetParams(ctx) + if epochIdentifier == params.DistrEpochIdentifier { + // begin distribution if it's start time + gauges := k.GetUpcomingGauges(ctx) + for _, gauge := range gauges { + if gauge.IsActiveGauge(ctx.BlockTime()) { + if err := k.moveUpcomingGaugeToActiveGauge(ctx, gauge); err != nil { + return err + } + } + } + + // distribute due to epoch event + gauges = k.GetActiveGauges(ctx) + _, err := k.Distribute(ctx, gauges) + if err != nil { + return err + } + } + return nil +} + +// ___________________________________________________________________________________________________ + +// Hooks is the wrapper struct for the incentives keeper. +type Hooks struct { + k Keeper +} + +var _ epochstypes.EpochHooks = Hooks{} + +// Hooks returns the hook wrapper struct. +func (k Keeper) Hooks() Hooks { + return Hooks{k} +} + +// BeforeEpochStart is the epoch start hook. +func (h Hooks) BeforeEpochStart(ctx sdk.Context, epochIdentifier string, epochNumber int64) error { + return h.k.BeforeEpochStart(ctx, epochIdentifier, epochNumber) +} + +// AfterEpochEnd is the epoch end hook. +func (h Hooks) AfterEpochEnd(ctx sdk.Context, epochIdentifier string, epochNumber int64) error { + return h.k.AfterEpochEnd(ctx, epochIdentifier, epochNumber) +} diff --git a/x/incentives/keeper/iterator.go b/x/incentives/keeper/iterator.go new file mode 100644 index 000000000..f536fcce0 --- /dev/null +++ b/x/incentives/keeper/iterator.go @@ -0,0 +1,58 @@ +package keeper + +import ( + "encoding/json" + + db "github.com/cometbft/cometbft-db" + "github.com/neutron-org/neutron/x/incentives/types" + + sdk "github.com/cosmos/cosmos-sdk/types" +) + +// iterator returns an iterator over all gauges in the {prefix} space of state. +func (k Keeper) iterator(ctx sdk.Context, prefix []byte) sdk.Iterator { + store := ctx.KVStore(k.storeKey) + return sdk.KVStorePrefixIterator(store, prefix) +} + +// iterator returns an iterator over all gauges in the {prefix} space of state. +func (k Keeper) iteratorStartEnd(ctx sdk.Context, start []byte, end []byte) sdk.Iterator { + store := ctx.KVStore(k.storeKey) + return store.Iterator(start, end) +} + +func UnmarshalRefArray(bz []byte) []uint64 { + ids := []uint64{} + err := json.Unmarshal(bz, &ids) + if err != nil { + panic(err) + } + return ids +} + +// getStakesFromIterator returns an array of single stake units by period defined by the x/stake module. +func (k Keeper) getStakesFromIterator(ctx sdk.Context, iterator db.Iterator) types.Stakes { + stakes := types.Stakes{} + defer iterator.Close() + for ; iterator.Valid(); iterator.Next() { + stakeIDs := UnmarshalRefArray(iterator.Value()) + for _, stakeID := range stakeIDs { + stake, err := k.GetStakeByID(ctx, stakeID) + if err != nil { + panic(err) + } + stakes = append(stakes, stake) + } + } + return stakes +} + +func (k Keeper) getIDsFromIterator(iterator db.Iterator) []uint64 { + allIds := []uint64{} + defer iterator.Close() + for ; iterator.Valid(); iterator.Next() { + ids := UnmarshalRefArray(iterator.Value()) + allIds = append(allIds, ids...) + } + return allIds +} diff --git a/x/incentives/keeper/keeper.go b/x/incentives/keeper/keeper.go new file mode 100644 index 000000000..0b8471250 --- /dev/null +++ b/x/incentives/keeper/keeper.go @@ -0,0 +1,81 @@ +package keeper + +import ( + "fmt" + + "github.com/cometbft/cometbft/libs/log" + + "github.com/neutron-org/neutron/x/incentives/types" + + storetypes "github.com/cosmos/cosmos-sdk/store/types" + sdk "github.com/cosmos/cosmos-sdk/types" + paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" +) + +// Keeper provides a way to manage incentives module storage. +type Keeper struct { + storeKey storetypes.StoreKey + paramSpace paramtypes.Subspace + hooks types.IncentiveHooks + ak types.AccountKeeper + bk types.BankKeeper + ek types.EpochKeeper + dk types.DexKeeper + distributor Distributor + authority string +} + +// NewKeeper returns a new instance of the incentive module keeper struct. +func NewKeeper( + storeKey storetypes.StoreKey, + paramSpace paramtypes.Subspace, + ak types.AccountKeeper, + bk types.BankKeeper, + ek types.EpochKeeper, + dk types.DexKeeper, + authority string, +) *Keeper { + if !paramSpace.HasKeyTable() { + paramSpace = paramSpace.WithKeyTable(types.ParamKeyTable()) + } + + keeper := &Keeper{ + storeKey: storeKey, + paramSpace: paramSpace, + ak: ak, + bk: bk, + ek: ek, + dk: dk, + authority: authority, + } + keeper.distributor = NewDistributor(keeper) + return keeper +} + +// SetHooks sets the incentives hooks. +func (k *Keeper) SetHooks(ih types.IncentiveHooks) *Keeper { + if k.hooks != nil { + panic("cannot set incentive hooks twice") + } + + k.hooks = ih + + return k +} + +// Logger returns a logger instance for the incentives module. +func (k Keeper) Logger(ctx sdk.Context) log.Logger { + return ctx.Logger().With("module", fmt.Sprintf("x/%s", types.ModuleName)) +} + +// GetModuleBalance returns full balance of the module. +func (k Keeper) GetModuleBalance(ctx sdk.Context) sdk.Coins { + acc := k.ak.GetModuleAccount(ctx, types.ModuleName) + return k.bk.GetAllBalances(ctx, acc.GetAddress()) +} + +// GetModuleStakedCoins Returns staked balance of the module. +func (k Keeper) GetModuleStakedCoins(ctx sdk.Context) sdk.Coins { + // all not unstaking + not finished unstaking + return k.GetStakes(ctx).GetCoins() +} diff --git a/x/incentives/keeper/keeper_test.go b/x/incentives/keeper/keeper_test.go new file mode 100644 index 000000000..6017bc4f1 --- /dev/null +++ b/x/incentives/keeper/keeper_test.go @@ -0,0 +1,52 @@ +package keeper_test + +import ( + "testing" + + "github.com/stretchr/testify/suite" + + "github.com/neutron-org/neutron/testutil/apptesting" + dextypes "github.com/neutron-org/neutron/x/dex/types" + "github.com/neutron-org/neutron/x/incentives/keeper" + "github.com/neutron-org/neutron/x/incentives/types" +) + +type KeeperTestSuite struct { + apptesting.KeeperTestHelper + + QueryServer keeper.QueryServer + MsgServer types.MsgServer + LPDenom0 string + LPDenom1 string +} + +// SetupTest sets incentives parameters from the suite's context +func (suite *KeeperTestSuite) SetupTest() { + suite.Setup() + suite.QueryServer = keeper.NewQueryServer(suite.App.IncentivesKeeper) + suite.MsgServer = keeper.NewMsgServerImpl(suite.App.IncentivesKeeper) + pool0, _ := suite.App.DexKeeper.GetOrInitPool(suite.Ctx, + &dextypes.PairID{ + Token0: "TokenA", + Token1: "TokenB", + }, + 0, + 1, + ) + suite.LPDenom0 = pool0.GetPoolDenom() + pool1, _ := suite.App.DexKeeper.GetOrInitPool(suite.Ctx, + &dextypes.PairID{ + Token0: "TokenA", + Token1: "TokenB", + }, + 1, + 1, + ) + suite.LPDenom1 = pool1.GetPoolDenom() + + suite.SetEpochStartTime() +} + +func TestKeeperTestSuite(t *testing.T) { + suite.Run(t, new(KeeperTestSuite)) +} diff --git a/x/incentives/keeper/msg_server.go b/x/incentives/keeper/msg_server.go new file mode 100644 index 000000000..6e7b3671e --- /dev/null +++ b/x/incentives/keeper/msg_server.go @@ -0,0 +1,183 @@ +package keeper + +import ( + "context" + "fmt" + "strconv" + + "cosmossdk.io/errors" + "github.com/neutron-org/neutron/x/incentives/types" + + sdk "github.com/cosmos/cosmos-sdk/types" + sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" +) + +var _ types.MsgServer = msgServer{} + +// msgServer provides a way to reference keeper pointer in the message server interface. +type msgServer struct { + keeper *Keeper +} + +// NewMsgServerImpl returns an instance of MsgServer for the provided keeper. +func NewMsgServerImpl(keeper *Keeper) types.MsgServer { + return &msgServer{ + keeper: keeper, + } +} + +// CreateGauge creates a gauge and sends coins to the gauge. +// Emits create gauge event and returns the create gauge response. +func (server msgServer) CreateGauge( + goCtx context.Context, + msg *types.MsgCreateGauge, +) (*types.MsgCreateGaugeResponse, error) { + if server.keeper.authority != msg.Owner { + return nil, errors.Wrapf( + types.ErrInvalidSigner, + "invalid authority; expected %s, got %s", + server.keeper.authority, + msg.Owner, + ) + } + + ctx := sdk.UnwrapSDKContext(goCtx) + owner, err := sdk.AccAddressFromBech32(msg.Owner) + if err != nil { + return nil, err + } + + gauge, err := server.keeper.CreateGauge( + ctx, + msg.IsPerpetual, + owner, + msg.Coins, + msg.DistributeTo, + msg.StartTime, + msg.NumEpochsPaidOver, + msg.PricingTick, + ) + if err != nil { + return nil, sdkerrors.Wrap(sdkerrors.ErrInvalidRequest, err.Error()) + } + + ctx.EventManager().EmitEvents(sdk.Events{ + sdk.NewEvent( + types.TypeEvtCreateGauge, + sdk.NewAttribute(types.AttributeGaugeID, strconv.FormatUint(gauge.Id, 10)), + ), + }) + + return &types.MsgCreateGaugeResponse{}, nil +} + +// AddToGauge adds coins to gauge. +// Emits add to gauge event and returns the add to gauge response. +func (server msgServer) AddToGauge( + goCtx context.Context, + msg *types.MsgAddToGauge, +) (*types.MsgAddToGaugeResponse, error) { + ctx := sdk.UnwrapSDKContext(goCtx) + owner, err := sdk.AccAddressFromBech32(msg.Owner) + if err != nil { + return nil, err + } + + err = server.keeper.AddToGaugeRewards(ctx, owner, msg.Rewards, msg.GaugeId) + if err != nil { + return nil, sdkerrors.Wrap(sdkerrors.ErrInvalidRequest, err.Error()) + } + + ctx.EventManager().EmitEvents(sdk.Events{ + sdk.NewEvent( + types.TypeEvtAddToGauge, + sdk.NewAttribute(types.AttributeGaugeID, strconv.FormatUint(msg.GaugeId, 10)), + ), + }) + + return &types.MsgAddToGaugeResponse{}, nil +} + +// StakeTokens stakes tokens in either two ways. +// 1. Add to an existing stake if a stake with the same owner and same duration exists. +// 2. Create a new stake if not. +// A sanity check to ensure given tokens is a single token is done in ValidateBaic. +// That is, a stake with multiple tokens cannot be created. +func (server msgServer) Stake( + goCtx context.Context, + msg *types.MsgStake, +) (*types.MsgStakeResponse, error) { + ctx := sdk.UnwrapSDKContext(goCtx) + + owner, err := sdk.AccAddressFromBech32(msg.Owner) + if err != nil { + return nil, err + } + + params := server.keeper.GetParams(ctx) + startDistEpoch := server.keeper.ek.GetEpochInfo(ctx, params.DistrEpochIdentifier).CurrentEpoch + + // if the owner + duration combination is new, create a new stake. + stake, err := server.keeper.CreateStake(ctx, owner, msg.Coins, ctx.BlockTime(), startDistEpoch) + if err != nil { + return nil, err + } + + ctx.EventManager().EmitEvents(sdk.Events{ + sdk.NewEvent( + types.TypeEvtStake, + sdk.NewAttribute(types.AttributeStakeID, strconv.FormatUint(stake.ID, 10)), + sdk.NewAttribute(types.AttributeStakeOwner, stake.Owner), + sdk.NewAttribute(types.AttributeStakeAmount, stake.Coins.String()), + ), + }) + + return &types.MsgStakeResponse{ID: stake.ID}, nil +} + +// BeginUnstaking begins unstaking of the specified stake. +// The stake would enter the unstaking queue, with the endtime of the stake set as block time + duration. +func (server msgServer) Unstake( + goCtx context.Context, + msg *types.MsgUnstake, +) (*types.MsgUnstakeResponse, error) { + ctx := sdk.UnwrapSDKContext(goCtx) + + unstakes := msg.Unstakes + if len(msg.Unstakes) == 0 { + stakes := server.keeper.GetStakesByAccount(ctx, sdk.AccAddress(msg.Owner)) + unstakes = make([]*types.MsgUnstake_UnstakeDescriptor, len(stakes)) + for i, stake := range stakes { + unstakes[i] = &types.MsgUnstake_UnstakeDescriptor{ + ID: stake.ID, + Coins: sdk.NewCoins(), + } + } + } + + for _, unstake := range unstakes { + stake, err := server.keeper.GetStakeByID(ctx, unstake.ID) + if err != nil { + return nil, sdkerrors.Wrap(sdkerrors.ErrInvalidRequest, err.Error()) + } + + if msg.Owner != stake.Owner { + return nil, sdkerrors.Wrap( + types.ErrNotStakeOwner, + fmt.Sprintf( + "msg sender (%s) and stake owner (%s) does not match", + msg.Owner, + stake.Owner, + ), + ) + } + + _, err = server.keeper.Unstake(ctx, stake, unstake.Coins) + if err != nil { + return nil, sdkerrors.Wrap(sdkerrors.ErrInvalidRequest, err.Error()) + } + } + + // N.B. begin unstake event is emitted downstream in the keeper method. + return &types.MsgUnstakeResponse{}, nil +} diff --git a/x/incentives/keeper/params.go b/x/incentives/keeper/params.go new file mode 100644 index 000000000..de175190f --- /dev/null +++ b/x/incentives/keeper/params.go @@ -0,0 +1,18 @@ +package keeper + +import ( + "github.com/neutron-org/neutron/x/incentives/types" + + sdk "github.com/cosmos/cosmos-sdk/types" +) + +// GetParams returns all of the parameters in the incentive module. +func (k Keeper) GetParams(ctx sdk.Context) (params types.Params) { + k.paramSpace.GetParamSet(ctx, ¶ms) + return params +} + +// SetParams sets all of the parameters in the incentive module. +func (k Keeper) SetParams(ctx sdk.Context, params types.Params) { + k.paramSpace.SetParamSet(ctx, ¶ms) +} diff --git a/x/incentives/keeper/query_server.go b/x/incentives/keeper/query_server.go new file mode 100644 index 000000000..6f259ee65 --- /dev/null +++ b/x/incentives/keeper/query_server.go @@ -0,0 +1,267 @@ +package keeper + +import ( + "context" + "encoding/json" + + "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" + + sdk "github.com/cosmos/cosmos-sdk/types" + sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + + dextypes "github.com/neutron-org/neutron/x/dex/types" + "github.com/neutron-org/neutron/x/incentives/types" +) + +var _ types.QueryServer = QueryServer{} + +// QueryServer defines a wrapper around the incentives module keeper providing gRPC method handlers. +type QueryServer struct { + *Keeper +} + +// NewQueryServer creates a new QueryServer struct. +func NewQueryServer(k *Keeper) QueryServer { + return QueryServer{Keeper: k} +} + +func (q QueryServer) GetModuleStatus( + goCtx context.Context, + req *types.GetModuleStatusRequest, +) (*types.GetModuleStatusResponse, error) { + ctx := sdk.UnwrapSDKContext(goCtx) + return &types.GetModuleStatusResponse{ + RewardCoins: q.Keeper.GetModuleCoinsToBeDistributed(ctx), + StakedCoins: q.Keeper.GetModuleStakedCoins(ctx), + Params: q.Keeper.GetParams(ctx), + }, nil +} + +func (q QueryServer) GetGaugeByID( + goCtx context.Context, + req *types.GetGaugeByIDRequest, +) (*types.GetGaugeByIDResponse, error) { + ctx := sdk.UnwrapSDKContext(goCtx) + if req == nil { + return nil, status.Error(codes.InvalidArgument, "empty request") + } + gauge, err := q.Keeper.GetGaugeByID(ctx, req.Id) + if err != nil { + return nil, err + } + return &types.GetGaugeByIDResponse{Gauge: gauge}, nil +} + +func (q QueryServer) GetGaugeQualifyingValue( + goCtx context.Context, + req *types.GetGaugeQualifyingValueRequest, +) (*types.GetGaugeQualifyingValueResponse, error) { + ctx := sdk.UnwrapSDKContext(goCtx) + if req == nil { + return nil, status.Error(codes.InvalidArgument, "empty request") + } + value, err := q.Keeper.GetGaugeQualifyingValue(ctx, req.Id) + if err != nil { + return nil, err + } + return &types.GetGaugeQualifyingValueResponse{QualifyingValue: value}, nil +} + +func (q QueryServer) GetGauges( + goCtx context.Context, + req *types.GetGaugesRequest, +) (*types.GetGaugesResponse, error) { + if req == nil { + return nil, status.Error(codes.InvalidArgument, "empty request") + } + ctx := sdk.UnwrapSDKContext(goCtx) + + var prefix []byte + switch req.Status { + case types.GaugeStatus_ACTIVE_UPCOMING: + prefix = types.KeyPrefixGaugeIndex + case types.GaugeStatus_ACTIVE: + prefix = types.KeyPrefixGaugeIndexActive + case types.GaugeStatus_UPCOMING: + prefix = types.KeyPrefixGaugeIndexUpcoming + case types.GaugeStatus_FINISHED: + prefix = types.KeyPrefixGaugeIndexFinished + default: + return nil, sdkerrors.Wrap(sdkerrors.ErrInvalidRequest, "invalid status filter value") + } + + var lowerTick, upperTick int64 + var poolMetadata *dextypes.PoolMetadata + if req.Denom != "" { + poolMetadata, err := q.dk.GetPoolMetadataByDenom(ctx, req.Denom) + if err != nil { + return nil, err + } + lowerTick = poolMetadata.Tick - int64(poolMetadata.Fee) + upperTick = poolMetadata.Tick + int64(poolMetadata.Fee) + } + + gauges := types.Gauges{} + store := ctx.KVStore(q.Keeper.storeKey) + iterator := sdk.KVStorePrefixIterator(store, prefix) + defer iterator.Close() + + for ; iterator.Valid(); iterator.Next() { + // this may return multiple gauges at once if two gauges start at the same time. + // for now this is treated as an edge case that is not of importance + newGauges, err := q.getGaugeFromIDJsonBytes(ctx, iterator.Value()) + if err != nil { + return nil, err + } + if req.Denom != "" { + for _, gauge := range newGauges { + if *gauge.DistributeTo.PairID != *poolMetadata.PairID { + continue + } + lowerTickInRange := gauge.DistributeTo.StartTick <= lowerTick && + lowerTick <= gauge.DistributeTo.EndTick + upperTickInRange := gauge.DistributeTo.StartTick <= upperTick && + upperTick <= gauge.DistributeTo.EndTick + if !lowerTickInRange || !upperTickInRange { + continue + } + gauges = append(gauges, gauge) + } + } else { + gauges = append(gauges, newGauges...) + } + } + + return &types.GetGaugesResponse{ + Gauges: gauges, + }, nil +} + +func (q QueryServer) GetStakeByID( + goCtx context.Context, + req *types.GetStakeByIDRequest, +) (*types.GetStakeByIDResponse, error) { + if req == nil { + return nil, status.Error(codes.InvalidArgument, "empty request") + } + ctx := sdk.UnwrapSDKContext(goCtx) + stake, err := q.Keeper.GetStakeByID(ctx, req.StakeId) + if err != nil { + return nil, status.Error(codes.Internal, err.Error()) + } + return &types.GetStakeByIDResponse{Stake: stake}, nil +} + +func (q QueryServer) GetStakes( + goCtx context.Context, + req *types.GetStakesRequest, +) (*types.GetStakesResponse, error) { + if req == nil { + return nil, status.Error(codes.InvalidArgument, "empty request") + } + + ctx := sdk.UnwrapSDKContext(goCtx) + hasOwner := len(req.Owner) > 0 + if !hasOwner { + // TODO: Verify this protection is necessary + return nil, status.Error( + codes.InvalidArgument, + "for performance reasons will not return all stakes", + ) + } + + owner, err := sdk.AccAddressFromBech32(req.Owner) + if err != nil { + return nil, err + } + + stakes := q.Keeper.getStakesByAccount(ctx, owner) + return &types.GetStakesResponse{ + Stakes: stakes, + }, nil +} + +func (q QueryServer) GetFutureRewardEstimate( + goCtx context.Context, + req *types.GetFutureRewardEstimateRequest, +) (*types.GetFutureRewardEstimateResponse, error) { + ctx := sdk.UnwrapSDKContext(goCtx) + if req == nil { + return nil, status.Error(codes.InvalidArgument, "empty request") + } + if len(req.Owner) == 0 && len(req.StakeIds) == 0 { + return nil, sdkerrors.Wrap(sdkerrors.ErrInvalidRequest, "empty owner") + } + + if req.NumEpochs > 365 { + return nil, sdkerrors.Wrap(sdkerrors.ErrInvalidRequest, "end epoch out of ranges") + } + + var ownerAddress sdk.AccAddress + if len(req.Owner) != 0 { + owner, err := sdk.AccAddressFromBech32(req.Owner) + if err != nil { + return nil, err + } + ownerAddress = owner + } + + stakes := make(types.Stakes, 0, len(req.StakeIds)) + for _, stakeID := range req.StakeIds { + stake, err := q.Keeper.GetStakeByID(ctx, stakeID) + if err != nil { + return nil, err + } + stakes = append(stakes, stake) + } + + rewards, err := q.Keeper.GetRewardsEstimate(ctx, ownerAddress, stakes, req.NumEpochs) + if err != nil { + return nil, err + } + return &types.GetFutureRewardEstimateResponse{Coins: rewards}, nil +} + +func (q QueryServer) GetAccountHistory( + goCtx context.Context, + req *types.GetAccountHistoryRequest, +) (*types.GetAccountHistoryResponse, error) { + if req == nil { + return nil, status.Error(codes.InvalidArgument, "empty request") + } + ctx := sdk.UnwrapSDKContext(goCtx) + accountHistory, found := q.Keeper.GetAccountHistory(ctx, req.Account) + if !found { + return nil, status.Error( + codes.NotFound, + "Could not locate an account history with that address", + ) + } + return &types.GetAccountHistoryResponse{Coins: accountHistory.Coins}, nil +} + +// getGaugeFromIDJsonBytes returns gauges from the json bytes of gaugeIDs. +func (q QueryServer) getGaugeFromIDJsonBytes( + ctx sdk.Context, + refValue []byte, +) (types.Gauges, error) { + gauges := types.Gauges{} + gaugeIDs := []uint64{} + + err := json.Unmarshal(refValue, &gaugeIDs) + if err != nil { + return gauges, err + } + + for _, gaugeID := range gaugeIDs { + gauge, err := q.Keeper.GetGaugeByID(ctx, gaugeID) + if err != nil { + return types.Gauges{}, err + } + + gauges = append(gauges, gauge) + } + + return gauges, nil +} diff --git a/x/incentives/keeper/query_server_test.go b/x/incentives/keeper/query_server_test.go new file mode 100644 index 000000000..1a99a7117 --- /dev/null +++ b/x/incentives/keeper/query_server_test.go @@ -0,0 +1,126 @@ +package keeper_test + +import ( + "time" + + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/neutron-org/neutron/x/incentives/types" + "github.com/stretchr/testify/suite" +) + +var _ = suite.TestingSuite(nil) + +func (suite *KeeperTestSuite) TestGetFutureRewardEstimate() { + addr1 := suite.SetupAddr(0) + suite.SetupDepositAndStake(depositStakeSpec{ + depositSpecs: []depositSpec{ + { + addr: addr1, + token0: sdk.NewInt64Coin("TokenA", 10), + token1: sdk.NewInt64Coin("TokenB", 10), + tick: 0, + fee: 1, + }, + }, + stakeDistEpochOffset: -2, + }) + addr2 := suite.SetupAddr(1) + suite.SetupDepositAndStake(depositStakeSpec{ + depositSpecs: []depositSpec{ + { + addr: addr2, + token0: sdk.NewInt64Coin("TokenA", 10), + token1: sdk.NewInt64Coin("TokenB", 10), + tick: 0, + fee: 1, + }, + }, + stakeDistEpochOffset: -2, + }) + suite.SetupGauge(gaugeSpec{ + isPerpetual: false, + rewards: sdk.NewCoins(sdk.NewInt64Coin("foocoin", 1000)), + paidOver: 100, + startTick: -10, + endTick: 10, + pricingTick: 0, + startTime: suite.Ctx.BlockTime(), + }) + suite.SetupGauge(gaugeSpec{ + isPerpetual: false, + rewards: sdk.NewCoins(sdk.NewInt64Coin("foocoin", 1000)), + paidOver: 100, + startTick: -10, + endTick: 10, + pricingTick: 0, + startTime: suite.Ctx.BlockTime().Add(315 * 24 * time.Hour), + }) + estimate, err := suite.QueryServer.GetFutureRewardEstimate( + suite.GoCtx, + &types.GetFutureRewardEstimateRequest{ + Owner: addr1.String(), + StakeIds: nil, + NumEpochs: 365, + }, + ) + suite.Require().NoError(err) + suite.Require().Equal(sdk.NewCoins(sdk.NewInt64Coin("foocoin", 750)), estimate.Coins) +} + +func (suite *KeeperTestSuite) TestGetGauges() { + addr1 := suite.SetupAddr(0) + suite.SetupDepositAndStake(depositStakeSpec{ + depositSpecs: []depositSpec{ + { + addr: addr1, + token0: sdk.NewInt64Coin("TokenA", 10), + token1: sdk.NewInt64Coin("TokenB", 10), + tick: 0, + fee: 1, + }, + }, + stakeDistEpochOffset: -2, + }) + addr2 := suite.SetupAddr(1) + suite.SetupDepositAndStake(depositStakeSpec{ + depositSpecs: []depositSpec{ + { + addr: addr2, + token0: sdk.NewInt64Coin("TokenA", 10), + token1: sdk.NewInt64Coin("TokenB", 10), + tick: 0, + fee: 1, + }, + }, + stakeDistEpochOffset: -2, + }) + gauge1 := suite.SetupGauge(gaugeSpec{ + isPerpetual: false, + rewards: sdk.NewCoins(sdk.NewInt64Coin("foocoin", 1000)), + paidOver: 100, + startTick: -10, + endTick: 10, + pricingTick: 0, + startTime: suite.Ctx.BlockTime(), + }) + gauge2 := suite.SetupGauge(gaugeSpec{ + isPerpetual: false, + rewards: sdk.NewCoins(sdk.NewInt64Coin("foocoin", 1000)), + paidOver: 100, + startTick: -10, + endTick: 10, + pricingTick: 0, + startTime: suite.Ctx.BlockTime().Add(315 * 24 * time.Hour), + }) + + response, err := suite.QueryServer.GetGauges(suite.GoCtx, &types.GetGaugesRequest{ + Status: types.GaugeStatus_ACTIVE_UPCOMING, + Denom: "", + }) + + suite.Require().NoError(err) + suite.Require().Equal([]*types.Gauge{ + gauge2, + gauge1, + }, response.Gauges) +} diff --git a/x/incentives/keeper/stake.go b/x/incentives/keeper/stake.go new file mode 100644 index 000000000..677494ffa --- /dev/null +++ b/x/incentives/keeper/stake.go @@ -0,0 +1,249 @@ +package keeper + +import ( + "fmt" + "strconv" + "time" + + sdk "github.com/cosmos/cosmos-sdk/types" + sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/gogoproto/proto" + + "github.com/neutron-org/neutron/x/incentives/types" +) + +// GetLastStakeID returns ID used last time. +func (k Keeper) GetLastStakeID(ctx sdk.Context) uint64 { + store := ctx.KVStore(k.storeKey) + + bz := store.Get(types.KeyLastStakeID) + if bz == nil { + return 0 + } + + return sdk.BigEndianToUint64(bz) +} + +// SetLastStakeID save ID used by last stake. +func (k Keeper) SetLastStakeID(ctx sdk.Context, id uint64) { + store := ctx.KVStore(k.storeKey) + store.Set(types.KeyLastStakeID, sdk.Uint64ToBigEndian(id)) +} + +func (k Keeper) Unstake(ctx sdk.Context, stake *types.Stake, coins sdk.Coins) (uint64, error) { + if coins.Empty() { + coins = stake.Coins + } + + if !coins.IsAllLTE(stake.Coins) { + return 0, fmt.Errorf("requested amount to unstake exceeds locked tokens") + } + + // remove existing stake refs from not unlocking queue + err := k.deleteStakeRefs(ctx, stake) + if err != nil { + return 0, err + } + + if len(coins) != 0 && !coins.IsEqual(stake.Coins) { + stake.Coins = stake.Coins.Sub(coins...) + err := k.setStake(ctx, stake) + if err != nil { + return 0, err + } + + // re-add remaining stake refs + err = k.addStakeRefs(ctx, stake) + if err != nil { + return 0, err + } + } else { + k.deleteStake(ctx, stake.ID) + } + + err = k.bk.SendCoinsFromModuleToAccount(ctx, types.ModuleName, stake.OwnerAddress(), coins) + if err != nil { + return 0, err + } + + if k.hooks != nil { + k.hooks.OnTokenUnstaked(ctx, stake.OwnerAddress(), stake.ID, stake.Coins, ctx.BlockTime()) + } + + ctx.EventManager().EmitEvents(sdk.Events{ + sdk.NewEvent( + types.TypeEvtUnstake, + sdk.NewAttribute(types.AttributeStakeID, strconv.FormatUint(stake.ID, 10)), + sdk.NewAttribute(types.AttributeStakeOwner, stake.Owner), + sdk.NewAttribute(types.AttributeStakeStakeTime, stake.StartTime.String()), + sdk.NewAttribute(types.AttributeUnstakedCoins, coins.String()), + ), + }) + + return stake.ID, err +} + +// setStake is a utility to store stake object into the store. +func (k Keeper) setStake(ctx sdk.Context, stake *types.Stake) error { + store := ctx.KVStore(k.storeKey) + bz, err := proto.Marshal(stake) + if err != nil { + return err + } + store.Set(types.GetStakeStoreKey(stake.ID), bz) + return nil +} + +// deleteStake removes the stake object from the state. +func (k Keeper) deleteStake(ctx sdk.Context, id uint64) { + store := ctx.KVStore(k.storeKey) + store.Delete(types.GetStakeStoreKey(id)) +} + +// GetStakeByID Returns stake from stakeID. +func (k Keeper) GetStakeByID(ctx sdk.Context, stakeID uint64) (*types.Stake, error) { + stake := types.Stake{} + store := ctx.KVStore(k.storeKey) + lockKey := types.GetStakeStoreKey(stakeID) + if !store.Has(lockKey) { + return nil, sdkerrors.Wrap( + types.ErrStakeNotFound, + fmt.Sprintf("stake with ID %d does not exist", stakeID), + ) + } + bz := store.Get(lockKey) + err := proto.Unmarshal(bz, &stake) + return &stake, err +} + +// GetAccountStakes Returns the period locks associated to an account. +func (k Keeper) GetStakesByQueryCondition( + ctx sdk.Context, + distrTo *types.QueryCondition, +) types.Stakes { + pairIDString := distrTo.PairID.CanonicalString() + tickStakeIds := k.getIDsFromIterator( + k.iteratorStartEnd( + ctx, + types.GetKeyStakeIndexByPairTick(pairIDString, distrTo.StartTick), + types.GetKeyStakeIndexByPairTick(pairIDString, distrTo.EndTick+1), + ), + ) + + idMemo := make(map[uint64]bool) + for _, id := range tickStakeIds { + idMemo[id] = true + } + + params := k.GetParams(ctx) + curEpoch := k.ek.GetEpochInfo(ctx, params.GetDistrEpochIdentifier()) + timeStakeIds := k.getIDsFromIterator( + k.iteratorStartEnd( + ctx, + types.CombineKeys( + types.KeyPrefixStakeIndexPairDistEpoch, + []byte(pairIDString), + ), + sdk.PrefixEndBytes(types.GetKeyStakeIndexByDistEpoch( + pairIDString, + curEpoch.CurrentEpoch-2, + )), + ), + ) + + resultIds := []uint64{} + for _, id := range timeStakeIds { + if _, ok := idMemo[id]; ok { + resultIds = append(resultIds, id) + } + } + + results := make([]*types.Stake, len(resultIds)) + for i, stakeID := range resultIds { + stake, err := k.GetStakeByID(ctx, stakeID) + if err != nil { + // This represents a db inconsistency + panic(err) + } + results[i] = stake + } + return results +} + +func (k Keeper) GetStakes(ctx sdk.Context) types.Stakes { + return k.getStakesFromIterator(ctx, k.iterator(ctx, types.KeyPrefixStakeIndex)) +} + +func (k Keeper) getStakesByAccount(ctx sdk.Context, acct sdk.AccAddress) types.Stakes { + return k.getStakesFromIterator(ctx, k.iterator(ctx, types.GetKeyStakeIndexByAccount(acct))) +} + +// GetAccountStakes Returns the period locks associated to an account. +func (k Keeper) GetStakesByAccount(ctx sdk.Context, addr sdk.AccAddress) types.Stakes { + return k.getStakesFromIterator(ctx, k.iterator(ctx, types.GetKeyStakeIndexByAccount(addr))) +} + +func (k Keeper) CreateStake( + ctx sdk.Context, + owner sdk.AccAddress, + coins sdk.Coins, + startTime time.Time, + startDistEpoch int64, +) (*types.Stake, error) { + ID := k.GetLastStakeID(ctx) + 1 + + // unlock time is initially set without a value, gets set as unlock start time + duration + // when unlocking starts. + stake := types.NewStake(ID, owner, coins, startTime, startDistEpoch) + + owner, err := sdk.AccAddressFromBech32(stake.Owner) + if err != nil { + return nil, sdkerrors.Wrap(sdkerrors.ErrInvalidRequest, err.Error()) + } + + err = stake.ValidateBasic() + if err != nil { + return nil, sdkerrors.Wrap(sdkerrors.ErrInvalidRequest, err.Error()) + } + + if err := k.bk.SendCoinsFromAccountToModule(ctx, owner, types.ModuleName, stake.Coins); err != nil { + return nil, sdkerrors.Wrap(sdkerrors.ErrInvalidRequest, err.Error()) + } + + // store stake object into the store + err = k.setStake(ctx, stake) + if err != nil { + return nil, sdkerrors.Wrap(sdkerrors.ErrInvalidRequest, err.Error()) + } + + k.hooks.OnTokenStaked(ctx, owner, stake.ID, stake.Coins, ctx.BlockTime()) + k.SetLastStakeID(ctx, stake.ID) + + // add stake refs into not unlocking queue + err = k.addStakeRefs(ctx, stake) + if err != nil { + return nil, sdkerrors.Wrap(sdkerrors.ErrInvalidRequest, err.Error()) + } + + return stake, nil +} + +func (k Keeper) StakeCoinsPassingQueryCondition( + ctx sdk.Context, + stake *types.Stake, + distrTo types.QueryCondition, +) sdk.Coins { + coins := stake.Coins + result := sdk.NewCoins() + for _, c := range coins { + poolMetadata, err := k.dk.GetPoolMetadataByDenom(ctx, c.Denom) + if err != nil { + continue + } + + if distrTo.Test(poolMetadata) { + result = result.Add(c) + } + } + return result +} diff --git a/x/incentives/keeper/stake_refs.go b/x/incentives/keeper/stake_refs.go new file mode 100644 index 000000000..93d9c66d5 --- /dev/null +++ b/x/incentives/keeper/stake_refs.go @@ -0,0 +1,72 @@ +package keeper + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" + dextypes "github.com/neutron-org/neutron/x/dex/types" + "github.com/neutron-org/neutron/x/incentives/types" +) + +// addStakeRefs adds appropriate reference keys preceded by a prefix. +// A prefix indicates whether the stake is unstaking or not. +func (k Keeper) addStakeRefs(ctx sdk.Context, stake *types.Stake) error { + refKeys, err := k.getStakeRefKeys(ctx, stake) + if err != nil { + return err + } + for _, refKey := range refKeys { + if err := k.addRefByKey(ctx, refKey, stake.ID); err != nil { + return err + } + } + return nil +} + +// deleteStakeRefs deletes all the stake references of the stake with the given stake prefix. +func (k Keeper) deleteStakeRefs(ctx sdk.Context, stake *types.Stake) error { + refKeys, err := k.getStakeRefKeys(ctx, stake) + if err != nil { + return err + } + for _, refKey := range refKeys { + err = k.deleteRefByKey(ctx, refKey, stake.ID) + if err != nil { + return err + } + } + return nil +} + +func (k Keeper) getStakeRefKeys(ctx sdk.Context, stake *types.Stake) ([][]byte, error) { + owner, err := sdk.AccAddressFromBech32(stake.Owner) + if err != nil { + return nil, err + } + + refKeys := make(map[string]bool) + refKeys[string(types.KeyPrefixStakeIndex)] = true + refKeys[string(types.CombineKeys(types.KeyPrefixStakeIndexAccount, owner))] = true + + for _, coin := range stake.Coins { + poolMetadata, err := k.dk.GetPoolMetadataByDenom(ctx, coin.Denom) + if err != nil { + panic("Only valid LP tokens should be staked") + } + denomBz := []byte(coin.Denom) + pairIDBz := []byte(poolMetadata.PairID.CanonicalString()) + tickBz := dextypes.TickIndexToBytes(poolMetadata.Tick) + refKeys[string(types.CombineKeys(types.KeyPrefixStakeIndexDenom, denomBz))] = true + refKeys[string(types.CombineKeys(types.KeyPrefixStakeIndexPairTick, pairIDBz, tickBz))] = true + refKeys[string(types.CombineKeys(types.KeyPrefixStakeIndexAccountDenom, owner, denomBz))] = true + refKeys[string(types.CombineKeys( + types.KeyPrefixStakeIndexPairDistEpoch, + pairIDBz, + types.GetKeyInt64(stake.StartDistEpoch), + ))] = true + } + + refKeyBytes := make([][]byte, 0, len(refKeys)) + for k := range refKeys { + refKeyBytes = append(refKeyBytes, []byte(k)) + } + return refKeyBytes, nil +} diff --git a/x/incentives/keeper/stake_test.go b/x/incentives/keeper/stake_test.go new file mode 100644 index 000000000..db858ff8f --- /dev/null +++ b/x/incentives/keeper/stake_test.go @@ -0,0 +1,120 @@ +package keeper_test + +import ( + "github.com/stretchr/testify/suite" + + sdk "github.com/cosmos/cosmos-sdk/types" +) + +var _ = suite.TestingSuite(nil) + +func (suite *KeeperTestSuite) TestStakeLifecycle() { + addr0 := suite.SetupAddr(0) + + // setup dex deposit and stake of those shares + stake := suite.SetupDepositAndStake(depositStakeSpec{ + depositSpecs: []depositSpec{ + { + addr: addr0, + token0: sdk.NewInt64Coin("TokenA", 10), + token1: sdk.NewInt64Coin("TokenB", 10), + tick: 0, + fee: 1, + }, + }, + stakeDistEpochOffset: -2, + }) + + retrievedStake, err := suite.App.IncentivesKeeper.GetStakeByID(suite.Ctx, stake.ID) + suite.Require().NoError(err) + suite.Require().NotNil(retrievedStake) + + // unstake the full amount + suite.App.IncentivesKeeper.Unstake(suite.Ctx, stake, sdk.Coins{}) + balances := suite.App.BankKeeper.GetAllBalances(suite.Ctx, addr0) + suite.Require().Equal(sdk.NewCoins(sdk.NewInt64Coin(suite.LPDenom0, 20)), balances) + _, err = suite.App.IncentivesKeeper.GetStakeByID(suite.Ctx, stake.ID) + // should be deleted + suite.Require().Error(err) +} + +func (suite *KeeperTestSuite) TestMultipleStakeLifecycle() { + addr0 := suite.SetupAddr(0) + + // setup dex deposit and stake of those shares + stake := suite.SetupDepositAndStake(depositStakeSpec{ + depositSpecs: []depositSpec{ + { + addr: addr0, + token0: sdk.NewInt64Coin("TokenA", 10), + token1: sdk.NewInt64Coin("TokenB", 10), + tick: 0, + fee: 1, + }, + { + addr: addr0, + token0: sdk.NewInt64Coin("TokenA", 10), + token1: sdk.NewInt64Coin("TokenB", 10), + tick: 1, + fee: 1, + }, + }, + stakeDistEpochOffset: -2, + }) + + retrievedStake, err := suite.App.IncentivesKeeper.GetStakeByID(suite.Ctx, stake.ID) + suite.Require().NoError(err) + suite.Require().NotNil(retrievedStake) + + // unstake the full amount + suite.App.IncentivesKeeper.Unstake(suite.Ctx, stake, sdk.Coins{}) + balances := suite.App.BankKeeper.GetAllBalances(suite.Ctx, addr0) + suite.Require().Equal( + sdk.NewCoins( + sdk.NewInt64Coin(suite.LPDenom0, 20), + sdk.NewInt64Coin(suite.LPDenom1, 20), + ), balances) + _, err = suite.App.IncentivesKeeper.GetStakeByID(suite.Ctx, stake.ID) + // should be deleted + suite.Require().Error(err) +} + +func (suite *KeeperTestSuite) TestStakeUnstakePartial() { + addr0 := suite.SetupAddr(0) + + // setup dex deposit and stake of those shares + stake := suite.SetupDepositAndStake(depositStakeSpec{ + depositSpecs: []depositSpec{ + { + addr: addr0, + token0: sdk.NewInt64Coin("TokenA", 10), + token1: sdk.NewInt64Coin("TokenB", 10), + tick: 0, + fee: 1, + }, + }, + stakeDistEpochOffset: -2, + }) + + retrievedStake, err := suite.App.IncentivesKeeper.GetStakeByID(suite.Ctx, stake.ID) + suite.Require().NoError(err) + suite.Require().NotNil(retrievedStake) + + // unstake the full amount + _, err = suite.App.IncentivesKeeper.Unstake( + suite.Ctx, + stake, + sdk.Coins{sdk.NewInt64Coin(suite.LPDenom0, 9)}, + ) + suite.Require().NoError(err) + balances := suite.App.BankKeeper.GetAllBalances(suite.Ctx, addr0) + suite.Require().ElementsMatch(sdk.NewCoins(sdk.NewInt64Coin(suite.LPDenom0, 9)), balances) + // should still be accessible + retrievedStake, err = suite.App.IncentivesKeeper.GetStakeByID(suite.Ctx, stake.ID) + suite.Require().NoError(err) + suite.Require().NotNil(retrievedStake) + suite.Require(). + ElementsMatch(sdk.NewCoins(sdk.NewInt64Coin(suite.LPDenom0, 11)), retrievedStake.Coins) + + // fin. +} diff --git a/x/incentives/keeper/store_test.go b/x/incentives/keeper/store_test.go new file mode 100644 index 000000000..0391f90ad --- /dev/null +++ b/x/incentives/keeper/store_test.go @@ -0,0 +1,54 @@ +package keeper_test + +// func (suite *KeeperTestSuite) TestGaugeReferencesManagement() { +// key1 := []byte{0x11} +// key2 := []byte{0x12} + +// suite.SetupTest() + +// // set two gauge references to key 1 and three gauge references to key 2 +// _ = suite.App.IncentivesKeeper.addRefByKey(suite.Ctx, key1, 1) +// _ = suite.App.IncentivesKeeper.addRefByKey(suite.Ctx, key2, 1) +// _ = suite.App.IncentivesKeeper.addRefByKey(suite.Ctx, key1, 2) +// _ = suite.App.IncentivesKeeper.addRefByKey(suite.Ctx, key2, 2) +// _ = suite.App.IncentivesKeeper.addRefByKey(suite.Ctx, key2, 3) + +// // ensure key1 only has 2 entires +// gaugeRefs1 := suite.App.IncentivesKeeper.getRefs(suite.Ctx, key1) +// suite.Require().Equal(len(gaugeRefs1), 2) + +// // ensure key2 only has 3 entries +// gaugeRefs2 := suite.App.IncentivesKeeper.getRefs(suite.Ctx, key2) +// suite.Require().Equal(len(gaugeRefs2), 3) + +// // remove gauge 1 from key2, resulting in a reduction from 3 to 2 entries +// err := suite.App.IncentivesKeeper.deleteRefByKey(suite.Ctx, key2, 1) +// suite.Require().NoError(err) + +// // ensure key2 now only has 2 entires +// gaugeRefs3 := suite.App.IncentivesKeeper.getRefs(suite.Ctx, key2) +// suite.Require().Equal(len(gaugeRefs3), 2) +// } + +// var _ = suite.TestingSuite(nil) + +// func (suite *KeeperTestSuite) TestStakeReferencesManagement() { +// key1 := []byte{0x11} +// key2 := []byte{0x12} + +// suite.SetupTest() +// _ = suite.App.IncentivesKeeper.addRefByKey(suite.Ctx, key1, 1) +// _ = suite.App.IncentivesKeeper.addRefByKey(suite.Ctx, key2, 1) +// _ = suite.App.IncentivesKeeper.addRefByKey(suite.Ctx, key1, 2) +// _ = suite.App.IncentivesKeeper.addRefByKey(suite.Ctx, key2, 2) +// _ = suite.App.IncentivesKeeper.addRefByKey(suite.Ctx, key2, 3) + +// stakeIDs1 := suite.App.IncentivesKeeper.getRefs(suite.Ctx, key1) +// suite.Require().Equal(len(stakeIDs1), 2) +// stakeIDs2 := suite.App.IncentivesKeeper.getRefs(suite.Ctx, key2) +// suite.Require().Equal(len(stakeIDs2), 3) + +// suite.App.IncentivesKeeper.deleteRefByKey(suite.Ctx, key2, 1) +// stakeIDs2 = suite.App.IncentivesKeeper.getRefs(suite.Ctx, key2) +// suite.Require().Equal(len(stakeIDs2), 2) +// } diff --git a/x/incentives/keeper/suite_test.go b/x/incentives/keeper/suite_test.go new file mode 100644 index 000000000..89596b341 --- /dev/null +++ b/x/incentives/keeper/suite_test.go @@ -0,0 +1,123 @@ +package keeper_test + +import ( + "time" + + dextypes "github.com/neutron-org/neutron/x/dex/types" + "github.com/neutron-org/neutron/x/incentives/types" + + sdk "github.com/cosmos/cosmos-sdk/types" +) + +type depositStakeSpec struct { + depositSpecs []depositSpec + stakeDistEpochOffset int // used for simulating the time of staking +} + +type depositSpec struct { + addr sdk.AccAddress + token0 sdk.Coin + token1 sdk.Coin + tick int64 + fee uint64 +} + +type gaugeSpec struct { + isPerpetual bool + rewards sdk.Coins + paidOver uint64 + startTick int64 + endTick int64 + pricingTick int64 + startTime time.Time +} + +// AddToGauge adds coins to the specified gauge. +func (suite *KeeperTestSuite) AddToGauge(coins sdk.Coins, gaugeID uint64) uint64 { + addr := sdk.AccAddress([]byte("addrx---------------")) + suite.FundAcc(addr, coins) + err := suite.App.IncentivesKeeper.AddToGaugeRewards(suite.Ctx, addr, coins, gaugeID) + suite.Require().NoError(err) + return gaugeID +} + +func (suite *KeeperTestSuite) SetupDeposit(ss []depositSpec) sdk.Coins { + shares := sdk.NewCoins() + for _, s := range ss { + suite.FundAcc(s.addr, sdk.Coins{s.token0, s.token1}) + _, _, indivShares, err := suite.App.DexKeeper.DepositCore( + sdk.WrapSDKContext(suite.Ctx), + dextypes.MustNewPairID(s.token0.Denom, s.token1.Denom), + s.addr, + s.addr, + []sdk.Int{s.token0.Amount}, + []sdk.Int{s.token1.Amount}, + []int64{s.tick}, + []uint64{s.fee}, + []*dextypes.DepositOptions{{}}, + ) + suite.Require().NoError(err) + suite.Require().NotEmpty(indivShares) + shares = shares.Add(indivShares...) + } + return shares +} + +func (suite *KeeperTestSuite) SetupDepositAndStake(s depositStakeSpec) *types.Stake { + shares := suite.SetupDeposit(s.depositSpecs) + return suite.SetupStake(s.depositSpecs[0].addr, shares, s.stakeDistEpochOffset) +} + +// StakeTokens stakes tokens for the specified duration +func (suite *KeeperTestSuite) SetupStake( + addr sdk.AccAddress, + shares sdk.Coins, + distEpochOffset int, +) *types.Stake { + params := suite.App.IncentivesKeeper.GetParams(suite.Ctx) + epoch := suite.App.EpochsKeeper.GetEpochInfo(suite.Ctx, params.GetDistrEpochIdentifier()) + stake, err := suite.App.IncentivesKeeper.CreateStake( + suite.Ctx, + addr, + shares, + suite.Ctx.BlockTime(), // irrelevant now + epoch.CurrentEpoch+int64(distEpochOffset), + ) + suite.Require().NoError(err) + return stake +} + +// setupNewGauge creates a gauge with the specified duration. +func (suite *KeeperTestSuite) SetupGauge(s gaugeSpec) *types.Gauge { + addr := sdk.AccAddress([]byte("Gauge_Creation_Addr_")) + + // fund reward tokens + suite.FundAcc(addr, s.rewards) + + // create gauge + gauge, err := suite.App.IncentivesKeeper.CreateGauge( + suite.Ctx, + s.isPerpetual, + addr, + s.rewards, + types.QueryCondition{ + PairID: &dextypes.PairID{ + Token0: "TokenA", + Token1: "TokenB", + }, + StartTick: s.startTick, + EndTick: s.endTick, + }, + s.startTime, + s.paidOver, + s.pricingTick, + ) + suite.Require().NoError(err) + return gauge +} + +func (suite *KeeperTestSuite) SetupGauges(specs []gaugeSpec) { + for _, s := range specs { + suite.SetupGauge(s) + } +} diff --git a/x/incentives/keeper/utils.go b/x/incentives/keeper/utils.go new file mode 100644 index 000000000..9a75f8eb2 --- /dev/null +++ b/x/incentives/keeper/utils.go @@ -0,0 +1,78 @@ +package keeper + +import ( + "encoding/json" + "fmt" + + sdk "github.com/cosmos/cosmos-sdk/types" +) + +// findIndex takes an array of IDs. Then return the index of a specific ID. +func findIndex(ids []uint64, id uint64) int { + for index, inspectID := range ids { + if inspectID == id { + return index + } + } + return -1 +} + +// removeValue takes an array of IDs. Then finds the index of the IDs and remove those IDs from the array. +func removeValue(ids []uint64, id uint64) ([]uint64, int) { + index := findIndex(ids, id) + if index < 0 { + return ids, index + } + ids[index] = ids[len(ids)-1] // set last element to index + return ids[:len(ids)-1], index +} + +// getRefs returns the IDs specified by the provided key. +func (k Keeper) getRefs(ctx sdk.Context, key []byte) []uint64 { + store := ctx.KVStore(k.storeKey) + ids := []uint64{} + if store.Has(key) { + bz := store.Get(key) + err := json.Unmarshal(bz, &ids) + if err != nil { + panic(err) + } + } + return ids +} + +// addRefByKey appends the provided object ID into an array associated with the provided key. +func (k Keeper) addRefByKey(ctx sdk.Context, key []byte, id uint64) error { + store := ctx.KVStore(k.storeKey) + ids := k.getRefs(ctx, key) + if findIndex(ids, id) > -1 { + return fmt.Errorf("object with same ID exists: %d", id) + } + ids = append(ids, id) + bz, err := json.Marshal(ids) + if err != nil { + return err + } + store.Set(key, bz) + return nil +} + +// deleteRefByKey removes the provided object ID from an array associated with the provided key. +func (k Keeper) deleteRefByKey(ctx sdk.Context, key []byte, id uint64) error { + store := ctx.KVStore(k.storeKey) + ids := k.getRefs(ctx, key) + ids, index := removeValue(ids, id) + if index < 0 { + return fmt.Errorf("specific object with ID %d not found by reference %s", id, key) + } + if len(ids) == 0 { + store.Delete(key) + } else { + bz, err := json.Marshal(ids) + if err != nil { + return err + } + store.Set(key, bz) + } + return nil +} diff --git a/x/incentives/keeper/utils_test.go b/x/incentives/keeper/utils_test.go new file mode 100644 index 000000000..95172abc0 --- /dev/null +++ b/x/incentives/keeper/utils_test.go @@ -0,0 +1,126 @@ +package keeper_test + +import ( + "testing" + "time" + + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/stretchr/testify/require" + + "github.com/neutron-org/neutron/app" + dextypes "github.com/neutron-org/neutron/x/dex/types" + . "github.com/neutron-org/neutron/x/incentives/keeper" + "github.com/neutron-org/neutron/x/incentives/types" +) + +func TestCombineKeys(t *testing.T) { + // create three keys, each different byte arrays + key1 := []byte{0x11} + key2 := []byte{0x12} + key3 := []byte{0x13} + + // combine the three keys into a single key + key := types.CombineKeys(key1, key2, key3) + + // three keys plus two separators is equal to a length of 5 + require.Len(t, key, 3+2) + + // ensure the newly created key is made up of the three previous keys (and the two key index separators) + require.Equal(t, key[0], key1[0]) + require.Equal(t, key[1], types.KeyIndexSeparator[0]) + require.Equal(t, key[2], key2[0]) + require.Equal(t, key[3], types.KeyIndexSeparator[0]) + require.Equal(t, key[4], key3[0]) +} + +func TestFindIndex(t *testing.T) { + // create an array of 5 IDs + IDs := []uint64{1, 2, 3, 4, 5} + + // use the FindIndex function to find the index of the respective IDs + // if it doesn't exist, return -1 + require.Equal(t, FindIndex(IDs, 1), 0) + require.Equal(t, FindIndex(IDs, 3), 2) + require.Equal(t, FindIndex(IDs, 5), 4) + require.Equal(t, FindIndex(IDs, 6), -1) +} + +func TestRemoveValue(t *testing.T) { + // create an array of 5 IDs + IDs := []uint64{1, 2, 3, 4, 5} + + // remove an ID + // ensure if ID exists, the length is reduced by one and the index of the removed ID is returned + IDs, index1 := RemoveValue(IDs, 5) + require.Len(t, IDs, 4) + require.Equal(t, index1, 4) + IDs, index2 := RemoveValue(IDs, 3) + require.Len(t, IDs, 3) + require.Equal(t, index2, 2) + IDs, index3 := RemoveValue(IDs, 1) + require.Len(t, IDs, 2) + require.Equal(t, index3, 0) + IDs, index4 := RemoveValue(IDs, 6) + require.Len(t, IDs, 2) + require.Equal(t, index4, -1) +} + +func TestStakeRefKeys(t *testing.T) { + addr1 := sdk.AccAddress([]byte("addr1---------------")) + app := app.Setup(t, false) + ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + + pool1, err := app.DexKeeper.InitPool(ctx, &dextypes.PairID{Token0: "TokenA", Token1: "TokenB"}, 0, 1) + require.NoError(t, err) + + denom1 := pool1.GetPoolDenom() + + pool2, err := app.DexKeeper.InitPool(ctx, &dextypes.PairID{Token0: "TokenA", Token1: "TokenC"}, 0, 1) + require.NoError(t, err) + + denom2 := pool2.GetPoolDenom() + + // empty address and 1 coin + stake1 := types.NewStake( + 1, + sdk.AccAddress{}, + sdk.Coins{sdk.NewInt64Coin(denom1, 10)}, + time.Now(), + 10, + ) + _, err = app.IncentivesKeeper.GetStakeRefKeys(ctx, stake1) + require.Error(t, err) + + // empty address and 2 coins + stake2 := types.NewStake( + 1, + sdk.AccAddress{}, + sdk.Coins{sdk.NewInt64Coin(denom1, 10), sdk.NewInt64Coin(denom2, 1)}, + time.Now(), + 10, + ) + _, err = app.IncentivesKeeper.GetStakeRefKeys(ctx, stake2) + require.Error(t, err) + + // not empty address and 1 coin + stake3 := types.NewStake(1, addr1, sdk.Coins{sdk.NewInt64Coin(denom1, 10)}, time.Now(), 10) + keys3, err := app.IncentivesKeeper.GetStakeRefKeys(ctx, stake3) + require.Len(t, keys3, 6) + + // not empty address and empty coin + stake4 := types.NewStake(1, addr1, sdk.Coins{sdk.NewInt64Coin(denom1, 10)}, time.Now(), 10) + keys4, err := app.IncentivesKeeper.GetStakeRefKeys(ctx, stake4) + require.Len(t, keys4, 6) + + // not empty address and 2 coins + stake5 := types.NewStake( + 1, + addr1, + sdk.Coins{sdk.NewInt64Coin(denom1, 10), sdk.NewInt64Coin(denom2, 1)}, + time.Now(), + 10, + ) + keys5, err := app.IncentivesKeeper.GetStakeRefKeys(ctx, stake5) + require.Len(t, keys5, 10) +} diff --git a/x/incentives/module.go b/x/incentives/module.go new file mode 100644 index 000000000..6340f41a2 --- /dev/null +++ b/x/incentives/module.go @@ -0,0 +1,212 @@ +/* +Incentives module provides general interface to give yield to stakers. The yield to be given +to stakers are stored in gauges and is distributed on epoch basis +to the stakers who meet specific conditions. + - Gauge queries, gauge creation and add tokens to gauge + - Upcoming-gauges related queries + - Gauge infos and gauge queues +*/package incentives + +import ( + "context" + "encoding/json" + "fmt" + + abci "github.com/cometbft/cometbft/abci/types" + "github.com/gorilla/mux" + "github.com/grpc-ecosystem/grpc-gateway/runtime" + "github.com/spf13/cobra" + + "github.com/cosmos/cosmos-sdk/client" + "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/module" + simtypes "github.com/cosmos/cosmos-sdk/types/simulation" + "github.com/cosmos/cosmos-sdk/x/gov/simulation" + stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" + + "github.com/neutron-org/neutron/x/incentives/client/cli" + "github.com/neutron-org/neutron/x/incentives/keeper" + "github.com/neutron-org/neutron/x/incentives/types" +) + +var ( + _ module.AppModule = AppModule{} + _ module.AppModuleBasic = AppModuleBasic{} +) + +// ---------------------------------------------------------------------------- +// AppModuleBasic +// ---------------------------------------------------------------------------- + +// Implements the AppModuleBasic interface for the module. +type AppModuleBasic struct{} + +// NewAppModuleBasic creates a new AppModuleBasic struct. +func NewAppModuleBasic() AppModuleBasic { + return AppModuleBasic{} +} + +// Name returns the module's name. +func (AppModuleBasic) Name() string { + return types.ModuleName +} + +// RegisterLegacyAminoCodec registers the module's types on the LegacyAmino codec. +func (AppModuleBasic) RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) { + types.RegisterCodec(cdc) +} + +// RegisterInterfaces registers the module's interface types. +func (a AppModuleBasic) RegisterInterfaces(reg cdctypes.InterfaceRegistry) { + types.RegisterInterfaces(reg) +} + +// DefaultGenesis returns the module's default genesis state. +func (AppModuleBasic) DefaultGenesis(cdc codec.JSONCodec) json.RawMessage { + return cdc.MustMarshalJSON(types.DefaultGenesis()) +} + +// ValidateGenesis performs genesis state validation for the module. +func (AppModuleBasic) ValidateGenesis( + cdc codec.JSONCodec, + config 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() +} + +// RegisterRESTRoutes registers the module's REST service handlers. +func (AppModuleBasic) RegisterRESTRoutes(clientCtx client.Context, rtr *mux.Router) { +} + +// RegisterGRPCGatewayRoutes registers the gRPC Gateway routes for the module. +func (AppModuleBasic) RegisterGRPCGatewayRoutes(clientCtx client.Context, mux *runtime.ServeMux) { + if err := types.RegisterQueryHandlerClient(context.Background(), mux, types.NewQueryClient(clientCtx)); err != nil { + return + } +} + +// GetTxCmd returns the module's root tx command. +func (a AppModuleBasic) GetTxCmd() *cobra.Command { + return cli.GetTxCmd() +} + +// GetQueryCmd returns the module's root query command. +func (AppModuleBasic) GetQueryCmd() *cobra.Command { + return cli.GetQueryCmd() +} + +// ---------------------------------------------------------------------------- +// AppModule +// ---------------------------------------------------------------------------- + +// AppModule implements the AppModule interface for the module. +type AppModule struct { + AppModuleBasic + + keeper *keeper.Keeper + + accountKeeper stakingtypes.AccountKeeper + bankKeeper stakingtypes.BankKeeper + epochKeeper types.EpochKeeper +} + +// NewAppModule creates a new AppModule struct. +func NewAppModule(keeper *keeper.Keeper, + accountKeeper stakingtypes.AccountKeeper, bankKeeper stakingtypes.BankKeeper, + epochKeeper types.EpochKeeper, +) AppModule { + return AppModule{ + AppModuleBasic: NewAppModuleBasic(), + keeper: keeper, + accountKeeper: accountKeeper, + bankKeeper: bankKeeper, + epochKeeper: epochKeeper, + } +} + +// Name returns the module's name. +func (am AppModule) Name() string { + return am.AppModuleBasic.Name() +} + +// QuerierRoute returns the module's query routing key. +func (AppModule) QuerierRoute() string { return types.QuerierRoute } + +// RegisterServices registers the module's services. +func (am AppModule) RegisterServices(cfg module.Configurator) { + types.RegisterMsgServer(cfg.MsgServer(), keeper.NewMsgServerImpl(am.keeper)) + types.RegisterQueryServer(cfg.QueryServer(), keeper.NewQueryServer(am.keeper)) +} + +// RegisterInvariants registers the module's invariants. +func (am AppModule) RegisterInvariants(_ sdk.InvariantRegistry) {} + +// InitGenesis performs the module's genesis initialization. +// Returns an empty ValidatorUpdate array. +func (am AppModule) InitGenesis( + ctx sdk.Context, + cdc codec.JSONCodec, + gs json.RawMessage, +) []abci.ValidatorUpdate { + var genState types.GenesisState + // initialize global index to index in genesis state. + cdc.MustUnmarshalJSON(gs, &genState) + + am.keeper.InitGenesis(ctx, genState) + + return []abci.ValidatorUpdate{} +} + +// ExportGenesis returns the module's exported genesis state as raw JSON bytes. +func (am AppModule) ExportGenesis(ctx sdk.Context, cdc codec.JSONCodec) json.RawMessage { + return cdc.MustMarshalJSON(am.keeper.ExportGenesis(ctx)) +} + +// BeginBlock executes all ABCI BeginBlock logic respective to the module. +func (am AppModule) BeginBlock(_ sdk.Context, _ abci.RequestBeginBlock) {} + +// EndBlock executes all ABCI EndBlock logic respective to the module. +// Returns a nil validatorUpdate struct array. +func (am AppModule) EndBlock(_ sdk.Context, _ abci.RequestEndBlock) []abci.ValidatorUpdate { + return []abci.ValidatorUpdate{} +} + +// AppModuleSimulation functions + +// GenerateGenesisState creates a randomized GenState of the incentives module. +func (AppModule) GenerateGenesisState(simState *module.SimulationState) { + simulation.RandomizedGenState(simState) +} + +// ProposalContents returns nil for governance proposals contents. +// Should eventually be deleted in a future update. +func (AppModule) ProposalContents( + simState module.SimulationState, +) []simtypes.WeightedProposalContent { + return nil +} + +// RegisterStoreDecoder has an unknown purpose. Should eventually be deleted in a future update. +func (am AppModule) RegisterStoreDecoder(sdr sdk.StoreDecoderRegistry) { +} + +// WeightedOperations returns the all the module's operations with their respective weights. +// func (am AppModule) WeightedOperations(simState module.SimulationState) []simtypes.WeightedOperation { +// // return simulation.WeightedOperations( +// // simState.AppParams, simState.Cdc, +// // am.accountKeeper, am.bankKeeper, am.epochKeeper, am.keeper, +// // ) +// // simtypes.NewMsgBasedAction("stake tokens", am.keeper, simulation.RandomMsgStakeTokens), +// // simtypes.NewMsgBasedAction("unstake all tokens", am.keeper, simulation.RandomMsgBeginUnstakingAll), +// // simtypes.NewMsgBasedAction("unstake stake", am.keeper, simulation.RandomMsgBeginUnstaking), +// } + +// ConsensusVersion implements AppModule/ConsensusVersion. +func (AppModule) ConsensusVersion() uint64 { return 1 } diff --git a/x/incentives/types/account.pb.go b/x/incentives/types/account.pb.go new file mode 100644 index 000000000..eb0a043c9 --- /dev/null +++ b/x/incentives/types/account.pb.go @@ -0,0 +1,391 @@ +// Code generated by protoc-gen-gogo. DO NOT EDIT. +// source: dualitylabs/duality/incentives/account.proto + +package types + +import ( + fmt "fmt" + github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" + types "github.com/cosmos/cosmos-sdk/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 + +// Describes the total distributions to an account over time +type Account struct { + // the address of this account + Account string `protobuf:"bytes,1,opt,name=account,proto3" json:"account,omitempty"` + // coins describes the total amount of coins that have been distributed to this user over time + Coins github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,2,rep,name=coins,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"coins"` +} + +func (m *Account) Reset() { *m = Account{} } +func (m *Account) String() string { return proto.CompactTextString(m) } +func (*Account) ProtoMessage() {} +func (*Account) Descriptor() ([]byte, []int) { + return fileDescriptor_2ae6444a4cf54b42, []int{0} +} +func (m *Account) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Account) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Account.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 *Account) XXX_Merge(src proto.Message) { + xxx_messageInfo_Account.Merge(m, src) +} +func (m *Account) XXX_Size() int { + return m.Size() +} +func (m *Account) XXX_DiscardUnknown() { + xxx_messageInfo_Account.DiscardUnknown(m) +} + +var xxx_messageInfo_Account proto.InternalMessageInfo + +func (m *Account) GetAccount() string { + if m != nil { + return m.Account + } + return "" +} + +func (m *Account) GetCoins() github_com_cosmos_cosmos_sdk_types.Coins { + if m != nil { + return m.Coins + } + return nil +} + +func init() { + proto.RegisterType((*Account)(nil), "dualitylabs.duality.incentives.Account") +} + +func init() { + proto.RegisterFile("dualitylabs/duality/incentives/account.proto", fileDescriptor_2ae6444a4cf54b42) +} + +var fileDescriptor_2ae6444a4cf54b42 = []byte{ + // 258 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0x49, 0x29, 0x4d, 0xcc, + 0xc9, 0x2c, 0xa9, 0xcc, 0x49, 0x4c, 0x2a, 0xd6, 0x87, 0xb2, 0xf5, 0x33, 0xf3, 0x92, 0x53, 0xf3, + 0x4a, 0x32, 0xcb, 0x52, 0x8b, 0xf5, 0x13, 0x93, 0x93, 0xf3, 0x4b, 0xf3, 0x4a, 0xf4, 0x0a, 0x8a, + 0xf2, 0x4b, 0xf2, 0x85, 0xe4, 0x90, 0x54, 0xeb, 0x41, 0xd9, 0x7a, 0x08, 0xd5, 0x52, 0x22, 0xe9, + 0xf9, 0xe9, 0xf9, 0x60, 0xa5, 0xfa, 0x20, 0x16, 0x44, 0x97, 0x94, 0x5c, 0x72, 0x7e, 0x71, 0x6e, + 0x7e, 0xb1, 0x7e, 0x52, 0x62, 0x71, 0xaa, 0x7e, 0x99, 0x61, 0x52, 0x6a, 0x49, 0xa2, 0xa1, 0x7e, + 0x72, 0x7e, 0x66, 0x1e, 0x44, 0x5e, 0xa9, 0x8d, 0x91, 0x8b, 0xdd, 0x11, 0x62, 0x8f, 0x90, 0x04, + 0x17, 0x3b, 0xd4, 0x4a, 0x09, 0x46, 0x05, 0x46, 0x0d, 0xce, 0x20, 0x18, 0x57, 0x28, 0x91, 0x8b, + 0x15, 0xa4, 0xa7, 0x58, 0x82, 0x49, 0x81, 0x59, 0x83, 0xdb, 0x48, 0x52, 0x0f, 0x62, 0xaa, 0x1e, + 0xc8, 0x54, 0x3d, 0xa8, 0xa9, 0x7a, 0xce, 0xf9, 0x99, 0x79, 0x4e, 0x06, 0x27, 0xee, 0xc9, 0x33, + 0xac, 0xba, 0x2f, 0xaf, 0x91, 0x9e, 0x59, 0x92, 0x51, 0x9a, 0xa4, 0x97, 0x9c, 0x9f, 0xab, 0x0f, + 0x75, 0x02, 0x84, 0xd2, 0x2d, 0x4e, 0xc9, 0xd6, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, 0x06, 0x6b, 0x28, + 0x0e, 0x82, 0x98, 0xec, 0xe4, 0x73, 0xe2, 0x91, 0x1c, 0xe3, 0x85, 0x47, 0x72, 0x8c, 0x0f, 0x1e, + 0xc9, 0x31, 0x4e, 0x78, 0x2c, 0xc7, 0x70, 0xe1, 0xb1, 0x1c, 0xc3, 0x8d, 0xc7, 0x72, 0x0c, 0x51, + 0x46, 0x48, 0x46, 0x41, 0xfd, 0xad, 0x8b, 0x12, 0x64, 0x15, 0xc8, 0x81, 0x06, 0x36, 0x3a, 0x89, + 0x0d, 0xec, 0x3b, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0x86, 0xe1, 0x38, 0x8e, 0x63, 0x01, + 0x00, 0x00, +} + +func (m *Account) 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 *Account) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Account) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Coins) > 0 { + for iNdEx := len(m.Coins) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Coins[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintAccount(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } + } + if len(m.Account) > 0 { + i -= len(m.Account) + copy(dAtA[i:], m.Account) + i = encodeVarintAccount(dAtA, i, uint64(len(m.Account))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func encodeVarintAccount(dAtA []byte, offset int, v uint64) int { + offset -= sovAccount(v) + base := offset + for v >= 1<<7 { + dAtA[offset] = uint8(v&0x7f | 0x80) + v >>= 7 + offset++ + } + dAtA[offset] = uint8(v) + return base +} +func (m *Account) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Account) + if l > 0 { + n += 1 + l + sovAccount(uint64(l)) + } + if len(m.Coins) > 0 { + for _, e := range m.Coins { + l = e.Size() + n += 1 + l + sovAccount(uint64(l)) + } + } + return n +} + +func sovAccount(x uint64) (n int) { + return (math_bits.Len64(x|1) + 6) / 7 +} +func sozAccount(x uint64) (n int) { + return sovAccount(uint64((x << 1) ^ uint64((int64(x) >> 63)))) +} +func (m *Account) 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 ErrIntOverflowAccount + } + 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: Account: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: Account: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Account", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowAccount + } + 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 ErrInvalidLengthAccount + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthAccount + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Account = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Coins", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowAccount + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthAccount + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthAccount + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Coins = append(m.Coins, types.Coin{}) + if err := m.Coins[len(m.Coins)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipAccount(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthAccount + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func skipAccount(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, ErrIntOverflowAccount + } + 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, ErrIntOverflowAccount + } + 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, ErrIntOverflowAccount + } + 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, ErrInvalidLengthAccount + } + iNdEx += length + case 3: + depth++ + case 4: + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupAccount + } + depth-- + case 5: + iNdEx += 4 + default: + return 0, fmt.Errorf("proto: illegal wireType %d", wireType) + } + if iNdEx < 0 { + return 0, ErrInvalidLengthAccount + } + if depth == 0 { + return iNdEx, nil + } + } + return 0, io.ErrUnexpectedEOF +} + +var ( + ErrInvalidLengthAccount = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowAccount = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupAccount = fmt.Errorf("proto: unexpected end of group") +) diff --git a/x/incentives/types/account_history.pb.go b/x/incentives/types/account_history.pb.go new file mode 100644 index 000000000..daaa35b10 --- /dev/null +++ b/x/incentives/types/account_history.pb.go @@ -0,0 +1,391 @@ +// Code generated by protoc-gen-gogo. DO NOT EDIT. +// source: duality/incentives/account_history.proto + +package types + +import ( + fmt "fmt" + github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" + types "github.com/cosmos/cosmos-sdk/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 + +// Describes the total distributions to an account over time +type AccountHistory struct { + // the address of this account + Account string `protobuf:"bytes,1,opt,name=account,proto3" json:"account,omitempty"` + // coins describes the total amount of coins that have been distributed to this user over time + Coins github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,2,rep,name=coins,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"coins"` +} + +func (m *AccountHistory) Reset() { *m = AccountHistory{} } +func (m *AccountHistory) String() string { return proto.CompactTextString(m) } +func (*AccountHistory) ProtoMessage() {} +func (*AccountHistory) Descriptor() ([]byte, []int) { + return fileDescriptor_69dfb106c545010e, []int{0} +} +func (m *AccountHistory) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *AccountHistory) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_AccountHistory.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 *AccountHistory) XXX_Merge(src proto.Message) { + xxx_messageInfo_AccountHistory.Merge(m, src) +} +func (m *AccountHistory) XXX_Size() int { + return m.Size() +} +func (m *AccountHistory) XXX_DiscardUnknown() { + xxx_messageInfo_AccountHistory.DiscardUnknown(m) +} + +var xxx_messageInfo_AccountHistory proto.InternalMessageInfo + +func (m *AccountHistory) GetAccount() string { + if m != nil { + return m.Account + } + return "" +} + +func (m *AccountHistory) GetCoins() github_com_cosmos_cosmos_sdk_types.Coins { + if m != nil { + return m.Coins + } + return nil +} + +func init() { + proto.RegisterType((*AccountHistory)(nil), "duality.incentives.AccountHistory") +} + +func init() { + proto.RegisterFile("duality/incentives/account_history.proto", fileDescriptor_69dfb106c545010e) +} + +var fileDescriptor_69dfb106c545010e = []byte{ + // 263 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0x48, 0x29, 0x4d, 0xcc, + 0xc9, 0x2c, 0xa9, 0xd4, 0xcf, 0xcc, 0x4b, 0x4e, 0xcd, 0x2b, 0xc9, 0x2c, 0x4b, 0x2d, 0xd6, 0x4f, + 0x4c, 0x4e, 0xce, 0x2f, 0xcd, 0x2b, 0x89, 0xcf, 0xc8, 0x2c, 0x2e, 0xc9, 0x2f, 0xaa, 0xd4, 0x2b, + 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x82, 0xaa, 0xd4, 0x43, 0xa8, 0x94, 0x12, 0x49, 0xcf, 0x4f, + 0xcf, 0x07, 0x4b, 0xeb, 0x83, 0x58, 0x10, 0x95, 0x52, 0x72, 0xc9, 0xf9, 0xc5, 0xb9, 0xf9, 0xc5, + 0xfa, 0x49, 0x89, 0xc5, 0xa9, 0xfa, 0x65, 0x86, 0x49, 0xa9, 0x25, 0x89, 0x86, 0xfa, 0xc9, 0xf9, + 0x99, 0x79, 0x10, 0x79, 0xa5, 0x5e, 0x46, 0x2e, 0x3e, 0x47, 0x88, 0x1d, 0x1e, 0x10, 0x2b, 0x84, + 0x24, 0xb8, 0xd8, 0xa1, 0xb6, 0x4a, 0x30, 0x2a, 0x30, 0x6a, 0x70, 0x06, 0xc1, 0xb8, 0x42, 0x89, + 0x5c, 0xac, 0x20, 0xad, 0xc5, 0x12, 0x4c, 0x0a, 0xcc, 0x1a, 0xdc, 0x46, 0x92, 0x7a, 0x10, 0xc3, + 0xf5, 0x40, 0x86, 0xeb, 0x41, 0x0d, 0xd7, 0x73, 0xce, 0xcf, 0xcc, 0x73, 0x32, 0x38, 0x71, 0x4f, + 0x9e, 0x61, 0xd5, 0x7d, 0x79, 0x8d, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, + 0x7d, 0xa8, 0x4b, 0x20, 0x94, 0x6e, 0x71, 0x4a, 0xb6, 0x7e, 0x49, 0x65, 0x41, 0x6a, 0x31, 0x58, + 0x43, 0x71, 0x10, 0xc4, 0x64, 0x27, 0x9f, 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, 0x42, 0x32, 0x0a, 0xea, 0x7d, 0xdd, 0x9c, 0xc4, 0xa4, 0x62, 0x18, 0x47, 0xbf, 0x02, + 0x39, 0xdc, 0xc0, 0x46, 0x27, 0xb1, 0x81, 0x3d, 0x69, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0xf0, + 0x48, 0x9b, 0xa0, 0x5a, 0x01, 0x00, 0x00, +} + +func (m *AccountHistory) 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 *AccountHistory) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *AccountHistory) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Coins) > 0 { + for iNdEx := len(m.Coins) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Coins[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintAccountHistory(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } + } + if len(m.Account) > 0 { + i -= len(m.Account) + copy(dAtA[i:], m.Account) + i = encodeVarintAccountHistory(dAtA, i, uint64(len(m.Account))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func encodeVarintAccountHistory(dAtA []byte, offset int, v uint64) int { + offset -= sovAccountHistory(v) + base := offset + for v >= 1<<7 { + dAtA[offset] = uint8(v&0x7f | 0x80) + v >>= 7 + offset++ + } + dAtA[offset] = uint8(v) + return base +} +func (m *AccountHistory) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Account) + if l > 0 { + n += 1 + l + sovAccountHistory(uint64(l)) + } + if len(m.Coins) > 0 { + for _, e := range m.Coins { + l = e.Size() + n += 1 + l + sovAccountHistory(uint64(l)) + } + } + return n +} + +func sovAccountHistory(x uint64) (n int) { + return (math_bits.Len64(x|1) + 6) / 7 +} +func sozAccountHistory(x uint64) (n int) { + return sovAccountHistory(uint64((x << 1) ^ uint64((int64(x) >> 63)))) +} +func (m *AccountHistory) 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 ErrIntOverflowAccountHistory + } + 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: AccountHistory: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: AccountHistory: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Account", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowAccountHistory + } + 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 ErrInvalidLengthAccountHistory + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthAccountHistory + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Account = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Coins", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowAccountHistory + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthAccountHistory + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthAccountHistory + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Coins = append(m.Coins, types.Coin{}) + if err := m.Coins[len(m.Coins)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipAccountHistory(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthAccountHistory + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func skipAccountHistory(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, ErrIntOverflowAccountHistory + } + 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, ErrIntOverflowAccountHistory + } + 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, ErrIntOverflowAccountHistory + } + 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, ErrInvalidLengthAccountHistory + } + iNdEx += length + case 3: + depth++ + case 4: + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupAccountHistory + } + depth-- + case 5: + iNdEx += 4 + default: + return 0, fmt.Errorf("proto: illegal wireType %d", wireType) + } + if iNdEx < 0 { + return 0, ErrInvalidLengthAccountHistory + } + if depth == 0 { + return iNdEx, nil + } + } + return 0, io.ErrUnexpectedEOF +} + +var ( + ErrInvalidLengthAccountHistory = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowAccountHistory = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupAccountHistory = fmt.Errorf("proto: unexpected end of group") +) diff --git a/x/incentives/types/codec.go b/x/incentives/types/codec.go new file mode 100644 index 000000000..b2e2b954f --- /dev/null +++ b/x/incentives/types/codec.go @@ -0,0 +1,35 @@ +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" +) + +var ( + amino = codec.NewLegacyAmino() + ModuleCdc = codec.NewAminoCodec(amino) +) + +// RegisterCodec registers the necessary x/incentives interfaces and concrete types on the provided +// LegacyAmino codec. These types are used for Amino JSON serialization. +func RegisterCodec(cdc *codec.LegacyAmino) { + cdc.RegisterConcrete(&MsgCreateGauge{}, "duality/incentives/create-gauge", nil) + cdc.RegisterConcrete(&MsgAddToGauge{}, "duality/incentives/add-to-gauge", nil) + cdc.RegisterConcrete(&MsgStake{}, "duality/stake/stake-tokens", nil) + cdc.RegisterConcrete(&MsgUnstake{}, "duality/stake/begin-unstake-period-stake", nil) +} + +// RegisterInterfaces registers interfaces and implementations of the incentives module. +func RegisterInterfaces(registry cdctypes.InterfaceRegistry) { + registry.RegisterImplementations( + (*sdk.Msg)(nil), + &MsgCreateGauge{}, + &MsgAddToGauge{}, + &MsgStake{}, + &MsgUnstake{}, + ) + + msgservice.RegisterMsgServiceDesc(registry, &_Msg_serviceDesc) +} diff --git a/x/incentives/types/distribution_spec.go b/x/incentives/types/distribution_spec.go new file mode 100644 index 000000000..ecb89dac7 --- /dev/null +++ b/x/incentives/types/distribution_spec.go @@ -0,0 +1,25 @@ +package types + +import sdk "github.com/cosmos/cosmos-sdk/types" + +type DistributionSpec map[string]sdk.Coins + +func (spec *DistributionSpec) Add(other DistributionSpec) DistributionSpec { + result := *spec + for k, v := range other { + if vv, ok := result[k]; ok { + result[k] = vv.Add(v...) + } else { + result[k] = v + } + } + return result +} + +func (spec DistributionSpec) GetTotal() sdk.Coins { + coins := sdk.Coins{} + for _, v := range spec { + coins = coins.Add(v...) + } + return coins +} diff --git a/x/incentives/types/distribution_spec_test.go b/x/incentives/types/distribution_spec_test.go new file mode 100644 index 000000000..942173480 --- /dev/null +++ b/x/incentives/types/distribution_spec_test.go @@ -0,0 +1,44 @@ +package types_test + +import ( + "testing" + + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/stretchr/testify/assert" + + "github.com/neutron-org/neutron/x/incentives/types" +) + +func TestDistributionSpec_Add(t *testing.T) { + spec1 := types.DistributionSpec{ + "alice": sdk.Coins{sdk.NewInt64Coin("coin1", 100), sdk.NewInt64Coin("coin2", 200)}, + "bob": sdk.Coins{sdk.NewInt64Coin("coin1", 300), sdk.NewInt64Coin("coin2", 400)}, + } + + spec2 := types.DistributionSpec{ + "alice": sdk.Coins{sdk.NewInt64Coin("coin1", 100), sdk.NewInt64Coin("coin2", 200)}, + "carol": sdk.Coins{sdk.NewInt64Coin("coin1", 500), sdk.NewInt64Coin("coin2", 600)}, + } + + expected := types.DistributionSpec{ + "alice": sdk.Coins{sdk.NewInt64Coin("coin1", 200), sdk.NewInt64Coin("coin2", 400)}, + "bob": sdk.Coins{sdk.NewInt64Coin("coin1", 300), sdk.NewInt64Coin("coin2", 400)}, + "carol": sdk.Coins{sdk.NewInt64Coin("coin1", 500), sdk.NewInt64Coin("coin2", 600)}, + } + + result := spec1.Add(spec2) + assert.Equal(t, expected, result) +} + +func TestDistributionSpec_GetTotal(t *testing.T) { + spec := types.DistributionSpec{ + "alice": sdk.Coins{sdk.NewInt64Coin("coin1", 100), sdk.NewInt64Coin("coin2", 200)}, + "bob": sdk.Coins{sdk.NewInt64Coin("coin1", 300), sdk.NewInt64Coin("coin2", 400)}, + "carol": sdk.Coins{sdk.NewInt64Coin("coin1", 500), sdk.NewInt64Coin("coin2", 600)}, + } + + expected := sdk.Coins{sdk.NewInt64Coin("coin1", 900), sdk.NewInt64Coin("coin2", 1200)} + + total := spec.GetTotal() + assert.Equal(t, expected, total) +} diff --git a/x/incentives/types/errors.go b/x/incentives/types/errors.go new file mode 100644 index 000000000..b6963a8d6 --- /dev/null +++ b/x/incentives/types/errors.go @@ -0,0 +1,43 @@ +package types + +// DONTCOVER + +import ( + sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" +) + +// x/incentives module sentinel errors. +var ( + ErrNotStakeOwner = sdkerrors.Register( + ModuleName, + 1, + "msg sender is not the owner of specified stake", + ) + ErrStakeNotFound = sdkerrors.Register(ModuleName, 2, "stake not found") + ErrGaugeNotActive = sdkerrors.Register( + ModuleName, + 3, + "cannot distribute from gauges when it is not active", + ) + ErrInvalidGaugeStatus = sdkerrors.Register( + ModuleName, + 4, + "Gauge status filter must be one of: ACTIVE_UPCOMING, ACTIVE, UPCOMING, FINISHED", + ) + ErrMaxGaugesReached = sdkerrors.Register( + ModuleName, + 5, + "Gauge limit has been reached; additional gauges may be created once the gauge limit has been raised via governance proposal", + ) + ErrGaugePricingTickOutOfRange = sdkerrors.Register( + ModuleName, + 6, + "cannot use an invalid price tick", + ) + ErrGaugeDistrToTickOutOfRange = sdkerrors.Register(ModuleName, 7, "cannot use an distrTo tick") + ErrInvalidSigner = sdkerrors.Register( + ModuleName, + 8, + "owner must be module authority", + ) +) diff --git a/x/incentives/types/events.go b/x/incentives/types/events.go new file mode 100644 index 000000000..c03383fed --- /dev/null +++ b/x/incentives/types/events.go @@ -0,0 +1,21 @@ +package types + +// Incentive module event types. +const ( + TypeEvtCreateGauge = "create_gauge" + TypeEvtAddToGauge = "add_to_gauge" + TypeEvtDistribution = "distribution" + + AttributeGaugeID = "gauge_id" + AttributeReceiver = "receiver" + AttributeAmount = "amount" + + TypeEvtStake = "stake" + TypeEvtUnstake = "unstake" + + AttributeStakeID = "stake_id" + AttributeStakeOwner = "owner" + AttributeStakeAmount = "amount" + AttributeStakeStakeTime = "stake_time" + AttributeUnstakedCoins = "unstaked_coins" +) diff --git a/x/incentives/types/expected_keepers.go b/x/incentives/types/expected_keepers.go new file mode 100644 index 000000000..ca9921a99 --- /dev/null +++ b/x/incentives/types/expected_keepers.go @@ -0,0 +1,34 @@ +package types + +import ( + authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" + "github.com/neutron-org/neutron/x/dex/types" + dextypes "github.com/neutron-org/neutron/x/dex/types" + epochstypes "github.com/neutron-org/neutron/x/epochs/types" + + sdk "github.com/cosmos/cosmos-sdk/types" +) + +// BankKeeper defines the expected interface needed to retrieve account balances. +type BankKeeper interface { + GetAllBalances(ctx sdk.Context, addr sdk.AccAddress) sdk.Coins + GetSupply(ctx sdk.Context, denom string) sdk.Coin + + SendCoinsFromModuleToAccount(ctx sdk.Context, senderModule string, recipientAddr sdk.AccAddress, amt sdk.Coins) error + SendCoinsFromAccountToModule(ctx sdk.Context, senderAddr sdk.AccAddress, recipientModule string, amt sdk.Coins) error +} + +// EpochKeeper defines the expected interface needed to retrieve epoch info. +type EpochKeeper interface { + GetEpochInfo(ctx sdk.Context, identifier string) epochstypes.EpochInfo +} + +type AccountKeeper interface { + GetModuleAccount(ctx sdk.Context, moduleName string) authtypes.ModuleAccountI + GetModuleAddress(moduleName string) sdk.AccAddress +} + +type DexKeeper interface { + GetOrInitPool(ctx sdk.Context, pairID *types.PairID, centerTickIndex int64, fee uint64) (*dextypes.Pool, error) + GetPoolMetadataByDenom(ctx sdk.Context, id string) (types.PoolMetadata, error) +} diff --git a/x/incentives/types/gauge.go b/x/incentives/types/gauge.go new file mode 100644 index 000000000..139be2874 --- /dev/null +++ b/x/incentives/types/gauge.go @@ -0,0 +1,82 @@ +package types + +import ( + time "time" + + sdk "github.com/cosmos/cosmos-sdk/types" +) + +// NewGauge creates a new gauge struct given the required gauge parameters. +func NewGauge( + id uint64, + isPerpetual bool, + distrTo QueryCondition, + coins sdk.Coins, + startTime time.Time, + numEpochsPaidOver uint64, + filledEpochs uint64, + distCoins sdk.Coins, + pricingTick int64, +) Gauge { + return Gauge{ + Id: id, + IsPerpetual: isPerpetual, + DistributeTo: distrTo, + Coins: coins, + StartTime: startTime, + NumEpochsPaidOver: numEpochsPaidOver, + FilledEpochs: filledEpochs, + DistributedCoins: distCoins, + PricingTick: pricingTick, + } +} + +func (gauge Gauge) hasEpochsRemaining() bool { + return gauge.IsPerpetual || gauge.FilledEpochs < gauge.NumEpochsPaidOver +} + +func (gauge Gauge) hasStarted(now time.Time) bool { + return !now.Before(gauge.StartTime) +} + +// IsUpcomingGauge returns true if the gauge's distribution start time is after the provided time. +func (gauge Gauge) IsUpcomingGauge(now time.Time) bool { + return !gauge.hasStarted(now) && gauge.hasEpochsRemaining() +} + +// IsActiveGauge returns true if the gauge is in an active state during the provided time. +func (gauge Gauge) IsActiveGauge(now time.Time) bool { + return gauge.hasStarted(now) && gauge.hasEpochsRemaining() +} + +// IsFinishedGauge returns true if the gauge is in a finished state during the provided time. +func (gauge Gauge) IsFinishedGauge(now time.Time) bool { + return gauge.hasStarted(now) && !gauge.hasEpochsRemaining() +} + +func (gauge Gauge) RewardsNextEpoch() sdk.Coins { + result := sdk.Coins{} + epochsRemaining := gauge.EpochsRemaining() + if epochsRemaining == 0 { + return result + } + + for _, rewardRemainingCoin := range gauge.CoinsRemaining() { + amount := rewardRemainingCoin.Amount.Quo(sdk.NewInt(int64(epochsRemaining))) + result = result.Add(sdk.Coin{Denom: rewardRemainingCoin.Denom, Amount: amount}) + } + + return result +} + +func (gauge Gauge) EpochsRemaining() uint64 { + if !gauge.IsPerpetual { + return gauge.NumEpochsPaidOver - gauge.FilledEpochs + } + + return 1 +} + +func (gauge Gauge) CoinsRemaining() sdk.Coins { + return gauge.Coins.Sub(gauge.DistributedCoins...) +} diff --git a/x/incentives/types/gauge.pb.go b/x/incentives/types/gauge.pb.go new file mode 100644 index 000000000..9b1e87dd7 --- /dev/null +++ b/x/incentives/types/gauge.pb.go @@ -0,0 +1,1021 @@ +// Code generated by protoc-gen-gogo. DO NOT EDIT. +// source: duality/incentives/gauge.proto + +package types + +import ( + fmt "fmt" + github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" + types "github.com/cosmos/cosmos-sdk/types" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" + github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" + types1 "github.com/neutron-org/neutron/x/dex/types" + _ "google.golang.org/protobuf/types/known/durationpb" + _ "google.golang.org/protobuf/types/known/timestamppb" + io "io" + math "math" + math_bits "math/bits" + time "time" +) + +// Reference imports to suppress errors if they are not otherwise used. +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf +var _ = time.Kitchen + +// 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 + +// Gauge is an object that describes an LP incentivization plan and its state. +type Gauge struct { + // id is the unique ID of a Gauge + Id uint64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` + // There are two kinds of gauges: perpetual and non-perpetual. Perpetual + // gauges describe an incentivization program for which the token rewards + // distributed on any given day must be added to the gauge prior to that day's + // distribution using an AddToGauge message. When distribute is called on a + // perpetual gauge, all of the remaining rewards in the gauge are distributed. + // Because of this, all perpetual gauges must have `num_epochs_paid_over` set + // to 1. A non-perpetual gauge by contrast distributes its rewards over a + // schedule as determined by `num_epochs_paid_over`. If a non-perpetual gauge + // is created with coins=[100atom] and num_epochs_paid_over=10, this means + // that for 10 days (10 epochs) the gauge will distribute 10atom each day to + // the staked LP positions qualifying for the gauge. + IsPerpetual bool `protobuf:"varint,2,opt,name=is_perpetual,json=isPerpetual,proto3" json:"is_perpetual,omitempty"` + // distribute_to describes a set of staked LP positions that should be + // distributed to from this gauge. + DistributeTo QueryCondition `protobuf:"bytes,3,opt,name=distribute_to,json=distributeTo,proto3" json:"distribute_to"` + // coins describes the total amount of coins that have been added to this + // gauge for distribution. + Coins github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,4,rep,name=coins,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"coins"` + // start_time describes when this gauge should begin distributing rewards. + // This allows gauge creators to schedule gauges into the future, in the event + // that an earlier gauge is expected to expire. + StartTime time.Time `protobuf:"bytes,5,opt,name=start_time,json=startTime,proto3,stdtime" json:"start_time" yaml:"start_time"` + // num_epochs_paid_over is the number of total epochs (days) the rewards in + // this gauge will be distributed over. + NumEpochsPaidOver uint64 `protobuf:"varint,6,opt,name=num_epochs_paid_over,json=numEpochsPaidOver,proto3" json:"num_epochs_paid_over,omitempty"` + // filled_epochs describes the number of epochs distribution have been completed + // already + FilledEpochs uint64 `protobuf:"varint,7,opt,name=filled_epochs,json=filledEpochs,proto3" json:"filled_epochs,omitempty"` + // distributed_coins describes coins that have been distributed already from + // this gauge. + DistributedCoins github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,8,rep,name=distributed_coins,json=distributedCoins,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"distributed_coins"` + // pricing_tick is necessary for fairly distributing rewards over a range of + // ticks. Without pricing_tick, we might naively distribute rewards in + // proportion to the number of deposit shares staked within the gauge's + // qualifying tick range. + // + // For example, a gauge with a distribute_to tick range of [-10, 10] would + // distribute to staked LP tokens where both tick-fee and tick+fee are within + // [-10, 10]. Let's say for pair "tokenA<>tokenB", the current trading tick is + // 0. If Alice were to LP (10tokenA, 0tokenB) @ tick -8, fee 2, this would + // mean Alice would be issued 10 shares (10 + 0 * 1.0001^-8), since shares are + // in terms of token0. Let's further assume Bob LPs (0tokenA, 10tokenB) @ tick + // 8, fee 2, such that Bob is issued 10.008 shares (0 + 10 * 1.0001^8). Under + // this naive approach, if Alice and Bob were to stake their shares, Bob would + // receive more in rewards, purely on the basis of the relative locations of + // their liquidity. + // + // This disparity originates in the fact that LP deposit denominations are not + // fungible across ticks. To avoid this, we can use a single price throughout + // the gauge's tick range for relating the relative value of token0 and + // token1, as specified by pricing_tick. + // + // Let's run through the earier example using the more sophisticated approach, + // where the gauge has pricing_tick set to 0. For the purpose of calculating + // reward distribution weight, Alice's shares are worth 10 + 0 * 1.0001^0 = 10 + // and Bob's shares are worth 0 + 10 * 1.0001^0 = 10. With the distribution + // weight of both shares set according to a gauge-specific tick, we do not + // distribute more or less rewards according to the relative location of + // liquidity within the gauge's tick range, freeing users to place liquidity + // whereever they deem most profitable in the gauge's range and still equally + // qualify for rewards. + PricingTick int64 `protobuf:"varint,9,opt,name=pricing_tick,json=pricingTick,proto3" json:"pricing_tick,omitempty"` +} + +func (m *Gauge) Reset() { *m = Gauge{} } +func (m *Gauge) String() string { return proto.CompactTextString(m) } +func (*Gauge) ProtoMessage() {} +func (*Gauge) Descriptor() ([]byte, []int) { + return fileDescriptor_13cec3b76ad4f381, []int{0} +} +func (m *Gauge) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Gauge) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Gauge.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 *Gauge) XXX_Merge(src proto.Message) { + xxx_messageInfo_Gauge.Merge(m, src) +} +func (m *Gauge) XXX_Size() int { + return m.Size() +} +func (m *Gauge) XXX_DiscardUnknown() { + xxx_messageInfo_Gauge.DiscardUnknown(m) +} + +var xxx_messageInfo_Gauge proto.InternalMessageInfo + +func (m *Gauge) GetId() uint64 { + if m != nil { + return m.Id + } + return 0 +} + +func (m *Gauge) GetIsPerpetual() bool { + if m != nil { + return m.IsPerpetual + } + return false +} + +func (m *Gauge) GetDistributeTo() QueryCondition { + if m != nil { + return m.DistributeTo + } + return QueryCondition{} +} + +func (m *Gauge) GetCoins() github_com_cosmos_cosmos_sdk_types.Coins { + if m != nil { + return m.Coins + } + return nil +} + +func (m *Gauge) GetStartTime() time.Time { + if m != nil { + return m.StartTime + } + return time.Time{} +} + +func (m *Gauge) GetNumEpochsPaidOver() uint64 { + if m != nil { + return m.NumEpochsPaidOver + } + return 0 +} + +func (m *Gauge) GetFilledEpochs() uint64 { + if m != nil { + return m.FilledEpochs + } + return 0 +} + +func (m *Gauge) GetDistributedCoins() github_com_cosmos_cosmos_sdk_types.Coins { + if m != nil { + return m.DistributedCoins + } + return nil +} + +func (m *Gauge) GetPricingTick() int64 { + if m != nil { + return m.PricingTick + } + return 0 +} + +// QueryCondition describes a set of staked LP positions that a gauge is +// configured to distribute to. LP tokens qualifying for a given QueryCondition +// must have both tick-fee and tick+fee fall within the range [startTick, endTick], +// such that all of the tradable liquidity for the pool is within that range. +type QueryCondition struct { + // pairID is the token pair which should be distributed to. + PairID *types1.PairID `protobuf:"bytes,1,opt,name=pairID,proto3" json:"pairID,omitempty"` + // start_tick is the inclusive lower bound on the location of LP tokens that + // qualify for a gauge's distribution. + StartTick int64 `protobuf:"varint,2,opt,name=startTick,proto3" json:"startTick,omitempty"` + // end_tick is the inclusive upper bound on the location of LP tokens that + // qualify for a gauge's distribution. + EndTick int64 `protobuf:"varint,3,opt,name=endTick,proto3" json:"endTick,omitempty"` +} + +func (m *QueryCondition) Reset() { *m = QueryCondition{} } +func (m *QueryCondition) String() string { return proto.CompactTextString(m) } +func (*QueryCondition) ProtoMessage() {} +func (*QueryCondition) Descriptor() ([]byte, []int) { + return fileDescriptor_13cec3b76ad4f381, []int{1} +} +func (m *QueryCondition) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryCondition) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryCondition.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 *QueryCondition) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryCondition.Merge(m, src) +} +func (m *QueryCondition) XXX_Size() int { + return m.Size() +} +func (m *QueryCondition) XXX_DiscardUnknown() { + xxx_messageInfo_QueryCondition.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryCondition proto.InternalMessageInfo + +func (m *QueryCondition) GetPairID() *types1.PairID { + if m != nil { + return m.PairID + } + return nil +} + +func (m *QueryCondition) GetStartTick() int64 { + if m != nil { + return m.StartTick + } + return 0 +} + +func (m *QueryCondition) GetEndTick() int64 { + if m != nil { + return m.EndTick + } + return 0 +} + +func init() { + proto.RegisterType((*Gauge)(nil), "duality.incentives.Gauge") + proto.RegisterType((*QueryCondition)(nil), "duality.incentives.QueryCondition") +} + +func init() { proto.RegisterFile("duality/incentives/gauge.proto", fileDescriptor_13cec3b76ad4f381) } + +var fileDescriptor_13cec3b76ad4f381 = []byte{ + // 564 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x53, 0xcd, 0x6e, 0xd3, 0x4c, + 0x14, 0x8d, 0x9b, 0xf4, 0x6f, 0xd2, 0x56, 0x5f, 0xe7, 0xeb, 0xc2, 0xad, 0xc0, 0x09, 0x61, 0x63, + 0x09, 0x75, 0x86, 0x86, 0x1d, 0xcb, 0x14, 0x84, 0x90, 0x40, 0x04, 0x2b, 0x0b, 0xc4, 0xc6, 0x1a, + 0x7b, 0xa6, 0xee, 0x55, 0x6c, 0x8f, 0xe5, 0x19, 0x47, 0xc9, 0x5b, 0xf4, 0x39, 0x78, 0x03, 0xde, + 0xa0, 0xcb, 0x2e, 0x59, 0xb5, 0x28, 0x79, 0x03, 0x9e, 0x00, 0x79, 0x6c, 0x93, 0x00, 0x5b, 0x56, + 0xc9, 0x9c, 0x73, 0xff, 0xce, 0xb9, 0xd7, 0xc8, 0xe1, 0x05, 0x8b, 0x41, 0x2f, 0x28, 0xa4, 0xa1, + 0x48, 0x35, 0xcc, 0x84, 0xa2, 0x11, 0x2b, 0x22, 0x41, 0xb2, 0x5c, 0x6a, 0x89, 0x71, 0xcd, 0x93, + 0x35, 0x7f, 0x76, 0x12, 0xc9, 0x48, 0x1a, 0x9a, 0x96, 0xff, 0xaa, 0xc8, 0x33, 0x27, 0x92, 0x32, + 0x8a, 0x05, 0x35, 0xaf, 0xa0, 0xb8, 0xa2, 0xbc, 0xc8, 0x99, 0x06, 0x99, 0xd6, 0x7c, 0xef, 0x4f, + 0x5e, 0x43, 0x22, 0x94, 0x66, 0x49, 0xd6, 0x14, 0x08, 0xa5, 0x4a, 0xa4, 0xa2, 0x01, 0x53, 0x82, + 0xce, 0x2e, 0x02, 0xa1, 0xd9, 0x05, 0x0d, 0x25, 0x34, 0x05, 0x4e, 0x9b, 0x51, 0xb9, 0x98, 0xd3, + 0x8c, 0x41, 0xee, 0x03, 0xaf, 0xa8, 0xc1, 0xd7, 0x0e, 0xda, 0x7e, 0x53, 0x4e, 0x8d, 0x8f, 0xd0, + 0x16, 0x70, 0xdb, 0xea, 0x5b, 0x6e, 0xc7, 0xdb, 0x02, 0x8e, 0x9f, 0xa0, 0x03, 0x50, 0x7e, 0x26, + 0xf2, 0x4c, 0xe8, 0x82, 0xc5, 0xf6, 0x56, 0xdf, 0x72, 0xf7, 0xbc, 0x2e, 0xa8, 0x71, 0x03, 0xe1, + 0xf7, 0xe8, 0x90, 0x83, 0xd2, 0x39, 0x04, 0x85, 0x16, 0xbe, 0x96, 0x76, 0xbb, 0x6f, 0xb9, 0xdd, + 0xe1, 0x80, 0xfc, 0x2d, 0x9d, 0x7c, 0x2c, 0x44, 0xbe, 0xb8, 0x94, 0x29, 0x87, 0x52, 0xd9, 0xa8, + 0x73, 0x7b, 0xdf, 0x6b, 0x79, 0x07, 0xeb, 0xf4, 0x89, 0xc4, 0x0c, 0x6d, 0x97, 0x43, 0x2b, 0xbb, + 0xd3, 0x6f, 0xbb, 0xdd, 0xe1, 0x29, 0xa9, 0x64, 0x91, 0x52, 0x16, 0xa9, 0x65, 0x91, 0x4b, 0x09, + 0xe9, 0xe8, 0x79, 0x99, 0xfd, 0xe5, 0xa1, 0xe7, 0x46, 0xa0, 0xaf, 0x8b, 0x80, 0x84, 0x32, 0xa1, + 0xb5, 0x07, 0xd5, 0xcf, 0xb9, 0xe2, 0x53, 0xaa, 0x17, 0x99, 0x50, 0x26, 0x41, 0x79, 0x55, 0x65, + 0xfc, 0x09, 0x21, 0xa5, 0x59, 0xae, 0xfd, 0xd2, 0x42, 0x7b, 0xdb, 0x8c, 0x7b, 0x46, 0x2a, 0x7f, + 0x49, 0xe3, 0x2f, 0x99, 0x34, 0xfe, 0x8e, 0x1e, 0x97, 0x8d, 0x7e, 0xdc, 0xf7, 0x8e, 0x17, 0x2c, + 0x89, 0x5f, 0x0e, 0xd6, 0xb9, 0x83, 0x9b, 0x87, 0x9e, 0xe5, 0xed, 0x1b, 0xa0, 0x0c, 0xc7, 0x14, + 0x9d, 0xa4, 0x45, 0xe2, 0x8b, 0x4c, 0x86, 0xd7, 0xca, 0xcf, 0x18, 0x70, 0x5f, 0xce, 0x44, 0x6e, + 0xef, 0x18, 0x43, 0x8f, 0xd3, 0x22, 0x79, 0x6d, 0xa8, 0x31, 0x03, 0xfe, 0x61, 0x26, 0x72, 0xfc, + 0x14, 0x1d, 0x5e, 0x41, 0x1c, 0x0b, 0x5e, 0xe7, 0xd8, 0xbb, 0x26, 0xf2, 0xa0, 0x02, 0xab, 0x60, + 0x3c, 0x47, 0xc7, 0x6b, 0x8b, 0xb8, 0x5f, 0xd9, 0xb3, 0xf7, 0xef, 0xed, 0xf9, 0x6f, 0xa3, 0x8b, + 0x41, 0xca, 0xf5, 0x67, 0x39, 0x84, 0x90, 0x46, 0xbe, 0x86, 0x70, 0x6a, 0xef, 0xf7, 0x2d, 0xb7, + 0xed, 0x75, 0x6b, 0x6c, 0x02, 0xe1, 0x74, 0x50, 0xa0, 0xa3, 0xdf, 0xb7, 0x8a, 0x9f, 0xa1, 0x9d, + 0xf2, 0xbc, 0xde, 0xbe, 0x32, 0x77, 0xd4, 0x1d, 0xfe, 0xff, 0xeb, 0x12, 0xb8, 0x98, 0x93, 0xb1, + 0xa1, 0xbc, 0x3a, 0x04, 0x3f, 0x42, 0x8d, 0x7d, 0xe1, 0xd4, 0x5c, 0x57, 0xdb, 0x5b, 0x03, 0xd8, + 0x46, 0xbb, 0x22, 0xe5, 0x86, 0x6b, 0x1b, 0xae, 0x79, 0x8e, 0xde, 0xdd, 0x2e, 0x1d, 0xeb, 0x6e, + 0xe9, 0x58, 0xdf, 0x97, 0x8e, 0x75, 0xb3, 0x72, 0x5a, 0x77, 0x2b, 0xa7, 0xf5, 0x6d, 0xe5, 0xb4, + 0x3e, 0x0f, 0x37, 0xf4, 0xd6, 0x8d, 0xcf, 0x63, 0x16, 0xa8, 0xe6, 0x41, 0xe7, 0x9b, 0x1f, 0xab, + 0xd1, 0x1f, 0xec, 0x98, 0xad, 0xbf, 0xf8, 0x19, 0x00, 0x00, 0xff, 0xff, 0xf7, 0x71, 0x80, 0xd1, + 0xcf, 0x03, 0x00, 0x00, +} + +func (m *Gauge) 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 *Gauge) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Gauge) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.PricingTick != 0 { + i = encodeVarintGauge(dAtA, i, uint64(m.PricingTick)) + i-- + dAtA[i] = 0x48 + } + if len(m.DistributedCoins) > 0 { + for iNdEx := len(m.DistributedCoins) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.DistributedCoins[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintGauge(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x42 + } + } + if m.FilledEpochs != 0 { + i = encodeVarintGauge(dAtA, i, uint64(m.FilledEpochs)) + i-- + dAtA[i] = 0x38 + } + if m.NumEpochsPaidOver != 0 { + i = encodeVarintGauge(dAtA, i, uint64(m.NumEpochsPaidOver)) + i-- + dAtA[i] = 0x30 + } + n1, err1 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.StartTime, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.StartTime):]) + if err1 != nil { + return 0, err1 + } + i -= n1 + i = encodeVarintGauge(dAtA, i, uint64(n1)) + i-- + dAtA[i] = 0x2a + if len(m.Coins) > 0 { + for iNdEx := len(m.Coins) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Coins[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintGauge(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x22 + } + } + { + size, err := m.DistributeTo.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintGauge(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1a + if m.IsPerpetual { + i-- + if m.IsPerpetual { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- + dAtA[i] = 0x10 + } + if m.Id != 0 { + i = encodeVarintGauge(dAtA, i, uint64(m.Id)) + i-- + dAtA[i] = 0x8 + } + return len(dAtA) - i, nil +} + +func (m *QueryCondition) 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 *QueryCondition) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryCondition) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.EndTick != 0 { + i = encodeVarintGauge(dAtA, i, uint64(m.EndTick)) + i-- + dAtA[i] = 0x18 + } + if m.StartTick != 0 { + i = encodeVarintGauge(dAtA, i, uint64(m.StartTick)) + i-- + dAtA[i] = 0x10 + } + if m.PairID != nil { + { + size, err := m.PairID.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintGauge(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func encodeVarintGauge(dAtA []byte, offset int, v uint64) int { + offset -= sovGauge(v) + base := offset + for v >= 1<<7 { + dAtA[offset] = uint8(v&0x7f | 0x80) + v >>= 7 + offset++ + } + dAtA[offset] = uint8(v) + return base +} +func (m *Gauge) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Id != 0 { + n += 1 + sovGauge(uint64(m.Id)) + } + if m.IsPerpetual { + n += 2 + } + l = m.DistributeTo.Size() + n += 1 + l + sovGauge(uint64(l)) + if len(m.Coins) > 0 { + for _, e := range m.Coins { + l = e.Size() + n += 1 + l + sovGauge(uint64(l)) + } + } + l = github_com_cosmos_gogoproto_types.SizeOfStdTime(m.StartTime) + n += 1 + l + sovGauge(uint64(l)) + if m.NumEpochsPaidOver != 0 { + n += 1 + sovGauge(uint64(m.NumEpochsPaidOver)) + } + if m.FilledEpochs != 0 { + n += 1 + sovGauge(uint64(m.FilledEpochs)) + } + if len(m.DistributedCoins) > 0 { + for _, e := range m.DistributedCoins { + l = e.Size() + n += 1 + l + sovGauge(uint64(l)) + } + } + if m.PricingTick != 0 { + n += 1 + sovGauge(uint64(m.PricingTick)) + } + return n +} + +func (m *QueryCondition) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.PairID != nil { + l = m.PairID.Size() + n += 1 + l + sovGauge(uint64(l)) + } + if m.StartTick != 0 { + n += 1 + sovGauge(uint64(m.StartTick)) + } + if m.EndTick != 0 { + n += 1 + sovGauge(uint64(m.EndTick)) + } + return n +} + +func sovGauge(x uint64) (n int) { + return (math_bits.Len64(x|1) + 6) / 7 +} +func sozGauge(x uint64) (n int) { + return sovGauge(uint64((x << 1) ^ uint64((int64(x) >> 63)))) +} +func (m *Gauge) 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 ErrIntOverflowGauge + } + 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: Gauge: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: Gauge: 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 ErrIntOverflowGauge + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Id |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 2: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field IsPerpetual", wireType) + } + var v int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGauge + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.IsPerpetual = bool(v != 0) + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field DistributeTo", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGauge + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthGauge + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthGauge + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.DistributeTo.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Coins", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGauge + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthGauge + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthGauge + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Coins = append(m.Coins, types.Coin{}) + if err := m.Coins[len(m.Coins)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 5: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field StartTime", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGauge + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthGauge + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthGauge + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(&m.StartTime, dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 6: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field NumEpochsPaidOver", wireType) + } + m.NumEpochsPaidOver = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGauge + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.NumEpochsPaidOver |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 7: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field FilledEpochs", wireType) + } + m.FilledEpochs = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGauge + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.FilledEpochs |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 8: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field DistributedCoins", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGauge + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthGauge + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthGauge + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.DistributedCoins = append(m.DistributedCoins, types.Coin{}) + if err := m.DistributedCoins[len(m.DistributedCoins)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 9: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field PricingTick", wireType) + } + m.PricingTick = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGauge + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.PricingTick |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } + default: + iNdEx = preIndex + skippy, err := skipGauge(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthGauge + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *QueryCondition) 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 ErrIntOverflowGauge + } + 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: QueryCondition: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryCondition: 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 msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGauge + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthGauge + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthGauge + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.PairID == nil { + m.PairID = &types1.PairID{} + } + if err := m.PairID.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 2: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field StartTick", wireType) + } + m.StartTick = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGauge + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.StartTick |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 3: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field EndTick", wireType) + } + m.EndTick = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGauge + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.EndTick |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } + default: + iNdEx = preIndex + skippy, err := skipGauge(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthGauge + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func skipGauge(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, ErrIntOverflowGauge + } + 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, ErrIntOverflowGauge + } + 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, ErrIntOverflowGauge + } + 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, ErrInvalidLengthGauge + } + iNdEx += length + case 3: + depth++ + case 4: + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupGauge + } + depth-- + case 5: + iNdEx += 4 + default: + return 0, fmt.Errorf("proto: illegal wireType %d", wireType) + } + if iNdEx < 0 { + return 0, ErrInvalidLengthGauge + } + if depth == 0 { + return iNdEx, nil + } + } + return 0, io.ErrUnexpectedEOF +} + +var ( + ErrInvalidLengthGauge = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowGauge = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupGauge = fmt.Errorf("proto: unexpected end of group") +) diff --git a/x/incentives/types/gauge_test.go b/x/incentives/types/gauge_test.go new file mode 100644 index 000000000..d05370d66 --- /dev/null +++ b/x/incentives/types/gauge_test.go @@ -0,0 +1,65 @@ +package types_test + +import ( + "testing" + "time" + + sdk "github.com/cosmos/cosmos-sdk/types" + . "github.com/neutron-org/neutron/x/incentives/types" + "github.com/stretchr/testify/assert" +) + +func TestGaugeIsUpcomingGauge(t *testing.T) { + now := time.Now() + gauge := NewGauge(1, false, QueryCondition{}, sdk.Coins{}, now.Add(time.Minute), 10, 0, sdk.Coins{}, 0) + + assert.True(t, gauge.IsUpcomingGauge(now)) + assert.False(t, gauge.IsUpcomingGauge(now.Add(time.Minute))) +} + +func TestGaugeIsActiveGauge(t *testing.T) { + now := time.Now() + gauge := NewGauge(1, false, QueryCondition{}, sdk.Coins{}, now.Add(time.Minute), 10, 0, sdk.Coins{}, 0) + + assert.False(t, gauge.IsActiveGauge(now)) + assert.True(t, gauge.IsActiveGauge(now.Add(11*time.Minute))) + + gauge.IsPerpetual = true + assert.False(t, gauge.IsActiveGauge(now)) + assert.True(t, gauge.IsActiveGauge(now.Add(11*time.Minute))) +} + +func TestGaugeIsFinishedGauge(t *testing.T) { + now := time.Now() + gauge := NewGauge(1, false, QueryCondition{}, sdk.Coins{}, now.Add(-time.Minute), 10, 10, sdk.Coins{}, 0) + assert.True(t, gauge.IsFinishedGauge(now)) + + gauge = NewGauge(1, false, QueryCondition{}, sdk.Coins{}, now.Add(-time.Minute), 10, 8, sdk.Coins{}, 0) + assert.False(t, gauge.IsFinishedGauge(now)) +} + +func TestGaugeEpochsRemaining(t *testing.T) { + gauge := NewGauge(1, false, QueryCondition{}, sdk.Coins{}, time.Time{}, 10, 5, sdk.Coins{}, 0) + + assert.Equal(t, uint64(5), gauge.EpochsRemaining()) + + gauge.IsPerpetual = true + assert.Equal(t, uint64(1), gauge.EpochsRemaining()) +} + +func TestGaugeCoinsRemaining(t *testing.T) { + coins := sdk.Coins{sdk.NewCoin("coin1", sdk.NewInt(100))} + distCoins := sdk.Coins{sdk.NewCoin("coin1", sdk.NewInt(50))} + gauge := NewGauge(1, false, QueryCondition{}, coins, time.Time{}, 10, 5, distCoins, 0) + assert.Equal(t, sdk.Coins{sdk.NewCoin("coin1", sdk.NewInt(50))}, gauge.CoinsRemaining()) +} + +func TestGaugeGetTotal(t *testing.T) { + distSpec := DistributionSpec{ + "addr1": sdk.Coins{sdk.NewCoin("coin1", sdk.NewInt(10))}, + "addr2": sdk.Coins{sdk.NewCoin("coin1", sdk.NewInt(20))}, + "addr3": sdk.Coins{sdk.NewCoin("coin1", sdk.NewInt(30))}, + } + + assert.Equal(t, sdk.Coins{sdk.NewCoin("coin1", sdk.NewInt(60))}, distSpec.GetTotal()) +} diff --git a/x/incentives/types/gauges.go b/x/incentives/types/gauges.go new file mode 100644 index 000000000..32dbb878f --- /dev/null +++ b/x/incentives/types/gauges.go @@ -0,0 +1,24 @@ +package types + +import sdk "github.com/cosmos/cosmos-sdk/types" + +type Gauges []*Gauge + +func (g Gauges) GetCoinsDistributed() sdk.Coins { + result := sdk.Coins{} + for _, gauge := range g { + result = result.Add(gauge.DistributedCoins...) + } + + return result +} + +// getToDistributeCoinsFromGauges returns coins that have not been distributed yet from the provided gauges +func (g Gauges) GetCoinsRemaining() sdk.Coins { + result := sdk.Coins{} + + for _, gauge := range g { + result = result.Add(gauge.CoinsRemaining()...) + } + return result +} diff --git a/x/incentives/types/genesis.go b/x/incentives/types/genesis.go new file mode 100644 index 000000000..e4d616d9a --- /dev/null +++ b/x/incentives/types/genesis.go @@ -0,0 +1,23 @@ +package types + +import ( + "errors" +) + +// DefaultIndex is the default incentive module's global index. +const DefaultIndex uint64 = 1 + +// DefaultGenesis returns the incentive module's default genesis state. +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 gs.Params.DistrEpochIdentifier == "" { + return errors.New("epoch identifier should NOT be empty") + } + return nil +} diff --git a/x/incentives/types/genesis.pb.go b/x/incentives/types/genesis.pb.go new file mode 100644 index 000000000..3e5c7de8c --- /dev/null +++ b/x/incentives/types/genesis.pb.go @@ -0,0 +1,590 @@ +// Code generated by protoc-gen-gogo. DO NOT EDIT. +// source: duality/incentives/genesis.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 + +// GenesisState defines the incentives module's various parameters when first +// initialized +type GenesisState struct { + // params are all the parameters of the module + Params Params `protobuf:"bytes,1,opt,name=params,proto3" json:"params"` + // gauges are all gauges that should exist at genesis + Gauges []*Gauge `protobuf:"bytes,2,rep,name=gauges,proto3" json:"gauges,omitempty"` + // last_gauge_id is what the gauge number will increment from when creating + // the next gauge after genesis + LastGaugeId uint64 `protobuf:"varint,3,opt,name=last_gauge_id,json=lastGaugeId,proto3" json:"last_gauge_id,omitempty"` + LastStakeId uint64 `protobuf:"varint,4,opt,name=last_stake_id,json=lastStakeId,proto3" json:"last_stake_id,omitempty"` + Stakes []*Stake `protobuf:"bytes,5,rep,name=stakes,proto3" json:"stakes,omitempty"` + AccountHistories []*AccountHistory `protobuf:"bytes,6,rep,name=accountHistories,proto3" json:"accountHistories,omitempty"` +} + +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_a99219687c93d9eb, []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 (m *GenesisState) GetGauges() []*Gauge { + if m != nil { + return m.Gauges + } + return nil +} + +func (m *GenesisState) GetLastGaugeId() uint64 { + if m != nil { + return m.LastGaugeId + } + return 0 +} + +func (m *GenesisState) GetLastStakeId() uint64 { + if m != nil { + return m.LastStakeId + } + return 0 +} + +func (m *GenesisState) GetStakes() []*Stake { + if m != nil { + return m.Stakes + } + return nil +} + +func (m *GenesisState) GetAccountHistories() []*AccountHistory { + if m != nil { + return m.AccountHistories + } + return nil +} + +func init() { + proto.RegisterType((*GenesisState)(nil), "duality.incentives.GenesisState") +} + +func init() { proto.RegisterFile("duality/incentives/genesis.proto", fileDescriptor_a99219687c93d9eb) } + +var fileDescriptor_a99219687c93d9eb = []byte{ + // 333 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0x4f, 0x4f, 0xc2, 0x30, + 0x18, 0xc6, 0x57, 0xc0, 0x1d, 0x8a, 0x26, 0xa6, 0xf1, 0x30, 0x77, 0x28, 0x0b, 0xa7, 0x5d, 0xdc, + 0x22, 0x5e, 0xbc, 0xca, 0x05, 0x49, 0x8c, 0x31, 0xe3, 0xe6, 0x85, 0x94, 0xad, 0x19, 0x8d, 0xb0, + 0x12, 0xda, 0x19, 0xf7, 0x2d, 0xfc, 0x54, 0x86, 0x23, 0x47, 0x4f, 0xc6, 0x6c, 0x5f, 0xc4, 0xb4, + 0x2b, 0x42, 0xc2, 0xf4, 0xd6, 0xbe, 0xcf, 0xef, 0x79, 0xff, 0x42, 0x2f, 0xc9, 0xc9, 0x82, 0xc9, + 0x22, 0x64, 0x59, 0x4c, 0x33, 0xc9, 0x5e, 0xa9, 0x08, 0x53, 0x9a, 0x51, 0xc1, 0x44, 0xb0, 0x5a, + 0x73, 0xc9, 0x11, 0x32, 0x44, 0xb0, 0x27, 0xdc, 0x8b, 0x94, 0xa7, 0x5c, 0xcb, 0xa1, 0x7a, 0xd5, + 0xa4, 0xdb, 0x6b, 0xc8, 0xb5, 0x22, 0x6b, 0xb2, 0x34, 0xa9, 0x5c, 0xdc, 0x54, 0x8c, 0xe4, 0x29, + 0xfd, 0x47, 0x17, 0x92, 0xbc, 0xec, 0x74, 0xbf, 0x41, 0x27, 0x71, 0xcc, 0xf3, 0x4c, 0x4e, 0xe7, + 0x4c, 0x48, 0xbe, 0x2e, 0x6a, 0xb2, 0xff, 0xd1, 0x82, 0xa7, 0xa3, 0x7a, 0x8c, 0x89, 0x24, 0x92, + 0xa2, 0x5b, 0x68, 0xd7, 0xad, 0x38, 0xc0, 0x03, 0x7e, 0x77, 0xe0, 0x06, 0xc7, 0x63, 0x05, 0x4f, + 0x9a, 0x18, 0x76, 0x36, 0x5f, 0x3d, 0x2b, 0x32, 0x3c, 0xba, 0x86, 0xb6, 0xee, 0x51, 0x38, 0x2d, + 0xaf, 0xed, 0x77, 0x07, 0x97, 0x4d, 0xce, 0x91, 0x22, 0x22, 0x03, 0xa2, 0x3e, 0x3c, 0x5b, 0x10, + 0x21, 0xa7, 0xfa, 0x3b, 0x65, 0x89, 0xd3, 0xf6, 0x80, 0xdf, 0x89, 0xba, 0x2a, 0xa8, 0xc9, 0x71, + 0xf2, 0xcb, 0xe8, 0xf9, 0x14, 0xd3, 0xd9, 0x33, 0x13, 0x15, 0x1b, 0x27, 0xaa, 0xb4, 0x96, 0x85, + 0x73, 0xf2, 0x77, 0x69, 0x0d, 0x47, 0x06, 0x44, 0x8f, 0xf0, 0xdc, 0x6c, 0xe4, 0x5e, 0x2f, 0x84, + 0x51, 0xe1, 0xd8, 0xda, 0xdc, 0x6f, 0x32, 0xdf, 0x1d, 0xb2, 0x45, 0x74, 0xe4, 0x1d, 0x3e, 0x6c, + 0x4a, 0x0c, 0xb6, 0x25, 0x06, 0xdf, 0x25, 0x06, 0xef, 0x15, 0xb6, 0xb6, 0x15, 0xb6, 0x3e, 0x2b, + 0x6c, 0x3d, 0x0f, 0x52, 0x26, 0xe7, 0xf9, 0x2c, 0x88, 0xf9, 0x32, 0x34, 0x99, 0xaf, 0x16, 0x64, + 0x26, 0x76, 0x9f, 0xf0, 0xed, 0xf0, 0x4c, 0xb2, 0x58, 0x51, 0x31, 0xb3, 0xf5, 0x75, 0x6e, 0x7e, + 0x02, 0x00, 0x00, 0xff, 0xff, 0x90, 0xe9, 0xfd, 0x56, 0x76, 0x02, 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 + if len(m.AccountHistories) > 0 { + for iNdEx := len(m.AccountHistories) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.AccountHistories[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintGenesis(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x32 + } + } + if len(m.Stakes) > 0 { + for iNdEx := len(m.Stakes) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Stakes[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintGenesis(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x2a + } + } + if m.LastStakeId != 0 { + i = encodeVarintGenesis(dAtA, i, uint64(m.LastStakeId)) + i-- + dAtA[i] = 0x20 + } + if m.LastGaugeId != 0 { + i = encodeVarintGenesis(dAtA, i, uint64(m.LastGaugeId)) + i-- + dAtA[i] = 0x18 + } + if len(m.Gauges) > 0 { + for iNdEx := len(m.Gauges) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Gauges[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintGenesis(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } + } + { + 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)) + if len(m.Gauges) > 0 { + for _, e := range m.Gauges { + l = e.Size() + n += 1 + l + sovGenesis(uint64(l)) + } + } + if m.LastGaugeId != 0 { + n += 1 + sovGenesis(uint64(m.LastGaugeId)) + } + if m.LastStakeId != 0 { + n += 1 + sovGenesis(uint64(m.LastStakeId)) + } + if len(m.Stakes) > 0 { + for _, e := range m.Stakes { + l = e.Size() + n += 1 + l + sovGenesis(uint64(l)) + } + } + if len(m.AccountHistories) > 0 { + for _, e := range m.AccountHistories { + l = e.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 + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Gauges", 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 + } + m.Gauges = append(m.Gauges, &Gauge{}) + if err := m.Gauges[len(m.Gauges)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 3: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field LastGaugeId", wireType) + } + m.LastGaugeId = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenesis + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.LastGaugeId |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 4: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field LastStakeId", wireType) + } + m.LastStakeId = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenesis + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.LastStakeId |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 5: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Stakes", 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 + } + m.Stakes = append(m.Stakes, &Stake{}) + if err := m.Stakes[len(m.Stakes)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 6: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field AccountHistories", 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 + } + m.AccountHistories = append(m.AccountHistories, &AccountHistory{}) + if err := m.AccountHistories[len(m.AccountHistories)-1].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/incentives/types/hooks.go b/x/incentives/types/hooks.go new file mode 100644 index 000000000..3c95c2110 --- /dev/null +++ b/x/incentives/types/hooks.go @@ -0,0 +1,82 @@ +package types + +import ( + time "time" + + sdk "github.com/cosmos/cosmos-sdk/types" +) + +type IncentiveHooks interface { + AfterCreateGauge(ctx sdk.Context, gaugeId uint64) + AfterAddToGauge(ctx sdk.Context, gaugeId uint64) + AfterStartDistribution(ctx sdk.Context, gaugeId uint64) + AfterFinishDistribution(ctx sdk.Context, gaugeId uint64) + AfterEpochDistribution(ctx sdk.Context) + AfterAddTokensToStake(ctx sdk.Context, address sdk.AccAddress, stakeID uint64, amount sdk.Coins) + OnTokenStaked(ctx sdk.Context, address sdk.AccAddress, stakeID uint64, amount sdk.Coins, unstakeTime time.Time) + OnTokenUnstaked(ctx sdk.Context, address sdk.AccAddress, stakeID uint64, amount sdk.Coins, unstakeTime time.Time) +} + +var _ IncentiveHooks = MultiIncentiveHooks{} + +// MultiIncentiveHooks combines multiple incentive hooks. All hook functions are run in array sequence. +type MultiIncentiveHooks []IncentiveHooks + +// NewMultiIncentiveHooks combines multiple incentive hooks into a single IncentiveHooks array. +func NewMultiIncentiveHooks(hooks ...IncentiveHooks) MultiIncentiveHooks { + return hooks +} + +func (h MultiIncentiveHooks) AfterCreateGauge(ctx sdk.Context, gaugeID uint64) { + for i := range h { + h[i].AfterCreateGauge(ctx, gaugeID) + } +} + +func (h MultiIncentiveHooks) AfterAddToGauge(ctx sdk.Context, gaugeID uint64) { + for i := range h { + h[i].AfterAddToGauge(ctx, gaugeID) + } +} + +func (h MultiIncentiveHooks) AfterStartDistribution(ctx sdk.Context, gaugeID uint64) { + for i := range h { + h[i].AfterStartDistribution(ctx, gaugeID) + } +} + +func (h MultiIncentiveHooks) AfterFinishDistribution(ctx sdk.Context, gaugeID uint64) { + for i := range h { + h[i].AfterFinishDistribution(ctx, gaugeID) + } +} + +func (h MultiIncentiveHooks) AfterEpochDistribution(ctx sdk.Context) { + for i := range h { + h[i].AfterEpochDistribution(ctx) + } +} + +func (h MultiIncentiveHooks) AfterAddTokensToStake(ctx sdk.Context, address sdk.AccAddress, stakeID uint64, amount sdk.Coins) { + for i := range h { + h[i].AfterAddTokensToStake(ctx, address, stakeID, amount) + } +} + +func (h MultiIncentiveHooks) OnTokenStaked(ctx sdk.Context, address sdk.AccAddress, stakeID uint64, amount sdk.Coins, unstakeTime time.Time) { + for i := range h { + h[i].OnTokenStaked(ctx, address, stakeID, amount, unstakeTime) + } +} + +func (h MultiIncentiveHooks) OnTokenUnstaked(ctx sdk.Context, address sdk.AccAddress, stakeID uint64, amount sdk.Coins, unstakeTime time.Time) { + for i := range h { + h[i].OnTokenUnstaked(ctx, address, stakeID, amount, unstakeTime) + } +} + +// func (h MultiIncentiveHooks) OnStakeExtend(ctx sdk.Context, stakeID uint64, prevDuration, newDuration time.Duration) { +// for i := range h { +// h[i].OnStakeExtend(ctx, stakeID, prevDuration, newDuration) +// } +// } diff --git a/x/incentives/types/keys.go b/x/incentives/types/keys.go new file mode 100644 index 000000000..08bde69a9 --- /dev/null +++ b/x/incentives/types/keys.go @@ -0,0 +1,175 @@ +package types + +import ( + "bytes" + time "time" + + sdk "github.com/cosmos/cosmos-sdk/types" +) + +var ( + // ModuleName defines the module name. + ModuleName = "incentives" + + // StoreKey defines the primary module store key. + StoreKey = ModuleName + + // RouterKey is the message route for slashing. + RouterKey = ModuleName + + // QuerierRoute defines the module's query routing key. + QuerierRoute = ModuleName + + // MemStoreKey defines the in-memory store key. + MemStoreKey = "mem_capability" + + // KeyPrefixTimestamp defines prefix key for timestamp iterator key. + KeyPrefixTimestamp = []byte{0x01} + + // KeyLastGaugeID defines key for setting last gauge ID. + KeyLastGaugeID = []byte{0x02} + + // KeyPrefixGauge defines prefix key for storing gauges. + KeyPrefixGauge = []byte{0x03} + + // KeyPrefixGaugeIndex defines prefix key for storing reference key for all gauges. + KeyPrefixGaugeIndex = []byte{0x04} + + // KeyPrefixGaugeIndexUpcoming defines prefix key for storing reference key for upcoming gauges. + KeyPrefixGaugeIndexUpcoming = []byte{0x04, 0x00} + + // KeyPrefixGaugeIndexActive defines prefix key for storing reference key for active gauges. + KeyPrefixGaugeIndexActive = []byte{0x04, 0x01} + + // KeyPrefixGaugeIndexFinished defines prefix key for storing reference key for finished gauges. + KeyPrefixGaugeIndexFinished = []byte{0x04, 0x02} + + // KeyPrefixGaugeIndexByPair defines prefix key for storing indexes of gauge IDs by denomination. + KeyPrefixGaugeIndexByPair = []byte{0x05} + + // KeyLastStakeID defines key to store stake ID used by last. + KeyLastStakeID = []byte{0x06} + + // KeyPrefixStake defines prefix to store period stake by ID. + KeyPrefixStake = []byte{0x07} + + // KeyPrefixStakeIndexAccount defines prefix for the iteration of stake IDs by account. + KeyPrefixStakeIndex = []byte{0x08} + + // KeyPrefixStakeIndexAccount defines prefix for the iteration of stake IDs by account. + KeyPrefixStakeIndexAccount = []byte{0x09} + + // KeyPrefixStakeIndexDenom defines prefix for the iteration of stake IDs by denom. + KeyPrefixStakeIndexDenom = []byte{0x0c} + + // KeyPrefixStakeIndexPairTick defines prefix for the iteration of stake IDs by pairId and tick index. + KeyPrefixStakeIndexPairTick = []byte{0x0d} + + // KeyPrefixStakeIndexAccountDenom defines prefix for the iteration of stake IDs by account, denomination. + KeyPrefixStakeIndexAccountDenom = []byte{0x0e} + + // KeyPrefixStakeIndexTimestamp defines prefix for the iteration of stake IDs by day epoch integer. + KeyPrefixStakeIndexPairDistEpoch = []byte{0x0f} + + // KeyPrefixAccountHistory defines the prefix for storing account histories. + KeyPrefixAccountHistory = []byte{0x10} + + // KeyndexSeparator defines separator between keys when combine, it should be one that is not used in denom expression. + KeyIndexSeparator = []byte{0xFF} +) + +// stakeStoreKey returns action store key from ID. +func GetStakeStoreKey(id uint64) []byte { + return CombineKeys(KeyPrefixStake, sdk.Uint64ToBigEndian(id)) +} + +// combineKeys combine bytes array into a single bytes. +func CombineKeys(keys ...[]byte) []byte { + return bytes.Join(keys, KeyIndexSeparator) +} + +// getTimeKey returns the key used for getting a set of period stakes +// where unstakeTime is after a specific time. +func GetTimeKey(timestamp time.Time) []byte { + timeBz := sdk.FormatTimeBytes(timestamp) + timeBzL := len(timeBz) + prefixL := len(KeyPrefixTimestamp) + + bz := make([]byte, prefixL+8+timeBzL) + + // copy the prefix + copy(bz[:prefixL], KeyPrefixTimestamp) + + // copy the encoded time bytes length + copy(bz[prefixL:prefixL+8], sdk.Uint64ToBigEndian(uint64(timeBzL))) + + // copy the encoded time bytes + copy(bz[prefixL+8:prefixL+8+timeBzL], timeBz) + return bz +} + +// gaugeStoreKey returns the combined byte array (store key) of the provided gauge ID's key prefix and the ID itself. +func GetKeyGaugeStore(id uint64) []byte { + return CombineKeys(KeyPrefixGauge, sdk.Uint64ToBigEndian(id)) +} + +// gaugePairStoreKey returns the combined byte array (store key) of the provided gauge denom key prefix and the denom itself. +func GetKeyGaugeIndexByPair(pairID string) []byte { + return CombineKeys(KeyPrefixGaugeIndexByPair, []byte(pairID)) +} + +func GetKeyStakeIndexByAccount(account sdk.AccAddress) []byte { + return CombineKeys( + KeyPrefixStakeIndexAccount, + account, + ) +} + +func GetKeyStakeIndexByDenom(denom string) []byte { + return CombineKeys( + KeyPrefixStakeIndexDenom, + []byte(denom), + ) +} + +func GetKeyStakeIndexByAccountDenom(account sdk.AccAddress, denom string) []byte { + return CombineKeys( + KeyPrefixStakeIndexAccountDenom, + account, + []byte(denom), + ) +} + +func GetKeyStakeIndexByDistEpoch(pairID string, distEpoch int64) []byte { + return CombineKeys( + KeyPrefixStakeIndexPairDistEpoch, + []byte(pairID), + GetKeyInt64(distEpoch), + ) +} + +func GetKeyStakeIndexByPairTick(pairID string, tickIndex int64) []byte { + return CombineKeys( + KeyPrefixStakeIndexPairTick, + []byte(pairID), + GetKeyInt64(tickIndex), + ) +} + +func GetKeyAccountHistory(address string) []byte { + return CombineKeys( + KeyPrefixStakeIndexPairTick, + []byte(address), + ) +} + +func GetKeyInt64(a int64) []byte { + key := make([]byte, 9) + if a < 0 { + copy(key[1:], sdk.Uint64ToBigEndian(uint64(a))) + } else { + copy(key[:1], []byte{0x01}) + copy(key[1:], sdk.Uint64ToBigEndian(uint64(a))) + } + return key +} diff --git a/x/incentives/types/keys_test.go b/x/incentives/types/keys_test.go new file mode 100644 index 000000000..8ea98bdda --- /dev/null +++ b/x/incentives/types/keys_test.go @@ -0,0 +1,18 @@ +package types_test + +import ( + "bytes" + "testing" + time "time" + + sdk "github.com/cosmos/cosmos-sdk/types" + . "github.com/neutron-org/neutron/x/incentives/types" + "github.com/stretchr/testify/require" +) + +func TestGetTimeKey(t *testing.T) { + now := time.Now() + timeKey := GetTimeKey(now) + require.True(t, bytes.HasPrefix(timeKey, KeyPrefixTimestamp)) + require.True(t, bytes.HasSuffix(timeKey, sdk.FormatTimeBytes(now))) +} diff --git a/x/incentives/types/msgs.go b/x/incentives/types/msgs.go new file mode 100644 index 000000000..bc4ba01d9 --- /dev/null +++ b/x/incentives/types/msgs.go @@ -0,0 +1,230 @@ +package types + +import ( + "fmt" + "time" + + sdk "github.com/cosmos/cosmos-sdk/types" + sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + dextypes "github.com/neutron-org/neutron/x/dex/types" +) + +const ( + TypeMsgCreateGauge = "create_gauge" + TypeMsgAddToGauge = "add_to_gauge" + TypeMsgStakeTokens = "stake_tokens" + TypeMsgBeginUnstaking = "begin_unstaking" +) + +var _ sdk.Msg = &MsgCreateGauge{} + +// NewMsgCreateGauge creates a message to create a gauge with the provided parameters. +func NewMsgCreateGauge( + isPerpetual bool, + owner sdk.AccAddress, + distributeTo QueryCondition, + coins sdk.Coins, + startTime time.Time, + numEpochsPaidOver uint64, + pricingTick int64, +) *MsgCreateGauge { + return &MsgCreateGauge{ + IsPerpetual: isPerpetual, + Owner: owner.String(), + DistributeTo: distributeTo, + Coins: coins, + StartTime: startTime, + NumEpochsPaidOver: numEpochsPaidOver, + PricingTick: pricingTick, + } +} + +// Route takes a create gauge message, then returns the RouterKey used for slashing. +func (m MsgCreateGauge) Route() string { return RouterKey } + +// Type takes a create gauge message, then returns a create gauge message type. +func (m MsgCreateGauge) Type() string { return TypeMsgCreateGauge } + +// ValidateBasic checks that the create gauge message is valid. +func (m MsgCreateGauge) ValidateBasic() error { + if m.Owner == "" { + return sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, "owner should be set") + } + // TODO: If this is not set, infer start time as "now" + if m.StartTime.Equal(time.Time{}) { + return sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, "distribution start time should be set") + } + if m.NumEpochsPaidOver == 0 { + return sdkerrors.Wrapf( + sdkerrors.ErrInvalidRequest, + "distribution period should be at least 1 epoch", + ) + } + if m.IsPerpetual && m.NumEpochsPaidOver != 1 { + return sdkerrors.Wrapf( + sdkerrors.ErrInvalidRequest, + "distribution period should be 1 epoch for perpetual gauge", + ) + } + if dextypes.IsTickOutOfRange(m.PricingTick) { + return sdkerrors.Wrapf( + sdkerrors.ErrInvalidRequest, + "pricing tick is out of range, must be between %d and %d", + int64(dextypes.MaxTickExp)*-1, + dextypes.MaxTickExp, + ) + } + if dextypes.IsTickOutOfRange(m.DistributeTo.StartTick) { + return sdkerrors.Wrapf( + sdkerrors.ErrInvalidRequest, + "start tick is out of range, must be between %d and %d", + int64(dextypes.MaxTickExp)*-1, + dextypes.MaxTickExp, + ) + } + if dextypes.IsTickOutOfRange(m.DistributeTo.EndTick) { + return sdkerrors.Wrapf( + sdkerrors.ErrInvalidRequest, + "start tick is out of range, must be between %d and %d", + int64(dextypes.MaxTickExp)*-1, + dextypes.MaxTickExp, + ) + } + + return nil +} + +// GetSignBytes takes a create gauge message and turns it into a byte array. +func (m MsgCreateGauge) GetSignBytes() []byte { + return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(&m)) +} + +// GetSigners takes a create gauge message and returns the owner in a byte array. +func (m MsgCreateGauge) GetSigners() []sdk.AccAddress { + owner, _ := sdk.AccAddressFromBech32(m.Owner) + return []sdk.AccAddress{owner} +} + +var _ sdk.Msg = &MsgAddToGauge{} + +// NewMsgAddToGauge creates a message to add rewards to a specific gauge. +func NewMsgAddToGauge(owner sdk.AccAddress, gaugeID uint64, rewards sdk.Coins) *MsgAddToGauge { + return &MsgAddToGauge{ + Owner: owner.String(), + GaugeId: gaugeID, + Rewards: rewards, + } +} + +// Route takes an add to gauge message, then returns the RouterKey used for slashing. +func (m MsgAddToGauge) Route() string { return RouterKey } + +// Type takes an add to gauge message, then returns an add to gauge message type. +func (m MsgAddToGauge) Type() string { return TypeMsgAddToGauge } + +// ValidateBasic checks that the add to gauge message is valid. +func (m MsgAddToGauge) ValidateBasic() error { + if m.Owner == "" { + return sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, "owner should be set") + } + if m.Rewards.Empty() { + return sdkerrors.Wrapf( + sdkerrors.ErrInvalidRequest, + "additional rewards should not be empty", + ) + } + + return nil +} + +// GetSignBytes takes an add to gauge message and turns it into a byte array. +func (m MsgAddToGauge) GetSignBytes() []byte { + return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(&m)) +} + +// GetSigners takes an add to gauge message and returns the owner in a byte array. +func (m MsgAddToGauge) GetSigners() []sdk.AccAddress { + owner, _ := sdk.AccAddressFromBech32(m.Owner) + return []sdk.AccAddress{owner} +} + +var _ sdk.Msg = &MsgStake{} + +// NewMsgStakeTokens creates a message to stake tokens. +func NewMsgSetupStake(owner sdk.AccAddress, duration time.Duration, coins sdk.Coins) *MsgStake { + return &MsgStake{ + Owner: owner.String(), + Coins: coins, + } +} + +func (m MsgStake) Route() string { return RouterKey } +func (m MsgStake) Type() string { return TypeMsgStakeTokens } +func (m MsgStake) ValidateBasic() error { + _, err := sdk.AccAddressFromBech32(m.Owner) + if err != nil { + return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid owner address (%s)", err) + } + + if !m.Coins.IsAllPositive() { + return fmt.Errorf("cannot stake up a zero or negative amount") + } + + return nil +} + +func (m MsgStake) GetSignBytes() []byte { + return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(&m)) +} + +func (m MsgStake) GetSigners() []sdk.AccAddress { + owner, _ := sdk.AccAddressFromBech32(m.Owner) + return []sdk.AccAddress{owner} +} + +var _ sdk.Msg = &MsgUnstake{} + +func NewMsgUnstakeDescriptor(id uint64, coins sdk.Coins) *MsgUnstake_UnstakeDescriptor { + return &MsgUnstake_UnstakeDescriptor{ + ID: id, + Coins: coins, + } +} + +// NewMsgUnstake creates a message to unstake the tokens of a set of stake records. +func NewMsgUnstake(owner sdk.AccAddress, unstakes []*MsgUnstake_UnstakeDescriptor) *MsgUnstake { + return &MsgUnstake{ + Owner: owner.String(), + Unstakes: unstakes, + } +} + +func (m MsgUnstake) Route() string { return RouterKey } +func (m MsgUnstake) Type() string { return TypeMsgBeginUnstaking } +func (m MsgUnstake) ValidateBasic() error { + _, err := sdk.AccAddressFromBech32(m.Owner) + if err != nil { + return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid owner address (%s)", err) + } + + for _, unstake := range m.Unstakes { + if unstake.ID == 0 { + return fmt.Errorf("invalid stake ID, got %v", unstake.ID) + } + + if !unstake.Coins.Empty() && !unstake.Coins.IsAllPositive() { + return fmt.Errorf("cannot unstake a zero or negative amount") + } + } + + return nil +} + +func (m MsgUnstake) GetSignBytes() []byte { + return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(&m)) +} + +func (m MsgUnstake) GetSigners() []sdk.AccAddress { + owner, _ := sdk.AccAddressFromBech32(m.Owner) + return []sdk.AccAddress{owner} +} diff --git a/x/incentives/types/msgs_test.go b/x/incentives/types/msgs_test.go new file mode 100644 index 000000000..659d13b21 --- /dev/null +++ b/x/incentives/types/msgs_test.go @@ -0,0 +1,323 @@ +package types_test + +import ( + "testing" + time "time" + + "github.com/cometbft/cometbft/crypto/ed25519" + "github.com/stretchr/testify/require" + + sdk "github.com/cosmos/cosmos-sdk/types" + + "github.com/neutron-org/neutron/testutil/apptesting" + dextypes "github.com/neutron-org/neutron/x/dex/types" + . "github.com/neutron-org/neutron/x/incentives/types" +) + +// TestMsgCreatePool tests if valid/invalid create pool messages are properly validated/invalidated +func TestMsgCreatePool(t *testing.T) { + // generate a private/public key pair and get the respective address + pk1 := ed25519.GenPrivKey().PubKey() + addr1 := sdk.AccAddress(pk1.Address()) + + // make a proper createPool message + createMsg := func(after func(msg MsgCreateGauge) MsgCreateGauge) MsgCreateGauge { + distributeTo := QueryCondition{ + PairID: &dextypes.PairID{ + Token0: "TokenA", + Token1: "TokenB", + }, + StartTick: -10, + EndTick: 10, + } + + properMsg := *NewMsgCreateGauge( + false, + addr1, + distributeTo, + sdk.Coins{}, + time.Now(), + 2, + 0, + ) + + return after(properMsg) + } + + // validate createPool message was created as intended + msg := createMsg(func(msg MsgCreateGauge) MsgCreateGauge { + return msg + }) + require.Equal(t, msg.Route(), RouterKey) + require.Equal(t, msg.Type(), "create_gauge") + signers := msg.GetSigners() + require.Equal(t, len(signers), 1) + require.Equal(t, signers[0].String(), addr1.String()) + + tests := []struct { + name string + msg MsgCreateGauge + expectPass bool + }{ + { + name: "proper msg", + msg: createMsg(func(msg MsgCreateGauge) MsgCreateGauge { + return msg + }), + expectPass: true, + }, + { + name: "empty owner", + msg: createMsg(func(msg MsgCreateGauge) MsgCreateGauge { + msg.Owner = "" + return msg + }), + expectPass: false, + }, + { + name: "invalid distribution start time", + msg: createMsg(func(msg MsgCreateGauge) MsgCreateGauge { + msg.StartTime = time.Time{} + return msg + }), + expectPass: false, + }, + { + name: "invalid num epochs paid over", + msg: createMsg(func(msg MsgCreateGauge) MsgCreateGauge { + msg.NumEpochsPaidOver = 0 + return msg + }), + expectPass: false, + }, + { + name: "invalid num epochs paid over for perpetual gauge", + msg: createMsg(func(msg MsgCreateGauge) MsgCreateGauge { + msg.NumEpochsPaidOver = 2 + msg.IsPerpetual = true + return msg + }), + expectPass: false, + }, + { + name: "valid num epochs paid over for perpetual gauge", + msg: createMsg(func(msg MsgCreateGauge) MsgCreateGauge { + msg.NumEpochsPaidOver = 1 + msg.IsPerpetual = true + return msg + }), + expectPass: true, + }, + } + + for _, test := range tests { + if test.expectPass { + require.NoError(t, test.msg.ValidateBasic(), "test: %v", test.name) + } else { + require.Error(t, test.msg.ValidateBasic(), "test: %v", test.name) + } + } +} + +// TestMsgAddToGauge tests if valid/invalid add to gauge messages are properly validated/invalidated +func TestMsgAddToGauge(t *testing.T) { + // generate a private/public key pair and get the respective address + pk1 := ed25519.GenPrivKey().PubKey() + addr1 := sdk.AccAddress(pk1.Address()) + + // make a proper addToGauge message + createMsg := func(after func(msg MsgAddToGauge) MsgAddToGauge) MsgAddToGauge { + properMsg := *NewMsgAddToGauge( + addr1, + 1, + sdk.Coins{sdk.NewInt64Coin("stake", 10)}, + ) + + return after(properMsg) + } + + // validate addToGauge message was created as intended + msg := createMsg(func(msg MsgAddToGauge) MsgAddToGauge { + return msg + }) + require.Equal(t, msg.Route(), RouterKey) + require.Equal(t, msg.Type(), "add_to_gauge") + signers := msg.GetSigners() + require.Equal(t, len(signers), 1) + require.Equal(t, signers[0].String(), addr1.String()) + + tests := []struct { + name string + msg MsgAddToGauge + expectPass bool + }{ + { + name: "proper msg", + msg: createMsg(func(msg MsgAddToGauge) MsgAddToGauge { + return msg + }), + expectPass: true, + }, + { + name: "empty owner", + msg: createMsg(func(msg MsgAddToGauge) MsgAddToGauge { + msg.Owner = "" + return msg + }), + expectPass: false, + }, + { + name: "empty rewards", + msg: createMsg(func(msg MsgAddToGauge) MsgAddToGauge { + msg.Rewards = sdk.Coins{} + return msg + }), + expectPass: false, + }, + } + + for _, test := range tests { + if test.expectPass { + require.NoError(t, test.msg.ValidateBasic(), "test: %v", test.name) + } else { + require.Error(t, test.msg.ValidateBasic(), "test: %v", test.name) + } + } +} + +func TestMsgSetupStake(t *testing.T) { + addr1, invalidAddr := apptesting.GenerateTestAddrs() + + tests := []struct { + name string + msg MsgStake + expectPass bool + }{ + { + name: "proper msg", + msg: MsgStake{ + Owner: addr1, + Coins: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100))), + }, + expectPass: true, + }, + { + name: "invalid owner", + msg: MsgStake{ + Owner: invalidAddr, + Coins: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100))), + }, + }, + { + name: "zero token amount", + msg: MsgStake{ + Owner: addr1, + Coins: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(0))), + }, + }, + } + + for _, test := range tests { + t.Run(test.name, func(t *testing.T) { + if test.expectPass { + require.NoError(t, test.msg.ValidateBasic(), "test: %v", test.name) + require.Equal(t, test.msg.Route(), RouterKey) + require.Equal(t, test.msg.Type(), "stake_tokens") + signers := test.msg.GetSigners() + require.Equal(t, len(signers), 1) + require.Equal(t, signers[0].String(), addr1) + } else { + require.Error(t, test.msg.ValidateBasic(), "test: %v", test.name) + } + }) + } +} + +func TestMsgUnstake(t *testing.T) { + addr1, invalidAddr := apptesting.GenerateTestAddrs() + + tests := []struct { + name string + msg MsgUnstake + expectPass bool + }{ + { + name: "proper msg", + msg: MsgUnstake{ + Owner: addr1, + Unstakes: []*MsgUnstake_UnstakeDescriptor{ + { + ID: 1, + Coins: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100))), + }, + }, + }, + expectPass: true, + }, + { + name: "invalid owner", + msg: MsgUnstake{ + Owner: invalidAddr, + Unstakes: []*MsgUnstake_UnstakeDescriptor{ + { + ID: 1, + Coins: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100))), + }, + }, + }, + }, + { + name: "invalid stake ID", + msg: MsgUnstake{ + Owner: addr1, + Unstakes: []*MsgUnstake_UnstakeDescriptor{ + { + ID: 0, + Coins: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100))), + }, + }, + }, + }, + { + name: "zero coins (same as nil)", + msg: MsgUnstake{ + Owner: addr1, + Unstakes: []*MsgUnstake_UnstakeDescriptor{ + { + ID: 1, + Coins: sdk.NewCoins(sdk.NewCoin("test1", sdk.NewInt(0))), + }, + }, + }, + expectPass: true, + }, + { + name: "nil coins (unstake by ID)", + msg: MsgUnstake{ + Owner: addr1, + Unstakes: []*MsgUnstake_UnstakeDescriptor{ + { + ID: 1, + Coins: sdk.NewCoins(), + }, + }, + }, + expectPass: true, + }, + } + + for _, test := range tests { + t.Run(test.name, func(t *testing.T) { + if test.expectPass { + require.NoError(t, test.msg.ValidateBasic(), "test: %v", test.name) + require.Equal(t, test.msg.Route(), RouterKey) + require.Equal(t, test.msg.Type(), "begin_unstaking") + signers := test.msg.GetSigners() + require.Equal(t, len(signers), 1) + require.Equal(t, signers[0].String(), addr1) + } else { + require.Error(t, test.msg.ValidateBasic(), "test: %v", test.name) + } + }) + } +} diff --git a/x/incentives/types/params.go b/x/incentives/types/params.go new file mode 100644 index 000000000..560ec9b67 --- /dev/null +++ b/x/incentives/types/params.go @@ -0,0 +1,50 @@ +package types + +import ( + epochtypes "github.com/neutron-org/neutron/x/epochs/types" + + paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" +) + +// Incentives parameters key store. +var ( + KeyDistrEpochIdentifier = []byte("DistrEpochIdentifier") + KeyMaxGauges = []byte("MaxGauges") +) + +// ParamKeyTable returns the key table for the incentive module's parameters. +func ParamKeyTable() paramtypes.KeyTable { + return paramtypes.NewKeyTable().RegisterParamSet(&Params{}) +} + +// NewParams takes an epoch distribution identifier, then returns an incentives Params struct. +func NewParams(distrEpochIdentifier string, maxGauges uint64) Params { + return Params{ + DistrEpochIdentifier: distrEpochIdentifier, + MaxGauges: maxGauges, + } +} + +// DefaultParams returns the default incentives module parameters. +func DefaultParams() Params { + return Params{ + DistrEpochIdentifier: "day", + MaxGauges: 20, + } +} + +// Validate checks that the incentives module parameters are valid. +func (p Params) Validate() error { + if err := epochtypes.ValidateEpochIdentifierInterface(p.DistrEpochIdentifier); err != nil { + return err + } + return nil +} + +// ParamSetPairs takes the parameter struct and associates the paramsubspace key and field of the parameters as a KVStore. +func (p *Params) ParamSetPairs() paramtypes.ParamSetPairs { + return paramtypes.ParamSetPairs{ + paramtypes.NewParamSetPair(KeyDistrEpochIdentifier, &p.DistrEpochIdentifier, epochtypes.ValidateEpochIdentifierInterface), + paramtypes.NewParamSetPair(KeyMaxGauges, &p.MaxGauges, func(interface{}) error { return nil }), + } +} diff --git a/x/incentives/types/params.pb.go b/x/incentives/types/params.pb.go new file mode 100644 index 000000000..9abc27827 --- /dev/null +++ b/x/incentives/types/params.pb.go @@ -0,0 +1,359 @@ +// Code generated by protoc-gen-gogo. DO NOT EDIT. +// source: duality/incentives/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 holds parameters for the incentives module +type Params struct { + // distr_epoch_identifier is what epoch type distribution will be triggered by + // (day, week, etc.) + DistrEpochIdentifier string `protobuf:"bytes,1,opt,name=distr_epoch_identifier,json=distrEpochIdentifier,proto3" json:"distr_epoch_identifier,omitempty" yaml:"distr_epoch_identifier"` + MaxGauges uint64 `protobuf:"varint,2,opt,name=max_gauges,json=maxGauges,proto3" json:"max_gauges,omitempty" yaml:"max_gauges"` +} + +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_7cfdf36cf57c01b8, []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) GetDistrEpochIdentifier() string { + if m != nil { + return m.DistrEpochIdentifier + } + return "" +} + +func (m *Params) GetMaxGauges() uint64 { + if m != nil { + return m.MaxGauges + } + return 0 +} + +func init() { + proto.RegisterType((*Params)(nil), "duality.incentives.Params") +} + +func init() { proto.RegisterFile("duality/incentives/params.proto", fileDescriptor_7cfdf36cf57c01b8) } + +var fileDescriptor_7cfdf36cf57c01b8 = []byte{ + // 243 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4f, 0x29, 0x4d, 0xcc, + 0xc9, 0x2c, 0xa9, 0xd4, 0xcf, 0xcc, 0x4b, 0x4e, 0xcd, 0x2b, 0xc9, 0x2c, 0x4b, 0x2d, 0xd6, 0x2f, + 0x48, 0x2c, 0x4a, 0xcc, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x82, 0x2a, 0xd0, + 0x43, 0x28, 0x90, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0x4b, 0xeb, 0x83, 0x58, 0x10, 0x95, 0x4a, + 0xd3, 0x19, 0xb9, 0xd8, 0x02, 0xc0, 0x5a, 0x85, 0xc2, 0xb9, 0xc4, 0x52, 0x32, 0x8b, 0x4b, 0x8a, + 0xe2, 0x53, 0x0b, 0xf2, 0x93, 0x33, 0xe2, 0x33, 0x53, 0x40, 0x3a, 0xd3, 0x32, 0x53, 0x8b, 0x24, + 0x18, 0x15, 0x18, 0x35, 0x38, 0x9d, 0x14, 0x3f, 0xdd, 0x93, 0x97, 0xad, 0x4c, 0xcc, 0xcd, 0xb1, + 0x52, 0xc2, 0xae, 0x4e, 0x29, 0x48, 0x04, 0x2c, 0xe1, 0x0a, 0x12, 0xf7, 0x84, 0x0b, 0x0b, 0x99, + 0x70, 0x71, 0xe5, 0x26, 0x56, 0xc4, 0xa7, 0x27, 0x96, 0xa6, 0xa7, 0x16, 0x4b, 0x30, 0x29, 0x30, + 0x6a, 0xb0, 0x38, 0x89, 0x7e, 0xba, 0x27, 0x2f, 0x08, 0x31, 0x0c, 0x21, 0xa7, 0x14, 0xc4, 0x99, + 0x9b, 0x58, 0xe1, 0x0e, 0x66, 0x3b, 0xf9, 0x9c, 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, 0x51, 0x7a, 0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, 0x7e, 0xae, 0x3e, 0xd4, 0xa3, + 0xba, 0x39, 0x89, 0x49, 0xc5, 0x30, 0x8e, 0x7e, 0x05, 0x72, 0xc0, 0x94, 0x54, 0x16, 0xa4, 0x16, + 0x27, 0xb1, 0x81, 0xbd, 0x6b, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x56, 0x09, 0x16, 0x1d, 0x3b, + 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 m.MaxGauges != 0 { + i = encodeVarintParams(dAtA, i, uint64(m.MaxGauges)) + i-- + dAtA[i] = 0x10 + } + if len(m.DistrEpochIdentifier) > 0 { + i -= len(m.DistrEpochIdentifier) + copy(dAtA[i:], m.DistrEpochIdentifier) + i = encodeVarintParams(dAtA, i, uint64(len(m.DistrEpochIdentifier))) + 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.DistrEpochIdentifier) + if l > 0 { + n += 1 + l + sovParams(uint64(l)) + } + if m.MaxGauges != 0 { + n += 1 + sovParams(uint64(m.MaxGauges)) + } + 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 DistrEpochIdentifier", 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.DistrEpochIdentifier = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field MaxGauges", wireType) + } + m.MaxGauges = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowParams + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.MaxGauges |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + 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/incentives/types/query.pb.go b/x/incentives/types/query.pb.go new file mode 100644 index 000000000..6875b41a9 --- /dev/null +++ b/x/incentives/types/query.pb.go @@ -0,0 +1,3584 @@ +// Code generated by protoc-gen-gogo. DO NOT EDIT. +// source: duality/incentives/query.proto + +package types + +import ( + context "context" + fmt "fmt" + github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" + types "github.com/cosmos/cosmos-sdk/types" + _ "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 + +type GaugeStatus int32 + +const ( + GaugeStatus_ACTIVE_UPCOMING GaugeStatus = 0 + GaugeStatus_ACTIVE GaugeStatus = 1 + GaugeStatus_UPCOMING GaugeStatus = 2 + GaugeStatus_FINISHED GaugeStatus = 3 +) + +var GaugeStatus_name = map[int32]string{ + 0: "ACTIVE_UPCOMING", + 1: "ACTIVE", + 2: "UPCOMING", + 3: "FINISHED", +} + +var GaugeStatus_value = map[string]int32{ + "ACTIVE_UPCOMING": 0, + "ACTIVE": 1, + "UPCOMING": 2, + "FINISHED": 3, +} + +func (x GaugeStatus) String() string { + return proto.EnumName(GaugeStatus_name, int32(x)) +} + +func (GaugeStatus) EnumDescriptor() ([]byte, []int) { + return fileDescriptor_27b4715672276428, []int{0} +} + +type GetModuleStatusRequest struct { +} + +func (m *GetModuleStatusRequest) Reset() { *m = GetModuleStatusRequest{} } +func (m *GetModuleStatusRequest) String() string { return proto.CompactTextString(m) } +func (*GetModuleStatusRequest) ProtoMessage() {} +func (*GetModuleStatusRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_27b4715672276428, []int{0} +} +func (m *GetModuleStatusRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *GetModuleStatusRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_GetModuleStatusRequest.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 *GetModuleStatusRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetModuleStatusRequest.Merge(m, src) +} +func (m *GetModuleStatusRequest) XXX_Size() int { + return m.Size() +} +func (m *GetModuleStatusRequest) XXX_DiscardUnknown() { + xxx_messageInfo_GetModuleStatusRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_GetModuleStatusRequest proto.InternalMessageInfo + +type GetModuleStatusResponse struct { + // Coins that have yet to be distributed + RewardCoins github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,1,rep,name=reward_coins,json=rewardCoins,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"reward_coins"` + StakedCoins github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,2,rep,name=staked_coins,json=stakedCoins,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"staked_coins"` + Params Params `protobuf:"bytes,3,opt,name=params,proto3" json:"params"` +} + +func (m *GetModuleStatusResponse) Reset() { *m = GetModuleStatusResponse{} } +func (m *GetModuleStatusResponse) String() string { return proto.CompactTextString(m) } +func (*GetModuleStatusResponse) ProtoMessage() {} +func (*GetModuleStatusResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_27b4715672276428, []int{1} +} +func (m *GetModuleStatusResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *GetModuleStatusResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_GetModuleStatusResponse.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 *GetModuleStatusResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetModuleStatusResponse.Merge(m, src) +} +func (m *GetModuleStatusResponse) XXX_Size() int { + return m.Size() +} +func (m *GetModuleStatusResponse) XXX_DiscardUnknown() { + xxx_messageInfo_GetModuleStatusResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_GetModuleStatusResponse proto.InternalMessageInfo + +func (m *GetModuleStatusResponse) GetRewardCoins() github_com_cosmos_cosmos_sdk_types.Coins { + if m != nil { + return m.RewardCoins + } + return nil +} + +func (m *GetModuleStatusResponse) GetStakedCoins() github_com_cosmos_cosmos_sdk_types.Coins { + if m != nil { + return m.StakedCoins + } + return nil +} + +func (m *GetModuleStatusResponse) GetParams() Params { + if m != nil { + return m.Params + } + return Params{} +} + +type GetGaugeByIDRequest struct { + // Gague ID being queried + Id uint64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` +} + +func (m *GetGaugeByIDRequest) Reset() { *m = GetGaugeByIDRequest{} } +func (m *GetGaugeByIDRequest) String() string { return proto.CompactTextString(m) } +func (*GetGaugeByIDRequest) ProtoMessage() {} +func (*GetGaugeByIDRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_27b4715672276428, []int{2} +} +func (m *GetGaugeByIDRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *GetGaugeByIDRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_GetGaugeByIDRequest.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 *GetGaugeByIDRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetGaugeByIDRequest.Merge(m, src) +} +func (m *GetGaugeByIDRequest) XXX_Size() int { + return m.Size() +} +func (m *GetGaugeByIDRequest) XXX_DiscardUnknown() { + xxx_messageInfo_GetGaugeByIDRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_GetGaugeByIDRequest proto.InternalMessageInfo + +func (m *GetGaugeByIDRequest) GetId() uint64 { + if m != nil { + return m.Id + } + return 0 +} + +type GetGaugeByIDResponse struct { + // Gauge that corresponds to provided gague ID + Gauge *Gauge `protobuf:"bytes,1,opt,name=gauge,proto3" json:"gauge,omitempty"` +} + +func (m *GetGaugeByIDResponse) Reset() { *m = GetGaugeByIDResponse{} } +func (m *GetGaugeByIDResponse) String() string { return proto.CompactTextString(m) } +func (*GetGaugeByIDResponse) ProtoMessage() {} +func (*GetGaugeByIDResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_27b4715672276428, []int{3} +} +func (m *GetGaugeByIDResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *GetGaugeByIDResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_GetGaugeByIDResponse.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 *GetGaugeByIDResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetGaugeByIDResponse.Merge(m, src) +} +func (m *GetGaugeByIDResponse) XXX_Size() int { + return m.Size() +} +func (m *GetGaugeByIDResponse) XXX_DiscardUnknown() { + xxx_messageInfo_GetGaugeByIDResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_GetGaugeByIDResponse proto.InternalMessageInfo + +func (m *GetGaugeByIDResponse) GetGauge() *Gauge { + if m != nil { + return m.Gauge + } + return nil +} + +type GetGaugeQualifyingValueRequest struct { + // Gague ID being queried + Id uint64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` +} + +func (m *GetGaugeQualifyingValueRequest) Reset() { *m = GetGaugeQualifyingValueRequest{} } +func (m *GetGaugeQualifyingValueRequest) String() string { return proto.CompactTextString(m) } +func (*GetGaugeQualifyingValueRequest) ProtoMessage() {} +func (*GetGaugeQualifyingValueRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_27b4715672276428, []int{4} +} +func (m *GetGaugeQualifyingValueRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *GetGaugeQualifyingValueRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_GetGaugeQualifyingValueRequest.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 *GetGaugeQualifyingValueRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetGaugeQualifyingValueRequest.Merge(m, src) +} +func (m *GetGaugeQualifyingValueRequest) XXX_Size() int { + return m.Size() +} +func (m *GetGaugeQualifyingValueRequest) XXX_DiscardUnknown() { + xxx_messageInfo_GetGaugeQualifyingValueRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_GetGaugeQualifyingValueRequest proto.InternalMessageInfo + +func (m *GetGaugeQualifyingValueRequest) GetId() uint64 { + if m != nil { + return m.Id + } + return 0 +} + +type GetGaugeQualifyingValueResponse struct { + // The amount of value at the gauge's pricing tick currently qualifying for the gauge. + QualifyingValue uint64 `protobuf:"varint,1,opt,name=qualifying_value,json=qualifyingValue,proto3" json:"qualifying_value,omitempty"` +} + +func (m *GetGaugeQualifyingValueResponse) Reset() { *m = GetGaugeQualifyingValueResponse{} } +func (m *GetGaugeQualifyingValueResponse) String() string { return proto.CompactTextString(m) } +func (*GetGaugeQualifyingValueResponse) ProtoMessage() {} +func (*GetGaugeQualifyingValueResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_27b4715672276428, []int{5} +} +func (m *GetGaugeQualifyingValueResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *GetGaugeQualifyingValueResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_GetGaugeQualifyingValueResponse.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 *GetGaugeQualifyingValueResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetGaugeQualifyingValueResponse.Merge(m, src) +} +func (m *GetGaugeQualifyingValueResponse) XXX_Size() int { + return m.Size() +} +func (m *GetGaugeQualifyingValueResponse) XXX_DiscardUnknown() { + xxx_messageInfo_GetGaugeQualifyingValueResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_GetGaugeQualifyingValueResponse proto.InternalMessageInfo + +func (m *GetGaugeQualifyingValueResponse) GetQualifyingValue() uint64 { + if m != nil { + return m.QualifyingValue + } + return 0 +} + +type GetGaugesRequest struct { + Status GaugeStatus `protobuf:"varint,1,opt,name=status,proto3,enum=duality.incentives.GaugeStatus" json:"status,omitempty"` + Denom string `protobuf:"bytes,2,opt,name=denom,proto3" json:"denom,omitempty"` +} + +func (m *GetGaugesRequest) Reset() { *m = GetGaugesRequest{} } +func (m *GetGaugesRequest) String() string { return proto.CompactTextString(m) } +func (*GetGaugesRequest) ProtoMessage() {} +func (*GetGaugesRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_27b4715672276428, []int{6} +} +func (m *GetGaugesRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *GetGaugesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_GetGaugesRequest.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 *GetGaugesRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetGaugesRequest.Merge(m, src) +} +func (m *GetGaugesRequest) XXX_Size() int { + return m.Size() +} +func (m *GetGaugesRequest) XXX_DiscardUnknown() { + xxx_messageInfo_GetGaugesRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_GetGaugesRequest proto.InternalMessageInfo + +func (m *GetGaugesRequest) GetStatus() GaugeStatus { + if m != nil { + return m.Status + } + return GaugeStatus_ACTIVE_UPCOMING +} + +func (m *GetGaugesRequest) GetDenom() string { + if m != nil { + return m.Denom + } + return "" +} + +type GetGaugesResponse struct { + // Upcoming and active gauges + Gauges []*Gauge `protobuf:"bytes,1,rep,name=gauges,proto3" json:"gauges,omitempty"` +} + +func (m *GetGaugesResponse) Reset() { *m = GetGaugesResponse{} } +func (m *GetGaugesResponse) String() string { return proto.CompactTextString(m) } +func (*GetGaugesResponse) ProtoMessage() {} +func (*GetGaugesResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_27b4715672276428, []int{7} +} +func (m *GetGaugesResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *GetGaugesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_GetGaugesResponse.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 *GetGaugesResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetGaugesResponse.Merge(m, src) +} +func (m *GetGaugesResponse) XXX_Size() int { + return m.Size() +} +func (m *GetGaugesResponse) XXX_DiscardUnknown() { + xxx_messageInfo_GetGaugesResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_GetGaugesResponse proto.InternalMessageInfo + +func (m *GetGaugesResponse) GetGauges() []*Gauge { + if m != nil { + return m.Gauges + } + return nil +} + +type GetStakeByIDRequest struct { + StakeId uint64 `protobuf:"varint,1,opt,name=stake_id,json=stakeId,proto3" json:"stake_id,omitempty"` +} + +func (m *GetStakeByIDRequest) Reset() { *m = GetStakeByIDRequest{} } +func (m *GetStakeByIDRequest) String() string { return proto.CompactTextString(m) } +func (*GetStakeByIDRequest) ProtoMessage() {} +func (*GetStakeByIDRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_27b4715672276428, []int{8} +} +func (m *GetStakeByIDRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *GetStakeByIDRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_GetStakeByIDRequest.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 *GetStakeByIDRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetStakeByIDRequest.Merge(m, src) +} +func (m *GetStakeByIDRequest) XXX_Size() int { + return m.Size() +} +func (m *GetStakeByIDRequest) XXX_DiscardUnknown() { + xxx_messageInfo_GetStakeByIDRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_GetStakeByIDRequest proto.InternalMessageInfo + +func (m *GetStakeByIDRequest) GetStakeId() uint64 { + if m != nil { + return m.StakeId + } + return 0 +} + +type GetStakeByIDResponse struct { + Stake *Stake `protobuf:"bytes,1,opt,name=stake,proto3" json:"stake,omitempty"` +} + +func (m *GetStakeByIDResponse) Reset() { *m = GetStakeByIDResponse{} } +func (m *GetStakeByIDResponse) String() string { return proto.CompactTextString(m) } +func (*GetStakeByIDResponse) ProtoMessage() {} +func (*GetStakeByIDResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_27b4715672276428, []int{9} +} +func (m *GetStakeByIDResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *GetStakeByIDResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_GetStakeByIDResponse.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 *GetStakeByIDResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetStakeByIDResponse.Merge(m, src) +} +func (m *GetStakeByIDResponse) XXX_Size() int { + return m.Size() +} +func (m *GetStakeByIDResponse) XXX_DiscardUnknown() { + xxx_messageInfo_GetStakeByIDResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_GetStakeByIDResponse proto.InternalMessageInfo + +func (m *GetStakeByIDResponse) GetStake() *Stake { + if m != nil { + return m.Stake + } + return nil +} + +type GetStakesRequest struct { + Owner string `protobuf:"bytes,1,opt,name=owner,proto3" json:"owner,omitempty" yaml:"owner"` +} + +func (m *GetStakesRequest) Reset() { *m = GetStakesRequest{} } +func (m *GetStakesRequest) String() string { return proto.CompactTextString(m) } +func (*GetStakesRequest) ProtoMessage() {} +func (*GetStakesRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_27b4715672276428, []int{10} +} +func (m *GetStakesRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *GetStakesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_GetStakesRequest.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 *GetStakesRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetStakesRequest.Merge(m, src) +} +func (m *GetStakesRequest) XXX_Size() int { + return m.Size() +} +func (m *GetStakesRequest) XXX_DiscardUnknown() { + xxx_messageInfo_GetStakesRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_GetStakesRequest proto.InternalMessageInfo + +func (m *GetStakesRequest) GetOwner() string { + if m != nil { + return m.Owner + } + return "" +} + +type GetStakesResponse struct { + Stakes []*Stake `protobuf:"bytes,1,rep,name=stakes,proto3" json:"stakes,omitempty"` +} + +func (m *GetStakesResponse) Reset() { *m = GetStakesResponse{} } +func (m *GetStakesResponse) String() string { return proto.CompactTextString(m) } +func (*GetStakesResponse) ProtoMessage() {} +func (*GetStakesResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_27b4715672276428, []int{11} +} +func (m *GetStakesResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *GetStakesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_GetStakesResponse.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 *GetStakesResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetStakesResponse.Merge(m, src) +} +func (m *GetStakesResponse) XXX_Size() int { + return m.Size() +} +func (m *GetStakesResponse) XXX_DiscardUnknown() { + xxx_messageInfo_GetStakesResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_GetStakesResponse proto.InternalMessageInfo + +func (m *GetStakesResponse) GetStakes() []*Stake { + if m != nil { + return m.Stakes + } + return nil +} + +type GetFutureRewardEstimateRequest struct { + // Address that is being queried for future estimated rewards + Owner string `protobuf:"bytes,1,opt,name=owner,proto3" json:"owner,omitempty" yaml:"owner"` + // Stake IDs included in future reward estimation + StakeIds []uint64 `protobuf:"varint,2,rep,packed,name=stake_ids,json=stakeIds,proto3" json:"stake_ids,omitempty"` + // Determines upper time limit of reward estimation + // reward estimation goes up to current_epoch + num_epochs + NumEpochs int64 `protobuf:"varint,3,opt,name=num_epochs,json=numEpochs,proto3" json:"num_epochs,omitempty"` +} + +func (m *GetFutureRewardEstimateRequest) Reset() { *m = GetFutureRewardEstimateRequest{} } +func (m *GetFutureRewardEstimateRequest) String() string { return proto.CompactTextString(m) } +func (*GetFutureRewardEstimateRequest) ProtoMessage() {} +func (*GetFutureRewardEstimateRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_27b4715672276428, []int{12} +} +func (m *GetFutureRewardEstimateRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *GetFutureRewardEstimateRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_GetFutureRewardEstimateRequest.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 *GetFutureRewardEstimateRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetFutureRewardEstimateRequest.Merge(m, src) +} +func (m *GetFutureRewardEstimateRequest) XXX_Size() int { + return m.Size() +} +func (m *GetFutureRewardEstimateRequest) XXX_DiscardUnknown() { + xxx_messageInfo_GetFutureRewardEstimateRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_GetFutureRewardEstimateRequest proto.InternalMessageInfo + +func (m *GetFutureRewardEstimateRequest) GetOwner() string { + if m != nil { + return m.Owner + } + return "" +} + +func (m *GetFutureRewardEstimateRequest) GetStakeIds() []uint64 { + if m != nil { + return m.StakeIds + } + return nil +} + +func (m *GetFutureRewardEstimateRequest) GetNumEpochs() int64 { + if m != nil { + return m.NumEpochs + } + return 0 +} + +type GetFutureRewardEstimateResponse struct { + // Estimated coin rewards that will be recieved at provided address + // from specified locks between current time and end epoch + Coins github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,1,rep,name=coins,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"coins"` +} + +func (m *GetFutureRewardEstimateResponse) Reset() { *m = GetFutureRewardEstimateResponse{} } +func (m *GetFutureRewardEstimateResponse) String() string { return proto.CompactTextString(m) } +func (*GetFutureRewardEstimateResponse) ProtoMessage() {} +func (*GetFutureRewardEstimateResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_27b4715672276428, []int{13} +} +func (m *GetFutureRewardEstimateResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *GetFutureRewardEstimateResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_GetFutureRewardEstimateResponse.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 *GetFutureRewardEstimateResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetFutureRewardEstimateResponse.Merge(m, src) +} +func (m *GetFutureRewardEstimateResponse) XXX_Size() int { + return m.Size() +} +func (m *GetFutureRewardEstimateResponse) XXX_DiscardUnknown() { + xxx_messageInfo_GetFutureRewardEstimateResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_GetFutureRewardEstimateResponse proto.InternalMessageInfo + +func (m *GetFutureRewardEstimateResponse) GetCoins() github_com_cosmos_cosmos_sdk_types.Coins { + if m != nil { + return m.Coins + } + return nil +} + +type GetAccountHistoryRequest struct { + // Address that is being queried for account history + Account string `protobuf:"bytes,1,opt,name=account,proto3" json:"account,omitempty" yaml:"account"` +} + +func (m *GetAccountHistoryRequest) Reset() { *m = GetAccountHistoryRequest{} } +func (m *GetAccountHistoryRequest) String() string { return proto.CompactTextString(m) } +func (*GetAccountHistoryRequest) ProtoMessage() {} +func (*GetAccountHistoryRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_27b4715672276428, []int{14} +} +func (m *GetAccountHistoryRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *GetAccountHistoryRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_GetAccountHistoryRequest.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 *GetAccountHistoryRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetAccountHistoryRequest.Merge(m, src) +} +func (m *GetAccountHistoryRequest) XXX_Size() int { + return m.Size() +} +func (m *GetAccountHistoryRequest) XXX_DiscardUnknown() { + xxx_messageInfo_GetAccountHistoryRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_GetAccountHistoryRequest proto.InternalMessageInfo + +func (m *GetAccountHistoryRequest) GetAccount() string { + if m != nil { + return m.Account + } + return "" +} + +type GetAccountHistoryResponse struct { + // Gauge rewards that have been distributed to this address to date + Coins github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,1,rep,name=coins,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"coins"` +} + +func (m *GetAccountHistoryResponse) Reset() { *m = GetAccountHistoryResponse{} } +func (m *GetAccountHistoryResponse) String() string { return proto.CompactTextString(m) } +func (*GetAccountHistoryResponse) ProtoMessage() {} +func (*GetAccountHistoryResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_27b4715672276428, []int{15} +} +func (m *GetAccountHistoryResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *GetAccountHistoryResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_GetAccountHistoryResponse.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 *GetAccountHistoryResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetAccountHistoryResponse.Merge(m, src) +} +func (m *GetAccountHistoryResponse) XXX_Size() int { + return m.Size() +} +func (m *GetAccountHistoryResponse) XXX_DiscardUnknown() { + xxx_messageInfo_GetAccountHistoryResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_GetAccountHistoryResponse proto.InternalMessageInfo + +func (m *GetAccountHistoryResponse) GetCoins() github_com_cosmos_cosmos_sdk_types.Coins { + if m != nil { + return m.Coins + } + return nil +} + +func init() { + proto.RegisterEnum("duality.incentives.GaugeStatus", GaugeStatus_name, GaugeStatus_value) + proto.RegisterType((*GetModuleStatusRequest)(nil), "duality.incentives.GetModuleStatusRequest") + proto.RegisterType((*GetModuleStatusResponse)(nil), "duality.incentives.GetModuleStatusResponse") + proto.RegisterType((*GetGaugeByIDRequest)(nil), "duality.incentives.GetGaugeByIDRequest") + proto.RegisterType((*GetGaugeByIDResponse)(nil), "duality.incentives.GetGaugeByIDResponse") + proto.RegisterType((*GetGaugeQualifyingValueRequest)(nil), "duality.incentives.GetGaugeQualifyingValueRequest") + proto.RegisterType((*GetGaugeQualifyingValueResponse)(nil), "duality.incentives.GetGaugeQualifyingValueResponse") + proto.RegisterType((*GetGaugesRequest)(nil), "duality.incentives.GetGaugesRequest") + proto.RegisterType((*GetGaugesResponse)(nil), "duality.incentives.GetGaugesResponse") + proto.RegisterType((*GetStakeByIDRequest)(nil), "duality.incentives.GetStakeByIDRequest") + proto.RegisterType((*GetStakeByIDResponse)(nil), "duality.incentives.GetStakeByIDResponse") + proto.RegisterType((*GetStakesRequest)(nil), "duality.incentives.GetStakesRequest") + proto.RegisterType((*GetStakesResponse)(nil), "duality.incentives.GetStakesResponse") + proto.RegisterType((*GetFutureRewardEstimateRequest)(nil), "duality.incentives.GetFutureRewardEstimateRequest") + proto.RegisterType((*GetFutureRewardEstimateResponse)(nil), "duality.incentives.GetFutureRewardEstimateResponse") + proto.RegisterType((*GetAccountHistoryRequest)(nil), "duality.incentives.GetAccountHistoryRequest") + proto.RegisterType((*GetAccountHistoryResponse)(nil), "duality.incentives.GetAccountHistoryResponse") +} + +func init() { proto.RegisterFile("duality/incentives/query.proto", fileDescriptor_27b4715672276428) } + +var fileDescriptor_27b4715672276428 = []byte{ + // 1075 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0x4f, 0x4f, 0x1b, 0xc7, + 0x1b, 0x66, 0xcd, 0x9f, 0xe0, 0x01, 0x81, 0x7f, 0x13, 0xf4, 0xab, 0x71, 0x53, 0x1b, 0x8d, 0x42, + 0x31, 0x24, 0x78, 0xc1, 0x51, 0x95, 0x2a, 0x55, 0x0e, 0x31, 0x01, 0xe3, 0x2a, 0x49, 0x93, 0xa5, + 0xcd, 0xa1, 0x97, 0xd5, 0xd8, 0x9e, 0x2c, 0xab, 0xd8, 0x3b, 0xc6, 0x33, 0x4b, 0x6a, 0x51, 0x7a, + 0xa8, 0xf2, 0x01, 0xa2, 0xf6, 0x56, 0xa9, 0x5f, 0xa0, 0x97, 0x1e, 0xfa, 0x21, 0x9a, 0x63, 0xa4, + 0x5e, 0x7a, 0xa2, 0x15, 0xf4, 0x13, 0xe4, 0x13, 0x54, 0xfb, 0xce, 0xac, 0xb1, 0x61, 0x77, 0x21, + 0x87, 0xf4, 0x64, 0xef, 0xbc, 0xff, 0x9e, 0xf7, 0x79, 0x67, 0x9e, 0x19, 0x94, 0x6f, 0xfa, 0xb4, + 0xe5, 0xca, 0x9e, 0xe9, 0x7a, 0x0d, 0xe6, 0x49, 0x77, 0x9f, 0x09, 0x73, 0xcf, 0x67, 0xdd, 0x5e, + 0xa9, 0xd3, 0xe5, 0x92, 0x63, 0xac, 0xed, 0xa5, 0x53, 0x7b, 0x6e, 0xce, 0xe1, 0x0e, 0x07, 0xb3, + 0x19, 0xfc, 0x53, 0x9e, 0xb9, 0x6b, 0x0e, 0xe7, 0x4e, 0x8b, 0x99, 0xb4, 0xe3, 0x9a, 0xd4, 0xf3, + 0xb8, 0xa4, 0xd2, 0xe5, 0x9e, 0xd0, 0xd6, 0x7c, 0x83, 0x8b, 0x36, 0x17, 0x66, 0x9d, 0x0a, 0x66, + 0xee, 0xaf, 0xd7, 0x99, 0xa4, 0xeb, 0x66, 0x83, 0xbb, 0x9e, 0xb6, 0xaf, 0x0c, 0xda, 0x01, 0x40, + 0xdf, 0xab, 0x43, 0x1d, 0xd7, 0x83, 0x64, 0x61, 0xae, 0x08, 0xcc, 0x0e, 0xf5, 0x1d, 0x96, 0x60, + 0x17, 0x92, 0x3e, 0x0f, 0xed, 0x85, 0x08, 0x7b, 0x87, 0x76, 0x69, 0x5b, 0x83, 0x25, 0x59, 0xf4, + 0xff, 0x2a, 0x93, 0x0f, 0x79, 0xd3, 0x6f, 0xb1, 0x1d, 0x49, 0xa5, 0x2f, 0x2c, 0xb6, 0xe7, 0x33, + 0x21, 0xc9, 0x6f, 0x29, 0xf4, 0xc1, 0x39, 0x93, 0xe8, 0x70, 0x4f, 0x30, 0xec, 0xa1, 0xe9, 0x2e, + 0x7b, 0x41, 0xbb, 0x4d, 0x3b, 0xe8, 0x4b, 0x64, 0x8d, 0x85, 0xd1, 0xe2, 0x54, 0x79, 0xbe, 0xa4, + 0x3a, 0x2b, 0x05, 0x9d, 0x95, 0x74, 0x4f, 0xa5, 0x0d, 0xee, 0x7a, 0x95, 0xb5, 0xd7, 0x47, 0x85, + 0x91, 0x5f, 0xfe, 0x2a, 0x14, 0x1d, 0x57, 0xee, 0xfa, 0xf5, 0x52, 0x83, 0xb7, 0x4d, 0x4d, 0x83, + 0xfa, 0x59, 0x15, 0xcd, 0xe7, 0xa6, 0xec, 0x75, 0x98, 0x80, 0x00, 0x61, 0x4d, 0xa9, 0x02, 0xf0, + 0x11, 0xd4, 0x83, 0xae, 0xc2, 0x7a, 0xa9, 0xf7, 0x50, 0x4f, 0x15, 0x50, 0xf5, 0x3e, 0x45, 0x13, + 0x8a, 0xa5, 0xec, 0xe8, 0x82, 0x51, 0x9c, 0x2a, 0xe7, 0x4a, 0xe7, 0xf7, 0x46, 0xe9, 0x31, 0x78, + 0x54, 0xc6, 0x82, 0x52, 0x96, 0xf6, 0x27, 0x8b, 0xe8, 0x6a, 0x95, 0xc9, 0x6a, 0x30, 0xa2, 0x4a, + 0xaf, 0x76, 0x5f, 0x93, 0x89, 0x67, 0x50, 0xca, 0x6d, 0x66, 0x8d, 0x05, 0xa3, 0x38, 0x66, 0xa5, + 0xdc, 0x26, 0xa9, 0xa2, 0xb9, 0x61, 0x37, 0x4d, 0xac, 0x89, 0xc6, 0x61, 0xbc, 0xe0, 0x1a, 0x74, + 0x18, 0x51, 0x17, 0xa2, 0x2c, 0xe5, 0x47, 0xd6, 0x50, 0x3e, 0x4c, 0xf4, 0x24, 0x70, 0x7d, 0xd6, + 0x73, 0x3d, 0xe7, 0x29, 0x6d, 0xf9, 0x2c, 0xae, 0xf4, 0x03, 0x54, 0x88, 0x8d, 0xd0, 0x28, 0x96, + 0x51, 0x66, 0xaf, 0x6f, 0xb2, 0xf7, 0x03, 0x9b, 0x4e, 0x30, 0xbb, 0x37, 0x1c, 0x42, 0x28, 0xca, + 0x84, 0xd9, 0xc2, 0x9d, 0x83, 0x6f, 0xa3, 0x09, 0x01, 0xfb, 0x05, 0x82, 0x66, 0xca, 0x85, 0xd8, + 0x2e, 0xf4, 0xb6, 0xd2, 0xee, 0x78, 0x0e, 0x8d, 0x37, 0x99, 0xc7, 0xdb, 0xd9, 0xd4, 0x82, 0x51, + 0x4c, 0x5b, 0xea, 0x83, 0x6c, 0xa1, 0xff, 0x0d, 0x94, 0xd0, 0x10, 0xd7, 0xd1, 0x04, 0x10, 0x70, + 0xba, 0xf7, 0x62, 0x99, 0xd2, 0x8e, 0x64, 0x0d, 0x46, 0xb3, 0x13, 0x8c, 0x79, 0x70, 0x34, 0xf3, + 0x68, 0x12, 0x46, 0x6f, 0xf7, 0x59, 0xba, 0x02, 0xdf, 0xb5, 0x70, 0x4a, 0x03, 0x11, 0xa7, 0x53, + 0x02, 0x97, 0xa4, 0x29, 0x41, 0x94, 0xa5, 0xfc, 0xc8, 0x1d, 0x60, 0x09, 0x96, 0xfa, 0x2c, 0x7d, + 0x8c, 0xc6, 0xf9, 0x0b, 0x8f, 0x75, 0x21, 0x49, 0xba, 0x92, 0x79, 0x7b, 0x54, 0x98, 0xee, 0xd1, + 0x76, 0xeb, 0x0e, 0x81, 0x65, 0x62, 0x29, 0xb3, 0x6e, 0x3f, 0x8c, 0x3d, 0x6d, 0x1f, 0x32, 0x27, + 0xb6, 0xaf, 0x20, 0x68, 0x47, 0xf2, 0xd2, 0x80, 0xad, 0xb2, 0xe5, 0x4b, 0xbf, 0xcb, 0x2c, 0x38, + 0x5c, 0x9b, 0x42, 0xba, 0x6d, 0x2a, 0xd9, 0x3b, 0x42, 0xc2, 0x1f, 0xa2, 0x74, 0x48, 0x99, 0x3a, + 0x8b, 0x63, 0xd6, 0xa4, 0xe6, 0x4c, 0xe0, 0x8f, 0x10, 0xf2, 0xfc, 0xb6, 0xcd, 0x3a, 0xbc, 0xb1, + 0xab, 0xce, 0xcf, 0xa8, 0x95, 0xf6, 0xfc, 0xf6, 0x26, 0x2c, 0x04, 0x30, 0x0a, 0xb1, 0x30, 0x74, + 0x77, 0x14, 0x8d, 0xbf, 0x37, 0x5d, 0x51, 0x99, 0xc9, 0x36, 0xca, 0x56, 0x99, 0xbc, 0xd7, 0x68, + 0x70, 0xdf, 0x93, 0xdb, 0xae, 0x90, 0xbc, 0xdb, 0x0b, 0x69, 0xb8, 0x89, 0xae, 0x50, 0x65, 0xd0, + 0x44, 0xe0, 0xb7, 0x47, 0x85, 0x19, 0x45, 0x84, 0x36, 0x10, 0x2b, 0x74, 0x21, 0xdf, 0xa1, 0xf9, + 0x88, 0x4c, 0xff, 0x59, 0x27, 0x2b, 0x9f, 0xa3, 0xa9, 0x81, 0xb3, 0x84, 0xaf, 0xa2, 0xd9, 0x7b, + 0x1b, 0x5f, 0xd6, 0x9e, 0x6e, 0xda, 0x5f, 0x3d, 0xde, 0xf8, 0xe2, 0x61, 0xed, 0x51, 0x35, 0x33, + 0x82, 0x11, 0x9a, 0x50, 0x8b, 0x19, 0x03, 0x4f, 0xa3, 0xc9, 0xbe, 0x25, 0x15, 0x7c, 0x6d, 0xd5, + 0x1e, 0xd5, 0x76, 0xb6, 0x37, 0xef, 0x67, 0x46, 0xcb, 0x3f, 0x21, 0x34, 0xfe, 0x24, 0xb8, 0x91, + 0xf0, 0xcf, 0x06, 0x9a, 0x3d, 0xa3, 0xfe, 0x78, 0x25, 0xf2, 0x8c, 0x45, 0xde, 0x1e, 0xb9, 0x1b, + 0x97, 0xf2, 0x55, 0x2c, 0x91, 0xf5, 0xef, 0xff, 0xf8, 0xe7, 0xc7, 0xd4, 0x0d, 0xbc, 0x6c, 0x46, + 0x5c, 0x57, 0xe1, 0xdd, 0xd8, 0x86, 0x48, 0x5b, 0x4b, 0xc5, 0x0f, 0x06, 0x9a, 0x1e, 0x54, 0x50, + 0xbc, 0x14, 0x53, 0xf0, 0xac, 0x14, 0xe7, 0x8a, 0x17, 0x3b, 0x6a, 0x58, 0x26, 0xc0, 0x5a, 0xc6, + 0x4b, 0x49, 0xb0, 0x94, 0xb8, 0x98, 0x07, 0x6e, 0xf3, 0x10, 0xbf, 0x34, 0x50, 0xba, 0x2f, 0x55, + 0xf8, 0x7a, 0x52, 0xa1, 0x3e, 0x51, 0x8b, 0x17, 0x78, 0x69, 0x2c, 0x2b, 0x80, 0xe5, 0x3a, 0x26, + 0x17, 0x63, 0xc1, 0xaf, 0x14, 0x37, 0x7d, 0xdd, 0x8a, 0xe5, 0xe6, 0xac, 0x16, 0xc6, 0x72, 0x73, + 0x4e, 0x02, 0xc9, 0x2a, 0xe0, 0x59, 0xc2, 0x8b, 0x66, 0xdc, 0x0b, 0x44, 0x98, 0x07, 0xa1, 0x48, + 0x1c, 0xe2, 0x6f, 0x81, 0x18, 0x25, 0x62, 0xb1, 0xc4, 0x0c, 0xe9, 0x63, 0x2c, 0x31, 0xc3, 0x4a, + 0x48, 0x08, 0x00, 0xb9, 0x86, 0x73, 0xf1, 0x40, 0xf0, 0xef, 0x06, 0x3c, 0x65, 0xa2, 0x34, 0x07, + 0x97, 0x63, 0xca, 0x24, 0xe8, 0x64, 0xee, 0xd6, 0x3b, 0xc5, 0x68, 0xa0, 0x1b, 0x00, 0xf4, 0x2e, + 0xfe, 0x2c, 0x69, 0x82, 0xcf, 0x20, 0x83, 0xad, 0xde, 0x3e, 0xc2, 0x66, 0x3a, 0x89, 0x79, 0x00, + 0xc2, 0x7b, 0x88, 0x7f, 0x35, 0xe0, 0x36, 0x18, 0x56, 0x1b, 0x7c, 0x33, 0x06, 0x4f, 0xa4, 0xbc, + 0xe5, 0x56, 0x2f, 0xe9, 0xad, 0x71, 0xdf, 0x05, 0xdc, 0xb7, 0xf1, 0x27, 0x49, 0xb8, 0xb5, 0x18, + 0xda, 0xbb, 0x2a, 0xd8, 0x3c, 0xd0, 0x0b, 0x87, 0x21, 0xf7, 0x51, 0xef, 0x8d, 0x58, 0xee, 0x13, + 0x9e, 0x33, 0xb1, 0xdc, 0x27, 0x3d, 0x68, 0x2e, 0xc7, 0xbd, 0xc3, 0xa4, 0x0d, 0x27, 0xc8, 0x3e, + 0xfb, 0xf8, 0x81, 0xd3, 0x5d, 0x79, 0xf0, 0xfa, 0x38, 0x6f, 0xbc, 0x39, 0xce, 0x1b, 0x7f, 0x1f, + 0xe7, 0x8d, 0x57, 0x27, 0xf9, 0x91, 0x37, 0x27, 0xf9, 0x91, 0x3f, 0x4f, 0xf2, 0x23, 0x5f, 0x97, + 0x07, 0x34, 0x5b, 0x17, 0x58, 0x6d, 0xd1, 0xba, 0xe8, 0x57, 0xfb, 0x66, 0xb0, 0x1e, 0x68, 0x78, + 0x7d, 0x02, 0xde, 0xdf, 0xb7, 0xfe, 0x0d, 0x00, 0x00, 0xff, 0xff, 0x4e, 0x9a, 0x32, 0x62, 0x96, + 0x0c, 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 { + // GetModuleStatus returns a rundown of coins in the module and their status + GetModuleStatus(ctx context.Context, in *GetModuleStatusRequest, opts ...grpc.CallOption) (*GetModuleStatusResponse, error) + // GetGaugeByID returns a gauge by its ID + GetGaugeByID(ctx context.Context, in *GetGaugeByIDRequest, opts ...grpc.CallOption) (*GetGaugeByIDResponse, error) + // GetGauges returns gauges according to the filter provided + GetGauges(ctx context.Context, in *GetGaugesRequest, opts ...grpc.CallOption) (*GetGaugesResponse, error) + // GetStakeByID returns a stake by its ID + GetStakeByID(ctx context.Context, in *GetStakeByIDRequest, opts ...grpc.CallOption) (*GetStakeByIDResponse, error) + // GetStakes returns stakes by the filter provided. At least one filter must be provided. + GetStakes(ctx context.Context, in *GetStakesRequest, opts ...grpc.CallOption) (*GetStakesResponse, error) + // GetFutureRewardsEstimate returns an estimate of the rewards from now until a specified + // time in the future. The requestor either provides an address or a set of locks + // for which they want to find the associated rewards. + GetFutureRewardEstimate(ctx context.Context, in *GetFutureRewardEstimateRequest, opts ...grpc.CallOption) (*GetFutureRewardEstimateResponse, error) + // GetAccountHistory returns the total accumulated rewards per denom for a given user. + GetAccountHistory(ctx context.Context, in *GetAccountHistoryRequest, opts ...grpc.CallOption) (*GetAccountHistoryResponse, error) + // Returns the total amount of value currently qualifying for the gauge. This is useful for calculating + // the prospective future rewards of staking. + GetGaugeQualifyingValue(ctx context.Context, in *GetGaugeQualifyingValueRequest, opts ...grpc.CallOption) (*GetGaugeQualifyingValueResponse, error) +} + +type queryClient struct { + cc grpc1.ClientConn +} + +func NewQueryClient(cc grpc1.ClientConn) QueryClient { + return &queryClient{cc} +} + +func (c *queryClient) GetModuleStatus(ctx context.Context, in *GetModuleStatusRequest, opts ...grpc.CallOption) (*GetModuleStatusResponse, error) { + out := new(GetModuleStatusResponse) + err := c.cc.Invoke(ctx, "/duality.incentives.Query/GetModuleStatus", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *queryClient) GetGaugeByID(ctx context.Context, in *GetGaugeByIDRequest, opts ...grpc.CallOption) (*GetGaugeByIDResponse, error) { + out := new(GetGaugeByIDResponse) + err := c.cc.Invoke(ctx, "/duality.incentives.Query/GetGaugeByID", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *queryClient) GetGauges(ctx context.Context, in *GetGaugesRequest, opts ...grpc.CallOption) (*GetGaugesResponse, error) { + out := new(GetGaugesResponse) + err := c.cc.Invoke(ctx, "/duality.incentives.Query/GetGauges", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *queryClient) GetStakeByID(ctx context.Context, in *GetStakeByIDRequest, opts ...grpc.CallOption) (*GetStakeByIDResponse, error) { + out := new(GetStakeByIDResponse) + err := c.cc.Invoke(ctx, "/duality.incentives.Query/GetStakeByID", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *queryClient) GetStakes(ctx context.Context, in *GetStakesRequest, opts ...grpc.CallOption) (*GetStakesResponse, error) { + out := new(GetStakesResponse) + err := c.cc.Invoke(ctx, "/duality.incentives.Query/GetStakes", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *queryClient) GetFutureRewardEstimate(ctx context.Context, in *GetFutureRewardEstimateRequest, opts ...grpc.CallOption) (*GetFutureRewardEstimateResponse, error) { + out := new(GetFutureRewardEstimateResponse) + err := c.cc.Invoke(ctx, "/duality.incentives.Query/GetFutureRewardEstimate", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *queryClient) GetAccountHistory(ctx context.Context, in *GetAccountHistoryRequest, opts ...grpc.CallOption) (*GetAccountHistoryResponse, error) { + out := new(GetAccountHistoryResponse) + err := c.cc.Invoke(ctx, "/duality.incentives.Query/GetAccountHistory", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *queryClient) GetGaugeQualifyingValue(ctx context.Context, in *GetGaugeQualifyingValueRequest, opts ...grpc.CallOption) (*GetGaugeQualifyingValueResponse, error) { + out := new(GetGaugeQualifyingValueResponse) + err := c.cc.Invoke(ctx, "/duality.incentives.Query/GetGaugeQualifyingValue", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +// QueryServer is the server API for Query service. +type QueryServer interface { + // GetModuleStatus returns a rundown of coins in the module and their status + GetModuleStatus(context.Context, *GetModuleStatusRequest) (*GetModuleStatusResponse, error) + // GetGaugeByID returns a gauge by its ID + GetGaugeByID(context.Context, *GetGaugeByIDRequest) (*GetGaugeByIDResponse, error) + // GetGauges returns gauges according to the filter provided + GetGauges(context.Context, *GetGaugesRequest) (*GetGaugesResponse, error) + // GetStakeByID returns a stake by its ID + GetStakeByID(context.Context, *GetStakeByIDRequest) (*GetStakeByIDResponse, error) + // GetStakes returns stakes by the filter provided. At least one filter must be provided. + GetStakes(context.Context, *GetStakesRequest) (*GetStakesResponse, error) + // GetFutureRewardsEstimate returns an estimate of the rewards from now until a specified + // time in the future. The requestor either provides an address or a set of locks + // for which they want to find the associated rewards. + GetFutureRewardEstimate(context.Context, *GetFutureRewardEstimateRequest) (*GetFutureRewardEstimateResponse, error) + // GetAccountHistory returns the total accumulated rewards per denom for a given user. + GetAccountHistory(context.Context, *GetAccountHistoryRequest) (*GetAccountHistoryResponse, error) + // Returns the total amount of value currently qualifying for the gauge. This is useful for calculating + // the prospective future rewards of staking. + GetGaugeQualifyingValue(context.Context, *GetGaugeQualifyingValueRequest) (*GetGaugeQualifyingValueResponse, error) +} + +// UnimplementedQueryServer can be embedded to have forward compatible implementations. +type UnimplementedQueryServer struct { +} + +func (*UnimplementedQueryServer) GetModuleStatus(ctx context.Context, req *GetModuleStatusRequest) (*GetModuleStatusResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method GetModuleStatus not implemented") +} +func (*UnimplementedQueryServer) GetGaugeByID(ctx context.Context, req *GetGaugeByIDRequest) (*GetGaugeByIDResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method GetGaugeByID not implemented") +} +func (*UnimplementedQueryServer) GetGauges(ctx context.Context, req *GetGaugesRequest) (*GetGaugesResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method GetGauges not implemented") +} +func (*UnimplementedQueryServer) GetStakeByID(ctx context.Context, req *GetStakeByIDRequest) (*GetStakeByIDResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method GetStakeByID not implemented") +} +func (*UnimplementedQueryServer) GetStakes(ctx context.Context, req *GetStakesRequest) (*GetStakesResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method GetStakes not implemented") +} +func (*UnimplementedQueryServer) GetFutureRewardEstimate(ctx context.Context, req *GetFutureRewardEstimateRequest) (*GetFutureRewardEstimateResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method GetFutureRewardEstimate not implemented") +} +func (*UnimplementedQueryServer) GetAccountHistory(ctx context.Context, req *GetAccountHistoryRequest) (*GetAccountHistoryResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method GetAccountHistory not implemented") +} +func (*UnimplementedQueryServer) GetGaugeQualifyingValue(ctx context.Context, req *GetGaugeQualifyingValueRequest) (*GetGaugeQualifyingValueResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method GetGaugeQualifyingValue not implemented") +} + +func RegisterQueryServer(s grpc1.Server, srv QueryServer) { + s.RegisterService(&_Query_serviceDesc, srv) +} + +func _Query_GetModuleStatus_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(GetModuleStatusRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(QueryServer).GetModuleStatus(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/duality.incentives.Query/GetModuleStatus", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(QueryServer).GetModuleStatus(ctx, req.(*GetModuleStatusRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Query_GetGaugeByID_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(GetGaugeByIDRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(QueryServer).GetGaugeByID(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/duality.incentives.Query/GetGaugeByID", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(QueryServer).GetGaugeByID(ctx, req.(*GetGaugeByIDRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Query_GetGauges_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(GetGaugesRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(QueryServer).GetGauges(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/duality.incentives.Query/GetGauges", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(QueryServer).GetGauges(ctx, req.(*GetGaugesRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Query_GetStakeByID_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(GetStakeByIDRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(QueryServer).GetStakeByID(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/duality.incentives.Query/GetStakeByID", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(QueryServer).GetStakeByID(ctx, req.(*GetStakeByIDRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Query_GetStakes_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(GetStakesRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(QueryServer).GetStakes(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/duality.incentives.Query/GetStakes", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(QueryServer).GetStakes(ctx, req.(*GetStakesRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Query_GetFutureRewardEstimate_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(GetFutureRewardEstimateRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(QueryServer).GetFutureRewardEstimate(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/duality.incentives.Query/GetFutureRewardEstimate", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(QueryServer).GetFutureRewardEstimate(ctx, req.(*GetFutureRewardEstimateRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Query_GetAccountHistory_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(GetAccountHistoryRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(QueryServer).GetAccountHistory(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/duality.incentives.Query/GetAccountHistory", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(QueryServer).GetAccountHistory(ctx, req.(*GetAccountHistoryRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Query_GetGaugeQualifyingValue_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(GetGaugeQualifyingValueRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(QueryServer).GetGaugeQualifyingValue(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/duality.incentives.Query/GetGaugeQualifyingValue", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(QueryServer).GetGaugeQualifyingValue(ctx, req.(*GetGaugeQualifyingValueRequest)) + } + return interceptor(ctx, in, info, handler) +} + +var _Query_serviceDesc = grpc.ServiceDesc{ + ServiceName: "duality.incentives.Query", + HandlerType: (*QueryServer)(nil), + Methods: []grpc.MethodDesc{ + { + MethodName: "GetModuleStatus", + Handler: _Query_GetModuleStatus_Handler, + }, + { + MethodName: "GetGaugeByID", + Handler: _Query_GetGaugeByID_Handler, + }, + { + MethodName: "GetGauges", + Handler: _Query_GetGauges_Handler, + }, + { + MethodName: "GetStakeByID", + Handler: _Query_GetStakeByID_Handler, + }, + { + MethodName: "GetStakes", + Handler: _Query_GetStakes_Handler, + }, + { + MethodName: "GetFutureRewardEstimate", + Handler: _Query_GetFutureRewardEstimate_Handler, + }, + { + MethodName: "GetAccountHistory", + Handler: _Query_GetAccountHistory_Handler, + }, + { + MethodName: "GetGaugeQualifyingValue", + Handler: _Query_GetGaugeQualifyingValue_Handler, + }, + }, + Streams: []grpc.StreamDesc{}, + Metadata: "duality/incentives/query.proto", +} + +func (m *GetModuleStatusRequest) 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 *GetModuleStatusRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *GetModuleStatusRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + return len(dAtA) - i, nil +} + +func (m *GetModuleStatusResponse) 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 *GetModuleStatusResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *GetModuleStatusResponse) 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] = 0x1a + if len(m.StakedCoins) > 0 { + for iNdEx := len(m.StakedCoins) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.StakedCoins[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } + } + if len(m.RewardCoins) > 0 { + for iNdEx := len(m.RewardCoins) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.RewardCoins[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 *GetGaugeByIDRequest) 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 *GetGaugeByIDRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *GetGaugeByIDRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.Id != 0 { + i = encodeVarintQuery(dAtA, i, uint64(m.Id)) + i-- + dAtA[i] = 0x8 + } + return len(dAtA) - i, nil +} + +func (m *GetGaugeByIDResponse) 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 *GetGaugeByIDResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *GetGaugeByIDResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.Gauge != nil { + { + size, err := m.Gauge.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 *GetGaugeQualifyingValueRequest) 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 *GetGaugeQualifyingValueRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *GetGaugeQualifyingValueRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.Id != 0 { + i = encodeVarintQuery(dAtA, i, uint64(m.Id)) + i-- + dAtA[i] = 0x8 + } + return len(dAtA) - i, nil +} + +func (m *GetGaugeQualifyingValueResponse) 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 *GetGaugeQualifyingValueResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *GetGaugeQualifyingValueResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.QualifyingValue != 0 { + i = encodeVarintQuery(dAtA, i, uint64(m.QualifyingValue)) + i-- + dAtA[i] = 0x8 + } + return len(dAtA) - i, nil +} + +func (m *GetGaugesRequest) 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 *GetGaugesRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *GetGaugesRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Denom) > 0 { + i -= len(m.Denom) + copy(dAtA[i:], m.Denom) + i = encodeVarintQuery(dAtA, i, uint64(len(m.Denom))) + i-- + dAtA[i] = 0x12 + } + if m.Status != 0 { + i = encodeVarintQuery(dAtA, i, uint64(m.Status)) + i-- + dAtA[i] = 0x8 + } + return len(dAtA) - i, nil +} + +func (m *GetGaugesResponse) 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 *GetGaugesResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *GetGaugesResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Gauges) > 0 { + for iNdEx := len(m.Gauges) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Gauges[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 *GetStakeByIDRequest) 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 *GetStakeByIDRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *GetStakeByIDRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.StakeId != 0 { + i = encodeVarintQuery(dAtA, i, uint64(m.StakeId)) + i-- + dAtA[i] = 0x8 + } + return len(dAtA) - i, nil +} + +func (m *GetStakeByIDResponse) 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 *GetStakeByIDResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *GetStakeByIDResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.Stake != nil { + { + size, err := m.Stake.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 *GetStakesRequest) 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 *GetStakesRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *GetStakesRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Owner) > 0 { + i -= len(m.Owner) + copy(dAtA[i:], m.Owner) + i = encodeVarintQuery(dAtA, i, uint64(len(m.Owner))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *GetStakesResponse) 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 *GetStakesResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *GetStakesResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Stakes) > 0 { + for iNdEx := len(m.Stakes) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Stakes[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 *GetFutureRewardEstimateRequest) 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 *GetFutureRewardEstimateRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *GetFutureRewardEstimateRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.NumEpochs != 0 { + i = encodeVarintQuery(dAtA, i, uint64(m.NumEpochs)) + i-- + dAtA[i] = 0x18 + } + if len(m.StakeIds) > 0 { + dAtA5 := make([]byte, len(m.StakeIds)*10) + var j4 int + for _, num := range m.StakeIds { + for num >= 1<<7 { + dAtA5[j4] = uint8(uint64(num)&0x7f | 0x80) + num >>= 7 + j4++ + } + dAtA5[j4] = uint8(num) + j4++ + } + i -= j4 + copy(dAtA[i:], dAtA5[:j4]) + i = encodeVarintQuery(dAtA, i, uint64(j4)) + i-- + dAtA[i] = 0x12 + } + if len(m.Owner) > 0 { + i -= len(m.Owner) + copy(dAtA[i:], m.Owner) + i = encodeVarintQuery(dAtA, i, uint64(len(m.Owner))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *GetFutureRewardEstimateResponse) 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 *GetFutureRewardEstimateResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *GetFutureRewardEstimateResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Coins) > 0 { + for iNdEx := len(m.Coins) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Coins[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 *GetAccountHistoryRequest) 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 *GetAccountHistoryRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *GetAccountHistoryRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Account) > 0 { + i -= len(m.Account) + copy(dAtA[i:], m.Account) + i = encodeVarintQuery(dAtA, i, uint64(len(m.Account))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *GetAccountHistoryResponse) 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 *GetAccountHistoryResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *GetAccountHistoryResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Coins) > 0 { + for iNdEx := len(m.Coins) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Coins[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 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 *GetModuleStatusRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + return n +} + +func (m *GetModuleStatusResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if len(m.RewardCoins) > 0 { + for _, e := range m.RewardCoins { + l = e.Size() + n += 1 + l + sovQuery(uint64(l)) + } + } + if len(m.StakedCoins) > 0 { + for _, e := range m.StakedCoins { + l = e.Size() + n += 1 + l + sovQuery(uint64(l)) + } + } + l = m.Params.Size() + n += 1 + l + sovQuery(uint64(l)) + return n +} + +func (m *GetGaugeByIDRequest) 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 *GetGaugeByIDResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Gauge != nil { + l = m.Gauge.Size() + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +func (m *GetGaugeQualifyingValueRequest) 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 *GetGaugeQualifyingValueResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.QualifyingValue != 0 { + n += 1 + sovQuery(uint64(m.QualifyingValue)) + } + return n +} + +func (m *GetGaugesRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Status != 0 { + n += 1 + sovQuery(uint64(m.Status)) + } + l = len(m.Denom) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +func (m *GetGaugesResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if len(m.Gauges) > 0 { + for _, e := range m.Gauges { + l = e.Size() + n += 1 + l + sovQuery(uint64(l)) + } + } + return n +} + +func (m *GetStakeByIDRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.StakeId != 0 { + n += 1 + sovQuery(uint64(m.StakeId)) + } + return n +} + +func (m *GetStakeByIDResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Stake != nil { + l = m.Stake.Size() + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +func (m *GetStakesRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Owner) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +func (m *GetStakesResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if len(m.Stakes) > 0 { + for _, e := range m.Stakes { + l = e.Size() + n += 1 + l + sovQuery(uint64(l)) + } + } + return n +} + +func (m *GetFutureRewardEstimateRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Owner) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + if len(m.StakeIds) > 0 { + l = 0 + for _, e := range m.StakeIds { + l += sovQuery(uint64(e)) + } + n += 1 + sovQuery(uint64(l)) + l + } + if m.NumEpochs != 0 { + n += 1 + sovQuery(uint64(m.NumEpochs)) + } + return n +} + +func (m *GetFutureRewardEstimateResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if len(m.Coins) > 0 { + for _, e := range m.Coins { + l = e.Size() + n += 1 + l + sovQuery(uint64(l)) + } + } + return n +} + +func (m *GetAccountHistoryRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Account) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +func (m *GetAccountHistoryResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if len(m.Coins) > 0 { + for _, e := range m.Coins { + l = e.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 *GetModuleStatusRequest) 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: GetModuleStatusRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: GetModuleStatusRequest: 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 *GetModuleStatusResponse) 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: GetModuleStatusResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: GetModuleStatusResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field RewardCoins", 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.RewardCoins = append(m.RewardCoins, types.Coin{}) + if err := m.RewardCoins[len(m.RewardCoins)-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 StakedCoins", 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.StakedCoins = append(m.StakedCoins, types.Coin{}) + if err := m.StakedCoins[len(m.StakedCoins)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 3: + 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 *GetGaugeByIDRequest) 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: GetGaugeByIDRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: GetGaugeByIDRequest: 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:]) + 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 *GetGaugeByIDResponse) 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: GetGaugeByIDResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: GetGaugeByIDResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Gauge", 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.Gauge == nil { + m.Gauge = &Gauge{} + } + if err := m.Gauge.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 *GetGaugeQualifyingValueRequest) 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: GetGaugeQualifyingValueRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: GetGaugeQualifyingValueRequest: 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:]) + 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 *GetGaugeQualifyingValueResponse) 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: GetGaugeQualifyingValueResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: GetGaugeQualifyingValueResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field QualifyingValue", wireType) + } + m.QualifyingValue = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.QualifyingValue |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + 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 *GetGaugesRequest) 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: GetGaugesRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: GetGaugesRequest: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Status", wireType) + } + m.Status = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Status |= GaugeStatus(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Denom", 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.Denom = 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 *GetGaugesResponse) 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: GetGaugesResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: GetGaugesResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Gauges", 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.Gauges = append(m.Gauges, &Gauge{}) + if err := m.Gauges[len(m.Gauges)-1].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 *GetStakeByIDRequest) 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: GetStakeByIDRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: GetStakeByIDRequest: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field StakeId", wireType) + } + m.StakeId = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.StakeId |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + 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 *GetStakeByIDResponse) 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: GetStakeByIDResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: GetStakeByIDResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Stake", 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.Stake == nil { + m.Stake = &Stake{} + } + if err := m.Stake.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 *GetStakesRequest) 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: GetStakesRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: GetStakesRequest: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Owner", 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.Owner = 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 *GetStakesResponse) 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: GetStakesResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: GetStakesResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Stakes", 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.Stakes = append(m.Stakes, &Stake{}) + if err := m.Stakes[len(m.Stakes)-1].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 *GetFutureRewardEstimateRequest) 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: GetFutureRewardEstimateRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: GetFutureRewardEstimateRequest: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Owner", 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.Owner = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType == 0 { + var v uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.StakeIds = append(m.StakeIds, v) + } else if wireType == 2 { + var packedLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + packedLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if packedLen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + packedLen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + var elementCount int + var count int + for _, integer := range dAtA[iNdEx:postIndex] { + if integer < 128 { + count++ + } + } + elementCount = count + if elementCount != 0 && len(m.StakeIds) == 0 { + m.StakeIds = make([]uint64, 0, elementCount) + } + for iNdEx < postIndex { + var v uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.StakeIds = append(m.StakeIds, v) + } + } else { + return fmt.Errorf("proto: wrong wireType = %d for field StakeIds", wireType) + } + case 3: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field NumEpochs", wireType) + } + m.NumEpochs = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.NumEpochs |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } + 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 *GetFutureRewardEstimateResponse) 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: GetFutureRewardEstimateResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: GetFutureRewardEstimateResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Coins", 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.Coins = append(m.Coins, types.Coin{}) + if err := m.Coins[len(m.Coins)-1].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 *GetAccountHistoryRequest) 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: GetAccountHistoryRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: GetAccountHistoryRequest: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Account", 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.Account = 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 *GetAccountHistoryResponse) 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: GetAccountHistoryResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: GetAccountHistoryResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Coins", 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.Coins = append(m.Coins, types.Coin{}) + if err := m.Coins[len(m.Coins)-1].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/incentives/types/query.pb.gw.go b/x/incentives/types/query.pb.gw.go new file mode 100644 index 000000000..d3d797117 --- /dev/null +++ b/x/incentives/types/query.pb.gw.go @@ -0,0 +1,842 @@ +// Code generated by protoc-gen-grpc-gateway. DO NOT EDIT. +// source: duality/incentives/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_GetModuleStatus_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq GetModuleStatusRequest + var metadata runtime.ServerMetadata + + msg, err := client.GetModuleStatus(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Query_GetModuleStatus_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq GetModuleStatusRequest + var metadata runtime.ServerMetadata + + msg, err := server.GetModuleStatus(ctx, &protoReq) + return msg, metadata, err + +} + +func request_Query_GetGaugeByID_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq GetGaugeByIDRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["id"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") + } + + protoReq.Id, err = runtime.Uint64(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id", err) + } + + msg, err := client.GetGaugeByID(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Query_GetGaugeByID_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq GetGaugeByIDRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["id"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") + } + + protoReq.Id, err = runtime.Uint64(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id", err) + } + + msg, err := server.GetGaugeByID(ctx, &protoReq) + return msg, metadata, err + +} + +var ( + filter_Query_GetGauges_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} +) + +func request_Query_GetGauges_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq GetGaugesRequest + 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_GetGauges_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := client.GetGauges(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Query_GetGauges_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq GetGaugesRequest + 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_GetGauges_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := server.GetGauges(ctx, &protoReq) + return msg, metadata, err + +} + +func request_Query_GetStakeByID_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq GetStakeByIDRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["stake_id"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "stake_id") + } + + protoReq.StakeId, err = runtime.Uint64(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "stake_id", err) + } + + msg, err := client.GetStakeByID(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Query_GetStakeByID_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq GetStakeByIDRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["stake_id"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "stake_id") + } + + protoReq.StakeId, err = runtime.Uint64(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "stake_id", err) + } + + msg, err := server.GetStakeByID(ctx, &protoReq) + return msg, metadata, err + +} + +var ( + filter_Query_GetStakes_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} +) + +func request_Query_GetStakes_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq GetStakesRequest + 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_GetStakes_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := client.GetStakes(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Query_GetStakes_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq GetStakesRequest + 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_GetStakes_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := server.GetStakes(ctx, &protoReq) + return msg, metadata, err + +} + +var ( + filter_Query_GetFutureRewardEstimate_0 = &utilities.DoubleArray{Encoding: map[string]int{"owner": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}} +) + +func request_Query_GetFutureRewardEstimate_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq GetFutureRewardEstimateRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["owner"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "owner") + } + + protoReq.Owner, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "owner", err) + } + + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_GetFutureRewardEstimate_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := client.GetFutureRewardEstimate(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Query_GetFutureRewardEstimate_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq GetFutureRewardEstimateRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["owner"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "owner") + } + + protoReq.Owner, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "owner", err) + } + + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_GetFutureRewardEstimate_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := server.GetFutureRewardEstimate(ctx, &protoReq) + return msg, metadata, err + +} + +func request_Query_GetAccountHistory_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq GetAccountHistoryRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["account"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "account") + } + + protoReq.Account, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "account", err) + } + + msg, err := client.GetAccountHistory(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Query_GetAccountHistory_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq GetAccountHistoryRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["account"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "account") + } + + protoReq.Account, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "account", err) + } + + msg, err := server.GetAccountHistory(ctx, &protoReq) + return msg, metadata, err + +} + +func request_Query_GetGaugeQualifyingValue_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq GetGaugeQualifyingValueRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["id"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") + } + + protoReq.Id, err = runtime.Uint64(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id", err) + } + + msg, err := client.GetGaugeQualifyingValue(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Query_GetGaugeQualifyingValue_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq GetGaugeQualifyingValueRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["id"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") + } + + protoReq.Id, err = runtime.Uint64(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id", err) + } + + msg, err := server.GetGaugeQualifyingValue(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_GetModuleStatus_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_GetModuleStatus_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_GetModuleStatus_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_GetGaugeByID_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_GetGaugeByID_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_GetGaugeByID_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_GetGauges_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_GetGauges_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_GetGauges_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_GetStakeByID_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_GetStakeByID_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_GetStakeByID_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_GetStakes_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_GetStakes_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_GetStakes_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_GetFutureRewardEstimate_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_GetFutureRewardEstimate_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_GetFutureRewardEstimate_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_GetAccountHistory_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_GetAccountHistory_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_GetAccountHistory_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_GetGaugeQualifyingValue_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_GetGaugeQualifyingValue_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_GetGaugeQualifyingValue_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_GetModuleStatus_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_GetModuleStatus_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_GetModuleStatus_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_GetGaugeByID_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_GetGaugeByID_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_GetGaugeByID_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_GetGauges_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_GetGauges_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_GetGauges_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_GetStakeByID_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_GetStakeByID_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_GetStakeByID_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_GetStakes_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_GetStakes_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_GetStakes_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_GetFutureRewardEstimate_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_GetFutureRewardEstimate_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_GetFutureRewardEstimate_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_GetAccountHistory_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_GetAccountHistory_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_GetAccountHistory_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_GetGaugeQualifyingValue_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_GetGaugeQualifyingValue_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_GetGaugeQualifyingValue_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + return nil +} + +var ( + pattern_Query_GetModuleStatus_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"duality", "incentives", "v1beta1", "module_status"}, "", runtime.AssumeColonVerbOpt(true))) + + pattern_Query_GetGaugeByID_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"duality", "incentives", "v1beta1", "gauges", "id"}, "", runtime.AssumeColonVerbOpt(true))) + + pattern_Query_GetGauges_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"duality", "incentives", "v1beta1", "gauges"}, "", runtime.AssumeColonVerbOpt(true))) + + pattern_Query_GetStakeByID_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"duality", "incentives", "stakes", "stake_id"}, "", runtime.AssumeColonVerbOpt(true))) + + pattern_Query_GetStakes_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"duality", "incentives", "stakes"}, "", runtime.AssumeColonVerbOpt(true))) + + pattern_Query_GetFutureRewardEstimate_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"duality", "incentives", "v1beta1", "future_rewards_estimate", "owner"}, "", runtime.AssumeColonVerbOpt(true))) + + pattern_Query_GetAccountHistory_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"duality", "incentives", "v1beta1", "account_history", "account"}, "", runtime.AssumeColonVerbOpt(true))) + + pattern_Query_GetGaugeQualifyingValue_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"duality", "incentives", "v1beta1", "get_gauge_qualifying_value", "id"}, "", runtime.AssumeColonVerbOpt(true))) +) + +var ( + forward_Query_GetModuleStatus_0 = runtime.ForwardResponseMessage + + forward_Query_GetGaugeByID_0 = runtime.ForwardResponseMessage + + forward_Query_GetGauges_0 = runtime.ForwardResponseMessage + + forward_Query_GetStakeByID_0 = runtime.ForwardResponseMessage + + forward_Query_GetStakes_0 = runtime.ForwardResponseMessage + + forward_Query_GetFutureRewardEstimate_0 = runtime.ForwardResponseMessage + + forward_Query_GetAccountHistory_0 = runtime.ForwardResponseMessage + + forward_Query_GetGaugeQualifyingValue_0 = runtime.ForwardResponseMessage +) diff --git a/x/incentives/types/query_condition.go b/x/incentives/types/query_condition.go new file mode 100644 index 000000000..0a9d45d26 --- /dev/null +++ b/x/incentives/types/query_condition.go @@ -0,0 +1,18 @@ +package types + +import ( + dextypes "github.com/neutron-org/neutron/x/dex/types" +) + +func (qc QueryCondition) Test(poolMetadata dextypes.PoolMetadata) bool { + if !poolMetadata.PairID.Equal(qc.PairID) { + return false + } + + lowerTick := poolMetadata.Tick - int64(poolMetadata.Fee) + upperTick := poolMetadata.Tick + int64(poolMetadata.Fee) + lowerTickQualifies := qc.StartTick <= lowerTick && lowerTick <= qc.EndTick + upperTickQualifies := qc.StartTick <= upperTick && upperTick <= qc.EndTick + + return lowerTickQualifies && upperTickQualifies +} diff --git a/x/incentives/types/query_condition_test.go b/x/incentives/types/query_condition_test.go new file mode 100644 index 000000000..c21e77208 --- /dev/null +++ b/x/incentives/types/query_condition_test.go @@ -0,0 +1,62 @@ +package types_test + +import ( + "testing" + + "github.com/stretchr/testify/assert" + + dextypes "github.com/neutron-org/neutron/x/dex/types" + . "github.com/neutron-org/neutron/x/incentives/types" +) + +func TestQueryCondition(t *testing.T) { + pairID := &dextypes.PairID{ + Token0: "coin1", + Token1: "coin2", + } + + tests := []struct { + name string + queryCond QueryCondition + poolMetadata dextypes.PoolMetadata + testResult bool + }{ + { + name: "Matching denom and tick range", + queryCond: QueryCondition{PairID: pairID, StartTick: 10, EndTick: 20}, + poolMetadata: dextypes.NewPoolMetadata(pairID, 15, 5, 0), + testResult: true, + }, + { + name: "Non-matching denom", + queryCond: QueryCondition{PairID: pairID, StartTick: 10, EndTick: 20}, + poolMetadata: dextypes.NewPoolMetadata(&dextypes.PairID{Token0: "coin1", Token1: "coin3"}, 15, 5, 0), + testResult: false, + }, + { + name: "Non-matching tick range", + queryCond: QueryCondition{PairID: pairID, StartTick: 30, EndTick: 40}, + poolMetadata: dextypes.NewPoolMetadata(pairID, 15, 6, 0), + testResult: false, + }, + { + name: "Non-matching tick fee range lower", + queryCond: QueryCondition{PairID: pairID, StartTick: 30, EndTick: 40}, + poolMetadata: dextypes.NewPoolMetadata(pairID, 10, 5, 0), + testResult: false, + }, + { + name: "Non-matching tick fee range upper", + queryCond: QueryCondition{PairID: pairID, StartTick: 30, EndTick: 40}, + poolMetadata: dextypes.NewPoolMetadata(pairID, 20, 5, 0), + testResult: false, + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + result := tt.queryCond.Test(tt.poolMetadata) + assert.Equal(t, tt.testResult, result) + }) + } +} diff --git a/x/incentives/types/stake.go b/x/incentives/types/stake.go new file mode 100644 index 000000000..7d2507cbb --- /dev/null +++ b/x/incentives/types/stake.go @@ -0,0 +1,53 @@ +package types + +import ( + "fmt" + "time" + + sdk "github.com/cosmos/cosmos-sdk/types" + dextypes "github.com/neutron-org/neutron/x/dex/types" +) + +// NewStake returns a new instance of period stake. +func NewStake( + id uint64, + owner sdk.AccAddress, + coins sdk.Coins, + startTime time.Time, + startDistEpoch int64, +) *Stake { + coins = coins.Sort() + return &Stake{ + ID: id, + Owner: owner.String(), + Coins: coins, + StartTime: startTime, + StartDistEpoch: startDistEpoch, + } +} + +// OwnerAddress returns stakes owner address. +func (p Stake) OwnerAddress() sdk.AccAddress { + addr, err := sdk.AccAddressFromBech32(p.Owner) + if err != nil { + panic(err) + } + return addr +} + +func (p Stake) SingleCoin() (sdk.Coin, error) { + if len(p.Coins) != 1 { + return sdk.Coin{}, fmt.Errorf("Stake %d has no single coin: %s", p.ID, p.Coins) + } + return p.Coins[0], nil +} + +func (p Stake) ValidateBasic() error { + for _, coin := range p.Coins { + err := dextypes.ValidatePoolDenom(coin.Denom) + if err != nil { + return err + } + } + return nil +} diff --git a/x/incentives/types/stake.pb.go b/x/incentives/types/stake.pb.go new file mode 100644 index 000000000..d21e38a29 --- /dev/null +++ b/x/incentives/types/stake.pb.go @@ -0,0 +1,531 @@ +// Code generated by protoc-gen-gogo. DO NOT EDIT. +// source: duality/incentives/stake.proto + +package types + +import ( + fmt "fmt" + github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" + types "github.com/cosmos/cosmos-sdk/types" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" + github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" + _ "google.golang.org/protobuf/types/known/timestamppb" + io "io" + math "math" + math_bits "math/bits" + time "time" +) + +// Reference imports to suppress errors if they are not otherwise used. +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf +var _ = time.Kitchen + +// 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 + +// Stake records what coins are staked when by who for the purpose of +// calculating gauge reward distributions. +type Stake struct { + // ID is the "autoincrementing" id of the stake, assigned at creation. + ID uint64 `protobuf:"varint,1,opt,name=ID,proto3" json:"ID,omitempty"` + // owner is the account originating the stake. Only the owner can withdraw + // coins from the stake. + Owner string `protobuf:"bytes,2,opt,name=owner,proto3" json:"owner,omitempty" yaml:"owner"` + // start_time is the time at which the coins in the lock were staked. + StartTime time.Time `protobuf:"bytes,3,opt,name=start_time,json=startTime,proto3,stdtime" json:"start_time,omitempty" yaml:"start_time"` + // coins are the tokens staked, and managed by the module account. + Coins github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,4,rep,name=coins,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"coins"` + // start_dist_epoch is the dist epoch (defaulting to the day) at which the + // coins in the lock were staked. This is used by distribution logic to filter + // on stakes that have existed for longer than the distribution period (you + // can only qualify for today's rewards if you staked your LP tokens + // yesterday). We use int64 instead of uint64 to make testing easier. + StartDistEpoch int64 `protobuf:"varint,5,opt,name=start_dist_epoch,json=startDistEpoch,proto3" json:"start_dist_epoch,omitempty"` +} + +func (m *Stake) Reset() { *m = Stake{} } +func (m *Stake) String() string { return proto.CompactTextString(m) } +func (*Stake) ProtoMessage() {} +func (*Stake) Descriptor() ([]byte, []int) { + return fileDescriptor_0b048b82a83f5ea3, []int{0} +} +func (m *Stake) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Stake) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Stake.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 *Stake) XXX_Merge(src proto.Message) { + xxx_messageInfo_Stake.Merge(m, src) +} +func (m *Stake) XXX_Size() int { + return m.Size() +} +func (m *Stake) XXX_DiscardUnknown() { + xxx_messageInfo_Stake.DiscardUnknown(m) +} + +var xxx_messageInfo_Stake proto.InternalMessageInfo + +func (m *Stake) GetID() uint64 { + if m != nil { + return m.ID + } + return 0 +} + +func (m *Stake) GetOwner() string { + if m != nil { + return m.Owner + } + return "" +} + +func (m *Stake) GetStartTime() time.Time { + if m != nil { + return m.StartTime + } + return time.Time{} +} + +func (m *Stake) GetCoins() github_com_cosmos_cosmos_sdk_types.Coins { + if m != nil { + return m.Coins + } + return nil +} + +func (m *Stake) GetStartDistEpoch() int64 { + if m != nil { + return m.StartDistEpoch + } + return 0 +} + +func init() { + proto.RegisterType((*Stake)(nil), "duality.incentives.Stake") +} + +func init() { proto.RegisterFile("duality/incentives/stake.proto", fileDescriptor_0b048b82a83f5ea3) } + +var fileDescriptor_0b048b82a83f5ea3 = []byte{ + // 397 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0x51, 0xb1, 0x6e, 0xdb, 0x30, + 0x10, 0x15, 0xe5, 0xa8, 0x40, 0x98, 0x22, 0x48, 0x85, 0x0c, 0xaa, 0x07, 0x4a, 0xd0, 0x50, 0x68, + 0x68, 0xc8, 0xc6, 0x45, 0x97, 0x8e, 0xaa, 0x3b, 0x04, 0xe8, 0xa4, 0x76, 0xea, 0x12, 0x50, 0x32, + 0xab, 0x10, 0x91, 0x44, 0xc1, 0xa4, 0xd3, 0xea, 0x2f, 0xfc, 0x1d, 0xfd, 0x88, 0xce, 0x1e, 0x3d, + 0x76, 0x92, 0x0b, 0x7b, 0xeb, 0xe8, 0x2f, 0x08, 0x48, 0xca, 0xb0, 0x27, 0x89, 0xef, 0xdd, 0xdd, + 0x7b, 0xef, 0x0e, 0xa2, 0xd9, 0x82, 0x56, 0x5c, 0x75, 0x84, 0x37, 0x05, 0x6b, 0x14, 0x7f, 0x62, + 0x92, 0x48, 0x45, 0x1f, 0x19, 0x6e, 0xe7, 0x42, 0x09, 0xdf, 0x1f, 0x78, 0x7c, 0xe4, 0xc7, 0xd7, + 0xa5, 0x28, 0x85, 0xa1, 0x89, 0xfe, 0xb3, 0x95, 0xe3, 0xb0, 0x14, 0xa2, 0xac, 0x18, 0x31, 0xaf, + 0x7c, 0xf1, 0x83, 0x28, 0x5e, 0x33, 0xa9, 0x68, 0xdd, 0x0e, 0x05, 0xa8, 0x10, 0xb2, 0x16, 0x92, + 0xe4, 0x54, 0x32, 0xf2, 0x74, 0x9b, 0x33, 0x45, 0x6f, 0x49, 0x21, 0x78, 0x63, 0xf9, 0xf8, 0x8f, + 0x0b, 0xbd, 0xaf, 0x5a, 0xda, 0xbf, 0x84, 0xee, 0xdd, 0x34, 0x00, 0x11, 0x48, 0xce, 0x32, 0xf7, + 0x6e, 0xea, 0xbf, 0x81, 0x9e, 0xf8, 0xd9, 0xb0, 0x79, 0xe0, 0x46, 0x20, 0x39, 0x4f, 0xaf, 0xf6, + 0x7d, 0xf8, 0xb2, 0xa3, 0x75, 0xf5, 0x31, 0x36, 0x70, 0x9c, 0x59, 0xda, 0x6f, 0x21, 0x94, 0x8a, + 0xce, 0xd5, 0xbd, 0x96, 0x0e, 0x46, 0x11, 0x48, 0x2e, 0x26, 0x63, 0x6c, 0x7d, 0xe1, 0x83, 0x2f, + 0xfc, 0xed, 0xe0, 0x2b, 0xfd, 0xb0, 0xea, 0x43, 0xe7, 0x7f, 0x1f, 0x5e, 0x1f, 0xbb, 0xde, 0x8a, + 0x9a, 0x2b, 0x56, 0xb7, 0xaa, 0xdb, 0xf7, 0xe1, 0x2b, 0x2b, 0x72, 0x64, 0xe3, 0xe5, 0x26, 0x04, + 0xd9, 0xb9, 0x01, 0xf4, 0x18, 0x9f, 0x42, 0x4f, 0x27, 0x90, 0xc1, 0x59, 0x34, 0x4a, 0x2e, 0x26, + 0xaf, 0xb1, 0xcd, 0x88, 0x75, 0x46, 0x3c, 0x64, 0xc4, 0x9f, 0x04, 0x6f, 0xd2, 0x77, 0x5a, 0xeb, + 0xf7, 0x26, 0x4c, 0x4a, 0xae, 0x1e, 0x16, 0x39, 0x2e, 0x44, 0x4d, 0x86, 0x85, 0xd8, 0xcf, 0x8d, + 0x9c, 0x3d, 0x12, 0xd5, 0xb5, 0x4c, 0x9a, 0x06, 0x99, 0xd9, 0xc9, 0x7e, 0x02, 0xaf, 0xac, 0x81, + 0x19, 0x97, 0xea, 0x9e, 0xb5, 0xa2, 0x78, 0x08, 0xbc, 0x08, 0x24, 0xa3, 0xec, 0xd2, 0xe0, 0x53, + 0x2e, 0xd5, 0x67, 0x8d, 0xa6, 0x5f, 0x56, 0x5b, 0x04, 0xd6, 0x5b, 0x04, 0xfe, 0x6d, 0x11, 0x58, + 0xee, 0x90, 0xb3, 0xde, 0x21, 0xe7, 0xef, 0x0e, 0x39, 0xdf, 0x27, 0x27, 0xa2, 0xc3, 0x41, 0x6f, + 0x2a, 0x9a, 0xcb, 0xc3, 0x83, 0xfc, 0x3a, 0xbd, 0xbf, 0x31, 0x91, 0xbf, 0x30, 0x0b, 0x7b, 0xff, + 0x1c, 0x00, 0x00, 0xff, 0xff, 0x74, 0x5b, 0xcb, 0x93, 0x22, 0x02, 0x00, 0x00, +} + +func (m *Stake) 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 *Stake) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Stake) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.StartDistEpoch != 0 { + i = encodeVarintStake(dAtA, i, uint64(m.StartDistEpoch)) + i-- + dAtA[i] = 0x28 + } + if len(m.Coins) > 0 { + for iNdEx := len(m.Coins) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Coins[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintStake(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x22 + } + } + n1, err1 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.StartTime, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.StartTime):]) + if err1 != nil { + return 0, err1 + } + i -= n1 + i = encodeVarintStake(dAtA, i, uint64(n1)) + i-- + dAtA[i] = 0x1a + if len(m.Owner) > 0 { + i -= len(m.Owner) + copy(dAtA[i:], m.Owner) + i = encodeVarintStake(dAtA, i, uint64(len(m.Owner))) + i-- + dAtA[i] = 0x12 + } + if m.ID != 0 { + i = encodeVarintStake(dAtA, i, uint64(m.ID)) + i-- + dAtA[i] = 0x8 + } + return len(dAtA) - i, nil +} + +func encodeVarintStake(dAtA []byte, offset int, v uint64) int { + offset -= sovStake(v) + base := offset + for v >= 1<<7 { + dAtA[offset] = uint8(v&0x7f | 0x80) + v >>= 7 + offset++ + } + dAtA[offset] = uint8(v) + return base +} +func (m *Stake) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.ID != 0 { + n += 1 + sovStake(uint64(m.ID)) + } + l = len(m.Owner) + if l > 0 { + n += 1 + l + sovStake(uint64(l)) + } + l = github_com_cosmos_gogoproto_types.SizeOfStdTime(m.StartTime) + n += 1 + l + sovStake(uint64(l)) + if len(m.Coins) > 0 { + for _, e := range m.Coins { + l = e.Size() + n += 1 + l + sovStake(uint64(l)) + } + } + if m.StartDistEpoch != 0 { + n += 1 + sovStake(uint64(m.StartDistEpoch)) + } + return n +} + +func sovStake(x uint64) (n int) { + return (math_bits.Len64(x|1) + 6) / 7 +} +func sozStake(x uint64) (n int) { + return sovStake(uint64((x << 1) ^ uint64((int64(x) >> 63)))) +} +func (m *Stake) 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 ErrIntOverflowStake + } + 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: Stake: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: Stake: 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 ErrIntOverflowStake + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.ID |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Owner", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowStake + } + 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 ErrInvalidLengthStake + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthStake + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Owner = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field StartTime", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowStake + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthStake + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthStake + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(&m.StartTime, dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Coins", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowStake + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthStake + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthStake + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Coins = append(m.Coins, types.Coin{}) + if err := m.Coins[len(m.Coins)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 5: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field StartDistEpoch", wireType) + } + m.StartDistEpoch = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowStake + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.StartDistEpoch |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } + default: + iNdEx = preIndex + skippy, err := skipStake(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthStake + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func skipStake(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, ErrIntOverflowStake + } + 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, ErrIntOverflowStake + } + 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, ErrIntOverflowStake + } + 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, ErrInvalidLengthStake + } + iNdEx += length + case 3: + depth++ + case 4: + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupStake + } + depth-- + case 5: + iNdEx += 4 + default: + return 0, fmt.Errorf("proto: illegal wireType %d", wireType) + } + if iNdEx < 0 { + return 0, ErrInvalidLengthStake + } + if depth == 0 { + return iNdEx, nil + } + } + return 0, io.ErrUnexpectedEOF +} + +var ( + ErrInvalidLengthStake = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowStake = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupStake = fmt.Errorf("proto: unexpected end of group") +) diff --git a/x/incentives/types/stakes.go b/x/incentives/types/stakes.go new file mode 100644 index 000000000..e2b0240b7 --- /dev/null +++ b/x/incentives/types/stakes.go @@ -0,0 +1,16 @@ +package types + +import sdk "github.com/cosmos/cosmos-sdk/types" + +type Stakes []*Stake + +func (stakes Stakes) GetCoins() sdk.Coins { + coins := sdk.Coins{} + for _, stake := range stakes { + coinsToAdd := stake.GetCoins() + if !coinsToAdd.Empty() { + coins = coins.Add(coinsToAdd...) + } + } + return coins +} diff --git a/x/incentives/types/tx.pb.go b/x/incentives/types/tx.pb.go new file mode 100644 index 000000000..330a3cbce --- /dev/null +++ b/x/incentives/types/tx.pb.go @@ -0,0 +1,2314 @@ +// Code generated by protoc-gen-gogo. DO NOT EDIT. +// source: duality/incentives/tx.proto + +package types + +import ( + context "context" + fmt "fmt" + github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" + types "github.com/cosmos/cosmos-sdk/types" + _ "github.com/cosmos/gogoproto/gogoproto" + grpc1 "github.com/cosmos/gogoproto/grpc" + proto "github.com/cosmos/gogoproto/proto" + github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" + grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" + _ "google.golang.org/protobuf/types/known/durationpb" + _ "google.golang.org/protobuf/types/known/timestamppb" + io "io" + math "math" + math_bits "math/bits" + time "time" +) + +// Reference imports to suppress errors if they are not otherwise used. +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf +var _ = time.Kitchen + +// 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 + +// MsgCreateGauge creates a gague to distribute rewards to users +type MsgCreateGauge struct { + // is_perpetual shows if it's a perpetual or non-perpetual gauge + // Non-perpetual gauges distribute their tokens equally per epoch while the + // gauge is in the active period. Perpetual gauges distribute all their tokens + // at a single time and only distribute their tokens again once the gauge is + // refilled + IsPerpetual bool `protobuf:"varint,1,opt,name=is_perpetual,json=isPerpetual,proto3" json:"is_perpetual,omitempty"` + // owner is the address of gauge creator, should be the module authority + Owner string `protobuf:"bytes,2,opt,name=owner,proto3" json:"owner,omitempty" yaml:"owner"` + // distribute_to show which lock the gauge should distribute to by time + // duration or by timestamp + DistributeTo QueryCondition `protobuf:"bytes,3,opt,name=distribute_to,json=distributeTo,proto3" json:"distribute_to"` + // coins are coin(s) to be distributed by the gauge + Coins github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,4,rep,name=coins,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"coins"` + // start_time is the distribution start time + StartTime time.Time `protobuf:"bytes,5,opt,name=start_time,json=startTime,proto3,stdtime" json:"start_time" yaml:"timestamp"` + // num_epochs_paid_over is the number of epochs distribution will be completed + // over + NumEpochsPaidOver uint64 `protobuf:"varint,6,opt,name=num_epochs_paid_over,json=numEpochsPaidOver,proto3" json:"num_epochs_paid_over,omitempty"` + // pricing_tick is the price that liquidity within the gauge range will be priced at + PricingTick int64 `protobuf:"varint,7,opt,name=pricing_tick,json=pricingTick,proto3" json:"pricing_tick,omitempty"` +} + +func (m *MsgCreateGauge) Reset() { *m = MsgCreateGauge{} } +func (m *MsgCreateGauge) String() string { return proto.CompactTextString(m) } +func (*MsgCreateGauge) ProtoMessage() {} +func (*MsgCreateGauge) Descriptor() ([]byte, []int) { + return fileDescriptor_e2cc69741b48f3e9, []int{0} +} +func (m *MsgCreateGauge) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MsgCreateGauge) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MsgCreateGauge.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 *MsgCreateGauge) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgCreateGauge.Merge(m, src) +} +func (m *MsgCreateGauge) XXX_Size() int { + return m.Size() +} +func (m *MsgCreateGauge) XXX_DiscardUnknown() { + xxx_messageInfo_MsgCreateGauge.DiscardUnknown(m) +} + +var xxx_messageInfo_MsgCreateGauge proto.InternalMessageInfo + +func (m *MsgCreateGauge) GetIsPerpetual() bool { + if m != nil { + return m.IsPerpetual + } + return false +} + +func (m *MsgCreateGauge) GetOwner() string { + if m != nil { + return m.Owner + } + return "" +} + +func (m *MsgCreateGauge) GetDistributeTo() QueryCondition { + if m != nil { + return m.DistributeTo + } + return QueryCondition{} +} + +func (m *MsgCreateGauge) GetCoins() github_com_cosmos_cosmos_sdk_types.Coins { + if m != nil { + return m.Coins + } + return nil +} + +func (m *MsgCreateGauge) GetStartTime() time.Time { + if m != nil { + return m.StartTime + } + return time.Time{} +} + +func (m *MsgCreateGauge) GetNumEpochsPaidOver() uint64 { + if m != nil { + return m.NumEpochsPaidOver + } + return 0 +} + +func (m *MsgCreateGauge) GetPricingTick() int64 { + if m != nil { + return m.PricingTick + } + return 0 +} + +type MsgCreateGaugeResponse struct { +} + +func (m *MsgCreateGaugeResponse) Reset() { *m = MsgCreateGaugeResponse{} } +func (m *MsgCreateGaugeResponse) String() string { return proto.CompactTextString(m) } +func (*MsgCreateGaugeResponse) ProtoMessage() {} +func (*MsgCreateGaugeResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_e2cc69741b48f3e9, []int{1} +} +func (m *MsgCreateGaugeResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MsgCreateGaugeResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MsgCreateGaugeResponse.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 *MsgCreateGaugeResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgCreateGaugeResponse.Merge(m, src) +} +func (m *MsgCreateGaugeResponse) XXX_Size() int { + return m.Size() +} +func (m *MsgCreateGaugeResponse) XXX_DiscardUnknown() { + xxx_messageInfo_MsgCreateGaugeResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_MsgCreateGaugeResponse proto.InternalMessageInfo + +// MsgAddToGauge adds coins to a previously created gauge +type MsgAddToGauge struct { + // owner is the gauge owner's address + Owner string `protobuf:"bytes,1,opt,name=owner,proto3" json:"owner,omitempty" yaml:"owner"` + // gauge_id is the ID of gauge that rewards are getting added to + GaugeId uint64 `protobuf:"varint,2,opt,name=gauge_id,json=gaugeId,proto3" json:"gauge_id,omitempty"` + // rewards are the coin(s) to add to gauge + Rewards github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,3,rep,name=rewards,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"rewards"` +} + +func (m *MsgAddToGauge) Reset() { *m = MsgAddToGauge{} } +func (m *MsgAddToGauge) String() string { return proto.CompactTextString(m) } +func (*MsgAddToGauge) ProtoMessage() {} +func (*MsgAddToGauge) Descriptor() ([]byte, []int) { + return fileDescriptor_e2cc69741b48f3e9, []int{2} +} +func (m *MsgAddToGauge) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MsgAddToGauge) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MsgAddToGauge.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 *MsgAddToGauge) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgAddToGauge.Merge(m, src) +} +func (m *MsgAddToGauge) XXX_Size() int { + return m.Size() +} +func (m *MsgAddToGauge) XXX_DiscardUnknown() { + xxx_messageInfo_MsgAddToGauge.DiscardUnknown(m) +} + +var xxx_messageInfo_MsgAddToGauge proto.InternalMessageInfo + +func (m *MsgAddToGauge) GetOwner() string { + if m != nil { + return m.Owner + } + return "" +} + +func (m *MsgAddToGauge) GetGaugeId() uint64 { + if m != nil { + return m.GaugeId + } + return 0 +} + +func (m *MsgAddToGauge) GetRewards() github_com_cosmos_cosmos_sdk_types.Coins { + if m != nil { + return m.Rewards + } + return nil +} + +type MsgAddToGaugeResponse struct { +} + +func (m *MsgAddToGaugeResponse) Reset() { *m = MsgAddToGaugeResponse{} } +func (m *MsgAddToGaugeResponse) String() string { return proto.CompactTextString(m) } +func (*MsgAddToGaugeResponse) ProtoMessage() {} +func (*MsgAddToGaugeResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_e2cc69741b48f3e9, []int{3} +} +func (m *MsgAddToGaugeResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MsgAddToGaugeResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MsgAddToGaugeResponse.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 *MsgAddToGaugeResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgAddToGaugeResponse.Merge(m, src) +} +func (m *MsgAddToGaugeResponse) XXX_Size() int { + return m.Size() +} +func (m *MsgAddToGaugeResponse) XXX_DiscardUnknown() { + xxx_messageInfo_MsgAddToGaugeResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_MsgAddToGaugeResponse proto.InternalMessageInfo + +type MsgStake struct { + Owner string `protobuf:"bytes,1,opt,name=owner,proto3" json:"owner,omitempty" yaml:"owner"` + Coins github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,2,rep,name=coins,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"coins"` +} + +func (m *MsgStake) Reset() { *m = MsgStake{} } +func (m *MsgStake) String() string { return proto.CompactTextString(m) } +func (*MsgStake) ProtoMessage() {} +func (*MsgStake) Descriptor() ([]byte, []int) { + return fileDescriptor_e2cc69741b48f3e9, []int{4} +} +func (m *MsgStake) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MsgStake) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MsgStake.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 *MsgStake) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgStake.Merge(m, src) +} +func (m *MsgStake) XXX_Size() int { + return m.Size() +} +func (m *MsgStake) XXX_DiscardUnknown() { + xxx_messageInfo_MsgStake.DiscardUnknown(m) +} + +var xxx_messageInfo_MsgStake proto.InternalMessageInfo + +func (m *MsgStake) GetOwner() string { + if m != nil { + return m.Owner + } + return "" +} + +func (m *MsgStake) GetCoins() github_com_cosmos_cosmos_sdk_types.Coins { + if m != nil { + return m.Coins + } + return nil +} + +type MsgStakeResponse struct { + ID uint64 `protobuf:"varint,1,opt,name=ID,proto3" json:"ID,omitempty"` +} + +func (m *MsgStakeResponse) Reset() { *m = MsgStakeResponse{} } +func (m *MsgStakeResponse) String() string { return proto.CompactTextString(m) } +func (*MsgStakeResponse) ProtoMessage() {} +func (*MsgStakeResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_e2cc69741b48f3e9, []int{5} +} +func (m *MsgStakeResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MsgStakeResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MsgStakeResponse.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 *MsgStakeResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgStakeResponse.Merge(m, src) +} +func (m *MsgStakeResponse) XXX_Size() int { + return m.Size() +} +func (m *MsgStakeResponse) XXX_DiscardUnknown() { + xxx_messageInfo_MsgStakeResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_MsgStakeResponse proto.InternalMessageInfo + +func (m *MsgStakeResponse) GetID() uint64 { + if m != nil { + return m.ID + } + return 0 +} + +type MsgUnstake struct { + Owner string `protobuf:"bytes,1,opt,name=owner,proto3" json:"owner,omitempty" yaml:"owner"` + // If unstake is left empty, this is interpreted as "unstake all" + Unstakes []*MsgUnstake_UnstakeDescriptor `protobuf:"bytes,2,rep,name=unstakes,proto3" json:"unstakes,omitempty"` +} + +func (m *MsgUnstake) Reset() { *m = MsgUnstake{} } +func (m *MsgUnstake) String() string { return proto.CompactTextString(m) } +func (*MsgUnstake) ProtoMessage() {} +func (*MsgUnstake) Descriptor() ([]byte, []int) { + return fileDescriptor_e2cc69741b48f3e9, []int{6} +} +func (m *MsgUnstake) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MsgUnstake) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MsgUnstake.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 *MsgUnstake) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgUnstake.Merge(m, src) +} +func (m *MsgUnstake) XXX_Size() int { + return m.Size() +} +func (m *MsgUnstake) XXX_DiscardUnknown() { + xxx_messageInfo_MsgUnstake.DiscardUnknown(m) +} + +var xxx_messageInfo_MsgUnstake proto.InternalMessageInfo + +func (m *MsgUnstake) GetOwner() string { + if m != nil { + return m.Owner + } + return "" +} + +func (m *MsgUnstake) GetUnstakes() []*MsgUnstake_UnstakeDescriptor { + if m != nil { + return m.Unstakes + } + return nil +} + +type MsgUnstake_UnstakeDescriptor struct { + ID uint64 `protobuf:"varint,1,opt,name=ID,proto3" json:"ID,omitempty"` + Coins github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,2,rep,name=coins,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"coins"` +} + +func (m *MsgUnstake_UnstakeDescriptor) Reset() { *m = MsgUnstake_UnstakeDescriptor{} } +func (m *MsgUnstake_UnstakeDescriptor) String() string { return proto.CompactTextString(m) } +func (*MsgUnstake_UnstakeDescriptor) ProtoMessage() {} +func (*MsgUnstake_UnstakeDescriptor) Descriptor() ([]byte, []int) { + return fileDescriptor_e2cc69741b48f3e9, []int{6, 0} +} +func (m *MsgUnstake_UnstakeDescriptor) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MsgUnstake_UnstakeDescriptor) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MsgUnstake_UnstakeDescriptor.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 *MsgUnstake_UnstakeDescriptor) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgUnstake_UnstakeDescriptor.Merge(m, src) +} +func (m *MsgUnstake_UnstakeDescriptor) XXX_Size() int { + return m.Size() +} +func (m *MsgUnstake_UnstakeDescriptor) XXX_DiscardUnknown() { + xxx_messageInfo_MsgUnstake_UnstakeDescriptor.DiscardUnknown(m) +} + +var xxx_messageInfo_MsgUnstake_UnstakeDescriptor proto.InternalMessageInfo + +func (m *MsgUnstake_UnstakeDescriptor) GetID() uint64 { + if m != nil { + return m.ID + } + return 0 +} + +func (m *MsgUnstake_UnstakeDescriptor) GetCoins() github_com_cosmos_cosmos_sdk_types.Coins { + if m != nil { + return m.Coins + } + return nil +} + +type MsgUnstakeResponse struct { +} + +func (m *MsgUnstakeResponse) Reset() { *m = MsgUnstakeResponse{} } +func (m *MsgUnstakeResponse) String() string { return proto.CompactTextString(m) } +func (*MsgUnstakeResponse) ProtoMessage() {} +func (*MsgUnstakeResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_e2cc69741b48f3e9, []int{7} +} +func (m *MsgUnstakeResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MsgUnstakeResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MsgUnstakeResponse.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 *MsgUnstakeResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgUnstakeResponse.Merge(m, src) +} +func (m *MsgUnstakeResponse) XXX_Size() int { + return m.Size() +} +func (m *MsgUnstakeResponse) XXX_DiscardUnknown() { + xxx_messageInfo_MsgUnstakeResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_MsgUnstakeResponse proto.InternalMessageInfo + +func init() { + proto.RegisterType((*MsgCreateGauge)(nil), "duality.incentives.MsgCreateGauge") + proto.RegisterType((*MsgCreateGaugeResponse)(nil), "duality.incentives.MsgCreateGaugeResponse") + proto.RegisterType((*MsgAddToGauge)(nil), "duality.incentives.MsgAddToGauge") + proto.RegisterType((*MsgAddToGaugeResponse)(nil), "duality.incentives.MsgAddToGaugeResponse") + proto.RegisterType((*MsgStake)(nil), "duality.incentives.MsgStake") + proto.RegisterType((*MsgStakeResponse)(nil), "duality.incentives.MsgStakeResponse") + proto.RegisterType((*MsgUnstake)(nil), "duality.incentives.MsgUnstake") + proto.RegisterType((*MsgUnstake_UnstakeDescriptor)(nil), "duality.incentives.MsgUnstake.UnstakeDescriptor") + proto.RegisterType((*MsgUnstakeResponse)(nil), "duality.incentives.MsgUnstakeResponse") +} + +func init() { proto.RegisterFile("duality/incentives/tx.proto", fileDescriptor_e2cc69741b48f3e9) } + +var fileDescriptor_e2cc69741b48f3e9 = []byte{ + // 741 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x55, 0xcb, 0x4e, 0xdb, 0x40, + 0x14, 0x8d, 0xf3, 0x20, 0x61, 0x02, 0x08, 0x2c, 0xda, 0x1a, 0x17, 0x39, 0xc1, 0xaa, 0x50, 0x5a, + 0x09, 0x1b, 0xd2, 0x5d, 0x77, 0x0d, 0x54, 0x15, 0x2a, 0x51, 0xc1, 0x4d, 0x55, 0x09, 0xa9, 0xb2, + 0x26, 0xf6, 0xd4, 0x8c, 0x92, 0x78, 0xac, 0x99, 0x71, 0x20, 0x3f, 0xd0, 0x4d, 0x37, 0x6c, 0xfa, + 0x13, 0xfd, 0x83, 0xf6, 0x0b, 0x58, 0xb2, 0xec, 0x0a, 0x10, 0xfc, 0x01, 0x5f, 0x50, 0xf9, 0x99, + 0xf0, 0x0a, 0xad, 0xd4, 0x76, 0x65, 0x66, 0xce, 0xbd, 0x87, 0x73, 0xcf, 0xb9, 0x76, 0xc0, 0x63, + 0xdb, 0x87, 0x5d, 0xcc, 0x07, 0x3a, 0x76, 0x2d, 0xe4, 0x72, 0xdc, 0x47, 0x4c, 0xe7, 0x07, 0x9a, + 0x47, 0x09, 0x27, 0xa2, 0x18, 0x83, 0xda, 0x10, 0x94, 0xe7, 0x1d, 0xe2, 0x90, 0x10, 0xd6, 0x83, + 0xbf, 0xa2, 0x4a, 0xb9, 0xe2, 0x10, 0xe2, 0x74, 0x91, 0x1e, 0x9e, 0xda, 0xfe, 0x27, 0x9d, 0xe3, + 0x1e, 0x62, 0x1c, 0xf6, 0xbc, 0xb8, 0x40, 0xb1, 0x08, 0xeb, 0x11, 0xa6, 0xb7, 0x21, 0x43, 0x7a, + 0x7f, 0xad, 0x8d, 0x38, 0x5c, 0xd3, 0x2d, 0x82, 0xdd, 0x04, 0xbf, 0x45, 0x87, 0x03, 0x7d, 0x07, + 0x8d, 0xc1, 0x19, 0x87, 0x9d, 0x14, 0xbf, 0x2e, 0xc0, 0xf6, 0x29, 0xe4, 0x98, 0xc4, 0xfc, 0xea, + 0x8f, 0x1c, 0x98, 0x69, 0x32, 0x67, 0x9d, 0x22, 0xc8, 0xd1, 0xeb, 0x80, 0x58, 0x5c, 0x02, 0x53, + 0x98, 0x99, 0x1e, 0xa2, 0x1e, 0xe2, 0x3e, 0xec, 0x4a, 0x42, 0x55, 0xa8, 0x95, 0x8c, 0x32, 0x66, + 0xdb, 0xc9, 0x95, 0xb8, 0x0c, 0x0a, 0x64, 0xdf, 0x45, 0x54, 0xca, 0x56, 0x85, 0xda, 0x64, 0x63, + 0xf6, 0xf2, 0xa4, 0x32, 0x35, 0x80, 0xbd, 0xee, 0x0b, 0x35, 0xbc, 0x56, 0x8d, 0x08, 0x16, 0x9b, + 0x60, 0xda, 0xc6, 0x8c, 0x53, 0xdc, 0xf6, 0x39, 0x32, 0x39, 0x91, 0x72, 0x55, 0xa1, 0x56, 0xae, + 0xab, 0xda, 0x4d, 0x03, 0xb5, 0x1d, 0x1f, 0xd1, 0xc1, 0x3a, 0x71, 0x6d, 0x1c, 0xc8, 0x6b, 0xe4, + 0x8f, 0x4e, 0x2a, 0x19, 0x63, 0x6a, 0xd8, 0xde, 0x22, 0x22, 0x04, 0x85, 0xc0, 0x1a, 0x26, 0xe5, + 0xab, 0xb9, 0x5a, 0xb9, 0xbe, 0xa0, 0x45, 0xe6, 0x69, 0x81, 0x79, 0x5a, 0x6c, 0x9e, 0xb6, 0x4e, + 0xb0, 0xdb, 0x58, 0x0d, 0xba, 0xbf, 0x9d, 0x56, 0x6a, 0x0e, 0xe6, 0x7b, 0x7e, 0x5b, 0xb3, 0x48, + 0x4f, 0x8f, 0x9d, 0x8e, 0x1e, 0x2b, 0xcc, 0xee, 0xe8, 0x7c, 0xe0, 0x21, 0x16, 0x36, 0x30, 0x23, + 0x62, 0x16, 0x3f, 0x00, 0xc0, 0x38, 0xa4, 0xdc, 0x0c, 0x82, 0x92, 0x0a, 0xa1, 0x5c, 0x59, 0x8b, + 0x4c, 0xd4, 0x12, 0x13, 0xb5, 0x56, 0x92, 0x62, 0x63, 0x31, 0xf8, 0x47, 0x97, 0x27, 0x95, 0xd9, + 0x68, 0xfc, 0x34, 0x5e, 0xf5, 0xf0, 0xb4, 0x22, 0x18, 0x93, 0x21, 0x57, 0x50, 0x2d, 0xea, 0x60, + 0xde, 0xf5, 0x7b, 0x26, 0xf2, 0x88, 0xb5, 0xc7, 0x4c, 0x0f, 0x62, 0xdb, 0x24, 0x7d, 0x44, 0xa5, + 0x89, 0xaa, 0x50, 0xcb, 0x1b, 0x73, 0xae, 0xdf, 0x7b, 0x15, 0x42, 0xdb, 0x10, 0xdb, 0x6f, 0xfb, + 0x88, 0x06, 0x31, 0x78, 0x14, 0x5b, 0xd8, 0x75, 0x4c, 0x8e, 0xad, 0x8e, 0x54, 0xac, 0x0a, 0xb5, + 0x9c, 0x51, 0x8e, 0xef, 0x5a, 0xd8, 0xea, 0xa8, 0x12, 0x78, 0x78, 0x35, 0x3b, 0x03, 0x31, 0x8f, + 0xb8, 0x0c, 0xa9, 0xdf, 0x05, 0x30, 0xdd, 0x64, 0xce, 0x4b, 0xdb, 0x6e, 0x91, 0x28, 0xd5, 0x34, + 0x32, 0x61, 0x7c, 0x64, 0x0b, 0xa0, 0x14, 0xee, 0x97, 0x89, 0xed, 0x30, 0xdd, 0xbc, 0x51, 0x0c, + 0xcf, 0x9b, 0xb6, 0x88, 0x40, 0x91, 0xa2, 0x7d, 0x48, 0x6d, 0x26, 0xe5, 0xfe, 0x7e, 0x00, 0x09, + 0xb7, 0xfa, 0x08, 0x3c, 0xb8, 0x22, 0x3d, 0x1d, 0xea, 0xab, 0x00, 0x4a, 0x4d, 0xe6, 0xbc, 0x0b, + 0xd6, 0xfb, 0xb7, 0xe7, 0x49, 0x77, 0x26, 0xfb, 0xaf, 0x76, 0x46, 0x55, 0xc1, 0x6c, 0x22, 0x2b, + 0xd1, 0x2a, 0xce, 0x80, 0xec, 0xe6, 0x46, 0xa8, 0x2d, 0x6f, 0x64, 0x37, 0x37, 0xd4, 0x2f, 0x59, + 0x00, 0x9a, 0xcc, 0x79, 0xef, 0xb2, 0x3f, 0x52, 0xbf, 0x05, 0x4a, 0x7e, 0xd4, 0x92, 0x0c, 0xb0, + 0x7a, 0xdb, 0xbb, 0x33, 0x64, 0xd6, 0xe2, 0xe7, 0x06, 0x62, 0x16, 0xc5, 0x1e, 0x27, 0xd4, 0x48, + 0x19, 0xe4, 0xcf, 0x02, 0x98, 0xbb, 0x81, 0x5f, 0x97, 0xfa, 0x3f, 0x1c, 0x9b, 0x07, 0xe2, 0x50, + 0x72, 0xe2, 0x59, 0xfd, 0x2c, 0x0b, 0x72, 0x4d, 0xe6, 0x88, 0x1f, 0x41, 0x79, 0xf4, 0x7b, 0xa4, + 0xde, 0x31, 0xf1, 0x48, 0x8d, 0xfc, 0xec, 0xfe, 0x9a, 0x34, 0x9a, 0x5d, 0x00, 0x46, 0xde, 0x8b, + 0xa5, 0x3b, 0x3a, 0x87, 0x25, 0xf2, 0xd3, 0x7b, 0x4b, 0x52, 0xee, 0x37, 0xa0, 0x10, 0xad, 0xe7, + 0xe2, 0x1d, 0x3d, 0x21, 0x2a, 0x3f, 0x19, 0x87, 0xa6, 0x64, 0x3b, 0xa0, 0x98, 0xec, 0x8b, 0x32, + 0x3e, 0x75, 0x79, 0x79, 0x3c, 0x9e, 0x50, 0x36, 0xb6, 0x8e, 0xce, 0x15, 0xe1, 0xf8, 0x5c, 0x11, + 0xce, 0xce, 0x15, 0xe1, 0xf0, 0x42, 0xc9, 0x1c, 0x5f, 0x28, 0x99, 0x9f, 0x17, 0x4a, 0x66, 0xb7, + 0x3e, 0x92, 0x61, 0xcc, 0xb5, 0xd2, 0x85, 0x6d, 0x96, 0x1c, 0xf4, 0x83, 0x2b, 0x3f, 0x85, 0x41, + 0xa6, 0xed, 0x89, 0xf0, 0x83, 0xf8, 0xfc, 0x57, 0x00, 0x00, 0x00, 0xff, 0xff, 0x99, 0xd3, 0x5a, + 0xcd, 0x2d, 0x07, 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 { + // Create an incentive program + CreateGauge(ctx context.Context, in *MsgCreateGauge, opts ...grpc.CallOption) (*MsgCreateGaugeResponse, error) + // Add rewards to an existing incentives program + AddToGauge(ctx context.Context, in *MsgAddToGauge, opts ...grpc.CallOption) (*MsgAddToGaugeResponse, error) + // Deposit LP tokens to the module, qualifying for rewards from gauges + Stake(ctx context.Context, in *MsgStake, opts ...grpc.CallOption) (*MsgStakeResponse, error) + // Withdraw LP tokens from the module, forfeiting future rewards from gauges + Unstake(ctx context.Context, in *MsgUnstake, opts ...grpc.CallOption) (*MsgUnstakeResponse, error) +} + +type msgClient struct { + cc grpc1.ClientConn +} + +func NewMsgClient(cc grpc1.ClientConn) MsgClient { + return &msgClient{cc} +} + +func (c *msgClient) CreateGauge(ctx context.Context, in *MsgCreateGauge, opts ...grpc.CallOption) (*MsgCreateGaugeResponse, error) { + out := new(MsgCreateGaugeResponse) + err := c.cc.Invoke(ctx, "/duality.incentives.Msg/CreateGauge", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *msgClient) AddToGauge(ctx context.Context, in *MsgAddToGauge, opts ...grpc.CallOption) (*MsgAddToGaugeResponse, error) { + out := new(MsgAddToGaugeResponse) + err := c.cc.Invoke(ctx, "/duality.incentives.Msg/AddToGauge", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *msgClient) Stake(ctx context.Context, in *MsgStake, opts ...grpc.CallOption) (*MsgStakeResponse, error) { + out := new(MsgStakeResponse) + err := c.cc.Invoke(ctx, "/duality.incentives.Msg/Stake", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *msgClient) Unstake(ctx context.Context, in *MsgUnstake, opts ...grpc.CallOption) (*MsgUnstakeResponse, error) { + out := new(MsgUnstakeResponse) + err := c.cc.Invoke(ctx, "/duality.incentives.Msg/Unstake", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +// MsgServer is the server API for Msg service. +type MsgServer interface { + // Create an incentive program + CreateGauge(context.Context, *MsgCreateGauge) (*MsgCreateGaugeResponse, error) + // Add rewards to an existing incentives program + AddToGauge(context.Context, *MsgAddToGauge) (*MsgAddToGaugeResponse, error) + // Deposit LP tokens to the module, qualifying for rewards from gauges + Stake(context.Context, *MsgStake) (*MsgStakeResponse, error) + // Withdraw LP tokens from the module, forfeiting future rewards from gauges + Unstake(context.Context, *MsgUnstake) (*MsgUnstakeResponse, error) +} + +// UnimplementedMsgServer can be embedded to have forward compatible implementations. +type UnimplementedMsgServer struct { +} + +func (*UnimplementedMsgServer) CreateGauge(ctx context.Context, req *MsgCreateGauge) (*MsgCreateGaugeResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method CreateGauge not implemented") +} +func (*UnimplementedMsgServer) AddToGauge(ctx context.Context, req *MsgAddToGauge) (*MsgAddToGaugeResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method AddToGauge not implemented") +} +func (*UnimplementedMsgServer) Stake(ctx context.Context, req *MsgStake) (*MsgStakeResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Stake not implemented") +} +func (*UnimplementedMsgServer) Unstake(ctx context.Context, req *MsgUnstake) (*MsgUnstakeResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Unstake not implemented") +} + +func RegisterMsgServer(s grpc1.Server, srv MsgServer) { + s.RegisterService(&_Msg_serviceDesc, srv) +} + +func _Msg_CreateGauge_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(MsgCreateGauge) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(MsgServer).CreateGauge(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/duality.incentives.Msg/CreateGauge", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(MsgServer).CreateGauge(ctx, req.(*MsgCreateGauge)) + } + return interceptor(ctx, in, info, handler) +} + +func _Msg_AddToGauge_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(MsgAddToGauge) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(MsgServer).AddToGauge(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/duality.incentives.Msg/AddToGauge", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(MsgServer).AddToGauge(ctx, req.(*MsgAddToGauge)) + } + return interceptor(ctx, in, info, handler) +} + +func _Msg_Stake_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(MsgStake) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(MsgServer).Stake(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/duality.incentives.Msg/Stake", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(MsgServer).Stake(ctx, req.(*MsgStake)) + } + return interceptor(ctx, in, info, handler) +} + +func _Msg_Unstake_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(MsgUnstake) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(MsgServer).Unstake(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/duality.incentives.Msg/Unstake", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(MsgServer).Unstake(ctx, req.(*MsgUnstake)) + } + return interceptor(ctx, in, info, handler) +} + +var _Msg_serviceDesc = grpc.ServiceDesc{ + ServiceName: "duality.incentives.Msg", + HandlerType: (*MsgServer)(nil), + Methods: []grpc.MethodDesc{ + { + MethodName: "CreateGauge", + Handler: _Msg_CreateGauge_Handler, + }, + { + MethodName: "AddToGauge", + Handler: _Msg_AddToGauge_Handler, + }, + { + MethodName: "Stake", + Handler: _Msg_Stake_Handler, + }, + { + MethodName: "Unstake", + Handler: _Msg_Unstake_Handler, + }, + }, + Streams: []grpc.StreamDesc{}, + Metadata: "duality/incentives/tx.proto", +} + +func (m *MsgCreateGauge) 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 *MsgCreateGauge) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MsgCreateGauge) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.PricingTick != 0 { + i = encodeVarintTx(dAtA, i, uint64(m.PricingTick)) + i-- + dAtA[i] = 0x38 + } + if m.NumEpochsPaidOver != 0 { + i = encodeVarintTx(dAtA, i, uint64(m.NumEpochsPaidOver)) + i-- + dAtA[i] = 0x30 + } + n1, err1 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.StartTime, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.StartTime):]) + if err1 != nil { + return 0, err1 + } + i -= n1 + i = encodeVarintTx(dAtA, i, uint64(n1)) + i-- + dAtA[i] = 0x2a + if len(m.Coins) > 0 { + for iNdEx := len(m.Coins) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Coins[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTx(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x22 + } + } + { + size, err := m.DistributeTo.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTx(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1a + if len(m.Owner) > 0 { + i -= len(m.Owner) + copy(dAtA[i:], m.Owner) + i = encodeVarintTx(dAtA, i, uint64(len(m.Owner))) + i-- + dAtA[i] = 0x12 + } + if m.IsPerpetual { + i-- + if m.IsPerpetual { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- + dAtA[i] = 0x8 + } + return len(dAtA) - i, nil +} + +func (m *MsgCreateGaugeResponse) 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 *MsgCreateGaugeResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MsgCreateGaugeResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + return len(dAtA) - i, nil +} + +func (m *MsgAddToGauge) 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 *MsgAddToGauge) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MsgAddToGauge) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Rewards) > 0 { + for iNdEx := len(m.Rewards) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Rewards[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTx(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1a + } + } + if m.GaugeId != 0 { + i = encodeVarintTx(dAtA, i, uint64(m.GaugeId)) + i-- + dAtA[i] = 0x10 + } + if len(m.Owner) > 0 { + i -= len(m.Owner) + copy(dAtA[i:], m.Owner) + i = encodeVarintTx(dAtA, i, uint64(len(m.Owner))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *MsgAddToGaugeResponse) 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 *MsgAddToGaugeResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MsgAddToGaugeResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + return len(dAtA) - i, nil +} + +func (m *MsgStake) 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 *MsgStake) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MsgStake) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Coins) > 0 { + for iNdEx := len(m.Coins) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Coins[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTx(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } + } + if len(m.Owner) > 0 { + i -= len(m.Owner) + copy(dAtA[i:], m.Owner) + i = encodeVarintTx(dAtA, i, uint64(len(m.Owner))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *MsgStakeResponse) 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 *MsgStakeResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MsgStakeResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.ID != 0 { + i = encodeVarintTx(dAtA, i, uint64(m.ID)) + i-- + dAtA[i] = 0x8 + } + return len(dAtA) - i, nil +} + +func (m *MsgUnstake) 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 *MsgUnstake) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MsgUnstake) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Unstakes) > 0 { + for iNdEx := len(m.Unstakes) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Unstakes[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTx(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } + } + if len(m.Owner) > 0 { + i -= len(m.Owner) + copy(dAtA[i:], m.Owner) + i = encodeVarintTx(dAtA, i, uint64(len(m.Owner))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *MsgUnstake_UnstakeDescriptor) 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 *MsgUnstake_UnstakeDescriptor) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MsgUnstake_UnstakeDescriptor) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Coins) > 0 { + for iNdEx := len(m.Coins) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Coins[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTx(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } + } + if m.ID != 0 { + i = encodeVarintTx(dAtA, i, uint64(m.ID)) + i-- + dAtA[i] = 0x8 + } + return len(dAtA) - i, nil +} + +func (m *MsgUnstakeResponse) 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 *MsgUnstakeResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MsgUnstakeResponse) 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 *MsgCreateGauge) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.IsPerpetual { + n += 2 + } + l = len(m.Owner) + if l > 0 { + n += 1 + l + sovTx(uint64(l)) + } + l = m.DistributeTo.Size() + n += 1 + l + sovTx(uint64(l)) + if len(m.Coins) > 0 { + for _, e := range m.Coins { + l = e.Size() + n += 1 + l + sovTx(uint64(l)) + } + } + l = github_com_cosmos_gogoproto_types.SizeOfStdTime(m.StartTime) + n += 1 + l + sovTx(uint64(l)) + if m.NumEpochsPaidOver != 0 { + n += 1 + sovTx(uint64(m.NumEpochsPaidOver)) + } + if m.PricingTick != 0 { + n += 1 + sovTx(uint64(m.PricingTick)) + } + return n +} + +func (m *MsgCreateGaugeResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + return n +} + +func (m *MsgAddToGauge) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Owner) + if l > 0 { + n += 1 + l + sovTx(uint64(l)) + } + if m.GaugeId != 0 { + n += 1 + sovTx(uint64(m.GaugeId)) + } + if len(m.Rewards) > 0 { + for _, e := range m.Rewards { + l = e.Size() + n += 1 + l + sovTx(uint64(l)) + } + } + return n +} + +func (m *MsgAddToGaugeResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + return n +} + +func (m *MsgStake) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Owner) + if l > 0 { + n += 1 + l + sovTx(uint64(l)) + } + if len(m.Coins) > 0 { + for _, e := range m.Coins { + l = e.Size() + n += 1 + l + sovTx(uint64(l)) + } + } + return n +} + +func (m *MsgStakeResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.ID != 0 { + n += 1 + sovTx(uint64(m.ID)) + } + return n +} + +func (m *MsgUnstake) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Owner) + if l > 0 { + n += 1 + l + sovTx(uint64(l)) + } + if len(m.Unstakes) > 0 { + for _, e := range m.Unstakes { + l = e.Size() + n += 1 + l + sovTx(uint64(l)) + } + } + return n +} + +func (m *MsgUnstake_UnstakeDescriptor) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.ID != 0 { + n += 1 + sovTx(uint64(m.ID)) + } + if len(m.Coins) > 0 { + for _, e := range m.Coins { + l = e.Size() + n += 1 + l + sovTx(uint64(l)) + } + } + return n +} + +func (m *MsgUnstakeResponse) 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 *MsgCreateGauge) 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: MsgCreateGauge: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MsgCreateGauge: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field IsPerpetual", wireType) + } + var v int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.IsPerpetual = bool(v != 0) + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Owner", 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.Owner = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field DistributeTo", 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.DistributeTo.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Coins", 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.Coins = append(m.Coins, types.Coin{}) + if err := m.Coins[len(m.Coins)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 5: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field StartTime", 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 := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(&m.StartTime, dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 6: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field NumEpochsPaidOver", wireType) + } + m.NumEpochsPaidOver = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.NumEpochsPaidOver |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 7: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field PricingTick", wireType) + } + m.PricingTick = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.PricingTick |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } + 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 *MsgCreateGaugeResponse) 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: MsgCreateGaugeResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MsgCreateGaugeResponse: 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 (m *MsgAddToGauge) 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: MsgAddToGauge: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MsgAddToGauge: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Owner", 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.Owner = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field GaugeId", wireType) + } + m.GaugeId = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.GaugeId |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Rewards", 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.Rewards = append(m.Rewards, types.Coin{}) + if err := m.Rewards[len(m.Rewards)-1].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 *MsgAddToGaugeResponse) 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: MsgAddToGaugeResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MsgAddToGaugeResponse: 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 (m *MsgStake) 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: MsgStake: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MsgStake: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Owner", 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.Owner = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Coins", 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.Coins = append(m.Coins, types.Coin{}) + if err := m.Coins[len(m.Coins)-1].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 *MsgStakeResponse) 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: MsgStakeResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MsgStakeResponse: 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 ErrIntOverflowTx + } + 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 := 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 *MsgUnstake) 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: MsgUnstake: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MsgUnstake: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Owner", 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.Owner = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Unstakes", 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.Unstakes = append(m.Unstakes, &MsgUnstake_UnstakeDescriptor{}) + if err := m.Unstakes[len(m.Unstakes)-1].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 *MsgUnstake_UnstakeDescriptor) 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: UnstakeDescriptor: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: UnstakeDescriptor: 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 ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.ID |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Coins", 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.Coins = append(m.Coins, types.Coin{}) + if err := m.Coins[len(m.Coins)-1].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 *MsgUnstakeResponse) 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: MsgUnstakeResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MsgUnstakeResponse: 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") +) From e12f6b62433a74d6e2b33afe23be54ace2a8d23a Mon Sep 17 00:00:00 2001 From: Julian Compagni Portis Date: Tue, 10 Oct 2023 16:59:02 -0400 Subject: [PATCH 174/307] edit and recompile protos to match neutron namespace --- proto/neutron/dex/deposit_record.proto | 4 +- proto/neutron/dex/genesis.proto | 12 +- .../neutron/dex/limit_order_expiration.proto | 2 +- proto/neutron/dex/limit_order_tranche.proto | 6 +- .../dex/limit_order_tranche_user.proto | 6 +- proto/neutron/dex/pair_id.proto | 2 +- proto/neutron/dex/params.proto | 2 +- proto/neutron/dex/pool.proto | 4 +- proto/neutron/dex/pool_metadata.proto | 4 +- proto/neutron/dex/pool_reserves.proto | 4 +- proto/neutron/dex/query.proto | 56 +- proto/neutron/dex/tick_liquidity.proto | 6 +- proto/neutron/dex/trade_pair_id.proto | 2 +- proto/neutron/dex/tx.proto | 2 +- proto/neutron/epochs/genesis.proto | 2 +- proto/neutron/epochs/query.proto | 8 +- .../neutron/incentives/account_history.proto | 2 +- proto/neutron/incentives/gauge.proto | 6 +- proto/neutron/incentives/genesis.proto | 10 +- proto/neutron/incentives/params.proto | 2 +- proto/neutron/incentives/query.proto | 24 +- proto/neutron/incentives/stake.proto | 2 +- proto/neutron/incentives/tx.proto | 6 +- x/dex/types/deposit_record.pb.go | 56 +- x/dex/types/genesis.pb.go | 60 +-- x/dex/types/limit_order_expiration.pb.go | 26 +- x/dex/types/limit_order_tranche.pb.go | 92 ++-- x/dex/types/limit_order_tranche_user.pb.go | 70 +-- x/dex/types/pair_id.pb.go | 26 +- x/dex/types/params.pb.go | 26 +- x/dex/types/pool.pb.go | 26 +- x/dex/types/pool_metadata.pb.go | 26 +- x/dex/types/pool_reserves.pb.go | 82 +-- x/dex/types/query.pb.go | 504 +++++++++--------- x/dex/types/query.pb.gw.go | 38 +- x/dex/types/tick_liquidity.pb.go | 26 +- x/dex/types/trade_pair_id.pb.go | 26 +- x/dex/types/tx.pb.go | 276 +++++----- x/epochs/types/genesis.pb.go | 73 ++- x/epochs/types/query.pb.go | 93 ++-- x/epochs/types/query.pb.gw.go | 6 +- x/incentives/types/account_history.pb.go | 24 +- x/incentives/types/gauge.pb.go | 86 +-- x/incentives/types/genesis.pb.go | 52 +- x/incentives/types/params.pb.go | 26 +- x/incentives/types/query.pb.go | 246 ++++----- x/incentives/types/query.pb.gw.go | 18 +- x/incentives/types/stake.pb.go | 58 +- x/incentives/types/tx.pb.go | 156 +++--- 49 files changed, 1185 insertions(+), 1187 deletions(-) diff --git a/proto/neutron/dex/deposit_record.proto b/proto/neutron/dex/deposit_record.proto index a637d24b9..8504aa8b1 100644 --- a/proto/neutron/dex/deposit_record.proto +++ b/proto/neutron/dex/deposit_record.proto @@ -1,9 +1,9 @@ syntax = "proto3"; -package duality.dex; +package neutron.dex; option go_package = "github.com/neutron-org/neutron/x/dex/types"; import "gogoproto/gogo.proto"; -import "duality/dex/pair_id.proto"; +import "neutron/dex/pair_id.proto"; message DepositRecord { PairID pairID = 1; diff --git a/proto/neutron/dex/genesis.proto b/proto/neutron/dex/genesis.proto index da8d5add4..596dc1c4a 100644 --- a/proto/neutron/dex/genesis.proto +++ b/proto/neutron/dex/genesis.proto @@ -1,13 +1,13 @@ syntax = "proto3"; -package duality.dex; +package neutron.dex; import "gogoproto/gogo.proto"; -import "duality/dex/params.proto"; -import "duality/dex/limit_order_tranche_user.proto"; -import "duality/dex/limit_order_tranche.proto"; -import "duality/dex/tick_liquidity.proto"; -import "duality/dex/pool_metadata.proto"; +import "neutron/dex/params.proto"; +import "neutron/dex/limit_order_tranche_user.proto"; +import "neutron/dex/limit_order_tranche.proto"; +import "neutron/dex/tick_liquidity.proto"; +import "neutron/dex/pool_metadata.proto"; // this line is used by starport scaffolding # genesis/proto/import diff --git a/proto/neutron/dex/limit_order_expiration.proto b/proto/neutron/dex/limit_order_expiration.proto index 2c7f1af5c..030965cfb 100644 --- a/proto/neutron/dex/limit_order_expiration.proto +++ b/proto/neutron/dex/limit_order_expiration.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -package duality.dex; +package neutron.dex; option go_package = "github.com/neutron-org/neutron/x/dex/types"; import "google/protobuf/timestamp.proto"; diff --git a/proto/neutron/dex/limit_order_tranche.proto b/proto/neutron/dex/limit_order_tranche.proto index b2ffd2749..0f0efc644 100644 --- a/proto/neutron/dex/limit_order_tranche.proto +++ b/proto/neutron/dex/limit_order_tranche.proto @@ -1,12 +1,12 @@ syntax = "proto3"; -package duality.dex; +package neutron.dex; option go_package = "github.com/neutron-org/neutron/x/dex/types"; import "google/protobuf/timestamp.proto"; -import "duality/dex/trade_pair_id.proto"; +import "neutron/dex/trade_pair_id.proto"; import "gogoproto/gogo.proto"; -import "duality/dex/pair_id.proto"; +import "neutron/dex/pair_id.proto"; message LimitOrderTrancheKey { TradePairID tradePairID = 1; diff --git a/proto/neutron/dex/limit_order_tranche_user.proto b/proto/neutron/dex/limit_order_tranche_user.proto index e316b08ce..56b1514d4 100644 --- a/proto/neutron/dex/limit_order_tranche_user.proto +++ b/proto/neutron/dex/limit_order_tranche_user.proto @@ -1,10 +1,10 @@ syntax = "proto3"; -package duality.dex; +package neutron.dex; option go_package = "github.com/neutron-org/neutron/x/dex/types"; import "gogoproto/gogo.proto"; -import "duality/dex/trade_pair_id.proto"; -import "duality/dex/tx.proto"; +import "neutron/dex/trade_pair_id.proto"; +import "neutron/dex/tx.proto"; message LimitOrderTrancheUser { TradePairID tradePairID = 1; diff --git a/proto/neutron/dex/pair_id.proto b/proto/neutron/dex/pair_id.proto index 65a675ba3..e543ba7a1 100644 --- a/proto/neutron/dex/pair_id.proto +++ b/proto/neutron/dex/pair_id.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -package duality.dex; +package neutron.dex; option go_package = "github.com/neutron-org/neutron/x/dex/types"; diff --git a/proto/neutron/dex/params.proto b/proto/neutron/dex/params.proto index 4545c871d..70c65c293 100644 --- a/proto/neutron/dex/params.proto +++ b/proto/neutron/dex/params.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -package duality.dex; +package neutron.dex; import "gogoproto/gogo.proto"; diff --git a/proto/neutron/dex/pool.proto b/proto/neutron/dex/pool.proto index 56ec8d8b3..42bf9fac1 100644 --- a/proto/neutron/dex/pool.proto +++ b/proto/neutron/dex/pool.proto @@ -1,9 +1,9 @@ syntax = "proto3"; -package duality.dex; +package neutron.dex; option go_package = "github.com/neutron-org/neutron/x/dex/types"; import "gogoproto/gogo.proto"; -import "duality/dex/pool_reserves.proto"; +import "neutron/dex/pool_reserves.proto"; // 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 f54d42303..5d8d8c9f3 100644 --- a/proto/neutron/dex/pool_metadata.proto +++ b/proto/neutron/dex/pool_metadata.proto @@ -1,9 +1,9 @@ syntax = "proto3"; -package duality.dex; +package neutron.dex; option go_package = "github.com/neutron-org/neutron/x/dex/types"; -import "duality/dex/pair_id.proto"; +import "neutron/dex/pair_id.proto"; message PoolMetadata { uint64 ID = 1; diff --git a/proto/neutron/dex/pool_reserves.proto b/proto/neutron/dex/pool_reserves.proto index 7bab4ab8e..1b75c64cf 100644 --- a/proto/neutron/dex/pool_reserves.proto +++ b/proto/neutron/dex/pool_reserves.proto @@ -1,9 +1,9 @@ syntax = "proto3"; -package duality.dex; +package neutron.dex; option go_package = "github.com/neutron-org/neutron/x/dex/types"; import "gogoproto/gogo.proto"; -import "duality/dex/trade_pair_id.proto"; +import "neutron/dex/trade_pair_id.proto"; message PoolReservesKey { TradePairID tradePairID = 1; diff --git a/proto/neutron/dex/query.proto b/proto/neutron/dex/query.proto index 69a055ea8..9e29261b2 100644 --- a/proto/neutron/dex/query.proto +++ b/proto/neutron/dex/query.proto @@ -1,21 +1,21 @@ syntax = "proto3"; -package duality.dex; +package neutron.dex; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; import "cosmos/base/query/v1beta1/pagination.proto"; -import "duality/dex/params.proto"; -import "duality/dex/limit_order_tranche_user.proto"; -import "duality/dex/limit_order_tranche.proto"; -import "duality/dex/deposit_record.proto"; -import "duality/dex/tick_liquidity.proto"; -import "duality/dex/pool_reserves.proto"; -import "duality/dex/tx.proto"; +import "neutron/dex/params.proto"; +import "neutron/dex/limit_order_tranche_user.proto"; +import "neutron/dex/limit_order_tranche.proto"; +import "neutron/dex/deposit_record.proto"; +import "neutron/dex/tick_liquidity.proto"; +import "neutron/dex/pool_reserves.proto"; +import "neutron/dex/tx.proto"; import "cosmos/base/v1beta1/coin.proto"; import "google/protobuf/timestamp.proto"; -import "duality/dex/pool.proto"; -import "duality/dex/pool_metadata.proto"; +import "neutron/dex/pool.proto"; +import "neutron/dex/pool_metadata.proto"; // this line is used by starport scaffolding # 1 @@ -25,98 +25,98 @@ option go_package = "github.com/neutron-org/neutron/x/dex/types"; service Query { // Parameters queries the parameters of the module. rpc Params (QueryParamsRequest) returns (QueryParamsResponse) { - option (google.api.http).get = "/duality/dex/params"; + option (google.api.http).get = "/neutron/dex/params"; } // Queries a LimitOrderTrancheUser by index. rpc LimitOrderTrancheUser (QueryGetLimitOrderTrancheUserRequest) returns (QueryGetLimitOrderTrancheUserResponse) { - option (google.api.http).get = "/duality/dex/limit_order_tranche_user/{address}/{trancheKey}"; + option (google.api.http).get = "/neutron/dex/limit_order_tranche_user/{address}/{trancheKey}"; } // Queries a list of LimitOrderTrancheMap items. rpc LimitOrderTrancheUserAll (QueryAllLimitOrderTrancheUserRequest) returns (QueryAllLimitOrderTrancheUserResponse) { - option (google.api.http).get = "/duality/dex/limit_order_tranche_user"; + option (google.api.http).get = "/neutron/dex/limit_order_tranche_user"; } // Queries a list of LimitOrderTrancheUser items for a given address. rpc LimitOrderTrancheUserAllByAddress(QueryAllUserLimitOrdersRequest) returns (QueryAllUserLimitOrdersResponse) { - option (google.api.http).get = "/duality/dex/user/limit_orders/{address}"; + option (google.api.http).get = "/neutron/dex/user/limit_orders/{address}"; } // Queries a LimitOrderTranche by index. rpc LimitOrderTranche (QueryGetLimitOrderTrancheRequest) returns (QueryGetLimitOrderTrancheResponse) { - option (google.api.http).get = "/duality/dex/limit_order_tranche/{pairID}/{tokenIn}/{tickIndex}/{trancheKey}"; + option (google.api.http).get = "/neutron/dex/limit_order_tranche/{pairID}/{tokenIn}/{tickIndex}/{trancheKey}"; } // Queries a list of LimitOrderTranche items for a given pairID / TokenIn combination. rpc LimitOrderTrancheAll (QueryAllLimitOrderTrancheRequest) returns (QueryAllLimitOrderTrancheResponse) { - option (google.api.http).get = "/duality/dex/limit_order_tranche/{pairID}/{tokenIn}"; + option (google.api.http).get = "/neutron/dex/limit_order_tranche/{pairID}/{tokenIn}"; } // Queries a list of UserDeposits items. rpc UserDepositsAll (QueryAllUserDepositsRequest) returns (QueryAllUserDepositsResponse) { - option (google.api.http).get = "/duality/dex/user/deposits/{address}"; + option (google.api.http).get = "/neutron/dex/user/deposits/{address}"; } // Queries a list of TickLiquidity items. rpc TickLiquidityAll (QueryAllTickLiquidityRequest) returns (QueryAllTickLiquidityResponse) { - option (google.api.http).get = "/duality/dex/tick_liquidity/{pairID}/{tokenIn}"; + option (google.api.http).get = "/neutron/dex/tick_liquidity/{pairID}/{tokenIn}"; } // Queries a InactiveLimitOrderTranche by index. rpc InactiveLimitOrderTranche (QueryGetInactiveLimitOrderTrancheRequest) returns (QueryGetInactiveLimitOrderTrancheResponse) { - option (google.api.http).get = "/duality/dex/filled_limit_order_tranche/{pairID}/{tokenIn}/{tickIndex}/{trancheKey}"; + option (google.api.http).get = "/neutron/dex/filled_limit_order_tranche/{pairID}/{tokenIn}/{tickIndex}/{trancheKey}"; } // Queries a list of InactiveLimitOrderTranche items. rpc InactiveLimitOrderTrancheAll (QueryAllInactiveLimitOrderTrancheRequest) returns (QueryAllInactiveLimitOrderTrancheResponse) { - option (google.api.http).get = "/duality/dex/filled_limit_order_tranche"; + option (google.api.http).get = "/neutron/dex/filled_limit_order_tranche"; } // Queries a list of PoolReserves items. rpc PoolReservesAll (QueryAllPoolReservesRequest) returns (QueryAllPoolReservesResponse) { - option (google.api.http).get = "/duality/dex/pool_reserves/{pairID}/{tokenIn}"; + option (google.api.http).get = "/neutron/dex/pool_reserves/{pairID}/{tokenIn}"; } // Queries a PoolReserve by index rpc PoolReserves (QueryGetPoolReservesRequest) returns (QueryGetPoolReservesResponse) { - option (google.api.http).get = "/duality/dex/pool_reserves/{pairID}/{tokenIn}/{tickIndex}/{fee}"; + option (google.api.http).get = "/neutron/dex/pool_reserves/{pairID}/{tokenIn}/{tickIndex}/{fee}"; } // Queries the simulated result of a multihop swap rpc EstimateMultiHopSwap (QueryEstimateMultiHopSwapRequest) returns (QueryEstimateMultiHopSwapResponse) { - option (google.api.http).get = "/duality/dex/estimate_multi_hop_swap"; + option (google.api.http).get = "/neutron/dex/estimate_multi_hop_swap"; } // Queries the simulated result of a multihop swap rpc EstimatePlaceLimitOrder (QueryEstimatePlaceLimitOrderRequest) returns (QueryEstimatePlaceLimitOrderResponse) { - option (google.api.http).get = "/duality/dex/estimate_place_limit_order"; + option (google.api.http).get = "/neutron/dex/estimate_place_limit_order"; } // Queries a pool by pair, tick and fee rpc Pool (QueryPoolRequest) returns (QueryPoolResponse) { - option (google.api.http).get = "/duality/dex/pool/{pairID}/{tickIndex}/{fee}"; + option (google.api.http).get = "/neutron/dex/pool/{pairID}/{tickIndex}/{fee}"; } // Queries a pool by ID rpc PoolByID (QueryPoolByIDRequest) returns (QueryPoolResponse) { - option (google.api.http).get = "/duality/dex/pool/{poolID}"; + option (google.api.http).get = "/neutron/dex/pool/{poolID}"; } // Queries a PoolMetadata by ID rpc PoolMetadata (QueryGetPoolMetadataRequest) returns (QueryGetPoolMetadataResponse) { - option (google.api.http).get = "/duality/dex/pool_metadata/{id}"; + option (google.api.http).get = "/neutron/dex/pool_metadata/{id}"; } // Queries a list of PoolMetadata items. rpc PoolMetadataAll (QueryAllPoolMetadataRequest) returns (QueryAllPoolMetadataResponse) { - option (google.api.http).get = "/duality/dex/pool_metadata"; + option (google.api.http).get = "/neutron/dex/pool_metadata"; } diff --git a/proto/neutron/dex/tick_liquidity.proto b/proto/neutron/dex/tick_liquidity.proto index 3fec914bc..c98840832 100644 --- a/proto/neutron/dex/tick_liquidity.proto +++ b/proto/neutron/dex/tick_liquidity.proto @@ -1,10 +1,10 @@ syntax = "proto3"; -package duality.dex; +package neutron.dex; option go_package = "github.com/neutron-org/neutron/x/dex/types"; import "gogoproto/gogo.proto"; -import "duality/dex/limit_order_tranche.proto"; -import "duality/dex/pool_reserves.proto"; +import "neutron/dex/limit_order_tranche.proto"; +import "neutron/dex/pool_reserves.proto"; message TickLiquidity { diff --git a/proto/neutron/dex/trade_pair_id.proto b/proto/neutron/dex/trade_pair_id.proto index bd66e0e25..cb74f94a3 100644 --- a/proto/neutron/dex/trade_pair_id.proto +++ b/proto/neutron/dex/trade_pair_id.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -package duality.dex; +package neutron.dex; option go_package = "github.com/neutron-org/neutron/x/dex/types"; diff --git a/proto/neutron/dex/tx.proto b/proto/neutron/dex/tx.proto index 8cf92c529..7fca574b3 100644 --- a/proto/neutron/dex/tx.proto +++ b/proto/neutron/dex/tx.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -package duality.dex; +package neutron.dex; // this line is used by starport scaffolding # proto/tx/import diff --git a/proto/neutron/epochs/genesis.proto b/proto/neutron/epochs/genesis.proto index 97bc08221..4a5c1ca4e 100644 --- a/proto/neutron/epochs/genesis.proto +++ b/proto/neutron/epochs/genesis.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -package duality.epochs; +package neutron.epochs; import "gogoproto/gogo.proto"; import "google/protobuf/duration.proto"; diff --git a/proto/neutron/epochs/query.proto b/proto/neutron/epochs/query.proto index cb9a8c3c7..b615eff97 100644 --- a/proto/neutron/epochs/query.proto +++ b/proto/neutron/epochs/query.proto @@ -1,10 +1,10 @@ syntax = "proto3"; -package duality.epochs; +package neutron.epochs; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; import "cosmos/base/query/v1beta1/pagination.proto"; -import "duality/epochs/genesis.proto"; +import "neutron/epochs/genesis.proto"; option go_package = "github.com/neutron-org/neutron/x/epochs/types"; @@ -12,12 +12,12 @@ option go_package = "github.com/neutron-org/neutron/x/epochs/types"; service Query { // EpochInfos provide running epochInfos rpc EpochInfos(QueryEpochsInfoRequest) returns (QueryEpochsInfoResponse) { - option (google.api.http).get = "/duality/epochs/epochs"; + option (google.api.http).get = "/neutron/epochs/epochs"; } // CurrentEpoch provide current epoch of specified identifier rpc CurrentEpoch(QueryCurrentEpochRequest) returns (QueryCurrentEpochResponse) { - option (google.api.http).get = "/duality/epochs/current_epoch"; + option (google.api.http).get = "/neutron/epochs/current_epoch"; } } diff --git a/proto/neutron/incentives/account_history.proto b/proto/neutron/incentives/account_history.proto index bd0866436..22188f152 100644 --- a/proto/neutron/incentives/account_history.proto +++ b/proto/neutron/incentives/account_history.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -package duality.incentives; +package neutron.incentives; import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.proto"; diff --git a/proto/neutron/incentives/gauge.proto b/proto/neutron/incentives/gauge.proto index bb5a4714e..5399bc761 100644 --- a/proto/neutron/incentives/gauge.proto +++ b/proto/neutron/incentives/gauge.proto @@ -1,11 +1,11 @@ syntax = "proto3"; -package duality.incentives; +package neutron.incentives; import "gogoproto/gogo.proto"; import "google/protobuf/duration.proto"; import "google/protobuf/timestamp.proto"; import "cosmos/base/v1beta1/coin.proto"; -import "duality/dex/pair_id.proto"; +import "neutron/dex/pair_id.proto"; option go_package = "github.com/neutron-org/neutron/x/incentives/types"; @@ -103,7 +103,7 @@ message Gauge { message QueryCondition { // pairID is the token pair which should be distributed to. - duality.dex.PairID pairID = 1; + neutron.dex.PairID pairID = 1; // start_tick is the inclusive lower bound on the location of LP tokens that // qualify for a gauge's distribution. diff --git a/proto/neutron/incentives/genesis.proto b/proto/neutron/incentives/genesis.proto index dfbf299a3..739095ca6 100644 --- a/proto/neutron/incentives/genesis.proto +++ b/proto/neutron/incentives/genesis.proto @@ -1,11 +1,11 @@ syntax = "proto3"; -package duality.incentives; +package neutron.incentives; import "gogoproto/gogo.proto"; -import "duality/incentives/params.proto"; -import "duality/incentives/gauge.proto"; -import "duality/incentives/stake.proto"; -import "duality/incentives/account_history.proto"; +import "neutron/incentives/params.proto"; +import "neutron/incentives/gauge.proto"; +import "neutron/incentives/stake.proto"; +import "neutron/incentives/account_history.proto"; option go_package = "github.com/neutron-org/neutron/x/incentives/types"; diff --git a/proto/neutron/incentives/params.proto b/proto/neutron/incentives/params.proto index 25311f0f9..99a7693da 100644 --- a/proto/neutron/incentives/params.proto +++ b/proto/neutron/incentives/params.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -package duality.incentives; +package neutron.incentives; import "gogoproto/gogo.proto"; diff --git a/proto/neutron/incentives/query.proto b/proto/neutron/incentives/query.proto index 4cb3875a3..0ea1c02ee 100644 --- a/proto/neutron/incentives/query.proto +++ b/proto/neutron/incentives/query.proto @@ -1,13 +1,13 @@ syntax = "proto3"; -package duality.incentives; +package neutron.incentives; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; import "cosmos/base/v1beta1/coin.proto"; import "cosmos/base/query/v1beta1/pagination.proto"; -import "duality/incentives/gauge.proto"; -import "duality/incentives/stake.proto"; -import "duality/incentives/params.proto"; +import "neutron/incentives/gauge.proto"; +import "neutron/incentives/stake.proto"; +import "neutron/incentives/params.proto"; option go_package = "github.com/neutron-org/neutron/x/incentives/types"; @@ -17,30 +17,30 @@ service Query { rpc GetModuleStatus(GetModuleStatusRequest) returns (GetModuleStatusResponse) { option (google.api.http).get = - "/duality/incentives/v1beta1/module_status"; + "/neutron/incentives/v1beta1/module_status"; } // GetGaugeByID returns a gauge by its ID rpc GetGaugeByID(GetGaugeByIDRequest) returns (GetGaugeByIDResponse) { option (google.api.http).get = - "/duality/incentives/v1beta1/gauges/{id}"; + "/neutron/incentives/v1beta1/gauges/{id}"; } // GetGauges returns gauges according to the filter provided rpc GetGauges(GetGaugesRequest) returns (GetGaugesResponse) { - option (google.api.http).get = "/duality/incentives/v1beta1/gauges"; + option (google.api.http).get = "/neutron/incentives/v1beta1/gauges"; } // GetStakeByID returns a stake by its ID rpc GetStakeByID(GetStakeByIDRequest) returns (GetStakeByIDResponse) { option (google.api.http).get = - "/duality/incentives/stakes/{stake_id}"; + "/neutron/incentives/stakes/{stake_id}"; } // GetStakes returns stakes by the filter provided. At least one filter must be provided. rpc GetStakes(GetStakesRequest) returns (GetStakesResponse) { option (google.api.http).get = - "/duality/incentives/stakes"; + "/neutron/incentives/stakes"; } // GetFutureRewardsEstimate returns an estimate of the rewards from now until a specified @@ -48,20 +48,20 @@ service Query { // for which they want to find the associated rewards. rpc GetFutureRewardEstimate(GetFutureRewardEstimateRequest) returns (GetFutureRewardEstimateResponse) { option (google.api.http).get = - "/duality/incentives/v1beta1/future_rewards_estimate/{owner}"; + "/neutron/incentives/v1beta1/future_rewards_estimate/{owner}"; } // GetAccountHistory returns the total accumulated rewards per denom for a given user. rpc GetAccountHistory(GetAccountHistoryRequest) returns (GetAccountHistoryResponse) { option (google.api.http).get = - "/duality/incentives/v1beta1/account_history/{account}"; + "/neutron/incentives/v1beta1/account_history/{account}"; } // Returns the total amount of value currently qualifying for the gauge. This is useful for calculating // the prospective future rewards of staking. rpc GetGaugeQualifyingValue(GetGaugeQualifyingValueRequest) returns (GetGaugeQualifyingValueResponse) { option (google.api.http).get = - "/duality/incentives/v1beta1/get_gauge_qualifying_value/{id}"; + "/neutron/incentives/v1beta1/get_gauge_qualifying_value/{id}"; } } diff --git a/proto/neutron/incentives/stake.proto b/proto/neutron/incentives/stake.proto index 16e26fde2..690c4e9fa 100644 --- a/proto/neutron/incentives/stake.proto +++ b/proto/neutron/incentives/stake.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -package duality.incentives; +package neutron.incentives; import "gogoproto/gogo.proto"; import "google/protobuf/timestamp.proto"; diff --git a/proto/neutron/incentives/tx.proto b/proto/neutron/incentives/tx.proto index 50f38c892..8894133d9 100644 --- a/proto/neutron/incentives/tx.proto +++ b/proto/neutron/incentives/tx.proto @@ -1,11 +1,11 @@ syntax = "proto3"; -package duality.incentives; +package neutron.incentives; import "gogoproto/gogo.proto"; import "google/protobuf/timestamp.proto"; import "cosmos/base/v1beta1/coin.proto"; -import "duality/incentives/gauge.proto"; -import "duality/incentives/stake.proto"; +import "neutron/incentives/gauge.proto"; +import "neutron/incentives/stake.proto"; import "google/protobuf/duration.proto"; option go_package = "github.com/neutron-org/neutron/x/incentives/types"; diff --git a/x/dex/types/deposit_record.pb.go b/x/dex/types/deposit_record.pb.go index 27084d1a0..d3d3e54c7 100644 --- a/x/dex/types/deposit_record.pb.go +++ b/x/dex/types/deposit_record.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: duality/dex/deposit_record.proto +// source: neutron/dex/deposit_record.proto package types @@ -37,7 +37,7 @@ func (m *DepositRecord) Reset() { *m = DepositRecord{} } func (m *DepositRecord) String() string { return proto.CompactTextString(m) } func (*DepositRecord) ProtoMessage() {} func (*DepositRecord) Descriptor() ([]byte, []int) { - return fileDescriptor_9d7c76d21a5add72, []int{0} + return fileDescriptor_250413eadaebbf28, []int{0} } func (m *DepositRecord) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -102,35 +102,35 @@ func (m *DepositRecord) GetFee() uint64 { } func init() { - proto.RegisterType((*DepositRecord)(nil), "duality.dex.DepositRecord") + proto.RegisterType((*DepositRecord)(nil), "neutron.dex.DepositRecord") } -func init() { proto.RegisterFile("duality/dex/deposit_record.proto", fileDescriptor_9d7c76d21a5add72) } +func init() { proto.RegisterFile("neutron/dex/deposit_record.proto", fileDescriptor_250413eadaebbf28) } -var fileDescriptor_9d7c76d21a5add72 = []byte{ - // 340 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x91, 0x3f, 0x4f, 0xc2, 0x40, - 0x18, 0x87, 0x7b, 0x80, 0x24, 0x5e, 0xe3, 0x9f, 0x9c, 0x0e, 0x95, 0xa1, 0x6d, 0x18, 0x48, 0x13, - 0x42, 0x9b, 0xe8, 0xe6, 0x48, 0x70, 0x60, 0xd2, 0x14, 0x27, 0x17, 0x52, 0x7a, 0x27, 0x34, 0x94, - 0x5e, 0x73, 0x77, 0x0d, 0xe5, 0x5b, 0xf8, 0x8d, 0x5c, 0x19, 0x19, 0x8d, 0x43, 0x63, 0x60, 0x73, - 0xf4, 0x13, 0x98, 0x5e, 0x6b, 0x72, 0x32, 0xf5, 0xed, 0x73, 0xcf, 0xfd, 0xde, 0xdc, 0xfb, 0x42, - 0x1b, 0x67, 0x41, 0x1c, 0x89, 0x8d, 0x87, 0x49, 0xee, 0x61, 0x92, 0x52, 0x1e, 0x89, 0x29, 0x23, - 0x21, 0x65, 0xd8, 0x4d, 0x19, 0x15, 0x14, 0xe9, 0xb5, 0xe1, 0x62, 0x92, 0x77, 0xae, 0xe7, 0x74, - 0x4e, 0x25, 0xf7, 0xca, 0xaa, 0x52, 0x3a, 0x37, 0x6a, 0x48, 0x1a, 0x44, 0x6c, 0x1a, 0xd5, 0xb7, - 0xbb, 0xef, 0x0d, 0x78, 0x36, 0xaa, 0x62, 0x7d, 0x99, 0x8a, 0xfa, 0xb0, 0x5d, 0x2a, 0xe3, 0x91, - 0x01, 0x6c, 0xe0, 0xe8, 0xb7, 0x57, 0xae, 0xd2, 0xc0, 0x7d, 0x92, 0x47, 0x7e, 0xad, 0xa0, 0x0c, - 0xea, 0x7c, 0x11, 0x30, 0xc2, 0x1f, 0xd7, 0x09, 0xc1, 0x46, 0xc3, 0x06, 0xce, 0xe9, 0x70, 0xb2, - 0x2d, 0x2c, 0xed, 0xb3, 0xb0, 0x7a, 0xf3, 0x48, 0x2c, 0xb2, 0x99, 0x1b, 0xd2, 0x95, 0x17, 0x52, - 0xbe, 0xa2, 0xbc, 0xfe, 0x0c, 0x38, 0x5e, 0x7a, 0x62, 0x93, 0x12, 0xee, 0x8e, 0x13, 0xf1, 0x5d, - 0x58, 0xba, 0xa0, 0x22, 0x88, 0x27, 0x32, 0xe9, 0xa7, 0xb0, 0xd0, 0x26, 0x58, 0xc5, 0xf7, 0x5d, - 0x05, 0x76, 0x7d, 0xb5, 0x0f, 0x72, 0xe0, 0x45, 0x48, 0x12, 0x41, 0xd8, 0x73, 0x14, 0x2e, 0xc7, - 0x09, 0x26, 0xb9, 0xd1, 0xb4, 0x81, 0xd3, 0xf4, 0x8f, 0x31, 0xea, 0xc1, 0xf3, 0x98, 0xae, 0x55, - 0xb1, 0x25, 0xc5, 0x23, 0x5a, 0x7a, 0x59, 0x9a, 0xaa, 0xde, 0x49, 0xe5, 0xfd, 0xa7, 0xe8, 0x12, - 0x36, 0x5f, 0x09, 0x31, 0xda, 0x36, 0x70, 0x5a, 0x7e, 0x59, 0x0e, 0x1f, 0xb6, 0x7b, 0x13, 0xec, - 0xf6, 0x26, 0xf8, 0xda, 0x9b, 0xe0, 0xed, 0x60, 0x6a, 0xbb, 0x83, 0xa9, 0x7d, 0x1c, 0x4c, 0xed, - 0xa5, 0xaf, 0xbc, 0xbf, 0x9e, 0xe1, 0x20, 0x0e, 0x66, 0xfc, 0xef, 0xc7, 0xcb, 0xe5, 0x42, 0xe4, - 0x20, 0x66, 0x6d, 0xb9, 0x8f, 0xbb, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x43, 0x9c, 0x66, 0x85, - 0xf1, 0x01, 0x00, 0x00, +var fileDescriptor_250413eadaebbf28 = []byte{ + // 339 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x91, 0x3f, 0x6f, 0xf2, 0x30, + 0x10, 0x87, 0x63, 0xe0, 0x45, 0x7a, 0x13, 0xf5, 0x8f, 0xdc, 0x0e, 0x29, 0x43, 0x12, 0x31, 0xa0, + 0xa8, 0x15, 0x89, 0xd4, 0x6e, 0x1d, 0x11, 0x0b, 0x53, 0xab, 0xd0, 0xa9, 0x0b, 0x0a, 0xb1, 0x1b, + 0x22, 0x20, 0x17, 0xd9, 0x8e, 0x08, 0xdf, 0xa2, 0xdf, 0xa8, 0x2b, 0x23, 0x63, 0xd5, 0x21, 0xaa, + 0x60, 0xeb, 0xd8, 0x4f, 0x50, 0xc5, 0xa4, 0x92, 0xcb, 0xe4, 0xd3, 0xe3, 0xc7, 0xbf, 0x93, 0xef, + 0x74, 0x27, 0xa5, 0xb9, 0x60, 0x90, 0xfa, 0x84, 0x16, 0x3e, 0xa1, 0x19, 0xf0, 0x44, 0x4c, 0x18, + 0x8d, 0x80, 0x11, 0x2f, 0x63, 0x20, 0x00, 0x1b, 0xb5, 0xe1, 0x11, 0x5a, 0x74, 0x2e, 0x63, 0x88, + 0x41, 0x72, 0xbf, 0xaa, 0x0e, 0x4a, 0xe7, 0x4a, 0x0d, 0xc9, 0xc2, 0x84, 0x4d, 0x92, 0xfa, 0x75, + 0xf7, 0xad, 0xa1, 0x9f, 0x0c, 0x0f, 0xb1, 0x81, 0x4c, 0xc5, 0x37, 0x7a, 0xbb, 0x52, 0x46, 0x43, + 0x13, 0x39, 0xc8, 0x35, 0x6e, 0x2f, 0x3c, 0xa5, 0x81, 0xf7, 0x28, 0xaf, 0x82, 0x5a, 0xc1, 0xb9, + 0x6e, 0xf0, 0x59, 0xc8, 0x28, 0x7f, 0x58, 0xa5, 0x94, 0x98, 0x0d, 0x07, 0xb9, 0xff, 0x07, 0xe3, + 0x4d, 0x69, 0x6b, 0x1f, 0xa5, 0xdd, 0x8b, 0x13, 0x31, 0xcb, 0xa7, 0x5e, 0x04, 0x4b, 0x3f, 0x02, + 0xbe, 0x04, 0x5e, 0x1f, 0x7d, 0x4e, 0xe6, 0xbe, 0x58, 0x67, 0x94, 0x7b, 0xa3, 0x54, 0x7c, 0x95, + 0xb6, 0x21, 0x40, 0x84, 0x8b, 0xb1, 0x4c, 0xfa, 0x2e, 0x6d, 0xbc, 0x0e, 0x97, 0x8b, 0xfb, 0xae, + 0x02, 0xbb, 0x81, 0xda, 0x07, 0xbb, 0xfa, 0x59, 0x44, 0x53, 0x41, 0xd9, 0x53, 0x12, 0xcd, 0x47, + 0x29, 0xa1, 0x85, 0xd9, 0x74, 0x90, 0xdb, 0x0c, 0x8e, 0x31, 0xee, 0xe9, 0xa7, 0x0b, 0x58, 0xa9, + 0x62, 0x4b, 0x8a, 0x47, 0xb4, 0xf2, 0xf2, 0x2c, 0x53, 0xbd, 0x7f, 0x07, 0xef, 0x2f, 0xc5, 0xe7, + 0x7a, 0xf3, 0x85, 0x52, 0xb3, 0xed, 0x20, 0xb7, 0x15, 0x54, 0xe5, 0x60, 0xb8, 0xd9, 0x59, 0x68, + 0xbb, 0xb3, 0xd0, 0xe7, 0xce, 0x42, 0xaf, 0x7b, 0x4b, 0xdb, 0xee, 0x2d, 0xed, 0x7d, 0x6f, 0x69, + 0xcf, 0xd7, 0xca, 0xff, 0xeb, 0x19, 0xf6, 0x81, 0xc5, 0xbf, 0xb5, 0x5f, 0xc8, 0x7d, 0xc8, 0x39, + 0x4c, 0xdb, 0x72, 0x1d, 0x77, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xa4, 0xd7, 0xff, 0x85, 0xf0, + 0x01, 0x00, 0x00, } func (m *DepositRecord) Marshal() (dAtA []byte, err error) { diff --git a/x/dex/types/genesis.pb.go b/x/dex/types/genesis.pb.go index d1469d8d6..49dff3899 100644 --- a/x/dex/types/genesis.pb.go +++ b/x/dex/types/genesis.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: duality/dex/genesis.proto +// source: neutron/dex/genesis.proto package types @@ -37,7 +37,7 @@ 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_6ccf50bb6779a67a, []int{0} + return fileDescriptor_0c051a8a0d58cd8b, []int{0} } func (m *GenesisState) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -109,38 +109,38 @@ func (m *GenesisState) GetPoolCount() uint64 { } func init() { - proto.RegisterType((*GenesisState)(nil), "duality.dex.GenesisState") + proto.RegisterType((*GenesisState)(nil), "neutron.dex.GenesisState") } -func init() { proto.RegisterFile("duality/dex/genesis.proto", fileDescriptor_6ccf50bb6779a67a) } +func init() { proto.RegisterFile("neutron/dex/genesis.proto", fileDescriptor_0c051a8a0d58cd8b) } -var fileDescriptor_6ccf50bb6779a67a = []byte{ - // 392 bytes of a gzipped FileDescriptorProto +var fileDescriptor_0c051a8a0d58cd8b = []byte{ + // 391 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0xcf, 0x4e, 0xea, 0x40, - 0x14, 0xc6, 0xdb, 0x0b, 0x97, 0xe4, 0x0e, 0x77, 0x71, 0x6f, 0x75, 0x51, 0x1a, 0x2d, 0x0d, 0x89, - 0x09, 0xd1, 0xd8, 0x46, 0x7c, 0x03, 0x8c, 0x71, 0x21, 0xfe, 0x09, 0xe2, 0xc6, 0x4d, 0x33, 0xb4, - 0x63, 0x19, 0x6d, 0x3b, 0xd8, 0x99, 0x1a, 0x78, 0x0b, 0x1f, 0x8b, 0x25, 0x4b, 0x57, 0xc6, 0xc0, - 0x8b, 0x98, 0xf9, 0x43, 0x6c, 0x25, 0xe2, 0xae, 0x3d, 0xe7, 0x77, 0xbe, 0xef, 0x7c, 0x27, 0x03, - 0x1a, 0x61, 0x0e, 0x63, 0xcc, 0xa6, 0x5e, 0x88, 0x26, 0x5e, 0x84, 0x52, 0x44, 0x31, 0x75, 0xc7, - 0x19, 0x61, 0xc4, 0xa8, 0xab, 0x96, 0x1b, 0xa2, 0x89, 0xb5, 0x1d, 0x91, 0x88, 0x88, 0xba, 0xc7, - 0xbf, 0x24, 0x62, 0x99, 0xc5, 0xe9, 0x31, 0xcc, 0x60, 0xa2, 0x86, 0xad, 0xfd, 0x62, 0x27, 0xc6, - 0x09, 0x66, 0x3e, 0xc9, 0x42, 0x94, 0xf9, 0x2c, 0x83, 0x69, 0x30, 0x42, 0x7e, 0x4e, 0x51, 0xa6, - 0xd8, 0xbd, 0x1f, 0x58, 0x85, 0x39, 0x45, 0x8c, 0xe1, 0xe0, 0xd1, 0x8f, 0xf1, 0x53, 0x8e, 0x43, - 0xbe, 0xa2, 0x24, 0x9a, 0xa5, 0x75, 0x08, 0x89, 0xfd, 0x04, 0x31, 0x18, 0x42, 0x06, 0x25, 0xd0, - 0x9a, 0x57, 0xc0, 0xdf, 0x33, 0x19, 0xf2, 0x86, 0x41, 0x86, 0x8c, 0x23, 0x50, 0x93, 0x6b, 0x9b, - 0xba, 0xa3, 0xb7, 0xeb, 0x9d, 0x2d, 0xb7, 0x10, 0xda, 0xbd, 0x16, 0xad, 0x6e, 0x75, 0xf6, 0xd6, - 0xd4, 0xfa, 0x0a, 0x34, 0x2e, 0xc1, 0x7f, 0x6e, 0xde, 0x5b, 0x79, 0xf7, 0x30, 0x65, 0xe6, 0x2f, - 0xa7, 0xd2, 0xae, 0x77, 0xac, 0xd2, 0xf4, 0xa0, 0x48, 0x09, 0x11, 0xbd, 0xbf, 0x3e, 0x6a, 0x3c, - 0x80, 0x5d, 0x9c, 0xc2, 0x80, 0xe1, 0x67, 0xd4, 0xe3, 0xd9, 0xaf, 0x78, 0xf4, 0x81, 0x4c, 0x2e, - 0xb4, 0x2b, 0x42, 0xdb, 0x2e, 0x69, 0xaf, 0x91, 0x4a, 0x7f, 0xb3, 0x94, 0x71, 0x0f, 0x1a, 0xf1, - 0xd7, 0xc6, 0x2d, 0x45, 0x99, 0xf0, 0xa9, 0x0a, 0x9f, 0xd6, 0x66, 0x1f, 0x4e, 0x2b, 0xaf, 0xef, - 0xa5, 0x8c, 0x73, 0xf0, 0x8f, 0x9f, 0xff, 0x42, 0x5d, 0x5f, 0xc8, 0xff, 0x16, 0xf2, 0x8d, 0xf2, - 0x81, 0x0b, 0x90, 0x3a, 0xf3, 0xda, 0xa0, 0xb1, 0x03, 0xfe, 0xf0, 0xda, 0x09, 0xc9, 0x53, 0x66, - 0xd6, 0x1c, 0xbd, 0x5d, 0xed, 0x7f, 0x16, 0xba, 0xa7, 0xb3, 0x85, 0xad, 0xcf, 0x17, 0xb6, 0xfe, - 0xbe, 0xb0, 0xf5, 0x97, 0xa5, 0xad, 0xcd, 0x97, 0xb6, 0xf6, 0xba, 0xb4, 0xb5, 0xbb, 0x83, 0x08, - 0xb3, 0x51, 0x3e, 0x74, 0x03, 0x92, 0x78, 0xca, 0xf4, 0x30, 0x86, 0x43, 0xba, 0xfa, 0xf1, 0x26, - 0xf2, 0x25, 0x4d, 0xc7, 0x88, 0x0e, 0x6b, 0xe2, 0x81, 0x1c, 0x7f, 0x04, 0x00, 0x00, 0xff, 0xff, - 0xb6, 0x99, 0x5f, 0x53, 0x10, 0x03, 0x00, 0x00, + 0x18, 0xc5, 0xdb, 0x0b, 0x97, 0xe4, 0x0e, 0x77, 0x71, 0x6f, 0x75, 0x51, 0x1a, 0x2d, 0x0d, 0x89, + 0x09, 0x21, 0xb1, 0x8d, 0xf8, 0x06, 0x68, 0xe2, 0x42, 0xfc, 0x13, 0xc4, 0x8d, 0x9b, 0x66, 0x68, + 0xc7, 0x32, 0xda, 0x76, 0x70, 0xfa, 0xd5, 0xc0, 0x5b, 0xf8, 0x58, 0x2c, 0x59, 0xba, 0x32, 0x06, + 0x5e, 0xc4, 0x74, 0x3a, 0xc4, 0x56, 0x22, 0xee, 0x26, 0xf3, 0xfd, 0xce, 0x39, 0x73, 0xbe, 0x0c, + 0x6a, 0xc4, 0x24, 0x05, 0xce, 0x62, 0xc7, 0x27, 0x53, 0x27, 0x20, 0x31, 0x49, 0x68, 0x62, 0x4f, + 0x38, 0x03, 0xa6, 0xd5, 0xe5, 0xc8, 0xf6, 0xc9, 0xd4, 0xd8, 0x0d, 0x58, 0xc0, 0xc4, 0xbd, 0x93, + 0x9d, 0x72, 0xc4, 0xd0, 0x8b, 0xea, 0x09, 0xe6, 0x38, 0x92, 0x62, 0xa3, 0x53, 0x9c, 0x84, 0x34, + 0xa2, 0xe0, 0x32, 0xee, 0x13, 0xee, 0x02, 0xc7, 0xb1, 0x37, 0x26, 0x6e, 0x9a, 0x10, 0x2e, 0xd9, + 0x83, 0x1f, 0x58, 0x89, 0x59, 0x45, 0x0c, 0xa8, 0xf7, 0xe8, 0x86, 0xf4, 0x29, 0xa5, 0x3e, 0x85, + 0x99, 0x24, 0x9a, 0xa5, 0xe7, 0x30, 0x16, 0xba, 0x11, 0x01, 0xec, 0x63, 0xc0, 0x39, 0xd0, 0x5a, + 0x54, 0xd0, 0xdf, 0xb3, 0xbc, 0xe4, 0x0d, 0x60, 0x20, 0xda, 0x11, 0xaa, 0xe5, 0xcf, 0xd6, 0x55, + 0x4b, 0x6d, 0xd7, 0xbb, 0x3b, 0x76, 0xa1, 0xb4, 0x7d, 0x2d, 0x46, 0xbd, 0xea, 0xfc, 0xad, 0xa9, + 0x0c, 0x24, 0xa8, 0x5d, 0xa2, 0xff, 0x59, 0x78, 0x7f, 0x9d, 0xdd, 0xa7, 0x09, 0xe8, 0xbf, 0xac, + 0x4a, 0xbb, 0xde, 0x35, 0x4a, 0xea, 0x61, 0x91, 0x12, 0x26, 0xea, 0x60, 0x53, 0xaa, 0x3d, 0xa0, + 0x7d, 0x1a, 0x63, 0x0f, 0xe8, 0x33, 0xe9, 0x67, 0xdd, 0xaf, 0xb2, 0xea, 0xc3, 0xbc, 0xb9, 0xf0, + 0xae, 0x08, 0x6f, 0xb3, 0xe4, 0xbd, 0x41, 0x4a, 0xff, 0xed, 0x56, 0xda, 0x3d, 0x6a, 0x84, 0x5f, + 0x07, 0xb7, 0x09, 0xe1, 0x22, 0xa7, 0x2a, 0x72, 0x5a, 0xdb, 0x73, 0x32, 0x5a, 0x66, 0x7d, 0x6f, + 0xa5, 0x9d, 0xa3, 0x7f, 0xd9, 0xfa, 0x2f, 0xe4, 0xf6, 0x85, 0xfd, 0x6f, 0x61, 0xdf, 0x28, 0x2f, + 0xb8, 0x00, 0xc9, 0x35, 0x6f, 0x08, 0xb5, 0x3d, 0xf4, 0x27, 0xbb, 0x3b, 0x61, 0x69, 0x0c, 0x7a, + 0xcd, 0x52, 0xdb, 0xd5, 0xc1, 0xe7, 0x45, 0xef, 0x74, 0xbe, 0x34, 0xd5, 0xc5, 0xd2, 0x54, 0xdf, + 0x97, 0xa6, 0xfa, 0xb2, 0x32, 0x95, 0xc5, 0xca, 0x54, 0x5e, 0x57, 0xa6, 0x72, 0xd7, 0x09, 0x28, + 0x8c, 0xd3, 0x91, 0xed, 0xb1, 0xc8, 0x91, 0xa1, 0x87, 0x8c, 0x07, 0xeb, 0xb3, 0x33, 0xcd, 0x3f, + 0xd2, 0x6c, 0x42, 0x92, 0x51, 0x4d, 0xfc, 0x8f, 0xe3, 0x8f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x29, + 0x44, 0x46, 0xac, 0x0f, 0x03, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/dex/types/limit_order_expiration.pb.go b/x/dex/types/limit_order_expiration.pb.go index 06347e92e..0e9664f02 100644 --- a/x/dex/types/limit_order_expiration.pb.go +++ b/x/dex/types/limit_order_expiration.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: duality/dex/limit_order_expiration.proto +// source: neutron/dex/limit_order_expiration.proto package types @@ -37,7 +37,7 @@ func (m *LimitOrderExpiration) Reset() { *m = LimitOrderExpiration{} } func (m *LimitOrderExpiration) String() string { return proto.CompactTextString(m) } func (*LimitOrderExpiration) ProtoMessage() {} func (*LimitOrderExpiration) Descriptor() ([]byte, []int) { - return fileDescriptor_8874a00326735ee6, []int{0} + return fileDescriptor_61264397cad6ae82, []int{0} } func (m *LimitOrderExpiration) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -81,17 +81,17 @@ func (m *LimitOrderExpiration) GetTrancheRef() []byte { } func init() { - proto.RegisterType((*LimitOrderExpiration)(nil), "duality.dex.LimitOrderExpiration") + proto.RegisterType((*LimitOrderExpiration)(nil), "neutron.dex.LimitOrderExpiration") } func init() { - proto.RegisterFile("duality/dex/limit_order_expiration.proto", fileDescriptor_8874a00326735ee6) + proto.RegisterFile("neutron/dex/limit_order_expiration.proto", fileDescriptor_61264397cad6ae82) } -var fileDescriptor_8874a00326735ee6 = []byte{ - // 256 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0x48, 0x29, 0x4d, 0xcc, - 0xc9, 0x2c, 0xa9, 0xd4, 0x4f, 0x49, 0xad, 0xd0, 0xcf, 0xc9, 0xcc, 0xcd, 0x2c, 0x89, 0xcf, 0x2f, +var fileDescriptor_61264397cad6ae82 = []byte{ + // 255 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0xc8, 0x4b, 0x2d, 0x2d, + 0x29, 0xca, 0xcf, 0xd3, 0x4f, 0x49, 0xad, 0xd0, 0xcf, 0xc9, 0xcc, 0xcd, 0x2c, 0x89, 0xcf, 0x2f, 0x4a, 0x49, 0x2d, 0x8a, 0x4f, 0xad, 0x28, 0xc8, 0x2c, 0x4a, 0x2c, 0xc9, 0xcc, 0xcf, 0xd3, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x86, 0xaa, 0xd4, 0x4b, 0x49, 0xad, 0x90, 0x92, 0x4f, 0xcf, 0xcf, 0x4f, 0xcf, 0x49, 0xd5, 0x07, 0x4b, 0x25, 0x95, 0xa6, 0xe9, 0x97, 0x64, 0xe6, 0xa6, 0x16, @@ -101,11 +101,11 @@ var fileDescriptor_8874a00326735ee6 = []byte{ 0xb8, 0x8d, 0xa4, 0xf4, 0x20, 0x16, 0xe9, 0xc1, 0x2c, 0xd2, 0x0b, 0x81, 0x59, 0xe4, 0xc4, 0x71, 0xe2, 0x9e, 0x3c, 0xc3, 0x84, 0xfb, 0xf2, 0x8c, 0x41, 0x68, 0x7a, 0x85, 0xe4, 0xb8, 0xb8, 0x4a, 0x8a, 0x12, 0xf3, 0x92, 0x33, 0x52, 0x83, 0x52, 0xd3, 0x24, 0x98, 0x14, 0x18, 0x35, 0x78, 0x82, - 0x90, 0x44, 0x9c, 0x5c, 0x4f, 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, 0x3b, - 0x3d, 0xb3, 0x24, 0xa3, 0x34, 0x49, 0x2f, 0x39, 0x3f, 0x57, 0x1f, 0xea, 0x5f, 0xdd, 0x9c, 0xc4, - 0xa4, 0x62, 0x18, 0x47, 0xbf, 0x02, 0x1c, 0x50, 0x25, 0x95, 0x05, 0xa9, 0xc5, 0x49, 0x6c, 0x60, - 0x47, 0x19, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x9a, 0xb3, 0x50, 0x04, 0x44, 0x01, 0x00, 0x00, + 0x90, 0x44, 0x9c, 0x5c, 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, 0x2b, + 0x3d, 0xb3, 0x24, 0xa3, 0x34, 0x49, 0x2f, 0x39, 0x3f, 0x57, 0x1f, 0xea, 0x5f, 0xdd, 0xfc, 0xa2, + 0x74, 0x18, 0x5b, 0xbf, 0x02, 0x1c, 0x4e, 0x25, 0x95, 0x05, 0xa9, 0xc5, 0x49, 0x6c, 0x60, 0x37, + 0x19, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x1a, 0xd9, 0xbe, 0xa6, 0x43, 0x01, 0x00, 0x00, } func (m *LimitOrderExpiration) Marshal() (dAtA []byte, err error) { diff --git a/x/dex/types/limit_order_tranche.pb.go b/x/dex/types/limit_order_tranche.pb.go index 3984c5926..272946670 100644 --- a/x/dex/types/limit_order_tranche.pb.go +++ b/x/dex/types/limit_order_tranche.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: duality/dex/limit_order_tranche.proto +// source: neutron/dex/limit_order_tranche.proto package types @@ -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_duality_labs_duality_utils_math "github.com/neutron-org/neutron/utils/math" + github_com_neutron_org_neutron_utils_math "github.com/neutron-org/neutron/utils/math" _ "google.golang.org/protobuf/types/known/timestamppb" io "io" math "math" @@ -39,7 +39,7 @@ func (m *LimitOrderTrancheKey) Reset() { *m = LimitOrderTrancheKey{} } func (m *LimitOrderTrancheKey) String() string { return proto.CompactTextString(m) } func (*LimitOrderTrancheKey) ProtoMessage() {} func (*LimitOrderTrancheKey) Descriptor() ([]byte, []int) { - return fileDescriptor_49e73267811ad014, []int{0} + return fileDescriptor_8c2ded67c80756d1, []int{0} } func (m *LimitOrderTrancheKey) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -98,15 +98,15 @@ type LimitOrderTranche struct { // JIT orders also use goodTilDate to handle deletion but represent a special case // All JIT orders have a goodTilDate of 0 and an exception is made to still 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=expirationTime,proto3,stdtime" json:"expirationTime,omitempty"` - PriceTakerToMaker github_com_duality_labs_duality_utils_math.PrecDec `protobuf:"bytes,7,opt,name=priceTakerToMaker,proto3,customtype=github.com/neutron-org/neutron/utils/math.PrecDec" json:"priceTakerToMaker" yaml:"priceTakerToMaker"` + ExpirationTime *time.Time `protobuf:"bytes,6,opt,name=expirationTime,proto3,stdtime" json:"expirationTime,omitempty"` + PriceTakerToMaker github_com_neutron_org_neutron_utils_math.PrecDec `protobuf:"bytes,7,opt,name=priceTakerToMaker,proto3,customtype=github.com/neutron-org/neutron/utils/math.PrecDec" json:"priceTakerToMaker" yaml:"priceTakerToMaker"` } func (m *LimitOrderTranche) Reset() { *m = LimitOrderTranche{} } func (m *LimitOrderTranche) String() string { return proto.CompactTextString(m) } func (*LimitOrderTranche) ProtoMessage() {} func (*LimitOrderTranche) Descriptor() ([]byte, []int) { - return fileDescriptor_49e73267811ad014, []int{1} + return fileDescriptor_8c2ded67c80756d1, []int{1} } func (m *LimitOrderTranche) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -150,51 +150,51 @@ func (m *LimitOrderTranche) GetExpirationTime() *time.Time { } func init() { - proto.RegisterType((*LimitOrderTrancheKey)(nil), "duality.dex.LimitOrderTrancheKey") - proto.RegisterType((*LimitOrderTranche)(nil), "duality.dex.LimitOrderTranche") + proto.RegisterType((*LimitOrderTrancheKey)(nil), "neutron.dex.LimitOrderTrancheKey") + proto.RegisterType((*LimitOrderTranche)(nil), "neutron.dex.LimitOrderTranche") } func init() { - proto.RegisterFile("duality/dex/limit_order_tranche.proto", fileDescriptor_49e73267811ad014) + proto.RegisterFile("neutron/dex/limit_order_tranche.proto", fileDescriptor_8c2ded67c80756d1) } -var fileDescriptor_49e73267811ad014 = []byte{ - // 560 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x94, 0x4f, 0x8b, 0xd3, 0x4e, - 0x18, 0xc7, 0x3b, 0xbf, 0xfe, 0x5c, 0xdd, 0xa9, 0x28, 0x1b, 0x56, 0xc9, 0xf6, 0x90, 0xd4, 0x80, - 0x52, 0x90, 0x4d, 0x60, 0xd7, 0xd3, 0x1e, 0x4b, 0x3d, 0x14, 0x57, 0x5c, 0x42, 0x0e, 0xa2, 0x87, - 0x32, 0x4d, 0x1e, 0xdb, 0x21, 0x7f, 0x26, 0x4c, 0xa6, 0xd2, 0x5e, 0x05, 0xef, 0xeb, 0xd1, 0x77, - 0xe0, 0x4b, 0xe9, 0x71, 0x8f, 0xe2, 0x21, 0x4a, 0x7b, 0x10, 0xf6, 0xd8, 0x57, 0x20, 0x99, 0xa4, - 0x36, 0x6d, 0x8a, 0xb2, 0x78, 0x9a, 0xc9, 0xf3, 0xe7, 0xfb, 0x7c, 0x9e, 0x87, 0x79, 0x82, 0x1f, - 0x7b, 0x63, 0x12, 0x50, 0x31, 0xb5, 0x3c, 0x98, 0x58, 0x01, 0x0d, 0xa9, 0xe8, 0x33, 0xee, 0x01, - 0xef, 0x0b, 0x4e, 0x22, 0x77, 0x04, 0x66, 0xcc, 0x99, 0x60, 0x4a, 0xa3, 0x08, 0x33, 0x3d, 0x98, - 0x34, 0xf5, 0x21, 0x63, 0xc3, 0x00, 0x2c, 0xe9, 0x1a, 0x8c, 0xdf, 0x59, 0x82, 0x86, 0x90, 0x08, - 0x12, 0xc6, 0x79, 0x74, 0x53, 0x2f, 0x8b, 0x0a, 0x4e, 0x3c, 0xe8, 0xc7, 0x84, 0xf2, 0x3e, 0xf5, - 0x8a, 0x80, 0xc3, 0x21, 0x1b, 0x32, 0x79, 0xb5, 0xb2, 0x5b, 0x61, 0x3d, 0x2a, 0xa7, 0x6d, 0x24, - 0x18, 0x5f, 0x10, 0x3e, 0x3c, 0xcf, 0xe8, 0x5e, 0x65, 0x70, 0x4e, 0xce, 0xf6, 0x02, 0xa6, 0xca, - 0x19, 0x6e, 0xc8, 0x02, 0x17, 0x84, 0xf2, 0x5e, 0x57, 0x45, 0x2d, 0xd4, 0x6e, 0x9c, 0xa8, 0x66, - 0x09, 0xd7, 0x74, 0xd6, 0x7e, 0xbb, 0x1c, 0xac, 0x3c, 0xc3, 0x0f, 0x04, 0x75, 0xfd, 0x5e, 0xe4, - 0xc1, 0xc4, 0x21, 0x3e, 0x70, 0x87, 0xbd, 0xcc, 0x0e, 0xf5, 0xbf, 0x16, 0x6a, 0xd7, 0xed, 0xdd, - 0x4e, 0x45, 0xc3, 0x58, 0xfc, 0xae, 0xaf, 0xd6, 0x5b, 0xa8, 0xbd, 0x6f, 0x97, 0x2c, 0xc6, 0xcf, - 0x3d, 0x7c, 0x50, 0x41, 0x55, 0x4e, 0x71, 0xdd, 0x87, 0x69, 0xc1, 0xf7, 0x68, 0x83, 0x6f, 0x57, - 0x5f, 0x76, 0x16, 0xad, 0x7c, 0x42, 0x58, 0xe1, 0x90, 0x00, 0x7f, 0x0f, 0x89, 0x2c, 0xde, 0x85, - 0x88, 0x85, 0x12, 0x6f, 0xbf, 0x43, 0x66, 0xa9, 0x5e, 0xfb, 0x96, 0xea, 0x4f, 0x86, 0x54, 0x8c, - 0xc6, 0x03, 0xd3, 0x65, 0xa1, 0xe5, 0xb2, 0x24, 0x64, 0x49, 0x71, 0x1c, 0x27, 0x9e, 0x6f, 0x89, - 0x69, 0x0c, 0x89, 0xd9, 0x8b, 0xc4, 0x75, 0xaa, 0xef, 0xd0, 0x5a, 0xa6, 0xfa, 0xd1, 0x94, 0x84, - 0xc1, 0x99, 0x51, 0xf5, 0x19, 0xf6, 0x8e, 0x84, 0x0d, 0x26, 0x67, 0xcd, 0x54, 0xff, 0x57, 0x26, - 0xe7, 0x0f, 0x4c, 0xce, 0x2e, 0xa6, 0xb5, 0x51, 0xf9, 0x80, 0xf0, 0x7d, 0xc1, 0x04, 0x09, 0x4a, - 0x43, 0xfa, 0x5f, 0x02, 0xbd, 0xbe, 0x31, 0xd0, 0x5d, 0x29, 0xe4, 0x30, 0x1f, 0xa2, 0x5e, 0xb4, - 0x4c, 0xf5, 0x87, 0x39, 0xca, 0x96, 0xbc, 0x61, 0x6f, 0x17, 0x54, 0x3e, 0xae, 0x20, 0x4a, 0x53, - 0xb9, 0x25, 0x21, 0xde, 0xde, 0x18, 0x62, 0x5b, 0x68, 0x8b, 0xc3, 0xa9, 0x70, 0x94, 0x86, 0x71, - 0x8e, 0xef, 0xc1, 0x24, 0xa6, 0x9c, 0x08, 0xca, 0x22, 0x87, 0x86, 0xa0, 0xee, 0xc9, 0x47, 0xd7, - 0x34, 0xf3, 0xb5, 0x35, 0x57, 0x6b, 0x6b, 0x3a, 0xab, 0xb5, 0xed, 0xdc, 0x99, 0xa5, 0x3a, 0xba, - 0xfc, 0xae, 0x23, 0x7b, 0x2b, 0x57, 0xf9, 0x8c, 0xf0, 0x41, 0xcc, 0xa9, 0x0b, 0x1b, 0x0b, 0x72, - 0x5b, 0xf6, 0xe5, 0x17, 0x7d, 0x9d, 0x94, 0xfa, 0x2a, 0x1e, 0xf6, 0x71, 0x40, 0x06, 0xc9, 0xea, - 0xc3, 0x1a, 0x0b, 0x1a, 0x24, 0x56, 0x48, 0xc4, 0xc8, 0xbc, 0xe0, 0xe0, 0x76, 0xc1, 0xbd, 0x4e, - 0xf5, 0xaa, 0xec, 0x32, 0xd5, 0xd5, 0xbc, 0xcb, 0x8a, 0xcb, 0xb0, 0xab, 0xe1, 0x9d, 0xe7, 0xb3, - 0xb9, 0x86, 0xae, 0xe6, 0x1a, 0xfa, 0x31, 0xd7, 0xd0, 0xe5, 0x42, 0xab, 0x5d, 0x2d, 0xb4, 0xda, - 0xd7, 0x85, 0x56, 0x7b, 0xf3, 0xf4, 0x6f, 0x44, 0x93, 0xfc, 0xd7, 0x94, 0x8d, 0x7c, 0xb0, 0x27, - 0x07, 0x72, 0xfa, 0x2b, 0x00, 0x00, 0xff, 0xff, 0x7a, 0x12, 0x2d, 0x9d, 0x0b, 0x05, 0x00, 0x00, +var fileDescriptor_8c2ded67c80756d1 = []byte{ + // 557 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x94, 0x41, 0x8b, 0xd3, 0x40, + 0x14, 0xc7, 0x3b, 0x56, 0xab, 0x3b, 0x15, 0x65, 0xc3, 0x2a, 0xd9, 0x1e, 0x92, 0x1a, 0x50, 0x8a, + 0xb0, 0x09, 0xba, 0x9e, 0xf6, 0x58, 0x7a, 0x29, 0xae, 0xb8, 0x84, 0x1c, 0x44, 0x0f, 0x65, 0x9a, + 0x3c, 0xd3, 0xb1, 0x4d, 0x26, 0x4c, 0xa6, 0xd2, 0x5e, 0x05, 0xef, 0xeb, 0xcd, 0x8f, 0xe0, 0x47, + 0xe9, 0x71, 0x8f, 0xe2, 0x21, 0x4a, 0x0b, 0x1e, 0xf6, 0xd8, 0x4f, 0x20, 0x99, 0xa4, 0x36, 0x6d, + 0x8a, 0xb2, 0xec, 0x29, 0xc3, 0xbc, 0xff, 0xfb, 0xbf, 0xdf, 0x7b, 0xcc, 0x0b, 0x7e, 0x1c, 0xc2, + 0x58, 0x70, 0x16, 0x5a, 0x1e, 0x4c, 0xac, 0x11, 0x0d, 0xa8, 0xe8, 0x31, 0xee, 0x01, 0xef, 0x09, + 0x4e, 0x42, 0x77, 0x00, 0x66, 0xc4, 0x99, 0x60, 0x4a, 0x3d, 0x97, 0x99, 0x1e, 0x4c, 0x1a, 0xba, + 0xcf, 0x98, 0x3f, 0x02, 0x4b, 0x86, 0xfa, 0xe3, 0xf7, 0x96, 0xa0, 0x01, 0xc4, 0x82, 0x04, 0x51, + 0xa6, 0x6e, 0xe8, 0x45, 0x53, 0xc1, 0x89, 0x07, 0xbd, 0x88, 0x50, 0xde, 0xa3, 0x5e, 0x2e, 0x38, + 0xf0, 0x99, 0xcf, 0xe4, 0xd1, 0x4a, 0x4f, 0xf9, 0xed, 0x61, 0x31, 0x6d, 0x23, 0xc1, 0xf8, 0x86, + 0xf0, 0xc1, 0x69, 0x4a, 0xf7, 0x3a, 0x85, 0x73, 0x32, 0xb6, 0x97, 0x30, 0x55, 0x4e, 0x70, 0x5d, + 0x16, 0x38, 0x23, 0x94, 0x77, 0x3b, 0x2a, 0x6a, 0xa2, 0x56, 0xfd, 0xb9, 0x6a, 0x16, 0x70, 0x4d, + 0x67, 0x1d, 0xb7, 0x8b, 0x62, 0xe5, 0x05, 0x7e, 0x20, 0xa8, 0x3b, 0xec, 0x86, 0x1e, 0x4c, 0x1c, + 0x32, 0x04, 0xee, 0xb0, 0x57, 0xe9, 0x47, 0xbd, 0xd1, 0x44, 0xad, 0xaa, 0xbd, 0x3b, 0xa8, 0x68, + 0x18, 0x8b, 0xbf, 0xf5, 0xd5, 0x6a, 0x13, 0xb5, 0xf6, 0xec, 0xc2, 0x8d, 0xf1, 0xbb, 0x86, 0xf7, + 0x4b, 0xa8, 0xca, 0x31, 0xae, 0x0e, 0x61, 0x9a, 0xf3, 0x3d, 0xda, 0xe0, 0xdb, 0xd5, 0x97, 0x9d, + 0xaa, 0x95, 0x2f, 0x08, 0x2b, 0x1c, 0x62, 0xe0, 0x1f, 0x21, 0x96, 0xc5, 0x3b, 0x10, 0xb2, 0x40, + 0xe2, 0xed, 0xb5, 0xc9, 0x2c, 0xd1, 0x2b, 0x3f, 0x12, 0xfd, 0x89, 0x4f, 0xc5, 0x60, 0xdc, 0x37, + 0x5d, 0x16, 0x58, 0x2e, 0x8b, 0x03, 0x16, 0xe7, 0x9f, 0xa3, 0xd8, 0x1b, 0x5a, 0x62, 0x1a, 0x41, + 0x6c, 0x76, 0x43, 0x71, 0x99, 0xe8, 0x3b, 0xbc, 0x96, 0x89, 0x7e, 0x38, 0x25, 0xc1, 0xe8, 0xc4, + 0x28, 0xc7, 0x0c, 0x7b, 0x47, 0xc2, 0x06, 0x93, 0xb3, 0x66, 0xaa, 0x5e, 0x97, 0xc9, 0xf9, 0x07, + 0x93, 0xb3, 0x8b, 0x69, 0x7d, 0xa9, 0x7c, 0x42, 0xf8, 0xbe, 0x60, 0x82, 0x8c, 0x0a, 0x43, 0xba, + 0x29, 0x81, 0xde, 0x5c, 0x19, 0xe8, 0xae, 0x34, 0x72, 0xd8, 0x10, 0xc2, 0x6e, 0xb8, 0x4c, 0xf4, + 0x87, 0x19, 0xca, 0x96, 0xbd, 0x61, 0x6f, 0x17, 0x54, 0x3e, 0xaf, 0x20, 0x0a, 0x53, 0xb9, 0x25, + 0x21, 0xde, 0x5d, 0x19, 0x62, 0xdb, 0x68, 0x8b, 0xc3, 0x29, 0x71, 0x14, 0x86, 0x71, 0x8a, 0xef, + 0xc1, 0x24, 0xa2, 0x9c, 0x08, 0xca, 0x42, 0x87, 0x06, 0xa0, 0xd6, 0xe4, 0xa3, 0x6b, 0x98, 0xd9, + 0xda, 0x9a, 0xab, 0xb5, 0x35, 0x9d, 0xd5, 0xda, 0xb6, 0xef, 0xcc, 0x12, 0x1d, 0x9d, 0xff, 0xd4, + 0x91, 0xbd, 0x95, 0xab, 0x7c, 0x45, 0x78, 0x3f, 0xe2, 0xd4, 0x85, 0x8d, 0x05, 0xb9, 0x2d, 0xfb, + 0xfa, 0x90, 0xf7, 0xf5, 0xac, 0xd0, 0x57, 0xfe, 0xb0, 0x8f, 0x18, 0xf7, 0x57, 0x67, 0x6b, 0x2c, + 0xe8, 0x28, 0xb6, 0x02, 0x22, 0x06, 0xe6, 0x19, 0x07, 0xb7, 0x03, 0xee, 0x65, 0xa2, 0x97, 0x5d, + 0x97, 0x89, 0xae, 0x66, 0x4d, 0x96, 0x42, 0x86, 0x5d, 0x96, 0xb7, 0x3b, 0xb3, 0xb9, 0x86, 0x2e, + 0xe6, 0x1a, 0xfa, 0x35, 0xd7, 0xd0, 0xf9, 0x42, 0xab, 0x5c, 0x2c, 0xb4, 0xca, 0xf7, 0x85, 0x56, + 0x79, 0xfb, 0xf4, 0x3f, 0x40, 0x93, 0xec, 0xc7, 0x94, 0x0e, 0xbc, 0x5f, 0x93, 0xe3, 0x38, 0xfe, + 0x13, 0x00, 0x00, 0xff, 0xff, 0x2a, 0xca, 0x7c, 0xe1, 0x09, 0x05, 0x00, 0x00, } func (m *LimitOrderTrancheKey) Marshal() (dAtA []byte, err error) { diff --git a/x/dex/types/limit_order_tranche_user.pb.go b/x/dex/types/limit_order_tranche_user.pb.go index 51228fda7..4920c8518 100644 --- a/x/dex/types/limit_order_tranche_user.pb.go +++ b/x/dex/types/limit_order_tranche_user.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: duality/dex/limit_order_tranche_user.proto +// source: neutron/dex/limit_order_tranche_user.proto package types @@ -32,14 +32,14 @@ type LimitOrderTrancheUser struct { SharesOwned github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,5,opt,name=sharesOwned,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"sharesOwned" yaml:"sharesOwned"` SharesWithdrawn github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,6,opt,name=sharesWithdrawn,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"sharesWithdrawn" yaml:"sharesWithdrawn"` SharesCancelled github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,7,opt,name=sharesCancelled,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"sharesCancelled" yaml:"sharesCancelled"` - OrderType LimitOrderType `protobuf:"varint,8,opt,name=orderType,proto3,enum=duality.dex.LimitOrderType" json:"orderType,omitempty"` + OrderType LimitOrderType `protobuf:"varint,8,opt,name=orderType,proto3,enum=neutron.dex.LimitOrderType" json:"orderType,omitempty"` } func (m *LimitOrderTrancheUser) Reset() { *m = LimitOrderTrancheUser{} } func (m *LimitOrderTrancheUser) String() string { return proto.CompactTextString(m) } func (*LimitOrderTrancheUser) ProtoMessage() {} func (*LimitOrderTrancheUser) Descriptor() ([]byte, []int) { - return fileDescriptor_896ef6766d8ff3c4, []int{0} + return fileDescriptor_67e5ffbd487ea05f, []int{0} } func (m *LimitOrderTrancheUser) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -104,43 +104,43 @@ func (m *LimitOrderTrancheUser) GetOrderType() LimitOrderType { } func init() { - proto.RegisterType((*LimitOrderTrancheUser)(nil), "duality.dex.LimitOrderTrancheUser") + proto.RegisterType((*LimitOrderTrancheUser)(nil), "neutron.dex.LimitOrderTrancheUser") } func init() { - proto.RegisterFile("duality/dex/limit_order_tranche_user.proto", fileDescriptor_896ef6766d8ff3c4) + proto.RegisterFile("neutron/dex/limit_order_tranche_user.proto", fileDescriptor_67e5ffbd487ea05f) } -var fileDescriptor_896ef6766d8ff3c4 = []byte{ - // 445 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x52, 0x4f, 0x6b, 0xd4, 0x40, - 0x1c, 0xdd, 0xb1, 0xb6, 0xb5, 0xb3, 0xa0, 0x30, 0xb4, 0x32, 0x54, 0x48, 0x96, 0x3d, 0xc8, 0xa2, - 0x34, 0x81, 0xea, 0xc5, 0x1e, 0xab, 0x1e, 0x16, 0x95, 0x4a, 0x8c, 0x08, 0x7a, 0x08, 0xb3, 0x99, - 0x1f, 0xbb, 0xc3, 0x66, 0x33, 0x61, 0x66, 0x96, 0x26, 0x1f, 0xa0, 0x77, 0x3f, 0x56, 0x8f, 0x3d, - 0x8a, 0x87, 0x20, 0xbb, 0x37, 0x8f, 0xfd, 0x04, 0x92, 0x3f, 0x4d, 0xa7, 0x8b, 0x17, 0xf1, 0x94, - 0xfc, 0xde, 0x7b, 0xbc, 0xf7, 0x06, 0x1e, 0x7e, 0xc6, 0x97, 0x2c, 0x11, 0xa6, 0xf0, 0x39, 0xe4, - 0x7e, 0x22, 0x16, 0xc2, 0x44, 0x52, 0x71, 0x50, 0x91, 0x51, 0x2c, 0x8d, 0x67, 0x10, 0x2d, 0x35, - 0x28, 0x2f, 0x53, 0xd2, 0x48, 0xd2, 0x6f, 0xb5, 0x1e, 0x87, 0xfc, 0x70, 0x7f, 0x2a, 0xa7, 0xb2, - 0xc6, 0xfd, 0xea, 0xaf, 0x91, 0x1c, 0xba, 0xb6, 0x9d, 0x51, 0x8c, 0x43, 0x94, 0x31, 0xa1, 0x22, - 0xc1, 0x5b, 0xc1, 0xfe, 0x1d, 0x41, 0xde, 0xa0, 0xc3, 0x8b, 0x6d, 0x7c, 0xf0, 0xbe, 0x0a, 0x3f, - 0xab, 0xb2, 0xc3, 0x26, 0xfa, 0xb3, 0x06, 0x45, 0x4e, 0x70, 0xbf, 0xb6, 0xf9, 0xc8, 0x84, 0x1a, - 0xbf, 0xa1, 0x68, 0x80, 0x46, 0xfd, 0x63, 0xea, 0x59, 0x4d, 0xbc, 0xf0, 0x96, 0x0f, 0x6c, 0x31, - 0x79, 0x89, 0x0f, 0x8c, 0x88, 0xe7, 0xe3, 0x94, 0x43, 0x1e, 0xb2, 0x39, 0xa8, 0x50, 0x7e, 0xa8, - 0x3e, 0xf4, 0xde, 0x00, 0x8d, 0xb6, 0x82, 0xbf, 0x93, 0xc4, 0xc1, 0xb8, 0x7d, 0xfb, 0x3b, 0x28, - 0xe8, 0xd6, 0x00, 0x8d, 0xf6, 0x02, 0x0b, 0x21, 0x14, 0xef, 0x32, 0xce, 0x15, 0x68, 0x4d, 0xef, - 0xd7, 0xe4, 0xcd, 0x49, 0x96, 0xb8, 0xaf, 0x67, 0x4c, 0x81, 0x3e, 0x3b, 0x4f, 0x81, 0xd3, 0xed, - 0x8a, 0x3d, 0xfd, 0x74, 0x59, 0xba, 0xbd, 0x9f, 0xa5, 0xfb, 0x74, 0x2a, 0xcc, 0x6c, 0x39, 0xf1, - 0x62, 0xb9, 0xf0, 0x63, 0xa9, 0x17, 0x52, 0xb7, 0x9f, 0x23, 0xcd, 0xe7, 0xbe, 0x29, 0x32, 0xd0, - 0xde, 0x38, 0x35, 0xbf, 0x4b, 0xd7, 0x36, 0xb9, 0x2e, 0x5d, 0x52, 0xb0, 0x45, 0x72, 0x32, 0xb4, - 0xc0, 0x61, 0x60, 0x4b, 0xc8, 0x05, 0xc2, 0x8f, 0x9a, 0xfb, 0x8b, 0x30, 0x33, 0xae, 0xd8, 0x79, - 0x4a, 0x77, 0xea, 0xec, 0x6f, 0xff, 0x9c, 0xbd, 0x69, 0x74, 0x5d, 0xba, 0x8f, 0xed, 0xfc, 0x8e, - 0x18, 0x06, 0x9b, 0x52, 0xab, 0xc7, 0x6b, 0x96, 0xc6, 0x90, 0x24, 0xc0, 0xe9, 0xee, 0xff, 0xf5, - 0xe8, 0x8c, 0x36, 0x7b, 0x74, 0x44, 0xd7, 0xa3, 0x43, 0xc8, 0x2b, 0xbc, 0x57, 0x4f, 0x38, 0x2c, - 0x32, 0xa0, 0x0f, 0x06, 0x68, 0xf4, 0xf0, 0xf8, 0xc9, 0x9d, 0xc1, 0x58, 0x4b, 0x2b, 0x32, 0x08, - 0x6e, 0xd5, 0xa7, 0x6f, 0x2f, 0x57, 0x0e, 0xba, 0x5a, 0x39, 0xe8, 0xd7, 0xca, 0x41, 0xdf, 0xd7, - 0x4e, 0xef, 0x6a, 0xed, 0xf4, 0x7e, 0xac, 0x9d, 0xde, 0xd7, 0xe7, 0x56, 0xf5, 0xd6, 0xeb, 0x28, - 0x61, 0x13, 0x7d, 0x73, 0xf8, 0x79, 0xb3, 0xe8, 0xea, 0x0d, 0x93, 0x9d, 0x7a, 0xd5, 0x2f, 0xfe, - 0x04, 0x00, 0x00, 0xff, 0xff, 0xa7, 0x69, 0xfa, 0xa6, 0x5d, 0x03, 0x00, 0x00, +var fileDescriptor_67e5ffbd487ea05f = []byte{ + // 443 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x52, 0x4f, 0x6b, 0xdb, 0x30, + 0x1c, 0x8d, 0xd6, 0xb5, 0x5d, 0x15, 0xd8, 0x40, 0xb4, 0x43, 0x74, 0x60, 0x87, 0x1c, 0x46, 0x28, + 0xd4, 0x86, 0x6e, 0x97, 0xf5, 0xd8, 0xf5, 0x12, 0xb6, 0xd1, 0xe1, 0x79, 0x0c, 0xb6, 0x83, 0x51, + 0xad, 0x1f, 0x89, 0x49, 0x22, 0x19, 0x49, 0xa6, 0xf6, 0x07, 0xe8, 0x7d, 0x1f, 0xab, 0xc7, 0x1e, + 0xc7, 0x0e, 0x66, 0x24, 0xb7, 0x1d, 0xfb, 0x09, 0x86, 0xff, 0xd4, 0x55, 0xc2, 0x2e, 0x63, 0x27, + 0x49, 0xef, 0x3d, 0xde, 0x7b, 0x82, 0x87, 0x8f, 0x04, 0x64, 0x46, 0x49, 0xe1, 0x73, 0xc8, 0xfd, + 0x79, 0xb2, 0x48, 0x4c, 0x24, 0x15, 0x07, 0x15, 0x19, 0xc5, 0x44, 0x3c, 0x85, 0x28, 0xd3, 0xa0, + 0xbc, 0x54, 0x49, 0x23, 0x49, 0xbf, 0xd5, 0x7a, 0x1c, 0xf2, 0xc3, 0xfd, 0x89, 0x9c, 0xc8, 0x1a, + 0xf7, 0xab, 0x5b, 0x23, 0x39, 0x74, 0x6d, 0x3b, 0xa3, 0x18, 0x87, 0x28, 0x65, 0x89, 0x8a, 0x12, + 0xde, 0x0a, 0xf6, 0xd7, 0x04, 0x79, 0x83, 0x0e, 0xaf, 0xb7, 0xf1, 0xc1, 0xfb, 0x2a, 0xfc, 0xa2, + 0xca, 0x0e, 0x9b, 0xe8, 0xcf, 0x1a, 0x14, 0x39, 0xc5, 0xfd, 0xda, 0xe6, 0x23, 0x4b, 0xd4, 0xf8, + 0x9c, 0xa2, 0x01, 0x1a, 0xf5, 0x4f, 0xa8, 0x67, 0x35, 0xf1, 0xc2, 0x07, 0x3e, 0xb0, 0xc5, 0xe4, + 0x35, 0x3e, 0x30, 0x49, 0x3c, 0x1b, 0x0b, 0x0e, 0x79, 0xc8, 0x66, 0xa0, 0x42, 0xf9, 0xa1, 0x3a, + 0xe8, 0xa3, 0x01, 0x1a, 0x6d, 0x05, 0x7f, 0x27, 0x89, 0x83, 0x71, 0xfb, 0xf7, 0x77, 0x50, 0xd0, + 0xad, 0x01, 0x1a, 0xed, 0x05, 0x16, 0x42, 0x28, 0xde, 0x65, 0x9c, 0x2b, 0xd0, 0x9a, 0x3e, 0xae, + 0xc9, 0xfb, 0x27, 0xc9, 0x70, 0x5f, 0x4f, 0x99, 0x02, 0x7d, 0x71, 0x25, 0x80, 0xd3, 0xed, 0x8a, + 0x3d, 0xfb, 0x74, 0x53, 0xba, 0xbd, 0x9f, 0xa5, 0xfb, 0x72, 0x92, 0x98, 0x69, 0x76, 0xe9, 0xc5, + 0x72, 0xe1, 0xc7, 0x52, 0x2f, 0xa4, 0x6e, 0x8f, 0x63, 0xcd, 0x67, 0xbe, 0x29, 0x52, 0xd0, 0xde, + 0x58, 0x98, 0xdf, 0xa5, 0x6b, 0x9b, 0xdc, 0x95, 0x2e, 0x29, 0xd8, 0x62, 0x7e, 0x3a, 0xb4, 0xc0, + 0x61, 0x60, 0x4b, 0xc8, 0x35, 0xc2, 0xcf, 0x9a, 0xf7, 0x97, 0xc4, 0x4c, 0xb9, 0x62, 0x57, 0x82, + 0xee, 0xd4, 0xd9, 0xdf, 0xfe, 0x39, 0x7b, 0xd3, 0xe8, 0xae, 0x74, 0x9f, 0xdb, 0xf9, 0x1d, 0x31, + 0x0c, 0x36, 0xa5, 0x56, 0x8f, 0xb7, 0x4c, 0xc4, 0x30, 0x9f, 0x03, 0xa7, 0xbb, 0xff, 0xd7, 0xa3, + 0x33, 0xda, 0xec, 0xd1, 0x11, 0x5d, 0x8f, 0x0e, 0x21, 0x6f, 0xf0, 0x5e, 0x3d, 0xe1, 0xb0, 0x48, + 0x81, 0x3e, 0x19, 0xa0, 0xd1, 0xd3, 0x93, 0x17, 0x6b, 0x83, 0xb1, 0x96, 0x56, 0xa4, 0x10, 0x3c, + 0xa8, 0xcf, 0xce, 0x6f, 0x96, 0x0e, 0xba, 0x5d, 0x3a, 0xe8, 0xd7, 0xd2, 0x41, 0xdf, 0x57, 0x4e, + 0xef, 0x76, 0xe5, 0xf4, 0x7e, 0xac, 0x9c, 0xde, 0xd7, 0x23, 0xab, 0x7a, 0xeb, 0x75, 0x2c, 0xd5, + 0xe4, 0xfe, 0xee, 0xe7, 0xcd, 0xa0, 0xab, 0x2f, 0x5c, 0xee, 0xd4, 0xa3, 0x7e, 0xf5, 0x27, 0x00, + 0x00, 0xff, 0xff, 0xe5, 0x2a, 0x9f, 0x17, 0x5c, 0x03, 0x00, 0x00, } func (m *LimitOrderTrancheUser) Marshal() (dAtA []byte, err error) { diff --git a/x/dex/types/pair_id.pb.go b/x/dex/types/pair_id.pb.go index 4b65c4207..7ddce416e 100644 --- a/x/dex/types/pair_id.pb.go +++ b/x/dex/types/pair_id.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: duality/dex/pair_id.proto +// source: neutron/dex/pair_id.proto package types @@ -31,7 +31,7 @@ func (m *PairID) Reset() { *m = PairID{} } func (m *PairID) String() string { return proto.CompactTextString(m) } func (*PairID) ProtoMessage() {} func (*PairID) Descriptor() ([]byte, []int) { - return fileDescriptor_1919813da3dc14c8, []int{0} + return fileDescriptor_7bd5bf8f218c5bfa, []int{0} } func (m *PairID) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -75,23 +75,23 @@ func (m *PairID) GetToken1() string { } func init() { - proto.RegisterType((*PairID)(nil), "duality.dex.PairID") + proto.RegisterType((*PairID)(nil), "neutron.dex.PairID") } -func init() { proto.RegisterFile("duality/dex/pair_id.proto", fileDescriptor_1919813da3dc14c8) } +func init() { proto.RegisterFile("neutron/dex/pair_id.proto", fileDescriptor_7bd5bf8f218c5bfa) } -var fileDescriptor_1919813da3dc14c8 = []byte{ - // 159 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4c, 0x29, 0x4d, 0xcc, - 0xc9, 0x2c, 0xa9, 0xd4, 0x4f, 0x49, 0xad, 0xd0, 0x2f, 0x48, 0xcc, 0x2c, 0x8a, 0xcf, 0x4c, 0xd1, +var fileDescriptor_7bd5bf8f218c5bfa = []byte{ + // 158 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xcc, 0x4b, 0x2d, 0x2d, + 0x29, 0xca, 0xcf, 0xd3, 0x4f, 0x49, 0xad, 0xd0, 0x2f, 0x48, 0xcc, 0x2c, 0x8a, 0xcf, 0x4c, 0xd1, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x86, 0x4a, 0xe9, 0xa5, 0xa4, 0x56, 0x28, 0x59, 0x70, 0xb1, 0x05, 0x24, 0x66, 0x16, 0x79, 0xba, 0x08, 0x89, 0x71, 0xb1, 0x95, 0xe4, 0x67, 0xa7, 0xe6, 0x19, 0x48, 0x30, 0x2a, 0x30, 0x6a, 0x70, 0x06, 0x41, 0x79, 0x70, 0x71, 0x43, 0x09, 0x26, 0x24, - 0x71, 0x43, 0x27, 0xd7, 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, 0x4e, - 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x87, 0xda, 0xa5, 0x9b, 0x93, 0x98, - 0x54, 0x0c, 0xe3, 0xe8, 0x57, 0x80, 0x5d, 0x55, 0x52, 0x59, 0x90, 0x5a, 0x9c, 0xc4, 0x06, 0x76, - 0x94, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0x72, 0x4e, 0xb2, 0x90, 0xb1, 0x00, 0x00, 0x00, + 0x71, 0x43, 0x27, 0x97, 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, 0x4a, + 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x87, 0xda, 0xa5, 0x9b, 0x5f, 0x94, + 0x0e, 0x63, 0xeb, 0x57, 0x80, 0x1d, 0x55, 0x52, 0x59, 0x90, 0x5a, 0x9c, 0xc4, 0x06, 0x76, 0x93, + 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0x69, 0x6e, 0x73, 0x3d, 0xb0, 0x00, 0x00, 0x00, } func (m *PairID) Marshal() (dAtA []byte, err error) { diff --git a/x/dex/types/params.pb.go b/x/dex/types/params.pb.go index 968ad5740..8ec299924 100644 --- a/x/dex/types/params.pb.go +++ b/x/dex/types/params.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: duality/dex/params.proto +// source: neutron/dex/params.proto package types @@ -31,7 +31,7 @@ type Params struct { func (m *Params) Reset() { *m = Params{} } func (*Params) ProtoMessage() {} func (*Params) Descriptor() ([]byte, []int) { - return fileDescriptor_0d9808a9c3c4a621, []int{0} + return fileDescriptor_84a6bffcfc21009c, []int{0} } func (m *Params) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -68,24 +68,24 @@ func (m *Params) GetFeeTiers() []uint64 { } func init() { - proto.RegisterType((*Params)(nil), "duality.dex.Params") + proto.RegisterType((*Params)(nil), "neutron.dex.Params") } -func init() { proto.RegisterFile("duality/dex/params.proto", fileDescriptor_0d9808a9c3c4a621) } +func init() { proto.RegisterFile("neutron/dex/params.proto", fileDescriptor_84a6bffcfc21009c) } -var fileDescriptor_0d9808a9c3c4a621 = []byte{ - // 174 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x48, 0x29, 0x4d, 0xcc, - 0xc9, 0x2c, 0xa9, 0xd4, 0x4f, 0x49, 0xad, 0xd0, 0x2f, 0x48, 0x2c, 0x4a, 0xcc, 0x2d, 0xd6, 0x2b, +var fileDescriptor_84a6bffcfc21009c = []byte{ + // 173 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xc8, 0x4b, 0x2d, 0x2d, + 0x29, 0xca, 0xcf, 0xd3, 0x4f, 0x49, 0xad, 0xd0, 0x2f, 0x48, 0x2c, 0x4a, 0xcc, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x86, 0xca, 0xe8, 0xa5, 0xa4, 0x56, 0x48, 0x89, 0xa4, 0xe7, 0xa7, 0xe7, 0x83, 0xc5, 0xf5, 0x41, 0x2c, 0x88, 0x12, 0x25, 0x6d, 0x2e, 0xb6, 0x00, 0xb0, 0x16, 0x21, 0x69, 0x2e, 0xce, 0xb4, 0xd4, 0xd4, 0xf8, 0x92, 0xcc, 0xd4, 0xa2, 0x62, 0x09, 0x46, 0x05, 0x66, 0x0d, 0x96, 0x20, 0x8e, 0xb4, 0xd4, 0xd4, 0x10, 0x10, 0xdf, 0x8a, 0x65, 0xc6, 0x02, 0x79, - 0x06, 0x27, 0xd7, 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, 0x4e, 0xcf, - 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x87, 0x5a, 0xaa, 0x9b, 0x93, 0x98, 0x54, - 0x0c, 0xe3, 0xe8, 0x57, 0x80, 0x5d, 0x57, 0x52, 0x59, 0x90, 0x5a, 0x9c, 0xc4, 0x06, 0xb6, 0xda, - 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0x16, 0x5d, 0xd1, 0xc7, 0xb9, 0x00, 0x00, 0x00, + 0x06, 0x27, 0x97, 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, 0x4a, 0xcf, + 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x87, 0x5a, 0xaa, 0x9b, 0x5f, 0x94, 0x0e, + 0x63, 0xeb, 0x57, 0x80, 0x1d, 0x57, 0x52, 0x59, 0x90, 0x5a, 0x9c, 0xc4, 0x06, 0xb6, 0xd9, 0x18, + 0x10, 0x00, 0x00, 0xff, 0xff, 0x6a, 0x44, 0xce, 0x46, 0xb8, 0x00, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { diff --git a/x/dex/types/pool.pb.go b/x/dex/types/pool.pb.go index bfacf593e..7824ad7d1 100644 --- a/x/dex/types/pool.pb.go +++ b/x/dex/types/pool.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: duality/dex/pool.proto +// source: neutron/dex/pool.proto package types @@ -33,7 +33,7 @@ func (m *Pool) Reset() { *m = Pool{} } func (m *Pool) String() string { return proto.CompactTextString(m) } func (*Pool) ProtoMessage() {} func (*Pool) Descriptor() ([]byte, []int) { - return fileDescriptor_458bee7d4cc3fc09, []int{0} + return fileDescriptor_6ad7a9165eac1fde, []int{0} } func (m *Pool) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -84,15 +84,15 @@ func (m *Pool) GetUpperTick1() *PoolReserves { } func init() { - proto.RegisterType((*Pool)(nil), "duality.dex.Pool") + proto.RegisterType((*Pool)(nil), "neutron.dex.Pool") } -func init() { proto.RegisterFile("duality/dex/pool.proto", fileDescriptor_458bee7d4cc3fc09) } +func init() { proto.RegisterFile("neutron/dex/pool.proto", fileDescriptor_6ad7a9165eac1fde) } -var fileDescriptor_458bee7d4cc3fc09 = []byte{ - // 229 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x4b, 0x29, 0x4d, 0xcc, - 0xc9, 0x2c, 0xa9, 0xd4, 0x4f, 0x49, 0xad, 0xd0, 0x2f, 0xc8, 0xcf, 0xcf, 0xd1, 0x2b, 0x28, 0xca, +var fileDescriptor_6ad7a9165eac1fde = []byte{ + // 228 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0xcb, 0x4b, 0x2d, 0x2d, + 0x29, 0xca, 0xcf, 0xd3, 0x4f, 0x49, 0xad, 0xd0, 0x2f, 0xc8, 0xcf, 0xcf, 0xd1, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x86, 0x8a, 0xeb, 0xa5, 0xa4, 0x56, 0x48, 0x89, 0xa4, 0xe7, 0xa7, 0xe7, 0x83, 0xc5, 0xf5, 0x41, 0x2c, 0x88, 0x12, 0x29, 0x79, 0x74, 0xad, 0xf1, 0x45, 0xa9, 0xc5, 0xa9, 0x45, 0x65, 0xa9, 0xc5, 0x10, 0x05, 0x4a, 0x7d, 0x8c, 0x5c, 0x2c, 0x01, 0xf9, 0xf9, 0x39, 0x42, @@ -100,12 +100,12 @@ var fileDescriptor_458bee7d4cc3fc09 = []byte{ 0x56, 0x5c, 0xdc, 0x39, 0xf9, 0xe5, 0xa9, 0x45, 0xf1, 0x25, 0x99, 0xc9, 0xd9, 0x06, 0x12, 0x4c, 0x0a, 0x8c, 0x1a, 0xdc, 0x46, 0x92, 0x7a, 0x48, 0x56, 0xea, 0x81, 0xf4, 0x05, 0x41, 0x8d, 0x0b, 0xe2, 0x02, 0xab, 0x0e, 0x01, 0x29, 0x06, 0xe9, 0x2d, 0x2d, 0x28, 0x80, 0xea, 0x35, 0x94, 0x60, - 0x26, 0xa8, 0x17, 0xac, 0x1a, 0xa4, 0xd7, 0xd0, 0xc9, 0xf5, 0xc4, 0x23, 0x39, 0xc6, 0x0b, 0x8f, + 0x26, 0xa8, 0x17, 0xac, 0x1a, 0xa4, 0xd7, 0xd0, 0xc9, 0xe5, 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, 0xb4, 0xd3, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xf5, - 0xa1, 0x46, 0xe9, 0xe6, 0x24, 0x26, 0x15, 0xc3, 0x38, 0xfa, 0x15, 0x60, 0x5f, 0x96, 0x54, 0x16, - 0xa4, 0x16, 0x27, 0xb1, 0x81, 0xbd, 0x67, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x8e, 0x0b, 0xf6, - 0xad, 0x3c, 0x01, 0x00, 0x00, + 0x8f, 0xe5, 0x18, 0xa2, 0xb4, 0xd2, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xf5, + 0xa1, 0x46, 0xe9, 0xe6, 0x17, 0xa5, 0xc3, 0xd8, 0xfa, 0x15, 0x60, 0x4f, 0x96, 0x54, 0x16, 0xa4, + 0x16, 0x27, 0xb1, 0x81, 0x7d, 0x67, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x3a, 0x23, 0x45, 0x18, + 0x3b, 0x01, 0x00, 0x00, } func (m *Pool) Marshal() (dAtA []byte, err error) { diff --git a/x/dex/types/pool_metadata.pb.go b/x/dex/types/pool_metadata.pb.go index 610f79cfc..91d5a3654 100644 --- a/x/dex/types/pool_metadata.pb.go +++ b/x/dex/types/pool_metadata.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: duality/dex/pool_metadata.proto +// source: neutron/dex/pool_metadata.proto package types @@ -33,7 +33,7 @@ func (m *PoolMetadata) Reset() { *m = PoolMetadata{} } func (m *PoolMetadata) String() string { return proto.CompactTextString(m) } func (*PoolMetadata) ProtoMessage() {} func (*PoolMetadata) Descriptor() ([]byte, []int) { - return fileDescriptor_20ad68f12715e384, []int{0} + return fileDescriptor_c2ee8eaeac9c06d8, []int{0} } func (m *PoolMetadata) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -91,15 +91,15 @@ func (m *PoolMetadata) GetPairID() *PairID { } func init() { - proto.RegisterType((*PoolMetadata)(nil), "duality.dex.PoolMetadata") + proto.RegisterType((*PoolMetadata)(nil), "neutron.dex.PoolMetadata") } -func init() { proto.RegisterFile("duality/dex/pool_metadata.proto", fileDescriptor_20ad68f12715e384) } +func init() { proto.RegisterFile("neutron/dex/pool_metadata.proto", fileDescriptor_c2ee8eaeac9c06d8) } -var fileDescriptor_20ad68f12715e384 = []byte{ - // 224 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4f, 0x29, 0x4d, 0xcc, - 0xc9, 0x2c, 0xa9, 0xd4, 0x4f, 0x49, 0xad, 0xd0, 0x2f, 0xc8, 0xcf, 0xcf, 0x89, 0xcf, 0x4d, 0x2d, +var fileDescriptor_c2ee8eaeac9c06d8 = []byte{ + // 223 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xcf, 0x4b, 0x2d, 0x2d, + 0x29, 0xca, 0xcf, 0xd3, 0x4f, 0x49, 0xad, 0xd0, 0x2f, 0xc8, 0xcf, 0xcf, 0x89, 0xcf, 0x4d, 0x2d, 0x49, 0x4c, 0x49, 0x2c, 0x49, 0xd4, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x86, 0x2a, 0xd0, 0x4b, 0x49, 0xad, 0x90, 0x92, 0x44, 0x51, 0x9d, 0x98, 0x59, 0x14, 0x9f, 0x99, 0x02, 0x51, 0xa7, 0x54, 0xc8, 0xc5, 0x13, 0x90, 0x9f, 0x9f, 0xe3, 0x0b, 0xd5, 0x2d, 0xc4, 0xc7, 0xc5, 0xe4, 0xe9, @@ -107,11 +107,11 @@ var fileDescriptor_20ad68f12715e384 = []byte{ 0x99, 0x9c, 0x2d, 0xc1, 0xa4, 0xc0, 0xa8, 0xc1, 0x1c, 0x04, 0x66, 0x0b, 0x09, 0x70, 0x31, 0xa7, 0xa5, 0xa6, 0x4a, 0x30, 0x83, 0x15, 0x81, 0x98, 0x42, 0xda, 0x5c, 0x6c, 0x20, 0x63, 0x3d, 0x5d, 0x24, 0x58, 0x14, 0x18, 0x35, 0xb8, 0x8d, 0x84, 0xf5, 0x90, 0xac, 0xd7, 0x0b, 0x00, 0x4b, 0x05, - 0x41, 0x95, 0x38, 0xb9, 0x9e, 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, 0x76, - 0x7a, 0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, 0x7e, 0xae, 0x3e, 0xd4, 0x00, 0xdd, 0x9c, 0xc4, - 0xa4, 0x62, 0x18, 0x47, 0xbf, 0x02, 0xec, 0x83, 0x92, 0xca, 0x82, 0xd4, 0xe2, 0x24, 0x36, 0xb0, - 0x07, 0x8c, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x45, 0x67, 0x83, 0xda, 0x0b, 0x01, 0x00, 0x00, + 0x41, 0x95, 0x38, 0xb9, 0x9c, 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, 0x56, + 0x7a, 0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, 0x7e, 0xae, 0x3e, 0xd4, 0x00, 0xdd, 0xfc, 0xa2, + 0x74, 0x18, 0x5b, 0xbf, 0x02, 0xec, 0x81, 0x92, 0xca, 0x82, 0xd4, 0xe2, 0x24, 0x36, 0xb0, 0xfb, + 0x8d, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x0c, 0xa8, 0xc5, 0x28, 0x0a, 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 b2020007b..eab47e55b 100644 --- a/x/dex/types/pool_reserves.pb.go +++ b/x/dex/types/pool_reserves.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: duality/dex/pool_reserves.proto +// source: neutron/dex/pool_reserves.proto package types @@ -8,7 +8,7 @@ import ( github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" - github_com_duality_labs_duality_utils_math "github.com/neutron-org/neutron/utils/math" + github_com_neutron_org_neutron_utils_math "github.com/neutron-org/neutron/utils/math" io "io" math "math" math_bits "math/bits" @@ -35,7 +35,7 @@ func (m *PoolReservesKey) Reset() { *m = PoolReservesKey{} } func (m *PoolReservesKey) String() string { return proto.CompactTextString(m) } func (*PoolReservesKey) ProtoMessage() {} func (*PoolReservesKey) Descriptor() ([]byte, []int) { - return fileDescriptor_d37077b416662cb1, []int{0} + return fileDescriptor_f0fe9f734c7ad538, []int{0} } func (m *PoolReservesKey) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -86,17 +86,17 @@ func (m *PoolReservesKey) GetFee() uint64 { } type PoolReserves struct { - Key *PoolReservesKey `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"` - ReservesMakerDenom github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,opt,name=reservesMakerDenom,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"reservesMakerDenom" yaml:"reservesMakerDenom"` - PriceTakerToMaker github_com_duality_labs_duality_utils_math.PrecDec `protobuf:"bytes,3,opt,name=priceTakerToMaker,proto3,customtype=github.com/neutron-org/neutron/utils/math.PrecDec" json:"priceTakerToMaker" yaml:"priceTakerToMaker"` - PriceOppositeTakerToMaker github_com_duality_labs_duality_utils_math.PrecDec `protobuf:"bytes,4,opt,name=priceOppositeTakerToMaker,proto3,customtype=github.com/neutron-org/neutron/utils/math.PrecDec" json:"priceOppositeTakerToMaker" yaml:"priceOppositeTakerToMaker"` + Key *PoolReservesKey `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"` + ReservesMakerDenom github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,opt,name=reservesMakerDenom,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"reservesMakerDenom" yaml:"reservesMakerDenom"` + PriceTakerToMaker github_com_neutron_org_neutron_utils_math.PrecDec `protobuf:"bytes,3,opt,name=priceTakerToMaker,proto3,customtype=github.com/neutron-org/neutron/utils/math.PrecDec" json:"priceTakerToMaker" yaml:"priceTakerToMaker"` + PriceOppositeTakerToMaker github_com_neutron_org_neutron_utils_math.PrecDec `protobuf:"bytes,4,opt,name=priceOppositeTakerToMaker,proto3,customtype=github.com/neutron-org/neutron/utils/math.PrecDec" json:"priceOppositeTakerToMaker" yaml:"priceOppositeTakerToMaker"` } func (m *PoolReserves) Reset() { *m = PoolReserves{} } func (m *PoolReserves) String() string { return proto.CompactTextString(m) } func (*PoolReserves) ProtoMessage() {} func (*PoolReserves) Descriptor() ([]byte, []int) { - return fileDescriptor_d37077b416662cb1, []int{1} + return fileDescriptor_f0fe9f734c7ad538, []int{1} } func (m *PoolReserves) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -133,42 +133,42 @@ func (m *PoolReserves) GetKey() *PoolReservesKey { } func init() { - proto.RegisterType((*PoolReservesKey)(nil), "duality.dex.PoolReservesKey") - proto.RegisterType((*PoolReserves)(nil), "duality.dex.PoolReserves") + proto.RegisterType((*PoolReservesKey)(nil), "neutron.dex.PoolReservesKey") + proto.RegisterType((*PoolReserves)(nil), "neutron.dex.PoolReserves") } -func init() { proto.RegisterFile("duality/dex/pool_reserves.proto", fileDescriptor_d37077b416662cb1) } +func init() { proto.RegisterFile("neutron/dex/pool_reserves.proto", fileDescriptor_f0fe9f734c7ad538) } -var fileDescriptor_d37077b416662cb1 = []byte{ - // 441 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x93, 0xc1, 0x8a, 0xd3, 0x40, - 0x18, 0xc7, 0x3b, 0xa6, 0x08, 0x4e, 0x05, 0x75, 0x50, 0xc8, 0x2e, 0x92, 0x94, 0x1c, 0xa4, 0x20, - 0x3b, 0x81, 0xd5, 0xd3, 0x1e, 0x97, 0x2a, 0x14, 0x11, 0xcb, 0xd0, 0x93, 0x97, 0x32, 0x4d, 0x3e, - 0xba, 0x43, 0x92, 0x4e, 0x98, 0x99, 0x4a, 0x83, 0x2f, 0xa1, 0x07, 0x0f, 0xbe, 0x82, 0x6f, 0xe0, - 0x1b, 0xec, 0x71, 0x8f, 0xe2, 0x21, 0x48, 0x7b, 0xdb, 0x63, 0x9f, 0x40, 0x32, 0xcd, 0x62, 0x6a, - 0xb3, 0x78, 0xf0, 0x34, 0x93, 0xf9, 0x7e, 0xf3, 0x9f, 0x5f, 0x66, 0xf8, 0xb0, 0x1f, 0x2f, 0x79, - 0x2a, 0x4c, 0x11, 0xc6, 0xb0, 0x0a, 0x73, 0x29, 0xd3, 0xa9, 0x02, 0x0d, 0xea, 0x03, 0x68, 0x9a, - 0x2b, 0x69, 0x24, 0xe9, 0xd5, 0x00, 0x8d, 0x61, 0x75, 0xfc, 0x78, 0x2e, 0xe7, 0xd2, 0xae, 0x87, - 0xd5, 0x6c, 0x87, 0x1c, 0xef, 0x65, 0x18, 0xc5, 0x63, 0x98, 0xe6, 0x5c, 0xa8, 0xa9, 0x88, 0x77, - 0x40, 0xf0, 0x05, 0xe1, 0x07, 0x63, 0x29, 0x53, 0x56, 0x47, 0xbf, 0x81, 0x82, 0x9c, 0xe1, 0x9e, - 0x45, 0xc7, 0x5c, 0xa8, 0xd1, 0xd0, 0x45, 0x7d, 0x34, 0xe8, 0x9d, 0xba, 0xb4, 0x71, 0x1a, 0x9d, - 0xfc, 0xa9, 0xb3, 0x26, 0x4c, 0x5e, 0xe2, 0x27, 0x13, 0x11, 0x25, 0xa3, 0x45, 0x0c, 0xab, 0x09, - 0x4f, 0x40, 0x4d, 0xe4, 0xdb, 0x6a, 0x70, 0xef, 0xf4, 0xd1, 0xc0, 0x61, 0xed, 0x45, 0xf2, 0x10, - 0x3b, 0xaf, 0x01, 0x5c, 0xa7, 0x8f, 0x06, 0x5d, 0x56, 0x4d, 0x83, 0x6f, 0x5d, 0x7c, 0xbf, 0xe9, - 0x45, 0x28, 0x76, 0x12, 0x28, 0x6a, 0x99, 0xa7, 0x7b, 0x32, 0x7f, 0xf9, 0xb3, 0x0a, 0x24, 0x9f, - 0x11, 0x26, 0x37, 0xf7, 0x65, 0x0f, 0x19, 0xc2, 0x42, 0x66, 0x56, 0xe3, 0xde, 0x39, 0xbf, 0x2c, - 0xfd, 0xce, 0xcf, 0xd2, 0x7f, 0x36, 0x17, 0xe6, 0x62, 0x39, 0xa3, 0x91, 0xcc, 0xc2, 0x48, 0xea, - 0x4c, 0xea, 0x7a, 0x38, 0xd1, 0x71, 0x12, 0x9a, 0x22, 0x07, 0x4d, 0x47, 0x0b, 0x73, 0x5d, 0xfa, - 0x2d, 0x59, 0xdb, 0xd2, 0x3f, 0x2a, 0x78, 0x96, 0x9e, 0x05, 0x87, 0xb5, 0x80, 0xb5, 0x6c, 0x20, - 0x5f, 0x11, 0x7e, 0x94, 0x2b, 0x11, 0xc1, 0xde, 0xcd, 0x38, 0x56, 0x29, 0xa9, 0x95, 0x4e, 0x1b, - 0x4a, 0xf5, 0x4f, 0x9e, 0xa4, 0x7c, 0xa6, 0x6f, 0x3e, 0xc2, 0xa5, 0x11, 0xa9, 0x0e, 0x33, 0x6e, - 0x2e, 0xe8, 0x58, 0x41, 0x34, 0x84, 0xe8, 0xba, 0xf4, 0x0f, 0x63, 0xb7, 0xa5, 0xef, 0xee, 0xec, - 0x0e, 0x4a, 0x01, 0x3b, 0xc4, 0xc9, 0x77, 0x84, 0x8f, 0xec, 0xea, 0xbb, 0x3c, 0x97, 0x5a, 0x98, - 0x7d, 0xc7, 0xae, 0x75, 0xfc, 0xf8, 0x5f, 0x8e, 0xb7, 0xc7, 0x6f, 0x4b, 0xbf, 0xdf, 0x70, 0x6d, - 0x43, 0x02, 0x76, 0xfb, 0xf6, 0xf3, 0x57, 0x97, 0x6b, 0x0f, 0x5d, 0xad, 0x3d, 0xf4, 0x6b, 0xed, - 0xa1, 0x4f, 0x1b, 0xaf, 0x73, 0xb5, 0xf1, 0x3a, 0x3f, 0x36, 0x5e, 0xe7, 0xfd, 0xf3, 0x7f, 0x99, - 0xae, 0x76, 0x9d, 0x51, 0xbd, 0xf4, 0xec, 0xae, 0x6d, 0x89, 0x17, 0xbf, 0x03, 0x00, 0x00, 0xff, - 0xff, 0x92, 0xad, 0x36, 0xbf, 0x79, 0x03, 0x00, 0x00, +var fileDescriptor_f0fe9f734c7ad538 = []byte{ + // 440 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x93, 0x4f, 0x8b, 0xd3, 0x40, + 0x18, 0x87, 0x3b, 0xa6, 0x08, 0x4e, 0x05, 0x75, 0x50, 0xc8, 0x2e, 0x92, 0x94, 0x1c, 0xa4, 0x08, + 0x3b, 0xc1, 0x3f, 0xa7, 0x3d, 0x2e, 0x45, 0x28, 0x22, 0x96, 0xa1, 0x27, 0x2f, 0x25, 0x9b, 0xbc, + 0x74, 0xc7, 0x36, 0x79, 0xc3, 0xcc, 0x54, 0x5a, 0x3f, 0x85, 0x1e, 0x04, 0x3f, 0x82, 0x1f, 0xc1, + 0x8f, 0xb0, 0xc7, 0x3d, 0x8a, 0x87, 0x20, 0xed, 0x6d, 0x8f, 0xfd, 0x04, 0x92, 0x69, 0x16, 0x53, + 0x9b, 0xe2, 0xc1, 0xd3, 0xbc, 0xcc, 0xfb, 0xcc, 0x6f, 0x9e, 0x4c, 0x78, 0xa9, 0x9f, 0xc1, 0xdc, + 0x28, 0xcc, 0xc2, 0x04, 0x16, 0x61, 0x8e, 0x38, 0x1b, 0x2b, 0xd0, 0xa0, 0x3e, 0x80, 0xe6, 0xb9, + 0x42, 0x83, 0xac, 0x53, 0x01, 0x3c, 0x81, 0xc5, 0xf1, 0xc3, 0x09, 0x4e, 0xd0, 0xee, 0x87, 0x65, + 0xb5, 0x45, 0x8e, 0x77, 0x32, 0x8c, 0x8a, 0x12, 0x18, 0xe7, 0x91, 0x54, 0x63, 0x99, 0x6c, 0x81, + 0xe0, 0x0b, 0xa1, 0xf7, 0x86, 0x88, 0x33, 0x51, 0x45, 0xbf, 0x86, 0x25, 0x3b, 0xa5, 0x1d, 0x8b, + 0x0e, 0x23, 0xa9, 0x06, 0x7d, 0x97, 0x74, 0x49, 0xaf, 0xf3, 0xdc, 0xe5, 0xb5, 0xdb, 0xf8, 0xe8, + 0x4f, 0x5f, 0xd4, 0x61, 0xf6, 0x92, 0x3e, 0x1a, 0xc9, 0x78, 0x3a, 0xc8, 0x12, 0x58, 0x8c, 0xa2, + 0x29, 0xa8, 0x11, 0xbe, 0x29, 0x17, 0xf7, 0x56, 0x97, 0xf4, 0x1c, 0xd1, 0xdc, 0x64, 0xf7, 0xa9, + 0xf3, 0x0a, 0xc0, 0x75, 0xba, 0xa4, 0xd7, 0x16, 0x65, 0x19, 0x7c, 0x6b, 0xd3, 0xbb, 0x75, 0x2f, + 0xc6, 0xa9, 0x33, 0x85, 0x65, 0x25, 0xf3, 0x78, 0x47, 0xe6, 0x2f, 0x7f, 0x51, 0x82, 0xec, 0x33, + 0xa1, 0xec, 0xe6, 0xbd, 0xec, 0x25, 0x7d, 0xc8, 0x30, 0xb5, 0x1a, 0x77, 0xce, 0xa2, 0xcb, 0xc2, + 0x6f, 0xfd, 0x2c, 0xfc, 0x27, 0x13, 0x69, 0x2e, 0xe6, 0xe7, 0x3c, 0xc6, 0x34, 0x8c, 0x51, 0xa7, + 0xa8, 0xab, 0xe5, 0x44, 0x27, 0xd3, 0xd0, 0x2c, 0x73, 0xd0, 0x7c, 0x90, 0x99, 0xeb, 0xc2, 0x6f, + 0xc8, 0xda, 0x14, 0xfe, 0xd1, 0x32, 0x4a, 0x67, 0xa7, 0xc1, 0x7e, 0x2f, 0x10, 0x0d, 0x07, 0xd8, + 0x57, 0x42, 0x1f, 0xe4, 0x4a, 0xc6, 0xb0, 0xf3, 0x32, 0x8e, 0x55, 0x7a, 0x5f, 0x29, 0x3d, 0xab, + 0x29, 0x55, 0x1f, 0x79, 0x82, 0x6a, 0x72, 0x53, 0x87, 0x73, 0x23, 0x67, 0x3a, 0x4c, 0x23, 0x73, + 0xc1, 0x87, 0x0a, 0xe2, 0x3e, 0xc4, 0xd7, 0x85, 0xbf, 0x9f, 0xba, 0x29, 0x7c, 0x77, 0x2b, 0xb7, + 0xd7, 0x0a, 0xc4, 0x3e, 0xce, 0xbe, 0x13, 0x7a, 0x64, 0x77, 0xdf, 0xe6, 0x39, 0x6a, 0x69, 0x76, + 0x15, 0xdb, 0x56, 0xf1, 0xe3, 0xff, 0x28, 0x1e, 0x4e, 0xdf, 0x14, 0x7e, 0xb7, 0xa6, 0xda, 0x84, + 0x04, 0xe2, 0xf0, 0xf1, 0xb3, 0xfe, 0xe5, 0xca, 0x23, 0x57, 0x2b, 0x8f, 0xfc, 0x5a, 0x79, 0xe4, + 0xd3, 0xda, 0x6b, 0x5d, 0xad, 0xbd, 0xd6, 0x8f, 0xb5, 0xd7, 0x7a, 0xf7, 0xf4, 0x1f, 0xa2, 0x8b, + 0xed, 0x58, 0x94, 0xbf, 0xf9, 0xfc, 0xb6, 0x9d, 0x87, 0x17, 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, + 0xfb, 0xee, 0x71, 0xc4, 0x76, 0x03, 0x00, 0x00, } func (m *PoolReservesKey) Marshal() (dAtA []byte, err error) { diff --git a/x/dex/types/query.pb.go b/x/dex/types/query.pb.go index dc5b5d9ac..b2537e353 100644 --- a/x/dex/types/query.pb.go +++ b/x/dex/types/query.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: duality/dex/query.proto +// source: neutron/dex/query.proto package types @@ -13,7 +13,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_duality_labs_duality_utils_math "github.com/neutron-org/neutron/utils/math" + github_com_neutron_org_neutron_utils_math "github.com/neutron-org/neutron/utils/math" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" @@ -45,7 +45,7 @@ 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_4664128fddcf2b7a, []int{0} + return fileDescriptor_b6613ea5fce61e9c, []int{0} } func (m *QueryParamsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -84,7 +84,7 @@ 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_4664128fddcf2b7a, []int{1} + return fileDescriptor_b6613ea5fce61e9c, []int{1} } func (m *QueryParamsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -129,7 +129,7 @@ func (m *QueryGetLimitOrderTrancheUserRequest) Reset() { *m = QueryGetLi func (m *QueryGetLimitOrderTrancheUserRequest) String() string { return proto.CompactTextString(m) } func (*QueryGetLimitOrderTrancheUserRequest) ProtoMessage() {} func (*QueryGetLimitOrderTrancheUserRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_4664128fddcf2b7a, []int{2} + return fileDescriptor_b6613ea5fce61e9c, []int{2} } func (m *QueryGetLimitOrderTrancheUserRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -180,7 +180,7 @@ func (m *QueryGetLimitOrderTrancheUserResponse) Reset() { *m = QueryGetL func (m *QueryGetLimitOrderTrancheUserResponse) String() string { return proto.CompactTextString(m) } func (*QueryGetLimitOrderTrancheUserResponse) ProtoMessage() {} func (*QueryGetLimitOrderTrancheUserResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_4664128fddcf2b7a, []int{3} + return fileDescriptor_b6613ea5fce61e9c, []int{3} } func (m *QueryGetLimitOrderTrancheUserResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -224,7 +224,7 @@ func (m *QueryAllLimitOrderTrancheUserRequest) Reset() { *m = QueryAllLi func (m *QueryAllLimitOrderTrancheUserRequest) String() string { return proto.CompactTextString(m) } func (*QueryAllLimitOrderTrancheUserRequest) ProtoMessage() {} func (*QueryAllLimitOrderTrancheUserRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_4664128fddcf2b7a, []int{4} + return fileDescriptor_b6613ea5fce61e9c, []int{4} } func (m *QueryAllLimitOrderTrancheUserRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -269,7 +269,7 @@ func (m *QueryAllLimitOrderTrancheUserResponse) Reset() { *m = QueryAllL func (m *QueryAllLimitOrderTrancheUserResponse) String() string { return proto.CompactTextString(m) } func (*QueryAllLimitOrderTrancheUserResponse) ProtoMessage() {} func (*QueryAllLimitOrderTrancheUserResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_4664128fddcf2b7a, []int{5} + return fileDescriptor_b6613ea5fce61e9c, []int{5} } func (m *QueryAllLimitOrderTrancheUserResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -323,7 +323,7 @@ func (m *QueryGetLimitOrderTrancheRequest) Reset() { *m = QueryGetLimitO func (m *QueryGetLimitOrderTrancheRequest) String() string { return proto.CompactTextString(m) } func (*QueryGetLimitOrderTrancheRequest) ProtoMessage() {} func (*QueryGetLimitOrderTrancheRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_4664128fddcf2b7a, []int{6} + return fileDescriptor_b6613ea5fce61e9c, []int{6} } func (m *QueryGetLimitOrderTrancheRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -388,7 +388,7 @@ func (m *QueryGetLimitOrderTrancheResponse) Reset() { *m = QueryGetLimit func (m *QueryGetLimitOrderTrancheResponse) String() string { return proto.CompactTextString(m) } func (*QueryGetLimitOrderTrancheResponse) ProtoMessage() {} func (*QueryGetLimitOrderTrancheResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_4664128fddcf2b7a, []int{7} + return fileDescriptor_b6613ea5fce61e9c, []int{7} } func (m *QueryGetLimitOrderTrancheResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -434,7 +434,7 @@ func (m *QueryAllLimitOrderTrancheRequest) Reset() { *m = QueryAllLimitO func (m *QueryAllLimitOrderTrancheRequest) String() string { return proto.CompactTextString(m) } func (*QueryAllLimitOrderTrancheRequest) ProtoMessage() {} func (*QueryAllLimitOrderTrancheRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_4664128fddcf2b7a, []int{8} + return fileDescriptor_b6613ea5fce61e9c, []int{8} } func (m *QueryAllLimitOrderTrancheRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -493,7 +493,7 @@ func (m *QueryAllLimitOrderTrancheResponse) Reset() { *m = QueryAllLimit func (m *QueryAllLimitOrderTrancheResponse) String() string { return proto.CompactTextString(m) } func (*QueryAllLimitOrderTrancheResponse) ProtoMessage() {} func (*QueryAllLimitOrderTrancheResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_4664128fddcf2b7a, []int{9} + return fileDescriptor_b6613ea5fce61e9c, []int{9} } func (m *QueryAllLimitOrderTrancheResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -545,7 +545,7 @@ func (m *QueryAllUserDepositsRequest) Reset() { *m = QueryAllUserDeposit func (m *QueryAllUserDepositsRequest) String() string { return proto.CompactTextString(m) } func (*QueryAllUserDepositsRequest) ProtoMessage() {} func (*QueryAllUserDepositsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_4664128fddcf2b7a, []int{10} + return fileDescriptor_b6613ea5fce61e9c, []int{10} } func (m *QueryAllUserDepositsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -597,7 +597,7 @@ func (m *QueryAllUserDepositsResponse) Reset() { *m = QueryAllUserDeposi func (m *QueryAllUserDepositsResponse) String() string { return proto.CompactTextString(m) } func (*QueryAllUserDepositsResponse) ProtoMessage() {} func (*QueryAllUserDepositsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_4664128fddcf2b7a, []int{11} + return fileDescriptor_b6613ea5fce61e9c, []int{11} } func (m *QueryAllUserDepositsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -649,7 +649,7 @@ func (m *QueryAllUserLimitOrdersRequest) Reset() { *m = QueryAllUserLimi func (m *QueryAllUserLimitOrdersRequest) String() string { return proto.CompactTextString(m) } func (*QueryAllUserLimitOrdersRequest) ProtoMessage() {} func (*QueryAllUserLimitOrdersRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_4664128fddcf2b7a, []int{12} + return fileDescriptor_b6613ea5fce61e9c, []int{12} } func (m *QueryAllUserLimitOrdersRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -701,7 +701,7 @@ func (m *QueryAllUserLimitOrdersResponse) Reset() { *m = QueryAllUserLim func (m *QueryAllUserLimitOrdersResponse) String() string { return proto.CompactTextString(m) } func (*QueryAllUserLimitOrdersResponse) ProtoMessage() {} func (*QueryAllUserLimitOrdersResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_4664128fddcf2b7a, []int{13} + return fileDescriptor_b6613ea5fce61e9c, []int{13} } func (m *QueryAllUserLimitOrdersResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -754,7 +754,7 @@ func (m *QueryAllTickLiquidityRequest) Reset() { *m = QueryAllTickLiquid func (m *QueryAllTickLiquidityRequest) String() string { return proto.CompactTextString(m) } func (*QueryAllTickLiquidityRequest) ProtoMessage() {} func (*QueryAllTickLiquidityRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_4664128fddcf2b7a, []int{14} + return fileDescriptor_b6613ea5fce61e9c, []int{14} } func (m *QueryAllTickLiquidityRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -813,7 +813,7 @@ func (m *QueryAllTickLiquidityResponse) Reset() { *m = QueryAllTickLiqui func (m *QueryAllTickLiquidityResponse) String() string { return proto.CompactTextString(m) } func (*QueryAllTickLiquidityResponse) ProtoMessage() {} func (*QueryAllTickLiquidityResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_4664128fddcf2b7a, []int{15} + return fileDescriptor_b6613ea5fce61e9c, []int{15} } func (m *QueryAllTickLiquidityResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -869,7 +869,7 @@ func (m *QueryGetInactiveLimitOrderTrancheRequest) Reset() { func (m *QueryGetInactiveLimitOrderTrancheRequest) String() string { return proto.CompactTextString(m) } func (*QueryGetInactiveLimitOrderTrancheRequest) ProtoMessage() {} func (*QueryGetInactiveLimitOrderTrancheRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_4664128fddcf2b7a, []int{16} + return fileDescriptor_b6613ea5fce61e9c, []int{16} } func (m *QueryGetInactiveLimitOrderTrancheRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -938,7 +938,7 @@ func (m *QueryGetInactiveLimitOrderTrancheResponse) String() string { } func (*QueryGetInactiveLimitOrderTrancheResponse) ProtoMessage() {} func (*QueryGetInactiveLimitOrderTrancheResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_4664128fddcf2b7a, []int{17} + return fileDescriptor_b6613ea5fce61e9c, []int{17} } func (m *QueryGetInactiveLimitOrderTrancheResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -984,7 +984,7 @@ func (m *QueryAllInactiveLimitOrderTrancheRequest) Reset() { func (m *QueryAllInactiveLimitOrderTrancheRequest) String() string { return proto.CompactTextString(m) } func (*QueryAllInactiveLimitOrderTrancheRequest) ProtoMessage() {} func (*QueryAllInactiveLimitOrderTrancheRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_4664128fddcf2b7a, []int{18} + return fileDescriptor_b6613ea5fce61e9c, []int{18} } func (m *QueryAllInactiveLimitOrderTrancheRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1033,7 +1033,7 @@ func (m *QueryAllInactiveLimitOrderTrancheResponse) String() string { } func (*QueryAllInactiveLimitOrderTrancheResponse) ProtoMessage() {} func (*QueryAllInactiveLimitOrderTrancheResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_4664128fddcf2b7a, []int{19} + return fileDescriptor_b6613ea5fce61e9c, []int{19} } func (m *QueryAllInactiveLimitOrderTrancheResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1086,7 +1086,7 @@ func (m *QueryAllPoolReservesRequest) Reset() { *m = QueryAllPoolReserve func (m *QueryAllPoolReservesRequest) String() string { return proto.CompactTextString(m) } func (*QueryAllPoolReservesRequest) ProtoMessage() {} func (*QueryAllPoolReservesRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_4664128fddcf2b7a, []int{20} + return fileDescriptor_b6613ea5fce61e9c, []int{20} } func (m *QueryAllPoolReservesRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1145,7 +1145,7 @@ func (m *QueryAllPoolReservesResponse) Reset() { *m = QueryAllPoolReserv func (m *QueryAllPoolReservesResponse) String() string { return proto.CompactTextString(m) } func (*QueryAllPoolReservesResponse) ProtoMessage() {} func (*QueryAllPoolReservesResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_4664128fddcf2b7a, []int{21} + return fileDescriptor_b6613ea5fce61e9c, []int{21} } func (m *QueryAllPoolReservesResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1199,7 +1199,7 @@ func (m *QueryGetPoolReservesRequest) Reset() { *m = QueryGetPoolReserve func (m *QueryGetPoolReservesRequest) String() string { return proto.CompactTextString(m) } func (*QueryGetPoolReservesRequest) ProtoMessage() {} func (*QueryGetPoolReservesRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_4664128fddcf2b7a, []int{22} + return fileDescriptor_b6613ea5fce61e9c, []int{22} } func (m *QueryGetPoolReservesRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1264,7 +1264,7 @@ func (m *QueryGetPoolReservesResponse) Reset() { *m = QueryGetPoolReserv func (m *QueryGetPoolReservesResponse) String() string { return proto.CompactTextString(m) } func (*QueryGetPoolReservesResponse) ProtoMessage() {} func (*QueryGetPoolReservesResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_4664128fddcf2b7a, []int{23} + return fileDescriptor_b6613ea5fce61e9c, []int{23} } func (m *QueryGetPoolReservesResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1301,11 +1301,11 @@ func (m *QueryGetPoolReservesResponse) GetPoolReserves() *PoolReserves { } type QueryEstimateMultiHopSwapRequest struct { - 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 github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,4,opt,name=amountIn,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"amountIn" yaml:"amountIn"` - ExitLimitPrice github_com_duality_labs_duality_utils_math.PrecDec `protobuf:"bytes,5,opt,name=exitLimitPrice,proto3,customtype=github.com/neutron-org/neutron/utils/math.PrecDec" json:"exitLimitPrice" yaml:"exitLimitPrice"` + 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 github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,4,opt,name=amountIn,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"amountIn" yaml:"amountIn"` + ExitLimitPrice github_com_neutron_org_neutron_utils_math.PrecDec `protobuf:"bytes,5,opt,name=exitLimitPrice,proto3,customtype=github.com/neutron-org/neutron/utils/math.PrecDec" json:"exitLimitPrice" yaml:"exitLimitPrice"` // 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=pickBestRoute,proto3" json:"pickBestRoute,omitempty"` @@ -1315,7 +1315,7 @@ func (m *QueryEstimateMultiHopSwapRequest) Reset() { *m = QueryEstimateM func (m *QueryEstimateMultiHopSwapRequest) String() string { return proto.CompactTextString(m) } func (*QueryEstimateMultiHopSwapRequest) ProtoMessage() {} func (*QueryEstimateMultiHopSwapRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_4664128fddcf2b7a, []int{24} + return fileDescriptor_b6613ea5fce61e9c, []int{24} } func (m *QueryEstimateMultiHopSwapRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1380,7 +1380,7 @@ func (m *QueryEstimateMultiHopSwapResponse) Reset() { *m = QueryEstimate func (m *QueryEstimateMultiHopSwapResponse) String() string { return proto.CompactTextString(m) } func (*QueryEstimateMultiHopSwapResponse) ProtoMessage() {} func (*QueryEstimateMultiHopSwapResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_4664128fddcf2b7a, []int{25} + return fileDescriptor_b6613ea5fce61e9c, []int{25} } func (m *QueryEstimateMultiHopSwapResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1416,7 +1416,7 @@ type QueryEstimatePlaceLimitOrderRequest struct { TokenOut string `protobuf:"bytes,4,opt,name=tokenOut,proto3" json:"tokenOut,omitempty"` TickIndexInToOut int64 `protobuf:"varint,5,opt,name=tickIndexInToOut,proto3" json:"tickIndexInToOut,omitempty"` AmountIn github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,6,opt,name=amountIn,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"amountIn" yaml:"amountIn"` - OrderType LimitOrderType `protobuf:"varint,7,opt,name=orderType,proto3,enum=duality.dex.LimitOrderType" json:"orderType,omitempty"` + OrderType LimitOrderType `protobuf:"varint,7,opt,name=orderType,proto3,enum=neutron.dex.LimitOrderType" json:"orderType,omitempty"` // expirationTime is only valid iff orderType == GOOD_TIL_TIME. ExpirationTime *time.Time `protobuf:"bytes,8,opt,name=expirationTime,proto3,stdtime" json:"expirationTime,omitempty"` MaxAmountOut *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,9,opt,name=maxAmountOut,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"maxAmountOut" yaml:"maxAmountOut"` @@ -1426,7 +1426,7 @@ func (m *QueryEstimatePlaceLimitOrderRequest) Reset() { *m = QueryEstima func (m *QueryEstimatePlaceLimitOrderRequest) String() string { return proto.CompactTextString(m) } func (*QueryEstimatePlaceLimitOrderRequest) ProtoMessage() {} func (*QueryEstimatePlaceLimitOrderRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_4664128fddcf2b7a, []int{26} + return fileDescriptor_b6613ea5fce61e9c, []int{26} } func (m *QueryEstimatePlaceLimitOrderRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1520,7 +1520,7 @@ func (m *QueryEstimatePlaceLimitOrderResponse) Reset() { *m = QueryEstim func (m *QueryEstimatePlaceLimitOrderResponse) String() string { return proto.CompactTextString(m) } func (*QueryEstimatePlaceLimitOrderResponse) ProtoMessage() {} func (*QueryEstimatePlaceLimitOrderResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_4664128fddcf2b7a, []int{27} + return fileDescriptor_b6613ea5fce61e9c, []int{27} } func (m *QueryEstimatePlaceLimitOrderResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1559,7 +1559,7 @@ func (m *QueryPoolRequest) Reset() { *m = QueryPoolRequest{} } func (m *QueryPoolRequest) String() string { return proto.CompactTextString(m) } func (*QueryPoolRequest) ProtoMessage() {} func (*QueryPoolRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_4664128fddcf2b7a, []int{28} + return fileDescriptor_b6613ea5fce61e9c, []int{28} } func (m *QueryPoolRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1617,7 +1617,7 @@ func (m *QueryPoolByIDRequest) Reset() { *m = QueryPoolByIDRequest{} } func (m *QueryPoolByIDRequest) String() string { return proto.CompactTextString(m) } func (*QueryPoolByIDRequest) ProtoMessage() {} func (*QueryPoolByIDRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_4664128fddcf2b7a, []int{29} + return fileDescriptor_b6613ea5fce61e9c, []int{29} } func (m *QueryPoolByIDRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1661,7 +1661,7 @@ func (m *QueryPoolResponse) Reset() { *m = QueryPoolResponse{} } func (m *QueryPoolResponse) String() string { return proto.CompactTextString(m) } func (*QueryPoolResponse) ProtoMessage() {} func (*QueryPoolResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_4664128fddcf2b7a, []int{30} + return fileDescriptor_b6613ea5fce61e9c, []int{30} } func (m *QueryPoolResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1705,7 +1705,7 @@ func (m *QueryGetPoolMetadataRequest) Reset() { *m = QueryGetPoolMetadat func (m *QueryGetPoolMetadataRequest) String() string { return proto.CompactTextString(m) } func (*QueryGetPoolMetadataRequest) ProtoMessage() {} func (*QueryGetPoolMetadataRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_4664128fddcf2b7a, []int{31} + return fileDescriptor_b6613ea5fce61e9c, []int{31} } func (m *QueryGetPoolMetadataRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1749,7 +1749,7 @@ func (m *QueryGetPoolMetadataResponse) Reset() { *m = QueryGetPoolMetada func (m *QueryGetPoolMetadataResponse) String() string { return proto.CompactTextString(m) } func (*QueryGetPoolMetadataResponse) ProtoMessage() {} func (*QueryGetPoolMetadataResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_4664128fddcf2b7a, []int{32} + return fileDescriptor_b6613ea5fce61e9c, []int{32} } func (m *QueryGetPoolMetadataResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1793,7 +1793,7 @@ func (m *QueryAllPoolMetadataRequest) Reset() { *m = QueryAllPoolMetadat func (m *QueryAllPoolMetadataRequest) String() string { return proto.CompactTextString(m) } func (*QueryAllPoolMetadataRequest) ProtoMessage() {} func (*QueryAllPoolMetadataRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_4664128fddcf2b7a, []int{33} + return fileDescriptor_b6613ea5fce61e9c, []int{33} } func (m *QueryAllPoolMetadataRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1838,7 +1838,7 @@ func (m *QueryAllPoolMetadataResponse) Reset() { *m = QueryAllPoolMetada func (m *QueryAllPoolMetadataResponse) String() string { return proto.CompactTextString(m) } func (*QueryAllPoolMetadataResponse) ProtoMessage() {} func (*QueryAllPoolMetadataResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_4664128fddcf2b7a, []int{34} + return fileDescriptor_b6613ea5fce61e9c, []int{34} } func (m *QueryAllPoolMetadataResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1882,179 +1882,179 @@ func (m *QueryAllPoolMetadataResponse) GetPagination() *query.PageResponse { } func init() { - proto.RegisterType((*QueryParamsRequest)(nil), "duality.dex.QueryParamsRequest") - proto.RegisterType((*QueryParamsResponse)(nil), "duality.dex.QueryParamsResponse") - proto.RegisterType((*QueryGetLimitOrderTrancheUserRequest)(nil), "duality.dex.QueryGetLimitOrderTrancheUserRequest") - proto.RegisterType((*QueryGetLimitOrderTrancheUserResponse)(nil), "duality.dex.QueryGetLimitOrderTrancheUserResponse") - proto.RegisterType((*QueryAllLimitOrderTrancheUserRequest)(nil), "duality.dex.QueryAllLimitOrderTrancheUserRequest") - proto.RegisterType((*QueryAllLimitOrderTrancheUserResponse)(nil), "duality.dex.QueryAllLimitOrderTrancheUserResponse") - proto.RegisterType((*QueryGetLimitOrderTrancheRequest)(nil), "duality.dex.QueryGetLimitOrderTrancheRequest") - proto.RegisterType((*QueryGetLimitOrderTrancheResponse)(nil), "duality.dex.QueryGetLimitOrderTrancheResponse") - proto.RegisterType((*QueryAllLimitOrderTrancheRequest)(nil), "duality.dex.QueryAllLimitOrderTrancheRequest") - proto.RegisterType((*QueryAllLimitOrderTrancheResponse)(nil), "duality.dex.QueryAllLimitOrderTrancheResponse") - proto.RegisterType((*QueryAllUserDepositsRequest)(nil), "duality.dex.QueryAllUserDepositsRequest") - proto.RegisterType((*QueryAllUserDepositsResponse)(nil), "duality.dex.QueryAllUserDepositsResponse") - proto.RegisterType((*QueryAllUserLimitOrdersRequest)(nil), "duality.dex.QueryAllUserLimitOrdersRequest") - proto.RegisterType((*QueryAllUserLimitOrdersResponse)(nil), "duality.dex.QueryAllUserLimitOrdersResponse") - proto.RegisterType((*QueryAllTickLiquidityRequest)(nil), "duality.dex.QueryAllTickLiquidityRequest") - proto.RegisterType((*QueryAllTickLiquidityResponse)(nil), "duality.dex.QueryAllTickLiquidityResponse") - proto.RegisterType((*QueryGetInactiveLimitOrderTrancheRequest)(nil), "duality.dex.QueryGetInactiveLimitOrderTrancheRequest") - proto.RegisterType((*QueryGetInactiveLimitOrderTrancheResponse)(nil), "duality.dex.QueryGetInactiveLimitOrderTrancheResponse") - proto.RegisterType((*QueryAllInactiveLimitOrderTrancheRequest)(nil), "duality.dex.QueryAllInactiveLimitOrderTrancheRequest") - proto.RegisterType((*QueryAllInactiveLimitOrderTrancheResponse)(nil), "duality.dex.QueryAllInactiveLimitOrderTrancheResponse") - proto.RegisterType((*QueryAllPoolReservesRequest)(nil), "duality.dex.QueryAllPoolReservesRequest") - proto.RegisterType((*QueryAllPoolReservesResponse)(nil), "duality.dex.QueryAllPoolReservesResponse") - proto.RegisterType((*QueryGetPoolReservesRequest)(nil), "duality.dex.QueryGetPoolReservesRequest") - proto.RegisterType((*QueryGetPoolReservesResponse)(nil), "duality.dex.QueryGetPoolReservesResponse") - proto.RegisterType((*QueryEstimateMultiHopSwapRequest)(nil), "duality.dex.QueryEstimateMultiHopSwapRequest") - proto.RegisterType((*QueryEstimateMultiHopSwapResponse)(nil), "duality.dex.QueryEstimateMultiHopSwapResponse") - proto.RegisterType((*QueryEstimatePlaceLimitOrderRequest)(nil), "duality.dex.QueryEstimatePlaceLimitOrderRequest") - proto.RegisterType((*QueryEstimatePlaceLimitOrderResponse)(nil), "duality.dex.QueryEstimatePlaceLimitOrderResponse") - proto.RegisterType((*QueryPoolRequest)(nil), "duality.dex.QueryPoolRequest") - proto.RegisterType((*QueryPoolByIDRequest)(nil), "duality.dex.QueryPoolByIDRequest") - proto.RegisterType((*QueryPoolResponse)(nil), "duality.dex.QueryPoolResponse") - proto.RegisterType((*QueryGetPoolMetadataRequest)(nil), "duality.dex.QueryGetPoolMetadataRequest") - proto.RegisterType((*QueryGetPoolMetadataResponse)(nil), "duality.dex.QueryGetPoolMetadataResponse") - proto.RegisterType((*QueryAllPoolMetadataRequest)(nil), "duality.dex.QueryAllPoolMetadataRequest") - proto.RegisterType((*QueryAllPoolMetadataResponse)(nil), "duality.dex.QueryAllPoolMetadataResponse") -} - -func init() { proto.RegisterFile("duality/dex/query.proto", fileDescriptor_4664128fddcf2b7a) } - -var fileDescriptor_4664128fddcf2b7a = []byte{ - // 2098 bytes of a gzipped FileDescriptorProto + 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((*QueryAllUserLimitOrdersRequest)(nil), "neutron.dex.QueryAllUserLimitOrdersRequest") + proto.RegisterType((*QueryAllUserLimitOrdersResponse)(nil), "neutron.dex.QueryAllUserLimitOrdersResponse") + 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") +} + +func init() { proto.RegisterFile("neutron/dex/query.proto", fileDescriptor_b6613ea5fce61e9c) } + +var fileDescriptor_b6613ea5fce61e9c = []byte{ + // 2097 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x5a, 0xcf, 0x6f, 0x1c, 0x49, 0x15, 0x4e, 0x79, 0x1c, 0xc7, 0xa9, 0xec, 0xe6, 0x47, 0xc5, 0xd9, 0x4c, 0x26, 0xde, 0x19, 0xa7, - 0x49, 0x62, 0xe7, 0x87, 0xbb, 0x63, 0x2f, 0x59, 0x89, 0x65, 0x05, 0xd8, 0xeb, 0x4d, 0x76, 0x20, - 0x21, 0xa6, 0x77, 0x72, 0x59, 0x24, 0x86, 0xf6, 0x4c, 0xc5, 0x6e, 0xb9, 0xa7, 0xbb, 0xd3, 0x5d, - 0x93, 0x78, 0x64, 0x59, 0x48, 0x7b, 0x41, 0x42, 0x20, 0x16, 0x58, 0x09, 0x84, 0xe0, 0x80, 0x10, - 0xb7, 0x20, 0x56, 0x1c, 0xe0, 0x86, 0x38, 0x70, 0xc8, 0x31, 0x12, 0x97, 0x15, 0x87, 0x01, 0x25, - 0x48, 0x48, 0x39, 0xfa, 0x2f, 0x40, 0x55, 0xfd, 0x7a, 0xa6, 0x7a, 0xa6, 0x7a, 0x7a, 0x26, 0x99, - 0xdd, 0x3d, 0xb9, 0xbb, 0xfa, 0x55, 0xbd, 0xef, 0x7d, 0xf5, 0x55, 0xbd, 0xaa, 0x37, 0xc6, 0xa7, - 0xeb, 0x4d, 0xcb, 0xb1, 0x59, 0xcb, 0xa8, 0xd3, 0x1d, 0xe3, 0x7e, 0x93, 0x06, 0x2d, 0xdd, 0x0f, - 0x3c, 0xe6, 0x91, 0x23, 0xf0, 0x41, 0xaf, 0xd3, 0x9d, 0xc2, 0xcc, 0xa6, 0xb7, 0xe9, 0x89, 0x76, - 0x83, 0x3f, 0x45, 0x26, 0x85, 0xd9, 0x4d, 0xcf, 0xdb, 0x74, 0xa8, 0x61, 0xf9, 0xb6, 0x61, 0xb9, - 0xae, 0xc7, 0x2c, 0x66, 0x7b, 0x6e, 0x08, 0x5f, 0x2f, 0xd7, 0xbc, 0xb0, 0xe1, 0x85, 0xc6, 0x86, - 0x15, 0xd2, 0x68, 0x64, 0xe3, 0xc1, 0xd2, 0x06, 0x65, 0xd6, 0x92, 0xe1, 0x5b, 0x9b, 0xb6, 0x2b, - 0x8c, 0xc1, 0x36, 0x2f, 0xa3, 0xf0, 0xad, 0xc0, 0x6a, 0x74, 0x46, 0x91, 0xbf, 0x38, 0x76, 0xc3, - 0x66, 0x55, 0x2f, 0xa8, 0xd3, 0xa0, 0xca, 0x02, 0xcb, 0xad, 0x6d, 0xd1, 0x6a, 0x33, 0xa4, 0x01, - 0xd8, 0x5e, 0xc8, 0xb0, 0x05, 0xb3, 0x39, 0xd9, 0xac, 0x4e, 0x7d, 0x2f, 0xb4, 0x59, 0x35, 0xa0, - 0x35, 0x2f, 0xa8, 0xab, 0x2c, 0x98, 0x5d, 0xdb, 0xae, 0x3a, 0xf6, 0xfd, 0xa6, 0x5d, 0xe7, 0x74, - 0x44, 0x16, 0xa5, 0x04, 0x60, 0xcf, 0x73, 0xaa, 0x01, 0x0d, 0x69, 0xf0, 0x80, 0xc6, 0xb8, 0x67, - 0x12, 0x43, 0xec, 0x40, 0x6b, 0x51, 0xe6, 0x24, 0x66, 0xa3, 0xe6, 0xd9, 0x31, 0x0f, 0x25, 0x60, - 0x54, 0xbc, 0x6d, 0x34, 0xef, 0x19, 0xcc, 0x6e, 0xd0, 0x90, 0x59, 0x0d, 0x1f, 0x0c, 0x5e, 0xeb, - 0xf5, 0x9b, 0x8a, 0xa7, 0x41, 0x99, 0x55, 0xb7, 0x98, 0x15, 0x19, 0x68, 0x33, 0x98, 0x7c, 0x87, - 0xcf, 0xc1, 0xba, 0x20, 0xd7, 0xa4, 0xf7, 0x9b, 0x34, 0x64, 0xda, 0x7b, 0xf8, 0x64, 0xa2, 0x35, - 0xf4, 0x3d, 0x37, 0xa4, 0x64, 0x09, 0x4f, 0x45, 0x93, 0x90, 0x47, 0x73, 0x68, 0xe1, 0xc8, 0xf2, - 0x49, 0x5d, 0x12, 0x83, 0x1e, 0x19, 0xaf, 0x4e, 0x3e, 0x6e, 0x97, 0x0e, 0x98, 0x60, 0xa8, 0x7d, - 0x1f, 0x9f, 0x17, 0x23, 0xdd, 0xa4, 0xec, 0x16, 0x67, 0xfe, 0x0e, 0x27, 0xbe, 0x12, 0xf1, 0x7e, - 0x37, 0xa4, 0x01, 0x78, 0x24, 0x79, 0x7c, 0xc8, 0xaa, 0xd7, 0x03, 0x1a, 0x46, 0x63, 0x1f, 0x36, - 0xe3, 0x57, 0x52, 0xc4, 0x18, 0xe6, 0xe9, 0x5b, 0xb4, 0x95, 0x9f, 0x10, 0x1f, 0xa5, 0x16, 0xed, - 0x87, 0x08, 0x5f, 0xc8, 0x70, 0x01, 0xf0, 0xbf, 0x87, 0x4f, 0x29, 0x0d, 0x20, 0x1a, 0x2d, 0x11, - 0x8d, 0xd2, 0x52, 0x04, 0x87, 0x4c, 0xf5, 0x30, 0x9a, 0x0b, 0xb1, 0xae, 0x38, 0xce, 0xc0, 0x58, - 0x6f, 0x60, 0xdc, 0x55, 0x3a, 0x38, 0xbf, 0xa8, 0x47, 0x12, 0xd0, 0xb9, 0x04, 0xf4, 0x68, 0xc1, - 0x81, 0x10, 0xf4, 0x75, 0x6b, 0x93, 0x42, 0x5f, 0x53, 0xea, 0xa9, 0x3d, 0x89, 0x23, 0x4f, 0x77, - 0x98, 0x1d, 0x79, 0x6e, 0x0c, 0x91, 0x93, 0x9b, 0x89, 0x88, 0x26, 0x44, 0x44, 0xf3, 0x99, 0x11, - 0x45, 0xe0, 0x12, 0x21, 0xfd, 0x1c, 0xe1, 0xb9, 0xd4, 0xc9, 0x8c, 0xf9, 0x7b, 0x8d, 0xcb, 0xd0, - 0x0e, 0xca, 0x6b, 0x20, 0x15, 0x78, 0x23, 0xb3, 0xf8, 0x30, 0x5f, 0x94, 0x65, 0xb7, 0x4e, 0x77, - 0x04, 0x88, 0x9c, 0xd9, 0x6d, 0xe0, 0x0a, 0x63, 0xde, 0x36, 0x75, 0xcb, 0x6e, 0x3e, 0x17, 0x29, - 0x0c, 0x5e, 0x7b, 0x14, 0x36, 0xd9, 0xa7, 0xb0, 0x87, 0xf8, 0xdc, 0x00, 0x4c, 0x40, 0xb1, 0x89, - 0x4f, 0xf4, 0x7d, 0x84, 0xb9, 0x2d, 0x0e, 0xa6, 0x17, 0xa8, 0xed, 0xef, 0xae, 0xfd, 0x26, 0x66, - 0x43, 0x35, 0xc1, 0x59, 0x6c, 0x48, 0xf1, 0x4e, 0x24, 0xe3, 0x4d, 0xea, 0x2f, 0xf7, 0xc2, 0xfa, - 0xfb, 0x3b, 0x02, 0x62, 0xd4, 0xf0, 0x06, 0x13, 0x93, 0x7b, 0x09, 0x62, 0xc6, 0xa7, 0xb7, 0x1f, - 0xe0, 0xb3, 0x71, 0x04, 0x5c, 0xc8, 0x6b, 0xd1, 0xae, 0x1f, 0x66, 0xef, 0x4a, 0x37, 0x14, 0x08, - 0x5e, 0x84, 0xc3, 0x3f, 0x20, 0x3c, 0xab, 0x46, 0x00, 0xf4, 0xbd, 0x8d, 0xa7, 0xe3, 0x36, 0x60, - 0xad, 0x90, 0x60, 0x0d, 0x3e, 0x9a, 0x22, 0x4f, 0x01, 0x63, 0x9d, 0x1e, 0xe3, 0x23, 0xea, 0x43, - 0x84, 0x8b, 0x32, 0xce, 0xee, 0x9c, 0x7c, 0x8e, 0x64, 0xfd, 0x05, 0xe1, 0x52, 0x2a, 0x08, 0xe0, - 0xeb, 0x9b, 0xf8, 0x88, 0xd3, 0x6d, 0x1e, 0x79, 0x83, 0x93, 0x3b, 0x8f, 0x8f, 0xbd, 0x5f, 0x49, - 0xb3, 0x5c, 0xb1, 0x6b, 0xdb, 0xb7, 0xe2, 0x63, 0xc3, 0x17, 0xbf, 0x88, 0x3f, 0x41, 0xf8, 0xf5, - 0x14, 0x68, 0xc0, 0xe8, 0x0d, 0xfc, 0x2a, 0x93, 0x3f, 0x28, 0x65, 0x98, 0xe8, 0x0a, 0x5c, 0x26, - 0xbb, 0x8d, 0x8f, 0xcd, 0x5f, 0x23, 0xbc, 0x10, 0x6f, 0xc8, 0x65, 0xd7, 0xaa, 0x31, 0xfb, 0x01, - 0x1d, 0xe3, 0xf6, 0x98, 0x48, 0x23, 0xb9, 0xde, 0x34, 0x92, 0x95, 0x2c, 0x7e, 0x8a, 0xf0, 0xa5, - 0x21, 0xc0, 0x01, 0xb7, 0x1b, 0xf8, 0x8c, 0x9d, 0x66, 0x34, 0x52, 0xf6, 0x48, 0x1f, 0x46, 0x0b, - 0x80, 0xad, 0x15, 0xc7, 0xc9, 0x64, 0x6b, 0x5c, 0x47, 0x93, 0x4f, 0x63, 0x16, 0x06, 0x3b, 0x1d, - 0x8e, 0x85, 0xdc, 0x18, 0x58, 0x18, 0x9f, 0xfa, 0x7e, 0x89, 0xba, 0x39, 0x63, 0xdd, 0xf3, 0x1c, - 0x13, 0x0e, 0xf8, 0x5f, 0xfc, 0x52, 0x7e, 0x24, 0xed, 0x32, 0x49, 0x64, 0xc0, 0xf3, 0x3b, 0xf8, - 0x15, 0x5f, 0x6a, 0x07, 0x6a, 0xcf, 0x24, 0x4f, 0xf1, 0x92, 0x01, 0xb0, 0x9a, 0xe8, 0x34, 0xfe, - 0xdc, 0x7b, 0x93, 0xb2, 0xf1, 0xf0, 0x38, 0x78, 0xe1, 0x1e, 0xc7, 0xb9, 0x7b, 0x94, 0x8a, 0x15, - 0x3b, 0x69, 0xf2, 0x47, 0xad, 0x06, 0x74, 0xf5, 0x01, 0x48, 0xa5, 0x0b, 0x8d, 0x4c, 0x97, 0xf6, - 0xc7, 0x1c, 0x9c, 0xe1, 0xde, 0x0d, 0x99, 0xdd, 0xb0, 0x18, 0xbd, 0xdd, 0x74, 0x98, 0xfd, 0x9e, - 0xe7, 0xbf, 0xff, 0xd0, 0xf2, 0xa5, 0xd4, 0x59, 0x0b, 0xa8, 0xc5, 0xbc, 0x20, 0x4e, 0x9d, 0xf0, - 0x4a, 0x0a, 0x78, 0x3a, 0xa0, 0x35, 0x6a, 0x3f, 0xa0, 0x01, 0x84, 0xdb, 0x79, 0x27, 0xcb, 0x78, - 0x2a, 0xf0, 0x9a, 0x8c, 0x86, 0xf9, 0x9c, 0x62, 0x47, 0x8e, 0xfd, 0x98, 0xdc, 0xc4, 0x04, 0x4b, - 0x62, 0xe3, 0x69, 0xab, 0xe1, 0x35, 0x5d, 0x56, 0x76, 0xa3, 0xcd, 0x6b, 0xf5, 0x36, 0xbf, 0xaf, - 0xfd, 0xab, 0x5d, 0xba, 0xb8, 0x69, 0xb3, 0xad, 0xe6, 0x86, 0x5e, 0xf3, 0x1a, 0x06, 0x5c, 0x47, - 0xa3, 0x3f, 0x8b, 0x61, 0x7d, 0xdb, 0x60, 0x2d, 0x9f, 0x86, 0x7a, 0xd9, 0x65, 0xcf, 0xdb, 0xa5, - 0xce, 0x08, 0xfb, 0xed, 0xd2, 0xb1, 0x96, 0xd5, 0x70, 0xde, 0xd2, 0xe2, 0x16, 0xcd, 0xec, 0x7c, - 0x24, 0x3f, 0x41, 0xf8, 0x28, 0xdd, 0xb1, 0xa3, 0x33, 0xf3, 0x7a, 0x60, 0xd7, 0x68, 0xfe, 0xa0, - 0xf0, 0x48, 0xc1, 0xe3, 0xb2, 0xe4, 0x11, 0x90, 0x2f, 0x3a, 0xd6, 0x46, 0x18, 0xbf, 0x18, 0x4d, - 0x66, 0x3b, 0xa1, 0xd1, 0xb0, 0xd8, 0x96, 0xbe, 0x1e, 0xd0, 0xda, 0x1a, 0xad, 0x3d, 0x6f, 0x97, - 0x7a, 0xc6, 0xdc, 0x6f, 0x97, 0x4e, 0x45, 0x18, 0x92, 0xed, 0x9a, 0xd9, 0x63, 0x48, 0xce, 0xe3, - 0x57, 0x7d, 0xbb, 0xb6, 0xbd, 0xca, 0x97, 0x0d, 0x27, 0x23, 0x3f, 0x35, 0x87, 0x16, 0xa6, 0xcd, - 0x64, 0xa3, 0xf6, 0x71, 0x7c, 0xa8, 0x55, 0xcf, 0x17, 0x48, 0xc3, 0xc3, 0x87, 0xf8, 0xf5, 0xfc, - 0x4e, 0x93, 0x75, 0x54, 0x21, 0xaf, 0x80, 0x58, 0xfb, 0xef, 0x78, 0xb6, 0xbb, 0xfa, 0x16, 0x84, - 0x3b, 0x3f, 0x04, 0xc1, 0xbc, 0xc3, 0xf3, 0x76, 0x29, 0x1e, 0xdc, 0x8c, 0x1f, 0xb4, 0x47, 0x93, - 0xf8, 0x4b, 0x09, 0x58, 0xeb, 0x8e, 0x55, 0x93, 0xb6, 0xb9, 0x97, 0x53, 0x52, 0xfa, 0xdd, 0xa8, - 0x80, 0xa7, 0xc5, 0x23, 0x8f, 0x34, 0x4a, 0x76, 0x9d, 0x77, 0x72, 0x19, 0x1f, 0xef, 0x2c, 0xaf, - 0xb2, 0x5b, 0xf1, 0xb8, 0xcd, 0x41, 0xb1, 0xec, 0xfa, 0xda, 0x13, 0xba, 0x9b, 0xfa, 0x6c, 0x75, - 0xf7, 0x15, 0x7c, 0x58, 0x94, 0x77, 0x2a, 0x2d, 0x9f, 0xe6, 0x0f, 0xcd, 0xa1, 0x85, 0xa3, 0xcb, - 0x67, 0xd3, 0xb2, 0x47, 0xcb, 0xa7, 0x66, 0xd7, 0x9a, 0xdc, 0xe2, 0x8a, 0xf5, 0xed, 0x40, 0x6c, - 0x50, 0x15, 0xbb, 0x41, 0xf3, 0xd3, 0x62, 0x76, 0x0b, 0x7a, 0x54, 0x80, 0xd1, 0xe3, 0x02, 0x8c, - 0x5e, 0x89, 0x0b, 0x30, 0xab, 0xd3, 0x7c, 0xd1, 0x7f, 0xf4, 0xef, 0x12, 0x32, 0x7b, 0xfa, 0x92, - 0x16, 0x7e, 0xa5, 0x61, 0xed, 0xac, 0x08, 0x5c, 0x9c, 0x9b, 0xc3, 0x22, 0xee, 0xbb, 0xdc, 0x7e, - 0xa4, 0xb8, 0x13, 0xa3, 0xec, 0xb7, 0x4b, 0x27, 0xa3, 0xd8, 0xe5, 0x56, 0xcd, 0x4c, 0x18, 0x69, - 0xed, 0x1c, 0xd4, 0x22, 0x52, 0xe5, 0x02, 0x42, 0xfe, 0x19, 0xc2, 0x47, 0x98, 0xc7, 0x2c, 0xa7, - 0xec, 0x72, 0xed, 0x65, 0xab, 0xb9, 0x32, 0xba, 0x9a, 0x65, 0x07, 0xfb, 0xed, 0x12, 0x89, 0xe0, - 0x4b, 0x8d, 0x9a, 0x29, 0x9b, 0xf0, 0x8d, 0x03, 0x87, 0x0f, 0x2d, 0x1f, 0x20, 0x4d, 0x64, 0x41, - 0x32, 0x47, 0x87, 0x24, 0x8d, 0xbf, 0xdf, 0x2e, 0x9d, 0x88, 0x10, 0x75, 0xdb, 0x34, 0x53, 0x32, - 0x10, 0x1c, 0xf1, 0xd7, 0x3b, 0x4d, 0x26, 0x00, 0xe5, 0x3e, 0x0b, 0x8e, 0x24, 0x07, 0x5d, 0x8e, - 0xa4, 0x46, 0xcd, 0x94, 0x4d, 0xb4, 0x0f, 0xf0, 0xf1, 0xa8, 0x42, 0x27, 0x72, 0xcd, 0xcb, 0xd4, - 0x45, 0x20, 0x2f, 0xe6, 0xba, 0x79, 0x51, 0xc7, 0x33, 0x9d, 0xb1, 0x57, 0x5b, 0xe5, 0x35, 0x79, - 0x7c, 0xcf, 0x73, 0x60, 0xfc, 0x49, 0x13, 0xde, 0xb4, 0x6f, 0xe0, 0x13, 0x12, 0x16, 0x10, 0xd6, - 0x15, 0x3c, 0xc9, 0x3f, 0x83, 0xa0, 0x4e, 0xf4, 0x25, 0x4d, 0x48, 0x96, 0xc2, 0x48, 0x5b, 0x4c, - 0x1e, 0x05, 0x6e, 0x43, 0x8d, 0x32, 0x76, 0x7c, 0x14, 0x4f, 0xd8, 0x75, 0x70, 0x3a, 0x61, 0xd7, - 0x7b, 0x13, 0x77, 0xd7, 0xbc, 0x9b, 0xb8, 0xe5, 0xf6, 0xd4, 0xc4, 0x1d, 0x1b, 0x40, 0xcd, 0x32, - 0xd1, 0x49, 0xa3, 0xc9, 0x63, 0x5e, 0x2f, 0xa6, 0x71, 0x9d, 0x94, 0x7b, 0x0f, 0x6d, 0x43, 0x04, - 0x93, 0x1b, 0x39, 0x98, 0xb1, 0x1d, 0xda, 0x96, 0xff, 0x7a, 0x1a, 0x1f, 0x14, 0x70, 0xc9, 0x16, - 0x9e, 0x8a, 0x2a, 0xbe, 0xa4, 0x94, 0xc0, 0xd2, 0x5f, 0x4e, 0x2e, 0xcc, 0xa5, 0x1b, 0x44, 0x2e, - 0xb4, 0xb3, 0x1f, 0xfe, 0xf3, 0xbf, 0xbf, 0x98, 0x38, 0x45, 0x4e, 0x1a, 0xfd, 0x15, 0x7f, 0xf2, - 0x0f, 0x94, 0x52, 0xbe, 0x24, 0x4b, 0xfd, 0x03, 0x67, 0x14, 0x9a, 0x0b, 0xcb, 0xa3, 0x74, 0x01, - 0x74, 0x6b, 0x02, 0xdd, 0xd7, 0xc8, 0xdb, 0xc6, 0x30, 0xbf, 0x3a, 0x18, 0xbb, 0x50, 0xf7, 0xd8, - 0x33, 0x76, 0xbb, 0x17, 0xc3, 0x3d, 0xf2, 0x09, 0xc2, 0x79, 0xa5, 0x9f, 0x15, 0xc7, 0x51, 0x45, - 0x92, 0x51, 0x46, 0x56, 0x45, 0x92, 0x55, 0x08, 0xd6, 0x16, 0x45, 0x24, 0xf3, 0xe4, 0xc2, 0x50, - 0x91, 0x70, 0xc8, 0xe7, 0xd2, 0x20, 0xaf, 0xb6, 0x56, 0xa0, 0xbc, 0x73, 0x45, 0x09, 0x44, 0x5d, - 0x25, 0x2a, 0x5c, 0x1d, 0xce, 0x18, 0xf0, 0x5e, 0x13, 0x78, 0x2f, 0x93, 0x85, 0x04, 0x5e, 0xc1, - 0xb2, 0x04, 0x3a, 0xec, 0x52, 0x4e, 0x1e, 0x23, 0x45, 0xbd, 0x91, 0x2c, 0x0e, 0x37, 0xeb, 0x31, - 0x48, 0x7d, 0x58, 0x73, 0x80, 0x59, 0x11, 0x30, 0xbf, 0x4d, 0x6e, 0x65, 0xd1, 0x6a, 0xec, 0x46, - 0x7b, 0x32, 0x97, 0x46, 0x74, 0xc2, 0xe2, 0x4f, 0xf1, 0x5e, 0xdc, 0x23, 0x98, 0x3f, 0x23, 0x3c, - 0xd3, 0xe7, 0x93, 0x8b, 0x65, 0x71, 0xb8, 0x99, 0x1f, 0x10, 0xcd, 0xa0, 0x8a, 0xad, 0xf6, 0x55, - 0x11, 0xcd, 0x75, 0xf2, 0xc6, 0x0b, 0x44, 0x43, 0x3e, 0x46, 0xf8, 0x98, 0x5c, 0xc8, 0xe4, 0x78, - 0x17, 0x52, 0xe7, 0xbc, 0xa7, 0xe0, 0x5a, 0xb8, 0x34, 0x84, 0x25, 0xa0, 0xbc, 0x2a, 0x50, 0x5e, - 0x24, 0xe7, 0xfb, 0xa5, 0x01, 0x3f, 0xde, 0xc9, 0xb2, 0xf8, 0x1d, 0xc2, 0xc7, 0x13, 0x35, 0x2a, - 0x8e, 0x4b, 0xed, 0x4d, 0x55, 0xa0, 0x2b, 0x5c, 0x1e, 0xc6, 0x14, 0x90, 0xbd, 0x29, 0x90, 0x5d, - 0x23, 0xba, 0x91, 0xfe, 0x7b, 0xa1, 0x8a, 0xba, 0xff, 0x21, 0x7c, 0x26, 0xb5, 0x58, 0x42, 0xae, - 0x2b, 0x35, 0x99, 0x55, 0xd1, 0x29, 0xbc, 0x39, 0x6a, 0x37, 0x08, 0xe2, 0xbb, 0x22, 0x88, 0xbb, - 0xe4, 0xfd, 0x44, 0x10, 0xf7, 0x6c, 0xc7, 0xa1, 0xf5, 0xea, 0xcb, 0x2a, 0xfb, 0x6f, 0x08, 0xcf, - 0xa6, 0x42, 0xe0, 0x33, 0x73, 0x5d, 0x49, 0xf7, 0x8b, 0x04, 0x3b, 0x4c, 0x01, 0x4a, 0x33, 0x44, - 0xb0, 0x97, 0xc8, 0xfc, 0x90, 0xc1, 0x92, 0xdf, 0x22, 0x7c, 0x4c, 0xbe, 0xfa, 0xa7, 0xab, 0x5c, - 0x51, 0xda, 0x48, 0x51, 0xb9, 0xaa, 0x06, 0xa1, 0x5d, 0x17, 0xc8, 0x0c, 0xb2, 0x68, 0xa4, 0xfe, - 0xb2, 0xac, 0x92, 0xd2, 0x23, 0x14, 0x9d, 0x1a, 0x3a, 0x55, 0x9b, 0x05, 0xa5, 0x0c, 0x86, 0x04, - 0x97, 0x52, 0x20, 0xd1, 0x6e, 0x0a, 0x70, 0x2b, 0xe4, 0xeb, 0x23, 0x81, 0x4b, 0xca, 0xe2, 0x1e, - 0xa5, 0x7b, 0xe4, 0xf7, 0x08, 0xcf, 0xa8, 0xee, 0xdb, 0xaa, 0x9d, 0x6e, 0x40, 0x1d, 0x45, 0xb5, - 0xd3, 0x0d, 0xba, 0xc6, 0xa7, 0xec, 0x21, 0x14, 0xba, 0x54, 0x1b, 0xbc, 0x4f, 0x75, 0xcb, 0xf3, - 0xab, 0xfc, 0xe8, 0x4d, 0xfe, 0x84, 0xf0, 0xe9, 0x94, 0xfb, 0x14, 0xb9, 0x96, 0xee, 0x59, 0x7d, - 0x53, 0x2f, 0x2c, 0x8d, 0xd0, 0x63, 0xa0, 0x4c, 0x3b, 0x70, 0x7d, 0xde, 0x4d, 0x96, 0x2b, 0xd9, - 0xc5, 0x93, 0x7c, 0xe2, 0xc8, 0xeb, 0x8a, 0x03, 0x58, 0xf7, 0xe2, 0x50, 0x28, 0xa6, 0x7d, 0x06, - 0xbf, 0x5f, 0x16, 0x7e, 0x75, 0x72, 0xb5, 0x6f, 0x9e, 0xe5, 0xe9, 0xed, 0x9d, 0xd4, 0xfb, 0x78, - 0x3a, 0xbe, 0x41, 0x90, 0x73, 0x6a, 0x0f, 0xd2, 0xed, 0x22, 0x13, 0x84, 0x26, 0x40, 0xcc, 0x92, - 0x82, 0x0a, 0x84, 0xb8, 0x88, 0xec, 0x91, 0x1f, 0xa3, 0xe4, 0x61, 0x79, 0x80, 0xec, 0x7b, 0xce, - 0xf3, 0x03, 0x64, 0xdf, 0x7b, 0x22, 0xd7, 0xe6, 0x05, 0x92, 0x73, 0xa4, 0x64, 0xa4, 0xfe, 0x77, - 0x85, 0xb1, 0x6b, 0xd7, 0xf7, 0xc8, 0x8f, 0x60, 0x97, 0x88, 0x47, 0x18, 0xbc, 0x4b, 0x0c, 0x81, - 0x28, 0xe5, 0x8e, 0x30, 0x80, 0x9b, 0x0e, 0xa2, 0xd5, 0x77, 0x1f, 0x3f, 0x2d, 0xa2, 0x27, 0x4f, - 0x8b, 0xe8, 0x3f, 0x4f, 0x8b, 0xe8, 0xa3, 0x67, 0xc5, 0x03, 0x4f, 0x9e, 0x15, 0x0f, 0x7c, 0xfa, - 0xac, 0x78, 0xe0, 0x83, 0x2b, 0x59, 0x75, 0xb8, 0x9d, 0x28, 0x81, 0xf1, 0xfb, 0xea, 0xc6, 0x94, - 0x28, 0x81, 0xbc, 0xf1, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc0, 0x56, 0x4c, 0xd7, 0x21, 0x24, - 0x00, 0x00, + 0x49, 0x62, 0xc7, 0x1b, 0x77, 0xc7, 0x5e, 0xb2, 0x12, 0xcb, 0x0a, 0xb0, 0xd7, 0x24, 0x3b, 0x90, + 0x10, 0xd3, 0xeb, 0x5c, 0x16, 0x89, 0xa1, 0x3d, 0x53, 0x19, 0xb7, 0xdc, 0xd3, 0xd5, 0xe9, 0xae, + 0x49, 0x3c, 0xb2, 0x2c, 0xa4, 0xbd, 0x20, 0xa1, 0x45, 0x2c, 0xb0, 0x12, 0x08, 0xc1, 0x01, 0x21, + 0x6e, 0x91, 0x58, 0x71, 0x80, 0x1b, 0xe2, 0xc0, 0x21, 0xc7, 0x48, 0x5c, 0x56, 0x1c, 0x06, 0x94, + 0x20, 0x21, 0xe5, 0xe8, 0xbf, 0x00, 0x55, 0xf5, 0xeb, 0x99, 0xea, 0x99, 0xee, 0xe9, 0x99, 0x64, + 0x96, 0x3d, 0xb9, 0xbb, 0xfa, 0x55, 0xbd, 0xef, 0x7d, 0xf5, 0x55, 0xbd, 0xaa, 0x37, 0xc6, 0x67, + 0x5d, 0xda, 0xe4, 0x3e, 0x73, 0x8d, 0x1a, 0xdd, 0x35, 0xee, 0x37, 0xa9, 0xdf, 0xd2, 0x3d, 0x9f, + 0x71, 0x46, 0x8e, 0xc1, 0x07, 0xbd, 0x46, 0x77, 0x0b, 0x33, 0x75, 0x56, 0x67, 0xb2, 0xdd, 0x10, + 0x4f, 0xa1, 0x49, 0x61, 0xb6, 0xce, 0x58, 0xdd, 0xa1, 0x86, 0xe5, 0xd9, 0x86, 0xe5, 0xba, 0x8c, + 0x5b, 0xdc, 0x66, 0x6e, 0x00, 0x5f, 0x17, 0xab, 0x2c, 0x68, 0xb0, 0xc0, 0xd8, 0xb2, 0x02, 0x1a, + 0x8e, 0x6c, 0x3c, 0x58, 0xde, 0xa2, 0xdc, 0x5a, 0x36, 0x3c, 0xab, 0x6e, 0xbb, 0xd2, 0x18, 0x6c, + 0xf3, 0x2a, 0x0a, 0xcf, 0xf2, 0xad, 0x46, 0x67, 0x14, 0xf5, 0x8b, 0x63, 0x37, 0x6c, 0x5e, 0x61, + 0x7e, 0x8d, 0xfa, 0x15, 0xee, 0x5b, 0x6e, 0x75, 0x9b, 0x56, 0x9a, 0x01, 0xf5, 0xc1, 0xf6, 0x52, + 0x86, 0x2d, 0x98, 0xcd, 0xa9, 0x66, 0x35, 0xea, 0xb1, 0xc0, 0xe6, 0x15, 0x9f, 0x56, 0x99, 0x5f, + 0x4b, 0xb2, 0xe0, 0x76, 0x75, 0xa7, 0xe2, 0xd8, 0xf7, 0x9b, 0x76, 0xcd, 0xe6, 0xc0, 0x4e, 0xa1, + 0x14, 0x03, 0xcc, 0x98, 0x53, 0xf1, 0x69, 0x40, 0xfd, 0x07, 0x34, 0xc2, 0x3d, 0x13, 0x1b, 0x62, + 0x17, 0x5a, 0x8b, 0x2a, 0x27, 0x11, 0x1b, 0x55, 0x66, 0x47, 0x3c, 0x94, 0x80, 0x51, 0xf9, 0xb6, + 0xd5, 0xbc, 0x67, 0x70, 0xbb, 0x41, 0x03, 0x6e, 0x35, 0x3c, 0x30, 0x78, 0xad, 0xd7, 0x6f, 0x2a, + 0x9e, 0x06, 0xe5, 0x56, 0xcd, 0xe2, 0x56, 0x68, 0xa0, 0xcd, 0x60, 0xf2, 0x5d, 0x31, 0x07, 0x1b, + 0x92, 0x5c, 0x93, 0xde, 0x6f, 0xd2, 0x80, 0x6b, 0xef, 0xe1, 0xd3, 0xb1, 0xd6, 0xc0, 0x63, 0x6e, + 0x40, 0xc9, 0x32, 0x9e, 0x0a, 0x27, 0x21, 0x8f, 0xe6, 0xd0, 0xc2, 0xb1, 0x95, 0xd3, 0xba, 0x22, + 0x06, 0x3d, 0x34, 0x5e, 0x9b, 0x7c, 0xdc, 0x2e, 0x1d, 0x32, 0xc1, 0x50, 0xfb, 0x01, 0xbe, 0x28, + 0x47, 0xba, 0x49, 0xf9, 0x2d, 0xc1, 0xfc, 0x1d, 0x41, 0xfc, 0x66, 0xc8, 0xfb, 0xdd, 0x80, 0xfa, + 0xe0, 0x91, 0xe4, 0xf1, 0x11, 0xab, 0x56, 0xf3, 0x69, 0x10, 0x8e, 0x7d, 0xd4, 0x8c, 0x5e, 0x49, + 0x11, 0x63, 0x98, 0xa7, 0x6f, 0xd3, 0x56, 0x7e, 0x42, 0x7e, 0x54, 0x5a, 0xb4, 0x1f, 0x21, 0x7c, + 0x29, 0xc3, 0x05, 0xc0, 0xff, 0x3e, 0x3e, 0x93, 0x68, 0x00, 0xd1, 0x68, 0xb1, 0x68, 0x12, 0x2d, + 0x65, 0x70, 0xc8, 0x4c, 0x1e, 0x46, 0x73, 0x21, 0xd6, 0x55, 0xc7, 0x19, 0x18, 0xeb, 0x0d, 0x8c, + 0xbb, 0x4a, 0x07, 0xe7, 0x97, 0xf5, 0x50, 0x02, 0xba, 0x90, 0x80, 0x1e, 0x2e, 0x38, 0x10, 0x82, + 0xbe, 0x61, 0xd5, 0x29, 0xf4, 0x35, 0x95, 0x9e, 0xda, 0x93, 0x28, 0xf2, 0x74, 0x87, 0xd9, 0x91, + 0xe7, 0xc6, 0x10, 0x39, 0xb9, 0x19, 0x8b, 0x68, 0x42, 0x46, 0x34, 0x9f, 0x19, 0x51, 0x08, 0x2e, + 0x16, 0xd2, 0xcf, 0x11, 0x9e, 0x4b, 0x9d, 0xcc, 0x88, 0xbf, 0xd7, 0x84, 0x0c, 0x6d, 0xbf, 0xbc, + 0x0e, 0x52, 0x81, 0x37, 0x32, 0x8b, 0x8f, 0x8a, 0x45, 0x59, 0x76, 0x6b, 0x74, 0x57, 0x82, 0xc8, + 0x99, 0xdd, 0x06, 0xa1, 0x30, 0xce, 0x76, 0xa8, 0x5b, 0x76, 0xf3, 0xb9, 0x50, 0x61, 0xf0, 0xda, + 0xa3, 0xb0, 0xc9, 0x3e, 0x85, 0x3d, 0xc4, 0x17, 0x06, 0x60, 0x02, 0x8a, 0x4d, 0x7c, 0xaa, 0xef, + 0x23, 0xcc, 0x6d, 0x71, 0x30, 0xbd, 0x40, 0x6d, 0x7f, 0x77, 0xed, 0x37, 0x11, 0x1b, 0x49, 0x13, + 0x9c, 0xc5, 0x86, 0x12, 0xef, 0x44, 0x3c, 0xde, 0xb8, 0xfe, 0x72, 0x2f, 0xac, 0xbf, 0xbf, 0x21, + 0x20, 0x26, 0x19, 0xde, 0x60, 0x62, 0x72, 0x2f, 0x41, 0xcc, 0xf8, 0xf4, 0xf6, 0x43, 0x7c, 0x3e, + 0x8a, 0x40, 0x08, 0x79, 0x3d, 0xdc, 0xf5, 0x83, 0xec, 0x5d, 0xe9, 0x46, 0x02, 0x82, 0x17, 0xe1, + 0xf0, 0x0f, 0x08, 0xcf, 0x26, 0x23, 0x00, 0xfa, 0xde, 0xc1, 0xd3, 0x51, 0x1b, 0xb0, 0x56, 0x88, + 0xb1, 0x06, 0x1f, 0x4d, 0x99, 0xa7, 0x80, 0xb1, 0x4e, 0x8f, 0xf1, 0x11, 0xf5, 0x21, 0xc2, 0x45, + 0x15, 0x67, 0x77, 0x4e, 0xfe, 0x8f, 0x64, 0xfd, 0x19, 0xe1, 0x52, 0x2a, 0x08, 0xe0, 0xeb, 0x5b, + 0xf8, 0x98, 0xd3, 0x6d, 0x1e, 0x79, 0x83, 0x53, 0x3b, 0x8f, 0x8f, 0xbd, 0x5f, 0x29, 0xb3, 0xbc, + 0x69, 0x57, 0x77, 0x6e, 0x45, 0xc7, 0x86, 0x2f, 0x7e, 0x11, 0x7f, 0x8a, 0xf0, 0xeb, 0x29, 0xd0, + 0x80, 0xd1, 0x1b, 0xf8, 0x55, 0xae, 0x7e, 0x48, 0x94, 0x61, 0xac, 0x2b, 0x70, 0x19, 0xef, 0x36, + 0x3e, 0x36, 0x7f, 0x8d, 0xf0, 0x42, 0xb4, 0x21, 0x97, 0x5d, 0xab, 0xca, 0xed, 0x07, 0x74, 0x8c, + 0xdb, 0x63, 0x2c, 0x8d, 0xe4, 0x7a, 0xd3, 0x48, 0x56, 0xb2, 0xf8, 0x29, 0xc2, 0x57, 0x86, 0x00, + 0x07, 0xdc, 0x6e, 0xe1, 0x73, 0x76, 0x9a, 0xd1, 0x48, 0xd9, 0x23, 0x7d, 0x18, 0xcd, 0x07, 0xb6, + 0x56, 0x1d, 0x27, 0x93, 0xad, 0x71, 0x1d, 0x4d, 0x3e, 0x8b, 0x58, 0x18, 0xec, 0x74, 0x38, 0x16, + 0x72, 0x63, 0x60, 0x61, 0x7c, 0xea, 0xfb, 0x25, 0xea, 0xe6, 0x8c, 0x0d, 0xc6, 0x1c, 0x13, 0x0e, + 0xf8, 0x5f, 0xfc, 0x52, 0x7e, 0xa4, 0xec, 0x32, 0x71, 0x64, 0xc0, 0xf3, 0xbb, 0xf8, 0x15, 0x4f, + 0x69, 0x07, 0x6a, 0xcf, 0xc5, 0x4f, 0xf1, 0x8a, 0x01, 0xb0, 0x1a, 0xeb, 0x34, 0xfe, 0xdc, 0x7b, + 0x93, 0xf2, 0xf1, 0xf0, 0x38, 0x78, 0xe1, 0x9e, 0xc4, 0xb9, 0x7b, 0x94, 0xca, 0x15, 0x3b, 0x69, + 0x8a, 0x47, 0xad, 0x0a, 0x74, 0xf5, 0x01, 0x48, 0xa5, 0x0b, 0x8d, 0x4c, 0x97, 0xf6, 0x28, 0x07, + 0x67, 0xb8, 0x6f, 0x06, 0xdc, 0x6e, 0x58, 0x9c, 0xde, 0x6e, 0x3a, 0xdc, 0x7e, 0x8f, 0x79, 0xef, + 0x3f, 0xb4, 0x3c, 0x25, 0x75, 0x56, 0x7d, 0x6a, 0x71, 0xe6, 0x47, 0xa9, 0x13, 0x5e, 0x49, 0x01, + 0x4f, 0xfb, 0xb4, 0x4a, 0xed, 0x07, 0xd4, 0x87, 0x70, 0x3b, 0xef, 0x64, 0x05, 0x4f, 0xf9, 0xac, + 0xc9, 0x69, 0x90, 0xcf, 0x25, 0xec, 0xc8, 0x91, 0x1f, 0x53, 0x98, 0x98, 0x60, 0x49, 0x6c, 0x3c, + 0x6d, 0x35, 0x58, 0xd3, 0xe5, 0x65, 0x37, 0xdc, 0xbc, 0xd6, 0x6e, 0x8b, 0xfb, 0xda, 0x3f, 0xdb, + 0xa5, 0xcb, 0x75, 0x9b, 0x6f, 0x37, 0xb7, 0xf4, 0x2a, 0x6b, 0x18, 0x70, 0x1d, 0x0d, 0xff, 0x2c, + 0x05, 0xb5, 0x1d, 0x83, 0xb7, 0x3c, 0x1a, 0xe8, 0x65, 0x97, 0x3f, 0x6f, 0x97, 0x3a, 0x23, 0x1c, + 0xb4, 0x4b, 0x27, 0x5a, 0x56, 0xc3, 0x79, 0x5b, 0x8b, 0x5a, 0x34, 0xb3, 0xf3, 0x91, 0x7c, 0x84, + 0xf0, 0x71, 0xba, 0x6b, 0x87, 0x67, 0xe6, 0x0d, 0xdf, 0xae, 0xd2, 0xfc, 0x61, 0xe9, 0xb1, 0x06, + 0x1e, 0x97, 0x15, 0x8f, 0x80, 0x7c, 0x89, 0xf9, 0xf5, 0xe8, 0xd9, 0x68, 0x72, 0xdb, 0x09, 0x8c, + 0x86, 0xc5, 0xb7, 0xf5, 0x0d, 0x9f, 0x56, 0xd7, 0x69, 0xf5, 0x79, 0xbb, 0xd4, 0x33, 0xe4, 0x41, + 0xbb, 0x74, 0x26, 0x84, 0x10, 0x6f, 0xd7, 0xcc, 0x1e, 0x43, 0x72, 0x11, 0xbf, 0xea, 0xd9, 0xd5, + 0x9d, 0x35, 0xb1, 0x6a, 0x04, 0x17, 0xf9, 0xa9, 0x39, 0xb4, 0x30, 0x6d, 0xc6, 0x1b, 0xb5, 0x4f, + 0xa2, 0x33, 0x6d, 0xf2, 0x74, 0x81, 0x32, 0x18, 0x3e, 0x22, 0x6e, 0xe7, 0x77, 0x9a, 0xbc, 0x23, + 0x0a, 0x75, 0x01, 0x44, 0xd2, 0x7f, 0x97, 0xd9, 0xee, 0xda, 0xdb, 0x10, 0xed, 0xfc, 0x10, 0xfc, + 0x8a, 0x0e, 0xcf, 0xdb, 0xa5, 0x68, 0x70, 0x33, 0x7a, 0xd0, 0x1e, 0x4d, 0xe2, 0x2f, 0xc5, 0x60, + 0x6d, 0x38, 0x56, 0x55, 0xd9, 0xe5, 0x5e, 0x4e, 0x48, 0xe9, 0x57, 0xa3, 0x02, 0x9e, 0x96, 0x8f, + 0x22, 0xd2, 0x30, 0xd7, 0x75, 0xde, 0xc9, 0x22, 0x3e, 0xd9, 0x59, 0x5d, 0x65, 0x77, 0x93, 0x09, + 0x9b, 0xc3, 0x72, 0xd5, 0xf5, 0xb5, 0xc7, 0x64, 0x37, 0xf5, 0xf9, 0xca, 0xee, 0x2b, 0xf8, 0xa8, + 0xac, 0xee, 0x6c, 0xb6, 0x3c, 0x9a, 0x3f, 0x32, 0x87, 0x16, 0x8e, 0xaf, 0x9c, 0x4f, 0x4b, 0x1e, + 0x2d, 0x8f, 0x9a, 0x5d, 0x6b, 0x72, 0x4b, 0x08, 0xd6, 0xb3, 0x7d, 0xb9, 0x3f, 0x6d, 0xda, 0x0d, + 0x9a, 0x9f, 0x96, 0xb3, 0x5b, 0xd0, 0xc3, 0xfa, 0x8b, 0x1e, 0xd5, 0x5f, 0xf4, 0xcd, 0xa8, 0xfe, + 0xb2, 0x36, 0x2d, 0xd6, 0xfc, 0xc7, 0xff, 0x2a, 0x21, 0xb3, 0xa7, 0x2f, 0x69, 0xe1, 0x57, 0x1a, + 0xd6, 0xee, 0xaa, 0xc4, 0x25, 0xb8, 0x39, 0x2a, 0xe3, 0xbe, 0x2b, 0xec, 0x47, 0x8a, 0x3b, 0x36, + 0xca, 0x41, 0xbb, 0x74, 0x3a, 0x8c, 0x5d, 0x6d, 0xd5, 0xcc, 0x98, 0x91, 0xd6, 0xce, 0x41, 0x29, + 0x22, 0x55, 0x2e, 0x20, 0xe4, 0x9f, 0x21, 0x7c, 0x8c, 0x33, 0x6e, 0x39, 0x65, 0x57, 0x68, 0x2f, + 0x5b, 0xcd, 0x9b, 0xa3, 0xab, 0x59, 0x75, 0x70, 0xd0, 0x2e, 0x91, 0x10, 0xbe, 0xd2, 0xa8, 0x99, + 0xaa, 0x09, 0xf9, 0x09, 0xc2, 0x38, 0x78, 0x68, 0x79, 0x00, 0x69, 0x22, 0x0b, 0x92, 0x39, 0x3a, + 0x24, 0x65, 0xfc, 0x83, 0x76, 0xe9, 0x54, 0x88, 0xa8, 0xdb, 0xa6, 0x99, 0x8a, 0x81, 0xe4, 0x48, + 0xbc, 0xde, 0x69, 0x72, 0x09, 0x28, 0xf7, 0x79, 0x70, 0xa4, 0x38, 0xe8, 0x72, 0xa4, 0x34, 0x6a, + 0xa6, 0x6a, 0xa2, 0x7d, 0x80, 0x4f, 0x86, 0x05, 0x3a, 0x99, 0x6a, 0x5e, 0xa6, 0x2c, 0x02, 0x69, + 0x31, 0xd7, 0x4d, 0x8b, 0x3a, 0x9e, 0xe9, 0x8c, 0xbd, 0xd6, 0x2a, 0xaf, 0xab, 0xe3, 0x33, 0xe6, + 0xc0, 0xf8, 0x93, 0x26, 0xbc, 0x69, 0xdf, 0xc0, 0xa7, 0x14, 0x2c, 0x20, 0xac, 0x37, 0xf0, 0xa4, + 0xf8, 0x0c, 0x82, 0x3a, 0xd5, 0x97, 0x33, 0x21, 0x57, 0x4a, 0x23, 0x6d, 0x29, 0x7e, 0x12, 0xb8, + 0x0d, 0x25, 0xca, 0xc8, 0xf1, 0x71, 0x3c, 0x61, 0xd7, 0xc0, 0xe9, 0x84, 0x5d, 0xeb, 0xcd, 0xdb, + 0x5d, 0xf3, 0x6e, 0xde, 0x56, 0xdb, 0x53, 0xf3, 0x76, 0x64, 0x00, 0x25, 0xcb, 0x58, 0x27, 0x8d, + 0xc6, 0x4f, 0x79, 0xbd, 0x98, 0xc6, 0x75, 0x50, 0xee, 0x3d, 0xb3, 0x0d, 0x11, 0x4c, 0x6e, 0xe4, + 0x60, 0xc6, 0x76, 0x66, 0x5b, 0xf9, 0xcb, 0x59, 0x7c, 0x58, 0xc2, 0x25, 0xdb, 0x78, 0x2a, 0x2c, + 0xf8, 0x92, 0x52, 0x0c, 0x4b, 0x7f, 0x35, 0xb9, 0x30, 0x97, 0x6e, 0x10, 0xba, 0xd0, 0xce, 0x7f, + 0xf8, 0x8f, 0xff, 0xfc, 0x62, 0xe2, 0x0c, 0x39, 0x6d, 0xf4, 0x17, 0xfc, 0xc9, 0xdf, 0x51, 0x4a, + 0xf5, 0x92, 0x2c, 0xf7, 0x0f, 0x9c, 0x51, 0x67, 0x2e, 0xac, 0x8c, 0xd2, 0x05, 0xd0, 0xad, 0x4b, + 0x74, 0x5f, 0x23, 0xef, 0x18, 0xc3, 0xfc, 0xe8, 0x60, 0xec, 0x41, 0xd9, 0x63, 0xdf, 0xd8, 0xeb, + 0xde, 0x0b, 0xf7, 0xc9, 0xa7, 0x08, 0xe7, 0x13, 0xfd, 0xac, 0x3a, 0x4e, 0x52, 0x24, 0x19, 0x55, + 0xe4, 0xa4, 0x48, 0xb2, 0xea, 0xc0, 0xda, 0x92, 0x8c, 0x64, 0x9e, 0x5c, 0x1a, 0x2a, 0x12, 0x01, + 0xf9, 0x42, 0x1a, 0xe4, 0xb5, 0xd6, 0x2a, 0x54, 0x77, 0xde, 0x48, 0x04, 0x92, 0x5c, 0x24, 0x2a, + 0x5c, 0x1d, 0xce, 0x18, 0xf0, 0x5e, 0x93, 0x78, 0x17, 0xc9, 0x42, 0x0c, 0xaf, 0x64, 0x59, 0x01, + 0x1d, 0x74, 0x29, 0x27, 0x8f, 0x51, 0x42, 0xb9, 0x91, 0x2c, 0x0d, 0x37, 0xeb, 0x11, 0x48, 0x7d, + 0x58, 0x73, 0x80, 0xb9, 0x29, 0x61, 0x7e, 0x87, 0xdc, 0xca, 0xa2, 0xd5, 0xd8, 0x0b, 0xf7, 0x64, + 0x21, 0x8d, 0xf0, 0x84, 0x25, 0x9e, 0xa2, 0xbd, 0xb8, 0x47, 0x30, 0x7f, 0x42, 0x78, 0xa6, 0xcf, + 0xa7, 0x10, 0xcb, 0xd2, 0x70, 0x33, 0x3f, 0x20, 0x9a, 0x41, 0x05, 0x5b, 0xed, 0xab, 0x32, 0x9a, + 0xeb, 0xe4, 0xcd, 0x17, 0x88, 0x86, 0x7c, 0x82, 0xf0, 0x09, 0xb5, 0x8e, 0x29, 0xf0, 0x2e, 0xa4, + 0xce, 0x79, 0x4f, 0xbd, 0xb5, 0x70, 0x65, 0x08, 0x4b, 0x40, 0x79, 0x55, 0xa2, 0xbc, 0x4c, 0x2e, + 0xf6, 0x4b, 0x03, 0x7e, 0xbb, 0x53, 0x65, 0xf1, 0x3b, 0x84, 0x4f, 0xc6, 0x4a, 0x54, 0x02, 0x57, + 0xb2, 0xb7, 0xa4, 0xfa, 0x5c, 0x61, 0x71, 0x18, 0x53, 0x40, 0xf6, 0x96, 0x44, 0x76, 0x8d, 0xe8, + 0x46, 0xfa, 0xcf, 0x85, 0x49, 0xd4, 0xfd, 0x17, 0xe1, 0x73, 0xa9, 0xb5, 0x12, 0x72, 0x3d, 0x51, + 0x93, 0x59, 0x05, 0x9d, 0xc2, 0x5b, 0xa3, 0x76, 0x83, 0x20, 0xbe, 0x27, 0x83, 0xb8, 0x4b, 0xde, + 0x8f, 0x05, 0x71, 0xcf, 0x76, 0x1c, 0x5a, 0xab, 0xbc, 0xac, 0xb2, 0xff, 0x8a, 0xf0, 0x6c, 0x2a, + 0x04, 0x31, 0x33, 0xd7, 0x13, 0xe9, 0x7e, 0x91, 0x60, 0x87, 0xa9, 0x3f, 0x69, 0x86, 0x0c, 0xf6, + 0x0a, 0x99, 0x1f, 0x32, 0x58, 0xf2, 0x5b, 0x84, 0x4f, 0xa8, 0x37, 0xff, 0x74, 0x95, 0x27, 0x54, + 0x36, 0x52, 0x54, 0x9e, 0x54, 0x82, 0xd0, 0xae, 0x4b, 0x64, 0x06, 0x59, 0x32, 0x52, 0x7f, 0x58, + 0x4e, 0x92, 0xd2, 0x23, 0x14, 0x9e, 0x1a, 0x3a, 0x45, 0x9b, 0x85, 0x44, 0x19, 0x0c, 0x09, 0x2e, + 0xa5, 0x3e, 0xa2, 0xdd, 0x94, 0xe0, 0x56, 0xc9, 0xd7, 0x47, 0x02, 0x17, 0x97, 0xc5, 0x3d, 0x4a, + 0xf7, 0xc9, 0xef, 0x11, 0x9e, 0x49, 0xba, 0x6f, 0x27, 0xed, 0x74, 0x03, 0xca, 0x28, 0x49, 0x3b, + 0xdd, 0xa0, 0x6b, 0x7c, 0xca, 0x1e, 0x42, 0xa1, 0x4b, 0xa5, 0x21, 0xfa, 0x54, 0xb6, 0x99, 0x57, + 0x11, 0x47, 0x6f, 0xf2, 0x47, 0x84, 0xcf, 0xa6, 0xdc, 0xa7, 0xc8, 0xb5, 0x74, 0xcf, 0xc9, 0x37, + 0xf5, 0xc2, 0xf2, 0x08, 0x3d, 0x06, 0xca, 0xb4, 0x03, 0xd7, 0x13, 0xdd, 0x54, 0xb9, 0x92, 0x3d, + 0x3c, 0x29, 0x26, 0x8e, 0xbc, 0x9e, 0x70, 0x00, 0xeb, 0x5e, 0x1c, 0x0a, 0xc5, 0xb4, 0xcf, 0xe0, + 0xf7, 0xcb, 0xd2, 0xaf, 0x4e, 0xae, 0xf6, 0xcd, 0xb3, 0x3a, 0xbd, 0xbd, 0x93, 0x7a, 0x1f, 0x4f, + 0x47, 0x37, 0x08, 0x72, 0x21, 0xd9, 0x83, 0x72, 0xbb, 0xc8, 0x04, 0xa1, 0x49, 0x10, 0xb3, 0xa4, + 0x90, 0x04, 0x42, 0x5e, 0x44, 0xf6, 0xc9, 0x47, 0x28, 0x7e, 0x58, 0x1e, 0x20, 0xfb, 0x9e, 0xf3, + 0xfc, 0x00, 0xd9, 0xf7, 0x9e, 0xc8, 0xb5, 0x79, 0x89, 0xe4, 0x02, 0x29, 0x19, 0xa9, 0xff, 0x5c, + 0x61, 0xec, 0xd9, 0xb5, 0x7d, 0xf2, 0x63, 0xd8, 0x25, 0xa2, 0x11, 0x06, 0xef, 0x12, 0x43, 0x20, + 0x4a, 0xb9, 0x23, 0x0c, 0xe0, 0xa6, 0x83, 0x68, 0x6d, 0xfd, 0xf1, 0xd3, 0x22, 0x7a, 0xf2, 0xb4, + 0x88, 0xfe, 0xfd, 0xb4, 0x88, 0x3e, 0x7e, 0x56, 0x3c, 0xf4, 0xe4, 0x59, 0xf1, 0xd0, 0x67, 0xcf, + 0x8a, 0x87, 0x3e, 0x58, 0xcc, 0x28, 0xc3, 0xed, 0x86, 0xf9, 0x4b, 0x5c, 0x57, 0xb7, 0xa6, 0x64, + 0x05, 0xe4, 0xcd, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0xfd, 0x47, 0x35, 0x89, 0x1f, 0x24, 0x00, + 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -2117,7 +2117,7 @@ func NewQueryClient(cc grpc1.ClientConn) QueryClient { func (c *queryClient) Params(ctx context.Context, in *QueryParamsRequest, opts ...grpc.CallOption) (*QueryParamsResponse, error) { out := new(QueryParamsResponse) - err := c.cc.Invoke(ctx, "/duality.dex.Query/Params", in, out, opts...) + err := c.cc.Invoke(ctx, "/neutron.dex.Query/Params", in, out, opts...) if err != nil { return nil, err } @@ -2126,7 +2126,7 @@ func (c *queryClient) Params(ctx context.Context, in *QueryParamsRequest, opts . func (c *queryClient) LimitOrderTrancheUser(ctx context.Context, in *QueryGetLimitOrderTrancheUserRequest, opts ...grpc.CallOption) (*QueryGetLimitOrderTrancheUserResponse, error) { out := new(QueryGetLimitOrderTrancheUserResponse) - err := c.cc.Invoke(ctx, "/duality.dex.Query/LimitOrderTrancheUser", in, out, opts...) + err := c.cc.Invoke(ctx, "/neutron.dex.Query/LimitOrderTrancheUser", in, out, opts...) if err != nil { return nil, err } @@ -2135,7 +2135,7 @@ func (c *queryClient) LimitOrderTrancheUser(ctx context.Context, in *QueryGetLim func (c *queryClient) LimitOrderTrancheUserAll(ctx context.Context, in *QueryAllLimitOrderTrancheUserRequest, opts ...grpc.CallOption) (*QueryAllLimitOrderTrancheUserResponse, error) { out := new(QueryAllLimitOrderTrancheUserResponse) - err := c.cc.Invoke(ctx, "/duality.dex.Query/LimitOrderTrancheUserAll", in, out, opts...) + err := c.cc.Invoke(ctx, "/neutron.dex.Query/LimitOrderTrancheUserAll", in, out, opts...) if err != nil { return nil, err } @@ -2144,7 +2144,7 @@ func (c *queryClient) LimitOrderTrancheUserAll(ctx context.Context, in *QueryAll func (c *queryClient) LimitOrderTrancheUserAllByAddress(ctx context.Context, in *QueryAllUserLimitOrdersRequest, opts ...grpc.CallOption) (*QueryAllUserLimitOrdersResponse, error) { out := new(QueryAllUserLimitOrdersResponse) - err := c.cc.Invoke(ctx, "/duality.dex.Query/LimitOrderTrancheUserAllByAddress", in, out, opts...) + err := c.cc.Invoke(ctx, "/neutron.dex.Query/LimitOrderTrancheUserAllByAddress", in, out, opts...) if err != nil { return nil, err } @@ -2153,7 +2153,7 @@ func (c *queryClient) LimitOrderTrancheUserAllByAddress(ctx context.Context, in func (c *queryClient) LimitOrderTranche(ctx context.Context, in *QueryGetLimitOrderTrancheRequest, opts ...grpc.CallOption) (*QueryGetLimitOrderTrancheResponse, error) { out := new(QueryGetLimitOrderTrancheResponse) - err := c.cc.Invoke(ctx, "/duality.dex.Query/LimitOrderTranche", in, out, opts...) + err := c.cc.Invoke(ctx, "/neutron.dex.Query/LimitOrderTranche", in, out, opts...) if err != nil { return nil, err } @@ -2162,7 +2162,7 @@ func (c *queryClient) LimitOrderTranche(ctx context.Context, in *QueryGetLimitOr func (c *queryClient) LimitOrderTrancheAll(ctx context.Context, in *QueryAllLimitOrderTrancheRequest, opts ...grpc.CallOption) (*QueryAllLimitOrderTrancheResponse, error) { out := new(QueryAllLimitOrderTrancheResponse) - err := c.cc.Invoke(ctx, "/duality.dex.Query/LimitOrderTrancheAll", in, out, opts...) + err := c.cc.Invoke(ctx, "/neutron.dex.Query/LimitOrderTrancheAll", in, out, opts...) if err != nil { return nil, err } @@ -2171,7 +2171,7 @@ func (c *queryClient) LimitOrderTrancheAll(ctx context.Context, in *QueryAllLimi func (c *queryClient) UserDepositsAll(ctx context.Context, in *QueryAllUserDepositsRequest, opts ...grpc.CallOption) (*QueryAllUserDepositsResponse, error) { out := new(QueryAllUserDepositsResponse) - err := c.cc.Invoke(ctx, "/duality.dex.Query/UserDepositsAll", in, out, opts...) + err := c.cc.Invoke(ctx, "/neutron.dex.Query/UserDepositsAll", in, out, opts...) if err != nil { return nil, err } @@ -2180,7 +2180,7 @@ func (c *queryClient) UserDepositsAll(ctx context.Context, in *QueryAllUserDepos func (c *queryClient) TickLiquidityAll(ctx context.Context, in *QueryAllTickLiquidityRequest, opts ...grpc.CallOption) (*QueryAllTickLiquidityResponse, error) { out := new(QueryAllTickLiquidityResponse) - err := c.cc.Invoke(ctx, "/duality.dex.Query/TickLiquidityAll", in, out, opts...) + err := c.cc.Invoke(ctx, "/neutron.dex.Query/TickLiquidityAll", in, out, opts...) if err != nil { return nil, err } @@ -2189,7 +2189,7 @@ func (c *queryClient) TickLiquidityAll(ctx context.Context, in *QueryAllTickLiqu func (c *queryClient) InactiveLimitOrderTranche(ctx context.Context, in *QueryGetInactiveLimitOrderTrancheRequest, opts ...grpc.CallOption) (*QueryGetInactiveLimitOrderTrancheResponse, error) { out := new(QueryGetInactiveLimitOrderTrancheResponse) - err := c.cc.Invoke(ctx, "/duality.dex.Query/InactiveLimitOrderTranche", in, out, opts...) + err := c.cc.Invoke(ctx, "/neutron.dex.Query/InactiveLimitOrderTranche", in, out, opts...) if err != nil { return nil, err } @@ -2198,7 +2198,7 @@ func (c *queryClient) InactiveLimitOrderTranche(ctx context.Context, in *QueryGe func (c *queryClient) InactiveLimitOrderTrancheAll(ctx context.Context, in *QueryAllInactiveLimitOrderTrancheRequest, opts ...grpc.CallOption) (*QueryAllInactiveLimitOrderTrancheResponse, error) { out := new(QueryAllInactiveLimitOrderTrancheResponse) - err := c.cc.Invoke(ctx, "/duality.dex.Query/InactiveLimitOrderTrancheAll", in, out, opts...) + err := c.cc.Invoke(ctx, "/neutron.dex.Query/InactiveLimitOrderTrancheAll", in, out, opts...) if err != nil { return nil, err } @@ -2207,7 +2207,7 @@ func (c *queryClient) InactiveLimitOrderTrancheAll(ctx context.Context, in *Quer func (c *queryClient) PoolReservesAll(ctx context.Context, in *QueryAllPoolReservesRequest, opts ...grpc.CallOption) (*QueryAllPoolReservesResponse, error) { out := new(QueryAllPoolReservesResponse) - err := c.cc.Invoke(ctx, "/duality.dex.Query/PoolReservesAll", in, out, opts...) + err := c.cc.Invoke(ctx, "/neutron.dex.Query/PoolReservesAll", in, out, opts...) if err != nil { return nil, err } @@ -2216,7 +2216,7 @@ func (c *queryClient) PoolReservesAll(ctx context.Context, in *QueryAllPoolReser func (c *queryClient) PoolReserves(ctx context.Context, in *QueryGetPoolReservesRequest, opts ...grpc.CallOption) (*QueryGetPoolReservesResponse, error) { out := new(QueryGetPoolReservesResponse) - err := c.cc.Invoke(ctx, "/duality.dex.Query/PoolReserves", in, out, opts...) + err := c.cc.Invoke(ctx, "/neutron.dex.Query/PoolReserves", in, out, opts...) if err != nil { return nil, err } @@ -2225,7 +2225,7 @@ func (c *queryClient) PoolReserves(ctx context.Context, in *QueryGetPoolReserves func (c *queryClient) EstimateMultiHopSwap(ctx context.Context, in *QueryEstimateMultiHopSwapRequest, opts ...grpc.CallOption) (*QueryEstimateMultiHopSwapResponse, error) { out := new(QueryEstimateMultiHopSwapResponse) - err := c.cc.Invoke(ctx, "/duality.dex.Query/EstimateMultiHopSwap", in, out, opts...) + err := c.cc.Invoke(ctx, "/neutron.dex.Query/EstimateMultiHopSwap", in, out, opts...) if err != nil { return nil, err } @@ -2234,7 +2234,7 @@ func (c *queryClient) EstimateMultiHopSwap(ctx context.Context, in *QueryEstimat func (c *queryClient) EstimatePlaceLimitOrder(ctx context.Context, in *QueryEstimatePlaceLimitOrderRequest, opts ...grpc.CallOption) (*QueryEstimatePlaceLimitOrderResponse, error) { out := new(QueryEstimatePlaceLimitOrderResponse) - err := c.cc.Invoke(ctx, "/duality.dex.Query/EstimatePlaceLimitOrder", in, out, opts...) + err := c.cc.Invoke(ctx, "/neutron.dex.Query/EstimatePlaceLimitOrder", in, out, opts...) if err != nil { return nil, err } @@ -2243,7 +2243,7 @@ func (c *queryClient) EstimatePlaceLimitOrder(ctx context.Context, in *QueryEsti func (c *queryClient) Pool(ctx context.Context, in *QueryPoolRequest, opts ...grpc.CallOption) (*QueryPoolResponse, error) { out := new(QueryPoolResponse) - err := c.cc.Invoke(ctx, "/duality.dex.Query/Pool", in, out, opts...) + err := c.cc.Invoke(ctx, "/neutron.dex.Query/Pool", in, out, opts...) if err != nil { return nil, err } @@ -2252,7 +2252,7 @@ func (c *queryClient) Pool(ctx context.Context, in *QueryPoolRequest, opts ...gr func (c *queryClient) PoolByID(ctx context.Context, in *QueryPoolByIDRequest, opts ...grpc.CallOption) (*QueryPoolResponse, error) { out := new(QueryPoolResponse) - err := c.cc.Invoke(ctx, "/duality.dex.Query/PoolByID", in, out, opts...) + err := c.cc.Invoke(ctx, "/neutron.dex.Query/PoolByID", in, out, opts...) if err != nil { return nil, err } @@ -2261,7 +2261,7 @@ func (c *queryClient) PoolByID(ctx context.Context, in *QueryPoolByIDRequest, op func (c *queryClient) PoolMetadata(ctx context.Context, in *QueryGetPoolMetadataRequest, opts ...grpc.CallOption) (*QueryGetPoolMetadataResponse, error) { out := new(QueryGetPoolMetadataResponse) - err := c.cc.Invoke(ctx, "/duality.dex.Query/PoolMetadata", in, out, opts...) + err := c.cc.Invoke(ctx, "/neutron.dex.Query/PoolMetadata", in, out, opts...) if err != nil { return nil, err } @@ -2270,7 +2270,7 @@ func (c *queryClient) PoolMetadata(ctx context.Context, in *QueryGetPoolMetadata func (c *queryClient) PoolMetadataAll(ctx context.Context, in *QueryAllPoolMetadataRequest, opts ...grpc.CallOption) (*QueryAllPoolMetadataResponse, error) { out := new(QueryAllPoolMetadataResponse) - err := c.cc.Invoke(ctx, "/duality.dex.Query/PoolMetadataAll", in, out, opts...) + err := c.cc.Invoke(ctx, "/neutron.dex.Query/PoolMetadataAll", in, out, opts...) if err != nil { return nil, err } @@ -2390,7 +2390,7 @@ func _Query_Params_Handler(srv interface{}, ctx context.Context, dec func(interf } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/duality.dex.Query/Params", + FullMethod: "/neutron.dex.Query/Params", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).Params(ctx, req.(*QueryParamsRequest)) @@ -2408,7 +2408,7 @@ func _Query_LimitOrderTrancheUser_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/duality.dex.Query/LimitOrderTrancheUser", + FullMethod: "/neutron.dex.Query/LimitOrderTrancheUser", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).LimitOrderTrancheUser(ctx, req.(*QueryGetLimitOrderTrancheUserRequest)) @@ -2426,7 +2426,7 @@ func _Query_LimitOrderTrancheUserAll_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/duality.dex.Query/LimitOrderTrancheUserAll", + FullMethod: "/neutron.dex.Query/LimitOrderTrancheUserAll", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).LimitOrderTrancheUserAll(ctx, req.(*QueryAllLimitOrderTrancheUserRequest)) @@ -2444,7 +2444,7 @@ func _Query_LimitOrderTrancheUserAllByAddress_Handler(srv interface{}, ctx conte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/duality.dex.Query/LimitOrderTrancheUserAllByAddress", + FullMethod: "/neutron.dex.Query/LimitOrderTrancheUserAllByAddress", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).LimitOrderTrancheUserAllByAddress(ctx, req.(*QueryAllUserLimitOrdersRequest)) @@ -2462,7 +2462,7 @@ func _Query_LimitOrderTranche_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/duality.dex.Query/LimitOrderTranche", + FullMethod: "/neutron.dex.Query/LimitOrderTranche", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).LimitOrderTranche(ctx, req.(*QueryGetLimitOrderTrancheRequest)) @@ -2480,7 +2480,7 @@ func _Query_LimitOrderTrancheAll_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/duality.dex.Query/LimitOrderTrancheAll", + FullMethod: "/neutron.dex.Query/LimitOrderTrancheAll", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).LimitOrderTrancheAll(ctx, req.(*QueryAllLimitOrderTrancheRequest)) @@ -2498,7 +2498,7 @@ func _Query_UserDepositsAll_Handler(srv interface{}, ctx context.Context, dec fu } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/duality.dex.Query/UserDepositsAll", + FullMethod: "/neutron.dex.Query/UserDepositsAll", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).UserDepositsAll(ctx, req.(*QueryAllUserDepositsRequest)) @@ -2516,7 +2516,7 @@ func _Query_TickLiquidityAll_Handler(srv interface{}, ctx context.Context, dec f } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/duality.dex.Query/TickLiquidityAll", + FullMethod: "/neutron.dex.Query/TickLiquidityAll", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).TickLiquidityAll(ctx, req.(*QueryAllTickLiquidityRequest)) @@ -2534,7 +2534,7 @@ func _Query_InactiveLimitOrderTranche_Handler(srv interface{}, ctx context.Conte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/duality.dex.Query/InactiveLimitOrderTranche", + FullMethod: "/neutron.dex.Query/InactiveLimitOrderTranche", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).InactiveLimitOrderTranche(ctx, req.(*QueryGetInactiveLimitOrderTrancheRequest)) @@ -2552,7 +2552,7 @@ func _Query_InactiveLimitOrderTrancheAll_Handler(srv interface{}, ctx context.Co } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/duality.dex.Query/InactiveLimitOrderTrancheAll", + FullMethod: "/neutron.dex.Query/InactiveLimitOrderTrancheAll", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).InactiveLimitOrderTrancheAll(ctx, req.(*QueryAllInactiveLimitOrderTrancheRequest)) @@ -2570,7 +2570,7 @@ func _Query_PoolReservesAll_Handler(srv interface{}, ctx context.Context, dec fu } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/duality.dex.Query/PoolReservesAll", + FullMethod: "/neutron.dex.Query/PoolReservesAll", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).PoolReservesAll(ctx, req.(*QueryAllPoolReservesRequest)) @@ -2588,7 +2588,7 @@ func _Query_PoolReserves_Handler(srv interface{}, ctx context.Context, dec func( } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/duality.dex.Query/PoolReserves", + FullMethod: "/neutron.dex.Query/PoolReserves", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).PoolReserves(ctx, req.(*QueryGetPoolReservesRequest)) @@ -2606,7 +2606,7 @@ func _Query_EstimateMultiHopSwap_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/duality.dex.Query/EstimateMultiHopSwap", + FullMethod: "/neutron.dex.Query/EstimateMultiHopSwap", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).EstimateMultiHopSwap(ctx, req.(*QueryEstimateMultiHopSwapRequest)) @@ -2624,7 +2624,7 @@ func _Query_EstimatePlaceLimitOrder_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/duality.dex.Query/EstimatePlaceLimitOrder", + FullMethod: "/neutron.dex.Query/EstimatePlaceLimitOrder", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).EstimatePlaceLimitOrder(ctx, req.(*QueryEstimatePlaceLimitOrderRequest)) @@ -2642,7 +2642,7 @@ func _Query_Pool_Handler(srv interface{}, ctx context.Context, dec func(interfac } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/duality.dex.Query/Pool", + FullMethod: "/neutron.dex.Query/Pool", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).Pool(ctx, req.(*QueryPoolRequest)) @@ -2660,7 +2660,7 @@ func _Query_PoolByID_Handler(srv interface{}, ctx context.Context, dec func(inte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/duality.dex.Query/PoolByID", + FullMethod: "/neutron.dex.Query/PoolByID", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).PoolByID(ctx, req.(*QueryPoolByIDRequest)) @@ -2678,7 +2678,7 @@ func _Query_PoolMetadata_Handler(srv interface{}, ctx context.Context, dec func( } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/duality.dex.Query/PoolMetadata", + FullMethod: "/neutron.dex.Query/PoolMetadata", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).PoolMetadata(ctx, req.(*QueryGetPoolMetadataRequest)) @@ -2696,7 +2696,7 @@ func _Query_PoolMetadataAll_Handler(srv interface{}, ctx context.Context, dec fu } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/duality.dex.Query/PoolMetadataAll", + FullMethod: "/neutron.dex.Query/PoolMetadataAll", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).PoolMetadataAll(ctx, req.(*QueryAllPoolMetadataRequest)) @@ -2705,7 +2705,7 @@ func _Query_PoolMetadataAll_Handler(srv interface{}, ctx context.Context, dec fu } var _Query_serviceDesc = grpc.ServiceDesc{ - ServiceName: "duality.dex.Query", + ServiceName: "neutron.dex.Query", HandlerType: (*QueryServer)(nil), Methods: []grpc.MethodDesc{ { @@ -2782,7 +2782,7 @@ var _Query_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "duality/dex/query.proto", + Metadata: "neutron/dex/query.proto", } func (m *QueryParamsRequest) Marshal() (dAtA []byte, err error) { diff --git a/x/dex/types/query.pb.gw.go b/x/dex/types/query.pb.gw.go index 2392b6c0e..0d0fae871 100644 --- a/x/dex/types/query.pb.gw.go +++ b/x/dex/types/query.pb.gw.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-grpc-gateway. DO NOT EDIT. -// source: duality/dex/query.proto +// source: neutron/dex/query.proto /* Package types is a reverse proxy. @@ -2124,41 +2124,41 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } var ( - pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"duality", "dex", "params"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"neutron", "dex", "params"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_LimitOrderTrancheUser_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4}, []string{"duality", "dex", "limit_order_tranche_user", "address", "trancheKey"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_LimitOrderTrancheUser_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4}, []string{"neutron", "dex", "limit_order_tranche_user", "address", "trancheKey"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_LimitOrderTrancheUserAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"duality", "dex", "limit_order_tranche_user"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_LimitOrderTrancheUserAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"neutron", "dex", "limit_order_tranche_user"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_LimitOrderTrancheUserAllByAddress_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"duality", "dex", "user", "limit_orders", "address"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_LimitOrderTrancheUserAllByAddress_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"neutron", "dex", "user", "limit_orders", "address"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_LimitOrderTranche_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5, 1, 0, 4, 1, 5, 6}, []string{"duality", "dex", "limit_order_tranche", "pairID", "tokenIn", "tickIndex", "trancheKey"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_LimitOrderTranche_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5, 1, 0, 4, 1, 5, 6}, []string{"neutron", "dex", "limit_order_tranche", "pairID", "tokenIn", "tickIndex", "trancheKey"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_LimitOrderTrancheAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4}, []string{"duality", "dex", "limit_order_tranche", "pairID", "tokenIn"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_LimitOrderTrancheAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4}, []string{"neutron", "dex", "limit_order_tranche", "pairID", "tokenIn"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_UserDepositsAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"duality", "dex", "user", "deposits", "address"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_UserDepositsAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"neutron", "dex", "user", "deposits", "address"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_TickLiquidityAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4}, []string{"duality", "dex", "tick_liquidity", "pairID", "tokenIn"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_TickLiquidityAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4}, []string{"neutron", "dex", "tick_liquidity", "pairID", "tokenIn"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_InactiveLimitOrderTranche_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5, 1, 0, 4, 1, 5, 6}, []string{"duality", "dex", "filled_limit_order_tranche", "pairID", "tokenIn", "tickIndex", "trancheKey"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_InactiveLimitOrderTranche_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5, 1, 0, 4, 1, 5, 6}, []string{"neutron", "dex", "filled_limit_order_tranche", "pairID", "tokenIn", "tickIndex", "trancheKey"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_InactiveLimitOrderTrancheAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"duality", "dex", "filled_limit_order_tranche"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_InactiveLimitOrderTrancheAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"neutron", "dex", "filled_limit_order_tranche"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_PoolReservesAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4}, []string{"duality", "dex", "pool_reserves", "pairID", "tokenIn"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_PoolReservesAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4}, []string{"neutron", "dex", "pool_reserves", "pairID", "tokenIn"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_PoolReserves_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5, 1, 0, 4, 1, 5, 6}, []string{"duality", "dex", "pool_reserves", "pairID", "tokenIn", "tickIndex", "fee"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_PoolReserves_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5, 1, 0, 4, 1, 5, 6}, []string{"neutron", "dex", "pool_reserves", "pairID", "tokenIn", "tickIndex", "fee"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_EstimateMultiHopSwap_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"duality", "dex", "estimate_multi_hop_swap"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_EstimateMultiHopSwap_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"neutron", "dex", "estimate_multi_hop_swap"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_EstimatePlaceLimitOrder_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"duality", "dex", "estimate_place_limit_order"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_EstimatePlaceLimitOrder_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"neutron", "dex", "estimate_place_limit_order"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_Pool_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5}, []string{"duality", "dex", "pool", "pairID", "tickIndex", "fee"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_Pool_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5}, []string{"neutron", "dex", "pool", "pairID", "tickIndex", "fee"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_PoolByID_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"duality", "dex", "pool", "poolID"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_PoolByID_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"neutron", "dex", "pool", "poolID"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_PoolMetadata_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"duality", "dex", "pool_metadata", "id"}, "", runtime.AssumeColonVerbOpt(true))) + 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{"duality", "dex", "pool_metadata"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_PoolMetadataAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"neutron", "dex", "pool_metadata"}, "", runtime.AssumeColonVerbOpt(false))) ) var ( diff --git a/x/dex/types/tick_liquidity.pb.go b/x/dex/types/tick_liquidity.pb.go index d545fde99..b5b1877c2 100644 --- a/x/dex/types/tick_liquidity.pb.go +++ b/x/dex/types/tick_liquidity.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: duality/dex/tick_liquidity.proto +// source: neutron/dex/tick_liquidity.proto package types @@ -34,7 +34,7 @@ func (m *TickLiquidity) Reset() { *m = TickLiquidity{} } func (m *TickLiquidity) String() string { return proto.CompactTextString(m) } func (*TickLiquidity) ProtoMessage() {} func (*TickLiquidity) Descriptor() ([]byte, []int) { - return fileDescriptor_1bf4777d3c75e20c, []int{0} + return fileDescriptor_fda22cbad7301397, []int{0} } func (m *TickLiquidity) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -109,15 +109,15 @@ func (*TickLiquidity) XXX_OneofWrappers() []interface{} { } func init() { - proto.RegisterType((*TickLiquidity)(nil), "duality.dex.TickLiquidity") + proto.RegisterType((*TickLiquidity)(nil), "neutron.dex.TickLiquidity") } -func init() { proto.RegisterFile("duality/dex/tick_liquidity.proto", fileDescriptor_1bf4777d3c75e20c) } +func init() { proto.RegisterFile("neutron/dex/tick_liquidity.proto", fileDescriptor_fda22cbad7301397) } -var fileDescriptor_1bf4777d3c75e20c = []byte{ - // 262 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x48, 0x29, 0x4d, 0xcc, - 0xc9, 0x2c, 0xa9, 0xd4, 0x4f, 0x49, 0xad, 0xd0, 0x2f, 0xc9, 0x4c, 0xce, 0x8e, 0xcf, 0xc9, 0x2c, +var fileDescriptor_fda22cbad7301397 = []byte{ + // 261 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0xc8, 0x4b, 0x2d, 0x2d, + 0x29, 0xca, 0xcf, 0xd3, 0x4f, 0x49, 0xad, 0xd0, 0x2f, 0xc9, 0x4c, 0xce, 0x8e, 0xcf, 0xc9, 0x2c, 0x2c, 0xcd, 0x4c, 0xc9, 0x2c, 0xa9, 0xd4, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x86, 0xaa, 0xd0, 0x4b, 0x49, 0xad, 0x90, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0x8b, 0xeb, 0x83, 0x58, 0x10, 0x25, 0x52, 0xaa, 0xc8, 0x86, 0xe4, 0x64, 0xe6, 0x66, 0x96, 0xc4, 0xe7, 0x17, 0xa5, 0xa4, 0x16, @@ -127,12 +127,12 @@ var fileDescriptor_1bf4777d3c75e20c = []byte{ 0x54, 0x9d, 0x04, 0xa3, 0x02, 0xa3, 0x06, 0xb7, 0x91, 0xa4, 0x1e, 0x92, 0x9b, 0xf4, 0x02, 0x90, 0x14, 0x78, 0x30, 0x04, 0xa1, 0x68, 0x10, 0xf2, 0xe3, 0x12, 0x04, 0x3b, 0xc8, 0x1f, 0xe4, 0x9e, 0x10, 0x88, 0x73, 0x24, 0x98, 0xc0, 0xa6, 0xc8, 0xa1, 0x98, 0xe2, 0x83, 0xae, 0xca, 0x83, 0x21, - 0x08, 0x53, 0xab, 0x13, 0x37, 0x17, 0x27, 0x3c, 0x80, 0x9c, 0x5c, 0x4f, 0x3c, 0x92, 0x63, 0xbc, + 0x08, 0x53, 0xab, 0x13, 0x37, 0x17, 0x27, 0x3c, 0x80, 0x9c, 0x5c, 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, 0x3b, 0x3d, 0xb3, 0x24, 0xa3, 0x34, 0x49, 0x2f, 0x39, 0x3f, - 0x57, 0x1f, 0x6a, 0x8b, 0x6e, 0x4e, 0x62, 0x52, 0x31, 0x8c, 0xa3, 0x5f, 0x01, 0x09, 0xf0, 0xca, - 0x82, 0xd4, 0xe2, 0x24, 0x36, 0xb0, 0xef, 0x8d, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0xf9, 0x4a, - 0xd5, 0x5a, 0x8c, 0x01, 0x00, 0x00, + 0xb8, 0xf1, 0x58, 0x8e, 0x21, 0x4a, 0x2b, 0x3d, 0xb3, 0x24, 0xa3, 0x34, 0x49, 0x2f, 0x39, 0x3f, + 0x57, 0x1f, 0x6a, 0x8b, 0x6e, 0x7e, 0x51, 0x3a, 0x8c, 0xad, 0x5f, 0x01, 0x09, 0xef, 0xca, 0x82, + 0xd4, 0xe2, 0x24, 0x36, 0xb0, 0xe7, 0x8d, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0xea, 0x7b, 0x19, + 0x9a, 0x8b, 0x01, 0x00, 0x00, } func (m *TickLiquidity) Marshal() (dAtA []byte, err error) { diff --git a/x/dex/types/trade_pair_id.pb.go b/x/dex/types/trade_pair_id.pb.go index 0a29660ee..561d60bd2 100644 --- a/x/dex/types/trade_pair_id.pb.go +++ b/x/dex/types/trade_pair_id.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: duality/dex/trade_pair_id.proto +// source: neutron/dex/trade_pair_id.proto package types @@ -31,7 +31,7 @@ func (m *TradePairID) Reset() { *m = TradePairID{} } func (m *TradePairID) String() string { return proto.CompactTextString(m) } func (*TradePairID) ProtoMessage() {} func (*TradePairID) Descriptor() ([]byte, []int) { - return fileDescriptor_9a4de11785745a60, []int{0} + return fileDescriptor_e0082302b8bd9607, []int{0} } func (m *TradePairID) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -75,24 +75,24 @@ func (m *TradePairID) GetTakerDenom() string { } func init() { - proto.RegisterType((*TradePairID)(nil), "duality.dex.TradePairID") + proto.RegisterType((*TradePairID)(nil), "neutron.dex.TradePairID") } -func init() { proto.RegisterFile("duality/dex/trade_pair_id.proto", fileDescriptor_9a4de11785745a60) } +func init() { proto.RegisterFile("neutron/dex/trade_pair_id.proto", fileDescriptor_e0082302b8bd9607) } -var fileDescriptor_9a4de11785745a60 = []byte{ - // 174 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4f, 0x29, 0x4d, 0xcc, - 0xc9, 0x2c, 0xa9, 0xd4, 0x4f, 0x49, 0xad, 0xd0, 0x2f, 0x29, 0x4a, 0x4c, 0x49, 0x8d, 0x2f, 0x48, +var fileDescriptor_e0082302b8bd9607 = []byte{ + // 173 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xcf, 0x4b, 0x2d, 0x2d, + 0x29, 0xca, 0xcf, 0xd3, 0x4f, 0x49, 0xad, 0xd0, 0x2f, 0x29, 0x4a, 0x4c, 0x49, 0x8d, 0x2f, 0x48, 0xcc, 0x2c, 0x8a, 0xcf, 0x4c, 0xd1, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x86, 0x2a, 0xd0, 0x4b, 0x49, 0xad, 0x50, 0xf2, 0xe5, 0xe2, 0x0e, 0x01, 0xa9, 0x09, 0x48, 0xcc, 0x2c, 0xf2, 0x74, 0x11, 0x92, 0xe3, 0xe2, 0xca, 0x4d, 0xcc, 0x4e, 0x2d, 0x72, 0x49, 0xcd, 0xcb, 0xcf, 0x95, 0x60, 0x52, 0x60, 0xd4, 0xe0, 0x0c, 0x42, 0x12, 0x01, 0xc9, 0x97, 0x20, 0xe4, 0x99, 0x21, 0xf2, 0x08, - 0x11, 0x27, 0xd7, 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, 0x4e, 0xcf, - 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x87, 0x3a, 0x40, 0x37, 0x27, 0x31, 0xa9, - 0x18, 0xc6, 0xd1, 0xaf, 0x80, 0x38, 0xb8, 0xb2, 0x20, 0xb5, 0x38, 0x89, 0x0d, 0xec, 0x52, 0x63, - 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0xf8, 0xf7, 0xc6, 0xed, 0xcc, 0x00, 0x00, 0x00, + 0x11, 0x27, 0x97, 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, 0x4a, 0xcf, + 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x87, 0x3a, 0x40, 0x37, 0xbf, 0x28, 0x1d, + 0xc6, 0xd6, 0xaf, 0x80, 0xb8, 0xb7, 0xb2, 0x20, 0xb5, 0x38, 0x89, 0x0d, 0xec, 0x50, 0x63, 0x40, + 0x00, 0x00, 0x00, 0xff, 0xff, 0xee, 0x17, 0xd6, 0xa6, 0xcb, 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 a01cef797..8503e97e5 100644 --- a/x/dex/types/tx.pb.go +++ b/x/dex/types/tx.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: duality/dex/tx.proto +// source: neutron/dex/tx.proto package types @@ -12,7 +12,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_duality_labs_duality_utils_math "github.com/neutron-org/neutron/utils/math" + github_com_neutron_org_neutron_utils_math "github.com/neutron-org/neutron/utils/math" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -66,7 +66,7 @@ func (x LimitOrderType) String() string { } func (LimitOrderType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_0012bae7d4530cbb, []int{0} + return fileDescriptor_a489f6e187d5e074, []int{0} } type DepositOptions struct { @@ -77,7 +77,7 @@ func (m *DepositOptions) Reset() { *m = DepositOptions{} } func (m *DepositOptions) String() string { return proto.CompactTextString(m) } func (*DepositOptions) ProtoMessage() {} func (*DepositOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_0012bae7d4530cbb, []int{0} + return fileDescriptor_a489f6e187d5e074, []int{0} } func (m *DepositOptions) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -129,7 +129,7 @@ func (m *MsgDeposit) Reset() { *m = MsgDeposit{} } func (m *MsgDeposit) String() string { return proto.CompactTextString(m) } func (*MsgDeposit) ProtoMessage() {} func (*MsgDeposit) Descriptor() ([]byte, []int) { - return fileDescriptor_0012bae7d4530cbb, []int{1} + return fileDescriptor_a489f6e187d5e074, []int{1} } func (m *MsgDeposit) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -216,7 +216,7 @@ func (m *MsgDepositResponse) Reset() { *m = MsgDepositResponse{} } func (m *MsgDepositResponse) String() string { return proto.CompactTextString(m) } func (*MsgDepositResponse) ProtoMessage() {} func (*MsgDepositResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_0012bae7d4530cbb, []int{2} + return fileDescriptor_a489f6e187d5e074, []int{2} } func (m *MsgDepositResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -259,7 +259,7 @@ func (m *MsgWithdrawal) Reset() { *m = MsgWithdrawal{} } func (m *MsgWithdrawal) String() string { return proto.CompactTextString(m) } func (*MsgWithdrawal) ProtoMessage() {} func (*MsgWithdrawal) Descriptor() ([]byte, []int) { - return fileDescriptor_0012bae7d4530cbb, []int{3} + return fileDescriptor_a489f6e187d5e074, []int{3} } func (m *MsgWithdrawal) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -337,7 +337,7 @@ func (m *MsgWithdrawalResponse) Reset() { *m = MsgWithdrawalResponse{} } func (m *MsgWithdrawalResponse) String() string { return proto.CompactTextString(m) } func (*MsgWithdrawalResponse) ProtoMessage() {} func (*MsgWithdrawalResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_0012bae7d4530cbb, []int{4} + return fileDescriptor_a489f6e187d5e074, []int{4} } func (m *MsgWithdrawalResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -373,7 +373,7 @@ type MsgPlaceLimitOrder struct { TokenOut string `protobuf:"bytes,4,opt,name=tokenOut,proto3" json:"tokenOut,omitempty"` TickIndexInToOut int64 `protobuf:"varint,5,opt,name=tickIndexInToOut,proto3" json:"tickIndexInToOut,omitempty"` AmountIn github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,7,opt,name=amountIn,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"amountIn" yaml:"amountIn"` - OrderType LimitOrderType `protobuf:"varint,8,opt,name=orderType,proto3,enum=duality.dex.LimitOrderType" json:"orderType,omitempty"` + OrderType LimitOrderType `protobuf:"varint,8,opt,name=orderType,proto3,enum=neutron.dex.LimitOrderType" json:"orderType,omitempty"` // expirationTime is only valid iff orderType == GOOD_TIL_TIME. ExpirationTime *time.Time `protobuf:"bytes,9,opt,name=expirationTime,proto3,stdtime" json:"expirationTime,omitempty"` MaxAmountOut *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,10,opt,name=maxAmountOut,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"maxAmountOut" yaml:"maxAmountOut"` @@ -383,7 +383,7 @@ func (m *MsgPlaceLimitOrder) Reset() { *m = MsgPlaceLimitOrder{} } func (m *MsgPlaceLimitOrder) String() string { return proto.CompactTextString(m) } func (*MsgPlaceLimitOrder) ProtoMessage() {} func (*MsgPlaceLimitOrder) Descriptor() ([]byte, []int) { - return fileDescriptor_0012bae7d4530cbb, []int{5} + return fileDescriptor_a489f6e187d5e074, []int{5} } func (m *MsgPlaceLimitOrder) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -475,7 +475,7 @@ func (m *MsgPlaceLimitOrderResponse) Reset() { *m = MsgPlaceLimitOrderRe func (m *MsgPlaceLimitOrderResponse) String() string { return proto.CompactTextString(m) } func (*MsgPlaceLimitOrderResponse) ProtoMessage() {} func (*MsgPlaceLimitOrderResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_0012bae7d4530cbb, []int{6} + return fileDescriptor_a489f6e187d5e074, []int{6} } func (m *MsgPlaceLimitOrderResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -520,7 +520,7 @@ func (m *MsgWithdrawFilledLimitOrder) Reset() { *m = MsgWithdrawFilledLi func (m *MsgWithdrawFilledLimitOrder) String() string { return proto.CompactTextString(m) } func (*MsgWithdrawFilledLimitOrder) ProtoMessage() {} func (*MsgWithdrawFilledLimitOrder) Descriptor() ([]byte, []int) { - return fileDescriptor_0012bae7d4530cbb, []int{7} + return fileDescriptor_a489f6e187d5e074, []int{7} } func (m *MsgWithdrawFilledLimitOrder) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -570,7 +570,7 @@ func (m *MsgWithdrawFilledLimitOrderResponse) Reset() { *m = MsgWithdraw func (m *MsgWithdrawFilledLimitOrderResponse) String() string { return proto.CompactTextString(m) } func (*MsgWithdrawFilledLimitOrderResponse) ProtoMessage() {} func (*MsgWithdrawFilledLimitOrderResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_0012bae7d4530cbb, []int{8} + return fileDescriptor_a489f6e187d5e074, []int{8} } func (m *MsgWithdrawFilledLimitOrderResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -608,7 +608,7 @@ func (m *MsgCancelLimitOrder) Reset() { *m = MsgCancelLimitOrder{} } func (m *MsgCancelLimitOrder) String() string { return proto.CompactTextString(m) } func (*MsgCancelLimitOrder) ProtoMessage() {} func (*MsgCancelLimitOrder) Descriptor() ([]byte, []int) { - return fileDescriptor_0012bae7d4530cbb, []int{9} + return fileDescriptor_a489f6e187d5e074, []int{9} } func (m *MsgCancelLimitOrder) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -658,7 +658,7 @@ func (m *MsgCancelLimitOrderResponse) Reset() { *m = MsgCancelLimitOrder func (m *MsgCancelLimitOrderResponse) String() string { return proto.CompactTextString(m) } func (*MsgCancelLimitOrderResponse) ProtoMessage() {} func (*MsgCancelLimitOrderResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_0012bae7d4530cbb, []int{10} + return fileDescriptor_a489f6e187d5e074, []int{10} } func (m *MsgCancelLimitOrderResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -695,7 +695,7 @@ func (m *MultiHopRoute) Reset() { *m = MultiHopRoute{} } func (m *MultiHopRoute) String() string { return proto.CompactTextString(m) } func (*MultiHopRoute) ProtoMessage() {} func (*MultiHopRoute) Descriptor() ([]byte, []int) { - return fileDescriptor_0012bae7d4530cbb, []int{11} + return fileDescriptor_a489f6e187d5e074, []int{11} } func (m *MultiHopRoute) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -732,11 +732,11 @@ func (m *MultiHopRoute) GetHops() []string { } type MsgMultiHopSwap struct { - 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 github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,4,opt,name=amountIn,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"amountIn" yaml:"amountIn"` - ExitLimitPrice github_com_duality_labs_duality_utils_math.PrecDec `protobuf:"bytes,5,opt,name=exitLimitPrice,proto3,customtype=github.com/neutron-org/neutron/utils/math.PrecDec" json:"exitLimitPrice" yaml:"exitLimitPrice"` + 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 github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,4,opt,name=amountIn,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"amountIn" yaml:"amountIn"` + ExitLimitPrice github_com_neutron_org_neutron_utils_math.PrecDec `protobuf:"bytes,5,opt,name=exitLimitPrice,proto3,customtype=github.com/neutron-org/neutron/utils/math.PrecDec" json:"exitLimitPrice" yaml:"exitLimitPrice"` // 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=pickBestRoute,proto3" json:"pickBestRoute,omitempty"` @@ -746,7 +746,7 @@ func (m *MsgMultiHopSwap) Reset() { *m = MsgMultiHopSwap{} } func (m *MsgMultiHopSwap) String() string { return proto.CompactTextString(m) } func (*MsgMultiHopSwap) ProtoMessage() {} func (*MsgMultiHopSwap) Descriptor() ([]byte, []int) { - return fileDescriptor_0012bae7d4530cbb, []int{12} + return fileDescriptor_a489f6e187d5e074, []int{12} } func (m *MsgMultiHopSwap) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -811,7 +811,7 @@ func (m *MsgMultiHopSwapResponse) Reset() { *m = MsgMultiHopSwapResponse func (m *MsgMultiHopSwapResponse) String() string { return proto.CompactTextString(m) } func (*MsgMultiHopSwapResponse) ProtoMessage() {} func (*MsgMultiHopSwapResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_0012bae7d4530cbb, []int{13} + return fileDescriptor_a489f6e187d5e074, []int{13} } func (m *MsgMultiHopSwapResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -841,107 +841,107 @@ func (m *MsgMultiHopSwapResponse) XXX_DiscardUnknown() { var xxx_messageInfo_MsgMultiHopSwapResponse proto.InternalMessageInfo func init() { - proto.RegisterEnum("duality.dex.LimitOrderType", LimitOrderType_name, LimitOrderType_value) - proto.RegisterType((*DepositOptions)(nil), "duality.dex.DepositOptions") - proto.RegisterType((*MsgDeposit)(nil), "duality.dex.MsgDeposit") - proto.RegisterType((*MsgDepositResponse)(nil), "duality.dex.MsgDepositResponse") - proto.RegisterType((*MsgWithdrawal)(nil), "duality.dex.MsgWithdrawal") - proto.RegisterType((*MsgWithdrawalResponse)(nil), "duality.dex.MsgWithdrawalResponse") - proto.RegisterType((*MsgPlaceLimitOrder)(nil), "duality.dex.MsgPlaceLimitOrder") - proto.RegisterType((*MsgPlaceLimitOrderResponse)(nil), "duality.dex.MsgPlaceLimitOrderResponse") - proto.RegisterType((*MsgWithdrawFilledLimitOrder)(nil), "duality.dex.MsgWithdrawFilledLimitOrder") - proto.RegisterType((*MsgWithdrawFilledLimitOrderResponse)(nil), "duality.dex.MsgWithdrawFilledLimitOrderResponse") - proto.RegisterType((*MsgCancelLimitOrder)(nil), "duality.dex.MsgCancelLimitOrder") - proto.RegisterType((*MsgCancelLimitOrderResponse)(nil), "duality.dex.MsgCancelLimitOrderResponse") - proto.RegisterType((*MultiHopRoute)(nil), "duality.dex.MultiHopRoute") - proto.RegisterType((*MsgMultiHopSwap)(nil), "duality.dex.MsgMultiHopSwap") - proto.RegisterType((*MsgMultiHopSwapResponse)(nil), "duality.dex.MsgMultiHopSwapResponse") -} - -func init() { proto.RegisterFile("duality/dex/tx.proto", fileDescriptor_0012bae7d4530cbb) } - -var fileDescriptor_0012bae7d4530cbb = []byte{ - // 1273 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0x4b, 0x8f, 0xdb, 0xd4, - 0x17, 0x1f, 0xc7, 0x69, 0x32, 0x73, 0xe6, 0x95, 0xde, 0x3e, 0xc6, 0x7f, 0xf7, 0x4f, 0x1c, 0xb9, - 0x85, 0x86, 0xa2, 0x3a, 0x9d, 0x41, 0x2c, 0x28, 0xab, 0x78, 0x66, 0x0a, 0x6e, 0x93, 0xa6, 0x72, - 0x53, 0x2a, 0x40, 0x22, 0x72, 0x9c, 0xdb, 0xc4, 0x9a, 0xc4, 0xd7, 0xf2, 0xbd, 0x99, 0x66, 0x16, - 0x2c, 0xd8, 0x22, 0x55, 0xea, 0x86, 0x15, 0x6c, 0xf8, 0x0e, 0x48, 0x2c, 0xf8, 0x02, 0x5d, 0x56, - 0x62, 0x83, 0x58, 0x04, 0xd4, 0xee, 0xba, 0x9c, 0x4f, 0x80, 0xfc, 0x8c, 0xed, 0x74, 0x3a, 0x9d, - 0x16, 0x58, 0xc5, 0xf7, 0x9c, 0xdf, 0xfd, 0x9d, 0x73, 0xcf, 0x3d, 0x8f, 0x1b, 0x38, 0xdb, 0x1b, - 0x1b, 0x43, 0x8b, 0x1d, 0xd4, 0x7a, 0x78, 0x52, 0x63, 0x13, 0xc5, 0x71, 0x09, 0x23, 0x68, 0x39, - 0x94, 0x2a, 0x3d, 0x3c, 0x11, 0xcf, 0xf6, 0x49, 0x9f, 0xf8, 0xf2, 0x9a, 0xf7, 0x15, 0x40, 0xc4, - 0xb2, 0x49, 0xe8, 0x88, 0xd0, 0x5a, 0xd7, 0xa0, 0xb8, 0xb6, 0xbf, 0xd9, 0xc5, 0xcc, 0xd8, 0xac, - 0x99, 0xc4, 0xb2, 0x43, 0xbd, 0xd4, 0x27, 0xa4, 0x3f, 0xc4, 0x35, 0x7f, 0xd5, 0x1d, 0x3f, 0xa8, - 0x31, 0x6b, 0x84, 0x29, 0x33, 0x46, 0x4e, 0x00, 0x90, 0x3f, 0x81, 0xb5, 0x1d, 0xec, 0x10, 0x6a, - 0xb1, 0x96, 0xc3, 0x2c, 0x62, 0x53, 0xf4, 0x3e, 0x94, 0x7a, 0x16, 0x35, 0xba, 0x43, 0xdc, 0x31, - 0xc6, 0x8c, 0xd0, 0x87, 0x86, 0x23, 0x70, 0x15, 0xae, 0xba, 0xa8, 0xaf, 0x87, 0xf2, 0x7a, 0x28, - 0x96, 0x7f, 0xe5, 0x01, 0x9a, 0xb4, 0x1f, 0x12, 0x20, 0x01, 0x8a, 0xa6, 0x8b, 0x0d, 0x46, 0x5c, - 0x7f, 0xc3, 0x92, 0x1e, 0x2d, 0x91, 0x08, 0x8b, 0x2e, 0x36, 0xb1, 0xb5, 0x8f, 0x5d, 0x21, 0xe7, - 0xab, 0xe2, 0x35, 0x3a, 0x0f, 0x05, 0x46, 0xf6, 0xb0, 0x5d, 0x17, 0x78, 0x5f, 0x13, 0xae, 0x62, - 0xb9, 0x2a, 0xe4, 0x13, 0x72, 0x15, 0x0d, 0x60, 0xd1, 0x18, 0x91, 0xb1, 0xcd, 0x68, 0x5d, 0x38, - 0x55, 0xe1, 0xab, 0x4b, 0x6a, 0xe3, 0xc9, 0x54, 0x5a, 0xf8, 0x63, 0x2a, 0xbd, 0xd7, 0xb7, 0xd8, - 0x60, 0xdc, 0x55, 0x4c, 0x32, 0xaa, 0x85, 0x71, 0x09, 0x7e, 0xae, 0xd2, 0xde, 0x5e, 0x8d, 0x1d, - 0x38, 0x98, 0x2a, 0x9a, 0xcd, 0x5e, 0x4c, 0xa5, 0x62, 0xc0, 0x50, 0x3f, 0x9c, 0x4a, 0xeb, 0x07, - 0xc6, 0x68, 0x78, 0x5d, 0x8e, 0x28, 0x65, 0x3d, 0x66, 0x4f, 0x58, 0x52, 0x85, 0xc2, 0xdb, 0x59, - 0x52, 0xe7, 0x2c, 0xa9, 0x33, 0x4b, 0x2a, 0xaa, 0xc2, 0x3a, 0xb3, 0xcc, 0x3d, 0xcd, 0xee, 0xe1, - 0x09, 0xa6, 0xf5, 0x36, 0x51, 0x85, 0x62, 0x85, 0xaf, 0xf2, 0x7a, 0x56, 0x8c, 0x10, 0xe4, 0x1f, - 0x60, 0x4c, 0x85, 0xc5, 0x0a, 0x5f, 0xcd, 0xeb, 0xfe, 0x37, 0xfa, 0x08, 0x8a, 0xe1, 0xe5, 0x09, - 0x4b, 0x15, 0xbe, 0xba, 0xbc, 0x75, 0x41, 0x49, 0x64, 0x8e, 0x92, 0xbe, 0x5f, 0x3d, 0xc2, 0xca, - 0x3f, 0xe7, 0x00, 0xcd, 0x6e, 0x4f, 0xc7, 0xd4, 0x21, 0x36, 0xc5, 0xe8, 0x11, 0x07, 0xa7, 0x75, - 0x4c, 0xb1, 0xbb, 0x8f, 0xaf, 0x85, 0x3a, 0xdc, 0x13, 0x38, 0xff, 0xfc, 0x9d, 0x13, 0x9f, 0xff, - 0xb4, 0x9b, 0xa5, 0x3a, 0x9c, 0x4a, 0x42, 0x10, 0x89, 0x39, 0x95, 0xac, 0xcf, 0x5b, 0x4e, 0xfa, - 0xb3, 0x39, 0xf3, 0x27, 0xf7, 0x96, 0xfe, 0x6c, 0x1e, 0xed, 0xcf, 0xe6, 0x4b, 0xfc, 0x49, 0xc8, - 0x7e, 0xc9, 0xc1, 0x6a, 0x93, 0xf6, 0xef, 0x5b, 0x6c, 0xd0, 0x73, 0x8d, 0x87, 0xc6, 0xf0, 0x3f, - 0xca, 0xfb, 0x6f, 0x39, 0x58, 0xa3, 0x03, 0xc3, 0xc5, 0xb4, 0x4d, 0x74, 0x3c, 0x22, 0xfb, 0x38, - 0x4c, 0xff, 0x2f, 0x4e, 0x1c, 0x84, 0x0c, 0xcf, 0xe1, 0x54, 0x3a, 0x17, 0x44, 0x20, 0x2d, 0x97, - 0xf5, 0x0c, 0xf0, 0x65, 0x79, 0x5a, 0x78, 0x75, 0x9e, 0x16, 0x67, 0x79, 0x2a, 0x6f, 0xc0, 0xb9, - 0x54, 0xe0, 0xa2, 0x94, 0x93, 0x7f, 0xc8, 0xfb, 0x99, 0x78, 0x67, 0x68, 0x98, 0xb8, 0x61, 0x8d, - 0x2c, 0xd6, 0x72, 0x7b, 0xd8, 0x7d, 0xc3, 0xb8, 0x0a, 0x50, 0xf4, 0x23, 0xa6, 0xd9, 0x61, 0x60, - 0xa3, 0xa5, 0xb7, 0xcb, 0xff, 0x6c, 0x8d, 0x59, 0x18, 0xdb, 0x78, 0x8d, 0xae, 0x40, 0x29, 0x3e, - 0x82, 0x66, 0xb7, 0x89, 0x87, 0x39, 0x55, 0xe1, 0xaa, 0xbc, 0x3e, 0x27, 0x47, 0x56, 0xd4, 0x17, - 0x34, 0x5b, 0x28, 0x7a, 0x3c, 0x6a, 0xf3, 0xc4, 0x57, 0x10, 0x33, 0x64, 0x1b, 0x83, 0x66, 0xc7, - 0x8d, 0x41, 0xb3, 0xd1, 0xc7, 0xb0, 0x44, 0xbc, 0x58, 0xb4, 0x0f, 0x1c, 0x2c, 0x2c, 0x56, 0xb8, - 0xea, 0x5a, 0xa6, 0xb8, 0x67, 0xe1, 0xf2, 0x20, 0xfa, 0x0c, 0x8d, 0x1a, 0xb0, 0x86, 0x27, 0x8e, - 0xe5, 0x1a, 0x5e, 0xb5, 0xb7, 0xad, 0x11, 0x16, 0x96, 0x2a, 0x5c, 0x75, 0x79, 0x4b, 0x54, 0x82, - 0x99, 0xa0, 0x44, 0x33, 0x41, 0x69, 0x47, 0x33, 0x41, 0x5d, 0x7c, 0x32, 0x95, 0xb8, 0xc7, 0x7f, - 0x4a, 0x9c, 0x9e, 0xd9, 0x8b, 0x0e, 0x60, 0x65, 0x64, 0x4c, 0xea, 0xbe, 0x5f, 0x5e, 0x6c, 0xc0, - 0x3f, 0xf7, 0x3d, 0x0f, 0x7f, 0xa2, 0x73, 0xa7, 0x58, 0x0e, 0xa7, 0xd2, 0x99, 0xe0, 0xec, 0x49, - 0xa9, 0xac, 0xa7, 0x40, 0xf2, 0x6f, 0x39, 0x10, 0xe7, 0xb3, 0x23, 0xee, 0x57, 0x65, 0x00, 0xe6, - 0x1a, 0xb6, 0x39, 0xc0, 0xb7, 0xf0, 0x41, 0x98, 0x28, 0x09, 0x09, 0xfa, 0x06, 0x0a, 0xde, 0x40, - 0xd4, 0x6c, 0x3f, 0x53, 0x96, 0xb7, 0xfe, 0xa7, 0x04, 0xae, 0x29, 0xde, 0xcc, 0x54, 0xc2, 0x99, - 0xa9, 0x6c, 0x13, 0xcb, 0x56, 0x6f, 0x86, 0xd7, 0x78, 0xf9, 0x35, 0x8e, 0xe3, 0x6d, 0x78, 0x31, - 0x95, 0x42, 0xee, 0xc3, 0xa9, 0xb4, 0x1a, 0x9c, 0x24, 0x58, 0xcb, 0x7a, 0xa8, 0x40, 0xdf, 0x73, - 0xb0, 0xc2, 0x8c, 0x3d, 0xec, 0x7a, 0x1b, 0xbc, 0xc8, 0xf1, 0xc7, 0x79, 0xf1, 0xf9, 0xc9, 0xbd, - 0x48, 0x59, 0x98, 0x45, 0x35, 0x29, 0x95, 0xf5, 0x14, 0x48, 0xbe, 0x0f, 0x17, 0x12, 0xc5, 0x78, - 0xc3, 0x1a, 0x0e, 0x71, 0xef, 0xb5, 0x6a, 0x2f, 0x1d, 0xef, 0x5c, 0x36, 0xde, 0xf2, 0xbb, 0x70, - 0xf1, 0x15, 0xc4, 0x71, 0xcd, 0xb7, 0xe0, 0x4c, 0x93, 0xf6, 0xb7, 0x0d, 0xdb, 0xc4, 0xc3, 0x7f, - 0xc4, 0xee, 0x3b, 0xfe, 0x81, 0xb2, 0x84, 0xb1, 0xbd, 0x8b, 0xb0, 0xda, 0x1c, 0x0f, 0x99, 0xf5, - 0x19, 0x71, 0x74, 0x32, 0x66, 0xd8, 0xeb, 0x50, 0x03, 0xe2, 0xd0, 0x60, 0xb2, 0xe9, 0xfe, 0xb7, - 0xfc, 0x23, 0x0f, 0xeb, 0x4d, 0xda, 0x8f, 0x80, 0x77, 0x1f, 0x1a, 0xce, 0x1b, 0x76, 0xa1, 0x2d, - 0x28, 0xb8, 0x9e, 0x19, 0x2a, 0xf0, 0xfe, 0x48, 0x16, 0x53, 0x55, 0x9b, 0xf2, 0x44, 0x0f, 0x91, - 0xa9, 0xbe, 0x92, 0xff, 0x77, 0xfb, 0xca, 0x23, 0xce, 0xeb, 0x0e, 0x16, 0xf3, 0x03, 0x75, 0xc7, - 0xb5, 0x4c, 0xec, 0x77, 0xbb, 0x25, 0x15, 0x87, 0x16, 0xb7, 0x12, 0x16, 0x43, 0xcf, 0xaf, 0x0e, - 0x8d, 0x2e, 0x8d, 0x16, 0xb5, 0x31, 0xb3, 0x86, 0xb4, 0x36, 0x32, 0xd8, 0x40, 0xb9, 0xe3, 0x62, - 0x73, 0x07, 0x9b, 0xde, 0x60, 0x49, 0x73, 0xce, 0x06, 0x4b, 0x5a, 0x2e, 0xeb, 0x19, 0x20, 0xba, - 0x04, 0xab, 0x8e, 0x65, 0xee, 0xa9, 0x98, 0x32, 0x3f, 0x26, 0x42, 0xc1, 0x7f, 0x71, 0xa6, 0x85, - 0xf2, 0x77, 0x1c, 0x6c, 0x64, 0xae, 0x27, 0x6e, 0x03, 0x04, 0x8a, 0x66, 0x58, 0x61, 0xdc, 0x71, - 0x15, 0x76, 0xfd, 0xe4, 0x15, 0x16, 0x91, 0xeb, 0xd1, 0xc7, 0x95, 0x09, 0xac, 0xa5, 0x9b, 0x2f, - 0x3a, 0x0f, 0xe8, 0xd3, 0x56, 0x6b, 0xa7, 0xd3, 0xd6, 0x1a, 0x9d, 0xed, 0xfa, 0xed, 0xed, 0xdd, - 0x46, 0x63, 0x77, 0xa7, 0xb4, 0x80, 0x4a, 0xb0, 0x72, 0x43, 0x6b, 0x34, 0x3a, 0x2d, 0xbd, 0x73, - 0x4b, 0x6b, 0x34, 0x4a, 0x1c, 0xda, 0x80, 0x33, 0x5a, 0xb3, 0xb9, 0xbb, 0xa3, 0xd5, 0xdb, 0xbb, - 0x9e, 0x38, 0x40, 0x97, 0x72, 0x1e, 0xf4, 0xe6, 0xbd, 0xbb, 0xed, 0x8e, 0x76, 0xbb, 0xd3, 0xd6, - 0x9a, 0xbb, 0x25, 0x1e, 0x9d, 0x86, 0xd5, 0x98, 0xd4, 0x17, 0xe5, 0xb7, 0x7e, 0xca, 0x03, 0xdf, - 0xa4, 0x7d, 0xb4, 0x0d, 0xc5, 0xe8, 0xe9, 0xbd, 0x91, 0x4e, 0xaf, 0xf8, 0x55, 0x27, 0x4a, 0x47, - 0x28, 0xe2, 0xb8, 0x35, 0x00, 0x12, 0x4f, 0x19, 0x31, 0x0b, 0x9f, 0xe9, 0x44, 0xf9, 0x68, 0x5d, - 0xcc, 0xf6, 0x15, 0xac, 0x67, 0xa7, 0xf8, 0x9c, 0x07, 0x19, 0x80, 0x78, 0xf9, 0x18, 0x40, 0x4c, - 0xbe, 0x0f, 0xc2, 0x91, 0xfd, 0xaa, 0x7a, 0x94, 0x73, 0x59, 0xa4, 0x78, 0xed, 0x75, 0x91, 0xb1, - 0xdd, 0xaf, 0xa1, 0x34, 0xd7, 0xa7, 0x2a, 0x59, 0x96, 0x2c, 0x42, 0xac, 0x1e, 0x87, 0x88, 0xf9, - 0x75, 0x58, 0x49, 0x75, 0x9c, 0xff, 0x67, 0x77, 0x26, 0xb5, 0xe2, 0xa5, 0x57, 0x69, 0x23, 0x4e, - 0x75, 0xf7, 0xc9, 0xb3, 0x32, 0xf7, 0xf4, 0x59, 0x99, 0xfb, 0xeb, 0x59, 0x99, 0x7b, 0xfc, 0xbc, - 0xbc, 0xf0, 0xf4, 0x79, 0x79, 0xe1, 0xf7, 0xe7, 0xe5, 0x85, 0x2f, 0x3f, 0x38, 0xae, 0xb2, 0x27, - 0xc1, 0xbf, 0x50, 0x2f, 0xfb, 0xbb, 0x05, 0xff, 0x91, 0xf0, 0xe1, 0xdf, 0x01, 0x00, 0x00, 0xff, - 0xff, 0x3e, 0x98, 0x48, 0x57, 0xa1, 0x0e, 0x00, 0x00, + proto.RegisterEnum("neutron.dex.LimitOrderType", LimitOrderType_name, LimitOrderType_value) + proto.RegisterType((*DepositOptions)(nil), "neutron.dex.DepositOptions") + proto.RegisterType((*MsgDeposit)(nil), "neutron.dex.MsgDeposit") + proto.RegisterType((*MsgDepositResponse)(nil), "neutron.dex.MsgDepositResponse") + proto.RegisterType((*MsgWithdrawal)(nil), "neutron.dex.MsgWithdrawal") + proto.RegisterType((*MsgWithdrawalResponse)(nil), "neutron.dex.MsgWithdrawalResponse") + proto.RegisterType((*MsgPlaceLimitOrder)(nil), "neutron.dex.MsgPlaceLimitOrder") + proto.RegisterType((*MsgPlaceLimitOrderResponse)(nil), "neutron.dex.MsgPlaceLimitOrderResponse") + proto.RegisterType((*MsgWithdrawFilledLimitOrder)(nil), "neutron.dex.MsgWithdrawFilledLimitOrder") + proto.RegisterType((*MsgWithdrawFilledLimitOrderResponse)(nil), "neutron.dex.MsgWithdrawFilledLimitOrderResponse") + proto.RegisterType((*MsgCancelLimitOrder)(nil), "neutron.dex.MsgCancelLimitOrder") + proto.RegisterType((*MsgCancelLimitOrderResponse)(nil), "neutron.dex.MsgCancelLimitOrderResponse") + proto.RegisterType((*MultiHopRoute)(nil), "neutron.dex.MultiHopRoute") + proto.RegisterType((*MsgMultiHopSwap)(nil), "neutron.dex.MsgMultiHopSwap") + proto.RegisterType((*MsgMultiHopSwapResponse)(nil), "neutron.dex.MsgMultiHopSwapResponse") +} + +func init() { proto.RegisterFile("neutron/dex/tx.proto", fileDescriptor_a489f6e187d5e074) } + +var fileDescriptor_a489f6e187d5e074 = []byte{ + // 1269 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0xcd, 0x8f, 0xdb, 0x44, + 0x14, 0x5f, 0xc7, 0x69, 0xb2, 0xfb, 0xf6, 0x2b, 0x9d, 0x7e, 0xac, 0x71, 0x21, 0x8e, 0xdc, 0x42, + 0x43, 0xa5, 0x3a, 0xdd, 0x45, 0x1c, 0x28, 0xa7, 0x78, 0x77, 0x0b, 0x6e, 0x93, 0xa6, 0x72, 0x53, + 0x2a, 0x40, 0x22, 0xf2, 0x3a, 0xd3, 0xc4, 0xda, 0xc4, 0x63, 0x79, 0x26, 0xdb, 0xec, 0x81, 0x03, + 0x57, 0x04, 0x52, 0x2f, 0x9c, 0x7a, 0xe2, 0x7f, 0x40, 0xe2, 0xc0, 0x3f, 0xd0, 0x63, 0x25, 0x2e, + 0x88, 0x43, 0x40, 0xed, 0xad, 0xc7, 0xfd, 0x0b, 0x90, 0x3f, 0x63, 0x3b, 0xdd, 0x6e, 0xd3, 0x02, + 0xa7, 0xcc, 0xbc, 0xf7, 0x9b, 0xdf, 0x7b, 0xf3, 0xe6, 0x7d, 0x38, 0x70, 0xd6, 0xc6, 0x23, 0xe6, + 0x12, 0xbb, 0xd6, 0xc5, 0xe3, 0x1a, 0x1b, 0x2b, 0x8e, 0x4b, 0x18, 0x41, 0xcb, 0xa1, 0x54, 0xe9, + 0xe2, 0xb1, 0x78, 0xb6, 0x47, 0x7a, 0xc4, 0x97, 0xd7, 0xbc, 0x55, 0x00, 0x11, 0xcb, 0x26, 0xa1, + 0x43, 0x42, 0x6b, 0x7b, 0x06, 0xc5, 0xb5, 0x83, 0xcd, 0x3d, 0xcc, 0x8c, 0xcd, 0x9a, 0x49, 0x2c, + 0x3b, 0xd4, 0x4b, 0x3d, 0x42, 0x7a, 0x03, 0x5c, 0xf3, 0x77, 0x7b, 0xa3, 0x07, 0x35, 0x66, 0x0d, + 0x31, 0x65, 0xc6, 0xd0, 0x09, 0x00, 0xf2, 0xa7, 0xb0, 0xb6, 0x83, 0x1d, 0x42, 0x2d, 0xd6, 0x72, + 0x98, 0x45, 0x6c, 0x8a, 0x3e, 0x84, 0x52, 0xd7, 0xa2, 0xc6, 0xde, 0x00, 0x77, 0x8c, 0x11, 0x23, + 0xf4, 0xa1, 0xe1, 0x08, 0x5c, 0x85, 0xab, 0x2e, 0xea, 0xeb, 0xa1, 0xbc, 0x1e, 0x8a, 0xe5, 0xdf, + 0x78, 0x80, 0x26, 0xed, 0x85, 0x04, 0x48, 0x80, 0xa2, 0xe9, 0x62, 0x83, 0x11, 0xd7, 0x3f, 0xb0, + 0xa4, 0x47, 0x5b, 0x24, 0xc2, 0xa2, 0x8b, 0x4d, 0x6c, 0x1d, 0x60, 0x57, 0xc8, 0xf9, 0xaa, 0x78, + 0x8f, 0xce, 0x43, 0x81, 0x91, 0x7d, 0x6c, 0xd7, 0x05, 0xde, 0xd7, 0x84, 0xbb, 0x58, 0xae, 0x0a, + 0xf9, 0x84, 0x5c, 0x45, 0x7d, 0x58, 0x34, 0x86, 0x64, 0x64, 0x33, 0x5a, 0x17, 0x4e, 0x55, 0xf8, + 0xea, 0x92, 0xda, 0x78, 0x32, 0x91, 0x16, 0xfe, 0x9c, 0x48, 0x1f, 0xf4, 0x2c, 0xd6, 0x1f, 0xed, + 0x29, 0x26, 0x19, 0xd6, 0xc2, 0xb8, 0x04, 0x3f, 0x57, 0x69, 0x77, 0xbf, 0xc6, 0x0e, 0x1d, 0x4c, + 0x15, 0xcd, 0x66, 0x2f, 0x26, 0x52, 0x31, 0x60, 0xa8, 0x1f, 0x4d, 0xa4, 0xf5, 0x43, 0x63, 0x38, + 0xb8, 0x2e, 0x47, 0x94, 0xb2, 0x1e, 0xb3, 0x27, 0x2c, 0xa9, 0x42, 0xe1, 0xed, 0x2c, 0xa9, 0x33, + 0x96, 0xd4, 0xa9, 0x25, 0x15, 0x55, 0x61, 0x9d, 0x59, 0xe6, 0xbe, 0x66, 0x77, 0xf1, 0x18, 0xd3, + 0x7a, 0x9b, 0xa8, 0x42, 0xb1, 0xc2, 0x57, 0x79, 0x3d, 0x2b, 0x46, 0x08, 0xf2, 0x0f, 0x30, 0xa6, + 0xc2, 0x62, 0x85, 0xaf, 0xe6, 0x75, 0x7f, 0x8d, 0x3e, 0x86, 0x62, 0xf8, 0x78, 0xc2, 0x52, 0x85, + 0xaf, 0x2e, 0x6f, 0x5d, 0x50, 0x12, 0x99, 0xa3, 0xa4, 0xdf, 0x57, 0x8f, 0xb0, 0xf2, 0x2f, 0x39, + 0x40, 0xd3, 0xd7, 0xd3, 0x31, 0x75, 0x88, 0x4d, 0x31, 0xfa, 0x91, 0x83, 0xd3, 0x3a, 0xa6, 0xd8, + 0x3d, 0xc0, 0xd7, 0x42, 0x1d, 0xee, 0x0a, 0x9c, 0x7f, 0xff, 0xce, 0xdc, 0xf7, 0x3f, 0xed, 0x66, + 0xa9, 0x8e, 0x26, 0x92, 0x10, 0x44, 0x62, 0x46, 0x25, 0xeb, 0xb3, 0x96, 0x93, 0xfe, 0x6c, 0x4e, + 0xfd, 0xc9, 0xbd, 0xa5, 0x3f, 0x9b, 0xc7, 0xfb, 0xb3, 0xf9, 0x12, 0x7f, 0x12, 0xb2, 0x5f, 0x73, + 0xb0, 0xda, 0xa4, 0xbd, 0xfb, 0x16, 0xeb, 0x77, 0x5d, 0xe3, 0xa1, 0x31, 0xf8, 0x9f, 0xf2, 0xfe, + 0x3b, 0x0e, 0xd6, 0x68, 0xdf, 0x70, 0x31, 0x6d, 0x13, 0x1d, 0x0f, 0xc9, 0x01, 0x0e, 0xd3, 0xff, + 0xcb, 0xb9, 0x83, 0x90, 0xe1, 0x39, 0x9a, 0x48, 0xe7, 0x82, 0x08, 0xa4, 0xe5, 0xb2, 0x9e, 0x01, + 0xbe, 0x2c, 0x4f, 0x0b, 0xaf, 0xce, 0xd3, 0xe2, 0x34, 0x4f, 0xe5, 0x0d, 0x38, 0x97, 0x0a, 0x5c, + 0x94, 0x72, 0xf2, 0xe3, 0xbc, 0x9f, 0x89, 0x77, 0x06, 0x86, 0x89, 0x1b, 0xd6, 0xd0, 0x62, 0x2d, + 0xb7, 0x8b, 0xdd, 0x37, 0x8c, 0xab, 0x00, 0x45, 0x3f, 0x62, 0x9a, 0x1d, 0x06, 0x36, 0xda, 0x7a, + 0xa7, 0xfc, 0x65, 0x6b, 0xc4, 0xc2, 0xd8, 0xc6, 0x7b, 0x74, 0x05, 0x4a, 0xf1, 0x15, 0x34, 0xbb, + 0x4d, 0x3c, 0xcc, 0xa9, 0x0a, 0x57, 0xe5, 0xf5, 0x19, 0x39, 0xb2, 0xa2, 0xbe, 0xa0, 0xd9, 0x42, + 0xd1, 0xe3, 0x51, 0x9b, 0x73, 0x3f, 0x41, 0xcc, 0x90, 0x6d, 0x0c, 0x9a, 0x1d, 0x37, 0x06, 0xcd, + 0x46, 0x9f, 0xc0, 0x12, 0xf1, 0x62, 0xd1, 0x3e, 0x74, 0xb0, 0xb0, 0x58, 0xe1, 0xaa, 0x6b, 0x99, + 0xe2, 0x9e, 0x86, 0xcb, 0x83, 0xe8, 0x53, 0x34, 0x6a, 0xc0, 0x1a, 0x1e, 0x3b, 0x96, 0x6b, 0x78, + 0xd5, 0xde, 0xb6, 0x86, 0x58, 0x58, 0xaa, 0x70, 0xd5, 0xe5, 0x2d, 0x51, 0x09, 0x66, 0x82, 0x12, + 0xcd, 0x04, 0xa5, 0x1d, 0xcd, 0x04, 0x75, 0xf1, 0xc9, 0x44, 0xe2, 0x1e, 0xfd, 0x25, 0x71, 0x7a, + 0xe6, 0x2c, 0x3a, 0x84, 0x95, 0xa1, 0x31, 0xae, 0xfb, 0x7e, 0x79, 0xb1, 0x01, 0xff, 0xde, 0xf7, + 0x3c, 0xfc, 0x5c, 0xf7, 0x4e, 0xb1, 0x1c, 0x4d, 0xa4, 0x33, 0xc1, 0xdd, 0x93, 0x52, 0x59, 0x4f, + 0x81, 0xe4, 0xdf, 0x73, 0x20, 0xce, 0x66, 0x47, 0xdc, 0xaf, 0xca, 0x00, 0xcc, 0x35, 0x6c, 0xb3, + 0x8f, 0x6f, 0xe1, 0xc3, 0x30, 0x51, 0x12, 0x12, 0xf4, 0x2d, 0x14, 0xbc, 0x81, 0xa8, 0xd9, 0x7e, + 0xa6, 0x2c, 0x6f, 0xbd, 0xa3, 0x04, 0xae, 0x29, 0xde, 0xcc, 0x54, 0xc2, 0x99, 0xa9, 0x6c, 0x13, + 0xcb, 0x56, 0x6f, 0x86, 0xcf, 0x78, 0xf9, 0x35, 0xae, 0xe3, 0x1d, 0x78, 0x31, 0x91, 0x42, 0xee, + 0xa3, 0x89, 0xb4, 0x1a, 0xdc, 0x24, 0xd8, 0xcb, 0x7a, 0xa8, 0x40, 0x3f, 0x71, 0xb0, 0xc2, 0x8c, + 0x7d, 0xec, 0x7a, 0x07, 0xbc, 0xc8, 0xf1, 0x27, 0x79, 0xf1, 0xc5, 0xfc, 0x5e, 0xa4, 0x2c, 0x4c, + 0xa3, 0x9a, 0x94, 0xca, 0x7a, 0x0a, 0x24, 0xdf, 0x87, 0x0b, 0x89, 0x62, 0xbc, 0x61, 0x0d, 0x06, + 0xb8, 0xfb, 0x5a, 0xb5, 0x97, 0x8e, 0x77, 0x2e, 0x1b, 0x6f, 0xf9, 0x7d, 0xb8, 0xf8, 0x0a, 0xe2, + 0xb8, 0xe6, 0x5b, 0x70, 0xa6, 0x49, 0x7b, 0xdb, 0x86, 0x6d, 0xe2, 0xc1, 0xbf, 0x62, 0xf7, 0x3d, + 0xff, 0x42, 0x59, 0xc2, 0xd8, 0xde, 0x45, 0x58, 0x6d, 0x8e, 0x06, 0xcc, 0xfa, 0x9c, 0x38, 0x3a, + 0x19, 0x31, 0xec, 0x75, 0xa8, 0x3e, 0x71, 0x68, 0x30, 0xd9, 0x74, 0x7f, 0x2d, 0x3f, 0xe6, 0x61, + 0xbd, 0x49, 0x7b, 0x11, 0xf0, 0xee, 0x43, 0xc3, 0x79, 0xc3, 0x2e, 0xb4, 0x05, 0x05, 0xd7, 0x33, + 0x43, 0x05, 0xde, 0x1f, 0xc9, 0x62, 0xaa, 0x6a, 0x53, 0x9e, 0xe8, 0x21, 0x32, 0xd5, 0x57, 0xf2, + 0xff, 0x6d, 0x5f, 0xf9, 0x81, 0xf3, 0xba, 0x83, 0xc5, 0xfc, 0x40, 0xdd, 0x71, 0x2d, 0x13, 0xfb, + 0xdd, 0x6e, 0x49, 0xed, 0x86, 0x16, 0x37, 0x13, 0x16, 0x43, 0xcf, 0xaf, 0x12, 0xb7, 0x17, 0xad, + 0x6b, 0x23, 0x66, 0x0d, 0x68, 0x6d, 0x68, 0xb0, 0xbe, 0x72, 0xc7, 0xc5, 0xe6, 0x0e, 0x36, 0xbd, + 0xb9, 0x92, 0xa6, 0x9c, 0xce, 0x95, 0xb4, 0x5c, 0xd6, 0x33, 0x40, 0x74, 0x09, 0x56, 0x1d, 0xcb, + 0xdc, 0x57, 0x31, 0x65, 0x7e, 0x48, 0x84, 0x82, 0xff, 0xc1, 0x99, 0x16, 0xca, 0xdf, 0x73, 0xb0, + 0x91, 0x79, 0x9d, 0xb8, 0x0b, 0x10, 0x28, 0x9a, 0x61, 0x81, 0x71, 0x27, 0x15, 0xd8, 0xf5, 0xf9, + 0x0b, 0x2c, 0x22, 0xd7, 0xa3, 0xc5, 0x95, 0x31, 0xac, 0xa5, 0x7b, 0x2f, 0x3a, 0x0f, 0xe8, 0xb3, + 0x56, 0x6b, 0xa7, 0xd3, 0xd6, 0x1a, 0x9d, 0xed, 0xfa, 0xed, 0xed, 0xdd, 0x46, 0x63, 0x77, 0xa7, + 0xb4, 0x80, 0x4a, 0xb0, 0x72, 0x43, 0x6b, 0x34, 0x3a, 0x2d, 0xbd, 0x73, 0x4b, 0x6b, 0x34, 0x4a, + 0x1c, 0xda, 0x80, 0x33, 0x5a, 0xb3, 0xb9, 0xbb, 0xa3, 0xd5, 0xdb, 0xbb, 0x9e, 0x38, 0x40, 0x97, + 0x72, 0x1e, 0xf4, 0xe6, 0xbd, 0xbb, 0xed, 0x8e, 0x76, 0xbb, 0xd3, 0xd6, 0x9a, 0xbb, 0x25, 0x1e, + 0x9d, 0x86, 0xd5, 0x98, 0xd4, 0x17, 0xe5, 0xb7, 0x7e, 0xce, 0x03, 0xdf, 0xa4, 0x3d, 0xb4, 0x0d, + 0xc5, 0xe8, 0xcb, 0x7b, 0x23, 0x9d, 0x5d, 0xf1, 0x47, 0x9d, 0x28, 0x1d, 0xa3, 0x88, 0xe3, 0xd6, + 0x00, 0x48, 0x7c, 0xc9, 0x88, 0x59, 0xf8, 0x54, 0x27, 0xca, 0xc7, 0xeb, 0x62, 0xb6, 0xaf, 0x61, + 0x3d, 0x3b, 0xc4, 0x67, 0x3c, 0xc8, 0x00, 0xc4, 0xcb, 0x27, 0x00, 0x62, 0xf2, 0x03, 0x10, 0x8e, + 0x6d, 0x57, 0xd5, 0xe3, 0x9c, 0xcb, 0x22, 0xc5, 0x6b, 0xaf, 0x8b, 0x8c, 0xed, 0x7e, 0x03, 0xa5, + 0x99, 0x36, 0x55, 0xc9, 0xb2, 0x64, 0x11, 0x62, 0xf5, 0x24, 0x44, 0xcc, 0xaf, 0xc3, 0x4a, 0xaa, + 0xe1, 0xbc, 0x9b, 0x3d, 0x99, 0xd4, 0x8a, 0x97, 0x5e, 0xa5, 0x8d, 0x38, 0xd5, 0x9d, 0x27, 0xcf, + 0xca, 0xdc, 0xd3, 0x67, 0x65, 0xee, 0xef, 0x67, 0x65, 0xee, 0xd1, 0xf3, 0xf2, 0xc2, 0xd3, 0xe7, + 0xe5, 0x85, 0x3f, 0x9e, 0x97, 0x17, 0xbe, 0xba, 0x72, 0x42, 0x61, 0x8f, 0x83, 0xff, 0xa0, 0x5e, + 0xf2, 0xef, 0x15, 0xfc, 0x4f, 0x84, 0x8f, 0xfe, 0x09, 0x00, 0x00, 0xff, 0xff, 0x56, 0x20, 0xd3, + 0x20, 0x9f, 0x0e, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -974,7 +974,7 @@ func NewMsgClient(cc grpc1.ClientConn) MsgClient { func (c *msgClient) Deposit(ctx context.Context, in *MsgDeposit, opts ...grpc.CallOption) (*MsgDepositResponse, error) { out := new(MsgDepositResponse) - err := c.cc.Invoke(ctx, "/duality.dex.Msg/Deposit", in, out, opts...) + err := c.cc.Invoke(ctx, "/neutron.dex.Msg/Deposit", in, out, opts...) if err != nil { return nil, err } @@ -983,7 +983,7 @@ func (c *msgClient) Deposit(ctx context.Context, in *MsgDeposit, opts ...grpc.Ca func (c *msgClient) Withdrawal(ctx context.Context, in *MsgWithdrawal, opts ...grpc.CallOption) (*MsgWithdrawalResponse, error) { out := new(MsgWithdrawalResponse) - err := c.cc.Invoke(ctx, "/duality.dex.Msg/Withdrawal", in, out, opts...) + err := c.cc.Invoke(ctx, "/neutron.dex.Msg/Withdrawal", in, out, opts...) if err != nil { return nil, err } @@ -992,7 +992,7 @@ func (c *msgClient) Withdrawal(ctx context.Context, in *MsgWithdrawal, opts ...g func (c *msgClient) PlaceLimitOrder(ctx context.Context, in *MsgPlaceLimitOrder, opts ...grpc.CallOption) (*MsgPlaceLimitOrderResponse, error) { out := new(MsgPlaceLimitOrderResponse) - err := c.cc.Invoke(ctx, "/duality.dex.Msg/PlaceLimitOrder", in, out, opts...) + err := c.cc.Invoke(ctx, "/neutron.dex.Msg/PlaceLimitOrder", in, out, opts...) if err != nil { return nil, err } @@ -1001,7 +1001,7 @@ func (c *msgClient) PlaceLimitOrder(ctx context.Context, in *MsgPlaceLimitOrder, func (c *msgClient) WithdrawFilledLimitOrder(ctx context.Context, in *MsgWithdrawFilledLimitOrder, opts ...grpc.CallOption) (*MsgWithdrawFilledLimitOrderResponse, error) { out := new(MsgWithdrawFilledLimitOrderResponse) - err := c.cc.Invoke(ctx, "/duality.dex.Msg/WithdrawFilledLimitOrder", in, out, opts...) + err := c.cc.Invoke(ctx, "/neutron.dex.Msg/WithdrawFilledLimitOrder", in, out, opts...) if err != nil { return nil, err } @@ -1010,7 +1010,7 @@ func (c *msgClient) WithdrawFilledLimitOrder(ctx context.Context, in *MsgWithdra func (c *msgClient) CancelLimitOrder(ctx context.Context, in *MsgCancelLimitOrder, opts ...grpc.CallOption) (*MsgCancelLimitOrderResponse, error) { out := new(MsgCancelLimitOrderResponse) - err := c.cc.Invoke(ctx, "/duality.dex.Msg/CancelLimitOrder", in, out, opts...) + err := c.cc.Invoke(ctx, "/neutron.dex.Msg/CancelLimitOrder", in, out, opts...) if err != nil { return nil, err } @@ -1019,7 +1019,7 @@ func (c *msgClient) CancelLimitOrder(ctx context.Context, in *MsgCancelLimitOrde func (c *msgClient) MultiHopSwap(ctx context.Context, in *MsgMultiHopSwap, opts ...grpc.CallOption) (*MsgMultiHopSwapResponse, error) { out := new(MsgMultiHopSwapResponse) - err := c.cc.Invoke(ctx, "/duality.dex.Msg/MultiHopSwap", in, out, opts...) + err := c.cc.Invoke(ctx, "/neutron.dex.Msg/MultiHopSwap", in, out, opts...) if err != nil { return nil, err } @@ -1073,7 +1073,7 @@ func _Msg_Deposit_Handler(srv interface{}, ctx context.Context, dec func(interfa } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/duality.dex.Msg/Deposit", + FullMethod: "/neutron.dex.Msg/Deposit", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MsgServer).Deposit(ctx, req.(*MsgDeposit)) @@ -1091,7 +1091,7 @@ func _Msg_Withdrawal_Handler(srv interface{}, ctx context.Context, dec func(inte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/duality.dex.Msg/Withdrawal", + FullMethod: "/neutron.dex.Msg/Withdrawal", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MsgServer).Withdrawal(ctx, req.(*MsgWithdrawal)) @@ -1109,7 +1109,7 @@ func _Msg_PlaceLimitOrder_Handler(srv interface{}, ctx context.Context, dec func } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/duality.dex.Msg/PlaceLimitOrder", + FullMethod: "/neutron.dex.Msg/PlaceLimitOrder", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MsgServer).PlaceLimitOrder(ctx, req.(*MsgPlaceLimitOrder)) @@ -1127,7 +1127,7 @@ func _Msg_WithdrawFilledLimitOrder_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/duality.dex.Msg/WithdrawFilledLimitOrder", + FullMethod: "/neutron.dex.Msg/WithdrawFilledLimitOrder", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MsgServer).WithdrawFilledLimitOrder(ctx, req.(*MsgWithdrawFilledLimitOrder)) @@ -1145,7 +1145,7 @@ func _Msg_CancelLimitOrder_Handler(srv interface{}, ctx context.Context, dec fun } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/duality.dex.Msg/CancelLimitOrder", + FullMethod: "/neutron.dex.Msg/CancelLimitOrder", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MsgServer).CancelLimitOrder(ctx, req.(*MsgCancelLimitOrder)) @@ -1163,7 +1163,7 @@ func _Msg_MultiHopSwap_Handler(srv interface{}, ctx context.Context, dec func(in } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/duality.dex.Msg/MultiHopSwap", + FullMethod: "/neutron.dex.Msg/MultiHopSwap", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MsgServer).MultiHopSwap(ctx, req.(*MsgMultiHopSwap)) @@ -1172,7 +1172,7 @@ func _Msg_MultiHopSwap_Handler(srv interface{}, ctx context.Context, dec func(in } var _Msg_serviceDesc = grpc.ServiceDesc{ - ServiceName: "duality.dex.Msg", + ServiceName: "neutron.dex.Msg", HandlerType: (*MsgServer)(nil), Methods: []grpc.MethodDesc{ { @@ -1201,7 +1201,7 @@ var _Msg_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "duality/dex/tx.proto", + Metadata: "neutron/dex/tx.proto", } func (m *DepositOptions) Marshal() (dAtA []byte, err error) { diff --git a/x/epochs/types/genesis.pb.go b/x/epochs/types/genesis.pb.go index b0253a65a..d89510958 100644 --- a/x/epochs/types/genesis.pb.go +++ b/x/epochs/types/genesis.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: duality/epochs/genesis.proto +// source: neutron/epochs/genesis.proto package types @@ -77,7 +77,7 @@ func (m *EpochInfo) Reset() { *m = EpochInfo{} } func (m *EpochInfo) String() string { return proto.CompactTextString(m) } func (*EpochInfo) ProtoMessage() {} func (*EpochInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_865ee7616311a8aa, []int{0} + return fileDescriptor_924a4bf36f8131d7, []int{0} } func (m *EpochInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -164,7 +164,7 @@ 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_865ee7616311a8aa, []int{1} + return fileDescriptor_924a4bf36f8131d7, []int{1} } func (m *GenesisState) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -201,44 +201,43 @@ func (m *GenesisState) GetEpochs() []EpochInfo { } func init() { - proto.RegisterType((*EpochInfo)(nil), "duality.epochs.EpochInfo") - proto.RegisterType((*GenesisState)(nil), "duality.epochs.GenesisState") + proto.RegisterType((*EpochInfo)(nil), "neutron.epochs.EpochInfo") + proto.RegisterType((*GenesisState)(nil), "neutron.epochs.GenesisState") } -func init() { proto.RegisterFile("duality/epochs/genesis.proto", fileDescriptor_865ee7616311a8aa) } +func init() { proto.RegisterFile("neutron/epochs/genesis.proto", fileDescriptor_924a4bf36f8131d7) } -var fileDescriptor_865ee7616311a8aa = []byte{ - // 465 bytes of a gzipped FileDescriptorProto +var fileDescriptor_924a4bf36f8131d7 = []byte{ + // 463 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x53, 0x4d, 0x8f, 0xd3, 0x30, - 0x10, 0xad, 0x69, 0x29, 0xa9, 0x59, 0xbe, 0xac, 0x05, 0x42, 0x05, 0x49, 0x14, 0x2e, 0x95, 0x00, - 0x47, 0x7c, 0x48, 0x48, 0x70, 0x2b, 0xa0, 0x5d, 0x38, 0xa6, 0x1c, 0x10, 0x97, 0x2a, 0x6d, 0x5d, - 0xc7, 0x52, 0x13, 0x47, 0xc9, 0x44, 0xa2, 0x37, 0x7e, 0x42, 0x8f, 0xfc, 0xa4, 0x3d, 0xee, 0x91, - 0x53, 0x40, 0xed, 0x8d, 0xe3, 0xfe, 0x02, 0x14, 0xdb, 0x29, 0x5d, 0x0a, 0xda, 0x5b, 0x3c, 0xef, - 0xcd, 0x7b, 0x9e, 0x97, 0x31, 0xbe, 0x3f, 0x2b, 0xa3, 0x85, 0x80, 0x65, 0xc0, 0x32, 0x39, 0x8d, - 0x8b, 0x80, 0xb3, 0x94, 0x15, 0xa2, 0xa0, 0x59, 0x2e, 0x41, 0x92, 0xeb, 0x06, 0xa5, 0x1a, 0xed, - 0x1f, 0x72, 0xc9, 0xa5, 0x82, 0x82, 0xfa, 0x4b, 0xb3, 0xfa, 0x0e, 0x97, 0x92, 0x2f, 0x58, 0xa0, - 0x4e, 0x93, 0x72, 0x1e, 0xcc, 0xca, 0x3c, 0x02, 0x21, 0x53, 0x83, 0xbb, 0x7f, 0xe3, 0x20, 0x12, - 0x56, 0x40, 0x94, 0x64, 0x9a, 0xe0, 0xaf, 0x3a, 0xb8, 0xf7, 0xae, 0x76, 0x78, 0x9f, 0xce, 0x25, - 0x71, 0x30, 0x16, 0x33, 0x96, 0x82, 0x98, 0x0b, 0x96, 0xdb, 0xc8, 0x43, 0x83, 0x5e, 0xb8, 0x53, - 0x21, 0x9f, 0x30, 0x2e, 0x20, 0xca, 0x61, 0x5c, 0xcb, 0xd8, 0x97, 0x3c, 0x34, 0xb8, 0xfa, 0xac, - 0x4f, 0xb5, 0x07, 0x6d, 0x3c, 0xe8, 0xc7, 0xc6, 0x63, 0xf8, 0xe0, 0xa4, 0x72, 0x5b, 0x67, 0x95, - 0x7b, 0x6b, 0x19, 0x25, 0x8b, 0x57, 0xfe, 0x9f, 0x5e, 0x7f, 0xf5, 0xc3, 0x45, 0x61, 0x4f, 0x15, - 0x6a, 0x3a, 0x89, 0xb1, 0xd5, 0x5c, 0xdd, 0x6e, 0x2b, 0xdd, 0x7b, 0x7b, 0xba, 0x6f, 0x0d, 0x61, - 0xf8, 0xb4, 0x96, 0xfd, 0x55, 0xb9, 0xa4, 0x69, 0x79, 0x2c, 0x13, 0x01, 0x2c, 0xc9, 0x60, 0x79, - 0x56, 0xb9, 0x37, 0xb4, 0x59, 0x83, 0xf9, 0xdf, 0x6a, 0xab, 0xad, 0x3a, 0x79, 0x88, 0xaf, 0x4d, - 0xcb, 0x3c, 0x67, 0x29, 0x8c, 0x55, 0xb4, 0x76, 0xc7, 0x43, 0x83, 0x76, 0x78, 0x60, 0x8a, 0x2a, - 0x0c, 0xf2, 0x15, 0x61, 0xfb, 0x1c, 0x6b, 0xbc, 0x33, 0xf7, 0xe5, 0x0b, 0xe7, 0x7e, 0x64, 0xe6, - 0x76, 0xf5, 0x55, 0xfe, 0xa7, 0xa4, 0x53, 0xb8, 0xbd, 0xeb, 0x3c, 0xda, 0x26, 0xf2, 0x02, 0xdf, - 0xd1, 0xfc, 0xa9, 0x2c, 0x53, 0x10, 0x29, 0xd7, 0x8d, 0x6c, 0x66, 0x77, 0x3d, 0x34, 0xb0, 0xc2, - 0x43, 0x85, 0xbe, 0x31, 0xe0, 0x48, 0x63, 0xe4, 0x35, 0xee, 0xff, 0xcb, 0x2d, 0x66, 0x82, 0xc7, - 0x60, 0x5b, 0x6a, 0xd4, 0xbb, 0x7b, 0x86, 0xc7, 0x0a, 0xfe, 0xd0, 0xb1, 0xae, 0xdc, 0xb4, 0xfc, - 0x23, 0x7c, 0x70, 0xa4, 0x57, 0x71, 0x04, 0x11, 0x30, 0xf2, 0x12, 0x77, 0xf5, 0x0e, 0xda, 0xc8, - 0x6b, 0xab, 0x1f, 0x73, 0x7e, 0x35, 0xe9, 0x76, 0x7f, 0x86, 0x9d, 0x7a, 0xee, 0xd0, 0xd0, 0x87, - 0xc7, 0x27, 0x6b, 0x07, 0x9d, 0xae, 0x1d, 0xf4, 0x73, 0xed, 0xa0, 0xd5, 0xc6, 0x69, 0x9d, 0x6e, - 0x9c, 0xd6, 0xf7, 0x8d, 0xd3, 0xfa, 0x4c, 0xb9, 0x80, 0xb8, 0x9c, 0xd0, 0xa9, 0x4c, 0x02, 0x23, - 0xf6, 0x64, 0x11, 0x4d, 0x8a, 0xe6, 0x10, 0x7c, 0x69, 0x1e, 0x05, 0x2c, 0x33, 0x56, 0x4c, 0xba, - 0x2a, 0xe3, 0xe7, 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, 0xb7, 0x72, 0xb3, 0x24, 0x33, 0x03, 0x00, - 0x00, + 0x10, 0xad, 0x69, 0x29, 0xa9, 0x59, 0xbe, 0xac, 0x05, 0x42, 0x05, 0x49, 0x14, 0x2e, 0x95, 0x60, + 0x13, 0xf1, 0x21, 0x21, 0xc1, 0xad, 0x80, 0x0a, 0x1c, 0x53, 0x0e, 0x88, 0x4b, 0x95, 0xb6, 0xae, + 0x63, 0x69, 0x63, 0x47, 0xc9, 0x44, 0xa2, 0x37, 0x7e, 0x42, 0x8f, 0xfc, 0xa4, 0x3d, 0xee, 0x91, + 0x53, 0x40, 0xed, 0x8d, 0xe3, 0xfe, 0x02, 0x14, 0xdb, 0x29, 0x5d, 0x0a, 0xda, 0x9b, 0x33, 0xef, + 0xcd, 0x7b, 0x9e, 0x97, 0x31, 0xbe, 0x2f, 0x68, 0x09, 0xb9, 0x14, 0x21, 0xcd, 0xe4, 0x2c, 0x29, + 0x42, 0x46, 0x05, 0x2d, 0x78, 0x11, 0x64, 0xb9, 0x04, 0x49, 0xae, 0x1b, 0x34, 0xd0, 0x68, 0xff, + 0x90, 0x49, 0x26, 0x15, 0x14, 0xd6, 0x27, 0xcd, 0xea, 0x3b, 0x4c, 0x4a, 0x76, 0x4c, 0x43, 0xf5, + 0x35, 0x2d, 0x17, 0xe1, 0xbc, 0xcc, 0x63, 0xe0, 0x52, 0x18, 0xdc, 0xfd, 0x1b, 0x07, 0x9e, 0xd2, + 0x02, 0xe2, 0x34, 0xd3, 0x04, 0x7f, 0xd5, 0xc1, 0xbd, 0xb7, 0xb5, 0xc3, 0x7b, 0xb1, 0x90, 0xc4, + 0xc1, 0x98, 0xcf, 0xa9, 0x00, 0xbe, 0xe0, 0x34, 0xb7, 0x91, 0x87, 0x06, 0xbd, 0x68, 0xa7, 0x42, + 0x3e, 0x61, 0x5c, 0x40, 0x9c, 0xc3, 0xa4, 0x96, 0xb1, 0x2f, 0x79, 0x68, 0x70, 0xf5, 0x69, 0x3f, + 0xd0, 0x1e, 0x41, 0xe3, 0x11, 0x7c, 0x6c, 0x3c, 0x86, 0x0f, 0x4e, 0x2a, 0xb7, 0x75, 0x56, 0xb9, + 0xb7, 0x96, 0x71, 0x7a, 0xfc, 0xd2, 0xff, 0xd3, 0xeb, 0xaf, 0x7e, 0xb8, 0x28, 0xea, 0xa9, 0x42, + 0x4d, 0x27, 0x09, 0xb6, 0x9a, 0xab, 0xdb, 0x6d, 0xa5, 0x7b, 0x6f, 0x4f, 0xf7, 0x8d, 0x21, 0x0c, + 0x9f, 0xd4, 0xb2, 0xbf, 0x2a, 0x97, 0x34, 0x2d, 0x8f, 0x65, 0xca, 0x81, 0xa6, 0x19, 0x2c, 0xcf, + 0x2a, 0xf7, 0x86, 0x36, 0x6b, 0x30, 0xff, 0x5b, 0x6d, 0xb5, 0x55, 0x27, 0x0f, 0xf1, 0xb5, 0x59, + 0x99, 0xe7, 0x54, 0xc0, 0x44, 0x45, 0x6b, 0x77, 0x3c, 0x34, 0x68, 0x47, 0x07, 0xa6, 0xa8, 0xc2, + 0x20, 0x5f, 0x11, 0xb6, 0xcf, 0xb1, 0x26, 0x3b, 0x73, 0x5f, 0xbe, 0x70, 0xee, 0x47, 0x66, 0x6e, + 0x57, 0x5f, 0xe5, 0x7f, 0x4a, 0x3a, 0x85, 0xdb, 0xbb, 0xce, 0xe3, 0x6d, 0x22, 0xcf, 0xf1, 0x1d, + 0xcd, 0x9f, 0xc9, 0x52, 0x00, 0x17, 0x4c, 0x37, 0xd2, 0xb9, 0xdd, 0xf5, 0xd0, 0xc0, 0x8a, 0x0e, + 0x15, 0xfa, 0xda, 0x80, 0x63, 0x8d, 0x91, 0x57, 0xb8, 0xff, 0x2f, 0xb7, 0x84, 0x72, 0x96, 0x80, + 0x6d, 0xa9, 0x51, 0xef, 0xee, 0x19, 0xbe, 0x53, 0xf0, 0x87, 0x8e, 0x75, 0xe5, 0xa6, 0xe5, 0x8f, + 0xf0, 0xc1, 0x48, 0xaf, 0xe2, 0x18, 0x62, 0xa0, 0xe4, 0x05, 0xee, 0xea, 0x1d, 0xb4, 0x91, 0xd7, + 0x56, 0x3f, 0xe6, 0xfc, 0x6a, 0x06, 0xdb, 0xfd, 0x19, 0x76, 0xea, 0xb9, 0x23, 0x43, 0x1f, 0x8e, + 0x4e, 0xd6, 0x0e, 0x3a, 0x5d, 0x3b, 0xe8, 0xe7, 0xda, 0x41, 0xab, 0x8d, 0xd3, 0x3a, 0xdd, 0x38, + 0xad, 0xef, 0x1b, 0xa7, 0xf5, 0xf9, 0x88, 0x71, 0x48, 0xca, 0x69, 0x30, 0x93, 0x69, 0x68, 0xc4, + 0x8e, 0x64, 0xce, 0x9a, 0x73, 0xf8, 0xa5, 0x79, 0x13, 0xb0, 0xcc, 0x68, 0x31, 0xed, 0xaa, 0x88, + 0x9f, 0xfd, 0x0e, 0x00, 0x00, 0xff, 0xff, 0x27, 0xb8, 0xfb, 0x5b, 0x32, 0x03, 0x00, 0x00, } func (m *EpochInfo) Marshal() (dAtA []byte, err error) { diff --git a/x/epochs/types/query.pb.go b/x/epochs/types/query.pb.go index e11a1f169..26f6b8c3c 100644 --- a/x/epochs/types/query.pb.go +++ b/x/epochs/types/query.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: duality/epochs/query.proto +// source: neutron/epochs/query.proto package types @@ -37,7 +37,7 @@ func (m *QueryEpochsInfoRequest) Reset() { *m = QueryEpochsInfoRequest{} func (m *QueryEpochsInfoRequest) String() string { return proto.CompactTextString(m) } func (*QueryEpochsInfoRequest) ProtoMessage() {} func (*QueryEpochsInfoRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_46bcc0d8d0692f49, []int{0} + return fileDescriptor_11ec49a7f39aeaae, []int{0} } func (m *QueryEpochsInfoRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -74,7 +74,7 @@ func (m *QueryEpochsInfoResponse) Reset() { *m = QueryEpochsInfoResponse func (m *QueryEpochsInfoResponse) String() string { return proto.CompactTextString(m) } func (*QueryEpochsInfoResponse) ProtoMessage() {} func (*QueryEpochsInfoResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_46bcc0d8d0692f49, []int{1} + return fileDescriptor_11ec49a7f39aeaae, []int{1} } func (m *QueryEpochsInfoResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -118,7 +118,7 @@ func (m *QueryCurrentEpochRequest) Reset() { *m = QueryCurrentEpochReque func (m *QueryCurrentEpochRequest) String() string { return proto.CompactTextString(m) } func (*QueryCurrentEpochRequest) ProtoMessage() {} func (*QueryCurrentEpochRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_46bcc0d8d0692f49, []int{2} + return fileDescriptor_11ec49a7f39aeaae, []int{2} } func (m *QueryCurrentEpochRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -162,7 +162,7 @@ func (m *QueryCurrentEpochResponse) Reset() { *m = QueryCurrentEpochResp func (m *QueryCurrentEpochResponse) String() string { return proto.CompactTextString(m) } func (*QueryCurrentEpochResponse) ProtoMessage() {} func (*QueryCurrentEpochResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_46bcc0d8d0692f49, []int{3} + return fileDescriptor_11ec49a7f39aeaae, []int{3} } func (m *QueryCurrentEpochResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -199,42 +199,41 @@ func (m *QueryCurrentEpochResponse) GetCurrentEpoch() int64 { } func init() { - proto.RegisterType((*QueryEpochsInfoRequest)(nil), "duality.epochs.QueryEpochsInfoRequest") - proto.RegisterType((*QueryEpochsInfoResponse)(nil), "duality.epochs.QueryEpochsInfoResponse") - proto.RegisterType((*QueryCurrentEpochRequest)(nil), "duality.epochs.QueryCurrentEpochRequest") - proto.RegisterType((*QueryCurrentEpochResponse)(nil), "duality.epochs.QueryCurrentEpochResponse") -} - -func init() { proto.RegisterFile("duality/epochs/query.proto", fileDescriptor_46bcc0d8d0692f49) } - -var fileDescriptor_46bcc0d8d0692f49 = []byte{ - // 402 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0x41, 0x6b, 0xdb, 0x30, - 0x1c, 0xc5, 0xed, 0x64, 0x0b, 0x4c, 0xcb, 0x76, 0x10, 0x23, 0x73, 0xcc, 0xa6, 0x04, 0x8f, 0x6d, - 0xd9, 0x60, 0x16, 0xc9, 0x0e, 0x85, 0x9e, 0x4a, 0x4a, 0xa1, 0x3d, 0xd6, 0xc7, 0x5e, 0x8a, 0xec, - 0x28, 0x8e, 0x20, 0x91, 0x1c, 0x4b, 0x2e, 0xcd, 0xa1, 0x97, 0x1e, 0x7b, 0x2a, 0xe4, 0x4b, 0xe5, - 0x18, 0xe8, 0xa5, 0xa7, 0x52, 0x92, 0x7e, 0x90, 0x12, 0xd9, 0x09, 0x89, 0x6b, 0x68, 0x4f, 0x36, - 0x7a, 0xef, 0xfd, 0xf4, 0xfe, 0x7f, 0x04, 0xec, 0x5e, 0x42, 0x86, 0x4c, 0x4d, 0x30, 0x8d, 0x44, - 0x30, 0x90, 0x78, 0x9c, 0xd0, 0x78, 0xe2, 0x46, 0xb1, 0x50, 0x02, 0x7e, 0xce, 0x34, 0x37, 0xd5, - 0xec, 0x2f, 0xa1, 0x08, 0x85, 0x96, 0xf0, 0xea, 0x2f, 0x75, 0xd9, 0xdf, 0x42, 0x21, 0xc2, 0x21, - 0xc5, 0x24, 0x62, 0x98, 0x70, 0x2e, 0x14, 0x51, 0x4c, 0x70, 0x99, 0xa9, 0x7f, 0x03, 0x21, 0x47, - 0x42, 0x62, 0x9f, 0x48, 0x9a, 0xc2, 0xf1, 0x45, 0xdb, 0xa7, 0x8a, 0xb4, 0x71, 0x44, 0x42, 0xc6, - 0xb5, 0x79, 0x4d, 0xca, 0x75, 0x09, 0x29, 0xa7, 0x92, 0x65, 0x24, 0xc7, 0x02, 0xb5, 0xd3, 0x55, - 0xfe, 0x48, 0x8b, 0x27, 0xbc, 0x2f, 0x3c, 0x3a, 0x4e, 0xa8, 0x54, 0x8e, 0x07, 0xbe, 0xbe, 0x50, - 0x64, 0x24, 0xb8, 0xa4, 0x70, 0x0f, 0x54, 0x52, 0x98, 0x65, 0x36, 0xcb, 0xad, 0x8f, 0x9d, 0xba, - 0xbb, 0x3b, 0x93, 0xab, 0x33, 0xab, 0x48, 0xf7, 0xdd, 0xec, 0xa1, 0x61, 0x78, 0x99, 0xdd, 0xd9, - 0x07, 0x96, 0x66, 0x1e, 0x26, 0x71, 0x4c, 0xb9, 0xd2, 0xb6, 0xec, 0x3e, 0x88, 0x00, 0x60, 0x3d, - 0xca, 0x15, 0xeb, 0x33, 0x1a, 0x5b, 0x66, 0xd3, 0x6c, 0x7d, 0xf0, 0xb6, 0x4e, 0x9c, 0x03, 0x50, - 0x2f, 0xc8, 0x66, 0x8d, 0x7e, 0x80, 0x4f, 0x41, 0x7a, 0x7e, 0xae, 0xaf, 0xd2, 0xf9, 0xb2, 0x57, - 0x0d, 0xb6, 0xcc, 0x9d, 0x69, 0x09, 0xbc, 0xd7, 0x08, 0x78, 0x05, 0xc0, 0xa6, 0xa2, 0x84, 0xbf, - 0xf2, 0xf5, 0x8b, 0x37, 0x62, 0xff, 0x7e, 0xd5, 0x97, 0xb6, 0x71, 0xd0, 0xf5, 0xdd, 0xd3, 0xb4, - 0x64, 0xc1, 0x1a, 0xce, 0xed, 0x3e, 0xfd, 0xc0, 0x1b, 0x13, 0x54, 0xb7, 0xc7, 0x80, 0xad, 0x42, - 0x72, 0xc1, 0x96, 0xec, 0x3f, 0x6f, 0x70, 0x66, 0x2d, 0x7e, 0xea, 0x16, 0x0d, 0xf8, 0x3d, 0xdf, - 0x62, 0x67, 0x53, 0xdd, 0xe3, 0xd9, 0x02, 0x99, 0xf3, 0x05, 0x32, 0x1f, 0x17, 0xc8, 0xbc, 0x5d, - 0x22, 0x63, 0xbe, 0x44, 0xc6, 0xfd, 0x12, 0x19, 0x67, 0x6e, 0xc8, 0xd4, 0x20, 0xf1, 0xdd, 0x40, - 0x8c, 0xd6, 0x88, 0x7f, 0x43, 0xe2, 0xcb, 0x0d, 0xef, 0x72, 0x4d, 0x54, 0x93, 0x88, 0x4a, 0xbf, - 0xa2, 0x9f, 0xd4, 0xff, 0xe7, 0x00, 0x00, 0x00, 0xff, 0xff, 0x49, 0x4a, 0x4c, 0xc9, 0xfe, 0x02, - 0x00, 0x00, + proto.RegisterType((*QueryEpochsInfoRequest)(nil), "neutron.epochs.QueryEpochsInfoRequest") + proto.RegisterType((*QueryEpochsInfoResponse)(nil), "neutron.epochs.QueryEpochsInfoResponse") + proto.RegisterType((*QueryCurrentEpochRequest)(nil), "neutron.epochs.QueryCurrentEpochRequest") + proto.RegisterType((*QueryCurrentEpochResponse)(nil), "neutron.epochs.QueryCurrentEpochResponse") +} + +func init() { proto.RegisterFile("neutron/epochs/query.proto", fileDescriptor_11ec49a7f39aeaae) } + +var fileDescriptor_11ec49a7f39aeaae = []byte{ + // 400 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xc1, 0x8b, 0xd3, 0x40, + 0x18, 0xc5, 0x93, 0x56, 0x0b, 0x8e, 0xd5, 0xc3, 0x20, 0x35, 0x0d, 0x3a, 0x2d, 0x11, 0xb5, 0x0a, + 0xcd, 0xd0, 0x7a, 0x10, 0x3c, 0x49, 0x45, 0xc4, 0xa3, 0x39, 0x7a, 0x91, 0x24, 0x4e, 0xa7, 0x03, + 0x76, 0xbe, 0x34, 0x33, 0x11, 0x7b, 0xf0, 0xb2, 0xc7, 0x3d, 0x2d, 0xf4, 0x9f, 0xea, 0xb1, 0xb0, + 0x97, 0x3d, 0x2d, 0x4b, 0xbb, 0x7f, 0xc8, 0xd2, 0x49, 0x5a, 0xda, 0x6c, 0x60, 0xf7, 0x94, 0x30, + 0xef, 0xbd, 0xdf, 0xbc, 0xef, 0x63, 0x90, 0x2b, 0x59, 0xa6, 0x53, 0x90, 0x94, 0x25, 0x10, 0x4f, + 0x14, 0x9d, 0x65, 0x2c, 0x9d, 0xfb, 0x49, 0x0a, 0x1a, 0xf0, 0xd3, 0x42, 0xf3, 0x73, 0xcd, 0x7d, + 0xc6, 0x81, 0x83, 0x91, 0xe8, 0xf6, 0x2f, 0x77, 0xb9, 0x2f, 0x38, 0x00, 0xff, 0xc3, 0x68, 0x98, + 0x08, 0x1a, 0x4a, 0x09, 0x3a, 0xd4, 0x02, 0xa4, 0x2a, 0xd4, 0xf7, 0x31, 0xa8, 0x29, 0x28, 0x1a, + 0x85, 0x8a, 0xe5, 0x70, 0xfa, 0x77, 0x10, 0x31, 0x1d, 0x0e, 0x68, 0x12, 0x72, 0x21, 0x8d, 0x79, + 0x47, 0x2a, 0x75, 0xe1, 0x4c, 0x32, 0x25, 0x0a, 0x92, 0xe7, 0xa0, 0xd6, 0x8f, 0x6d, 0xfe, 0xab, + 0x11, 0xbf, 0xcb, 0x31, 0x04, 0x6c, 0x96, 0x31, 0xa5, 0xbd, 0x00, 0x3d, 0xbf, 0xa5, 0xa8, 0x04, + 0xa4, 0x62, 0xf8, 0x23, 0x6a, 0xe4, 0x30, 0xc7, 0xee, 0xd6, 0x7b, 0x8f, 0x87, 0x6d, 0xff, 0x78, + 0x26, 0xdf, 0x64, 0xb6, 0x91, 0xd1, 0x83, 0xe5, 0x65, 0xc7, 0x0a, 0x0a, 0xbb, 0xf7, 0x09, 0x39, + 0x86, 0xf9, 0x25, 0x4b, 0x53, 0x26, 0xb5, 0xb1, 0x15, 0xf7, 0x61, 0x82, 0x90, 0xf8, 0xcd, 0xa4, + 0x16, 0x63, 0xc1, 0x52, 0xc7, 0xee, 0xda, 0xbd, 0x47, 0xc1, 0xc1, 0x89, 0xf7, 0x19, 0xb5, 0x2b, + 0xb2, 0x45, 0xa3, 0x57, 0xe8, 0x49, 0x9c, 0x9f, 0xff, 0x32, 0x57, 0x99, 0x7c, 0x3d, 0x68, 0xc6, + 0x07, 0xe6, 0xe1, 0xa2, 0x86, 0x1e, 0x1a, 0x04, 0xfe, 0x8f, 0xd0, 0xbe, 0xa2, 0xc2, 0x6f, 0xca, + 0xf5, 0xab, 0x37, 0xe2, 0xbe, 0xbd, 0xd3, 0x97, 0xb7, 0xf1, 0xc8, 0xc9, 0xf9, 0xf5, 0xa2, 0xe6, + 0xe0, 0x16, 0x2d, 0xed, 0x3e, 0xff, 0xe0, 0x53, 0x1b, 0x35, 0x0f, 0xc7, 0xc0, 0xbd, 0x4a, 0x72, + 0xc5, 0x96, 0xdc, 0x77, 0xf7, 0x70, 0x16, 0x2d, 0x5e, 0x9b, 0x16, 0x1d, 0xfc, 0xb2, 0xdc, 0xe2, + 0x68, 0x53, 0xa3, 0x6f, 0xcb, 0x35, 0xb1, 0x57, 0x6b, 0x62, 0x5f, 0xad, 0x89, 0x7d, 0xb6, 0x21, + 0xd6, 0x6a, 0x43, 0xac, 0x8b, 0x0d, 0xb1, 0x7e, 0xf6, 0xb9, 0xd0, 0x93, 0x2c, 0xf2, 0x63, 0x98, + 0xee, 0x10, 0x7d, 0x48, 0xf9, 0x1e, 0xf7, 0x6f, 0x07, 0xd4, 0xf3, 0x84, 0xa9, 0xa8, 0x61, 0x5e, + 0xd4, 0x87, 0x9b, 0x00, 0x00, 0x00, 0xff, 0xff, 0xda, 0x17, 0x4e, 0xb5, 0xfd, 0x02, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -265,7 +264,7 @@ func NewQueryClient(cc grpc1.ClientConn) QueryClient { func (c *queryClient) EpochInfos(ctx context.Context, in *QueryEpochsInfoRequest, opts ...grpc.CallOption) (*QueryEpochsInfoResponse, error) { out := new(QueryEpochsInfoResponse) - err := c.cc.Invoke(ctx, "/duality.epochs.Query/EpochInfos", in, out, opts...) + err := c.cc.Invoke(ctx, "/neutron.epochs.Query/EpochInfos", in, out, opts...) if err != nil { return nil, err } @@ -274,7 +273,7 @@ func (c *queryClient) EpochInfos(ctx context.Context, in *QueryEpochsInfoRequest func (c *queryClient) CurrentEpoch(ctx context.Context, in *QueryCurrentEpochRequest, opts ...grpc.CallOption) (*QueryCurrentEpochResponse, error) { out := new(QueryCurrentEpochResponse) - err := c.cc.Invoke(ctx, "/duality.epochs.Query/CurrentEpoch", in, out, opts...) + err := c.cc.Invoke(ctx, "/neutron.epochs.Query/CurrentEpoch", in, out, opts...) if err != nil { return nil, err } @@ -314,7 +313,7 @@ func _Query_EpochInfos_Handler(srv interface{}, ctx context.Context, dec func(in } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/duality.epochs.Query/EpochInfos", + FullMethod: "/neutron.epochs.Query/EpochInfos", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).EpochInfos(ctx, req.(*QueryEpochsInfoRequest)) @@ -332,7 +331,7 @@ func _Query_CurrentEpoch_Handler(srv interface{}, ctx context.Context, dec func( } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/duality.epochs.Query/CurrentEpoch", + FullMethod: "/neutron.epochs.Query/CurrentEpoch", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).CurrentEpoch(ctx, req.(*QueryCurrentEpochRequest)) @@ -341,7 +340,7 @@ func _Query_CurrentEpoch_Handler(srv interface{}, ctx context.Context, dec func( } var _Query_serviceDesc = grpc.ServiceDesc{ - ServiceName: "duality.epochs.Query", + ServiceName: "neutron.epochs.Query", HandlerType: (*QueryServer)(nil), Methods: []grpc.MethodDesc{ { @@ -354,7 +353,7 @@ var _Query_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "duality/epochs/query.proto", + Metadata: "neutron/epochs/query.proto", } func (m *QueryEpochsInfoRequest) Marshal() (dAtA []byte, err error) { diff --git a/x/epochs/types/query.pb.gw.go b/x/epochs/types/query.pb.gw.go index a20817322..3b0d42301 100644 --- a/x/epochs/types/query.pb.gw.go +++ b/x/epochs/types/query.pb.gw.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-grpc-gateway. DO NOT EDIT. -// source: duality/epochs/query.proto +// source: neutron/epochs/query.proto /* Package types is a reverse proxy. @@ -224,9 +224,9 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } var ( - pattern_Query_EpochInfos_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 1}, []string{"duality", "epochs"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_EpochInfos_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 1}, []string{"neutron", "epochs"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_CurrentEpoch_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"duality", "epochs", "current_epoch"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_CurrentEpoch_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"neutron", "epochs", "current_epoch"}, "", runtime.AssumeColonVerbOpt(false))) ) var ( diff --git a/x/incentives/types/account_history.pb.go b/x/incentives/types/account_history.pb.go index daaa35b10..de7676f41 100644 --- a/x/incentives/types/account_history.pb.go +++ b/x/incentives/types/account_history.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: duality/incentives/account_history.proto +// source: neutron/incentives/account_history.proto package types @@ -37,7 +37,7 @@ func (m *AccountHistory) Reset() { *m = AccountHistory{} } func (m *AccountHistory) String() string { return proto.CompactTextString(m) } func (*AccountHistory) ProtoMessage() {} func (*AccountHistory) Descriptor() ([]byte, []int) { - return fileDescriptor_69dfb106c545010e, []int{0} + return fileDescriptor_6b167edf56b0451f, []int{0} } func (m *AccountHistory) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -81,17 +81,17 @@ func (m *AccountHistory) GetCoins() github_com_cosmos_cosmos_sdk_types.Coins { } func init() { - proto.RegisterType((*AccountHistory)(nil), "duality.incentives.AccountHistory") + proto.RegisterType((*AccountHistory)(nil), "neutron.incentives.AccountHistory") } func init() { - proto.RegisterFile("duality/incentives/account_history.proto", fileDescriptor_69dfb106c545010e) + proto.RegisterFile("neutron/incentives/account_history.proto", fileDescriptor_6b167edf56b0451f) } -var fileDescriptor_69dfb106c545010e = []byte{ - // 263 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0x48, 0x29, 0x4d, 0xcc, - 0xc9, 0x2c, 0xa9, 0xd4, 0xcf, 0xcc, 0x4b, 0x4e, 0xcd, 0x2b, 0xc9, 0x2c, 0x4b, 0x2d, 0xd6, 0x4f, +var fileDescriptor_6b167edf56b0451f = []byte{ + // 262 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0xc8, 0x4b, 0x2d, 0x2d, + 0x29, 0xca, 0xcf, 0xd3, 0xcf, 0xcc, 0x4b, 0x4e, 0xcd, 0x2b, 0xc9, 0x2c, 0x4b, 0x2d, 0xd6, 0x4f, 0x4c, 0x4e, 0xce, 0x2f, 0xcd, 0x2b, 0x89, 0xcf, 0xc8, 0x2c, 0x2e, 0xc9, 0x2f, 0xaa, 0xd4, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x82, 0xaa, 0xd4, 0x43, 0xa8, 0x94, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0x4b, 0xeb, 0x83, 0x58, 0x10, 0x95, 0x52, 0x72, 0xc9, 0xf9, 0xc5, 0xb9, 0xf9, 0xc5, @@ -102,11 +102,11 @@ var fileDescriptor_69dfb106c545010e = []byte{ 0xf5, 0x40, 0x86, 0xeb, 0x41, 0x0d, 0xd7, 0x73, 0xce, 0xcf, 0xcc, 0x73, 0x32, 0x38, 0x71, 0x4f, 0x9e, 0x61, 0xd5, 0x7d, 0x79, 0x8d, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0x7d, 0xa8, 0x4b, 0x20, 0x94, 0x6e, 0x71, 0x4a, 0xb6, 0x7e, 0x49, 0x65, 0x41, 0x6a, 0x31, 0x58, - 0x43, 0x71, 0x10, 0xc4, 0x64, 0x27, 0x9f, 0x13, 0x8f, 0xe4, 0x18, 0x2f, 0x3c, 0x92, 0x63, 0x7c, + 0x43, 0x71, 0x10, 0xc4, 0x64, 0x27, 0xef, 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, 0x42, 0x32, 0x0a, 0xea, 0x7d, 0xdd, 0x9c, 0xc4, 0xa4, 0x62, 0x18, 0x47, 0xbf, 0x02, - 0x39, 0xdc, 0xc0, 0x46, 0x27, 0xb1, 0x81, 0x3d, 0x69, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0xf0, - 0x48, 0x9b, 0xa0, 0x5a, 0x01, 0x00, 0x00, + 0x88, 0x32, 0x44, 0x32, 0x0a, 0xea, 0x7d, 0xdd, 0xfc, 0xa2, 0x74, 0x18, 0x5b, 0xbf, 0x02, 0x39, + 0xd8, 0xc0, 0x26, 0x27, 0xb1, 0x81, 0xfd, 0x68, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x43, 0xc5, + 0xdc, 0x5f, 0x59, 0x01, 0x00, 0x00, } func (m *AccountHistory) Marshal() (dAtA []byte, err error) { diff --git a/x/incentives/types/gauge.pb.go b/x/incentives/types/gauge.pb.go index 9b1e87dd7..5265a1dc6 100644 --- a/x/incentives/types/gauge.pb.go +++ b/x/incentives/types/gauge.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: duality/incentives/gauge.proto +// source: neutron/incentives/gauge.proto package types @@ -103,7 +103,7 @@ func (m *Gauge) Reset() { *m = Gauge{} } func (m *Gauge) String() string { return proto.CompactTextString(m) } func (*Gauge) ProtoMessage() {} func (*Gauge) Descriptor() ([]byte, []int) { - return fileDescriptor_13cec3b76ad4f381, []int{0} + return fileDescriptor_2467fab98b594cb6, []int{0} } func (m *Gauge) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -214,7 +214,7 @@ func (m *QueryCondition) Reset() { *m = QueryCondition{} } func (m *QueryCondition) String() string { return proto.CompactTextString(m) } func (*QueryCondition) ProtoMessage() {} func (*QueryCondition) Descriptor() ([]byte, []int) { - return fileDescriptor_13cec3b76ad4f381, []int{1} + return fileDescriptor_2467fab98b594cb6, []int{1} } func (m *QueryCondition) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -265,50 +265,50 @@ func (m *QueryCondition) GetEndTick() int64 { } func init() { - proto.RegisterType((*Gauge)(nil), "duality.incentives.Gauge") - proto.RegisterType((*QueryCondition)(nil), "duality.incentives.QueryCondition") + proto.RegisterType((*Gauge)(nil), "neutron.incentives.Gauge") + proto.RegisterType((*QueryCondition)(nil), "neutron.incentives.QueryCondition") } -func init() { proto.RegisterFile("duality/incentives/gauge.proto", fileDescriptor_13cec3b76ad4f381) } +func init() { proto.RegisterFile("neutron/incentives/gauge.proto", fileDescriptor_2467fab98b594cb6) } -var fileDescriptor_13cec3b76ad4f381 = []byte{ - // 564 bytes of a gzipped FileDescriptorProto +var fileDescriptor_2467fab98b594cb6 = []byte{ + // 566 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x53, 0xcd, 0x6e, 0xd3, 0x4c, - 0x14, 0x8d, 0x9b, 0xf4, 0x6f, 0xd2, 0x56, 0x5f, 0xe7, 0xeb, 0xc2, 0xad, 0xc0, 0x09, 0x61, 0x63, - 0x09, 0x75, 0x86, 0x86, 0x1d, 0xcb, 0x14, 0x84, 0x90, 0x40, 0x04, 0x2b, 0x0b, 0xc4, 0xc6, 0x1a, - 0x7b, 0xa6, 0xee, 0x55, 0x6c, 0x8f, 0xe5, 0x19, 0x47, 0xc9, 0x5b, 0xf4, 0x39, 0x78, 0x03, 0xde, - 0xa0, 0xcb, 0x2e, 0x59, 0xb5, 0x28, 0x79, 0x03, 0x9e, 0x00, 0x79, 0x6c, 0x93, 0x00, 0x5b, 0x56, - 0xc9, 0x9c, 0x73, 0xff, 0xce, 0xb9, 0xd7, 0xc8, 0xe1, 0x05, 0x8b, 0x41, 0x2f, 0x28, 0xa4, 0xa1, - 0x48, 0x35, 0xcc, 0x84, 0xa2, 0x11, 0x2b, 0x22, 0x41, 0xb2, 0x5c, 0x6a, 0x89, 0x71, 0xcd, 0x93, - 0x35, 0x7f, 0x76, 0x12, 0xc9, 0x48, 0x1a, 0x9a, 0x96, 0xff, 0xaa, 0xc8, 0x33, 0x27, 0x92, 0x32, - 0x8a, 0x05, 0x35, 0xaf, 0xa0, 0xb8, 0xa2, 0xbc, 0xc8, 0x99, 0x06, 0x99, 0xd6, 0x7c, 0xef, 0x4f, - 0x5e, 0x43, 0x22, 0x94, 0x66, 0x49, 0xd6, 0x14, 0x08, 0xa5, 0x4a, 0xa4, 0xa2, 0x01, 0x53, 0x82, - 0xce, 0x2e, 0x02, 0xa1, 0xd9, 0x05, 0x0d, 0x25, 0x34, 0x05, 0x4e, 0x9b, 0x51, 0xb9, 0x98, 0xd3, - 0x8c, 0x41, 0xee, 0x03, 0xaf, 0xa8, 0xc1, 0xd7, 0x0e, 0xda, 0x7e, 0x53, 0x4e, 0x8d, 0x8f, 0xd0, - 0x16, 0x70, 0xdb, 0xea, 0x5b, 0x6e, 0xc7, 0xdb, 0x02, 0x8e, 0x9f, 0xa0, 0x03, 0x50, 0x7e, 0x26, - 0xf2, 0x4c, 0xe8, 0x82, 0xc5, 0xf6, 0x56, 0xdf, 0x72, 0xf7, 0xbc, 0x2e, 0xa8, 0x71, 0x03, 0xe1, - 0xf7, 0xe8, 0x90, 0x83, 0xd2, 0x39, 0x04, 0x85, 0x16, 0xbe, 0x96, 0x76, 0xbb, 0x6f, 0xb9, 0xdd, - 0xe1, 0x80, 0xfc, 0x2d, 0x9d, 0x7c, 0x2c, 0x44, 0xbe, 0xb8, 0x94, 0x29, 0x87, 0x52, 0xd9, 0xa8, - 0x73, 0x7b, 0xdf, 0x6b, 0x79, 0x07, 0xeb, 0xf4, 0x89, 0xc4, 0x0c, 0x6d, 0x97, 0x43, 0x2b, 0xbb, - 0xd3, 0x6f, 0xbb, 0xdd, 0xe1, 0x29, 0xa9, 0x64, 0x91, 0x52, 0x16, 0xa9, 0x65, 0x91, 0x4b, 0x09, - 0xe9, 0xe8, 0x79, 0x99, 0xfd, 0xe5, 0xa1, 0xe7, 0x46, 0xa0, 0xaf, 0x8b, 0x80, 0x84, 0x32, 0xa1, - 0xb5, 0x07, 0xd5, 0xcf, 0xb9, 0xe2, 0x53, 0xaa, 0x17, 0x99, 0x50, 0x26, 0x41, 0x79, 0x55, 0x65, - 0xfc, 0x09, 0x21, 0xa5, 0x59, 0xae, 0xfd, 0xd2, 0x42, 0x7b, 0xdb, 0x8c, 0x7b, 0x46, 0x2a, 0x7f, - 0x49, 0xe3, 0x2f, 0x99, 0x34, 0xfe, 0x8e, 0x1e, 0x97, 0x8d, 0x7e, 0xdc, 0xf7, 0x8e, 0x17, 0x2c, - 0x89, 0x5f, 0x0e, 0xd6, 0xb9, 0x83, 0x9b, 0x87, 0x9e, 0xe5, 0xed, 0x1b, 0xa0, 0x0c, 0xc7, 0x14, - 0x9d, 0xa4, 0x45, 0xe2, 0x8b, 0x4c, 0x86, 0xd7, 0xca, 0xcf, 0x18, 0x70, 0x5f, 0xce, 0x44, 0x6e, - 0xef, 0x18, 0x43, 0x8f, 0xd3, 0x22, 0x79, 0x6d, 0xa8, 0x31, 0x03, 0xfe, 0x61, 0x26, 0x72, 0xfc, - 0x14, 0x1d, 0x5e, 0x41, 0x1c, 0x0b, 0x5e, 0xe7, 0xd8, 0xbb, 0x26, 0xf2, 0xa0, 0x02, 0xab, 0x60, - 0x3c, 0x47, 0xc7, 0x6b, 0x8b, 0xb8, 0x5f, 0xd9, 0xb3, 0xf7, 0xef, 0xed, 0xf9, 0x6f, 0xa3, 0x8b, - 0x41, 0xca, 0xf5, 0x67, 0x39, 0x84, 0x90, 0x46, 0xbe, 0x86, 0x70, 0x6a, 0xef, 0xf7, 0x2d, 0xb7, - 0xed, 0x75, 0x6b, 0x6c, 0x02, 0xe1, 0x74, 0x50, 0xa0, 0xa3, 0xdf, 0xb7, 0x8a, 0x9f, 0xa1, 0x9d, - 0xf2, 0xbc, 0xde, 0xbe, 0x32, 0x77, 0xd4, 0x1d, 0xfe, 0xff, 0xeb, 0x12, 0xb8, 0x98, 0x93, 0xb1, - 0xa1, 0xbc, 0x3a, 0x04, 0x3f, 0x42, 0x8d, 0x7d, 0xe1, 0xd4, 0x5c, 0x57, 0xdb, 0x5b, 0x03, 0xd8, - 0x46, 0xbb, 0x22, 0xe5, 0x86, 0x6b, 0x1b, 0xae, 0x79, 0x8e, 0xde, 0xdd, 0x2e, 0x1d, 0xeb, 0x6e, - 0xe9, 0x58, 0xdf, 0x97, 0x8e, 0x75, 0xb3, 0x72, 0x5a, 0x77, 0x2b, 0xa7, 0xf5, 0x6d, 0xe5, 0xb4, - 0x3e, 0x0f, 0x37, 0xf4, 0xd6, 0x8d, 0xcf, 0x63, 0x16, 0xa8, 0xe6, 0x41, 0xe7, 0x9b, 0x1f, 0xab, - 0xd1, 0x1f, 0xec, 0x98, 0xad, 0xbf, 0xf8, 0x19, 0x00, 0x00, 0xff, 0xff, 0xf7, 0x71, 0x80, 0xd1, - 0xcf, 0x03, 0x00, 0x00, + 0x14, 0x8d, 0x9b, 0x9f, 0xb6, 0x93, 0xb4, 0xfa, 0x32, 0x5f, 0x17, 0x6e, 0x04, 0x4e, 0x08, 0x1b, + 0x4b, 0xa8, 0x33, 0x24, 0xec, 0x58, 0xa6, 0x20, 0x84, 0x10, 0x22, 0x58, 0x59, 0x20, 0x36, 0xd6, + 0xd8, 0x33, 0x75, 0x47, 0x89, 0x3d, 0xd6, 0xcc, 0x38, 0x4a, 0xde, 0xa2, 0xcf, 0xc1, 0x1b, 0xf0, + 0x06, 0x5d, 0x76, 0xc9, 0xaa, 0x45, 0xc9, 0x1b, 0xf0, 0x04, 0xc8, 0x63, 0x9b, 0x04, 0xd8, 0xb2, + 0xf2, 0xcc, 0x39, 0xf7, 0xce, 0xbd, 0xe7, 0xdc, 0x6b, 0xe0, 0x24, 0x2c, 0xd3, 0x52, 0x24, 0x98, + 0x27, 0x21, 0x4b, 0x34, 0x5f, 0x32, 0x85, 0x23, 0x92, 0x45, 0x0c, 0xa5, 0x52, 0x68, 0x01, 0x61, + 0xc9, 0xa3, 0x1d, 0xdf, 0x3b, 0x8b, 0x44, 0x24, 0x0c, 0x8d, 0xf3, 0x53, 0x11, 0xd9, 0x73, 0x22, + 0x21, 0xa2, 0x05, 0xc3, 0xe6, 0x16, 0x64, 0x57, 0x98, 0x66, 0x92, 0x68, 0x2e, 0x92, 0x92, 0xef, + 0xff, 0xc9, 0x6b, 0x1e, 0x33, 0xa5, 0x49, 0x9c, 0x56, 0x0f, 0x84, 0x42, 0xc5, 0x42, 0xe1, 0x80, + 0x28, 0x86, 0x97, 0xa3, 0x80, 0x69, 0x32, 0xc2, 0xa1, 0xe0, 0xd5, 0x03, 0xe7, 0x55, 0xab, 0x94, + 0xad, 0x70, 0x4a, 0xb8, 0xf4, 0x39, 0x2d, 0xa8, 0xe1, 0xd7, 0x06, 0x68, 0xbe, 0xc9, 0xbb, 0x86, + 0xa7, 0xe0, 0x80, 0x53, 0xdb, 0x1a, 0x58, 0x6e, 0xc3, 0x3b, 0xe0, 0x14, 0x3e, 0x01, 0x1d, 0xae, + 0xfc, 0x94, 0xc9, 0x94, 0xe9, 0x8c, 0x2c, 0xec, 0x83, 0x81, 0xe5, 0x1e, 0x79, 0x6d, 0xae, 0xa6, + 0x15, 0x04, 0xdf, 0x83, 0x13, 0xca, 0x95, 0x96, 0x3c, 0xc8, 0x34, 0xf3, 0xb5, 0xb0, 0xeb, 0x03, + 0xcb, 0x6d, 0x8f, 0x87, 0xe8, 0x6f, 0xe9, 0xe8, 0x63, 0xc6, 0xe4, 0xfa, 0x52, 0x24, 0x94, 0xe7, + 0xca, 0x26, 0x8d, 0xdb, 0xfb, 0x7e, 0xcd, 0xeb, 0xec, 0xd2, 0x67, 0x02, 0x12, 0xd0, 0xcc, 0x9b, + 0x56, 0x76, 0x63, 0x50, 0x77, 0xdb, 0xe3, 0x73, 0x54, 0xc8, 0x42, 0xb9, 0x2c, 0x54, 0xca, 0x42, + 0x97, 0x82, 0x27, 0x93, 0xe7, 0x79, 0xf6, 0x97, 0x87, 0xbe, 0x1b, 0x71, 0x7d, 0x9d, 0x05, 0x28, + 0x14, 0x31, 0x2e, 0x3d, 0x28, 0x3e, 0x17, 0x8a, 0xce, 0xb1, 0x5e, 0xa7, 0x4c, 0x99, 0x04, 0xe5, + 0x15, 0x2f, 0xc3, 0x4f, 0x00, 0x28, 0x4d, 0xa4, 0xf6, 0x73, 0x0b, 0xed, 0xa6, 0x69, 0xb7, 0x87, + 0x0a, 0x7f, 0x51, 0xe5, 0x2f, 0x9a, 0x55, 0xfe, 0x4e, 0x1e, 0xe7, 0x85, 0x7e, 0xdc, 0xf7, 0xbb, + 0x6b, 0x12, 0x2f, 0x5e, 0x0e, 0x77, 0xb9, 0xc3, 0x9b, 0x87, 0xbe, 0xe5, 0x1d, 0x1b, 0x20, 0x0f, + 0x87, 0x18, 0x9c, 0x25, 0x59, 0xec, 0xb3, 0x54, 0x84, 0xd7, 0xca, 0x4f, 0x09, 0xa7, 0xbe, 0x58, + 0x32, 0x69, 0xb7, 0x8c, 0xa1, 0xdd, 0x24, 0x8b, 0x5f, 0x1b, 0x6a, 0x4a, 0x38, 0xfd, 0xb0, 0x64, + 0x12, 0x3e, 0x05, 0x27, 0x57, 0x7c, 0xb1, 0x60, 0xb4, 0xcc, 0xb1, 0x0f, 0x4d, 0x64, 0xa7, 0x00, + 0x8b, 0x60, 0xb8, 0x02, 0xdd, 0x9d, 0x45, 0xd4, 0x2f, 0xec, 0x39, 0xfa, 0xf7, 0xf6, 0xfc, 0xb7, + 0x57, 0xc5, 0x20, 0xf9, 0xf8, 0x53, 0xc9, 0x43, 0x9e, 0x44, 0xbe, 0xe6, 0xe1, 0xdc, 0x3e, 0x1e, + 0x58, 0x6e, 0xdd, 0x6b, 0x97, 0xd8, 0x8c, 0x87, 0xf3, 0x61, 0x06, 0x4e, 0x7f, 0x9f, 0x2a, 0x7c, + 0x06, 0x5a, 0xf9, 0x7a, 0xbd, 0x7d, 0x65, 0xf6, 0xa8, 0x3d, 0xfe, 0xff, 0xd7, 0x26, 0x50, 0xb6, + 0x42, 0x53, 0x43, 0x79, 0x65, 0x08, 0x7c, 0x04, 0x2a, 0xfb, 0xc2, 0xb9, 0xd9, 0xae, 0xba, 0xb7, + 0x03, 0xa0, 0x0d, 0x0e, 0x59, 0x42, 0x0d, 0x57, 0x37, 0x5c, 0x75, 0x9d, 0xbc, 0xbb, 0xdd, 0x38, + 0xd6, 0xdd, 0xc6, 0xb1, 0xbe, 0x6f, 0x1c, 0xeb, 0x66, 0xeb, 0xd4, 0xee, 0xb6, 0x4e, 0xed, 0xdb, + 0xd6, 0xa9, 0x7d, 0x1e, 0xed, 0xe9, 0x2d, 0x0b, 0x5f, 0x08, 0x19, 0x55, 0x67, 0xbc, 0xda, 0xff, + 0x57, 0x8d, 0xfc, 0xa0, 0x65, 0x86, 0xfe, 0xe2, 0x67, 0x00, 0x00, 0x00, 0xff, 0xff, 0xf6, 0xde, + 0x74, 0xfa, 0xce, 0x03, 0x00, 0x00, } func (m *Gauge) Marshal() (dAtA []byte, err error) { diff --git a/x/incentives/types/genesis.pb.go b/x/incentives/types/genesis.pb.go index 3e5c7de8c..5455123db 100644 --- a/x/incentives/types/genesis.pb.go +++ b/x/incentives/types/genesis.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: duality/incentives/genesis.proto +// source: neutron/incentives/genesis.proto package types @@ -42,7 +42,7 @@ 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_a99219687c93d9eb, []int{0} + return fileDescriptor_98ecc78531d9ace2, []int{0} } func (m *GenesisState) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -114,34 +114,34 @@ func (m *GenesisState) GetAccountHistories() []*AccountHistory { } func init() { - proto.RegisterType((*GenesisState)(nil), "duality.incentives.GenesisState") + proto.RegisterType((*GenesisState)(nil), "neutron.incentives.GenesisState") } -func init() { proto.RegisterFile("duality/incentives/genesis.proto", fileDescriptor_a99219687c93d9eb) } +func init() { proto.RegisterFile("neutron/incentives/genesis.proto", fileDescriptor_98ecc78531d9ace2) } -var fileDescriptor_a99219687c93d9eb = []byte{ - // 333 bytes of a gzipped FileDescriptorProto +var fileDescriptor_98ecc78531d9ace2 = []byte{ + // 332 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0x4f, 0x4f, 0xc2, 0x30, - 0x18, 0xc6, 0x57, 0xc0, 0x1d, 0x8a, 0x26, 0xa6, 0xf1, 0x30, 0x77, 0x28, 0x0b, 0xa7, 0x5d, 0xdc, - 0x22, 0x5e, 0xbc, 0xca, 0x05, 0x49, 0x8c, 0x31, 0xe3, 0xe6, 0x85, 0x94, 0xad, 0x19, 0x8d, 0xb0, - 0x12, 0xda, 0x19, 0xf7, 0x2d, 0xfc, 0x54, 0x86, 0x23, 0x47, 0x4f, 0xc6, 0x6c, 0x5f, 0xc4, 0xb4, - 0x2b, 0x42, 0xc2, 0xf4, 0xd6, 0xbe, 0xcf, 0xef, 0x79, 0xff, 0x42, 0x2f, 0xc9, 0xc9, 0x82, 0xc9, - 0x22, 0x64, 0x59, 0x4c, 0x33, 0xc9, 0x5e, 0xa9, 0x08, 0x53, 0x9a, 0x51, 0xc1, 0x44, 0xb0, 0x5a, - 0x73, 0xc9, 0x11, 0x32, 0x44, 0xb0, 0x27, 0xdc, 0x8b, 0x94, 0xa7, 0x5c, 0xcb, 0xa1, 0x7a, 0xd5, - 0xa4, 0xdb, 0x6b, 0xc8, 0xb5, 0x22, 0x6b, 0xb2, 0x34, 0xa9, 0x5c, 0xdc, 0x54, 0x8c, 0xe4, 0x29, - 0xfd, 0x47, 0x17, 0x92, 0xbc, 0xec, 0x74, 0xbf, 0x41, 0x27, 0x71, 0xcc, 0xf3, 0x4c, 0x4e, 0xe7, - 0x4c, 0x48, 0xbe, 0x2e, 0x6a, 0xb2, 0xff, 0xd1, 0x82, 0xa7, 0xa3, 0x7a, 0x8c, 0x89, 0x24, 0x92, - 0xa2, 0x5b, 0x68, 0xd7, 0xad, 0x38, 0xc0, 0x03, 0x7e, 0x77, 0xe0, 0x06, 0xc7, 0x63, 0x05, 0x4f, - 0x9a, 0x18, 0x76, 0x36, 0x5f, 0x3d, 0x2b, 0x32, 0x3c, 0xba, 0x86, 0xb6, 0xee, 0x51, 0x38, 0x2d, - 0xaf, 0xed, 0x77, 0x07, 0x97, 0x4d, 0xce, 0x91, 0x22, 0x22, 0x03, 0xa2, 0x3e, 0x3c, 0x5b, 0x10, - 0x21, 0xa7, 0xfa, 0x3b, 0x65, 0x89, 0xd3, 0xf6, 0x80, 0xdf, 0x89, 0xba, 0x2a, 0xa8, 0xc9, 0x71, - 0xf2, 0xcb, 0xe8, 0xf9, 0x14, 0xd3, 0xd9, 0x33, 0x13, 0x15, 0x1b, 0x27, 0xaa, 0xb4, 0x96, 0x85, - 0x73, 0xf2, 0x77, 0x69, 0x0d, 0x47, 0x06, 0x44, 0x8f, 0xf0, 0xdc, 0x6c, 0xe4, 0x5e, 0x2f, 0x84, - 0x51, 0xe1, 0xd8, 0xda, 0xdc, 0x6f, 0x32, 0xdf, 0x1d, 0xb2, 0x45, 0x74, 0xe4, 0x1d, 0x3e, 0x6c, - 0x4a, 0x0c, 0xb6, 0x25, 0x06, 0xdf, 0x25, 0x06, 0xef, 0x15, 0xb6, 0xb6, 0x15, 0xb6, 0x3e, 0x2b, - 0x6c, 0x3d, 0x0f, 0x52, 0x26, 0xe7, 0xf9, 0x2c, 0x88, 0xf9, 0x32, 0x34, 0x99, 0xaf, 0x16, 0x64, - 0x26, 0x76, 0x9f, 0xf0, 0xed, 0xf0, 0x4c, 0xb2, 0x58, 0x51, 0x31, 0xb3, 0xf5, 0x75, 0x6e, 0x7e, - 0x02, 0x00, 0x00, 0xff, 0xff, 0x90, 0xe9, 0xfd, 0x56, 0x76, 0x02, 0x00, 0x00, + 0x18, 0xc6, 0x37, 0xc0, 0x1d, 0x8a, 0x26, 0xa6, 0xf1, 0x30, 0x77, 0x28, 0x0b, 0xa7, 0x5d, 0xdc, + 0x02, 0x5e, 0xbc, 0xca, 0x05, 0x89, 0x89, 0x31, 0xe3, 0xe6, 0x85, 0x94, 0xd1, 0x94, 0x46, 0x69, + 0xc9, 0xda, 0x19, 0xf9, 0x16, 0x7e, 0x2a, 0xc3, 0x91, 0xa3, 0x27, 0x63, 0xd8, 0x17, 0x31, 0xed, + 0x8a, 0x90, 0x30, 0xbd, 0xb5, 0xef, 0xf3, 0x7b, 0xde, 0xbf, 0x20, 0xe4, 0xa4, 0x50, 0xb9, 0xe0, + 0x09, 0xe3, 0x19, 0xe1, 0x8a, 0xbd, 0x12, 0x99, 0x50, 0xc2, 0x89, 0x64, 0x32, 0x5e, 0xe6, 0x42, + 0x09, 0x08, 0x2d, 0x11, 0xef, 0x89, 0xe0, 0x82, 0x0a, 0x2a, 0x8c, 0x9c, 0xe8, 0x57, 0x45, 0x06, + 0x9d, 0x9a, 0x5c, 0x4b, 0x9c, 0xe3, 0x85, 0x4d, 0x15, 0xa0, 0xba, 0x62, 0xb8, 0xa0, 0xe4, 0x1f, + 0x5d, 0x2a, 0xfc, 0xbc, 0xd3, 0xa3, 0x1a, 0x1d, 0x67, 0x99, 0x28, 0xb8, 0x9a, 0xcc, 0x99, 0x54, + 0x22, 0x5f, 0x55, 0x64, 0xf7, 0xa3, 0x01, 0x4e, 0x87, 0xd5, 0x18, 0x63, 0x85, 0x15, 0x81, 0x37, + 0xc0, 0xab, 0x5a, 0xf1, 0xdd, 0xd0, 0x8d, 0xda, 0xfd, 0x20, 0x3e, 0x1e, 0x2b, 0x7e, 0x34, 0xc4, + 0xa0, 0xb5, 0xfe, 0xea, 0x38, 0xa9, 0xe5, 0x61, 0x0f, 0x78, 0xa6, 0x47, 0xe9, 0x37, 0xc2, 0x66, + 0xd4, 0xee, 0x5f, 0xd6, 0x39, 0x87, 0x9a, 0x48, 0x2d, 0x08, 0xbb, 0xe0, 0xec, 0x05, 0x4b, 0x35, + 0x31, 0xdf, 0x09, 0x9b, 0xf9, 0xcd, 0xd0, 0x8d, 0x5a, 0x69, 0x5b, 0x07, 0x0d, 0x39, 0x9a, 0xfd, + 0x32, 0x66, 0x3e, 0xcd, 0xb4, 0xf6, 0xcc, 0x58, 0xc7, 0x46, 0x33, 0x5d, 0xda, 0xc8, 0xd2, 0x3f, + 0xf9, 0xbb, 0xb4, 0x81, 0x53, 0x0b, 0xc2, 0x07, 0x70, 0x6e, 0x37, 0x72, 0x67, 0x16, 0xc2, 0x88, + 0xf4, 0x3d, 0x63, 0xee, 0xd6, 0x99, 0x6f, 0x0f, 0xd9, 0x55, 0x7a, 0xe4, 0x1d, 0xdc, 0xaf, 0xb7, + 0xc8, 0xdd, 0x6c, 0x91, 0xfb, 0xbd, 0x45, 0xee, 0x7b, 0x89, 0x9c, 0x4d, 0x89, 0x9c, 0xcf, 0x12, + 0x39, 0x4f, 0x3d, 0xca, 0xd4, 0xbc, 0x98, 0xc6, 0x99, 0x58, 0x24, 0x36, 0xf3, 0x95, 0xc8, 0xe9, + 0xee, 0x9d, 0xbc, 0x1d, 0x5e, 0x49, 0xad, 0x96, 0x44, 0x4e, 0x3d, 0x73, 0x9c, 0xeb, 0x9f, 0x00, + 0x00, 0x00, 0xff, 0xff, 0x78, 0xe5, 0x26, 0xb9, 0x75, 0x02, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/incentives/types/params.pb.go b/x/incentives/types/params.pb.go index 9abc27827..43335aa08 100644 --- a/x/incentives/types/params.pb.go +++ b/x/incentives/types/params.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: duality/incentives/params.proto +// source: neutron/incentives/params.proto package types @@ -35,7 +35,7 @@ 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_7cfdf36cf57c01b8, []int{0} + return fileDescriptor_26b1e31ea29bccbb, []int{0} } func (m *Params) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -79,15 +79,15 @@ func (m *Params) GetMaxGauges() uint64 { } func init() { - proto.RegisterType((*Params)(nil), "duality.incentives.Params") + proto.RegisterType((*Params)(nil), "neutron.incentives.Params") } -func init() { proto.RegisterFile("duality/incentives/params.proto", fileDescriptor_7cfdf36cf57c01b8) } +func init() { proto.RegisterFile("neutron/incentives/params.proto", fileDescriptor_26b1e31ea29bccbb) } -var fileDescriptor_7cfdf36cf57c01b8 = []byte{ - // 243 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4f, 0x29, 0x4d, 0xcc, - 0xc9, 0x2c, 0xa9, 0xd4, 0xcf, 0xcc, 0x4b, 0x4e, 0xcd, 0x2b, 0xc9, 0x2c, 0x4b, 0x2d, 0xd6, 0x2f, +var fileDescriptor_26b1e31ea29bccbb = []byte{ + // 242 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xcf, 0x4b, 0x2d, 0x2d, + 0x29, 0xca, 0xcf, 0xd3, 0xcf, 0xcc, 0x4b, 0x4e, 0xcd, 0x2b, 0xc9, 0x2c, 0x4b, 0x2d, 0xd6, 0x2f, 0x48, 0x2c, 0x4a, 0xcc, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x82, 0x2a, 0xd0, 0x43, 0x28, 0x90, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0x4b, 0xeb, 0x83, 0x58, 0x10, 0x95, 0x4a, 0xd3, 0x19, 0xb9, 0xd8, 0x02, 0xc0, 0x5a, 0x85, 0xc2, 0xb9, 0xc4, 0x52, 0x32, 0x8b, 0x4b, 0x8a, @@ -96,12 +96,12 @@ var fileDescriptor_7cfdf36cf57c01b8 = []byte{ 0x52, 0xc2, 0xae, 0x4e, 0x29, 0x48, 0x04, 0x2c, 0xe1, 0x0a, 0x12, 0xf7, 0x84, 0x0b, 0x0b, 0x99, 0x70, 0x71, 0xe5, 0x26, 0x56, 0xc4, 0xa7, 0x27, 0x96, 0xa6, 0xa7, 0x16, 0x4b, 0x30, 0x29, 0x30, 0x6a, 0xb0, 0x38, 0x89, 0x7e, 0xba, 0x27, 0x2f, 0x08, 0x31, 0x0c, 0x21, 0xa7, 0x14, 0xc4, 0x99, - 0x9b, 0x58, 0xe1, 0x0e, 0x66, 0x3b, 0xf9, 0x9c, 0x78, 0x24, 0xc7, 0x78, 0xe1, 0x91, 0x1c, 0xe3, + 0x9b, 0x58, 0xe1, 0x0e, 0x66, 0x3b, 0x79, 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, 0x51, 0x7a, 0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, 0x7e, 0xae, 0x3e, 0xd4, 0xa3, - 0xba, 0x39, 0x89, 0x49, 0xc5, 0x30, 0x8e, 0x7e, 0x05, 0x72, 0xc0, 0x94, 0x54, 0x16, 0xa4, 0x16, - 0x27, 0xb1, 0x81, 0xbd, 0x6b, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x56, 0x09, 0x16, 0x1d, 0x3b, - 0x01, 0x00, 0x00, + 0x43, 0x94, 0x61, 0x7a, 0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, 0x7e, 0xae, 0x3e, 0xd4, 0xa3, + 0xba, 0xf9, 0x45, 0xe9, 0x30, 0xb6, 0x7e, 0x05, 0x72, 0xb8, 0x94, 0x54, 0x16, 0xa4, 0x16, 0x27, + 0xb1, 0x81, 0x7d, 0x6b, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x2b, 0x9e, 0xe5, 0x1b, 0x3a, 0x01, + 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { diff --git a/x/incentives/types/query.pb.go b/x/incentives/types/query.pb.go index 6875b41a9..633166dcd 100644 --- a/x/incentives/types/query.pb.go +++ b/x/incentives/types/query.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: duality/incentives/query.proto +// source: neutron/incentives/query.proto package types @@ -60,7 +60,7 @@ func (x GaugeStatus) String() string { } func (GaugeStatus) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_27b4715672276428, []int{0} + return fileDescriptor_04f05289607f461a, []int{0} } type GetModuleStatusRequest struct { @@ -70,7 +70,7 @@ func (m *GetModuleStatusRequest) Reset() { *m = GetModuleStatusRequest{} func (m *GetModuleStatusRequest) String() string { return proto.CompactTextString(m) } func (*GetModuleStatusRequest) ProtoMessage() {} func (*GetModuleStatusRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_27b4715672276428, []int{0} + return fileDescriptor_04f05289607f461a, []int{0} } func (m *GetModuleStatusRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -110,7 +110,7 @@ func (m *GetModuleStatusResponse) Reset() { *m = GetModuleStatusResponse func (m *GetModuleStatusResponse) String() string { return proto.CompactTextString(m) } func (*GetModuleStatusResponse) ProtoMessage() {} func (*GetModuleStatusResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_27b4715672276428, []int{1} + return fileDescriptor_04f05289607f461a, []int{1} } func (m *GetModuleStatusResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -169,7 +169,7 @@ func (m *GetGaugeByIDRequest) Reset() { *m = GetGaugeByIDRequest{} } func (m *GetGaugeByIDRequest) String() string { return proto.CompactTextString(m) } func (*GetGaugeByIDRequest) ProtoMessage() {} func (*GetGaugeByIDRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_27b4715672276428, []int{2} + return fileDescriptor_04f05289607f461a, []int{2} } func (m *GetGaugeByIDRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -214,7 +214,7 @@ func (m *GetGaugeByIDResponse) Reset() { *m = GetGaugeByIDResponse{} } func (m *GetGaugeByIDResponse) String() string { return proto.CompactTextString(m) } func (*GetGaugeByIDResponse) ProtoMessage() {} func (*GetGaugeByIDResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_27b4715672276428, []int{3} + return fileDescriptor_04f05289607f461a, []int{3} } func (m *GetGaugeByIDResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -259,7 +259,7 @@ func (m *GetGaugeQualifyingValueRequest) Reset() { *m = GetGaugeQualifyi func (m *GetGaugeQualifyingValueRequest) String() string { return proto.CompactTextString(m) } func (*GetGaugeQualifyingValueRequest) ProtoMessage() {} func (*GetGaugeQualifyingValueRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_27b4715672276428, []int{4} + return fileDescriptor_04f05289607f461a, []int{4} } func (m *GetGaugeQualifyingValueRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -304,7 +304,7 @@ func (m *GetGaugeQualifyingValueResponse) Reset() { *m = GetGaugeQualify func (m *GetGaugeQualifyingValueResponse) String() string { return proto.CompactTextString(m) } func (*GetGaugeQualifyingValueResponse) ProtoMessage() {} func (*GetGaugeQualifyingValueResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_27b4715672276428, []int{5} + return fileDescriptor_04f05289607f461a, []int{5} } func (m *GetGaugeQualifyingValueResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -341,7 +341,7 @@ func (m *GetGaugeQualifyingValueResponse) GetQualifyingValue() uint64 { } type GetGaugesRequest struct { - Status GaugeStatus `protobuf:"varint,1,opt,name=status,proto3,enum=duality.incentives.GaugeStatus" json:"status,omitempty"` + Status GaugeStatus `protobuf:"varint,1,opt,name=status,proto3,enum=neutron.incentives.GaugeStatus" json:"status,omitempty"` Denom string `protobuf:"bytes,2,opt,name=denom,proto3" json:"denom,omitempty"` } @@ -349,7 +349,7 @@ func (m *GetGaugesRequest) Reset() { *m = GetGaugesRequest{} } func (m *GetGaugesRequest) String() string { return proto.CompactTextString(m) } func (*GetGaugesRequest) ProtoMessage() {} func (*GetGaugesRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_27b4715672276428, []int{6} + return fileDescriptor_04f05289607f461a, []int{6} } func (m *GetGaugesRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -401,7 +401,7 @@ func (m *GetGaugesResponse) Reset() { *m = GetGaugesResponse{} } func (m *GetGaugesResponse) String() string { return proto.CompactTextString(m) } func (*GetGaugesResponse) ProtoMessage() {} func (*GetGaugesResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_27b4715672276428, []int{7} + return fileDescriptor_04f05289607f461a, []int{7} } func (m *GetGaugesResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -445,7 +445,7 @@ func (m *GetStakeByIDRequest) Reset() { *m = GetStakeByIDRequest{} } func (m *GetStakeByIDRequest) String() string { return proto.CompactTextString(m) } func (*GetStakeByIDRequest) ProtoMessage() {} func (*GetStakeByIDRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_27b4715672276428, []int{8} + return fileDescriptor_04f05289607f461a, []int{8} } func (m *GetStakeByIDRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -489,7 +489,7 @@ func (m *GetStakeByIDResponse) Reset() { *m = GetStakeByIDResponse{} } func (m *GetStakeByIDResponse) String() string { return proto.CompactTextString(m) } func (*GetStakeByIDResponse) ProtoMessage() {} func (*GetStakeByIDResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_27b4715672276428, []int{9} + return fileDescriptor_04f05289607f461a, []int{9} } func (m *GetStakeByIDResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -533,7 +533,7 @@ func (m *GetStakesRequest) Reset() { *m = GetStakesRequest{} } func (m *GetStakesRequest) String() string { return proto.CompactTextString(m) } func (*GetStakesRequest) ProtoMessage() {} func (*GetStakesRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_27b4715672276428, []int{10} + return fileDescriptor_04f05289607f461a, []int{10} } func (m *GetStakesRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -577,7 +577,7 @@ func (m *GetStakesResponse) Reset() { *m = GetStakesResponse{} } func (m *GetStakesResponse) String() string { return proto.CompactTextString(m) } func (*GetStakesResponse) ProtoMessage() {} func (*GetStakesResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_27b4715672276428, []int{11} + return fileDescriptor_04f05289607f461a, []int{11} } func (m *GetStakesResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -627,7 +627,7 @@ func (m *GetFutureRewardEstimateRequest) Reset() { *m = GetFutureRewardE func (m *GetFutureRewardEstimateRequest) String() string { return proto.CompactTextString(m) } func (*GetFutureRewardEstimateRequest) ProtoMessage() {} func (*GetFutureRewardEstimateRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_27b4715672276428, []int{12} + return fileDescriptor_04f05289607f461a, []int{12} } func (m *GetFutureRewardEstimateRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -687,7 +687,7 @@ func (m *GetFutureRewardEstimateResponse) Reset() { *m = GetFutureReward func (m *GetFutureRewardEstimateResponse) String() string { return proto.CompactTextString(m) } func (*GetFutureRewardEstimateResponse) ProtoMessage() {} func (*GetFutureRewardEstimateResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_27b4715672276428, []int{13} + return fileDescriptor_04f05289607f461a, []int{13} } func (m *GetFutureRewardEstimateResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -732,7 +732,7 @@ func (m *GetAccountHistoryRequest) Reset() { *m = GetAccountHistoryReque func (m *GetAccountHistoryRequest) String() string { return proto.CompactTextString(m) } func (*GetAccountHistoryRequest) ProtoMessage() {} func (*GetAccountHistoryRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_27b4715672276428, []int{14} + return fileDescriptor_04f05289607f461a, []int{14} } func (m *GetAccountHistoryRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -777,7 +777,7 @@ func (m *GetAccountHistoryResponse) Reset() { *m = GetAccountHistoryResp func (m *GetAccountHistoryResponse) String() string { return proto.CompactTextString(m) } func (*GetAccountHistoryResponse) ProtoMessage() {} func (*GetAccountHistoryResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_27b4715672276428, []int{15} + return fileDescriptor_04f05289607f461a, []int{15} } func (m *GetAccountHistoryResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -814,96 +814,96 @@ func (m *GetAccountHistoryResponse) GetCoins() github_com_cosmos_cosmos_sdk_type } func init() { - proto.RegisterEnum("duality.incentives.GaugeStatus", GaugeStatus_name, GaugeStatus_value) - proto.RegisterType((*GetModuleStatusRequest)(nil), "duality.incentives.GetModuleStatusRequest") - proto.RegisterType((*GetModuleStatusResponse)(nil), "duality.incentives.GetModuleStatusResponse") - proto.RegisterType((*GetGaugeByIDRequest)(nil), "duality.incentives.GetGaugeByIDRequest") - proto.RegisterType((*GetGaugeByIDResponse)(nil), "duality.incentives.GetGaugeByIDResponse") - proto.RegisterType((*GetGaugeQualifyingValueRequest)(nil), "duality.incentives.GetGaugeQualifyingValueRequest") - proto.RegisterType((*GetGaugeQualifyingValueResponse)(nil), "duality.incentives.GetGaugeQualifyingValueResponse") - proto.RegisterType((*GetGaugesRequest)(nil), "duality.incentives.GetGaugesRequest") - proto.RegisterType((*GetGaugesResponse)(nil), "duality.incentives.GetGaugesResponse") - proto.RegisterType((*GetStakeByIDRequest)(nil), "duality.incentives.GetStakeByIDRequest") - proto.RegisterType((*GetStakeByIDResponse)(nil), "duality.incentives.GetStakeByIDResponse") - proto.RegisterType((*GetStakesRequest)(nil), "duality.incentives.GetStakesRequest") - proto.RegisterType((*GetStakesResponse)(nil), "duality.incentives.GetStakesResponse") - proto.RegisterType((*GetFutureRewardEstimateRequest)(nil), "duality.incentives.GetFutureRewardEstimateRequest") - proto.RegisterType((*GetFutureRewardEstimateResponse)(nil), "duality.incentives.GetFutureRewardEstimateResponse") - proto.RegisterType((*GetAccountHistoryRequest)(nil), "duality.incentives.GetAccountHistoryRequest") - proto.RegisterType((*GetAccountHistoryResponse)(nil), "duality.incentives.GetAccountHistoryResponse") -} - -func init() { proto.RegisterFile("duality/incentives/query.proto", fileDescriptor_27b4715672276428) } - -var fileDescriptor_27b4715672276428 = []byte{ + proto.RegisterEnum("neutron.incentives.GaugeStatus", GaugeStatus_name, GaugeStatus_value) + proto.RegisterType((*GetModuleStatusRequest)(nil), "neutron.incentives.GetModuleStatusRequest") + proto.RegisterType((*GetModuleStatusResponse)(nil), "neutron.incentives.GetModuleStatusResponse") + proto.RegisterType((*GetGaugeByIDRequest)(nil), "neutron.incentives.GetGaugeByIDRequest") + proto.RegisterType((*GetGaugeByIDResponse)(nil), "neutron.incentives.GetGaugeByIDResponse") + proto.RegisterType((*GetGaugeQualifyingValueRequest)(nil), "neutron.incentives.GetGaugeQualifyingValueRequest") + proto.RegisterType((*GetGaugeQualifyingValueResponse)(nil), "neutron.incentives.GetGaugeQualifyingValueResponse") + proto.RegisterType((*GetGaugesRequest)(nil), "neutron.incentives.GetGaugesRequest") + proto.RegisterType((*GetGaugesResponse)(nil), "neutron.incentives.GetGaugesResponse") + proto.RegisterType((*GetStakeByIDRequest)(nil), "neutron.incentives.GetStakeByIDRequest") + proto.RegisterType((*GetStakeByIDResponse)(nil), "neutron.incentives.GetStakeByIDResponse") + proto.RegisterType((*GetStakesRequest)(nil), "neutron.incentives.GetStakesRequest") + proto.RegisterType((*GetStakesResponse)(nil), "neutron.incentives.GetStakesResponse") + proto.RegisterType((*GetFutureRewardEstimateRequest)(nil), "neutron.incentives.GetFutureRewardEstimateRequest") + proto.RegisterType((*GetFutureRewardEstimateResponse)(nil), "neutron.incentives.GetFutureRewardEstimateResponse") + proto.RegisterType((*GetAccountHistoryRequest)(nil), "neutron.incentives.GetAccountHistoryRequest") + proto.RegisterType((*GetAccountHistoryResponse)(nil), "neutron.incentives.GetAccountHistoryResponse") +} + +func init() { proto.RegisterFile("neutron/incentives/query.proto", fileDescriptor_04f05289607f461a) } + +var fileDescriptor_04f05289607f461a = []byte{ // 1075 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0x4f, 0x4f, 0x1b, 0xc7, - 0x1b, 0x66, 0xcd, 0x9f, 0xe0, 0x01, 0x81, 0x7f, 0x13, 0xf4, 0xab, 0x71, 0x53, 0x1b, 0x8d, 0x42, - 0x31, 0x24, 0x78, 0xc1, 0x51, 0x95, 0x2a, 0x55, 0x0e, 0x31, 0x01, 0xe3, 0x2a, 0x49, 0x93, 0xa5, - 0xcd, 0xa1, 0x97, 0xd5, 0xd8, 0x9e, 0x2c, 0xab, 0xd8, 0x3b, 0xc6, 0x33, 0x4b, 0x6a, 0x51, 0x7a, + 0x1b, 0x66, 0x0d, 0x76, 0xf0, 0x80, 0xc0, 0xbf, 0x09, 0xfa, 0xd5, 0xb8, 0xa9, 0x8d, 0x46, 0xa1, + 0x18, 0x12, 0xbc, 0xd8, 0x51, 0x95, 0x2a, 0x55, 0x0e, 0x31, 0x01, 0xe3, 0xb6, 0x49, 0x93, 0xa5, + 0xcd, 0xa1, 0x97, 0xd5, 0x62, 0x4f, 0x96, 0x55, 0xec, 0x1d, 0xb3, 0x33, 0x4b, 0x6a, 0x51, 0x7a, 0xa8, 0xf2, 0x01, 0xa2, 0xf6, 0x56, 0xa9, 0x5f, 0xa0, 0x97, 0x1e, 0xfa, 0x21, 0x9a, 0x63, 0xa4, 0x5e, 0x7a, 0xa2, 0x15, 0xf4, 0x13, 0xe4, 0x13, 0x54, 0xfb, 0xce, 0xac, 0xb1, 0x61, 0x77, 0x21, - 0x87, 0xf4, 0x64, 0xef, 0xbc, 0xff, 0x9e, 0xf7, 0x79, 0x67, 0x9e, 0x19, 0x94, 0x6f, 0xfa, 0xb4, - 0xe5, 0xca, 0x9e, 0xe9, 0x7a, 0x0d, 0xe6, 0x49, 0x77, 0x9f, 0x09, 0x73, 0xcf, 0x67, 0xdd, 0x5e, - 0xa9, 0xd3, 0xe5, 0x92, 0x63, 0xac, 0xed, 0xa5, 0x53, 0x7b, 0x6e, 0xce, 0xe1, 0x0e, 0x07, 0xb3, - 0x19, 0xfc, 0x53, 0x9e, 0xb9, 0x6b, 0x0e, 0xe7, 0x4e, 0x8b, 0x99, 0xb4, 0xe3, 0x9a, 0xd4, 0xf3, - 0xb8, 0xa4, 0xd2, 0xe5, 0x9e, 0xd0, 0xd6, 0x7c, 0x83, 0x8b, 0x36, 0x17, 0x66, 0x9d, 0x0a, 0x66, - 0xee, 0xaf, 0xd7, 0x99, 0xa4, 0xeb, 0x66, 0x83, 0xbb, 0x9e, 0xb6, 0xaf, 0x0c, 0xda, 0x01, 0x40, - 0xdf, 0xab, 0x43, 0x1d, 0xd7, 0x83, 0x64, 0x61, 0xae, 0x08, 0xcc, 0x0e, 0xf5, 0x1d, 0x96, 0x60, - 0x17, 0x92, 0x3e, 0x0f, 0xed, 0x85, 0x08, 0x7b, 0x87, 0x76, 0x69, 0x5b, 0x83, 0x25, 0x59, 0xf4, - 0xff, 0x2a, 0x93, 0x0f, 0x79, 0xd3, 0x6f, 0xb1, 0x1d, 0x49, 0xa5, 0x2f, 0x2c, 0xb6, 0xe7, 0x33, - 0x21, 0xc9, 0x6f, 0x29, 0xf4, 0xc1, 0x39, 0x93, 0xe8, 0x70, 0x4f, 0x30, 0xec, 0xa1, 0xe9, 0x2e, - 0x7b, 0x41, 0xbb, 0x4d, 0x3b, 0xe8, 0x4b, 0x64, 0x8d, 0x85, 0xd1, 0xe2, 0x54, 0x79, 0xbe, 0xa4, - 0x3a, 0x2b, 0x05, 0x9d, 0x95, 0x74, 0x4f, 0xa5, 0x0d, 0xee, 0x7a, 0x95, 0xb5, 0xd7, 0x47, 0x85, - 0x91, 0x5f, 0xfe, 0x2a, 0x14, 0x1d, 0x57, 0xee, 0xfa, 0xf5, 0x52, 0x83, 0xb7, 0x4d, 0x4d, 0x83, - 0xfa, 0x59, 0x15, 0xcd, 0xe7, 0xa6, 0xec, 0x75, 0x98, 0x80, 0x00, 0x61, 0x4d, 0xa9, 0x02, 0xf0, - 0x11, 0xd4, 0x83, 0xae, 0xc2, 0x7a, 0xa9, 0xf7, 0x50, 0x4f, 0x15, 0x50, 0xf5, 0x3e, 0x45, 0x13, - 0x8a, 0xa5, 0xec, 0xe8, 0x82, 0x51, 0x9c, 0x2a, 0xe7, 0x4a, 0xe7, 0xf7, 0x46, 0xe9, 0x31, 0x78, - 0x54, 0xc6, 0x82, 0x52, 0x96, 0xf6, 0x27, 0x8b, 0xe8, 0x6a, 0x95, 0xc9, 0x6a, 0x30, 0xa2, 0x4a, - 0xaf, 0x76, 0x5f, 0x93, 0x89, 0x67, 0x50, 0xca, 0x6d, 0x66, 0x8d, 0x05, 0xa3, 0x38, 0x66, 0xa5, - 0xdc, 0x26, 0xa9, 0xa2, 0xb9, 0x61, 0x37, 0x4d, 0xac, 0x89, 0xc6, 0x61, 0xbc, 0xe0, 0x1a, 0x74, - 0x18, 0x51, 0x17, 0xa2, 0x2c, 0xe5, 0x47, 0xd6, 0x50, 0x3e, 0x4c, 0xf4, 0x24, 0x70, 0x7d, 0xd6, - 0x73, 0x3d, 0xe7, 0x29, 0x6d, 0xf9, 0x2c, 0xae, 0xf4, 0x03, 0x54, 0x88, 0x8d, 0xd0, 0x28, 0x96, - 0x51, 0x66, 0xaf, 0x6f, 0xb2, 0xf7, 0x03, 0x9b, 0x4e, 0x30, 0xbb, 0x37, 0x1c, 0x42, 0x28, 0xca, - 0x84, 0xd9, 0xc2, 0x9d, 0x83, 0x6f, 0xa3, 0x09, 0x01, 0xfb, 0x05, 0x82, 0x66, 0xca, 0x85, 0xd8, - 0x2e, 0xf4, 0xb6, 0xd2, 0xee, 0x78, 0x0e, 0x8d, 0x37, 0x99, 0xc7, 0xdb, 0xd9, 0xd4, 0x82, 0x51, - 0x4c, 0x5b, 0xea, 0x83, 0x6c, 0xa1, 0xff, 0x0d, 0x94, 0xd0, 0x10, 0xd7, 0xd1, 0x04, 0x10, 0x70, - 0xba, 0xf7, 0x62, 0x99, 0xd2, 0x8e, 0x64, 0x0d, 0x46, 0xb3, 0x13, 0x8c, 0x79, 0x70, 0x34, 0xf3, - 0x68, 0x12, 0x46, 0x6f, 0xf7, 0x59, 0xba, 0x02, 0xdf, 0xb5, 0x70, 0x4a, 0x03, 0x11, 0xa7, 0x53, - 0x02, 0x97, 0xa4, 0x29, 0x41, 0x94, 0xa5, 0xfc, 0xc8, 0x1d, 0x60, 0x09, 0x96, 0xfa, 0x2c, 0x7d, - 0x8c, 0xc6, 0xf9, 0x0b, 0x8f, 0x75, 0x21, 0x49, 0xba, 0x92, 0x79, 0x7b, 0x54, 0x98, 0xee, 0xd1, - 0x76, 0xeb, 0x0e, 0x81, 0x65, 0x62, 0x29, 0xb3, 0x6e, 0x3f, 0x8c, 0x3d, 0x6d, 0x1f, 0x32, 0x27, - 0xb6, 0xaf, 0x20, 0x68, 0x47, 0xf2, 0xd2, 0x80, 0xad, 0xb2, 0xe5, 0x4b, 0xbf, 0xcb, 0x2c, 0x38, - 0x5c, 0x9b, 0x42, 0xba, 0x6d, 0x2a, 0xd9, 0x3b, 0x42, 0xc2, 0x1f, 0xa2, 0x74, 0x48, 0x99, 0x3a, - 0x8b, 0x63, 0xd6, 0xa4, 0xe6, 0x4c, 0xe0, 0x8f, 0x10, 0xf2, 0xfc, 0xb6, 0xcd, 0x3a, 0xbc, 0xb1, - 0xab, 0xce, 0xcf, 0xa8, 0x95, 0xf6, 0xfc, 0xf6, 0x26, 0x2c, 0x04, 0x30, 0x0a, 0xb1, 0x30, 0x74, - 0x77, 0x14, 0x8d, 0xbf, 0x37, 0x5d, 0x51, 0x99, 0xc9, 0x36, 0xca, 0x56, 0x99, 0xbc, 0xd7, 0x68, - 0x70, 0xdf, 0x93, 0xdb, 0xae, 0x90, 0xbc, 0xdb, 0x0b, 0x69, 0xb8, 0x89, 0xae, 0x50, 0x65, 0xd0, - 0x44, 0xe0, 0xb7, 0x47, 0x85, 0x19, 0x45, 0x84, 0x36, 0x10, 0x2b, 0x74, 0x21, 0xdf, 0xa1, 0xf9, - 0x88, 0x4c, 0xff, 0x59, 0x27, 0x2b, 0x9f, 0xa3, 0xa9, 0x81, 0xb3, 0x84, 0xaf, 0xa2, 0xd9, 0x7b, - 0x1b, 0x5f, 0xd6, 0x9e, 0x6e, 0xda, 0x5f, 0x3d, 0xde, 0xf8, 0xe2, 0x61, 0xed, 0x51, 0x35, 0x33, - 0x82, 0x11, 0x9a, 0x50, 0x8b, 0x19, 0x03, 0x4f, 0xa3, 0xc9, 0xbe, 0x25, 0x15, 0x7c, 0x6d, 0xd5, - 0x1e, 0xd5, 0x76, 0xb6, 0x37, 0xef, 0x67, 0x46, 0xcb, 0x3f, 0x21, 0x34, 0xfe, 0x24, 0xb8, 0x91, - 0xf0, 0xcf, 0x06, 0x9a, 0x3d, 0xa3, 0xfe, 0x78, 0x25, 0xf2, 0x8c, 0x45, 0xde, 0x1e, 0xb9, 0x1b, - 0x97, 0xf2, 0x55, 0x2c, 0x91, 0xf5, 0xef, 0xff, 0xf8, 0xe7, 0xc7, 0xd4, 0x0d, 0xbc, 0x6c, 0x46, - 0x5c, 0x57, 0xe1, 0xdd, 0xd8, 0x86, 0x48, 0x5b, 0x4b, 0xc5, 0x0f, 0x06, 0x9a, 0x1e, 0x54, 0x50, - 0xbc, 0x14, 0x53, 0xf0, 0xac, 0x14, 0xe7, 0x8a, 0x17, 0x3b, 0x6a, 0x58, 0x26, 0xc0, 0x5a, 0xc6, - 0x4b, 0x49, 0xb0, 0x94, 0xb8, 0x98, 0x07, 0x6e, 0xf3, 0x10, 0xbf, 0x34, 0x50, 0xba, 0x2f, 0x55, - 0xf8, 0x7a, 0x52, 0xa1, 0x3e, 0x51, 0x8b, 0x17, 0x78, 0x69, 0x2c, 0x2b, 0x80, 0xe5, 0x3a, 0x26, - 0x17, 0x63, 0xc1, 0xaf, 0x14, 0x37, 0x7d, 0xdd, 0x8a, 0xe5, 0xe6, 0xac, 0x16, 0xc6, 0x72, 0x73, - 0x4e, 0x02, 0xc9, 0x2a, 0xe0, 0x59, 0xc2, 0x8b, 0x66, 0xdc, 0x0b, 0x44, 0x98, 0x07, 0xa1, 0x48, - 0x1c, 0xe2, 0x6f, 0x81, 0x18, 0x25, 0x62, 0xb1, 0xc4, 0x0c, 0xe9, 0x63, 0x2c, 0x31, 0xc3, 0x4a, - 0x48, 0x08, 0x00, 0xb9, 0x86, 0x73, 0xf1, 0x40, 0xf0, 0xef, 0x06, 0x3c, 0x65, 0xa2, 0x34, 0x07, - 0x97, 0x63, 0xca, 0x24, 0xe8, 0x64, 0xee, 0xd6, 0x3b, 0xc5, 0x68, 0xa0, 0x1b, 0x00, 0xf4, 0x2e, - 0xfe, 0x2c, 0x69, 0x82, 0xcf, 0x20, 0x83, 0xad, 0xde, 0x3e, 0xc2, 0x66, 0x3a, 0x89, 0x79, 0x00, - 0xc2, 0x7b, 0x88, 0x7f, 0x35, 0xe0, 0x36, 0x18, 0x56, 0x1b, 0x7c, 0x33, 0x06, 0x4f, 0xa4, 0xbc, - 0xe5, 0x56, 0x2f, 0xe9, 0xad, 0x71, 0xdf, 0x05, 0xdc, 0xb7, 0xf1, 0x27, 0x49, 0xb8, 0xb5, 0x18, - 0xda, 0xbb, 0x2a, 0xd8, 0x3c, 0xd0, 0x0b, 0x87, 0x21, 0xf7, 0x51, 0xef, 0x8d, 0x58, 0xee, 0x13, - 0x9e, 0x33, 0xb1, 0xdc, 0x27, 0x3d, 0x68, 0x2e, 0xc7, 0xbd, 0xc3, 0xa4, 0x0d, 0x27, 0xc8, 0x3e, - 0xfb, 0xf8, 0x81, 0xd3, 0x5d, 0x79, 0xf0, 0xfa, 0x38, 0x6f, 0xbc, 0x39, 0xce, 0x1b, 0x7f, 0x1f, - 0xe7, 0x8d, 0x57, 0x27, 0xf9, 0x91, 0x37, 0x27, 0xf9, 0x91, 0x3f, 0x4f, 0xf2, 0x23, 0x5f, 0x97, - 0x07, 0x34, 0x5b, 0x17, 0x58, 0x6d, 0xd1, 0xba, 0xe8, 0x57, 0xfb, 0x66, 0xb0, 0x1e, 0x68, 0x78, - 0x7d, 0x02, 0xde, 0xdf, 0xb7, 0xfe, 0x0d, 0x00, 0x00, 0xff, 0xff, 0x4e, 0x9a, 0x32, 0x62, 0x96, + 0x87, 0xf4, 0x64, 0xef, 0xbc, 0xff, 0x9e, 0xf7, 0x79, 0x67, 0x9e, 0x19, 0x54, 0x74, 0xa9, 0x2f, + 0x3c, 0xe6, 0xea, 0x8e, 0xdb, 0xa2, 0xae, 0x70, 0xf6, 0x29, 0xd7, 0xf7, 0x7c, 0xea, 0xf5, 0x2b, + 0x3d, 0x8f, 0x09, 0x86, 0xb1, 0xb2, 0x57, 0x4e, 0xed, 0x85, 0x39, 0x9b, 0xd9, 0x0c, 0xcc, 0x7a, + 0xf0, 0x4f, 0x7a, 0x16, 0xae, 0xd9, 0x8c, 0xd9, 0x1d, 0xaa, 0x5b, 0x3d, 0x47, 0xb7, 0x5c, 0x97, + 0x09, 0x4b, 0x38, 0xcc, 0xe5, 0xca, 0x5a, 0x6c, 0x31, 0xde, 0x65, 0x5c, 0xdf, 0xb1, 0x38, 0xd5, + 0xf7, 0xab, 0x3b, 0x54, 0x58, 0x55, 0xbd, 0xc5, 0x1c, 0x57, 0xd9, 0x57, 0x86, 0xed, 0x00, 0x60, + 0xe0, 0xd5, 0xb3, 0x6c, 0xc7, 0x85, 0x64, 0x61, 0xae, 0x08, 0xcc, 0xb6, 0xe5, 0xdb, 0x34, 0xc1, + 0xce, 0x85, 0xf5, 0x2c, 0xb4, 0x97, 0x22, 0xec, 0x3d, 0xcb, 0xb3, 0xba, 0x0a, 0x2c, 0xc9, 0xa3, + 0xff, 0x37, 0xa8, 0x78, 0xc0, 0xda, 0x7e, 0x87, 0x6e, 0x0b, 0x4b, 0xf8, 0xdc, 0xa0, 0x7b, 0x3e, + 0xe5, 0x82, 0xfc, 0x96, 0x42, 0xef, 0x9d, 0x33, 0xf1, 0x1e, 0x73, 0x39, 0xc5, 0x2e, 0x9a, 0xf6, + 0xe8, 0x73, 0xcb, 0x6b, 0x9b, 0x41, 0x5f, 0x3c, 0xaf, 0x2d, 0x8c, 0x97, 0xa7, 0x6a, 0xf3, 0x15, + 0xd9, 0x59, 0x25, 0xe8, 0xac, 0xa2, 0x7a, 0xaa, 0xac, 0x33, 0xc7, 0xad, 0xaf, 0xbd, 0x3a, 0x2a, + 0x8d, 0xfd, 0xf2, 0x57, 0xa9, 0x6c, 0x3b, 0x62, 0xd7, 0xdf, 0xa9, 0xb4, 0x58, 0x57, 0x57, 0x34, + 0xc8, 0x9f, 0x55, 0xde, 0x7e, 0xa6, 0x8b, 0x7e, 0x8f, 0x72, 0x08, 0xe0, 0xc6, 0x94, 0x2c, 0x00, + 0x1f, 0x41, 0x3d, 0xe8, 0x2a, 0xac, 0x97, 0x7a, 0x07, 0xf5, 0x64, 0x01, 0x59, 0xef, 0x63, 0x94, + 0x91, 0x2c, 0xe5, 0xc7, 0x17, 0xb4, 0xf2, 0x54, 0xad, 0x50, 0x39, 0xbf, 0x37, 0x2a, 0x8f, 0xc0, + 0xa3, 0x3e, 0x11, 0x94, 0x32, 0x94, 0x3f, 0x59, 0x44, 0x57, 0x1b, 0x54, 0x34, 0x82, 0x11, 0xd5, + 0xfb, 0xcd, 0xfb, 0x8a, 0x4c, 0x3c, 0x83, 0x52, 0x4e, 0x3b, 0xaf, 0x2d, 0x68, 0xe5, 0x09, 0x23, + 0xe5, 0xb4, 0x49, 0x03, 0xcd, 0x8d, 0xba, 0x29, 0x62, 0x75, 0x94, 0x86, 0xf1, 0x82, 0x6b, 0xd0, + 0x61, 0x44, 0x5d, 0x88, 0x32, 0xa4, 0x1f, 0x59, 0x43, 0xc5, 0x30, 0xd1, 0x63, 0xdf, 0xea, 0x38, + 0x4f, 0xfb, 0x8e, 0x6b, 0x3f, 0xb1, 0x3a, 0x3e, 0x8d, 0x2b, 0xfd, 0x39, 0x2a, 0xc5, 0x46, 0x28, + 0x14, 0xcb, 0x28, 0xb7, 0x37, 0x30, 0x99, 0xfb, 0x81, 0x4d, 0x25, 0x98, 0xdd, 0x1b, 0x0d, 0x21, + 0x16, 0xca, 0x85, 0xd9, 0xc2, 0x9d, 0x83, 0x6f, 0xa3, 0x0c, 0x87, 0xfd, 0x02, 0x41, 0x33, 0xb5, + 0x52, 0x6c, 0x17, 0x6a, 0x5b, 0x29, 0x77, 0x3c, 0x87, 0xd2, 0x6d, 0xea, 0xb2, 0x6e, 0x3e, 0xb5, + 0xa0, 0x95, 0xb3, 0x86, 0xfc, 0x20, 0x9b, 0xe8, 0x7f, 0x43, 0x25, 0x14, 0xc4, 0x2a, 0xca, 0x00, + 0x01, 0xa7, 0x7b, 0x2f, 0x96, 0x29, 0xe5, 0x48, 0xd6, 0x60, 0x34, 0xdb, 0xc1, 0x98, 0x87, 0x47, + 0x33, 0x8f, 0x26, 0x61, 0xf4, 0xe6, 0x80, 0xa5, 0x2b, 0xf0, 0xdd, 0x0c, 0xa7, 0x34, 0x14, 0x71, + 0x3a, 0x25, 0x70, 0x49, 0x9a, 0x12, 0x44, 0x19, 0xd2, 0x8f, 0xdc, 0x01, 0x96, 0x60, 0x69, 0xc0, + 0xd2, 0x87, 0x28, 0xcd, 0x9e, 0xbb, 0xd4, 0x83, 0x24, 0xd9, 0x7a, 0xee, 0xcd, 0x51, 0x69, 0xba, + 0x6f, 0x75, 0x3b, 0x77, 0x08, 0x2c, 0x13, 0x43, 0x9a, 0x55, 0xfb, 0x61, 0xec, 0x69, 0xfb, 0x90, + 0x39, 0xb1, 0x7d, 0x09, 0x41, 0x39, 0x92, 0x17, 0x1a, 0x6c, 0x95, 0x4d, 0x5f, 0xf8, 0x1e, 0x35, + 0xe0, 0x70, 0x6d, 0x70, 0xe1, 0x74, 0x2d, 0x41, 0xdf, 0x12, 0x12, 0x7e, 0x1f, 0x65, 0x43, 0xca, + 0xe4, 0x59, 0x9c, 0x30, 0x26, 0x15, 0x67, 0x1c, 0x7f, 0x80, 0x90, 0xeb, 0x77, 0x4d, 0xda, 0x63, + 0xad, 0x5d, 0x79, 0x7e, 0xc6, 0x8d, 0xac, 0xeb, 0x77, 0x37, 0x60, 0x21, 0x80, 0x51, 0x8a, 0x85, + 0xa1, 0xba, 0xb3, 0x50, 0xfa, 0x9d, 0xe9, 0x8a, 0xcc, 0x4c, 0xb6, 0x50, 0xbe, 0x41, 0xc5, 0xbd, + 0x56, 0x8b, 0xf9, 0xae, 0xd8, 0x72, 0xb8, 0x60, 0x5e, 0x3f, 0xa4, 0xe1, 0x26, 0xba, 0x62, 0x49, + 0x83, 0x22, 0x02, 0xbf, 0x39, 0x2a, 0xcd, 0x48, 0x22, 0x94, 0x81, 0x18, 0xa1, 0x0b, 0xf9, 0x0e, + 0xcd, 0x47, 0x64, 0xfa, 0xcf, 0x3a, 0x59, 0xf9, 0x14, 0x4d, 0x0d, 0x9d, 0x25, 0x7c, 0x15, 0xcd, + 0xde, 0x5b, 0xff, 0xb2, 0xf9, 0x64, 0xc3, 0xfc, 0xea, 0xd1, 0xfa, 0x17, 0x0f, 0x9a, 0x0f, 0x1b, + 0xb9, 0x31, 0x8c, 0x50, 0x46, 0x2e, 0xe6, 0x34, 0x3c, 0x8d, 0x26, 0x07, 0x96, 0x54, 0xf0, 0xb5, + 0xd9, 0x7c, 0xd8, 0xdc, 0xde, 0xda, 0xb8, 0x9f, 0x1b, 0xaf, 0xfd, 0x84, 0x50, 0xfa, 0x71, 0x70, + 0x23, 0xe1, 0x9f, 0x35, 0x34, 0x7b, 0x46, 0xfd, 0xf1, 0x4a, 0xe4, 0x19, 0x8b, 0xbc, 0x3d, 0x0a, + 0x37, 0x2e, 0xe5, 0x2b, 0x59, 0x22, 0xd5, 0xef, 0xff, 0xf8, 0xe7, 0xc7, 0xd4, 0x0d, 0xbc, 0xac, + 0x47, 0x5c, 0x57, 0xe1, 0xdd, 0xd8, 0x85, 0x48, 0x53, 0x49, 0xc5, 0x0f, 0x1a, 0x9a, 0x1e, 0x56, + 0x50, 0xbc, 0x14, 0x53, 0xf0, 0xac, 0x14, 0x17, 0xca, 0x17, 0x3b, 0x2a, 0x58, 0x3a, 0xc0, 0x5a, + 0xc6, 0x4b, 0x49, 0xb0, 0xa4, 0xb8, 0xe8, 0x07, 0x4e, 0xfb, 0x10, 0xbf, 0xd0, 0x50, 0x76, 0x20, + 0x55, 0xf8, 0x7a, 0x52, 0xa1, 0x01, 0x51, 0x8b, 0x17, 0x78, 0x29, 0x2c, 0x2b, 0x80, 0xe5, 0x3a, + 0x26, 0x17, 0x63, 0xc1, 0x2f, 0x25, 0x37, 0x03, 0xdd, 0x8a, 0xe5, 0xe6, 0xac, 0x16, 0xc6, 0x72, + 0x73, 0x4e, 0x02, 0xc9, 0x2a, 0xe0, 0x59, 0xc2, 0x8b, 0x7a, 0xdc, 0x0b, 0x84, 0xeb, 0x07, 0xa1, + 0x48, 0x1c, 0xe2, 0x6f, 0x81, 0x18, 0x29, 0x62, 0xb1, 0xc4, 0x8c, 0xe8, 0x63, 0x2c, 0x31, 0xa3, + 0x4a, 0x48, 0x08, 0x00, 0xb9, 0x86, 0x0b, 0xf1, 0x40, 0xf0, 0xef, 0x1a, 0x3c, 0x65, 0xa2, 0x34, + 0x07, 0xd7, 0x62, 0xca, 0x24, 0xe8, 0x64, 0xe1, 0xd6, 0x5b, 0xc5, 0x28, 0xa0, 0xeb, 0x00, 0xf4, + 0x2e, 0xfe, 0x24, 0x69, 0x82, 0x4f, 0x21, 0x83, 0x29, 0xdf, 0x3e, 0xdc, 0xa4, 0x2a, 0x89, 0x7e, + 0x00, 0xc2, 0x7b, 0x88, 0x7f, 0xd5, 0xe0, 0x36, 0x18, 0x55, 0x1b, 0x7c, 0x33, 0x06, 0x4f, 0xa4, + 0xbc, 0x15, 0x56, 0x2f, 0xe9, 0xad, 0x70, 0xdf, 0x05, 0xdc, 0xb7, 0xf1, 0x47, 0x49, 0xb8, 0x95, + 0x18, 0x9a, 0xbb, 0x32, 0x58, 0x3f, 0x50, 0x0b, 0x87, 0x21, 0xf7, 0x51, 0xef, 0x8d, 0x58, 0xee, + 0x13, 0x9e, 0x33, 0xb1, 0xdc, 0x27, 0x3d, 0x68, 0x2e, 0xc7, 0xbd, 0x4d, 0x85, 0x09, 0x27, 0xc8, + 0x3c, 0xfb, 0xf8, 0x81, 0xd3, 0x5d, 0xff, 0xec, 0xd5, 0x71, 0x51, 0x7b, 0x7d, 0x5c, 0xd4, 0xfe, + 0x3e, 0x2e, 0x6a, 0x2f, 0x4f, 0x8a, 0x63, 0xaf, 0x4f, 0x8a, 0x63, 0x7f, 0x9e, 0x14, 0xc7, 0xbe, + 0xae, 0x0e, 0x69, 0xb6, 0x2a, 0xb0, 0xca, 0x3c, 0x7b, 0x50, 0xec, 0x9b, 0xe1, 0x72, 0x20, 0xe1, + 0x3b, 0x19, 0x78, 0x7e, 0xdf, 0xfa, 0x37, 0x00, 0x00, 0xff, 0xff, 0xc4, 0xcb, 0x7d, 0x4c, 0x95, 0x0c, 0x00, 0x00, } @@ -950,7 +950,7 @@ func NewQueryClient(cc grpc1.ClientConn) QueryClient { func (c *queryClient) GetModuleStatus(ctx context.Context, in *GetModuleStatusRequest, opts ...grpc.CallOption) (*GetModuleStatusResponse, error) { out := new(GetModuleStatusResponse) - err := c.cc.Invoke(ctx, "/duality.incentives.Query/GetModuleStatus", in, out, opts...) + err := c.cc.Invoke(ctx, "/neutron.incentives.Query/GetModuleStatus", in, out, opts...) if err != nil { return nil, err } @@ -959,7 +959,7 @@ func (c *queryClient) GetModuleStatus(ctx context.Context, in *GetModuleStatusRe func (c *queryClient) GetGaugeByID(ctx context.Context, in *GetGaugeByIDRequest, opts ...grpc.CallOption) (*GetGaugeByIDResponse, error) { out := new(GetGaugeByIDResponse) - err := c.cc.Invoke(ctx, "/duality.incentives.Query/GetGaugeByID", in, out, opts...) + err := c.cc.Invoke(ctx, "/neutron.incentives.Query/GetGaugeByID", in, out, opts...) if err != nil { return nil, err } @@ -968,7 +968,7 @@ func (c *queryClient) GetGaugeByID(ctx context.Context, in *GetGaugeByIDRequest, func (c *queryClient) GetGauges(ctx context.Context, in *GetGaugesRequest, opts ...grpc.CallOption) (*GetGaugesResponse, error) { out := new(GetGaugesResponse) - err := c.cc.Invoke(ctx, "/duality.incentives.Query/GetGauges", in, out, opts...) + err := c.cc.Invoke(ctx, "/neutron.incentives.Query/GetGauges", in, out, opts...) if err != nil { return nil, err } @@ -977,7 +977,7 @@ func (c *queryClient) GetGauges(ctx context.Context, in *GetGaugesRequest, opts func (c *queryClient) GetStakeByID(ctx context.Context, in *GetStakeByIDRequest, opts ...grpc.CallOption) (*GetStakeByIDResponse, error) { out := new(GetStakeByIDResponse) - err := c.cc.Invoke(ctx, "/duality.incentives.Query/GetStakeByID", in, out, opts...) + err := c.cc.Invoke(ctx, "/neutron.incentives.Query/GetStakeByID", in, out, opts...) if err != nil { return nil, err } @@ -986,7 +986,7 @@ func (c *queryClient) GetStakeByID(ctx context.Context, in *GetStakeByIDRequest, func (c *queryClient) GetStakes(ctx context.Context, in *GetStakesRequest, opts ...grpc.CallOption) (*GetStakesResponse, error) { out := new(GetStakesResponse) - err := c.cc.Invoke(ctx, "/duality.incentives.Query/GetStakes", in, out, opts...) + err := c.cc.Invoke(ctx, "/neutron.incentives.Query/GetStakes", in, out, opts...) if err != nil { return nil, err } @@ -995,7 +995,7 @@ func (c *queryClient) GetStakes(ctx context.Context, in *GetStakesRequest, opts func (c *queryClient) GetFutureRewardEstimate(ctx context.Context, in *GetFutureRewardEstimateRequest, opts ...grpc.CallOption) (*GetFutureRewardEstimateResponse, error) { out := new(GetFutureRewardEstimateResponse) - err := c.cc.Invoke(ctx, "/duality.incentives.Query/GetFutureRewardEstimate", in, out, opts...) + err := c.cc.Invoke(ctx, "/neutron.incentives.Query/GetFutureRewardEstimate", in, out, opts...) if err != nil { return nil, err } @@ -1004,7 +1004,7 @@ func (c *queryClient) GetFutureRewardEstimate(ctx context.Context, in *GetFuture func (c *queryClient) GetAccountHistory(ctx context.Context, in *GetAccountHistoryRequest, opts ...grpc.CallOption) (*GetAccountHistoryResponse, error) { out := new(GetAccountHistoryResponse) - err := c.cc.Invoke(ctx, "/duality.incentives.Query/GetAccountHistory", in, out, opts...) + err := c.cc.Invoke(ctx, "/neutron.incentives.Query/GetAccountHistory", in, out, opts...) if err != nil { return nil, err } @@ -1013,7 +1013,7 @@ func (c *queryClient) GetAccountHistory(ctx context.Context, in *GetAccountHisto func (c *queryClient) GetGaugeQualifyingValue(ctx context.Context, in *GetGaugeQualifyingValueRequest, opts ...grpc.CallOption) (*GetGaugeQualifyingValueResponse, error) { out := new(GetGaugeQualifyingValueResponse) - err := c.cc.Invoke(ctx, "/duality.incentives.Query/GetGaugeQualifyingValue", in, out, opts...) + err := c.cc.Invoke(ctx, "/neutron.incentives.Query/GetGaugeQualifyingValue", in, out, opts...) if err != nil { return nil, err } @@ -1086,7 +1086,7 @@ func _Query_GetModuleStatus_Handler(srv interface{}, ctx context.Context, dec fu } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/duality.incentives.Query/GetModuleStatus", + FullMethod: "/neutron.incentives.Query/GetModuleStatus", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).GetModuleStatus(ctx, req.(*GetModuleStatusRequest)) @@ -1104,7 +1104,7 @@ func _Query_GetGaugeByID_Handler(srv interface{}, ctx context.Context, dec func( } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/duality.incentives.Query/GetGaugeByID", + FullMethod: "/neutron.incentives.Query/GetGaugeByID", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).GetGaugeByID(ctx, req.(*GetGaugeByIDRequest)) @@ -1122,7 +1122,7 @@ func _Query_GetGauges_Handler(srv interface{}, ctx context.Context, dec func(int } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/duality.incentives.Query/GetGauges", + FullMethod: "/neutron.incentives.Query/GetGauges", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).GetGauges(ctx, req.(*GetGaugesRequest)) @@ -1140,7 +1140,7 @@ func _Query_GetStakeByID_Handler(srv interface{}, ctx context.Context, dec func( } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/duality.incentives.Query/GetStakeByID", + FullMethod: "/neutron.incentives.Query/GetStakeByID", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).GetStakeByID(ctx, req.(*GetStakeByIDRequest)) @@ -1158,7 +1158,7 @@ func _Query_GetStakes_Handler(srv interface{}, ctx context.Context, dec func(int } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/duality.incentives.Query/GetStakes", + FullMethod: "/neutron.incentives.Query/GetStakes", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).GetStakes(ctx, req.(*GetStakesRequest)) @@ -1176,7 +1176,7 @@ func _Query_GetFutureRewardEstimate_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/duality.incentives.Query/GetFutureRewardEstimate", + FullMethod: "/neutron.incentives.Query/GetFutureRewardEstimate", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).GetFutureRewardEstimate(ctx, req.(*GetFutureRewardEstimateRequest)) @@ -1194,7 +1194,7 @@ func _Query_GetAccountHistory_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/duality.incentives.Query/GetAccountHistory", + FullMethod: "/neutron.incentives.Query/GetAccountHistory", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).GetAccountHistory(ctx, req.(*GetAccountHistoryRequest)) @@ -1212,7 +1212,7 @@ func _Query_GetGaugeQualifyingValue_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/duality.incentives.Query/GetGaugeQualifyingValue", + FullMethod: "/neutron.incentives.Query/GetGaugeQualifyingValue", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).GetGaugeQualifyingValue(ctx, req.(*GetGaugeQualifyingValueRequest)) @@ -1221,7 +1221,7 @@ func _Query_GetGaugeQualifyingValue_Handler(srv interface{}, ctx context.Context } var _Query_serviceDesc = grpc.ServiceDesc{ - ServiceName: "duality.incentives.Query", + ServiceName: "neutron.incentives.Query", HandlerType: (*QueryServer)(nil), Methods: []grpc.MethodDesc{ { @@ -1258,7 +1258,7 @@ var _Query_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "duality/incentives/query.proto", + Metadata: "neutron/incentives/query.proto", } func (m *GetModuleStatusRequest) Marshal() (dAtA []byte, err error) { diff --git a/x/incentives/types/query.pb.gw.go b/x/incentives/types/query.pb.gw.go index d3d797117..7d95daa11 100644 --- a/x/incentives/types/query.pb.gw.go +++ b/x/incentives/types/query.pb.gw.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-grpc-gateway. DO NOT EDIT. -// source: duality/incentives/query.proto +// source: neutron/incentives/query.proto /* Package types is a reverse proxy. @@ -806,21 +806,21 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } var ( - pattern_Query_GetModuleStatus_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"duality", "incentives", "v1beta1", "module_status"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_GetModuleStatus_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"neutron", "incentives", "v1beta1", "module_status"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_GetGaugeByID_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"duality", "incentives", "v1beta1", "gauges", "id"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_GetGaugeByID_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"neutron", "incentives", "v1beta1", "gauges", "id"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_GetGauges_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"duality", "incentives", "v1beta1", "gauges"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_GetGauges_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"neutron", "incentives", "v1beta1", "gauges"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_GetStakeByID_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"duality", "incentives", "stakes", "stake_id"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_GetStakeByID_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"neutron", "incentives", "stakes", "stake_id"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_GetStakes_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"duality", "incentives", "stakes"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_GetStakes_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"neutron", "incentives", "stakes"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_GetFutureRewardEstimate_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"duality", "incentives", "v1beta1", "future_rewards_estimate", "owner"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_GetFutureRewardEstimate_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"neutron", "incentives", "v1beta1", "future_rewards_estimate", "owner"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_GetAccountHistory_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"duality", "incentives", "v1beta1", "account_history", "account"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_GetAccountHistory_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"neutron", "incentives", "v1beta1", "account_history", "account"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_GetGaugeQualifyingValue_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"duality", "incentives", "v1beta1", "get_gauge_qualifying_value", "id"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_GetGaugeQualifyingValue_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"neutron", "incentives", "v1beta1", "get_gauge_qualifying_value", "id"}, "", runtime.AssumeColonVerbOpt(false))) ) var ( diff --git a/x/incentives/types/stake.pb.go b/x/incentives/types/stake.pb.go index d21e38a29..fd18e7e04 100644 --- a/x/incentives/types/stake.pb.go +++ b/x/incentives/types/stake.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: duality/incentives/stake.proto +// source: neutron/incentives/stake.proto package types @@ -53,7 +53,7 @@ func (m *Stake) Reset() { *m = Stake{} } func (m *Stake) String() string { return proto.CompactTextString(m) } func (*Stake) ProtoMessage() {} func (*Stake) Descriptor() ([]byte, []int) { - return fileDescriptor_0b048b82a83f5ea3, []int{0} + return fileDescriptor_6900551d6712f42b, []int{0} } func (m *Stake) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -118,38 +118,38 @@ func (m *Stake) GetStartDistEpoch() int64 { } func init() { - proto.RegisterType((*Stake)(nil), "duality.incentives.Stake") + proto.RegisterType((*Stake)(nil), "neutron.incentives.Stake") } -func init() { proto.RegisterFile("duality/incentives/stake.proto", fileDescriptor_0b048b82a83f5ea3) } +func init() { proto.RegisterFile("neutron/incentives/stake.proto", fileDescriptor_6900551d6712f42b) } -var fileDescriptor_0b048b82a83f5ea3 = []byte{ - // 397 bytes of a gzipped FileDescriptorProto +var fileDescriptor_6900551d6712f42b = []byte{ + // 396 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0x51, 0xb1, 0x6e, 0xdb, 0x30, 0x10, 0x15, 0xe5, 0xa8, 0x40, 0x98, 0x22, 0x48, 0x85, 0x0c, 0xaa, 0x07, 0x4a, 0xd0, 0x50, 0x68, - 0x68, 0xc8, 0xc6, 0x45, 0x97, 0x8e, 0xaa, 0x3b, 0x04, 0xe8, 0xa4, 0x76, 0xea, 0x12, 0x50, 0x32, - 0xab, 0x10, 0x91, 0x44, 0xc1, 0xa4, 0xd3, 0xea, 0x2f, 0xfc, 0x1d, 0xfd, 0x88, 0xce, 0x1e, 0x3d, - 0x76, 0x92, 0x0b, 0x7b, 0xeb, 0xe8, 0x2f, 0x08, 0x48, 0xca, 0xb0, 0x27, 0x89, 0xef, 0xdd, 0xdd, - 0x7b, 0xef, 0x0e, 0xa2, 0xd9, 0x82, 0x56, 0x5c, 0x75, 0x84, 0x37, 0x05, 0x6b, 0x14, 0x7f, 0x62, - 0x92, 0x48, 0x45, 0x1f, 0x19, 0x6e, 0xe7, 0x42, 0x09, 0xdf, 0x1f, 0x78, 0x7c, 0xe4, 0xc7, 0xd7, - 0xa5, 0x28, 0x85, 0xa1, 0x89, 0xfe, 0xb3, 0x95, 0xe3, 0xb0, 0x14, 0xa2, 0xac, 0x18, 0x31, 0xaf, - 0x7c, 0xf1, 0x83, 0x28, 0x5e, 0x33, 0xa9, 0x68, 0xdd, 0x0e, 0x05, 0xa8, 0x10, 0xb2, 0x16, 0x92, - 0xe4, 0x54, 0x32, 0xf2, 0x74, 0x9b, 0x33, 0x45, 0x6f, 0x49, 0x21, 0x78, 0x63, 0xf9, 0xf8, 0x8f, - 0x0b, 0xbd, 0xaf, 0x5a, 0xda, 0xbf, 0x84, 0xee, 0xdd, 0x34, 0x00, 0x11, 0x48, 0xce, 0x32, 0xf7, - 0x6e, 0xea, 0xbf, 0x81, 0x9e, 0xf8, 0xd9, 0xb0, 0x79, 0xe0, 0x46, 0x20, 0x39, 0x4f, 0xaf, 0xf6, - 0x7d, 0xf8, 0xb2, 0xa3, 0x75, 0xf5, 0x31, 0x36, 0x70, 0x9c, 0x59, 0xda, 0x6f, 0x21, 0x94, 0x8a, - 0xce, 0xd5, 0xbd, 0x96, 0x0e, 0x46, 0x11, 0x48, 0x2e, 0x26, 0x63, 0x6c, 0x7d, 0xe1, 0x83, 0x2f, - 0xfc, 0xed, 0xe0, 0x2b, 0xfd, 0xb0, 0xea, 0x43, 0xe7, 0x7f, 0x1f, 0x5e, 0x1f, 0xbb, 0xde, 0x8a, - 0x9a, 0x2b, 0x56, 0xb7, 0xaa, 0xdb, 0xf7, 0xe1, 0x2b, 0x2b, 0x72, 0x64, 0xe3, 0xe5, 0x26, 0x04, - 0xd9, 0xb9, 0x01, 0xf4, 0x18, 0x9f, 0x42, 0x4f, 0x27, 0x90, 0xc1, 0x59, 0x34, 0x4a, 0x2e, 0x26, - 0xaf, 0xb1, 0xcd, 0x88, 0x75, 0x46, 0x3c, 0x64, 0xc4, 0x9f, 0x04, 0x6f, 0xd2, 0x77, 0x5a, 0xeb, - 0xf7, 0x26, 0x4c, 0x4a, 0xae, 0x1e, 0x16, 0x39, 0x2e, 0x44, 0x4d, 0x86, 0x85, 0xd8, 0xcf, 0x8d, - 0x9c, 0x3d, 0x12, 0xd5, 0xb5, 0x4c, 0x9a, 0x06, 0x99, 0xd9, 0xc9, 0x7e, 0x02, 0xaf, 0xac, 0x81, - 0x19, 0x97, 0xea, 0x9e, 0xb5, 0xa2, 0x78, 0x08, 0xbc, 0x08, 0x24, 0xa3, 0xec, 0xd2, 0xe0, 0x53, - 0x2e, 0xd5, 0x67, 0x8d, 0xa6, 0x5f, 0x56, 0x5b, 0x04, 0xd6, 0x5b, 0x04, 0xfe, 0x6d, 0x11, 0x58, - 0xee, 0x90, 0xb3, 0xde, 0x21, 0xe7, 0xef, 0x0e, 0x39, 0xdf, 0x27, 0x27, 0xa2, 0xc3, 0x41, 0x6f, - 0x2a, 0x9a, 0xcb, 0xc3, 0x83, 0xfc, 0x3a, 0xbd, 0xbf, 0x31, 0x91, 0xbf, 0x30, 0x0b, 0x7b, 0xff, - 0x1c, 0x00, 0x00, 0xff, 0xff, 0x74, 0x5b, 0xcb, 0x93, 0x22, 0x02, 0x00, 0x00, + 0x68, 0xc8, 0x3a, 0x45, 0x97, 0x8e, 0xaa, 0x3b, 0x04, 0xdd, 0xd4, 0x4e, 0x5d, 0x02, 0x49, 0x61, + 0x15, 0x22, 0x91, 0x4e, 0x10, 0xe9, 0xb4, 0xfe, 0x0b, 0x7f, 0x47, 0x3f, 0xa2, 0xb3, 0x47, 0x8f, + 0x9d, 0xe4, 0xc2, 0xde, 0x3a, 0xfa, 0x0b, 0x02, 0x92, 0x32, 0xec, 0x49, 0xd4, 0x7b, 0x77, 0xf7, + 0xde, 0xbb, 0xc3, 0xa4, 0xe1, 0x33, 0xd5, 0x41, 0xc3, 0x44, 0x53, 0xf2, 0x46, 0x89, 0x27, 0x2e, + 0x99, 0x54, 0xf9, 0x03, 0xa7, 0x6d, 0x07, 0x0a, 0x7c, 0x7f, 0xe0, 0xe9, 0x81, 0x1f, 0x5f, 0x56, + 0x50, 0x81, 0xa1, 0x99, 0x7e, 0xd9, 0xca, 0x71, 0x58, 0x01, 0x54, 0x8f, 0x9c, 0x99, 0xbf, 0x62, + 0xf6, 0x83, 0x29, 0x51, 0x73, 0xa9, 0xf2, 0xba, 0x1d, 0x0a, 0x48, 0x09, 0xb2, 0x06, 0xc9, 0x8a, + 0x5c, 0x72, 0xf6, 0x34, 0x29, 0xb8, 0xca, 0x27, 0xac, 0x04, 0xd1, 0x58, 0x3e, 0xfe, 0xe3, 0x62, + 0xef, 0xab, 0x96, 0xf6, 0xcf, 0xb1, 0x7b, 0x33, 0x0d, 0x50, 0x84, 0x92, 0x93, 0xcc, 0xbd, 0x99, + 0xfa, 0x6f, 0xb0, 0x07, 0x3f, 0x1b, 0xde, 0x05, 0x6e, 0x84, 0x92, 0xd3, 0xf4, 0x62, 0xd7, 0x87, + 0x2f, 0xe7, 0x79, 0xfd, 0xf8, 0x31, 0x36, 0x70, 0x9c, 0x59, 0xda, 0x6f, 0x31, 0x96, 0x2a, 0xef, + 0xd4, 0xad, 0x96, 0x0e, 0x46, 0x11, 0x4a, 0xce, 0xae, 0xc7, 0xd4, 0xfa, 0xa2, 0x7b, 0x5f, 0xf4, + 0xdb, 0xde, 0x57, 0xfa, 0x61, 0xd9, 0x87, 0xce, 0xff, 0x3e, 0xbc, 0x3c, 0x74, 0xbd, 0x85, 0x5a, + 0x28, 0x5e, 0xb7, 0x6a, 0xbe, 0xeb, 0xc3, 0x57, 0x56, 0xe4, 0xc0, 0xc6, 0x8b, 0x75, 0x88, 0xb2, + 0x53, 0x03, 0xe8, 0x31, 0x7e, 0x8e, 0x3d, 0x9d, 0x40, 0x06, 0x27, 0xd1, 0x28, 0x39, 0xbb, 0x7e, + 0x4d, 0x6d, 0x46, 0xaa, 0x33, 0xd2, 0x21, 0x23, 0xfd, 0x04, 0xa2, 0x49, 0xdf, 0x69, 0xad, 0xdf, + 0xeb, 0x30, 0xa9, 0x84, 0xba, 0x9f, 0x15, 0xb4, 0x84, 0x9a, 0x0d, 0x0b, 0xb1, 0x9f, 0x2b, 0x79, + 0xf7, 0xc0, 0xd4, 0xbc, 0xe5, 0xd2, 0x34, 0xc8, 0xcc, 0x4e, 0xf6, 0x13, 0x7c, 0x61, 0x0d, 0xdc, + 0x09, 0xa9, 0x6e, 0x79, 0x0b, 0xe5, 0x7d, 0xe0, 0x45, 0x28, 0x19, 0x65, 0xe7, 0x06, 0x9f, 0x0a, + 0xa9, 0x3e, 0x6b, 0x34, 0xfd, 0xb2, 0xdc, 0x10, 0xb4, 0xda, 0x10, 0xf4, 0x6f, 0x43, 0xd0, 0x62, + 0x4b, 0x9c, 0xd5, 0x96, 0x38, 0x7f, 0xb7, 0xc4, 0xf9, 0x3e, 0x39, 0x12, 0x1d, 0x0e, 0x7a, 0x05, + 0x5d, 0xb5, 0x7f, 0xb3, 0x5f, 0xc7, 0xe7, 0x37, 0x1e, 0x8a, 0x17, 0x66, 0x5f, 0xef, 0x9f, 0x03, + 0x00, 0x00, 0xff, 0xff, 0xad, 0x4f, 0xba, 0xca, 0x21, 0x02, 0x00, 0x00, } func (m *Stake) Marshal() (dAtA []byte, err error) { diff --git a/x/incentives/types/tx.pb.go b/x/incentives/types/tx.pb.go index 330a3cbce..5043cc76e 100644 --- a/x/incentives/types/tx.pb.go +++ b/x/incentives/types/tx.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: duality/incentives/tx.proto +// source: neutron/incentives/tx.proto package types @@ -63,7 +63,7 @@ func (m *MsgCreateGauge) Reset() { *m = MsgCreateGauge{} } func (m *MsgCreateGauge) String() string { return proto.CompactTextString(m) } func (*MsgCreateGauge) ProtoMessage() {} func (*MsgCreateGauge) Descriptor() ([]byte, []int) { - return fileDescriptor_e2cc69741b48f3e9, []int{0} + return fileDescriptor_5fe3d35711153e8d, []int{0} } func (m *MsgCreateGauge) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -148,7 +148,7 @@ func (m *MsgCreateGaugeResponse) Reset() { *m = MsgCreateGaugeResponse{} func (m *MsgCreateGaugeResponse) String() string { return proto.CompactTextString(m) } func (*MsgCreateGaugeResponse) ProtoMessage() {} func (*MsgCreateGaugeResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_e2cc69741b48f3e9, []int{1} + return fileDescriptor_5fe3d35711153e8d, []int{1} } func (m *MsgCreateGaugeResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -191,7 +191,7 @@ func (m *MsgAddToGauge) Reset() { *m = MsgAddToGauge{} } func (m *MsgAddToGauge) String() string { return proto.CompactTextString(m) } func (*MsgAddToGauge) ProtoMessage() {} func (*MsgAddToGauge) Descriptor() ([]byte, []int) { - return fileDescriptor_e2cc69741b48f3e9, []int{2} + return fileDescriptor_5fe3d35711153e8d, []int{2} } func (m *MsgAddToGauge) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -248,7 +248,7 @@ func (m *MsgAddToGaugeResponse) Reset() { *m = MsgAddToGaugeResponse{} } func (m *MsgAddToGaugeResponse) String() string { return proto.CompactTextString(m) } func (*MsgAddToGaugeResponse) ProtoMessage() {} func (*MsgAddToGaugeResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_e2cc69741b48f3e9, []int{3} + return fileDescriptor_5fe3d35711153e8d, []int{3} } func (m *MsgAddToGaugeResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -286,7 +286,7 @@ func (m *MsgStake) Reset() { *m = MsgStake{} } func (m *MsgStake) String() string { return proto.CompactTextString(m) } func (*MsgStake) ProtoMessage() {} func (*MsgStake) Descriptor() ([]byte, []int) { - return fileDescriptor_e2cc69741b48f3e9, []int{4} + return fileDescriptor_5fe3d35711153e8d, []int{4} } func (m *MsgStake) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -337,7 +337,7 @@ func (m *MsgStakeResponse) Reset() { *m = MsgStakeResponse{} } func (m *MsgStakeResponse) String() string { return proto.CompactTextString(m) } func (*MsgStakeResponse) ProtoMessage() {} func (*MsgStakeResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_e2cc69741b48f3e9, []int{5} + return fileDescriptor_5fe3d35711153e8d, []int{5} } func (m *MsgStakeResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -383,7 +383,7 @@ func (m *MsgUnstake) Reset() { *m = MsgUnstake{} } func (m *MsgUnstake) String() string { return proto.CompactTextString(m) } func (*MsgUnstake) ProtoMessage() {} func (*MsgUnstake) Descriptor() ([]byte, []int) { - return fileDescriptor_e2cc69741b48f3e9, []int{6} + return fileDescriptor_5fe3d35711153e8d, []int{6} } func (m *MsgUnstake) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -435,7 +435,7 @@ func (m *MsgUnstake_UnstakeDescriptor) Reset() { *m = MsgUnstake_Unstake func (m *MsgUnstake_UnstakeDescriptor) String() string { return proto.CompactTextString(m) } func (*MsgUnstake_UnstakeDescriptor) ProtoMessage() {} func (*MsgUnstake_UnstakeDescriptor) Descriptor() ([]byte, []int) { - return fileDescriptor_e2cc69741b48f3e9, []int{6, 0} + return fileDescriptor_5fe3d35711153e8d, []int{6, 0} } func (m *MsgUnstake_UnstakeDescriptor) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -485,7 +485,7 @@ func (m *MsgUnstakeResponse) Reset() { *m = MsgUnstakeResponse{} } func (m *MsgUnstakeResponse) String() string { return proto.CompactTextString(m) } func (*MsgUnstakeResponse) ProtoMessage() {} func (*MsgUnstakeResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_e2cc69741b48f3e9, []int{7} + return fileDescriptor_5fe3d35711153e8d, []int{7} } func (m *MsgUnstakeResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -515,68 +515,68 @@ func (m *MsgUnstakeResponse) XXX_DiscardUnknown() { var xxx_messageInfo_MsgUnstakeResponse proto.InternalMessageInfo func init() { - proto.RegisterType((*MsgCreateGauge)(nil), "duality.incentives.MsgCreateGauge") - proto.RegisterType((*MsgCreateGaugeResponse)(nil), "duality.incentives.MsgCreateGaugeResponse") - proto.RegisterType((*MsgAddToGauge)(nil), "duality.incentives.MsgAddToGauge") - proto.RegisterType((*MsgAddToGaugeResponse)(nil), "duality.incentives.MsgAddToGaugeResponse") - proto.RegisterType((*MsgStake)(nil), "duality.incentives.MsgStake") - proto.RegisterType((*MsgStakeResponse)(nil), "duality.incentives.MsgStakeResponse") - proto.RegisterType((*MsgUnstake)(nil), "duality.incentives.MsgUnstake") - proto.RegisterType((*MsgUnstake_UnstakeDescriptor)(nil), "duality.incentives.MsgUnstake.UnstakeDescriptor") - proto.RegisterType((*MsgUnstakeResponse)(nil), "duality.incentives.MsgUnstakeResponse") + proto.RegisterType((*MsgCreateGauge)(nil), "neutron.incentives.MsgCreateGauge") + proto.RegisterType((*MsgCreateGaugeResponse)(nil), "neutron.incentives.MsgCreateGaugeResponse") + proto.RegisterType((*MsgAddToGauge)(nil), "neutron.incentives.MsgAddToGauge") + proto.RegisterType((*MsgAddToGaugeResponse)(nil), "neutron.incentives.MsgAddToGaugeResponse") + proto.RegisterType((*MsgStake)(nil), "neutron.incentives.MsgStake") + proto.RegisterType((*MsgStakeResponse)(nil), "neutron.incentives.MsgStakeResponse") + proto.RegisterType((*MsgUnstake)(nil), "neutron.incentives.MsgUnstake") + proto.RegisterType((*MsgUnstake_UnstakeDescriptor)(nil), "neutron.incentives.MsgUnstake.UnstakeDescriptor") + proto.RegisterType((*MsgUnstakeResponse)(nil), "neutron.incentives.MsgUnstakeResponse") } -func init() { proto.RegisterFile("duality/incentives/tx.proto", fileDescriptor_e2cc69741b48f3e9) } +func init() { proto.RegisterFile("neutron/incentives/tx.proto", fileDescriptor_5fe3d35711153e8d) } -var fileDescriptor_e2cc69741b48f3e9 = []byte{ +var fileDescriptor_5fe3d35711153e8d = []byte{ // 741 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x55, 0xcb, 0x4e, 0xdb, 0x40, - 0x14, 0x8d, 0xf3, 0x20, 0x61, 0x02, 0x08, 0x2c, 0xda, 0x1a, 0x17, 0x39, 0xc1, 0xaa, 0x50, 0x5a, - 0x09, 0x1b, 0xd2, 0x5d, 0x77, 0x0d, 0x54, 0x15, 0x2a, 0x51, 0xc1, 0x4d, 0x55, 0x09, 0xa9, 0xb2, - 0x26, 0xf6, 0xd4, 0x8c, 0x92, 0x78, 0xac, 0x99, 0x71, 0x20, 0x3f, 0xd0, 0x4d, 0x37, 0x6c, 0xfa, - 0x13, 0xfd, 0x83, 0xf6, 0x0b, 0x58, 0xb2, 0xec, 0x0a, 0x10, 0xfc, 0x01, 0x5f, 0x50, 0xf9, 0x99, - 0xf0, 0x0a, 0xad, 0xd4, 0x76, 0x65, 0x66, 0xce, 0xbd, 0x87, 0x73, 0xcf, 0xb9, 0x76, 0xc0, 0x63, - 0xdb, 0x87, 0x5d, 0xcc, 0x07, 0x3a, 0x76, 0x2d, 0xe4, 0x72, 0xdc, 0x47, 0x4c, 0xe7, 0x07, 0x9a, - 0x47, 0x09, 0x27, 0xa2, 0x18, 0x83, 0xda, 0x10, 0x94, 0xe7, 0x1d, 0xe2, 0x90, 0x10, 0xd6, 0x83, - 0xbf, 0xa2, 0x4a, 0xb9, 0xe2, 0x10, 0xe2, 0x74, 0x91, 0x1e, 0x9e, 0xda, 0xfe, 0x27, 0x9d, 0xe3, - 0x1e, 0x62, 0x1c, 0xf6, 0xbc, 0xb8, 0x40, 0xb1, 0x08, 0xeb, 0x11, 0xa6, 0xb7, 0x21, 0x43, 0x7a, - 0x7f, 0xad, 0x8d, 0x38, 0x5c, 0xd3, 0x2d, 0x82, 0xdd, 0x04, 0xbf, 0x45, 0x87, 0x03, 0x7d, 0x07, - 0x8d, 0xc1, 0x19, 0x87, 0x9d, 0x14, 0xbf, 0x2e, 0xc0, 0xf6, 0x29, 0xe4, 0x98, 0xc4, 0xfc, 0xea, - 0x8f, 0x1c, 0x98, 0x69, 0x32, 0x67, 0x9d, 0x22, 0xc8, 0xd1, 0xeb, 0x80, 0x58, 0x5c, 0x02, 0x53, - 0x98, 0x99, 0x1e, 0xa2, 0x1e, 0xe2, 0x3e, 0xec, 0x4a, 0x42, 0x55, 0xa8, 0x95, 0x8c, 0x32, 0x66, - 0xdb, 0xc9, 0x95, 0xb8, 0x0c, 0x0a, 0x64, 0xdf, 0x45, 0x54, 0xca, 0x56, 0x85, 0xda, 0x64, 0x63, - 0xf6, 0xf2, 0xa4, 0x32, 0x35, 0x80, 0xbd, 0xee, 0x0b, 0x35, 0xbc, 0x56, 0x8d, 0x08, 0x16, 0x9b, - 0x60, 0xda, 0xc6, 0x8c, 0x53, 0xdc, 0xf6, 0x39, 0x32, 0x39, 0x91, 0x72, 0x55, 0xa1, 0x56, 0xae, - 0xab, 0xda, 0x4d, 0x03, 0xb5, 0x1d, 0x1f, 0xd1, 0xc1, 0x3a, 0x71, 0x6d, 0x1c, 0xc8, 0x6b, 0xe4, - 0x8f, 0x4e, 0x2a, 0x19, 0x63, 0x6a, 0xd8, 0xde, 0x22, 0x22, 0x04, 0x85, 0xc0, 0x1a, 0x26, 0xe5, - 0xab, 0xb9, 0x5a, 0xb9, 0xbe, 0xa0, 0x45, 0xe6, 0x69, 0x81, 0x79, 0x5a, 0x6c, 0x9e, 0xb6, 0x4e, - 0xb0, 0xdb, 0x58, 0x0d, 0xba, 0xbf, 0x9d, 0x56, 0x6a, 0x0e, 0xe6, 0x7b, 0x7e, 0x5b, 0xb3, 0x48, - 0x4f, 0x8f, 0x9d, 0x8e, 0x1e, 0x2b, 0xcc, 0xee, 0xe8, 0x7c, 0xe0, 0x21, 0x16, 0x36, 0x30, 0x23, - 0x62, 0x16, 0x3f, 0x00, 0xc0, 0x38, 0xa4, 0xdc, 0x0c, 0x82, 0x92, 0x0a, 0xa1, 0x5c, 0x59, 0x8b, - 0x4c, 0xd4, 0x12, 0x13, 0xb5, 0x56, 0x92, 0x62, 0x63, 0x31, 0xf8, 0x47, 0x97, 0x27, 0x95, 0xd9, - 0x68, 0xfc, 0x34, 0x5e, 0xf5, 0xf0, 0xb4, 0x22, 0x18, 0x93, 0x21, 0x57, 0x50, 0x2d, 0xea, 0x60, - 0xde, 0xf5, 0x7b, 0x26, 0xf2, 0x88, 0xb5, 0xc7, 0x4c, 0x0f, 0x62, 0xdb, 0x24, 0x7d, 0x44, 0xa5, - 0x89, 0xaa, 0x50, 0xcb, 0x1b, 0x73, 0xae, 0xdf, 0x7b, 0x15, 0x42, 0xdb, 0x10, 0xdb, 0x6f, 0xfb, - 0x88, 0x06, 0x31, 0x78, 0x14, 0x5b, 0xd8, 0x75, 0x4c, 0x8e, 0xad, 0x8e, 0x54, 0xac, 0x0a, 0xb5, - 0x9c, 0x51, 0x8e, 0xef, 0x5a, 0xd8, 0xea, 0xa8, 0x12, 0x78, 0x78, 0x35, 0x3b, 0x03, 0x31, 0x8f, - 0xb8, 0x0c, 0xa9, 0xdf, 0x05, 0x30, 0xdd, 0x64, 0xce, 0x4b, 0xdb, 0x6e, 0x91, 0x28, 0xd5, 0x34, - 0x32, 0x61, 0x7c, 0x64, 0x0b, 0xa0, 0x14, 0xee, 0x97, 0x89, 0xed, 0x30, 0xdd, 0xbc, 0x51, 0x0c, - 0xcf, 0x9b, 0xb6, 0x88, 0x40, 0x91, 0xa2, 0x7d, 0x48, 0x6d, 0x26, 0xe5, 0xfe, 0x7e, 0x00, 0x09, - 0xb7, 0xfa, 0x08, 0x3c, 0xb8, 0x22, 0x3d, 0x1d, 0xea, 0xab, 0x00, 0x4a, 0x4d, 0xe6, 0xbc, 0x0b, - 0xd6, 0xfb, 0xb7, 0xe7, 0x49, 0x77, 0x26, 0xfb, 0xaf, 0x76, 0x46, 0x55, 0xc1, 0x6c, 0x22, 0x2b, - 0xd1, 0x2a, 0xce, 0x80, 0xec, 0xe6, 0x46, 0xa8, 0x2d, 0x6f, 0x64, 0x37, 0x37, 0xd4, 0x2f, 0x59, - 0x00, 0x9a, 0xcc, 0x79, 0xef, 0xb2, 0x3f, 0x52, 0xbf, 0x05, 0x4a, 0x7e, 0xd4, 0x92, 0x0c, 0xb0, - 0x7a, 0xdb, 0xbb, 0x33, 0x64, 0xd6, 0xe2, 0xe7, 0x06, 0x62, 0x16, 0xc5, 0x1e, 0x27, 0xd4, 0x48, - 0x19, 0xe4, 0xcf, 0x02, 0x98, 0xbb, 0x81, 0x5f, 0x97, 0xfa, 0x3f, 0x1c, 0x9b, 0x07, 0xe2, 0x50, - 0x72, 0xe2, 0x59, 0xfd, 0x2c, 0x0b, 0x72, 0x4d, 0xe6, 0x88, 0x1f, 0x41, 0x79, 0xf4, 0x7b, 0xa4, - 0xde, 0x31, 0xf1, 0x48, 0x8d, 0xfc, 0xec, 0xfe, 0x9a, 0x34, 0x9a, 0x5d, 0x00, 0x46, 0xde, 0x8b, - 0xa5, 0x3b, 0x3a, 0x87, 0x25, 0xf2, 0xd3, 0x7b, 0x4b, 0x52, 0xee, 0x37, 0xa0, 0x10, 0xad, 0xe7, - 0xe2, 0x1d, 0x3d, 0x21, 0x2a, 0x3f, 0x19, 0x87, 0xa6, 0x64, 0x3b, 0xa0, 0x98, 0xec, 0x8b, 0x32, - 0x3e, 0x75, 0x79, 0x79, 0x3c, 0x9e, 0x50, 0x36, 0xb6, 0x8e, 0xce, 0x15, 0xe1, 0xf8, 0x5c, 0x11, - 0xce, 0xce, 0x15, 0xe1, 0xf0, 0x42, 0xc9, 0x1c, 0x5f, 0x28, 0x99, 0x9f, 0x17, 0x4a, 0x66, 0xb7, - 0x3e, 0x92, 0x61, 0xcc, 0xb5, 0xd2, 0x85, 0x6d, 0x96, 0x1c, 0xf4, 0x83, 0x2b, 0x3f, 0x85, 0x41, - 0xa6, 0xed, 0x89, 0xf0, 0x83, 0xf8, 0xfc, 0x57, 0x00, 0x00, 0x00, 0xff, 0xff, 0x99, 0xd3, 0x5a, - 0xcd, 0x2d, 0x07, 0x00, 0x00, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x55, 0xcd, 0x4e, 0xdb, 0x4c, + 0x14, 0x8d, 0xf3, 0x43, 0xc2, 0x0d, 0x20, 0xb0, 0xf8, 0xbe, 0xcf, 0xf8, 0x43, 0x4e, 0xb0, 0x2a, + 0x94, 0x56, 0xc2, 0x06, 0xba, 0xeb, 0xae, 0x81, 0xaa, 0x42, 0x34, 0x2a, 0xb8, 0xa9, 0x2a, 0x21, + 0x55, 0x96, 0x63, 0x4f, 0xcd, 0x28, 0xc4, 0x63, 0xcd, 0x8c, 0x03, 0xbc, 0x40, 0x37, 0xdd, 0xb0, + 0xe9, 0x4b, 0xf4, 0x0d, 0xda, 0x27, 0x60, 0xc9, 0xb2, 0x2b, 0x40, 0xf0, 0x06, 0x3c, 0x41, 0xe5, + 0xdf, 0x84, 0xbf, 0xd0, 0x4a, 0x6d, 0x57, 0xb6, 0xe7, 0xdc, 0x7b, 0x72, 0xee, 0x39, 0xd7, 0x0e, + 0xfc, 0xef, 0xa1, 0x80, 0x53, 0xe2, 0xe9, 0xd8, 0xb3, 0x91, 0xc7, 0x71, 0x1f, 0x31, 0x9d, 0x1f, + 0x68, 0x3e, 0x25, 0x9c, 0x88, 0x62, 0x02, 0x6a, 0x03, 0x50, 0x9e, 0x75, 0x89, 0x4b, 0x22, 0x58, + 0x0f, 0xef, 0xe2, 0x4a, 0xb9, 0xe6, 0x12, 0xe2, 0xee, 0x21, 0x3d, 0x7a, 0xea, 0x04, 0x1f, 0x74, + 0x8e, 0x7b, 0x88, 0x71, 0xab, 0xe7, 0x27, 0x05, 0x8a, 0x4d, 0x58, 0x8f, 0x30, 0xbd, 0x63, 0x31, + 0xa4, 0xf7, 0x57, 0x3a, 0x88, 0x5b, 0x2b, 0xba, 0x4d, 0xb0, 0x97, 0xe2, 0x77, 0xe8, 0x70, 0xad, + 0xc0, 0x45, 0x23, 0x70, 0xc6, 0xad, 0x6e, 0x86, 0xdf, 0x14, 0xe0, 0x04, 0xd4, 0xe2, 0x98, 0x24, + 0xfc, 0xea, 0xb7, 0x02, 0x4c, 0xb5, 0x98, 0xbb, 0x46, 0x91, 0xc5, 0xd1, 0xcb, 0x90, 0x58, 0x5c, + 0x80, 0x09, 0xcc, 0x4c, 0x1f, 0x51, 0x1f, 0xf1, 0xc0, 0xda, 0x93, 0x84, 0xba, 0xd0, 0xa8, 0x18, + 0x55, 0xcc, 0xb6, 0xd2, 0x23, 0x71, 0x11, 0x4a, 0x64, 0xdf, 0x43, 0x54, 0xca, 0xd7, 0x85, 0xc6, + 0x78, 0x73, 0xfa, 0xea, 0xb4, 0x36, 0x71, 0x68, 0xf5, 0xf6, 0x9e, 0xa9, 0xd1, 0xb1, 0x6a, 0xc4, + 0xb0, 0xd8, 0x82, 0x49, 0x07, 0x33, 0x4e, 0x71, 0x27, 0xe0, 0xc8, 0xe4, 0x44, 0x2a, 0xd4, 0x85, + 0x46, 0x75, 0x55, 0xd5, 0x6e, 0x1b, 0xa8, 0x6d, 0x07, 0x88, 0x1e, 0xae, 0x11, 0xcf, 0xc1, 0xa1, + 0xbc, 0x66, 0xf1, 0xf8, 0xb4, 0x96, 0x33, 0x26, 0x06, 0xed, 0x6d, 0x22, 0x5a, 0x50, 0x0a, 0xad, + 0x61, 0x52, 0xb1, 0x5e, 0x68, 0x54, 0x57, 0xe7, 0xb4, 0xd8, 0x3c, 0x2d, 0x34, 0x4f, 0x4b, 0xcc, + 0xd3, 0xd6, 0x08, 0xf6, 0x9a, 0xcb, 0x61, 0xf7, 0x97, 0xb3, 0x5a, 0xc3, 0xc5, 0x7c, 0x37, 0xe8, + 0x68, 0x36, 0xe9, 0xe9, 0x89, 0xd3, 0xf1, 0x65, 0x89, 0x39, 0x5d, 0x9d, 0x1f, 0xfa, 0x88, 0x45, + 0x0d, 0xcc, 0x88, 0x99, 0xc5, 0x77, 0x00, 0x8c, 0x5b, 0x94, 0x9b, 0x61, 0x50, 0x52, 0x29, 0x92, + 0x2b, 0x6b, 0xb1, 0x89, 0x5a, 0x6a, 0xa2, 0xd6, 0x4e, 0x53, 0x6c, 0xce, 0x87, 0x3f, 0x74, 0x75, + 0x5a, 0x9b, 0x8e, 0xc7, 0xcf, 0xe2, 0x55, 0x8f, 0xce, 0x6a, 0x82, 0x31, 0x1e, 0x71, 0x85, 0xd5, + 0xa2, 0x0e, 0xb3, 0x5e, 0xd0, 0x33, 0x91, 0x4f, 0xec, 0x5d, 0x66, 0xfa, 0x16, 0x76, 0x4c, 0xd2, + 0x47, 0x54, 0x1a, 0xab, 0x0b, 0x8d, 0xa2, 0x31, 0xe3, 0x05, 0xbd, 0x17, 0x11, 0xb4, 0x65, 0x61, + 0xe7, 0x75, 0x1f, 0xd1, 0x30, 0x06, 0x9f, 0x62, 0x1b, 0x7b, 0xae, 0xc9, 0xb1, 0xdd, 0x95, 0xca, + 0x75, 0xa1, 0x51, 0x30, 0xaa, 0xc9, 0x59, 0x1b, 0xdb, 0x5d, 0x55, 0x82, 0x7f, 0xaf, 0x67, 0x67, + 0x20, 0xe6, 0x13, 0x8f, 0x21, 0xf5, 0xab, 0x00, 0x93, 0x2d, 0xe6, 0x3e, 0x77, 0x9c, 0x36, 0x89, + 0x53, 0xcd, 0x22, 0x13, 0x46, 0x47, 0x36, 0x07, 0x95, 0x68, 0xbf, 0x4c, 0xec, 0x44, 0xe9, 0x16, + 0x8d, 0x72, 0xf4, 0xbc, 0xe1, 0x88, 0x08, 0xca, 0x14, 0xed, 0x5b, 0xd4, 0x61, 0x52, 0xe1, 0xf7, + 0x07, 0x90, 0x72, 0xab, 0xff, 0xc1, 0x3f, 0xd7, 0xa4, 0x67, 0x43, 0x7d, 0x16, 0xa0, 0xd2, 0x62, + 0xee, 0x9b, 0x70, 0xbd, 0x7f, 0x7a, 0x9e, 0x6c, 0x67, 0xf2, 0x7f, 0x6a, 0x67, 0x54, 0x15, 0xa6, + 0x53, 0x59, 0xa9, 0x56, 0x71, 0x0a, 0xf2, 0x1b, 0xeb, 0x91, 0xb6, 0xa2, 0x91, 0xdf, 0x58, 0x57, + 0x3f, 0xe5, 0x01, 0x5a, 0xcc, 0x7d, 0xeb, 0xb1, 0x5f, 0x52, 0xff, 0x0a, 0x2a, 0x41, 0xdc, 0x92, + 0x0e, 0xb0, 0x7c, 0xd7, 0xbb, 0x33, 0x60, 0xd6, 0x92, 0xeb, 0x3a, 0x62, 0x36, 0xc5, 0x3e, 0x27, + 0xd4, 0xc8, 0x18, 0xe4, 0x8f, 0x02, 0xcc, 0xdc, 0xc2, 0x6f, 0x4a, 0xfd, 0x1b, 0x8e, 0xcd, 0x82, + 0x38, 0x90, 0x9c, 0x7a, 0xb6, 0x7a, 0x9e, 0x87, 0x42, 0x8b, 0xb9, 0xe2, 0x7b, 0xa8, 0x0e, 0x7f, + 0x8f, 0xd4, 0x7b, 0x26, 0x1e, 0xaa, 0x91, 0x9f, 0x3c, 0x5c, 0x93, 0x45, 0xb3, 0x03, 0x30, 0xf4, + 0x5e, 0x2c, 0xdc, 0xd3, 0x39, 0x28, 0x91, 0x1f, 0x3f, 0x58, 0x92, 0x71, 0x6f, 0x42, 0x29, 0x5e, + 0xcf, 0xf9, 0x7b, 0x7a, 0x22, 0x54, 0x7e, 0x34, 0x0a, 0xcd, 0xc8, 0xb6, 0xa1, 0x9c, 0xee, 0x8b, + 0x32, 0x3a, 0x75, 0x79, 0x71, 0x34, 0x9e, 0x52, 0x36, 0x37, 0x8f, 0x2f, 0x14, 0xe1, 0xe4, 0x42, + 0x11, 0xce, 0x2f, 0x14, 0xe1, 0xe8, 0x52, 0xc9, 0x9d, 0x5c, 0x2a, 0xb9, 0xef, 0x97, 0x4a, 0x6e, + 0x67, 0x65, 0x28, 0xc3, 0x84, 0x6b, 0x89, 0x50, 0x37, 0xbd, 0xd7, 0x0f, 0xae, 0xfd, 0x13, 0x86, + 0x91, 0x76, 0xc6, 0xa2, 0xef, 0xe1, 0xd3, 0x1f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x41, 0xec, 0xc5, + 0x1c, 0x2c, 0x07, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -611,7 +611,7 @@ func NewMsgClient(cc grpc1.ClientConn) MsgClient { func (c *msgClient) CreateGauge(ctx context.Context, in *MsgCreateGauge, opts ...grpc.CallOption) (*MsgCreateGaugeResponse, error) { out := new(MsgCreateGaugeResponse) - err := c.cc.Invoke(ctx, "/duality.incentives.Msg/CreateGauge", in, out, opts...) + err := c.cc.Invoke(ctx, "/neutron.incentives.Msg/CreateGauge", in, out, opts...) if err != nil { return nil, err } @@ -620,7 +620,7 @@ func (c *msgClient) CreateGauge(ctx context.Context, in *MsgCreateGauge, opts .. func (c *msgClient) AddToGauge(ctx context.Context, in *MsgAddToGauge, opts ...grpc.CallOption) (*MsgAddToGaugeResponse, error) { out := new(MsgAddToGaugeResponse) - err := c.cc.Invoke(ctx, "/duality.incentives.Msg/AddToGauge", in, out, opts...) + err := c.cc.Invoke(ctx, "/neutron.incentives.Msg/AddToGauge", in, out, opts...) if err != nil { return nil, err } @@ -629,7 +629,7 @@ func (c *msgClient) AddToGauge(ctx context.Context, in *MsgAddToGauge, opts ...g func (c *msgClient) Stake(ctx context.Context, in *MsgStake, opts ...grpc.CallOption) (*MsgStakeResponse, error) { out := new(MsgStakeResponse) - err := c.cc.Invoke(ctx, "/duality.incentives.Msg/Stake", in, out, opts...) + err := c.cc.Invoke(ctx, "/neutron.incentives.Msg/Stake", in, out, opts...) if err != nil { return nil, err } @@ -638,7 +638,7 @@ func (c *msgClient) Stake(ctx context.Context, in *MsgStake, opts ...grpc.CallOp func (c *msgClient) Unstake(ctx context.Context, in *MsgUnstake, opts ...grpc.CallOption) (*MsgUnstakeResponse, error) { out := new(MsgUnstakeResponse) - err := c.cc.Invoke(ctx, "/duality.incentives.Msg/Unstake", in, out, opts...) + err := c.cc.Invoke(ctx, "/neutron.incentives.Msg/Unstake", in, out, opts...) if err != nil { return nil, err } @@ -688,7 +688,7 @@ func _Msg_CreateGauge_Handler(srv interface{}, ctx context.Context, dec func(int } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/duality.incentives.Msg/CreateGauge", + FullMethod: "/neutron.incentives.Msg/CreateGauge", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MsgServer).CreateGauge(ctx, req.(*MsgCreateGauge)) @@ -706,7 +706,7 @@ func _Msg_AddToGauge_Handler(srv interface{}, ctx context.Context, dec func(inte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/duality.incentives.Msg/AddToGauge", + FullMethod: "/neutron.incentives.Msg/AddToGauge", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MsgServer).AddToGauge(ctx, req.(*MsgAddToGauge)) @@ -724,7 +724,7 @@ func _Msg_Stake_Handler(srv interface{}, ctx context.Context, dec func(interface } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/duality.incentives.Msg/Stake", + FullMethod: "/neutron.incentives.Msg/Stake", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MsgServer).Stake(ctx, req.(*MsgStake)) @@ -742,7 +742,7 @@ func _Msg_Unstake_Handler(srv interface{}, ctx context.Context, dec func(interfa } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/duality.incentives.Msg/Unstake", + FullMethod: "/neutron.incentives.Msg/Unstake", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MsgServer).Unstake(ctx, req.(*MsgUnstake)) @@ -751,7 +751,7 @@ func _Msg_Unstake_Handler(srv interface{}, ctx context.Context, dec func(interfa } var _Msg_serviceDesc = grpc.ServiceDesc{ - ServiceName: "duality.incentives.Msg", + ServiceName: "neutron.incentives.Msg", HandlerType: (*MsgServer)(nil), Methods: []grpc.MethodDesc{ { @@ -772,7 +772,7 @@ var _Msg_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "duality/incentives/tx.proto", + Metadata: "neutron/incentives/tx.proto", } func (m *MsgCreateGauge) Marshal() (dAtA []byte, err error) { From ad4718161ca655fd5a931aacf31f583d823e0cdb Mon Sep 17 00:00:00 2001 From: Julian Compagni Portis Date: Thu, 28 Sep 2023 17:18:55 -0400 Subject: [PATCH 175/307] update duality code to connect with neutron --- app/app.go | 120 +++++++++++++++++- go.mod | 6 +- tests/ibc/gmp_swap_forward_test.go | 6 +- tests/ibc/ibc_setup_test.go | 23 ++-- tests/ibc/swap_forward_test.go | 4 +- tests/ibc/swap_test.go | 4 +- testutil/apptesting/test_suite.go | 22 +--- testutil/consumer/test_helpers.go | 17 +++ testutil/contractmanager/network/network.go | 4 + testutil/cron/network/network.go | 4 + testutil/integration_test_setup.go | 4 - testutil/interchaintxs/network/network.go | 4 + x/dex/keeper/core_helper_test.go | 25 ++-- ...grpc_query_estimate_multi_hop_swap_test.go | 2 +- x/dex/keeper/grpc_query_user_deposits_test.go | 3 +- x/dex/keeper/integration_multihopswap_test.go | 2 +- x/dex/keeper/liquidity_test.go | 3 +- x/dex/keeper/msg_server_test.go | 30 ++--- x/epochs/keeper/abci_test.go | 4 +- x/epochs/keeper/genesis_test.go | 6 +- x/gmp/ibc_middleware.go | 3 +- x/ibcswap/types/swap_test.go | 17 ++- x/incentives/keeper/distributor_test.go | 4 +- x/incentives/keeper/utils_test.go | 4 +- x/incentives/types/expected_keepers.go | 5 +- 25 files changed, 222 insertions(+), 104 deletions(-) diff --git a/app/app.go b/app/app.go index 798cc7f48..389d3d8ba 100644 --- a/app/app.go +++ b/app/app.go @@ -150,6 +150,24 @@ import ( routerkeeper "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router/keeper" routertypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router/types" + "github.com/neutron-org/neutron/x/dex" + dexkeeper "github.com/neutron-org/neutron/x/dex/keeper" + dextypes "github.com/neutron-org/neutron/x/dex/types" + + "github.com/neutron-org/neutron/x/incentives" + incentiveskeeper "github.com/neutron-org/neutron/x/incentives/keeper" + incentivestypes "github.com/neutron-org/neutron/x/incentives/types" + + "github.com/neutron-org/neutron/x/epochs" + epochskeeper "github.com/neutron-org/neutron/x/epochs/keeper" + epochstypes "github.com/neutron-org/neutron/x/epochs/types" + + "github.com/neutron-org/neutron/x/ibcswap" + ibcswapkeeper "github.com/neutron-org/neutron/x/ibcswap/keeper" + ibcswaptypes "github.com/neutron-org/neutron/x/ibcswap/types" + + gmpmiddleware "github.com/neutron-org/neutron/x/gmp" + // Block-sdk imports blocksdkabci "github.com/skip-mev/block-sdk/abci" signer_extraction_adapter "github.com/skip-mev/block-sdk/adapters/signer_extraction_adapter" @@ -218,6 +236,10 @@ var ( router.AppModuleBasic{}, auction.AppModuleBasic{}, globalfee.AppModule{}, + dex.AppModuleBasic{}, + ibcswap.AppModuleBasic{}, + epochs.AppModuleBasic{}, + incentives.AppModuleBasic{}, ) // module account permissions @@ -234,6 +256,8 @@ var ( ccvconsumertypes.ConsumerToSendToProviderName: nil, tokenfactorytypes.ModuleName: {authtypes.Minter, authtypes.Burner}, crontypes.ModuleName: nil, + dextypes.ModuleName: {authtypes.Minter, authtypes.Burner, authtypes.Staking}, + incentivestypes.ModuleName: nil, } ) @@ -297,6 +321,10 @@ type App struct { TokenFactoryKeeper *tokenfactorykeeper.Keeper CronKeeper cronkeeper.Keeper RouterKeeper *routerkeeper.Keeper + DexKeeper dexkeeper.Keeper + SwapKeeper ibcswapkeeper.Keeper + IncentivesKeeper *incentiveskeeper.Keeper + EpochsKeeper *epochskeeper.Keeper RouterModule router.AppModule @@ -381,7 +409,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, routertypes.StoreKey, - crontypes.StoreKey, ibchookstypes.StoreKey, consensusparamtypes.StoreKey, crisistypes.StoreKey, auctiontypes.StoreKey, + crontypes.StoreKey, ibchookstypes.StoreKey, consensusparamtypes.StoreKey, crisistypes.StoreKey, auctiontypes.StoreKey, dextypes.StoreKey, incentivestypes.StoreKey, epochstypes.StoreKey, ) tkeys := sdk.NewTransientStoreKeys(paramstypes.TStoreKey) memKeys := sdk.NewMemoryStoreKeys(capabilitytypes.MemStoreKey, feetypes.MemStoreKey) @@ -604,6 +632,59 @@ func New( authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String(), ) + app.DexKeeper = *dexkeeper.NewKeeper( + appCodec, + keys[dextypes.StoreKey], + keys[dextypes.MemStoreKey], + app.GetSubspace(dextypes.ModuleName), + app.BankKeeper, + ) + + dexModule := dex.NewAppModule(appCodec, app.DexKeeper, app.BankKeeper) + + app.SwapKeeper = ibcswapkeeper.NewKeeper( + appCodec, + app.MsgServiceRouter(), + app.IBCKeeper.ChannelKeeper, + app.BankKeeper, + ) + + swapModule := ibcswap.NewAppModule(app.SwapKeeper) + + app.EpochsKeeper = epochskeeper.NewKeeper(keys[epochstypes.StoreKey]) + + app.IncentivesKeeper = incentiveskeeper.NewKeeper( + keys[incentivestypes.StoreKey], + app.GetSubspace(incentivestypes.ModuleName), + app.AccountKeeper, + app.BankKeeper, + app.EpochsKeeper, + app.DexKeeper, + // JCP TODO: confirm this is correct + authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String(), + ) + + app.IncentivesKeeper.SetHooks( + incentivestypes.NewMultiIncentiveHooks( + // insert Incentives hooks receivers here + ), + ) + + incentivesModule := incentives.NewAppModule( + app.IncentivesKeeper, + app.AccountKeeper, + app.BankKeeper, + app.EpochsKeeper, + ) + + app.EpochsKeeper.SetHooks(epochstypes.NewMultiEpochHooks( + app.IncentivesKeeper.Hooks(), + )) + + // NB: This must be initialized AFTER app.EpochsKeeper.SetHooks() because otherwise + // we dereference an out-of-date EpochsKeeper. + epochsModule := epochs.NewAppModule(*app.EpochsKeeper) + wasmDir := filepath.Join(homePath, "wasm") wasmConfig, err := wasm.ReadWasmConfig(appOpts) if err != nil { @@ -718,7 +799,7 @@ func New( app.RouterModule = router.NewAppModule(app.RouterKeeper) - ibcStack := router.NewIBCMiddleware( + var ibcStack ibcporttypes.IBCModule = router.NewIBCMiddleware( app.HooksTransferIBCModule, app.RouterKeeper, 0, @@ -726,6 +807,9 @@ func New( routerkeeper.DefaultRefundTransferPacketTimeoutTimestamp, ) + ibcStack = ibcswap.NewIBCMiddleware(ibcStack, app.SwapKeeper) + ibcStack = gmpmiddleware.NewIBCMiddleware(ibcStack) + ibcRouter.AddRoute(icacontrollertypes.SubModuleName, icaControllerStack). AddRoute(icahosttypes.SubModuleName, icaHostIBCModule). AddRoute(ibctransfertypes.ModuleName, ibcStack). @@ -773,6 +857,10 @@ func New( cronModule, globalfee.NewAppModule(app.GetSubspace(globalfee.ModuleName)), auction.NewAppModule(appCodec, app.AuctionKeeper), + swapModule, + dexModule, + incentivesModule, + epochsModule, crisis.NewAppModule(&app.CrisisKeeper, skipGenesisInvariants, app.GetSubspace(crisistypes.ModuleName)), // always be last to make sure that it checks for all invariants and not only part of them ) @@ -809,6 +897,10 @@ func New( routertypes.ModuleName, crontypes.ModuleName, globalfee.ModuleName, + ibcswaptypes.ModuleName, + dextypes.ModuleName, + incentivestypes.ModuleName, + epochstypes.ModuleName, ) app.mm.SetOrderEndBlockers( @@ -840,6 +932,12 @@ func New( routertypes.ModuleName, crontypes.ModuleName, globalfee.ModuleName, + ibcswaptypes.ModuleName, + incentivestypes.ModuleName, + epochstypes.ModuleName, + // NOTE: Because of the gas sensitivity of PurgeExpiredLimit order operations + // dexmodule must be the last endBlock module to run + dextypes.ModuleName, ) // NOTE: The genutils module must occur after staking so that pools are @@ -876,6 +974,10 @@ func New( routertypes.ModuleName, crontypes.ModuleName, globalfee.ModuleName, + ibcswaptypes.ModuleName, + dextypes.ModuleName, + incentivestypes.ModuleName, + epochstypes.ModuleName, ) app.mm.RegisterInvariants(&app.CrisisKeeper) @@ -904,6 +1006,7 @@ func New( interchainTxsModule, feeBurnerModule, cronModule, + dexModule, ) app.sm.RegisterStoreDecoders() @@ -1107,12 +1210,22 @@ func (app *App) EndBlocker(ctx sdk.Context, req abci.RequestEndBlock) abci.Respo return app.mm.EndBlock(ctx, req) } +func (app *App) EnsureBlockGasMeter(ctx sdk.Context) { + // TrancheKey generation and LimitOrderExpirationPurge both rely on a BlockGas meter. + // check that it works at startup + cp := app.GetConsensusParams(ctx) + if cp == nil || cp.Block == nil || cp.Block.MaxGas <= 0 { + panic("BlockGas meter must be initialized. Genesis must provide value for Block.MaxGas") + } +} + // InitChainer application update at chain initialization func (app *App) InitChainer(ctx sdk.Context, req abci.RequestInitChain) abci.ResponseInitChain { var genesisState GenesisState if err := tmjson.Unmarshal(req.AppStateBytes, &genesisState); err != nil { panic(err) } + app.EnsureBlockGasMeter(ctx) app.UpgradeKeeper.SetModuleVersionMap(ctx, app.mm.GetVersionMap()) return app.mm.InitGenesis(ctx, app.appCodec, genesisState) } @@ -1244,6 +1357,9 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino paramsKeeper.Subspace(tokenfactorytypes.StoreKey).WithKeyTable(tokenfactorytypes.ParamKeyTable()) paramsKeeper.Subspace(interchainqueriesmoduletypes.StoreKey).WithKeyTable(interchainqueriesmoduletypes.ParamKeyTable()) paramsKeeper.Subspace(interchaintxstypes.StoreKey).WithKeyTable(interchaintxstypes.ParamKeyTable()) + paramsKeeper.Subspace(dextypes.ModuleName) + paramsKeeper.Subspace(epochstypes.ModuleName) + paramsKeeper.Subspace(incentivestypes.ModuleName) return paramsKeeper } diff --git a/go.mod b/go.mod index a0f9c16f7..0a6c7f1ca 100644 --- a/go.mod +++ b/go.mod @@ -26,6 +26,7 @@ require ( github.com/golang/protobuf v1.5.3 github.com/gorilla/mux v1.8.0 github.com/grpc-ecosystem/grpc-gateway v1.16.0 + github.com/iancoleman/orderedmap v0.2.0 github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.16.0 github.com/rs/zerolog v1.30.0 @@ -37,6 +38,8 @@ require ( github.com/stretchr/testify v1.8.4 google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d google.golang.org/grpc v1.59.0 + golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb + google.golang.org/protobuf v1.31.0 gopkg.in/yaml.v2 v2.4.0 ) @@ -120,7 +123,6 @@ require ( github.com/hashicorp/hcl v1.0.0 // indirect github.com/hdevalence/ed25519consensus v0.1.0 // indirect github.com/huandu/skiplist v1.2.0 // indirect - github.com/iancoleman/orderedmap v0.2.0 // indirect github.com/improbable-eng/grpc-web v0.15.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect @@ -167,7 +169,6 @@ require ( go.etcd.io/bbolt v1.3.7 // indirect go.opencensus.io v0.24.0 // indirect golang.org/x/crypto v0.12.0 // indirect - golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb // indirect golang.org/x/net v0.14.0 // indirect golang.org/x/oauth2 v0.11.0 // indirect golang.org/x/sync v0.3.0 // indirect @@ -179,7 +180,6 @@ require ( google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect - google.golang.org/protobuf v1.31.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect nhooyr.io/websocket v1.8.7 // indirect diff --git a/tests/ibc/gmp_swap_forward_test.go b/tests/ibc/gmp_swap_forward_test.go index 023c957a5..3048eea5c 100644 --- a/tests/ibc/gmp_swap_forward_test.go +++ b/tests/ibc/gmp_swap_forward_test.go @@ -7,9 +7,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" forwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router/types" transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" - "github.com/duality-labs/duality/x/dex/types" - "github.com/duality-labs/duality/x/gmp" - swaptypes "github.com/duality-labs/duality/x/ibcswap/types" + "github.com/neutron-org/neutron/x/dex/types" + "github.com/neutron-org/neutron/x/gmp" + swaptypes "github.com/neutron-org/neutron/x/ibcswap/types" ) // TestSwapAndForward_Success asserts that the swap and forward middleware stack works as intended with Duality running as a diff --git a/tests/ibc/ibc_setup_test.go b/tests/ibc/ibc_setup_test.go index 98b50c608..1daca621b 100644 --- a/tests/ibc/ibc_setup_test.go +++ b/tests/ibc/ibc_setup_test.go @@ -5,6 +5,8 @@ import ( "fmt" "testing" + dbm "github.com/cometbft/cometbft-db" + "github.com/cosmos/cosmos-sdk/testutil/sims" sdk "github.com/cosmos/cosmos-sdk/types" transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" @@ -13,14 +15,13 @@ import ( ibctesting "github.com/cosmos/ibc-go/v7/testing" icsibctesting "github.com/cosmos/interchain-security/v3/legacy_ibc_testing/testing" - dbm "github.com/cometbft/cometbft-db" "github.com/cometbft/cometbft/libs/log" icstestingutils "github.com/cosmos/interchain-security/v3/testutil/ibc_testing" testutil "github.com/cosmos/interchain-security/v3/testutil/integration" ccvconsumertypes "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types" ccv "github.com/cosmos/interchain-security/v3/x/ccv/types" - appduality "github.com/duality-labs/duality/app" - dextypes "github.com/duality-labs/duality/x/dex/types" + app "github.com/neutron-org/neutron/app" + dextypes "github.com/neutron-org/neutron/x/dex/types" "github.com/stretchr/testify/suite" ) @@ -224,21 +225,23 @@ func (s *IBCTestSuite) setupTransferChannel( } func dualityAppIniter() (icsibctesting.TestingApp, map[string]json.RawMessage) { - encoding := appduality.MakeEncodingConfig() - testApp := appduality.NewApp( + encoding := app.MakeEncodingConfig() + db := dbm.NewMemDB() + testApp := app.New( log.NewNopLogger(), - dbm.NewMemDB(), + "neutron-1", + db, nil, true, map[int64]bool{}, - appduality.DefaultNodeHome, - 5, - appduality.EmptyAppOptions{}, + app.DefaultNodeHome, + 0, encoding, + sims.EmptyAppOptions{}, nil, ) - return testApp, appduality.NewDefaultGenesisState(testApp.AppCodec()) + return testApp, app.NewDefaultGenesisState(testApp.AppCodec()) } func (s *IBCTestSuite) providerCtx() sdk.Context { diff --git a/tests/ibc/swap_forward_test.go b/tests/ibc/swap_forward_test.go index 522db1a72..d9fc03af2 100644 --- a/tests/ibc/swap_forward_test.go +++ b/tests/ibc/swap_forward_test.go @@ -7,8 +7,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" forwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router/types" transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" - "github.com/duality-labs/duality/x/dex/types" - swaptypes "github.com/duality-labs/duality/x/ibcswap/types" + "github.com/neutron-org/neutron/x/dex/types" + swaptypes "github.com/neutron-org/neutron/x/ibcswap/types" "github.com/iancoleman/orderedmap" "golang.org/x/exp/maps" ) diff --git a/tests/ibc/swap_test.go b/tests/ibc/swap_test.go index 8cb1a8c0f..ab8973221 100644 --- a/tests/ibc/swap_test.go +++ b/tests/ibc/swap_test.go @@ -4,8 +4,8 @@ import ( "encoding/json" sdk "github.com/cosmos/cosmos-sdk/types" - dextypes "github.com/duality-labs/duality/x/dex/types" - swaptypes "github.com/duality-labs/duality/x/ibcswap/types" + dextypes "github.com/neutron-org/neutron/x/dex/types" + swaptypes "github.com/neutron-org/neutron/x/ibcswap/types" ) // TestIBCSwapMiddleware_Success asserts that the IBC swap middleware works as intended with Duality running as a diff --git a/testutil/apptesting/test_suite.go b/testutil/apptesting/test_suite.go index 4d11c3cbc..d3b3e4f84 100644 --- a/testutil/apptesting/test_suite.go +++ b/testutil/apptesting/test_suite.go @@ -14,9 +14,9 @@ import ( "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/store/rootmulti" sdk "github.com/cosmos/cosmos-sdk/types" - banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" "github.com/neutron-org/neutron/app" "github.com/neutron-org/neutron/testutil" + dexmoduletypes "github.com/neutron-org/neutron/x/dex/types" "github.com/stretchr/testify/suite" ) @@ -34,7 +34,7 @@ type KeeperTestHelper struct { // Setup sets up basic environment for suite (App, Ctx, and test accounts) func (s *KeeperTestHelper) Setup() { - s.App, _ = testutil.SetupTestingApp("neutron-1")() + s.App = testutil.Setup(s.T(), false) s.Ctx = s.App.BaseApp.NewContext( false, tmtypes.Header{Height: 1, ChainID: "neutron-1", Time: time.Now().UTC()}, @@ -48,12 +48,6 @@ func (s *KeeperTestHelper) Setup() { s.SetEpochStartTime() } -// func (s *KeeperTestHelper) SetupTestForInitGenesis() { -// // Setting to True, leads to init genesis not running -// s.App = app.Setup(true) -// s.Ctx = s.App.BaseApp.NewContext(true, tmtypes.Header{}) -// } - func (s *KeeperTestHelper) SetEpochStartTime() { epochsKeeper := s.App.EpochsKeeper @@ -137,17 +131,9 @@ func (s *KeeperTestHelper) Commit() { // FundAcc funds target address with specified amount. func (s *KeeperTestHelper) FundAcc(acc sdk.AccAddress, amounts sdk.Coins) { - err := s.App.BankKeeper.MintCoins(s.Ctx, banktypes.ModuleName, amounts) + err := s.App.BankKeeper.MintCoins(s.Ctx, dexmoduletypes.ModuleName, amounts) s.Require().NoError(err) - err = s.App.BankKeeper.SendCoinsFromModuleToAccount(s.Ctx, banktypes.ModuleName, acc, amounts) + err = s.App.BankKeeper.SendCoinsFromModuleToAccount(s.Ctx, dexmoduletypes.ModuleName, acc, amounts) s.Require().NoError(err) } - -// StateNotAltered validates that app state is not altered. Fails if it is. -func (s *KeeperTestHelper) StateNotAltered() { - oldState := s.App.ExportState(s.Ctx) - s.App.Commit() - newState := s.App.ExportState(s.Ctx) - s.Require().Equal(oldState, newState) -} diff --git a/testutil/consumer/test_helpers.go b/testutil/consumer/test_helpers.go index 14090e8fe..c32a4c758 100644 --- a/testutil/consumer/test_helpers.go +++ b/testutil/consumer/test_helpers.go @@ -90,3 +90,20 @@ func ModifyConsumerGenesis(val network.Validator) error { return nil } + +func ModifyGenesisBlockGas(val network.Validator) error { + genFile := val.Ctx.Config.GenesisFile() + _, genDoc, err := genutiltypes.GenesisStateFromGenFile(genFile) + if err != nil { + return errors.Wrap(err, "failed to read genesis from the file") + } + + genDoc.ConsensusParams.Block.MaxGas = 35_000_000 + + err = genutil.ExportGenesisFile(genDoc, genFile) + if err != nil { + return errors.Wrap(err, "failed to export genesis state") + } + + return nil +} diff --git a/testutil/contractmanager/network/network.go b/testutil/contractmanager/network/network.go index 20e2b8d73..52cf17c17 100644 --- a/testutil/contractmanager/network/network.go +++ b/testutil/contractmanager/network/network.go @@ -71,6 +71,10 @@ func DefaultConfig() network.Config { if err != nil { panic(err) } + err = consumer.ModifyGenesisBlockGas(val.(network.Validator)) + if err != nil { + panic(err) + } return app.New( val.GetCtx().Logger, chainID, tmdb.NewMemDB(), nil, true, map[int64]bool{}, val.GetCtx().Config.RootDir, 0, diff --git a/testutil/cron/network/network.go b/testutil/cron/network/network.go index b31c16d1b..9455dded2 100644 --- a/testutil/cron/network/network.go +++ b/testutil/cron/network/network.go @@ -73,6 +73,10 @@ func DefaultConfig() network.Config { if err != nil { panic(err) } + err = consumer.ModifyGenesisBlockGas(val.(network.Validator)) + if err != nil { + panic(err) + } return app.New( val.GetCtx().Logger, chainID, tmdb.NewMemDB(), nil, true, map[int64]bool{}, val.GetCtx().Config.RootDir, 0, diff --git a/testutil/integration_test_setup.go b/testutil/integration_test_setup.go index 4e2189617..ebac488a9 100644 --- a/testutil/integration_test_setup.go +++ b/testutil/integration_test_setup.go @@ -59,10 +59,6 @@ func Setup(t *testing.T, isCheckTx bool) *app.App { pubKey, err := privVal.GetPubKey() require.NoError(t, err) - // JCP TODO: need? - // // Give bank module minter permissions for testing (ie. KeeperTestHelper.FundAcc) - // maccPerms[banktypes.ModuleName] = []string{authtypes.Minter} - // create validator set with single validator validator := tmtypes.NewValidator(pubKey, 1) valSet := tmtypes.NewValidatorSet([]*tmtypes.Validator{validator}) diff --git a/testutil/interchaintxs/network/network.go b/testutil/interchaintxs/network/network.go index 945ee62b3..3be8f8bb4 100644 --- a/testutil/interchaintxs/network/network.go +++ b/testutil/interchaintxs/network/network.go @@ -72,6 +72,10 @@ func DefaultConfig() network.Config { if err != nil { panic(err) } + err = consumer.ModifyGenesisBlockGas(val.(network.Validator)) + if err != nil { + panic(err) + } return app.New( val.GetCtx().Logger, chainID, tmdb.NewMemDB(), nil, true, map[int64]bool{}, val.GetCtx().Config.RootDir, 0, diff --git a/x/dex/keeper/core_helper_test.go b/x/dex/keeper/core_helper_test.go index 6735567fc..bb257dee3 100644 --- a/x/dex/keeper/core_helper_test.go +++ b/x/dex/keeper/core_helper_test.go @@ -4,12 +4,11 @@ import ( "testing" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" dualityapp "github.com/neutron-org/neutron/app" - . "github.com/neutron-org/neutron/x/dex/keeper" + "github.com/neutron-org/neutron/testutil" "github.com/neutron-org/neutron/x/dex/types" "github.com/stretchr/testify/suite" ) @@ -17,14 +16,12 @@ import ( // Test Suite /////////////////////////////////////////////////////////////// type CoreHelpersTestSuite struct { suite.Suite - app *dualityapp.App - msgServer types.MsgServer - ctx sdk.Context - queryClient types.QueryClient - alice sdk.AccAddress - bob sdk.AccAddress - carol sdk.AccAddress - dan sdk.AccAddress + app *dualityapp.App + ctx sdk.Context + alice sdk.AccAddress + bob sdk.AccAddress + carol sdk.AccAddress + dan sdk.AccAddress } func TestCoreHelpersTestSuite(t *testing.T) { @@ -32,16 +29,12 @@ func TestCoreHelpersTestSuite(t *testing.T) { } func (s *CoreHelpersTestSuite) SetupTest() { - app := dualityapp.Setup(s.T(), false) + app := testutil.Setup(s.T(), false) ctx := app.BaseApp.NewContext(false, tmproto.Header{}) app.AccountKeeper.SetParams(ctx, authtypes.DefaultParams()) app.BankKeeper.SetParams(ctx, banktypes.DefaultParams()) - queryHelper := baseapp.NewQueryServerTestHelper(ctx, app.InterfaceRegistry()) - types.RegisterQueryServer(queryHelper, app.DexKeeper) - queryClient := types.NewQueryClient(queryHelper) - accAlice := app.AccountKeeper.NewAccountWithAddress(ctx, s.alice) app.AccountKeeper.SetAccount(ctx, accAlice) accBob := app.AccountKeeper.NewAccountWithAddress(ctx, s.bob) @@ -52,9 +45,7 @@ func (s *CoreHelpersTestSuite) SetupTest() { app.AccountKeeper.SetAccount(ctx, accDan) s.app = app - s.msgServer = NewMsgServerImpl(app.DexKeeper) s.ctx = ctx - s.queryClient = queryClient s.alice = sdk.AccAddress([]byte("alice")) s.bob = sdk.AccAddress([]byte("bob")) s.carol = sdk.AccAddress([]byte("carol")) 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 c2830469e..ed9721549 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 @@ -2,7 +2,7 @@ package keeper_test import ( sdk "github.com/cosmos/cosmos-sdk/types" - keepertest "github.com/neutron-org/neutron/testutil/keeper" + keepertest "github.com/neutron-org/neutron/testutil/dex/keeper" math_utils "github.com/neutron-org/neutron/utils/math" "github.com/neutron-org/neutron/x/dex/types" ) diff --git a/x/dex/keeper/grpc_query_user_deposits_test.go b/x/dex/keeper/grpc_query_user_deposits_test.go index d9fe413ac..69c4e592b 100644 --- a/x/dex/keeper/grpc_query_user_deposits_test.go +++ b/x/dex/keeper/grpc_query_user_deposits_test.go @@ -7,6 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" dualityapp "github.com/neutron-org/neutron/app" + "github.com/neutron-org/neutron/testutil" keepertest "github.com/neutron-org/neutron/x/dex/keeper/internal/testutils" "github.com/neutron-org/neutron/x/dex/types" "github.com/stretchr/testify/require" @@ -26,7 +27,7 @@ func simulateDeposit(ctx sdk.Context, app *dualityapp.App, addr sdk.AccAddress, } func TestUserDepositsAllQueryPaginated(t *testing.T) { - app := dualityapp.Setup(t, false) + app := testutil.Setup(t, false) keeper := app.DexKeeper ctx := app.BaseApp.NewContext(false, tmproto.Header{}) wctx := sdk.WrapSDKContext(ctx) diff --git a/x/dex/keeper/integration_multihopswap_test.go b/x/dex/keeper/integration_multihopswap_test.go index 08b28dbf2..52a5f32da 100644 --- a/x/dex/keeper/integration_multihopswap_test.go +++ b/x/dex/keeper/integration_multihopswap_test.go @@ -2,7 +2,7 @@ package keeper_test import ( sdk "github.com/cosmos/cosmos-sdk/types" - keepertest "github.com/neutron-org/neutron/testutil/keeper" + keepertest "github.com/neutron-org/neutron/testutil/dex/keeper" math_utils "github.com/neutron-org/neutron/utils/math" "github.com/neutron-org/neutron/x/dex/types" ) diff --git a/x/dex/keeper/liquidity_test.go b/x/dex/keeper/liquidity_test.go index 013080f4c..6b6626e77 100644 --- a/x/dex/keeper/liquidity_test.go +++ b/x/dex/keeper/liquidity_test.go @@ -7,6 +7,7 @@ import ( tmproto "github.com/cometbft/cometbft/proto/tendermint/types" sdk "github.com/cosmos/cosmos-sdk/types" dualityapp "github.com/neutron-org/neutron/app" + "github.com/neutron-org/neutron/testutil" keepertest "github.com/neutron-org/neutron/testutil/dex/keeper" "github.com/neutron-org/neutron/x/dex/types" "github.com/stretchr/testify/suite" @@ -22,7 +23,7 @@ type LiquidityTestSuite struct { // don't need to test both LO and LP. At the level of swap testing these should be indistinguishable. func (s *LiquidityTestSuite) SetupTest() { - s.app = dualityapp.Setup(s.T(), false) + s.app = testutil.Setup(s.T(), false) ctx := s.app.BaseApp.NewContext(false, tmproto.Header{}) ctx = ctx.WithBlockGasMeter(sdk.NewInfiniteGasMeter()) s.ctx = ctx diff --git a/x/dex/keeper/msg_server_test.go b/x/dex/keeper/msg_server_test.go index 51955b5e4..fdf0f89af 100644 --- a/x/dex/keeper/msg_server_test.go +++ b/x/dex/keeper/msg_server_test.go @@ -8,12 +8,12 @@ import ( abci "github.com/cometbft/cometbft/abci/types" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" dualityapp "github.com/neutron-org/neutron/app" math_utils "github.com/neutron-org/neutron/utils/math" + "github.com/neutron-org/neutron/testutil" . "github.com/neutron-org/neutron/x/dex/keeper" . "github.com/neutron-org/neutron/x/dex/keeper/internal/testutils" "github.com/neutron-org/neutron/x/dex/types" @@ -23,15 +23,14 @@ import ( // / Test suite type MsgServerTestSuite struct { suite.Suite - app *dualityapp.App - msgServer types.MsgServer - ctx sdk.Context - queryClient types.QueryClient - alice sdk.AccAddress - bob sdk.AccAddress - carol sdk.AccAddress - dan sdk.AccAddress - goCtx context.Context + app *dualityapp.App + msgServer types.MsgServer + ctx sdk.Context + alice sdk.AccAddress + bob sdk.AccAddress + carol sdk.AccAddress + dan sdk.AccAddress + goCtx context.Context } var defaultPairID *types.PairID = &types.PairID{Token0: "TokenA", Token1: "TokenB"} @@ -51,17 +50,13 @@ func TestMsgServerTestSuite(t *testing.T) { } func (s *MsgServerTestSuite) SetupTest() { - app := dualityapp.Setup(s.T(), false) + app := testutil.Setup(s.T(), false) ctx := app.BaseApp.NewContext(false, tmproto.Header{}) ctx = ctx.WithBlockGasMeter(sdk.NewInfiniteGasMeter()) app.AccountKeeper.SetParams(ctx, authtypes.DefaultParams()) app.BankKeeper.SetParams(ctx, banktypes.DefaultParams()) - queryHelper := baseapp.NewQueryServerTestHelper(ctx, app.InterfaceRegistry()) - types.RegisterQueryServer(queryHelper, app.DexKeeper) - queryClient := types.NewQueryClient(queryHelper) - accAlice := app.AccountKeeper.NewAccountWithAddress(ctx, s.alice) app.AccountKeeper.SetAccount(ctx, accAlice) accBob := app.AccountKeeper.NewAccountWithAddress(ctx, s.bob) @@ -75,7 +70,6 @@ func (s *MsgServerTestSuite) SetupTest() { s.msgServer = NewMsgServerImpl(app.DexKeeper) s.ctx = ctx s.goCtx = sdk.WrapSDKContext(ctx) - s.queryClient = queryClient s.alice = sdk.AccAddress([]byte("alice")) s.bob = sdk.AccAddress([]byte("bob")) s.carol = sdk.AccAddress([]byte("carol")) @@ -916,7 +910,7 @@ func (s *MsgServerTestSuite) aliceEstimatesMultiHopSwap( ExitLimitPrice: exitLimitPrice, PickBestRoute: pickBest, } - res, err := s.queryClient.EstimateMultiHopSwap(s.goCtx, msg) + res, err := s.app.DexKeeper.EstimateMultiHopSwap(s.goCtx, msg) s.Require().Nil(err) return res.CoinOut } @@ -940,7 +934,7 @@ func (s *MsgServerTestSuite) aliceEstimatesMultiHopSwapFails( ExitLimitPrice: exitLimitPrice, PickBestRoute: pickBest, } - _, err := s.queryClient.EstimateMultiHopSwap(s.goCtx, msg) + _, err := s.app.DexKeeper.EstimateMultiHopSwap(s.goCtx, msg) s.Assert().ErrorIs(err, expectedErr) } diff --git a/x/epochs/keeper/abci_test.go b/x/epochs/keeper/abci_test.go index 44304ae11..2afb5b739 100644 --- a/x/epochs/keeper/abci_test.go +++ b/x/epochs/keeper/abci_test.go @@ -7,7 +7,7 @@ import ( tmproto "github.com/cometbft/cometbft/proto/tendermint/types" "github.com/stretchr/testify/require" - "github.com/neutron-org/neutron/app" + "github.com/neutron-org/neutron/testutil" "github.com/neutron-org/neutron/x/epochs/types" "golang.org/x/exp/maps" @@ -239,7 +239,7 @@ func initializeBlankEpochInfoFields( } func TestEpochStartingOneMonthAfterInitGenesis(t *testing.T) { - app := app.Setup(t, false) + app := testutil.Setup(t, false) ctx := app.BaseApp.NewContext(false, tmproto.Header{}) // On init genesis, default epochs information is set diff --git a/x/epochs/keeper/genesis_test.go b/x/epochs/keeper/genesis_test.go index 574632ad3..8c0fa9973 100644 --- a/x/epochs/keeper/genesis_test.go +++ b/x/epochs/keeper/genesis_test.go @@ -7,12 +7,12 @@ import ( tmproto "github.com/cometbft/cometbft/proto/tendermint/types" "github.com/stretchr/testify/require" - "github.com/neutron-org/neutron/app" + "github.com/neutron-org/neutron/testutil" "github.com/neutron-org/neutron/x/epochs/types" ) func TestEpochsExportGenesis(t *testing.T) { - app := app.Setup(t, false) + app := testutil.Setup(t, false) ctx := app.BaseApp.NewContext(false, tmproto.Header{}) chainStartTime := ctx.BlockTime() @@ -31,7 +31,7 @@ func TestEpochsExportGenesis(t *testing.T) { } func TestEpochsInitGenesis(t *testing.T) { - app := app.Setup(t, false) + app := testutil.Setup(t, false) ctx := app.BaseApp.NewContext(false, tmproto.Header{}) // On init genesis, default epochs information is set diff --git a/x/gmp/ibc_middleware.go b/x/gmp/ibc_middleware.go index 4d28b23b2..62e7a7286 100644 --- a/x/gmp/ibc_middleware.go +++ b/x/gmp/ibc_middleware.go @@ -7,7 +7,6 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" - transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" porttypes "github.com/cosmos/ibc-go/v7/modules/core/05-port/types" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" @@ -96,7 +95,7 @@ func (im IBCMiddleware) OnRecvPacket( packet channeltypes.Packet, relayer sdk.AccAddress, ) ibcexported.Acknowledgement { - var data transfertypes.FungibleTokenPacketData + var data types.FungibleTokenPacketData if err := types.ModuleCdc.UnmarshalJSON(packet.GetData(), &data); err != nil { return channeltypes.NewErrorAcknowledgement(fmt.Errorf("cannot unmarshal ICS-20 transfer packet data")) } diff --git a/x/ibcswap/types/swap_test.go b/x/ibcswap/types/swap_test.go index f64a70a01..01368e6bf 100644 --- a/x/ibcswap/types/swap_test.go +++ b/x/ibcswap/types/swap_test.go @@ -1,4 +1,4 @@ -package types +package types_test import ( "encoding/json" @@ -6,14 +6,17 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" forwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router/types" - appparams "github.com/neutron-org/neutron/app/params" - "github.com/neutron-org/neutron/x/dex/types" "github.com/iancoleman/orderedmap" + "github.com/neutron-org/neutron/app" + "github.com/neutron-org/neutron/testutil/common/sample" + "github.com/neutron-org/neutron/x/dex/types" + . "github.com/neutron-org/neutron/x/ibcswap/types" "github.com/stretchr/testify/require" ) -// Load appparams so that we correctly init acc prefixes -var _ appparams.EncodingConfig +func init() { + _ = app.GetDefaultConfig() +} // TestPacketMetadata_Marshal asserts that the marshaling of the swap metadata works as intended. func TestPacketMetadata_Marshal(t *testing.T) { @@ -97,8 +100,8 @@ func TestSwapMetadata_ValidatePass(t *testing.T) { pm := PacketMetadata{ &SwapMetadata{ MsgPlaceLimitOrder: &types.MsgPlaceLimitOrder{ - Creator: "dual1lyaz7emmzreenas4fpz49a49958kye7wxuvsdr", - Receiver: "dual1lyaz7emmzreenas4fpz49a49958kye7wxuvsdr", + Creator: sample.AccAddress(), + Receiver: sample.AccAddress(), TokenIn: "token-a", TokenOut: "token-b", AmountIn: sdk.NewInt(123), diff --git a/x/incentives/keeper/distributor_test.go b/x/incentives/keeper/distributor_test.go index a7b0f9895..a1b6f0c42 100644 --- a/x/incentives/keeper/distributor_test.go +++ b/x/incentives/keeper/distributor_test.go @@ -6,7 +6,7 @@ import ( tmtypes "github.com/cometbft/cometbft/proto/tendermint/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/app" + "github.com/neutron-org/neutron/testutil" dextypes "github.com/neutron-org/neutron/x/dex/types" . "github.com/neutron-org/neutron/x/incentives/keeper" "github.com/neutron-org/neutron/x/incentives/types" @@ -44,7 +44,7 @@ func (k MockKeeper) StakeCoinsPassingQueryCondition(ctx sdk.Context, stake *type } func TestDistributor(t *testing.T) { - app := app.Setup(t, false) + app := testutil.Setup(t, false) ctx := app.BaseApp.NewContext( false, tmtypes.Header{Height: 1, ChainID: "duality-1", Time: time.Now().UTC()}, diff --git a/x/incentives/keeper/utils_test.go b/x/incentives/keeper/utils_test.go index 95172abc0..32b72b3fd 100644 --- a/x/incentives/keeper/utils_test.go +++ b/x/incentives/keeper/utils_test.go @@ -8,7 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/neutron-org/neutron/app" + "github.com/neutron-org/neutron/testutil" dextypes "github.com/neutron-org/neutron/x/dex/types" . "github.com/neutron-org/neutron/x/incentives/keeper" "github.com/neutron-org/neutron/x/incentives/types" @@ -68,7 +68,7 @@ func TestRemoveValue(t *testing.T) { func TestStakeRefKeys(t *testing.T) { addr1 := sdk.AccAddress([]byte("addr1---------------")) - app := app.Setup(t, false) + app := testutil.Setup(t, false) ctx := app.BaseApp.NewContext(false, tmproto.Header{}) pool1, err := app.DexKeeper.InitPool(ctx, &dextypes.PairID{Token0: "TokenA", Token1: "TokenB"}, 0, 1) diff --git a/x/incentives/types/expected_keepers.go b/x/incentives/types/expected_keepers.go index ca9921a99..4e11a97ff 100644 --- a/x/incentives/types/expected_keepers.go +++ b/x/incentives/types/expected_keepers.go @@ -2,7 +2,6 @@ package types import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - "github.com/neutron-org/neutron/x/dex/types" dextypes "github.com/neutron-org/neutron/x/dex/types" epochstypes "github.com/neutron-org/neutron/x/epochs/types" @@ -29,6 +28,6 @@ type AccountKeeper interface { } type DexKeeper interface { - GetOrInitPool(ctx sdk.Context, pairID *types.PairID, centerTickIndex int64, fee uint64) (*dextypes.Pool, error) - GetPoolMetadataByDenom(ctx sdk.Context, id string) (types.PoolMetadata, error) + GetOrInitPool(ctx sdk.Context, pairID *dextypes.PairID, centerTickIndex int64, fee uint64) (*dextypes.Pool, error) + GetPoolMetadataByDenom(ctx sdk.Context, id string) (dextypes.PoolMetadata, error) } From f5e47be586733a013e2f16d0707cfb12fa55ba9d Mon Sep 17 00:00:00 2001 From: Julian Compagni Portis Date: Fri, 29 Sep 2023 12:38:02 -0400 Subject: [PATCH 176/307] downgrade packet-forward-middleware the version of packet-forward-middleware being used by neutron breaks duality's swap-and-forward middleware due to a change in how receiever addresses are handled. --- go.mod | 4 +++- go.sum | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 0a6c7f1ca..1f0796f6d 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,9 @@ require ( github.com/cosmos/cosmos-sdk v0.47.5 github.com/cosmos/gaia/v11 v11.0.0-00010101000000-000000000000 github.com/cosmos/gogoproto v1.4.10 - github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.0-20230803181732-7c8f814d3b79 + // TEMP: Using this version to support duality swap-and-forward + github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.0-20230629164013-34f5e666f806 + // github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.0-20230803181732-7c8f814d3b79 github.com/cosmos/ibc-go/v7 v7.2.0 github.com/cosmos/ics23/go v0.10.0 github.com/cosmos/interchain-security/v3 v3.1.0 diff --git a/go.sum b/go.sum index 1d2952b0f..524231754 100644 --- a/go.sum +++ b/go.sum @@ -399,8 +399,8 @@ github.com/cosmos/gogoproto v1.4.10 h1:QH/yT8X+c0F4ZDacDv3z+xE3WU1P1Z3wQoLMBRJoK github.com/cosmos/gogoproto v1.4.10/go.mod h1:3aAZzeRWpAwr+SS/LLkICX2/kDFyaYVzckBDzygIxek= github.com/cosmos/iavl v0.20.0 h1:fTVznVlepH0KK8NyKq8w+U7c2L6jofa27aFX6YGlm38= github.com/cosmos/iavl v0.20.0/go.mod h1:WO7FyvaZJoH65+HFOsDir7xU9FWk2w9cHXNW1XHcl7A= -github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.0-20230803181732-7c8f814d3b79 h1:n+PjYB3JnbKN+sGmX6khST4xMP+D0UdrMNj7O91fuOg= -github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.0-20230803181732-7c8f814d3b79/go.mod h1:fctjEnz9xaBFOlmYYPdKL8Hs1Y3GUKilSwsJdqBb5QU= +github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.0-20230629164013-34f5e666f806 h1:iFWb/KrnP5jthNZ23l72wqE8nzHJHzoVe22giUfJce8= +github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.0-20230629164013-34f5e666f806/go.mod h1:fctjEnz9xaBFOlmYYPdKL8Hs1Y3GUKilSwsJdqBb5QU= github.com/cosmos/ibc-go/v7 v7.2.0 h1:dx0DLUl7rxdyZ8NiT6UsrbzKOJx/w7s+BOaewFRH6cg= github.com/cosmos/ibc-go/v7 v7.2.0/go.mod h1:OOcjKIRku/j1Xs1RgKK0yvKRrJ5iFuZYMetR1n3yMlc= github.com/cosmos/ics23/go v0.10.0 h1:iXqLLgp2Lp+EdpIuwXTYIQU+AiHj9mOC2X9ab++bZDM= From 6380617d97f609d360cf080b6629d5d44cc39961 Mon Sep 17 00:00:00 2001 From: Julian Compagni Portis Date: Tue, 10 Oct 2023 16:21:34 -0400 Subject: [PATCH 177/307] add dex, incentives and epochs modules to storeUpgrades keys --- app/upgrades/nextupgrade/constants.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/upgrades/nextupgrade/constants.go b/app/upgrades/nextupgrade/constants.go index e082115a3..142f65a92 100644 --- a/app/upgrades/nextupgrade/constants.go +++ b/app/upgrades/nextupgrade/constants.go @@ -6,6 +6,9 @@ import ( crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types" "github.com/neutron-org/neutron/app/upgrades" auctiontypes "github.com/skip-mev/block-sdk/x/auction/types" + dextypes "github.com/neutron-org/neutron/x/dex/types" + epochstypes "github.com/neutron-org/neutron/x/epochs/types" + incentivestypes "github.com/neutron-org/neutron/x/incentives/types" ) const ( @@ -21,6 +24,9 @@ var Upgrade = upgrades.Upgrade{ consensusparamtypes.ModuleName, crisistypes.ModuleName, auctiontypes.ModuleName, + dextypes.ModuleName, + incentivestypes.ModuleName, + epochstypes.ModuleName, }, }, } From 21672837cebbc7c368f81b6a4801685ef1e9a543 Mon Sep 17 00:00:00 2001 From: Julian Compagni Portis Date: Tue, 10 Oct 2023 16:52:56 -0400 Subject: [PATCH 178/307] change dex params to kv store --- app/app.go | 4 +- proto/neutron/dex/tx.proto | 22 ++ testutil/dex/keeper/dex.go | 15 +- x/dex/genesis.go | 5 +- x/dex/keeper/keeper.go | 18 +- x/dex/keeper/msg_server.go | 19 + x/dex/keeper/params.go | 19 +- x/dex/types/keys.go | 3 + x/dex/types/message_update_params.go | 41 ++ x/dex/types/tx.pb.go | 558 +++++++++++++++++++++++---- 10 files changed, 596 insertions(+), 108 deletions(-) create mode 100644 x/dex/types/message_update_params.go diff --git a/app/app.go b/app/app.go index 389d3d8ba..203e711e5 100644 --- a/app/app.go +++ b/app/app.go @@ -636,8 +636,8 @@ func New( appCodec, keys[dextypes.StoreKey], keys[dextypes.MemStoreKey], - app.GetSubspace(dextypes.ModuleName), app.BankKeeper, + authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String(), ) dexModule := dex.NewAppModule(appCodec, app.DexKeeper, app.BankKeeper) @@ -655,12 +655,10 @@ func New( app.IncentivesKeeper = incentiveskeeper.NewKeeper( keys[incentivestypes.StoreKey], - app.GetSubspace(incentivestypes.ModuleName), app.AccountKeeper, app.BankKeeper, app.EpochsKeeper, app.DexKeeper, - // JCP TODO: confirm this is correct authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String(), ) diff --git a/proto/neutron/dex/tx.proto b/proto/neutron/dex/tx.proto index 7fca574b3..538a0e96c 100644 --- a/proto/neutron/dex/tx.proto +++ b/proto/neutron/dex/tx.proto @@ -7,6 +7,10 @@ option go_package = "github.com/neutron-org/neutron/x/dex/types"; import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.proto"; import "google/protobuf/timestamp.proto"; +import "amino/amino.proto"; +import "neutron/dex/params.proto"; +import "cosmos/msg/v1/msg.proto"; +import "cosmos_proto/cosmos.proto"; // Msg defines the Msg service. service Msg { @@ -16,6 +20,7 @@ service Msg { rpc WithdrawFilledLimitOrder(MsgWithdrawFilledLimitOrder) returns (MsgWithdrawFilledLimitOrderResponse); rpc CancelLimitOrder(MsgCancelLimitOrder) returns (MsgCancelLimitOrderResponse); rpc MultiHopSwap(MsgMultiHopSwap) returns (MsgMultiHopSwapResponse); + rpc UpdateParams(MsgUpdateParams) returns (MsgUpdateParamsResponse); // this line is used by starport scaffolding # proto/tx/rpc } @@ -183,4 +188,21 @@ message MsgMultiHopSwapResponse { ]; } +message MsgUpdateParams { + option (amino.name) = "dex/MsgUpdateParams"; + option (cosmos.msg.v1.signer) = "authority"; + + // Authority is the address of the governance account. + string authority = 1 [ (cosmos_proto.scalar) = "cosmos.AddressString" ]; + 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 {} + + // this line is used by starport scaffolding # proto/tx/message diff --git a/testutil/dex/keeper/dex.go b/testutil/dex/keeper/dex.go index 65c078c17..530139c2f 100644 --- a/testutil/dex/keeper/dex.go +++ b/testutil/dex/keeper/dex.go @@ -6,12 +6,13 @@ import ( cmdb "github.com/cometbft/cometbft-db" "github.com/cometbft/cometbft/libs/log" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + adminmoduletypes "github.com/cosmos/admin-module/x/adminmodule/types" "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" "github.com/cosmos/cosmos-sdk/store" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - typesparams "github.com/cosmos/cosmos-sdk/x/params/types" + authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" "github.com/neutron-org/neutron/x/dex/keeper" "github.com/neutron-org/neutron/x/dex/types" "github.com/stretchr/testify/require" @@ -30,24 +31,20 @@ func DexKeeper(t testing.TB) (*keeper.Keeper, sdk.Context) { registry := codectypes.NewInterfaceRegistry() cdc := codec.NewProtoCodec(registry) - paramsSubspace := typesparams.NewSubspace(cdc, - types.Amino, - storeKey, - memStoreKey, - "DexParams", - ) k := keeper.NewKeeper( cdc, storeKey, memStoreKey, - paramsSubspace, nil, + authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String(), ) ctx := sdk.NewContext(stateStore, tmproto.Header{}, false, log.NewNopLogger()) // Initialize params - k.SetParams(ctx, types.DefaultParams()) + if err := k.SetParams(ctx, types.DefaultParams()); err != nil { + panic(err) + } return k, ctx } diff --git a/x/dex/genesis.go b/x/dex/genesis.go index d0d9ff1b2..8d1fbb5f2 100644 --- a/x/dex/genesis.go +++ b/x/dex/genesis.go @@ -36,7 +36,10 @@ func InitGenesis(ctx sdk.Context, k keeper.Keeper, genState types.GenesisState) // Set poolMetadata count k.SetPoolCount(ctx, genState.PoolCount) // this line is used by starport scaffolding # genesis/module/init - k.SetParams(ctx, genState.Params) + err := k.SetParams(ctx, genState.Params) + if err != nil { + panic(err) + } } // ExportGenesis returns the capability module's exported genesis. diff --git a/x/dex/keeper/keeper.go b/x/dex/keeper/keeper.go index 082084f62..52f04cf34 100644 --- a/x/dex/keeper/keeper.go +++ b/x/dex/keeper/keeper.go @@ -8,7 +8,6 @@ import ( "github.com/cosmos/cosmos-sdk/codec" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" "github.com/neutron-org/neutron/x/dex/types" ) @@ -17,9 +16,8 @@ type ( cdc codec.BinaryCodec storeKey storetypes.StoreKey memKey storetypes.StoreKey - paramstore paramtypes.Subspace - bankKeeper types.BankKeeper + authority string } ) @@ -27,24 +25,22 @@ func NewKeeper( cdc codec.BinaryCodec, storeKey, memKey storetypes.StoreKey, - ps paramtypes.Subspace, - bankKeeper types.BankKeeper, + authority string, ) *Keeper { - // set KeyTable if it has not already been set - if !ps.HasKeyTable() { - ps = ps.WithKeyTable(types.ParamKeyTable()) - } - return &Keeper{ cdc: cdc, storeKey: storeKey, memKey: memKey, - paramstore: ps, bankKeeper: bankKeeper, + authority: authority, } } func (k Keeper) Logger(ctx sdk.Context) log.Logger { return ctx.Logger().With("module", fmt.Sprintf("x/%s", types.ModuleName)) } + +func (k Keeper) GetAuthority() string { + return k.authority +} diff --git a/x/dex/keeper/msg_server.go b/x/dex/keeper/msg_server.go index 1f36797b0..f9b84fdc6 100644 --- a/x/dex/keeper/msg_server.go +++ b/x/dex/keeper/msg_server.go @@ -3,7 +3,9 @@ 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/x/dex/types" ) @@ -181,3 +183,20 @@ func (k MsgServer) MultiHopSwap( return &types.MsgMultiHopSwapResponse{CoinOut: coinOut}, nil } + +func (k MsgServer) UpdateParams(goCtx context.Context, req *types.MsgUpdateParams) (*types.MsgUpdateParamsResponse, error) { + if err := req.ValidateBasic(); err != nil { + return nil, err + } + 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/dex/keeper/params.go b/x/dex/keeper/params.go index 4e37fd76f..9b13ebbae 100644 --- a/x/dex/keeper/params.go +++ b/x/dex/keeper/params.go @@ -7,11 +7,24 @@ import ( // GetParams get all parameters as types.Params func (k Keeper) GetParams(ctx sdk.Context) (params types.Params) { - k.paramstore.GetParamSet(ctx, ¶ms) + store := ctx.KVStore(k.storeKey) + bz := store.Get(types.KeyPrefix(types.ParamsKey)) + if bz == nil { + return params + } + + k.cdc.MustUnmarshal(bz, ¶ms) return params } // SetParams set the params -func (k Keeper) SetParams(ctx sdk.Context, params types.Params) { - k.paramstore.SetParamSet(ctx, ¶ms) +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.KeyPrefix(types.ParamsKey), bz) + return nil } diff --git a/x/dex/types/keys.go b/x/dex/types/keys.go index a00a6b0bf..dbefbf132 100644 --- a/x/dex/types/keys.go +++ b/x/dex/types/keys.go @@ -46,6 +46,9 @@ const ( // PoolCountKeyPrefix is the prefix to retrieve the Pool count PoolCountKeyPrefix = "Pool/count/" + + // ParamsKey is the prefix to retrieve params + ParamsKey = "Params/value/" ) func KeyPrefix(p string) []byte { diff --git a/x/dex/types/message_update_params.go b/x/dex/types/message_update_params.go new file mode 100644 index 000000000..750b98a16 --- /dev/null +++ b/x/dex/types/message_update_params.go @@ -0,0 +1,41 @@ +package types + +import ( + errorsmod "cosmossdk.io/errors" + sdk "github.com/cosmos/cosmos-sdk/types" +) + +const TypeMsgUpdateParams = "update-params" + +var _ sdk.Msg = &MsgUpdateParams{} + +func (msg *MsgUpdateParams) Route() string { + return RouterKey +} + +func (msg *MsgUpdateParams) Type() string { + return TypeMsgUpdateParams +} + +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 { + bz := ModuleCdc.MustMarshalJSON(msg) + return sdk.MustSortJSON(bz) +} + +func (msg *MsgUpdateParams) ValidateBasic() error { + if _, err := sdk.AccAddressFromBech32(msg.Authority); err != nil { + return errorsmod.Wrap(err, "authority is invalid") + } + if err := msg.Params.Validate(); err != nil { + return err + } + return nil +} diff --git a/x/dex/types/tx.pb.go b/x/dex/types/tx.pb.go index 8503e97e5..5ce055a62 100644 --- a/x/dex/types/tx.pb.go +++ b/x/dex/types/tx.pb.go @@ -6,8 +6,11 @@ package types import ( context "context" fmt "fmt" + _ "github.com/cosmos/cosmos-proto" _ "github.com/cosmos/cosmos-sdk/types" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" + _ "github.com/cosmos/cosmos-sdk/types/msgservice" + _ "github.com/cosmos/cosmos-sdk/types/tx/amino" _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" @@ -840,6 +843,99 @@ func (m *MsgMultiHopSwapResponse) XXX_DiscardUnknown() { var xxx_messageInfo_MsgMultiHopSwapResponse proto.InternalMessageInfo +type MsgUpdateParams struct { + // Authority is the address of the governance account. + Authority string `protobuf:"bytes,1,opt,name=authority,proto3" json:"authority,omitempty"` + 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_a489f6e187d5e074, []int{14} +} +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_a489f6e187d5e074, []int{15} +} +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.RegisterEnum("neutron.dex.LimitOrderType", LimitOrderType_name, LimitOrderType_value) proto.RegisterType((*DepositOptions)(nil), "neutron.dex.DepositOptions") @@ -856,92 +952,104 @@ func init() { proto.RegisterType((*MultiHopRoute)(nil), "neutron.dex.MultiHopRoute") proto.RegisterType((*MsgMultiHopSwap)(nil), "neutron.dex.MsgMultiHopSwap") proto.RegisterType((*MsgMultiHopSwapResponse)(nil), "neutron.dex.MsgMultiHopSwapResponse") + proto.RegisterType((*MsgUpdateParams)(nil), "neutron.dex.MsgUpdateParams") + proto.RegisterType((*MsgUpdateParamsResponse)(nil), "neutron.dex.MsgUpdateParamsResponse") } func init() { proto.RegisterFile("neutron/dex/tx.proto", fileDescriptor_a489f6e187d5e074) } var fileDescriptor_a489f6e187d5e074 = []byte{ - // 1269 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0xcd, 0x8f, 0xdb, 0x44, - 0x14, 0x5f, 0xc7, 0x69, 0xb2, 0xfb, 0xf6, 0x2b, 0x9d, 0x7e, 0xac, 0x71, 0x21, 0x8e, 0xdc, 0x42, - 0x43, 0xa5, 0x3a, 0xdd, 0x45, 0x1c, 0x28, 0xa7, 0x78, 0x77, 0x0b, 0x6e, 0x93, 0xa6, 0x72, 0x53, - 0x2a, 0x40, 0x22, 0xf2, 0x3a, 0xd3, 0xc4, 0xda, 0xc4, 0x63, 0x79, 0x26, 0xdb, 0xec, 0x81, 0x03, - 0x57, 0x04, 0x52, 0x2f, 0x9c, 0x7a, 0xe2, 0x7f, 0x40, 0xe2, 0xc0, 0x3f, 0xd0, 0x63, 0x25, 0x2e, - 0x88, 0x43, 0x40, 0xed, 0xad, 0xc7, 0xfd, 0x0b, 0x90, 0x3f, 0x63, 0x3b, 0xdd, 0x6e, 0xd3, 0x02, - 0xa7, 0xcc, 0xbc, 0xf7, 0x9b, 0xdf, 0x7b, 0xf3, 0xe6, 0x7d, 0x38, 0x70, 0xd6, 0xc6, 0x23, 0xe6, - 0x12, 0xbb, 0xd6, 0xc5, 0xe3, 0x1a, 0x1b, 0x2b, 0x8e, 0x4b, 0x18, 0x41, 0xcb, 0xa1, 0x54, 0xe9, - 0xe2, 0xb1, 0x78, 0xb6, 0x47, 0x7a, 0xc4, 0x97, 0xd7, 0xbc, 0x55, 0x00, 0x11, 0xcb, 0x26, 0xa1, - 0x43, 0x42, 0x6b, 0x7b, 0x06, 0xc5, 0xb5, 0x83, 0xcd, 0x3d, 0xcc, 0x8c, 0xcd, 0x9a, 0x49, 0x2c, - 0x3b, 0xd4, 0x4b, 0x3d, 0x42, 0x7a, 0x03, 0x5c, 0xf3, 0x77, 0x7b, 0xa3, 0x07, 0x35, 0x66, 0x0d, - 0x31, 0x65, 0xc6, 0xd0, 0x09, 0x00, 0xf2, 0xa7, 0xb0, 0xb6, 0x83, 0x1d, 0x42, 0x2d, 0xd6, 0x72, - 0x98, 0x45, 0x6c, 0x8a, 0x3e, 0x84, 0x52, 0xd7, 0xa2, 0xc6, 0xde, 0x00, 0x77, 0x8c, 0x11, 0x23, - 0xf4, 0xa1, 0xe1, 0x08, 0x5c, 0x85, 0xab, 0x2e, 0xea, 0xeb, 0xa1, 0xbc, 0x1e, 0x8a, 0xe5, 0xdf, - 0x78, 0x80, 0x26, 0xed, 0x85, 0x04, 0x48, 0x80, 0xa2, 0xe9, 0x62, 0x83, 0x11, 0xd7, 0x3f, 0xb0, - 0xa4, 0x47, 0x5b, 0x24, 0xc2, 0xa2, 0x8b, 0x4d, 0x6c, 0x1d, 0x60, 0x57, 0xc8, 0xf9, 0xaa, 0x78, - 0x8f, 0xce, 0x43, 0x81, 0x91, 0x7d, 0x6c, 0xd7, 0x05, 0xde, 0xd7, 0x84, 0xbb, 0x58, 0xae, 0x0a, - 0xf9, 0x84, 0x5c, 0x45, 0x7d, 0x58, 0x34, 0x86, 0x64, 0x64, 0x33, 0x5a, 0x17, 0x4e, 0x55, 0xf8, - 0xea, 0x92, 0xda, 0x78, 0x32, 0x91, 0x16, 0xfe, 0x9c, 0x48, 0x1f, 0xf4, 0x2c, 0xd6, 0x1f, 0xed, - 0x29, 0x26, 0x19, 0xd6, 0xc2, 0xb8, 0x04, 0x3f, 0x57, 0x69, 0x77, 0xbf, 0xc6, 0x0e, 0x1d, 0x4c, - 0x15, 0xcd, 0x66, 0x2f, 0x26, 0x52, 0x31, 0x60, 0xa8, 0x1f, 0x4d, 0xa4, 0xf5, 0x43, 0x63, 0x38, - 0xb8, 0x2e, 0x47, 0x94, 0xb2, 0x1e, 0xb3, 0x27, 0x2c, 0xa9, 0x42, 0xe1, 0xed, 0x2c, 0xa9, 0x33, - 0x96, 0xd4, 0xa9, 0x25, 0x15, 0x55, 0x61, 0x9d, 0x59, 0xe6, 0xbe, 0x66, 0x77, 0xf1, 0x18, 0xd3, - 0x7a, 0x9b, 0xa8, 0x42, 0xb1, 0xc2, 0x57, 0x79, 0x3d, 0x2b, 0x46, 0x08, 0xf2, 0x0f, 0x30, 0xa6, - 0xc2, 0x62, 0x85, 0xaf, 0xe6, 0x75, 0x7f, 0x8d, 0x3e, 0x86, 0x62, 0xf8, 0x78, 0xc2, 0x52, 0x85, - 0xaf, 0x2e, 0x6f, 0x5d, 0x50, 0x12, 0x99, 0xa3, 0xa4, 0xdf, 0x57, 0x8f, 0xb0, 0xf2, 0x2f, 0x39, - 0x40, 0xd3, 0xd7, 0xd3, 0x31, 0x75, 0x88, 0x4d, 0x31, 0xfa, 0x91, 0x83, 0xd3, 0x3a, 0xa6, 0xd8, - 0x3d, 0xc0, 0xd7, 0x42, 0x1d, 0xee, 0x0a, 0x9c, 0x7f, 0xff, 0xce, 0xdc, 0xf7, 0x3f, 0xed, 0x66, - 0xa9, 0x8e, 0x26, 0x92, 0x10, 0x44, 0x62, 0x46, 0x25, 0xeb, 0xb3, 0x96, 0x93, 0xfe, 0x6c, 0x4e, - 0xfd, 0xc9, 0xbd, 0xa5, 0x3f, 0x9b, 0xc7, 0xfb, 0xb3, 0xf9, 0x12, 0x7f, 0x12, 0xb2, 0x5f, 0x73, - 0xb0, 0xda, 0xa4, 0xbd, 0xfb, 0x16, 0xeb, 0x77, 0x5d, 0xe3, 0xa1, 0x31, 0xf8, 0x9f, 0xf2, 0xfe, - 0x3b, 0x0e, 0xd6, 0x68, 0xdf, 0x70, 0x31, 0x6d, 0x13, 0x1d, 0x0f, 0xc9, 0x01, 0x0e, 0xd3, 0xff, - 0xcb, 0xb9, 0x83, 0x90, 0xe1, 0x39, 0x9a, 0x48, 0xe7, 0x82, 0x08, 0xa4, 0xe5, 0xb2, 0x9e, 0x01, - 0xbe, 0x2c, 0x4f, 0x0b, 0xaf, 0xce, 0xd3, 0xe2, 0x34, 0x4f, 0xe5, 0x0d, 0x38, 0x97, 0x0a, 0x5c, - 0x94, 0x72, 0xf2, 0xe3, 0xbc, 0x9f, 0x89, 0x77, 0x06, 0x86, 0x89, 0x1b, 0xd6, 0xd0, 0x62, 0x2d, - 0xb7, 0x8b, 0xdd, 0x37, 0x8c, 0xab, 0x00, 0x45, 0x3f, 0x62, 0x9a, 0x1d, 0x06, 0x36, 0xda, 0x7a, - 0xa7, 0xfc, 0x65, 0x6b, 0xc4, 0xc2, 0xd8, 0xc6, 0x7b, 0x74, 0x05, 0x4a, 0xf1, 0x15, 0x34, 0xbb, - 0x4d, 0x3c, 0xcc, 0xa9, 0x0a, 0x57, 0xe5, 0xf5, 0x19, 0x39, 0xb2, 0xa2, 0xbe, 0xa0, 0xd9, 0x42, - 0xd1, 0xe3, 0x51, 0x9b, 0x73, 0x3f, 0x41, 0xcc, 0x90, 0x6d, 0x0c, 0x9a, 0x1d, 0x37, 0x06, 0xcd, - 0x46, 0x9f, 0xc0, 0x12, 0xf1, 0x62, 0xd1, 0x3e, 0x74, 0xb0, 0xb0, 0x58, 0xe1, 0xaa, 0x6b, 0x99, - 0xe2, 0x9e, 0x86, 0xcb, 0x83, 0xe8, 0x53, 0x34, 0x6a, 0xc0, 0x1a, 0x1e, 0x3b, 0x96, 0x6b, 0x78, - 0xd5, 0xde, 0xb6, 0x86, 0x58, 0x58, 0xaa, 0x70, 0xd5, 0xe5, 0x2d, 0x51, 0x09, 0x66, 0x82, 0x12, - 0xcd, 0x04, 0xa5, 0x1d, 0xcd, 0x04, 0x75, 0xf1, 0xc9, 0x44, 0xe2, 0x1e, 0xfd, 0x25, 0x71, 0x7a, - 0xe6, 0x2c, 0x3a, 0x84, 0x95, 0xa1, 0x31, 0xae, 0xfb, 0x7e, 0x79, 0xb1, 0x01, 0xff, 0xde, 0xf7, - 0x3c, 0xfc, 0x5c, 0xf7, 0x4e, 0xb1, 0x1c, 0x4d, 0xa4, 0x33, 0xc1, 0xdd, 0x93, 0x52, 0x59, 0x4f, - 0x81, 0xe4, 0xdf, 0x73, 0x20, 0xce, 0x66, 0x47, 0xdc, 0xaf, 0xca, 0x00, 0xcc, 0x35, 0x6c, 0xb3, - 0x8f, 0x6f, 0xe1, 0xc3, 0x30, 0x51, 0x12, 0x12, 0xf4, 0x2d, 0x14, 0xbc, 0x81, 0xa8, 0xd9, 0x7e, - 0xa6, 0x2c, 0x6f, 0xbd, 0xa3, 0x04, 0xae, 0x29, 0xde, 0xcc, 0x54, 0xc2, 0x99, 0xa9, 0x6c, 0x13, - 0xcb, 0x56, 0x6f, 0x86, 0xcf, 0x78, 0xf9, 0x35, 0xae, 0xe3, 0x1d, 0x78, 0x31, 0x91, 0x42, 0xee, - 0xa3, 0x89, 0xb4, 0x1a, 0xdc, 0x24, 0xd8, 0xcb, 0x7a, 0xa8, 0x40, 0x3f, 0x71, 0xb0, 0xc2, 0x8c, - 0x7d, 0xec, 0x7a, 0x07, 0xbc, 0xc8, 0xf1, 0x27, 0x79, 0xf1, 0xc5, 0xfc, 0x5e, 0xa4, 0x2c, 0x4c, - 0xa3, 0x9a, 0x94, 0xca, 0x7a, 0x0a, 0x24, 0xdf, 0x87, 0x0b, 0x89, 0x62, 0xbc, 0x61, 0x0d, 0x06, - 0xb8, 0xfb, 0x5a, 0xb5, 0x97, 0x8e, 0x77, 0x2e, 0x1b, 0x6f, 0xf9, 0x7d, 0xb8, 0xf8, 0x0a, 0xe2, - 0xb8, 0xe6, 0x5b, 0x70, 0xa6, 0x49, 0x7b, 0xdb, 0x86, 0x6d, 0xe2, 0xc1, 0xbf, 0x62, 0xf7, 0x3d, - 0xff, 0x42, 0x59, 0xc2, 0xd8, 0xde, 0x45, 0x58, 0x6d, 0x8e, 0x06, 0xcc, 0xfa, 0x9c, 0x38, 0x3a, - 0x19, 0x31, 0xec, 0x75, 0xa8, 0x3e, 0x71, 0x68, 0x30, 0xd9, 0x74, 0x7f, 0x2d, 0x3f, 0xe6, 0x61, - 0xbd, 0x49, 0x7b, 0x11, 0xf0, 0xee, 0x43, 0xc3, 0x79, 0xc3, 0x2e, 0xb4, 0x05, 0x05, 0xd7, 0x33, - 0x43, 0x05, 0xde, 0x1f, 0xc9, 0x62, 0xaa, 0x6a, 0x53, 0x9e, 0xe8, 0x21, 0x32, 0xd5, 0x57, 0xf2, - 0xff, 0x6d, 0x5f, 0xf9, 0x81, 0xf3, 0xba, 0x83, 0xc5, 0xfc, 0x40, 0xdd, 0x71, 0x2d, 0x13, 0xfb, - 0xdd, 0x6e, 0x49, 0xed, 0x86, 0x16, 0x37, 0x13, 0x16, 0x43, 0xcf, 0xaf, 0x12, 0xb7, 0x17, 0xad, - 0x6b, 0x23, 0x66, 0x0d, 0x68, 0x6d, 0x68, 0xb0, 0xbe, 0x72, 0xc7, 0xc5, 0xe6, 0x0e, 0x36, 0xbd, - 0xb9, 0x92, 0xa6, 0x9c, 0xce, 0x95, 0xb4, 0x5c, 0xd6, 0x33, 0x40, 0x74, 0x09, 0x56, 0x1d, 0xcb, - 0xdc, 0x57, 0x31, 0x65, 0x7e, 0x48, 0x84, 0x82, 0xff, 0xc1, 0x99, 0x16, 0xca, 0xdf, 0x73, 0xb0, - 0x91, 0x79, 0x9d, 0xb8, 0x0b, 0x10, 0x28, 0x9a, 0x61, 0x81, 0x71, 0x27, 0x15, 0xd8, 0xf5, 0xf9, - 0x0b, 0x2c, 0x22, 0xd7, 0xa3, 0xc5, 0x95, 0x31, 0xac, 0xa5, 0x7b, 0x2f, 0x3a, 0x0f, 0xe8, 0xb3, - 0x56, 0x6b, 0xa7, 0xd3, 0xd6, 0x1a, 0x9d, 0xed, 0xfa, 0xed, 0xed, 0xdd, 0x46, 0x63, 0x77, 0xa7, - 0xb4, 0x80, 0x4a, 0xb0, 0x72, 0x43, 0x6b, 0x34, 0x3a, 0x2d, 0xbd, 0x73, 0x4b, 0x6b, 0x34, 0x4a, - 0x1c, 0xda, 0x80, 0x33, 0x5a, 0xb3, 0xb9, 0xbb, 0xa3, 0xd5, 0xdb, 0xbb, 0x9e, 0x38, 0x40, 0x97, - 0x72, 0x1e, 0xf4, 0xe6, 0xbd, 0xbb, 0xed, 0x8e, 0x76, 0xbb, 0xd3, 0xd6, 0x9a, 0xbb, 0x25, 0x1e, - 0x9d, 0x86, 0xd5, 0x98, 0xd4, 0x17, 0xe5, 0xb7, 0x7e, 0xce, 0x03, 0xdf, 0xa4, 0x3d, 0xb4, 0x0d, - 0xc5, 0xe8, 0xcb, 0x7b, 0x23, 0x9d, 0x5d, 0xf1, 0x47, 0x9d, 0x28, 0x1d, 0xa3, 0x88, 0xe3, 0xd6, - 0x00, 0x48, 0x7c, 0xc9, 0x88, 0x59, 0xf8, 0x54, 0x27, 0xca, 0xc7, 0xeb, 0x62, 0xb6, 0xaf, 0x61, - 0x3d, 0x3b, 0xc4, 0x67, 0x3c, 0xc8, 0x00, 0xc4, 0xcb, 0x27, 0x00, 0x62, 0xf2, 0x03, 0x10, 0x8e, - 0x6d, 0x57, 0xd5, 0xe3, 0x9c, 0xcb, 0x22, 0xc5, 0x6b, 0xaf, 0x8b, 0x8c, 0xed, 0x7e, 0x03, 0xa5, - 0x99, 0x36, 0x55, 0xc9, 0xb2, 0x64, 0x11, 0x62, 0xf5, 0x24, 0x44, 0xcc, 0xaf, 0xc3, 0x4a, 0xaa, - 0xe1, 0xbc, 0x9b, 0x3d, 0x99, 0xd4, 0x8a, 0x97, 0x5e, 0xa5, 0x8d, 0x38, 0xd5, 0x9d, 0x27, 0xcf, - 0xca, 0xdc, 0xd3, 0x67, 0x65, 0xee, 0xef, 0x67, 0x65, 0xee, 0xd1, 0xf3, 0xf2, 0xc2, 0xd3, 0xe7, - 0xe5, 0x85, 0x3f, 0x9e, 0x97, 0x17, 0xbe, 0xba, 0x72, 0x42, 0x61, 0x8f, 0x83, 0xff, 0xa0, 0x5e, - 0xf2, 0xef, 0x15, 0xfc, 0x4f, 0x84, 0x8f, 0xfe, 0x09, 0x00, 0x00, 0xff, 0xff, 0x56, 0x20, 0xd3, - 0x20, 0x9f, 0x0e, 0x00, 0x00, + // 1425 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0xcf, 0x8f, 0xd3, 0xc6, + 0x17, 0x5f, 0x27, 0x21, 0xd9, 0xcc, 0xfe, 0xca, 0xce, 0x02, 0x6b, 0xc2, 0xf7, 0x9b, 0x44, 0x86, + 0x2f, 0xe4, 0xbb, 0x12, 0x09, 0xd9, 0xaa, 0x48, 0xa5, 0xa7, 0x78, 0x77, 0x69, 0x0d, 0x09, 0x59, + 0x99, 0x50, 0xd4, 0x56, 0x6a, 0xe4, 0x75, 0x86, 0xc4, 0xda, 0xd8, 0x63, 0x79, 0x26, 0x4b, 0xf6, + 0xd0, 0x43, 0x7b, 0x44, 0xad, 0xc4, 0xa5, 0x27, 0xfe, 0x81, 0xf6, 0xc6, 0x01, 0xa9, 0x87, 0xfe, + 0x03, 0x1c, 0x51, 0x7b, 0xa9, 0x7a, 0x48, 0x2b, 0x38, 0x20, 0x71, 0x5c, 0xa9, 0xf7, 0xca, 0xe3, + 0xb1, 0x63, 0x3b, 0x2c, 0xcb, 0x42, 0xdb, 0x4b, 0x32, 0xf3, 0xde, 0x67, 0x3e, 0xef, 0xcd, 0x9b, + 0x37, 0xef, 0x8d, 0xc1, 0x49, 0x0b, 0x0d, 0xa9, 0x83, 0xad, 0x6a, 0x17, 0x8d, 0xaa, 0x74, 0x54, + 0xb1, 0x1d, 0x4c, 0x31, 0x9c, 0xe3, 0xd2, 0x4a, 0x17, 0x8d, 0xf2, 0x27, 0x7b, 0xb8, 0x87, 0x99, + 0xbc, 0xea, 0x8e, 0x3c, 0x48, 0xbe, 0xa0, 0x63, 0x62, 0x62, 0x52, 0xdd, 0xd1, 0x08, 0xaa, 0xee, + 0xd5, 0x76, 0x10, 0xd5, 0x6a, 0x55, 0x1d, 0x1b, 0x16, 0xd7, 0x17, 0x7b, 0x18, 0xf7, 0x06, 0xa8, + 0xca, 0x66, 0x3b, 0xc3, 0xbb, 0x55, 0x6a, 0x98, 0x88, 0x50, 0xcd, 0xb4, 0x39, 0x60, 0x59, 0x33, + 0x0d, 0x0b, 0x57, 0xd9, 0x2f, 0x17, 0x89, 0x61, 0x67, 0x6c, 0xcd, 0xd1, 0x4c, 0xc2, 0x35, 0xab, + 0xdc, 0x9a, 0x49, 0x7a, 0xd5, 0xbd, 0x9a, 0xfb, 0xc7, 0x15, 0x67, 0x3c, 0x45, 0xc7, 0xf3, 0xcf, + 0x9b, 0x78, 0x2a, 0xe9, 0x43, 0xb0, 0xb8, 0x89, 0x6c, 0x4c, 0x0c, 0xda, 0xb2, 0xa9, 0x81, 0x2d, + 0x02, 0xff, 0x0f, 0x72, 0x5d, 0x83, 0x68, 0x3b, 0x03, 0xd4, 0xd1, 0x86, 0x14, 0x93, 0x7b, 0x9a, + 0x2d, 0x0a, 0x25, 0xa1, 0x3c, 0xab, 0x2e, 0x71, 0x79, 0x9d, 0x8b, 0xa5, 0x9f, 0x92, 0x00, 0x34, + 0x49, 0x8f, 0x13, 0x40, 0x11, 0x64, 0x74, 0x07, 0x69, 0x14, 0x3b, 0x6c, 0x41, 0x56, 0xf5, 0xa7, + 0x30, 0x0f, 0x66, 0x1d, 0xa4, 0x23, 0x63, 0x0f, 0x39, 0x62, 0x82, 0xa9, 0x82, 0x39, 0x3c, 0x0d, + 0xd2, 0x14, 0xef, 0x22, 0xab, 0x2e, 0x26, 0x99, 0x86, 0xcf, 0x02, 0xb9, 0x2c, 0xa6, 0x42, 0x72, + 0x19, 0xf6, 0xc1, 0xac, 0x66, 0xe2, 0xa1, 0x45, 0x49, 0x5d, 0x3c, 0x51, 0x4a, 0x96, 0xb3, 0x72, + 0xe3, 0xc9, 0xb8, 0x38, 0xf3, 0xdb, 0xb8, 0x78, 0xa1, 0x67, 0xd0, 0xfe, 0x70, 0xa7, 0xa2, 0x63, + 0x93, 0x6f, 0x92, 0xff, 0x5d, 0x22, 0xdd, 0xdd, 0x2a, 0xdd, 0xb7, 0x11, 0xa9, 0x28, 0x16, 0x7d, + 0x39, 0x2e, 0x66, 0x3c, 0x86, 0xfa, 0xc1, 0xb8, 0xb8, 0xb4, 0xaf, 0x99, 0x83, 0xab, 0x92, 0x4f, + 0x29, 0xa9, 0x01, 0x7b, 0xc8, 0x92, 0x2c, 0xa6, 0xdf, 0xcd, 0x92, 0x3c, 0x65, 0x49, 0x9e, 0x58, + 0x92, 0x61, 0x19, 0x2c, 0x51, 0x43, 0xdf, 0x55, 0xac, 0x2e, 0x1a, 0x21, 0x52, 0x6f, 0x63, 0x59, + 0xcc, 0x94, 0x92, 0xe5, 0xa4, 0x1a, 0x17, 0x43, 0x08, 0x52, 0x77, 0x11, 0x22, 0xe2, 0x6c, 0x29, + 0x59, 0x4e, 0xa9, 0x6c, 0x0c, 0xdf, 0x07, 0x19, 0x7e, 0x78, 0x62, 0xb6, 0x94, 0x2c, 0xcf, 0xad, + 0x9f, 0xad, 0x84, 0x52, 0xb3, 0x12, 0x3d, 0x5f, 0xd5, 0xc7, 0x4a, 0x8f, 0x13, 0x00, 0x4e, 0x4e, + 0x4f, 0x45, 0xc4, 0xc6, 0x16, 0x41, 0xf0, 0x5b, 0x01, 0x2c, 0xab, 0x88, 0x20, 0x67, 0x0f, 0x5d, + 0xe6, 0x3a, 0xd4, 0x15, 0x05, 0xb6, 0xff, 0xce, 0xb1, 0xf7, 0xbf, 0xec, 0xc4, 0xa9, 0x0e, 0xc6, + 0x45, 0xd1, 0x8b, 0xc4, 0x94, 0x4a, 0x52, 0xa7, 0x2d, 0x87, 0xfd, 0xa9, 0x4d, 0xfc, 0x49, 0xbc, + 0xa3, 0x3f, 0xb5, 0xc3, 0xfd, 0xa9, 0xbd, 0xc2, 0x9f, 0x90, 0xec, 0xc7, 0x04, 0x58, 0x68, 0x92, + 0xde, 0x1d, 0x83, 0xf6, 0xbb, 0x8e, 0x76, 0x4f, 0x1b, 0xfc, 0x4b, 0x79, 0xff, 0x95, 0x00, 0x16, + 0x49, 0x5f, 0x73, 0x10, 0x69, 0x63, 0x15, 0x99, 0x78, 0x0f, 0xf1, 0xf4, 0xff, 0xf4, 0xd8, 0x41, + 0x88, 0xf1, 0x1c, 0x8c, 0x8b, 0xa7, 0xbc, 0x08, 0x44, 0xe5, 0x92, 0x1a, 0x03, 0xbe, 0x2a, 0x4f, + 0xd3, 0xaf, 0xcf, 0xd3, 0xcc, 0x24, 0x4f, 0xa5, 0x55, 0x70, 0x2a, 0x12, 0x38, 0x3f, 0xe5, 0xa4, + 0x87, 0x29, 0x96, 0x89, 0xdb, 0x03, 0x4d, 0x47, 0x0d, 0xc3, 0x34, 0x68, 0xcb, 0xe9, 0x22, 0xe7, + 0x2d, 0xe3, 0x2a, 0x82, 0x0c, 0x8b, 0x98, 0x62, 0xf1, 0xc0, 0xfa, 0x53, 0x77, 0x15, 0x1b, 0xb6, + 0x86, 0x94, 0xc7, 0x36, 0x98, 0xc3, 0x35, 0x90, 0x0b, 0xb6, 0xa0, 0x58, 0x6d, 0xec, 0x62, 0x4e, + 0x94, 0x84, 0x72, 0x52, 0x9d, 0x92, 0x43, 0xc3, 0xaf, 0x0b, 0x8a, 0x25, 0x66, 0x5c, 0x1e, 0xb9, + 0x79, 0xec, 0x23, 0x08, 0x18, 0xe2, 0x85, 0x41, 0xb1, 0x82, 0xc2, 0xa0, 0x58, 0xf0, 0x03, 0x90, + 0xc5, 0x6e, 0x2c, 0xda, 0xfb, 0x36, 0x12, 0x67, 0x4b, 0x42, 0x79, 0x31, 0x76, 0xb9, 0x27, 0xe1, + 0x72, 0x21, 0xea, 0x04, 0x0d, 0x1b, 0x60, 0x11, 0x8d, 0x6c, 0xc3, 0xd1, 0xdc, 0xdb, 0xde, 0x36, + 0x4c, 0x24, 0x66, 0x4b, 0x42, 0x79, 0x6e, 0x3d, 0x5f, 0xf1, 0x9a, 0x4e, 0xc5, 0x6f, 0x3a, 0x95, + 0xb6, 0xdf, 0x74, 0xe4, 0xd9, 0x27, 0xe3, 0xa2, 0xf0, 0xe0, 0xf7, 0xa2, 0xa0, 0xc6, 0xd6, 0xc2, + 0x7d, 0x30, 0x6f, 0x6a, 0xa3, 0x3a, 0xf3, 0xcb, 0x8d, 0x0d, 0x60, 0xfb, 0xbe, 0xed, 0xe2, 0x8f, + 0xb5, 0xef, 0x08, 0xcb, 0xc1, 0xb8, 0xb8, 0xe2, 0xed, 0x3d, 0x2c, 0x95, 0xd4, 0x08, 0x48, 0xfa, + 0x25, 0x01, 0xf2, 0xd3, 0xd9, 0x11, 0xd4, 0xab, 0x02, 0x00, 0xd4, 0xd1, 0x2c, 0xbd, 0x8f, 0x6e, + 0xa0, 0x7d, 0x9e, 0x28, 0x21, 0x09, 0xfc, 0x12, 0xa4, 0xdd, 0x8e, 0xab, 0x58, 0x2c, 0x53, 0xe6, + 0xd6, 0xcf, 0x54, 0x78, 0x03, 0x74, 0x9b, 0x72, 0x85, 0x37, 0xe5, 0xca, 0x06, 0x36, 0x2c, 0xf9, + 0x3a, 0x3f, 0xc6, 0x8b, 0x6f, 0xb0, 0x1d, 0x77, 0xc1, 0xcb, 0x71, 0x91, 0x73, 0x1f, 0x8c, 0x8b, + 0x0b, 0xde, 0x4e, 0xbc, 0xb9, 0xa4, 0x72, 0x05, 0xfc, 0x4e, 0x00, 0xf3, 0x54, 0xdb, 0x45, 0x8e, + 0xbb, 0xc0, 0x8d, 0x5c, 0xf2, 0x28, 0x2f, 0x3e, 0x39, 0xbe, 0x17, 0x11, 0x0b, 0x93, 0xa8, 0x86, + 0xa5, 0x92, 0x1a, 0x01, 0x49, 0x77, 0xc0, 0xd9, 0xd0, 0x65, 0xbc, 0x66, 0x0c, 0x06, 0xa8, 0xfb, + 0x46, 0x77, 0x2f, 0x1a, 0xef, 0x44, 0x3c, 0xde, 0xd2, 0xff, 0xc0, 0xb9, 0xd7, 0x10, 0x07, 0x77, + 0xbe, 0x05, 0x56, 0x9a, 0xa4, 0xb7, 0xa1, 0x59, 0x3a, 0x1a, 0xfc, 0x2d, 0x76, 0xff, 0xcb, 0x36, + 0x14, 0x27, 0x0c, 0xec, 0x9d, 0x03, 0x0b, 0xcd, 0xe1, 0x80, 0x1a, 0x1f, 0x63, 0x5b, 0xc5, 0x43, + 0x8a, 0xdc, 0x0a, 0xd5, 0xc7, 0x36, 0xf1, 0x3a, 0x9b, 0xca, 0xc6, 0xd2, 0xc3, 0x24, 0x58, 0x6a, + 0x92, 0x9e, 0x0f, 0xbc, 0x75, 0x4f, 0xb3, 0xdf, 0xb2, 0x0a, 0xad, 0x83, 0xb4, 0xe3, 0x9a, 0x21, + 0x62, 0x92, 0xb5, 0xe4, 0x7c, 0xe4, 0xd6, 0x46, 0x3c, 0x51, 0x39, 0x32, 0x52, 0x57, 0x52, 0xff, + 0x6c, 0x5d, 0xf9, 0x46, 0x70, 0xab, 0x83, 0x41, 0x59, 0xa0, 0xb6, 0x1d, 0x43, 0x47, 0xac, 0xda, + 0x65, 0xe5, 0x2e, 0xb7, 0x58, 0x0b, 0x59, 0xe4, 0x9e, 0x5f, 0xc2, 0x4e, 0xcf, 0x1f, 0x57, 0x87, + 0xd4, 0x18, 0x90, 0xaa, 0xa9, 0xd1, 0x7e, 0x65, 0xdb, 0x41, 0xfa, 0x26, 0xd2, 0xdd, 0xbe, 0x12, + 0xa5, 0x9c, 0xf4, 0x95, 0xa8, 0x5c, 0x52, 0x63, 0x40, 0x78, 0x1e, 0x2c, 0xd8, 0x86, 0xbe, 0x2b, + 0x23, 0x42, 0x59, 0x48, 0xc4, 0x34, 0x7b, 0x70, 0x46, 0x85, 0xd2, 0x7d, 0x01, 0xac, 0xc6, 0x4e, + 0x27, 0xa8, 0x02, 0x18, 0x64, 0x74, 0x7e, 0xc1, 0x84, 0xa3, 0x2e, 0xd8, 0xd5, 0xe3, 0x5f, 0x30, + 0x9f, 0x5c, 0xf5, 0x07, 0xd2, 0x0f, 0x02, 0x4b, 0x95, 0xdb, 0x76, 0x57, 0xa3, 0x68, 0x9b, 0x3d, + 0xc3, 0xe1, 0x15, 0x90, 0xd5, 0x86, 0xb4, 0x8f, 0x1d, 0x83, 0xf2, 0x4a, 0x24, 0x8b, 0x3f, 0x3f, + 0xbe, 0x74, 0x92, 0x7b, 0x52, 0xef, 0x76, 0x1d, 0x44, 0xc8, 0x2d, 0xea, 0x18, 0x56, 0x4f, 0x9d, + 0x40, 0xe1, 0x15, 0x90, 0xf6, 0x1e, 0xf2, 0xbc, 0x44, 0xad, 0x44, 0x92, 0xc5, 0x23, 0x97, 0xb3, + 0xae, 0xd7, 0xdf, 0xbf, 0x78, 0xb4, 0x26, 0xa8, 0x1c, 0x7d, 0xf5, 0xc2, 0xd7, 0x2f, 0x1e, 0xad, + 0x4d, 0x78, 0xee, 0xbf, 0x78, 0xb4, 0xb6, 0xe2, 0x7e, 0x15, 0xc4, 0xfc, 0x92, 0xce, 0xb0, 0xb8, + 0x85, 0x45, 0x7e, 0xdc, 0xd6, 0x46, 0x60, 0x31, 0xda, 0x42, 0xe0, 0x69, 0x00, 0x3f, 0x6a, 0xb5, + 0x36, 0x3b, 0x6d, 0xa5, 0xd1, 0xd9, 0xa8, 0xdf, 0xdc, 0xd8, 0x6a, 0x34, 0xb6, 0x36, 0x73, 0x33, + 0x30, 0x07, 0xe6, 0xaf, 0x29, 0x8d, 0x46, 0xa7, 0xa5, 0x76, 0x6e, 0x28, 0x8d, 0x46, 0x4e, 0x80, + 0xab, 0x60, 0x45, 0x69, 0x36, 0xb7, 0x36, 0x95, 0x7a, 0x7b, 0xcb, 0x15, 0x7b, 0xe8, 0x5c, 0xc2, + 0x85, 0x5e, 0xbf, 0x7d, 0xab, 0xdd, 0x51, 0x6e, 0x76, 0xda, 0x4a, 0x73, 0x2b, 0x97, 0x84, 0xcb, + 0x60, 0x21, 0x20, 0x65, 0xa2, 0xd4, 0xfa, 0x9f, 0x29, 0x90, 0x6c, 0x92, 0x1e, 0xdc, 0x00, 0x19, + 0xff, 0x03, 0x62, 0x35, 0x7a, 0x49, 0x82, 0xb7, 0x69, 0xbe, 0x78, 0x88, 0x22, 0x38, 0xfe, 0x06, + 0x00, 0xa1, 0x07, 0x59, 0x3e, 0x0e, 0x9f, 0xe8, 0xf2, 0xd2, 0xe1, 0xba, 0x80, 0xed, 0x73, 0xb0, + 0x14, 0x7f, 0x8b, 0x4c, 0x79, 0x10, 0x03, 0xe4, 0x2f, 0x1e, 0x01, 0x08, 0xc8, 0xf7, 0x80, 0x78, + 0x68, 0xd5, 0x2d, 0x1f, 0xe6, 0x5c, 0x1c, 0x99, 0xbf, 0xfc, 0xa6, 0xc8, 0xc0, 0xee, 0x17, 0x20, + 0x37, 0x55, 0x6d, 0x4b, 0x71, 0x96, 0x38, 0x22, 0x5f, 0x3e, 0x0a, 0x11, 0xf0, 0xab, 0x60, 0x3e, + 0x52, 0x37, 0xff, 0x13, 0x5f, 0x19, 0xd6, 0xe6, 0xcf, 0xbf, 0x4e, 0x1b, 0xe6, 0x8c, 0x5c, 0xb0, + 0x29, 0xce, 0xb0, 0x76, 0x9a, 0xf3, 0x55, 0x19, 0x2f, 0x6f, 0x3e, 0x79, 0x56, 0x10, 0x9e, 0x3e, + 0x2b, 0x08, 0x7f, 0x3c, 0x2b, 0x08, 0x0f, 0x9e, 0x17, 0x66, 0x9e, 0x3e, 0x2f, 0xcc, 0xfc, 0xfa, + 0xbc, 0x30, 0xf3, 0xd9, 0xda, 0x11, 0x35, 0x6f, 0xe4, 0x7d, 0xff, 0xbb, 0x75, 0x61, 0x27, 0xcd, + 0x5e, 0x4f, 0xef, 0xfd, 0x15, 0x00, 0x00, 0xff, 0xff, 0xba, 0xdd, 0x59, 0x72, 0x1b, 0x10, 0x00, + 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -962,6 +1070,7 @@ type MsgClient interface { WithdrawFilledLimitOrder(ctx context.Context, in *MsgWithdrawFilledLimitOrder, opts ...grpc.CallOption) (*MsgWithdrawFilledLimitOrderResponse, error) CancelLimitOrder(ctx context.Context, in *MsgCancelLimitOrder, opts ...grpc.CallOption) (*MsgCancelLimitOrderResponse, error) MultiHopSwap(ctx context.Context, in *MsgMultiHopSwap, opts ...grpc.CallOption) (*MsgMultiHopSwapResponse, error) + UpdateParams(ctx context.Context, in *MsgUpdateParams, opts ...grpc.CallOption) (*MsgUpdateParamsResponse, error) } type msgClient struct { @@ -1026,6 +1135,15 @@ func (c *msgClient) MultiHopSwap(ctx context.Context, in *MsgMultiHopSwap, opts return out, nil } +func (c *msgClient) UpdateParams(ctx context.Context, in *MsgUpdateParams, opts ...grpc.CallOption) (*MsgUpdateParamsResponse, error) { + out := new(MsgUpdateParamsResponse) + err := c.cc.Invoke(ctx, "/neutron.dex.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 { Deposit(context.Context, *MsgDeposit) (*MsgDepositResponse, error) @@ -1034,6 +1152,7 @@ type MsgServer interface { WithdrawFilledLimitOrder(context.Context, *MsgWithdrawFilledLimitOrder) (*MsgWithdrawFilledLimitOrderResponse, error) CancelLimitOrder(context.Context, *MsgCancelLimitOrder) (*MsgCancelLimitOrderResponse, error) MultiHopSwap(context.Context, *MsgMultiHopSwap) (*MsgMultiHopSwapResponse, error) + UpdateParams(context.Context, *MsgUpdateParams) (*MsgUpdateParamsResponse, error) } // UnimplementedMsgServer can be embedded to have forward compatible implementations. @@ -1058,6 +1177,9 @@ func (*UnimplementedMsgServer) CancelLimitOrder(ctx context.Context, req *MsgCan func (*UnimplementedMsgServer) MultiHopSwap(ctx context.Context, req *MsgMultiHopSwap) (*MsgMultiHopSwapResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method MultiHopSwap not implemented") } +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) @@ -1171,6 +1293,24 @@ func _Msg_MultiHopSwap_Handler(srv interface{}, ctx context.Context, dec func(in return interceptor(ctx, in, info, handler) } +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.dex.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.dex.Msg", HandlerType: (*MsgServer)(nil), @@ -1199,6 +1339,10 @@ var _Msg_serviceDesc = grpc.ServiceDesc{ MethodName: "MultiHopSwap", Handler: _Msg_MultiHopSwap_Handler, }, + { + MethodName: "UpdateParams", + Handler: _Msg_UpdateParams_Handler, + }, }, Streams: []grpc.StreamDesc{}, Metadata: "neutron/dex/tx.proto", @@ -1952,6 +2096,69 @@ func (m *MsgMultiHopSwapResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) return len(dAtA) - i, nil } +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 @@ -2273,6 +2480,30 @@ func (m *MsgMultiHopSwapResponse) Size() (n int) { return n } +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 } @@ -4522,6 +4753,171 @@ func (m *MsgMultiHopSwapResponse) Unmarshal(dAtA []byte) error { } return nil } +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 From 678a700597abd1ec7bf0ebd96558b5e91e2f2b1f Mon Sep 17 00:00:00 2001 From: Julian Compagni Portis Date: Tue, 10 Oct 2023 17:37:11 -0400 Subject: [PATCH 179/307] switch incentives to kvstore params --- proto/neutron/incentives/tx.proto | 24 +- x/incentives/keeper/keeper.go | 24 +- x/incentives/keeper/msg_server.go | 17 + x/incentives/keeper/params.go | 26 +- x/incentives/types/keys.go | 1 + x/incentives/types/msgs.go | 31 ++ x/incentives/types/tx.pb.go | 494 +++++++++++++++++++++++++++--- 7 files changed, 549 insertions(+), 68 deletions(-) diff --git a/proto/neutron/incentives/tx.proto b/proto/neutron/incentives/tx.proto index 8894133d9..b73c85719 100644 --- a/proto/neutron/incentives/tx.proto +++ b/proto/neutron/incentives/tx.proto @@ -7,6 +7,10 @@ import "cosmos/base/v1beta1/coin.proto"; import "neutron/incentives/gauge.proto"; import "neutron/incentives/stake.proto"; import "google/protobuf/duration.proto"; +import "amino/amino.proto"; +import "neutron/incentives/params.proto"; +import "cosmos/msg/v1/msg.proto"; +import "cosmos_proto/cosmos.proto"; option go_package = "github.com/neutron-org/neutron/x/incentives/types"; @@ -19,6 +23,8 @@ service Msg { rpc Stake(MsgStake) returns (MsgStakeResponse); // Withdraw LP tokens from the module, forfeiting future rewards from gauges rpc Unstake(MsgUnstake) returns (MsgUnstakeResponse); + // Update incentives params + rpc UpdateParams(MsgUpdateParams) returns (MsgUpdateParamsResponse); } // MsgCreateGauge creates a gague to distribute rewards to users @@ -93,4 +99,20 @@ message MsgUnstake { // If unstake is left empty, this is interpreted as "unstake all" repeated UnstakeDescriptor unstakes = 2; } -message MsgUnstakeResponse {} \ No newline at end of file +message MsgUnstakeResponse {} + +message MsgUpdateParams { + option (amino.name) = "dex/MsgUpdateParams"; + option (cosmos.msg.v1.signer) = "authority"; + + // Authority is the address of the governance account. + string authority = 1 [ (cosmos_proto.scalar) = "cosmos.AddressString" ]; + 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/x/incentives/keeper/keeper.go b/x/incentives/keeper/keeper.go index 0b8471250..f9fcfe12a 100644 --- a/x/incentives/keeper/keeper.go +++ b/x/incentives/keeper/keeper.go @@ -9,13 +9,11 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" ) // Keeper provides a way to manage incentives module storage. type Keeper struct { storeKey storetypes.StoreKey - paramSpace paramtypes.Subspace hooks types.IncentiveHooks ak types.AccountKeeper bk types.BankKeeper @@ -28,25 +26,19 @@ type Keeper struct { // NewKeeper returns a new instance of the incentive module keeper struct. func NewKeeper( storeKey storetypes.StoreKey, - paramSpace paramtypes.Subspace, ak types.AccountKeeper, bk types.BankKeeper, ek types.EpochKeeper, dk types.DexKeeper, authority string, ) *Keeper { - if !paramSpace.HasKeyTable() { - paramSpace = paramSpace.WithKeyTable(types.ParamKeyTable()) - } - keeper := &Keeper{ - storeKey: storeKey, - paramSpace: paramSpace, - ak: ak, - bk: bk, - ek: ek, - dk: dk, - authority: authority, + storeKey: storeKey, + ak: ak, + bk: bk, + ek: ek, + dk: dk, + authority: authority, } keeper.distributor = NewDistributor(keeper) return keeper @@ -79,3 +71,7 @@ func (k Keeper) GetModuleStakedCoins(ctx sdk.Context) sdk.Coins { // all not unstaking + not finished unstaking return k.GetStakes(ctx).GetCoins() } + +func (k Keeper) GetAuthority() string { + return k.authority +} diff --git a/x/incentives/keeper/msg_server.go b/x/incentives/keeper/msg_server.go index 6e7b3671e..c87730284 100644 --- a/x/incentives/keeper/msg_server.go +++ b/x/incentives/keeper/msg_server.go @@ -181,3 +181,20 @@ func (server msgServer) Unstake( // N.B. begin unstake event is emitted downstream in the keeper method. return &types.MsgUnstakeResponse{}, nil } + +func (server msgServer) UpdateParams(goCtx context.Context, req *types.MsgUpdateParams) (*types.MsgUpdateParamsResponse, error) { + if err := req.ValidateBasic(); err != nil { + return nil, err + } + authority := server.keeper.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 := server.keeper.SetParams(ctx, req.Params); err != nil { + return nil, err + } + + return &types.MsgUpdateParamsResponse{}, nil +} diff --git a/x/incentives/keeper/params.go b/x/incentives/keeper/params.go index de175190f..9a684f11c 100644 --- a/x/incentives/keeper/params.go +++ b/x/incentives/keeper/params.go @@ -1,18 +1,34 @@ package keeper import ( - "github.com/neutron-org/neutron/x/incentives/types" - sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/gogoproto/proto" + "github.com/neutron-org/neutron/x/incentives/types" ) // GetParams returns all of the parameters in the incentive module. func (k Keeper) GetParams(ctx sdk.Context) (params types.Params) { - k.paramSpace.GetParamSet(ctx, ¶ms) + store := ctx.KVStore(k.storeKey) + bz := store.Get(types.KeyParams) + if bz == nil { + return params + } + + if err := proto.Unmarshal(bz, ¶ms); err != nil { + panic(err) + } + return params } // SetParams sets all of the parameters in the incentive module. -func (k Keeper) SetParams(ctx sdk.Context, params types.Params) { - k.paramSpace.SetParamSet(ctx, ¶ms) +func (k Keeper) SetParams(ctx sdk.Context, params types.Params) error { + store := ctx.KVStore(k.storeKey) + bz, err := proto.Marshal(¶ms) + if err != nil { + return err + } + + store.Set(types.KeyParams, bz) + return nil } diff --git a/x/incentives/types/keys.go b/x/incentives/types/keys.go index 08bde69a9..7afce2652 100644 --- a/x/incentives/types/keys.go +++ b/x/incentives/types/keys.go @@ -74,6 +74,7 @@ var ( // KeyPrefixAccountHistory defines the prefix for storing account histories. KeyPrefixAccountHistory = []byte{0x10} + KeyParams = []byte{0x11} // KeyndexSeparator defines separator between keys when combine, it should be one that is not used in denom expression. KeyIndexSeparator = []byte{0xFF} ) diff --git a/x/incentives/types/msgs.go b/x/incentives/types/msgs.go index bc4ba01d9..8bdba513b 100644 --- a/x/incentives/types/msgs.go +++ b/x/incentives/types/msgs.go @@ -4,6 +4,7 @@ import ( "fmt" "time" + errorsmod "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" dextypes "github.com/neutron-org/neutron/x/dex/types" @@ -14,6 +15,7 @@ const ( TypeMsgAddToGauge = "add_to_gauge" TypeMsgStakeTokens = "stake_tokens" TypeMsgBeginUnstaking = "begin_unstaking" + TypeMsgUpdateParams = "update-params" ) var _ sdk.Msg = &MsgCreateGauge{} @@ -228,3 +230,32 @@ func (m MsgUnstake) GetSigners() []sdk.AccAddress { owner, _ := sdk.AccAddressFromBech32(m.Owner) return []sdk.AccAddress{owner} } + +var _ sdk.Msg = &MsgUpdateParams{} + +func (msg *MsgUpdateParams) Route() string { return RouterKey } + +func (msg *MsgUpdateParams) Type() string { return TypeMsgUpdateParams } + +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 { + bz := ModuleCdc.MustMarshalJSON(msg) + return sdk.MustSortJSON(bz) +} + +func (msg *MsgUpdateParams) ValidateBasic() error { + if _, err := sdk.AccAddressFromBech32(msg.Authority); err != nil { + return errorsmod.Wrap(err, "authority is invalid") + } + if err := msg.Params.Validate(); err != nil { + return err + } + return nil +} diff --git a/x/incentives/types/tx.pb.go b/x/incentives/types/tx.pb.go index 5043cc76e..6dba41aa9 100644 --- a/x/incentives/types/tx.pb.go +++ b/x/incentives/types/tx.pb.go @@ -6,8 +6,11 @@ package types import ( context "context" fmt "fmt" + _ "github.com/cosmos/cosmos-proto" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" types "github.com/cosmos/cosmos-sdk/types" + _ "github.com/cosmos/cosmos-sdk/types/msgservice" + _ "github.com/cosmos/cosmos-sdk/types/tx/amino" _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" @@ -514,6 +517,99 @@ func (m *MsgUnstakeResponse) XXX_DiscardUnknown() { var xxx_messageInfo_MsgUnstakeResponse proto.InternalMessageInfo +type MsgUpdateParams struct { + // Authority is the address of the governance account. + Authority string `protobuf:"bytes,1,opt,name=authority,proto3" json:"authority,omitempty"` + 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_5fe3d35711153e8d, []int{8} +} +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_5fe3d35711153e8d, []int{9} +} +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((*MsgCreateGauge)(nil), "neutron.incentives.MsgCreateGauge") proto.RegisterType((*MsgCreateGaugeResponse)(nil), "neutron.incentives.MsgCreateGaugeResponse") @@ -524,59 +620,71 @@ func init() { proto.RegisterType((*MsgUnstake)(nil), "neutron.incentives.MsgUnstake") proto.RegisterType((*MsgUnstake_UnstakeDescriptor)(nil), "neutron.incentives.MsgUnstake.UnstakeDescriptor") proto.RegisterType((*MsgUnstakeResponse)(nil), "neutron.incentives.MsgUnstakeResponse") + proto.RegisterType((*MsgUpdateParams)(nil), "neutron.incentives.MsgUpdateParams") + proto.RegisterType((*MsgUpdateParamsResponse)(nil), "neutron.incentives.MsgUpdateParamsResponse") } func init() { proto.RegisterFile("neutron/incentives/tx.proto", fileDescriptor_5fe3d35711153e8d) } var fileDescriptor_5fe3d35711153e8d = []byte{ - // 741 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x55, 0xcd, 0x4e, 0xdb, 0x4c, - 0x14, 0x8d, 0xf3, 0x43, 0xc2, 0x0d, 0x20, 0xb0, 0xf8, 0xbe, 0xcf, 0xf8, 0x43, 0x4e, 0xb0, 0x2a, - 0x94, 0x56, 0xc2, 0x06, 0xba, 0xeb, 0xae, 0x81, 0xaa, 0x42, 0x34, 0x2a, 0xb8, 0xa9, 0x2a, 0x21, - 0x55, 0x96, 0x63, 0x4f, 0xcd, 0x28, 0xc4, 0x63, 0xcd, 0x8c, 0x03, 0xbc, 0x40, 0x37, 0xdd, 0xb0, - 0xe9, 0x4b, 0xf4, 0x0d, 0xda, 0x27, 0x60, 0xc9, 0xb2, 0x2b, 0x40, 0xf0, 0x06, 0x3c, 0x41, 0xe5, - 0xdf, 0x84, 0xbf, 0xd0, 0x4a, 0x6d, 0x57, 0xb6, 0xe7, 0xdc, 0x7b, 0x72, 0xee, 0x39, 0xd7, 0x0e, - 0xfc, 0xef, 0xa1, 0x80, 0x53, 0xe2, 0xe9, 0xd8, 0xb3, 0x91, 0xc7, 0x71, 0x1f, 0x31, 0x9d, 0x1f, - 0x68, 0x3e, 0x25, 0x9c, 0x88, 0x62, 0x02, 0x6a, 0x03, 0x50, 0x9e, 0x75, 0x89, 0x4b, 0x22, 0x58, - 0x0f, 0xef, 0xe2, 0x4a, 0xb9, 0xe6, 0x12, 0xe2, 0xee, 0x21, 0x3d, 0x7a, 0xea, 0x04, 0x1f, 0x74, - 0x8e, 0x7b, 0x88, 0x71, 0xab, 0xe7, 0x27, 0x05, 0x8a, 0x4d, 0x58, 0x8f, 0x30, 0xbd, 0x63, 0x31, - 0xa4, 0xf7, 0x57, 0x3a, 0x88, 0x5b, 0x2b, 0xba, 0x4d, 0xb0, 0x97, 0xe2, 0x77, 0xe8, 0x70, 0xad, - 0xc0, 0x45, 0x23, 0x70, 0xc6, 0xad, 0x6e, 0x86, 0xdf, 0x14, 0xe0, 0x04, 0xd4, 0xe2, 0x98, 0x24, - 0xfc, 0xea, 0xb7, 0x02, 0x4c, 0xb5, 0x98, 0xbb, 0x46, 0x91, 0xc5, 0xd1, 0xcb, 0x90, 0x58, 0x5c, - 0x80, 0x09, 0xcc, 0x4c, 0x1f, 0x51, 0x1f, 0xf1, 0xc0, 0xda, 0x93, 0x84, 0xba, 0xd0, 0xa8, 0x18, - 0x55, 0xcc, 0xb6, 0xd2, 0x23, 0x71, 0x11, 0x4a, 0x64, 0xdf, 0x43, 0x54, 0xca, 0xd7, 0x85, 0xc6, - 0x78, 0x73, 0xfa, 0xea, 0xb4, 0x36, 0x71, 0x68, 0xf5, 0xf6, 0x9e, 0xa9, 0xd1, 0xb1, 0x6a, 0xc4, - 0xb0, 0xd8, 0x82, 0x49, 0x07, 0x33, 0x4e, 0x71, 0x27, 0xe0, 0xc8, 0xe4, 0x44, 0x2a, 0xd4, 0x85, - 0x46, 0x75, 0x55, 0xd5, 0x6e, 0x1b, 0xa8, 0x6d, 0x07, 0x88, 0x1e, 0xae, 0x11, 0xcf, 0xc1, 0xa1, - 0xbc, 0x66, 0xf1, 0xf8, 0xb4, 0x96, 0x33, 0x26, 0x06, 0xed, 0x6d, 0x22, 0x5a, 0x50, 0x0a, 0xad, - 0x61, 0x52, 0xb1, 0x5e, 0x68, 0x54, 0x57, 0xe7, 0xb4, 0xd8, 0x3c, 0x2d, 0x34, 0x4f, 0x4b, 0xcc, - 0xd3, 0xd6, 0x08, 0xf6, 0x9a, 0xcb, 0x61, 0xf7, 0x97, 0xb3, 0x5a, 0xc3, 0xc5, 0x7c, 0x37, 0xe8, - 0x68, 0x36, 0xe9, 0xe9, 0x89, 0xd3, 0xf1, 0x65, 0x89, 0x39, 0x5d, 0x9d, 0x1f, 0xfa, 0x88, 0x45, - 0x0d, 0xcc, 0x88, 0x99, 0xc5, 0x77, 0x00, 0x8c, 0x5b, 0x94, 0x9b, 0x61, 0x50, 0x52, 0x29, 0x92, - 0x2b, 0x6b, 0xb1, 0x89, 0x5a, 0x6a, 0xa2, 0xd6, 0x4e, 0x53, 0x6c, 0xce, 0x87, 0x3f, 0x74, 0x75, - 0x5a, 0x9b, 0x8e, 0xc7, 0xcf, 0xe2, 0x55, 0x8f, 0xce, 0x6a, 0x82, 0x31, 0x1e, 0x71, 0x85, 0xd5, - 0xa2, 0x0e, 0xb3, 0x5e, 0xd0, 0x33, 0x91, 0x4f, 0xec, 0x5d, 0x66, 0xfa, 0x16, 0x76, 0x4c, 0xd2, - 0x47, 0x54, 0x1a, 0xab, 0x0b, 0x8d, 0xa2, 0x31, 0xe3, 0x05, 0xbd, 0x17, 0x11, 0xb4, 0x65, 0x61, - 0xe7, 0x75, 0x1f, 0xd1, 0x30, 0x06, 0x9f, 0x62, 0x1b, 0x7b, 0xae, 0xc9, 0xb1, 0xdd, 0x95, 0xca, - 0x75, 0xa1, 0x51, 0x30, 0xaa, 0xc9, 0x59, 0x1b, 0xdb, 0x5d, 0x55, 0x82, 0x7f, 0xaf, 0x67, 0x67, - 0x20, 0xe6, 0x13, 0x8f, 0x21, 0xf5, 0xab, 0x00, 0x93, 0x2d, 0xe6, 0x3e, 0x77, 0x9c, 0x36, 0x89, - 0x53, 0xcd, 0x22, 0x13, 0x46, 0x47, 0x36, 0x07, 0x95, 0x68, 0xbf, 0x4c, 0xec, 0x44, 0xe9, 0x16, - 0x8d, 0x72, 0xf4, 0xbc, 0xe1, 0x88, 0x08, 0xca, 0x14, 0xed, 0x5b, 0xd4, 0x61, 0x52, 0xe1, 0xf7, - 0x07, 0x90, 0x72, 0xab, 0xff, 0xc1, 0x3f, 0xd7, 0xa4, 0x67, 0x43, 0x7d, 0x16, 0xa0, 0xd2, 0x62, - 0xee, 0x9b, 0x70, 0xbd, 0x7f, 0x7a, 0x9e, 0x6c, 0x67, 0xf2, 0x7f, 0x6a, 0x67, 0x54, 0x15, 0xa6, - 0x53, 0x59, 0xa9, 0x56, 0x71, 0x0a, 0xf2, 0x1b, 0xeb, 0x91, 0xb6, 0xa2, 0x91, 0xdf, 0x58, 0x57, - 0x3f, 0xe5, 0x01, 0x5a, 0xcc, 0x7d, 0xeb, 0xb1, 0x5f, 0x52, 0xff, 0x0a, 0x2a, 0x41, 0xdc, 0x92, - 0x0e, 0xb0, 0x7c, 0xd7, 0xbb, 0x33, 0x60, 0xd6, 0x92, 0xeb, 0x3a, 0x62, 0x36, 0xc5, 0x3e, 0x27, - 0xd4, 0xc8, 0x18, 0xe4, 0x8f, 0x02, 0xcc, 0xdc, 0xc2, 0x6f, 0x4a, 0xfd, 0x1b, 0x8e, 0xcd, 0x82, - 0x38, 0x90, 0x9c, 0x7a, 0xb6, 0x7a, 0x9e, 0x87, 0x42, 0x8b, 0xb9, 0xe2, 0x7b, 0xa8, 0x0e, 0x7f, - 0x8f, 0xd4, 0x7b, 0x26, 0x1e, 0xaa, 0x91, 0x9f, 0x3c, 0x5c, 0x93, 0x45, 0xb3, 0x03, 0x30, 0xf4, - 0x5e, 0x2c, 0xdc, 0xd3, 0x39, 0x28, 0x91, 0x1f, 0x3f, 0x58, 0x92, 0x71, 0x6f, 0x42, 0x29, 0x5e, - 0xcf, 0xf9, 0x7b, 0x7a, 0x22, 0x54, 0x7e, 0x34, 0x0a, 0xcd, 0xc8, 0xb6, 0xa1, 0x9c, 0xee, 0x8b, - 0x32, 0x3a, 0x75, 0x79, 0x71, 0x34, 0x9e, 0x52, 0x36, 0x37, 0x8f, 0x2f, 0x14, 0xe1, 0xe4, 0x42, - 0x11, 0xce, 0x2f, 0x14, 0xe1, 0xe8, 0x52, 0xc9, 0x9d, 0x5c, 0x2a, 0xb9, 0xef, 0x97, 0x4a, 0x6e, - 0x67, 0x65, 0x28, 0xc3, 0x84, 0x6b, 0x89, 0x50, 0x37, 0xbd, 0xd7, 0x0f, 0xae, 0xfd, 0x13, 0x86, - 0x91, 0x76, 0xc6, 0xa2, 0xef, 0xe1, 0xd3, 0x1f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x41, 0xec, 0xc5, - 0x1c, 0x2c, 0x07, 0x00, 0x00, + // 907 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0xcf, 0x6f, 0xdc, 0x44, + 0x18, 0x8d, 0x77, 0x37, 0xbf, 0xbe, 0x4d, 0x4b, 0x62, 0x02, 0x71, 0x4c, 0xe5, 0xdd, 0x1a, 0x14, + 0x2d, 0x41, 0xb1, 0x9b, 0x20, 0x71, 0xa8, 0xc4, 0xa1, 0x9b, 0x20, 0x14, 0x95, 0x15, 0xa9, 0x1b, + 0x84, 0x54, 0x09, 0x99, 0x59, 0x7b, 0x70, 0x46, 0x89, 0x3d, 0xd6, 0xcc, 0x78, 0x9b, 0x5c, 0x39, + 0x70, 0x80, 0x4b, 0x2f, 0xfc, 0x0f, 0x88, 0x53, 0x0e, 0x5c, 0xe0, 0xc8, 0xa9, 0xc7, 0x8a, 0x13, + 0xa7, 0x14, 0x25, 0x87, 0xdc, 0xfb, 0x17, 0xa0, 0x19, 0xff, 0xd8, 0x4d, 0x9a, 0x6c, 0x8b, 0x04, + 0x5c, 0x62, 0x7b, 0xde, 0xf7, 0x3d, 0xbf, 0x6f, 0xde, 0x1b, 0x67, 0xe1, 0x9d, 0x04, 0x67, 0x82, + 0xd1, 0xc4, 0x25, 0x49, 0x80, 0x13, 0x41, 0x06, 0x98, 0xbb, 0xe2, 0xd0, 0x49, 0x19, 0x15, 0x54, + 0xd7, 0x0b, 0xd0, 0x19, 0x82, 0xe6, 0x62, 0x44, 0x23, 0xaa, 0x60, 0x57, 0xde, 0xe5, 0x95, 0x66, + 0x2b, 0xa2, 0x34, 0x3a, 0xc0, 0xae, 0x7a, 0xea, 0x67, 0xdf, 0xb8, 0x82, 0xc4, 0x98, 0x0b, 0x14, + 0xa7, 0x45, 0x81, 0x15, 0x50, 0x1e, 0x53, 0xee, 0xf6, 0x11, 0xc7, 0xee, 0x60, 0xbd, 0x8f, 0x05, + 0x5a, 0x77, 0x03, 0x4a, 0x92, 0x12, 0xbf, 0x42, 0x47, 0x84, 0xb2, 0x08, 0x8f, 0xc1, 0xb9, 0x40, + 0xfb, 0x15, 0x7e, 0x59, 0x40, 0x98, 0x31, 0x24, 0x08, 0x2d, 0xf9, 0x17, 0x50, 0x4c, 0x12, 0xea, + 0xaa, 0xbf, 0xa5, 0xe6, 0x2b, 0x28, 0x53, 0xc4, 0x50, 0xcc, 0x8b, 0x82, 0xa5, 0x42, 0x73, 0xcc, + 0x23, 0x77, 0xb0, 0x2e, 0x2f, 0x05, 0xb0, 0x9c, 0x03, 0x7e, 0xbe, 0x0d, 0xf9, 0x43, 0x0e, 0xd9, + 0xbf, 0xd5, 0xe1, 0x66, 0x8f, 0x47, 0x9b, 0x0c, 0x23, 0x81, 0x3f, 0x95, 0x03, 0xe8, 0xb7, 0x61, + 0x8e, 0x70, 0x3f, 0xc5, 0x2c, 0xc5, 0x22, 0x43, 0x07, 0x86, 0xd6, 0xd6, 0x3a, 0x33, 0x5e, 0x93, + 0xf0, 0x9d, 0x72, 0x49, 0x5f, 0x81, 0x49, 0xfa, 0x38, 0xc1, 0xcc, 0xa8, 0xb5, 0xb5, 0xce, 0x6c, + 0x77, 0xfe, 0xc5, 0x49, 0x6b, 0xee, 0x08, 0xc5, 0x07, 0x77, 0x6d, 0xb5, 0x6c, 0x7b, 0x39, 0xac, + 0xf7, 0xe0, 0x46, 0x48, 0xb8, 0x60, 0xa4, 0x9f, 0x09, 0xec, 0x0b, 0x6a, 0xd4, 0xdb, 0x5a, 0xa7, + 0xb9, 0x61, 0x3b, 0x2f, 0x1b, 0xe5, 0x3c, 0xc8, 0x30, 0x3b, 0xda, 0xa4, 0x49, 0x48, 0xe4, 0x36, + 0x74, 0x1b, 0x4f, 0x4f, 0x5a, 0x13, 0xde, 0xdc, 0xb0, 0x7d, 0x97, 0xea, 0x08, 0x26, 0xa5, 0x05, + 0xdc, 0x68, 0xb4, 0xeb, 0x9d, 0xe6, 0xc6, 0xb2, 0x53, 0x8c, 0x22, 0x4d, 0x72, 0x0a, 0x93, 0x9c, + 0x4d, 0x4a, 0x92, 0xee, 0x1d, 0xd9, 0xfd, 0xf3, 0xf3, 0x56, 0x27, 0x22, 0x62, 0x2f, 0xeb, 0x3b, + 0x01, 0x8d, 0x8b, 0xb9, 0x8b, 0xcb, 0x1a, 0x0f, 0xf7, 0x5d, 0x71, 0x94, 0x62, 0xae, 0x1a, 0xb8, + 0x97, 0x33, 0xeb, 0x5f, 0x02, 0x70, 0x81, 0x98, 0xf0, 0x65, 0x20, 0x8c, 0x49, 0x25, 0xd7, 0x74, + 0x72, 0xb3, 0x9c, 0xd2, 0x2c, 0x67, 0xb7, 0x4c, 0x4b, 0xf7, 0x96, 0x7c, 0xd1, 0x8b, 0x93, 0xd6, + 0x7c, 0x3e, 0x7e, 0x15, 0x23, 0xfb, 0xc9, 0xf3, 0x96, 0xe6, 0xcd, 0x2a, 0x2e, 0x59, 0xad, 0xbb, + 0xb0, 0x98, 0x64, 0xb1, 0x8f, 0x53, 0x1a, 0xec, 0x71, 0x3f, 0x45, 0x24, 0xf4, 0xe9, 0x00, 0x33, + 0x63, 0xaa, 0xad, 0x75, 0x1a, 0xde, 0x42, 0x92, 0xc5, 0x9f, 0x28, 0x68, 0x07, 0x91, 0xf0, 0xf3, + 0x01, 0x66, 0xd2, 0x86, 0x94, 0x91, 0x80, 0x24, 0x91, 0x2f, 0x48, 0xb0, 0x6f, 0x4c, 0xb7, 0xb5, + 0x4e, 0xdd, 0x6b, 0x16, 0x6b, 0xbb, 0x24, 0xd8, 0xb7, 0x0d, 0x78, 0xfb, 0xa2, 0x77, 0x1e, 0xe6, + 0x29, 0x4d, 0x38, 0xb6, 0x7f, 0xd5, 0xe0, 0x46, 0x8f, 0x47, 0xf7, 0xc2, 0x70, 0x97, 0xe6, 0xae, + 0x56, 0x96, 0x69, 0xe3, 0x2d, 0x5b, 0x86, 0x19, 0x95, 0x63, 0x9f, 0x84, 0xca, 0xdd, 0x86, 0x37, + 0xad, 0x9e, 0xb7, 0x43, 0x1d, 0xc3, 0x34, 0xc3, 0x8f, 0x11, 0x0b, 0xb9, 0x51, 0xff, 0xf7, 0x0d, + 0x28, 0xb9, 0xed, 0x25, 0x78, 0xeb, 0x82, 0xf4, 0x6a, 0xa8, 0x1f, 0x35, 0x98, 0xe9, 0xf1, 0xe8, + 0xa1, 0x3c, 0x46, 0xaf, 0x3d, 0x4f, 0x95, 0x99, 0xda, 0x7f, 0x95, 0x19, 0xdb, 0x86, 0xf9, 0x52, + 0x56, 0xa9, 0x55, 0xbf, 0x09, 0xb5, 0xed, 0x2d, 0xa5, 0xad, 0xe1, 0xd5, 0xb6, 0xb7, 0xec, 0x1f, + 0x6a, 0x00, 0x3d, 0x1e, 0x7d, 0x91, 0xf0, 0x7f, 0xa4, 0xfe, 0x33, 0x98, 0xc9, 0xf2, 0x96, 0x72, + 0x80, 0x3b, 0x57, 0x9d, 0x9d, 0x21, 0xb3, 0x53, 0x5c, 0xb7, 0x30, 0x0f, 0x18, 0x49, 0x05, 0x65, + 0x5e, 0xc5, 0x60, 0x7e, 0xa7, 0xc1, 0xc2, 0x4b, 0xf8, 0x65, 0xa9, 0xff, 0xc7, 0x8e, 0x2d, 0x82, + 0x3e, 0x94, 0x5c, 0xf9, 0x7b, 0xac, 0xc1, 0x1b, 0x72, 0x39, 0x0d, 0x91, 0xc0, 0x3b, 0xea, 0xcb, + 0xa6, 0x7f, 0x04, 0xb3, 0x28, 0x13, 0x7b, 0x94, 0x11, 0x71, 0x54, 0x6c, 0x96, 0xf1, 0xc7, 0x2f, + 0x6b, 0x8b, 0x85, 0xa6, 0x7b, 0x61, 0xc8, 0x30, 0xe7, 0x0f, 0x05, 0x23, 0x49, 0xe4, 0x0d, 0x4b, + 0xf5, 0x8f, 0x61, 0x2a, 0xff, 0x36, 0xaa, 0x10, 0xcb, 0x33, 0x7c, 0xc5, 0xb6, 0xe5, 0xef, 0xe8, + 0xce, 0xca, 0x31, 0x7e, 0x3a, 0x3f, 0x5e, 0xd5, 0xbc, 0xa2, 0xe9, 0xee, 0xca, 0xb7, 0xe7, 0xc7, + 0xab, 0x43, 0xba, 0xef, 0xcf, 0x8f, 0x57, 0xdf, 0x0c, 0xf1, 0xa1, 0x7b, 0x49, 0x9e, 0xbd, 0x0c, + 0x4b, 0x97, 0x96, 0xca, 0x69, 0x36, 0x7e, 0xaf, 0x43, 0xbd, 0xc7, 0x23, 0xfd, 0x2b, 0x68, 0x8e, + 0x7e, 0x5d, 0xed, 0x6b, 0xfc, 0x1b, 0xa9, 0x31, 0x57, 0x5f, 0x5d, 0x53, 0x05, 0xed, 0x11, 0xc0, + 0xc8, 0x29, 0xbf, 0x7d, 0x4d, 0xe7, 0xb0, 0xc4, 0x7c, 0xff, 0x95, 0x25, 0x15, 0xf7, 0x7d, 0x98, + 0xcc, 0x0f, 0xdb, 0xad, 0x6b, 0x7a, 0x14, 0x6a, 0xbe, 0x37, 0x0e, 0xad, 0xc8, 0x1e, 0xc0, 0x74, + 0x99, 0x7e, 0x6b, 0x7c, 0x86, 0xcd, 0x95, 0xf1, 0x78, 0x45, 0xf9, 0x35, 0xcc, 0x5d, 0x08, 0xcb, + 0xbb, 0xd7, 0xf5, 0x8d, 0x14, 0x99, 0x1f, 0xbc, 0x46, 0x51, 0xf9, 0x86, 0xee, 0xfd, 0xa7, 0xa7, + 0x96, 0xf6, 0xec, 0xd4, 0xd2, 0xfe, 0x3a, 0xb5, 0xb4, 0x27, 0x67, 0xd6, 0xc4, 0xb3, 0x33, 0x6b, + 0xe2, 0xcf, 0x33, 0x6b, 0xe2, 0xd1, 0xfa, 0x48, 0xe6, 0x0b, 0xc2, 0x35, 0xca, 0xa2, 0xf2, 0xde, + 0x3d, 0xbc, 0xf0, 0x0b, 0x45, 0x1e, 0x81, 0xfe, 0x94, 0xfa, 0xff, 0xf1, 0xe1, 0xdf, 0x01, 0x00, + 0x00, 0xff, 0xff, 0x55, 0x20, 0x0f, 0x95, 0xc4, 0x08, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -599,6 +707,8 @@ type MsgClient interface { Stake(ctx context.Context, in *MsgStake, opts ...grpc.CallOption) (*MsgStakeResponse, error) // Withdraw LP tokens from the module, forfeiting future rewards from gauges Unstake(ctx context.Context, in *MsgUnstake, opts ...grpc.CallOption) (*MsgUnstakeResponse, error) + // Update incentives params + UpdateParams(ctx context.Context, in *MsgUpdateParams, opts ...grpc.CallOption) (*MsgUpdateParamsResponse, error) } type msgClient struct { @@ -645,6 +755,15 @@ func (c *msgClient) Unstake(ctx context.Context, in *MsgUnstake, opts ...grpc.Ca return out, nil } +func (c *msgClient) UpdateParams(ctx context.Context, in *MsgUpdateParams, opts ...grpc.CallOption) (*MsgUpdateParamsResponse, error) { + out := new(MsgUpdateParamsResponse) + err := c.cc.Invoke(ctx, "/neutron.incentives.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 { // Create an incentive program @@ -655,6 +774,8 @@ type MsgServer interface { Stake(context.Context, *MsgStake) (*MsgStakeResponse, error) // Withdraw LP tokens from the module, forfeiting future rewards from gauges Unstake(context.Context, *MsgUnstake) (*MsgUnstakeResponse, error) + // Update incentives params + UpdateParams(context.Context, *MsgUpdateParams) (*MsgUpdateParamsResponse, error) } // UnimplementedMsgServer can be embedded to have forward compatible implementations. @@ -673,6 +794,9 @@ func (*UnimplementedMsgServer) Stake(ctx context.Context, req *MsgStake) (*MsgSt func (*UnimplementedMsgServer) Unstake(ctx context.Context, req *MsgUnstake) (*MsgUnstakeResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Unstake not implemented") } +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) @@ -750,6 +874,24 @@ func _Msg_Unstake_Handler(srv interface{}, ctx context.Context, dec func(interfa return interceptor(ctx, in, info, handler) } +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.incentives.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.incentives.Msg", HandlerType: (*MsgServer)(nil), @@ -770,6 +912,10 @@ var _Msg_serviceDesc = grpc.ServiceDesc{ MethodName: "Unstake", Handler: _Msg_Unstake_Handler, }, + { + MethodName: "UpdateParams", + Handler: _Msg_UpdateParams_Handler, + }, }, Streams: []grpc.StreamDesc{}, Metadata: "neutron/incentives/tx.proto", @@ -1133,6 +1279,69 @@ func (m *MsgUnstakeResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } +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 @@ -1293,6 +1502,30 @@ func (m *MsgUnstakeResponse) Size() (n int) { return n } +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 } @@ -2228,6 +2461,171 @@ func (m *MsgUnstakeResponse) Unmarshal(dAtA []byte) error { } return nil } +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 From 7d06f9b7ca7c4c8054afa24583322d3af643bcda Mon Sep 17 00:00:00 2001 From: Julian Compagni Portis Date: Tue, 10 Oct 2023 19:06:34 -0400 Subject: [PATCH 180/307] start using "cosmossdk.io/math" --- tests/ibc/gmp_swap_forward_test.go | 10 +- tests/ibc/ibc_setup_test.go | 27 +-- tests/ibc/swap_forward_test.go | 44 ++--- tests/ibc/swap_test.go | 20 +- testutil/integration_test_setup.go | 2 +- utils/cli_helpers.go | 7 +- utils/dcli/parsers.go | 7 +- utils/dcli/parsers_test.go | 29 +-- utils/math/prec_dec.go | 24 ++- x/dex/client/cli/query_test.go | 48 ++--- x/dex/client/cli/tx_deposit.go | 10 +- x/dex/client/cli/tx_multi_hop_swap.go | 4 +- x/dex/client/cli/tx_place_limit_order.go | 8 +- x/dex/client/cli/tx_test.go | 12 +- x/dex/client/cli/tx_withdrawl.go | 6 +- x/dex/genesis_test.go | 30 +-- x/dex/keeper/core.go | 43 +++-- x/dex/keeper/core_helper.go | 3 +- x/dex/keeper/core_helper_test.go | 5 +- x/dex/keeper/deposit_record_test.go | 20 +- ...grpc_query_estimate_multi_hop_swap_test.go | 81 ++++---- x/dex/keeper/grpc_query_user_deposits_test.go | 11 +- .../integration_deposit_autoswap_unit_test.go | 4 +- .../integration_deposit_doublesided_test.go | 6 +- .../keeper/integration_deposit_multi_test.go | 4 +- x/dex/keeper/integration_multihopswap_test.go | 73 +++---- .../integration_placelimitorder_test.go | 4 +- .../keeper/integration_withdraw_multi_test.go | 8 +- x/dex/keeper/integration_withdraw_test.go | 4 +- .../keeper/internal/testutils/test_helpers.go | 5 +- x/dex/keeper/limit_order_expiration_test.go | 9 +- x/dex/keeper/limit_order_tranche.go | 9 +- x/dex/keeper/limit_order_tranche_user.go | 7 +- x/dex/keeper/limit_order_tranche_user_test.go | 25 +-- x/dex/keeper/liquidity.go | 15 +- x/dex/keeper/liquidity_test.go | 17 +- x/dex/keeper/msg_server_test.go | 149 +++++++------- x/dex/keeper/multihop_swap.go | 7 +- x/dex/keeper/pair_helper.go | 4 +- x/dex/keeper/pool_test.go | 5 +- x/dex/types/events.go | 27 +-- x/dex/types/limit_order_tranche.go | 37 ++-- x/dex/types/liquidity.go | 4 +- x/dex/types/message_deposit.go | 7 +- x/dex/types/message_deposit_test.go | 38 ++-- x/dex/types/message_multi_hop_swap.go | 5 +- x/dex/types/message_multi_hop_swap_test.go | 6 +- x/dex/types/message_place_limit_order.go | 7 +- x/dex/types/message_place_limit_order_test.go | 18 +- x/dex/types/message_withdrawl.go | 5 +- x/dex/types/message_withdrawl_test.go | 18 +- x/dex/types/pool.go | 61 +++--- x/dex/types/pool_liquidity.go | 8 +- x/dex/types/pool_reserves.go | 8 +- x/dex/types/pool_test.go | 182 +++++++++--------- x/dex/types/tick_liquidity_test.go | 10 +- x/dex/utils/math.go | 6 +- x/ibcswap/ibc_middleware.go | 3 +- x/ibcswap/keeper/keeper.go | 3 +- x/ibcswap/types/swap_test.go | 24 +-- x/incentives/client/cli/cli_test.go | 43 +++-- x/incentives/client/cli/query_test.go | 2 +- x/incentives/keeper/distribute.go | 12 +- x/incentives/keeper/distribute_test.go | 11 +- x/incentives/keeper/distributor.go | 9 +- x/incentives/keeper/distributor_test.go | 21 +- x/incentives/keeper/suite_test.go | 5 +- x/incentives/types/gauge.go | 3 +- x/incentives/types/gauge_test.go | 15 +- x/incentives/types/msgs_test.go | 15 +- 70 files changed, 727 insertions(+), 692 deletions(-) diff --git a/tests/ibc/gmp_swap_forward_test.go b/tests/ibc/gmp_swap_forward_test.go index 3048eea5c..fdf4a6075 100644 --- a/tests/ibc/gmp_swap_forward_test.go +++ b/tests/ibc/gmp_swap_forward_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "time" - sdk "github.com/cosmos/cosmos-sdk/types" + "cosmossdk.io/math" forwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router/types" transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" "github.com/neutron-org/neutron/x/dex/types" @@ -25,7 +25,7 @@ func (s *IBCTestSuite) TestGMPSwapAndForward_Success() { s.assertDualityBalance(s.dualityAddr, s.providerToDualityDenom, ibcTransferAmount) // deposit stake<>ibcTransferToken to initialize the pool on Duality - depositAmount := sdk.NewInt(100_000) + depositAmount := math.NewInt(100_000) s.dualityDeposit( nativeDenom, s.providerToDualityDenom, @@ -36,8 +36,8 @@ func (s *IBCTestSuite) TestGMPSwapAndForward_Success() { s.dualityAddr) // Compose the IBC transfer memo metadata to be used in the swap and forward - swapAmount := sdk.NewInt(100000) - expectedAmountOut := sdk.NewInt(99990) + swapAmount := math.NewInt(100000) + expectedAmountOut := math.NewInt(99990) chainBAddr := s.bundleB.Chain.SenderAccount.GetAddress() retries := uint8(0) @@ -99,7 +99,7 @@ func (s *IBCTestSuite) TestGMPSwapAndForward_Success() { s.assertProviderBalance(s.providerAddr, nativeDenom, newProviderBalNative.Sub(ibcTransferAmount)) // Check that the amountIn is deduced from the duality account - s.assertDualityBalance(s.dualityAddr, s.providerToDualityDenom, sdk.ZeroInt()) + s.assertDualityBalance(s.dualityAddr, s.providerToDualityDenom, math.ZeroInt()) // Check that duality account did not keep any of the transfer denom s.assertDualityBalance(s.dualityAddr, nativeDenom, genesisWalletAmount.Sub(swapAmount)) diff --git a/tests/ibc/ibc_setup_test.go b/tests/ibc/ibc_setup_test.go index 1daca621b..415aa36e1 100644 --- a/tests/ibc/ibc_setup_test.go +++ b/tests/ibc/ibc_setup_test.go @@ -5,6 +5,7 @@ import ( "fmt" "testing" + "cosmossdk.io/math" dbm "github.com/cometbft/cometbft-db" "github.com/cosmos/cosmos-sdk/testutil/sims" sdk "github.com/cosmos/cosmos-sdk/types" @@ -27,8 +28,8 @@ import ( var ( nativeDenom = sdk.DefaultBondDenom - ibcTransferAmount = sdk.NewInt(100_000) - genesisWalletAmount, _ = sdk.NewIntFromString("10000000000000000000") + ibcTransferAmount = math.NewInt(100_000) + genesisWalletAmount, _ = math.NewIntFromString("10000000000000000000") ) type IBCTestSuite struct { @@ -260,7 +261,7 @@ func (s *IBCTestSuite) IBCTransfer( fromAddr sdk.AccAddress, toAddr sdk.AccAddress, transferDenom string, - transferAmount sdk.Int, + transferAmount math.Int, memo string, ) { timeoutHeight := clienttypes.NewHeight(1, 110) @@ -292,7 +293,7 @@ func (s *IBCTestSuite) IBCTransferProviderToDuality( providerAddr sdk.AccAddress, dualityAddr sdk.AccAddress, transferDenom string, - transferAmount sdk.Int, + transferAmount math.Int, memo string, ) { s.IBCTransfer( @@ -321,7 +322,7 @@ func (s *IBCTestSuite) assertBalance( chain *icsibctesting.TestChain, addr sdk.AccAddress, denom string, - expectedAmt sdk.Int, + expectedAmt math.Int, ) { actualAmt := s.getBalance(bk, chain, addr, denom).Amount s.Assert(). @@ -331,7 +332,7 @@ func (s *IBCTestSuite) assertBalance( func (s *IBCTestSuite) assertDualityBalance( addr sdk.AccAddress, denom string, - expectedAmt sdk.Int, + expectedAmt math.Int, ) { s.assertBalance(s.dualityApp.GetTestBankKeeper(), s.dualityChain, addr, denom, expectedAmt) } @@ -339,24 +340,24 @@ func (s *IBCTestSuite) assertDualityBalance( func (s *IBCTestSuite) assertProviderBalance( addr sdk.AccAddress, denom string, - expectedAmt sdk.Int, + expectedAmt math.Int, ) { s.assertBalance(s.providerApp.GetTestBankKeeper(), s.providerChain, addr, denom, expectedAmt) } -func (s *IBCTestSuite) assertChainBBalance(addr sdk.AccAddress, denom string, expectedAmt sdk.Int) { +func (s *IBCTestSuite) assertChainBBalance(addr sdk.AccAddress, denom string, expectedAmt math.Int) { s.assertBalance(s.bundleB.App.GetTestBankKeeper(), s.bundleB.Chain, addr, denom, expectedAmt) } -func (s *IBCTestSuite) assertChainCBalance(addr sdk.AccAddress, denom string, expectedAmt sdk.Int) { +func (s *IBCTestSuite) assertChainCBalance(addr sdk.AccAddress, denom string, expectedAmt math.Int) { s.assertBalance(s.bundleC.App.GetTestBankKeeper(), s.bundleC.Chain, addr, denom, expectedAmt) } func (s *IBCTestSuite) dualityDeposit( token0 string, token1 string, - depositAmount0 sdk.Int, - depositAmount1 sdk.Int, + depositAmount0 math.Int, + depositAmount1 math.Int, tickIndex int64, fee uint64, creator sdk.AccAddress, @@ -367,8 +368,8 @@ func (s *IBCTestSuite) dualityDeposit( creator.String(), token0, token1, - []sdk.Int{depositAmount0}, - []sdk.Int{depositAmount1}, + []math.Int{depositAmount0}, + []math.Int{depositAmount1}, []int64{tickIndex}, []uint64{fee}, []*dextypes.DepositOptions{{false}}, diff --git a/tests/ibc/swap_forward_test.go b/tests/ibc/swap_forward_test.go index d9fc03af2..386e3ad64 100644 --- a/tests/ibc/swap_forward_test.go +++ b/tests/ibc/swap_forward_test.go @@ -4,12 +4,12 @@ import ( "encoding/json" "time" - sdk "github.com/cosmos/cosmos-sdk/types" + "cosmossdk.io/math" forwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router/types" transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" + "github.com/iancoleman/orderedmap" "github.com/neutron-org/neutron/x/dex/types" swaptypes "github.com/neutron-org/neutron/x/ibcswap/types" - "github.com/iancoleman/orderedmap" "golang.org/x/exp/maps" ) @@ -30,7 +30,7 @@ func (s *IBCTestSuite) TestSwapAndForward_Success() { s.assertDualityBalance(s.dualityAddr, s.providerToDualityDenom, ibcTransferAmount) // deposit stake<>ibcTransferToken to initialize the pool on Duality - depositAmount := sdk.NewInt(100_000) + depositAmount := math.NewInt(100_000) s.dualityDeposit( nativeDenom, s.providerToDualityDenom, @@ -41,13 +41,13 @@ func (s *IBCTestSuite) TestSwapAndForward_Success() { s.dualityAddr) // Assert that the deposit was successful and the funds are moved out of the Duality user acc - s.assertDualityBalance(s.dualityAddr, s.providerToDualityDenom, sdk.ZeroInt()) + s.assertDualityBalance(s.dualityAddr, s.providerToDualityDenom, math.ZeroInt()) postDepositDualityBalNative := genesisWalletAmount.Sub(depositAmount) s.assertDualityBalance(s.dualityAddr, nativeDenom, postDepositDualityBalNative) // Compose the IBC transfer memo metadata to be used in the swap and forward - swapAmount := sdk.NewInt(100000) - expectedAmountOut := sdk.NewInt(99990) + swapAmount := math.NewInt(100000) + expectedAmountOut := math.NewInt(99990) chainBAddr := s.bundleB.Chain.SenderAccount.GetAddress() retries := uint8(0) @@ -109,7 +109,7 @@ func (s *IBCTestSuite) TestSwapAndForward_Success() { ) // Check that the amountIn is deduced from the duality account - s.assertDualityBalance(s.dualityAddr, s.providerToDualityDenom, sdk.ZeroInt()) + s.assertDualityBalance(s.dualityAddr, s.providerToDualityDenom, math.ZeroInt()) // Check that duality account did not keep any of the transfer denom s.assertDualityBalance(s.dualityAddr, nativeDenom, genesisWalletAmount.Sub(swapAmount)) @@ -143,7 +143,7 @@ func (s *IBCTestSuite) TestSwapAndForward_MultiHopSuccess() { s.assertDualityBalance(s.dualityAddr, s.providerToDualityDenom, ibcTransferAmount) // deposit stake<>ibcTransferToken to initialize the pool on Duality - depositAmount := sdk.NewInt(100_000) + depositAmount := math.NewInt(100_000) s.dualityDeposit( nativeDenom, s.providerToDualityDenom, @@ -154,14 +154,14 @@ func (s *IBCTestSuite) TestSwapAndForward_MultiHopSuccess() { s.dualityAddr) // Assert that the deposit was successful and the funds are moved out of the Duality user acc - s.assertDualityBalance(s.dualityAddr, s.providerToDualityDenom, sdk.ZeroInt()) + s.assertDualityBalance(s.dualityAddr, s.providerToDualityDenom, math.ZeroInt()) postDepositDualityBalNative := genesisWalletAmount.Sub(depositAmount) s.assertDualityBalance(s.dualityAddr, nativeDenom, postDepositDualityBalNative) // Compose the IBC transfer memo metadata to be used in the swap and forward - swapAmount := sdk.NewInt(100000) + swapAmount := math.NewInt(100000) - expectedOut := sdk.NewInt(99_990) + expectedOut := math.NewInt(99_990) chainBAddr := s.bundleB.Chain.SenderAccount.GetAddress() chainCAddr := s.bundleC.Chain.SenderAccount.GetAddress() @@ -253,7 +253,7 @@ func (s *IBCTestSuite) TestSwapAndForward_MultiHopSuccess() { newProviderBalNative.Sub(ibcTransferAmount), ) // Check that chain B balance is unchanged - s.assertChainBBalance(chainBAddr, transferDenomDuality_B, sdk.ZeroInt()) + s.assertChainBBalance(chainBAddr, transferDenomDuality_B, math.ZeroInt()) // Check that funds made it to chainC s.assertChainCBalance(chainCAddr, transferDenomB_C, expectedOut) @@ -279,7 +279,7 @@ func (s *IBCTestSuite) TestSwapAndForward_UnwindIBCDenomSuccess() { s.assertDualityBalance(s.dualityAddr, s.providerToDualityDenom, ibcTransferAmount) // deposit stake<>ibcTransferToken to initialize the pool on Duality - depositAmount := sdk.NewInt(100_000) + depositAmount := math.NewInt(100_000) s.dualityDeposit( nativeDenom, s.providerToDualityDenom, @@ -290,12 +290,12 @@ func (s *IBCTestSuite) TestSwapAndForward_UnwindIBCDenomSuccess() { s.dualityAddr) // Assert that the deposit was successful and the funds are moved out of the Duality user acc - s.assertDualityBalance(s.dualityAddr, s.providerToDualityDenom, sdk.ZeroInt()) + s.assertDualityBalance(s.dualityAddr, s.providerToDualityDenom, math.ZeroInt()) postDepositDualityBalNative := genesisWalletAmount.Sub(depositAmount) s.assertDualityBalance(s.dualityAddr, nativeDenom, postDepositDualityBalNative) - swapAmount := sdk.NewInt(100000) - expectedAmountOut := sdk.NewInt(99990) + swapAmount := math.NewInt(100000) + expectedAmountOut := math.NewInt(99990) retries := uint8(0) @@ -381,7 +381,7 @@ func (s *IBCTestSuite) TestSwapAndForward_ForwardFails() { s.assertDualityBalance(s.dualityAddr, s.providerToDualityDenom, ibcTransferAmount) // deposit stake<>ibcTransferToken to initialize the pool on Duality - depositAmount := sdk.NewInt(100_000) + depositAmount := math.NewInt(100_000) s.dualityDeposit( nativeDenom, s.providerToDualityDenom, @@ -392,13 +392,13 @@ func (s *IBCTestSuite) TestSwapAndForward_ForwardFails() { s.dualityAddr) // Assert that the deposit was successful and the funds are moved out of the Duality user acc - s.assertDualityBalance(s.dualityAddr, s.providerToDualityDenom, sdk.ZeroInt()) + s.assertDualityBalance(s.dualityAddr, s.providerToDualityDenom, math.ZeroInt()) postDepositDualityBalNative := genesisWalletAmount.Sub(depositAmount) s.assertDualityBalance(s.dualityAddr, nativeDenom, postDepositDualityBalNative) // Compose the IBC transfer memo metadata to be used in the swap and forward - swapAmount := sdk.NewInt(100000) - expectedAmountOut := sdk.NewInt(99990) + swapAmount := math.NewInt(100000) + expectedAmountOut := math.NewInt(99990) chainBAddr := s.bundleB.Chain.SenderAccount.GetAddress() retries := uint8(0) @@ -461,7 +461,7 @@ func (s *IBCTestSuite) TestSwapAndForward_ForwardFails() { ) // Check that the amountIn is deduced from the duality account - s.assertDualityBalance(s.dualityAddr, s.providerToDualityDenom, sdk.ZeroInt()) + s.assertDualityBalance(s.dualityAddr, s.providerToDualityDenom, math.ZeroInt()) // Check that the amountOut stays on the dualitychain s.assertDualityBalance( s.dualityAddr, @@ -477,5 +477,5 @@ func (s *IBCTestSuite) TestSwapAndForward_ForwardFails() { ) transferDenomDuality_B := transfertypes.ParseDenomTrace(transferDenomPath).IBCDenom() - s.assertChainBBalance(chainBAddr, transferDenomDuality_B, sdk.ZeroInt()) + s.assertChainBBalance(chainBAddr, transferDenomDuality_B, math.ZeroInt()) } diff --git a/tests/ibc/swap_test.go b/tests/ibc/swap_test.go index ab8973221..3cc72adb4 100644 --- a/tests/ibc/swap_test.go +++ b/tests/ibc/swap_test.go @@ -3,7 +3,7 @@ package ibc_test import ( "encoding/json" - sdk "github.com/cosmos/cosmos-sdk/types" + "cosmossdk.io/math" dextypes "github.com/neutron-org/neutron/x/dex/types" swaptypes "github.com/neutron-org/neutron/x/ibcswap/types" ) @@ -27,7 +27,7 @@ func (s *IBCTestSuite) TestIBCSwapMiddleware_Success() { s.assertDualityBalance(s.dualityAddr, s.providerToDualityDenom, ibcTransferAmount) // deposit stake<>ibcTransferToken to initialize the pool on Duality - depositAmount := sdk.NewInt(100_000) + depositAmount := math.NewInt(100_000) s.dualityDeposit( nativeDenom, s.providerToDualityDenom, @@ -38,13 +38,13 @@ func (s *IBCTestSuite) TestIBCSwapMiddleware_Success() { s.dualityAddr) // Assert that the deposit was successful and the funds are moved out of the Duality user acc - s.assertDualityBalance(s.dualityAddr, s.providerToDualityDenom, sdk.ZeroInt()) + s.assertDualityBalance(s.dualityAddr, s.providerToDualityDenom, math.ZeroInt()) postDepositDualityBalNative := genesisWalletAmount.Sub(depositAmount) s.assertDualityBalance(s.dualityAddr, nativeDenom, postDepositDualityBalNative) // Send an IBC transfer from providerChain to Duality with packet memo containing the swap metadata - swapAmount := sdk.NewInt(100000) - expectedOut := sdk.NewInt(99_990) + swapAmount := math.NewInt(100000) + expectedOut := math.NewInt(99_990) metadata := swaptypes.PacketMetadata{ Swap: &swaptypes.SwapMetadata{ @@ -83,14 +83,14 @@ func (s *IBCTestSuite) TestIBCSwapMiddleware_Success() { s.assertDualityBalance(s.dualityAddr, nativeDenom, postDepositDualityBalNative.Add(expectedOut)) // Check that all of the IBC transfer denom have been used up - s.assertDualityBalance(s.dualityAddr, s.providerToDualityDenom, sdk.ZeroInt()) + s.assertDualityBalance(s.dualityAddr, s.providerToDualityDenom, math.ZeroInt()) } // TestIBCSwapMiddleware_FailRefund asserts that the IBC swap middleware works as intended with Duality running as a // consumer chain connected to the Cosmos Hub. The swap should fail and a refund to the src chain should take place. func (s *IBCTestSuite) TestIBCSwapMiddleware_FailRefund() { // Compose the swap metadata, this swap will fail because there is no pool initialized for this pair - swapAmount := sdk.NewInt(100000) + swapAmount := math.NewInt(100000) metadata := swaptypes.PacketMetadata{ Swap: &swaptypes.SwapMetadata{ MsgPlaceLimitOrder: &dextypes.MsgPlaceLimitOrder{ @@ -121,7 +121,7 @@ func (s *IBCTestSuite) TestIBCSwapMiddleware_FailRefund() { // Check that the funds are not present in the account on Duality s.assertDualityBalance(s.dualityAddr, nativeDenom, genesisWalletAmount) - s.assertDualityBalance(s.dualityAddr, s.providerToDualityDenom, sdk.ZeroInt()) + s.assertDualityBalance(s.dualityAddr, s.providerToDualityDenom, math.ZeroInt()) // Check that the refund takes place and the funds are moved back to the account on Gaia s.assertProviderBalance(s.providerAddr, nativeDenom, genesisWalletAmount) @@ -131,7 +131,7 @@ func (s *IBCTestSuite) TestIBCSwapMiddleware_FailRefund() { // consumer chain connected to the Cosmos Hub. The swap should fail and funds should remain on Duality. func (s *IBCTestSuite) TestIBCSwapMiddleware_FailNoRefund() { // Compose the swap metadata, this swap will fail because there is no pool initialized for this pair - swapAmount := sdk.NewInt(100000) + swapAmount := math.NewInt(100000) metadata := swaptypes.PacketMetadata{ Swap: &swaptypes.SwapMetadata{ MsgPlaceLimitOrder: &dextypes.MsgPlaceLimitOrder{ @@ -175,7 +175,7 @@ func (s *IBCTestSuite) TestIBCSwapMiddleware_FailNoRefund() { func (s *IBCTestSuite) TestIBCSwapMiddleware_FailWithRefundAddr() { // Compose the swap metadata, this swap will fail because there is no pool initialized for this pair refundAddr := s.dualityChain.SenderAccounts[1].SenderAccount.GetAddress() - swapAmount := sdk.NewInt(100000) + swapAmount := math.NewInt(100000) metadata := swaptypes.PacketMetadata{ Swap: &swaptypes.SwapMetadata{ MsgPlaceLimitOrder: &dextypes.MsgPlaceLimitOrder{ diff --git a/testutil/integration_test_setup.go b/testutil/integration_test_setup.go index ebac488a9..5d8284ac2 100644 --- a/testutil/integration_test_setup.go +++ b/testutil/integration_test_setup.go @@ -73,7 +73,7 @@ func Setup(t *testing.T, isCheckTx bool) *app.App { ) balance := banktypes.Balance{ Address: acc.GetAddress().String(), - Coins: sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(100000000000000))), + Coins: sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, math.NewInt(100000000000000))), } app := SetupWithGenesisValSet(t, valSet, []authtypes.GenesisAccount{acc}, balance) diff --git a/utils/cli_helpers.go b/utils/cli_helpers.go index 8dc123204..9c2779825 100644 --- a/utils/cli_helpers.go +++ b/utils/cli_helpers.go @@ -4,6 +4,7 @@ import ( "strconv" "strings" + "cosmossdk.io/math" "github.com/cometbft/cometbft/crypto/ed25519" sdk "github.com/cosmos/cosmos-sdk/types" ) @@ -27,8 +28,8 @@ func ParseUint64SliceFromString(s, separator string) ([]uint64, error) { return parsedInts, nil } -func ParseSdkIntFromString(s, separator string) ([]sdk.Int, error) { - var parsedInts []sdk.Int +func ParseSdkIntFromString(s, separator string) ([]math.Int, error) { + var parsedInts []math.Int for _, weightStr := range strings.Split(s, separator) { weightStr = strings.TrimSpace(weightStr) @@ -36,7 +37,7 @@ func ParseSdkIntFromString(s, separator string) ([]sdk.Int, error) { if err != nil { return parsedInts, err } - parsedInts = append(parsedInts, sdk.NewIntFromUint64(parsed)) + parsedInts = append(parsedInts, math.NewIntFromUint64(parsed)) } return parsedInts, nil } diff --git a/utils/dcli/parsers.go b/utils/dcli/parsers.go index 0575ded5c..65af3d222 100644 --- a/utils/dcli/parsers.go +++ b/utils/dcli/parsers.go @@ -8,6 +8,7 @@ import ( "strings" "time" + "cosmossdk.io/math" "github.com/cosmos/cosmos-sdk/client" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/spf13/pflag" @@ -339,10 +340,10 @@ func ParseCoins(arg, fieldName string) (sdk.Coins, error) { } // TODO: This really shouldn't be getting used in the CLI, its misdesign on the CLI ux -func ParseSdkInt(arg, fieldName string) (sdk.Int, error) { - i, ok := sdk.NewIntFromString(arg) +func ParseSdkInt(arg, fieldName string) (math.Int, error) { + i, ok := math.NewIntFromString(arg) if !ok { - return sdk.Int{}, fmt.Errorf("could not parse %s as sdk.Int for field %s", arg, fieldName) + return math.Int{}, fmt.Errorf("could not parse %s as math.Int for field %s", arg, fieldName) } return i, nil } diff --git a/utils/dcli/parsers_test.go b/utils/dcli/parsers_test.go index 5748dc6d6..2a90ca363 100644 --- a/utils/dcli/parsers_test.go +++ b/utils/dcli/parsers_test.go @@ -5,6 +5,7 @@ import ( "testing" "time" + "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" . "github.com/neutron-org/neutron/utils/dcli" "github.com/stretchr/testify/require" @@ -19,7 +20,7 @@ type testingStruct struct { Pointer *testingStruct Slice sdk.Coins Struct interface{} - Dec sdk.Dec + Dec math.LegacyDec } func TestParseFieldFromArg(t *testing.T) { @@ -81,24 +82,24 @@ func TestParseFieldFromArg(t *testing.T) { }, "Slice change": { testingStruct: testingStruct{Slice: sdk.Coins{ - sdk.NewCoin("foo", sdk.NewInt(100)), - sdk.NewCoin("bar", sdk.NewInt(100)), + sdk.NewCoin("foo", math.NewInt(100)), + sdk.NewCoin("bar", math.NewInt(100)), }}, arg: "10foo,10bar", // Should be of a format suitable for ParseCoinsNormalized fieldIndex: 6, expectedStruct: testingStruct{Slice: sdk.Coins{ // swapped places due to lexicographic order - sdk.NewCoin("bar", sdk.NewInt(10)), - sdk.NewCoin("foo", sdk.NewInt(10)), + sdk.NewCoin("bar", math.NewInt(10)), + sdk.NewCoin("foo", math.NewInt(10)), }}, }, "Struct (sdk.Coin) change": { - testingStruct: testingStruct{Struct: sdk.NewCoin("bar", sdk.NewInt(10))}, // only supports sdk.Int, sdk.Coin or time.Time, other structs are not recognized + testingStruct: testingStruct{Struct: sdk.NewCoin("bar", math.NewInt(10))}, // only supports math.Int, sdk.Coin or time.Time, other structs are not recognized arg: "100bar", fieldIndex: 7, - expectedStruct: testingStruct{Struct: sdk.NewCoin("bar", sdk.NewInt(10))}, + expectedStruct: testingStruct{Struct: sdk.NewCoin("bar", math.NewInt(10))}, }, "Unrecognizable struct": { - testingStruct: testingStruct{Struct: testingStruct{}}, // only supports sdk.Int, sdk.Coin or time.Time, other structs are not recognized + testingStruct: testingStruct{Struct: testingStruct{}}, // only supports math.Int, sdk.Coin or time.Time, other structs are not recognized arg: "whatever", fieldIndex: 7, expectingErr: true, @@ -118,10 +119,10 @@ func TestParseFieldFromArg(t *testing.T) { Duration: time.Second, Pointer: &testingStruct{}, Slice: sdk.Coins{ - sdk.NewCoin("foo", sdk.NewInt(100)), - sdk.NewCoin("bar", sdk.NewInt(100)), + sdk.NewCoin("foo", math.NewInt(100)), + sdk.NewCoin("bar", math.NewInt(100)), }, - Struct: sdk.NewCoin("bar", sdk.NewInt(10)), + Struct: sdk.NewCoin("bar", math.NewInt(10)), }, arg: "1foo,15bar", fieldIndex: 6, @@ -133,10 +134,10 @@ func TestParseFieldFromArg(t *testing.T) { Duration: time.Second, Pointer: &testingStruct{}, Slice: sdk.Coins{ - sdk.NewCoin("bar", sdk.NewInt(15)), - sdk.NewCoin("foo", sdk.NewInt(1)), + sdk.NewCoin("bar", math.NewInt(15)), + sdk.NewCoin("foo", math.NewInt(1)), }, - Struct: sdk.NewCoin("bar", sdk.NewInt(10)), + Struct: sdk.NewCoin("bar", math.NewInt(10)), }, }, "Dec struct": { diff --git a/utils/math/prec_dec.go b/utils/math/prec_dec.go index f0cb85370..e09555bff 100644 --- a/utils/math/prec_dec.go +++ b/utils/math/prec_dec.go @@ -10,8 +10,6 @@ import ( "testing" "cosmossdk.io/math" - - sdk "github.com/cosmos/cosmos-sdk/types" ) // NOTE: This file is nearly direct copy from cosmossdk.io/math/dec.go @v1.01 @@ -131,13 +129,13 @@ func NewPrecDecFromBigIntWithPrec(i *big.Int, prec int64) PrecDec { // create a new PrecDec from big integer assuming whole numbers // CONTRACT: prec <= Precision -func NewPrecDecFromInt(i sdk.Int) PrecDec { +func NewPrecDecFromInt(i math.Int) PrecDec { return NewPrecDecFromIntWithPrec(i, 0) } // create a new PrecDec from big integer with decimal place at prec // CONTRACT: prec <= Precision -func NewPrecDecFromIntWithPrec(i sdk.Int, prec int64) PrecDec { +func NewPrecDecFromIntWithPrec(i math.Int, prec int64) PrecDec { return PrecDec{ new(big.Int).Mul(i.BigInt(), precisionMultiplier(prec)), } @@ -247,7 +245,7 @@ func (d PrecDec) ImmutOp(op func(PrecDec, PrecDec) PrecDec, d2 PrecDec) PrecDec return op(d.Clone(), d2) } -func (d PrecDec) ImmutOpInt(op func(PrecDec, sdk.Int) PrecDec, d2 sdk.Int) PrecDec { +func (d PrecDec) ImmutOpInt(op func(PrecDec, math.Int) PrecDec, d2 math.Int) PrecDec { return op(d.Clone(), d2) } @@ -328,11 +326,11 @@ func (d PrecDec) MulTruncateMut(d2 PrecDec) PrecDec { } // multiplication -func (d PrecDec) MulInt(i sdk.Int) PrecDec { +func (d PrecDec) MulInt(i math.Int) PrecDec { return d.ImmutOpInt(PrecDec.MulIntMut, i) } -func (d PrecDec) MulIntMut(i sdk.Int) PrecDec { +func (d PrecDec) MulIntMut(i math.Int) PrecDec { d.i.Mul(d.i, i.BigInt()) if d.i.BitLen() > maxPrecDecBitLen { panic("Int overflow") @@ -411,11 +409,11 @@ func (d PrecDec) QuoRoundupMut(d2 PrecDec) PrecDec { } // quotient -func (d PrecDec) QuoInt(i sdk.Int) PrecDec { +func (d PrecDec) QuoInt(i math.Int) PrecDec { return d.ImmutOpInt(PrecDec.QuoIntMut, i) } -func (d PrecDec) QuoIntMut(i sdk.Int) PrecDec { +func (d PrecDec) QuoIntMut(i math.Int) PrecDec { d.i.Quo(d.i, i.BigInt()) return d } @@ -684,8 +682,8 @@ func (d PrecDec) RoundInt64() int64 { } // RoundInt round the decimal using bankers rounding -func (d PrecDec) RoundInt() sdk.Int { - return sdk.NewIntFromBigInt(chopPrecisionAndRoundNonMutative(d.i)) +func (d PrecDec) RoundInt() math.Int { + return math.NewIntFromBigInt(chopPrecisionAndRoundNonMutative(d.i)) } // chopPrecisionAndTruncate is similar to chopPrecisionAndRound, @@ -710,8 +708,8 @@ func (d PrecDec) TruncateInt64() int64 { } // TruncateInt truncates the decimals from the number and returns an Int -func (d PrecDec) TruncateInt() sdk.Int { - return sdk.NewIntFromBigInt(chopPrecisionAndTruncateNonMutative(d.i)) +func (d PrecDec) TruncateInt() math.Int { + return math.NewIntFromBigInt(chopPrecisionAndTruncateNonMutative(d.i)) } // TruncatePrecDec truncates the decimals from the number and returns a PrecDec diff --git a/x/dex/client/cli/query_test.go b/x/dex/client/cli/query_test.go index bccd16375..a3774204e 100644 --- a/x/dex/client/cli/query_test.go +++ b/x/dex/client/cli/query_test.go @@ -54,10 +54,10 @@ package cli // TokenIn: "TokenB", // TickIndex: 1, // TrancheKey: "0", -// ReservesTokenIn: sdk.NewInt(10), -// ReservesTokenOut: sdk.ZeroInt(), -// TotalTokenIn: sdk.NewInt(10), -// TotalTokenOut: sdk.ZeroInt(), +// ReservesTokenIn: math.NewInt(10), +// ReservesTokenOut: math.ZeroInt(), +// TotalTokenIn: math.NewInt(10), +// TotalTokenOut: math.ZeroInt(), // }, // }, // }, @@ -71,10 +71,10 @@ package cli // TokenIn: "TokenB", // TickIndex: 2, // TrancheKey: "1", -// ReservesTokenIn: sdk.NewInt(10), -// ReservesTokenOut: sdk.ZeroInt(), -// TotalTokenIn: sdk.NewInt(10), -// TotalTokenOut: sdk.ZeroInt(), +// ReservesTokenIn: math.NewInt(10), +// ReservesTokenOut: math.ZeroInt(), +// TotalTokenIn: math.NewInt(10), +// TotalTokenOut: math.ZeroInt(), // }, // }, // }, @@ -86,20 +86,20 @@ package cli // TokenIn: "TokenB", // TickIndex: 0, // TrancheKey: "0", -// TotalTokenIn: sdk.NewInt(10), -// TotalTokenOut: sdk.NewInt(10), -// ReservesTokenOut: sdk.NewInt(10), -// ReservesTokenIn: sdk.NewInt(0), +// TotalTokenIn: math.NewInt(10), +// TotalTokenOut: math.NewInt(10), +// ReservesTokenOut: math.NewInt(10), +// ReservesTokenIn: math.NewInt(0), // }, // { // PairID: &types.PairID{Token0: "TokenA", Token1: "TokenB"}, // TokenIn: "TokenB", // TickIndex: 0, // TrancheKey: "1", -// TotalTokenIn: sdk.NewInt(10), -// TotalTokenOut: sdk.NewInt(10), -// ReservesTokenOut: sdk.NewInt(10), -// ReservesTokenIn: sdk.NewInt(0), +// TotalTokenIn: math.NewInt(10), +// TotalTokenOut: math.NewInt(10), +// ReservesTokenOut: math.NewInt(10), +// ReservesTokenIn: math.NewInt(0), // }, // } @@ -114,7 +114,7 @@ package cli // TokenIn: "TokenB", // TickIndex: 0, // Fee: 1, -// Reserves: sdk.NewInt(10), +// Reserves: math.NewInt(10), // }, // }, // }, @@ -128,7 +128,7 @@ package cli // TokenIn: "TokenB", // TickIndex: 0, // Fee: 3, -// Reserves: sdk.NewInt(10), +// Reserves: math.NewInt(10), // }, // }, // }, @@ -141,9 +141,9 @@ package cli // TickIndex: 1, // TrancheKey: "0", // Address: testAddress.String(), -// SharesOwned: sdk.NewInt(10), -// SharesWithdrawn: sdk.NewInt(0), -// SharesCancelled: sdk.NewInt(0), +// SharesOwned: math.NewInt(10), +// SharesWithdrawn: math.NewInt(0), +// SharesCancelled: math.NewInt(0), // }, // { // PairID: &types.PairID{Token0: "TokenA", Token1: "TokenB"}, @@ -151,9 +151,9 @@ package cli // TickIndex: 20, // TrancheKey: "1", // Address: testAddress.String(), -// SharesOwned: sdk.NewInt(10), -// SharesWithdrawn: sdk.NewInt(0), -// SharesCancelled: sdk.NewInt(0), +// SharesOwned: math.NewInt(10), +// SharesWithdrawn: math.NewInt(0), +// SharesCancelled: math.NewInt(0), // }, // } diff --git a/x/dex/client/cli/tx_deposit.go b/x/dex/client/cli/tx_deposit.go index 23c6300e4..31a833303 100644 --- a/x/dex/client/cli/tx_deposit.go +++ b/x/dex/client/cli/tx_deposit.go @@ -5,10 +5,10 @@ import ( "strconv" "strings" + "cosmossdk.io/math" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" - sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/neutron-org/neutron/x/dex/types" "github.com/spf13/cobra" @@ -41,14 +41,14 @@ func CmdDeposit() *cobra.Command { argFees := strings.Split(args[6], ",") argDepositOptions := strings.Split(args[7], ",") - var AmountsA []sdk.Int - var AmountsB []sdk.Int + var AmountsA []math.Int + var AmountsB []math.Int var TicksIndexesInt []int64 var FeesUint []uint64 var DepositOptions []*types.DepositOptions for _, s := range argAmountsA { - amountA, ok := sdk.NewIntFromString(s) + amountA, ok := math.NewIntFromString(s) if !ok { return sdkerrors.Wrapf(types.ErrIntOverflowTx, "Integer overflow for amountsA") } @@ -57,7 +57,7 @@ func CmdDeposit() *cobra.Command { } for _, s := range argAmountsB { - amountB, ok := sdk.NewIntFromString(s) + amountB, ok := math.NewIntFromString(s) if !ok { return sdkerrors.Wrapf(types.ErrIntOverflowTx, "Integer overflow for amountsB") } diff --git a/x/dex/client/cli/tx_multi_hop_swap.go b/x/dex/client/cli/tx_multi_hop_swap.go index ff3eb34f9..bf703cb2a 100644 --- a/x/dex/client/cli/tx_multi_hop_swap.go +++ b/x/dex/client/cli/tx_multi_hop_swap.go @@ -4,10 +4,10 @@ import ( "strconv" "strings" + "cosmossdk.io/math" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" - sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" math_utils "github.com/neutron-org/neutron/utils/math" "github.com/neutron-org/neutron/x/dex/types" @@ -33,7 +33,7 @@ func CmdMultiHopSwap() *cobra.Command { routesArr[i] = strings.Split(route, ",") } - amountInInt, ok := sdk.NewIntFromString(argAmountIn) + amountInInt, ok := math.NewIntFromString(argAmountIn) if !ok { return sdkerrors.Wrapf(types.ErrIntOverflowTx, "Invalid value for amount-in") } diff --git a/x/dex/client/cli/tx_place_limit_order.go b/x/dex/client/cli/tx_place_limit_order.go index 4e4faa95d..6ae51074c 100644 --- a/x/dex/client/cli/tx_place_limit_order.go +++ b/x/dex/client/cli/tx_place_limit_order.go @@ -5,10 +5,10 @@ import ( "strings" "time" + "cosmossdk.io/math" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" - sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/neutron-org/neutron/x/dex/types" "github.com/spf13/cobra" @@ -36,7 +36,7 @@ func CmdPlaceLimitOrder() *cobra.Command { } argAmountIn := args[4] - amountInInt, ok := sdk.NewIntFromString(argAmountIn) + amountInInt, ok := math.NewIntFromString(argAmountIn) if !ok { return sdkerrors.Wrapf(types.ErrIntOverflowTx, "Integer overflow for amount-in") } @@ -64,9 +64,9 @@ func CmdPlaceLimitOrder() *cobra.Command { if err != nil { return err } - var maxAmountOutIntP *sdk.Int = nil + var maxAmountOutIntP *math.Int = nil if maxAmountOutArg != "" { - maxAmountOutInt, ok := sdk.NewIntFromString(maxAmountOutArg) + maxAmountOutInt, ok := math.NewIntFromString(maxAmountOutArg) if !ok { return sdkerrors.Wrapf( types.ErrIntOverflowTx, diff --git a/x/dex/client/cli/tx_test.go b/x/dex/client/cli/tx_test.go index 389138114..2e40e8ea6 100644 --- a/x/dex/client/cli/tx_test.go +++ b/x/dex/client/cli/tx_test.go @@ -156,7 +156,7 @@ package cli // fmt.Sprintf( // "--%s=%s", // flags.FlagFees, -// sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(10))).String(), +// sdk.NewCoins(sdk.NewCoin("stake", math.NewInt(10))).String(), // ), // } // out, err := clitestutil.MsgSendExec( @@ -180,7 +180,7 @@ package cli // fmt.Sprintf( // "--%s=%s", // flags.FlagFees, -// sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(10))).String(), +// sdk.NewCoins(sdk.NewCoin("stake", math.NewInt(10))).String(), // ), // fmt.Sprintf("--%s=%s", flags.FlagGas, "200000000"), // fmt.Sprintf("--%s=%s", flags.FlagFrom, val[0].Address.String()), @@ -283,7 +283,7 @@ package cli // fmt.Sprintf( // "--%s=%s", // flags.FlagFees, -// sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(10))).String(), +// sdk.NewCoins(sdk.NewCoin("stake", math.NewInt(10))).String(), // ), // fmt.Sprintf("--%s=%s", flags.FlagGas, "200000000"), // fmt.Sprintf("--%s=%s", flags.FlagFrom, val[0].Address.String()), @@ -396,7 +396,7 @@ package cli // fmt.Sprintf( // "--%s=%s", // flags.FlagFees, -// sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(10))).String(), +// sdk.NewCoins(sdk.NewCoin("stake", math.NewInt(10))).String(), // ), // fmt.Sprintf("--%s=%s", flags.FlagGas, "200000000"), // fmt.Sprintf("--%s=%s", flags.FlagFrom, val[0].Address.String()), @@ -521,7 +521,7 @@ package cli // fmt.Sprintf( // "--%s=%s", // flags.FlagFees, -// sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(10))).String(), +// sdk.NewCoins(sdk.NewCoin("stake", math.NewInt(10))).String(), // ), // fmt.Sprintf("--%s=%s", flags.FlagGas, "200000000"), // fmt.Sprintf("--%s=%s", flags.FlagFrom, val[0].Address.String()), @@ -585,7 +585,7 @@ package cli // fmt.Sprintf( // "--%s=%s", // flags.FlagFees, -// sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(10))).String(), +// sdk.NewCoins(sdk.NewCoin("stake", math.NewInt(10))).String(), // ), // fmt.Sprintf("--%s=%s", flags.FlagGas, "200000000"), // fmt.Sprintf("--%s=%s", flags.FlagFrom, val[0].Address.String()), diff --git a/x/dex/client/cli/tx_withdrawl.go b/x/dex/client/cli/tx_withdrawl.go index 534ee2613..277f31488 100644 --- a/x/dex/client/cli/tx_withdrawl.go +++ b/x/dex/client/cli/tx_withdrawl.go @@ -4,10 +4,10 @@ import ( "strconv" "strings" + "cosmossdk.io/math" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" - sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/neutron-org/neutron/x/dex/types" "github.com/spf13/cobra" @@ -32,11 +32,11 @@ func CmdWithdrawal() *cobra.Command { argTickIndexes := strings.Split(args[4], ",") argFees := strings.Split(args[5], ",") - var SharesToRemoveInt []sdk.Int + var SharesToRemoveInt []math.Int var TicksIndexesInt []int64 var FeesUint []uint64 for _, s := range argSharesToRemove { - sharesToRemoveInt, ok := sdk.NewIntFromString(s) + sharesToRemoveInt, ok := math.NewIntFromString(s) if !ok { return sdkerrors.Wrapf(types.ErrIntOverflowTx, "Integer Overflow for shares-to-remove") diff --git a/x/dex/genesis_test.go b/x/dex/genesis_test.go index 3984887c7..d315eb455 100644 --- a/x/dex/genesis_test.go +++ b/x/dex/genesis_test.go @@ -3,7 +3,7 @@ package dex_test import ( "testing" - sdk "github.com/cosmos/cosmos-sdk/types" + "cosmossdk.io/math" keepertest "github.com/neutron-org/neutron/testutil/dex/keeper" "github.com/neutron-org/neutron/testutil/dex/nullify" "github.com/neutron-org/neutron/x/dex" @@ -23,9 +23,9 @@ func TestGenesis(t *testing.T) { TickIndexTakerToMaker: 1, TrancheKey: "0", Address: "fakeAddr", - SharesOwned: sdk.NewInt(10), - SharesWithdrawn: sdk.NewInt(0), - SharesCancelled: sdk.NewInt(0), + SharesOwned: math.NewInt(10), + SharesWithdrawn: math.NewInt(0), + SharesCancelled: math.NewInt(0), }, { TradePairID: &types.TradePairID{ @@ -35,9 +35,9 @@ func TestGenesis(t *testing.T) { TickIndexTakerToMaker: 20, TrancheKey: "0", Address: "fakeAddr", - SharesOwned: sdk.NewInt(10), - SharesWithdrawn: sdk.NewInt(0), - SharesCancelled: sdk.NewInt(0), + SharesOwned: math.NewInt(10), + SharesWithdrawn: math.NewInt(0), + SharesCancelled: math.NewInt(0), }, }, TickLiquidityList: []*types.TickLiquidity{ @@ -48,10 +48,10 @@ func TestGenesis(t *testing.T) { "TokenA", "0", 0, - sdk.ZeroInt(), - sdk.ZeroInt(), - sdk.ZeroInt(), - sdk.ZeroInt(), + math.ZeroInt(), + math.ZeroInt(), + math.ZeroInt(), + math.ZeroInt(), ), }, }, @@ -62,10 +62,10 @@ func TestGenesis(t *testing.T) { "TokenA", "0", 0, - sdk.ZeroInt(), - sdk.ZeroInt(), - sdk.ZeroInt(), - sdk.ZeroInt(), + math.ZeroInt(), + math.ZeroInt(), + math.ZeroInt(), + math.ZeroInt(), ), }, }, diff --git a/x/dex/keeper/core.go b/x/dex/keeper/core.go index 5e35eae1a..1fa69de81 100644 --- a/x/dex/keeper/core.go +++ b/x/dex/keeper/core.go @@ -4,6 +4,7 @@ import ( "context" "time" + "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" math_utils "github.com/neutron-org/neutron/utils/math" @@ -11,7 +12,7 @@ import ( "github.com/neutron-org/neutron/x/dex/utils" ) -// NOTE: Currently we are using TruncateInt in multiple places for converting Decs back into sdk.Ints. +// NOTE: Currently we are using TruncateInt in multiple places for converting Decs back into math.Ints. // This may create some accounting anomalies but seems preferable to other alternatives. // See full ADR here: https://www.notion.so/dualityxyz/A-Modest-Proposal-For-Truncating-696a919d59254876a617f82fb9567895 @@ -22,23 +23,23 @@ func (k Keeper) DepositCore( pairID *types.PairID, callerAddr sdk.AccAddress, receiverAddr sdk.AccAddress, - amounts0 []sdk.Int, - amounts1 []sdk.Int, + amounts0 []math.Int, + amounts1 []math.Int, tickIndices []int64, fees []uint64, options []*types.DepositOptions, -) (amounts0Deposit, amounts1Deposit []sdk.Int, sharesIssued sdk.Coins, err error) { +) (amounts0Deposit, amounts1Deposit []math.Int, sharesIssued sdk.Coins, err error) { ctx := sdk.UnwrapSDKContext(goCtx) - totalAmountReserve0 := sdk.ZeroInt() - totalAmountReserve1 := sdk.ZeroInt() - amounts0Deposited := make([]sdk.Int, len(amounts0)) - amounts1Deposited := make([]sdk.Int, len(amounts1)) + totalAmountReserve0 := math.ZeroInt() + totalAmountReserve1 := math.ZeroInt() + amounts0Deposited := make([]math.Int, len(amounts0)) + amounts1Deposited := make([]math.Int, len(amounts1)) sharesIssued = sdk.Coins{} for i := 0; i < len(amounts0); i++ { - amounts0Deposited[i] = sdk.ZeroInt() - amounts1Deposited[i] = sdk.ZeroInt() + amounts0Deposited[i] = math.ZeroInt() + amounts1Deposited[i] = math.ZeroInt() } for i, amount0 := range amounts0 { @@ -124,13 +125,13 @@ func (k Keeper) WithdrawCore( pairID *types.PairID, callerAddr sdk.AccAddress, receiverAddr sdk.AccAddress, - sharesToRemoveList []sdk.Int, + sharesToRemoveList []math.Int, tickIndicesNormalized []int64, fees []uint64, ) error { ctx := sdk.UnwrapSDKContext(goCtx) - totalReserve0ToRemove := sdk.ZeroInt() - totalReserve1ToRemove := sdk.ZeroInt() + totalReserve0ToRemove := math.ZeroInt() + totalReserve1ToRemove := math.ZeroInt() for i, fee := range fees { sharesToRemove := sharesToRemoveList[i] @@ -212,7 +213,7 @@ func (k Keeper) WithdrawCore( func (k Keeper) MultiHopSwapCore( goCtx context.Context, - amountIn sdk.Int, + amountIn math.Int, routes []*types.MultiHopRoute, exitLimitPrice math_utils.PrecDec, pickBestRoute bool, @@ -228,7 +229,7 @@ func (k Keeper) MultiHopSwapCore( coinOut sdk.Coin route []string } - bestRoute.coinOut = sdk.Coin{Amount: sdk.ZeroInt()} + bestRoute.coinOut = sdk.Coin{Amount: math.ZeroInt()} for _, route := range routes { routeCoinOut, writeRoute, err := k.RunMultihopRoute( @@ -300,11 +301,11 @@ func (k Keeper) PlaceLimitOrderCore( goCtx context.Context, tokenIn string, tokenOut string, - amountIn sdk.Int, + amountIn math.Int, tickIndexInToOut int64, orderType types.LimitOrderType, goodTil *time.Time, - maxAmountOut *sdk.Int, + maxAmountOut *math.Int, callerAddr sdk.AccAddress, receiverAddr sdk.AccAddress, ) (trancheKey string, totalInCoin sdk.Coin, swapInCoin sdk.Coin, swapOutCoin sdk.Coin, err error) { @@ -316,7 +317,7 @@ func (k Keeper) PlaceLimitOrderCore( return } - amountLeft, totalIn := amountIn, sdk.ZeroInt() + amountLeft, totalIn := amountIn, math.ZeroInt() // For everything except just-in-time (JIT) orders try to execute as a swap first if !orderType.IsJIT() { @@ -387,7 +388,7 @@ func (k Keeper) PlaceLimitOrderCore( receiverAddr.String(), ) - sharesIssued := sdk.ZeroInt() + sharesIssued := math.ZeroInt() // FOR GTC, JIT & GoodTil try to place a maker limitOrder with remaining Amount if amountLeft.IsPositive() && (orderType.IsGTC() || orderType.IsJIT() || orderType.IsGoodTil()) { @@ -537,10 +538,10 @@ func (k Keeper) WithdrawFilledLimitOrderCore( ) amountOutTokenOut := math_utils.ZeroPrecDec() - remainingTokenIn := sdk.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 sdk.Int + var amountOutTokenIn math.Int amountOutTokenIn, amountOutTokenOut = tranche.Withdraw(trancheUser) if wasFilled { diff --git a/x/dex/keeper/core_helper.go b/x/dex/keeper/core_helper.go index b6089cf83..cf5d0ff81 100644 --- a/x/dex/keeper/core_helper.go +++ b/x/dex/keeper/core_helper.go @@ -1,6 +1,7 @@ package keeper import ( + "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" math_utils "github.com/neutron-org/neutron/utils/math" @@ -91,7 +92,7 @@ func (k Keeper) MintShares(ctx sdk.Context, addr sdk.AccAddress, shareCoin sdk.C func (k Keeper) BurnShares( ctx sdk.Context, addr sdk.AccAddress, - amount sdk.Int, + amount math.Int, sharesID string, ) error { sharesCoins := sdk.Coins{sdk.NewCoin(sharesID, amount)} diff --git a/x/dex/keeper/core_helper_test.go b/x/dex/keeper/core_helper_test.go index bb257dee3..d04e3d996 100644 --- a/x/dex/keeper/core_helper_test.go +++ b/x/dex/keeper/core_helper_test.go @@ -3,6 +3,7 @@ package keeper_test import ( "testing" + "cosmossdk.io/math" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" @@ -59,8 +60,8 @@ func (s *CoreHelpersTestSuite) setLPAtFee1Pool(tickIndex int64, amountA int, amo panic(err) } lowerTick, upperTick := pool.LowerTick0, pool.UpperTick1 - amountAInt := sdk.NewInt(int64(amountA)) - amountBInt := sdk.NewInt(int64(amountB)) + amountAInt := math.NewInt(int64(amountA)) + amountBInt := math.NewInt(int64(amountB)) existingShares := s.app.BankKeeper.GetSupply(s.ctx, pool.GetPoolDenom()).Amount diff --git a/x/dex/keeper/deposit_record_test.go b/x/dex/keeper/deposit_record_test.go index aed7bcc1d..864b5b111 100644 --- a/x/dex/keeper/deposit_record_test.go +++ b/x/dex/keeper/deposit_record_test.go @@ -1,7 +1,7 @@ package keeper_test import ( - sdk "github.com/cosmos/cosmos-sdk/types" + "cosmossdk.io/math" "github.com/neutron-org/neutron/x/dex/types" ) @@ -10,20 +10,20 @@ func (s *MsgServerTestSuite) TestGetAllDeposits() { // GIVEN Alice Deposits 3 positions and withdraws the first s.aliceDeposits( &Deposit{ - AmountA: sdk.NewInt(1), - AmountB: sdk.NewInt(0), + AmountA: math.NewInt(1), + AmountB: math.NewInt(0), TickIndex: -50, Fee: 1, }, &Deposit{ - AmountA: sdk.NewInt(5), - AmountB: sdk.NewInt(5), + AmountA: math.NewInt(5), + AmountB: math.NewInt(5), TickIndex: 0, Fee: 1, }, &Deposit{ - AmountA: sdk.NewInt(0), - AmountB: sdk.NewInt(10), + AmountA: math.NewInt(0), + AmountB: math.NewInt(10), TickIndex: 2, Fee: 1, }, @@ -31,7 +31,7 @@ func (s *MsgServerTestSuite) TestGetAllDeposits() { s.aliceWithdraws(&Withdrawal{ TickIndex: -50, Fee: 1, - Shares: sdk.NewInt(1), + Shares: math.NewInt(1), }, ) @@ -40,7 +40,7 @@ func (s *MsgServerTestSuite) TestGetAllDeposits() { s.Assert().Equal(2, len(depositList)) s.Assert().Equal(&types.DepositRecord{ PairID: defaultPairID, - SharesOwned: sdk.NewInt(10), + SharesOwned: math.NewInt(10), CenterTickIndex: 0, LowerTickIndex: -1, UpperTickIndex: 1, @@ -50,7 +50,7 @@ func (s *MsgServerTestSuite) TestGetAllDeposits() { ) s.Assert().Equal(&types.DepositRecord{ PairID: defaultPairID, - SharesOwned: sdk.NewInt(10), + SharesOwned: math.NewInt(10), CenterTickIndex: 2, LowerTickIndex: 1, UpperTickIndex: 3, 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 ed9721549..8d8080ded 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 @@ -1,6 +1,7 @@ package keeper_test import ( + "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" keepertest "github.com/neutron-org/neutron/testutil/dex/keeper" math_utils "github.com/neutron-org/neutron/utils/math" @@ -22,7 +23,7 @@ func (s *MsgServerTestSuite) TestEstimateMultiHopSwapSingleRoute() { coinOut := s.aliceEstimatesMultiHopSwap(route, 100, math_utils.MustNewPrecDecFromStr("0.9"), false) // THEN alice would get out 99 TokenD - s.Assert().Equal(sdk.NewInt(97), coinOut.Amount) + s.Assert().Equal(math.NewInt(97), coinOut.Amount) s.assertAccountBalanceWithDenom(s.alice, "TokenA", 100) s.assertAccountBalanceWithDenom(s.alice, "TokenD", 0) @@ -99,8 +100,8 @@ func (s *MsgServerTestSuite) TestEstimateMultiHopSwapMultiRouteOneGood() { s.assertLiquidityAtTickWithDenom( &types.PairID{Token0: "TokenA", Token1: "TokenB"}, - sdk.NewInt(0), - sdk.NewInt(100), + math.NewInt(0), + math.NewInt(100), 0, 1, ) @@ -110,27 +111,27 @@ func (s *MsgServerTestSuite) TestEstimateMultiHopSwapMultiRouteOneGood() { // THEN swap estimation succeeds through route A<>B, B<>E, E<>X - s.Assert().Equal(sdk.NewInt(97), coinOut.Amount) + s.Assert().Equal(math.NewInt(97), coinOut.Amount) s.assertAccountBalanceWithDenom(s.alice, "TokenA", 100) s.assertAccountBalanceWithDenom(s.alice, "TokenX", 0) s.assertLiquidityAtTickWithDenom( &types.PairID{Token0: "TokenA", Token1: "TokenB"}, - sdk.NewInt(0), - sdk.NewInt(100), + math.NewInt(0), + math.NewInt(100), 0, 1, ) s.assertLiquidityAtTickWithDenom( &types.PairID{Token0: "TokenB", Token1: "TokenE"}, - sdk.NewInt(0), - sdk.NewInt(100), + math.NewInt(0), + math.NewInt(100), 0, 1, ) s.assertLiquidityAtTickWithDenom( &types.PairID{Token0: "TokenE", Token1: "TokenX"}, - sdk.NewInt(0), - sdk.NewInt(100), + math.NewInt(0), + math.NewInt(100), 0, 1, ) @@ -138,43 +139,43 @@ func (s *MsgServerTestSuite) TestEstimateMultiHopSwapMultiRouteOneGood() { // Other pools are unaffected s.assertLiquidityAtTickWithDenom( &types.PairID{Token0: "TokenB", Token1: "TokenC"}, - sdk.NewInt(0), - sdk.NewInt(100), + math.NewInt(0), + math.NewInt(100), 0, 1, ) s.assertLiquidityAtTickWithDenom( &types.PairID{Token0: "TokenC", Token1: "TokenX"}, - sdk.NewInt(0), - sdk.NewInt(50), + math.NewInt(0), + math.NewInt(50), 0, 1, ) s.assertLiquidityAtTickWithDenom( &types.PairID{Token0: "TokenC", Token1: "TokenX"}, - sdk.NewInt(0), - sdk.NewInt(50), + math.NewInt(0), + math.NewInt(50), 2200, 1, ) s.assertLiquidityAtTickWithDenom( &types.PairID{Token0: "TokenB", Token1: "TokenD"}, - sdk.NewInt(0), - sdk.NewInt(100), + math.NewInt(0), + math.NewInt(100), 0, 1, ) s.assertLiquidityAtTickWithDenom( &types.PairID{Token0: "TokenD", Token1: "TokenX"}, - sdk.NewInt(0), - sdk.NewInt(50), + math.NewInt(0), + math.NewInt(50), 0, 1, ) s.assertLiquidityAtTickWithDenom( &types.PairID{Token0: "TokenD", Token1: "TokenX"}, - sdk.NewInt(0), - sdk.NewInt(50), + math.NewInt(0), + math.NewInt(50), 2200, 1, ) @@ -247,25 +248,25 @@ func (s *MsgServerTestSuite) TestEstimateMultiHopSwapMultiRouteFindBestRoute() { // THEN swap succeeds through route A<>B, B<>E, E<>X - s.Assert().Equal(sdk.NewCoin("TokenX", sdk.NewInt(132)), coinOut) + s.Assert().Equal(sdk.NewCoin("TokenX", math.NewInt(132)), coinOut) s.assertLiquidityAtTickWithDenom( &types.PairID{Token0: "TokenA", Token1: "TokenB"}, - sdk.NewInt(0), - sdk.NewInt(100), + math.NewInt(0), + math.NewInt(100), 0, 1, ) s.assertLiquidityAtTickWithDenom( &types.PairID{Token0: "TokenB", Token1: "TokenE"}, - sdk.NewInt(0), - sdk.NewInt(100), + math.NewInt(0), + math.NewInt(100), 0, 1, ) s.assertLiquidityAtTickWithDenom( &types.PairID{Token0: "TokenE", Token1: "TokenX"}, - sdk.NewInt(0), - sdk.NewInt(1000), + math.NewInt(0), + math.NewInt(1000), -3000, 1, ) @@ -273,29 +274,29 @@ func (s *MsgServerTestSuite) TestEstimateMultiHopSwapMultiRouteFindBestRoute() { // Other pools are unaffected s.assertLiquidityAtTickWithDenom( &types.PairID{Token0: "TokenB", Token1: "TokenC"}, - sdk.NewInt(0), - sdk.NewInt(100), + math.NewInt(0), + math.NewInt(100), 0, 1, ) s.assertLiquidityAtTickWithDenom( &types.PairID{Token0: "TokenC", Token1: "TokenX"}, - sdk.NewInt(0), - sdk.NewInt(1000), + math.NewInt(0), + math.NewInt(1000), -1000, 1, ) s.assertLiquidityAtTickWithDenom( &types.PairID{Token0: "TokenB", Token1: "TokenD"}, - sdk.NewInt(0), - sdk.NewInt(100), + math.NewInt(0), + math.NewInt(100), 0, 1, ) s.assertLiquidityAtTickWithDenom( &types.PairID{Token0: "TokenD", Token1: "TokenX"}, - sdk.NewInt(0), - sdk.NewInt(1000), + math.NewInt(0), + math.NewInt(1000), -2000, 1, ) @@ -338,12 +339,12 @@ func (s *MsgServerTestSuite) TestEstimateMultiHopSwapLongRouteWithCache() { coinOut := s.aliceEstimatesMultiHopSwap(routes, 100, math_utils.MustNewPrecDecFromStr("0.8"), true) // THEN swap succeeds with second route - s.Assert().Equal(coinOut, sdk.NewCoin("TokenX", sdk.NewInt(88))) + s.Assert().Equal(coinOut, sdk.NewCoin("TokenX", math.NewInt(88))) s.assertAccountBalanceWithDenom(s.alice, "TokenA", 100) s.assertLiquidityAtTickWithDenom( &types.PairID{Token0: "TokenM", Token1: "TokenX"}, - sdk.NewInt(0), - sdk.NewInt(100), + math.NewInt(0), + math.NewInt(100), 0, 1, ) diff --git a/x/dex/keeper/grpc_query_user_deposits_test.go b/x/dex/keeper/grpc_query_user_deposits_test.go index 69c4e592b..5719b94e2 100644 --- a/x/dex/keeper/grpc_query_user_deposits_test.go +++ b/x/dex/keeper/grpc_query_user_deposits_test.go @@ -3,6 +3,7 @@ package keeper_test import ( "testing" + "cosmossdk.io/math" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" @@ -35,7 +36,7 @@ func TestUserDepositsAllQueryPaginated(t *testing.T) { msgs := []*types.DepositRecord{ { PairID: defaultPairID, - SharesOwned: sdk.NewInt(10), + SharesOwned: math.NewInt(10), CenterTickIndex: 2, LowerTickIndex: 1, UpperTickIndex: 3, @@ -43,7 +44,7 @@ func TestUserDepositsAllQueryPaginated(t *testing.T) { }, { PairID: defaultPairID, - SharesOwned: sdk.NewInt(10), + SharesOwned: math.NewInt(10), CenterTickIndex: 3, LowerTickIndex: 2, UpperTickIndex: 4, @@ -51,7 +52,7 @@ func TestUserDepositsAllQueryPaginated(t *testing.T) { }, { PairID: defaultPairID, - SharesOwned: sdk.NewInt(10), + SharesOwned: math.NewInt(10), CenterTickIndex: 4, LowerTickIndex: 3, UpperTickIndex: 5, @@ -59,7 +60,7 @@ func TestUserDepositsAllQueryPaginated(t *testing.T) { }, { PairID: defaultPairID, - SharesOwned: sdk.NewInt(10), + SharesOwned: math.NewInt(10), CenterTickIndex: 5, LowerTickIndex: 4, UpperTickIndex: 6, @@ -67,7 +68,7 @@ func TestUserDepositsAllQueryPaginated(t *testing.T) { }, { PairID: defaultPairID, - SharesOwned: sdk.NewInt(10), + SharesOwned: math.NewInt(10), CenterTickIndex: 6, LowerTickIndex: 5, UpperTickIndex: 7, diff --git a/x/dex/keeper/integration_deposit_autoswap_unit_test.go b/x/dex/keeper/integration_deposit_autoswap_unit_test.go index e7236da73..551c6dd44 100644 --- a/x/dex/keeper/integration_deposit_autoswap_unit_test.go +++ b/x/dex/keeper/integration_deposit_autoswap_unit_test.go @@ -24,7 +24,7 @@ func (s *MsgServerTestSuite) TestAutoswapperWithdraws() { // Calculated expected amounts out autoswapSharesMinted := s.calcAutoswapSharesMinted(int64(tickIndex), uint64(fee), 7, 0, 5, 5, bobSharesMinted.Int64(), bobSharesMinted.Int64()) - // totalShares := autoswapSharesMinted.Add(sdk.NewInt(20)) + // totalShares := autoswapSharesMinted.Add(math.NewInt(20)) aliceExpectedBalance0, aliceExpectedBalance1, dexExpectedBalance0, dexExpectedBalance1 := s.calcExpectedBalancesAfterWithdrawOnePool(autoswapSharesMinted, s.alice, int64(tickIndex), uint64(fee)) @@ -90,7 +90,7 @@ func (s *MsgServerTestSuite) TestAutoswapBothWithdraws() { // Calculated expected amounts out autoswapSharesMinted := s.calcAutoswapSharesMinted(int64(tickIndex), uint64(fee), 5, 0, 5, 5, bobSharesMinted.Int64(), bobSharesMinted.Int64()) - // totalShares := autoswapSharesMinted.Add(sdk.NewInt(20)) + // totalShares := autoswapSharesMinted.Add(math.NewInt(20)) bobExpectedBalance0, bobExpectedBalance1, dexExpectedBalance0, dexExpectedBalance1 := s.calcExpectedBalancesAfterWithdrawOnePool(bobSharesMinted, s.bob, int64(tickIndex), uint64(fee)) diff --git a/x/dex/keeper/integration_deposit_doublesided_test.go b/x/dex/keeper/integration_deposit_doublesided_test.go index dc03f571f..a5a09eddb 100644 --- a/x/dex/keeper/integration_deposit_doublesided_test.go +++ b/x/dex/keeper/integration_deposit_doublesided_test.go @@ -1,7 +1,7 @@ package keeper_test import ( - sdk "github.com/cosmos/cosmos-sdk/types" + "cosmossdk.io/math" "github.com/neutron-org/neutron/x/dex/types" ) @@ -221,7 +221,7 @@ func (s *MsgServerTestSuite) TestDepositValueAccural() { // Alice deposits 100TokenA @ tick0 => 100 shares s.aliceDeposits(NewDeposit(100, 0, 0, 10)) s.assertAliceShares(0, 10, 100) - s.assertLiquidityAtTick(sdk.NewInt(100), sdk.ZeroInt(), 0, 10) + s.assertLiquidityAtTick(math.NewInt(100), math.ZeroInt(), 0, 10) // Lots of trade activity => ~200 ExistingValueToken0 @@ -233,7 +233,7 @@ func (s *MsgServerTestSuite) TestDepositValueAccural() { s.bobLimitSells("TokenA", 10, int(liquidityB.Int64())+10, types.LimitOrderType_IMMEDIATE_OR_CANCEL) } } - s.assertLiquidityAtTick(sdk.NewInt(200), sdk.NewInt(0), 0, 10) + s.assertLiquidityAtTick(math.NewInt(200), math.NewInt(0), 0, 10) s.assertDexBalances(200, 0) // Carol deposits 100TokenA @tick0 diff --git a/x/dex/keeper/integration_deposit_multi_test.go b/x/dex/keeper/integration_deposit_multi_test.go index 330ab70d9..6423954a8 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 ( - sdk "github.com/cosmos/cosmos-sdk/types" + "cosmossdk.io/math" "github.com/neutron-org/neutron/x/dex/types" ) @@ -40,6 +40,6 @@ func (s *MsgServerTestSuite) TestDepositMultiSuccess() { // THEN // both deposits should go through s.assertAliceBalances(35, 35) - s.assertLiquidityAtTick(sdk.NewInt(15), sdk.NewInt(15), 0, 1) + s.assertLiquidityAtTick(math.NewInt(15), math.NewInt(15), 0, 1) s.assertDexBalances(15, 15) } diff --git a/x/dex/keeper/integration_multihopswap_test.go b/x/dex/keeper/integration_multihopswap_test.go index 52a5f32da..ad926f342 100644 --- a/x/dex/keeper/integration_multihopswap_test.go +++ b/x/dex/keeper/integration_multihopswap_test.go @@ -1,6 +1,7 @@ package keeper_test import ( + "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" keepertest "github.com/neutron-org/neutron/testutil/dex/keeper" math_utils "github.com/neutron-org/neutron/utils/math" @@ -30,8 +31,8 @@ func NewPoolSetup(tokenA, tokenB string, amountA, amountB, tickIndex, fee int) P func (s *MsgServerTestSuite) SetupMultiplePools(poolSetups ...PoolSetup) { for _, p := range poolSetups { coins := sdk.NewCoins( - sdk.NewCoin(p.TokenA, sdk.NewInt(int64(p.AmountA))), - sdk.NewCoin(p.TokenB, sdk.NewInt(int64(p.AmountB))), + sdk.NewCoin(p.TokenA, math.NewInt(int64(p.AmountA))), + sdk.NewCoin(p.TokenB, math.NewInt(int64(p.AmountB))), ) s.fundAccountBalancesWithDenom(s.bob, coins) pairID := types.PairID{Token0: p.TokenA, Token1: p.TokenB} @@ -138,22 +139,22 @@ func (s *MsgServerTestSuite) TestMultiHopSwapMultiRouteOneGood() { s.assertAccountBalanceWithDenom(s.alice, "TokenX", 97) s.assertLiquidityAtTickWithDenom( &types.PairID{Token0: "TokenA", Token1: "TokenB"}, - sdk.NewInt(100), - sdk.NewInt(1), + math.NewInt(100), + math.NewInt(1), 0, 1, ) s.assertLiquidityAtTickWithDenom( &types.PairID{Token0: "TokenB", Token1: "TokenE"}, - sdk.NewInt(99), - sdk.NewInt(2), + math.NewInt(99), + math.NewInt(2), 0, 1, ) s.assertLiquidityAtTickWithDenom( &types.PairID{Token0: "TokenE", Token1: "TokenX"}, - sdk.NewInt(98), - sdk.NewInt(3), + math.NewInt(98), + math.NewInt(3), 0, 1, ) @@ -161,43 +162,43 @@ func (s *MsgServerTestSuite) TestMultiHopSwapMultiRouteOneGood() { // Other pools are unaffected s.assertLiquidityAtTickWithDenom( &types.PairID{Token0: "TokenB", Token1: "TokenC"}, - sdk.NewInt(0), - sdk.NewInt(100), + math.NewInt(0), + math.NewInt(100), 0, 1, ) s.assertLiquidityAtTickWithDenom( &types.PairID{Token0: "TokenC", Token1: "TokenX"}, - sdk.NewInt(0), - sdk.NewInt(50), + math.NewInt(0), + math.NewInt(50), 0, 1, ) s.assertLiquidityAtTickWithDenom( &types.PairID{Token0: "TokenC", Token1: "TokenX"}, - sdk.NewInt(0), - sdk.NewInt(50), + math.NewInt(0), + math.NewInt(50), 2200, 1, ) s.assertLiquidityAtTickWithDenom( &types.PairID{Token0: "TokenB", Token1: "TokenD"}, - sdk.NewInt(0), - sdk.NewInt(100), + math.NewInt(0), + math.NewInt(100), 0, 1, ) s.assertLiquidityAtTickWithDenom( &types.PairID{Token0: "TokenD", Token1: "TokenX"}, - sdk.NewInt(0), - sdk.NewInt(50), + math.NewInt(0), + math.NewInt(50), 0, 1, ) s.assertLiquidityAtTickWithDenom( &types.PairID{Token0: "TokenD", Token1: "TokenX"}, - sdk.NewInt(0), - sdk.NewInt(50), + math.NewInt(0), + math.NewInt(50), 2200, 1, ) @@ -274,22 +275,22 @@ func (s *MsgServerTestSuite) TestMultiHopSwapMultiRouteFindBestRoute() { s.assertAccountBalanceWithDenom(s.alice, "TokenX", 132) s.assertLiquidityAtTickWithDenom( &types.PairID{Token0: "TokenA", Token1: "TokenB"}, - sdk.NewInt(100), - sdk.NewInt(1), + math.NewInt(100), + math.NewInt(1), 0, 1, ) s.assertLiquidityAtTickWithDenom( &types.PairID{Token0: "TokenB", Token1: "TokenE"}, - sdk.NewInt(99), - sdk.NewInt(2), + math.NewInt(99), + math.NewInt(2), 0, 1, ) s.assertLiquidityAtTickWithDenom( &types.PairID{Token0: "TokenE", Token1: "TokenX"}, - sdk.NewInt(98), - sdk.NewInt(868), + math.NewInt(98), + math.NewInt(868), -3000, 1, ) @@ -297,29 +298,29 @@ func (s *MsgServerTestSuite) TestMultiHopSwapMultiRouteFindBestRoute() { // Other pools are unaffected s.assertLiquidityAtTickWithDenom( &types.PairID{Token0: "TokenB", Token1: "TokenC"}, - sdk.NewInt(0), - sdk.NewInt(100), + math.NewInt(0), + math.NewInt(100), 0, 1, ) s.assertLiquidityAtTickWithDenom( &types.PairID{Token0: "TokenC", Token1: "TokenX"}, - sdk.NewInt(0), - sdk.NewInt(1000), + math.NewInt(0), + math.NewInt(1000), -1000, 1, ) s.assertLiquidityAtTickWithDenom( &types.PairID{Token0: "TokenB", Token1: "TokenD"}, - sdk.NewInt(0), - sdk.NewInt(100), + math.NewInt(0), + math.NewInt(100), 0, 1, ) s.assertLiquidityAtTickWithDenom( &types.PairID{Token0: "TokenD", Token1: "TokenX"}, - sdk.NewInt(0), - sdk.NewInt(1000), + math.NewInt(0), + math.NewInt(1000), -2000, 1, ) @@ -366,8 +367,8 @@ func (s *MsgServerTestSuite) TestMultiHopSwapLongRouteWithCache() { s.assertAccountBalanceWithDenom(s.alice, "TokenX", 88) s.assertLiquidityAtTickWithDenom( &types.PairID{Token0: "TokenM", Token1: "TokenX"}, - sdk.NewInt(89), - sdk.NewInt(12), + math.NewInt(89), + math.NewInt(12), 0, 1, ) diff --git a/x/dex/keeper/integration_placelimitorder_test.go b/x/dex/keeper/integration_placelimitorder_test.go index 59ce4ad3f..605441408 100644 --- a/x/dex/keeper/integration_placelimitorder_test.go +++ b/x/dex/keeper/integration_placelimitorder_test.go @@ -4,8 +4,8 @@ import ( "math" "time" + sdkmath "cosmossdk.io/math" abci "github.com/cometbft/cometbft/abci/types" - sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/neutron-org/neutron/x/dex/types" ) @@ -763,7 +763,7 @@ func (s *MsgServerTestSuite) TestPlaceLimitOrderGoodTilAlreadyExpiredFails() { TokenIn: "TokenA", TokenOut: "TokenB", TickIndexInToOut: 0, - AmountIn: sdk.NewInt(50), + AmountIn: sdkmath.NewInt(50), OrderType: types.LimitOrderType_GOOD_TIL_TIME, ExpirationTime: &yesterday, }) diff --git a/x/dex/keeper/integration_withdraw_multi_test.go b/x/dex/keeper/integration_withdraw_multi_test.go index ae4485ff9..6b092f4c3 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 ( - sdk "github.com/cosmos/cosmos-sdk/types" + "cosmossdk.io/math" "github.com/neutron-org/neutron/x/dex/types" ) @@ -11,7 +11,7 @@ func (s *MsgServerTestSuite) TestWithdrawMultiFailure() { // alice deposits 5 A, 5 B in tick 0 fee 0 s.aliceDeposits(NewDeposit(5, 5, 0, 1)) s.assertAliceShares(0, 1, 10) - s.assertLiquidityAtTick(sdk.NewInt(5), sdk.NewInt(5), 0, 1) + s.assertLiquidityAtTick(math.NewInt(5), math.NewInt(5), 0, 1) s.assertAliceBalances(45, 45) s.assertDexBalances(5, 5) @@ -33,7 +33,7 @@ func (s *MsgServerTestSuite) TestWithdrawMultiSuccess() { // alice deposits 5 A, 5 B in tick 0 fee 1 s.aliceDeposits(NewDeposit(5, 5, 0, 1)) s.assertAliceShares(0, 1, 10) - s.assertLiquidityAtTick(sdk.NewInt(5), sdk.NewInt(5), 0, 1) + s.assertLiquidityAtTick(math.NewInt(5), math.NewInt(5), 0, 1) s.assertAliceBalances(45, 45) s.assertDexBalances(5, 5) @@ -48,7 +48,7 @@ func (s *MsgServerTestSuite) TestWithdrawMultiSuccess() { // both withdraws should work // i.e. no shares remaining and entire balance transferred out s.assertAliceShares(0, 1, 0) - s.assertLiquidityAtTick(sdk.ZeroInt(), sdk.ZeroInt(), 0, 1) + s.assertLiquidityAtTick(math.ZeroInt(), math.ZeroInt(), 0, 1) s.assertAliceBalances(50, 50) s.assertDexBalances(0, 0) } diff --git a/x/dex/keeper/integration_withdraw_test.go b/x/dex/keeper/integration_withdraw_test.go index afd7f4ece..afeeb89e9 100644 --- a/x/dex/keeper/integration_withdraw_test.go +++ b/x/dex/keeper/integration_withdraw_test.go @@ -3,7 +3,7 @@ package keeper_test import ( "math" - sdk "github.com/cosmos/cosmos-sdk/types" + sdkmath "cosmossdk.io/math" "github.com/neutron-org/neutron/x/dex/types" ) @@ -251,7 +251,7 @@ func (s *MsgServerTestSuite) TestWithdrawalFailsWithNonExistentPair() { Receiver: s.alice.String(), TokenA: "TokenX", TokenB: "TokenZ", - SharesToRemove: []sdk.Int{sdk.NewInt(10)}, + SharesToRemove: []sdkmath.Int{sdkmath.NewInt(10)}, TickIndexesAToB: []int64{0}, Fees: []uint64{0}, }) diff --git a/x/dex/keeper/internal/testutils/test_helpers.go b/x/dex/keeper/internal/testutils/test_helpers.go index fc72286eb..4b87f7f95 100644 --- a/x/dex/keeper/internal/testutils/test_helpers.go +++ b/x/dex/keeper/internal/testutils/test_helpers.go @@ -1,16 +1,17 @@ package keeper import ( + "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" dexmoduletypes "github.com/neutron-org/neutron/x/dex/types" ) -func NewACoin(amt sdk.Int) sdk.Coin { +func NewACoin(amt math.Int) sdk.Coin { return sdk.NewCoin("TokenA", amt) } -func NewBCoin(amt sdk.Int) sdk.Coin { +func NewBCoin(amt math.Int) sdk.Coin { return sdk.NewCoin("TokenB", amt) } diff --git a/x/dex/keeper/limit_order_expiration_test.go b/x/dex/keeper/limit_order_expiration_test.go index 9e5b2c6af..e73978b37 100644 --- a/x/dex/keeper/limit_order_expiration_test.go +++ b/x/dex/keeper/limit_order_expiration_test.go @@ -5,6 +5,7 @@ import ( "testing" "time" + "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" keepertest "github.com/neutron-org/neutron/testutil/dex/keeper" "github.com/neutron-org/neutron/x/dex/keeper" @@ -47,10 +48,10 @@ func createLimitOrderExpirationAndTranches( TickIndexTakerToMaker: 0, TrancheKey: strconv.Itoa(i), }, - ReservesMakerDenom: sdk.NewInt(10), - ReservesTakerDenom: sdk.NewInt(10), - TotalMakerDenom: sdk.NewInt(10), - TotalTakerDenom: sdk.NewInt(10), + ReservesMakerDenom: math.NewInt(10), + ReservesTakerDenom: math.NewInt(10), + TotalMakerDenom: math.NewInt(10), + TotalTakerDenom: math.NewInt(10), ExpirationTime: &expTimes[i], } items[i].ExpirationTime = expTimes[i] diff --git a/x/dex/keeper/limit_order_tranche.go b/x/dex/keeper/limit_order_tranche.go index 6628c4e12..791629989 100644 --- a/x/dex/keeper/limit_order_tranche.go +++ b/x/dex/keeper/limit_order_tranche.go @@ -4,6 +4,7 @@ import ( "fmt" "time" + "cosmossdk.io/math" "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/neutron-org/neutron/x/dex/types" @@ -20,10 +21,10 @@ func NewLimitOrderTranche( } return &types.LimitOrderTranche{ Key: limitOrderTrancheKey, - ReservesMakerDenom: sdk.ZeroInt(), - ReservesTakerDenom: sdk.ZeroInt(), - TotalMakerDenom: sdk.ZeroInt(), - TotalTakerDenom: sdk.ZeroInt(), + ReservesMakerDenom: math.ZeroInt(), + ReservesTakerDenom: math.ZeroInt(), + TotalMakerDenom: math.ZeroInt(), + TotalTakerDenom: math.ZeroInt(), ExpirationTime: goodTil, PriceTakerToMaker: priceTakerToMaker, }, nil diff --git a/x/dex/keeper/limit_order_tranche_user.go b/x/dex/keeper/limit_order_tranche_user.go index 077982a41..b075fff67 100644 --- a/x/dex/keeper/limit_order_tranche_user.go +++ b/x/dex/keeper/limit_order_tranche_user.go @@ -1,6 +1,7 @@ package keeper import ( + "cosmossdk.io/math" "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/neutron-org/neutron/x/dex/types" @@ -20,9 +21,9 @@ func (k Keeper) GetOrInitLimitOrderTrancheUser( return &types.LimitOrderTrancheUser{ TrancheKey: trancheKey, Address: receiver, - SharesOwned: sdk.ZeroInt(), - SharesWithdrawn: sdk.ZeroInt(), - SharesCancelled: sdk.ZeroInt(), + SharesOwned: math.ZeroInt(), + SharesWithdrawn: math.ZeroInt(), + SharesCancelled: math.ZeroInt(), TickIndexTakerToMaker: tickIndex, TradePairID: tradePairID, OrderType: orderType, diff --git a/x/dex/keeper/limit_order_tranche_user_test.go b/x/dex/keeper/limit_order_tranche_user_test.go index 7ac9acbbc..65cf048f4 100644 --- a/x/dex/keeper/limit_order_tranche_user_test.go +++ b/x/dex/keeper/limit_order_tranche_user_test.go @@ -4,6 +4,7 @@ import ( "strconv" "testing" + "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" keepertest "github.com/neutron-org/neutron/testutil/dex/keeper" "github.com/neutron-org/neutron/testutil/dex/nullify" @@ -20,9 +21,9 @@ func createNLimitOrderTrancheUser(keeper *keeper.Keeper, ctx sdk.Context, n int) Address: strconv.Itoa(i), TradePairID: &types.TradePairID{MakerDenom: "TokenA", TakerDenom: "TokenB"}, TickIndexTakerToMaker: 0, - SharesOwned: sdk.ZeroInt(), - SharesWithdrawn: sdk.ZeroInt(), - SharesCancelled: sdk.ZeroInt(), + SharesOwned: math.ZeroInt(), + SharesWithdrawn: math.ZeroInt(), + SharesCancelled: math.ZeroInt(), } items[i] = val keeper.SetLimitOrderTrancheUser(ctx, items[i]) @@ -39,9 +40,9 @@ func createNLimitOrderTrancheUserWithAddress(keeper *keeper.Keeper, ctx sdk.Cont Address: address, TradePairID: &types.TradePairID{MakerDenom: "TokenA", TakerDenom: "TokenB"}, TickIndexTakerToMaker: 0, - SharesOwned: sdk.ZeroInt(), - SharesWithdrawn: sdk.ZeroInt(), - SharesCancelled: sdk.ZeroInt(), + SharesOwned: math.ZeroInt(), + SharesWithdrawn: math.ZeroInt(), + SharesCancelled: math.ZeroInt(), } items[i] = val keeper.SetLimitOrderTrancheUser(ctx, items[i]) @@ -89,9 +90,9 @@ func (s *MsgServerTestSuite) TestGetAllLimitOrders() { TickIndexTakerToMaker: 1, TrancheKey: trancheKeyA, Address: s.alice.String(), - SharesOwned: sdk.NewInt(10), - SharesWithdrawn: sdk.NewInt(0), - SharesCancelled: sdk.NewInt(0), + SharesOwned: math.NewInt(10), + SharesWithdrawn: math.NewInt(0), + SharesCancelled: math.NewInt(0), }, LOList[0], ) @@ -100,9 +101,9 @@ func (s *MsgServerTestSuite) TestGetAllLimitOrders() { TickIndexTakerToMaker: 0, TrancheKey: trancheKeyB, Address: s.alice.String(), - SharesOwned: sdk.NewInt(10), - SharesWithdrawn: sdk.NewInt(0), - SharesCancelled: sdk.NewInt(0), + SharesOwned: math.NewInt(10), + SharesWithdrawn: math.NewInt(0), + SharesCancelled: math.NewInt(0), }, LOList[1], ) diff --git a/x/dex/keeper/liquidity.go b/x/dex/keeper/liquidity.go index 4615f7741..f6a8d4521 100644 --- a/x/dex/keeper/liquidity.go +++ b/x/dex/keeper/liquidity.go @@ -1,6 +1,7 @@ package keeper import ( + "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" math_utils "github.com/neutron-org/neutron/utils/math" "github.com/neutron-org/neutron/x/dex/types" @@ -9,19 +10,19 @@ import ( func (k Keeper) Swap( ctx sdk.Context, tradePairID *types.TradePairID, - maxAmountTakerDenom sdk.Int, - maxAmountMakerDenom *sdk.Int, + maxAmountTakerDenom math.Int, + maxAmountMakerDenom *math.Int, limitPrice *math_utils.PrecDec, ) (totalTakerCoin, totalMakerCoin sdk.Coin, orderFilled bool, err error) { useMaxOut := maxAmountMakerDenom != nil - var remainingMakerDenom *sdk.Int + var remainingMakerDenom *math.Int if useMaxOut { copy := *maxAmountMakerDenom remainingMakerDenom = © } remainingTakerDenom := maxAmountTakerDenom - totalMakerDenom := sdk.ZeroInt() + totalMakerDenom := math.ZeroInt() orderFilled = false // verify that amount left is not zero and that there are additional valid ticks to check @@ -57,7 +58,7 @@ func (k Keeper) Swap( remainingMakerDenom = © // if maxAmountOut has been used up then exit - if remainingMakerDenom.LTE(sdk.ZeroInt()) { + if remainingMakerDenom.LTE(math.ZeroInt()) { orderFilled = true break } @@ -77,8 +78,8 @@ func (k Keeper) Swap( func (k Keeper) SwapWithCache( ctx sdk.Context, tradePairID *types.TradePairID, - maxAmountIn sdk.Int, - maxAmountOut *sdk.Int, + maxAmountIn math.Int, + maxAmountOut *math.Int, limitPrice *math_utils.PrecDec, ) (totalIn, totalOut sdk.Coin, orderFilled bool, err error) { cacheCtx, writeCache := ctx.CacheContext() diff --git a/x/dex/keeper/liquidity_test.go b/x/dex/keeper/liquidity_test.go index 6b6626e77..1a8f606e8 100644 --- a/x/dex/keeper/liquidity_test.go +++ b/x/dex/keeper/liquidity_test.go @@ -4,6 +4,7 @@ import ( "math" "testing" + sdkmath "cosmossdk.io/math" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" sdk "github.com/cosmos/cosmos-sdk/types" dualityapp "github.com/neutron-org/neutron/app" @@ -602,7 +603,7 @@ func (s *LiquidityTestSuite) placeGTCLimitOrder( types.LimitOrderType_GOOD_TIL_CANCELLED, ) s.Assert().NoError(err) - tranche.PlaceMakerLimitOrder(sdk.NewInt(amountIn)) + tranche.PlaceMakerLimitOrder(sdkmath.NewInt(amountIn)) s.app.DexKeeper.SaveTranche(s.ctx, tranche) } @@ -616,7 +617,7 @@ func (s *LiquidityTestSuite) swap( coinIn, coinOut, _, err = s.app.DexKeeper.Swap( s.ctx, tradePairID, - sdk.NewInt(maxAmountIn), + sdkmath.NewInt(maxAmountIn), nil, nil, ) @@ -631,11 +632,11 @@ func (s *LiquidityTestSuite) swapWithMaxOut( maxAmountOut int64, ) (coinIn, coinOut sdk.Coin) { tradePairID := types.MustNewTradePairID(tokenIn, tokenOut) - maxAmountOutInt := sdk.NewInt(maxAmountOut) + maxAmountOutInt := sdkmath.NewInt(maxAmountOut) coinIn, coinOut, _, err := s.app.DexKeeper.Swap( s.ctx, tradePairID, - sdk.NewInt(maxAmountIn), + sdkmath.NewInt(maxAmountIn), &maxAmountOutInt, nil, ) @@ -654,17 +655,17 @@ func (s *LiquidityTestSuite) assertSwapOutput( amtOut := actualOut.Amount s.Assert(). - True(amtIn.Equal(sdk.NewInt(expectedIn)), "Expected amountIn %d != %s", expectedIn, amtIn) + True(amtIn.Equal(sdkmath.NewInt(expectedIn)), "Expected amountIn %d != %s", expectedIn, amtIn) s.Assert(). - True(amtOut.Equal(sdk.NewInt(expectedOut)), "Expected amountOut %d != %s", expectedOut, amtOut) + True(amtOut.Equal(sdkmath.NewInt(expectedOut)), "Expected amountOut %d != %s", expectedOut, amtOut) } func (s *LiquidityTestSuite) assertDexBalances(expectedABalance int64, expectedBBalance int64) { // NOTE: We can't just check the actual DEX bank balances since we are testing swap // before any transfers take place. Instead we have to sum up the total amount of coins // at each tick - expectedAInt := sdk.NewInt(expectedABalance) - expectedBInt := sdk.NewInt(expectedBBalance) + expectedAInt := sdkmath.NewInt(expectedABalance) + expectedBInt := sdkmath.NewInt(expectedBBalance) allCoins := sdk.Coins{} ticks := s.app.DexKeeper.GetAllTickLiquidity(s.ctx) inactiveLOs := s.app.DexKeeper.GetAllInactiveLimitOrderTranche(s.ctx) diff --git a/x/dex/keeper/msg_server_test.go b/x/dex/keeper/msg_server_test.go index fdf0f89af..fb8b1073c 100644 --- a/x/dex/keeper/msg_server_test.go +++ b/x/dex/keeper/msg_server_test.go @@ -6,14 +6,15 @@ import ( "testing" "time" + sdkmath "cosmossdk.io/math" abci "github.com/cometbft/cometbft/abci/types" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" dualityapp "github.com/neutron-org/neutron/app" - math_utils "github.com/neutron-org/neutron/utils/math" "github.com/neutron-org/neutron/testutil" + math_utils "github.com/neutron-org/neutron/utils/math" . "github.com/neutron-org/neutron/x/dex/keeper" . "github.com/neutron-org/neutron/x/dex/keeper/internal/testutils" "github.com/neutron-org/neutron/x/dex/types" @@ -79,8 +80,8 @@ func (s *MsgServerTestSuite) SetupTest() { /// Fund accounts func (s *MsgServerTestSuite) fundAccountBalances(account sdk.AccAddress, aBalance, bBalance int64) { - aBalanceInt := sdk.NewInt(aBalance) - bBalanceInt := sdk.NewInt(bBalance) + aBalanceInt := sdkmath.NewInt(aBalance) + bBalanceInt := sdkmath.NewInt(bBalance) balances := sdk.NewCoins(NewACoin(aBalanceInt), NewBCoin(bBalanceInt)) err := FundAccount(s.app.BankKeeper, s.ctx, account, balances) s.Assert().NoError(err) @@ -118,8 +119,8 @@ func (s *MsgServerTestSuite) fundDanBalances(a, b int64) { func (s *MsgServerTestSuite) assertAccountBalancesInt( account sdk.AccAddress, - aBalance sdk.Int, - bBalance sdk.Int, + aBalance sdkmath.Int, + bBalance sdkmath.Int, ) { aActual := s.app.BankKeeper.GetBalance(s.ctx, account, "TokenA").Amount s.Assert().True(aBalance.Equal(aActual), "expected %s != actual %s", aBalance, aActual) @@ -133,7 +134,7 @@ func (s *MsgServerTestSuite) assertAccountBalances( aBalance int64, bBalance int64, ) { - s.assertAccountBalancesInt(account, sdk.NewInt(aBalance), sdk.NewInt(bBalance)) + s.assertAccountBalancesInt(account, sdkmath.NewInt(aBalance), sdkmath.NewInt(bBalance)) } func (s *MsgServerTestSuite) assertAccountBalanceWithDenom( @@ -142,7 +143,7 @@ func (s *MsgServerTestSuite) assertAccountBalanceWithDenom( expBalance int64, ) { actualBalance := s.app.BankKeeper.GetBalance(s.ctx, account, denom).Amount - expBalanceInt := sdk.NewInt(expBalance) + expBalanceInt := sdkmath.NewInt(expBalance) s.Assert(). True(expBalanceInt.Equal(actualBalance), "expected %s != actual %s", expBalance, actualBalance) } @@ -151,7 +152,7 @@ func (s *MsgServerTestSuite) assertAliceBalances(a, b int64) { s.assertAccountBalances(s.alice, a, b) } -func (s *MsgServerTestSuite) assertAliceBalancesInt(a, b sdk.Int) { +func (s *MsgServerTestSuite) assertAliceBalancesInt(a, b sdkmath.Int) { s.assertAccountBalancesInt(s.alice, a, b) } @@ -159,7 +160,7 @@ func (s *MsgServerTestSuite) assertBobBalances(a, b int64) { s.assertAccountBalances(s.bob, a, b) } -func (s *MsgServerTestSuite) assertBobBalancesInt(a, b sdk.Int) { +func (s *MsgServerTestSuite) assertBobBalancesInt(a, b sdkmath.Int) { s.assertAccountBalancesInt(s.bob, a, b) } @@ -167,7 +168,7 @@ func (s *MsgServerTestSuite) assertCarolBalances(a, b int64) { s.assertAccountBalances(s.carol, a, b) } -func (s *MsgServerTestSuite) assertCarolBalancesInt(a, b sdk.Int) { +func (s *MsgServerTestSuite) assertCarolBalancesInt(a, b sdkmath.Int) { s.assertAccountBalancesInt(s.carol, a, b) } @@ -175,7 +176,7 @@ func (s *MsgServerTestSuite) assertDanBalances(a, b int64) { s.assertAccountBalances(s.dan, a, b) } -func (s *MsgServerTestSuite) assertDanBalancesInt(a, b sdk.Int) { +func (s *MsgServerTestSuite) assertDanBalancesInt(a, b sdkmath.Int) { s.assertAccountBalancesInt(s.dan, a, b) } @@ -191,7 +192,7 @@ func (s *MsgServerTestSuite) assertDexBalanceWithDenom(denom string, expectedAmo ) } -func (s *MsgServerTestSuite) assertDexBalancesInt(a, b sdk.Int) { +func (s *MsgServerTestSuite) assertDexBalancesInt(a, b sdkmath.Int) { s.assertAccountBalancesInt(s.app.AccountKeeper.GetModuleAddress("dex"), a, b) } @@ -372,7 +373,7 @@ func (s *MsgServerTestSuite) limitSellsWithMaxOut( maxAmoutOut int, ) string { tokenIn, tokenOut := GetInOutTokens(tokenIn, "TokenA", "TokenB") - maxAmountOutInt := sdk.NewInt(int64(maxAmoutOut)) + maxAmountOutInt := sdkmath.NewInt(int64(maxAmoutOut)) msg, err := s.msgServer.PlaceLimitOrder(s.goCtx, &types.MsgPlaceLimitOrder{ Creator: account.String(), @@ -380,7 +381,7 @@ func (s *MsgServerTestSuite) limitSellsWithMaxOut( TokenIn: tokenIn, TokenOut: tokenOut, TickIndexInToOut: int64(tick), - AmountIn: sdk.NewInt(int64(amountIn)), + AmountIn: sdkmath.NewInt(int64(amountIn)), OrderType: types.LimitOrderType_FILL_OR_KILL, MaxAmountOut: &maxAmountOutInt, }) @@ -411,7 +412,7 @@ func (s *MsgServerTestSuite) limitSells( TokenIn: tradePairID.TakerDenom, TokenOut: tradePairID.MakerDenom, TickIndexInToOut: tickIndexTakerToMaker, - AmountIn: sdk.NewInt(int64(amountIn)), + AmountIn: sdkmath.NewInt(int64(amountIn)), OrderType: orderType, }) @@ -433,7 +434,7 @@ func (s *MsgServerTestSuite) limitSellsGoodTil( TokenIn: tradePairID.TakerDenom, TokenOut: tradePairID.MakerDenom, TickIndexInToOut: tickIndexTakerToMaker, - AmountIn: sdk.NewInt(int64(amountIn)), + AmountIn: sdkmath.NewInt(int64(amountIn)), OrderType: types.LimitOrderType_GOOD_TIL_TIME, ExpirationTime: &goodTil, }) @@ -445,8 +446,8 @@ func (s *MsgServerTestSuite) limitSellsGoodTil( // / Deposit type Deposit struct { - AmountA sdk.Int - AmountB sdk.Int + AmountA sdkmath.Int + AmountB sdkmath.Int TickIndex int64 Fee uint64 } @@ -456,8 +457,8 @@ type DepositOptions struct { } type DepositWithOptions struct { - AmountA sdk.Int - AmountB sdk.Int + AmountA sdkmath.Int + AmountB sdkmath.Int TickIndex int64 Fee uint64 Options DepositOptions @@ -465,8 +466,8 @@ type DepositWithOptions struct { func NewDeposit(amountA, amountB, tickIndex, fee int) *Deposit { return &Deposit{ - AmountA: sdk.NewInt(int64(amountA)), - AmountB: sdk.NewInt(int64(amountB)), + AmountA: sdkmath.NewInt(int64(amountA)), + AmountB: sdkmath.NewInt(int64(amountB)), TickIndex: int64(tickIndex), Fee: uint64(fee), } @@ -477,8 +478,8 @@ func NewDepositWithOptions( options DepositOptions, ) *DepositWithOptions { return &DepositWithOptions{ - AmountA: sdk.NewInt(int64(amountA)), - AmountB: sdk.NewInt(int64(amountB)), + AmountA: sdkmath.NewInt(int64(amountA)), + AmountB: sdkmath.NewInt(int64(amountB)), TickIndex: int64(tickIndex), Fee: uint64(fee), Options: options, @@ -514,8 +515,8 @@ func (s *MsgServerTestSuite) deposits( deposits []*Deposit, pairID ...types.PairID, ) { - amountsA := make([]sdk.Int, len(deposits)) - amountsB := make([]sdk.Int, len(deposits)) + amountsA := make([]sdkmath.Int, len(deposits)) + amountsB := make([]sdkmath.Int, len(deposits)) tickIndexes := make([]int64, len(deposits)) fees := make([]uint64, len(deposits)) options := make([]*types.DepositOptions, len(deposits)) @@ -557,8 +558,8 @@ func (s *MsgServerTestSuite) depositsWithOptions( account sdk.AccAddress, deposits ...*DepositWithOptions, ) { - amountsA := make([]sdk.Int, len(deposits)) - amountsB := make([]sdk.Int, len(deposits)) + amountsA := make([]sdkmath.Int, len(deposits)) + amountsB := make([]sdkmath.Int, len(deposits)) tickIndexes := make([]int64, len(deposits)) fees := make([]uint64, len(deposits)) options := make([]*types.DepositOptions, len(deposits)) @@ -586,7 +587,7 @@ func (s *MsgServerTestSuite) depositsWithOptions( s.Assert().Nil(err) } -func (s *MsgServerTestSuite) getLiquidityAtTick(tickIndex int64, fee uint64) (sdk.Int, sdk.Int) { +func (s *MsgServerTestSuite) getLiquidityAtTick(tickIndex int64, fee uint64) (sdkmath.Int, sdkmath.Int) { pool, err := s.app.DexKeeper.GetOrInitPool(s.ctx, defaultPairID, tickIndex, fee) s.Assert().NoError(err) @@ -600,7 +601,7 @@ func (s *MsgServerTestSuite) getLiquidityAtTickWithDenom( pairID *types.PairID, tickIndex int64, fee uint64, -) (sdk.Int, sdk.Int) { +) (sdkmath.Int, sdkmath.Int) { pool, err := s.app.DexKeeper.GetOrInitPool(s.ctx, pairID, tickIndex, fee) s.Assert().NoError(err) @@ -631,8 +632,8 @@ func (s *MsgServerTestSuite) assertDepositFails( expectedErr error, deposits ...*Deposit, ) { - amountsA := make([]sdk.Int, len(deposits)) - amountsB := make([]sdk.Int, len(deposits)) + amountsA := make([]sdkmath.Int, len(deposits)) + amountsB := make([]sdkmath.Int, len(deposits)) tickIndexes := make([]int64, len(deposits)) fees := make([]uint64, len(deposits)) options := make([]*types.DepositOptions, len(deposits)) @@ -677,18 +678,18 @@ func (s *MsgServerTestSuite) assertDepositReponse( } type DepositReponse struct { - amountsA []sdk.Int - amountsB []sdk.Int + amountsA []sdkmath.Int + amountsB []sdkmath.Int } // Withdraw type Withdrawal struct { TickIndex int64 Fee uint64 - Shares sdk.Int + Shares sdkmath.Int } -func NewWithdrawalInt(shares sdk.Int, tick int64, fee uint64) *Withdrawal { +func NewWithdrawalInt(shares sdkmath.Int, tick int64, fee uint64) *Withdrawal { return &Withdrawal{ Shares: shares, Fee: fee, @@ -697,7 +698,7 @@ func NewWithdrawalInt(shares sdk.Int, tick int64, fee uint64) *Withdrawal { } func NewWithdrawal(shares, tick int64, fee uint64) *Withdrawal { - return NewWithdrawalInt(sdk.NewInt(shares), tick, fee) + return NewWithdrawalInt(sdkmath.NewInt(shares), tick, fee) } func (s *MsgServerTestSuite) aliceWithdraws(withdrawals ...*Withdrawal) { @@ -719,7 +720,7 @@ func (s *MsgServerTestSuite) danWithdraws(withdrawals ...*Withdrawal) { func (s *MsgServerTestSuite) withdraws(account sdk.AccAddress, withdrawals ...*Withdrawal) { tickIndexes := make([]int64, len(withdrawals)) fee := make([]uint64, len(withdrawals)) - sharesToRemove := make([]sdk.Int, len(withdrawals)) + sharesToRemove := make([]sdkmath.Int, len(withdrawals)) for i, e := range withdrawals { tickIndexes[i] = e.TickIndex fee[i] = e.Fee @@ -761,7 +762,7 @@ func (s *MsgServerTestSuite) withdrawFails( ) { tickIndexes := make([]int64, len(withdrawals)) fee := make([]uint64, len(withdrawals)) - sharesToRemove := make([]sdk.Int, len(withdrawals)) + sharesToRemove := make([]sdkmath.Int, len(withdrawals)) for i, e := range withdrawals { tickIndexes[i] = e.TickIndex fee[i] = e.Fee @@ -884,7 +885,7 @@ func (s *MsgServerTestSuite) multiHopSwaps( account.String(), account.String(), routes, - sdk.NewInt(int64(amountIn)), + sdkmath.NewInt(int64(amountIn)), exitLimitPrice, pickBest, ) @@ -906,7 +907,7 @@ func (s *MsgServerTestSuite) aliceEstimatesMultiHopSwap( Creator: s.alice.String(), Receiver: s.alice.String(), Routes: multiHopRoutes, - AmountIn: sdk.NewInt(int64(amountIn)), + AmountIn: sdkmath.NewInt(int64(amountIn)), ExitLimitPrice: exitLimitPrice, PickBestRoute: pickBest, } @@ -930,7 +931,7 @@ func (s *MsgServerTestSuite) aliceEstimatesMultiHopSwapFails( Creator: s.alice.String(), Receiver: s.alice.String(), Routes: multiHopRoutes, - AmountIn: sdk.NewInt(int64(amountIn)), + AmountIn: sdkmath.NewInt(int64(amountIn)), ExitLimitPrice: exitLimitPrice, PickBestRoute: pickBest, } @@ -990,7 +991,7 @@ func (s *MsgServerTestSuite) multiHopSwapFails( account.String(), account.String(), routes, - sdk.NewInt(int64(amountIn)), + sdkmath.NewInt(int64(amountIn)), exitLimitPrice, pickBest, ) @@ -1058,10 +1059,10 @@ func (s *MsgServerTestSuite) getPoolShares( token1 string, tick int64, fee uint64, -) (shares sdk.Int) { +) (shares sdkmath.Int) { poolID, found := s.app.DexKeeper.GetPoolIDByParams(s.ctx, &types.PairID{Token0: token0, Token1: token1}, tick, fee) if !found { - return sdk.ZeroInt() + return sdkmath.ZeroInt() } poolDenom := types.NewPoolDenom(poolID) return s.app.BankKeeper.GetSupply(s.ctx, poolDenom).Amount @@ -1072,7 +1073,7 @@ func (s *MsgServerTestSuite) assertPoolShares( fee uint64, sharesExpected uint64, ) { - sharesExpectedInt := sdk.NewIntFromUint64(sharesExpected) + sharesExpectedInt := sdkmath.NewIntFromUint64(sharesExpected) sharesOwned := s.getPoolShares("TokenA", "TokenB", tick, fee) s.Assert().Equal(sharesExpectedInt, sharesOwned) } @@ -1083,10 +1084,10 @@ func (s *MsgServerTestSuite) getAccountShares( token1 string, tick int64, fee uint64, -) (shares sdk.Int) { +) (shares sdkmath.Int) { id, found := s.app.DexKeeper.GetPoolIDByParams(s.ctx, types.MustNewPairID(token0, token1), tick, fee) if !found { - return sdk.ZeroInt() + return sdkmath.ZeroInt() } poolDenom := types.NewPoolDenom(id) @@ -1099,7 +1100,7 @@ func (s *MsgServerTestSuite) assertAccountShares( fee uint64, sharesExpected uint64, ) { - sharesExpectedInt := sdk.NewIntFromUint64(sharesExpected) + sharesExpectedInt := sdkmath.NewIntFromUint64(sharesExpected) sharesOwned := s.getAccountShares(account, "TokenA", "TokenB", tick, fee) s.Assert(). Equal(sharesExpectedInt, sharesOwned, "expected %s != actual %s", sharesExpected, sharesOwned) @@ -1156,7 +1157,7 @@ func (s *MsgServerTestSuite) assertCurr1To0(curr1To0Expected int64) { // Pool liquidity (i.e. deposited rather than LO) func (s *MsgServerTestSuite) assertLiquidityAtTick( - amountA, amountB sdk.Int, + amountA, amountB sdkmath.Int, tickIndex int64, fee uint64, ) { @@ -1169,7 +1170,7 @@ func (s *MsgServerTestSuite) assertLiquidityAtTick( func (s *MsgServerTestSuite) assertLiquidityAtTickWithDenom( pairID *types.PairID, - expected0, expected1 sdk.Int, + expected0, expected1 sdkmath.Int, tickIndex int64, fee uint64, ) { @@ -1185,11 +1186,11 @@ func (s *MsgServerTestSuite) assertPoolLiquidity( tickIndex int64, fee uint64, ) { - s.assertLiquidityAtTick(sdk.NewInt(int64(amountA)), sdk.NewInt(int64(amountB)), tickIndex, fee) + s.assertLiquidityAtTick(sdkmath.NewInt(int64(amountA)), sdkmath.NewInt(int64(amountB)), tickIndex, fee) } func (s *MsgServerTestSuite) assertNoLiquidityAtTick(tickIndex int64, fee uint64) { - s.assertLiquidityAtTick(sdk.ZeroInt(), sdk.ZeroInt(), tickIndex, fee) + s.assertLiquidityAtTick(sdkmath.ZeroInt(), sdkmath.ZeroInt(), tickIndex, fee) } // Filled limit liquidity @@ -1246,7 +1247,7 @@ func (s *MsgServerTestSuite) assertLimitFilledAtTickAtIndex( ) userRatio := math_utils.NewPrecDecFromInt(userShares).QuoInt(totalShares) filled := s.getLimitFilledLiquidityAtTickAtIndex(selling, tickIndex, trancheKey) - amt := sdk.NewInt(int64(amount)) + amt := sdkmath.NewInt(int64(amount)) userFilled := userRatio.MulInt(filled).RoundInt() s.Assert().True(amt.Equal(userFilled)) } @@ -1302,13 +1303,13 @@ func (s *MsgServerTestSuite) assertLimitLiquidityAtTick( selling string, tickIndexNormalized, amount int64, ) { - s.assertLimitLiquidityAtTickInt(selling, tickIndexNormalized, sdk.NewInt(amount)) + s.assertLimitLiquidityAtTickInt(selling, tickIndexNormalized, sdkmath.NewInt(amount)) } func (s *MsgServerTestSuite) assertLimitLiquidityAtTickInt( selling string, tickIndexNormalized int64, - amount sdk.Int, + amount sdkmath.Int, ) { tradePairID := defaultPairID.MustTradePairIDFromMaker(selling) tickIndexTakerToMaker := tradePairID.TickIndexTakerToMaker(tickIndexNormalized) @@ -1317,7 +1318,7 @@ func (s *MsgServerTestSuite) assertLimitLiquidityAtTickInt( tradePairID, tickIndexTakerToMaker, ) - liquidity := sdk.ZeroInt() + liquidity := sdkmath.ZeroInt() for _, t := range tranches { if !t.IsExpired(s.ctx) { liquidity = liquidity.Add(t.ReservesMakerDenom) @@ -1358,7 +1359,7 @@ func (s *MsgServerTestSuite) getLimitUserSharesAtTick( account sdk.AccAddress, selling string, tickIndexNormalized int64, -) sdk.Int { +) sdkmath.Int { tradePairID := defaultPairID.MustTradePairIDFromMaker(selling) tickIndexTakerToMaker := tradePairID.TickIndexTakerToMaker(tickIndexNormalized) tranches := s.app.DexKeeper.GetAllLimitOrderTrancheAtIndex( @@ -1381,7 +1382,7 @@ func (s *MsgServerTestSuite) getLimitUserSharesAtTick( func (s *MsgServerTestSuite) getLimitUserSharesAtTickAtIndex( account sdk.AccAddress, trancheKey string, -) sdk.Int { +) sdkmath.Int { userShares, found := s.app.DexKeeper.GetLimitOrderTrancheUser( s.ctx, account.String(), @@ -1394,7 +1395,7 @@ func (s *MsgServerTestSuite) getLimitUserSharesAtTickAtIndex( func (s *MsgServerTestSuite) getLimitTotalSharesAtTick( selling string, tickIndexNormalized int64, -) sdk.Int { +) sdkmath.Int { tradePairID := defaultPairID.MustTradePairIDFromMaker(selling) tickIndexTakerToMaker := tradePairID.TickIndexTakerToMaker(tickIndexNormalized) tranches := s.app.DexKeeper.GetAllLimitOrderTrancheAtIndex( @@ -1403,7 +1404,7 @@ func (s *MsgServerTestSuite) getLimitTotalSharesAtTick( tickIndexTakerToMaker, ) // get user shares and total shares - totalShares := sdk.ZeroInt() + totalShares := sdkmath.ZeroInt() for _, t := range tranches { totalShares = totalShares.Add(t.TotalMakerDenom) } @@ -1415,7 +1416,7 @@ func (s *MsgServerTestSuite) getLimitFilledLiquidityAtTickAtIndex( selling string, tickIndex int64, trancheKey string, -) sdk.Int { +) sdkmath.Int { // grab fill tranche reserves and shares tradePairID := defaultPairID.MustTradePairIDFromMaker(selling) tranche, _, found := s.app.DexKeeper.FindLimitOrderTranche(s.ctx, &types.LimitOrderTrancheKey{ @@ -1432,7 +1433,7 @@ func (s *MsgServerTestSuite) getLimitReservesAtTickAtKey( selling string, tickIndex int64, trancheKey string, -) sdk.Int { +) sdkmath.Int { // grab fill tranche reserves and shares tradePairID := defaultPairID.MustTradePairIDFromMaker(selling) tranche, _, found := s.app.DexKeeper.FindLimitOrderTranche(s.ctx, &types.LimitOrderTrancheKey{ @@ -1452,18 +1453,18 @@ func (s *MsgServerTestSuite) calcAutoswapSharesMinted( centerTick int64, fee uint64, residual0, residual1, balanced0, balanced1, totalShares, valuePool int64, -) sdk.Int { - residual0Int, residual1Int, balanced0Int, balanced1Int, totalSharesInt, valuePoolInt := sdk.NewInt( +) sdkmath.Int { + residual0Int, residual1Int, balanced0Int, balanced1Int, totalSharesInt, valuePoolInt := sdkmath.NewInt( residual0, - ), sdk.NewInt( + ), sdkmath.NewInt( residual1, - ), sdk.NewInt( + ), sdkmath.NewInt( balanced0, - ), sdk.NewInt( + ), sdkmath.NewInt( balanced1, - ), sdk.NewInt( + ), sdkmath.NewInt( totalShares, - ), sdk.NewInt( + ), sdkmath.NewInt( valuePool, ) @@ -1487,19 +1488,19 @@ func (s *MsgServerTestSuite) calcAutoswapSharesMinted( return valueMint.Mul(totalSharesInt).Quo(valuePoolInt) } -func (s *MsgServerTestSuite) calcSharesMinted(centerTick, amount0Int, amount1Int int64) sdk.Int { - amount0, amount1 := sdk.NewInt(amount0Int), sdk.NewInt(amount1Int) +func (s *MsgServerTestSuite) calcSharesMinted(centerTick, amount0Int, amount1Int int64) sdkmath.Int { + amount0, amount1 := sdkmath.NewInt(amount0Int), sdkmath.NewInt(amount1Int) centerPrice := types.MustCalcPrice(-1 * centerTick) return math_utils.NewPrecDecFromInt(amount0).Add(centerPrice.Mul(math_utils.NewPrecDecFromInt(amount1))).TruncateInt() } func (s *MsgServerTestSuite) calcExpectedBalancesAfterWithdrawOnePool( - sharesMinted sdk.Int, + sharesMinted sdkmath.Int, account sdk.AccAddress, tickIndex int64, fee uint64, -) (sdk.Int, sdk.Int, sdk.Int, sdk.Int) { +) (sdkmath.Int, sdkmath.Int, sdkmath.Int, sdkmath.Int) { dexCurrentBalance0 := s.app.BankKeeper.GetBalance( s.ctx, s.app.AccountKeeper.GetModuleAddress("dex"), diff --git a/x/dex/keeper/multihop_swap.go b/x/dex/keeper/multihop_swap.go index e26321290..02dac052a 100644 --- a/x/dex/keeper/multihop_swap.go +++ b/x/dex/keeper/multihop_swap.go @@ -1,6 +1,7 @@ package keeper import ( + "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" math_utils "github.com/neutron-org/neutron/utils/math" @@ -51,10 +52,10 @@ type StepResult struct { type multihopCacheKey struct { TokenIn string TokenOut string - InAmount sdk.Int + InAmount math.Int } -func newCacheKey(tokenIn, tokenOut string, inAmount sdk.Int) multihopCacheKey { +func newCacheKey(tokenIn, tokenOut string, inAmount math.Int) multihopCacheKey { return multihopCacheKey{ TokenIn: tokenIn, TokenOut: tokenOut, @@ -147,7 +148,7 @@ func (k Keeper) RunMultihopRoute( func (k Keeper) SwapExactAmountIn(ctx sdk.Context, tradePairID *types.TradePairID, - amountIn sdk.Int, + amountIn math.Int, ) (totalOut sdk.Coin, err error) { _, swapAmountMakerDenom, orderFilled, err := k.Swap( ctx, diff --git a/x/dex/keeper/pair_helper.go b/x/dex/keeper/pair_helper.go index 82ce6b6b0..a54f31934 100644 --- a/x/dex/keeper/pair_helper.go +++ b/x/dex/keeper/pair_helper.go @@ -1,10 +1,10 @@ package keeper import ( - sdk "github.com/cosmos/cosmos-sdk/types" + "cosmossdk.io/math" ) -func SortAmounts(tokenA, token0 string, amountsA, amountsB []sdk.Int) ([]sdk.Int, []sdk.Int) { +func SortAmounts(tokenA, token0 string, amountsA, amountsB []math.Int) ([]math.Int, []math.Int) { if tokenA == token0 { return amountsA, amountsB } diff --git a/x/dex/keeper/pool_test.go b/x/dex/keeper/pool_test.go index ecb231ff9..14d0bb05e 100644 --- a/x/dex/keeper/pool_test.go +++ b/x/dex/keeper/pool_test.go @@ -3,6 +3,7 @@ package keeper_test import ( "testing" + "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" keepertest "github.com/neutron-org/neutron/testutil/dex/keeper" "github.com/neutron-org/neutron/x/dex/keeper" @@ -17,7 +18,7 @@ func createNPools(k *keeper.Keeper, ctx sdk.Context, n int) []*types.Pool { if err != nil { panic("failed to create pool") } - pool.Deposit(sdk.NewInt(10), sdk.NewInt(0), sdk.ZeroInt(), true) + pool.Deposit(math.NewInt(10), math.NewInt(0), math.ZeroInt(), true) k.SetPool(ctx, pool) items[i] = pool } @@ -30,7 +31,7 @@ func TestPoolInit(t *testing.T) { pool, err := keeper.InitPool(ctx, defaultPairID, 0, 1) require.NoError(t, err) - pool.Deposit(sdk.NewInt(100), sdk.NewInt(100), sdk.NewInt(0), true) + pool.Deposit(math.NewInt(100), math.NewInt(100), math.NewInt(0), true) keeper.SetPool(ctx, pool) dbPool, found := keeper.GetPool(ctx, defaultPairID, 0, 1) diff --git a/x/dex/types/events.go b/x/dex/types/events.go index 1d428f844..1c50ff105 100644 --- a/x/dex/types/events.go +++ b/x/dex/types/events.go @@ -4,6 +4,7 @@ import ( "strconv" "strings" + "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" ) @@ -14,9 +15,9 @@ func CreateDepositEvent( token1 string, tickIndex int64, fee uint64, - depositAmountReserve0 sdk.Int, - depositAmountReserve1 sdk.Int, - sharesMinted sdk.Int, + depositAmountReserve0 math.Int, + depositAmountReserve1 math.Int, + sharesMinted math.Int, ) sdk.Event { attrs := []sdk.Attribute{ sdk.NewAttribute(sdk.AttributeKeyModule, "dex"), @@ -42,9 +43,9 @@ func CreateWithdrawEvent( token1 string, tickIndex int64, fee uint64, - withdrawAmountReserve0 sdk.Int, - withdrawAmountReserve1 sdk.Int, - sharesRemoved sdk.Int, + withdrawAmountReserve0 math.Int, + withdrawAmountReserve1 math.Int, + sharesRemoved math.Int, ) sdk.Event { attrs := []sdk.Attribute{ sdk.NewAttribute(sdk.AttributeKeyModule, "dex"), @@ -68,8 +69,8 @@ func CreateMultihopSwapEvent( receiver sdk.AccAddress, makerDenom string, tokenOut string, - amountIn sdk.Int, - amountOut sdk.Int, + amountIn math.Int, + amountOut math.Int, route []string, ) sdk.Event { attrs := []sdk.Attribute{ @@ -94,10 +95,10 @@ func CreatePlaceLimitOrderEvent( token1 string, makerDenom string, tokenOut string, - amountIn sdk.Int, + amountIn math.Int, limitTick int64, orderType string, - shares sdk.Int, + shares math.Int, trancheKey string, ) sdk.Event { attrs := []sdk.Attribute{ @@ -125,7 +126,7 @@ func WithdrawFilledLimitOrderEvent( token1 string, makerDenom string, tokenOut string, - amountOut sdk.Int, + amountOut math.Int, trancheKey string, ) sdk.Event { attrs := []sdk.Attribute{ @@ -149,7 +150,7 @@ func CancelLimitOrderEvent( token1 string, makerDenom string, tokenOut string, - amountOut sdk.Int, + amountOut math.Int, trancheKey string, ) sdk.Event { attrs := []sdk.Attribute{ @@ -172,7 +173,7 @@ func TickUpdateEvent( token1 string, makerDenom string, tickIndex int64, - reserves sdk.Int, + reserves math.Int, otherAttrs ...sdk.Attribute, ) sdk.Event { attrs := []sdk.Attribute{ diff --git a/x/dex/types/limit_order_tranche.go b/x/dex/types/limit_order_tranche.go index dc6b69f03..6e9a7dc74 100644 --- a/x/dex/types/limit_order_tranche.go +++ b/x/dex/types/limit_order_tranche.go @@ -1,6 +1,7 @@ package types import ( + "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" math_utils "github.com/neutron-org/neutron/utils/math" "github.com/neutron-org/neutron/x/dex/utils" @@ -11,10 +12,10 @@ func NewLimitOrderTranche( takerDenom string, trancheKey string, tickIndex int64, - reservesMakerDenom sdk.Int, - reservesTakerDenom sdk.Int, - totalMakerDenom sdk.Int, - totalTakerDenom sdk.Int, + reservesMakerDenom math.Int, + reservesTakerDenom math.Int, + totalMakerDenom math.Int, + totalTakerDenom math.Int, ) (*LimitOrderTranche, error) { tradePairID, err := NewTradePairID(takerDenom, makerDenom) if err != nil { @@ -44,10 +45,10 @@ func MustNewLimitOrderTranche( takerDenom string, trancheKey string, tickIndex int64, - reservesMakerDenom sdk.Int, - reservesTakerDenom sdk.Int, - totalMakerDenom sdk.Int, - totalTakerDenom sdk.Int, + reservesMakerDenom math.Int, + reservesTakerDenom math.Int, + totalMakerDenom math.Int, + totalTakerDenom math.Int, ) *LimitOrderTranche { limitOrderTranche, err := NewLimitOrderTranche( makerDenom, @@ -82,11 +83,11 @@ func (t LimitOrderTranche) IsExpired(ctx sdk.Context) bool { } func (t LimitOrderTranche) HasTokenIn() bool { - return t.ReservesMakerDenom.GT(sdk.ZeroInt()) + return t.ReservesMakerDenom.GT(math.ZeroInt()) } func (t LimitOrderTranche) HasTokenOut() bool { - return t.ReservesTakerDenom.GT(sdk.ZeroInt()) + return t.ReservesTakerDenom.GT(math.ZeroInt()) } func (t LimitOrderTranche) Price() math_utils.PrecDec { @@ -105,12 +106,12 @@ func (t LimitOrderTranche) AmountUnfilled() math_utils.PrecDec { } func (t LimitOrderTranche) HasLiquidity() bool { - return t.ReservesMakerDenom.GT(sdk.ZeroInt()) + return t.ReservesMakerDenom.GT(math.ZeroInt()) } func (t *LimitOrderTranche) RemoveTokenIn( trancheUser *LimitOrderTrancheUser, -) (amountToRemove sdk.Int) { +) (amountToRemove math.Int) { amountUnfilled := t.AmountUnfilled() maxAmountToRemove := amountUnfilled.MulInt(trancheUser.SharesOwned). QuoInt(t.TotalMakerDenom). @@ -121,7 +122,7 @@ func (t *LimitOrderTranche) RemoveTokenIn( return amountToRemove } -func (t *LimitOrderTranche) Withdraw(trancheUser *LimitOrderTrancheUser) (sdk.Int, math_utils.PrecDec) { +func (t *LimitOrderTranche) Withdraw(trancheUser *LimitOrderTrancheUser) (math.Int, math_utils.PrecDec) { reservesTokenOutDec := math_utils.NewPrecDecFromInt(t.ReservesTakerDenom) ratioFilled := t.RatioFilled() @@ -133,15 +134,15 @@ func (t *LimitOrderTranche) Withdraw(trancheUser *LimitOrderTrancheUser) (sdk.In return amountOutTokenIn, amountOutTokenOut } -func (t *LimitOrderTranche) Swap(maxAmountTakerIn sdk.Int, maxAmountMakerOut *sdk.Int) ( - inAmount sdk.Int, - outAmount sdk.Int, +func (t *LimitOrderTranche) Swap(maxAmountTakerIn math.Int, maxAmountMakerOut *math.Int) ( + inAmount math.Int, + outAmount math.Int, ) { reservesTokenOut := &t.ReservesMakerDenom fillTokenIn := &t.ReservesTakerDenom totalTokenIn := &t.TotalTakerDenom maxOutGivenIn := t.PriceTakerToMaker.MulInt(maxAmountTakerIn).TruncateInt() - possibleOutAmounts := []sdk.Int{*reservesTokenOut, maxOutGivenIn} + possibleOutAmounts := []math.Int{*reservesTokenOut, maxOutGivenIn} if maxAmountMakerOut != nil { possibleOutAmounts = append(possibleOutAmounts, *maxAmountMakerOut) } @@ -156,7 +157,7 @@ func (t *LimitOrderTranche) Swap(maxAmountTakerIn sdk.Int, maxAmountMakerOut *sd return inAmount, outAmount } -func (t *LimitOrderTranche) PlaceMakerLimitOrder(amountIn sdk.Int) { +func (t *LimitOrderTranche) PlaceMakerLimitOrder(amountIn math.Int) { t.ReservesMakerDenom = t.ReservesMakerDenom.Add(amountIn) t.TotalMakerDenom = t.TotalMakerDenom.Add(amountIn) } diff --git a/x/dex/types/liquidity.go b/x/dex/types/liquidity.go index 60cc306b4..d8a4f105f 100644 --- a/x/dex/types/liquidity.go +++ b/x/dex/types/liquidity.go @@ -1,11 +1,11 @@ package types import ( - sdk "github.com/cosmos/cosmos-sdk/types" + "cosmossdk.io/math" math_utils "github.com/neutron-org/neutron/utils/math" ) type Liquidity interface { - Swap(maxAmountTakerIn sdk.Int, maxAmountMakerOut *sdk.Int) (inAmount, outAmount sdk.Int) + Swap(maxAmountTakerIn math.Int, maxAmountMakerOut *math.Int) (inAmount, outAmount math.Int) Price() math_utils.PrecDec } diff --git a/x/dex/types/message_deposit.go b/x/dex/types/message_deposit.go index f05fd015e..4288ca2e6 100644 --- a/x/dex/types/message_deposit.go +++ b/x/dex/types/message_deposit.go @@ -1,6 +1,7 @@ package types import ( + "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" ) @@ -15,7 +16,7 @@ func NewMsgDeposit( tokenA, tokenB string, amountsA, - amountsB []sdk.Int, + amountsB []math.Int, tickIndexes []int64, fees []uint64, depositOptions []*DepositOptions, @@ -78,10 +79,10 @@ func (msg *MsgDeposit) ValidateBasic() error { } for i := 0; i < numDeposits; i++ { - if msg.AmountsA[i].LT(sdk.ZeroInt()) || msg.AmountsB[i].LT(sdk.ZeroInt()) { + if msg.AmountsA[i].LT(math.ZeroInt()) || msg.AmountsB[i].LT(math.ZeroInt()) { return ErrZeroDeposit } - if msg.AmountsA[i].Equal(sdk.ZeroInt()) && msg.AmountsB[i].Equal(sdk.ZeroInt()) { + if msg.AmountsA[i].Equal(math.ZeroInt()) && msg.AmountsB[i].Equal(math.ZeroInt()) { return ErrZeroDeposit } } diff --git a/x/dex/types/message_deposit_test.go b/x/dex/types/message_deposit_test.go index 590444805..12ca261f3 100644 --- a/x/dex/types/message_deposit_test.go +++ b/x/dex/types/message_deposit_test.go @@ -3,7 +3,7 @@ package types_test import ( "testing" - sdk "github.com/cosmos/cosmos-sdk/types" + "cosmossdk.io/math" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/neutron-org/neutron/testutil/common/sample" . "github.com/neutron-org/neutron/x/dex/types" @@ -23,8 +23,8 @@ func TestMsgDeposit_ValidateBasic(t *testing.T) { Receiver: sample.AccAddress(), Fees: []uint64{0}, TickIndexesAToB: []int64{0}, - AmountsA: []sdk.Int{sdk.OneInt()}, - AmountsB: []sdk.Int{sdk.OneInt()}, + AmountsA: []math.Int{math.OneInt()}, + AmountsB: []math.Int{math.OneInt()}, }, err: sdkerrors.ErrInvalidAddress, }, @@ -35,8 +35,8 @@ func TestMsgDeposit_ValidateBasic(t *testing.T) { Receiver: "invalid address", Fees: []uint64{0}, TickIndexesAToB: []int64{0}, - AmountsA: []sdk.Int{sdk.OneInt()}, - AmountsB: []sdk.Int{sdk.OneInt()}, + AmountsA: []math.Int{math.OneInt()}, + AmountsB: []math.Int{math.OneInt()}, }, err: sdkerrors.ErrInvalidAddress, }, @@ -47,8 +47,8 @@ func TestMsgDeposit_ValidateBasic(t *testing.T) { Receiver: sample.AccAddress(), Fees: []uint64{0}, TickIndexesAToB: []int64{}, - AmountsA: []sdk.Int{}, - AmountsB: []sdk.Int{}, + AmountsA: []math.Int{}, + AmountsB: []math.Int{}, }, err: ErrUnbalancedTxArray, }, @@ -59,8 +59,8 @@ func TestMsgDeposit_ValidateBasic(t *testing.T) { Receiver: sample.AccAddress(), Fees: []uint64{}, TickIndexesAToB: []int64{0}, - AmountsA: []sdk.Int{}, - AmountsB: []sdk.Int{}, + AmountsA: []math.Int{}, + AmountsB: []math.Int{}, }, err: ErrUnbalancedTxArray, }, @@ -71,8 +71,8 @@ func TestMsgDeposit_ValidateBasic(t *testing.T) { Receiver: sample.AccAddress(), Fees: []uint64{}, TickIndexesAToB: []int64{}, - AmountsA: []sdk.Int{sdk.OneInt()}, - AmountsB: []sdk.Int{}, + AmountsA: []math.Int{math.OneInt()}, + AmountsB: []math.Int{}, }, err: ErrUnbalancedTxArray, }, @@ -83,8 +83,8 @@ func TestMsgDeposit_ValidateBasic(t *testing.T) { Receiver: sample.AccAddress(), Fees: []uint64{}, TickIndexesAToB: []int64{}, - AmountsA: []sdk.Int{}, - AmountsB: []sdk.Int{sdk.OneInt()}, + AmountsA: []math.Int{}, + AmountsB: []math.Int{math.OneInt()}, }, err: ErrUnbalancedTxArray, }, @@ -95,8 +95,8 @@ func TestMsgDeposit_ValidateBasic(t *testing.T) { Receiver: sample.AccAddress(), Fees: []uint64{}, TickIndexesAToB: []int64{}, - AmountsA: []sdk.Int{}, - AmountsB: []sdk.Int{}, + AmountsA: []math.Int{}, + AmountsB: []math.Int{}, }, err: ErrZeroDeposit, }, @@ -107,8 +107,8 @@ func TestMsgDeposit_ValidateBasic(t *testing.T) { Receiver: sample.AccAddress(), Fees: []uint64{0}, TickIndexesAToB: []int64{0}, - AmountsA: []sdk.Int{sdk.ZeroInt()}, - AmountsB: []sdk.Int{sdk.ZeroInt()}, + AmountsA: []math.Int{math.ZeroInt()}, + AmountsB: []math.Int{math.ZeroInt()}, }, err: ErrZeroDeposit, }, @@ -119,8 +119,8 @@ func TestMsgDeposit_ValidateBasic(t *testing.T) { Receiver: sample.AccAddress(), Fees: []uint64{0}, TickIndexesAToB: []int64{0}, - AmountsA: []sdk.Int{sdk.OneInt()}, - AmountsB: []sdk.Int{sdk.OneInt()}, + AmountsA: []math.Int{math.OneInt()}, + AmountsB: []math.Int{math.OneInt()}, }, }, } diff --git a/x/dex/types/message_multi_hop_swap.go b/x/dex/types/message_multi_hop_swap.go index c9c292884..b8e543f04 100644 --- a/x/dex/types/message_multi_hop_swap.go +++ b/x/dex/types/message_multi_hop_swap.go @@ -1,6 +1,7 @@ package types import ( + "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" math_utils "github.com/neutron-org/neutron/utils/math" @@ -14,7 +15,7 @@ func NewMsgMultiHopSwap( creator string, receiever string, routesArr [][]string, - amountIn sdk.Int, + amountIn math.Int, exitLimitPrice math_utils.PrecDec, pickBestRoute bool, ) *MsgMultiHopSwap { @@ -77,7 +78,7 @@ func (msg *MsgMultiHopSwap) ValidateBasic() error { } } - if msg.AmountIn.LTE(sdk.ZeroInt()) { + if msg.AmountIn.LTE(math.ZeroInt()) { return ErrZeroSwap } diff --git a/x/dex/types/message_multi_hop_swap_test.go b/x/dex/types/message_multi_hop_swap_test.go index b9fc67acc..af2d5b7a5 100644 --- a/x/dex/types/message_multi_hop_swap_test.go +++ b/x/dex/types/message_multi_hop_swap_test.go @@ -3,7 +3,7 @@ package types_test import ( "testing" - sdk "github.com/cosmos/cosmos-sdk/types" + "cosmossdk.io/math" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/neutron-org/neutron/testutil/common/sample" . "github.com/neutron-org/neutron/x/dex/types" @@ -58,7 +58,7 @@ func TestMsgMultiHopSwap_ValidateBasic(t *testing.T) { Creator: sample.AccAddress(), Receiver: sample.AccAddress(), Routes: []*MultiHopRoute{{Hops: []string{"A", "B", "C"}}}, - AmountIn: sdk.NewInt(-1), + AmountIn: math.NewInt(-1), }, err: ErrZeroSwap, }, @@ -68,7 +68,7 @@ func TestMsgMultiHopSwap_ValidateBasic(t *testing.T) { Routes: []*MultiHopRoute{{Hops: []string{"A", "B", "C"}}}, Creator: sample.AccAddress(), Receiver: sample.AccAddress(), - AmountIn: sdk.OneInt(), + AmountIn: math.OneInt(), }, }, } diff --git a/x/dex/types/message_place_limit_order.go b/x/dex/types/message_place_limit_order.go index 23135d2f5..255005925 100644 --- a/x/dex/types/message_place_limit_order.go +++ b/x/dex/types/message_place_limit_order.go @@ -3,6 +3,7 @@ package types import ( "time" + "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" ) @@ -17,10 +18,10 @@ func NewMsgPlaceLimitOrder( tokenIn, tokenOut string, tickIndex int64, - amountIn sdk.Int, + amountIn math.Int, orderType LimitOrderType, goodTil *time.Time, - maxAmountOut *sdk.Int, + maxAmountOut *math.Int, ) *MsgPlaceLimitOrder { return &MsgPlaceLimitOrder{ Creator: creator, @@ -68,7 +69,7 @@ func (msg *MsgPlaceLimitOrder) ValidateBasic() error { return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid receiver address (%s)", err) } - if msg.AmountIn.LTE(sdk.ZeroInt()) { + if msg.AmountIn.LTE(math.ZeroInt()) { return ErrZeroLimitOrder } diff --git a/x/dex/types/message_place_limit_order_test.go b/x/dex/types/message_place_limit_order_test.go index bdbaeda59..27fa00b57 100644 --- a/x/dex/types/message_place_limit_order_test.go +++ b/x/dex/types/message_place_limit_order_test.go @@ -3,7 +3,7 @@ package types_test import ( "testing" - sdk "github.com/cosmos/cosmos-sdk/types" + "cosmossdk.io/math" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/neutron-org/neutron/testutil/common/sample" . "github.com/neutron-org/neutron/x/dex/types" @@ -11,8 +11,8 @@ import ( ) func TestMsgPlaceLimitOrder_ValidateBasic(t *testing.T) { - ZEROINT := sdk.ZeroInt() - ONEINT := sdk.OneInt() + ZEROINT := math.ZeroInt() + ONEINT := math.OneInt() tests := []struct { name string msg MsgPlaceLimitOrder @@ -26,7 +26,7 @@ func TestMsgPlaceLimitOrder_ValidateBasic(t *testing.T) { TokenIn: "TokenA", TokenOut: "TokenB", TickIndexInToOut: 0, - AmountIn: sdk.OneInt(), + AmountIn: math.OneInt(), }, err: sdkerrors.ErrInvalidAddress, }, @@ -38,7 +38,7 @@ func TestMsgPlaceLimitOrder_ValidateBasic(t *testing.T) { TokenIn: "TokenA", TokenOut: "TokenB", TickIndexInToOut: 0, - AmountIn: sdk.OneInt(), + AmountIn: math.OneInt(), }, err: sdkerrors.ErrInvalidAddress, }, @@ -50,7 +50,7 @@ func TestMsgPlaceLimitOrder_ValidateBasic(t *testing.T) { TokenIn: "TokenA", TokenOut: "TokenB", TickIndexInToOut: 0, - AmountIn: sdk.ZeroInt(), + AmountIn: math.ZeroInt(), }, err: ErrZeroLimitOrder, }, @@ -62,7 +62,7 @@ func TestMsgPlaceLimitOrder_ValidateBasic(t *testing.T) { TokenIn: "TokenA", TokenOut: "TokenB", TickIndexInToOut: 0, - AmountIn: sdk.OneInt(), + AmountIn: math.OneInt(), MaxAmountOut: &ZEROINT, OrderType: LimitOrderType_FILL_OR_KILL, }, @@ -76,7 +76,7 @@ func TestMsgPlaceLimitOrder_ValidateBasic(t *testing.T) { TokenIn: "TokenA", TokenOut: "TokenB", TickIndexInToOut: 0, - AmountIn: sdk.OneInt(), + AmountIn: math.OneInt(), MaxAmountOut: &ONEINT, OrderType: LimitOrderType_GOOD_TIL_CANCELLED, }, @@ -90,7 +90,7 @@ func TestMsgPlaceLimitOrder_ValidateBasic(t *testing.T) { TokenIn: "TokenA", TokenOut: "TokenB", TickIndexInToOut: 0, - AmountIn: sdk.OneInt(), + AmountIn: math.OneInt(), }, }, } diff --git a/x/dex/types/message_withdrawl.go b/x/dex/types/message_withdrawl.go index 3448d2f1d..82580f9ec 100644 --- a/x/dex/types/message_withdrawl.go +++ b/x/dex/types/message_withdrawl.go @@ -1,6 +1,7 @@ package types import ( + "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" ) @@ -13,7 +14,7 @@ func NewMsgWithdrawal(creator, receiver, tokenA, tokenB string, - sharesToRemove []sdk.Int, + sharesToRemove []math.Int, tickIndexes []int64, fees []uint64, ) *MsgWithdrawal { @@ -72,7 +73,7 @@ func (msg *MsgWithdrawal) ValidateBasic() error { } for i := 0; i < len(msg.Fees); i++ { - if msg.SharesToRemove[i].LTE(sdk.ZeroInt()) { + if msg.SharesToRemove[i].LTE(math.ZeroInt()) { return ErrZeroWithdraw } } diff --git a/x/dex/types/message_withdrawl_test.go b/x/dex/types/message_withdrawl_test.go index 288fc3bbe..b551cb800 100644 --- a/x/dex/types/message_withdrawl_test.go +++ b/x/dex/types/message_withdrawl_test.go @@ -3,7 +3,7 @@ package types_test import ( "testing" - sdk "github.com/cosmos/cosmos-sdk/types" + "cosmossdk.io/math" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/neutron-org/neutron/testutil/common/sample" . "github.com/neutron-org/neutron/x/dex/types" @@ -23,7 +23,7 @@ func TestMsgWithdrawal_ValidateBasic(t *testing.T) { Receiver: sample.AccAddress(), Fees: []uint64{0}, TickIndexesAToB: []int64{0}, - SharesToRemove: []sdk.Int{sdk.OneInt()}, + SharesToRemove: []math.Int{math.OneInt()}, }, err: sdkerrors.ErrInvalidAddress, }, @@ -34,7 +34,7 @@ func TestMsgWithdrawal_ValidateBasic(t *testing.T) { Receiver: "invalid_address", Fees: []uint64{0}, TickIndexesAToB: []int64{0}, - SharesToRemove: []sdk.Int{sdk.OneInt()}, + SharesToRemove: []math.Int{math.OneInt()}, }, err: sdkerrors.ErrInvalidAddress, }, @@ -45,7 +45,7 @@ func TestMsgWithdrawal_ValidateBasic(t *testing.T) { Receiver: sample.AccAddress(), Fees: []uint64{}, TickIndexesAToB: []int64{0}, - SharesToRemove: []sdk.Int{sdk.OneInt()}, + SharesToRemove: []math.Int{math.OneInt()}, }, err: ErrUnbalancedTxArray, }, @@ -56,7 +56,7 @@ func TestMsgWithdrawal_ValidateBasic(t *testing.T) { Receiver: sample.AccAddress(), Fees: []uint64{0}, TickIndexesAToB: []int64{}, - SharesToRemove: []sdk.Int{sdk.OneInt()}, + SharesToRemove: []math.Int{math.OneInt()}, }, err: ErrUnbalancedTxArray, }, @@ -67,7 +67,7 @@ func TestMsgWithdrawal_ValidateBasic(t *testing.T) { Receiver: sample.AccAddress(), Fees: []uint64{0}, TickIndexesAToB: []int64{0}, - SharesToRemove: []sdk.Int{}, + SharesToRemove: []math.Int{}, }, err: ErrUnbalancedTxArray, }, @@ -78,7 +78,7 @@ func TestMsgWithdrawal_ValidateBasic(t *testing.T) { Receiver: sample.AccAddress(), Fees: []uint64{}, TickIndexesAToB: []int64{}, - SharesToRemove: []sdk.Int{}, + SharesToRemove: []math.Int{}, }, err: ErrZeroWithdraw, }, @@ -89,7 +89,7 @@ func TestMsgWithdrawal_ValidateBasic(t *testing.T) { Receiver: sample.AccAddress(), Fees: []uint64{0}, TickIndexesAToB: []int64{0}, - SharesToRemove: []sdk.Int{sdk.ZeroInt()}, + SharesToRemove: []math.Int{math.ZeroInt()}, }, err: ErrZeroWithdraw, }, @@ -100,7 +100,7 @@ func TestMsgWithdrawal_ValidateBasic(t *testing.T) { Receiver: sample.AccAddress(), Fees: []uint64{0}, TickIndexesAToB: []int64{0}, - SharesToRemove: []sdk.Int{sdk.OneInt()}, + SharesToRemove: []math.Int{math.OneInt()}, }, }, } diff --git a/x/dex/types/pool.go b/x/dex/types/pool.go index 8c320277b..72e73e9ae 100644 --- a/x/dex/types/pool.go +++ b/x/dex/types/pool.go @@ -1,6 +1,7 @@ package types import ( + "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" math_utils "github.com/neutron-org/neutron/utils/math" "github.com/neutron-org/neutron/x/dex/utils" @@ -56,19 +57,19 @@ func (p *Pool) Fee() uint64 { return p.UpperTick1.Key.Fee } -func (p *Pool) GetLowerReserve0() sdk.Int { +func (p *Pool) GetLowerReserve0() math.Int { return p.LowerTick0.ReservesMakerDenom } -func (p *Pool) GetUpperReserve1() sdk.Int { +func (p *Pool) GetUpperReserve1() math.Int { return p.UpperTick1.ReservesMakerDenom } func (p *Pool) Swap( tradePairID *TradePairID, - maxAmountTakerIn sdk.Int, - maxAmountMakerOut *sdk.Int, -) (amountTakerIn, amountMakerOut sdk.Int) { + maxAmountTakerIn math.Int, + maxAmountMakerOut *math.Int, +) (amountTakerIn, amountMakerOut math.Int) { var takerReserves, makerReserves *PoolReserves if tradePairID.IsMakerDenomToken0() { makerReserves = p.LowerTick0 @@ -78,13 +79,13 @@ func (p *Pool) Swap( takerReserves = p.LowerTick0 } - if maxAmountTakerIn.Equal(sdk.ZeroInt()) || - makerReserves.ReservesMakerDenom.Equal(sdk.ZeroInt()) { - return sdk.ZeroInt(), sdk.ZeroInt() + if maxAmountTakerIn.Equal(math.ZeroInt()) || + makerReserves.ReservesMakerDenom.Equal(math.ZeroInt()) { + return math.ZeroInt(), math.ZeroInt() } maxOutGivenTakerIn := makerReserves.PriceTakerToMaker.MulInt(maxAmountTakerIn).TruncateInt() - possibleAmountsMakerOut := []sdk.Int{makerReserves.ReservesMakerDenom, maxOutGivenTakerIn} + possibleAmountsMakerOut := []math.Int{makerReserves.ReservesMakerDenom, maxOutGivenTakerIn} if maxAmountMakerOut != nil { possibleAmountsMakerOut = append(possibleAmountsMakerOut, *maxAmountMakerOut) } @@ -110,9 +111,9 @@ func (p *Pool) Swap( func (p *Pool) Deposit( maxAmount0, maxAmount1, - existingShares sdk.Int, + existingShares math.Int, autoswap bool, -) (inAmount0, inAmount1 sdk.Int, outShares sdk.Coin) { +) (inAmount0, inAmount1 math.Int, outShares sdk.Coin) { lowerReserve0 := &p.LowerTick0.ReservesMakerDenom upperReserve1 := &p.UpperTick1.ReservesMakerDenom @@ -123,8 +124,8 @@ func (p *Pool) Deposit( maxAmount1, ) - if inAmount0.Equal(sdk.ZeroInt()) && inAmount1.Equal(sdk.ZeroInt()) { - return sdk.ZeroInt(), sdk.ZeroInt(), sdk.Coin{Denom: p.GetPoolDenom()} + if inAmount0.Equal(math.ZeroInt()) && inAmount1.Equal(math.ZeroInt()) { + return math.ZeroInt(), math.ZeroInt(), sdk.Coin{Denom: p.GetPoolDenom()} } outShares = p.CalcSharesMinted(inAmount0, inAmount1, existingShares) @@ -169,9 +170,9 @@ func (p *Pool) MustCalcPrice1To0Center() math_utils.PrecDec { } func (p *Pool) CalcSharesMinted( - amount0 sdk.Int, - amount1 sdk.Int, - existingShares sdk.Int, + amount0 math.Int, + amount1 math.Int, + existingShares math.Int, ) (sharesMinted sdk.Coin) { price1To0Center := p.MustCalcPrice1To0Center() valueMintedToken0 := CalcAmountAsToken0(amount0, amount1, price1To0Center) @@ -181,7 +182,7 @@ func (p *Pool) CalcSharesMinted( p.UpperTick1.ReservesMakerDenom, price1To0Center, ) - var sharesMintedAmount sdk.Int + var sharesMintedAmount math.Int if valueExistingToken0.GT(math_utils.ZeroPrecDec()) { sharesMintedAmount = valueMintedToken0.MulInt(existingShares). Quo(valueExistingToken0). @@ -194,8 +195,8 @@ func (p *Pool) CalcSharesMinted( } func (p *Pool) CalcResidualSharesMinted( - residualAmount0 sdk.Int, - residualAmount1 sdk.Int, + residualAmount0 math.Int, + residualAmount1 math.Int, ) (sharesMinted sdk.Coin, err error) { fee := CalcFee(p.UpperTick1.Key.TickIndexTakerToMaker, p.LowerTick0.Key.TickIndexTakerToMaker) valueMintedToken0, err := CalcResidualValue( @@ -211,7 +212,7 @@ func (p *Pool) CalcResidualSharesMinted( return sdk.Coin{Denom: p.GetPoolDenom(), Amount: valueMintedToken0.TruncateInt()}, nil } -func (p *Pool) RedeemValue(sharesToRemove, totalShares sdk.Int) (outAmount0, outAmount1 sdk.Int) { +func (p *Pool) RedeemValue(sharesToRemove, totalShares math.Int) (outAmount0, outAmount1 math.Int) { reserves0 := &p.LowerTick0.ReservesMakerDenom reserves1 := &p.UpperTick1.ReservesMakerDenom // outAmount1 = ownershipRatio * reserves1 @@ -226,7 +227,7 @@ func (p *Pool) RedeemValue(sharesToRemove, totalShares sdk.Int) (outAmount0, out return outAmount0, outAmount1 } -func (p *Pool) Withdraw(sharesToRemove, totalShares sdk.Int) (outAmount0, outAmount1 sdk.Int) { +func (p *Pool) Withdraw(sharesToRemove, totalShares math.Int) (outAmount0, outAmount1 math.Int) { reserves0 := &p.LowerTick0.ReservesMakerDenom reserves1 := &p.UpperTick1.ReservesMakerDenom outAmount0, outAmount1 = p.RedeemValue(sharesToRemove, totalShares) @@ -238,16 +239,16 @@ func (p *Pool) Withdraw(sharesToRemove, totalShares sdk.Int) (outAmount0, outAmo // Balance trueAmount1 to the pool ratio func CalcGreatestMatchingRatio( - targetAmount0 sdk.Int, - targetAmount1 sdk.Int, - amount0 sdk.Int, - amount1 sdk.Int, -) (resultAmount0, resultAmount1 sdk.Int) { + targetAmount0 math.Int, + targetAmount1 math.Int, + amount0 math.Int, + amount1 math.Int, +) (resultAmount0, resultAmount1 math.Int) { targetAmount0Dec := sdk.NewDecFromInt(targetAmount0) targetAmount1Dec := sdk.NewDecFromInt(targetAmount1) // See spec: https://www.notion.so/dualityxyz/Autoswap-Spec-e856fa7b2438403c95147010d479b98c - if targetAmount1.GT(sdk.ZeroInt()) { + if targetAmount1.GT(math.ZeroInt()) { resultAmount0 = sdk.MinInt( amount0, sdk.NewDecFromInt(amount1).Mul(targetAmount0Dec).Quo(targetAmount1Dec).TruncateInt()) @@ -255,7 +256,7 @@ func CalcGreatestMatchingRatio( resultAmount0 = amount0 } - if targetAmount0.GT(sdk.ZeroInt()) { + if targetAmount0.GT(math.ZeroInt()) { resultAmount1 = sdk.MinInt( amount1, sdk.NewDecFromInt(amount0).Mul(targetAmount1Dec).Quo(targetAmount0Dec).TruncateInt()) @@ -267,7 +268,7 @@ func CalcGreatestMatchingRatio( } func CalcResidualValue( - amount0, amount1 sdk.Int, + amount0, amount1 math.Int, priceLowerTakerToMaker math_utils.PrecDec, fee int64, ) (math_utils.PrecDec, error) { @@ -284,7 +285,7 @@ func CalcFee(upperTickIndex, lowerTickIndex int64) int64 { return (upperTickIndex - lowerTickIndex) / 2 } -func CalcAmountAsToken0(amount0, amount1 sdk.Int, price1To0 math_utils.PrecDec) math_utils.PrecDec { +func CalcAmountAsToken0(amount0, amount1 math.Int, price1To0 math_utils.PrecDec) math_utils.PrecDec { amount0Dec := math_utils.NewPrecDecFromInt(amount0) return amount0Dec.Add(price1To0.MulInt(amount1)) diff --git a/x/dex/types/pool_liquidity.go b/x/dex/types/pool_liquidity.go index 47e2eefd6..6456df9e4 100644 --- a/x/dex/types/pool_liquidity.go +++ b/x/dex/types/pool_liquidity.go @@ -1,7 +1,7 @@ package types import ( - sdk "github.com/cosmos/cosmos-sdk/types" + "cosmossdk.io/math" math_utils "github.com/neutron-org/neutron/utils/math" ) @@ -11,9 +11,9 @@ type PoolLiquidity struct { } func (pl *PoolLiquidity) Swap( - maxAmountTakerDenomIn sdk.Int, - maxAmountMakerDenomOut *sdk.Int, -) (inAmount, outAmount sdk.Int) { + maxAmountTakerDenomIn math.Int, + maxAmountMakerDenomOut *math.Int, +) (inAmount, outAmount math.Int) { return pl.Pool.Swap( pl.TradePairID, maxAmountTakerDenomIn, diff --git a/x/dex/types/pool_reserves.go b/x/dex/types/pool_reserves.go index 0d523338a..d4f29eff6 100644 --- a/x/dex/types/pool_reserves.go +++ b/x/dex/types/pool_reserves.go @@ -1,11 +1,11 @@ package types import ( - sdk "github.com/cosmos/cosmos-sdk/types" + "cosmossdk.io/math" ) func (p PoolReserves) HasToken() bool { - return p.ReservesMakerDenom.GT(sdk.ZeroInt()) + return p.ReservesMakerDenom.GT(math.ZeroInt()) } func NewPoolReservesFromCounterpart( @@ -14,7 +14,7 @@ func NewPoolReservesFromCounterpart( thisID := counterpart.Key.Counterpart() return &PoolReserves{ Key: thisID, - ReservesMakerDenom: sdk.ZeroInt(), + ReservesMakerDenom: math.ZeroInt(), PriceTakerToMaker: counterpart.PriceOppositeTakerToMaker, PriceOppositeTakerToMaker: counterpart.PriceTakerToMaker, } @@ -35,7 +35,7 @@ func NewPoolReserves( return &PoolReserves{ Key: poolReservesID, - ReservesMakerDenom: sdk.ZeroInt(), + ReservesMakerDenom: math.ZeroInt(), PriceTakerToMaker: priceTakerToMaker, PriceOppositeTakerToMaker: priceOppositeTakerToMaker, }, nil diff --git a/x/dex/types/pool_test.go b/x/dex/types/pool_test.go index 98f721143..328ada29f 100644 --- a/x/dex/types/pool_test.go +++ b/x/dex/types/pool_test.go @@ -3,206 +3,206 @@ package types_test import ( "testing" - sdk "github.com/cosmos/cosmos-sdk/types" + "cosmossdk.io/math" . "github.com/neutron-org/neutron/x/dex/types" "github.com/stretchr/testify/assert" ) func TestCalcGreatestMatchingRatioBothReservesNonZero(t *testing.T) { trueAmount0, trueAmount1 := CalcGreatestMatchingRatio( - sdk.NewInt(10), - sdk.NewInt(40), - sdk.NewInt(100), - sdk.NewInt(100), + math.NewInt(10), + math.NewInt(40), + math.NewInt(100), + math.NewInt(100), ) - assert.Equal(t, sdk.NewInt(25), trueAmount0) - assert.Equal(t, sdk.NewInt(100), trueAmount1) + assert.Equal(t, math.NewInt(25), trueAmount0) + assert.Equal(t, math.NewInt(100), trueAmount1) } func TestCalcGreatestMatchingRatioBothReservesZero(t *testing.T) { trueAmount0, trueAmount1 := CalcGreatestMatchingRatio( - sdk.NewInt(0), - sdk.NewInt(0), - sdk.NewInt(100), - sdk.NewInt(100), + math.NewInt(0), + math.NewInt(0), + math.NewInt(100), + math.NewInt(100), ) - assert.Equal(t, sdk.NewInt(100), trueAmount0) - assert.Equal(t, sdk.NewInt(100), trueAmount1) + assert.Equal(t, math.NewInt(100), trueAmount0) + assert.Equal(t, math.NewInt(100), trueAmount1) } func TestCalcGreatestMatchingRatioWrongCoinDeposited(t *testing.T) { trueAmount0, trueAmount1 := CalcGreatestMatchingRatio( - sdk.NewInt(100), - sdk.NewInt(0), - sdk.NewInt(0), - sdk.NewInt(100), + math.NewInt(100), + math.NewInt(0), + math.NewInt(0), + math.NewInt(100), ) - assert.Equal(t, sdk.NewInt(0), trueAmount0) - assert.Equal(t, sdk.NewInt(0), trueAmount1) + assert.Equal(t, math.NewInt(0), trueAmount0) + assert.Equal(t, math.NewInt(0), trueAmount1) trueAmount0, trueAmount1 = CalcGreatestMatchingRatio( - sdk.NewInt(0), - sdk.NewInt(100), - sdk.NewInt(100), - sdk.NewInt(0), + math.NewInt(0), + math.NewInt(100), + math.NewInt(100), + math.NewInt(0), ) - assert.Equal(t, sdk.NewInt(0), trueAmount0) - assert.Equal(t, sdk.NewInt(0), trueAmount1) + assert.Equal(t, math.NewInt(0), trueAmount0) + assert.Equal(t, math.NewInt(0), trueAmount1) } func TestCalcGreatestMatchingRatioOneReserveZero(t *testing.T) { trueAmount0, trueAmount1 := CalcGreatestMatchingRatio( - sdk.NewInt(100), - sdk.NewInt(0), - sdk.NewInt(100), - sdk.NewInt(100), + math.NewInt(100), + math.NewInt(0), + math.NewInt(100), + math.NewInt(100), ) - assert.Equal(t, sdk.NewInt(100), trueAmount0) - assert.Equal(t, sdk.NewInt(0), trueAmount1) + assert.Equal(t, math.NewInt(100), trueAmount0) + assert.Equal(t, math.NewInt(0), trueAmount1) trueAmount0, trueAmount1 = CalcGreatestMatchingRatio( - sdk.NewInt(0), - sdk.NewInt(100), - sdk.NewInt(100), - sdk.NewInt(100), + math.NewInt(0), + math.NewInt(100), + math.NewInt(100), + math.NewInt(100), ) - assert.Equal(t, sdk.NewInt(0), trueAmount0) - assert.Equal(t, sdk.NewInt(100), trueAmount1) + assert.Equal(t, math.NewInt(0), trueAmount0) + assert.Equal(t, math.NewInt(100), trueAmount1) } func TestCalcGreatestMatchingRatio2SidedPoolBothSidesRightRatio(t *testing.T) { // WHEN deposit into a pool with a ratio of 2:5 with the same ratio all of the tokens are used trueAmount0, trueAmount1 := CalcGreatestMatchingRatio( - sdk.NewInt(20), - sdk.NewInt(50), - sdk.NewInt(4), - sdk.NewInt(10), + math.NewInt(20), + math.NewInt(50), + math.NewInt(4), + math.NewInt(10), ) // THEN both amounts are fully user - assert.Equal(t, sdk.NewInt(4), trueAmount0) - assert.Equal(t, sdk.NewInt(10), trueAmount1) + assert.Equal(t, math.NewInt(4), trueAmount0) + assert.Equal(t, math.NewInt(10), trueAmount1) } func TestCalcGreatestMatchingRatio2SidedPoolBothSidesWrongRatio(t *testing.T) { // WHEN deposit into a pool with a ratio of 3:2 with a ratio of 2:1 trueAmount0, trueAmount1 := CalcGreatestMatchingRatio( - sdk.NewInt(3), - sdk.NewInt(2), - sdk.NewInt(20), - sdk.NewInt(10), + math.NewInt(3), + math.NewInt(2), + math.NewInt(20), + math.NewInt(10), ) // THEN all of Token1 is used and 3/4 of token0 is used - assert.Equal(t, sdk.NewInt(15), trueAmount0) - assert.Equal(t, sdk.NewInt(10), trueAmount1) + assert.Equal(t, math.NewInt(15), trueAmount0) + assert.Equal(t, math.NewInt(10), trueAmount1) } func TestCalcGreatestMatchingRatio2SidedPoolBothSidesWrongRatio2(t *testing.T) { // IF deposit into a pool with a ratio of 2:3 with a ratio of 1:2 trueAmount0, trueAmount1 := CalcGreatestMatchingRatio( - sdk.NewInt(2), - sdk.NewInt(3), - sdk.NewInt(10), - sdk.NewInt(20), + math.NewInt(2), + math.NewInt(3), + math.NewInt(10), + math.NewInt(20), ) // THEN all of Token0 is used and 3/4 of token1 is used - assert.Equal(t, sdk.NewInt(10), trueAmount0) - assert.Equal(t, sdk.NewInt(15), trueAmount1) + assert.Equal(t, math.NewInt(10), trueAmount0) + assert.Equal(t, math.NewInt(15), trueAmount1) } func TestCalcGreatestMatchingRatio1SidedPoolBothSides(t *testing.T) { // WHEN deposit Token0 and Token1 into a pool with only Token0 trueAmount0, trueAmount1 := CalcGreatestMatchingRatio( - sdk.NewInt(10), - sdk.NewInt(0), - sdk.NewInt(10), - sdk.NewInt(10), + math.NewInt(10), + math.NewInt(0), + math.NewInt(10), + math.NewInt(10), ) // THEN only Token0 is used - assert.Equal(t, sdk.NewInt(10), trueAmount0) - assert.Equal(t, sdk.NewInt(0), trueAmount1) + assert.Equal(t, math.NewInt(10), trueAmount0) + assert.Equal(t, math.NewInt(0), trueAmount1) } func TestCalcGreatestMatchingRatio1SidedPoolBothSides2(t *testing.T) { // WHEN deposit Token0 and Token1 into a pool with only Token1 trueAmount0, trueAmount1 := CalcGreatestMatchingRatio( - sdk.NewInt(0), - sdk.NewInt(10), - sdk.NewInt(10), - sdk.NewInt(10), + math.NewInt(0), + math.NewInt(10), + math.NewInt(10), + math.NewInt(10), ) // THEN only Token1 is used - assert.Equal(t, sdk.NewInt(0), trueAmount0) - assert.Equal(t, sdk.NewInt(10), trueAmount1) + assert.Equal(t, math.NewInt(0), trueAmount0) + assert.Equal(t, math.NewInt(10), trueAmount1) } func TestCalcGreatestMatchingRatio1SidedPool1SidedToken0(t *testing.T) { // WHEN deposit Token0 into a pool with only Token1 trueAmount0, trueAmount1 := CalcGreatestMatchingRatio( - sdk.NewInt(0), - sdk.NewInt(10), - sdk.NewInt(10), - sdk.NewInt(0), + math.NewInt(0), + math.NewInt(10), + math.NewInt(10), + math.NewInt(0), ) // THEN no amounts are used - assert.Equal(t, sdk.NewInt(0), trueAmount0) - assert.Equal(t, sdk.NewInt(0), trueAmount1) + assert.Equal(t, math.NewInt(0), trueAmount0) + assert.Equal(t, math.NewInt(0), trueAmount1) } func TestCalcGreatestMatchingRatio1SidedPool1SidedToken0B(t *testing.T) { // WHEN deposit Token0 into a pool with only Token0 trueAmount0, trueAmount1 := CalcGreatestMatchingRatio( - sdk.NewInt(10), - sdk.NewInt(0), - sdk.NewInt(10), - sdk.NewInt(0), + math.NewInt(10), + math.NewInt(0), + math.NewInt(10), + math.NewInt(0), ) // THEN all of Token0 is used - assert.Equal(t, sdk.NewInt(10), trueAmount0) - assert.Equal(t, sdk.NewInt(0), trueAmount1) + assert.Equal(t, math.NewInt(10), trueAmount0) + assert.Equal(t, math.NewInt(0), trueAmount1) } func TestCalcGreatestMatchingRatio1SidedPool1SidedToken1(t *testing.T) { // WHEN deposit Token1 into a pool with only Token0 trueAmount0, trueAmount1 := CalcGreatestMatchingRatio( - sdk.NewInt(10), - sdk.NewInt(0), - sdk.NewInt(0), - sdk.NewInt(1), + math.NewInt(10), + math.NewInt(0), + math.NewInt(0), + math.NewInt(1), ) // THEN no amounts are used - assert.Equal(t, sdk.NewInt(0), trueAmount0) - assert.Equal(t, sdk.NewInt(0), trueAmount1) + assert.Equal(t, math.NewInt(0), trueAmount0) + assert.Equal(t, math.NewInt(0), trueAmount1) } func TestCalcGreatestMatchingRatio1SidedPool1SidedToken1B(t *testing.T) { // WHEN deposit Token1 into a pool with only Token1 trueAmount0, trueAmount1 := CalcGreatestMatchingRatio( - sdk.NewInt(0), - sdk.NewInt(10), - sdk.NewInt(0), - sdk.NewInt(10), + math.NewInt(0), + math.NewInt(10), + math.NewInt(0), + math.NewInt(10), ) // THEN all of Token1 is used - assert.Equal(t, sdk.NewInt(0), trueAmount0) - assert.Equal(t, sdk.NewInt(10), trueAmount1) + assert.Equal(t, math.NewInt(0), trueAmount0) + assert.Equal(t, math.NewInt(10), trueAmount1) } diff --git a/x/dex/types/tick_liquidity_test.go b/x/dex/types/tick_liquidity_test.go index 01aeeea58..e16d62c40 100644 --- a/x/dex/types/tick_liquidity_test.go +++ b/x/dex/types/tick_liquidity_test.go @@ -3,32 +3,32 @@ package types_test import ( "testing" - sdk "github.com/cosmos/cosmos-sdk/types" + "cosmossdk.io/math" "github.com/neutron-org/neutron/x/dex/types" "github.com/stretchr/testify/assert" ) func TestHasTokenEmptyReserves(t *testing.T) { // WHEN has no reserves - tick := &types.PoolReserves{ReservesMakerDenom: sdk.ZeroInt()} + tick := &types.PoolReserves{ReservesMakerDenom: math.ZeroInt()} assert.False(t, tick.HasToken()) } func TestHasTokenEmptyLO(t *testing.T) { // WHEN has no limits orders - tick := &types.LimitOrderTranche{ReservesMakerDenom: sdk.NewInt(0)} + tick := &types.LimitOrderTranche{ReservesMakerDenom: math.NewInt(0)} assert.False(t, tick.HasTokenIn()) } func TestHasToken0HasReserves(t *testing.T) { // WHEN tick has Reserves - tick := &types.PoolReserves{ReservesMakerDenom: sdk.NewInt(10)} + tick := &types.PoolReserves{ReservesMakerDenom: math.NewInt(10)} assert.True(t, tick.HasToken()) } func TestHasTokenHasLO(t *testing.T) { // WHEN has limit ordeers - tick := &types.LimitOrderTranche{ReservesMakerDenom: sdk.NewInt(10)} + tick := &types.LimitOrderTranche{ReservesMakerDenom: math.NewInt(10)} assert.True(t, tick.HasTokenIn()) } diff --git a/x/dex/utils/math.go b/x/dex/utils/math.go index 6fe67f632..23d23e96f 100644 --- a/x/dex/utils/math.go +++ b/x/dex/utils/math.go @@ -5,7 +5,7 @@ import ( "math" "strconv" - sdk "github.com/cosmos/cosmos-sdk/types" + sdkmath "cosmossdk.io/math" math_utils "github.com/neutron-org/neutron/utils/math" ) @@ -22,7 +22,7 @@ func Abs(x int64) uint64 { return uint64(x) } -func MinIntArr(vals []sdk.Int) sdk.Int { +func MinIntArr(vals []sdkmath.Int) sdkmath.Int { min := vals[0] for _, val := range vals { if val.LT(min) { @@ -33,7 +33,7 @@ func MinIntArr(vals []sdk.Int) sdk.Int { return min } -func MaxIntArr(vals []sdk.Int) sdk.Int { +func MaxIntArr(vals []sdkmath.Int) sdkmath.Int { max := vals[0] for _, val := range vals { if val.GT(max) { diff --git a/x/ibcswap/ibc_middleware.go b/x/ibcswap/ibc_middleware.go index f1273e315..08bce70c4 100644 --- a/x/ibcswap/ibc_middleware.go +++ b/x/ibcswap/ibc_middleware.go @@ -5,6 +5,7 @@ import ( "encoding/json" "strings" + "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" @@ -303,7 +304,7 @@ func (im IBCMiddleware) handleNoRefund( return channeltypes.NewResultAcknowledgement([]byte(swapErr.Error())) } - amount, ok := sdk.NewIntFromString(data.Amount) + amount, ok := math.NewIntFromString(data.Amount) if !ok { wrappedErr := sdkerrors.Wrapf( transfertypes.ErrInvalidAmount, diff --git a/x/ibcswap/keeper/keeper.go b/x/ibcswap/keeper/keeper.go index d71c683ab..548b592c9 100644 --- a/x/ibcswap/keeper/keeper.go +++ b/x/ibcswap/keeper/keeper.go @@ -3,6 +3,7 @@ package keeper import ( "fmt" + "cosmossdk.io/math" "github.com/cometbft/cometbft/libs/log" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/codec" @@ -117,7 +118,7 @@ func (k Keeper) RefundPacketToken( trace := transfertypes.ParseDenomTrace(data.Denom) // parse the transfer amount - transferAmount, ok := sdk.NewIntFromString(data.Amount) + transferAmount, ok := math.NewIntFromString(data.Amount) if !ok { return sdkerrors.Wrapf( transfertypes.ErrInvalidAmount, diff --git a/x/ibcswap/types/swap_test.go b/x/ibcswap/types/swap_test.go index 01368e6bf..ff7ba8a60 100644 --- a/x/ibcswap/types/swap_test.go +++ b/x/ibcswap/types/swap_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "testing" - sdk "github.com/cosmos/cosmos-sdk/types" + "cosmossdk.io/math" forwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router/types" "github.com/iancoleman/orderedmap" "github.com/neutron-org/neutron/app" @@ -27,7 +27,7 @@ func TestPacketMetadata_Marshal(t *testing.T) { Receiver: "test-1", TokenIn: "token-a", TokenOut: "token-b", - AmountIn: sdk.NewInt(123), + AmountIn: math.NewInt(123), TickIndexInToOut: 0, OrderType: types.LimitOrderType_FILL_OR_KILL, }, @@ -61,9 +61,9 @@ func TestPacketMetadata_MarshalWithNext(t *testing.T) { TokenIn: "token-a", TokenOut: "token-b", TickIndexInToOut: 0, - AmountIn: sdk.NewInt(123), + AmountIn: math.NewInt(123), OrderType: types.LimitOrderType_FILL_OR_KILL, - // MaxAmountOut: sdk.NewInt(456), + // MaxAmountOut: math.NewInt(456), }, Next: NewJSONObject(false, nextBz, orderedmap.OrderedMap{}), }, @@ -104,7 +104,7 @@ func TestSwapMetadata_ValidatePass(t *testing.T) { Receiver: sample.AccAddress(), TokenIn: "token-a", TokenOut: "token-b", - AmountIn: sdk.NewInt(123), + AmountIn: math.NewInt(123), TickIndexInToOut: 0, OrderType: types.LimitOrderType_FILL_OR_KILL, }, @@ -125,7 +125,7 @@ func TestSwapMetadata_ValidateFail(t *testing.T) { Receiver: "test-1", TokenIn: "token-a", TokenOut: "token-b", - AmountIn: sdk.NewInt(123), + AmountIn: math.NewInt(123), TickIndexInToOut: 0, OrderType: types.LimitOrderType_FILL_OR_KILL, }, @@ -143,7 +143,7 @@ func TestSwapMetadata_ValidateFail(t *testing.T) { Receiver: "", TokenIn: "token-a", TokenOut: "token-b", - AmountIn: sdk.NewInt(123), + AmountIn: math.NewInt(123), TickIndexInToOut: 0, OrderType: types.LimitOrderType_FILL_OR_KILL, }, @@ -161,7 +161,7 @@ func TestSwapMetadata_ValidateFail(t *testing.T) { Receiver: "test-1", TokenIn: "", TokenOut: "token-b", - AmountIn: sdk.NewInt(123), + AmountIn: math.NewInt(123), TickIndexInToOut: 0, OrderType: types.LimitOrderType_FILL_OR_KILL, }, @@ -179,7 +179,7 @@ func TestSwapMetadata_ValidateFail(t *testing.T) { Receiver: "receiver", TokenIn: "token-a", TokenOut: "", - AmountIn: sdk.NewInt(123), + AmountIn: math.NewInt(123), TickIndexInToOut: 0, OrderType: types.LimitOrderType_FILL_OR_KILL, }, @@ -197,7 +197,7 @@ func TestSwapMetadata_ValidateFail(t *testing.T) { Receiver: "receiver", TokenIn: "token-a", TokenOut: "token-b", - AmountIn: sdk.NewInt(0), + AmountIn: math.NewInt(0), TickIndexInToOut: 0, OrderType: types.LimitOrderType_FILL_OR_KILL, }, @@ -215,7 +215,7 @@ func TestSwapMetadata_ValidateFail(t *testing.T) { Receiver: "receiver", TokenIn: "token-a", TokenOut: "token-b", - AmountIn: sdk.NewInt(-1), + AmountIn: math.NewInt(-1), TickIndexInToOut: 0, OrderType: types.LimitOrderType_FILL_OR_KILL, }, @@ -233,7 +233,7 @@ func TestSwapMetadata_ValidateFail(t *testing.T) { Receiver: "receiver", TokenIn: "token-a", TokenOut: "token-b", - AmountIn: sdk.NewInt(123), + AmountIn: math.NewInt(123), TickIndexInToOut: 0, OrderType: types.LimitOrderType_GOOD_TIL_CANCELLED, }, diff --git a/x/incentives/client/cli/cli_test.go b/x/incentives/client/cli/cli_test.go index 473b37297..3ac098792 100644 --- a/x/incentives/client/cli/cli_test.go +++ b/x/incentives/client/cli/cli_test.go @@ -5,6 +5,7 @@ import ( "testing" "time" + "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/neutron-org/neutron/utils" "github.com/neutron-org/neutron/utils/dcli" @@ -149,8 +150,8 @@ func TestNewCreateGaugeCmd(t *testing.T) { EndTick: 100, }, Coins: sdk.NewCoins( - sdk.NewCoin("TokenA", sdk.NewInt(100)), - sdk.NewCoin("TokenB", sdk.NewInt(100)), + sdk.NewCoin("TokenA", math.NewInt(100)), + sdk.NewCoin("TokenB", math.NewInt(100)), ), StartTime: time.Unix(0, 0).UTC(), NumEpochsPaidOver: 50, @@ -172,8 +173,8 @@ func TestNewCreateGaugeCmd(t *testing.T) { EndTick: 20, }, Coins: sdk.NewCoins( - sdk.NewCoin("TokenA", sdk.NewInt(100)), - sdk.NewCoin("TokenB", sdk.NewInt(100)), + sdk.NewCoin("TokenA", math.NewInt(100)), + sdk.NewCoin("TokenB", math.NewInt(100)), ), StartTime: testTime, NumEpochsPaidOver: 50, @@ -195,8 +196,8 @@ func TestNewCreateGaugeCmd(t *testing.T) { EndTick: 20, }, Coins: sdk.NewCoins( - sdk.NewCoin("TokenA", sdk.NewInt(100)), - sdk.NewCoin("TokenB", sdk.NewInt(100)), + sdk.NewCoin("TokenA", math.NewInt(100)), + sdk.NewCoin("TokenB", math.NewInt(100)), ), StartTime: testTime, NumEpochsPaidOver: 50, @@ -217,8 +218,8 @@ func TestNewCreateGaugeCmd(t *testing.T) { EndTick: 20, }, Coins: sdk.NewCoins( - sdk.NewCoin("TokenA", sdk.NewInt(100)), - sdk.NewCoin("TokenB", sdk.NewInt(100)), + sdk.NewCoin("TokenA", math.NewInt(100)), + sdk.NewCoin("TokenB", math.NewInt(100)), ), StartTime: time.Unix(0, 0).UTC(), NumEpochsPaidOver: 1, @@ -237,7 +238,7 @@ func TestNewAddToGaugeCmd(t *testing.T) { ExpectedMsg: &types.MsgAddToGauge{ Owner: testAddresses[0].String(), GaugeId: 1, - Rewards: sdk.NewCoins(sdk.NewCoin("TokenA", sdk.NewInt(1000))), + Rewards: sdk.NewCoins(sdk.NewCoin("TokenA", math.NewInt(1000))), }, }, "multiple tokens": { @@ -246,8 +247,8 @@ func TestNewAddToGaugeCmd(t *testing.T) { Owner: testAddresses[0].String(), GaugeId: 1, Rewards: sdk.NewCoins( - sdk.NewCoin("TokenA", sdk.NewInt(1000)), - sdk.NewCoin("TokenZ", sdk.NewInt(1)), + sdk.NewCoin("TokenA", math.NewInt(1000)), + sdk.NewCoin("TokenZ", math.NewInt(1)), ), }, }, @@ -262,7 +263,7 @@ func TestNewStakeCmd(t *testing.T) { Cmd: fmt.Sprintf("1000TokenA --from %s", testAddresses[0]), ExpectedMsg: &types.MsgStake{ Owner: testAddresses[0].String(), - Coins: sdk.NewCoins(sdk.NewCoin("TokenA", sdk.NewInt(1000))), + Coins: sdk.NewCoins(sdk.NewCoin("TokenA", math.NewInt(1000))), }, }, "multiple tokens": { @@ -270,8 +271,8 @@ func TestNewStakeCmd(t *testing.T) { ExpectedMsg: &types.MsgStake{ Owner: testAddresses[0].String(), Coins: sdk.NewCoins( - sdk.NewCoin("TokenA", sdk.NewInt(1000)), - sdk.NewCoin("TokenZ", sdk.NewInt(1)), + sdk.NewCoin("TokenA", math.NewInt(1000)), + sdk.NewCoin("TokenZ", math.NewInt(1)), ), }, }, @@ -283,7 +284,7 @@ func TestNewStakeCmd(t *testing.T) { ExpectedMsg: &types.MsgStake{ Owner: testAddresses[0].String(), Coins: sdk.NewCoins( - sdk.NewCoin("DualityPoolShares-tokenA-tokenB-t123-f30", sdk.NewInt(1000)), + sdk.NewCoin("DualityPoolShares-tokenA-tokenB-t123-f30", math.NewInt(1000)), ), }, }, @@ -295,7 +296,7 @@ func TestNewStakeCmd(t *testing.T) { ExpectedMsg: &types.MsgStake{ Owner: testAddresses[0].String(), Coins: sdk.NewCoins( - sdk.NewCoin("DualityPoolShares-tokenA-tokenB-t-123-f30", sdk.NewInt(1000)), + sdk.NewCoin("DualityPoolShares-tokenA-tokenB-t-123-f30", math.NewInt(1000)), ), }, }, @@ -307,8 +308,8 @@ func TestNewStakeCmd(t *testing.T) { ExpectedMsg: &types.MsgStake{ Owner: testAddresses[0].String(), Coins: sdk.NewCoins( - sdk.NewCoin("DualityPoolShares-tokenA-tokenB-t-123-f30", sdk.NewInt(1000)), - sdk.NewCoin("DualityPoolShares-tokenA-tokenB-t-124-f30", sdk.NewInt(1)), + sdk.NewCoin("DualityPoolShares-tokenA-tokenB-t-123-f30", math.NewInt(1000)), + sdk.NewCoin("DualityPoolShares-tokenA-tokenB-t-124-f30", math.NewInt(1)), ), }, }, @@ -334,13 +335,13 @@ func TestNewUnstakeCmd(t *testing.T) { { ID: 1, Coins: sdk.NewCoins( - sdk.NewCoin("TokenA", sdk.NewInt(10)), + sdk.NewCoin("TokenA", math.NewInt(10)), ), }, { ID: 10, Coins: sdk.NewCoins( - sdk.NewCoin("TokenA", sdk.NewInt(10)), - sdk.NewCoin("TokenC", sdk.NewInt(10)), + sdk.NewCoin("TokenA", math.NewInt(10)), + sdk.NewCoin("TokenC", math.NewInt(10)), ), }, }, diff --git a/x/incentives/client/cli/query_test.go b/x/incentives/client/cli/query_test.go index 657944430..b0102ff02 100644 --- a/x/incentives/client/cli/query_test.go +++ b/x/incentives/client/cli/query_test.go @@ -46,7 +46,7 @@ func (s *QueryTestSuite) SetupSuite() { // set up stake with id = 1 addr := apptesting.SetupAddr(0) - s.SetupStake(addr, sdk.Coins{sdk.NewCoin(denom, sdk.NewInt(1000000))}, time.Hour*24) + s.SetupStake(addr, sdk.Coins{sdk.NewCoin(denom, math.NewInt(1000000))}, time.Hour*24) s.Commit() } diff --git a/x/incentives/keeper/distribute.go b/x/incentives/keeper/distribute.go index 9dff4b39d..3990e0046 100644 --- a/x/incentives/keeper/distribute.go +++ b/x/incentives/keeper/distribute.go @@ -4,20 +4,20 @@ import ( "fmt" "time" + "cosmossdk.io/math" + sdk "github.com/cosmos/cosmos-sdk/types" math_utils "github.com/neutron-org/neutron/utils/math" dextypes "github.com/neutron-org/neutron/x/dex/types" "github.com/neutron-org/neutron/x/incentives/types" - - sdk "github.com/cosmos/cosmos-sdk/types" ) var _ DistributorKeeper = Keeper{} -func (k Keeper) ValueForShares(ctx sdk.Context, coin sdk.Coin, tick int64) (sdk.Int, error) { +func (k Keeper) ValueForShares(ctx sdk.Context, coin sdk.Coin, tick int64) (math.Int, error) { totalShares := k.bk.GetSupply(ctx, coin.Denom).Amount poolMetadata, err := k.dk.GetPoolMetadataByDenom(ctx, coin.Denom) if err != nil { - return sdk.ZeroInt(), err + return math.ZeroInt(), err } pool, err := k.dk.GetOrInitPool( @@ -27,12 +27,12 @@ func (k Keeper) ValueForShares(ctx sdk.Context, coin sdk.Coin, tick int64) (sdk. poolMetadata.Fee, ) if err != nil { - return sdk.ZeroInt(), err + return math.ZeroInt(), err } amount0, amount1 := pool.RedeemValue(coin.Amount, totalShares) price1To0Center, err := dextypes.CalcPrice(-1 * tick) if err != nil { - return sdk.ZeroInt(), err + return math.ZeroInt(), err } return math_utils.NewPrecDecFromInt(amount0).Add(price1To0Center.MulInt(amount1)).TruncateInt(), nil } diff --git a/x/incentives/keeper/distribute_test.go b/x/incentives/keeper/distribute_test.go index b699bcf2e..44516848e 100644 --- a/x/incentives/keeper/distribute_test.go +++ b/x/incentives/keeper/distribute_test.go @@ -7,6 +7,7 @@ import ( "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" + "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/neutron-org/neutron/testutil/apptesting" dextypes "github.com/neutron-org/neutron/x/dex/types" @@ -28,7 +29,7 @@ func (suite *KeeperTestSuite) TestValueForShares() { deposits []depositSpec coin sdk.Coin tick int64 - expectation sdk.Int + expectation math.Int err error }{ // gauge 1 gives 3k coins. three stakes, all eligible. 1k coins per stake. @@ -46,7 +47,7 @@ func (suite *KeeperTestSuite) TestValueForShares() { }, coin: sdk.NewInt64Coin(dextypes.NewPoolDenom(0), 20), tick: 1000, - expectation: sdk.NewInt(21), + expectation: math.NewInt(21), }, { name: "one deposit: no adjustment", @@ -61,7 +62,7 @@ func (suite *KeeperTestSuite) TestValueForShares() { }, coin: sdk.NewInt64Coin(dextypes.NewPoolDenom(0), 20), tick: 0, - expectation: sdk.NewInt(20), + expectation: math.NewInt(20), }, { name: "two deposits: one extraneous", @@ -83,7 +84,7 @@ func (suite *KeeperTestSuite) TestValueForShares() { }, coin: sdk.NewInt64Coin(dextypes.NewPoolDenom(0), 20), tick: 1000, - expectation: sdk.NewInt(21), + expectation: math.NewInt(21), }, { name: "two deposits: both relevant", @@ -105,7 +106,7 @@ func (suite *KeeperTestSuite) TestValueForShares() { }, coin: sdk.NewInt64Coin(dextypes.NewPoolDenom(0), 20), tick: 1000, - expectation: sdk.NewInt(21), + expectation: math.NewInt(21), }, } for _, tc := range tests { diff --git a/x/incentives/keeper/distributor.go b/x/incentives/keeper/distributor.go index 837986dd5..46197d28d 100644 --- a/x/incentives/keeper/distributor.go +++ b/x/incentives/keeper/distributor.go @@ -1,12 +1,13 @@ package keeper import ( + "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/neutron-org/neutron/x/incentives/types" ) type DistributorKeeper interface { - ValueForShares(ctx sdk.Context, coin sdk.Coin, tick int64) (sdk.Int, error) + ValueForShares(ctx sdk.Context, coin sdk.Coin, tick int64) (math.Int, error) GetStakesByQueryCondition(ctx sdk.Context, distrTo *types.QueryCondition) types.Stakes StakeCoinsPassingQueryCondition(ctx sdk.Context, stake *types.Stake, distrTo types.QueryCondition) sdk.Coins } @@ -34,17 +35,17 @@ func (d Distributor) Distribute( rewardsNextEpoch := gauge.RewardsNextEpoch() - adjustedGaugeTotal := sdk.ZeroInt() + adjustedGaugeTotal := math.ZeroInt() gaugeStakes := d.keeper.GetStakesByQueryCondition(ctx, &gauge.DistributeTo) if filterStakes == nil { filterStakes = gaugeStakes } - stakeSumCache := make(map[uint64]sdk.Int, len(gaugeStakes)) + stakeSumCache := make(map[uint64]math.Int, len(gaugeStakes)) for _, stake := range gaugeStakes { stakeCoins := d.keeper.StakeCoinsPassingQueryCondition(ctx, stake, gauge.DistributeTo) - stakeTotal := sdk.ZeroInt() + stakeTotal := math.ZeroInt() for _, stakeCoin := range stakeCoins { adjustedPositionValue, err := d.keeper.ValueForShares(ctx, stakeCoin, gauge.PricingTick) if err != nil { diff --git a/x/incentives/keeper/distributor_test.go b/x/incentives/keeper/distributor_test.go index a1b6f0c42..36e59528e 100644 --- a/x/incentives/keeper/distributor_test.go +++ b/x/incentives/keeper/distributor_test.go @@ -4,6 +4,7 @@ import ( "testing" time "time" + "cosmossdk.io/math" tmtypes "github.com/cometbft/cometbft/proto/tendermint/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/neutron-org/neutron/testutil" @@ -28,8 +29,8 @@ func NewMockKeeper(keeper DistributorKeeper, stakes types.Stakes) MockKeeper { } } -func (k MockKeeper) ValueForShares(_ sdk.Context, coin sdk.Coin, tick int64) (sdk.Int, error) { - return coin.Amount.Mul(sdk.NewInt(2)), nil +func (k MockKeeper) ValueForShares(_ sdk.Context, coin sdk.Coin, tick int64) (math.Int, error) { + return coin.Amount.Mul(math.NewInt(2)), nil } func (k MockKeeper) GetStakesByQueryCondition( @@ -61,7 +62,7 @@ func TestDistributor(t *testing.T) { StartTick: -10, EndTick: 10, }, - sdk.Coins{sdk.NewCoin("coin1", sdk.NewInt(100))}, + sdk.Coins{sdk.NewCoin("coin1", math.NewInt(100))}, ctx.BlockTime(), 10, 0, @@ -73,10 +74,10 @@ func TestDistributor(t *testing.T) { nonRewardPool, _ := app.DexKeeper.GetOrInitPool(ctx, &dextypes.PairID{Token0: "TokenA", Token1: "TokenB"}, 12, 1) nonRewardedDenom := nonRewardPool.GetPoolDenom() allStakes := types.Stakes{ - {1, "addr1", ctx.BlockTime(), sdk.Coins{sdk.NewCoin(rewardedDenom, sdk.NewInt(50))}, 0}, - {2, "addr2", ctx.BlockTime(), sdk.Coins{sdk.NewCoin(rewardedDenom, sdk.NewInt(25))}, 0}, - {3, "addr2", ctx.BlockTime(), sdk.Coins{sdk.NewCoin(rewardedDenom, sdk.NewInt(25))}, 0}, - {4, "addr3", ctx.BlockTime(), sdk.Coins{sdk.NewCoin(nonRewardedDenom, sdk.NewInt(50))}, 0}, + {1, "addr1", ctx.BlockTime(), sdk.Coins{sdk.NewCoin(rewardedDenom, math.NewInt(50))}, 0}, + {2, "addr2", ctx.BlockTime(), sdk.Coins{sdk.NewCoin(rewardedDenom, math.NewInt(25))}, 0}, + {3, "addr2", ctx.BlockTime(), sdk.Coins{sdk.NewCoin(rewardedDenom, math.NewInt(25))}, 0}, + {4, "addr3", ctx.BlockTime(), sdk.Coins{sdk.NewCoin(nonRewardedDenom, math.NewInt(50))}, 0}, } distributor := NewDistributor(NewMockKeeper(app.IncentivesKeeper, allStakes)) @@ -100,8 +101,8 @@ func TestDistributor(t *testing.T) { timeOffset: 0, filterStakes: allStakes, expected: types.DistributionSpec{ - "addr1": sdk.Coins{sdk.NewCoin("coin1", sdk.NewInt(5))}, - "addr2": sdk.Coins{sdk.NewCoin("coin1", sdk.NewInt(4))}, + "addr1": sdk.Coins{sdk.NewCoin("coin1", math.NewInt(5))}, + "addr2": sdk.Coins{sdk.NewCoin("coin1", math.NewInt(4))}, }, expectedErr: nil, }, @@ -110,7 +111,7 @@ func TestDistributor(t *testing.T) { timeOffset: 0, filterStakes: types.Stakes{allStakes[0]}, expected: types.DistributionSpec{ - "addr1": sdk.Coins{sdk.NewCoin("coin1", sdk.NewInt(5))}, + "addr1": sdk.Coins{sdk.NewCoin("coin1", math.NewInt(5))}, }, expectedErr: nil, }, diff --git a/x/incentives/keeper/suite_test.go b/x/incentives/keeper/suite_test.go index 89596b341..cf0ab8382 100644 --- a/x/incentives/keeper/suite_test.go +++ b/x/incentives/keeper/suite_test.go @@ -3,6 +3,7 @@ package keeper_test import ( "time" + "cosmossdk.io/math" dextypes "github.com/neutron-org/neutron/x/dex/types" "github.com/neutron-org/neutron/x/incentives/types" @@ -50,8 +51,8 @@ func (suite *KeeperTestSuite) SetupDeposit(ss []depositSpec) sdk.Coins { dextypes.MustNewPairID(s.token0.Denom, s.token1.Denom), s.addr, s.addr, - []sdk.Int{s.token0.Amount}, - []sdk.Int{s.token1.Amount}, + []math.Int{s.token0.Amount}, + []math.Int{s.token1.Amount}, []int64{s.tick}, []uint64{s.fee}, []*dextypes.DepositOptions{{}}, diff --git a/x/incentives/types/gauge.go b/x/incentives/types/gauge.go index 139be2874..94a43dc16 100644 --- a/x/incentives/types/gauge.go +++ b/x/incentives/types/gauge.go @@ -3,6 +3,7 @@ package types import ( time "time" + "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" ) @@ -62,7 +63,7 @@ func (gauge Gauge) RewardsNextEpoch() sdk.Coins { } for _, rewardRemainingCoin := range gauge.CoinsRemaining() { - amount := rewardRemainingCoin.Amount.Quo(sdk.NewInt(int64(epochsRemaining))) + amount := rewardRemainingCoin.Amount.Quo(math.NewInt(int64(epochsRemaining))) result = result.Add(sdk.Coin{Denom: rewardRemainingCoin.Denom, Amount: amount}) } diff --git a/x/incentives/types/gauge_test.go b/x/incentives/types/gauge_test.go index d05370d66..431aeb815 100644 --- a/x/incentives/types/gauge_test.go +++ b/x/incentives/types/gauge_test.go @@ -4,6 +4,7 @@ import ( "testing" "time" + "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" . "github.com/neutron-org/neutron/x/incentives/types" "github.com/stretchr/testify/assert" @@ -48,18 +49,18 @@ func TestGaugeEpochsRemaining(t *testing.T) { } func TestGaugeCoinsRemaining(t *testing.T) { - coins := sdk.Coins{sdk.NewCoin("coin1", sdk.NewInt(100))} - distCoins := sdk.Coins{sdk.NewCoin("coin1", sdk.NewInt(50))} + coins := sdk.Coins{sdk.NewCoin("coin1", math.NewInt(100))} + distCoins := sdk.Coins{sdk.NewCoin("coin1", math.NewInt(50))} gauge := NewGauge(1, false, QueryCondition{}, coins, time.Time{}, 10, 5, distCoins, 0) - assert.Equal(t, sdk.Coins{sdk.NewCoin("coin1", sdk.NewInt(50))}, gauge.CoinsRemaining()) + assert.Equal(t, sdk.Coins{sdk.NewCoin("coin1", math.NewInt(50))}, gauge.CoinsRemaining()) } func TestGaugeGetTotal(t *testing.T) { distSpec := DistributionSpec{ - "addr1": sdk.Coins{sdk.NewCoin("coin1", sdk.NewInt(10))}, - "addr2": sdk.Coins{sdk.NewCoin("coin1", sdk.NewInt(20))}, - "addr3": sdk.Coins{sdk.NewCoin("coin1", sdk.NewInt(30))}, + "addr1": sdk.Coins{sdk.NewCoin("coin1", math.NewInt(10))}, + "addr2": sdk.Coins{sdk.NewCoin("coin1", math.NewInt(20))}, + "addr3": sdk.Coins{sdk.NewCoin("coin1", math.NewInt(30))}, } - assert.Equal(t, sdk.Coins{sdk.NewCoin("coin1", sdk.NewInt(60))}, distSpec.GetTotal()) + assert.Equal(t, sdk.Coins{sdk.NewCoin("coin1", math.NewInt(60))}, distSpec.GetTotal()) } diff --git a/x/incentives/types/msgs_test.go b/x/incentives/types/msgs_test.go index 659d13b21..4ebdde3ea 100644 --- a/x/incentives/types/msgs_test.go +++ b/x/incentives/types/msgs_test.go @@ -7,6 +7,7 @@ import ( "github.com/cometbft/cometbft/crypto/ed25519" "github.com/stretchr/testify/require" + "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/neutron-org/neutron/testutil/apptesting" @@ -197,7 +198,7 @@ func TestMsgSetupStake(t *testing.T) { name: "proper msg", msg: MsgStake{ Owner: addr1, - Coins: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100))), + Coins: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100))), }, expectPass: true, }, @@ -205,14 +206,14 @@ func TestMsgSetupStake(t *testing.T) { name: "invalid owner", msg: MsgStake{ Owner: invalidAddr, - Coins: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100))), + Coins: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100))), }, }, { name: "zero token amount", msg: MsgStake{ Owner: addr1, - Coins: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(0))), + Coins: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(0))), }, }, } @@ -248,7 +249,7 @@ func TestMsgUnstake(t *testing.T) { Unstakes: []*MsgUnstake_UnstakeDescriptor{ { ID: 1, - Coins: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100))), + Coins: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100))), }, }, }, @@ -261,7 +262,7 @@ func TestMsgUnstake(t *testing.T) { Unstakes: []*MsgUnstake_UnstakeDescriptor{ { ID: 1, - Coins: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100))), + Coins: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100))), }, }, }, @@ -273,7 +274,7 @@ func TestMsgUnstake(t *testing.T) { Unstakes: []*MsgUnstake_UnstakeDescriptor{ { ID: 0, - Coins: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100))), + Coins: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100))), }, }, }, @@ -285,7 +286,7 @@ func TestMsgUnstake(t *testing.T) { Unstakes: []*MsgUnstake_UnstakeDescriptor{ { ID: 1, - Coins: sdk.NewCoins(sdk.NewCoin("test1", sdk.NewInt(0))), + Coins: sdk.NewCoins(sdk.NewCoin("test1", math.NewInt(0))), }, }, }, From 5b598bf0f82be9ca83d9a8039383372a70b8e0c7 Mon Sep 17 00:00:00 2001 From: Julian Compagni Portis Date: Mon, 16 Oct 2023 13:35:22 -0400 Subject: [PATCH 181/307] FIX: deprecation github.com/cosmos/cosmos-sdk/types/errors => cosmossdk.io/errors --- x/dex/client/cli/tx_deposit.go | 2 +- x/dex/client/cli/tx_multi_hop_swap.go | 2 +- x/dex/client/cli/tx_place_limit_order.go | 2 +- x/dex/client/cli/tx_withdrawl.go | 2 +- x/dex/keeper/core.go | 2 +- x/dex/keeper/core_helper.go | 4 ++-- .../grpc_query_estimate_place_limit_order.go | 2 +- x/dex/keeper/grpc_query_pool_metadata.go | 3 +-- x/dex/keeper/grpc_query_pool_metadata_test.go | 3 +-- x/dex/keeper/msg_server.go | 6 ++--- x/dex/keeper/multihop_swap.go | 2 +- x/dex/types/errors.go | 7 +++++- x/dex/types/message_cancel_limit_order.go | 4 ++-- .../types/message_cancel_limit_order_test.go | 3 +-- x/dex/types/message_deposit.go | 6 ++--- x/dex/types/message_deposit_test.go | 5 ++-- x/dex/types/message_multi_hop_swap.go | 6 ++--- x/dex/types/message_multi_hop_swap_test.go | 5 ++-- x/dex/types/message_place_limit_order.go | 6 ++--- x/dex/types/message_place_limit_order_test.go | 5 ++-- x/dex/types/message_withdrawl.go | 6 ++--- .../message_withdrawl_filled_limit_order.go | 4 ++-- ...ssage_withdrawl_filled_limit_order_test.go | 3 +-- x/dex/types/message_withdrawl_test.go | 5 ++-- x/dex/types/pair_id.go | 2 +- x/dex/types/trade_pair_id.go | 2 +- x/dex/utils/abci.go | 5 ++-- x/epochs/types/hooks_test.go | 2 +- x/ibcswap/ibc_middleware.go | 2 +- x/ibcswap/keeper/keeper.go | 2 +- x/ibcswap/types/errors.go | 2 +- x/ibcswap/types/swap.go | 6 ++--- x/incentives/keeper/msg_server.go | 12 +++++----- x/incentives/keeper/query_server.go | 8 +++---- x/incentives/keeper/stake.go | 12 +++++----- x/incentives/types/errors.go | 12 +++++++++- x/incentives/types/msgs.go | 24 +++++++++---------- 37 files changed, 97 insertions(+), 89 deletions(-) diff --git a/x/dex/client/cli/tx_deposit.go b/x/dex/client/cli/tx_deposit.go index 31a833303..8d58c44b7 100644 --- a/x/dex/client/cli/tx_deposit.go +++ b/x/dex/client/cli/tx_deposit.go @@ -9,7 +9,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + sdkerrors "cosmossdk.io/errors" "github.com/neutron-org/neutron/x/dex/types" "github.com/spf13/cobra" ) diff --git a/x/dex/client/cli/tx_multi_hop_swap.go b/x/dex/client/cli/tx_multi_hop_swap.go index bf703cb2a..9c33cc3d4 100644 --- a/x/dex/client/cli/tx_multi_hop_swap.go +++ b/x/dex/client/cli/tx_multi_hop_swap.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + sdkerrors "cosmossdk.io/errors" math_utils "github.com/neutron-org/neutron/utils/math" "github.com/neutron-org/neutron/x/dex/types" "github.com/spf13/cobra" diff --git a/x/dex/client/cli/tx_place_limit_order.go b/x/dex/client/cli/tx_place_limit_order.go index 6ae51074c..e57e1a017 100644 --- a/x/dex/client/cli/tx_place_limit_order.go +++ b/x/dex/client/cli/tx_place_limit_order.go @@ -9,7 +9,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + sdkerrors "cosmossdk.io/errors" "github.com/neutron-org/neutron/x/dex/types" "github.com/spf13/cobra" ) diff --git a/x/dex/client/cli/tx_withdrawl.go b/x/dex/client/cli/tx_withdrawl.go index 277f31488..3da7962a0 100644 --- a/x/dex/client/cli/tx_withdrawl.go +++ b/x/dex/client/cli/tx_withdrawl.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + sdkerrors "cosmossdk.io/errors" "github.com/neutron-org/neutron/x/dex/types" "github.com/spf13/cobra" ) diff --git a/x/dex/keeper/core.go b/x/dex/keeper/core.go index 1fa69de81..6268b908d 100644 --- a/x/dex/keeper/core.go +++ b/x/dex/keeper/core.go @@ -6,7 +6,7 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + sdkerrors "cosmossdk.io/errors" math_utils "github.com/neutron-org/neutron/utils/math" "github.com/neutron-org/neutron/x/dex/types" "github.com/neutron-org/neutron/x/dex/utils" diff --git a/x/dex/keeper/core_helper.go b/x/dex/keeper/core_helper.go index cf5d0ff81..e22495807 100644 --- a/x/dex/keeper/core_helper.go +++ b/x/dex/keeper/core_helper.go @@ -1,9 +1,9 @@ package keeper import ( + sdkerrors "cosmossdk.io/errors" "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" math_utils "github.com/neutron-org/neutron/utils/math" "github.com/neutron-org/neutron/x/dex/types" "golang.org/x/exp/slices" @@ -67,7 +67,7 @@ func (k Keeper) GetValidFees(ctx sdk.Context) []uint64 { func (k Keeper) ValidateFee(ctx sdk.Context, fee uint64) error { validFees := k.GetValidFees(ctx) if !slices.Contains(validFees, fee) { - return sdkerrors.Wrapf(types.ErrInvalidFee, "%s", validFees) + return sdkerrors.Wrapf(types.ErrInvalidFee, "%d", validFees) } return nil 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 26069379e..69285cf75 100644 --- a/x/dex/keeper/grpc_query_estimate_place_limit_order.go +++ b/x/dex/keeper/grpc_query_estimate_place_limit_order.go @@ -4,7 +4,7 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + sdkerrors "cosmossdk.io/errors" "github.com/neutron-org/neutron/x/dex/types" ) diff --git a/x/dex/keeper/grpc_query_pool_metadata.go b/x/dex/keeper/grpc_query_pool_metadata.go index 628d2bf2a..a4ebc6feb 100644 --- a/x/dex/keeper/grpc_query_pool_metadata.go +++ b/x/dex/keeper/grpc_query_pool_metadata.go @@ -5,7 +5,6 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/cosmos/cosmos-sdk/types/query" "github.com/neutron-org/neutron/x/dex/types" "google.golang.org/grpc/codes" @@ -47,7 +46,7 @@ func (k Keeper) PoolMetadata(goCtx context.Context, req *types.QueryGetPoolMetad ctx := sdk.UnwrapSDKContext(goCtx) poolMetadata, found := k.GetPoolMetadata(ctx, req.Id) if !found { - return nil, sdkerrors.ErrKeyNotFound + return nil, status.Error(codes.NotFound, "PoolMetadata not found for key") } return &types.QueryGetPoolMetadataResponse{PoolMetadata: poolMetadata}, nil diff --git a/x/dex/keeper/grpc_query_pool_metadata_test.go b/x/dex/keeper/grpc_query_pool_metadata_test.go index 13153e102..88f61d2da 100644 --- a/x/dex/keeper/grpc_query_pool_metadata_test.go +++ b/x/dex/keeper/grpc_query_pool_metadata_test.go @@ -4,7 +4,6 @@ import ( "testing" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/cosmos/cosmos-sdk/types/query" "github.com/stretchr/testify/require" "google.golang.org/grpc/codes" @@ -38,7 +37,7 @@ func TestPoolMetadataQuerySingle(t *testing.T) { { desc: "KeyNotFound", request: &types.QueryGetPoolMetadataRequest{Id: uint64(len(msgs))}, - err: sdkerrors.ErrKeyNotFound, + err: status.Error(codes.NotFound, "PoolMetadata not found for key"), }, { desc: "InvalidRequest", diff --git a/x/dex/keeper/msg_server.go b/x/dex/keeper/msg_server.go index f9b84fdc6..4857aa1c2 100644 --- a/x/dex/keeper/msg_server.go +++ b/x/dex/keeper/msg_server.go @@ -3,10 +3,10 @@ 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/x/dex/types" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" ) type MsgServer struct { @@ -190,7 +190,7 @@ func (k MsgServer) UpdateParams(goCtx context.Context, req *types.MsgUpdateParam } authority := k.GetAuthority() if authority != req.Authority { - return nil, errors.Wrapf(sdkerrors.ErrInvalidRequest, "invalid authority; expected %s, got %s", authority, req.Authority) + return nil, status.Errorf(codes.PermissionDenied, "invalid authority; expected %s, got %s", authority, req.Authority) } ctx := sdk.UnwrapSDKContext(goCtx) diff --git a/x/dex/keeper/multihop_swap.go b/x/dex/keeper/multihop_swap.go index 02dac052a..d8ed175c6 100644 --- a/x/dex/keeper/multihop_swap.go +++ b/x/dex/keeper/multihop_swap.go @@ -3,7 +3,7 @@ package keeper import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + sdkerrors "cosmossdk.io/errors" math_utils "github.com/neutron-org/neutron/utils/math" "github.com/neutron-org/neutron/x/dex/types" ) diff --git a/x/dex/types/errors.go b/x/dex/types/errors.go index 7aad622ad..744c2e289 100644 --- a/x/dex/types/errors.go +++ b/x/dex/types/errors.go @@ -3,7 +3,7 @@ package types // DONTCOVER import ( - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + sdkerrors "cosmossdk.io/errors" ) // x/dex module sentinel errors @@ -160,4 +160,9 @@ var ( 1148, "Fee must must a legal fee amount:", ) + ErrInvalidAddress = sdkerrors.Register( + ModuleName, + 1149, + "Invalid Address", + ) ) diff --git a/x/dex/types/message_cancel_limit_order.go b/x/dex/types/message_cancel_limit_order.go index 7b8433ffe..538ab9b0e 100644 --- a/x/dex/types/message_cancel_limit_order.go +++ b/x/dex/types/message_cancel_limit_order.go @@ -1,8 +1,8 @@ package types import ( + sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" ) const TypeMsgCancelLimitOrder = "cancel_limit_order" @@ -41,7 +41,7 @@ func (msg *MsgCancelLimitOrder) GetSignBytes() []byte { func (msg *MsgCancelLimitOrder) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(msg.Creator) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err) + return sdkerrors.Wrapf(ErrInvalidAddress, "invalid creator address (%s)", err) } return nil diff --git a/x/dex/types/message_cancel_limit_order_test.go b/x/dex/types/message_cancel_limit_order_test.go index 6e87664fb..421defb08 100644 --- a/x/dex/types/message_cancel_limit_order_test.go +++ b/x/dex/types/message_cancel_limit_order_test.go @@ -3,7 +3,6 @@ package types_test import ( "testing" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/neutron-org/neutron/testutil/common/sample" . "github.com/neutron-org/neutron/x/dex/types" "github.com/stretchr/testify/require" @@ -21,7 +20,7 @@ func TestMsgCancelLimitOrder_ValidateBasic(t *testing.T) { Creator: "invalid_address", TrancheKey: "ORDER123", }, - err: sdkerrors.ErrInvalidAddress, + err: ErrInvalidAddress, }, { name: "valid msg", msg: MsgCancelLimitOrder{ diff --git a/x/dex/types/message_deposit.go b/x/dex/types/message_deposit.go index 4288ca2e6..841b0328e 100644 --- a/x/dex/types/message_deposit.go +++ b/x/dex/types/message_deposit.go @@ -1,9 +1,9 @@ package types import ( + sdkerrors "cosmossdk.io/errors" "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" ) const TypeMsgDeposit = "deposit" @@ -59,12 +59,12 @@ func (msg *MsgDeposit) GetSignBytes() []byte { func (msg *MsgDeposit) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(msg.Creator) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err) + return sdkerrors.Wrapf(ErrInvalidAddress, "invalid creator address (%s)", err) } _, err = sdk.AccAddressFromBech32(msg.Receiver) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid receiver address (%s)", err) + return sdkerrors.Wrapf(ErrInvalidAddress, "invalid receiver address (%s)", err) } // Verify that the lengths of TickIndexes, Fees, AmountsA, AmountsB are all equal diff --git a/x/dex/types/message_deposit_test.go b/x/dex/types/message_deposit_test.go index 12ca261f3..33c8baf35 100644 --- a/x/dex/types/message_deposit_test.go +++ b/x/dex/types/message_deposit_test.go @@ -4,7 +4,6 @@ import ( "testing" "cosmossdk.io/math" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/neutron-org/neutron/testutil/common/sample" . "github.com/neutron-org/neutron/x/dex/types" "github.com/stretchr/testify/require" @@ -26,7 +25,7 @@ func TestMsgDeposit_ValidateBasic(t *testing.T) { AmountsA: []math.Int{math.OneInt()}, AmountsB: []math.Int{math.OneInt()}, }, - err: sdkerrors.ErrInvalidAddress, + err: ErrInvalidAddress, }, { name: "invalid receiver", @@ -38,7 +37,7 @@ func TestMsgDeposit_ValidateBasic(t *testing.T) { AmountsA: []math.Int{math.OneInt()}, AmountsB: []math.Int{math.OneInt()}, }, - err: sdkerrors.ErrInvalidAddress, + err: ErrInvalidAddress, }, { name: "invalid fee indexes length", diff --git a/x/dex/types/message_multi_hop_swap.go b/x/dex/types/message_multi_hop_swap.go index b8e543f04..57375f20f 100644 --- a/x/dex/types/message_multi_hop_swap.go +++ b/x/dex/types/message_multi_hop_swap.go @@ -1,9 +1,9 @@ package types import ( + sdkerrors "cosmossdk.io/errors" "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" math_utils "github.com/neutron-org/neutron/utils/math" ) @@ -59,11 +59,11 @@ func (msg *MsgMultiHopSwap) GetSignBytes() []byte { func (msg *MsgMultiHopSwap) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(msg.Creator) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err) + return sdkerrors.Wrapf(ErrInvalidAddress, "invalid creator address (%s)", err) } _, err = sdk.AccAddressFromBech32(msg.Receiver) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid receiver address (%s)", err) + return sdkerrors.Wrapf(ErrInvalidAddress, "invalid receiver address (%s)", err) } if len(msg.Routes) == 0 { diff --git a/x/dex/types/message_multi_hop_swap_test.go b/x/dex/types/message_multi_hop_swap_test.go index af2d5b7a5..87ee40107 100644 --- a/x/dex/types/message_multi_hop_swap_test.go +++ b/x/dex/types/message_multi_hop_swap_test.go @@ -4,7 +4,6 @@ import ( "testing" "cosmossdk.io/math" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/neutron-org/neutron/testutil/common/sample" . "github.com/neutron-org/neutron/x/dex/types" "github.com/stretchr/testify/require" @@ -22,7 +21,7 @@ func TestMsgMultiHopSwap_ValidateBasic(t *testing.T) { Creator: "invalid_address", Receiver: sample.AccAddress(), }, - err: sdkerrors.ErrInvalidAddress, + err: ErrInvalidAddress, }, { name: "invalid receiver address", @@ -30,7 +29,7 @@ func TestMsgMultiHopSwap_ValidateBasic(t *testing.T) { Creator: sample.AccAddress(), Receiver: "invalid_address", }, - err: sdkerrors.ErrInvalidAddress, + err: ErrInvalidAddress, }, { name: "missing route", diff --git a/x/dex/types/message_place_limit_order.go b/x/dex/types/message_place_limit_order.go index 255005925..33593ad26 100644 --- a/x/dex/types/message_place_limit_order.go +++ b/x/dex/types/message_place_limit_order.go @@ -3,9 +3,9 @@ package types import ( "time" + sdkerrors "cosmossdk.io/errors" "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" ) const TypeMsgPlaceLimitOrder = "place_limit_order" @@ -61,12 +61,12 @@ func (msg *MsgPlaceLimitOrder) GetSignBytes() []byte { func (msg *MsgPlaceLimitOrder) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(msg.Creator) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err) + return sdkerrors.Wrapf(ErrInvalidAddress, "invalid creator address (%s)", err) } _, err = sdk.AccAddressFromBech32(msg.Receiver) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid receiver address (%s)", err) + return sdkerrors.Wrapf(ErrInvalidAddress, "invalid receiver address (%s)", err) } if msg.AmountIn.LTE(math.ZeroInt()) { diff --git a/x/dex/types/message_place_limit_order_test.go b/x/dex/types/message_place_limit_order_test.go index 27fa00b57..2c80d90d1 100644 --- a/x/dex/types/message_place_limit_order_test.go +++ b/x/dex/types/message_place_limit_order_test.go @@ -4,7 +4,6 @@ import ( "testing" "cosmossdk.io/math" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/neutron-org/neutron/testutil/common/sample" . "github.com/neutron-org/neutron/x/dex/types" "github.com/stretchr/testify/require" @@ -28,7 +27,7 @@ func TestMsgPlaceLimitOrder_ValidateBasic(t *testing.T) { TickIndexInToOut: 0, AmountIn: math.OneInt(), }, - err: sdkerrors.ErrInvalidAddress, + err: ErrInvalidAddress, }, { name: "invalid receiver", @@ -40,7 +39,7 @@ func TestMsgPlaceLimitOrder_ValidateBasic(t *testing.T) { TickIndexInToOut: 0, AmountIn: math.OneInt(), }, - err: sdkerrors.ErrInvalidAddress, + err: ErrInvalidAddress, }, { name: "invalid zero limit order", diff --git a/x/dex/types/message_withdrawl.go b/x/dex/types/message_withdrawl.go index 82580f9ec..564b3edbf 100644 --- a/x/dex/types/message_withdrawl.go +++ b/x/dex/types/message_withdrawl.go @@ -1,9 +1,9 @@ package types import ( + sdkerrors "cosmossdk.io/errors" "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" ) const TypeMsgWithdrawal = "withdrawal" @@ -54,12 +54,12 @@ func (msg *MsgWithdrawal) GetSignBytes() []byte { func (msg *MsgWithdrawal) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(msg.Creator) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err) + return sdkerrors.Wrapf(ErrInvalidAddress, "invalid creator address (%s)", err) } _, err = sdk.AccAddressFromBech32(msg.Receiver) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid receiver address (%s)", err) + return sdkerrors.Wrapf(ErrInvalidAddress, "invalid receiver address (%s)", err) } // Verify that the lengths of TickIndexes, Fees, SharesToRemove are all equal diff --git a/x/dex/types/message_withdrawl_filled_limit_order.go b/x/dex/types/message_withdrawl_filled_limit_order.go index 929329650..0291f2808 100644 --- a/x/dex/types/message_withdrawl_filled_limit_order.go +++ b/x/dex/types/message_withdrawl_filled_limit_order.go @@ -1,8 +1,8 @@ package types import ( + sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" ) const TypeMsgWithdrawFilledLimitOrder = "withdrawal_withdrawn_limit_order" @@ -41,7 +41,7 @@ func (msg *MsgWithdrawFilledLimitOrder) GetSignBytes() []byte { func (msg *MsgWithdrawFilledLimitOrder) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(msg.Creator) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err) + return sdkerrors.Wrapf(ErrInvalidAddress, "invalid creator address (%s)", err) } return nil diff --git a/x/dex/types/message_withdrawl_filled_limit_order_test.go b/x/dex/types/message_withdrawl_filled_limit_order_test.go index e1fceeec1..9ac8b476e 100644 --- a/x/dex/types/message_withdrawl_filled_limit_order_test.go +++ b/x/dex/types/message_withdrawl_filled_limit_order_test.go @@ -3,7 +3,6 @@ package types_test import ( "testing" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/neutron-org/neutron/testutil/common/sample" . "github.com/neutron-org/neutron/x/dex/types" "github.com/stretchr/testify/require" @@ -21,7 +20,7 @@ func TestMsgWithdrawFilledLimitOrder_ValidateBasic(t *testing.T) { Creator: "invalid_address", TrancheKey: "ORDER123", }, - err: sdkerrors.ErrInvalidAddress, + err: ErrInvalidAddress, }, { name: "valid msg", msg: MsgWithdrawFilledLimitOrder{ diff --git a/x/dex/types/message_withdrawl_test.go b/x/dex/types/message_withdrawl_test.go index b551cb800..b2bfce5ba 100644 --- a/x/dex/types/message_withdrawl_test.go +++ b/x/dex/types/message_withdrawl_test.go @@ -4,7 +4,6 @@ import ( "testing" "cosmossdk.io/math" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/neutron-org/neutron/testutil/common/sample" . "github.com/neutron-org/neutron/x/dex/types" "github.com/stretchr/testify/require" @@ -25,7 +24,7 @@ func TestMsgWithdrawal_ValidateBasic(t *testing.T) { TickIndexesAToB: []int64{0}, SharesToRemove: []math.Int{math.OneInt()}, }, - err: sdkerrors.ErrInvalidAddress, + err: ErrInvalidAddress, }, { name: "invalid receiver", @@ -36,7 +35,7 @@ func TestMsgWithdrawal_ValidateBasic(t *testing.T) { TickIndexesAToB: []int64{0}, SharesToRemove: []math.Int{math.OneInt()}, }, - err: sdkerrors.ErrInvalidAddress, + err: ErrInvalidAddress, }, { name: "invalid fee indexes length", diff --git a/x/dex/types/pair_id.go b/x/dex/types/pair_id.go index 4f18aadfe..af61d7634 100644 --- a/x/dex/types/pair_id.go +++ b/x/dex/types/pair_id.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + sdkerrors "cosmossdk.io/errors" ) func NewPairID(token0, token1 string) (*PairID, error) { diff --git a/x/dex/types/trade_pair_id.go b/x/dex/types/trade_pair_id.go index 591017f3b..f04c0e11f 100644 --- a/x/dex/types/trade_pair_id.go +++ b/x/dex/types/trade_pair_id.go @@ -1,7 +1,7 @@ package types import ( - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + sdkerrors "cosmossdk.io/errors" math_utils "github.com/neutron-org/neutron/utils/math" ) diff --git a/x/dex/utils/abci.go b/x/dex/utils/abci.go index ec96f9534..22e281428 100644 --- a/x/dex/utils/abci.go +++ b/x/dex/utils/abci.go @@ -1,8 +1,9 @@ package utils import ( + "errors" + sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" ) func GetBlockGasUsed(ctx sdk.Context) (gasUsed uint64, err error) { @@ -14,7 +15,7 @@ func GetBlockGasUsed(ctx sdk.Context) (gasUsed uint64, err error) { return 0, nil default: // Otherwise, BlockGasMeter should probably be initialized - return 0, sdkerrors.Wrap(sdkerrors.ErrAppConfig, "Block Gas Meter is not initialized") + return 0, errors.New("block Gas Meter is not initialized") } } diff --git a/x/epochs/types/hooks_test.go b/x/epochs/types/hooks_test.go index b1cf86396..143b171d3 100644 --- a/x/epochs/types/hooks_test.go +++ b/x/epochs/types/hooks_test.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/testutil" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/types/errors" + "cosmossdk.io/errors" "github.com/stretchr/testify/suite" "github.com/neutron-org/neutron/x/epochs/types" diff --git a/x/ibcswap/ibc_middleware.go b/x/ibcswap/ibc_middleware.go index 08bce70c4..11e254560 100644 --- a/x/ibcswap/ibc_middleware.go +++ b/x/ibcswap/ibc_middleware.go @@ -7,7 +7,7 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + sdkerrors "cosmossdk.io/errors" capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" forwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router/types" transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" diff --git a/x/ibcswap/keeper/keeper.go b/x/ibcswap/keeper/keeper.go index 548b592c9..a3d45b12a 100644 --- a/x/ibcswap/keeper/keeper.go +++ b/x/ibcswap/keeper/keeper.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + sdkerrors "cosmossdk.io/errors" capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" "github.com/cosmos/gogoproto/proto" transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" diff --git a/x/ibcswap/types/errors.go b/x/ibcswap/types/errors.go index 68037f2f1..819589ae8 100644 --- a/x/ibcswap/types/errors.go +++ b/x/ibcswap/types/errors.go @@ -1,6 +1,6 @@ package types -import sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" +import sdkerrors "cosmossdk.io/errors" var ( ErrInvalidSwapMetadata = sdkerrors.Register(ModuleName, 2, "invalid swap metadata") diff --git a/x/ibcswap/types/swap.go b/x/ibcswap/types/swap.go index 45b360394..0694889db 100644 --- a/x/ibcswap/types/swap.go +++ b/x/ibcswap/types/swap.go @@ -3,10 +3,10 @@ package types import ( "encoding/json" + sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - dextypes "github.com/neutron-org/neutron/x/dex/types" "github.com/iancoleman/orderedmap" + dextypes "github.com/neutron-org/neutron/x/dex/types" ) // PacketMetadata wraps the SwapMetadata. The root key in the incoming ICS20 transfer packet's memo needs to be set to the same @@ -42,7 +42,7 @@ func (sm SwapMetadata) Validate() error { if sm.RefundAddress != "" { _, err := sdk.AccAddressFromBech32(sm.RefundAddress) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "%s is not a valid Duality address", sm.RefundAddress) + return sdkerrors.Wrapf(dextypes.ErrInvalidAddress, "%s is not a valid Duality address", sm.RefundAddress) } } diff --git a/x/incentives/keeper/msg_server.go b/x/incentives/keeper/msg_server.go index c87730284..8905b0468 100644 --- a/x/incentives/keeper/msg_server.go +++ b/x/incentives/keeper/msg_server.go @@ -8,8 +8,8 @@ import ( "cosmossdk.io/errors" "github.com/neutron-org/neutron/x/incentives/types" + sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" ) var _ types.MsgServer = msgServer{} @@ -58,7 +58,7 @@ func (server msgServer) CreateGauge( msg.PricingTick, ) if err != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrInvalidRequest, err.Error()) + return nil, sdkerrors.Wrap(types.ErrInvalidRequest, err.Error()) } ctx.EventManager().EmitEvents(sdk.Events{ @@ -85,7 +85,7 @@ func (server msgServer) AddToGauge( err = server.keeper.AddToGaugeRewards(ctx, owner, msg.Rewards, msg.GaugeId) if err != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrInvalidRequest, err.Error()) + return nil, sdkerrors.Wrap(types.ErrInvalidRequest, err.Error()) } ctx.EventManager().EmitEvents(sdk.Events{ @@ -158,7 +158,7 @@ func (server msgServer) Unstake( for _, unstake := range unstakes { stake, err := server.keeper.GetStakeByID(ctx, unstake.ID) if err != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrInvalidRequest, err.Error()) + return nil, sdkerrors.Wrap(types.ErrInvalidRequest, err.Error()) } if msg.Owner != stake.Owner { @@ -174,7 +174,7 @@ func (server msgServer) Unstake( _, err = server.keeper.Unstake(ctx, stake, unstake.Coins) if err != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrInvalidRequest, err.Error()) + return nil, sdkerrors.Wrap(types.ErrInvalidRequest, err.Error()) } } @@ -188,7 +188,7 @@ func (server msgServer) UpdateParams(goCtx context.Context, req *types.MsgUpdate } authority := server.keeper.GetAuthority() if authority != req.Authority { - return nil, errors.Wrapf(sdkerrors.ErrInvalidRequest, "invalid authority; expected %s, got %s", authority, req.Authority) + return nil, errors.Wrapf(types.ErrInvalidRequest, "invalid authority; expected %s, got %s", authority, req.Authority) } ctx := sdk.UnwrapSDKContext(goCtx) diff --git a/x/incentives/keeper/query_server.go b/x/incentives/keeper/query_server.go index 6f259ee65..8b13d9e72 100644 --- a/x/incentives/keeper/query_server.go +++ b/x/incentives/keeper/query_server.go @@ -7,8 +7,8 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" + sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" dextypes "github.com/neutron-org/neutron/x/dex/types" "github.com/neutron-org/neutron/x/incentives/types" @@ -88,7 +88,7 @@ func (q QueryServer) GetGauges( case types.GaugeStatus_FINISHED: prefix = types.KeyPrefixGaugeIndexFinished default: - return nil, sdkerrors.Wrap(sdkerrors.ErrInvalidRequest, "invalid status filter value") + return nil, sdkerrors.Wrap(types.ErrInvalidRequest, "invalid status filter value") } var lowerTick, upperTick int64 @@ -191,11 +191,11 @@ func (q QueryServer) GetFutureRewardEstimate( return nil, status.Error(codes.InvalidArgument, "empty request") } if len(req.Owner) == 0 && len(req.StakeIds) == 0 { - return nil, sdkerrors.Wrap(sdkerrors.ErrInvalidRequest, "empty owner") + return nil, sdkerrors.Wrap(types.ErrInvalidRequest, "empty owner") } if req.NumEpochs > 365 { - return nil, sdkerrors.Wrap(sdkerrors.ErrInvalidRequest, "end epoch out of ranges") + return nil, sdkerrors.Wrap(types.ErrInvalidRequest, "end epoch out of ranges") } var ownerAddress sdk.AccAddress diff --git a/x/incentives/keeper/stake.go b/x/incentives/keeper/stake.go index 677494ffa..90ef98fb4 100644 --- a/x/incentives/keeper/stake.go +++ b/x/incentives/keeper/stake.go @@ -5,8 +5,8 @@ import ( "strconv" "time" + sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/cosmos/gogoproto/proto" "github.com/neutron-org/neutron/x/incentives/types" @@ -198,22 +198,22 @@ func (k Keeper) CreateStake( owner, err := sdk.AccAddressFromBech32(stake.Owner) if err != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrInvalidRequest, err.Error()) + return nil, sdkerrors.Wrap(types.ErrInvalidRequest, err.Error()) } err = stake.ValidateBasic() if err != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrInvalidRequest, err.Error()) + return nil, sdkerrors.Wrap(types.ErrInvalidRequest, err.Error()) } if err := k.bk.SendCoinsFromAccountToModule(ctx, owner, types.ModuleName, stake.Coins); err != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrInvalidRequest, err.Error()) + return nil, sdkerrors.Wrap(types.ErrInvalidRequest, err.Error()) } // store stake object into the store err = k.setStake(ctx, stake) if err != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrInvalidRequest, err.Error()) + return nil, sdkerrors.Wrap(types.ErrInvalidRequest, err.Error()) } k.hooks.OnTokenStaked(ctx, owner, stake.ID, stake.Coins, ctx.BlockTime()) @@ -222,7 +222,7 @@ func (k Keeper) CreateStake( // add stake refs into not unlocking queue err = k.addStakeRefs(ctx, stake) if err != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrInvalidRequest, err.Error()) + return nil, sdkerrors.Wrap(types.ErrInvalidRequest, err.Error()) } return stake, nil diff --git a/x/incentives/types/errors.go b/x/incentives/types/errors.go index b6963a8d6..526e1280e 100644 --- a/x/incentives/types/errors.go +++ b/x/incentives/types/errors.go @@ -3,7 +3,7 @@ package types // DONTCOVER import ( - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + sdkerrors "cosmossdk.io/errors" ) // x/incentives module sentinel errors. @@ -40,4 +40,14 @@ var ( 8, "owner must be module authority", ) + ErrInvalidRequest = sdkerrors.Register( + ModuleName, + 9, + "invalid request", + ) + ErrInvalidAddress = sdkerrors.Register( + ModuleName, + 10, + "Invalid Address", + ) ) diff --git a/x/incentives/types/msgs.go b/x/incentives/types/msgs.go index 8bdba513b..6b710339a 100644 --- a/x/incentives/types/msgs.go +++ b/x/incentives/types/msgs.go @@ -5,8 +5,8 @@ import ( "time" errorsmod "cosmossdk.io/errors" + sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" dextypes "github.com/neutron-org/neutron/x/dex/types" ) @@ -50,27 +50,27 @@ func (m MsgCreateGauge) Type() string { return TypeMsgCreateGauge } // ValidateBasic checks that the create gauge message is valid. func (m MsgCreateGauge) ValidateBasic() error { if m.Owner == "" { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, "owner should be set") + return sdkerrors.Wrapf(ErrInvalidRequest, "owner should be set") } // TODO: If this is not set, infer start time as "now" if m.StartTime.Equal(time.Time{}) { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, "distribution start time should be set") + return sdkerrors.Wrapf(ErrInvalidRequest, "distribution start time should be set") } if m.NumEpochsPaidOver == 0 { return sdkerrors.Wrapf( - sdkerrors.ErrInvalidRequest, + ErrInvalidRequest, "distribution period should be at least 1 epoch", ) } if m.IsPerpetual && m.NumEpochsPaidOver != 1 { return sdkerrors.Wrapf( - sdkerrors.ErrInvalidRequest, + ErrInvalidRequest, "distribution period should be 1 epoch for perpetual gauge", ) } if dextypes.IsTickOutOfRange(m.PricingTick) { return sdkerrors.Wrapf( - sdkerrors.ErrInvalidRequest, + ErrInvalidRequest, "pricing tick is out of range, must be between %d and %d", int64(dextypes.MaxTickExp)*-1, dextypes.MaxTickExp, @@ -78,7 +78,7 @@ func (m MsgCreateGauge) ValidateBasic() error { } if dextypes.IsTickOutOfRange(m.DistributeTo.StartTick) { return sdkerrors.Wrapf( - sdkerrors.ErrInvalidRequest, + ErrInvalidRequest, "start tick is out of range, must be between %d and %d", int64(dextypes.MaxTickExp)*-1, dextypes.MaxTickExp, @@ -86,7 +86,7 @@ func (m MsgCreateGauge) ValidateBasic() error { } if dextypes.IsTickOutOfRange(m.DistributeTo.EndTick) { return sdkerrors.Wrapf( - sdkerrors.ErrInvalidRequest, + ErrInvalidRequest, "start tick is out of range, must be between %d and %d", int64(dextypes.MaxTickExp)*-1, dextypes.MaxTickExp, @@ -127,11 +127,11 @@ func (m MsgAddToGauge) Type() string { return TypeMsgAddToGauge } // ValidateBasic checks that the add to gauge message is valid. func (m MsgAddToGauge) ValidateBasic() error { if m.Owner == "" { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, "owner should be set") + return sdkerrors.Wrapf(ErrInvalidRequest, "owner should be set") } if m.Rewards.Empty() { return sdkerrors.Wrapf( - sdkerrors.ErrInvalidRequest, + ErrInvalidRequest, "additional rewards should not be empty", ) } @@ -165,7 +165,7 @@ func (m MsgStake) Type() string { return TypeMsgStakeTokens } func (m MsgStake) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(m.Owner) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid owner address (%s)", err) + return sdkerrors.Wrapf(ErrInvalidAddress, "Invalid owner address (%s)", err) } if !m.Coins.IsAllPositive() { @@ -206,7 +206,7 @@ func (m MsgUnstake) Type() string { return TypeMsgBeginUnstaking } func (m MsgUnstake) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(m.Owner) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid owner address (%s)", err) + return sdkerrors.Wrapf(ErrInvalidAddress, "Invalid owner address (%s)", err) } for _, unstake := range m.Unstakes { From 5d44551e31dde7ee47d0a25f688fb9cd5d4e8595 Mon Sep 17 00:00:00 2001 From: Julian Compagni Portis Date: Mon, 16 Oct 2023 14:30:26 -0400 Subject: [PATCH 182/307] FIX: missing import --- x/incentives/client/cli/query_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/x/incentives/client/cli/query_test.go b/x/incentives/client/cli/query_test.go index b0102ff02..49d606075 100644 --- a/x/incentives/client/cli/query_test.go +++ b/x/incentives/client/cli/query_test.go @@ -4,6 +4,7 @@ import ( "testing" "time" + "cosmossdk.io/math" "github.com/stretchr/testify/suite" "github.com/neutron-org/neutron/testutil/apptesting" From c4dea365ae536dacbffa68cc77e7e2ab7808719b Mon Sep 17 00:00:00 2001 From: Julian Compagni Portis Date: Mon, 16 Oct 2023 15:10:39 -0400 Subject: [PATCH 183/307] go fumpt --extra on all duality files --- x/dex/client/cli/tx_deposit.go | 2 +- x/dex/client/cli/tx_multi_hop_swap.go | 2 +- x/dex/client/cli/tx_place_limit_order.go | 2 +- x/dex/client/cli/tx_withdrawl.go | 2 +- x/dex/keeper/core.go | 4 +-- x/dex/keeper/core_helper_test.go | 4 +-- .../grpc_query_estimate_place_limit_order.go | 2 +- x/dex/keeper/grpc_query_pool_metadata.go | 2 +- x/dex/keeper/grpc_query_pool_reserves.go | 6 ++-- x/dex/keeper/liquidity_test.go | 2 +- x/dex/keeper/multihop_swap.go | 2 +- x/dex/types/pool_metadata.go | 2 +- x/epochs/types/hooks_test.go | 2 +- x/ibcswap/ibc_middleware.go | 2 +- x/ibcswap/keeper/keeper.go | 6 ++-- x/ibcswap/module.go | 4 +-- x/ibcswap/types/expected_keepers.go | 2 +- x/incentives/keeper/iterator.go | 2 +- x/incentives/types/errors.go | 4 +-- x/incentives/types/query_condition_test.go | 36 +++++++++---------- 20 files changed, 44 insertions(+), 46 deletions(-) diff --git a/x/dex/client/cli/tx_deposit.go b/x/dex/client/cli/tx_deposit.go index 8d58c44b7..55787ce79 100644 --- a/x/dex/client/cli/tx_deposit.go +++ b/x/dex/client/cli/tx_deposit.go @@ -5,11 +5,11 @@ import ( "strconv" "strings" + sdkerrors "cosmossdk.io/errors" "cosmossdk.io/math" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" - sdkerrors "cosmossdk.io/errors" "github.com/neutron-org/neutron/x/dex/types" "github.com/spf13/cobra" ) diff --git a/x/dex/client/cli/tx_multi_hop_swap.go b/x/dex/client/cli/tx_multi_hop_swap.go index 9c33cc3d4..0dab65dab 100644 --- a/x/dex/client/cli/tx_multi_hop_swap.go +++ b/x/dex/client/cli/tx_multi_hop_swap.go @@ -4,11 +4,11 @@ import ( "strconv" "strings" + sdkerrors "cosmossdk.io/errors" "cosmossdk.io/math" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" - sdkerrors "cosmossdk.io/errors" math_utils "github.com/neutron-org/neutron/utils/math" "github.com/neutron-org/neutron/x/dex/types" "github.com/spf13/cobra" diff --git a/x/dex/client/cli/tx_place_limit_order.go b/x/dex/client/cli/tx_place_limit_order.go index e57e1a017..f174016c5 100644 --- a/x/dex/client/cli/tx_place_limit_order.go +++ b/x/dex/client/cli/tx_place_limit_order.go @@ -5,11 +5,11 @@ import ( "strings" "time" + sdkerrors "cosmossdk.io/errors" "cosmossdk.io/math" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" - sdkerrors "cosmossdk.io/errors" "github.com/neutron-org/neutron/x/dex/types" "github.com/spf13/cobra" ) diff --git a/x/dex/client/cli/tx_withdrawl.go b/x/dex/client/cli/tx_withdrawl.go index 3da7962a0..720b44394 100644 --- a/x/dex/client/cli/tx_withdrawl.go +++ b/x/dex/client/cli/tx_withdrawl.go @@ -4,11 +4,11 @@ import ( "strconv" "strings" + sdkerrors "cosmossdk.io/errors" "cosmossdk.io/math" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" - sdkerrors "cosmossdk.io/errors" "github.com/neutron-org/neutron/x/dex/types" "github.com/spf13/cobra" ) diff --git a/x/dex/keeper/core.go b/x/dex/keeper/core.go index 6268b908d..b2d8a47a4 100644 --- a/x/dex/keeper/core.go +++ b/x/dex/keeper/core.go @@ -4,9 +4,9 @@ import ( "context" "time" + sdkerrors "cosmossdk.io/errors" "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "cosmossdk.io/errors" math_utils "github.com/neutron-org/neutron/utils/math" "github.com/neutron-org/neutron/x/dex/types" "github.com/neutron-org/neutron/x/dex/utils" @@ -308,7 +308,7 @@ func (k Keeper) PlaceLimitOrderCore( maxAmountOut *math.Int, callerAddr sdk.AccAddress, receiverAddr sdk.AccAddress, -) (trancheKey string, totalInCoin sdk.Coin, swapInCoin sdk.Coin, swapOutCoin sdk.Coin, err error) { +) (trancheKey string, totalInCoin, swapInCoin, swapOutCoin sdk.Coin, err error) { ctx := sdk.UnwrapSDKContext(goCtx) var pairID *types.PairID diff --git a/x/dex/keeper/core_helper_test.go b/x/dex/keeper/core_helper_test.go index d04e3d996..663f8519f 100644 --- a/x/dex/keeper/core_helper_test.go +++ b/x/dex/keeper/core_helper_test.go @@ -6,8 +6,6 @@ import ( "cosmossdk.io/math" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" sdk "github.com/cosmos/cosmos-sdk/types" - authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" dualityapp "github.com/neutron-org/neutron/app" "github.com/neutron-org/neutron/testutil" "github.com/neutron-org/neutron/x/dex/types" @@ -53,7 +51,7 @@ func (s *CoreHelpersTestSuite) SetupTest() { s.dan = sdk.AccAddress([]byte("dan")) } -func (s *CoreHelpersTestSuite) setLPAtFee1Pool(tickIndex int64, amountA int, amountB int) { +func (s *CoreHelpersTestSuite) setLPAtFee1Pool(tickIndex int64, amountA, amountB int) { pairID := &types.PairID{Token0: "TokenA", Token1: "TokenB"} pool, err := s.app.DexKeeper.GetOrInitPool(s.ctx, pairID, tickIndex, 1) if err != nil { 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 69285cf75..d616708ea 100644 --- a/x/dex/keeper/grpc_query_estimate_place_limit_order.go +++ b/x/dex/keeper/grpc_query_estimate_place_limit_order.go @@ -3,8 +3,8 @@ package keeper import ( "context" - sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "cosmossdk.io/errors" + sdk "github.com/cosmos/cosmos-sdk/types" "github.com/neutron-org/neutron/x/dex/types" ) diff --git a/x/dex/keeper/grpc_query_pool_metadata.go b/x/dex/keeper/grpc_query_pool_metadata.go index a4ebc6feb..5debb51c2 100644 --- a/x/dex/keeper/grpc_query_pool_metadata.go +++ b/x/dex/keeper/grpc_query_pool_metadata.go @@ -22,7 +22,7 @@ func (k Keeper) PoolMetadataAll(goCtx context.Context, req *types.QueryAllPoolMe store := ctx.KVStore(k.storeKey) poolMetadataStore := prefix.NewStore(store, types.KeyPrefix(types.PoolMetadataKeyPrefix)) - pageRes, err := query.Paginate(poolMetadataStore, req.Pagination, func(key []byte, value []byte) error { + pageRes, err := query.Paginate(poolMetadataStore, req.Pagination, func(key, value []byte) error { var poolMetadata types.PoolMetadata if err := k.cdc.Unmarshal(value, &poolMetadata); err != nil { return err diff --git a/x/dex/keeper/grpc_query_pool_reserves.go b/x/dex/keeper/grpc_query_pool_reserves.go index b44af3958..927018c01 100644 --- a/x/dex/keeper/grpc_query_pool_reserves.go +++ b/x/dex/keeper/grpc_query_pool_reserves.go @@ -74,9 +74,9 @@ func (k Keeper) PoolReserves( tradePairID := types.NewTradePairIDFromMaker(pairID, req.TokenIn) poolReservesID := &types.PoolReservesKey{ - tradePairID, - req.TickIndex, - req.Fee, + TradePairID: tradePairID, + TickIndexTakerToMaker: req.TickIndex, + Fee: req.Fee, } val, found := k.GetPoolReserves(ctx, poolReservesID) if !found { diff --git a/x/dex/keeper/liquidity_test.go b/x/dex/keeper/liquidity_test.go index 1a8f606e8..d99b39163 100644 --- a/x/dex/keeper/liquidity_test.go +++ b/x/dex/keeper/liquidity_test.go @@ -660,7 +660,7 @@ func (s *LiquidityTestSuite) assertSwapOutput( True(amtOut.Equal(sdkmath.NewInt(expectedOut)), "Expected amountOut %d != %s", expectedOut, amtOut) } -func (s *LiquidityTestSuite) assertDexBalances(expectedABalance int64, expectedBBalance int64) { +func (s *LiquidityTestSuite) assertDexBalances(expectedABalance, expectedBBalance int64) { // NOTE: We can't just check the actual DEX bank balances since we are testing swap // before any transfers take place. Instead we have to sum up the total amount of coins // at each tick diff --git a/x/dex/keeper/multihop_swap.go b/x/dex/keeper/multihop_swap.go index d8ed175c6..09b8d24be 100644 --- a/x/dex/keeper/multihop_swap.go +++ b/x/dex/keeper/multihop_swap.go @@ -1,9 +1,9 @@ package keeper import ( + sdkerrors "cosmossdk.io/errors" "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "cosmossdk.io/errors" math_utils "github.com/neutron-org/neutron/utils/math" "github.com/neutron-org/neutron/x/dex/types" ) diff --git a/x/dex/types/pool_metadata.go b/x/dex/types/pool_metadata.go index eff09212b..1f2e70606 100644 --- a/x/dex/types/pool_metadata.go +++ b/x/dex/types/pool_metadata.go @@ -1,5 +1,5 @@ package types -func NewPoolMetadata(pairID *PairID, tick int64, fee uint64, poolID uint64) PoolMetadata { +func NewPoolMetadata(pairID *PairID, tick int64, fee, poolID uint64) PoolMetadata { return PoolMetadata{PairID: pairID, Tick: tick, Fee: fee, ID: poolID} } diff --git a/x/epochs/types/hooks_test.go b/x/epochs/types/hooks_test.go index 143b171d3..8ea59a49e 100644 --- a/x/epochs/types/hooks_test.go +++ b/x/epochs/types/hooks_test.go @@ -4,9 +4,9 @@ import ( "strconv" "testing" + "cosmossdk.io/errors" "github.com/cosmos/cosmos-sdk/testutil" sdk "github.com/cosmos/cosmos-sdk/types" - "cosmossdk.io/errors" "github.com/stretchr/testify/suite" "github.com/neutron-org/neutron/x/epochs/types" diff --git a/x/ibcswap/ibc_middleware.go b/x/ibcswap/ibc_middleware.go index 11e254560..99d1fc143 100644 --- a/x/ibcswap/ibc_middleware.go +++ b/x/ibcswap/ibc_middleware.go @@ -5,9 +5,9 @@ import ( "encoding/json" "strings" + sdkerrors "cosmossdk.io/errors" "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "cosmossdk.io/errors" capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" forwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router/types" transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" diff --git a/x/ibcswap/keeper/keeper.go b/x/ibcswap/keeper/keeper.go index a3d45b12a..e5427c52b 100644 --- a/x/ibcswap/keeper/keeper.go +++ b/x/ibcswap/keeper/keeper.go @@ -3,12 +3,12 @@ package keeper import ( "fmt" + sdkerrors "cosmossdk.io/errors" "cosmossdk.io/math" "github.com/cometbft/cometbft/libs/log" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "cosmossdk.io/errors" capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" "github.com/cosmos/gogoproto/proto" transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" @@ -170,7 +170,7 @@ func (k Keeper) RefundPacketToken( } // SendCoins wraps the BankKeepers SendCoins function so it can be invoked from the middleware. -func (k Keeper) SendCoins(ctx sdk.Context, fromAddr string, toAddr string, amt sdk.Coins) error { +func (k Keeper) SendCoins(ctx sdk.Context, fromAddr, toAddr string, amt sdk.Coins) error { from, err := sdk.AccAddressFromBech32(fromAddr) if err != nil { return err @@ -184,6 +184,6 @@ func (k Keeper) SendCoins(ctx sdk.Context, fromAddr string, toAddr string, amt s return k.bankKeeper.SendCoins(ctx, from, to, amt) } -func (k Keeper) GetAppVersion(ctx sdk.Context, portID string, channelID string) (string, bool) { +func (k Keeper) GetAppVersion(ctx sdk.Context, portID, channelID string) (string, bool) { return k.ics4Wrapper.GetAppVersion(ctx, portID, channelID) } diff --git a/x/ibcswap/module.go b/x/ibcswap/module.go index ad5e25176..3d2d40198 100644 --- a/x/ibcswap/module.go +++ b/x/ibcswap/module.go @@ -10,10 +10,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/neutron-org/neutron/x/ibcswap/keeper" - "github.com/neutron-org/neutron/x/ibcswap/types" "github.com/gorilla/mux" "github.com/grpc-ecosystem/grpc-gateway/runtime" + "github.com/neutron-org/neutron/x/ibcswap/keeper" + "github.com/neutron-org/neutron/x/ibcswap/types" "github.com/spf13/cobra" ) diff --git a/x/ibcswap/types/expected_keepers.go b/x/ibcswap/types/expected_keepers.go index 0ea6192ea..4380703bf 100644 --- a/x/ibcswap/types/expected_keepers.go +++ b/x/ibcswap/types/expected_keepers.go @@ -6,7 +6,7 @@ import ( // BankKeeper defines the expected interface that the swap middleware needs in order to facilitate refunds. type BankKeeper interface { - SendCoins(ctx sdk.Context, fromAddr sdk.AccAddress, toAddr sdk.AccAddress, amt sdk.Coins) error + SendCoins(ctx sdk.Context, fromAddr, toAddr sdk.AccAddress, amt sdk.Coins) error MintCoins(ctx sdk.Context, moduleName string, amt sdk.Coins) error BurnCoins(ctx sdk.Context, moduleName string, amt sdk.Coins) error SendCoinsFromModuleToAccount(ctx sdk.Context, senderModule string, recipientAddr sdk.AccAddress, amt sdk.Coins) error diff --git a/x/incentives/keeper/iterator.go b/x/incentives/keeper/iterator.go index f536fcce0..4fdaa3cc6 100644 --- a/x/incentives/keeper/iterator.go +++ b/x/incentives/keeper/iterator.go @@ -16,7 +16,7 @@ func (k Keeper) iterator(ctx sdk.Context, prefix []byte) sdk.Iterator { } // iterator returns an iterator over all gauges in the {prefix} space of state. -func (k Keeper) iteratorStartEnd(ctx sdk.Context, start []byte, end []byte) sdk.Iterator { +func (k Keeper) iteratorStartEnd(ctx sdk.Context, start, end []byte) sdk.Iterator { store := ctx.KVStore(k.storeKey) return store.Iterator(start, end) } diff --git a/x/incentives/types/errors.go b/x/incentives/types/errors.go index 526e1280e..f54f5c663 100644 --- a/x/incentives/types/errors.go +++ b/x/incentives/types/errors.go @@ -13,8 +13,8 @@ var ( 1, "msg sender is not the owner of specified stake", ) - ErrStakeNotFound = sdkerrors.Register(ModuleName, 2, "stake not found") - ErrGaugeNotActive = sdkerrors.Register( + ErrStakeNotFound = sdkerrors.Register(ModuleName, 2, "stake not found") + ErrGaugeNotActive = sdkerrors.Register( ModuleName, 3, "cannot distribute from gauges when it is not active", diff --git a/x/incentives/types/query_condition_test.go b/x/incentives/types/query_condition_test.go index c21e77208..13a0fe619 100644 --- a/x/incentives/types/query_condition_test.go +++ b/x/incentives/types/query_condition_test.go @@ -16,40 +16,40 @@ func TestQueryCondition(t *testing.T) { } tests := []struct { - name string - queryCond QueryCondition + name string + queryCond QueryCondition poolMetadata dextypes.PoolMetadata - testResult bool + testResult bool }{ { - name: "Matching denom and tick range", - queryCond: QueryCondition{PairID: pairID, StartTick: 10, EndTick: 20}, + name: "Matching denom and tick range", + queryCond: QueryCondition{PairID: pairID, StartTick: 10, EndTick: 20}, poolMetadata: dextypes.NewPoolMetadata(pairID, 15, 5, 0), - testResult: true, + testResult: true, }, { - name: "Non-matching denom", - queryCond: QueryCondition{PairID: pairID, StartTick: 10, EndTick: 20}, + name: "Non-matching denom", + queryCond: QueryCondition{PairID: pairID, StartTick: 10, EndTick: 20}, poolMetadata: dextypes.NewPoolMetadata(&dextypes.PairID{Token0: "coin1", Token1: "coin3"}, 15, 5, 0), - testResult: false, + testResult: false, }, { - name: "Non-matching tick range", - queryCond: QueryCondition{PairID: pairID, StartTick: 30, EndTick: 40}, + name: "Non-matching tick range", + queryCond: QueryCondition{PairID: pairID, StartTick: 30, EndTick: 40}, poolMetadata: dextypes.NewPoolMetadata(pairID, 15, 6, 0), - testResult: false, + testResult: false, }, { - name: "Non-matching tick fee range lower", - queryCond: QueryCondition{PairID: pairID, StartTick: 30, EndTick: 40}, + name: "Non-matching tick fee range lower", + queryCond: QueryCondition{PairID: pairID, StartTick: 30, EndTick: 40}, poolMetadata: dextypes.NewPoolMetadata(pairID, 10, 5, 0), - testResult: false, + testResult: false, }, { - name: "Non-matching tick fee range upper", - queryCond: QueryCondition{PairID: pairID, StartTick: 30, EndTick: 40}, + name: "Non-matching tick fee range upper", + queryCond: QueryCondition{PairID: pairID, StartTick: 30, EndTick: 40}, poolMetadata: dextypes.NewPoolMetadata(pairID, 20, 5, 0), - testResult: false, + testResult: false, }, } From d3d5368d83db594629d3130aab1e3b8c3a2adfdd Mon Sep 17 00:00:00 2001 From: Julian Compagni Portis Date: Mon, 16 Oct 2023 15:10:22 -0400 Subject: [PATCH 184/307] misc linting fixes --- tests/ibc/gmp_swap_forward_test.go | 4 +- tests/ibc/ibc_setup_test.go | 9 +-- tests/ibc/swap_forward_test.go | 25 +++--- testutil/apptesting/events.go | 2 +- testutil/apptesting/test_suite.go | 2 +- testutil/dex/keeper/dex.go | 6 +- testutil/integration_test_setup.go | 6 +- utils/bank.go | 59 +++++++------- utils/dcli/cli_tester.go | 10 +-- utils/dcli/index_cmd.go | 2 +- utils/dcli/parsers.go | 14 ++-- utils/dcli/query_cmd_wrap.go | 4 +- utils/generic_helper.go | 4 +- utils/math/prec_dec.go | 4 +- utils/slice_helper.go | 3 +- x/dex/client/cli/tx_place_limit_order.go | 2 +- x/dex/keeper/core.go | 3 +- x/dex/keeper/core_helper_test.go | 10 +-- x/dex/keeper/grpc_query_params_test.go | 3 +- x/dex/keeper/grpc_query_user_deposits_test.go | 2 +- .../inactive_limit_order_tranche_test.go | 11 +-- .../keeper/internal/testutils/test_helpers.go | 8 +- x/dex/keeper/limit_order_tranche_test.go | 4 +- x/dex/keeper/limit_order_tranche_user_test.go | 4 +- x/dex/keeper/liquidity.go | 8 +- x/dex/keeper/liquidity_test.go | 22 +---- x/dex/keeper/msg_server_test.go | 29 ++++--- x/dex/keeper/multihop_swap.go | 11 +-- x/dex/keeper/params_test.go | 3 +- x/dex/keeper/pool.go | 7 +- x/dex/keeper/pool_metadata_test.go | 4 +- x/dex/keeper/pool_reserves_test.go | 4 +- x/dex/module_simulation.go | 3 +- x/dex/types/codec.go | 1 - x/dex/types/errors.go | 1 - x/dex/types/keys.go | 4 +- x/dex/types/limit_order_tranche_key.go | 31 ------- x/dex/types/message_update_params.go | 6 +- x/dex/types/pair_id.go | 18 +++-- x/dex/types/params.go | 9 +-- x/dex/types/pool_reserves_key.go | 31 ------- x/dex/types/price.go | 4 +- x/dex/types/trade_pair_id.go | 4 +- x/epochs/keeper/abci.go | 4 +- x/epochs/keeper/abci_test.go | 8 +- x/epochs/keeper/epoch_test.go | 4 +- x/epochs/keeper/genesis_test.go | 4 +- x/epochs/keeper/hooks.go | 8 +- x/epochs/module.go | 6 +- x/epochs/types/hooks.go | 15 ++-- x/epochs/types/hooks_test.go | 38 ++++----- x/ibcswap/ibc_middleware.go | 2 +- x/ibcswap/module.go | 38 ++++----- x/incentives/client/cli/query.go | 1 + x/incentives/client/cli/query_test.go | 81 +------------------ x/incentives/keeper/distribute.go | 4 +- x/incentives/keeper/distributor_test.go | 23 +++--- x/incentives/keeper/gas_test.go | 14 ++-- x/incentives/keeper/gauge.go | 16 ++-- x/incentives/keeper/gauge_test.go | 17 ++-- x/incentives/keeper/genesis.go | 4 +- x/incentives/keeper/hooks.go | 12 +-- x/incentives/keeper/msg_server.go | 5 +- x/incentives/keeper/query_server.go | 2 +- x/incentives/keeper/stake_test.go | 6 +- x/incentives/keeper/utils_test.go | 5 +- x/incentives/module.go | 36 +-------- x/incentives/module_simulation.go | 33 ++++++++ x/incentives/types/hooks.go | 8 +- x/incentives/types/msgs.go | 12 ++- x/incentives/types/params.go | 5 +- x/incentives/types/tx.pb.go | 2 +- 72 files changed, 321 insertions(+), 493 deletions(-) create mode 100644 x/incentives/module_simulation.go diff --git a/tests/ibc/gmp_swap_forward_test.go b/tests/ibc/gmp_swap_forward_test.go index fdf4a6075..95e579f97 100644 --- a/tests/ibc/gmp_swap_forward_test.go +++ b/tests/ibc/gmp_swap_forward_test.go @@ -108,10 +108,10 @@ func (s *IBCTestSuite) TestGMPSwapAndForward_Success() { s.dualityChainBPath.EndpointA.ChannelID, nativeDenom, ) - transferDenomDuality_B := transfertypes.ParseDenomTrace(transferDenomPath).IBCDenom() + transferDenomChainB := transfertypes.ParseDenomTrace(transferDenomPath).IBCDenom() // Check that the funds are now present in the acc on chainB - s.assertChainBBalance(chainBAddr, transferDenomDuality_B, expectedAmountOut) + s.assertChainBBalance(chainBAddr, transferDenomChainB, expectedAmountOut) s.Assert().NoError(err) } diff --git a/tests/ibc/ibc_setup_test.go b/tests/ibc/ibc_setup_test.go index 415aa36e1..ebe6802ed 100644 --- a/tests/ibc/ibc_setup_test.go +++ b/tests/ibc/ibc_setup_test.go @@ -249,10 +249,6 @@ func (s *IBCTestSuite) providerCtx() sdk.Context { return s.providerChain.GetContext() } -func (s *IBCTestSuite) dualityCtx() sdk.Context { - return s.dualityChain.GetContext() -} - // Helper Methods ///////////////////////////////////////////////////////////// func (s *IBCTestSuite) IBCTransfer( @@ -285,8 +281,8 @@ func (s *IBCTestSuite) IBCTransfer( packet, err := ibctesting.ParsePacketFromEvents(res.GetEvents()) s.Require().NoError(err) + //nolint:errcheck // this will return an error for multi-hop routes; that's expected path.RelayPacket(packet) - s.Assert().NoError(err) } func (s *IBCTestSuite) IBCTransferProviderToDuality( @@ -353,6 +349,7 @@ func (s *IBCTestSuite) assertChainCBalance(addr sdk.AccAddress, denom string, ex s.assertBalance(s.bundleC.App.GetTestBankKeeper(), s.bundleC.Chain, addr, denom, expectedAmt) } +//nolint:unparam // keep this flexible even if we aren't currently using all the params func (s *IBCTestSuite) dualityDeposit( token0 string, token1 string, @@ -372,7 +369,7 @@ func (s *IBCTestSuite) dualityDeposit( []math.Int{depositAmount1}, []int64{tickIndex}, []uint64{fee}, - []*dextypes.DepositOptions{{false}}, + []*dextypes.DepositOptions{{DisableAutoswap: false}}, ) // execute deposit msg diff --git a/tests/ibc/swap_forward_test.go b/tests/ibc/swap_forward_test.go index 386e3ad64..6dd383a2b 100644 --- a/tests/ibc/swap_forward_test.go +++ b/tests/ibc/swap_forward_test.go @@ -118,10 +118,10 @@ func (s *IBCTestSuite) TestSwapAndForward_Success() { s.dualityChainBPath.EndpointA.ChannelID, nativeDenom, ) - transferDenomDuality_B := transfertypes.ParseDenomTrace(transferDenomPath).IBCDenom() + transferDenomDualityChainB := transfertypes.ParseDenomTrace(transferDenomPath).IBCDenom() // Check that the funds are now present in the acc on chainB - s.assertChainBBalance(chainBAddr, transferDenomDuality_B, expectedAmountOut) + s.assertChainBBalance(chainBAddr, transferDenomDualityChainB, expectedAmountOut) s.Assert().NoError(err) } @@ -233,18 +233,18 @@ func (s *IBCTestSuite) TestSwapAndForward_MultiHopSuccess() { err = s.RelayAllPacketsAToB(s.chainBChainCPath) s.Require().NoError(err) - transferDenomPathDuality_B := transfertypes.GetPrefixedDenom( + transferDenomPathDualityChainB := transfertypes.GetPrefixedDenom( transfertypes.PortID, s.dualityChainBPath.EndpointB.ChannelID, nativeDenom, ) - transferDenomDuality_B := transfertypes.ParseDenomTrace(transferDenomPathDuality_B).IBCDenom() - transferDenomPathB_C := transfertypes.GetPrefixedDenom( + transferDenomDualityChainB := transfertypes.ParseDenomTrace(transferDenomPathDualityChainB).IBCDenom() + transferDenomPathChainC := transfertypes.GetPrefixedDenom( transfertypes.PortID, s.chainBChainCPath.EndpointB.ChannelID, - transferDenomPathDuality_B, + transferDenomPathDualityChainB, ) - transferDenomB_C := transfertypes.ParseDenomTrace(transferDenomPathB_C).IBCDenom() + transferDenomChainC := transfertypes.ParseDenomTrace(transferDenomPathChainC).IBCDenom() // Check that the funds are moved out of the acc on chainA s.assertProviderBalance( @@ -253,10 +253,10 @@ func (s *IBCTestSuite) TestSwapAndForward_MultiHopSuccess() { newProviderBalNative.Sub(ibcTransferAmount), ) // Check that chain B balance is unchanged - s.assertChainBBalance(chainBAddr, transferDenomDuality_B, math.ZeroInt()) + s.assertChainBBalance(chainBAddr, transferDenomDualityChainB, math.ZeroInt()) // Check that funds made it to chainC - s.assertChainCBalance(chainCAddr, transferDenomB_C, expectedOut) + s.assertChainCBalance(chainCAddr, transferDenomChainC, expectedOut) } // TestSwapAndForward_UnwindIBCDenomSuccess asserts that the swap and forward middleware stack works as intended in the @@ -345,7 +345,8 @@ func (s *IBCTestSuite) TestSwapAndForward_UnwindIBCDenomSuccess() { ) // Relay the packets - s.RelayAllPacketsAToB(s.dualityTransferPath) + err = s.RelayAllPacketsAToB(s.dualityTransferPath) + s.Assert().NoError(err) s.coordinator.CommitBlock(s.dualityChain) // Check that the amountIn is deduced from the duality account @@ -475,7 +476,7 @@ func (s *IBCTestSuite) TestSwapAndForward_ForwardFails() { s.dualityChainBPath.EndpointA.ChannelID, nativeDenom, ) - transferDenomDuality_B := transfertypes.ParseDenomTrace(transferDenomPath).IBCDenom() + transferDenomDualityChainB := transfertypes.ParseDenomTrace(transferDenomPath).IBCDenom() - s.assertChainBBalance(chainBAddr, transferDenomDuality_B, math.ZeroInt()) + s.assertChainBBalance(chainBAddr, transferDenomDualityChainB, math.ZeroInt()) } diff --git a/testutil/apptesting/events.go b/testutil/apptesting/events.go index 354f87a9e..55e2fa7be 100644 --- a/testutil/apptesting/events.go +++ b/testutil/apptesting/events.go @@ -34,7 +34,7 @@ func (s *KeeperTestHelper) ExtractAttributes(event sdk.Event) map[string]string return attrs } for _, a := range event.Attributes { - attrs[string(a.Key)] = string(a.Value) + attrs[a.Key] = a.Value } return attrs diff --git a/testutil/apptesting/test_suite.go b/testutil/apptesting/test_suite.go index d3b3e4f84..5ddb5dfb8 100644 --- a/testutil/apptesting/test_suite.go +++ b/testutil/apptesting/test_suite.go @@ -34,7 +34,7 @@ type KeeperTestHelper struct { // Setup sets up basic environment for suite (App, Ctx, and test accounts) func (s *KeeperTestHelper) Setup() { - s.App = testutil.Setup(s.T(), false) + s.App = testutil.Setup(s.T()) s.Ctx = s.App.BaseApp.NewContext( false, tmtypes.Header{Height: 1, ChainID: "neutron-1", Time: time.Now().UTC()}, diff --git a/testutil/dex/keeper/dex.go b/testutil/dex/keeper/dex.go index 530139c2f..6f0586b92 100644 --- a/testutil/dex/keeper/dex.go +++ b/testutil/dex/keeper/dex.go @@ -53,7 +53,7 @@ func AssertEventEmitted(t *testing.T, ctx sdk.Context, eventValue, message strin allEvents := ctx.EventManager().Events() for _, event := range allEvents { for _, attr := range event.Attributes { - if string(attr.Value) == eventValue { + if attr.Value == eventValue { return } } @@ -66,7 +66,7 @@ func AssertNEventsEmitted(t *testing.T, ctx sdk.Context, eventValue string, nEve allEvents := ctx.EventManager().Events() for _, event := range allEvents { for _, attr := range event.Attributes { - if string(attr.Value) == eventValue { + if attr.Value == eventValue { emissions++ } } @@ -78,7 +78,7 @@ func AssertEventNotEmitted(t *testing.T, ctx sdk.Context, eventValue, message st allEvents := ctx.EventManager().Events() if len(allEvents) != 0 { for _, attr := range allEvents[len(allEvents)-1].Attributes { - if string(attr.Value) == eventValue { + if attr.Value == eventValue { require.Fail(t, message) } } diff --git a/testutil/integration_test_setup.go b/testutil/integration_test_setup.go index 5d8284ac2..083533a5e 100644 --- a/testutil/integration_test_setup.go +++ b/testutil/integration_test_setup.go @@ -29,7 +29,7 @@ import ( "github.com/stretchr/testify/require" ) -func setup(withGenesis bool, invCheckPeriod uint) (*app.App, app.GenesisState) { +func setup(withGenesis bool) (*app.App, app.GenesisState) { encoding := app.MakeEncodingConfig() db := dbm.NewMemDB() testApp := app.New( @@ -52,7 +52,7 @@ func setup(withGenesis bool, invCheckPeriod uint) (*app.App, app.GenesisState) { return testApp, app.GenesisState{} } -func Setup(t *testing.T, isCheckTx bool) *app.App { +func Setup(t *testing.T) *app.App { t.Helper() privVal := mock.NewPV() @@ -93,7 +93,7 @@ func SetupWithGenesisValSet( ) *app.App { t.Helper() - app, genesisState := setup(true, 5) + app, genesisState := setup(true) genesisState, err := GenesisStateWithValSet( app.AppCodec(), genesisState, diff --git a/utils/bank.go b/utils/bank.go index a9740a8fa..b89845735 100644 --- a/utils/bank.go +++ b/utils/bank.go @@ -69,42 +69,39 @@ func FilteredPaginateAccountBalances( return &query.PageResponse{ NextKey: nextKey, }, nil - } else { - // default pagination (with offset) - - end := offset + limit - - var ( - numHits uint64 - nextKey []byte - ) - - bankKeeper.IterateAccountBalances(ctx, address, func(coin sdk.Coin) bool { - accumulate := numHits >= offset && numHits < end - hit := onResult(coin, accumulate) + } + // else default pagination (with offset) + end := offset + limit + var ( + numHits uint64 + nextKey []byte + ) + + bankKeeper.IterateAccountBalances(ctx, address, func(coin sdk.Coin) bool { + accumulate := numHits >= offset && numHits < end + hit := onResult(coin, accumulate) + + if hit { + numHits++ + } - if hit { - numHits++ + if numHits == end+1 { + if nextKey == nil { + nextKey = []byte(coin.Denom) } - if numHits == end+1 { - if nextKey == nil { - nextKey = []byte(coin.Denom) - } - - if !countTotal { - return true - } + if !countTotal { + return true } - - return false - }) - - res := &query.PageResponse{NextKey: nextKey} - if countTotal { - res.Total = numHits } - return res, nil + return false + }) + + res := &query.PageResponse{NextKey: nextKey} + if countTotal { + res.Total = numHits } + + return res, nil } diff --git a/utils/dcli/cli_tester.go b/utils/dcli/cli_tester.go index 7c16aac5d..3f12da339 100644 --- a/utils/dcli/cli_tester.go +++ b/utils/dcli/cli_tester.go @@ -29,7 +29,7 @@ type QueryCliTestCase[Q proto.Message] struct { func RunTxTestCases[M sdk.Msg](t *testing.T, desc *TxCliDesc, testcases map[string]TxCliTestCase[M]) { for name, tc := range testcases { t.Run(name, func(t *testing.T) { - RunTxTestCase(t, desc, &tc) + RunTxTestCase(t, desc, tc) }) } } @@ -37,12 +37,12 @@ func RunTxTestCases[M sdk.Msg](t *testing.T, desc *TxCliDesc, testcases map[stri func RunQueryTestCases[Q proto.Message](t *testing.T, desc *QueryDescriptor, testcases map[string]QueryCliTestCase[Q]) { for name, tc := range testcases { t.Run(name, func(t *testing.T) { - RunQueryTestCase(t, desc, &tc) + RunQueryTestCase(t, desc, tc) }) } } -func RunTxTestCase[M sdk.Msg](t *testing.T, desc *TxCliDesc, tc *TxCliTestCase[M]) { +func RunTxTestCase[M sdk.Msg](t *testing.T, desc *TxCliDesc, tc TxCliTestCase[M]) { cmd := BuildTxCli[M](desc) err := resetCommandFlagValues(cmd) require.NoError(t, err, "error in resetCommandFlagValues") @@ -65,7 +65,7 @@ func RunTxTestCase[M sdk.Msg](t *testing.T, desc *TxCliDesc, tc *TxCliTestCase[M require.Equal(t, tc.ExpectedMsg, msg) } -func RunQueryTestCase[Q proto.Message](t *testing.T, desc *QueryDescriptor, tc *QueryCliTestCase[Q]) { +func RunQueryTestCase[Q proto.Message](t *testing.T, desc *QueryDescriptor, tc QueryCliTestCase[Q]) { cmd := BuildQueryCli[Q, int](desc, nil) err := resetCommandFlagValues(cmd) require.NoError(t, err, "error in resetCommandFlagValues") @@ -97,7 +97,7 @@ func newClientContextWithFrom(t *testing.T, fs *pflag.FlagSet) client.Context { // taken from https://github.com/golang/debug/pull/8, // due to no cobra command for resetting flag value func resetCommandFlagValues(cmd *cobra.Command) error { - var retErr error = nil + var retErr error cmd.Flags().VisitAll(func(f *pflag.Flag) { if f.Changed { err := f.Value.Set(f.DefValue) diff --git a/utils/dcli/index_cmd.go b/utils/dcli/index_cmd.go index b332189f1..6ebd395d3 100644 --- a/utils/dcli/index_cmd.go +++ b/utils/dcli/index_cmd.go @@ -17,7 +17,7 @@ func IndexCmd(moduleName string) *cobra.Command { } } -func indexRunCmd(cmd *cobra.Command, args []string) error { +func indexRunCmd(cmd *cobra.Command, _ []string) error { usageTemplate := `Usage:{{if .HasAvailableSubCommands}} {{.CommandPath}} [command]{{end}} diff --git a/utils/dcli/parsers.go b/utils/dcli/parsers.go index 65af3d222..840d9b62d 100644 --- a/utils/dcli/parsers.go +++ b/utils/dcli/parsers.go @@ -249,15 +249,17 @@ func ParseFieldFromArg(fVal reflect.Value, fType reflect.StructField, arg string typeStr := fType.Type.String() var v any var err error - if typeStr == "types.Coin" { + + switch { + case typeStr == "types.Coin": v, err = ParseCoin(arg, fType.Name) - } else if typeStr == "types.Int" { + case typeStr == "types.Int": v, err = ParseSdkInt(arg, fType.Name) - } else if typeStr == "time.Time" { + case typeStr == "time.Time": v, err = ParseUnixTime(arg, fType.Name) - } else if typeStr == "math.LegacyDec" { + case typeStr == "math.LegacyDec": v, err = ParseSdkDec(arg, fType.Name) - } else { + default: return fmt.Errorf("struct field type not recognized. Got type %v", fType) } @@ -317,7 +319,7 @@ func ParseUnixTime(arg, fieldName string) (time.Time, error) { return startTime, nil } -func ParseDenom(arg, fieldName string) (string, error) { +func ParseDenom(arg, _ string) (string, error) { return strings.TrimSpace(arg), nil } diff --git a/utils/dcli/query_cmd_wrap.go b/utils/dcli/query_cmd_wrap.go index 2dbfb8b9a..332de88eb 100644 --- a/utils/dcli/query_cmd_wrap.go +++ b/utils/dcli/query_cmd_wrap.go @@ -72,7 +72,7 @@ func prepareDescriptor[reqP proto.Message](desc *QueryDescriptor) { desc.numArgs = ParseNumFields[reqP]() - len(desc.CustomFlagOverrides) if desc.HasPagination { - desc.numArgs = desc.numArgs - 1 + desc.numArgs-- } } @@ -135,7 +135,7 @@ func callQueryClientFn(ctx context.Context, fnName string, req proto.Message, q qVal := reflect.ValueOf(q) method := qVal.MethodByName(fnName) if (method == reflect.Value{}) { - return nil, fmt.Errorf("Method %s does not exist on the querier."+ + return nil, fmt.Errorf("method %s does not exist on the querier."+ " You likely need to override QueryFnName in your Query descriptor", fnName) } args := []reflect.Value{ diff --git a/utils/generic_helper.go b/utils/generic_helper.go index e05ead8ae..93e2995ca 100644 --- a/utils/generic_helper.go +++ b/utils/generic_helper.go @@ -11,7 +11,7 @@ func MakeNew[T any]() T { elem := typ.Elem() //nolint:forcetypeassert return reflect.New(elem).Interface().(T) // must use reflect - } else { - return *new(T) // v is not ptr, alloc with new } + + return *new(T) // v is not ptr, alloc with new } diff --git a/utils/math/prec_dec.go b/utils/math/prec_dec.go index e09555bff..07996bf70 100644 --- a/utils/math/prec_dec.go +++ b/utils/math/prec_dec.go @@ -1,4 +1,4 @@ -package math_utils +package math import ( "encoding/json" @@ -525,7 +525,7 @@ func (d PrecDec) IsInteger() bool { } // format decimal state -func (d PrecDec) Format(s fmt.State, verb rune) { +func (d PrecDec) Format(s fmt.State) { _, err := s.Write([]byte(d.String())) if err != nil { panic(err) diff --git a/utils/slice_helper.go b/utils/slice_helper.go index 933542e62..ffeb69bd7 100644 --- a/utils/slice_helper.go +++ b/utils/slice_helper.go @@ -43,9 +43,8 @@ func ContainsDuplicate[T any](arr []T) bool { for i := 0; i < len(arr); i++ { if visited[arr[i]] { return true - } else { - visited[arr[i]] = true } + visited[arr[i]] = true } return false } diff --git a/x/dex/client/cli/tx_place_limit_order.go b/x/dex/client/cli/tx_place_limit_order.go index f174016c5..13f83d0c5 100644 --- a/x/dex/client/cli/tx_place_limit_order.go +++ b/x/dex/client/cli/tx_place_limit_order.go @@ -64,7 +64,7 @@ func CmdPlaceLimitOrder() *cobra.Command { if err != nil { return err } - var maxAmountOutIntP *math.Int = nil + var maxAmountOutIntP *math.Int if maxAmountOutArg != "" { maxAmountOutInt, ok := math.NewIntFromString(maxAmountOutArg) if !ok { diff --git a/x/dex/keeper/core.go b/x/dex/keeper/core.go index b2d8a47a4..ebe804de0 100644 --- a/x/dex/keeper/core.go +++ b/x/dex/keeper/core.go @@ -325,7 +325,6 @@ func (k Keeper) PlaceLimitOrderCore( takerTradePairID := pairID.MustTradePairIDFromMaker(tokenOut) var limitPrice math_utils.PrecDec limitPrice, err = types.CalcPrice(tickIndexInToOut) - err = err if err != nil { return } @@ -437,7 +436,7 @@ func (k Keeper) PlaceLimitOrderCore( trancheKey, )) - return + return trancheKey, totalInCoin, swapInCoin, swapOutCoin, nil } // Handles MsgCancelLimitOrder, removing a specified number of shares from a limit order diff --git a/x/dex/keeper/core_helper_test.go b/x/dex/keeper/core_helper_test.go index 663f8519f..9660dd74c 100644 --- a/x/dex/keeper/core_helper_test.go +++ b/x/dex/keeper/core_helper_test.go @@ -28,12 +28,9 @@ func TestCoreHelpersTestSuite(t *testing.T) { } func (s *CoreHelpersTestSuite) SetupTest() { - app := testutil.Setup(s.T(), false) + app := testutil.Setup(s.T()) ctx := app.BaseApp.NewContext(false, tmproto.Header{}) - app.AccountKeeper.SetParams(ctx, authtypes.DefaultParams()) - app.BankKeeper.SetParams(ctx, banktypes.DefaultParams()) - accAlice := app.AccountKeeper.NewAccountWithAddress(ctx, s.alice) app.AccountKeeper.SetAccount(ctx, accAlice) accBob := app.AccountKeeper.NewAccountWithAddress(ctx, s.bob) @@ -65,7 +62,8 @@ func (s *CoreHelpersTestSuite) setLPAtFee1Pool(tickIndex int64, amountA, amountB totalShares := pool.CalcSharesMinted(amountAInt, amountBInt, existingShares) - s.app.DexKeeper.MintShares(s.ctx, s.alice, totalShares) + err = s.app.DexKeeper.MintShares(s.ctx, s.alice, totalShares) + s.Require().NoError(err) lowerTick.ReservesMakerDenom = amountAInt upperTick.ReservesMakerDenom = amountBInt @@ -100,7 +98,6 @@ func (s *CoreHelpersTestSuite) TestGetCurrTick1To0WithLiq() { func (s *CoreHelpersTestSuite) TestGetCurrTick1To0WithMinLiq() { // GIVEN tick with token0 @ index -1 s.setLPAtFee1Pool(-1, 10, 0) - s.setLPAtFee1Pool(1, 0, 0) // THEN GetCurrTick1To0 finds the tick at -2 @@ -138,7 +135,6 @@ func (s *CoreHelpersTestSuite) TestGetCurrTick0To1WithLiq() { func (s *CoreHelpersTestSuite) TestGetCurrTick0To1WithMinLiq() { // WHEN tick with token1 @ index 1 - s.setLPAtFee1Pool(-1, 0, 0) s.setLPAtFee1Pool(1, 0, 10) // THEN GetCurrTick0To1 finds the tick at 2 diff --git a/x/dex/keeper/grpc_query_params_test.go b/x/dex/keeper/grpc_query_params_test.go index daa26bd2e..5b44a7a10 100644 --- a/x/dex/keeper/grpc_query_params_test.go +++ b/x/dex/keeper/grpc_query_params_test.go @@ -13,7 +13,8 @@ func TestParamsQuery(t *testing.T) { keeper, ctx := testkeeper.DexKeeper(t) wctx := sdk.WrapSDKContext(ctx) params := types.DefaultParams() - keeper.SetParams(ctx, params) + err := keeper.SetParams(ctx, params) + require.NoError(t, err) response, err := keeper.Params(wctx, &types.QueryParamsRequest{}) require.NoError(t, err) diff --git a/x/dex/keeper/grpc_query_user_deposits_test.go b/x/dex/keeper/grpc_query_user_deposits_test.go index 5719b94e2..19f2e4a7a 100644 --- a/x/dex/keeper/grpc_query_user_deposits_test.go +++ b/x/dex/keeper/grpc_query_user_deposits_test.go @@ -28,7 +28,7 @@ func simulateDeposit(ctx sdk.Context, app *dualityapp.App, addr sdk.AccAddress, } func TestUserDepositsAllQueryPaginated(t *testing.T) { - app := testutil.Setup(t, false) + app := testutil.Setup(t) keeper := app.DexKeeper ctx := app.BaseApp.NewContext(false, tmproto.Header{}) wctx := sdk.WrapSDKContext(ctx) diff --git a/x/dex/keeper/inactive_limit_order_tranche_test.go b/x/dex/keeper/inactive_limit_order_tranche_test.go index 4dc47b2cc..68e0d34ed 100644 --- a/x/dex/keeper/inactive_limit_order_tranche_test.go +++ b/x/dex/keeper/inactive_limit_order_tranche_test.go @@ -43,8 +43,8 @@ func TestInactiveLimitOrderTrancheGet(t *testing.T) { rst, found := keeper.GetInactiveLimitOrderTranche(ctx, item.Key) require.True(t, found) require.Equal(t, - nullify.Fill(&item), - nullify.Fill(&rst), + nullify.Fill(item), + nullify.Fill(rst), ) } } @@ -62,12 +62,9 @@ func TestInactiveLimitOrderTrancheRemove(t *testing.T) { func TestInactiveLimitOrderTrancheGetAll(t *testing.T) { keeper, ctx := keepertest.DexKeeper(t) items := createNInactiveLimitOrderTranche(keeper, ctx, 10) - pointerItems := make([]*types.LimitOrderTranche, len(items)) - for i := range items { - pointerItems[i] = items[i] - } + require.ElementsMatch(t, - pointerItems, + items, keeper.GetAllInactiveLimitOrderTranche(ctx), ) } diff --git a/x/dex/keeper/internal/testutils/test_helpers.go b/x/dex/keeper/internal/testutils/test_helpers.go index 4b87f7f95..700489211 100644 --- a/x/dex/keeper/internal/testutils/test_helpers.go +++ b/x/dex/keeper/internal/testutils/test_helpers.go @@ -15,10 +15,12 @@ func NewBCoin(amt math.Int) sdk.Coin { return sdk.NewCoin("TokenB", amt) } -func FundAccount(bankKeeper bankkeeper.Keeper, ctx sdk.Context, addr sdk.AccAddress, amounts sdk.Coins) error { +func FundAccount(bankKeeper bankkeeper.Keeper, ctx sdk.Context, addr sdk.AccAddress, amounts sdk.Coins) { if err := bankKeeper.MintCoins(ctx, dexmoduletypes.ModuleName, amounts); err != nil { - return err + panic(err) } - return bankKeeper.SendCoinsFromModuleToAccount(ctx, dexmoduletypes.ModuleName, addr, amounts) + if err := bankKeeper.SendCoinsFromModuleToAccount(ctx, dexmoduletypes.ModuleName, addr, amounts); err != nil { + panic(err) + } } diff --git a/x/dex/keeper/limit_order_tranche_test.go b/x/dex/keeper/limit_order_tranche_test.go index 36e9374af..70e22ab44 100644 --- a/x/dex/keeper/limit_order_tranche_test.go +++ b/x/dex/keeper/limit_order_tranche_test.go @@ -43,8 +43,8 @@ func TestGetLimitOrderTranche(t *testing.T) { rst := keeper.GetLimitOrderTranche(ctx, item.Key) require.NotNil(t, rst) require.Equal(t, - nullify.Fill(&item), - nullify.Fill(&rst), + nullify.Fill(item), + nullify.Fill(rst), ) } } diff --git a/x/dex/keeper/limit_order_tranche_user_test.go b/x/dex/keeper/limit_order_tranche_user_test.go index 65cf048f4..b9d8dd956 100644 --- a/x/dex/keeper/limit_order_tranche_user_test.go +++ b/x/dex/keeper/limit_order_tranche_user_test.go @@ -58,8 +58,8 @@ func TestLimitOrderTrancheUserGet(t *testing.T) { rst, found := keeper.GetLimitOrderTrancheUser(ctx, item.Address, item.TrancheKey) require.True(t, found) require.Equal(t, - nullify.Fill(&item), - nullify.Fill(&rst), + nullify.Fill(item), + nullify.Fill(rst), ) } } diff --git a/x/dex/keeper/liquidity.go b/x/dex/keeper/liquidity.go index f6a8d4521..a24ec9bfb 100644 --- a/x/dex/keeper/liquidity.go +++ b/x/dex/keeper/liquidity.go @@ -17,8 +17,8 @@ func (k Keeper) Swap( useMaxOut := maxAmountMakerDenom != nil var remainingMakerDenom *math.Int if useMaxOut { - copy := *maxAmountMakerDenom - remainingMakerDenom = © + temp := *maxAmountMakerDenom + remainingMakerDenom = &temp } remainingTakerDenom := maxAmountTakerDenom @@ -54,8 +54,8 @@ func (k Keeper) Swap( } if useMaxOut { - copy := remainingMakerDenom.Sub(outAmount) - remainingMakerDenom = © + temp := remainingMakerDenom.Sub(outAmount) + remainingMakerDenom = &temp // if maxAmountOut has been used up then exit if remainingMakerDenom.LTE(math.ZeroInt()) { diff --git a/x/dex/keeper/liquidity_test.go b/x/dex/keeper/liquidity_test.go index d99b39163..1fc93edee 100644 --- a/x/dex/keeper/liquidity_test.go +++ b/x/dex/keeper/liquidity_test.go @@ -24,7 +24,7 @@ type LiquidityTestSuite struct { // don't need to test both LO and LP. At the level of swap testing these should be indistinguishable. func (s *LiquidityTestSuite) SetupTest() { - s.app = testutil.Setup(s.T(), false) + s.app = testutil.Setup(s.T()) ctx := s.app.BaseApp.NewContext(false, tmproto.Header{}) ctx = ctx.WithBlockGasMeter(sdk.NewInfiniteGasMeter()) s.ctx = ctx @@ -726,23 +726,3 @@ func (s *LiquidityTestSuite) assertCurr1To0(curr1To0Expected int64) { s.Assert().Equal(curr1To0Expected, curr1to0Actual) } } - -func (s *LiquidityTestSuite) assertFillAndPlaceTrancheKeys( - selling string, - tickIndex int64, - expectedFill, expectedPlace string, -) { - tradePairID := defaultPairID.MustTradePairIDFromMaker(selling) - placeTranche := s.app.DexKeeper.GetPlaceTranche(s.ctx, tradePairID, tickIndex) - fillTranche, foundFill := s.app.DexKeeper.GetFillTranche(s.ctx, tradePairID, tickIndex) - placeKey, fillKey := "", "" - if placeTranche != nil { - placeKey = placeTranche.Key.TrancheKey - } - - if foundFill { - fillKey = fillTranche.Key.TrancheKey - } - s.Assert().Equal(expectedFill, fillKey) - s.Assert().Equal(expectedPlace, placeKey) -} diff --git a/x/dex/keeper/msg_server_test.go b/x/dex/keeper/msg_server_test.go index fb8b1073c..13a46cf85 100644 --- a/x/dex/keeper/msg_server_test.go +++ b/x/dex/keeper/msg_server_test.go @@ -1,3 +1,4 @@ +//nolint:unused,unparam // Lots of useful test helper fns that we don't want to delete, also extra params we need to keep package keeper_test import ( @@ -10,8 +11,6 @@ import ( abci "github.com/cometbft/cometbft/abci/types" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" sdk "github.com/cosmos/cosmos-sdk/types" - authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" dualityapp "github.com/neutron-org/neutron/app" "github.com/neutron-org/neutron/testutil" math_utils "github.com/neutron-org/neutron/utils/math" @@ -51,13 +50,10 @@ func TestMsgServerTestSuite(t *testing.T) { } func (s *MsgServerTestSuite) SetupTest() { - app := testutil.Setup(s.T(), false) + app := testutil.Setup(s.T()) ctx := app.BaseApp.NewContext(false, tmproto.Header{}) ctx = ctx.WithBlockGasMeter(sdk.NewInfiniteGasMeter()) - app.AccountKeeper.SetParams(ctx, authtypes.DefaultParams()) - app.BankKeeper.SetParams(ctx, banktypes.DefaultParams()) - accAlice := app.AccountKeeper.NewAccountWithAddress(ctx, s.alice) app.AccountKeeper.SetAccount(ctx, accAlice) accBob := app.AccountKeeper.NewAccountWithAddress(ctx, s.bob) @@ -83,20 +79,21 @@ func (s *MsgServerTestSuite) fundAccountBalances(account sdk.AccAddress, aBalanc aBalanceInt := sdkmath.NewInt(aBalance) bBalanceInt := sdkmath.NewInt(bBalance) balances := sdk.NewCoins(NewACoin(aBalanceInt), NewBCoin(bBalanceInt)) - err := FundAccount(s.app.BankKeeper, s.ctx, account, balances) - s.Assert().NoError(err) + FundAccount(s.app.BankKeeper, s.ctx, account, balances) s.assertAccountBalances(account, aBalance, bBalance) } func (s *MsgServerTestSuite) fundAccountBalancesWithDenom( addr sdk.AccAddress, amounts sdk.Coins, -) error { +) { if err := s.app.BankKeeper.MintCoins(s.ctx, types.ModuleName, amounts); err != nil { - return err + panic(err) } - return s.app.BankKeeper.SendCoinsFromModuleToAccount(s.ctx, types.ModuleName, addr, amounts) + if err := s.app.BankKeeper.SendCoinsFromModuleToAccount(s.ctx, types.ModuleName, addr, amounts); err != nil { + panic(err) + } } func (s *MsgServerTestSuite) fundAliceBalances(a, b int64) { @@ -1420,9 +1417,9 @@ func (s *MsgServerTestSuite) getLimitFilledLiquidityAtTickAtIndex( // grab fill tranche reserves and shares tradePairID := defaultPairID.MustTradePairIDFromMaker(selling) tranche, _, found := s.app.DexKeeper.FindLimitOrderTranche(s.ctx, &types.LimitOrderTrancheKey{ - tradePairID, - tickIndex, - trancheKey, + TradePairID: tradePairID, + TickIndexTakerToMaker: tickIndex, + TrancheKey: trancheKey, }) s.Assert().True(found, "Failed to get limit order filled reserves for index %s", trancheKey) @@ -1437,7 +1434,9 @@ func (s *MsgServerTestSuite) getLimitReservesAtTickAtKey( // grab fill tranche reserves and shares tradePairID := defaultPairID.MustTradePairIDFromMaker(selling) tranche, _, found := s.app.DexKeeper.FindLimitOrderTranche(s.ctx, &types.LimitOrderTrancheKey{ - tradePairID, tickIndex, trancheKey, + TradePairID: tradePairID, + TickIndexTakerToMaker: tickIndex, + TrancheKey: trancheKey, }) s.Assert().True(found, "Failed to get limit order reserves for index %s", trancheKey) diff --git a/x/dex/keeper/multihop_swap.go b/x/dex/keeper/multihop_swap.go index 09b8d24be..656a76732 100644 --- a/x/dex/keeper/multihop_swap.go +++ b/x/dex/keeper/multihop_swap.go @@ -16,7 +16,6 @@ type MultihopStep struct { func (k Keeper) HopsToRouteData( ctx sdk.Context, hops []string, - exitLimitPrice math_utils.PrecDec, ) ([]MultihopStep, error) { nPairs := len(hops) - 1 routeArr := make([]MultihopStep, nPairs) @@ -67,9 +66,6 @@ func (k Keeper) MultihopStep( bctx *types.BranchableCache, step MultihopStep, inCoin sdk.Coin, - exitLimitPrice math_utils.PrecDec, - currentPrice math_utils.PrecDec, - remainingSteps []MultihopStep, stepCache map[multihopCacheKey]StepResult, ) (sdk.Coin, *types.BranchableCache, error) { cacheKey := newCacheKey(step.tradePairID.TakerDenom, step.tradePairID.MakerDenom, inCoin.Amount) @@ -100,7 +96,7 @@ func (k Keeper) RunMultihopRoute( exitLimitPrice math_utils.PrecDec, stepCache map[multihopCacheKey]StepResult, ) (sdk.Coin, func(), error) { - routeData, err := k.HopsToRouteData(ctx, route.Hops, exitLimitPrice) + routeData, err := k.HopsToRouteData(ctx, route.Hops) if err != nil { return sdk.Coin{}, nil, err } @@ -110,7 +106,7 @@ func (k Keeper) RunMultihopRoute( inCoin := initialInCoin bCacheCtx := types.NewBranchableCache(ctx) - for i, step := range routeData { + for _, step := range routeData { // If we can't hit the best possible price we can greedily abort priceUpperbound := currentPrice.Mul(step.RemainingBestPrice) if exitLimitPrice.GT(priceUpperbound) { @@ -121,9 +117,6 @@ func (k Keeper) RunMultihopRoute( bCacheCtx, step, inCoin, - exitLimitPrice, - currentPrice, - routeData[i:], stepCache, ) inCoin = currentOutCoin diff --git a/x/dex/keeper/params_test.go b/x/dex/keeper/params_test.go index 21529526d..9dadfb7d8 100644 --- a/x/dex/keeper/params_test.go +++ b/x/dex/keeper/params_test.go @@ -12,7 +12,8 @@ func TestGetParams(t *testing.T) { k, ctx := testkeeper.DexKeeper(t) params := types.DefaultParams() - k.SetParams(ctx, params) + err := k.SetParams(ctx, params) + require.NoError(t, err) require.EqualValues(t, params, k.GetParams(ctx)) } diff --git a/x/dex/keeper/pool.go b/x/dex/keeper/pool.go index 6bc34a26e..b0172824a 100644 --- a/x/dex/keeper/pool.go +++ b/x/dex/keeper/pool.go @@ -78,11 +78,12 @@ func (k Keeper) GetPool( upperTick, upperTickFound := k.GetPoolReserves(ctx, id0To1) lowerTick, lowerTickFound := k.GetPoolReserves(ctx, id0To1.Counterpart()) - if !lowerTickFound && upperTickFound { + switch { + case !lowerTickFound && upperTickFound: lowerTick = types.NewPoolReservesFromCounterpart(upperTick) - } else if lowerTickFound && !upperTickFound { + case lowerTickFound && !upperTickFound: upperTick = types.NewPoolReservesFromCounterpart(lowerTick) - } else if !lowerTickFound && !upperTickFound { + case !lowerTickFound && !upperTickFound: // Pool has already been initialized before so we can safely assume that pool creation doesn't throw an error return types.MustNewPool(pairID, centerTickIndexNormalized, fee, poolID), true } diff --git a/x/dex/keeper/pool_metadata_test.go b/x/dex/keeper/pool_metadata_test.go index bc41fcb40..7bb9088e9 100644 --- a/x/dex/keeper/pool_metadata_test.go +++ b/x/dex/keeper/pool_metadata_test.go @@ -28,8 +28,8 @@ func TestPoolMetadataGet(t *testing.T) { got, found := keeper.GetPoolMetadata(ctx, item.ID) require.True(t, found) require.Equal(t, - nullify.Fill(&item), - nullify.Fill(&got), + nullify.Fill(item), + nullify.Fill(got), ) } } diff --git a/x/dex/keeper/pool_reserves_test.go b/x/dex/keeper/pool_reserves_test.go index 13e361128..b3dff4c09 100644 --- a/x/dex/keeper/pool_reserves_test.go +++ b/x/dex/keeper/pool_reserves_test.go @@ -27,8 +27,8 @@ func TestGetPoolReserves(t *testing.T) { rst, found := keeper.GetPoolReserves(ctx, item.Key) require.True(t, found) require.Equal(t, - nullify.Fill(&item), - nullify.Fill(&rst), + nullify.Fill(item), + nullify.Fill(rst), ) } } diff --git a/x/dex/module_simulation.go b/x/dex/module_simulation.go index f83b5ac42..c2d1311d7 100644 --- a/x/dex/module_simulation.go +++ b/x/dex/module_simulation.go @@ -21,6 +21,7 @@ var ( _ = baseapp.Paramspace ) +//nolint:gosec // false positive const ( opWeightMsgDeposit = "op_weight_msg_deposit" // TODO: Determine the simulation weight value @@ -63,7 +64,7 @@ func (AppModule) GenerateGenesisState(simState *module.SimulationState) { } // ProposalContents doesn't return any content functions for governance proposals -func (AppModule) ProposalContents(_ module.SimulationState) []simtypes.WeightedProposalContent { +func (AppModule) ProposalContents(_ module.SimulationState) []simtypes.WeightedProposalMsg { return nil } diff --git a/x/dex/types/codec.go b/x/dex/types/codec.go index c7401e6cd..9ed387fb7 100644 --- a/x/dex/types/codec.go +++ b/x/dex/types/codec.go @@ -1,4 +1,3 @@ -//nolint:all package types import ( diff --git a/x/dex/types/errors.go b/x/dex/types/errors.go index 744c2e289..d555b76fa 100644 --- a/x/dex/types/errors.go +++ b/x/dex/types/errors.go @@ -8,7 +8,6 @@ import ( // x/dex module sentinel errors -//nolint:all var ( ErrInvalidTradingPair = sdkerrors.Register( ModuleName, diff --git a/x/dex/types/keys.go b/x/dex/types/keys.go index dbefbf132..65c00f1d3 100644 --- a/x/dex/types/keys.go +++ b/x/dex/types/keys.go @@ -79,9 +79,9 @@ func BytesToTickIndex(bz []byte) (int64, error) { if isNegative { return int64(-tickTakerToMaker), nil - } else { - return int64(tickTakerToMaker), nil } + // else + return int64(tickTakerToMaker), nil } // LimitOrderTrancheUserKey returns the store key to retrieve a LimitOrderTrancheUser from the index fields diff --git a/x/dex/types/limit_order_tranche_key.go b/x/dex/types/limit_order_tranche_key.go index d05342989..76c2aca95 100644 --- a/x/dex/types/limit_order_tranche_key.go +++ b/x/dex/types/limit_order_tranche_key.go @@ -1,9 +1,6 @@ package types import ( - "errors" - "strings" - math_utils "github.com/neutron-org/neutron/utils/math" ) @@ -34,34 +31,6 @@ func (p LimitOrderTrancheKey) KeyMarshal() []byte { return key } -func (p LimitOrderTrancheKey) KeyUnmarshal(bz []byte) error { - split := strings.Split(string(bz), "/") - - if len(split) != 5 { - return errors.New("invalid input length") - } - - pairKey, err := NewPairIDFromCanonicalString(split[0]) - if err != nil { - return err - } - p.TradePairID = pairKey.MustTradePairIDFromMaker(split[1]) - - tickIndex, err := BytesToTickIndex([]byte(split[2])) - if err != nil { - return err - } - p.TickIndexTakerToMaker = tickIndex - - if split[3] != LiquidityTypeLimitOrder { - return errors.New("unexpected liquidity type") - } - - p.TrancheKey = split[4] - - return nil -} - func (p LimitOrderTrancheKey) PriceTakerToMaker() (priceTakerToMaker math_utils.PrecDec, err error) { return CalcPrice(p.TickIndexTakerToMaker) } diff --git a/x/dex/types/message_update_params.go b/x/dex/types/message_update_params.go index 750b98a16..599c7d911 100644 --- a/x/dex/types/message_update_params.go +++ b/x/dex/types/message_update_params.go @@ -34,8 +34,6 @@ func (msg *MsgUpdateParams) ValidateBasic() error { if _, err := sdk.AccAddressFromBech32(msg.Authority); err != nil { return errorsmod.Wrap(err, "authority is invalid") } - if err := msg.Params.Validate(); err != nil { - return err - } - return nil + + return msg.Params.Validate() } diff --git a/x/dex/types/pair_id.go b/x/dex/types/pair_id.go index af61d7634..dd2b9b9e6 100644 --- a/x/dex/types/pair_id.go +++ b/x/dex/types/pair_id.go @@ -65,27 +65,29 @@ func NewPairIDFromCanonicalString(pairIDStr string) (*PairID, error) { func SortTokens(tokenA, tokenB string) (string, string) { if tokenA < tokenB { return tokenA, tokenB - } else { - return tokenB, tokenA } + // else + return tokenB, tokenA } func (p *PairID) MustTradePairIDFromMaker(maker string) *TradePairID { - if p.Token0 == maker { + switch { + case p.Token0 == maker: return MustNewTradePairID(p.Token1, p.Token0) - } else if p.Token1 == maker { + case p.Token1 == maker: return MustNewTradePairID(p.Token0, p.Token1) - } else { + default: panic(fmt.Errorf("pair.TradePairIDFromMaker(maker string) called where maker does not equal either pair.Token0 or pair.Token1")) } } func (p *PairID) MustTradePairIDFromTaker(taker string) *TradePairID { - if p.Token0 == taker { + switch { + case p.Token0 == taker: return MustNewTradePairID(p.Token0, p.Token1) - } else if p.Token1 == taker { + case p.Token1 == taker: return MustNewTradePairID(p.Token1, p.Token0) - } else { + default: panic(fmt.Errorf("pair.TradePairIDFromMaker(maker string) called where maker does not equal either pair.Token0 or pair.Token1")) } } diff --git a/x/dex/types/params.go b/x/dex/types/params.go index fbd7d08d8..8bb7fdc0b 100644 --- a/x/dex/types/params.go +++ b/x/dex/types/params.go @@ -10,8 +10,8 @@ import ( var _ paramtypes.ParamSet = (*Params)(nil) var ( - KeyFeeTiers = []byte("FeeTiers") - DefaultFeeTiers []uint64 = []uint64{0, 1, 2, 3, 4, 5, 10, 20, 50, 100, 150, 200} + KeyFeeTiers = []byte("FeeTiers") + DefaultFeeTiers = []uint64{0, 1, 2, 3, 4, 5, 10, 20, 50, 100, 150, 200} ) // ParamKeyTable the param key table for launch module @@ -44,10 +44,7 @@ func (p Params) String() string { // Validate validates the set of params func (p Params) Validate() error { - if err := validateFeeTiers(p.FeeTiers); err != nil { - return err - } - return nil + return validateFeeTiers(p.FeeTiers) } func validateFeeTiers(v interface{}) error { diff --git a/x/dex/types/pool_reserves_key.go b/x/dex/types/pool_reserves_key.go index 0560f9fa1..766a5ca42 100644 --- a/x/dex/types/pool_reserves_key.go +++ b/x/dex/types/pool_reserves_key.go @@ -1,9 +1,6 @@ package types import ( - "errors" - "strings" - sdk "github.com/cosmos/cosmos-sdk/types" math_utils "github.com/neutron-org/neutron/utils/math" "github.com/neutron-org/neutron/x/dex/utils" @@ -37,34 +34,6 @@ func (p PoolReservesKey) KeyMarshal() []byte { return key } -func (p PoolReservesKey) KeyUnmarshal(bz []byte) error { - split := strings.Split(string(bz), "/") - - if len(split) != 5 { - return errors.New("invalid input length") - } - - pairKey, err := NewPairIDFromCanonicalString(split[0]) - if err != nil { - return err - } - p.TradePairID = pairKey.MustTradePairIDFromMaker(split[1]) - - tickIndex, err := BytesToTickIndex([]byte(split[2])) - if err != nil { - return err - } - p.TickIndexTakerToMaker = tickIndex - - if split[3] != LiquidityTypePoolReserves { - return errors.New("unexpected liquidity type") - } - - p.Fee = sdk.BigEndianToUint64([]byte(split[4])) - - return nil -} - func (p PoolReservesKey) Counterpart() *PoolReservesKey { feeInt64 := utils.MustSafeUint64ToInt64(p.Fee) return &PoolReservesKey{ diff --git a/x/dex/types/price.go b/x/dex/types/price.go index cd799dd41..82625f700 100644 --- a/x/dex/types/price.go +++ b/x/dex/types/price.go @@ -19,9 +19,9 @@ func CalcPrice(relativeTickIndex int64) (math_utils.PrecDec, error) { } if relativeTickIndex < 0 { return utils.BasePrice().Power(uint64(-1 * relativeTickIndex)), nil - } else { - return math_utils.OnePrecDec().Quo(utils.BasePrice().Power(uint64(relativeTickIndex))), nil } + // else + return math_utils.OnePrecDec().Quo(utils.BasePrice().Power(uint64(relativeTickIndex))), nil } func MustCalcPrice(relativeTickIndex int64) math_utils.PrecDec { diff --git a/x/dex/types/trade_pair_id.go b/x/dex/types/trade_pair_id.go index f04c0e11f..4e82ef59a 100644 --- a/x/dex/types/trade_pair_id.go +++ b/x/dex/types/trade_pair_id.go @@ -81,9 +81,9 @@ func (p TradePairID) TickIndexTakerToMaker(tickIndexNormalized int64) int64 { pairID := p.MustPairID() if pairID.Token1 == p.MakerDenom { return tickIndexNormalized - } else { - return -1 * tickIndexNormalized } + // else + return -1 * tickIndexNormalized } func (p TradePairID) TickIndexNormalized(tickIndexTakerToMaker int64) int64 { diff --git a/x/epochs/keeper/abci.go b/x/epochs/keeper/abci.go index c8eedc570..ccf3fcf87 100644 --- a/x/epochs/keeper/abci.go +++ b/x/epochs/keeper/abci.go @@ -53,7 +53,7 @@ func (k Keeper) BeginBlocker(ctx sdk.Context) { sdk.NewAttribute(types.AttributeEpochNumber, fmt.Sprintf("%d", epochInfo.CurrentEpoch)), ), ) - k.AfterEpochEnd(ctx, epochInfo.Identifier, epochInfo.CurrentEpoch) + k.AfterEpochEnd(ctx, epochInfo.Identifier) epochInfo.CurrentEpoch++ epochInfo.CurrentEpochStartTime = epochInfo.CurrentEpochStartTime.Add(epochInfo.Duration) logger.Info("Starting epoch", "Identifier", epochInfo.Identifier, "CurEpoch", epochInfo.CurrentEpoch) @@ -74,7 +74,7 @@ func (k Keeper) BeginBlocker(ctx sdk.Context) { ), ) k.setEpochInfo(ctx, epochInfo) - k.BeforeEpochStart(ctx, epochInfo.Identifier, epochInfo.CurrentEpoch) + k.BeforeEpochStart(ctx, epochInfo.Identifier) return false }) diff --git a/x/epochs/keeper/abci_test.go b/x/epochs/keeper/abci_test.go index 2afb5b739..c8989e5e2 100644 --- a/x/epochs/keeper/abci_test.go +++ b/x/epochs/keeper/abci_test.go @@ -17,7 +17,8 @@ import ( // This test is responsible for testing how epochs increment based off // of their initial conditions, and subsequent block height / times. -func (suite KeeperTestSuite) TestEpochInfoBeginBlockChanges() { + +func (suite *KeeperTestSuite) TestEpochInfoBeginBlockChanges() { block1Time := time.Unix(1656907200, 0).UTC() const defaultIdentifier = "hourly" const defaultDuration = time.Hour @@ -198,7 +199,8 @@ func (suite KeeperTestSuite) TestEpochInfoBeginBlockChanges() { defaultIdentifier, defaultDuration, ) - suite.App.EpochsKeeper.AddEpochInfo(suite.Ctx, initialEpoch) + err := suite.App.EpochsKeeper.AddEpochInfo(suite.Ctx, initialEpoch) + suite.Require().NoError(err) suite.App.EpochsKeeper.BeginBlocker(suite.Ctx) // get sorted heights @@ -239,7 +241,7 @@ func initializeBlankEpochInfoFields( } func TestEpochStartingOneMonthAfterInitGenesis(t *testing.T) { - app := testutil.Setup(t, false) + app := testutil.Setup(t) ctx := app.BaseApp.NewContext(false, tmproto.Header{}) // On init genesis, default epochs information is set diff --git a/x/epochs/keeper/epoch_test.go b/x/epochs/keeper/epoch_test.go index 536ea9392..8a7630a0b 100644 --- a/x/epochs/keeper/epoch_test.go +++ b/x/epochs/keeper/epoch_test.go @@ -79,7 +79,9 @@ func (suite *KeeperTestSuite) TestEpochLifeCycle() { suite.SetupTest() epochInfo := types.NewGenesisEpochInfo("monthly", time.Hour*24*30) - suite.App.EpochsKeeper.AddEpochInfo(suite.Ctx, epochInfo) + err := suite.App.EpochsKeeper.AddEpochInfo(suite.Ctx, epochInfo) + suite.Require().NoError(err) + epochInfoSaved := suite.App.EpochsKeeper.GetEpochInfo(suite.Ctx, "monthly") // setup expected epoch info diff --git a/x/epochs/keeper/genesis_test.go b/x/epochs/keeper/genesis_test.go index 8c0fa9973..2d685b0fd 100644 --- a/x/epochs/keeper/genesis_test.go +++ b/x/epochs/keeper/genesis_test.go @@ -12,7 +12,7 @@ import ( ) func TestEpochsExportGenesis(t *testing.T) { - app := testutil.Setup(t, false) + app := testutil.Setup(t) ctx := app.BaseApp.NewContext(false, tmproto.Header{}) chainStartTime := ctx.BlockTime() @@ -31,7 +31,7 @@ func TestEpochsExportGenesis(t *testing.T) { } func TestEpochsInitGenesis(t *testing.T) { - app := testutil.Setup(t, false) + app := testutil.Setup(t) ctx := app.BaseApp.NewContext(false, tmproto.Header{}) // On init genesis, default epochs information is set diff --git a/x/epochs/keeper/hooks.go b/x/epochs/keeper/hooks.go index f1d36ff17..5828d2ef6 100644 --- a/x/epochs/keeper/hooks.go +++ b/x/epochs/keeper/hooks.go @@ -6,17 +6,17 @@ import ( // AfterEpochEnd gets called at the end of the epoch, // end of epoch is the timestamp of first block produced after epoch duration. -func (k Keeper) AfterEpochEnd(ctx sdk.Context, identifier string, epochNumber int64) { +func (k Keeper) AfterEpochEnd(ctx sdk.Context, identifier string) { // Error is not handled as AfterEpochEnd Hooks use utils.ApplyFuncIfNoError() if k.hooks != nil { - _ = k.hooks.AfterEpochEnd(ctx, identifier, epochNumber) + _ = k.hooks.AfterEpochEnd(ctx, identifier) } } // BeforeEpochStart new epoch is next block of epoch end block -func (k Keeper) BeforeEpochStart(ctx sdk.Context, identifier string, epochNumber int64) { +func (k Keeper) BeforeEpochStart(ctx sdk.Context, identifier string) { // Error is not handled as BeforeEpochStart Hooks use utils.ApplyFuncIfNoError() if k.hooks != nil { - _ = k.hooks.BeforeEpochStart(ctx, identifier, epochNumber) + _ = k.hooks.BeforeEpochStart(ctx, identifier) } } diff --git a/x/epochs/module.go b/x/epochs/module.go index c6a4f8b4f..9bf259b38 100644 --- a/x/epochs/module.go +++ b/x/epochs/module.go @@ -84,11 +84,7 @@ func (AppModuleBasic) RegisterRESTRoutes(_ client.Context, _ *mux.Router) {} // RegisterGRPCGatewayRoutes registers the gRPC Gateway routes for the module. func (AppModuleBasic) RegisterGRPCGatewayRoutes(clientCtx client.Context, mux *runtime.ServeMux) { - types.RegisterQueryHandlerClient( - context.Background(), - mux, - types.NewQueryClient(clientCtx), - ) //nolint:errcheck + types.RegisterQueryHandlerClient(context.Background(), mux, types.NewQueryClient(clientCtx)) //nolint:errcheck } // GetTxCmd returns the capability module's root tx command. diff --git a/x/epochs/types/hooks.go b/x/epochs/types/hooks.go index 77b76bd11..d3cab5e61 100644 --- a/x/epochs/types/hooks.go +++ b/x/epochs/types/hooks.go @@ -10,9 +10,9 @@ import ( type EpochHooks interface { // the first block whose timestamp is after the duration is counted as the end of the epoch - AfterEpochEnd(ctx sdk.Context, epochIdentifier string, epochNumber int64) error + AfterEpochEnd(ctx sdk.Context, epochIdentifier string) error // new epoch is next block of epoch end block - BeforeEpochStart(ctx sdk.Context, epochIdentifier string, epochNumber int64) error + BeforeEpochStart(ctx sdk.Context, epochIdentifier string) error } var _ EpochHooks = MultiEpochHooks{} @@ -28,10 +28,9 @@ func NewMultiEpochHooks(hooks ...EpochHooks) MultiEpochHooks { func (h MultiEpochHooks) AfterEpochEnd( ctx sdk.Context, epochIdentifier string, - epochNumber int64, ) error { for i := range h { - panicCatchingEpochHook(ctx, h[i].AfterEpochEnd, epochIdentifier, epochNumber) + panicCatchingEpochHook(ctx, h[i].AfterEpochEnd, epochIdentifier) } return nil @@ -41,10 +40,9 @@ func (h MultiEpochHooks) AfterEpochEnd( func (h MultiEpochHooks) BeforeEpochStart( ctx sdk.Context, epochIdentifier string, - epochNumber int64, ) error { for i := range h { - panicCatchingEpochHook(ctx, h[i].BeforeEpochStart, epochIdentifier, epochNumber) + panicCatchingEpochHook(ctx, h[i].BeforeEpochStart, epochIdentifier) } return nil @@ -52,12 +50,11 @@ func (h MultiEpochHooks) BeforeEpochStart( func panicCatchingEpochHook( ctx sdk.Context, - hookFn func(ctx sdk.Context, epochIdentifier string, epochNumber int64) error, + hookFn func(ctx sdk.Context, epochIdentifier string) error, epochIdentifier string, - epochNumber int64, ) { wrappedHookFn := func(ctx sdk.Context) error { - return hookFn(ctx, epochIdentifier, epochNumber) + return hookFn(ctx, epochIdentifier) } // TODO: Thread info for which hook this is, may be dependent on larger hook system refactoring err := utils.ApplyFuncIfNoError(ctx, wrappedHookFn) diff --git a/x/epochs/types/hooks_test.go b/x/epochs/types/hooks_test.go index 8ea59a49e..84475d652 100644 --- a/x/epochs/types/hooks_test.go +++ b/x/epochs/types/hooks_test.go @@ -1,7 +1,6 @@ package types_test import ( - "strconv" "testing" "cosmossdk.io/errors" @@ -28,19 +27,17 @@ func (s *KeeperTestSuite) SetupTest() { ) } -func dummyAfterEpochEndEvent(epochIdentifier string, epochNumber int64) sdk.Event { +func dummyAfterEpochEndEvent(epochIdentifier string) sdk.Event { return sdk.NewEvent( "afterEpochEnd", sdk.NewAttribute("epochIdentifier", epochIdentifier), - sdk.NewAttribute("epochNumber", strconv.FormatInt(epochNumber, 10)), ) } -func dummyBeforeEpochStartEvent(epochIdentifier string, epochNumber int64) sdk.Event { +func dummyBeforeEpochStartEvent(epochIdentifier string) sdk.Event { return sdk.NewEvent( "beforeEpochStart", sdk.NewAttribute("epochIdentifier", epochIdentifier), - sdk.NewAttribute("epochNumber", strconv.FormatInt(epochNumber, 10)), ) } @@ -58,7 +55,6 @@ type dummyEpochHook struct { func (hook *dummyEpochHook) AfterEpochEnd( ctx sdk.Context, epochIdentifier string, - epochNumber int64, ) error { if hook.shouldPanic { panic("dummyEpochHook is panicking") @@ -67,7 +63,7 @@ func (hook *dummyEpochHook) AfterEpochEnd( return errDummy } hook.successCounter++ - ctx.EventManager().EmitEvent(dummyAfterEpochEndEvent(epochIdentifier, epochNumber)) + ctx.EventManager().EmitEvent(dummyAfterEpochEndEvent(epochIdentifier)) return nil } @@ -75,7 +71,6 @@ func (hook *dummyEpochHook) AfterEpochEnd( func (hook *dummyEpochHook) BeforeEpochStart( ctx sdk.Context, epochIdentifier string, - epochNumber int64, ) error { if hook.shouldPanic { panic("dummyEpochHook is panicking") @@ -84,7 +79,7 @@ func (hook *dummyEpochHook) BeforeEpochStart( return errDummy } hook.successCounter++ - ctx.EventManager().EmitEvent(dummyBeforeEpochStartEvent(epochIdentifier, epochNumber)) + ctx.EventManager().EmitEvent(dummyBeforeEpochStartEvent(epochIdentifier)) return nil } @@ -100,7 +95,7 @@ func (hook *dummyEpochHook) Clone() *dummyEpochHook { var _ types.EpochHooks = &dummyEpochHook{} -func (suite *KeeperTestSuite) TestHooksPanicRecovery() { +func (s *KeeperTestSuite) TestHooksPanicRecovery() { // panicHook := dummyEpochHook{shouldPanic: true} noPanicHook := dummyEpochHook{shouldPanic: false} // errorHook := dummyEpochHook{shouldError: true} @@ -120,7 +115,7 @@ func (suite *KeeperTestSuite) TestHooksPanicRecovery() { for tcIndex, tc := range tests { for epochActionSelector := 0; epochActionSelector < 2; epochActionSelector++ { - suite.SetupTest() + s.SetupTest() hookRefs := []types.EpochHooks{} for _, hook := range tc.hooks { @@ -129,37 +124,38 @@ func (suite *KeeperTestSuite) TestHooksPanicRecovery() { hooks := types.NewMultiEpochHooks(hookRefs...) - events := func(epochID string, epochNumber int64, dummyEvent func(id string, number int64) sdk.Event) sdk.Events { + events := func(epochID string, dummyEvent func(id string) sdk.Event) sdk.Events { evts := make(sdk.Events, tc.lenEvents) for i := 0; i < tc.lenEvents; i++ { - evts[i] = dummyEvent(epochID, epochNumber) + evts[i] = dummyEvent(epochID) } return evts } - suite.NotPanics(func() { + s.NotPanics(func() { if epochActionSelector == 0 { - hooks.BeforeEpochStart(suite.Ctx, "id", 0) - suite.Require().Equal( + err := hooks.BeforeEpochStart(s.Ctx, "id") + s.Require().NoError(err) + s.Require().Equal( events( "id", - 0, dummyBeforeEpochStartEvent, ), - suite.Ctx.EventManager().Events(), + s.Ctx.EventManager().Events(), "test case index %d, before epoch event check", tcIndex, ) } else if epochActionSelector == 1 { - hooks.AfterEpochEnd(suite.Ctx, "id", 0) - suite.Require().Equal(events("id", 0, dummyAfterEpochEndEvent), suite.Ctx.EventManager().Events(), + err := hooks.AfterEpochEnd(s.Ctx, "id") + s.Require().NoError(err) + s.Require().Equal(events("id", dummyAfterEpochEndEvent), s.Ctx.EventManager().Events(), "test case index %d, after epoch event check", tcIndex) } }) for i := 0; i < len(hooks); i++ { epochHook := hookRefs[i].(*dummyEpochHook) - suite.Require(). + s.Require(). Equal(tc.expectedCounterValues[i], epochHook.successCounter, "test case index %d", tcIndex) } } diff --git a/x/ibcswap/ibc_middleware.go b/x/ibcswap/ibc_middleware.go index 99d1fc143..4abad72ce 100644 --- a/x/ibcswap/ibc_middleware.go +++ b/x/ibcswap/ibc_middleware.go @@ -226,7 +226,7 @@ func (im IBCMiddleware) SendPacket( return im.keeper.SendPacket( ctx, chanCap, - sourceChannel, + sourcePort, sourceChannel, timeoutHeight, timeoutTimestamp, diff --git a/x/ibcswap/module.go b/x/ibcswap/module.go index 3d2d40198..8a20873b0 100644 --- a/x/ibcswap/module.go +++ b/x/ibcswap/module.go @@ -32,30 +32,30 @@ func (AppModuleBasic) Name() string { } // RegisterLegacyAminoCodec implements AppModuleBasic interface. -func (AppModuleBasic) RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) {} +func (AppModuleBasic) RegisterLegacyAminoCodec(_ *codec.LegacyAmino) {} // RegisterInterfaces registers module concrete types into protobuf Any. -func (AppModuleBasic) RegisterInterfaces(registry codectypes.InterfaceRegistry) {} +func (AppModuleBasic) RegisterInterfaces(_ codectypes.InterfaceRegistry) {} // DefaultGenesis returns default genesis state as raw bytes for the swap module. -func (AppModuleBasic) DefaultGenesis(cdc codec.JSONCodec) json.RawMessage { +func (AppModuleBasic) DefaultGenesis(_ codec.JSONCodec) json.RawMessage { return nil } // ValidateGenesis performs genesis state validation for the swap module. func (AppModuleBasic) ValidateGenesis( - cdc codec.JSONCodec, - config client.TxEncodingConfig, - bz json.RawMessage, + _ codec.JSONCodec, + _ client.TxEncodingConfig, + _ json.RawMessage, ) error { return nil } // RegisterRESTRoutes implements AppModuleBasic interface. -func (AppModuleBasic) RegisterRESTRoutes(clientCtx client.Context, rtr *mux.Router) {} +func (AppModuleBasic) RegisterRESTRoutes(_ client.Context, _ *mux.Router) {} // RegisterGRPCGatewayRoutes registers the gRPC Gateway routes for the swap module. -func (AppModuleBasic) RegisterGRPCGatewayRoutes(clientCtx client.Context, mux *runtime.ServeMux) {} +func (AppModuleBasic) RegisterGRPCGatewayRoutes(_ client.Context, _ *runtime.ServeMux) {} // GetTxCmd implements AppModuleBasic interface. func (AppModuleBasic) GetTxCmd() *cobra.Command { @@ -80,7 +80,7 @@ func NewAppModule(keeper keeper.Keeper) *AppModule { } // RegisterInvariants implements the AppModule interface. -func (AppModule) RegisterInvariants(ir sdk.InvariantRegistry) {} +func (AppModule) RegisterInvariants(_ sdk.InvariantRegistry) {} // QuerierRoute implements the AppModule interface. func (AppModule) QuerierRoute() string { @@ -88,20 +88,20 @@ func (AppModule) QuerierRoute() string { } // RegisterServices registers module services. -func (am AppModule) RegisterServices(cfg module.Configurator) {} +func (am AppModule) RegisterServices(_ module.Configurator) {} // InitGenesis performs genesis initialization for the ibc-router module. It returns // no validator updates. func (am AppModule) InitGenesis( - ctx sdk.Context, - cdc codec.JSONCodec, - data json.RawMessage, + _ sdk.Context, + _ codec.JSONCodec, + _ json.RawMessage, ) []abci.ValidatorUpdate { return []abci.ValidatorUpdate{} } // ExportGenesis returns the exported genesis state as raw bytes for the swap module. -func (am AppModule) ExportGenesis(ctx sdk.Context, cdc codec.JSONCodec) json.RawMessage { +func (am AppModule) ExportGenesis(_ sdk.Context, _ codec.JSONCodec) json.RawMessage { return nil } @@ -109,23 +109,23 @@ func (am AppModule) ExportGenesis(ctx sdk.Context, cdc codec.JSONCodec) json.Raw func (AppModule) ConsensusVersion() uint64 { return 1 } // BeginBlock implements the AppModule interface. -func (am AppModule) BeginBlock(ctx sdk.Context, req abci.RequestBeginBlock) {} +func (am AppModule) BeginBlock(_ sdk.Context, _ abci.RequestBeginBlock) {} // EndBlock implements the AppModule interface. -func (am AppModule) EndBlock(ctx sdk.Context, req abci.RequestEndBlock) []abci.ValidatorUpdate { +func (am AppModule) EndBlock(_ sdk.Context, _ abci.RequestEndBlock) []abci.ValidatorUpdate { return []abci.ValidatorUpdate{} } // GenerateGenesisState implements the AppModuleSimulation interface. -func (AppModule) GenerateGenesisState(simState *module.SimulationState) {} +func (AppModule) GenerateGenesisState(_ *module.SimulationState) {} // ProposalContents implements the AppModuleSimulation interface. -func (AppModule) ProposalContents(_ module.SimulationState) []simtypes.WeightedProposalContent { +func (AppModule) ProposalContents(_ module.SimulationState) []simtypes.WeightedProposalMsg { return nil } // RegisterStoreDecoder implements the AppModuleSimulation interface. -func (am AppModule) RegisterStoreDecoder(sdr sdk.StoreDecoderRegistry) {} +func (am AppModule) RegisterStoreDecoder(_ sdk.StoreDecoderRegistry) {} // WeightedOperations implements the AppModuleSimulation interface. func (am AppModule) WeightedOperations(_ module.SimulationState) []simtypes.WeightedOperation { diff --git a/x/incentives/client/cli/query.go b/x/incentives/client/cli/query.go index b2d7c2fe4..a922baffa 100644 --- a/x/incentives/client/cli/query.go +++ b/x/incentives/client/cli/query.go @@ -43,6 +43,7 @@ func GetCmdGetGaugeByID() (*dcli.QueryDescriptor, *types.GetGaugeByIDRequest) { }, &types.GetGaugeByIDRequest{} } +//nolint:unparam // we can't change return values since we need to match interface func parseGaugeStatus(arg string, _ *pflag.FlagSet) (any, dcli.FieldReadLocation, error) { gaugeStatusInt, ok := types.GaugeStatus_value[arg] if !ok { diff --git a/x/incentives/client/cli/query_test.go b/x/incentives/client/cli/query_test.go index 49d606075..2a60451d3 100644 --- a/x/incentives/client/cli/query_test.go +++ b/x/incentives/client/cli/query_test.go @@ -2,7 +2,6 @@ package cli_test import ( "testing" - "time" "cosmossdk.io/math" "github.com/stretchr/testify/suite" @@ -24,14 +23,13 @@ type QueryTestSuite struct { func (s *QueryTestSuite) SetupStake( addr sdk.AccAddress, coins sdk.Coins, - duration time.Duration, ) (stakeID uint64) { msgServer := keeper.NewMsgServerImpl(s.App.IncentivesKeeper) s.FundAcc(addr, coins) msgResponse, err := msgServer.Stake( sdk.WrapSDKContext(s.Ctx), - types.NewMsgSetupStake(addr, duration, coins), + types.NewMsgSetupStake(addr, coins), ) s.Require().NoError(err) @@ -47,86 +45,11 @@ func (s *QueryTestSuite) SetupSuite() { // set up stake with id = 1 addr := apptesting.SetupAddr(0) - s.SetupStake(addr, sdk.Coins{sdk.NewCoin(denom, math.NewInt(1000000))}, time.Hour*24) + s.SetupStake(addr, sdk.Coins{sdk.NewCoin(denom, math.NewInt(1000000))}) s.Commit() } -// func (s *QueryTestSuite) TestQueriesNeverAlterState() { -// testCases := []struct { -// name string -// query string -// input interface{} -// output interface{} -// }{ -// // { -// // "Query active gauges", -// // "/duality.incentives.Query/ActiveGauges", -// // &types.ActiveGetGaugesActiveUpcomingRequest{}, -// // &types.ActiveGetGaugesActiveUpcomingResponse{}, -// // }, -// // { -// // "Query active gauges per denom", -// // "/duality.incentives.Query/ActiveGaugesPerDenom", -// // &types.ActiveGaugesPerDenomRequest{Denom: "stake"}, -// // &types.ActiveGaugesPerDenomResponse{}, -// // }, -// // { -// // "Query gauge by id", -// // "/duality.incentives.Query/GetGaugeByID", -// // &types.GetGaugeByIDRequest{Id: 1}, -// // &types.GetGaugeByIDResponse{}, -// // }, -// // { -// // "Query all gauges", -// // "/duality.incentives.Query/Gauges", -// // &types.GetGaugesActiveUpcomingRequest{}, -// // &types.GetGaugesActiveUpcomingResponse{}, -// // }, -// // { -// // "Query stakeable durations", -// // "/duality.incentives.Query/StakeableDurations", -// // &types.QueryStakeableDurationsRequest{}, -// // &types.QueryStakeableDurationsResponse{}, -// // }, -// // { -// // "Query module to distibute coins", -// // "/duality.incentives.Query/GetModuleCoinsToBeDistributed", -// // &types.GetModuleCoinsToBeDistributedRequest{}, -// // &types.GetModuleCoinsToBeDistributedResponse{}, -// // }, -// // { -// // "Query reward estimate", -// // "/duality.incentives.Query/RewardsEst", -// // &types.RewardsEstRequest{Owner: s.TestAccs[0].String()}, -// // &types.RewardsEstResponse{}, -// // }, -// // { -// // "Query upcoming gauges", -// // "/duality.incentives.Query/UpcomingGauges", -// // &types.UpcomingGetGaugesActiveUpcomingRequest{}, -// // &types.UpcomingGetGaugesActiveUpcomingResponse{}, -// // }, -// // { -// // "Query upcoming gauges", -// // "/duality.incentives.Query/UpcomingGaugesPerDenom", -// // &types.UpcomingGaugesPerDenomRequest{Denom: "stake"}, -// // &types.UpcomingGaugesPerDenomResponse{}, -// // }, -// } - -// for _, tc := range testCases { -// tc := tc - -// s.Run(tc.name, func() { -// s.SetupSuite() -// err := s.QueryHelper.Invoke(gocontext.Background(), tc.query, tc.input, tc.output) -// s.Require().NoError(err) -// s.StateNotAltered() -// }) -// } -// } - func TestQueryTestSuite(t *testing.T) { suite.Run(t, new(QueryTestSuite)) } diff --git a/x/incentives/keeper/distribute.go b/x/incentives/keeper/distribute.go index 3990e0046..9ea79d702 100644 --- a/x/incentives/keeper/distribute.go +++ b/x/incentives/keeper/distribute.go @@ -80,7 +80,9 @@ func (k Keeper) Distribute(ctx sdk.Context, gauges types.Gauges) (types.Distribu } else { accHistory = NewAccountHistory(addr, rewards) } - k.SetAccountHistory(ctx, accHistory) + if err := k.SetAccountHistory(ctx, accHistory); err != nil { + return nil, err + } // Emit events ctx.EventManager().EmitEvents(sdk.Events{ diff --git a/x/incentives/keeper/distributor_test.go b/x/incentives/keeper/distributor_test.go index 36e59528e..a924902b0 100644 --- a/x/incentives/keeper/distributor_test.go +++ b/x/incentives/keeper/distributor_test.go @@ -29,13 +29,13 @@ func NewMockKeeper(keeper DistributorKeeper, stakes types.Stakes) MockKeeper { } } -func (k MockKeeper) ValueForShares(_ sdk.Context, coin sdk.Coin, tick int64) (math.Int, error) { +func (k MockKeeper) ValueForShares(_ sdk.Context, coin sdk.Coin, _ int64) (math.Int, error) { return coin.Amount.Mul(math.NewInt(2)), nil } func (k MockKeeper) GetStakesByQueryCondition( _ sdk.Context, - distrTo *types.QueryCondition, + _ *types.QueryCondition, ) types.Stakes { return k.stakes } @@ -45,7 +45,7 @@ func (k MockKeeper) StakeCoinsPassingQueryCondition(ctx sdk.Context, stake *type } func TestDistributor(t *testing.T) { - app := testutil.Setup(t, false) + app := testutil.Setup(t) ctx := app.BaseApp.NewContext( false, tmtypes.Header{Height: 1, ChainID: "duality-1", Time: time.Now().UTC()}, @@ -73,11 +73,14 @@ func TestDistributor(t *testing.T) { rewardedDenom := rewardPool.GetPoolDenom() nonRewardPool, _ := app.DexKeeper.GetOrInitPool(ctx, &dextypes.PairID{Token0: "TokenA", Token1: "TokenB"}, 12, 1) nonRewardedDenom := nonRewardPool.GetPoolDenom() + addr1 := sdk.AccAddress("addr1") + addr2 := sdk.AccAddress("addr2") + addr3 := sdk.AccAddress("addr3") allStakes := types.Stakes{ - {1, "addr1", ctx.BlockTime(), sdk.Coins{sdk.NewCoin(rewardedDenom, math.NewInt(50))}, 0}, - {2, "addr2", ctx.BlockTime(), sdk.Coins{sdk.NewCoin(rewardedDenom, math.NewInt(25))}, 0}, - {3, "addr2", ctx.BlockTime(), sdk.Coins{sdk.NewCoin(rewardedDenom, math.NewInt(25))}, 0}, - {4, "addr3", ctx.BlockTime(), sdk.Coins{sdk.NewCoin(nonRewardedDenom, math.NewInt(50))}, 0}, + types.NewStake(1, addr1, sdk.Coins{sdk.NewCoin(rewardedDenom, math.NewInt(50))}, ctx.BlockTime(), 0), + types.NewStake(2, addr2, sdk.Coins{sdk.NewCoin(rewardedDenom, math.NewInt(25))}, ctx.BlockTime(), 0), + types.NewStake(3, addr2, sdk.Coins{sdk.NewCoin(rewardedDenom, math.NewInt(25))}, ctx.BlockTime(), 0), + types.NewStake(4, addr3, sdk.Coins{sdk.NewCoin(nonRewardedDenom, math.NewInt(50))}, ctx.BlockTime(), 0), } distributor := NewDistributor(NewMockKeeper(app.IncentivesKeeper, allStakes)) @@ -101,8 +104,8 @@ func TestDistributor(t *testing.T) { timeOffset: 0, filterStakes: allStakes, expected: types.DistributionSpec{ - "addr1": sdk.Coins{sdk.NewCoin("coin1", math.NewInt(5))}, - "addr2": sdk.Coins{sdk.NewCoin("coin1", math.NewInt(4))}, + addr1.String(): sdk.Coins{sdk.NewCoin("coin1", math.NewInt(5))}, + addr2.String(): sdk.Coins{sdk.NewCoin("coin1", math.NewInt(4))}, }, expectedErr: nil, }, @@ -111,7 +114,7 @@ func TestDistributor(t *testing.T) { timeOffset: 0, filterStakes: types.Stakes{allStakes[0]}, expected: types.DistributionSpec{ - "addr1": sdk.Coins{sdk.NewCoin("coin1", math.NewInt(5))}, + addr1.String(): sdk.Coins{sdk.NewCoin("coin1", math.NewInt(5))}, }, expectedErr: nil, }, diff --git a/x/incentives/keeper/gas_test.go b/x/incentives/keeper/gas_test.go index 70d052fa7..c52c2abcf 100644 --- a/x/incentives/keeper/gas_test.go +++ b/x/incentives/keeper/gas_test.go @@ -1,13 +1,13 @@ package keeper_test -import ( - sdk "github.com/cosmos/cosmos-sdk/types" -) +// import ( +// sdk "github.com/cosmos/cosmos-sdk/types" +// ) -var ( - defaultAddr sdk.AccAddress = sdk.AccAddress([]byte("addr1---------------")) - defaultCoins sdk.Coins = sdk.Coins{sdk.NewInt64Coin("stake", 10)} -) +// var ( +// defaultAddr sdk.AccAddress = sdk.AccAddress([]byte("addr1---------------")) +// defaultCoins sdk.Coins = sdk.Coins{sdk.NewInt64Coin("stake", 10)} +// ) // func (suite *KeeperTestSuite) measureStakeGas(addr sdk.AccAddress, coins sdk.Coins, dur time.Duration) uint64 { // // fundAccount outside of gas measurement diff --git a/x/incentives/keeper/gauge.go b/x/incentives/keeper/gauge.go index 3ffa3c7ca..180b3d101 100644 --- a/x/incentives/keeper/gauge.go +++ b/x/incentives/keeper/gauge.go @@ -56,7 +56,8 @@ func (k Keeper) getGaugesFromIterator(ctx sdk.Context, iterator db.Iterator) typ } func (k Keeper) setGaugeRefs(ctx sdk.Context, gauge *types.Gauge) error { - if gauge.IsUpcomingGauge(ctx.BlockTime()) { + switch { + case gauge.IsUpcomingGauge(ctx.BlockTime()): if err := k.addRefByKey(ctx, types.CombineKeys(types.KeyPrefixGaugeIndexUpcoming, types.GetTimeKey(gauge.StartTime)), gauge.Id); err != nil { return err } @@ -68,7 +69,7 @@ func (k Keeper) setGaugeRefs(ctx sdk.Context, gauge *types.Gauge) error { if err != nil { return err } - } else if gauge.IsActiveGauge(ctx.BlockTime()) { + case gauge.IsActiveGauge(ctx.BlockTime()): err := k.addRefByKey(ctx, types.CombineKeys(types.KeyPrefixGaugeIndexActive, types.GetTimeKey(gauge.StartTime)), gauge.Id) if err != nil { return err @@ -77,7 +78,7 @@ func (k Keeper) setGaugeRefs(ctx sdk.Context, gauge *types.Gauge) error { if err != nil { return err } - } else { // finished gauge + default: // finished gauge err := k.addRefByKey(ctx, types.CombineKeys(types.KeyPrefixGaugeIndexFinished, types.GetTimeKey(gauge.StartTime)), gauge.Id) if err != nil { return err @@ -213,7 +214,7 @@ func (k Keeper) GetGaugeQualifyingValue(ctx sdk.Context, gaugeID uint64) (uint64 if err := proto.Unmarshal(bz, &gauge); err != nil { return 0, err } - var value uint64 = 0 + var value uint64 stakes := k.GetStakesByQueryCondition(ctx, &gauge.DistributeTo) for _, stake := range stakes { stakeCoins := k.StakeCoinsPassingQueryCondition(ctx, stake, gauge.DistributeTo) @@ -259,10 +260,9 @@ func (k Keeper) moveUpcomingGaugeToActiveGauge(ctx sdk.Context, gauge *types.Gau if err := k.deleteRefByKey(ctx, types.CombineKeys(types.KeyPrefixGaugeIndexUpcoming, timeKey), gauge.Id); err != nil { return err } - if err := k.addRefByKey(ctx, types.CombineKeys(types.KeyPrefixGaugeIndexActive, timeKey), gauge.Id); err != nil { - return err - } - return nil + + err := k.addRefByKey(ctx, types.CombineKeys(types.KeyPrefixGaugeIndexActive, timeKey), gauge.Id) + return err } // moveActiveGaugeToFinishedGauge moves a gauge that has completed its distribution from an active to a finished status. diff --git a/x/incentives/keeper/gauge_test.go b/x/incentives/keeper/gauge_test.go index 9258f7954..11d96f27c 100644 --- a/x/incentives/keeper/gauge_test.go +++ b/x/incentives/keeper/gauge_test.go @@ -44,7 +44,8 @@ func (suite *KeeperTestSuite) TestGaugeLifecycle() { }) // assert that the gauge is not in effect yet by triggering an epoch end before gauge start - suite.App.IncentivesKeeper.AfterEpochEnd(suite.Ctx, "day", 1) + err := suite.App.IncentivesKeeper.AfterEpochEnd(suite.Ctx, "day") + require.NoError(suite.T(), err) // no distribution yet require.Equal( suite.T(), @@ -58,7 +59,8 @@ func (suite *KeeperTestSuite) TestGaugeLifecycle() { // advance time to epoch at or after the gauge starts, triggering distribution suite.Ctx = suite.Ctx.WithBlockTime(suite.Ctx.BlockTime().Add(24 * time.Hour)) - suite.App.IncentivesKeeper.AfterEpochEnd(suite.Ctx, "day", 2) + err = suite.App.IncentivesKeeper.AfterEpochEnd(suite.Ctx, "day") + require.NoError(suite.T(), err) // assert that the gauge distributed require.Equal( @@ -73,7 +75,8 @@ func (suite *KeeperTestSuite) TestGaugeLifecycle() { // advance to next epoch suite.Ctx = suite.Ctx.WithBlockTime(suite.Ctx.BlockTime().Add(24 * time.Hour)) - suite.App.IncentivesKeeper.AfterEpochEnd(suite.Ctx, "day", 3) + err = suite.App.IncentivesKeeper.AfterEpochEnd(suite.Ctx, "day") + require.NoError(suite.T(), err) // assert new distribution require.Equal( @@ -88,7 +91,8 @@ func (suite *KeeperTestSuite) TestGaugeLifecycle() { // repeat advancing to next epoch until gauge should be finished suite.Ctx = suite.Ctx.WithBlockTime(suite.Ctx.BlockTime().Add(24 * time.Hour)) - suite.App.IncentivesKeeper.AfterEpochEnd(suite.Ctx, "day", 4) + err = suite.App.IncentivesKeeper.AfterEpochEnd(suite.Ctx, "day") + require.NoError(suite.T(), err) // assert no additional distribution from finished gauge require.Equal( @@ -107,7 +111,8 @@ func (suite *KeeperTestSuite) TestGaugeLimit() { // We set the gauge limit to 20. On the 21st gauge, we should encounter an error. params := suite.App.IncentivesKeeper.GetParams(suite.Ctx) params.MaxGauges = 20 - suite.App.IncentivesKeeper.SetParams(suite.Ctx, params) + err := suite.App.IncentivesKeeper.SetParams(suite.Ctx, params) + suite.Require().NoError(err) addr0 := suite.SetupAddr(0) @@ -144,7 +149,7 @@ func (suite *KeeperTestSuite) TestGaugeLimit() { suite.FundAcc(addr, sdk.NewCoins(sdk.NewInt64Coin("foocoin", 10))) // create gauge - _, err := suite.App.IncentivesKeeper.CreateGauge( + _, err = suite.App.IncentivesKeeper.CreateGauge( suite.Ctx, false, addr, diff --git a/x/incentives/keeper/genesis.go b/x/incentives/keeper/genesis.go index 1943cd7a1..710671120 100644 --- a/x/incentives/keeper/genesis.go +++ b/x/incentives/keeper/genesis.go @@ -10,7 +10,9 @@ import ( // InitGenesis initializes the incentives module's state from a provided genesis state. func (k Keeper) InitGenesis(ctx sdk.Context, genState types.GenesisState) { - k.SetParams(ctx, genState.Params) + if err := k.SetParams(ctx, genState.Params); err != nil { + panic(err) + } if err := k.InitializeAllStakes(ctx, genState.Stakes); err != nil { panic(err) } diff --git a/x/incentives/keeper/hooks.go b/x/incentives/keeper/hooks.go index 4fd1c92fa..6d8fb1911 100644 --- a/x/incentives/keeper/hooks.go +++ b/x/incentives/keeper/hooks.go @@ -7,12 +7,12 @@ import ( ) // BeforeEpochStart is the epoch start hook. -func (k Keeper) BeforeEpochStart(ctx sdk.Context, epochIdentifier string, epochNumber int64) error { +func (k Keeper) BeforeEpochStart(_ sdk.Context, _ string) error { return nil } // AfterEpochEnd is the epoch end hook. -func (k Keeper) AfterEpochEnd(ctx sdk.Context, epochIdentifier string, epochNumber int64) error { +func (k Keeper) AfterEpochEnd(ctx sdk.Context, epochIdentifier string) error { params := k.GetParams(ctx) if epochIdentifier == params.DistrEpochIdentifier { // begin distribution if it's start time @@ -50,11 +50,11 @@ func (k Keeper) Hooks() Hooks { } // BeforeEpochStart is the epoch start hook. -func (h Hooks) BeforeEpochStart(ctx sdk.Context, epochIdentifier string, epochNumber int64) error { - return h.k.BeforeEpochStart(ctx, epochIdentifier, epochNumber) +func (h Hooks) BeforeEpochStart(ctx sdk.Context, epochIdentifier string) error { + return h.k.BeforeEpochStart(ctx, epochIdentifier) } // AfterEpochEnd is the epoch end hook. -func (h Hooks) AfterEpochEnd(ctx sdk.Context, epochIdentifier string, epochNumber int64) error { - return h.k.AfterEpochEnd(ctx, epochIdentifier, epochNumber) +func (h Hooks) AfterEpochEnd(ctx sdk.Context, epochIdentifier string) error { + return h.k.AfterEpochEnd(ctx, epochIdentifier) } diff --git a/x/incentives/keeper/msg_server.go b/x/incentives/keeper/msg_server.go index 8905b0468..c0feb7306 100644 --- a/x/incentives/keeper/msg_server.go +++ b/x/incentives/keeper/msg_server.go @@ -5,7 +5,6 @@ import ( "fmt" "strconv" - "cosmossdk.io/errors" "github.com/neutron-org/neutron/x/incentives/types" sdkerrors "cosmossdk.io/errors" @@ -33,7 +32,7 @@ func (server msgServer) CreateGauge( msg *types.MsgCreateGauge, ) (*types.MsgCreateGaugeResponse, error) { if server.keeper.authority != msg.Owner { - return nil, errors.Wrapf( + return nil, sdkerrors.Wrapf( types.ErrInvalidSigner, "invalid authority; expected %s, got %s", server.keeper.authority, @@ -188,7 +187,7 @@ func (server msgServer) UpdateParams(goCtx context.Context, req *types.MsgUpdate } authority := server.keeper.GetAuthority() if authority != req.Authority { - return nil, errors.Wrapf(types.ErrInvalidRequest, "invalid authority; expected %s, got %s", authority, req.Authority) + return nil, sdkerrors.Wrapf(types.ErrInvalidRequest, "invalid authority; expected %s, got %s", authority, req.Authority) } ctx := sdk.UnwrapSDKContext(goCtx) diff --git a/x/incentives/keeper/query_server.go b/x/incentives/keeper/query_server.go index 8b13d9e72..4d2426ca8 100644 --- a/x/incentives/keeper/query_server.go +++ b/x/incentives/keeper/query_server.go @@ -28,7 +28,7 @@ func NewQueryServer(k *Keeper) QueryServer { func (q QueryServer) GetModuleStatus( goCtx context.Context, - req *types.GetModuleStatusRequest, + _ *types.GetModuleStatusRequest, ) (*types.GetModuleStatusResponse, error) { ctx := sdk.UnwrapSDKContext(goCtx) return &types.GetModuleStatusResponse{ diff --git a/x/incentives/keeper/stake_test.go b/x/incentives/keeper/stake_test.go index db858ff8f..00da937c8 100644 --- a/x/incentives/keeper/stake_test.go +++ b/x/incentives/keeper/stake_test.go @@ -30,7 +30,8 @@ func (suite *KeeperTestSuite) TestStakeLifecycle() { suite.Require().NotNil(retrievedStake) // unstake the full amount - suite.App.IncentivesKeeper.Unstake(suite.Ctx, stake, sdk.Coins{}) + _, err = suite.App.IncentivesKeeper.Unstake(suite.Ctx, stake, sdk.Coins{}) + suite.Require().NoError(err) balances := suite.App.BankKeeper.GetAllBalances(suite.Ctx, addr0) suite.Require().Equal(sdk.NewCoins(sdk.NewInt64Coin(suite.LPDenom0, 20)), balances) _, err = suite.App.IncentivesKeeper.GetStakeByID(suite.Ctx, stake.ID) @@ -67,7 +68,8 @@ func (suite *KeeperTestSuite) TestMultipleStakeLifecycle() { suite.Require().NotNil(retrievedStake) // unstake the full amount - suite.App.IncentivesKeeper.Unstake(suite.Ctx, stake, sdk.Coins{}) + _, err = suite.App.IncentivesKeeper.Unstake(suite.Ctx, stake, sdk.Coins{}) + suite.Require().NoError(err) balances := suite.App.BankKeeper.GetAllBalances(suite.Ctx, addr0) suite.Require().Equal( sdk.NewCoins( diff --git a/x/incentives/keeper/utils_test.go b/x/incentives/keeper/utils_test.go index 32b72b3fd..6a63d401e 100644 --- a/x/incentives/keeper/utils_test.go +++ b/x/incentives/keeper/utils_test.go @@ -68,7 +68,7 @@ func TestRemoveValue(t *testing.T) { func TestStakeRefKeys(t *testing.T) { addr1 := sdk.AccAddress([]byte("addr1---------------")) - app := testutil.Setup(t, false) + app := testutil.Setup(t) ctx := app.BaseApp.NewContext(false, tmproto.Header{}) pool1, err := app.DexKeeper.InitPool(ctx, &dextypes.PairID{Token0: "TokenA", Token1: "TokenB"}, 0, 1) @@ -106,11 +106,13 @@ func TestStakeRefKeys(t *testing.T) { // not empty address and 1 coin stake3 := types.NewStake(1, addr1, sdk.Coins{sdk.NewInt64Coin(denom1, 10)}, time.Now(), 10) keys3, err := app.IncentivesKeeper.GetStakeRefKeys(ctx, stake3) + require.NoError(t, err) require.Len(t, keys3, 6) // not empty address and empty coin stake4 := types.NewStake(1, addr1, sdk.Coins{sdk.NewInt64Coin(denom1, 10)}, time.Now(), 10) keys4, err := app.IncentivesKeeper.GetStakeRefKeys(ctx, stake4) + require.NoError(t, err) require.Len(t, keys4, 6) // not empty address and 2 coins @@ -122,5 +124,6 @@ func TestStakeRefKeys(t *testing.T) { 10, ) keys5, err := app.IncentivesKeeper.GetStakeRefKeys(ctx, stake5) + require.NoError(t, err) require.Len(t, keys5, 10) } diff --git a/x/incentives/module.go b/x/incentives/module.go index 6340f41a2..9fdfc6439 100644 --- a/x/incentives/module.go +++ b/x/incentives/module.go @@ -22,8 +22,6 @@ import ( cdctypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/cosmos/cosmos-sdk/x/gov/simulation" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/neutron-org/neutron/x/incentives/client/cli" @@ -71,7 +69,7 @@ func (AppModuleBasic) DefaultGenesis(cdc codec.JSONCodec) json.RawMessage { // ValidateGenesis performs genesis state validation for the module. func (AppModuleBasic) ValidateGenesis( cdc codec.JSONCodec, - config client.TxEncodingConfig, + _ client.TxEncodingConfig, bz json.RawMessage, ) error { var genState types.GenesisState @@ -82,7 +80,7 @@ func (AppModuleBasic) ValidateGenesis( } // RegisterRESTRoutes registers the module's REST service handlers. -func (AppModuleBasic) RegisterRESTRoutes(clientCtx client.Context, rtr *mux.Router) { +func (AppModuleBasic) RegisterRESTRoutes(_ client.Context, _ *mux.Router) { } // RegisterGRPCGatewayRoutes registers the gRPC Gateway routes for the module. @@ -178,35 +176,5 @@ func (am AppModule) EndBlock(_ sdk.Context, _ abci.RequestEndBlock) []abci.Valid return []abci.ValidatorUpdate{} } -// AppModuleSimulation functions - -// GenerateGenesisState creates a randomized GenState of the incentives module. -func (AppModule) GenerateGenesisState(simState *module.SimulationState) { - simulation.RandomizedGenState(simState) -} - -// ProposalContents returns nil for governance proposals contents. -// Should eventually be deleted in a future update. -func (AppModule) ProposalContents( - simState module.SimulationState, -) []simtypes.WeightedProposalContent { - return nil -} - -// RegisterStoreDecoder has an unknown purpose. Should eventually be deleted in a future update. -func (am AppModule) RegisterStoreDecoder(sdr sdk.StoreDecoderRegistry) { -} - -// WeightedOperations returns the all the module's operations with their respective weights. -// func (am AppModule) WeightedOperations(simState module.SimulationState) []simtypes.WeightedOperation { -// // return simulation.WeightedOperations( -// // simState.AppParams, simState.Cdc, -// // am.accountKeeper, am.bankKeeper, am.epochKeeper, am.keeper, -// // ) -// // simtypes.NewMsgBasedAction("stake tokens", am.keeper, simulation.RandomMsgStakeTokens), -// // simtypes.NewMsgBasedAction("unstake all tokens", am.keeper, simulation.RandomMsgBeginUnstakingAll), -// // simtypes.NewMsgBasedAction("unstake stake", am.keeper, simulation.RandomMsgBeginUnstaking), -// } - // ConsensusVersion implements AppModule/ConsensusVersion. func (AppModule) ConsensusVersion() uint64 { return 1 } diff --git a/x/incentives/module_simulation.go b/x/incentives/module_simulation.go new file mode 100644 index 000000000..c79664124 --- /dev/null +++ b/x/incentives/module_simulation.go @@ -0,0 +1,33 @@ +package incentives + +import ( + "github.com/CosmWasm/wasmd/x/wasm/simulation" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/types/module" + simtypes "github.com/cosmos/cosmos-sdk/types/simulation" +) + +// AppModuleSimulation functions + +// GenerateGenesisState creates a randomized GenState of the incentives module. +func (AppModule) GenerateGenesisState(simState *module.SimulationState) { + simulation.RandomizedGenState(simState) +} + +// ProposalContents returns nil for governance proposals contents. +// Should eventually be deleted in a future update. +func (AppModule) ProposalContents( + _ module.SimulationState, +) []simtypes.WeightedProposalMsg { + return nil +} + +// RegisterStoreDecoder has an unknown purpose. Should eventually be deleted in a future update. +func (am AppModule) RegisterStoreDecoder(_ sdk.StoreDecoderRegistry) { +} + +// WeightedOperations returns the all the module's operations with their respective weights. +func (am AppModule) WeightedOperations(_ module.SimulationState) []simtypes.WeightedOperation { + operations := make([]simtypes.WeightedOperation, 0) + return operations +} diff --git a/x/incentives/types/hooks.go b/x/incentives/types/hooks.go index 3c95c2110..bcb37bbc7 100644 --- a/x/incentives/types/hooks.go +++ b/x/incentives/types/hooks.go @@ -7,10 +7,10 @@ import ( ) type IncentiveHooks interface { - AfterCreateGauge(ctx sdk.Context, gaugeId uint64) - AfterAddToGauge(ctx sdk.Context, gaugeId uint64) - AfterStartDistribution(ctx sdk.Context, gaugeId uint64) - AfterFinishDistribution(ctx sdk.Context, gaugeId uint64) + AfterCreateGauge(ctx sdk.Context, gaugeID uint64) + AfterAddToGauge(ctx sdk.Context, gaugeID uint64) + AfterStartDistribution(ctx sdk.Context, gaugeID uint64) + AfterFinishDistribution(ctx sdk.Context, gaugeID uint64) AfterEpochDistribution(ctx sdk.Context) AfterAddTokensToStake(ctx sdk.Context, address sdk.AccAddress, stakeID uint64, amount sdk.Coins) OnTokenStaked(ctx sdk.Context, address sdk.AccAddress, stakeID uint64, amount sdk.Coins, unstakeTime time.Time) diff --git a/x/incentives/types/msgs.go b/x/incentives/types/msgs.go index 6b710339a..92e5e49fa 100644 --- a/x/incentives/types/msgs.go +++ b/x/incentives/types/msgs.go @@ -4,7 +4,6 @@ import ( "fmt" "time" - errorsmod "cosmossdk.io/errors" sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" dextypes "github.com/neutron-org/neutron/x/dex/types" @@ -153,7 +152,7 @@ func (m MsgAddToGauge) GetSigners() []sdk.AccAddress { var _ sdk.Msg = &MsgStake{} // NewMsgStakeTokens creates a message to stake tokens. -func NewMsgSetupStake(owner sdk.AccAddress, duration time.Duration, coins sdk.Coins) *MsgStake { +func NewMsgSetupStake(owner sdk.AccAddress, coins sdk.Coins) *MsgStake { return &MsgStake{ Owner: owner.String(), Coins: coins, @@ -252,10 +251,9 @@ func (msg *MsgUpdateParams) GetSignBytes() []byte { func (msg *MsgUpdateParams) ValidateBasic() error { if _, err := sdk.AccAddressFromBech32(msg.Authority); err != nil { - return errorsmod.Wrap(err, "authority is invalid") + return sdkerrors.Wrap(err, "authority is invalid") } - if err := msg.Params.Validate(); err != nil { - return err - } - return nil + + err := msg.Params.Validate() + return err } diff --git a/x/incentives/types/params.go b/x/incentives/types/params.go index 560ec9b67..51747339d 100644 --- a/x/incentives/types/params.go +++ b/x/incentives/types/params.go @@ -35,10 +35,7 @@ func DefaultParams() Params { // Validate checks that the incentives module parameters are valid. func (p Params) Validate() error { - if err := epochtypes.ValidateEpochIdentifierInterface(p.DistrEpochIdentifier); err != nil { - return err - } - return nil + return epochtypes.ValidateEpochIdentifierInterface(p.DistrEpochIdentifier) } // ParamSetPairs takes the parameter struct and associates the paramsubspace key and field of the parameters as a KVStore. diff --git a/x/incentives/types/tx.pb.go b/x/incentives/types/tx.pb.go index 6dba41aa9..bb30ac56e 100644 --- a/x/incentives/types/tx.pb.go +++ b/x/incentives/types/tx.pb.go @@ -185,7 +185,7 @@ type MsgAddToGauge struct { // owner is the gauge owner's address Owner string `protobuf:"bytes,1,opt,name=owner,proto3" json:"owner,omitempty" yaml:"owner"` // gauge_id is the ID of gauge that rewards are getting added to - GaugeId uint64 `protobuf:"varint,2,opt,name=gauge_id,json=gaugeId,proto3" json:"gauge_id,omitempty"` + GaugeId uint64 `protobuf:"varint,2,opt,name=gauge_id,json=gaugeID,proto3" json:"gauge_id,omitempty"` // rewards are the coin(s) to add to gauge Rewards github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,3,rep,name=rewards,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"rewards"` } From f0c7447bd8129df9e3d1021fd6552f436c3407b8 Mon Sep 17 00:00:00 2001 From: Julian Compagni Portis Date: Tue, 17 Oct 2023 16:45:27 -0400 Subject: [PATCH 185/307] General Test cleanup cleanup KeeperTestHelper and re-use for dex testing centralize event testing assertions rename test suite to be more informative --- testutil/apptesting/events.go | 36 ++ testutil/apptesting/test_suite.go | 4 +- testutil/dex/keeper/dex.go | 36 -- x/dex/keeper/deposit_record_test.go | 4 +- ...grpc_query_estimate_multi_hop_swap_test.go | 19 +- .../integration_cancellimitorder_test.go | 34 +- .../integration_deposit_autoswap_unit_test.go | 6 +- .../integration_deposit_doublesided_test.go | 22 +- .../keeper/integration_deposit_multi_test.go | 4 +- .../integration_deposit_singlesided_test.go | 40 +- x/dex/keeper/integration_multihopswap_test.go | 21 +- .../integration_placelimitorder_test.go | 84 ++-- .../keeper/integration_withdraw_multi_test.go | 4 +- x/dex/keeper/integration_withdraw_test.go | 20 +- .../keeper/integration_withdrawfilled_test.go | 18 +- x/dex/keeper/limit_order_expiration_test.go | 110 ++--- x/dex/keeper/limit_order_tranche_user_test.go | 4 +- x/dex/keeper/liquidity_test.go | 216 ++++----- x/dex/keeper/msg_server_test.go | 455 +++++++++--------- x/epochs/keeper/abci_test.go | 2 +- x/epochs/keeper/epoch_test.go | 6 +- x/epochs/keeper/grpc_query_test.go | 2 +- x/epochs/keeper/keeper_test.go | 8 +- x/incentives/keeper/distribute_test.go | 4 +- x/incentives/keeper/gauge_test.go | 6 +- x/incentives/keeper/genesis_test.go | 2 +- x/incentives/keeper/keeper_test.go | 8 +- x/incentives/keeper/query_server_test.go | 4 +- x/incentives/keeper/stake_test.go | 6 +- x/incentives/keeper/suite_test.go | 12 +- 30 files changed, 556 insertions(+), 641 deletions(-) diff --git a/testutil/apptesting/events.go b/testutil/apptesting/events.go index 55e2fa7be..f06410fc2 100644 --- a/testutil/apptesting/events.go +++ b/testutil/apptesting/events.go @@ -39,3 +39,39 @@ func (s *KeeperTestHelper) ExtractAttributes(event sdk.Event) map[string]string return attrs } + +func (s *KeeperTestHelper) AssertEventValueEmitted(eventValue, message string) { + allEvents := s.Ctx.EventManager().Events() + for _, event := range allEvents { + for _, attr := range event.Attributes { + if attr.Value == eventValue { + return + } + } + } + s.Fail(message) +} + +func (s *KeeperTestHelper) AssertNEventValuesEmitted(eventValue string, nEvents int) { + emissions := 0 + allEvents := s.Ctx.EventManager().Events() + for _, event := range allEvents { + for _, attr := range event.Attributes { + if attr.Value == eventValue { + emissions++ + } + } + } + s.Equal(nEvents, emissions, "Expected %v events, got %v", nEvents, emissions) +} + +func (s *KeeperTestHelper) AssertEventValueNotEmitted(eventValue, message string) { + allEvents := s.Ctx.EventManager().Events() + if len(allEvents) != 0 { + for _, attr := range allEvents[len(allEvents)-1].Attributes { + if attr.Value == eventValue { + s.Fail(message) + } + } + } +} diff --git a/testutil/apptesting/test_suite.go b/testutil/apptesting/test_suite.go index 5ddb5dfb8..4f885b495 100644 --- a/testutil/apptesting/test_suite.go +++ b/testutil/apptesting/test_suite.go @@ -35,10 +35,12 @@ type KeeperTestHelper struct { // Setup sets up basic environment for suite (App, Ctx, and test accounts) func (s *KeeperTestHelper) Setup() { s.App = testutil.Setup(s.T()) - s.Ctx = s.App.BaseApp.NewContext( + ctx := s.App.BaseApp.NewContext( false, tmtypes.Header{Height: 1, ChainID: "neutron-1", Time: time.Now().UTC()}, ) + s.Ctx = ctx.WithBlockGasMeter(sdk.NewInfiniteGasMeter()) + s.GoCtx = sdk.WrapSDKContext(s.Ctx) s.QueryHelper = &baseapp.QueryServiceTestHelper{ GRPCQueryRouter: s.App.GRPCQueryRouter(), diff --git a/testutil/dex/keeper/dex.go b/testutil/dex/keeper/dex.go index 6f0586b92..275d46a85 100644 --- a/testutil/dex/keeper/dex.go +++ b/testutil/dex/keeper/dex.go @@ -48,39 +48,3 @@ func DexKeeper(t testing.TB) (*keeper.Keeper, sdk.Context) { return k, ctx } - -func AssertEventEmitted(t *testing.T, ctx sdk.Context, eventValue, message string) { - allEvents := ctx.EventManager().Events() - for _, event := range allEvents { - for _, attr := range event.Attributes { - if attr.Value == eventValue { - return - } - } - } - require.Fail(t, message) -} - -func AssertNEventsEmitted(t *testing.T, ctx sdk.Context, eventValue string, nEvents int) { - emissions := 0 - allEvents := ctx.EventManager().Events() - for _, event := range allEvents { - for _, attr := range event.Attributes { - if attr.Value == eventValue { - emissions++ - } - } - } - require.Equal(t, nEvents, emissions, "Expected %v events, got %v", nEvents, emissions) -} - -func AssertEventNotEmitted(t *testing.T, ctx sdk.Context, eventValue, message string) { - allEvents := ctx.EventManager().Events() - if len(allEvents) != 0 { - for _, attr := range allEvents[len(allEvents)-1].Attributes { - if attr.Value == eventValue { - require.Fail(t, message) - } - } - } -} diff --git a/x/dex/keeper/deposit_record_test.go b/x/dex/keeper/deposit_record_test.go index 864b5b111..4ed8526f2 100644 --- a/x/dex/keeper/deposit_record_test.go +++ b/x/dex/keeper/deposit_record_test.go @@ -5,7 +5,7 @@ import ( "github.com/neutron-org/neutron/x/dex/types" ) -func (s *MsgServerTestSuite) TestGetAllDeposits() { +func (s *DexTestSuite) TestGetAllDeposits() { s.fundAliceBalances(20, 20) // GIVEN Alice Deposits 3 positions and withdraws the first s.aliceDeposits( @@ -36,7 +36,7 @@ func (s *MsgServerTestSuite) TestGetAllDeposits() { ) // THEN GetAllDeposits returns the two remaining LP positions - depositList := s.app.DexKeeper.GetAllDepositsForAddress(s.ctx, s.alice) + depositList := s.App.DexKeeper.GetAllDepositsForAddress(s.Ctx, s.alice) s.Assert().Equal(2, len(depositList)) s.Assert().Equal(&types.DepositRecord{ PairID: defaultPairID, 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 8d8080ded..2ad474b81 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 @@ -3,12 +3,11 @@ package keeper_test import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - keepertest "github.com/neutron-org/neutron/testutil/dex/keeper" math_utils "github.com/neutron-org/neutron/utils/math" "github.com/neutron-org/neutron/x/dex/types" ) -func (s *MsgServerTestSuite) TestEstimateMultiHopSwapSingleRoute() { +func (s *DexTestSuite) TestEstimateMultiHopSwapSingleRoute() { s.fundAliceBalances(100, 0) // GIVEN liquidity in pools A<>B, B<>C, C<>D, @@ -33,7 +32,7 @@ func (s *MsgServerTestSuite) TestEstimateMultiHopSwapSingleRoute() { s.assertDexBalanceWithDenom("TokenD", 100) } -func (s *MsgServerTestSuite) TestEstimateMultiHopSwapInsufficientLiquiditySingleRoute() { +func (s *DexTestSuite) TestEstimateMultiHopSwapInsufficientLiquiditySingleRoute() { s.fundAliceBalances(100, 0) // GIVEN liquidity in pools A<>B, B<>C, C<>D with insufficient liquidity in C<>D @@ -54,7 +53,7 @@ func (s *MsgServerTestSuite) TestEstimateMultiHopSwapInsufficientLiquiditySingle ) } -func (s *MsgServerTestSuite) TestEstimateMultiHopSwapLimitPriceNotMetSingleRoute() { +func (s *DexTestSuite) TestEstimateMultiHopSwapLimitPriceNotMetSingleRoute() { s.fundAliceBalances(100, 0) // GIVEN liquidity in pools A<>B, B<>C, C<>D with insufficient liquidity in C<>D @@ -75,7 +74,7 @@ func (s *MsgServerTestSuite) TestEstimateMultiHopSwapLimitPriceNotMetSingleRoute ) } -func (s *MsgServerTestSuite) TestEstimateMultiHopSwapMultiRouteOneGood() { +func (s *DexTestSuite) TestEstimateMultiHopSwapMultiRouteOneGood() { s.fundAliceBalances(100, 0) // GIVEN viable liquidity in pools A<>B, B<>E, E<>X @@ -181,7 +180,7 @@ func (s *MsgServerTestSuite) TestEstimateMultiHopSwapMultiRouteOneGood() { ) } -func (s *MsgServerTestSuite) TestEstimateMultiHopSwapMultiRouteAllFail() { +func (s *DexTestSuite) TestEstimateMultiHopSwapMultiRouteAllFail() { s.fundAliceBalances(100, 0) // GIVEN liquidity in sufficient liquidity but inadequate prices @@ -224,7 +223,7 @@ func (s *MsgServerTestSuite) TestEstimateMultiHopSwapMultiRouteAllFail() { ) } -func (s *MsgServerTestSuite) TestEstimateMultiHopSwapMultiRouteFindBestRoute() { +func (s *DexTestSuite) TestEstimateMultiHopSwapMultiRouteFindBestRoute() { s.fundAliceBalances(100, 0) // GIVEN viable liquidity in pools but with a best route through E<>X @@ -302,7 +301,7 @@ func (s *MsgServerTestSuite) TestEstimateMultiHopSwapMultiRouteFindBestRoute() { ) } -func (s *MsgServerTestSuite) TestEstimateMultiHopSwapLongRouteWithCache() { +func (s *DexTestSuite) TestEstimateMultiHopSwapLongRouteWithCache() { s.fundAliceBalances(100, 0) // GIVEN viable route from A->B->C...->L but last leg to X only possible through K->M->X @@ -350,7 +349,7 @@ func (s *MsgServerTestSuite) TestEstimateMultiHopSwapLongRouteWithCache() { ) } -func (s *MsgServerTestSuite) TestEstimateMultiHopSwapEventsEmitted() { +func (s *DexTestSuite) TestEstimateMultiHopSwapEventsEmitted() { s.fundAliceBalances(100, 0) s.SetupMultiplePools( @@ -362,5 +361,5 @@ func (s *MsgServerTestSuite) TestEstimateMultiHopSwapEventsEmitted() { _ = s.aliceEstimatesMultiHopSwap(route, 100, math_utils.MustNewPrecDecFromStr("0.9"), false) // 8 tickUpdateEvents are emitted 4x for pool setup 4x for two swaps - keepertest.AssertEventNotEmitted(s.T(), s.ctx, types.TickUpdateEventKey, "Expected no events") + s.AssertEventValueNotEmitted(types.TickUpdateEventKey, "Expected no events") } diff --git a/x/dex/keeper/integration_cancellimitorder_test.go b/x/dex/keeper/integration_cancellimitorder_test.go index 00aadff0b..92ba79939 100644 --- a/x/dex/keeper/integration_cancellimitorder_test.go +++ b/x/dex/keeper/integration_cancellimitorder_test.go @@ -8,7 +8,7 @@ import ( "github.com/neutron-org/neutron/x/dex/types" ) -func (s *MsgServerTestSuite) TestCancelEntireLimitOrderAOneExists() { +func (s *DexTestSuite) TestCancelEntireLimitOrderAOneExists() { s.fundAliceBalances(50, 50) // CASE // Alice adds a limit order of A for B and cancels it right away @@ -28,11 +28,11 @@ func (s *MsgServerTestSuite) TestCancelEntireLimitOrderAOneExists() { s.assertCurr0To1(math.MaxInt64) // Assert that the LimitOrderTrancheUser has been deleted - _, found := s.app.DexKeeper.GetLimitOrderTrancheUser(s.ctx, s.alice.String(), trancheKey) + _, found := s.App.DexKeeper.GetLimitOrderTrancheUser(s.Ctx, s.alice.String(), trancheKey) s.Assert().False(found) } -func (s *MsgServerTestSuite) TestCancelEntireLimitOrderBOneExists() { +func (s *DexTestSuite) TestCancelEntireLimitOrderBOneExists() { s.fundAliceBalances(50, 50) // CASE // Alice adds a limit order of B for A and cancels it right away @@ -52,7 +52,7 @@ func (s *MsgServerTestSuite) TestCancelEntireLimitOrderBOneExists() { s.assertCurr0To1(math.MaxInt64) } -func (s *MsgServerTestSuite) TestCancelHigherEntireLimitOrderATwoExistDiffTicksSameDirection() { +func (s *DexTestSuite) TestCancelHigherEntireLimitOrderATwoExistDiffTicksSameDirection() { s.fundAliceBalances(50, 50) // CASE // Alice adds two limit orders from A to B and removes the one at the higher tick (0) @@ -73,7 +73,7 @@ func (s *MsgServerTestSuite) TestCancelHigherEntireLimitOrderATwoExistDiffTicksS s.assertCurr0To1(math.MaxInt64) } -func (s *MsgServerTestSuite) TestCancelLowerEntireLimitOrderATwoExistDiffTicksSameDirection() { +func (s *DexTestSuite) TestCancelLowerEntireLimitOrderATwoExistDiffTicksSameDirection() { s.fundAliceBalances(50, 50) // CASE // Alice adds two limit orders from A to B and removes the one at the lower tick (-1) @@ -94,7 +94,7 @@ func (s *MsgServerTestSuite) TestCancelLowerEntireLimitOrderATwoExistDiffTicksSa s.assertCurr0To1(math.MaxInt64) } -func (s *MsgServerTestSuite) TestCancelLowerEntireLimitOrderATwoExistDiffTicksDiffDirection() { +func (s *DexTestSuite) TestCancelLowerEntireLimitOrderATwoExistDiffTicksDiffDirection() { s.fundAliceBalances(50, 50) // CASE // Alice adds one limit orders from A to B and one from B to A and removes the one from A to B @@ -115,7 +115,7 @@ func (s *MsgServerTestSuite) TestCancelLowerEntireLimitOrderATwoExistDiffTicksDi s.assertCurr0To1(1) } -func (s *MsgServerTestSuite) TestCancelHigherEntireLimitOrderBTwoExistDiffTicksSameDirection() { +func (s *DexTestSuite) TestCancelHigherEntireLimitOrderBTwoExistDiffTicksSameDirection() { s.fundAliceBalances(50, 50) // CASE // Alice adds two limit orders from B to A and removes the one at tick 0 @@ -136,7 +136,7 @@ func (s *MsgServerTestSuite) TestCancelHigherEntireLimitOrderBTwoExistDiffTicksS s.assertCurr0To1(-1) } -func (s *MsgServerTestSuite) TestCancelLowerEntireLimitOrderBTwoExistDiffTicksSameDirection() { +func (s *DexTestSuite) TestCancelLowerEntireLimitOrderBTwoExistDiffTicksSameDirection() { s.fundAliceBalances(50, 50) // CASE // Alice adds two limit orders from B to A and removes the one at tick 0 @@ -157,7 +157,7 @@ func (s *MsgServerTestSuite) TestCancelLowerEntireLimitOrderBTwoExistDiffTicksSa s.assertCurr0To1(0) } -func (s *MsgServerTestSuite) TestCancelTwiceFails() { +func (s *DexTestSuite) TestCancelTwiceFails() { s.fundAliceBalances(50, 50) // CASE // Alice tries to cancel the same limit order twice @@ -175,7 +175,7 @@ func (s *MsgServerTestSuite) TestCancelTwiceFails() { s.aliceCancelsLimitSellFails(trancheKey, types.ErrActiveLimitOrderNotFound) } -func (s *MsgServerTestSuite) TestCancelPartiallyFilled() { +func (s *DexTestSuite) TestCancelPartiallyFilled() { s.fundAliceBalances(50, 0) s.fundBobBalances(0, 50) @@ -195,7 +195,7 @@ func (s *MsgServerTestSuite) TestCancelPartiallyFilled() { s.assertDexBalances(0, 25) } -func (s *MsgServerTestSuite) TestCancelPartiallyFilledMultiUser() { +func (s *DexTestSuite) TestCancelPartiallyFilledMultiUser() { s.fundAliceBalances(50, 0) s.fundBobBalances(0, 50) s.fundCarolBalances(100, 0) @@ -222,7 +222,7 @@ func (s *MsgServerTestSuite) TestCancelPartiallyFilledMultiUser() { s.assertDexBalances(1, 25) } -func (s *MsgServerTestSuite) TestCancelGoodTil() { +func (s *DexTestSuite) TestCancelGoodTil() { s.fundAliceBalances(50, 0) tomorrow := time.Now().AddDate(0, 0, 1) // GIVEN alice limit sells 50 TokenA with goodTil date of tommrow @@ -238,7 +238,7 @@ func (s *MsgServerTestSuite) TestCancelGoodTil() { s.assertNLimitOrderExpiration(0) } -func (s *MsgServerTestSuite) TestCancelGoodTilAfterExpirationFails() { +func (s *DexTestSuite) TestCancelGoodTilAfterExpirationFails() { s.fundAliceBalances(50, 0) tomorrow := time.Now().AddDate(0, 0, 1) // GIVEN alice limit sells 50 TokenA with goodTil date of tommrow @@ -248,13 +248,13 @@ func (s *MsgServerTestSuite) TestCancelGoodTilAfterExpirationFails() { // WHEN expiration date has passed s.nextBlockWithTime(time.Now().AddDate(0, 0, 2)) - s.app.EndBlock(abci.RequestEndBlock{Height: 0}) + s.App.EndBlock(abci.RequestEndBlock{Height: 0}) // THEN alice cancellation fails s.aliceCancelsLimitSellFails(trancheKey, types.ErrActiveLimitOrderNotFound) } -func (s *MsgServerTestSuite) TestCancelJITSameBlock() { +func (s *DexTestSuite) TestCancelJITSameBlock() { s.fundAliceBalances(50, 0) // GIVEN alice limit sells 50 TokenA as JIT trancheKey := s.aliceLimitSells("TokenA", 0, 50, types.LimitOrderType_JUST_IN_TIME) @@ -269,7 +269,7 @@ func (s *MsgServerTestSuite) TestCancelJITSameBlock() { s.assertNLimitOrderExpiration(0) } -func (s *MsgServerTestSuite) TestCancelJITNextBlock() { +func (s *DexTestSuite) TestCancelJITNextBlock() { s.fundAliceBalances(50, 0) // GIVEN alice limit sells 50 TokenA as JIT trancheKey := s.aliceLimitSells("TokenA", 0, 50, types.LimitOrderType_JUST_IN_TIME) @@ -278,7 +278,7 @@ func (s *MsgServerTestSuite) TestCancelJITNextBlock() { // WHEN we move to block N+1 s.nextBlockWithTime(time.Now()) - s.app.EndBlock(abci.RequestEndBlock{Height: 0}) + s.App.EndBlock(abci.RequestEndBlock{Height: 0}) // THEN alice cancellation fails s.aliceCancelsLimitSellFails(trancheKey, types.ErrActiveLimitOrderNotFound) diff --git a/x/dex/keeper/integration_deposit_autoswap_unit_test.go b/x/dex/keeper/integration_deposit_autoswap_unit_test.go index 551c6dd44..5fc6eb9b6 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 -func (s *MsgServerTestSuite) TestAutoswapperWithdraws() { +func (s *DexTestSuite) TestAutoswapperWithdraws() { s.fundAliceBalances(50, 50) s.fundBobBalances(50, 50) @@ -34,7 +34,7 @@ func (s *MsgServerTestSuite) TestAutoswapperWithdraws() { s.assertDexBalances(dexExpectedBalance0.Int64(), dexExpectedBalance1.Int64()) } -func (s *MsgServerTestSuite) TestAutoswapOtherDepositorWithdraws() { +func (s *DexTestSuite) TestAutoswapOtherDepositorWithdraws() { s.fundAliceBalances(50, 50) s.fundBobBalances(50, 50) @@ -66,7 +66,7 @@ func (s *MsgServerTestSuite) TestAutoswapOtherDepositorWithdraws() { s.assertDexBalances(dexExpectedBalance0.Int64(), dexExpectedBalance1.Int64()) } -func (s *MsgServerTestSuite) TestAutoswapBothWithdraws() { +func (s *DexTestSuite) TestAutoswapBothWithdraws() { s.fundAliceBalances(50, 50) s.fundBobBalances(50, 50) diff --git a/x/dex/keeper/integration_deposit_doublesided_test.go b/x/dex/keeper/integration_deposit_doublesided_test.go index a5a09eddb..79fb8dc91 100644 --- a/x/dex/keeper/integration_deposit_doublesided_test.go +++ b/x/dex/keeper/integration_deposit_doublesided_test.go @@ -5,7 +5,7 @@ import ( "github.com/neutron-org/neutron/x/dex/types" ) -func (s *MsgServerTestSuite) TestDepositDoubleSidedInSpreadCurrTickAdjusted() { +func (s *DexTestSuite) TestDepositDoubleSidedInSpreadCurrTickAdjusted() { s.fundAliceBalances(50, 50) // GIVEN @@ -28,7 +28,7 @@ func (s *MsgServerTestSuite) TestDepositDoubleSidedInSpreadCurrTickAdjusted() { s.assertCurr0To1(1) } -func (s *MsgServerTestSuite) TestDepositDoubleSidedAroundSpreadCurrTickNotAdjusted() { +func (s *DexTestSuite) TestDepositDoubleSidedAroundSpreadCurrTickNotAdjusted() { s.fundAliceBalances(50, 50) // GIVEN @@ -51,7 +51,7 @@ func (s *MsgServerTestSuite) TestDepositDoubleSidedAroundSpreadCurrTickNotAdjust s.assertCurr0To1(1) } -func (s *MsgServerTestSuite) TestDepositDoubleSidedHalfInSpreadCurrTick0To1Adjusted() { +func (s *DexTestSuite) TestDepositDoubleSidedHalfInSpreadCurrTick0To1Adjusted() { s.fundAliceBalances(50, 50) // GIVEN @@ -74,7 +74,7 @@ func (s *MsgServerTestSuite) TestDepositDoubleSidedHalfInSpreadCurrTick0To1Adjus s.assertCurr0To1(5) } -func (s *MsgServerTestSuite) TestDepositDoubleSidedHalfInSpreadCurrTick1To0Adjusted() { +func (s *DexTestSuite) TestDepositDoubleSidedHalfInSpreadCurrTick1To0Adjusted() { s.fundAliceBalances(50, 50) // GIVEN @@ -97,7 +97,7 @@ func (s *MsgServerTestSuite) TestDepositDoubleSidedHalfInSpreadCurrTick1To0Adjus s.assertCurr0To1(4) } -func (s *MsgServerTestSuite) TestDepositDoubleSidedCreatingArbBelow() { +func (s *DexTestSuite) TestDepositDoubleSidedCreatingArbBelow() { s.fundAliceBalances(50, 50) s.fundBobBalances(50, 50) @@ -119,7 +119,7 @@ func (s *MsgServerTestSuite) TestDepositDoubleSidedCreatingArbBelow() { s.bobLimitSells("TokenA", 0, 10, types.LimitOrderType_FILL_OR_KILL) } -func (s *MsgServerTestSuite) TestDepositDoubleSidedCreatingArbAbove() { +func (s *DexTestSuite) TestDepositDoubleSidedCreatingArbAbove() { s.fundAliceBalances(50, 50) s.fundBobBalances(50, 50) @@ -141,7 +141,7 @@ func (s *MsgServerTestSuite) TestDepositDoubleSidedCreatingArbAbove() { s.bobLimitSells("TokenB", 0, 10, types.LimitOrderType_FILL_OR_KILL) } -func (s *MsgServerTestSuite) TestDepositDoubleSidedFirstSharesMintedTotal() { +func (s *DexTestSuite) TestDepositDoubleSidedFirstSharesMintedTotal() { s.fundAliceBalances(50, 50) // GIVEN @@ -158,7 +158,7 @@ func (s *MsgServerTestSuite) TestDepositDoubleSidedFirstSharesMintedTotal() { s.assertPoolShares(0, 1, 15) } -func (s *MsgServerTestSuite) TestDepositDoubleSidedFirstSharesMintedUser() { +func (s *DexTestSuite) TestDepositDoubleSidedFirstSharesMintedUser() { s.fundAliceBalances(50, 50) // GIVEN @@ -176,7 +176,7 @@ func (s *MsgServerTestSuite) TestDepositDoubleSidedFirstSharesMintedUser() { s.assertAliceShares(0, 1, 15) } -func (s *MsgServerTestSuite) TestDepositDoubleSidedExistingSharesMintedTotal() { +func (s *DexTestSuite) TestDepositDoubleSidedExistingSharesMintedTotal() { s.fundAliceBalances(50, 50) // GIVEN @@ -194,7 +194,7 @@ func (s *MsgServerTestSuite) TestDepositDoubleSidedExistingSharesMintedTotal() { s.assertPoolShares(0, 1, 30) } -func (s *MsgServerTestSuite) TestDepositDoubleSidedExistingSharesMintedUser() { +func (s *DexTestSuite) TestDepositDoubleSidedExistingSharesMintedUser() { s.fundAliceBalances(50, 50) // GIVEN @@ -213,7 +213,7 @@ func (s *MsgServerTestSuite) TestDepositDoubleSidedExistingSharesMintedUser() { s.assertAliceShares(0, 1, 24) } -func (s *MsgServerTestSuite) TestDepositValueAccural() { +func (s *DexTestSuite) TestDepositValueAccural() { s.fundAliceBalances(100, 0) s.fundBobBalances(1000, 1000) s.fundCarolBalances(100, 1) diff --git a/x/dex/keeper/integration_deposit_multi_test.go b/x/dex/keeper/integration_deposit_multi_test.go index 6423954a8..cbf999695 100644 --- a/x/dex/keeper/integration_deposit_multi_test.go +++ b/x/dex/keeper/integration_deposit_multi_test.go @@ -5,7 +5,7 @@ import ( "github.com/neutron-org/neutron/x/dex/types" ) -func (s *MsgServerTestSuite) TestDepositMultiCompleteFailure() { +func (s *DexTestSuite) TestDepositMultiCompleteFailure() { s.fundAliceBalances(50, 50) // GIVEN @@ -24,7 +24,7 @@ func (s *MsgServerTestSuite) TestDepositMultiCompleteFailure() { ) } -func (s *MsgServerTestSuite) TestDepositMultiSuccess() { +func (s *DexTestSuite) TestDepositMultiSuccess() { s.fundAliceBalances(50, 50) // GIVEN diff --git a/x/dex/keeper/integration_deposit_singlesided_test.go b/x/dex/keeper/integration_deposit_singlesided_test.go index a7a85e3df..0d5a176c1 100644 --- a/x/dex/keeper/integration_deposit_singlesided_test.go +++ b/x/dex/keeper/integration_deposit_singlesided_test.go @@ -6,7 +6,7 @@ import ( "github.com/neutron-org/neutron/x/dex/types" ) -func (s *MsgServerTestSuite) TestDepositSingleSidedInSpread1To0() { +func (s *DexTestSuite) TestDepositSingleSidedInSpread1To0() { s.fundAliceBalances(50, 50) // GIVEN @@ -28,7 +28,7 @@ func (s *MsgServerTestSuite) TestDepositSingleSidedInSpread1To0() { s.assertCurr1To0(-1) } -func (s *MsgServerTestSuite) TestDepositSingleSidedInSpread0To1() { +func (s *DexTestSuite) TestDepositSingleSidedInSpread0To1() { s.fundAliceBalances(50, 50) // GIVEN @@ -50,7 +50,7 @@ func (s *MsgServerTestSuite) TestDepositSingleSidedInSpread0To1() { s.assertCurr0To1(1) } -func (s *MsgServerTestSuite) TestDepositSingleSidedInSpreadMinMaxNotAdjusted() { +func (s *DexTestSuite) TestDepositSingleSidedInSpreadMinMaxNotAdjusted() { s.fundAliceBalances(50, 50) // GIVEN @@ -69,7 +69,7 @@ func (s *MsgServerTestSuite) TestDepositSingleSidedInSpreadMinMaxNotAdjusted() { // assert min, max not moved } -func (s *MsgServerTestSuite) TestDepositSingleSidedOutOfSpread0To1NotAdjusted() { +func (s *DexTestSuite) TestDepositSingleSidedOutOfSpread0To1NotAdjusted() { s.fundAliceBalances(50, 50) // GIVEN @@ -91,7 +91,7 @@ func (s *MsgServerTestSuite) TestDepositSingleSidedOutOfSpread0To1NotAdjusted() s.assertCurr0To1(1) } -func (s *MsgServerTestSuite) TestDepositSingleSidedOutOfSpread1To0NotAdjusted() { +func (s *DexTestSuite) TestDepositSingleSidedOutOfSpread1To0NotAdjusted() { s.fundAliceBalances(50, 50) // GIVEN @@ -113,7 +113,7 @@ func (s *MsgServerTestSuite) TestDepositSingleSidedOutOfSpread1To0NotAdjusted() s.assertCurr1To0(-1) } -func (s *MsgServerTestSuite) TestDepositSingleSidedOutOfSpreadMinAdjusted() { +func (s *DexTestSuite) TestDepositSingleSidedOutOfSpreadMinAdjusted() { s.fundAliceBalances(50, 50) // GIVEN @@ -134,7 +134,7 @@ func (s *MsgServerTestSuite) TestDepositSingleSidedOutOfSpreadMinAdjusted() { // assert min moved } -func (s *MsgServerTestSuite) TestDepositSingleSidedOutOfSpreadMaxAdjusted() { +func (s *DexTestSuite) TestDepositSingleSidedOutOfSpreadMaxAdjusted() { s.fundAliceBalances(50, 50) // GIVEN @@ -155,7 +155,7 @@ func (s *MsgServerTestSuite) TestDepositSingleSidedOutOfSpreadMaxAdjusted() { // assert max moved } -func (s *MsgServerTestSuite) TestDepositSingleSidedOutOfSpreadMinNotAdjusted() { +func (s *DexTestSuite) TestDepositSingleSidedOutOfSpreadMinNotAdjusted() { s.fundAliceBalances(50, 50) // GIVEN @@ -180,7 +180,7 @@ func (s *MsgServerTestSuite) TestDepositSingleSidedOutOfSpreadMinNotAdjusted() { // assert min not moved } -func (s *MsgServerTestSuite) TestDepositSingleSidedOutOfSpreadMaxNotAdjusted() { +func (s *DexTestSuite) TestDepositSingleSidedOutOfSpreadMaxNotAdjusted() { s.fundAliceBalances(50, 50) // GIVEN @@ -205,7 +205,7 @@ func (s *MsgServerTestSuite) TestDepositSingleSidedOutOfSpreadMaxNotAdjusted() { // assert max not moved } -func (s *MsgServerTestSuite) TestDepositSingleSidedExistingLiquidityA() { +func (s *DexTestSuite) TestDepositSingleSidedExistingLiquidityA() { s.fundAliceBalances(50, 50) // GIVEN @@ -230,7 +230,7 @@ func (s *MsgServerTestSuite) TestDepositSingleSidedExistingLiquidityA() { s.assertCurr0To1(math.MaxInt64) } -func (s *MsgServerTestSuite) TestDepositSingleSidedExistingLiquidityB() { +func (s *DexTestSuite) TestDepositSingleSidedExistingLiquidityB() { s.fundAliceBalances(50, 50) // GIVEN @@ -255,7 +255,7 @@ func (s *MsgServerTestSuite) TestDepositSingleSidedExistingLiquidityB() { s.assertCurr0To1(1) } -func (s *MsgServerTestSuite) TestDepositSingleSidedCreatingArbToken0() { +func (s *DexTestSuite) TestDepositSingleSidedCreatingArbToken0() { s.fundAliceBalances(50, 50) s.fundBobBalances(50, 50) @@ -279,7 +279,7 @@ func (s *MsgServerTestSuite) TestDepositSingleSidedCreatingArbToken0() { s.assertBobBalances(50, 52) } -func (s *MsgServerTestSuite) TestDepositSingleSidedCreatingArbToken1() { +func (s *DexTestSuite) TestDepositSingleSidedCreatingArbToken1() { s.fundAliceBalances(50, 50) s.fundBobBalances(50, 50) @@ -304,7 +304,7 @@ func (s *MsgServerTestSuite) TestDepositSingleSidedCreatingArbToken1() { s.assertBobBalances(52, 50) } -func (s *MsgServerTestSuite) TestDepositSingleSidedMultiA() { +func (s *DexTestSuite) TestDepositSingleSidedMultiA() { s.fundAliceBalances(50, 50) // GIVEN @@ -333,7 +333,7 @@ func (s *MsgServerTestSuite) TestDepositSingleSidedMultiA() { s.assertCurr0To1(math.MaxInt64) } -func (s *MsgServerTestSuite) TestDepositSingleSidedMultiB() { +func (s *DexTestSuite) TestDepositSingleSidedMultiB() { s.fundAliceBalances(50, 50) // GIVEN @@ -362,7 +362,7 @@ func (s *MsgServerTestSuite) TestDepositSingleSidedMultiB() { s.assertCurr0To1(1) } -func (s *MsgServerTestSuite) TestDepositSingleSidedLowerTickOutsideRange() { +func (s *DexTestSuite) TestDepositSingleSidedLowerTickOutsideRange() { s.fundAliceBalances(50, 50) // GIVEN @@ -378,7 +378,7 @@ func (s *MsgServerTestSuite) TestDepositSingleSidedLowerTickOutsideRange() { s.assertAliceDepositFails(err, NewDeposit(10, 0, tickIndex, 1)) } -func (s *MsgServerTestSuite) TestDepositSingleSidedUpperTickOutsideRange() { +func (s *DexTestSuite) TestDepositSingleSidedUpperTickOutsideRange() { s.fundAliceBalances(50, 50) // GIVEN @@ -394,7 +394,7 @@ func (s *MsgServerTestSuite) TestDepositSingleSidedUpperTickOutsideRange() { s.assertAliceDepositFails(err, NewDeposit(0, 10, tickIndex, 1)) } -func (s *MsgServerTestSuite) TestDepositSingleSidedZeroTrueAmountsFail() { +func (s *DexTestSuite) TestDepositSingleSidedZeroTrueAmountsFail() { s.fundAliceBalances(50, 50) // GIVEN @@ -410,7 +410,7 @@ func (s *MsgServerTestSuite) TestDepositSingleSidedZeroTrueAmountsFail() { s.assertAliceDepositFails(err, NewDeposit(0, 5, 0, 1)) } -func (s *MsgServerTestSuite) TestDepositSingleLowTickUnderflowFails() { +func (s *DexTestSuite) TestDepositSingleLowTickUnderflowFails() { s.fundAliceBalances(0, 50) // GIVEN @@ -422,7 +422,7 @@ func (s *MsgServerTestSuite) TestDepositSingleLowTickUnderflowFails() { ) } -func (s *MsgServerTestSuite) TestDepositSingleInvalidFeeFails() { +func (s *DexTestSuite) TestDepositSingleInvalidFeeFails() { s.fundAliceBalances(0, 50) // GIVEN diff --git a/x/dex/keeper/integration_multihopswap_test.go b/x/dex/keeper/integration_multihopswap_test.go index ad926f342..6bb951ae0 100644 --- a/x/dex/keeper/integration_multihopswap_test.go +++ b/x/dex/keeper/integration_multihopswap_test.go @@ -3,7 +3,6 @@ package keeper_test import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - keepertest "github.com/neutron-org/neutron/testutil/dex/keeper" math_utils "github.com/neutron-org/neutron/utils/math" "github.com/neutron-org/neutron/x/dex/types" ) @@ -28,7 +27,7 @@ func NewPoolSetup(tokenA, tokenB string, amountA, amountB, tickIndex, fee int) P } } -func (s *MsgServerTestSuite) SetupMultiplePools(poolSetups ...PoolSetup) { +func (s *DexTestSuite) SetupMultiplePools(poolSetups ...PoolSetup) { for _, p := range poolSetups { coins := sdk.NewCoins( sdk.NewCoin(p.TokenA, math.NewInt(int64(p.AmountA))), @@ -44,7 +43,7 @@ func (s *MsgServerTestSuite) SetupMultiplePools(poolSetups ...PoolSetup) { } } -func (s *MsgServerTestSuite) TestMultiHopSwapSingleRoute() { +func (s *DexTestSuite) TestMultiHopSwapSingleRoute() { s.fundAliceBalances(100, 0) // GIVEN liquidity in pools A<>B, B<>C, C<>D, @@ -68,7 +67,7 @@ func (s *MsgServerTestSuite) TestMultiHopSwapSingleRoute() { s.assertDexBalanceWithDenom("TokenD", 3) } -func (s *MsgServerTestSuite) TestMultiHopSwapInsufficientLiquiditySingleRoute() { +func (s *DexTestSuite) TestMultiHopSwapInsufficientLiquiditySingleRoute() { s.fundAliceBalances(100, 0) // GIVEN liquidity in pools A<>B, B<>C, C<>D with insufficient liquidity in C<>D @@ -89,7 +88,7 @@ func (s *MsgServerTestSuite) TestMultiHopSwapInsufficientLiquiditySingleRoute() ) } -func (s *MsgServerTestSuite) TestMultiHopSwapLimitPriceNotMetSingleRoute() { +func (s *DexTestSuite) TestMultiHopSwapLimitPriceNotMetSingleRoute() { s.fundAliceBalances(100, 0) // GIVEN liquidity in pools A<>B, B<>C, C<>D with insufficient liquidity in C<>D @@ -110,7 +109,7 @@ func (s *MsgServerTestSuite) TestMultiHopSwapLimitPriceNotMetSingleRoute() { ) } -func (s *MsgServerTestSuite) TestMultiHopSwapMultiRouteOneGood() { +func (s *DexTestSuite) TestMultiHopSwapMultiRouteOneGood() { s.fundAliceBalances(100, 0) // GIVEN viable liquidity in pools A<>B, B<>E, E<>X @@ -204,7 +203,7 @@ func (s *MsgServerTestSuite) TestMultiHopSwapMultiRouteOneGood() { ) } -func (s *MsgServerTestSuite) TestMultiHopSwapMultiRouteAllFail() { +func (s *DexTestSuite) TestMultiHopSwapMultiRouteAllFail() { s.fundAliceBalances(100, 0) // GIVEN liquidity in sufficient liquidity but inadequate prices @@ -247,7 +246,7 @@ func (s *MsgServerTestSuite) TestMultiHopSwapMultiRouteAllFail() { ) } -func (s *MsgServerTestSuite) TestMultiHopSwapMultiRouteFindBestRoute() { +func (s *DexTestSuite) TestMultiHopSwapMultiRouteFindBestRoute() { s.fundAliceBalances(100, 0) // GIVEN viable liquidity in pools but with a best route through E<>X @@ -326,7 +325,7 @@ func (s *MsgServerTestSuite) TestMultiHopSwapMultiRouteFindBestRoute() { ) } -func (s *MsgServerTestSuite) TestMultiHopSwapLongRouteWithCache() { +func (s *DexTestSuite) TestMultiHopSwapLongRouteWithCache() { s.fundAliceBalances(100, 0) // GIVEN viable route from A->B->C...->L but last leg to X only possible through K->M->X @@ -374,7 +373,7 @@ func (s *MsgServerTestSuite) TestMultiHopSwapLongRouteWithCache() { ) } -func (s *MsgServerTestSuite) TestMultiHopSwapEventsEmitted() { +func (s *DexTestSuite) TestMultiHopSwapEventsEmitted() { s.fundAliceBalances(100, 0) s.SetupMultiplePools( @@ -386,5 +385,5 @@ func (s *MsgServerTestSuite) TestMultiHopSwapEventsEmitted() { s.aliceMultiHopSwaps(route, 100, math_utils.MustNewPrecDecFromStr("0.9"), false) // 8 tickUpdateEvents are emitted 4x for pool setup 4x for two swaps - keepertest.AssertNEventsEmitted(s.T(), s.ctx, types.TickUpdateEventKey, 8) + s.AssertNEventValuesEmitted(types.TickUpdateEventKey, 8) } diff --git a/x/dex/keeper/integration_placelimitorder_test.go b/x/dex/keeper/integration_placelimitorder_test.go index 605441408..0f2aa189e 100644 --- a/x/dex/keeper/integration_placelimitorder_test.go +++ b/x/dex/keeper/integration_placelimitorder_test.go @@ -11,7 +11,7 @@ import ( ) // Core tests w/ GTC limitOrders ////////////////////////////////////////////// -func (s *MsgServerTestSuite) TestPlaceLimitOrderInSpread1To0() { +func (s *DexTestSuite) TestPlaceLimitOrderInSpread1To0() { s.fundAliceBalances(50, 50) // GIVEN @@ -33,7 +33,7 @@ func (s *MsgServerTestSuite) TestPlaceLimitOrderInSpread1To0() { s.assertCurr1To0(-1) } -func (s *MsgServerTestSuite) TestPlaceLimitOrderInSpread0To1() { +func (s *DexTestSuite) TestPlaceLimitOrderInSpread0To1() { s.fundAliceBalances(50, 50) // GIVEN @@ -55,7 +55,7 @@ func (s *MsgServerTestSuite) TestPlaceLimitOrderInSpread0To1() { s.assertCurr0To1(1) } -func (s *MsgServerTestSuite) TestPlaceLimitOrderInSpreadMinMaxNotAdjusted() { +func (s *DexTestSuite) TestPlaceLimitOrderInSpreadMinMaxNotAdjusted() { s.fundAliceBalances(50, 50) // GIVEN @@ -74,7 +74,7 @@ func (s *MsgServerTestSuite) TestPlaceLimitOrderInSpreadMinMaxNotAdjusted() { // assert min, max not moved } -func (s *MsgServerTestSuite) TestPlaceLimitOrderOutOfSpread0To1NotAdjusted() { +func (s *DexTestSuite) TestPlaceLimitOrderOutOfSpread0To1NotAdjusted() { s.fundAliceBalances(50, 50) // GIVEN @@ -96,7 +96,7 @@ func (s *MsgServerTestSuite) TestPlaceLimitOrderOutOfSpread0To1NotAdjusted() { s.assertCurr0To1(1) } -func (s *MsgServerTestSuite) TestPlaceLimitOrderOutOfSpread1To0NotAdjusted() { +func (s *DexTestSuite) TestPlaceLimitOrderOutOfSpread1To0NotAdjusted() { s.fundAliceBalances(50, 50) // GIVEN @@ -118,7 +118,7 @@ func (s *MsgServerTestSuite) TestPlaceLimitOrderOutOfSpread1To0NotAdjusted() { s.assertCurr1To0(-1) } -func (s *MsgServerTestSuite) TestPlaceLimitOrderOutOfSpreadMinAdjusted() { +func (s *DexTestSuite) TestPlaceLimitOrderOutOfSpreadMinAdjusted() { s.fundAliceBalances(50, 50) // GIVEN @@ -139,7 +139,7 @@ func (s *MsgServerTestSuite) TestPlaceLimitOrderOutOfSpreadMinAdjusted() { // assert min moved } -func (s *MsgServerTestSuite) TestPlaceLimitOrderOutOfSpreadMaxAdjusted() { +func (s *DexTestSuite) TestPlaceLimitOrderOutOfSpreadMaxAdjusted() { s.fundAliceBalances(50, 50) // GIVEN @@ -160,7 +160,7 @@ func (s *MsgServerTestSuite) TestPlaceLimitOrderOutOfSpreadMaxAdjusted() { // assert max moved } -func (s *MsgServerTestSuite) TestPlaceLimitOrderOutOfSpreadMinNotAdjusted() { +func (s *DexTestSuite) TestPlaceLimitOrderOutOfSpreadMinNotAdjusted() { s.fundAliceBalances(50, 50) // GIVEN @@ -185,7 +185,7 @@ func (s *MsgServerTestSuite) TestPlaceLimitOrderOutOfSpreadMinNotAdjusted() { // assert min not moved } -func (s *MsgServerTestSuite) TestPlaceLimitOrderOutOfSpreadMaxNotAdjusted() { +func (s *DexTestSuite) TestPlaceLimitOrderOutOfSpreadMaxNotAdjusted() { s.fundAliceBalances(50, 50) // GIVEN @@ -210,7 +210,7 @@ func (s *MsgServerTestSuite) TestPlaceLimitOrderOutOfSpreadMaxNotAdjusted() { // assert max not moved } -func (s *MsgServerTestSuite) TestPlaceLimitOrderExistingLiquidityA() { +func (s *DexTestSuite) TestPlaceLimitOrderExistingLiquidityA() { s.fundAliceBalances(50, 50) // GIVEN @@ -237,7 +237,7 @@ func (s *MsgServerTestSuite) TestPlaceLimitOrderExistingLiquidityA() { // s.assertCurr0To1(math.MaxInt64) } -func (s *MsgServerTestSuite) TestPlaceLimitOrderExistingLiquidityB() { +func (s *DexTestSuite) TestPlaceLimitOrderExistingLiquidityB() { s.fundAliceBalances(50, 50) // GIVEN @@ -264,7 +264,7 @@ func (s *MsgServerTestSuite) TestPlaceLimitOrderExistingLiquidityB() { s.assertCurr0To1(1) } -func (s *MsgServerTestSuite) TestPlaceLimitOrderNoLOPlaceLODoesntIncrementPlaceTrancheKey() { +func (s *DexTestSuite) TestPlaceLimitOrderNoLOPlaceLODoesntIncrementPlaceTrancheKey() { s.fundAliceBalances(50, 50) // GIVEN @@ -282,7 +282,7 @@ func (s *MsgServerTestSuite) TestPlaceLimitOrderNoLOPlaceLODoesntIncrementPlaceT s.assertFillAndPlaceTrancheKeys("TokenA", -1, trancheKey, trancheKey) } -func (s *MsgServerTestSuite) TestPlaceLimitOrderUnfilledLOPlaceLODoesntIncrementPlaceTrancheKey() { +func (s *DexTestSuite) TestPlaceLimitOrderUnfilledLOPlaceLODoesntIncrementPlaceTrancheKey() { s.fundAliceBalances(50, 50) // GIVEN @@ -300,7 +300,7 @@ func (s *MsgServerTestSuite) TestPlaceLimitOrderUnfilledLOPlaceLODoesntIncrement s.assertFillAndPlaceTrancheKeys("TokenA", -1, trancheKey, trancheKey) } -func (s *MsgServerTestSuite) TestPlaceLimitOrderPartiallyFilledLOPlaceLOIncrementsPlaceTrancheKey() { +func (s *DexTestSuite) TestPlaceLimitOrderPartiallyFilledLOPlaceLOIncrementsPlaceTrancheKey() { s.fundAliceBalances(50, 50) s.fundBobBalances(50, 50) @@ -319,7 +319,7 @@ func (s *MsgServerTestSuite) TestPlaceLimitOrderPartiallyFilledLOPlaceLOIncremen s.assertFillAndPlaceTrancheKeys("TokenA", -1, trancheKey0, trancheKey1) } -func (s *MsgServerTestSuite) TestPlaceLimitOrderFilledLOPlaceLODoesntIncrementsPlaceTrancheKey() { +func (s *DexTestSuite) TestPlaceLimitOrderFilledLOPlaceLODoesntIncrementsPlaceTrancheKey() { s.fundAliceBalances(50, 50) s.fundBobBalances(50, 50) @@ -339,7 +339,7 @@ func (s *MsgServerTestSuite) TestPlaceLimitOrderFilledLOPlaceLODoesntIncrementsP s.assertFillAndPlaceTrancheKeys("TokenA", -1, trancheKey0, trancheKey1) } -func (s *MsgServerTestSuite) TestPlaceLimitOrderInsufficientFunds() { +func (s *DexTestSuite) TestPlaceLimitOrderInsufficientFunds() { // GIVEN // alice has no funds s.assertAliceBalances(0, 0) @@ -353,7 +353,7 @@ func (s *MsgServerTestSuite) TestPlaceLimitOrderInsufficientFunds() { s.assertAliceLimitSellFails(err, "TokenA", 0, 10) } -func (s *MsgServerTestSuite) TestLimitOrderPartialFillDepositCancel() { +func (s *DexTestSuite) TestLimitOrderPartialFillDepositCancel() { s.fundAliceBalances(100, 100) s.fundBobBalances(100, 100) s.assertDexBalances(0, 0) @@ -412,7 +412,7 @@ func (s *MsgServerTestSuite) TestLimitOrderPartialFillDepositCancel() { } // Fill Or Kill limit orders /////////////////////////////////////////////////////////// -func (s *MsgServerTestSuite) TestPlaceLimitOrderFoKNoLiq() { +func (s *DexTestSuite) TestPlaceLimitOrderFoKNoLiq() { s.fundAliceBalances(10, 0) // GIVEN no liquidity // THEN alice's LimitOrder fails @@ -428,7 +428,7 @@ func (s *MsgServerTestSuite) TestPlaceLimitOrderFoKNoLiq() { s.assertAliceBalances(10, 0) } -func (s *MsgServerTestSuite) TestPlaceLimitOrderFoKWithLPFills() { +func (s *DexTestSuite) TestPlaceLimitOrderFoKWithLPFills() { s.fundAliceBalances(10, 0) s.fundBobBalances(0, 20) // GIVEN LP liq at tick -1 @@ -444,7 +444,7 @@ func (s *MsgServerTestSuite) TestPlaceLimitOrderFoKWithLPFills() { s.assertLimitLiquidityAtTick("TokenA", 1, 0) } -func (s *MsgServerTestSuite) TestPlaceLimitOrderFoKFailsWithInsufficientLiq() { +func (s *DexTestSuite) TestPlaceLimitOrderFoKFailsWithInsufficientLiq() { s.fundAliceBalances(10, 0) s.fundBobBalances(0, 20) // GIVEN LP liq at tick -1 of 9 tokenB @@ -459,7 +459,7 @@ func (s *MsgServerTestSuite) TestPlaceLimitOrderFoKFailsWithInsufficientLiq() { ) } -func (s *MsgServerTestSuite) TestPlaceLimitOrder0FoKFailsWithLowLimit() { +func (s *DexTestSuite) TestPlaceLimitOrder0FoKFailsWithLowLimit() { s.fundAliceBalances(10, 0) s.fundBobBalances(0, 20) // GIVEN LP liq at tick -1 of 20 tokenB @@ -474,7 +474,7 @@ func (s *MsgServerTestSuite) TestPlaceLimitOrder0FoKFailsWithLowLimit() { ) } -func (s *MsgServerTestSuite) TestPlaceLimitOrder1FoKFailsWithHighLimit() { +func (s *DexTestSuite) TestPlaceLimitOrder1FoKFailsWithHighLimit() { s.fundAliceBalances(0, 10) s.fundBobBalances(20, 0) // GIVEN LP liq at tick 20 of 20 tokenA @@ -489,7 +489,7 @@ func (s *MsgServerTestSuite) TestPlaceLimitOrder1FoKFailsWithHighLimit() { ) } -func (s *MsgServerTestSuite) TestPlaceLimitOrderFoK0TotalAmountInNotUsed() { +func (s *DexTestSuite) TestPlaceLimitOrderFoK0TotalAmountInNotUsed() { s.fundAliceBalances(9998, 0) s.fundBobBalances(0, 5000) // GIVEN LP liq at tick 20,000 & 20,001 of 1000 TokenB @@ -503,7 +503,7 @@ func (s *MsgServerTestSuite) TestPlaceLimitOrderFoK0TotalAmountInNotUsed() { s.assertAliceBalances(6, 1352) } -func (s *MsgServerTestSuite) TestPlaceLimitOrderFoK1TotalAmountInNotUsed() { +func (s *DexTestSuite) TestPlaceLimitOrderFoK1TotalAmountInNotUsed() { s.fundAliceBalances(0, 9998) s.fundBobBalances(5000, 0) // GIVEN LP liq at tick -20,000 & -20,001 of 1000 tokenA @@ -517,7 +517,7 @@ func (s *MsgServerTestSuite) TestPlaceLimitOrderFoK1TotalAmountInNotUsed() { s.assertAliceBalances(1352, 6) } -func (s *MsgServerTestSuite) TestPlaceLimitOrderFoKMaxOutUsed() { +func (s *DexTestSuite) TestPlaceLimitOrderFoKMaxOutUsed() { s.fundAliceBalances(0, 50) s.fundBobBalances(50, 0) // GIVEN LP 50 TokenA at tick 600 @@ -531,7 +531,7 @@ func (s *MsgServerTestSuite) TestPlaceLimitOrderFoKMaxOutUsed() { s.assertAliceBalances(20, 31) } -func (s *MsgServerTestSuite) TestPlaceLimitOrderFoKMaxOutUsedMultiTick() { +func (s *DexTestSuite) TestPlaceLimitOrderFoKMaxOutUsedMultiTick() { s.fundAliceBalances(0, 50) s.fundBobBalances(50, 0) // GIVEN LP 30 TokenA at tick 600-602 @@ -549,7 +549,7 @@ func (s *MsgServerTestSuite) TestPlaceLimitOrderFoKMaxOutUsedMultiTick() { // Immediate Or Cancel LimitOrders //////////////////////////////////////////////////////////////////// -func (s *MsgServerTestSuite) TestPlaceLimitOrderIoCNoLiq() { +func (s *DexTestSuite) TestPlaceLimitOrderIoCNoLiq() { s.fundAliceBalances(10, 0) // GIVEN no liquidity // WHEN alice submits IoC limitOrder @@ -564,7 +564,7 @@ func (s *MsgServerTestSuite) TestPlaceLimitOrderIoCNoLiq() { s.assertFillAndPlaceTrancheKeys("TokenA", 1, "", "") } -func (s *MsgServerTestSuite) TestPlaceLimitOrderIoCWithLPFills() { +func (s *DexTestSuite) TestPlaceLimitOrderIoCWithLPFills() { s.fundAliceBalances(10, 0) s.fundBobBalances(0, 20) // GIVEN LP liq at tick -1 @@ -581,7 +581,7 @@ func (s *MsgServerTestSuite) TestPlaceLimitOrderIoCWithLPFills() { s.assertFillAndPlaceTrancheKeys("TokenA", 1, "", "") } -func (s *MsgServerTestSuite) TestPlaceLimitOrderIoCWithLPPartialFill() { +func (s *DexTestSuite) TestPlaceLimitOrderIoCWithLPPartialFill() { s.fundAliceBalances(10, 0) s.fundBobBalances(0, 20) // GIVEN LP of 5 tokenB at tick -1 @@ -598,7 +598,7 @@ func (s *MsgServerTestSuite) TestPlaceLimitOrderIoCWithLPPartialFill() { s.assertLimitLiquidityAtTick("TokenA", 1, 0) } -func (s *MsgServerTestSuite) TestPlaceLimitOrderIoCWithLPNoFill() { +func (s *DexTestSuite) TestPlaceLimitOrderIoCWithLPNoFill() { s.fundAliceBalances(10, 0) s.fundBobBalances(0, 20) // GIVEN LP of 5 tokenB at tick -1 @@ -616,7 +616,7 @@ func (s *MsgServerTestSuite) TestPlaceLimitOrderIoCWithLPNoFill() { // Just In Time Limit Orders ////////////////////////////////////////////////// -func (s *MsgServerTestSuite) TestPlaceLimitOrderJITFills() { +func (s *DexTestSuite) TestPlaceLimitOrderJITFills() { s.fundAliceBalances(10, 0) s.fundBobBalances(0, 20) @@ -635,7 +635,7 @@ func (s *MsgServerTestSuite) TestPlaceLimitOrderJITFills() { s.assertAliceBalances(0, 10) } -func (s *MsgServerTestSuite) TestPlaceLimitOrderJITBehindEnemyLines() { +func (s *DexTestSuite) TestPlaceLimitOrderJITBehindEnemyLines() { s.fundAliceBalances(10, 0) s.fundBobBalances(0, 20) @@ -656,7 +656,7 @@ func (s *MsgServerTestSuite) TestPlaceLimitOrderJITBehindEnemyLines() { s.assertAliceBalances(0, 9) } -func (s *MsgServerTestSuite) TestPlaceLimitOrderJITNextBlock() { +func (s *DexTestSuite) TestPlaceLimitOrderJITNextBlock() { s.fundAliceBalances(10, 0) s.fundBobBalances(0, 20) @@ -667,7 +667,7 @@ func (s *MsgServerTestSuite) TestPlaceLimitOrderJITNextBlock() { // WHEN we move to block N+1 s.nextBlockWithTime(time.Now()) - s.app.EndBlock(abci.RequestEndBlock{Height: 0}) + s.App.EndBlock(abci.RequestEndBlock{Height: 0}) // THEN there is no liquidity available s.assertLimitLiquidityAtTick("TokenA", 0, 0) @@ -678,7 +678,7 @@ func (s *MsgServerTestSuite) TestPlaceLimitOrderJITNextBlock() { // GoodTilLimitOrders ////////////////////////////////////////////////// -func (s *MsgServerTestSuite) TestPlaceLimitOrderGoodTilFills() { +func (s *DexTestSuite) TestPlaceLimitOrderGoodTilFills() { s.fundAliceBalances(10, 0) s.fundBobBalances(0, 20) tomorrow := time.Now().AddDate(0, 0, 1) @@ -697,7 +697,7 @@ func (s *MsgServerTestSuite) TestPlaceLimitOrderGoodTilFills() { s.assertAliceBalances(0, 10) } -func (s *MsgServerTestSuite) TestPlaceLimitOrderGoodTilExpires() { +func (s *DexTestSuite) TestPlaceLimitOrderGoodTilExpires() { s.fundAliceBalances(10, 0) s.fundBobBalances(0, 20) tomorrow := time.Now().AddDate(0, 0, 1) @@ -708,7 +708,7 @@ func (s *MsgServerTestSuite) TestPlaceLimitOrderGoodTilExpires() { // When two days go by and multiple blocks are created (ie. purge is run) s.nextBlockWithTime(time.Now().AddDate(0, 0, 2)) - s.app.EndBlock(abci.RequestEndBlock{Height: 0}) + s.App.EndBlock(abci.RequestEndBlock{Height: 0}) // THEN there is no liquidity available s.assertLimitLiquidityAtTick("TokenA", 0, 0) // Alice can withdraw the entirety of the unfilled limitOrder @@ -716,7 +716,7 @@ func (s *MsgServerTestSuite) TestPlaceLimitOrderGoodTilExpires() { s.assertAliceBalances(10, 0) } -func (s *MsgServerTestSuite) TestPlaceLimitOrderGoodTilExpiresNotPurged() { +func (s *DexTestSuite) TestPlaceLimitOrderGoodTilExpiresNotPurged() { // This is testing the case where the limitOrder has expired but has not yet been purged s.fundAliceBalances(10, 0) s.fundBobBalances(0, 20) @@ -737,11 +737,11 @@ func (s *MsgServerTestSuite) TestPlaceLimitOrderGoodTilExpiresNotPurged() { s.assertAliceBalances(10, 0) } -func (s *MsgServerTestSuite) TestPlaceLimitOrderGoodTilHandlesTimezoneCorrectly() { +func (s *DexTestSuite) TestPlaceLimitOrderGoodTilHandlesTimezoneCorrectly() { s.fundAliceBalances(10, 0) timeInPST, _ := time.Parse(time.RFC3339, "2050-01-02T15:04:05-08:00") trancheKey := s.aliceLimitSellsGoodTil("TokenA", 0, 10, timeInPST) - tranche := s.app.DexKeeper.GetLimitOrderTranche(s.ctx, &types.LimitOrderTrancheKey{ + tranche := s.App.DexKeeper.GetLimitOrderTranche(s.Ctx, &types.LimitOrderTrancheKey{ TradePairID: defaultTradePairID1To0, TickIndexTakerToMaker: 0, TrancheKey: trancheKey, @@ -750,14 +750,14 @@ func (s *MsgServerTestSuite) TestPlaceLimitOrderGoodTilHandlesTimezoneCorrectly( s.Assert().Equal(tranche.ExpirationTime.Unix(), timeInPST.Unix()) } -func (s *MsgServerTestSuite) TestPlaceLimitOrderGoodTilAlreadyExpiredFails() { +func (s *DexTestSuite) TestPlaceLimitOrderGoodTilAlreadyExpiredFails() { s.fundAliceBalances(10, 0) now := time.Now() yesterday := time.Now().AddDate(0, 0, -1) s.nextBlockWithTime(now) - _, err := s.msgServer.PlaceLimitOrder(s.goCtx, &types.MsgPlaceLimitOrder{ + _, err := s.msgServer.PlaceLimitOrder(s.GoCtx, &types.MsgPlaceLimitOrder{ Creator: s.alice.String(), Receiver: s.alice.String(), TokenIn: "TokenA", diff --git a/x/dex/keeper/integration_withdraw_multi_test.go b/x/dex/keeper/integration_withdraw_multi_test.go index 6b092f4c3..410b2878d 100644 --- a/x/dex/keeper/integration_withdraw_multi_test.go +++ b/x/dex/keeper/integration_withdraw_multi_test.go @@ -5,7 +5,7 @@ import ( "github.com/neutron-org/neutron/x/dex/types" ) -func (s *MsgServerTestSuite) TestWithdrawMultiFailure() { +func (s *DexTestSuite) TestWithdrawMultiFailure() { s.fundAliceBalances(50, 50) // GIVEN // alice deposits 5 A, 5 B in tick 0 fee 0 @@ -26,7 +26,7 @@ func (s *MsgServerTestSuite) TestWithdrawMultiFailure() { ) } -func (s *MsgServerTestSuite) TestWithdrawMultiSuccess() { +func (s *DexTestSuite) TestWithdrawMultiSuccess() { s.fundAliceBalances(50, 50) // GIVEN diff --git a/x/dex/keeper/integration_withdraw_test.go b/x/dex/keeper/integration_withdraw_test.go index afeeb89e9..4b2d100b3 100644 --- a/x/dex/keeper/integration_withdraw_test.go +++ b/x/dex/keeper/integration_withdraw_test.go @@ -7,7 +7,7 @@ import ( "github.com/neutron-org/neutron/x/dex/types" ) -func (s *MsgServerTestSuite) TestPartialWithdrawOnlyA() { +func (s *DexTestSuite) TestPartialWithdrawOnlyA() { s.fundAliceBalances(50, 50) // CASE // Alice deposits 10 of A at tick 0, fee tier 0 @@ -32,7 +32,7 @@ func (s *MsgServerTestSuite) TestPartialWithdrawOnlyA() { s.assertCurr0To1(math.MaxInt64) } -func (s *MsgServerTestSuite) TestPartialWithdrawOnlyB() { +func (s *DexTestSuite) TestPartialWithdrawOnlyB() { s.fundAliceBalances(50, 50) // CASE // Alice deposits 10 of B at tick 0, fee tier 0 @@ -57,7 +57,7 @@ func (s *MsgServerTestSuite) TestPartialWithdrawOnlyB() { s.assertCurr0To1(1) } -func (s *MsgServerTestSuite) TestFullWithdrawOnlyB() { +func (s *DexTestSuite) TestFullWithdrawOnlyB() { s.fundAliceBalances(50, 50) // CASE // Alice deposits 10 of B at tick 0, fee tier 0 @@ -82,7 +82,7 @@ func (s *MsgServerTestSuite) TestFullWithdrawOnlyB() { s.assertCurr0To1(math.MaxInt64) } -func (s *MsgServerTestSuite) TestCurrentTickUpdatesAfterDoubleSidedThenSingleSidedDepositAndPartialWithdrawal() { +func (s *DexTestSuite) TestCurrentTickUpdatesAfterDoubleSidedThenSingleSidedDepositAndPartialWithdrawal() { s.fundAliceBalances(50, 50) // CASE // Alice deposits 10 of A and B with a spread (fee) of +- 3 ticks @@ -112,7 +112,7 @@ func (s *MsgServerTestSuite) TestCurrentTickUpdatesAfterDoubleSidedThenSingleSid s.assertCurr0To1(3) } -func (s *MsgServerTestSuite) TestCurrentTickUpdatesAfterDoubleSidedThenSingleSidedDepositAndFulllWithdrawal() { +func (s *DexTestSuite) TestCurrentTickUpdatesAfterDoubleSidedThenSingleSidedDepositAndFulllWithdrawal() { s.fundAliceBalances(50, 50) // CASE // Alice deposits 10 of A and B with a spread (fee) of +- 3 ticks @@ -141,7 +141,7 @@ func (s *MsgServerTestSuite) TestCurrentTickUpdatesAfterDoubleSidedThenSingleSid s.assertCurr0To1(math.MaxInt64) } -func (s *MsgServerTestSuite) TestTwoFullDoubleSidedRebalancedAtooMuchTick0() { +func (s *DexTestSuite) TestTwoFullDoubleSidedRebalancedAtooMuchTick0() { s.fundAliceBalances(50, 50) s.fundBobBalances(50, 50) // CASE @@ -184,7 +184,7 @@ func (s *MsgServerTestSuite) TestTwoFullDoubleSidedRebalancedAtooMuchTick0() { s.assertCurr0To1(math.MaxInt64) } -func (s *MsgServerTestSuite) TestTwoFullDoubleSidedRebalancedBtooMuchTick0() { +func (s *DexTestSuite) TestTwoFullDoubleSidedRebalancedBtooMuchTick0() { s.fundAliceBalances(50, 50) s.fundBobBalances(50, 50) // CASE @@ -227,7 +227,7 @@ func (s *MsgServerTestSuite) TestTwoFullDoubleSidedRebalancedBtooMuchTick0() { s.assertCurr0To1(math.MaxInt64) } -func (s *MsgServerTestSuite) TestWithdrawalFailsWhenNotEnoughShares() { +func (s *DexTestSuite) TestWithdrawalFailsWhenNotEnoughShares() { s.fundAliceBalances(100, 0) // IF Alice deposits 100 @@ -239,14 +239,14 @@ func (s *MsgServerTestSuite) TestWithdrawalFailsWhenNotEnoughShares() { s.aliceWithdrawFails(err, NewWithdrawal(200, 0, 1)) } -func (s *MsgServerTestSuite) TestWithdrawalFailsWithNonExistentPair() { +func (s *DexTestSuite) TestWithdrawalFailsWithNonExistentPair() { s.fundAliceBalances(100, 0) // IF Alice Deposists 100 s.aliceDeposits(NewDeposit(100, 0, 0, 1)) // WHEN Alice tries to withdraw from a nonexistent tokenPair - _, err := s.msgServer.Withdrawal(s.goCtx, &types.MsgWithdrawal{ + _, err := s.msgServer.Withdrawal(s.GoCtx, &types.MsgWithdrawal{ Creator: s.alice.String(), Receiver: s.alice.String(), TokenA: "TokenX", diff --git a/x/dex/keeper/integration_withdrawfilled_test.go b/x/dex/keeper/integration_withdrawfilled_test.go index 2ff2cd1a1..2f8b4c651 100644 --- a/x/dex/keeper/integration_withdrawfilled_test.go +++ b/x/dex/keeper/integration_withdrawfilled_test.go @@ -6,7 +6,7 @@ import ( "github.com/neutron-org/neutron/x/dex/types" ) -func (s *MsgServerTestSuite) TestWithdrawFilledSimpleFull() { +func (s *DexTestSuite) TestWithdrawFilledSimpleFull() { s.fundAliceBalances(50, 50) s.fundBobBalances(50, 50) // CASE @@ -39,11 +39,11 @@ func (s *MsgServerTestSuite) TestWithdrawFilledSimpleFull() { s.assertCurr0To1(math.MaxInt64) // Assert that the LimitOrderTrancheUser has been deleted - _, found := s.app.DexKeeper.GetLimitOrderTrancheUser(s.ctx, s.alice.String(), trancheKey) + _, found := s.App.DexKeeper.GetLimitOrderTrancheUser(s.Ctx, s.alice.String(), trancheKey) s.Assert().False(found) } -func (s *MsgServerTestSuite) TestWithdrawFilledPartial() { +func (s *DexTestSuite) TestWithdrawFilledPartial() { s.fundAliceBalances(100, 100) s.fundBobBalances(100, 100) @@ -73,11 +73,11 @@ func (s *MsgServerTestSuite) TestWithdrawFilledPartial() { s.assertBobBalances(90, 110) // the LimitOrderTrancheUser still exists - _, found := s.app.DexKeeper.GetLimitOrderTrancheUser(s.ctx, s.alice.String(), trancheKey) + _, found := s.App.DexKeeper.GetLimitOrderTrancheUser(s.Ctx, s.alice.String(), trancheKey) s.Assert().True(found) } -func (s *MsgServerTestSuite) TestWithdrawFilledTwiceFullSameDirection() { +func (s *DexTestSuite) TestWithdrawFilledTwiceFullSameDirection() { s.fundAliceBalances(50, 50) s.fundBobBalances(50, 50) // CASE @@ -129,7 +129,7 @@ func (s *MsgServerTestSuite) TestWithdrawFilledTwiceFullSameDirection() { s.assertCurr0To1(math.MaxInt64) } -func (s *MsgServerTestSuite) TestWithdrawFilledTwiceFullDifferentDirection() { +func (s *DexTestSuite) TestWithdrawFilledTwiceFullDifferentDirection() { s.fundAliceBalances(50, 50) s.fundBobBalances(50, 50) // CASE @@ -181,7 +181,7 @@ func (s *MsgServerTestSuite) TestWithdrawFilledTwiceFullDifferentDirection() { s.assertCurr0To1(math.MaxInt64) } -func (s *MsgServerTestSuite) TestWithdrawFilledEmptyFilled() { +func (s *DexTestSuite) TestWithdrawFilledEmptyFilled() { s.fundAliceBalances(50, 50) // GIVEN @@ -196,7 +196,7 @@ func (s *MsgServerTestSuite) TestWithdrawFilledEmptyFilled() { s.aliceWithdrawLimitSellFails(err, trancheKey) } -func (s *MsgServerTestSuite) TestWithdrawFilledNoExistingOrderByUser() { +func (s *DexTestSuite) TestWithdrawFilledNoExistingOrderByUser() { s.fundAliceBalances(50, 50) s.fundBobBalances(50, 50) @@ -212,7 +212,7 @@ func (s *MsgServerTestSuite) TestWithdrawFilledNoExistingOrderByUser() { s.bobWithdrawLimitSellFails(err, trancheKey) } -func (s *MsgServerTestSuite) TestWithdrawFilledOtherUserOrder() { +func (s *DexTestSuite) TestWithdrawFilledOtherUserOrder() { s.fundAliceBalances(50, 50) s.fundBobBalances(50, 50) diff --git a/x/dex/keeper/limit_order_expiration_test.go b/x/dex/keeper/limit_order_expiration_test.go index e73978b37..598a6ac25 100644 --- a/x/dex/keeper/limit_order_expiration_test.go +++ b/x/dex/keeper/limit_order_expiration_test.go @@ -2,20 +2,14 @@ package keeper_test import ( "strconv" - "testing" "time" "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - keepertest "github.com/neutron-org/neutron/testutil/dex/keeper" "github.com/neutron-org/neutron/x/dex/keeper" "github.com/neutron-org/neutron/x/dex/types" - "github.com/stretchr/testify/require" ) -// Prevent strconv unused error -var _ = strconv.IntSize - func createNLimitOrderExpiration( keeper *keeper.Keeper, ctx sdk.Context, @@ -62,55 +56,51 @@ func createLimitOrderExpirationAndTranches( } } -func TestLimitOrderExpirationGet(t *testing.T) { - keeper, ctx := keepertest.DexKeeper(t) - items := createNLimitOrderExpiration(keeper, ctx, 10) +func (s *DexTestSuite) TestLimitOrderExpirationGet() { + keeper := s.App.DexKeeper + items := createNLimitOrderExpiration(&keeper, s.Ctx, 10) for _, item := range items { - rst, found := keeper.GetLimitOrderExpiration(ctx, + rst, found := keeper.GetLimitOrderExpiration(s.Ctx, item.ExpirationTime, item.TrancheRef, ) - require.True(t, found) - require.Equal(t, - item, - *rst, - ) + s.True(found) + s.Equal(item, *rst) } } -func TestLimitOrderExpirationRemove(t *testing.T) { - keeper, ctx := keepertest.DexKeeper(t) - items := createNLimitOrderExpiration(keeper, ctx, 10) +func (s *DexTestSuite) TestLimitOrderExpirationRemove() { + keeper := s.App.DexKeeper + items := createNLimitOrderExpiration(&keeper, s.Ctx, 10) for _, item := range items { - keeper.RemoveLimitOrderExpiration(ctx, + keeper.RemoveLimitOrderExpiration(s.Ctx, item.ExpirationTime, item.TrancheRef, ) - _, found := keeper.GetLimitOrderExpiration(ctx, + _, found := keeper.GetLimitOrderExpiration(s.Ctx, item.ExpirationTime, item.TrancheRef, ) - require.False(t, found) + s.False(found) } } -func TestLimitOrderExpirationGetAll(t *testing.T) { - keeper, ctx := keepertest.DexKeeper(t) - items := createNLimitOrderExpiration(keeper, ctx, 10) +func (s *DexTestSuite) TestLimitOrderExpirationGetAll() { + items := createNLimitOrderExpiration(&s.App.DexKeeper, s.Ctx, 10) pointerItems := make([]*types.LimitOrderExpiration, len(items)) for i := range items { pointerItems[i] = &items[i] } - require.ElementsMatch(t, + s.ElementsMatch( pointerItems, - keeper.GetAllLimitOrderExpiration(ctx), + s.App.DexKeeper.GetAllLimitOrderExpiration(s.Ctx), ) } -func TestPurgeExpiredLimitOrders(t *testing.T) { - keeper, ctx := keepertest.DexKeeper(t) +func (s *DexTestSuite) TestPurgeExpiredLimitOrders() { + keeper := s.App.DexKeeper now := time.Now().UTC() - ctx = ctx.WithBlockTime(now) + ctx := s.Ctx.WithBlockTime(now) ctx = ctx.WithBlockGasMeter(sdk.NewGasMeter(1000000)) yesterday := now.AddDate(0, 0, -1) @@ -125,33 +115,33 @@ func TestPurgeExpiredLimitOrders(t *testing.T) { nextWeek, } - createLimitOrderExpirationAndTranches(keeper, ctx, expTimes) - keeper.PurgeExpiredLimitOrders(ctx, now) + createLimitOrderExpirationAndTranches(&keeper, s.Ctx, expTimes) + keeper.PurgeExpiredLimitOrders(s.Ctx, now) // Only future LimitOrderExpiration items still exist - expList := keeper.GetAllLimitOrderExpiration(ctx) - require.Equal(t, 2, len(expList)) - require.Equal(t, tomorrow, expList[0].ExpirationTime) - require.Equal(t, nextWeek, expList[1].ExpirationTime) + expList := keeper.GetAllLimitOrderExpiration(s.Ctx) + s.Equal(2, len(expList)) + s.Equal(tomorrow, expList[0].ExpirationTime) + s.Equal(nextWeek, expList[1].ExpirationTime) // Only future LimitOrderTranches Exist - trancheList := keeper.GetAllLimitOrderTrancheAtIndex(ctx, defaultTradePairID1To0, 0) - require.Equal(t, 2, len(trancheList)) - require.Equal(t, tomorrow, *trancheList[0].ExpirationTime) - require.Equal(t, nextWeek, *trancheList[1].ExpirationTime) + trancheList := keeper.GetAllLimitOrderTrancheAtIndex(s.Ctx, defaultTradePairID1To0, 0) + s.Equal(2, len(trancheList)) + s.Equal(tomorrow, *trancheList[0].ExpirationTime) + s.Equal(nextWeek, *trancheList[1].ExpirationTime) // InactiveLimitOrderTranches have been created for the expired tranched inactiveTrancheList := keeper.GetAllInactiveLimitOrderTranche(ctx) - require.Equal(t, 3, len(inactiveTrancheList)) - require.Equal(t, yesterday, *inactiveTrancheList[0].ExpirationTime) - require.Equal(t, yesterday, *inactiveTrancheList[1].ExpirationTime) - require.Equal(t, now, *inactiveTrancheList[2].ExpirationTime) + s.Equal(3, len(inactiveTrancheList)) + s.Equal(yesterday, *inactiveTrancheList[0].ExpirationTime) + s.Equal(yesterday, *inactiveTrancheList[1].ExpirationTime) + s.Equal(now, *inactiveTrancheList[2].ExpirationTime) } -func TestPurgeExpiredLimitOrdersAtBlockGasLimit(t *testing.T) { - keeper, ctx := keepertest.DexKeeper(t) +func (s *DexTestSuite) TestPurgeExpiredLimitOrdersAtBlockGasLimit() { + keeper := s.App.DexKeeper now := time.Now().UTC() - ctx = ctx.WithBlockTime(now) + ctx := s.Ctx.WithBlockTime(now) gasLimit := 1000000 ctx = ctx.WithBlockGasMeter(sdk.NewGasMeter(uint64(gasLimit))) timeRequiredToPurgeOneNonJIT := 35000 @@ -166,7 +156,7 @@ func TestPurgeExpiredLimitOrdersAtBlockGasLimit(t *testing.T) { yesterday, yesterday, } - createLimitOrderExpirationAndTranches(keeper, ctx, expTimes) + createLimitOrderExpirationAndTranches(&keeper, ctx, expTimes) // IF blockGasMeter is nearing the GoodTilPurgeBuffer ctx = ctx.WithGasMeter(sdk.NewGasMeter(uint64(gasLimit))) @@ -176,25 +166,20 @@ func TestPurgeExpiredLimitOrdersAtBlockGasLimit(t *testing.T) { keeper.PurgeExpiredLimitOrders(ctx, now) // THEN GoodTilPurgeHitGasLimit event is emitted - keepertest.AssertEventEmitted( - t, - ctx, - types.GoodTilPurgeHitGasLimitEventKey, - "Gas Limit Event not emitted", - ) + s.AssertEventValueEmitted(types.GoodTilPurgeHitGasLimitEventKey, "Gas Limit Event not emitted") // All JIT expirations are purged but other expirations remain expList := keeper.GetAllLimitOrderExpiration(ctx) // NOTE: this test is very brittle because it relies on an estimated cost // for deleting expirations. If this cost changes the number of remaining // expirations may change - require.Equal(t, 1, len(expList)) + s.Equal(1, len(expList)) } -func TestPurgeExpiredLimitOrdersAtBlockGasLimitOnlyJIT(t *testing.T) { - keeper, ctx := keepertest.DexKeeper(t) +func (s *DexTestSuite) TestPurgeExpiredLimitOrdersAtBlockGasLimitOnlyJIT() { + keeper := s.App.DexKeeper now := time.Now().UTC() - ctx = ctx.WithBlockTime(now) + ctx := s.Ctx.WithBlockTime(now) gasLimt := 1000000 ctx = ctx.WithBlockGasMeter(sdk.NewGasMeter(uint64(gasLimt))) gasUsed := gasLimt - types.GoodTilPurgeGasBuffer - 30000 @@ -209,20 +194,15 @@ func TestPurgeExpiredLimitOrdersAtBlockGasLimitOnlyJIT(t *testing.T) { types.JITGoodTilTime(), } - createLimitOrderExpirationAndTranches(keeper, ctx, expTimes) + createLimitOrderExpirationAndTranches(&keeper, ctx, expTimes) ctx = ctx.WithGasMeter(sdk.NewGasMeter(100000)) ctx.BlockGasMeter().ConsumeGas(uint64(gasUsed), "stub block gas usage") keeper.PurgeExpiredLimitOrders(ctx, now) // GoodTilPurgeHitGasLimit event is not been emitted - keepertest.AssertEventNotEmitted( - t, - ctx, - types.GoodTilPurgeHitGasLimitEventGas, - "Hit gas limit purging JIT expirations", - ) + s.AssertEventValueNotEmitted(types.GoodTilPurgeHitGasLimitEventGas, "Hit gas limit purging JIT expirations") // All JIT expirations are purged expList := keeper.GetAllLimitOrderExpiration(ctx) - require.Equal(t, 0, len(expList)) + s.Equal(0, len(expList)) } diff --git a/x/dex/keeper/limit_order_tranche_user_test.go b/x/dex/keeper/limit_order_tranche_user_test.go index b9d8dd956..3c507ce49 100644 --- a/x/dex/keeper/limit_order_tranche_user_test.go +++ b/x/dex/keeper/limit_order_tranche_user_test.go @@ -74,7 +74,7 @@ func TestLimitOrderTrancheUserRemove(t *testing.T) { } } -func (s *MsgServerTestSuite) TestGetAllLimitOrders() { +func (s *DexTestSuite) TestGetAllLimitOrders() { // WHEN Alice places 2 limit orders s.fundAliceBalances(20, 20) s.fundBobBalances(20, 20) @@ -83,7 +83,7 @@ func (s *MsgServerTestSuite) TestGetAllLimitOrders() { s.bobLimitSells("TokenA", -1, 10) // THEN GetAllLimitOrders returns alice's same two orders - LOList := s.app.DexKeeper.GetAllLimitOrderTrancheUserForAddress(s.ctx, s.alice) + LOList := s.App.DexKeeper.GetAllLimitOrderTrancheUserForAddress(s.Ctx, s.alice) s.Assert().Equal(2, len(LOList)) s.Assert().Equal(&types.LimitOrderTrancheUser{ TradePairID: defaultTradePairID1To0, diff --git a/x/dex/keeper/liquidity_test.go b/x/dex/keeper/liquidity_test.go index 1fc93edee..cdfb199cf 100644 --- a/x/dex/keeper/liquidity_test.go +++ b/x/dex/keeper/liquidity_test.go @@ -2,39 +2,15 @@ package keeper_test import ( "math" - "testing" sdkmath "cosmossdk.io/math" - tmproto "github.com/cometbft/cometbft/proto/tendermint/types" sdk "github.com/cosmos/cosmos-sdk/types" - dualityapp "github.com/neutron-org/neutron/app" - "github.com/neutron-org/neutron/testutil" - keepertest "github.com/neutron-org/neutron/testutil/dex/keeper" "github.com/neutron-org/neutron/x/dex/types" - "github.com/stretchr/testify/suite" ) -type LiquidityTestSuite struct { - suite.Suite - app *dualityapp.App - ctx sdk.Context -} - // TODO: In an ideal world, there should be enough lower level testing that the swap tests // don't need to test both LO and LP. At the level of swap testing these should be indistinguishable. - -func (s *LiquidityTestSuite) SetupTest() { - s.app = testutil.Setup(s.T()) - ctx := s.app.BaseApp.NewContext(false, tmproto.Header{}) - ctx = ctx.WithBlockGasMeter(sdk.NewInfiniteGasMeter()) - s.ctx = ctx -} - -func TestLiquidityTestSuite(t *testing.T) { - suite.Run(t, new(LiquidityTestSuite)) -} - -func (s *LiquidityTestSuite) TestSwap0To1NoLiquidity() { +func (s *DexTestSuite) TestSwap0To1NoLiquidity() { // GIVEN no liqudity of token B (deposit only token A and LO of token A) s.addDeposit(NewDeposit(10, 0, 0, 1)) s.placeGTCLimitOrder("TokenA", 1000, 10) @@ -44,12 +20,12 @@ func (s *LiquidityTestSuite) TestSwap0To1NoLiquidity() { // THEN swap should do nothing s.assertSwapOutput(tokenIn, 0, tokenOut, 0) - s.assertDexBalances(1010, 0) + s.assertTickBalances(1010, 0) s.assertCurr0To1(math.MaxInt64) } -func (s *LiquidityTestSuite) TestSwap1To0NoLiquidity() { +func (s *DexTestSuite) TestSwap1To0NoLiquidity() { // GIVEN no liqudity of token A (deposit only token B and LO of token B) s.addDeposit(NewDeposit(0, 10, 0, 1)) s.placeGTCLimitOrder("TokenB", 1000, 10) @@ -59,14 +35,14 @@ func (s *LiquidityTestSuite) TestSwap1To0NoLiquidity() { // THEN swap should do nothing s.assertSwapOutput(tokenIn, 0, tokenOut, 0) - s.assertDexBalances(0, 1010) + s.assertTickBalances(0, 1010) s.assertCurr1To0(math.MinInt64) } // swaps against LPs only ///////////////////////////////////////////////////// -func (s *LiquidityTestSuite) TestSwap0To1PartialFillLP() { +func (s *DexTestSuite) TestSwap0To1PartialFillLP() { // GIVEN 10 tokenB LP @ tick 0 fee 1 s.addDeposit(NewDeposit(0, 10, 0, 1)) @@ -77,13 +53,13 @@ func (s *LiquidityTestSuite) TestSwap0To1PartialFillLP() { s.Assert().Equal("TokenA", tokenIn.Denom) s.Assert().Equal("TokenB", tokenOut.Denom) s.assertSwapOutput(tokenIn, 11, tokenOut, 10) - s.assertDexBalances(11, 0) + s.assertTickBalances(11, 0) s.assertCurr0To1(math.MaxInt64) s.assertCurr1To0(-1) } -func (s *LiquidityTestSuite) TestSwap1To0PartialFillLP() { +func (s *DexTestSuite) TestSwap1To0PartialFillLP() { // GIVEN 10 tokenA LP @ tick 0 fee 1 s.addDeposit(NewDeposit(10, 0, 0, 1)) @@ -94,13 +70,13 @@ func (s *LiquidityTestSuite) TestSwap1To0PartialFillLP() { s.Assert().Equal("TokenB", tokenIn.Denom) s.Assert().Equal("TokenA", tokenOut.Denom) s.assertSwapOutput(tokenIn, 11, tokenOut, 10) - s.assertDexBalances(0, 11) + s.assertTickBalances(0, 11) s.assertCurr0To1(1) s.assertCurr1To0(math.MinInt64) } -func (s *LiquidityTestSuite) TestSwap0To1FillLP() { +func (s *DexTestSuite) TestSwap0To1FillLP() { // GIVEN 100 tokenB LP @ tick 200 fee 5 s.addDeposit(NewDeposit(0, 100, 200, 5)) @@ -111,13 +87,13 @@ func (s *LiquidityTestSuite) TestSwap0To1FillLP() { s.Assert().Equal("TokenA", tokenIn.Denom) s.Assert().Equal("TokenB", tokenOut.Denom) s.assertSwapOutput(tokenIn, 100, tokenOut, 97) - s.assertDexBalances(100, 3) + s.assertTickBalances(100, 3) s.assertCurr0To1(205) s.assertCurr1To0(195) } -func (s *LiquidityTestSuite) TestSwap1To0FillLP() { +func (s *DexTestSuite) TestSwap1To0FillLP() { // GIVEN 100 tokenA LP @ tick -20,000 fee 1 s.addDeposit(NewDeposit(100, 0, -20_000, 1)) @@ -129,13 +105,13 @@ func (s *LiquidityTestSuite) TestSwap1To0FillLP() { s.Assert().Equal("TokenA", tokenOut.Denom) // NOTE: Given rounding for amountOut, amountIn does not use the full maxAmount s.assertSwapOutput(tokenIn, 97, tokenOut, 13) - s.assertDexBalances(87, 97) + s.assertTickBalances(87, 97) s.assertCurr0To1(-19_999) s.assertCurr1To0(-20_001) } -func (s *LiquidityTestSuite) TestSwap0To1FillLPHighFee() { +func (s *DexTestSuite) TestSwap0To1FillLPHighFee() { // GIVEN 100 tokenB LP @ tick 20,000 fee 1,000 s.addDeposit(NewDeposit(0, 100, 20_000, 1_000)) @@ -146,13 +122,13 @@ func (s *LiquidityTestSuite) TestSwap0To1FillLPHighFee() { s.Assert().Equal("TokenA", tokenIn.Denom) s.Assert().Equal("TokenB", tokenOut.Denom) s.assertSwapOutput(tokenIn, 98, tokenOut, 12) - s.assertDexBalances(98, 88) + s.assertTickBalances(98, 88) s.assertCurr0To1(21_000) s.assertCurr1To0(19_000) } -func (s *LiquidityTestSuite) TestSwap1To0FillLPHighFee() { +func (s *DexTestSuite) TestSwap1To0FillLPHighFee() { // GIVEN 1000 tokenA LP @ tick 20,000 fee 1000 s.addDeposit(NewDeposit(1000, 0, 20_000, 1000)) @@ -163,13 +139,13 @@ func (s *LiquidityTestSuite) TestSwap1To0FillLPHighFee() { s.Assert().Equal("TokenB", tokenIn.Denom) s.Assert().Equal("TokenA", tokenOut.Denom) s.assertSwapOutput(tokenIn, 100, tokenOut, 668) - s.assertDexBalances(332, 100) + s.assertTickBalances(332, 100) s.assertCurr0To1(21_000) s.assertCurr1To0(19_000) } -func (s *LiquidityTestSuite) TestSwap0To1PartialFillMultipleLP() { +func (s *DexTestSuite) TestSwap0To1PartialFillMultipleLP() { // GIVEN 300 worth of tokenB LPs s.addDeposits( NewDeposit(0, 100, -20_000, 1), @@ -184,13 +160,13 @@ func (s *LiquidityTestSuite) TestSwap0To1PartialFillMultipleLP() { s.Assert().Equal("TokenA", tokenIn.Denom) s.Assert().Equal("TokenB", tokenOut.Denom) s.assertSwapOutput(tokenIn, 42, tokenOut, 300) - s.assertDexBalances(42, 0) + s.assertTickBalances(42, 0) s.assertCurr0To1(math.MaxInt64) s.assertCurr1To0(-20_001) } -func (s *LiquidityTestSuite) TestSwap1To0PartialFillMultipleLP() { +func (s *DexTestSuite) TestSwap1To0PartialFillMultipleLP() { // GIVEN 300 worth of tokenA LPs s.addDeposits( NewDeposit(100, 0, 20_000, 1), @@ -205,13 +181,13 @@ func (s *LiquidityTestSuite) TestSwap1To0PartialFillMultipleLP() { s.Assert().Equal("TokenB", tokenIn.Denom) s.Assert().Equal("TokenA", tokenOut.Denom) s.assertSwapOutput(tokenIn, 42, tokenOut, 300) - s.assertDexBalances(0, 42) + s.assertTickBalances(0, 42) s.assertCurr0To1(20_001) s.assertCurr1To0(math.MinInt64) } -func (s *LiquidityTestSuite) TestSwap0To1FillMultipleLP() { +func (s *DexTestSuite) TestSwap0To1FillMultipleLP() { // GIVEN 400 worth of tokenB LPs s.addDeposits( NewDeposit(0, 100, -20, 1), @@ -227,13 +203,13 @@ func (s *LiquidityTestSuite) TestSwap0To1FillMultipleLP() { s.Assert().Equal("TokenA", tokenIn.Denom) s.Assert().Equal("TokenB", tokenOut.Denom) s.assertSwapOutput(tokenIn, 400, tokenOut, 400) - s.assertDexBalances(400, 0) + s.assertTickBalances(400, 0) s.assertCurr0To1(math.MaxInt64) s.assertCurr1To0(-21) } -func (s *LiquidityTestSuite) TestSwap1To0FillMultipleLP() { +func (s *DexTestSuite) TestSwap1To0FillMultipleLP() { // GIVEN 400 worth of tokenA LPs s.addDeposits( NewDeposit(100, 0, 20, 1), @@ -249,13 +225,13 @@ func (s *LiquidityTestSuite) TestSwap1To0FillMultipleLP() { s.Assert().Equal("TokenB", tokenIn.Denom) s.Assert().Equal("TokenA", tokenOut.Denom) s.assertSwapOutput(tokenIn, 400, tokenOut, 400) - s.assertDexBalances(0, 400) + s.assertTickBalances(0, 400) s.assertCurr0To1(21) s.assertCurr1To0(math.MinInt64) } -func (s *LiquidityTestSuite) TestSwap0To1LPMaxAmountUsed() { +func (s *DexTestSuite) TestSwap0To1LPMaxAmountUsed() { // GIVEN 10 TokenB available s.addDeposits(NewDeposit(0, 10, 0, 1)) @@ -264,10 +240,10 @@ func (s *LiquidityTestSuite) TestSwap0To1LPMaxAmountUsed() { // THEN swap should return 6 TokenA in and 5 TokenB out s.assertSwapOutput(tokenIn, 6, tokenOut, 5) - s.assertDexBalances(6, 5) + s.assertTickBalances(6, 5) } -func (s *LiquidityTestSuite) TestSwap1To0LPMaxAmountUsed() { +func (s *DexTestSuite) TestSwap1To0LPMaxAmountUsed() { // GIVEN 10 TokenA available s.addDeposits(NewDeposit(10, 0, 0, 1)) @@ -276,10 +252,10 @@ func (s *LiquidityTestSuite) TestSwap1To0LPMaxAmountUsed() { // THEN swap should return 6 TokenB in and 5 TokenA out s.assertSwapOutput(tokenIn, 6, tokenOut, 5) - s.assertDexBalances(5, 6) + s.assertTickBalances(5, 6) } -func (s *LiquidityTestSuite) TestSwap0To1LPMaxAmountNotUsed() { +func (s *DexTestSuite) TestSwap0To1LPMaxAmountNotUsed() { // GIVEN 10 TokenB available s.addDeposits(NewDeposit(0, 10, 0, 1)) @@ -288,10 +264,10 @@ func (s *LiquidityTestSuite) TestSwap0To1LPMaxAmountNotUsed() { // THEN swap should return 8 TokenA in and 7 TokenB out s.assertSwapOutput(tokenIn, 8, tokenOut, 7) - s.assertDexBalances(8, 3) + s.assertTickBalances(8, 3) } -func (s *LiquidityTestSuite) TestSwap1To0LPMaxAmountNotUsed() { +func (s *DexTestSuite) TestSwap1To0LPMaxAmountNotUsed() { // GIVEN 10 TokenA available s.addDeposits(NewDeposit(10, 0, 0, 1)) @@ -300,10 +276,10 @@ func (s *LiquidityTestSuite) TestSwap1To0LPMaxAmountNotUsed() { // THEN swap should return 8 TokenB in and 7 TokenA out s.assertSwapOutput(tokenIn, 8, tokenOut, 7) - s.assertDexBalances(3, 8) + s.assertTickBalances(3, 8) } -func (s *LiquidityTestSuite) TestSwap0To1LPMaxAmountUsedMultiTick() { +func (s *DexTestSuite) TestSwap0To1LPMaxAmountUsedMultiTick() { // GIVEN 50 TokenB available s.addDeposits( NewDeposit(0, 5, 0, 1), @@ -318,10 +294,10 @@ func (s *LiquidityTestSuite) TestSwap0To1LPMaxAmountUsedMultiTick() { // THEN swap should return 24 TokenA in and 20 TokenB out s.assertSwapOutput(tokenIn, 24, tokenOut, 20) - s.assertDexBalances(24, 30) + s.assertTickBalances(24, 30) } -func (s *LiquidityTestSuite) TestSwap1To0LPMaxAmountUsedMultiTick() { +func (s *DexTestSuite) TestSwap1To0LPMaxAmountUsedMultiTick() { // GIVEN 50 TokenA available s.addDeposits( NewDeposit(5, 0, 0, 1), @@ -336,10 +312,10 @@ func (s *LiquidityTestSuite) TestSwap1To0LPMaxAmountUsedMultiTick() { // THEN swap should return 20 TokenB in and 20 TokenA out s.assertSwapOutput(tokenIn, 20, tokenOut, 20) - s.assertDexBalances(30, 20) + s.assertTickBalances(30, 20) } -func (s *LiquidityTestSuite) TestSwap0To1LPMaxAmountNotUsedMultiTick() { +func (s *DexTestSuite) TestSwap0To1LPMaxAmountNotUsedMultiTick() { // GIVEN 50 TokenB available s.addDeposits( NewDeposit(0, 5, 0, 1), @@ -354,12 +330,12 @@ func (s *LiquidityTestSuite) TestSwap0To1LPMaxAmountNotUsedMultiTick() { // THEN swap should return 19 TokenA in and 15 TokenB out s.assertSwapOutput(tokenIn, 18, tokenOut, 15) - s.assertDexBalances(18, 35) + s.assertTickBalances(18, 35) } // swaps against LOs only ///////////////////////////////////////////////////// -func (s *LiquidityTestSuite) TestSwap0To1PartialFillLO() { +func (s *DexTestSuite) TestSwap0To1PartialFillLO() { // GIVEN 10 tokenB LO @ tick 1,000 s.placeGTCLimitOrder("TokenB", 10, 1_000) @@ -370,10 +346,10 @@ func (s *LiquidityTestSuite) TestSwap0To1PartialFillLO() { s.Assert().Equal("TokenA", tokenIn.Denom) s.Assert().Equal("TokenB", tokenOut.Denom) s.assertSwapOutput(tokenIn, 12, tokenOut, 10) - s.assertDexBalances(12, 0) + s.assertTickBalances(12, 0) } -func (s *LiquidityTestSuite) TestSwap1To0PartialFillLO() { +func (s *DexTestSuite) TestSwap1To0PartialFillLO() { // GIVEN 10 tokenA LO @ tick -1,000 s.placeGTCLimitOrder("TokenA", 10, -1_000) @@ -384,13 +360,13 @@ func (s *LiquidityTestSuite) TestSwap1To0PartialFillLO() { s.Assert().Equal("TokenB", tokenIn.Denom) s.Assert().Equal("TokenA", tokenOut.Denom) s.assertSwapOutput(tokenIn, 12, tokenOut, 10) - s.assertDexBalances(0, 12) + s.assertTickBalances(0, 12) s.assertCurr0To1(math.MaxInt64) s.assertCurr1To0(math.MinInt64) } -func (s *LiquidityTestSuite) TestSwap0To1FillLO() { +func (s *DexTestSuite) TestSwap0To1FillLO() { // GIVEN 100 tokenB LO @ tick 10,000 s.placeGTCLimitOrder("TokenB", 100, 10_000) @@ -401,13 +377,13 @@ func (s *LiquidityTestSuite) TestSwap0To1FillLO() { s.Assert().Equal("TokenA", tokenIn.Denom) s.Assert().Equal("TokenB", tokenOut.Denom) s.assertSwapOutput(tokenIn, 98, tokenOut, 36) - s.assertDexBalances(98, 64) + s.assertTickBalances(98, 64) s.assertCurr0To1(10_000) s.assertCurr1To0(math.MinInt64) } -func (s *LiquidityTestSuite) TestSwap1To0FillLO() { +func (s *DexTestSuite) TestSwap1To0FillLO() { // GIVEN 100 tokenA LO @ tick 10,000 s.placeGTCLimitOrder("TokenA", 100, -10_000) @@ -418,13 +394,13 @@ func (s *LiquidityTestSuite) TestSwap1To0FillLO() { s.Assert().Equal("TokenB", tokenIn.Denom) s.Assert().Equal("TokenA", tokenOut.Denom) s.assertSwapOutput(tokenIn, 9, tokenOut, 3) - s.assertDexBalances(97, 9) + s.assertTickBalances(97, 9) s.assertCurr0To1(math.MaxInt64) s.assertCurr1To0(-10_000) } -func (s *LiquidityTestSuite) TestSwap0To1FillMultipleLO() { +func (s *DexTestSuite) TestSwap0To1FillMultipleLO() { // GIVEN 300 tokenB across multiple LOs s.placeGTCLimitOrder("TokenB", 100, 1_000) s.placeGTCLimitOrder("TokenB", 100, 1_001) @@ -437,13 +413,13 @@ func (s *LiquidityTestSuite) TestSwap0To1FillMultipleLO() { s.Assert().Equal("TokenA", tokenIn.Denom) s.Assert().Equal("TokenB", tokenOut.Denom) s.assertSwapOutput(tokenIn, 300, tokenOut, 270) - s.assertDexBalances(300, 30) + s.assertTickBalances(300, 30) s.assertCurr0To1(1_002) s.assertCurr1To0(math.MinInt64) } -func (s *LiquidityTestSuite) TestSwap1To0FillMultipleLO() { +func (s *DexTestSuite) TestSwap1To0FillMultipleLO() { // GIVEN 300 tokenA across multiple LOs s.placeGTCLimitOrder("TokenA", 100, -1_000) s.placeGTCLimitOrder("TokenA", 100, -1_001) @@ -456,13 +432,13 @@ func (s *LiquidityTestSuite) TestSwap1To0FillMultipleLO() { s.Assert().Equal("TokenB", tokenIn.Denom) s.Assert().Equal("TokenA", tokenOut.Denom) s.assertSwapOutput(tokenIn, 300, tokenOut, 270) - s.assertDexBalances(30, 300) + s.assertTickBalances(30, 300) s.assertCurr0To1(math.MaxInt64) s.assertCurr1To0(-1_002) } -func (s *LiquidityTestSuite) TestSwap0To1LOMaxAmountUsed() { +func (s *DexTestSuite) TestSwap0To1LOMaxAmountUsed() { // GIVEN 10 TokenB available s.placeGTCLimitOrder("TokenB", 10, 1) @@ -471,10 +447,10 @@ func (s *LiquidityTestSuite) TestSwap0To1LOMaxAmountUsed() { // THEN swap should return 6 TokenA in and 5 TokenB out s.assertSwapOutput(tokenIn, 6, tokenOut, 5) - s.assertDexBalances(6, 5) + s.assertTickBalances(6, 5) } -func (s *LiquidityTestSuite) TestSwap1To0LOMaxAmountUsed() { +func (s *DexTestSuite) TestSwap1To0LOMaxAmountUsed() { // GIVEN 10 TokenA available s.placeGTCLimitOrder("TokenA", 10, 0) @@ -483,10 +459,10 @@ func (s *LiquidityTestSuite) TestSwap1To0LOMaxAmountUsed() { // THEN swap should return 5 TokenB in and 5 TokenA out s.assertSwapOutput(tokenIn, 5, tokenOut, 5) - s.assertDexBalances(5, 5) + s.assertTickBalances(5, 5) } -func (s *LiquidityTestSuite) TestSwap0To1LOMaxAmountNotUsed() { +func (s *DexTestSuite) TestSwap0To1LOMaxAmountNotUsed() { // GIVEN 10 TokenB available s.placeGTCLimitOrder("TokenB", 10, 1) @@ -495,10 +471,10 @@ func (s *LiquidityTestSuite) TestSwap0To1LOMaxAmountNotUsed() { // THEN swap should return 8 TokenA in and 7 TokenB out s.assertSwapOutput(tokenIn, 8, tokenOut, 7) - s.assertDexBalances(8, 3) + s.assertTickBalances(8, 3) } -func (s *LiquidityTestSuite) TestSwap1To0LOMaxAmountNotUsed() { +func (s *DexTestSuite) TestSwap1To0LOMaxAmountNotUsed() { // GIVEN 10 TokenA available s.placeGTCLimitOrder("TokenA", 10, 1) @@ -507,10 +483,10 @@ func (s *LiquidityTestSuite) TestSwap1To0LOMaxAmountNotUsed() { // THEN swap should return 8 TokenB in and 8 TokenA out s.assertSwapOutput(tokenIn, 8, tokenOut, 8) - s.assertDexBalances(2, 8) + s.assertTickBalances(2, 8) } -func (s *LiquidityTestSuite) TestSwap0To1LOMaxAmountUsedMultiTick() { +func (s *DexTestSuite) TestSwap0To1LOMaxAmountUsedMultiTick() { // GIVEN 50 TokenB available s.placeGTCLimitOrder("TokenB", 5, 0) s.placeGTCLimitOrder("TokenB", 5, 1) @@ -523,10 +499,10 @@ func (s *LiquidityTestSuite) TestSwap0To1LOMaxAmountUsedMultiTick() { // THEN swap should return 23 TokenA in and 20 TokenB out s.assertSwapOutput(tokenIn, 23, tokenOut, 20) - s.assertDexBalances(23, 30) + s.assertTickBalances(23, 30) } -func (s *LiquidityTestSuite) TestSwap1To0LOMaxAmountUsedMultiTick() { +func (s *DexTestSuite) TestSwap1To0LOMaxAmountUsedMultiTick() { // GIVEN 50 TokenA available s.placeGTCLimitOrder("TokenA", 5, 0) s.placeGTCLimitOrder("TokenA", 5, 1) @@ -539,10 +515,10 @@ func (s *LiquidityTestSuite) TestSwap1To0LOMaxAmountUsedMultiTick() { // THEN swap should return 20 TokenB in and 20 TokenA out s.assertSwapOutput(tokenIn, 20, tokenOut, 20) - s.assertDexBalances(30, 20) + s.assertTickBalances(30, 20) } -func (s *LiquidityTestSuite) TestSwap0To1LOMaxAmountNotUsedMultiTick() { +func (s *DexTestSuite) TestSwap0To1LOMaxAmountNotUsedMultiTick() { // GIVEN 50 TokenB available s.placeGTCLimitOrder("TokenB", 5, 0) s.placeGTCLimitOrder("TokenB", 5, 1) @@ -555,12 +531,12 @@ func (s *LiquidityTestSuite) TestSwap0To1LOMaxAmountNotUsedMultiTick() { // THEN swap should return 19 TokenA in and 16 TokenB out s.assertSwapOutput(tokenIn, 19, tokenOut, 16) - s.assertDexBalances(19, 34) + s.assertTickBalances(19, 34) } // Swap LO and LP //////////////////////////////////////////////////////////// -func (s *LiquidityTestSuite) TestSwapExhaustsLOAndLP() { +func (s *DexTestSuite) TestSwapExhaustsLOAndLP() { s.placeGTCLimitOrder("TokenB", 10, 0) s.addDeposits(NewDeposit(0, 10, 0, 1)) @@ -569,34 +545,34 @@ func (s *LiquidityTestSuite) TestSwapExhaustsLOAndLP() { // There should be total of 6 tick updates // (limitOrder, 2x deposit, 2x swap LP, swap LO) - keepertest.AssertNEventsEmitted(s.T(), s.ctx, types.TickUpdateEventKey, 6) + s.AssertNEventValuesEmitted(types.TickUpdateEventKey, 6) } // Test helpers /////////////////////////////////////////////////////////////// -func (s *LiquidityTestSuite) addDeposit(deposit *Deposit) { - pool, err := s.app.DexKeeper.GetOrInitPool(s.ctx, defaultPairID, deposit.TickIndex, deposit.Fee) +func (s *DexTestSuite) addDeposit(deposit *Deposit) { + pool, err := s.App.DexKeeper.GetOrInitPool(s.Ctx, defaultPairID, deposit.TickIndex, deposit.Fee) s.Assert().NoError(err) pool.LowerTick0.ReservesMakerDenom = pool.LowerTick0.ReservesMakerDenom.Add(deposit.AmountA) pool.UpperTick1.ReservesMakerDenom = pool.UpperTick1.ReservesMakerDenom.Add(deposit.AmountB) - s.app.DexKeeper.SetPool(s.ctx, pool) + s.App.DexKeeper.SetPool(s.Ctx, pool) } -func (s *LiquidityTestSuite) addDeposits(deposits ...*Deposit) { +func (s *DexTestSuite) addDeposits(deposits ...*Deposit) { for _, deposit := range deposits { s.addDeposit(deposit) } } -func (s *LiquidityTestSuite) placeGTCLimitOrder( +func (s *DexTestSuite) placeGTCLimitOrder( makerDenom string, amountIn int64, tickIndex int64, ) { tradePairID := defaultPairID.MustTradePairIDFromMaker(makerDenom) tickIndexTakerToMaker := tradePairID.TickIndexTakerToMaker(tickIndex) - tranche, err := s.app.DexKeeper.GetOrInitPlaceTranche( - s.ctx, + tranche, err := s.App.DexKeeper.GetOrInitPlaceTranche( + s.Ctx, tradePairID, tickIndexTakerToMaker, nil, @@ -604,18 +580,18 @@ func (s *LiquidityTestSuite) placeGTCLimitOrder( ) s.Assert().NoError(err) tranche.PlaceMakerLimitOrder(sdkmath.NewInt(amountIn)) - s.app.DexKeeper.SaveTranche(s.ctx, tranche) + s.App.DexKeeper.SaveTranche(s.Ctx, tranche) } -func (s *LiquidityTestSuite) swap( +func (s *DexTestSuite) swap( tokenIn string, tokenOut string, maxAmountIn int64, ) (coinIn, coinOut sdk.Coin) { tradePairID, err := types.NewTradePairID(tokenIn, tokenOut) s.Assert().NoError(err) - coinIn, coinOut, _, err = s.app.DexKeeper.Swap( - s.ctx, + coinIn, coinOut, _, err = s.App.DexKeeper.Swap( + s.Ctx, tradePairID, sdkmath.NewInt(maxAmountIn), nil, @@ -625,7 +601,7 @@ func (s *LiquidityTestSuite) swap( return coinIn, coinOut } -func (s *LiquidityTestSuite) swapWithMaxOut( +func (s *DexTestSuite) swapWithMaxOut( tokenIn string, tokenOut string, maxAmountIn int64, @@ -633,8 +609,8 @@ func (s *LiquidityTestSuite) swapWithMaxOut( ) (coinIn, coinOut sdk.Coin) { tradePairID := types.MustNewTradePairID(tokenIn, tokenOut) maxAmountOutInt := sdkmath.NewInt(maxAmountOut) - coinIn, coinOut, _, err := s.app.DexKeeper.Swap( - s.ctx, + coinIn, coinOut, _, err := s.App.DexKeeper.Swap( + s.Ctx, tradePairID, sdkmath.NewInt(maxAmountIn), &maxAmountOutInt, @@ -645,7 +621,7 @@ func (s *LiquidityTestSuite) swapWithMaxOut( return coinIn, coinOut } -func (s *LiquidityTestSuite) assertSwapOutput( +func (s *DexTestSuite) assertSwapOutput( actualIn sdk.Coin, expectedIn int64, actualOut sdk.Coin, @@ -660,15 +636,15 @@ func (s *LiquidityTestSuite) assertSwapOutput( True(amtOut.Equal(sdkmath.NewInt(expectedOut)), "Expected amountOut %d != %s", expectedOut, amtOut) } -func (s *LiquidityTestSuite) assertDexBalances(expectedABalance, expectedBBalance int64) { +func (s *DexTestSuite) assertTickBalances(expectedABalance, expectedBBalance int64) { // NOTE: We can't just check the actual DEX bank balances since we are testing swap // before any transfers take place. Instead we have to sum up the total amount of coins // at each tick expectedAInt := sdkmath.NewInt(expectedABalance) expectedBInt := sdkmath.NewInt(expectedBBalance) allCoins := sdk.Coins{} - ticks := s.app.DexKeeper.GetAllTickLiquidity(s.ctx) - inactiveLOs := s.app.DexKeeper.GetAllInactiveLimitOrderTranche(s.ctx) + ticks := s.App.DexKeeper.GetAllTickLiquidity(s.Ctx) + inactiveLOs := s.App.DexKeeper.GetAllInactiveLimitOrderTranche(s.Ctx) for _, tick := range ticks { switch liquidity := tick.Liquidity.(type) { @@ -702,27 +678,3 @@ func (s *LiquidityTestSuite) assertDexBalances(expectedABalance, expectedBBalanc s.Assert(). True(actualB.Equal(expectedBInt), "TokenB: expected %s != actual %s", expectedBInt, actualB) } - -func (s *LiquidityTestSuite) assertCurr0To1(curr0To1Expected int64) { - curr0To1Actual, found := s.app.DexKeeper.GetCurrTickIndexTakerToMakerNormalized( - s.ctx, - defaultTradePairID0To1, - ) - if curr0To1Expected == math.MaxInt64 { - s.Assert().False(found) - } else { - s.Assert().Equal(curr0To1Expected, curr0To1Actual) - } -} - -func (s *LiquidityTestSuite) assertCurr1To0(curr1To0Expected int64) { - curr1to0Actual, found := s.app.DexKeeper.GetCurrTickIndexTakerToMakerNormalized( - s.ctx, - defaultTradePairID1To0, - ) - if curr1To0Expected == math.MinInt64 { - s.Assert().False(found) - } else { - s.Assert().Equal(curr1To0Expected, curr1to0Actual) - } -} diff --git a/x/dex/keeper/msg_server_test.go b/x/dex/keeper/msg_server_test.go index 13a46cf85..f6dd8b43c 100644 --- a/x/dex/keeper/msg_server_test.go +++ b/x/dex/keeper/msg_server_test.go @@ -2,7 +2,6 @@ package keeper_test import ( - "context" "math" "testing" "time" @@ -11,8 +10,7 @@ import ( abci "github.com/cometbft/cometbft/abci/types" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" sdk "github.com/cosmos/cosmos-sdk/types" - dualityapp "github.com/neutron-org/neutron/app" - "github.com/neutron-org/neutron/testutil" + "github.com/neutron-org/neutron/testutil/apptesting" math_utils "github.com/neutron-org/neutron/utils/math" . "github.com/neutron-org/neutron/x/dex/keeper" . "github.com/neutron-org/neutron/x/dex/keeper/internal/testutils" @@ -21,16 +19,13 @@ import ( ) // / Test suite -type MsgServerTestSuite struct { - suite.Suite - app *dualityapp.App +type DexTestSuite struct { + apptesting.KeeperTestHelper msgServer types.MsgServer - ctx sdk.Context alice sdk.AccAddress bob sdk.AccAddress carol sdk.AccAddress dan sdk.AccAddress - goCtx context.Context } var defaultPairID *types.PairID = &types.PairID{Token0: "TokenA", Token1: "TokenB"} @@ -45,88 +40,76 @@ var defaultTradePairID1To0 *types.TradePairID = &types.TradePairID{ MakerDenom: "TokenA", } -func TestMsgServerTestSuite(t *testing.T) { - suite.Run(t, new(MsgServerTestSuite)) +func TestDexTestSuite(t *testing.T) { + suite.Run(t, new(DexTestSuite)) } -func (s *MsgServerTestSuite) SetupTest() { - app := testutil.Setup(s.T()) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) - ctx = ctx.WithBlockGasMeter(sdk.NewInfiniteGasMeter()) +func (s *DexTestSuite) SetupTest() { + s.Setup() - accAlice := app.AccountKeeper.NewAccountWithAddress(ctx, s.alice) - app.AccountKeeper.SetAccount(ctx, accAlice) - accBob := app.AccountKeeper.NewAccountWithAddress(ctx, s.bob) - app.AccountKeeper.SetAccount(ctx, accBob) - accCarol := app.AccountKeeper.NewAccountWithAddress(ctx, s.carol) - app.AccountKeeper.SetAccount(ctx, accCarol) - accDan := app.AccountKeeper.NewAccountWithAddress(ctx, s.dan) - app.AccountKeeper.SetAccount(ctx, accDan) - - s.app = app - s.msgServer = NewMsgServerImpl(app.DexKeeper) - s.ctx = ctx - s.goCtx = sdk.WrapSDKContext(ctx) s.alice = sdk.AccAddress([]byte("alice")) s.bob = sdk.AccAddress([]byte("bob")) s.carol = sdk.AccAddress([]byte("carol")) s.dan = sdk.AccAddress([]byte("dan")) + + s.msgServer = NewMsgServerImpl(s.App.DexKeeper) } /// Fund accounts -func (s *MsgServerTestSuite) fundAccountBalances(account sdk.AccAddress, aBalance, bBalance int64) { +func (s *DexTestSuite) fundAccountBalances(account sdk.AccAddress, aBalance, bBalance int64) { aBalanceInt := sdkmath.NewInt(aBalance) bBalanceInt := sdkmath.NewInt(bBalance) balances := sdk.NewCoins(NewACoin(aBalanceInt), NewBCoin(bBalanceInt)) - FundAccount(s.app.BankKeeper, s.ctx, account, balances) + + FundAccount(s.App.BankKeeper, s.Ctx, account, balances) s.assertAccountBalances(account, aBalance, bBalance) } -func (s *MsgServerTestSuite) fundAccountBalancesWithDenom( +func (s *DexTestSuite) fundAccountBalancesWithDenom( addr sdk.AccAddress, amounts sdk.Coins, ) { - if err := s.app.BankKeeper.MintCoins(s.ctx, types.ModuleName, amounts); err != nil { + if err := s.App.BankKeeper.MintCoins(s.Ctx, types.ModuleName, amounts); err != nil { panic(err) } - if err := s.app.BankKeeper.SendCoinsFromModuleToAccount(s.ctx, types.ModuleName, addr, amounts); err != nil { + if err := s.App.BankKeeper.SendCoinsFromModuleToAccount(s.Ctx, types.ModuleName, addr, amounts); err != nil { panic(err) } } -func (s *MsgServerTestSuite) fundAliceBalances(a, b int64) { +func (s *DexTestSuite) fundAliceBalances(a, b int64) { s.fundAccountBalances(s.alice, a, b) } -func (s *MsgServerTestSuite) fundBobBalances(a, b int64) { +func (s *DexTestSuite) fundBobBalances(a, b int64) { s.fundAccountBalances(s.bob, a, b) } -func (s *MsgServerTestSuite) fundCarolBalances(a, b int64) { +func (s *DexTestSuite) fundCarolBalances(a, b int64) { s.fundAccountBalances(s.carol, a, b) } -func (s *MsgServerTestSuite) fundDanBalances(a, b int64) { +func (s *DexTestSuite) fundDanBalances(a, b int64) { s.fundAccountBalances(s.dan, a, b) } /// Assert balances -func (s *MsgServerTestSuite) assertAccountBalancesInt( +func (s *DexTestSuite) assertAccountBalancesInt( account sdk.AccAddress, aBalance sdkmath.Int, bBalance sdkmath.Int, ) { - aActual := s.app.BankKeeper.GetBalance(s.ctx, account, "TokenA").Amount + aActual := s.App.BankKeeper.GetBalance(s.Ctx, account, "TokenA").Amount s.Assert().True(aBalance.Equal(aActual), "expected %s != actual %s", aBalance, aActual) - bActual := s.app.BankKeeper.GetBalance(s.ctx, account, "TokenB").Amount + bActual := s.App.BankKeeper.GetBalance(s.Ctx, account, "TokenB").Amount s.Assert().True(bBalance.Equal(bActual), "expected %s != actual %s", bBalance, bActual) } -func (s *MsgServerTestSuite) assertAccountBalances( +func (s *DexTestSuite) assertAccountBalances( account sdk.AccAddress, aBalance int64, bBalance int64, @@ -134,74 +117,74 @@ func (s *MsgServerTestSuite) assertAccountBalances( s.assertAccountBalancesInt(account, sdkmath.NewInt(aBalance), sdkmath.NewInt(bBalance)) } -func (s *MsgServerTestSuite) assertAccountBalanceWithDenom( +func (s *DexTestSuite) assertAccountBalanceWithDenom( account sdk.AccAddress, denom string, expBalance int64, ) { - actualBalance := s.app.BankKeeper.GetBalance(s.ctx, account, denom).Amount + actualBalance := s.App.BankKeeper.GetBalance(s.Ctx, account, denom).Amount expBalanceInt := sdkmath.NewInt(expBalance) s.Assert(). True(expBalanceInt.Equal(actualBalance), "expected %s != actual %s", expBalance, actualBalance) } -func (s *MsgServerTestSuite) assertAliceBalances(a, b int64) { +func (s *DexTestSuite) assertAliceBalances(a, b int64) { s.assertAccountBalances(s.alice, a, b) } -func (s *MsgServerTestSuite) assertAliceBalancesInt(a, b sdkmath.Int) { +func (s *DexTestSuite) assertAliceBalancesInt(a, b sdkmath.Int) { s.assertAccountBalancesInt(s.alice, a, b) } -func (s *MsgServerTestSuite) assertBobBalances(a, b int64) { +func (s *DexTestSuite) assertBobBalances(a, b int64) { s.assertAccountBalances(s.bob, a, b) } -func (s *MsgServerTestSuite) assertBobBalancesInt(a, b sdkmath.Int) { +func (s *DexTestSuite) assertBobBalancesInt(a, b sdkmath.Int) { s.assertAccountBalancesInt(s.bob, a, b) } -func (s *MsgServerTestSuite) assertCarolBalances(a, b int64) { +func (s *DexTestSuite) assertCarolBalances(a, b int64) { s.assertAccountBalances(s.carol, a, b) } -func (s *MsgServerTestSuite) assertCarolBalancesInt(a, b sdkmath.Int) { +func (s *DexTestSuite) assertCarolBalancesInt(a, b sdkmath.Int) { s.assertAccountBalancesInt(s.carol, a, b) } -func (s *MsgServerTestSuite) assertDanBalances(a, b int64) { +func (s *DexTestSuite) assertDanBalances(a, b int64) { s.assertAccountBalances(s.dan, a, b) } -func (s *MsgServerTestSuite) assertDanBalancesInt(a, b sdkmath.Int) { +func (s *DexTestSuite) assertDanBalancesInt(a, b sdkmath.Int) { s.assertAccountBalancesInt(s.dan, a, b) } -func (s *MsgServerTestSuite) assertDexBalances(a, b int64) { - s.assertAccountBalances(s.app.AccountKeeper.GetModuleAddress("dex"), a, b) +func (s *DexTestSuite) assertDexBalances(a, b int64) { + s.assertAccountBalances(s.App.AccountKeeper.GetModuleAddress("dex"), a, b) } -func (s *MsgServerTestSuite) assertDexBalanceWithDenom(denom string, expectedAmount int64) { +func (s *DexTestSuite) assertDexBalanceWithDenom(denom string, expectedAmount int64) { s.assertAccountBalanceWithDenom( - s.app.AccountKeeper.GetModuleAddress("dex"), + s.App.AccountKeeper.GetModuleAddress("dex"), denom, expectedAmount, ) } -func (s *MsgServerTestSuite) assertDexBalancesInt(a, b sdkmath.Int) { - s.assertAccountBalancesInt(s.app.AccountKeeper.GetModuleAddress("dex"), a, b) +func (s *DexTestSuite) assertDexBalancesInt(a, b sdkmath.Int) { + s.assertAccountBalancesInt(s.App.AccountKeeper.GetModuleAddress("dex"), a, b) } -func (s *MsgServerTestSuite) traceBalances() { - aliceA := s.app.BankKeeper.GetBalance(s.ctx, s.alice, "TokenA") - aliceB := s.app.BankKeeper.GetBalance(s.ctx, s.alice, "TokenB") - bobA := s.app.BankKeeper.GetBalance(s.ctx, s.bob, "TokenA") - bobB := s.app.BankKeeper.GetBalance(s.ctx, s.bob, "TokenB") - carolA := s.app.BankKeeper.GetBalance(s.ctx, s.carol, "TokenA") - carolB := s.app.BankKeeper.GetBalance(s.ctx, s.carol, "TokenB") - danA := s.app.BankKeeper.GetBalance(s.ctx, s.dan, "TokenA") - danB := s.app.BankKeeper.GetBalance(s.ctx, s.dan, "TokenB") +func (s *DexTestSuite) traceBalances() { + aliceA := s.App.BankKeeper.GetBalance(s.Ctx, s.alice, "TokenA") + aliceB := s.App.BankKeeper.GetBalance(s.Ctx, s.alice, "TokenB") + bobA := s.App.BankKeeper.GetBalance(s.Ctx, s.bob, "TokenA") + bobB := s.App.BankKeeper.GetBalance(s.Ctx, s.bob, "TokenB") + carolA := s.App.BankKeeper.GetBalance(s.Ctx, s.carol, "TokenA") + carolB := s.App.BankKeeper.GetBalance(s.Ctx, s.carol, "TokenB") + danA := s.App.BankKeeper.GetBalance(s.Ctx, s.dan, "TokenA") + danB := s.App.BankKeeper.GetBalance(s.Ctx, s.dan, "TokenB") s.T().Logf( "Alice: %+v %+v\nBob: %+v %+v\nCarol: %+v %+v\nDan: %+v %+v", aliceA, aliceB, @@ -213,7 +196,7 @@ func (s *MsgServerTestSuite) traceBalances() { /// Place limit order -func (s *MsgServerTestSuite) aliceLimitSells( +func (s *DexTestSuite) aliceLimitSells( selling string, tick, amountIn int, orderTypeOpt ...types.LimitOrderType, @@ -221,7 +204,7 @@ func (s *MsgServerTestSuite) aliceLimitSells( return s.limitSellsSuccess(s.alice, selling, tick, amountIn, orderTypeOpt...) } -func (s *MsgServerTestSuite) bobLimitSells( +func (s *DexTestSuite) bobLimitSells( selling string, tick, amountIn int, orderTypeOpt ...types.LimitOrderType, @@ -229,7 +212,7 @@ func (s *MsgServerTestSuite) bobLimitSells( return s.limitSellsSuccess(s.bob, selling, tick, amountIn, orderTypeOpt...) } -func (s *MsgServerTestSuite) carolLimitSells( +func (s *DexTestSuite) carolLimitSells( selling string, tick, amountIn int, orderTypeOpt ...types.LimitOrderType, @@ -237,7 +220,7 @@ func (s *MsgServerTestSuite) carolLimitSells( return s.limitSellsSuccess(s.carol, selling, tick, amountIn, orderTypeOpt...) } -func (s *MsgServerTestSuite) danLimitSells( +func (s *DexTestSuite) danLimitSells( selling string, tick, amountIn int, orderTypeOpt ...types.LimitOrderType, @@ -245,7 +228,7 @@ func (s *MsgServerTestSuite) danLimitSells( return s.limitSellsSuccess(s.dan, selling, tick, amountIn, orderTypeOpt...) } -func (s *MsgServerTestSuite) limitSellsSuccess( +func (s *DexTestSuite) limitSellsSuccess( account sdk.AccAddress, tokenIn string, tick, amountIn int, @@ -256,7 +239,7 @@ func (s *MsgServerTestSuite) limitSellsSuccess( return trancheKey } -func (s *MsgServerTestSuite) aliceLimitSellsGoodTil( +func (s *DexTestSuite) aliceLimitSellsGoodTil( selling string, tick, amountIn int, goodTil time.Time, @@ -264,7 +247,7 @@ func (s *MsgServerTestSuite) aliceLimitSellsGoodTil( return s.limitSellsGoodTil(s.alice, selling, tick, amountIn, goodTil) } -func (s *MsgServerTestSuite) bobLimitSellsGoodTil( +func (s *DexTestSuite) bobLimitSellsGoodTil( selling string, tick, amountIn int, goodTil time.Time, @@ -272,7 +255,7 @@ func (s *MsgServerTestSuite) bobLimitSellsGoodTil( return s.limitSellsGoodTil(s.bob, selling, tick, amountIn, goodTil) } -func (s *MsgServerTestSuite) carolLimitSellsGoodTil( +func (s *DexTestSuite) carolLimitSellsGoodTil( selling string, tick, amountIn int, goodTil time.Time, @@ -280,7 +263,7 @@ func (s *MsgServerTestSuite) carolLimitSellsGoodTil( return s.limitSellsGoodTil(s.carol, selling, tick, amountIn, goodTil) } -func (s *MsgServerTestSuite) danLimitSellsGoodTil( +func (s *DexTestSuite) danLimitSellsGoodTil( selling string, tick, amountIn int, goodTil time.Time, @@ -288,7 +271,7 @@ func (s *MsgServerTestSuite) danLimitSellsGoodTil( return s.limitSellsGoodTil(s.dan, selling, tick, amountIn, goodTil) } -func (s *MsgServerTestSuite) assertAliceLimitSellFails( +func (s *DexTestSuite) assertAliceLimitSellFails( err error, selling string, tickIndexNormalized, amountIn int, @@ -297,7 +280,7 @@ func (s *MsgServerTestSuite) assertAliceLimitSellFails( s.assertLimitSellFails(s.alice, err, selling, tickIndexNormalized, amountIn, orderTypeOpt...) } -func (s *MsgServerTestSuite) assertBobLimitSellFails( +func (s *DexTestSuite) assertBobLimitSellFails( err error, selling string, tickIndexNormalized, amountIn int, @@ -306,7 +289,7 @@ func (s *MsgServerTestSuite) assertBobLimitSellFails( s.assertLimitSellFails(s.bob, err, selling, tickIndexNormalized, amountIn, orderTypeOpt...) } -func (s *MsgServerTestSuite) assertCarolLimitSellFails( +func (s *DexTestSuite) assertCarolLimitSellFails( err error, selling string, tickIndexNormalized, amountIn int, @@ -315,7 +298,7 @@ func (s *MsgServerTestSuite) assertCarolLimitSellFails( s.assertLimitSellFails(s.carol, err, selling, tickIndexNormalized, amountIn, orderTypeOpt...) } -func (s *MsgServerTestSuite) assertDanLimitSellFails( +func (s *DexTestSuite) assertDanLimitSellFails( err error, selling string, tickIndexNormalized, amountIn int, @@ -324,7 +307,7 @@ func (s *MsgServerTestSuite) assertDanLimitSellFails( s.assertLimitSellFails(s.dan, err, selling, tickIndexNormalized, amountIn, orderTypeOpt...) } -func (s *MsgServerTestSuite) assertLimitSellFails( +func (s *DexTestSuite) assertLimitSellFails( account sdk.AccAddress, expectedErr error, tokenIn string, @@ -335,35 +318,35 @@ func (s *MsgServerTestSuite) assertLimitSellFails( s.Assert().ErrorIs(err, expectedErr) } -func (s *MsgServerTestSuite) aliceLimitSellsWithMaxOut( +func (s *DexTestSuite) aliceLimitSellsWithMaxOut( selling string, tick, amountIn, maxAmountOut int, ) string { return s.limitSellsWithMaxOut(s.alice, selling, tick, amountIn, maxAmountOut) } -func (s *MsgServerTestSuite) bobLimitSellsWithMaxOut( +func (s *DexTestSuite) bobLimitSellsWithMaxOut( selling string, tick, amountIn, maxAmountOut int, ) string { return s.limitSellsWithMaxOut(s.bob, selling, tick, amountIn, maxAmountOut) } -func (s *MsgServerTestSuite) carolLimitSellsWithMaxOut( +func (s *DexTestSuite) carolLimitSellsWithMaxOut( selling string, tick, amountIn, maxAmountOut int, ) string { return s.limitSellsWithMaxOut(s.carol, selling, tick, amountIn, maxAmountOut) } -func (s *MsgServerTestSuite) danLimitSellsWithMaxOut( +func (s *DexTestSuite) danLimitSellsWithMaxOut( selling string, tick, amountIn, maxAmountOut int, ) string { return s.limitSellsWithMaxOut(s.dan, selling, tick, amountIn, maxAmountOut) } -func (s *MsgServerTestSuite) limitSellsWithMaxOut( +func (s *DexTestSuite) limitSellsWithMaxOut( account sdk.AccAddress, tokenIn string, tick, amountIn int, @@ -372,7 +355,7 @@ func (s *MsgServerTestSuite) limitSellsWithMaxOut( tokenIn, tokenOut := GetInOutTokens(tokenIn, "TokenA", "TokenB") maxAmountOutInt := sdkmath.NewInt(int64(maxAmoutOut)) - msg, err := s.msgServer.PlaceLimitOrder(s.goCtx, &types.MsgPlaceLimitOrder{ + msg, err := s.msgServer.PlaceLimitOrder(s.GoCtx, &types.MsgPlaceLimitOrder{ Creator: account.String(), Receiver: account.String(), TokenIn: tokenIn, @@ -388,7 +371,7 @@ func (s *MsgServerTestSuite) limitSellsWithMaxOut( return msg.TrancheKey } -func (s *MsgServerTestSuite) limitSells( +func (s *DexTestSuite) limitSells( account sdk.AccAddress, tokenIn string, tickIndexNormalized, amountIn int, @@ -403,7 +386,7 @@ func (s *MsgServerTestSuite) limitSells( tradePairID := types.NewTradePairIDFromTaker(defaultPairID, tokenIn) tickIndexTakerToMaker := tradePairID.TickIndexTakerToMaker(int64(tickIndexNormalized)) - msg, err := s.msgServer.PlaceLimitOrder(s.goCtx, &types.MsgPlaceLimitOrder{ + msg, err := s.msgServer.PlaceLimitOrder(s.GoCtx, &types.MsgPlaceLimitOrder{ Creator: account.String(), Receiver: account.String(), TokenIn: tradePairID.TakerDenom, @@ -416,7 +399,7 @@ func (s *MsgServerTestSuite) limitSells( return msg.TrancheKey, err } -func (s *MsgServerTestSuite) limitSellsGoodTil( +func (s *DexTestSuite) limitSellsGoodTil( account sdk.AccAddress, tokenIn string, tick, amountIn int, @@ -425,7 +408,7 @@ func (s *MsgServerTestSuite) limitSellsGoodTil( tradePairID := types.NewTradePairIDFromTaker(defaultPairID, tokenIn) tickIndexTakerToMaker := tradePairID.TickIndexTakerToMaker(int64(tick)) - msg, err := s.msgServer.PlaceLimitOrder(s.goCtx, &types.MsgPlaceLimitOrder{ + msg, err := s.msgServer.PlaceLimitOrder(s.GoCtx, &types.MsgPlaceLimitOrder{ Creator: account.String(), Receiver: account.String(), TokenIn: tradePairID.TakerDenom, @@ -483,31 +466,31 @@ func NewDepositWithOptions( } } -func (s *MsgServerTestSuite) aliceDeposits(deposits ...*Deposit) { +func (s *DexTestSuite) aliceDeposits(deposits ...*Deposit) { s.deposits(s.alice, deposits) } -func (s *MsgServerTestSuite) aliceDepositsWithOptions(deposits ...*DepositWithOptions) { +func (s *DexTestSuite) aliceDepositsWithOptions(deposits ...*DepositWithOptions) { s.depositsWithOptions(s.alice, deposits...) } -func (s *MsgServerTestSuite) bobDeposits(deposits ...*Deposit) { +func (s *DexTestSuite) bobDeposits(deposits ...*Deposit) { s.deposits(s.bob, deposits) } -func (s *MsgServerTestSuite) bobDepositsWithOptions(deposits ...*DepositWithOptions) { +func (s *DexTestSuite) bobDepositsWithOptions(deposits ...*DepositWithOptions) { s.depositsWithOptions(s.bob, deposits...) } -func (s *MsgServerTestSuite) carolDeposits(deposits ...*Deposit) { +func (s *DexTestSuite) carolDeposits(deposits ...*Deposit) { s.deposits(s.carol, deposits) } -func (s *MsgServerTestSuite) danDeposits(deposits ...*Deposit) { +func (s *DexTestSuite) danDeposits(deposits ...*Deposit) { s.deposits(s.dan, deposits) } -func (s *MsgServerTestSuite) deposits( +func (s *DexTestSuite) deposits( account sdk.AccAddress, deposits []*Deposit, pairID ...types.PairID, @@ -537,7 +520,7 @@ func (s *MsgServerTestSuite) deposits( s.Assert().Fail("Only 1 pairID can be provided") } - _, err := s.msgServer.Deposit(s.goCtx, &types.MsgDeposit{ + _, err := s.msgServer.Deposit(s.GoCtx, &types.MsgDeposit{ Creator: account.String(), Receiver: account.String(), TokenA: tokenA, @@ -551,7 +534,7 @@ func (s *MsgServerTestSuite) deposits( s.Assert().Nil(err) } -func (s *MsgServerTestSuite) depositsWithOptions( +func (s *DexTestSuite) depositsWithOptions( account sdk.AccAddress, deposits ...*DepositWithOptions, ) { @@ -570,7 +553,7 @@ func (s *MsgServerTestSuite) depositsWithOptions( } } - _, err := s.msgServer.Deposit(s.goCtx, &types.MsgDeposit{ + _, err := s.msgServer.Deposit(s.GoCtx, &types.MsgDeposit{ Creator: account.String(), Receiver: account.String(), TokenA: "TokenA", @@ -584,8 +567,8 @@ func (s *MsgServerTestSuite) depositsWithOptions( s.Assert().Nil(err) } -func (s *MsgServerTestSuite) getLiquidityAtTick(tickIndex int64, fee uint64) (sdkmath.Int, sdkmath.Int) { - pool, err := s.app.DexKeeper.GetOrInitPool(s.ctx, defaultPairID, tickIndex, fee) +func (s *DexTestSuite) getLiquidityAtTick(tickIndex int64, fee uint64) (sdkmath.Int, sdkmath.Int) { + pool, err := s.App.DexKeeper.GetOrInitPool(s.Ctx, defaultPairID, tickIndex, fee) s.Assert().NoError(err) liquidityA := pool.LowerTick0.ReservesMakerDenom @@ -594,12 +577,12 @@ func (s *MsgServerTestSuite) getLiquidityAtTick(tickIndex int64, fee uint64) (sd return liquidityA, liquidityB } -func (s *MsgServerTestSuite) getLiquidityAtTickWithDenom( +func (s *DexTestSuite) getLiquidityAtTickWithDenom( pairID *types.PairID, tickIndex int64, fee uint64, ) (sdkmath.Int, sdkmath.Int) { - pool, err := s.app.DexKeeper.GetOrInitPool(s.ctx, pairID, tickIndex, fee) + pool, err := s.App.DexKeeper.GetOrInitPool(s.Ctx, pairID, tickIndex, fee) s.Assert().NoError(err) liquidityA := pool.LowerTick0.ReservesMakerDenom @@ -608,23 +591,23 @@ func (s *MsgServerTestSuite) getLiquidityAtTickWithDenom( return liquidityA, liquidityB } -func (s *MsgServerTestSuite) assertAliceDepositFails(err error, deposits ...*Deposit) { +func (s *DexTestSuite) assertAliceDepositFails(err error, deposits ...*Deposit) { s.assertDepositFails(s.alice, err, deposits...) } -func (s *MsgServerTestSuite) assertBobDepositFails(err error, deposits ...*Deposit) { +func (s *DexTestSuite) assertBobDepositFails(err error, deposits ...*Deposit) { s.assertDepositFails(s.bob, err, deposits...) } -func (s *MsgServerTestSuite) assertCarolDepositFails(err error, deposits ...*Deposit) { +func (s *DexTestSuite) assertCarolDepositFails(err error, deposits ...*Deposit) { s.assertDepositFails(s.carol, err, deposits...) } -func (s *MsgServerTestSuite) assertDanDepositFails(err error, deposits ...*Deposit) { +func (s *DexTestSuite) assertDanDepositFails(err error, deposits ...*Deposit) { s.assertDepositFails(s.dan, err, deposits...) } -func (s *MsgServerTestSuite) assertDepositFails( +func (s *DexTestSuite) assertDepositFails( account sdk.AccAddress, expectedErr error, deposits ...*Deposit, @@ -642,7 +625,7 @@ func (s *MsgServerTestSuite) assertDepositFails( options[i] = &types.DepositOptions{DisableAutoswap: true} } - _, err := s.msgServer.Deposit(s.goCtx, &types.MsgDeposit{ + _, err := s.msgServer.Deposit(s.GoCtx, &types.MsgDeposit{ Creator: account.String(), Receiver: account.String(), TokenA: "TokenA", @@ -657,7 +640,7 @@ func (s *MsgServerTestSuite) assertDepositFails( s.Assert().ErrorIs(err, expectedErr) } -func (s *MsgServerTestSuite) assertDepositReponse( +func (s *DexTestSuite) assertDepositReponse( depositResponse, expectedDepositResponse DepositReponse, ) { for i := range expectedDepositResponse.amountsA { @@ -698,23 +681,23 @@ func NewWithdrawal(shares, tick int64, fee uint64) *Withdrawal { return NewWithdrawalInt(sdkmath.NewInt(shares), tick, fee) } -func (s *MsgServerTestSuite) aliceWithdraws(withdrawals ...*Withdrawal) { +func (s *DexTestSuite) aliceWithdraws(withdrawals ...*Withdrawal) { s.withdraws(s.alice, withdrawals...) } -func (s *MsgServerTestSuite) bobWithdraws(withdrawals ...*Withdrawal) { +func (s *DexTestSuite) bobWithdraws(withdrawals ...*Withdrawal) { s.withdraws(s.bob, withdrawals...) } -func (s *MsgServerTestSuite) carolWithdraws(withdrawals ...*Withdrawal) { +func (s *DexTestSuite) carolWithdraws(withdrawals ...*Withdrawal) { s.withdraws(s.carol, withdrawals...) } -func (s *MsgServerTestSuite) danWithdraws(withdrawals ...*Withdrawal) { +func (s *DexTestSuite) danWithdraws(withdrawals ...*Withdrawal) { s.withdraws(s.dan, withdrawals...) } -func (s *MsgServerTestSuite) withdraws(account sdk.AccAddress, withdrawals ...*Withdrawal) { +func (s *DexTestSuite) withdraws(account sdk.AccAddress, withdrawals ...*Withdrawal) { tickIndexes := make([]int64, len(withdrawals)) fee := make([]uint64, len(withdrawals)) sharesToRemove := make([]sdkmath.Int, len(withdrawals)) @@ -724,7 +707,7 @@ func (s *MsgServerTestSuite) withdraws(account sdk.AccAddress, withdrawals ...*W sharesToRemove[i] = e.Shares } - _, err := s.msgServer.Withdrawal(s.goCtx, &types.MsgWithdrawal{ + _, err := s.msgServer.Withdrawal(s.GoCtx, &types.MsgWithdrawal{ Creator: account.String(), Receiver: account.String(), TokenA: "TokenA", @@ -736,23 +719,23 @@ func (s *MsgServerTestSuite) withdraws(account sdk.AccAddress, withdrawals ...*W s.Assert().Nil(err) } -func (s *MsgServerTestSuite) aliceWithdrawFails(expectedErr error, withdrawals ...*Withdrawal) { +func (s *DexTestSuite) aliceWithdrawFails(expectedErr error, withdrawals ...*Withdrawal) { s.withdrawFails(s.alice, expectedErr, withdrawals...) } -func (s *MsgServerTestSuite) bobWithdrawFails(expectedErr error, withdrawals ...*Withdrawal) { +func (s *DexTestSuite) bobWithdrawFails(expectedErr error, withdrawals ...*Withdrawal) { s.withdrawFails(s.bob, expectedErr, withdrawals...) } -func (s *MsgServerTestSuite) carolWithdrawFails(expectedErr error, withdrawals ...*Withdrawal) { +func (s *DexTestSuite) carolWithdrawFails(expectedErr error, withdrawals ...*Withdrawal) { s.withdrawFails(s.carol, expectedErr, withdrawals...) } -func (s *MsgServerTestSuite) danWithdrawFails(expectedErr error, withdrawals ...*Withdrawal) { +func (s *DexTestSuite) danWithdrawFails(expectedErr error, withdrawals ...*Withdrawal) { s.withdrawFails(s.dan, expectedErr, withdrawals...) } -func (s *MsgServerTestSuite) withdrawFails( +func (s *DexTestSuite) withdrawFails( account sdk.AccAddress, expectedErr error, withdrawals ...*Withdrawal, @@ -766,7 +749,7 @@ func (s *MsgServerTestSuite) withdrawFails( sharesToRemove[i] = e.Shares } - _, err := s.msgServer.Withdrawal(s.goCtx, &types.MsgWithdrawal{ + _, err := s.msgServer.Withdrawal(s.GoCtx, &types.MsgWithdrawal{ Creator: account.String(), Receiver: account.String(), TokenA: "TokenA", @@ -781,52 +764,52 @@ func (s *MsgServerTestSuite) withdrawFails( /// Cancel limit order -func (s *MsgServerTestSuite) aliceCancelsLimitSell(trancheKey string) { +func (s *DexTestSuite) aliceCancelsLimitSell(trancheKey string) { s.cancelsLimitSell(s.alice, trancheKey) } -func (s *MsgServerTestSuite) bobCancelsLimitSell(trancheKey string) { +func (s *DexTestSuite) bobCancelsLimitSell(trancheKey string) { s.cancelsLimitSell(s.bob, trancheKey) } -func (s *MsgServerTestSuite) carolCancelsLimitSell(trancheKey string) { +func (s *DexTestSuite) carolCancelsLimitSell(trancheKey string) { s.cancelsLimitSell(s.carol, trancheKey) } -func (s *MsgServerTestSuite) danCancelsLimitSell(trancheKey string) { +func (s *DexTestSuite) danCancelsLimitSell(trancheKey string) { s.cancelsLimitSell(s.dan, trancheKey) } -func (s *MsgServerTestSuite) cancelsLimitSell(account sdk.AccAddress, trancheKey string) { - _, err := s.msgServer.CancelLimitOrder(s.goCtx, &types.MsgCancelLimitOrder{ +func (s *DexTestSuite) cancelsLimitSell(account sdk.AccAddress, trancheKey string) { + _, err := s.msgServer.CancelLimitOrder(s.GoCtx, &types.MsgCancelLimitOrder{ Creator: account.String(), TrancheKey: trancheKey, }) s.Assert().Nil(err) } -func (s *MsgServerTestSuite) aliceCancelsLimitSellFails(trancheKey string, expectedErr error) { +func (s *DexTestSuite) aliceCancelsLimitSellFails(trancheKey string, expectedErr error) { s.cancelsLimitSellFails(s.alice, trancheKey, expectedErr) } -func (s *MsgServerTestSuite) bobCancelsLimitSellFails(trancheKey string, expectedErr error) { +func (s *DexTestSuite) bobCancelsLimitSellFails(trancheKey string, expectedErr error) { s.cancelsLimitSellFails(s.bob, trancheKey, expectedErr) } -func (s *MsgServerTestSuite) carolCancelsLimitSellFails(trancheKey string, expectedErr error) { +func (s *DexTestSuite) carolCancelsLimitSellFails(trancheKey string, expectedErr error) { s.cancelsLimitSellFails(s.carol, trancheKey, expectedErr) } -func (s *MsgServerTestSuite) danCancelsLimitSellFails(trancheKey string, expectedErr error) { +func (s *DexTestSuite) danCancelsLimitSellFails(trancheKey string, expectedErr error) { s.cancelsLimitSellFails(s.dan, trancheKey, expectedErr) } -func (s *MsgServerTestSuite) cancelsLimitSellFails( +func (s *DexTestSuite) cancelsLimitSellFails( account sdk.AccAddress, trancheKey string, expectedErr error, ) { - _, err := s.msgServer.CancelLimitOrder(s.goCtx, &types.MsgCancelLimitOrder{ + _, err := s.msgServer.CancelLimitOrder(s.GoCtx, &types.MsgCancelLimitOrder{ Creator: account.String(), TrancheKey: trancheKey, }) @@ -835,7 +818,7 @@ func (s *MsgServerTestSuite) cancelsLimitSellFails( /// MultiHopSwap -func (s *MsgServerTestSuite) aliceMultiHopSwaps( +func (s *DexTestSuite) aliceMultiHopSwaps( routes [][]string, amountIn int, exitLimitPrice math_utils.PrecDec, @@ -844,7 +827,7 @@ func (s *MsgServerTestSuite) aliceMultiHopSwaps( s.multiHopSwaps(s.alice, routes, amountIn, exitLimitPrice, pickBest) } -func (s *MsgServerTestSuite) bobMultiHopSwaps( +func (s *DexTestSuite) bobMultiHopSwaps( routes [][]string, amountIn int, exitLimitPrice math_utils.PrecDec, @@ -853,7 +836,7 @@ func (s *MsgServerTestSuite) bobMultiHopSwaps( s.multiHopSwaps(s.bob, routes, amountIn, exitLimitPrice, pickBest) } -func (s *MsgServerTestSuite) carolMultiHopSwaps( +func (s *DexTestSuite) carolMultiHopSwaps( routes [][]string, amountIn int, exitLimitPrice math_utils.PrecDec, @@ -862,7 +845,7 @@ func (s *MsgServerTestSuite) carolMultiHopSwaps( s.multiHopSwaps(s.carol, routes, amountIn, exitLimitPrice, pickBest) } -func (s *MsgServerTestSuite) danMultiHopSwaps( +func (s *DexTestSuite) danMultiHopSwaps( routes [][]string, amountIn int, exitLimitPrice math_utils.PrecDec, @@ -871,7 +854,7 @@ func (s *MsgServerTestSuite) danMultiHopSwaps( s.multiHopSwaps(s.dan, routes, amountIn, exitLimitPrice, pickBest) } -func (s *MsgServerTestSuite) multiHopSwaps( +func (s *DexTestSuite) multiHopSwaps( account sdk.AccAddress, routes [][]string, amountIn int, @@ -886,11 +869,11 @@ func (s *MsgServerTestSuite) multiHopSwaps( exitLimitPrice, pickBest, ) - _, err := s.msgServer.MultiHopSwap(s.goCtx, msg) + _, err := s.msgServer.MultiHopSwap(s.GoCtx, msg) s.Assert().Nil(err) } -func (s *MsgServerTestSuite) aliceEstimatesMultiHopSwap( +func (s *DexTestSuite) aliceEstimatesMultiHopSwap( routes [][]string, amountIn int, exitLimitPrice math_utils.PrecDec, @@ -908,12 +891,12 @@ func (s *MsgServerTestSuite) aliceEstimatesMultiHopSwap( ExitLimitPrice: exitLimitPrice, PickBestRoute: pickBest, } - res, err := s.app.DexKeeper.EstimateMultiHopSwap(s.goCtx, msg) + res, err := s.App.DexKeeper.EstimateMultiHopSwap(s.GoCtx, msg) s.Require().Nil(err) return res.CoinOut } -func (s *MsgServerTestSuite) aliceEstimatesMultiHopSwapFails( +func (s *DexTestSuite) aliceEstimatesMultiHopSwapFails( expectedErr error, routes [][]string, amountIn int, @@ -932,11 +915,11 @@ func (s *MsgServerTestSuite) aliceEstimatesMultiHopSwapFails( ExitLimitPrice: exitLimitPrice, PickBestRoute: pickBest, } - _, err := s.app.DexKeeper.EstimateMultiHopSwap(s.goCtx, msg) + _, err := s.App.DexKeeper.EstimateMultiHopSwap(s.GoCtx, msg) s.Assert().ErrorIs(err, expectedErr) } -func (s *MsgServerTestSuite) aliceMultiHopSwapFails( +func (s *DexTestSuite) aliceMultiHopSwapFails( err error, routes [][]string, amountIn int, @@ -946,7 +929,7 @@ func (s *MsgServerTestSuite) aliceMultiHopSwapFails( s.multiHopSwapFails(s.alice, err, routes, amountIn, exitLimitPrice, pickBest) } -func (s *MsgServerTestSuite) bobMultiHopSwapFails( +func (s *DexTestSuite) bobMultiHopSwapFails( err error, routes [][]string, amountIn int, @@ -956,7 +939,7 @@ func (s *MsgServerTestSuite) bobMultiHopSwapFails( s.multiHopSwapFails(s.bob, err, routes, amountIn, exitLimitPrice, pickBest) } -func (s *MsgServerTestSuite) carolMultiHopSwapFails( +func (s *DexTestSuite) carolMultiHopSwapFails( err error, routes [][]string, amountIn int, @@ -966,7 +949,7 @@ func (s *MsgServerTestSuite) carolMultiHopSwapFails( s.multiHopSwapFails(s.carol, err, routes, amountIn, exitLimitPrice, pickBest) } -func (s *MsgServerTestSuite) danMultiHopSwapFails( +func (s *DexTestSuite) danMultiHopSwapFails( err error, routes [][]string, amountIn int, @@ -976,7 +959,7 @@ func (s *MsgServerTestSuite) danMultiHopSwapFails( s.multiHopSwapFails(s.dan, err, routes, amountIn, exitLimitPrice, pickBest) } -func (s *MsgServerTestSuite) multiHopSwapFails( +func (s *DexTestSuite) multiHopSwapFails( account sdk.AccAddress, expectedErr error, routes [][]string, @@ -992,58 +975,58 @@ func (s *MsgServerTestSuite) multiHopSwapFails( exitLimitPrice, pickBest, ) - _, err := s.msgServer.MultiHopSwap(s.goCtx, msg) + _, err := s.msgServer.MultiHopSwap(s.GoCtx, msg) s.Assert().ErrorIs(err, expectedErr) } /// Withdraw filled limit order -func (s *MsgServerTestSuite) aliceWithdrawsLimitSell(trancheKey string) { +func (s *DexTestSuite) aliceWithdrawsLimitSell(trancheKey string) { s.withdrawsLimitSell(s.alice, trancheKey) } -func (s *MsgServerTestSuite) bobWithdrawsLimitSell(trancheKey string) { +func (s *DexTestSuite) bobWithdrawsLimitSell(trancheKey string) { s.withdrawsLimitSell(s.bob, trancheKey) } -func (s *MsgServerTestSuite) carolWithdrawsLimitSell(trancheKey string) { +func (s *DexTestSuite) carolWithdrawsLimitSell(trancheKey string) { s.withdrawsLimitSell(s.carol, trancheKey) } -func (s *MsgServerTestSuite) danWithdrawsLimitSell(trancheKey string) { +func (s *DexTestSuite) danWithdrawsLimitSell(trancheKey string) { s.withdrawsLimitSell(s.dan, trancheKey) } -func (s *MsgServerTestSuite) withdrawsLimitSell(account sdk.AccAddress, trancheKey string) { - _, err := s.msgServer.WithdrawFilledLimitOrder(s.goCtx, &types.MsgWithdrawFilledLimitOrder{ +func (s *DexTestSuite) withdrawsLimitSell(account sdk.AccAddress, trancheKey string) { + _, err := s.msgServer.WithdrawFilledLimitOrder(s.GoCtx, &types.MsgWithdrawFilledLimitOrder{ Creator: account.String(), TrancheKey: trancheKey, }) s.Assert().Nil(err) } -func (s *MsgServerTestSuite) aliceWithdrawLimitSellFails(expectedErr error, trancheKey string) { +func (s *DexTestSuite) aliceWithdrawLimitSellFails(expectedErr error, trancheKey string) { s.withdrawLimitSellFails(s.alice, expectedErr, trancheKey) } -func (s *MsgServerTestSuite) bobWithdrawLimitSellFails(expectedErr error, trancheKey string) { +func (s *DexTestSuite) bobWithdrawLimitSellFails(expectedErr error, trancheKey string) { s.withdrawLimitSellFails(s.bob, expectedErr, trancheKey) } -func (s *MsgServerTestSuite) carolWithdrawLimitSellFails(expectedErr error, trancheKey string) { +func (s *DexTestSuite) carolWithdrawLimitSellFails(expectedErr error, trancheKey string) { s.withdrawLimitSellFails(s.carol, expectedErr, trancheKey) } -func (s *MsgServerTestSuite) danWithdrawLimitSellFails(expectedErr error, trancheKey string) { +func (s *DexTestSuite) danWithdrawLimitSellFails(expectedErr error, trancheKey string) { s.withdrawLimitSellFails(s.dan, expectedErr, trancheKey) } -func (s *MsgServerTestSuite) withdrawLimitSellFails( +func (s *DexTestSuite) withdrawLimitSellFails( account sdk.AccAddress, expectedErr error, trancheKey string, ) { - _, err := s.msgServer.WithdrawFilledLimitOrder(s.goCtx, &types.MsgWithdrawFilledLimitOrder{ + _, err := s.msgServer.WithdrawFilledLimitOrder(s.GoCtx, &types.MsgWithdrawFilledLimitOrder{ Creator: account.String(), TrancheKey: trancheKey, }) @@ -1051,21 +1034,21 @@ func (s *MsgServerTestSuite) withdrawLimitSellFails( } // Shares -func (s *MsgServerTestSuite) getPoolShares( +func (s *DexTestSuite) getPoolShares( token0 string, token1 string, tick int64, fee uint64, ) (shares sdkmath.Int) { - poolID, found := s.app.DexKeeper.GetPoolIDByParams(s.ctx, &types.PairID{Token0: token0, Token1: token1}, tick, fee) + poolID, found := s.App.DexKeeper.GetPoolIDByParams(s.Ctx, &types.PairID{Token0: token0, Token1: token1}, tick, fee) if !found { return sdkmath.ZeroInt() } poolDenom := types.NewPoolDenom(poolID) - return s.app.BankKeeper.GetSupply(s.ctx, poolDenom).Amount + return s.App.BankKeeper.GetSupply(s.Ctx, poolDenom).Amount } -func (s *MsgServerTestSuite) assertPoolShares( +func (s *DexTestSuite) assertPoolShares( tick int64, fee uint64, sharesExpected uint64, @@ -1075,23 +1058,23 @@ func (s *MsgServerTestSuite) assertPoolShares( s.Assert().Equal(sharesExpectedInt, sharesOwned) } -func (s *MsgServerTestSuite) getAccountShares( +func (s *DexTestSuite) getAccountShares( account sdk.AccAddress, token0 string, token1 string, tick int64, fee uint64, ) (shares sdkmath.Int) { - id, found := s.app.DexKeeper.GetPoolIDByParams(s.ctx, types.MustNewPairID(token0, token1), tick, fee) + id, found := s.App.DexKeeper.GetPoolIDByParams(s.Ctx, types.MustNewPairID(token0, token1), tick, fee) if !found { return sdkmath.ZeroInt() } poolDenom := types.NewPoolDenom(id) - return s.app.BankKeeper.GetBalance(s.ctx, account, poolDenom).Amount + return s.App.BankKeeper.GetBalance(s.Ctx, account, poolDenom).Amount } -func (s *MsgServerTestSuite) assertAccountShares( +func (s *DexTestSuite) assertAccountShares( account sdk.AccAddress, tick int64, fee uint64, @@ -1103,24 +1086,24 @@ func (s *MsgServerTestSuite) assertAccountShares( Equal(sharesExpectedInt, sharesOwned, "expected %s != actual %s", sharesExpected, sharesOwned) } -func (s *MsgServerTestSuite) assertAliceShares(tick int64, fee, sharesExpected uint64) { +func (s *DexTestSuite) assertAliceShares(tick int64, fee, sharesExpected uint64) { s.assertAccountShares(s.alice, tick, fee, sharesExpected) } -func (s *MsgServerTestSuite) assertBobShares(tick int64, fee, sharesExpected uint64) { +func (s *DexTestSuite) assertBobShares(tick int64, fee, sharesExpected uint64) { s.assertAccountShares(s.bob, tick, fee, sharesExpected) } -func (s *MsgServerTestSuite) assertCarolShares(tick int64, fee, sharesExpected uint64) { +func (s *DexTestSuite) assertCarolShares(tick int64, fee, sharesExpected uint64) { s.assertAccountShares(s.carol, tick, fee, sharesExpected) } -func (s *MsgServerTestSuite) assertDanShares(tick int64, fee, sharesExpected uint64) { +func (s *DexTestSuite) assertDanShares(tick int64, fee, sharesExpected uint64) { s.assertAccountShares(s.dan, tick, fee, sharesExpected) } // Ticks -func (s *MsgServerTestSuite) assertCurrentTicks( +func (s *DexTestSuite) assertCurrentTicks( expected1To0 int64, expected0To1 int64, ) { @@ -1128,9 +1111,9 @@ func (s *MsgServerTestSuite) assertCurrentTicks( s.assertCurr1To0(expected1To0) } -func (s *MsgServerTestSuite) assertCurr0To1(curr0To1Expected int64) { - curr0To1Actual, found := s.app.DexKeeper.GetCurrTickIndexTakerToMakerNormalized( - s.ctx, +func (s *DexTestSuite) assertCurr0To1(curr0To1Expected int64) { + curr0To1Actual, found := s.App.DexKeeper.GetCurrTickIndexTakerToMakerNormalized( + s.Ctx, defaultTradePairID0To1, ) if curr0To1Expected == math.MaxInt64 { @@ -1140,9 +1123,9 @@ func (s *MsgServerTestSuite) assertCurr0To1(curr0To1Expected int64) { } } -func (s *MsgServerTestSuite) assertCurr1To0(curr1To0Expected int64) { - curr1to0Actual, found := s.app.DexKeeper.GetCurrTickIndexTakerToMakerNormalized( - s.ctx, +func (s *DexTestSuite) assertCurr1To0(curr1To0Expected int64) { + curr1to0Actual, found := s.App.DexKeeper.GetCurrTickIndexTakerToMakerNormalized( + s.Ctx, defaultTradePairID1To0, ) if curr1To0Expected == math.MinInt64 { @@ -1153,7 +1136,7 @@ func (s *MsgServerTestSuite) assertCurr1To0(curr1To0Expected int64) { } // Pool liquidity (i.e. deposited rather than LO) -func (s *MsgServerTestSuite) assertLiquidityAtTick( +func (s *DexTestSuite) assertLiquidityAtTick( amountA, amountB sdkmath.Int, tickIndex int64, fee uint64, @@ -1165,7 +1148,7 @@ func (s *MsgServerTestSuite) assertLiquidityAtTick( True(amountB.Equal(liquidityB), "liquidity B: actual %s, expected %s", liquidityB, amountB) } -func (s *MsgServerTestSuite) assertLiquidityAtTickWithDenom( +func (s *DexTestSuite) assertLiquidityAtTickWithDenom( pairID *types.PairID, expected0, expected1 sdkmath.Int, tickIndex int64, @@ -1178,7 +1161,7 @@ func (s *MsgServerTestSuite) assertLiquidityAtTickWithDenom( True(expected1.Equal(liquidity1), "liquidity 1: actual %s, expected %s", liquidity1, expected1) } -func (s *MsgServerTestSuite) assertPoolLiquidity( +func (s *DexTestSuite) assertPoolLiquidity( amountA, amountB int, tickIndex int64, fee uint64, @@ -1186,12 +1169,12 @@ func (s *MsgServerTestSuite) assertPoolLiquidity( s.assertLiquidityAtTick(sdkmath.NewInt(int64(amountA)), sdkmath.NewInt(int64(amountB)), tickIndex, fee) } -func (s *MsgServerTestSuite) assertNoLiquidityAtTick(tickIndex int64, fee uint64) { +func (s *DexTestSuite) assertNoLiquidityAtTick(tickIndex int64, fee uint64) { s.assertLiquidityAtTick(sdkmath.ZeroInt(), sdkmath.ZeroInt(), tickIndex, fee) } // Filled limit liquidity -func (s *MsgServerTestSuite) assertAliceLimitFilledAtTickAtIndex( +func (s *DexTestSuite) assertAliceLimitFilledAtTickAtIndex( selling string, amount int, tickIndex int64, @@ -1200,7 +1183,7 @@ func (s *MsgServerTestSuite) assertAliceLimitFilledAtTickAtIndex( s.assertLimitFilledAtTickAtIndex(s.alice, selling, amount, tickIndex, trancheKey) } -func (s *MsgServerTestSuite) assertBobLimitFilledAtTickAtIndex( +func (s *DexTestSuite) assertBobLimitFilledAtTickAtIndex( selling string, amount int, tickIndex int64, @@ -1209,7 +1192,7 @@ func (s *MsgServerTestSuite) assertBobLimitFilledAtTickAtIndex( s.assertLimitFilledAtTickAtIndex(s.bob, selling, amount, tickIndex, trancheKey) } -func (s *MsgServerTestSuite) assertCarolLimitFilledAtTickAtIndex( +func (s *DexTestSuite) assertCarolLimitFilledAtTickAtIndex( selling string, amount int, tickIndex int64, @@ -1218,7 +1201,7 @@ func (s *MsgServerTestSuite) assertCarolLimitFilledAtTickAtIndex( s.assertLimitFilledAtTickAtIndex(s.carol, selling, amount, tickIndex, trancheKey) } -func (s *MsgServerTestSuite) assertDanLimitFilledAtTickAtIndex( +func (s *DexTestSuite) assertDanLimitFilledAtTickAtIndex( selling string, amount int, tickIndex int64, @@ -1227,7 +1210,7 @@ func (s *MsgServerTestSuite) assertDanLimitFilledAtTickAtIndex( s.assertLimitFilledAtTickAtIndex(s.dan, selling, amount, tickIndex, trancheKey) } -func (s *MsgServerTestSuite) assertLimitFilledAtTickAtIndex( +func (s *DexTestSuite) assertLimitFilledAtTickAtIndex( account sdk.AccAddress, selling string, amount int, @@ -1250,7 +1233,7 @@ func (s *MsgServerTestSuite) assertLimitFilledAtTickAtIndex( } // Limit liquidity -func (s *MsgServerTestSuite) assertAliceLimitLiquidityAtTick( +func (s *DexTestSuite) assertAliceLimitLiquidityAtTick( selling string, amount int, tickIndex int64, @@ -1258,7 +1241,7 @@ func (s *MsgServerTestSuite) assertAliceLimitLiquidityAtTick( s.assertAccountLimitLiquidityAtTick(s.alice, selling, amount, tickIndex) } -func (s *MsgServerTestSuite) assertBobLimitLiquidityAtTick( +func (s *DexTestSuite) assertBobLimitLiquidityAtTick( selling string, amount int, tickIndex int64, @@ -1266,7 +1249,7 @@ func (s *MsgServerTestSuite) assertBobLimitLiquidityAtTick( s.assertAccountLimitLiquidityAtTick(s.bob, selling, amount, tickIndex) } -func (s *MsgServerTestSuite) assertCarolLimitLiquidityAtTick( +func (s *DexTestSuite) assertCarolLimitLiquidityAtTick( selling string, amount int, tickIndex int64, @@ -1274,7 +1257,7 @@ func (s *MsgServerTestSuite) assertCarolLimitLiquidityAtTick( s.assertAccountLimitLiquidityAtTick(s.carol, selling, amount, tickIndex) } -func (s *MsgServerTestSuite) assertDanLimitLiquidityAtTick( +func (s *DexTestSuite) assertDanLimitLiquidityAtTick( selling string, amount int, tickIndex int64, @@ -1282,7 +1265,7 @@ func (s *MsgServerTestSuite) assertDanLimitLiquidityAtTick( s.assertAccountLimitLiquidityAtTick(s.dan, selling, amount, tickIndex) } -func (s *MsgServerTestSuite) assertAccountLimitLiquidityAtTick( +func (s *DexTestSuite) assertAccountLimitLiquidityAtTick( account sdk.AccAddress, selling string, amount int, @@ -1296,28 +1279,28 @@ func (s *MsgServerTestSuite) assertAccountLimitLiquidityAtTick( s.assertLimitLiquidityAtTick(selling, tickIndexNormalized, userLiquidity.Int64()) } -func (s *MsgServerTestSuite) assertLimitLiquidityAtTick( +func (s *DexTestSuite) assertLimitLiquidityAtTick( selling string, tickIndexNormalized, amount int64, ) { s.assertLimitLiquidityAtTickInt(selling, tickIndexNormalized, sdkmath.NewInt(amount)) } -func (s *MsgServerTestSuite) assertLimitLiquidityAtTickInt( +func (s *DexTestSuite) assertLimitLiquidityAtTickInt( selling string, tickIndexNormalized int64, amount sdkmath.Int, ) { tradePairID := defaultPairID.MustTradePairIDFromMaker(selling) tickIndexTakerToMaker := tradePairID.TickIndexTakerToMaker(tickIndexNormalized) - tranches := s.app.DexKeeper.GetAllLimitOrderTrancheAtIndex( - s.ctx, + tranches := s.App.DexKeeper.GetAllLimitOrderTrancheAtIndex( + s.Ctx, tradePairID, tickIndexTakerToMaker, ) liquidity := sdkmath.ZeroInt() for _, t := range tranches { - if !t.IsExpired(s.ctx) { + if !t.IsExpired(s.Ctx) { liquidity = liquidity.Add(t.ReservesMakerDenom) } } @@ -1326,16 +1309,16 @@ func (s *MsgServerTestSuite) assertLimitLiquidityAtTickInt( True(amount.Equal(liquidity), "Incorrect liquidity: expected %s, have %s", amount.String(), liquidity.String()) } -func (s *MsgServerTestSuite) assertFillAndPlaceTrancheKeys( +func (s *DexTestSuite) assertFillAndPlaceTrancheKeys( selling string, tickIndexNormalized int64, expectedFill, expectedPlace string, ) { tradePairID := defaultPairID.MustTradePairIDFromMaker(selling) tickIndexTakerToMaker := tradePairID.TickIndexTakerToMaker(tickIndexNormalized) - placeTranche := s.app.DexKeeper.GetPlaceTranche(s.ctx, tradePairID, tickIndexTakerToMaker) - fillTranche, foundFill := s.app.DexKeeper.GetFillTranche( - s.ctx, + placeTranche := s.App.DexKeeper.GetPlaceTranche(s.Ctx, tradePairID, tickIndexTakerToMaker) + fillTranche, foundFill := s.App.DexKeeper.GetFillTranche( + s.Ctx, tradePairID, tickIndexTakerToMaker, ) @@ -1352,15 +1335,15 @@ func (s *MsgServerTestSuite) assertFillAndPlaceTrancheKeys( } // Limit order map helpers -func (s *MsgServerTestSuite) getLimitUserSharesAtTick( +func (s *DexTestSuite) getLimitUserSharesAtTick( account sdk.AccAddress, selling string, tickIndexNormalized int64, ) sdkmath.Int { tradePairID := defaultPairID.MustTradePairIDFromMaker(selling) tickIndexTakerToMaker := tradePairID.TickIndexTakerToMaker(tickIndexNormalized) - tranches := s.app.DexKeeper.GetAllLimitOrderTrancheAtIndex( - s.ctx, + tranches := s.App.DexKeeper.GetAllLimitOrderTrancheAtIndex( + s.Ctx, tradePairID, tickIndexTakerToMaker, ) @@ -1376,12 +1359,12 @@ func (s *MsgServerTestSuite) getLimitUserSharesAtTick( return userShares } -func (s *MsgServerTestSuite) getLimitUserSharesAtTickAtIndex( +func (s *DexTestSuite) getLimitUserSharesAtTickAtIndex( account sdk.AccAddress, trancheKey string, ) sdkmath.Int { - userShares, found := s.app.DexKeeper.GetLimitOrderTrancheUser( - s.ctx, + userShares, found := s.App.DexKeeper.GetLimitOrderTrancheUser( + s.Ctx, account.String(), trancheKey, ) @@ -1389,14 +1372,14 @@ func (s *MsgServerTestSuite) getLimitUserSharesAtTickAtIndex( return userShares.SharesOwned } -func (s *MsgServerTestSuite) getLimitTotalSharesAtTick( +func (s *DexTestSuite) getLimitTotalSharesAtTick( selling string, tickIndexNormalized int64, ) sdkmath.Int { tradePairID := defaultPairID.MustTradePairIDFromMaker(selling) tickIndexTakerToMaker := tradePairID.TickIndexTakerToMaker(tickIndexNormalized) - tranches := s.app.DexKeeper.GetAllLimitOrderTrancheAtIndex( - s.ctx, + tranches := s.App.DexKeeper.GetAllLimitOrderTrancheAtIndex( + s.Ctx, tradePairID, tickIndexTakerToMaker, ) @@ -1409,14 +1392,14 @@ func (s *MsgServerTestSuite) getLimitTotalSharesAtTick( return totalShares } -func (s *MsgServerTestSuite) getLimitFilledLiquidityAtTickAtIndex( +func (s *DexTestSuite) getLimitFilledLiquidityAtTickAtIndex( selling string, tickIndex int64, trancheKey string, ) sdkmath.Int { // grab fill tranche reserves and shares tradePairID := defaultPairID.MustTradePairIDFromMaker(selling) - tranche, _, found := s.app.DexKeeper.FindLimitOrderTranche(s.ctx, &types.LimitOrderTrancheKey{ + tranche, _, found := s.App.DexKeeper.FindLimitOrderTranche(s.Ctx, &types.LimitOrderTrancheKey{ TradePairID: tradePairID, TickIndexTakerToMaker: tickIndex, TrancheKey: trancheKey, @@ -1426,14 +1409,14 @@ func (s *MsgServerTestSuite) getLimitFilledLiquidityAtTickAtIndex( return tranche.ReservesTakerDenom } -func (s *MsgServerTestSuite) getLimitReservesAtTickAtKey( +func (s *DexTestSuite) getLimitReservesAtTickAtKey( selling string, tickIndex int64, trancheKey string, ) sdkmath.Int { // grab fill tranche reserves and shares tradePairID := defaultPairID.MustTradePairIDFromMaker(selling) - tranche, _, found := s.app.DexKeeper.FindLimitOrderTranche(s.ctx, &types.LimitOrderTrancheKey{ + tranche, _, found := s.App.DexKeeper.FindLimitOrderTranche(s.Ctx, &types.LimitOrderTrancheKey{ TradePairID: tradePairID, TickIndexTakerToMaker: tickIndex, TrancheKey: trancheKey, @@ -1443,12 +1426,12 @@ func (s *MsgServerTestSuite) getLimitReservesAtTickAtKey( return tranche.ReservesMakerDenom } -func (s *MsgServerTestSuite) assertNLimitOrderExpiration(expected int) { - exps := s.app.DexKeeper.GetAllLimitOrderExpiration(s.ctx) +func (s *DexTestSuite) assertNLimitOrderExpiration(expected int) { + exps := s.App.DexKeeper.GetAllLimitOrderExpiration(s.Ctx) s.Assert().Equal(expected, len(exps)) } -func (s *MsgServerTestSuite) calcAutoswapSharesMinted( +func (s *DexTestSuite) calcAutoswapSharesMinted( centerTick int64, fee uint64, residual0, residual1, balanced0, balanced1, totalShares, valuePool int64, @@ -1487,31 +1470,31 @@ func (s *MsgServerTestSuite) calcAutoswapSharesMinted( return valueMint.Mul(totalSharesInt).Quo(valuePoolInt) } -func (s *MsgServerTestSuite) calcSharesMinted(centerTick, amount0Int, amount1Int int64) sdkmath.Int { +func (s *DexTestSuite) calcSharesMinted(centerTick, amount0Int, amount1Int int64) sdkmath.Int { amount0, amount1 := sdkmath.NewInt(amount0Int), sdkmath.NewInt(amount1Int) centerPrice := types.MustCalcPrice(-1 * centerTick) return math_utils.NewPrecDecFromInt(amount0).Add(centerPrice.Mul(math_utils.NewPrecDecFromInt(amount1))).TruncateInt() } -func (s *MsgServerTestSuite) calcExpectedBalancesAfterWithdrawOnePool( +func (s *DexTestSuite) calcExpectedBalancesAfterWithdrawOnePool( sharesMinted sdkmath.Int, account sdk.AccAddress, tickIndex int64, fee uint64, ) (sdkmath.Int, sdkmath.Int, sdkmath.Int, sdkmath.Int) { - dexCurrentBalance0 := s.app.BankKeeper.GetBalance( - s.ctx, - s.app.AccountKeeper.GetModuleAddress("dex"), + dexCurrentBalance0 := s.App.BankKeeper.GetBalance( + s.Ctx, + s.App.AccountKeeper.GetModuleAddress("dex"), "TokenA", ).Amount - dexCurrentBalance1 := s.app.BankKeeper.GetBalance( - s.ctx, - s.app.AccountKeeper.GetModuleAddress("dex"), + dexCurrentBalance1 := s.App.BankKeeper.GetBalance( + s.Ctx, + s.App.AccountKeeper.GetModuleAddress("dex"), "TokenB", ).Amount - currentBalance0 := s.app.BankKeeper.GetBalance(s.ctx, account, "TokenA").Amount - currentBalance1 := s.app.BankKeeper.GetBalance(s.ctx, account, "TokenB").Amount + currentBalance0 := s.App.BankKeeper.GetBalance(s.Ctx, account, "TokenA").Amount + currentBalance1 := s.App.BankKeeper.GetBalance(s.Ctx, account, "TokenB").Amount amountPool0, amountPool1 := s.getLiquidityAtTick(tickIndex, fee) poolShares := s.getPoolShares("TokenA", "TokenB", tickIndex, fee) @@ -1526,12 +1509,12 @@ func (s *MsgServerTestSuite) calcExpectedBalancesAfterWithdrawOnePool( return expectedBalance0, expectedBalance1, dexExpectedBalance0, dexExpectedBalance1 } -func (s *MsgServerTestSuite) nextBlockWithTime(blockTime time.Time) { - newCtx := s.ctx.WithBlockTime(blockTime) - s.ctx = newCtx - s.goCtx = sdk.WrapSDKContext(newCtx) - s.app.BeginBlock(abci.RequestBeginBlock{Header: tmproto.Header{ - Height: s.app.LastBlockHeight() + 1, AppHash: s.app.LastCommitID().Hash, +func (s *DexTestSuite) nextBlockWithTime(blockTime time.Time) { + newCtx := s.Ctx.WithBlockTime(blockTime) + s.Ctx = newCtx + s.GoCtx = sdk.WrapSDKContext(newCtx) + s.App.BeginBlock(abci.RequestBeginBlock{Header: tmproto.Header{ + Height: s.App.LastBlockHeight() + 1, AppHash: s.App.LastCommitID().Hash, Time: blockTime, }}) } diff --git a/x/epochs/keeper/abci_test.go b/x/epochs/keeper/abci_test.go index c8989e5e2..223827ac6 100644 --- a/x/epochs/keeper/abci_test.go +++ b/x/epochs/keeper/abci_test.go @@ -18,7 +18,7 @@ import ( // This test is responsible for testing how epochs increment based off // of their initial conditions, and subsequent block height / times. -func (suite *KeeperTestSuite) TestEpochInfoBeginBlockChanges() { +func (suite *EpochsTestSuite) TestEpochInfoBeginBlockChanges() { block1Time := time.Unix(1656907200, 0).UTC() const defaultIdentifier = "hourly" const defaultDuration = time.Hour diff --git a/x/epochs/keeper/epoch_test.go b/x/epochs/keeper/epoch_test.go index 8a7630a0b..94ab6c0d3 100644 --- a/x/epochs/keeper/epoch_test.go +++ b/x/epochs/keeper/epoch_test.go @@ -6,7 +6,7 @@ import ( "github.com/neutron-org/neutron/x/epochs/types" ) -func (suite *KeeperTestSuite) TestAddEpochInfo() { +func (suite *EpochsTestSuite) TestAddEpochInfo() { defaultIdentifier := "default_add_epoch_info_id" defaultDuration := time.Hour startBlockHeight := int64(100) @@ -66,7 +66,7 @@ func (suite *KeeperTestSuite) TestAddEpochInfo() { } } -func (suite *KeeperTestSuite) TestDuplicateAddEpochInfo() { +func (suite *EpochsTestSuite) TestDuplicateAddEpochInfo() { identifier := "duplicate_add_epoch_info" epochInfo := types.NewGenesisEpochInfo(identifier, time.Hour*24*30) err := suite.App.EpochsKeeper.AddEpochInfo(suite.Ctx, epochInfo) @@ -75,7 +75,7 @@ func (suite *KeeperTestSuite) TestDuplicateAddEpochInfo() { suite.Require().Error(err) } -func (suite *KeeperTestSuite) TestEpochLifeCycle() { +func (suite *EpochsTestSuite) TestEpochLifeCycle() { suite.SetupTest() epochInfo := types.NewGenesisEpochInfo("monthly", time.Hour*24*30) diff --git a/x/epochs/keeper/grpc_query_test.go b/x/epochs/keeper/grpc_query_test.go index 20029a17e..a2b5c8c95 100644 --- a/x/epochs/keeper/grpc_query_test.go +++ b/x/epochs/keeper/grpc_query_test.go @@ -6,7 +6,7 @@ import ( "github.com/neutron-org/neutron/x/epochs/types" ) -func (suite *KeeperTestSuite) TestQueryEpochInfos() { +func (suite *EpochsTestSuite) TestQueryEpochInfos() { suite.SetupTest() queryClient := suite.queryClient diff --git a/x/epochs/keeper/keeper_test.go b/x/epochs/keeper/keeper_test.go index 988287c5b..4871e2de1 100644 --- a/x/epochs/keeper/keeper_test.go +++ b/x/epochs/keeper/keeper_test.go @@ -9,16 +9,16 @@ import ( "github.com/neutron-org/neutron/x/epochs/types" ) -type KeeperTestSuite struct { +type EpochsTestSuite struct { apptesting.KeeperTestHelper queryClient types.QueryClient } -func (suite *KeeperTestSuite) SetupTest() { +func (suite *EpochsTestSuite) SetupTest() { suite.Setup() suite.queryClient = types.NewQueryClient(suite.QueryHelper) } -func TestKeeperTestSuite(t *testing.T) { - suite.Run(t, new(KeeperTestSuite)) +func TestEpochsTestSuite(t *testing.T) { + suite.Run(t, new(EpochsTestSuite)) } diff --git a/x/incentives/keeper/distribute_test.go b/x/incentives/keeper/distribute_test.go index 44516848e..d97ab4342 100644 --- a/x/incentives/keeper/distribute_test.go +++ b/x/incentives/keeper/distribute_test.go @@ -21,7 +21,7 @@ type balanceAssertion struct { balances sdk.Coins } -func (suite *KeeperTestSuite) TestValueForShares() { +func (suite *IncentivesTestSuite) TestValueForShares() { addrs := apptesting.SetupAddrs(3) tests := []struct { @@ -126,7 +126,7 @@ func (suite *KeeperTestSuite) TestValueForShares() { // TestDistribute tests that when the distribute command is executed on a provided gauge // that the correct amount of rewards is sent to the correct stake owners. -func (suite *KeeperTestSuite) TestDistribute() { +func (suite *IncentivesTestSuite) TestDistribute() { addrs := apptesting.SetupAddrs(3) tests := []struct { name string diff --git a/x/incentives/keeper/gauge_test.go b/x/incentives/keeper/gauge_test.go index 11d96f27c..00b4970b1 100644 --- a/x/incentives/keeper/gauge_test.go +++ b/x/incentives/keeper/gauge_test.go @@ -15,7 +15,7 @@ import ( var _ = suite.TestingSuite(nil) -func (suite *KeeperTestSuite) TestGaugeLifecycle() { +func (suite *IncentivesTestSuite) TestGaugeLifecycle() { addr0 := suite.SetupAddr(0) // setup dex deposit and stake of those shares @@ -107,7 +107,7 @@ func (suite *KeeperTestSuite) TestGaugeLifecycle() { // fin. } -func (suite *KeeperTestSuite) TestGaugeLimit() { +func (suite *IncentivesTestSuite) TestGaugeLimit() { // We set the gauge limit to 20. On the 21st gauge, we should encounter an error. params := suite.App.IncentivesKeeper.GetParams(suite.Ctx) params.MaxGauges = 20 @@ -171,7 +171,7 @@ func (suite *KeeperTestSuite) TestGaugeLimit() { // TestGaugeCreateFails tests that when the distribute command is executed on a provided bad gauge // that the step fails gracefully. -func (suite *KeeperTestSuite) TestGaugeCreateFails() { +func (suite *IncentivesTestSuite) TestGaugeCreateFails() { addrs := apptesting.SetupAddrs(3) tests := []struct { name string diff --git a/x/incentives/keeper/genesis_test.go b/x/incentives/keeper/genesis_test.go index efeac77cb..d1747b173 100644 --- a/x/incentives/keeper/genesis_test.go +++ b/x/incentives/keeper/genesis_test.go @@ -12,7 +12,7 @@ import ( ) // TestIncentivesExportGenesis tests export genesis command for the incentives module. -func (suite *KeeperTestSuite) TestGenesis() { +func (suite *IncentivesTestSuite) TestGenesis() { validAddr, _ := apptesting.GenerateTestAddrs() genesisState := types.GenesisState{ Params: types.DefaultParams(), diff --git a/x/incentives/keeper/keeper_test.go b/x/incentives/keeper/keeper_test.go index 6017bc4f1..6268a0516 100644 --- a/x/incentives/keeper/keeper_test.go +++ b/x/incentives/keeper/keeper_test.go @@ -11,7 +11,7 @@ import ( "github.com/neutron-org/neutron/x/incentives/types" ) -type KeeperTestSuite struct { +type IncentivesTestSuite struct { apptesting.KeeperTestHelper QueryServer keeper.QueryServer @@ -21,7 +21,7 @@ type KeeperTestSuite struct { } // SetupTest sets incentives parameters from the suite's context -func (suite *KeeperTestSuite) SetupTest() { +func (suite *IncentivesTestSuite) SetupTest() { suite.Setup() suite.QueryServer = keeper.NewQueryServer(suite.App.IncentivesKeeper) suite.MsgServer = keeper.NewMsgServerImpl(suite.App.IncentivesKeeper) @@ -47,6 +47,6 @@ func (suite *KeeperTestSuite) SetupTest() { suite.SetEpochStartTime() } -func TestKeeperTestSuite(t *testing.T) { - suite.Run(t, new(KeeperTestSuite)) +func TestIncentivesTestSuite(t *testing.T) { + suite.Run(t, new(IncentivesTestSuite)) } diff --git a/x/incentives/keeper/query_server_test.go b/x/incentives/keeper/query_server_test.go index 1a99a7117..d1545f6a1 100644 --- a/x/incentives/keeper/query_server_test.go +++ b/x/incentives/keeper/query_server_test.go @@ -10,7 +10,7 @@ import ( var _ = suite.TestingSuite(nil) -func (suite *KeeperTestSuite) TestGetFutureRewardEstimate() { +func (suite *IncentivesTestSuite) TestGetFutureRewardEstimate() { addr1 := suite.SetupAddr(0) suite.SetupDepositAndStake(depositStakeSpec{ depositSpecs: []depositSpec{ @@ -67,7 +67,7 @@ func (suite *KeeperTestSuite) TestGetFutureRewardEstimate() { suite.Require().Equal(sdk.NewCoins(sdk.NewInt64Coin("foocoin", 750)), estimate.Coins) } -func (suite *KeeperTestSuite) TestGetGauges() { +func (suite *IncentivesTestSuite) TestGetGauges() { addr1 := suite.SetupAddr(0) suite.SetupDepositAndStake(depositStakeSpec{ depositSpecs: []depositSpec{ diff --git a/x/incentives/keeper/stake_test.go b/x/incentives/keeper/stake_test.go index 00da937c8..d5caf9e0b 100644 --- a/x/incentives/keeper/stake_test.go +++ b/x/incentives/keeper/stake_test.go @@ -8,7 +8,7 @@ import ( var _ = suite.TestingSuite(nil) -func (suite *KeeperTestSuite) TestStakeLifecycle() { +func (suite *IncentivesTestSuite) TestStakeLifecycle() { addr0 := suite.SetupAddr(0) // setup dex deposit and stake of those shares @@ -39,7 +39,7 @@ func (suite *KeeperTestSuite) TestStakeLifecycle() { suite.Require().Error(err) } -func (suite *KeeperTestSuite) TestMultipleStakeLifecycle() { +func (suite *IncentivesTestSuite) TestMultipleStakeLifecycle() { addr0 := suite.SetupAddr(0) // setup dex deposit and stake of those shares @@ -81,7 +81,7 @@ func (suite *KeeperTestSuite) TestMultipleStakeLifecycle() { suite.Require().Error(err) } -func (suite *KeeperTestSuite) TestStakeUnstakePartial() { +func (suite *IncentivesTestSuite) TestStakeUnstakePartial() { addr0 := suite.SetupAddr(0) // setup dex deposit and stake of those shares diff --git a/x/incentives/keeper/suite_test.go b/x/incentives/keeper/suite_test.go index cf0ab8382..7668ea9b1 100644 --- a/x/incentives/keeper/suite_test.go +++ b/x/incentives/keeper/suite_test.go @@ -34,7 +34,7 @@ type gaugeSpec struct { } // AddToGauge adds coins to the specified gauge. -func (suite *KeeperTestSuite) AddToGauge(coins sdk.Coins, gaugeID uint64) uint64 { +func (suite *IncentivesTestSuite) AddToGauge(coins sdk.Coins, gaugeID uint64) uint64 { addr := sdk.AccAddress([]byte("addrx---------------")) suite.FundAcc(addr, coins) err := suite.App.IncentivesKeeper.AddToGaugeRewards(suite.Ctx, addr, coins, gaugeID) @@ -42,7 +42,7 @@ func (suite *KeeperTestSuite) AddToGauge(coins sdk.Coins, gaugeID uint64) uint64 return gaugeID } -func (suite *KeeperTestSuite) SetupDeposit(ss []depositSpec) sdk.Coins { +func (suite *IncentivesTestSuite) SetupDeposit(ss []depositSpec) sdk.Coins { shares := sdk.NewCoins() for _, s := range ss { suite.FundAcc(s.addr, sdk.Coins{s.token0, s.token1}) @@ -64,13 +64,13 @@ func (suite *KeeperTestSuite) SetupDeposit(ss []depositSpec) sdk.Coins { return shares } -func (suite *KeeperTestSuite) SetupDepositAndStake(s depositStakeSpec) *types.Stake { +func (suite *IncentivesTestSuite) SetupDepositAndStake(s depositStakeSpec) *types.Stake { shares := suite.SetupDeposit(s.depositSpecs) return suite.SetupStake(s.depositSpecs[0].addr, shares, s.stakeDistEpochOffset) } // StakeTokens stakes tokens for the specified duration -func (suite *KeeperTestSuite) SetupStake( +func (suite *IncentivesTestSuite) SetupStake( addr sdk.AccAddress, shares sdk.Coins, distEpochOffset int, @@ -89,7 +89,7 @@ func (suite *KeeperTestSuite) SetupStake( } // setupNewGauge creates a gauge with the specified duration. -func (suite *KeeperTestSuite) SetupGauge(s gaugeSpec) *types.Gauge { +func (suite *IncentivesTestSuite) SetupGauge(s gaugeSpec) *types.Gauge { addr := sdk.AccAddress([]byte("Gauge_Creation_Addr_")) // fund reward tokens @@ -117,7 +117,7 @@ func (suite *KeeperTestSuite) SetupGauge(s gaugeSpec) *types.Gauge { return gauge } -func (suite *KeeperTestSuite) SetupGauges(specs []gaugeSpec) { +func (suite *IncentivesTestSuite) SetupGauges(specs []gaugeSpec) { for _, s := range specs { suite.SetupGauge(s) } From 040d01287e66c06bacceee447c544b206ed2ca9f Mon Sep 17 00:00:00 2001 From: Julian Compagni Portis Date: Tue, 17 Oct 2023 19:34:15 -0400 Subject: [PATCH 186/307] set max_gas in init-neutrond.sh duality code requires max gas to be set initChain panics --- network/init-neutrond.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/network/init-neutrond.sh b/network/init-neutrond.sh index 390284816..d2461210f 100755 --- a/network/init-neutrond.sh +++ b/network/init-neutrond.sh @@ -643,6 +643,7 @@ set_genesis_param_jq ".app_state.globalfee.params.bypass_min_fee_msg_types" "$BY set_genesis_param proposer_fee "\"0.25\"" # builder(POB) set_genesis_param escrow_account_address "\"$DAO_CONTRACT_ADDRESS_B64\"," # builder(POB) set_genesis_param sudo_call_gas_limit "\"1000000\"" # contractmanager +set_genesis_param max_gas "\"40000000\"" # consensus_params if ! jq -e . "$GENESIS_PATH" >/dev/null 2>&1; then echo "genesis appears to become incorrect json" >&2 From 6a06cc233ffe36bf6d0a4b7f416b3a0f810b8957 Mon Sep 17 00:00:00 2001 From: Julian Compagni Portis Date: Tue, 17 Oct 2023 19:59:56 -0400 Subject: [PATCH 187/307] remove vestigial code --- x/incentives/types/account.pb.go | 391 ------------------------------- 1 file changed, 391 deletions(-) delete mode 100644 x/incentives/types/account.pb.go diff --git a/x/incentives/types/account.pb.go b/x/incentives/types/account.pb.go deleted file mode 100644 index eb0a043c9..000000000 --- a/x/incentives/types/account.pb.go +++ /dev/null @@ -1,391 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: dualitylabs/duality/incentives/account.proto - -package types - -import ( - fmt "fmt" - github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" - types "github.com/cosmos/cosmos-sdk/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 - -// Describes the total distributions to an account over time -type Account struct { - // the address of this account - Account string `protobuf:"bytes,1,opt,name=account,proto3" json:"account,omitempty"` - // coins describes the total amount of coins that have been distributed to this user over time - Coins github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,2,rep,name=coins,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"coins"` -} - -func (m *Account) Reset() { *m = Account{} } -func (m *Account) String() string { return proto.CompactTextString(m) } -func (*Account) ProtoMessage() {} -func (*Account) Descriptor() ([]byte, []int) { - return fileDescriptor_2ae6444a4cf54b42, []int{0} -} -func (m *Account) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *Account) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_Account.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 *Account) XXX_Merge(src proto.Message) { - xxx_messageInfo_Account.Merge(m, src) -} -func (m *Account) XXX_Size() int { - return m.Size() -} -func (m *Account) XXX_DiscardUnknown() { - xxx_messageInfo_Account.DiscardUnknown(m) -} - -var xxx_messageInfo_Account proto.InternalMessageInfo - -func (m *Account) GetAccount() string { - if m != nil { - return m.Account - } - return "" -} - -func (m *Account) GetCoins() github_com_cosmos_cosmos_sdk_types.Coins { - if m != nil { - return m.Coins - } - return nil -} - -func init() { - proto.RegisterType((*Account)(nil), "dualitylabs.duality.incentives.Account") -} - -func init() { - proto.RegisterFile("dualitylabs/duality/incentives/account.proto", fileDescriptor_2ae6444a4cf54b42) -} - -var fileDescriptor_2ae6444a4cf54b42 = []byte{ - // 258 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0x49, 0x29, 0x4d, 0xcc, - 0xc9, 0x2c, 0xa9, 0xcc, 0x49, 0x4c, 0x2a, 0xd6, 0x87, 0xb2, 0xf5, 0x33, 0xf3, 0x92, 0x53, 0xf3, - 0x4a, 0x32, 0xcb, 0x52, 0x8b, 0xf5, 0x13, 0x93, 0x93, 0xf3, 0x4b, 0xf3, 0x4a, 0xf4, 0x0a, 0x8a, - 0xf2, 0x4b, 0xf2, 0x85, 0xe4, 0x90, 0x54, 0xeb, 0x41, 0xd9, 0x7a, 0x08, 0xd5, 0x52, 0x22, 0xe9, - 0xf9, 0xe9, 0xf9, 0x60, 0xa5, 0xfa, 0x20, 0x16, 0x44, 0x97, 0x94, 0x5c, 0x72, 0x7e, 0x71, 0x6e, - 0x7e, 0xb1, 0x7e, 0x52, 0x62, 0x71, 0xaa, 0x7e, 0x99, 0x61, 0x52, 0x6a, 0x49, 0xa2, 0xa1, 0x7e, - 0x72, 0x7e, 0x66, 0x1e, 0x44, 0x5e, 0xa9, 0x8d, 0x91, 0x8b, 0xdd, 0x11, 0x62, 0x8f, 0x90, 0x04, - 0x17, 0x3b, 0xd4, 0x4a, 0x09, 0x46, 0x05, 0x46, 0x0d, 0xce, 0x20, 0x18, 0x57, 0x28, 0x91, 0x8b, - 0x15, 0xa4, 0xa7, 0x58, 0x82, 0x49, 0x81, 0x59, 0x83, 0xdb, 0x48, 0x52, 0x0f, 0x62, 0xaa, 0x1e, - 0xc8, 0x54, 0x3d, 0xa8, 0xa9, 0x7a, 0xce, 0xf9, 0x99, 0x79, 0x4e, 0x06, 0x27, 0xee, 0xc9, 0x33, - 0xac, 0xba, 0x2f, 0xaf, 0x91, 0x9e, 0x59, 0x92, 0x51, 0x9a, 0xa4, 0x97, 0x9c, 0x9f, 0xab, 0x0f, - 0x75, 0x02, 0x84, 0xd2, 0x2d, 0x4e, 0xc9, 0xd6, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, 0x06, 0x6b, 0x28, - 0x0e, 0x82, 0x98, 0xec, 0xe4, 0x73, 0xe2, 0x91, 0x1c, 0xe3, 0x85, 0x47, 0x72, 0x8c, 0x0f, 0x1e, - 0xc9, 0x31, 0x4e, 0x78, 0x2c, 0xc7, 0x70, 0xe1, 0xb1, 0x1c, 0xc3, 0x8d, 0xc7, 0x72, 0x0c, 0x51, - 0x46, 0x48, 0x46, 0x41, 0xfd, 0xad, 0x8b, 0x12, 0x64, 0x15, 0xc8, 0x81, 0x06, 0x36, 0x3a, 0x89, - 0x0d, 0xec, 0x3b, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0x86, 0xe1, 0x38, 0x8e, 0x63, 0x01, - 0x00, 0x00, -} - -func (m *Account) 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 *Account) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *Account) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Coins) > 0 { - for iNdEx := len(m.Coins) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Coins[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintAccount(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - } - if len(m.Account) > 0 { - i -= len(m.Account) - copy(dAtA[i:], m.Account) - i = encodeVarintAccount(dAtA, i, uint64(len(m.Account))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func encodeVarintAccount(dAtA []byte, offset int, v uint64) int { - offset -= sovAccount(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func (m *Account) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Account) - if l > 0 { - n += 1 + l + sovAccount(uint64(l)) - } - if len(m.Coins) > 0 { - for _, e := range m.Coins { - l = e.Size() - n += 1 + l + sovAccount(uint64(l)) - } - } - return n -} - -func sovAccount(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozAccount(x uint64) (n int) { - return sovAccount(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (m *Account) 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 ErrIntOverflowAccount - } - 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: Account: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: Account: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Account", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowAccount - } - 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 ErrInvalidLengthAccount - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthAccount - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Account = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Coins", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowAccount - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthAccount - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthAccount - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Coins = append(m.Coins, types.Coin{}) - if err := m.Coins[len(m.Coins)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipAccount(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthAccount - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func skipAccount(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, ErrIntOverflowAccount - } - 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, ErrIntOverflowAccount - } - 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, ErrIntOverflowAccount - } - 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, ErrInvalidLengthAccount - } - iNdEx += length - case 3: - depth++ - case 4: - if depth == 0 { - return 0, ErrUnexpectedEndOfGroupAccount - } - depth-- - case 5: - iNdEx += 4 - default: - return 0, fmt.Errorf("proto: illegal wireType %d", wireType) - } - if iNdEx < 0 { - return 0, ErrInvalidLengthAccount - } - if depth == 0 { - return iNdEx, nil - } - } - return 0, io.ErrUnexpectedEOF -} - -var ( - ErrInvalidLengthAccount = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowAccount = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupAccount = fmt.Errorf("proto: unexpected end of group") -) From 549c39a69f3f5619f8405424e6842e81009e0bee Mon Sep 17 00:00:00 2001 From: Julian Compagni Portis Date: Tue, 17 Oct 2023 20:03:29 -0400 Subject: [PATCH 188/307] rename duality => neutron where applicable in code --- tests/ibc/gmp_swap_forward_test.go | 42 ++-- tests/ibc/ibc_setup_test.go | 110 ++++---- tests/ibc/swap_forward_test.go | 234 +++++++++--------- tests/ibc/swap_test.go | 104 ++++---- testutil/integration_test_setup.go | 2 +- wasmbinding/stargate_allowlist.go | 38 +-- x/dex/keeper/core_helper_test.go | 4 +- x/dex/keeper/grpc_query_user_deposits_test.go | 4 +- x/dex/types/errors.go | 2 +- x/dex/types/pool_denom.go | 2 +- x/dex/types/pool_denom_test.go | 8 +- x/epochs/README.md | 8 +- x/ibcswap/keeper/keeper.go | 2 +- x/ibcswap/types/swap.go | 2 +- x/incentives/README LOCKUP.md | 106 ++++---- x/incentives/client/cli/cli_test.go | 14 +- x/incentives/client/cli/query.go | 2 +- x/incentives/keeper/distributor_test.go | 2 +- x/incentives/types/codec.go | 8 +- 19 files changed, 335 insertions(+), 359 deletions(-) diff --git a/tests/ibc/gmp_swap_forward_test.go b/tests/ibc/gmp_swap_forward_test.go index 95e579f97..06dfa33a3 100644 --- a/tests/ibc/gmp_swap_forward_test.go +++ b/tests/ibc/gmp_swap_forward_test.go @@ -12,28 +12,28 @@ import ( swaptypes "github.com/neutron-org/neutron/x/ibcswap/types" ) -// TestSwapAndForward_Success asserts that the swap and forward middleware stack works as intended with Duality running as a +// TestSwapAndForward_Success asserts that the swap and forward middleware stack works as intended with Neutron running as a // consumer chain connected to two other chains via IBC. func (s *IBCTestSuite) TestGMPSwapAndForward_Success() { - // Send an IBC transfer from provider to Duality, so we can initialize a pool with the IBC denom token + native Duality token - s.IBCTransferProviderToDuality(s.providerAddr, s.dualityAddr, nativeDenom, ibcTransferAmount, "") + // Send an IBC transfer from provider to Neutron, so we can initialize a pool with the IBC denom token + native Neutron token + s.IBCTransferProviderToNeutron(s.providerAddr, s.neutronAddr, nativeDenom, ibcTransferAmount, "") - // Assert that the funds are gone from the acc on provider and present in the acc on Duality + // Assert that the funds are gone from the acc on provider and present in the acc on Neutron newProviderBalNative := genesisWalletAmount.Sub(ibcTransferAmount) s.assertProviderBalance(s.providerAddr, nativeDenom, newProviderBalNative) - s.assertDualityBalance(s.dualityAddr, s.providerToDualityDenom, ibcTransferAmount) + s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, ibcTransferAmount) - // deposit stake<>ibcTransferToken to initialize the pool on Duality + // deposit stake<>ibcTransferToken to initialize the pool on Neutron depositAmount := math.NewInt(100_000) - s.dualityDeposit( + s.neutronDeposit( nativeDenom, - s.providerToDualityDenom, + s.providerToNeutronDenom, depositAmount, depositAmount, 0, 1, - s.dualityAddr) + s.neutronAddr) // Compose the IBC transfer memo metadata to be used in the swap and forward swapAmount := math.NewInt(100000) @@ -44,8 +44,8 @@ func (s *IBCTestSuite) TestGMPSwapAndForward_Success() { forwardMetadata := forwardtypes.PacketMetadata{ Forward: &forwardtypes.ForwardMetadata{ Receiver: chainBAddr.String(), - Port: s.dualityChainBPath.EndpointA.ChannelConfig.PortID, - Channel: s.dualityChainBPath.EndpointA.ChannelID, + Port: s.neutronChainBPath.EndpointA.ChannelConfig.PortID, + Channel: s.neutronChainBPath.EndpointA.ChannelID, Timeout: forwardtypes.Duration(5 * time.Minute), Retries: &retries, Next: nil, @@ -62,9 +62,9 @@ func (s *IBCTestSuite) TestGMPSwapAndForward_Success() { swapMetadata := swaptypes.PacketMetadata{ Swap: &swaptypes.SwapMetadata{ MsgPlaceLimitOrder: &types.MsgPlaceLimitOrder{ - Creator: s.dualityAddr.String(), - Receiver: s.dualityAddr.String(), - TokenIn: s.providerToDualityDenom, + Creator: s.neutronAddr.String(), + Receiver: s.neutronAddr.String(), + TokenIn: s.providerToNeutronDenom, TokenOut: nativeDenom, AmountIn: swapAmount, TickIndexInToOut: 2, @@ -89,23 +89,23 @@ func (s *IBCTestSuite) TestGMPSwapAndForward_Success() { // Send an IBC transfer from chainA to chainB with packet memo containing the swap metadata - s.IBCTransferProviderToDuality(s.providerAddr, s.dualityAddr, nativeDenom, ibcTransferAmount, string(gmpMetadataBz)) + s.IBCTransferProviderToNeutron(s.providerAddr, s.neutronAddr, nativeDenom, ibcTransferAmount, string(gmpMetadataBz)) // Relay the packet - err = s.RelayAllPacketsAToB(s.dualityChainBPath) + err = s.RelayAllPacketsAToB(s.neutronChainBPath) s.Assert().NoError(err) // Check that the funds are moved out of the acc on providerChain s.assertProviderBalance(s.providerAddr, nativeDenom, newProviderBalNative.Sub(ibcTransferAmount)) - // Check that the amountIn is deduced from the duality account - s.assertDualityBalance(s.dualityAddr, s.providerToDualityDenom, math.ZeroInt()) - // Check that duality account did not keep any of the transfer denom - s.assertDualityBalance(s.dualityAddr, nativeDenom, genesisWalletAmount.Sub(swapAmount)) + // Check that the amountIn is deduced from the neutron account + s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, math.ZeroInt()) + // Check that neutron account did not keep any of the transfer denom + s.assertNeutronBalance(s.neutronAddr, nativeDenom, genesisWalletAmount.Sub(swapAmount)) transferDenomPath := transfertypes.GetPrefixedDenom( transfertypes.PortID, - s.dualityChainBPath.EndpointA.ChannelID, + s.neutronChainBPath.EndpointA.ChannelID, nativeDenom, ) transferDenomChainB := transfertypes.ParseDenomTrace(transferDenomPath).IBCDenom() diff --git a/tests/ibc/ibc_setup_test.go b/tests/ibc/ibc_setup_test.go index ebe6802ed..e3df4b424 100644 --- a/tests/ibc/ibc_setup_test.go +++ b/tests/ibc/ibc_setup_test.go @@ -1,13 +1,10 @@ package ibc_test import ( - "encoding/json" "fmt" "testing" "cosmossdk.io/math" - dbm "github.com/cometbft/cometbft-db" - "github.com/cosmos/cosmos-sdk/testutil/sims" sdk "github.com/cosmos/cosmos-sdk/types" transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" @@ -16,12 +13,11 @@ import ( ibctesting "github.com/cosmos/ibc-go/v7/testing" icsibctesting "github.com/cosmos/interchain-security/v3/legacy_ibc_testing/testing" - "github.com/cometbft/cometbft/libs/log" icstestingutils "github.com/cosmos/interchain-security/v3/testutil/ibc_testing" - testutil "github.com/cosmos/interchain-security/v3/testutil/integration" + icstestutil "github.com/cosmos/interchain-security/v3/testutil/integration" ccvconsumertypes "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types" ccv "github.com/cosmos/interchain-security/v3/x/ccv/types" - app "github.com/neutron-org/neutron/app" + "github.com/neutron-org/neutron/testutil" dextypes "github.com/neutron-org/neutron/x/dex/types" "github.com/stretchr/testify/suite" ) @@ -37,20 +33,20 @@ type IBCTestSuite struct { coordinator *icsibctesting.Coordinator providerChain *icsibctesting.TestChain - providerApp testutil.ProviderApp - dualityChain *icsibctesting.TestChain // aka chainA - dualityApp testutil.ConsumerApp + providerApp icstestutil.ProviderApp + neutronChain *icsibctesting.TestChain // aka chainA + neutronApp icstestutil.ConsumerApp bundleB *icstestingutils.ConsumerBundle bundleC *icstestingutils.ConsumerBundle - dualityCCVPath *icsibctesting.Path - dualityTransferPath *icsibctesting.Path - dualityChainBPath *icsibctesting.Path + neutronCCVPath *icsibctesting.Path + neutronTransferPath *icsibctesting.Path + neutronChainBPath *icsibctesting.Path chainBChainCPath *icsibctesting.Path providerAddr sdk.AccAddress - dualityAddr sdk.AccAddress - providerToDualityDenom string + neutronAddr sdk.AccAddress + providerToNeutronDenom string } func TestIBCTestSuite(t *testing.T) { @@ -60,46 +56,46 @@ func TestIBCTestSuite(t *testing.T) { func (s *IBCTestSuite) SetupTest() { // Create coordinator s.coordinator = icsibctesting.NewCoordinator(s.T(), 0) - s.providerChain, s.providerApp = icstestingutils.AddProvider[testutil.ProviderApp]( + s.providerChain, s.providerApp = icstestingutils.AddProvider[icstestutil.ProviderApp]( s.T(), s.coordinator, icstestingutils.ProviderAppIniter, ) - // Setup duality as a consumer chain - dualityBundle := s.addConsumerChain(dualityAppIniter, 1) - s.dualityChain = dualityBundle.Chain - s.dualityApp = dualityBundle.App - s.dualityCCVPath = dualityBundle.Path - s.dualityTransferPath = dualityBundle.TransferPath + // Setup neutron as a consumer chain + neutronBundle := s.addConsumerChain(testutil.SetupTestingApp("neutron-1"), 1) + s.neutronChain = neutronBundle.Chain + s.neutronApp = neutronBundle.App + s.neutronCCVPath = neutronBundle.Path + s.neutronTransferPath = neutronBundle.TransferPath // Setup consumer chainB - // NOTE: using dualityAppIniter otherwise the consumer chain doesn't have the packetForwarding middleware - s.bundleB = s.addConsumerChain(dualityAppIniter, 2) + // NOTE: using neutron Setup for chain B, otherwise the consumer chain doesn't have the packetForwarding middleware + s.bundleB = s.addConsumerChain(testutil.SetupTestingApp("chainB-1"), 2) // Setup consumer chainC s.bundleC = s.addConsumerChain(icstestingutils.ConsumerAppIniter, 3) - // setup transfer channel between duality and consumerChainB - s.dualityChainBPath = s.setupConsumerToConsumerTransferChannel(dualityBundle, s.bundleB) + // setup transfer channel between neutron and consumerChainB + s.neutronChainBPath = s.setupConsumerToConsumerTransferChannel(neutronBundle, s.bundleB) // setup transfer channel between consumerChainB and consumerChainC s.chainBChainCPath = s.setupConsumerToConsumerTransferChannel(s.bundleB, s.bundleC) - // Store ibc transfer denom for providerChain=>duality for test convenience + // Store ibc transfer denom for providerChain=>neutron for test convenience fullTransferDenomPath := transfertypes.GetPrefixedDenom( transfertypes.PortID, - s.dualityTransferPath.EndpointB.ChannelID, + s.neutronTransferPath.EndpointB.ChannelID, nativeDenom, ) transferDenom := transfertypes.ParseDenomTrace(fullTransferDenomPath).IBCDenom() - s.providerToDualityDenom = transferDenom + s.providerToNeutronDenom = transferDenom - // Store default addresses from duality and provider chain for test convenience + // Store default addresses from neutron and provider chain for test convenience s.providerAddr = s.providerChain.SenderAccount.GetAddress() - s.dualityAddr = s.dualityChain.SenderAccount.GetAddress() + s.neutronAddr = s.neutronChain.SenderAccount.GetAddress() // ensure genesis balances are as expected - s.assertDualityBalance(s.dualityAddr, nativeDenom, genesisWalletAmount) + s.assertNeutronBalance(s.neutronAddr, nativeDenom, genesisWalletAmount) s.assertProviderBalance(s.providerAddr, nativeDenom, genesisWalletAmount) } @@ -107,7 +103,7 @@ func (s *IBCTestSuite) addConsumerChain( appIniter icsibctesting.AppIniter, chainIdx int, ) *icstestingutils.ConsumerBundle { - bundle := icstestingutils.AddConsumer[testutil.ProviderApp, testutil.ConsumerApp]( + bundle := icstestingutils.AddConsumer[icstestutil.ProviderApp, icstestutil.ConsumerApp]( s.coordinator, &s.Suite, chainIdx, @@ -136,7 +132,7 @@ func (s *IBCTestSuite) setupCCVChannel(bundle *icstestingutils.ConsumerBundle) * ccvPath := icsibctesting.NewPath(bundle.Chain, s.providerChain) providerKeeper := s.providerApp.GetProviderKeeper() - dualityKeeper := bundle.GetKeeper() + neutronKeeper := bundle.GetKeeper() providerEndpointClientID, found := providerKeeper.GetConsumerClientId( s.providerCtx(), @@ -145,7 +141,7 @@ func (s *IBCTestSuite) setupCCVChannel(bundle *icstestingutils.ConsumerBundle) * s.Require().True(found, "provider endpoint clientID not found") ccvPath.EndpointB.ClientID = providerEndpointClientID - consumerEndpointClientID, found := dualityKeeper.GetProviderClientID(bundle.GetCtx()) + consumerEndpointClientID, found := neutronKeeper.GetProviderClientID(bundle.GetCtx()) s.Require().True(found, "consumer endpoint clientID not found") ccvPath.EndpointA.ClientID = consumerEndpointClientID @@ -188,7 +184,7 @@ func (s *IBCTestSuite) setupConsumerToConsumerTransferChannel( func (s *IBCTestSuite) setupTransferChannel( ccvPath *icsibctesting.Path, - appA testutil.ConsumerApp, + appA icstestutil.ConsumerApp, chainA, chainB *icsibctesting.TestChain, ) *icsibctesting.Path { // transfer path will use the same connection as ibc path @@ -225,26 +221,6 @@ func (s *IBCTestSuite) setupTransferChannel( return transferPath } -func dualityAppIniter() (icsibctesting.TestingApp, map[string]json.RawMessage) { - encoding := app.MakeEncodingConfig() - db := dbm.NewMemDB() - testApp := app.New( - log.NewNopLogger(), - "neutron-1", - db, - nil, - true, - map[int64]bool{}, - app.DefaultNodeHome, - 0, - encoding, - sims.EmptyAppOptions{}, - nil, - ) - - return testApp, app.NewDefaultGenesisState(testApp.AppCodec()) -} - func (s *IBCTestSuite) providerCtx() sdk.Context { return s.providerChain.GetContext() } @@ -277,7 +253,7 @@ func (s *IBCTestSuite) IBCTransfer( res, err := sourceEndpoint.Chain.SendMsgs(transferMsg) s.Assert().NoError(err) - // Relay transfer msg to Duality chain + // Relay transfer msg to Neutron chain packet, err := ibctesting.ParsePacketFromEvents(res.GetEvents()) s.Require().NoError(err) @@ -285,18 +261,18 @@ func (s *IBCTestSuite) IBCTransfer( path.RelayPacket(packet) } -func (s *IBCTestSuite) IBCTransferProviderToDuality( +func (s *IBCTestSuite) IBCTransferProviderToNeutron( providerAddr sdk.AccAddress, - dualityAddr sdk.AccAddress, + neutronAddr sdk.AccAddress, transferDenom string, transferAmount math.Int, memo string, ) { s.IBCTransfer( - s.dualityTransferPath, - s.dualityTransferPath.EndpointB, + s.neutronTransferPath, + s.neutronTransferPath.EndpointB, providerAddr, - dualityAddr, + neutronAddr, transferDenom, transferAmount, memo, @@ -304,7 +280,7 @@ func (s *IBCTestSuite) IBCTransferProviderToDuality( } func (s *IBCTestSuite) getBalance( - bk testutil.TestBankKeeper, + bk icstestutil.TestBankKeeper, chain *icsibctesting.TestChain, addr sdk.AccAddress, denom string, @@ -314,7 +290,7 @@ func (s *IBCTestSuite) getBalance( } func (s *IBCTestSuite) assertBalance( - bk testutil.TestBankKeeper, + bk icstestutil.TestBankKeeper, chain *icsibctesting.TestChain, addr sdk.AccAddress, denom string, @@ -325,12 +301,12 @@ func (s *IBCTestSuite) assertBalance( Equal(expectedAmt, actualAmt, "Expected amount of %s: %s; Got: %s", denom, expectedAmt, actualAmt) } -func (s *IBCTestSuite) assertDualityBalance( +func (s *IBCTestSuite) assertNeutronBalance( addr sdk.AccAddress, denom string, expectedAmt math.Int, ) { - s.assertBalance(s.dualityApp.GetTestBankKeeper(), s.dualityChain, addr, denom, expectedAmt) + s.assertBalance(s.neutronApp.GetTestBankKeeper(), s.neutronChain, addr, denom, expectedAmt) } func (s *IBCTestSuite) assertProviderBalance( @@ -350,7 +326,7 @@ func (s *IBCTestSuite) assertChainCBalance(addr sdk.AccAddress, denom string, ex } //nolint:unparam // keep this flexible even if we aren't currently using all the params -func (s *IBCTestSuite) dualityDeposit( +func (s *IBCTestSuite) neutronDeposit( token0 string, token1 string, depositAmount0 math.Int, @@ -373,7 +349,7 @@ func (s *IBCTestSuite) dualityDeposit( ) // execute deposit msg - _, err := s.dualityChain.SendMsgs(msgDeposit) + _, err := s.neutronChain.SendMsgs(msgDeposit) s.Assert().NoError(err, "Deposit Failed") } diff --git a/tests/ibc/swap_forward_test.go b/tests/ibc/swap_forward_test.go index 6dd383a2b..12d07e448 100644 --- a/tests/ibc/swap_forward_test.go +++ b/tests/ibc/swap_forward_test.go @@ -14,36 +14,36 @@ import ( ) func (s *IBCTestSuite) TestSwapAndForward_Success() { - // Send an IBC transfer from provider chain to duality, so we can initialize a pool with the IBC denom token + native Duality token - s.IBCTransferProviderToDuality( + // Send an IBC transfer from provider chain to neutron, so we can initialize a pool with the IBC denom token + native Neutron token + s.IBCTransferProviderToNeutron( s.providerAddr, - s.dualityAddr, + s.neutronAddr, nativeDenom, ibcTransferAmount, "", ) - // Assert that the funds are gone from the acc on provider and present in the acc on Duality + // Assert that the funds are gone from the acc on provider and present in the acc on Neutron newProviderBalNative := genesisWalletAmount.Sub(ibcTransferAmount) s.assertProviderBalance(s.providerAddr, nativeDenom, newProviderBalNative) - s.assertDualityBalance(s.dualityAddr, s.providerToDualityDenom, ibcTransferAmount) + s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, ibcTransferAmount) - // deposit stake<>ibcTransferToken to initialize the pool on Duality + // deposit stake<>ibcTransferToken to initialize the pool on Neutron depositAmount := math.NewInt(100_000) - s.dualityDeposit( + s.neutronDeposit( nativeDenom, - s.providerToDualityDenom, + s.providerToNeutronDenom, depositAmount, depositAmount, 0, 1, - s.dualityAddr) + s.neutronAddr) - // Assert that the deposit was successful and the funds are moved out of the Duality user acc - s.assertDualityBalance(s.dualityAddr, s.providerToDualityDenom, math.ZeroInt()) - postDepositDualityBalNative := genesisWalletAmount.Sub(depositAmount) - s.assertDualityBalance(s.dualityAddr, nativeDenom, postDepositDualityBalNative) + // Assert that the deposit was successful and the funds are moved out of the Neutron user acc + s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, math.ZeroInt()) + postDepositNeutronBalNative := genesisWalletAmount.Sub(depositAmount) + s.assertNeutronBalance(s.neutronAddr, nativeDenom, postDepositNeutronBalNative) // Compose the IBC transfer memo metadata to be used in the swap and forward swapAmount := math.NewInt(100000) @@ -55,8 +55,8 @@ func (s *IBCTestSuite) TestSwapAndForward_Success() { forwardMetadata := forwardtypes.PacketMetadata{ Forward: &forwardtypes.ForwardMetadata{ Receiver: chainBAddr.String(), - Port: s.dualityChainBPath.EndpointA.ChannelConfig.PortID, - Channel: s.dualityChainBPath.EndpointA.ChannelID, + Port: s.neutronChainBPath.EndpointA.ChannelConfig.PortID, + Channel: s.neutronChainBPath.EndpointA.ChannelID, Timeout: forwardtypes.Duration(5 * time.Minute), Retries: &retries, Next: nil, @@ -73,9 +73,9 @@ func (s *IBCTestSuite) TestSwapAndForward_Success() { metadata := swaptypes.PacketMetadata{ Swap: &swaptypes.SwapMetadata{ MsgPlaceLimitOrder: &types.MsgPlaceLimitOrder{ - Creator: s.dualityAddr.String(), - Receiver: s.dualityAddr.String(), - TokenIn: s.providerToDualityDenom, + Creator: s.neutronAddr.String(), + Receiver: s.neutronAddr.String(), + TokenIn: s.providerToNeutronDenom, TokenOut: nativeDenom, AmountIn: swapAmount, TickIndexInToOut: 2, @@ -88,17 +88,17 @@ func (s *IBCTestSuite) TestSwapAndForward_Success() { metadataBz, err := json.Marshal(metadata) s.Require().NoError(err) - // Send an IBC transfer from provider to duality with packet memo containing the swap metadata - s.IBCTransferProviderToDuality( + // Send an IBC transfer from provider to neutron with packet memo containing the swap metadata + s.IBCTransferProviderToNeutron( s.providerAddr, - s.dualityAddr, + s.neutronAddr, nativeDenom, ibcTransferAmount, string(metadataBz), ) // Relay the packets - err = s.RelayAllPacketsAToB(s.dualityChainBPath) + err = s.RelayAllPacketsAToB(s.neutronChainBPath) s.Assert().NoError(err) // Check that the funds are moved out of the acc on providerChain @@ -108,55 +108,55 @@ func (s *IBCTestSuite) TestSwapAndForward_Success() { newProviderBalNative.Sub(ibcTransferAmount), ) - // Check that the amountIn is deduced from the duality account - s.assertDualityBalance(s.dualityAddr, s.providerToDualityDenom, math.ZeroInt()) - // Check that duality account did not keep any of the transfer denom - s.assertDualityBalance(s.dualityAddr, nativeDenom, genesisWalletAmount.Sub(swapAmount)) + // Check that the amountIn is deducted from the neutron account + s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, math.ZeroInt()) + // Check that neutron account did not keep any of the transfer denom + s.assertNeutronBalance(s.neutronAddr, nativeDenom, genesisWalletAmount.Sub(swapAmount)) transferDenomPath := transfertypes.GetPrefixedDenom( transfertypes.PortID, - s.dualityChainBPath.EndpointA.ChannelID, + s.neutronChainBPath.EndpointA.ChannelID, nativeDenom, ) - transferDenomDualityChainB := transfertypes.ParseDenomTrace(transferDenomPath).IBCDenom() + transferDenomNeutronChainB := transfertypes.ParseDenomTrace(transferDenomPath).IBCDenom() // Check that the funds are now present in the acc on chainB - s.assertChainBBalance(chainBAddr, transferDenomDualityChainB, expectedAmountOut) + s.assertChainBBalance(chainBAddr, transferDenomNeutronChainB, expectedAmountOut) s.Assert().NoError(err) } func (s *IBCTestSuite) TestSwapAndForward_MultiHopSuccess() { - // Send an IBC transfer from provider chain to duality, so we can initialize a pool with the IBC denom token + native Duality token - s.IBCTransferProviderToDuality( + // Send an IBC transfer from provider chain to neutron, so we can initialize a pool with the IBC denom token + native Neutron token + s.IBCTransferProviderToNeutron( s.providerAddr, - s.dualityAddr, + s.neutronAddr, nativeDenom, ibcTransferAmount, "", ) - // Assert that the funds are gone from the acc on provider and present in the acc on Duality + // Assert that the funds are gone from the acc on provider and present in the acc on Neutron newProviderBalNative := genesisWalletAmount.Sub(ibcTransferAmount) s.assertProviderBalance(s.providerAddr, nativeDenom, newProviderBalNative) - s.assertDualityBalance(s.dualityAddr, s.providerToDualityDenom, ibcTransferAmount) + s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, ibcTransferAmount) - // deposit stake<>ibcTransferToken to initialize the pool on Duality + // deposit stake<>ibcTransferToken to initialize the pool on Neutron depositAmount := math.NewInt(100_000) - s.dualityDeposit( + s.neutronDeposit( nativeDenom, - s.providerToDualityDenom, + s.providerToNeutronDenom, depositAmount, depositAmount, 0, 1, - s.dualityAddr) + s.neutronAddr) - // Assert that the deposit was successful and the funds are moved out of the Duality user acc - s.assertDualityBalance(s.dualityAddr, s.providerToDualityDenom, math.ZeroInt()) - postDepositDualityBalNative := genesisWalletAmount.Sub(depositAmount) - s.assertDualityBalance(s.dualityAddr, nativeDenom, postDepositDualityBalNative) + // Assert that the deposit was successful and the funds are moved out of the Neutron user acc + s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, math.ZeroInt()) + postDepositNeutronBalNative := genesisWalletAmount.Sub(depositAmount) + s.assertNeutronBalance(s.neutronAddr, nativeDenom, postDepositNeutronBalNative) // Compose the IBC transfer memo metadata to be used in the swap and forward swapAmount := math.NewInt(100000) @@ -184,8 +184,8 @@ func (s *IBCTestSuite) TestSwapAndForward_MultiHopSuccess() { forwardMetadata := forwardtypes.PacketMetadata{ Forward: &forwardtypes.ForwardMetadata{ Receiver: chainBAddr.String(), - Port: s.dualityChainBPath.EndpointA.ChannelConfig.PortID, - Channel: s.dualityChainBPath.EndpointA.ChannelID, + Port: s.neutronChainBPath.EndpointA.ChannelConfig.PortID, + Channel: s.neutronChainBPath.EndpointA.ChannelID, Timeout: forwardtypes.Duration(5 * time.Minute), Retries: &retries, Next: nextForwardJSON, @@ -201,9 +201,9 @@ func (s *IBCTestSuite) TestSwapAndForward_MultiHopSuccess() { metadata := swaptypes.PacketMetadata{ Swap: &swaptypes.SwapMetadata{ MsgPlaceLimitOrder: &types.MsgPlaceLimitOrder{ - Creator: s.dualityAddr.String(), - Receiver: s.dualityAddr.String(), - TokenIn: s.providerToDualityDenom, + Creator: s.neutronAddr.String(), + Receiver: s.neutronAddr.String(), + TokenIn: s.providerToNeutronDenom, TokenOut: nativeDenom, AmountIn: swapAmount, TickIndexInToOut: 2, @@ -216,33 +216,33 @@ func (s *IBCTestSuite) TestSwapAndForward_MultiHopSuccess() { metadataBz, err := json.Marshal(metadata) s.Assert().NoError(err) - // Send an IBC transfer from provider to duality with packet memo containing the swap metadata - s.IBCTransferProviderToDuality( + // Send an IBC transfer from provider to neutron with packet memo containing the swap metadata + s.IBCTransferProviderToNeutron( s.providerAddr, - s.dualityAddr, + s.neutronAddr, nativeDenom, ibcTransferAmount, string(metadataBz), ) - dualityPacket := maps.Values(s.dualityChain.SentPackets)[0] - err = s.dualityChainBPath.EndpointB.UpdateClient() + neutronPacket := maps.Values(s.neutronChain.SentPackets)[0] + err = s.neutronChainBPath.EndpointB.UpdateClient() s.Require().NoError(err) - err = s.dualityChainBPath.EndpointB.RecvPacket(dualityPacket) + err = s.neutronChainBPath.EndpointB.RecvPacket(neutronPacket) s.Require().NoError(err) err = s.RelayAllPacketsAToB(s.chainBChainCPath) s.Require().NoError(err) - transferDenomPathDualityChainB := transfertypes.GetPrefixedDenom( + transferDenomPathNeutronChainB := transfertypes.GetPrefixedDenom( transfertypes.PortID, - s.dualityChainBPath.EndpointB.ChannelID, + s.neutronChainBPath.EndpointB.ChannelID, nativeDenom, ) - transferDenomDualityChainB := transfertypes.ParseDenomTrace(transferDenomPathDualityChainB).IBCDenom() + transferDenomNeutronChainB := transfertypes.ParseDenomTrace(transferDenomPathNeutronChainB).IBCDenom() transferDenomPathChainC := transfertypes.GetPrefixedDenom( transfertypes.PortID, s.chainBChainCPath.EndpointB.ChannelID, - transferDenomPathDualityChainB, + transferDenomPathNeutronChainB, ) transferDenomChainC := transfertypes.ParseDenomTrace(transferDenomPathChainC).IBCDenom() @@ -253,7 +253,7 @@ func (s *IBCTestSuite) TestSwapAndForward_MultiHopSuccess() { newProviderBalNative.Sub(ibcTransferAmount), ) // Check that chain B balance is unchanged - s.assertChainBBalance(chainBAddr, transferDenomDualityChainB, math.ZeroInt()) + s.assertChainBBalance(chainBAddr, transferDenomNeutronChainB, math.ZeroInt()) // Check that funds made it to chainC s.assertChainCBalance(chainCAddr, transferDenomChainC, expectedOut) @@ -261,38 +261,38 @@ func (s *IBCTestSuite) TestSwapAndForward_MultiHopSuccess() { // TestSwapAndForward_UnwindIBCDenomSuccess asserts that the swap and forward middleware stack works as intended in the // case that a native token from ChainB is sent to ChainA and then ChainA initiates a swap and forward with the token. -// This asserts that denom unwinding works as intended when going provider->duality->provider +// This asserts that denom unwinding works as intended when going provider->neutron->provider func (s *IBCTestSuite) TestSwapAndForward_UnwindIBCDenomSuccess() { - // Send an IBC transfer from provider chain to duality, so we can initialize a pool with the IBC denom token + native Duality token - s.IBCTransferProviderToDuality( + // Send an IBC transfer from provider chain to neutron, so we can initialize a pool with the IBC denom token + native Neutron token + s.IBCTransferProviderToNeutron( s.providerAddr, - s.dualityAddr, + s.neutronAddr, nativeDenom, ibcTransferAmount, "", ) - // Assert that the funds are gone from the acc on provider and present in the acc on Duality + // Assert that the funds are gone from the acc on provider and present in the acc on Neutron newProviderBalNative := genesisWalletAmount.Sub(ibcTransferAmount) s.assertProviderBalance(s.providerAddr, nativeDenom, newProviderBalNative) - s.assertDualityBalance(s.dualityAddr, s.providerToDualityDenom, ibcTransferAmount) + s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, ibcTransferAmount) - // deposit stake<>ibcTransferToken to initialize the pool on Duality + // deposit stake<>ibcTransferToken to initialize the pool on Neutron depositAmount := math.NewInt(100_000) - s.dualityDeposit( + s.neutronDeposit( nativeDenom, - s.providerToDualityDenom, + s.providerToNeutronDenom, depositAmount, depositAmount, 0, 1, - s.dualityAddr) + s.neutronAddr) - // Assert that the deposit was successful and the funds are moved out of the Duality user acc - s.assertDualityBalance(s.dualityAddr, s.providerToDualityDenom, math.ZeroInt()) - postDepositDualityBalNative := genesisWalletAmount.Sub(depositAmount) - s.assertDualityBalance(s.dualityAddr, nativeDenom, postDepositDualityBalNative) + // Assert that the deposit was successful and the funds are moved out of the Neutron user acc + s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, math.ZeroInt()) + postDepositNeutronBalNative := genesisWalletAmount.Sub(depositAmount) + s.assertNeutronBalance(s.neutronAddr, nativeDenom, postDepositNeutronBalNative) swapAmount := math.NewInt(100000) expectedAmountOut := math.NewInt(99990) @@ -302,8 +302,8 @@ func (s *IBCTestSuite) TestSwapAndForward_UnwindIBCDenomSuccess() { forwardMetadata := forwardtypes.PacketMetadata{ Forward: &forwardtypes.ForwardMetadata{ Receiver: s.providerAddr.String(), - Port: s.dualityTransferPath.EndpointA.ChannelConfig.PortID, - Channel: s.dualityTransferPath.EndpointA.ChannelID, + Port: s.neutronTransferPath.EndpointA.ChannelConfig.PortID, + Channel: s.neutronTransferPath.EndpointA.ChannelID, Timeout: forwardtypes.Duration(5 * time.Minute), Retries: &retries, Next: nil, @@ -320,10 +320,10 @@ func (s *IBCTestSuite) TestSwapAndForward_UnwindIBCDenomSuccess() { metadata := swaptypes.PacketMetadata{ Swap: &swaptypes.SwapMetadata{ MsgPlaceLimitOrder: &types.MsgPlaceLimitOrder{ - Creator: s.dualityAddr.String(), - Receiver: s.dualityAddr.String(), + Creator: s.neutronAddr.String(), + Receiver: s.neutronAddr.String(), TokenIn: nativeDenom, - TokenOut: s.providerToDualityDenom, + TokenOut: s.providerToNeutronDenom, AmountIn: swapAmount, TickIndexInToOut: 2, OrderType: types.LimitOrderType_FILL_OR_KILL, @@ -335,24 +335,24 @@ func (s *IBCTestSuite) TestSwapAndForward_UnwindIBCDenomSuccess() { metadataBz, err := json.Marshal(metadata) s.Require().NoError(err) - // Send an IBC transfer from provider to duality with packet memo containing the swap metadata - s.IBCTransferProviderToDuality( + // Send an IBC transfer from provider to neutron with packet memo containing the swap metadata + s.IBCTransferProviderToNeutron( s.providerAddr, - s.dualityAddr, + s.neutronAddr, nativeDenom, ibcTransferAmount, string(metadataBz), ) // Relay the packets - err = s.RelayAllPacketsAToB(s.dualityTransferPath) + err = s.RelayAllPacketsAToB(s.neutronTransferPath) s.Assert().NoError(err) - s.coordinator.CommitBlock(s.dualityChain) + s.coordinator.CommitBlock(s.neutronChain) - // Check that the amountIn is deduced from the duality account - s.assertDualityBalance(s.dualityAddr, nativeDenom, postDepositDualityBalNative.Sub(swapAmount)) - // Check that the amountIn has been deducted from the duality chain - s.assertDualityBalance(s.dualityAddr, nativeDenom, postDepositDualityBalNative.Sub(swapAmount)) + // Check that the amountIn is deduced from the neutron account + s.assertNeutronBalance(s.neutronAddr, nativeDenom, postDepositNeutronBalNative.Sub(swapAmount)) + // Check that the amountIn has been deducted from the neutron chain + s.assertNeutronBalance(s.neutronAddr, nativeDenom, postDepositNeutronBalNative.Sub(swapAmount)) // Check that the funds are now present on the provider chainer s.assertProviderBalance( s.providerAddr, @@ -366,36 +366,36 @@ func (s *IBCTestSuite) TestSwapAndForward_UnwindIBCDenomSuccess() { // TestSwapAndForward_ForwardFails asserts that the swap and forward middleware stack works as intended in the case // that an incoming IBC swap succeeds but the forward fails. func (s *IBCTestSuite) TestSwapAndForward_ForwardFails() { - // Send an IBC transfer from provider chain to duality, so we can initialize a pool with the IBC denom token + native Duality token - s.IBCTransferProviderToDuality( + // Send an IBC transfer from provider chain to neutron, so we can initialize a pool with the IBC denom token + native Neutron token + s.IBCTransferProviderToNeutron( s.providerAddr, - s.dualityAddr, + s.neutronAddr, nativeDenom, ibcTransferAmount, "", ) - // Assert that the funds are gone from the acc on provider and present in the acc on Duality + // Assert that the funds are gone from the acc on provider and present in the acc on Neutron newProviderBalNative := genesisWalletAmount.Sub(ibcTransferAmount) s.assertProviderBalance(s.providerAddr, nativeDenom, newProviderBalNative) - s.assertDualityBalance(s.dualityAddr, s.providerToDualityDenom, ibcTransferAmount) + s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, ibcTransferAmount) - // deposit stake<>ibcTransferToken to initialize the pool on Duality + // deposit stake<>ibcTransferToken to initialize the pool on Neutron depositAmount := math.NewInt(100_000) - s.dualityDeposit( + s.neutronDeposit( nativeDenom, - s.providerToDualityDenom, + s.providerToNeutronDenom, depositAmount, depositAmount, 0, 1, - s.dualityAddr) + s.neutronAddr) - // Assert that the deposit was successful and the funds are moved out of the Duality user acc - s.assertDualityBalance(s.dualityAddr, s.providerToDualityDenom, math.ZeroInt()) - postDepositDualityBalNative := genesisWalletAmount.Sub(depositAmount) - s.assertDualityBalance(s.dualityAddr, nativeDenom, postDepositDualityBalNative) + // Assert that the deposit was successful and the funds are moved out of the Neutron user acc + s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, math.ZeroInt()) + postDepositNeutronBalNative := genesisWalletAmount.Sub(depositAmount) + s.assertNeutronBalance(s.neutronAddr, nativeDenom, postDepositNeutronBalNative) // Compose the IBC transfer memo metadata to be used in the swap and forward swapAmount := math.NewInt(100000) @@ -407,7 +407,7 @@ func (s *IBCTestSuite) TestSwapAndForward_ForwardFails() { forwardMetadata := forwardtypes.PacketMetadata{ Forward: &forwardtypes.ForwardMetadata{ Receiver: chainBAddr.String(), - Port: s.dualityChainBPath.EndpointA.ChannelConfig.PortID, + Port: s.neutronChainBPath.EndpointA.ChannelConfig.PortID, Channel: "invalid-channel", // add an invalid channel identifier so the forward fails Timeout: forwardtypes.Duration(5 * time.Minute), Retries: &retries, @@ -425,9 +425,9 @@ func (s *IBCTestSuite) TestSwapAndForward_ForwardFails() { metadata := swaptypes.PacketMetadata{ Swap: &swaptypes.SwapMetadata{ MsgPlaceLimitOrder: &types.MsgPlaceLimitOrder{ - Creator: s.dualityAddr.String(), - Receiver: s.dualityAddr.String(), - TokenIn: s.providerToDualityDenom, + Creator: s.neutronAddr.String(), + Receiver: s.neutronAddr.String(), + TokenIn: s.providerToNeutronDenom, TokenOut: nativeDenom, AmountIn: swapAmount, TickIndexInToOut: 2, @@ -440,17 +440,17 @@ func (s *IBCTestSuite) TestSwapAndForward_ForwardFails() { metadataBz, err := json.Marshal(metadata) s.Require().NoError(err) - // Send an IBC transfer from provider to duality with packet memo containing the swap metadata - s.IBCTransferProviderToDuality( + // Send an IBC transfer from provider to neutron with packet memo containing the swap metadata + s.IBCTransferProviderToNeutron( s.providerAddr, - s.dualityAddr, + s.neutronAddr, nativeDenom, ibcTransferAmount, string(metadataBz), ) - // Relay the packets from duality => ChainB - err = s.RelayAllPacketsAToB(s.dualityChainBPath) + // Relay the packets from neutron => ChainB + err = s.RelayAllPacketsAToB(s.neutronChainBPath) // Relay Fails s.Assert().Error(err) @@ -461,22 +461,22 @@ func (s *IBCTestSuite) TestSwapAndForward_ForwardFails() { newProviderBalNative.Sub(ibcTransferAmount), ) - // Check that the amountIn is deduced from the duality account - s.assertDualityBalance(s.dualityAddr, s.providerToDualityDenom, math.ZeroInt()) - // Check that the amountOut stays on the dualitychain - s.assertDualityBalance( - s.dualityAddr, + // Check that the amountIn is deduced from the neutron account + s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, math.ZeroInt()) + // Check that the amountOut stays on the neutronchain + s.assertNeutronBalance( + s.neutronAddr, nativeDenom, - postDepositDualityBalNative.Add(expectedAmountOut), + postDepositNeutronBalNative.Add(expectedAmountOut), ) // Check that nothing made it to chainB transferDenomPath := transfertypes.GetPrefixedDenom( transfertypes.PortID, - s.dualityChainBPath.EndpointA.ChannelID, + s.neutronChainBPath.EndpointA.ChannelID, nativeDenom, ) - transferDenomDualityChainB := transfertypes.ParseDenomTrace(transferDenomPath).IBCDenom() + transferDenomNeutronChainB := transfertypes.ParseDenomTrace(transferDenomPath).IBCDenom() - s.assertChainBBalance(chainBAddr, transferDenomDualityChainB, math.ZeroInt()) + s.assertChainBBalance(chainBAddr, transferDenomNeutronChainB, math.ZeroInt()) } diff --git a/tests/ibc/swap_test.go b/tests/ibc/swap_test.go index 3cc72adb4..a7cf723af 100644 --- a/tests/ibc/swap_test.go +++ b/tests/ibc/swap_test.go @@ -8,50 +8,50 @@ import ( swaptypes "github.com/neutron-org/neutron/x/ibcswap/types" ) -// TestIBCSwapMiddleware_Success asserts that the IBC swap middleware works as intended with Duality running as a +// TestIBCSwapMiddleware_Success asserts that the IBC swap middleware works as intended with Neutron running as a // consumer chain connected to the Cosmos Hub. func (s *IBCTestSuite) TestIBCSwapMiddleware_Success() { - // Send an IBC transfer from provider to Duality, so we can initialize a pool with the IBC denom token + native Duality token - s.IBCTransferProviderToDuality( + // Send an IBC transfer from provider to Neutron, so we can initialize a pool with the IBC denom token + native Neutron token + s.IBCTransferProviderToNeutron( s.providerAddr, - s.dualityAddr, + s.neutronAddr, nativeDenom, ibcTransferAmount, "", ) - // Assert that the funds are gone from the acc on provider and present in the acc on Duality + // Assert that the funds are gone from the acc on provider and present in the acc on Neutron newProviderBalNative := genesisWalletAmount.Sub(ibcTransferAmount) s.assertProviderBalance(s.providerAddr, nativeDenom, newProviderBalNative) - s.assertDualityBalance(s.dualityAddr, s.providerToDualityDenom, ibcTransferAmount) + s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, ibcTransferAmount) - // deposit stake<>ibcTransferToken to initialize the pool on Duality + // deposit stake<>ibcTransferToken to initialize the pool on Neutron depositAmount := math.NewInt(100_000) - s.dualityDeposit( + s.neutronDeposit( nativeDenom, - s.providerToDualityDenom, + s.providerToNeutronDenom, depositAmount, depositAmount, 0, 1, - s.dualityAddr) + s.neutronAddr) - // Assert that the deposit was successful and the funds are moved out of the Duality user acc - s.assertDualityBalance(s.dualityAddr, s.providerToDualityDenom, math.ZeroInt()) - postDepositDualityBalNative := genesisWalletAmount.Sub(depositAmount) - s.assertDualityBalance(s.dualityAddr, nativeDenom, postDepositDualityBalNative) + // Assert that the deposit was successful and the funds are moved out of the Neutron user acc + s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, math.ZeroInt()) + postDepositNeutronBalNative := genesisWalletAmount.Sub(depositAmount) + s.assertNeutronBalance(s.neutronAddr, nativeDenom, postDepositNeutronBalNative) - // Send an IBC transfer from providerChain to Duality with packet memo containing the swap metadata + // Send an IBC transfer from providerChain to Neutron with packet memo containing the swap metadata swapAmount := math.NewInt(100000) expectedOut := math.NewInt(99_990) metadata := swaptypes.PacketMetadata{ Swap: &swaptypes.SwapMetadata{ MsgPlaceLimitOrder: &dextypes.MsgPlaceLimitOrder{ - Creator: s.dualityAddr.String(), - Receiver: s.dualityAddr.String(), - TokenIn: s.providerToDualityDenom, + Creator: s.neutronAddr.String(), + Receiver: s.neutronAddr.String(), + TokenIn: s.providerToNeutronDenom, TokenOut: nativeDenom, AmountIn: swapAmount, TickIndexInToOut: 1, @@ -64,9 +64,9 @@ func (s *IBCTestSuite) TestIBCSwapMiddleware_Success() { metadataBz, err := json.Marshal(metadata) s.Require().NoError(err) - s.IBCTransferProviderToDuality( + s.IBCTransferProviderToNeutron( s.providerAddr, - s.dualityAddr, + s.neutronAddr, nativeDenom, ibcTransferAmount, string(metadataBz), @@ -79,14 +79,14 @@ func (s *IBCTestSuite) TestIBCSwapMiddleware_Success() { newProviderBalNative.Sub(ibcTransferAmount), ) - // Check that the swap funds are now present in the acc on Duality - s.assertDualityBalance(s.dualityAddr, nativeDenom, postDepositDualityBalNative.Add(expectedOut)) + // Check that the swap funds are now present in the acc on Neutron + s.assertNeutronBalance(s.neutronAddr, nativeDenom, postDepositNeutronBalNative.Add(expectedOut)) // Check that all of the IBC transfer denom have been used up - s.assertDualityBalance(s.dualityAddr, s.providerToDualityDenom, math.ZeroInt()) + s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, math.ZeroInt()) } -// TestIBCSwapMiddleware_FailRefund asserts that the IBC swap middleware works as intended with Duality running as a +// TestIBCSwapMiddleware_FailRefund asserts that the IBC swap middleware works as intended with Neutron running as a // consumer chain connected to the Cosmos Hub. The swap should fail and a refund to the src chain should take place. func (s *IBCTestSuite) TestIBCSwapMiddleware_FailRefund() { // Compose the swap metadata, this swap will fail because there is no pool initialized for this pair @@ -94,9 +94,9 @@ func (s *IBCTestSuite) TestIBCSwapMiddleware_FailRefund() { metadata := swaptypes.PacketMetadata{ Swap: &swaptypes.SwapMetadata{ MsgPlaceLimitOrder: &dextypes.MsgPlaceLimitOrder{ - Creator: s.dualityAddr.String(), - Receiver: s.dualityAddr.String(), - TokenIn: s.providerToDualityDenom, + Creator: s.neutronAddr.String(), + Receiver: s.neutronAddr.String(), + TokenIn: s.providerToNeutronDenom, TokenOut: nativeDenom, AmountIn: swapAmount, TickIndexInToOut: 1, @@ -111,33 +111,33 @@ func (s *IBCTestSuite) TestIBCSwapMiddleware_FailRefund() { s.Require().NoError(err) // Send (failing) IBC transfer with swap metadata - s.IBCTransferProviderToDuality( + s.IBCTransferProviderToNeutron( s.providerAddr, - s.dualityAddr, + s.neutronAddr, nativeDenom, ibcTransferAmount, string(metadataBz), ) - // Check that the funds are not present in the account on Duality - s.assertDualityBalance(s.dualityAddr, nativeDenom, genesisWalletAmount) - s.assertDualityBalance(s.dualityAddr, s.providerToDualityDenom, math.ZeroInt()) + // Check that the funds are not present in the account on Neutron + s.assertNeutronBalance(s.neutronAddr, nativeDenom, genesisWalletAmount) + s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, math.ZeroInt()) // Check that the refund takes place and the funds are moved back to the account on Gaia s.assertProviderBalance(s.providerAddr, nativeDenom, genesisWalletAmount) } -// TestIBCSwapMiddleware_FailNoRefund asserts that the IBC swap middleware works as intended with Duality running as a -// consumer chain connected to the Cosmos Hub. The swap should fail and funds should remain on Duality. +// TestIBCSwapMiddleware_FailNoRefund asserts that the IBC swap middleware works as intended with Neutron running as a +// consumer chain connected to the Cosmos Hub. The swap should fail and funds should remain on Neutron. func (s *IBCTestSuite) TestIBCSwapMiddleware_FailNoRefund() { // Compose the swap metadata, this swap will fail because there is no pool initialized for this pair swapAmount := math.NewInt(100000) metadata := swaptypes.PacketMetadata{ Swap: &swaptypes.SwapMetadata{ MsgPlaceLimitOrder: &dextypes.MsgPlaceLimitOrder{ - Creator: s.dualityAddr.String(), - Receiver: s.dualityAddr.String(), - TokenIn: s.providerToDualityDenom, + Creator: s.neutronAddr.String(), + Receiver: s.neutronAddr.String(), + TokenIn: s.providerToNeutronDenom, TokenOut: nativeDenom, AmountIn: swapAmount, TickIndexInToOut: 1, @@ -152,36 +152,36 @@ func (s *IBCTestSuite) TestIBCSwapMiddleware_FailNoRefund() { s.Require().NoError(err) // Send (failing) IBC transfer with swap metadata - s.IBCTransferProviderToDuality( + s.IBCTransferProviderToNeutron( s.providerAddr, - s.dualityAddr, + s.neutronAddr, nativeDenom, ibcTransferAmount, string(metadataBz), ) - // Check that the funds are present in the account on Duality - s.assertDualityBalance(s.dualityAddr, nativeDenom, genesisWalletAmount) - s.assertDualityBalance(s.dualityAddr, s.providerToDualityDenom, ibcTransferAmount) + // Check that the funds are present in the account on Neutron + s.assertNeutronBalance(s.neutronAddr, nativeDenom, genesisWalletAmount) + s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, ibcTransferAmount) // Check that no refund takes place and the funds are not in the account on provider s.assertProviderBalance(s.providerAddr, nativeDenom, genesisWalletAmount.Sub(ibcTransferAmount)) } -// TestIBCSwapMiddleware_FailWithRefundAddr asserts that the IBC swap middleware works as intended with Duality running as a -// consumer chain connected to the Cosmos Hub. The swap should fail and funds should remain on Duality but be moved +// TestIBCSwapMiddleware_FailWithRefundAddr asserts that the IBC swap middleware works as intended with Neutron running as a +// consumer chain connected to the Cosmos Hub. The swap should fail and funds should remain on Neutron but be moved // to the refund address. func (s *IBCTestSuite) TestIBCSwapMiddleware_FailWithRefundAddr() { // Compose the swap metadata, this swap will fail because there is no pool initialized for this pair - refundAddr := s.dualityChain.SenderAccounts[1].SenderAccount.GetAddress() + refundAddr := s.neutronChain.SenderAccounts[1].SenderAccount.GetAddress() swapAmount := math.NewInt(100000) metadata := swaptypes.PacketMetadata{ Swap: &swaptypes.SwapMetadata{ MsgPlaceLimitOrder: &dextypes.MsgPlaceLimitOrder{ - Creator: s.dualityAddr.String(), - Receiver: s.dualityAddr.String(), - TokenIn: s.providerToDualityDenom, + Creator: s.neutronAddr.String(), + Receiver: s.neutronAddr.String(), + TokenIn: s.providerToNeutronDenom, TokenOut: nativeDenom, AmountIn: swapAmount, TickIndexInToOut: 1, @@ -197,17 +197,17 @@ func (s *IBCTestSuite) TestIBCSwapMiddleware_FailWithRefundAddr() { s.Require().NoError(err) // Send (failing) IBC transfer with swap metadata - s.IBCTransferProviderToDuality( + s.IBCTransferProviderToNeutron( s.providerAddr, - s.dualityAddr, + s.neutronAddr, nativeDenom, ibcTransferAmount, string(metadataBz), ) // Check that the funds have been moved to the refund address - s.assertDualityBalance(refundAddr, nativeDenom, genesisWalletAmount) - s.assertDualityBalance(refundAddr, s.providerToDualityDenom, ibcTransferAmount) + s.assertNeutronBalance(refundAddr, nativeDenom, genesisWalletAmount) + s.assertNeutronBalance(refundAddr, s.providerToNeutronDenom, ibcTransferAmount) // Check that no refund takes place and the funds are not in the account on provider s.assertProviderBalance(s.providerAddr, nativeDenom, genesisWalletAmount.Sub(ibcTransferAmount)) diff --git a/testutil/integration_test_setup.go b/testutil/integration_test_setup.go index 083533a5e..93091eb6b 100644 --- a/testutil/integration_test_setup.go +++ b/testutil/integration_test_setup.go @@ -252,7 +252,7 @@ func GenesisStateWithValSet( // var _ network.TestFixtureFactory = NewTestNetworkFixture // func NewTestNetworkFixture() network.TestFixture { -// dir, err := os.MkdirTemp("", "duality") +// dir, err := os.MkdirTemp("", "neutron") // if err != nil { // panic(fmt.Sprintf("failed creating temporary directory: %v", err)) // } diff --git a/wasmbinding/stargate_allowlist.go b/wasmbinding/stargate_allowlist.go index 2526ca97b..ac0a41597 100644 --- a/wasmbinding/stargate_allowlist.go +++ b/wasmbinding/stargate_allowlist.go @@ -56,28 +56,28 @@ func AcceptedStargateQueries() wasmkeeper.AcceptedStargateQueries { "/neutron.feeburner.Query/Params": &feeburnertypes.QueryParamsResponse{}, // dex - "/dualitylabs.duality.dex.Query/Params": &dextypes.QueryParamsResponse{}, - "/dualitylabs.duality.dex.Query/LimitOrderTrancheUser": &dextypes.QueryGetLimitOrderTrancheUserResponse{}, - "/dualitylabs.duality.dex.Query/LimitOrderTranche": &dextypes.QueryGetLimitOrderTrancheResponse{}, - "/dualitylabs.duality.dex.Query/UserDepositsAll": &dextypes.QueryAllUserDepositsResponse{}, - "/dualitylabs.duality.dex.Query/UserLimitOrdersAll": &dextypes.QueryAllUserLimitOrdersResponse{}, - "/dualitylabs.duality.dex.Query/InactiveLimitOrderTranche": &dextypes.QueryGetInactiveLimitOrderTrancheResponse{}, - "/dualitylabs.duality.dex.Query/PoolReserves": &dextypes.QueryGetPoolReservesResponse{}, - "/dualitylabs.duality.dex.Query/EstimateMultiHopSwap": &dextypes.QueryEstimateMultiHopSwapResponse{}, - "/dualitylabs.duality.dex.Query/EstimatePlaceLimitOrder": &dextypes.QueryEstimatePlaceLimitOrderResponse{}, + "/neutron.dex.Query/Params": &dextypes.QueryParamsResponse{}, + "/neutron.dex.Query/LimitOrderTrancheUser": &dextypes.QueryGetLimitOrderTrancheUserResponse{}, + "/neutron.dex.Query/LimitOrderTranche": &dextypes.QueryGetLimitOrderTrancheResponse{}, + "/neutron.dex.Query/UserDepositsAll": &dextypes.QueryAllUserDepositsResponse{}, + "/neutron.dex.Query/UserLimitOrdersAll": &dextypes.QueryAllUserLimitOrdersResponse{}, + "/neutron.dex.Query/InactiveLimitOrderTranche": &dextypes.QueryGetInactiveLimitOrderTrancheResponse{}, + "/neutron.dex.Query/PoolReserves": &dextypes.QueryGetPoolReservesResponse{}, + "/neutron.dex.Query/EstimateMultiHopSwap": &dextypes.QueryEstimateMultiHopSwapResponse{}, + "/neutron.dex.Query/EstimatePlaceLimitOrder": &dextypes.QueryEstimatePlaceLimitOrderResponse{}, // incentives - "/dualitylabs.duality.incentives.Query/GetModuleStatus": &incentivestypes.GetModuleStatusResponse{}, - "/dualitylabs.duality.incentives.Query/GetGaugeByID": &incentivestypes.GetGaugeByIDResponse{}, - "/dualitylabs.duality.incentives.Query/GetGauges": &incentivestypes.GetGaugesResponse{}, - "/dualitylabs.duality.incentives.Query/GetStakeByID": &incentivestypes.GetStakeByIDResponse{}, - "/dualitylabs.duality.incentives.Query/GetStakes": &incentivestypes.GetStakesResponse{}, - "/dualitylabs.duality.incentives.Query/GetFutureRewardEstimate": &incentivestypes.GetFutureRewardEstimateResponse{}, - "/dualitylabs.duality.incentives.Query/GetAccountHistory": &incentivestypes.GetAccountHistoryResponse{}, - "/dualitylabs.duality.incentives.Query/GetGaugeQualifyingValue": &incentivestypes.GetGaugeQualifyingValueResponse{}, + "/neutron.incentives.Query/GetModuleStatus": &incentivestypes.GetModuleStatusResponse{}, + "/neutron.incentives.Query/GetGaugeByID": &incentivestypes.GetGaugeByIDResponse{}, + "/neutron.incentives.Query/GetGauges": &incentivestypes.GetGaugesResponse{}, + "/neutron.incentives.Query/GetStakeByID": &incentivestypes.GetStakeByIDResponse{}, + "/neutron.incentives.Query/GetStakes": &incentivestypes.GetStakesResponse{}, + "/neutron.incentives.Query/GetFutureRewardEstimate": &incentivestypes.GetFutureRewardEstimateResponse{}, + "/neutron.incentives.Query/GetAccountHistory": &incentivestypes.GetAccountHistoryResponse{}, + "/neutron.incentives.Query/GetGaugeQualifyingValue": &incentivestypes.GetGaugeQualifyingValueResponse{}, // epochs - "/dualitylabs.duality.epochs.Query/EpochInfos": &epochstypes.QueryEpochsInfoResponse{}, - "/dualitylabs.duality.epochs.Query/CurrentEpoch": &epochstypes.QueryCurrentEpochResponse{}, + "/neutron.epochs.Query/EpochInfos": &epochstypes.QueryEpochsInfoResponse{}, + "/neutron.epochs.Query/CurrentEpoch": &epochstypes.QueryCurrentEpochResponse{}, } } diff --git a/x/dex/keeper/core_helper_test.go b/x/dex/keeper/core_helper_test.go index 9660dd74c..1e864fbd9 100644 --- a/x/dex/keeper/core_helper_test.go +++ b/x/dex/keeper/core_helper_test.go @@ -6,7 +6,7 @@ import ( "cosmossdk.io/math" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" sdk "github.com/cosmos/cosmos-sdk/types" - dualityapp "github.com/neutron-org/neutron/app" + neutronapp "github.com/neutron-org/neutron/app" "github.com/neutron-org/neutron/testutil" "github.com/neutron-org/neutron/x/dex/types" "github.com/stretchr/testify/suite" @@ -15,7 +15,7 @@ import ( // Test Suite /////////////////////////////////////////////////////////////// type CoreHelpersTestSuite struct { suite.Suite - app *dualityapp.App + app *neutronapp.App ctx sdk.Context alice sdk.AccAddress bob sdk.AccAddress diff --git a/x/dex/keeper/grpc_query_user_deposits_test.go b/x/dex/keeper/grpc_query_user_deposits_test.go index 19f2e4a7a..871a6dcf0 100644 --- a/x/dex/keeper/grpc_query_user_deposits_test.go +++ b/x/dex/keeper/grpc_query_user_deposits_test.go @@ -7,7 +7,7 @@ import ( tmproto "github.com/cometbft/cometbft/proto/tendermint/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" - dualityapp "github.com/neutron-org/neutron/app" + neutronapp "github.com/neutron-org/neutron/app" "github.com/neutron-org/neutron/testutil" keepertest "github.com/neutron-org/neutron/x/dex/keeper/internal/testutils" "github.com/neutron-org/neutron/x/dex/types" @@ -16,7 +16,7 @@ import ( "google.golang.org/grpc/status" ) -func simulateDeposit(ctx sdk.Context, app *dualityapp.App, addr sdk.AccAddress, deposit *types.DepositRecord) { +func simulateDeposit(ctx sdk.Context, app *neutronapp.App, addr sdk.AccAddress, deposit *types.DepositRecord) { // NOTE: For simplicyt sake, we are not actually doing a deposit, we are just initializing // the pool and adding the poolDenom to the users account pool, err := app.DexKeeper.InitPool(ctx, deposit.PairID, deposit.CenterTickIndex, deposit.Fee) diff --git a/x/dex/types/errors.go b/x/dex/types/errors.go index d555b76fa..7f4eaa964 100644 --- a/x/dex/types/errors.go +++ b/x/dex/types/errors.go @@ -47,7 +47,7 @@ var ( ErrInvalidPoolDenom = sdkerrors.Register( ModuleName, 1118, - "Denom is not an instance of Duality PoolDenom", + "Denom is not an instance of Neutron PoolDenom", ) ErrInvalidPairIDStr = sdkerrors.Register( ModuleName, diff --git a/x/dex/types/pool_denom.go b/x/dex/types/pool_denom.go index f27660d7d..eb3f87104 100644 --- a/x/dex/types/pool_denom.go +++ b/x/dex/types/pool_denom.go @@ -7,7 +7,7 @@ import ( ) const ( - PoolDenomPrefix = "duality/pool/" + PoolDenomPrefix = "neutron/pool/" PoolDenomRegexpStr = "^" + PoolDenomPrefix + `(\d+)` + "$" ) diff --git a/x/dex/types/pool_denom_test.go b/x/dex/types/pool_denom_test.go index 9c609e797..0d46a66f8 100644 --- a/x/dex/types/pool_denom_test.go +++ b/x/dex/types/pool_denom_test.go @@ -16,24 +16,24 @@ func TestParsePoolIDFromDenom(t *testing.T) { }{ { desc: "valid denom", - denom: "duality/pool/0", + denom: "neutron/pool/0", expected: 0, valid: true, }, { desc: "valid denom long", - denom: "duality/pool/999999999", + denom: "neutron/pool/999999999", expected: 999999999, valid: true, }, { desc: "invalid format 1", - denom: "/duality/pool/0", + denom: "/neutron/pool/0", valid: false, }, { desc: "invalid format 2", - denom: "duality/pool/0/", + denom: "neutron/pool/0/", valid: false, }, { diff --git a/x/epochs/README.md b/x/epochs/README.md index ae92f0529..0b95457c9 100644 --- a/x/epochs/README.md +++ b/x/epochs/README.md @@ -26,7 +26,7 @@ We refer to the period in between two timer ticks as an "epoch". Every timer has a unique identifier. Every epoch will have a start time, and an end time, where `end time = start time + timer interval`. -On Duality mainnet, we only utilize one identifier, with a time interval of `one day`. +On Neutron mainnet, we only utilize one identifier, with a time interval of `one day`. The timer will tick at the first block whose blocktime is greater than the timer end time, and set the start as the prior timer end time. (Notably, its not set to the block time!) @@ -137,7 +137,7 @@ service Query { Query the currently running epochInfos ```sh -dualityd query epochs epoch-infos +neutrond query epochs epoch-infos ``` ::: details Example @@ -169,7 +169,7 @@ epochs: Query the current epoch by the specified identifier ```sh -dualityd query epochs current-epoch [identifier] +neutrond query epochs current-epoch [identifier] ``` ::: details Example @@ -177,7 +177,7 @@ dualityd query epochs current-epoch [identifier] Query the current `day` epoch: ```sh -dualityd query epochs current-epoch day +neutrond query epochs current-epoch day ``` Which in this example outputs: diff --git a/x/ibcswap/keeper/keeper.go b/x/ibcswap/keeper/keeper.go index e5427c52b..5ddfc1315 100644 --- a/x/ibcswap/keeper/keeper.go +++ b/x/ibcswap/keeper/keeper.go @@ -134,7 +134,7 @@ func (k Keeper) RefundPacketToken( return err } - // if the sender chain is source that means a voucher was minted on Duality when the ics20 transfer took place + // if the sender chain is source that means a voucher was minted on Neutron when the ics20 transfer took place if transfertypes.SenderChainIsSource(packet.SourcePort, packet.SourceChannel, data.Denom) { // transfer coins from user account to transfer module err = k.bankKeeper.SendCoinsFromAccountToModule( diff --git a/x/ibcswap/types/swap.go b/x/ibcswap/types/swap.go index 0694889db..57e9faf5e 100644 --- a/x/ibcswap/types/swap.go +++ b/x/ibcswap/types/swap.go @@ -42,7 +42,7 @@ func (sm SwapMetadata) Validate() error { if sm.RefundAddress != "" { _, err := sdk.AccAddressFromBech32(sm.RefundAddress) if err != nil { - return sdkerrors.Wrapf(dextypes.ErrInvalidAddress, "%s is not a valid Duality address", sm.RefundAddress) + return sdkerrors.Wrapf(dextypes.ErrInvalidAddress, "%s is not a valid Neutron address", sm.RefundAddress) } } diff --git a/x/incentives/README LOCKUP.md b/x/incentives/README LOCKUP.md index fbd2e8184..43cd1fb39 100644 --- a/x/incentives/README LOCKUP.md +++ b/x/incentives/README LOCKUP.md @@ -365,7 +365,7 @@ reference queues are removed. Bond tokens in a LP for a set duration ```sh -dualityd tx stakeup stake-tokens [tokens] --duration --from --chain-id +neutrond tx stakeup stake-tokens [tokens] --duration --from --chain-id ``` ::: details Example @@ -373,19 +373,19 @@ dualityd tx stakeup stake-tokens [tokens] --duration --from --chain-id To stakeup `15.527546134174465309gamm/pool/3` tokens for a `one day` bonding period from `WALLET_NAME` on the osmosis mainnet: ```bash -dualityd tx stakeup stake-tokens 15527546134174465309gamm/pool/3 --duration="24h" --from WALLET_NAME --chain-id osmosis-1 +neutrond tx stakeup stake-tokens 15527546134174465309gamm/pool/3 --duration="24h" --from WALLET_NAME --chain-id osmosis-1 ``` To stakeup `25.527546134174465309gamm/pool/13` tokens for a `one week` bonding period from `WALLET_NAME` on the osmosis testnet: ```bash -dualityd tx stakeup stake-tokens 25527546134174465309gamm/pool/13 --duration="168h" --from WALLET_NAME --chain-id osmo-test-4 +neutrond tx stakeup stake-tokens 25527546134174465309gamm/pool/13 --duration="168h" --from WALLET_NAME --chain-id osmo-test-4 ``` To stakeup `35.527546134174465309 gamm/pool/197` tokens for a `two week` bonding period from `WALLET_NAME` on the osmosis mainnet: ```bash -dualityd tx stakeup stake-tokens 35527546134174465309gamm/pool/197 --duration="336h" --from WALLET_NAME --chain-id osmosis-1 +neutrond tx stakeup stake-tokens 35527546134174465309gamm/pool/197 --duration="336h" --from WALLET_NAME --chain-id osmosis-1 ``` ::: @@ -395,7 +395,7 @@ dualityd tx stakeup stake-tokens 35527546134174465309gamm/pool/197 --duration="3 Begin the unbonding process for tokens given their unique stake ID ```sh -dualityd tx stakeup begin-unstake-by-id [id] --from --chain-id +neutrond tx stakeup begin-unstake-by-id [id] --from --chain-id ``` ::: details Example @@ -403,7 +403,7 @@ dualityd tx stakeup begin-unstake-by-id [id] --from --chain-id To begin the unbonding time for all bonded tokens under id `75` from `WALLET_NAME` on the osmosis mainnet: ```bash -dualityd tx stakeup begin-unstake-by-id 75 --from WALLET_NAME --chain-id osmosis-1 +neutrond tx stakeup begin-unstake-by-id 75 --from WALLET_NAME --chain-id osmosis-1 ``` ::: ::: warning Note @@ -415,7 +415,7 @@ The ID corresponds to the unique ID given to your stakeup transaction (explained Begin unbonding process for all bonded tokens in a wallet ```sh -dualityd tx stakeup begin-unstake-tokens --from --chain-id +neutrond tx stakeup begin-unstake-tokens --from --chain-id ``` ::: details Example @@ -424,7 +424,7 @@ To begin unbonding time for ALL pools and ALL bonded tokens in `WALLET_NAME` on ```bash -dualityd tx stakeup begin-unstake-tokens --from=WALLET_NAME --chain-id=osmosis-1 --yes +neutrond tx stakeup begin-unstake-tokens --from=WALLET_NAME --chain-id=osmosis-1 --yes ``` ::: @@ -484,7 +484,7 @@ In this example, the current UNIX time is `1639776682`, 2 days from now is appro An account's `ADDRESS` is staked in both the `1 day` and `1 week` gamm/pool/3. To query the `ADDRESS` with a timestamp 2 days from now `1639971082`: ```bash -dualityd query stakeup account-staked-beforetime ADDRESS 1639971082 +neutrond query stakeup account-staked-beforetime ADDRESS 1639971082 ``` In this example will output the `1 day` stake but not the `1 week` stake: @@ -503,7 +503,7 @@ stakes: If querying the same `ADDRESS` with a timestamp 15 days from now `1641094282`: ```bash -dualityd query stakeup account-staked-beforetime ADDRESS 1641094282 +neutrond query stakeup account-staked-beforetime ADDRESS 1641094282 ``` In this example will output both the `1 day` and `1 week` stake: @@ -533,13 +533,13 @@ stakes: Query an account's staked (bonded) LP tokens ```sh -dualityd query stakeup account-staked-coins [address] +neutrond query stakeup account-staked-coins [address] ``` :::: details Example ```bash -dualityd query stakeup account-staked-coins osmo1xqhlshlhs5g0acqgrkafdemvf5kz4pp4c2x259 +neutrond query stakeup account-staked-coins osmo1xqhlshlhs5g0acqgrkafdemvf5kz4pp4c2x259 ``` An example output: @@ -571,7 +571,7 @@ You may also specify a --height flag to see bonded LP tokens at a specified heig Query an account's staked records that are greater than or equal to a specified stake duration ```sh -dualityd query stakeup account-staked-longer-duration [address] [duration] +neutrond query stakeup account-staked-longer-duration [address] [duration] ``` ::: details Example @@ -579,7 +579,7 @@ dualityd query stakeup account-staked-longer-duration [address] [duration] Here is an example of querying an `ADDRESS` for all `1 day` or greater bonding periods: ```bash -dualityd query stakeup account-staked-longer-duration osmo1xqhlshlhs5g0acqgrkafdemvf5kz4pp4c2x259 24h +neutrond query stakeup account-staked-longer-duration osmo1xqhlshlhs5g0acqgrkafdemvf5kz4pp4c2x259 24h ``` An example output: @@ -609,7 +609,7 @@ stakes: Query an account's staked records for a denom that is staked equal to or greater than the specified duration AND match a specified denom ```sh -dualityd query stakeup account-staked-longer-duration-denom [address] [duration] [denom] +neutrond query stakeup account-staked-longer-duration-denom [address] [duration] [denom] ``` ::: details Example @@ -617,7 +617,7 @@ dualityd query stakeup account-staked-longer-duration-denom [address] [duration] Here is an example of an `ADDRESS` that is staked in both the `1 day` and `1 week` for both the gamm/pool/3 and gamm/pool/1, then queries the `ADDRESS` for all bonding periods equal to or greater than `1 day` for just the gamm/pool/3: ```bash -dualityd query stakeup account-staked-longer-duration-denom osmo1xqhlshlhs5g0acqgrkafdemvf5kz4pp4c2x259 24h gamm/pool/3 +neutrond query stakeup account-staked-longer-duration-denom osmo1xqhlshlhs5g0acqgrkafdemvf5kz4pp4c2x259 24h gamm/pool/3 ``` An example output: @@ -649,7 +649,7 @@ As shown, the gamm/pool/3 is returned but not the gamm/pool/1 due to the denom f Query an account's staked records for a denom that is staked equal to or greater than the specified duration AND is not in the process of being unstaked ```sh -dualityd query stakeup account-staked-longer-duration-not-unstaking [address] [duration] +neutrond query stakeup account-staked-longer-duration-not-unstaking [address] [duration] ``` ::: details Example @@ -657,7 +657,7 @@ dualityd query stakeup account-staked-longer-duration-not-unstaking [address] [d Here is an example of an `ADDRESS` that is staked in both the `1 day` and `1 week` gamm/pool/3, begins unstaking process for the `1 day` bond, and queries the `ADDRESS` for all bonding periods equal to or greater than `1 day` that are not unbonding: ```bash -dualityd query stakeup account-staked-longer-duration-not-unstaking osmo1xqhlshlhs5g0acqgrkafdemvf5kz4pp4c2x259 24h +neutrond query stakeup account-staked-longer-duration-not-unstaking osmo1xqhlshlhs5g0acqgrkafdemvf5kz4pp4c2x259 24h ``` An example output: @@ -682,7 +682,7 @@ The `1 day` bond does not show since it is in the process of unbonding. Query the staked records of an account with the unstake time beyond timestamp (UNIX) ```bash -dualityd query stakeup account-staked-pasttime [address] [timestamp] +neutrond query stakeup account-staked-pasttime [address] [timestamp] ``` ::: details Example @@ -690,7 +690,7 @@ dualityd query stakeup account-staked-pasttime [address] [timestamp] Here is an example of an account that is staked in both the `1 day` and `1 week` gamm/pool/3. In this example, the UNIX time is currently `1639776682` and queries an `ADDRESS` for UNIX time two days later from the current time (which in this example would be `1639971082`) ```bash -dualityd query stakeup account-staked-pasttime osmo1xqhlshlhs5g0acqgrkafdemvf5kz4pp4c2x259 1639971082 +neutrond query stakeup account-staked-pasttime osmo1xqhlshlhs5g0acqgrkafdemvf5kz4pp4c2x259 1639971082 ``` The example output: @@ -715,7 +715,7 @@ Note that the `1 day` stake ID did not display because, if the unbonding time be Query the staked records of an account with the unstake time beyond timestamp (unix) and filter by a specific denom ```bash -dualityd query stakeup account-staked-pasttime-denom osmo1xqhlshlhs5g0acqgrkafdemvf5kz4pp4c2x259 [timestamp] [denom] +neutrond query stakeup account-staked-pasttime-denom osmo1xqhlshlhs5g0acqgrkafdemvf5kz4pp4c2x259 [timestamp] [denom] ``` ::: details Example @@ -723,7 +723,7 @@ dualityd query stakeup account-staked-pasttime-denom osmo1xqhlshlhs5g0acqgrkafde Here is an example of an account that is staked in both the `1 day` and `1 week` gamm/pool/3 and `1 day` and `1 week` gamm/pool/1. In this example, the UNIX time is currently `1639776682` and queries an `ADDRESS` for UNIX time two days later from the current time (which in this example would be `1639971082`) and filters for gamm/pool/3 ```bash -dualityd query stakeup account-staked-pasttime-denom osmo1xqhlshlhs5g0acqgrkafdemvf5kz4pp4c2x259 1639971082 gamm/pool/3 +neutrond query stakeup account-staked-pasttime-denom osmo1xqhlshlhs5g0acqgrkafdemvf5kz4pp4c2x259 1639971082 gamm/pool/3 ``` The example output: @@ -748,7 +748,7 @@ Note that the `1 day` stake ID did not display because, if the unbonding time be Query the staked records of an account with the unstake time beyond timestamp (unix) AND is not in the process of unstaking ```sh -dualityd query stakeup account-staked-pasttime [address] [timestamp] +neutrond query stakeup account-staked-pasttime [address] [timestamp] ``` ::: details Example @@ -756,7 +756,7 @@ dualityd query stakeup account-staked-pasttime [address] [timestamp] Here is an example of an account that is staked in both the `1 day` and `1 week` gamm/pool/3. In this example, the UNIX time is currently `1639776682` and queries an `ADDRESS` for UNIX time two days later from the current time (which in this example would be `1639971082`) AND is not unstaking: ```bash -dualityd query stakeup account-staked-pasttime osmo1xqhlshlhs5g0acqgrkafdemvf5kz4pp4c2x259 1639971082 +neutrond query stakeup account-staked-pasttime osmo1xqhlshlhs5g0acqgrkafdemvf5kz4pp4c2x259 1639971082 ``` The example output: @@ -781,7 +781,7 @@ Note that the `1 day` stake ID did not display because, if the unbonding time be Query an address's LP shares that have completed the unstaking period and are ready to be withdrawn ```bash -dualityd query stakeup account-unstakeable-coins ADDRESS +neutrond query stakeup account-unstakeable-coins ADDRESS ``` @@ -791,13 +791,13 @@ dualityd query stakeup account-unstakeable-coins ADDRESS Query an address's LP shares that are currently unstaking ```sh -dualityd query stakeup account-unstaking-coins [address] +neutrond query stakeup account-unstaking-coins [address] ``` ::: details Example ```bash -dualityd query stakeup account-unstaking-coins osmo1xqhlshlhs5g0acqgrkafdemvf5kz4pp4c2x259 +neutrond query stakeup account-unstaking-coins osmo1xqhlshlhs5g0acqgrkafdemvf5kz4pp4c2x259 ``` Example output: @@ -815,7 +815,7 @@ coins: Query a stake record by its ID ```sh -dualityd query stakeup stake-by-id [id] +neutrond query stakeup stake-by-id [id] ``` ::: details Example @@ -825,7 +825,7 @@ Every time a user bonds tokens to an LP, a unique stake ID is created for that t Here is an example viewing the stake record for ID 9: ```bash -dualityd query stakeup stake-by-id 9 +neutrond query stakeup stake-by-id 9 ``` And its output: @@ -850,13 +850,13 @@ In summary, this shows wallet `osmo16r39ghhwqjcwxa8q3yswlz8jhzldygy66vlm82` bond Query the balance of all LP shares (bonded and unbonded) ```sh -dualityd query stakeup module-balance +neutrond query stakeup module-balance ``` ::: details Example ```bash -dualityd query stakeup module-balance +neutrond query stakeup module-balance ``` An example output: @@ -904,13 +904,13 @@ coins: Query the balance of all bonded LP shares ```sh -dualityd query stakeup module-staked-amount +neutrond query stakeup module-staked-amount ``` ::: details Example ```bash -dualityd query stakeup module-staked-amount +neutrond query stakeup module-staked-amount ``` An example output: @@ -964,7 +964,7 @@ NOTE: This command seems to only work on gRPC and on CLI returns an EOF error. Output all stakes into a json file ```sh -dualityd query stakeup output-all-stakes [max stake ID] +neutrond query stakeup output-all-stakes [max stake ID] ``` :::: details Example @@ -972,7 +972,7 @@ dualityd query stakeup output-all-stakes [max stake ID] This example command outputs stakes 1-1000 and saves to a json file: ```bash -dualityd query stakeup output-all-stakes 1000 +neutrond query stakeup output-all-stakes 1000 ``` ::: warning Note If a stakeup has been completed, the stakeup status will show as "0" (or successful) and no further information will be available. To get further information on a completed stake, run the stake-by-id query. @@ -985,7 +985,7 @@ If a stakeup has been completed, the stakeup status will show as "0" (or success Query staked amount for a specific denom in the duration provided ```sh -dualityd query stakeup total-staked-of-denom [denom] --min-duration +neutrond query stakeup total-staked-of-denom [denom] --min-duration ``` :::: details Example @@ -993,7 +993,7 @@ dualityd query stakeup total-staked-of-denom [denom] --min-duration This example command outputs the amount of `gamm/pool/2` LP shares that staked in the `2 week` bonding period: ```bash -dualityd query stakeup total-staked-of-denom gamm/pool/2 --min-duration "336h" +neutrond query stakeup total-staked-of-denom gamm/pool/2 --min-duration "336h" ``` Which, at the time of this writing outputs `14106985399822075248947045` which is equivalent to `14106985.3998 gamm/pool/2` @@ -1005,50 +1005,50 @@ NOTE: As of this writing, there is a bug that defaults the min duration to days ```sh # 1 day 100stake stake-tokens command -dualityd tx stakeup stake-tokens 200stake --duration="86400s" --from=validator --chain-id=testing --keyring-backend=test --yes +neutrond tx stakeup stake-tokens 200stake --duration="86400s" --from=validator --chain-id=testing --keyring-backend=test --yes # 5s 100stake stake-tokens command -dualityd tx stakeup stake-tokens 100stake --duration="5s" --from=validator --chain-id=testing --keyring-backend=test --yes +neutrond tx stakeup stake-tokens 100stake --duration="5s" --from=validator --chain-id=testing --keyring-backend=test --yes # begin unstake tokens, NOTE: add more gas when unstaking more than two stakes in a same command -dualityd tx stakeup begin-unstake-tokens --from=validator --gas=500000 --chain-id=testing --keyring-backend=test --yes +neutrond tx stakeup begin-unstake-tokens --from=validator --gas=500000 --chain-id=testing --keyring-backend=test --yes # unstake tokens, NOTE: add more gas when unstaking more than two stakes in a same command -dualityd tx stakeup unstake-tokens --from=validator --gas=500000 --chain-id=testing --keyring-backend=test --yes +neutrond tx stakeup unstake-tokens --from=validator --gas=500000 --chain-id=testing --keyring-backend=test --yes # unstake specific period stake -dualityd tx stakeup unstake-by-id 1 --from=validator --chain-id=testing --keyring-backend=test --yes +neutrond tx stakeup unstake-by-id 1 --from=validator --chain-id=testing --keyring-backend=test --yes # account balance -dualityd query bank balances $(dualityd keys show -a validator --keyring-backend=test) +neutrond query bank balances $(neutrond keys show -a validator --keyring-backend=test) # query module balance -dualityd query stakeup module-balance +neutrond query stakeup module-balance # query staked amount -dualityd query stakeup module-staked-amount +neutrond query stakeup module-staked-amount # query stake by id -dualityd query stakeup stake-by-id 1 +neutrond query stakeup stake-by-id 1 # query account unstakeable coins -dualityd query stakeup account-unstakeable-coins $(dualityd keys show -a validator --keyring-backend=test) +neutrond query stakeup account-unstakeable-coins $(neutrond keys show -a validator --keyring-backend=test) # query account stakes by denom past time -dualityd query stakeup account-staked-pasttime-denom $(dualityd keys show -a validator --keyring-backend=test) 1611879610 stake +neutrond query stakeup account-staked-pasttime-denom $(neutrond keys show -a validator --keyring-backend=test) 1611879610 stake # query account stakes past time -dualityd query stakeup account-staked-pasttime $(dualityd keys show -a validator --keyring-backend=test) 1611879610 +neutrond query stakeup account-staked-pasttime $(neutrond keys show -a validator --keyring-backend=test) 1611879610 # query account stakes by denom with longer duration -dualityd query stakeup account-staked-longer-duration-denom $(dualityd keys show -a validator --keyring-backend=test) 5.1s stake +neutrond query stakeup account-staked-longer-duration-denom $(neutrond keys show -a validator --keyring-backend=test) 5.1s stake # query account stakes with longer duration -dualityd query stakeup account-staked-longer-duration $(dualityd keys show -a validator --keyring-backend=test) 5.1s +neutrond query stakeup account-staked-longer-duration $(neutrond keys show -a validator --keyring-backend=test) 5.1s # query account staked coins -dualityd query stakeup account-staked-coins $(dualityd keys show -a validator --keyring-backend=test) +neutrond query stakeup account-staked-coins $(neutrond keys show -a validator --keyring-backend=test) # query account stakes before time -dualityd query stakeup account-staked-beforetime $(dualityd keys show -a validator --keyring-backend=test) 1611879610 +neutrond query stakeup account-staked-beforetime $(neutrond keys show -a validator --keyring-backend=test) 1611879610 ``` diff --git a/x/incentives/client/cli/cli_test.go b/x/incentives/client/cli/cli_test.go index 3ac098792..17b5b8aff 100644 --- a/x/incentives/client/cli/cli_test.go +++ b/x/incentives/client/cli/cli_test.go @@ -278,38 +278,38 @@ func TestNewStakeCmd(t *testing.T) { }, "tokenized share test": { Cmd: fmt.Sprintf( - "1000DualityPoolShares-tokenA-tokenB-t123-f30 --from %s", + "1000NeutronPoolShares-tokenA-tokenB-t123-f30 --from %s", testAddresses[0], ), ExpectedMsg: &types.MsgStake{ Owner: testAddresses[0].String(), Coins: sdk.NewCoins( - sdk.NewCoin("DualityPoolShares-tokenA-tokenB-t123-f30", math.NewInt(1000)), + sdk.NewCoin("NeutronPoolShares-tokenA-tokenB-t123-f30", math.NewInt(1000)), ), }, }, "tokenized share negative tick index test": { Cmd: fmt.Sprintf( - "1000DualityPoolShares-tokenA-tokenB-t-123-f30 --from %s", + "1000NeutronPoolShares-tokenA-tokenB-t-123-f30 --from %s", testAddresses[0], ), ExpectedMsg: &types.MsgStake{ Owner: testAddresses[0].String(), Coins: sdk.NewCoins( - sdk.NewCoin("DualityPoolShares-tokenA-tokenB-t-123-f30", math.NewInt(1000)), + sdk.NewCoin("NeutronPoolShares-tokenA-tokenB-t-123-f30", math.NewInt(1000)), ), }, }, "multiple tokenized shares": { Cmd: fmt.Sprintf( - "1000DualityPoolShares-tokenA-tokenB-t-123-f30,1DualityPoolShares-tokenA-tokenB-t-124-f30 --from %s", + "1000NeutronPoolShares-tokenA-tokenB-t-123-f30,1NeutronPoolShares-tokenA-tokenB-t-124-f30 --from %s", testAddresses[0], ), ExpectedMsg: &types.MsgStake{ Owner: testAddresses[0].String(), Coins: sdk.NewCoins( - sdk.NewCoin("DualityPoolShares-tokenA-tokenB-t-123-f30", math.NewInt(1000)), - sdk.NewCoin("DualityPoolShares-tokenA-tokenB-t-124-f30", math.NewInt(1)), + sdk.NewCoin("NeutronPoolShares-tokenA-tokenB-t-123-f30", math.NewInt(1000)), + sdk.NewCoin("NeutronPoolShares-tokenA-tokenB-t-124-f30", math.NewInt(1)), ), }, }, diff --git a/x/incentives/client/cli/query.go b/x/incentives/client/cli/query.go index a922baffa..4cb6481b0 100644 --- a/x/incentives/client/cli/query.go +++ b/x/incentives/client/cli/query.go @@ -59,7 +59,7 @@ func GetCmdGauges() (*dcli.QueryDescriptor, *types.GetGaugesRequest) { return &dcli.QueryDescriptor{ Use: "list-gauges [status] [denom]", Short: "Query gauges", - Long: `{{.Short}}{{.ExampleHeader}} list-gauges UPCOMING DualityPoolShares-stake-token-t0-f1`, + Long: `{{.Short}}{{.ExampleHeader}} list-gauges UPCOMING NeutronPoolShares-stake-token-t0-f1`, CustomFieldParsers: map[string]dcli.CustomFieldParserFn{ "Status": parseGaugeStatus, }, diff --git a/x/incentives/keeper/distributor_test.go b/x/incentives/keeper/distributor_test.go index a924902b0..a9989c065 100644 --- a/x/incentives/keeper/distributor_test.go +++ b/x/incentives/keeper/distributor_test.go @@ -48,7 +48,7 @@ func TestDistributor(t *testing.T) { app := testutil.Setup(t) ctx := app.BaseApp.NewContext( false, - tmtypes.Header{Height: 1, ChainID: "duality-1", Time: time.Now().UTC()}, + tmtypes.Header{Height: 1, ChainID: "neutron-1", Time: time.Now().UTC()}, ) gauge := types.NewGauge( diff --git a/x/incentives/types/codec.go b/x/incentives/types/codec.go index b2e2b954f..d58ef0655 100644 --- a/x/incentives/types/codec.go +++ b/x/incentives/types/codec.go @@ -15,10 +15,10 @@ var ( // RegisterCodec registers the necessary x/incentives interfaces and concrete types on the provided // LegacyAmino codec. These types are used for Amino JSON serialization. func RegisterCodec(cdc *codec.LegacyAmino) { - cdc.RegisterConcrete(&MsgCreateGauge{}, "duality/incentives/create-gauge", nil) - cdc.RegisterConcrete(&MsgAddToGauge{}, "duality/incentives/add-to-gauge", nil) - cdc.RegisterConcrete(&MsgStake{}, "duality/stake/stake-tokens", nil) - cdc.RegisterConcrete(&MsgUnstake{}, "duality/stake/begin-unstake-period-stake", nil) + cdc.RegisterConcrete(&MsgCreateGauge{}, "neutron/incentives/create-gauge", nil) + cdc.RegisterConcrete(&MsgAddToGauge{}, "neutron/incentives/add-to-gauge", nil) + cdc.RegisterConcrete(&MsgStake{}, "neutron/stake/stake-tokens", nil) + cdc.RegisterConcrete(&MsgUnstake{}, "neutron/stake/begin-unstake-period-stake", nil) } // RegisterInterfaces registers interfaces and implementations of the incentives module. From fe5a99dcffc385cb274f9e79a149fedd1dc59055 Mon Sep 17 00:00:00 2001 From: Julian Compagni Portis Date: Wed, 18 Oct 2023 13:54:05 -0400 Subject: [PATCH 189/307] add dex and incentives updaateParams msgs to proposal whitelist --- app/proposals_allowlisting.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/proposals_allowlisting.go b/app/proposals_allowlisting.go index a5853cf30..624c7e577 100644 --- a/app/proposals_allowlisting.go +++ b/app/proposals_allowlisting.go @@ -13,8 +13,10 @@ import ( ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" contractmanagertypes "github.com/neutron-org/neutron/x/contractmanager/types" crontypes "github.com/neutron-org/neutron/x/cron/types" + dextypes "github.com/neutron-org/neutron/x/dex/types" feeburnertypes "github.com/neutron-org/neutron/x/feeburner/types" feerefundertypes "github.com/neutron-org/neutron/x/feerefunder/types" + incentivestypes "github.com/neutron-org/neutron/x/incentives/types" interchainqueriestypes "github.com/neutron-org/neutron/x/interchainqueries/types" interchaintxstypes "github.com/neutron-org/neutron/x/interchaintxs/types" tokenfactorytypes "github.com/neutron-org/neutron/x/tokenfactory/types" @@ -60,7 +62,9 @@ func isSdkMessageWhitelisted(msg sdk.Msg) bool { *feeburnertypes.MsgUpdateParams, *feerefundertypes.MsgUpdateParams, *crontypes.MsgUpdateParams, - *contractmanagertypes.MsgUpdateParams: + *contractmanagertypes.MsgUpdateParams, + *incentivestypes.MsgUpdateParams, + *dextypes.MsgUpdateParams: return true } return false From 9db539cc52de24aa09ae3ff941227e31a049adc4 Mon Sep 17 00:00:00 2001 From: Julian Compagni Portis Date: Wed, 18 Oct 2023 13:54:37 -0400 Subject: [PATCH 190/307] Add note to dex and incentives UpdateParams msg --- proto/neutron/dex/tx.proto | 1 + proto/neutron/incentives/tx.proto | 1 + x/dex/types/tx.pb.go | 3 ++- x/incentives/types/tx.pb.go | 5 +++-- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/proto/neutron/dex/tx.proto b/proto/neutron/dex/tx.proto index 538a0e96c..b2bacb988 100644 --- a/proto/neutron/dex/tx.proto +++ b/proto/neutron/dex/tx.proto @@ -194,6 +194,7 @@ message MsgUpdateParams { // Authority is the address of the governance account. string authority = 1 [ (cosmos_proto.scalar) = "cosmos.AddressString" ]; + // NOTE: All parameters must be supplied. Params params = 2 [ (gogoproto.nullable) = false, (amino.dont_omitempty) = true ]; } diff --git a/proto/neutron/incentives/tx.proto b/proto/neutron/incentives/tx.proto index b73c85719..cb6487234 100644 --- a/proto/neutron/incentives/tx.proto +++ b/proto/neutron/incentives/tx.proto @@ -107,6 +107,7 @@ message MsgUpdateParams { // Authority is the address of the governance account. string authority = 1 [ (cosmos_proto.scalar) = "cosmos.AddressString" ]; + // NOTE: All parameters must be supplied. Params params = 2 [ (gogoproto.nullable) = false, (amino.dont_omitempty) = true ]; } diff --git a/x/dex/types/tx.pb.go b/x/dex/types/tx.pb.go index 5ce055a62..a90fadfc9 100644 --- a/x/dex/types/tx.pb.go +++ b/x/dex/types/tx.pb.go @@ -846,7 +846,8 @@ var xxx_messageInfo_MsgMultiHopSwapResponse proto.InternalMessageInfo type MsgUpdateParams struct { // Authority is the address of the governance account. Authority string `protobuf:"bytes,1,opt,name=authority,proto3" json:"authority,omitempty"` - Params Params `protobuf:"bytes,2,opt,name=params,proto3" json:"params"` + // NOTE: All parameters must be supplied. + Params Params `protobuf:"bytes,2,opt,name=params,proto3" json:"params"` } func (m *MsgUpdateParams) Reset() { *m = MsgUpdateParams{} } diff --git a/x/incentives/types/tx.pb.go b/x/incentives/types/tx.pb.go index bb30ac56e..aa9553cc0 100644 --- a/x/incentives/types/tx.pb.go +++ b/x/incentives/types/tx.pb.go @@ -185,7 +185,7 @@ type MsgAddToGauge struct { // owner is the gauge owner's address Owner string `protobuf:"bytes,1,opt,name=owner,proto3" json:"owner,omitempty" yaml:"owner"` // gauge_id is the ID of gauge that rewards are getting added to - GaugeId uint64 `protobuf:"varint,2,opt,name=gauge_id,json=gaugeID,proto3" json:"gauge_id,omitempty"` + GaugeId uint64 `protobuf:"varint,2,opt,name=gauge_id,json=gaugeId,proto3" json:"gauge_id,omitempty"` // rewards are the coin(s) to add to gauge Rewards github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,3,rep,name=rewards,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"rewards"` } @@ -520,7 +520,8 @@ var xxx_messageInfo_MsgUnstakeResponse proto.InternalMessageInfo type MsgUpdateParams struct { // Authority is the address of the governance account. Authority string `protobuf:"bytes,1,opt,name=authority,proto3" json:"authority,omitempty"` - Params Params `protobuf:"bytes,2,opt,name=params,proto3" json:"params"` + // NOTE: All parameters must be supplied. + Params Params `protobuf:"bytes,2,opt,name=params,proto3" json:"params"` } func (m *MsgUpdateParams) Reset() { *m = MsgUpdateParams{} } From 56ac6531a141c27ef6e5e15af13db7b3d538bcf6 Mon Sep 17 00:00:00 2001 From: Julian Compagni Portis Date: Wed, 18 Oct 2023 14:01:00 -0400 Subject: [PATCH 191/307] FIX: update incentives cli tests to match new denom format --- x/incentives/client/cli/cli_test.go | 22 +++++----------------- x/incentives/client/cli/query.go | 2 +- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/x/incentives/client/cli/cli_test.go b/x/incentives/client/cli/cli_test.go index 17b5b8aff..526dcda41 100644 --- a/x/incentives/client/cli/cli_test.go +++ b/x/incentives/client/cli/cli_test.go @@ -278,38 +278,26 @@ func TestNewStakeCmd(t *testing.T) { }, "tokenized share test": { Cmd: fmt.Sprintf( - "1000NeutronPoolShares-tokenA-tokenB-t123-f30 --from %s", + "1000neutron/pool/1 --from %s", testAddresses[0], ), ExpectedMsg: &types.MsgStake{ Owner: testAddresses[0].String(), Coins: sdk.NewCoins( - sdk.NewCoin("NeutronPoolShares-tokenA-tokenB-t123-f30", math.NewInt(1000)), - ), - }, - }, - "tokenized share negative tick index test": { - Cmd: fmt.Sprintf( - "1000NeutronPoolShares-tokenA-tokenB-t-123-f30 --from %s", - testAddresses[0], - ), - ExpectedMsg: &types.MsgStake{ - Owner: testAddresses[0].String(), - Coins: sdk.NewCoins( - sdk.NewCoin("NeutronPoolShares-tokenA-tokenB-t-123-f30", math.NewInt(1000)), + sdk.NewCoin("neutron/pool/1", math.NewInt(1000)), ), }, }, "multiple tokenized shares": { Cmd: fmt.Sprintf( - "1000NeutronPoolShares-tokenA-tokenB-t-123-f30,1NeutronPoolShares-tokenA-tokenB-t-124-f30 --from %s", + "1000neutron/pool/1,1neutron/pool/2 --from %s", testAddresses[0], ), ExpectedMsg: &types.MsgStake{ Owner: testAddresses[0].String(), Coins: sdk.NewCoins( - sdk.NewCoin("NeutronPoolShares-tokenA-tokenB-t-123-f30", math.NewInt(1000)), - sdk.NewCoin("NeutronPoolShares-tokenA-tokenB-t-124-f30", math.NewInt(1)), + sdk.NewCoin("neutron/pool/1", math.NewInt(1000)), + sdk.NewCoin("neutron/pool/2", math.NewInt(1)), ), }, }, diff --git a/x/incentives/client/cli/query.go b/x/incentives/client/cli/query.go index 4cb6481b0..13fa2f876 100644 --- a/x/incentives/client/cli/query.go +++ b/x/incentives/client/cli/query.go @@ -59,7 +59,7 @@ func GetCmdGauges() (*dcli.QueryDescriptor, *types.GetGaugesRequest) { return &dcli.QueryDescriptor{ Use: "list-gauges [status] [denom]", Short: "Query gauges", - Long: `{{.Short}}{{.ExampleHeader}} list-gauges UPCOMING NeutronPoolShares-stake-token-t0-f1`, + Long: `{{.Short}}{{.ExampleHeader}} list-gauges UPCOMING neutron/pool/1`, CustomFieldParsers: map[string]dcli.CustomFieldParserFn{ "Status": parseGaugeStatus, }, From 32d3e07433c749c5046ec98985a44b72c54a94c0 Mon Sep 17 00:00:00 2001 From: Julian Compagni Portis Date: Tue, 24 Oct 2023 15:58:15 -0400 Subject: [PATCH 192/307] FIX: more canonical naming for GoodTilPurgeHitGasLimit event --- x/dex/keeper/limit_order_expiration_test.go | 2 +- x/dex/types/events.go | 3 +-- x/dex/types/keys.go | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/x/dex/keeper/limit_order_expiration_test.go b/x/dex/keeper/limit_order_expiration_test.go index 598a6ac25..212fc60e0 100644 --- a/x/dex/keeper/limit_order_expiration_test.go +++ b/x/dex/keeper/limit_order_expiration_test.go @@ -166,7 +166,7 @@ func (s *DexTestSuite) TestPurgeExpiredLimitOrdersAtBlockGasLimit() { keeper.PurgeExpiredLimitOrders(ctx, now) // THEN GoodTilPurgeHitGasLimit event is emitted - s.AssertEventValueEmitted(types.GoodTilPurgeHitGasLimitEventKey, "Gas Limit Event not emitted") + s.AssertEventEmitted(ctx, types.EventTypeGoodTilPurgeHitGasLimit, 1) // All JIT expirations are purged but other expirations remain expList := keeper.GetAllLimitOrderExpiration(ctx) diff --git a/x/dex/types/events.go b/x/dex/types/events.go index 1c50ff105..cfc0b6bf6 100644 --- a/x/dex/types/events.go +++ b/x/dex/types/events.go @@ -220,9 +220,8 @@ func CreateTickUpdateLimitOrderTranche(tranche *LimitOrderTranche) sdk.Event { func GoodTilPurgeHitLimitEvent(gas sdk.Gas) sdk.Event { attrs := []sdk.Attribute{ sdk.NewAttribute(sdk.AttributeKeyModule, "dex"), - sdk.NewAttribute(sdk.AttributeKeyAction, GoodTilPurgeHitGasLimitEventKey), sdk.NewAttribute(GoodTilPurgeHitGasLimitEventGas, strconv.FormatUint(gas, 10)), } - return sdk.NewEvent(sdk.EventTypeMessage, attrs...) + return sdk.NewEvent(EventTypeGoodTilPurgeHitGasLimit, attrs...) } diff --git a/x/dex/types/keys.go b/x/dex/types/keys.go index 65c00f1d3..ec12ebd3d 100644 --- a/x/dex/types/keys.go +++ b/x/dex/types/keys.go @@ -276,8 +276,8 @@ const ( ) const ( - GoodTilPurgeHitGasLimitEventKey = "GoodTilPurgeHitGasLimit" - GoodTilPurgeHitGasLimitEventGas = "Gas" + EventTypeGoodTilPurgeHitGasLimit = "GoodTilPurgeHitGasLimit" + GoodTilPurgeHitGasLimitEventGas = "Gas" ) const ( From c1672b72a164d9c32668cbee4a13f00c7dd430cd Mon Sep 17 00:00:00 2001 From: Julian Compagni Portis Date: Wed, 25 Oct 2023 01:56:58 -0400 Subject: [PATCH 193/307] FIX: remove vestigial tests --- .../integration_placelimitorder_test.go | 135 ++---------------- 1 file changed, 12 insertions(+), 123 deletions(-) diff --git a/x/dex/keeper/integration_placelimitorder_test.go b/x/dex/keeper/integration_placelimitorder_test.go index 0f2aa189e..90cc398a2 100644 --- a/x/dex/keeper/integration_placelimitorder_test.go +++ b/x/dex/keeper/integration_placelimitorder_test.go @@ -55,25 +55,6 @@ func (s *DexTestSuite) TestPlaceLimitOrderInSpread0To1() { s.assertCurr0To1(1) } -func (s *DexTestSuite) TestPlaceLimitOrderInSpreadMinMaxNotAdjusted() { - s.fundAliceBalances(50, 50) - - // GIVEN - // create spread around -5, 5 - s.aliceDeposits(NewDeposit(10, 10, 0, 5)) - s.assertAliceBalances(40, 40) - s.assertDexBalances(10, 10) - - // WHEN - // place limit order for B at tick -1 - s.aliceLimitSells("TokenA", -1, 10) - s.assertAliceBalances(30, 40) - s.assertDexBalances(20, 10) - - // THEN - // assert min, max not moved -} - func (s *DexTestSuite) TestPlaceLimitOrderOutOfSpread0To1NotAdjusted() { s.fundAliceBalances(50, 50) @@ -118,98 +99,6 @@ func (s *DexTestSuite) TestPlaceLimitOrderOutOfSpread1To0NotAdjusted() { s.assertCurr1To0(-1) } -func (s *DexTestSuite) TestPlaceLimitOrderOutOfSpreadMinAdjusted() { - s.fundAliceBalances(50, 50) - - // GIVEN - // create spread around -1, 1 - s.aliceDeposits(NewDeposit(10, 10, 0, 1)) - s.assertAliceBalances(40, 40) - s.assertDexBalances(10, 10) - s.assertCurr1To0(-1) - s.assertCurr0To1(1) - - // WHEN - // place limit order out of spread (for B at tick -3) - s.aliceLimitSells("TokenA", -3, 10) - s.assertAliceBalances(30, 40) - s.assertDexBalances(20, 10) - - // THEN - // assert min moved -} - -func (s *DexTestSuite) TestPlaceLimitOrderOutOfSpreadMaxAdjusted() { - s.fundAliceBalances(50, 50) - - // GIVEN - // create spread around -1, 1 - s.aliceDeposits(NewDeposit(10, 10, 0, 1)) - s.assertAliceBalances(40, 40) - s.assertDexBalances(10, 10) - s.assertCurr1To0(-1) - s.assertCurr0To1(1) - - // WHEN - // place limit order out of spread (for A at tick 3) - s.aliceLimitSells("TokenB", 3, 10) - s.assertAliceBalances(40, 30) - s.assertDexBalances(10, 20) - - // THEN - // assert max moved -} - -func (s *DexTestSuite) TestPlaceLimitOrderOutOfSpreadMinNotAdjusted() { - s.fundAliceBalances(50, 50) - - // GIVEN - // create spread around -1, 1 - s.aliceDeposits(NewDeposit(10, 10, 0, 1)) - s.assertAliceBalances(40, 40) - s.assertDexBalances(10, 10) - s.assertCurr1To0(-1) - s.assertCurr0To1(1) - // deposit new min at -5 - s.aliceDeposits(NewDeposit(10, 0, 0, 5)) - s.assertAliceBalances(30, 40) - s.assertDexBalances(20, 10) - - // WHEN - // place limit order in spread (for B at tick -3) - s.aliceLimitSells("TokenA", -3, 10) - s.assertAliceBalances(20, 40) - s.assertDexBalances(30, 10) - - // THEN - // assert min not moved -} - -func (s *DexTestSuite) TestPlaceLimitOrderOutOfSpreadMaxNotAdjusted() { - s.fundAliceBalances(50, 50) - - // GIVEN - // create spread around -1, 1 - s.aliceDeposits(NewDeposit(10, 10, 0, 1)) - s.assertAliceBalances(40, 40) - s.assertDexBalances(10, 10) - s.assertCurr1To0(-1) - s.assertCurr0To1(1) - // deposit new max at 5 - s.aliceDeposits(NewDeposit(0, 10, 0, 5)) - s.assertAliceBalances(40, 30) - s.assertDexBalances(10, 20) - - // WHEN - // place limit order in spread (for A at tick 3) - s.aliceLimitSells("TokenB", 3, 10) - s.assertAliceBalances(40, 20) - s.assertDexBalances(10, 30) - - // THEN - // assert max not moved -} - func (s *DexTestSuite) TestPlaceLimitOrderExistingLiquidityA() { s.fundAliceBalances(50, 50) @@ -223,18 +112,18 @@ func (s *DexTestSuite) TestPlaceLimitOrderExistingLiquidityA() { s.assertCurr1To0(-1) s.assertCurr0To1(math.MaxInt64) - // // WHEN - // // place limit order on same tick (for B at tick -1) - // s.aliceLimitSells("TokenA", -1, 10) - - // // THEN - // // assert 20 of token A deposited at tick 0 fee 0 and ticks unchanged - // s.assertLimitLiquidityAtTick("TokenA", -1, 20) - // s.assertAliceLimitLiquidityAtTick("TokenA", 20, -1) - // s.assertAliceBalances(30, 50) - // s.assertDexBalances(20, 0) - // s.assertCurr1To0(-1) - // s.assertCurr0To1(math.MaxInt64) + // WHEN + // place limit order on same tick (for B at tick -1) + s.aliceLimitSells("TokenA", -1, 10) + + // THEN + // assert 20 of token A deposited at tick 0 fee 0 and ticks unchanged + s.assertLimitLiquidityAtTick("TokenA", -1, 20) + s.assertAliceLimitLiquidityAtTick("TokenA", 20, -1) + s.assertAliceBalances(30, 50) + s.assertDexBalances(20, 0) + s.assertCurr1To0(-1) + s.assertCurr0To1(math.MaxInt64) } func (s *DexTestSuite) TestPlaceLimitOrderExistingLiquidityB() { From eed9cefc103ef830a08fa3bdc3433280b3f05cc0 Mon Sep 17 00:00:00 2001 From: Julian Compagni Portis Date: Wed, 1 Nov 2023 14:22:39 -0400 Subject: [PATCH 194/307] Rewrite test helpers to default to BIGToken (exponent 6) In order to simulate more realistic trade volume and avoid inadvertent failures due to ErrInvalidPositionSpread all of the basic user operations (fundXXXBalance, assertXXXBalance, XXXLimitsSells, etc.) treat TokenA and TokenB as BIG tokens with an exponent of 6. Ie. fundAliceBalance(10, 10) funds alices account with 10,000,000 small TokenA and TokenB. For tests requiring more accuracy methods that take Ints (ie. assertXXXAccountBalancesInt, NewWithdrawlInt) are used and assume that amount are being provided in terms of small tokens. Example: s.fundAliceBalances(10, 10) s.assertAliceBalances(10, 10) ==> True s.assertAliceBalancesInt(sdkmath.NewInt(10_000_000), sdkmath.NewInt(10_000_000)) ==> true --- x/dex/keeper/deposit_record_test.go | 32 +-- ...grpc_query_estimate_multi_hop_swap_test.go | 94 +++---- .../integration_cancellimitorder_test.go | 9 +- .../integration_deposit_autoswap_unit_test.go | 25 +- .../integration_deposit_doublesided_test.go | 30 +-- .../keeper/integration_deposit_multi_test.go | 6 +- .../integration_deposit_singlesided_test.go | 29 ++- x/dex/keeper/integration_multihopswap_test.go | 105 ++++---- .../integration_placelimitorder_test.go | 18 +- .../keeper/integration_withdraw_multi_test.go | 7 +- x/dex/keeper/limit_order_tranche_user_test.go | 4 +- x/dex/keeper/liquidity_test.go | 232 ++++++++++-------- x/dex/keeper/msg_server_test.go | 159 +++++++----- x/dex/keeper/pool_test.go | 2 +- x/incentives/keeper/distribute_test.go | 68 ++--- x/incentives/keeper/gauge_test.go | 24 +- x/incentives/keeper/query_server_test.go | 16 +- x/incentives/keeper/stake_test.go | 30 +-- 18 files changed, 472 insertions(+), 418 deletions(-) diff --git a/x/dex/keeper/deposit_record_test.go b/x/dex/keeper/deposit_record_test.go index 4ed8526f2..4bb305d86 100644 --- a/x/dex/keeper/deposit_record_test.go +++ b/x/dex/keeper/deposit_record_test.go @@ -9,38 +9,18 @@ func (s *DexTestSuite) TestGetAllDeposits() { s.fundAliceBalances(20, 20) // GIVEN Alice Deposits 3 positions and withdraws the first s.aliceDeposits( - &Deposit{ - AmountA: math.NewInt(1), - AmountB: math.NewInt(0), - TickIndex: -50, - Fee: 1, - }, - &Deposit{ - AmountA: math.NewInt(5), - AmountB: math.NewInt(5), - TickIndex: 0, - Fee: 1, - }, - &Deposit{ - AmountA: math.NewInt(0), - AmountB: math.NewInt(10), - TickIndex: 2, - Fee: 1, - }, - ) - s.aliceWithdraws(&Withdrawal{ - TickIndex: -50, - Fee: 1, - Shares: math.NewInt(1), - }, + NewDeposit(1, 0, -50, 1), + NewDeposit(5, 5, 0, 1), + NewDeposit(0, 10, 2, 1), ) + s.aliceWithdraws(NewWithdrawal(1, -50, 1)) // THEN GetAllDeposits returns the two remaining LP positions depositList := s.App.DexKeeper.GetAllDepositsForAddress(s.Ctx, s.alice) s.Assert().Equal(2, len(depositList)) s.Assert().Equal(&types.DepositRecord{ PairID: defaultPairID, - SharesOwned: math.NewInt(10), + SharesOwned: math.NewInt(10_000_000), CenterTickIndex: 0, LowerTickIndex: -1, UpperTickIndex: 1, @@ -50,7 +30,7 @@ func (s *DexTestSuite) TestGetAllDeposits() { ) s.Assert().Equal(&types.DepositRecord{ PairID: defaultPairID, - SharesOwned: math.NewInt(10), + SharesOwned: math.NewInt(10_002_000), CenterTickIndex: 2, LowerTickIndex: 1, UpperTickIndex: 3, 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 2ad474b81..a589a6dee 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 @@ -21,8 +21,8 @@ func (s *DexTestSuite) TestEstimateMultiHopSwapSingleRoute() { route := [][]string{{"TokenA", "TokenB", "TokenC", "TokenD"}} coinOut := s.aliceEstimatesMultiHopSwap(route, 100, math_utils.MustNewPrecDecFromStr("0.9"), false) - // THEN alice would get out 99 TokenD - s.Assert().Equal(math.NewInt(97), coinOut.Amount) + // THEN alice would get out ~99 BIGTokenD + s.Assert().Equal(math.NewInt(99970003), coinOut.Amount) s.assertAccountBalanceWithDenom(s.alice, "TokenA", 100) s.assertAccountBalanceWithDenom(s.alice, "TokenD", 0) @@ -99,82 +99,82 @@ func (s *DexTestSuite) TestEstimateMultiHopSwapMultiRouteOneGood() { s.assertLiquidityAtTickWithDenom( &types.PairID{Token0: "TokenA", Token1: "TokenB"}, - math.NewInt(0), - math.NewInt(100), + 0, + 100, 0, 1, ) - coinOut := s.aliceEstimatesMultiHopSwap(routes, 100, math_utils.MustNewPrecDecFromStr("0.9"), false) - _ = coinOut + coinOut := s.aliceEstimatesMultiHopSwap(routes, 100, math_utils.MustNewPrecDecFromStr("0.91"), false) // THEN swap estimation succeeds through route A<>B, B<>E, E<>X - s.Assert().Equal(math.NewInt(97), coinOut.Amount) + s.Assert().Equal(math.NewInt(99970003), coinOut.Amount) + + // pools and accounts are unaffected s.assertAccountBalanceWithDenom(s.alice, "TokenA", 100) s.assertAccountBalanceWithDenom(s.alice, "TokenX", 0) s.assertLiquidityAtTickWithDenom( &types.PairID{Token0: "TokenA", Token1: "TokenB"}, - math.NewInt(0), - math.NewInt(100), + 0, + 100, 0, 1, ) s.assertLiquidityAtTickWithDenom( &types.PairID{Token0: "TokenB", Token1: "TokenE"}, - math.NewInt(0), - math.NewInt(100), + 0, + 100, 0, 1, ) s.assertLiquidityAtTickWithDenom( &types.PairID{Token0: "TokenE", Token1: "TokenX"}, - math.NewInt(0), - math.NewInt(100), + 0, + 100, 0, 1, ) - // Other pools are unaffected s.assertLiquidityAtTickWithDenom( &types.PairID{Token0: "TokenB", Token1: "TokenC"}, - math.NewInt(0), - math.NewInt(100), + 0, + 100, 0, 1, ) s.assertLiquidityAtTickWithDenom( &types.PairID{Token0: "TokenC", Token1: "TokenX"}, - math.NewInt(0), - math.NewInt(50), + 0, + 50, 0, 1, ) s.assertLiquidityAtTickWithDenom( &types.PairID{Token0: "TokenC", Token1: "TokenX"}, - math.NewInt(0), - math.NewInt(50), + 0, + 50, 2200, 1, ) s.assertLiquidityAtTickWithDenom( &types.PairID{Token0: "TokenB", Token1: "TokenD"}, - math.NewInt(0), - math.NewInt(100), + 0, + 100, 0, 1, ) s.assertLiquidityAtTickWithDenom( &types.PairID{Token0: "TokenD", Token1: "TokenX"}, - math.NewInt(0), - math.NewInt(50), + 0, + 50, 0, 1, ) s.assertLiquidityAtTickWithDenom( &types.PairID{Token0: "TokenD", Token1: "TokenX"}, - math.NewInt(0), - math.NewInt(50), + 0, + 50, 2200, 1, ) @@ -208,7 +208,7 @@ func (s *DexTestSuite) TestEstimateMultiHopSwapMultiRouteAllFail() { types.ErrExitLimitPriceHit, routes, 100, - math_utils.MustNewPrecDecFromStr("0.9"), + math_utils.MustNewPrecDecFromStr("0.91"), true, ) @@ -218,7 +218,7 @@ func (s *DexTestSuite) TestEstimateMultiHopSwapMultiRouteAllFail() { types.ErrExitLimitPriceHit, routes, 100, - math_utils.MustNewPrecDecFromStr("0.9"), + math_utils.MustNewPrecDecFromStr("0.91"), false, ) } @@ -247,55 +247,55 @@ func (s *DexTestSuite) TestEstimateMultiHopSwapMultiRouteFindBestRoute() { // THEN swap succeeds through route A<>B, B<>E, E<>X - s.Assert().Equal(sdk.NewCoin("TokenX", math.NewInt(132)), coinOut) + // pools are unaffected + s.Assert().Equal(sdk.NewCoin("TokenX", math.NewInt(134943366)), coinOut) s.assertLiquidityAtTickWithDenom( &types.PairID{Token0: "TokenA", Token1: "TokenB"}, - math.NewInt(0), - math.NewInt(100), + 0, + 100, 0, 1, ) s.assertLiquidityAtTickWithDenom( &types.PairID{Token0: "TokenB", Token1: "TokenE"}, - math.NewInt(0), - math.NewInt(100), + 0, + 100, 0, 1, ) s.assertLiquidityAtTickWithDenom( &types.PairID{Token0: "TokenE", Token1: "TokenX"}, - math.NewInt(0), - math.NewInt(1000), + 0, + 1000, -3000, 1, ) - // Other pools are unaffected s.assertLiquidityAtTickWithDenom( &types.PairID{Token0: "TokenB", Token1: "TokenC"}, - math.NewInt(0), - math.NewInt(100), + 0, + 100, 0, 1, ) s.assertLiquidityAtTickWithDenom( &types.PairID{Token0: "TokenC", Token1: "TokenX"}, - math.NewInt(0), - math.NewInt(1000), + 0, + 1000, -1000, 1, ) s.assertLiquidityAtTickWithDenom( &types.PairID{Token0: "TokenB", Token1: "TokenD"}, - math.NewInt(0), - math.NewInt(100), + 0, + 100, 0, 1, ) s.assertLiquidityAtTickWithDenom( &types.PairID{Token0: "TokenD", Token1: "TokenX"}, - math.NewInt(0), - math.NewInt(1000), + 0, + 1000, -2000, 1, ) @@ -338,12 +338,12 @@ func (s *DexTestSuite) TestEstimateMultiHopSwapLongRouteWithCache() { coinOut := s.aliceEstimatesMultiHopSwap(routes, 100, math_utils.MustNewPrecDecFromStr("0.8"), true) // THEN swap succeeds with second route - s.Assert().Equal(coinOut, sdk.NewCoin("TokenX", math.NewInt(88))) + s.Assert().Equal(coinOut, sdk.NewCoin("TokenX", math.NewInt(99880066))) s.assertAccountBalanceWithDenom(s.alice, "TokenA", 100) s.assertLiquidityAtTickWithDenom( &types.PairID{Token0: "TokenM", Token1: "TokenX"}, - math.NewInt(0), - math.NewInt(100), + 0, + 100, 0, 1, ) diff --git a/x/dex/keeper/integration_cancellimitorder_test.go b/x/dex/keeper/integration_cancellimitorder_test.go index 92ba79939..6bfdd305a 100644 --- a/x/dex/keeper/integration_cancellimitorder_test.go +++ b/x/dex/keeper/integration_cancellimitorder_test.go @@ -4,6 +4,7 @@ import ( "math" "time" + sdkmath "cosmossdk.io/math" abci "github.com/cometbft/cometbft/abci/types" "github.com/neutron-org/neutron/x/dex/types" ) @@ -214,12 +215,12 @@ func (s *DexTestSuite) TestCancelPartiallyFilledMultiUser() { s.aliceCancelsLimitSell(trancheKey) s.carolCancelsLimitSell(trancheKey) - // THEN alice gets back 41 TokenA (125 * 1/3) - s.assertAliceBalances(41, 0) + // THEN alice gets back ~41 BIGTokenA (125 * 1/3) + s.assertAliceBalancesInt(sdkmath.NewInt(41_666_666), sdkmath.ZeroInt()) // Carol gets back 83 TokenA (125 * 2/3) - s.assertCarolBalances(83, 0) - s.assertDexBalances(1, 25) + s.assertCarolBalancesInt(sdkmath.NewInt(83_333_333), sdkmath.ZeroInt()) + s.assertDexBalancesInt(sdkmath.OneInt(), sdkmath.NewInt(25_000_000)) } func (s *DexTestSuite) TestCancelGoodTil() { diff --git a/x/dex/keeper/integration_deposit_autoswap_unit_test.go b/x/dex/keeper/integration_deposit_autoswap_unit_test.go index 5fc6eb9b6..f3fd9c6b6 100644 --- a/x/dex/keeper/integration_deposit_autoswap_unit_test.go +++ b/x/dex/keeper/integration_deposit_autoswap_unit_test.go @@ -30,8 +30,8 @@ func (s *DexTestSuite) TestAutoswapperWithdraws() { s.aliceWithdraws(NewWithdrawalInt(autoswapSharesMinted, int64(tickIndex), uint64(fee))) - s.assertAliceBalances(aliceExpectedBalance0.Int64(), aliceExpectedBalance1.Int64()) - s.assertDexBalances(dexExpectedBalance0.Int64(), dexExpectedBalance1.Int64()) + s.assertAliceBalancesInt(aliceExpectedBalance0, aliceExpectedBalance1) + s.assertDexBalancesInt(dexExpectedBalance0, dexExpectedBalance1) } func (s *DexTestSuite) TestAutoswapOtherDepositorWithdraws() { @@ -60,10 +60,10 @@ func (s *DexTestSuite) TestAutoswapOtherDepositorWithdraws() { bobExpectedBalance0, bobExpectedBalance1, dexExpectedBalance0, dexExpectedBalance1 := s.calcExpectedBalancesAfterWithdrawOnePool(bobSharesMinted, s.bob, int64(tickIndex), uint64(fee)) - s.bobWithdraws(NewWithdrawal(bobSharesMinted.Int64(), int64(tickIndex), uint64(fee))) + s.bobWithdraws(NewWithdrawalInt(bobSharesMinted, int64(tickIndex), uint64(fee))) - s.assertBobBalances(bobExpectedBalance0.Int64(), bobExpectedBalance1.Int64()) - s.assertDexBalances(dexExpectedBalance0.Int64(), dexExpectedBalance1.Int64()) + s.assertBobBalancesInt(bobExpectedBalance0, bobExpectedBalance1) + s.assertDexBalancesInt(dexExpectedBalance0, dexExpectedBalance1) } func (s *DexTestSuite) TestAutoswapBothWithdraws() { @@ -77,9 +77,8 @@ func (s *DexTestSuite) TestAutoswapBothWithdraws() { tickIndex := 10000 fee := 5 - bobSharesMinted := s.calcSharesMinted(int64(tickIndex), int64(bobDep0), int64(bobDep1)) - s.bobDeposits(NewDeposit(bobDep0, bobDep1, tickIndex, fee)) + bobSharesMinted := s.getAccountShares(s.bob, "TokenA", "TokenB", int64(tickIndex), uint64(fee)) s.assertBobBalances(40, 40) s.assertDexBalances(10, 10) @@ -89,20 +88,20 @@ func (s *DexTestSuite) TestAutoswapBothWithdraws() { s.assertDexBalances(20, 15) // Calculated expected amounts out - autoswapSharesMinted := s.calcAutoswapSharesMinted(int64(tickIndex), uint64(fee), 5, 0, 5, 5, bobSharesMinted.Int64(), bobSharesMinted.Int64()) + autoswapSharesMinted := s.getAccountShares(s.alice, "TokenA", "TokenB", int64(tickIndex), uint64(fee)) // totalShares := autoswapSharesMinted.Add(math.NewInt(20)) bobExpectedBalance0, bobExpectedBalance1, dexExpectedBalance0, dexExpectedBalance1 := s.calcExpectedBalancesAfterWithdrawOnePool(bobSharesMinted, s.bob, int64(tickIndex), uint64(fee)) - s.bobWithdraws(NewWithdrawal(bobSharesMinted.Int64(), int64(tickIndex), uint64(fee))) + s.bobWithdraws(NewWithdrawalInt(bobSharesMinted, int64(tickIndex), uint64(fee))) - s.assertBobBalances(bobExpectedBalance0.Int64(), bobExpectedBalance1.Int64()) - s.assertDexBalances(dexExpectedBalance0.Int64(), dexExpectedBalance1.Int64()) + s.assertBobBalancesInt(bobExpectedBalance0, bobExpectedBalance1) + s.assertDexBalancesInt(dexExpectedBalance0, dexExpectedBalance1) aliceExpectedBalance0, aliceExpectedBalance1, dexExpectedBalance0, dexExpectedBalance1 := s.calcExpectedBalancesAfterWithdrawOnePool(autoswapSharesMinted, s.alice, int64(tickIndex), uint64(fee)) s.aliceWithdraws(NewWithdrawalInt(autoswapSharesMinted, int64(tickIndex), uint64(fee))) - s.assertAliceBalances(aliceExpectedBalance0.Int64(), aliceExpectedBalance1.Int64()) - s.assertDexBalances(dexExpectedBalance0.Int64(), dexExpectedBalance1.Int64()) + s.assertAliceBalancesInt(aliceExpectedBalance0, aliceExpectedBalance1) + s.assertDexBalancesInt(dexExpectedBalance0, dexExpectedBalance1) } diff --git a/x/dex/keeper/integration_deposit_doublesided_test.go b/x/dex/keeper/integration_deposit_doublesided_test.go index 79fb8dc91..951ffb004 100644 --- a/x/dex/keeper/integration_deposit_doublesided_test.go +++ b/x/dex/keeper/integration_deposit_doublesided_test.go @@ -113,7 +113,7 @@ func (s *DexTestSuite) TestDepositDoubleSidedCreatingArbBelow() { // THEN // deposit should not fail with BEL error, balances and liquidity should not change at deposited tick - s.aliceDeposits(NewDeposit(10, 10, -5, 1)) + s.aliceDeposits(NewDeposit(10, 11, -5, 1)) // buying liquidity behind enemy lines doesn't break anything s.bobLimitSells("TokenA", 0, 10, types.LimitOrderType_FILL_OR_KILL) @@ -135,7 +135,7 @@ func (s *DexTestSuite) TestDepositDoubleSidedCreatingArbAbove() { // THEN // deposit should not fail with BEL error, balances and liquidity should not change at deposited tick - s.aliceDeposits(NewDeposit(10, 10, 5, 1)) + s.aliceDeposits(NewDeposit(11, 10, 5, 1)) // buying liquidity behind enemy lines doesn't break anything s.bobLimitSells("TokenB", 0, 10, types.LimitOrderType_FILL_OR_KILL) @@ -221,28 +221,30 @@ func (s *DexTestSuite) TestDepositValueAccural() { // Alice deposits 100TokenA @ tick0 => 100 shares s.aliceDeposits(NewDeposit(100, 0, 0, 10)) s.assertAliceShares(0, 10, 100) - s.assertLiquidityAtTick(math.NewInt(100), math.ZeroInt(), 0, 10) + s.assertLiquidityAtTick(100, 0, 0, 10) - // Lots of trade activity => ~200 ExistingValueToken0 + // Lots of trade activity => ~110 ExistingValueToken0 for i := 0; i < 100; i++ { - liquidityA, liquidityB := s.getLiquidityAtTick(0, 10) if i%2 == 0 { - s.bobLimitSells("TokenB", -10, int(liquidityA.Int64())+10, types.LimitOrderType_IMMEDIATE_OR_CANCEL) + s.bobLimitSells("TokenB", -10, 1000, types.LimitOrderType_IMMEDIATE_OR_CANCEL) } else { - s.bobLimitSells("TokenA", 10, int(liquidityB.Int64())+10, types.LimitOrderType_IMMEDIATE_OR_CANCEL) + s.bobLimitSells("TokenA", 10, 1000, types.LimitOrderType_IMMEDIATE_OR_CANCEL) } } - s.assertLiquidityAtTick(math.NewInt(200), math.NewInt(0), 0, 10) - s.assertDexBalances(200, 0) + s.assertLiquidityAtTickInt(math.NewInt(110516593), math.ZeroInt(), 0, 10) + s.assertDexBalancesInt(math.NewInt(110516593), math.ZeroInt()) + s.assertLiquidityAtTickInt(math.NewInt(110516593), math.ZeroInt(), 0, 10) // Carol deposits 100TokenA @tick0 - s.carolDeposits(NewDeposit(100, 1, 0, 10)) - s.assertCarolShares(0, 10, 50) + s.carolDeposits(NewDeposit(100, 0, 0, 10)) + s.assertLiquidityAtTickInt(math.NewInt(210516593), math.ZeroInt(), 0, 10) + s.assertAccountSharesInt(s.carol, 0, 10, math.NewInt(90484150)) + // Alice gets back 100% of the accrued trade value s.aliceWithdraws(NewWithdrawal(100, 0, 10)) - s.assertAliceBalances(200, 0) - - s.carolWithdraws(NewWithdrawal(50, 0, 10)) + s.assertAliceBalancesInt(math.NewInt(110516593), math.NewInt(0)) + // AND carol get's back only what she put in + s.carolWithdraws(NewWithdrawalInt(math.NewInt(90484150), 0, 10)) s.assertCarolBalances(100, 1) } diff --git a/x/dex/keeper/integration_deposit_multi_test.go b/x/dex/keeper/integration_deposit_multi_test.go index cbf999695..b2ca79a8b 100644 --- a/x/dex/keeper/integration_deposit_multi_test.go +++ b/x/dex/keeper/integration_deposit_multi_test.go @@ -1,7 +1,6 @@ package keeper_test import ( - "cosmossdk.io/math" "github.com/neutron-org/neutron/x/dex/types" ) @@ -34,12 +33,13 @@ func (s *DexTestSuite) TestDepositMultiSuccess() { // alice deposits 5 A, 5 B at tick 0 fee 0 and then 10 A, 10 B at tick 5 fee 0 s.aliceDeposits( NewDeposit(5, 5, 0, 1), - NewDeposit(10, 10, 0, 1), + NewDeposit(10, 10, 5, 0), ) // THEN // both deposits should go through s.assertAliceBalances(35, 35) - s.assertLiquidityAtTick(math.NewInt(15), math.NewInt(15), 0, 1) + s.assertLiquidityAtTick(5, 5, 0, 1) + s.assertLiquidityAtTick(10, 10, 5, 0) s.assertDexBalances(15, 15) } diff --git a/x/dex/keeper/integration_deposit_singlesided_test.go b/x/dex/keeper/integration_deposit_singlesided_test.go index 0d5a176c1..661747407 100644 --- a/x/dex/keeper/integration_deposit_singlesided_test.go +++ b/x/dex/keeper/integration_deposit_singlesided_test.go @@ -3,6 +3,7 @@ package keeper_test import ( "math" + sdkmath "cosmossdk.io/math" "github.com/neutron-org/neutron/x/dex/types" ) @@ -276,7 +277,7 @@ func (s *DexTestSuite) TestDepositSingleSidedCreatingArbToken0() { // Bob arbs s.bobLimitSells("TokenB", -1, 50, types.LimitOrderType_IMMEDIATE_OR_CANCEL) s.bobLimitSells("TokenA", 1, 10) - s.assertBobBalances(50, 52) + s.assertBobBalancesInt(sdkmath.NewInt(50_000_000), sdkmath.NewInt(53_294_995)) } func (s *DexTestSuite) TestDepositSingleSidedCreatingArbToken1() { @@ -301,7 +302,7 @@ func (s *DexTestSuite) TestDepositSingleSidedCreatingArbToken1() { // Bob arbs s.bobLimitSells("TokenA", -1, 50, types.LimitOrderType_IMMEDIATE_OR_CANCEL) s.bobLimitSells("TokenB", -1, 10) - s.assertBobBalances(52, 50) + s.assertBobBalancesInt(sdkmath.NewInt(53_295_665), sdkmath.NewInt(50_000_000)) } func (s *DexTestSuite) TestDepositSingleSidedMultiA() { @@ -410,17 +411,19 @@ func (s *DexTestSuite) TestDepositSingleSidedZeroTrueAmountsFail() { s.assertAliceDepositFails(err, NewDeposit(0, 5, 0, 1)) } -func (s *DexTestSuite) TestDepositSingleLowTickUnderflowFails() { - s.fundAliceBalances(0, 50) - - // GIVEN - // deposit 50 of token B at tick -352436 fee 0 - // THEN 0 shares would be issued so deposit fails - s.assertAliceDepositFails( - types.ErrDepositShareUnderflow, - NewDeposit(0, 50, -352436, 0), - ) -} +// NOTE: The error checking for ShareUnderflow is completely subsumed by the ensureFairTruePrice check +// it no longer possible to manually check this test case. Leaving the example test here should things change in the future +// func (s *DexTestSuite) TestDepositSingleLowTickUnderflowFails() { +// s.fundAliceBalances(0, 40_000_000_000_0) + +// // GIVEN +// // deposit 50 of token B at tick -352436 fee 0 +// // THEN 0 shares would be issued so deposit fails +// s.assertAliceDepositFails( +// types.ErrDepositShareUnderflow, +// NewDeposit(0, 26457, -240_000, 0), +// ) +// } func (s *DexTestSuite) TestDepositSingleInvalidFeeFails() { s.fundAliceBalances(0, 50) diff --git a/x/dex/keeper/integration_multihopswap_test.go b/x/dex/keeper/integration_multihopswap_test.go index 6bb951ae0..776b13e7f 100644 --- a/x/dex/keeper/integration_multihopswap_test.go +++ b/x/dex/keeper/integration_multihopswap_test.go @@ -29,9 +29,11 @@ func NewPoolSetup(tokenA, tokenB string, amountA, amountB, tickIndex, fee int) P func (s *DexTestSuite) SetupMultiplePools(poolSetups ...PoolSetup) { for _, p := range poolSetups { + amountAInt := math.NewInt(int64(p.AmountA)).Mul(denomMultiple) + amountBInt := math.NewInt(int64(p.AmountB)).Mul(denomMultiple) coins := sdk.NewCoins( - sdk.NewCoin(p.TokenA, math.NewInt(int64(p.AmountA))), - sdk.NewCoin(p.TokenB, math.NewInt(int64(p.AmountB))), + sdk.NewCoin(p.TokenA, amountAInt), + sdk.NewCoin(p.TokenB, amountBInt), ) s.fundAccountBalancesWithDenom(s.bob, coins) pairID := types.PairID{Token0: p.TokenA, Token1: p.TokenB} @@ -59,12 +61,12 @@ func (s *DexTestSuite) TestMultiHopSwapSingleRoute() { // THEN alice gets out 99 TokenD s.assertAccountBalanceWithDenom(s.alice, "TokenA", 0) - s.assertAccountBalanceWithDenom(s.alice, "TokenD", 97) + s.assertAccountBalanceWithDenomInt(s.alice, "TokenD", math.NewInt(99_970_003)) s.assertDexBalanceWithDenom("TokenA", 100) s.assertDexBalanceWithDenom("TokenB", 100) s.assertDexBalanceWithDenom("TokenC", 100) - s.assertDexBalanceWithDenom("TokenD", 3) + s.assertDexBalanceWithDenomInt("TokenD", math.NewInt(29_997)) } func (s *DexTestSuite) TestMultiHopSwapInsufficientLiquiditySingleRoute() { @@ -131,73 +133,73 @@ func (s *DexTestSuite) TestMultiHopSwapMultiRouteOneGood() { {"TokenA", "TokenB", "TokenD", "TokenX"}, {"TokenA", "TokenB", "TokenE", "TokenX"}, } - s.aliceMultiHopSwaps(routes, 100, math_utils.MustNewPrecDecFromStr("0.9"), false) + s.aliceMultiHopSwaps(routes, 100, math_utils.MustNewPrecDecFromStr("0.91"), false) // THEN swap succeeds through route A<>B, B<>E, E<>X s.assertAccountBalanceWithDenom(s.alice, "TokenA", 0) - s.assertAccountBalanceWithDenom(s.alice, "TokenX", 97) - s.assertLiquidityAtTickWithDenom( + s.assertAccountBalanceWithDenomInt(s.alice, "TokenX", math.NewInt(99_970_003)) + s.assertLiquidityAtTickWithDenomInt( &types.PairID{Token0: "TokenA", Token1: "TokenB"}, - math.NewInt(100), - math.NewInt(1), + math.NewInt(99_999_999), + math.NewInt(10_000), 0, 1, ) - s.assertLiquidityAtTickWithDenom( + s.assertLiquidityAtTickWithDenomInt( &types.PairID{Token0: "TokenB", Token1: "TokenE"}, - math.NewInt(99), - math.NewInt(2), + math.NewInt(99_990_000), + math.NewInt(19_999), 0, 1, ) - s.assertLiquidityAtTickWithDenom( + s.assertLiquidityAtTickWithDenomInt( &types.PairID{Token0: "TokenE", Token1: "TokenX"}, - math.NewInt(98), - math.NewInt(3), + math.NewInt(99_980_001), + math.NewInt(29_997), 0, 1, ) // Other pools are unaffected - s.assertLiquidityAtTickWithDenom( + s.assertLiquidityAtTickWithDenomInt( &types.PairID{Token0: "TokenB", Token1: "TokenC"}, math.NewInt(0), - math.NewInt(100), + math.NewInt(100_000_000), 0, 1, ) - s.assertLiquidityAtTickWithDenom( + s.assertLiquidityAtTickWithDenomInt( &types.PairID{Token0: "TokenC", Token1: "TokenX"}, math.NewInt(0), - math.NewInt(50), + math.NewInt(50_000_000), 0, 1, ) - s.assertLiquidityAtTickWithDenom( + s.assertLiquidityAtTickWithDenomInt( &types.PairID{Token0: "TokenC", Token1: "TokenX"}, math.NewInt(0), - math.NewInt(50), + math.NewInt(50_000_000), 2200, 1, ) - s.assertLiquidityAtTickWithDenom( + s.assertLiquidityAtTickWithDenomInt( &types.PairID{Token0: "TokenB", Token1: "TokenD"}, math.NewInt(0), - math.NewInt(100), + math.NewInt(100_000_000), 0, 1, ) - s.assertLiquidityAtTickWithDenom( + s.assertLiquidityAtTickWithDenomInt( &types.PairID{Token0: "TokenD", Token1: "TokenX"}, math.NewInt(0), - math.NewInt(50), + math.NewInt(50_000_000), 0, 1, ) - s.assertLiquidityAtTickWithDenom( + s.assertLiquidityAtTickWithDenomInt( &types.PairID{Token0: "TokenD", Token1: "TokenX"}, math.NewInt(0), - math.NewInt(50), + math.NewInt(50_000_000), 2200, 1, ) @@ -231,7 +233,7 @@ func (s *DexTestSuite) TestMultiHopSwapMultiRouteAllFail() { types.ErrExitLimitPriceHit, routes, 100, - math_utils.MustNewPrecDecFromStr("0.9"), + math_utils.MustNewPrecDecFromStr("0.91"), true, ) @@ -241,7 +243,7 @@ func (s *DexTestSuite) TestMultiHopSwapMultiRouteAllFail() { types.ErrExitLimitPriceHit, routes, 100, - math_utils.MustNewPrecDecFromStr("0.9"), + math_utils.MustNewPrecDecFromStr("0.91"), false, ) } @@ -271,55 +273,56 @@ func (s *DexTestSuite) TestMultiHopSwapMultiRouteFindBestRoute() { // THEN swap succeeds through route A<>B, B<>E, E<>X s.assertAccountBalanceWithDenom(s.alice, "TokenA", 0) - s.assertAccountBalanceWithDenom(s.alice, "TokenX", 132) - s.assertLiquidityAtTickWithDenom( + s.assertAccountBalanceWithDenomInt(s.alice, "TokenX", math.NewInt(134_943_366)) + s.assertLiquidityAtTickWithDenomInt( &types.PairID{Token0: "TokenA", Token1: "TokenB"}, - math.NewInt(100), - math.NewInt(1), + math.NewInt(99_999_999), + math.NewInt(10000), 0, 1, ) - s.assertLiquidityAtTickWithDenom( + s.assertLiquidityAtTickWithDenomInt( &types.PairID{Token0: "TokenB", Token1: "TokenE"}, - math.NewInt(99), - math.NewInt(2), + math.NewInt(99_990_000), + math.NewInt(19_999), 0, 1, ) - s.assertLiquidityAtTickWithDenom( + + s.assertLiquidityAtTickWithDenomInt( &types.PairID{Token0: "TokenE", Token1: "TokenX"}, - math.NewInt(98), - math.NewInt(868), + math.NewInt(99_980_001), + math.NewInt(865_056_634), -3000, 1, ) // Other pools are unaffected - s.assertLiquidityAtTickWithDenom( + s.assertLiquidityAtTickWithDenomInt( &types.PairID{Token0: "TokenB", Token1: "TokenC"}, math.NewInt(0), - math.NewInt(100), + math.NewInt(100_000_000), 0, 1, ) - s.assertLiquidityAtTickWithDenom( + s.assertLiquidityAtTickWithDenomInt( &types.PairID{Token0: "TokenC", Token1: "TokenX"}, math.NewInt(0), - math.NewInt(1000), + math.NewInt(1_000_000_000), -1000, 1, ) - s.assertLiquidityAtTickWithDenom( + s.assertLiquidityAtTickWithDenomInt( &types.PairID{Token0: "TokenB", Token1: "TokenD"}, math.NewInt(0), - math.NewInt(100), + math.NewInt(100_000_000), 0, 1, ) - s.assertLiquidityAtTickWithDenom( + s.assertLiquidityAtTickWithDenomInt( &types.PairID{Token0: "TokenD", Token1: "TokenX"}, math.NewInt(0), - math.NewInt(1000), + math.NewInt(1_000_000_000), -2000, 1, ) @@ -363,11 +366,11 @@ func (s *DexTestSuite) TestMultiHopSwapLongRouteWithCache() { // THEN swap succeeds with second route s.assertAccountBalanceWithDenom(s.alice, "TokenA", 0) - s.assertAccountBalanceWithDenom(s.alice, "TokenX", 88) - s.assertLiquidityAtTickWithDenom( + s.assertAccountBalanceWithDenomInt(s.alice, "TokenX", math.NewInt(99_880_066)) + s.assertLiquidityAtTickWithDenomInt( &types.PairID{Token0: "TokenM", Token1: "TokenX"}, - math.NewInt(89), - math.NewInt(12), + math.NewInt(99_890_055), + math.NewInt(119_934), 0, 1, ) diff --git a/x/dex/keeper/integration_placelimitorder_test.go b/x/dex/keeper/integration_placelimitorder_test.go index 90cc398a2..0fc08221f 100644 --- a/x/dex/keeper/integration_placelimitorder_test.go +++ b/x/dex/keeper/integration_placelimitorder_test.go @@ -389,7 +389,7 @@ func (s *DexTestSuite) TestPlaceLimitOrderFoK0TotalAmountInNotUsed() { // WHEN alice submits FoK limitOrder for 9998 it succeeds // even though trueAmountIn < specifiedAmountIn due to rounding s.aliceLimitSells("TokenA", 21000, 9998, types.LimitOrderType_FILL_OR_KILL) - s.assertAliceBalances(6, 1352) + s.assertAliceBalancesInt(sdkmath.NewInt(5), sdkmath.NewInt(1_353_046_854)) } func (s *DexTestSuite) TestPlaceLimitOrderFoK1TotalAmountInNotUsed() { @@ -403,7 +403,7 @@ func (s *DexTestSuite) TestPlaceLimitOrderFoK1TotalAmountInNotUsed() { // WHEN alice submits FoK limitOrder for 9998 it succeeds // even though trueAmountIn < specifiedAmountIn due to rounding s.aliceLimitSells("TokenB", -21000, 9998, types.LimitOrderType_FILL_OR_KILL) - s.assertAliceBalances(1352, 6) + s.assertAliceBalancesInt(sdkmath.NewInt(135_3046_854), sdkmath.NewInt(5)) } func (s *DexTestSuite) TestPlaceLimitOrderFoKMaxOutUsed() { @@ -416,8 +416,8 @@ func (s *DexTestSuite) TestPlaceLimitOrderFoKMaxOutUsed() { // WHEN alice submits FoK limitOrder of 50 TokenB with maxOut of 20 s.aliceLimitSellsWithMaxOut("TokenB", 0, 50, 20) - // THEN alice swap 19 TokenB and gets back 20 TokenA - s.assertAliceBalances(20, 31) + // THEN alice swap ~19 BIGTokenB and gets back 20 BIGTokenA + s.assertAliceBalancesInt(sdkmath.NewInt(20_000_000), sdkmath.NewInt(31_162_769)) } func (s *DexTestSuite) TestPlaceLimitOrderFoKMaxOutUsedMultiTick() { @@ -432,8 +432,8 @@ func (s *DexTestSuite) TestPlaceLimitOrderFoKMaxOutUsedMultiTick() { // WHEN alice submits FoK limitOrder of 50 TokenB with maxOut of 20 s.aliceLimitSellsWithMaxOut("TokenB", 0, 50, 20) - // THEN alice swap 20 TokenB and gets back 20 TokenA - s.assertAliceBalances(20, 30) + // THEN alice swap ~19 BIGTokenB and gets back 20 BIGTokenA + s.assertAliceBalancesInt(sdkmath.NewInt(20_000_000), sdkmath.NewInt(31_165_594)) } // Immediate Or Cancel LimitOrders //////////////////////////////////////////////////////////////////// @@ -536,13 +536,13 @@ func (s *DexTestSuite) TestPlaceLimitOrderJITBehindEnemyLines() { s.assertLimitLiquidityAtTick("TokenA", 1, 10) s.assertAliceBalances(0, 0) // AND bob swaps through all the liquidity - s.bobLimitSells("TokenB", -10, 10, types.LimitOrderType_FILL_OR_KILL) + s.bobLimitSells("TokenB", -10, 10, types.LimitOrderType_IMMEDIATE_OR_CANCEL) // THEN all liquidity is depleted s.assertLimitLiquidityAtTick("TokenA", 1, 0) - // Alice can withdraw 9 TokenB + // Alice can withdraw ~10 BIGTokenB s.aliceWithdrawsLimitSell(trancheKey) - s.assertAliceBalances(0, 9) + s.assertAliceBalancesInt(sdkmath.ZeroInt(), sdkmath.NewInt(9999000)) } func (s *DexTestSuite) TestPlaceLimitOrderJITNextBlock() { diff --git a/x/dex/keeper/integration_withdraw_multi_test.go b/x/dex/keeper/integration_withdraw_multi_test.go index 410b2878d..b7f8edcb4 100644 --- a/x/dex/keeper/integration_withdraw_multi_test.go +++ b/x/dex/keeper/integration_withdraw_multi_test.go @@ -1,7 +1,6 @@ package keeper_test import ( - "cosmossdk.io/math" "github.com/neutron-org/neutron/x/dex/types" ) @@ -11,7 +10,7 @@ func (s *DexTestSuite) TestWithdrawMultiFailure() { // alice deposits 5 A, 5 B in tick 0 fee 0 s.aliceDeposits(NewDeposit(5, 5, 0, 1)) s.assertAliceShares(0, 1, 10) - s.assertLiquidityAtTick(math.NewInt(5), math.NewInt(5), 0, 1) + s.assertLiquidityAtTick(5, 5, 0, 1) s.assertAliceBalances(45, 45) s.assertDexBalances(5, 5) @@ -33,7 +32,7 @@ func (s *DexTestSuite) TestWithdrawMultiSuccess() { // alice deposits 5 A, 5 B in tick 0 fee 1 s.aliceDeposits(NewDeposit(5, 5, 0, 1)) s.assertAliceShares(0, 1, 10) - s.assertLiquidityAtTick(math.NewInt(5), math.NewInt(5), 0, 1) + s.assertLiquidityAtTick(5, 5, 0, 1) s.assertAliceBalances(45, 45) s.assertDexBalances(5, 5) @@ -48,7 +47,7 @@ func (s *DexTestSuite) TestWithdrawMultiSuccess() { // both withdraws should work // i.e. no shares remaining and entire balance transferred out s.assertAliceShares(0, 1, 0) - s.assertLiquidityAtTick(math.ZeroInt(), math.ZeroInt(), 0, 1) + s.assertLiquidityAtTick(0, 0, 0, 1) s.assertAliceBalances(50, 50) s.assertDexBalances(0, 0) } diff --git a/x/dex/keeper/limit_order_tranche_user_test.go b/x/dex/keeper/limit_order_tranche_user_test.go index 3c507ce49..c3eef976b 100644 --- a/x/dex/keeper/limit_order_tranche_user_test.go +++ b/x/dex/keeper/limit_order_tranche_user_test.go @@ -90,7 +90,7 @@ func (s *DexTestSuite) TestGetAllLimitOrders() { TickIndexTakerToMaker: 1, TrancheKey: trancheKeyA, Address: s.alice.String(), - SharesOwned: math.NewInt(10), + SharesOwned: math.NewInt(10_000_000), SharesWithdrawn: math.NewInt(0), SharesCancelled: math.NewInt(0), }, @@ -101,7 +101,7 @@ func (s *DexTestSuite) TestGetAllLimitOrders() { TickIndexTakerToMaker: 0, TrancheKey: trancheKeyB, Address: s.alice.String(), - SharesOwned: math.NewInt(10), + SharesOwned: math.NewInt(10_000_000), SharesWithdrawn: math.NewInt(0), SharesCancelled: math.NewInt(0), }, diff --git a/x/dex/keeper/liquidity_test.go b/x/dex/keeper/liquidity_test.go index cdfb199cf..0cfdad2b7 100644 --- a/x/dex/keeper/liquidity_test.go +++ b/x/dex/keeper/liquidity_test.go @@ -19,8 +19,8 @@ func (s *DexTestSuite) TestSwap0To1NoLiquidity() { tokenIn, tokenOut := s.swap("TokenA", "TokenB", 10) // THEN swap should do nothing - s.assertSwapOutput(tokenIn, 0, tokenOut, 0) - s.assertTickBalances(1010, 0) + s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(0o_000_000), tokenOut, sdkmath.NewInt(0o_000_000)) + s.assertTickBalancesInt(sdkmath.NewInt(1010_000_000), sdkmath.NewInt(0o_000_000)) s.assertCurr0To1(math.MaxInt64) } @@ -34,8 +34,8 @@ func (s *DexTestSuite) TestSwap1To0NoLiquidity() { tokenIn, tokenOut := s.swap("TokenB", "TokenA", 10) // THEN swap should do nothing - s.assertSwapOutput(tokenIn, 0, tokenOut, 0) - s.assertTickBalances(0, 1010) + s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(0o_000_000), tokenOut, sdkmath.NewInt(0o_000_000)) + s.assertTickBalancesInt(sdkmath.NewInt(0o_000_000), sdkmath.NewInt(1010_000_000)) s.assertCurr1To0(math.MinInt64) } @@ -49,11 +49,11 @@ func (s *DexTestSuite) TestSwap0To1PartialFillLP() { // WHEN swap 20 of tokenA tokenIn, tokenOut := s.swap("TokenA", "TokenB", 20) - // THEN swap should return 11 TokenA in and 10 TokenB out + // THEN swap should return ~10 BIGTokenA in and 10 BIGTokenB out s.Assert().Equal("TokenA", tokenIn.Denom) s.Assert().Equal("TokenB", tokenOut.Denom) - s.assertSwapOutput(tokenIn, 11, tokenOut, 10) - s.assertTickBalances(11, 0) + s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(10_001_000), tokenOut, sdkmath.NewInt(10_000_000)) + s.assertTickBalancesInt(sdkmath.NewInt(10_001_000), sdkmath.ZeroInt()) s.assertCurr0To1(math.MaxInt64) s.assertCurr1To0(-1) @@ -66,11 +66,11 @@ func (s *DexTestSuite) TestSwap1To0PartialFillLP() { // WHEN swap 20 of tokenB tokenIn, tokenOut := s.swap("TokenB", "TokenA", 20) - // THEN swap should return 11 TokenB in and 10 TokenA out + // THEN swap should return ~10 BIGTokenB in and 10 BIGTokenA out s.Assert().Equal("TokenB", tokenIn.Denom) s.Assert().Equal("TokenA", tokenOut.Denom) - s.assertSwapOutput(tokenIn, 11, tokenOut, 10) - s.assertTickBalances(0, 11) + s.assertSwapOutputInt(tokenIn, sdk.NewInt(10_001_000), tokenOut, sdk.NewInt(10_000_000)) + s.assertTickBalancesInt(sdk.ZeroInt(), sdk.NewInt(10001000)) s.assertCurr0To1(1) s.assertCurr1To0(math.MinInt64) @@ -83,11 +83,11 @@ func (s *DexTestSuite) TestSwap0To1FillLP() { // WHEN swap 100 of tokenA tokenIn, tokenOut := s.swap("TokenA", "TokenB", 100) - // THEN swap should return 100 TokenA in and 97 TokenB out + // THEN swap should return 100 BIGTokenA in and ~98 BIGTokenB out s.Assert().Equal("TokenA", tokenIn.Denom) s.Assert().Equal("TokenB", tokenOut.Denom) - s.assertSwapOutput(tokenIn, 100, tokenOut, 97) - s.assertTickBalances(100, 3) + s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(100_000_000), tokenOut, sdkmath.NewInt(97_970_970)) + s.assertTickBalancesInt(sdkmath.NewInt(100_000_000), sdkmath.NewInt(20_29_030)) s.assertCurr0To1(205) s.assertCurr1To0(195) @@ -100,12 +100,12 @@ func (s *DexTestSuite) TestSwap1To0FillLP() { // WHEN swap 100 of tokenB tokenIn, tokenOut := s.swap("TokenB", "TokenA", 100) - // THEN swap should return 97 TokenB in and 13 TokenA out + // THEN swap should return ~99 BIGTokenB in and ~14 BIGTokenA out s.Assert().Equal("TokenB", tokenIn.Denom) s.Assert().Equal("TokenA", tokenOut.Denom) // NOTE: Given rounding for amountOut, amountIn does not use the full maxAmount - s.assertSwapOutput(tokenIn, 97, tokenOut, 13) - s.assertTickBalances(87, 97) + s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(99_999_998), tokenOut, sdkmath.NewInt(13_533_528)) + s.assertTickBalancesInt(sdkmath.NewInt(86_466_472), sdkmath.NewInt(99_999_998)) s.assertCurr0To1(-19_999) s.assertCurr1To0(-20_001) @@ -118,11 +118,11 @@ func (s *DexTestSuite) TestSwap0To1FillLPHighFee() { // WHEN swap 100 of tokenA tokenIn, tokenOut := s.swap("TokenA", "TokenB", 100) - // THEN swap should return 98 TokenA in and 12 TokenB out + // THEN swap should return ~99 BIGTokenA in and ~12 BIGTokenB out s.Assert().Equal("TokenA", tokenIn.Denom) s.Assert().Equal("TokenB", tokenOut.Denom) - s.assertSwapOutput(tokenIn, 98, tokenOut, 12) - s.assertTickBalances(98, 88) + s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(99_999_996), tokenOut, sdkmath.NewInt(12_246_928)) + s.assertTickBalancesInt(sdkmath.NewInt(99_999_996), sdkmath.NewInt(87_753_072)) s.assertCurr0To1(21_000) s.assertCurr1To0(19_000) @@ -135,11 +135,11 @@ func (s *DexTestSuite) TestSwap1To0FillLPHighFee() { // WHEN swap 100 of tokenB tokenIn, tokenOut := s.swap("TokenB", "TokenA", 100) - // THEN swap should return 100 TokenB in and 668 TokenA out + // THEN swap should return 100 BIGTokenB in and ~668 BIGTokenA out s.Assert().Equal("TokenB", tokenIn.Denom) s.Assert().Equal("TokenA", tokenOut.Denom) - s.assertSwapOutput(tokenIn, 100, tokenOut, 668) - s.assertTickBalances(332, 100) + s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(100_000_000), tokenOut, sdkmath.NewInt(668_525_935)) + s.assertTickBalancesInt(sdkmath.NewInt(331_474_065), sdkmath.NewInt(100_000_000)) s.assertCurr0To1(21_000) s.assertCurr1To0(19_000) @@ -156,11 +156,11 @@ func (s *DexTestSuite) TestSwap0To1PartialFillMultipleLP() { // WHEN swap 100 of tokenA tokenIn, tokenOut := s.swap("TokenA", "TokenB", 100) - // THEN swap should return 42 TokenA in and 300 TokenB out + // THEN swap should return ~40 BIGTokenA in and 300 TokenB out s.Assert().Equal("TokenA", tokenIn.Denom) s.Assert().Equal("TokenB", tokenOut.Denom) - s.assertSwapOutput(tokenIn, 42, tokenOut, 300) - s.assertTickBalances(42, 0) + s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(40_604_647), tokenOut, sdkmath.NewInt(300_000_000)) + s.assertTickBalancesInt(sdkmath.NewInt(40_604_647), sdkmath.ZeroInt()) s.assertCurr0To1(math.MaxInt64) s.assertCurr1To0(-20_001) @@ -177,11 +177,11 @@ func (s *DexTestSuite) TestSwap1To0PartialFillMultipleLP() { // WHEN swap 100 of tokenB tokenIn, tokenOut := s.swap("TokenB", "TokenA", 100) - // THEN swap should return 42 TokenB in and 300 TokenA out + // THEN swap should return ~41 BIGTokenB in and 300 BIGTokenA out s.Assert().Equal("TokenB", tokenIn.Denom) s.Assert().Equal("TokenA", tokenOut.Denom) - s.assertSwapOutput(tokenIn, 42, tokenOut, 300) - s.assertTickBalances(0, 42) + s.assertSwapOutputInt(tokenIn, sdk.NewInt(40604647), tokenOut, sdk.NewInt(300000000)) + s.assertTickBalancesInt(sdk.ZeroInt(), sdk.NewInt(40604647)) s.assertCurr0To1(20_001) s.assertCurr1To0(math.MinInt64) @@ -199,11 +199,11 @@ func (s *DexTestSuite) TestSwap0To1FillMultipleLP() { // WHEN swap 100 of tokenA tokenIn, tokenOut := s.swap("TokenA", "TokenB", 400) - // THEN swap should return 400 TokenA in and 400 TokenB out + // THEN swap should return ~399 BIGTokenA in and 400 BIGTokenB out s.Assert().Equal("TokenA", tokenIn.Denom) s.Assert().Equal("TokenB", tokenOut.Denom) - s.assertSwapOutput(tokenIn, 400, tokenOut, 400) - s.assertTickBalances(400, 0) + s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(399_180_884), tokenOut, sdkmath.NewInt(400_000_000)) + s.assertTickBalancesInt(sdkmath.NewInt(399_180_884), sdkmath.ZeroInt()) s.assertCurr0To1(math.MaxInt64) s.assertCurr1To0(-21) @@ -221,11 +221,11 @@ func (s *DexTestSuite) TestSwap1To0FillMultipleLP() { // WHEN swap 400 of tokenB tokenIn, tokenOut := s.swap("TokenB", "TokenA", 400) - // THEN swap should return 400 TokenB in and 400 TokenA out + // THEN swap should return 400 BIGTokenB in and ~400 BIGTokenA out s.Assert().Equal("TokenB", tokenIn.Denom) s.Assert().Equal("TokenA", tokenOut.Denom) - s.assertSwapOutput(tokenIn, 400, tokenOut, 400) - s.assertTickBalances(0, 400) + s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(399_180_884), tokenOut, sdkmath.NewInt(400_000_000)) + s.assertTickBalancesInt(sdkmath.ZeroInt(), sdkmath.NewInt(399_180_884)) s.assertCurr0To1(21) s.assertCurr1To0(math.MinInt64) @@ -238,9 +238,9 @@ func (s *DexTestSuite) TestSwap0To1LPMaxAmountUsed() { // WHEN swap 50 TokenA with maxOut of 5 tokenIn, tokenOut := s.swapWithMaxOut("TokenA", "TokenB", 50, 5) - // THEN swap should return 6 TokenA in and 5 TokenB out - s.assertSwapOutput(tokenIn, 6, tokenOut, 5) - s.assertTickBalances(6, 5) + // THEN swap should return ~5 BIGTokenA in and 5 BIGTokenB out + s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(5_000_500), tokenOut, sdkmath.NewInt(5_000_000)) + s.assertTickBalancesInt(sdkmath.NewInt(5_000_500), sdkmath.NewInt(5_000_000)) } func (s *DexTestSuite) TestSwap1To0LPMaxAmountUsed() { @@ -250,9 +250,9 @@ func (s *DexTestSuite) TestSwap1To0LPMaxAmountUsed() { // WHEN swap 50 TokenB with maxOut of 5 tokenIn, tokenOut := s.swapWithMaxOut("TokenB", "TokenA", 50, 5) - // THEN swap should return 6 TokenB in and 5 TokenA out - s.assertSwapOutput(tokenIn, 6, tokenOut, 5) - s.assertTickBalances(5, 6) + // THEN swap should return ~5 BIGTokenB in and 5 BIGTokenA out + s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(5_000_500), tokenOut, sdkmath.NewInt(5_000_000)) + s.assertTickBalancesInt(sdkmath.NewInt(5_000_000), sdkmath.NewInt(5_000_500)) } func (s *DexTestSuite) TestSwap0To1LPMaxAmountNotUsed() { @@ -262,9 +262,9 @@ func (s *DexTestSuite) TestSwap0To1LPMaxAmountNotUsed() { // WHEN swap 8 with maxOut of 15 tokenIn, tokenOut := s.swapWithMaxOut("TokenA", "TokenB", 8, 15) - // THEN swap should return 8 TokenA in and 7 TokenB out - s.assertSwapOutput(tokenIn, 8, tokenOut, 7) - s.assertTickBalances(8, 3) + // THEN swap should return 8 BIGTokenA in and ~8 BIGTokenB out + s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(8_000_000), tokenOut, sdkmath.NewInt(7_999_200)) + s.assertTickBalancesInt(sdkmath.NewInt(8_000_000), sdkmath.NewInt(20_00_800)) } func (s *DexTestSuite) TestSwap1To0LPMaxAmountNotUsed() { @@ -274,9 +274,9 @@ func (s *DexTestSuite) TestSwap1To0LPMaxAmountNotUsed() { // WHEN swap 8 with maxOut of 15 tokenIn, tokenOut := s.swapWithMaxOut("TokenB", "TokenA", 8, 15) - // THEN swap should return 8 TokenB in and 7 TokenA out - s.assertSwapOutput(tokenIn, 8, tokenOut, 7) - s.assertTickBalances(3, 8) + // THEN swap should return 8 BIGTokenB in and ~8 BIGTokenA out + s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(8_000_000), tokenOut, sdkmath.NewInt(7_999_200)) + s.assertTickBalancesInt(sdkmath.NewInt(2000800), sdkmath.NewInt(8_000_000)) } func (s *DexTestSuite) TestSwap0To1LPMaxAmountUsedMultiTick() { @@ -292,9 +292,9 @@ func (s *DexTestSuite) TestSwap0To1LPMaxAmountUsedMultiTick() { // WHEN swap 50 TokenA with maxOut of 20 tokenIn, tokenOut := s.swapWithMaxOut("TokenA", "TokenB", 50, 20) - // THEN swap should return 24 TokenA in and 20 TokenB out - s.assertSwapOutput(tokenIn, 24, tokenOut, 20) - s.assertTickBalances(24, 30) + // THEN swap should return ~20 BIGTokenA in and 20 BIGTokenB out + s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(20_005_003), tokenOut, sdkmath.NewInt(20_000_000)) + s.assertTickBalancesInt(sdkmath.NewInt(20_005_003), sdkmath.NewInt(30_000_000)) } func (s *DexTestSuite) TestSwap1To0LPMaxAmountUsedMultiTick() { @@ -310,9 +310,9 @@ func (s *DexTestSuite) TestSwap1To0LPMaxAmountUsedMultiTick() { // WHEN swap 50 TokenB with maxOut of 20 tokenIn, tokenOut := s.swapWithMaxOut("TokenB", "TokenA", 50, 20) - // THEN swap should return 20 TokenB in and 20 TokenA out - s.assertSwapOutput(tokenIn, 20, tokenOut, 20) - s.assertTickBalances(30, 20) + // THEN swap should return ~ 20 BIGTokenB in and 20 BIGTokenA out + s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(19_994_002), tokenOut, sdkmath.NewInt(20_000_000)) + s.assertTickBalancesInt(sdkmath.NewInt(30_000_000), sdkmath.NewInt(19_994_002)) } func (s *DexTestSuite) TestSwap0To1LPMaxAmountNotUsedMultiTick() { @@ -328,9 +328,9 @@ func (s *DexTestSuite) TestSwap0To1LPMaxAmountNotUsedMultiTick() { // WHEN swap 19 TokenA with maxOut of 20 tokenIn, tokenOut := s.swapWithMaxOut("TokenA", "TokenB", 19, 20) - // THEN swap should return 19 TokenA in and 15 TokenB out - s.assertSwapOutput(tokenIn, 18, tokenOut, 15) - s.assertTickBalances(18, 35) + // THEN swap should return 19 BIGTokenA in and 19 BIGTokenB out + s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(19_000_000), tokenOut, sdkmath.NewInt(18_995_399)) + s.assertTickBalancesInt(sdkmath.NewInt(19_000_000), sdkmath.NewInt(31_004_601)) } // swaps against LOs only ///////////////////////////////////////////////////// @@ -342,11 +342,11 @@ func (s *DexTestSuite) TestSwap0To1PartialFillLO() { // WHEN swap 20 of tokenA tokenIn, tokenOut := s.swap("TokenA", "TokenB", 20) - // THEN swap should return 12 TokenA in and 10 TokenB out + // THEN swap should return ~11 BIGTokenA in and 10 BIGTokenB out s.Assert().Equal("TokenA", tokenIn.Denom) s.Assert().Equal("TokenB", tokenOut.Denom) - s.assertSwapOutput(tokenIn, 12, tokenOut, 10) - s.assertTickBalances(12, 0) + s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(11_051_654), tokenOut, sdkmath.NewInt(10_000_000)) + s.assertTickBalancesInt(sdkmath.NewInt(11_051_654), sdkmath.ZeroInt()) } func (s *DexTestSuite) TestSwap1To0PartialFillLO() { @@ -356,11 +356,11 @@ func (s *DexTestSuite) TestSwap1To0PartialFillLO() { // WHEN swap 20 of tokenB tokenIn, tokenOut := s.swap("TokenB", "TokenA", 20) - // THEN swap should return 12 TokenB in and 10 TokenA out + // THEN swap should return ~11 BIGTokenB in and 10 BIGTokenA out s.Assert().Equal("TokenB", tokenIn.Denom) s.Assert().Equal("TokenA", tokenOut.Denom) - s.assertSwapOutput(tokenIn, 12, tokenOut, 10) - s.assertTickBalances(0, 12) + s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(11_051_654), tokenOut, sdkmath.NewInt(10_000_000)) + s.assertTickBalancesInt(sdkmath.ZeroInt(), sdkmath.NewInt(11_051_654)) s.assertCurr0To1(math.MaxInt64) s.assertCurr1To0(math.MinInt64) @@ -373,11 +373,11 @@ func (s *DexTestSuite) TestSwap0To1FillLO() { // WHEN swap 100 of tokenA tokenIn, tokenOut := s.swap("TokenA", "TokenB", 100) - // THEN swap should return 98 TokenA in and 36 TokenB out + // THEN swap should return ~99 BIGTokenA in and ~37 BIGTokenB out s.Assert().Equal("TokenA", tokenIn.Denom) s.Assert().Equal("TokenB", tokenOut.Denom) - s.assertSwapOutput(tokenIn, 98, tokenOut, 36) - s.assertTickBalances(98, 64) + s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(99_999_999), tokenOut, sdkmath.NewInt(36_789_783)) + s.assertTickBalancesInt(sdkmath.NewInt(99_999_999), sdkmath.NewInt(63_210_217)) s.assertCurr0To1(10_000) s.assertCurr1To0(math.MinInt64) @@ -390,11 +390,11 @@ func (s *DexTestSuite) TestSwap1To0FillLO() { // WHEN swap 10 of tokenB tokenIn, tokenOut := s.swap("TokenB", "TokenA", 10) - // THEN swap should return 9 TokenB in and 3 TokenA out + // THEN swap should return 10 BIGTokenB in and ~4 BIGTokenA out s.Assert().Equal("TokenB", tokenIn.Denom) s.Assert().Equal("TokenA", tokenOut.Denom) - s.assertSwapOutput(tokenIn, 9, tokenOut, 3) - s.assertTickBalances(97, 9) + s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(10_000_000), tokenOut, sdkmath.NewInt(3_678_978)) + s.assertTickBalancesInt(sdkmath.NewInt(96_321_022), sdkmath.NewInt(10_000_000)) s.assertCurr0To1(math.MaxInt64) s.assertCurr1To0(-10_000) @@ -409,11 +409,11 @@ func (s *DexTestSuite) TestSwap0To1FillMultipleLO() { // WHEN swap 300 of tokenA tokenIn, tokenOut := s.swap("TokenA", "TokenB", 300) - // THEN swap should return 300 TokenA in and 270 TokenB out + // THEN swap should return 300 BIGTokenA in and ~271 BIGTokenB out s.Assert().Equal("TokenA", tokenIn.Denom) s.Assert().Equal("TokenB", tokenOut.Denom) - s.assertSwapOutput(tokenIn, 300, tokenOut, 270) - s.assertTickBalances(300, 30) + s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(300_000_000), tokenOut, sdkmath.NewInt(271_428_295)) + s.assertTickBalancesInt(sdkmath.NewInt(300_000_000), sdkmath.NewInt(28_571_705)) s.assertCurr0To1(1_002) s.assertCurr1To0(math.MinInt64) @@ -428,11 +428,11 @@ func (s *DexTestSuite) TestSwap1To0FillMultipleLO() { // WHEN swap 300 of tokenB tokenIn, tokenOut := s.swap("TokenB", "TokenA", 300) - // THEN swap should return 300 TokenB in and 270 TokenB out + // THEN swap should return 300 BIGTokenB in and ~271 BIGTokenB out s.Assert().Equal("TokenB", tokenIn.Denom) s.Assert().Equal("TokenA", tokenOut.Denom) - s.assertSwapOutput(tokenIn, 300, tokenOut, 270) - s.assertTickBalances(30, 300) + s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(300_000_000), tokenOut, sdkmath.NewInt(271_428_295)) + s.assertTickBalancesInt(sdkmath.NewInt(28_571_705), sdkmath.NewInt(300_000_000)) s.assertCurr0To1(math.MaxInt64) s.assertCurr1To0(-1_002) @@ -445,9 +445,9 @@ func (s *DexTestSuite) TestSwap0To1LOMaxAmountUsed() { // WHEN swap 50 TokenA with maxOut of 5 tokenIn, tokenOut := s.swapWithMaxOut("TokenA", "TokenB", 50, 5) - // THEN swap should return 6 TokenA in and 5 TokenB out - s.assertSwapOutput(tokenIn, 6, tokenOut, 5) - s.assertTickBalances(6, 5) + // THEN swap should return ~5 BIGTokenA in and 5 BIGTokenB out + s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(5_000_500), tokenOut, sdkmath.NewInt(5_000_000)) + s.assertTickBalancesInt(sdkmath.NewInt(5_000_500), sdkmath.NewInt(5_000_000)) } func (s *DexTestSuite) TestSwap1To0LOMaxAmountUsed() { @@ -458,8 +458,8 @@ func (s *DexTestSuite) TestSwap1To0LOMaxAmountUsed() { tokenIn, tokenOut := s.swapWithMaxOut("TokenB", "TokenA", 50, 5) // THEN swap should return 5 TokenB in and 5 TokenA out - s.assertSwapOutput(tokenIn, 5, tokenOut, 5) - s.assertTickBalances(5, 5) + s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(5_000_000), tokenOut, sdkmath.NewInt(5_000_000)) + s.assertTickBalancesInt(sdkmath.NewInt(5_000_000), sdkmath.NewInt(5_000_000)) } func (s *DexTestSuite) TestSwap0To1LOMaxAmountNotUsed() { @@ -469,9 +469,9 @@ func (s *DexTestSuite) TestSwap0To1LOMaxAmountNotUsed() { // WHEN swap 8 with maxOut of 15 tokenIn, tokenOut := s.swapWithMaxOut("TokenA", "TokenB", 8, 15) - // THEN swap should return 8 TokenA in and 7 TokenB out - s.assertSwapOutput(tokenIn, 8, tokenOut, 7) - s.assertTickBalances(8, 3) + // THEN swap should return 8 BIGTokenA in and ~8 BIGTokenB out + s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(8_000_000), tokenOut, sdkmath.NewInt(7_999_200)) + s.assertTickBalancesInt(sdkmath.NewInt(8_000_000), sdkmath.NewInt(2_000_800)) } func (s *DexTestSuite) TestSwap1To0LOMaxAmountNotUsed() { @@ -481,9 +481,9 @@ func (s *DexTestSuite) TestSwap1To0LOMaxAmountNotUsed() { // WHEN swap 8 with maxOut of 15 tokenIn, tokenOut := s.swapWithMaxOut("TokenB", "TokenA", 8, 15) - // THEN swap should return 8 TokenB in and 8 TokenA out - s.assertSwapOutput(tokenIn, 8, tokenOut, 8) - s.assertTickBalances(2, 8) + // THEN swap should return 8 BIGTokenB in and ~8 BIGTokenA out + s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(8_000_000), tokenOut, sdkmath.NewInt(8_000_800)) + s.assertTickBalancesInt(sdkmath.NewInt(1_999_200), sdkmath.NewInt(8_000_000)) } func (s *DexTestSuite) TestSwap0To1LOMaxAmountUsedMultiTick() { @@ -497,9 +497,9 @@ func (s *DexTestSuite) TestSwap0To1LOMaxAmountUsedMultiTick() { // WHEN swap 50 TokenA with maxOut of 20 tokenIn, tokenOut := s.swapWithMaxOut("TokenA", "TokenB", 50, 20) - // THEN swap should return 23 TokenA in and 20 TokenB out - s.assertSwapOutput(tokenIn, 23, tokenOut, 20) - s.assertTickBalances(23, 30) + // THEN swap should return ~20 BIGTokenA in and 20 TokenB out + s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(20_003_002), tokenOut, sdkmath.NewInt(20_000_000)) + s.assertTickBalancesInt(sdkmath.NewInt(20_003_002), sdkmath.NewInt(30_000_000)) } func (s *DexTestSuite) TestSwap1To0LOMaxAmountUsedMultiTick() { @@ -513,9 +513,9 @@ func (s *DexTestSuite) TestSwap1To0LOMaxAmountUsedMultiTick() { // WHEN swap 50 TokenB with maxOut of 20 tokenIn, tokenOut := s.swapWithMaxOut("TokenB", "TokenA", 50, 20) - // THEN swap should return 20 TokenB in and 20 TokenA out - s.assertSwapOutput(tokenIn, 20, tokenOut, 20) - s.assertTickBalances(30, 20) + // THEN swap should return ~20 BIGTokenB in and 20 BIGTokenA out + s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(19_992_002), tokenOut, sdkmath.NewInt(20_000_000)) + s.assertTickBalancesInt(sdkmath.NewInt(30_000_000), sdkmath.NewInt(19_992_002)) } func (s *DexTestSuite) TestSwap0To1LOMaxAmountNotUsedMultiTick() { @@ -529,9 +529,9 @@ func (s *DexTestSuite) TestSwap0To1LOMaxAmountNotUsedMultiTick() { // WHEN swap 19 TokenA with maxOut of 20 tokenIn, tokenOut := s.swapWithMaxOut("TokenA", "TokenB", 19, 20) - // THEN swap should return 19 TokenA in and 16 TokenB out - s.assertSwapOutput(tokenIn, 19, tokenOut, 16) - s.assertTickBalances(19, 34) + // THEN swap should return 19 BIGTokenA in and ~19 BIGTokenB out + s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(19_000_000), tokenOut, sdkmath.NewInt(18_997_299)) + s.assertTickBalancesInt(sdkmath.NewInt(19_000_000), sdkmath.NewInt(31_002_701)) } // Swap LO and LP //////////////////////////////////////////////////////////// @@ -579,7 +579,7 @@ func (s *DexTestSuite) placeGTCLimitOrder( types.LimitOrderType_GOOD_TIL_CANCELLED, ) s.Assert().NoError(err) - tranche.PlaceMakerLimitOrder(sdkmath.NewInt(amountIn)) + tranche.PlaceMakerLimitOrder(sdkmath.NewInt(amountIn).Mul(denomMultiple)) s.App.DexKeeper.SaveTranche(s.Ctx, tranche) } @@ -593,7 +593,7 @@ func (s *DexTestSuite) swap( coinIn, coinOut, _, err = s.App.DexKeeper.Swap( s.Ctx, tradePairID, - sdkmath.NewInt(maxAmountIn), + sdkmath.NewInt(maxAmountIn).Mul(denomMultiple), nil, nil, ) @@ -608,11 +608,11 @@ func (s *DexTestSuite) swapWithMaxOut( maxAmountOut int64, ) (coinIn, coinOut sdk.Coin) { tradePairID := types.MustNewTradePairID(tokenIn, tokenOut) - maxAmountOutInt := sdkmath.NewInt(maxAmountOut) + maxAmountOutInt := sdkmath.NewInt(maxAmountOut).Mul(denomMultiple) coinIn, coinOut, _, err := s.App.DexKeeper.Swap( s.Ctx, tradePairID, - sdkmath.NewInt(maxAmountIn), + sdkmath.NewInt(maxAmountIn).Mul(denomMultiple), &maxAmountOutInt, nil, ) @@ -621,27 +621,36 @@ func (s *DexTestSuite) swapWithMaxOut( return coinIn, coinOut } -func (s *DexTestSuite) assertSwapOutput( +func (s *DexTestSuite) assertSwapOutputInt( actualIn sdk.Coin, - expectedIn int64, + expectedIn sdkmath.Int, actualOut sdk.Coin, - expectedOut int64, + expectedOut sdkmath.Int, ) { amtIn := actualIn.Amount amtOut := actualOut.Amount s.Assert(). - True(amtIn.Equal(sdkmath.NewInt(expectedIn)), "Expected amountIn %d != %s", expectedIn, amtIn) + True(amtIn.Equal(expectedIn), "Expected amountIn %s != %s", expectedIn, amtIn) s.Assert(). - True(amtOut.Equal(sdkmath.NewInt(expectedOut)), "Expected amountOut %d != %s", expectedOut, amtOut) + True(amtOut.Equal(expectedOut), "Expected amountOut %s != %s", expectedOut, amtOut) } -func (s *DexTestSuite) assertTickBalances(expectedABalance, expectedBBalance int64) { +func (s *DexTestSuite) assertSwapOutput( + actualIn sdk.Coin, + expectedIn int64, + actualOut sdk.Coin, + expectedOut int64, +) { + expectedInInt := sdkmath.NewInt(expectedIn).Mul(denomMultiple) + expectedOutInt := sdkmath.NewInt(expectedOut).Mul(denomMultiple) + s.assertSwapOutputInt(actualIn, expectedInInt, actualOut, expectedOutInt) +} + +func (s *DexTestSuite) assertTickBalancesInt(expectedABalance, expectedBBalance sdkmath.Int) { // NOTE: We can't just check the actual DEX bank balances since we are testing swap // before any transfers take place. Instead we have to sum up the total amount of coins // at each tick - expectedAInt := sdkmath.NewInt(expectedABalance) - expectedBInt := sdkmath.NewInt(expectedBBalance) allCoins := sdk.Coins{} ticks := s.App.DexKeeper.GetAllTickLiquidity(s.Ctx) inactiveLOs := s.App.DexKeeper.GetAllInactiveLimitOrderTranche(s.Ctx) @@ -674,7 +683,16 @@ func (s *DexTestSuite) assertTickBalances(expectedABalance, expectedBBalance int actualB := allCoins.AmountOf("TokenB") s.Assert(). - True(actualA.Equal(expectedAInt), "TokenA: expected %s != actual %s", expectedAInt, actualA) + True(actualA.Equal(expectedABalance), "TokenA: expected %s != actual %s", expectedABalance, actualA) s.Assert(). - True(actualB.Equal(expectedBInt), "TokenB: expected %s != actual %s", expectedBInt, actualB) + True(actualB.Equal(expectedBBalance), "TokenB: expected %s != actual %s", expectedBBalance, actualB) +} + +func (s *DexTestSuite) assertTickBalances(expectedABalance, expectedBBalance int64) { + // NOTE: We can't just check the actual DEX bank balances since we are testing swap + // before any transfers take place. Instead we have to sum up the total amount of coins + // at each tick + expectedAInt := sdkmath.NewInt(expectedABalance).Mul(denomMultiple) + expectedBInt := sdkmath.NewInt(expectedBBalance).Mul(denomMultiple) + s.assertTickBalancesInt(expectedAInt, expectedBInt) } diff --git a/x/dex/keeper/msg_server_test.go b/x/dex/keeper/msg_server_test.go index f6dd8b43c..387bf9b64 100644 --- a/x/dex/keeper/msg_server_test.go +++ b/x/dex/keeper/msg_server_test.go @@ -18,7 +18,7 @@ import ( "github.com/stretchr/testify/suite" ) -// / Test suite +// Test suite type DexTestSuite struct { apptesting.KeeperTestHelper msgServer types.MsgServer @@ -30,6 +30,8 @@ type DexTestSuite struct { var defaultPairID *types.PairID = &types.PairID{Token0: "TokenA", Token1: "TokenB"} +var denomMultiple = sdk.NewInt(1000000) + var defaultTradePairID0To1 *types.TradePairID = &types.TradePairID{ TakerDenom: "TokenA", MakerDenom: "TokenB", @@ -55,11 +57,22 @@ func (s *DexTestSuite) SetupTest() { s.msgServer = NewMsgServerImpl(s.App.DexKeeper) } -/// Fund accounts +// NOTE: In order to simulate more realistic trade volume and avoid inadvertent failures due to ErrInvalidPositionSpread +// all of the basic user operations (fundXXXBalance, assertXXXBalance, XXXLimitsSells, etc.) treat TokenA and TokenB +// as BIG tokens with an exponent of 6. Ie. fundAliceBalance(10, 10) funds alices account with 10,000,000 small TokenA and TokenB. +// For tests requiring more accuracy methods that take Ints (ie. assertXXXAccountBalancesInt, NewWithdrawlInt) are used +// and assume that amount are being provided in terms of small tokens. + +// Example: +// s.fundAliceBalances(10, 10) +// s.assertAliceBalances(10, 10) ==> True +// s.assertAliceBalancesInt(sdkmath.NewInt(10_000_000), sdkmath.NewInt(10_000_000)) ==> true + +// Fund accounts func (s *DexTestSuite) fundAccountBalances(account sdk.AccAddress, aBalance, bBalance int64) { - aBalanceInt := sdkmath.NewInt(aBalance) - bBalanceInt := sdkmath.NewInt(bBalance) + aBalanceInt := sdkmath.NewInt(aBalance).Mul(denomMultiple) + bBalanceInt := sdkmath.NewInt(bBalance).Mul(denomMultiple) balances := sdk.NewCoins(NewACoin(aBalanceInt), NewBCoin(bBalanceInt)) FundAccount(s.App.BankKeeper, s.Ctx, account, balances) @@ -70,13 +83,7 @@ func (s *DexTestSuite) fundAccountBalancesWithDenom( addr sdk.AccAddress, amounts sdk.Coins, ) { - if err := s.App.BankKeeper.MintCoins(s.Ctx, types.ModuleName, amounts); err != nil { - panic(err) - } - - if err := s.App.BankKeeper.SendCoinsFromModuleToAccount(s.Ctx, types.ModuleName, addr, amounts); err != nil { - panic(err) - } + FundAccount(s.App.BankKeeper, s.Ctx, addr, amounts) } func (s *DexTestSuite) fundAliceBalances(a, b int64) { @@ -114,18 +121,26 @@ func (s *DexTestSuite) assertAccountBalances( aBalance int64, bBalance int64, ) { - s.assertAccountBalancesInt(account, sdkmath.NewInt(aBalance), sdkmath.NewInt(bBalance)) + s.assertAccountBalancesInt(account, sdkmath.NewInt(aBalance).Mul(denomMultiple), sdkmath.NewInt(bBalance).Mul(denomMultiple)) } -func (s *DexTestSuite) assertAccountBalanceWithDenom( +func (s *DexTestSuite) assertAccountBalanceWithDenomInt( account sdk.AccAddress, denom string, - expBalance int64, + expBalance sdkmath.Int, ) { actualBalance := s.App.BankKeeper.GetBalance(s.Ctx, account, denom).Amount - expBalanceInt := sdkmath.NewInt(expBalance) s.Assert(). - True(expBalanceInt.Equal(actualBalance), "expected %s != actual %s", expBalance, actualBalance) + True(expBalance.Equal(actualBalance), "expected %s != actual %s", expBalance, actualBalance) +} + +func (s *DexTestSuite) assertAccountBalanceWithDenom( + account sdk.AccAddress, + denom string, + expBalance int64, +) { + expBalanceInt := sdkmath.NewInt(expBalance).Mul(denomMultiple) + s.assertAccountBalanceWithDenomInt(account, denom, expBalanceInt) } func (s *DexTestSuite) assertAliceBalances(a, b int64) { @@ -164,6 +179,10 @@ func (s *DexTestSuite) assertDexBalances(a, b int64) { s.assertAccountBalances(s.App.AccountKeeper.GetModuleAddress("dex"), a, b) } +func (s *DexTestSuite) assertDexBalancesInt(a, b sdkmath.Int) { + s.assertAccountBalancesInt(s.App.AccountKeeper.GetModuleAddress("dex"), a, b) +} + func (s *DexTestSuite) assertDexBalanceWithDenom(denom string, expectedAmount int64) { s.assertAccountBalanceWithDenom( s.App.AccountKeeper.GetModuleAddress("dex"), @@ -172,8 +191,12 @@ func (s *DexTestSuite) assertDexBalanceWithDenom(denom string, expectedAmount in ) } -func (s *DexTestSuite) assertDexBalancesInt(a, b sdkmath.Int) { - s.assertAccountBalancesInt(s.App.AccountKeeper.GetModuleAddress("dex"), a, b) +func (s *DexTestSuite) assertDexBalanceWithDenomInt(denom string, expectedAmount sdkmath.Int) { + s.assertAccountBalanceWithDenomInt( + s.App.AccountKeeper.GetModuleAddress("dex"), + denom, + expectedAmount, + ) } func (s *DexTestSuite) traceBalances() { @@ -353,7 +376,7 @@ func (s *DexTestSuite) limitSellsWithMaxOut( maxAmoutOut int, ) string { tokenIn, tokenOut := GetInOutTokens(tokenIn, "TokenA", "TokenB") - maxAmountOutInt := sdkmath.NewInt(int64(maxAmoutOut)) + maxAmountOutInt := sdkmath.NewInt(int64(maxAmoutOut)).Mul(denomMultiple) msg, err := s.msgServer.PlaceLimitOrder(s.GoCtx, &types.MsgPlaceLimitOrder{ Creator: account.String(), @@ -361,7 +384,7 @@ func (s *DexTestSuite) limitSellsWithMaxOut( TokenIn: tokenIn, TokenOut: tokenOut, TickIndexInToOut: int64(tick), - AmountIn: sdkmath.NewInt(int64(amountIn)), + AmountIn: sdkmath.NewInt(int64(amountIn)).Mul(denomMultiple), OrderType: types.LimitOrderType_FILL_OR_KILL, MaxAmountOut: &maxAmountOutInt, }) @@ -392,7 +415,7 @@ func (s *DexTestSuite) limitSells( TokenIn: tradePairID.TakerDenom, TokenOut: tradePairID.MakerDenom, TickIndexInToOut: tickIndexTakerToMaker, - AmountIn: sdkmath.NewInt(int64(amountIn)), + AmountIn: sdkmath.NewInt(int64(amountIn)).Mul(denomMultiple), OrderType: orderType, }) @@ -414,7 +437,7 @@ func (s *DexTestSuite) limitSellsGoodTil( TokenIn: tradePairID.TakerDenom, TokenOut: tradePairID.MakerDenom, TickIndexInToOut: tickIndexTakerToMaker, - AmountIn: sdkmath.NewInt(int64(amountIn)), + AmountIn: sdkmath.NewInt(int64(amountIn)).Mul(denomMultiple), OrderType: types.LimitOrderType_GOOD_TIL_TIME, ExpirationTime: &goodTil, }) @@ -446,8 +469,8 @@ type DepositWithOptions struct { func NewDeposit(amountA, amountB, tickIndex, fee int) *Deposit { return &Deposit{ - AmountA: sdkmath.NewInt(int64(amountA)), - AmountB: sdkmath.NewInt(int64(amountB)), + AmountA: sdkmath.NewInt(int64(amountA)).Mul(denomMultiple), + AmountB: sdkmath.NewInt(int64(amountB)).Mul(denomMultiple), TickIndex: int64(tickIndex), Fee: uint64(fee), } @@ -458,8 +481,8 @@ func NewDepositWithOptions( options DepositOptions, ) *DepositWithOptions { return &DepositWithOptions{ - AmountA: sdkmath.NewInt(int64(amountA)), - AmountB: sdkmath.NewInt(int64(amountB)), + AmountA: sdkmath.NewInt(int64(amountA)).Mul(denomMultiple), + AmountB: sdkmath.NewInt(int64(amountB)).Mul(denomMultiple), TickIndex: int64(tickIndex), Fee: uint64(fee), Options: options, @@ -677,8 +700,9 @@ func NewWithdrawalInt(shares sdkmath.Int, tick int64, fee uint64) *Withdrawal { } } +// Multiples amount of shares to represent BIGtoken with exponent 6 func NewWithdrawal(shares, tick int64, fee uint64) *Withdrawal { - return NewWithdrawalInt(sdkmath.NewInt(shares), tick, fee) + return NewWithdrawalInt(sdkmath.NewInt(shares).Mul(denomMultiple), tick, fee) } func (s *DexTestSuite) aliceWithdraws(withdrawals ...*Withdrawal) { @@ -865,7 +889,7 @@ func (s *DexTestSuite) multiHopSwaps( account.String(), account.String(), routes, - sdkmath.NewInt(int64(amountIn)), + sdkmath.NewInt(int64(amountIn)).Mul(denomMultiple), exitLimitPrice, pickBest, ) @@ -887,7 +911,7 @@ func (s *DexTestSuite) aliceEstimatesMultiHopSwap( Creator: s.alice.String(), Receiver: s.alice.String(), Routes: multiHopRoutes, - AmountIn: sdkmath.NewInt(int64(amountIn)), + AmountIn: sdkmath.NewInt(int64(amountIn)).Mul(denomMultiple), ExitLimitPrice: exitLimitPrice, PickBestRoute: pickBest, } @@ -911,7 +935,7 @@ func (s *DexTestSuite) aliceEstimatesMultiHopSwapFails( Creator: s.alice.String(), Receiver: s.alice.String(), Routes: multiHopRoutes, - AmountIn: sdkmath.NewInt(int64(amountIn)), + AmountIn: sdkmath.NewInt(int64(amountIn)).Mul(denomMultiple), ExitLimitPrice: exitLimitPrice, PickBestRoute: pickBest, } @@ -971,7 +995,7 @@ func (s *DexTestSuite) multiHopSwapFails( account.String(), account.String(), routes, - sdkmath.NewInt(int64(amountIn)), + sdkmath.NewInt(int64(amountIn)).Mul(denomMultiple), exitLimitPrice, pickBest, ) @@ -1053,7 +1077,7 @@ func (s *DexTestSuite) assertPoolShares( fee uint64, sharesExpected uint64, ) { - sharesExpectedInt := sdkmath.NewIntFromUint64(sharesExpected) + sharesExpectedInt := sdkmath.NewIntFromUint64(sharesExpected).Mul(denomMultiple) sharesOwned := s.getPoolShares("TokenA", "TokenB", tick, fee) s.Assert().Equal(sharesExpectedInt, sharesOwned) } @@ -1074,16 +1098,25 @@ func (s *DexTestSuite) getAccountShares( return s.App.BankKeeper.GetBalance(s.Ctx, account, poolDenom).Amount } -func (s *DexTestSuite) assertAccountShares( +func (s *DexTestSuite) assertAccountSharesInt( account sdk.AccAddress, tick int64, fee uint64, - sharesExpected uint64, + sharesExpected sdkmath.Int, ) { - sharesExpectedInt := sdkmath.NewIntFromUint64(sharesExpected) sharesOwned := s.getAccountShares(account, "TokenA", "TokenB", tick, fee) s.Assert(). - Equal(sharesExpectedInt, sharesOwned, "expected %s != actual %s", sharesExpected, sharesOwned) + Equal(sharesExpected, sharesOwned, "expected %s != actual %s", sharesExpected, sharesOwned) +} + +func (s *DexTestSuite) assertAccountShares( + account sdk.AccAddress, + tick int64, + fee uint64, + sharesExpected uint64, +) { + sharesExpectedInt := sdkmath.NewIntFromUint64(sharesExpected).Mul(denomMultiple) + s.assertAccountSharesInt(account, tick, fee, sharesExpectedInt) } func (s *DexTestSuite) assertAliceShares(tick int64, fee, sharesExpected uint64) { @@ -1136,7 +1169,7 @@ func (s *DexTestSuite) assertCurr1To0(curr1To0Expected int64) { } // Pool liquidity (i.e. deposited rather than LO) -func (s *DexTestSuite) assertLiquidityAtTick( +func (s *DexTestSuite) assertLiquidityAtTickInt( amountA, amountB sdkmath.Int, tickIndex int64, fee uint64, @@ -1148,7 +1181,17 @@ func (s *DexTestSuite) assertLiquidityAtTick( True(amountB.Equal(liquidityB), "liquidity B: actual %s, expected %s", liquidityB, amountB) } -func (s *DexTestSuite) assertLiquidityAtTickWithDenom( +func (s *DexTestSuite) assertLiquidityAtTick( + amountA, amountB int64, + tickIndex int64, + fee uint64, +) { + amountAInt := sdkmath.NewInt(amountA).Mul(denomMultiple) + amountBInt := sdkmath.NewInt(amountB).Mul(denomMultiple) + s.assertLiquidityAtTickInt(amountAInt, amountBInt, tickIndex, fee) +} + +func (s *DexTestSuite) assertLiquidityAtTickWithDenomInt( pairID *types.PairID, expected0, expected1 sdkmath.Int, tickIndex int64, @@ -1161,16 +1204,28 @@ func (s *DexTestSuite) assertLiquidityAtTickWithDenom( True(expected1.Equal(liquidity1), "liquidity 1: actual %s, expected %s", liquidity1, expected1) } +func (s *DexTestSuite) assertLiquidityAtTickWithDenom( + pairID *types.PairID, + expected0, + expected1, + tickIndex int64, + fee uint64, +) { + expected0Int := sdkmath.NewInt(expected0).Mul(denomMultiple) + expected1Int := sdkmath.NewInt(expected1).Mul(denomMultiple) + s.assertLiquidityAtTickWithDenomInt(pairID, expected0Int, expected1Int, tickIndex, fee) +} + func (s *DexTestSuite) assertPoolLiquidity( - amountA, amountB int, + amountA, amountB int64, tickIndex int64, fee uint64, ) { - s.assertLiquidityAtTick(sdkmath.NewInt(int64(amountA)), sdkmath.NewInt(int64(amountB)), tickIndex, fee) + s.assertLiquidityAtTick(amountA, amountB, tickIndex, fee) } func (s *DexTestSuite) assertNoLiquidityAtTick(tickIndex int64, fee uint64) { - s.assertLiquidityAtTick(sdkmath.ZeroInt(), sdkmath.ZeroInt(), tickIndex, fee) + s.assertLiquidityAtTick(0, 0, tickIndex, fee) } // Filled limit liquidity @@ -1227,7 +1282,7 @@ func (s *DexTestSuite) assertLimitFilledAtTickAtIndex( ) userRatio := math_utils.NewPrecDecFromInt(userShares).QuoInt(totalShares) filled := s.getLimitFilledLiquidityAtTickAtIndex(selling, tickIndex, trancheKey) - amt := sdkmath.NewInt(int64(amount)) + amt := sdkmath.NewInt(int64(amount)).Mul(denomMultiple) userFilled := userRatio.MulInt(filled).RoundInt() s.Assert().True(amt.Equal(userFilled)) } @@ -1291,6 +1346,7 @@ func (s *DexTestSuite) assertLimitLiquidityAtTickInt( tickIndexNormalized int64, amount sdkmath.Int, ) { + amount = amount.Mul(denomMultiple) tradePairID := defaultPairID.MustTradePairIDFromMaker(selling) tickIndexTakerToMaker := tradePairID.TickIndexTakerToMaker(tickIndexNormalized) tranches := s.App.DexKeeper.GetAllLimitOrderTrancheAtIndex( @@ -1436,19 +1492,12 @@ func (s *DexTestSuite) calcAutoswapSharesMinted( fee uint64, residual0, residual1, balanced0, balanced1, totalShares, valuePool int64, ) sdkmath.Int { - residual0Int, residual1Int, balanced0Int, balanced1Int, totalSharesInt, valuePoolInt := sdkmath.NewInt( - residual0, - ), sdkmath.NewInt( - residual1, - ), sdkmath.NewInt( - balanced0, - ), sdkmath.NewInt( - balanced1, - ), sdkmath.NewInt( - totalShares, - ), sdkmath.NewInt( - valuePool, - ) + residual0Int, residual1Int, balanced0Int, balanced1Int, totalSharesInt, valuePoolInt := sdkmath.NewInt(residual0), + sdkmath.NewInt(residual1), + sdkmath.NewInt(balanced0), + sdkmath.NewInt(balanced1), + sdkmath.NewInt(totalShares), + sdkmath.NewInt(valuePool) // residualValue = 1.0001^-f * residualAmount0 + 1.0001^{i-f} * residualAmount1 // balancedValue = balancedAmount0 + 1.0001^{i} * balancedAmount1 diff --git a/x/dex/keeper/pool_test.go b/x/dex/keeper/pool_test.go index 14d0bb05e..527b53ea8 100644 --- a/x/dex/keeper/pool_test.go +++ b/x/dex/keeper/pool_test.go @@ -31,7 +31,7 @@ func TestPoolInit(t *testing.T) { pool, err := keeper.InitPool(ctx, defaultPairID, 0, 1) require.NoError(t, err) - pool.Deposit(math.NewInt(100), math.NewInt(100), math.NewInt(0), true) + pool.Deposit(math.NewInt(1000), math.NewInt(1000), math.NewInt(0), true) keeper.SetPool(ctx, pool) dbPool, found := keeper.GetPool(ctx, defaultPairID, 0, 1) diff --git a/x/incentives/keeper/distribute_test.go b/x/incentives/keeper/distribute_test.go index d97ab4342..656ed771d 100644 --- a/x/incentives/keeper/distribute_test.go +++ b/x/incentives/keeper/distribute_test.go @@ -39,8 +39,8 @@ func (suite *IncentivesTestSuite) TestValueForShares() { deposits: []depositSpec{ { addr: addrs[0], - token0: sdk.NewInt64Coin("TokenA", 10), - token1: sdk.NewInt64Coin("TokenB", 10), + token0: sdk.NewInt64Coin("TokenA", 1000), + token1: sdk.NewInt64Coin("TokenB", 1000), tick: 0, fee: 1, }, @@ -54,8 +54,8 @@ func (suite *IncentivesTestSuite) TestValueForShares() { deposits: []depositSpec{ { addr: addrs[0], - token0: sdk.NewInt64Coin("TokenA", 10), - token1: sdk.NewInt64Coin("TokenB", 10), + token0: sdk.NewInt64Coin("TokenA", 1000), + token1: sdk.NewInt64Coin("TokenB", 1000), tick: 0, fee: 1, }, @@ -69,15 +69,15 @@ func (suite *IncentivesTestSuite) TestValueForShares() { deposits: []depositSpec{ { addr: addrs[0], - token0: sdk.NewInt64Coin("TokenA", 10), - token1: sdk.NewInt64Coin("TokenB", 10), + token0: sdk.NewInt64Coin("TokenA", 1000), + token1: sdk.NewInt64Coin("TokenB", 1000), tick: 0, fee: 1, }, { addr: addrs[0], - token0: sdk.NewInt64Coin("TokenA", 10), - token1: sdk.NewInt64Coin("TokenB", 10), + token0: sdk.NewInt64Coin("TokenA", 1000), + token1: sdk.NewInt64Coin("TokenB", 1000), tick: 0, fee: 2, }, @@ -91,15 +91,15 @@ func (suite *IncentivesTestSuite) TestValueForShares() { deposits: []depositSpec{ { addr: addrs[0], - token0: sdk.NewInt64Coin("TokenA", 10), - token1: sdk.NewInt64Coin("TokenB", 10), + token0: sdk.NewInt64Coin("TokenA", 1000), + token1: sdk.NewInt64Coin("TokenB", 1000), tick: 0, fee: 1, }, { addr: addrs[0], - token0: sdk.NewInt64Coin("TokenA", 10), - token1: sdk.NewInt64Coin("TokenB", 10), + token0: sdk.NewInt64Coin("TokenA", 1000), + token1: sdk.NewInt64Coin("TokenB", 1000), tick: 0, fee: 1, }, @@ -142,8 +142,8 @@ func (suite *IncentivesTestSuite) TestDistribute() { depositSpecs: []depositSpec{ { addr: addrs[0], - token0: sdk.NewInt64Coin("TokenA", 10), - token1: sdk.NewInt64Coin("TokenB", 10), + token0: sdk.NewInt64Coin("TokenA", 1000), + token1: sdk.NewInt64Coin("TokenB", 1000), tick: 0, fee: 1, }, @@ -154,8 +154,8 @@ func (suite *IncentivesTestSuite) TestDistribute() { depositSpecs: []depositSpec{ { addr: addrs[1], - token0: sdk.NewInt64Coin("TokenA", 10), - token1: sdk.NewInt64Coin("TokenB", 10), + token0: sdk.NewInt64Coin("TokenA", 1000), + token1: sdk.NewInt64Coin("TokenB", 1000), tick: 0, fee: 1, }, @@ -166,8 +166,8 @@ func (suite *IncentivesTestSuite) TestDistribute() { depositSpecs: []depositSpec{ { addr: addrs[1], - token0: sdk.NewInt64Coin("TokenA", 10), - token1: sdk.NewInt64Coin("TokenB", 10), + token0: sdk.NewInt64Coin("TokenA", 1000), + token1: sdk.NewInt64Coin("TokenB", 1000), tick: 0, fee: 1, }, @@ -197,8 +197,8 @@ func (suite *IncentivesTestSuite) TestDistribute() { depositSpecs: []depositSpec{ { addr: addrs[0], - token0: sdk.NewInt64Coin("TokenA", 10), - token1: sdk.NewInt64Coin("TokenB", 10), + token0: sdk.NewInt64Coin("TokenA", 1000), + token1: sdk.NewInt64Coin("TokenB", 1000), tick: 0, fee: 1, }, @@ -209,8 +209,8 @@ func (suite *IncentivesTestSuite) TestDistribute() { depositSpecs: []depositSpec{ { addr: addrs[1], - token0: sdk.NewInt64Coin("TokenA", 10), - token1: sdk.NewInt64Coin("TokenB", 10), + token0: sdk.NewInt64Coin("TokenA", 1000), + token1: sdk.NewInt64Coin("TokenB", 1000), tick: 0, fee: 1, }, @@ -221,8 +221,8 @@ func (suite *IncentivesTestSuite) TestDistribute() { depositSpecs: []depositSpec{ { addr: addrs[1], - token0: sdk.NewInt64Coin("TokenA", 10), - token1: sdk.NewInt64Coin("TokenB", 10), + token0: sdk.NewInt64Coin("TokenA", 1000), + token1: sdk.NewInt64Coin("TokenB", 1000), tick: 0, fee: 1, }, @@ -233,8 +233,8 @@ func (suite *IncentivesTestSuite) TestDistribute() { depositSpecs: []depositSpec{ { addr: addrs[0], - token0: sdk.NewInt64Coin("TokenA", 10), - token1: sdk.NewInt64Coin("TokenB", 10), + token0: sdk.NewInt64Coin("TokenA", 1000), + token1: sdk.NewInt64Coin("TokenB", 1000), tick: 0, fee: 1, }, @@ -272,8 +272,8 @@ func (suite *IncentivesTestSuite) TestDistribute() { depositSpecs: []depositSpec{ { addr: addrs[0], - token0: sdk.NewInt64Coin("TokenA", 10), - token1: sdk.NewInt64Coin("TokenB", 10), + token0: sdk.NewInt64Coin("TokenA", 1000), + token1: sdk.NewInt64Coin("TokenB", 1000), tick: 999, fee: 1, }, @@ -284,8 +284,8 @@ func (suite *IncentivesTestSuite) TestDistribute() { depositSpecs: []depositSpec{ { addr: addrs[1], - token0: sdk.NewInt64Coin("TokenA", 10), - token1: sdk.NewInt64Coin("TokenB", 10), + token0: sdk.NewInt64Coin("TokenA", 1000), + token1: sdk.NewInt64Coin("TokenB", 1000), tick: 999, fee: 1, }, @@ -296,8 +296,8 @@ func (suite *IncentivesTestSuite) TestDistribute() { depositSpecs: []depositSpec{ { addr: addrs[1], - token0: sdk.NewInt64Coin("TokenA", 10), - token1: sdk.NewInt64Coin("TokenB", 10), + token0: sdk.NewInt64Coin("TokenA", 1000), + token1: sdk.NewInt64Coin("TokenB", 1000), tick: 999, fee: 50, }, @@ -308,8 +308,8 @@ func (suite *IncentivesTestSuite) TestDistribute() { depositSpecs: []depositSpec{ { addr: addrs[1], - token0: sdk.NewInt64Coin("TokenA", 10), - token1: sdk.NewInt64Coin("TokenB", 10), + token0: sdk.NewInt64Coin("TokenA", 1000), + token1: sdk.NewInt64Coin("TokenB", 1000), tick: 999, fee: 50, }, diff --git a/x/incentives/keeper/gauge_test.go b/x/incentives/keeper/gauge_test.go index 00b4970b1..ac8ae4396 100644 --- a/x/incentives/keeper/gauge_test.go +++ b/x/incentives/keeper/gauge_test.go @@ -23,8 +23,8 @@ func (suite *IncentivesTestSuite) TestGaugeLifecycle() { depositSpecs: []depositSpec{ { addr: addr0, - token0: sdk.NewInt64Coin("TokenA", 10), - token1: sdk.NewInt64Coin("TokenB", 10), + token0: sdk.NewInt64Coin("TokenA", 1000), + token1: sdk.NewInt64Coin("TokenB", 1000), tick: 0, fee: 1, }, @@ -121,8 +121,8 @@ func (suite *IncentivesTestSuite) TestGaugeLimit() { depositSpecs: []depositSpec{ { addr: addr0, - token0: sdk.NewInt64Coin("TokenA", 10), - token1: sdk.NewInt64Coin("TokenB", 10), + token0: sdk.NewInt64Coin("TokenA", 1000), + token1: sdk.NewInt64Coin("TokenB", 1000), tick: 0, fee: 1, }, @@ -187,8 +187,8 @@ func (suite *IncentivesTestSuite) TestGaugeCreateFails() { depositSpecs: []depositSpec{ { addr: addrs[0], - token0: sdk.NewInt64Coin("TokenA", 10), - token1: sdk.NewInt64Coin("TokenB", 10), + token0: sdk.NewInt64Coin("TokenA", 1000), + token1: sdk.NewInt64Coin("TokenB", 1000), tick: 999, fee: 1, }, @@ -199,8 +199,8 @@ func (suite *IncentivesTestSuite) TestGaugeCreateFails() { depositSpecs: []depositSpec{ { addr: addrs[1], - token0: sdk.NewInt64Coin("TokenA", 10), - token1: sdk.NewInt64Coin("TokenB", 10), + token0: sdk.NewInt64Coin("TokenA", 1000), + token1: sdk.NewInt64Coin("TokenB", 1000), tick: 999, fee: 1, }, @@ -211,8 +211,8 @@ func (suite *IncentivesTestSuite) TestGaugeCreateFails() { depositSpecs: []depositSpec{ { addr: addrs[1], - token0: sdk.NewInt64Coin("TokenA", 10), - token1: sdk.NewInt64Coin("TokenB", 10), + token0: sdk.NewInt64Coin("TokenA", 1000), + token1: sdk.NewInt64Coin("TokenB", 1000), tick: 999, fee: 50, }, @@ -223,8 +223,8 @@ func (suite *IncentivesTestSuite) TestGaugeCreateFails() { depositSpecs: []depositSpec{ { addr: addrs[1], - token0: sdk.NewInt64Coin("TokenA", 10), - token1: sdk.NewInt64Coin("TokenB", 10), + token0: sdk.NewInt64Coin("TokenA", 1000), + token1: sdk.NewInt64Coin("TokenB", 1000), tick: 999, fee: 50, }, diff --git a/x/incentives/keeper/query_server_test.go b/x/incentives/keeper/query_server_test.go index d1545f6a1..953c67876 100644 --- a/x/incentives/keeper/query_server_test.go +++ b/x/incentives/keeper/query_server_test.go @@ -16,8 +16,8 @@ func (suite *IncentivesTestSuite) TestGetFutureRewardEstimate() { depositSpecs: []depositSpec{ { addr: addr1, - token0: sdk.NewInt64Coin("TokenA", 10), - token1: sdk.NewInt64Coin("TokenB", 10), + token0: sdk.NewInt64Coin("TokenA", 1000), + token1: sdk.NewInt64Coin("TokenB", 1000), tick: 0, fee: 1, }, @@ -29,8 +29,8 @@ func (suite *IncentivesTestSuite) TestGetFutureRewardEstimate() { depositSpecs: []depositSpec{ { addr: addr2, - token0: sdk.NewInt64Coin("TokenA", 10), - token1: sdk.NewInt64Coin("TokenB", 10), + token0: sdk.NewInt64Coin("TokenA", 1000), + token1: sdk.NewInt64Coin("TokenB", 1000), tick: 0, fee: 1, }, @@ -73,8 +73,8 @@ func (suite *IncentivesTestSuite) TestGetGauges() { depositSpecs: []depositSpec{ { addr: addr1, - token0: sdk.NewInt64Coin("TokenA", 10), - token1: sdk.NewInt64Coin("TokenB", 10), + token0: sdk.NewInt64Coin("TokenA", 1000), + token1: sdk.NewInt64Coin("TokenB", 1000), tick: 0, fee: 1, }, @@ -86,8 +86,8 @@ func (suite *IncentivesTestSuite) TestGetGauges() { depositSpecs: []depositSpec{ { addr: addr2, - token0: sdk.NewInt64Coin("TokenA", 10), - token1: sdk.NewInt64Coin("TokenB", 10), + token0: sdk.NewInt64Coin("TokenA", 1000), + token1: sdk.NewInt64Coin("TokenB", 1000), tick: 0, fee: 1, }, diff --git a/x/incentives/keeper/stake_test.go b/x/incentives/keeper/stake_test.go index d5caf9e0b..d39cda26e 100644 --- a/x/incentives/keeper/stake_test.go +++ b/x/incentives/keeper/stake_test.go @@ -16,8 +16,8 @@ func (suite *IncentivesTestSuite) TestStakeLifecycle() { depositSpecs: []depositSpec{ { addr: addr0, - token0: sdk.NewInt64Coin("TokenA", 10), - token1: sdk.NewInt64Coin("TokenB", 10), + token0: sdk.NewInt64Coin("TokenA", 1000), + token1: sdk.NewInt64Coin("TokenB", 1000), tick: 0, fee: 1, }, @@ -33,7 +33,7 @@ func (suite *IncentivesTestSuite) TestStakeLifecycle() { _, err = suite.App.IncentivesKeeper.Unstake(suite.Ctx, stake, sdk.Coins{}) suite.Require().NoError(err) balances := suite.App.BankKeeper.GetAllBalances(suite.Ctx, addr0) - suite.Require().Equal(sdk.NewCoins(sdk.NewInt64Coin(suite.LPDenom0, 20)), balances) + suite.Require().Equal(sdk.NewCoins(sdk.NewInt64Coin(suite.LPDenom0, 2000)), balances) _, err = suite.App.IncentivesKeeper.GetStakeByID(suite.Ctx, stake.ID) // should be deleted suite.Require().Error(err) @@ -47,15 +47,15 @@ func (suite *IncentivesTestSuite) TestMultipleStakeLifecycle() { depositSpecs: []depositSpec{ { addr: addr0, - token0: sdk.NewInt64Coin("TokenA", 10), - token1: sdk.NewInt64Coin("TokenB", 10), + token0: sdk.NewInt64Coin("TokenA", 1000), + token1: sdk.NewInt64Coin("TokenB", 1000), tick: 0, fee: 1, }, { addr: addr0, - token0: sdk.NewInt64Coin("TokenA", 10), - token1: sdk.NewInt64Coin("TokenB", 10), + token0: sdk.NewInt64Coin("TokenA", 1000), + token1: sdk.NewInt64Coin("TokenB", 1000), tick: 1, fee: 1, }, @@ -73,8 +73,8 @@ func (suite *IncentivesTestSuite) TestMultipleStakeLifecycle() { balances := suite.App.BankKeeper.GetAllBalances(suite.Ctx, addr0) suite.Require().Equal( sdk.NewCoins( - sdk.NewInt64Coin(suite.LPDenom0, 20), - sdk.NewInt64Coin(suite.LPDenom1, 20), + sdk.NewInt64Coin(suite.LPDenom0, 2000), + sdk.NewInt64Coin(suite.LPDenom1, 2000), ), balances) _, err = suite.App.IncentivesKeeper.GetStakeByID(suite.Ctx, stake.ID) // should be deleted @@ -89,8 +89,8 @@ func (suite *IncentivesTestSuite) TestStakeUnstakePartial() { depositSpecs: []depositSpec{ { addr: addr0, - token0: sdk.NewInt64Coin("TokenA", 10), - token1: sdk.NewInt64Coin("TokenB", 10), + token0: sdk.NewInt64Coin("TokenA", 1000), + token1: sdk.NewInt64Coin("TokenB", 1000), tick: 0, fee: 1, }, @@ -102,21 +102,21 @@ func (suite *IncentivesTestSuite) TestStakeUnstakePartial() { suite.Require().NoError(err) suite.Require().NotNil(retrievedStake) - // unstake the full amount + // unstake the partial amount _, err = suite.App.IncentivesKeeper.Unstake( suite.Ctx, stake, - sdk.Coins{sdk.NewInt64Coin(suite.LPDenom0, 9)}, + sdk.Coins{sdk.NewInt64Coin(suite.LPDenom0, 900)}, ) suite.Require().NoError(err) balances := suite.App.BankKeeper.GetAllBalances(suite.Ctx, addr0) - suite.Require().ElementsMatch(sdk.NewCoins(sdk.NewInt64Coin(suite.LPDenom0, 9)), balances) + suite.Require().ElementsMatch(sdk.NewCoins(sdk.NewInt64Coin(suite.LPDenom0, 900)), balances) // should still be accessible retrievedStake, err = suite.App.IncentivesKeeper.GetStakeByID(suite.Ctx, stake.ID) suite.Require().NoError(err) suite.Require().NotNil(retrievedStake) suite.Require(). - ElementsMatch(sdk.NewCoins(sdk.NewInt64Coin(suite.LPDenom0, 11)), retrievedStake.Coins) + ElementsMatch(sdk.NewCoins(sdk.NewInt64Coin(suite.LPDenom0, 1100)), retrievedStake.Coins) // fin. } From 554fda3d938ffc25dbd61b7afec0fb3219320528 Mon Sep 17 00:00:00 2001 From: Julian Compagni Portis Date: Wed, 1 Nov 2023 15:10:54 -0400 Subject: [PATCH 195/307] small fixes per PR feedback -typos, -remove extra maccperms -remove unused expected keepers -incorrect module for burning coins for ibcswap -adding minting restriction for dex --- app/app.go | 15 ++++++--------- x/dex/client/cli/query.go | 7 +------ x/dex/types/expected_keepers.go | 1 - x/dex/types/pool_denom.go | 17 +++++++++++++++++ x/ibcswap/keeper/keeper.go | 4 ++-- x/ibcswap/types/expected_keepers.go | 2 -- 6 files changed, 26 insertions(+), 20 deletions(-) diff --git a/app/app.go b/app/app.go index 203e711e5..17933df3c 100644 --- a/app/app.go +++ b/app/app.go @@ -256,8 +256,9 @@ var ( ccvconsumertypes.ConsumerToSendToProviderName: nil, tokenfactorytypes.ModuleName: {authtypes.Minter, authtypes.Burner}, crontypes.ModuleName: nil, - dextypes.ModuleName: {authtypes.Minter, authtypes.Burner, authtypes.Staking}, + dextypes.ModuleName: {authtypes.Minter, authtypes.Burner}, incentivestypes.ModuleName: nil, + ibcswaptypes.ModuleName: {authtypes.Burner}, } ) @@ -356,8 +357,8 @@ type App struct { checkTxHandler mev_lane.CheckTx // Lanes - Mempool blocksdk.Mempool - MEVLane auctionante.MEVLane + Mempool blocksdk.Mempool + MEVLane auctionante.MEVLane } func (app *App) GetTestBankKeeper() integration.TestBankKeeper { @@ -636,7 +637,7 @@ func New( appCodec, keys[dextypes.StoreKey], keys[dextypes.MemStoreKey], - app.BankKeeper, + app.BankKeeper.WithMintCoinsRestriction(dextypes.NewDexDenomMintCoinsRestriction()), authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String(), ) @@ -896,9 +897,9 @@ func New( crontypes.ModuleName, globalfee.ModuleName, ibcswaptypes.ModuleName, - dextypes.ModuleName, incentivestypes.ModuleName, epochstypes.ModuleName, + dextypes.ModuleName, ) app.mm.SetOrderEndBlockers( @@ -1078,7 +1079,6 @@ func New( mevLane.SetAnteHandler(anteHandler) baseLane.SetAnteHandler(anteHandler) - app.SetEndBlocker(app.EndBlocker) handler := blocksdkabci.NewProposalHandler( @@ -1355,9 +1355,6 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino paramsKeeper.Subspace(tokenfactorytypes.StoreKey).WithKeyTable(tokenfactorytypes.ParamKeyTable()) paramsKeeper.Subspace(interchainqueriesmoduletypes.StoreKey).WithKeyTable(interchainqueriesmoduletypes.ParamKeyTable()) paramsKeeper.Subspace(interchaintxstypes.StoreKey).WithKeyTable(interchaintxstypes.ParamKeyTable()) - paramsKeeper.Subspace(dextypes.ModuleName) - paramsKeeper.Subspace(epochstypes.ModuleName) - paramsKeeper.Subspace(incentivestypes.ModuleName) return paramsKeeper } diff --git a/x/dex/client/cli/query.go b/x/dex/client/cli/query.go index 40609ab72..1d27bebbe 100644 --- a/x/dex/client/cli/query.go +++ b/x/dex/client/cli/query.go @@ -2,15 +2,10 @@ package cli import ( "fmt" - // "strings" - - "github.com/spf13/cobra" "github.com/cosmos/cosmos-sdk/client" - // "github.com/cosmos/cosmos-sdk/client/flags" - // sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/x/dex/types" + "github.com/spf13/cobra" ) // GetQueryCmd returns the cli query commands for this module diff --git a/x/dex/types/expected_keepers.go b/x/dex/types/expected_keepers.go index 22d02f63c..82de2fb25 100644 --- a/x/dex/types/expected_keepers.go +++ b/x/dex/types/expected_keepers.go @@ -12,6 +12,5 @@ type BankKeeper interface { MintCoins(ctx sdk.Context, moduleName string, amt sdk.Coins) error BurnCoins(ctx sdk.Context, moduleName string, amt sdk.Coins) error IterateAccountBalances(ctx sdk.Context, addr sdk.AccAddress, cb func(sdk.Coin) bool) - SpendableCoins(ctx sdk.Context, addr sdk.AccAddress) sdk.Coins GetSupply(ctx sdk.Context, denom string) sdk.Coin } diff --git a/x/dex/types/pool_denom.go b/x/dex/types/pool_denom.go index eb3f87104..1d3ddbbfc 100644 --- a/x/dex/types/pool_denom.go +++ b/x/dex/types/pool_denom.go @@ -4,6 +4,9 @@ import ( "fmt" "regexp" "strconv" + + sdk "github.com/cosmos/cosmos-sdk/types" + bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" ) const ( @@ -39,3 +42,17 @@ func ParsePoolIDFromDenom(denom string) (uint64, error) { return idInt, nil } + +// NewDexMintCoinsRestriction creates and returns a BankMintingRestrictionFn that only allows minting of +// valid pool denoms +func NewDexDenomMintCoinsRestriction() bankkeeper.MintingRestrictionFn { + return func(_ sdk.Context, coinsToMint sdk.Coins) error { + for _, coin := range coinsToMint { + err := ValidatePoolDenom(coin.Denom) + if err != nil { + return fmt.Errorf("does not have permission to mint %s", coin.Denom) + } + } + return nil + } +} diff --git a/x/ibcswap/keeper/keeper.go b/x/ibcswap/keeper/keeper.go index 5ddfc1315..3902568b5 100644 --- a/x/ibcswap/keeper/keeper.go +++ b/x/ibcswap/keeper/keeper.go @@ -140,7 +140,7 @@ func (k Keeper) RefundPacketToken( err = k.bankKeeper.SendCoinsFromAccountToModule( ctx, receiver, - transfertypes.ModuleName, + types.ModuleName, sdk.NewCoins(token), ) if err != nil { @@ -148,7 +148,7 @@ func (k Keeper) RefundPacketToken( } // burn the coins - err = k.bankKeeper.BurnCoins(ctx, transfertypes.ModuleName, sdk.NewCoins(token)) + err = k.bankKeeper.BurnCoins(ctx, types.ModuleName, sdk.NewCoins(token)) if err != nil { return err } diff --git a/x/ibcswap/types/expected_keepers.go b/x/ibcswap/types/expected_keepers.go index 4380703bf..faad6b1fd 100644 --- a/x/ibcswap/types/expected_keepers.go +++ b/x/ibcswap/types/expected_keepers.go @@ -7,8 +7,6 @@ import ( // BankKeeper defines the expected interface that the swap middleware needs in order to facilitate refunds. type BankKeeper interface { SendCoins(ctx sdk.Context, fromAddr, toAddr sdk.AccAddress, amt sdk.Coins) error - MintCoins(ctx sdk.Context, moduleName string, amt sdk.Coins) error BurnCoins(ctx sdk.Context, moduleName string, amt sdk.Coins) error - SendCoinsFromModuleToAccount(ctx sdk.Context, senderModule string, recipientAddr sdk.AccAddress, amt sdk.Coins) error SendCoinsFromAccountToModule(ctx sdk.Context, senderAddr sdk.AccAddress, recipientModule string, amt sdk.Coins) error } From ee0ef2309be19c48446b75c20f95da069131e201 Mon Sep 17 00:00:00 2001 From: Julian Compagni Portis Date: Tue, 24 Oct 2023 16:48:44 -0400 Subject: [PATCH 196/307] Audit Fix: Don't use coin.Add in deposit every sdk.Coin.Add happening in DepositCore results in multiple traversals over all coins in sharesIssued , and also involves allocation of additional data structures, thus resulting in quadratic scaling of the DepositCore runtime (because it invokes sdk.Coins Add() for each issued share). --- utils/bank.go | 22 ++++++++++++++++++++++ x/dex/keeper/core.go | 10 +++++++--- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/utils/bank.go b/utils/bank.go index b89845735..e0be3d35a 100644 --- a/utils/bank.go +++ b/utils/bank.go @@ -2,6 +2,7 @@ package utils import ( "fmt" + "sort" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/neutron-org/neutron/x/dex/types" @@ -105,3 +106,24 @@ func FilteredPaginateAccountBalances( return res, nil } + +// SanitizeCoins takes an unsorted list of coins and sorts them, removes coins with amount zero and combines duplicate coins +func SanitizeCoins(coins []sdk.Coin) sdk.Coins { + sort.SliceStable(coins, func(i, j int) bool { + return coins[i].Denom < coins[j].Denom + }) + cleanCoins := sdk.Coins{} + lastDenom := "" + for _, coin := range coins { + if coin.IsZero() { + continue + } + if lastDenom != coin.Denom { + cleanCoins = append(cleanCoins, coin) + } else { + cleanCoins[len(cleanCoins)-1].Add(coin) + } + lastDenom = coin.Denom + } + return cleanCoins +} diff --git a/x/dex/keeper/core.go b/x/dex/keeper/core.go index ebe804de0..1506cf6b6 100644 --- a/x/dex/keeper/core.go +++ b/x/dex/keeper/core.go @@ -7,9 +7,10 @@ import ( sdkerrors "cosmossdk.io/errors" "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/neutron-org/neutron/utils" math_utils "github.com/neutron-org/neutron/utils/math" "github.com/neutron-org/neutron/x/dex/types" - "github.com/neutron-org/neutron/x/dex/utils" + dexutils "github.com/neutron-org/neutron/x/dex/utils" ) // NOTE: Currently we are using TruncateInt in multiple places for converting Decs back into math.Ints. @@ -79,7 +80,7 @@ func (k Keeper) DepositCore( if err := k.MintShares(ctx, receiverAddr, outShares); err != nil { return nil, nil, nil, err } - sharesIssued = sharesIssued.Add(outShares) + sharesIssued = append(sharesIssued, outShares) amounts0Deposited[i] = inAmount0 amounts1Deposited[i] = inAmount1 @@ -99,6 +100,9 @@ func (k Keeper) DepositCore( )) } + // At this point shares issued is not sorted and may have duplicates + // we must sanitize to convert it to a valid set of coins + sharesIssued = utils.SanitizeCoins(sharesIssued) if totalAmountReserve0.IsPositive() { coin0 := sdk.NewCoin(pairID.Token0, totalAmountReserve0) if err := k.bankKeeper.SendCoinsFromAccountToModule(ctx, callerAddr, types.ModuleName, sdk.Coins{coin0}); err != nil { @@ -257,7 +261,7 @@ func (k Keeper) MultiHopSwapCore( if len(routeErrors) == len(routes) { // All routes have failed - allErr := utils.JoinErrors(types.ErrAllMultiHopRoutesFailed, routeErrors...) + allErr := dexutils.JoinErrors(types.ErrAllMultiHopRoutesFailed, routeErrors...) return sdk.Coin{}, allErr } From ffc8bd2e2f9869bb7e2e4fcf4070e29c0bd39fe3 Mon Sep 17 00:00:00 2001 From: Julian Compagni Portis Date: Tue, 24 Oct 2023 17:58:04 -0400 Subject: [PATCH 197/307] Mint shares at the end depositCore; not inside the loop Much better gas efficiency since we don't need to perform duplicate lookups for each share issuance Also add additional check for duplicate deposits. This should exist regardless but also required for share math to work if we aren't issuing shares within the deposit loop --- x/dex/keeper/core.go | 8 +++++--- x/dex/keeper/core_helper.go | 3 +-- x/dex/keeper/core_helper_test.go | 2 +- x/dex/keeper/msg_server_test.go | 7 +++++-- x/dex/types/errors.go | 5 +++++ x/dex/types/message_deposit.go | 8 ++++++++ x/dex/types/message_deposit_test.go | 12 ++++++++++++ 7 files changed, 37 insertions(+), 8 deletions(-) diff --git a/x/dex/keeper/core.go b/x/dex/keeper/core.go index 1506cf6b6..e1aa53832 100644 --- a/x/dex/keeper/core.go +++ b/x/dex/keeper/core.go @@ -77,9 +77,6 @@ func (k Keeper) DepositCore( return nil, nil, nil, types.ErrDepositShareUnderflow } - if err := k.MintShares(ctx, receiverAddr, outShares); err != nil { - return nil, nil, nil, err - } sharesIssued = append(sharesIssued, outShares) amounts0Deposited[i] = inAmount0 @@ -103,6 +100,7 @@ func (k Keeper) DepositCore( // At this point shares issued is not sorted and may have duplicates // we must sanitize to convert it to a valid set of coins sharesIssued = utils.SanitizeCoins(sharesIssued) + if totalAmountReserve0.IsPositive() { coin0 := sdk.NewCoin(pairID.Token0, totalAmountReserve0) if err := k.bankKeeper.SendCoinsFromAccountToModule(ctx, callerAddr, types.ModuleName, sdk.Coins{coin0}); err != nil { @@ -117,6 +115,10 @@ func (k Keeper) DepositCore( } } + if err := k.MintShares(ctx, receiverAddr, sharesIssued); err != nil { + return nil, nil, nil, err + } + return amounts0Deposited, amounts1Deposited, sharesIssued, nil } diff --git a/x/dex/keeper/core_helper.go b/x/dex/keeper/core_helper.go index e22495807..637329300 100644 --- a/x/dex/keeper/core_helper.go +++ b/x/dex/keeper/core_helper.go @@ -77,9 +77,8 @@ func (k Keeper) ValidateFee(ctx sdk.Context, fee uint64) error { // TOKENIZER UTILS // /////////////////////////////////////////////////////////////////////////////// -func (k Keeper) MintShares(ctx sdk.Context, addr sdk.AccAddress, shareCoin sdk.Coin) error { +func (k Keeper) MintShares(ctx sdk.Context, addr sdk.AccAddress, sharesCoins sdk.Coins) error { // mint share tokens - sharesCoins := sdk.Coins{shareCoin} if err := k.bankKeeper.MintCoins(ctx, types.ModuleName, sharesCoins); err != nil { return err } diff --git a/x/dex/keeper/core_helper_test.go b/x/dex/keeper/core_helper_test.go index 1e864fbd9..681cc100e 100644 --- a/x/dex/keeper/core_helper_test.go +++ b/x/dex/keeper/core_helper_test.go @@ -62,7 +62,7 @@ func (s *CoreHelpersTestSuite) setLPAtFee1Pool(tickIndex int64, amountA, amountB totalShares := pool.CalcSharesMinted(amountAInt, amountBInt, existingShares) - err = s.app.DexKeeper.MintShares(s.ctx, s.alice, totalShares) + err = s.app.DexKeeper.MintShares(s.ctx, s.alice, sdk.NewCoins(totalShares)) s.Require().NoError(err) lowerTick.ReservesMakerDenom = amountAInt diff --git a/x/dex/keeper/msg_server_test.go b/x/dex/keeper/msg_server_test.go index 387bf9b64..999c4d817 100644 --- a/x/dex/keeper/msg_server_test.go +++ b/x/dex/keeper/msg_server_test.go @@ -543,7 +543,7 @@ func (s *DexTestSuite) deposits( s.Assert().Fail("Only 1 pairID can be provided") } - _, err := s.msgServer.Deposit(s.GoCtx, &types.MsgDeposit{ + msg := &types.MsgDeposit{ Creator: account.String(), Receiver: account.String(), TokenA: tokenA, @@ -553,7 +553,10 @@ func (s *DexTestSuite) deposits( TickIndexesAToB: tickIndexes, Fees: fees, Options: options, - }) + } + err := msg.ValidateBasic() + s.Assert().NoError(err) + _, err = s.msgServer.Deposit(s.GoCtx, msg) s.Assert().Nil(err) } diff --git a/x/dex/types/errors.go b/x/dex/types/errors.go index 7f4eaa964..024a67bbe 100644 --- a/x/dex/types/errors.go +++ b/x/dex/types/errors.go @@ -164,4 +164,9 @@ var ( 1149, "Invalid Address", ) + ErrDuplicatePoolDeposit = sdkerrors.Register( + ModuleName, + 1150, + "Can only provide a single deposit amount for each tick, fee pair", + ) ) diff --git a/x/dex/types/message_deposit.go b/x/dex/types/message_deposit.go index 841b0328e..83d29eaab 100644 --- a/x/dex/types/message_deposit.go +++ b/x/dex/types/message_deposit.go @@ -1,6 +1,8 @@ package types import ( + "fmt" + sdkerrors "cosmossdk.io/errors" "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" @@ -78,7 +80,13 @@ func (msg *MsgDeposit) ValidateBasic() error { return ErrZeroDeposit } + poolsDeposited := make(map[string]bool) for i := 0; i < numDeposits; i++ { + poolStr := fmt.Sprintf("%d-%d", msg.TickIndexesAToB[i], msg.Fees[i]) + if _, ok := poolsDeposited[poolStr]; ok { + return ErrDuplicatePoolDeposit + } + poolsDeposited[poolStr] = true if msg.AmountsA[i].LT(math.ZeroInt()) || msg.AmountsB[i].LT(math.ZeroInt()) { return ErrZeroDeposit } diff --git a/x/dex/types/message_deposit_test.go b/x/dex/types/message_deposit_test.go index 33c8baf35..e06bd3e5d 100644 --- a/x/dex/types/message_deposit_test.go +++ b/x/dex/types/message_deposit_test.go @@ -99,6 +99,18 @@ func TestMsgDeposit_ValidateBasic(t *testing.T) { }, err: ErrZeroDeposit, }, + { + name: "invalid duplicate deposit", + msg: MsgDeposit{ + Creator: sample.AccAddress(), + Receiver: sample.AccAddress(), + Fees: []uint64{1, 2, 1}, + TickIndexesAToB: []int64{0, 0, 0}, + AmountsA: []math.Int{math.OneInt(), math.OneInt(), math.OneInt()}, + AmountsB: []math.Int{math.OneInt(), math.OneInt(), math.OneInt()}, + }, + err: ErrDuplicatePoolDeposit, + }, { name: "invalid no deposit", msg: MsgDeposit{ From e94daf13273fccc8adaf266b59db87061ee5f70d Mon Sep 17 00:00:00 2001 From: Julian Compagni Portis Date: Tue, 24 Oct 2023 18:07:44 -0400 Subject: [PATCH 198/307] Audit Fix: check that deposit options array is correct length --- x/dex/types/message_deposit.go | 3 ++- x/dex/types/message_deposit_test.go | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/x/dex/types/message_deposit.go b/x/dex/types/message_deposit.go index 841b0328e..aa097c823 100644 --- a/x/dex/types/message_deposit.go +++ b/x/dex/types/message_deposit.go @@ -71,7 +71,8 @@ func (msg *MsgDeposit) ValidateBasic() error { numDeposits := len(msg.AmountsA) if numDeposits != len(msg.Fees) || numDeposits != len(msg.TickIndexesAToB) || - numDeposits != len(msg.AmountsB) { + numDeposits != len(msg.AmountsB) || + numDeposits != len(msg.Options) { return ErrUnbalancedTxArray } if numDeposits == 0 { diff --git a/x/dex/types/message_deposit_test.go b/x/dex/types/message_deposit_test.go index 33c8baf35..179e30c8d 100644 --- a/x/dex/types/message_deposit_test.go +++ b/x/dex/types/message_deposit_test.go @@ -24,6 +24,7 @@ func TestMsgDeposit_ValidateBasic(t *testing.T) { TickIndexesAToB: []int64{0}, AmountsA: []math.Int{math.OneInt()}, AmountsB: []math.Int{math.OneInt()}, + Options: []*DepositOptions{{false}}, }, err: ErrInvalidAddress, }, @@ -36,6 +37,7 @@ func TestMsgDeposit_ValidateBasic(t *testing.T) { TickIndexesAToB: []int64{0}, AmountsA: []math.Int{math.OneInt()}, AmountsB: []math.Int{math.OneInt()}, + Options: []*DepositOptions{{false}}, }, err: ErrInvalidAddress, }, @@ -48,6 +50,7 @@ func TestMsgDeposit_ValidateBasic(t *testing.T) { TickIndexesAToB: []int64{}, AmountsA: []math.Int{}, AmountsB: []math.Int{}, + Options: []*DepositOptions{{false}}, }, err: ErrUnbalancedTxArray, }, @@ -99,6 +102,19 @@ func TestMsgDeposit_ValidateBasic(t *testing.T) { }, err: ErrZeroDeposit, }, + { + name: "invalid duplicate deposit", + msg: MsgDeposit{ + Creator: sample.AccAddress(), + Receiver: sample.AccAddress(), + Fees: []uint64{1, 2, 1}, + TickIndexesAToB: []int64{0, 0, 0}, + AmountsA: []math.Int{math.OneInt(), math.OneInt(), math.OneInt()}, + AmountsB: []math.Int{math.OneInt(), math.OneInt(), math.OneInt()}, + Options: []*DepositOptions{{false}, {false}, {false}}, + }, + err: ErrDuplicatePoolDeposit, + }, { name: "invalid no deposit", msg: MsgDeposit{ @@ -108,6 +124,7 @@ func TestMsgDeposit_ValidateBasic(t *testing.T) { TickIndexesAToB: []int64{0}, AmountsA: []math.Int{math.ZeroInt()}, AmountsB: []math.Int{math.ZeroInt()}, + Options: []*DepositOptions{{false}}, }, err: ErrZeroDeposit, }, @@ -120,6 +137,7 @@ func TestMsgDeposit_ValidateBasic(t *testing.T) { TickIndexesAToB: []int64{0}, AmountsA: []math.Int{math.OneInt()}, AmountsB: []math.Int{math.OneInt()}, + Options: []*DepositOptions{{false}}, }, }, } From c4329fc8b36676101b49a37efced7dd4791bdd0c Mon Sep 17 00:00:00 2001 From: Julian Compagni Portis Date: Wed, 1 Nov 2023 17:16:59 -0400 Subject: [PATCH 199/307] remove outdated READMEs from code ported from osmosis --- x/epochs/README.md | 187 ------ x/incentives/README GAUGES.md | 651 -------------------- x/incentives/README LOCKUP.md | 1054 --------------------------------- 3 files changed, 1892 deletions(-) delete mode 100644 x/epochs/README.md delete mode 100644 x/incentives/README GAUGES.md delete mode 100644 x/incentives/README LOCKUP.md diff --git a/x/epochs/README.md b/x/epochs/README.md deleted file mode 100644 index 0b95457c9..000000000 --- a/x/epochs/README.md +++ /dev/null @@ -1,187 +0,0 @@ -# Epochs - -## Abstract - -Often in the SDK, we would like to run certain code every-so often. The -purpose of `epochs` module is to allow other modules to set that they -would like to be signaled once every period. So another module can -specify it wants to execute code once a week, starting at UTC-time = x. -`epochs` creates a generalized epoch interface to other modules so that -they can easily be signalled upon such events. - -## Contents - -1. **[Concept](#concepts)** -2. **[State](#state)** -3. **[Events](#events)** -4. **[Keeper](#keepers)** -5. **[Hooks](#hooks)** -6. **[Queries](#queries)** - -## Concepts - -The epochs module defines on-chain timers, that execute at fixed time intervals. -Other SDK modules can then register logic to be executed at the timer ticks. -We refer to the period in between two timer ticks as an "epoch". - -Every timer has a unique identifier. -Every epoch will have a start time, and an end time, where `end time = start time + timer interval`. -On Neutron mainnet, we only utilize one identifier, with a time interval of `one day`. - -The timer will tick at the first block whose blocktime is greater than the timer end time, -and set the start as the prior timer end time. (Notably, its not set to the block time!) -This means that if the chain has been down for awhile, you will get one timer tick per block, -until the timer has caught up. - -## State - -The Epochs module keeps a single [`EpochInfo`](https://github.com/osmosis-labs/osmosis/blob/b4befe4f3eb97ebb477323234b910c4afafab9b7/proto/osmosis/epochs/genesis.proto#L12) per identifier. -This contains the current state of the timer with the corresponding identifier. -Its fields are modified at every timer tick. -EpochInfos are initialized as part of genesis initialization or upgrade logic, -and are only modified on begin blockers. - -## Events - -The `epochs` module emits the following events: - -### BeginBlocker - -| Type | Attribute Key | Attribute Value | -| ----------- | ------------- | --------------- | -| epoch_start | epoch_number | {epoch_number} | -| epoch_start | start_time | {start_time} | - -### EndBlocker - -| Type | Attribute Key | Attribute Value | -| --------- | ------------- | --------------- | -| epoch_end | epoch_number | {epoch_number} | - -## Keepers - -### Keeper functions - -Epochs keeper module provides utility functions to manage epochs. - -```go -// Keeper is the interface for lockup module keeper -type Keeper interface { - // GetEpochInfo returns epoch info by identifier - GetEpochInfo(ctx sdk.Context, identifier string) types.EpochInfo - // SetEpochInfo set epoch info - SetEpochInfo(ctx sdk.Context, epoch types.EpochInfo) - // DeleteEpochInfo delete epoch info - DeleteEpochInfo(ctx sdk.Context, identifier string) - // IterateEpochInfo iterate through epochs - IterateEpochInfo(ctx sdk.Context, fn func(index int64, epochInfo types.EpochInfo) (stop bool)) - // Get all epoch infos - AllEpochInfos(ctx sdk.Context) []types.EpochInfo -} -``` - -## Hooks - -```go - // the first block whose timestamp is after the duration is counted as the end of the epoch - AfterEpochEnd(ctx sdk.Context, epochIdentifier string, epochNumber int64) - // new epoch is next block of epoch end block - BeforeEpochStart(ctx sdk.Context, epochIdentifier string, epochNumber int64) -``` - -### How modules receive hooks - -On hook receiver function of other modules, they need to filter -`epochIdentifier` and only do executions for only specific -epochIdentifier. Filtering epochIdentifier could be in `Params` of other -modules so that they can be modified by governance. - -This is the standard dev UX of this: - -```golang -func (k MyModuleKeeper) AfterEpochEnd(ctx sdk.Context, epochIdentifier string, epochNumber int64) { - params := k.GetParams(ctx) - if epochIdentifier == params.DistrEpochIdentifier { - // my logic - } -} -``` - -### Panic isolation - -If a given epoch hook panics, its state update is reverted, but we keep -proceeding through the remaining hooks. This allows more advanced epoch -logic to be used, without concern over state machine halting, or halting -subsequent modules. - -This does mean that if there is behavior you expect from a prior epoch -hook, and that epoch hook reverted, your hook may also have an issue. So -do keep in mind "what if a prior hook didn't get executed" in the safety -checks you consider for a new epoch hook. - -## Queries - -Epochs module is providing below queries to check the module's state. - -```protobuf -service Query { - // EpochInfos provide running epochInfos - rpc EpochInfos(QueryEpochsInfoRequest) returns (QueryEpochsInfoResponse) {} - // CurrentEpoch provide current epoch of specified identifier - rpc CurrentEpoch(QueryCurrentEpochRequest) returns (QueryCurrentEpochResponse) {} -} -``` - -### Epoch Infos - -Query the currently running epochInfos - -```sh -neutrond query epochs epoch-infos -``` - -::: details Example - -An example output: - -```sh -epochs: -- current_epoch: "183" - current_epoch_start_height: "2438409" - current_epoch_start_time: "2021-12-18T17:16:09.898160996Z" - duration: 86400s - epoch_counting_started: true - identifier: day - start_time: "2021-06-18T17:00:00Z" -- current_epoch: "26" - current_epoch_start_height: "2424854" - current_epoch_start_time: "2021-12-17T17:02:07.229632445Z" - duration: 604800s - epoch_counting_started: true - identifier: week - start_time: "2021-06-18T17:00:00Z" -``` - -::: - -### Current Epoch - -Query the current epoch by the specified identifier - -```sh -neutrond query epochs current-epoch [identifier] -``` - -::: details Example - -Query the current `day` epoch: - -```sh -neutrond query epochs current-epoch day -``` - -Which in this example outputs: - -```sh -current_epoch: "183" -``` diff --git a/x/incentives/README GAUGES.md b/x/incentives/README GAUGES.md deleted file mode 100644 index c7bbd8f52..000000000 --- a/x/incentives/README GAUGES.md +++ /dev/null @@ -1,651 +0,0 @@ -# Incentives - -## Abstract - -Incentives module provides general interface to give yield to stakers. - -The yield to be given to stakers are stored in `gauge` and it is distributed on epoch basis to the stakers who meet specific conditions. - -Anyone can create gauge and add rewards to the gauge, there is no way to take it out other than distribution. - -There are two kinds of `gauges`, perpetual and non-perpetual ones. - -- Non perpetual ones get removed from active queue after the the distribution period finish but perpetual ones persist. -- For non perpetual ones, they distribute the tokens equally per epoch during the `gauge` is in the active period. -- For perpetual ones, it distribute all the tokens at a single time and somewhere else put the tokens regularly to distribute the tokens, it's mainly used to distribute minted OSMO tokens to LP token stakers. - -## Contents - -1. **[Concept](#concepts)** -2. **[State](#state)** -3. **[Messages](#messages)** -4. **[Events](#events)** -5. **[Hooks](#hooks)** -6. **[Params](#parameters)** -7. **[Transactions](#transactions)** -8. **[Queries](#queries)** - -## Concepts - -The purpose of `incentives` module is to provide incentives to the users -who stake specific token for specific period of time. - -Staked tokens can be of any denomination, including LP tokens (gamm/pool/x), IBC tokens (tokens sent through IBC such as ibc/27394FB092D2ECCD56123C74F36E4C1F926001CEADA9CA97EA622B25F41E5EB2), and native tokens (such as ATOM or LUNA). - -The incentive amount is entered by the gauge creator. Rewards for a given pool of staked up tokens are pooled into a gauge until the disbursement time. At the disbursement time, they are distributed pro-rata (proportionally) to members of the pool. - -Anyone can create a gauge and add rewards to the gauge. There is no way to withdraw gauge rewards other than distribution. Governance proposals can be raised to match the external incentive tokens with equivalent Osmo incentives (see for example: [proposal 47](https://www.mintscan.io/osmosis/proposals/47)). - -There are two kinds of gauges: **`perpetual`** and **`non-perpetual`**: - -- **`Non-perpetual`** gauges distribute their tokens equally per epoch while the gauge is in the active period. These gauges get removed from the active queue after the distribution period finishes - -- **`Perpetual gauges`** distribute all their tokens at a single time and only distribute their tokens again once the gauge is refilled (this is mainly used to distribute minted OSMO tokens to LP token stakers). Perpetual gauges persist and will re-disburse tokens when refilled (there is no "active" period) - -## State - -### Incentives management - -All the incentives that are going to be provided are staked into -`IncentivePool` until released to the appropriate recipients after a -specific period of time. - -### Gauge - -Rewards to be distributed are organized by `Gauge`. The `Gauge` -describes how users can get reward, stores the amount of coins in the -gauge, the cadence at which rewards are to be distributed, and the -number of epochs to distribute the reward over. - -```protobuf -enum StakeQueryType { - option (gogoproto.goproto_enum_prefix) = false; - - ByDuration = 0; // stakes which has more than specific duration - ByTime = 1; // stakes which are started before specific time -} - -message QueryCondition { - StakeQueryType stake_query_type = 1; // type of stake, ByStakeDuration | ByStakeTime - string denom = 2; // stake denom - google.protobuf.Duration duration = 3; // condition for stake duration, only valid if positive - google.protobuf.Timestamp timestamp = 4; // condition for stake start time, not valid if unset value -} - -message Gauge { - uint64 id = 1; // unique ID of a Gauge - QueryCondition distribute_to = 2; // distribute condition of a stake which meet one of these conditions - repeated cosmos.base.v1beta1.Coin coins = 3; // can distribute multiple coins - google.protobuf.Timestamp start_time = 4; // condition for stake start time, not valid if unset value - uint64 num_epochs_paid_over = 5; // number of epochs distribution will be done -} -``` - -### Gauge queues - -#### Upcoming queue - -To start release `Gauges` at a specific time, we schedule distribution -start time with time key queue. - -#### Active queue - -Active queue has all the `Gauges` that are distributing and after -distribution period finish, it's removed from the queue. - -#### Active by Denom queue - -To speed up the distribution process, module introduces the active -`Gauges` by denom. - -#### Finished queue - -Finished queue saves the `Gauges` that has finished distribution to keep -in track. - -#### Module state - -The state of the module is expressed by `params`, `stakeable_durations` -and `gauges`. - -```protobuf -// GenesisState defines the incentives module's genesis state. -message GenesisState { - // params defines all the parameters of the module - Params params = 1 [ (gogoproto.nullable) = false ]; - repeated Gauge gauges = 2 [ (gogoproto.nullable) = false ]; - repeated google.protobuf.Duration stakeable_durations = 3 [ - (gogoproto.nullable) = false, - (gogoproto.stdduration) = true, - (gogoproto.moretags) = "yaml:\"stakeable_durations\"" - ]; -} -``` - -## Messages - -### Create Gauge - -`MsgCreateGauge` can be submitted by any account to create a `Gauge`. - -```go -type MsgCreateGauge struct { - Owner sdk.AccAddress - DistributeTo QueryCondition - Rewards sdk.Coins - StartTime time.Time // start time to start distribution - NumEpochsPaidOver uint64 // number of epochs distribution will be done -} -``` - -**State modifications:** - -- Validate `Owner` has enough tokens for rewards -- Generate new `Gauge` record -- Save the record inside the keeper's time basis unstake queue -- Transfer the tokens from the `Owner` to incentives `ModuleAccount`. - -### Adding balance to Gauge - -`MsgAddToGauge` can be submitted by any account to add more incentives -to a `Gauge`. - -```go -type MsgAddToGauge struct { - GaugeID uint64 - Rewards sdk.Coins -} -``` - -**State modifications:** - -- Validate `Owner` has enough tokens for rewards -- Check if `Gauge` with specified `msg.GaugeID` is available -- Modify the `Gauge` record by adding `msg.Rewards` -- Transfer the tokens from the `Owner` to incentives `ModuleAccount`. - -## Events - -The incentives module emits the following events: - -### Handlers - -#### MsgCreateGauge - -| Type | Attribute Key | Attribute Value | -| ------------ | -------------------- | ------------------- | -| create_gauge | gauge_id | {gaugeID} | -| create_gauge | distribute_to | {owner} | -| create_gauge | rewards | {rewards} | -| create_gauge | start_time | {startTime} | -| create_gauge | num_epochs_paid_over | {numEpochsPaidOver} | -| message | action | create_gauge | -| message | sender | {owner} | -| transfer | recipient | {moduleAccount} | -| transfer | sender | {owner} | -| transfer | amount | {amount} | - -#### MsgAddToGauge - -| Type | Attribute Key | Attribute Value | -| ------------ | ------------- | --------------- | -| add_to_gauge | gauge_id | {gaugeID} | -| create_gauge | rewards | {rewards} | -| message | action | create_gauge | -| message | sender | {owner} | -| transfer | recipient | {moduleAccount} | -| transfer | sender | {owner} | -| transfer | amount | {amount} | - -### EndBlockers - -#### Incentives distribution - -| Type | Attribute Key | Attribute Value | -| ------------ | ------------- | --------------- | -| transfer\[\] | recipient | {receiver} | -| transfer\[\] | sender | {moduleAccount} | -| transfer\[\] | amount | {distrAmount} | - -## Hooks - -In this section we describe the "hooks" that `incentives` module provide -for other modules. - -If there's no usecase for this, we could ignore this. - -```go - AfterCreateGauge(ctx sdk.Context, gaugeId uint64) - AfterAddToGauge(ctx sdk.Context, gaugeId uint64) - AfterStartDistribution(ctx sdk.Context, gaugeId uint64) - AfterFinishDistribution(ctx sdk.Context, gaugeId uint64) - AfterDistribute(ctx sdk.Context, gaugeId uint64) -``` - -## Parameters - -The incentives module contains the following parameters: - -| Key | Type | Example | -| -------------------- | ------ | -------- | -| DistrEpochIdentifier | string | "weekly" | - -Note: DistrEpochIdentifier is a epoch identifier, and module distribute -rewards at the end of epochs. As `epochs` module is handling multiple -epochs, the identifier is required to check if distribution should be -done at `AfterEpochEnd` hook - -
    -
    - -## Transactions - -### create-gauge - -Create a gauge to distribute rewards to users - -```sh -osmosisd tx incentives create-gauge [stake_denom] [reward] [flags] -``` - -::: details Example 1 - -I want to make incentives for LP tokens of pool 3, namely gamm/pool/3 that have been staked up for at least 1 day. -I want to reward 100 AKT to this pool over 2 days (2 epochs). (50 rewarded on each day) -I want the rewards to start dispersing on 21 December 2021 (1640081402 UNIX time) - -```bash -osmosisd tx incentives create-gauge gamm/pool/3 10000ibc/1480B8FD20AD5FCAE81EA87584D269547DD4D436843C1D20F15E00EB64743EF4 \ ---duration 24h --start-time 1640081402 --epochs 2 --from WALLET_NAME --chain-id osmosis-1 -``` - -::: - -::: details Example 2 - -I want to make incentives for ATOM (ibc/27394FB092D2ECCD56123C74F36E4C1F926001CEADA9CA97EA622B25F41E5EB2) that have been staked up for at least 1 week (164h). -I want to reward 1000 JUNO (ibc/46B44899322F3CD854D2D46DEEF881958467CDD4B3B10086DA49296BBED94BED) to ATOM holders perpetually (perpetually meaning I must add more tokens to this gauge myself every epoch). I want the reward to start dispersing immediately. - -```bash -osmosisd tx incentives create-gauge ibc/27394FB092D2ECCD56123C74F36E4C1F926001CEADA9CA97EA622B25F41E5EB2 \ -1000000000ibc/46B44899322F3CD854D2D46DEEF881958467CDD4B3B10086DA49296BBED94BED --perpetual --duration 168h \ ---from WALLET_NAME --chain-id osmosis-1 -``` - -::: - -### add-to-gauge - -Add coins to a gauge previously created to distribute more rewards to users - -```sh -osmosisd tx incentives add-to-gauge [gauge_id] [rewards] [flags] -``` - -::: details Example - -I want to refill the gauge with 500 JUNO to a previously created gauge (gauge ID 1914) after the distribution. - -```bash -osmosisd tx incentives add-to-gauge 1914 500000000ibc/46B44899322F3CD854D2D46DEEF881958467CDD4B3B10086DA49296BBED94BED \ ---from WALLET_NAME --chain-id osmosis-1 -``` - -::: - -## Queries - -In this section we describe the queries required on grpc server. - -```protobuf -// Query defines the gRPC QueryServer service. -service Query { - // returns coins that is going to be distributed - rpc GetModuleCoinsToBeDistributed(GetModuleCoinsToBeDistributedRequest) returns (GetModuleCoinsToBeDistributedResponse) {} - // returns Gauge by id - rpc GetGaugeByID(GetGaugeByIDRequest) returns (GetGaugeByIDResponse) {} - // returns gauges both upcoming and active - rpc Gauges(GetGaugesActiveUpcomingRequest) returns (GetGaugesActiveUpcomingResponse) {} - // returns active gauges - rpc ActiveGauges(ActiveGetGaugesActiveUpcomingRequest) returns (ActiveGetGaugesActiveUpcomingResponse) {} - // returns scheduled gauges - rpc UpcomingGauges(UpcomingGetGaugesActiveUpcomingRequest) returns (UpcomingGetGaugesActiveUpcomingResponse) {} - // RewardsEst returns an estimate of the rewards at a future specific time. - // The QueryServer either provides an address or a set of stakes - // for which they want to find the associated rewards. - rpc RewardsEst(RewardsEstRequest) returns (RewardsEstResponse) {} - // returns stakeable durations that are valid to give incentives - rpc StakeableDurations(QueryStakeableDurationsRequest) returns (QueryStakeableDurationsResponse) {} -} -``` - -### active-gauges - -Query active gauges - -```sh -osmosisd query incentives active-gauges [flags] -``` - -::: details Example - -```bash -osmosisd query incentives active-gauges -``` - -An example output - -```sh -- coins: [] - distribute_to: - denom: gamm/pool/99 - duration: 604800s - stake_query_type: ByDuration - timestamp: "0001-01-01T00:00:00Z" - distributed_coins: [] - filled_epochs: "0" - id: "297" - is_perpetual: true - num_epochs_paid_over: "1" - start_time: "2021-07-03T12:27:09.323840990Z" -- coins: [] - distribute_to: - denom: gamm/pool/99 - duration: 1209600s - stake_query_type: ByDuration - timestamp: "0001-01-01T00:00:00Z" - distributed_coins: [] - filled_epochs: "0" - id: "298" - is_perpetual: true - num_epochs_paid_over: "1" - start_time: "2021-07-03T12:27:09.323840990Z" -pagination: - next_key: BwEAAAAAAAAAHTIwMjEtMDctMDNUMTI6Mjc6MDkuMzIzODQwOTkw - total: "0" -... -``` - -::: - -### active-gauges-per-denom - -Query active gauges per denom - -```sh -osmosisd query incentives active-gauges-per-denom [denom] [flags] -``` - -::: details Example - -Query all active gauges distributing incentives to holders of gamm/pool/341 - -```bash -osmosisd query incentives active-gauges-per-denom gamm/pool/341 -``` - -An example output: - -```sh -- coins: [] - distribute_to: - denom: gamm/pool/341 - duration: 604800s - stake_query_type: ByDuration - timestamp: "0001-01-01T00:00:00Z" - distributed_coins: [] - filled_epochs: "0" - id: "1033" - is_perpetual: true - num_epochs_paid_over: "1" - start_time: "2021-09-06T22:42:52.139465318Z" -- coins: [] - distribute_to: - denom: gamm/pool/341 - duration: 1209600s - stake_query_type: ByDuration - timestamp: "0001-01-01T00:00:00Z" - distributed_coins: [] - filled_epochs: "0" - id: "1034" - is_perpetual: true - num_epochs_paid_over: "1" - start_time: "2021-09-06T22:42:52.139465318Z" -pagination: - next_key: BwEAAAAAAAAAHTIwMjEtMDctMDNUMTI6Mjc6MDkuMzIzODQwOTkw - total: "0" -... -``` - -::: - -### distributed-coins - -Query coins distributed so far - -```sh -osmosisd query incentives distributed-coins [flags] -``` - -::: details Example - -```bash -osmosisd query incentives distributed-coins -``` - -An example output: - -```sh -coins: -- amount: "27632051924" - denom: ibc/0954E1C28EB7AF5B72D24F3BC2B47BBB2FDF91BDDFD57B74B99E133AED40972A -- amount: "3975960654" - denom: ibc/0EF15DF2F02480ADE0BB6E85D9EBB5DAEA2836D3860E9F97F9AADE4F57A31AA0 -- amount: "125999980901" - denom: ibc/1480B8FD20AD5FCAE81EA87584D269547DD4D436843C1D20F15E00EB64743EF4 -- amount: "434999992789" - denom: ibc/1DC495FCEFDA068A3820F903EDBD78B942FBD204D7E93D3BA2B432E9669D1A59 -- amount: "3001296" - denom: ibc/27394FB092D2ECCD56123C74F36E4C1F926001CEADA9CA97EA622B25F41E5EB2 -- amount: "1493887986685" - denom: ibc/3BCCC93AD5DF58D11A6F8A05FA8BC801CBA0BA61A981F57E91B8B598BF8061CB -- amount: "372218215714" - denom: ibc/46B44899322F3CD854D2D46DEEF881958467CDD4B3B10086DA49296BBED94BED -- amount: "1049999973206" - denom: ibc/4E5444C35610CC76FC94E7F7886B93121175C28262DDFDDE6F84E82BF2425452 -- amount: "11666666665116" - denom: ibc/7A08C6F11EF0F59EB841B9F788A87EC9F2361C7D9703157EC13D940DC53031FA -- amount: "13199999715662" - denom: ibc/9712DBB13B9631EDFA9BF61B55F1B2D290B2ADB67E3A4EB3A875F3B6081B3B84 -- amount: "1177777428443" - denom: ibc/D805F1DA50D31B96E4282C1D4181EDDFB1A44A598BFF5666F4B43E4B8BEA95A5 -- amount: "466666567747" - denom: ibc/EA3E1640F9B1532AB129A571203A0B9F789A7F14BB66E350DCBFA18E1A1931F0 -- amount: "79999999178" - denom: ibc/F3FF7A84A73B62921538642F9797C423D2B4C4ACB3C7FCFFCE7F12AA69909C4B -- amount: "65873607694598" - denom: uosmo -``` - -::: - -### gauge-by-id - -Query gauge by id - -```sh -osmosisd query incentives gauge-by-id [id] [flags] -``` - -::: details Example - -Query the incentive distribution for gauge ID 1: - -```sh -osmosisd query incentives gauge-by-id 1 -``` - -```bash -gauge: - coins: - - amount: "16654747773959" - denom: uosmo - distribute_to: - denom: gamm/pool/1 - duration: 86400s - stake_query_type: ByDuration - timestamp: "0001-01-01T00:00:00Z" - distributed_coins: - - amount: "16589795315655" - denom: uosmo - filled_epochs: "182" - id: "1" - is_perpetual: true - num_epochs_paid_over: "1" - start_time: "2021-06-19T04:30:19.082462364Z" -``` - -::: - -### gauges - -Query available gauges - -```sh -osmosisd query incentives gauges [flags] -``` - -::: details Example - -Query ALL gauges (by default the limit is 100, so here I will define a much larger number to output all gauges) - -```bash -osmosisd query incentives gauges --limit 2000 -``` - -An example output: - -```sh -- coins: - - amount: "1924196414964" - denom: uosmo - distribute_to: - denom: gamm/pool/348 - duration: 604800s - stake_query_type: ByDuration - timestamp: "0001-01-01T00:00:00Z" - distributed_coins: [] - filled_epochs: "0" - id: "8" - is_perpetual: true - num_epochs_paid_over: "1" - start_time: "2021-10-04T13:59:02.142175968Z" -- coins: - - amount: "641398804181" - denom: uosmo - distribute_to: - denom: gamm/pool/348 - duration: 1209600s - stake_query_type: ByDuration - timestamp: "0001-01-01T00:00:00Z" - distributed_coins: [] - filled_epochs: "0" - id: "9" - is_perpetual: true - num_epochs_paid_over: "1" - start_time: "2021-10-04T13:59:02.142175968Z" -pagination: - next_key: null - total: "0" -... -``` - -::: - -### rewards-estimation - -Query rewards estimation - -// Error: strconv.ParseUint: parsing "": invalid syntax - -### to-distribute-coins - -Query coins that is going to be distributed - -```sh -osmosisd query incentives to-distribute-coins [flags] -``` - -::: details Example - -```bash -osmosisd query incentives to-distribute-coins -``` - -An example output: - -```sh -coins: -- amount: "20000000" - denom: gamm/pool/87 -- amount: "90791948076" - denom: ibc/0954E1C28EB7AF5B72D24F3BC2B47BBB2FDF91BDDFD57B74B99E133AED40972A -- amount: "10000" - denom: ibc/1480B8FD20AD5FCAE81EA87584D269547DD4D436843C1D20F15E00EB64743EF4 -- amount: "1000" - denom: ibc/27394FB092D2ECCD56123C74F36E4C1F926001CEADA9CA97EA622B25F41E5EB2 -- amount: "10728832013315" - denom: ibc/3BCCC93AD5DF58D11A6F8A05FA8BC801CBA0BA61A981F57E91B8B598BF8061CB -- amount: "627782783496" - denom: ibc/46B44899322F3CD854D2D46DEEF881958467CDD4B3B10086DA49296BBED94BED -- amount: "450000026794" - denom: ibc/4E5444C35610CC76FC94E7F7886B93121175C28262DDFDDE6F84E82BF2425452 -- amount: "38333333334884" - denom: ibc/7A08C6F11EF0F59EB841B9F788A87EC9F2361C7D9703157EC13D940DC53031FA -- amount: "46800000284338" - denom: ibc/9712DBB13B9631EDFA9BF61B55F1B2D290B2ADB67E3A4EB3A875F3B6081B3B84 -- amount: "2822222571557" - denom: ibc/D805F1DA50D31B96E4282C1D4181EDDFB1A44A598BFF5666F4B43E4B8BEA95A5 -- amount: "2533333432253" - denom: ibc/EA3E1640F9B1532AB129A571203A0B9F789A7F14BB66E350DCBFA18E1A1931F0 -- amount: "366164843847" - denom: uosmo -``` - -::: - -### upcoming-gauges - -Query scheduled gauges (gauges whose `start_time` has not yet occurred) - -```sh -osmosisd query incentives upcoming-gauges [flags] -``` - -::: details Example - -```bash -osmosisd query incentives upcoming-gauges -``` - -Using this command, we will see the gauge we created earlier, among all other upcoming gauges: - -```sh -- coins: - - amount: "10000" - denom: ibc/1480B8FD20AD5FCAE81EA87584D269547DD4D436843C1D20F15E00EB64743EF4 - distribute_to: - denom: gamm/pool/3 - duration: 86400s - stake_query_type: ByDuration - timestamp: "1970-01-01T00:00:00Z" - distributed_coins: [] - filled_epochs: "0" - id: "1914" - is_perpetual: false - num_epochs_paid_over: "2" - start_time: "2021-12-21T10:10:02Z" -... -``` - -::: diff --git a/x/incentives/README LOCKUP.md b/x/incentives/README LOCKUP.md deleted file mode 100644 index 43cd1fb39..000000000 --- a/x/incentives/README LOCKUP.md +++ /dev/null @@ -1,1054 +0,0 @@ -# Stakeup - -## Abstract - -Stakeup module provides an interface for users to stake tokens (also known as bonding) into the module to get incentives. - -After tokens have been added to a specific pool and turned into LP shares through the GAMM module, users can then stake these LP shares with a specific duration in order to begin earing rewards. - -To unstake these LP shares, users must trigger the unstake timer and wait for the unstake period that was set initially to be completed. After the unstake period is over, users can turn LP shares back into their respective share of tokens. - -This module provides interfaces for other modules to iterate the stakes efficiently and grpc query to check the status of staked coins. - -## Contents - -1. **[Concept](#concepts)** -2. **[State](#state)** -3. **[Messages](#messages)** -4. **[Events](#events)** -5. **[Keeper](#keeper)** -6. **[Hooks](#hooks)** -7. **[Queries](#queries)** -8. **[Transactions](#transactions)** -9. **[Params](#params)** -10. **[Endbstakeer](#endbstakeer)** - -## Concepts - -The purpose of `stakeup` module is to provide the functionality to stake -tokens for specific period of time for LP token stakers to get -incentives. - -To unstake these LP shares, users must trigger the unstake timer and wait for the unstake period that was set initially to be completed. After the unstake period is over, users can turn LP shares back into their respective share of tokens. - -This module provides interfaces for other modules to iterate the stakes efficiently and grpc query to check the status of staked coins. - -There are currently three incentivize stakeup periods; `1 day` (24h), `1 week` (168h), and `2 weeks` (336h). When staking tokens in the 2 week period, the liquidity provider is effectively earning rewards for a combination of the 1 day, 1 week, and 2 week bonding periods. - -The 2 week period refers to how long it takes to unbond the LP shares. The liquidity provider can keep their LP shares bonded to the 2 week stakeup period indefinitely. Unbonding is only required when the liquidity provider desires access to the underlying assets. - -If the liquidity provider begins the unbonding process for their 2 week bonded LP shares, they will earn rewards for all three bonding periods during the first day of unbonding. - -After the first day passes, they will only receive rewards for the 1 day and 1 week stakeup periods. After seven days pass, they will only receive the 1 day rewards until the 2 weeks is complete and their LP shares are unstaked. The below chart is a visual example of what was just explained. - -
    -

    - -

    - -
    -
    - -## State - -### Staked coins management - -Staked coins are all stored in module account for `stakeup` module which -is called `StakePool`. When user stake coins within `stakeup` module, it's -moved from user account to `StakePool` and a record (`PeriodStake` struct) -is created. - -Once the period is over, user can withdraw it at anytime from -`StakePool`. User can withdraw by PeriodStake ID or withdraw all -`UnstakeableCoins` at a time. - -### Period Stake - -A `PeriodStake` is a single unit of stake by period. It's a record of -staked coin at a specific time. It stores owner, duration, unstake time -and the amount of coins staked. - -``` {.go} -type PeriodStake struct { - ID uint64 - Owner sdk.AccAddress - Duration time.Duration - UnstakeTime time.Time - Coins sdk.Coins -} -``` - -All stakes are stored on the KVStore as value at -`{KeyPrefixPeriodStake}{ID}` key. - -### Period stake reference queues - -To provide time efficient queries, several reference queues are managed -by denom, unstake time, and duration. There are two big queues to store -the stake references. (`a_prefix_key`) - -1. Stake references that hasn't started with unstaking yet has prefix of - `KeyPrefixNotUnstaking`. -2. Stake references that has started unstaking already has prefix of - `KeyPrefixUnstaking`. -3. Stake references that has withdrawn, it's removed from the store. - -Regardless the stake has started unstaking or not, it stores below -references. (`b_prefix_key`) - -1. `{KeyPrefixStakeDuration}{Duration}` -2. `{KeyPrefixAccountStakeDuration}{Owner}{Duration}` -3. `{KeyPrefixDenomStakeDuration}{Denom}{Duration}` -4. `{KeyPrefixAccountDenomStakeDuration}{Owner}{Denom}{Duration}` - -If the stake is unstaking, it also stores the below references. - -1. `{KeyPrefixStakeTimestamp}{StakeEndTime}` -2. `{KeyPrefixAccountStakeTimestamp}{Owner}{StakeEndTime}` -3. `{KeyPrefixDenomStakeTimestamp}{Denom}{StakeEndTime}` -4. `{KeyPrefixAccountDenomStakeTimestamp}{Owner}{Denom}{StakeEndTime}` - -For end time keys, they are converted to sortable string by using -`sdk.FormatTimeBytes` function. - -**Note:** Additionally, for stakes that hasn't started unstaking yet, it -stores accumulation store for efficient rewards distribution mechanism. - -For reference management, `addStakeRefByKey` function is used a lot. Here -key is the prefix key to be used for iteration. It is combination of two -prefix keys.(`{a_prefix_key}{b_prefix_key}`) - -``` {.go} -// addStakeRefByKey make a stakeID iterable with the prefix `key` -func (k Keeper) addStakeRefByKey(ctx sdk.Context, key []byte, stakeID uint64) error { - store := ctx.KVStore(k.storeKey) - stakeIDBz := sdk.Uint64ToBigEndian(stakeID) - endKey := combineKeys(key, stakeIDBz) - if store.Has(endKey) { - return fmt.Errorf("stake with same ID exist: %d", stakeID) - } - store.Set(endKey, stakeIDBz) - return nil -} -``` - -## Messages - -### Stake Tokens - -`MsgStake` can be submitted by any token holder via a -`MsgStake` transaction. - -``` {.go} -type MsgStake struct { - Owner sdk.AccAddress - Duration time.Duration - Coins sdk.Coins -} -``` - -**State modifications:** - -- Validate `Owner` has enough tokens -- Generate new `PeriodStake` record -- Save the record inside the keeper's time basis unstake queue -- Transfer the tokens from the `Owner` to stakeup `ModuleAccount`. - -### Begin Unstake of all stakes - -Once time is over, users can withdraw unstaked coins from stakeup -`ModuleAccount`. - -``` {.go} -type MsgBeginUnstakingAll struct { - Owner string -} -``` - -**State modifications:** - -- Fetch all unstakeable `PeriodStake`s that has not started unstaking - yet -- Set `PeriodStake`'s unstake time -- Remove stake references from `NotUnstaking` queue -- Add stake references to `Unstaking` queue - -### Begin unstake for a stake - -Once time is over, users can withdraw unstaked coins from stakeup -`ModuleAccount`. - -``` {.go} -type MsgUnstake struct { - Owner string - ID uint64 -} -``` - -**State modifications:** - -- Check `PeriodStake` with `ID` specified by `MsgUnstake` is not - started unstaking yet -- Set `PeriodStake`'s unstake time -- Remove stake references from `NotUnstaking` queue -- Add stake references to `Unstaking` queue - -Note: If another module needs past `PeriodStake` item, it can log the -details themselves using the hooks. - -## Events - -The stakeup module emits the following events: - -### Handlers - -#### MsgStake - -| Type | Attribute Key | Attribute Value | -| --------------| ------------------| -----------------| -| stake\_tokens | period\_stake\_id | {periodStakeID} | -| stake\_tokens | owner | {owner} | -| stake\_tokens | amount | {amount} | -| stake\_tokens | duration | {duration} | -| stake\_tokens | unstake\_time | {unstakeTime} | -| message | action | stake\_tokens | -| message | sender | {owner} | -| transfer | recipient | {moduleAccount} | -| transfer | sender | {owner} | -| transfer | amount | {amount} | - -#### MsgUnstake - -| Type | Attribute Key | Attribute Value | -| ---------------| ------------------| ------------------| -| begin\_unstake | period\_stake\_id | {periodStakeID} | -| begin\_unstake | owner | {owner} | -| begin\_unstake | amount | {amount} | -| begin\_unstake | duration | {duration} | -| begin\_unstake | unstake\_time | {unstakeTime} | -| message | action | begin\_unstaking | -| message | sender | {owner} | - -#### MsgBeginUnstakingAll - -| Type | Attribute Key | Attribute Value | -| --------------------| ------------------| -----------------------| -| begin\_unstake\_all | owner | {owner} | -| begin\_unstake\_all | unstaked\_coins | {unstakedCoins} | -| begin\_unstake | period\_stake\_id | {periodStakeID} | -| begin\_unstake | owner | {owner} | -| begin\_unstake | amount | {amount} | -| begin\_unstake | duration | {duration} | -| begin\_unstake | unstake\_time | {unstakeTime} | -| message | action | begin\_unstaking\_all | -| message | sender | {owner} | - -### Endbstakeer - -#### Automatic withdraw when unstake time mature - -| Type | Attribute Key | Attribute Value | -| ----------------| ------------------| -----------------| -| message | action | unstake\_tokens | -| message | sender | {owner} | -| transfer\[\] | recipient | {owner} | -| transfer\[\] | sender | {moduleAccount} | -| transfer\[\] | amount | {unstakeAmount} | -| unstake\[\] | period\_stake\_id | {owner} | -| unstake\[\] | owner | {stakeID} | -| unstake\[\] | duration | {stakeDuration} | -| unstake\[\] | unstake\_time | {unstakeTime} | -| unstake\_tokens | owner | {owner} | -| unstake\_tokens | unstaked\_coins | {totalAmount} | - -## Keepers - -### Stakeup Keeper - -Stakeup keeper provides utility functions to store stake queues and query -stakes. - -```go -// Keeper is the interface for stakeup module keeper -type Keeper interface { - // GetModuleBalance Returns full balance of the module - GetModuleBalance(sdk.Context) sdk.Coins - // GetModuleStakedCoins Returns staked balance of the module - GetModuleStakedCoins(sdk.Context) sdk.Coins - // GetAccountUnstakeableCoins Returns whole unstakeable coins which are not withdrawn yet - GetAccountUnstakeableCoins(sdk.Context, addr sdk.AccAddress) sdk.Coins - // GetAccountUnstakingCoins Returns whole unstaking coins - GetAccountUnstakingCoins(sdk.Context, addr sdk.AccAddress) sdk.Coins - // GetAccountStakedCoins Returns a staked coins that can't be withdrawn - GetAccountStakedCoins(sdk.Context, addr sdk.AccAddress) sdk.Coins - // GetAccountStakedPastTime Returns the total stakes of an account whose unstake time is beyond timestamp - GetAccountStakedPastTime(sdk.Context, addr sdk.AccAddress, timestamp time.Time) []types.PeriodStake - // GetAccountUnstakedBeforeTime Returns the total unstakes of an account whose unstake time is before timestamp - GetAccountUnstakedBeforeTime(sdk.Context, addr sdk.AccAddress, timestamp time.Time) []types.PeriodStake - // GetAccountStakedPastTimeDenom is equal to GetAccountStakedPastTime but denom specific - GetAccountStakedPastTimeDenom(ctx sdk.Context, addr sdk.AccAddress, denom string, timestamp time.Time) []types.PeriodStake - - // GetAccountStakedLongerDuration Returns account staked with duration longer than specified - GetAccountStakedLongerDuration(sdk.Context, addr sdk.AccAddress, duration time.Duration) []types.PeriodStake - // GetAccountStakedLongerDurationDenom Returns account staked with duration longer than specified with specific denom - GetAccountStakedLongerDurationDenom(sdk.Context, addr sdk.AccAddress, denom string, duration time.Duration) []types.PeriodStake - // GetStakesPastTimeDenom Returns the stakes whose unstake time is beyond timestamp - GetStakesPastTimeDenom(ctx sdk.Context, addr sdk.AccAddress, denom string, timestamp time.Time) []types.PeriodStake - // GetStakesLongerThanDurationDenom Returns the stakes whose unstake duration is longer than duration - GetStakesLongerThanDurationDenom(ctx sdk.Context, addr sdk.AccAddress, denom string, duration time.Duration) []types.PeriodStake - // GetStakeByID Returns stake from stakeID - GetStakeByID(sdk.Context, stakeID uint64) (*types.PeriodStake, error) - // GetPeriodStakes Returns the period stakes on pool - GetPeriodStakes(sdk.Context) ([]types.PeriodStake, error) - // UnstakeAllUnstakeableCoins Unstake all unstakeable coins - UnstakeAllUnstakeableCoins(sdk.Context, account sdk.AccAddress) (sdk.Coins, error) - // StakeTokens stake tokens from an account for specified duration - StakeTokens(sdk.Context, owner sdk.AccAddress, coins sdk.Coins, duration time.Duration) (types.PeriodStake, error) - // AddTokensToStake stakes more tokens into a stakeup - AddTokensToStake(ctx sdk.Context, owner sdk.AccAddress, stakeID uint64, coins sdk.Coins) (*types.PeriodStake, error) - // Stake is a utility to stake coins into module account - Stake(sdk.Context, stake types.PeriodStake) error - // Unstake is a utility to unstake coins from module account - Unstake(sdk.Context, stake types.PeriodStake) error -``` - -## Hooks - -In this section we describe the "hooks" that `stakeup` module provide for -other modules. - -### Tokens Staked - -On stake/unstake events, stakeup module execute hooks for other modules to -make following actions. - -``` go - OnTokenStaked(ctx sdk.Context, address sdk.AccAddress, stakeID uint64, amount sdk.Coins, stakeDuration time.Duration, unstakeTime time.Time) - OnTokenUnstaked(ctx sdk.Context, address sdk.AccAddress, stakeID uint64, amount sdk.Coins, stakeDuration time.Duration, unstakeTime time.Time) -``` - -## Parameters - -The stakeup module contains the following parameters: - -| Key | Type | Example | -| ---------------------- | --------------- | ------- | - -Note: Currently no parameters are set for `stakeup` module, we will need -to move stakeable durations from incentives module to stakeup module. - -## Endbstakeer - -### Withdraw tokens after unstake time mature - -Once time is over, endbstakeer withdraw coins from matured stakes and -coins are sent from stakeup `ModuleAccount`. - -**State modifications:** - -- Fetch all unstakeable `PeriodStake`s that `Owner` has not withdrawn - yet -- Remove `PeriodStake` records from the state -- Transfer the tokens from stakeup `ModuleAccount` to the - `MsgUnstakeTokens.Owner`. - -### Remove synthetic stakes after removal time mature - -For synthetic stakes, no coin movement is made, but stakeup record and -reference queues are removed. - - -## Transactions - -### stake-tokens - -Bond tokens in a LP for a set duration - -```sh -neutrond tx stakeup stake-tokens [tokens] --duration --from --chain-id -``` - -::: details Example - -To stakeup `15.527546134174465309gamm/pool/3` tokens for a `one day` bonding period from `WALLET_NAME` on the osmosis mainnet: - -```bash -neutrond tx stakeup stake-tokens 15527546134174465309gamm/pool/3 --duration="24h" --from WALLET_NAME --chain-id osmosis-1 -``` - -To stakeup `25.527546134174465309gamm/pool/13` tokens for a `one week` bonding period from `WALLET_NAME` on the osmosis testnet: - -```bash -neutrond tx stakeup stake-tokens 25527546134174465309gamm/pool/13 --duration="168h" --from WALLET_NAME --chain-id osmo-test-4 -``` - -To stakeup `35.527546134174465309 gamm/pool/197` tokens for a `two week` bonding period from `WALLET_NAME` on the osmosis mainnet: - -```bash -neutrond tx stakeup stake-tokens 35527546134174465309gamm/pool/197 --duration="336h" --from WALLET_NAME --chain-id osmosis-1 -``` -::: - - -### begin-unstake-by-id - -Begin the unbonding process for tokens given their unique stake ID - -```sh -neutrond tx stakeup begin-unstake-by-id [id] --from --chain-id -``` - -::: details Example - -To begin the unbonding time for all bonded tokens under id `75` from `WALLET_NAME` on the osmosis mainnet: - -```bash -neutrond tx stakeup begin-unstake-by-id 75 --from WALLET_NAME --chain-id osmosis-1 -``` -::: -::: warning Note -The ID corresponds to the unique ID given to your stakeup transaction (explained more in stake-by-id section) -::: - -### begin-unstake-tokens - -Begin unbonding process for all bonded tokens in a wallet - -```sh -neutrond tx stakeup begin-unstake-tokens --from --chain-id -``` - -::: details Example - -To begin unbonding time for ALL pools and ALL bonded tokens in `WALLET_NAME` on the osmosis mainnet: - - -```bash -neutrond tx stakeup begin-unstake-tokens --from=WALLET_NAME --chain-id=osmosis-1 --yes -``` -::: - -## Queries - -In this section we describe the queries required on grpc server. - -``` protobuf -// Query defines the gRPC QueryServer service. -service Query { - // Return full balance of the module - rpc ModuleBalance(ModuleBalanceRequest) returns (ModuleBalanceResponse); - // Return staked balance of the module - rpc ModuleStakedAmount(ModuleStakedAmountRequest) returns (ModuleStakedAmountResponse); - - // Returns unstakeable coins which are not withdrawn yet - rpc AccountUnstakeableCoins(AccountUnstakeableCoinsRequest) returns (AccountUnstakeableCoinsResponse); - // Returns unstaking coins - rpc AccountUnstakingCoins(AccountUnstakingCoinsRequest) returns (AccountUnstakingCoinsResponse) {} - // Return a staked coins that can't be withdrawn - rpc AccountStakedCoins(AccountStakedCoinsRequest) returns (AccountStakedCoinsResponse); - - // Returns staked records of an account with unstake time beyond timestamp - rpc AccountStakedPastTime(AccountStakedPastTimeRequest) returns (AccountStakedPastTimeResponse); - // Returns staked records of an account with unstake time beyond timestamp excluding tokens started unstaking - rpc AccountStakedPastTimeNotUnstakingOnly(AccountStakedPastTimeNotUnstakingOnlyRequest) returns (AccountStakedPastTimeNotUnstakingOnlyResponse) {} - // Returns unstaked records with unstake time before timestamp - rpc AccountUnstakedBeforeTime(AccountUnstakedBeforeTimeRequest) returns (AccountUnstakedBeforeTimeResponse); - - // Returns stake records by address, timestamp, denom - rpc AccountStakedPastTimeDenom(AccountStakedPastTimeDenomRequest) returns (AccountStakedPastTimeDenomResponse); - // Returns stake record by id - rpc StakedByID(StakedRequest) returns (StakedResponse); - - // Returns account staked records with longer duration - rpc AccountStakedLongerDuration(AccountStakedLongerDurationRequest) returns (AccountStakedLongerDurationResponse); - // Returns account staked records with longer duration excluding tokens started unstaking - rpc AccountStakedLongerDurationNotUnstakingOnly(AccountStakedLongerDurationNotUnstakingOnlyRequest) returns (AccountStakedLongerDurationNotUnstakingOnlyResponse) {} - // Returns account's staked records for a denom with longer duration - rpc AccountStakedLongerDurationDenom(AccountStakedLongerDurationDenomRequest) returns (AccountStakedLongerDurationDenomResponse); - - // Returns account staked records with a specific duration - rpc AccountStakedDuration(AccountStakedDurationRequest) returns (AccountStakedDurationResponse); -} -``` - -### account-staked-beforetime - -Query an account's unstaked records after a specified time (UNIX) has passed - -In other words, if an account unstaked all their bonded tokens the moment the query was executed, only the stakes that would have completed their bond time requirement by the time the `TIMESTAMP` is reached will be returned. - -::: details Example - -In this example, the current UNIX time is `1639776682`, 2 days from now is approx `1639971082`, and 15 days from now is approx `1641094282`. - -An account's `ADDRESS` is staked in both the `1 day` and `1 week` gamm/pool/3. To query the `ADDRESS` with a timestamp 2 days from now `1639971082`: - -```bash -neutrond query stakeup account-staked-beforetime ADDRESS 1639971082 -``` - -In this example will output the `1 day` stake but not the `1 week` stake: - -```bash -stakes: -- ID: "571839" - coins: - - amount: "15527546134174465309" - denom: gamm/pool/3 - duration: 24h - end_time: "2021-12-18T23:32:58.900715388Z" - owner: osmo1xqhlshlhs5g0acqgrkafdemvf5kz4pp4c2x259 -``` - -If querying the same `ADDRESS` with a timestamp 15 days from now `1641094282`: - -```bash -neutrond query stakeup account-staked-beforetime ADDRESS 1641094282 -``` - -In this example will output both the `1 day` and `1 week` stake: - -```bash -stakes: -- ID: "572027" - coins: - - amount: "16120691802759484268" - denom: gamm/pool/3 - duration: 604800.000006193s - end_time: "0001-01-01T00:00:00Z" - owner: osmo1xqhlshlhs5g0acqgrkafdemvf5kz4pp4c2x259 -- ID: "571839" - coins: - - amount: "15527546134174465309" - denom: gamm/pool/3 - duration: 24h - end_time: "2021-12-18T23:32:58.900715388Z" - owner: osmo1xqhlshlhs5g0acqgrkafdemvf5kz4pp4c2x259 -``` -::: - - -### account-staked-coins - -Query an account's staked (bonded) LP tokens - -```sh -neutrond query stakeup account-staked-coins [address] -``` - -:::: details Example - -```bash -neutrond query stakeup account-staked-coins osmo1xqhlshlhs5g0acqgrkafdemvf5kz4pp4c2x259 -``` - -An example output: - -```bash -coins: -- amount: "413553955105681228583" - denom: gamm/pool/1 -- amount: "32155370994266157441309" - denom: gamm/pool/10 -- amount: "220957857520769912023" - denom: gamm/pool/3 -- amount: "31648237936933949577" - denom: gamm/pool/42 -- amount: "14162624050980051053569" - denom: gamm/pool/5 -- amount: "1023186951315714985896914" - denom: gamm/pool/9 -``` -::: warning Note -All GAMM amounts listed are 10^18. Move the decimal place to the left 18 places to get the GAMM amount listed in the GUI. - -You may also specify a --height flag to see bonded LP tokens at a specified height (note: if running a pruned node, this may result in an error) -::: -:::: - -### account-staked-longer-duration - -Query an account's staked records that are greater than or equal to a specified stake duration - -```sh -neutrond query stakeup account-staked-longer-duration [address] [duration] -``` - -::: details Example - -Here is an example of querying an `ADDRESS` for all `1 day` or greater bonding periods: - -```bash -neutrond query stakeup account-staked-longer-duration osmo1xqhlshlhs5g0acqgrkafdemvf5kz4pp4c2x259 24h -``` - -An example output: - -```bash -stakes: -- ID: "572027" - coins: - - amount: "16120691802759484268" - denom: gamm/pool/3 - duration: 604800.000006193s - end_time: "0001-01-01T00:00:00Z" - owner: osmo1xqhlshlhs5g0acqgrkafdemvf5kz4pp4c2x259 -- ID: "571839" - coins: - - amount: "15527546134174465309" - denom: gamm/pool/3 - duration: 24h - end_time: "2021-12-18T23:32:58.900715388Z" - owner: osmo1xqhlshlhs5g0acqgrkafdemvf5kz4pp4c2x259 -``` -::: - - -### account-staked-longer-duration-denom - -Query an account's staked records for a denom that is staked equal to or greater than the specified duration AND match a specified denom - -```sh -neutrond query stakeup account-staked-longer-duration-denom [address] [duration] [denom] -``` - -::: details Example - -Here is an example of an `ADDRESS` that is staked in both the `1 day` and `1 week` for both the gamm/pool/3 and gamm/pool/1, then queries the `ADDRESS` for all bonding periods equal to or greater than `1 day` for just the gamm/pool/3: - -```bash -neutrond query stakeup account-staked-longer-duration-denom osmo1xqhlshlhs5g0acqgrkafdemvf5kz4pp4c2x259 24h gamm/pool/3 -``` - -An example output: - -```bash -stakes: -- ID: "571839" - coins: - - amount: "15527546134174465309" - denom: gamm/pool/3 - duration: 24h - end_time: "0001-01-01T00:00:00Z" - owner: osmo1xqhlshlhs5g0acqgrkafdemvf5kz4pp4c2x259 -- ID: "572027" - coins: - - amount: "16120691802759484268" - denom: gamm/pool/3 - duration: 604800.000006193s - end_time: "0001-01-01T00:00:00Z" - owner: osmo1xqhlshlhs5g0acqgrkafdemvf5kz4pp4c2x259 -``` - -As shown, the gamm/pool/3 is returned but not the gamm/pool/1 due to the denom filter. -::: - - -### account-staked-longer-duration-not-unstaking - -Query an account's staked records for a denom that is staked equal to or greater than the specified duration AND is not in the process of being unstaked - -```sh -neutrond query stakeup account-staked-longer-duration-not-unstaking [address] [duration] -``` - -::: details Example - -Here is an example of an `ADDRESS` that is staked in both the `1 day` and `1 week` gamm/pool/3, begins unstaking process for the `1 day` bond, and queries the `ADDRESS` for all bonding periods equal to or greater than `1 day` that are not unbonding: - -```bash -neutrond query stakeup account-staked-longer-duration-not-unstaking osmo1xqhlshlhs5g0acqgrkafdemvf5kz4pp4c2x259 24h -``` - -An example output: - -```bash -stakes: -- ID: "571839" - coins: - - amount: "16120691802759484268" - denom: gamm/pool/3 - duration: 604800.000006193s - end_time: "0001-01-01T00:00:00Z" - owner: osmo1xqhlshlhs5g0acqgrkafdemvf5kz4pp4c2x259 -``` - -The `1 day` bond does not show since it is in the process of unbonding. -::: - - -### account-staked-pasttime - -Query the staked records of an account with the unstake time beyond timestamp (UNIX) - -```bash -neutrond query stakeup account-staked-pasttime [address] [timestamp] -``` - -::: details Example - -Here is an example of an account that is staked in both the `1 day` and `1 week` gamm/pool/3. In this example, the UNIX time is currently `1639776682` and queries an `ADDRESS` for UNIX time two days later from the current time (which in this example would be `1639971082`) - -```bash -neutrond query stakeup account-staked-pasttime osmo1xqhlshlhs5g0acqgrkafdemvf5kz4pp4c2x259 1639971082 -``` - -The example output: - -```bash -stakes: -- ID: "572027" - coins: - - amount: "16120691802759484268" - denom: gamm/pool/3 - duration: 604800.000006193s - end_time: "0001-01-01T00:00:00Z" - owner: osmo1xqhlshlhs5g0acqgrkafdemvf5kz4pp4c2x259 -``` - -Note that the `1 day` stake ID did not display because, if the unbonding time began counting down from the time the command was executed, the bonding period would be complete before the two day window given by the UNIX timestamp input. -::: - - -### account-staked-pasttime-denom - -Query the staked records of an account with the unstake time beyond timestamp (unix) and filter by a specific denom - -```bash -neutrond query stakeup account-staked-pasttime-denom osmo1xqhlshlhs5g0acqgrkafdemvf5kz4pp4c2x259 [timestamp] [denom] -``` - -::: details Example - -Here is an example of an account that is staked in both the `1 day` and `1 week` gamm/pool/3 and `1 day` and `1 week` gamm/pool/1. In this example, the UNIX time is currently `1639776682` and queries an `ADDRESS` for UNIX time two days later from the current time (which in this example would be `1639971082`) and filters for gamm/pool/3 - -```bash -neutrond query stakeup account-staked-pasttime-denom osmo1xqhlshlhs5g0acqgrkafdemvf5kz4pp4c2x259 1639971082 gamm/pool/3 -``` - -The example output: - -```bash -stakes: -- ID: "572027" - coins: - - amount: "16120691802759484268" - denom: gamm/pool/3 - duration: 604800.000006193s - end_time: "0001-01-01T00:00:00Z" - owner: osmo1xqhlshlhs5g0acqgrkafdemvf5kz4pp4c2x259 -``` - -Note that the `1 day` stake ID did not display because, if the unbonding time began counting down from the time the command was executed, the bonding period would be complete before the two day window given by the UNIX timestamp input. Additionally, neither of the `1 day` or `1 week` stake IDs for gamm/pool/1 showed due to the denom filter. -::: - - -### account-staked-pasttime-not-unstaking - -Query the staked records of an account with the unstake time beyond timestamp (unix) AND is not in the process of unstaking - -```sh -neutrond query stakeup account-staked-pasttime [address] [timestamp] -``` - -::: details Example - -Here is an example of an account that is staked in both the `1 day` and `1 week` gamm/pool/3. In this example, the UNIX time is currently `1639776682` and queries an `ADDRESS` for UNIX time two days later from the current time (which in this example would be `1639971082`) AND is not unstaking: - -```bash -neutrond query stakeup account-staked-pasttime osmo1xqhlshlhs5g0acqgrkafdemvf5kz4pp4c2x259 1639971082 -``` - -The example output: - -```bash -stakes: -- ID: "572027" - coins: - - amount: "16120691802759484268" - denom: gamm/pool/3 - duration: 604800.000006193s - end_time: "0001-01-01T00:00:00Z" - owner: osmo1xqhlshlhs5g0acqgrkafdemvf5kz4pp4c2x259 -``` - -Note that the `1 day` stake ID did not display because, if the unbonding time began counting down from the time the command was executed, the bonding period would be complete before the two day window given by the UNIX timestamp input. Additionally, if ID 572027 were to begin the unstaking process, the query would have returned blank. -::: - - -### account-unstakeable-coins - -Query an address's LP shares that have completed the unstaking period and are ready to be withdrawn - -```bash -neutrond query stakeup account-unstakeable-coins ADDRESS -``` - - - -### account-unstaking-coins - -Query an address's LP shares that are currently unstaking - -```sh -neutrond query stakeup account-unstaking-coins [address] -``` - -::: details Example - -```bash -neutrond query stakeup account-unstaking-coins osmo1xqhlshlhs5g0acqgrkafdemvf5kz4pp4c2x259 -``` - -Example output: - -```bash -coins: -- amount: "15527546134174465309" - denom: gamm/pool/3 -``` -::: - - -### stake-by-id - -Query a stake record by its ID - -```sh -neutrond query stakeup stake-by-id [id] -``` - -::: details Example - -Every time a user bonds tokens to an LP, a unique stake ID is created for that transaction. - -Here is an example viewing the stake record for ID 9: - -```bash -neutrond query stakeup stake-by-id 9 -``` - -And its output: - -```bash -stake: - ID: "9" - coins: - - amount: "2449472670508255020346507" - denom: gamm/pool/2 - duration: 336h - end_time: "0001-01-01T00:00:00Z" - owner: osmo16r39ghhwqjcwxa8q3yswlz8jhzldygy66vlm82 -``` - -In summary, this shows wallet `osmo16r39ghhwqjcwxa8q3yswlz8jhzldygy66vlm82` bonded `2449472.670 gamm/pool/2` LP shares for a `2 week` staking period. -::: - - -### module-balance - -Query the balance of all LP shares (bonded and unbonded) - -```sh -neutrond query stakeup module-balance -``` - -::: details Example - -```bash -neutrond query stakeup module-balance -``` - -An example output: - -```bash -coins: -- amount: "118851922644152734549498647" - denom: gamm/pool/1 -- amount: "2165392672114512349039263626" - denom: gamm/pool/10 -- amount: "9346769826591025900804" - denom: gamm/pool/13 -- amount: "229347389639275840044722315" - denom: gamm/pool/15 -- amount: "81217698776012800247869" - denom: gamm/pool/183 -- amount: "284253336860259874753775" - denom: gamm/pool/197 -- amount: "664300804648059580124426710" - denom: gamm/pool/2 -- amount: "5087102794776326441530430" - denom: gamm/pool/22 -- amount: "178900843925960029029567880" - denom: gamm/pool/3 -- amount: "64845148811263846652326124" - denom: gamm/pool/4 -- amount: "177831279847453210600513" - denom: gamm/pool/42 -- amount: "18685913727862493301261661338" - denom: gamm/pool/5 -- amount: "23579028640963777558149250419" - denom: gamm/pool/6 -- amount: "1273329284855460149381904976" - denom: gamm/pool/7 -- amount: "625252103927082207683116933" - denom: gamm/pool/8 -- amount: "1148475247281090606949382402" - denom: gamm/pool/9 -``` -::: - - -### module-staked-amount - -Query the balance of all bonded LP shares - -```sh -neutrond query stakeup module-staked-amount -``` - -::: details Example - -```bash -neutrond query stakeup module-staked-amount -``` - -An example output: - -```bash - - "coins": - { - "denom": "gamm/pool/1", - "amount": "247321084020868094262821308" - }, - { - "denom": "gamm/pool/10", - "amount": "2866946821820635047398966697" - }, - { - "denom": "gamm/pool/13", - "amount": "9366580741745176812984" - }, - { - "denom": "gamm/pool/15", - "amount": "193294911294343602187680438" - }, - { - "denom": "gamm/pool/183", - "amount": "196722012808526595790871" - }, - { - "denom": "gamm/pool/197", - "amount": "1157025085661167198918241" - }, - { - "denom": "gamm/pool/2", - "amount": "633051132033131378888258047" - }, - { - "denom": "gamm/pool/22", - "amount": "3622601406125950733194696" - }, -... - -``` - -NOTE: This command seems to only work on gRPC and on CLI returns an EOF error. -::: - - - -### output-all-stakes - -Output all stakes into a json file - -```sh -neutrond query stakeup output-all-stakes [max stake ID] -``` - -:::: details Example - -This example command outputs stakes 1-1000 and saves to a json file: - -```bash -neutrond query stakeup output-all-stakes 1000 -``` -::: warning Note -If a stakeup has been completed, the stakeup status will show as "0" (or successful) and no further information will be available. To get further information on a completed stake, run the stake-by-id query. -::: -:::: - - -### total-staked-of-denom - -Query staked amount for a specific denom in the duration provided - -```sh -neutrond query stakeup total-staked-of-denom [denom] --min-duration -``` - -:::: details Example - -This example command outputs the amount of `gamm/pool/2` LP shares that staked in the `2 week` bonding period: - -```bash -neutrond query stakeup total-staked-of-denom gamm/pool/2 --min-duration "336h" -``` - -Which, at the time of this writing outputs `14106985399822075248947045` which is equivalent to `14106985.3998 gamm/pool/2` - -NOTE: As of this writing, there is a bug that defaults the min duration to days instead of seconds. Ensure you specify the time in seconds to get the correct response. -::: - -## Commands - -```sh -# 1 day 100stake stake-tokens command -neutrond tx stakeup stake-tokens 200stake --duration="86400s" --from=validator --chain-id=testing --keyring-backend=test --yes - -# 5s 100stake stake-tokens command -neutrond tx stakeup stake-tokens 100stake --duration="5s" --from=validator --chain-id=testing --keyring-backend=test --yes - -# begin unstake tokens, NOTE: add more gas when unstaking more than two stakes in a same command -neutrond tx stakeup begin-unstake-tokens --from=validator --gas=500000 --chain-id=testing --keyring-backend=test --yes - -# unstake tokens, NOTE: add more gas when unstaking more than two stakes in a same command -neutrond tx stakeup unstake-tokens --from=validator --gas=500000 --chain-id=testing --keyring-backend=test --yes - -# unstake specific period stake -neutrond tx stakeup unstake-by-id 1 --from=validator --chain-id=testing --keyring-backend=test --yes - -# account balance -neutrond query bank balances $(neutrond keys show -a validator --keyring-backend=test) - -# query module balance -neutrond query stakeup module-balance - -# query staked amount -neutrond query stakeup module-staked-amount - -# query stake by id -neutrond query stakeup stake-by-id 1 - -# query account unstakeable coins -neutrond query stakeup account-unstakeable-coins $(neutrond keys show -a validator --keyring-backend=test) - -# query account stakes by denom past time -neutrond query stakeup account-staked-pasttime-denom $(neutrond keys show -a validator --keyring-backend=test) 1611879610 stake - -# query account stakes past time -neutrond query stakeup account-staked-pasttime $(neutrond keys show -a validator --keyring-backend=test) 1611879610 - -# query account stakes by denom with longer duration -neutrond query stakeup account-staked-longer-duration-denom $(neutrond keys show -a validator --keyring-backend=test) 5.1s stake - -# query account stakes with longer duration -neutrond query stakeup account-staked-longer-duration $(neutrond keys show -a validator --keyring-backend=test) 5.1s - -# query account staked coins -neutrond query stakeup account-staked-coins $(neutrond keys show -a validator --keyring-backend=test) - -# query account stakes before time -neutrond query stakeup account-staked-beforetime $(neutrond keys show -a validator --keyring-backend=test) 1611879610 -``` From e071617be687bbf53033dd80e3448f4ca0a74ec2 Mon Sep 17 00:00:00 2001 From: Lockwarr Date: Thu, 2 Nov 2023 09:00:36 +0200 Subject: [PATCH 200/307] fix: typo --- x/interchaintxs/keeper/keeper.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x/interchaintxs/keeper/keeper.go b/x/interchaintxs/keeper/keeper.go index ac0cc37ce..be503d56f 100644 --- a/x/interchaintxs/keeper/keeper.go +++ b/x/interchaintxs/keeper/keeper.go @@ -79,7 +79,7 @@ func (k Keeper) ChargeFee(ctx sdk.Context, payer sdk.AccAddress, fee sdk.Coins) feeCollector := k.getFeeCollectorAddr(ctx) feeCollectorAddress, err := sdk.AccAddressFromBech32(feeCollector) if err != nil { - return errors.Wrapf(sdkerrors.ErrInvalidAddress, "failed to convert fee collecor, bech32 to AccAddress: %s: %s", feeCollector, err.Error()) + return errors.Wrapf(sdkerrors.ErrInvalidAddress, "failed to convert fee collector, bech32 to AccAddress: %s: %s", feeCollector, err.Error()) } err = k.bankKeeper.SendCoins(ctx, payer, feeCollectorAddress, fee) From 2c92d0b73cda4baad2fa1f57ef87133b24522c79 Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Thu, 2 Nov 2023 11:19:48 +0400 Subject: [PATCH 201/307] rename method and prefix, add comment --- app/upgrades/nextupgrade/upgrades.go | 2 +- app/upgrades/nextupgrade/upgrades_test.go | 2 +- x/interchaintxs/keeper/keeper.go | 6 +++--- x/interchaintxs/keeper/msg_server.go | 2 +- x/interchaintxs/types/keys.go | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/upgrades/nextupgrade/upgrades.go b/app/upgrades/nextupgrade/upgrades.go index 34f26a21d..58e73253d 100644 --- a/app/upgrades/nextupgrade/upgrades.go +++ b/app/upgrades/nextupgrade/upgrades.go @@ -246,7 +246,7 @@ func setInterchainTxsParams(ctx sdk.Context, paramsKeepers paramskeeper.Keeper, if bzWasm == nil { return fmt.Errorf("last code ID not found during the upgrade") } - store.Set(interchaintxstypes.FeeRegisterICACodeID, bzWasm) + store.Set(interchaintxstypes.ICARegistrationFeeFirstCodeID, bzWasm) return nil } diff --git a/app/upgrades/nextupgrade/upgrades_test.go b/app/upgrades/nextupgrade/upgrades_test.go index 80aaf32b3..999ecf24a 100644 --- a/app/upgrades/nextupgrade/upgrades_test.go +++ b/app/upgrades/nextupgrade/upgrades_test.go @@ -184,7 +184,7 @@ func (suite *UpgradeTestSuite) TestRegisterInterchainAccountCreationFee() { } app.UpgradeKeeper.ApplyUpgrade(ctx, upgrade) - lastCodeID := app.InterchainTxsKeeper.GetFeeRegisterICACodeID(ctx) + lastCodeID := app.InterchainTxsKeeper.GetICARegistrationFeeFirstCodeID(ctx) // ensure that wasm module stores next code id suite.Require().Equal(lastCodeID, codeIDBefore+1) diff --git a/x/interchaintxs/keeper/keeper.go b/x/interchaintxs/keeper/keeper.go index 74fd546ea..2899cb968 100644 --- a/x/interchaintxs/keeper/keeper.go +++ b/x/interchaintxs/keeper/keeper.go @@ -93,10 +93,10 @@ func (k Keeper) GetAuthority() string { return k.authority } -func (k Keeper) GetFeeRegisterICACodeID(ctx sdk.Context) (codeID uint64) { +// GetICARegistrationFeeFirstCodeID returns code id, starting from which we charge fee for ICA registration +func (k Keeper) GetICARegistrationFeeFirstCodeID(ctx sdk.Context) (codeID uint64) { store := ctx.KVStore(k.storeKey) - bytes := store.Get(types.FeeRegisterICACodeID) - + bytes := store.Get(types.ICARegistrationFeeFirstCodeID) if bytes == nil { k.Logger(ctx).Debug("Fee register ICA code id key don't exists, GetLastCodeID returns 0") return 0 diff --git a/x/interchaintxs/keeper/msg_server.go b/x/interchaintxs/keeper/msg_server.go index 07baf510c..ace0f34f5 100644 --- a/x/interchaintxs/keeper/msg_server.go +++ b/x/interchaintxs/keeper/msg_server.go @@ -48,7 +48,7 @@ func (k Keeper) RegisterInterchainAccount(goCtx context.Context, msg *ictxtypes. } // if contract is stored after [last] upgrade, we're not going charge fees for register ICA - if k.sudoKeeper.GetContractInfo(ctx, senderAddr).CodeID >= k.GetFeeRegisterICACodeID(ctx) { + if k.sudoKeeper.GetContractInfo(ctx, senderAddr).CodeID >= k.GetICARegistrationFeeFirstCodeID(ctx) { if err := k.ChargeFee(ctx, senderAddr, msg.RegisterFee); err != nil { return nil, errors.Wrapf(err, "failed to charge fees to pay for RegisterInterchainAccount msg: %s", msg) } diff --git a/x/interchaintxs/types/keys.go b/x/interchaintxs/types/keys.go index 8b4d7a499..7fd3d09c1 100644 --- a/x/interchaintxs/types/keys.go +++ b/x/interchaintxs/types/keys.go @@ -21,8 +21,8 @@ const ( // parameters key prefixParamsKey = iota + 1 // prefix of code id, starting from which we charge fee for ICA registration - prefixFeeRegisterICACodeID = iota + 2 + prefixICARegistrationFeeFirstCodeID = iota + 2 ) var ParamsKey = []byte{prefixParamsKey} -var FeeRegisterICACodeID = []byte{prefixFeeRegisterICACodeID} +var ICARegistrationFeeFirstCodeID = []byte{prefixICARegistrationFeeFirstCodeID} From 6c78b6ee058324aab3e28e190e09d1d05adaf672 Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Thu, 2 Nov 2023 12:07:46 +0400 Subject: [PATCH 202/307] audit report fixes --- app/upgrades/nextupgrade/constants.go | 4 +- app/upgrades/nextupgrade/upgrades.go | 8 +- go.mod | 2 +- go.sum | 4 +- wasmbinding/message_plugin.go | 115 +++++++++++++------------ x/contractmanager/module.go | 2 +- x/contractmanager/types/constants.go | 3 + x/cron/module.go | 2 +- x/cron/types/constants.go | 3 + x/feeburner/module.go | 2 +- x/feeburner/types/constants.go | 3 + x/feerefunder/module.go | 2 +- x/feerefunder/types/constants.go | 3 + x/interchainqueries/module.go | 2 +- x/interchainqueries/types/constants.go | 3 + x/interchaintxs/module.go | 2 +- x/interchaintxs/types/constants.go | 3 + x/tokenfactory/module.go | 2 +- x/tokenfactory/types/constants.go | 2 + x/transfer/ibc_handlers.go | 2 +- x/transfer/keeper/keeper.go | 1 - 21 files changed, 99 insertions(+), 71 deletions(-) create mode 100644 x/contractmanager/types/constants.go create mode 100644 x/cron/types/constants.go create mode 100644 x/feeburner/types/constants.go create mode 100644 x/feerefunder/types/constants.go create mode 100644 x/interchainqueries/types/constants.go create mode 100644 x/interchaintxs/types/constants.go diff --git a/app/upgrades/nextupgrade/constants.go b/app/upgrades/nextupgrade/constants.go index e082115a3..c6e0a35c9 100644 --- a/app/upgrades/nextupgrade/constants.go +++ b/app/upgrades/nextupgrade/constants.go @@ -10,7 +10,9 @@ import ( const ( // UpgradeName defines the on-chain upgrade name. - UpgradeName = "Next-Upgrade" + UpgradeName = "Next-Upgrade" + AtomDenom = "ibc/C4CFF46FD6DE35CA4CF4CE031E643C8FDC9BA4B99AE598E9B0ED98FE3A2319F9" + AxelarUsdcDenom = "ibc/F082B65C88E4B6D5EF1DB243CDA1D331D002759E938A0F5CD3FFDC5D53B3E349" ) var Upgrade = upgrades.Upgrade{ diff --git a/app/upgrades/nextupgrade/upgrades.go b/app/upgrades/nextupgrade/upgrades.go index 92a94d7d6..e013d261b 100644 --- a/app/upgrades/nextupgrade/upgrades.go +++ b/app/upgrades/nextupgrade/upgrades.go @@ -2,9 +2,11 @@ package nextupgrade import ( "fmt" + "github.com/cosmos/cosmos-sdk/baseapp" consensuskeeper "github.com/cosmos/cosmos-sdk/x/consensus/keeper" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" + "github.com/neutron-org/neutron/app/params" "cosmossdk.io/math" "github.com/cosmos/cosmos-sdk/codec" @@ -248,9 +250,9 @@ func migrateGlobalFees(ctx sdk.Context, keepers *upgrades.UpgradeKeepers) error // As of June 22nd, 2023 this is // 0.9untrn,0.026ibc/C4CFF46FD6DE35CA4CF4CE031E643C8FDC9BA4B99AE598E9B0ED98FE3A2319F9,0.25ibc/F082B65C88E4B6D5EF1DB243CDA1D331D002759E938A0F5CD3FFDC5D53B3E349 requiredGlobalFees := sdk.DecCoins{ - sdk.NewDecCoinFromDec("untrn", sdk.MustNewDecFromStr("0.9")), - sdk.NewDecCoinFromDec("ibc/C4CFF46FD6DE35CA4CF4CE031E643C8FDC9BA4B99AE598E9B0ED98FE3A2319F9", sdk.MustNewDecFromStr("0.026")), - sdk.NewDecCoinFromDec("ibc/F082B65C88E4B6D5EF1DB243CDA1D331D002759E938A0F5CD3FFDC5D53B3E349", sdk.MustNewDecFromStr("0.25")), + sdk.NewDecCoinFromDec(params.DefaultDenom, sdk.MustNewDecFromStr("0.9")), + sdk.NewDecCoinFromDec(AtomDenom, sdk.MustNewDecFromStr("0.026")), + sdk.NewDecCoinFromDec(AxelarUsdcDenom, sdk.MustNewDecFromStr("0.25")), } requiredGlobalFees = requiredGlobalFees.Sort() diff --git a/go.mod b/go.mod index a0f9c16f7..8cee0a7a4 100644 --- a/go.mod +++ b/go.mod @@ -191,7 +191,7 @@ replace ( github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0 github.com/ChainSafe/go-schnorrkel => github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d github.com/CosmWasm/wasmd => github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230808084410-6083b888424e - github.com/cosmos/admin-module => github.com/neutron-org/admin-module v0.0.0-20230906150724-9ccb75c61fc5 + github.com/cosmos/admin-module => github.com/neutron-org/admin-module v0.0.0-20231102080303-b3efc44ef5d9 github.com/cosmos/cosmos-sdk => github.com/neutron-org/cosmos-sdk v0.47.5 github.com/cosmos/gaia/v11 => github.com/cosmos/gaia/v11 v11.0.0-20230724152830-861ba391c3b4 github.com/cosmos/ledger-cosmos-go => github.com/cosmos/ledger-cosmos-go v0.12.1 diff --git a/go.sum b/go.sum index 1d2952b0f..6c148f995 100644 --- a/go.sum +++ b/go.sum @@ -934,8 +934,8 @@ github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxzi github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/neilotoole/errgroup v0.1.6/go.mod h1:Q2nLGf+594h0CLBs/Mbg6qOr7GtqDK7C2S41udRnToE= -github.com/neutron-org/admin-module v0.0.0-20230906150724-9ccb75c61fc5 h1:96ZjLWoN4nCIcFdxrz51Xu2Y8aqpcScy3eva3S5hM60= -github.com/neutron-org/admin-module v0.0.0-20230906150724-9ccb75c61fc5/go.mod h1:INknneN2W3Fr9Eld7SpfLRdjyHR1muzFbbqXln1ixic= +github.com/neutron-org/admin-module v0.0.0-20231102080303-b3efc44ef5d9 h1:46M72zk3g8Uff2i3Fl0Nl/vE/QVL2Fv+jfwqCYI2Ki0= +github.com/neutron-org/admin-module v0.0.0-20231102080303-b3efc44ef5d9/go.mod h1:INknneN2W3Fr9Eld7SpfLRdjyHR1muzFbbqXln1ixic= github.com/neutron-org/cosmos-sdk v0.47.5 h1:BUBqUPI5I8rF9ql3RfSCo9XkpZBJPhTZSIWexyxutA4= github.com/neutron-org/cosmos-sdk v0.47.5/go.mod h1:3uZbdGpMOT5usEich5wHANLxz0VbKE9lL1PUq+rzkS4= github.com/neutron-org/wasmd v0.40.0-rc.0.0.20230808084410-6083b888424e h1:uVJCBWf1vcCYY0pzOA2SCPIZT8WsR8fsOxs57mnJbM4= diff --git a/wasmbinding/message_plugin.go b/wasmbinding/message_plugin.go index a130dae31..a5ebcc27f 100644 --- a/wasmbinding/message_plugin.go +++ b/wasmbinding/message_plugin.go @@ -83,64 +83,69 @@ type CustomMessenger struct { var _ wasmkeeper.Messenger = (*CustomMessenger)(nil) func (m *CustomMessenger) DispatchMsg(ctx sdk.Context, contractAddr sdk.AccAddress, contractIBCPortID string, msg wasmvmtypes.CosmosMsg) ([]sdk.Event, [][]byte, error) { - if msg.Custom != nil { - var contractMsg bindings.NeutronMsg - if err := json.Unmarshal(msg.Custom, &contractMsg); err != nil { - ctx.Logger().Debug("json.Unmarshal: failed to decode incoming custom cosmos message", - "from_address", contractAddr.String(), - "message", string(msg.Custom), - "error", err, - ) - return nil, nil, errors.Wrap(err, "failed to decode incoming custom cosmos message") - } + // Return early if msg.Custom is nil + if msg.Custom == nil { + return m.Wrapped.DispatchMsg(ctx, contractAddr, contractIBCPortID, msg) + } - if contractMsg.SubmitTx != nil { - return m.submitTx(ctx, contractAddr, contractMsg.SubmitTx) - } - if contractMsg.RegisterInterchainAccount != nil { - return m.registerInterchainAccount(ctx, contractAddr, contractMsg.RegisterInterchainAccount) - } - if contractMsg.RegisterInterchainQuery != nil { - return m.registerInterchainQuery(ctx, contractAddr, contractMsg.RegisterInterchainQuery) - } - if contractMsg.UpdateInterchainQuery != nil { - return m.updateInterchainQuery(ctx, contractAddr, contractMsg.UpdateInterchainQuery) - } - if contractMsg.RemoveInterchainQuery != nil { - return m.removeInterchainQuery(ctx, contractAddr, contractMsg.RemoveInterchainQuery) - } - if contractMsg.IBCTransfer != nil { - return m.ibcTransfer(ctx, contractAddr, *contractMsg.IBCTransfer) - } - if contractMsg.SubmitAdminProposal != nil { - return m.submitAdminProposal(ctx, contractAddr, &contractMsg.SubmitAdminProposal.AdminProposal) - } - if contractMsg.CreateDenom != nil { - return m.createDenom(ctx, contractAddr, contractMsg.CreateDenom) - } - if contractMsg.MintTokens != nil { - return m.mintTokens(ctx, contractAddr, contractMsg.MintTokens) - } - if contractMsg.SetBeforeSendHook != nil { - return m.setBeforeSendHook(ctx, contractAddr, contractMsg.SetBeforeSendHook) - } - if contractMsg.ChangeAdmin != nil { - return m.changeAdmin(ctx, contractAddr, contractMsg.ChangeAdmin) - } - if contractMsg.BurnTokens != nil { - return m.burnTokens(ctx, contractAddr, contractMsg.BurnTokens) - } - if contractMsg.AddSchedule != nil { - return m.addSchedule(ctx, contractAddr, contractMsg.AddSchedule) - } - if contractMsg.RemoveSchedule != nil { - return m.removeSchedule(ctx, contractAddr, contractMsg.RemoveSchedule) - } - if contractMsg.ResubmitFailure != nil { - return m.resubmitFailure(ctx, contractAddr, contractMsg.ResubmitFailure) - } + var contractMsg bindings.NeutronMsg + if err := json.Unmarshal(msg.Custom, &contractMsg); err != nil { + ctx.Logger().Debug("json.Unmarshal: failed to decode incoming custom cosmos message", + "from_address", contractAddr.String(), + "message", string(msg.Custom), + "error", err, + ) + return nil, nil, errors.Wrap(err, "failed to decode incoming custom cosmos message") + } + + // Dispatch the message based on its type by checking each possible field + if contractMsg.SubmitTx != nil { + return m.submitTx(ctx, contractAddr, contractMsg.SubmitTx) + } + if contractMsg.RegisterInterchainAccount != nil { + return m.registerInterchainAccount(ctx, contractAddr, contractMsg.RegisterInterchainAccount) + } + if contractMsg.RegisterInterchainQuery != nil { + return m.registerInterchainQuery(ctx, contractAddr, contractMsg.RegisterInterchainQuery) + } + if contractMsg.UpdateInterchainQuery != nil { + return m.updateInterchainQuery(ctx, contractAddr, contractMsg.UpdateInterchainQuery) + } + if contractMsg.RemoveInterchainQuery != nil { + return m.removeInterchainQuery(ctx, contractAddr, contractMsg.RemoveInterchainQuery) + } + if contractMsg.IBCTransfer != nil { + return m.ibcTransfer(ctx, contractAddr, *contractMsg.IBCTransfer) + } + if contractMsg.SubmitAdminProposal != nil { + return m.submitAdminProposal(ctx, contractAddr, &contractMsg.SubmitAdminProposal.AdminProposal) + } + if contractMsg.CreateDenom != nil { + return m.createDenom(ctx, contractAddr, contractMsg.CreateDenom) + } + if contractMsg.MintTokens != nil { + return m.mintTokens(ctx, contractAddr, contractMsg.MintTokens) + } + if contractMsg.SetBeforeSendHook != nil { + return m.setBeforeSendHook(ctx, contractAddr, contractMsg.SetBeforeSendHook) + } + if contractMsg.ChangeAdmin != nil { + return m.changeAdmin(ctx, contractAddr, contractMsg.ChangeAdmin) + } + if contractMsg.BurnTokens != nil { + return m.burnTokens(ctx, contractAddr, contractMsg.BurnTokens) + } + if contractMsg.AddSchedule != nil { + return m.addSchedule(ctx, contractAddr, contractMsg.AddSchedule) + } + if contractMsg.RemoveSchedule != nil { + return m.removeSchedule(ctx, contractAddr, contractMsg.RemoveSchedule) + } + if contractMsg.ResubmitFailure != nil { + return m.resubmitFailure(ctx, contractAddr, contractMsg.ResubmitFailure) } + // If none of the conditions are met, forward the message to the wrapped handler return m.Wrapped.DispatchMsg(ctx, contractAddr, contractIBCPortID, msg) } diff --git a/x/contractmanager/module.go b/x/contractmanager/module.go index e12420b7b..a5c4f75fa 100644 --- a/x/contractmanager/module.go +++ b/x/contractmanager/module.go @@ -157,7 +157,7 @@ func (am AppModule) ExportGenesis(ctx sdk.Context, cdc codec.JSONCodec) json.Raw } // ConsensusVersion is a sequence number for state-breaking change of the module. It should be incremented on each consensus-breaking change introduced by the module. To avoid wrong/empty versions, the initial version should be set to 1 -func (AppModule) ConsensusVersion() uint64 { return 2 } +func (AppModule) ConsensusVersion() uint64 { return types.ConsensusVersion } // BeginBlock contains the logic that is automatically triggered at the beginning of each block func (am AppModule) BeginBlock(_ sdk.Context, _ abci.RequestBeginBlock) {} diff --git a/x/contractmanager/types/constants.go b/x/contractmanager/types/constants.go new file mode 100644 index 000000000..4c93fbeff --- /dev/null +++ b/x/contractmanager/types/constants.go @@ -0,0 +1,3 @@ +package types + +const ConsensusVersion = 2 diff --git a/x/cron/module.go b/x/cron/module.go index a2ba784fd..3aa173d56 100644 --- a/x/cron/module.go +++ b/x/cron/module.go @@ -153,7 +153,7 @@ func (am AppModule) ExportGenesis(ctx sdk.Context, cdc codec.JSONCodec) json.Raw } // ConsensusVersion is a sequence number for state-breaking change of the module. It should be incremented on each consensus-breaking change introduced by the module. To avoid wrong/empty versions, the initial version should be set to 1 -func (AppModule) ConsensusVersion() uint64 { return 1 } +func (AppModule) ConsensusVersion() uint64 { return types.ConsensusVersion } // BeginBlock contains the logic that is automatically triggered at the beginning of each block func (am AppModule) BeginBlock(_ sdk.Context, _ abci.RequestBeginBlock) {} diff --git a/x/cron/types/constants.go b/x/cron/types/constants.go new file mode 100644 index 000000000..6bad94d03 --- /dev/null +++ b/x/cron/types/constants.go @@ -0,0 +1,3 @@ +package types + +const ConsensusVersion = 1 diff --git a/x/feeburner/module.go b/x/feeburner/module.go index 4926f74ca..19b98ab10 100644 --- a/x/feeburner/module.go +++ b/x/feeburner/module.go @@ -150,7 +150,7 @@ func (am AppModule) ExportGenesis(ctx sdk.Context, cdc codec.JSONCodec) json.Raw } // ConsensusVersion is a sequence number for state-breaking change of the module. It should be incremented on each consensus-breaking change introduced by the module. To avoid wrong/empty versions, the initial version should be set to 1 -func (AppModule) ConsensusVersion() uint64 { return 1 } +func (AppModule) ConsensusVersion() uint64 { return types.ConsensusVersion } // BeginBlock contains the logic that is automatically triggered at the beginning of each block func (am AppModule) BeginBlock(_ sdk.Context, _ abci.RequestBeginBlock) {} diff --git a/x/feeburner/types/constants.go b/x/feeburner/types/constants.go new file mode 100644 index 000000000..6bad94d03 --- /dev/null +++ b/x/feeburner/types/constants.go @@ -0,0 +1,3 @@ +package types + +const ConsensusVersion = 1 diff --git a/x/feerefunder/module.go b/x/feerefunder/module.go index ca33f35b6..7f7d22730 100644 --- a/x/feerefunder/module.go +++ b/x/feerefunder/module.go @@ -158,7 +158,7 @@ func (am AppModule) ExportGenesis(ctx sdk.Context, cdc codec.JSONCodec) json.Raw } // ConsensusVersion is a sequence number for state-breaking change of the module. It should be incremented on each consensus-breaking change introduced by the module. To avoid wrong/empty versions, the initial version should be set to 1 -func (AppModule) ConsensusVersion() uint64 { return 1 } +func (AppModule) ConsensusVersion() uint64 { return types.ConsensusVersion } // BeginBlock contains the logic that is automatically triggered at the beginning of each block func (am AppModule) BeginBlock(_ sdk.Context, _ abci.RequestBeginBlock) {} diff --git a/x/feerefunder/types/constants.go b/x/feerefunder/types/constants.go new file mode 100644 index 000000000..6bad94d03 --- /dev/null +++ b/x/feerefunder/types/constants.go @@ -0,0 +1,3 @@ +package types + +const ConsensusVersion = 1 diff --git a/x/interchainqueries/module.go b/x/interchainqueries/module.go index 1a1dc65eb..a32d3be52 100644 --- a/x/interchainqueries/module.go +++ b/x/interchainqueries/module.go @@ -167,7 +167,7 @@ func (am AppModule) ExportGenesis(ctx sdk.Context, cdc codec.JSONCodec) json.Raw } // ConsensusVersion implements ConsensusVersion. -func (AppModule) ConsensusVersion() uint64 { return 2 } +func (AppModule) ConsensusVersion() uint64 { return types.ConsensusVersion } // BeginBlock executes all ABCI BeginBlock logic respective to the capability module. func (am AppModule) BeginBlock(_ sdk.Context, _ abci.RequestBeginBlock) {} diff --git a/x/interchainqueries/types/constants.go b/x/interchainqueries/types/constants.go new file mode 100644 index 000000000..4c93fbeff --- /dev/null +++ b/x/interchainqueries/types/constants.go @@ -0,0 +1,3 @@ +package types + +const ConsensusVersion = 2 diff --git a/x/interchaintxs/module.go b/x/interchaintxs/module.go index cbbc934ad..e29946741 100644 --- a/x/interchaintxs/module.go +++ b/x/interchaintxs/module.go @@ -167,7 +167,7 @@ func (am AppModule) ExportGenesis(ctx sdk.Context, cdc codec.JSONCodec) json.Raw } // ConsensusVersion implements ConsensusVersion. -func (AppModule) ConsensusVersion() uint64 { return 2 } +func (AppModule) ConsensusVersion() uint64 { return types.ConsensusVersion } // BeginBlock executes all ABCI BeginBlock logic respective to the capability module. func (am AppModule) BeginBlock(_ sdk.Context, _ abci.RequestBeginBlock) {} diff --git a/x/interchaintxs/types/constants.go b/x/interchaintxs/types/constants.go new file mode 100644 index 000000000..4c93fbeff --- /dev/null +++ b/x/interchaintxs/types/constants.go @@ -0,0 +1,3 @@ +package types + +const ConsensusVersion = 2 diff --git a/x/tokenfactory/module.go b/x/tokenfactory/module.go index 71f61e563..eda08a60a 100644 --- a/x/tokenfactory/module.go +++ b/x/tokenfactory/module.go @@ -158,7 +158,7 @@ func (am AppModule) ExportGenesis(ctx sdk.Context, cdc codec.JSONCodec) json.Raw } // ConsensusVersion implements ConsensusVersion. -func (AppModule) ConsensusVersion() uint64 { return 1 } +func (AppModule) ConsensusVersion() uint64 { return types.ConsensusVersion } // BeginBlock executes all ABCI BeginBlock logic respective to the tokenfactory module. func (am AppModule) BeginBlock(_ sdk.Context, _ abci.RequestBeginBlock) {} diff --git a/x/tokenfactory/types/constants.go b/x/tokenfactory/types/constants.go index ba0108ee2..b68bbb99a 100644 --- a/x/tokenfactory/types/constants.go +++ b/x/tokenfactory/types/constants.go @@ -1,3 +1,5 @@ package types +const ConsensusVersion = 1 + var TrackBeforeSendGasLimit = uint64(100_000) diff --git a/x/transfer/ibc_handlers.go b/x/transfer/ibc_handlers.go index 30ad94af3..813ef54d1 100644 --- a/x/transfer/ibc_handlers.go +++ b/x/transfer/ibc_handlers.go @@ -71,7 +71,7 @@ func (im IBCModule) HandleTimeout(ctx sdk.Context, packet channeltypes.Packet, r _, err = im.sudoKeeper.Sudo(ctx, senderAddress, msg) if err != nil { - im.keeper.Logger(ctx).Debug("HandleAcknowledgement: failed to Sudo contract on packet acknowledgement", "error", err) + im.keeper.Logger(ctx).Debug("HandleAcknowledgement: failed to Sudo contract on packet timeout", "error", err) } return nil diff --git a/x/transfer/keeper/keeper.go b/x/transfer/keeper/keeper.go index 50729540a..fdae1dcba 100644 --- a/x/transfer/keeper/keeper.go +++ b/x/transfer/keeper/keeper.go @@ -53,7 +53,6 @@ func (k KeeperTransferWrapper) Transfer(goCtx context.Context, msg *wrappedtypes } transferMsg := types.NewMsgTransfer(msg.SourcePort, msg.SourceChannel, msg.Token, msg.Sender, msg.Receiver, msg.TimeoutHeight, msg.TimeoutTimestamp, msg.Memo) - transferMsg.Memo = msg.Memo if _, err := k.Keeper.Transfer(goCtx, transferMsg); err != nil { return nil, err } From b3ddcb547f12f7517ec36ec04cd9be7887e5ca73 Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Thu, 2 Nov 2023 11:30:44 +0200 Subject: [PATCH 203/307] remove burn permissions for wasmd --- app/app.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/app.go b/app/app.go index 798cc7f48..bed82c5a8 100644 --- a/app/app.go +++ b/app/app.go @@ -226,7 +226,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, @@ -328,8 +328,8 @@ type App struct { checkTxHandler mev_lane.CheckTx // Lanes - Mempool blocksdk.Mempool - MEVLane auctionante.MEVLane + Mempool blocksdk.Mempool + MEVLane auctionante.MEVLane } func (app *App) GetTestBankKeeper() integration.TestBankKeeper { @@ -977,7 +977,6 @@ func New( mevLane.SetAnteHandler(anteHandler) baseLane.SetAnteHandler(anteHandler) - app.SetEndBlocker(app.EndBlocker) handler := blocksdkabci.NewProposalHandler( From 8fa3c19d1b188efc646273ca7ea67c442a5e3690 Mon Sep 17 00:00:00 2001 From: Julian Compagni Portis Date: Thu, 2 Nov 2023 11:53:15 -0400 Subject: [PATCH 204/307] typo: fix inconsistent dex/tx.proto naming --- proto/neutron/dex/tx.proto | 4 +- x/dex/types/tx.pb.go | 185 ++++++++++++++++++------------------- 2 files changed, 94 insertions(+), 95 deletions(-) diff --git a/proto/neutron/dex/tx.proto b/proto/neutron/dex/tx.proto index b2bacb988..37fcd83ec 100644 --- a/proto/neutron/dex/tx.proto +++ b/proto/neutron/dex/tx.proto @@ -37,13 +37,13 @@ message MsgDeposit { (gogoproto.moretags) = "yaml:\"amountsA\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false, - (gogoproto.jsontag) = "amountA" + (gogoproto.jsontag) = "amountsA" ]; repeated string amountsB = 6 [ (gogoproto.moretags) = "yaml:\"amountsB\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false, - (gogoproto.jsontag) = "amountB" + (gogoproto.jsontag) = "amountsB" ]; repeated int64 tickIndexesAToB = 7; repeated uint64 fees = 8; diff --git a/x/dex/types/tx.pb.go b/x/dex/types/tx.pb.go index a90fadfc9..488966197 100644 --- a/x/dex/types/tx.pb.go +++ b/x/dex/types/tx.pb.go @@ -121,8 +121,8 @@ type MsgDeposit struct { Receiver string `protobuf:"bytes,2,opt,name=receiver,proto3" json:"receiver,omitempty"` TokenA string `protobuf:"bytes,3,opt,name=tokenA,proto3" json:"tokenA,omitempty"` TokenB string `protobuf:"bytes,4,opt,name=tokenB,proto3" json:"tokenB,omitempty"` - AmountsA []github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,5,rep,name=amountsA,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"amountA" yaml:"amountsA"` - AmountsB []github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,6,rep,name=amountsB,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"amountB" yaml:"amountsB"` + AmountsA []github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,5,rep,name=amountsA,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"amountsA" yaml:"amountsA"` + AmountsB []github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,6,rep,name=amountsB,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"amountsB" yaml:"amountsB"` TickIndexesAToB []int64 `protobuf:"varint,7,rep,packed,name=tickIndexesAToB,proto3" json:"tickIndexesAToB,omitempty"` Fees []uint64 `protobuf:"varint,8,rep,packed,name=fees,proto3" json:"fees,omitempty"` Options []*DepositOptions `protobuf:"bytes,9,rep,name=Options,proto3" json:"Options,omitempty"` @@ -960,97 +960,96 @@ func init() { func init() { proto.RegisterFile("neutron/dex/tx.proto", fileDescriptor_a489f6e187d5e074) } var fileDescriptor_a489f6e187d5e074 = []byte{ - // 1425 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0xcf, 0x8f, 0xd3, 0xc6, - 0x17, 0x5f, 0x27, 0x21, 0xd9, 0xcc, 0xfe, 0xca, 0xce, 0x02, 0x6b, 0xc2, 0xf7, 0x9b, 0x44, 0x86, - 0x2f, 0xe4, 0xbb, 0x12, 0x09, 0xd9, 0xaa, 0x48, 0xa5, 0xa7, 0x78, 0x77, 0x69, 0x0d, 0x09, 0x59, - 0x99, 0x50, 0xd4, 0x56, 0x6a, 0xe4, 0x75, 0x86, 0xc4, 0xda, 0xd8, 0x63, 0x79, 0x26, 0x4b, 0xf6, - 0xd0, 0x43, 0x7b, 0x44, 0xad, 0xc4, 0xa5, 0x27, 0xfe, 0x81, 0xf6, 0xc6, 0x01, 0xa9, 0x87, 0xfe, - 0x03, 0x1c, 0x51, 0x7b, 0xa9, 0x7a, 0x48, 0x2b, 0x38, 0x20, 0x71, 0x5c, 0xa9, 0xf7, 0xca, 0xe3, - 0xb1, 0x63, 0x3b, 0x2c, 0xcb, 0x42, 0xdb, 0x4b, 0x32, 0xf3, 0xde, 0x67, 0x3e, 0xef, 0xcd, 0x9b, - 0x37, 0xef, 0x8d, 0xc1, 0x49, 0x0b, 0x0d, 0xa9, 0x83, 0xad, 0x6a, 0x17, 0x8d, 0xaa, 0x74, 0x54, - 0xb1, 0x1d, 0x4c, 0x31, 0x9c, 0xe3, 0xd2, 0x4a, 0x17, 0x8d, 0xf2, 0x27, 0x7b, 0xb8, 0x87, 0x99, - 0xbc, 0xea, 0x8e, 0x3c, 0x48, 0xbe, 0xa0, 0x63, 0x62, 0x62, 0x52, 0xdd, 0xd1, 0x08, 0xaa, 0xee, - 0xd5, 0x76, 0x10, 0xd5, 0x6a, 0x55, 0x1d, 0x1b, 0x16, 0xd7, 0x17, 0x7b, 0x18, 0xf7, 0x06, 0xa8, - 0xca, 0x66, 0x3b, 0xc3, 0xbb, 0x55, 0x6a, 0x98, 0x88, 0x50, 0xcd, 0xb4, 0x39, 0x60, 0x59, 0x33, - 0x0d, 0x0b, 0x57, 0xd9, 0x2f, 0x17, 0x89, 0x61, 0x67, 0x6c, 0xcd, 0xd1, 0x4c, 0xc2, 0x35, 0xab, - 0xdc, 0x9a, 0x49, 0x7a, 0xd5, 0xbd, 0x9a, 0xfb, 0xc7, 0x15, 0x67, 0x3c, 0x45, 0xc7, 0xf3, 0xcf, - 0x9b, 0x78, 0x2a, 0xe9, 0x43, 0xb0, 0xb8, 0x89, 0x6c, 0x4c, 0x0c, 0xda, 0xb2, 0xa9, 0x81, 0x2d, - 0x02, 0xff, 0x0f, 0x72, 0x5d, 0x83, 0x68, 0x3b, 0x03, 0xd4, 0xd1, 0x86, 0x14, 0x93, 0x7b, 0x9a, - 0x2d, 0x0a, 0x25, 0xa1, 0x3c, 0xab, 0x2e, 0x71, 0x79, 0x9d, 0x8b, 0xa5, 0x9f, 0x92, 0x00, 0x34, - 0x49, 0x8f, 0x13, 0x40, 0x11, 0x64, 0x74, 0x07, 0x69, 0x14, 0x3b, 0x6c, 0x41, 0x56, 0xf5, 0xa7, - 0x30, 0x0f, 0x66, 0x1d, 0xa4, 0x23, 0x63, 0x0f, 0x39, 0x62, 0x82, 0xa9, 0x82, 0x39, 0x3c, 0x0d, - 0xd2, 0x14, 0xef, 0x22, 0xab, 0x2e, 0x26, 0x99, 0x86, 0xcf, 0x02, 0xb9, 0x2c, 0xa6, 0x42, 0x72, - 0x19, 0xf6, 0xc1, 0xac, 0x66, 0xe2, 0xa1, 0x45, 0x49, 0x5d, 0x3c, 0x51, 0x4a, 0x96, 0xb3, 0x72, - 0xe3, 0xc9, 0xb8, 0x38, 0xf3, 0xdb, 0xb8, 0x78, 0xa1, 0x67, 0xd0, 0xfe, 0x70, 0xa7, 0xa2, 0x63, - 0x93, 0x6f, 0x92, 0xff, 0x5d, 0x22, 0xdd, 0xdd, 0x2a, 0xdd, 0xb7, 0x11, 0xa9, 0x28, 0x16, 0x7d, - 0x39, 0x2e, 0x66, 0x3c, 0x86, 0xfa, 0xc1, 0xb8, 0xb8, 0xb4, 0xaf, 0x99, 0x83, 0xab, 0x92, 0x4f, - 0x29, 0xa9, 0x01, 0x7b, 0xc8, 0x92, 0x2c, 0xa6, 0xdf, 0xcd, 0x92, 0x3c, 0x65, 0x49, 0x9e, 0x58, - 0x92, 0x61, 0x19, 0x2c, 0x51, 0x43, 0xdf, 0x55, 0xac, 0x2e, 0x1a, 0x21, 0x52, 0x6f, 0x63, 0x59, - 0xcc, 0x94, 0x92, 0xe5, 0xa4, 0x1a, 0x17, 0x43, 0x08, 0x52, 0x77, 0x11, 0x22, 0xe2, 0x6c, 0x29, - 0x59, 0x4e, 0xa9, 0x6c, 0x0c, 0xdf, 0x07, 0x19, 0x7e, 0x78, 0x62, 0xb6, 0x94, 0x2c, 0xcf, 0xad, - 0x9f, 0xad, 0x84, 0x52, 0xb3, 0x12, 0x3d, 0x5f, 0xd5, 0xc7, 0x4a, 0x8f, 0x13, 0x00, 0x4e, 0x4e, - 0x4f, 0x45, 0xc4, 0xc6, 0x16, 0x41, 0xf0, 0x5b, 0x01, 0x2c, 0xab, 0x88, 0x20, 0x67, 0x0f, 0x5d, - 0xe6, 0x3a, 0xd4, 0x15, 0x05, 0xb6, 0xff, 0xce, 0xb1, 0xf7, 0xbf, 0xec, 0xc4, 0xa9, 0x0e, 0xc6, - 0x45, 0xd1, 0x8b, 0xc4, 0x94, 0x4a, 0x52, 0xa7, 0x2d, 0x87, 0xfd, 0xa9, 0x4d, 0xfc, 0x49, 0xbc, - 0xa3, 0x3f, 0xb5, 0xc3, 0xfd, 0xa9, 0xbd, 0xc2, 0x9f, 0x90, 0xec, 0xc7, 0x04, 0x58, 0x68, 0x92, - 0xde, 0x1d, 0x83, 0xf6, 0xbb, 0x8e, 0x76, 0x4f, 0x1b, 0xfc, 0x4b, 0x79, 0xff, 0x95, 0x00, 0x16, - 0x49, 0x5f, 0x73, 0x10, 0x69, 0x63, 0x15, 0x99, 0x78, 0x0f, 0xf1, 0xf4, 0xff, 0xf4, 0xd8, 0x41, - 0x88, 0xf1, 0x1c, 0x8c, 0x8b, 0xa7, 0xbc, 0x08, 0x44, 0xe5, 0x92, 0x1a, 0x03, 0xbe, 0x2a, 0x4f, - 0xd3, 0xaf, 0xcf, 0xd3, 0xcc, 0x24, 0x4f, 0xa5, 0x55, 0x70, 0x2a, 0x12, 0x38, 0x3f, 0xe5, 0xa4, - 0x87, 0x29, 0x96, 0x89, 0xdb, 0x03, 0x4d, 0x47, 0x0d, 0xc3, 0x34, 0x68, 0xcb, 0xe9, 0x22, 0xe7, - 0x2d, 0xe3, 0x2a, 0x82, 0x0c, 0x8b, 0x98, 0x62, 0xf1, 0xc0, 0xfa, 0x53, 0x77, 0x15, 0x1b, 0xb6, - 0x86, 0x94, 0xc7, 0x36, 0x98, 0xc3, 0x35, 0x90, 0x0b, 0xb6, 0xa0, 0x58, 0x6d, 0xec, 0x62, 0x4e, - 0x94, 0x84, 0x72, 0x52, 0x9d, 0x92, 0x43, 0xc3, 0xaf, 0x0b, 0x8a, 0x25, 0x66, 0x5c, 0x1e, 0xb9, - 0x79, 0xec, 0x23, 0x08, 0x18, 0xe2, 0x85, 0x41, 0xb1, 0x82, 0xc2, 0xa0, 0x58, 0xf0, 0x03, 0x90, - 0xc5, 0x6e, 0x2c, 0xda, 0xfb, 0x36, 0x12, 0x67, 0x4b, 0x42, 0x79, 0x31, 0x76, 0xb9, 0x27, 0xe1, - 0x72, 0x21, 0xea, 0x04, 0x0d, 0x1b, 0x60, 0x11, 0x8d, 0x6c, 0xc3, 0xd1, 0xdc, 0xdb, 0xde, 0x36, - 0x4c, 0x24, 0x66, 0x4b, 0x42, 0x79, 0x6e, 0x3d, 0x5f, 0xf1, 0x9a, 0x4e, 0xc5, 0x6f, 0x3a, 0x95, - 0xb6, 0xdf, 0x74, 0xe4, 0xd9, 0x27, 0xe3, 0xa2, 0xf0, 0xe0, 0xf7, 0xa2, 0xa0, 0xc6, 0xd6, 0xc2, - 0x7d, 0x30, 0x6f, 0x6a, 0xa3, 0x3a, 0xf3, 0xcb, 0x8d, 0x0d, 0x60, 0xfb, 0xbe, 0xed, 0xe2, 0x8f, - 0xb5, 0xef, 0x08, 0xcb, 0xc1, 0xb8, 0xb8, 0xe2, 0xed, 0x3d, 0x2c, 0x95, 0xd4, 0x08, 0x48, 0xfa, - 0x25, 0x01, 0xf2, 0xd3, 0xd9, 0x11, 0xd4, 0xab, 0x02, 0x00, 0xd4, 0xd1, 0x2c, 0xbd, 0x8f, 0x6e, - 0xa0, 0x7d, 0x9e, 0x28, 0x21, 0x09, 0xfc, 0x12, 0xa4, 0xdd, 0x8e, 0xab, 0x58, 0x2c, 0x53, 0xe6, - 0xd6, 0xcf, 0x54, 0x78, 0x03, 0x74, 0x9b, 0x72, 0x85, 0x37, 0xe5, 0xca, 0x06, 0x36, 0x2c, 0xf9, - 0x3a, 0x3f, 0xc6, 0x8b, 0x6f, 0xb0, 0x1d, 0x77, 0xc1, 0xcb, 0x71, 0x91, 0x73, 0x1f, 0x8c, 0x8b, - 0x0b, 0xde, 0x4e, 0xbc, 0xb9, 0xa4, 0x72, 0x05, 0xfc, 0x4e, 0x00, 0xf3, 0x54, 0xdb, 0x45, 0x8e, - 0xbb, 0xc0, 0x8d, 0x5c, 0xf2, 0x28, 0x2f, 0x3e, 0x39, 0xbe, 0x17, 0x11, 0x0b, 0x93, 0xa8, 0x86, - 0xa5, 0x92, 0x1a, 0x01, 0x49, 0x77, 0xc0, 0xd9, 0xd0, 0x65, 0xbc, 0x66, 0x0c, 0x06, 0xa8, 0xfb, - 0x46, 0x77, 0x2f, 0x1a, 0xef, 0x44, 0x3c, 0xde, 0xd2, 0xff, 0xc0, 0xb9, 0xd7, 0x10, 0x07, 0x77, - 0xbe, 0x05, 0x56, 0x9a, 0xa4, 0xb7, 0xa1, 0x59, 0x3a, 0x1a, 0xfc, 0x2d, 0x76, 0xff, 0xcb, 0x36, - 0x14, 0x27, 0x0c, 0xec, 0x9d, 0x03, 0x0b, 0xcd, 0xe1, 0x80, 0x1a, 0x1f, 0x63, 0x5b, 0xc5, 0x43, - 0x8a, 0xdc, 0x0a, 0xd5, 0xc7, 0x36, 0xf1, 0x3a, 0x9b, 0xca, 0xc6, 0xd2, 0xc3, 0x24, 0x58, 0x6a, - 0x92, 0x9e, 0x0f, 0xbc, 0x75, 0x4f, 0xb3, 0xdf, 0xb2, 0x0a, 0xad, 0x83, 0xb4, 0xe3, 0x9a, 0x21, - 0x62, 0x92, 0xb5, 0xe4, 0x7c, 0xe4, 0xd6, 0x46, 0x3c, 0x51, 0x39, 0x32, 0x52, 0x57, 0x52, 0xff, - 0x6c, 0x5d, 0xf9, 0x46, 0x70, 0xab, 0x83, 0x41, 0x59, 0xa0, 0xb6, 0x1d, 0x43, 0x47, 0xac, 0xda, - 0x65, 0xe5, 0x2e, 0xb7, 0x58, 0x0b, 0x59, 0xe4, 0x9e, 0x5f, 0xc2, 0x4e, 0xcf, 0x1f, 0x57, 0x87, - 0xd4, 0x18, 0x90, 0xaa, 0xa9, 0xd1, 0x7e, 0x65, 0xdb, 0x41, 0xfa, 0x26, 0xd2, 0xdd, 0xbe, 0x12, - 0xa5, 0x9c, 0xf4, 0x95, 0xa8, 0x5c, 0x52, 0x63, 0x40, 0x78, 0x1e, 0x2c, 0xd8, 0x86, 0xbe, 0x2b, - 0x23, 0x42, 0x59, 0x48, 0xc4, 0x34, 0x7b, 0x70, 0x46, 0x85, 0xd2, 0x7d, 0x01, 0xac, 0xc6, 0x4e, - 0x27, 0xa8, 0x02, 0x18, 0x64, 0x74, 0x7e, 0xc1, 0x84, 0xa3, 0x2e, 0xd8, 0xd5, 0xe3, 0x5f, 0x30, - 0x9f, 0x5c, 0xf5, 0x07, 0xd2, 0x0f, 0x02, 0x4b, 0x95, 0xdb, 0x76, 0x57, 0xa3, 0x68, 0x9b, 0x3d, - 0xc3, 0xe1, 0x15, 0x90, 0xd5, 0x86, 0xb4, 0x8f, 0x1d, 0x83, 0xf2, 0x4a, 0x24, 0x8b, 0x3f, 0x3f, - 0xbe, 0x74, 0x92, 0x7b, 0x52, 0xef, 0x76, 0x1d, 0x44, 0xc8, 0x2d, 0xea, 0x18, 0x56, 0x4f, 0x9d, - 0x40, 0xe1, 0x15, 0x90, 0xf6, 0x1e, 0xf2, 0xbc, 0x44, 0xad, 0x44, 0x92, 0xc5, 0x23, 0x97, 0xb3, - 0xae, 0xd7, 0xdf, 0xbf, 0x78, 0xb4, 0x26, 0xa8, 0x1c, 0x7d, 0xf5, 0xc2, 0xd7, 0x2f, 0x1e, 0xad, - 0x4d, 0x78, 0xee, 0xbf, 0x78, 0xb4, 0xb6, 0xe2, 0x7e, 0x15, 0xc4, 0xfc, 0x92, 0xce, 0xb0, 0xb8, - 0x85, 0x45, 0x7e, 0xdc, 0xd6, 0x46, 0x60, 0x31, 0xda, 0x42, 0xe0, 0x69, 0x00, 0x3f, 0x6a, 0xb5, - 0x36, 0x3b, 0x6d, 0xa5, 0xd1, 0xd9, 0xa8, 0xdf, 0xdc, 0xd8, 0x6a, 0x34, 0xb6, 0x36, 0x73, 0x33, - 0x30, 0x07, 0xe6, 0xaf, 0x29, 0x8d, 0x46, 0xa7, 0xa5, 0x76, 0x6e, 0x28, 0x8d, 0x46, 0x4e, 0x80, - 0xab, 0x60, 0x45, 0x69, 0x36, 0xb7, 0x36, 0x95, 0x7a, 0x7b, 0xcb, 0x15, 0x7b, 0xe8, 0x5c, 0xc2, - 0x85, 0x5e, 0xbf, 0x7d, 0xab, 0xdd, 0x51, 0x6e, 0x76, 0xda, 0x4a, 0x73, 0x2b, 0x97, 0x84, 0xcb, - 0x60, 0x21, 0x20, 0x65, 0xa2, 0xd4, 0xfa, 0x9f, 0x29, 0x90, 0x6c, 0x92, 0x1e, 0xdc, 0x00, 0x19, - 0xff, 0x03, 0x62, 0x35, 0x7a, 0x49, 0x82, 0xb7, 0x69, 0xbe, 0x78, 0x88, 0x22, 0x38, 0xfe, 0x06, - 0x00, 0xa1, 0x07, 0x59, 0x3e, 0x0e, 0x9f, 0xe8, 0xf2, 0xd2, 0xe1, 0xba, 0x80, 0xed, 0x73, 0xb0, - 0x14, 0x7f, 0x8b, 0x4c, 0x79, 0x10, 0x03, 0xe4, 0x2f, 0x1e, 0x01, 0x08, 0xc8, 0xf7, 0x80, 0x78, - 0x68, 0xd5, 0x2d, 0x1f, 0xe6, 0x5c, 0x1c, 0x99, 0xbf, 0xfc, 0xa6, 0xc8, 0xc0, 0xee, 0x17, 0x20, - 0x37, 0x55, 0x6d, 0x4b, 0x71, 0x96, 0x38, 0x22, 0x5f, 0x3e, 0x0a, 0x11, 0xf0, 0xab, 0x60, 0x3e, - 0x52, 0x37, 0xff, 0x13, 0x5f, 0x19, 0xd6, 0xe6, 0xcf, 0xbf, 0x4e, 0x1b, 0xe6, 0x8c, 0x5c, 0xb0, - 0x29, 0xce, 0xb0, 0x76, 0x9a, 0xf3, 0x55, 0x19, 0x2f, 0x6f, 0x3e, 0x79, 0x56, 0x10, 0x9e, 0x3e, - 0x2b, 0x08, 0x7f, 0x3c, 0x2b, 0x08, 0x0f, 0x9e, 0x17, 0x66, 0x9e, 0x3e, 0x2f, 0xcc, 0xfc, 0xfa, - 0xbc, 0x30, 0xf3, 0xd9, 0xda, 0x11, 0x35, 0x6f, 0xe4, 0x7d, 0xff, 0xbb, 0x75, 0x61, 0x27, 0xcd, - 0x5e, 0x4f, 0xef, 0xfd, 0x15, 0x00, 0x00, 0xff, 0xff, 0xba, 0xdd, 0x59, 0x72, 0x1b, 0x10, 0x00, - 0x00, + // 1420 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0xcf, 0x6f, 0x13, 0xc7, + 0x17, 0xcf, 0xda, 0xc6, 0x8e, 0x27, 0xbf, 0x9c, 0x09, 0x90, 0xc5, 0x7c, 0xbf, 0xb6, 0xb5, 0xf0, + 0x05, 0x7f, 0x23, 0x61, 0xe3, 0x54, 0x45, 0x2a, 0x3d, 0x79, 0x93, 0xd0, 0x2e, 0xd8, 0x38, 0x5a, + 0x4c, 0x51, 0x5b, 0xa9, 0xd6, 0x66, 0x3d, 0xd8, 0xab, 0x78, 0x77, 0x56, 0x3b, 0xe3, 0xe0, 0x1c, + 0x7a, 0x68, 0x8f, 0xa8, 0x95, 0xb8, 0xf4, 0xc4, 0x3f, 0xd0, 0xde, 0x38, 0x20, 0xf5, 0xd4, 0x3b, + 0x47, 0xd4, 0x5e, 0xaa, 0x1e, 0xdc, 0x0a, 0x0e, 0x48, 0x1c, 0x23, 0xf5, 0x5e, 0xed, 0xec, 0xec, + 0x7a, 0x77, 0x4d, 0x08, 0x81, 0xb6, 0x17, 0xb2, 0xf3, 0xde, 0x67, 0xde, 0x7b, 0xf3, 0x99, 0xf7, + 0x63, 0x0c, 0x38, 0x69, 0xa1, 0x21, 0x75, 0xb0, 0x55, 0xed, 0xa2, 0x51, 0x95, 0x8e, 0x2a, 0xb6, + 0x83, 0x29, 0x86, 0x73, 0x5c, 0x5a, 0xe9, 0xa2, 0x51, 0xfe, 0x64, 0x0f, 0xf7, 0x30, 0x93, 0x57, + 0xdd, 0x2f, 0x0f, 0x92, 0x2f, 0xe8, 0x98, 0x98, 0x98, 0x54, 0x77, 0x34, 0x82, 0xaa, 0x7b, 0xb5, + 0x1d, 0x44, 0xb5, 0x5a, 0x55, 0xc7, 0x86, 0xc5, 0xf5, 0xc5, 0x1e, 0xc6, 0xbd, 0x01, 0xaa, 0xb2, + 0xd5, 0xce, 0xf0, 0x6e, 0x95, 0x1a, 0x26, 0x22, 0x54, 0x33, 0x6d, 0x0e, 0x58, 0xd6, 0x4c, 0xc3, + 0xc2, 0x55, 0xf6, 0x2f, 0x17, 0x89, 0xe1, 0x60, 0x6c, 0xcd, 0xd1, 0x4c, 0xc2, 0x35, 0xab, 0xdc, + 0x9b, 0x49, 0x7a, 0xd5, 0xbd, 0x9a, 0xfb, 0x87, 0x2b, 0xce, 0x78, 0x8a, 0x8e, 0x17, 0x9f, 0xb7, + 0xf0, 0x54, 0xd2, 0x87, 0x60, 0x71, 0x13, 0xd9, 0x98, 0x18, 0xb4, 0x65, 0x53, 0x03, 0x5b, 0x04, + 0xfe, 0x1f, 0xe4, 0xba, 0x06, 0xd1, 0x76, 0x06, 0xa8, 0xa3, 0x0d, 0x29, 0x26, 0xf7, 0x34, 0x5b, + 0x14, 0x4a, 0x42, 0x79, 0x56, 0x5d, 0xe2, 0xf2, 0x3a, 0x17, 0x4b, 0x3f, 0x25, 0x01, 0x68, 0x92, + 0x1e, 0x37, 0x00, 0x45, 0x90, 0xd1, 0x1d, 0xa4, 0x51, 0xec, 0xb0, 0x0d, 0x59, 0xd5, 0x5f, 0xc2, + 0x3c, 0x98, 0x75, 0x90, 0x8e, 0x8c, 0x3d, 0xe4, 0x88, 0x09, 0xa6, 0x0a, 0xd6, 0xf0, 0x34, 0x48, + 0x53, 0xbc, 0x8b, 0xac, 0xba, 0x98, 0x64, 0x1a, 0xbe, 0x0a, 0xe4, 0xb2, 0x98, 0x0a, 0xc9, 0x65, + 0x68, 0x80, 0x59, 0xcd, 0xc4, 0x43, 0x8b, 0x92, 0xba, 0x78, 0xa2, 0x94, 0x2c, 0x67, 0xe5, 0xe6, + 0x93, 0x71, 0x71, 0xe6, 0xb7, 0x71, 0xf1, 0x42, 0xcf, 0xa0, 0xfd, 0xe1, 0x4e, 0x45, 0xc7, 0x26, + 0x3f, 0x24, 0xff, 0x73, 0x89, 0x74, 0x77, 0xab, 0x74, 0xdf, 0x46, 0xa4, 0xa2, 0x58, 0xf4, 0xe5, + 0xb8, 0x18, 0x58, 0x38, 0x18, 0x17, 0x97, 0xf6, 0x35, 0x73, 0x70, 0x55, 0xf2, 0x25, 0x92, 0x1a, + 0x28, 0x43, 0xae, 0x64, 0x31, 0xfd, 0x8e, 0xae, 0xe4, 0x29, 0x57, 0xf2, 0xc4, 0x95, 0x0c, 0xcb, + 0x60, 0x89, 0x1a, 0xfa, 0xae, 0x62, 0x75, 0xd1, 0x08, 0x91, 0x7a, 0x1b, 0xcb, 0x62, 0xa6, 0x94, + 0x2c, 0x27, 0xd5, 0xb8, 0x18, 0x42, 0x90, 0xba, 0x8b, 0x10, 0x11, 0x67, 0x4b, 0xc9, 0x72, 0x4a, + 0x65, 0xdf, 0xf0, 0x7d, 0x90, 0xe1, 0xd7, 0x27, 0x66, 0x4b, 0xc9, 0xf2, 0xdc, 0xfa, 0xd9, 0x4a, + 0x28, 0x39, 0x2b, 0xd1, 0x1b, 0x56, 0x7d, 0xac, 0xf4, 0x38, 0x01, 0xe0, 0xe4, 0xfe, 0x54, 0x44, + 0x6c, 0x6c, 0x11, 0x04, 0xbf, 0x15, 0xc0, 0xb2, 0x8a, 0x08, 0x72, 0xf6, 0xd0, 0x65, 0xae, 0x43, + 0x5d, 0x51, 0x60, 0x04, 0x74, 0x8e, 0x4d, 0xc0, 0xb2, 0x13, 0x37, 0x75, 0x30, 0x2e, 0x8a, 0x1e, + 0x13, 0x53, 0x2a, 0x49, 0x9d, 0xf6, 0x1c, 0x8e, 0xa7, 0x36, 0x89, 0x27, 0xf1, 0x8e, 0xf1, 0xd4, + 0x0e, 0x8f, 0xa7, 0xf6, 0x8a, 0x78, 0x42, 0xb2, 0x1f, 0x13, 0x60, 0xa1, 0x49, 0x7a, 0x77, 0x0c, + 0xda, 0xef, 0x3a, 0xda, 0x3d, 0x6d, 0xf0, 0x2f, 0x65, 0xfe, 0x57, 0x02, 0x58, 0x24, 0x7d, 0xcd, + 0x41, 0xa4, 0x8d, 0x55, 0x64, 0xe2, 0x3d, 0xc4, 0x0b, 0xe0, 0xd3, 0x63, 0x93, 0x10, 0xb3, 0x73, + 0x30, 0x2e, 0x9e, 0xf2, 0x18, 0x88, 0xca, 0x25, 0x35, 0x06, 0x7c, 0x55, 0x9e, 0xa6, 0x5f, 0x9f, + 0xa7, 0x99, 0x49, 0x9e, 0x4a, 0xab, 0xe0, 0x54, 0x84, 0x38, 0x3f, 0xe5, 0xa4, 0x87, 0x29, 0x96, + 0x89, 0xdb, 0x03, 0x4d, 0x47, 0x0d, 0xc3, 0x34, 0x68, 0xcb, 0xe9, 0x22, 0xe7, 0x2d, 0x79, 0x15, + 0x41, 0x86, 0x31, 0xa6, 0x58, 0x9c, 0x58, 0x7f, 0xe9, 0xee, 0x62, 0x9f, 0xad, 0x21, 0xe5, 0xdc, + 0x06, 0x6b, 0xb8, 0x06, 0x72, 0xc1, 0x11, 0x14, 0xab, 0x8d, 0x5d, 0xcc, 0x89, 0x92, 0x50, 0x4e, + 0xaa, 0x53, 0xf2, 0x49, 0x63, 0x50, 0x2c, 0x31, 0xe3, 0xda, 0x79, 0xfb, 0xc6, 0xa0, 0x58, 0xf1, + 0xc6, 0xa0, 0x58, 0x41, 0x63, 0x50, 0x2c, 0xf8, 0x01, 0xc8, 0x62, 0x97, 0x8b, 0xf6, 0xbe, 0x8d, + 0xc4, 0xd9, 0x92, 0x50, 0x5e, 0x8c, 0x15, 0xf7, 0x84, 0x2e, 0x17, 0xa2, 0x4e, 0xd0, 0xb0, 0x01, + 0x16, 0xd1, 0xc8, 0x36, 0x1c, 0xcd, 0xad, 0xf6, 0xb6, 0x61, 0x22, 0x31, 0x5b, 0x12, 0xca, 0x73, + 0xeb, 0xf9, 0x8a, 0x37, 0x76, 0x2a, 0xfe, 0xd8, 0xa9, 0xb4, 0xfd, 0xb1, 0x23, 0xcf, 0x3e, 0x19, + 0x17, 0x85, 0x07, 0xbf, 0x17, 0x05, 0x35, 0xb6, 0x17, 0xee, 0x83, 0x79, 0x53, 0x1b, 0xd5, 0x59, + 0x5c, 0x2e, 0x37, 0x80, 0x9d, 0xfb, 0xb6, 0x8b, 0x3f, 0xd6, 0xb9, 0x23, 0x56, 0x0e, 0xc6, 0xc5, + 0x15, 0xef, 0xec, 0x61, 0xa9, 0xa4, 0x46, 0x40, 0xd2, 0x2f, 0x09, 0x90, 0x9f, 0xce, 0x8e, 0xa0, + 0x5f, 0x15, 0x00, 0xa0, 0x8e, 0x66, 0xe9, 0x7d, 0x74, 0x03, 0xed, 0xf3, 0x44, 0x09, 0x49, 0xe0, + 0x97, 0x20, 0xed, 0xce, 0x5c, 0xc5, 0x62, 0x99, 0x32, 0xb7, 0x7e, 0xa6, 0xc2, 0x47, 0xa0, 0x3b, + 0x96, 0x2b, 0x7c, 0x2c, 0x57, 0x36, 0xb0, 0x61, 0xc9, 0xd7, 0xf9, 0x35, 0x5e, 0x7c, 0x83, 0xe3, + 0xb8, 0x1b, 0x5e, 0x8e, 0x8b, 0xdc, 0xf6, 0xc1, 0xb8, 0xb8, 0xe0, 0x9d, 0xc4, 0x5b, 0x4b, 0x2a, + 0x57, 0xc0, 0xef, 0x04, 0x30, 0x4f, 0xb5, 0x5d, 0xe4, 0xb8, 0x1b, 0x5c, 0xe6, 0x92, 0x47, 0x45, + 0xf1, 0xc9, 0xf1, 0xa3, 0x88, 0x78, 0x98, 0xb0, 0x1a, 0x96, 0x4a, 0x6a, 0x04, 0x24, 0xdd, 0x01, + 0x67, 0x43, 0xc5, 0x78, 0xcd, 0x18, 0x0c, 0x50, 0xf7, 0x8d, 0x6a, 0x2f, 0xca, 0x77, 0x22, 0xce, + 0xb7, 0xf4, 0x3f, 0x70, 0xee, 0x35, 0x86, 0x83, 0x9a, 0x6f, 0x81, 0x95, 0x26, 0xe9, 0x6d, 0x68, + 0x96, 0x8e, 0x06, 0x7f, 0x8b, 0xdf, 0xff, 0xb2, 0x03, 0xc5, 0x0d, 0x06, 0xfe, 0xce, 0x81, 0x85, + 0xe6, 0x70, 0x40, 0x8d, 0x8f, 0xb1, 0xad, 0xe2, 0x21, 0x45, 0x6e, 0x87, 0xea, 0x63, 0x9b, 0x78, + 0x93, 0x4d, 0x65, 0xdf, 0xd2, 0xc3, 0x24, 0x58, 0x6a, 0x92, 0x9e, 0x0f, 0xbc, 0x75, 0x4f, 0xb3, + 0xdf, 0xb2, 0x0b, 0xad, 0x83, 0xb4, 0xe3, 0xba, 0x21, 0x62, 0x92, 0x8d, 0xe4, 0x7c, 0xa4, 0x6a, + 0x23, 0x91, 0xa8, 0x1c, 0x19, 0xe9, 0x2b, 0xa9, 0x7f, 0xb6, 0xaf, 0x7c, 0x23, 0xb8, 0xdd, 0xc1, + 0xa0, 0x8c, 0xa8, 0x6d, 0xc7, 0xd0, 0x11, 0xeb, 0x76, 0x59, 0xb9, 0xcb, 0x3d, 0xd6, 0x42, 0x1e, + 0x79, 0xe4, 0x97, 0xb0, 0xd3, 0xf3, 0xbf, 0xab, 0x43, 0x6a, 0x0c, 0x48, 0xd5, 0xd4, 0x68, 0xbf, + 0xb2, 0xed, 0x20, 0x7d, 0x13, 0xe9, 0xee, 0x5c, 0x89, 0x9a, 0x9c, 0xcc, 0x95, 0xa8, 0x5c, 0x52, + 0x63, 0x40, 0x78, 0x1e, 0x2c, 0xd8, 0x86, 0xbe, 0x2b, 0x23, 0x42, 0x19, 0x25, 0x62, 0x9a, 0x3d, + 0x39, 0xa3, 0x42, 0xe9, 0xbe, 0x00, 0x56, 0x63, 0xb7, 0x13, 0x74, 0x01, 0x0c, 0x32, 0x3a, 0x2f, + 0x30, 0xe1, 0xa8, 0x02, 0xbb, 0x7a, 0xfc, 0x02, 0xf3, 0x8d, 0xab, 0xfe, 0x87, 0xf4, 0x83, 0xc0, + 0x52, 0xe5, 0xb6, 0xdd, 0xd5, 0x28, 0xda, 0x66, 0x0f, 0x71, 0x78, 0x05, 0x64, 0xb5, 0x21, 0xed, + 0x63, 0xc7, 0xa0, 0xbc, 0x13, 0xc9, 0xe2, 0xcf, 0x8f, 0x2f, 0x9d, 0xe4, 0x91, 0xd4, 0xbb, 0x5d, + 0x07, 0x11, 0x72, 0x8b, 0x3a, 0x86, 0xd5, 0x53, 0x27, 0x50, 0x78, 0x05, 0xa4, 0xbd, 0xa7, 0x3c, + 0x6f, 0x51, 0x2b, 0x91, 0x64, 0xf1, 0x8c, 0xcb, 0x59, 0x37, 0xea, 0xef, 0x5f, 0x3c, 0x5a, 0x13, + 0x54, 0x8e, 0xbe, 0x7a, 0xe1, 0xeb, 0x17, 0x8f, 0xd6, 0x26, 0x76, 0xee, 0xbf, 0x78, 0xb4, 0xb6, + 0xe2, 0xfe, 0x2e, 0x88, 0xc5, 0x25, 0x9d, 0x61, 0xbc, 0x85, 0x45, 0x3e, 0x6f, 0x6b, 0x23, 0xb0, + 0x18, 0x1d, 0x21, 0xf0, 0x34, 0x80, 0x1f, 0xb5, 0x5a, 0x9b, 0x9d, 0xb6, 0xd2, 0xe8, 0x6c, 0xd4, + 0x6f, 0x6e, 0x6c, 0x35, 0x1a, 0x5b, 0x9b, 0xb9, 0x19, 0x98, 0x03, 0xf3, 0xd7, 0x94, 0x46, 0xa3, + 0xd3, 0x52, 0x3b, 0x37, 0x94, 0x46, 0x23, 0x27, 0xc0, 0x55, 0xb0, 0xa2, 0x34, 0x9b, 0x5b, 0x9b, + 0x4a, 0xbd, 0xbd, 0xe5, 0x8a, 0x3d, 0x74, 0x2e, 0xe1, 0x42, 0xaf, 0xdf, 0xbe, 0xd5, 0xee, 0x28, + 0x37, 0x3b, 0x6d, 0xa5, 0xb9, 0x95, 0x4b, 0xc2, 0x65, 0xb0, 0x10, 0x18, 0x65, 0xa2, 0xd4, 0xfa, + 0x9f, 0x29, 0x90, 0x6c, 0x92, 0x1e, 0xdc, 0x00, 0x19, 0xff, 0x27, 0xc4, 0x6a, 0xb4, 0x48, 0x82, + 0xb7, 0x69, 0xbe, 0x78, 0x88, 0x22, 0xb8, 0xfe, 0x06, 0x00, 0xa1, 0x07, 0x59, 0x3e, 0x0e, 0x9f, + 0xe8, 0xf2, 0xd2, 0xe1, 0xba, 0xc0, 0xda, 0xe7, 0x60, 0x29, 0xfe, 0x16, 0x99, 0x8a, 0x20, 0x06, + 0xc8, 0x5f, 0x3c, 0x02, 0x10, 0x18, 0xdf, 0x03, 0xe2, 0xa1, 0x5d, 0xb7, 0x7c, 0x58, 0x70, 0x71, + 0x64, 0xfe, 0xf2, 0x9b, 0x22, 0x03, 0xbf, 0x5f, 0x80, 0xdc, 0x54, 0xb7, 0x2d, 0xc5, 0xad, 0xc4, + 0x11, 0xf9, 0xf2, 0x51, 0x88, 0xc0, 0xbe, 0x0a, 0xe6, 0x23, 0x7d, 0xf3, 0x3f, 0xf1, 0x9d, 0x61, + 0x6d, 0xfe, 0xfc, 0xeb, 0xb4, 0x61, 0x9b, 0x91, 0x02, 0x9b, 0xb2, 0x19, 0xd6, 0x4e, 0xdb, 0x7c, + 0x55, 0xc6, 0xcb, 0x9b, 0x4f, 0x9e, 0x15, 0x84, 0xa7, 0xcf, 0x0a, 0xc2, 0x1f, 0xcf, 0x0a, 0xc2, + 0x83, 0xe7, 0x85, 0x99, 0xa7, 0xcf, 0x0b, 0x33, 0xbf, 0x3e, 0x2f, 0xcc, 0x7c, 0xb6, 0x76, 0x44, + 0xcf, 0x1b, 0x79, 0xff, 0x03, 0xe0, 0xf6, 0x85, 0x9d, 0x34, 0x7b, 0x3d, 0xbd, 0xf7, 0x57, 0x00, + 0x00, 0x00, 0xff, 0xff, 0xa9, 0x01, 0xb0, 0x91, 0x1d, 0x10, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. From cda97ece89f1d44fa4357c02fb970c2e02a7790b Mon Sep 17 00:00:00 2001 From: Julian Compagni Portis Date: Thu, 2 Nov 2023 13:33:45 -0400 Subject: [PATCH 205/307] Remove incentives and epochs module. The rationale is as follows: 1. No direct need to incentivize the base pools right away. Most of that is done on astroport and integrations 2. The modules were modified from Osmo incentives and the degree of certainty we have here (even after 2 audits) is not the same as the core Dex module. 3. Upside of incentives is low compared to risk of pushing sub-optimal code Given that I think we should hold off on the deployment of the incentives, keep it back here for a while longer for further testing etc and decide if we really want it in the future. --- app/app.go | 55 +- app/proposals_allowlisting.go | 2 - app/upgrades/nextupgrade/constants.go | 6 +- proto/neutron/epochs/genesis.proto | 72 - proto/neutron/epochs/query.proto | 30 - .../neutron/incentives/account_history.proto | 19 - proto/neutron/incentives/gauge.proto | 115 - proto/neutron/incentives/genesis.proto | 26 - proto/neutron/incentives/params.proto | 17 - proto/neutron/incentives/query.proto | 161 - proto/neutron/incentives/stake.proto | 41 - proto/neutron/incentives/tx.proto | 119 - testutil/apptesting/test_suite.go | 15 - wasmbinding/stargate_allowlist.go | 16 - x/epochs/client/cli/cli_test.go | 33 - x/epochs/client/cli/query.go | 36 - x/epochs/keeper/abci.go | 81 - x/epochs/keeper/abci_test.go | 302 -- x/epochs/keeper/epoch.go | 114 - x/epochs/keeper/epoch_test.go | 99 - x/epochs/keeper/genesis.go | 24 - x/epochs/keeper/genesis_test.go | 96 - x/epochs/keeper/grpc_query.go | 60 - x/epochs/keeper/grpc_query_test.go | 30 - x/epochs/keeper/hooks.go | 22 - x/epochs/keeper/keeper.go | 41 - x/epochs/keeper/keeper_test.go | 24 - x/epochs/module.go | 169 - x/epochs/types/doc.go | 4 - x/epochs/types/events.go | 9 - x/epochs/types/genesis.go | 68 - x/epochs/types/genesis.pb.go | 820 ---- x/epochs/types/hooks.go | 64 - x/epochs/types/hooks_test.go | 163 - x/epochs/types/identifier.go | 23 - x/epochs/types/keys.go | 18 - x/epochs/types/query.pb.go | 911 ----- x/epochs/types/query.pb.gw.go | 236 -- x/incentives/client/cli/cli_test.go | 340 -- x/incentives/client/cli/flags.go | 22 - x/incentives/client/cli/query.go | 114 - x/incentives/client/cli/query_test.go | 55 - x/incentives/client/cli/tx.go | 173 - x/incentives/keeper/account_history.go | 83 - x/incentives/keeper/distribute.go | 186 - x/incentives/keeper/distribute_test.go | 363 -- x/incentives/keeper/distributor.go | 92 - x/incentives/keeper/distributor_test.go | 144 - x/incentives/keeper/export_test.go | 44 - x/incentives/keeper/gas_test.go | 77 - x/incentives/keeper/gauge.go | 309 -- x/incentives/keeper/gauge_test.go | 285 -- x/incentives/keeper/genesis.go | 80 - x/incentives/keeper/genesis_test.go | 57 - x/incentives/keeper/hooks.go | 60 - x/incentives/keeper/iterator.go | 58 - x/incentives/keeper/keeper.go | 77 - x/incentives/keeper/keeper_test.go | 52 - x/incentives/keeper/msg_server.go | 199 - x/incentives/keeper/params.go | 34 - x/incentives/keeper/query_server.go | 267 -- x/incentives/keeper/query_server_test.go | 126 - x/incentives/keeper/stake.go | 249 -- x/incentives/keeper/stake_refs.go | 72 - x/incentives/keeper/stake_test.go | 122 - x/incentives/keeper/store_test.go | 54 - x/incentives/keeper/suite_test.go | 124 - x/incentives/keeper/utils.go | 78 - x/incentives/keeper/utils_test.go | 129 - x/incentives/module.go | 180 - x/incentives/module_simulation.go | 33 - x/incentives/types/account_history.pb.go | 391 -- x/incentives/types/codec.go | 35 - x/incentives/types/distribution_spec.go | 25 - x/incentives/types/distribution_spec_test.go | 44 - x/incentives/types/errors.go | 53 - x/incentives/types/events.go | 21 - x/incentives/types/expected_keepers.go | 33 - x/incentives/types/gauge.go | 83 - x/incentives/types/gauge.pb.go | 1021 ----- x/incentives/types/gauge_test.go | 66 - x/incentives/types/gauges.go | 24 - x/incentives/types/genesis.go | 23 - x/incentives/types/genesis.pb.go | 590 --- x/incentives/types/hooks.go | 82 - x/incentives/types/keys.go | 176 - x/incentives/types/keys_test.go | 18 - x/incentives/types/msgs.go | 259 -- x/incentives/types/msgs_test.go | 324 -- x/incentives/types/params.go | 47 - x/incentives/types/params.pb.go | 359 -- x/incentives/types/query.pb.go | 3584 ----------------- x/incentives/types/query.pb.gw.go | 842 ---- x/incentives/types/query_condition.go | 18 - x/incentives/types/query_condition_test.go | 62 - x/incentives/types/stake.go | 53 - x/incentives/types/stake.pb.go | 531 --- x/incentives/types/stakes.go | 16 - x/incentives/types/tx.pb.go | 2713 ------------- 99 files changed, 2 insertions(+), 19970 deletions(-) delete mode 100644 proto/neutron/epochs/genesis.proto delete mode 100644 proto/neutron/epochs/query.proto delete mode 100644 proto/neutron/incentives/account_history.proto delete mode 100644 proto/neutron/incentives/gauge.proto delete mode 100644 proto/neutron/incentives/genesis.proto delete mode 100644 proto/neutron/incentives/params.proto delete mode 100644 proto/neutron/incentives/query.proto delete mode 100644 proto/neutron/incentives/stake.proto delete mode 100644 proto/neutron/incentives/tx.proto delete mode 100644 x/epochs/client/cli/cli_test.go delete mode 100644 x/epochs/client/cli/query.go delete mode 100644 x/epochs/keeper/abci.go delete mode 100644 x/epochs/keeper/abci_test.go delete mode 100644 x/epochs/keeper/epoch.go delete mode 100644 x/epochs/keeper/epoch_test.go delete mode 100644 x/epochs/keeper/genesis.go delete mode 100644 x/epochs/keeper/genesis_test.go delete mode 100644 x/epochs/keeper/grpc_query.go delete mode 100644 x/epochs/keeper/grpc_query_test.go delete mode 100644 x/epochs/keeper/hooks.go delete mode 100644 x/epochs/keeper/keeper.go delete mode 100644 x/epochs/keeper/keeper_test.go delete mode 100644 x/epochs/module.go delete mode 100644 x/epochs/types/doc.go delete mode 100644 x/epochs/types/events.go delete mode 100644 x/epochs/types/genesis.go delete mode 100644 x/epochs/types/genesis.pb.go delete mode 100644 x/epochs/types/hooks.go delete mode 100644 x/epochs/types/hooks_test.go delete mode 100644 x/epochs/types/identifier.go delete mode 100644 x/epochs/types/keys.go delete mode 100644 x/epochs/types/query.pb.go delete mode 100644 x/epochs/types/query.pb.gw.go delete mode 100644 x/incentives/client/cli/cli_test.go delete mode 100644 x/incentives/client/cli/flags.go delete mode 100644 x/incentives/client/cli/query.go delete mode 100644 x/incentives/client/cli/query_test.go delete mode 100644 x/incentives/client/cli/tx.go delete mode 100644 x/incentives/keeper/account_history.go delete mode 100644 x/incentives/keeper/distribute.go delete mode 100644 x/incentives/keeper/distribute_test.go delete mode 100644 x/incentives/keeper/distributor.go delete mode 100644 x/incentives/keeper/distributor_test.go delete mode 100644 x/incentives/keeper/export_test.go delete mode 100644 x/incentives/keeper/gas_test.go delete mode 100644 x/incentives/keeper/gauge.go delete mode 100644 x/incentives/keeper/gauge_test.go delete mode 100644 x/incentives/keeper/genesis.go delete mode 100644 x/incentives/keeper/genesis_test.go delete mode 100644 x/incentives/keeper/hooks.go delete mode 100644 x/incentives/keeper/iterator.go delete mode 100644 x/incentives/keeper/keeper.go delete mode 100644 x/incentives/keeper/keeper_test.go delete mode 100644 x/incentives/keeper/msg_server.go delete mode 100644 x/incentives/keeper/params.go delete mode 100644 x/incentives/keeper/query_server.go delete mode 100644 x/incentives/keeper/query_server_test.go delete mode 100644 x/incentives/keeper/stake.go delete mode 100644 x/incentives/keeper/stake_refs.go delete mode 100644 x/incentives/keeper/stake_test.go delete mode 100644 x/incentives/keeper/store_test.go delete mode 100644 x/incentives/keeper/suite_test.go delete mode 100644 x/incentives/keeper/utils.go delete mode 100644 x/incentives/keeper/utils_test.go delete mode 100644 x/incentives/module.go delete mode 100644 x/incentives/module_simulation.go delete mode 100644 x/incentives/types/account_history.pb.go delete mode 100644 x/incentives/types/codec.go delete mode 100644 x/incentives/types/distribution_spec.go delete mode 100644 x/incentives/types/distribution_spec_test.go delete mode 100644 x/incentives/types/errors.go delete mode 100644 x/incentives/types/events.go delete mode 100644 x/incentives/types/expected_keepers.go delete mode 100644 x/incentives/types/gauge.go delete mode 100644 x/incentives/types/gauge.pb.go delete mode 100644 x/incentives/types/gauge_test.go delete mode 100644 x/incentives/types/gauges.go delete mode 100644 x/incentives/types/genesis.go delete mode 100644 x/incentives/types/genesis.pb.go delete mode 100644 x/incentives/types/hooks.go delete mode 100644 x/incentives/types/keys.go delete mode 100644 x/incentives/types/keys_test.go delete mode 100644 x/incentives/types/msgs.go delete mode 100644 x/incentives/types/msgs_test.go delete mode 100644 x/incentives/types/params.go delete mode 100644 x/incentives/types/params.pb.go delete mode 100644 x/incentives/types/query.pb.go delete mode 100644 x/incentives/types/query.pb.gw.go delete mode 100644 x/incentives/types/query_condition.go delete mode 100644 x/incentives/types/query_condition_test.go delete mode 100644 x/incentives/types/stake.go delete mode 100644 x/incentives/types/stake.pb.go delete mode 100644 x/incentives/types/stakes.go delete mode 100644 x/incentives/types/tx.pb.go diff --git a/app/app.go b/app/app.go index 17933df3c..ad59ec3ca 100644 --- a/app/app.go +++ b/app/app.go @@ -154,14 +154,6 @@ import ( dexkeeper "github.com/neutron-org/neutron/x/dex/keeper" dextypes "github.com/neutron-org/neutron/x/dex/types" - "github.com/neutron-org/neutron/x/incentives" - incentiveskeeper "github.com/neutron-org/neutron/x/incentives/keeper" - incentivestypes "github.com/neutron-org/neutron/x/incentives/types" - - "github.com/neutron-org/neutron/x/epochs" - epochskeeper "github.com/neutron-org/neutron/x/epochs/keeper" - epochstypes "github.com/neutron-org/neutron/x/epochs/types" - "github.com/neutron-org/neutron/x/ibcswap" ibcswapkeeper "github.com/neutron-org/neutron/x/ibcswap/keeper" ibcswaptypes "github.com/neutron-org/neutron/x/ibcswap/types" @@ -238,8 +230,6 @@ var ( globalfee.AppModule{}, dex.AppModuleBasic{}, ibcswap.AppModuleBasic{}, - epochs.AppModuleBasic{}, - incentives.AppModuleBasic{}, ) // module account permissions @@ -257,7 +247,6 @@ var ( tokenfactorytypes.ModuleName: {authtypes.Minter, authtypes.Burner}, crontypes.ModuleName: nil, dextypes.ModuleName: {authtypes.Minter, authtypes.Burner}, - incentivestypes.ModuleName: nil, ibcswaptypes.ModuleName: {authtypes.Burner}, } ) @@ -324,8 +313,6 @@ type App struct { RouterKeeper *routerkeeper.Keeper DexKeeper dexkeeper.Keeper SwapKeeper ibcswapkeeper.Keeper - IncentivesKeeper *incentiveskeeper.Keeper - EpochsKeeper *epochskeeper.Keeper RouterModule router.AppModule @@ -410,7 +397,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, routertypes.StoreKey, - crontypes.StoreKey, ibchookstypes.StoreKey, consensusparamtypes.StoreKey, crisistypes.StoreKey, auctiontypes.StoreKey, dextypes.StoreKey, incentivestypes.StoreKey, epochstypes.StoreKey, + crontypes.StoreKey, ibchookstypes.StoreKey, consensusparamtypes.StoreKey, crisistypes.StoreKey, auctiontypes.StoreKey, dextypes.StoreKey, ) tkeys := sdk.NewTransientStoreKeys(paramstypes.TStoreKey) memKeys := sdk.NewMemoryStoreKeys(capabilitytypes.MemStoreKey, feetypes.MemStoreKey) @@ -652,38 +639,6 @@ func New( swapModule := ibcswap.NewAppModule(app.SwapKeeper) - app.EpochsKeeper = epochskeeper.NewKeeper(keys[epochstypes.StoreKey]) - - app.IncentivesKeeper = incentiveskeeper.NewKeeper( - keys[incentivestypes.StoreKey], - app.AccountKeeper, - app.BankKeeper, - app.EpochsKeeper, - app.DexKeeper, - authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String(), - ) - - app.IncentivesKeeper.SetHooks( - incentivestypes.NewMultiIncentiveHooks( - // insert Incentives hooks receivers here - ), - ) - - incentivesModule := incentives.NewAppModule( - app.IncentivesKeeper, - app.AccountKeeper, - app.BankKeeper, - app.EpochsKeeper, - ) - - app.EpochsKeeper.SetHooks(epochstypes.NewMultiEpochHooks( - app.IncentivesKeeper.Hooks(), - )) - - // NB: This must be initialized AFTER app.EpochsKeeper.SetHooks() because otherwise - // we dereference an out-of-date EpochsKeeper. - epochsModule := epochs.NewAppModule(*app.EpochsKeeper) - wasmDir := filepath.Join(homePath, "wasm") wasmConfig, err := wasm.ReadWasmConfig(appOpts) if err != nil { @@ -858,8 +813,6 @@ func New( auction.NewAppModule(appCodec, app.AuctionKeeper), swapModule, dexModule, - incentivesModule, - epochsModule, crisis.NewAppModule(&app.CrisisKeeper, skipGenesisInvariants, app.GetSubspace(crisistypes.ModuleName)), // always be last to make sure that it checks for all invariants and not only part of them ) @@ -897,8 +850,6 @@ func New( crontypes.ModuleName, globalfee.ModuleName, ibcswaptypes.ModuleName, - incentivestypes.ModuleName, - epochstypes.ModuleName, dextypes.ModuleName, ) @@ -932,8 +883,6 @@ func New( crontypes.ModuleName, globalfee.ModuleName, ibcswaptypes.ModuleName, - incentivestypes.ModuleName, - epochstypes.ModuleName, // NOTE: Because of the gas sensitivity of PurgeExpiredLimit order operations // dexmodule must be the last endBlock module to run dextypes.ModuleName, @@ -975,8 +924,6 @@ func New( globalfee.ModuleName, ibcswaptypes.ModuleName, dextypes.ModuleName, - incentivestypes.ModuleName, - epochstypes.ModuleName, ) app.mm.RegisterInvariants(&app.CrisisKeeper) diff --git a/app/proposals_allowlisting.go b/app/proposals_allowlisting.go index 624c7e577..da85afeee 100644 --- a/app/proposals_allowlisting.go +++ b/app/proposals_allowlisting.go @@ -16,7 +16,6 @@ import ( dextypes "github.com/neutron-org/neutron/x/dex/types" feeburnertypes "github.com/neutron-org/neutron/x/feeburner/types" feerefundertypes "github.com/neutron-org/neutron/x/feerefunder/types" - incentivestypes "github.com/neutron-org/neutron/x/incentives/types" interchainqueriestypes "github.com/neutron-org/neutron/x/interchainqueries/types" interchaintxstypes "github.com/neutron-org/neutron/x/interchaintxs/types" tokenfactorytypes "github.com/neutron-org/neutron/x/tokenfactory/types" @@ -63,7 +62,6 @@ func isSdkMessageWhitelisted(msg sdk.Msg) bool { *feerefundertypes.MsgUpdateParams, *crontypes.MsgUpdateParams, *contractmanagertypes.MsgUpdateParams, - *incentivestypes.MsgUpdateParams, *dextypes.MsgUpdateParams: return true } diff --git a/app/upgrades/nextupgrade/constants.go b/app/upgrades/nextupgrade/constants.go index 142f65a92..cda89f115 100644 --- a/app/upgrades/nextupgrade/constants.go +++ b/app/upgrades/nextupgrade/constants.go @@ -5,10 +5,8 @@ import ( consensusparamtypes "github.com/cosmos/cosmos-sdk/x/consensus/types" crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types" "github.com/neutron-org/neutron/app/upgrades" - auctiontypes "github.com/skip-mev/block-sdk/x/auction/types" dextypes "github.com/neutron-org/neutron/x/dex/types" - epochstypes "github.com/neutron-org/neutron/x/epochs/types" - incentivestypes "github.com/neutron-org/neutron/x/incentives/types" + auctiontypes "github.com/skip-mev/block-sdk/x/auction/types" ) const ( @@ -25,8 +23,6 @@ var Upgrade = upgrades.Upgrade{ crisistypes.ModuleName, auctiontypes.ModuleName, dextypes.ModuleName, - incentivestypes.ModuleName, - epochstypes.ModuleName, }, }, } diff --git a/proto/neutron/epochs/genesis.proto b/proto/neutron/epochs/genesis.proto deleted file mode 100644 index 4a5c1ca4e..000000000 --- a/proto/neutron/epochs/genesis.proto +++ /dev/null @@ -1,72 +0,0 @@ -syntax = "proto3"; -package neutron.epochs; - -import "gogoproto/gogo.proto"; -import "google/protobuf/duration.proto"; -import "google/protobuf/timestamp.proto"; - -option go_package = "github.com/neutron-org/neutron/x/epochs/types"; - -// EpochInfo is a struct that describes the data going into -// a timer defined by the x/epochs module. -message EpochInfo { - // identifier is a unique reference to this particular timer. - string identifier = 1; - // start_time is the time at which the timer first ever ticks. - // If start_time is in the future, the epoch will not begin until the start - // time. - google.protobuf.Timestamp start_time = 2 [ - (gogoproto.stdtime) = true, - (gogoproto.nullable) = false, - (gogoproto.moretags) = "yaml:\"start_time\"" - ]; - // duration is the time in between epoch ticks. - // In order for intended behavior to be met, duration should - // be greater than the chains expected block time. - // Duration must be non-zero. - google.protobuf.Duration duration = 3 [ - (gogoproto.nullable) = false, - (gogoproto.stdduration) = true, - (gogoproto.jsontag) = "duration,omitempty", - (gogoproto.moretags) = "yaml:\"duration\"" - ]; - // current_epoch is the current epoch number, or in other words, - // how many times has the timer 'ticked'. - // The first tick (current_epoch=1) is defined as - // the first block whose blocktime is greater than the EpochInfo start_time. - int64 current_epoch = 4; - // current_epoch_start_time describes the start time of the current timer - // interval. The interval is (current_epoch_start_time, - // current_epoch_start_time + duration] When the timer ticks, this is set to - // current_epoch_start_time = last_epoch_start_time + duration only one timer - // tick for a given identifier can occur per block. - // - // NOTE! The current_epoch_start_time may diverge significantly from the - // wall-clock time the epoch began at. Wall-clock time of epoch start may be - // >> current_epoch_start_time. Suppose current_epoch_start_time = 10, - // duration = 5. Suppose the chain goes offline at t=14, and comes back online - // at t=30, and produces blocks at every successive time. (t=31, 32, etc.) - // * The t=30 block will start the epoch for (10, 15] - // * The t=31 block will start the epoch for (15, 20] - // * The t=32 block will start the epoch for (20, 25] - // * The t=33 block will start the epoch for (25, 30] - // * The t=34 block will start the epoch for (30, 35] - // * The **t=36** block will start the epoch for (35, 40] - google.protobuf.Timestamp current_epoch_start_time = 5 [ - (gogoproto.stdtime) = true, - (gogoproto.nullable) = false, - (gogoproto.moretags) = "yaml:\"current_epoch_start_time\"" - ]; - // epoch_counting_started is a boolean, that indicates whether this - // epoch timer has began yet. - bool epoch_counting_started = 6; - reserved 7; - // current_epoch_start_height is the block height at which the current epoch - // started. (The block height at which the timer last ticked) - int64 current_epoch_start_height = 8; -} - -// GenesisState defines the epochs module's genesis state. -message GenesisState { - repeated EpochInfo epochs = 1 [ (gogoproto.nullable) = false ]; -} diff --git a/proto/neutron/epochs/query.proto b/proto/neutron/epochs/query.proto deleted file mode 100644 index b615eff97..000000000 --- a/proto/neutron/epochs/query.proto +++ /dev/null @@ -1,30 +0,0 @@ -syntax = "proto3"; -package neutron.epochs; - -import "gogoproto/gogo.proto"; -import "google/api/annotations.proto"; -import "cosmos/base/query/v1beta1/pagination.proto"; -import "neutron/epochs/genesis.proto"; - -option go_package = "github.com/neutron-org/neutron/x/epochs/types"; - -// Query defines the gRPC querier service. -service Query { - // EpochInfos provide running epochInfos - rpc EpochInfos(QueryEpochsInfoRequest) returns (QueryEpochsInfoResponse) { - option (google.api.http).get = "/neutron/epochs/epochs"; - } - // CurrentEpoch provide current epoch of specified identifier - rpc CurrentEpoch(QueryCurrentEpochRequest) - returns (QueryCurrentEpochResponse) { - option (google.api.http).get = "/neutron/epochs/current_epoch"; - } -} - -message QueryEpochsInfoRequest {} -message QueryEpochsInfoResponse { - repeated EpochInfo epochs = 1 [ (gogoproto.nullable) = false ]; -} - -message QueryCurrentEpochRequest { string identifier = 1; } -message QueryCurrentEpochResponse { int64 current_epoch = 1; } \ No newline at end of file diff --git a/proto/neutron/incentives/account_history.proto b/proto/neutron/incentives/account_history.proto deleted file mode 100644 index 22188f152..000000000 --- a/proto/neutron/incentives/account_history.proto +++ /dev/null @@ -1,19 +0,0 @@ -syntax = "proto3"; -package neutron.incentives; - -import "gogoproto/gogo.proto"; -import "cosmos/base/v1beta1/coin.proto"; - -option go_package = "github.com/neutron-org/neutron/x/incentives/types"; - -// Describes the total distributions to an account over time -message AccountHistory { - // the address of this account - string account = 1; - - // coins describes the total amount of coins that have been distributed to this user over time - repeated cosmos.base.v1beta1.Coin coins = 2 [ - (gogoproto.nullable) = false, - (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" - ]; -} diff --git a/proto/neutron/incentives/gauge.proto b/proto/neutron/incentives/gauge.proto deleted file mode 100644 index 5399bc761..000000000 --- a/proto/neutron/incentives/gauge.proto +++ /dev/null @@ -1,115 +0,0 @@ -syntax = "proto3"; -package neutron.incentives; - -import "gogoproto/gogo.proto"; -import "google/protobuf/duration.proto"; -import "google/protobuf/timestamp.proto"; -import "cosmos/base/v1beta1/coin.proto"; -import "neutron/dex/pair_id.proto"; - -option go_package = "github.com/neutron-org/neutron/x/incentives/types"; - -// Gauge is an object that describes an LP incentivization plan and its state. -message Gauge { - // id is the unique ID of a Gauge - uint64 id = 1; - - // There are two kinds of gauges: perpetual and non-perpetual. Perpetual - // gauges describe an incentivization program for which the token rewards - // distributed on any given day must be added to the gauge prior to that day's - // distribution using an AddToGauge message. When distribute is called on a - // perpetual gauge, all of the remaining rewards in the gauge are distributed. - // Because of this, all perpetual gauges must have `num_epochs_paid_over` set - // to 1. A non-perpetual gauge by contrast distributes its rewards over a - // schedule as determined by `num_epochs_paid_over`. If a non-perpetual gauge - // is created with coins=[100atom] and num_epochs_paid_over=10, this means - // that for 10 days (10 epochs) the gauge will distribute 10atom each day to - // the staked LP positions qualifying for the gauge. - bool is_perpetual = 2; - - // distribute_to describes a set of staked LP positions that should be - // distributed to from this gauge. - QueryCondition distribute_to = 3 - [ (gogoproto.nullable) = false ]; - - // coins describes the total amount of coins that have been added to this - // gauge for distribution. - repeated cosmos.base.v1beta1.Coin coins = 4 [ - (gogoproto.nullable) = false, - (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" - ]; - - // start_time describes when this gauge should begin distributing rewards. - // This allows gauge creators to schedule gauges into the future, in the event - // that an earlier gauge is expected to expire. - google.protobuf.Timestamp start_time = 5 [ - (gogoproto.stdtime) = true, - (gogoproto.nullable) = false, - (gogoproto.moretags) = "yaml:\"start_time\"" - ]; - - // num_epochs_paid_over is the number of total epochs (days) the rewards in - // this gauge will be distributed over. - uint64 num_epochs_paid_over = 6; - - // filled_epochs describes the number of epochs distribution have been completed - // already - uint64 filled_epochs = 7; - - // distributed_coins describes coins that have been distributed already from - // this gauge. - repeated cosmos.base.v1beta1.Coin distributed_coins = 8 [ - (gogoproto.nullable) = false, - (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" - ]; - - // pricing_tick is necessary for fairly distributing rewards over a range of - // ticks. Without pricing_tick, we might naively distribute rewards in - // proportion to the number of deposit shares staked within the gauge's - // qualifying tick range. - // - // For example, a gauge with a distribute_to tick range of [-10, 10] would - // distribute to staked LP tokens where both tick-fee and tick+fee are within - // [-10, 10]. Let's say for pair "tokenA<>tokenB", the current trading tick is - // 0. If Alice were to LP (10tokenA, 0tokenB) @ tick -8, fee 2, this would - // mean Alice would be issued 10 shares (10 + 0 * 1.0001^-8), since shares are - // in terms of token0. Let's further assume Bob LPs (0tokenA, 10tokenB) @ tick - // 8, fee 2, such that Bob is issued 10.008 shares (0 + 10 * 1.0001^8). Under - // this naive approach, if Alice and Bob were to stake their shares, Bob would - // receive more in rewards, purely on the basis of the relative locations of - // their liquidity. - // - // This disparity originates in the fact that LP deposit denominations are not - // fungible across ticks. To avoid this, we can use a single price throughout - // the gauge's tick range for relating the relative value of token0 and - // token1, as specified by pricing_tick. - // - // Let's run through the earier example using the more sophisticated approach, - // where the gauge has pricing_tick set to 0. For the purpose of calculating - // reward distribution weight, Alice's shares are worth 10 + 0 * 1.0001^0 = 10 - // and Bob's shares are worth 0 + 10 * 1.0001^0 = 10. With the distribution - // weight of both shares set according to a gauge-specific tick, we do not - // distribute more or less rewards according to the relative location of - // liquidity within the gauge's tick range, freeing users to place liquidity - // whereever they deem most profitable in the gauge's range and still equally - // qualify for rewards. - int64 pricing_tick = 9; -} - -// QueryCondition describes a set of staked LP positions that a gauge is -// configured to distribute to. LP tokens qualifying for a given QueryCondition -// must have both tick-fee and tick+fee fall within the range [startTick, endTick], -// such that all of the tradable liquidity for the pool is within that range. -message QueryCondition { - - // pairID is the token pair which should be distributed to. - neutron.dex.PairID pairID = 1; - - // start_tick is the inclusive lower bound on the location of LP tokens that - // qualify for a gauge's distribution. - int64 startTick = 2; - - // end_tick is the inclusive upper bound on the location of LP tokens that - // qualify for a gauge's distribution. - int64 endTick = 3; -} \ No newline at end of file diff --git a/proto/neutron/incentives/genesis.proto b/proto/neutron/incentives/genesis.proto deleted file mode 100644 index 739095ca6..000000000 --- a/proto/neutron/incentives/genesis.proto +++ /dev/null @@ -1,26 +0,0 @@ -syntax = "proto3"; -package neutron.incentives; - -import "gogoproto/gogo.proto"; -import "neutron/incentives/params.proto"; -import "neutron/incentives/gauge.proto"; -import "neutron/incentives/stake.proto"; -import "neutron/incentives/account_history.proto"; - -option go_package = "github.com/neutron-org/neutron/x/incentives/types"; - -// GenesisState defines the incentives module's various parameters when first -// initialized -message GenesisState { - // params are all the parameters of the module - Params params = 1 [ (gogoproto.nullable) = false ]; - // gauges are all gauges that should exist at genesis - repeated Gauge gauges = 2; - // last_gauge_id is what the gauge number will increment from when creating - // the next gauge after genesis - uint64 last_gauge_id = 3; - - uint64 last_stake_id = 4; - repeated Stake stakes = 5; - repeated AccountHistory accountHistories = 6; -} diff --git a/proto/neutron/incentives/params.proto b/proto/neutron/incentives/params.proto deleted file mode 100644 index 99a7693da..000000000 --- a/proto/neutron/incentives/params.proto +++ /dev/null @@ -1,17 +0,0 @@ -syntax = "proto3"; -package neutron.incentives; - -import "gogoproto/gogo.proto"; - -option go_package = "github.com/neutron-org/neutron/x/incentives/types"; - -// Params holds parameters for the incentives module -message Params { - // distr_epoch_identifier is what epoch type distribution will be triggered by - // (day, week, etc.) - string distr_epoch_identifier = 1 - [ (gogoproto.moretags) = "yaml:\"distr_epoch_identifier\"" ]; - - uint64 max_gauges = 2 - [ (gogoproto.moretags) = "yaml:\"max_gauges\"" ]; -} diff --git a/proto/neutron/incentives/query.proto b/proto/neutron/incentives/query.proto deleted file mode 100644 index 0ea1c02ee..000000000 --- a/proto/neutron/incentives/query.proto +++ /dev/null @@ -1,161 +0,0 @@ -syntax = "proto3"; -package neutron.incentives; - -import "gogoproto/gogo.proto"; -import "google/api/annotations.proto"; -import "cosmos/base/v1beta1/coin.proto"; -import "cosmos/base/query/v1beta1/pagination.proto"; -import "neutron/incentives/gauge.proto"; -import "neutron/incentives/stake.proto"; -import "neutron/incentives/params.proto"; - -option go_package = "github.com/neutron-org/neutron/x/incentives/types"; - -// Query defines the gRPC querier service -service Query { - // GetModuleStatus returns a rundown of coins in the module and their status - rpc GetModuleStatus(GetModuleStatusRequest) - returns (GetModuleStatusResponse) { - option (google.api.http).get = - "/neutron/incentives/v1beta1/module_status"; - } - - // GetGaugeByID returns a gauge by its ID - rpc GetGaugeByID(GetGaugeByIDRequest) returns (GetGaugeByIDResponse) { - option (google.api.http).get = - "/neutron/incentives/v1beta1/gauges/{id}"; - } - - // GetGauges returns gauges according to the filter provided - rpc GetGauges(GetGaugesRequest) returns (GetGaugesResponse) { - option (google.api.http).get = "/neutron/incentives/v1beta1/gauges"; - } - - // GetStakeByID returns a stake by its ID - rpc GetStakeByID(GetStakeByIDRequest) returns (GetStakeByIDResponse) { - option (google.api.http).get = - "/neutron/incentives/stakes/{stake_id}"; - } - - // GetStakes returns stakes by the filter provided. At least one filter must be provided. - rpc GetStakes(GetStakesRequest) returns (GetStakesResponse) { - option (google.api.http).get = - "/neutron/incentives/stakes"; - } - - // GetFutureRewardsEstimate returns an estimate of the rewards from now until a specified - // time in the future. The requestor either provides an address or a set of locks - // for which they want to find the associated rewards. - rpc GetFutureRewardEstimate(GetFutureRewardEstimateRequest) returns (GetFutureRewardEstimateResponse) { - option (google.api.http).get = - "/neutron/incentives/v1beta1/future_rewards_estimate/{owner}"; - } - - // GetAccountHistory returns the total accumulated rewards per denom for a given user. - rpc GetAccountHistory(GetAccountHistoryRequest) returns (GetAccountHistoryResponse) { - option (google.api.http).get = - "/neutron/incentives/v1beta1/account_history/{account}"; - } - - // Returns the total amount of value currently qualifying for the gauge. This is useful for calculating - // the prospective future rewards of staking. - rpc GetGaugeQualifyingValue(GetGaugeQualifyingValueRequest) returns (GetGaugeQualifyingValueResponse) { - option (google.api.http).get = - "/neutron/incentives/v1beta1/get_gauge_qualifying_value/{id}"; - } -} - -message GetModuleStatusRequest {} -message GetModuleStatusResponse { - // Coins that have yet to be distributed - repeated cosmos.base.v1beta1.Coin reward_coins = 1 [ - (gogoproto.nullable) = false, - (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" - ]; - repeated cosmos.base.v1beta1.Coin staked_coins = 2 [ - (gogoproto.nullable) = false, - (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" - ]; - Params params = 3 [ (gogoproto.nullable) = false ]; -} - -message GetGaugeByIDRequest { - // Gague ID being queried - uint64 id = 1; -} -message GetGaugeByIDResponse { - // Gauge that corresponds to provided gague ID - Gauge gauge = 1; -} - -message GetGaugeQualifyingValueRequest { - // Gague ID being queried - uint64 id = 1; -} -message GetGaugeQualifyingValueResponse { - // The amount of value at the gauge's pricing tick currently qualifying for the gauge. - uint64 qualifying_value = 1; -} - -enum GaugeStatus { - ACTIVE_UPCOMING = 0; - ACTIVE = 1; - UPCOMING = 2; - FINISHED = 3; -} - -message GetGaugesRequest { - // Pagination defines pagination for the request - - GaugeStatus status = 1; - string denom = 2; -} -message GetGaugesResponse { - // Upcoming and active gauges - repeated Gauge gauges = 1; -} - -message GetStakeByIDRequest { - uint64 stake_id = 1; -}; -message GetStakeByIDResponse { - Stake stake = 1; -}; - -message GetStakesRequest { - string owner = 1 [ (gogoproto.moretags) = "yaml:\"owner\"" ]; -}; - -message GetStakesResponse { - repeated Stake stakes = 1; -}; - -message GetFutureRewardEstimateRequest { - // Address that is being queried for future estimated rewards - string owner = 1 [ (gogoproto.moretags) = "yaml:\"owner\"" ]; - // Stake IDs included in future reward estimation - repeated uint64 stake_ids = 2; - // Determines upper time limit of reward estimation - // reward estimation goes up to current_epoch + num_epochs - int64 num_epochs = 3; -} -message GetFutureRewardEstimateResponse { - // Estimated coin rewards that will be recieved at provided address - // from specified locks between current time and end epoch - repeated cosmos.base.v1beta1.Coin coins = 1 [ - (gogoproto.nullable) = false, - (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" - ]; -} - -message GetAccountHistoryRequest { - // Address that is being queried for account history - string account = 1 [ (gogoproto.moretags) = "yaml:\"account\"" ]; -} -message GetAccountHistoryResponse { - // Gauge rewards that have been distributed to this address to date - repeated cosmos.base.v1beta1.Coin coins = 1 [ - (gogoproto.nullable) = false, - (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" - ]; -} diff --git a/proto/neutron/incentives/stake.proto b/proto/neutron/incentives/stake.proto deleted file mode 100644 index 690c4e9fa..000000000 --- a/proto/neutron/incentives/stake.proto +++ /dev/null @@ -1,41 +0,0 @@ -syntax = "proto3"; -package neutron.incentives; - -import "gogoproto/gogo.proto"; -import "google/protobuf/timestamp.proto"; -import "cosmos/base/v1beta1/coin.proto"; - -option go_package = "github.com/neutron-org/neutron/x/incentives/types"; - -// Stake records what coins are staked when by who for the purpose of -// calculating gauge reward distributions. -message Stake { - - // ID is the "autoincrementing" id of the stake, assigned at creation. - uint64 ID = 1; - - // owner is the account originating the stake. Only the owner can withdraw - // coins from the stake. - string owner = 2 [ (gogoproto.moretags) = "yaml:\"owner\"" ]; - - // start_time is the time at which the coins in the lock were staked. - google.protobuf.Timestamp start_time = 3 [ - (gogoproto.stdtime) = true, - (gogoproto.nullable) = false, - (gogoproto.jsontag) = "start_time,omitempty", - (gogoproto.moretags) = "yaml:\"start_time\"" - ]; - - // coins are the tokens staked, and managed by the module account. - repeated cosmos.base.v1beta1.Coin coins = 4 [ - (gogoproto.nullable) = false, - (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" - ]; - - // start_dist_epoch is the dist epoch (defaulting to the day) at which the - // coins in the lock were staked. This is used by distribution logic to filter - // on stakes that have existed for longer than the distribution period (you - // can only qualify for today's rewards if you staked your LP tokens - // yesterday). We use int64 instead of uint64 to make testing easier. - int64 start_dist_epoch = 5; -} \ No newline at end of file diff --git a/proto/neutron/incentives/tx.proto b/proto/neutron/incentives/tx.proto deleted file mode 100644 index cb6487234..000000000 --- a/proto/neutron/incentives/tx.proto +++ /dev/null @@ -1,119 +0,0 @@ -syntax = "proto3"; -package neutron.incentives; - -import "gogoproto/gogo.proto"; -import "google/protobuf/timestamp.proto"; -import "cosmos/base/v1beta1/coin.proto"; -import "neutron/incentives/gauge.proto"; -import "neutron/incentives/stake.proto"; -import "google/protobuf/duration.proto"; -import "amino/amino.proto"; -import "neutron/incentives/params.proto"; -import "cosmos/msg/v1/msg.proto"; -import "cosmos_proto/cosmos.proto"; - -option go_package = "github.com/neutron-org/neutron/x/incentives/types"; - -service Msg { - // Create an incentive program - rpc CreateGauge(MsgCreateGauge) returns (MsgCreateGaugeResponse); - // Add rewards to an existing incentives program - rpc AddToGauge(MsgAddToGauge) returns (MsgAddToGaugeResponse); - // Deposit LP tokens to the module, qualifying for rewards from gauges - rpc Stake(MsgStake) returns (MsgStakeResponse); - // Withdraw LP tokens from the module, forfeiting future rewards from gauges - rpc Unstake(MsgUnstake) returns (MsgUnstakeResponse); - // Update incentives params - rpc UpdateParams(MsgUpdateParams) returns (MsgUpdateParamsResponse); -} - -// MsgCreateGauge creates a gague to distribute rewards to users -message MsgCreateGauge { - // is_perpetual shows if it's a perpetual or non-perpetual gauge - // Non-perpetual gauges distribute their tokens equally per epoch while the - // gauge is in the active period. Perpetual gauges distribute all their tokens - // at a single time and only distribute their tokens again once the gauge is - // refilled - bool is_perpetual = 1; - - // owner is the address of gauge creator, should be the module authority - string owner = 2 [ (gogoproto.moretags) = "yaml:\"owner\"" ]; - - // distribute_to show which lock the gauge should distribute to by time - // duration or by timestamp - QueryCondition distribute_to = 3 - [ (gogoproto.nullable) = false ]; - // coins are coin(s) to be distributed by the gauge - repeated cosmos.base.v1beta1.Coin coins = 4 [ - (gogoproto.nullable) = false, - (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" - ]; - // start_time is the distribution start time - google.protobuf.Timestamp start_time = 5 [ - (gogoproto.stdtime) = true, - (gogoproto.nullable) = false, - (gogoproto.moretags) = "yaml:\"timestamp\"" - ]; - // num_epochs_paid_over is the number of epochs distribution will be completed - // over - uint64 num_epochs_paid_over = 6; - - // pricing_tick is the price that liquidity within the gauge range will be priced at - int64 pricing_tick = 7; -} -message MsgCreateGaugeResponse {} - -// MsgAddToGauge adds coins to a previously created gauge -message MsgAddToGauge { - // owner is the gauge owner's address - string owner = 1 [ (gogoproto.moretags) = "yaml:\"owner\"" ]; - // gauge_id is the ID of gauge that rewards are getting added to - uint64 gauge_id = 2; - // rewards are the coin(s) to add to gauge - repeated cosmos.base.v1beta1.Coin rewards = 3 [ - (gogoproto.nullable) = false, - (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" - ]; -} -message MsgAddToGaugeResponse {} - -message MsgStake { - string owner = 1 [ (gogoproto.moretags) = "yaml:\"owner\"" ]; - repeated cosmos.base.v1beta1.Coin coins = 2 [ - (gogoproto.nullable) = false, - (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" - ]; -} -message MsgStakeResponse { uint64 ID = 1; } - -message MsgUnstake { - message UnstakeDescriptor { - uint64 ID = 1; - repeated cosmos.base.v1beta1.Coin coins = 2 [ - (gogoproto.nullable) = false, - (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" - ]; - } - string owner = 1 [ (gogoproto.moretags) = "yaml:\"owner\"" ]; - - // If unstake is left empty, this is interpreted as "unstake all" - repeated UnstakeDescriptor unstakes = 2; -} -message MsgUnstakeResponse {} - -message MsgUpdateParams { - option (amino.name) = "dex/MsgUpdateParams"; - option (cosmos.msg.v1.signer) = "authority"; - - // Authority is the address of the governance account. - string authority = 1 [ (cosmos_proto.scalar) = "cosmos.AddressString" ]; - // 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/testutil/apptesting/test_suite.go b/testutil/apptesting/test_suite.go index 4f885b495..6a6bf9b46 100644 --- a/testutil/apptesting/test_suite.go +++ b/testutil/apptesting/test_suite.go @@ -46,21 +46,6 @@ func (s *KeeperTestHelper) Setup() { GRPCQueryRouter: s.App.GRPCQueryRouter(), Ctx: s.Ctx, } - - s.SetEpochStartTime() -} - -func (s *KeeperTestHelper) SetEpochStartTime() { - epochsKeeper := s.App.EpochsKeeper - - for _, epoch := range epochsKeeper.AllEpochInfos(s.Ctx) { - epoch.StartTime = s.Ctx.BlockTime() - epochsKeeper.DeleteEpochInfo(s.Ctx, epoch.Identifier) - err := epochsKeeper.AddEpochInfo(s.Ctx, epoch) - if err != nil { - panic(err) - } - } } // setupAddr takes a balance, prefix, and address number. Then returns the respective account address byte array. diff --git a/wasmbinding/stargate_allowlist.go b/wasmbinding/stargate_allowlist.go index ac0a41597..30f0843b2 100644 --- a/wasmbinding/stargate_allowlist.go +++ b/wasmbinding/stargate_allowlist.go @@ -9,9 +9,7 @@ import ( ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" ibcconnectiontypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" dextypes "github.com/neutron-org/neutron/x/dex/types" - epochstypes "github.com/neutron-org/neutron/x/epochs/types" feeburnertypes "github.com/neutron-org/neutron/x/feeburner/types" - incentivestypes "github.com/neutron-org/neutron/x/incentives/types" interchainqueriestypes "github.com/neutron-org/neutron/x/interchainqueries/types" interchaintxstypes "github.com/neutron-org/neutron/x/interchaintxs/types" tokenfactorytypes "github.com/neutron-org/neutron/x/tokenfactory/types" @@ -65,19 +63,5 @@ func AcceptedStargateQueries() wasmkeeper.AcceptedStargateQueries { "/neutron.dex.Query/PoolReserves": &dextypes.QueryGetPoolReservesResponse{}, "/neutron.dex.Query/EstimateMultiHopSwap": &dextypes.QueryEstimateMultiHopSwapResponse{}, "/neutron.dex.Query/EstimatePlaceLimitOrder": &dextypes.QueryEstimatePlaceLimitOrderResponse{}, - - // incentives - "/neutron.incentives.Query/GetModuleStatus": &incentivestypes.GetModuleStatusResponse{}, - "/neutron.incentives.Query/GetGaugeByID": &incentivestypes.GetGaugeByIDResponse{}, - "/neutron.incentives.Query/GetGauges": &incentivestypes.GetGaugesResponse{}, - "/neutron.incentives.Query/GetStakeByID": &incentivestypes.GetStakeByIDResponse{}, - "/neutron.incentives.Query/GetStakes": &incentivestypes.GetStakesResponse{}, - "/neutron.incentives.Query/GetFutureRewardEstimate": &incentivestypes.GetFutureRewardEstimateResponse{}, - "/neutron.incentives.Query/GetAccountHistory": &incentivestypes.GetAccountHistoryResponse{}, - "/neutron.incentives.Query/GetGaugeQualifyingValue": &incentivestypes.GetGaugeQualifyingValueResponse{}, - - // epochs - "/neutron.epochs.Query/EpochInfos": &epochstypes.QueryEpochsInfoResponse{}, - "/neutron.epochs.Query/CurrentEpoch": &epochstypes.QueryCurrentEpochResponse{}, } } diff --git a/x/epochs/client/cli/cli_test.go b/x/epochs/client/cli/cli_test.go deleted file mode 100644 index b8406fa5d..000000000 --- a/x/epochs/client/cli/cli_test.go +++ /dev/null @@ -1,33 +0,0 @@ -package cli_test - -import ( - "testing" - - "github.com/neutron-org/neutron/utils/dcli" - "github.com/neutron-org/neutron/x/epochs/client/cli" - "github.com/neutron-org/neutron/x/epochs/types" -) - -func TestGetCmdCurrentEpoch(t *testing.T) { - desc, _ := cli.GetCmdCurrentEpoch() - tcs := map[string]dcli.QueryCliTestCase[*types.QueryCurrentEpochRequest]{ - "basic test": { - Cmd: "day", - ExpectedQuery: &types.QueryCurrentEpochRequest{ - Identifier: "day", - }, - }, - } - dcli.RunQueryTestCases(t, desc, tcs) -} - -func TestGetCmdEpochsInfo(t *testing.T) { - desc, _ := cli.GetCmdEpochInfos() - tcs := map[string]dcli.QueryCliTestCase[*types.QueryEpochsInfoRequest]{ - "basic test": { - Cmd: "", - ExpectedQuery: &types.QueryEpochsInfoRequest{}, - }, - } - dcli.RunQueryTestCases(t, desc, tcs) -} diff --git a/x/epochs/client/cli/query.go b/x/epochs/client/cli/query.go deleted file mode 100644 index e9bcf2238..000000000 --- a/x/epochs/client/cli/query.go +++ /dev/null @@ -1,36 +0,0 @@ -package cli - -import ( - "github.com/spf13/cobra" - - "github.com/neutron-org/neutron/utils/dcli" - "github.com/neutron-org/neutron/x/epochs/types" -) - -// GetQueryCmd returns the cli query commands for this module. -func GetQueryCmd() *cobra.Command { - cmd := dcli.QueryIndexCmd(types.ModuleName) - dcli.AddQueryCmd(cmd, types.NewQueryClient, GetCmdEpochInfos) - dcli.AddQueryCmd(cmd, types.NewQueryClient, GetCmdCurrentEpoch) - - return cmd -} - -func GetCmdEpochInfos() (*dcli.QueryDescriptor, *types.QueryEpochsInfoRequest) { - return &dcli.QueryDescriptor{ - Use: "epoch-infos", - Short: "Query running epoch infos.", - Long: `{{.Short}}{{.ExampleHeader}} -{{.CommandPrefix}}`, - QueryFnName: "EpochInfos", - }, &types.QueryEpochsInfoRequest{} -} - -func GetCmdCurrentEpoch() (*dcli.QueryDescriptor, *types.QueryCurrentEpochRequest) { - return &dcli.QueryDescriptor{ - Use: "current-epoch", - Short: "Query current epoch by specified identifier.", - Long: `{{.Short}}{{.ExampleHeader}} -{{.CommandPrefix}} day`, - }, &types.QueryCurrentEpochRequest{} -} diff --git a/x/epochs/keeper/abci.go b/x/epochs/keeper/abci.go deleted file mode 100644 index ccf3fcf87..000000000 --- a/x/epochs/keeper/abci.go +++ /dev/null @@ -1,81 +0,0 @@ -package keeper - -import ( - "fmt" - "time" - - "github.com/neutron-org/neutron/x/epochs/types" - - "github.com/cosmos/cosmos-sdk/telemetry" - sdk "github.com/cosmos/cosmos-sdk/types" -) - -// BeginBlocker of epochs module. -func (k Keeper) BeginBlocker(ctx sdk.Context) { - defer telemetry.ModuleMeasureSince( - types.ModuleName, - time.Now(), - telemetry.MetricKeyBeginBlocker, - ) - k.IterateEpochInfo(ctx, func(index int64, epochInfo types.EpochInfo) (stop bool) { - logger := k.Logger(ctx) - - // If blocktime < initial epoch start time, return - if ctx.BlockTime().Before(epochInfo.StartTime) { - return - } - // if epoch counting hasn't started, signal we need to start. - shouldInitialEpochStart := !epochInfo.EpochCountingStarted - - epochEndTime := epochInfo.CurrentEpochStartTime.Add(epochInfo.Duration) - shouldEpochStart := (ctx.BlockTime().After(epochEndTime)) || shouldInitialEpochStart - - if !shouldEpochStart { - return false - } - epochInfo.CurrentEpochStartHeight = ctx.BlockHeight() - - if shouldInitialEpochStart { - epochInfo.EpochCountingStarted = true - epochInfo.CurrentEpoch = 1 - epochInfo.CurrentEpochStartTime = epochInfo.StartTime - logger.Info( - "Starting epoch", - "Identifier", - epochInfo.Identifier, - "CurEpoch", - epochInfo.CurrentEpoch, - ) - } else { - ctx.EventManager().EmitEvent( - sdk.NewEvent( - types.EventTypeEpochEnd, - sdk.NewAttribute(types.AttributeEpochNumber, fmt.Sprintf("%d", epochInfo.CurrentEpoch)), - ), - ) - k.AfterEpochEnd(ctx, epochInfo.Identifier) - epochInfo.CurrentEpoch++ - epochInfo.CurrentEpochStartTime = epochInfo.CurrentEpochStartTime.Add(epochInfo.Duration) - logger.Info("Starting epoch", "Identifier", epochInfo.Identifier, "CurEpoch", epochInfo.CurrentEpoch) - } - - // emit new epoch start event, set epoch info, and run BeforeEpochStart hook - ctx.EventManager().EmitEvent( - sdk.NewEvent( - types.EventTypeEpochStart, - sdk.NewAttribute( - types.AttributeEpochNumber, - fmt.Sprintf("%d", epochInfo.CurrentEpoch), - ), - sdk.NewAttribute( - types.AttributeEpochStartTime, - fmt.Sprintf("%d", epochInfo.CurrentEpochStartTime.Unix()), - ), - ), - ) - k.setEpochInfo(ctx, epochInfo) - k.BeforeEpochStart(ctx, epochInfo.Identifier) - - return false - }) -} diff --git a/x/epochs/keeper/abci_test.go b/x/epochs/keeper/abci_test.go deleted file mode 100644 index 223827ac6..000000000 --- a/x/epochs/keeper/abci_test.go +++ /dev/null @@ -1,302 +0,0 @@ -package keeper_test - -import ( - "testing" - "time" - - tmproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/stretchr/testify/require" - - "github.com/neutron-org/neutron/testutil" - "github.com/neutron-org/neutron/x/epochs/types" - - "golang.org/x/exp/maps" - - "github.com/neutron-org/neutron/utils" -) - -// This test is responsible for testing how epochs increment based off -// of their initial conditions, and subsequent block height / times. - -func (suite *EpochsTestSuite) TestEpochInfoBeginBlockChanges() { - block1Time := time.Unix(1656907200, 0).UTC() - const defaultIdentifier = "hourly" - const defaultDuration = time.Hour - // eps is short for epsilon - in this case a negligible amount of time. - const eps = time.Nanosecond - - tests := map[string]struct { - // if identifier, duration is not set, we make it defaultIdentifier and defaultDuration. - // EpochCountingStarted, if unspecified, is inferred by CurrentEpoch == 0 - // StartTime is inferred to be block1Time if left blank. - initialEpochInfo types.EpochInfo - blockHeightTimePairs map[int]time.Time - expEpochInfo types.EpochInfo - }{ - "First block running at exactly start time sets epoch tick": { - initialEpochInfo: types.EpochInfo{ - StartTime: block1Time, - CurrentEpoch: 0, - CurrentEpochStartTime: time.Time{}, - }, - expEpochInfo: types.EpochInfo{ - StartTime: block1Time, - CurrentEpoch: 1, - CurrentEpochStartTime: block1Time, - CurrentEpochStartHeight: 1, - }, - }, - "First block run sets start time, subsequent blocks within timer interval do not cause timer tick": { - initialEpochInfo: types.EpochInfo{ - StartTime: block1Time, - CurrentEpoch: 0, - CurrentEpochStartTime: time.Time{}, - }, - blockHeightTimePairs: map[int]time.Time{ - 2: block1Time.Add(time.Second), - 3: block1Time.Add(time.Minute), - 4: block1Time.Add(30 * time.Minute), - }, - expEpochInfo: types.EpochInfo{ - StartTime: block1Time, - CurrentEpoch: 1, - CurrentEpochStartTime: block1Time, - CurrentEpochStartHeight: 1, - }, - }, - "Second block at exactly timer interval later does not tick": { - initialEpochInfo: types.EpochInfo{ - StartTime: block1Time, - CurrentEpoch: 0, - CurrentEpochStartTime: time.Time{}, - }, - blockHeightTimePairs: map[int]time.Time{2: block1Time.Add(defaultDuration)}, - expEpochInfo: types.EpochInfo{ - StartTime: block1Time, - CurrentEpoch: 1, - CurrentEpochStartTime: block1Time, - CurrentEpochStartHeight: 1, - }, - }, - "Second block at timer interval + epsilon later does tick": { - initialEpochInfo: types.EpochInfo{ - StartTime: block1Time, - CurrentEpoch: 0, - CurrentEpochStartTime: time.Time{}, - }, - blockHeightTimePairs: map[int]time.Time{2: block1Time.Add(defaultDuration).Add(eps)}, - expEpochInfo: types.EpochInfo{ - StartTime: block1Time, - CurrentEpoch: 2, - CurrentEpochStartTime: block1Time.Add(time.Hour), - CurrentEpochStartHeight: 2, - }, - }, - "Downtime recovery (many intervals), first block causes 1 tick and sets current start time 1 interval ahead": { - initialEpochInfo: types.EpochInfo{ - StartTime: block1Time, - CurrentEpoch: 0, - CurrentEpochStartTime: time.Time{}, - }, - blockHeightTimePairs: map[int]time.Time{2: block1Time.Add(24 * time.Hour)}, - expEpochInfo: types.EpochInfo{ - StartTime: block1Time, - CurrentEpoch: 2, - CurrentEpochStartTime: block1Time.Add(time.Hour), - CurrentEpochStartHeight: 2, - }, - }, - "Downtime recovery (many intervals), second block is at tick 2, w/ start time 2 intervals ahead": { - initialEpochInfo: types.EpochInfo{ - StartTime: block1Time, - CurrentEpoch: 0, - CurrentEpochStartTime: time.Time{}, - }, - blockHeightTimePairs: map[int]time.Time{ - 2: block1Time.Add(24 * time.Hour), - 3: block1Time.Add(24 * time.Hour).Add(eps), - }, - expEpochInfo: types.EpochInfo{ - StartTime: block1Time, - CurrentEpoch: 3, - CurrentEpochStartTime: block1Time.Add(2 * time.Hour), - CurrentEpochStartHeight: 3, - }, - }, - "Many blocks between first and second tick": { - initialEpochInfo: types.EpochInfo{ - StartTime: block1Time, - CurrentEpoch: 1, - CurrentEpochStartTime: block1Time, - }, - blockHeightTimePairs: map[int]time.Time{ - 2: block1Time.Add(time.Second), - 3: block1Time.Add(2 * time.Second), - 4: block1Time.Add(time.Hour).Add(eps), - }, - expEpochInfo: types.EpochInfo{ - StartTime: block1Time, - CurrentEpoch: 2, - CurrentEpochStartTime: block1Time.Add(time.Hour), - CurrentEpochStartHeight: 4, - }, - }, - "Distinct identifier and duration still works": { - initialEpochInfo: types.EpochInfo{ - Identifier: "hello", - Duration: time.Minute, - StartTime: block1Time, - CurrentEpoch: 0, - CurrentEpochStartTime: time.Time{}, - }, - blockHeightTimePairs: map[int]time.Time{ - 2: block1Time.Add(time.Second), - 3: block1Time.Add(time.Minute).Add(eps), - }, - expEpochInfo: types.EpochInfo{ - Identifier: "hello", - Duration: time.Minute, - StartTime: block1Time, - CurrentEpoch: 2, - CurrentEpochStartTime: block1Time.Add(time.Minute), - CurrentEpochStartHeight: 3, - }, - }, - "StartTime in future won't get ticked on first block": { - initialEpochInfo: types.EpochInfo{ - StartTime: block1Time.Add(time.Second), - CurrentEpoch: 0, - CurrentEpochStartTime: time.Time{}, - }, - // currentEpochStartHeight is 1 because thats when the timer was created on-chain - expEpochInfo: types.EpochInfo{ - StartTime: block1Time.Add(time.Second), - CurrentEpoch: 0, - CurrentEpochStartTime: time.Time{}, - CurrentEpochStartHeight: 1, - }, - }, - "StartTime in past will get ticked on first block": { - initialEpochInfo: types.EpochInfo{ - StartTime: block1Time.Add(-time.Second), - CurrentEpoch: 0, - CurrentEpochStartTime: time.Time{}, - }, - expEpochInfo: types.EpochInfo{ - StartTime: block1Time.Add(-time.Second), - CurrentEpoch: 1, - CurrentEpochStartTime: block1Time.Add(-time.Second), - CurrentEpochStartHeight: 1, - }, - }, - } - for name, test := range tests { - suite.Run(name, func() { - suite.SetupTest() - suite.Ctx = suite.Ctx.WithBlockHeight(1).WithBlockTime(block1Time) - initialEpoch := initializeBlankEpochInfoFields( - test.initialEpochInfo, - defaultIdentifier, - defaultDuration, - ) - err := suite.App.EpochsKeeper.AddEpochInfo(suite.Ctx, initialEpoch) - suite.Require().NoError(err) - suite.App.EpochsKeeper.BeginBlocker(suite.Ctx) - - // get sorted heights - heights := maps.Keys(test.blockHeightTimePairs) - utils.SortSlice(heights) - for _, h := range heights { - // for each height in order, run begin block - suite.Ctx = suite.Ctx.WithBlockHeight(int64(h)). - WithBlockTime(test.blockHeightTimePairs[h]) - suite.App.EpochsKeeper.BeginBlocker(suite.Ctx) - } - expEpoch := initializeBlankEpochInfoFields( - test.expEpochInfo, - initialEpoch.Identifier, - initialEpoch.Duration, - ) - actEpoch := suite.App.EpochsKeeper.GetEpochInfo(suite.Ctx, initialEpoch.Identifier) - suite.Require().Equal(expEpoch, actEpoch) - }) - } -} - -// initializeBlankEpochInfoFields set identifier, duration and epochCountingStarted if blank in epoch -func initializeBlankEpochInfoFields( - epoch types.EpochInfo, - identifier string, - duration time.Duration, -) types.EpochInfo { - if epoch.Identifier == "" { - epoch.Identifier = identifier - } - if epoch.Duration == time.Duration(0) { - epoch.Duration = duration - } - epoch.EpochCountingStarted = (epoch.CurrentEpoch != 0) - - return epoch -} - -func TestEpochStartingOneMonthAfterInitGenesis(t *testing.T) { - app := testutil.Setup(t) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) - - // On init genesis, default epochs information is set - // To check init genesis again, should make it fresh status - epochInfos := app.EpochsKeeper.AllEpochInfos(ctx) - for _, epochInfo := range epochInfos { - app.EpochsKeeper.DeleteEpochInfo(ctx, epochInfo.Identifier) - } - - now := time.Now() - week := time.Hour * 24 * 7 - month := time.Hour * 24 * 30 - initialBlockHeight := int64(1) - ctx = ctx.WithBlockHeight(initialBlockHeight).WithBlockTime(now) - - app.EpochsKeeper.InitGenesis(ctx, types.GenesisState{ - Epochs: []types.EpochInfo{ - { - Identifier: "monthly", - StartTime: now.Add(month), - Duration: time.Hour * 24 * 30, - CurrentEpoch: 0, - CurrentEpochStartHeight: ctx.BlockHeight(), - CurrentEpochStartTime: time.Time{}, - EpochCountingStarted: false, - }, - }, - }) - - // epoch not started yet - epochInfo := app.EpochsKeeper.GetEpochInfo(ctx, "monthly") - require.Equal(t, epochInfo.CurrentEpoch, int64(0)) - require.Equal(t, epochInfo.CurrentEpochStartHeight, initialBlockHeight) - require.Equal(t, epochInfo.CurrentEpochStartTime, time.Time{}) - require.Equal(t, epochInfo.EpochCountingStarted, false) - - // after 1 week - ctx = ctx.WithBlockHeight(2).WithBlockTime(now.Add(week)) - app.EpochsKeeper.BeginBlocker(ctx) - - // epoch not started yet - epochInfo = app.EpochsKeeper.GetEpochInfo(ctx, "monthly") - require.Equal(t, epochInfo.CurrentEpoch, int64(0)) - require.Equal(t, epochInfo.CurrentEpochStartHeight, initialBlockHeight) - require.Equal(t, epochInfo.CurrentEpochStartTime, time.Time{}) - require.Equal(t, epochInfo.EpochCountingStarted, false) - - // after 1 month - ctx = ctx.WithBlockHeight(3).WithBlockTime(now.Add(month)) - app.EpochsKeeper.BeginBlocker(ctx) - - // epoch started - epochInfo = app.EpochsKeeper.GetEpochInfo(ctx, "monthly") - require.Equal(t, epochInfo.CurrentEpoch, int64(1)) - require.Equal(t, epochInfo.CurrentEpochStartHeight, ctx.BlockHeight()) - require.Equal(t, epochInfo.CurrentEpochStartTime.UTC().String(), now.Add(month).UTC().String()) - require.Equal(t, epochInfo.EpochCountingStarted, true) -} diff --git a/x/epochs/keeper/epoch.go b/x/epochs/keeper/epoch.go deleted file mode 100644 index 6bd2a3f43..000000000 --- a/x/epochs/keeper/epoch.go +++ /dev/null @@ -1,114 +0,0 @@ -package keeper - -import ( - "fmt" - "time" - - "github.com/cosmos/gogoproto/proto" - - "github.com/neutron-org/neutron/x/epochs/types" - - sdk "github.com/cosmos/cosmos-sdk/types" -) - -// GetEpochInfo returns epoch info by identifier. -func (k Keeper) GetEpochInfo(ctx sdk.Context, identifier string) types.EpochInfo { - epoch := types.EpochInfo{} - store := ctx.KVStore(k.storeKey) - b := store.Get(append(types.KeyPrefixEpoch, []byte(identifier)...)) - if b == nil { - return epoch - } - err := proto.Unmarshal(b, &epoch) - if err != nil { - panic(err) - } - - return epoch -} - -// AddEpochInfo adds a new epoch info. Will return an error if the epoch fails validation, -// or re-uses an existing identifier. -// This method also sets the start time if left unset, and sets the epoch start height. -func (k Keeper) AddEpochInfo(ctx sdk.Context, epoch types.EpochInfo) error { - if err := epoch.Validate(); err != nil { - return err - } - // Check if identifier already exists - if (k.GetEpochInfo(ctx, epoch.Identifier) != types.EpochInfo{}) { - return fmt.Errorf("epoch with identifier %s already exists", epoch.Identifier) - } - - // Initialize empty and default epoch values - if epoch.StartTime.Equal(time.Time{}) { - epoch.StartTime = ctx.BlockTime() - } - epoch.CurrentEpochStartHeight = ctx.BlockHeight() - k.setEpochInfo(ctx, epoch) - - return nil -} - -// setEpochInfo set epoch info. -func (k Keeper) setEpochInfo(ctx sdk.Context, epoch types.EpochInfo) { - store := ctx.KVStore(k.storeKey) - value, err := proto.Marshal(&epoch) - if err != nil { - panic(err) - } - store.Set(append(types.KeyPrefixEpoch, []byte(epoch.Identifier)...), value) -} - -// DeleteEpochInfo delete epoch info. -func (k Keeper) DeleteEpochInfo(ctx sdk.Context, identifier string) { - store := ctx.KVStore(k.storeKey) - store.Delete(append(types.KeyPrefixEpoch, []byte(identifier)...)) -} - -// IterateEpochInfo iterate through epochs. -func (k Keeper) IterateEpochInfo(ctx sdk.Context, fn func(index int64, epochInfo types.EpochInfo) (stop bool)) { - store := ctx.KVStore(k.storeKey) - - iterator := sdk.KVStorePrefixIterator(store, types.KeyPrefixEpoch) - defer iterator.Close() - - i := int64(0) - - for ; iterator.Valid(); iterator.Next() { - epoch := types.EpochInfo{} - err := proto.Unmarshal(iterator.Value(), &epoch) - if err != nil { - panic(err) - } - stop := fn(i, epoch) - - if stop { - break - } - i++ - } -} - -// AllEpochInfos iterate through epochs to return all epochs info. -func (k Keeper) AllEpochInfos(ctx sdk.Context) []types.EpochInfo { - epochs := []types.EpochInfo{} - k.IterateEpochInfo(ctx, func(index int64, epochInfo types.EpochInfo) (stop bool) { - epochs = append(epochs, epochInfo) - return false - }) - - return epochs -} - -// NumBlocksSinceEpochStart returns the number of blocks since the epoch started. -// if the epoch started on block N, then calling this during block N (after BeforeEpochStart) -// would return 0. -// Calling it any point in block N+1 (assuming the epoch doesn't increment) would return 1. -func (k Keeper) NumBlocksSinceEpochStart(ctx sdk.Context, identifier string) (int64, error) { - epoch := k.GetEpochInfo(ctx, identifier) - if (epoch == types.EpochInfo{}) { - return 0, fmt.Errorf("epoch with identifier %s not found", identifier) - } - - return ctx.BlockHeight() - epoch.CurrentEpochStartHeight, nil -} diff --git a/x/epochs/keeper/epoch_test.go b/x/epochs/keeper/epoch_test.go deleted file mode 100644 index 94ab6c0d3..000000000 --- a/x/epochs/keeper/epoch_test.go +++ /dev/null @@ -1,99 +0,0 @@ -package keeper_test - -import ( - "time" - - "github.com/neutron-org/neutron/x/epochs/types" -) - -func (suite *EpochsTestSuite) TestAddEpochInfo() { - defaultIdentifier := "default_add_epoch_info_id" - defaultDuration := time.Hour - startBlockHeight := int64(100) - startBlockTime := time.Unix(1656907200, 0).UTC() - tests := map[string]struct { - addedEpochInfo types.EpochInfo - expErr bool - expEpochInfo types.EpochInfo - }{ - "simple_add": { - addedEpochInfo: types.EpochInfo{ - Identifier: defaultIdentifier, - StartTime: time.Time{}, - Duration: defaultDuration, - CurrentEpoch: 0, - CurrentEpochStartHeight: 0, - CurrentEpochStartTime: time.Time{}, - EpochCountingStarted: false, - }, - expErr: false, - expEpochInfo: types.EpochInfo{ - Identifier: defaultIdentifier, - StartTime: startBlockTime, - Duration: defaultDuration, - CurrentEpoch: 0, - CurrentEpochStartHeight: startBlockHeight, - CurrentEpochStartTime: time.Time{}, - EpochCountingStarted: false, - }, - }, - "zero_duration": { - addedEpochInfo: types.EpochInfo{ - Identifier: defaultIdentifier, - StartTime: time.Time{}, - Duration: time.Duration(0), - CurrentEpoch: 0, - CurrentEpochStartHeight: 0, - CurrentEpochStartTime: time.Time{}, - EpochCountingStarted: false, - }, - expErr: true, - }, - } - for name, test := range tests { - suite.Run(name, func() { - suite.SetupTest() - suite.Ctx = suite.Ctx.WithBlockHeight(startBlockHeight).WithBlockTime(startBlockTime) - err := suite.App.EpochsKeeper.AddEpochInfo(suite.Ctx, test.addedEpochInfo) - if !test.expErr { - suite.Require().NoError(err) - actualEpochInfo := suite.App.EpochsKeeper.GetEpochInfo(suite.Ctx, test.addedEpochInfo.Identifier) - suite.Require().Equal(test.expEpochInfo, actualEpochInfo) - } else { - suite.Require().Error(err) - } - }) - } -} - -func (suite *EpochsTestSuite) TestDuplicateAddEpochInfo() { - identifier := "duplicate_add_epoch_info" - epochInfo := types.NewGenesisEpochInfo(identifier, time.Hour*24*30) - err := suite.App.EpochsKeeper.AddEpochInfo(suite.Ctx, epochInfo) - suite.Require().NoError(err) - err = suite.App.EpochsKeeper.AddEpochInfo(suite.Ctx, epochInfo) - suite.Require().Error(err) -} - -func (suite *EpochsTestSuite) TestEpochLifeCycle() { - suite.SetupTest() - - epochInfo := types.NewGenesisEpochInfo("monthly", time.Hour*24*30) - err := suite.App.EpochsKeeper.AddEpochInfo(suite.Ctx, epochInfo) - suite.Require().NoError(err) - - epochInfoSaved := suite.App.EpochsKeeper.GetEpochInfo(suite.Ctx, "monthly") - - // setup expected epoch info - expectedEpochInfo := epochInfo - expectedEpochInfo.StartTime = suite.Ctx.BlockTime() - expectedEpochInfo.CurrentEpochStartHeight = suite.Ctx.BlockHeight() - suite.Require().Equal(expectedEpochInfo, epochInfoSaved) - - allEpochs := suite.App.EpochsKeeper.AllEpochInfos(suite.Ctx) - suite.Require().Len(allEpochs, 4) - suite.Require().Equal(allEpochs[0].Identifier, "day") // alphabetical order - suite.Require().Equal(allEpochs[1].Identifier, "hour") - suite.Require().Equal(allEpochs[2].Identifier, "monthly") - suite.Require().Equal(allEpochs[3].Identifier, "week") -} diff --git a/x/epochs/keeper/genesis.go b/x/epochs/keeper/genesis.go deleted file mode 100644 index 00fd79188..000000000 --- a/x/epochs/keeper/genesis.go +++ /dev/null @@ -1,24 +0,0 @@ -package keeper - -import ( - sdk "github.com/cosmos/cosmos-sdk/types" - - "github.com/neutron-org/neutron/x/epochs/types" -) - -// InitGenesis sets epoch info from genesis -func (k Keeper) InitGenesis(ctx sdk.Context, genState types.GenesisState) { - for _, epoch := range genState.Epochs { - err := k.AddEpochInfo(ctx, epoch) - if err != nil { - panic(err) - } - } -} - -// ExportGenesis returns the capability module's exported genesis. -func (k Keeper) ExportGenesis(ctx sdk.Context) *types.GenesisState { - genesis := types.DefaultGenesis() - genesis.Epochs = k.AllEpochInfos(ctx) - return genesis -} diff --git a/x/epochs/keeper/genesis_test.go b/x/epochs/keeper/genesis_test.go deleted file mode 100644 index 2d685b0fd..000000000 --- a/x/epochs/keeper/genesis_test.go +++ /dev/null @@ -1,96 +0,0 @@ -package keeper_test - -import ( - "testing" - "time" - - tmproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/stretchr/testify/require" - - "github.com/neutron-org/neutron/testutil" - "github.com/neutron-org/neutron/x/epochs/types" -) - -func TestEpochsExportGenesis(t *testing.T) { - app := testutil.Setup(t) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) - - chainStartTime := ctx.BlockTime() - - genesis := app.EpochsKeeper.ExportGenesis(ctx) - require.Len(t, genesis.Epochs, 3) - - expectedEpochs := types.DefaultGenesis().Epochs - for i := 0; i < len(expectedEpochs); i++ { - expectedEpochs[i].CurrentEpochStartHeight = 2 - expectedEpochs[i].CurrentEpochStartTime = chainStartTime - expectedEpochs[i].EpochCountingStarted = true - expectedEpochs[i].CurrentEpoch = 1 - } - require.Equal(t, expectedEpochs, genesis.Epochs) -} - -func TestEpochsInitGenesis(t *testing.T) { - app := testutil.Setup(t) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) - - // On init genesis, default epochs information is set - // To check init genesis again, should make it fresh status - epochInfos := app.EpochsKeeper.AllEpochInfos(ctx) - for _, epochInfo := range epochInfos { - app.EpochsKeeper.DeleteEpochInfo(ctx, epochInfo.Identifier) - } - - now := time.Now() - ctx = ctx.WithBlockHeight(1) - ctx = ctx.WithBlockTime(now) - - // test genesisState validation - genesisState := types.GenesisState{ - Epochs: []types.EpochInfo{ - { - Identifier: "monthly", - StartTime: time.Time{}, - Duration: time.Hour * 24, - CurrentEpoch: 0, - CurrentEpochStartHeight: ctx.BlockHeight(), - CurrentEpochStartTime: time.Time{}, - EpochCountingStarted: true, - }, - { - Identifier: "monthly", - StartTime: time.Time{}, - Duration: time.Hour * 24, - CurrentEpoch: 0, - CurrentEpochStartHeight: ctx.BlockHeight(), - CurrentEpochStartTime: time.Time{}, - EpochCountingStarted: true, - }, - }, - } - require.EqualError(t, genesisState.Validate(), "epoch identifier should be unique") - - genesisState = types.GenesisState{ - Epochs: []types.EpochInfo{ - { - Identifier: "monthly", - StartTime: time.Time{}, - Duration: time.Hour * 24, - CurrentEpoch: 0, - CurrentEpochStartHeight: ctx.BlockHeight(), - CurrentEpochStartTime: time.Time{}, - EpochCountingStarted: true, - }, - }, - } - - app.EpochsKeeper.InitGenesis(ctx, genesisState) - epochInfo := app.EpochsKeeper.GetEpochInfo(ctx, "monthly") - require.Equal(t, epochInfo.Identifier, "monthly") - require.Equal(t, epochInfo.StartTime.UTC().String(), now.UTC().String()) - require.Equal(t, epochInfo.Duration, time.Hour*24) - require.Equal(t, epochInfo.CurrentEpoch, int64(0)) - require.Equal(t, epochInfo.CurrentEpochStartHeight, ctx.BlockHeight()) - require.Equal(t, epochInfo.CurrentEpochStartTime.UTC().String(), time.Time{}.String()) - require.Equal(t, epochInfo.EpochCountingStarted, true) -} diff --git a/x/epochs/keeper/grpc_query.go b/x/epochs/keeper/grpc_query.go deleted file mode 100644 index 283bf32ae..000000000 --- a/x/epochs/keeper/grpc_query.go +++ /dev/null @@ -1,60 +0,0 @@ -package keeper - -import ( - "context" - "errors" - - sdk "github.com/cosmos/cosmos-sdk/types" - "google.golang.org/grpc/codes" - "google.golang.org/grpc/status" - - "github.com/neutron-org/neutron/x/epochs/types" -) - -var _ types.QueryServer = Querier{} - -// Querier defines a wrapper around the x/epochs keeper providing gRPC method -// handlers. -type Querier struct { - Keeper -} - -// NewQuerier initializes new querier. -func NewQuerier(k Keeper) Querier { - return Querier{Keeper: k} -} - -// EpochInfos provide running epochInfos. -func (q Querier) EpochInfos( - c context.Context, - _ *types.QueryEpochsInfoRequest, -) (*types.QueryEpochsInfoResponse, error) { - ctx := sdk.UnwrapSDKContext(c) - - return &types.QueryEpochsInfoResponse{ - Epochs: q.Keeper.AllEpochInfos(ctx), - }, nil -} - -// CurrentEpoch provides current epoch of specified identifier. -func (q Querier) CurrentEpoch(c context.Context, - req *types.QueryCurrentEpochRequest, -) (*types.QueryCurrentEpochResponse, error) { - if req == nil { - return nil, status.Error(codes.InvalidArgument, "empty request") - } - if req.Identifier == "" { - return nil, status.Error(codes.InvalidArgument, "identifier is empty") - } - - ctx := sdk.UnwrapSDKContext(c) - - info := q.Keeper.GetEpochInfo(ctx, req.Identifier) - if info.Identifier != req.Identifier { - return nil, errors.New("not available identifier") - } - - return &types.QueryCurrentEpochResponse{ - CurrentEpoch: info.CurrentEpoch, - }, nil -} diff --git a/x/epochs/keeper/grpc_query_test.go b/x/epochs/keeper/grpc_query_test.go deleted file mode 100644 index a2b5c8c95..000000000 --- a/x/epochs/keeper/grpc_query_test.go +++ /dev/null @@ -1,30 +0,0 @@ -package keeper_test - -import ( - gocontext "context" - - "github.com/neutron-org/neutron/x/epochs/types" -) - -func (suite *EpochsTestSuite) TestQueryEpochInfos() { - suite.SetupTest() - queryClient := suite.queryClient - - // Check that querying epoch infos on default genesis returns the default genesis epoch infos - epochInfosResponse, err := queryClient.EpochInfos( - gocontext.Background(), - &types.QueryEpochsInfoRequest{}, - ) - suite.Require().NoError(err) - suite.Require().Len(epochInfosResponse.Epochs, 3) - - expectedEpochs := types.DefaultGenesis().Epochs - for id := range expectedEpochs { - expectedEpochs[id].StartTime = suite.Ctx.BlockTime() - expectedEpochs[id].CurrentEpochStartHeight = suite.Ctx.BlockHeight() - expectedEpochs[id].CurrentEpoch = 1 - expectedEpochs[id].EpochCountingStarted = true - } - - suite.Require().Equal(expectedEpochs, epochInfosResponse.Epochs) -} diff --git a/x/epochs/keeper/hooks.go b/x/epochs/keeper/hooks.go deleted file mode 100644 index 5828d2ef6..000000000 --- a/x/epochs/keeper/hooks.go +++ /dev/null @@ -1,22 +0,0 @@ -package keeper - -import ( - sdk "github.com/cosmos/cosmos-sdk/types" -) - -// AfterEpochEnd gets called at the end of the epoch, -// end of epoch is the timestamp of first block produced after epoch duration. -func (k Keeper) AfterEpochEnd(ctx sdk.Context, identifier string) { - // Error is not handled as AfterEpochEnd Hooks use utils.ApplyFuncIfNoError() - if k.hooks != nil { - _ = k.hooks.AfterEpochEnd(ctx, identifier) - } -} - -// BeforeEpochStart new epoch is next block of epoch end block -func (k Keeper) BeforeEpochStart(ctx sdk.Context, identifier string) { - // Error is not handled as BeforeEpochStart Hooks use utils.ApplyFuncIfNoError() - if k.hooks != nil { - _ = k.hooks.BeforeEpochStart(ctx, identifier) - } -} diff --git a/x/epochs/keeper/keeper.go b/x/epochs/keeper/keeper.go deleted file mode 100644 index 583d4f598..000000000 --- a/x/epochs/keeper/keeper.go +++ /dev/null @@ -1,41 +0,0 @@ -package keeper - -import ( - "fmt" - - "github.com/cometbft/cometbft/libs/log" - - "github.com/neutron-org/neutron/x/epochs/types" - - storetypes "github.com/cosmos/cosmos-sdk/store/types" - sdk "github.com/cosmos/cosmos-sdk/types" -) - -type ( - Keeper struct { - storeKey storetypes.StoreKey - hooks types.EpochHooks - } -) - -// NewKeeper returns a new keeper by codec and storeKey inputs. -func NewKeeper(storeKey storetypes.StoreKey) *Keeper { - return &Keeper{ - storeKey: storeKey, - } -} - -// Set the gamm hooks. -func (k *Keeper) SetHooks(eh types.EpochHooks) *Keeper { - if k.hooks != nil { - panic("cannot set epochs hooks twice") - } - - k.hooks = eh - - return k -} - -func (k Keeper) Logger(ctx sdk.Context) log.Logger { - return ctx.Logger().With("module", fmt.Sprintf("x/%s", types.ModuleName)) -} diff --git a/x/epochs/keeper/keeper_test.go b/x/epochs/keeper/keeper_test.go deleted file mode 100644 index 4871e2de1..000000000 --- a/x/epochs/keeper/keeper_test.go +++ /dev/null @@ -1,24 +0,0 @@ -package keeper_test - -import ( - "testing" - - "github.com/stretchr/testify/suite" - - "github.com/neutron-org/neutron/testutil/apptesting" - "github.com/neutron-org/neutron/x/epochs/types" -) - -type EpochsTestSuite struct { - apptesting.KeeperTestHelper - queryClient types.QueryClient -} - -func (suite *EpochsTestSuite) SetupTest() { - suite.Setup() - suite.queryClient = types.NewQueryClient(suite.QueryHelper) -} - -func TestEpochsTestSuite(t *testing.T) { - suite.Run(t, new(EpochsTestSuite)) -} diff --git a/x/epochs/module.go b/x/epochs/module.go deleted file mode 100644 index 9bf259b38..000000000 --- a/x/epochs/module.go +++ /dev/null @@ -1,169 +0,0 @@ -/* -Often in the SDK, we would like to run certain code every-so often. The -purpose of `epochs` module is to allow other modules to set that they -would like to be signaled once every period. So another module can -specify it wants to execute code once a week, starting at UTC-time = x. -`epochs` creates a generalized epoch interface to other modules so that -they can easily be signalled upon such events. - - Contains functionality for querying epoch. - - Events for BeginBlock and EndBlock. - - Initialization for epoch-related infos. -*/ - -package epochs - -import ( - "context" - "encoding/json" - "fmt" - - abci "github.com/cometbft/cometbft/abci/types" - "github.com/gorilla/mux" - "github.com/grpc-ecosystem/grpc-gateway/runtime" - "github.com/spf13/cobra" - - "github.com/cosmos/cosmos-sdk/client" - "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/module" - - "github.com/neutron-org/neutron/x/epochs/client/cli" - "github.com/neutron-org/neutron/x/epochs/keeper" - "github.com/neutron-org/neutron/x/epochs/types" -) - -var ( - _ module.AppModule = AppModule{} - _ module.AppModuleBasic = AppModuleBasic{} -) - -// ---------------------------------------------------------------------------- -// AppModuleBasic -// ---------------------------------------------------------------------------- - -// AppModuleBasic implements the AppModuleBasic interface for the capability module. -type AppModuleBasic struct{} - -func NewAppModuleBasic() AppModuleBasic { - return AppModuleBasic{} -} - -// Name returns the capability module's name. -func (AppModuleBasic) Name() string { - return types.ModuleName -} - -// RegisterLegacyAminoCodec registers the module's Amino codec that properly handles protobuf types with Any's. -func (AppModuleBasic) RegisterLegacyAminoCodec(_ *codec.LegacyAmino) {} - -// RegisterInterfaces registers the module's interface types. -func (a AppModuleBasic) RegisterInterfaces(_ cdctypes.InterfaceRegistry) {} - -// DefaultGenesis returns the capability module's default genesis state. -func (AppModuleBasic) DefaultGenesis(cdc codec.JSONCodec) json.RawMessage { - return cdc.MustMarshalJSON(types.DefaultGenesis()) -} - -// ValidateGenesis performs genesis state validation for the capability module. -func (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() -} - -// RegisterRESTRoutes registers the capability module's REST service handlers. -func (AppModuleBasic) RegisterRESTRoutes(_ client.Context, _ *mux.Router) {} - -// RegisterGRPCGatewayRoutes registers the gRPC Gateway routes for the module. -func (AppModuleBasic) RegisterGRPCGatewayRoutes(clientCtx client.Context, mux *runtime.ServeMux) { - types.RegisterQueryHandlerClient(context.Background(), mux, types.NewQueryClient(clientCtx)) //nolint:errcheck -} - -// GetTxCmd returns the capability module's root tx command. -func (a AppModuleBasic) GetTxCmd() *cobra.Command { - return nil -} - -// GetQueryCmd returns the capability module's root query command. -func (AppModuleBasic) GetQueryCmd() *cobra.Command { - return cli.GetQueryCmd() -} - -// ---------------------------------------------------------------------------- -// AppModule -// ---------------------------------------------------------------------------- - -// AppModule implements the AppModule interface for the capability module. -type AppModule struct { - AppModuleBasic - - keeper keeper.Keeper -} - -func NewAppModule(keeper keeper.Keeper) AppModule { - return AppModule{ - AppModuleBasic: NewAppModuleBasic(), - keeper: keeper, - } -} - -// Name returns the capability module's name. -func (am AppModule) Name() string { - return am.AppModuleBasic.Name() -} - -// QuerierRoute returns the capability module's query routing key. -func (AppModule) QuerierRoute() string { return types.QuerierRoute } - -// 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(), keeper.NewQuerier(am.keeper)) -} - -// RegisterInvariants registers the capability module's invariants. -func (am AppModule) RegisterInvariants(_ sdk.InvariantRegistry) {} - -// InitGenesis performs the capability module's genesis initialization It returns -// no validator updates. -func (am AppModule) InitGenesis( - ctx sdk.Context, - cdc codec.JSONCodec, - gs json.RawMessage, -) []abci.ValidatorUpdate { - var genState types.GenesisState - // Initialize global index to index in genesis state - cdc.MustUnmarshalJSON(gs, &genState) - - am.keeper.InitGenesis(ctx, genState) - - return []abci.ValidatorUpdate{} -} - -// ExportGenesis returns the capability module's exported genesis state as raw JSON bytes. -func (am AppModule) ExportGenesis(ctx sdk.Context, cdc codec.JSONCodec) json.RawMessage { - genState := am.keeper.ExportGenesis(ctx) - return cdc.MustMarshalJSON(genState) -} - -// BeginBlock executes all ABCI BeginBlock logic respective to the capability module. -func (am AppModule) BeginBlock(ctx sdk.Context, _ abci.RequestBeginBlock) { - am.keeper.BeginBlocker(ctx) -} - -// EndBlock executes all ABCI EndBlock logic respective to the capability module. It -// returns no validator updates. -func (am AppModule) EndBlock(_ sdk.Context, _ abci.RequestEndBlock) []abci.ValidatorUpdate { - return []abci.ValidatorUpdate{} -} - -// ConsensusVersion implements AppModule/ConsensusVersion. -func (AppModule) ConsensusVersion() uint64 { return 1 } diff --git a/x/epochs/types/doc.go b/x/epochs/types/doc.go deleted file mode 100644 index c1b138dfb..000000000 --- a/x/epochs/types/doc.go +++ /dev/null @@ -1,4 +0,0 @@ -/* -Package types translates gRPC into RESTful JSON APIs. -*/ -package types diff --git a/x/epochs/types/events.go b/x/epochs/types/events.go deleted file mode 100644 index da0ac836e..000000000 --- a/x/epochs/types/events.go +++ /dev/null @@ -1,9 +0,0 @@ -package types - -const ( - EventTypeEpochEnd = "epoch_end" - EventTypeEpochStart = "epoch_start" - - AttributeEpochNumber = "epoch_number" - AttributeEpochStartTime = "start_time" -) diff --git a/x/epochs/types/genesis.go b/x/epochs/types/genesis.go deleted file mode 100644 index 3aadcce3b..000000000 --- a/x/epochs/types/genesis.go +++ /dev/null @@ -1,68 +0,0 @@ -package types - -import ( - "errors" - "time" -) - -func NewGenesisState(epochs []EpochInfo) *GenesisState { - return &GenesisState{Epochs: epochs} -} - -// DefaultGenesis returns the default Capability genesis state. -func DefaultGenesis() *GenesisState { - epochs := []EpochInfo{ - NewGenesisEpochInfo("day", time.Hour*24), // alphabetical order - NewGenesisEpochInfo("hour", time.Hour), - NewGenesisEpochInfo("week", time.Hour*24*7), - } - - return NewGenesisState(epochs) -} - -// Validate performs basic genesis state validation returning an error upon any -// failure. -func (gs GenesisState) Validate() error { - epochIdentifiers := map[string]bool{} - for _, epoch := range gs.Epochs { - if err := epoch.Validate(); err != nil { - return err - } - if epochIdentifiers[epoch.Identifier] { - return errors.New("epoch identifier should be unique") - } - epochIdentifiers[epoch.Identifier] = true - } - - return nil -} - -// Validate also validates epoch info. -func (epoch EpochInfo) Validate() error { - if epoch.Identifier == "" { - return errors.New("epoch identifier should NOT be empty") - } - if epoch.Duration == 0 { - return errors.New("epoch duration should NOT be 0") - } - if epoch.CurrentEpoch < 0 { - return errors.New("epoch CurrentEpoch must be non-negative") - } - if epoch.CurrentEpochStartHeight < 0 { - return errors.New("epoch CurrentEpoch must be non-negative") - } - - return nil -} - -func NewGenesisEpochInfo(identifier string, duration time.Duration) EpochInfo { - return EpochInfo{ - Identifier: identifier, - StartTime: time.Time{}, - Duration: duration, - CurrentEpoch: 0, - CurrentEpochStartHeight: 0, - CurrentEpochStartTime: time.Time{}, - EpochCountingStarted: false, - } -} diff --git a/x/epochs/types/genesis.pb.go b/x/epochs/types/genesis.pb.go deleted file mode 100644 index d89510958..000000000 --- a/x/epochs/types/genesis.pb.go +++ /dev/null @@ -1,820 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: neutron/epochs/genesis.proto - -package types - -import ( - fmt "fmt" - _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" - github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" - _ "google.golang.org/protobuf/types/known/durationpb" - _ "google.golang.org/protobuf/types/known/timestamppb" - io "io" - math "math" - math_bits "math/bits" - time "time" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf -var _ = time.Kitchen - -// 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 - -// EpochInfo is a struct that describes the data going into -// a timer defined by the x/epochs module. -type EpochInfo struct { - // identifier is a unique reference to this particular timer. - Identifier string `protobuf:"bytes,1,opt,name=identifier,proto3" json:"identifier,omitempty"` - // start_time is the time at which the timer first ever ticks. - // If start_time is in the future, the epoch will not begin until the start - // time. - StartTime time.Time `protobuf:"bytes,2,opt,name=start_time,json=startTime,proto3,stdtime" json:"start_time" yaml:"start_time"` - // duration is the time in between epoch ticks. - // In order for intended behavior to be met, duration should - // be greater than the chains expected block time. - // Duration must be non-zero. - Duration time.Duration `protobuf:"bytes,3,opt,name=duration,proto3,stdduration" json:"duration,omitempty" yaml:"duration"` - // current_epoch is the current epoch number, or in other words, - // how many times has the timer 'ticked'. - // The first tick (current_epoch=1) is defined as - // the first block whose blocktime is greater than the EpochInfo start_time. - CurrentEpoch int64 `protobuf:"varint,4,opt,name=current_epoch,json=currentEpoch,proto3" json:"current_epoch,omitempty"` - // current_epoch_start_time describes the start time of the current timer - // interval. The interval is (current_epoch_start_time, - // current_epoch_start_time + duration] When the timer ticks, this is set to - // current_epoch_start_time = last_epoch_start_time + duration only one timer - // tick for a given identifier can occur per block. - // - // NOTE! The current_epoch_start_time may diverge significantly from the - // wall-clock time the epoch began at. Wall-clock time of epoch start may be - // >> current_epoch_start_time. Suppose current_epoch_start_time = 10, - // duration = 5. Suppose the chain goes offline at t=14, and comes back online - // at t=30, and produces blocks at every successive time. (t=31, 32, etc.) - // * The t=30 block will start the epoch for (10, 15] - // * The t=31 block will start the epoch for (15, 20] - // * The t=32 block will start the epoch for (20, 25] - // * The t=33 block will start the epoch for (25, 30] - // * The t=34 block will start the epoch for (30, 35] - // * The **t=36** block will start the epoch for (35, 40] - CurrentEpochStartTime time.Time `protobuf:"bytes,5,opt,name=current_epoch_start_time,json=currentEpochStartTime,proto3,stdtime" json:"current_epoch_start_time" yaml:"current_epoch_start_time"` - // epoch_counting_started is a boolean, that indicates whether this - // epoch timer has began yet. - EpochCountingStarted bool `protobuf:"varint,6,opt,name=epoch_counting_started,json=epochCountingStarted,proto3" json:"epoch_counting_started,omitempty"` - // current_epoch_start_height is the block height at which the current epoch - // started. (The block height at which the timer last ticked) - CurrentEpochStartHeight int64 `protobuf:"varint,8,opt,name=current_epoch_start_height,json=currentEpochStartHeight,proto3" json:"current_epoch_start_height,omitempty"` -} - -func (m *EpochInfo) Reset() { *m = EpochInfo{} } -func (m *EpochInfo) String() string { return proto.CompactTextString(m) } -func (*EpochInfo) ProtoMessage() {} -func (*EpochInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_924a4bf36f8131d7, []int{0} -} -func (m *EpochInfo) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *EpochInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_EpochInfo.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 *EpochInfo) XXX_Merge(src proto.Message) { - xxx_messageInfo_EpochInfo.Merge(m, src) -} -func (m *EpochInfo) XXX_Size() int { - return m.Size() -} -func (m *EpochInfo) XXX_DiscardUnknown() { - xxx_messageInfo_EpochInfo.DiscardUnknown(m) -} - -var xxx_messageInfo_EpochInfo proto.InternalMessageInfo - -func (m *EpochInfo) GetIdentifier() string { - if m != nil { - return m.Identifier - } - return "" -} - -func (m *EpochInfo) GetStartTime() time.Time { - if m != nil { - return m.StartTime - } - return time.Time{} -} - -func (m *EpochInfo) GetDuration() time.Duration { - if m != nil { - return m.Duration - } - return 0 -} - -func (m *EpochInfo) GetCurrentEpoch() int64 { - if m != nil { - return m.CurrentEpoch - } - return 0 -} - -func (m *EpochInfo) GetCurrentEpochStartTime() time.Time { - if m != nil { - return m.CurrentEpochStartTime - } - return time.Time{} -} - -func (m *EpochInfo) GetEpochCountingStarted() bool { - if m != nil { - return m.EpochCountingStarted - } - return false -} - -func (m *EpochInfo) GetCurrentEpochStartHeight() int64 { - if m != nil { - return m.CurrentEpochStartHeight - } - return 0 -} - -// GenesisState defines the epochs module's genesis state. -type GenesisState struct { - Epochs []EpochInfo `protobuf:"bytes,1,rep,name=epochs,proto3" json:"epochs"` -} - -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_924a4bf36f8131d7, []int{1} -} -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) GetEpochs() []EpochInfo { - if m != nil { - return m.Epochs - } - return nil -} - -func init() { - proto.RegisterType((*EpochInfo)(nil), "neutron.epochs.EpochInfo") - proto.RegisterType((*GenesisState)(nil), "neutron.epochs.GenesisState") -} - -func init() { proto.RegisterFile("neutron/epochs/genesis.proto", fileDescriptor_924a4bf36f8131d7) } - -var fileDescriptor_924a4bf36f8131d7 = []byte{ - // 463 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x53, 0x4d, 0x8f, 0xd3, 0x30, - 0x10, 0xad, 0x69, 0x29, 0xa9, 0x59, 0xbe, 0xac, 0x05, 0x42, 0x05, 0x49, 0x14, 0x2e, 0x95, 0x60, - 0x13, 0xf1, 0x21, 0x21, 0xc1, 0xad, 0x80, 0x0a, 0x1c, 0x53, 0x0e, 0x88, 0x4b, 0x95, 0xb6, 0xae, - 0x63, 0x69, 0x63, 0x47, 0xc9, 0x44, 0xa2, 0x37, 0x7e, 0x42, 0x8f, 0xfc, 0xa4, 0x3d, 0xee, 0x91, - 0x53, 0x40, 0xed, 0x8d, 0xe3, 0xfe, 0x02, 0x14, 0xdb, 0x29, 0x5d, 0x0a, 0xda, 0x9b, 0x33, 0xef, - 0xcd, 0x7b, 0x9e, 0x97, 0x31, 0xbe, 0x2f, 0x68, 0x09, 0xb9, 0x14, 0x21, 0xcd, 0xe4, 0x2c, 0x29, - 0x42, 0x46, 0x05, 0x2d, 0x78, 0x11, 0x64, 0xb9, 0x04, 0x49, 0xae, 0x1b, 0x34, 0xd0, 0x68, 0xff, - 0x90, 0x49, 0x26, 0x15, 0x14, 0xd6, 0x27, 0xcd, 0xea, 0x3b, 0x4c, 0x4a, 0x76, 0x4c, 0x43, 0xf5, - 0x35, 0x2d, 0x17, 0xe1, 0xbc, 0xcc, 0x63, 0xe0, 0x52, 0x18, 0xdc, 0xfd, 0x1b, 0x07, 0x9e, 0xd2, - 0x02, 0xe2, 0x34, 0xd3, 0x04, 0x7f, 0xd5, 0xc1, 0xbd, 0xb7, 0xb5, 0xc3, 0x7b, 0xb1, 0x90, 0xc4, - 0xc1, 0x98, 0xcf, 0xa9, 0x00, 0xbe, 0xe0, 0x34, 0xb7, 0x91, 0x87, 0x06, 0xbd, 0x68, 0xa7, 0x42, - 0x3e, 0x61, 0x5c, 0x40, 0x9c, 0xc3, 0xa4, 0x96, 0xb1, 0x2f, 0x79, 0x68, 0x70, 0xf5, 0x69, 0x3f, - 0xd0, 0x1e, 0x41, 0xe3, 0x11, 0x7c, 0x6c, 0x3c, 0x86, 0x0f, 0x4e, 0x2a, 0xb7, 0x75, 0x56, 0xb9, - 0xb7, 0x96, 0x71, 0x7a, 0xfc, 0xd2, 0xff, 0xd3, 0xeb, 0xaf, 0x7e, 0xb8, 0x28, 0xea, 0xa9, 0x42, - 0x4d, 0x27, 0x09, 0xb6, 0x9a, 0xab, 0xdb, 0x6d, 0xa5, 0x7b, 0x6f, 0x4f, 0xf7, 0x8d, 0x21, 0x0c, - 0x9f, 0xd4, 0xb2, 0xbf, 0x2a, 0x97, 0x34, 0x2d, 0x8f, 0x65, 0xca, 0x81, 0xa6, 0x19, 0x2c, 0xcf, - 0x2a, 0xf7, 0x86, 0x36, 0x6b, 0x30, 0xff, 0x5b, 0x6d, 0xb5, 0x55, 0x27, 0x0f, 0xf1, 0xb5, 0x59, - 0x99, 0xe7, 0x54, 0xc0, 0x44, 0x45, 0x6b, 0x77, 0x3c, 0x34, 0x68, 0x47, 0x07, 0xa6, 0xa8, 0xc2, - 0x20, 0x5f, 0x11, 0xb6, 0xcf, 0xb1, 0x26, 0x3b, 0x73, 0x5f, 0xbe, 0x70, 0xee, 0x47, 0x66, 0x6e, - 0x57, 0x5f, 0xe5, 0x7f, 0x4a, 0x3a, 0x85, 0xdb, 0xbb, 0xce, 0xe3, 0x6d, 0x22, 0xcf, 0xf1, 0x1d, - 0xcd, 0x9f, 0xc9, 0x52, 0x00, 0x17, 0x4c, 0x37, 0xd2, 0xb9, 0xdd, 0xf5, 0xd0, 0xc0, 0x8a, 0x0e, - 0x15, 0xfa, 0xda, 0x80, 0x63, 0x8d, 0x91, 0x57, 0xb8, 0xff, 0x2f, 0xb7, 0x84, 0x72, 0x96, 0x80, - 0x6d, 0xa9, 0x51, 0xef, 0xee, 0x19, 0xbe, 0x53, 0xf0, 0x87, 0x8e, 0x75, 0xe5, 0xa6, 0xe5, 0x8f, - 0xf0, 0xc1, 0x48, 0xaf, 0xe2, 0x18, 0x62, 0xa0, 0xe4, 0x05, 0xee, 0xea, 0x1d, 0xb4, 0x91, 0xd7, - 0x56, 0x3f, 0xe6, 0xfc, 0x6a, 0x06, 0xdb, 0xfd, 0x19, 0x76, 0xea, 0xb9, 0x23, 0x43, 0x1f, 0x8e, - 0x4e, 0xd6, 0x0e, 0x3a, 0x5d, 0x3b, 0xe8, 0xe7, 0xda, 0x41, 0xab, 0x8d, 0xd3, 0x3a, 0xdd, 0x38, - 0xad, 0xef, 0x1b, 0xa7, 0xf5, 0xf9, 0x88, 0x71, 0x48, 0xca, 0x69, 0x30, 0x93, 0x69, 0x68, 0xc4, - 0x8e, 0x64, 0xce, 0x9a, 0x73, 0xf8, 0xa5, 0x79, 0x13, 0xb0, 0xcc, 0x68, 0x31, 0xed, 0xaa, 0x88, - 0x9f, 0xfd, 0x0e, 0x00, 0x00, 0xff, 0xff, 0x27, 0xb8, 0xfb, 0x5b, 0x32, 0x03, 0x00, 0x00, -} - -func (m *EpochInfo) 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 *EpochInfo) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *EpochInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.CurrentEpochStartHeight != 0 { - i = encodeVarintGenesis(dAtA, i, uint64(m.CurrentEpochStartHeight)) - i-- - dAtA[i] = 0x40 - } - if m.EpochCountingStarted { - i-- - if m.EpochCountingStarted { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x30 - } - n1, err1 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.CurrentEpochStartTime, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.CurrentEpochStartTime):]) - if err1 != nil { - return 0, err1 - } - i -= n1 - i = encodeVarintGenesis(dAtA, i, uint64(n1)) - i-- - dAtA[i] = 0x2a - if m.CurrentEpoch != 0 { - i = encodeVarintGenesis(dAtA, i, uint64(m.CurrentEpoch)) - i-- - dAtA[i] = 0x20 - } - n2, err2 := github_com_cosmos_gogoproto_types.StdDurationMarshalTo(m.Duration, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdDuration(m.Duration):]) - if err2 != nil { - return 0, err2 - } - i -= n2 - i = encodeVarintGenesis(dAtA, i, uint64(n2)) - i-- - dAtA[i] = 0x1a - n3, err3 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.StartTime, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.StartTime):]) - if err3 != nil { - return 0, err3 - } - i -= n3 - i = encodeVarintGenesis(dAtA, i, uint64(n3)) - i-- - dAtA[i] = 0x12 - if len(m.Identifier) > 0 { - i -= len(m.Identifier) - copy(dAtA[i:], m.Identifier) - i = encodeVarintGenesis(dAtA, i, uint64(len(m.Identifier))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -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 - if len(m.Epochs) > 0 { - for iNdEx := len(m.Epochs) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Epochs[iNdEx].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 *EpochInfo) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Identifier) - if l > 0 { - n += 1 + l + sovGenesis(uint64(l)) - } - l = github_com_cosmos_gogoproto_types.SizeOfStdTime(m.StartTime) - n += 1 + l + sovGenesis(uint64(l)) - l = github_com_cosmos_gogoproto_types.SizeOfStdDuration(m.Duration) - n += 1 + l + sovGenesis(uint64(l)) - if m.CurrentEpoch != 0 { - n += 1 + sovGenesis(uint64(m.CurrentEpoch)) - } - l = github_com_cosmos_gogoproto_types.SizeOfStdTime(m.CurrentEpochStartTime) - n += 1 + l + sovGenesis(uint64(l)) - if m.EpochCountingStarted { - n += 2 - } - if m.CurrentEpochStartHeight != 0 { - n += 1 + sovGenesis(uint64(m.CurrentEpochStartHeight)) - } - return n -} - -func (m *GenesisState) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if len(m.Epochs) > 0 { - for _, e := range m.Epochs { - l = e.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 *EpochInfo) 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: EpochInfo: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: EpochInfo: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Identifier", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenesis - } - 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 ErrInvalidLengthGenesis - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthGenesis - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Identifier = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field StartTime", 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 := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(&m.StartTime, dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Duration", 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 := github_com_cosmos_gogoproto_types.StdDurationUnmarshal(&m.Duration, dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 4: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field CurrentEpoch", wireType) - } - m.CurrentEpoch = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenesis - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.CurrentEpoch |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 5: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field CurrentEpochStartTime", 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 := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(&m.CurrentEpochStartTime, dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 6: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field EpochCountingStarted", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenesis - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.EpochCountingStarted = bool(v != 0) - case 8: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field CurrentEpochStartHeight", wireType) - } - m.CurrentEpochStartHeight = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenesis - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.CurrentEpochStartHeight |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - 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 (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 Epochs", 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 - } - m.Epochs = append(m.Epochs, EpochInfo{}) - if err := m.Epochs[len(m.Epochs)-1].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/epochs/types/hooks.go b/x/epochs/types/hooks.go deleted file mode 100644 index d3cab5e61..000000000 --- a/x/epochs/types/hooks.go +++ /dev/null @@ -1,64 +0,0 @@ -package types - -import ( - fmt "fmt" - - sdk "github.com/cosmos/cosmos-sdk/types" - - "github.com/neutron-org/neutron/utils" -) - -type EpochHooks interface { - // the first block whose timestamp is after the duration is counted as the end of the epoch - AfterEpochEnd(ctx sdk.Context, epochIdentifier string) error - // new epoch is next block of epoch end block - BeforeEpochStart(ctx sdk.Context, epochIdentifier string) error -} - -var _ EpochHooks = MultiEpochHooks{} - -// combine multiple gamm hooks, all hook functions are run in array sequence. -type MultiEpochHooks []EpochHooks - -func NewMultiEpochHooks(hooks ...EpochHooks) MultiEpochHooks { - return hooks -} - -// AfterEpochEnd is called when epoch is going to be ended, epochNumber is the number of epoch that is ending. -func (h MultiEpochHooks) AfterEpochEnd( - ctx sdk.Context, - epochIdentifier string, -) error { - for i := range h { - panicCatchingEpochHook(ctx, h[i].AfterEpochEnd, epochIdentifier) - } - - return nil -} - -// BeforeEpochStart is called when epoch is going to be started, epochNumber is the number of epoch that is starting. -func (h MultiEpochHooks) BeforeEpochStart( - ctx sdk.Context, - epochIdentifier string, -) error { - for i := range h { - panicCatchingEpochHook(ctx, h[i].BeforeEpochStart, epochIdentifier) - } - - return nil -} - -func panicCatchingEpochHook( - ctx sdk.Context, - hookFn func(ctx sdk.Context, epochIdentifier string) error, - epochIdentifier string, -) { - wrappedHookFn := func(ctx sdk.Context) error { - return hookFn(ctx, epochIdentifier) - } - // TODO: Thread info for which hook this is, may be dependent on larger hook system refactoring - err := utils.ApplyFuncIfNoError(ctx, wrappedHookFn) - if err != nil { - ctx.Logger().Error(fmt.Sprintf("error in epoch hook %v", err)) - } -} diff --git a/x/epochs/types/hooks_test.go b/x/epochs/types/hooks_test.go deleted file mode 100644 index 84475d652..000000000 --- a/x/epochs/types/hooks_test.go +++ /dev/null @@ -1,163 +0,0 @@ -package types_test - -import ( - "testing" - - "cosmossdk.io/errors" - "github.com/cosmos/cosmos-sdk/testutil" - sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/stretchr/testify/suite" - - "github.com/neutron-org/neutron/x/epochs/types" -) - -type KeeperTestSuite struct { - suite.Suite - Ctx sdk.Context -} - -func TestKeeperTestSuite(t *testing.T) { - suite.Run(t, new(KeeperTestSuite)) -} - -func (s *KeeperTestSuite) SetupTest() { - s.Ctx = testutil.DefaultContext( - sdk.NewKVStoreKey(types.StoreKey), - sdk.NewTransientStoreKey("transient_test"), - ) -} - -func dummyAfterEpochEndEvent(epochIdentifier string) sdk.Event { - return sdk.NewEvent( - "afterEpochEnd", - sdk.NewAttribute("epochIdentifier", epochIdentifier), - ) -} - -func dummyBeforeEpochStartEvent(epochIdentifier string) sdk.Event { - return sdk.NewEvent( - "beforeEpochStart", - sdk.NewAttribute("epochIdentifier", epochIdentifier), - ) -} - -var errDummy = errors.New("9", 9, "dummyError") - -// dummyEpochHook is a struct satisfying the epoch hook interface, -// that maintains a counter for how many times its been successfully called, -// and a boolean for whether it should panic during its execution. -type dummyEpochHook struct { - successCounter int - shouldPanic bool - shouldError bool -} - -func (hook *dummyEpochHook) AfterEpochEnd( - ctx sdk.Context, - epochIdentifier string, -) error { - if hook.shouldPanic { - panic("dummyEpochHook is panicking") - } - if hook.shouldError { - return errDummy - } - hook.successCounter++ - ctx.EventManager().EmitEvent(dummyAfterEpochEndEvent(epochIdentifier)) - - return nil -} - -func (hook *dummyEpochHook) BeforeEpochStart( - ctx sdk.Context, - epochIdentifier string, -) error { - if hook.shouldPanic { - panic("dummyEpochHook is panicking") - } - if hook.shouldError { - return errDummy - } - hook.successCounter++ - ctx.EventManager().EmitEvent(dummyBeforeEpochStartEvent(epochIdentifier)) - - return nil -} - -func (hook *dummyEpochHook) Clone() *dummyEpochHook { - newHook := dummyEpochHook{ - shouldPanic: hook.shouldPanic, - successCounter: hook.successCounter, - shouldError: hook.shouldError, - } - return &newHook -} - -var _ types.EpochHooks = &dummyEpochHook{} - -func (s *KeeperTestSuite) TestHooksPanicRecovery() { - // panicHook := dummyEpochHook{shouldPanic: true} - noPanicHook := dummyEpochHook{shouldPanic: false} - // errorHook := dummyEpochHook{shouldError: true} - // noErrorHook := dummyEpochHook{shouldError: false} // same as nopanic - // simpleHooks := []dummyEpochHook{panicHook, noPanicHook, errorHook, noErrorHook} - - tests := []struct { - hooks []dummyEpochHook - expectedCounterValues []int - lenEvents int - }{ - {[]dummyEpochHook{noPanicHook}, []int{1}, 1}, - // {[]dummyEpochHook{panicHook}, []int{0}, 0}, - // {[]dummyEpochHook{errorHook}, []int{0}, 0}, - // {simpleHooks, []int{0, 1, 0, 1}, 2}, - } - - for tcIndex, tc := range tests { - for epochActionSelector := 0; epochActionSelector < 2; epochActionSelector++ { - s.SetupTest() - hookRefs := []types.EpochHooks{} - - for _, hook := range tc.hooks { - hookRefs = append(hookRefs, hook.Clone()) - } - - hooks := types.NewMultiEpochHooks(hookRefs...) - - events := func(epochID string, dummyEvent func(id string) sdk.Event) sdk.Events { - evts := make(sdk.Events, tc.lenEvents) - for i := 0; i < tc.lenEvents; i++ { - evts[i] = dummyEvent(epochID) - } - - return evts - } - - s.NotPanics(func() { - if epochActionSelector == 0 { - err := hooks.BeforeEpochStart(s.Ctx, "id") - s.Require().NoError(err) - s.Require().Equal( - events( - "id", - dummyBeforeEpochStartEvent, - ), - s.Ctx.EventManager().Events(), - "test case index %d, before epoch event check", tcIndex, - ) - } else if epochActionSelector == 1 { - err := hooks.AfterEpochEnd(s.Ctx, "id") - s.Require().NoError(err) - s.Require().Equal(events("id", dummyAfterEpochEndEvent), s.Ctx.EventManager().Events(), - "test case index %d, after epoch event check", tcIndex) - } - }) - - for i := 0; i < len(hooks); i++ { - epochHook := hookRefs[i].(*dummyEpochHook) - s.Require(). - Equal(tc.expectedCounterValues[i], epochHook.successCounter, "test case index %d", tcIndex) - } - } - } -} diff --git a/x/epochs/types/identifier.go b/x/epochs/types/identifier.go deleted file mode 100644 index 1cd154fa0..000000000 --- a/x/epochs/types/identifier.go +++ /dev/null @@ -1,23 +0,0 @@ -package types - -import ( - "fmt" -) - -func ValidateEpochIdentifierInterface(i interface{}) error { - v, ok := i.(string) - if !ok { - return fmt.Errorf("invalid parameter type: %T", i) - } - err := ValidateEpochIdentifierString(v) - - return err -} - -func ValidateEpochIdentifierString(s string) error { - if s == "" { - return fmt.Errorf("empty distribution epoch identifier: %+v", s) - } - - return nil -} diff --git a/x/epochs/types/keys.go b/x/epochs/types/keys.go deleted file mode 100644 index 4c6186fe5..000000000 --- a/x/epochs/types/keys.go +++ /dev/null @@ -1,18 +0,0 @@ -package types - -const ( - // ModuleName defines the module name. - ModuleName = "epochs" - - // StoreKey defines the primary module store key. - StoreKey = ModuleName - - // RouterKey is the message route for slashing. - RouterKey = ModuleName - - // QuerierRoute defines the module's query routing key. - QuerierRoute = ModuleName -) - -// KeyPrefixEpoch defines prefix key for storing epochs. -var KeyPrefixEpoch = []byte{0x01} diff --git a/x/epochs/types/query.pb.go b/x/epochs/types/query.pb.go deleted file mode 100644 index 26f6b8c3c..000000000 --- a/x/epochs/types/query.pb.go +++ /dev/null @@ -1,911 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: neutron/epochs/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 - -type QueryEpochsInfoRequest struct { -} - -func (m *QueryEpochsInfoRequest) Reset() { *m = QueryEpochsInfoRequest{} } -func (m *QueryEpochsInfoRequest) String() string { return proto.CompactTextString(m) } -func (*QueryEpochsInfoRequest) ProtoMessage() {} -func (*QueryEpochsInfoRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_11ec49a7f39aeaae, []int{0} -} -func (m *QueryEpochsInfoRequest) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *QueryEpochsInfoRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_QueryEpochsInfoRequest.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 *QueryEpochsInfoRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryEpochsInfoRequest.Merge(m, src) -} -func (m *QueryEpochsInfoRequest) XXX_Size() int { - return m.Size() -} -func (m *QueryEpochsInfoRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryEpochsInfoRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_QueryEpochsInfoRequest proto.InternalMessageInfo - -type QueryEpochsInfoResponse struct { - Epochs []EpochInfo `protobuf:"bytes,1,rep,name=epochs,proto3" json:"epochs"` -} - -func (m *QueryEpochsInfoResponse) Reset() { *m = QueryEpochsInfoResponse{} } -func (m *QueryEpochsInfoResponse) String() string { return proto.CompactTextString(m) } -func (*QueryEpochsInfoResponse) ProtoMessage() {} -func (*QueryEpochsInfoResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_11ec49a7f39aeaae, []int{1} -} -func (m *QueryEpochsInfoResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *QueryEpochsInfoResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_QueryEpochsInfoResponse.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 *QueryEpochsInfoResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryEpochsInfoResponse.Merge(m, src) -} -func (m *QueryEpochsInfoResponse) XXX_Size() int { - return m.Size() -} -func (m *QueryEpochsInfoResponse) XXX_DiscardUnknown() { - xxx_messageInfo_QueryEpochsInfoResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_QueryEpochsInfoResponse proto.InternalMessageInfo - -func (m *QueryEpochsInfoResponse) GetEpochs() []EpochInfo { - if m != nil { - return m.Epochs - } - return nil -} - -type QueryCurrentEpochRequest struct { - Identifier string `protobuf:"bytes,1,opt,name=identifier,proto3" json:"identifier,omitempty"` -} - -func (m *QueryCurrentEpochRequest) Reset() { *m = QueryCurrentEpochRequest{} } -func (m *QueryCurrentEpochRequest) String() string { return proto.CompactTextString(m) } -func (*QueryCurrentEpochRequest) ProtoMessage() {} -func (*QueryCurrentEpochRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_11ec49a7f39aeaae, []int{2} -} -func (m *QueryCurrentEpochRequest) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *QueryCurrentEpochRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_QueryCurrentEpochRequest.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 *QueryCurrentEpochRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryCurrentEpochRequest.Merge(m, src) -} -func (m *QueryCurrentEpochRequest) XXX_Size() int { - return m.Size() -} -func (m *QueryCurrentEpochRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryCurrentEpochRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_QueryCurrentEpochRequest proto.InternalMessageInfo - -func (m *QueryCurrentEpochRequest) GetIdentifier() string { - if m != nil { - return m.Identifier - } - return "" -} - -type QueryCurrentEpochResponse struct { - CurrentEpoch int64 `protobuf:"varint,1,opt,name=current_epoch,json=currentEpoch,proto3" json:"current_epoch,omitempty"` -} - -func (m *QueryCurrentEpochResponse) Reset() { *m = QueryCurrentEpochResponse{} } -func (m *QueryCurrentEpochResponse) String() string { return proto.CompactTextString(m) } -func (*QueryCurrentEpochResponse) ProtoMessage() {} -func (*QueryCurrentEpochResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_11ec49a7f39aeaae, []int{3} -} -func (m *QueryCurrentEpochResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *QueryCurrentEpochResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_QueryCurrentEpochResponse.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 *QueryCurrentEpochResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryCurrentEpochResponse.Merge(m, src) -} -func (m *QueryCurrentEpochResponse) XXX_Size() int { - return m.Size() -} -func (m *QueryCurrentEpochResponse) XXX_DiscardUnknown() { - xxx_messageInfo_QueryCurrentEpochResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_QueryCurrentEpochResponse proto.InternalMessageInfo - -func (m *QueryCurrentEpochResponse) GetCurrentEpoch() int64 { - if m != nil { - return m.CurrentEpoch - } - return 0 -} - -func init() { - proto.RegisterType((*QueryEpochsInfoRequest)(nil), "neutron.epochs.QueryEpochsInfoRequest") - proto.RegisterType((*QueryEpochsInfoResponse)(nil), "neutron.epochs.QueryEpochsInfoResponse") - proto.RegisterType((*QueryCurrentEpochRequest)(nil), "neutron.epochs.QueryCurrentEpochRequest") - proto.RegisterType((*QueryCurrentEpochResponse)(nil), "neutron.epochs.QueryCurrentEpochResponse") -} - -func init() { proto.RegisterFile("neutron/epochs/query.proto", fileDescriptor_11ec49a7f39aeaae) } - -var fileDescriptor_11ec49a7f39aeaae = []byte{ - // 400 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xc1, 0x8b, 0xd3, 0x40, - 0x18, 0xc5, 0x93, 0x56, 0x0b, 0x8e, 0xd5, 0xc3, 0x20, 0x35, 0x0d, 0x3a, 0x2d, 0x11, 0xb5, 0x0a, - 0xcd, 0xd0, 0x7a, 0x10, 0x3c, 0x49, 0x45, 0xc4, 0xa3, 0x39, 0x7a, 0x91, 0x24, 0x4e, 0xa7, 0x03, - 0x76, 0xbe, 0x34, 0x33, 0x11, 0x7b, 0xf0, 0xb2, 0xc7, 0x3d, 0x2d, 0xf4, 0x9f, 0xea, 0xb1, 0xb0, - 0x97, 0x3d, 0x2d, 0x4b, 0xbb, 0x7f, 0xc8, 0xd2, 0x49, 0x5a, 0xda, 0x6c, 0x60, 0xf7, 0x94, 0x30, - 0xef, 0xbd, 0xdf, 0xbc, 0xef, 0x63, 0x90, 0x2b, 0x59, 0xa6, 0x53, 0x90, 0x94, 0x25, 0x10, 0x4f, - 0x14, 0x9d, 0x65, 0x2c, 0x9d, 0xfb, 0x49, 0x0a, 0x1a, 0xf0, 0xd3, 0x42, 0xf3, 0x73, 0xcd, 0x7d, - 0xc6, 0x81, 0x83, 0x91, 0xe8, 0xf6, 0x2f, 0x77, 0xb9, 0x2f, 0x38, 0x00, 0xff, 0xc3, 0x68, 0x98, - 0x08, 0x1a, 0x4a, 0x09, 0x3a, 0xd4, 0x02, 0xa4, 0x2a, 0xd4, 0xf7, 0x31, 0xa8, 0x29, 0x28, 0x1a, - 0x85, 0x8a, 0xe5, 0x70, 0xfa, 0x77, 0x10, 0x31, 0x1d, 0x0e, 0x68, 0x12, 0x72, 0x21, 0x8d, 0x79, - 0x47, 0x2a, 0x75, 0xe1, 0x4c, 0x32, 0x25, 0x0a, 0x92, 0xe7, 0xa0, 0xd6, 0x8f, 0x6d, 0xfe, 0xab, - 0x11, 0xbf, 0xcb, 0x31, 0x04, 0x6c, 0x96, 0x31, 0xa5, 0xbd, 0x00, 0x3d, 0xbf, 0xa5, 0xa8, 0x04, - 0xa4, 0x62, 0xf8, 0x23, 0x6a, 0xe4, 0x30, 0xc7, 0xee, 0xd6, 0x7b, 0x8f, 0x87, 0x6d, 0xff, 0x78, - 0x26, 0xdf, 0x64, 0xb6, 0x91, 0xd1, 0x83, 0xe5, 0x65, 0xc7, 0x0a, 0x0a, 0xbb, 0xf7, 0x09, 0x39, - 0x86, 0xf9, 0x25, 0x4b, 0x53, 0x26, 0xb5, 0xb1, 0x15, 0xf7, 0x61, 0x82, 0x90, 0xf8, 0xcd, 0xa4, - 0x16, 0x63, 0xc1, 0x52, 0xc7, 0xee, 0xda, 0xbd, 0x47, 0xc1, 0xc1, 0x89, 0xf7, 0x19, 0xb5, 0x2b, - 0xb2, 0x45, 0xa3, 0x57, 0xe8, 0x49, 0x9c, 0x9f, 0xff, 0x32, 0x57, 0x99, 0x7c, 0x3d, 0x68, 0xc6, - 0x07, 0xe6, 0xe1, 0xa2, 0x86, 0x1e, 0x1a, 0x04, 0xfe, 0x8f, 0xd0, 0xbe, 0xa2, 0xc2, 0x6f, 0xca, - 0xf5, 0xab, 0x37, 0xe2, 0xbe, 0xbd, 0xd3, 0x97, 0xb7, 0xf1, 0xc8, 0xc9, 0xf9, 0xf5, 0xa2, 0xe6, - 0xe0, 0x16, 0x2d, 0xed, 0x3e, 0xff, 0xe0, 0x53, 0x1b, 0x35, 0x0f, 0xc7, 0xc0, 0xbd, 0x4a, 0x72, - 0xc5, 0x96, 0xdc, 0x77, 0xf7, 0x70, 0x16, 0x2d, 0x5e, 0x9b, 0x16, 0x1d, 0xfc, 0xb2, 0xdc, 0xe2, - 0x68, 0x53, 0xa3, 0x6f, 0xcb, 0x35, 0xb1, 0x57, 0x6b, 0x62, 0x5f, 0xad, 0x89, 0x7d, 0xb6, 0x21, - 0xd6, 0x6a, 0x43, 0xac, 0x8b, 0x0d, 0xb1, 0x7e, 0xf6, 0xb9, 0xd0, 0x93, 0x2c, 0xf2, 0x63, 0x98, - 0xee, 0x10, 0x7d, 0x48, 0xf9, 0x1e, 0xf7, 0x6f, 0x07, 0xd4, 0xf3, 0x84, 0xa9, 0xa8, 0x61, 0x5e, - 0xd4, 0x87, 0x9b, 0x00, 0x00, 0x00, 0xff, 0xff, 0xda, 0x17, 0x4e, 0xb5, 0xfd, 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 { - // EpochInfos provide running epochInfos - EpochInfos(ctx context.Context, in *QueryEpochsInfoRequest, opts ...grpc.CallOption) (*QueryEpochsInfoResponse, error) - // CurrentEpoch provide current epoch of specified identifier - CurrentEpoch(ctx context.Context, in *QueryCurrentEpochRequest, opts ...grpc.CallOption) (*QueryCurrentEpochResponse, error) -} - -type queryClient struct { - cc grpc1.ClientConn -} - -func NewQueryClient(cc grpc1.ClientConn) QueryClient { - return &queryClient{cc} -} - -func (c *queryClient) EpochInfos(ctx context.Context, in *QueryEpochsInfoRequest, opts ...grpc.CallOption) (*QueryEpochsInfoResponse, error) { - out := new(QueryEpochsInfoResponse) - err := c.cc.Invoke(ctx, "/neutron.epochs.Query/EpochInfos", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *queryClient) CurrentEpoch(ctx context.Context, in *QueryCurrentEpochRequest, opts ...grpc.CallOption) (*QueryCurrentEpochResponse, error) { - out := new(QueryCurrentEpochResponse) - err := c.cc.Invoke(ctx, "/neutron.epochs.Query/CurrentEpoch", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - -// QueryServer is the server API for Query service. -type QueryServer interface { - // EpochInfos provide running epochInfos - EpochInfos(context.Context, *QueryEpochsInfoRequest) (*QueryEpochsInfoResponse, error) - // CurrentEpoch provide current epoch of specified identifier - CurrentEpoch(context.Context, *QueryCurrentEpochRequest) (*QueryCurrentEpochResponse, error) -} - -// UnimplementedQueryServer can be embedded to have forward compatible implementations. -type UnimplementedQueryServer struct { -} - -func (*UnimplementedQueryServer) EpochInfos(ctx context.Context, req *QueryEpochsInfoRequest) (*QueryEpochsInfoResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method EpochInfos not implemented") -} -func (*UnimplementedQueryServer) CurrentEpoch(ctx context.Context, req *QueryCurrentEpochRequest) (*QueryCurrentEpochResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method CurrentEpoch not implemented") -} - -func RegisterQueryServer(s grpc1.Server, srv QueryServer) { - s.RegisterService(&_Query_serviceDesc, srv) -} - -func _Query_EpochInfos_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryEpochsInfoRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(QueryServer).EpochInfos(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/neutron.epochs.Query/EpochInfos", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).EpochInfos(ctx, req.(*QueryEpochsInfoRequest)) - } - return interceptor(ctx, in, info, handler) -} - -func _Query_CurrentEpoch_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryCurrentEpochRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(QueryServer).CurrentEpoch(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/neutron.epochs.Query/CurrentEpoch", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).CurrentEpoch(ctx, req.(*QueryCurrentEpochRequest)) - } - return interceptor(ctx, in, info, handler) -} - -var _Query_serviceDesc = grpc.ServiceDesc{ - ServiceName: "neutron.epochs.Query", - HandlerType: (*QueryServer)(nil), - Methods: []grpc.MethodDesc{ - { - MethodName: "EpochInfos", - Handler: _Query_EpochInfos_Handler, - }, - { - MethodName: "CurrentEpoch", - Handler: _Query_CurrentEpoch_Handler, - }, - }, - Streams: []grpc.StreamDesc{}, - Metadata: "neutron/epochs/query.proto", -} - -func (m *QueryEpochsInfoRequest) 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 *QueryEpochsInfoRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *QueryEpochsInfoRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - return len(dAtA) - i, nil -} - -func (m *QueryEpochsInfoResponse) 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 *QueryEpochsInfoResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *QueryEpochsInfoResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Epochs) > 0 { - for iNdEx := len(m.Epochs) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Epochs[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 *QueryCurrentEpochRequest) 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 *QueryCurrentEpochRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *QueryCurrentEpochRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Identifier) > 0 { - i -= len(m.Identifier) - copy(dAtA[i:], m.Identifier) - i = encodeVarintQuery(dAtA, i, uint64(len(m.Identifier))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *QueryCurrentEpochResponse) 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 *QueryCurrentEpochResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *QueryCurrentEpochResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.CurrentEpoch != 0 { - i = encodeVarintQuery(dAtA, i, uint64(m.CurrentEpoch)) - i-- - dAtA[i] = 0x8 - } - 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 *QueryEpochsInfoRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - return n -} - -func (m *QueryEpochsInfoResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if len(m.Epochs) > 0 { - for _, e := range m.Epochs { - l = e.Size() - n += 1 + l + sovQuery(uint64(l)) - } - } - return n -} - -func (m *QueryCurrentEpochRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Identifier) - if l > 0 { - n += 1 + l + sovQuery(uint64(l)) - } - return n -} - -func (m *QueryCurrentEpochResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.CurrentEpoch != 0 { - n += 1 + sovQuery(uint64(m.CurrentEpoch)) - } - 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 *QueryEpochsInfoRequest) 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: QueryEpochsInfoRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: QueryEpochsInfoRequest: 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 *QueryEpochsInfoResponse) 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: QueryEpochsInfoResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: QueryEpochsInfoResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Epochs", 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.Epochs = append(m.Epochs, EpochInfo{}) - if err := m.Epochs[len(m.Epochs)-1].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 *QueryCurrentEpochRequest) 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: QueryCurrentEpochRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: QueryCurrentEpochRequest: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Identifier", 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.Identifier = 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 *QueryCurrentEpochResponse) 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: QueryCurrentEpochResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: QueryCurrentEpochResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field CurrentEpoch", wireType) - } - m.CurrentEpoch = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.CurrentEpoch |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - 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/epochs/types/query.pb.gw.go b/x/epochs/types/query.pb.gw.go deleted file mode 100644 index 3b0d42301..000000000 --- a/x/epochs/types/query.pb.gw.go +++ /dev/null @@ -1,236 +0,0 @@ -// Code generated by protoc-gen-grpc-gateway. DO NOT EDIT. -// source: neutron/epochs/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_EpochInfos_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryEpochsInfoRequest - var metadata runtime.ServerMetadata - - msg, err := client.EpochInfos(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) - return msg, metadata, err - -} - -func local_request_Query_EpochInfos_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryEpochsInfoRequest - var metadata runtime.ServerMetadata - - msg, err := server.EpochInfos(ctx, &protoReq) - return msg, metadata, err - -} - -var ( - filter_Query_CurrentEpoch_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} -) - -func request_Query_CurrentEpoch_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryCurrentEpochRequest - 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_CurrentEpoch_0); err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - - msg, err := client.CurrentEpoch(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) - return msg, metadata, err - -} - -func local_request_Query_CurrentEpoch_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryCurrentEpochRequest - 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_CurrentEpoch_0); err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - - msg, err := server.CurrentEpoch(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_EpochInfos_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_EpochInfos_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_EpochInfos_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - - }) - - mux.Handle("GET", pattern_Query_CurrentEpoch_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_CurrentEpoch_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_CurrentEpoch_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_EpochInfos_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_EpochInfos_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_EpochInfos_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - - }) - - mux.Handle("GET", pattern_Query_CurrentEpoch_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_CurrentEpoch_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_CurrentEpoch_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - - }) - - return nil -} - -var ( - pattern_Query_EpochInfos_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 1}, []string{"neutron", "epochs"}, "", runtime.AssumeColonVerbOpt(false))) - - pattern_Query_CurrentEpoch_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"neutron", "epochs", "current_epoch"}, "", runtime.AssumeColonVerbOpt(false))) -) - -var ( - forward_Query_EpochInfos_0 = runtime.ForwardResponseMessage - - forward_Query_CurrentEpoch_0 = runtime.ForwardResponseMessage -) diff --git a/x/incentives/client/cli/cli_test.go b/x/incentives/client/cli/cli_test.go deleted file mode 100644 index 526dcda41..000000000 --- a/x/incentives/client/cli/cli_test.go +++ /dev/null @@ -1,340 +0,0 @@ -package cli_test - -import ( - "fmt" - "testing" - "time" - - "cosmossdk.io/math" - sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/utils" - "github.com/neutron-org/neutron/utils/dcli" - dextypes "github.com/neutron-org/neutron/x/dex/types" - "github.com/neutron-org/neutron/x/incentives/client/cli" - "github.com/neutron-org/neutron/x/incentives/types" -) - -var testAddresses = utils.CreateRandomAccounts(3) - -// Queries //////////////////////////////////////////////////////////////////// - -func TestGetCmdGetModuleStatus(t *testing.T) { - desc, _ := cli.GetCmdGetModuleStatus() - tcs := map[string]dcli.QueryCliTestCase[*types.GetModuleStatusRequest]{ - "basic test": { - ExpectedQuery: &types.GetModuleStatusRequest{}, - }, - } - dcli.RunQueryTestCases(t, desc, tcs) -} - -func TestGetCmdGetGaugeByID(t *testing.T) { - desc, _ := cli.GetCmdGetGaugeByID() - tcs := map[string]dcli.QueryCliTestCase[*types.GetGaugeByIDRequest]{ - "basic test": { - Cmd: "1", ExpectedQuery: &types.GetGaugeByIDRequest{Id: 1}, - }, - } - dcli.RunQueryTestCases(t, desc, tcs) -} - -func TestGetCmdGauges(t *testing.T) { - desc, _ := cli.GetCmdGauges() - tcs := map[string]dcli.QueryCliTestCase[*types.GetGaugesRequest]{ - "test ACTIVE_UPCOMING": { - Cmd: "ACTIVE_UPCOMING TokenA", - ExpectedQuery: &types.GetGaugesRequest{ - Status: types.GaugeStatus_ACTIVE_UPCOMING, - Denom: "TokenA", - }, - }, - "test UPCOMING": { - Cmd: "UPCOMING TokenA", - ExpectedQuery: &types.GetGaugesRequest{ - Status: types.GaugeStatus_UPCOMING, - Denom: "TokenA", - }, - }, - "test FINISHED": { - Cmd: "FINISHED TokenA", - ExpectedQuery: &types.GetGaugesRequest{ - Status: types.GaugeStatus_FINISHED, - Denom: "TokenA", - }, - }, - } - dcli.RunQueryTestCases(t, desc, tcs) -} - -func TestGetCmdGetStakeByID(t *testing.T) { - desc, _ := cli.GetCmdGetStakeByID() - tcs := map[string]dcli.QueryCliTestCase[*types.GetStakeByIDRequest]{ - "basic test": { - Cmd: "1", ExpectedQuery: &types.GetStakeByIDRequest{StakeId: 1}, - }, - } - dcli.RunQueryTestCases(t, desc, tcs) -} - -func TestGetCmdStakes(t *testing.T) { - desc, _ := cli.GetCmdStakes() - tcs := map[string]dcli.QueryCliTestCase[*types.GetStakesRequest]{ - "basic test": { - Cmd: fmt.Sprintf("%s", testAddresses[0]), - ExpectedQuery: &types.GetStakesRequest{ - Owner: testAddresses[0].String(), - }, - }, - } - dcli.RunQueryTestCases(t, desc, tcs) -} - -func TestGetCmdFutureRewardEstimate(t *testing.T) { - desc, _ := cli.GetCmdGetFutureRewardEstimate() - tcs := map[string]dcli.QueryCliTestCase[*types.GetFutureRewardEstimateRequest]{ - "basic test": { - Cmd: fmt.Sprintf("%s [1,2,3] 1000", testAddresses[0]), - ExpectedQuery: &types.GetFutureRewardEstimateRequest{ - Owner: testAddresses[0].String(), - StakeIds: []uint64{1, 2, 3}, - NumEpochs: 1000, - }, - }, - } - dcli.RunQueryTestCases(t, desc, tcs) -} - -func TestGetAccountHistory(t *testing.T) { - desc, _ := cli.GetCmdGetAccountHistory() - tcs := map[string]dcli.QueryCliTestCase[*types.GetAccountHistoryRequest]{ - "basic test": { - Cmd: fmt.Sprintf("%s", testAddresses[0]), - ExpectedQuery: &types.GetAccountHistoryRequest{ - Account: testAddresses[0].String(), - }, - }, - } - dcli.RunQueryTestCases(t, desc, tcs) -} - -func TestGetGaugeQualifyingValue(t *testing.T) { - desc, _ := cli.GetCmdGaugeQualifyingValue() - tcs := map[string]dcli.QueryCliTestCase[*types.GetGaugeQualifyingValueRequest]{ - "basic test": { - Cmd: "1", - ExpectedQuery: &types.GetGaugeQualifyingValueRequest{ - Id: 1, - }, - }, - } - dcli.RunQueryTestCases(t, desc, tcs) -} - -// TXS //////////////////////////////////////////////////////////////////////// - -func TestNewCreateGaugeCmd(t *testing.T) { - testTime := time.Unix(1681505514, 0).UTC() - desc, _ := cli.NewCreateGaugeCmd() - tcs := map[string]dcli.TxCliTestCase[*types.MsgCreateGauge]{ - "basic test": { - Cmd: fmt.Sprintf( - "TokenA TokenB 0 100 100TokenA,100TokenB 50 0 --from %s", - testAddresses[0], - ), - ExpectedMsg: &types.MsgCreateGauge{ - IsPerpetual: false, - Owner: testAddresses[0].String(), - DistributeTo: types.QueryCondition{ - PairID: &dextypes.PairID{Token0: "TokenA", Token1: "TokenB"}, - StartTick: 0, - EndTick: 100, - }, - Coins: sdk.NewCoins( - sdk.NewCoin("TokenA", math.NewInt(100)), - sdk.NewCoin("TokenB", math.NewInt(100)), - ), - StartTime: time.Unix(0, 0).UTC(), - NumEpochsPaidOver: 50, - PricingTick: 0, - }, - }, - "tests with time (RFC3339)": { - Cmd: fmt.Sprintf( - "TokenA TokenB [-20] 20 100TokenA,100TokenB 50 0 --start-time %s --from %s", - testTime.Format(time.RFC3339), - testAddresses[0], - ), - ExpectedMsg: &types.MsgCreateGauge{ - IsPerpetual: false, - Owner: testAddresses[0].String(), - DistributeTo: types.QueryCondition{ - PairID: &dextypes.PairID{Token0: "TokenA", Token1: "TokenB"}, - StartTick: -20, - EndTick: 20, - }, - Coins: sdk.NewCoins( - sdk.NewCoin("TokenA", math.NewInt(100)), - sdk.NewCoin("TokenB", math.NewInt(100)), - ), - StartTime: testTime, - NumEpochsPaidOver: 50, - PricingTick: 0, - }, - }, - "tests with time (unix int)": { - Cmd: fmt.Sprintf( - "TokenA TokenB [-20] 20 100TokenA,100TokenB 50 0 --start-time %d --from %s", - testTime.Unix(), - testAddresses[0], - ), - ExpectedMsg: &types.MsgCreateGauge{ - IsPerpetual: false, - Owner: testAddresses[0].String(), - DistributeTo: types.QueryCondition{ - PairID: &dextypes.PairID{Token0: "TokenA", Token1: "TokenB"}, - StartTick: -20, - EndTick: 20, - }, - Coins: sdk.NewCoins( - sdk.NewCoin("TokenA", math.NewInt(100)), - sdk.NewCoin("TokenB", math.NewInt(100)), - ), - StartTime: testTime, - NumEpochsPaidOver: 50, - PricingTick: 0, - }, - }, - "tests with perpetual": { - Cmd: fmt.Sprintf( - "TokenA TokenB [-20] 20 100TokenA,100TokenB 50 0 --perpetual --from %s", - testAddresses[0], - ), - ExpectedMsg: &types.MsgCreateGauge{ - IsPerpetual: true, - Owner: testAddresses[0].String(), - DistributeTo: types.QueryCondition{ - PairID: &dextypes.PairID{Token0: "TokenA", Token1: "TokenB"}, - StartTick: -20, - EndTick: 20, - }, - Coins: sdk.NewCoins( - sdk.NewCoin("TokenA", math.NewInt(100)), - sdk.NewCoin("TokenB", math.NewInt(100)), - ), - StartTime: time.Unix(0, 0).UTC(), - NumEpochsPaidOver: 1, - PricingTick: 0, - }, - }, - } - dcli.RunTxTestCases(t, desc, tcs) -} - -func TestNewAddToGaugeCmd(t *testing.T) { - desc, _ := cli.NewAddToGaugeCmd() - tcs := map[string]dcli.TxCliTestCase[*types.MsgAddToGauge]{ - "basic test": { - Cmd: fmt.Sprintf("1 1000TokenA --from %s", testAddresses[0]), - ExpectedMsg: &types.MsgAddToGauge{ - Owner: testAddresses[0].String(), - GaugeId: 1, - Rewards: sdk.NewCoins(sdk.NewCoin("TokenA", math.NewInt(1000))), - }, - }, - "multiple tokens": { - Cmd: fmt.Sprintf("1 1000TokenA,1TokenZ --from %s", testAddresses[0]), - ExpectedMsg: &types.MsgAddToGauge{ - Owner: testAddresses[0].String(), - GaugeId: 1, - Rewards: sdk.NewCoins( - sdk.NewCoin("TokenA", math.NewInt(1000)), - sdk.NewCoin("TokenZ", math.NewInt(1)), - ), - }, - }, - } - dcli.RunTxTestCases(t, desc, tcs) -} - -func TestNewStakeCmd(t *testing.T) { - desc, _ := cli.NewStakeCmd() - tcs := map[string]dcli.TxCliTestCase[*types.MsgStake]{ - "basic test": { - Cmd: fmt.Sprintf("1000TokenA --from %s", testAddresses[0]), - ExpectedMsg: &types.MsgStake{ - Owner: testAddresses[0].String(), - Coins: sdk.NewCoins(sdk.NewCoin("TokenA", math.NewInt(1000))), - }, - }, - "multiple tokens": { - Cmd: fmt.Sprintf("1000TokenA,1TokenZ --from %s", testAddresses[0]), - ExpectedMsg: &types.MsgStake{ - Owner: testAddresses[0].String(), - Coins: sdk.NewCoins( - sdk.NewCoin("TokenA", math.NewInt(1000)), - sdk.NewCoin("TokenZ", math.NewInt(1)), - ), - }, - }, - "tokenized share test": { - Cmd: fmt.Sprintf( - "1000neutron/pool/1 --from %s", - testAddresses[0], - ), - ExpectedMsg: &types.MsgStake{ - Owner: testAddresses[0].String(), - Coins: sdk.NewCoins( - sdk.NewCoin("neutron/pool/1", math.NewInt(1000)), - ), - }, - }, - "multiple tokenized shares": { - Cmd: fmt.Sprintf( - "1000neutron/pool/1,1neutron/pool/2 --from %s", - testAddresses[0], - ), - ExpectedMsg: &types.MsgStake{ - Owner: testAddresses[0].String(), - Coins: sdk.NewCoins( - sdk.NewCoin("neutron/pool/1", math.NewInt(1000)), - sdk.NewCoin("neutron/pool/2", math.NewInt(1)), - ), - }, - }, - } - dcli.RunTxTestCases(t, desc, tcs) -} - -func TestNewUnstakeCmd(t *testing.T) { - desc, _ := cli.NewUnstakeCmd() - tcs := map[string]dcli.TxCliTestCase[*types.MsgUnstake]{ - "basic test": { - Cmd: fmt.Sprintf("--from %s", testAddresses[0]), - ExpectedMsg: &types.MsgUnstake{ - Owner: testAddresses[0].String(), - Unstakes: []*types.MsgUnstake_UnstakeDescriptor{}, - }, - }, - "with coins": { - Cmd: fmt.Sprintf("1:10TokenA 10:10TokenA,10TokenC --from %s", testAddresses[0]), - ExpectedMsg: &types.MsgUnstake{ - Owner: testAddresses[0].String(), - Unstakes: []*types.MsgUnstake_UnstakeDescriptor{ - { - ID: 1, - Coins: sdk.NewCoins( - sdk.NewCoin("TokenA", math.NewInt(10)), - ), - }, { - ID: 10, - Coins: sdk.NewCoins( - sdk.NewCoin("TokenA", math.NewInt(10)), - sdk.NewCoin("TokenC", math.NewInt(10)), - ), - }, - }, - }, - }, - } - dcli.RunTxTestCases(t, desc, tcs) -} diff --git a/x/incentives/client/cli/flags.go b/x/incentives/client/cli/flags.go deleted file mode 100644 index fa3467e0f..000000000 --- a/x/incentives/client/cli/flags.go +++ /dev/null @@ -1,22 +0,0 @@ -package cli - -import ( - flag "github.com/spf13/pflag" -) - -// Flags for incentives module tx commands. -const ( - FlagStartTime = "start-time" - FlagPerpetual = "perpetual" - FlagAmount = "amount" -) - -// FlagSetCreateGauge returns flags for creating gauges. -func FlagSetCreateGauge() *flag.FlagSet { - fs := flag.NewFlagSet("", flag.ContinueOnError) - - fs.String(FlagStartTime, "", "Timestamp to begin distribution") - fs.Bool(FlagPerpetual, false, "Perpetual distribution") - - return fs -} diff --git a/x/incentives/client/cli/query.go b/x/incentives/client/cli/query.go deleted file mode 100644 index 13fa2f876..000000000 --- a/x/incentives/client/cli/query.go +++ /dev/null @@ -1,114 +0,0 @@ -package cli - -import ( - "github.com/spf13/cobra" - "github.com/spf13/pflag" - - "github.com/neutron-org/neutron/utils/dcli" - "github.com/neutron-org/neutron/x/incentives/types" -) - -// GetQueryCmd returns the query commands for this module. -func GetQueryCmd() *cobra.Command { - // group incentives queries under a subcommand - cmd := dcli.QueryIndexCmd(types.ModuleName) - qcGetter := types.NewQueryClient - dcli.AddQueryCmd(cmd, qcGetter, GetCmdGetModuleStatus) - dcli.AddQueryCmd(cmd, qcGetter, GetCmdGetGaugeByID) - dcli.AddQueryCmd(cmd, qcGetter, GetCmdGauges) - dcli.AddQueryCmd(cmd, qcGetter, GetCmdGetStakeByID) - dcli.AddQueryCmd(cmd, qcGetter, GetCmdStakes) - dcli.AddQueryCmd(cmd, qcGetter, GetCmdGetFutureRewardEstimate) - dcli.AddQueryCmd(cmd, qcGetter, GetCmdGetAccountHistory) - dcli.AddQueryCmd(cmd, qcGetter, GetCmdGaugeQualifyingValue) - - return cmd -} - -// GetCmdGetModuleStatus returns status of incentive module. -func GetCmdGetModuleStatus() (*dcli.QueryDescriptor, *types.GetModuleStatusRequest) { - return &dcli.QueryDescriptor{ - Use: "module-status", - Short: "Query module status.", - Long: `{{.Short}}`, - }, &types.GetModuleStatusRequest{} -} - -// GetCmdGetGaugeByID returns a gauge by ID. -func GetCmdGetGaugeByID() (*dcli.QueryDescriptor, *types.GetGaugeByIDRequest) { - return &dcli.QueryDescriptor{ - Use: "gauge-by-id [id]", - Short: "Query gauge by id.", - Long: `{{.Short}}{{.ExampleHeader}} gauge-by-id 1`, - }, &types.GetGaugeByIDRequest{} -} - -//nolint:unparam // we can't change return values since we need to match interface -func parseGaugeStatus(arg string, _ *pflag.FlagSet) (any, dcli.FieldReadLocation, error) { - gaugeStatusInt, ok := types.GaugeStatus_value[arg] - if !ok { - return 0, dcli.UsedArg, types.ErrInvalidGaugeStatus - } - gaugeStatus := types.GaugeStatus(gaugeStatusInt) - - return gaugeStatus, dcli.UsedArg, nil -} - -// GetCmdGauges returns all gauges for a given status and denom. -func GetCmdGauges() (*dcli.QueryDescriptor, *types.GetGaugesRequest) { - return &dcli.QueryDescriptor{ - Use: "list-gauges [status] [denom]", - Short: "Query gauges", - Long: `{{.Short}}{{.ExampleHeader}} list-gauges UPCOMING neutron/pool/1`, - CustomFieldParsers: map[string]dcli.CustomFieldParserFn{ - "Status": parseGaugeStatus, - }, - }, &types.GetGaugesRequest{} -} - -// GetCmdGetStakeByID returns a lock by ID. -func GetCmdGetStakeByID() (*dcli.QueryDescriptor, *types.GetStakeByIDRequest) { - return &dcli.QueryDescriptor{ - Use: "stake-by-id [stakeID]", - Short: "Query stake by id.", - Long: `{{.Short}}{{.ExampleHeader}} Stake-by-id 1`, - }, &types.GetStakeByIDRequest{} -} - -// GetCmdStakes returns all gauges for a given status and owner. -func GetCmdStakes() (*dcli.QueryDescriptor, *types.GetStakesRequest) { - return &dcli.QueryDescriptor{ - Use: "list-stakes [owner]", - Short: "Query stakes", - Long: `{{.Short}}{{.ExampleHeader}} list-stakes cosmos1chl62vc593p99z2tfh2pp8tl4anm0w4l8h8svx`, - }, &types.GetStakesRequest{} -} - -// GetCmdGetFutureRewardsEstimate returns a rewards estimate for a given set of stakes. -func GetCmdGetFutureRewardEstimate() (*dcli.QueryDescriptor, *types.GetFutureRewardEstimateRequest) { - return &dcli.QueryDescriptor{ - Use: "reward-estimate [owner] [stakeIDs] [numEpochs]", - Short: "Get rewards estimate for set of stakes", - Long: `{{.Short}}{{.ExampleHeader}} reward-estimate cosmos1chl62vc593p99z2tfh2pp8tl4anm0w4l8h8svx [1,2,3] 365`, - CustomFieldParsers: map[string]dcli.CustomFieldParserFn{ - "StakeIDs": dcli.ParseUintArray, - }, - }, &types.GetFutureRewardEstimateRequest{} -} - -// GetCmdGetFutureRewardsEstimate returns a rewards estimate for a given set of stakes. -func GetCmdGetAccountHistory() (*dcli.QueryDescriptor, *types.GetAccountHistoryRequest) { - return &dcli.QueryDescriptor{ - Use: "account-history [account]", - Short: "Get rewards distribution history for an address", - Long: `{{.Short}}{{.ExampleHeader}} account-history cosmos1chl62vc593p99z2tfh2pp8tl4anm0w4l8h8svx`, - }, &types.GetAccountHistoryRequest{} -} - -func GetCmdGaugeQualifyingValue() (*dcli.QueryDescriptor, *types.GetGaugeQualifyingValueRequest) { - return &dcli.QueryDescriptor{ - Use: "gauge-qualifying-value [gaugeID]", - Short: "Query the qualifying value of a gauge by gauge id.", - Long: `{{.Short}}{{.ExampleHeader}} gauge-qualifying-value 1`, - }, &types.GetGaugeQualifyingValueRequest{} -} diff --git a/x/incentives/client/cli/query_test.go b/x/incentives/client/cli/query_test.go deleted file mode 100644 index 2a60451d3..000000000 --- a/x/incentives/client/cli/query_test.go +++ /dev/null @@ -1,55 +0,0 @@ -package cli_test - -import ( - "testing" - - "cosmossdk.io/math" - "github.com/stretchr/testify/suite" - - "github.com/neutron-org/neutron/testutil/apptesting" - dextypes "github.com/neutron-org/neutron/x/dex/types" - "github.com/neutron-org/neutron/x/incentives/keeper" - "github.com/neutron-org/neutron/x/incentives/types" - - sdk "github.com/cosmos/cosmos-sdk/types" -) - -type QueryTestSuite struct { - apptesting.KeeperTestHelper - queryClient types.QueryClient -} - -// StakeTokens funds an account, stakes tokens and returns a stakeID. -func (s *QueryTestSuite) SetupStake( - addr sdk.AccAddress, - coins sdk.Coins, -) (stakeID uint64) { - msgServer := keeper.NewMsgServerImpl(s.App.IncentivesKeeper) - s.FundAcc(addr, coins) - - msgResponse, err := msgServer.Stake( - sdk.WrapSDKContext(s.Ctx), - types.NewMsgSetupStake(addr, coins), - ) - s.Require().NoError(err) - - return msgResponse.ID -} - -func (s *QueryTestSuite) SetupSuite() { - s.Setup() - s.queryClient = types.NewQueryClient(s.QueryHelper) - - pool, _ := s.App.DexKeeper.InitPool(s.Ctx, dextypes.MustNewPairID("tokenA", "tokenB"), 0, 1) - denom := pool.GetPoolDenom() - - // set up stake with id = 1 - addr := apptesting.SetupAddr(0) - s.SetupStake(addr, sdk.Coins{sdk.NewCoin(denom, math.NewInt(1000000))}) - - s.Commit() -} - -func TestQueryTestSuite(t *testing.T) { - suite.Run(t, new(QueryTestSuite)) -} diff --git a/x/incentives/client/cli/tx.go b/x/incentives/client/cli/tx.go deleted file mode 100644 index 0c9517923..000000000 --- a/x/incentives/client/cli/tx.go +++ /dev/null @@ -1,173 +0,0 @@ -package cli - -import ( - "errors" - "fmt" - "strconv" - "strings" - "time" - - "github.com/cosmos/cosmos-sdk/client" - sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/spf13/cobra" - "github.com/spf13/pflag" - - "github.com/neutron-org/neutron/utils/dcli" - dextypes "github.com/neutron-org/neutron/x/dex/types" - "github.com/neutron-org/neutron/x/incentives/types" -) - -// GetTxCmd returns the transaction commands for this module. -func GetTxCmd() *cobra.Command { - cmd := dcli.TxIndexCmd(types.ModuleName) - - dcli.AddTxCmd(cmd, NewCreateGaugeCmd) - dcli.AddTxCmd(cmd, NewAddToGaugeCmd) - dcli.AddTxCmd(cmd, NewStakeCmd) - dcli.AddTxCmd(cmd, NewUnstakeCmd) - - return cmd -} - -func CreateGaugeCmdBuilder( - clientCtx client.Context, - args []string, - flags *pflag.FlagSet, -) (sdk.Msg, error) { - // "create-gauge [pairTokenA] [pairTokenB] [startTick] [endTick] [coins] [numEpochs] [pricingTick]" - pairID, err := dextypes.NewPairIDFromUnsorted(args[0], args[1]) - if err != nil { - return &types.MsgCreateGauge{}, err - } - - startTick, err := dcli.ParseIntMaybeNegative(args[2], "startTick") - if err != nil { - return &types.MsgCreateGauge{}, err - } - - endTick, err := dcli.ParseIntMaybeNegative(args[3], "endTick") - if err != nil { - return &types.MsgCreateGauge{}, err - } - - coins, err := sdk.ParseCoinsNormalized(args[4]) - if err != nil { - return &types.MsgCreateGauge{}, err - } - - var startTime time.Time - timeStr, err := flags.GetString(FlagStartTime) - if err != nil { - return &types.MsgCreateGauge{}, err - } - if timeStr == "" { // empty start time - startTime = time.Unix(0, 0).UTC() - } else if timeUnix, err := strconv.ParseInt(timeStr, 10, 64); err == nil { // unix time - startTime = time.Unix(timeUnix, 0).UTC() - } else if timeRFC, err := time.Parse(time.RFC3339, timeStr); err == nil { // RFC time - startTime = timeRFC - } else { // invalid input - return &types.MsgCreateGauge{}, errors.New("invalid start time format") - } - - epochs, err := dcli.ParseUint(args[5], "numEpochs") - if err != nil { - return &types.MsgCreateGauge{}, err - } - - perpetual, err := flags.GetBool(FlagPerpetual) - if err != nil { - return &types.MsgCreateGauge{}, err - } - - if perpetual { - epochs = 1 - } - - pricingTick, err := dcli.ParseIntMaybeNegative(args[6], "pricingTick") - if err != nil { - return &types.MsgCreateGauge{}, err - } - - distributeTo := types.QueryCondition{ - PairID: pairID, - StartTick: startTick, - EndTick: endTick, - } - - msg := types.NewMsgCreateGauge( - epochs == 1, - clientCtx.GetFromAddress(), - distributeTo, - coins, - startTime, - epochs, - pricingTick, - ) - - return msg, nil -} - -func NewCreateGaugeCmd() (*dcli.TxCliDesc, *types.MsgCreateGauge) { - return &dcli.TxCliDesc{ - ParseAndBuildMsg: CreateGaugeCmdBuilder, - Use: "create-gauge [pairTokenA] [pairTokenB] [startTick] [endTick] [coins] [numEpochs] [pricingTick]", - Short: "create a gauge to distribute rewards to users", - Long: `{{.Short}}{{.ExampleHeader}} create-gauge TokenA TokenB [-10] 200 100TokenA,200TokenB 6 0 --start-time 2006-01-02T15:04:05Z07:00 --perpetual true`, - Flags: dcli.FlagDesc{OptionalFlags: []*pflag.FlagSet{FlagSetCreateGauge()}}, - NumArgs: 7, - }, &types.MsgCreateGauge{} -} - -func NewAddToGaugeCmd() (*dcli.TxCliDesc, *types.MsgAddToGauge) { - return &dcli.TxCliDesc{ - Use: "add-to-gauge [gauge_id] [coins]", - Short: "add coins to gauge to distribute more rewards to users", - Long: `{{.Short}}{{.ExampleHeader}} add-to-gauge 1 TokenA,TokenB`, - }, &types.MsgAddToGauge{} -} - -func NewStakeCmd() (*dcli.TxCliDesc, *types.MsgStake) { - return &dcli.TxCliDesc{ - Use: "stake-tokens [coins]", - Short: "stake tokens into stake pool from user account", - }, &types.MsgStake{} -} - -func UnstakeCmdBuilder(clientCtx client.Context, args []string, _ *pflag.FlagSet) (sdk.Msg, error) { - // "unstake-tokens [poolID]:[coins] [poolID]:[coins] ..." - unstakes := make([]*types.MsgUnstake_UnstakeDescriptor, 0, len(args)) - for i, unstake := range args { - if strings.HasPrefix(unstake, "-") { - // no more unstakes left, only flags - break - } - - parts := strings.Split(unstake, ":") - if len(parts) != 2 { - return &types.MsgUnstake{}, errors.New("invalid syntax for unstake tokens") - } - poolID, err := dcli.ParseUint(parts[0], fmt.Sprintf("poolID[%d]", i)) - if err != nil { - return &types.MsgUnstake{}, err - } - - coins, err := dcli.ParseCoins(parts[1], fmt.Sprintf("coins[%d]", i)) - if err != nil { - return &types.MsgUnstake{}, err - } - - unstakes = append(unstakes, types.NewMsgUnstakeDescriptor(poolID, coins)) - } - - return types.NewMsgUnstake(clientCtx.GetFromAddress(), unstakes), nil -} - -func NewUnstakeCmd() (*dcli.TxCliDesc, *types.MsgUnstake) { - return &dcli.TxCliDesc{ - Use: "unstake-tokens [poolID]:[coins] [poolID]:[coins] ...", - Short: "Unstake tokens", - ParseAndBuildMsg: UnstakeCmdBuilder, - Long: `{{.Short}}{{.ExampleHeader}} unstake-tokens 1:100TokenA 2:10TokenZ,20TokenB`, - }, &types.MsgUnstake{} -} diff --git a/x/incentives/keeper/account_history.go b/x/incentives/keeper/account_history.go deleted file mode 100644 index 27d787b2b..000000000 --- a/x/incentives/keeper/account_history.go +++ /dev/null @@ -1,83 +0,0 @@ -package keeper - -import ( - "github.com/cosmos/cosmos-sdk/store/prefix" - sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/gogoproto/proto" - "github.com/neutron-org/neutron/x/incentives/types" -) - -func NewAccountHistory(account string, coins sdk.Coins) *types.AccountHistory { - return &types.AccountHistory{ - Account: account, - Coins: coins, - } -} - -// SetAccountHistory set a specific goodTilRecord in the store from its index -func (k Keeper) SetAccountHistory( - ctx sdk.Context, - accountHistory *types.AccountHistory, -) error { - store := ctx.KVStore(k.storeKey) - b, err := proto.Marshal(accountHistory) - if err != nil { - return err - } - store.Set(types.GetKeyAccountHistory( - accountHistory.Account, - ), b) - return nil -} - -// GetAccountHistory returns a goodTilRecord from its index -func (k Keeper) GetAccountHistory( - ctx sdk.Context, - account string, -) (val *types.AccountHistory, found bool) { - store := ctx.KVStore(k.storeKey) - - b := store.Get(types.GetKeyAccountHistory(account)) - if b == nil { - return val, false - } - - val = &types.AccountHistory{} - err := proto.Unmarshal(b, val) - if err != nil { - panic(err) - } - - return val, true -} - -// RemoveAccountHistory removes a goodTilRecord from the store -func (k Keeper) RemoveAccountHistory( - ctx sdk.Context, - account string, -) { - store := ctx.KVStore(k.storeKey) - store.Delete(types.GetKeyAccountHistory(account)) -} - -// GetAllAccountHistory returns all goodTilRecord -func (k Keeper) GetAllAccountHistory(ctx sdk.Context) (list []*types.AccountHistory) { - store := prefix.NewStore( - ctx.KVStore(k.storeKey), - types.KeyPrefixAccountHistory, - ) - iterator := sdk.KVStorePrefixIterator(store, []byte{}) - - defer iterator.Close() - - for ; iterator.Valid(); iterator.Next() { - val := &types.AccountHistory{} - err := proto.Unmarshal(iterator.Value(), val) - if err != nil { - panic(err) - } - list = append(list, val) - } - - return -} diff --git a/x/incentives/keeper/distribute.go b/x/incentives/keeper/distribute.go deleted file mode 100644 index 9ea79d702..000000000 --- a/x/incentives/keeper/distribute.go +++ /dev/null @@ -1,186 +0,0 @@ -package keeper - -import ( - "fmt" - "time" - - "cosmossdk.io/math" - sdk "github.com/cosmos/cosmos-sdk/types" - math_utils "github.com/neutron-org/neutron/utils/math" - dextypes "github.com/neutron-org/neutron/x/dex/types" - "github.com/neutron-org/neutron/x/incentives/types" -) - -var _ DistributorKeeper = Keeper{} - -func (k Keeper) ValueForShares(ctx sdk.Context, coin sdk.Coin, tick int64) (math.Int, error) { - totalShares := k.bk.GetSupply(ctx, coin.Denom).Amount - poolMetadata, err := k.dk.GetPoolMetadataByDenom(ctx, coin.Denom) - if err != nil { - return math.ZeroInt(), err - } - - pool, err := k.dk.GetOrInitPool( - ctx, - poolMetadata.PairID, - poolMetadata.Tick, - poolMetadata.Fee, - ) - if err != nil { - return math.ZeroInt(), err - } - amount0, amount1 := pool.RedeemValue(coin.Amount, totalShares) - price1To0Center, err := dextypes.CalcPrice(-1 * tick) - if err != nil { - return math.ZeroInt(), err - } - return math_utils.NewPrecDecFromInt(amount0).Add(price1To0Center.MulInt(amount1)).TruncateInt(), nil -} - -// Distribute distributes coins from an array of gauges to all eligible stakes. -func (k Keeper) Distribute(ctx sdk.Context, gauges types.Gauges) (types.DistributionSpec, error) { - distSpec := types.DistributionSpec{} - for _, gauge := range gauges { - gaugeDistSpec, err := k.distributor.Distribute(ctx, gauge, nil) - if err != nil { - return nil, err - } - distSpec = distSpec.Add(gaugeDistSpec) - - err = k.setGauge(ctx, gauge) - if err != nil { - return nil, err - } - if gauge.IsFinishedGauge(ctx.BlockTime()) { - if err := k.moveActiveGaugeToFinishedGauge(ctx, gauge); err != nil { - return nil, err - } - } - } - - ctx.Logger().Debug(fmt.Sprintf("Beginning distribution to %d users", len(distSpec))) - for addr, rewards := range distSpec { - decodedAddr, err := sdk.AccAddressFromBech32(addr) - if err != nil { - return nil, err - } - err = k.bk.SendCoinsFromModuleToAccount( - ctx, - types.ModuleName, - decodedAddr, - rewards) - if err != nil { - return nil, err - } - - // Accumulate to account history - accHistory, found := k.GetAccountHistory(ctx, addr) - if found { - accHistory.Coins = accHistory.Coins.Add(rewards...) - } else { - accHistory = NewAccountHistory(addr, rewards) - } - if err := k.SetAccountHistory(ctx, accHistory); err != nil { - return nil, err - } - - // Emit events - ctx.EventManager().EmitEvents(sdk.Events{ - sdk.NewEvent( - types.TypeEvtDistribution, - sdk.NewAttribute(types.AttributeReceiver, addr), - sdk.NewAttribute(types.AttributeAmount, rewards.String()), - ), - }) - } - ctx.Logger().Debug(fmt.Sprintf("Finished Distributing to %d users", len(distSpec))) - k.hooks.AfterEpochDistribution(ctx) - return distSpec, nil -} - -// GetModuleCoinsToBeDistributed returns sum of coins yet to be distributed for all of the module. -func (k Keeper) GetModuleCoinsToBeDistributed(ctx sdk.Context) sdk.Coins { - activeGaugesDistr := k.GetActiveGauges(ctx).GetCoinsRemaining() - upcomingGaugesDistr := k.GetUpcomingGauges(ctx).GetCoinsRemaining() - return activeGaugesDistr.Add(upcomingGaugesDistr...) -} - -// GetModuleDistributedCoins returns sum of coins that have been distributed so far for all of the module. -func (k Keeper) GetModuleDistributedCoins(ctx sdk.Context) sdk.Coins { - activeGaugesDistr := k.GetActiveGauges(ctx).GetCoinsDistributed() - finishedGaugesDistr := k.GetFinishedGauges(ctx).GetCoinsDistributed() - return activeGaugesDistr.Add(finishedGaugesDistr...) -} - -// GetRewardsEstimate returns rewards estimation at a future specific time (by epoch) -// If stakes are nil, it returns the rewards between now and the end epoch associated with address. -// If stakes are not nil, it returns all the rewards for the given stakes between now and end epoch. -func (k Keeper) GetRewardsEstimate( - ctx sdk.Context, - addr sdk.AccAddress, - filterStakes types.Stakes, - numEpochs int64, -) (sdk.Coins, error) { - // if stakes are nil, populate with all stakes associated with the address - if len(filterStakes) == 0 { - filterStakes = k.GetStakesByAccount(ctx, addr) - } - - // for each specified stake get associated pairs - pairSet := map[dextypes.PairID]bool{} - for _, l := range filterStakes { - for _, c := range l.Coins { - poolMetadata, err := k.dk.GetPoolMetadataByDenom(ctx, c.Denom) - if err != nil { - panic("all stakes should be valid deposit denoms") - } - pairSet[*poolMetadata.PairID] = true - } - } - - // for each pair get associated gauges - gauges := types.Gauges{} - for s := range pairSet { - gauges = append(gauges, k.GetGaugesByPair(ctx, &s)...) - } - - // estimate rewards - estimatedRewards := sdk.Coins{} - epochInfo := k.GetEpochInfo(ctx) - - // ensure we don't change storage while doing estimation - cacheCtx, _ := ctx.CacheContext() - for _, gauge := range gauges { - distrBeginEpoch := epochInfo.CurrentEpoch - endEpoch := epochInfo.CurrentEpoch + numEpochs - bstakeTime := ctx.BlockTime() - if gauge.StartTime.After(bstakeTime) { - distrBeginEpoch = epochInfo.CurrentEpoch + 1 + int64( - gauge.StartTime.Sub(bstakeTime)/epochInfo.Duration, - ) - } - - // TODO: Make more efficient by making it possible to call distribute with this - // gaugeStakes := k.GetStakesByQueryCondition(cacheCtx, &gauge.DistributeTo) - gaugeRewards := sdk.Coins{} - for epoch := distrBeginEpoch; epoch <= endEpoch; epoch++ { - epochTime := epochInfo.StartTime.Add( - time.Duration(epoch-epochInfo.CurrentEpoch) * epochInfo.Duration, - ) - if !gauge.IsActiveGauge(epochTime) { - break - } - - futureCtx := cacheCtx.WithBlockTime(epochTime) - distSpec, err := k.distributor.Distribute(futureCtx, gauge, filterStakes) - if err != nil { - return nil, err - } - - gaugeRewards = gaugeRewards.Add(distSpec.GetTotal()...) - } - estimatedRewards = estimatedRewards.Add(gaugeRewards...) - } - - return estimatedRewards, nil -} diff --git a/x/incentives/keeper/distribute_test.go b/x/incentives/keeper/distribute_test.go deleted file mode 100644 index 656ed771d..000000000 --- a/x/incentives/keeper/distribute_test.go +++ /dev/null @@ -1,363 +0,0 @@ -package keeper_test - -import ( - "testing" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - "github.com/stretchr/testify/suite" - - "cosmossdk.io/math" - sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/testutil/apptesting" - dextypes "github.com/neutron-org/neutron/x/dex/types" - "github.com/neutron-org/neutron/x/incentives/types" -) - -var _ = suite.TestingSuite(nil) - -type balanceAssertion struct { - addr sdk.AccAddress - balances sdk.Coins -} - -func (suite *IncentivesTestSuite) TestValueForShares() { - addrs := apptesting.SetupAddrs(3) - - tests := []struct { - name string - deposits []depositSpec - coin sdk.Coin - tick int64 - expectation math.Int - err error - }{ - // gauge 1 gives 3k coins. three stakes, all eligible. 1k coins per stake. - // 1k should go to oneStakeUser and 2k to twoStakeUser. - { - name: "one deposit", - deposits: []depositSpec{ - { - addr: addrs[0], - token0: sdk.NewInt64Coin("TokenA", 1000), - token1: sdk.NewInt64Coin("TokenB", 1000), - tick: 0, - fee: 1, - }, - }, - coin: sdk.NewInt64Coin(dextypes.NewPoolDenom(0), 20), - tick: 1000, - expectation: math.NewInt(21), - }, - { - name: "one deposit: no adjustment", - deposits: []depositSpec{ - { - addr: addrs[0], - token0: sdk.NewInt64Coin("TokenA", 1000), - token1: sdk.NewInt64Coin("TokenB", 1000), - tick: 0, - fee: 1, - }, - }, - coin: sdk.NewInt64Coin(dextypes.NewPoolDenom(0), 20), - tick: 0, - expectation: math.NewInt(20), - }, - { - name: "two deposits: one extraneous", - deposits: []depositSpec{ - { - addr: addrs[0], - token0: sdk.NewInt64Coin("TokenA", 1000), - token1: sdk.NewInt64Coin("TokenB", 1000), - tick: 0, - fee: 1, - }, - { - addr: addrs[0], - token0: sdk.NewInt64Coin("TokenA", 1000), - token1: sdk.NewInt64Coin("TokenB", 1000), - tick: 0, - fee: 2, - }, - }, - coin: sdk.NewInt64Coin(dextypes.NewPoolDenom(0), 20), - tick: 1000, - expectation: math.NewInt(21), - }, - { - name: "two deposits: both relevant", - deposits: []depositSpec{ - { - addr: addrs[0], - token0: sdk.NewInt64Coin("TokenA", 1000), - token1: sdk.NewInt64Coin("TokenB", 1000), - tick: 0, - fee: 1, - }, - { - addr: addrs[0], - token0: sdk.NewInt64Coin("TokenA", 1000), - token1: sdk.NewInt64Coin("TokenB", 1000), - tick: 0, - fee: 1, - }, - }, - coin: sdk.NewInt64Coin(dextypes.NewPoolDenom(0), 20), - tick: 1000, - expectation: math.NewInt(21), - }, - } - for _, tc := range tests { - suite.T().Run(tc.name, func(t *testing.T) { - suite.SetupTest() - _ = suite.SetupDeposit(tc.deposits) - value, err := suite.App.IncentivesKeeper.ValueForShares(suite.Ctx, tc.coin, tc.tick) - if tc.err == nil { - require.NoError(t, err) - require.Equal(t, tc.expectation, value) - } else { - require.Error(t, err) - } - }) - } -} - -// TestDistribute tests that when the distribute command is executed on a provided gauge -// that the correct amount of rewards is sent to the correct stake owners. -func (suite *IncentivesTestSuite) TestDistribute() { - addrs := apptesting.SetupAddrs(3) - tests := []struct { - name string - addrs []sdk.AccAddress - depositStakeSpecs []depositStakeSpec - gaugeSpecs []gaugeSpec - assertions []balanceAssertion - }{ - { - name: "one gauge", - depositStakeSpecs: []depositStakeSpec{ - { - depositSpecs: []depositSpec{ - { - addr: addrs[0], - token0: sdk.NewInt64Coin("TokenA", 1000), - token1: sdk.NewInt64Coin("TokenB", 1000), - tick: 0, - fee: 1, - }, - }, - stakeDistEpochOffset: -2, - }, - { - depositSpecs: []depositSpec{ - { - addr: addrs[1], - token0: sdk.NewInt64Coin("TokenA", 1000), - token1: sdk.NewInt64Coin("TokenB", 1000), - tick: 0, - fee: 1, - }, - }, - stakeDistEpochOffset: -2, - }, - { - depositSpecs: []depositSpec{ - { - addr: addrs[1], - token0: sdk.NewInt64Coin("TokenA", 1000), - token1: sdk.NewInt64Coin("TokenB", 1000), - tick: 0, - fee: 1, - }, - }, - stakeDistEpochOffset: -2, - }, - }, - gaugeSpecs: []gaugeSpec{ - { - isPerpetual: false, - rewards: sdk.Coins{sdk.NewInt64Coin("reward", 3000)}, - startTick: -10, - endTick: 10, - paidOver: 1, - pricingTick: 0, - }, - }, - assertions: []balanceAssertion{ - {addr: addrs[0], balances: sdk.Coins{sdk.NewInt64Coin("reward", 1000)}}, - {addr: addrs[1], balances: sdk.Coins{sdk.NewInt64Coin("reward", 2000)}}, - }, - }, - { - name: "two gauges", - depositStakeSpecs: []depositStakeSpec{ - { - depositSpecs: []depositSpec{ - { - addr: addrs[0], - token0: sdk.NewInt64Coin("TokenA", 1000), - token1: sdk.NewInt64Coin("TokenB", 1000), - tick: 0, - fee: 1, - }, - }, - stakeDistEpochOffset: -2, - }, - { - depositSpecs: []depositSpec{ - { - addr: addrs[1], - token0: sdk.NewInt64Coin("TokenA", 1000), - token1: sdk.NewInt64Coin("TokenB", 1000), - tick: 0, - fee: 1, - }, - }, - stakeDistEpochOffset: -2, - }, - { - depositSpecs: []depositSpec{ - { - addr: addrs[1], - token0: sdk.NewInt64Coin("TokenA", 1000), - token1: sdk.NewInt64Coin("TokenB", 1000), - tick: 0, - fee: 1, - }, - }, - stakeDistEpochOffset: -2, - }, - { - depositSpecs: []depositSpec{ - { - addr: addrs[0], - token0: sdk.NewInt64Coin("TokenA", 1000), - token1: sdk.NewInt64Coin("TokenB", 1000), - tick: 0, - fee: 1, - }, - }, - stakeDistEpochOffset: -1, - }, - }, - gaugeSpecs: []gaugeSpec{ - { - isPerpetual: false, - rewards: sdk.Coins{sdk.NewInt64Coin("reward", 3000)}, - startTick: -10, - endTick: 10, - paidOver: 1, - pricingTick: 0, - }, - { - isPerpetual: false, - rewards: sdk.Coins{sdk.NewInt64Coin("reward", 3000)}, - startTick: -10, - endTick: 10, - paidOver: 2, - pricingTick: 0, - }, - }, - assertions: []balanceAssertion{ - {addr: addrs[0], balances: sdk.Coins{sdk.NewInt64Coin("reward", 1500)}}, - {addr: addrs[1], balances: sdk.Coins{sdk.NewInt64Coin("reward", 3000)}}, - }, - }, - { - name: "one stake with adjustment", - depositStakeSpecs: []depositStakeSpec{ - { - depositSpecs: []depositSpec{ - { - addr: addrs[0], - token0: sdk.NewInt64Coin("TokenA", 1000), - token1: sdk.NewInt64Coin("TokenB", 1000), - tick: 999, - fee: 1, - }, - }, - stakeDistEpochOffset: -2, - }, - { - depositSpecs: []depositSpec{ - { - addr: addrs[1], - token0: sdk.NewInt64Coin("TokenA", 1000), - token1: sdk.NewInt64Coin("TokenB", 1000), - tick: 999, - fee: 1, - }, - }, - stakeDistEpochOffset: -2, - }, - { - depositSpecs: []depositSpec{ - { - addr: addrs[1], - token0: sdk.NewInt64Coin("TokenA", 1000), - token1: sdk.NewInt64Coin("TokenB", 1000), - tick: 999, - fee: 50, - }, - }, - stakeDistEpochOffset: -2, - }, - { - depositSpecs: []depositSpec{ - { - addr: addrs[1], - token0: sdk.NewInt64Coin("TokenA", 1000), - token1: sdk.NewInt64Coin("TokenB", 1000), - tick: 999, - fee: 50, - }, - }, - stakeDistEpochOffset: -1, - }, - }, - gaugeSpecs: []gaugeSpec{ - { - isPerpetual: false, - rewards: sdk.Coins{sdk.NewInt64Coin("reward", 3000)}, - startTick: -1000, - endTick: 1000, - paidOver: 1, - pricingTick: 0, - }, - }, - assertions: []balanceAssertion{ - {addr: addrs[0], balances: sdk.Coins{sdk.NewInt64Coin("reward", 1500)}}, - {addr: addrs[1], balances: sdk.Coins{sdk.NewInt64Coin("reward", 1500)}}, - }, - }, - } - for _, tc := range tests { - suite.T().Run(tc.name, func(t *testing.T) { - suite.SetupTest() - for _, depositSpec := range tc.depositStakeSpecs { - suite.SetupDepositAndStake(depositSpec) - } - gauges := make(types.Gauges, len(tc.gaugeSpecs)) - for i, gaugeSpec := range tc.gaugeSpecs { - gauge := suite.SetupGauge(gaugeSpec) - gauges[i] = gauge - } - _, err := suite.App.IncentivesKeeper.Distribute(suite.Ctx, gauges) - require.NoError(t, err) - // check expected rewards against actual rewards received - for i, assertion := range tc.assertions { - bal := suite.App.BankKeeper.GetAllBalances(suite.Ctx, assertion.addr) - assert.Equal( - t, - assertion.balances.String(), - bal.String(), - "test %v, person %d", - tc.name, - i, - ) - } - }) - } -} diff --git a/x/incentives/keeper/distributor.go b/x/incentives/keeper/distributor.go deleted file mode 100644 index 46197d28d..000000000 --- a/x/incentives/keeper/distributor.go +++ /dev/null @@ -1,92 +0,0 @@ -package keeper - -import ( - "cosmossdk.io/math" - sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/x/incentives/types" -) - -type DistributorKeeper interface { - ValueForShares(ctx sdk.Context, coin sdk.Coin, tick int64) (math.Int, error) - GetStakesByQueryCondition(ctx sdk.Context, distrTo *types.QueryCondition) types.Stakes - StakeCoinsPassingQueryCondition(ctx sdk.Context, stake *types.Stake, distrTo types.QueryCondition) sdk.Coins -} - -type Distributor struct { - keeper DistributorKeeper -} - -func NewDistributor(keeper DistributorKeeper) Distributor { - return Distributor{ - keeper: keeper, - } -} - -func (d Distributor) Distribute( - ctx sdk.Context, - gauge *types.Gauge, - filterStakes types.Stakes, -) (types.DistributionSpec, error) { - if !gauge.IsActiveGauge(ctx.BlockTime()) { - return nil, types.ErrGaugeNotActive - } - - distSpec := types.DistributionSpec{} - - rewardsNextEpoch := gauge.RewardsNextEpoch() - - adjustedGaugeTotal := math.ZeroInt() - - gaugeStakes := d.keeper.GetStakesByQueryCondition(ctx, &gauge.DistributeTo) - if filterStakes == nil { - filterStakes = gaugeStakes - } - - stakeSumCache := make(map[uint64]math.Int, len(gaugeStakes)) - for _, stake := range gaugeStakes { - stakeCoins := d.keeper.StakeCoinsPassingQueryCondition(ctx, stake, gauge.DistributeTo) - stakeTotal := math.ZeroInt() - for _, stakeCoin := range stakeCoins { - adjustedPositionValue, err := d.keeper.ValueForShares(ctx, stakeCoin, gauge.PricingTick) - if err != nil { - return nil, err - } - stakeTotal = stakeTotal.Add(adjustedPositionValue) - } - adjustedGaugeTotal = adjustedGaugeTotal.Add(stakeTotal) - stakeSumCache[stake.ID] = stakeTotal - } - - if adjustedGaugeTotal.IsZero() { - return distSpec, nil - } - - for _, stake := range filterStakes { - stakeAmt := stakeSumCache[stake.ID] - distCoins := sdk.Coins{} - for _, epochRewards := range rewardsNextEpoch { - // distribution amount = gauge_size * denom_stake_amount / (total_denom_stake_amount * remain_epochs) - amount := sdk.NewDecFromInt(epochRewards.Amount). - Mul(sdk.NewDecFromInt(stakeAmt)). - Quo(sdk.NewDecFromInt(adjustedGaugeTotal)). - TruncateInt() - reward := sdk.Coin{Denom: epochRewards.Denom, Amount: amount} - distCoins = distCoins.Add(reward) - } - - // update the amount for that address - if distCoins.Empty() { - continue - } - - if spec, ok := distSpec[stake.Owner]; ok { - distSpec[stake.Owner] = spec.Add(distCoins...) - } else { - distSpec[stake.Owner] = distCoins - } - } - - gauge.DistributedCoins = gauge.DistributedCoins.Add(rewardsNextEpoch...) - gauge.FilledEpochs++ - return distSpec, nil -} diff --git a/x/incentives/keeper/distributor_test.go b/x/incentives/keeper/distributor_test.go deleted file mode 100644 index a9989c065..000000000 --- a/x/incentives/keeper/distributor_test.go +++ /dev/null @@ -1,144 +0,0 @@ -package keeper_test - -import ( - "testing" - time "time" - - "cosmossdk.io/math" - tmtypes "github.com/cometbft/cometbft/proto/tendermint/types" - sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/testutil" - dextypes "github.com/neutron-org/neutron/x/dex/types" - . "github.com/neutron-org/neutron/x/incentives/keeper" - "github.com/neutron-org/neutron/x/incentives/types" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" -) - -var _ DistributorKeeper = MockKeeper{} - -type MockKeeper struct { - stakes types.Stakes - keeper DistributorKeeper -} - -func NewMockKeeper(keeper DistributorKeeper, stakes types.Stakes) MockKeeper { - return MockKeeper{ - stakes: stakes, - keeper: keeper, - } -} - -func (k MockKeeper) ValueForShares(_ sdk.Context, coin sdk.Coin, _ int64) (math.Int, error) { - return coin.Amount.Mul(math.NewInt(2)), nil -} - -func (k MockKeeper) GetStakesByQueryCondition( - _ sdk.Context, - _ *types.QueryCondition, -) types.Stakes { - return k.stakes -} - -func (k MockKeeper) StakeCoinsPassingQueryCondition(ctx sdk.Context, stake *types.Stake, distrTo types.QueryCondition) sdk.Coins { - return k.keeper.StakeCoinsPassingQueryCondition(ctx, stake, distrTo) -} - -func TestDistributor(t *testing.T) { - app := testutil.Setup(t) - ctx := app.BaseApp.NewContext( - false, - tmtypes.Header{Height: 1, ChainID: "neutron-1", Time: time.Now().UTC()}, - ) - - gauge := types.NewGauge( - 1, - false, - types.QueryCondition{ - PairID: &dextypes.PairID{ - Token0: "TokenA", - Token1: "TokenB", - }, - StartTick: -10, - EndTick: 10, - }, - sdk.Coins{sdk.NewCoin("coin1", math.NewInt(100))}, - ctx.BlockTime(), - 10, - 0, - sdk.Coins{}, - 0, - ) - rewardPool, _ := app.DexKeeper.GetOrInitPool(ctx, &dextypes.PairID{Token0: "TokenA", Token1: "TokenB"}, 5, 1) - rewardedDenom := rewardPool.GetPoolDenom() - nonRewardPool, _ := app.DexKeeper.GetOrInitPool(ctx, &dextypes.PairID{Token0: "TokenA", Token1: "TokenB"}, 12, 1) - nonRewardedDenom := nonRewardPool.GetPoolDenom() - addr1 := sdk.AccAddress("addr1") - addr2 := sdk.AccAddress("addr2") - addr3 := sdk.AccAddress("addr3") - allStakes := types.Stakes{ - types.NewStake(1, addr1, sdk.Coins{sdk.NewCoin(rewardedDenom, math.NewInt(50))}, ctx.BlockTime(), 0), - types.NewStake(2, addr2, sdk.Coins{sdk.NewCoin(rewardedDenom, math.NewInt(25))}, ctx.BlockTime(), 0), - types.NewStake(3, addr2, sdk.Coins{sdk.NewCoin(rewardedDenom, math.NewInt(25))}, ctx.BlockTime(), 0), - types.NewStake(4, addr3, sdk.Coins{sdk.NewCoin(nonRewardedDenom, math.NewInt(50))}, ctx.BlockTime(), 0), - } - - distributor := NewDistributor(NewMockKeeper(app.IncentivesKeeper, allStakes)) - - testCases := []struct { - name string - timeOffset time.Duration - filterStakes types.Stakes - expected types.DistributionSpec - expectedErr error - }{ - { - name: "Error case: gauge not active", - timeOffset: -1 * time.Minute, - filterStakes: allStakes, - expected: nil, - expectedErr: types.ErrGaugeNotActive, - }, - { - name: "Successful case: distribute to all stakes", - timeOffset: 0, - filterStakes: allStakes, - expected: types.DistributionSpec{ - addr1.String(): sdk.Coins{sdk.NewCoin("coin1", math.NewInt(5))}, - addr2.String(): sdk.Coins{sdk.NewCoin("coin1", math.NewInt(4))}, - }, - expectedErr: nil, - }, - { - name: "Successful case: distribute to one stake", - timeOffset: 0, - filterStakes: types.Stakes{allStakes[0]}, - expected: types.DistributionSpec{ - addr1.String(): sdk.Coins{sdk.NewCoin("coin1", math.NewInt(5))}, - }, - expectedErr: nil, - }, - { - name: "No distribution: empty filterStakes", - filterStakes: types.Stakes{}, - expected: types.DistributionSpec{}, - expectedErr: nil, - }, - } - - for _, tc := range testCases { - t.Run(tc.name, func(t *testing.T) { - distSpec, err := distributor.Distribute( - ctx.WithBlockTime(ctx.BlockTime().Add(tc.timeOffset)), - &gauge, - tc.filterStakes, - ) - if tc.expectedErr != nil { - assert.Equal(t, tc.expectedErr, err) - } else { - require.NoError(t, err) - } - assert.Equal(t, tc.expected, distSpec) - }) - } -} diff --git a/x/incentives/keeper/export_test.go b/x/incentives/keeper/export_test.go deleted file mode 100644 index 71baec5fe..000000000 --- a/x/incentives/keeper/export_test.go +++ /dev/null @@ -1,44 +0,0 @@ -package keeper - -import ( - sdk "github.com/cosmos/cosmos-sdk/types" - - "github.com/neutron-org/neutron/x/incentives/types" -) - -// AddGaugeRefByKey appends the provided gauge ID into an array associated with the provided key. -func (k Keeper) AddRefByKey(ctx sdk.Context, key []byte, gaugeID uint64) error { - return k.addRefByKey(ctx, key, gaugeID) -} - -// DeleteGaugeRefByKey removes the provided gauge ID from an array associated with the provided key. -func (k Keeper) DeleteRefByKey(ctx sdk.Context, key []byte, guageID uint64) error { - return k.deleteRefByKey(ctx, key, guageID) -} - -// GetGaugeRefs returns the gauge IDs specified by the provided key. -func (k Keeper) GetRefs(ctx sdk.Context, key []byte) []uint64 { - return k.getRefs(ctx, key) -} - -// MoveUpcomingGaugeToActiveGauge moves a gauge that has reached it's start time from an upcoming to an active status. -func (k Keeper) MoveUpcomingGaugeToActiveGauge(ctx sdk.Context, gauge *types.Gauge) error { - return k.moveUpcomingGaugeToActiveGauge(ctx, gauge) -} - -// MoveActiveGaugeToFinishedGauge moves a gauge that has completed its distribution from an active to a finished status. -func (k Keeper) MoveActiveGaugeToFinishedGauge(ctx sdk.Context, gauge *types.Gauge) error { - return k.moveActiveGaugeToFinishedGauge(ctx, gauge) -} - -func (k Keeper) GetStakeRefKeys(ctx sdk.Context, stake *types.Stake) ([][]byte, error) { - return k.getStakeRefKeys(ctx, stake) -} - -func RemoveValue(ids []uint64, id uint64) ([]uint64, int) { - return removeValue(ids, id) -} - -func FindIndex(ids []uint64, id uint64) int { - return findIndex(ids, id) -} diff --git a/x/incentives/keeper/gas_test.go b/x/incentives/keeper/gas_test.go deleted file mode 100644 index c52c2abcf..000000000 --- a/x/incentives/keeper/gas_test.go +++ /dev/null @@ -1,77 +0,0 @@ -package keeper_test - -// import ( -// sdk "github.com/cosmos/cosmos-sdk/types" -// ) - -// var ( -// defaultAddr sdk.AccAddress = sdk.AccAddress([]byte("addr1---------------")) -// defaultCoins sdk.Coins = sdk.Coins{sdk.NewInt64Coin("stake", 10)} -// ) - -// func (suite *KeeperTestSuite) measureStakeGas(addr sdk.AccAddress, coins sdk.Coins, dur time.Duration) uint64 { -// // fundAccount outside of gas measurement -// suite.FundAcc(addr, coins) -// // start measuring gas -// alreadySpent := suite.Ctx.GasMeter().GasConsumed() -// _, err := suite.App.IncentivesKeeper.CreateStake(suite.Ctx, addr, coins, dur) -// suite.Require().NoError(err) -// newSpent := suite.Ctx.GasMeter().GasConsumed() -// spentNow := newSpent - alreadySpent -// return spentNow -// } - -// func (suite *KeeperTestSuite) measureAvgAndMaxStakeGas( -// numIterations int, -// addr sdk.AccAddress, -// coinsFn func(int) sdk.Coins, -// durFn func(int) time.Duration, -// ) (avg uint64, maxGas uint64) { -// runningTotal := uint64(0) -// maxGas = uint64(0) -// for i := 1; i <= numIterations; i++ { -// stakeGas := suite.measureStakeGas(addr, coinsFn(i), durFn(i)) -// runningTotal += stakeGas -// if stakeGas > maxGas { -// maxGas = stakeGas -// // fmt.Println(suite.Ctx.GasMeter().String()) -// } -// } -// avg = runningTotal / uint64(numIterations) -// return avg, maxGas -// } - -// // This maintains hard coded gas test vector changes, -// // so we can easily track changes -// func (suite *KeeperTestSuite) TestRepeatedStakeTokensGas() { -// suite.SetupTest() - -// coinsFn := func(int) sdk.Coins { return defaultCoins } -// durFn := func(int) time.Duration { return time.Second } -// startAveragingAt := 1000 -// totalNumStakes := 10000 - -// firstStakeGasAmount := suite.measureStakeGas(defaultAddr, defaultCoins, time.Second) -// suite.Assert().LessOrEqual(int(firstStakeGasAmount), 100000) - -// for i := 1; i < startAveragingAt; i++ { -// suite.SetupStake(defaultAddr, defaultCoins) -// } -// avgGas, maxGas := suite.measureAvgAndMaxStakeGas(totalNumStakes-startAveragingAt, defaultAddr, coinsFn, durFn) -// fmt.Printf("test deets: total stakes created %d, begin average at %d\n", totalNumStakes, startAveragingAt) -// suite.Assert().LessOrEqual(int(avgGas), 100000, "average gas / stake") -// suite.Assert().LessOrEqual(int(maxGas), 100000, "max gas / stake") -// } - -// func (suite *KeeperTestSuite) TestRepeatedStakeTokensDistinctDurationGas() { -// suite.SetupTest() - -// coinsFn := func(int) sdk.Coins { return defaultCoins } -// durFn := func(i int) time.Duration { return time.Duration(i+1) * time.Second } -// totalNumStakes := 10000 - -// avgGas, maxGas := suite.measureAvgAndMaxStakeGas(totalNumStakes, defaultAddr, coinsFn, durFn) -// fmt.Printf("test deets: total stakes created %d\n", totalNumStakes) -// suite.Assert().LessOrEqual(int(avgGas), 150000, "average gas / stake") -// suite.Assert().LessOrEqual(int(maxGas), 300000, "max gas / stake") -// } diff --git a/x/incentives/keeper/gauge.go b/x/incentives/keeper/gauge.go deleted file mode 100644 index 180b3d101..000000000 --- a/x/incentives/keeper/gauge.go +++ /dev/null @@ -1,309 +0,0 @@ -package keeper - -import ( - "encoding/json" - "errors" - "fmt" - "time" - - db "github.com/cometbft/cometbft-db" - "github.com/cosmos/gogoproto/proto" - - dextypes "github.com/neutron-org/neutron/x/dex/types" - epochtypes "github.com/neutron-org/neutron/x/epochs/types" - "github.com/neutron-org/neutron/x/incentives/types" - - sdk "github.com/cosmos/cosmos-sdk/types" -) - -// GetLastGaugeID returns the last used gauge ID. -func (k Keeper) GetLastGaugeID(ctx sdk.Context) uint64 { - store := ctx.KVStore(k.storeKey) - - bz := store.Get(types.KeyLastGaugeID) - if bz == nil { - return 0 - } - - return sdk.BigEndianToUint64(bz) -} - -// SetLastGaugeID sets the last used gauge ID to the provided ID. -func (k Keeper) SetLastGaugeID(ctx sdk.Context, id uint64) { - store := ctx.KVStore(k.storeKey) - store.Set(types.KeyLastGaugeID, sdk.Uint64ToBigEndian(id)) -} - -// getGaugesFromIterator iterates over everything in a gauge's iterator, until it reaches the end. Return all gauges iterated over. -func (k Keeper) getGaugesFromIterator(ctx sdk.Context, iterator db.Iterator) types.Gauges { - gauges := []*types.Gauge{} - defer iterator.Close() - for ; iterator.Valid(); iterator.Next() { - gaugeIDs := []uint64{} - err := json.Unmarshal(iterator.Value(), &gaugeIDs) - if err != nil { - panic(err) - } - for _, gaugeID := range gaugeIDs { - gauge, err := k.GetGaugeByID(ctx, gaugeID) - if err != nil { - panic(err) - } - gauges = append(gauges, gauge) - } - } - return gauges -} - -func (k Keeper) setGaugeRefs(ctx sdk.Context, gauge *types.Gauge) error { - switch { - case gauge.IsUpcomingGauge(ctx.BlockTime()): - if err := k.addRefByKey(ctx, types.CombineKeys(types.KeyPrefixGaugeIndexUpcoming, types.GetTimeKey(gauge.StartTime)), gauge.Id); err != nil { - return err - } - err := k.addRefByKey( - ctx, - types.GetKeyGaugeIndexByPair(gauge.DistributeTo.PairID.CanonicalString()), - gauge.Id, - ) - if err != nil { - return err - } - case gauge.IsActiveGauge(ctx.BlockTime()): - err := k.addRefByKey(ctx, types.CombineKeys(types.KeyPrefixGaugeIndexActive, types.GetTimeKey(gauge.StartTime)), gauge.Id) - if err != nil { - return err - } - err = k.addRefByKey(ctx, types.GetKeyGaugeIndexByPair(gauge.DistributeTo.PairID.CanonicalString()), gauge.Id) - if err != nil { - return err - } - default: // finished gauge - err := k.addRefByKey(ctx, types.CombineKeys(types.KeyPrefixGaugeIndexFinished, types.GetTimeKey(gauge.StartTime)), gauge.Id) - if err != nil { - return err - } - } - return nil -} - -// setGauge set the gauge inside store. -func (k Keeper) setGauge(ctx sdk.Context, gauge *types.Gauge) error { - store := ctx.KVStore(k.storeKey) - bz, err := proto.Marshal(gauge) - if err != nil { - return err - } - store.Set(types.GetKeyGaugeStore(gauge.Id), bz) - return nil -} - -// CreateGauge creates a gauge and sends coins to the gauge. -func (k Keeper) CreateGauge( - ctx sdk.Context, - isPerpetual bool, - owner sdk.AccAddress, - coins sdk.Coins, - distrTo types.QueryCondition, - startTime time.Time, - numEpochsPaidOver uint64, - pricingTick int64, -) (*types.Gauge, error) { - numGauges := k.GetLastGaugeID(ctx) - params := k.GetParams(ctx) - if params.MaxGauges < numGauges+1 { - return nil, types.ErrMaxGaugesReached - } - - // Perhaps overly defensive checks, these validations are also being performed - // in the ValidateBasic() for CreateGaugeMsg. - if dextypes.IsTickOutOfRange(pricingTick) { - return nil, types.ErrGaugePricingTickOutOfRange - } - - if dextypes.IsTickOutOfRange(distrTo.StartTick) { - return nil, types.ErrGaugeDistrToTickOutOfRange - } - - if dextypes.IsTickOutOfRange(distrTo.EndTick) { - return nil, types.ErrGaugeDistrToTickOutOfRange - } - - gauge := &types.Gauge{ - Id: numGauges + 1, - IsPerpetual: isPerpetual, - DistributeTo: distrTo, - Coins: coins, - StartTime: startTime, - NumEpochsPaidOver: numEpochsPaidOver, - // If this is outside the tick range then the distribution step will fail - PricingTick: pricingTick, - } - - if err := k.bk.SendCoinsFromAccountToModule(ctx, owner, types.ModuleName, gauge.Coins); err != nil { - return nil, err - } - - err := k.setGauge(ctx, gauge) - if err != nil { - return nil, err - } - - k.SetLastGaugeID(ctx, gauge.Id) - - err = k.setGaugeRefs(ctx, gauge) - if err != nil { - return nil, err - } - - k.hooks.AfterCreateGauge(ctx, gauge.Id) - return gauge, nil -} - -// AddToGaugeRewards adds coins to gauge. -func (k Keeper) AddToGaugeRewards( - ctx sdk.Context, - owner sdk.AccAddress, - coins sdk.Coins, - gaugeID uint64, -) error { - gauge, err := k.GetGaugeByID(ctx, gaugeID) - if err != nil { - return err - } - if gauge.IsFinishedGauge(ctx.BlockTime()) { - return errors.New("gauge is already completed") - } - if err := k.bk.SendCoinsFromAccountToModule(ctx, owner, types.ModuleName, coins); err != nil { - return err - } - - gauge.Coins = gauge.Coins.Add(coins...) - err = k.setGauge(ctx, gauge) - if err != nil { - return err - } - k.hooks.AfterAddToGauge(ctx, gauge.Id) - return nil -} - -// GetGaugeByID returns gauge from gauge ID. -func (k Keeper) GetGaugeByID(ctx sdk.Context, gaugeID uint64) (*types.Gauge, error) { - gauge := types.Gauge{} - store := ctx.KVStore(k.storeKey) - gaugeKey := types.GetKeyGaugeStore(gaugeID) - if !store.Has(gaugeKey) { - return nil, fmt.Errorf("gauge with ID %d does not exist", gaugeID) - } - bz := store.Get(gaugeKey) - if err := proto.Unmarshal(bz, &gauge); err != nil { - return nil, err - } - return &gauge, nil -} - -// GetGaugeQualifyingValue returns gauge qualifying value from gauge ID. -func (k Keeper) GetGaugeQualifyingValue(ctx sdk.Context, gaugeID uint64) (uint64, error) { - gauge := types.Gauge{} - store := ctx.KVStore(k.storeKey) - gaugeKey := types.GetKeyGaugeStore(gaugeID) - if !store.Has(gaugeKey) { - return 0, fmt.Errorf("gauge with ID %d does not exist", gaugeID) - } - bz := store.Get(gaugeKey) - if err := proto.Unmarshal(bz, &gauge); err != nil { - return 0, err - } - var value uint64 - stakes := k.GetStakesByQueryCondition(ctx, &gauge.DistributeTo) - for _, stake := range stakes { - stakeCoins := k.StakeCoinsPassingQueryCondition(ctx, stake, gauge.DistributeTo) - for _, stakeCoin := range stakeCoins { - adjustedPositionValue, err := k.ValueForShares(ctx, stakeCoin, gauge.PricingTick) - if err != nil { - return 0, err - } - value += value + adjustedPositionValue.Uint64() - } - } - return value, nil -} - -// GetGauges returns upcoming, active, and finished gauges. -func (k Keeper) GetGauges(ctx sdk.Context) types.Gauges { - return k.getGaugesFromIterator(ctx, k.iterator(ctx, types.KeyPrefixGaugeIndex)) -} - -// GetNotFinishedGauges returns both upcoming and active gauges. -func (k Keeper) GetNotFinishedGauges(ctx sdk.Context) types.Gauges { - return append(k.GetActiveGauges(ctx), k.GetUpcomingGauges(ctx)...) -} - -// GetEpochInfo returns EpochInfo struct given context. -func (k Keeper) GetEpochInfo(ctx sdk.Context) epochtypes.EpochInfo { - params := k.GetParams(ctx) - return k.ek.GetEpochInfo(ctx, params.DistrEpochIdentifier) -} - -// moveUpcomingGaugeToActiveGauge moves a gauge that has reached it's start time from an upcoming to an active status. -func (k Keeper) moveUpcomingGaugeToActiveGauge(ctx sdk.Context, gauge *types.Gauge) error { - // validation for current time and distribution start time - if ctx.BlockTime().Before(gauge.StartTime) { - return fmt.Errorf( - "gauge is not able to start distribution yet: %s >= %s", - ctx.BlockTime().String(), - gauge.StartTime.String(), - ) - } - - timeKey := types.GetTimeKey(gauge.StartTime) - if err := k.deleteRefByKey(ctx, types.CombineKeys(types.KeyPrefixGaugeIndexUpcoming, timeKey), gauge.Id); err != nil { - return err - } - - err := k.addRefByKey(ctx, types.CombineKeys(types.KeyPrefixGaugeIndexActive, timeKey), gauge.Id) - return err -} - -// moveActiveGaugeToFinishedGauge moves a gauge that has completed its distribution from an active to a finished status. -func (k Keeper) moveActiveGaugeToFinishedGauge(ctx sdk.Context, gauge *types.Gauge) error { - timeKey := types.GetTimeKey(gauge.StartTime) - if err := k.deleteRefByKey(ctx, types.CombineKeys(types.KeyPrefixGaugeIndexActive, timeKey), gauge.Id); err != nil { - return err - } - if err := k.addRefByKey(ctx, types.CombineKeys(types.KeyPrefixGaugeIndexFinished, timeKey), gauge.Id); err != nil { - return err - } - err := k.deleteRefByKey( - ctx, - types.GetKeyGaugeIndexByPair(gauge.DistributeTo.PairID.CanonicalString()), - gauge.Id, - ) - if err != nil { - return err - } - k.hooks.AfterFinishDistribution(ctx, gauge.Id) - return nil -} - -// GetActiveGauges returns active gauges. -func (k Keeper) GetActiveGauges(ctx sdk.Context) types.Gauges { - return k.getGaugesFromIterator(ctx, k.iterator(ctx, types.KeyPrefixGaugeIndexActive)) -} - -// GetUpcomingGauges returns upcoming gauges. -func (k Keeper) GetUpcomingGauges(ctx sdk.Context) types.Gauges { - return k.getGaugesFromIterator(ctx, k.iterator(ctx, types.KeyPrefixGaugeIndexUpcoming)) -} - -// GetFinishedGauges returns finished gauges. -func (k Keeper) GetFinishedGauges(ctx sdk.Context) types.Gauges { - return k.getGaugesFromIterator(ctx, k.iterator(ctx, types.KeyPrefixGaugeIndexFinished)) -} - -func (k Keeper) GetGaugesByPair(ctx sdk.Context, pair *dextypes.PairID) []*types.Gauge { - return k.getGaugesFromIterator( - ctx, - k.iterator(ctx, types.GetKeyGaugeIndexByPair(pair.CanonicalString())), - ) -} diff --git a/x/incentives/keeper/gauge_test.go b/x/incentives/keeper/gauge_test.go deleted file mode 100644 index ac8ae4396..000000000 --- a/x/incentives/keeper/gauge_test.go +++ /dev/null @@ -1,285 +0,0 @@ -package keeper_test - -import ( - "testing" - "time" - - "github.com/neutron-org/neutron/testutil/apptesting" - dextypes "github.com/neutron-org/neutron/x/dex/types" - "github.com/neutron-org/neutron/x/incentives/types" - "github.com/stretchr/testify/require" - "github.com/stretchr/testify/suite" - - sdk "github.com/cosmos/cosmos-sdk/types" -) - -var _ = suite.TestingSuite(nil) - -func (suite *IncentivesTestSuite) TestGaugeLifecycle() { - addr0 := suite.SetupAddr(0) - - // setup dex deposit and stake of those shares - suite.SetupDepositAndStake(depositStakeSpec{ - depositSpecs: []depositSpec{ - { - addr: addr0, - token0: sdk.NewInt64Coin("TokenA", 1000), - token1: sdk.NewInt64Coin("TokenB", 1000), - tick: 0, - fee: 1, - }, - }, - stakeDistEpochOffset: -2, - }) - - // setup gauge starting 24 hours in the future - suite.SetupGauge(gaugeSpec{ - startTime: suite.Ctx.BlockTime().Add(24 * time.Hour), - isPerpetual: false, - rewards: sdk.NewCoins(sdk.NewInt64Coin("foocoin", 10)), - paidOver: 2, - startTick: -10, - endTick: 10, - pricingTick: 0, - }) - - // assert that the gauge is not in effect yet by triggering an epoch end before gauge start - err := suite.App.IncentivesKeeper.AfterEpochEnd(suite.Ctx, "day") - require.NoError(suite.T(), err) - // no distribution yet - require.Equal( - suite.T(), - "0foocoin", - suite.App.BankKeeper.GetBalance(suite.Ctx, addr0, "foocoin").String(), - ) - // assert that gauge state is well-managed - require.Equal(suite.T(), len(suite.QueryServer.GetUpcomingGauges(suite.Ctx)), 1) - require.Equal(suite.T(), len(suite.QueryServer.GetActiveGauges(suite.Ctx)), 0) - require.Equal(suite.T(), len(suite.QueryServer.GetFinishedGauges(suite.Ctx)), 0) - - // advance time to epoch at or after the gauge starts, triggering distribution - suite.Ctx = suite.Ctx.WithBlockTime(suite.Ctx.BlockTime().Add(24 * time.Hour)) - err = suite.App.IncentivesKeeper.AfterEpochEnd(suite.Ctx, "day") - require.NoError(suite.T(), err) - - // assert that the gauge distributed - require.Equal( - suite.T(), - "5foocoin", - suite.App.BankKeeper.GetBalance(suite.Ctx, addr0, "foocoin").String(), - ) - // assert that gauge state is well-managed - require.Equal(suite.T(), len(suite.QueryServer.GetUpcomingGauges(suite.Ctx)), 0) - require.Equal(suite.T(), len(suite.QueryServer.GetActiveGauges(suite.Ctx)), 1) - require.Equal(suite.T(), len(suite.QueryServer.GetFinishedGauges(suite.Ctx)), 0) - - // advance to next epoch - suite.Ctx = suite.Ctx.WithBlockTime(suite.Ctx.BlockTime().Add(24 * time.Hour)) - err = suite.App.IncentivesKeeper.AfterEpochEnd(suite.Ctx, "day") - require.NoError(suite.T(), err) - - // assert new distribution - require.Equal( - suite.T(), - "10foocoin", - suite.App.BankKeeper.GetBalance(suite.Ctx, addr0, "foocoin").String(), - ) - // assert that gauge state is well-managed - require.Equal(suite.T(), len(suite.QueryServer.GetUpcomingGauges(suite.Ctx)), 0) - require.Equal(suite.T(), len(suite.QueryServer.GetActiveGauges(suite.Ctx)), 0) - require.Equal(suite.T(), len(suite.QueryServer.GetFinishedGauges(suite.Ctx)), 1) - - // repeat advancing to next epoch until gauge should be finished - suite.Ctx = suite.Ctx.WithBlockTime(suite.Ctx.BlockTime().Add(24 * time.Hour)) - err = suite.App.IncentivesKeeper.AfterEpochEnd(suite.Ctx, "day") - require.NoError(suite.T(), err) - - // assert no additional distribution from finished gauge - require.Equal( - suite.T(), - "10foocoin", - suite.App.BankKeeper.GetBalance(suite.Ctx, addr0, "foocoin").String(), - ) - // assert that gauge state is well-managed - require.Equal(suite.T(), len(suite.QueryServer.GetUpcomingGauges(suite.Ctx)), 0) - require.Equal(suite.T(), len(suite.QueryServer.GetActiveGauges(suite.Ctx)), 0) - require.Equal(suite.T(), len(suite.QueryServer.GetFinishedGauges(suite.Ctx)), 1) - // fin. -} - -func (suite *IncentivesTestSuite) TestGaugeLimit() { - // We set the gauge limit to 20. On the 21st gauge, we should encounter an error. - params := suite.App.IncentivesKeeper.GetParams(suite.Ctx) - params.MaxGauges = 20 - err := suite.App.IncentivesKeeper.SetParams(suite.Ctx, params) - suite.Require().NoError(err) - - addr0 := suite.SetupAddr(0) - - // setup dex deposit and stake of those shares - suite.SetupDepositAndStake(depositStakeSpec{ - depositSpecs: []depositSpec{ - { - addr: addr0, - token0: sdk.NewInt64Coin("TokenA", 1000), - token1: sdk.NewInt64Coin("TokenB", 1000), - tick: 0, - fee: 1, - }, - }, - stakeDistEpochOffset: -2, - }) - - for i := 0; i < 20; i++ { - // setup gauge starting 24 hours in the future - suite.SetupGauge(gaugeSpec{ - startTime: suite.Ctx.BlockTime().Add(24 * time.Hour), - isPerpetual: false, - rewards: sdk.NewCoins(sdk.NewInt64Coin("foocoin", 10)), - paidOver: 2, - startTick: -10, - endTick: 10, - pricingTick: 0, - }) - } - - addr := sdk.AccAddress([]byte("Gauge_Creation_Addr_")) - - // fund reward tokens - suite.FundAcc(addr, sdk.NewCoins(sdk.NewInt64Coin("foocoin", 10))) - - // create gauge - _, err = suite.App.IncentivesKeeper.CreateGauge( - suite.Ctx, - false, - addr, - sdk.NewCoins(sdk.NewInt64Coin("foocoin", 10)), - types.QueryCondition{ - PairID: &dextypes.PairID{ - Token0: "TokenA", - Token1: "TokenB", - }, - StartTick: -10, - EndTick: 10, - }, - suite.Ctx.BlockTime().Add(24*time.Hour), - 2, - 0, - ) - suite.Require().Error(err) -} - -// TestGaugeCreateFails tests that when the distribute command is executed on a provided bad gauge -// that the step fails gracefully. -func (suite *IncentivesTestSuite) TestGaugeCreateFails() { - addrs := apptesting.SetupAddrs(3) - tests := []struct { - name string - addrs []sdk.AccAddress - depositStakeSpecs []depositStakeSpec - gaugeSpecs []gaugeSpec - assertions []balanceAssertion - }{ - { - name: "one stake with bad gauge", - depositStakeSpecs: []depositStakeSpec{ - { - depositSpecs: []depositSpec{ - { - addr: addrs[0], - token0: sdk.NewInt64Coin("TokenA", 1000), - token1: sdk.NewInt64Coin("TokenB", 1000), - tick: 999, - fee: 1, - }, - }, - stakeDistEpochOffset: -2, - }, - { - depositSpecs: []depositSpec{ - { - addr: addrs[1], - token0: sdk.NewInt64Coin("TokenA", 1000), - token1: sdk.NewInt64Coin("TokenB", 1000), - tick: 999, - fee: 1, - }, - }, - stakeDistEpochOffset: -2, - }, - { - depositSpecs: []depositSpec{ - { - addr: addrs[1], - token0: sdk.NewInt64Coin("TokenA", 1000), - token1: sdk.NewInt64Coin("TokenB", 1000), - tick: 999, - fee: 50, - }, - }, - stakeDistEpochOffset: -2, - }, - { - depositSpecs: []depositSpec{ - { - addr: addrs[1], - token0: sdk.NewInt64Coin("TokenA", 1000), - token1: sdk.NewInt64Coin("TokenB", 1000), - tick: 999, - fee: 50, - }, - }, - stakeDistEpochOffset: -1, - }, - }, - gaugeSpecs: []gaugeSpec{ - { - isPerpetual: false, - rewards: sdk.Coins{sdk.NewInt64Coin("reward", 3000)}, - startTick: -1000, - endTick: 1000, - paidOver: 1, - pricingTick: 9999999, - }, - }, - assertions: []balanceAssertion{ - {addr: addrs[0], balances: sdk.Coins{sdk.NewInt64Coin("reward", 1500)}}, - {addr: addrs[1], balances: sdk.Coins{sdk.NewInt64Coin("reward", 1500)}}, - }, - }, - } - for _, tc := range tests { - suite.T().Run(tc.name, func(t *testing.T) { - suite.SetupTest() - for _, depositSpec := range tc.depositStakeSpecs { - suite.SetupDepositAndStake(depositSpec) - } - for _, s := range tc.gaugeSpecs { - addr := sdk.AccAddress([]byte("Gauge_Creation_Addr_")) - - // fund reward tokens - suite.FundAcc(addr, s.rewards) - - // create gauge - _, err := suite.App.IncentivesKeeper.CreateGauge( - suite.Ctx, - s.isPerpetual, - addr, - s.rewards, - types.QueryCondition{ - PairID: &dextypes.PairID{ - Token0: "TokenA", - Token1: "TokenB", - }, - StartTick: s.startTick, - EndTick: s.endTick, - }, - s.startTime, - s.paidOver, - s.pricingTick, - ) - require.Error(t, err) - } - }) - } -} diff --git a/x/incentives/keeper/genesis.go b/x/incentives/keeper/genesis.go deleted file mode 100644 index 710671120..000000000 --- a/x/incentives/keeper/genesis.go +++ /dev/null @@ -1,80 +0,0 @@ -package keeper - -import ( - "fmt" - - sdk "github.com/cosmos/cosmos-sdk/types" - - "github.com/neutron-org/neutron/x/incentives/types" -) - -// InitGenesis initializes the incentives module's state from a provided genesis state. -func (k Keeper) InitGenesis(ctx sdk.Context, genState types.GenesisState) { - if err := k.SetParams(ctx, genState.Params); err != nil { - panic(err) - } - if err := k.InitializeAllStakes(ctx, genState.Stakes); err != nil { - panic(err) - } - if err := k.InitializeAllGauges(ctx, genState.Gauges); err != nil { - panic(err) - } - k.SetLastStakeID(ctx, genState.LastStakeId) - k.SetLastGaugeID(ctx, genState.LastGaugeId) - for _, accountHistory := range genState.AccountHistories { - err := k.SetAccountHistory(ctx, accountHistory) - if err != nil { - panic(err) - } - } -} - -// ExportGenesis returns the x/incentives module's exported genesis. -func (k Keeper) ExportGenesis(ctx sdk.Context) *types.GenesisState { - return &types.GenesisState{ - Params: k.GetParams(ctx), - Gauges: k.GetNotFinishedGauges(ctx), - LastGaugeId: k.GetLastGaugeID(ctx), - LastStakeId: k.GetLastStakeID(ctx), - Stakes: k.GetStakes(ctx), - AccountHistories: k.GetAllAccountHistory(ctx), - } -} - -// InitializeAllStakes takes a set of stakes, and initializes state to be storing -// them all correctly. -func (k Keeper) InitializeAllStakes(ctx sdk.Context, stakes types.Stakes) error { - for i, stake := range stakes { - if i%25000 == 0 { - msg := fmt.Sprintf("Reset %d stake refs, cur stake ID %d", i, stake.ID) - ctx.Logger().Info(msg) - } - err := k.setStake(ctx, stake) - if err != nil { - return err - } - - err = k.addStakeRefs(ctx, stake) - if err != nil { - return err - } - } - - return nil -} - -// InitializeAllGauges takes a set of gauges, and initializes state to be storing -// them all correctly. -func (k Keeper) InitializeAllGauges(ctx sdk.Context, gauges types.Gauges) error { - for _, gauge := range gauges { - err := k.setGauge(ctx, gauge) - if err != nil { - return err - } - err = k.setGaugeRefs(ctx, gauge) - if err != nil { - return err - } - } - return nil -} diff --git a/x/incentives/keeper/genesis_test.go b/x/incentives/keeper/genesis_test.go deleted file mode 100644 index d1747b173..000000000 --- a/x/incentives/keeper/genesis_test.go +++ /dev/null @@ -1,57 +0,0 @@ -package keeper_test - -import ( - "time" - - sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/testutil/apptesting" - "github.com/neutron-org/neutron/testutil/dex/nullify" - dextypes "github.com/neutron-org/neutron/x/dex/types" - "github.com/neutron-org/neutron/x/incentives/types" - "github.com/stretchr/testify/require" -) - -// TestIncentivesExportGenesis tests export genesis command for the incentives module. -func (suite *IncentivesTestSuite) TestGenesis() { - validAddr, _ := apptesting.GenerateTestAddrs() - genesisState := types.GenesisState{ - Params: types.DefaultParams(), - LastStakeId: 10, - Stakes: []*types.Stake{ - { - ID: 0, - Owner: validAddr, - StartTime: time.Time{}, - Coins: sdk.NewCoins(sdk.NewInt64Coin(suite.LPDenom0, 10)), - }, - }, - LastGaugeId: 10, - Gauges: []*types.Gauge{ - { - IsPerpetual: false, - Coins: sdk.Coins{sdk.NewInt64Coin("reward", 3000)}, - DistributeTo: types.QueryCondition{ - StartTick: -10, - EndTick: 10, - PairID: &dextypes.PairID{ - Token0: "TokenA", - Token1: "TokenB", - }, - }, - NumEpochsPaidOver: 1, - PricingTick: 0, - }, - }, - } - suite.App.IncentivesKeeper.InitGenesis(suite.Ctx, genesisState) - got := suite.App.IncentivesKeeper.ExportGenesis(suite.Ctx) - require.NotNil(suite.T(), got) - - nullify.Fill(&genesisState) - nullify.Fill(got) - - require.ElementsMatch(suite.T(), genesisState.Gauges, got.Gauges) - require.ElementsMatch(suite.T(), genesisState.Stakes, got.Stakes) - require.Equal(suite.T(), genesisState.LastStakeId, got.LastStakeId) - require.Equal(suite.T(), genesisState.LastGaugeId, got.LastGaugeId) -} diff --git a/x/incentives/keeper/hooks.go b/x/incentives/keeper/hooks.go deleted file mode 100644 index 6d8fb1911..000000000 --- a/x/incentives/keeper/hooks.go +++ /dev/null @@ -1,60 +0,0 @@ -package keeper - -import ( - epochstypes "github.com/neutron-org/neutron/x/epochs/types" - - sdk "github.com/cosmos/cosmos-sdk/types" -) - -// BeforeEpochStart is the epoch start hook. -func (k Keeper) BeforeEpochStart(_ sdk.Context, _ string) error { - return nil -} - -// AfterEpochEnd is the epoch end hook. -func (k Keeper) AfterEpochEnd(ctx sdk.Context, epochIdentifier string) error { - params := k.GetParams(ctx) - if epochIdentifier == params.DistrEpochIdentifier { - // begin distribution if it's start time - gauges := k.GetUpcomingGauges(ctx) - for _, gauge := range gauges { - if gauge.IsActiveGauge(ctx.BlockTime()) { - if err := k.moveUpcomingGaugeToActiveGauge(ctx, gauge); err != nil { - return err - } - } - } - - // distribute due to epoch event - gauges = k.GetActiveGauges(ctx) - _, err := k.Distribute(ctx, gauges) - if err != nil { - return err - } - } - return nil -} - -// ___________________________________________________________________________________________________ - -// Hooks is the wrapper struct for the incentives keeper. -type Hooks struct { - k Keeper -} - -var _ epochstypes.EpochHooks = Hooks{} - -// Hooks returns the hook wrapper struct. -func (k Keeper) Hooks() Hooks { - return Hooks{k} -} - -// BeforeEpochStart is the epoch start hook. -func (h Hooks) BeforeEpochStart(ctx sdk.Context, epochIdentifier string) error { - return h.k.BeforeEpochStart(ctx, epochIdentifier) -} - -// AfterEpochEnd is the epoch end hook. -func (h Hooks) AfterEpochEnd(ctx sdk.Context, epochIdentifier string) error { - return h.k.AfterEpochEnd(ctx, epochIdentifier) -} diff --git a/x/incentives/keeper/iterator.go b/x/incentives/keeper/iterator.go deleted file mode 100644 index 4fdaa3cc6..000000000 --- a/x/incentives/keeper/iterator.go +++ /dev/null @@ -1,58 +0,0 @@ -package keeper - -import ( - "encoding/json" - - db "github.com/cometbft/cometbft-db" - "github.com/neutron-org/neutron/x/incentives/types" - - sdk "github.com/cosmos/cosmos-sdk/types" -) - -// iterator returns an iterator over all gauges in the {prefix} space of state. -func (k Keeper) iterator(ctx sdk.Context, prefix []byte) sdk.Iterator { - store := ctx.KVStore(k.storeKey) - return sdk.KVStorePrefixIterator(store, prefix) -} - -// iterator returns an iterator over all gauges in the {prefix} space of state. -func (k Keeper) iteratorStartEnd(ctx sdk.Context, start, end []byte) sdk.Iterator { - store := ctx.KVStore(k.storeKey) - return store.Iterator(start, end) -} - -func UnmarshalRefArray(bz []byte) []uint64 { - ids := []uint64{} - err := json.Unmarshal(bz, &ids) - if err != nil { - panic(err) - } - return ids -} - -// getStakesFromIterator returns an array of single stake units by period defined by the x/stake module. -func (k Keeper) getStakesFromIterator(ctx sdk.Context, iterator db.Iterator) types.Stakes { - stakes := types.Stakes{} - defer iterator.Close() - for ; iterator.Valid(); iterator.Next() { - stakeIDs := UnmarshalRefArray(iterator.Value()) - for _, stakeID := range stakeIDs { - stake, err := k.GetStakeByID(ctx, stakeID) - if err != nil { - panic(err) - } - stakes = append(stakes, stake) - } - } - return stakes -} - -func (k Keeper) getIDsFromIterator(iterator db.Iterator) []uint64 { - allIds := []uint64{} - defer iterator.Close() - for ; iterator.Valid(); iterator.Next() { - ids := UnmarshalRefArray(iterator.Value()) - allIds = append(allIds, ids...) - } - return allIds -} diff --git a/x/incentives/keeper/keeper.go b/x/incentives/keeper/keeper.go deleted file mode 100644 index f9fcfe12a..000000000 --- a/x/incentives/keeper/keeper.go +++ /dev/null @@ -1,77 +0,0 @@ -package keeper - -import ( - "fmt" - - "github.com/cometbft/cometbft/libs/log" - - "github.com/neutron-org/neutron/x/incentives/types" - - storetypes "github.com/cosmos/cosmos-sdk/store/types" - sdk "github.com/cosmos/cosmos-sdk/types" -) - -// Keeper provides a way to manage incentives module storage. -type Keeper struct { - storeKey storetypes.StoreKey - hooks types.IncentiveHooks - ak types.AccountKeeper - bk types.BankKeeper - ek types.EpochKeeper - dk types.DexKeeper - distributor Distributor - authority string -} - -// NewKeeper returns a new instance of the incentive module keeper struct. -func NewKeeper( - storeKey storetypes.StoreKey, - ak types.AccountKeeper, - bk types.BankKeeper, - ek types.EpochKeeper, - dk types.DexKeeper, - authority string, -) *Keeper { - keeper := &Keeper{ - storeKey: storeKey, - ak: ak, - bk: bk, - ek: ek, - dk: dk, - authority: authority, - } - keeper.distributor = NewDistributor(keeper) - return keeper -} - -// SetHooks sets the incentives hooks. -func (k *Keeper) SetHooks(ih types.IncentiveHooks) *Keeper { - if k.hooks != nil { - panic("cannot set incentive hooks twice") - } - - k.hooks = ih - - return k -} - -// Logger returns a logger instance for the incentives module. -func (k Keeper) Logger(ctx sdk.Context) log.Logger { - return ctx.Logger().With("module", fmt.Sprintf("x/%s", types.ModuleName)) -} - -// GetModuleBalance returns full balance of the module. -func (k Keeper) GetModuleBalance(ctx sdk.Context) sdk.Coins { - acc := k.ak.GetModuleAccount(ctx, types.ModuleName) - return k.bk.GetAllBalances(ctx, acc.GetAddress()) -} - -// GetModuleStakedCoins Returns staked balance of the module. -func (k Keeper) GetModuleStakedCoins(ctx sdk.Context) sdk.Coins { - // all not unstaking + not finished unstaking - return k.GetStakes(ctx).GetCoins() -} - -func (k Keeper) GetAuthority() string { - return k.authority -} diff --git a/x/incentives/keeper/keeper_test.go b/x/incentives/keeper/keeper_test.go deleted file mode 100644 index 6268a0516..000000000 --- a/x/incentives/keeper/keeper_test.go +++ /dev/null @@ -1,52 +0,0 @@ -package keeper_test - -import ( - "testing" - - "github.com/stretchr/testify/suite" - - "github.com/neutron-org/neutron/testutil/apptesting" - dextypes "github.com/neutron-org/neutron/x/dex/types" - "github.com/neutron-org/neutron/x/incentives/keeper" - "github.com/neutron-org/neutron/x/incentives/types" -) - -type IncentivesTestSuite struct { - apptesting.KeeperTestHelper - - QueryServer keeper.QueryServer - MsgServer types.MsgServer - LPDenom0 string - LPDenom1 string -} - -// SetupTest sets incentives parameters from the suite's context -func (suite *IncentivesTestSuite) SetupTest() { - suite.Setup() - suite.QueryServer = keeper.NewQueryServer(suite.App.IncentivesKeeper) - suite.MsgServer = keeper.NewMsgServerImpl(suite.App.IncentivesKeeper) - pool0, _ := suite.App.DexKeeper.GetOrInitPool(suite.Ctx, - &dextypes.PairID{ - Token0: "TokenA", - Token1: "TokenB", - }, - 0, - 1, - ) - suite.LPDenom0 = pool0.GetPoolDenom() - pool1, _ := suite.App.DexKeeper.GetOrInitPool(suite.Ctx, - &dextypes.PairID{ - Token0: "TokenA", - Token1: "TokenB", - }, - 1, - 1, - ) - suite.LPDenom1 = pool1.GetPoolDenom() - - suite.SetEpochStartTime() -} - -func TestIncentivesTestSuite(t *testing.T) { - suite.Run(t, new(IncentivesTestSuite)) -} diff --git a/x/incentives/keeper/msg_server.go b/x/incentives/keeper/msg_server.go deleted file mode 100644 index c0feb7306..000000000 --- a/x/incentives/keeper/msg_server.go +++ /dev/null @@ -1,199 +0,0 @@ -package keeper - -import ( - "context" - "fmt" - "strconv" - - "github.com/neutron-org/neutron/x/incentives/types" - - sdkerrors "cosmossdk.io/errors" - sdk "github.com/cosmos/cosmos-sdk/types" -) - -var _ types.MsgServer = msgServer{} - -// msgServer provides a way to reference keeper pointer in the message server interface. -type msgServer struct { - keeper *Keeper -} - -// NewMsgServerImpl returns an instance of MsgServer for the provided keeper. -func NewMsgServerImpl(keeper *Keeper) types.MsgServer { - return &msgServer{ - keeper: keeper, - } -} - -// CreateGauge creates a gauge and sends coins to the gauge. -// Emits create gauge event and returns the create gauge response. -func (server msgServer) CreateGauge( - goCtx context.Context, - msg *types.MsgCreateGauge, -) (*types.MsgCreateGaugeResponse, error) { - if server.keeper.authority != msg.Owner { - return nil, sdkerrors.Wrapf( - types.ErrInvalidSigner, - "invalid authority; expected %s, got %s", - server.keeper.authority, - msg.Owner, - ) - } - - ctx := sdk.UnwrapSDKContext(goCtx) - owner, err := sdk.AccAddressFromBech32(msg.Owner) - if err != nil { - return nil, err - } - - gauge, err := server.keeper.CreateGauge( - ctx, - msg.IsPerpetual, - owner, - msg.Coins, - msg.DistributeTo, - msg.StartTime, - msg.NumEpochsPaidOver, - msg.PricingTick, - ) - if err != nil { - return nil, sdkerrors.Wrap(types.ErrInvalidRequest, err.Error()) - } - - ctx.EventManager().EmitEvents(sdk.Events{ - sdk.NewEvent( - types.TypeEvtCreateGauge, - sdk.NewAttribute(types.AttributeGaugeID, strconv.FormatUint(gauge.Id, 10)), - ), - }) - - return &types.MsgCreateGaugeResponse{}, nil -} - -// AddToGauge adds coins to gauge. -// Emits add to gauge event and returns the add to gauge response. -func (server msgServer) AddToGauge( - goCtx context.Context, - msg *types.MsgAddToGauge, -) (*types.MsgAddToGaugeResponse, error) { - ctx := sdk.UnwrapSDKContext(goCtx) - owner, err := sdk.AccAddressFromBech32(msg.Owner) - if err != nil { - return nil, err - } - - err = server.keeper.AddToGaugeRewards(ctx, owner, msg.Rewards, msg.GaugeId) - if err != nil { - return nil, sdkerrors.Wrap(types.ErrInvalidRequest, err.Error()) - } - - ctx.EventManager().EmitEvents(sdk.Events{ - sdk.NewEvent( - types.TypeEvtAddToGauge, - sdk.NewAttribute(types.AttributeGaugeID, strconv.FormatUint(msg.GaugeId, 10)), - ), - }) - - return &types.MsgAddToGaugeResponse{}, nil -} - -// StakeTokens stakes tokens in either two ways. -// 1. Add to an existing stake if a stake with the same owner and same duration exists. -// 2. Create a new stake if not. -// A sanity check to ensure given tokens is a single token is done in ValidateBaic. -// That is, a stake with multiple tokens cannot be created. -func (server msgServer) Stake( - goCtx context.Context, - msg *types.MsgStake, -) (*types.MsgStakeResponse, error) { - ctx := sdk.UnwrapSDKContext(goCtx) - - owner, err := sdk.AccAddressFromBech32(msg.Owner) - if err != nil { - return nil, err - } - - params := server.keeper.GetParams(ctx) - startDistEpoch := server.keeper.ek.GetEpochInfo(ctx, params.DistrEpochIdentifier).CurrentEpoch - - // if the owner + duration combination is new, create a new stake. - stake, err := server.keeper.CreateStake(ctx, owner, msg.Coins, ctx.BlockTime(), startDistEpoch) - if err != nil { - return nil, err - } - - ctx.EventManager().EmitEvents(sdk.Events{ - sdk.NewEvent( - types.TypeEvtStake, - sdk.NewAttribute(types.AttributeStakeID, strconv.FormatUint(stake.ID, 10)), - sdk.NewAttribute(types.AttributeStakeOwner, stake.Owner), - sdk.NewAttribute(types.AttributeStakeAmount, stake.Coins.String()), - ), - }) - - return &types.MsgStakeResponse{ID: stake.ID}, nil -} - -// BeginUnstaking begins unstaking of the specified stake. -// The stake would enter the unstaking queue, with the endtime of the stake set as block time + duration. -func (server msgServer) Unstake( - goCtx context.Context, - msg *types.MsgUnstake, -) (*types.MsgUnstakeResponse, error) { - ctx := sdk.UnwrapSDKContext(goCtx) - - unstakes := msg.Unstakes - if len(msg.Unstakes) == 0 { - stakes := server.keeper.GetStakesByAccount(ctx, sdk.AccAddress(msg.Owner)) - unstakes = make([]*types.MsgUnstake_UnstakeDescriptor, len(stakes)) - for i, stake := range stakes { - unstakes[i] = &types.MsgUnstake_UnstakeDescriptor{ - ID: stake.ID, - Coins: sdk.NewCoins(), - } - } - } - - for _, unstake := range unstakes { - stake, err := server.keeper.GetStakeByID(ctx, unstake.ID) - if err != nil { - return nil, sdkerrors.Wrap(types.ErrInvalidRequest, err.Error()) - } - - if msg.Owner != stake.Owner { - return nil, sdkerrors.Wrap( - types.ErrNotStakeOwner, - fmt.Sprintf( - "msg sender (%s) and stake owner (%s) does not match", - msg.Owner, - stake.Owner, - ), - ) - } - - _, err = server.keeper.Unstake(ctx, stake, unstake.Coins) - if err != nil { - return nil, sdkerrors.Wrap(types.ErrInvalidRequest, err.Error()) - } - } - - // N.B. begin unstake event is emitted downstream in the keeper method. - return &types.MsgUnstakeResponse{}, nil -} - -func (server msgServer) UpdateParams(goCtx context.Context, req *types.MsgUpdateParams) (*types.MsgUpdateParamsResponse, error) { - if err := req.ValidateBasic(); err != nil { - return nil, err - } - authority := server.keeper.GetAuthority() - if authority != req.Authority { - return nil, sdkerrors.Wrapf(types.ErrInvalidRequest, "invalid authority; expected %s, got %s", authority, req.Authority) - } - - ctx := sdk.UnwrapSDKContext(goCtx) - if err := server.keeper.SetParams(ctx, req.Params); err != nil { - return nil, err - } - - return &types.MsgUpdateParamsResponse{}, nil -} diff --git a/x/incentives/keeper/params.go b/x/incentives/keeper/params.go deleted file mode 100644 index 9a684f11c..000000000 --- a/x/incentives/keeper/params.go +++ /dev/null @@ -1,34 +0,0 @@ -package keeper - -import ( - sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/gogoproto/proto" - "github.com/neutron-org/neutron/x/incentives/types" -) - -// GetParams returns all of the parameters in the incentive module. -func (k Keeper) GetParams(ctx sdk.Context) (params types.Params) { - store := ctx.KVStore(k.storeKey) - bz := store.Get(types.KeyParams) - if bz == nil { - return params - } - - if err := proto.Unmarshal(bz, ¶ms); err != nil { - panic(err) - } - - return params -} - -// SetParams sets all of the parameters in the incentive module. -func (k Keeper) SetParams(ctx sdk.Context, params types.Params) error { - store := ctx.KVStore(k.storeKey) - bz, err := proto.Marshal(¶ms) - if err != nil { - return err - } - - store.Set(types.KeyParams, bz) - return nil -} diff --git a/x/incentives/keeper/query_server.go b/x/incentives/keeper/query_server.go deleted file mode 100644 index 4d2426ca8..000000000 --- a/x/incentives/keeper/query_server.go +++ /dev/null @@ -1,267 +0,0 @@ -package keeper - -import ( - "context" - "encoding/json" - - "google.golang.org/grpc/codes" - "google.golang.org/grpc/status" - - sdkerrors "cosmossdk.io/errors" - sdk "github.com/cosmos/cosmos-sdk/types" - - dextypes "github.com/neutron-org/neutron/x/dex/types" - "github.com/neutron-org/neutron/x/incentives/types" -) - -var _ types.QueryServer = QueryServer{} - -// QueryServer defines a wrapper around the incentives module keeper providing gRPC method handlers. -type QueryServer struct { - *Keeper -} - -// NewQueryServer creates a new QueryServer struct. -func NewQueryServer(k *Keeper) QueryServer { - return QueryServer{Keeper: k} -} - -func (q QueryServer) GetModuleStatus( - goCtx context.Context, - _ *types.GetModuleStatusRequest, -) (*types.GetModuleStatusResponse, error) { - ctx := sdk.UnwrapSDKContext(goCtx) - return &types.GetModuleStatusResponse{ - RewardCoins: q.Keeper.GetModuleCoinsToBeDistributed(ctx), - StakedCoins: q.Keeper.GetModuleStakedCoins(ctx), - Params: q.Keeper.GetParams(ctx), - }, nil -} - -func (q QueryServer) GetGaugeByID( - goCtx context.Context, - req *types.GetGaugeByIDRequest, -) (*types.GetGaugeByIDResponse, error) { - ctx := sdk.UnwrapSDKContext(goCtx) - if req == nil { - return nil, status.Error(codes.InvalidArgument, "empty request") - } - gauge, err := q.Keeper.GetGaugeByID(ctx, req.Id) - if err != nil { - return nil, err - } - return &types.GetGaugeByIDResponse{Gauge: gauge}, nil -} - -func (q QueryServer) GetGaugeQualifyingValue( - goCtx context.Context, - req *types.GetGaugeQualifyingValueRequest, -) (*types.GetGaugeQualifyingValueResponse, error) { - ctx := sdk.UnwrapSDKContext(goCtx) - if req == nil { - return nil, status.Error(codes.InvalidArgument, "empty request") - } - value, err := q.Keeper.GetGaugeQualifyingValue(ctx, req.Id) - if err != nil { - return nil, err - } - return &types.GetGaugeQualifyingValueResponse{QualifyingValue: value}, nil -} - -func (q QueryServer) GetGauges( - goCtx context.Context, - req *types.GetGaugesRequest, -) (*types.GetGaugesResponse, error) { - if req == nil { - return nil, status.Error(codes.InvalidArgument, "empty request") - } - ctx := sdk.UnwrapSDKContext(goCtx) - - var prefix []byte - switch req.Status { - case types.GaugeStatus_ACTIVE_UPCOMING: - prefix = types.KeyPrefixGaugeIndex - case types.GaugeStatus_ACTIVE: - prefix = types.KeyPrefixGaugeIndexActive - case types.GaugeStatus_UPCOMING: - prefix = types.KeyPrefixGaugeIndexUpcoming - case types.GaugeStatus_FINISHED: - prefix = types.KeyPrefixGaugeIndexFinished - default: - return nil, sdkerrors.Wrap(types.ErrInvalidRequest, "invalid status filter value") - } - - var lowerTick, upperTick int64 - var poolMetadata *dextypes.PoolMetadata - if req.Denom != "" { - poolMetadata, err := q.dk.GetPoolMetadataByDenom(ctx, req.Denom) - if err != nil { - return nil, err - } - lowerTick = poolMetadata.Tick - int64(poolMetadata.Fee) - upperTick = poolMetadata.Tick + int64(poolMetadata.Fee) - } - - gauges := types.Gauges{} - store := ctx.KVStore(q.Keeper.storeKey) - iterator := sdk.KVStorePrefixIterator(store, prefix) - defer iterator.Close() - - for ; iterator.Valid(); iterator.Next() { - // this may return multiple gauges at once if two gauges start at the same time. - // for now this is treated as an edge case that is not of importance - newGauges, err := q.getGaugeFromIDJsonBytes(ctx, iterator.Value()) - if err != nil { - return nil, err - } - if req.Denom != "" { - for _, gauge := range newGauges { - if *gauge.DistributeTo.PairID != *poolMetadata.PairID { - continue - } - lowerTickInRange := gauge.DistributeTo.StartTick <= lowerTick && - lowerTick <= gauge.DistributeTo.EndTick - upperTickInRange := gauge.DistributeTo.StartTick <= upperTick && - upperTick <= gauge.DistributeTo.EndTick - if !lowerTickInRange || !upperTickInRange { - continue - } - gauges = append(gauges, gauge) - } - } else { - gauges = append(gauges, newGauges...) - } - } - - return &types.GetGaugesResponse{ - Gauges: gauges, - }, nil -} - -func (q QueryServer) GetStakeByID( - goCtx context.Context, - req *types.GetStakeByIDRequest, -) (*types.GetStakeByIDResponse, error) { - if req == nil { - return nil, status.Error(codes.InvalidArgument, "empty request") - } - ctx := sdk.UnwrapSDKContext(goCtx) - stake, err := q.Keeper.GetStakeByID(ctx, req.StakeId) - if err != nil { - return nil, status.Error(codes.Internal, err.Error()) - } - return &types.GetStakeByIDResponse{Stake: stake}, nil -} - -func (q QueryServer) GetStakes( - goCtx context.Context, - req *types.GetStakesRequest, -) (*types.GetStakesResponse, error) { - if req == nil { - return nil, status.Error(codes.InvalidArgument, "empty request") - } - - ctx := sdk.UnwrapSDKContext(goCtx) - hasOwner := len(req.Owner) > 0 - if !hasOwner { - // TODO: Verify this protection is necessary - return nil, status.Error( - codes.InvalidArgument, - "for performance reasons will not return all stakes", - ) - } - - owner, err := sdk.AccAddressFromBech32(req.Owner) - if err != nil { - return nil, err - } - - stakes := q.Keeper.getStakesByAccount(ctx, owner) - return &types.GetStakesResponse{ - Stakes: stakes, - }, nil -} - -func (q QueryServer) GetFutureRewardEstimate( - goCtx context.Context, - req *types.GetFutureRewardEstimateRequest, -) (*types.GetFutureRewardEstimateResponse, error) { - ctx := sdk.UnwrapSDKContext(goCtx) - if req == nil { - return nil, status.Error(codes.InvalidArgument, "empty request") - } - if len(req.Owner) == 0 && len(req.StakeIds) == 0 { - return nil, sdkerrors.Wrap(types.ErrInvalidRequest, "empty owner") - } - - if req.NumEpochs > 365 { - return nil, sdkerrors.Wrap(types.ErrInvalidRequest, "end epoch out of ranges") - } - - var ownerAddress sdk.AccAddress - if len(req.Owner) != 0 { - owner, err := sdk.AccAddressFromBech32(req.Owner) - if err != nil { - return nil, err - } - ownerAddress = owner - } - - stakes := make(types.Stakes, 0, len(req.StakeIds)) - for _, stakeID := range req.StakeIds { - stake, err := q.Keeper.GetStakeByID(ctx, stakeID) - if err != nil { - return nil, err - } - stakes = append(stakes, stake) - } - - rewards, err := q.Keeper.GetRewardsEstimate(ctx, ownerAddress, stakes, req.NumEpochs) - if err != nil { - return nil, err - } - return &types.GetFutureRewardEstimateResponse{Coins: rewards}, nil -} - -func (q QueryServer) GetAccountHistory( - goCtx context.Context, - req *types.GetAccountHistoryRequest, -) (*types.GetAccountHistoryResponse, error) { - if req == nil { - return nil, status.Error(codes.InvalidArgument, "empty request") - } - ctx := sdk.UnwrapSDKContext(goCtx) - accountHistory, found := q.Keeper.GetAccountHistory(ctx, req.Account) - if !found { - return nil, status.Error( - codes.NotFound, - "Could not locate an account history with that address", - ) - } - return &types.GetAccountHistoryResponse{Coins: accountHistory.Coins}, nil -} - -// getGaugeFromIDJsonBytes returns gauges from the json bytes of gaugeIDs. -func (q QueryServer) getGaugeFromIDJsonBytes( - ctx sdk.Context, - refValue []byte, -) (types.Gauges, error) { - gauges := types.Gauges{} - gaugeIDs := []uint64{} - - err := json.Unmarshal(refValue, &gaugeIDs) - if err != nil { - return gauges, err - } - - for _, gaugeID := range gaugeIDs { - gauge, err := q.Keeper.GetGaugeByID(ctx, gaugeID) - if err != nil { - return types.Gauges{}, err - } - - gauges = append(gauges, gauge) - } - - return gauges, nil -} diff --git a/x/incentives/keeper/query_server_test.go b/x/incentives/keeper/query_server_test.go deleted file mode 100644 index 953c67876..000000000 --- a/x/incentives/keeper/query_server_test.go +++ /dev/null @@ -1,126 +0,0 @@ -package keeper_test - -import ( - "time" - - sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/x/incentives/types" - "github.com/stretchr/testify/suite" -) - -var _ = suite.TestingSuite(nil) - -func (suite *IncentivesTestSuite) TestGetFutureRewardEstimate() { - addr1 := suite.SetupAddr(0) - suite.SetupDepositAndStake(depositStakeSpec{ - depositSpecs: []depositSpec{ - { - addr: addr1, - token0: sdk.NewInt64Coin("TokenA", 1000), - token1: sdk.NewInt64Coin("TokenB", 1000), - tick: 0, - fee: 1, - }, - }, - stakeDistEpochOffset: -2, - }) - addr2 := suite.SetupAddr(1) - suite.SetupDepositAndStake(depositStakeSpec{ - depositSpecs: []depositSpec{ - { - addr: addr2, - token0: sdk.NewInt64Coin("TokenA", 1000), - token1: sdk.NewInt64Coin("TokenB", 1000), - tick: 0, - fee: 1, - }, - }, - stakeDistEpochOffset: -2, - }) - suite.SetupGauge(gaugeSpec{ - isPerpetual: false, - rewards: sdk.NewCoins(sdk.NewInt64Coin("foocoin", 1000)), - paidOver: 100, - startTick: -10, - endTick: 10, - pricingTick: 0, - startTime: suite.Ctx.BlockTime(), - }) - suite.SetupGauge(gaugeSpec{ - isPerpetual: false, - rewards: sdk.NewCoins(sdk.NewInt64Coin("foocoin", 1000)), - paidOver: 100, - startTick: -10, - endTick: 10, - pricingTick: 0, - startTime: suite.Ctx.BlockTime().Add(315 * 24 * time.Hour), - }) - estimate, err := suite.QueryServer.GetFutureRewardEstimate( - suite.GoCtx, - &types.GetFutureRewardEstimateRequest{ - Owner: addr1.String(), - StakeIds: nil, - NumEpochs: 365, - }, - ) - suite.Require().NoError(err) - suite.Require().Equal(sdk.NewCoins(sdk.NewInt64Coin("foocoin", 750)), estimate.Coins) -} - -func (suite *IncentivesTestSuite) TestGetGauges() { - addr1 := suite.SetupAddr(0) - suite.SetupDepositAndStake(depositStakeSpec{ - depositSpecs: []depositSpec{ - { - addr: addr1, - token0: sdk.NewInt64Coin("TokenA", 1000), - token1: sdk.NewInt64Coin("TokenB", 1000), - tick: 0, - fee: 1, - }, - }, - stakeDistEpochOffset: -2, - }) - addr2 := suite.SetupAddr(1) - suite.SetupDepositAndStake(depositStakeSpec{ - depositSpecs: []depositSpec{ - { - addr: addr2, - token0: sdk.NewInt64Coin("TokenA", 1000), - token1: sdk.NewInt64Coin("TokenB", 1000), - tick: 0, - fee: 1, - }, - }, - stakeDistEpochOffset: -2, - }) - gauge1 := suite.SetupGauge(gaugeSpec{ - isPerpetual: false, - rewards: sdk.NewCoins(sdk.NewInt64Coin("foocoin", 1000)), - paidOver: 100, - startTick: -10, - endTick: 10, - pricingTick: 0, - startTime: suite.Ctx.BlockTime(), - }) - gauge2 := suite.SetupGauge(gaugeSpec{ - isPerpetual: false, - rewards: sdk.NewCoins(sdk.NewInt64Coin("foocoin", 1000)), - paidOver: 100, - startTick: -10, - endTick: 10, - pricingTick: 0, - startTime: suite.Ctx.BlockTime().Add(315 * 24 * time.Hour), - }) - - response, err := suite.QueryServer.GetGauges(suite.GoCtx, &types.GetGaugesRequest{ - Status: types.GaugeStatus_ACTIVE_UPCOMING, - Denom: "", - }) - - suite.Require().NoError(err) - suite.Require().Equal([]*types.Gauge{ - gauge2, - gauge1, - }, response.Gauges) -} diff --git a/x/incentives/keeper/stake.go b/x/incentives/keeper/stake.go deleted file mode 100644 index 90ef98fb4..000000000 --- a/x/incentives/keeper/stake.go +++ /dev/null @@ -1,249 +0,0 @@ -package keeper - -import ( - "fmt" - "strconv" - "time" - - sdkerrors "cosmossdk.io/errors" - sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/gogoproto/proto" - - "github.com/neutron-org/neutron/x/incentives/types" -) - -// GetLastStakeID returns ID used last time. -func (k Keeper) GetLastStakeID(ctx sdk.Context) uint64 { - store := ctx.KVStore(k.storeKey) - - bz := store.Get(types.KeyLastStakeID) - if bz == nil { - return 0 - } - - return sdk.BigEndianToUint64(bz) -} - -// SetLastStakeID save ID used by last stake. -func (k Keeper) SetLastStakeID(ctx sdk.Context, id uint64) { - store := ctx.KVStore(k.storeKey) - store.Set(types.KeyLastStakeID, sdk.Uint64ToBigEndian(id)) -} - -func (k Keeper) Unstake(ctx sdk.Context, stake *types.Stake, coins sdk.Coins) (uint64, error) { - if coins.Empty() { - coins = stake.Coins - } - - if !coins.IsAllLTE(stake.Coins) { - return 0, fmt.Errorf("requested amount to unstake exceeds locked tokens") - } - - // remove existing stake refs from not unlocking queue - err := k.deleteStakeRefs(ctx, stake) - if err != nil { - return 0, err - } - - if len(coins) != 0 && !coins.IsEqual(stake.Coins) { - stake.Coins = stake.Coins.Sub(coins...) - err := k.setStake(ctx, stake) - if err != nil { - return 0, err - } - - // re-add remaining stake refs - err = k.addStakeRefs(ctx, stake) - if err != nil { - return 0, err - } - } else { - k.deleteStake(ctx, stake.ID) - } - - err = k.bk.SendCoinsFromModuleToAccount(ctx, types.ModuleName, stake.OwnerAddress(), coins) - if err != nil { - return 0, err - } - - if k.hooks != nil { - k.hooks.OnTokenUnstaked(ctx, stake.OwnerAddress(), stake.ID, stake.Coins, ctx.BlockTime()) - } - - ctx.EventManager().EmitEvents(sdk.Events{ - sdk.NewEvent( - types.TypeEvtUnstake, - sdk.NewAttribute(types.AttributeStakeID, strconv.FormatUint(stake.ID, 10)), - sdk.NewAttribute(types.AttributeStakeOwner, stake.Owner), - sdk.NewAttribute(types.AttributeStakeStakeTime, stake.StartTime.String()), - sdk.NewAttribute(types.AttributeUnstakedCoins, coins.String()), - ), - }) - - return stake.ID, err -} - -// setStake is a utility to store stake object into the store. -func (k Keeper) setStake(ctx sdk.Context, stake *types.Stake) error { - store := ctx.KVStore(k.storeKey) - bz, err := proto.Marshal(stake) - if err != nil { - return err - } - store.Set(types.GetStakeStoreKey(stake.ID), bz) - return nil -} - -// deleteStake removes the stake object from the state. -func (k Keeper) deleteStake(ctx sdk.Context, id uint64) { - store := ctx.KVStore(k.storeKey) - store.Delete(types.GetStakeStoreKey(id)) -} - -// GetStakeByID Returns stake from stakeID. -func (k Keeper) GetStakeByID(ctx sdk.Context, stakeID uint64) (*types.Stake, error) { - stake := types.Stake{} - store := ctx.KVStore(k.storeKey) - lockKey := types.GetStakeStoreKey(stakeID) - if !store.Has(lockKey) { - return nil, sdkerrors.Wrap( - types.ErrStakeNotFound, - fmt.Sprintf("stake with ID %d does not exist", stakeID), - ) - } - bz := store.Get(lockKey) - err := proto.Unmarshal(bz, &stake) - return &stake, err -} - -// GetAccountStakes Returns the period locks associated to an account. -func (k Keeper) GetStakesByQueryCondition( - ctx sdk.Context, - distrTo *types.QueryCondition, -) types.Stakes { - pairIDString := distrTo.PairID.CanonicalString() - tickStakeIds := k.getIDsFromIterator( - k.iteratorStartEnd( - ctx, - types.GetKeyStakeIndexByPairTick(pairIDString, distrTo.StartTick), - types.GetKeyStakeIndexByPairTick(pairIDString, distrTo.EndTick+1), - ), - ) - - idMemo := make(map[uint64]bool) - for _, id := range tickStakeIds { - idMemo[id] = true - } - - params := k.GetParams(ctx) - curEpoch := k.ek.GetEpochInfo(ctx, params.GetDistrEpochIdentifier()) - timeStakeIds := k.getIDsFromIterator( - k.iteratorStartEnd( - ctx, - types.CombineKeys( - types.KeyPrefixStakeIndexPairDistEpoch, - []byte(pairIDString), - ), - sdk.PrefixEndBytes(types.GetKeyStakeIndexByDistEpoch( - pairIDString, - curEpoch.CurrentEpoch-2, - )), - ), - ) - - resultIds := []uint64{} - for _, id := range timeStakeIds { - if _, ok := idMemo[id]; ok { - resultIds = append(resultIds, id) - } - } - - results := make([]*types.Stake, len(resultIds)) - for i, stakeID := range resultIds { - stake, err := k.GetStakeByID(ctx, stakeID) - if err != nil { - // This represents a db inconsistency - panic(err) - } - results[i] = stake - } - return results -} - -func (k Keeper) GetStakes(ctx sdk.Context) types.Stakes { - return k.getStakesFromIterator(ctx, k.iterator(ctx, types.KeyPrefixStakeIndex)) -} - -func (k Keeper) getStakesByAccount(ctx sdk.Context, acct sdk.AccAddress) types.Stakes { - return k.getStakesFromIterator(ctx, k.iterator(ctx, types.GetKeyStakeIndexByAccount(acct))) -} - -// GetAccountStakes Returns the period locks associated to an account. -func (k Keeper) GetStakesByAccount(ctx sdk.Context, addr sdk.AccAddress) types.Stakes { - return k.getStakesFromIterator(ctx, k.iterator(ctx, types.GetKeyStakeIndexByAccount(addr))) -} - -func (k Keeper) CreateStake( - ctx sdk.Context, - owner sdk.AccAddress, - coins sdk.Coins, - startTime time.Time, - startDistEpoch int64, -) (*types.Stake, error) { - ID := k.GetLastStakeID(ctx) + 1 - - // unlock time is initially set without a value, gets set as unlock start time + duration - // when unlocking starts. - stake := types.NewStake(ID, owner, coins, startTime, startDistEpoch) - - owner, err := sdk.AccAddressFromBech32(stake.Owner) - if err != nil { - return nil, sdkerrors.Wrap(types.ErrInvalidRequest, err.Error()) - } - - err = stake.ValidateBasic() - if err != nil { - return nil, sdkerrors.Wrap(types.ErrInvalidRequest, err.Error()) - } - - if err := k.bk.SendCoinsFromAccountToModule(ctx, owner, types.ModuleName, stake.Coins); err != nil { - return nil, sdkerrors.Wrap(types.ErrInvalidRequest, err.Error()) - } - - // store stake object into the store - err = k.setStake(ctx, stake) - if err != nil { - return nil, sdkerrors.Wrap(types.ErrInvalidRequest, err.Error()) - } - - k.hooks.OnTokenStaked(ctx, owner, stake.ID, stake.Coins, ctx.BlockTime()) - k.SetLastStakeID(ctx, stake.ID) - - // add stake refs into not unlocking queue - err = k.addStakeRefs(ctx, stake) - if err != nil { - return nil, sdkerrors.Wrap(types.ErrInvalidRequest, err.Error()) - } - - return stake, nil -} - -func (k Keeper) StakeCoinsPassingQueryCondition( - ctx sdk.Context, - stake *types.Stake, - distrTo types.QueryCondition, -) sdk.Coins { - coins := stake.Coins - result := sdk.NewCoins() - for _, c := range coins { - poolMetadata, err := k.dk.GetPoolMetadataByDenom(ctx, c.Denom) - if err != nil { - continue - } - - if distrTo.Test(poolMetadata) { - result = result.Add(c) - } - } - return result -} diff --git a/x/incentives/keeper/stake_refs.go b/x/incentives/keeper/stake_refs.go deleted file mode 100644 index 93d9c66d5..000000000 --- a/x/incentives/keeper/stake_refs.go +++ /dev/null @@ -1,72 +0,0 @@ -package keeper - -import ( - sdk "github.com/cosmos/cosmos-sdk/types" - dextypes "github.com/neutron-org/neutron/x/dex/types" - "github.com/neutron-org/neutron/x/incentives/types" -) - -// addStakeRefs adds appropriate reference keys preceded by a prefix. -// A prefix indicates whether the stake is unstaking or not. -func (k Keeper) addStakeRefs(ctx sdk.Context, stake *types.Stake) error { - refKeys, err := k.getStakeRefKeys(ctx, stake) - if err != nil { - return err - } - for _, refKey := range refKeys { - if err := k.addRefByKey(ctx, refKey, stake.ID); err != nil { - return err - } - } - return nil -} - -// deleteStakeRefs deletes all the stake references of the stake with the given stake prefix. -func (k Keeper) deleteStakeRefs(ctx sdk.Context, stake *types.Stake) error { - refKeys, err := k.getStakeRefKeys(ctx, stake) - if err != nil { - return err - } - for _, refKey := range refKeys { - err = k.deleteRefByKey(ctx, refKey, stake.ID) - if err != nil { - return err - } - } - return nil -} - -func (k Keeper) getStakeRefKeys(ctx sdk.Context, stake *types.Stake) ([][]byte, error) { - owner, err := sdk.AccAddressFromBech32(stake.Owner) - if err != nil { - return nil, err - } - - refKeys := make(map[string]bool) - refKeys[string(types.KeyPrefixStakeIndex)] = true - refKeys[string(types.CombineKeys(types.KeyPrefixStakeIndexAccount, owner))] = true - - for _, coin := range stake.Coins { - poolMetadata, err := k.dk.GetPoolMetadataByDenom(ctx, coin.Denom) - if err != nil { - panic("Only valid LP tokens should be staked") - } - denomBz := []byte(coin.Denom) - pairIDBz := []byte(poolMetadata.PairID.CanonicalString()) - tickBz := dextypes.TickIndexToBytes(poolMetadata.Tick) - refKeys[string(types.CombineKeys(types.KeyPrefixStakeIndexDenom, denomBz))] = true - refKeys[string(types.CombineKeys(types.KeyPrefixStakeIndexPairTick, pairIDBz, tickBz))] = true - refKeys[string(types.CombineKeys(types.KeyPrefixStakeIndexAccountDenom, owner, denomBz))] = true - refKeys[string(types.CombineKeys( - types.KeyPrefixStakeIndexPairDistEpoch, - pairIDBz, - types.GetKeyInt64(stake.StartDistEpoch), - ))] = true - } - - refKeyBytes := make([][]byte, 0, len(refKeys)) - for k := range refKeys { - refKeyBytes = append(refKeyBytes, []byte(k)) - } - return refKeyBytes, nil -} diff --git a/x/incentives/keeper/stake_test.go b/x/incentives/keeper/stake_test.go deleted file mode 100644 index d39cda26e..000000000 --- a/x/incentives/keeper/stake_test.go +++ /dev/null @@ -1,122 +0,0 @@ -package keeper_test - -import ( - "github.com/stretchr/testify/suite" - - sdk "github.com/cosmos/cosmos-sdk/types" -) - -var _ = suite.TestingSuite(nil) - -func (suite *IncentivesTestSuite) TestStakeLifecycle() { - addr0 := suite.SetupAddr(0) - - // setup dex deposit and stake of those shares - stake := suite.SetupDepositAndStake(depositStakeSpec{ - depositSpecs: []depositSpec{ - { - addr: addr0, - token0: sdk.NewInt64Coin("TokenA", 1000), - token1: sdk.NewInt64Coin("TokenB", 1000), - tick: 0, - fee: 1, - }, - }, - stakeDistEpochOffset: -2, - }) - - retrievedStake, err := suite.App.IncentivesKeeper.GetStakeByID(suite.Ctx, stake.ID) - suite.Require().NoError(err) - suite.Require().NotNil(retrievedStake) - - // unstake the full amount - _, err = suite.App.IncentivesKeeper.Unstake(suite.Ctx, stake, sdk.Coins{}) - suite.Require().NoError(err) - balances := suite.App.BankKeeper.GetAllBalances(suite.Ctx, addr0) - suite.Require().Equal(sdk.NewCoins(sdk.NewInt64Coin(suite.LPDenom0, 2000)), balances) - _, err = suite.App.IncentivesKeeper.GetStakeByID(suite.Ctx, stake.ID) - // should be deleted - suite.Require().Error(err) -} - -func (suite *IncentivesTestSuite) TestMultipleStakeLifecycle() { - addr0 := suite.SetupAddr(0) - - // setup dex deposit and stake of those shares - stake := suite.SetupDepositAndStake(depositStakeSpec{ - depositSpecs: []depositSpec{ - { - addr: addr0, - token0: sdk.NewInt64Coin("TokenA", 1000), - token1: sdk.NewInt64Coin("TokenB", 1000), - tick: 0, - fee: 1, - }, - { - addr: addr0, - token0: sdk.NewInt64Coin("TokenA", 1000), - token1: sdk.NewInt64Coin("TokenB", 1000), - tick: 1, - fee: 1, - }, - }, - stakeDistEpochOffset: -2, - }) - - retrievedStake, err := suite.App.IncentivesKeeper.GetStakeByID(suite.Ctx, stake.ID) - suite.Require().NoError(err) - suite.Require().NotNil(retrievedStake) - - // unstake the full amount - _, err = suite.App.IncentivesKeeper.Unstake(suite.Ctx, stake, sdk.Coins{}) - suite.Require().NoError(err) - balances := suite.App.BankKeeper.GetAllBalances(suite.Ctx, addr0) - suite.Require().Equal( - sdk.NewCoins( - sdk.NewInt64Coin(suite.LPDenom0, 2000), - sdk.NewInt64Coin(suite.LPDenom1, 2000), - ), balances) - _, err = suite.App.IncentivesKeeper.GetStakeByID(suite.Ctx, stake.ID) - // should be deleted - suite.Require().Error(err) -} - -func (suite *IncentivesTestSuite) TestStakeUnstakePartial() { - addr0 := suite.SetupAddr(0) - - // setup dex deposit and stake of those shares - stake := suite.SetupDepositAndStake(depositStakeSpec{ - depositSpecs: []depositSpec{ - { - addr: addr0, - token0: sdk.NewInt64Coin("TokenA", 1000), - token1: sdk.NewInt64Coin("TokenB", 1000), - tick: 0, - fee: 1, - }, - }, - stakeDistEpochOffset: -2, - }) - - retrievedStake, err := suite.App.IncentivesKeeper.GetStakeByID(suite.Ctx, stake.ID) - suite.Require().NoError(err) - suite.Require().NotNil(retrievedStake) - - // unstake the partial amount - _, err = suite.App.IncentivesKeeper.Unstake( - suite.Ctx, - stake, - sdk.Coins{sdk.NewInt64Coin(suite.LPDenom0, 900)}, - ) - suite.Require().NoError(err) - balances := suite.App.BankKeeper.GetAllBalances(suite.Ctx, addr0) - suite.Require().ElementsMatch(sdk.NewCoins(sdk.NewInt64Coin(suite.LPDenom0, 900)), balances) - // should still be accessible - retrievedStake, err = suite.App.IncentivesKeeper.GetStakeByID(suite.Ctx, stake.ID) - suite.Require().NoError(err) - suite.Require().NotNil(retrievedStake) - suite.Require(). - ElementsMatch(sdk.NewCoins(sdk.NewInt64Coin(suite.LPDenom0, 1100)), retrievedStake.Coins) - - // fin. -} diff --git a/x/incentives/keeper/store_test.go b/x/incentives/keeper/store_test.go deleted file mode 100644 index 0391f90ad..000000000 --- a/x/incentives/keeper/store_test.go +++ /dev/null @@ -1,54 +0,0 @@ -package keeper_test - -// func (suite *KeeperTestSuite) TestGaugeReferencesManagement() { -// key1 := []byte{0x11} -// key2 := []byte{0x12} - -// suite.SetupTest() - -// // set two gauge references to key 1 and three gauge references to key 2 -// _ = suite.App.IncentivesKeeper.addRefByKey(suite.Ctx, key1, 1) -// _ = suite.App.IncentivesKeeper.addRefByKey(suite.Ctx, key2, 1) -// _ = suite.App.IncentivesKeeper.addRefByKey(suite.Ctx, key1, 2) -// _ = suite.App.IncentivesKeeper.addRefByKey(suite.Ctx, key2, 2) -// _ = suite.App.IncentivesKeeper.addRefByKey(suite.Ctx, key2, 3) - -// // ensure key1 only has 2 entires -// gaugeRefs1 := suite.App.IncentivesKeeper.getRefs(suite.Ctx, key1) -// suite.Require().Equal(len(gaugeRefs1), 2) - -// // ensure key2 only has 3 entries -// gaugeRefs2 := suite.App.IncentivesKeeper.getRefs(suite.Ctx, key2) -// suite.Require().Equal(len(gaugeRefs2), 3) - -// // remove gauge 1 from key2, resulting in a reduction from 3 to 2 entries -// err := suite.App.IncentivesKeeper.deleteRefByKey(suite.Ctx, key2, 1) -// suite.Require().NoError(err) - -// // ensure key2 now only has 2 entires -// gaugeRefs3 := suite.App.IncentivesKeeper.getRefs(suite.Ctx, key2) -// suite.Require().Equal(len(gaugeRefs3), 2) -// } - -// var _ = suite.TestingSuite(nil) - -// func (suite *KeeperTestSuite) TestStakeReferencesManagement() { -// key1 := []byte{0x11} -// key2 := []byte{0x12} - -// suite.SetupTest() -// _ = suite.App.IncentivesKeeper.addRefByKey(suite.Ctx, key1, 1) -// _ = suite.App.IncentivesKeeper.addRefByKey(suite.Ctx, key2, 1) -// _ = suite.App.IncentivesKeeper.addRefByKey(suite.Ctx, key1, 2) -// _ = suite.App.IncentivesKeeper.addRefByKey(suite.Ctx, key2, 2) -// _ = suite.App.IncentivesKeeper.addRefByKey(suite.Ctx, key2, 3) - -// stakeIDs1 := suite.App.IncentivesKeeper.getRefs(suite.Ctx, key1) -// suite.Require().Equal(len(stakeIDs1), 2) -// stakeIDs2 := suite.App.IncentivesKeeper.getRefs(suite.Ctx, key2) -// suite.Require().Equal(len(stakeIDs2), 3) - -// suite.App.IncentivesKeeper.deleteRefByKey(suite.Ctx, key2, 1) -// stakeIDs2 = suite.App.IncentivesKeeper.getRefs(suite.Ctx, key2) -// suite.Require().Equal(len(stakeIDs2), 2) -// } diff --git a/x/incentives/keeper/suite_test.go b/x/incentives/keeper/suite_test.go deleted file mode 100644 index 7668ea9b1..000000000 --- a/x/incentives/keeper/suite_test.go +++ /dev/null @@ -1,124 +0,0 @@ -package keeper_test - -import ( - "time" - - "cosmossdk.io/math" - dextypes "github.com/neutron-org/neutron/x/dex/types" - "github.com/neutron-org/neutron/x/incentives/types" - - sdk "github.com/cosmos/cosmos-sdk/types" -) - -type depositStakeSpec struct { - depositSpecs []depositSpec - stakeDistEpochOffset int // used for simulating the time of staking -} - -type depositSpec struct { - addr sdk.AccAddress - token0 sdk.Coin - token1 sdk.Coin - tick int64 - fee uint64 -} - -type gaugeSpec struct { - isPerpetual bool - rewards sdk.Coins - paidOver uint64 - startTick int64 - endTick int64 - pricingTick int64 - startTime time.Time -} - -// AddToGauge adds coins to the specified gauge. -func (suite *IncentivesTestSuite) AddToGauge(coins sdk.Coins, gaugeID uint64) uint64 { - addr := sdk.AccAddress([]byte("addrx---------------")) - suite.FundAcc(addr, coins) - err := suite.App.IncentivesKeeper.AddToGaugeRewards(suite.Ctx, addr, coins, gaugeID) - suite.Require().NoError(err) - return gaugeID -} - -func (suite *IncentivesTestSuite) SetupDeposit(ss []depositSpec) sdk.Coins { - shares := sdk.NewCoins() - for _, s := range ss { - suite.FundAcc(s.addr, sdk.Coins{s.token0, s.token1}) - _, _, indivShares, err := suite.App.DexKeeper.DepositCore( - sdk.WrapSDKContext(suite.Ctx), - dextypes.MustNewPairID(s.token0.Denom, s.token1.Denom), - s.addr, - s.addr, - []math.Int{s.token0.Amount}, - []math.Int{s.token1.Amount}, - []int64{s.tick}, - []uint64{s.fee}, - []*dextypes.DepositOptions{{}}, - ) - suite.Require().NoError(err) - suite.Require().NotEmpty(indivShares) - shares = shares.Add(indivShares...) - } - return shares -} - -func (suite *IncentivesTestSuite) SetupDepositAndStake(s depositStakeSpec) *types.Stake { - shares := suite.SetupDeposit(s.depositSpecs) - return suite.SetupStake(s.depositSpecs[0].addr, shares, s.stakeDistEpochOffset) -} - -// StakeTokens stakes tokens for the specified duration -func (suite *IncentivesTestSuite) SetupStake( - addr sdk.AccAddress, - shares sdk.Coins, - distEpochOffset int, -) *types.Stake { - params := suite.App.IncentivesKeeper.GetParams(suite.Ctx) - epoch := suite.App.EpochsKeeper.GetEpochInfo(suite.Ctx, params.GetDistrEpochIdentifier()) - stake, err := suite.App.IncentivesKeeper.CreateStake( - suite.Ctx, - addr, - shares, - suite.Ctx.BlockTime(), // irrelevant now - epoch.CurrentEpoch+int64(distEpochOffset), - ) - suite.Require().NoError(err) - return stake -} - -// setupNewGauge creates a gauge with the specified duration. -func (suite *IncentivesTestSuite) SetupGauge(s gaugeSpec) *types.Gauge { - addr := sdk.AccAddress([]byte("Gauge_Creation_Addr_")) - - // fund reward tokens - suite.FundAcc(addr, s.rewards) - - // create gauge - gauge, err := suite.App.IncentivesKeeper.CreateGauge( - suite.Ctx, - s.isPerpetual, - addr, - s.rewards, - types.QueryCondition{ - PairID: &dextypes.PairID{ - Token0: "TokenA", - Token1: "TokenB", - }, - StartTick: s.startTick, - EndTick: s.endTick, - }, - s.startTime, - s.paidOver, - s.pricingTick, - ) - suite.Require().NoError(err) - return gauge -} - -func (suite *IncentivesTestSuite) SetupGauges(specs []gaugeSpec) { - for _, s := range specs { - suite.SetupGauge(s) - } -} diff --git a/x/incentives/keeper/utils.go b/x/incentives/keeper/utils.go deleted file mode 100644 index 9a75f8eb2..000000000 --- a/x/incentives/keeper/utils.go +++ /dev/null @@ -1,78 +0,0 @@ -package keeper - -import ( - "encoding/json" - "fmt" - - sdk "github.com/cosmos/cosmos-sdk/types" -) - -// findIndex takes an array of IDs. Then return the index of a specific ID. -func findIndex(ids []uint64, id uint64) int { - for index, inspectID := range ids { - if inspectID == id { - return index - } - } - return -1 -} - -// removeValue takes an array of IDs. Then finds the index of the IDs and remove those IDs from the array. -func removeValue(ids []uint64, id uint64) ([]uint64, int) { - index := findIndex(ids, id) - if index < 0 { - return ids, index - } - ids[index] = ids[len(ids)-1] // set last element to index - return ids[:len(ids)-1], index -} - -// getRefs returns the IDs specified by the provided key. -func (k Keeper) getRefs(ctx sdk.Context, key []byte) []uint64 { - store := ctx.KVStore(k.storeKey) - ids := []uint64{} - if store.Has(key) { - bz := store.Get(key) - err := json.Unmarshal(bz, &ids) - if err != nil { - panic(err) - } - } - return ids -} - -// addRefByKey appends the provided object ID into an array associated with the provided key. -func (k Keeper) addRefByKey(ctx sdk.Context, key []byte, id uint64) error { - store := ctx.KVStore(k.storeKey) - ids := k.getRefs(ctx, key) - if findIndex(ids, id) > -1 { - return fmt.Errorf("object with same ID exists: %d", id) - } - ids = append(ids, id) - bz, err := json.Marshal(ids) - if err != nil { - return err - } - store.Set(key, bz) - return nil -} - -// deleteRefByKey removes the provided object ID from an array associated with the provided key. -func (k Keeper) deleteRefByKey(ctx sdk.Context, key []byte, id uint64) error { - store := ctx.KVStore(k.storeKey) - ids := k.getRefs(ctx, key) - ids, index := removeValue(ids, id) - if index < 0 { - return fmt.Errorf("specific object with ID %d not found by reference %s", id, key) - } - if len(ids) == 0 { - store.Delete(key) - } else { - bz, err := json.Marshal(ids) - if err != nil { - return err - } - store.Set(key, bz) - } - return nil -} diff --git a/x/incentives/keeper/utils_test.go b/x/incentives/keeper/utils_test.go deleted file mode 100644 index 6a63d401e..000000000 --- a/x/incentives/keeper/utils_test.go +++ /dev/null @@ -1,129 +0,0 @@ -package keeper_test - -import ( - "testing" - "time" - - tmproto "github.com/cometbft/cometbft/proto/tendermint/types" - sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/stretchr/testify/require" - - "github.com/neutron-org/neutron/testutil" - dextypes "github.com/neutron-org/neutron/x/dex/types" - . "github.com/neutron-org/neutron/x/incentives/keeper" - "github.com/neutron-org/neutron/x/incentives/types" -) - -func TestCombineKeys(t *testing.T) { - // create three keys, each different byte arrays - key1 := []byte{0x11} - key2 := []byte{0x12} - key3 := []byte{0x13} - - // combine the three keys into a single key - key := types.CombineKeys(key1, key2, key3) - - // three keys plus two separators is equal to a length of 5 - require.Len(t, key, 3+2) - - // ensure the newly created key is made up of the three previous keys (and the two key index separators) - require.Equal(t, key[0], key1[0]) - require.Equal(t, key[1], types.KeyIndexSeparator[0]) - require.Equal(t, key[2], key2[0]) - require.Equal(t, key[3], types.KeyIndexSeparator[0]) - require.Equal(t, key[4], key3[0]) -} - -func TestFindIndex(t *testing.T) { - // create an array of 5 IDs - IDs := []uint64{1, 2, 3, 4, 5} - - // use the FindIndex function to find the index of the respective IDs - // if it doesn't exist, return -1 - require.Equal(t, FindIndex(IDs, 1), 0) - require.Equal(t, FindIndex(IDs, 3), 2) - require.Equal(t, FindIndex(IDs, 5), 4) - require.Equal(t, FindIndex(IDs, 6), -1) -} - -func TestRemoveValue(t *testing.T) { - // create an array of 5 IDs - IDs := []uint64{1, 2, 3, 4, 5} - - // remove an ID - // ensure if ID exists, the length is reduced by one and the index of the removed ID is returned - IDs, index1 := RemoveValue(IDs, 5) - require.Len(t, IDs, 4) - require.Equal(t, index1, 4) - IDs, index2 := RemoveValue(IDs, 3) - require.Len(t, IDs, 3) - require.Equal(t, index2, 2) - IDs, index3 := RemoveValue(IDs, 1) - require.Len(t, IDs, 2) - require.Equal(t, index3, 0) - IDs, index4 := RemoveValue(IDs, 6) - require.Len(t, IDs, 2) - require.Equal(t, index4, -1) -} - -func TestStakeRefKeys(t *testing.T) { - addr1 := sdk.AccAddress([]byte("addr1---------------")) - app := testutil.Setup(t) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) - - pool1, err := app.DexKeeper.InitPool(ctx, &dextypes.PairID{Token0: "TokenA", Token1: "TokenB"}, 0, 1) - require.NoError(t, err) - - denom1 := pool1.GetPoolDenom() - - pool2, err := app.DexKeeper.InitPool(ctx, &dextypes.PairID{Token0: "TokenA", Token1: "TokenC"}, 0, 1) - require.NoError(t, err) - - denom2 := pool2.GetPoolDenom() - - // empty address and 1 coin - stake1 := types.NewStake( - 1, - sdk.AccAddress{}, - sdk.Coins{sdk.NewInt64Coin(denom1, 10)}, - time.Now(), - 10, - ) - _, err = app.IncentivesKeeper.GetStakeRefKeys(ctx, stake1) - require.Error(t, err) - - // empty address and 2 coins - stake2 := types.NewStake( - 1, - sdk.AccAddress{}, - sdk.Coins{sdk.NewInt64Coin(denom1, 10), sdk.NewInt64Coin(denom2, 1)}, - time.Now(), - 10, - ) - _, err = app.IncentivesKeeper.GetStakeRefKeys(ctx, stake2) - require.Error(t, err) - - // not empty address and 1 coin - stake3 := types.NewStake(1, addr1, sdk.Coins{sdk.NewInt64Coin(denom1, 10)}, time.Now(), 10) - keys3, err := app.IncentivesKeeper.GetStakeRefKeys(ctx, stake3) - require.NoError(t, err) - require.Len(t, keys3, 6) - - // not empty address and empty coin - stake4 := types.NewStake(1, addr1, sdk.Coins{sdk.NewInt64Coin(denom1, 10)}, time.Now(), 10) - keys4, err := app.IncentivesKeeper.GetStakeRefKeys(ctx, stake4) - require.NoError(t, err) - require.Len(t, keys4, 6) - - // not empty address and 2 coins - stake5 := types.NewStake( - 1, - addr1, - sdk.Coins{sdk.NewInt64Coin(denom1, 10), sdk.NewInt64Coin(denom2, 1)}, - time.Now(), - 10, - ) - keys5, err := app.IncentivesKeeper.GetStakeRefKeys(ctx, stake5) - require.NoError(t, err) - require.Len(t, keys5, 10) -} diff --git a/x/incentives/module.go b/x/incentives/module.go deleted file mode 100644 index 9fdfc6439..000000000 --- a/x/incentives/module.go +++ /dev/null @@ -1,180 +0,0 @@ -/* -Incentives module provides general interface to give yield to stakers. The yield to be given -to stakers are stored in gauges and is distributed on epoch basis -to the stakers who meet specific conditions. - - Gauge queries, gauge creation and add tokens to gauge - - Upcoming-gauges related queries - - Gauge infos and gauge queues -*/package incentives - -import ( - "context" - "encoding/json" - "fmt" - - abci "github.com/cometbft/cometbft/abci/types" - "github.com/gorilla/mux" - "github.com/grpc-ecosystem/grpc-gateway/runtime" - "github.com/spf13/cobra" - - "github.com/cosmos/cosmos-sdk/client" - "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/module" - stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - - "github.com/neutron-org/neutron/x/incentives/client/cli" - "github.com/neutron-org/neutron/x/incentives/keeper" - "github.com/neutron-org/neutron/x/incentives/types" -) - -var ( - _ module.AppModule = AppModule{} - _ module.AppModuleBasic = AppModuleBasic{} -) - -// ---------------------------------------------------------------------------- -// AppModuleBasic -// ---------------------------------------------------------------------------- - -// Implements the AppModuleBasic interface for the module. -type AppModuleBasic struct{} - -// NewAppModuleBasic creates a new AppModuleBasic struct. -func NewAppModuleBasic() AppModuleBasic { - return AppModuleBasic{} -} - -// Name returns the module's name. -func (AppModuleBasic) Name() string { - return types.ModuleName -} - -// RegisterLegacyAminoCodec registers the module's types on the LegacyAmino codec. -func (AppModuleBasic) RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) { - types.RegisterCodec(cdc) -} - -// RegisterInterfaces registers the module's interface types. -func (a AppModuleBasic) RegisterInterfaces(reg cdctypes.InterfaceRegistry) { - types.RegisterInterfaces(reg) -} - -// DefaultGenesis returns the module's default genesis state. -func (AppModuleBasic) DefaultGenesis(cdc codec.JSONCodec) json.RawMessage { - return cdc.MustMarshalJSON(types.DefaultGenesis()) -} - -// ValidateGenesis performs genesis state validation for the module. -func (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() -} - -// RegisterRESTRoutes registers the module's REST service handlers. -func (AppModuleBasic) RegisterRESTRoutes(_ client.Context, _ *mux.Router) { -} - -// RegisterGRPCGatewayRoutes registers the gRPC Gateway routes for the module. -func (AppModuleBasic) RegisterGRPCGatewayRoutes(clientCtx client.Context, mux *runtime.ServeMux) { - if err := types.RegisterQueryHandlerClient(context.Background(), mux, types.NewQueryClient(clientCtx)); err != nil { - return - } -} - -// GetTxCmd returns the module's root tx command. -func (a AppModuleBasic) GetTxCmd() *cobra.Command { - return cli.GetTxCmd() -} - -// GetQueryCmd returns the module's root query command. -func (AppModuleBasic) GetQueryCmd() *cobra.Command { - return cli.GetQueryCmd() -} - -// ---------------------------------------------------------------------------- -// AppModule -// ---------------------------------------------------------------------------- - -// AppModule implements the AppModule interface for the module. -type AppModule struct { - AppModuleBasic - - keeper *keeper.Keeper - - accountKeeper stakingtypes.AccountKeeper - bankKeeper stakingtypes.BankKeeper - epochKeeper types.EpochKeeper -} - -// NewAppModule creates a new AppModule struct. -func NewAppModule(keeper *keeper.Keeper, - accountKeeper stakingtypes.AccountKeeper, bankKeeper stakingtypes.BankKeeper, - epochKeeper types.EpochKeeper, -) AppModule { - return AppModule{ - AppModuleBasic: NewAppModuleBasic(), - keeper: keeper, - accountKeeper: accountKeeper, - bankKeeper: bankKeeper, - epochKeeper: epochKeeper, - } -} - -// Name returns the module's name. -func (am AppModule) Name() string { - return am.AppModuleBasic.Name() -} - -// QuerierRoute returns the module's query routing key. -func (AppModule) QuerierRoute() string { return types.QuerierRoute } - -// RegisterServices registers the module's services. -func (am AppModule) RegisterServices(cfg module.Configurator) { - types.RegisterMsgServer(cfg.MsgServer(), keeper.NewMsgServerImpl(am.keeper)) - types.RegisterQueryServer(cfg.QueryServer(), keeper.NewQueryServer(am.keeper)) -} - -// RegisterInvariants registers the module's invariants. -func (am AppModule) RegisterInvariants(_ sdk.InvariantRegistry) {} - -// InitGenesis performs the module's genesis initialization. -// Returns an empty ValidatorUpdate array. -func (am AppModule) InitGenesis( - ctx sdk.Context, - cdc codec.JSONCodec, - gs json.RawMessage, -) []abci.ValidatorUpdate { - var genState types.GenesisState - // initialize global index to index in genesis state. - cdc.MustUnmarshalJSON(gs, &genState) - - am.keeper.InitGenesis(ctx, genState) - - return []abci.ValidatorUpdate{} -} - -// ExportGenesis returns the module's exported genesis state as raw JSON bytes. -func (am AppModule) ExportGenesis(ctx sdk.Context, cdc codec.JSONCodec) json.RawMessage { - return cdc.MustMarshalJSON(am.keeper.ExportGenesis(ctx)) -} - -// BeginBlock executes all ABCI BeginBlock logic respective to the module. -func (am AppModule) BeginBlock(_ sdk.Context, _ abci.RequestBeginBlock) {} - -// EndBlock executes all ABCI EndBlock logic respective to the module. -// Returns a nil validatorUpdate struct array. -func (am AppModule) EndBlock(_ sdk.Context, _ abci.RequestEndBlock) []abci.ValidatorUpdate { - return []abci.ValidatorUpdate{} -} - -// ConsensusVersion implements AppModule/ConsensusVersion. -func (AppModule) ConsensusVersion() uint64 { return 1 } diff --git a/x/incentives/module_simulation.go b/x/incentives/module_simulation.go deleted file mode 100644 index c79664124..000000000 --- a/x/incentives/module_simulation.go +++ /dev/null @@ -1,33 +0,0 @@ -package incentives - -import ( - "github.com/CosmWasm/wasmd/x/wasm/simulation" - sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/types/module" - simtypes "github.com/cosmos/cosmos-sdk/types/simulation" -) - -// AppModuleSimulation functions - -// GenerateGenesisState creates a randomized GenState of the incentives module. -func (AppModule) GenerateGenesisState(simState *module.SimulationState) { - simulation.RandomizedGenState(simState) -} - -// ProposalContents returns nil for governance proposals contents. -// Should eventually be deleted in a future update. -func (AppModule) ProposalContents( - _ module.SimulationState, -) []simtypes.WeightedProposalMsg { - return nil -} - -// RegisterStoreDecoder has an unknown purpose. Should eventually be deleted in a future update. -func (am AppModule) RegisterStoreDecoder(_ sdk.StoreDecoderRegistry) { -} - -// WeightedOperations returns the all the module's operations with their respective weights. -func (am AppModule) WeightedOperations(_ module.SimulationState) []simtypes.WeightedOperation { - operations := make([]simtypes.WeightedOperation, 0) - return operations -} diff --git a/x/incentives/types/account_history.pb.go b/x/incentives/types/account_history.pb.go deleted file mode 100644 index de7676f41..000000000 --- a/x/incentives/types/account_history.pb.go +++ /dev/null @@ -1,391 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: neutron/incentives/account_history.proto - -package types - -import ( - fmt "fmt" - github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" - types "github.com/cosmos/cosmos-sdk/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 - -// Describes the total distributions to an account over time -type AccountHistory struct { - // the address of this account - Account string `protobuf:"bytes,1,opt,name=account,proto3" json:"account,omitempty"` - // coins describes the total amount of coins that have been distributed to this user over time - Coins github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,2,rep,name=coins,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"coins"` -} - -func (m *AccountHistory) Reset() { *m = AccountHistory{} } -func (m *AccountHistory) String() string { return proto.CompactTextString(m) } -func (*AccountHistory) ProtoMessage() {} -func (*AccountHistory) Descriptor() ([]byte, []int) { - return fileDescriptor_6b167edf56b0451f, []int{0} -} -func (m *AccountHistory) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *AccountHistory) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_AccountHistory.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 *AccountHistory) XXX_Merge(src proto.Message) { - xxx_messageInfo_AccountHistory.Merge(m, src) -} -func (m *AccountHistory) XXX_Size() int { - return m.Size() -} -func (m *AccountHistory) XXX_DiscardUnknown() { - xxx_messageInfo_AccountHistory.DiscardUnknown(m) -} - -var xxx_messageInfo_AccountHistory proto.InternalMessageInfo - -func (m *AccountHistory) GetAccount() string { - if m != nil { - return m.Account - } - return "" -} - -func (m *AccountHistory) GetCoins() github_com_cosmos_cosmos_sdk_types.Coins { - if m != nil { - return m.Coins - } - return nil -} - -func init() { - proto.RegisterType((*AccountHistory)(nil), "neutron.incentives.AccountHistory") -} - -func init() { - proto.RegisterFile("neutron/incentives/account_history.proto", fileDescriptor_6b167edf56b0451f) -} - -var fileDescriptor_6b167edf56b0451f = []byte{ - // 262 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0xc8, 0x4b, 0x2d, 0x2d, - 0x29, 0xca, 0xcf, 0xd3, 0xcf, 0xcc, 0x4b, 0x4e, 0xcd, 0x2b, 0xc9, 0x2c, 0x4b, 0x2d, 0xd6, 0x4f, - 0x4c, 0x4e, 0xce, 0x2f, 0xcd, 0x2b, 0x89, 0xcf, 0xc8, 0x2c, 0x2e, 0xc9, 0x2f, 0xaa, 0xd4, 0x2b, - 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x82, 0xaa, 0xd4, 0x43, 0xa8, 0x94, 0x12, 0x49, 0xcf, 0x4f, - 0xcf, 0x07, 0x4b, 0xeb, 0x83, 0x58, 0x10, 0x95, 0x52, 0x72, 0xc9, 0xf9, 0xc5, 0xb9, 0xf9, 0xc5, - 0xfa, 0x49, 0x89, 0xc5, 0xa9, 0xfa, 0x65, 0x86, 0x49, 0xa9, 0x25, 0x89, 0x86, 0xfa, 0xc9, 0xf9, - 0x99, 0x79, 0x10, 0x79, 0xa5, 0x5e, 0x46, 0x2e, 0x3e, 0x47, 0x88, 0x1d, 0x1e, 0x10, 0x2b, 0x84, - 0x24, 0xb8, 0xd8, 0xa1, 0xb6, 0x4a, 0x30, 0x2a, 0x30, 0x6a, 0x70, 0x06, 0xc1, 0xb8, 0x42, 0x89, - 0x5c, 0xac, 0x20, 0xad, 0xc5, 0x12, 0x4c, 0x0a, 0xcc, 0x1a, 0xdc, 0x46, 0x92, 0x7a, 0x10, 0xc3, - 0xf5, 0x40, 0x86, 0xeb, 0x41, 0x0d, 0xd7, 0x73, 0xce, 0xcf, 0xcc, 0x73, 0x32, 0x38, 0x71, 0x4f, - 0x9e, 0x61, 0xd5, 0x7d, 0x79, 0x8d, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, - 0x7d, 0xa8, 0x4b, 0x20, 0x94, 0x6e, 0x71, 0x4a, 0xb6, 0x7e, 0x49, 0x65, 0x41, 0x6a, 0x31, 0x58, - 0x43, 0x71, 0x10, 0xc4, 0x64, 0x27, 0xef, 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, 0x44, 0x32, 0x0a, 0xea, 0x7d, 0xdd, 0xfc, 0xa2, 0x74, 0x18, 0x5b, 0xbf, 0x02, 0x39, - 0xd8, 0xc0, 0x26, 0x27, 0xb1, 0x81, 0xfd, 0x68, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x43, 0xc5, - 0xdc, 0x5f, 0x59, 0x01, 0x00, 0x00, -} - -func (m *AccountHistory) 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 *AccountHistory) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *AccountHistory) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Coins) > 0 { - for iNdEx := len(m.Coins) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Coins[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintAccountHistory(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - } - if len(m.Account) > 0 { - i -= len(m.Account) - copy(dAtA[i:], m.Account) - i = encodeVarintAccountHistory(dAtA, i, uint64(len(m.Account))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func encodeVarintAccountHistory(dAtA []byte, offset int, v uint64) int { - offset -= sovAccountHistory(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func (m *AccountHistory) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Account) - if l > 0 { - n += 1 + l + sovAccountHistory(uint64(l)) - } - if len(m.Coins) > 0 { - for _, e := range m.Coins { - l = e.Size() - n += 1 + l + sovAccountHistory(uint64(l)) - } - } - return n -} - -func sovAccountHistory(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozAccountHistory(x uint64) (n int) { - return sovAccountHistory(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (m *AccountHistory) 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 ErrIntOverflowAccountHistory - } - 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: AccountHistory: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: AccountHistory: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Account", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowAccountHistory - } - 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 ErrInvalidLengthAccountHistory - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthAccountHistory - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Account = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Coins", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowAccountHistory - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthAccountHistory - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthAccountHistory - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Coins = append(m.Coins, types.Coin{}) - if err := m.Coins[len(m.Coins)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipAccountHistory(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthAccountHistory - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func skipAccountHistory(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, ErrIntOverflowAccountHistory - } - 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, ErrIntOverflowAccountHistory - } - 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, ErrIntOverflowAccountHistory - } - 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, ErrInvalidLengthAccountHistory - } - iNdEx += length - case 3: - depth++ - case 4: - if depth == 0 { - return 0, ErrUnexpectedEndOfGroupAccountHistory - } - depth-- - case 5: - iNdEx += 4 - default: - return 0, fmt.Errorf("proto: illegal wireType %d", wireType) - } - if iNdEx < 0 { - return 0, ErrInvalidLengthAccountHistory - } - if depth == 0 { - return iNdEx, nil - } - } - return 0, io.ErrUnexpectedEOF -} - -var ( - ErrInvalidLengthAccountHistory = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowAccountHistory = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupAccountHistory = fmt.Errorf("proto: unexpected end of group") -) diff --git a/x/incentives/types/codec.go b/x/incentives/types/codec.go deleted file mode 100644 index d58ef0655..000000000 --- a/x/incentives/types/codec.go +++ /dev/null @@ -1,35 +0,0 @@ -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" -) - -var ( - amino = codec.NewLegacyAmino() - ModuleCdc = codec.NewAminoCodec(amino) -) - -// RegisterCodec registers the necessary x/incentives interfaces and concrete types on the provided -// LegacyAmino codec. These types are used for Amino JSON serialization. -func RegisterCodec(cdc *codec.LegacyAmino) { - cdc.RegisterConcrete(&MsgCreateGauge{}, "neutron/incentives/create-gauge", nil) - cdc.RegisterConcrete(&MsgAddToGauge{}, "neutron/incentives/add-to-gauge", nil) - cdc.RegisterConcrete(&MsgStake{}, "neutron/stake/stake-tokens", nil) - cdc.RegisterConcrete(&MsgUnstake{}, "neutron/stake/begin-unstake-period-stake", nil) -} - -// RegisterInterfaces registers interfaces and implementations of the incentives module. -func RegisterInterfaces(registry cdctypes.InterfaceRegistry) { - registry.RegisterImplementations( - (*sdk.Msg)(nil), - &MsgCreateGauge{}, - &MsgAddToGauge{}, - &MsgStake{}, - &MsgUnstake{}, - ) - - msgservice.RegisterMsgServiceDesc(registry, &_Msg_serviceDesc) -} diff --git a/x/incentives/types/distribution_spec.go b/x/incentives/types/distribution_spec.go deleted file mode 100644 index ecb89dac7..000000000 --- a/x/incentives/types/distribution_spec.go +++ /dev/null @@ -1,25 +0,0 @@ -package types - -import sdk "github.com/cosmos/cosmos-sdk/types" - -type DistributionSpec map[string]sdk.Coins - -func (spec *DistributionSpec) Add(other DistributionSpec) DistributionSpec { - result := *spec - for k, v := range other { - if vv, ok := result[k]; ok { - result[k] = vv.Add(v...) - } else { - result[k] = v - } - } - return result -} - -func (spec DistributionSpec) GetTotal() sdk.Coins { - coins := sdk.Coins{} - for _, v := range spec { - coins = coins.Add(v...) - } - return coins -} diff --git a/x/incentives/types/distribution_spec_test.go b/x/incentives/types/distribution_spec_test.go deleted file mode 100644 index 942173480..000000000 --- a/x/incentives/types/distribution_spec_test.go +++ /dev/null @@ -1,44 +0,0 @@ -package types_test - -import ( - "testing" - - sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/stretchr/testify/assert" - - "github.com/neutron-org/neutron/x/incentives/types" -) - -func TestDistributionSpec_Add(t *testing.T) { - spec1 := types.DistributionSpec{ - "alice": sdk.Coins{sdk.NewInt64Coin("coin1", 100), sdk.NewInt64Coin("coin2", 200)}, - "bob": sdk.Coins{sdk.NewInt64Coin("coin1", 300), sdk.NewInt64Coin("coin2", 400)}, - } - - spec2 := types.DistributionSpec{ - "alice": sdk.Coins{sdk.NewInt64Coin("coin1", 100), sdk.NewInt64Coin("coin2", 200)}, - "carol": sdk.Coins{sdk.NewInt64Coin("coin1", 500), sdk.NewInt64Coin("coin2", 600)}, - } - - expected := types.DistributionSpec{ - "alice": sdk.Coins{sdk.NewInt64Coin("coin1", 200), sdk.NewInt64Coin("coin2", 400)}, - "bob": sdk.Coins{sdk.NewInt64Coin("coin1", 300), sdk.NewInt64Coin("coin2", 400)}, - "carol": sdk.Coins{sdk.NewInt64Coin("coin1", 500), sdk.NewInt64Coin("coin2", 600)}, - } - - result := spec1.Add(spec2) - assert.Equal(t, expected, result) -} - -func TestDistributionSpec_GetTotal(t *testing.T) { - spec := types.DistributionSpec{ - "alice": sdk.Coins{sdk.NewInt64Coin("coin1", 100), sdk.NewInt64Coin("coin2", 200)}, - "bob": sdk.Coins{sdk.NewInt64Coin("coin1", 300), sdk.NewInt64Coin("coin2", 400)}, - "carol": sdk.Coins{sdk.NewInt64Coin("coin1", 500), sdk.NewInt64Coin("coin2", 600)}, - } - - expected := sdk.Coins{sdk.NewInt64Coin("coin1", 900), sdk.NewInt64Coin("coin2", 1200)} - - total := spec.GetTotal() - assert.Equal(t, expected, total) -} diff --git a/x/incentives/types/errors.go b/x/incentives/types/errors.go deleted file mode 100644 index f54f5c663..000000000 --- a/x/incentives/types/errors.go +++ /dev/null @@ -1,53 +0,0 @@ -package types - -// DONTCOVER - -import ( - sdkerrors "cosmossdk.io/errors" -) - -// x/incentives module sentinel errors. -var ( - ErrNotStakeOwner = sdkerrors.Register( - ModuleName, - 1, - "msg sender is not the owner of specified stake", - ) - ErrStakeNotFound = sdkerrors.Register(ModuleName, 2, "stake not found") - ErrGaugeNotActive = sdkerrors.Register( - ModuleName, - 3, - "cannot distribute from gauges when it is not active", - ) - ErrInvalidGaugeStatus = sdkerrors.Register( - ModuleName, - 4, - "Gauge status filter must be one of: ACTIVE_UPCOMING, ACTIVE, UPCOMING, FINISHED", - ) - ErrMaxGaugesReached = sdkerrors.Register( - ModuleName, - 5, - "Gauge limit has been reached; additional gauges may be created once the gauge limit has been raised via governance proposal", - ) - ErrGaugePricingTickOutOfRange = sdkerrors.Register( - ModuleName, - 6, - "cannot use an invalid price tick", - ) - ErrGaugeDistrToTickOutOfRange = sdkerrors.Register(ModuleName, 7, "cannot use an distrTo tick") - ErrInvalidSigner = sdkerrors.Register( - ModuleName, - 8, - "owner must be module authority", - ) - ErrInvalidRequest = sdkerrors.Register( - ModuleName, - 9, - "invalid request", - ) - ErrInvalidAddress = sdkerrors.Register( - ModuleName, - 10, - "Invalid Address", - ) -) diff --git a/x/incentives/types/events.go b/x/incentives/types/events.go deleted file mode 100644 index c03383fed..000000000 --- a/x/incentives/types/events.go +++ /dev/null @@ -1,21 +0,0 @@ -package types - -// Incentive module event types. -const ( - TypeEvtCreateGauge = "create_gauge" - TypeEvtAddToGauge = "add_to_gauge" - TypeEvtDistribution = "distribution" - - AttributeGaugeID = "gauge_id" - AttributeReceiver = "receiver" - AttributeAmount = "amount" - - TypeEvtStake = "stake" - TypeEvtUnstake = "unstake" - - AttributeStakeID = "stake_id" - AttributeStakeOwner = "owner" - AttributeStakeAmount = "amount" - AttributeStakeStakeTime = "stake_time" - AttributeUnstakedCoins = "unstaked_coins" -) diff --git a/x/incentives/types/expected_keepers.go b/x/incentives/types/expected_keepers.go deleted file mode 100644 index 4e11a97ff..000000000 --- a/x/incentives/types/expected_keepers.go +++ /dev/null @@ -1,33 +0,0 @@ -package types - -import ( - authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - dextypes "github.com/neutron-org/neutron/x/dex/types" - epochstypes "github.com/neutron-org/neutron/x/epochs/types" - - sdk "github.com/cosmos/cosmos-sdk/types" -) - -// BankKeeper defines the expected interface needed to retrieve account balances. -type BankKeeper interface { - GetAllBalances(ctx sdk.Context, addr sdk.AccAddress) sdk.Coins - GetSupply(ctx sdk.Context, denom string) sdk.Coin - - SendCoinsFromModuleToAccount(ctx sdk.Context, senderModule string, recipientAddr sdk.AccAddress, amt sdk.Coins) error - SendCoinsFromAccountToModule(ctx sdk.Context, senderAddr sdk.AccAddress, recipientModule string, amt sdk.Coins) error -} - -// EpochKeeper defines the expected interface needed to retrieve epoch info. -type EpochKeeper interface { - GetEpochInfo(ctx sdk.Context, identifier string) epochstypes.EpochInfo -} - -type AccountKeeper interface { - GetModuleAccount(ctx sdk.Context, moduleName string) authtypes.ModuleAccountI - GetModuleAddress(moduleName string) sdk.AccAddress -} - -type DexKeeper interface { - GetOrInitPool(ctx sdk.Context, pairID *dextypes.PairID, centerTickIndex int64, fee uint64) (*dextypes.Pool, error) - GetPoolMetadataByDenom(ctx sdk.Context, id string) (dextypes.PoolMetadata, error) -} diff --git a/x/incentives/types/gauge.go b/x/incentives/types/gauge.go deleted file mode 100644 index 94a43dc16..000000000 --- a/x/incentives/types/gauge.go +++ /dev/null @@ -1,83 +0,0 @@ -package types - -import ( - time "time" - - "cosmossdk.io/math" - sdk "github.com/cosmos/cosmos-sdk/types" -) - -// NewGauge creates a new gauge struct given the required gauge parameters. -func NewGauge( - id uint64, - isPerpetual bool, - distrTo QueryCondition, - coins sdk.Coins, - startTime time.Time, - numEpochsPaidOver uint64, - filledEpochs uint64, - distCoins sdk.Coins, - pricingTick int64, -) Gauge { - return Gauge{ - Id: id, - IsPerpetual: isPerpetual, - DistributeTo: distrTo, - Coins: coins, - StartTime: startTime, - NumEpochsPaidOver: numEpochsPaidOver, - FilledEpochs: filledEpochs, - DistributedCoins: distCoins, - PricingTick: pricingTick, - } -} - -func (gauge Gauge) hasEpochsRemaining() bool { - return gauge.IsPerpetual || gauge.FilledEpochs < gauge.NumEpochsPaidOver -} - -func (gauge Gauge) hasStarted(now time.Time) bool { - return !now.Before(gauge.StartTime) -} - -// IsUpcomingGauge returns true if the gauge's distribution start time is after the provided time. -func (gauge Gauge) IsUpcomingGauge(now time.Time) bool { - return !gauge.hasStarted(now) && gauge.hasEpochsRemaining() -} - -// IsActiveGauge returns true if the gauge is in an active state during the provided time. -func (gauge Gauge) IsActiveGauge(now time.Time) bool { - return gauge.hasStarted(now) && gauge.hasEpochsRemaining() -} - -// IsFinishedGauge returns true if the gauge is in a finished state during the provided time. -func (gauge Gauge) IsFinishedGauge(now time.Time) bool { - return gauge.hasStarted(now) && !gauge.hasEpochsRemaining() -} - -func (gauge Gauge) RewardsNextEpoch() sdk.Coins { - result := sdk.Coins{} - epochsRemaining := gauge.EpochsRemaining() - if epochsRemaining == 0 { - return result - } - - for _, rewardRemainingCoin := range gauge.CoinsRemaining() { - amount := rewardRemainingCoin.Amount.Quo(math.NewInt(int64(epochsRemaining))) - result = result.Add(sdk.Coin{Denom: rewardRemainingCoin.Denom, Amount: amount}) - } - - return result -} - -func (gauge Gauge) EpochsRemaining() uint64 { - if !gauge.IsPerpetual { - return gauge.NumEpochsPaidOver - gauge.FilledEpochs - } - - return 1 -} - -func (gauge Gauge) CoinsRemaining() sdk.Coins { - return gauge.Coins.Sub(gauge.DistributedCoins...) -} diff --git a/x/incentives/types/gauge.pb.go b/x/incentives/types/gauge.pb.go deleted file mode 100644 index 5265a1dc6..000000000 --- a/x/incentives/types/gauge.pb.go +++ /dev/null @@ -1,1021 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: neutron/incentives/gauge.proto - -package types - -import ( - fmt "fmt" - github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" - types "github.com/cosmos/cosmos-sdk/types" - _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" - github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" - types1 "github.com/neutron-org/neutron/x/dex/types" - _ "google.golang.org/protobuf/types/known/durationpb" - _ "google.golang.org/protobuf/types/known/timestamppb" - io "io" - math "math" - math_bits "math/bits" - time "time" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf -var _ = time.Kitchen - -// 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 - -// Gauge is an object that describes an LP incentivization plan and its state. -type Gauge struct { - // id is the unique ID of a Gauge - Id uint64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` - // There are two kinds of gauges: perpetual and non-perpetual. Perpetual - // gauges describe an incentivization program for which the token rewards - // distributed on any given day must be added to the gauge prior to that day's - // distribution using an AddToGauge message. When distribute is called on a - // perpetual gauge, all of the remaining rewards in the gauge are distributed. - // Because of this, all perpetual gauges must have `num_epochs_paid_over` set - // to 1. A non-perpetual gauge by contrast distributes its rewards over a - // schedule as determined by `num_epochs_paid_over`. If a non-perpetual gauge - // is created with coins=[100atom] and num_epochs_paid_over=10, this means - // that for 10 days (10 epochs) the gauge will distribute 10atom each day to - // the staked LP positions qualifying for the gauge. - IsPerpetual bool `protobuf:"varint,2,opt,name=is_perpetual,json=isPerpetual,proto3" json:"is_perpetual,omitempty"` - // distribute_to describes a set of staked LP positions that should be - // distributed to from this gauge. - DistributeTo QueryCondition `protobuf:"bytes,3,opt,name=distribute_to,json=distributeTo,proto3" json:"distribute_to"` - // coins describes the total amount of coins that have been added to this - // gauge for distribution. - Coins github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,4,rep,name=coins,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"coins"` - // start_time describes when this gauge should begin distributing rewards. - // This allows gauge creators to schedule gauges into the future, in the event - // that an earlier gauge is expected to expire. - StartTime time.Time `protobuf:"bytes,5,opt,name=start_time,json=startTime,proto3,stdtime" json:"start_time" yaml:"start_time"` - // num_epochs_paid_over is the number of total epochs (days) the rewards in - // this gauge will be distributed over. - NumEpochsPaidOver uint64 `protobuf:"varint,6,opt,name=num_epochs_paid_over,json=numEpochsPaidOver,proto3" json:"num_epochs_paid_over,omitempty"` - // filled_epochs describes the number of epochs distribution have been completed - // already - FilledEpochs uint64 `protobuf:"varint,7,opt,name=filled_epochs,json=filledEpochs,proto3" json:"filled_epochs,omitempty"` - // distributed_coins describes coins that have been distributed already from - // this gauge. - DistributedCoins github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,8,rep,name=distributed_coins,json=distributedCoins,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"distributed_coins"` - // pricing_tick is necessary for fairly distributing rewards over a range of - // ticks. Without pricing_tick, we might naively distribute rewards in - // proportion to the number of deposit shares staked within the gauge's - // qualifying tick range. - // - // For example, a gauge with a distribute_to tick range of [-10, 10] would - // distribute to staked LP tokens where both tick-fee and tick+fee are within - // [-10, 10]. Let's say for pair "tokenA<>tokenB", the current trading tick is - // 0. If Alice were to LP (10tokenA, 0tokenB) @ tick -8, fee 2, this would - // mean Alice would be issued 10 shares (10 + 0 * 1.0001^-8), since shares are - // in terms of token0. Let's further assume Bob LPs (0tokenA, 10tokenB) @ tick - // 8, fee 2, such that Bob is issued 10.008 shares (0 + 10 * 1.0001^8). Under - // this naive approach, if Alice and Bob were to stake their shares, Bob would - // receive more in rewards, purely on the basis of the relative locations of - // their liquidity. - // - // This disparity originates in the fact that LP deposit denominations are not - // fungible across ticks. To avoid this, we can use a single price throughout - // the gauge's tick range for relating the relative value of token0 and - // token1, as specified by pricing_tick. - // - // Let's run through the earier example using the more sophisticated approach, - // where the gauge has pricing_tick set to 0. For the purpose of calculating - // reward distribution weight, Alice's shares are worth 10 + 0 * 1.0001^0 = 10 - // and Bob's shares are worth 0 + 10 * 1.0001^0 = 10. With the distribution - // weight of both shares set according to a gauge-specific tick, we do not - // distribute more or less rewards according to the relative location of - // liquidity within the gauge's tick range, freeing users to place liquidity - // whereever they deem most profitable in the gauge's range and still equally - // qualify for rewards. - PricingTick int64 `protobuf:"varint,9,opt,name=pricing_tick,json=pricingTick,proto3" json:"pricing_tick,omitempty"` -} - -func (m *Gauge) Reset() { *m = Gauge{} } -func (m *Gauge) String() string { return proto.CompactTextString(m) } -func (*Gauge) ProtoMessage() {} -func (*Gauge) Descriptor() ([]byte, []int) { - return fileDescriptor_2467fab98b594cb6, []int{0} -} -func (m *Gauge) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *Gauge) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_Gauge.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 *Gauge) XXX_Merge(src proto.Message) { - xxx_messageInfo_Gauge.Merge(m, src) -} -func (m *Gauge) XXX_Size() int { - return m.Size() -} -func (m *Gauge) XXX_DiscardUnknown() { - xxx_messageInfo_Gauge.DiscardUnknown(m) -} - -var xxx_messageInfo_Gauge proto.InternalMessageInfo - -func (m *Gauge) GetId() uint64 { - if m != nil { - return m.Id - } - return 0 -} - -func (m *Gauge) GetIsPerpetual() bool { - if m != nil { - return m.IsPerpetual - } - return false -} - -func (m *Gauge) GetDistributeTo() QueryCondition { - if m != nil { - return m.DistributeTo - } - return QueryCondition{} -} - -func (m *Gauge) GetCoins() github_com_cosmos_cosmos_sdk_types.Coins { - if m != nil { - return m.Coins - } - return nil -} - -func (m *Gauge) GetStartTime() time.Time { - if m != nil { - return m.StartTime - } - return time.Time{} -} - -func (m *Gauge) GetNumEpochsPaidOver() uint64 { - if m != nil { - return m.NumEpochsPaidOver - } - return 0 -} - -func (m *Gauge) GetFilledEpochs() uint64 { - if m != nil { - return m.FilledEpochs - } - return 0 -} - -func (m *Gauge) GetDistributedCoins() github_com_cosmos_cosmos_sdk_types.Coins { - if m != nil { - return m.DistributedCoins - } - return nil -} - -func (m *Gauge) GetPricingTick() int64 { - if m != nil { - return m.PricingTick - } - return 0 -} - -// QueryCondition describes a set of staked LP positions that a gauge is -// configured to distribute to. LP tokens qualifying for a given QueryCondition -// must have both tick-fee and tick+fee fall within the range [startTick, endTick], -// such that all of the tradable liquidity for the pool is within that range. -type QueryCondition struct { - // pairID is the token pair which should be distributed to. - PairID *types1.PairID `protobuf:"bytes,1,opt,name=pairID,proto3" json:"pairID,omitempty"` - // start_tick is the inclusive lower bound on the location of LP tokens that - // qualify for a gauge's distribution. - StartTick int64 `protobuf:"varint,2,opt,name=startTick,proto3" json:"startTick,omitempty"` - // end_tick is the inclusive upper bound on the location of LP tokens that - // qualify for a gauge's distribution. - EndTick int64 `protobuf:"varint,3,opt,name=endTick,proto3" json:"endTick,omitempty"` -} - -func (m *QueryCondition) Reset() { *m = QueryCondition{} } -func (m *QueryCondition) String() string { return proto.CompactTextString(m) } -func (*QueryCondition) ProtoMessage() {} -func (*QueryCondition) Descriptor() ([]byte, []int) { - return fileDescriptor_2467fab98b594cb6, []int{1} -} -func (m *QueryCondition) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *QueryCondition) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_QueryCondition.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 *QueryCondition) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryCondition.Merge(m, src) -} -func (m *QueryCondition) XXX_Size() int { - return m.Size() -} -func (m *QueryCondition) XXX_DiscardUnknown() { - xxx_messageInfo_QueryCondition.DiscardUnknown(m) -} - -var xxx_messageInfo_QueryCondition proto.InternalMessageInfo - -func (m *QueryCondition) GetPairID() *types1.PairID { - if m != nil { - return m.PairID - } - return nil -} - -func (m *QueryCondition) GetStartTick() int64 { - if m != nil { - return m.StartTick - } - return 0 -} - -func (m *QueryCondition) GetEndTick() int64 { - if m != nil { - return m.EndTick - } - return 0 -} - -func init() { - proto.RegisterType((*Gauge)(nil), "neutron.incentives.Gauge") - proto.RegisterType((*QueryCondition)(nil), "neutron.incentives.QueryCondition") -} - -func init() { proto.RegisterFile("neutron/incentives/gauge.proto", fileDescriptor_2467fab98b594cb6) } - -var fileDescriptor_2467fab98b594cb6 = []byte{ - // 566 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x53, 0xcd, 0x6e, 0xd3, 0x4c, - 0x14, 0x8d, 0x9b, 0x9f, 0xb6, 0x93, 0xb4, 0xfa, 0x32, 0x5f, 0x17, 0x6e, 0x04, 0x4e, 0x08, 0x1b, - 0x4b, 0xa8, 0x33, 0x24, 0xec, 0x58, 0xa6, 0x20, 0x84, 0x10, 0x22, 0x58, 0x59, 0x20, 0x36, 0xd6, - 0xd8, 0x33, 0x75, 0x47, 0x89, 0x3d, 0xd6, 0xcc, 0x38, 0x4a, 0xde, 0xa2, 0xcf, 0xc1, 0x1b, 0xf0, - 0x06, 0x5d, 0x76, 0xc9, 0xaa, 0x45, 0xc9, 0x1b, 0xf0, 0x04, 0xc8, 0x63, 0x9b, 0x04, 0xd8, 0xb2, - 0xf2, 0xcc, 0x39, 0xf7, 0xce, 0xbd, 0xe7, 0xdc, 0x6b, 0xe0, 0x24, 0x2c, 0xd3, 0x52, 0x24, 0x98, - 0x27, 0x21, 0x4b, 0x34, 0x5f, 0x32, 0x85, 0x23, 0x92, 0x45, 0x0c, 0xa5, 0x52, 0x68, 0x01, 0x61, - 0xc9, 0xa3, 0x1d, 0xdf, 0x3b, 0x8b, 0x44, 0x24, 0x0c, 0x8d, 0xf3, 0x53, 0x11, 0xd9, 0x73, 0x22, - 0x21, 0xa2, 0x05, 0xc3, 0xe6, 0x16, 0x64, 0x57, 0x98, 0x66, 0x92, 0x68, 0x2e, 0x92, 0x92, 0xef, - 0xff, 0xc9, 0x6b, 0x1e, 0x33, 0xa5, 0x49, 0x9c, 0x56, 0x0f, 0x84, 0x42, 0xc5, 0x42, 0xe1, 0x80, - 0x28, 0x86, 0x97, 0xa3, 0x80, 0x69, 0x32, 0xc2, 0xa1, 0xe0, 0xd5, 0x03, 0xe7, 0x55, 0xab, 0x94, - 0xad, 0x70, 0x4a, 0xb8, 0xf4, 0x39, 0x2d, 0xa8, 0xe1, 0xd7, 0x06, 0x68, 0xbe, 0xc9, 0xbb, 0x86, - 0xa7, 0xe0, 0x80, 0x53, 0xdb, 0x1a, 0x58, 0x6e, 0xc3, 0x3b, 0xe0, 0x14, 0x3e, 0x01, 0x1d, 0xae, - 0xfc, 0x94, 0xc9, 0x94, 0xe9, 0x8c, 0x2c, 0xec, 0x83, 0x81, 0xe5, 0x1e, 0x79, 0x6d, 0xae, 0xa6, - 0x15, 0x04, 0xdf, 0x83, 0x13, 0xca, 0x95, 0x96, 0x3c, 0xc8, 0x34, 0xf3, 0xb5, 0xb0, 0xeb, 0x03, - 0xcb, 0x6d, 0x8f, 0x87, 0xe8, 0x6f, 0xe9, 0xe8, 0x63, 0xc6, 0xe4, 0xfa, 0x52, 0x24, 0x94, 0xe7, - 0xca, 0x26, 0x8d, 0xdb, 0xfb, 0x7e, 0xcd, 0xeb, 0xec, 0xd2, 0x67, 0x02, 0x12, 0xd0, 0xcc, 0x9b, - 0x56, 0x76, 0x63, 0x50, 0x77, 0xdb, 0xe3, 0x73, 0x54, 0xc8, 0x42, 0xb9, 0x2c, 0x54, 0xca, 0x42, - 0x97, 0x82, 0x27, 0x93, 0xe7, 0x79, 0xf6, 0x97, 0x87, 0xbe, 0x1b, 0x71, 0x7d, 0x9d, 0x05, 0x28, - 0x14, 0x31, 0x2e, 0x3d, 0x28, 0x3e, 0x17, 0x8a, 0xce, 0xb1, 0x5e, 0xa7, 0x4c, 0x99, 0x04, 0xe5, - 0x15, 0x2f, 0xc3, 0x4f, 0x00, 0x28, 0x4d, 0xa4, 0xf6, 0x73, 0x0b, 0xed, 0xa6, 0x69, 0xb7, 0x87, - 0x0a, 0x7f, 0x51, 0xe5, 0x2f, 0x9a, 0x55, 0xfe, 0x4e, 0x1e, 0xe7, 0x85, 0x7e, 0xdc, 0xf7, 0xbb, - 0x6b, 0x12, 0x2f, 0x5e, 0x0e, 0x77, 0xb9, 0xc3, 0x9b, 0x87, 0xbe, 0xe5, 0x1d, 0x1b, 0x20, 0x0f, - 0x87, 0x18, 0x9c, 0x25, 0x59, 0xec, 0xb3, 0x54, 0x84, 0xd7, 0xca, 0x4f, 0x09, 0xa7, 0xbe, 0x58, - 0x32, 0x69, 0xb7, 0x8c, 0xa1, 0xdd, 0x24, 0x8b, 0x5f, 0x1b, 0x6a, 0x4a, 0x38, 0xfd, 0xb0, 0x64, - 0x12, 0x3e, 0x05, 0x27, 0x57, 0x7c, 0xb1, 0x60, 0xb4, 0xcc, 0xb1, 0x0f, 0x4d, 0x64, 0xa7, 0x00, - 0x8b, 0x60, 0xb8, 0x02, 0xdd, 0x9d, 0x45, 0xd4, 0x2f, 0xec, 0x39, 0xfa, 0xf7, 0xf6, 0xfc, 0xb7, - 0x57, 0xc5, 0x20, 0xf9, 0xf8, 0x53, 0xc9, 0x43, 0x9e, 0x44, 0xbe, 0xe6, 0xe1, 0xdc, 0x3e, 0x1e, - 0x58, 0x6e, 0xdd, 0x6b, 0x97, 0xd8, 0x8c, 0x87, 0xf3, 0x61, 0x06, 0x4e, 0x7f, 0x9f, 0x2a, 0x7c, - 0x06, 0x5a, 0xf9, 0x7a, 0xbd, 0x7d, 0x65, 0xf6, 0xa8, 0x3d, 0xfe, 0xff, 0xd7, 0x26, 0x50, 0xb6, - 0x42, 0x53, 0x43, 0x79, 0x65, 0x08, 0x7c, 0x04, 0x2a, 0xfb, 0xc2, 0xb9, 0xd9, 0xae, 0xba, 0xb7, - 0x03, 0xa0, 0x0d, 0x0e, 0x59, 0x42, 0x0d, 0x57, 0x37, 0x5c, 0x75, 0x9d, 0xbc, 0xbb, 0xdd, 0x38, - 0xd6, 0xdd, 0xc6, 0xb1, 0xbe, 0x6f, 0x1c, 0xeb, 0x66, 0xeb, 0xd4, 0xee, 0xb6, 0x4e, 0xed, 0xdb, - 0xd6, 0xa9, 0x7d, 0x1e, 0xed, 0xe9, 0x2d, 0x0b, 0x5f, 0x08, 0x19, 0x55, 0x67, 0xbc, 0xda, 0xff, - 0x57, 0x8d, 0xfc, 0xa0, 0x65, 0x86, 0xfe, 0xe2, 0x67, 0x00, 0x00, 0x00, 0xff, 0xff, 0xf6, 0xde, - 0x74, 0xfa, 0xce, 0x03, 0x00, 0x00, -} - -func (m *Gauge) 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 *Gauge) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *Gauge) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.PricingTick != 0 { - i = encodeVarintGauge(dAtA, i, uint64(m.PricingTick)) - i-- - dAtA[i] = 0x48 - } - if len(m.DistributedCoins) > 0 { - for iNdEx := len(m.DistributedCoins) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.DistributedCoins[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintGauge(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x42 - } - } - if m.FilledEpochs != 0 { - i = encodeVarintGauge(dAtA, i, uint64(m.FilledEpochs)) - i-- - dAtA[i] = 0x38 - } - if m.NumEpochsPaidOver != 0 { - i = encodeVarintGauge(dAtA, i, uint64(m.NumEpochsPaidOver)) - i-- - dAtA[i] = 0x30 - } - n1, err1 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.StartTime, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.StartTime):]) - if err1 != nil { - return 0, err1 - } - i -= n1 - i = encodeVarintGauge(dAtA, i, uint64(n1)) - i-- - dAtA[i] = 0x2a - if len(m.Coins) > 0 { - for iNdEx := len(m.Coins) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Coins[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintGauge(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x22 - } - } - { - size, err := m.DistributeTo.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintGauge(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x1a - if m.IsPerpetual { - i-- - if m.IsPerpetual { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x10 - } - if m.Id != 0 { - i = encodeVarintGauge(dAtA, i, uint64(m.Id)) - i-- - dAtA[i] = 0x8 - } - return len(dAtA) - i, nil -} - -func (m *QueryCondition) 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 *QueryCondition) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *QueryCondition) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.EndTick != 0 { - i = encodeVarintGauge(dAtA, i, uint64(m.EndTick)) - i-- - dAtA[i] = 0x18 - } - if m.StartTick != 0 { - i = encodeVarintGauge(dAtA, i, uint64(m.StartTick)) - i-- - dAtA[i] = 0x10 - } - if m.PairID != nil { - { - size, err := m.PairID.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintGauge(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func encodeVarintGauge(dAtA []byte, offset int, v uint64) int { - offset -= sovGauge(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func (m *Gauge) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Id != 0 { - n += 1 + sovGauge(uint64(m.Id)) - } - if m.IsPerpetual { - n += 2 - } - l = m.DistributeTo.Size() - n += 1 + l + sovGauge(uint64(l)) - if len(m.Coins) > 0 { - for _, e := range m.Coins { - l = e.Size() - n += 1 + l + sovGauge(uint64(l)) - } - } - l = github_com_cosmos_gogoproto_types.SizeOfStdTime(m.StartTime) - n += 1 + l + sovGauge(uint64(l)) - if m.NumEpochsPaidOver != 0 { - n += 1 + sovGauge(uint64(m.NumEpochsPaidOver)) - } - if m.FilledEpochs != 0 { - n += 1 + sovGauge(uint64(m.FilledEpochs)) - } - if len(m.DistributedCoins) > 0 { - for _, e := range m.DistributedCoins { - l = e.Size() - n += 1 + l + sovGauge(uint64(l)) - } - } - if m.PricingTick != 0 { - n += 1 + sovGauge(uint64(m.PricingTick)) - } - return n -} - -func (m *QueryCondition) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.PairID != nil { - l = m.PairID.Size() - n += 1 + l + sovGauge(uint64(l)) - } - if m.StartTick != 0 { - n += 1 + sovGauge(uint64(m.StartTick)) - } - if m.EndTick != 0 { - n += 1 + sovGauge(uint64(m.EndTick)) - } - return n -} - -func sovGauge(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozGauge(x uint64) (n int) { - return sovGauge(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (m *Gauge) 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 ErrIntOverflowGauge - } - 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: Gauge: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: Gauge: 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 ErrIntOverflowGauge - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Id |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field IsPerpetual", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGauge - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.IsPerpetual = bool(v != 0) - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field DistributeTo", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGauge - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthGauge - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthGauge - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := m.DistributeTo.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Coins", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGauge - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthGauge - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthGauge - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Coins = append(m.Coins, types.Coin{}) - if err := m.Coins[len(m.Coins)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 5: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field StartTime", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGauge - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthGauge - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthGauge - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(&m.StartTime, dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 6: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field NumEpochsPaidOver", wireType) - } - m.NumEpochsPaidOver = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGauge - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.NumEpochsPaidOver |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 7: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field FilledEpochs", wireType) - } - m.FilledEpochs = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGauge - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.FilledEpochs |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 8: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field DistributedCoins", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGauge - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthGauge - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthGauge - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.DistributedCoins = append(m.DistributedCoins, types.Coin{}) - if err := m.DistributedCoins[len(m.DistributedCoins)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 9: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field PricingTick", wireType) - } - m.PricingTick = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGauge - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.PricingTick |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - default: - iNdEx = preIndex - skippy, err := skipGauge(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthGauge - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *QueryCondition) 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 ErrIntOverflowGauge - } - 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: QueryCondition: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: QueryCondition: 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 msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGauge - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthGauge - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthGauge - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.PairID == nil { - m.PairID = &types1.PairID{} - } - if err := m.PairID.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field StartTick", wireType) - } - m.StartTick = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGauge - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.StartTick |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 3: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field EndTick", wireType) - } - m.EndTick = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGauge - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.EndTick |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - default: - iNdEx = preIndex - skippy, err := skipGauge(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthGauge - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func skipGauge(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, ErrIntOverflowGauge - } - 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, ErrIntOverflowGauge - } - 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, ErrIntOverflowGauge - } - 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, ErrInvalidLengthGauge - } - iNdEx += length - case 3: - depth++ - case 4: - if depth == 0 { - return 0, ErrUnexpectedEndOfGroupGauge - } - depth-- - case 5: - iNdEx += 4 - default: - return 0, fmt.Errorf("proto: illegal wireType %d", wireType) - } - if iNdEx < 0 { - return 0, ErrInvalidLengthGauge - } - if depth == 0 { - return iNdEx, nil - } - } - return 0, io.ErrUnexpectedEOF -} - -var ( - ErrInvalidLengthGauge = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowGauge = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupGauge = fmt.Errorf("proto: unexpected end of group") -) diff --git a/x/incentives/types/gauge_test.go b/x/incentives/types/gauge_test.go deleted file mode 100644 index 431aeb815..000000000 --- a/x/incentives/types/gauge_test.go +++ /dev/null @@ -1,66 +0,0 @@ -package types_test - -import ( - "testing" - "time" - - "cosmossdk.io/math" - sdk "github.com/cosmos/cosmos-sdk/types" - . "github.com/neutron-org/neutron/x/incentives/types" - "github.com/stretchr/testify/assert" -) - -func TestGaugeIsUpcomingGauge(t *testing.T) { - now := time.Now() - gauge := NewGauge(1, false, QueryCondition{}, sdk.Coins{}, now.Add(time.Minute), 10, 0, sdk.Coins{}, 0) - - assert.True(t, gauge.IsUpcomingGauge(now)) - assert.False(t, gauge.IsUpcomingGauge(now.Add(time.Minute))) -} - -func TestGaugeIsActiveGauge(t *testing.T) { - now := time.Now() - gauge := NewGauge(1, false, QueryCondition{}, sdk.Coins{}, now.Add(time.Minute), 10, 0, sdk.Coins{}, 0) - - assert.False(t, gauge.IsActiveGauge(now)) - assert.True(t, gauge.IsActiveGauge(now.Add(11*time.Minute))) - - gauge.IsPerpetual = true - assert.False(t, gauge.IsActiveGauge(now)) - assert.True(t, gauge.IsActiveGauge(now.Add(11*time.Minute))) -} - -func TestGaugeIsFinishedGauge(t *testing.T) { - now := time.Now() - gauge := NewGauge(1, false, QueryCondition{}, sdk.Coins{}, now.Add(-time.Minute), 10, 10, sdk.Coins{}, 0) - assert.True(t, gauge.IsFinishedGauge(now)) - - gauge = NewGauge(1, false, QueryCondition{}, sdk.Coins{}, now.Add(-time.Minute), 10, 8, sdk.Coins{}, 0) - assert.False(t, gauge.IsFinishedGauge(now)) -} - -func TestGaugeEpochsRemaining(t *testing.T) { - gauge := NewGauge(1, false, QueryCondition{}, sdk.Coins{}, time.Time{}, 10, 5, sdk.Coins{}, 0) - - assert.Equal(t, uint64(5), gauge.EpochsRemaining()) - - gauge.IsPerpetual = true - assert.Equal(t, uint64(1), gauge.EpochsRemaining()) -} - -func TestGaugeCoinsRemaining(t *testing.T) { - coins := sdk.Coins{sdk.NewCoin("coin1", math.NewInt(100))} - distCoins := sdk.Coins{sdk.NewCoin("coin1", math.NewInt(50))} - gauge := NewGauge(1, false, QueryCondition{}, coins, time.Time{}, 10, 5, distCoins, 0) - assert.Equal(t, sdk.Coins{sdk.NewCoin("coin1", math.NewInt(50))}, gauge.CoinsRemaining()) -} - -func TestGaugeGetTotal(t *testing.T) { - distSpec := DistributionSpec{ - "addr1": sdk.Coins{sdk.NewCoin("coin1", math.NewInt(10))}, - "addr2": sdk.Coins{sdk.NewCoin("coin1", math.NewInt(20))}, - "addr3": sdk.Coins{sdk.NewCoin("coin1", math.NewInt(30))}, - } - - assert.Equal(t, sdk.Coins{sdk.NewCoin("coin1", math.NewInt(60))}, distSpec.GetTotal()) -} diff --git a/x/incentives/types/gauges.go b/x/incentives/types/gauges.go deleted file mode 100644 index 32dbb878f..000000000 --- a/x/incentives/types/gauges.go +++ /dev/null @@ -1,24 +0,0 @@ -package types - -import sdk "github.com/cosmos/cosmos-sdk/types" - -type Gauges []*Gauge - -func (g Gauges) GetCoinsDistributed() sdk.Coins { - result := sdk.Coins{} - for _, gauge := range g { - result = result.Add(gauge.DistributedCoins...) - } - - return result -} - -// getToDistributeCoinsFromGauges returns coins that have not been distributed yet from the provided gauges -func (g Gauges) GetCoinsRemaining() sdk.Coins { - result := sdk.Coins{} - - for _, gauge := range g { - result = result.Add(gauge.CoinsRemaining()...) - } - return result -} diff --git a/x/incentives/types/genesis.go b/x/incentives/types/genesis.go deleted file mode 100644 index e4d616d9a..000000000 --- a/x/incentives/types/genesis.go +++ /dev/null @@ -1,23 +0,0 @@ -package types - -import ( - "errors" -) - -// DefaultIndex is the default incentive module's global index. -const DefaultIndex uint64 = 1 - -// DefaultGenesis returns the incentive module's default genesis state. -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 gs.Params.DistrEpochIdentifier == "" { - return errors.New("epoch identifier should NOT be empty") - } - return nil -} diff --git a/x/incentives/types/genesis.pb.go b/x/incentives/types/genesis.pb.go deleted file mode 100644 index 5455123db..000000000 --- a/x/incentives/types/genesis.pb.go +++ /dev/null @@ -1,590 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: neutron/incentives/genesis.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 - -// GenesisState defines the incentives module's various parameters when first -// initialized -type GenesisState struct { - // params are all the parameters of the module - Params Params `protobuf:"bytes,1,opt,name=params,proto3" json:"params"` - // gauges are all gauges that should exist at genesis - Gauges []*Gauge `protobuf:"bytes,2,rep,name=gauges,proto3" json:"gauges,omitempty"` - // last_gauge_id is what the gauge number will increment from when creating - // the next gauge after genesis - LastGaugeId uint64 `protobuf:"varint,3,opt,name=last_gauge_id,json=lastGaugeId,proto3" json:"last_gauge_id,omitempty"` - LastStakeId uint64 `protobuf:"varint,4,opt,name=last_stake_id,json=lastStakeId,proto3" json:"last_stake_id,omitempty"` - Stakes []*Stake `protobuf:"bytes,5,rep,name=stakes,proto3" json:"stakes,omitempty"` - AccountHistories []*AccountHistory `protobuf:"bytes,6,rep,name=accountHistories,proto3" json:"accountHistories,omitempty"` -} - -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_98ecc78531d9ace2, []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 (m *GenesisState) GetGauges() []*Gauge { - if m != nil { - return m.Gauges - } - return nil -} - -func (m *GenesisState) GetLastGaugeId() uint64 { - if m != nil { - return m.LastGaugeId - } - return 0 -} - -func (m *GenesisState) GetLastStakeId() uint64 { - if m != nil { - return m.LastStakeId - } - return 0 -} - -func (m *GenesisState) GetStakes() []*Stake { - if m != nil { - return m.Stakes - } - return nil -} - -func (m *GenesisState) GetAccountHistories() []*AccountHistory { - if m != nil { - return m.AccountHistories - } - return nil -} - -func init() { - proto.RegisterType((*GenesisState)(nil), "neutron.incentives.GenesisState") -} - -func init() { proto.RegisterFile("neutron/incentives/genesis.proto", fileDescriptor_98ecc78531d9ace2) } - -var fileDescriptor_98ecc78531d9ace2 = []byte{ - // 332 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0x4f, 0x4f, 0xc2, 0x30, - 0x18, 0xc6, 0x37, 0xc0, 0x1d, 0x8a, 0x26, 0xa6, 0xf1, 0x30, 0x77, 0x28, 0x0b, 0xa7, 0x5d, 0xdc, - 0x02, 0x5e, 0xbc, 0xca, 0x05, 0x89, 0x89, 0x31, 0xe3, 0xe6, 0x85, 0x94, 0xd1, 0x94, 0x46, 0x69, - 0xc9, 0xda, 0x19, 0xf9, 0x16, 0x7e, 0x2a, 0xc3, 0x91, 0xa3, 0x27, 0x63, 0xd8, 0x17, 0x31, 0xed, - 0x8a, 0x90, 0x30, 0xbd, 0xb5, 0xef, 0xf3, 0x7b, 0xde, 0xbf, 0x20, 0xe4, 0xa4, 0x50, 0xb9, 0xe0, - 0x09, 0xe3, 0x19, 0xe1, 0x8a, 0xbd, 0x12, 0x99, 0x50, 0xc2, 0x89, 0x64, 0x32, 0x5e, 0xe6, 0x42, - 0x09, 0x08, 0x2d, 0x11, 0xef, 0x89, 0xe0, 0x82, 0x0a, 0x2a, 0x8c, 0x9c, 0xe8, 0x57, 0x45, 0x06, - 0x9d, 0x9a, 0x5c, 0x4b, 0x9c, 0xe3, 0x85, 0x4d, 0x15, 0xa0, 0xba, 0x62, 0xb8, 0xa0, 0xe4, 0x1f, - 0x5d, 0x2a, 0xfc, 0xbc, 0xd3, 0xa3, 0x1a, 0x1d, 0x67, 0x99, 0x28, 0xb8, 0x9a, 0xcc, 0x99, 0x54, - 0x22, 0x5f, 0x55, 0x64, 0xf7, 0xa3, 0x01, 0x4e, 0x87, 0xd5, 0x18, 0x63, 0x85, 0x15, 0x81, 0x37, - 0xc0, 0xab, 0x5a, 0xf1, 0xdd, 0xd0, 0x8d, 0xda, 0xfd, 0x20, 0x3e, 0x1e, 0x2b, 0x7e, 0x34, 0xc4, - 0xa0, 0xb5, 0xfe, 0xea, 0x38, 0xa9, 0xe5, 0x61, 0x0f, 0x78, 0xa6, 0x47, 0xe9, 0x37, 0xc2, 0x66, - 0xd4, 0xee, 0x5f, 0xd6, 0x39, 0x87, 0x9a, 0x48, 0x2d, 0x08, 0xbb, 0xe0, 0xec, 0x05, 0x4b, 0x35, - 0x31, 0xdf, 0x09, 0x9b, 0xf9, 0xcd, 0xd0, 0x8d, 0x5a, 0x69, 0x5b, 0x07, 0x0d, 0x39, 0x9a, 0xfd, - 0x32, 0x66, 0x3e, 0xcd, 0xb4, 0xf6, 0xcc, 0x58, 0xc7, 0x46, 0x33, 0x5d, 0xda, 0xc8, 0xd2, 0x3f, - 0xf9, 0xbb, 0xb4, 0x81, 0x53, 0x0b, 0xc2, 0x07, 0x70, 0x6e, 0x37, 0x72, 0x67, 0x16, 0xc2, 0x88, - 0xf4, 0x3d, 0x63, 0xee, 0xd6, 0x99, 0x6f, 0x0f, 0xd9, 0x55, 0x7a, 0xe4, 0x1d, 0xdc, 0xaf, 0xb7, - 0xc8, 0xdd, 0x6c, 0x91, 0xfb, 0xbd, 0x45, 0xee, 0x7b, 0x89, 0x9c, 0x4d, 0x89, 0x9c, 0xcf, 0x12, - 0x39, 0x4f, 0x3d, 0xca, 0xd4, 0xbc, 0x98, 0xc6, 0x99, 0x58, 0x24, 0x36, 0xf3, 0x95, 0xc8, 0xe9, - 0xee, 0x9d, 0xbc, 0x1d, 0x5e, 0x49, 0xad, 0x96, 0x44, 0x4e, 0x3d, 0x73, 0x9c, 0xeb, 0x9f, 0x00, - 0x00, 0x00, 0xff, 0xff, 0x78, 0xe5, 0x26, 0xb9, 0x75, 0x02, 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 - if len(m.AccountHistories) > 0 { - for iNdEx := len(m.AccountHistories) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.AccountHistories[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintGenesis(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x32 - } - } - if len(m.Stakes) > 0 { - for iNdEx := len(m.Stakes) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Stakes[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintGenesis(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x2a - } - } - if m.LastStakeId != 0 { - i = encodeVarintGenesis(dAtA, i, uint64(m.LastStakeId)) - i-- - dAtA[i] = 0x20 - } - if m.LastGaugeId != 0 { - i = encodeVarintGenesis(dAtA, i, uint64(m.LastGaugeId)) - i-- - dAtA[i] = 0x18 - } - if len(m.Gauges) > 0 { - for iNdEx := len(m.Gauges) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Gauges[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintGenesis(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - } - { - 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)) - if len(m.Gauges) > 0 { - for _, e := range m.Gauges { - l = e.Size() - n += 1 + l + sovGenesis(uint64(l)) - } - } - if m.LastGaugeId != 0 { - n += 1 + sovGenesis(uint64(m.LastGaugeId)) - } - if m.LastStakeId != 0 { - n += 1 + sovGenesis(uint64(m.LastStakeId)) - } - if len(m.Stakes) > 0 { - for _, e := range m.Stakes { - l = e.Size() - n += 1 + l + sovGenesis(uint64(l)) - } - } - if len(m.AccountHistories) > 0 { - for _, e := range m.AccountHistories { - l = e.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 - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Gauges", 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 - } - m.Gauges = append(m.Gauges, &Gauge{}) - if err := m.Gauges[len(m.Gauges)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 3: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field LastGaugeId", wireType) - } - m.LastGaugeId = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenesis - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.LastGaugeId |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 4: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field LastStakeId", wireType) - } - m.LastStakeId = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenesis - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.LastStakeId |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 5: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Stakes", 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 - } - m.Stakes = append(m.Stakes, &Stake{}) - if err := m.Stakes[len(m.Stakes)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 6: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field AccountHistories", 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 - } - m.AccountHistories = append(m.AccountHistories, &AccountHistory{}) - if err := m.AccountHistories[len(m.AccountHistories)-1].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/incentives/types/hooks.go b/x/incentives/types/hooks.go deleted file mode 100644 index bcb37bbc7..000000000 --- a/x/incentives/types/hooks.go +++ /dev/null @@ -1,82 +0,0 @@ -package types - -import ( - time "time" - - sdk "github.com/cosmos/cosmos-sdk/types" -) - -type IncentiveHooks interface { - AfterCreateGauge(ctx sdk.Context, gaugeID uint64) - AfterAddToGauge(ctx sdk.Context, gaugeID uint64) - AfterStartDistribution(ctx sdk.Context, gaugeID uint64) - AfterFinishDistribution(ctx sdk.Context, gaugeID uint64) - AfterEpochDistribution(ctx sdk.Context) - AfterAddTokensToStake(ctx sdk.Context, address sdk.AccAddress, stakeID uint64, amount sdk.Coins) - OnTokenStaked(ctx sdk.Context, address sdk.AccAddress, stakeID uint64, amount sdk.Coins, unstakeTime time.Time) - OnTokenUnstaked(ctx sdk.Context, address sdk.AccAddress, stakeID uint64, amount sdk.Coins, unstakeTime time.Time) -} - -var _ IncentiveHooks = MultiIncentiveHooks{} - -// MultiIncentiveHooks combines multiple incentive hooks. All hook functions are run in array sequence. -type MultiIncentiveHooks []IncentiveHooks - -// NewMultiIncentiveHooks combines multiple incentive hooks into a single IncentiveHooks array. -func NewMultiIncentiveHooks(hooks ...IncentiveHooks) MultiIncentiveHooks { - return hooks -} - -func (h MultiIncentiveHooks) AfterCreateGauge(ctx sdk.Context, gaugeID uint64) { - for i := range h { - h[i].AfterCreateGauge(ctx, gaugeID) - } -} - -func (h MultiIncentiveHooks) AfterAddToGauge(ctx sdk.Context, gaugeID uint64) { - for i := range h { - h[i].AfterAddToGauge(ctx, gaugeID) - } -} - -func (h MultiIncentiveHooks) AfterStartDistribution(ctx sdk.Context, gaugeID uint64) { - for i := range h { - h[i].AfterStartDistribution(ctx, gaugeID) - } -} - -func (h MultiIncentiveHooks) AfterFinishDistribution(ctx sdk.Context, gaugeID uint64) { - for i := range h { - h[i].AfterFinishDistribution(ctx, gaugeID) - } -} - -func (h MultiIncentiveHooks) AfterEpochDistribution(ctx sdk.Context) { - for i := range h { - h[i].AfterEpochDistribution(ctx) - } -} - -func (h MultiIncentiveHooks) AfterAddTokensToStake(ctx sdk.Context, address sdk.AccAddress, stakeID uint64, amount sdk.Coins) { - for i := range h { - h[i].AfterAddTokensToStake(ctx, address, stakeID, amount) - } -} - -func (h MultiIncentiveHooks) OnTokenStaked(ctx sdk.Context, address sdk.AccAddress, stakeID uint64, amount sdk.Coins, unstakeTime time.Time) { - for i := range h { - h[i].OnTokenStaked(ctx, address, stakeID, amount, unstakeTime) - } -} - -func (h MultiIncentiveHooks) OnTokenUnstaked(ctx sdk.Context, address sdk.AccAddress, stakeID uint64, amount sdk.Coins, unstakeTime time.Time) { - for i := range h { - h[i].OnTokenUnstaked(ctx, address, stakeID, amount, unstakeTime) - } -} - -// func (h MultiIncentiveHooks) OnStakeExtend(ctx sdk.Context, stakeID uint64, prevDuration, newDuration time.Duration) { -// for i := range h { -// h[i].OnStakeExtend(ctx, stakeID, prevDuration, newDuration) -// } -// } diff --git a/x/incentives/types/keys.go b/x/incentives/types/keys.go deleted file mode 100644 index 7afce2652..000000000 --- a/x/incentives/types/keys.go +++ /dev/null @@ -1,176 +0,0 @@ -package types - -import ( - "bytes" - time "time" - - sdk "github.com/cosmos/cosmos-sdk/types" -) - -var ( - // ModuleName defines the module name. - ModuleName = "incentives" - - // StoreKey defines the primary module store key. - StoreKey = ModuleName - - // RouterKey is the message route for slashing. - RouterKey = ModuleName - - // QuerierRoute defines the module's query routing key. - QuerierRoute = ModuleName - - // MemStoreKey defines the in-memory store key. - MemStoreKey = "mem_capability" - - // KeyPrefixTimestamp defines prefix key for timestamp iterator key. - KeyPrefixTimestamp = []byte{0x01} - - // KeyLastGaugeID defines key for setting last gauge ID. - KeyLastGaugeID = []byte{0x02} - - // KeyPrefixGauge defines prefix key for storing gauges. - KeyPrefixGauge = []byte{0x03} - - // KeyPrefixGaugeIndex defines prefix key for storing reference key for all gauges. - KeyPrefixGaugeIndex = []byte{0x04} - - // KeyPrefixGaugeIndexUpcoming defines prefix key for storing reference key for upcoming gauges. - KeyPrefixGaugeIndexUpcoming = []byte{0x04, 0x00} - - // KeyPrefixGaugeIndexActive defines prefix key for storing reference key for active gauges. - KeyPrefixGaugeIndexActive = []byte{0x04, 0x01} - - // KeyPrefixGaugeIndexFinished defines prefix key for storing reference key for finished gauges. - KeyPrefixGaugeIndexFinished = []byte{0x04, 0x02} - - // KeyPrefixGaugeIndexByPair defines prefix key for storing indexes of gauge IDs by denomination. - KeyPrefixGaugeIndexByPair = []byte{0x05} - - // KeyLastStakeID defines key to store stake ID used by last. - KeyLastStakeID = []byte{0x06} - - // KeyPrefixStake defines prefix to store period stake by ID. - KeyPrefixStake = []byte{0x07} - - // KeyPrefixStakeIndexAccount defines prefix for the iteration of stake IDs by account. - KeyPrefixStakeIndex = []byte{0x08} - - // KeyPrefixStakeIndexAccount defines prefix for the iteration of stake IDs by account. - KeyPrefixStakeIndexAccount = []byte{0x09} - - // KeyPrefixStakeIndexDenom defines prefix for the iteration of stake IDs by denom. - KeyPrefixStakeIndexDenom = []byte{0x0c} - - // KeyPrefixStakeIndexPairTick defines prefix for the iteration of stake IDs by pairId and tick index. - KeyPrefixStakeIndexPairTick = []byte{0x0d} - - // KeyPrefixStakeIndexAccountDenom defines prefix for the iteration of stake IDs by account, denomination. - KeyPrefixStakeIndexAccountDenom = []byte{0x0e} - - // KeyPrefixStakeIndexTimestamp defines prefix for the iteration of stake IDs by day epoch integer. - KeyPrefixStakeIndexPairDistEpoch = []byte{0x0f} - - // KeyPrefixAccountHistory defines the prefix for storing account histories. - KeyPrefixAccountHistory = []byte{0x10} - - KeyParams = []byte{0x11} - // KeyndexSeparator defines separator between keys when combine, it should be one that is not used in denom expression. - KeyIndexSeparator = []byte{0xFF} -) - -// stakeStoreKey returns action store key from ID. -func GetStakeStoreKey(id uint64) []byte { - return CombineKeys(KeyPrefixStake, sdk.Uint64ToBigEndian(id)) -} - -// combineKeys combine bytes array into a single bytes. -func CombineKeys(keys ...[]byte) []byte { - return bytes.Join(keys, KeyIndexSeparator) -} - -// getTimeKey returns the key used for getting a set of period stakes -// where unstakeTime is after a specific time. -func GetTimeKey(timestamp time.Time) []byte { - timeBz := sdk.FormatTimeBytes(timestamp) - timeBzL := len(timeBz) - prefixL := len(KeyPrefixTimestamp) - - bz := make([]byte, prefixL+8+timeBzL) - - // copy the prefix - copy(bz[:prefixL], KeyPrefixTimestamp) - - // copy the encoded time bytes length - copy(bz[prefixL:prefixL+8], sdk.Uint64ToBigEndian(uint64(timeBzL))) - - // copy the encoded time bytes - copy(bz[prefixL+8:prefixL+8+timeBzL], timeBz) - return bz -} - -// gaugeStoreKey returns the combined byte array (store key) of the provided gauge ID's key prefix and the ID itself. -func GetKeyGaugeStore(id uint64) []byte { - return CombineKeys(KeyPrefixGauge, sdk.Uint64ToBigEndian(id)) -} - -// gaugePairStoreKey returns the combined byte array (store key) of the provided gauge denom key prefix and the denom itself. -func GetKeyGaugeIndexByPair(pairID string) []byte { - return CombineKeys(KeyPrefixGaugeIndexByPair, []byte(pairID)) -} - -func GetKeyStakeIndexByAccount(account sdk.AccAddress) []byte { - return CombineKeys( - KeyPrefixStakeIndexAccount, - account, - ) -} - -func GetKeyStakeIndexByDenom(denom string) []byte { - return CombineKeys( - KeyPrefixStakeIndexDenom, - []byte(denom), - ) -} - -func GetKeyStakeIndexByAccountDenom(account sdk.AccAddress, denom string) []byte { - return CombineKeys( - KeyPrefixStakeIndexAccountDenom, - account, - []byte(denom), - ) -} - -func GetKeyStakeIndexByDistEpoch(pairID string, distEpoch int64) []byte { - return CombineKeys( - KeyPrefixStakeIndexPairDistEpoch, - []byte(pairID), - GetKeyInt64(distEpoch), - ) -} - -func GetKeyStakeIndexByPairTick(pairID string, tickIndex int64) []byte { - return CombineKeys( - KeyPrefixStakeIndexPairTick, - []byte(pairID), - GetKeyInt64(tickIndex), - ) -} - -func GetKeyAccountHistory(address string) []byte { - return CombineKeys( - KeyPrefixStakeIndexPairTick, - []byte(address), - ) -} - -func GetKeyInt64(a int64) []byte { - key := make([]byte, 9) - if a < 0 { - copy(key[1:], sdk.Uint64ToBigEndian(uint64(a))) - } else { - copy(key[:1], []byte{0x01}) - copy(key[1:], sdk.Uint64ToBigEndian(uint64(a))) - } - return key -} diff --git a/x/incentives/types/keys_test.go b/x/incentives/types/keys_test.go deleted file mode 100644 index 8ea98bdda..000000000 --- a/x/incentives/types/keys_test.go +++ /dev/null @@ -1,18 +0,0 @@ -package types_test - -import ( - "bytes" - "testing" - time "time" - - sdk "github.com/cosmos/cosmos-sdk/types" - . "github.com/neutron-org/neutron/x/incentives/types" - "github.com/stretchr/testify/require" -) - -func TestGetTimeKey(t *testing.T) { - now := time.Now() - timeKey := GetTimeKey(now) - require.True(t, bytes.HasPrefix(timeKey, KeyPrefixTimestamp)) - require.True(t, bytes.HasSuffix(timeKey, sdk.FormatTimeBytes(now))) -} diff --git a/x/incentives/types/msgs.go b/x/incentives/types/msgs.go deleted file mode 100644 index 92e5e49fa..000000000 --- a/x/incentives/types/msgs.go +++ /dev/null @@ -1,259 +0,0 @@ -package types - -import ( - "fmt" - "time" - - sdkerrors "cosmossdk.io/errors" - sdk "github.com/cosmos/cosmos-sdk/types" - dextypes "github.com/neutron-org/neutron/x/dex/types" -) - -const ( - TypeMsgCreateGauge = "create_gauge" - TypeMsgAddToGauge = "add_to_gauge" - TypeMsgStakeTokens = "stake_tokens" - TypeMsgBeginUnstaking = "begin_unstaking" - TypeMsgUpdateParams = "update-params" -) - -var _ sdk.Msg = &MsgCreateGauge{} - -// NewMsgCreateGauge creates a message to create a gauge with the provided parameters. -func NewMsgCreateGauge( - isPerpetual bool, - owner sdk.AccAddress, - distributeTo QueryCondition, - coins sdk.Coins, - startTime time.Time, - numEpochsPaidOver uint64, - pricingTick int64, -) *MsgCreateGauge { - return &MsgCreateGauge{ - IsPerpetual: isPerpetual, - Owner: owner.String(), - DistributeTo: distributeTo, - Coins: coins, - StartTime: startTime, - NumEpochsPaidOver: numEpochsPaidOver, - PricingTick: pricingTick, - } -} - -// Route takes a create gauge message, then returns the RouterKey used for slashing. -func (m MsgCreateGauge) Route() string { return RouterKey } - -// Type takes a create gauge message, then returns a create gauge message type. -func (m MsgCreateGauge) Type() string { return TypeMsgCreateGauge } - -// ValidateBasic checks that the create gauge message is valid. -func (m MsgCreateGauge) ValidateBasic() error { - if m.Owner == "" { - return sdkerrors.Wrapf(ErrInvalidRequest, "owner should be set") - } - // TODO: If this is not set, infer start time as "now" - if m.StartTime.Equal(time.Time{}) { - return sdkerrors.Wrapf(ErrInvalidRequest, "distribution start time should be set") - } - if m.NumEpochsPaidOver == 0 { - return sdkerrors.Wrapf( - ErrInvalidRequest, - "distribution period should be at least 1 epoch", - ) - } - if m.IsPerpetual && m.NumEpochsPaidOver != 1 { - return sdkerrors.Wrapf( - ErrInvalidRequest, - "distribution period should be 1 epoch for perpetual gauge", - ) - } - if dextypes.IsTickOutOfRange(m.PricingTick) { - return sdkerrors.Wrapf( - ErrInvalidRequest, - "pricing tick is out of range, must be between %d and %d", - int64(dextypes.MaxTickExp)*-1, - dextypes.MaxTickExp, - ) - } - if dextypes.IsTickOutOfRange(m.DistributeTo.StartTick) { - return sdkerrors.Wrapf( - ErrInvalidRequest, - "start tick is out of range, must be between %d and %d", - int64(dextypes.MaxTickExp)*-1, - dextypes.MaxTickExp, - ) - } - if dextypes.IsTickOutOfRange(m.DistributeTo.EndTick) { - return sdkerrors.Wrapf( - ErrInvalidRequest, - "start tick is out of range, must be between %d and %d", - int64(dextypes.MaxTickExp)*-1, - dextypes.MaxTickExp, - ) - } - - return nil -} - -// GetSignBytes takes a create gauge message and turns it into a byte array. -func (m MsgCreateGauge) GetSignBytes() []byte { - return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(&m)) -} - -// GetSigners takes a create gauge message and returns the owner in a byte array. -func (m MsgCreateGauge) GetSigners() []sdk.AccAddress { - owner, _ := sdk.AccAddressFromBech32(m.Owner) - return []sdk.AccAddress{owner} -} - -var _ sdk.Msg = &MsgAddToGauge{} - -// NewMsgAddToGauge creates a message to add rewards to a specific gauge. -func NewMsgAddToGauge(owner sdk.AccAddress, gaugeID uint64, rewards sdk.Coins) *MsgAddToGauge { - return &MsgAddToGauge{ - Owner: owner.String(), - GaugeId: gaugeID, - Rewards: rewards, - } -} - -// Route takes an add to gauge message, then returns the RouterKey used for slashing. -func (m MsgAddToGauge) Route() string { return RouterKey } - -// Type takes an add to gauge message, then returns an add to gauge message type. -func (m MsgAddToGauge) Type() string { return TypeMsgAddToGauge } - -// ValidateBasic checks that the add to gauge message is valid. -func (m MsgAddToGauge) ValidateBasic() error { - if m.Owner == "" { - return sdkerrors.Wrapf(ErrInvalidRequest, "owner should be set") - } - if m.Rewards.Empty() { - return sdkerrors.Wrapf( - ErrInvalidRequest, - "additional rewards should not be empty", - ) - } - - return nil -} - -// GetSignBytes takes an add to gauge message and turns it into a byte array. -func (m MsgAddToGauge) GetSignBytes() []byte { - return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(&m)) -} - -// GetSigners takes an add to gauge message and returns the owner in a byte array. -func (m MsgAddToGauge) GetSigners() []sdk.AccAddress { - owner, _ := sdk.AccAddressFromBech32(m.Owner) - return []sdk.AccAddress{owner} -} - -var _ sdk.Msg = &MsgStake{} - -// NewMsgStakeTokens creates a message to stake tokens. -func NewMsgSetupStake(owner sdk.AccAddress, coins sdk.Coins) *MsgStake { - return &MsgStake{ - Owner: owner.String(), - Coins: coins, - } -} - -func (m MsgStake) Route() string { return RouterKey } -func (m MsgStake) Type() string { return TypeMsgStakeTokens } -func (m MsgStake) ValidateBasic() error { - _, err := sdk.AccAddressFromBech32(m.Owner) - if err != nil { - return sdkerrors.Wrapf(ErrInvalidAddress, "Invalid owner address (%s)", err) - } - - if !m.Coins.IsAllPositive() { - return fmt.Errorf("cannot stake up a zero or negative amount") - } - - return nil -} - -func (m MsgStake) GetSignBytes() []byte { - return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(&m)) -} - -func (m MsgStake) GetSigners() []sdk.AccAddress { - owner, _ := sdk.AccAddressFromBech32(m.Owner) - return []sdk.AccAddress{owner} -} - -var _ sdk.Msg = &MsgUnstake{} - -func NewMsgUnstakeDescriptor(id uint64, coins sdk.Coins) *MsgUnstake_UnstakeDescriptor { - return &MsgUnstake_UnstakeDescriptor{ - ID: id, - Coins: coins, - } -} - -// NewMsgUnstake creates a message to unstake the tokens of a set of stake records. -func NewMsgUnstake(owner sdk.AccAddress, unstakes []*MsgUnstake_UnstakeDescriptor) *MsgUnstake { - return &MsgUnstake{ - Owner: owner.String(), - Unstakes: unstakes, - } -} - -func (m MsgUnstake) Route() string { return RouterKey } -func (m MsgUnstake) Type() string { return TypeMsgBeginUnstaking } -func (m MsgUnstake) ValidateBasic() error { - _, err := sdk.AccAddressFromBech32(m.Owner) - if err != nil { - return sdkerrors.Wrapf(ErrInvalidAddress, "Invalid owner address (%s)", err) - } - - for _, unstake := range m.Unstakes { - if unstake.ID == 0 { - return fmt.Errorf("invalid stake ID, got %v", unstake.ID) - } - - if !unstake.Coins.Empty() && !unstake.Coins.IsAllPositive() { - return fmt.Errorf("cannot unstake a zero or negative amount") - } - } - - return nil -} - -func (m MsgUnstake) GetSignBytes() []byte { - return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(&m)) -} - -func (m MsgUnstake) GetSigners() []sdk.AccAddress { - owner, _ := sdk.AccAddressFromBech32(m.Owner) - return []sdk.AccAddress{owner} -} - -var _ sdk.Msg = &MsgUpdateParams{} - -func (msg *MsgUpdateParams) Route() string { return RouterKey } - -func (msg *MsgUpdateParams) Type() string { return TypeMsgUpdateParams } - -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 { - bz := ModuleCdc.MustMarshalJSON(msg) - return sdk.MustSortJSON(bz) -} - -func (msg *MsgUpdateParams) ValidateBasic() error { - if _, err := sdk.AccAddressFromBech32(msg.Authority); err != nil { - return sdkerrors.Wrap(err, "authority is invalid") - } - - err := msg.Params.Validate() - return err -} diff --git a/x/incentives/types/msgs_test.go b/x/incentives/types/msgs_test.go deleted file mode 100644 index 4ebdde3ea..000000000 --- a/x/incentives/types/msgs_test.go +++ /dev/null @@ -1,324 +0,0 @@ -package types_test - -import ( - "testing" - time "time" - - "github.com/cometbft/cometbft/crypto/ed25519" - "github.com/stretchr/testify/require" - - "cosmossdk.io/math" - sdk "github.com/cosmos/cosmos-sdk/types" - - "github.com/neutron-org/neutron/testutil/apptesting" - dextypes "github.com/neutron-org/neutron/x/dex/types" - . "github.com/neutron-org/neutron/x/incentives/types" -) - -// TestMsgCreatePool tests if valid/invalid create pool messages are properly validated/invalidated -func TestMsgCreatePool(t *testing.T) { - // generate a private/public key pair and get the respective address - pk1 := ed25519.GenPrivKey().PubKey() - addr1 := sdk.AccAddress(pk1.Address()) - - // make a proper createPool message - createMsg := func(after func(msg MsgCreateGauge) MsgCreateGauge) MsgCreateGauge { - distributeTo := QueryCondition{ - PairID: &dextypes.PairID{ - Token0: "TokenA", - Token1: "TokenB", - }, - StartTick: -10, - EndTick: 10, - } - - properMsg := *NewMsgCreateGauge( - false, - addr1, - distributeTo, - sdk.Coins{}, - time.Now(), - 2, - 0, - ) - - return after(properMsg) - } - - // validate createPool message was created as intended - msg := createMsg(func(msg MsgCreateGauge) MsgCreateGauge { - return msg - }) - require.Equal(t, msg.Route(), RouterKey) - require.Equal(t, msg.Type(), "create_gauge") - signers := msg.GetSigners() - require.Equal(t, len(signers), 1) - require.Equal(t, signers[0].String(), addr1.String()) - - tests := []struct { - name string - msg MsgCreateGauge - expectPass bool - }{ - { - name: "proper msg", - msg: createMsg(func(msg MsgCreateGauge) MsgCreateGauge { - return msg - }), - expectPass: true, - }, - { - name: "empty owner", - msg: createMsg(func(msg MsgCreateGauge) MsgCreateGauge { - msg.Owner = "" - return msg - }), - expectPass: false, - }, - { - name: "invalid distribution start time", - msg: createMsg(func(msg MsgCreateGauge) MsgCreateGauge { - msg.StartTime = time.Time{} - return msg - }), - expectPass: false, - }, - { - name: "invalid num epochs paid over", - msg: createMsg(func(msg MsgCreateGauge) MsgCreateGauge { - msg.NumEpochsPaidOver = 0 - return msg - }), - expectPass: false, - }, - { - name: "invalid num epochs paid over for perpetual gauge", - msg: createMsg(func(msg MsgCreateGauge) MsgCreateGauge { - msg.NumEpochsPaidOver = 2 - msg.IsPerpetual = true - return msg - }), - expectPass: false, - }, - { - name: "valid num epochs paid over for perpetual gauge", - msg: createMsg(func(msg MsgCreateGauge) MsgCreateGauge { - msg.NumEpochsPaidOver = 1 - msg.IsPerpetual = true - return msg - }), - expectPass: true, - }, - } - - for _, test := range tests { - if test.expectPass { - require.NoError(t, test.msg.ValidateBasic(), "test: %v", test.name) - } else { - require.Error(t, test.msg.ValidateBasic(), "test: %v", test.name) - } - } -} - -// TestMsgAddToGauge tests if valid/invalid add to gauge messages are properly validated/invalidated -func TestMsgAddToGauge(t *testing.T) { - // generate a private/public key pair and get the respective address - pk1 := ed25519.GenPrivKey().PubKey() - addr1 := sdk.AccAddress(pk1.Address()) - - // make a proper addToGauge message - createMsg := func(after func(msg MsgAddToGauge) MsgAddToGauge) MsgAddToGauge { - properMsg := *NewMsgAddToGauge( - addr1, - 1, - sdk.Coins{sdk.NewInt64Coin("stake", 10)}, - ) - - return after(properMsg) - } - - // validate addToGauge message was created as intended - msg := createMsg(func(msg MsgAddToGauge) MsgAddToGauge { - return msg - }) - require.Equal(t, msg.Route(), RouterKey) - require.Equal(t, msg.Type(), "add_to_gauge") - signers := msg.GetSigners() - require.Equal(t, len(signers), 1) - require.Equal(t, signers[0].String(), addr1.String()) - - tests := []struct { - name string - msg MsgAddToGauge - expectPass bool - }{ - { - name: "proper msg", - msg: createMsg(func(msg MsgAddToGauge) MsgAddToGauge { - return msg - }), - expectPass: true, - }, - { - name: "empty owner", - msg: createMsg(func(msg MsgAddToGauge) MsgAddToGauge { - msg.Owner = "" - return msg - }), - expectPass: false, - }, - { - name: "empty rewards", - msg: createMsg(func(msg MsgAddToGauge) MsgAddToGauge { - msg.Rewards = sdk.Coins{} - return msg - }), - expectPass: false, - }, - } - - for _, test := range tests { - if test.expectPass { - require.NoError(t, test.msg.ValidateBasic(), "test: %v", test.name) - } else { - require.Error(t, test.msg.ValidateBasic(), "test: %v", test.name) - } - } -} - -func TestMsgSetupStake(t *testing.T) { - addr1, invalidAddr := apptesting.GenerateTestAddrs() - - tests := []struct { - name string - msg MsgStake - expectPass bool - }{ - { - name: "proper msg", - msg: MsgStake{ - Owner: addr1, - Coins: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100))), - }, - expectPass: true, - }, - { - name: "invalid owner", - msg: MsgStake{ - Owner: invalidAddr, - Coins: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100))), - }, - }, - { - name: "zero token amount", - msg: MsgStake{ - Owner: addr1, - Coins: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(0))), - }, - }, - } - - for _, test := range tests { - t.Run(test.name, func(t *testing.T) { - if test.expectPass { - require.NoError(t, test.msg.ValidateBasic(), "test: %v", test.name) - require.Equal(t, test.msg.Route(), RouterKey) - require.Equal(t, test.msg.Type(), "stake_tokens") - signers := test.msg.GetSigners() - require.Equal(t, len(signers), 1) - require.Equal(t, signers[0].String(), addr1) - } else { - require.Error(t, test.msg.ValidateBasic(), "test: %v", test.name) - } - }) - } -} - -func TestMsgUnstake(t *testing.T) { - addr1, invalidAddr := apptesting.GenerateTestAddrs() - - tests := []struct { - name string - msg MsgUnstake - expectPass bool - }{ - { - name: "proper msg", - msg: MsgUnstake{ - Owner: addr1, - Unstakes: []*MsgUnstake_UnstakeDescriptor{ - { - ID: 1, - Coins: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100))), - }, - }, - }, - expectPass: true, - }, - { - name: "invalid owner", - msg: MsgUnstake{ - Owner: invalidAddr, - Unstakes: []*MsgUnstake_UnstakeDescriptor{ - { - ID: 1, - Coins: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100))), - }, - }, - }, - }, - { - name: "invalid stake ID", - msg: MsgUnstake{ - Owner: addr1, - Unstakes: []*MsgUnstake_UnstakeDescriptor{ - { - ID: 0, - Coins: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100))), - }, - }, - }, - }, - { - name: "zero coins (same as nil)", - msg: MsgUnstake{ - Owner: addr1, - Unstakes: []*MsgUnstake_UnstakeDescriptor{ - { - ID: 1, - Coins: sdk.NewCoins(sdk.NewCoin("test1", math.NewInt(0))), - }, - }, - }, - expectPass: true, - }, - { - name: "nil coins (unstake by ID)", - msg: MsgUnstake{ - Owner: addr1, - Unstakes: []*MsgUnstake_UnstakeDescriptor{ - { - ID: 1, - Coins: sdk.NewCoins(), - }, - }, - }, - expectPass: true, - }, - } - - for _, test := range tests { - t.Run(test.name, func(t *testing.T) { - if test.expectPass { - require.NoError(t, test.msg.ValidateBasic(), "test: %v", test.name) - require.Equal(t, test.msg.Route(), RouterKey) - require.Equal(t, test.msg.Type(), "begin_unstaking") - signers := test.msg.GetSigners() - require.Equal(t, len(signers), 1) - require.Equal(t, signers[0].String(), addr1) - } else { - require.Error(t, test.msg.ValidateBasic(), "test: %v", test.name) - } - }) - } -} diff --git a/x/incentives/types/params.go b/x/incentives/types/params.go deleted file mode 100644 index 51747339d..000000000 --- a/x/incentives/types/params.go +++ /dev/null @@ -1,47 +0,0 @@ -package types - -import ( - epochtypes "github.com/neutron-org/neutron/x/epochs/types" - - paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" -) - -// Incentives parameters key store. -var ( - KeyDistrEpochIdentifier = []byte("DistrEpochIdentifier") - KeyMaxGauges = []byte("MaxGauges") -) - -// ParamKeyTable returns the key table for the incentive module's parameters. -func ParamKeyTable() paramtypes.KeyTable { - return paramtypes.NewKeyTable().RegisterParamSet(&Params{}) -} - -// NewParams takes an epoch distribution identifier, then returns an incentives Params struct. -func NewParams(distrEpochIdentifier string, maxGauges uint64) Params { - return Params{ - DistrEpochIdentifier: distrEpochIdentifier, - MaxGauges: maxGauges, - } -} - -// DefaultParams returns the default incentives module parameters. -func DefaultParams() Params { - return Params{ - DistrEpochIdentifier: "day", - MaxGauges: 20, - } -} - -// Validate checks that the incentives module parameters are valid. -func (p Params) Validate() error { - return epochtypes.ValidateEpochIdentifierInterface(p.DistrEpochIdentifier) -} - -// ParamSetPairs takes the parameter struct and associates the paramsubspace key and field of the parameters as a KVStore. -func (p *Params) ParamSetPairs() paramtypes.ParamSetPairs { - return paramtypes.ParamSetPairs{ - paramtypes.NewParamSetPair(KeyDistrEpochIdentifier, &p.DistrEpochIdentifier, epochtypes.ValidateEpochIdentifierInterface), - paramtypes.NewParamSetPair(KeyMaxGauges, &p.MaxGauges, func(interface{}) error { return nil }), - } -} diff --git a/x/incentives/types/params.pb.go b/x/incentives/types/params.pb.go deleted file mode 100644 index 43335aa08..000000000 --- a/x/incentives/types/params.pb.go +++ /dev/null @@ -1,359 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: neutron/incentives/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 holds parameters for the incentives module -type Params struct { - // distr_epoch_identifier is what epoch type distribution will be triggered by - // (day, week, etc.) - DistrEpochIdentifier string `protobuf:"bytes,1,opt,name=distr_epoch_identifier,json=distrEpochIdentifier,proto3" json:"distr_epoch_identifier,omitempty" yaml:"distr_epoch_identifier"` - MaxGauges uint64 `protobuf:"varint,2,opt,name=max_gauges,json=maxGauges,proto3" json:"max_gauges,omitempty" yaml:"max_gauges"` -} - -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_26b1e31ea29bccbb, []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) GetDistrEpochIdentifier() string { - if m != nil { - return m.DistrEpochIdentifier - } - return "" -} - -func (m *Params) GetMaxGauges() uint64 { - if m != nil { - return m.MaxGauges - } - return 0 -} - -func init() { - proto.RegisterType((*Params)(nil), "neutron.incentives.Params") -} - -func init() { proto.RegisterFile("neutron/incentives/params.proto", fileDescriptor_26b1e31ea29bccbb) } - -var fileDescriptor_26b1e31ea29bccbb = []byte{ - // 242 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xcf, 0x4b, 0x2d, 0x2d, - 0x29, 0xca, 0xcf, 0xd3, 0xcf, 0xcc, 0x4b, 0x4e, 0xcd, 0x2b, 0xc9, 0x2c, 0x4b, 0x2d, 0xd6, 0x2f, - 0x48, 0x2c, 0x4a, 0xcc, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x82, 0x2a, 0xd0, - 0x43, 0x28, 0x90, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0x4b, 0xeb, 0x83, 0x58, 0x10, 0x95, 0x4a, - 0xd3, 0x19, 0xb9, 0xd8, 0x02, 0xc0, 0x5a, 0x85, 0xc2, 0xb9, 0xc4, 0x52, 0x32, 0x8b, 0x4b, 0x8a, - 0xe2, 0x53, 0x0b, 0xf2, 0x93, 0x33, 0xe2, 0x33, 0x53, 0x40, 0x3a, 0xd3, 0x32, 0x53, 0x8b, 0x24, - 0x18, 0x15, 0x18, 0x35, 0x38, 0x9d, 0x14, 0x3f, 0xdd, 0x93, 0x97, 0xad, 0x4c, 0xcc, 0xcd, 0xb1, - 0x52, 0xc2, 0xae, 0x4e, 0x29, 0x48, 0x04, 0x2c, 0xe1, 0x0a, 0x12, 0xf7, 0x84, 0x0b, 0x0b, 0x99, - 0x70, 0x71, 0xe5, 0x26, 0x56, 0xc4, 0xa7, 0x27, 0x96, 0xa6, 0xa7, 0x16, 0x4b, 0x30, 0x29, 0x30, - 0x6a, 0xb0, 0x38, 0x89, 0x7e, 0xba, 0x27, 0x2f, 0x08, 0x31, 0x0c, 0x21, 0xa7, 0x14, 0xc4, 0x99, - 0x9b, 0x58, 0xe1, 0x0e, 0x66, 0x3b, 0x79, 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, 0x61, 0x7a, 0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, 0x7e, 0xae, 0x3e, 0xd4, 0xa3, - 0xba, 0xf9, 0x45, 0xe9, 0x30, 0xb6, 0x7e, 0x05, 0x72, 0xb8, 0x94, 0x54, 0x16, 0xa4, 0x16, 0x27, - 0xb1, 0x81, 0x7d, 0x6b, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x2b, 0x9e, 0xe5, 0x1b, 0x3a, 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 m.MaxGauges != 0 { - i = encodeVarintParams(dAtA, i, uint64(m.MaxGauges)) - i-- - dAtA[i] = 0x10 - } - if len(m.DistrEpochIdentifier) > 0 { - i -= len(m.DistrEpochIdentifier) - copy(dAtA[i:], m.DistrEpochIdentifier) - i = encodeVarintParams(dAtA, i, uint64(len(m.DistrEpochIdentifier))) - 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.DistrEpochIdentifier) - if l > 0 { - n += 1 + l + sovParams(uint64(l)) - } - if m.MaxGauges != 0 { - n += 1 + sovParams(uint64(m.MaxGauges)) - } - 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 DistrEpochIdentifier", 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.DistrEpochIdentifier = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field MaxGauges", wireType) - } - m.MaxGauges = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowParams - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.MaxGauges |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - 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/incentives/types/query.pb.go b/x/incentives/types/query.pb.go deleted file mode 100644 index 633166dcd..000000000 --- a/x/incentives/types/query.pb.go +++ /dev/null @@ -1,3584 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: neutron/incentives/query.proto - -package types - -import ( - context "context" - fmt "fmt" - github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" - types "github.com/cosmos/cosmos-sdk/types" - _ "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 - -type GaugeStatus int32 - -const ( - GaugeStatus_ACTIVE_UPCOMING GaugeStatus = 0 - GaugeStatus_ACTIVE GaugeStatus = 1 - GaugeStatus_UPCOMING GaugeStatus = 2 - GaugeStatus_FINISHED GaugeStatus = 3 -) - -var GaugeStatus_name = map[int32]string{ - 0: "ACTIVE_UPCOMING", - 1: "ACTIVE", - 2: "UPCOMING", - 3: "FINISHED", -} - -var GaugeStatus_value = map[string]int32{ - "ACTIVE_UPCOMING": 0, - "ACTIVE": 1, - "UPCOMING": 2, - "FINISHED": 3, -} - -func (x GaugeStatus) String() string { - return proto.EnumName(GaugeStatus_name, int32(x)) -} - -func (GaugeStatus) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_04f05289607f461a, []int{0} -} - -type GetModuleStatusRequest struct { -} - -func (m *GetModuleStatusRequest) Reset() { *m = GetModuleStatusRequest{} } -func (m *GetModuleStatusRequest) String() string { return proto.CompactTextString(m) } -func (*GetModuleStatusRequest) ProtoMessage() {} -func (*GetModuleStatusRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_04f05289607f461a, []int{0} -} -func (m *GetModuleStatusRequest) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *GetModuleStatusRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_GetModuleStatusRequest.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 *GetModuleStatusRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_GetModuleStatusRequest.Merge(m, src) -} -func (m *GetModuleStatusRequest) XXX_Size() int { - return m.Size() -} -func (m *GetModuleStatusRequest) XXX_DiscardUnknown() { - xxx_messageInfo_GetModuleStatusRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_GetModuleStatusRequest proto.InternalMessageInfo - -type GetModuleStatusResponse struct { - // Coins that have yet to be distributed - RewardCoins github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,1,rep,name=reward_coins,json=rewardCoins,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"reward_coins"` - StakedCoins github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,2,rep,name=staked_coins,json=stakedCoins,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"staked_coins"` - Params Params `protobuf:"bytes,3,opt,name=params,proto3" json:"params"` -} - -func (m *GetModuleStatusResponse) Reset() { *m = GetModuleStatusResponse{} } -func (m *GetModuleStatusResponse) String() string { return proto.CompactTextString(m) } -func (*GetModuleStatusResponse) ProtoMessage() {} -func (*GetModuleStatusResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_04f05289607f461a, []int{1} -} -func (m *GetModuleStatusResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *GetModuleStatusResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_GetModuleStatusResponse.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 *GetModuleStatusResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_GetModuleStatusResponse.Merge(m, src) -} -func (m *GetModuleStatusResponse) XXX_Size() int { - return m.Size() -} -func (m *GetModuleStatusResponse) XXX_DiscardUnknown() { - xxx_messageInfo_GetModuleStatusResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_GetModuleStatusResponse proto.InternalMessageInfo - -func (m *GetModuleStatusResponse) GetRewardCoins() github_com_cosmos_cosmos_sdk_types.Coins { - if m != nil { - return m.RewardCoins - } - return nil -} - -func (m *GetModuleStatusResponse) GetStakedCoins() github_com_cosmos_cosmos_sdk_types.Coins { - if m != nil { - return m.StakedCoins - } - return nil -} - -func (m *GetModuleStatusResponse) GetParams() Params { - if m != nil { - return m.Params - } - return Params{} -} - -type GetGaugeByIDRequest struct { - // Gague ID being queried - Id uint64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` -} - -func (m *GetGaugeByIDRequest) Reset() { *m = GetGaugeByIDRequest{} } -func (m *GetGaugeByIDRequest) String() string { return proto.CompactTextString(m) } -func (*GetGaugeByIDRequest) ProtoMessage() {} -func (*GetGaugeByIDRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_04f05289607f461a, []int{2} -} -func (m *GetGaugeByIDRequest) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *GetGaugeByIDRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_GetGaugeByIDRequest.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 *GetGaugeByIDRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_GetGaugeByIDRequest.Merge(m, src) -} -func (m *GetGaugeByIDRequest) XXX_Size() int { - return m.Size() -} -func (m *GetGaugeByIDRequest) XXX_DiscardUnknown() { - xxx_messageInfo_GetGaugeByIDRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_GetGaugeByIDRequest proto.InternalMessageInfo - -func (m *GetGaugeByIDRequest) GetId() uint64 { - if m != nil { - return m.Id - } - return 0 -} - -type GetGaugeByIDResponse struct { - // Gauge that corresponds to provided gague ID - Gauge *Gauge `protobuf:"bytes,1,opt,name=gauge,proto3" json:"gauge,omitempty"` -} - -func (m *GetGaugeByIDResponse) Reset() { *m = GetGaugeByIDResponse{} } -func (m *GetGaugeByIDResponse) String() string { return proto.CompactTextString(m) } -func (*GetGaugeByIDResponse) ProtoMessage() {} -func (*GetGaugeByIDResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_04f05289607f461a, []int{3} -} -func (m *GetGaugeByIDResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *GetGaugeByIDResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_GetGaugeByIDResponse.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 *GetGaugeByIDResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_GetGaugeByIDResponse.Merge(m, src) -} -func (m *GetGaugeByIDResponse) XXX_Size() int { - return m.Size() -} -func (m *GetGaugeByIDResponse) XXX_DiscardUnknown() { - xxx_messageInfo_GetGaugeByIDResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_GetGaugeByIDResponse proto.InternalMessageInfo - -func (m *GetGaugeByIDResponse) GetGauge() *Gauge { - if m != nil { - return m.Gauge - } - return nil -} - -type GetGaugeQualifyingValueRequest struct { - // Gague ID being queried - Id uint64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` -} - -func (m *GetGaugeQualifyingValueRequest) Reset() { *m = GetGaugeQualifyingValueRequest{} } -func (m *GetGaugeQualifyingValueRequest) String() string { return proto.CompactTextString(m) } -func (*GetGaugeQualifyingValueRequest) ProtoMessage() {} -func (*GetGaugeQualifyingValueRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_04f05289607f461a, []int{4} -} -func (m *GetGaugeQualifyingValueRequest) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *GetGaugeQualifyingValueRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_GetGaugeQualifyingValueRequest.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 *GetGaugeQualifyingValueRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_GetGaugeQualifyingValueRequest.Merge(m, src) -} -func (m *GetGaugeQualifyingValueRequest) XXX_Size() int { - return m.Size() -} -func (m *GetGaugeQualifyingValueRequest) XXX_DiscardUnknown() { - xxx_messageInfo_GetGaugeQualifyingValueRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_GetGaugeQualifyingValueRequest proto.InternalMessageInfo - -func (m *GetGaugeQualifyingValueRequest) GetId() uint64 { - if m != nil { - return m.Id - } - return 0 -} - -type GetGaugeQualifyingValueResponse struct { - // The amount of value at the gauge's pricing tick currently qualifying for the gauge. - QualifyingValue uint64 `protobuf:"varint,1,opt,name=qualifying_value,json=qualifyingValue,proto3" json:"qualifying_value,omitempty"` -} - -func (m *GetGaugeQualifyingValueResponse) Reset() { *m = GetGaugeQualifyingValueResponse{} } -func (m *GetGaugeQualifyingValueResponse) String() string { return proto.CompactTextString(m) } -func (*GetGaugeQualifyingValueResponse) ProtoMessage() {} -func (*GetGaugeQualifyingValueResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_04f05289607f461a, []int{5} -} -func (m *GetGaugeQualifyingValueResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *GetGaugeQualifyingValueResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_GetGaugeQualifyingValueResponse.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 *GetGaugeQualifyingValueResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_GetGaugeQualifyingValueResponse.Merge(m, src) -} -func (m *GetGaugeQualifyingValueResponse) XXX_Size() int { - return m.Size() -} -func (m *GetGaugeQualifyingValueResponse) XXX_DiscardUnknown() { - xxx_messageInfo_GetGaugeQualifyingValueResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_GetGaugeQualifyingValueResponse proto.InternalMessageInfo - -func (m *GetGaugeQualifyingValueResponse) GetQualifyingValue() uint64 { - if m != nil { - return m.QualifyingValue - } - return 0 -} - -type GetGaugesRequest struct { - Status GaugeStatus `protobuf:"varint,1,opt,name=status,proto3,enum=neutron.incentives.GaugeStatus" json:"status,omitempty"` - Denom string `protobuf:"bytes,2,opt,name=denom,proto3" json:"denom,omitempty"` -} - -func (m *GetGaugesRequest) Reset() { *m = GetGaugesRequest{} } -func (m *GetGaugesRequest) String() string { return proto.CompactTextString(m) } -func (*GetGaugesRequest) ProtoMessage() {} -func (*GetGaugesRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_04f05289607f461a, []int{6} -} -func (m *GetGaugesRequest) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *GetGaugesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_GetGaugesRequest.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 *GetGaugesRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_GetGaugesRequest.Merge(m, src) -} -func (m *GetGaugesRequest) XXX_Size() int { - return m.Size() -} -func (m *GetGaugesRequest) XXX_DiscardUnknown() { - xxx_messageInfo_GetGaugesRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_GetGaugesRequest proto.InternalMessageInfo - -func (m *GetGaugesRequest) GetStatus() GaugeStatus { - if m != nil { - return m.Status - } - return GaugeStatus_ACTIVE_UPCOMING -} - -func (m *GetGaugesRequest) GetDenom() string { - if m != nil { - return m.Denom - } - return "" -} - -type GetGaugesResponse struct { - // Upcoming and active gauges - Gauges []*Gauge `protobuf:"bytes,1,rep,name=gauges,proto3" json:"gauges,omitempty"` -} - -func (m *GetGaugesResponse) Reset() { *m = GetGaugesResponse{} } -func (m *GetGaugesResponse) String() string { return proto.CompactTextString(m) } -func (*GetGaugesResponse) ProtoMessage() {} -func (*GetGaugesResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_04f05289607f461a, []int{7} -} -func (m *GetGaugesResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *GetGaugesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_GetGaugesResponse.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 *GetGaugesResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_GetGaugesResponse.Merge(m, src) -} -func (m *GetGaugesResponse) XXX_Size() int { - return m.Size() -} -func (m *GetGaugesResponse) XXX_DiscardUnknown() { - xxx_messageInfo_GetGaugesResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_GetGaugesResponse proto.InternalMessageInfo - -func (m *GetGaugesResponse) GetGauges() []*Gauge { - if m != nil { - return m.Gauges - } - return nil -} - -type GetStakeByIDRequest struct { - StakeId uint64 `protobuf:"varint,1,opt,name=stake_id,json=stakeId,proto3" json:"stake_id,omitempty"` -} - -func (m *GetStakeByIDRequest) Reset() { *m = GetStakeByIDRequest{} } -func (m *GetStakeByIDRequest) String() string { return proto.CompactTextString(m) } -func (*GetStakeByIDRequest) ProtoMessage() {} -func (*GetStakeByIDRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_04f05289607f461a, []int{8} -} -func (m *GetStakeByIDRequest) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *GetStakeByIDRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_GetStakeByIDRequest.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 *GetStakeByIDRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_GetStakeByIDRequest.Merge(m, src) -} -func (m *GetStakeByIDRequest) XXX_Size() int { - return m.Size() -} -func (m *GetStakeByIDRequest) XXX_DiscardUnknown() { - xxx_messageInfo_GetStakeByIDRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_GetStakeByIDRequest proto.InternalMessageInfo - -func (m *GetStakeByIDRequest) GetStakeId() uint64 { - if m != nil { - return m.StakeId - } - return 0 -} - -type GetStakeByIDResponse struct { - Stake *Stake `protobuf:"bytes,1,opt,name=stake,proto3" json:"stake,omitempty"` -} - -func (m *GetStakeByIDResponse) Reset() { *m = GetStakeByIDResponse{} } -func (m *GetStakeByIDResponse) String() string { return proto.CompactTextString(m) } -func (*GetStakeByIDResponse) ProtoMessage() {} -func (*GetStakeByIDResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_04f05289607f461a, []int{9} -} -func (m *GetStakeByIDResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *GetStakeByIDResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_GetStakeByIDResponse.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 *GetStakeByIDResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_GetStakeByIDResponse.Merge(m, src) -} -func (m *GetStakeByIDResponse) XXX_Size() int { - return m.Size() -} -func (m *GetStakeByIDResponse) XXX_DiscardUnknown() { - xxx_messageInfo_GetStakeByIDResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_GetStakeByIDResponse proto.InternalMessageInfo - -func (m *GetStakeByIDResponse) GetStake() *Stake { - if m != nil { - return m.Stake - } - return nil -} - -type GetStakesRequest struct { - Owner string `protobuf:"bytes,1,opt,name=owner,proto3" json:"owner,omitempty" yaml:"owner"` -} - -func (m *GetStakesRequest) Reset() { *m = GetStakesRequest{} } -func (m *GetStakesRequest) String() string { return proto.CompactTextString(m) } -func (*GetStakesRequest) ProtoMessage() {} -func (*GetStakesRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_04f05289607f461a, []int{10} -} -func (m *GetStakesRequest) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *GetStakesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_GetStakesRequest.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 *GetStakesRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_GetStakesRequest.Merge(m, src) -} -func (m *GetStakesRequest) XXX_Size() int { - return m.Size() -} -func (m *GetStakesRequest) XXX_DiscardUnknown() { - xxx_messageInfo_GetStakesRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_GetStakesRequest proto.InternalMessageInfo - -func (m *GetStakesRequest) GetOwner() string { - if m != nil { - return m.Owner - } - return "" -} - -type GetStakesResponse struct { - Stakes []*Stake `protobuf:"bytes,1,rep,name=stakes,proto3" json:"stakes,omitempty"` -} - -func (m *GetStakesResponse) Reset() { *m = GetStakesResponse{} } -func (m *GetStakesResponse) String() string { return proto.CompactTextString(m) } -func (*GetStakesResponse) ProtoMessage() {} -func (*GetStakesResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_04f05289607f461a, []int{11} -} -func (m *GetStakesResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *GetStakesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_GetStakesResponse.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 *GetStakesResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_GetStakesResponse.Merge(m, src) -} -func (m *GetStakesResponse) XXX_Size() int { - return m.Size() -} -func (m *GetStakesResponse) XXX_DiscardUnknown() { - xxx_messageInfo_GetStakesResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_GetStakesResponse proto.InternalMessageInfo - -func (m *GetStakesResponse) GetStakes() []*Stake { - if m != nil { - return m.Stakes - } - return nil -} - -type GetFutureRewardEstimateRequest struct { - // Address that is being queried for future estimated rewards - Owner string `protobuf:"bytes,1,opt,name=owner,proto3" json:"owner,omitempty" yaml:"owner"` - // Stake IDs included in future reward estimation - StakeIds []uint64 `protobuf:"varint,2,rep,packed,name=stake_ids,json=stakeIds,proto3" json:"stake_ids,omitempty"` - // Determines upper time limit of reward estimation - // reward estimation goes up to current_epoch + num_epochs - NumEpochs int64 `protobuf:"varint,3,opt,name=num_epochs,json=numEpochs,proto3" json:"num_epochs,omitempty"` -} - -func (m *GetFutureRewardEstimateRequest) Reset() { *m = GetFutureRewardEstimateRequest{} } -func (m *GetFutureRewardEstimateRequest) String() string { return proto.CompactTextString(m) } -func (*GetFutureRewardEstimateRequest) ProtoMessage() {} -func (*GetFutureRewardEstimateRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_04f05289607f461a, []int{12} -} -func (m *GetFutureRewardEstimateRequest) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *GetFutureRewardEstimateRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_GetFutureRewardEstimateRequest.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 *GetFutureRewardEstimateRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_GetFutureRewardEstimateRequest.Merge(m, src) -} -func (m *GetFutureRewardEstimateRequest) XXX_Size() int { - return m.Size() -} -func (m *GetFutureRewardEstimateRequest) XXX_DiscardUnknown() { - xxx_messageInfo_GetFutureRewardEstimateRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_GetFutureRewardEstimateRequest proto.InternalMessageInfo - -func (m *GetFutureRewardEstimateRequest) GetOwner() string { - if m != nil { - return m.Owner - } - return "" -} - -func (m *GetFutureRewardEstimateRequest) GetStakeIds() []uint64 { - if m != nil { - return m.StakeIds - } - return nil -} - -func (m *GetFutureRewardEstimateRequest) GetNumEpochs() int64 { - if m != nil { - return m.NumEpochs - } - return 0 -} - -type GetFutureRewardEstimateResponse struct { - // Estimated coin rewards that will be recieved at provided address - // from specified locks between current time and end epoch - Coins github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,1,rep,name=coins,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"coins"` -} - -func (m *GetFutureRewardEstimateResponse) Reset() { *m = GetFutureRewardEstimateResponse{} } -func (m *GetFutureRewardEstimateResponse) String() string { return proto.CompactTextString(m) } -func (*GetFutureRewardEstimateResponse) ProtoMessage() {} -func (*GetFutureRewardEstimateResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_04f05289607f461a, []int{13} -} -func (m *GetFutureRewardEstimateResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *GetFutureRewardEstimateResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_GetFutureRewardEstimateResponse.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 *GetFutureRewardEstimateResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_GetFutureRewardEstimateResponse.Merge(m, src) -} -func (m *GetFutureRewardEstimateResponse) XXX_Size() int { - return m.Size() -} -func (m *GetFutureRewardEstimateResponse) XXX_DiscardUnknown() { - xxx_messageInfo_GetFutureRewardEstimateResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_GetFutureRewardEstimateResponse proto.InternalMessageInfo - -func (m *GetFutureRewardEstimateResponse) GetCoins() github_com_cosmos_cosmos_sdk_types.Coins { - if m != nil { - return m.Coins - } - return nil -} - -type GetAccountHistoryRequest struct { - // Address that is being queried for account history - Account string `protobuf:"bytes,1,opt,name=account,proto3" json:"account,omitempty" yaml:"account"` -} - -func (m *GetAccountHistoryRequest) Reset() { *m = GetAccountHistoryRequest{} } -func (m *GetAccountHistoryRequest) String() string { return proto.CompactTextString(m) } -func (*GetAccountHistoryRequest) ProtoMessage() {} -func (*GetAccountHistoryRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_04f05289607f461a, []int{14} -} -func (m *GetAccountHistoryRequest) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *GetAccountHistoryRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_GetAccountHistoryRequest.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 *GetAccountHistoryRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_GetAccountHistoryRequest.Merge(m, src) -} -func (m *GetAccountHistoryRequest) XXX_Size() int { - return m.Size() -} -func (m *GetAccountHistoryRequest) XXX_DiscardUnknown() { - xxx_messageInfo_GetAccountHistoryRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_GetAccountHistoryRequest proto.InternalMessageInfo - -func (m *GetAccountHistoryRequest) GetAccount() string { - if m != nil { - return m.Account - } - return "" -} - -type GetAccountHistoryResponse struct { - // Gauge rewards that have been distributed to this address to date - Coins github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,1,rep,name=coins,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"coins"` -} - -func (m *GetAccountHistoryResponse) Reset() { *m = GetAccountHistoryResponse{} } -func (m *GetAccountHistoryResponse) String() string { return proto.CompactTextString(m) } -func (*GetAccountHistoryResponse) ProtoMessage() {} -func (*GetAccountHistoryResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_04f05289607f461a, []int{15} -} -func (m *GetAccountHistoryResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *GetAccountHistoryResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_GetAccountHistoryResponse.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 *GetAccountHistoryResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_GetAccountHistoryResponse.Merge(m, src) -} -func (m *GetAccountHistoryResponse) XXX_Size() int { - return m.Size() -} -func (m *GetAccountHistoryResponse) XXX_DiscardUnknown() { - xxx_messageInfo_GetAccountHistoryResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_GetAccountHistoryResponse proto.InternalMessageInfo - -func (m *GetAccountHistoryResponse) GetCoins() github_com_cosmos_cosmos_sdk_types.Coins { - if m != nil { - return m.Coins - } - return nil -} - -func init() { - proto.RegisterEnum("neutron.incentives.GaugeStatus", GaugeStatus_name, GaugeStatus_value) - proto.RegisterType((*GetModuleStatusRequest)(nil), "neutron.incentives.GetModuleStatusRequest") - proto.RegisterType((*GetModuleStatusResponse)(nil), "neutron.incentives.GetModuleStatusResponse") - proto.RegisterType((*GetGaugeByIDRequest)(nil), "neutron.incentives.GetGaugeByIDRequest") - proto.RegisterType((*GetGaugeByIDResponse)(nil), "neutron.incentives.GetGaugeByIDResponse") - proto.RegisterType((*GetGaugeQualifyingValueRequest)(nil), "neutron.incentives.GetGaugeQualifyingValueRequest") - proto.RegisterType((*GetGaugeQualifyingValueResponse)(nil), "neutron.incentives.GetGaugeQualifyingValueResponse") - proto.RegisterType((*GetGaugesRequest)(nil), "neutron.incentives.GetGaugesRequest") - proto.RegisterType((*GetGaugesResponse)(nil), "neutron.incentives.GetGaugesResponse") - proto.RegisterType((*GetStakeByIDRequest)(nil), "neutron.incentives.GetStakeByIDRequest") - proto.RegisterType((*GetStakeByIDResponse)(nil), "neutron.incentives.GetStakeByIDResponse") - proto.RegisterType((*GetStakesRequest)(nil), "neutron.incentives.GetStakesRequest") - proto.RegisterType((*GetStakesResponse)(nil), "neutron.incentives.GetStakesResponse") - proto.RegisterType((*GetFutureRewardEstimateRequest)(nil), "neutron.incentives.GetFutureRewardEstimateRequest") - proto.RegisterType((*GetFutureRewardEstimateResponse)(nil), "neutron.incentives.GetFutureRewardEstimateResponse") - proto.RegisterType((*GetAccountHistoryRequest)(nil), "neutron.incentives.GetAccountHistoryRequest") - proto.RegisterType((*GetAccountHistoryResponse)(nil), "neutron.incentives.GetAccountHistoryResponse") -} - -func init() { proto.RegisterFile("neutron/incentives/query.proto", fileDescriptor_04f05289607f461a) } - -var fileDescriptor_04f05289607f461a = []byte{ - // 1075 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0x4f, 0x4f, 0x1b, 0xc7, - 0x1b, 0x66, 0x0d, 0x76, 0xf0, 0x80, 0xc0, 0xbf, 0x09, 0xfa, 0xd5, 0xb8, 0xa9, 0x8d, 0x46, 0xa1, - 0x18, 0x12, 0xbc, 0xd8, 0x51, 0x95, 0x2a, 0x55, 0x0e, 0x31, 0x01, 0xe3, 0xb6, 0x49, 0x93, 0xa5, - 0xcd, 0xa1, 0x97, 0xd5, 0x62, 0x4f, 0x96, 0x55, 0xec, 0x1d, 0xb3, 0x33, 0x4b, 0x6a, 0x51, 0x7a, - 0xa8, 0xf2, 0x01, 0xa2, 0xf6, 0x56, 0xa9, 0x5f, 0xa0, 0x97, 0x1e, 0xfa, 0x21, 0x9a, 0x63, 0xa4, - 0x5e, 0x7a, 0xa2, 0x15, 0xf4, 0x13, 0xe4, 0x13, 0x54, 0xfb, 0xce, 0xac, 0xb1, 0x61, 0x77, 0x21, - 0x87, 0xf4, 0x64, 0xef, 0xbc, 0xff, 0x9e, 0xf7, 0x79, 0x67, 0x9e, 0x19, 0x54, 0x74, 0xa9, 0x2f, - 0x3c, 0xe6, 0xea, 0x8e, 0xdb, 0xa2, 0xae, 0x70, 0xf6, 0x29, 0xd7, 0xf7, 0x7c, 0xea, 0xf5, 0x2b, - 0x3d, 0x8f, 0x09, 0x86, 0xb1, 0xb2, 0x57, 0x4e, 0xed, 0x85, 0x39, 0x9b, 0xd9, 0x0c, 0xcc, 0x7a, - 0xf0, 0x4f, 0x7a, 0x16, 0xae, 0xd9, 0x8c, 0xd9, 0x1d, 0xaa, 0x5b, 0x3d, 0x47, 0xb7, 0x5c, 0x97, - 0x09, 0x4b, 0x38, 0xcc, 0xe5, 0xca, 0x5a, 0x6c, 0x31, 0xde, 0x65, 0x5c, 0xdf, 0xb1, 0x38, 0xd5, - 0xf7, 0xab, 0x3b, 0x54, 0x58, 0x55, 0xbd, 0xc5, 0x1c, 0x57, 0xd9, 0x57, 0x86, 0xed, 0x00, 0x60, - 0xe0, 0xd5, 0xb3, 0x6c, 0xc7, 0x85, 0x64, 0x61, 0xae, 0x08, 0xcc, 0xb6, 0xe5, 0xdb, 0x34, 0xc1, - 0xce, 0x85, 0xf5, 0x2c, 0xb4, 0x97, 0x22, 0xec, 0x3d, 0xcb, 0xb3, 0xba, 0x0a, 0x2c, 0xc9, 0xa3, - 0xff, 0x37, 0xa8, 0x78, 0xc0, 0xda, 0x7e, 0x87, 0x6e, 0x0b, 0x4b, 0xf8, 0xdc, 0xa0, 0x7b, 0x3e, - 0xe5, 0x82, 0xfc, 0x96, 0x42, 0xef, 0x9d, 0x33, 0xf1, 0x1e, 0x73, 0x39, 0xc5, 0x2e, 0x9a, 0xf6, - 0xe8, 0x73, 0xcb, 0x6b, 0x9b, 0x41, 0x5f, 0x3c, 0xaf, 0x2d, 0x8c, 0x97, 0xa7, 0x6a, 0xf3, 0x15, - 0xd9, 0x59, 0x25, 0xe8, 0xac, 0xa2, 0x7a, 0xaa, 0xac, 0x33, 0xc7, 0xad, 0xaf, 0xbd, 0x3a, 0x2a, - 0x8d, 0xfd, 0xf2, 0x57, 0xa9, 0x6c, 0x3b, 0x62, 0xd7, 0xdf, 0xa9, 0xb4, 0x58, 0x57, 0x57, 0x34, - 0xc8, 0x9f, 0x55, 0xde, 0x7e, 0xa6, 0x8b, 0x7e, 0x8f, 0x72, 0x08, 0xe0, 0xc6, 0x94, 0x2c, 0x00, - 0x1f, 0x41, 0x3d, 0xe8, 0x2a, 0xac, 0x97, 0x7a, 0x07, 0xf5, 0x64, 0x01, 0x59, 0xef, 0x63, 0x94, - 0x91, 0x2c, 0xe5, 0xc7, 0x17, 0xb4, 0xf2, 0x54, 0xad, 0x50, 0x39, 0xbf, 0x37, 0x2a, 0x8f, 0xc0, - 0xa3, 0x3e, 0x11, 0x94, 0x32, 0x94, 0x3f, 0x59, 0x44, 0x57, 0x1b, 0x54, 0x34, 0x82, 0x11, 0xd5, - 0xfb, 0xcd, 0xfb, 0x8a, 0x4c, 0x3c, 0x83, 0x52, 0x4e, 0x3b, 0xaf, 0x2d, 0x68, 0xe5, 0x09, 0x23, - 0xe5, 0xb4, 0x49, 0x03, 0xcd, 0x8d, 0xba, 0x29, 0x62, 0x75, 0x94, 0x86, 0xf1, 0x82, 0x6b, 0xd0, - 0x61, 0x44, 0x5d, 0x88, 0x32, 0xa4, 0x1f, 0x59, 0x43, 0xc5, 0x30, 0xd1, 0x63, 0xdf, 0xea, 0x38, - 0x4f, 0xfb, 0x8e, 0x6b, 0x3f, 0xb1, 0x3a, 0x3e, 0x8d, 0x2b, 0xfd, 0x39, 0x2a, 0xc5, 0x46, 0x28, - 0x14, 0xcb, 0x28, 0xb7, 0x37, 0x30, 0x99, 0xfb, 0x81, 0x4d, 0x25, 0x98, 0xdd, 0x1b, 0x0d, 0x21, - 0x16, 0xca, 0x85, 0xd9, 0xc2, 0x9d, 0x83, 0x6f, 0xa3, 0x0c, 0x87, 0xfd, 0x02, 0x41, 0x33, 0xb5, - 0x52, 0x6c, 0x17, 0x6a, 0x5b, 0x29, 0x77, 0x3c, 0x87, 0xd2, 0x6d, 0xea, 0xb2, 0x6e, 0x3e, 0xb5, - 0xa0, 0x95, 0xb3, 0x86, 0xfc, 0x20, 0x9b, 0xe8, 0x7f, 0x43, 0x25, 0x14, 0xc4, 0x2a, 0xca, 0x00, - 0x01, 0xa7, 0x7b, 0x2f, 0x96, 0x29, 0xe5, 0x48, 0xd6, 0x60, 0x34, 0xdb, 0xc1, 0x98, 0x87, 0x47, - 0x33, 0x8f, 0x26, 0x61, 0xf4, 0xe6, 0x80, 0xa5, 0x2b, 0xf0, 0xdd, 0x0c, 0xa7, 0x34, 0x14, 0x71, - 0x3a, 0x25, 0x70, 0x49, 0x9a, 0x12, 0x44, 0x19, 0xd2, 0x8f, 0xdc, 0x01, 0x96, 0x60, 0x69, 0xc0, - 0xd2, 0x87, 0x28, 0xcd, 0x9e, 0xbb, 0xd4, 0x83, 0x24, 0xd9, 0x7a, 0xee, 0xcd, 0x51, 0x69, 0xba, - 0x6f, 0x75, 0x3b, 0x77, 0x08, 0x2c, 0x13, 0x43, 0x9a, 0x55, 0xfb, 0x61, 0xec, 0x69, 0xfb, 0x90, - 0x39, 0xb1, 0x7d, 0x09, 0x41, 0x39, 0x92, 0x17, 0x1a, 0x6c, 0x95, 0x4d, 0x5f, 0xf8, 0x1e, 0x35, - 0xe0, 0x70, 0x6d, 0x70, 0xe1, 0x74, 0x2d, 0x41, 0xdf, 0x12, 0x12, 0x7e, 0x1f, 0x65, 0x43, 0xca, - 0xe4, 0x59, 0x9c, 0x30, 0x26, 0x15, 0x67, 0x1c, 0x7f, 0x80, 0x90, 0xeb, 0x77, 0x4d, 0xda, 0x63, - 0xad, 0x5d, 0x79, 0x7e, 0xc6, 0x8d, 0xac, 0xeb, 0x77, 0x37, 0x60, 0x21, 0x80, 0x51, 0x8a, 0x85, - 0xa1, 0xba, 0xb3, 0x50, 0xfa, 0x9d, 0xe9, 0x8a, 0xcc, 0x4c, 0xb6, 0x50, 0xbe, 0x41, 0xc5, 0xbd, - 0x56, 0x8b, 0xf9, 0xae, 0xd8, 0x72, 0xb8, 0x60, 0x5e, 0x3f, 0xa4, 0xe1, 0x26, 0xba, 0x62, 0x49, - 0x83, 0x22, 0x02, 0xbf, 0x39, 0x2a, 0xcd, 0x48, 0x22, 0x94, 0x81, 0x18, 0xa1, 0x0b, 0xf9, 0x0e, - 0xcd, 0x47, 0x64, 0xfa, 0xcf, 0x3a, 0x59, 0xf9, 0x14, 0x4d, 0x0d, 0x9d, 0x25, 0x7c, 0x15, 0xcd, - 0xde, 0x5b, 0xff, 0xb2, 0xf9, 0x64, 0xc3, 0xfc, 0xea, 0xd1, 0xfa, 0x17, 0x0f, 0x9a, 0x0f, 0x1b, - 0xb9, 0x31, 0x8c, 0x50, 0x46, 0x2e, 0xe6, 0x34, 0x3c, 0x8d, 0x26, 0x07, 0x96, 0x54, 0xf0, 0xb5, - 0xd9, 0x7c, 0xd8, 0xdc, 0xde, 0xda, 0xb8, 0x9f, 0x1b, 0xaf, 0xfd, 0x84, 0x50, 0xfa, 0x71, 0x70, - 0x23, 0xe1, 0x9f, 0x35, 0x34, 0x7b, 0x46, 0xfd, 0xf1, 0x4a, 0xe4, 0x19, 0x8b, 0xbc, 0x3d, 0x0a, - 0x37, 0x2e, 0xe5, 0x2b, 0x59, 0x22, 0xd5, 0xef, 0xff, 0xf8, 0xe7, 0xc7, 0xd4, 0x0d, 0xbc, 0xac, - 0x47, 0x5c, 0x57, 0xe1, 0xdd, 0xd8, 0x85, 0x48, 0x53, 0x49, 0xc5, 0x0f, 0x1a, 0x9a, 0x1e, 0x56, - 0x50, 0xbc, 0x14, 0x53, 0xf0, 0xac, 0x14, 0x17, 0xca, 0x17, 0x3b, 0x2a, 0x58, 0x3a, 0xc0, 0x5a, - 0xc6, 0x4b, 0x49, 0xb0, 0xa4, 0xb8, 0xe8, 0x07, 0x4e, 0xfb, 0x10, 0xbf, 0xd0, 0x50, 0x76, 0x20, - 0x55, 0xf8, 0x7a, 0x52, 0xa1, 0x01, 0x51, 0x8b, 0x17, 0x78, 0x29, 0x2c, 0x2b, 0x80, 0xe5, 0x3a, - 0x26, 0x17, 0x63, 0xc1, 0x2f, 0x25, 0x37, 0x03, 0xdd, 0x8a, 0xe5, 0xe6, 0xac, 0x16, 0xc6, 0x72, - 0x73, 0x4e, 0x02, 0xc9, 0x2a, 0xe0, 0x59, 0xc2, 0x8b, 0x7a, 0xdc, 0x0b, 0x84, 0xeb, 0x07, 0xa1, - 0x48, 0x1c, 0xe2, 0x6f, 0x81, 0x18, 0x29, 0x62, 0xb1, 0xc4, 0x8c, 0xe8, 0x63, 0x2c, 0x31, 0xa3, - 0x4a, 0x48, 0x08, 0x00, 0xb9, 0x86, 0x0b, 0xf1, 0x40, 0xf0, 0xef, 0x1a, 0x3c, 0x65, 0xa2, 0x34, - 0x07, 0xd7, 0x62, 0xca, 0x24, 0xe8, 0x64, 0xe1, 0xd6, 0x5b, 0xc5, 0x28, 0xa0, 0xeb, 0x00, 0xf4, - 0x2e, 0xfe, 0x24, 0x69, 0x82, 0x4f, 0x21, 0x83, 0x29, 0xdf, 0x3e, 0xdc, 0xa4, 0x2a, 0x89, 0x7e, - 0x00, 0xc2, 0x7b, 0x88, 0x7f, 0xd5, 0xe0, 0x36, 0x18, 0x55, 0x1b, 0x7c, 0x33, 0x06, 0x4f, 0xa4, - 0xbc, 0x15, 0x56, 0x2f, 0xe9, 0xad, 0x70, 0xdf, 0x05, 0xdc, 0xb7, 0xf1, 0x47, 0x49, 0xb8, 0x95, - 0x18, 0x9a, 0xbb, 0x32, 0x58, 0x3f, 0x50, 0x0b, 0x87, 0x21, 0xf7, 0x51, 0xef, 0x8d, 0x58, 0xee, - 0x13, 0x9e, 0x33, 0xb1, 0xdc, 0x27, 0x3d, 0x68, 0x2e, 0xc7, 0xbd, 0x4d, 0x85, 0x09, 0x27, 0xc8, - 0x3c, 0xfb, 0xf8, 0x81, 0xd3, 0x5d, 0xff, 0xec, 0xd5, 0x71, 0x51, 0x7b, 0x7d, 0x5c, 0xd4, 0xfe, - 0x3e, 0x2e, 0x6a, 0x2f, 0x4f, 0x8a, 0x63, 0xaf, 0x4f, 0x8a, 0x63, 0x7f, 0x9e, 0x14, 0xc7, 0xbe, - 0xae, 0x0e, 0x69, 0xb6, 0x2a, 0xb0, 0xca, 0x3c, 0x7b, 0x50, 0xec, 0x9b, 0xe1, 0x72, 0x20, 0xe1, - 0x3b, 0x19, 0x78, 0x7e, 0xdf, 0xfa, 0x37, 0x00, 0x00, 0xff, 0xff, 0xc4, 0xcb, 0x7d, 0x4c, 0x95, - 0x0c, 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 { - // GetModuleStatus returns a rundown of coins in the module and their status - GetModuleStatus(ctx context.Context, in *GetModuleStatusRequest, opts ...grpc.CallOption) (*GetModuleStatusResponse, error) - // GetGaugeByID returns a gauge by its ID - GetGaugeByID(ctx context.Context, in *GetGaugeByIDRequest, opts ...grpc.CallOption) (*GetGaugeByIDResponse, error) - // GetGauges returns gauges according to the filter provided - GetGauges(ctx context.Context, in *GetGaugesRequest, opts ...grpc.CallOption) (*GetGaugesResponse, error) - // GetStakeByID returns a stake by its ID - GetStakeByID(ctx context.Context, in *GetStakeByIDRequest, opts ...grpc.CallOption) (*GetStakeByIDResponse, error) - // GetStakes returns stakes by the filter provided. At least one filter must be provided. - GetStakes(ctx context.Context, in *GetStakesRequest, opts ...grpc.CallOption) (*GetStakesResponse, error) - // GetFutureRewardsEstimate returns an estimate of the rewards from now until a specified - // time in the future. The requestor either provides an address or a set of locks - // for which they want to find the associated rewards. - GetFutureRewardEstimate(ctx context.Context, in *GetFutureRewardEstimateRequest, opts ...grpc.CallOption) (*GetFutureRewardEstimateResponse, error) - // GetAccountHistory returns the total accumulated rewards per denom for a given user. - GetAccountHistory(ctx context.Context, in *GetAccountHistoryRequest, opts ...grpc.CallOption) (*GetAccountHistoryResponse, error) - // Returns the total amount of value currently qualifying for the gauge. This is useful for calculating - // the prospective future rewards of staking. - GetGaugeQualifyingValue(ctx context.Context, in *GetGaugeQualifyingValueRequest, opts ...grpc.CallOption) (*GetGaugeQualifyingValueResponse, error) -} - -type queryClient struct { - cc grpc1.ClientConn -} - -func NewQueryClient(cc grpc1.ClientConn) QueryClient { - return &queryClient{cc} -} - -func (c *queryClient) GetModuleStatus(ctx context.Context, in *GetModuleStatusRequest, opts ...grpc.CallOption) (*GetModuleStatusResponse, error) { - out := new(GetModuleStatusResponse) - err := c.cc.Invoke(ctx, "/neutron.incentives.Query/GetModuleStatus", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *queryClient) GetGaugeByID(ctx context.Context, in *GetGaugeByIDRequest, opts ...grpc.CallOption) (*GetGaugeByIDResponse, error) { - out := new(GetGaugeByIDResponse) - err := c.cc.Invoke(ctx, "/neutron.incentives.Query/GetGaugeByID", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *queryClient) GetGauges(ctx context.Context, in *GetGaugesRequest, opts ...grpc.CallOption) (*GetGaugesResponse, error) { - out := new(GetGaugesResponse) - err := c.cc.Invoke(ctx, "/neutron.incentives.Query/GetGauges", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *queryClient) GetStakeByID(ctx context.Context, in *GetStakeByIDRequest, opts ...grpc.CallOption) (*GetStakeByIDResponse, error) { - out := new(GetStakeByIDResponse) - err := c.cc.Invoke(ctx, "/neutron.incentives.Query/GetStakeByID", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *queryClient) GetStakes(ctx context.Context, in *GetStakesRequest, opts ...grpc.CallOption) (*GetStakesResponse, error) { - out := new(GetStakesResponse) - err := c.cc.Invoke(ctx, "/neutron.incentives.Query/GetStakes", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *queryClient) GetFutureRewardEstimate(ctx context.Context, in *GetFutureRewardEstimateRequest, opts ...grpc.CallOption) (*GetFutureRewardEstimateResponse, error) { - out := new(GetFutureRewardEstimateResponse) - err := c.cc.Invoke(ctx, "/neutron.incentives.Query/GetFutureRewardEstimate", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *queryClient) GetAccountHistory(ctx context.Context, in *GetAccountHistoryRequest, opts ...grpc.CallOption) (*GetAccountHistoryResponse, error) { - out := new(GetAccountHistoryResponse) - err := c.cc.Invoke(ctx, "/neutron.incentives.Query/GetAccountHistory", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *queryClient) GetGaugeQualifyingValue(ctx context.Context, in *GetGaugeQualifyingValueRequest, opts ...grpc.CallOption) (*GetGaugeQualifyingValueResponse, error) { - out := new(GetGaugeQualifyingValueResponse) - err := c.cc.Invoke(ctx, "/neutron.incentives.Query/GetGaugeQualifyingValue", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - -// QueryServer is the server API for Query service. -type QueryServer interface { - // GetModuleStatus returns a rundown of coins in the module and their status - GetModuleStatus(context.Context, *GetModuleStatusRequest) (*GetModuleStatusResponse, error) - // GetGaugeByID returns a gauge by its ID - GetGaugeByID(context.Context, *GetGaugeByIDRequest) (*GetGaugeByIDResponse, error) - // GetGauges returns gauges according to the filter provided - GetGauges(context.Context, *GetGaugesRequest) (*GetGaugesResponse, error) - // GetStakeByID returns a stake by its ID - GetStakeByID(context.Context, *GetStakeByIDRequest) (*GetStakeByIDResponse, error) - // GetStakes returns stakes by the filter provided. At least one filter must be provided. - GetStakes(context.Context, *GetStakesRequest) (*GetStakesResponse, error) - // GetFutureRewardsEstimate returns an estimate of the rewards from now until a specified - // time in the future. The requestor either provides an address or a set of locks - // for which they want to find the associated rewards. - GetFutureRewardEstimate(context.Context, *GetFutureRewardEstimateRequest) (*GetFutureRewardEstimateResponse, error) - // GetAccountHistory returns the total accumulated rewards per denom for a given user. - GetAccountHistory(context.Context, *GetAccountHistoryRequest) (*GetAccountHistoryResponse, error) - // Returns the total amount of value currently qualifying for the gauge. This is useful for calculating - // the prospective future rewards of staking. - GetGaugeQualifyingValue(context.Context, *GetGaugeQualifyingValueRequest) (*GetGaugeQualifyingValueResponse, error) -} - -// UnimplementedQueryServer can be embedded to have forward compatible implementations. -type UnimplementedQueryServer struct { -} - -func (*UnimplementedQueryServer) GetModuleStatus(ctx context.Context, req *GetModuleStatusRequest) (*GetModuleStatusResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method GetModuleStatus not implemented") -} -func (*UnimplementedQueryServer) GetGaugeByID(ctx context.Context, req *GetGaugeByIDRequest) (*GetGaugeByIDResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method GetGaugeByID not implemented") -} -func (*UnimplementedQueryServer) GetGauges(ctx context.Context, req *GetGaugesRequest) (*GetGaugesResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method GetGauges not implemented") -} -func (*UnimplementedQueryServer) GetStakeByID(ctx context.Context, req *GetStakeByIDRequest) (*GetStakeByIDResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method GetStakeByID not implemented") -} -func (*UnimplementedQueryServer) GetStakes(ctx context.Context, req *GetStakesRequest) (*GetStakesResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method GetStakes not implemented") -} -func (*UnimplementedQueryServer) GetFutureRewardEstimate(ctx context.Context, req *GetFutureRewardEstimateRequest) (*GetFutureRewardEstimateResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method GetFutureRewardEstimate not implemented") -} -func (*UnimplementedQueryServer) GetAccountHistory(ctx context.Context, req *GetAccountHistoryRequest) (*GetAccountHistoryResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method GetAccountHistory not implemented") -} -func (*UnimplementedQueryServer) GetGaugeQualifyingValue(ctx context.Context, req *GetGaugeQualifyingValueRequest) (*GetGaugeQualifyingValueResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method GetGaugeQualifyingValue not implemented") -} - -func RegisterQueryServer(s grpc1.Server, srv QueryServer) { - s.RegisterService(&_Query_serviceDesc, srv) -} - -func _Query_GetModuleStatus_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(GetModuleStatusRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(QueryServer).GetModuleStatus(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/neutron.incentives.Query/GetModuleStatus", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).GetModuleStatus(ctx, req.(*GetModuleStatusRequest)) - } - return interceptor(ctx, in, info, handler) -} - -func _Query_GetGaugeByID_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(GetGaugeByIDRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(QueryServer).GetGaugeByID(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/neutron.incentives.Query/GetGaugeByID", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).GetGaugeByID(ctx, req.(*GetGaugeByIDRequest)) - } - return interceptor(ctx, in, info, handler) -} - -func _Query_GetGauges_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(GetGaugesRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(QueryServer).GetGauges(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/neutron.incentives.Query/GetGauges", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).GetGauges(ctx, req.(*GetGaugesRequest)) - } - return interceptor(ctx, in, info, handler) -} - -func _Query_GetStakeByID_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(GetStakeByIDRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(QueryServer).GetStakeByID(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/neutron.incentives.Query/GetStakeByID", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).GetStakeByID(ctx, req.(*GetStakeByIDRequest)) - } - return interceptor(ctx, in, info, handler) -} - -func _Query_GetStakes_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(GetStakesRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(QueryServer).GetStakes(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/neutron.incentives.Query/GetStakes", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).GetStakes(ctx, req.(*GetStakesRequest)) - } - return interceptor(ctx, in, info, handler) -} - -func _Query_GetFutureRewardEstimate_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(GetFutureRewardEstimateRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(QueryServer).GetFutureRewardEstimate(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/neutron.incentives.Query/GetFutureRewardEstimate", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).GetFutureRewardEstimate(ctx, req.(*GetFutureRewardEstimateRequest)) - } - return interceptor(ctx, in, info, handler) -} - -func _Query_GetAccountHistory_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(GetAccountHistoryRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(QueryServer).GetAccountHistory(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/neutron.incentives.Query/GetAccountHistory", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).GetAccountHistory(ctx, req.(*GetAccountHistoryRequest)) - } - return interceptor(ctx, in, info, handler) -} - -func _Query_GetGaugeQualifyingValue_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(GetGaugeQualifyingValueRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(QueryServer).GetGaugeQualifyingValue(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/neutron.incentives.Query/GetGaugeQualifyingValue", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).GetGaugeQualifyingValue(ctx, req.(*GetGaugeQualifyingValueRequest)) - } - return interceptor(ctx, in, info, handler) -} - -var _Query_serviceDesc = grpc.ServiceDesc{ - ServiceName: "neutron.incentives.Query", - HandlerType: (*QueryServer)(nil), - Methods: []grpc.MethodDesc{ - { - MethodName: "GetModuleStatus", - Handler: _Query_GetModuleStatus_Handler, - }, - { - MethodName: "GetGaugeByID", - Handler: _Query_GetGaugeByID_Handler, - }, - { - MethodName: "GetGauges", - Handler: _Query_GetGauges_Handler, - }, - { - MethodName: "GetStakeByID", - Handler: _Query_GetStakeByID_Handler, - }, - { - MethodName: "GetStakes", - Handler: _Query_GetStakes_Handler, - }, - { - MethodName: "GetFutureRewardEstimate", - Handler: _Query_GetFutureRewardEstimate_Handler, - }, - { - MethodName: "GetAccountHistory", - Handler: _Query_GetAccountHistory_Handler, - }, - { - MethodName: "GetGaugeQualifyingValue", - Handler: _Query_GetGaugeQualifyingValue_Handler, - }, - }, - Streams: []grpc.StreamDesc{}, - Metadata: "neutron/incentives/query.proto", -} - -func (m *GetModuleStatusRequest) 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 *GetModuleStatusRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *GetModuleStatusRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - return len(dAtA) - i, nil -} - -func (m *GetModuleStatusResponse) 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 *GetModuleStatusResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *GetModuleStatusResponse) 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] = 0x1a - if len(m.StakedCoins) > 0 { - for iNdEx := len(m.StakedCoins) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.StakedCoins[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintQuery(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - } - if len(m.RewardCoins) > 0 { - for iNdEx := len(m.RewardCoins) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.RewardCoins[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 *GetGaugeByIDRequest) 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 *GetGaugeByIDRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *GetGaugeByIDRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.Id != 0 { - i = encodeVarintQuery(dAtA, i, uint64(m.Id)) - i-- - dAtA[i] = 0x8 - } - return len(dAtA) - i, nil -} - -func (m *GetGaugeByIDResponse) 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 *GetGaugeByIDResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *GetGaugeByIDResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.Gauge != nil { - { - size, err := m.Gauge.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 *GetGaugeQualifyingValueRequest) 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 *GetGaugeQualifyingValueRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *GetGaugeQualifyingValueRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.Id != 0 { - i = encodeVarintQuery(dAtA, i, uint64(m.Id)) - i-- - dAtA[i] = 0x8 - } - return len(dAtA) - i, nil -} - -func (m *GetGaugeQualifyingValueResponse) 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 *GetGaugeQualifyingValueResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *GetGaugeQualifyingValueResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.QualifyingValue != 0 { - i = encodeVarintQuery(dAtA, i, uint64(m.QualifyingValue)) - i-- - dAtA[i] = 0x8 - } - return len(dAtA) - i, nil -} - -func (m *GetGaugesRequest) 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 *GetGaugesRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *GetGaugesRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Denom) > 0 { - i -= len(m.Denom) - copy(dAtA[i:], m.Denom) - i = encodeVarintQuery(dAtA, i, uint64(len(m.Denom))) - i-- - dAtA[i] = 0x12 - } - if m.Status != 0 { - i = encodeVarintQuery(dAtA, i, uint64(m.Status)) - i-- - dAtA[i] = 0x8 - } - return len(dAtA) - i, nil -} - -func (m *GetGaugesResponse) 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 *GetGaugesResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *GetGaugesResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Gauges) > 0 { - for iNdEx := len(m.Gauges) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Gauges[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 *GetStakeByIDRequest) 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 *GetStakeByIDRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *GetStakeByIDRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.StakeId != 0 { - i = encodeVarintQuery(dAtA, i, uint64(m.StakeId)) - i-- - dAtA[i] = 0x8 - } - return len(dAtA) - i, nil -} - -func (m *GetStakeByIDResponse) 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 *GetStakeByIDResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *GetStakeByIDResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.Stake != nil { - { - size, err := m.Stake.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 *GetStakesRequest) 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 *GetStakesRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *GetStakesRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Owner) > 0 { - i -= len(m.Owner) - copy(dAtA[i:], m.Owner) - i = encodeVarintQuery(dAtA, i, uint64(len(m.Owner))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *GetStakesResponse) 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 *GetStakesResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *GetStakesResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Stakes) > 0 { - for iNdEx := len(m.Stakes) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Stakes[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 *GetFutureRewardEstimateRequest) 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 *GetFutureRewardEstimateRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *GetFutureRewardEstimateRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.NumEpochs != 0 { - i = encodeVarintQuery(dAtA, i, uint64(m.NumEpochs)) - i-- - dAtA[i] = 0x18 - } - if len(m.StakeIds) > 0 { - dAtA5 := make([]byte, len(m.StakeIds)*10) - var j4 int - for _, num := range m.StakeIds { - for num >= 1<<7 { - dAtA5[j4] = uint8(uint64(num)&0x7f | 0x80) - num >>= 7 - j4++ - } - dAtA5[j4] = uint8(num) - j4++ - } - i -= j4 - copy(dAtA[i:], dAtA5[:j4]) - i = encodeVarintQuery(dAtA, i, uint64(j4)) - i-- - dAtA[i] = 0x12 - } - if len(m.Owner) > 0 { - i -= len(m.Owner) - copy(dAtA[i:], m.Owner) - i = encodeVarintQuery(dAtA, i, uint64(len(m.Owner))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *GetFutureRewardEstimateResponse) 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 *GetFutureRewardEstimateResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *GetFutureRewardEstimateResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Coins) > 0 { - for iNdEx := len(m.Coins) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Coins[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 *GetAccountHistoryRequest) 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 *GetAccountHistoryRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *GetAccountHistoryRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Account) > 0 { - i -= len(m.Account) - copy(dAtA[i:], m.Account) - i = encodeVarintQuery(dAtA, i, uint64(len(m.Account))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *GetAccountHistoryResponse) 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 *GetAccountHistoryResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *GetAccountHistoryResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Coins) > 0 { - for iNdEx := len(m.Coins) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Coins[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 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 *GetModuleStatusRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - return n -} - -func (m *GetModuleStatusResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if len(m.RewardCoins) > 0 { - for _, e := range m.RewardCoins { - l = e.Size() - n += 1 + l + sovQuery(uint64(l)) - } - } - if len(m.StakedCoins) > 0 { - for _, e := range m.StakedCoins { - l = e.Size() - n += 1 + l + sovQuery(uint64(l)) - } - } - l = m.Params.Size() - n += 1 + l + sovQuery(uint64(l)) - return n -} - -func (m *GetGaugeByIDRequest) 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 *GetGaugeByIDResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Gauge != nil { - l = m.Gauge.Size() - n += 1 + l + sovQuery(uint64(l)) - } - return n -} - -func (m *GetGaugeQualifyingValueRequest) 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 *GetGaugeQualifyingValueResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.QualifyingValue != 0 { - n += 1 + sovQuery(uint64(m.QualifyingValue)) - } - return n -} - -func (m *GetGaugesRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Status != 0 { - n += 1 + sovQuery(uint64(m.Status)) - } - l = len(m.Denom) - if l > 0 { - n += 1 + l + sovQuery(uint64(l)) - } - return n -} - -func (m *GetGaugesResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if len(m.Gauges) > 0 { - for _, e := range m.Gauges { - l = e.Size() - n += 1 + l + sovQuery(uint64(l)) - } - } - return n -} - -func (m *GetStakeByIDRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.StakeId != 0 { - n += 1 + sovQuery(uint64(m.StakeId)) - } - return n -} - -func (m *GetStakeByIDResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Stake != nil { - l = m.Stake.Size() - n += 1 + l + sovQuery(uint64(l)) - } - return n -} - -func (m *GetStakesRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Owner) - if l > 0 { - n += 1 + l + sovQuery(uint64(l)) - } - return n -} - -func (m *GetStakesResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if len(m.Stakes) > 0 { - for _, e := range m.Stakes { - l = e.Size() - n += 1 + l + sovQuery(uint64(l)) - } - } - return n -} - -func (m *GetFutureRewardEstimateRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Owner) - if l > 0 { - n += 1 + l + sovQuery(uint64(l)) - } - if len(m.StakeIds) > 0 { - l = 0 - for _, e := range m.StakeIds { - l += sovQuery(uint64(e)) - } - n += 1 + sovQuery(uint64(l)) + l - } - if m.NumEpochs != 0 { - n += 1 + sovQuery(uint64(m.NumEpochs)) - } - return n -} - -func (m *GetFutureRewardEstimateResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if len(m.Coins) > 0 { - for _, e := range m.Coins { - l = e.Size() - n += 1 + l + sovQuery(uint64(l)) - } - } - return n -} - -func (m *GetAccountHistoryRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Account) - if l > 0 { - n += 1 + l + sovQuery(uint64(l)) - } - return n -} - -func (m *GetAccountHistoryResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if len(m.Coins) > 0 { - for _, e := range m.Coins { - l = e.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 *GetModuleStatusRequest) 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: GetModuleStatusRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: GetModuleStatusRequest: 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 *GetModuleStatusResponse) 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: GetModuleStatusResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: GetModuleStatusResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field RewardCoins", 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.RewardCoins = append(m.RewardCoins, types.Coin{}) - if err := m.RewardCoins[len(m.RewardCoins)-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 StakedCoins", 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.StakedCoins = append(m.StakedCoins, types.Coin{}) - if err := m.StakedCoins[len(m.StakedCoins)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 3: - 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 *GetGaugeByIDRequest) 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: GetGaugeByIDRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: GetGaugeByIDRequest: 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:]) - 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 *GetGaugeByIDResponse) 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: GetGaugeByIDResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: GetGaugeByIDResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Gauge", 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.Gauge == nil { - m.Gauge = &Gauge{} - } - if err := m.Gauge.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 *GetGaugeQualifyingValueRequest) 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: GetGaugeQualifyingValueRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: GetGaugeQualifyingValueRequest: 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:]) - 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 *GetGaugeQualifyingValueResponse) 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: GetGaugeQualifyingValueResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: GetGaugeQualifyingValueResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field QualifyingValue", wireType) - } - m.QualifyingValue = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.QualifyingValue |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - 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 *GetGaugesRequest) 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: GetGaugesRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: GetGaugesRequest: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Status", wireType) - } - m.Status = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Status |= GaugeStatus(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Denom", 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.Denom = 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 *GetGaugesResponse) 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: GetGaugesResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: GetGaugesResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Gauges", 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.Gauges = append(m.Gauges, &Gauge{}) - if err := m.Gauges[len(m.Gauges)-1].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 *GetStakeByIDRequest) 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: GetStakeByIDRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: GetStakeByIDRequest: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field StakeId", wireType) - } - m.StakeId = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.StakeId |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - 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 *GetStakeByIDResponse) 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: GetStakeByIDResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: GetStakeByIDResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Stake", 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.Stake == nil { - m.Stake = &Stake{} - } - if err := m.Stake.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 *GetStakesRequest) 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: GetStakesRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: GetStakesRequest: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Owner", 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.Owner = 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 *GetStakesResponse) 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: GetStakesResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: GetStakesResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Stakes", 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.Stakes = append(m.Stakes, &Stake{}) - if err := m.Stakes[len(m.Stakes)-1].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 *GetFutureRewardEstimateRequest) 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: GetFutureRewardEstimateRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: GetFutureRewardEstimateRequest: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Owner", 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.Owner = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType == 0 { - var v uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.StakeIds = append(m.StakeIds, v) - } else if wireType == 2 { - var packedLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - packedLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if packedLen < 0 { - return ErrInvalidLengthQuery - } - postIndex := iNdEx + packedLen - if postIndex < 0 { - return ErrInvalidLengthQuery - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - var elementCount int - var count int - for _, integer := range dAtA[iNdEx:postIndex] { - if integer < 128 { - count++ - } - } - elementCount = count - if elementCount != 0 && len(m.StakeIds) == 0 { - m.StakeIds = make([]uint64, 0, elementCount) - } - for iNdEx < postIndex { - var v uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.StakeIds = append(m.StakeIds, v) - } - } else { - return fmt.Errorf("proto: wrong wireType = %d for field StakeIds", wireType) - } - case 3: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field NumEpochs", wireType) - } - m.NumEpochs = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.NumEpochs |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - 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 *GetFutureRewardEstimateResponse) 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: GetFutureRewardEstimateResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: GetFutureRewardEstimateResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Coins", 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.Coins = append(m.Coins, types.Coin{}) - if err := m.Coins[len(m.Coins)-1].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 *GetAccountHistoryRequest) 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: GetAccountHistoryRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: GetAccountHistoryRequest: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Account", 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.Account = 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 *GetAccountHistoryResponse) 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: GetAccountHistoryResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: GetAccountHistoryResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Coins", 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.Coins = append(m.Coins, types.Coin{}) - if err := m.Coins[len(m.Coins)-1].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/incentives/types/query.pb.gw.go b/x/incentives/types/query.pb.gw.go deleted file mode 100644 index 7d95daa11..000000000 --- a/x/incentives/types/query.pb.gw.go +++ /dev/null @@ -1,842 +0,0 @@ -// Code generated by protoc-gen-grpc-gateway. DO NOT EDIT. -// source: neutron/incentives/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_GetModuleStatus_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq GetModuleStatusRequest - var metadata runtime.ServerMetadata - - msg, err := client.GetModuleStatus(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) - return msg, metadata, err - -} - -func local_request_Query_GetModuleStatus_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq GetModuleStatusRequest - var metadata runtime.ServerMetadata - - msg, err := server.GetModuleStatus(ctx, &protoReq) - return msg, metadata, err - -} - -func request_Query_GetGaugeByID_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq GetGaugeByIDRequest - var metadata runtime.ServerMetadata - - var ( - val string - ok bool - err error - _ = err - ) - - val, ok = pathParams["id"] - if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") - } - - protoReq.Id, err = runtime.Uint64(val) - - if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id", err) - } - - msg, err := client.GetGaugeByID(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) - return msg, metadata, err - -} - -func local_request_Query_GetGaugeByID_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq GetGaugeByIDRequest - var metadata runtime.ServerMetadata - - var ( - val string - ok bool - err error - _ = err - ) - - val, ok = pathParams["id"] - if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") - } - - protoReq.Id, err = runtime.Uint64(val) - - if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id", err) - } - - msg, err := server.GetGaugeByID(ctx, &protoReq) - return msg, metadata, err - -} - -var ( - filter_Query_GetGauges_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} -) - -func request_Query_GetGauges_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq GetGaugesRequest - 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_GetGauges_0); err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - - msg, err := client.GetGauges(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) - return msg, metadata, err - -} - -func local_request_Query_GetGauges_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq GetGaugesRequest - 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_GetGauges_0); err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - - msg, err := server.GetGauges(ctx, &protoReq) - return msg, metadata, err - -} - -func request_Query_GetStakeByID_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq GetStakeByIDRequest - var metadata runtime.ServerMetadata - - var ( - val string - ok bool - err error - _ = err - ) - - val, ok = pathParams["stake_id"] - if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "stake_id") - } - - protoReq.StakeId, err = runtime.Uint64(val) - - if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "stake_id", err) - } - - msg, err := client.GetStakeByID(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) - return msg, metadata, err - -} - -func local_request_Query_GetStakeByID_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq GetStakeByIDRequest - var metadata runtime.ServerMetadata - - var ( - val string - ok bool - err error - _ = err - ) - - val, ok = pathParams["stake_id"] - if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "stake_id") - } - - protoReq.StakeId, err = runtime.Uint64(val) - - if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "stake_id", err) - } - - msg, err := server.GetStakeByID(ctx, &protoReq) - return msg, metadata, err - -} - -var ( - filter_Query_GetStakes_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} -) - -func request_Query_GetStakes_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq GetStakesRequest - 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_GetStakes_0); err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - - msg, err := client.GetStakes(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) - return msg, metadata, err - -} - -func local_request_Query_GetStakes_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq GetStakesRequest - 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_GetStakes_0); err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - - msg, err := server.GetStakes(ctx, &protoReq) - return msg, metadata, err - -} - -var ( - filter_Query_GetFutureRewardEstimate_0 = &utilities.DoubleArray{Encoding: map[string]int{"owner": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}} -) - -func request_Query_GetFutureRewardEstimate_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq GetFutureRewardEstimateRequest - var metadata runtime.ServerMetadata - - var ( - val string - ok bool - err error - _ = err - ) - - val, ok = pathParams["owner"] - if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "owner") - } - - protoReq.Owner, err = runtime.String(val) - - if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "owner", err) - } - - if err := req.ParseForm(); err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_GetFutureRewardEstimate_0); err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - - msg, err := client.GetFutureRewardEstimate(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) - return msg, metadata, err - -} - -func local_request_Query_GetFutureRewardEstimate_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq GetFutureRewardEstimateRequest - var metadata runtime.ServerMetadata - - var ( - val string - ok bool - err error - _ = err - ) - - val, ok = pathParams["owner"] - if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "owner") - } - - protoReq.Owner, err = runtime.String(val) - - if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "owner", err) - } - - if err := req.ParseForm(); err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_GetFutureRewardEstimate_0); err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - - msg, err := server.GetFutureRewardEstimate(ctx, &protoReq) - return msg, metadata, err - -} - -func request_Query_GetAccountHistory_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq GetAccountHistoryRequest - var metadata runtime.ServerMetadata - - var ( - val string - ok bool - err error - _ = err - ) - - val, ok = pathParams["account"] - if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "account") - } - - protoReq.Account, err = runtime.String(val) - - if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "account", err) - } - - msg, err := client.GetAccountHistory(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) - return msg, metadata, err - -} - -func local_request_Query_GetAccountHistory_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq GetAccountHistoryRequest - var metadata runtime.ServerMetadata - - var ( - val string - ok bool - err error - _ = err - ) - - val, ok = pathParams["account"] - if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "account") - } - - protoReq.Account, err = runtime.String(val) - - if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "account", err) - } - - msg, err := server.GetAccountHistory(ctx, &protoReq) - return msg, metadata, err - -} - -func request_Query_GetGaugeQualifyingValue_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq GetGaugeQualifyingValueRequest - var metadata runtime.ServerMetadata - - var ( - val string - ok bool - err error - _ = err - ) - - val, ok = pathParams["id"] - if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") - } - - protoReq.Id, err = runtime.Uint64(val) - - if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id", err) - } - - msg, err := client.GetGaugeQualifyingValue(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) - return msg, metadata, err - -} - -func local_request_Query_GetGaugeQualifyingValue_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq GetGaugeQualifyingValueRequest - var metadata runtime.ServerMetadata - - var ( - val string - ok bool - err error - _ = err - ) - - val, ok = pathParams["id"] - if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") - } - - protoReq.Id, err = runtime.Uint64(val) - - if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id", err) - } - - msg, err := server.GetGaugeQualifyingValue(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_GetModuleStatus_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_GetModuleStatus_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_GetModuleStatus_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - - }) - - mux.Handle("GET", pattern_Query_GetGaugeByID_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_GetGaugeByID_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_GetGaugeByID_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - - }) - - mux.Handle("GET", pattern_Query_GetGauges_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_GetGauges_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_GetGauges_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - - }) - - mux.Handle("GET", pattern_Query_GetStakeByID_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_GetStakeByID_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_GetStakeByID_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - - }) - - mux.Handle("GET", pattern_Query_GetStakes_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_GetStakes_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_GetStakes_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - - }) - - mux.Handle("GET", pattern_Query_GetFutureRewardEstimate_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_GetFutureRewardEstimate_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_GetFutureRewardEstimate_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - - }) - - mux.Handle("GET", pattern_Query_GetAccountHistory_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_GetAccountHistory_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_GetAccountHistory_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - - }) - - mux.Handle("GET", pattern_Query_GetGaugeQualifyingValue_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_GetGaugeQualifyingValue_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_GetGaugeQualifyingValue_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_GetModuleStatus_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_GetModuleStatus_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_GetModuleStatus_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - - }) - - mux.Handle("GET", pattern_Query_GetGaugeByID_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_GetGaugeByID_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_GetGaugeByID_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - - }) - - mux.Handle("GET", pattern_Query_GetGauges_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_GetGauges_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_GetGauges_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - - }) - - mux.Handle("GET", pattern_Query_GetStakeByID_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_GetStakeByID_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_GetStakeByID_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - - }) - - mux.Handle("GET", pattern_Query_GetStakes_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_GetStakes_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_GetStakes_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - - }) - - mux.Handle("GET", pattern_Query_GetFutureRewardEstimate_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_GetFutureRewardEstimate_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_GetFutureRewardEstimate_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - - }) - - mux.Handle("GET", pattern_Query_GetAccountHistory_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_GetAccountHistory_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_GetAccountHistory_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - - }) - - mux.Handle("GET", pattern_Query_GetGaugeQualifyingValue_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_GetGaugeQualifyingValue_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_GetGaugeQualifyingValue_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - - }) - - return nil -} - -var ( - pattern_Query_GetModuleStatus_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"neutron", "incentives", "v1beta1", "module_status"}, "", runtime.AssumeColonVerbOpt(false))) - - pattern_Query_GetGaugeByID_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"neutron", "incentives", "v1beta1", "gauges", "id"}, "", runtime.AssumeColonVerbOpt(false))) - - pattern_Query_GetGauges_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"neutron", "incentives", "v1beta1", "gauges"}, "", runtime.AssumeColonVerbOpt(false))) - - pattern_Query_GetStakeByID_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"neutron", "incentives", "stakes", "stake_id"}, "", runtime.AssumeColonVerbOpt(false))) - - pattern_Query_GetStakes_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"neutron", "incentives", "stakes"}, "", runtime.AssumeColonVerbOpt(false))) - - pattern_Query_GetFutureRewardEstimate_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"neutron", "incentives", "v1beta1", "future_rewards_estimate", "owner"}, "", runtime.AssumeColonVerbOpt(false))) - - pattern_Query_GetAccountHistory_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"neutron", "incentives", "v1beta1", "account_history", "account"}, "", runtime.AssumeColonVerbOpt(false))) - - pattern_Query_GetGaugeQualifyingValue_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"neutron", "incentives", "v1beta1", "get_gauge_qualifying_value", "id"}, "", runtime.AssumeColonVerbOpt(false))) -) - -var ( - forward_Query_GetModuleStatus_0 = runtime.ForwardResponseMessage - - forward_Query_GetGaugeByID_0 = runtime.ForwardResponseMessage - - forward_Query_GetGauges_0 = runtime.ForwardResponseMessage - - forward_Query_GetStakeByID_0 = runtime.ForwardResponseMessage - - forward_Query_GetStakes_0 = runtime.ForwardResponseMessage - - forward_Query_GetFutureRewardEstimate_0 = runtime.ForwardResponseMessage - - forward_Query_GetAccountHistory_0 = runtime.ForwardResponseMessage - - forward_Query_GetGaugeQualifyingValue_0 = runtime.ForwardResponseMessage -) diff --git a/x/incentives/types/query_condition.go b/x/incentives/types/query_condition.go deleted file mode 100644 index 0a9d45d26..000000000 --- a/x/incentives/types/query_condition.go +++ /dev/null @@ -1,18 +0,0 @@ -package types - -import ( - dextypes "github.com/neutron-org/neutron/x/dex/types" -) - -func (qc QueryCondition) Test(poolMetadata dextypes.PoolMetadata) bool { - if !poolMetadata.PairID.Equal(qc.PairID) { - return false - } - - lowerTick := poolMetadata.Tick - int64(poolMetadata.Fee) - upperTick := poolMetadata.Tick + int64(poolMetadata.Fee) - lowerTickQualifies := qc.StartTick <= lowerTick && lowerTick <= qc.EndTick - upperTickQualifies := qc.StartTick <= upperTick && upperTick <= qc.EndTick - - return lowerTickQualifies && upperTickQualifies -} diff --git a/x/incentives/types/query_condition_test.go b/x/incentives/types/query_condition_test.go deleted file mode 100644 index 13a0fe619..000000000 --- a/x/incentives/types/query_condition_test.go +++ /dev/null @@ -1,62 +0,0 @@ -package types_test - -import ( - "testing" - - "github.com/stretchr/testify/assert" - - dextypes "github.com/neutron-org/neutron/x/dex/types" - . "github.com/neutron-org/neutron/x/incentives/types" -) - -func TestQueryCondition(t *testing.T) { - pairID := &dextypes.PairID{ - Token0: "coin1", - Token1: "coin2", - } - - tests := []struct { - name string - queryCond QueryCondition - poolMetadata dextypes.PoolMetadata - testResult bool - }{ - { - name: "Matching denom and tick range", - queryCond: QueryCondition{PairID: pairID, StartTick: 10, EndTick: 20}, - poolMetadata: dextypes.NewPoolMetadata(pairID, 15, 5, 0), - testResult: true, - }, - { - name: "Non-matching denom", - queryCond: QueryCondition{PairID: pairID, StartTick: 10, EndTick: 20}, - poolMetadata: dextypes.NewPoolMetadata(&dextypes.PairID{Token0: "coin1", Token1: "coin3"}, 15, 5, 0), - testResult: false, - }, - { - name: "Non-matching tick range", - queryCond: QueryCondition{PairID: pairID, StartTick: 30, EndTick: 40}, - poolMetadata: dextypes.NewPoolMetadata(pairID, 15, 6, 0), - testResult: false, - }, - { - name: "Non-matching tick fee range lower", - queryCond: QueryCondition{PairID: pairID, StartTick: 30, EndTick: 40}, - poolMetadata: dextypes.NewPoolMetadata(pairID, 10, 5, 0), - testResult: false, - }, - { - name: "Non-matching tick fee range upper", - queryCond: QueryCondition{PairID: pairID, StartTick: 30, EndTick: 40}, - poolMetadata: dextypes.NewPoolMetadata(pairID, 20, 5, 0), - testResult: false, - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - result := tt.queryCond.Test(tt.poolMetadata) - assert.Equal(t, tt.testResult, result) - }) - } -} diff --git a/x/incentives/types/stake.go b/x/incentives/types/stake.go deleted file mode 100644 index 7d2507cbb..000000000 --- a/x/incentives/types/stake.go +++ /dev/null @@ -1,53 +0,0 @@ -package types - -import ( - "fmt" - "time" - - sdk "github.com/cosmos/cosmos-sdk/types" - dextypes "github.com/neutron-org/neutron/x/dex/types" -) - -// NewStake returns a new instance of period stake. -func NewStake( - id uint64, - owner sdk.AccAddress, - coins sdk.Coins, - startTime time.Time, - startDistEpoch int64, -) *Stake { - coins = coins.Sort() - return &Stake{ - ID: id, - Owner: owner.String(), - Coins: coins, - StartTime: startTime, - StartDistEpoch: startDistEpoch, - } -} - -// OwnerAddress returns stakes owner address. -func (p Stake) OwnerAddress() sdk.AccAddress { - addr, err := sdk.AccAddressFromBech32(p.Owner) - if err != nil { - panic(err) - } - return addr -} - -func (p Stake) SingleCoin() (sdk.Coin, error) { - if len(p.Coins) != 1 { - return sdk.Coin{}, fmt.Errorf("Stake %d has no single coin: %s", p.ID, p.Coins) - } - return p.Coins[0], nil -} - -func (p Stake) ValidateBasic() error { - for _, coin := range p.Coins { - err := dextypes.ValidatePoolDenom(coin.Denom) - if err != nil { - return err - } - } - return nil -} diff --git a/x/incentives/types/stake.pb.go b/x/incentives/types/stake.pb.go deleted file mode 100644 index fd18e7e04..000000000 --- a/x/incentives/types/stake.pb.go +++ /dev/null @@ -1,531 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: neutron/incentives/stake.proto - -package types - -import ( - fmt "fmt" - github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" - types "github.com/cosmos/cosmos-sdk/types" - _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" - github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" - _ "google.golang.org/protobuf/types/known/timestamppb" - io "io" - math "math" - math_bits "math/bits" - time "time" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf -var _ = time.Kitchen - -// 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 - -// Stake records what coins are staked when by who for the purpose of -// calculating gauge reward distributions. -type Stake struct { - // ID is the "autoincrementing" id of the stake, assigned at creation. - ID uint64 `protobuf:"varint,1,opt,name=ID,proto3" json:"ID,omitempty"` - // owner is the account originating the stake. Only the owner can withdraw - // coins from the stake. - Owner string `protobuf:"bytes,2,opt,name=owner,proto3" json:"owner,omitempty" yaml:"owner"` - // start_time is the time at which the coins in the lock were staked. - StartTime time.Time `protobuf:"bytes,3,opt,name=start_time,json=startTime,proto3,stdtime" json:"start_time,omitempty" yaml:"start_time"` - // coins are the tokens staked, and managed by the module account. - Coins github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,4,rep,name=coins,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"coins"` - // start_dist_epoch is the dist epoch (defaulting to the day) at which the - // coins in the lock were staked. This is used by distribution logic to filter - // on stakes that have existed for longer than the distribution period (you - // can only qualify for today's rewards if you staked your LP tokens - // yesterday). We use int64 instead of uint64 to make testing easier. - StartDistEpoch int64 `protobuf:"varint,5,opt,name=start_dist_epoch,json=startDistEpoch,proto3" json:"start_dist_epoch,omitempty"` -} - -func (m *Stake) Reset() { *m = Stake{} } -func (m *Stake) String() string { return proto.CompactTextString(m) } -func (*Stake) ProtoMessage() {} -func (*Stake) Descriptor() ([]byte, []int) { - return fileDescriptor_6900551d6712f42b, []int{0} -} -func (m *Stake) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *Stake) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_Stake.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 *Stake) XXX_Merge(src proto.Message) { - xxx_messageInfo_Stake.Merge(m, src) -} -func (m *Stake) XXX_Size() int { - return m.Size() -} -func (m *Stake) XXX_DiscardUnknown() { - xxx_messageInfo_Stake.DiscardUnknown(m) -} - -var xxx_messageInfo_Stake proto.InternalMessageInfo - -func (m *Stake) GetID() uint64 { - if m != nil { - return m.ID - } - return 0 -} - -func (m *Stake) GetOwner() string { - if m != nil { - return m.Owner - } - return "" -} - -func (m *Stake) GetStartTime() time.Time { - if m != nil { - return m.StartTime - } - return time.Time{} -} - -func (m *Stake) GetCoins() github_com_cosmos_cosmos_sdk_types.Coins { - if m != nil { - return m.Coins - } - return nil -} - -func (m *Stake) GetStartDistEpoch() int64 { - if m != nil { - return m.StartDistEpoch - } - return 0 -} - -func init() { - proto.RegisterType((*Stake)(nil), "neutron.incentives.Stake") -} - -func init() { proto.RegisterFile("neutron/incentives/stake.proto", fileDescriptor_6900551d6712f42b) } - -var fileDescriptor_6900551d6712f42b = []byte{ - // 396 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0x51, 0xb1, 0x6e, 0xdb, 0x30, - 0x10, 0x15, 0xe5, 0xa8, 0x40, 0x98, 0x22, 0x48, 0x85, 0x0c, 0xaa, 0x07, 0x4a, 0xd0, 0x50, 0x68, - 0x68, 0xc8, 0x3a, 0x45, 0x97, 0x8e, 0xaa, 0x3b, 0x04, 0xdd, 0xd4, 0x4e, 0x5d, 0x02, 0x49, 0x61, - 0x15, 0x22, 0x91, 0x4e, 0x10, 0xe9, 0xb4, 0xfe, 0x0b, 0x7f, 0x47, 0x3f, 0xa2, 0xb3, 0x47, 0x8f, - 0x9d, 0xe4, 0xc2, 0xde, 0x3a, 0xfa, 0x0b, 0x02, 0x92, 0x32, 0xec, 0x49, 0xd4, 0x7b, 0x77, 0xf7, - 0xde, 0xbb, 0xc3, 0xa4, 0xe1, 0x33, 0xd5, 0x41, 0xc3, 0x44, 0x53, 0xf2, 0x46, 0x89, 0x27, 0x2e, - 0x99, 0x54, 0xf9, 0x03, 0xa7, 0x6d, 0x07, 0x0a, 0x7c, 0x7f, 0xe0, 0xe9, 0x81, 0x1f, 0x5f, 0x56, - 0x50, 0x81, 0xa1, 0x99, 0x7e, 0xd9, 0xca, 0x71, 0x58, 0x01, 0x54, 0x8f, 0x9c, 0x99, 0xbf, 0x62, - 0xf6, 0x83, 0x29, 0x51, 0x73, 0xa9, 0xf2, 0xba, 0x1d, 0x0a, 0x48, 0x09, 0xb2, 0x06, 0xc9, 0x8a, - 0x5c, 0x72, 0xf6, 0x34, 0x29, 0xb8, 0xca, 0x27, 0xac, 0x04, 0xd1, 0x58, 0x3e, 0xfe, 0xe3, 0x62, - 0xef, 0xab, 0x96, 0xf6, 0xcf, 0xb1, 0x7b, 0x33, 0x0d, 0x50, 0x84, 0x92, 0x93, 0xcc, 0xbd, 0x99, - 0xfa, 0x6f, 0xb0, 0x07, 0x3f, 0x1b, 0xde, 0x05, 0x6e, 0x84, 0x92, 0xd3, 0xf4, 0x62, 0xd7, 0x87, - 0x2f, 0xe7, 0x79, 0xfd, 0xf8, 0x31, 0x36, 0x70, 0x9c, 0x59, 0xda, 0x6f, 0x31, 0x96, 0x2a, 0xef, - 0xd4, 0xad, 0x96, 0x0e, 0x46, 0x11, 0x4a, 0xce, 0xae, 0xc7, 0xd4, 0xfa, 0xa2, 0x7b, 0x5f, 0xf4, - 0xdb, 0xde, 0x57, 0xfa, 0x61, 0xd9, 0x87, 0xce, 0xff, 0x3e, 0xbc, 0x3c, 0x74, 0xbd, 0x85, 0x5a, - 0x28, 0x5e, 0xb7, 0x6a, 0xbe, 0xeb, 0xc3, 0x57, 0x56, 0xe4, 0xc0, 0xc6, 0x8b, 0x75, 0x88, 0xb2, - 0x53, 0x03, 0xe8, 0x31, 0x7e, 0x8e, 0x3d, 0x9d, 0x40, 0x06, 0x27, 0xd1, 0x28, 0x39, 0xbb, 0x7e, - 0x4d, 0x6d, 0x46, 0xaa, 0x33, 0xd2, 0x21, 0x23, 0xfd, 0x04, 0xa2, 0x49, 0xdf, 0x69, 0xad, 0xdf, - 0xeb, 0x30, 0xa9, 0x84, 0xba, 0x9f, 0x15, 0xb4, 0x84, 0x9a, 0x0d, 0x0b, 0xb1, 0x9f, 0x2b, 0x79, - 0xf7, 0xc0, 0xd4, 0xbc, 0xe5, 0xd2, 0x34, 0xc8, 0xcc, 0x4e, 0xf6, 0x13, 0x7c, 0x61, 0x0d, 0xdc, - 0x09, 0xa9, 0x6e, 0x79, 0x0b, 0xe5, 0x7d, 0xe0, 0x45, 0x28, 0x19, 0x65, 0xe7, 0x06, 0x9f, 0x0a, - 0xa9, 0x3e, 0x6b, 0x34, 0xfd, 0xb2, 0xdc, 0x10, 0xb4, 0xda, 0x10, 0xf4, 0x6f, 0x43, 0xd0, 0x62, - 0x4b, 0x9c, 0xd5, 0x96, 0x38, 0x7f, 0xb7, 0xc4, 0xf9, 0x3e, 0x39, 0x12, 0x1d, 0x0e, 0x7a, 0x05, - 0x5d, 0xb5, 0x7f, 0xb3, 0x5f, 0xc7, 0xe7, 0x37, 0x1e, 0x8a, 0x17, 0x66, 0x5f, 0xef, 0x9f, 0x03, - 0x00, 0x00, 0xff, 0xff, 0xad, 0x4f, 0xba, 0xca, 0x21, 0x02, 0x00, 0x00, -} - -func (m *Stake) 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 *Stake) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *Stake) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.StartDistEpoch != 0 { - i = encodeVarintStake(dAtA, i, uint64(m.StartDistEpoch)) - i-- - dAtA[i] = 0x28 - } - if len(m.Coins) > 0 { - for iNdEx := len(m.Coins) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Coins[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintStake(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x22 - } - } - n1, err1 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.StartTime, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.StartTime):]) - if err1 != nil { - return 0, err1 - } - i -= n1 - i = encodeVarintStake(dAtA, i, uint64(n1)) - i-- - dAtA[i] = 0x1a - if len(m.Owner) > 0 { - i -= len(m.Owner) - copy(dAtA[i:], m.Owner) - i = encodeVarintStake(dAtA, i, uint64(len(m.Owner))) - i-- - dAtA[i] = 0x12 - } - if m.ID != 0 { - i = encodeVarintStake(dAtA, i, uint64(m.ID)) - i-- - dAtA[i] = 0x8 - } - return len(dAtA) - i, nil -} - -func encodeVarintStake(dAtA []byte, offset int, v uint64) int { - offset -= sovStake(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func (m *Stake) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.ID != 0 { - n += 1 + sovStake(uint64(m.ID)) - } - l = len(m.Owner) - if l > 0 { - n += 1 + l + sovStake(uint64(l)) - } - l = github_com_cosmos_gogoproto_types.SizeOfStdTime(m.StartTime) - n += 1 + l + sovStake(uint64(l)) - if len(m.Coins) > 0 { - for _, e := range m.Coins { - l = e.Size() - n += 1 + l + sovStake(uint64(l)) - } - } - if m.StartDistEpoch != 0 { - n += 1 + sovStake(uint64(m.StartDistEpoch)) - } - return n -} - -func sovStake(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozStake(x uint64) (n int) { - return sovStake(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (m *Stake) 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 ErrIntOverflowStake - } - 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: Stake: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: Stake: 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 ErrIntOverflowStake - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.ID |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Owner", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStake - } - 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 ErrInvalidLengthStake - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthStake - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Owner = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field StartTime", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStake - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthStake - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthStake - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(&m.StartTime, dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Coins", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStake - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthStake - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthStake - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Coins = append(m.Coins, types.Coin{}) - if err := m.Coins[len(m.Coins)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 5: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field StartDistEpoch", wireType) - } - m.StartDistEpoch = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStake - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.StartDistEpoch |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - default: - iNdEx = preIndex - skippy, err := skipStake(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthStake - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func skipStake(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, ErrIntOverflowStake - } - 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, ErrIntOverflowStake - } - 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, ErrIntOverflowStake - } - 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, ErrInvalidLengthStake - } - iNdEx += length - case 3: - depth++ - case 4: - if depth == 0 { - return 0, ErrUnexpectedEndOfGroupStake - } - depth-- - case 5: - iNdEx += 4 - default: - return 0, fmt.Errorf("proto: illegal wireType %d", wireType) - } - if iNdEx < 0 { - return 0, ErrInvalidLengthStake - } - if depth == 0 { - return iNdEx, nil - } - } - return 0, io.ErrUnexpectedEOF -} - -var ( - ErrInvalidLengthStake = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowStake = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupStake = fmt.Errorf("proto: unexpected end of group") -) diff --git a/x/incentives/types/stakes.go b/x/incentives/types/stakes.go deleted file mode 100644 index e2b0240b7..000000000 --- a/x/incentives/types/stakes.go +++ /dev/null @@ -1,16 +0,0 @@ -package types - -import sdk "github.com/cosmos/cosmos-sdk/types" - -type Stakes []*Stake - -func (stakes Stakes) GetCoins() sdk.Coins { - coins := sdk.Coins{} - for _, stake := range stakes { - coinsToAdd := stake.GetCoins() - if !coinsToAdd.Empty() { - coins = coins.Add(coinsToAdd...) - } - } - return coins -} diff --git a/x/incentives/types/tx.pb.go b/x/incentives/types/tx.pb.go deleted file mode 100644 index aa9553cc0..000000000 --- a/x/incentives/types/tx.pb.go +++ /dev/null @@ -1,2713 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: neutron/incentives/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" - types "github.com/cosmos/cosmos-sdk/types" - _ "github.com/cosmos/cosmos-sdk/types/msgservice" - _ "github.com/cosmos/cosmos-sdk/types/tx/amino" - _ "github.com/cosmos/gogoproto/gogoproto" - grpc1 "github.com/cosmos/gogoproto/grpc" - proto "github.com/cosmos/gogoproto/proto" - github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" - grpc "google.golang.org/grpc" - codes "google.golang.org/grpc/codes" - status "google.golang.org/grpc/status" - _ "google.golang.org/protobuf/types/known/durationpb" - _ "google.golang.org/protobuf/types/known/timestamppb" - io "io" - math "math" - math_bits "math/bits" - time "time" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf -var _ = time.Kitchen - -// 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 - -// MsgCreateGauge creates a gague to distribute rewards to users -type MsgCreateGauge struct { - // is_perpetual shows if it's a perpetual or non-perpetual gauge - // Non-perpetual gauges distribute their tokens equally per epoch while the - // gauge is in the active period. Perpetual gauges distribute all their tokens - // at a single time and only distribute their tokens again once the gauge is - // refilled - IsPerpetual bool `protobuf:"varint,1,opt,name=is_perpetual,json=isPerpetual,proto3" json:"is_perpetual,omitempty"` - // owner is the address of gauge creator, should be the module authority - Owner string `protobuf:"bytes,2,opt,name=owner,proto3" json:"owner,omitempty" yaml:"owner"` - // distribute_to show which lock the gauge should distribute to by time - // duration or by timestamp - DistributeTo QueryCondition `protobuf:"bytes,3,opt,name=distribute_to,json=distributeTo,proto3" json:"distribute_to"` - // coins are coin(s) to be distributed by the gauge - Coins github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,4,rep,name=coins,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"coins"` - // start_time is the distribution start time - StartTime time.Time `protobuf:"bytes,5,opt,name=start_time,json=startTime,proto3,stdtime" json:"start_time" yaml:"timestamp"` - // num_epochs_paid_over is the number of epochs distribution will be completed - // over - NumEpochsPaidOver uint64 `protobuf:"varint,6,opt,name=num_epochs_paid_over,json=numEpochsPaidOver,proto3" json:"num_epochs_paid_over,omitempty"` - // pricing_tick is the price that liquidity within the gauge range will be priced at - PricingTick int64 `protobuf:"varint,7,opt,name=pricing_tick,json=pricingTick,proto3" json:"pricing_tick,omitempty"` -} - -func (m *MsgCreateGauge) Reset() { *m = MsgCreateGauge{} } -func (m *MsgCreateGauge) String() string { return proto.CompactTextString(m) } -func (*MsgCreateGauge) ProtoMessage() {} -func (*MsgCreateGauge) Descriptor() ([]byte, []int) { - return fileDescriptor_5fe3d35711153e8d, []int{0} -} -func (m *MsgCreateGauge) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *MsgCreateGauge) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_MsgCreateGauge.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 *MsgCreateGauge) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgCreateGauge.Merge(m, src) -} -func (m *MsgCreateGauge) XXX_Size() int { - return m.Size() -} -func (m *MsgCreateGauge) XXX_DiscardUnknown() { - xxx_messageInfo_MsgCreateGauge.DiscardUnknown(m) -} - -var xxx_messageInfo_MsgCreateGauge proto.InternalMessageInfo - -func (m *MsgCreateGauge) GetIsPerpetual() bool { - if m != nil { - return m.IsPerpetual - } - return false -} - -func (m *MsgCreateGauge) GetOwner() string { - if m != nil { - return m.Owner - } - return "" -} - -func (m *MsgCreateGauge) GetDistributeTo() QueryCondition { - if m != nil { - return m.DistributeTo - } - return QueryCondition{} -} - -func (m *MsgCreateGauge) GetCoins() github_com_cosmos_cosmos_sdk_types.Coins { - if m != nil { - return m.Coins - } - return nil -} - -func (m *MsgCreateGauge) GetStartTime() time.Time { - if m != nil { - return m.StartTime - } - return time.Time{} -} - -func (m *MsgCreateGauge) GetNumEpochsPaidOver() uint64 { - if m != nil { - return m.NumEpochsPaidOver - } - return 0 -} - -func (m *MsgCreateGauge) GetPricingTick() int64 { - if m != nil { - return m.PricingTick - } - return 0 -} - -type MsgCreateGaugeResponse struct { -} - -func (m *MsgCreateGaugeResponse) Reset() { *m = MsgCreateGaugeResponse{} } -func (m *MsgCreateGaugeResponse) String() string { return proto.CompactTextString(m) } -func (*MsgCreateGaugeResponse) ProtoMessage() {} -func (*MsgCreateGaugeResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_5fe3d35711153e8d, []int{1} -} -func (m *MsgCreateGaugeResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *MsgCreateGaugeResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_MsgCreateGaugeResponse.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 *MsgCreateGaugeResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgCreateGaugeResponse.Merge(m, src) -} -func (m *MsgCreateGaugeResponse) XXX_Size() int { - return m.Size() -} -func (m *MsgCreateGaugeResponse) XXX_DiscardUnknown() { - xxx_messageInfo_MsgCreateGaugeResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_MsgCreateGaugeResponse proto.InternalMessageInfo - -// MsgAddToGauge adds coins to a previously created gauge -type MsgAddToGauge struct { - // owner is the gauge owner's address - Owner string `protobuf:"bytes,1,opt,name=owner,proto3" json:"owner,omitempty" yaml:"owner"` - // gauge_id is the ID of gauge that rewards are getting added to - GaugeId uint64 `protobuf:"varint,2,opt,name=gauge_id,json=gaugeId,proto3" json:"gauge_id,omitempty"` - // rewards are the coin(s) to add to gauge - Rewards github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,3,rep,name=rewards,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"rewards"` -} - -func (m *MsgAddToGauge) Reset() { *m = MsgAddToGauge{} } -func (m *MsgAddToGauge) String() string { return proto.CompactTextString(m) } -func (*MsgAddToGauge) ProtoMessage() {} -func (*MsgAddToGauge) Descriptor() ([]byte, []int) { - return fileDescriptor_5fe3d35711153e8d, []int{2} -} -func (m *MsgAddToGauge) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *MsgAddToGauge) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_MsgAddToGauge.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 *MsgAddToGauge) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgAddToGauge.Merge(m, src) -} -func (m *MsgAddToGauge) XXX_Size() int { - return m.Size() -} -func (m *MsgAddToGauge) XXX_DiscardUnknown() { - xxx_messageInfo_MsgAddToGauge.DiscardUnknown(m) -} - -var xxx_messageInfo_MsgAddToGauge proto.InternalMessageInfo - -func (m *MsgAddToGauge) GetOwner() string { - if m != nil { - return m.Owner - } - return "" -} - -func (m *MsgAddToGauge) GetGaugeId() uint64 { - if m != nil { - return m.GaugeId - } - return 0 -} - -func (m *MsgAddToGauge) GetRewards() github_com_cosmos_cosmos_sdk_types.Coins { - if m != nil { - return m.Rewards - } - return nil -} - -type MsgAddToGaugeResponse struct { -} - -func (m *MsgAddToGaugeResponse) Reset() { *m = MsgAddToGaugeResponse{} } -func (m *MsgAddToGaugeResponse) String() string { return proto.CompactTextString(m) } -func (*MsgAddToGaugeResponse) ProtoMessage() {} -func (*MsgAddToGaugeResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_5fe3d35711153e8d, []int{3} -} -func (m *MsgAddToGaugeResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *MsgAddToGaugeResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_MsgAddToGaugeResponse.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 *MsgAddToGaugeResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgAddToGaugeResponse.Merge(m, src) -} -func (m *MsgAddToGaugeResponse) XXX_Size() int { - return m.Size() -} -func (m *MsgAddToGaugeResponse) XXX_DiscardUnknown() { - xxx_messageInfo_MsgAddToGaugeResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_MsgAddToGaugeResponse proto.InternalMessageInfo - -type MsgStake struct { - Owner string `protobuf:"bytes,1,opt,name=owner,proto3" json:"owner,omitempty" yaml:"owner"` - Coins github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,2,rep,name=coins,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"coins"` -} - -func (m *MsgStake) Reset() { *m = MsgStake{} } -func (m *MsgStake) String() string { return proto.CompactTextString(m) } -func (*MsgStake) ProtoMessage() {} -func (*MsgStake) Descriptor() ([]byte, []int) { - return fileDescriptor_5fe3d35711153e8d, []int{4} -} -func (m *MsgStake) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *MsgStake) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_MsgStake.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 *MsgStake) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgStake.Merge(m, src) -} -func (m *MsgStake) XXX_Size() int { - return m.Size() -} -func (m *MsgStake) XXX_DiscardUnknown() { - xxx_messageInfo_MsgStake.DiscardUnknown(m) -} - -var xxx_messageInfo_MsgStake proto.InternalMessageInfo - -func (m *MsgStake) GetOwner() string { - if m != nil { - return m.Owner - } - return "" -} - -func (m *MsgStake) GetCoins() github_com_cosmos_cosmos_sdk_types.Coins { - if m != nil { - return m.Coins - } - return nil -} - -type MsgStakeResponse struct { - ID uint64 `protobuf:"varint,1,opt,name=ID,proto3" json:"ID,omitempty"` -} - -func (m *MsgStakeResponse) Reset() { *m = MsgStakeResponse{} } -func (m *MsgStakeResponse) String() string { return proto.CompactTextString(m) } -func (*MsgStakeResponse) ProtoMessage() {} -func (*MsgStakeResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_5fe3d35711153e8d, []int{5} -} -func (m *MsgStakeResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *MsgStakeResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_MsgStakeResponse.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 *MsgStakeResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgStakeResponse.Merge(m, src) -} -func (m *MsgStakeResponse) XXX_Size() int { - return m.Size() -} -func (m *MsgStakeResponse) XXX_DiscardUnknown() { - xxx_messageInfo_MsgStakeResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_MsgStakeResponse proto.InternalMessageInfo - -func (m *MsgStakeResponse) GetID() uint64 { - if m != nil { - return m.ID - } - return 0 -} - -type MsgUnstake struct { - Owner string `protobuf:"bytes,1,opt,name=owner,proto3" json:"owner,omitempty" yaml:"owner"` - // If unstake is left empty, this is interpreted as "unstake all" - Unstakes []*MsgUnstake_UnstakeDescriptor `protobuf:"bytes,2,rep,name=unstakes,proto3" json:"unstakes,omitempty"` -} - -func (m *MsgUnstake) Reset() { *m = MsgUnstake{} } -func (m *MsgUnstake) String() string { return proto.CompactTextString(m) } -func (*MsgUnstake) ProtoMessage() {} -func (*MsgUnstake) Descriptor() ([]byte, []int) { - return fileDescriptor_5fe3d35711153e8d, []int{6} -} -func (m *MsgUnstake) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *MsgUnstake) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_MsgUnstake.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 *MsgUnstake) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgUnstake.Merge(m, src) -} -func (m *MsgUnstake) XXX_Size() int { - return m.Size() -} -func (m *MsgUnstake) XXX_DiscardUnknown() { - xxx_messageInfo_MsgUnstake.DiscardUnknown(m) -} - -var xxx_messageInfo_MsgUnstake proto.InternalMessageInfo - -func (m *MsgUnstake) GetOwner() string { - if m != nil { - return m.Owner - } - return "" -} - -func (m *MsgUnstake) GetUnstakes() []*MsgUnstake_UnstakeDescriptor { - if m != nil { - return m.Unstakes - } - return nil -} - -type MsgUnstake_UnstakeDescriptor struct { - ID uint64 `protobuf:"varint,1,opt,name=ID,proto3" json:"ID,omitempty"` - Coins github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,2,rep,name=coins,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"coins"` -} - -func (m *MsgUnstake_UnstakeDescriptor) Reset() { *m = MsgUnstake_UnstakeDescriptor{} } -func (m *MsgUnstake_UnstakeDescriptor) String() string { return proto.CompactTextString(m) } -func (*MsgUnstake_UnstakeDescriptor) ProtoMessage() {} -func (*MsgUnstake_UnstakeDescriptor) Descriptor() ([]byte, []int) { - return fileDescriptor_5fe3d35711153e8d, []int{6, 0} -} -func (m *MsgUnstake_UnstakeDescriptor) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *MsgUnstake_UnstakeDescriptor) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_MsgUnstake_UnstakeDescriptor.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 *MsgUnstake_UnstakeDescriptor) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgUnstake_UnstakeDescriptor.Merge(m, src) -} -func (m *MsgUnstake_UnstakeDescriptor) XXX_Size() int { - return m.Size() -} -func (m *MsgUnstake_UnstakeDescriptor) XXX_DiscardUnknown() { - xxx_messageInfo_MsgUnstake_UnstakeDescriptor.DiscardUnknown(m) -} - -var xxx_messageInfo_MsgUnstake_UnstakeDescriptor proto.InternalMessageInfo - -func (m *MsgUnstake_UnstakeDescriptor) GetID() uint64 { - if m != nil { - return m.ID - } - return 0 -} - -func (m *MsgUnstake_UnstakeDescriptor) GetCoins() github_com_cosmos_cosmos_sdk_types.Coins { - if m != nil { - return m.Coins - } - return nil -} - -type MsgUnstakeResponse struct { -} - -func (m *MsgUnstakeResponse) Reset() { *m = MsgUnstakeResponse{} } -func (m *MsgUnstakeResponse) String() string { return proto.CompactTextString(m) } -func (*MsgUnstakeResponse) ProtoMessage() {} -func (*MsgUnstakeResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_5fe3d35711153e8d, []int{7} -} -func (m *MsgUnstakeResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *MsgUnstakeResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_MsgUnstakeResponse.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 *MsgUnstakeResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgUnstakeResponse.Merge(m, src) -} -func (m *MsgUnstakeResponse) XXX_Size() int { - return m.Size() -} -func (m *MsgUnstakeResponse) XXX_DiscardUnknown() { - xxx_messageInfo_MsgUnstakeResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_MsgUnstakeResponse proto.InternalMessageInfo - -type MsgUpdateParams struct { - // Authority is the address of the governance account. - Authority string `protobuf:"bytes,1,opt,name=authority,proto3" json:"authority,omitempty"` - // 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_5fe3d35711153e8d, []int{8} -} -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_5fe3d35711153e8d, []int{9} -} -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((*MsgCreateGauge)(nil), "neutron.incentives.MsgCreateGauge") - proto.RegisterType((*MsgCreateGaugeResponse)(nil), "neutron.incentives.MsgCreateGaugeResponse") - proto.RegisterType((*MsgAddToGauge)(nil), "neutron.incentives.MsgAddToGauge") - proto.RegisterType((*MsgAddToGaugeResponse)(nil), "neutron.incentives.MsgAddToGaugeResponse") - proto.RegisterType((*MsgStake)(nil), "neutron.incentives.MsgStake") - proto.RegisterType((*MsgStakeResponse)(nil), "neutron.incentives.MsgStakeResponse") - proto.RegisterType((*MsgUnstake)(nil), "neutron.incentives.MsgUnstake") - proto.RegisterType((*MsgUnstake_UnstakeDescriptor)(nil), "neutron.incentives.MsgUnstake.UnstakeDescriptor") - proto.RegisterType((*MsgUnstakeResponse)(nil), "neutron.incentives.MsgUnstakeResponse") - proto.RegisterType((*MsgUpdateParams)(nil), "neutron.incentives.MsgUpdateParams") - proto.RegisterType((*MsgUpdateParamsResponse)(nil), "neutron.incentives.MsgUpdateParamsResponse") -} - -func init() { proto.RegisterFile("neutron/incentives/tx.proto", fileDescriptor_5fe3d35711153e8d) } - -var fileDescriptor_5fe3d35711153e8d = []byte{ - // 907 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0xcf, 0x6f, 0xdc, 0x44, - 0x18, 0x8d, 0x77, 0x37, 0xbf, 0xbe, 0x4d, 0x4b, 0x62, 0x02, 0x71, 0x4c, 0xe5, 0xdd, 0x1a, 0x14, - 0x2d, 0x41, 0xb1, 0x9b, 0x20, 0x71, 0xa8, 0xc4, 0xa1, 0x9b, 0x20, 0x14, 0x95, 0x15, 0xa9, 0x1b, - 0x84, 0x54, 0x09, 0x99, 0x59, 0x7b, 0x70, 0x46, 0x89, 0x3d, 0xd6, 0xcc, 0x78, 0x9b, 0x5c, 0x39, - 0x70, 0x80, 0x4b, 0x2f, 0xfc, 0x0f, 0x88, 0x53, 0x0e, 0x5c, 0xe0, 0xc8, 0xa9, 0xc7, 0x8a, 0x13, - 0xa7, 0x14, 0x25, 0x87, 0xdc, 0xfb, 0x17, 0xa0, 0x19, 0xff, 0xd8, 0x4d, 0x9a, 0x6c, 0x8b, 0x04, - 0x5c, 0x62, 0x7b, 0xde, 0xf7, 0x3d, 0xbf, 0x6f, 0xde, 0x1b, 0x67, 0xe1, 0x9d, 0x04, 0x67, 0x82, - 0xd1, 0xc4, 0x25, 0x49, 0x80, 0x13, 0x41, 0x06, 0x98, 0xbb, 0xe2, 0xd0, 0x49, 0x19, 0x15, 0x54, - 0xd7, 0x0b, 0xd0, 0x19, 0x82, 0xe6, 0x62, 0x44, 0x23, 0xaa, 0x60, 0x57, 0xde, 0xe5, 0x95, 0x66, - 0x2b, 0xa2, 0x34, 0x3a, 0xc0, 0xae, 0x7a, 0xea, 0x67, 0xdf, 0xb8, 0x82, 0xc4, 0x98, 0x0b, 0x14, - 0xa7, 0x45, 0x81, 0x15, 0x50, 0x1e, 0x53, 0xee, 0xf6, 0x11, 0xc7, 0xee, 0x60, 0xbd, 0x8f, 0x05, - 0x5a, 0x77, 0x03, 0x4a, 0x92, 0x12, 0xbf, 0x42, 0x47, 0x84, 0xb2, 0x08, 0x8f, 0xc1, 0xb9, 0x40, - 0xfb, 0x15, 0x7e, 0x59, 0x40, 0x98, 0x31, 0x24, 0x08, 0x2d, 0xf9, 0x17, 0x50, 0x4c, 0x12, 0xea, - 0xaa, 0xbf, 0xa5, 0xe6, 0x2b, 0x28, 0x53, 0xc4, 0x50, 0xcc, 0x8b, 0x82, 0xa5, 0x42, 0x73, 0xcc, - 0x23, 0x77, 0xb0, 0x2e, 0x2f, 0x05, 0xb0, 0x9c, 0x03, 0x7e, 0xbe, 0x0d, 0xf9, 0x43, 0x0e, 0xd9, - 0xbf, 0xd5, 0xe1, 0x66, 0x8f, 0x47, 0x9b, 0x0c, 0x23, 0x81, 0x3f, 0x95, 0x03, 0xe8, 0xb7, 0x61, - 0x8e, 0x70, 0x3f, 0xc5, 0x2c, 0xc5, 0x22, 0x43, 0x07, 0x86, 0xd6, 0xd6, 0x3a, 0x33, 0x5e, 0x93, - 0xf0, 0x9d, 0x72, 0x49, 0x5f, 0x81, 0x49, 0xfa, 0x38, 0xc1, 0xcc, 0xa8, 0xb5, 0xb5, 0xce, 0x6c, - 0x77, 0xfe, 0xc5, 0x49, 0x6b, 0xee, 0x08, 0xc5, 0x07, 0x77, 0x6d, 0xb5, 0x6c, 0x7b, 0x39, 0xac, - 0xf7, 0xe0, 0x46, 0x48, 0xb8, 0x60, 0xa4, 0x9f, 0x09, 0xec, 0x0b, 0x6a, 0xd4, 0xdb, 0x5a, 0xa7, - 0xb9, 0x61, 0x3b, 0x2f, 0x1b, 0xe5, 0x3c, 0xc8, 0x30, 0x3b, 0xda, 0xa4, 0x49, 0x48, 0xe4, 0x36, - 0x74, 0x1b, 0x4f, 0x4f, 0x5a, 0x13, 0xde, 0xdc, 0xb0, 0x7d, 0x97, 0xea, 0x08, 0x26, 0xa5, 0x05, - 0xdc, 0x68, 0xb4, 0xeb, 0x9d, 0xe6, 0xc6, 0xb2, 0x53, 0x8c, 0x22, 0x4d, 0x72, 0x0a, 0x93, 0x9c, - 0x4d, 0x4a, 0x92, 0xee, 0x1d, 0xd9, 0xfd, 0xf3, 0xf3, 0x56, 0x27, 0x22, 0x62, 0x2f, 0xeb, 0x3b, - 0x01, 0x8d, 0x8b, 0xb9, 0x8b, 0xcb, 0x1a, 0x0f, 0xf7, 0x5d, 0x71, 0x94, 0x62, 0xae, 0x1a, 0xb8, - 0x97, 0x33, 0xeb, 0x5f, 0x02, 0x70, 0x81, 0x98, 0xf0, 0x65, 0x20, 0x8c, 0x49, 0x25, 0xd7, 0x74, - 0x72, 0xb3, 0x9c, 0xd2, 0x2c, 0x67, 0xb7, 0x4c, 0x4b, 0xf7, 0x96, 0x7c, 0xd1, 0x8b, 0x93, 0xd6, - 0x7c, 0x3e, 0x7e, 0x15, 0x23, 0xfb, 0xc9, 0xf3, 0x96, 0xe6, 0xcd, 0x2a, 0x2e, 0x59, 0xad, 0xbb, - 0xb0, 0x98, 0x64, 0xb1, 0x8f, 0x53, 0x1a, 0xec, 0x71, 0x3f, 0x45, 0x24, 0xf4, 0xe9, 0x00, 0x33, - 0x63, 0xaa, 0xad, 0x75, 0x1a, 0xde, 0x42, 0x92, 0xc5, 0x9f, 0x28, 0x68, 0x07, 0x91, 0xf0, 0xf3, - 0x01, 0x66, 0xd2, 0x86, 0x94, 0x91, 0x80, 0x24, 0x91, 0x2f, 0x48, 0xb0, 0x6f, 0x4c, 0xb7, 0xb5, - 0x4e, 0xdd, 0x6b, 0x16, 0x6b, 0xbb, 0x24, 0xd8, 0xb7, 0x0d, 0x78, 0xfb, 0xa2, 0x77, 0x1e, 0xe6, - 0x29, 0x4d, 0x38, 0xb6, 0x7f, 0xd5, 0xe0, 0x46, 0x8f, 0x47, 0xf7, 0xc2, 0x70, 0x97, 0xe6, 0xae, - 0x56, 0x96, 0x69, 0xe3, 0x2d, 0x5b, 0x86, 0x19, 0x95, 0x63, 0x9f, 0x84, 0xca, 0xdd, 0x86, 0x37, - 0xad, 0x9e, 0xb7, 0x43, 0x1d, 0xc3, 0x34, 0xc3, 0x8f, 0x11, 0x0b, 0xb9, 0x51, 0xff, 0xf7, 0x0d, - 0x28, 0xb9, 0xed, 0x25, 0x78, 0xeb, 0x82, 0xf4, 0x6a, 0xa8, 0x1f, 0x35, 0x98, 0xe9, 0xf1, 0xe8, - 0xa1, 0x3c, 0x46, 0xaf, 0x3d, 0x4f, 0x95, 0x99, 0xda, 0x7f, 0x95, 0x19, 0xdb, 0x86, 0xf9, 0x52, - 0x56, 0xa9, 0x55, 0xbf, 0x09, 0xb5, 0xed, 0x2d, 0xa5, 0xad, 0xe1, 0xd5, 0xb6, 0xb7, 0xec, 0x1f, - 0x6a, 0x00, 0x3d, 0x1e, 0x7d, 0x91, 0xf0, 0x7f, 0xa4, 0xfe, 0x33, 0x98, 0xc9, 0xf2, 0x96, 0x72, - 0x80, 0x3b, 0x57, 0x9d, 0x9d, 0x21, 0xb3, 0x53, 0x5c, 0xb7, 0x30, 0x0f, 0x18, 0x49, 0x05, 0x65, - 0x5e, 0xc5, 0x60, 0x7e, 0xa7, 0xc1, 0xc2, 0x4b, 0xf8, 0x65, 0xa9, 0xff, 0xc7, 0x8e, 0x2d, 0x82, - 0x3e, 0x94, 0x5c, 0xf9, 0x7b, 0xac, 0xc1, 0x1b, 0x72, 0x39, 0x0d, 0x91, 0xc0, 0x3b, 0xea, 0xcb, - 0xa6, 0x7f, 0x04, 0xb3, 0x28, 0x13, 0x7b, 0x94, 0x11, 0x71, 0x54, 0x6c, 0x96, 0xf1, 0xc7, 0x2f, - 0x6b, 0x8b, 0x85, 0xa6, 0x7b, 0x61, 0xc8, 0x30, 0xe7, 0x0f, 0x05, 0x23, 0x49, 0xe4, 0x0d, 0x4b, - 0xf5, 0x8f, 0x61, 0x2a, 0xff, 0x36, 0xaa, 0x10, 0xcb, 0x33, 0x7c, 0xc5, 0xb6, 0xe5, 0xef, 0xe8, - 0xce, 0xca, 0x31, 0x7e, 0x3a, 0x3f, 0x5e, 0xd5, 0xbc, 0xa2, 0xe9, 0xee, 0xca, 0xb7, 0xe7, 0xc7, - 0xab, 0x43, 0xba, 0xef, 0xcf, 0x8f, 0x57, 0xdf, 0x0c, 0xf1, 0xa1, 0x7b, 0x49, 0x9e, 0xbd, 0x0c, - 0x4b, 0x97, 0x96, 0xca, 0x69, 0x36, 0x7e, 0xaf, 0x43, 0xbd, 0xc7, 0x23, 0xfd, 0x2b, 0x68, 0x8e, - 0x7e, 0x5d, 0xed, 0x6b, 0xfc, 0x1b, 0xa9, 0x31, 0x57, 0x5f, 0x5d, 0x53, 0x05, 0xed, 0x11, 0xc0, - 0xc8, 0x29, 0xbf, 0x7d, 0x4d, 0xe7, 0xb0, 0xc4, 0x7c, 0xff, 0x95, 0x25, 0x15, 0xf7, 0x7d, 0x98, - 0xcc, 0x0f, 0xdb, 0xad, 0x6b, 0x7a, 0x14, 0x6a, 0xbe, 0x37, 0x0e, 0xad, 0xc8, 0x1e, 0xc0, 0x74, - 0x99, 0x7e, 0x6b, 0x7c, 0x86, 0xcd, 0x95, 0xf1, 0x78, 0x45, 0xf9, 0x35, 0xcc, 0x5d, 0x08, 0xcb, - 0xbb, 0xd7, 0xf5, 0x8d, 0x14, 0x99, 0x1f, 0xbc, 0x46, 0x51, 0xf9, 0x86, 0xee, 0xfd, 0xa7, 0xa7, - 0x96, 0xf6, 0xec, 0xd4, 0xd2, 0xfe, 0x3a, 0xb5, 0xb4, 0x27, 0x67, 0xd6, 0xc4, 0xb3, 0x33, 0x6b, - 0xe2, 0xcf, 0x33, 0x6b, 0xe2, 0xd1, 0xfa, 0x48, 0xe6, 0x0b, 0xc2, 0x35, 0xca, 0xa2, 0xf2, 0xde, - 0x3d, 0xbc, 0xf0, 0x0b, 0x45, 0x1e, 0x81, 0xfe, 0x94, 0xfa, 0xff, 0xf1, 0xe1, 0xdf, 0x01, 0x00, - 0x00, 0xff, 0xff, 0x55, 0x20, 0x0f, 0x95, 0xc4, 0x08, 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 { - // Create an incentive program - CreateGauge(ctx context.Context, in *MsgCreateGauge, opts ...grpc.CallOption) (*MsgCreateGaugeResponse, error) - // Add rewards to an existing incentives program - AddToGauge(ctx context.Context, in *MsgAddToGauge, opts ...grpc.CallOption) (*MsgAddToGaugeResponse, error) - // Deposit LP tokens to the module, qualifying for rewards from gauges - Stake(ctx context.Context, in *MsgStake, opts ...grpc.CallOption) (*MsgStakeResponse, error) - // Withdraw LP tokens from the module, forfeiting future rewards from gauges - Unstake(ctx context.Context, in *MsgUnstake, opts ...grpc.CallOption) (*MsgUnstakeResponse, error) - // Update incentives params - 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) CreateGauge(ctx context.Context, in *MsgCreateGauge, opts ...grpc.CallOption) (*MsgCreateGaugeResponse, error) { - out := new(MsgCreateGaugeResponse) - err := c.cc.Invoke(ctx, "/neutron.incentives.Msg/CreateGauge", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *msgClient) AddToGauge(ctx context.Context, in *MsgAddToGauge, opts ...grpc.CallOption) (*MsgAddToGaugeResponse, error) { - out := new(MsgAddToGaugeResponse) - err := c.cc.Invoke(ctx, "/neutron.incentives.Msg/AddToGauge", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *msgClient) Stake(ctx context.Context, in *MsgStake, opts ...grpc.CallOption) (*MsgStakeResponse, error) { - out := new(MsgStakeResponse) - err := c.cc.Invoke(ctx, "/neutron.incentives.Msg/Stake", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *msgClient) Unstake(ctx context.Context, in *MsgUnstake, opts ...grpc.CallOption) (*MsgUnstakeResponse, error) { - out := new(MsgUnstakeResponse) - err := c.cc.Invoke(ctx, "/neutron.incentives.Msg/Unstake", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *msgClient) UpdateParams(ctx context.Context, in *MsgUpdateParams, opts ...grpc.CallOption) (*MsgUpdateParamsResponse, error) { - out := new(MsgUpdateParamsResponse) - err := c.cc.Invoke(ctx, "/neutron.incentives.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 { - // Create an incentive program - CreateGauge(context.Context, *MsgCreateGauge) (*MsgCreateGaugeResponse, error) - // Add rewards to an existing incentives program - AddToGauge(context.Context, *MsgAddToGauge) (*MsgAddToGaugeResponse, error) - // Deposit LP tokens to the module, qualifying for rewards from gauges - Stake(context.Context, *MsgStake) (*MsgStakeResponse, error) - // Withdraw LP tokens from the module, forfeiting future rewards from gauges - Unstake(context.Context, *MsgUnstake) (*MsgUnstakeResponse, error) - // Update incentives params - UpdateParams(context.Context, *MsgUpdateParams) (*MsgUpdateParamsResponse, error) -} - -// UnimplementedMsgServer can be embedded to have forward compatible implementations. -type UnimplementedMsgServer struct { -} - -func (*UnimplementedMsgServer) CreateGauge(ctx context.Context, req *MsgCreateGauge) (*MsgCreateGaugeResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method CreateGauge not implemented") -} -func (*UnimplementedMsgServer) AddToGauge(ctx context.Context, req *MsgAddToGauge) (*MsgAddToGaugeResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method AddToGauge not implemented") -} -func (*UnimplementedMsgServer) Stake(ctx context.Context, req *MsgStake) (*MsgStakeResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method Stake not implemented") -} -func (*UnimplementedMsgServer) Unstake(ctx context.Context, req *MsgUnstake) (*MsgUnstakeResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method Unstake not implemented") -} -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_CreateGauge_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(MsgCreateGauge) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(MsgServer).CreateGauge(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/neutron.incentives.Msg/CreateGauge", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(MsgServer).CreateGauge(ctx, req.(*MsgCreateGauge)) - } - return interceptor(ctx, in, info, handler) -} - -func _Msg_AddToGauge_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(MsgAddToGauge) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(MsgServer).AddToGauge(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/neutron.incentives.Msg/AddToGauge", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(MsgServer).AddToGauge(ctx, req.(*MsgAddToGauge)) - } - return interceptor(ctx, in, info, handler) -} - -func _Msg_Stake_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(MsgStake) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(MsgServer).Stake(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/neutron.incentives.Msg/Stake", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(MsgServer).Stake(ctx, req.(*MsgStake)) - } - return interceptor(ctx, in, info, handler) -} - -func _Msg_Unstake_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(MsgUnstake) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(MsgServer).Unstake(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/neutron.incentives.Msg/Unstake", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(MsgServer).Unstake(ctx, req.(*MsgUnstake)) - } - return interceptor(ctx, in, info, handler) -} - -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.incentives.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.incentives.Msg", - HandlerType: (*MsgServer)(nil), - Methods: []grpc.MethodDesc{ - { - MethodName: "CreateGauge", - Handler: _Msg_CreateGauge_Handler, - }, - { - MethodName: "AddToGauge", - Handler: _Msg_AddToGauge_Handler, - }, - { - MethodName: "Stake", - Handler: _Msg_Stake_Handler, - }, - { - MethodName: "Unstake", - Handler: _Msg_Unstake_Handler, - }, - { - MethodName: "UpdateParams", - Handler: _Msg_UpdateParams_Handler, - }, - }, - Streams: []grpc.StreamDesc{}, - Metadata: "neutron/incentives/tx.proto", -} - -func (m *MsgCreateGauge) 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 *MsgCreateGauge) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *MsgCreateGauge) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.PricingTick != 0 { - i = encodeVarintTx(dAtA, i, uint64(m.PricingTick)) - i-- - dAtA[i] = 0x38 - } - if m.NumEpochsPaidOver != 0 { - i = encodeVarintTx(dAtA, i, uint64(m.NumEpochsPaidOver)) - i-- - dAtA[i] = 0x30 - } - n1, err1 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.StartTime, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.StartTime):]) - if err1 != nil { - return 0, err1 - } - i -= n1 - i = encodeVarintTx(dAtA, i, uint64(n1)) - i-- - dAtA[i] = 0x2a - if len(m.Coins) > 0 { - for iNdEx := len(m.Coins) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Coins[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTx(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x22 - } - } - { - size, err := m.DistributeTo.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTx(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x1a - if len(m.Owner) > 0 { - i -= len(m.Owner) - copy(dAtA[i:], m.Owner) - i = encodeVarintTx(dAtA, i, uint64(len(m.Owner))) - i-- - dAtA[i] = 0x12 - } - if m.IsPerpetual { - i-- - if m.IsPerpetual { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x8 - } - return len(dAtA) - i, nil -} - -func (m *MsgCreateGaugeResponse) 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 *MsgCreateGaugeResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *MsgCreateGaugeResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - return len(dAtA) - i, nil -} - -func (m *MsgAddToGauge) 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 *MsgAddToGauge) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *MsgAddToGauge) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Rewards) > 0 { - for iNdEx := len(m.Rewards) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Rewards[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTx(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x1a - } - } - if m.GaugeId != 0 { - i = encodeVarintTx(dAtA, i, uint64(m.GaugeId)) - i-- - dAtA[i] = 0x10 - } - if len(m.Owner) > 0 { - i -= len(m.Owner) - copy(dAtA[i:], m.Owner) - i = encodeVarintTx(dAtA, i, uint64(len(m.Owner))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *MsgAddToGaugeResponse) 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 *MsgAddToGaugeResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *MsgAddToGaugeResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - return len(dAtA) - i, nil -} - -func (m *MsgStake) 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 *MsgStake) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *MsgStake) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Coins) > 0 { - for iNdEx := len(m.Coins) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Coins[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTx(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - } - if len(m.Owner) > 0 { - i -= len(m.Owner) - copy(dAtA[i:], m.Owner) - i = encodeVarintTx(dAtA, i, uint64(len(m.Owner))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *MsgStakeResponse) 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 *MsgStakeResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *MsgStakeResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.ID != 0 { - i = encodeVarintTx(dAtA, i, uint64(m.ID)) - i-- - dAtA[i] = 0x8 - } - return len(dAtA) - i, nil -} - -func (m *MsgUnstake) 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 *MsgUnstake) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *MsgUnstake) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Unstakes) > 0 { - for iNdEx := len(m.Unstakes) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Unstakes[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTx(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - } - if len(m.Owner) > 0 { - i -= len(m.Owner) - copy(dAtA[i:], m.Owner) - i = encodeVarintTx(dAtA, i, uint64(len(m.Owner))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *MsgUnstake_UnstakeDescriptor) 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 *MsgUnstake_UnstakeDescriptor) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *MsgUnstake_UnstakeDescriptor) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Coins) > 0 { - for iNdEx := len(m.Coins) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Coins[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTx(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - } - if m.ID != 0 { - i = encodeVarintTx(dAtA, i, uint64(m.ID)) - i-- - dAtA[i] = 0x8 - } - return len(dAtA) - i, nil -} - -func (m *MsgUnstakeResponse) 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 *MsgUnstakeResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *MsgUnstakeResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - return len(dAtA) - i, nil -} - -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 *MsgCreateGauge) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.IsPerpetual { - n += 2 - } - l = len(m.Owner) - if l > 0 { - n += 1 + l + sovTx(uint64(l)) - } - l = m.DistributeTo.Size() - n += 1 + l + sovTx(uint64(l)) - if len(m.Coins) > 0 { - for _, e := range m.Coins { - l = e.Size() - n += 1 + l + sovTx(uint64(l)) - } - } - l = github_com_cosmos_gogoproto_types.SizeOfStdTime(m.StartTime) - n += 1 + l + sovTx(uint64(l)) - if m.NumEpochsPaidOver != 0 { - n += 1 + sovTx(uint64(m.NumEpochsPaidOver)) - } - if m.PricingTick != 0 { - n += 1 + sovTx(uint64(m.PricingTick)) - } - return n -} - -func (m *MsgCreateGaugeResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - return n -} - -func (m *MsgAddToGauge) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Owner) - if l > 0 { - n += 1 + l + sovTx(uint64(l)) - } - if m.GaugeId != 0 { - n += 1 + sovTx(uint64(m.GaugeId)) - } - if len(m.Rewards) > 0 { - for _, e := range m.Rewards { - l = e.Size() - n += 1 + l + sovTx(uint64(l)) - } - } - return n -} - -func (m *MsgAddToGaugeResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - return n -} - -func (m *MsgStake) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Owner) - if l > 0 { - n += 1 + l + sovTx(uint64(l)) - } - if len(m.Coins) > 0 { - for _, e := range m.Coins { - l = e.Size() - n += 1 + l + sovTx(uint64(l)) - } - } - return n -} - -func (m *MsgStakeResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.ID != 0 { - n += 1 + sovTx(uint64(m.ID)) - } - return n -} - -func (m *MsgUnstake) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Owner) - if l > 0 { - n += 1 + l + sovTx(uint64(l)) - } - if len(m.Unstakes) > 0 { - for _, e := range m.Unstakes { - l = e.Size() - n += 1 + l + sovTx(uint64(l)) - } - } - return n -} - -func (m *MsgUnstake_UnstakeDescriptor) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.ID != 0 { - n += 1 + sovTx(uint64(m.ID)) - } - if len(m.Coins) > 0 { - for _, e := range m.Coins { - l = e.Size() - n += 1 + l + sovTx(uint64(l)) - } - } - return n -} - -func (m *MsgUnstakeResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - return n -} - -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 *MsgCreateGauge) 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: MsgCreateGauge: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: MsgCreateGauge: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field IsPerpetual", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTx - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.IsPerpetual = bool(v != 0) - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Owner", 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.Owner = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field DistributeTo", 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.DistributeTo.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Coins", 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.Coins = append(m.Coins, types.Coin{}) - if err := m.Coins[len(m.Coins)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 5: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field StartTime", 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 := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(&m.StartTime, dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 6: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field NumEpochsPaidOver", wireType) - } - m.NumEpochsPaidOver = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTx - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.NumEpochsPaidOver |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 7: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field PricingTick", wireType) - } - m.PricingTick = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTx - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.PricingTick |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - 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 *MsgCreateGaugeResponse) 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: MsgCreateGaugeResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: MsgCreateGaugeResponse: 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 (m *MsgAddToGauge) 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: MsgAddToGauge: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: MsgAddToGauge: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Owner", 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.Owner = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field GaugeId", wireType) - } - m.GaugeId = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTx - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.GaugeId |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Rewards", 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.Rewards = append(m.Rewards, types.Coin{}) - if err := m.Rewards[len(m.Rewards)-1].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 *MsgAddToGaugeResponse) 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: MsgAddToGaugeResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: MsgAddToGaugeResponse: 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 (m *MsgStake) 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: MsgStake: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: MsgStake: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Owner", 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.Owner = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Coins", 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.Coins = append(m.Coins, types.Coin{}) - if err := m.Coins[len(m.Coins)-1].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 *MsgStakeResponse) 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: MsgStakeResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: MsgStakeResponse: 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 ErrIntOverflowTx - } - 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 := 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 *MsgUnstake) 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: MsgUnstake: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: MsgUnstake: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Owner", 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.Owner = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Unstakes", 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.Unstakes = append(m.Unstakes, &MsgUnstake_UnstakeDescriptor{}) - if err := m.Unstakes[len(m.Unstakes)-1].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 *MsgUnstake_UnstakeDescriptor) 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: UnstakeDescriptor: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: UnstakeDescriptor: 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 ErrIntOverflowTx - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.ID |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Coins", 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.Coins = append(m.Coins, types.Coin{}) - if err := m.Coins[len(m.Coins)-1].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 *MsgUnstakeResponse) 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: MsgUnstakeResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: MsgUnstakeResponse: 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 (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") -) From b0edc3518268252a6b2fe81ae90a7fb5ac321ea2 Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Thu, 2 Nov 2023 21:43:06 +0200 Subject: [PATCH 206/307] bump pfm to 7.0.1 and ibc-go to 7.3.1 --- app/app.go | 19 +++++++++---------- app/proposals_allowlisting.go | 3 ++- go.mod | 4 ++-- go.sum | 9 +++++---- x/interchainqueries/keeper/msg_server.go | 3 +-- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/app/app.go b/app/app.go index 798cc7f48..aabec59c3 100644 --- a/app/app.go +++ b/app/app.go @@ -9,6 +9,7 @@ import ( "path/filepath" globalfeetypes "github.com/cosmos/gaia/v11/x/globalfee/types" + "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward" "github.com/cosmos/interchain-security/v3/testutil/integration" @@ -146,9 +147,8 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" consensusparamkeeper "github.com/cosmos/cosmos-sdk/x/consensus/keeper" consensusparamtypes "github.com/cosmos/cosmos-sdk/x/consensus/types" - "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router" - routerkeeper "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router/keeper" - routertypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router/types" + routerkeeper "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/keeper" + routertypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types" // Block-sdk imports blocksdkabci "github.com/skip-mev/block-sdk/abci" @@ -215,7 +215,7 @@ var ( ), ), ibchooks.AppModuleBasic{}, - router.AppModuleBasic{}, + packetforward.AppModuleBasic{}, auction.AppModuleBasic{}, globalfee.AppModule{}, ) @@ -298,7 +298,7 @@ type App struct { CronKeeper cronkeeper.Keeper RouterKeeper *routerkeeper.Keeper - RouterModule router.AppModule + RouterModule packetforward.AppModule HooksTransferIBCModule *ibchooks.IBCMiddleware HooksICS4Wrapper ibchooks.ICS4Middleware @@ -328,8 +328,8 @@ type App struct { checkTxHandler mev_lane.CheckTx // Lanes - Mempool blocksdk.Mempool - MEVLane auctionante.MEVLane + Mempool blocksdk.Mempool + MEVLane auctionante.MEVLane } func (app *App) GetTestBankKeeper() integration.TestBankKeeper { @@ -716,9 +716,9 @@ func New( contractManagerModule := contractmanager.NewAppModule(appCodec, app.ContractManagerKeeper) ibcHooksModule := ibchooks.NewAppModule(app.AccountKeeper) - app.RouterModule = router.NewAppModule(app.RouterKeeper) + app.RouterModule = packetforward.NewAppModule(app.RouterKeeper) - ibcStack := router.NewIBCMiddleware( + ibcStack := packetforward.NewIBCMiddleware( app.HooksTransferIBCModule, app.RouterKeeper, 0, @@ -977,7 +977,6 @@ func New( mevLane.SetAnteHandler(anteHandler) baseLane.SetAnteHandler(anteHandler) - app.SetEndBlocker(app.EndBlocker) handler := blocksdkabci.NewProposalHandler( diff --git a/app/proposals_allowlisting.go b/app/proposals_allowlisting.go index a5853cf30..064d3d3d3 100644 --- a/app/proposals_allowlisting.go +++ b/app/proposals_allowlisting.go @@ -7,10 +7,11 @@ import ( "github.com/cosmos/cosmos-sdk/x/params/types/proposal" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" globalfeetypes "github.com/cosmos/gaia/v11/x/globalfee/types" - packetforwardmiddlewaretypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router/types" + packetforwardmiddlewaretypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types" icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types" ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" + contractmanagertypes "github.com/neutron-org/neutron/x/contractmanager/types" crontypes "github.com/neutron-org/neutron/x/cron/types" feeburnertypes "github.com/neutron-org/neutron/x/feeburner/types" diff --git a/go.mod b/go.mod index a0f9c16f7..8b4329718 100644 --- a/go.mod +++ b/go.mod @@ -17,8 +17,8 @@ require ( github.com/cosmos/cosmos-sdk v0.47.5 github.com/cosmos/gaia/v11 v11.0.0-00010101000000-000000000000 github.com/cosmos/gogoproto v1.4.10 - github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.0-20230803181732-7c8f814d3b79 - github.com/cosmos/ibc-go/v7 v7.2.0 + github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.1 + github.com/cosmos/ibc-go/v7 v7.3.1 github.com/cosmos/ics23/go v0.10.0 github.com/cosmos/interchain-security/v3 v3.1.0 github.com/gogo/protobuf v1.3.3 diff --git a/go.sum b/go.sum index 1d2952b0f..4b0941ac6 100644 --- a/go.sum +++ b/go.sum @@ -399,10 +399,10 @@ github.com/cosmos/gogoproto v1.4.10 h1:QH/yT8X+c0F4ZDacDv3z+xE3WU1P1Z3wQoLMBRJoK github.com/cosmos/gogoproto v1.4.10/go.mod h1:3aAZzeRWpAwr+SS/LLkICX2/kDFyaYVzckBDzygIxek= github.com/cosmos/iavl v0.20.0 h1:fTVznVlepH0KK8NyKq8w+U7c2L6jofa27aFX6YGlm38= github.com/cosmos/iavl v0.20.0/go.mod h1:WO7FyvaZJoH65+HFOsDir7xU9FWk2w9cHXNW1XHcl7A= -github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.0-20230803181732-7c8f814d3b79 h1:n+PjYB3JnbKN+sGmX6khST4xMP+D0UdrMNj7O91fuOg= -github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.0-20230803181732-7c8f814d3b79/go.mod h1:fctjEnz9xaBFOlmYYPdKL8Hs1Y3GUKilSwsJdqBb5QU= -github.com/cosmos/ibc-go/v7 v7.2.0 h1:dx0DLUl7rxdyZ8NiT6UsrbzKOJx/w7s+BOaewFRH6cg= -github.com/cosmos/ibc-go/v7 v7.2.0/go.mod h1:OOcjKIRku/j1Xs1RgKK0yvKRrJ5iFuZYMetR1n3yMlc= +github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.1 h1:8mK4Ha/56P6jkRcLhIYhg/ipWhEuXBtj5O4I6fAi6vg= +github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.1/go.mod h1:GGUJN4LnB3J1Luu4kxTklQLbW69So3QXUndSalB003s= +github.com/cosmos/ibc-go/v7 v7.3.1 h1:bil1IjnHdyWDASFYKfwdRiNtFP6WK3osW7QFEAgU4I8= +github.com/cosmos/ibc-go/v7 v7.3.1/go.mod h1:wvx4pPBofe5ZdMNV3OFRxSI4auEP5Qfqf8JXLLNV04g= github.com/cosmos/ics23/go v0.10.0 h1:iXqLLgp2Lp+EdpIuwXTYIQU+AiHj9mOC2X9ab++bZDM= github.com/cosmos/ics23/go v0.10.0/go.mod h1:ZfJSmng/TBNTBkFemHHHj5YY7VAU/MBU980F4VU1NG0= github.com/cosmos/interchain-security/v3 v3.1.0 h1:EKDJCIKIDLG45tvKwfoANrRPgqvqfUt/f1TNKx3b7Uo= @@ -1203,6 +1203,7 @@ go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= +go.uber.org/mock v0.2.0 h1:TaP3xedm7JaAgScZO7tlvlKrqT0p7I6OsdGB5YNSMDU= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= diff --git a/x/interchainqueries/keeper/msg_server.go b/x/interchainqueries/keeper/msg_server.go index 219c07e21..ca9c9ce13 100644 --- a/x/interchainqueries/keeper/msg_server.go +++ b/x/interchainqueries/keeper/msg_server.go @@ -4,7 +4,6 @@ import ( "bytes" "context" "fmt" - "net/url" "strconv" "time" @@ -230,7 +229,7 @@ func (m msgServer) SubmitQueryResult(goCtx context.Context, msg *types.MsgSubmit return nil, errors.Wrapf(types.ErrInvalidSubmittedResult, "KV path from result is not equal to registered query storage prefix: %v != %v", result.StoragePrefix, query.Keys[index].Path) } - path := ibccommitmenttypes.NewMerklePath(result.StoragePrefix, url.PathEscape(string(result.Key))) + path := ibccommitmenttypes.NewMerklePath(result.StoragePrefix, string(result.Key)) // identify what kind proofs (non-existence proof always has *ics23.CommitmentProof_Nonexist as the first item) we got // and call corresponding method to verify it switch proof.GetProofs()[0].GetProof().(type) { From 06c12a21598da2ffcca1273e72f43e7fd11b0eb3 Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Fri, 3 Nov 2023 11:25:28 +0200 Subject: [PATCH 207/307] import renamings --- app/app.go | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/app/app.go b/app/app.go index aabec59c3..dfdec5c26 100644 --- a/app/app.go +++ b/app/app.go @@ -147,8 +147,8 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" consensusparamkeeper "github.com/cosmos/cosmos-sdk/x/consensus/keeper" consensusparamtypes "github.com/cosmos/cosmos-sdk/x/consensus/types" - routerkeeper "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/keeper" - routertypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types" + pfmkeeper "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/keeper" + pfmtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types" // Block-sdk imports blocksdkabci "github.com/skip-mev/block-sdk/abci" @@ -296,7 +296,7 @@ type App struct { ConsumerKeeper ccvconsumerkeeper.Keeper TokenFactoryKeeper *tokenfactorykeeper.Keeper CronKeeper cronkeeper.Keeper - RouterKeeper *routerkeeper.Keeper + RouterKeeper *pfmkeeper.Keeper RouterModule packetforward.AppModule @@ -380,7 +380,7 @@ func New( evidencetypes.StoreKey, ibctransfertypes.StoreKey, icacontrollertypes.StoreKey, icahosttypes.StoreKey, capabilitytypes.StoreKey, interchainqueriesmoduletypes.StoreKey, contractmanagermoduletypes.StoreKey, interchaintxstypes.StoreKey, wasmtypes.StoreKey, feetypes.StoreKey, - feeburnertypes.StoreKey, adminmoduletypes.StoreKey, ccvconsumertypes.StoreKey, tokenfactorytypes.StoreKey, routertypes.StoreKey, + feeburnertypes.StoreKey, adminmoduletypes.StoreKey, ccvconsumertypes.StoreKey, tokenfactorytypes.StoreKey, pfmtypes.StoreKey, crontypes.StoreKey, ibchookstypes.StoreKey, consensusparamtypes.StoreKey, crisistypes.StoreKey, auctiontypes.StoreKey, ) tkeys := sdk.NewTransientStoreKeys(paramstypes.TStoreKey) @@ -516,10 +516,10 @@ func New( feeBurnerModule := feeburner.NewAppModule(appCodec, *app.FeeBurnerKeeper) // RouterKeeper must be created before TransferKeeper - app.RouterKeeper = routerkeeper.NewKeeper( + app.RouterKeeper = pfmkeeper.NewKeeper( appCodec, - app.keys[routertypes.StoreKey], - app.GetSubspace(routertypes.ModuleName), + app.keys[pfmtypes.StoreKey], + app.GetSubspace(pfmtypes.ModuleName), app.TransferKeeper.Keeper, app.IBCKeeper.ChannelKeeper, app.FeeBurnerKeeper, @@ -722,8 +722,8 @@ func New( app.HooksTransferIBCModule, app.RouterKeeper, 0, - routerkeeper.DefaultForwardTransferPacketTimeoutTimestamp, - routerkeeper.DefaultRefundTransferPacketTimeoutTimestamp, + pfmkeeper.DefaultForwardTransferPacketTimeoutTimestamp, + pfmkeeper.DefaultRefundTransferPacketTimeoutTimestamp, ) ibcRouter.AddRoute(icacontrollertypes.SubModuleName, icaControllerStack). @@ -806,7 +806,7 @@ func New( feeburnertypes.ModuleName, adminmoduletypes.ModuleName, ibchookstypes.ModuleName, - routertypes.ModuleName, + pfmtypes.ModuleName, crontypes.ModuleName, globalfee.ModuleName, ) @@ -837,7 +837,7 @@ func New( feeburnertypes.ModuleName, adminmoduletypes.ModuleName, ibchookstypes.ModuleName, - routertypes.ModuleName, + pfmtypes.ModuleName, crontypes.ModuleName, globalfee.ModuleName, ) @@ -873,7 +873,7 @@ func New( feeburnertypes.ModuleName, adminmoduletypes.ModuleName, ibchookstypes.ModuleName, // after auth keeper - routertypes.ModuleName, + pfmtypes.ModuleName, crontypes.ModuleName, globalfee.ModuleName, ) @@ -1229,7 +1229,7 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino paramsKeeper.Subspace(icacontrollertypes.SubModuleName).WithKeyTable(icacontrollertypes.ParamKeyTable()) paramsKeeper.Subspace(icahosttypes.SubModuleName).WithKeyTable(icahosttypes.ParamKeyTable()) - paramsKeeper.Subspace(routertypes.ModuleName).WithKeyTable(routertypes.ParamKeyTable()) + paramsKeeper.Subspace(pfmtypes.ModuleName).WithKeyTable(pfmtypes.ParamKeyTable()) paramsKeeper.Subspace(globalfee.ModuleName).WithKeyTable(globalfeetypes.ParamKeyTable()) From 8a160ba2ba040914d54e4cdf6b05e4135dee1521 Mon Sep 17 00:00:00 2001 From: swelf Date: Fri, 3 Nov 2023 14:55:53 +0300 Subject: [PATCH 208/307] enabled cosmwasm_1_3,cosmwasm_1_4 features --- app/app.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/app.go b/app/app.go index 798cc7f48..46f87b98f 100644 --- a/app/app.go +++ b/app/app.go @@ -328,8 +328,8 @@ type App struct { checkTxHandler mev_lane.CheckTx // Lanes - Mempool blocksdk.Mempool - MEVLane auctionante.MEVLane + Mempool blocksdk.Mempool + MEVLane auctionante.MEVLane } func (app *App) GetTestBankKeeper() integration.TestBankKeeper { @@ -615,7 +615,7 @@ func New( // NOTE: we need staking feature here even if there is no staking module anymore because cosmwasm-std in the CosmWasm SDK requires this feature // NOTE: cosmwasm_1_2 feature enables GovMsg::VoteWeighted, which doesn't work with Neutron, because it uses its own custom governance, // however, cosmwasm_1_2 also enables WasmMsg::Instantiate2, which works as one could expect - supportedFeatures := "iterator,stargate,staking,neutron,cosmwasm_1_1,cosmwasm_1_2" + supportedFeatures := "iterator,stargate,staking,neutron,cosmwasm_1_1,cosmwasm_1_2,cosmwasm_1_3,cosmwasm_1_4" // register the proposal types adminRouterLegacy := govv1beta1.NewRouter() @@ -977,7 +977,6 @@ func New( mevLane.SetAnteHandler(anteHandler) baseLane.SetAnteHandler(anteHandler) - app.SetEndBlocker(app.EndBlocker) handler := blocksdkabci.NewProposalHandler( From 0065999d091e42efc712306b21112aeae7e377a1 Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Fri, 3 Nov 2023 14:38:23 +0200 Subject: [PATCH 209/307] wasmd release --- go.mod | 4 +--- go.sum | 18 ++---------------- 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/go.mod b/go.mod index 8e0d1a680..6c2ef31d2 100644 --- a/go.mod +++ b/go.mod @@ -26,7 +26,6 @@ require ( github.com/golang/protobuf v1.5.3 github.com/gorilla/mux v1.8.0 github.com/grpc-ecosystem/grpc-gateway v1.16.0 - github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0 github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.16.0 github.com/rs/zerolog v1.30.0 @@ -90,7 +89,6 @@ require ( github.com/felixge/httpsnoop v1.0.2 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect github.com/getsentry/sentry-go v0.23.0 // indirect - github.com/ghodss/yaml v1.0.0 // indirect github.com/go-kit/kit v0.12.0 // indirect github.com/go-kit/log v0.2.1 // indirect github.com/go-logfmt/logfmt v0.6.0 // indirect @@ -192,7 +190,7 @@ require ( replace ( github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0 github.com/ChainSafe/go-schnorrkel => github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d - github.com/CosmWasm/wasmd => github.com/neutron-org/wasmd v0.41.1-0.20231024125505-4e32ed6dc344 + github.com/CosmWasm/wasmd => github.com/neutron-org/wasmd v0.43.0 github.com/cosmos/admin-module => github.com/neutron-org/admin-module v0.0.0-20230906150724-9ccb75c61fc5 github.com/cosmos/cosmos-sdk => github.com/neutron-org/cosmos-sdk v0.47.5 github.com/cosmos/gaia/v11 => github.com/cosmos/gaia/v11 v11.0.0-20230724152830-861ba391c3b4 diff --git a/go.sum b/go.sum index 18187390a..aefde6738 100644 --- a/go.sum +++ b/go.sum @@ -34,8 +34,6 @@ cloud.google.com/go v0.100.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w9 cloud.google.com/go v0.102.0/go.mod h1:oWcCzKlqJ5zgHQt9YsaeTY9KzIvjyy0ArmiBUgpQ+nc= cloud.google.com/go v0.102.1/go.mod h1:XZ77E9qnTEnrgEOvr4xzfdX5TRo7fB4T2F4O6+34hIU= cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA= -cloud.google.com/go v0.110.6 h1:8uYAkj3YHTP/1iwReuHPxLSbdcyc+dSBbzFMrVwDR6Q= -cloud.google.com/go v0.110.6/go.mod h1:+EYjdK8e5RME/VY/qLCAtuyALQ9q67dvuum8i+H5xsI= cloud.google.com/go v0.110.7 h1:rJyC7nWRg2jWGZ4wSJ5nY65GTdYJkg0cd/uXb+ACI6o= cloud.google.com/go v0.110.7/go.mod h1:+EYjdK8e5RME/VY/qLCAtuyALQ9q67dvuum8i+H5xsI= cloud.google.com/go/aiplatform v1.22.0/go.mod h1:ig5Nct50bZlzV6NvKaTwmplLLddFx0YReh9WfTO5jKw= @@ -506,7 +504,6 @@ github.com/getkin/kin-openapi v0.53.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW github.com/getkin/kin-openapi v0.61.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4= github.com/getsentry/sentry-go v0.23.0 h1:dn+QRCeJv4pPt9OjVXiMcGIBIefaTJPw/h0bZWO05nE= github.com/getsentry/sentry-go v0.23.0/go.mod h1:lc76E2QywIyW8WuBnwl8Lc4bkmQH4+w1gwTf25trprY= -github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= @@ -565,8 +562,6 @@ github.com/golang-jwt/jwt/v4 v4.3.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzw github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= github.com/golang/geo v0.0.0-20190916061304-5b978397cfec/go.mod h1:QZ0nwyI2jOfgRAoBvP+ab5aRr7c9x7lhGEJrKvBwjWI= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/glog v1.1.1 h1:jxpi2eWoU84wbX9iIEyAeeoac3FLuifZpY9tcNUD9kw= -github.com/golang/glog v1.1.1/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/rLQ= github.com/golang/glog v1.1.2 h1:DVjP2PbBOzHyzA+dn3WhHIq4NdVu3Q+pvivFICf/7fo= github.com/golang/glog v1.1.2/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/rLQ= github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -666,7 +661,6 @@ github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+ github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -710,8 +704,6 @@ github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgf github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0 h1:RtRsiaGvWxcwd8y3BiRZxsylPT8hLWZ5SPcfI+3IDNk= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0/go.mod h1:TzP6duP4Py2pHLVPPQp42aoYI92+PCrVotyR5e8Vqlk= github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c h1:6rhixN/i8ZofjG1Y75iExal34USq5p+wiN1tpie8IrU= github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c/go.mod h1:NMPJylDgVpX0MLRlPy15sqSwOFv/U1GZ2m21JhFfek0= github.com/gtank/merlin v0.1.1-0.20191105220539-8318aed1a79f/go.mod h1:T86dnYJhcGOh5BjZFCJWTDeTK7XW8uE+E21Cy/bIQ+s= @@ -946,8 +938,8 @@ github.com/neutron-org/admin-module v0.0.0-20230906150724-9ccb75c61fc5 h1:96ZjLW github.com/neutron-org/admin-module v0.0.0-20230906150724-9ccb75c61fc5/go.mod h1:INknneN2W3Fr9Eld7SpfLRdjyHR1muzFbbqXln1ixic= github.com/neutron-org/cosmos-sdk v0.47.5 h1:BUBqUPI5I8rF9ql3RfSCo9XkpZBJPhTZSIWexyxutA4= github.com/neutron-org/cosmos-sdk v0.47.5/go.mod h1:3uZbdGpMOT5usEich5wHANLxz0VbKE9lL1PUq+rzkS4= -github.com/neutron-org/wasmd v0.41.1-0.20231024125505-4e32ed6dc344 h1:5Nl05LZIk13ek1i3fuZlj4rDu47VQrx3DWN1Cn1hIk0= -github.com/neutron-org/wasmd v0.41.1-0.20231024125505-4e32ed6dc344/go.mod h1:GEWnDHjbx7qtVHQ+5ocrNe1sIHNiXcTlSocXyLQNnRY= +github.com/neutron-org/wasmd v0.43.0 h1:aXzN9diVRAKTs2+EdK4zoTOmNCjjr8vpAhIq8VbBUJc= +github.com/neutron-org/wasmd v0.43.0/go.mod h1:GEWnDHjbx7qtVHQ+5ocrNe1sIHNiXcTlSocXyLQNnRY= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= @@ -1088,8 +1080,6 @@ github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6Mwd github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= -github.com/skip-mev/block-sdk v1.0.0 h1:unp9laTgcePHPRm5TCr0xHmytDmTnqAwlivsn/LqTWI= -github.com/skip-mev/block-sdk v1.0.0/go.mod h1:+yIvnG/K0o/fnWkX4Iw/Wt7m1ofUO67uz0rsbULuSAY= github.com/skip-mev/block-sdk v1.1.0 h1:cYEO/ASxhtasdRStMXhw1cWOjCJ78Z3J+K01n++OHkU= github.com/skip-mev/block-sdk v1.1.0/go.mod h1:G/ryMdo70R1xOJehV1RqDyTH0x7gffwB1wU9MLMzIHE= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= @@ -1788,8 +1778,6 @@ google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqw google.golang.org/genproto v0.0.0-20221014173430-6e2ab493f96b/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221025140454-527a21cfbd71/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s= -google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 h1:L6iMMGrtzgHsWofoFcihmDEMYeDR9KN/ThbPWGrh++g= -google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5/go.mod h1:oH/ZOT02u4kWEp7oYBGYFFkCdKS/uYR9Z7+0/xuuFp8= google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d h1:VBu5YqKPv6XiJ199exd8Br+Aetz+o08F+PLMnwJQHAY= google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d/go.mod h1:yZTlhN0tQnXo3h00fuXNCxJdLdIdnVFVBaRJ5LWBbw4= google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d h1:DoPTO70H+bcDXcd39vOqb2viZxgqeBeSGtZ55yZU4/Q= @@ -1837,8 +1825,6 @@ 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.58.2 h1:SXUpjxeVF3FKrTYQI4f4KvbGD5u2xccdYdurwowix5I= -google.golang.org/grpc v1.58.2/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0= google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk= google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= From a3c1b1e0085940a5d55218c23cccd6138b1daf4c Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Fri, 3 Nov 2023 15:04:29 +0200 Subject: [PATCH 210/307] linter --- app/ante_handler.go | 2 +- app/app.go | 10 +++++----- app/upgrades/nextupgrade/upgrades.go | 5 +++-- app/upgrades/nextupgrade/upgrades_test.go | 2 +- x/transfer/module.go | 3 ++- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/app/ante_handler.go b/app/ante_handler.go index 7d67d7d9e..d7821cf1a 100644 --- a/app/ante_handler.go +++ b/app/ante_handler.go @@ -15,9 +15,9 @@ import ( ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper" consumerante "github.com/cosmos/interchain-security/v3/app/consumer/ante" ibcconsumerkeeper "github.com/cosmos/interchain-security/v3/x/ccv/consumer/keeper" + blocksdk "github.com/skip-mev/block-sdk/block" auctionante "github.com/skip-mev/block-sdk/x/auction/ante" auctionkeeper "github.com/skip-mev/block-sdk/x/auction/keeper" - blocksdk "github.com/skip-mev/block-sdk/block" ) // HandlerOptions extend the SDK's AnteHandler options by requiring the IBC diff --git a/app/app.go b/app/app.go index dc56fda8f..66cc0c850 100644 --- a/app/app.go +++ b/app/app.go @@ -1220,10 +1220,10 @@ func (app *App) RegisterTendermintService(clientCtx client.Context) { func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino, key, tkey storetypes.StoreKey) paramskeeper.Keeper { paramsKeeper := paramskeeper.NewKeeper(appCodec, legacyAmino, key, tkey) - paramsKeeper.Subspace(authtypes.ModuleName).WithKeyTable(authtypes.ParamKeyTable()) - paramsKeeper.Subspace(banktypes.ModuleName).WithKeyTable(banktypes.ParamKeyTable()) - paramsKeeper.Subspace(slashingtypes.ModuleName).WithKeyTable(slashingtypes.ParamKeyTable()) - paramsKeeper.Subspace(crisistypes.ModuleName).WithKeyTable(crisistypes.ParamKeyTable()) + paramsKeeper.Subspace(authtypes.ModuleName).WithKeyTable(authtypes.ParamKeyTable()) //nolint:staticcheck + paramsKeeper.Subspace(banktypes.ModuleName).WithKeyTable(banktypes.ParamKeyTable()) //nolint:staticcheck + paramsKeeper.Subspace(slashingtypes.ModuleName).WithKeyTable(slashingtypes.ParamKeyTable()) //nolint:staticcheck + paramsKeeper.Subspace(crisistypes.ModuleName).WithKeyTable(crisistypes.ParamKeyTable()) //nolint:staticcheck paramsKeeper.Subspace(ibctransfertypes.ModuleName).WithKeyTable(ibctransfertypes.ParamKeyTable()) paramsKeeper.Subspace(ibchost.ModuleName) paramsKeeper.Subspace(icacontrollertypes.SubModuleName).WithKeyTable(icacontrollertypes.ParamKeyTable()) @@ -1236,7 +1236,7 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino paramsKeeper.Subspace(ccvconsumertypes.ModuleName).WithKeyTable(ccvconsumertypes.ParamKeyTable()) // MOTE: legacy subspaces for migration sdk47 only - paramsKeeper.Subspace(wasmtypes.ModuleName).WithKeyTable(wasmtypes.ParamKeyTable()) + paramsKeeper.Subspace(wasmtypes.ModuleName).WithKeyTable(wasmtypes.ParamKeyTable()) //nolint:staticcheck paramsKeeper.Subspace(crontypes.StoreKey).WithKeyTable(crontypes.ParamKeyTable()) paramsKeeper.Subspace(feeburnertypes.StoreKey).WithKeyTable(feeburnertypes.ParamKeyTable()) paramsKeeper.Subspace(feetypes.StoreKey).WithKeyTable(feetypes.ParamKeyTable()) diff --git a/app/upgrades/nextupgrade/upgrades.go b/app/upgrades/nextupgrade/upgrades.go index 92a94d7d6..3ac120b4c 100644 --- a/app/upgrades/nextupgrade/upgrades.go +++ b/app/upgrades/nextupgrade/upgrades.go @@ -2,6 +2,7 @@ package nextupgrade import ( "fmt" + "github.com/cosmos/cosmos-sdk/baseapp" consensuskeeper "github.com/cosmos/cosmos-sdk/x/consensus/keeper" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" @@ -241,7 +242,7 @@ func setInterchainTxsParams(ctx sdk.Context, paramsKeepers paramskeeper.Keeper, return nil } -func migrateGlobalFees(ctx sdk.Context, keepers *upgrades.UpgradeKeepers) error { +func migrateGlobalFees(ctx sdk.Context, keepers *upgrades.UpgradeKeepers) error { //nolint:unparam ctx.Logger().Info("Implementing GlobalFee Params...") // global fee is empty set, set global fee to equal to 0.05 USD (for 200k of gas) in appropriate coin @@ -290,7 +291,7 @@ func migrateRewardDenoms(ctx sdk.Context, keepers *upgrades.UpgradeKeepers) erro return nil } -func migrateAdminModule(ctx sdk.Context, keepers *upgrades.UpgradeKeepers) error { +func migrateAdminModule(ctx sdk.Context, keepers *upgrades.UpgradeKeepers) error { //nolint:unparam ctx.Logger().Info("Migrating admin module...") keepers.AdminModule.SetProposalID(ctx, 1) diff --git a/app/upgrades/nextupgrade/upgrades_test.go b/app/upgrades/nextupgrade/upgrades_test.go index 453aae2e1..ebba89756 100644 --- a/app/upgrades/nextupgrade/upgrades_test.go +++ b/app/upgrades/nextupgrade/upgrades_test.go @@ -141,7 +141,7 @@ func (suite *UpgradeTestSuite) TestAdminModuleUpgrade() { ctx = suite.ChainA.GetContext() ) - //emulate lack of ProposalIDKey like on a real mainnet + // emulate lack of ProposalIDKey like on a real mainnet store := ctx.KVStore(app.GetKey(adminmoduletypes.StoreKey)) store.Delete(adminmoduletypes.ProposalIDKey) diff --git a/x/transfer/module.go b/x/transfer/module.go index 10da394eb..a642920f9 100644 --- a/x/transfer/module.go +++ b/x/transfer/module.go @@ -1,9 +1,10 @@ package transfer import ( + "fmt" + "cosmossdk.io/core/appmodule" "cosmossdk.io/errors" - "fmt" "github.com/cosmos/cosmos-sdk/codec" cdctypes "github.com/cosmos/cosmos-sdk/codec/types" From 11166c6268a29ae10808b51a3c62fb8aced89987 Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Fri, 3 Nov 2023 20:00:26 +0400 Subject: [PATCH 211/307] update wasm key due wasm module update --- app/upgrades/nextupgrade/upgrades.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/upgrades/nextupgrade/upgrades.go b/app/upgrades/nextupgrade/upgrades.go index a2114cf6f..dec75c001 100644 --- a/app/upgrades/nextupgrade/upgrades.go +++ b/app/upgrades/nextupgrade/upgrades.go @@ -242,9 +242,9 @@ func setInterchainTxsParams(ctx sdk.Context, paramsKeepers paramskeeper.Keeper, store.Set(interchaintxstypes.ParamsKey, bz) wasmStore := ctx.KVStore(wasmStoreKey) - bzWasm := wasmStore.Get(wasmtypes.KeyLastCodeID) + bzWasm := wasmStore.Get(wasmtypes.KeySequenceCodeID) if bzWasm == nil { - return fmt.Errorf("last code ID not found during the upgrade") + return fmt.Errorf("KeySequenceCodeID not found during the upgrade") } store.Set(interchaintxstypes.ICARegistrationFeeFirstCodeID, bzWasm) return nil From ad0c8af7d30977da7a3506f38953784d45d292e9 Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Fri, 3 Nov 2023 21:59:37 +0200 Subject: [PATCH 212/307] linter --- app/upgrades/nextupgrade/upgrades.go | 2 +- testutil/mocks/contractmanager/types/expected_keepers.go | 2 +- x/interchaintxs/types/keys.go | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/upgrades/nextupgrade/upgrades.go b/app/upgrades/nextupgrade/upgrades.go index dec75c001..9388e549f 100644 --- a/app/upgrades/nextupgrade/upgrades.go +++ b/app/upgrades/nextupgrade/upgrades.go @@ -227,7 +227,7 @@ func migrateInterchainQueriesParams(ctx sdk.Context, paramsKeepers paramskeeper. return nil } -func setInterchainTxsParams(ctx sdk.Context, paramsKeepers paramskeeper.Keeper, storeKey storetypes.StoreKey, wasmStoreKey storetypes.StoreKey, codec codec.Codec) error { +func setInterchainTxsParams(ctx sdk.Context, paramsKeepers paramskeeper.Keeper, storeKey, wasmStoreKey storetypes.StoreKey, codec codec.Codec) error { store := ctx.KVStore(storeKey) var currParams interchaintxstypes.Params subspace, _ := paramsKeepers.GetSubspace(interchaintxstypes.StoreKey) diff --git a/testutil/mocks/contractmanager/types/expected_keepers.go b/testutil/mocks/contractmanager/types/expected_keepers.go index c69dcf649..eb767f134 100644 --- a/testutil/mocks/contractmanager/types/expected_keepers.go +++ b/testutil/mocks/contractmanager/types/expected_keepers.go @@ -20,7 +20,7 @@ type MockWasmKeeper struct { } func (m *MockWasmKeeper) GetContractInfo(ctx types.Context, contractAddress types.AccAddress) *wasmtypes.ContractInfo { - //TODO implement me + // TODO implement me panic("implement me") } diff --git a/x/interchaintxs/types/keys.go b/x/interchaintxs/types/keys.go index 7fd3d09c1..ba4019d86 100644 --- a/x/interchaintxs/types/keys.go +++ b/x/interchaintxs/types/keys.go @@ -24,5 +24,7 @@ const ( prefixICARegistrationFeeFirstCodeID = iota + 2 ) -var ParamsKey = []byte{prefixParamsKey} -var ICARegistrationFeeFirstCodeID = []byte{prefixICARegistrationFeeFirstCodeID} +var ( + ParamsKey = []byte{prefixParamsKey} + ICARegistrationFeeFirstCodeID = []byte{prefixICARegistrationFeeFirstCodeID} +) From c6df465e5f83a811fd1cc98b6ebbf677a55ea21c Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Tue, 7 Nov 2023 13:01:56 +0400 Subject: [PATCH 213/307] fix typo in comment --- x/interchaintxs/keeper/msg_server.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x/interchaintxs/keeper/msg_server.go b/x/interchaintxs/keeper/msg_server.go index ace0f34f5..5cde87c49 100644 --- a/x/interchaintxs/keeper/msg_server.go +++ b/x/interchaintxs/keeper/msg_server.go @@ -47,7 +47,7 @@ func (k Keeper) RegisterInterchainAccount(goCtx context.Context, msg *ictxtypes. return nil, errors.Wrapf(ictxtypes.ErrNotContract, "%s is not a contract address", msg.FromAddress) } - // if contract is stored after [last] upgrade, we're not going charge fees for register ICA + // if contract is stored before [last] upgrade, we're not going charge fees for register ICA if k.sudoKeeper.GetContractInfo(ctx, senderAddr).CodeID >= k.GetICARegistrationFeeFirstCodeID(ctx) { if err := k.ChargeFee(ctx, senderAddr, msg.RegisterFee); err != nil { return nil, errors.Wrapf(err, "failed to charge fees to pay for RegisterInterchainAccount msg: %s", msg) From 7acfccd16a4521112630ca1326e913f22e02f305 Mon Sep 17 00:00:00 2001 From: sotnikov-s Date: Tue, 7 Nov 2023 15:00:17 +0300 Subject: [PATCH 214/307] add error to Failure proto (no rebuild) --- proto/neutron/contractmanager/failure.proto | 2 ++ 1 file changed, 2 insertions(+) diff --git a/proto/neutron/contractmanager/failure.proto b/proto/neutron/contractmanager/failure.proto index d18386884..d09c7b055 100644 --- a/proto/neutron/contractmanager/failure.proto +++ b/proto/neutron/contractmanager/failure.proto @@ -15,4 +15,6 @@ message Failure { uint64 id = 2; // Serialized MessageSudoCallback with Packet and Ack(if exists) bytes sudo_payload = 3; + // Redacted error response of the sudo call. Full error is emitted as an event + string error = 4; } From 3f84ba0c75fee35087fbfd14ed7e1d0267500100 Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Tue, 7 Nov 2023 16:08:46 +0400 Subject: [PATCH 215/307] regen-proto --- x/contractmanager/types/failure.pb.go | 69 +++++++++++++++++++++++---- 1 file changed, 61 insertions(+), 8 deletions(-) diff --git a/x/contractmanager/types/failure.pb.go b/x/contractmanager/types/failure.pb.go index 063afa74f..c06816160 100644 --- a/x/contractmanager/types/failure.pb.go +++ b/x/contractmanager/types/failure.pb.go @@ -33,6 +33,8 @@ type Failure struct { Id uint64 `protobuf:"varint,2,opt,name=id,proto3" json:"id,omitempty"` // Serialized MessageSudoCallback with Packet and Ack(if exists) SudoPayload []byte `protobuf:"bytes,3,opt,name=sudo_payload,json=sudoPayload,proto3" json:"sudo_payload,omitempty"` + // Redacted error response of the sudo call. Full error is emitted as an event + Error string `protobuf:"bytes,4,opt,name=error,proto3" json:"error,omitempty"` } func (m *Failure) Reset() { *m = Failure{} } @@ -89,6 +91,13 @@ func (m *Failure) GetSudoPayload() []byte { return nil } +func (m *Failure) GetError() string { + if m != nil { + return m.Error + } + return "" +} + func init() { proto.RegisterType((*Failure)(nil), "neutron.contractmanager.Failure") } @@ -98,22 +107,23 @@ func init() { } var fileDescriptor_fba0c26e85dad46e = []byte{ - // 230 bytes of a gzipped FileDescriptorProto + // 245 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, 0x4f, 0xce, 0xcf, 0x2b, 0x29, 0x4a, 0x4c, 0x2e, 0xc9, 0x4d, 0xcc, 0x4b, 0x4c, 0x4f, 0x2d, 0xd2, 0x4f, 0x4b, 0xcc, 0xcc, 0x29, 0x2d, 0x4a, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x87, 0x2a, 0xd3, 0x43, 0x53, 0x26, 0xa5, 0x98, 0x99, 0x94, 0xac, 0x9f, 0x9c, 0x5f, 0x94, 0xaa, 0x9f, 0x9c, 0x91, 0x98, 0x97, 0x97, 0x9a, 0xa3, 0x5f, 0x66, 0x08, 0x63, 0x42, - 0xf4, 0x2a, 0x85, 0x71, 0xb1, 0xbb, 0x41, 0x0c, 0x13, 0x92, 0xe0, 0x62, 0x4f, 0x4c, 0x49, 0x29, + 0xf4, 0x2a, 0xe5, 0x70, 0xb1, 0xbb, 0x41, 0x0c, 0x13, 0x92, 0xe0, 0x62, 0x4f, 0x4c, 0x49, 0x29, 0x4a, 0x2d, 0x2e, 0x96, 0x60, 0x54, 0x60, 0xd4, 0xe0, 0x0c, 0x82, 0x71, 0x85, 0xf8, 0xb8, 0x98, 0x32, 0x53, 0x24, 0x98, 0x14, 0x18, 0x35, 0x58, 0x82, 0x98, 0x32, 0x53, 0x84, 0x14, 0xb9, 0x78, 0x8a, 0x4b, 0x53, 0xf2, 0xe3, 0x0b, 0x12, 0x2b, 0x73, 0xf2, 0x13, 0x53, 0x24, 0x98, 0x15, 0x18, - 0x35, 0x78, 0x82, 0xb8, 0x41, 0x62, 0x01, 0x10, 0x21, 0xa7, 0x80, 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, 0x4b, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, - 0xd5, 0x87, 0x3a, 0x5c, 0x37, 0xbf, 0x28, 0x1d, 0xc6, 0xd6, 0xaf, 0xc0, 0xf0, 0x6d, 0x49, 0x65, - 0x41, 0x6a, 0x71, 0x12, 0x1b, 0xd8, 0xc1, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc1, 0xf7, - 0xe5, 0xa7, 0x15, 0x01, 0x00, 0x00, + 0x35, 0x78, 0x82, 0xb8, 0x41, 0x62, 0x01, 0x10, 0x21, 0x21, 0x11, 0x2e, 0xd6, 0xd4, 0xa2, 0xa2, + 0xfc, 0x22, 0x09, 0x16, 0xb0, 0x51, 0x10, 0x8e, 0x53, 0xc0, 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, 0x99, 0xa5, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, + 0x43, 0xbd, 0xa3, 0x9b, 0x5f, 0x94, 0x0e, 0x63, 0xeb, 0x57, 0x60, 0x84, 0x41, 0x49, 0x65, 0x41, + 0x6a, 0x71, 0x12, 0x1b, 0xd8, 0x1b, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x3c, 0x20, 0x77, + 0x4c, 0x2b, 0x01, 0x00, 0x00, } func (m *Failure) Marshal() (dAtA []byte, err error) { @@ -136,6 +146,13 @@ func (m *Failure) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if len(m.Error) > 0 { + i -= len(m.Error) + copy(dAtA[i:], m.Error) + i = encodeVarintFailure(dAtA, i, uint64(len(m.Error))) + i-- + dAtA[i] = 0x22 + } if len(m.SudoPayload) > 0 { i -= len(m.SudoPayload) copy(dAtA[i:], m.SudoPayload) @@ -186,6 +203,10 @@ func (m *Failure) Size() (n int) { if l > 0 { n += 1 + l + sovFailure(uint64(l)) } + l = len(m.Error) + if l > 0 { + n += 1 + l + sovFailure(uint64(l)) + } return n } @@ -309,6 +330,38 @@ func (m *Failure) Unmarshal(dAtA []byte) error { m.SudoPayload = []byte{} } iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Error", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowFailure + } + 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 ErrInvalidLengthFailure + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthFailure + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Error = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipFailure(dAtA[iNdEx:]) From ac9156a595076e50208c0cfd6c663d591e8c7506 Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Tue, 7 Nov 2023 19:25:14 +0200 Subject: [PATCH 216/307] small improvements --- x/dex/keeper/liquidity.go | 11 ++++++----- x/dex/keeper/liquidity_test.go | 7 +++---- x/dex/keeper/multihop_swap.go | 6 ++---- x/gmp/types.go | 2 -- x/incentives/types/stake.go | 9 +-------- 5 files changed, 12 insertions(+), 23 deletions(-) diff --git a/x/dex/keeper/liquidity.go b/x/dex/keeper/liquidity.go index a24ec9bfb..6bae05491 100644 --- a/x/dex/keeper/liquidity.go +++ b/x/dex/keeper/liquidity.go @@ -3,6 +3,7 @@ package keeper import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" + math_utils "github.com/neutron-org/neutron/utils/math" "github.com/neutron-org/neutron/x/dex/types" ) @@ -13,7 +14,7 @@ func (k Keeper) Swap( maxAmountTakerDenom math.Int, maxAmountMakerDenom *math.Int, limitPrice *math_utils.PrecDec, -) (totalTakerCoin, totalMakerCoin sdk.Coin, orderFilled bool, err error) { +) (totalTakerCoin, totalMakerCoin sdk.Coin, orderFilled bool) { useMaxOut := maxAmountMakerDenom != nil var remainingMakerDenom *math.Int if useMaxOut { @@ -72,7 +73,7 @@ func (k Keeper) Swap( ), sdk.NewCoin( tradePairID.MakerDenom, totalMakerDenom, - ), orderFilled, nil + ), orderFilled } func (k Keeper) SwapWithCache( @@ -81,9 +82,9 @@ func (k Keeper) SwapWithCache( maxAmountIn math.Int, maxAmountOut *math.Int, limitPrice *math_utils.PrecDec, -) (totalIn, totalOut sdk.Coin, orderFilled bool, err error) { +) (totalIn, totalOut sdk.Coin, orderFilled bool) { cacheCtx, writeCache := ctx.CacheContext() - totalIn, totalOut, orderFilled, err = k.Swap( + totalIn, totalOut, orderFilled = k.Swap( cacheCtx, tradePairID, maxAmountIn, @@ -93,7 +94,7 @@ func (k Keeper) SwapWithCache( writeCache() - return totalIn, totalOut, orderFilled, err + return totalIn, totalOut, orderFilled } func (k Keeper) SaveLiquidity(sdkCtx sdk.Context, liquidityI types.Liquidity) { diff --git a/x/dex/keeper/liquidity_test.go b/x/dex/keeper/liquidity_test.go index 0cfdad2b7..1896dc28d 100644 --- a/x/dex/keeper/liquidity_test.go +++ b/x/dex/keeper/liquidity_test.go @@ -5,6 +5,7 @@ import ( sdkmath "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/neutron-org/neutron/x/dex/types" ) @@ -590,14 +591,13 @@ func (s *DexTestSuite) swap( ) (coinIn, coinOut sdk.Coin) { tradePairID, err := types.NewTradePairID(tokenIn, tokenOut) s.Assert().NoError(err) - coinIn, coinOut, _, err = s.App.DexKeeper.Swap( + coinIn, coinOut, _ = s.App.DexKeeper.Swap( s.Ctx, tradePairID, sdkmath.NewInt(maxAmountIn).Mul(denomMultiple), nil, nil, ) - s.Assert().NoError(err) return coinIn, coinOut } @@ -609,14 +609,13 @@ func (s *DexTestSuite) swapWithMaxOut( ) (coinIn, coinOut sdk.Coin) { tradePairID := types.MustNewTradePairID(tokenIn, tokenOut) maxAmountOutInt := sdkmath.NewInt(maxAmountOut).Mul(denomMultiple) - coinIn, coinOut, _, err := s.App.DexKeeper.Swap( + coinIn, coinOut, _ = s.App.DexKeeper.Swap( s.Ctx, tradePairID, sdkmath.NewInt(maxAmountIn).Mul(denomMultiple), &maxAmountOutInt, nil, ) - s.Assert().NoError(err) return coinIn, coinOut } diff --git a/x/dex/keeper/multihop_swap.go b/x/dex/keeper/multihop_swap.go index 656a76732..0704e83b5 100644 --- a/x/dex/keeper/multihop_swap.go +++ b/x/dex/keeper/multihop_swap.go @@ -4,6 +4,7 @@ import ( sdkerrors "cosmossdk.io/errors" "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" + math_utils "github.com/neutron-org/neutron/utils/math" "github.com/neutron-org/neutron/x/dex/types" ) @@ -143,16 +144,13 @@ func (k Keeper) SwapExactAmountIn(ctx sdk.Context, tradePairID *types.TradePairID, amountIn math.Int, ) (totalOut sdk.Coin, err error) { - _, swapAmountMakerDenom, orderFilled, err := k.Swap( + _, swapAmountMakerDenom, orderFilled := k.Swap( ctx, tradePairID, amountIn, nil, nil, ) - if err != nil { - return sdk.Coin{}, err - } if !orderFilled { return sdk.Coin{}, types.ErrInsufficientLiquidity } diff --git a/x/gmp/types.go b/x/gmp/types.go index ed497174e..63c371ff6 100644 --- a/x/gmp/types.go +++ b/x/gmp/types.go @@ -1,7 +1,5 @@ package gmp -const AxelarGMPAcc = "axelar1dv4u5k73pzqrxlzujxg3qp8kvc3pje7jtdvu72npnt5zhq05ejcsn5qme5" - // Message is attached in ICS20 packet memo field type Message struct { SourceChain string `json:"source_chain"` diff --git a/x/incentives/types/stake.go b/x/incentives/types/stake.go index 7d2507cbb..a830e885c 100644 --- a/x/incentives/types/stake.go +++ b/x/incentives/types/stake.go @@ -1,10 +1,10 @@ package types import ( - "fmt" "time" sdk "github.com/cosmos/cosmos-sdk/types" + dextypes "github.com/neutron-org/neutron/x/dex/types" ) @@ -35,13 +35,6 @@ func (p Stake) OwnerAddress() sdk.AccAddress { return addr } -func (p Stake) SingleCoin() (sdk.Coin, error) { - if len(p.Coins) != 1 { - return sdk.Coin{}, fmt.Errorf("Stake %d has no single coin: %s", p.ID, p.Coins) - } - return p.Coins[0], nil -} - func (p Stake) ValidateBasic() error { for _, coin := range p.Coins { err := dextypes.ValidatePoolDenom(coin.Denom) From c6469edc863dcb4c3f1fcbc947c97c3563426526 Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Tue, 7 Nov 2023 19:38:36 +0200 Subject: [PATCH 217/307] fix core.go --- x/dex/keeper/core.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/x/dex/keeper/core.go b/x/dex/keeper/core.go index ebe804de0..cab8d8e05 100644 --- a/x/dex/keeper/core.go +++ b/x/dex/keeper/core.go @@ -7,6 +7,7 @@ import ( sdkerrors "cosmossdk.io/errors" "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" + math_utils "github.com/neutron-org/neutron/utils/math" "github.com/neutron-org/neutron/x/dex/types" "github.com/neutron-org/neutron/x/dex/utils" @@ -330,16 +331,13 @@ func (k Keeper) PlaceLimitOrderCore( } var orderFilled bool - swapInCoin, swapOutCoin, orderFilled, err = k.SwapWithCache( + swapInCoin, swapOutCoin, orderFilled = k.SwapWithCache( ctx, takerTradePairID, amountIn, maxAmountOut, &limitPrice, ) - if err != nil { - return - } if orderType.IsFoK() && !orderFilled { err = types.ErrFoKLimitOrderNotFilled From 7867e066508272de12e3ca7ed064ff2a6285a438 Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Tue, 7 Nov 2023 19:57:20 +0200 Subject: [PATCH 218/307] pool validation --- x/dex/types/pool_denom.go | 5 ++--- x/dex/types/pool_denom_test.go | 13 +++++++++++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/x/dex/types/pool_denom.go b/x/dex/types/pool_denom.go index 1d3ddbbfc..8ec7547cb 100644 --- a/x/dex/types/pool_denom.go +++ b/x/dex/types/pool_denom.go @@ -21,10 +21,9 @@ func NewPoolDenom(poolID uint64) string { } func ValidatePoolDenom(denom string) error { - if !PoolDenomRegexp.MatchString(denom) { - return ErrInvalidPoolDenom + if _, err := ParsePoolIDFromDenom(denom); err != nil { + return err } - return nil } diff --git a/x/dex/types/pool_denom_test.go b/x/dex/types/pool_denom_test.go index 0d46a66f8..57683a701 100644 --- a/x/dex/types/pool_denom_test.go +++ b/x/dex/types/pool_denom_test.go @@ -3,11 +3,12 @@ package types_test import ( "testing" - . "github.com/neutron-org/neutron/x/dex/types" "github.com/stretchr/testify/require" + + . "github.com/neutron-org/neutron/x/dex/types" ) -func TestParsePoolIDFromDenom(t *testing.T) { +func TestValidatePoolDenom(t *testing.T) { for _, tc := range []struct { desc string denom string @@ -26,6 +27,11 @@ func TestParsePoolIDFromDenom(t *testing.T) { expected: 999999999, valid: true, }, + { + desc: "invalid denom long", + denom: "neutron/pool/99999999999999999999", + valid: false, + }, { desc: "invalid format 1", denom: "/neutron/pool/0", @@ -43,12 +49,15 @@ func TestParsePoolIDFromDenom(t *testing.T) { }, } { t.Run(tc.desc, func(t *testing.T) { + validateError := ValidatePoolDenom(tc.denom) id, err := ParsePoolIDFromDenom(tc.denom) if tc.valid { require.NoError(t, err) + require.NoError(t, validateError) require.Equal(t, tc.expected, id) } else { require.Error(t, err) + require.Equal(t, err, validateError) } }) } From 4ee803ff75bb8fdddee1ed62fbf8b771d8006347 Mon Sep 17 00:00:00 2001 From: sotnikov-s Date: Wed, 8 Nov 2023 14:02:24 +0300 Subject: [PATCH 219/307] add events emission and redacted err saving on sudo err --- proto/neutron/contractmanager/query.proto | 17 +- x/contractmanager/client/cli/query.go | 1 + x/contractmanager/client/cli/query_failure.go | 72 +++++++- x/contractmanager/genesis.go | 2 +- x/contractmanager/ibc_middleware.go | 39 ++++- x/contractmanager/keeper/failure.go | 12 +- .../keeper/grpc_query_failure.go | 21 ++- x/contractmanager/types/events.go | 10 ++ x/contractmanager/types/expected_keepers.go | 2 +- x/contractmanager/types/query.pb.go | 156 +++++++++++++----- x/contractmanager/types/query.pb.gw.go | 141 ++++++++++++++++ 11 files changed, 412 insertions(+), 61 deletions(-) create mode 100644 x/contractmanager/types/events.go diff --git a/proto/neutron/contractmanager/query.proto b/proto/neutron/contractmanager/query.proto index 8ce870c3e..973cd15ef 100644 --- a/proto/neutron/contractmanager/query.proto +++ b/proto/neutron/contractmanager/query.proto @@ -16,13 +16,19 @@ service Query { rpc Params(QueryParamsRequest) returns (QueryParamsResponse) { option (google.api.http).get = "/neutron/contractmanager/params"; } - // Queries a Failure by address. + + // Queries a Failure by contract address and failure ID. + rpc AddressFailure(QueryFailuresRequest) returns (QueryFailuresResponse) { + option (google.api.http).get = "/neutron/contractmanager/failures/{address}/{failure_id}"; + } + + // Queries Failures by contract address. rpc AddressFailures(QueryFailuresRequest) returns (QueryFailuresResponse) { option (google.api.http).get = "/neutron/contractmanager/failures/{address}"; } - // Queries a list of Failure items. + // Queries a list of Failures occurred on the network. rpc Failures(QueryFailuresRequest) returns (QueryFailuresResponse) { option (google.api.http).get = "/neutron/contractmanager/failures"; } @@ -39,11 +45,16 @@ message QueryParamsResponse { Params params = 1 [ (gogoproto.nullable) = false ]; } +// QueryFailuresRequest is request type for the Query/Failures RPC method. message QueryFailuresRequest { + // address of the contract which Sudo call failed. string address = 1; - cosmos.base.query.v1beta1.PageRequest pagination = 2; + // ID of the failure for the given contract. + uint64 failure_id = 2; + cosmos.base.query.v1beta1.PageRequest pagination = 3; } +// QueryFailuresResponse is response type for the Query/Failures RPC method. message QueryFailuresResponse { repeated Failure failures = 1 [ (gogoproto.nullable) = false ]; cosmos.base.query.v1beta1.PageResponse pagination = 2; diff --git a/x/contractmanager/client/cli/query.go b/x/contractmanager/client/cli/query.go index a60ce28a2..9562d9550 100644 --- a/x/contractmanager/client/cli/query.go +++ b/x/contractmanager/client/cli/query.go @@ -24,6 +24,7 @@ func GetQueryCmd(_ string) *cobra.Command { cmd.AddCommand(CmdQueryParams()) cmd.AddCommand(CmdFailures()) + cmd.AddCommand(CmdFailureDetails()) // this line is used by starport scaffolding # 1 return cmd diff --git a/x/contractmanager/client/cli/query_failure.go b/x/contractmanager/client/cli/query_failure.go index 0a819dc79..9544e3ebc 100644 --- a/x/contractmanager/client/cli/query_failure.go +++ b/x/contractmanager/client/cli/query_failure.go @@ -1,13 +1,16 @@ package cli import ( - "context" + "fmt" + "strconv" + wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" + "github.com/cosmos/cosmos-sdk/version" + "github.com/cosmos/cosmos-sdk/x/auth/tx" + contractmanagertypes "github.com/neutron-org/neutron/x/contractmanager/types" "github.com/spf13/cobra" - - "github.com/neutron-org/neutron/x/contractmanager/types" ) func CmdFailures() *cobra.Command { @@ -23,19 +26,19 @@ func CmdFailures() *cobra.Command { return err } - queryClient := types.NewQueryClient(clientCtx) + queryClient := contractmanagertypes.NewQueryClient(clientCtx) address := "" if len(args) > 0 { address = args[0] } - params := &types.QueryFailuresRequest{ + params := &contractmanagertypes.QueryFailuresRequest{ Address: address, Pagination: pageReq, } - res, err := queryClient.Failures(context.Background(), params) + res, err := queryClient.Failures(cmd.Context(), params) if err != nil { return err } @@ -49,3 +52,60 @@ func CmdFailures() *cobra.Command { return cmd } + +// CmdFailureDetails returns the command handler for the failure's detailed error querying. +func CmdFailureDetails() *cobra.Command { + cmd := &cobra.Command{ + Use: "failure-details [address] [failure-id]", + Short: "Query the detailed error related to a contract's sudo call failure", + Long: "Query the detailed error related to a contract's sudo call failure based on contract's address and failure ID", + Args: cobra.ExactArgs(2), + Example: fmt.Sprintf("%s query failure-details neutron1m0z0kk0qqug74n9u9ul23e28x5fszr628h20xwt6jywjpp64xn4qatgvm0 0", version.AppName), + RunE: func(cmd *cobra.Command, args []string) error { + address := args[0] + failureID, err := strconv.ParseUint(args[1], 10, 64) + if err != nil { + return fmt.Errorf("invalid failure ID %s: expected a uint64: %v", args[1], err) + } + + clientCtx, err := client.GetClientQueryContext(cmd) + if err != nil { + return err + } + + queryClient := contractmanagertypes.NewQueryClient(clientCtx) + if _, err = queryClient.AddressFailure( + cmd.Context(), + &contractmanagertypes.QueryFailuresRequest{Address: address, FailureId: failureID}, + ); err != nil { + return err + } + + searchEvents := []string{ + fmt.Sprintf("%s.%s='%s'", wasmtypes.EventTypeSudo, wasmtypes.AttributeKeyContractAddr, address), + fmt.Sprintf("%s.%s='%d'", wasmtypes.EventTypeSudo, contractmanagertypes.AttributeKeySudoFailureID, failureID), + } + result, err := tx.QueryTxsByEvents(clientCtx, searchEvents, 1, 1, "") // only a single tx for a pair address+failure_id is expected + if err != nil { + return err + } + + for _, tx := range result.Txs { + for _, event := range tx.Events { + if event.Type == wasmtypes.EventTypeSudo { + for _, attr := range event.Attributes { + if attr.Key == contractmanagertypes.AttributeKeySudoError { + return clientCtx.PrintString(attr.Value) + } + } + } + } + } + return fmt.Errorf("detailed failure error message not found in node events") + }, + } + + flags.AddQueryFlagsToCmd(cmd) + + return cmd +} diff --git a/x/contractmanager/genesis.go b/x/contractmanager/genesis.go index fd5751c6b..785cadda6 100644 --- a/x/contractmanager/genesis.go +++ b/x/contractmanager/genesis.go @@ -11,7 +11,7 @@ import ( func InitGenesis(ctx sdk.Context, k keeper.Keeper, genState types.GenesisState) { // Set all the failure for _, elem := range genState.FailuresList { - k.AddContractFailure(ctx, elem.Address, elem.SudoPayload) + k.AddContractFailure(ctx, elem.Address, elem.SudoPayload, elem.Error) } // this line is used by starport scaffolding # genesis/module/init err := k.SetParams(ctx, genState.Params) diff --git a/x/contractmanager/ibc_middleware.go b/x/contractmanager/ibc_middleware.go index 1b3370f86..5ea900776 100644 --- a/x/contractmanager/ibc_middleware.go +++ b/x/contractmanager/ibc_middleware.go @@ -3,8 +3,10 @@ package contractmanager import ( "fmt" - "cosmossdk.io/errors" + errorsmod "cosmossdk.io/errors" + wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" + wasmvmtypes "github.com/CosmWasm/wasmvm/types" "github.com/cometbft/cometbft/libs/log" sdk "github.com/cosmos/cosmos-sdk/types" contractmanagertypes "github.com/neutron-org/neutron/x/contractmanager/types" @@ -34,9 +36,16 @@ func (k SudoLimitWrapper) Sudo(ctx sdk.Context, contractAddress sdk.AccAddress, // maybe later we'll retrieve actual errors from events resp, err = k.WasmKeeper.Sudo(cacheCtx, contractAddress, msg) }() - if err != nil { - // the contract either returned an error or panicked with `out of gas` - k.contractManager.AddContractFailure(ctx, contractAddress.String(), msg) + if err != nil { // the contract either returned an error or panicked with `out of gas` + failure := k.contractManager.AddContractFailure(ctx, contractAddress.String(), msg, redactError(err).Error()) + ctx.EventManager().EmitEvents(sdk.Events{ + sdk.NewEvent( + wasmtypes.EventTypeSudo, + sdk.NewAttribute(wasmtypes.AttributeKeyContractAddr, contractAddress.String()), + sdk.NewAttribute(contractmanagertypes.AttributeKeySudoFailureID, fmt.Sprintf("%d", failure.Id)), + sdk.NewAttribute(contractmanagertypes.AttributeKeySudoError, err.Error()), + ), + }) } else { writeFn() } @@ -60,7 +69,7 @@ func outOfGasRecovery( if !ok || !gasMeter.IsOutOfGas() { panic(r) } - *err = errors.Wrapf(errors.ErrPanic, "%v", r) + *err = errorsmod.Wrapf(errorsmod.ErrPanic, "%v", r) } } @@ -71,3 +80,23 @@ func createCachedContext(ctx sdk.Context, gasLimit uint64) (sdk.Context, func()) cacheCtx = cacheCtx.WithGasMeter(gasMeter) return cacheCtx, writeFn } + +// redactError removes non-determenistic details from the error returning just codespace and core +// of the error. Returns full error for system errors. +// +// Copy+paste from https://github.com/neutron-org/wasmd/blob/5b59886e41ed55a7a4a9ae196e34b0852285503d/x/wasm/keeper/msg_dispatcher.go#L175-L190 +func redactError(err error) error { + // Do not redact system errors + // SystemErrors must be created in x/wasm and we can ensure determinism + if wasmvmtypes.ToSystemError(err) != nil { + return err + } + + // FIXME: do we want to hardcode some constant string mappings here as well? + // Or better document them? (SDK error string may change on a patch release to fix wording) + // sdk/11 is out of gas + // sdk/5 is insufficient funds (on bank send) + // (we can theoretically redact less in the future, but this is a first step to safety) + codespace, code, _ := errorsmod.ABCIInfo(err, false) + return fmt.Errorf("codespace: %s, code: %d", codespace, code) +} diff --git a/x/contractmanager/keeper/failure.go b/x/contractmanager/keeper/failure.go index 02e653655..6adc60fd5 100644 --- a/x/contractmanager/keeper/failure.go +++ b/x/contractmanager/keeper/failure.go @@ -1,7 +1,7 @@ package keeper import ( - "cosmossdk.io/errors" + errorsmod "cosmossdk.io/errors" "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" @@ -9,10 +9,11 @@ import ( ) // AddContractFailure adds a specific failure to the store using address as the key -func (k Keeper) AddContractFailure(ctx sdk.Context, address string, sudoPayload []byte) { +func (k Keeper) AddContractFailure(ctx sdk.Context, address string, sudoPayload []byte, errMsg string) types.Failure { failure := types.Failure{ Address: address, SudoPayload: sudoPayload, + Error: errMsg, } nextFailureID := k.GetNextFailureIDKey(ctx, failure.GetAddress()) failure.Id = nextFailureID @@ -20,6 +21,7 @@ func (k Keeper) AddContractFailure(ctx sdk.Context, address string, sudoPayload store := ctx.KVStore(k.storeKey) bz := k.cdc.MustMarshal(&failure) store.Set(types.GetFailureKey(failure.GetAddress(), nextFailureID), bz) + return failure } func (k Keeper) GetNextFailureIDKey(ctx sdk.Context, address string) uint64 { @@ -58,7 +60,7 @@ func (k Keeper) GetFailure(ctx sdk.Context, contractAddr sdk.AccAddress, id uint bz := store.Get(key) if bz == nil { - return nil, errors.Wrapf(sdkerrors.ErrKeyNotFound, "no failure found for contractAddress = %s and failureId = %d", contractAddr.String(), id) + return nil, errorsmod.Wrapf(sdkerrors.ErrKeyNotFound, "no failure found for contractAddress = %s and failureId = %d", contractAddr.String(), id) } var res types.Failure k.cdc.MustUnmarshal(bz, &res) @@ -69,11 +71,11 @@ func (k Keeper) GetFailure(ctx sdk.Context, contractAddr sdk.AccAddress, id uint // ResubmitFailure tries to call sudo handler for contract with same parameters as initially. func (k Keeper) ResubmitFailure(ctx sdk.Context, contractAddr sdk.AccAddress, failure *types.Failure) error { if failure.SudoPayload == nil { - return errors.Wrapf(types.IncorrectFailureToResubmit, "cannot resubmit failure without sudo payload; failureId = %d", failure.Id) + return errorsmod.Wrapf(types.IncorrectFailureToResubmit, "cannot resubmit failure without sudo payload; failureId = %d", failure.Id) } if _, err := k.wasmKeeper.Sudo(ctx, contractAddr, failure.SudoPayload); err != nil { - return errors.Wrapf(types.FailedToResubmitFailure, "cannot resubmit failure; failureId = %d; err = %s", failure.Id, err) + return errorsmod.Wrapf(types.FailedToResubmitFailure, "cannot resubmit failure; failureId = %d; err = %s", failure.Id, err) } // Cleanup failure since we resubmitted it successfully diff --git a/x/contractmanager/keeper/grpc_query_failure.go b/x/contractmanager/keeper/grpc_query_failure.go index 87df124fb..188829a71 100644 --- a/x/contractmanager/keeper/grpc_query_failure.go +++ b/x/contractmanager/keeper/grpc_query_failure.go @@ -6,10 +6,9 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" + "github.com/neutron-org/neutron/x/contractmanager/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - - "github.com/neutron-org/neutron/x/contractmanager/types" ) const FailuresQueryMaxLimit uint64 = query.DefaultLimit @@ -58,3 +57,21 @@ func (k Keeper) AddressFailures(c context.Context, req *types.QueryFailuresReque return &types.QueryFailuresResponse{Failures: failures, Pagination: pageRes}, nil } + +func (k Keeper) AddressFailure(c context.Context, req *types.QueryFailuresRequest) (*types.QueryFailuresResponse, error) { + if req == nil { + return nil, status.Error(codes.InvalidArgument, "request field must not be empty") + } + + addr, err := sdk.AccAddressFromBech32(req.Address) + if err != nil { + return nil, status.Errorf(codes.InvalidArgument, "invalid address: %v", err) + } + + resp, err := k.GetFailure(sdk.UnwrapSDKContext(c), addr, req.GetFailureId()) + if err != nil { + return nil, status.Error(codes.InvalidArgument, err.Error()) + } + + return &types.QueryFailuresResponse{Failures: []types.Failure{*resp}}, nil +} diff --git a/x/contractmanager/types/events.go b/x/contractmanager/types/events.go new file mode 100644 index 000000000..36ccef858 --- /dev/null +++ b/x/contractmanager/types/events.go @@ -0,0 +1,10 @@ +package types + +// Contractmanager events +const ( + // AttributeKeySudoError indicates an attribute containing detailed Sudo call error. + AttributeKeySudoError = "error" + // AttributeKeySudoFailureID indicates attribute containing ID of the failure related to an + // error Sudo call. + AttributeKeySudoFailureID = "failure_id" +) diff --git a/x/contractmanager/types/expected_keepers.go b/x/contractmanager/types/expected_keepers.go index f30e346b8..34931862c 100644 --- a/x/contractmanager/types/expected_keepers.go +++ b/x/contractmanager/types/expected_keepers.go @@ -13,6 +13,6 @@ type WasmKeeper interface { } type ContractManagerKeeper interface { - AddContractFailure(ctx sdk.Context, address string, sudoPayload []byte) + AddContractFailure(ctx sdk.Context, address string, sudoPayload []byte, errMsg string) Failure GetParams(ctx sdk.Context) (params Params) } diff --git a/x/contractmanager/types/query.pb.go b/x/contractmanager/types/query.pb.go index a4eea203d..b4d8f4adc 100644 --- a/x/contractmanager/types/query.pb.go +++ b/x/contractmanager/types/query.pb.go @@ -113,9 +113,13 @@ func (m *QueryParamsResponse) GetParams() Params { return Params{} } +// QueryFailuresRequest is request type for the Query/Failures RPC method. type QueryFailuresRequest struct { - Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` - Pagination *query.PageRequest `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` + // address of the contract which Sudo call failed. + Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` + // ID of the failure for the given contract. + FailureId uint64 `protobuf:"varint,2,opt,name=failure_id,json=failureId,proto3" json:"failure_id,omitempty"` + Pagination *query.PageRequest `protobuf:"bytes,3,opt,name=pagination,proto3" json:"pagination,omitempty"` } func (m *QueryFailuresRequest) Reset() { *m = QueryFailuresRequest{} } @@ -158,6 +162,13 @@ func (m *QueryFailuresRequest) GetAddress() string { return "" } +func (m *QueryFailuresRequest) GetFailureId() uint64 { + if m != nil { + return m.FailureId + } + return 0 +} + func (m *QueryFailuresRequest) GetPagination() *query.PageRequest { if m != nil { return m.Pagination @@ -165,6 +176,7 @@ func (m *QueryFailuresRequest) GetPagination() *query.PageRequest { return nil } +// QueryFailuresResponse is response type for the Query/Failures RPC method. type QueryFailuresResponse struct { Failures []Failure `protobuf:"bytes,1,rep,name=failures,proto3" json:"failures"` Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` @@ -229,37 +241,40 @@ func init() { } var fileDescriptor_f9524a427f219917 = []byte{ - // 475 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x93, 0x31, 0x6f, 0xd4, 0x30, - 0x1c, 0xc5, 0xe3, 0x16, 0x8e, 0xe2, 0x0e, 0x48, 0xe6, 0x10, 0xa7, 0x08, 0xe5, 0xda, 0x14, 0x68, - 0xa1, 0x9c, 0xad, 0x5e, 0x25, 0x36, 0x06, 0x6e, 0x28, 0xeb, 0x11, 0x31, 0xb1, 0x39, 0xa9, 0x31, - 0x91, 0x1a, 0x3b, 0xb5, 0x1d, 0xd4, 0x0a, 0xb1, 0x30, 0x33, 0x20, 0xc1, 0x47, 0x80, 0xef, 0xd2, - 0xb1, 0x12, 0x42, 0x62, 0x42, 0xe8, 0x8e, 0x0f, 0x82, 0x62, 0x3b, 0xa5, 0x5c, 0x49, 0xaf, 0x53, - 0xb7, 0xbb, 0xe4, 0xfd, 0xdf, 0xfb, 0xf9, 0xfd, 0x1d, 0xb8, 0x26, 0x58, 0x65, 0x94, 0x14, 0x24, - 0x93, 0xc2, 0x28, 0x9a, 0x99, 0x82, 0x0a, 0xca, 0x99, 0x22, 0xfb, 0x15, 0x53, 0x87, 0xb8, 0x54, - 0xd2, 0x48, 0x74, 0xdb, 0x8b, 0xf0, 0x8c, 0x28, 0xec, 0x72, 0xc9, 0xa5, 0xd5, 0x90, 0xfa, 0x97, - 0x93, 0x87, 0x77, 0xb8, 0x94, 0x7c, 0x8f, 0x11, 0x5a, 0xe6, 0x84, 0x0a, 0x21, 0x0d, 0x35, 0xb9, - 0x14, 0xda, 0xbf, 0x7d, 0x98, 0x49, 0x5d, 0x48, 0x4d, 0x52, 0xaa, 0x99, 0x4b, 0x21, 0x6f, 0xb6, - 0x52, 0x66, 0xe8, 0x16, 0x29, 0x29, 0xcf, 0x85, 0x15, 0x7b, 0xed, 0xdd, 0x36, 0xba, 0x92, 0x2a, - 0x5a, 0x34, 0x8e, 0xf7, 0xda, 0x54, 0xaf, 0x68, 0xbe, 0x57, 0x29, 0xe6, 0x64, 0x71, 0x17, 0xa2, - 0xe7, 0x75, 0xdc, 0xd8, 0xce, 0x26, 0x6c, 0xbf, 0x62, 0xda, 0xc4, 0x2f, 0xe0, 0xcd, 0x7f, 0x9e, - 0xea, 0x52, 0x0a, 0xcd, 0xd0, 0x13, 0xd8, 0x71, 0x19, 0x3d, 0xb0, 0x02, 0x36, 0x96, 0x87, 0x7d, - 0xdc, 0xd2, 0x01, 0x76, 0x83, 0xa3, 0x2b, 0x47, 0x3f, 0xfb, 0x41, 0xe2, 0x87, 0xe2, 0x03, 0xd8, - 0xb5, 0xae, 0x3b, 0x8e, 0xa0, 0x49, 0x43, 0x3d, 0x78, 0x8d, 0xee, 0xee, 0x2a, 0xa6, 0x9d, 0xef, - 0xf5, 0xa4, 0xf9, 0x8b, 0x76, 0x20, 0xfc, 0x7b, 0xfc, 0xde, 0x82, 0x0d, 0xbd, 0x8f, 0x5d, 0x57, - 0xb8, 0xee, 0x0a, 0xbb, 0x8d, 0xf8, 0xae, 0xf0, 0x98, 0x72, 0xe6, 0x5d, 0x93, 0x53, 0x93, 0xf1, - 0x17, 0x00, 0x6f, 0xcd, 0x44, 0xfb, 0x23, 0x8d, 0xe0, 0x92, 0x2f, 0xa4, 0x0e, 0x5f, 0xdc, 0x58, - 0x1e, 0xae, 0xb4, 0x1e, 0xca, 0x0f, 0xfb, 0x53, 0x9d, 0xcc, 0xa1, 0x67, 0xff, 0xa1, 0x5c, 0x9f, - 0x4b, 0xe9, 0x00, 0x4e, 0x63, 0x0e, 0xbf, 0x2f, 0xc2, 0xab, 0x16, 0x13, 0x7d, 0x00, 0xb0, 0xe3, - 0x3a, 0x44, 0x9b, 0xad, 0x3c, 0x67, 0x17, 0x17, 0x3e, 0xba, 0x98, 0xd8, 0x65, 0xc7, 0xeb, 0xef, - 0xbf, 0xfd, 0xfe, 0xb4, 0xb0, 0x8a, 0xfa, 0xe4, 0xfc, 0x2b, 0x85, 0xbe, 0x02, 0x78, 0xe3, 0xa9, - 0xdb, 0x49, 0xd3, 0x20, 0x1a, 0x9c, 0x1f, 0x35, 0xb3, 0xe4, 0x10, 0x5f, 0x54, 0xee, 0xd9, 0xb6, - 0x2d, 0xdb, 0x00, 0x6d, 0x92, 0x39, 0x17, 0x59, 0x93, 0xb7, 0xfe, 0xba, 0xbc, 0x43, 0x9f, 0x01, - 0x5c, 0xba, 0x2c, 0xc0, 0x07, 0x16, 0x70, 0x0d, 0xad, 0xce, 0x05, 0x1c, 0x8d, 0x8f, 0x26, 0x11, - 0x38, 0x9e, 0x44, 0xe0, 0xd7, 0x24, 0x02, 0x1f, 0xa7, 0x51, 0x70, 0x3c, 0x8d, 0x82, 0x1f, 0xd3, - 0x28, 0x78, 0xf9, 0x98, 0xe7, 0xe6, 0x75, 0x95, 0xe2, 0x4c, 0x16, 0x8d, 0xcd, 0x40, 0x2a, 0x7e, - 0x62, 0x79, 0x70, 0xc6, 0xd4, 0x1c, 0x96, 0x4c, 0xa7, 0x1d, 0xfb, 0xf5, 0x6e, 0xff, 0x09, 0x00, - 0x00, 0xff, 0xff, 0x05, 0x7b, 0x9c, 0xb2, 0xaa, 0x04, 0x00, 0x00, + // 527 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x94, 0xc1, 0x6a, 0x13, 0x41, + 0x18, 0xc7, 0x33, 0x69, 0x1b, 0xdb, 0x29, 0x28, 0x8c, 0x11, 0x43, 0xd0, 0x4d, 0xba, 0x55, 0x1b, + 0xad, 0x99, 0xa1, 0x29, 0x88, 0x08, 0x82, 0xe6, 0x50, 0xf1, 0x16, 0x17, 0x4f, 0x5e, 0x64, 0x92, + 0x8c, 0xe3, 0x42, 0x33, 0xb3, 0x9d, 0x99, 0x15, 0x4b, 0xe9, 0xc5, 0x9b, 0xe0, 0x41, 0x50, 0xf0, + 0x05, 0xf4, 0x01, 0x7c, 0x8b, 0x1e, 0x0b, 0x5e, 0x3c, 0x89, 0x24, 0x3e, 0x88, 0x64, 0x66, 0xd2, + 0x36, 0x29, 0xdb, 0xc4, 0x83, 0xbd, 0xed, 0xce, 0xfe, 0xbf, 0xef, 0xff, 0x9b, 0xff, 0xf7, 0xb1, + 0x70, 0x55, 0xb0, 0xd4, 0x28, 0x29, 0x48, 0x47, 0x0a, 0xa3, 0x68, 0xc7, 0xf4, 0xa8, 0xa0, 0x9c, + 0x29, 0xb2, 0x93, 0x32, 0xb5, 0x8b, 0x13, 0x25, 0x8d, 0x44, 0x57, 0xbd, 0x08, 0x4f, 0x88, 0xca, + 0x45, 0x2e, 0xb9, 0xb4, 0x1a, 0x32, 0x7c, 0x72, 0xf2, 0xf2, 0x35, 0x2e, 0x25, 0xdf, 0x66, 0x84, + 0x26, 0x31, 0xa1, 0x42, 0x48, 0x43, 0x4d, 0x2c, 0x85, 0xf6, 0x5f, 0xef, 0x74, 0xa4, 0xee, 0x49, + 0x4d, 0xda, 0x54, 0x33, 0xe7, 0x42, 0xde, 0x6c, 0xb4, 0x99, 0xa1, 0x1b, 0x24, 0xa1, 0x3c, 0x16, + 0x56, 0xec, 0xb5, 0x37, 0xb2, 0xe8, 0x12, 0xaa, 0x68, 0x6f, 0xd4, 0xf1, 0x66, 0x96, 0xea, 0x15, + 0x8d, 0xb7, 0x53, 0xc5, 0x9c, 0x2c, 0x2c, 0x42, 0xf4, 0x6c, 0x68, 0xd7, 0xb2, 0xb5, 0x11, 0xdb, + 0x49, 0x99, 0x36, 0xe1, 0x73, 0x78, 0x79, 0xec, 0x54, 0x27, 0x52, 0x68, 0x86, 0x1e, 0xc2, 0x82, + 0xf3, 0x28, 0x81, 0x2a, 0xa8, 0x2d, 0x37, 0x2a, 0x38, 0x23, 0x03, 0xec, 0x0a, 0x9b, 0xf3, 0x07, + 0xbf, 0x2a, 0xb9, 0xc8, 0x17, 0x85, 0x5f, 0x00, 0x2c, 0xda, 0xb6, 0x5b, 0x0e, 0x61, 0x64, 0x87, + 0x4a, 0xf0, 0x02, 0xed, 0x76, 0x15, 0xd3, 0xae, 0xf1, 0x52, 0x34, 0x7a, 0x45, 0xd7, 0x21, 0xf4, + 0xbc, 0x2f, 0xe3, 0x6e, 0x29, 0x5f, 0x05, 0xb5, 0xf9, 0x68, 0xc9, 0x9f, 0x3c, 0xed, 0xa2, 0x2d, + 0x08, 0x8f, 0xe3, 0x29, 0xcd, 0x59, 0xa8, 0x5b, 0xd8, 0x65, 0x89, 0x87, 0x59, 0x62, 0x37, 0x31, + 0x9f, 0x25, 0x6e, 0x51, 0xce, 0xbc, 0x69, 0x74, 0xa2, 0x32, 0xfc, 0x0a, 0xe0, 0x95, 0x09, 0x32, + 0x7f, 0xe5, 0x26, 0x5c, 0xf4, 0x76, 0x43, 0xb6, 0xb9, 0xda, 0x72, 0xa3, 0x9a, 0x79, 0x69, 0x5f, + 0xec, 0x6f, 0x7d, 0x54, 0x87, 0x9e, 0x8c, 0x51, 0xe6, 0x2d, 0xe5, 0xda, 0x54, 0x4a, 0x07, 0x70, + 0x12, 0xb3, 0xf1, 0x7e, 0x01, 0x2e, 0x58, 0x4c, 0xf4, 0x01, 0xc0, 0x82, 0xcb, 0x18, 0xad, 0x67, + 0xf2, 0x9c, 0x1e, 0x6c, 0xf9, 0xee, 0x6c, 0x62, 0xe7, 0x1d, 0xae, 0xbd, 0xfb, 0xf1, 0xe7, 0x53, + 0x7e, 0x05, 0x55, 0xc8, 0xd9, 0x2b, 0x87, 0xbe, 0x03, 0x78, 0xf1, 0xb1, 0x1b, 0x99, 0x0f, 0x01, + 0xd5, 0xcf, 0x76, 0x9a, 0x58, 0x81, 0x32, 0x9e, 0x55, 0xee, 0xd1, 0x1e, 0x59, 0xb4, 0x07, 0xe8, + 0x3e, 0x99, 0xb2, 0xe7, 0x9a, 0xec, 0xf9, 0x65, 0xda, 0x27, 0x7b, 0xc7, 0xbb, 0xb4, 0x8f, 0xbe, + 0x01, 0x78, 0x69, 0x9c, 0x59, 0xff, 0x6f, 0xe8, 0x4d, 0x0b, 0x5d, 0x47, 0xeb, 0xff, 0x00, 0x8d, + 0x3e, 0x03, 0xb8, 0x78, 0x5e, 0x80, 0xb7, 0x2d, 0xe0, 0x2a, 0x5a, 0x99, 0x0a, 0xd8, 0x6c, 0x1d, + 0xf4, 0x03, 0x70, 0xd8, 0x0f, 0xc0, 0xef, 0x7e, 0x00, 0x3e, 0x0e, 0x82, 0xdc, 0xe1, 0x20, 0xc8, + 0xfd, 0x1c, 0x04, 0xb9, 0x17, 0xf7, 0x78, 0x6c, 0x5e, 0xa7, 0x6d, 0xdc, 0x91, 0xbd, 0x51, 0x9b, + 0xba, 0x54, 0xfc, 0xa8, 0xe5, 0xdb, 0x53, 0x4d, 0xcd, 0x6e, 0xc2, 0x74, 0xbb, 0x60, 0xff, 0x48, + 0x9b, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0xa3, 0xb5, 0xbb, 0x34, 0x7e, 0x05, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -276,9 +291,11 @@ const _ = grpc.SupportPackageIsVersion4 type QueryClient interface { // Parameters queries the parameters of the module. Params(ctx context.Context, in *QueryParamsRequest, opts ...grpc.CallOption) (*QueryParamsResponse, error) - // Queries a Failure by address. + // Queries a Failure by contract address and failure ID. + AddressFailure(ctx context.Context, in *QueryFailuresRequest, opts ...grpc.CallOption) (*QueryFailuresResponse, error) + // Queries Failures by contract address. AddressFailures(ctx context.Context, in *QueryFailuresRequest, opts ...grpc.CallOption) (*QueryFailuresResponse, error) - // Queries a list of Failure items. + // Queries a list of Failures occurred on the network. Failures(ctx context.Context, in *QueryFailuresRequest, opts ...grpc.CallOption) (*QueryFailuresResponse, error) } @@ -299,6 +316,15 @@ func (c *queryClient) Params(ctx context.Context, in *QueryParamsRequest, opts . return out, nil } +func (c *queryClient) AddressFailure(ctx context.Context, in *QueryFailuresRequest, opts ...grpc.CallOption) (*QueryFailuresResponse, error) { + out := new(QueryFailuresResponse) + err := c.cc.Invoke(ctx, "/neutron.contractmanager.Query/AddressFailure", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + func (c *queryClient) AddressFailures(ctx context.Context, in *QueryFailuresRequest, opts ...grpc.CallOption) (*QueryFailuresResponse, error) { out := new(QueryFailuresResponse) err := c.cc.Invoke(ctx, "/neutron.contractmanager.Query/AddressFailures", in, out, opts...) @@ -321,9 +347,11 @@ func (c *queryClient) Failures(ctx context.Context, in *QueryFailuresRequest, op type QueryServer interface { // Parameters queries the parameters of the module. Params(context.Context, *QueryParamsRequest) (*QueryParamsResponse, error) - // Queries a Failure by address. + // Queries a Failure by contract address and failure ID. + AddressFailure(context.Context, *QueryFailuresRequest) (*QueryFailuresResponse, error) + // Queries Failures by contract address. AddressFailures(context.Context, *QueryFailuresRequest) (*QueryFailuresResponse, error) - // Queries a list of Failure items. + // Queries a list of Failures occurred on the network. Failures(context.Context, *QueryFailuresRequest) (*QueryFailuresResponse, error) } @@ -334,6 +362,9 @@ type UnimplementedQueryServer struct { func (*UnimplementedQueryServer) Params(ctx context.Context, req *QueryParamsRequest) (*QueryParamsResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Params not implemented") } +func (*UnimplementedQueryServer) AddressFailure(ctx context.Context, req *QueryFailuresRequest) (*QueryFailuresResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method AddressFailure not implemented") +} func (*UnimplementedQueryServer) AddressFailures(ctx context.Context, req *QueryFailuresRequest) (*QueryFailuresResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method AddressFailures not implemented") } @@ -363,6 +394,24 @@ func _Query_Params_Handler(srv interface{}, ctx context.Context, dec func(interf return interceptor(ctx, in, info, handler) } +func _Query_AddressFailure_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QueryFailuresRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(QueryServer).AddressFailure(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/neutron.contractmanager.Query/AddressFailure", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(QueryServer).AddressFailure(ctx, req.(*QueryFailuresRequest)) + } + return interceptor(ctx, in, info, handler) +} + func _Query_AddressFailures_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(QueryFailuresRequest) if err := dec(in); err != nil { @@ -407,6 +456,10 @@ var _Query_serviceDesc = grpc.ServiceDesc{ MethodName: "Params", Handler: _Query_Params_Handler, }, + { + MethodName: "AddressFailure", + Handler: _Query_AddressFailure_Handler, + }, { MethodName: "AddressFailures", Handler: _Query_AddressFailures_Handler, @@ -506,7 +559,12 @@ func (m *QueryFailuresRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintQuery(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x12 + dAtA[i] = 0x1a + } + if m.FailureId != 0 { + i = encodeVarintQuery(dAtA, i, uint64(m.FailureId)) + i-- + dAtA[i] = 0x10 } if len(m.Address) > 0 { i -= len(m.Address) @@ -608,6 +666,9 @@ func (m *QueryFailuresRequest) Size() (n int) { if l > 0 { n += 1 + l + sovQuery(uint64(l)) } + if m.FailureId != 0 { + n += 1 + sovQuery(uint64(m.FailureId)) + } if m.Pagination != nil { l = m.Pagination.Size() n += 1 + l + sovQuery(uint64(l)) @@ -835,6 +896,25 @@ func (m *QueryFailuresRequest) Unmarshal(dAtA []byte) error { m.Address = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field FailureId", wireType) + } + m.FailureId = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.FailureId |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 3: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) } diff --git a/x/contractmanager/types/query.pb.gw.go b/x/contractmanager/types/query.pb.gw.go index 53090c4e2..2c201192b 100644 --- a/x/contractmanager/types/query.pb.gw.go +++ b/x/contractmanager/types/query.pb.gw.go @@ -51,6 +51,100 @@ func local_request_Query_Params_0(ctx context.Context, marshaler runtime.Marshal } +var ( + filter_Query_AddressFailure_0 = &utilities.DoubleArray{Encoding: map[string]int{"address": 0, "failure_id": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}} +) + +func request_Query_AddressFailure_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryFailuresRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["address"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "address") + } + + protoReq.Address, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "address", err) + } + + val, ok = pathParams["failure_id"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "failure_id") + } + + protoReq.FailureId, err = runtime.Uint64(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "failure_id", err) + } + + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_AddressFailure_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := client.AddressFailure(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Query_AddressFailure_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryFailuresRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["address"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "address") + } + + protoReq.Address, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "address", err) + } + + val, ok = pathParams["failure_id"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "failure_id") + } + + protoReq.FailureId, err = runtime.Uint64(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "failure_id", err) + } + + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_AddressFailure_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := server.AddressFailure(ctx, &protoReq) + return msg, metadata, err + +} + var ( filter_Query_AddressFailures_0 = &utilities.DoubleArray{Encoding: map[string]int{"address": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}} ) @@ -188,6 +282,29 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv }) + mux.Handle("GET", pattern_Query_AddressFailure_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_AddressFailure_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_AddressFailure_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + mux.Handle("GET", pattern_Query_AddressFailures_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() @@ -295,6 +412,26 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie }) + mux.Handle("GET", pattern_Query_AddressFailure_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_AddressFailure_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_AddressFailure_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + mux.Handle("GET", pattern_Query_AddressFailures_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() @@ -341,6 +478,8 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie var ( pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"neutron", "contractmanager", "params"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_AddressFailure_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4}, []string{"neutron", "contractmanager", "failures", "address", "failure_id"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_AddressFailures_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"neutron", "contractmanager", "failures", "address"}, "", runtime.AssumeColonVerbOpt(false))) pattern_Query_Failures_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"neutron", "contractmanager", "failures"}, "", runtime.AssumeColonVerbOpt(false))) @@ -349,6 +488,8 @@ var ( var ( forward_Query_Params_0 = runtime.ForwardResponseMessage + forward_Query_AddressFailure_0 = runtime.ForwardResponseMessage + forward_Query_AddressFailures_0 = runtime.ForwardResponseMessage forward_Query_Failures_0 = runtime.ForwardResponseMessage From 7f957b0fbc0622b2aa5a88c2c27cbdb8365e009e Mon Sep 17 00:00:00 2001 From: nhpd Date: Wed, 8 Nov 2023 16:02:40 +0400 Subject: [PATCH 220/307] fix: add more multihop validation --- proto/neutron/dex/query.proto | 2 +- proto/neutron/dex/tx.proto | 2 +- x/dex/types/errors.go | 15 +++++ x/dex/types/message_multi_hop_swap.go | 22 ++++++- x/dex/types/message_multi_hop_swap_test.go | 68 +++++++++++++++++++--- 5 files changed, 96 insertions(+), 13 deletions(-) diff --git a/proto/neutron/dex/query.proto b/proto/neutron/dex/query.proto index 9e29261b2..5e1532e2c 100644 --- a/proto/neutron/dex/query.proto +++ b/proto/neutron/dex/query.proto @@ -254,7 +254,7 @@ message QueryEstimateMultiHopSwapRequest { string exitLimitPrice = 5 [(gogoproto.moretags) = "yaml:\"exitLimitPrice\"", (gogoproto.customtype) = "github.com/neutron-org/neutron/utils/math.PrecDec", (gogoproto.nullable) = false, (gogoproto.jsontag) = "exitLimitPrice"]; // If pickBestRoute == true then all routes are run and the route with the best price is chosen - // otherwise, the first succesful route is used. + // otherwise, the first successful route is used. bool pickBestRoute = 6; } diff --git a/proto/neutron/dex/tx.proto b/proto/neutron/dex/tx.proto index 37fcd83ec..e2aa38103 100644 --- a/proto/neutron/dex/tx.proto +++ b/proto/neutron/dex/tx.proto @@ -176,7 +176,7 @@ message MsgMultiHopSwap { (gogoproto.jsontag) = "exitLimitPrice" ]; // If pickBestRoute == true then all routes are run and the route with the best price is chosen - // otherwise, the first succesful route is used. + // otherwise, the first successful route is used. bool pickBestRoute = 6; } diff --git a/x/dex/types/errors.go b/x/dex/types/errors.go index 7f4eaa964..c301f2aea 100644 --- a/x/dex/types/errors.go +++ b/x/dex/types/errors.go @@ -164,4 +164,19 @@ var ( 1149, "Invalid Address", ) + ErrRouteWithoutExitToken = sdkerrors.Register( + ModuleName, + 1150, + "Each route should specify at least two hops - input and output tokens", + ) + ErrCycleInHops = sdkerrors.Register( + ModuleName, + 1151, + "Hops cannot have cycles", + ) + ErrZeroExitPrice = sdkerrors.Register( + ModuleName, + 1152, + "Cannot have negative or zero exit price", + ) ) diff --git a/x/dex/types/message_multi_hop_swap.go b/x/dex/types/message_multi_hop_swap.go index 57375f20f..baf3d92c2 100644 --- a/x/dex/types/message_multi_hop_swap.go +++ b/x/dex/types/message_multi_hop_swap.go @@ -13,7 +13,7 @@ var _ sdk.Msg = &MsgMultiHopSwap{} func NewMsgMultiHopSwap( creator string, - receiever string, + receiver string, routesArr [][]string, amountIn math.Int, exitLimitPrice math_utils.PrecDec, @@ -26,7 +26,7 @@ func NewMsgMultiHopSwap( return &MsgMultiHopSwap{ Creator: creator, - Receiver: receiever, + Receiver: receiver, Routes: routes, AmountIn: amountIn, ExitLimitPrice: exitLimitPrice, @@ -70,6 +70,20 @@ func (msg *MsgMultiHopSwap) ValidateBasic() error { return ErrMissingMultihopRoute } + for _, route := range msg.Routes { + if len(route.Hops) < 2 { + return ErrRouteWithoutExitToken + } + + existingHops := make(map[string]bool, len(route.Hops)) + for _, hop := range route.Hops { + if _, ok := existingHops[hop]; ok { + return ErrCycleInHops + } + existingHops[hop] = true + } + } + expectedExitToken := msg.Routes[0].Hops[len(msg.Routes[0].Hops)-1] for _, route := range msg.Routes[1:] { hops := route.Hops @@ -82,5 +96,9 @@ func (msg *MsgMultiHopSwap) ValidateBasic() error { return ErrZeroSwap } + if !msg.ExitLimitPrice.IsPositive() { + return ErrZeroExitPrice + } + return nil } diff --git a/x/dex/types/message_multi_hop_swap_test.go b/x/dex/types/message_multi_hop_swap_test.go index 87ee40107..3a37389b8 100644 --- a/x/dex/types/message_multi_hop_swap_test.go +++ b/x/dex/types/message_multi_hop_swap_test.go @@ -1,6 +1,7 @@ package types_test import ( + math_utils "github.com/neutron-org/neutron/utils/math" "testing" "cosmossdk.io/math" @@ -20,6 +21,10 @@ func TestMsgMultiHopSwap_ValidateBasic(t *testing.T) { msg: MsgMultiHopSwap{ Creator: "invalid_address", Receiver: sample.AccAddress(), + Routes: []*MultiHopRoute{ + {Hops: []string{"A", "B", "C"}}, + }, + ExitLimitPrice: math_utils.MustNewPrecDecFromStr("0.9"), }, err: ErrInvalidAddress, }, @@ -28,14 +33,20 @@ func TestMsgMultiHopSwap_ValidateBasic(t *testing.T) { msg: MsgMultiHopSwap{ Creator: sample.AccAddress(), Receiver: "invalid_address", + Routes: []*MultiHopRoute{ + {Hops: []string{"A", "B", "C"}}, + }, + ExitLimitPrice: math_utils.MustNewPrecDecFromStr("0.9"), }, err: ErrInvalidAddress, }, { name: "missing route", msg: MsgMultiHopSwap{ - Creator: sample.AccAddress(), - Receiver: sample.AccAddress(), + Creator: sample.AccAddress(), + Receiver: sample.AccAddress(), + Routes: []*MultiHopRoute{}, + ExitLimitPrice: math_utils.MustNewPrecDecFromStr("0.9"), }, err: ErrMissingMultihopRoute, }, @@ -48,26 +59,65 @@ func TestMsgMultiHopSwap_ValidateBasic(t *testing.T) { {Hops: []string{"A", "B", "C"}}, {Hops: []string{"A", "B", "Z"}}, }, + ExitLimitPrice: math_utils.MustNewPrecDecFromStr("0.9"), }, err: ErrMultihopExitTokensMismatch, }, { name: "invalid amountIn", msg: MsgMultiHopSwap{ - Creator: sample.AccAddress(), - Receiver: sample.AccAddress(), - Routes: []*MultiHopRoute{{Hops: []string{"A", "B", "C"}}}, - AmountIn: math.NewInt(-1), + Creator: sample.AccAddress(), + Receiver: sample.AccAddress(), + Routes: []*MultiHopRoute{{Hops: []string{"A", "B", "C"}}}, + AmountIn: math.NewInt(-1), + ExitLimitPrice: math_utils.MustNewPrecDecFromStr("0.9"), }, err: ErrZeroSwap, }, { - name: "valid", + name: "cycles in hops", msg: MsgMultiHopSwap{ - Routes: []*MultiHopRoute{{Hops: []string{"A", "B", "C"}}}, Creator: sample.AccAddress(), Receiver: sample.AccAddress(), - AmountIn: math.OneInt(), + Routes: []*MultiHopRoute{ + {Hops: []string{"A", "B", "C"}}, // normal + {Hops: []string{"A", "B", "D", "E", "B", "C"}}, // has cycle + }, + AmountIn: math.OneInt(), + ExitLimitPrice: math_utils.MustNewPrecDecFromStr("0.9"), + }, + err: ErrCycleInHops, + }, + { + name: "zero exit limit price", + msg: MsgMultiHopSwap{ + Creator: sample.AccAddress(), + Receiver: sample.AccAddress(), + Routes: []*MultiHopRoute{{Hops: []string{"A", "B", "C"}}}, + AmountIn: math.OneInt(), + ExitLimitPrice: math_utils.MustNewPrecDecFromStr("0"), + }, + err: ErrZeroExitPrice, + }, + { + name: "negative exit limit price", + msg: MsgMultiHopSwap{ + Creator: sample.AccAddress(), + Receiver: sample.AccAddress(), + Routes: []*MultiHopRoute{{Hops: []string{"A", "B", "C"}}}, + AmountIn: math.OneInt(), + ExitLimitPrice: math_utils.MustNewPrecDecFromStr("-0.5"), + }, + err: ErrZeroExitPrice, + }, + { + name: "valid", + msg: MsgMultiHopSwap{ + Creator: sample.AccAddress(), + Receiver: sample.AccAddress(), + Routes: []*MultiHopRoute{{Hops: []string{"A", "B", "C"}}}, + AmountIn: math.OneInt(), + ExitLimitPrice: math_utils.MustNewPrecDecFromStr("0.9"), }, }, } From bab75054c2f6ee49a9245e0ac62db99fc585219d Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Wed, 8 Nov 2023 15:03:27 +0200 Subject: [PATCH 221/307] camelCase -> snake_case --- proto/neutron/dex/deposit_record.proto | 10 +- proto/neutron/dex/genesis.proto | 10 +- .../neutron/dex/limit_order_expiration.proto | 4 +- proto/neutron/dex/limit_order_tranche.proto | 18 +- .../dex/limit_order_tranche_user.proto | 14 +- proto/neutron/dex/pool.proto | 2 +- proto/neutron/dex/pool_metadata.proto | 4 +- proto/neutron/dex/pool_reserves.proto | 12 +- proto/neutron/dex/query.proto | 114 ++-- proto/neutron/dex/tick_liquidity.proto | 4 +- proto/neutron/dex/trade_pair_id.proto | 4 +- proto/neutron/dex/tx.proto | 54 +- .../cli/query_inactive_limit_order_tranche.go | 5 +- x/dex/client/cli/query_limit_order_tranche.go | 7 +- x/dex/client/cli/query_pool.go | 7 +- x/dex/client/cli/query_pool_reserves.go | 7 +- x/dex/client/cli/query_tick_liquidity.go | 5 +- x/dex/genesis_test.go | 15 +- x/dex/keeper/core.go | 9 +- x/dex/keeper/deposit_record.go | 3 +- x/dex/keeper/deposit_record_test.go | 5 +- ...grpc_query_inactive_limit_order_tranche.go | 7 +- ...query_inactive_limit_order_tranche_test.go | 10 +- .../keeper/grpc_query_limit_order_tranche.go | 9 +- .../grpc_query_limit_order_tranche_test.go | 8 +- x/dex/keeper/grpc_query_pool.go | 7 +- x/dex/keeper/grpc_query_pool_metadata_test.go | 4 +- x/dex/keeper/grpc_query_pool_reserves.go | 9 +- x/dex/keeper/grpc_query_pool_reserves_test.go | 8 +- x/dex/keeper/grpc_query_pool_test.go | 12 +- x/dex/keeper/grpc_query_tick_liquidity.go | 5 +- .../keeper/grpc_query_tick_liquidity_test.go | 2 +- x/dex/keeper/grpc_query_user_deposits.go | 7 +- x/dex/keeper/grpc_query_user_deposits_test.go | 19 +- .../integration_placelimitorder_test.go | 3 +- x/dex/keeper/limit_order_expiration_test.go | 3 +- x/dex/keeper/limit_order_tranche.go | 7 +- x/dex/keeper/limit_order_tranche_user.go | 3 +- x/dex/keeper/limit_order_tranche_user_test.go | 11 +- x/dex/keeper/liquidity_test.go | 9 +- x/dex/keeper/msg_server_test.go | 7 +- x/dex/keeper/pool.go | 11 +- x/dex/keeper/pool_metadata.go | 3 +- x/dex/keeper/pool_metadata_test.go | 11 +- x/dex/keeper/pool_test.go | 17 +- x/dex/types/deposit_record.pb.go | 77 +-- x/dex/types/events.go | 4 +- x/dex/types/genesis.go | 6 +- x/dex/types/genesis.pb.go | 63 +-- x/dex/types/genesis_test.go | 37 +- x/dex/types/limit_order_expiration.pb.go | 27 +- x/dex/types/limit_order_tranche.go | 3 +- x/dex/types/limit_order_tranche.pb.go | 112 ++-- x/dex/types/limit_order_tranche_key.go | 4 +- x/dex/types/limit_order_tranche_user.pb.go | 92 ++-- x/dex/types/pool.go | 7 +- x/dex/types/pool.pb.go | 24 +- x/dex/types/pool_metadata.go | 2 +- x/dex/types/pool_metadata.pb.go | 63 +-- x/dex/types/pool_reserves.pb.go | 92 ++-- x/dex/types/pool_reserves_key.go | 7 +- x/dex/types/query.pb.go | 511 +++++++++--------- x/dex/types/query.pb.gw.go | 308 +++++------ x/dex/types/tick_liquidity.pb.go | 28 +- x/dex/types/trade_pair_id.pb.go | 23 +- x/dex/types/tx.pb.go | 239 ++++---- 66 files changed, 1143 insertions(+), 1091 deletions(-) diff --git a/proto/neutron/dex/deposit_record.proto b/proto/neutron/dex/deposit_record.proto index 8504aa8b1..c76a32853 100644 --- a/proto/neutron/dex/deposit_record.proto +++ b/proto/neutron/dex/deposit_record.proto @@ -6,15 +6,15 @@ import "gogoproto/gogo.proto"; import "neutron/dex/pair_id.proto"; message DepositRecord { - PairID pairID = 1; - string sharesOwned = 2 [ + PairID pair_id = 1; + string shares_owned = 2 [ (gogoproto.moretags) = "yaml:\"totalShares\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false, (gogoproto.jsontag) = "totalShares" ]; - int64 centerTickIndex = 3; - int64 lowerTickIndex = 4; - int64 upperTickIndex = 5; + int64 center_tick_index = 3; + int64 lower_tick_index = 4; + int64 upper_tick_index = 5; uint64 fee = 6; } diff --git a/proto/neutron/dex/genesis.proto b/proto/neutron/dex/genesis.proto index 596dc1c4a..ae4e590c2 100644 --- a/proto/neutron/dex/genesis.proto +++ b/proto/neutron/dex/genesis.proto @@ -16,11 +16,11 @@ option go_package = "github.com/neutron-org/neutron/x/dex/types"; // GenesisState defines the dex module's genesis state. message GenesisState { Params params = 1 [(gogoproto.nullable) = false]; - repeated TickLiquidity tickLiquidityList = 2 [(gogoproto.nullable) = true ]; - repeated LimitOrderTranche inactiveLimitOrderTrancheList = 3 [(gogoproto.nullable) = true ]; - repeated LimitOrderTrancheUser limitOrderTrancheUserList = 4 [(gogoproto.nullable) = true ]; - repeated PoolMetadata poolMetadataList = 5 [(gogoproto.nullable) = false]; - uint64 poolCount = 6; + repeated TickLiquidity tick_liquidity_list = 2 [(gogoproto.nullable) = true ]; + repeated LimitOrderTranche inactive_limit_order_tranche_list = 3 [(gogoproto.nullable) = true ]; + repeated LimitOrderTrancheUser limit_order_tranche_user_list = 4 [(gogoproto.nullable) = true ]; + repeated PoolMetadata pool_metadata_list = 5 [(gogoproto.nullable) = false]; + uint64 pool_count = 6; // this line is used by starport scaffolding # genesis/proto/state } diff --git a/proto/neutron/dex/limit_order_expiration.proto b/proto/neutron/dex/limit_order_expiration.proto index 030965cfb..0057de0d8 100644 --- a/proto/neutron/dex/limit_order_expiration.proto +++ b/proto/neutron/dex/limit_order_expiration.proto @@ -8,11 +8,11 @@ import "gogoproto/gogo.proto"; message LimitOrderExpiration { // see limitOrderTranche.proto for details on goodTilDate - google.protobuf.Timestamp expirationTime = 1 [ + google.protobuf.Timestamp expiration_time = 1 [ (gogoproto.stdtime) = true, (gogoproto.nullable) = false ]; - bytes trancheRef = 2; + bytes tranche_ref = 2; } diff --git a/proto/neutron/dex/limit_order_tranche.proto b/proto/neutron/dex/limit_order_tranche.proto index 0f0efc644..df97c11a2 100644 --- a/proto/neutron/dex/limit_order_tranche.proto +++ b/proto/neutron/dex/limit_order_tranche.proto @@ -9,32 +9,32 @@ import "gogoproto/gogo.proto"; import "neutron/dex/pair_id.proto"; message LimitOrderTrancheKey { - TradePairID tradePairID = 1; - int64 tickIndexTakerToMaker = 2; - string trancheKey = 3; + TradePairID trade_pair_id = 1; + int64 tick_index_taker_to_maker = 2; + string tranche_key = 3; } message LimitOrderTranche { LimitOrderTrancheKey key = 1; - string reservesMakerDenom = 2 [ + string reserves_maker_denom = 2 [ (gogoproto.moretags) = "yaml:\"reservesMakerDenom\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false, (gogoproto.jsontag) = "reservesMakerDenom" ]; - string reservesTakerDenom = 3 [ + string reserves_taker_denom = 3 [ (gogoproto.moretags) = "yaml:\"reservesTakerDenom\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false, (gogoproto.jsontag) = "reservesTakerDenom" ]; - string totalMakerDenom = 4 [ + string total_maker_denom = 4 [ (gogoproto.moretags) = "yaml:\"totalMakerDenom\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false, (gogoproto.jsontag) = "totalTokenIn" ]; - string totalTakerDenom = 5 [ + string total_taker_denom = 5 [ (gogoproto.moretags) = "yaml:\"totalTakerDenom\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false, @@ -46,11 +46,11 @@ message LimitOrderTranche { // JIT orders also use goodTilDate to handle deletion but represent a special case // All JIT orders have a goodTilDate of 0 and an exception is made to still still treat these orders as live // Order deletion still functions the same and the orders will be deleted at the end of the block - google.protobuf.Timestamp expirationTime = 6 [ + google.protobuf.Timestamp expiration_time = 6 [ (gogoproto.stdtime) = true, (gogoproto.nullable) = true ]; - string priceTakerToMaker = 7 [ + string price_taker_to_maker = 7 [ (gogoproto.moretags) = "yaml:\"priceTakerToMaker\"", (gogoproto.customtype) = "github.com/neutron-org/neutron/utils/math.PrecDec", (gogoproto.nullable) = false, diff --git a/proto/neutron/dex/limit_order_tranche_user.proto b/proto/neutron/dex/limit_order_tranche_user.proto index 56b1514d4..8159d48d5 100644 --- a/proto/neutron/dex/limit_order_tranche_user.proto +++ b/proto/neutron/dex/limit_order_tranche_user.proto @@ -7,28 +7,28 @@ import "neutron/dex/trade_pair_id.proto"; import "neutron/dex/tx.proto"; message LimitOrderTrancheUser { - TradePairID tradePairID = 1; - int64 tickIndexTakerToMaker = 2; - string trancheKey = 3; + TradePairID trade_pair_id = 1; + int64 tick_index_taker_to_maker = 2; + string tranche_key = 3; string address = 4; - string sharesOwned = 5 [ + string shares_owned = 5 [ (gogoproto.moretags) = "yaml:\"sharesOwned\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false, (gogoproto.jsontag) = "sharesOwned" ]; - string sharesWithdrawn = 6 [ + string shares_withdrawn = 6 [ (gogoproto.moretags) = "yaml:\"sharesWithdrawn\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false, (gogoproto.jsontag) = "sharesWithdrawn" ]; - string sharesCancelled = 7 [ + string shares_cancelled = 7 [ (gogoproto.moretags) = "yaml:\"sharesCancelled\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false, (gogoproto.jsontag) = "sharesCancelled" ]; - LimitOrderType orderType = 8; + LimitOrderType order_type = 8; } diff --git a/proto/neutron/dex/pool.proto b/proto/neutron/dex/pool.proto index 42bf9fac1..5dd76a801 100644 --- a/proto/neutron/dex/pool.proto +++ b/proto/neutron/dex/pool.proto @@ -8,7 +8,7 @@ import "neutron/dex/pool_reserves.proto"; // NOTE: This struct is never actually stored in the KV store. It is merely a convenience wrapper for holding both sides of a pool. message Pool { - uint64 ID = 1; + uint64 id = 1; PoolReserves lower_tick0 = 2; PoolReserves upper_tick1 = 3; } diff --git a/proto/neutron/dex/pool_metadata.proto b/proto/neutron/dex/pool_metadata.proto index 5d8d8c9f3..3e30323ca 100644 --- a/proto/neutron/dex/pool_metadata.proto +++ b/proto/neutron/dex/pool_metadata.proto @@ -6,8 +6,8 @@ option go_package = "github.com/neutron-org/neutron/x/dex/types"; import "neutron/dex/pair_id.proto"; message PoolMetadata { - uint64 ID = 1; + uint64 id = 1; int64 tick = 2; uint64 fee = 3; - PairID pairID = 4; + PairID pair_id = 4; } diff --git a/proto/neutron/dex/pool_reserves.proto b/proto/neutron/dex/pool_reserves.proto index 1b75c64cf..fedb3ba78 100644 --- a/proto/neutron/dex/pool_reserves.proto +++ b/proto/neutron/dex/pool_reserves.proto @@ -6,26 +6,26 @@ import "gogoproto/gogo.proto"; import "neutron/dex/trade_pair_id.proto"; message PoolReservesKey { - TradePairID tradePairID = 1; - int64 TickIndexTakerToMaker = 2; - uint64 Fee = 3; + TradePairID trade_pair_id = 1; + int64 tick_index_taker_to_maker = 2; + uint64 fee = 3; } message PoolReserves { PoolReservesKey key = 1; - string reservesMakerDenom = 2 [ + string reserves_maker_denom = 2 [ (gogoproto.moretags) = "yaml:\"reservesMakerDenom\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.jsontag) = "reservesMakerDenom", (gogoproto.nullable) = false ]; - string priceTakerToMaker = 3 [ + string price_taker_to_maker = 3 [ (gogoproto.moretags) = "yaml:\"priceTakerToMaker\"", (gogoproto.customtype) = "github.com/neutron-org/neutron/utils/math.PrecDec", (gogoproto.nullable) = false, (gogoproto.jsontag) = "priceTakerToMaker" ]; - string priceOppositeTakerToMaker = 4 [ + string price_opposite_taker_to_maker = 4 [ (gogoproto.moretags) = "yaml:\"priceOppositeTakerToMaker\"", (gogoproto.customtype) = "github.com/neutron-org/neutron/utils/math.PrecDec", (gogoproto.nullable) = false, diff --git a/proto/neutron/dex/query.proto b/proto/neutron/dex/query.proto index 9e29261b2..f168933a0 100644 --- a/proto/neutron/dex/query.proto +++ b/proto/neutron/dex/query.proto @@ -31,7 +31,7 @@ service Query { // Queries a LimitOrderTrancheUser by index. rpc LimitOrderTrancheUser (QueryGetLimitOrderTrancheUserRequest) returns (QueryGetLimitOrderTrancheUserResponse) { - option (google.api.http).get = "/neutron/dex/limit_order_tranche_user/{address}/{trancheKey}"; + option (google.api.http).get = "/neutron/dex/limit_order_tranche_user/{address}/{tranche_key}"; } @@ -48,12 +48,12 @@ service Query { // Queries a LimitOrderTranche by index. rpc LimitOrderTranche (QueryGetLimitOrderTrancheRequest) returns (QueryGetLimitOrderTrancheResponse) { - option (google.api.http).get = "/neutron/dex/limit_order_tranche/{pairID}/{tokenIn}/{tickIndex}/{trancheKey}"; + option (google.api.http).get = "/neutron/dex/limit_order_tranche/{pair_id}/{token_in}/{tick_index}/{tranche_key}"; } // Queries a list of LimitOrderTranche items for a given pairID / TokenIn combination. rpc LimitOrderTrancheAll (QueryAllLimitOrderTrancheRequest) returns (QueryAllLimitOrderTrancheResponse) { - option (google.api.http).get = "/neutron/dex/limit_order_tranche/{pairID}/{tokenIn}"; + option (google.api.http).get = "/neutron/dex/limit_order_tranche/{pair_id}/{token_in}"; } // Queries a list of UserDeposits items. @@ -63,12 +63,12 @@ service Query { // Queries a list of TickLiquidity items. rpc TickLiquidityAll (QueryAllTickLiquidityRequest) returns (QueryAllTickLiquidityResponse) { - option (google.api.http).get = "/neutron/dex/tick_liquidity/{pairID}/{tokenIn}"; + option (google.api.http).get = "/neutron/dex/tick_liquidity/{pair_id}/{token_in}"; } // Queries a InactiveLimitOrderTranche by index. rpc InactiveLimitOrderTranche (QueryGetInactiveLimitOrderTrancheRequest) returns (QueryGetInactiveLimitOrderTrancheResponse) { - option (google.api.http).get = "/neutron/dex/filled_limit_order_tranche/{pairID}/{tokenIn}/{tickIndex}/{trancheKey}"; + option (google.api.http).get = "/neutron/dex/filled_limit_order_tranche/{pair_id}/{token_in}/{tick_index}/{tranche_key}"; } // Queries a list of InactiveLimitOrderTranche items. @@ -78,12 +78,12 @@ service Query { // Queries a list of PoolReserves items. rpc PoolReservesAll (QueryAllPoolReservesRequest) returns (QueryAllPoolReservesResponse) { - option (google.api.http).get = "/neutron/dex/pool_reserves/{pairID}/{tokenIn}"; + option (google.api.http).get = "/neutron/dex/pool_reserves/{pair_id}/{token_in}"; } // Queries a PoolReserve by index rpc PoolReserves (QueryGetPoolReservesRequest) returns (QueryGetPoolReservesResponse) { - option (google.api.http).get = "/neutron/dex/pool_reserves/{pairID}/{tokenIn}/{tickIndex}/{fee}"; + option (google.api.http).get = "/neutron/dex/pool_reserves/{pair_id}/{token_in}/{tick_index}/{fee}"; } // Queries the simulated result of a multihop swap @@ -98,13 +98,13 @@ service Query { // Queries a pool by pair, tick and fee rpc Pool (QueryPoolRequest) returns (QueryPoolResponse) { - option (google.api.http).get = "/neutron/dex/pool/{pairID}/{tickIndex}/{fee}"; + option (google.api.http).get = "/neutron/dex/pool/{pair_id}/{tick_index}/{fee}"; } // Queries a pool by ID rpc PoolByID (QueryPoolByIDRequest) returns (QueryPoolResponse) { - option (google.api.http).get = "/neutron/dex/pool/{poolID}"; + option (google.api.http).get = "/neutron/dex/pool/{pool_id}"; } @@ -135,11 +135,11 @@ message QueryParamsResponse { message QueryGetLimitOrderTrancheUserRequest { string address = 1; - string trancheKey = 2; + string tranche_key = 2; } message QueryGetLimitOrderTrancheUserResponse { - LimitOrderTrancheUser LimitOrderTrancheUser = 1 [(gogoproto.nullable) = true]; + LimitOrderTrancheUser limit_order_tranche_user = 1 [(gogoproto.nullable) = true]; } message QueryAllLimitOrderTrancheUserRequest { @@ -147,29 +147,29 @@ message QueryAllLimitOrderTrancheUserRequest { } message QueryAllLimitOrderTrancheUserResponse { - repeated LimitOrderTrancheUser LimitOrderTrancheUser = 1 [(gogoproto.nullable) = true]; + repeated LimitOrderTrancheUser limit_order_tranche_user = 1 [(gogoproto.nullable) = true]; cosmos.base.query.v1beta1.PageResponse pagination = 2; } message QueryGetLimitOrderTrancheRequest { - string pairID = 1; - int64 tickIndex = 2; - string tokenIn = 3; - string trancheKey = 4; + string pair_id = 1; + int64 tick_index = 2; + string token_in = 3; + string tranche_key = 4; } message QueryGetLimitOrderTrancheResponse { - LimitOrderTranche LimitOrderTranche = 1 [(gogoproto.nullable) = true]; + LimitOrderTranche limit_order_tranche = 1 [(gogoproto.nullable) = true]; } message QueryAllLimitOrderTrancheRequest { - string pairID = 1; - string tokenIn = 2; + string pair_id = 1; + string token_in = 2; cosmos.base.query.v1beta1.PageRequest pagination = 3; } message QueryAllLimitOrderTrancheResponse { - repeated LimitOrderTranche LimitOrderTranche = 1 [(gogoproto.nullable) = true]; + repeated LimitOrderTranche limit_order_tranche = 1 [(gogoproto.nullable) = true]; cosmos.base.query.v1beta1.PageResponse pagination = 2; } @@ -179,7 +179,7 @@ message QueryAllUserDepositsRequest { } message QueryAllUserDepositsResponse { - repeated DepositRecord Deposits = 1 [(gogoproto.nullable) = true]; + repeated DepositRecord deposits = 1 [(gogoproto.nullable) = true]; cosmos.base.query.v1beta1.PageResponse pagination = 2; } @@ -189,30 +189,30 @@ message QueryAllUserLimitOrdersRequest { } message QueryAllUserLimitOrdersResponse { - repeated LimitOrderTrancheUser limitOrders = 1 [(gogoproto.nullable) = true]; + repeated LimitOrderTrancheUser limit_orders = 1 [(gogoproto.nullable) = true]; cosmos.base.query.v1beta1.PageResponse pagination = 2; } message QueryAllTickLiquidityRequest { - string pairID = 1; - string tokenIn = 2; + string pair_id = 1; + string token_in = 2; cosmos.base.query.v1beta1.PageRequest pagination = 3; } message QueryAllTickLiquidityResponse { - repeated TickLiquidity tickLiquidity = 1 [(gogoproto.nullable) = true]; + repeated TickLiquidity tick_liquidity = 1 [(gogoproto.nullable) = true]; cosmos.base.query.v1beta1.PageResponse pagination = 2; } message QueryGetInactiveLimitOrderTrancheRequest { - string pairID = 1; - string tokenIn = 2; - int64 tickIndex = 3; - string trancheKey = 4; + string pair_id = 1; + string token_in = 2; + int64 tick_index = 3; + string tranche_key = 4; } message QueryGetInactiveLimitOrderTrancheResponse { - LimitOrderTranche inactiveLimitOrderTranche = 1 [(gogoproto.nullable) = true]; + LimitOrderTranche inactive_limit_order_tranche = 1 [(gogoproto.nullable) = true]; } message QueryAllInactiveLimitOrderTrancheRequest { @@ -220,85 +220,85 @@ message QueryAllInactiveLimitOrderTrancheRequest { } message QueryAllInactiveLimitOrderTrancheResponse { - repeated LimitOrderTranche inactiveLimitOrderTranche = 1 [(gogoproto.nullable) = true]; + repeated LimitOrderTranche inactive_limit_order_tranche = 1 [(gogoproto.nullable) = true]; cosmos.base.query.v1beta1.PageResponse pagination = 2; } message QueryAllPoolReservesRequest { - string pairID = 1; - string tokenIn = 2; + string pair_id = 1; + string token_in = 2; cosmos.base.query.v1beta1.PageRequest pagination = 3; } message QueryAllPoolReservesResponse { - repeated PoolReserves poolReserves = 1 [(gogoproto.nullable) = true]; + repeated PoolReserves pool_reserves = 1 [(gogoproto.nullable) = true]; cosmos.base.query.v1beta1.PageResponse pagination = 2; } message QueryGetPoolReservesRequest { - string pairID = 1; - string tokenIn = 2; - int64 tickIndex = 3; + string pair_id = 1; + string token_in = 2; + int64 tick_index = 3; uint64 fee = 4; } message QueryGetPoolReservesResponse { - PoolReserves poolReserves = 1 [(gogoproto.nullable) = true]; + PoolReserves pool_reserves = 1 [(gogoproto.nullable) = true]; } message QueryEstimateMultiHopSwapRequest { string creator = 1; string receiver = 2; repeated MultiHopRoute routes = 3; - string amountIn = 4 [(gogoproto.moretags) = "yaml:\"amountIn\"" , (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false, (gogoproto.jsontag) = "amountIn" ]; - string exitLimitPrice = 5 [(gogoproto.moretags) = "yaml:\"exitLimitPrice\"", (gogoproto.customtype) = "github.com/neutron-org/neutron/utils/math.PrecDec", (gogoproto.nullable) = false, (gogoproto.jsontag) = "exitLimitPrice"]; + string amount_in = 4 [(gogoproto.moretags) = "yaml:\"amountIn\"" , (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false, (gogoproto.jsontag) = "amountIn" ]; + string exit_limit_price = 5 [(gogoproto.moretags) = "yaml:\"exitLimitPrice\"", (gogoproto.customtype) = "github.com/neutron-org/neutron/utils/math.PrecDec", (gogoproto.nullable) = false, (gogoproto.jsontag) = "exitLimitPrice"]; // If pickBestRoute == true then all routes are run and the route with the best price is chosen // otherwise, the first succesful route is used. - bool pickBestRoute = 6; + bool pick_best_route = 6; } message QueryEstimateMultiHopSwapResponse { - cosmos.base.v1beta1.Coin coinOut = 1 [(gogoproto.nullable) = false, (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Coin", (gogoproto.jsontag) = "coinOut"]; + cosmos.base.v1beta1.Coin coin_out = 1 [(gogoproto.nullable) = false, (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Coin", (gogoproto.jsontag) = "coinOut"]; } message QueryEstimatePlaceLimitOrderRequest { string creator = 1; string receiver = 2; - string tokenIn = 3; - string tokenOut = 4; - int64 tickIndexInToOut = 5; - string amountIn = 6 [(gogoproto.moretags) = "yaml:\"amountIn\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false, (gogoproto.jsontag) = "amountIn"]; - LimitOrderType orderType = 7; + string token_in = 3; + string token_out = 4; + int64 tick_index_in_to_out = 5; + string amount_in = 6 [(gogoproto.moretags) = "yaml:\"amountIn\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false, (gogoproto.jsontag) = "amountIn"]; + LimitOrderType order_type = 7; // expirationTime is only valid iff orderType == GOOD_TIL_TIME. - google.protobuf.Timestamp expirationTime = 8 [(gogoproto.stdtime) = true , (gogoproto.nullable) = true ] ; - string maxAmountOut = 9 [(gogoproto.moretags) = "yaml:\"maxAmountOut\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = true, (gogoproto.jsontag) = "maxAmountOut"]; + google.protobuf.Timestamp expiration_time = 8 [(gogoproto.stdtime) = true , (gogoproto.nullable) = true ] ; + string maxAmount_out = 9 [(gogoproto.moretags) = "yaml:\"maxAmountOut\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = true, (gogoproto.jsontag) = "maxAmountOut"]; } message QueryEstimatePlaceLimitOrderResponse { // Total amount of coin used for the limit order // You can derive makerLimitInCoin using the equation: totalInCoin = swapInCoin + makerLimitInCoin - cosmos.base.v1beta1.Coin totalInCoin = 1 [(gogoproto.moretags) = "yaml:\"totalInCoin\"", (gogoproto.nullable) = false, (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Coin", (gogoproto.jsontag) = "totalInCoin"]; + cosmos.base.v1beta1.Coin total_in_coin = 1 [(gogoproto.moretags) = "yaml:\"totalInCoin\"", (gogoproto.nullable) = false, (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Coin", (gogoproto.jsontag) = "totalInCoin"]; // Total amount of the token in that was immediately swapped for swapOutCoin - cosmos.base.v1beta1.Coin swapInCoin = 2 [(gogoproto.moretags) = "yaml:\"swapInCoin\"", (gogoproto.nullable) = false, (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Coin", (gogoproto.jsontag) = "swapInCoin"]; + cosmos.base.v1beta1.Coin swap_in_coin = 2 [(gogoproto.moretags) = "yaml:\"swapInCoin\"", (gogoproto.nullable) = false, (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Coin", (gogoproto.jsontag) = "swapInCoin"]; // 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 - cosmos.base.v1beta1.Coin swapOutCoin = 3 [(gogoproto.moretags) = "yaml:\"swapOutCoin\"", (gogoproto.nullable) = false, (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Coin", (gogoproto.jsontag) = "swapOutCoin"]; + cosmos.base.v1beta1.Coin swap_out_coin = 3 [(gogoproto.moretags) = "yaml:\"swapOutCoin\"", (gogoproto.nullable) = false, (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Coin", (gogoproto.jsontag) = "swapOutCoin"]; } message QueryPoolRequest { - string pairID = 1; - int64 tickIndex = 2; + string pair_id = 1; + int64 tick_index = 2; uint64 fee = 3; } message QueryPoolByIDRequest { - uint64 poolID = 1; + uint64 pool_id = 1; } message QueryPoolResponse { @@ -311,7 +311,7 @@ message QueryGetPoolMetadataRequest { } message QueryGetPoolMetadataResponse { - PoolMetadata PoolMetadata = 1 [(gogoproto.nullable) = false]; + PoolMetadata Pool_metadata = 1 [(gogoproto.nullable) = false]; } message QueryAllPoolMetadataRequest { @@ -319,7 +319,7 @@ message QueryAllPoolMetadataRequest { } message QueryAllPoolMetadataResponse { - repeated PoolMetadata PoolMetadata = 1 [(gogoproto.nullable) = false]; + repeated PoolMetadata pool_metadata = 1 [(gogoproto.nullable) = false]; cosmos.base.query.v1beta1.PageResponse pagination = 2; } diff --git a/proto/neutron/dex/tick_liquidity.proto b/proto/neutron/dex/tick_liquidity.proto index c98840832..0671e8cfe 100644 --- a/proto/neutron/dex/tick_liquidity.proto +++ b/proto/neutron/dex/tick_liquidity.proto @@ -9,8 +9,8 @@ import "neutron/dex/pool_reserves.proto"; message TickLiquidity { oneof liquidity { - PoolReserves poolReserves = 1; - LimitOrderTranche limitOrderTranche = 2; + PoolReserves pool_reserves = 1; + LimitOrderTranche limit_order_tranche = 2; } } diff --git a/proto/neutron/dex/trade_pair_id.proto b/proto/neutron/dex/trade_pair_id.proto index cb74f94a3..c2f21e8de 100644 --- a/proto/neutron/dex/trade_pair_id.proto +++ b/proto/neutron/dex/trade_pair_id.proto @@ -4,6 +4,6 @@ package neutron.dex; option go_package = "github.com/neutron-org/neutron/x/dex/types"; message TradePairID { - string makerDenom = 2; - string takerDenom = 3; + string maker_denom = 2; + string taker_denom = 3; } diff --git a/proto/neutron/dex/tx.proto b/proto/neutron/dex/tx.proto index 37fcd83ec..7ea19633e 100644 --- a/proto/neutron/dex/tx.proto +++ b/proto/neutron/dex/tx.proto @@ -31,33 +31,33 @@ message DepositOptions { message MsgDeposit { string creator = 1; string receiver = 2; - string tokenA = 3; - string tokenB = 4; - repeated string amountsA = 5 [ + string token_a = 3; + string token_b = 4; + repeated string amounts_a = 5 [ (gogoproto.moretags) = "yaml:\"amountsA\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false, (gogoproto.jsontag) = "amountsA" ]; - repeated string amountsB = 6 [ + repeated string amounts_b = 6 [ (gogoproto.moretags) = "yaml:\"amountsB\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false, (gogoproto.jsontag) = "amountsB" ]; - repeated int64 tickIndexesAToB = 7; + repeated int64 tick_indexes_a_to_b = 7; repeated uint64 fees = 8; - repeated DepositOptions Options = 9; + repeated DepositOptions options = 9; } message MsgDepositResponse { - repeated string Reserve0Deposited = 1 [ + repeated string reserve0_deposited = 1 [ (gogoproto.moretags) = "yaml:\"reserve0Deposited\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false, (gogoproto.jsontag) = "reserve0Deposited" ]; - repeated string Reserve1Deposited = 2[ + repeated string reserve1_deposited = 2[ (gogoproto.moretags) = "yaml:\"reserve1Deposited\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false, @@ -68,15 +68,15 @@ message MsgDepositResponse { message MsgWithdrawal { string creator = 1; string receiver = 2; - string tokenA = 3; - string tokenB = 4; - repeated string sharesToRemove = 5 [ + string token_a = 3; + string token_b = 4; + repeated string shares_to_remove = 5 [ (gogoproto.moretags) = "yaml:\"sharesToRemove\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false, (gogoproto.jsontag) = "sharesToRemove" ]; - repeated int64 tickIndexesAToB = 6; + repeated int64 tick_indexes_a_to_b = 6; repeated uint64 fees = 7; } @@ -95,22 +95,22 @@ enum LimitOrderType{ message MsgPlaceLimitOrder { string creator = 1; string receiver = 2; - string tokenIn = 3; - string tokenOut = 4; - int64 tickIndexInToOut = 5; - string amountIn = 7 [ + string token_in = 3; + string token_out = 4; + int64 tick_index_in_to_out = 5; + string amount_in = 7 [ (gogoproto.moretags) = "yaml:\"amountIn\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false, (gogoproto.jsontag) = "amountIn" ]; - LimitOrderType orderType = 8; + LimitOrderType order_type = 8; // expirationTime is only valid iff orderType == GOOD_TIL_TIME. - google.protobuf.Timestamp expirationTime = 9 [ + google.protobuf.Timestamp expiration_time = 9 [ (gogoproto.stdtime) = true, (gogoproto.nullable) = true ]; - string maxAmountOut = 10 [ + string max_amount_out = 10 [ (gogoproto.moretags) = "yaml:\"maxAmountOut\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = true, @@ -121,7 +121,7 @@ message MsgPlaceLimitOrder { message MsgPlaceLimitOrderResponse { string trancheKey = 1; // Total amount of coin used for the limit order - cosmos.base.v1beta1.Coin coinIn = 2 [ + cosmos.base.v1beta1.Coin coin_in = 2 [ (gogoproto.moretags) = "yaml:\"coinIn\"", (gogoproto.nullable) = false, (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Coin", @@ -130,7 +130,7 @@ message MsgPlaceLimitOrderResponse { // 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 - cosmos.base.v1beta1.Coin takerCoinOut = 3 [ + cosmos.base.v1beta1.Coin taker_coin_out = 3 [ (gogoproto.moretags) = "yaml:\"takerCoinOut\"", (gogoproto.nullable) = false, (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Coin", @@ -141,7 +141,7 @@ message MsgPlaceLimitOrderResponse { message MsgWithdrawFilledLimitOrder { string creator = 1; - string trancheKey = 2; + string tranche_key = 2; } message MsgWithdrawFilledLimitOrderResponse { @@ -149,7 +149,7 @@ message MsgWithdrawFilledLimitOrderResponse { message MsgCancelLimitOrder { string creator = 1; - string trancheKey = 2; + string tranche_key = 2; } message MsgCancelLimitOrderResponse { @@ -163,13 +163,13 @@ message MsgMultiHopSwap { string creator = 1; string receiver = 2; repeated MultiHopRoute routes = 3; - string amountIn = 4 [ + string amount_in = 4 [ (gogoproto.moretags) = "yaml:\"amountIn\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false, (gogoproto.jsontag) = "amountIn" ]; - string exitLimitPrice = 5 [ + string exit_limit_price = 5 [ (gogoproto.moretags) = "yaml:\"exitLimitPrice\"", (gogoproto.customtype) = "github.com/neutron-org/neutron/utils/math.PrecDec", (gogoproto.nullable) = false, @@ -177,11 +177,11 @@ message MsgMultiHopSwap { ]; // If pickBestRoute == true then all routes are run and the route with the best price is chosen // otherwise, the first succesful route is used. - bool pickBestRoute = 6; + bool pick_best_route = 6; } message MsgMultiHopSwapResponse { - cosmos.base.v1beta1.Coin coinOut = 1 [ + cosmos.base.v1beta1.Coin coin_out = 1 [ (gogoproto.nullable) = false, (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Coin", (gogoproto.jsontag) = "coinOut" 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 f3a29df7e..930d75d49 100644 --- a/x/dex/client/cli/query_inactive_limit_order_tranche.go +++ b/x/dex/client/cli/query_inactive_limit_order_tranche.go @@ -6,9 +6,10 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/neutron-org/neutron/x/dex/types" "github.com/spf13/cast" "github.com/spf13/cobra" + + "github.com/neutron-org/neutron/x/dex/types" ) func CmdListInactiveLimitOrderTranche() *cobra.Command { @@ -69,7 +70,7 @@ func CmdShowInactiveLimitOrderTranche() *cobra.Command { } params := &types.QueryGetInactiveLimitOrderTrancheRequest{ - PairID: argPairID, + PairId: argPairID, TokenIn: argTokenIn, TickIndex: argTickIndex, TrancheKey: argTrancheKey, diff --git a/x/dex/client/cli/query_limit_order_tranche.go b/x/dex/client/cli/query_limit_order_tranche.go index 8185f0b23..175ac442a 100644 --- a/x/dex/client/cli/query_limit_order_tranche.go +++ b/x/dex/client/cli/query_limit_order_tranche.go @@ -7,8 +7,9 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/neutron-org/neutron/x/dex/types" "github.com/spf13/cobra" + + "github.com/neutron-org/neutron/x/dex/types" ) func CmdListLimitOrderTranche() *cobra.Command { @@ -32,7 +33,7 @@ func CmdListLimitOrderTranche() *cobra.Command { params := &types.QueryAllLimitOrderTrancheRequest{ Pagination: pageReq, - PairID: argPairID, + PairId: argPairID, TokenIn: argTokenIn, } @@ -77,7 +78,7 @@ func CmdShowLimitOrderTranche() *cobra.Command { } params := &types.QueryGetLimitOrderTrancheRequest{ - PairID: argPairID, + PairId: argPairID, TickIndex: argTickIndexInt, TokenIn: argTokenIn, TrancheKey: argTrancheKey, diff --git a/x/dex/client/cli/query_pool.go b/x/dex/client/cli/query_pool.go index 44c4914fd..861a9021d 100644 --- a/x/dex/client/cli/query_pool.go +++ b/x/dex/client/cli/query_pool.go @@ -7,8 +7,9 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/neutron-org/neutron/x/dex/types" "github.com/spf13/cobra" + + "github.com/neutron-org/neutron/x/dex/types" ) func CmdShowPool() *cobra.Command { @@ -41,7 +42,7 @@ func CmdShowPool() *cobra.Command { } params := &types.QueryPoolRequest{ - PairID: argPairID, + PairId: argPairID, TickIndex: argTickIndexInt, Fee: argFeeInt, } @@ -77,7 +78,7 @@ func CmdShowPoolByID() *cobra.Command { } params := &types.QueryPoolByIDRequest{ - PoolID: argPoolID, + PoolId: argPoolID, } res, err := queryClient.PoolByID(context.Background(), params) diff --git a/x/dex/client/cli/query_pool_reserves.go b/x/dex/client/cli/query_pool_reserves.go index ce36eb937..7ffcbb471 100644 --- a/x/dex/client/cli/query_pool_reserves.go +++ b/x/dex/client/cli/query_pool_reserves.go @@ -7,8 +7,9 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/neutron-org/neutron/x/dex/types" "github.com/spf13/cobra" + + "github.com/neutron-org/neutron/x/dex/types" ) func CmdListPoolReserves() *cobra.Command { @@ -29,7 +30,7 @@ func CmdListPoolReserves() *cobra.Command { queryClient := types.NewQueryClient(clientCtx) params := &types.QueryAllPoolReservesRequest{ - PairID: reqPairID, + PairId: reqPairID, TokenIn: reqTokenIn, } @@ -84,7 +85,7 @@ func CmdShowPoolReserves() *cobra.Command { } params := &types.QueryGetPoolReservesRequest{ - PairID: argPairID, + PairId: argPairID, TickIndex: argTickIndexInt, TokenIn: argTokenIn, Fee: argTrancheKeyInt, diff --git a/x/dex/client/cli/query_tick_liquidity.go b/x/dex/client/cli/query_tick_liquidity.go index 2076f5d34..4d86f0483 100644 --- a/x/dex/client/cli/query_tick_liquidity.go +++ b/x/dex/client/cli/query_tick_liquidity.go @@ -5,8 +5,9 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/neutron-org/neutron/x/dex/types" "github.com/spf13/cobra" + + "github.com/neutron-org/neutron/x/dex/types" ) func CmdListTickLiquidity() *cobra.Command { @@ -29,7 +30,7 @@ func CmdListTickLiquidity() *cobra.Command { queryClient := types.NewQueryClient(clientCtx) params := &types.QueryAllTickLiquidityRequest{ - PairID: argPairID, + PairId: argPairID, TokenIn: argTokenIn, Pagination: pageReq, } diff --git a/x/dex/genesis_test.go b/x/dex/genesis_test.go index d315eb455..04d22b246 100644 --- a/x/dex/genesis_test.go +++ b/x/dex/genesis_test.go @@ -4,11 +4,12 @@ import ( "testing" "cosmossdk.io/math" + "github.com/stretchr/testify/require" + keepertest "github.com/neutron-org/neutron/testutil/dex/keeper" "github.com/neutron-org/neutron/testutil/dex/nullify" "github.com/neutron-org/neutron/x/dex" "github.com/neutron-org/neutron/x/dex/types" - "github.com/stretchr/testify/require" ) func TestGenesis(t *testing.T) { @@ -16,7 +17,7 @@ func TestGenesis(t *testing.T) { Params: types.DefaultParams(), LimitOrderTrancheUserList: []*types.LimitOrderTrancheUser{ { - TradePairID: &types.TradePairID{ + TradePairId: &types.TradePairID{ TakerDenom: "TokenA", MakerDenom: "TokenB", }, @@ -28,7 +29,7 @@ func TestGenesis(t *testing.T) { SharesCancelled: math.NewInt(0), }, { - TradePairID: &types.TradePairID{ + TradePairId: &types.TradePairID{ TakerDenom: "TokenB", MakerDenom: "TokenA", }, @@ -73,7 +74,7 @@ func TestGenesis(t *testing.T) { InactiveLimitOrderTrancheList: []*types.LimitOrderTranche{ { Key: &types.LimitOrderTrancheKey{ - TradePairID: &types.TradePairID{ + TradePairId: &types.TradePairID{ TakerDenom: "TokenA", MakerDenom: "TokenB", }, @@ -83,7 +84,7 @@ func TestGenesis(t *testing.T) { }, { Key: &types.LimitOrderTrancheKey{ - TradePairID: &types.TradePairID{ + TradePairId: &types.TradePairID{ TakerDenom: "TokenA", MakerDenom: "TokenB", }, @@ -94,10 +95,10 @@ func TestGenesis(t *testing.T) { }, PoolMetadataList: []types.PoolMetadata{ { - ID: 0, + Id: 0, }, { - ID: 1, + Id: 1, }, }, PoolCount: 2, diff --git a/x/dex/keeper/core.go b/x/dex/keeper/core.go index ebe804de0..bf1e20796 100644 --- a/x/dex/keeper/core.go +++ b/x/dex/keeper/core.go @@ -7,6 +7,7 @@ import ( sdkerrors "cosmossdk.io/errors" "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" + math_utils "github.com/neutron-org/neutron/utils/math" "github.com/neutron-org/neutron/x/dex/types" "github.com/neutron-org/neutron/x/dex/utils" @@ -453,11 +454,11 @@ func (k Keeper) CancelLimitOrderCore( return types.ErrActiveLimitOrderNotFound } - tradePairID, tickIndex := trancheUser.TradePairID, trancheUser.TickIndexTakerToMaker + tradePairID, tickIndex := trancheUser.TradePairId, trancheUser.TickIndexTakerToMaker tranche := k.GetLimitOrderTranche( ctx, &types.LimitOrderTrancheKey{ - TradePairID: tradePairID, + TradePairId: tradePairID, TickIndexTakerToMaker: tickIndex, TrancheKey: trancheKey, }, @@ -524,13 +525,13 @@ func (k Keeper) WithdrawFilledLimitOrderCore( return sdkerrors.Wrapf(types.ErrValidLimitOrderTrancheNotFound, "%s", trancheKey) } - tradePairID, tickIndex := trancheUser.TradePairID, trancheUser.TickIndexTakerToMaker + tradePairID, tickIndex := trancheUser.TradePairId, trancheUser.TickIndexTakerToMaker pairID := tradePairID.MustPairID() tranche, wasFilled, found := k.FindLimitOrderTranche( ctx, &types.LimitOrderTrancheKey{ - TradePairID: tradePairID, + TradePairId: tradePairID, TickIndexTakerToMaker: tickIndex, TrancheKey: trancheKey, }, diff --git a/x/dex/keeper/deposit_record.go b/x/dex/keeper/deposit_record.go index 5b2673368..df8e51d47 100644 --- a/x/dex/keeper/deposit_record.go +++ b/x/dex/keeper/deposit_record.go @@ -2,6 +2,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/neutron-org/neutron/x/dex/types" "github.com/neutron-org/neutron/x/dex/utils" ) @@ -21,7 +22,7 @@ func (k Keeper) GetAllDepositsForAddress(ctx sdk.Context, addr sdk.AccAddress) [ } fee := utils.MustSafeUint64ToInt64(poolMetadata.Fee) depositRecord := &types.DepositRecord{ - PairID: poolMetadata.PairID, + PairId: poolMetadata.PairId, SharesOwned: sharesMaybe.Amount, CenterTickIndex: poolMetadata.Tick, LowerTickIndex: poolMetadata.Tick - fee, diff --git a/x/dex/keeper/deposit_record_test.go b/x/dex/keeper/deposit_record_test.go index 4bb305d86..77aaa9848 100644 --- a/x/dex/keeper/deposit_record_test.go +++ b/x/dex/keeper/deposit_record_test.go @@ -2,6 +2,7 @@ package keeper_test import ( "cosmossdk.io/math" + "github.com/neutron-org/neutron/x/dex/types" ) @@ -19,7 +20,7 @@ func (s *DexTestSuite) TestGetAllDeposits() { depositList := s.App.DexKeeper.GetAllDepositsForAddress(s.Ctx, s.alice) s.Assert().Equal(2, len(depositList)) s.Assert().Equal(&types.DepositRecord{ - PairID: defaultPairID, + PairId: defaultPairID, SharesOwned: math.NewInt(10_000_000), CenterTickIndex: 0, LowerTickIndex: -1, @@ -29,7 +30,7 @@ func (s *DexTestSuite) TestGetAllDeposits() { depositList[0], ) s.Assert().Equal(&types.DepositRecord{ - PairID: defaultPairID, + PairId: defaultPairID, SharesOwned: math.NewInt(10_002_000), CenterTickIndex: 2, LowerTickIndex: 1, 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 d33740e2b..b082d76d7 100644 --- a/x/dex/keeper/grpc_query_inactive_limit_order_tranche.go +++ b/x/dex/keeper/grpc_query_inactive_limit_order_tranche.go @@ -6,9 +6,10 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" - "github.com/neutron-org/neutron/x/dex/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" + + "github.com/neutron-org/neutron/x/dex/types" ) func (k Keeper) InactiveLimitOrderTrancheAll( @@ -53,7 +54,7 @@ func (k Keeper) InactiveLimitOrderTranche( return nil, status.Error(codes.InvalidArgument, "invalid request") } ctx := sdk.UnwrapSDKContext(c) - pairID, err := types.NewPairIDFromCanonicalString(req.PairID) + pairID, err := types.NewPairIDFromCanonicalString(req.PairId) if err != nil { return nil, err } @@ -61,7 +62,7 @@ func (k Keeper) InactiveLimitOrderTranche( val, found := k.GetInactiveLimitOrderTranche( ctx, &types.LimitOrderTrancheKey{ - TradePairID: tradePairID, + TradePairId: tradePairID, TickIndexTakerToMaker: req.TickIndex, TrancheKey: req.TrancheKey, }, 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 66a694709..e0f9f68d8 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 @@ -31,8 +31,8 @@ func TestInactiveLimitOrderTrancheQuerySingle(t *testing.T) { { desc: "First", request: &types.QueryGetInactiveLimitOrderTrancheRequest{ - PairID: msgs[0].Key.TradePairID.MustPairID().CanonicalString(), - TokenIn: msgs[0].Key.TradePairID.MakerDenom, + PairId: msgs[0].Key.TradePairId.MustPairID().CanonicalString(), + TokenIn: msgs[0].Key.TradePairId.MakerDenom, TickIndex: msgs[0].Key.TickIndexTakerToMaker, TrancheKey: msgs[0].Key.TrancheKey, }, @@ -41,8 +41,8 @@ func TestInactiveLimitOrderTrancheQuerySingle(t *testing.T) { { desc: "Second", request: &types.QueryGetInactiveLimitOrderTrancheRequest{ - PairID: msgs[1].Key.TradePairID.MustPairID().CanonicalString(), - TokenIn: msgs[1].Key.TradePairID.MakerDenom, + PairId: msgs[1].Key.TradePairId.MustPairID().CanonicalString(), + TokenIn: msgs[1].Key.TradePairId.MakerDenom, TickIndex: msgs[1].Key.TickIndexTakerToMaker, TrancheKey: msgs[1].Key.TrancheKey, }, @@ -51,7 +51,7 @@ func TestInactiveLimitOrderTrancheQuerySingle(t *testing.T) { { desc: "KeyNotFound", request: &types.QueryGetInactiveLimitOrderTrancheRequest{ - PairID: "TokenZ<>TokenQ", + PairId: "TokenZ<>TokenQ", TokenIn: strconv.Itoa(100000), TickIndex: 100000, TrancheKey: "100000", diff --git a/x/dex/keeper/grpc_query_limit_order_tranche.go b/x/dex/keeper/grpc_query_limit_order_tranche.go index 0665dd481..0a1070814 100644 --- a/x/dex/keeper/grpc_query_limit_order_tranche.go +++ b/x/dex/keeper/grpc_query_limit_order_tranche.go @@ -6,9 +6,10 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" - "github.com/neutron-org/neutron/x/dex/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" + + "github.com/neutron-org/neutron/x/dex/types" ) // Returns all ACTIVE limit order tranches for a given pairID/tokenIn combination @@ -24,7 +25,7 @@ func (k Keeper) LimitOrderTrancheAll( var limitOrderTranches []*types.LimitOrderTranche ctx := sdk.UnwrapSDKContext(c) - pairID, err := types.NewPairIDFromCanonicalString(req.PairID) + pairID, err := types.NewPairIDFromCanonicalString(req.PairId) if err != nil { return nil, err } @@ -69,7 +70,7 @@ func (k Keeper) LimitOrderTranche( return nil, status.Error(codes.InvalidArgument, "invalid request") } ctx := sdk.UnwrapSDKContext(c) - pairID, err := types.NewPairIDFromCanonicalString(req.PairID) + pairID, err := types.NewPairIDFromCanonicalString(req.PairId) if err != nil { return nil, err } @@ -77,7 +78,7 @@ func (k Keeper) LimitOrderTranche( val, _, found := k.FindLimitOrderTranche( ctx, &types.LimitOrderTrancheKey{ - TradePairID: tradePairID, + TradePairId: tradePairID, TickIndexTakerToMaker: req.TickIndex, TrancheKey: req.TrancheKey, }, 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 448777e57..00e0be2e2 100644 --- a/x/dex/keeper/grpc_query_limit_order_tranche_test.go +++ b/x/dex/keeper/grpc_query_limit_order_tranche_test.go @@ -27,7 +27,7 @@ func TestLimitOrderTrancheQuerySingle(t *testing.T) { { desc: "First", request: &types.QueryGetLimitOrderTrancheRequest{ - PairID: "TokenA<>TokenB", + PairId: "TokenA<>TokenB", TickIndex: msgs[0].Key.TickIndexTakerToMaker, TokenIn: "TokenA", TrancheKey: msgs[0].Key.TrancheKey, @@ -37,7 +37,7 @@ func TestLimitOrderTrancheQuerySingle(t *testing.T) { { desc: "Second", request: &types.QueryGetLimitOrderTrancheRequest{ - PairID: "TokenA<>TokenB", + PairId: "TokenA<>TokenB", TickIndex: msgs[1].Key.TickIndexTakerToMaker, TokenIn: "TokenA", TrancheKey: msgs[1].Key.TrancheKey, @@ -47,7 +47,7 @@ func TestLimitOrderTrancheQuerySingle(t *testing.T) { { desc: "KeyNotFound", request: &types.QueryGetLimitOrderTrancheRequest{ - PairID: "TokenA<>TokenB", + PairId: "TokenA<>TokenB", TickIndex: 0, TokenIn: "TokenA", TrancheKey: "100000", @@ -83,7 +83,7 @@ func TestLimitOrderTrancheQueryPaginated(t *testing.T) { request := func(next []byte, offset, limit uint64, total bool) *types.QueryAllLimitOrderTrancheRequest { return &types.QueryAllLimitOrderTrancheRequest{ - PairID: "TokenA<>TokenB", + PairId: "TokenA<>TokenB", TokenIn: "TokenA", Pagination: &query.PageRequest{ Key: next, diff --git a/x/dex/keeper/grpc_query_pool.go b/x/dex/keeper/grpc_query_pool.go index 6783dac68..e831e94fe 100644 --- a/x/dex/keeper/grpc_query_pool.go +++ b/x/dex/keeper/grpc_query_pool.go @@ -4,9 +4,10 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/x/dex/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" + + "github.com/neutron-org/neutron/x/dex/types" ) func (k Keeper) Pool( @@ -19,7 +20,7 @@ func (k Keeper) Pool( ctx := sdk.UnwrapSDKContext(goCtx) - pairID, err := types.NewPairIDFromCanonicalString(req.PairID) + pairID, err := types.NewPairIDFromCanonicalString(req.PairId) if err != nil { return nil, err } @@ -42,7 +43,7 @@ func (k Keeper) PoolByID( ctx := sdk.UnwrapSDKContext(goCtx) - pool, found := k.GetPoolByID(ctx, req.PoolID) + pool, found := k.GetPoolByID(ctx, req.PoolId) if !found { return nil, status.Error(codes.NotFound, "not found") } diff --git a/x/dex/keeper/grpc_query_pool_metadata_test.go b/x/dex/keeper/grpc_query_pool_metadata_test.go index 88f61d2da..f46241d0b 100644 --- a/x/dex/keeper/grpc_query_pool_metadata_test.go +++ b/x/dex/keeper/grpc_query_pool_metadata_test.go @@ -26,12 +26,12 @@ func TestPoolMetadataQuerySingle(t *testing.T) { }{ { desc: "First", - request: &types.QueryGetPoolMetadataRequest{Id: msgs[0].ID}, + request: &types.QueryGetPoolMetadataRequest{Id: msgs[0].Id}, response: &types.QueryGetPoolMetadataResponse{PoolMetadata: msgs[0]}, }, { desc: "Second", - request: &types.QueryGetPoolMetadataRequest{Id: msgs[1].ID}, + request: &types.QueryGetPoolMetadataRequest{Id: msgs[1].Id}, response: &types.QueryGetPoolMetadataResponse{PoolMetadata: msgs[1]}, }, { diff --git a/x/dex/keeper/grpc_query_pool_reserves.go b/x/dex/keeper/grpc_query_pool_reserves.go index 927018c01..057c62801 100644 --- a/x/dex/keeper/grpc_query_pool_reserves.go +++ b/x/dex/keeper/grpc_query_pool_reserves.go @@ -6,9 +6,10 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" - "github.com/neutron-org/neutron/x/dex/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" + + "github.com/neutron-org/neutron/x/dex/types" ) func (k Keeper) PoolReservesAll( @@ -21,7 +22,7 @@ func (k Keeper) PoolReservesAll( ctx := sdk.UnwrapSDKContext(goCtx) - pairID, err := types.NewPairIDFromCanonicalString(req.PairID) + pairID, err := types.NewPairIDFromCanonicalString(req.PairId) if err != nil { return nil, err } @@ -67,14 +68,14 @@ func (k Keeper) PoolReserves( return nil, status.Error(codes.InvalidArgument, "invalid request") } ctx := sdk.UnwrapSDKContext(goCtx) - pairID, err := types.NewPairIDFromCanonicalString(req.PairID) + pairID, err := types.NewPairIDFromCanonicalString(req.PairId) if err != nil { return nil, err } tradePairID := types.NewTradePairIDFromMaker(pairID, req.TokenIn) poolReservesID := &types.PoolReservesKey{ - TradePairID: tradePairID, + TradePairId: tradePairID, TickIndexTakerToMaker: req.TickIndex, Fee: req.Fee, } diff --git a/x/dex/keeper/grpc_query_pool_reserves_test.go b/x/dex/keeper/grpc_query_pool_reserves_test.go index 60d197dd4..8bda9f699 100644 --- a/x/dex/keeper/grpc_query_pool_reserves_test.go +++ b/x/dex/keeper/grpc_query_pool_reserves_test.go @@ -27,7 +27,7 @@ func TestPoolReservesQuerySingle(t *testing.T) { { desc: "First", request: &types.QueryGetPoolReservesRequest{ - PairID: "TokenA<>TokenB", + PairId: "TokenA<>TokenB", TickIndex: msgs[0].Key.TickIndexTakerToMaker, TokenIn: "TokenA", Fee: msgs[0].Key.Fee, @@ -37,7 +37,7 @@ func TestPoolReservesQuerySingle(t *testing.T) { { desc: "Second", request: &types.QueryGetPoolReservesRequest{ - PairID: "TokenA<>TokenB", + PairId: "TokenA<>TokenB", TickIndex: msgs[1].Key.TickIndexTakerToMaker, TokenIn: "TokenA", Fee: msgs[1].Key.Fee, @@ -47,7 +47,7 @@ func TestPoolReservesQuerySingle(t *testing.T) { { desc: "KeyNotFound", request: &types.QueryGetPoolReservesRequest{ - PairID: "TokenA<>TokenB", + PairId: "TokenA<>TokenB", TickIndex: 0, TokenIn: "TokenA", Fee: 100000, @@ -83,7 +83,7 @@ func TestPoolReservesQueryPaginated(t *testing.T) { request := func(next []byte, offset, limit uint64, total bool) *types.QueryAllPoolReservesRequest { return &types.QueryAllPoolReservesRequest{ - PairID: "TokenA<>TokenB", + PairId: "TokenA<>TokenB", TokenIn: "TokenA", Pagination: &query.PageRequest{ Key: next, diff --git a/x/dex/keeper/grpc_query_pool_test.go b/x/dex/keeper/grpc_query_pool_test.go index 634df80dd..909bcf700 100644 --- a/x/dex/keeper/grpc_query_pool_test.go +++ b/x/dex/keeper/grpc_query_pool_test.go @@ -26,7 +26,7 @@ func TestPoolQuerySingle(t *testing.T) { { desc: "First", request: &types.QueryPoolRequest{ - PairID: "TokenA<>TokenB", + PairId: "TokenA<>TokenB", TickIndex: msgs[0].CenterTickIndex(), Fee: msgs[0].Fee(), }, @@ -35,7 +35,7 @@ func TestPoolQuerySingle(t *testing.T) { { desc: "Second", request: &types.QueryPoolRequest{ - PairID: "TokenA<>TokenB", + PairId: "TokenA<>TokenB", TickIndex: msgs[1].CenterTickIndex(), Fee: msgs[1].Fee(), }, @@ -44,7 +44,7 @@ func TestPoolQuerySingle(t *testing.T) { { desc: "KeyNotFound", request: &types.QueryPoolRequest{ - PairID: "TokenA<>TokenB", + PairId: "TokenA<>TokenB", TickIndex: 0, Fee: 100000, }, @@ -83,21 +83,21 @@ func TestPoolQueryByID(t *testing.T) { { desc: "First", request: &types.QueryPoolByIDRequest{ - PoolID: 0, + PoolId: 0, }, response: &types.QueryPoolResponse{Pool: msgs[0]}, }, { desc: "Second", request: &types.QueryPoolByIDRequest{ - PoolID: 1, + PoolId: 1, }, response: &types.QueryPoolResponse{Pool: msgs[1]}, }, { desc: "KeyNotFound", request: &types.QueryPoolByIDRequest{ - PoolID: 100, + PoolId: 100, }, err: status.Error(codes.NotFound, "not found"), }, diff --git a/x/dex/keeper/grpc_query_tick_liquidity.go b/x/dex/keeper/grpc_query_tick_liquidity.go index 6da6a9640..4c89b8c5d 100644 --- a/x/dex/keeper/grpc_query_tick_liquidity.go +++ b/x/dex/keeper/grpc_query_tick_liquidity.go @@ -6,9 +6,10 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" - "github.com/neutron-org/neutron/x/dex/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" + + "github.com/neutron-org/neutron/x/dex/types" ) // NOTE: For single queries of tick liquidity use explicty typed queries @@ -25,7 +26,7 @@ func (k Keeper) TickLiquidityAll( var tickLiquidities []*types.TickLiquidity ctx := sdk.UnwrapSDKContext(c) - pairID, err := types.NewPairIDFromCanonicalString(req.PairID) + pairID, err := types.NewPairIDFromCanonicalString(req.PairId) if err != nil { return nil, err } diff --git a/x/dex/keeper/grpc_query_tick_liquidity_test.go b/x/dex/keeper/grpc_query_tick_liquidity_test.go index 0de6968b1..eedeaa47e 100644 --- a/x/dex/keeper/grpc_query_tick_liquidity_test.go +++ b/x/dex/keeper/grpc_query_tick_liquidity_test.go @@ -20,7 +20,7 @@ func TestTickLiquidityQueryPaginated(t *testing.T) { request := func(next []byte, offset, limit uint64, total bool) *types.QueryAllTickLiquidityRequest { return &types.QueryAllTickLiquidityRequest{ - PairID: "TokenA<>TokenB", + PairId: "TokenA<>TokenB", TokenIn: "TokenA", Pagination: &query.PageRequest{ Key: next, diff --git a/x/dex/keeper/grpc_query_user_deposits.go b/x/dex/keeper/grpc_query_user_deposits.go index a94fe3ff1..81a6b1cc1 100644 --- a/x/dex/keeper/grpc_query_user_deposits.go +++ b/x/dex/keeper/grpc_query_user_deposits.go @@ -4,11 +4,12 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" + "github.com/neutron-org/neutron/utils" "github.com/neutron-org/neutron/x/dex/types" dexutils "github.com/neutron-org/neutron/x/dex/utils" - "google.golang.org/grpc/codes" - "google.golang.org/grpc/status" ) func (k Keeper) UserDepositsAll( @@ -47,7 +48,7 @@ func (k Keeper) UserDepositsAll( if accumulate { depositRecord := &types.DepositRecord{ - PairID: poolMetadata.PairID, + PairId: poolMetadata.PairId, SharesOwned: poolCoinMaybe.Amount, CenterTickIndex: poolMetadata.Tick, LowerTickIndex: poolMetadata.Tick - fee, diff --git a/x/dex/keeper/grpc_query_user_deposits_test.go b/x/dex/keeper/grpc_query_user_deposits_test.go index 871a6dcf0..1db6fdda0 100644 --- a/x/dex/keeper/grpc_query_user_deposits_test.go +++ b/x/dex/keeper/grpc_query_user_deposits_test.go @@ -7,19 +7,20 @@ import ( tmproto "github.com/cometbft/cometbft/proto/tendermint/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" + "github.com/stretchr/testify/require" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" + neutronapp "github.com/neutron-org/neutron/app" "github.com/neutron-org/neutron/testutil" keepertest "github.com/neutron-org/neutron/x/dex/keeper/internal/testutils" "github.com/neutron-org/neutron/x/dex/types" - "github.com/stretchr/testify/require" - "google.golang.org/grpc/codes" - "google.golang.org/grpc/status" ) func simulateDeposit(ctx sdk.Context, app *neutronapp.App, addr sdk.AccAddress, deposit *types.DepositRecord) { // NOTE: For simplicyt sake, we are not actually doing a deposit, we are just initializing // the pool and adding the poolDenom to the users account - pool, err := app.DexKeeper.InitPool(ctx, deposit.PairID, deposit.CenterTickIndex, deposit.Fee) + pool, err := app.DexKeeper.InitPool(ctx, deposit.PairId, deposit.CenterTickIndex, deposit.Fee) if err != nil { panic("Cannot init pool") } @@ -35,7 +36,7 @@ func TestUserDepositsAllQueryPaginated(t *testing.T) { addr := sdk.AccAddress([]byte("test_addr")) msgs := []*types.DepositRecord{ { - PairID: defaultPairID, + PairId: defaultPairID, SharesOwned: math.NewInt(10), CenterTickIndex: 2, LowerTickIndex: 1, @@ -43,7 +44,7 @@ func TestUserDepositsAllQueryPaginated(t *testing.T) { Fee: 1, }, { - PairID: defaultPairID, + PairId: defaultPairID, SharesOwned: math.NewInt(10), CenterTickIndex: 3, LowerTickIndex: 2, @@ -51,7 +52,7 @@ func TestUserDepositsAllQueryPaginated(t *testing.T) { Fee: 1, }, { - PairID: defaultPairID, + PairId: defaultPairID, SharesOwned: math.NewInt(10), CenterTickIndex: 4, LowerTickIndex: 3, @@ -59,7 +60,7 @@ func TestUserDepositsAllQueryPaginated(t *testing.T) { Fee: 1, }, { - PairID: defaultPairID, + PairId: defaultPairID, SharesOwned: math.NewInt(10), CenterTickIndex: 5, LowerTickIndex: 4, @@ -67,7 +68,7 @@ func TestUserDepositsAllQueryPaginated(t *testing.T) { Fee: 1, }, { - PairID: defaultPairID, + PairId: defaultPairID, SharesOwned: math.NewInt(10), CenterTickIndex: 6, LowerTickIndex: 5, diff --git a/x/dex/keeper/integration_placelimitorder_test.go b/x/dex/keeper/integration_placelimitorder_test.go index 0fc08221f..f8d63713f 100644 --- a/x/dex/keeper/integration_placelimitorder_test.go +++ b/x/dex/keeper/integration_placelimitorder_test.go @@ -7,6 +7,7 @@ import ( sdkmath "cosmossdk.io/math" abci "github.com/cometbft/cometbft/abci/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/neutron-org/neutron/x/dex/types" ) @@ -631,7 +632,7 @@ func (s *DexTestSuite) TestPlaceLimitOrderGoodTilHandlesTimezoneCorrectly() { timeInPST, _ := time.Parse(time.RFC3339, "2050-01-02T15:04:05-08:00") trancheKey := s.aliceLimitSellsGoodTil("TokenA", 0, 10, timeInPST) tranche := s.App.DexKeeper.GetLimitOrderTranche(s.Ctx, &types.LimitOrderTrancheKey{ - TradePairID: defaultTradePairID1To0, + TradePairId: defaultTradePairID1To0, TickIndexTakerToMaker: 0, TrancheKey: trancheKey, }) diff --git a/x/dex/keeper/limit_order_expiration_test.go b/x/dex/keeper/limit_order_expiration_test.go index 212fc60e0..4e802b5a8 100644 --- a/x/dex/keeper/limit_order_expiration_test.go +++ b/x/dex/keeper/limit_order_expiration_test.go @@ -6,6 +6,7 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/neutron-org/neutron/x/dex/keeper" "github.com/neutron-org/neutron/x/dex/types" ) @@ -35,7 +36,7 @@ func createLimitOrderExpirationAndTranches( for i := range items { tranche := &types.LimitOrderTranche{ Key: &types.LimitOrderTrancheKey{ - TradePairID: &types.TradePairID{ + TradePairId: &types.TradePairID{ MakerDenom: "TokenA", TakerDenom: "TokenB", }, diff --git a/x/dex/keeper/limit_order_tranche.go b/x/dex/keeper/limit_order_tranche.go index 791629989..d39a65b71 100644 --- a/x/dex/keeper/limit_order_tranche.go +++ b/x/dex/keeper/limit_order_tranche.go @@ -7,6 +7,7 @@ import ( "cosmossdk.io/math" "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/neutron-org/neutron/x/dex/types" "github.com/neutron-org/neutron/x/dex/utils" ) @@ -208,14 +209,14 @@ func (k Keeper) GetOrInitPlaceTranche(ctx sdk.Context, switch orderType { case types.LimitOrderType_JUST_IN_TIME: limitOrderTrancheKey := &types.LimitOrderTrancheKey{ - TradePairID: tradePairID, + TradePairId: tradePairID, TickIndexTakerToMaker: tickIndexTakerToMaker, TrancheKey: NewTrancheKey(ctx), } placeTranche, err = NewLimitOrderTranche(limitOrderTrancheKey, &JITGoodTilTime) case types.LimitOrderType_GOOD_TIL_TIME: limitOrderTrancheKey := &types.LimitOrderTrancheKey{ - TradePairID: tradePairID, + TradePairId: tradePairID, TickIndexTakerToMaker: tickIndexTakerToMaker, TrancheKey: NewTrancheKey(ctx), } @@ -224,7 +225,7 @@ func (k Keeper) GetOrInitPlaceTranche(ctx sdk.Context, placeTranche = k.GetPlaceTranche(ctx, tradePairID, tickIndexTakerToMaker) if placeTranche == nil { limitOrderTrancheKey := &types.LimitOrderTrancheKey{ - TradePairID: tradePairID, + TradePairId: tradePairID, TickIndexTakerToMaker: tickIndexTakerToMaker, TrancheKey: NewTrancheKey(ctx), } diff --git a/x/dex/keeper/limit_order_tranche_user.go b/x/dex/keeper/limit_order_tranche_user.go index b075fff67..e25ee4d39 100644 --- a/x/dex/keeper/limit_order_tranche_user.go +++ b/x/dex/keeper/limit_order_tranche_user.go @@ -4,6 +4,7 @@ import ( "cosmossdk.io/math" "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/neutron-org/neutron/x/dex/types" ) @@ -25,7 +26,7 @@ func (k Keeper) GetOrInitLimitOrderTrancheUser( SharesWithdrawn: math.ZeroInt(), SharesCancelled: math.ZeroInt(), TickIndexTakerToMaker: tickIndex, - TradePairID: tradePairID, + TradePairId: tradePairID, OrderType: orderType, } } diff --git a/x/dex/keeper/limit_order_tranche_user_test.go b/x/dex/keeper/limit_order_tranche_user_test.go index c3eef976b..d9cf8de78 100644 --- a/x/dex/keeper/limit_order_tranche_user_test.go +++ b/x/dex/keeper/limit_order_tranche_user_test.go @@ -6,11 +6,12 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/stretchr/testify/require" + keepertest "github.com/neutron-org/neutron/testutil/dex/keeper" "github.com/neutron-org/neutron/testutil/dex/nullify" "github.com/neutron-org/neutron/x/dex/keeper" "github.com/neutron-org/neutron/x/dex/types" - "github.com/stretchr/testify/require" ) func createNLimitOrderTrancheUser(keeper *keeper.Keeper, ctx sdk.Context, n int) []*types.LimitOrderTrancheUser { @@ -19,7 +20,7 @@ func createNLimitOrderTrancheUser(keeper *keeper.Keeper, ctx sdk.Context, n int) val := &types.LimitOrderTrancheUser{ TrancheKey: strconv.Itoa(i), Address: strconv.Itoa(i), - TradePairID: &types.TradePairID{MakerDenom: "TokenA", TakerDenom: "TokenB"}, + TradePairId: &types.TradePairID{MakerDenom: "TokenA", TakerDenom: "TokenB"}, TickIndexTakerToMaker: 0, SharesOwned: math.ZeroInt(), SharesWithdrawn: math.ZeroInt(), @@ -38,7 +39,7 @@ func createNLimitOrderTrancheUserWithAddress(keeper *keeper.Keeper, ctx sdk.Cont val := &types.LimitOrderTrancheUser{ TrancheKey: strconv.Itoa(i), Address: address, - TradePairID: &types.TradePairID{MakerDenom: "TokenA", TakerDenom: "TokenB"}, + TradePairId: &types.TradePairID{MakerDenom: "TokenA", TakerDenom: "TokenB"}, TickIndexTakerToMaker: 0, SharesOwned: math.ZeroInt(), SharesWithdrawn: math.ZeroInt(), @@ -86,7 +87,7 @@ func (s *DexTestSuite) TestGetAllLimitOrders() { LOList := s.App.DexKeeper.GetAllLimitOrderTrancheUserForAddress(s.Ctx, s.alice) s.Assert().Equal(2, len(LOList)) s.Assert().Equal(&types.LimitOrderTrancheUser{ - TradePairID: defaultTradePairID1To0, + TradePairId: defaultTradePairID1To0, TickIndexTakerToMaker: 1, TrancheKey: trancheKeyA, Address: s.alice.String(), @@ -97,7 +98,7 @@ func (s *DexTestSuite) TestGetAllLimitOrders() { LOList[0], ) s.Assert().Equal(&types.LimitOrderTrancheUser{ - TradePairID: defaultTradePairID0To1, + TradePairId: defaultTradePairID0To1, TickIndexTakerToMaker: 0, TrancheKey: trancheKeyB, Address: s.alice.String(), diff --git a/x/dex/keeper/liquidity_test.go b/x/dex/keeper/liquidity_test.go index 0cfdad2b7..4f9381930 100644 --- a/x/dex/keeper/liquidity_test.go +++ b/x/dex/keeper/liquidity_test.go @@ -5,6 +5,7 @@ import ( sdkmath "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/neutron-org/neutron/x/dex/types" ) @@ -658,23 +659,23 @@ func (s *DexTestSuite) assertTickBalancesInt(expectedABalance, expectedBBalance for _, tick := range ticks { switch liquidity := tick.Liquidity.(type) { case *types.TickLiquidity_LimitOrderTranche: - tokenIn := liquidity.LimitOrderTranche.Key.TradePairID.MakerDenom + tokenIn := liquidity.LimitOrderTranche.Key.TradePairId.MakerDenom amountIn := liquidity.LimitOrderTranche.ReservesMakerDenom allCoins = allCoins.Add(sdk.NewCoin(tokenIn, amountIn)) - tokenOut := liquidity.LimitOrderTranche.Key.TradePairID.TakerDenom + tokenOut := liquidity.LimitOrderTranche.Key.TradePairId.TakerDenom amountOut := liquidity.LimitOrderTranche.ReservesTakerDenom allCoins = allCoins.Add(sdk.NewCoin(tokenOut, amountOut)) case *types.TickLiquidity_PoolReserves: - tokenIn := liquidity.PoolReserves.Key.TradePairID.MakerDenom + tokenIn := liquidity.PoolReserves.Key.TradePairId.MakerDenom reserves := liquidity.PoolReserves.ReservesMakerDenom allCoins = allCoins.Add(sdk.NewCoin(tokenIn, reserves)) } } for _, lo := range inactiveLOs { - tokenOut := lo.Key.TradePairID.TakerDenom + tokenOut := lo.Key.TradePairId.TakerDenom amountOut := lo.ReservesTakerDenom allCoins = allCoins.Add(sdk.NewCoin(tokenOut, amountOut)) } diff --git a/x/dex/keeper/msg_server_test.go b/x/dex/keeper/msg_server_test.go index 387bf9b64..dc4819545 100644 --- a/x/dex/keeper/msg_server_test.go +++ b/x/dex/keeper/msg_server_test.go @@ -10,12 +10,13 @@ import ( abci "github.com/cometbft/cometbft/abci/types" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/stretchr/testify/suite" + "github.com/neutron-org/neutron/testutil/apptesting" math_utils "github.com/neutron-org/neutron/utils/math" . "github.com/neutron-org/neutron/x/dex/keeper" . "github.com/neutron-org/neutron/x/dex/keeper/internal/testutils" "github.com/neutron-org/neutron/x/dex/types" - "github.com/stretchr/testify/suite" ) // Test suite @@ -1456,7 +1457,7 @@ func (s *DexTestSuite) getLimitFilledLiquidityAtTickAtIndex( // grab fill tranche reserves and shares tradePairID := defaultPairID.MustTradePairIDFromMaker(selling) tranche, _, found := s.App.DexKeeper.FindLimitOrderTranche(s.Ctx, &types.LimitOrderTrancheKey{ - TradePairID: tradePairID, + TradePairId: tradePairID, TickIndexTakerToMaker: tickIndex, TrancheKey: trancheKey, }) @@ -1473,7 +1474,7 @@ func (s *DexTestSuite) getLimitReservesAtTickAtKey( // grab fill tranche reserves and shares tradePairID := defaultPairID.MustTradePairIDFromMaker(selling) tranche, _, found := s.App.DexKeeper.FindLimitOrderTranche(s.Ctx, &types.LimitOrderTrancheKey{ - TradePairID: tradePairID, + TradePairId: tradePairID, TickIndexTakerToMaker: tickIndex, TrancheKey: trancheKey, }) diff --git a/x/dex/keeper/pool.go b/x/dex/keeper/pool.go index b0172824a..d388eca73 100644 --- a/x/dex/keeper/pool.go +++ b/x/dex/keeper/pool.go @@ -5,6 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/neutron-org/neutron/x/dex/types" "github.com/neutron-org/neutron/x/dex/utils" ) @@ -29,11 +30,11 @@ func (k Keeper) InitPool( centerTickIndexNormalized int64, fee uint64, ) (pool *types.Pool, err error) { - poolMetadata := types.PoolMetadata{PairID: pairID, Tick: centerTickIndexNormalized, Fee: fee} + poolMetadata := types.PoolMetadata{PairId: pairID, Tick: centerTickIndexNormalized, Fee: fee} // Get current poolID poolID := k.GetPoolCount(ctx) - poolMetadata.ID = poolID + poolMetadata.Id = poolID // Store poolMetadata k.SetPoolMetadata(ctx, poolMetadata) @@ -65,7 +66,7 @@ func (k Keeper) GetPool( feeInt64 := utils.MustSafeUint64ToInt64(fee) id0To1 := &types.PoolReservesKey{ - TradePairID: types.NewTradePairIDFromMaker(pairID, pairID.Token1), + TradePairId: types.NewTradePairIDFromMaker(pairID, pairID.Token1), TickIndexTakerToMaker: centerTickIndexNormalized + feeInt64, Fee: fee, } @@ -89,7 +90,7 @@ func (k Keeper) GetPool( } return &types.Pool{ - ID: poolID, + Id: poolID, LowerTick0: lowerTick, UpperTick1: upperTick, }, true @@ -101,7 +102,7 @@ func (k Keeper) GetPoolByID(ctx sdk.Context, poolID uint64) (pool *types.Pool, f return pool, false } - return k.GetPool(ctx, poolMetadata.PairID, poolMetadata.Tick, poolMetadata.Fee) + return k.GetPool(ctx, poolMetadata.PairId, poolMetadata.Tick, poolMetadata.Fee) } func (k Keeper) GetPoolIDByParams( diff --git a/x/dex/keeper/pool_metadata.go b/x/dex/keeper/pool_metadata.go index 2d3c0f141..9ffacb40f 100644 --- a/x/dex/keeper/pool_metadata.go +++ b/x/dex/keeper/pool_metadata.go @@ -5,6 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/neutron-org/neutron/x/dex/types" ) @@ -12,7 +13,7 @@ import ( func (k Keeper) SetPoolMetadata(ctx sdk.Context, poolMetadata types.PoolMetadata) { store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefix(types.PoolMetadataKeyPrefix)) b := k.cdc.MustMarshal(&poolMetadata) - store.Set(GetPoolMetadataIDBytes(poolMetadata.ID), b) + store.Set(GetPoolMetadataIDBytes(poolMetadata.Id), b) } // GetPoolMetadata returns a poolMetadata from its id diff --git a/x/dex/keeper/pool_metadata_test.go b/x/dex/keeper/pool_metadata_test.go index 7bb9088e9..6eb70ef1c 100644 --- a/x/dex/keeper/pool_metadata_test.go +++ b/x/dex/keeper/pool_metadata_test.go @@ -4,17 +4,18 @@ import ( "testing" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/stretchr/testify/require" + keepertest "github.com/neutron-org/neutron/testutil/dex/keeper" "github.com/neutron-org/neutron/testutil/dex/nullify" "github.com/neutron-org/neutron/x/dex/keeper" "github.com/neutron-org/neutron/x/dex/types" - "github.com/stretchr/testify/require" ) func createNPoolMetadata(keeper *keeper.Keeper, ctx sdk.Context, n int) []types.PoolMetadata { items := make([]types.PoolMetadata, n) for i := range items { - items[i].ID = uint64(i) + items[i].Id = uint64(i) keeper.SetPoolMetadata(ctx, items[i]) } @@ -25,7 +26,7 @@ func TestPoolMetadataGet(t *testing.T) { keeper, ctx := keepertest.DexKeeper(t) items := createNPoolMetadata(keeper, ctx, 10) for _, item := range items { - got, found := keeper.GetPoolMetadata(ctx, item.ID) + got, found := keeper.GetPoolMetadata(ctx, item.Id) require.True(t, found) require.Equal(t, nullify.Fill(item), @@ -38,8 +39,8 @@ func TestPoolMetadataRemove(t *testing.T) { keeper, ctx := keepertest.DexKeeper(t) items := createNPoolMetadata(keeper, ctx, 10) for _, item := range items { - keeper.RemovePoolMetadata(ctx, item.ID) - _, found := keeper.GetPoolMetadata(ctx, item.ID) + keeper.RemovePoolMetadata(ctx, item.Id) + _, found := keeper.GetPoolMetadata(ctx, item.Id) require.False(t, found) } } diff --git a/x/dex/keeper/pool_test.go b/x/dex/keeper/pool_test.go index 527b53ea8..fe4224de3 100644 --- a/x/dex/keeper/pool_test.go +++ b/x/dex/keeper/pool_test.go @@ -5,10 +5,11 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/stretchr/testify/require" + keepertest "github.com/neutron-org/neutron/testutil/dex/keeper" "github.com/neutron-org/neutron/x/dex/keeper" "github.com/neutron-org/neutron/x/dex/types" - "github.com/stretchr/testify/require" ) func createNPools(k *keeper.Keeper, ctx sdk.Context, n int) []*types.Pool { @@ -38,7 +39,7 @@ func TestPoolInit(t *testing.T) { require.True(t, found) - require.Equal(t, pool.ID, dbPool.ID) + require.Equal(t, pool.Id, dbPool.Id) require.Equal(t, pool.LowerTick0, dbPool.LowerTick0) require.Equal(t, pool.UpperTick1, dbPool.UpperTick1) } @@ -54,11 +55,11 @@ func TestGetPoolByID(t *testing.T) { keeper, ctx := keepertest.DexKeeper(t) items := createNPools(keeper, ctx, 2) - pool0, found := keeper.GetPoolByID(ctx, items[0].ID) + pool0, found := keeper.GetPoolByID(ctx, items[0].Id) require.True(t, found) require.Equal(t, items[0], pool0) - pool1, found := keeper.GetPoolByID(ctx, items[1].ID) + pool1, found := keeper.GetPoolByID(ctx, items[1].Id) require.True(t, found) require.Equal(t, items[1], pool1) @@ -72,21 +73,21 @@ func TestGetPoolIDByParams(t *testing.T) { id0, found := keeper.GetPoolIDByParams( ctx, - items[0].LowerTick0.Key.TradePairID.MustPairID(), + items[0].LowerTick0.Key.TradePairId.MustPairID(), items[0].CenterTickIndex(), items[0].Fee(), ) require.True(t, found) - require.Equal(t, items[0].ID, id0) + require.Equal(t, items[0].Id, id0) id1, found := keeper.GetPoolIDByParams( ctx, - items[1].LowerTick0.Key.TradePairID.MustPairID(), + items[1].LowerTick0.Key.TradePairId.MustPairID(), items[1].CenterTickIndex(), items[1].Fee(), ) require.True(t, found) - require.Equal(t, items[1].ID, id1) + require.Equal(t, items[1].Id, id1) _, found = keeper.GetPoolIDByParams(ctx, defaultPairID, 99, 2) require.False(t, found) diff --git a/x/dex/types/deposit_record.pb.go b/x/dex/types/deposit_record.pb.go index d3d3e54c7..270160cb5 100644 --- a/x/dex/types/deposit_record.pb.go +++ b/x/dex/types/deposit_record.pb.go @@ -25,11 +25,11 @@ var _ = math.Inf const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type DepositRecord struct { - PairID *PairID `protobuf:"bytes,1,opt,name=pairID,proto3" json:"pairID,omitempty"` - SharesOwned github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,opt,name=sharesOwned,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"totalShares" yaml:"totalShares"` - CenterTickIndex int64 `protobuf:"varint,3,opt,name=centerTickIndex,proto3" json:"centerTickIndex,omitempty"` - LowerTickIndex int64 `protobuf:"varint,4,opt,name=lowerTickIndex,proto3" json:"lowerTickIndex,omitempty"` - UpperTickIndex int64 `protobuf:"varint,5,opt,name=upperTickIndex,proto3" json:"upperTickIndex,omitempty"` + PairId *PairID `protobuf:"bytes,1,opt,name=pair_id,json=pairId,proto3" json:"pair_id,omitempty"` + SharesOwned github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,opt,name=shares_owned,json=sharesOwned,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"totalShares" yaml:"totalShares"` + CenterTickIndex int64 `protobuf:"varint,3,opt,name=center_tick_index,json=centerTickIndex,proto3" json:"center_tick_index,omitempty"` + LowerTickIndex int64 `protobuf:"varint,4,opt,name=lower_tick_index,json=lowerTickIndex,proto3" json:"lower_tick_index,omitempty"` + UpperTickIndex int64 `protobuf:"varint,5,opt,name=upper_tick_index,json=upperTickIndex,proto3" json:"upper_tick_index,omitempty"` Fee uint64 `protobuf:"varint,6,opt,name=fee,proto3" json:"fee,omitempty"` } @@ -66,9 +66,9 @@ func (m *DepositRecord) XXX_DiscardUnknown() { var xxx_messageInfo_DepositRecord proto.InternalMessageInfo -func (m *DepositRecord) GetPairID() *PairID { +func (m *DepositRecord) GetPairId() *PairID { if m != nil { - return m.PairID + return m.PairId } return nil } @@ -108,29 +108,30 @@ func init() { func init() { proto.RegisterFile("neutron/dex/deposit_record.proto", fileDescriptor_250413eadaebbf28) } var fileDescriptor_250413eadaebbf28 = []byte{ - // 339 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x91, 0x3f, 0x6f, 0xf2, 0x30, - 0x10, 0x87, 0x63, 0xe0, 0x45, 0x7a, 0x13, 0xf5, 0x8f, 0xdc, 0x0e, 0x29, 0x43, 0x12, 0x31, 0xa0, - 0xa8, 0x15, 0x89, 0xd4, 0x6e, 0x1d, 0x11, 0x0b, 0x53, 0xab, 0xd0, 0xa9, 0x0b, 0x0a, 0xb1, 0x1b, - 0x22, 0x20, 0x17, 0xd9, 0x8e, 0x08, 0xdf, 0xa2, 0xdf, 0xa8, 0x2b, 0x23, 0x63, 0xd5, 0x21, 0xaa, - 0x60, 0xeb, 0xd8, 0x4f, 0x50, 0xc5, 0xa4, 0x92, 0xcb, 0xe4, 0xd3, 0xe3, 0xc7, 0xbf, 0x93, 0xef, - 0x74, 0x27, 0xa5, 0xb9, 0x60, 0x90, 0xfa, 0x84, 0x16, 0x3e, 0xa1, 0x19, 0xf0, 0x44, 0x4c, 0x18, - 0x8d, 0x80, 0x11, 0x2f, 0x63, 0x20, 0x00, 0x1b, 0xb5, 0xe1, 0x11, 0x5a, 0x74, 0x2e, 0x63, 0x88, - 0x41, 0x72, 0xbf, 0xaa, 0x0e, 0x4a, 0xe7, 0x4a, 0x0d, 0xc9, 0xc2, 0x84, 0x4d, 0x92, 0xfa, 0x75, - 0xf7, 0xad, 0xa1, 0x9f, 0x0c, 0x0f, 0xb1, 0x81, 0x4c, 0xc5, 0x37, 0x7a, 0xbb, 0x52, 0x46, 0x43, - 0x13, 0x39, 0xc8, 0x35, 0x6e, 0x2f, 0x3c, 0xa5, 0x81, 0xf7, 0x28, 0xaf, 0x82, 0x5a, 0xc1, 0xb9, - 0x6e, 0xf0, 0x59, 0xc8, 0x28, 0x7f, 0x58, 0xa5, 0x94, 0x98, 0x0d, 0x07, 0xb9, 0xff, 0x07, 0xe3, - 0x4d, 0x69, 0x6b, 0x1f, 0xa5, 0xdd, 0x8b, 0x13, 0x31, 0xcb, 0xa7, 0x5e, 0x04, 0x4b, 0x3f, 0x02, - 0xbe, 0x04, 0x5e, 0x1f, 0x7d, 0x4e, 0xe6, 0xbe, 0x58, 0x67, 0x94, 0x7b, 0xa3, 0x54, 0x7c, 0x95, - 0xb6, 0x21, 0x40, 0x84, 0x8b, 0xb1, 0x4c, 0xfa, 0x2e, 0x6d, 0xbc, 0x0e, 0x97, 0x8b, 0xfb, 0xae, - 0x02, 0xbb, 0x81, 0xda, 0x07, 0xbb, 0xfa, 0x59, 0x44, 0x53, 0x41, 0xd9, 0x53, 0x12, 0xcd, 0x47, - 0x29, 0xa1, 0x85, 0xd9, 0x74, 0x90, 0xdb, 0x0c, 0x8e, 0x31, 0xee, 0xe9, 0xa7, 0x0b, 0x58, 0xa9, - 0x62, 0x4b, 0x8a, 0x47, 0xb4, 0xf2, 0xf2, 0x2c, 0x53, 0xbd, 0x7f, 0x07, 0xef, 0x2f, 0xc5, 0xe7, - 0x7a, 0xf3, 0x85, 0x52, 0xb3, 0xed, 0x20, 0xb7, 0x15, 0x54, 0xe5, 0x60, 0xb8, 0xd9, 0x59, 0x68, - 0xbb, 0xb3, 0xd0, 0xe7, 0xce, 0x42, 0xaf, 0x7b, 0x4b, 0xdb, 0xee, 0x2d, 0xed, 0x7d, 0x6f, 0x69, - 0xcf, 0xd7, 0xca, 0xff, 0xeb, 0x19, 0xf6, 0x81, 0xc5, 0xbf, 0xb5, 0x5f, 0xc8, 0x7d, 0xc8, 0x39, - 0x4c, 0xdb, 0x72, 0x1d, 0x77, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xa4, 0xd7, 0xff, 0x85, 0xf0, - 0x01, 0x00, 0x00, + // 354 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x91, 0x31, 0x4f, 0xab, 0x50, + 0x1c, 0xc5, 0xb9, 0x6d, 0x5f, 0x5f, 0x1e, 0x3c, 0xb5, 0xa2, 0x03, 0x76, 0x00, 0xd2, 0xc1, 0x90, + 0xc6, 0x42, 0xa2, 0x9b, 0x63, 0xd3, 0x85, 0x49, 0x43, 0x9d, 0x5c, 0x08, 0xe5, 0x5e, 0xe9, 0x4d, + 0x5b, 0xfe, 0xe4, 0x72, 0x6b, 0xe9, 0xb7, 0xf0, 0x5b, 0xd9, 0xb1, 0xa3, 0x71, 0x20, 0xa6, 0xdd, + 0x1c, 0xfd, 0x04, 0x86, 0x0b, 0x46, 0x3a, 0x71, 0x72, 0xf8, 0xdd, 0x73, 0x92, 0xf3, 0x97, 0xcd, + 0x98, 0x2c, 0x39, 0x83, 0xd8, 0xc1, 0x24, 0x73, 0x30, 0x49, 0x20, 0xa5, 0xdc, 0x67, 0x24, 0x04, + 0x86, 0xed, 0x84, 0x01, 0x07, 0x55, 0xa9, 0x08, 0x1b, 0x93, 0xac, 0x7b, 0x1e, 0x41, 0x04, 0xc2, + 0x77, 0x0a, 0x55, 0x22, 0xdd, 0x8b, 0x7a, 0x48, 0x12, 0x50, 0xe6, 0xd3, 0xea, 0x75, 0xef, 0xb5, + 0x21, 0x1f, 0x8d, 0xca, 0x58, 0x4f, 0xa4, 0xaa, 0x57, 0xf2, 0xdf, 0x0a, 0xd1, 0x90, 0x89, 0x2c, + 0xe5, 0xfa, 0xcc, 0xae, 0x35, 0xd8, 0xf7, 0x01, 0x65, 0xee, 0xc8, 0x6b, 0x17, 0x8c, 0x8b, 0xd5, + 0x67, 0xf9, 0x7f, 0x3a, 0x0d, 0x18, 0x49, 0x7d, 0x58, 0xc5, 0x04, 0x6b, 0x0d, 0x13, 0x59, 0xff, + 0x86, 0xe3, 0x4d, 0x6e, 0x48, 0xef, 0xb9, 0x71, 0x19, 0x51, 0x3e, 0x5d, 0x4e, 0xec, 0x10, 0x16, + 0x4e, 0x08, 0xe9, 0x02, 0xd2, 0xea, 0x33, 0x48, 0xf1, 0xcc, 0xe1, 0xeb, 0x84, 0xa4, 0xb6, 0x1b, + 0xf3, 0xcf, 0xdc, 0x50, 0x38, 0xf0, 0x60, 0x3e, 0x16, 0x51, 0x5f, 0xb9, 0xa1, 0xae, 0x83, 0xc5, + 0xfc, 0xb6, 0x57, 0x33, 0x7b, 0x9e, 0x52, 0x16, 0xdd, 0x15, 0x3d, 0x6a, 0x5f, 0x3e, 0x0d, 0x49, + 0xcc, 0x09, 0xf3, 0x39, 0x0d, 0x67, 0x3e, 0x8d, 0x31, 0xc9, 0xb4, 0xa6, 0x89, 0xac, 0xa6, 0x77, + 0x52, 0xfe, 0x78, 0xa0, 0xe1, 0xcc, 0x2d, 0x6c, 0xd5, 0x92, 0x3b, 0x73, 0x58, 0x1d, 0xa2, 0x2d, + 0x81, 0x1e, 0x0b, 0xff, 0x80, 0x5c, 0x26, 0xc9, 0x21, 0xf9, 0xa7, 0x24, 0x85, 0xff, 0x4b, 0x76, + 0xe4, 0xe6, 0x13, 0x21, 0x5a, 0xdb, 0x44, 0x56, 0xcb, 0x2b, 0xe4, 0x70, 0xb4, 0xd9, 0xe9, 0x68, + 0xbb, 0xd3, 0xd1, 0xc7, 0x4e, 0x47, 0x2f, 0x7b, 0x5d, 0xda, 0xee, 0x75, 0xe9, 0x6d, 0xaf, 0x4b, + 0x8f, 0xfd, 0xda, 0x0a, 0xd5, 0x94, 0x03, 0x60, 0xd1, 0x8f, 0x76, 0x32, 0x71, 0x17, 0xb1, 0xc6, + 0xa4, 0x2d, 0xce, 0x72, 0xf3, 0x1d, 0x00, 0x00, 0xff, 0xff, 0x42, 0xc1, 0x96, 0x79, 0xf8, 0x01, + 0x00, 0x00, } func (m *DepositRecord) Marshal() (dAtA []byte, err error) { @@ -183,9 +184,9 @@ func (m *DepositRecord) MarshalToSizedBuffer(dAtA []byte) (int, error) { } i-- dAtA[i] = 0x12 - if m.PairID != nil { + if m.PairId != nil { { - size, err := m.PairID.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.PairId.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -215,8 +216,8 @@ func (m *DepositRecord) Size() (n int) { } var l int _ = l - if m.PairID != nil { - l = m.PairID.Size() + if m.PairId != nil { + l = m.PairId.Size() n += 1 + l + sovDepositRecord(uint64(l)) } l = m.SharesOwned.Size() @@ -273,7 +274,7 @@ func (m *DepositRecord) Unmarshal(dAtA []byte) error { 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 PairId", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -300,10 +301,10 @@ func (m *DepositRecord) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.PairID == nil { - m.PairID = &PairID{} + if m.PairId == nil { + m.PairId = &PairID{} } - if err := m.PairID.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.PairId.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/x/dex/types/events.go b/x/dex/types/events.go index cfc0b6bf6..87f7ff571 100644 --- a/x/dex/types/events.go +++ b/x/dex/types/events.go @@ -192,7 +192,7 @@ func TickUpdateEvent( } func CreateTickUpdatePoolReserves(tick PoolReserves) sdk.Event { - tradePairID := tick.Key.TradePairID + tradePairID := tick.Key.TradePairId pairID := tradePairID.MustPairID() return TickUpdateEvent( pairID.Token0, @@ -205,7 +205,7 @@ func CreateTickUpdatePoolReserves(tick PoolReserves) sdk.Event { } func CreateTickUpdateLimitOrderTranche(tranche *LimitOrderTranche) sdk.Event { - tradePairID := tranche.Key.TradePairID + tradePairID := tranche.Key.TradePairId pairID := tradePairID.MustPairID() return TickUpdateEvent( pairID.Token0, diff --git a/x/dex/types/genesis.go b/x/dex/types/genesis.go index 645614e97..5a4fe9b10 100644 --- a/x/dex/types/genesis.go +++ b/x/dex/types/genesis.go @@ -60,13 +60,13 @@ func (gs GenesisState) Validate() error { poolMetadataIDMap := make(map[uint64]bool) poolMetadataCount := gs.GetPoolCount() for _, elem := range gs.PoolMetadataList { - if _, ok := poolMetadataIDMap[elem.ID]; ok { + if _, ok := poolMetadataIDMap[elem.Id]; ok { return fmt.Errorf("duplicated id for poolMetadata") } - if elem.ID >= poolMetadataCount { + if elem.Id >= poolMetadataCount { return fmt.Errorf("poolMetadata id should be lower or equal than the last id") } - poolMetadataIDMap[elem.ID] = true + poolMetadataIDMap[elem.Id] = true } // this line is used by starport scaffolding # genesis/types/validate diff --git a/x/dex/types/genesis.pb.go b/x/dex/types/genesis.pb.go index 49dff3899..60e2fe03d 100644 --- a/x/dex/types/genesis.pb.go +++ b/x/dex/types/genesis.pb.go @@ -26,11 +26,11 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // GenesisState defines the dex module's genesis state. type GenesisState struct { Params Params `protobuf:"bytes,1,opt,name=params,proto3" json:"params"` - TickLiquidityList []*TickLiquidity `protobuf:"bytes,2,rep,name=tickLiquidityList,proto3" json:"tickLiquidityList,omitempty"` - InactiveLimitOrderTrancheList []*LimitOrderTranche `protobuf:"bytes,3,rep,name=inactiveLimitOrderTrancheList,proto3" json:"inactiveLimitOrderTrancheList,omitempty"` - LimitOrderTrancheUserList []*LimitOrderTrancheUser `protobuf:"bytes,4,rep,name=limitOrderTrancheUserList,proto3" json:"limitOrderTrancheUserList,omitempty"` - PoolMetadataList []PoolMetadata `protobuf:"bytes,5,rep,name=poolMetadataList,proto3" json:"poolMetadataList"` - PoolCount uint64 `protobuf:"varint,6,opt,name=poolCount,proto3" json:"poolCount,omitempty"` + TickLiquidityList []*TickLiquidity `protobuf:"bytes,2,rep,name=tick_liquidity_list,json=tickLiquidityList,proto3" json:"tick_liquidity_list,omitempty"` + InactiveLimitOrderTrancheList []*LimitOrderTranche `protobuf:"bytes,3,rep,name=inactive_limit_order_tranche_list,json=inactiveLimitOrderTrancheList,proto3" json:"inactive_limit_order_tranche_list,omitempty"` + LimitOrderTrancheUserList []*LimitOrderTrancheUser `protobuf:"bytes,4,rep,name=limit_order_tranche_user_list,json=limitOrderTrancheUserList,proto3" json:"limit_order_tranche_user_list,omitempty"` + PoolMetadataList []PoolMetadata `protobuf:"bytes,5,rep,name=pool_metadata_list,json=poolMetadataList,proto3" json:"pool_metadata_list"` + PoolCount uint64 `protobuf:"varint,6,opt,name=pool_count,json=poolCount,proto3" json:"pool_count,omitempty"` } func (m *GenesisState) Reset() { *m = GenesisState{} } @@ -115,32 +115,33 @@ func init() { func init() { proto.RegisterFile("neutron/dex/genesis.proto", fileDescriptor_0c051a8a0d58cd8b) } var fileDescriptor_0c051a8a0d58cd8b = []byte{ - // 391 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0xcf, 0x4e, 0xea, 0x40, - 0x18, 0xc5, 0xdb, 0x0b, 0x97, 0xe4, 0x0e, 0x77, 0x71, 0x6f, 0x75, 0x51, 0x1a, 0x2d, 0x0d, 0x89, - 0x09, 0x21, 0xb1, 0x8d, 0xf8, 0x06, 0x68, 0xe2, 0x42, 0xfc, 0x13, 0xc4, 0x8d, 0x9b, 0x66, 0x68, - 0xc7, 0x32, 0xda, 0x76, 0x70, 0xfa, 0xd5, 0xc0, 0x5b, 0xf8, 0x58, 0x2c, 0x59, 0xba, 0x32, 0x06, - 0x5e, 0xc4, 0x74, 0x3a, 0xc4, 0x56, 0x22, 0xee, 0x26, 0xf3, 0xfd, 0xce, 0x39, 0x73, 0xbe, 0x0c, - 0x6a, 0xc4, 0x24, 0x05, 0xce, 0x62, 0xc7, 0x27, 0x53, 0x27, 0x20, 0x31, 0x49, 0x68, 0x62, 0x4f, - 0x38, 0x03, 0xa6, 0xd5, 0xe5, 0xc8, 0xf6, 0xc9, 0xd4, 0xd8, 0x0d, 0x58, 0xc0, 0xc4, 0xbd, 0x93, - 0x9d, 0x72, 0xc4, 0xd0, 0x8b, 0xea, 0x09, 0xe6, 0x38, 0x92, 0x62, 0xa3, 0x53, 0x9c, 0x84, 0x34, - 0xa2, 0xe0, 0x32, 0xee, 0x13, 0xee, 0x02, 0xc7, 0xb1, 0x37, 0x26, 0x6e, 0x9a, 0x10, 0x2e, 0xd9, - 0x83, 0x1f, 0x58, 0x89, 0x59, 0x45, 0x0c, 0xa8, 0xf7, 0xe8, 0x86, 0xf4, 0x29, 0xa5, 0x3e, 0x85, - 0x99, 0x24, 0x9a, 0xa5, 0xe7, 0x30, 0x16, 0xba, 0x11, 0x01, 0xec, 0x63, 0xc0, 0x39, 0xd0, 0x5a, - 0x54, 0xd0, 0xdf, 0xb3, 0xbc, 0xe4, 0x0d, 0x60, 0x20, 0xda, 0x11, 0xaa, 0xe5, 0xcf, 0xd6, 0x55, - 0x4b, 0x6d, 0xd7, 0xbb, 0x3b, 0x76, 0xa1, 0xb4, 0x7d, 0x2d, 0x46, 0xbd, 0xea, 0xfc, 0xad, 0xa9, - 0x0c, 0x24, 0xa8, 0x5d, 0xa2, 0xff, 0x59, 0x78, 0x7f, 0x9d, 0xdd, 0xa7, 0x09, 0xe8, 0xbf, 0xac, - 0x4a, 0xbb, 0xde, 0x35, 0x4a, 0xea, 0x61, 0x91, 0x12, 0x26, 0xea, 0x60, 0x53, 0xaa, 0x3d, 0xa0, - 0x7d, 0x1a, 0x63, 0x0f, 0xe8, 0x33, 0xe9, 0x67, 0xdd, 0xaf, 0xb2, 0xea, 0xc3, 0xbc, 0xb9, 0xf0, - 0xae, 0x08, 0x6f, 0xb3, 0xe4, 0xbd, 0x41, 0x4a, 0xff, 0xed, 0x56, 0xda, 0x3d, 0x6a, 0x84, 0x5f, - 0x07, 0xb7, 0x09, 0xe1, 0x22, 0xa7, 0x2a, 0x72, 0x5a, 0xdb, 0x73, 0x32, 0x5a, 0x66, 0x7d, 0x6f, - 0xa5, 0x9d, 0xa3, 0x7f, 0xd9, 0xfa, 0x2f, 0xe4, 0xf6, 0x85, 0xfd, 0x6f, 0x61, 0xdf, 0x28, 0x2f, - 0xb8, 0x00, 0xc9, 0x35, 0x6f, 0x08, 0xb5, 0x3d, 0xf4, 0x27, 0xbb, 0x3b, 0x61, 0x69, 0x0c, 0x7a, - 0xcd, 0x52, 0xdb, 0xd5, 0xc1, 0xe7, 0x45, 0xef, 0x74, 0xbe, 0x34, 0xd5, 0xc5, 0xd2, 0x54, 0xdf, - 0x97, 0xa6, 0xfa, 0xb2, 0x32, 0x95, 0xc5, 0xca, 0x54, 0x5e, 0x57, 0xa6, 0x72, 0xd7, 0x09, 0x28, - 0x8c, 0xd3, 0x91, 0xed, 0xb1, 0xc8, 0x91, 0xa1, 0x87, 0x8c, 0x07, 0xeb, 0xb3, 0x33, 0xcd, 0x3f, - 0xd2, 0x6c, 0x42, 0x92, 0x51, 0x4d, 0xfc, 0x8f, 0xe3, 0x8f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x29, - 0x44, 0x46, 0xac, 0x0f, 0x03, 0x00, 0x00, + // 405 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0xc1, 0x6e, 0xda, 0x30, + 0x18, 0xc7, 0x93, 0xc1, 0x90, 0x66, 0x76, 0xd8, 0xc2, 0x0e, 0x21, 0x12, 0x21, 0x43, 0x9a, 0x84, + 0x90, 0x96, 0x68, 0xec, 0x0d, 0xd8, 0xa4, 0x5d, 0x40, 0x43, 0x8c, 0x5d, 0x76, 0x89, 0x4c, 0x62, + 0x05, 0x8f, 0x24, 0x4e, 0x9d, 0x2f, 0x15, 0xbc, 0x45, 0x1f, 0x8b, 0x23, 0xc7, 0x5e, 0x5a, 0x55, + 0xf0, 0x22, 0x55, 0x6c, 0x23, 0x25, 0x2a, 0x6d, 0x6f, 0xd6, 0xf7, 0xfd, 0xfc, 0xff, 0xd9, 0x9f, + 0x8d, 0xba, 0x29, 0x29, 0x80, 0xb3, 0xd4, 0x0b, 0xc9, 0xd6, 0x8b, 0x48, 0x4a, 0x72, 0x9a, 0xbb, + 0x19, 0x67, 0xc0, 0x8c, 0xb6, 0x6a, 0xb9, 0x21, 0xd9, 0x5a, 0x9f, 0x22, 0x16, 0x31, 0x51, 0xf7, + 0xca, 0x95, 0x44, 0x2c, 0xb3, 0xba, 0x3b, 0xc3, 0x1c, 0x27, 0x6a, 0xb3, 0x35, 0xaa, 0x76, 0x62, + 0x9a, 0x50, 0xf0, 0x19, 0x0f, 0x09, 0xf7, 0x81, 0xe3, 0x34, 0x58, 0x13, 0xbf, 0xc8, 0x09, 0x57, + 0xec, 0x97, 0x57, 0x58, 0x85, 0x39, 0x55, 0x0c, 0x68, 0xb0, 0xf1, 0x63, 0x7a, 0x55, 0xd0, 0x90, + 0xc2, 0x4e, 0x11, 0xfd, 0xda, 0x71, 0x18, 0x8b, 0xfd, 0x84, 0x00, 0x0e, 0x31, 0x60, 0x09, 0x0c, + 0xee, 0x1a, 0xe8, 0xfd, 0x2f, 0x79, 0xc9, 0x3f, 0x80, 0x81, 0x18, 0xdf, 0x50, 0x4b, 0x1e, 0xdb, + 0xd4, 0x1d, 0x7d, 0xd8, 0x1e, 0x77, 0xdc, 0xca, 0xa5, 0xdd, 0xb9, 0x68, 0x4d, 0x9a, 0xfb, 0xfb, + 0xbe, 0xb6, 0x50, 0xa0, 0x31, 0x47, 0x9d, 0xba, 0xdc, 0x8f, 0x69, 0x0e, 0xe6, 0x1b, 0xa7, 0x31, + 0x6c, 0x8f, 0xad, 0xda, 0xfe, 0x25, 0x0d, 0x36, 0xd3, 0x33, 0x26, 0x62, 0xf4, 0xc5, 0x47, 0xa8, + 0x16, 0xa7, 0x34, 0x07, 0x23, 0x45, 0x9f, 0x69, 0x8a, 0x03, 0xa0, 0xd7, 0xc4, 0xbf, 0x34, 0x2a, + 0x91, 0xdf, 0x10, 0xf9, 0x76, 0x2d, 0x7f, 0x5a, 0xc2, 0xbf, 0x4b, 0x76, 0x29, 0x51, 0xe5, 0xe8, + 0x9d, 0xe3, 0x9e, 0x00, 0xc2, 0xf7, 0x1f, 0xf5, 0x9e, 0x7b, 0x11, 0xe9, 0x6a, 0x0a, 0xd7, 0xe0, + 0x65, 0xd7, 0xdf, 0x9c, 0x70, 0xe5, 0xeb, 0xc6, 0x97, 0x9a, 0xc2, 0x35, 0x43, 0x46, 0xed, 0x21, + 0xa4, 0xe0, 0xad, 0x10, 0x74, 0xeb, 0xc3, 0x66, 0x2c, 0x9e, 0x29, 0x4a, 0x8d, 0xfc, 0x43, 0x56, + 0xa9, 0x89, 0xb8, 0x1e, 0x42, 0x22, 0x2e, 0x60, 0x45, 0x0a, 0x66, 0xcb, 0xd1, 0x87, 0xcd, 0xc5, + 0xbb, 0xb2, 0xf2, 0xa3, 0x2c, 0x4c, 0x7e, 0xee, 0x8f, 0xb6, 0x7e, 0x38, 0xda, 0xfa, 0xc3, 0xd1, + 0xd6, 0x6f, 0x4e, 0xb6, 0x76, 0x38, 0xd9, 0xda, 0xed, 0xc9, 0xd6, 0xfe, 0x8d, 0x22, 0x0a, 0xeb, + 0x62, 0xe5, 0x06, 0x2c, 0xf1, 0x94, 0xf5, 0x2b, 0xe3, 0xd1, 0x79, 0xed, 0x6d, 0xe5, 0xaf, 0xda, + 0x65, 0x24, 0x5f, 0xb5, 0xc4, 0x67, 0xf9, 0xfe, 0x18, 0x00, 0x00, 0xff, 0xff, 0x62, 0xa7, 0x84, + 0x86, 0x1c, 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 4a86c25d8..0aad879b8 100644 --- a/x/dex/types/genesis_test.go +++ b/x/dex/types/genesis_test.go @@ -3,8 +3,9 @@ package types_test import ( "testing" - "github.com/neutron-org/neutron/x/dex/types" "github.com/stretchr/testify/require" + + "github.com/neutron-org/neutron/x/dex/types" ) func TestGenesisState_Validate(t *testing.T) { @@ -25,12 +26,12 @@ func TestGenesisState_Validate(t *testing.T) { { TrancheKey: "0", Address: "0", - TradePairID: &types.TradePairID{MakerDenom: "TokenA", TakerDenom: "TokenB"}, + TradePairId: &types.TradePairID{MakerDenom: "TokenA", TakerDenom: "TokenB"}, }, { TrancheKey: "1", Address: "1", - TradePairID: &types.TradePairID{MakerDenom: "TokenA", TakerDenom: "TokenB"}, + TradePairId: &types.TradePairID{MakerDenom: "TokenA", TakerDenom: "TokenB"}, }, }, TickLiquidityList: []*types.TickLiquidity{ @@ -38,7 +39,7 @@ func TestGenesisState_Validate(t *testing.T) { Liquidity: &types.TickLiquidity_LimitOrderTranche{ LimitOrderTranche: &types.LimitOrderTranche{ Key: &types.LimitOrderTrancheKey{ - TradePairID: &types.TradePairID{MakerDenom: "TokenA", TakerDenom: "TokenB"}, + TradePairId: &types.TradePairID{MakerDenom: "TokenA", TakerDenom: "TokenB"}, TickIndexTakerToMaker: 0, TrancheKey: "0", }, @@ -49,7 +50,7 @@ func TestGenesisState_Validate(t *testing.T) { Liquidity: &types.TickLiquidity_PoolReserves{ PoolReserves: &types.PoolReserves{ Key: &types.PoolReservesKey{ - TradePairID: &types.TradePairID{MakerDenom: "TokenA", TakerDenom: "TokenB"}, + TradePairId: &types.TradePairID{MakerDenom: "TokenA", TakerDenom: "TokenB"}, TickIndexTakerToMaker: 0, Fee: 0, }, @@ -60,14 +61,14 @@ func TestGenesisState_Validate(t *testing.T) { InactiveLimitOrderTrancheList: []*types.LimitOrderTranche{ { Key: &types.LimitOrderTrancheKey{ - TradePairID: &types.TradePairID{MakerDenom: "TokenA", TakerDenom: "TokenB"}, + TradePairId: &types.TradePairID{MakerDenom: "TokenA", TakerDenom: "TokenB"}, TickIndexTakerToMaker: 0, TrancheKey: "0", }, }, { Key: &types.LimitOrderTrancheKey{ - TradePairID: &types.TradePairID{TakerDenom: "TokenA", MakerDenom: "TokenB"}, + TradePairId: &types.TradePairID{TakerDenom: "TokenA", MakerDenom: "TokenB"}, TickIndexTakerToMaker: 1, TrancheKey: "1", }, @@ -75,10 +76,10 @@ func TestGenesisState_Validate(t *testing.T) { }, PoolMetadataList: []types.PoolMetadata{ { - ID: 0, + Id: 0, }, { - ID: 1, + Id: 1, }, }, PoolCount: 2, @@ -93,12 +94,12 @@ func TestGenesisState_Validate(t *testing.T) { { TrancheKey: "0", Address: "0", - TradePairID: &types.TradePairID{MakerDenom: "TokenA", TakerDenom: "TokenB"}, + TradePairId: &types.TradePairID{MakerDenom: "TokenA", TakerDenom: "TokenB"}, }, { TrancheKey: "0", Address: "0", - TradePairID: &types.TradePairID{MakerDenom: "TokenA", TakerDenom: "TokenB"}, + TradePairId: &types.TradePairID{MakerDenom: "TokenA", TakerDenom: "TokenB"}, }, }, }, @@ -112,7 +113,7 @@ func TestGenesisState_Validate(t *testing.T) { Liquidity: &types.TickLiquidity_LimitOrderTranche{ LimitOrderTranche: &types.LimitOrderTranche{ Key: &types.LimitOrderTrancheKey{ - TradePairID: &types.TradePairID{MakerDenom: "TokenA", TakerDenom: "TokenB"}, + TradePairId: &types.TradePairID{MakerDenom: "TokenA", TakerDenom: "TokenB"}, TickIndexTakerToMaker: 0, TrancheKey: "0", }, @@ -123,7 +124,7 @@ func TestGenesisState_Validate(t *testing.T) { Liquidity: &types.TickLiquidity_LimitOrderTranche{ LimitOrderTranche: &types.LimitOrderTranche{ Key: &types.LimitOrderTrancheKey{ - TradePairID: &types.TradePairID{MakerDenom: "TokenA", TakerDenom: "TokenB"}, + TradePairId: &types.TradePairID{MakerDenom: "TokenA", TakerDenom: "TokenB"}, TickIndexTakerToMaker: 0, TrancheKey: "0", }, @@ -140,14 +141,14 @@ func TestGenesisState_Validate(t *testing.T) { InactiveLimitOrderTrancheList: []*types.LimitOrderTranche{ { Key: &types.LimitOrderTrancheKey{ - TradePairID: &types.TradePairID{MakerDenom: "TokenA", TakerDenom: "TokenB"}, + TradePairId: &types.TradePairID{MakerDenom: "TokenA", TakerDenom: "TokenB"}, TickIndexTakerToMaker: 0, TrancheKey: "0", }, }, { Key: &types.LimitOrderTrancheKey{ - TradePairID: &types.TradePairID{MakerDenom: "TokenA", TakerDenom: "TokenB"}, + TradePairId: &types.TradePairID{MakerDenom: "TokenA", TakerDenom: "TokenB"}, TickIndexTakerToMaker: 0, TrancheKey: "0", }, @@ -161,10 +162,10 @@ func TestGenesisState_Validate(t *testing.T) { genState: &types.GenesisState{ PoolMetadataList: []types.PoolMetadata{ { - ID: 0, + Id: 0, }, { - ID: 0, + Id: 0, }, }, }, @@ -175,7 +176,7 @@ func TestGenesisState_Validate(t *testing.T) { genState: &types.GenesisState{ PoolMetadataList: []types.PoolMetadata{ { - ID: 1, + Id: 1, }, }, PoolCount: 0, diff --git a/x/dex/types/limit_order_expiration.pb.go b/x/dex/types/limit_order_expiration.pb.go index 0e9664f02..1de9e33a6 100644 --- a/x/dex/types/limit_order_expiration.pb.go +++ b/x/dex/types/limit_order_expiration.pb.go @@ -29,8 +29,8 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type LimitOrderExpiration struct { // see limitOrderTranche.proto for details on goodTilDate - ExpirationTime time.Time `protobuf:"bytes,1,opt,name=expirationTime,proto3,stdtime" json:"expirationTime"` - TrancheRef []byte `protobuf:"bytes,2,opt,name=trancheRef,proto3" json:"trancheRef,omitempty"` + ExpirationTime time.Time `protobuf:"bytes,1,opt,name=expiration_time,json=expirationTime,proto3,stdtime" json:"expiration_time"` + TrancheRef []byte `protobuf:"bytes,2,opt,name=tranche_ref,json=trancheRef,proto3" json:"tranche_ref,omitempty"` } func (m *LimitOrderExpiration) Reset() { *m = LimitOrderExpiration{} } @@ -89,23 +89,24 @@ func init() { } var fileDescriptor_61264397cad6ae82 = []byte{ - // 255 bytes of a gzipped FileDescriptorProto + // 262 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0xc8, 0x4b, 0x2d, 0x2d, 0x29, 0xca, 0xcf, 0xd3, 0x4f, 0x49, 0xad, 0xd0, 0xcf, 0xc9, 0xcc, 0xcd, 0x2c, 0x89, 0xcf, 0x2f, 0x4a, 0x49, 0x2d, 0x8a, 0x4f, 0xad, 0x28, 0xc8, 0x2c, 0x4a, 0x2c, 0xc9, 0xcc, 0xcf, 0xd3, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x86, 0xaa, 0xd4, 0x4b, 0x49, 0xad, 0x90, 0x92, 0x4f, 0xcf, 0xcf, 0x4f, 0xcf, 0x49, 0xd5, 0x07, 0x4b, 0x25, 0x95, 0xa6, 0xe9, 0x97, 0x64, 0xe6, 0xa6, 0x16, 0x97, 0x24, 0xe6, 0x16, 0x40, 0x54, 0x4b, 0x89, 0xa4, 0xe7, 0xa7, 0xe7, 0x83, 0x99, 0xfa, 0x20, - 0x16, 0x44, 0x54, 0xa9, 0x85, 0x91, 0x4b, 0xc4, 0x07, 0x64, 0x89, 0x3f, 0xc8, 0x0e, 0x57, 0xb8, - 0x15, 0x42, 0x3e, 0x5c, 0x7c, 0x08, 0x0b, 0x43, 0x32, 0x73, 0x53, 0x25, 0x18, 0x15, 0x18, 0x35, - 0xb8, 0x8d, 0xa4, 0xf4, 0x20, 0x16, 0xe9, 0xc1, 0x2c, 0xd2, 0x0b, 0x81, 0x59, 0xe4, 0xc4, 0x71, - 0xe2, 0x9e, 0x3c, 0xc3, 0x84, 0xfb, 0xf2, 0x8c, 0x41, 0x68, 0x7a, 0x85, 0xe4, 0xb8, 0xb8, 0x4a, - 0x8a, 0x12, 0xf3, 0x92, 0x33, 0x52, 0x83, 0x52, 0xd3, 0x24, 0x98, 0x14, 0x18, 0x35, 0x78, 0x82, - 0x90, 0x44, 0x9c, 0x5c, 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, 0x2b, - 0x3d, 0xb3, 0x24, 0xa3, 0x34, 0x49, 0x2f, 0x39, 0x3f, 0x57, 0x1f, 0xea, 0x5f, 0xdd, 0xfc, 0xa2, - 0x74, 0x18, 0x5b, 0xbf, 0x02, 0x1c, 0x4e, 0x25, 0x95, 0x05, 0xa9, 0xc5, 0x49, 0x6c, 0x60, 0x37, - 0x19, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x1a, 0xd9, 0xbe, 0xa6, 0x43, 0x01, 0x00, 0x00, + 0x16, 0x44, 0x54, 0xa9, 0x8d, 0x91, 0x4b, 0xc4, 0x07, 0x64, 0x89, 0x3f, 0xc8, 0x0e, 0x57, 0xb8, + 0x15, 0x42, 0xbe, 0x5c, 0xfc, 0x08, 0x0b, 0xe3, 0x41, 0x86, 0x49, 0x30, 0x2a, 0x30, 0x6a, 0x70, + 0x1b, 0x49, 0xe9, 0x41, 0x6c, 0xd2, 0x83, 0xd9, 0xa4, 0x17, 0x02, 0xb3, 0xc9, 0x89, 0xe3, 0xc4, + 0x3d, 0x79, 0x86, 0x09, 0xf7, 0xe5, 0x19, 0x83, 0xf8, 0x10, 0x9a, 0x41, 0xd2, 0x42, 0xf2, 0x5c, + 0xdc, 0x25, 0x45, 0x89, 0x79, 0xc9, 0x19, 0xa9, 0xf1, 0x45, 0xa9, 0x69, 0x12, 0x4c, 0x0a, 0x8c, + 0x1a, 0x3c, 0x41, 0x5c, 0x50, 0xa1, 0xa0, 0xd4, 0x34, 0x27, 0x97, 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, 0x4a, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, + 0xd5, 0x87, 0xfa, 0x58, 0x37, 0xbf, 0x28, 0x1d, 0xc6, 0xd6, 0xaf, 0x00, 0x87, 0x54, 0x49, 0x65, + 0x41, 0x6a, 0x71, 0x12, 0x1b, 0xd8, 0x51, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0xeb, 0x7a, + 0x71, 0x93, 0x45, 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 6e9a7dc74..26d78e0ab 100644 --- a/x/dex/types/limit_order_tranche.go +++ b/x/dex/types/limit_order_tranche.go @@ -3,6 +3,7 @@ package types import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" + math_utils "github.com/neutron-org/neutron/utils/math" "github.com/neutron-org/neutron/x/dex/utils" ) @@ -27,7 +28,7 @@ func NewLimitOrderTranche( } return &LimitOrderTranche{ Key: &LimitOrderTrancheKey{ - TradePairID: tradePairID, + TradePairId: tradePairID, TrancheKey: trancheKey, TickIndexTakerToMaker: tickIndex, }, diff --git a/x/dex/types/limit_order_tranche.pb.go b/x/dex/types/limit_order_tranche.pb.go index 272946670..054bb1169 100644 --- a/x/dex/types/limit_order_tranche.pb.go +++ b/x/dex/types/limit_order_tranche.pb.go @@ -30,9 +30,9 @@ var _ = time.Kitchen const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type LimitOrderTrancheKey struct { - TradePairID *TradePairID `protobuf:"bytes,1,opt,name=tradePairID,proto3" json:"tradePairID,omitempty"` - TickIndexTakerToMaker int64 `protobuf:"varint,2,opt,name=tickIndexTakerToMaker,proto3" json:"tickIndexTakerToMaker,omitempty"` - TrancheKey string `protobuf:"bytes,3,opt,name=trancheKey,proto3" json:"trancheKey,omitempty"` + TradePairId *TradePairID `protobuf:"bytes,1,opt,name=trade_pair_id,json=tradePairId,proto3" json:"trade_pair_id,omitempty"` + TickIndexTakerToMaker int64 `protobuf:"varint,2,opt,name=tick_index_taker_to_maker,json=tickIndexTakerToMaker,proto3" json:"tick_index_taker_to_maker,omitempty"` + TrancheKey string `protobuf:"bytes,3,opt,name=tranche_key,json=trancheKey,proto3" json:"tranche_key,omitempty"` } func (m *LimitOrderTrancheKey) Reset() { *m = LimitOrderTrancheKey{} } @@ -68,9 +68,9 @@ func (m *LimitOrderTrancheKey) XXX_DiscardUnknown() { var xxx_messageInfo_LimitOrderTrancheKey proto.InternalMessageInfo -func (m *LimitOrderTrancheKey) GetTradePairID() *TradePairID { +func (m *LimitOrderTrancheKey) GetTradePairId() *TradePairID { if m != nil { - return m.TradePairID + return m.TradePairId } return nil } @@ -91,15 +91,15 @@ func (m *LimitOrderTrancheKey) GetTrancheKey() string { type LimitOrderTranche struct { Key *LimitOrderTrancheKey `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"` - ReservesMakerDenom github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,opt,name=reservesMakerDenom,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"reservesMakerDenom" yaml:"reservesMakerDenom"` - ReservesTakerDenom github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,3,opt,name=reservesTakerDenom,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"reservesTakerDenom" yaml:"reservesTakerDenom"` - TotalMakerDenom github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,4,opt,name=totalMakerDenom,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"totalTokenIn" yaml:"totalMakerDenom"` - TotalTakerDenom github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,5,opt,name=totalTakerDenom,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"totalTakerDenom" yaml:"totalTakerDenom"` + ReservesMakerDenom github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,opt,name=reserves_maker_denom,json=reservesMakerDenom,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"reservesMakerDenom" yaml:"reservesMakerDenom"` + ReservesTakerDenom github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,3,opt,name=reserves_taker_denom,json=reservesTakerDenom,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"reservesTakerDenom" yaml:"reservesTakerDenom"` + TotalMakerDenom github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,4,opt,name=total_maker_denom,json=totalMakerDenom,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"totalTokenIn" yaml:"totalMakerDenom"` + TotalTakerDenom github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,5,opt,name=total_taker_denom,json=totalTakerDenom,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"totalTakerDenom" yaml:"totalTakerDenom"` // JIT orders also use goodTilDate to handle deletion but represent a special case // All JIT orders have a goodTilDate of 0 and an exception is made to still 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=expirationTime,proto3,stdtime" json:"expirationTime,omitempty"` - PriceTakerToMaker github_com_neutron_org_neutron_utils_math.PrecDec `protobuf:"bytes,7,opt,name=priceTakerToMaker,proto3,customtype=github.com/neutron-org/neutron/utils/math.PrecDec" json:"priceTakerToMaker" yaml:"priceTakerToMaker"` + ExpirationTime *time.Time `protobuf:"bytes,6,opt,name=expiration_time,json=expirationTime,proto3,stdtime" json:"expiration_time,omitempty"` + PriceTakerToMaker github_com_neutron_org_neutron_utils_math.PrecDec `protobuf:"bytes,7,opt,name=price_taker_to_maker,json=priceTakerToMaker,proto3,customtype=github.com/neutron-org/neutron/utils/math.PrecDec" json:"priceTakerToMaker" yaml:"priceTakerToMaker"` } func (m *LimitOrderTranche) Reset() { *m = LimitOrderTranche{} } @@ -159,42 +159,44 @@ func init() { } var fileDescriptor_8c2ded67c80756d1 = []byte{ - // 557 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x94, 0x41, 0x8b, 0xd3, 0x40, - 0x14, 0xc7, 0x3b, 0x56, 0xab, 0x3b, 0x15, 0x65, 0xc3, 0x2a, 0xd9, 0x1e, 0x92, 0x1a, 0x50, 0x8a, - 0xb0, 0x09, 0xba, 0x9e, 0xf6, 0x58, 0x7a, 0x29, 0xae, 0xb8, 0x84, 0x1c, 0x44, 0x0f, 0x65, 0x9a, - 0x3c, 0xd3, 0xb1, 0x4d, 0x26, 0x4c, 0xa6, 0xd2, 0x5e, 0x05, 0xef, 0xeb, 0xcd, 0x8f, 0xe0, 0x47, - 0xe9, 0x71, 0x8f, 0xe2, 0x21, 0x4a, 0x0b, 0x1e, 0xf6, 0xd8, 0x4f, 0x20, 0x99, 0xa4, 0x36, 0x6d, - 0x8a, 0xb2, 0xec, 0x29, 0xc3, 0xbc, 0xff, 0xfb, 0xbf, 0xdf, 0x7b, 0xcc, 0x0b, 0x7e, 0x1c, 0xc2, - 0x58, 0x70, 0x16, 0x5a, 0x1e, 0x4c, 0xac, 0x11, 0x0d, 0xa8, 0xe8, 0x31, 0xee, 0x01, 0xef, 0x09, - 0x4e, 0x42, 0x77, 0x00, 0x66, 0xc4, 0x99, 0x60, 0x4a, 0x3d, 0x97, 0x99, 0x1e, 0x4c, 0x1a, 0xba, - 0xcf, 0x98, 0x3f, 0x02, 0x4b, 0x86, 0xfa, 0xe3, 0xf7, 0x96, 0xa0, 0x01, 0xc4, 0x82, 0x04, 0x51, - 0xa6, 0x6e, 0xe8, 0x45, 0x53, 0xc1, 0x89, 0x07, 0xbd, 0x88, 0x50, 0xde, 0xa3, 0x5e, 0x2e, 0x38, - 0xf0, 0x99, 0xcf, 0xe4, 0xd1, 0x4a, 0x4f, 0xf9, 0xed, 0x61, 0x31, 0x6d, 0x23, 0xc1, 0xf8, 0x86, - 0xf0, 0xc1, 0x69, 0x4a, 0xf7, 0x3a, 0x85, 0x73, 0x32, 0xb6, 0x97, 0x30, 0x55, 0x4e, 0x70, 0x5d, - 0x16, 0x38, 0x23, 0x94, 0x77, 0x3b, 0x2a, 0x6a, 0xa2, 0x56, 0xfd, 0xb9, 0x6a, 0x16, 0x70, 0x4d, - 0x67, 0x1d, 0xb7, 0x8b, 0x62, 0xe5, 0x05, 0x7e, 0x20, 0xa8, 0x3b, 0xec, 0x86, 0x1e, 0x4c, 0x1c, - 0x32, 0x04, 0xee, 0xb0, 0x57, 0xe9, 0x47, 0xbd, 0xd1, 0x44, 0xad, 0xaa, 0xbd, 0x3b, 0xa8, 0x68, - 0x18, 0x8b, 0xbf, 0xf5, 0xd5, 0x6a, 0x13, 0xb5, 0xf6, 0xec, 0xc2, 0x8d, 0xf1, 0xbb, 0x86, 0xf7, - 0x4b, 0xa8, 0xca, 0x31, 0xae, 0x0e, 0x61, 0x9a, 0xf3, 0x3d, 0xda, 0xe0, 0xdb, 0xd5, 0x97, 0x9d, - 0xaa, 0x95, 0x2f, 0x08, 0x2b, 0x1c, 0x62, 0xe0, 0x1f, 0x21, 0x96, 0xc5, 0x3b, 0x10, 0xb2, 0x40, - 0xe2, 0xed, 0xb5, 0xc9, 0x2c, 0xd1, 0x2b, 0x3f, 0x12, 0xfd, 0x89, 0x4f, 0xc5, 0x60, 0xdc, 0x37, - 0x5d, 0x16, 0x58, 0x2e, 0x8b, 0x03, 0x16, 0xe7, 0x9f, 0xa3, 0xd8, 0x1b, 0x5a, 0x62, 0x1a, 0x41, - 0x6c, 0x76, 0x43, 0x71, 0x99, 0xe8, 0x3b, 0xbc, 0x96, 0x89, 0x7e, 0x38, 0x25, 0xc1, 0xe8, 0xc4, - 0x28, 0xc7, 0x0c, 0x7b, 0x47, 0xc2, 0x06, 0x93, 0xb3, 0x66, 0xaa, 0x5e, 0x97, 0xc9, 0xf9, 0x07, - 0x93, 0xb3, 0x8b, 0x69, 0x7d, 0xa9, 0x7c, 0x42, 0xf8, 0xbe, 0x60, 0x82, 0x8c, 0x0a, 0x43, 0xba, - 0x29, 0x81, 0xde, 0x5c, 0x19, 0xe8, 0xae, 0x34, 0x72, 0xd8, 0x10, 0xc2, 0x6e, 0xb8, 0x4c, 0xf4, - 0x87, 0x19, 0xca, 0x96, 0xbd, 0x61, 0x6f, 0x17, 0x54, 0x3e, 0xaf, 0x20, 0x0a, 0x53, 0xb9, 0x25, - 0x21, 0xde, 0x5d, 0x19, 0x62, 0xdb, 0x68, 0x8b, 0xc3, 0x29, 0x71, 0x14, 0x86, 0x71, 0x8a, 0xef, - 0xc1, 0x24, 0xa2, 0x9c, 0x08, 0xca, 0x42, 0x87, 0x06, 0xa0, 0xd6, 0xe4, 0xa3, 0x6b, 0x98, 0xd9, - 0xda, 0x9a, 0xab, 0xb5, 0x35, 0x9d, 0xd5, 0xda, 0xb6, 0xef, 0xcc, 0x12, 0x1d, 0x9d, 0xff, 0xd4, - 0x91, 0xbd, 0x95, 0xab, 0x7c, 0x45, 0x78, 0x3f, 0xe2, 0xd4, 0x85, 0x8d, 0x05, 0xb9, 0x2d, 0xfb, - 0xfa, 0x90, 0xf7, 0xf5, 0xac, 0xd0, 0x57, 0xfe, 0xb0, 0x8f, 0x18, 0xf7, 0x57, 0x67, 0x6b, 0x2c, - 0xe8, 0x28, 0xb6, 0x02, 0x22, 0x06, 0xe6, 0x19, 0x07, 0xb7, 0x03, 0xee, 0x65, 0xa2, 0x97, 0x5d, - 0x97, 0x89, 0xae, 0x66, 0x4d, 0x96, 0x42, 0x86, 0x5d, 0x96, 0xb7, 0x3b, 0xb3, 0xb9, 0x86, 0x2e, - 0xe6, 0x1a, 0xfa, 0x35, 0xd7, 0xd0, 0xf9, 0x42, 0xab, 0x5c, 0x2c, 0xb4, 0xca, 0xf7, 0x85, 0x56, - 0x79, 0xfb, 0xf4, 0x3f, 0x40, 0x93, 0xec, 0xc7, 0x94, 0x0e, 0xbc, 0x5f, 0x93, 0xe3, 0x38, 0xfe, - 0x13, 0x00, 0x00, 0xff, 0xff, 0x2a, 0xca, 0x7c, 0xe1, 0x09, 0x05, 0x00, 0x00, + // 591 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x94, 0xc1, 0x8b, 0xd3, 0x4e, + 0x14, 0xc7, 0x3b, 0xbf, 0xfe, 0x5c, 0xdd, 0xa9, 0xba, 0x6c, 0xa8, 0x92, 0xf6, 0x90, 0xa9, 0x05, + 0xa5, 0x08, 0x9b, 0xa0, 0x7b, 0x11, 0xf1, 0x54, 0x7a, 0x29, 0xba, 0xb8, 0x84, 0x1c, 0x44, 0x0f, + 0x61, 0x9a, 0x8c, 0xe9, 0xd8, 0x26, 0x13, 0x26, 0x53, 0x69, 0xef, 0x82, 0xd7, 0x05, 0x8f, 0xfe, + 0x11, 0xfe, 0x1b, 0x3d, 0xee, 0x51, 0x3c, 0x44, 0x69, 0x6f, 0x7b, 0xec, 0x5f, 0x20, 0x33, 0x49, + 0xbb, 0xc9, 0xb6, 0x28, 0x8b, 0xa7, 0xbc, 0xbe, 0xf7, 0x7d, 0xaf, 0x9f, 0xf7, 0x25, 0x2f, 0xf0, + 0x61, 0x44, 0x26, 0x82, 0xb3, 0xc8, 0xf2, 0xc9, 0xd4, 0x1a, 0xd3, 0x90, 0x0a, 0x97, 0x71, 0x9f, + 0x70, 0x57, 0x70, 0x1c, 0x79, 0x43, 0x62, 0xc6, 0x9c, 0x09, 0xa6, 0xd5, 0x72, 0x99, 0xe9, 0x93, + 0x69, 0x13, 0x05, 0x8c, 0x05, 0x63, 0x62, 0xa9, 0xd2, 0x60, 0xf2, 0xde, 0x12, 0x34, 0x24, 0x89, + 0xc0, 0x61, 0x9c, 0xa9, 0x9b, 0xa8, 0x38, 0x54, 0x70, 0xec, 0x13, 0x37, 0xc6, 0x94, 0xbb, 0xd4, + 0xcf, 0x05, 0xf5, 0x80, 0x05, 0x4c, 0x85, 0x96, 0x8c, 0xf2, 0x6c, 0xa3, 0xd8, 0x56, 0x6a, 0x68, + 0x7f, 0x03, 0xb0, 0xfe, 0x4a, 0xd2, 0xbd, 0x96, 0x70, 0x4e, 0xc6, 0xf6, 0x92, 0xcc, 0xb4, 0x17, + 0xf0, 0x4e, 0xe9, 0x0f, 0x74, 0xd0, 0x02, 0x9d, 0xda, 0x53, 0xdd, 0x2c, 0x00, 0x9b, 0x8e, 0x54, + 0x9c, 0x62, 0xca, 0xfb, 0x3d, 0xbb, 0x26, 0x36, 0x3f, 0x7c, 0xed, 0x19, 0x6c, 0x08, 0xea, 0x8d, + 0x5c, 0x1a, 0xf9, 0x64, 0xea, 0x0a, 0x3c, 0x92, 0x8b, 0x33, 0x37, 0x94, 0x81, 0xfe, 0x5f, 0x0b, + 0x74, 0xaa, 0xf6, 0x3d, 0x29, 0xe8, 0xcb, 0xba, 0x23, 0xb3, 0x0e, 0x3b, 0x91, 0x0f, 0x0d, 0xc1, + 0x5a, 0xee, 0x90, 0x3b, 0x22, 0x33, 0xbd, 0xda, 0x02, 0x9d, 0x7d, 0x1b, 0x8a, 0x0d, 0x58, 0x7b, + 0xb5, 0x07, 0x0f, 0xb7, 0x88, 0xb5, 0x63, 0x58, 0x95, 0xf2, 0x0c, 0xf2, 0x41, 0x09, 0x72, 0xd7, + 0x7a, 0xb6, 0x54, 0x6b, 0x5f, 0x00, 0xac, 0x73, 0x92, 0x10, 0xfe, 0x91, 0x24, 0x19, 0x9b, 0xeb, + 0x93, 0x88, 0x85, 0x8a, 0x70, 0xbf, 0x8b, 0xe7, 0x29, 0xaa, 0xfc, 0x48, 0xd1, 0xa3, 0x80, 0x8a, + 0xe1, 0x64, 0x60, 0x7a, 0x2c, 0xb4, 0x3c, 0x96, 0x84, 0x2c, 0xc9, 0x1f, 0x47, 0x89, 0x3f, 0xb2, + 0xc4, 0x2c, 0x26, 0x89, 0xd9, 0x8f, 0xc4, 0x45, 0x8a, 0xb4, 0xf5, 0x34, 0xb5, 0x4b, 0x4f, 0xce, + 0x5a, 0xa5, 0xa8, 0x31, 0xc3, 0xe1, 0xf8, 0x79, 0x7b, 0xbb, 0xd6, 0xb6, 0x77, 0x34, 0x94, 0xa9, + 0x44, 0x81, 0xaa, 0xfa, 0xaf, 0x54, 0xce, 0x1f, 0xa8, 0x9c, 0x5d, 0x54, 0x97, 0x49, 0xed, 0x13, + 0x80, 0x87, 0x82, 0x09, 0x3c, 0x2e, 0x19, 0xf5, 0xbf, 0x42, 0x7a, 0x73, 0x6d, 0xa4, 0xdb, 0x6a, + 0x94, 0xc3, 0x46, 0x24, 0xea, 0x47, 0xab, 0x14, 0xdd, 0xcf, 0x60, 0x54, 0xb6, 0xe8, 0xcf, 0xc1, + 0x95, 0x8c, 0xf6, 0x79, 0x83, 0x51, 0x74, 0xe6, 0x86, 0xc2, 0x78, 0x77, 0x6d, 0x8c, 0x6c, 0x7c, + 0xc9, 0x96, 0x22, 0x89, 0xb3, 0x45, 0x52, 0x30, 0xe4, 0x04, 0x1e, 0x90, 0x69, 0x4c, 0x39, 0x16, + 0x94, 0x45, 0xae, 0xbc, 0x54, 0x7d, 0x4f, 0xbd, 0x7d, 0x4d, 0x33, 0x3b, 0x63, 0x73, 0x7d, 0xc6, + 0xa6, 0xb3, 0x3e, 0xe3, 0xee, 0xad, 0x79, 0x8a, 0xc0, 0xd9, 0x4f, 0x04, 0xec, 0xbb, 0x97, 0xcd, + 0xb2, 0xac, 0x7d, 0x05, 0xb0, 0x1e, 0x73, 0xea, 0x91, 0xab, 0xd7, 0x72, 0x53, 0xed, 0xf6, 0x21, + 0xdf, 0xed, 0x49, 0x61, 0xb7, 0xfc, 0x25, 0x3f, 0x62, 0x3c, 0x58, 0xc7, 0xd6, 0x44, 0xd0, 0x71, + 0x62, 0x85, 0x58, 0x0c, 0xcd, 0x53, 0x4e, 0xbc, 0x1e, 0xf1, 0x2e, 0x52, 0x74, 0xa8, 0x06, 0x17, + 0xcf, 0x6c, 0x95, 0x22, 0x3d, 0x5b, 0x74, 0xab, 0xd4, 0xb6, 0xb7, 0xe5, 0xdd, 0xde, 0x7c, 0x61, + 0x80, 0xf3, 0x85, 0x01, 0x7e, 0x2d, 0x0c, 0x70, 0xb6, 0x34, 0x2a, 0xe7, 0x4b, 0xa3, 0xf2, 0x7d, + 0x69, 0x54, 0xde, 0x3e, 0xfe, 0x0b, 0xd0, 0x34, 0xfb, 0x56, 0x49, 0xd3, 0x07, 0x7b, 0xca, 0x91, + 0xe3, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xc6, 0x16, 0x67, 0x66, 0x1c, 0x05, 0x00, 0x00, } func (m *LimitOrderTrancheKey) Marshal() (dAtA []byte, err error) { @@ -229,9 +231,9 @@ func (m *LimitOrderTrancheKey) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x10 } - if m.TradePairID != nil { + if m.TradePairId != nil { { - size, err := m.TradePairID.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.TradePairId.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -356,8 +358,8 @@ func (m *LimitOrderTrancheKey) Size() (n int) { } var l int _ = l - if m.TradePairID != nil { - l = m.TradePairID.Size() + if m.TradePairId != nil { + l = m.TradePairId.Size() n += 1 + l + sovLimitOrderTranche(uint64(l)) } if m.TickIndexTakerToMaker != 0 { @@ -434,7 +436,7 @@ func (m *LimitOrderTrancheKey) Unmarshal(dAtA []byte) error { switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TradePairID", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field TradePairId", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -461,10 +463,10 @@ func (m *LimitOrderTrancheKey) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.TradePairID == nil { - m.TradePairID = &TradePairID{} + if m.TradePairId == nil { + m.TradePairId = &TradePairID{} } - if err := m.TradePairID.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.TradePairId.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/x/dex/types/limit_order_tranche_key.go b/x/dex/types/limit_order_tranche_key.go index 76c2aca95..fc9b12ab3 100644 --- a/x/dex/types/limit_order_tranche_key.go +++ b/x/dex/types/limit_order_tranche_key.go @@ -9,11 +9,11 @@ var _ TickLiquidityKey = (*LimitOrderTrancheKey)(nil) func (p LimitOrderTrancheKey) KeyMarshal() []byte { var key []byte - pairKeyBytes := []byte(p.TradePairID.MustPairID().CanonicalString()) + pairKeyBytes := []byte(p.TradePairId.MustPairID().CanonicalString()) key = append(key, pairKeyBytes...) key = append(key, []byte("/")...) - makerDenomBytes := []byte(p.TradePairID.MakerDenom) + makerDenomBytes := []byte(p.TradePairId.MakerDenom) key = append(key, makerDenomBytes...) key = append(key, []byte("/")...) diff --git a/x/dex/types/limit_order_tranche_user.pb.go b/x/dex/types/limit_order_tranche_user.pb.go index 4920c8518..191d47e0a 100644 --- a/x/dex/types/limit_order_tranche_user.pb.go +++ b/x/dex/types/limit_order_tranche_user.pb.go @@ -25,14 +25,14 @@ var _ = math.Inf const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type LimitOrderTrancheUser struct { - TradePairID *TradePairID `protobuf:"bytes,1,opt,name=tradePairID,proto3" json:"tradePairID,omitempty"` - TickIndexTakerToMaker int64 `protobuf:"varint,2,opt,name=tickIndexTakerToMaker,proto3" json:"tickIndexTakerToMaker,omitempty"` - TrancheKey string `protobuf:"bytes,3,opt,name=trancheKey,proto3" json:"trancheKey,omitempty"` + TradePairId *TradePairID `protobuf:"bytes,1,opt,name=trade_pair_id,json=tradePairId,proto3" json:"trade_pair_id,omitempty"` + TickIndexTakerToMaker int64 `protobuf:"varint,2,opt,name=tick_index_taker_to_maker,json=tickIndexTakerToMaker,proto3" json:"tick_index_taker_to_maker,omitempty"` + TrancheKey string `protobuf:"bytes,3,opt,name=tranche_key,json=trancheKey,proto3" json:"tranche_key,omitempty"` Address string `protobuf:"bytes,4,opt,name=address,proto3" json:"address,omitempty"` - SharesOwned github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,5,opt,name=sharesOwned,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"sharesOwned" yaml:"sharesOwned"` - SharesWithdrawn github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,6,opt,name=sharesWithdrawn,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"sharesWithdrawn" yaml:"sharesWithdrawn"` - SharesCancelled github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,7,opt,name=sharesCancelled,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"sharesCancelled" yaml:"sharesCancelled"` - OrderType LimitOrderType `protobuf:"varint,8,opt,name=orderType,proto3,enum=neutron.dex.LimitOrderType" json:"orderType,omitempty"` + SharesOwned github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,5,opt,name=shares_owned,json=sharesOwned,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"sharesOwned" yaml:"sharesOwned"` + SharesWithdrawn github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,6,opt,name=shares_withdrawn,json=sharesWithdrawn,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"sharesWithdrawn" yaml:"sharesWithdrawn"` + SharesCancelled github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,7,opt,name=shares_cancelled,json=sharesCancelled,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"sharesCancelled" yaml:"sharesCancelled"` + OrderType LimitOrderType `protobuf:"varint,8,opt,name=order_type,json=orderType,proto3,enum=neutron.dex.LimitOrderType" json:"order_type,omitempty"` } func (m *LimitOrderTrancheUser) Reset() { *m = LimitOrderTrancheUser{} } @@ -68,9 +68,9 @@ func (m *LimitOrderTrancheUser) XXX_DiscardUnknown() { var xxx_messageInfo_LimitOrderTrancheUser proto.InternalMessageInfo -func (m *LimitOrderTrancheUser) GetTradePairID() *TradePairID { +func (m *LimitOrderTrancheUser) GetTradePairId() *TradePairID { if m != nil { - return m.TradePairID + return m.TradePairId } return nil } @@ -112,35 +112,37 @@ func init() { } var fileDescriptor_67e5ffbd487ea05f = []byte{ - // 443 bytes of a gzipped FileDescriptorProto + // 470 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x52, 0x4f, 0x6b, 0xdb, 0x30, - 0x1c, 0x8d, 0xd6, 0xb5, 0x5d, 0x15, 0xd8, 0x40, 0xb4, 0x43, 0x74, 0x60, 0x87, 0x1c, 0x46, 0x28, - 0xd4, 0x86, 0x6e, 0x97, 0xf5, 0xd8, 0xf5, 0x12, 0xb6, 0xd1, 0xe1, 0x79, 0x0c, 0xb6, 0x83, 0x51, - 0xad, 0x1f, 0x89, 0x49, 0x22, 0x19, 0x49, 0xa6, 0xf6, 0x07, 0xe8, 0x7d, 0x1f, 0xab, 0xc7, 0x1e, - 0xc7, 0x0e, 0x66, 0x24, 0xb7, 0x1d, 0xfb, 0x09, 0x86, 0xff, 0xd4, 0x55, 0xc2, 0x2e, 0x63, 0x27, - 0x49, 0xef, 0x3d, 0xde, 0x7b, 0x82, 0x87, 0x8f, 0x04, 0x64, 0x46, 0x49, 0xe1, 0x73, 0xc8, 0xfd, - 0x79, 0xb2, 0x48, 0x4c, 0x24, 0x15, 0x07, 0x15, 0x19, 0xc5, 0x44, 0x3c, 0x85, 0x28, 0xd3, 0xa0, - 0xbc, 0x54, 0x49, 0x23, 0x49, 0xbf, 0xd5, 0x7a, 0x1c, 0xf2, 0xc3, 0xfd, 0x89, 0x9c, 0xc8, 0x1a, - 0xf7, 0xab, 0x5b, 0x23, 0x39, 0x74, 0x6d, 0x3b, 0xa3, 0x18, 0x87, 0x28, 0x65, 0x89, 0x8a, 0x12, - 0xde, 0x0a, 0xf6, 0xd7, 0x04, 0x79, 0x83, 0x0e, 0xaf, 0xb7, 0xf1, 0xc1, 0xfb, 0x2a, 0xfc, 0xa2, - 0xca, 0x0e, 0x9b, 0xe8, 0xcf, 0x1a, 0x14, 0x39, 0xc5, 0xfd, 0xda, 0xe6, 0x23, 0x4b, 0xd4, 0xf8, - 0x9c, 0xa2, 0x01, 0x1a, 0xf5, 0x4f, 0xa8, 0x67, 0x35, 0xf1, 0xc2, 0x07, 0x3e, 0xb0, 0xc5, 0xe4, - 0x35, 0x3e, 0x30, 0x49, 0x3c, 0x1b, 0x0b, 0x0e, 0x79, 0xc8, 0x66, 0xa0, 0x42, 0xf9, 0xa1, 0x3a, - 0xe8, 0xa3, 0x01, 0x1a, 0x6d, 0x05, 0x7f, 0x27, 0x89, 0x83, 0x71, 0xfb, 0xf7, 0x77, 0x50, 0xd0, - 0xad, 0x01, 0x1a, 0xed, 0x05, 0x16, 0x42, 0x28, 0xde, 0x65, 0x9c, 0x2b, 0xd0, 0x9a, 0x3e, 0xae, - 0xc9, 0xfb, 0x27, 0xc9, 0x70, 0x5f, 0x4f, 0x99, 0x02, 0x7d, 0x71, 0x25, 0x80, 0xd3, 0xed, 0x8a, - 0x3d, 0xfb, 0x74, 0x53, 0xba, 0xbd, 0x9f, 0xa5, 0xfb, 0x72, 0x92, 0x98, 0x69, 0x76, 0xe9, 0xc5, - 0x72, 0xe1, 0xc7, 0x52, 0x2f, 0xa4, 0x6e, 0x8f, 0x63, 0xcd, 0x67, 0xbe, 0x29, 0x52, 0xd0, 0xde, - 0x58, 0x98, 0xdf, 0xa5, 0x6b, 0x9b, 0xdc, 0x95, 0x2e, 0x29, 0xd8, 0x62, 0x7e, 0x3a, 0xb4, 0xc0, - 0x61, 0x60, 0x4b, 0xc8, 0x35, 0xc2, 0xcf, 0x9a, 0xf7, 0x97, 0xc4, 0x4c, 0xb9, 0x62, 0x57, 0x82, - 0xee, 0xd4, 0xd9, 0xdf, 0xfe, 0x39, 0x7b, 0xd3, 0xe8, 0xae, 0x74, 0x9f, 0xdb, 0xf9, 0x1d, 0x31, - 0x0c, 0x36, 0xa5, 0x56, 0x8f, 0xb7, 0x4c, 0xc4, 0x30, 0x9f, 0x03, 0xa7, 0xbb, 0xff, 0xd7, 0xa3, - 0x33, 0xda, 0xec, 0xd1, 0x11, 0x5d, 0x8f, 0x0e, 0x21, 0x6f, 0xf0, 0x5e, 0x3d, 0xe1, 0xb0, 0x48, - 0x81, 0x3e, 0x19, 0xa0, 0xd1, 0xd3, 0x93, 0x17, 0x6b, 0x83, 0xb1, 0x96, 0x56, 0xa4, 0x10, 0x3c, - 0xa8, 0xcf, 0xce, 0x6f, 0x96, 0x0e, 0xba, 0x5d, 0x3a, 0xe8, 0xd7, 0xd2, 0x41, 0xdf, 0x57, 0x4e, - 0xef, 0x76, 0xe5, 0xf4, 0x7e, 0xac, 0x9c, 0xde, 0xd7, 0x23, 0xab, 0x7a, 0xeb, 0x75, 0x2c, 0xd5, - 0xe4, 0xfe, 0xee, 0xe7, 0xcd, 0xa0, 0xab, 0x2f, 0x5c, 0xee, 0xd4, 0xa3, 0x7e, 0xf5, 0x27, 0x00, - 0x00, 0xff, 0xff, 0xe5, 0x2a, 0x9f, 0x17, 0x5c, 0x03, 0x00, 0x00, + 0x1c, 0x8d, 0xd7, 0xb5, 0x5d, 0x95, 0xfd, 0x43, 0xb4, 0x43, 0xeb, 0xc0, 0x0e, 0x39, 0x8c, 0x50, + 0xa8, 0x0d, 0xdd, 0x65, 0x94, 0x9d, 0xba, 0x5e, 0xc2, 0x36, 0x3a, 0xbc, 0x8c, 0xc1, 0x76, 0x10, + 0xaa, 0xf5, 0x23, 0x11, 0x89, 0x2d, 0x23, 0x29, 0x8b, 0xfd, 0x05, 0x76, 0xee, 0xc7, 0xea, 0xb1, + 0xc7, 0xb1, 0x83, 0x19, 0xc9, 0x6d, 0xc7, 0x7e, 0x82, 0xa1, 0xf8, 0x0f, 0x4e, 0x6f, 0x63, 0x27, + 0xfd, 0xf4, 0x7e, 0x8f, 0xf7, 0x9e, 0xc4, 0x43, 0x47, 0x09, 0xcc, 0x8d, 0x92, 0x49, 0xc0, 0x21, + 0x0b, 0x66, 0x22, 0x16, 0x86, 0x4a, 0xc5, 0x41, 0x51, 0xa3, 0x58, 0x12, 0x4d, 0x80, 0xce, 0x35, + 0x28, 0x3f, 0x55, 0xd2, 0x48, 0xdc, 0xad, 0xb8, 0x3e, 0x87, 0xec, 0x70, 0x7f, 0x2c, 0xc7, 0x72, + 0x8d, 0x07, 0x76, 0x2a, 0x29, 0x87, 0x5e, 0x5b, 0xce, 0x28, 0xc6, 0x81, 0xa6, 0x4c, 0x28, 0x2a, + 0x78, 0x45, 0xd8, 0xdf, 0x20, 0x64, 0x25, 0xda, 0xbf, 0xda, 0x46, 0x07, 0xef, 0xad, 0xf9, 0x85, + 0xf5, 0x1e, 0x95, 0xd6, 0x9f, 0x35, 0x28, 0xfc, 0x06, 0x3d, 0xda, 0x90, 0x21, 0x4e, 0xcf, 0x19, + 0x74, 0x4f, 0x88, 0xdf, 0xca, 0xe2, 0x8f, 0x2c, 0xe3, 0x23, 0x13, 0x6a, 0x78, 0x1e, 0x76, 0x4d, + 0x73, 0xe1, 0xf8, 0x35, 0x7a, 0x6e, 0x44, 0x34, 0xa5, 0x22, 0xe1, 0x90, 0x51, 0xc3, 0xa6, 0xf6, + 0x61, 0x92, 0xc6, 0x76, 0x20, 0xf7, 0x7a, 0xce, 0x60, 0x2b, 0x3c, 0xb0, 0x84, 0xa1, 0xdd, 0x8f, + 0x2c, 0x3a, 0x92, 0x1f, 0xec, 0x81, 0x3d, 0xd4, 0xad, 0x7f, 0x60, 0x0a, 0x39, 0xd9, 0xea, 0x39, + 0x83, 0xbd, 0x10, 0x55, 0xd0, 0x3b, 0xc8, 0x31, 0x41, 0xbb, 0x8c, 0x73, 0x05, 0x5a, 0x93, 0xfb, + 0xeb, 0x65, 0x7d, 0xc5, 0xdf, 0xd1, 0x43, 0x3d, 0x61, 0x0a, 0x34, 0x95, 0x8b, 0x04, 0x38, 0xd9, + 0xb6, 0xeb, 0xb3, 0x4f, 0xd7, 0x85, 0xd7, 0xf9, 0x55, 0x78, 0x2f, 0xc7, 0xc2, 0x4c, 0xe6, 0x97, + 0x7e, 0x24, 0xe3, 0x20, 0x92, 0x3a, 0x96, 0xba, 0x3a, 0x8e, 0x35, 0x9f, 0x06, 0x26, 0x4f, 0x41, + 0xfb, 0xc3, 0xc4, 0xfc, 0x29, 0xbc, 0x6e, 0xa9, 0x72, 0x61, 0x45, 0x6e, 0x0b, 0x0f, 0xe7, 0x2c, + 0x9e, 0x9d, 0xf6, 0x5b, 0x60, 0x3f, 0x6c, 0x53, 0xf0, 0x0f, 0x07, 0x3d, 0xad, 0x8c, 0x17, 0xc2, + 0x4c, 0xb8, 0x62, 0x8b, 0x84, 0xec, 0xac, 0xcd, 0xbf, 0xfd, 0xb3, 0xf9, 0x93, 0x52, 0xe9, 0x4b, + 0x2d, 0x74, 0x5b, 0x78, 0xcf, 0xda, 0x01, 0x9a, 0x45, 0x3f, 0xbc, 0x4b, 0x6d, 0x07, 0x89, 0x58, + 0x12, 0xc1, 0x6c, 0x06, 0x9c, 0xec, 0xfe, 0x5f, 0x90, 0xb7, 0xb5, 0xd0, 0xdd, 0x20, 0xcd, 0xa2, + 0x09, 0xd2, 0x20, 0xf8, 0x14, 0xa1, 0xaa, 0xcc, 0x79, 0x0a, 0xe4, 0x41, 0xcf, 0x19, 0x3c, 0x3e, + 0x79, 0xb1, 0xd1, 0x9c, 0x56, 0xe9, 0xf2, 0x14, 0xc2, 0x3d, 0x59, 0x8f, 0x67, 0xe7, 0xd7, 0x4b, + 0xd7, 0xb9, 0x59, 0xba, 0xce, 0xef, 0xa5, 0xeb, 0x5c, 0xad, 0xdc, 0xce, 0xcd, 0xca, 0xed, 0xfc, + 0x5c, 0xb9, 0x9d, 0xaf, 0x47, 0xad, 0xec, 0x95, 0xd6, 0xb1, 0x54, 0xe3, 0x7a, 0x0e, 0xb2, 0xb2, + 0xdb, 0xf6, 0x0d, 0x97, 0x3b, 0xeb, 0x7e, 0xbf, 0xfa, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x5d, 0xb7, + 0x0b, 0xc1, 0x67, 0x03, 0x00, 0x00, } func (m *LimitOrderTrancheUser) Marshal() (dAtA []byte, err error) { @@ -217,9 +219,9 @@ func (m *LimitOrderTrancheUser) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x10 } - if m.TradePairID != nil { + if m.TradePairId != nil { { - size, err := m.TradePairID.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.TradePairId.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -249,8 +251,8 @@ func (m *LimitOrderTrancheUser) Size() (n int) { } var l int _ = l - if m.TradePairID != nil { - l = m.TradePairID.Size() + if m.TradePairId != nil { + l = m.TradePairId.Size() n += 1 + l + sovLimitOrderTrancheUser(uint64(l)) } if m.TickIndexTakerToMaker != 0 { @@ -313,7 +315,7 @@ func (m *LimitOrderTrancheUser) Unmarshal(dAtA []byte) error { switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TradePairID", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field TradePairId", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -340,10 +342,10 @@ func (m *LimitOrderTrancheUser) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.TradePairID == nil { - m.TradePairID = &TradePairID{} + if m.TradePairId == nil { + m.TradePairId = &TradePairID{} } - if err := m.TradePairID.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.TradePairId.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/x/dex/types/pool.go b/x/dex/types/pool.go index 72e73e9ae..e5c6ad381 100644 --- a/x/dex/types/pool.go +++ b/x/dex/types/pool.go @@ -3,6 +3,7 @@ package types import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" + math_utils "github.com/neutron-org/neutron/utils/math" "github.com/neutron-org/neutron/x/dex/utils" ) @@ -16,7 +17,7 @@ func NewPool( feeInt64 := utils.MustSafeUint64ToInt64(fee) id0To1 := &PoolReservesKey{ - TradePairID: NewTradePairIDFromMaker(pairID, pairID.Token1), + TradePairId: NewTradePairIDFromMaker(pairID, pairID.Token1), TickIndexTakerToMaker: centerTickIndexNormalized + feeInt64, Fee: fee, } @@ -31,7 +32,7 @@ func NewPool( return &Pool{ LowerTick0: lowerTick, UpperTick1: upperTick, - ID: id, + Id: id, }, nil } @@ -152,7 +153,7 @@ func (p *Pool) Deposit( } func (p *Pool) GetPoolDenom() string { - return NewPoolDenom(p.ID) + return NewPoolDenom(p.Id) } func (p *Pool) Price(tradePairID *TradePairID) math_utils.PrecDec { diff --git a/x/dex/types/pool.pb.go b/x/dex/types/pool.pb.go index 7824ad7d1..8ddb0f09d 100644 --- a/x/dex/types/pool.pb.go +++ b/x/dex/types/pool.pb.go @@ -24,7 +24,7 @@ var _ = math.Inf const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type Pool struct { - ID uint64 `protobuf:"varint,1,opt,name=ID,proto3" json:"ID,omitempty"` + Id uint64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` LowerTick0 *PoolReserves `protobuf:"bytes,2,opt,name=lower_tick0,json=lowerTick0,proto3" json:"lower_tick0,omitempty"` UpperTick1 *PoolReserves `protobuf:"bytes,3,opt,name=upper_tick1,json=upperTick1,proto3" json:"upper_tick1,omitempty"` } @@ -62,9 +62,9 @@ func (m *Pool) XXX_DiscardUnknown() { var xxx_messageInfo_Pool proto.InternalMessageInfo -func (m *Pool) GetID() uint64 { +func (m *Pool) GetId() uint64 { if m != nil { - return m.ID + return m.Id } return 0 } @@ -96,7 +96,7 @@ var fileDescriptor_6ad7a9165eac1fde = []byte{ 0x2f, 0xc9, 0x17, 0xe2, 0x86, 0x8a, 0xeb, 0xa5, 0xa4, 0x56, 0x48, 0x89, 0xa4, 0xe7, 0xa7, 0xe7, 0x83, 0xc5, 0xf5, 0x41, 0x2c, 0x88, 0x12, 0x29, 0x79, 0x74, 0xad, 0xf1, 0x45, 0xa9, 0xc5, 0xa9, 0x45, 0x65, 0xa9, 0xc5, 0x10, 0x05, 0x4a, 0x7d, 0x8c, 0x5c, 0x2c, 0x01, 0xf9, 0xf9, 0x39, 0x42, - 0x7c, 0x5c, 0x4c, 0x9e, 0x2e, 0x12, 0x8c, 0x0a, 0x8c, 0x1a, 0x2c, 0x41, 0x4c, 0x9e, 0x2e, 0x42, + 0x7c, 0x5c, 0x4c, 0x99, 0x29, 0x12, 0x8c, 0x0a, 0x8c, 0x1a, 0x2c, 0x41, 0x4c, 0x99, 0x29, 0x42, 0x56, 0x5c, 0xdc, 0x39, 0xf9, 0xe5, 0xa9, 0x45, 0xf1, 0x25, 0x99, 0xc9, 0xd9, 0x06, 0x12, 0x4c, 0x0a, 0x8c, 0x1a, 0xdc, 0x46, 0x92, 0x7a, 0x48, 0x56, 0xea, 0x81, 0xf4, 0x05, 0x41, 0x8d, 0x0b, 0xe2, 0x02, 0xab, 0x0e, 0x01, 0x29, 0x06, 0xe9, 0x2d, 0x2d, 0x28, 0x80, 0xea, 0x35, 0x94, 0x60, @@ -104,7 +104,7 @@ var fileDescriptor_6ad7a9165eac1fde = []byte{ 0xe4, 0x18, 0x1f, 0x3c, 0x92, 0x63, 0x9c, 0xf0, 0x58, 0x8e, 0xe1, 0xc2, 0x63, 0x39, 0x86, 0x1b, 0x8f, 0xe5, 0x18, 0xa2, 0xb4, 0xd2, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xf5, 0xa1, 0x46, 0xe9, 0xe6, 0x17, 0xa5, 0xc3, 0xd8, 0xfa, 0x15, 0x60, 0x4f, 0x96, 0x54, 0x16, 0xa4, - 0x16, 0x27, 0xb1, 0x81, 0x7d, 0x67, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x3a, 0x23, 0x45, 0x18, + 0x16, 0x27, 0xb1, 0x81, 0x7d, 0x67, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0xdf, 0x6f, 0x46, 0xc2, 0x3b, 0x01, 0x00, 0x00, } @@ -152,8 +152,8 @@ func (m *Pool) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x12 } - if m.ID != 0 { - i = encodeVarintPool(dAtA, i, uint64(m.ID)) + if m.Id != 0 { + i = encodeVarintPool(dAtA, i, uint64(m.Id)) i-- dAtA[i] = 0x8 } @@ -177,8 +177,8 @@ func (m *Pool) Size() (n int) { } var l int _ = l - if m.ID != 0 { - n += 1 + sovPool(uint64(m.ID)) + if m.Id != 0 { + n += 1 + sovPool(uint64(m.Id)) } if m.LowerTick0 != nil { l = m.LowerTick0.Size() @@ -228,9 +228,9 @@ func (m *Pool) Unmarshal(dAtA []byte) error { switch fieldNum { case 1: if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field ID", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Id", wireType) } - m.ID = 0 + m.Id = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowPool @@ -240,7 +240,7 @@ func (m *Pool) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.ID |= uint64(b&0x7F) << shift + m.Id |= uint64(b&0x7F) << shift if b < 0x80 { break } diff --git a/x/dex/types/pool_metadata.go b/x/dex/types/pool_metadata.go index 1f2e70606..4d24c6d0f 100644 --- a/x/dex/types/pool_metadata.go +++ b/x/dex/types/pool_metadata.go @@ -1,5 +1,5 @@ package types func NewPoolMetadata(pairID *PairID, tick int64, fee, poolID uint64) PoolMetadata { - return PoolMetadata{PairID: pairID, Tick: tick, Fee: fee, ID: poolID} + return PoolMetadata{PairId: pairID, Tick: tick, Fee: fee, Id: poolID} } diff --git a/x/dex/types/pool_metadata.pb.go b/x/dex/types/pool_metadata.pb.go index 91d5a3654..83c059c9a 100644 --- a/x/dex/types/pool_metadata.pb.go +++ b/x/dex/types/pool_metadata.pb.go @@ -23,10 +23,10 @@ var _ = math.Inf const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type PoolMetadata struct { - ID uint64 `protobuf:"varint,1,opt,name=ID,proto3" json:"ID,omitempty"` + Id uint64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` Tick int64 `protobuf:"varint,2,opt,name=tick,proto3" json:"tick,omitempty"` Fee uint64 `protobuf:"varint,3,opt,name=fee,proto3" json:"fee,omitempty"` - PairID *PairID `protobuf:"bytes,4,opt,name=pairID,proto3" json:"pairID,omitempty"` + PairId *PairID `protobuf:"bytes,4,opt,name=pair_id,json=pairId,proto3" json:"pair_id,omitempty"` } func (m *PoolMetadata) Reset() { *m = PoolMetadata{} } @@ -62,9 +62,9 @@ func (m *PoolMetadata) XXX_DiscardUnknown() { var xxx_messageInfo_PoolMetadata proto.InternalMessageInfo -func (m *PoolMetadata) GetID() uint64 { +func (m *PoolMetadata) GetId() uint64 { if m != nil { - return m.ID + return m.Id } return 0 } @@ -83,9 +83,9 @@ func (m *PoolMetadata) GetFee() uint64 { return 0 } -func (m *PoolMetadata) GetPairID() *PairID { +func (m *PoolMetadata) GetPairId() *PairID { if m != nil { - return m.PairID + return m.PairId } return nil } @@ -97,21 +97,22 @@ func init() { func init() { proto.RegisterFile("neutron/dex/pool_metadata.proto", fileDescriptor_c2ee8eaeac9c06d8) } var fileDescriptor_c2ee8eaeac9c06d8 = []byte{ - // 223 bytes of a gzipped FileDescriptorProto + // 227 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xcf, 0x4b, 0x2d, 0x2d, 0x29, 0xca, 0xcf, 0xd3, 0x4f, 0x49, 0xad, 0xd0, 0x2f, 0xc8, 0xcf, 0xcf, 0x89, 0xcf, 0x4d, 0x2d, 0x49, 0x4c, 0x49, 0x2c, 0x49, 0xd4, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x86, 0x2a, 0xd0, 0x4b, 0x49, 0xad, 0x90, 0x92, 0x44, 0x51, 0x9d, 0x98, 0x59, 0x14, 0x9f, 0x99, 0x02, 0x51, 0xa7, - 0x54, 0xc8, 0xc5, 0x13, 0x90, 0x9f, 0x9f, 0xe3, 0x0b, 0xd5, 0x2d, 0xc4, 0xc7, 0xc5, 0xe4, 0xe9, - 0x22, 0xc1, 0xa8, 0xc0, 0xa8, 0xc1, 0x12, 0xc4, 0xe4, 0xe9, 0x22, 0x24, 0xc4, 0xc5, 0x52, 0x92, + 0x54, 0xc4, 0xc5, 0x13, 0x90, 0x9f, 0x9f, 0xe3, 0x0b, 0xd5, 0x2d, 0xc4, 0xc7, 0xc5, 0x94, 0x99, + 0x22, 0xc1, 0xa8, 0xc0, 0xa8, 0xc1, 0x12, 0xc4, 0x94, 0x99, 0x22, 0x24, 0xc4, 0xc5, 0x52, 0x92, 0x99, 0x9c, 0x2d, 0xc1, 0xa4, 0xc0, 0xa8, 0xc1, 0x1c, 0x04, 0x66, 0x0b, 0x09, 0x70, 0x31, 0xa7, - 0xa5, 0xa6, 0x4a, 0x30, 0x83, 0x15, 0x81, 0x98, 0x42, 0xda, 0x5c, 0x6c, 0x20, 0x63, 0x3d, 0x5d, - 0x24, 0x58, 0x14, 0x18, 0x35, 0xb8, 0x8d, 0x84, 0xf5, 0x90, 0xac, 0xd7, 0x0b, 0x00, 0x4b, 0x05, - 0x41, 0x95, 0x38, 0xb9, 0x9c, 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, 0x56, - 0x7a, 0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, 0x7e, 0xae, 0x3e, 0xd4, 0x00, 0xdd, 0xfc, 0xa2, - 0x74, 0x18, 0x5b, 0xbf, 0x02, 0xec, 0x81, 0x92, 0xca, 0x82, 0xd4, 0xe2, 0x24, 0x36, 0xb0, 0xfb, - 0x8d, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x0c, 0xa8, 0xc5, 0x28, 0x0a, 0x01, 0x00, 0x00, + 0xa5, 0xa6, 0x4a, 0x30, 0x83, 0x15, 0x81, 0x98, 0x42, 0x3a, 0x5c, 0xec, 0x50, 0x63, 0x25, 0x58, + 0x14, 0x18, 0x35, 0xb8, 0x8d, 0x84, 0xf5, 0x90, 0xec, 0xd7, 0x0b, 0x48, 0xcc, 0x2c, 0xf2, 0x74, + 0x09, 0x62, 0x03, 0xa9, 0xf1, 0x4c, 0x71, 0x72, 0x39, 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, 0xad, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0x7d, 0xa8, + 0x01, 0xba, 0xf9, 0x45, 0xe9, 0x30, 0xb6, 0x7e, 0x05, 0xd8, 0x07, 0x25, 0x95, 0x05, 0xa9, 0xc5, + 0x49, 0x6c, 0x60, 0x0f, 0x18, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0xe3, 0xe2, 0x08, 0xd4, 0x0b, + 0x01, 0x00, 0x00, } func (m *PoolMetadata) Marshal() (dAtA []byte, err error) { @@ -134,9 +135,9 @@ func (m *PoolMetadata) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.PairID != nil { + if m.PairId != nil { { - size, err := m.PairID.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.PairId.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -156,8 +157,8 @@ func (m *PoolMetadata) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x10 } - if m.ID != 0 { - i = encodeVarintPoolMetadata(dAtA, i, uint64(m.ID)) + if m.Id != 0 { + i = encodeVarintPoolMetadata(dAtA, i, uint64(m.Id)) i-- dAtA[i] = 0x8 } @@ -181,8 +182,8 @@ func (m *PoolMetadata) Size() (n int) { } var l int _ = l - if m.ID != 0 { - n += 1 + sovPoolMetadata(uint64(m.ID)) + if m.Id != 0 { + n += 1 + sovPoolMetadata(uint64(m.Id)) } if m.Tick != 0 { n += 1 + sovPoolMetadata(uint64(m.Tick)) @@ -190,8 +191,8 @@ func (m *PoolMetadata) Size() (n int) { if m.Fee != 0 { n += 1 + sovPoolMetadata(uint64(m.Fee)) } - if m.PairID != nil { - l = m.PairID.Size() + if m.PairId != nil { + l = m.PairId.Size() n += 1 + l + sovPoolMetadata(uint64(l)) } return n @@ -234,9 +235,9 @@ func (m *PoolMetadata) Unmarshal(dAtA []byte) error { switch fieldNum { case 1: if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field ID", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Id", wireType) } - m.ID = 0 + m.Id = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowPoolMetadata @@ -246,7 +247,7 @@ func (m *PoolMetadata) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.ID |= uint64(b&0x7F) << shift + m.Id |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -291,7 +292,7 @@ func (m *PoolMetadata) Unmarshal(dAtA []byte) error { } case 4: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field PairID", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field PairId", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -318,10 +319,10 @@ func (m *PoolMetadata) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.PairID == nil { - m.PairID = &PairID{} + if m.PairId == nil { + m.PairId = &PairID{} } - if err := m.PairID.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.PairId.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/x/dex/types/pool_reserves.pb.go b/x/dex/types/pool_reserves.pb.go index eab47e55b..5350404f5 100644 --- a/x/dex/types/pool_reserves.pb.go +++ b/x/dex/types/pool_reserves.pb.go @@ -26,9 +26,9 @@ var _ = math.Inf const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type PoolReservesKey struct { - TradePairID *TradePairID `protobuf:"bytes,1,opt,name=tradePairID,proto3" json:"tradePairID,omitempty"` - TickIndexTakerToMaker int64 `protobuf:"varint,2,opt,name=TickIndexTakerToMaker,proto3" json:"TickIndexTakerToMaker,omitempty"` - Fee uint64 `protobuf:"varint,3,opt,name=Fee,proto3" json:"Fee,omitempty"` + TradePairId *TradePairID `protobuf:"bytes,1,opt,name=trade_pair_id,json=tradePairId,proto3" json:"trade_pair_id,omitempty"` + TickIndexTakerToMaker int64 `protobuf:"varint,2,opt,name=tick_index_taker_to_maker,json=tickIndexTakerToMaker,proto3" json:"tick_index_taker_to_maker,omitempty"` + Fee uint64 `protobuf:"varint,3,opt,name=fee,proto3" json:"fee,omitempty"` } func (m *PoolReservesKey) Reset() { *m = PoolReservesKey{} } @@ -64,9 +64,9 @@ func (m *PoolReservesKey) XXX_DiscardUnknown() { var xxx_messageInfo_PoolReservesKey proto.InternalMessageInfo -func (m *PoolReservesKey) GetTradePairID() *TradePairID { +func (m *PoolReservesKey) GetTradePairId() *TradePairID { if m != nil { - return m.TradePairID + return m.TradePairId } return nil } @@ -87,9 +87,9 @@ func (m *PoolReservesKey) GetFee() uint64 { type PoolReserves struct { Key *PoolReservesKey `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"` - ReservesMakerDenom github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,opt,name=reservesMakerDenom,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"reservesMakerDenom" yaml:"reservesMakerDenom"` - PriceTakerToMaker github_com_neutron_org_neutron_utils_math.PrecDec `protobuf:"bytes,3,opt,name=priceTakerToMaker,proto3,customtype=github.com/neutron-org/neutron/utils/math.PrecDec" json:"priceTakerToMaker" yaml:"priceTakerToMaker"` - PriceOppositeTakerToMaker github_com_neutron_org_neutron_utils_math.PrecDec `protobuf:"bytes,4,opt,name=priceOppositeTakerToMaker,proto3,customtype=github.com/neutron-org/neutron/utils/math.PrecDec" json:"priceOppositeTakerToMaker" yaml:"priceOppositeTakerToMaker"` + ReservesMakerDenom github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,opt,name=reserves_maker_denom,json=reservesMakerDenom,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"reservesMakerDenom" yaml:"reservesMakerDenom"` + PriceTakerToMaker github_com_neutron_org_neutron_utils_math.PrecDec `protobuf:"bytes,3,opt,name=price_taker_to_maker,json=priceTakerToMaker,proto3,customtype=github.com/neutron-org/neutron/utils/math.PrecDec" json:"priceTakerToMaker" yaml:"priceTakerToMaker"` + PriceOppositeTakerToMaker github_com_neutron_org_neutron_utils_math.PrecDec `protobuf:"bytes,4,opt,name=price_opposite_taker_to_maker,json=priceOppositeTakerToMaker,proto3,customtype=github.com/neutron-org/neutron/utils/math.PrecDec" json:"priceOppositeTakerToMaker" yaml:"priceOppositeTakerToMaker"` } func (m *PoolReserves) Reset() { *m = PoolReserves{} } @@ -140,35 +140,37 @@ func init() { func init() { proto.RegisterFile("neutron/dex/pool_reserves.proto", fileDescriptor_f0fe9f734c7ad538) } var fileDescriptor_f0fe9f734c7ad538 = []byte{ - // 440 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x93, 0x4f, 0x8b, 0xd3, 0x40, - 0x18, 0x87, 0x3b, 0xa6, 0x08, 0x4e, 0x05, 0x75, 0x50, 0xc8, 0x2e, 0x92, 0x94, 0x1c, 0xa4, 0x08, - 0x3b, 0xc1, 0x3f, 0xa7, 0x3d, 0x2e, 0x45, 0x28, 0x22, 0x96, 0xa1, 0x27, 0x2f, 0x25, 0x9b, 0xbc, - 0x74, 0xc7, 0x36, 0x79, 0xc3, 0xcc, 0x54, 0x5a, 0x3f, 0x85, 0x1e, 0x04, 0x3f, 0x82, 0x1f, 0xc1, - 0x8f, 0xb0, 0xc7, 0x3d, 0x8a, 0x87, 0x20, 0xed, 0x6d, 0x8f, 0xfd, 0x04, 0x92, 0x69, 0x16, 0x53, - 0x9b, 0xe2, 0xc1, 0xd3, 0xbc, 0xcc, 0xfb, 0xcc, 0x6f, 0x9e, 0x4c, 0x78, 0xa9, 0x9f, 0xc1, 0xdc, - 0x28, 0xcc, 0xc2, 0x04, 0x16, 0x61, 0x8e, 0x38, 0x1b, 0x2b, 0xd0, 0xa0, 0x3e, 0x80, 0xe6, 0xb9, - 0x42, 0x83, 0xac, 0x53, 0x01, 0x3c, 0x81, 0xc5, 0xf1, 0xc3, 0x09, 0x4e, 0xd0, 0xee, 0x87, 0x65, - 0xb5, 0x45, 0x8e, 0x77, 0x32, 0x8c, 0x8a, 0x12, 0x18, 0xe7, 0x91, 0x54, 0x63, 0x99, 0x6c, 0x81, - 0xe0, 0x0b, 0xa1, 0xf7, 0x86, 0x88, 0x33, 0x51, 0x45, 0xbf, 0x86, 0x25, 0x3b, 0xa5, 0x1d, 0x8b, - 0x0e, 0x23, 0xa9, 0x06, 0x7d, 0x97, 0x74, 0x49, 0xaf, 0xf3, 0xdc, 0xe5, 0xb5, 0xdb, 0xf8, 0xe8, - 0x4f, 0x5f, 0xd4, 0x61, 0xf6, 0x92, 0x3e, 0x1a, 0xc9, 0x78, 0x3a, 0xc8, 0x12, 0x58, 0x8c, 0xa2, - 0x29, 0xa8, 0x11, 0xbe, 0x29, 0x17, 0xf7, 0x56, 0x97, 0xf4, 0x1c, 0xd1, 0xdc, 0x64, 0xf7, 0xa9, - 0xf3, 0x0a, 0xc0, 0x75, 0xba, 0xa4, 0xd7, 0x16, 0x65, 0x19, 0x7c, 0x6b, 0xd3, 0xbb, 0x75, 0x2f, - 0xc6, 0xa9, 0x33, 0x85, 0x65, 0x25, 0xf3, 0x78, 0x47, 0xe6, 0x2f, 0x7f, 0x51, 0x82, 0xec, 0x33, - 0xa1, 0xec, 0xe6, 0xbd, 0xec, 0x25, 0x7d, 0xc8, 0x30, 0xb5, 0x1a, 0x77, 0xce, 0xa2, 0xcb, 0xc2, - 0x6f, 0xfd, 0x2c, 0xfc, 0x27, 0x13, 0x69, 0x2e, 0xe6, 0xe7, 0x3c, 0xc6, 0x34, 0x8c, 0x51, 0xa7, - 0xa8, 0xab, 0xe5, 0x44, 0x27, 0xd3, 0xd0, 0x2c, 0x73, 0xd0, 0x7c, 0x90, 0x99, 0xeb, 0xc2, 0x6f, - 0xc8, 0xda, 0x14, 0xfe, 0xd1, 0x32, 0x4a, 0x67, 0xa7, 0xc1, 0x7e, 0x2f, 0x10, 0x0d, 0x07, 0xd8, - 0x57, 0x42, 0x1f, 0xe4, 0x4a, 0xc6, 0xb0, 0xf3, 0x32, 0x8e, 0x55, 0x7a, 0x5f, 0x29, 0x3d, 0xab, - 0x29, 0x55, 0x1f, 0x79, 0x82, 0x6a, 0x72, 0x53, 0x87, 0x73, 0x23, 0x67, 0x3a, 0x4c, 0x23, 0x73, - 0xc1, 0x87, 0x0a, 0xe2, 0x3e, 0xc4, 0xd7, 0x85, 0xbf, 0x9f, 0xba, 0x29, 0x7c, 0x77, 0x2b, 0xb7, - 0xd7, 0x0a, 0xc4, 0x3e, 0xce, 0xbe, 0x13, 0x7a, 0x64, 0x77, 0xdf, 0xe6, 0x39, 0x6a, 0x69, 0x76, - 0x15, 0xdb, 0x56, 0xf1, 0xe3, 0xff, 0x28, 0x1e, 0x4e, 0xdf, 0x14, 0x7e, 0xb7, 0xa6, 0xda, 0x84, - 0x04, 0xe2, 0xf0, 0xf1, 0xb3, 0xfe, 0xe5, 0xca, 0x23, 0x57, 0x2b, 0x8f, 0xfc, 0x5a, 0x79, 0xe4, - 0xd3, 0xda, 0x6b, 0x5d, 0xad, 0xbd, 0xd6, 0x8f, 0xb5, 0xd7, 0x7a, 0xf7, 0xf4, 0x1f, 0xa2, 0x8b, - 0xed, 0x58, 0x94, 0xbf, 0xf9, 0xfc, 0xb6, 0x9d, 0x87, 0x17, 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, - 0xfb, 0xee, 0x71, 0xc4, 0x76, 0x03, 0x00, 0x00, + // 465 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x93, 0x41, 0x8b, 0xd3, 0x40, + 0x14, 0x80, 0x3b, 0xa6, 0x08, 0x4e, 0x15, 0x75, 0xa8, 0x90, 0x2e, 0x9a, 0x94, 0x1c, 0xa4, 0x08, + 0x9b, 0xa0, 0x5e, 0x44, 0x3c, 0x2d, 0xbd, 0x14, 0x11, 0x4b, 0xe8, 0xc9, 0x4b, 0xc8, 0x26, 0xcf, + 0xee, 0xd8, 0x26, 0x2f, 0x4c, 0xa6, 0xd2, 0xfa, 0x2b, 0x04, 0x8f, 0xfb, 0x2b, 0xbc, 0xfb, 0x03, + 0xf6, 0xb8, 0x47, 0xf1, 0x10, 0xa4, 0xbd, 0xed, 0x71, 0x7f, 0x81, 0xcc, 0x24, 0x95, 0xb4, 0xa9, + 0x78, 0xd8, 0xd3, 0xbc, 0xcc, 0xfb, 0xe6, 0xbd, 0x6f, 0x5e, 0x18, 0x6a, 0xa7, 0xb0, 0x90, 0x02, + 0x53, 0x2f, 0x86, 0xa5, 0x97, 0x21, 0xce, 0x03, 0x01, 0x39, 0x88, 0xcf, 0x90, 0xbb, 0x99, 0x40, + 0x89, 0xac, 0x53, 0x01, 0x6e, 0x0c, 0xcb, 0xa3, 0xee, 0x14, 0xa7, 0xa8, 0xf7, 0x3d, 0x15, 0x95, + 0xc8, 0xd1, 0x4e, 0x0d, 0x29, 0xc2, 0x18, 0x82, 0x2c, 0xe4, 0x22, 0xe0, 0x71, 0x09, 0x38, 0xe7, + 0x84, 0xde, 0x1f, 0x23, 0xce, 0xfd, 0xaa, 0xf4, 0x5b, 0x58, 0xb1, 0x37, 0xf4, 0xde, 0x0e, 0x6a, + 0x92, 0x3e, 0x19, 0x74, 0x5e, 0x98, 0x6e, 0xad, 0x9f, 0x3b, 0x51, 0xc4, 0x38, 0xe4, 0x62, 0x34, + 0xf4, 0x3b, 0xf2, 0xef, 0x47, 0xcc, 0x5e, 0xd1, 0x9e, 0xe4, 0xd1, 0x2c, 0xe0, 0x69, 0x0c, 0xcb, + 0x40, 0x86, 0x33, 0x10, 0x81, 0xc4, 0x20, 0x51, 0x81, 0x79, 0xab, 0x4f, 0x06, 0x86, 0xff, 0x48, + 0x01, 0x23, 0x95, 0x9f, 0xa8, 0xdd, 0x09, 0xbe, 0x53, 0x0b, 0x7b, 0x40, 0x8d, 0x8f, 0x00, 0xa6, + 0xd1, 0x27, 0x83, 0xb6, 0xaf, 0x42, 0xe7, 0x7b, 0x9b, 0xde, 0xad, 0xdb, 0x31, 0x97, 0x1a, 0x33, + 0x58, 0x55, 0x42, 0x8f, 0x77, 0x84, 0xf6, 0x6e, 0xe1, 0x2b, 0x90, 0x7d, 0x23, 0xb4, 0xbb, 0x9d, + 0x5a, 0xa9, 0x10, 0xc4, 0x90, 0x62, 0xa2, 0x45, 0xee, 0x9c, 0x84, 0x17, 0x85, 0xdd, 0xfa, 0x55, + 0xd8, 0x4f, 0xa7, 0x5c, 0x9e, 0x2d, 0x4e, 0xdd, 0x08, 0x13, 0x2f, 0xc2, 0x3c, 0xc1, 0xbc, 0x5a, + 0x8e, 0xf3, 0x78, 0xe6, 0xc9, 0x55, 0x06, 0xb9, 0x3b, 0x4a, 0xe5, 0x55, 0x61, 0xb3, 0x6d, 0x35, + 0xad, 0x3c, 0x54, 0xb5, 0xae, 0x0b, 0xbb, 0xb7, 0x0a, 0x93, 0xf9, 0x6b, 0xa7, 0x99, 0x73, 0xfc, + 0x03, 0x07, 0xd8, 0x39, 0xa1, 0xdd, 0x4c, 0xf0, 0x08, 0xf6, 0xc7, 0x63, 0x68, 0xab, 0x4f, 0x95, + 0xd5, 0xf3, 0x9a, 0x55, 0x75, 0xd3, 0x63, 0x14, 0xd3, 0x6d, 0xec, 0x2d, 0x24, 0x9f, 0xe7, 0x5e, + 0x12, 0xca, 0x33, 0x77, 0x2c, 0x20, 0x1a, 0x42, 0x74, 0x55, 0xd8, 0x0f, 0x75, 0xe1, 0xfa, 0x5c, + 0xaf, 0x0b, 0xdb, 0x2c, 0xfd, 0x1a, 0x29, 0xc7, 0x6f, 0xe2, 0xec, 0x07, 0xa1, 0x4f, 0x4a, 0x3b, + 0xcc, 0x32, 0xcc, 0xb9, 0x6c, 0x68, 0xb6, 0xb5, 0xe6, 0x97, 0x9b, 0x68, 0xf6, 0x74, 0x87, 0xf7, + 0x55, 0x83, 0x3d, 0xdd, 0x7e, 0x4d, 0xf7, 0x10, 0xe2, 0xf8, 0xff, 0x3e, 0x7e, 0x32, 0xbc, 0x58, + 0x5b, 0xe4, 0x72, 0x6d, 0x91, 0xdf, 0x6b, 0x8b, 0x7c, 0xdd, 0x58, 0xad, 0xcb, 0x8d, 0xd5, 0xfa, + 0xb9, 0xb1, 0x5a, 0x1f, 0x9e, 0xfd, 0x47, 0x74, 0x59, 0xbe, 0x12, 0xf5, 0xb7, 0x4f, 0x6f, 0xeb, + 0xe7, 0xf1, 0xf2, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xd5, 0x52, 0xb3, 0x3e, 0x85, 0x03, 0x00, + 0x00, } func (m *PoolReservesKey) Marshal() (dAtA []byte, err error) { @@ -201,9 +203,9 @@ func (m *PoolReservesKey) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x10 } - if m.TradePairID != nil { + if m.TradePairId != nil { { - size, err := m.TradePairID.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.TradePairId.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -298,8 +300,8 @@ func (m *PoolReservesKey) Size() (n int) { } var l int _ = l - if m.TradePairID != nil { - l = m.TradePairID.Size() + if m.TradePairId != nil { + l = m.TradePairId.Size() n += 1 + l + sovPoolReserves(uint64(l)) } if m.TickIndexTakerToMaker != 0 { @@ -367,7 +369,7 @@ func (m *PoolReservesKey) Unmarshal(dAtA []byte) error { switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TradePairID", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field TradePairId", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -394,10 +396,10 @@ func (m *PoolReservesKey) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.TradePairID == nil { - m.TradePairID = &TradePairID{} + if m.TradePairId == nil { + m.TradePairId = &TradePairID{} } - if err := m.TradePairID.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.TradePairId.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/x/dex/types/pool_reserves_key.go b/x/dex/types/pool_reserves_key.go index 766a5ca42..da445e3b3 100644 --- a/x/dex/types/pool_reserves_key.go +++ b/x/dex/types/pool_reserves_key.go @@ -2,6 +2,7 @@ package types import ( sdk "github.com/cosmos/cosmos-sdk/types" + math_utils "github.com/neutron-org/neutron/utils/math" "github.com/neutron-org/neutron/x/dex/utils" ) @@ -11,11 +12,11 @@ var _ TickLiquidityKey = (*PoolReservesKey)(nil) func (p PoolReservesKey) KeyMarshal() []byte { var key []byte - pairKeyBytes := []byte(p.TradePairID.MustPairID().CanonicalString()) + pairKeyBytes := []byte(p.TradePairId.MustPairID().CanonicalString()) key = append(key, pairKeyBytes...) key = append(key, []byte("/")...) - makerDenomBytes := []byte(p.TradePairID.MakerDenom) + makerDenomBytes := []byte(p.TradePairId.MakerDenom) key = append(key, makerDenomBytes...) key = append(key, []byte("/")...) @@ -37,7 +38,7 @@ func (p PoolReservesKey) KeyMarshal() []byte { func (p PoolReservesKey) Counterpart() *PoolReservesKey { feeInt64 := utils.MustSafeUint64ToInt64(p.Fee) return &PoolReservesKey{ - TradePairID: p.TradePairID.Reversed(), + TradePairId: p.TradePairId.Reversed(), TickIndexTakerToMaker: p.TickIndexTakerToMaker*-1 + 2*feeInt64, Fee: p.Fee, } diff --git a/x/dex/types/query.pb.go b/x/dex/types/query.pb.go index b2537e353..3d548f0a1 100644 --- a/x/dex/types/query.pb.go +++ b/x/dex/types/query.pb.go @@ -122,7 +122,7 @@ func (m *QueryParamsResponse) GetParams() Params { type QueryGetLimitOrderTrancheUserRequest struct { Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` - TrancheKey string `protobuf:"bytes,2,opt,name=trancheKey,proto3" json:"trancheKey,omitempty"` + TrancheKey string `protobuf:"bytes,2,opt,name=tranche_key,json=trancheKey,proto3" json:"tranche_key,omitempty"` } func (m *QueryGetLimitOrderTrancheUserRequest) Reset() { *m = QueryGetLimitOrderTrancheUserRequest{} } @@ -173,7 +173,7 @@ func (m *QueryGetLimitOrderTrancheUserRequest) GetTrancheKey() string { } type QueryGetLimitOrderTrancheUserResponse struct { - LimitOrderTrancheUser *LimitOrderTrancheUser `protobuf:"bytes,1,opt,name=LimitOrderTrancheUser,proto3" json:"LimitOrderTrancheUser,omitempty"` + LimitOrderTrancheUser *LimitOrderTrancheUser `protobuf:"bytes,1,opt,name=limit_order_tranche_user,json=limitOrderTrancheUser,proto3" json:"limit_order_tranche_user,omitempty"` } func (m *QueryGetLimitOrderTrancheUserResponse) Reset() { *m = QueryGetLimitOrderTrancheUserResponse{} } @@ -261,7 +261,7 @@ func (m *QueryAllLimitOrderTrancheUserRequest) GetPagination() *query.PageReques } type QueryAllLimitOrderTrancheUserResponse struct { - LimitOrderTrancheUser []*LimitOrderTrancheUser `protobuf:"bytes,1,rep,name=LimitOrderTrancheUser,proto3" json:"LimitOrderTrancheUser,omitempty"` + LimitOrderTrancheUser []*LimitOrderTrancheUser `protobuf:"bytes,1,rep,name=limit_order_tranche_user,json=limitOrderTrancheUser,proto3" json:"limit_order_tranche_user,omitempty"` Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` } @@ -313,10 +313,10 @@ func (m *QueryAllLimitOrderTrancheUserResponse) GetPagination() *query.PageRespo } type QueryGetLimitOrderTrancheRequest struct { - PairID string `protobuf:"bytes,1,opt,name=pairID,proto3" json:"pairID,omitempty"` - TickIndex int64 `protobuf:"varint,2,opt,name=tickIndex,proto3" json:"tickIndex,omitempty"` - TokenIn string `protobuf:"bytes,3,opt,name=tokenIn,proto3" json:"tokenIn,omitempty"` - TrancheKey string `protobuf:"bytes,4,opt,name=trancheKey,proto3" json:"trancheKey,omitempty"` + PairId string `protobuf:"bytes,1,opt,name=pair_id,json=pairId,proto3" json:"pair_id,omitempty"` + TickIndex int64 `protobuf:"varint,2,opt,name=tick_index,json=tickIndex,proto3" json:"tick_index,omitempty"` + TokenIn string `protobuf:"bytes,3,opt,name=token_in,json=tokenIn,proto3" json:"token_in,omitempty"` + TrancheKey string `protobuf:"bytes,4,opt,name=tranche_key,json=trancheKey,proto3" json:"tranche_key,omitempty"` } func (m *QueryGetLimitOrderTrancheRequest) Reset() { *m = QueryGetLimitOrderTrancheRequest{} } @@ -352,9 +352,9 @@ func (m *QueryGetLimitOrderTrancheRequest) XXX_DiscardUnknown() { var xxx_messageInfo_QueryGetLimitOrderTrancheRequest proto.InternalMessageInfo -func (m *QueryGetLimitOrderTrancheRequest) GetPairID() string { +func (m *QueryGetLimitOrderTrancheRequest) GetPairId() string { if m != nil { - return m.PairID + return m.PairId } return "" } @@ -381,7 +381,7 @@ func (m *QueryGetLimitOrderTrancheRequest) GetTrancheKey() string { } type QueryGetLimitOrderTrancheResponse struct { - LimitOrderTranche *LimitOrderTranche `protobuf:"bytes,1,opt,name=LimitOrderTranche,proto3" json:"LimitOrderTranche,omitempty"` + LimitOrderTranche *LimitOrderTranche `protobuf:"bytes,1,opt,name=limit_order_tranche,json=limitOrderTranche,proto3" json:"limit_order_tranche,omitempty"` } func (m *QueryGetLimitOrderTrancheResponse) Reset() { *m = QueryGetLimitOrderTrancheResponse{} } @@ -425,8 +425,8 @@ func (m *QueryGetLimitOrderTrancheResponse) GetLimitOrderTranche() *LimitOrderTr } type QueryAllLimitOrderTrancheRequest struct { - PairID string `protobuf:"bytes,1,opt,name=pairID,proto3" json:"pairID,omitempty"` - TokenIn string `protobuf:"bytes,2,opt,name=tokenIn,proto3" json:"tokenIn,omitempty"` + PairId string `protobuf:"bytes,1,opt,name=pair_id,json=pairId,proto3" json:"pair_id,omitempty"` + TokenIn string `protobuf:"bytes,2,opt,name=token_in,json=tokenIn,proto3" json:"token_in,omitempty"` Pagination *query.PageRequest `protobuf:"bytes,3,opt,name=pagination,proto3" json:"pagination,omitempty"` } @@ -463,9 +463,9 @@ func (m *QueryAllLimitOrderTrancheRequest) XXX_DiscardUnknown() { var xxx_messageInfo_QueryAllLimitOrderTrancheRequest proto.InternalMessageInfo -func (m *QueryAllLimitOrderTrancheRequest) GetPairID() string { +func (m *QueryAllLimitOrderTrancheRequest) GetPairId() string { if m != nil { - return m.PairID + return m.PairId } return "" } @@ -485,7 +485,7 @@ func (m *QueryAllLimitOrderTrancheRequest) GetPagination() *query.PageRequest { } type QueryAllLimitOrderTrancheResponse struct { - LimitOrderTranche []*LimitOrderTranche `protobuf:"bytes,1,rep,name=LimitOrderTranche,proto3" json:"LimitOrderTranche,omitempty"` + LimitOrderTranche []*LimitOrderTranche `protobuf:"bytes,1,rep,name=limit_order_tranche,json=limitOrderTranche,proto3" json:"limit_order_tranche,omitempty"` Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` } @@ -589,7 +589,7 @@ func (m *QueryAllUserDepositsRequest) GetPagination() *query.PageRequest { } type QueryAllUserDepositsResponse struct { - Deposits []*DepositRecord `protobuf:"bytes,1,rep,name=Deposits,proto3" json:"Deposits,omitempty"` + Deposits []*DepositRecord `protobuf:"bytes,1,rep,name=deposits,proto3" json:"deposits,omitempty"` Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` } @@ -693,7 +693,7 @@ func (m *QueryAllUserLimitOrdersRequest) GetPagination() *query.PageRequest { } type QueryAllUserLimitOrdersResponse struct { - LimitOrders []*LimitOrderTrancheUser `protobuf:"bytes,1,rep,name=limitOrders,proto3" json:"limitOrders,omitempty"` + LimitOrders []*LimitOrderTrancheUser `protobuf:"bytes,1,rep,name=limit_orders,json=limitOrders,proto3" json:"limit_orders,omitempty"` Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` } @@ -745,8 +745,8 @@ func (m *QueryAllUserLimitOrdersResponse) GetPagination() *query.PageResponse { } type QueryAllTickLiquidityRequest struct { - PairID string `protobuf:"bytes,1,opt,name=pairID,proto3" json:"pairID,omitempty"` - TokenIn string `protobuf:"bytes,2,opt,name=tokenIn,proto3" json:"tokenIn,omitempty"` + PairId string `protobuf:"bytes,1,opt,name=pair_id,json=pairId,proto3" json:"pair_id,omitempty"` + TokenIn string `protobuf:"bytes,2,opt,name=token_in,json=tokenIn,proto3" json:"token_in,omitempty"` Pagination *query.PageRequest `protobuf:"bytes,3,opt,name=pagination,proto3" json:"pagination,omitempty"` } @@ -783,9 +783,9 @@ func (m *QueryAllTickLiquidityRequest) XXX_DiscardUnknown() { var xxx_messageInfo_QueryAllTickLiquidityRequest proto.InternalMessageInfo -func (m *QueryAllTickLiquidityRequest) GetPairID() string { +func (m *QueryAllTickLiquidityRequest) GetPairId() string { if m != nil { - return m.PairID + return m.PairId } return "" } @@ -805,7 +805,7 @@ func (m *QueryAllTickLiquidityRequest) GetPagination() *query.PageRequest { } type QueryAllTickLiquidityResponse struct { - TickLiquidity []*TickLiquidity `protobuf:"bytes,1,rep,name=tickLiquidity,proto3" json:"tickLiquidity,omitempty"` + TickLiquidity []*TickLiquidity `protobuf:"bytes,1,rep,name=tick_liquidity,json=tickLiquidity,proto3" json:"tick_liquidity,omitempty"` Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` } @@ -857,10 +857,10 @@ func (m *QueryAllTickLiquidityResponse) GetPagination() *query.PageResponse { } type QueryGetInactiveLimitOrderTrancheRequest struct { - PairID string `protobuf:"bytes,1,opt,name=pairID,proto3" json:"pairID,omitempty"` - TokenIn string `protobuf:"bytes,2,opt,name=tokenIn,proto3" json:"tokenIn,omitempty"` - TickIndex int64 `protobuf:"varint,3,opt,name=tickIndex,proto3" json:"tickIndex,omitempty"` - TrancheKey string `protobuf:"bytes,4,opt,name=trancheKey,proto3" json:"trancheKey,omitempty"` + PairId string `protobuf:"bytes,1,opt,name=pair_id,json=pairId,proto3" json:"pair_id,omitempty"` + TokenIn string `protobuf:"bytes,2,opt,name=token_in,json=tokenIn,proto3" json:"token_in,omitempty"` + TickIndex int64 `protobuf:"varint,3,opt,name=tick_index,json=tickIndex,proto3" json:"tick_index,omitempty"` + TrancheKey string `protobuf:"bytes,4,opt,name=tranche_key,json=trancheKey,proto3" json:"tranche_key,omitempty"` } func (m *QueryGetInactiveLimitOrderTrancheRequest) Reset() { @@ -898,9 +898,9 @@ func (m *QueryGetInactiveLimitOrderTrancheRequest) XXX_DiscardUnknown() { var xxx_messageInfo_QueryGetInactiveLimitOrderTrancheRequest proto.InternalMessageInfo -func (m *QueryGetInactiveLimitOrderTrancheRequest) GetPairID() string { +func (m *QueryGetInactiveLimitOrderTrancheRequest) GetPairId() string { if m != nil { - return m.PairID + return m.PairId } return "" } @@ -927,7 +927,7 @@ func (m *QueryGetInactiveLimitOrderTrancheRequest) GetTrancheKey() string { } type QueryGetInactiveLimitOrderTrancheResponse struct { - InactiveLimitOrderTranche *LimitOrderTranche `protobuf:"bytes,1,opt,name=inactiveLimitOrderTranche,proto3" json:"inactiveLimitOrderTranche,omitempty"` + InactiveLimitOrderTranche *LimitOrderTranche `protobuf:"bytes,1,opt,name=inactive_limit_order_tranche,json=inactiveLimitOrderTranche,proto3" json:"inactive_limit_order_tranche,omitempty"` } func (m *QueryGetInactiveLimitOrderTrancheResponse) Reset() { @@ -1021,7 +1021,7 @@ func (m *QueryAllInactiveLimitOrderTrancheRequest) GetPagination() *query.PageRe } type QueryAllInactiveLimitOrderTrancheResponse struct { - InactiveLimitOrderTranche []*LimitOrderTranche `protobuf:"bytes,1,rep,name=inactiveLimitOrderTranche,proto3" json:"inactiveLimitOrderTranche,omitempty"` + InactiveLimitOrderTranche []*LimitOrderTranche `protobuf:"bytes,1,rep,name=inactive_limit_order_tranche,json=inactiveLimitOrderTranche,proto3" json:"inactive_limit_order_tranche,omitempty"` Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` } @@ -1077,8 +1077,8 @@ func (m *QueryAllInactiveLimitOrderTrancheResponse) GetPagination() *query.PageR } type QueryAllPoolReservesRequest struct { - PairID string `protobuf:"bytes,1,opt,name=pairID,proto3" json:"pairID,omitempty"` - TokenIn string `protobuf:"bytes,2,opt,name=tokenIn,proto3" json:"tokenIn,omitempty"` + PairId string `protobuf:"bytes,1,opt,name=pair_id,json=pairId,proto3" json:"pair_id,omitempty"` + TokenIn string `protobuf:"bytes,2,opt,name=token_in,json=tokenIn,proto3" json:"token_in,omitempty"` Pagination *query.PageRequest `protobuf:"bytes,3,opt,name=pagination,proto3" json:"pagination,omitempty"` } @@ -1115,9 +1115,9 @@ func (m *QueryAllPoolReservesRequest) XXX_DiscardUnknown() { var xxx_messageInfo_QueryAllPoolReservesRequest proto.InternalMessageInfo -func (m *QueryAllPoolReservesRequest) GetPairID() string { +func (m *QueryAllPoolReservesRequest) GetPairId() string { if m != nil { - return m.PairID + return m.PairId } return "" } @@ -1137,7 +1137,7 @@ func (m *QueryAllPoolReservesRequest) GetPagination() *query.PageRequest { } type QueryAllPoolReservesResponse struct { - PoolReserves []*PoolReserves `protobuf:"bytes,1,rep,name=poolReserves,proto3" json:"poolReserves,omitempty"` + PoolReserves []*PoolReserves `protobuf:"bytes,1,rep,name=pool_reserves,json=poolReserves,proto3" json:"pool_reserves,omitempty"` Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` } @@ -1189,9 +1189,9 @@ func (m *QueryAllPoolReservesResponse) GetPagination() *query.PageResponse { } type QueryGetPoolReservesRequest struct { - PairID string `protobuf:"bytes,1,opt,name=pairID,proto3" json:"pairID,omitempty"` - TokenIn string `protobuf:"bytes,2,opt,name=tokenIn,proto3" json:"tokenIn,omitempty"` - TickIndex int64 `protobuf:"varint,3,opt,name=tickIndex,proto3" json:"tickIndex,omitempty"` + PairId string `protobuf:"bytes,1,opt,name=pair_id,json=pairId,proto3" json:"pair_id,omitempty"` + TokenIn string `protobuf:"bytes,2,opt,name=token_in,json=tokenIn,proto3" json:"token_in,omitempty"` + TickIndex int64 `protobuf:"varint,3,opt,name=tick_index,json=tickIndex,proto3" json:"tick_index,omitempty"` Fee uint64 `protobuf:"varint,4,opt,name=fee,proto3" json:"fee,omitempty"` } @@ -1228,9 +1228,9 @@ func (m *QueryGetPoolReservesRequest) XXX_DiscardUnknown() { var xxx_messageInfo_QueryGetPoolReservesRequest proto.InternalMessageInfo -func (m *QueryGetPoolReservesRequest) GetPairID() string { +func (m *QueryGetPoolReservesRequest) GetPairId() string { if m != nil { - return m.PairID + return m.PairId } return "" } @@ -1257,7 +1257,7 @@ func (m *QueryGetPoolReservesRequest) GetFee() uint64 { } type QueryGetPoolReservesResponse struct { - PoolReserves *PoolReserves `protobuf:"bytes,1,opt,name=poolReserves,proto3" json:"poolReserves,omitempty"` + PoolReserves *PoolReserves `protobuf:"bytes,1,opt,name=pool_reserves,json=poolReserves,proto3" json:"pool_reserves,omitempty"` } func (m *QueryGetPoolReservesResponse) Reset() { *m = QueryGetPoolReservesResponse{} } @@ -1304,11 +1304,11 @@ type QueryEstimateMultiHopSwapRequest struct { 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 github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,4,opt,name=amountIn,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"amountIn" yaml:"amountIn"` - ExitLimitPrice github_com_neutron_org_neutron_utils_math.PrecDec `protobuf:"bytes,5,opt,name=exitLimitPrice,proto3,customtype=github.com/neutron-org/neutron/utils/math.PrecDec" json:"exitLimitPrice" yaml:"exitLimitPrice"` + AmountIn github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,4,opt,name=amount_in,json=amountIn,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"amountIn" yaml:"amountIn"` + ExitLimitPrice github_com_neutron_org_neutron_utils_math.PrecDec `protobuf:"bytes,5,opt,name=exit_limit_price,json=exitLimitPrice,proto3,customtype=github.com/neutron-org/neutron/utils/math.PrecDec" json:"exitLimitPrice" yaml:"exitLimitPrice"` // 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=pickBestRoute,proto3" json:"pickBestRoute,omitempty"` + PickBestRoute bool `protobuf:"varint,6,opt,name=pick_best_route,json=pickBestRoute,proto3" json:"pick_best_route,omitempty"` } func (m *QueryEstimateMultiHopSwapRequest) Reset() { *m = QueryEstimateMultiHopSwapRequest{} } @@ -1373,7 +1373,7 @@ func (m *QueryEstimateMultiHopSwapRequest) GetPickBestRoute() bool { } type QueryEstimateMultiHopSwapResponse struct { - CoinOut github_com_cosmos_cosmos_sdk_types.Coin `protobuf:"bytes,1,opt,name=coinOut,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Coin" json:"coinOut"` + 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:"coinOut"` } func (m *QueryEstimateMultiHopSwapResponse) Reset() { *m = QueryEstimateMultiHopSwapResponse{} } @@ -1412,14 +1412,14 @@ var xxx_messageInfo_QueryEstimateMultiHopSwapResponse proto.InternalMessageInfo type QueryEstimatePlaceLimitOrderRequest struct { 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=tokenIn,proto3" json:"tokenIn,omitempty"` - TokenOut string `protobuf:"bytes,4,opt,name=tokenOut,proto3" json:"tokenOut,omitempty"` - TickIndexInToOut int64 `protobuf:"varint,5,opt,name=tickIndexInToOut,proto3" json:"tickIndexInToOut,omitempty"` - AmountIn github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,6,opt,name=amountIn,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"amountIn" yaml:"amountIn"` - OrderType LimitOrderType `protobuf:"varint,7,opt,name=orderType,proto3,enum=neutron.dex.LimitOrderType" json:"orderType,omitempty"` + TokenIn string `protobuf:"bytes,3,opt,name=token_in,json=tokenIn,proto3" json:"token_in,omitempty"` + TokenOut string `protobuf:"bytes,4,opt,name=token_out,json=tokenOut,proto3" json:"token_out,omitempty"` + TickIndexInToOut int64 `protobuf:"varint,5,opt,name=tick_index_in_to_out,json=tickIndexInToOut,proto3" json:"tick_index_in_to_out,omitempty"` + AmountIn github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,6,opt,name=amount_in,json=amountIn,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"amountIn" yaml:"amountIn"` + OrderType LimitOrderType `protobuf:"varint,7,opt,name=order_type,json=orderType,proto3,enum=neutron.dex.LimitOrderType" json:"order_type,omitempty"` // expirationTime is only valid iff orderType == GOOD_TIL_TIME. - ExpirationTime *time.Time `protobuf:"bytes,8,opt,name=expirationTime,proto3,stdtime" json:"expirationTime,omitempty"` - MaxAmountOut *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,9,opt,name=maxAmountOut,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"maxAmountOut" yaml:"maxAmountOut"` + ExpirationTime *time.Time `protobuf:"bytes,8,opt,name=expiration_time,json=expirationTime,proto3,stdtime" json:"expiration_time,omitempty"` + MaxAmountOut *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,9,opt,name=maxAmount_out,json=maxAmountOut,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"maxAmountOut" yaml:"maxAmountOut"` } func (m *QueryEstimatePlaceLimitOrderRequest) Reset() { *m = QueryEstimatePlaceLimitOrderRequest{} } @@ -1507,13 +1507,13 @@ func (m *QueryEstimatePlaceLimitOrderRequest) GetExpirationTime() *time.Time { type QueryEstimatePlaceLimitOrderResponse struct { // Total amount of coin used for the limit order // You can derive makerLimitInCoin using the equation: totalInCoin = swapInCoin + makerLimitInCoin - TotalInCoin github_com_cosmos_cosmos_sdk_types.Coin `protobuf:"bytes,1,opt,name=totalInCoin,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Coin" json:"totalInCoin" yaml:"totalInCoin"` + TotalInCoin github_com_cosmos_cosmos_sdk_types.Coin `protobuf:"bytes,1,opt,name=total_in_coin,json=totalInCoin,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Coin" json:"totalInCoin" yaml:"totalInCoin"` // Total amount of the token in that was immediately swapped for swapOutCoin - SwapInCoin github_com_cosmos_cosmos_sdk_types.Coin `protobuf:"bytes,2,opt,name=swapInCoin,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Coin" json:"swapInCoin" yaml:"swapInCoin"` + SwapInCoin github_com_cosmos_cosmos_sdk_types.Coin `protobuf:"bytes,2,opt,name=swap_in_coin,json=swapInCoin,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Coin" json:"swapInCoin" yaml:"swapInCoin"` // 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 - SwapOutCoin github_com_cosmos_cosmos_sdk_types.Coin `protobuf:"bytes,3,opt,name=swapOutCoin,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Coin" json:"swapOutCoin" yaml:"swapOutCoin"` + SwapOutCoin github_com_cosmos_cosmos_sdk_types.Coin `protobuf:"bytes,3,opt,name=swap_out_coin,json=swapOutCoin,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Coin" json:"swapOutCoin" yaml:"swapOutCoin"` } func (m *QueryEstimatePlaceLimitOrderResponse) Reset() { *m = QueryEstimatePlaceLimitOrderResponse{} } @@ -1550,8 +1550,8 @@ func (m *QueryEstimatePlaceLimitOrderResponse) XXX_DiscardUnknown() { var xxx_messageInfo_QueryEstimatePlaceLimitOrderResponse proto.InternalMessageInfo type QueryPoolRequest struct { - PairID string `protobuf:"bytes,1,opt,name=pairID,proto3" json:"pairID,omitempty"` - TickIndex int64 `protobuf:"varint,2,opt,name=tickIndex,proto3" json:"tickIndex,omitempty"` + PairId string `protobuf:"bytes,1,opt,name=pair_id,json=pairId,proto3" json:"pair_id,omitempty"` + TickIndex int64 `protobuf:"varint,2,opt,name=tick_index,json=tickIndex,proto3" json:"tick_index,omitempty"` Fee uint64 `protobuf:"varint,3,opt,name=fee,proto3" json:"fee,omitempty"` } @@ -1588,9 +1588,9 @@ func (m *QueryPoolRequest) XXX_DiscardUnknown() { var xxx_messageInfo_QueryPoolRequest proto.InternalMessageInfo -func (m *QueryPoolRequest) GetPairID() string { +func (m *QueryPoolRequest) GetPairId() string { if m != nil { - return m.PairID + return m.PairId } return "" } @@ -1610,7 +1610,7 @@ func (m *QueryPoolRequest) GetFee() uint64 { } type QueryPoolByIDRequest struct { - PoolID uint64 `protobuf:"varint,1,opt,name=poolID,proto3" json:"poolID,omitempty"` + PoolId uint64 `protobuf:"varint,1,opt,name=pool_id,json=poolId,proto3" json:"pool_id,omitempty"` } func (m *QueryPoolByIDRequest) Reset() { *m = QueryPoolByIDRequest{} } @@ -1646,9 +1646,9 @@ func (m *QueryPoolByIDRequest) XXX_DiscardUnknown() { var xxx_messageInfo_QueryPoolByIDRequest proto.InternalMessageInfo -func (m *QueryPoolByIDRequest) GetPoolID() uint64 { +func (m *QueryPoolByIDRequest) GetPoolId() uint64 { if m != nil { - return m.PoolID + return m.PoolId } return 0 } @@ -1742,7 +1742,7 @@ func (m *QueryGetPoolMetadataRequest) GetId() uint64 { } type QueryGetPoolMetadataResponse struct { - PoolMetadata PoolMetadata `protobuf:"bytes,1,opt,name=PoolMetadata,proto3" json:"PoolMetadata"` + PoolMetadata PoolMetadata `protobuf:"bytes,1,opt,name=Pool_metadata,json=PoolMetadata,proto3" json:"Pool_metadata"` } func (m *QueryGetPoolMetadataResponse) Reset() { *m = QueryGetPoolMetadataResponse{} } @@ -1830,7 +1830,7 @@ func (m *QueryAllPoolMetadataRequest) GetPagination() *query.PageRequest { } type QueryAllPoolMetadataResponse struct { - PoolMetadata []PoolMetadata `protobuf:"bytes,1,rep,name=PoolMetadata,proto3" json:"PoolMetadata"` + PoolMetadata []PoolMetadata `protobuf:"bytes,1,rep,name=pool_metadata,json=poolMetadata,proto3" json:"pool_metadata"` Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` } @@ -1922,139 +1922,144 @@ func init() { func init() { proto.RegisterFile("neutron/dex/query.proto", fileDescriptor_b6613ea5fce61e9c) } var fileDescriptor_b6613ea5fce61e9c = []byte{ - // 2097 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x5a, 0xcf, 0x6f, 0x1c, 0x49, - 0x15, 0x4e, 0x79, 0x1c, 0xc7, 0xa9, 0xec, 0xe6, 0x47, 0xc5, 0xd9, 0x4c, 0x26, 0xde, 0x19, 0xa7, - 0x49, 0x62, 0xc7, 0x1b, 0x77, 0xc7, 0x5e, 0xb2, 0x12, 0xcb, 0x0a, 0xb0, 0xd7, 0x24, 0x3b, 0x90, - 0x10, 0xd3, 0xeb, 0x5c, 0x16, 0x89, 0xa1, 0x3d, 0x53, 0x19, 0xb7, 0xdc, 0xd3, 0xd5, 0xe9, 0xae, - 0x49, 0x3c, 0xb2, 0x2c, 0xa4, 0xbd, 0x20, 0xa1, 0x45, 0x2c, 0xb0, 0x12, 0x08, 0xc1, 0x01, 0x21, - 0x6e, 0x91, 0x58, 0x71, 0x80, 0x1b, 0xe2, 0xc0, 0x21, 0xc7, 0x48, 0x5c, 0x56, 0x1c, 0x06, 0x94, - 0x20, 0x21, 0xe5, 0xe8, 0xbf, 0x00, 0x55, 0xf5, 0xeb, 0x99, 0xea, 0x99, 0xee, 0xe9, 0x99, 0x64, - 0x96, 0x3d, 0xb9, 0xbb, 0xfa, 0x55, 0xbd, 0xef, 0x7d, 0xf5, 0x55, 0xbd, 0xaa, 0x37, 0xc6, 0x67, - 0x5d, 0xda, 0xe4, 0x3e, 0x73, 0x8d, 0x1a, 0xdd, 0x35, 0xee, 0x37, 0xa9, 0xdf, 0xd2, 0x3d, 0x9f, - 0x71, 0x46, 0x8e, 0xc1, 0x07, 0xbd, 0x46, 0x77, 0x0b, 0x33, 0x75, 0x56, 0x67, 0xb2, 0xdd, 0x10, - 0x4f, 0xa1, 0x49, 0x61, 0xb6, 0xce, 0x58, 0xdd, 0xa1, 0x86, 0xe5, 0xd9, 0x86, 0xe5, 0xba, 0x8c, - 0x5b, 0xdc, 0x66, 0x6e, 0x00, 0x5f, 0x17, 0xab, 0x2c, 0x68, 0xb0, 0xc0, 0xd8, 0xb2, 0x02, 0x1a, - 0x8e, 0x6c, 0x3c, 0x58, 0xde, 0xa2, 0xdc, 0x5a, 0x36, 0x3c, 0xab, 0x6e, 0xbb, 0xd2, 0x18, 0x6c, - 0xf3, 0x2a, 0x0a, 0xcf, 0xf2, 0xad, 0x46, 0x67, 0x14, 0xf5, 0x8b, 0x63, 0x37, 0x6c, 0x5e, 0x61, - 0x7e, 0x8d, 0xfa, 0x15, 0xee, 0x5b, 0x6e, 0x75, 0x9b, 0x56, 0x9a, 0x01, 0xf5, 0xc1, 0xf6, 0x52, - 0x86, 0x2d, 0x98, 0xcd, 0xa9, 0x66, 0x35, 0xea, 0xb1, 0xc0, 0xe6, 0x15, 0x9f, 0x56, 0x99, 0x5f, - 0x4b, 0xb2, 0xe0, 0x76, 0x75, 0xa7, 0xe2, 0xd8, 0xf7, 0x9b, 0x76, 0xcd, 0xe6, 0xc0, 0x4e, 0xa1, - 0x14, 0x03, 0xcc, 0x98, 0x53, 0xf1, 0x69, 0x40, 0xfd, 0x07, 0x34, 0xc2, 0x3d, 0x13, 0x1b, 0x62, - 0x17, 0x5a, 0x8b, 0x2a, 0x27, 0x11, 0x1b, 0x55, 0x66, 0x47, 0x3c, 0x94, 0x80, 0x51, 0xf9, 0xb6, - 0xd5, 0xbc, 0x67, 0x70, 0xbb, 0x41, 0x03, 0x6e, 0x35, 0x3c, 0x30, 0x78, 0xad, 0xd7, 0x6f, 0x2a, - 0x9e, 0x06, 0xe5, 0x56, 0xcd, 0xe2, 0x56, 0x68, 0xa0, 0xcd, 0x60, 0xf2, 0x5d, 0x31, 0x07, 0x1b, - 0x92, 0x5c, 0x93, 0xde, 0x6f, 0xd2, 0x80, 0x6b, 0xef, 0xe1, 0xd3, 0xb1, 0xd6, 0xc0, 0x63, 0x6e, - 0x40, 0xc9, 0x32, 0x9e, 0x0a, 0x27, 0x21, 0x8f, 0xe6, 0xd0, 0xc2, 0xb1, 0x95, 0xd3, 0xba, 0x22, - 0x06, 0x3d, 0x34, 0x5e, 0x9b, 0x7c, 0xdc, 0x2e, 0x1d, 0x32, 0xc1, 0x50, 0xfb, 0x01, 0xbe, 0x28, - 0x47, 0xba, 0x49, 0xf9, 0x2d, 0xc1, 0xfc, 0x1d, 0x41, 0xfc, 0x66, 0xc8, 0xfb, 0xdd, 0x80, 0xfa, - 0xe0, 0x91, 0xe4, 0xf1, 0x11, 0xab, 0x56, 0xf3, 0x69, 0x10, 0x8e, 0x7d, 0xd4, 0x8c, 0x5e, 0x49, - 0x11, 0x63, 0x98, 0xa7, 0x6f, 0xd3, 0x56, 0x7e, 0x42, 0x7e, 0x54, 0x5a, 0xb4, 0x1f, 0x21, 0x7c, - 0x29, 0xc3, 0x05, 0xc0, 0xff, 0x3e, 0x3e, 0x93, 0x68, 0x00, 0xd1, 0x68, 0xb1, 0x68, 0x12, 0x2d, - 0x65, 0x70, 0xc8, 0x4c, 0x1e, 0x46, 0x73, 0x21, 0xd6, 0x55, 0xc7, 0x19, 0x18, 0xeb, 0x0d, 0x8c, - 0xbb, 0x4a, 0x07, 0xe7, 0x97, 0xf5, 0x50, 0x02, 0xba, 0x90, 0x80, 0x1e, 0x2e, 0x38, 0x10, 0x82, - 0xbe, 0x61, 0xd5, 0x29, 0xf4, 0x35, 0x95, 0x9e, 0xda, 0x93, 0x28, 0xf2, 0x74, 0x87, 0xd9, 0x91, - 0xe7, 0xc6, 0x10, 0x39, 0xb9, 0x19, 0x8b, 0x68, 0x42, 0x46, 0x34, 0x9f, 0x19, 0x51, 0x08, 0x2e, - 0x16, 0xd2, 0xcf, 0x11, 0x9e, 0x4b, 0x9d, 0xcc, 0x88, 0xbf, 0xd7, 0x84, 0x0c, 0x6d, 0xbf, 0xbc, - 0x0e, 0x52, 0x81, 0x37, 0x32, 0x8b, 0x8f, 0x8a, 0x45, 0x59, 0x76, 0x6b, 0x74, 0x57, 0x82, 0xc8, - 0x99, 0xdd, 0x06, 0xa1, 0x30, 0xce, 0x76, 0xa8, 0x5b, 0x76, 0xf3, 0xb9, 0x50, 0x61, 0xf0, 0xda, - 0xa3, 0xb0, 0xc9, 0x3e, 0x85, 0x3d, 0xc4, 0x17, 0x06, 0x60, 0x02, 0x8a, 0x4d, 0x7c, 0xaa, 0xef, - 0x23, 0xcc, 0x6d, 0x71, 0x30, 0xbd, 0x40, 0x6d, 0x7f, 0x77, 0xed, 0x37, 0x11, 0x1b, 0x49, 0x13, - 0x9c, 0xc5, 0x86, 0x12, 0xef, 0x44, 0x3c, 0xde, 0xb8, 0xfe, 0x72, 0x2f, 0xac, 0xbf, 0xbf, 0x21, - 0x20, 0x26, 0x19, 0xde, 0x60, 0x62, 0x72, 0x2f, 0x41, 0xcc, 0xf8, 0xf4, 0xf6, 0x43, 0x7c, 0x3e, - 0x8a, 0x40, 0x08, 0x79, 0x3d, 0xdc, 0xf5, 0x83, 0xec, 0x5d, 0xe9, 0x46, 0x02, 0x82, 0x17, 0xe1, - 0xf0, 0x0f, 0x08, 0xcf, 0x26, 0x23, 0x00, 0xfa, 0xde, 0xc1, 0xd3, 0x51, 0x1b, 0xb0, 0x56, 0x88, - 0xb1, 0x06, 0x1f, 0x4d, 0x99, 0xa7, 0x80, 0xb1, 0x4e, 0x8f, 0xf1, 0x11, 0xf5, 0x21, 0xc2, 0x45, - 0x15, 0x67, 0x77, 0x4e, 0xfe, 0x8f, 0x64, 0xfd, 0x19, 0xe1, 0x52, 0x2a, 0x08, 0xe0, 0xeb, 0x5b, - 0xf8, 0x98, 0xd3, 0x6d, 0x1e, 0x79, 0x83, 0x53, 0x3b, 0x8f, 0x8f, 0xbd, 0x5f, 0x29, 0xb3, 0xbc, - 0x69, 0x57, 0x77, 0x6e, 0x45, 0xc7, 0x86, 0x2f, 0x7e, 0x11, 0x7f, 0x8a, 0xf0, 0xeb, 0x29, 0xd0, - 0x80, 0xd1, 0x1b, 0xf8, 0x55, 0xae, 0x7e, 0x48, 0x94, 0x61, 0xac, 0x2b, 0x70, 0x19, 0xef, 0x36, - 0x3e, 0x36, 0x7f, 0x8d, 0xf0, 0x42, 0xb4, 0x21, 0x97, 0x5d, 0xab, 0xca, 0xed, 0x07, 0x74, 0x8c, - 0xdb, 0x63, 0x2c, 0x8d, 0xe4, 0x7a, 0xd3, 0x48, 0x56, 0xb2, 0xf8, 0x29, 0xc2, 0x57, 0x86, 0x00, - 0x07, 0xdc, 0x6e, 0xe1, 0x73, 0x76, 0x9a, 0xd1, 0x48, 0xd9, 0x23, 0x7d, 0x18, 0xcd, 0x07, 0xb6, - 0x56, 0x1d, 0x27, 0x93, 0xad, 0x71, 0x1d, 0x4d, 0x3e, 0x8b, 0x58, 0x18, 0xec, 0x74, 0x38, 0x16, - 0x72, 0x63, 0x60, 0x61, 0x7c, 0xea, 0xfb, 0x25, 0xea, 0xe6, 0x8c, 0x0d, 0xc6, 0x1c, 0x13, 0x0e, - 0xf8, 0x5f, 0xfc, 0x52, 0x7e, 0xa4, 0xec, 0x32, 0x71, 0x64, 0xc0, 0xf3, 0xbb, 0xf8, 0x15, 0x4f, - 0x69, 0x07, 0x6a, 0xcf, 0xc5, 0x4f, 0xf1, 0x8a, 0x01, 0xb0, 0x1a, 0xeb, 0x34, 0xfe, 0xdc, 0x7b, - 0x93, 0xf2, 0xf1, 0xf0, 0x38, 0x78, 0xe1, 0x9e, 0xc4, 0xb9, 0x7b, 0x94, 0xca, 0x15, 0x3b, 0x69, - 0x8a, 0x47, 0xad, 0x0a, 0x74, 0xf5, 0x01, 0x48, 0xa5, 0x0b, 0x8d, 0x4c, 0x97, 0xf6, 0x28, 0x07, - 0x67, 0xb8, 0x6f, 0x06, 0xdc, 0x6e, 0x58, 0x9c, 0xde, 0x6e, 0x3a, 0xdc, 0x7e, 0x8f, 0x79, 0xef, - 0x3f, 0xb4, 0x3c, 0x25, 0x75, 0x56, 0x7d, 0x6a, 0x71, 0xe6, 0x47, 0xa9, 0x13, 0x5e, 0x49, 0x01, - 0x4f, 0xfb, 0xb4, 0x4a, 0xed, 0x07, 0xd4, 0x87, 0x70, 0x3b, 0xef, 0x64, 0x05, 0x4f, 0xf9, 0xac, - 0xc9, 0x69, 0x90, 0xcf, 0x25, 0xec, 0xc8, 0x91, 0x1f, 0x53, 0x98, 0x98, 0x60, 0x49, 0x6c, 0x3c, - 0x6d, 0x35, 0x58, 0xd3, 0xe5, 0x65, 0x37, 0xdc, 0xbc, 0xd6, 0x6e, 0x8b, 0xfb, 0xda, 0x3f, 0xdb, - 0xa5, 0xcb, 0x75, 0x9b, 0x6f, 0x37, 0xb7, 0xf4, 0x2a, 0x6b, 0x18, 0x70, 0x1d, 0x0d, 0xff, 0x2c, - 0x05, 0xb5, 0x1d, 0x83, 0xb7, 0x3c, 0x1a, 0xe8, 0x65, 0x97, 0x3f, 0x6f, 0x97, 0x3a, 0x23, 0x1c, - 0xb4, 0x4b, 0x27, 0x5a, 0x56, 0xc3, 0x79, 0x5b, 0x8b, 0x5a, 0x34, 0xb3, 0xf3, 0x91, 0x7c, 0x84, - 0xf0, 0x71, 0xba, 0x6b, 0x87, 0x67, 0xe6, 0x0d, 0xdf, 0xae, 0xd2, 0xfc, 0x61, 0xe9, 0xb1, 0x06, - 0x1e, 0x97, 0x15, 0x8f, 0x80, 0x7c, 0x89, 0xf9, 0xf5, 0xe8, 0xd9, 0x68, 0x72, 0xdb, 0x09, 0x8c, - 0x86, 0xc5, 0xb7, 0xf5, 0x0d, 0x9f, 0x56, 0xd7, 0x69, 0xf5, 0x79, 0xbb, 0xd4, 0x33, 0xe4, 0x41, - 0xbb, 0x74, 0x26, 0x84, 0x10, 0x6f, 0xd7, 0xcc, 0x1e, 0x43, 0x72, 0x11, 0xbf, 0xea, 0xd9, 0xd5, - 0x9d, 0x35, 0xb1, 0x6a, 0x04, 0x17, 0xf9, 0xa9, 0x39, 0xb4, 0x30, 0x6d, 0xc6, 0x1b, 0xb5, 0x4f, - 0xa2, 0x33, 0x6d, 0xf2, 0x74, 0x81, 0x32, 0x18, 0x3e, 0x22, 0x6e, 0xe7, 0x77, 0x9a, 0xbc, 0x23, - 0x0a, 0x75, 0x01, 0x44, 0xd2, 0x7f, 0x97, 0xd9, 0xee, 0xda, 0xdb, 0x10, 0xed, 0xfc, 0x10, 0xfc, - 0x8a, 0x0e, 0xcf, 0xdb, 0xa5, 0x68, 0x70, 0x33, 0x7a, 0xd0, 0x1e, 0x4d, 0xe2, 0x2f, 0xc5, 0x60, - 0x6d, 0x38, 0x56, 0x55, 0xd9, 0xe5, 0x5e, 0x4e, 0x48, 0xe9, 0x57, 0xa3, 0x02, 0x9e, 0x96, 0x8f, - 0x22, 0xd2, 0x30, 0xd7, 0x75, 0xde, 0xc9, 0x22, 0x3e, 0xd9, 0x59, 0x5d, 0x65, 0x77, 0x93, 0x09, - 0x9b, 0xc3, 0x72, 0xd5, 0xf5, 0xb5, 0xc7, 0x64, 0x37, 0xf5, 0xf9, 0xca, 0xee, 0x2b, 0xf8, 0xa8, - 0xac, 0xee, 0x6c, 0xb6, 0x3c, 0x9a, 0x3f, 0x32, 0x87, 0x16, 0x8e, 0xaf, 0x9c, 0x4f, 0x4b, 0x1e, - 0x2d, 0x8f, 0x9a, 0x5d, 0x6b, 0x72, 0x4b, 0x08, 0xd6, 0xb3, 0x7d, 0xb9, 0x3f, 0x6d, 0xda, 0x0d, - 0x9a, 0x9f, 0x96, 0xb3, 0x5b, 0xd0, 0xc3, 0xfa, 0x8b, 0x1e, 0xd5, 0x5f, 0xf4, 0xcd, 0xa8, 0xfe, - 0xb2, 0x36, 0x2d, 0xd6, 0xfc, 0xc7, 0xff, 0x2a, 0x21, 0xb3, 0xa7, 0x2f, 0x69, 0xe1, 0x57, 0x1a, - 0xd6, 0xee, 0xaa, 0xc4, 0x25, 0xb8, 0x39, 0x2a, 0xe3, 0xbe, 0x2b, 0xec, 0x47, 0x8a, 0x3b, 0x36, - 0xca, 0x41, 0xbb, 0x74, 0x3a, 0x8c, 0x5d, 0x6d, 0xd5, 0xcc, 0x98, 0x91, 0xd6, 0xce, 0x41, 0x29, - 0x22, 0x55, 0x2e, 0x20, 0xe4, 0x9f, 0x21, 0x7c, 0x8c, 0x33, 0x6e, 0x39, 0x65, 0x57, 0x68, 0x2f, - 0x5b, 0xcd, 0x9b, 0xa3, 0xab, 0x59, 0x75, 0x70, 0xd0, 0x2e, 0x91, 0x10, 0xbe, 0xd2, 0xa8, 0x99, - 0xaa, 0x09, 0xf9, 0x09, 0xc2, 0x38, 0x78, 0x68, 0x79, 0x00, 0x69, 0x22, 0x0b, 0x92, 0x39, 0x3a, - 0x24, 0x65, 0xfc, 0x83, 0x76, 0xe9, 0x54, 0x88, 0xa8, 0xdb, 0xa6, 0x99, 0x8a, 0x81, 0xe4, 0x48, - 0xbc, 0xde, 0x69, 0x72, 0x09, 0x28, 0xf7, 0x79, 0x70, 0xa4, 0x38, 0xe8, 0x72, 0xa4, 0x34, 0x6a, - 0xa6, 0x6a, 0xa2, 0x7d, 0x80, 0x4f, 0x86, 0x05, 0x3a, 0x99, 0x6a, 0x5e, 0xa6, 0x2c, 0x02, 0x69, - 0x31, 0xd7, 0x4d, 0x8b, 0x3a, 0x9e, 0xe9, 0x8c, 0xbd, 0xd6, 0x2a, 0xaf, 0xab, 0xe3, 0x33, 0xe6, - 0xc0, 0xf8, 0x93, 0x26, 0xbc, 0x69, 0xdf, 0xc0, 0xa7, 0x14, 0x2c, 0x20, 0xac, 0x37, 0xf0, 0xa4, - 0xf8, 0x0c, 0x82, 0x3a, 0xd5, 0x97, 0x33, 0x21, 0x57, 0x4a, 0x23, 0x6d, 0x29, 0x7e, 0x12, 0xb8, - 0x0d, 0x25, 0xca, 0xc8, 0xf1, 0x71, 0x3c, 0x61, 0xd7, 0xc0, 0xe9, 0x84, 0x5d, 0xeb, 0xcd, 0xdb, - 0x5d, 0xf3, 0x6e, 0xde, 0x56, 0xdb, 0x53, 0xf3, 0x76, 0x64, 0x00, 0x25, 0xcb, 0x58, 0x27, 0x8d, - 0xc6, 0x4f, 0x79, 0xbd, 0x98, 0xc6, 0x75, 0x50, 0xee, 0x3d, 0xb3, 0x0d, 0x11, 0x4c, 0x6e, 0xe4, - 0x60, 0xc6, 0x76, 0x66, 0x5b, 0xf9, 0xcb, 0x59, 0x7c, 0x58, 0xc2, 0x25, 0xdb, 0x78, 0x2a, 0x2c, - 0xf8, 0x92, 0x52, 0x0c, 0x4b, 0x7f, 0x35, 0xb9, 0x30, 0x97, 0x6e, 0x10, 0xba, 0xd0, 0xce, 0x7f, - 0xf8, 0x8f, 0xff, 0xfc, 0x62, 0xe2, 0x0c, 0x39, 0x6d, 0xf4, 0x17, 0xfc, 0xc9, 0xdf, 0x51, 0x4a, - 0xf5, 0x92, 0x2c, 0xf7, 0x0f, 0x9c, 0x51, 0x67, 0x2e, 0xac, 0x8c, 0xd2, 0x05, 0xd0, 0xad, 0x4b, - 0x74, 0x5f, 0x23, 0xef, 0x18, 0xc3, 0xfc, 0xe8, 0x60, 0xec, 0x41, 0xd9, 0x63, 0xdf, 0xd8, 0xeb, - 0xde, 0x0b, 0xf7, 0xc9, 0xa7, 0x08, 0xe7, 0x13, 0xfd, 0xac, 0x3a, 0x4e, 0x52, 0x24, 0x19, 0x55, - 0xe4, 0xa4, 0x48, 0xb2, 0xea, 0xc0, 0xda, 0x92, 0x8c, 0x64, 0x9e, 0x5c, 0x1a, 0x2a, 0x12, 0x01, - 0xf9, 0x42, 0x1a, 0xe4, 0xb5, 0xd6, 0x2a, 0x54, 0x77, 0xde, 0x48, 0x04, 0x92, 0x5c, 0x24, 0x2a, - 0x5c, 0x1d, 0xce, 0x18, 0xf0, 0x5e, 0x93, 0x78, 0x17, 0xc9, 0x42, 0x0c, 0xaf, 0x64, 0x59, 0x01, - 0x1d, 0x74, 0x29, 0x27, 0x8f, 0x51, 0x42, 0xb9, 0x91, 0x2c, 0x0d, 0x37, 0xeb, 0x11, 0x48, 0x7d, - 0x58, 0x73, 0x80, 0xb9, 0x29, 0x61, 0x7e, 0x87, 0xdc, 0xca, 0xa2, 0xd5, 0xd8, 0x0b, 0xf7, 0x64, - 0x21, 0x8d, 0xf0, 0x84, 0x25, 0x9e, 0xa2, 0xbd, 0xb8, 0x47, 0x30, 0x7f, 0x42, 0x78, 0xa6, 0xcf, - 0xa7, 0x10, 0xcb, 0xd2, 0x70, 0x33, 0x3f, 0x20, 0x9a, 0x41, 0x05, 0x5b, 0xed, 0xab, 0x32, 0x9a, - 0xeb, 0xe4, 0xcd, 0x17, 0x88, 0x86, 0x7c, 0x82, 0xf0, 0x09, 0xb5, 0x8e, 0x29, 0xf0, 0x2e, 0xa4, - 0xce, 0x79, 0x4f, 0xbd, 0xb5, 0x70, 0x65, 0x08, 0x4b, 0x40, 0x79, 0x55, 0xa2, 0xbc, 0x4c, 0x2e, - 0xf6, 0x4b, 0x03, 0x7e, 0xbb, 0x53, 0x65, 0xf1, 0x3b, 0x84, 0x4f, 0xc6, 0x4a, 0x54, 0x02, 0x57, - 0xb2, 0xb7, 0xa4, 0xfa, 0x5c, 0x61, 0x71, 0x18, 0x53, 0x40, 0xf6, 0x96, 0x44, 0x76, 0x8d, 0xe8, - 0x46, 0xfa, 0xcf, 0x85, 0x49, 0xd4, 0xfd, 0x17, 0xe1, 0x73, 0xa9, 0xb5, 0x12, 0x72, 0x3d, 0x51, - 0x93, 0x59, 0x05, 0x9d, 0xc2, 0x5b, 0xa3, 0x76, 0x83, 0x20, 0xbe, 0x27, 0x83, 0xb8, 0x4b, 0xde, - 0x8f, 0x05, 0x71, 0xcf, 0x76, 0x1c, 0x5a, 0xab, 0xbc, 0xac, 0xb2, 0xff, 0x8a, 0xf0, 0x6c, 0x2a, - 0x04, 0x31, 0x33, 0xd7, 0x13, 0xe9, 0x7e, 0x91, 0x60, 0x87, 0xa9, 0x3f, 0x69, 0x86, 0x0c, 0xf6, - 0x0a, 0x99, 0x1f, 0x32, 0x58, 0xf2, 0x5b, 0x84, 0x4f, 0xa8, 0x37, 0xff, 0x74, 0x95, 0x27, 0x54, - 0x36, 0x52, 0x54, 0x9e, 0x54, 0x82, 0xd0, 0xae, 0x4b, 0x64, 0x06, 0x59, 0x32, 0x52, 0x7f, 0x58, - 0x4e, 0x92, 0xd2, 0x23, 0x14, 0x9e, 0x1a, 0x3a, 0x45, 0x9b, 0x85, 0x44, 0x19, 0x0c, 0x09, 0x2e, - 0xa5, 0x3e, 0xa2, 0xdd, 0x94, 0xe0, 0x56, 0xc9, 0xd7, 0x47, 0x02, 0x17, 0x97, 0xc5, 0x3d, 0x4a, - 0xf7, 0xc9, 0xef, 0x11, 0x9e, 0x49, 0xba, 0x6f, 0x27, 0xed, 0x74, 0x03, 0xca, 0x28, 0x49, 0x3b, - 0xdd, 0xa0, 0x6b, 0x7c, 0xca, 0x1e, 0x42, 0xa1, 0x4b, 0xa5, 0x21, 0xfa, 0x54, 0xb6, 0x99, 0x57, - 0x11, 0x47, 0x6f, 0xf2, 0x47, 0x84, 0xcf, 0xa6, 0xdc, 0xa7, 0xc8, 0xb5, 0x74, 0xcf, 0xc9, 0x37, - 0xf5, 0xc2, 0xf2, 0x08, 0x3d, 0x06, 0xca, 0xb4, 0x03, 0xd7, 0x13, 0xdd, 0x54, 0xb9, 0x92, 0x3d, - 0x3c, 0x29, 0x26, 0x8e, 0xbc, 0x9e, 0x70, 0x00, 0xeb, 0x5e, 0x1c, 0x0a, 0xc5, 0xb4, 0xcf, 0xe0, - 0xf7, 0xcb, 0xd2, 0xaf, 0x4e, 0xae, 0xf6, 0xcd, 0xb3, 0x3a, 0xbd, 0xbd, 0x93, 0x7a, 0x1f, 0x4f, - 0x47, 0x37, 0x08, 0x72, 0x21, 0xd9, 0x83, 0x72, 0xbb, 0xc8, 0x04, 0xa1, 0x49, 0x10, 0xb3, 0xa4, - 0x90, 0x04, 0x42, 0x5e, 0x44, 0xf6, 0xc9, 0x47, 0x28, 0x7e, 0x58, 0x1e, 0x20, 0xfb, 0x9e, 0xf3, - 0xfc, 0x00, 0xd9, 0xf7, 0x9e, 0xc8, 0xb5, 0x79, 0x89, 0xe4, 0x02, 0x29, 0x19, 0xa9, 0xff, 0x5c, - 0x61, 0xec, 0xd9, 0xb5, 0x7d, 0xf2, 0x63, 0xd8, 0x25, 0xa2, 0x11, 0x06, 0xef, 0x12, 0x43, 0x20, - 0x4a, 0xb9, 0x23, 0x0c, 0xe0, 0xa6, 0x83, 0x68, 0x6d, 0xfd, 0xf1, 0xd3, 0x22, 0x7a, 0xf2, 0xb4, - 0x88, 0xfe, 0xfd, 0xb4, 0x88, 0x3e, 0x7e, 0x56, 0x3c, 0xf4, 0xe4, 0x59, 0xf1, 0xd0, 0x67, 0xcf, - 0x8a, 0x87, 0x3e, 0x58, 0xcc, 0x28, 0xc3, 0xed, 0x86, 0xf9, 0x4b, 0x5c, 0x57, 0xb7, 0xa6, 0x64, - 0x05, 0xe4, 0xcd, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0xfd, 0x47, 0x35, 0x89, 0x1f, 0x24, 0x00, - 0x00, + // 2185 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x5a, 0xcf, 0x6f, 0x1b, 0xc7, + 0xf5, 0xf7, 0x8a, 0xb2, 0x2c, 0x8d, 0x24, 0x4b, 0x1a, 0xc9, 0x5f, 0xd3, 0x94, 0x4c, 0xca, 0x9b, + 0xd8, 0x92, 0x9d, 0x88, 0x6b, 0xe9, 0x0b, 0x27, 0x85, 0xd1, 0xa0, 0x15, 0xab, 0xc4, 0x61, 0x13, + 0x43, 0xea, 0x56, 0x41, 0x7f, 0xa0, 0xc0, 0x62, 0xc5, 0x1d, 0x4b, 0x5b, 0x2d, 0x77, 0xd7, 0xbb, + 0x43, 0x47, 0xac, 0x61, 0x14, 0xc8, 0x31, 0x28, 0xda, 0xa0, 0x69, 0x0b, 0xb4, 0x87, 0xf4, 0x50, + 0xf4, 0x58, 0xb4, 0x01, 0x8a, 0xf6, 0xd6, 0x43, 0x81, 0x02, 0x39, 0xe4, 0x10, 0x20, 0x97, 0xa2, + 0x05, 0xd8, 0xc2, 0xce, 0xc9, 0xbd, 0xf9, 0x2f, 0x28, 0x66, 0xf6, 0x2d, 0x39, 0x4b, 0xce, 0x72, + 0x49, 0x9b, 0x29, 0x72, 0xd2, 0xee, 0xec, 0x9b, 0x79, 0x9f, 0xf7, 0x99, 0xcf, 0xcc, 0x9b, 0x79, + 0x14, 0x3a, 0xef, 0x92, 0x06, 0x0d, 0x3c, 0x57, 0xb3, 0xc8, 0x89, 0x76, 0xb7, 0x41, 0x82, 0x66, + 0xd9, 0x0f, 0x3c, 0xea, 0xe1, 0x69, 0xf8, 0x50, 0xb6, 0xc8, 0x49, 0x61, 0xe9, 0xd0, 0x3b, 0xf4, + 0x78, 0xbb, 0xc6, 0x9e, 0x22, 0x93, 0xc2, 0xca, 0xa1, 0xe7, 0x1d, 0x3a, 0x44, 0x33, 0x7d, 0x5b, + 0x33, 0x5d, 0xd7, 0xa3, 0x26, 0xb5, 0x3d, 0x37, 0x84, 0xaf, 0xd7, 0x6a, 0x5e, 0x58, 0xf7, 0x42, + 0xed, 0xc0, 0x0c, 0x49, 0x34, 0xb2, 0x76, 0x6f, 0xf3, 0x80, 0x50, 0x73, 0x53, 0xf3, 0xcd, 0x43, + 0xdb, 0xe5, 0xc6, 0x60, 0x9b, 0x17, 0x51, 0xf8, 0x66, 0x60, 0xd6, 0xdb, 0xa3, 0x88, 0x5f, 0x1c, + 0xbb, 0x6e, 0x53, 0xc3, 0x0b, 0x2c, 0x12, 0x18, 0x34, 0x30, 0xdd, 0xda, 0x11, 0x31, 0x1a, 0x21, + 0x09, 0xc0, 0xf6, 0x72, 0x86, 0x2d, 0x98, 0xad, 0x8a, 0x66, 0x16, 0xf1, 0xbd, 0xd0, 0xa6, 0x46, + 0x40, 0x6a, 0x5e, 0x60, 0xc9, 0x2c, 0xa8, 0x5d, 0x3b, 0x36, 0x1c, 0xfb, 0x6e, 0xc3, 0xb6, 0x6c, + 0x0a, 0xec, 0x14, 0x4a, 0x09, 0xc0, 0x9e, 0xe7, 0x18, 0x01, 0x09, 0x49, 0x70, 0x8f, 0xc4, 0xb8, + 0x97, 0x12, 0x43, 0x9c, 0x40, 0x6b, 0x51, 0xe4, 0x24, 0x66, 0xa3, 0xe6, 0xd9, 0x31, 0x0f, 0x25, + 0x60, 0x94, 0xbf, 0x1d, 0x34, 0xee, 0x68, 0xd4, 0xae, 0x93, 0x90, 0x9a, 0x75, 0x1f, 0x0c, 0xfe, + 0xaf, 0xdb, 0x6f, 0x2a, 0x9e, 0x3a, 0xa1, 0xa6, 0x65, 0x52, 0x33, 0x32, 0x50, 0x97, 0x10, 0xfe, + 0x06, 0x9b, 0x83, 0x3d, 0x4e, 0xae, 0x4e, 0xee, 0x36, 0x48, 0x48, 0xd5, 0xd7, 0xd1, 0x62, 0xa2, + 0x35, 0xf4, 0x3d, 0x37, 0x24, 0x78, 0x13, 0x4d, 0x44, 0x93, 0x90, 0x57, 0x56, 0x95, 0xf5, 0xe9, + 0xad, 0xc5, 0xb2, 0x20, 0x86, 0x72, 0x64, 0x5c, 0x19, 0xff, 0xa8, 0x55, 0x3a, 0xa5, 0x83, 0xa1, + 0x6a, 0xa2, 0xe7, 0xf9, 0x48, 0xb7, 0x08, 0x7d, 0x93, 0x31, 0xbf, 0xcb, 0x88, 0xdf, 0x8f, 0x78, + 0x7f, 0x2b, 0x24, 0x01, 0x78, 0xc4, 0x79, 0x74, 0xc6, 0xb4, 0xac, 0x80, 0x84, 0xd1, 0xd8, 0x53, + 0x7a, 0xfc, 0x8a, 0x4b, 0x68, 0x3a, 0x9e, 0xd3, 0x63, 0xd2, 0xcc, 0x8f, 0xf1, 0xaf, 0x08, 0x9a, + 0xde, 0x20, 0x4d, 0xf5, 0x5d, 0x05, 0x5d, 0xce, 0xf0, 0x01, 0xf8, 0x4d, 0x94, 0x4f, 0x93, 0x0a, + 0x44, 0xa4, 0x26, 0x22, 0x92, 0x8e, 0xc6, 0x03, 0x54, 0xf4, 0x73, 0x8e, 0xec, 0xa3, 0xea, 0x42, + 0xbc, 0xdb, 0x8e, 0xd3, 0x37, 0xde, 0xd7, 0x10, 0xea, 0xa8, 0x1d, 0x9c, 0x5f, 0x29, 0x47, 0x32, + 0x28, 0x33, 0x19, 0x94, 0xa3, 0x45, 0x07, 0x62, 0x28, 0xef, 0x99, 0x87, 0x04, 0xfa, 0xea, 0x42, + 0x4f, 0xf5, 0xd3, 0x38, 0xf8, 0x74, 0x87, 0x03, 0x05, 0x9f, 0x1b, 0x41, 0xf0, 0xf8, 0x56, 0x22, + 0xa8, 0x31, 0x1e, 0xd4, 0x5a, 0x66, 0x50, 0x11, 0xbe, 0x44, 0x54, 0xbf, 0x50, 0xd0, 0x6a, 0xea, + 0x94, 0xc6, 0x14, 0x9e, 0x47, 0x67, 0x7c, 0xd3, 0x0e, 0x0c, 0xdb, 0x02, 0xc9, 0x4c, 0xb0, 0xd7, + 0xaa, 0x85, 0x2f, 0x22, 0xc4, 0x17, 0xa7, 0xed, 0x5a, 0xe4, 0x84, 0xc3, 0xc8, 0xe9, 0x53, 0xac, + 0xa5, 0xca, 0x1a, 0xf0, 0x05, 0x34, 0x49, 0xbd, 0x63, 0xe2, 0x1a, 0xb6, 0x9b, 0xcf, 0x45, 0x5a, + 0xe3, 0xef, 0x55, 0xb7, 0x5b, 0x6b, 0xe3, 0x3d, 0x5a, 0x6b, 0xa2, 0x4b, 0x7d, 0x70, 0x01, 0xd3, + 0xfb, 0x68, 0x51, 0xc2, 0x34, 0x4c, 0x72, 0xb1, 0x3f, 0xc9, 0x40, 0xf0, 0x42, 0x0f, 0xc1, 0xea, + 0x07, 0x31, 0x27, 0xb2, 0x99, 0xce, 0xe4, 0x44, 0x0c, 0x7a, 0x2c, 0x19, 0x74, 0x52, 0x8a, 0xb9, + 0xa7, 0x96, 0xe2, 0x5f, 0x15, 0x20, 0x47, 0x0e, 0x30, 0x8b, 0x9c, 0xdc, 0x33, 0x90, 0x33, 0x3a, + 0xe5, 0xfd, 0x10, 0x2d, 0xc7, 0x31, 0x30, 0x49, 0xef, 0x44, 0x69, 0x20, 0xcc, 0xde, 0xa6, 0x5e, + 0x93, 0x20, 0x78, 0x1a, 0x16, 0x7f, 0xab, 0xa0, 0x15, 0x39, 0x02, 0x20, 0xf0, 0xcb, 0x68, 0x12, + 0x92, 0x53, 0x08, 0xac, 0x15, 0x12, 0xac, 0x41, 0x07, 0x9d, 0x27, 0x2e, 0x60, 0xac, 0xdd, 0x63, + 0x74, 0x44, 0xbd, 0xa3, 0xa0, 0xa2, 0x88, 0xb3, 0x33, 0x59, 0xff, 0x43, 0xb2, 0xfe, 0xac, 0xa0, + 0x52, 0x2a, 0x08, 0xe0, 0xeb, 0x0d, 0x34, 0x23, 0x08, 0x2e, 0x1c, 0x7a, 0xaf, 0x9b, 0xee, 0xa8, + 0x6d, 0x84, 0xf4, 0xfd, 0x4a, 0x98, 0xe6, 0x7d, 0xbb, 0x76, 0xfc, 0x66, 0x7c, 0x90, 0xf8, 0x22, + 0xac, 0xe4, 0x0f, 0x15, 0x74, 0x31, 0x05, 0x1c, 0x90, 0x7a, 0x0b, 0x9d, 0x4d, 0x9e, 0x7f, 0xa4, + 0x52, 0x4c, 0xf4, 0x05, 0x3a, 0x67, 0xa9, 0xd8, 0x38, 0x3a, 0x42, 0x3f, 0x50, 0xd0, 0x7a, 0xbc, + 0x35, 0x57, 0x5d, 0xb3, 0x46, 0xed, 0x7b, 0x64, 0xa4, 0xdb, 0x64, 0x32, 0xab, 0xe4, 0xba, 0xb3, + 0x4a, 0x66, 0xea, 0xf8, 0xa9, 0x82, 0xae, 0x0e, 0x00, 0x10, 0x08, 0x26, 0x68, 0xc5, 0x06, 0x23, + 0xe3, 0x59, 0x93, 0xc9, 0x05, 0x3b, 0xcd, 0x9d, 0x1a, 0x00, 0x69, 0xdb, 0x8e, 0x93, 0x49, 0xda, + 0xa8, 0x8e, 0x2c, 0xff, 0x8c, 0x89, 0xe8, 0xef, 0x74, 0x60, 0x22, 0x72, 0x23, 0x20, 0x62, 0x74, + 0x3a, 0xfc, 0xa5, 0xd2, 0xc9, 0x20, 0x7b, 0x9e, 0xe7, 0xe8, 0x70, 0xfe, 0xff, 0x22, 0xac, 0xeb, + 0xdf, 0x09, 0x9b, 0x4e, 0x12, 0x1b, 0x90, 0xbd, 0x83, 0x66, 0x13, 0x97, 0x16, 0x60, 0xf7, 0x42, + 0xf2, 0x9c, 0x2f, 0xf4, 0x04, 0x62, 0x67, 0x7c, 0xa1, 0x6d, 0xa4, 0x39, 0x66, 0x39, 0x5e, 0x32, + 0xa3, 0xe2, 0x32, 0x63, 0x19, 0xcf, 0xa3, 0xdc, 0x1d, 0x42, 0xf8, 0xf2, 0x1d, 0xd7, 0xd9, 0xa3, + 0x6a, 0x01, 0x67, 0x3d, 0x18, 0xd2, 0x39, 0x53, 0x86, 0xe6, 0x4c, 0xfd, 0x30, 0x07, 0xa7, 0xbb, + 0x57, 0x43, 0x6a, 0xd7, 0x4d, 0x4a, 0x6e, 0x37, 0x1c, 0x6a, 0xbf, 0xee, 0xf9, 0xdf, 0x7c, 0xdb, + 0xf4, 0x85, 0x84, 0x5a, 0x0b, 0x88, 0x49, 0xbd, 0x20, 0x4e, 0xa8, 0xf0, 0x8a, 0x0b, 0x68, 0x32, + 0x20, 0x35, 0x62, 0xdf, 0x23, 0x01, 0x04, 0xdc, 0x7e, 0xc7, 0x5b, 0x68, 0x22, 0xf0, 0x1a, 0x94, + 0x84, 0xf9, 0x9c, 0x64, 0x8f, 0x8e, 0xfd, 0xe8, 0xcc, 0x44, 0x07, 0x4b, 0xfc, 0x7d, 0x34, 0x65, + 0xd6, 0xbd, 0x86, 0x4b, 0x19, 0x83, 0x7c, 0x2f, 0xab, 0xdc, 0x66, 0xf7, 0xba, 0x7f, 0xb4, 0x4a, + 0x57, 0x0e, 0x6d, 0x7a, 0xd4, 0x38, 0x28, 0xd7, 0xbc, 0xba, 0x06, 0xd7, 0xd6, 0xe8, 0xcf, 0x46, + 0x68, 0x1d, 0x6b, 0xb4, 0xe9, 0x93, 0xb0, 0x5c, 0x75, 0xe9, 0xe3, 0x56, 0x69, 0x32, 0x1a, 0xa2, + 0xea, 0x3e, 0x69, 0x95, 0xe6, 0x9a, 0x66, 0xdd, 0xb9, 0xa9, 0xc6, 0x2d, 0xaa, 0xde, 0xfe, 0x88, + 0x7f, 0xac, 0xa0, 0x79, 0x72, 0x62, 0x53, 0x58, 0xde, 0x7e, 0x60, 0xd7, 0x48, 0xfe, 0x34, 0xf7, + 0x69, 0x81, 0xcf, 0x4d, 0xc1, 0x27, 0x80, 0xdf, 0xf0, 0x82, 0xc3, 0xf8, 0x59, 0x6b, 0x50, 0xdb, + 0x09, 0xb5, 0xba, 0x49, 0x8f, 0xca, 0x7b, 0x01, 0xa9, 0xed, 0x90, 0xda, 0xe3, 0x56, 0xe9, 0x2c, + 0x1b, 0x94, 0xaf, 0xf4, 0x3d, 0x36, 0xe4, 0x93, 0x56, 0xe9, 0x5c, 0x04, 0x22, 0xd9, 0xae, 0xea, + 0x5d, 0x86, 0xf8, 0x0a, 0x9a, 0xf3, 0x99, 0x44, 0x0e, 0x48, 0x48, 0x0d, 0x4e, 0x48, 0x7e, 0x62, + 0x55, 0x59, 0x9f, 0xd4, 0x67, 0x59, 0x73, 0x85, 0xad, 0x2a, 0xd6, 0xa8, 0xfe, 0x3c, 0x3e, 0xf0, + 0xca, 0xe7, 0x0c, 0xf4, 0xe1, 0xa3, 0x49, 0x76, 0x93, 0x37, 0xbc, 0x06, 0x6d, 0x4b, 0x43, 0x5c, + 0x0b, 0xf1, 0x2a, 0xf8, 0x9a, 0x67, 0xbb, 0x95, 0x9b, 0x10, 0xf0, 0xda, 0x00, 0x24, 0xb3, 0x0e, + 0x8f, 0x5b, 0xa5, 0x33, 0x6c, 0xf4, 0xdd, 0x06, 0xd5, 0xe3, 0x07, 0xf5, 0x4f, 0xe3, 0xe8, 0xb9, + 0x04, 0xae, 0x3d, 0xc7, 0xac, 0x09, 0x7b, 0xde, 0xb3, 0xc9, 0xa9, 0xcf, 0xf5, 0x69, 0x19, 0x4d, + 0x45, 0x9f, 0x58, 0xac, 0x51, 0x06, 0x8c, 0x6c, 0x77, 0x1b, 0x14, 0x97, 0xd1, 0x52, 0x67, 0xe1, + 0x19, 0xb6, 0x6b, 0x50, 0x8f, 0xdb, 0x9d, 0xe6, 0x4b, 0x70, 0xbe, 0xbd, 0x04, 0xab, 0xee, 0xbe, + 0xc7, 0xec, 0x13, 0x12, 0x9c, 0xf8, 0x7c, 0x25, 0x78, 0x13, 0x21, 0xc8, 0x2a, 0x4d, 0x9f, 0xe4, + 0xcf, 0xac, 0x2a, 0xeb, 0x67, 0xb7, 0x96, 0xd3, 0x52, 0x4a, 0xd3, 0x27, 0xfa, 0x94, 0x17, 0x3f, + 0xe2, 0xdb, 0x68, 0x8e, 0x9c, 0xf8, 0x76, 0xc0, 0xb7, 0x2c, 0x83, 0xda, 0x75, 0x92, 0x9f, 0xe4, + 0xd3, 0x5c, 0x28, 0x47, 0x55, 0x9b, 0x72, 0x5c, 0xb5, 0x29, 0xef, 0xc7, 0x55, 0x9b, 0xca, 0x24, + 0xdb, 0x02, 0xde, 0xfb, 0x57, 0x49, 0x61, 0xe2, 0x8b, 0x3b, 0xb3, 0xcf, 0xf8, 0x07, 0x68, 0xb6, + 0x6e, 0x9e, 0x6c, 0x47, 0x91, 0x33, 0x7e, 0xa6, 0x78, 0xe8, 0x6f, 0xb1, 0x0e, 0x43, 0x85, 0x3e, + 0xd3, 0x1e, 0x66, 0xb7, 0x41, 0x9f, 0xb4, 0x4a, 0x8b, 0x51, 0xf8, 0x62, 0xab, 0xaa, 0x27, 0x8c, + 0xd4, 0xcf, 0x72, 0x50, 0xbd, 0x48, 0x15, 0x0e, 0x68, 0xfa, 0x7d, 0x05, 0xcd, 0x52, 0x8f, 0x9a, + 0x0e, 0x9b, 0x47, 0x26, 0xbb, 0x6c, 0x65, 0xef, 0x0f, 0xaf, 0xec, 0x69, 0xee, 0xa2, 0xea, 0xb2, + 0xd7, 0x27, 0xad, 0x12, 0x8e, 0x02, 0x10, 0x1a, 0x55, 0x5d, 0x34, 0xc1, 0x3f, 0x51, 0xd0, 0x4c, + 0xf8, 0xb6, 0xe9, 0xb7, 0x41, 0x8d, 0x65, 0x81, 0xd2, 0x87, 0x07, 0x85, 0x98, 0x87, 0x36, 0xa6, + 0x85, 0x08, 0x53, 0xa7, 0x4d, 0xd5, 0x05, 0x03, 0xce, 0x13, 0x47, 0xe4, 0x35, 0x68, 0x04, 0x29, + 0xf7, 0x79, 0xf0, 0xc4, 0x5c, 0xec, 0x36, 0x68, 0x92, 0x27, 0xa1, 0x51, 0xd5, 0x45, 0x13, 0xf5, + 0x7b, 0x68, 0x3e, 0xaa, 0xee, 0xf1, 0x04, 0xf4, 0x6c, 0xc5, 0x14, 0xc8, 0x97, 0xb9, 0x4e, 0xbe, + 0xd4, 0xd0, 0x52, 0x7b, 0xf4, 0x4a, 0xb3, 0xba, 0x23, 0x7a, 0x60, 0x79, 0x12, 0x3c, 0x8c, 0xeb, + 0x13, 0xec, 0xb5, 0x6a, 0xa9, 0x5f, 0x45, 0x0b, 0x02, 0x1c, 0x50, 0xd8, 0x0b, 0x68, 0x9c, 0x7d, + 0x06, 0x5d, 0x2d, 0xf4, 0x24, 0x53, 0x48, 0xa2, 0xdc, 0x48, 0xdd, 0x48, 0x1e, 0x13, 0x6e, 0x43, + 0x89, 0x33, 0xf6, 0x7c, 0x16, 0x8d, 0xb5, 0x9d, 0x8e, 0xd9, 0x56, 0x77, 0x46, 0xef, 0x98, 0x77, + 0x32, 0xfa, 0x9e, 0x58, 0x2a, 0x4d, 0xcd, 0xe8, 0x71, 0x4f, 0xa8, 0x79, 0xce, 0x88, 0x6d, 0x2a, + 0x49, 0x9e, 0x03, 0xbb, 0x41, 0x8d, 0xea, 0x34, 0xdd, 0x7d, 0xa6, 0x93, 0x45, 0xe3, 0x77, 0x45, + 0x93, 0x1b, 0x28, 0x1a, 0x5f, 0x68, 0x1b, 0xd9, 0x99, 0x6e, 0xeb, 0xe3, 0xf3, 0xe8, 0x34, 0xc7, + 0x8b, 0x8f, 0xd0, 0x44, 0x54, 0x32, 0xc6, 0xa5, 0x04, 0x96, 0xde, 0x7a, 0x74, 0x61, 0x35, 0xdd, + 0x20, 0x72, 0xa1, 0x2e, 0xbf, 0xf3, 0xe9, 0x67, 0xef, 0x8f, 0x9d, 0xc3, 0x8b, 0x5a, 0xef, 0x4f, + 0x06, 0xf8, 0x6f, 0x0a, 0x3a, 0x27, 0xbd, 0xe2, 0xe3, 0xcd, 0xde, 0x81, 0x33, 0x2a, 0xd5, 0x85, + 0xad, 0x61, 0xba, 0x00, 0xba, 0x57, 0x39, 0xba, 0xaf, 0xe0, 0x57, 0xb4, 0x41, 0x7e, 0xb6, 0xd0, + 0xee, 0x43, 0x9d, 0xe4, 0x81, 0x76, 0x5f, 0xb8, 0x53, 0x3e, 0xc0, 0x7f, 0x50, 0x50, 0x5e, 0xea, + 0x68, 0xdb, 0x71, 0x64, 0xa1, 0x64, 0x14, 0xa1, 0x65, 0xa1, 0x64, 0x95, 0x91, 0xd5, 0x0d, 0x1e, + 0xca, 0x1a, 0xbe, 0x3c, 0x50, 0x28, 0x0c, 0xf2, 0xa5, 0x34, 0xc8, 0x95, 0xe6, 0x36, 0xd4, 0x83, + 0x5e, 0x90, 0x02, 0x91, 0x97, 0x95, 0x0a, 0x2f, 0x0e, 0x66, 0x0c, 0x78, 0xaf, 0x73, 0xbc, 0xd7, + 0xf0, 0x7a, 0x02, 0x2f, 0xa7, 0x59, 0x2c, 0x0b, 0x75, 0x38, 0xc7, 0x1f, 0x2b, 0x68, 0xa1, 0xf7, + 0x82, 0xb8, 0x31, 0xd8, 0xb4, 0xc7, 0x20, 0xcb, 0x83, 0x9a, 0x03, 0xcc, 0x6f, 0x73, 0x98, 0x3a, + 0xde, 0xcb, 0xa2, 0x55, 0xbb, 0x0f, 0xfb, 0x34, 0x13, 0x07, 0x9c, 0xc3, 0xd8, 0x63, 0x7b, 0x8f, + 0xee, 0x16, 0xcd, 0x1f, 0x15, 0xb4, 0xd4, 0xe3, 0x97, 0x09, 0x66, 0x63, 0xb0, 0xd9, 0xef, 0x13, + 0x51, 0xbf, 0x42, 0xaf, 0xfa, 0x0a, 0x8f, 0xe8, 0x65, 0x7c, 0xe3, 0xa9, 0x22, 0xc2, 0x3f, 0x53, + 0xd0, 0x9c, 0x58, 0xff, 0x64, 0x88, 0xd7, 0x53, 0x67, 0xbe, 0xab, 0x4e, 0x5b, 0xb8, 0x3a, 0x80, + 0x25, 0xe0, 0x7c, 0x91, 0xe3, 0xbc, 0x82, 0x9f, 0xef, 0x15, 0x48, 0x5c, 0x35, 0x15, 0xc4, 0xf1, + 0x1b, 0x05, 0xcd, 0x27, 0xca, 0x5a, 0x0c, 0x97, 0xdc, 0x9b, 0xac, 0xac, 0x57, 0xb8, 0x36, 0x88, + 0x29, 0x20, 0xfb, 0x12, 0x47, 0xb6, 0x85, 0xaf, 0x6b, 0xe9, 0xbf, 0x3b, 0xca, 0xc9, 0xfb, 0x8f, + 0x82, 0x2e, 0xa4, 0x96, 0x56, 0xf0, 0x0d, 0xa9, 0x36, 0xb3, 0xea, 0x3f, 0x85, 0x97, 0x86, 0xed, + 0x06, 0x61, 0x18, 0x3c, 0x8c, 0xef, 0xe0, 0x6f, 0x25, 0xc2, 0xb8, 0x63, 0x3b, 0x0e, 0xb1, 0x8c, + 0x51, 0x28, 0xfc, 0x2f, 0x0a, 0x5a, 0x49, 0x85, 0xc1, 0xe6, 0xe7, 0x86, 0x94, 0xf4, 0xa7, 0x09, + 0x78, 0x90, 0x92, 0x95, 0xaa, 0xf1, 0x80, 0xaf, 0xe2, 0xb5, 0x01, 0x03, 0xc6, 0xbf, 0x56, 0xd0, + 0x9c, 0x58, 0x21, 0x48, 0xd7, 0xba, 0xa4, 0x0a, 0x92, 0xa2, 0x75, 0x59, 0xad, 0x42, 0x7d, 0x99, + 0x23, 0xdb, 0xc4, 0x9a, 0x96, 0xfa, 0x3b, 0xb5, 0x5c, 0x50, 0xbf, 0x57, 0xd0, 0x8c, 0x38, 0xa2, + 0x0c, 0x9e, 0xbc, 0x48, 0x23, 0x83, 0x97, 0x52, 0x4a, 0x51, 0xbf, 0xce, 0xe1, 0xed, 0xe0, 0xca, + 0x90, 0xf0, 0xba, 0xc4, 0x71, 0x87, 0x10, 0xbe, 0x50, 0x97, 0x64, 0xf7, 0x72, 0xd9, 0xb6, 0xd7, + 0xa7, 0xe6, 0x22, 0xdb, 0xf6, 0xfa, 0x5d, 0xf7, 0x53, 0xb6, 0x13, 0x02, 0x5d, 0x8c, 0x3a, 0xeb, + 0x63, 0x1c, 0x79, 0xbe, 0xc1, 0x4e, 0xe4, 0x8c, 0xd7, 0xf3, 0x29, 0x97, 0x2d, 0x7c, 0x3d, 0xdd, + 0xb3, 0xfc, 0x42, 0x5f, 0xd8, 0x1c, 0xa2, 0x47, 0x5f, 0xad, 0xb6, 0xe1, 0xfa, 0xac, 0x9b, 0xa8, + 0x59, 0xfc, 0x00, 0x8d, 0xb3, 0xb9, 0xc3, 0x17, 0x25, 0x47, 0xb2, 0xce, 0x7d, 0xa2, 0x50, 0x4c, + 0xfb, 0x0c, 0x7e, 0x5f, 0xe2, 0x7e, 0xaf, 0xe3, 0x72, 0xcf, 0x54, 0x27, 0x66, 0xb8, 0x67, 0x5a, + 0x03, 0x34, 0x19, 0x5f, 0x2c, 0xf0, 0x25, 0xb9, 0x0f, 0xe1, 0xd2, 0x91, 0x09, 0xe3, 0x39, 0x0e, + 0xe3, 0x22, 0x5e, 0x96, 0xc1, 0x88, 0x6e, 0x2b, 0x0f, 0xf0, 0x8f, 0x40, 0xfc, 0xed, 0xc3, 0x70, + 0xba, 0xf8, 0xbb, 0x4e, 0xf9, 0x7d, 0xc4, 0xdf, 0x7d, 0x4e, 0x57, 0xd7, 0x38, 0x94, 0x4b, 0xb8, + 0xa4, 0xa5, 0xfe, 0xcf, 0x86, 0x76, 0x9f, 0xc1, 0x79, 0x17, 0x76, 0x8b, 0x78, 0x84, 0xfe, 0xbb, + 0xc5, 0x00, 0x88, 0x52, 0x6e, 0x0e, 0xaa, 0xca, 0x11, 0xad, 0xe0, 0x42, 0x3a, 0xa2, 0xca, 0xce, + 0x47, 0x0f, 0x8b, 0xca, 0x27, 0x0f, 0x8b, 0xca, 0xbf, 0x1f, 0x16, 0x95, 0xf7, 0x1e, 0x15, 0x4f, + 0x7d, 0xf2, 0xa8, 0x78, 0xea, 0xef, 0x8f, 0x8a, 0xa7, 0xbe, 0x7b, 0x2d, 0xa3, 0x66, 0x77, 0x12, + 0x65, 0x33, 0x76, 0x91, 0x3d, 0x98, 0xe0, 0x25, 0x92, 0xff, 0xff, 0x6f, 0x00, 0x00, 0x00, 0xff, + 0xff, 0xca, 0x93, 0x0c, 0xc0, 0x76, 0x24, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -3036,10 +3041,10 @@ func (m *QueryGetLimitOrderTrancheRequest) MarshalToSizedBuffer(dAtA []byte) (in 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 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 } @@ -3120,10 +3125,10 @@ func (m *QueryAllLimitOrderTrancheRequest) MarshalToSizedBuffer(dAtA []byte) (in 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.PairId) > 0 { + i -= len(m.PairId) + copy(dAtA[i:], m.PairId) + i = encodeVarintQuery(dAtA, i, uint64(len(m.PairId))) i-- dAtA[i] = 0xa } @@ -3400,10 +3405,10 @@ func (m *QueryAllTickLiquidityRequest) MarshalToSizedBuffer(dAtA []byte) (int, e 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.PairId) > 0 { + i -= len(m.PairId) + copy(dAtA[i:], m.PairId) + i = encodeVarintQuery(dAtA, i, uint64(len(m.PairId))) i-- dAtA[i] = 0xa } @@ -3498,10 +3503,10 @@ func (m *QueryGetInactiveLimitOrderTrancheRequest) MarshalToSizedBuffer(dAtA []b 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.PairId) > 0 { + i -= len(m.PairId) + copy(dAtA[i:], m.PairId) + i = encodeVarintQuery(dAtA, i, uint64(len(m.PairId))) i-- dAtA[i] = 0xa } @@ -3666,10 +3671,10 @@ func (m *QueryAllPoolReservesRequest) MarshalToSizedBuffer(dAtA []byte) (int, er 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.PairId) > 0 { + i -= len(m.PairId) + copy(dAtA[i:], m.PairId) + i = encodeVarintQuery(dAtA, i, uint64(len(m.PairId))) i-- dAtA[i] = 0xa } @@ -3762,10 +3767,10 @@ func (m *QueryGetPoolReservesRequest) MarshalToSizedBuffer(dAtA []byte) (int, er 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.PairId) > 0 { + i -= len(m.PairId) + copy(dAtA[i:], m.PairId) + i = encodeVarintQuery(dAtA, i, uint64(len(m.PairId))) i-- dAtA[i] = 0xa } @@ -4097,10 +4102,10 @@ func (m *QueryPoolRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { 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 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 } @@ -4127,8 +4132,8 @@ func (m *QueryPoolByIDRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.PoolID != 0 { - i = encodeVarintQuery(dAtA, i, uint64(m.PoolID)) + if m.PoolId != 0 { + i = encodeVarintQuery(dAtA, i, uint64(m.PoolId)) i-- dAtA[i] = 0x8 } @@ -4414,7 +4419,7 @@ func (m *QueryGetLimitOrderTrancheRequest) Size() (n int) { } var l int _ = l - l = len(m.PairID) + l = len(m.PairId) if l > 0 { n += 1 + l + sovQuery(uint64(l)) } @@ -4451,7 +4456,7 @@ func (m *QueryAllLimitOrderTrancheRequest) Size() (n int) { } var l int _ = l - l = len(m.PairID) + l = len(m.PairId) if l > 0 { n += 1 + l + sovQuery(uint64(l)) } @@ -4563,7 +4568,7 @@ func (m *QueryAllTickLiquidityRequest) Size() (n int) { } var l int _ = l - l = len(m.PairID) + l = len(m.PairId) if l > 0 { n += 1 + l + sovQuery(uint64(l)) } @@ -4603,7 +4608,7 @@ func (m *QueryGetInactiveLimitOrderTrancheRequest) Size() (n int) { } var l int _ = l - l = len(m.PairID) + l = len(m.PairId) if l > 0 { n += 1 + l + sovQuery(uint64(l)) } @@ -4672,7 +4677,7 @@ func (m *QueryAllPoolReservesRequest) Size() (n int) { } var l int _ = l - l = len(m.PairID) + l = len(m.PairId) if l > 0 { n += 1 + l + sovQuery(uint64(l)) } @@ -4712,7 +4717,7 @@ func (m *QueryGetPoolReservesRequest) Size() (n int) { } var l int _ = l - l = len(m.PairID) + l = len(m.PairId) if l > 0 { n += 1 + l + sovQuery(uint64(l)) } @@ -4845,7 +4850,7 @@ func (m *QueryPoolRequest) Size() (n int) { } var l int _ = l - l = len(m.PairID) + l = len(m.PairId) if l > 0 { n += 1 + l + sovQuery(uint64(l)) } @@ -4864,8 +4869,8 @@ func (m *QueryPoolByIDRequest) Size() (n int) { } var l int _ = l - if m.PoolID != 0 { - n += 1 + sovQuery(uint64(m.PoolID)) + if m.PoolId != 0 { + n += 1 + sovQuery(uint64(m.PoolId)) } return n } @@ -5514,7 +5519,7 @@ func (m *QueryGetLimitOrderTrancheRequest) Unmarshal(dAtA []byte) error { 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 PairId", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -5542,7 +5547,7 @@ func (m *QueryGetLimitOrderTrancheRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.PairID = string(dAtA[iNdEx:postIndex]) + m.PairId = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: if wireType != 0 { @@ -5765,7 +5770,7 @@ func (m *QueryAllLimitOrderTrancheRequest) Unmarshal(dAtA []byte) error { 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 PairId", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -5793,7 +5798,7 @@ func (m *QueryAllLimitOrderTrancheRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.PairID = string(dAtA[iNdEx:postIndex]) + m.PairId = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: if wireType != 2 { @@ -6511,7 +6516,7 @@ func (m *QueryAllTickLiquidityRequest) Unmarshal(dAtA []byte) error { 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 PairId", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -6539,7 +6544,7 @@ func (m *QueryAllTickLiquidityRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.PairID = string(dAtA[iNdEx:postIndex]) + m.PairId = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: if wireType != 2 { @@ -6781,7 +6786,7 @@ func (m *QueryGetInactiveLimitOrderTrancheRequest) Unmarshal(dAtA []byte) error 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 PairId", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -6809,7 +6814,7 @@ func (m *QueryGetInactiveLimitOrderTrancheRequest) Unmarshal(dAtA []byte) error if postIndex > l { return io.ErrUnexpectedEOF } - m.PairID = string(dAtA[iNdEx:postIndex]) + m.PairId = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: if wireType != 2 { @@ -7238,7 +7243,7 @@ func (m *QueryAllPoolReservesRequest) Unmarshal(dAtA []byte) error { 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 PairId", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -7266,7 +7271,7 @@ func (m *QueryAllPoolReservesRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.PairID = string(dAtA[iNdEx:postIndex]) + m.PairId = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: if wireType != 2 { @@ -7508,7 +7513,7 @@ func (m *QueryGetPoolReservesRequest) Unmarshal(dAtA []byte) error { 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 PairId", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -7536,7 +7541,7 @@ func (m *QueryGetPoolReservesRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.PairID = string(dAtA[iNdEx:postIndex]) + m.PairId = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: if wireType != 2 { @@ -8536,7 +8541,7 @@ func (m *QueryPoolRequest) Unmarshal(dAtA []byte) error { 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 PairId", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -8564,7 +8569,7 @@ func (m *QueryPoolRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.PairID = string(dAtA[iNdEx:postIndex]) + m.PairId = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: if wireType != 0 { @@ -8656,9 +8661,9 @@ func (m *QueryPoolByIDRequest) Unmarshal(dAtA []byte) error { switch fieldNum { case 1: if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field PoolID", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field PoolId", wireType) } - m.PoolID = 0 + m.PoolId = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowQuery @@ -8668,7 +8673,7 @@ func (m *QueryPoolByIDRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.PoolID |= uint64(b&0x7F) << shift + m.PoolId |= uint64(b&0x7F) << shift if b < 0x80 { break } diff --git a/x/dex/types/query.pb.gw.go b/x/dex/types/query.pb.gw.go index 0d0fae871..ef38e09cc 100644 --- a/x/dex/types/query.pb.gw.go +++ b/x/dex/types/query.pb.gw.go @@ -73,15 +73,15 @@ func request_Query_LimitOrderTrancheUser_0(ctx context.Context, marshaler runtim return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "address", err) } - val, ok = pathParams["trancheKey"] + val, ok = pathParams["tranche_key"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "trancheKey") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "tranche_key") } protoReq.TrancheKey, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "trancheKey", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "tranche_key", err) } msg, err := client.LimitOrderTrancheUser(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) @@ -111,15 +111,15 @@ func local_request_Query_LimitOrderTrancheUser_0(ctx context.Context, marshaler return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "address", err) } - val, ok = pathParams["trancheKey"] + val, ok = pathParams["tranche_key"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "trancheKey") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "tranche_key") } protoReq.TrancheKey, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "trancheKey", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "tranche_key", err) } msg, err := server.LimitOrderTrancheUser(ctx, &protoReq) @@ -246,48 +246,48 @@ func request_Query_LimitOrderTranche_0(ctx context.Context, marshaler runtime.Ma _ = err ) - val, ok = pathParams["pairID"] + val, ok = pathParams["pair_id"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "pairID") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "pair_id") } - protoReq.PairID, err = runtime.String(val) + protoReq.PairId, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "pairID", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "pair_id", err) } - val, ok = pathParams["tokenIn"] + val, ok = pathParams["token_in"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "tokenIn") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "token_in") } protoReq.TokenIn, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "tokenIn", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "token_in", err) } - val, ok = pathParams["tickIndex"] + val, ok = pathParams["tick_index"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "tickIndex") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "tick_index") } protoReq.TickIndex, err = runtime.Int64(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "tickIndex", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "tick_index", err) } - val, ok = pathParams["trancheKey"] + val, ok = pathParams["tranche_key"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "trancheKey") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "tranche_key") } protoReq.TrancheKey, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "trancheKey", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "tranche_key", err) } msg, err := client.LimitOrderTranche(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) @@ -306,48 +306,48 @@ func local_request_Query_LimitOrderTranche_0(ctx context.Context, marshaler runt _ = err ) - val, ok = pathParams["pairID"] + val, ok = pathParams["pair_id"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "pairID") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "pair_id") } - protoReq.PairID, err = runtime.String(val) + protoReq.PairId, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "pairID", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "pair_id", err) } - val, ok = pathParams["tokenIn"] + val, ok = pathParams["token_in"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "tokenIn") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "token_in") } protoReq.TokenIn, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "tokenIn", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "token_in", err) } - val, ok = pathParams["tickIndex"] + val, ok = pathParams["tick_index"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "tickIndex") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "tick_index") } protoReq.TickIndex, err = runtime.Int64(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "tickIndex", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "tick_index", err) } - val, ok = pathParams["trancheKey"] + val, ok = pathParams["tranche_key"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "trancheKey") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "tranche_key") } protoReq.TrancheKey, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "trancheKey", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "tranche_key", err) } msg, err := server.LimitOrderTranche(ctx, &protoReq) @@ -356,7 +356,7 @@ func local_request_Query_LimitOrderTranche_0(ctx context.Context, marshaler runt } var ( - filter_Query_LimitOrderTrancheAll_0 = &utilities.DoubleArray{Encoding: map[string]int{"pairID": 0, "tokenIn": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}} + filter_Query_LimitOrderTrancheAll_0 = &utilities.DoubleArray{Encoding: map[string]int{"pair_id": 0, "token_in": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}} ) func request_Query_LimitOrderTrancheAll_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -370,26 +370,26 @@ func request_Query_LimitOrderTrancheAll_0(ctx context.Context, marshaler runtime _ = err ) - val, ok = pathParams["pairID"] + val, ok = pathParams["pair_id"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "pairID") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "pair_id") } - protoReq.PairID, err = runtime.String(val) + protoReq.PairId, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "pairID", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "pair_id", err) } - val, ok = pathParams["tokenIn"] + val, ok = pathParams["token_in"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "tokenIn") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "token_in") } protoReq.TokenIn, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "tokenIn", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "token_in", err) } if err := req.ParseForm(); err != nil { @@ -415,26 +415,26 @@ func local_request_Query_LimitOrderTrancheAll_0(ctx context.Context, marshaler r _ = err ) - val, ok = pathParams["pairID"] + val, ok = pathParams["pair_id"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "pairID") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "pair_id") } - protoReq.PairID, err = runtime.String(val) + protoReq.PairId, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "pairID", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "pair_id", err) } - val, ok = pathParams["tokenIn"] + val, ok = pathParams["token_in"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "tokenIn") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "token_in") } protoReq.TokenIn, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "tokenIn", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "token_in", err) } if err := req.ParseForm(); err != nil { @@ -522,7 +522,7 @@ func local_request_Query_UserDepositsAll_0(ctx context.Context, marshaler runtim } var ( - filter_Query_TickLiquidityAll_0 = &utilities.DoubleArray{Encoding: map[string]int{"pairID": 0, "tokenIn": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}} + filter_Query_TickLiquidityAll_0 = &utilities.DoubleArray{Encoding: map[string]int{"pair_id": 0, "token_in": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}} ) func request_Query_TickLiquidityAll_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -536,26 +536,26 @@ func request_Query_TickLiquidityAll_0(ctx context.Context, marshaler runtime.Mar _ = err ) - val, ok = pathParams["pairID"] + val, ok = pathParams["pair_id"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "pairID") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "pair_id") } - protoReq.PairID, err = runtime.String(val) + protoReq.PairId, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "pairID", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "pair_id", err) } - val, ok = pathParams["tokenIn"] + val, ok = pathParams["token_in"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "tokenIn") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "token_in") } protoReq.TokenIn, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "tokenIn", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "token_in", err) } if err := req.ParseForm(); err != nil { @@ -581,26 +581,26 @@ func local_request_Query_TickLiquidityAll_0(ctx context.Context, marshaler runti _ = err ) - val, ok = pathParams["pairID"] + val, ok = pathParams["pair_id"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "pairID") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "pair_id") } - protoReq.PairID, err = runtime.String(val) + protoReq.PairId, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "pairID", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "pair_id", err) } - val, ok = pathParams["tokenIn"] + val, ok = pathParams["token_in"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "tokenIn") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "token_in") } protoReq.TokenIn, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "tokenIn", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "token_in", err) } if err := req.ParseForm(); err != nil { @@ -626,48 +626,48 @@ func request_Query_InactiveLimitOrderTranche_0(ctx context.Context, marshaler ru _ = err ) - val, ok = pathParams["pairID"] + val, ok = pathParams["pair_id"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "pairID") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "pair_id") } - protoReq.PairID, err = runtime.String(val) + protoReq.PairId, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "pairID", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "pair_id", err) } - val, ok = pathParams["tokenIn"] + val, ok = pathParams["token_in"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "tokenIn") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "token_in") } protoReq.TokenIn, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "tokenIn", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "token_in", err) } - val, ok = pathParams["tickIndex"] + val, ok = pathParams["tick_index"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "tickIndex") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "tick_index") } protoReq.TickIndex, err = runtime.Int64(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "tickIndex", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "tick_index", err) } - val, ok = pathParams["trancheKey"] + val, ok = pathParams["tranche_key"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "trancheKey") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "tranche_key") } protoReq.TrancheKey, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "trancheKey", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "tranche_key", err) } msg, err := client.InactiveLimitOrderTranche(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) @@ -686,48 +686,48 @@ func local_request_Query_InactiveLimitOrderTranche_0(ctx context.Context, marsha _ = err ) - val, ok = pathParams["pairID"] + val, ok = pathParams["pair_id"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "pairID") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "pair_id") } - protoReq.PairID, err = runtime.String(val) + protoReq.PairId, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "pairID", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "pair_id", err) } - val, ok = pathParams["tokenIn"] + val, ok = pathParams["token_in"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "tokenIn") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "token_in") } protoReq.TokenIn, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "tokenIn", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "token_in", err) } - val, ok = pathParams["tickIndex"] + val, ok = pathParams["tick_index"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "tickIndex") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "tick_index") } protoReq.TickIndex, err = runtime.Int64(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "tickIndex", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "tick_index", err) } - val, ok = pathParams["trancheKey"] + val, ok = pathParams["tranche_key"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "trancheKey") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "tranche_key") } protoReq.TrancheKey, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "trancheKey", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "tranche_key", err) } msg, err := server.InactiveLimitOrderTranche(ctx, &protoReq) @@ -772,7 +772,7 @@ func local_request_Query_InactiveLimitOrderTrancheAll_0(ctx context.Context, mar } var ( - filter_Query_PoolReservesAll_0 = &utilities.DoubleArray{Encoding: map[string]int{"pairID": 0, "tokenIn": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}} + filter_Query_PoolReservesAll_0 = &utilities.DoubleArray{Encoding: map[string]int{"pair_id": 0, "token_in": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}} ) func request_Query_PoolReservesAll_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -786,26 +786,26 @@ func request_Query_PoolReservesAll_0(ctx context.Context, marshaler runtime.Mars _ = err ) - val, ok = pathParams["pairID"] + val, ok = pathParams["pair_id"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "pairID") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "pair_id") } - protoReq.PairID, err = runtime.String(val) + protoReq.PairId, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "pairID", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "pair_id", err) } - val, ok = pathParams["tokenIn"] + val, ok = pathParams["token_in"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "tokenIn") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "token_in") } protoReq.TokenIn, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "tokenIn", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "token_in", err) } if err := req.ParseForm(); err != nil { @@ -831,26 +831,26 @@ func local_request_Query_PoolReservesAll_0(ctx context.Context, marshaler runtim _ = err ) - val, ok = pathParams["pairID"] + val, ok = pathParams["pair_id"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "pairID") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "pair_id") } - protoReq.PairID, err = runtime.String(val) + protoReq.PairId, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "pairID", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "pair_id", err) } - val, ok = pathParams["tokenIn"] + val, ok = pathParams["token_in"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "tokenIn") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "token_in") } protoReq.TokenIn, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "tokenIn", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "token_in", err) } if err := req.ParseForm(); err != nil { @@ -876,37 +876,37 @@ func request_Query_PoolReserves_0(ctx context.Context, marshaler runtime.Marshal _ = err ) - val, ok = pathParams["pairID"] + val, ok = pathParams["pair_id"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "pairID") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "pair_id") } - protoReq.PairID, err = runtime.String(val) + protoReq.PairId, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "pairID", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "pair_id", err) } - val, ok = pathParams["tokenIn"] + val, ok = pathParams["token_in"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "tokenIn") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "token_in") } protoReq.TokenIn, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "tokenIn", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "token_in", err) } - val, ok = pathParams["tickIndex"] + val, ok = pathParams["tick_index"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "tickIndex") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "tick_index") } protoReq.TickIndex, err = runtime.Int64(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "tickIndex", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "tick_index", err) } val, ok = pathParams["fee"] @@ -936,37 +936,37 @@ func local_request_Query_PoolReserves_0(ctx context.Context, marshaler runtime.M _ = err ) - val, ok = pathParams["pairID"] + val, ok = pathParams["pair_id"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "pairID") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "pair_id") } - protoReq.PairID, err = runtime.String(val) + protoReq.PairId, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "pairID", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "pair_id", err) } - val, ok = pathParams["tokenIn"] + val, ok = pathParams["token_in"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "tokenIn") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "token_in") } protoReq.TokenIn, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "tokenIn", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "token_in", err) } - val, ok = pathParams["tickIndex"] + val, ok = pathParams["tick_index"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "tickIndex") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "tick_index") } protoReq.TickIndex, err = runtime.Int64(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "tickIndex", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "tick_index", err) } val, ok = pathParams["fee"] @@ -1068,26 +1068,26 @@ func request_Query_Pool_0(ctx context.Context, marshaler runtime.Marshaler, clie _ = err ) - val, ok = pathParams["pairID"] + val, ok = pathParams["pair_id"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "pairID") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "pair_id") } - protoReq.PairID, err = runtime.String(val) + protoReq.PairId, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "pairID", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "pair_id", err) } - val, ok = pathParams["tickIndex"] + val, ok = pathParams["tick_index"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "tickIndex") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "tick_index") } protoReq.TickIndex, err = runtime.Int64(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "tickIndex", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "tick_index", err) } val, ok = pathParams["fee"] @@ -1117,26 +1117,26 @@ func local_request_Query_Pool_0(ctx context.Context, marshaler runtime.Marshaler _ = err ) - val, ok = pathParams["pairID"] + val, ok = pathParams["pair_id"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "pairID") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "pair_id") } - protoReq.PairID, err = runtime.String(val) + protoReq.PairId, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "pairID", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "pair_id", err) } - val, ok = pathParams["tickIndex"] + val, ok = pathParams["tick_index"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "tickIndex") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "tick_index") } protoReq.TickIndex, err = runtime.Int64(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "tickIndex", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "tick_index", err) } val, ok = pathParams["fee"] @@ -1166,15 +1166,15 @@ func request_Query_PoolByID_0(ctx context.Context, marshaler runtime.Marshaler, _ = err ) - val, ok = pathParams["poolID"] + val, ok = pathParams["pool_id"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "poolID") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "pool_id") } - protoReq.PoolID, err = runtime.Uint64(val) + protoReq.PoolId, err = runtime.Uint64(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "poolID", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "pool_id", err) } msg, err := client.PoolByID(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) @@ -1193,15 +1193,15 @@ func local_request_Query_PoolByID_0(ctx context.Context, marshaler runtime.Marsh _ = err ) - val, ok = pathParams["poolID"] + val, ok = pathParams["pool_id"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "poolID") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "pool_id") } - protoReq.PoolID, err = runtime.Uint64(val) + protoReq.PoolId, err = runtime.Uint64(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "poolID", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "pool_id", err) } msg, err := server.PoolByID(ctx, &protoReq) @@ -2126,35 +2126,35 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie var ( pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"neutron", "dex", "params"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_LimitOrderTrancheUser_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4}, []string{"neutron", "dex", "limit_order_tranche_user", "address", "trancheKey"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_LimitOrderTrancheUser_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4}, []string{"neutron", "dex", "limit_order_tranche_user", "address", "tranche_key"}, "", runtime.AssumeColonVerbOpt(false))) pattern_Query_LimitOrderTrancheUserAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"neutron", "dex", "limit_order_tranche_user"}, "", runtime.AssumeColonVerbOpt(false))) pattern_Query_LimitOrderTrancheUserAllByAddress_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"neutron", "dex", "user", "limit_orders", "address"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_LimitOrderTranche_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5, 1, 0, 4, 1, 5, 6}, []string{"neutron", "dex", "limit_order_tranche", "pairID", "tokenIn", "tickIndex", "trancheKey"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_LimitOrderTranche_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5, 1, 0, 4, 1, 5, 6}, []string{"neutron", "dex", "limit_order_tranche", "pair_id", "token_in", "tick_index", "tranche_key"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_LimitOrderTrancheAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4}, []string{"neutron", "dex", "limit_order_tranche", "pairID", "tokenIn"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_LimitOrderTrancheAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4}, []string{"neutron", "dex", "limit_order_tranche", "pair_id", "token_in"}, "", runtime.AssumeColonVerbOpt(false))) pattern_Query_UserDepositsAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"neutron", "dex", "user", "deposits", "address"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_TickLiquidityAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4}, []string{"neutron", "dex", "tick_liquidity", "pairID", "tokenIn"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_TickLiquidityAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4}, []string{"neutron", "dex", "tick_liquidity", "pair_id", "token_in"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_InactiveLimitOrderTranche_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5, 1, 0, 4, 1, 5, 6}, []string{"neutron", "dex", "filled_limit_order_tranche", "pairID", "tokenIn", "tickIndex", "trancheKey"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_InactiveLimitOrderTranche_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5, 1, 0, 4, 1, 5, 6}, []string{"neutron", "dex", "filled_limit_order_tranche", "pair_id", "token_in", "tick_index", "tranche_key"}, "", runtime.AssumeColonVerbOpt(false))) pattern_Query_InactiveLimitOrderTrancheAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"neutron", "dex", "filled_limit_order_tranche"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_PoolReservesAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4}, []string{"neutron", "dex", "pool_reserves", "pairID", "tokenIn"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_PoolReservesAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4}, []string{"neutron", "dex", "pool_reserves", "pair_id", "token_in"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_PoolReserves_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5, 1, 0, 4, 1, 5, 6}, []string{"neutron", "dex", "pool_reserves", "pairID", "tokenIn", "tickIndex", "fee"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_PoolReserves_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5, 1, 0, 4, 1, 5, 6}, []string{"neutron", "dex", "pool_reserves", "pair_id", "token_in", "tick_index", "fee"}, "", runtime.AssumeColonVerbOpt(false))) pattern_Query_EstimateMultiHopSwap_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"neutron", "dex", "estimate_multi_hop_swap"}, "", runtime.AssumeColonVerbOpt(false))) pattern_Query_EstimatePlaceLimitOrder_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"neutron", "dex", "estimate_place_limit_order"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_Pool_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5}, []string{"neutron", "dex", "pool", "pairID", "tickIndex", "fee"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_Pool_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5}, []string{"neutron", "dex", "pool", "pair_id", "tick_index", "fee"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_PoolByID_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"neutron", "dex", "pool", "poolID"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_PoolByID_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"neutron", "dex", "pool", "pool_id"}, "", runtime.AssumeColonVerbOpt(false))) 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))) diff --git a/x/dex/types/tick_liquidity.pb.go b/x/dex/types/tick_liquidity.pb.go index b5b1877c2..96df486af 100644 --- a/x/dex/types/tick_liquidity.pb.go +++ b/x/dex/types/tick_liquidity.pb.go @@ -70,10 +70,10 @@ type isTickLiquidity_Liquidity interface { } type TickLiquidity_PoolReserves struct { - PoolReserves *PoolReserves `protobuf:"bytes,1,opt,name=poolReserves,proto3,oneof" json:"poolReserves,omitempty"` + PoolReserves *PoolReserves `protobuf:"bytes,1,opt,name=pool_reserves,json=poolReserves,proto3,oneof" json:"pool_reserves,omitempty"` } type TickLiquidity_LimitOrderTranche struct { - LimitOrderTranche *LimitOrderTranche `protobuf:"bytes,2,opt,name=limitOrderTranche,proto3,oneof" json:"limitOrderTranche,omitempty"` + LimitOrderTranche *LimitOrderTranche `protobuf:"bytes,2,opt,name=limit_order_tranche,json=limitOrderTranche,proto3,oneof" json:"limit_order_tranche,omitempty"` } func (*TickLiquidity_PoolReserves) isTickLiquidity_Liquidity() {} @@ -115,24 +115,24 @@ func init() { func init() { proto.RegisterFile("neutron/dex/tick_liquidity.proto", fileDescriptor_fda22cbad7301397) } var fileDescriptor_fda22cbad7301397 = []byte{ - // 261 bytes of a gzipped FileDescriptorProto + // 265 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0xc8, 0x4b, 0x2d, 0x2d, 0x29, 0xca, 0xcf, 0xd3, 0x4f, 0x49, 0xad, 0xd0, 0x2f, 0xc9, 0x4c, 0xce, 0x8e, 0xcf, 0xc9, 0x2c, 0x2c, 0xcd, 0x4c, 0xc9, 0x2c, 0xa9, 0xd4, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x86, 0xaa, 0xd0, 0x4b, 0x49, 0xad, 0x90, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0x8b, 0xeb, 0x83, 0x58, 0x10, 0x25, 0x52, 0xaa, 0xc8, 0x86, 0xe4, 0x64, 0xe6, 0x66, 0x96, 0xc4, 0xe7, 0x17, 0xa5, 0xa4, 0x16, 0xc5, 0x97, 0x14, 0x25, 0xe6, 0x25, 0x67, 0xa4, 0x42, 0x95, 0xc9, 0x23, 0x2b, 0x2b, 0xc8, 0xcf, - 0xcf, 0x89, 0x2f, 0x4a, 0x2d, 0x4e, 0x2d, 0x2a, 0x4b, 0x2d, 0x86, 0x28, 0x50, 0x5a, 0xcb, 0xc8, - 0xc5, 0x1b, 0x92, 0x99, 0x9c, 0xed, 0x03, 0x73, 0x82, 0x90, 0x3d, 0x17, 0x0f, 0x48, 0x61, 0x10, - 0x54, 0x9d, 0x04, 0xa3, 0x02, 0xa3, 0x06, 0xb7, 0x91, 0xa4, 0x1e, 0x92, 0x9b, 0xf4, 0x02, 0x90, - 0x14, 0x78, 0x30, 0x04, 0xa1, 0x68, 0x10, 0xf2, 0xe3, 0x12, 0x04, 0x3b, 0xc8, 0x1f, 0xe4, 0x9e, - 0x10, 0x88, 0x73, 0x24, 0x98, 0xc0, 0xa6, 0xc8, 0xa1, 0x98, 0xe2, 0x83, 0xae, 0xca, 0x83, 0x21, - 0x08, 0x53, 0xab, 0x13, 0x37, 0x17, 0x27, 0x3c, 0x80, 0x9c, 0x5c, 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, 0x2b, 0x3d, 0xb3, 0x24, 0xa3, 0x34, 0x49, 0x2f, 0x39, 0x3f, - 0x57, 0x1f, 0x6a, 0x8b, 0x6e, 0x7e, 0x51, 0x3a, 0x8c, 0xad, 0x5f, 0x01, 0x09, 0xef, 0xca, 0x82, - 0xd4, 0xe2, 0x24, 0x36, 0xb0, 0xe7, 0x8d, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0xea, 0x7b, 0x19, - 0x9a, 0x8b, 0x01, 0x00, 0x00, + 0xcf, 0x89, 0x2f, 0x4a, 0x2d, 0x4e, 0x2d, 0x2a, 0x4b, 0x2d, 0x86, 0x28, 0x50, 0xda, 0xc0, 0xc8, + 0xc5, 0x1b, 0x92, 0x99, 0x9c, 0xed, 0x03, 0x73, 0x82, 0x90, 0x03, 0x17, 0x2f, 0x8a, 0x42, 0x09, + 0x46, 0x05, 0x46, 0x0d, 0x6e, 0x23, 0x49, 0x3d, 0x24, 0x47, 0xe9, 0x05, 0xe4, 0xe7, 0xe7, 0x04, + 0x41, 0x15, 0x78, 0x30, 0x04, 0xf1, 0x14, 0x20, 0xf1, 0x85, 0x02, 0xb8, 0x84, 0xb1, 0xb8, 0x48, + 0x82, 0x09, 0x6c, 0x8e, 0x1c, 0x8a, 0x39, 0x3e, 0x20, 0x75, 0xfe, 0x20, 0x65, 0x21, 0x10, 0x55, + 0x1e, 0x0c, 0x41, 0x82, 0x39, 0xe8, 0x82, 0x4e, 0xdc, 0x5c, 0x9c, 0xf0, 0x30, 0x72, 0x72, 0x39, + 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, 0xad, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, + 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0x7d, 0xa8, 0x2d, 0xba, 0xf9, 0x45, 0xe9, 0x30, 0xb6, 0x7e, 0x05, + 0x24, 0xc8, 0x2b, 0x0b, 0x52, 0x8b, 0x93, 0xd8, 0xc0, 0xfe, 0x37, 0x06, 0x04, 0x00, 0x00, 0xff, + 0xff, 0xae, 0x6c, 0x72, 0x79, 0x8e, 0x01, 0x00, 0x00, } func (m *TickLiquidity) Marshal() (dAtA []byte, err error) { diff --git a/x/dex/types/trade_pair_id.pb.go b/x/dex/types/trade_pair_id.pb.go index 561d60bd2..51f884991 100644 --- a/x/dex/types/trade_pair_id.pb.go +++ b/x/dex/types/trade_pair_id.pb.go @@ -23,8 +23,8 @@ var _ = math.Inf const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type TradePairID struct { - MakerDenom string `protobuf:"bytes,2,opt,name=makerDenom,proto3" json:"makerDenom,omitempty"` - TakerDenom string `protobuf:"bytes,3,opt,name=takerDenom,proto3" json:"takerDenom,omitempty"` + MakerDenom string `protobuf:"bytes,2,opt,name=maker_denom,json=makerDenom,proto3" json:"maker_denom,omitempty"` + TakerDenom string `protobuf:"bytes,3,opt,name=taker_denom,json=takerDenom,proto3" json:"taker_denom,omitempty"` } func (m *TradePairID) Reset() { *m = TradePairID{} } @@ -81,18 +81,19 @@ func init() { func init() { proto.RegisterFile("neutron/dex/trade_pair_id.proto", fileDescriptor_e0082302b8bd9607) } var fileDescriptor_e0082302b8bd9607 = []byte{ - // 173 bytes of a gzipped FileDescriptorProto + // 179 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xcf, 0x4b, 0x2d, 0x2d, 0x29, 0xca, 0xcf, 0xd3, 0x4f, 0x49, 0xad, 0xd0, 0x2f, 0x29, 0x4a, 0x4c, 0x49, 0x8d, 0x2f, 0x48, 0xcc, 0x2c, 0x8a, 0xcf, 0x4c, 0xd1, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x86, 0x2a, 0xd0, - 0x4b, 0x49, 0xad, 0x50, 0xf2, 0xe5, 0xe2, 0x0e, 0x01, 0xa9, 0x09, 0x48, 0xcc, 0x2c, 0xf2, 0x74, - 0x11, 0x92, 0xe3, 0xe2, 0xca, 0x4d, 0xcc, 0x4e, 0x2d, 0x72, 0x49, 0xcd, 0xcb, 0xcf, 0x95, 0x60, - 0x52, 0x60, 0xd4, 0xe0, 0x0c, 0x42, 0x12, 0x01, 0xc9, 0x97, 0x20, 0xe4, 0x99, 0x21, 0xf2, 0x08, - 0x11, 0x27, 0x97, 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, 0x4a, 0xcf, - 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x87, 0x3a, 0x40, 0x37, 0xbf, 0x28, 0x1d, - 0xc6, 0xd6, 0xaf, 0x80, 0xb8, 0xb7, 0xb2, 0x20, 0xb5, 0x38, 0x89, 0x0d, 0xec, 0x50, 0x63, 0x40, - 0x00, 0x00, 0x00, 0xff, 0xff, 0xee, 0x17, 0xd6, 0xa6, 0xcb, 0x00, 0x00, 0x00, + 0x4b, 0x49, 0xad, 0x50, 0xf2, 0xe7, 0xe2, 0x0e, 0x01, 0xa9, 0x09, 0x48, 0xcc, 0x2c, 0xf2, 0x74, + 0x11, 0x92, 0xe7, 0xe2, 0xce, 0x4d, 0xcc, 0x4e, 0x2d, 0x8a, 0x4f, 0x49, 0xcd, 0xcb, 0xcf, 0x95, + 0x60, 0x52, 0x60, 0xd4, 0xe0, 0x0c, 0xe2, 0x02, 0x0b, 0xb9, 0x80, 0x44, 0x40, 0x0a, 0x4a, 0x90, + 0x14, 0x30, 0x43, 0x14, 0x94, 0xc0, 0x15, 0x38, 0xb9, 0x9c, 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, 0x56, 0x7a, 0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, 0x7e, 0xae, 0x3e, + 0xd4, 0x09, 0xba, 0xf9, 0x45, 0xe9, 0x30, 0xb6, 0x7e, 0x05, 0xc4, 0xc5, 0x95, 0x05, 0xa9, 0xc5, + 0x49, 0x6c, 0x60, 0xa7, 0x1a, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0xa5, 0xfa, 0x5d, 0x65, 0xcd, + 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 488966197..47e78b1b3 100644 --- a/x/dex/types/tx.pb.go +++ b/x/dex/types/tx.pb.go @@ -119,13 +119,13 @@ func (m *DepositOptions) GetDisableAutoswap() bool { type MsgDeposit struct { Creator string `protobuf:"bytes,1,opt,name=creator,proto3" json:"creator,omitempty"` Receiver string `protobuf:"bytes,2,opt,name=receiver,proto3" json:"receiver,omitempty"` - TokenA string `protobuf:"bytes,3,opt,name=tokenA,proto3" json:"tokenA,omitempty"` - TokenB string `protobuf:"bytes,4,opt,name=tokenB,proto3" json:"tokenB,omitempty"` - AmountsA []github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,5,rep,name=amountsA,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"amountsA" yaml:"amountsA"` - AmountsB []github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,6,rep,name=amountsB,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"amountsB" yaml:"amountsB"` - TickIndexesAToB []int64 `protobuf:"varint,7,rep,packed,name=tickIndexesAToB,proto3" json:"tickIndexesAToB,omitempty"` + TokenA string `protobuf:"bytes,3,opt,name=token_a,json=tokenA,proto3" json:"token_a,omitempty"` + TokenB string `protobuf:"bytes,4,opt,name=token_b,json=tokenB,proto3" json:"token_b,omitempty"` + AmountsA []github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,5,rep,name=amounts_a,json=amountsA,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"amountsA" yaml:"amountsA"` + AmountsB []github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,6,rep,name=amounts_b,json=amountsB,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"amountsB" yaml:"amountsB"` + TickIndexesAToB []int64 `protobuf:"varint,7,rep,packed,name=tick_indexes_a_to_b,json=tickIndexesAToB,proto3" json:"tick_indexes_a_to_b,omitempty"` Fees []uint64 `protobuf:"varint,8,rep,packed,name=fees,proto3" json:"fees,omitempty"` - Options []*DepositOptions `protobuf:"bytes,9,rep,name=Options,proto3" json:"Options,omitempty"` + Options []*DepositOptions `protobuf:"bytes,9,rep,name=options,proto3" json:"options,omitempty"` } func (m *MsgDeposit) Reset() { *m = MsgDeposit{} } @@ -211,8 +211,8 @@ func (m *MsgDeposit) GetOptions() []*DepositOptions { } type MsgDepositResponse struct { - Reserve0Deposited []github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,1,rep,name=Reserve0Deposited,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"reserve0Deposited" yaml:"reserve0Deposited"` - Reserve1Deposited []github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,rep,name=Reserve1Deposited,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"reserve1Deposited" yaml:"reserve1Deposited"` + Reserve0Deposited []github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,1,rep,name=reserve0_deposited,json=reserve0Deposited,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"reserve0Deposited" yaml:"reserve0Deposited"` + Reserve1Deposited []github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,rep,name=reserve1_deposited,json=reserve1Deposited,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"reserve1Deposited" yaml:"reserve1Deposited"` } func (m *MsgDepositResponse) Reset() { *m = MsgDepositResponse{} } @@ -251,10 +251,10 @@ var xxx_messageInfo_MsgDepositResponse proto.InternalMessageInfo type MsgWithdrawal struct { Creator string `protobuf:"bytes,1,opt,name=creator,proto3" json:"creator,omitempty"` Receiver string `protobuf:"bytes,2,opt,name=receiver,proto3" json:"receiver,omitempty"` - TokenA string `protobuf:"bytes,3,opt,name=tokenA,proto3" json:"tokenA,omitempty"` - TokenB string `protobuf:"bytes,4,opt,name=tokenB,proto3" json:"tokenB,omitempty"` - SharesToRemove []github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,5,rep,name=sharesToRemove,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"sharesToRemove" yaml:"sharesToRemove"` - TickIndexesAToB []int64 `protobuf:"varint,6,rep,packed,name=tickIndexesAToB,proto3" json:"tickIndexesAToB,omitempty"` + TokenA string `protobuf:"bytes,3,opt,name=token_a,json=tokenA,proto3" json:"token_a,omitempty"` + TokenB string `protobuf:"bytes,4,opt,name=token_b,json=tokenB,proto3" json:"token_b,omitempty"` + SharesToRemove []github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,5,rep,name=shares_to_remove,json=sharesToRemove,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"sharesToRemove" yaml:"sharesToRemove"` + TickIndexesAToB []int64 `protobuf:"varint,6,rep,packed,name=tick_indexes_a_to_b,json=tickIndexesAToB,proto3" json:"tick_indexes_a_to_b,omitempty"` Fees []uint64 `protobuf:"varint,7,rep,packed,name=fees,proto3" json:"fees,omitempty"` } @@ -372,14 +372,14 @@ var xxx_messageInfo_MsgWithdrawalResponse proto.InternalMessageInfo type MsgPlaceLimitOrder struct { 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=tokenIn,proto3" json:"tokenIn,omitempty"` - TokenOut string `protobuf:"bytes,4,opt,name=tokenOut,proto3" json:"tokenOut,omitempty"` - TickIndexInToOut int64 `protobuf:"varint,5,opt,name=tickIndexInToOut,proto3" json:"tickIndexInToOut,omitempty"` - AmountIn github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,7,opt,name=amountIn,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"amountIn" yaml:"amountIn"` - OrderType LimitOrderType `protobuf:"varint,8,opt,name=orderType,proto3,enum=neutron.dex.LimitOrderType" json:"orderType,omitempty"` + TokenIn string `protobuf:"bytes,3,opt,name=token_in,json=tokenIn,proto3" json:"token_in,omitempty"` + TokenOut string `protobuf:"bytes,4,opt,name=token_out,json=tokenOut,proto3" json:"token_out,omitempty"` + TickIndexInToOut int64 `protobuf:"varint,5,opt,name=tick_index_in_to_out,json=tickIndexInToOut,proto3" json:"tick_index_in_to_out,omitempty"` + AmountIn github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,7,opt,name=amount_in,json=amountIn,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"amountIn" yaml:"amountIn"` + OrderType LimitOrderType `protobuf:"varint,8,opt,name=order_type,json=orderType,proto3,enum=neutron.dex.LimitOrderType" json:"order_type,omitempty"` // expirationTime is only valid iff orderType == GOOD_TIL_TIME. - ExpirationTime *time.Time `protobuf:"bytes,9,opt,name=expirationTime,proto3,stdtime" json:"expirationTime,omitempty"` - MaxAmountOut *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,10,opt,name=maxAmountOut,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"maxAmountOut" yaml:"maxAmountOut"` + ExpirationTime *time.Time `protobuf:"bytes,9,opt,name=expiration_time,json=expirationTime,proto3,stdtime" json:"expiration_time,omitempty"` + MaxAmountOut *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,10,opt,name=max_amount_out,json=maxAmountOut,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"maxAmountOut" yaml:"maxAmountOut"` } func (m *MsgPlaceLimitOrder) Reset() { *m = MsgPlaceLimitOrder{} } @@ -467,11 +467,11 @@ func (m *MsgPlaceLimitOrder) GetExpirationTime() *time.Time { type MsgPlaceLimitOrderResponse struct { TrancheKey string `protobuf:"bytes,1,opt,name=trancheKey,proto3" json:"trancheKey,omitempty"` // Total amount of coin used for the limit order - CoinIn github_com_cosmos_cosmos_sdk_types.Coin `protobuf:"bytes,2,opt,name=coinIn,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Coin" json:"coinIn" yaml:"coinIn"` + CoinIn github_com_cosmos_cosmos_sdk_types.Coin `protobuf:"bytes,2,opt,name=coin_in,json=coinIn,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Coin" json:"coinIn" yaml:"coinIn"` // 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 - TakerCoinOut github_com_cosmos_cosmos_sdk_types.Coin `protobuf:"bytes,3,opt,name=takerCoinOut,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Coin" json:"takerCoinOut" yaml:"takerCoinOut"` + 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:"takerCoinOut" yaml:"takerCoinOut"` } func (m *MsgPlaceLimitOrderResponse) Reset() { *m = MsgPlaceLimitOrderResponse{} } @@ -516,7 +516,7 @@ func (m *MsgPlaceLimitOrderResponse) GetTrancheKey() string { type MsgWithdrawFilledLimitOrder struct { Creator string `protobuf:"bytes,1,opt,name=creator,proto3" json:"creator,omitempty"` - TrancheKey string `protobuf:"bytes,2,opt,name=trancheKey,proto3" json:"trancheKey,omitempty"` + TrancheKey string `protobuf:"bytes,2,opt,name=tranche_key,json=trancheKey,proto3" json:"tranche_key,omitempty"` } func (m *MsgWithdrawFilledLimitOrder) Reset() { *m = MsgWithdrawFilledLimitOrder{} } @@ -604,7 +604,7 @@ var xxx_messageInfo_MsgWithdrawFilledLimitOrderResponse proto.InternalMessageInf type MsgCancelLimitOrder struct { Creator string `protobuf:"bytes,1,opt,name=creator,proto3" json:"creator,omitempty"` - TrancheKey string `protobuf:"bytes,2,opt,name=trancheKey,proto3" json:"trancheKey,omitempty"` + TrancheKey string `protobuf:"bytes,2,opt,name=tranche_key,json=trancheKey,proto3" json:"tranche_key,omitempty"` } func (m *MsgCancelLimitOrder) Reset() { *m = MsgCancelLimitOrder{} } @@ -738,11 +738,11 @@ type MsgMultiHopSwap struct { 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 github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,4,opt,name=amountIn,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"amountIn" yaml:"amountIn"` - ExitLimitPrice github_com_neutron_org_neutron_utils_math.PrecDec `protobuf:"bytes,5,opt,name=exitLimitPrice,proto3,customtype=github.com/neutron-org/neutron/utils/math.PrecDec" json:"exitLimitPrice" yaml:"exitLimitPrice"` + AmountIn github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,4,opt,name=amount_in,json=amountIn,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"amountIn" yaml:"amountIn"` + ExitLimitPrice github_com_neutron_org_neutron_utils_math.PrecDec `protobuf:"bytes,5,opt,name=exit_limit_price,json=exitLimitPrice,proto3,customtype=github.com/neutron-org/neutron/utils/math.PrecDec" json:"exitLimitPrice" yaml:"exitLimitPrice"` // 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=pickBestRoute,proto3" json:"pickBestRoute,omitempty"` + PickBestRoute bool `protobuf:"varint,6,opt,name=pick_best_route,json=pickBestRoute,proto3" json:"pick_best_route,omitempty"` } func (m *MsgMultiHopSwap) Reset() { *m = MsgMultiHopSwap{} } @@ -807,7 +807,7 @@ func (m *MsgMultiHopSwap) GetPickBestRoute() bool { } type MsgMultiHopSwapResponse struct { - CoinOut github_com_cosmos_cosmos_sdk_types.Coin `protobuf:"bytes,1,opt,name=coinOut,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Coin" json:"coinOut"` + 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:"coinOut"` } func (m *MsgMultiHopSwapResponse) Reset() { *m = MsgMultiHopSwapResponse{} } @@ -960,96 +960,101 @@ func init() { func init() { proto.RegisterFile("neutron/dex/tx.proto", fileDescriptor_a489f6e187d5e074) } var fileDescriptor_a489f6e187d5e074 = []byte{ - // 1420 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0xcf, 0x6f, 0x13, 0xc7, - 0x17, 0xcf, 0xda, 0xc6, 0x8e, 0x27, 0xbf, 0x9c, 0x09, 0x90, 0xc5, 0x7c, 0xbf, 0xb6, 0xb5, 0xf0, - 0x05, 0x7f, 0x23, 0x61, 0xe3, 0x54, 0x45, 0x2a, 0x3d, 0x79, 0x93, 0xd0, 0x2e, 0xd8, 0x38, 0x5a, - 0x4c, 0x51, 0x5b, 0xa9, 0xd6, 0x66, 0x3d, 0xd8, 0xab, 0x78, 0x77, 0x56, 0x3b, 0xe3, 0xe0, 0x1c, - 0x7a, 0x68, 0x8f, 0xa8, 0x95, 0xb8, 0xf4, 0xc4, 0x3f, 0xd0, 0xde, 0x38, 0x20, 0xf5, 0xd4, 0x3b, - 0x47, 0xd4, 0x5e, 0xaa, 0x1e, 0xdc, 0x0a, 0x0e, 0x48, 0x1c, 0x23, 0xf5, 0x5e, 0xed, 0xec, 0xec, - 0x7a, 0x77, 0x4d, 0x08, 0x81, 0xb6, 0x17, 0xb2, 0xf3, 0xde, 0x67, 0xde, 0x7b, 0xf3, 0x99, 0xf7, - 0x63, 0x0c, 0x38, 0x69, 0xa1, 0x21, 0x75, 0xb0, 0x55, 0xed, 0xa2, 0x51, 0x95, 0x8e, 0x2a, 0xb6, - 0x83, 0x29, 0x86, 0x73, 0x5c, 0x5a, 0xe9, 0xa2, 0x51, 0xfe, 0x64, 0x0f, 0xf7, 0x30, 0x93, 0x57, - 0xdd, 0x2f, 0x0f, 0x92, 0x2f, 0xe8, 0x98, 0x98, 0x98, 0x54, 0x77, 0x34, 0x82, 0xaa, 0x7b, 0xb5, - 0x1d, 0x44, 0xb5, 0x5a, 0x55, 0xc7, 0x86, 0xc5, 0xf5, 0xc5, 0x1e, 0xc6, 0xbd, 0x01, 0xaa, 0xb2, - 0xd5, 0xce, 0xf0, 0x6e, 0x95, 0x1a, 0x26, 0x22, 0x54, 0x33, 0x6d, 0x0e, 0x58, 0xd6, 0x4c, 0xc3, - 0xc2, 0x55, 0xf6, 0x2f, 0x17, 0x89, 0xe1, 0x60, 0x6c, 0xcd, 0xd1, 0x4c, 0xc2, 0x35, 0xab, 0xdc, - 0x9b, 0x49, 0x7a, 0xd5, 0xbd, 0x9a, 0xfb, 0x87, 0x2b, 0xce, 0x78, 0x8a, 0x8e, 0x17, 0x9f, 0xb7, - 0xf0, 0x54, 0xd2, 0x87, 0x60, 0x71, 0x13, 0xd9, 0x98, 0x18, 0xb4, 0x65, 0x53, 0x03, 0x5b, 0x04, - 0xfe, 0x1f, 0xe4, 0xba, 0x06, 0xd1, 0x76, 0x06, 0xa8, 0xa3, 0x0d, 0x29, 0x26, 0xf7, 0x34, 0x5b, - 0x14, 0x4a, 0x42, 0x79, 0x56, 0x5d, 0xe2, 0xf2, 0x3a, 0x17, 0x4b, 0x3f, 0x25, 0x01, 0x68, 0x92, - 0x1e, 0x37, 0x00, 0x45, 0x90, 0xd1, 0x1d, 0xa4, 0x51, 0xec, 0xb0, 0x0d, 0x59, 0xd5, 0x5f, 0xc2, - 0x3c, 0x98, 0x75, 0x90, 0x8e, 0x8c, 0x3d, 0xe4, 0x88, 0x09, 0xa6, 0x0a, 0xd6, 0xf0, 0x34, 0x48, - 0x53, 0xbc, 0x8b, 0xac, 0xba, 0x98, 0x64, 0x1a, 0xbe, 0x0a, 0xe4, 0xb2, 0x98, 0x0a, 0xc9, 0x65, - 0x68, 0x80, 0x59, 0xcd, 0xc4, 0x43, 0x8b, 0x92, 0xba, 0x78, 0xa2, 0x94, 0x2c, 0x67, 0xe5, 0xe6, - 0x93, 0x71, 0x71, 0xe6, 0xb7, 0x71, 0xf1, 0x42, 0xcf, 0xa0, 0xfd, 0xe1, 0x4e, 0x45, 0xc7, 0x26, - 0x3f, 0x24, 0xff, 0x73, 0x89, 0x74, 0x77, 0xab, 0x74, 0xdf, 0x46, 0xa4, 0xa2, 0x58, 0xf4, 0xe5, - 0xb8, 0x18, 0x58, 0x38, 0x18, 0x17, 0x97, 0xf6, 0x35, 0x73, 0x70, 0x55, 0xf2, 0x25, 0x92, 0x1a, - 0x28, 0x43, 0xae, 0x64, 0x31, 0xfd, 0x8e, 0xae, 0xe4, 0x29, 0x57, 0xf2, 0xc4, 0x95, 0x0c, 0xcb, - 0x60, 0x89, 0x1a, 0xfa, 0xae, 0x62, 0x75, 0xd1, 0x08, 0x91, 0x7a, 0x1b, 0xcb, 0x62, 0xa6, 0x94, - 0x2c, 0x27, 0xd5, 0xb8, 0x18, 0x42, 0x90, 0xba, 0x8b, 0x10, 0x11, 0x67, 0x4b, 0xc9, 0x72, 0x4a, - 0x65, 0xdf, 0xf0, 0x7d, 0x90, 0xe1, 0xd7, 0x27, 0x66, 0x4b, 0xc9, 0xf2, 0xdc, 0xfa, 0xd9, 0x4a, - 0x28, 0x39, 0x2b, 0xd1, 0x1b, 0x56, 0x7d, 0xac, 0xf4, 0x38, 0x01, 0xe0, 0xe4, 0xfe, 0x54, 0x44, - 0x6c, 0x6c, 0x11, 0x04, 0xbf, 0x15, 0xc0, 0xb2, 0x8a, 0x08, 0x72, 0xf6, 0xd0, 0x65, 0xae, 0x43, - 0x5d, 0x51, 0x60, 0x04, 0x74, 0x8e, 0x4d, 0xc0, 0xb2, 0x13, 0x37, 0x75, 0x30, 0x2e, 0x8a, 0x1e, - 0x13, 0x53, 0x2a, 0x49, 0x9d, 0xf6, 0x1c, 0x8e, 0xa7, 0x36, 0x89, 0x27, 0xf1, 0x8e, 0xf1, 0xd4, - 0x0e, 0x8f, 0xa7, 0xf6, 0x8a, 0x78, 0x42, 0xb2, 0x1f, 0x13, 0x60, 0xa1, 0x49, 0x7a, 0x77, 0x0c, - 0xda, 0xef, 0x3a, 0xda, 0x3d, 0x6d, 0xf0, 0x2f, 0x65, 0xfe, 0x57, 0x02, 0x58, 0x24, 0x7d, 0xcd, - 0x41, 0xa4, 0x8d, 0x55, 0x64, 0xe2, 0x3d, 0xc4, 0x0b, 0xe0, 0xd3, 0x63, 0x93, 0x10, 0xb3, 0x73, - 0x30, 0x2e, 0x9e, 0xf2, 0x18, 0x88, 0xca, 0x25, 0x35, 0x06, 0x7c, 0x55, 0x9e, 0xa6, 0x5f, 0x9f, - 0xa7, 0x99, 0x49, 0x9e, 0x4a, 0xab, 0xe0, 0x54, 0x84, 0x38, 0x3f, 0xe5, 0xa4, 0x87, 0x29, 0x96, - 0x89, 0xdb, 0x03, 0x4d, 0x47, 0x0d, 0xc3, 0x34, 0x68, 0xcb, 0xe9, 0x22, 0xe7, 0x2d, 0x79, 0x15, - 0x41, 0x86, 0x31, 0xa6, 0x58, 0x9c, 0x58, 0x7f, 0xe9, 0xee, 0x62, 0x9f, 0xad, 0x21, 0xe5, 0xdc, - 0x06, 0x6b, 0xb8, 0x06, 0x72, 0xc1, 0x11, 0x14, 0xab, 0x8d, 0x5d, 0xcc, 0x89, 0x92, 0x50, 0x4e, - 0xaa, 0x53, 0xf2, 0x49, 0x63, 0x50, 0x2c, 0x31, 0xe3, 0xda, 0x79, 0xfb, 0xc6, 0xa0, 0x58, 0xf1, - 0xc6, 0xa0, 0x58, 0x41, 0x63, 0x50, 0x2c, 0xf8, 0x01, 0xc8, 0x62, 0x97, 0x8b, 0xf6, 0xbe, 0x8d, - 0xc4, 0xd9, 0x92, 0x50, 0x5e, 0x8c, 0x15, 0xf7, 0x84, 0x2e, 0x17, 0xa2, 0x4e, 0xd0, 0xb0, 0x01, - 0x16, 0xd1, 0xc8, 0x36, 0x1c, 0xcd, 0xad, 0xf6, 0xb6, 0x61, 0x22, 0x31, 0x5b, 0x12, 0xca, 0x73, - 0xeb, 0xf9, 0x8a, 0x37, 0x76, 0x2a, 0xfe, 0xd8, 0xa9, 0xb4, 0xfd, 0xb1, 0x23, 0xcf, 0x3e, 0x19, - 0x17, 0x85, 0x07, 0xbf, 0x17, 0x05, 0x35, 0xb6, 0x17, 0xee, 0x83, 0x79, 0x53, 0x1b, 0xd5, 0x59, - 0x5c, 0x2e, 0x37, 0x80, 0x9d, 0xfb, 0xb6, 0x8b, 0x3f, 0xd6, 0xb9, 0x23, 0x56, 0x0e, 0xc6, 0xc5, - 0x15, 0xef, 0xec, 0x61, 0xa9, 0xa4, 0x46, 0x40, 0xd2, 0x2f, 0x09, 0x90, 0x9f, 0xce, 0x8e, 0xa0, - 0x5f, 0x15, 0x00, 0xa0, 0x8e, 0x66, 0xe9, 0x7d, 0x74, 0x03, 0xed, 0xf3, 0x44, 0x09, 0x49, 0xe0, - 0x97, 0x20, 0xed, 0xce, 0x5c, 0xc5, 0x62, 0x99, 0x32, 0xb7, 0x7e, 0xa6, 0xc2, 0x47, 0xa0, 0x3b, - 0x96, 0x2b, 0x7c, 0x2c, 0x57, 0x36, 0xb0, 0x61, 0xc9, 0xd7, 0xf9, 0x35, 0x5e, 0x7c, 0x83, 0xe3, - 0xb8, 0x1b, 0x5e, 0x8e, 0x8b, 0xdc, 0xf6, 0xc1, 0xb8, 0xb8, 0xe0, 0x9d, 0xc4, 0x5b, 0x4b, 0x2a, - 0x57, 0xc0, 0xef, 0x04, 0x30, 0x4f, 0xb5, 0x5d, 0xe4, 0xb8, 0x1b, 0x5c, 0xe6, 0x92, 0x47, 0x45, - 0xf1, 0xc9, 0xf1, 0xa3, 0x88, 0x78, 0x98, 0xb0, 0x1a, 0x96, 0x4a, 0x6a, 0x04, 0x24, 0xdd, 0x01, - 0x67, 0x43, 0xc5, 0x78, 0xcd, 0x18, 0x0c, 0x50, 0xf7, 0x8d, 0x6a, 0x2f, 0xca, 0x77, 0x22, 0xce, - 0xb7, 0xf4, 0x3f, 0x70, 0xee, 0x35, 0x86, 0x83, 0x9a, 0x6f, 0x81, 0x95, 0x26, 0xe9, 0x6d, 0x68, - 0x96, 0x8e, 0x06, 0x7f, 0x8b, 0xdf, 0xff, 0xb2, 0x03, 0xc5, 0x0d, 0x06, 0xfe, 0xce, 0x81, 0x85, - 0xe6, 0x70, 0x40, 0x8d, 0x8f, 0xb1, 0xad, 0xe2, 0x21, 0x45, 0x6e, 0x87, 0xea, 0x63, 0x9b, 0x78, - 0x93, 0x4d, 0x65, 0xdf, 0xd2, 0xc3, 0x24, 0x58, 0x6a, 0x92, 0x9e, 0x0f, 0xbc, 0x75, 0x4f, 0xb3, - 0xdf, 0xb2, 0x0b, 0xad, 0x83, 0xb4, 0xe3, 0xba, 0x21, 0x62, 0x92, 0x8d, 0xe4, 0x7c, 0xa4, 0x6a, - 0x23, 0x91, 0xa8, 0x1c, 0x19, 0xe9, 0x2b, 0xa9, 0x7f, 0xb6, 0xaf, 0x7c, 0x23, 0xb8, 0xdd, 0xc1, - 0xa0, 0x8c, 0xa8, 0x6d, 0xc7, 0xd0, 0x11, 0xeb, 0x76, 0x59, 0xb9, 0xcb, 0x3d, 0xd6, 0x42, 0x1e, - 0x79, 0xe4, 0x97, 0xb0, 0xd3, 0xf3, 0xbf, 0xab, 0x43, 0x6a, 0x0c, 0x48, 0xd5, 0xd4, 0x68, 0xbf, - 0xb2, 0xed, 0x20, 0x7d, 0x13, 0xe9, 0xee, 0x5c, 0x89, 0x9a, 0x9c, 0xcc, 0x95, 0xa8, 0x5c, 0x52, - 0x63, 0x40, 0x78, 0x1e, 0x2c, 0xd8, 0x86, 0xbe, 0x2b, 0x23, 0x42, 0x19, 0x25, 0x62, 0x9a, 0x3d, - 0x39, 0xa3, 0x42, 0xe9, 0xbe, 0x00, 0x56, 0x63, 0xb7, 0x13, 0x74, 0x01, 0x0c, 0x32, 0x3a, 0x2f, - 0x30, 0xe1, 0xa8, 0x02, 0xbb, 0x7a, 0xfc, 0x02, 0xf3, 0x8d, 0xab, 0xfe, 0x87, 0xf4, 0x83, 0xc0, - 0x52, 0xe5, 0xb6, 0xdd, 0xd5, 0x28, 0xda, 0x66, 0x0f, 0x71, 0x78, 0x05, 0x64, 0xb5, 0x21, 0xed, - 0x63, 0xc7, 0xa0, 0xbc, 0x13, 0xc9, 0xe2, 0xcf, 0x8f, 0x2f, 0x9d, 0xe4, 0x91, 0xd4, 0xbb, 0x5d, - 0x07, 0x11, 0x72, 0x8b, 0x3a, 0x86, 0xd5, 0x53, 0x27, 0x50, 0x78, 0x05, 0xa4, 0xbd, 0xa7, 0x3c, - 0x6f, 0x51, 0x2b, 0x91, 0x64, 0xf1, 0x8c, 0xcb, 0x59, 0x37, 0xea, 0xef, 0x5f, 0x3c, 0x5a, 0x13, - 0x54, 0x8e, 0xbe, 0x7a, 0xe1, 0xeb, 0x17, 0x8f, 0xd6, 0x26, 0x76, 0xee, 0xbf, 0x78, 0xb4, 0xb6, - 0xe2, 0xfe, 0x2e, 0x88, 0xc5, 0x25, 0x9d, 0x61, 0xbc, 0x85, 0x45, 0x3e, 0x6f, 0x6b, 0x23, 0xb0, - 0x18, 0x1d, 0x21, 0xf0, 0x34, 0x80, 0x1f, 0xb5, 0x5a, 0x9b, 0x9d, 0xb6, 0xd2, 0xe8, 0x6c, 0xd4, - 0x6f, 0x6e, 0x6c, 0x35, 0x1a, 0x5b, 0x9b, 0xb9, 0x19, 0x98, 0x03, 0xf3, 0xd7, 0x94, 0x46, 0xa3, - 0xd3, 0x52, 0x3b, 0x37, 0x94, 0x46, 0x23, 0x27, 0xc0, 0x55, 0xb0, 0xa2, 0x34, 0x9b, 0x5b, 0x9b, - 0x4a, 0xbd, 0xbd, 0xe5, 0x8a, 0x3d, 0x74, 0x2e, 0xe1, 0x42, 0xaf, 0xdf, 0xbe, 0xd5, 0xee, 0x28, - 0x37, 0x3b, 0x6d, 0xa5, 0xb9, 0x95, 0x4b, 0xc2, 0x65, 0xb0, 0x10, 0x18, 0x65, 0xa2, 0xd4, 0xfa, - 0x9f, 0x29, 0x90, 0x6c, 0x92, 0x1e, 0xdc, 0x00, 0x19, 0xff, 0x27, 0xc4, 0x6a, 0xb4, 0x48, 0x82, - 0xb7, 0x69, 0xbe, 0x78, 0x88, 0x22, 0xb8, 0xfe, 0x06, 0x00, 0xa1, 0x07, 0x59, 0x3e, 0x0e, 0x9f, - 0xe8, 0xf2, 0xd2, 0xe1, 0xba, 0xc0, 0xda, 0xe7, 0x60, 0x29, 0xfe, 0x16, 0x99, 0x8a, 0x20, 0x06, - 0xc8, 0x5f, 0x3c, 0x02, 0x10, 0x18, 0xdf, 0x03, 0xe2, 0xa1, 0x5d, 0xb7, 0x7c, 0x58, 0x70, 0x71, - 0x64, 0xfe, 0xf2, 0x9b, 0x22, 0x03, 0xbf, 0x5f, 0x80, 0xdc, 0x54, 0xb7, 0x2d, 0xc5, 0xad, 0xc4, - 0x11, 0xf9, 0xf2, 0x51, 0x88, 0xc0, 0xbe, 0x0a, 0xe6, 0x23, 0x7d, 0xf3, 0x3f, 0xf1, 0x9d, 0x61, - 0x6d, 0xfe, 0xfc, 0xeb, 0xb4, 0x61, 0x9b, 0x91, 0x02, 0x9b, 0xb2, 0x19, 0xd6, 0x4e, 0xdb, 0x7c, - 0x55, 0xc6, 0xcb, 0x9b, 0x4f, 0x9e, 0x15, 0x84, 0xa7, 0xcf, 0x0a, 0xc2, 0x1f, 0xcf, 0x0a, 0xc2, - 0x83, 0xe7, 0x85, 0x99, 0xa7, 0xcf, 0x0b, 0x33, 0xbf, 0x3e, 0x2f, 0xcc, 0x7c, 0xb6, 0x76, 0x44, - 0xcf, 0x1b, 0x79, 0xff, 0x03, 0xe0, 0xf6, 0x85, 0x9d, 0x34, 0x7b, 0x3d, 0xbd, 0xf7, 0x57, 0x00, - 0x00, 0x00, 0xff, 0xff, 0xa9, 0x01, 0xb0, 0x91, 0x1d, 0x10, 0x00, 0x00, + // 1494 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0x4d, 0x6c, 0x1b, 0xc5, + 0x17, 0xcf, 0xc6, 0xa9, 0x3f, 0x26, 0x5f, 0xee, 0x24, 0xfd, 0x67, 0xe3, 0xfe, 0xff, 0xb6, 0xb5, + 0xfd, 0xd3, 0x9a, 0x88, 0xda, 0x4d, 0x10, 0x3d, 0x84, 0x93, 0x9d, 0xa4, 0xe0, 0xd6, 0xae, 0xa3, + 0xad, 0xcb, 0xa7, 0xc4, 0x6a, 0x6c, 0x4f, 0xed, 0x25, 0xf6, 0xce, 0x6a, 0x67, 0x9c, 0x3a, 0x42, + 0xe2, 0x00, 0x37, 0x90, 0xaa, 0xde, 0xb8, 0x72, 0x42, 0x70, 0xeb, 0x01, 0x71, 0xe5, 0x84, 0xd4, + 0x63, 0xc5, 0x01, 0x21, 0x0e, 0x06, 0xb5, 0x87, 0x4a, 0x3d, 0x46, 0xe2, 0x8e, 0x66, 0x76, 0xbc, + 0xde, 0x5d, 0x37, 0x4d, 0xd3, 0x02, 0x97, 0x66, 0xe7, 0xbd, 0xdf, 0xbc, 0xf7, 0xe6, 0x37, 0xef, + 0x63, 0x5c, 0xb0, 0x6c, 0xe1, 0x3e, 0x73, 0x88, 0x55, 0x68, 0xe1, 0x41, 0x81, 0x0d, 0xf2, 0xb6, + 0x43, 0x18, 0x81, 0xb3, 0x52, 0x9a, 0x6f, 0xe1, 0x41, 0x6a, 0xb9, 0x4d, 0xda, 0x44, 0xc8, 0x0b, + 0xfc, 0xcb, 0x85, 0xa4, 0xd2, 0x4d, 0x42, 0x7b, 0x84, 0x16, 0x1a, 0x88, 0xe2, 0xc2, 0xfe, 0x7a, + 0x03, 0x33, 0xb4, 0x5e, 0x68, 0x12, 0xd3, 0x92, 0xfa, 0x4c, 0x9b, 0x90, 0x76, 0x17, 0x17, 0xc4, + 0xaa, 0xd1, 0xbf, 0x55, 0x60, 0x66, 0x0f, 0x53, 0x86, 0x7a, 0xb6, 0x04, 0x9c, 0x46, 0x3d, 0xd3, + 0x22, 0x05, 0xf1, 0xaf, 0x14, 0xa9, 0xfe, 0x60, 0x6c, 0xe4, 0xa0, 0x1e, 0x95, 0x9a, 0x15, 0xe9, + 0xad, 0x47, 0xdb, 0x85, 0xfd, 0x75, 0xfe, 0x47, 0x2a, 0x56, 0x5d, 0x85, 0xe1, 0xc6, 0xe7, 0x2e, + 0x5c, 0x95, 0xf6, 0x26, 0x58, 0xd8, 0xc6, 0x36, 0xa1, 0x26, 0xab, 0xd9, 0xcc, 0x24, 0x16, 0x85, + 0xaf, 0x82, 0x64, 0xcb, 0xa4, 0xa8, 0xd1, 0xc5, 0x06, 0xea, 0x33, 0x42, 0x6f, 0x23, 0x5b, 0x55, + 0xb2, 0x4a, 0x2e, 0xae, 0x2f, 0x4a, 0x79, 0x51, 0x8a, 0xb5, 0x9f, 0x22, 0x00, 0x54, 0x69, 0x5b, + 0x1a, 0x80, 0x2a, 0x88, 0x35, 0x1d, 0x8c, 0x18, 0x71, 0xc4, 0x86, 0x84, 0x3e, 0x5a, 0xc2, 0x14, + 0x88, 0x3b, 0xb8, 0x89, 0xcd, 0x7d, 0xec, 0xa8, 0xd3, 0x42, 0xe5, 0xad, 0xe1, 0x0a, 0x88, 0x31, + 0xb2, 0x87, 0x2d, 0x03, 0xa9, 0x11, 0xa1, 0x8a, 0x8a, 0x65, 0x71, 0xac, 0x68, 0xa8, 0x33, 0x3e, + 0x45, 0x09, 0x7e, 0x0c, 0x12, 0xa8, 0x47, 0xfa, 0x16, 0xa3, 0x06, 0x52, 0x4f, 0x65, 0x23, 0xb9, + 0x44, 0xa9, 0x7a, 0x7f, 0x98, 0x99, 0xfa, 0x6d, 0x98, 0x39, 0xdf, 0x36, 0x59, 0xa7, 0xdf, 0xc8, + 0x37, 0x49, 0x4f, 0x9e, 0x53, 0xfe, 0xb9, 0x48, 0x5b, 0x7b, 0x05, 0x76, 0x60, 0x63, 0x9a, 0x2f, + 0x5b, 0xec, 0xc9, 0x30, 0x13, 0x97, 0x26, 0x8a, 0x87, 0xc3, 0xcc, 0xe2, 0x01, 0xea, 0x75, 0x37, + 0xb5, 0x91, 0x44, 0xd3, 0x3d, 0xa5, 0xdf, 0x57, 0x43, 0x8d, 0xbe, 0xa4, 0xaf, 0xd2, 0x84, 0xaf, + 0xd2, 0xd8, 0x57, 0x09, 0xbe, 0x06, 0x96, 0x98, 0xd9, 0xdc, 0x33, 0x4c, 0xab, 0x85, 0x07, 0x98, + 0x1a, 0xc8, 0x60, 0xc4, 0x68, 0xa8, 0xb1, 0x6c, 0x24, 0x17, 0xd1, 0x17, 0xb9, 0xaa, 0xec, 0x6a, + 0x8a, 0x75, 0x52, 0x82, 0x10, 0xcc, 0xdc, 0xc2, 0x98, 0xaa, 0xf1, 0x6c, 0x24, 0x37, 0xa3, 0x8b, + 0x6f, 0xf8, 0x06, 0x88, 0x11, 0xf7, 0x1a, 0xd5, 0x44, 0x36, 0x92, 0x9b, 0xdd, 0x38, 0x9b, 0xf7, + 0x25, 0x69, 0x3e, 0x78, 0xd3, 0xfa, 0x08, 0xab, 0xfd, 0x30, 0x0d, 0xe0, 0xf8, 0x1e, 0x75, 0x4c, + 0x6d, 0x62, 0x51, 0x0c, 0xef, 0x28, 0x00, 0x3a, 0x98, 0x62, 0x67, 0x1f, 0x5f, 0x32, 0x5a, 0xae, + 0x12, 0xb7, 0x54, 0x45, 0xb0, 0x60, 0x9c, 0x98, 0x85, 0xd3, 0x23, 0x5b, 0xdb, 0x23, 0x53, 0x87, + 0xc3, 0x8c, 0xea, 0xd2, 0x31, 0xa1, 0xd2, 0xf4, 0x49, 0xb8, 0x3f, 0xa0, 0x75, 0x5f, 0x40, 0xd3, + 0x2f, 0x19, 0xd0, 0xfa, 0xd1, 0x01, 0xad, 0x3f, 0x25, 0x20, 0x9f, 0xec, 0xc7, 0x69, 0x30, 0x5f, + 0xa5, 0xed, 0x77, 0x4d, 0xd6, 0x69, 0x39, 0xe8, 0x36, 0xea, 0xfe, 0x6b, 0x35, 0xf0, 0xb9, 0x02, + 0x92, 0xb4, 0x83, 0x1c, 0x4c, 0x79, 0x92, 0x38, 0xb8, 0x47, 0xf6, 0xb1, 0xac, 0x85, 0xf7, 0x4f, + 0x4c, 0xc4, 0x82, 0x6b, 0xa9, 0x4e, 0x74, 0x61, 0xe7, 0x70, 0x98, 0x39, 0xe3, 0xb2, 0x10, 0x94, + 0x6b, 0x7a, 0x08, 0x78, 0x54, 0xc6, 0x46, 0x9f, 0x9d, 0xb1, 0xb1, 0x71, 0xc6, 0x6a, 0x2b, 0xe0, + 0x4c, 0x80, 0xc0, 0x51, 0xf2, 0x69, 0xdf, 0xcc, 0x88, 0x9c, 0xdc, 0xed, 0xa2, 0x26, 0xae, 0x98, + 0x3d, 0x93, 0xd5, 0x9c, 0x16, 0x76, 0x5e, 0x90, 0xdf, 0x55, 0x10, 0x77, 0x69, 0x34, 0x2d, 0x49, + 0xb0, 0x4b, 0x6b, 0xd9, 0x82, 0x67, 0x41, 0xc2, 0x55, 0x91, 0x3e, 0x93, 0x1c, 0xbb, 0xd8, 0x5a, + 0x9f, 0xc1, 0x3c, 0x58, 0x1e, 0x9f, 0xcf, 0x30, 0x2d, 0x7e, 0x3c, 0x8e, 0x3b, 0x95, 0x55, 0x72, + 0x11, 0x3d, 0xe9, 0x1d, 0xb0, 0x6c, 0xd5, 0x09, 0xc7, 0x7b, 0xdd, 0x82, 0x3b, 0x8a, 0x71, 0x63, + 0x2f, 0xde, 0x2d, 0xca, 0x56, 0xb8, 0x5b, 0x94, 0x2d, 0xaf, 0x5b, 0x94, 0x2d, 0xb8, 0x09, 0x00, + 0xe1, 0x94, 0x18, 0x7c, 0xaf, 0x1a, 0xcf, 0x2a, 0xb9, 0x85, 0x50, 0xb9, 0x8f, 0x69, 0xab, 0x1f, + 0xd8, 0x58, 0x4f, 0x90, 0xd1, 0x27, 0xac, 0x82, 0x45, 0x3c, 0xb0, 0x4d, 0x07, 0xf1, 0xfa, 0x37, + 0xf8, 0xd0, 0x51, 0x13, 0x59, 0x25, 0x37, 0xbb, 0x91, 0xca, 0xbb, 0x13, 0x29, 0x3f, 0x9a, 0x48, + 0xf9, 0xfa, 0x68, 0x22, 0x95, 0xe2, 0xf7, 0x87, 0x19, 0xe5, 0xee, 0xef, 0x19, 0x45, 0x5f, 0x18, + 0x6f, 0xe6, 0x6a, 0xf8, 0x09, 0x58, 0xe8, 0xa1, 0x81, 0x21, 0x8f, 0xce, 0x09, 0x02, 0xe2, 0xec, + 0x37, 0xf9, 0x8e, 0x13, 0x9d, 0x7d, 0xae, 0x87, 0x06, 0x45, 0x61, 0xa6, 0xd6, 0x67, 0x87, 0xc3, + 0xcc, 0x92, 0x7b, 0x7e, 0xbf, 0x54, 0xd3, 0x03, 0x20, 0xed, 0x97, 0x69, 0x90, 0x9a, 0x4c, 0x14, + 0xaf, 0x89, 0xa5, 0x01, 0x60, 0x0e, 0xb2, 0x9a, 0x1d, 0x7c, 0x0d, 0x1f, 0xc8, 0x9c, 0xf1, 0x49, + 0xe0, 0xa7, 0x20, 0xc6, 0x07, 0x32, 0xbf, 0xb0, 0x69, 0x41, 0xc1, 0x6a, 0x5e, 0x0e, 0x48, 0x3e, + 0xb4, 0xf3, 0x72, 0x68, 0xe7, 0xb7, 0x88, 0x69, 0x95, 0xae, 0xca, 0xbb, 0xbc, 0xf0, 0x1c, 0xe7, + 0xe1, 0x1b, 0x9e, 0x0c, 0x33, 0x51, 0x6e, 0x5c, 0x5c, 0xe5, 0xbc, 0x7b, 0x14, 0x77, 0xad, 0xe9, + 0x52, 0x01, 0xbf, 0x52, 0xc0, 0x02, 0x43, 0x7b, 0xd8, 0x31, 0x44, 0x18, 0x9c, 0xbc, 0xc8, 0x71, + 0x71, 0xbc, 0x73, 0xf2, 0x38, 0xe6, 0x84, 0x0f, 0xbe, 0x08, 0x10, 0xeb, 0x97, 0x6a, 0x7a, 0x00, + 0xa4, 0xbd, 0x07, 0xce, 0xfa, 0x4a, 0xf3, 0x8a, 0xd9, 0xed, 0xe2, 0xd6, 0x73, 0x55, 0x62, 0x06, + 0xcc, 0x4a, 0x82, 0x8d, 0x3d, 0x7c, 0x20, 0x8b, 0xd1, 0xc7, 0xb9, 0xf6, 0x0a, 0x38, 0xf7, 0x0c, + 0xcb, 0x5e, 0x0b, 0xd8, 0x05, 0x4b, 0x55, 0xda, 0xde, 0x42, 0x56, 0x13, 0x77, 0xff, 0x1e, 0xc7, + 0xff, 0x13, 0x47, 0x0a, 0x5b, 0xf4, 0x1c, 0x9e, 0x03, 0xf3, 0xd5, 0x7e, 0x97, 0x99, 0x6f, 0x13, + 0x5b, 0x27, 0x7d, 0x86, 0x79, 0xc7, 0xea, 0x10, 0x9b, 0xba, 0x23, 0x4f, 0x17, 0xdf, 0xda, 0xd7, + 0x11, 0xb0, 0x58, 0xa5, 0xed, 0x11, 0xf0, 0xc6, 0x6d, 0x64, 0xbf, 0x60, 0x57, 0xda, 0x00, 0x51, + 0x87, 0xbb, 0xa1, 0x6a, 0x44, 0x0c, 0xeb, 0x54, 0xa0, 0x7a, 0x03, 0x91, 0xe8, 0x12, 0x19, 0xec, + 0x30, 0x33, 0xff, 0x6c, 0x87, 0xb9, 0xa3, 0x80, 0x24, 0x1e, 0x98, 0xcc, 0xe8, 0x72, 0xaa, 0x0c, + 0xdb, 0x31, 0x9b, 0x58, 0xb4, 0xbe, 0x44, 0xa9, 0x25, 0x7d, 0xae, 0xfb, 0x7c, 0xca, 0xe0, 0x2f, + 0x12, 0xa7, 0x3d, 0xfa, 0x2e, 0xf4, 0x99, 0xd9, 0xa5, 0x85, 0x1e, 0x62, 0x9d, 0xfc, 0xae, 0x83, + 0x9b, 0xdb, 0xb8, 0xc9, 0xc7, 0x0d, 0x37, 0x2a, 0xe8, 0xdf, 0xe5, 0x26, 0xc7, 0xe3, 0x26, 0x28, + 0xd7, 0xf4, 0x10, 0x10, 0x9e, 0x07, 0x8b, 0x36, 0x6f, 0xc7, 0x0d, 0x4c, 0x99, 0x21, 0x08, 0x51, + 0xa3, 0xe2, 0x65, 0x3a, 0xcf, 0xc5, 0x25, 0x4c, 0x99, 0x20, 0x4b, 0xfb, 0x52, 0x01, 0x2b, 0xa1, + 0x2b, 0xf2, 0xfa, 0x81, 0x0d, 0xe2, 0x5e, 0xa1, 0x29, 0xc7, 0x15, 0xda, 0xe6, 0xc9, 0x0b, 0x4d, + 0x74, 0x93, 0x5a, 0x9f, 0xe9, 0xa3, 0x0f, 0xed, 0x3b, 0x45, 0x24, 0xcc, 0x4d, 0xbb, 0x85, 0x18, + 0xde, 0x15, 0x0f, 0x76, 0x78, 0x19, 0x24, 0x50, 0x9f, 0x75, 0x88, 0x63, 0x32, 0xd9, 0x94, 0x4a, + 0xea, 0xcf, 0xdf, 0x5f, 0x5c, 0x96, 0x91, 0x14, 0x5b, 0x2d, 0x07, 0x53, 0x7a, 0x83, 0x39, 0xa6, + 0xd5, 0xd6, 0xc7, 0x50, 0x78, 0x19, 0x44, 0xdd, 0x27, 0xbf, 0x6c, 0x56, 0x4b, 0x81, 0x94, 0x71, + 0x8d, 0x97, 0x12, 0x3c, 0xea, 0x6f, 0x1f, 0xdf, 0x5b, 0x53, 0x74, 0x89, 0xde, 0x3c, 0xff, 0xd9, + 0xe3, 0x7b, 0x6b, 0x63, 0x3b, 0x5f, 0x3c, 0xbe, 0xb7, 0xb6, 0xc4, 0x7f, 0x3f, 0x84, 0xe2, 0xd2, + 0x56, 0x05, 0x71, 0x7e, 0xd1, 0x88, 0xb8, 0xb5, 0x01, 0x58, 0x08, 0x0e, 0x14, 0xf8, 0x1f, 0x00, + 0xdf, 0xaa, 0xd5, 0xb6, 0x8d, 0x7a, 0xb9, 0x62, 0x6c, 0x15, 0xaf, 0x6f, 0xed, 0x54, 0x2a, 0x3b, + 0xdb, 0xc9, 0x29, 0x98, 0x04, 0x73, 0x57, 0xca, 0x95, 0x8a, 0x51, 0xd3, 0x8d, 0x6b, 0xe5, 0x4a, + 0x25, 0xa9, 0xc0, 0x15, 0xb0, 0x54, 0xae, 0x56, 0x77, 0xb6, 0xcb, 0xc5, 0xfa, 0x0e, 0x17, 0xbb, + 0xe8, 0xe4, 0x34, 0x87, 0x5e, 0xbd, 0x79, 0xa3, 0x6e, 0x94, 0xaf, 0x1b, 0xf5, 0x72, 0x75, 0x27, + 0x19, 0x81, 0xa7, 0xc1, 0xbc, 0x67, 0x54, 0x88, 0x66, 0x36, 0xfe, 0x9c, 0x01, 0x91, 0x2a, 0x6d, + 0xc3, 0x2d, 0x10, 0x1b, 0xfd, 0xd4, 0x58, 0x09, 0x96, 0x8a, 0xf7, 0x76, 0x4d, 0x65, 0x8e, 0x50, + 0x78, 0xf7, 0x5f, 0x01, 0xc0, 0xf7, 0x5c, 0x4b, 0x85, 0xe1, 0x63, 0x5d, 0x4a, 0x3b, 0x5a, 0xe7, + 0x59, 0xfb, 0x10, 0x2c, 0x86, 0x5f, 0x28, 0x13, 0x11, 0x84, 0x00, 0xa9, 0x0b, 0xc7, 0x00, 0x3c, + 0xe3, 0xfb, 0x40, 0x3d, 0xb2, 0xfb, 0xe6, 0x8e, 0x0a, 0x2e, 0x8c, 0x4c, 0x5d, 0x7a, 0x5e, 0xa4, + 0xe7, 0xf7, 0x23, 0x90, 0x9c, 0x68, 0xba, 0xd9, 0xb0, 0x95, 0x30, 0x22, 0x95, 0x3b, 0x0e, 0xe1, + 0xd9, 0xd7, 0xc1, 0x5c, 0xa0, 0x7b, 0xfe, 0x37, 0xbc, 0xd3, 0xaf, 0x4d, 0xfd, 0xff, 0x59, 0x5a, + 0xbf, 0xcd, 0x40, 0x81, 0x4d, 0xd8, 0xf4, 0x6b, 0x27, 0x6d, 0x3e, 0x2d, 0xe3, 0x4b, 0xdb, 0xf7, + 0x1f, 0xa6, 0x95, 0x07, 0x0f, 0xd3, 0xca, 0x1f, 0x0f, 0xd3, 0xca, 0xdd, 0x47, 0xe9, 0xa9, 0x07, + 0x8f, 0xd2, 0x53, 0xbf, 0x3e, 0x4a, 0x4f, 0x7d, 0xb0, 0x76, 0x4c, 0xdb, 0x1b, 0xb8, 0xff, 0x53, + 0xc0, 0xfb, 0x42, 0x23, 0x2a, 0x9e, 0x52, 0xaf, 0xff, 0x15, 0x00, 0x00, 0xff, 0xff, 0x2e, 0xd9, + 0xb3, 0xc0, 0x45, 0x10, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. From 7fd8ba396f2be9afeefd05748fc5f416624c4e25 Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Wed, 8 Nov 2023 15:20:20 +0200 Subject: [PATCH 222/307] fix json and yaml tags --- proto/neutron/dex/deposit_record.proto | 4 +- proto/neutron/dex/limit_order_tranche.proto | 20 +- .../dex/limit_order_tranche_user.proto | 10 +- proto/neutron/dex/pool_reserves.proto | 12 +- proto/neutron/dex/query.proto | 16 +- proto/neutron/dex/tx.proto | 46 +-- x/dex/types/deposit_record.pb.go | 50 +-- x/dex/types/limit_order_tranche.pb.go | 83 +++-- x/dex/types/limit_order_tranche_user.pb.go | 68 ++-- x/dex/types/pool_reserves.pb.go | 65 ++-- x/dex/types/query.pb.go | 291 +++++++++--------- x/dex/types/tx.pb.go | 214 ++++++------- 12 files changed, 439 insertions(+), 440 deletions(-) diff --git a/proto/neutron/dex/deposit_record.proto b/proto/neutron/dex/deposit_record.proto index c76a32853..86a6c26b9 100644 --- a/proto/neutron/dex/deposit_record.proto +++ b/proto/neutron/dex/deposit_record.proto @@ -8,10 +8,10 @@ import "neutron/dex/pair_id.proto"; message DepositRecord { PairID pair_id = 1; string shares_owned = 2 [ - (gogoproto.moretags) = "yaml:\"totalShares\"", + (gogoproto.moretags) = "yaml:\"total_shares\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false, - (gogoproto.jsontag) = "totalShares" + (gogoproto.jsontag) = "total_shares" ]; int64 center_tick_index = 3; int64 lower_tick_index = 4; diff --git a/proto/neutron/dex/limit_order_tranche.proto b/proto/neutron/dex/limit_order_tranche.proto index df97c11a2..3bd70b1d8 100644 --- a/proto/neutron/dex/limit_order_tranche.proto +++ b/proto/neutron/dex/limit_order_tranche.proto @@ -17,28 +17,28 @@ message LimitOrderTrancheKey { message LimitOrderTranche { LimitOrderTrancheKey key = 1; string reserves_maker_denom = 2 [ - (gogoproto.moretags) = "yaml:\"reservesMakerDenom\"", + (gogoproto.moretags) = "yaml:\"reserves_maker_denom\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false, - (gogoproto.jsontag) = "reservesMakerDenom" + (gogoproto.jsontag) = "reserves_maker_denom" ]; string reserves_taker_denom = 3 [ - (gogoproto.moretags) = "yaml:\"reservesTakerDenom\"", + (gogoproto.moretags) = "yaml:\"reserves_taker_denom\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false, - (gogoproto.jsontag) = "reservesTakerDenom" + (gogoproto.jsontag) = "reserves_taker_denom" ]; string total_maker_denom = 4 [ - (gogoproto.moretags) = "yaml:\"totalMakerDenom\"", + (gogoproto.moretags) = "yaml:\"total_maker_denom\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false, - (gogoproto.jsontag) = "totalTokenIn" + (gogoproto.jsontag) = "total_maker_denom" ]; string total_taker_denom = 5 [ - (gogoproto.moretags) = "yaml:\"totalTakerDenom\"", + (gogoproto.moretags) = "yaml:\"total_taker_denom\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false, - (gogoproto.jsontag) = "totalTakerDenom" + (gogoproto.jsontag) = "total_taker_denom" ]; // GoodTilDate is represented as seconds since January 1, year 1, 00:00:00.00 UTC // LimitOrders with goodTilDate set are valid as long as blockTime <= goodTilDate @@ -51,10 +51,10 @@ message LimitOrderTranche { (gogoproto.nullable) = true ]; string price_taker_to_maker = 7 [ - (gogoproto.moretags) = "yaml:\"priceTakerToMaker\"", + (gogoproto.moretags) = "yaml:\"price_taker_to_maker\"", (gogoproto.customtype) = "github.com/neutron-org/neutron/utils/math.PrecDec", (gogoproto.nullable) = false, - (gogoproto.jsontag) = "priceTakerToMaker" + (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 8159d48d5..51b8163ef 100644 --- a/proto/neutron/dex/limit_order_tranche_user.proto +++ b/proto/neutron/dex/limit_order_tranche_user.proto @@ -12,22 +12,22 @@ message LimitOrderTrancheUser { string tranche_key = 3; string address = 4; string shares_owned = 5 [ - (gogoproto.moretags) = "yaml:\"sharesOwned\"", + (gogoproto.moretags) = "yaml:\"shares_owned\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false, (gogoproto.jsontag) = "sharesOwned" ]; string shares_withdrawn = 6 [ - (gogoproto.moretags) = "yaml:\"sharesWithdrawn\"", + (gogoproto.moretags) = "yaml:\"shares_withdrawn\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false, - (gogoproto.jsontag) = "sharesWithdrawn" + (gogoproto.jsontag) = "shares_withdrawn" ]; string shares_cancelled = 7 [ - (gogoproto.moretags) = "yaml:\"sharesCancelled\"", + (gogoproto.moretags) = "yaml:\"shares_cancelled\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false, - (gogoproto.jsontag) = "sharesCancelled" + (gogoproto.jsontag) = "shares_cancelled" ]; LimitOrderType order_type = 8; } diff --git a/proto/neutron/dex/pool_reserves.proto b/proto/neutron/dex/pool_reserves.proto index fedb3ba78..0d489ea99 100644 --- a/proto/neutron/dex/pool_reserves.proto +++ b/proto/neutron/dex/pool_reserves.proto @@ -14,22 +14,22 @@ message PoolReservesKey { message PoolReserves { PoolReservesKey key = 1; string reserves_maker_denom = 2 [ - (gogoproto.moretags) = "yaml:\"reservesMakerDenom\"", + (gogoproto.moretags) = "yaml:\"reserves_maker_denom\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", - (gogoproto.jsontag) = "reservesMakerDenom", + (gogoproto.jsontag) = "reserves_maker_denom", (gogoproto.nullable) = false ]; string price_taker_to_maker = 3 [ - (gogoproto.moretags) = "yaml:\"priceTakerToMaker\"", + (gogoproto.moretags) = "yaml:\"price_taker_to_maker\"", (gogoproto.customtype) = "github.com/neutron-org/neutron/utils/math.PrecDec", (gogoproto.nullable) = false, - (gogoproto.jsontag) = "priceTakerToMaker" + (gogoproto.jsontag) = "price_taker_to_maker" ]; string price_opposite_taker_to_maker = 4 [ - (gogoproto.moretags) = "yaml:\"priceOppositeTakerToMaker\"", + (gogoproto.moretags) = "yaml:\"price_opposite_taker_to_maker\"", (gogoproto.customtype) = "github.com/neutron-org/neutron/utils/math.PrecDec", (gogoproto.nullable) = false, - (gogoproto.jsontag) = "priceOppositeTakerToMaker" + (gogoproto.jsontag) = "price_opposite_taker_to_maker" ]; } diff --git a/proto/neutron/dex/query.proto b/proto/neutron/dex/query.proto index f168933a0..6251d0b62 100644 --- a/proto/neutron/dex/query.proto +++ b/proto/neutron/dex/query.proto @@ -250,8 +250,8 @@ message QueryEstimateMultiHopSwapRequest { string creator = 1; string receiver = 2; repeated MultiHopRoute routes = 3; - string amount_in = 4 [(gogoproto.moretags) = "yaml:\"amountIn\"" , (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false, (gogoproto.jsontag) = "amountIn" ]; - string exit_limit_price = 5 [(gogoproto.moretags) = "yaml:\"exitLimitPrice\"", (gogoproto.customtype) = "github.com/neutron-org/neutron/utils/math.PrecDec", (gogoproto.nullable) = false, (gogoproto.jsontag) = "exitLimitPrice"]; + string amount_in = 4 [(gogoproto.moretags) = "yaml:\"amount_in\"" , (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false, (gogoproto.jsontag) = "amount_in" ]; + string exit_limit_price = 5 [(gogoproto.moretags) = "yaml:\"exit_limit_price\"", (gogoproto.customtype) = "github.com/neutron-org/neutron/utils/math.PrecDec", (gogoproto.nullable) = false, (gogoproto.jsontag) = "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. @@ -259,7 +259,7 @@ message QueryEstimateMultiHopSwapRequest { } message QueryEstimateMultiHopSwapResponse { - cosmos.base.v1beta1.Coin coin_out = 1 [(gogoproto.nullable) = false, (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Coin", (gogoproto.jsontag) = "coinOut"]; + cosmos.base.v1beta1.Coin coin_out = 1 [(gogoproto.nullable) = false, (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Coin", (gogoproto.jsontag) = "coin_out"]; } message QueryEstimatePlaceLimitOrderRequest { @@ -268,27 +268,27 @@ message QueryEstimatePlaceLimitOrderRequest { string token_in = 3; string token_out = 4; int64 tick_index_in_to_out = 5; - string amount_in = 6 [(gogoproto.moretags) = "yaml:\"amountIn\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false, (gogoproto.jsontag) = "amountIn"]; + string amount_in = 6 [(gogoproto.moretags) = "yaml:\"amount_in\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false, (gogoproto.jsontag) = "amount_in"]; LimitOrderType order_type = 7; // expirationTime is only valid iff orderType == GOOD_TIL_TIME. google.protobuf.Timestamp expiration_time = 8 [(gogoproto.stdtime) = true , (gogoproto.nullable) = true ] ; - string maxAmount_out = 9 [(gogoproto.moretags) = "yaml:\"maxAmountOut\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = true, (gogoproto.jsontag) = "maxAmountOut"]; + string maxAmount_out = 9 [(gogoproto.moretags) = "yaml:\"max_amount_out\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = true, (gogoproto.jsontag) = "max_amount_out"]; } message QueryEstimatePlaceLimitOrderResponse { // Total amount of coin used for the limit order // You can derive makerLimitInCoin using the equation: totalInCoin = swapInCoin + makerLimitInCoin - cosmos.base.v1beta1.Coin total_in_coin = 1 [(gogoproto.moretags) = "yaml:\"totalInCoin\"", (gogoproto.nullable) = false, (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Coin", (gogoproto.jsontag) = "totalInCoin"]; + cosmos.base.v1beta1.Coin total_in_coin = 1 [(gogoproto.moretags) = "yaml:\"total_in_coin\"", (gogoproto.nullable) = false, (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Coin", (gogoproto.jsontag) = "total_in_coin"]; // Total amount of the token in that was immediately swapped for swapOutCoin - cosmos.base.v1beta1.Coin swap_in_coin = 2 [(gogoproto.moretags) = "yaml:\"swapInCoin\"", (gogoproto.nullable) = false, (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Coin", (gogoproto.jsontag) = "swapInCoin"]; + cosmos.base.v1beta1.Coin swap_in_coin = 2 [(gogoproto.moretags) = "yaml:\"swap_in_coin\"", (gogoproto.nullable) = false, (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Coin", (gogoproto.jsontag) = "swap_in_coin"]; // 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 - cosmos.base.v1beta1.Coin swap_out_coin = 3 [(gogoproto.moretags) = "yaml:\"swapOutCoin\"", (gogoproto.nullable) = false, (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Coin", (gogoproto.jsontag) = "swapOutCoin"]; + cosmos.base.v1beta1.Coin swap_out_coin = 3 [(gogoproto.moretags) = "yaml:\"swap_out_coin\"", (gogoproto.nullable) = false, (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Coin", (gogoproto.jsontag) = "swap_out_coin"]; } message QueryPoolRequest { diff --git a/proto/neutron/dex/tx.proto b/proto/neutron/dex/tx.proto index 7ea19633e..41104299a 100644 --- a/proto/neutron/dex/tx.proto +++ b/proto/neutron/dex/tx.proto @@ -34,16 +34,16 @@ message MsgDeposit { string token_a = 3; string token_b = 4; repeated string amounts_a = 5 [ - (gogoproto.moretags) = "yaml:\"amountsA\"", + (gogoproto.moretags) = "yaml:\"amounts_a\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false, - (gogoproto.jsontag) = "amountsA" + (gogoproto.jsontag) = "amounts_a" ]; repeated string amounts_b = 6 [ - (gogoproto.moretags) = "yaml:\"amountsB\"", + (gogoproto.moretags) = "yaml:\"amounts_b\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false, - (gogoproto.jsontag) = "amountsB" + (gogoproto.jsontag) = "amounts_b" ]; repeated int64 tick_indexes_a_to_b = 7; repeated uint64 fees = 8; @@ -52,16 +52,16 @@ message MsgDeposit { message MsgDepositResponse { repeated string reserve0_deposited = 1 [ - (gogoproto.moretags) = "yaml:\"reserve0Deposited\"", + (gogoproto.moretags) = "yaml:\"reserve0_deposited\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false, - (gogoproto.jsontag) = "reserve0Deposited" + (gogoproto.jsontag) = "reserve0_deposited" ]; repeated string reserve1_deposited = 2[ - (gogoproto.moretags) = "yaml:\"reserve1Deposited\"", + (gogoproto.moretags) = "yaml:\"reserve1_deposited\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false, - (gogoproto.jsontag) = "reserve1Deposited" + (gogoproto.jsontag) = "reserve1_deposited" ]; } @@ -71,10 +71,10 @@ message MsgWithdrawal { string token_a = 3; string token_b = 4; repeated string shares_to_remove = 5 [ - (gogoproto.moretags) = "yaml:\"sharesToRemove\"", + (gogoproto.moretags) = "yaml:\"shares_to_remove\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false, - (gogoproto.jsontag) = "sharesToRemove" + (gogoproto.jsontag) = "shares_to_remove" ]; repeated int64 tick_indexes_a_to_b = 6; repeated uint64 fees = 7; @@ -99,10 +99,10 @@ message MsgPlaceLimitOrder { string token_out = 4; int64 tick_index_in_to_out = 5; string amount_in = 7 [ - (gogoproto.moretags) = "yaml:\"amountIn\"", + (gogoproto.moretags) = "yaml:\"amount_in\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false, - (gogoproto.jsontag) = "amountIn" + (gogoproto.jsontag) = "amount_in" ]; LimitOrderType order_type = 8; // expirationTime is only valid iff orderType == GOOD_TIL_TIME. @@ -111,10 +111,10 @@ message MsgPlaceLimitOrder { (gogoproto.nullable) = true ]; string max_amount_out = 10 [ - (gogoproto.moretags) = "yaml:\"maxAmountOut\"", + (gogoproto.moretags) = "yaml:\"max_amount_out\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = true, - (gogoproto.jsontag) = "maxAmountOut" + (gogoproto.jsontag) = "max_amount_out" ]; } @@ -122,19 +122,19 @@ message MsgPlaceLimitOrderResponse { string trancheKey = 1; // Total amount of coin used for the limit order cosmos.base.v1beta1.Coin coin_in = 2 [ - (gogoproto.moretags) = "yaml:\"coinIn\"", + (gogoproto.moretags) = "yaml:\"coin_in\"", (gogoproto.nullable) = false, (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Coin", - (gogoproto.jsontag) = "coinIn" + (gogoproto.jsontag) = "coin_in" ]; // 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 cosmos.base.v1beta1.Coin taker_coin_out = 3 [ - (gogoproto.moretags) = "yaml:\"takerCoinOut\"", + (gogoproto.moretags) = "yaml:\"taker_coin_out\"", (gogoproto.nullable) = false, (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Coin", - (gogoproto.jsontag) = "takerCoinOut" + (gogoproto.jsontag) = "taker_coin_out" ]; } @@ -164,16 +164,16 @@ message MsgMultiHopSwap { string receiver = 2; repeated MultiHopRoute routes = 3; string amount_in = 4 [ - (gogoproto.moretags) = "yaml:\"amountIn\"", + (gogoproto.moretags) = "yaml:\"amount_in\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false, - (gogoproto.jsontag) = "amountIn" + (gogoproto.jsontag) = "amount_in" ]; string exit_limit_price = 5 [ - (gogoproto.moretags) = "yaml:\"exitLimitPrice\"", + (gogoproto.moretags) = "yaml:\"exit_limit_price\"", (gogoproto.customtype) = "github.com/neutron-org/neutron/utils/math.PrecDec", (gogoproto.nullable) = false, - (gogoproto.jsontag) = "exitLimitPrice" + (gogoproto.jsontag) = "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. @@ -184,7 +184,7 @@ message MsgMultiHopSwapResponse { cosmos.base.v1beta1.Coin coin_out = 1 [ (gogoproto.nullable) = false, (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Coin", - (gogoproto.jsontag) = "coinOut" + (gogoproto.jsontag) = "coin_out" ]; } diff --git a/x/dex/types/deposit_record.pb.go b/x/dex/types/deposit_record.pb.go index 270160cb5..6c773863e 100644 --- a/x/dex/types/deposit_record.pb.go +++ b/x/dex/types/deposit_record.pb.go @@ -26,7 +26,7 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type DepositRecord struct { PairId *PairID `protobuf:"bytes,1,opt,name=pair_id,json=pairId,proto3" json:"pair_id,omitempty"` - SharesOwned github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,opt,name=shares_owned,json=sharesOwned,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"totalShares" yaml:"totalShares"` + SharesOwned github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,opt,name=shares_owned,json=sharesOwned,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"total_shares" yaml:"total_shares"` CenterTickIndex int64 `protobuf:"varint,3,opt,name=center_tick_index,json=centerTickIndex,proto3" json:"center_tick_index,omitempty"` LowerTickIndex int64 `protobuf:"varint,4,opt,name=lower_tick_index,json=lowerTickIndex,proto3" json:"lower_tick_index,omitempty"` UpperTickIndex int64 `protobuf:"varint,5,opt,name=upper_tick_index,json=upperTickIndex,proto3" json:"upper_tick_index,omitempty"` @@ -108,30 +108,30 @@ func init() { func init() { proto.RegisterFile("neutron/dex/deposit_record.proto", fileDescriptor_250413eadaebbf28) } var fileDescriptor_250413eadaebbf28 = []byte{ - // 354 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x91, 0x31, 0x4f, 0xab, 0x50, - 0x1c, 0xc5, 0xb9, 0x6d, 0x5f, 0x5f, 0x1e, 0x3c, 0xb5, 0xa2, 0x03, 0x76, 0x00, 0xd2, 0xc1, 0x90, - 0xc6, 0x42, 0xa2, 0x9b, 0x63, 0xd3, 0x85, 0x49, 0x43, 0x9d, 0x5c, 0x08, 0xe5, 0x5e, 0xe9, 0x4d, - 0x5b, 0xfe, 0xe4, 0x72, 0x6b, 0xe9, 0xb7, 0xf0, 0x5b, 0xd9, 0xb1, 0xa3, 0x71, 0x20, 0xa6, 0xdd, - 0x1c, 0xfd, 0x04, 0x86, 0x0b, 0x46, 0x3a, 0x71, 0x72, 0xf8, 0xdd, 0x73, 0x92, 0xf3, 0x97, 0xcd, - 0x98, 0x2c, 0x39, 0x83, 0xd8, 0xc1, 0x24, 0x73, 0x30, 0x49, 0x20, 0xa5, 0xdc, 0x67, 0x24, 0x04, - 0x86, 0xed, 0x84, 0x01, 0x07, 0x55, 0xa9, 0x08, 0x1b, 0x93, 0xac, 0x7b, 0x1e, 0x41, 0x04, 0xc2, - 0x77, 0x0a, 0x55, 0x22, 0xdd, 0x8b, 0x7a, 0x48, 0x12, 0x50, 0xe6, 0xd3, 0xea, 0x75, 0xef, 0xb5, - 0x21, 0x1f, 0x8d, 0xca, 0x58, 0x4f, 0xa4, 0xaa, 0x57, 0xf2, 0xdf, 0x0a, 0xd1, 0x90, 0x89, 0x2c, - 0xe5, 0xfa, 0xcc, 0xae, 0x35, 0xd8, 0xf7, 0x01, 0x65, 0xee, 0xc8, 0x6b, 0x17, 0x8c, 0x8b, 0xd5, - 0x67, 0xf9, 0x7f, 0x3a, 0x0d, 0x18, 0x49, 0x7d, 0x58, 0xc5, 0x04, 0x6b, 0x0d, 0x13, 0x59, 0xff, - 0x86, 0xe3, 0x4d, 0x6e, 0x48, 0xef, 0xb9, 0x71, 0x19, 0x51, 0x3e, 0x5d, 0x4e, 0xec, 0x10, 0x16, - 0x4e, 0x08, 0xe9, 0x02, 0xd2, 0xea, 0x33, 0x48, 0xf1, 0xcc, 0xe1, 0xeb, 0x84, 0xa4, 0xb6, 0x1b, - 0xf3, 0xcf, 0xdc, 0x50, 0x38, 0xf0, 0x60, 0x3e, 0x16, 0x51, 0x5f, 0xb9, 0xa1, 0xae, 0x83, 0xc5, - 0xfc, 0xb6, 0x57, 0x33, 0x7b, 0x9e, 0x52, 0x16, 0xdd, 0x15, 0x3d, 0x6a, 0x5f, 0x3e, 0x0d, 0x49, - 0xcc, 0x09, 0xf3, 0x39, 0x0d, 0x67, 0x3e, 0x8d, 0x31, 0xc9, 0xb4, 0xa6, 0x89, 0xac, 0xa6, 0x77, - 0x52, 0xfe, 0x78, 0xa0, 0xe1, 0xcc, 0x2d, 0x6c, 0xd5, 0x92, 0x3b, 0x73, 0x58, 0x1d, 0xa2, 0x2d, - 0x81, 0x1e, 0x0b, 0xff, 0x80, 0x5c, 0x26, 0xc9, 0x21, 0xf9, 0xa7, 0x24, 0x85, 0xff, 0x4b, 0x76, - 0xe4, 0xe6, 0x13, 0x21, 0x5a, 0xdb, 0x44, 0x56, 0xcb, 0x2b, 0xe4, 0x70, 0xb4, 0xd9, 0xe9, 0x68, - 0xbb, 0xd3, 0xd1, 0xc7, 0x4e, 0x47, 0x2f, 0x7b, 0x5d, 0xda, 0xee, 0x75, 0xe9, 0x6d, 0xaf, 0x4b, - 0x8f, 0xfd, 0xda, 0x0a, 0xd5, 0x94, 0x03, 0x60, 0xd1, 0x8f, 0x76, 0x32, 0x71, 0x17, 0xb1, 0xc6, - 0xa4, 0x2d, 0xce, 0x72, 0xf3, 0x1d, 0x00, 0x00, 0xff, 0xff, 0x42, 0xc1, 0x96, 0x79, 0xf8, 0x01, - 0x00, 0x00, + // 353 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x91, 0xb1, 0x4f, 0xc2, 0x40, + 0x14, 0xc6, 0x7b, 0x80, 0x18, 0x0b, 0x2a, 0x16, 0x87, 0xca, 0xd0, 0x36, 0x0c, 0xa6, 0x21, 0xd2, + 0x26, 0xba, 0x39, 0x12, 0x96, 0x4e, 0x9a, 0x46, 0x17, 0x97, 0xa6, 0xf4, 0xce, 0x72, 0x01, 0xfa, + 0x9a, 0xeb, 0x11, 0xca, 0x7f, 0xe1, 0x9f, 0x85, 0x1b, 0xa3, 0x71, 0x68, 0x0c, 0x6c, 0x8e, 0xfe, + 0x05, 0xa6, 0xd7, 0x1a, 0xcb, 0x74, 0x5f, 0xbe, 0xfb, 0xbd, 0xef, 0x25, 0xdf, 0x93, 0x8d, 0x88, + 0x2c, 0x39, 0x83, 0xc8, 0xc6, 0x24, 0xb5, 0x31, 0x89, 0x21, 0xa1, 0xdc, 0x63, 0x24, 0x00, 0x86, + 0xad, 0x98, 0x01, 0x07, 0xa5, 0x55, 0x12, 0x16, 0x26, 0x69, 0xef, 0x32, 0x84, 0x10, 0x84, 0x6f, + 0xe7, 0xaa, 0x40, 0x7a, 0x57, 0xd5, 0x90, 0xd8, 0xa7, 0xcc, 0xa3, 0xe5, 0x74, 0xff, 0xbd, 0x26, + 0x9f, 0x8e, 0x8b, 0x58, 0x57, 0xa4, 0x2a, 0x37, 0xf2, 0x71, 0x89, 0xa8, 0xc8, 0x40, 0x66, 0xeb, + 0xb6, 0x6b, 0x55, 0x36, 0x58, 0x8f, 0x3e, 0x65, 0xce, 0xd8, 0x6d, 0xe6, 0x8c, 0x83, 0x95, 0x54, + 0x6e, 0x27, 0x53, 0x9f, 0x91, 0xc4, 0x83, 0x55, 0x44, 0xb0, 0x5a, 0x33, 0x90, 0x79, 0x32, 0x7a, + 0xde, 0x64, 0xba, 0xf4, 0x99, 0xe9, 0xd7, 0x21, 0xe5, 0xd3, 0xe5, 0xc4, 0x0a, 0x60, 0x61, 0x07, + 0x90, 0x2c, 0x20, 0x29, 0x9f, 0x61, 0x82, 0x67, 0x36, 0x5f, 0xc7, 0x24, 0xb1, 0x9c, 0x88, 0x7f, + 0x67, 0x7a, 0x9b, 0x03, 0xf7, 0xe7, 0x5e, 0x91, 0xf5, 0x93, 0xe9, 0xdd, 0xb5, 0xbf, 0x98, 0xdf, + 0xf7, 0xab, 0x6e, 0xdf, 0x6d, 0x15, 0xe2, 0x21, 0xdf, 0xa4, 0x0c, 0xe4, 0x8b, 0x80, 0x44, 0x9c, + 0x30, 0x8f, 0xd3, 0x60, 0xe6, 0xd1, 0x08, 0x93, 0x54, 0xad, 0x1b, 0xc8, 0xac, 0xbb, 0xe7, 0xc5, + 0xc7, 0x13, 0x0d, 0x66, 0x4e, 0x6e, 0x2b, 0xa6, 0xdc, 0x99, 0xc3, 0xea, 0x10, 0x6d, 0x08, 0xf4, + 0x4c, 0xf8, 0x07, 0xe4, 0x32, 0x8e, 0x0f, 0xc9, 0xa3, 0x82, 0x14, 0xfe, 0x3f, 0xd9, 0x91, 0xeb, + 0xaf, 0x84, 0xa8, 0x4d, 0x03, 0x99, 0x0d, 0x37, 0x97, 0xa3, 0xf1, 0x66, 0xa7, 0xa1, 0xed, 0x4e, + 0x43, 0x5f, 0x3b, 0x0d, 0xbd, 0xed, 0x35, 0x69, 0xbb, 0xd7, 0xa4, 0x8f, 0xbd, 0x26, 0xbd, 0x0c, + 0x2a, 0x3d, 0x94, 0x65, 0x0e, 0x81, 0x85, 0x7f, 0xda, 0x4e, 0xc5, 0x65, 0x44, 0x1f, 0x93, 0xa6, + 0x38, 0xcc, 0xdd, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x63, 0x8f, 0x8e, 0x7e, 0xfa, 0x01, 0x00, + 0x00, } func (m *DepositRecord) Marshal() (dAtA []byte, err error) { diff --git a/x/dex/types/limit_order_tranche.pb.go b/x/dex/types/limit_order_tranche.pb.go index 054bb1169..0362678b6 100644 --- a/x/dex/types/limit_order_tranche.pb.go +++ b/x/dex/types/limit_order_tranche.pb.go @@ -91,15 +91,15 @@ func (m *LimitOrderTrancheKey) GetTrancheKey() string { type LimitOrderTranche struct { Key *LimitOrderTrancheKey `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"` - ReservesMakerDenom github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,opt,name=reserves_maker_denom,json=reservesMakerDenom,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"reservesMakerDenom" yaml:"reservesMakerDenom"` - ReservesTakerDenom github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,3,opt,name=reserves_taker_denom,json=reservesTakerDenom,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"reservesTakerDenom" yaml:"reservesTakerDenom"` - TotalMakerDenom github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,4,opt,name=total_maker_denom,json=totalMakerDenom,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"totalTokenIn" yaml:"totalMakerDenom"` - TotalTakerDenom github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,5,opt,name=total_taker_denom,json=totalTakerDenom,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"totalTakerDenom" yaml:"totalTakerDenom"` + ReservesMakerDenom github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,opt,name=reserves_maker_denom,json=reservesMakerDenom,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"reserves_maker_denom" yaml:"reserves_maker_denom"` + ReservesTakerDenom github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,3,opt,name=reserves_taker_denom,json=reservesTakerDenom,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"reserves_taker_denom" yaml:"reserves_taker_denom"` + TotalMakerDenom github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,4,opt,name=total_maker_denom,json=totalMakerDenom,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"total_maker_denom" yaml:"total_maker_denom"` + TotalTakerDenom github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,5,opt,name=total_taker_denom,json=totalTakerDenom,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"total_taker_denom" yaml:"total_taker_denom"` // JIT orders also use goodTilDate to handle deletion but represent a special case // All JIT orders have a goodTilDate of 0 and an exception is made to still 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_utils_math.PrecDec `protobuf:"bytes,7,opt,name=price_taker_to_maker,json=priceTakerToMaker,proto3,customtype=github.com/neutron-org/neutron/utils/math.PrecDec" json:"priceTakerToMaker" yaml:"priceTakerToMaker"` + PriceTakerToMaker github_com_neutron_org_neutron_utils_math.PrecDec `protobuf:"bytes,7,opt,name=price_taker_to_maker,json=priceTakerToMaker,proto3,customtype=github.com/neutron-org/neutron/utils/math.PrecDec" json:"price_taker_to_maker" yaml:"price_taker_to_maker"` } func (m *LimitOrderTranche) Reset() { *m = LimitOrderTranche{} } @@ -159,44 +159,43 @@ func init() { } var fileDescriptor_8c2ded67c80756d1 = []byte{ - // 591 bytes of a gzipped FileDescriptorProto + // 572 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x94, 0xc1, 0x8b, 0xd3, 0x4e, - 0x14, 0xc7, 0x3b, 0xbf, 0xfe, 0x5c, 0xdd, 0xa9, 0xba, 0x6c, 0xa8, 0x92, 0xf6, 0x90, 0xa9, 0x05, - 0xa5, 0x08, 0x9b, 0xa0, 0x7b, 0x11, 0xf1, 0x54, 0x7a, 0x29, 0xba, 0xb8, 0x84, 0x1c, 0x44, 0x0f, - 0x61, 0x9a, 0x8c, 0xe9, 0xd8, 0x26, 0x13, 0x26, 0x53, 0x69, 0xef, 0x82, 0xd7, 0x05, 0x8f, 0xfe, - 0x11, 0xfe, 0x1b, 0x3d, 0xee, 0x51, 0x3c, 0x44, 0x69, 0x6f, 0x7b, 0xec, 0x5f, 0x20, 0x33, 0x49, - 0xbb, 0xc9, 0xb6, 0x28, 0x8b, 0xa7, 0xbc, 0xbe, 0xf7, 0x7d, 0xaf, 0x9f, 0xf7, 0x25, 0x2f, 0xf0, - 0x61, 0x44, 0x26, 0x82, 0xb3, 0xc8, 0xf2, 0xc9, 0xd4, 0x1a, 0xd3, 0x90, 0x0a, 0x97, 0x71, 0x9f, - 0x70, 0x57, 0x70, 0x1c, 0x79, 0x43, 0x62, 0xc6, 0x9c, 0x09, 0xa6, 0xd5, 0x72, 0x99, 0xe9, 0x93, - 0x69, 0x13, 0x05, 0x8c, 0x05, 0x63, 0x62, 0xa9, 0xd2, 0x60, 0xf2, 0xde, 0x12, 0x34, 0x24, 0x89, - 0xc0, 0x61, 0x9c, 0xa9, 0x9b, 0xa8, 0x38, 0x54, 0x70, 0xec, 0x13, 0x37, 0xc6, 0x94, 0xbb, 0xd4, - 0xcf, 0x05, 0xf5, 0x80, 0x05, 0x4c, 0x85, 0x96, 0x8c, 0xf2, 0x6c, 0xa3, 0xd8, 0x56, 0x6a, 0x68, - 0x7f, 0x03, 0xb0, 0xfe, 0x4a, 0xd2, 0xbd, 0x96, 0x70, 0x4e, 0xc6, 0xf6, 0x92, 0xcc, 0xb4, 0x17, - 0xf0, 0x4e, 0xe9, 0x0f, 0x74, 0xd0, 0x02, 0x9d, 0xda, 0x53, 0xdd, 0x2c, 0x00, 0x9b, 0x8e, 0x54, - 0x9c, 0x62, 0xca, 0xfb, 0x3d, 0xbb, 0x26, 0x36, 0x3f, 0x7c, 0xed, 0x19, 0x6c, 0x08, 0xea, 0x8d, - 0x5c, 0x1a, 0xf9, 0x64, 0xea, 0x0a, 0x3c, 0x92, 0x8b, 0x33, 0x37, 0x94, 0x81, 0xfe, 0x5f, 0x0b, - 0x74, 0xaa, 0xf6, 0x3d, 0x29, 0xe8, 0xcb, 0xba, 0x23, 0xb3, 0x0e, 0x3b, 0x91, 0x0f, 0x0d, 0xc1, - 0x5a, 0xee, 0x90, 0x3b, 0x22, 0x33, 0xbd, 0xda, 0x02, 0x9d, 0x7d, 0x1b, 0x8a, 0x0d, 0x58, 0x7b, - 0xb5, 0x07, 0x0f, 0xb7, 0x88, 0xb5, 0x63, 0x58, 0x95, 0xf2, 0x0c, 0xf2, 0x41, 0x09, 0x72, 0xd7, - 0x7a, 0xb6, 0x54, 0x6b, 0x5f, 0x00, 0xac, 0x73, 0x92, 0x10, 0xfe, 0x91, 0x24, 0x19, 0x9b, 0xeb, - 0x93, 0x88, 0x85, 0x8a, 0x70, 0xbf, 0x8b, 0xe7, 0x29, 0xaa, 0xfc, 0x48, 0xd1, 0xa3, 0x80, 0x8a, - 0xe1, 0x64, 0x60, 0x7a, 0x2c, 0xb4, 0x3c, 0x96, 0x84, 0x2c, 0xc9, 0x1f, 0x47, 0x89, 0x3f, 0xb2, - 0xc4, 0x2c, 0x26, 0x89, 0xd9, 0x8f, 0xc4, 0x45, 0x8a, 0xb4, 0xf5, 0x34, 0xb5, 0x4b, 0x4f, 0xce, - 0x5a, 0xa5, 0xa8, 0x31, 0xc3, 0xe1, 0xf8, 0x79, 0x7b, 0xbb, 0xd6, 0xb6, 0x77, 0x34, 0x94, 0xa9, - 0x44, 0x81, 0xaa, 0xfa, 0xaf, 0x54, 0xce, 0x1f, 0xa8, 0x9c, 0x5d, 0x54, 0x97, 0x49, 0xed, 0x13, - 0x80, 0x87, 0x82, 0x09, 0x3c, 0x2e, 0x19, 0xf5, 0xbf, 0x42, 0x7a, 0x73, 0x6d, 0xa4, 0xdb, 0x6a, - 0x94, 0xc3, 0x46, 0x24, 0xea, 0x47, 0xab, 0x14, 0xdd, 0xcf, 0x60, 0x54, 0xb6, 0xe8, 0xcf, 0xc1, - 0x95, 0x8c, 0xf6, 0x79, 0x83, 0x51, 0x74, 0xe6, 0x86, 0xc2, 0x78, 0x77, 0x6d, 0x8c, 0x6c, 0x7c, - 0xc9, 0x96, 0x22, 0x89, 0xb3, 0x45, 0x52, 0x30, 0xe4, 0x04, 0x1e, 0x90, 0x69, 0x4c, 0x39, 0x16, - 0x94, 0x45, 0xae, 0xbc, 0x54, 0x7d, 0x4f, 0xbd, 0x7d, 0x4d, 0x33, 0x3b, 0x63, 0x73, 0x7d, 0xc6, - 0xa6, 0xb3, 0x3e, 0xe3, 0xee, 0xad, 0x79, 0x8a, 0xc0, 0xd9, 0x4f, 0x04, 0xec, 0xbb, 0x97, 0xcd, - 0xb2, 0xac, 0x7d, 0x05, 0xb0, 0x1e, 0x73, 0xea, 0x91, 0xab, 0xd7, 0x72, 0x53, 0xed, 0xf6, 0x21, - 0xdf, 0xed, 0x49, 0x61, 0xb7, 0xfc, 0x25, 0x3f, 0x62, 0x3c, 0x58, 0xc7, 0xd6, 0x44, 0xd0, 0x71, - 0x62, 0x85, 0x58, 0x0c, 0xcd, 0x53, 0x4e, 0xbc, 0x1e, 0xf1, 0x2e, 0x52, 0x74, 0xa8, 0x06, 0x17, - 0xcf, 0x6c, 0x95, 0x22, 0x3d, 0x5b, 0x74, 0xab, 0xd4, 0xb6, 0xb7, 0xe5, 0xdd, 0xde, 0x7c, 0x61, - 0x80, 0xf3, 0x85, 0x01, 0x7e, 0x2d, 0x0c, 0x70, 0xb6, 0x34, 0x2a, 0xe7, 0x4b, 0xa3, 0xf2, 0x7d, - 0x69, 0x54, 0xde, 0x3e, 0xfe, 0x0b, 0xd0, 0x34, 0xfb, 0x56, 0x49, 0xd3, 0x07, 0x7b, 0xca, 0x91, - 0xe3, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xc6, 0x16, 0x67, 0x66, 0x1c, 0x05, 0x00, 0x00, + 0x14, 0xc7, 0x3b, 0xbf, 0xfe, 0xdc, 0x75, 0xa7, 0xe8, 0xd2, 0x50, 0x21, 0x5b, 0x21, 0xa9, 0x01, + 0xa5, 0x08, 0x9b, 0xa0, 0x7b, 0x11, 0xf1, 0x54, 0x7a, 0x29, 0x5a, 0x5c, 0x42, 0x4e, 0x5e, 0x86, + 0x34, 0x19, 0xd3, 0xa1, 0x4d, 0x26, 0x4c, 0x5e, 0xa5, 0xfd, 0x1b, 0xf6, 0xb2, 0x37, 0xcf, 0xfe, + 0x05, 0xfe, 0x1b, 0x3d, 0xee, 0x51, 0x3c, 0x44, 0x69, 0x6f, 0x1e, 0xf7, 0x2f, 0x90, 0x49, 0xd2, + 0x6d, 0x6a, 0xa3, 0x22, 0x7b, 0x9a, 0xe9, 0x7b, 0xdf, 0x79, 0xfd, 0xbc, 0x2f, 0xef, 0x05, 0x3f, + 0x8e, 0xe8, 0x0c, 0x04, 0x8f, 0x2c, 0x9f, 0xce, 0xad, 0x29, 0x0b, 0x19, 0x10, 0x2e, 0x7c, 0x2a, + 0x08, 0x08, 0x37, 0xf2, 0xc6, 0xd4, 0x8c, 0x05, 0x07, 0xae, 0x34, 0x0a, 0x99, 0xe9, 0xd3, 0x79, + 0x5b, 0x0f, 0x38, 0x0f, 0xa6, 0xd4, 0xca, 0x52, 0xa3, 0xd9, 0x7b, 0x0b, 0x58, 0x48, 0x13, 0x70, + 0xc3, 0x38, 0x57, 0xb7, 0xf5, 0x72, 0x51, 0x10, 0xae, 0x4f, 0x49, 0xec, 0x32, 0x41, 0x98, 0x5f, + 0x08, 0x5a, 0x01, 0x0f, 0x78, 0x76, 0xb5, 0xe4, 0xad, 0x88, 0x9e, 0x94, 0x9f, 0xed, 0x3c, 0x30, + 0x3e, 0x23, 0xdc, 0x7a, 0x23, 0xe9, 0xde, 0x4a, 0x38, 0x27, 0x67, 0x7b, 0x4d, 0x17, 0xca, 0x2b, + 0x7c, 0x6f, 0xe7, 0x0f, 0x54, 0xd4, 0x41, 0xdd, 0xc6, 0x73, 0xd5, 0x2c, 0x01, 0x9b, 0x8e, 0x54, + 0x9c, 0xbb, 0x4c, 0x0c, 0xfa, 0x76, 0x03, 0x6e, 0x7e, 0xf8, 0xca, 0x0b, 0x7c, 0x02, 0xcc, 0x9b, + 0x10, 0x16, 0xf9, 0x74, 0x4e, 0xc0, 0x9d, 0xc8, 0xc6, 0x39, 0x09, 0xe5, 0x45, 0xfd, 0xaf, 0x83, + 0xba, 0x75, 0xfb, 0x81, 0x14, 0x0c, 0x64, 0xde, 0x91, 0x51, 0x87, 0x0f, 0xe5, 0xa1, 0xe8, 0xb8, + 0x51, 0x38, 0x44, 0x26, 0x74, 0xa1, 0xd6, 0x3b, 0xa8, 0x7b, 0x64, 0x63, 0xb8, 0x01, 0x33, 0x2e, + 0x0e, 0x71, 0x73, 0x8f, 0x58, 0x39, 0xc3, 0x75, 0x29, 0xcf, 0x21, 0x1f, 0xed, 0x40, 0x56, 0xb5, + 0x67, 0x4b, 0xb5, 0xf2, 0x11, 0xe1, 0x96, 0xa0, 0x09, 0x15, 0x1f, 0x68, 0x92, 0xb3, 0x11, 0x9f, + 0x46, 0x3c, 0xcc, 0x08, 0x8f, 0x7a, 0x74, 0x99, 0xea, 0xb5, 0xaf, 0xa9, 0xfe, 0x24, 0x60, 0x30, + 0x9e, 0x8d, 0x4c, 0x8f, 0x87, 0x96, 0xc7, 0x93, 0x90, 0x27, 0xc5, 0x71, 0x9a, 0xf8, 0x13, 0x0b, + 0x16, 0x31, 0x4d, 0xcc, 0x41, 0x04, 0x3f, 0x52, 0xbd, 0xb2, 0xda, 0x75, 0xaa, 0x3f, 0x5c, 0xb8, + 0xe1, 0xf4, 0xa5, 0x51, 0x95, 0x35, 0x6c, 0x65, 0x13, 0xce, 0x0c, 0xe8, 0xcb, 0xe0, 0x2e, 0x19, + 0x94, 0xc8, 0xea, 0xb7, 0x26, 0x83, 0x3f, 0x92, 0x41, 0x25, 0x99, 0xb3, 0x25, 0xbb, 0x40, 0xb8, + 0x09, 0x1c, 0xdc, 0xe9, 0x8e, 0x61, 0xff, 0x67, 0x58, 0xe4, 0x9f, 0xb1, 0xf6, 0x4b, 0x5d, 0xa7, + 0xba, 0x9a, 0x33, 0xed, 0xa5, 0x0c, 0xfb, 0x38, 0x8b, 0x0d, 0xab, 0x68, 0xca, 0x26, 0xdd, 0xb9, + 0x1d, 0x0d, 0xfc, 0x9e, 0x06, 0xf6, 0x69, 0x4a, 0xde, 0x0c, 0xf1, 0x31, 0x9d, 0xc7, 0x4c, 0xb8, + 0xc0, 0x78, 0x44, 0xe4, 0xf2, 0xaa, 0x07, 0xd9, 0x40, 0xb6, 0xcd, 0x7c, 0xb3, 0xcd, 0xcd, 0x66, + 0x9b, 0xce, 0x66, 0xb3, 0x7b, 0x77, 0x97, 0xa9, 0x8e, 0x2e, 0xbf, 0xe9, 0xc8, 0xbe, 0xbf, 0x7d, + 0x2c, 0xd3, 0xca, 0x27, 0x84, 0x5b, 0xb1, 0x60, 0x1e, 0xfd, 0x75, 0x81, 0x0e, 0xb3, 0xfe, 0xe2, + 0xa2, 0xbf, 0x67, 0xa5, 0xfe, 0x8a, 0xb9, 0x3f, 0xe5, 0x22, 0xd8, 0xdc, 0xad, 0x19, 0xb0, 0x69, + 0x62, 0x85, 0x2e, 0x8c, 0xcd, 0x73, 0x41, 0xbd, 0x3e, 0xf5, 0xe4, 0x3c, 0x54, 0x15, 0xde, 0xce, + 0x43, 0x55, 0xd6, 0xb0, 0x9b, 0x59, 0xb8, 0xbc, 0xae, 0xbd, 0xfe, 0x72, 0xa5, 0xa1, 0xab, 0x95, + 0x86, 0xbe, 0xaf, 0x34, 0x74, 0xb9, 0xd6, 0x6a, 0x57, 0x6b, 0xad, 0xf6, 0x65, 0xad, 0xd5, 0xde, + 0x3d, 0xfd, 0x0b, 0xd6, 0x3c, 0xff, 0x88, 0x49, 0xfb, 0x47, 0x07, 0x99, 0x2f, 0x67, 0x3f, 0x03, + 0x00, 0x00, 0xff, 0xff, 0xd0, 0xdc, 0xf7, 0xcb, 0x35, 0x05, 0x00, 0x00, } func (m *LimitOrderTrancheKey) Marshal() (dAtA []byte, err error) { diff --git a/x/dex/types/limit_order_tranche_user.pb.go b/x/dex/types/limit_order_tranche_user.pb.go index 191d47e0a..19755ffaf 100644 --- a/x/dex/types/limit_order_tranche_user.pb.go +++ b/x/dex/types/limit_order_tranche_user.pb.go @@ -29,9 +29,9 @@ type LimitOrderTrancheUser struct { TickIndexTakerToMaker int64 `protobuf:"varint,2,opt,name=tick_index_taker_to_maker,json=tickIndexTakerToMaker,proto3" json:"tick_index_taker_to_maker,omitempty"` TrancheKey string `protobuf:"bytes,3,opt,name=tranche_key,json=trancheKey,proto3" json:"tranche_key,omitempty"` Address string `protobuf:"bytes,4,opt,name=address,proto3" json:"address,omitempty"` - SharesOwned github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,5,opt,name=shares_owned,json=sharesOwned,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"sharesOwned" yaml:"sharesOwned"` - SharesWithdrawn github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,6,opt,name=shares_withdrawn,json=sharesWithdrawn,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"sharesWithdrawn" yaml:"sharesWithdrawn"` - SharesCancelled github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,7,opt,name=shares_cancelled,json=sharesCancelled,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"sharesCancelled" yaml:"sharesCancelled"` + SharesOwned github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,5,opt,name=shares_owned,json=sharesOwned,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"sharesOwned" yaml:"shares_owned"` + SharesWithdrawn github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,6,opt,name=shares_withdrawn,json=sharesWithdrawn,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"shares_withdrawn" yaml:"shares_withdrawn"` + SharesCancelled github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,7,opt,name=shares_cancelled,json=sharesCancelled,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"shares_cancelled" yaml:"shares_cancelled"` OrderType LimitOrderType `protobuf:"varint,8,opt,name=order_type,json=orderType,proto3,enum=neutron.dex.LimitOrderType" json:"order_type,omitempty"` } @@ -112,37 +112,37 @@ func init() { } var fileDescriptor_67e5ffbd487ea05f = []byte{ - // 470 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x52, 0x4f, 0x6b, 0xdb, 0x30, - 0x1c, 0x8d, 0xd7, 0xb5, 0x5d, 0x95, 0xfd, 0x43, 0xb4, 0x43, 0xeb, 0xc0, 0x0e, 0x39, 0x8c, 0x50, - 0xa8, 0x0d, 0xdd, 0x65, 0x94, 0x9d, 0xba, 0x5e, 0xc2, 0x36, 0x3a, 0xbc, 0x8c, 0xc1, 0x76, 0x10, - 0xaa, 0xf5, 0x23, 0x11, 0x89, 0x2d, 0x23, 0x29, 0x8b, 0xfd, 0x05, 0x76, 0xee, 0xc7, 0xea, 0xb1, - 0xc7, 0xb1, 0x83, 0x19, 0xc9, 0x6d, 0xc7, 0x7e, 0x82, 0xa1, 0xf8, 0x0f, 0x4e, 0x6f, 0x63, 0x27, - 0xfd, 0xf4, 0x7e, 0x8f, 0xf7, 0x9e, 0xc4, 0x43, 0x47, 0x09, 0xcc, 0x8d, 0x92, 0x49, 0xc0, 0x21, - 0x0b, 0x66, 0x22, 0x16, 0x86, 0x4a, 0xc5, 0x41, 0x51, 0xa3, 0x58, 0x12, 0x4d, 0x80, 0xce, 0x35, - 0x28, 0x3f, 0x55, 0xd2, 0x48, 0xdc, 0xad, 0xb8, 0x3e, 0x87, 0xec, 0x70, 0x7f, 0x2c, 0xc7, 0x72, - 0x8d, 0x07, 0x76, 0x2a, 0x29, 0x87, 0x5e, 0x5b, 0xce, 0x28, 0xc6, 0x81, 0xa6, 0x4c, 0x28, 0x2a, - 0x78, 0x45, 0xd8, 0xdf, 0x20, 0x64, 0x25, 0xda, 0xbf, 0xda, 0x46, 0x07, 0xef, 0xad, 0xf9, 0x85, - 0xf5, 0x1e, 0x95, 0xd6, 0x9f, 0x35, 0x28, 0xfc, 0x06, 0x3d, 0xda, 0x90, 0x21, 0x4e, 0xcf, 0x19, - 0x74, 0x4f, 0x88, 0xdf, 0xca, 0xe2, 0x8f, 0x2c, 0xe3, 0x23, 0x13, 0x6a, 0x78, 0x1e, 0x76, 0x4d, - 0x73, 0xe1, 0xf8, 0x35, 0x7a, 0x6e, 0x44, 0x34, 0xa5, 0x22, 0xe1, 0x90, 0x51, 0xc3, 0xa6, 0xf6, - 0x61, 0x92, 0xc6, 0x76, 0x20, 0xf7, 0x7a, 0xce, 0x60, 0x2b, 0x3c, 0xb0, 0x84, 0xa1, 0xdd, 0x8f, - 0x2c, 0x3a, 0x92, 0x1f, 0xec, 0x81, 0x3d, 0xd4, 0xad, 0x7f, 0x60, 0x0a, 0x39, 0xd9, 0xea, 0x39, - 0x83, 0xbd, 0x10, 0x55, 0xd0, 0x3b, 0xc8, 0x31, 0x41, 0xbb, 0x8c, 0x73, 0x05, 0x5a, 0x93, 0xfb, - 0xeb, 0x65, 0x7d, 0xc5, 0xdf, 0xd1, 0x43, 0x3d, 0x61, 0x0a, 0x34, 0x95, 0x8b, 0x04, 0x38, 0xd9, - 0xb6, 0xeb, 0xb3, 0x4f, 0xd7, 0x85, 0xd7, 0xf9, 0x55, 0x78, 0x2f, 0xc7, 0xc2, 0x4c, 0xe6, 0x97, - 0x7e, 0x24, 0xe3, 0x20, 0x92, 0x3a, 0x96, 0xba, 0x3a, 0x8e, 0x35, 0x9f, 0x06, 0x26, 0x4f, 0x41, - 0xfb, 0xc3, 0xc4, 0xfc, 0x29, 0xbc, 0x6e, 0xa9, 0x72, 0x61, 0x45, 0x6e, 0x0b, 0x0f, 0xe7, 0x2c, - 0x9e, 0x9d, 0xf6, 0x5b, 0x60, 0x3f, 0x6c, 0x53, 0xf0, 0x0f, 0x07, 0x3d, 0xad, 0x8c, 0x17, 0xc2, - 0x4c, 0xb8, 0x62, 0x8b, 0x84, 0xec, 0xac, 0xcd, 0xbf, 0xfd, 0xb3, 0xf9, 0x93, 0x52, 0xe9, 0x4b, - 0x2d, 0x74, 0x5b, 0x78, 0xcf, 0xda, 0x01, 0x9a, 0x45, 0x3f, 0xbc, 0x4b, 0x6d, 0x07, 0x89, 0x58, - 0x12, 0xc1, 0x6c, 0x06, 0x9c, 0xec, 0xfe, 0x5f, 0x90, 0xb7, 0xb5, 0xd0, 0xdd, 0x20, 0xcd, 0xa2, - 0x09, 0xd2, 0x20, 0xf8, 0x14, 0xa1, 0xaa, 0xcc, 0x79, 0x0a, 0xe4, 0x41, 0xcf, 0x19, 0x3c, 0x3e, - 0x79, 0xb1, 0xd1, 0x9c, 0x56, 0xe9, 0xf2, 0x14, 0xc2, 0x3d, 0x59, 0x8f, 0x67, 0xe7, 0xd7, 0x4b, - 0xd7, 0xb9, 0x59, 0xba, 0xce, 0xef, 0xa5, 0xeb, 0x5c, 0xad, 0xdc, 0xce, 0xcd, 0xca, 0xed, 0xfc, - 0x5c, 0xb9, 0x9d, 0xaf, 0x47, 0xad, 0xec, 0x95, 0xd6, 0xb1, 0x54, 0xe3, 0x7a, 0x0e, 0xb2, 0xb2, - 0xdb, 0xf6, 0x0d, 0x97, 0x3b, 0xeb, 0x7e, 0xbf, 0xfa, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x5d, 0xb7, - 0x0b, 0xc1, 0x67, 0x03, 0x00, 0x00, + // 471 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x52, 0x4f, 0x6b, 0xd4, 0x40, + 0x1c, 0xdd, 0x58, 0xdb, 0xda, 0x89, 0xff, 0x88, 0x2d, 0x8e, 0x15, 0x92, 0x65, 0x0f, 0xb2, 0x14, + 0x9a, 0x40, 0xbd, 0x48, 0xf1, 0x54, 0x7b, 0x59, 0x54, 0x2a, 0x21, 0x22, 0x08, 0x32, 0x4c, 0x33, + 0x3f, 0x76, 0x87, 0xdd, 0x64, 0xc2, 0xcc, 0x2c, 0x9b, 0x7c, 0x03, 0x8f, 0x5e, 0xfc, 0x4e, 0x3d, + 0xf6, 0x28, 0x1e, 0x82, 0xec, 0xde, 0x3c, 0xf6, 0x13, 0xc8, 0x6c, 0xfe, 0x90, 0xa5, 0x27, 0xe9, + 0x69, 0x7e, 0xf3, 0xde, 0xe3, 0xfd, 0xde, 0x0c, 0x0f, 0x1d, 0xa5, 0x30, 0xd7, 0x52, 0xa4, 0x01, + 0x83, 0x3c, 0x98, 0xf1, 0x84, 0x6b, 0x22, 0x24, 0x03, 0x49, 0xb4, 0xa4, 0x69, 0x3c, 0x01, 0x32, + 0x57, 0x20, 0xfd, 0x4c, 0x0a, 0x2d, 0x1c, 0xbb, 0xd6, 0xfa, 0x0c, 0xf2, 0xc3, 0xfd, 0xb1, 0x18, + 0x8b, 0x35, 0x1e, 0x98, 0xa9, 0x92, 0x1c, 0x7a, 0x5d, 0x3b, 0x2d, 0x29, 0x03, 0x92, 0x51, 0x2e, + 0x09, 0x67, 0xb5, 0x60, 0x7f, 0x43, 0x90, 0x57, 0xe8, 0xe0, 0xe7, 0x36, 0x3a, 0xf8, 0x60, 0x96, + 0x5f, 0x98, 0xdd, 0x51, 0xb5, 0xfa, 0xb3, 0x02, 0xe9, 0xbc, 0x45, 0x8f, 0x36, 0x6c, 0xb0, 0xd5, + 0xb7, 0x86, 0xf6, 0x09, 0xf6, 0x3b, 0x59, 0xfc, 0xc8, 0x28, 0x3e, 0x51, 0x2e, 0x47, 0xe7, 0xa1, + 0xad, 0xdb, 0x0b, 0x73, 0xde, 0xa0, 0x17, 0x9a, 0xc7, 0x53, 0xc2, 0x53, 0x06, 0x39, 0xd1, 0x74, + 0x6a, 0x1e, 0x26, 0x48, 0x62, 0x06, 0x7c, 0xaf, 0x6f, 0x0d, 0xb7, 0xc2, 0x03, 0x23, 0x18, 0x19, + 0x3e, 0x32, 0x68, 0x24, 0x3e, 0x9a, 0xc3, 0xf1, 0x90, 0xdd, 0xfc, 0xc0, 0x14, 0x0a, 0xbc, 0xd5, + 0xb7, 0x86, 0x7b, 0x21, 0xaa, 0xa1, 0xf7, 0x50, 0x38, 0x18, 0xed, 0x52, 0xc6, 0x24, 0x28, 0x85, + 0xef, 0xaf, 0xc9, 0xe6, 0xea, 0x2c, 0xd0, 0x43, 0x35, 0xa1, 0x12, 0x14, 0x11, 0x8b, 0x14, 0x18, + 0xde, 0x36, 0xf4, 0x59, 0x74, 0x55, 0x7a, 0xbd, 0xdf, 0xa5, 0xf7, 0x6a, 0xcc, 0xf5, 0x64, 0x7e, + 0xe9, 0xc7, 0x22, 0x09, 0x62, 0xa1, 0x12, 0xa1, 0xea, 0xe3, 0x58, 0xb1, 0x69, 0xa0, 0x8b, 0x0c, + 0x94, 0x3f, 0x4a, 0xf5, 0xdf, 0xd2, 0xb3, 0x2b, 0x97, 0x0b, 0x63, 0x72, 0x53, 0x7a, 0xcf, 0x0a, + 0x9a, 0xcc, 0x4e, 0x07, 0x5d, 0xeb, 0x41, 0xd8, 0xd5, 0x38, 0xdf, 0x2d, 0xf4, 0xb4, 0xa6, 0x17, + 0x5c, 0x4f, 0x98, 0xa4, 0x8b, 0x14, 0xef, 0xac, 0xb7, 0x7f, 0xfb, 0xef, 0xed, 0xb7, 0x9c, 0x6e, + 0x4a, 0xef, 0xf9, 0x46, 0x84, 0x96, 0x19, 0x84, 0x4f, 0x2a, 0xe8, 0x4b, 0x83, 0x74, 0xa3, 0xc4, + 0x34, 0x8d, 0x61, 0x36, 0x03, 0x86, 0x77, 0xef, 0x18, 0xa5, 0x75, 0xba, 0x15, 0xa5, 0x65, 0xda, + 0x28, 0xef, 0x1a, 0xc4, 0x39, 0x45, 0xa8, 0x6e, 0x74, 0x91, 0x01, 0x7e, 0xd0, 0xb7, 0x86, 0x8f, + 0x4f, 0x5e, 0x6e, 0xd4, 0xa7, 0xd3, 0xbc, 0x22, 0x83, 0x70, 0x4f, 0x34, 0xe3, 0xd9, 0xf9, 0xd5, + 0xd2, 0xb5, 0xae, 0x97, 0xae, 0xf5, 0x67, 0xe9, 0x5a, 0x3f, 0x56, 0x6e, 0xef, 0x7a, 0xe5, 0xf6, + 0x7e, 0xad, 0xdc, 0xde, 0xd7, 0xa3, 0x4e, 0xfa, 0xda, 0xeb, 0x58, 0xc8, 0x71, 0x33, 0x07, 0x79, + 0x55, 0x70, 0xf3, 0x8a, 0xcb, 0x9d, 0x75, 0xc9, 0x5f, 0xff, 0x0b, 0x00, 0x00, 0xff, 0xff, 0xb7, + 0xb0, 0x38, 0x91, 0x6c, 0x03, 0x00, 0x00, } func (m *LimitOrderTrancheUser) Marshal() (dAtA []byte, err error) { diff --git a/x/dex/types/pool_reserves.pb.go b/x/dex/types/pool_reserves.pb.go index 5350404f5..b060cd429 100644 --- a/x/dex/types/pool_reserves.pb.go +++ b/x/dex/types/pool_reserves.pb.go @@ -87,9 +87,9 @@ func (m *PoolReservesKey) GetFee() uint64 { type PoolReserves struct { Key *PoolReservesKey `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"` - ReservesMakerDenom github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,opt,name=reserves_maker_denom,json=reservesMakerDenom,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"reservesMakerDenom" yaml:"reservesMakerDenom"` - PriceTakerToMaker github_com_neutron_org_neutron_utils_math.PrecDec `protobuf:"bytes,3,opt,name=price_taker_to_maker,json=priceTakerToMaker,proto3,customtype=github.com/neutron-org/neutron/utils/math.PrecDec" json:"priceTakerToMaker" yaml:"priceTakerToMaker"` - PriceOppositeTakerToMaker github_com_neutron_org_neutron_utils_math.PrecDec `protobuf:"bytes,4,opt,name=price_opposite_taker_to_maker,json=priceOppositeTakerToMaker,proto3,customtype=github.com/neutron-org/neutron/utils/math.PrecDec" json:"priceOppositeTakerToMaker" yaml:"priceOppositeTakerToMaker"` + ReservesMakerDenom github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,opt,name=reserves_maker_denom,json=reservesMakerDenom,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"reserves_maker_denom" yaml:"reserves_maker_denom"` + PriceTakerToMaker github_com_neutron_org_neutron_utils_math.PrecDec `protobuf:"bytes,3,opt,name=price_taker_to_maker,json=priceTakerToMaker,proto3,customtype=github.com/neutron-org/neutron/utils/math.PrecDec" json:"price_taker_to_maker" yaml:"price_taker_to_maker"` + PriceOppositeTakerToMaker github_com_neutron_org_neutron_utils_math.PrecDec `protobuf:"bytes,4,opt,name=price_opposite_taker_to_maker,json=priceOppositeTakerToMaker,proto3,customtype=github.com/neutron-org/neutron/utils/math.PrecDec" json:"price_opposite_taker_to_maker" yaml:"price_opposite_taker_to_maker"` } func (m *PoolReserves) Reset() { *m = PoolReserves{} } @@ -140,37 +140,36 @@ func init() { func init() { proto.RegisterFile("neutron/dex/pool_reserves.proto", fileDescriptor_f0fe9f734c7ad538) } var fileDescriptor_f0fe9f734c7ad538 = []byte{ - // 465 bytes of a gzipped FileDescriptorProto + // 464 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x93, 0x41, 0x8b, 0xd3, 0x40, - 0x14, 0x80, 0x3b, 0xa6, 0x08, 0x4e, 0x15, 0x75, 0xa8, 0x90, 0x2e, 0x9a, 0x94, 0x1c, 0xa4, 0x08, - 0x9b, 0xa0, 0x5e, 0x44, 0x3c, 0x2d, 0xbd, 0x14, 0x11, 0x4b, 0xe8, 0xc9, 0x4b, 0xc8, 0x26, 0xcf, - 0xee, 0xd8, 0x26, 0x2f, 0x4c, 0xa6, 0xd2, 0xfa, 0x2b, 0x04, 0x8f, 0xfb, 0x2b, 0xbc, 0xfb, 0x03, - 0xf6, 0xb8, 0x47, 0xf1, 0x10, 0xa4, 0xbd, 0xed, 0x71, 0x7f, 0x81, 0xcc, 0x24, 0x95, 0xb4, 0xa9, - 0x78, 0xd8, 0xd3, 0xbc, 0xcc, 0xfb, 0xe6, 0xbd, 0x6f, 0x5e, 0x18, 0x6a, 0xa7, 0xb0, 0x90, 0x02, - 0x53, 0x2f, 0x86, 0xa5, 0x97, 0x21, 0xce, 0x03, 0x01, 0x39, 0x88, 0xcf, 0x90, 0xbb, 0x99, 0x40, - 0x89, 0xac, 0x53, 0x01, 0x6e, 0x0c, 0xcb, 0xa3, 0xee, 0x14, 0xa7, 0xa8, 0xf7, 0x3d, 0x15, 0x95, - 0xc8, 0xd1, 0x4e, 0x0d, 0x29, 0xc2, 0x18, 0x82, 0x2c, 0xe4, 0x22, 0xe0, 0x71, 0x09, 0x38, 0xe7, - 0x84, 0xde, 0x1f, 0x23, 0xce, 0xfd, 0xaa, 0xf4, 0x5b, 0x58, 0xb1, 0x37, 0xf4, 0xde, 0x0e, 0x6a, - 0x92, 0x3e, 0x19, 0x74, 0x5e, 0x98, 0x6e, 0xad, 0x9f, 0x3b, 0x51, 0xc4, 0x38, 0xe4, 0x62, 0x34, - 0xf4, 0x3b, 0xf2, 0xef, 0x47, 0xcc, 0x5e, 0xd1, 0x9e, 0xe4, 0xd1, 0x2c, 0xe0, 0x69, 0x0c, 0xcb, - 0x40, 0x86, 0x33, 0x10, 0x81, 0xc4, 0x20, 0x51, 0x81, 0x79, 0xab, 0x4f, 0x06, 0x86, 0xff, 0x48, - 0x01, 0x23, 0x95, 0x9f, 0xa8, 0xdd, 0x09, 0xbe, 0x53, 0x0b, 0x7b, 0x40, 0x8d, 0x8f, 0x00, 0xa6, - 0xd1, 0x27, 0x83, 0xb6, 0xaf, 0x42, 0xe7, 0x7b, 0x9b, 0xde, 0xad, 0xdb, 0x31, 0x97, 0x1a, 0x33, - 0x58, 0x55, 0x42, 0x8f, 0x77, 0x84, 0xf6, 0x6e, 0xe1, 0x2b, 0x90, 0x7d, 0x23, 0xb4, 0xbb, 0x9d, - 0x5a, 0xa9, 0x10, 0xc4, 0x90, 0x62, 0xa2, 0x45, 0xee, 0x9c, 0x84, 0x17, 0x85, 0xdd, 0xfa, 0x55, - 0xd8, 0x4f, 0xa7, 0x5c, 0x9e, 0x2d, 0x4e, 0xdd, 0x08, 0x13, 0x2f, 0xc2, 0x3c, 0xc1, 0xbc, 0x5a, - 0x8e, 0xf3, 0x78, 0xe6, 0xc9, 0x55, 0x06, 0xb9, 0x3b, 0x4a, 0xe5, 0x55, 0x61, 0xb3, 0x6d, 0x35, - 0xad, 0x3c, 0x54, 0xb5, 0xae, 0x0b, 0xbb, 0xb7, 0x0a, 0x93, 0xf9, 0x6b, 0xa7, 0x99, 0x73, 0xfc, - 0x03, 0x07, 0xd8, 0x39, 0xa1, 0xdd, 0x4c, 0xf0, 0x08, 0xf6, 0xc7, 0x63, 0x68, 0xab, 0x4f, 0x95, - 0xd5, 0xf3, 0x9a, 0x55, 0x75, 0xd3, 0x63, 0x14, 0xd3, 0x6d, 0xec, 0x2d, 0x24, 0x9f, 0xe7, 0x5e, - 0x12, 0xca, 0x33, 0x77, 0x2c, 0x20, 0x1a, 0x42, 0x74, 0x55, 0xd8, 0x0f, 0x75, 0xe1, 0xfa, 0x5c, - 0xaf, 0x0b, 0xdb, 0x2c, 0xfd, 0x1a, 0x29, 0xc7, 0x6f, 0xe2, 0xec, 0x07, 0xa1, 0x4f, 0x4a, 0x3b, - 0xcc, 0x32, 0xcc, 0xb9, 0x6c, 0x68, 0xb6, 0xb5, 0xe6, 0x97, 0x9b, 0x68, 0xf6, 0x74, 0x87, 0xf7, - 0x55, 0x83, 0x3d, 0xdd, 0x7e, 0x4d, 0xf7, 0x10, 0xe2, 0xf8, 0xff, 0x3e, 0x7e, 0x32, 0xbc, 0x58, - 0x5b, 0xe4, 0x72, 0x6d, 0x91, 0xdf, 0x6b, 0x8b, 0x7c, 0xdd, 0x58, 0xad, 0xcb, 0x8d, 0xd5, 0xfa, - 0xb9, 0xb1, 0x5a, 0x1f, 0x9e, 0xfd, 0x47, 0x74, 0x59, 0xbe, 0x12, 0xf5, 0xb7, 0x4f, 0x6f, 0xeb, - 0xe7, 0xf1, 0xf2, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xd5, 0x52, 0xb3, 0x3e, 0x85, 0x03, 0x00, - 0x00, + 0x14, 0xc7, 0x3b, 0xa6, 0x08, 0x4e, 0x15, 0x35, 0x54, 0xe8, 0xae, 0x9a, 0x94, 0x20, 0x52, 0x84, + 0x4d, 0x50, 0x2f, 0x22, 0x9e, 0x96, 0x5e, 0x8a, 0x88, 0x25, 0xf4, 0xe4, 0x25, 0x64, 0x93, 0x67, + 0x77, 0x68, 0x93, 0x37, 0xcc, 0x4c, 0xa5, 0xbd, 0xfa, 0x09, 0xbc, 0x79, 0xf0, 0xe4, 0x77, 0x51, + 0xd8, 0xe3, 0x1e, 0xc5, 0x43, 0x90, 0xf6, 0xe6, 0x71, 0x3f, 0x81, 0xcc, 0x24, 0xd5, 0xb4, 0x46, + 0x3d, 0x78, 0x9a, 0x97, 0xff, 0xff, 0xcf, 0x9b, 0xdf, 0x9b, 0xcc, 0x50, 0x37, 0x87, 0x85, 0x12, + 0x98, 0x07, 0x29, 0x2c, 0x03, 0x8e, 0x38, 0x8f, 0x04, 0x48, 0x10, 0x6f, 0x40, 0xfa, 0x5c, 0xa0, + 0x42, 0xbb, 0x53, 0x05, 0xfc, 0x14, 0x96, 0x87, 0xdd, 0x29, 0x4e, 0xd1, 0xe8, 0x81, 0xae, 0xca, + 0xc8, 0xe1, 0x4e, 0x0f, 0x25, 0xe2, 0x14, 0x22, 0x1e, 0x33, 0x11, 0xb1, 0xb4, 0x0c, 0x78, 0x1f, + 0x08, 0xbd, 0x3e, 0x46, 0x9c, 0x87, 0x55, 0xeb, 0xe7, 0xb0, 0xb2, 0x9f, 0xd1, 0x6b, 0x3b, 0xd1, + 0x1e, 0xe9, 0x93, 0x41, 0xe7, 0x51, 0xcf, 0xaf, 0xed, 0xe7, 0x4f, 0x74, 0x62, 0x1c, 0x33, 0x31, + 0x1a, 0x86, 0x1d, 0xf5, 0xf3, 0x23, 0xb5, 0x9f, 0xd0, 0x03, 0xc5, 0x92, 0x59, 0xc4, 0xf2, 0x14, + 0x96, 0x91, 0x8a, 0x67, 0x20, 0x22, 0x85, 0x51, 0xa6, 0x8b, 0xde, 0xa5, 0x3e, 0x19, 0x58, 0xe1, + 0x2d, 0x1d, 0x18, 0x69, 0x7f, 0xa2, 0xd5, 0x09, 0xbe, 0xd0, 0x8b, 0x7d, 0x83, 0x5a, 0xaf, 0x01, + 0x7a, 0x56, 0x9f, 0x0c, 0xda, 0xa1, 0x2e, 0xbd, 0x4f, 0x6d, 0x7a, 0xb5, 0x4e, 0x67, 0xfb, 0xd4, + 0x9a, 0xc1, 0xaa, 0x02, 0xba, 0xb3, 0x03, 0xb4, 0x37, 0x45, 0xa8, 0x83, 0xf6, 0x7b, 0x42, 0xbb, + 0xdb, 0x53, 0x2b, 0x11, 0xa2, 0x14, 0x72, 0xcc, 0x0c, 0xc8, 0x95, 0x63, 0x38, 0x2b, 0xdc, 0xd6, + 0xd7, 0xc2, 0xbd, 0x3f, 0x65, 0xea, 0x74, 0x71, 0xe2, 0x27, 0x98, 0x05, 0x09, 0xca, 0x0c, 0x65, + 0xb5, 0x1c, 0xc9, 0x74, 0x16, 0xa8, 0x15, 0x07, 0xe9, 0x8f, 0x72, 0xf5, 0xbd, 0x70, 0x1b, 0xbb, + 0x5d, 0x14, 0xee, 0xed, 0x55, 0x9c, 0xcd, 0x9f, 0x7a, 0x4d, 0xae, 0x17, 0xda, 0x5b, 0xd9, 0xcc, + 0x39, 0xd4, 0xa2, 0xfd, 0x91, 0xd0, 0x2e, 0x17, 0x2c, 0x81, 0xfd, 0x23, 0xb2, 0x0c, 0x19, 0xaf, + 0xc8, 0x1e, 0xd6, 0xc8, 0xaa, 0x69, 0x8f, 0x50, 0x4c, 0xb7, 0x75, 0xb0, 0x50, 0x6c, 0x2e, 0x83, + 0x2c, 0x56, 0xa7, 0xfe, 0x58, 0x40, 0x32, 0x84, 0x44, 0x43, 0x36, 0x35, 0xfe, 0x05, 0xd9, 0xe4, + 0x7a, 0xe1, 0x4d, 0x23, 0xef, 0xfc, 0x90, 0xcf, 0x84, 0xde, 0x2d, 0xc3, 0xc8, 0x39, 0x4a, 0xa6, + 0x7e, 0x83, 0x6d, 0x1b, 0xd8, 0xb7, 0xe4, 0x7f, 0x68, 0xff, 0xbe, 0xc5, 0x45, 0xe1, 0xde, 0xab, + 0x63, 0xff, 0x21, 0xe6, 0x85, 0x07, 0xc6, 0x7f, 0x59, 0xd9, 0xf5, 0x39, 0x8e, 0x87, 0x67, 0x6b, + 0x87, 0x9c, 0xaf, 0x1d, 0xf2, 0x6d, 0xed, 0x90, 0x77, 0x1b, 0xa7, 0x75, 0xbe, 0x71, 0x5a, 0x5f, + 0x36, 0x4e, 0xeb, 0xd5, 0x83, 0x7f, 0x00, 0x2f, 0xcb, 0x87, 0xa3, 0x2f, 0xc0, 0xc9, 0x65, 0xf3, + 0x62, 0x1e, 0xff, 0x08, 0x00, 0x00, 0xff, 0xff, 0xc5, 0xf4, 0xdc, 0x1c, 0x98, 0x03, 0x00, 0x00, } func (m *PoolReservesKey) Marshal() (dAtA []byte, err error) { diff --git a/x/dex/types/query.pb.go b/x/dex/types/query.pb.go index 3d548f0a1..c9aa8017f 100644 --- a/x/dex/types/query.pb.go +++ b/x/dex/types/query.pb.go @@ -1304,8 +1304,8 @@ type QueryEstimateMultiHopSwapRequest struct { 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 github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,4,opt,name=amount_in,json=amountIn,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"amountIn" yaml:"amountIn"` - ExitLimitPrice github_com_neutron_org_neutron_utils_math.PrecDec `protobuf:"bytes,5,opt,name=exit_limit_price,json=exitLimitPrice,proto3,customtype=github.com/neutron-org/neutron/utils/math.PrecDec" json:"exitLimitPrice" yaml:"exitLimitPrice"` + AmountIn github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,4,opt,name=amount_in,json=amountIn,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"amount_in" yaml:"amount_in"` + ExitLimitPrice github_com_neutron_org_neutron_utils_math.PrecDec `protobuf:"bytes,5,opt,name=exit_limit_price,json=exitLimitPrice,proto3,customtype=github.com/neutron-org/neutron/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"` @@ -1373,7 +1373,7 @@ func (m *QueryEstimateMultiHopSwapRequest) GetPickBestRoute() bool { } type QueryEstimateMultiHopSwapResponse 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:"coinOut"` + 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"` } func (m *QueryEstimateMultiHopSwapResponse) Reset() { *m = QueryEstimateMultiHopSwapResponse{} } @@ -1415,11 +1415,11 @@ type QueryEstimatePlaceLimitOrderRequest struct { TokenIn string `protobuf:"bytes,3,opt,name=token_in,json=tokenIn,proto3" json:"token_in,omitempty"` TokenOut string `protobuf:"bytes,4,opt,name=token_out,json=tokenOut,proto3" json:"token_out,omitempty"` TickIndexInToOut int64 `protobuf:"varint,5,opt,name=tick_index_in_to_out,json=tickIndexInToOut,proto3" json:"tick_index_in_to_out,omitempty"` - AmountIn github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,6,opt,name=amount_in,json=amountIn,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"amountIn" yaml:"amountIn"` + AmountIn github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,6,opt,name=amount_in,json=amountIn,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"amount_in" yaml:"amount_in"` OrderType LimitOrderType `protobuf:"varint,7,opt,name=order_type,json=orderType,proto3,enum=neutron.dex.LimitOrderType" json:"order_type,omitempty"` // expirationTime is only valid iff orderType == GOOD_TIL_TIME. ExpirationTime *time.Time `protobuf:"bytes,8,opt,name=expiration_time,json=expirationTime,proto3,stdtime" json:"expiration_time,omitempty"` - MaxAmountOut *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,9,opt,name=maxAmount_out,json=maxAmountOut,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"maxAmountOut" yaml:"maxAmountOut"` + MaxAmountOut *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,9,opt,name=maxAmount_out,json=maxAmountOut,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"max_amount_out" yaml:"max_amount_out"` } func (m *QueryEstimatePlaceLimitOrderRequest) Reset() { *m = QueryEstimatePlaceLimitOrderRequest{} } @@ -1507,13 +1507,13 @@ func (m *QueryEstimatePlaceLimitOrderRequest) GetExpirationTime() *time.Time { type QueryEstimatePlaceLimitOrderResponse struct { // Total amount of coin used for the limit order // You can derive makerLimitInCoin using the equation: totalInCoin = swapInCoin + makerLimitInCoin - TotalInCoin github_com_cosmos_cosmos_sdk_types.Coin `protobuf:"bytes,1,opt,name=total_in_coin,json=totalInCoin,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Coin" json:"totalInCoin" yaml:"totalInCoin"` + TotalInCoin github_com_cosmos_cosmos_sdk_types.Coin `protobuf:"bytes,1,opt,name=total_in_coin,json=totalInCoin,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Coin" json:"total_in_coin" yaml:"total_in_coin"` // Total amount of the token in that was immediately swapped for swapOutCoin - SwapInCoin github_com_cosmos_cosmos_sdk_types.Coin `protobuf:"bytes,2,opt,name=swap_in_coin,json=swapInCoin,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Coin" json:"swapInCoin" yaml:"swapInCoin"` + SwapInCoin github_com_cosmos_cosmos_sdk_types.Coin `protobuf:"bytes,2,opt,name=swap_in_coin,json=swapInCoin,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Coin" json:"swap_in_coin" yaml:"swap_in_coin"` // 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 - SwapOutCoin github_com_cosmos_cosmos_sdk_types.Coin `protobuf:"bytes,3,opt,name=swap_out_coin,json=swapOutCoin,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Coin" json:"swapOutCoin" yaml:"swapOutCoin"` + SwapOutCoin github_com_cosmos_cosmos_sdk_types.Coin `protobuf:"bytes,3,opt,name=swap_out_coin,json=swapOutCoin,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Coin" json:"swap_out_coin" yaml:"swap_out_coin"` } func (m *QueryEstimatePlaceLimitOrderResponse) Reset() { *m = QueryEstimatePlaceLimitOrderResponse{} } @@ -1922,144 +1922,145 @@ func init() { func init() { proto.RegisterFile("neutron/dex/query.proto", fileDescriptor_b6613ea5fce61e9c) } var fileDescriptor_b6613ea5fce61e9c = []byte{ - // 2185 bytes of a gzipped FileDescriptorProto + // 2194 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x5a, 0xcf, 0x6f, 0x1b, 0xc7, - 0xf5, 0xf7, 0x8a, 0xb2, 0x2c, 0x8d, 0x24, 0x4b, 0x1a, 0xc9, 0x5f, 0xd3, 0x94, 0x4c, 0xca, 0x9b, - 0xd8, 0x92, 0x9d, 0x88, 0x6b, 0xe9, 0x0b, 0x27, 0x85, 0xd1, 0xa0, 0x15, 0xab, 0xc4, 0x61, 0x13, - 0x43, 0xea, 0x56, 0x41, 0x7f, 0xa0, 0xc0, 0x62, 0xc5, 0x1d, 0x4b, 0x5b, 0x2d, 0x77, 0xd7, 0xbb, - 0x43, 0x47, 0xac, 0x61, 0x14, 0xc8, 0x31, 0x28, 0xda, 0xa0, 0x69, 0x0b, 0xb4, 0x87, 0xf4, 0x50, - 0xf4, 0x58, 0xb4, 0x01, 0x8a, 0xf6, 0xd6, 0x43, 0x81, 0x02, 0x39, 0xe4, 0x10, 0x20, 0x97, 0xa2, - 0x05, 0xd8, 0xc2, 0xce, 0xc9, 0xbd, 0xf9, 0x2f, 0x28, 0x66, 0xf6, 0x2d, 0x39, 0x4b, 0xce, 0x72, - 0x49, 0x9b, 0x29, 0x72, 0xd2, 0xee, 0xec, 0x9b, 0x79, 0x9f, 0xf7, 0x99, 0xcf, 0xcc, 0x9b, 0x79, - 0x14, 0x3a, 0xef, 0x92, 0x06, 0x0d, 0x3c, 0x57, 0xb3, 0xc8, 0x89, 0x76, 0xb7, 0x41, 0x82, 0x66, - 0xd9, 0x0f, 0x3c, 0xea, 0xe1, 0x69, 0xf8, 0x50, 0xb6, 0xc8, 0x49, 0x61, 0xe9, 0xd0, 0x3b, 0xf4, - 0x78, 0xbb, 0xc6, 0x9e, 0x22, 0x93, 0xc2, 0xca, 0xa1, 0xe7, 0x1d, 0x3a, 0x44, 0x33, 0x7d, 0x5b, - 0x33, 0x5d, 0xd7, 0xa3, 0x26, 0xb5, 0x3d, 0x37, 0x84, 0xaf, 0xd7, 0x6a, 0x5e, 0x58, 0xf7, 0x42, - 0xed, 0xc0, 0x0c, 0x49, 0x34, 0xb2, 0x76, 0x6f, 0xf3, 0x80, 0x50, 0x73, 0x53, 0xf3, 0xcd, 0x43, - 0xdb, 0xe5, 0xc6, 0x60, 0x9b, 0x17, 0x51, 0xf8, 0x66, 0x60, 0xd6, 0xdb, 0xa3, 0x88, 0x5f, 0x1c, - 0xbb, 0x6e, 0x53, 0xc3, 0x0b, 0x2c, 0x12, 0x18, 0x34, 0x30, 0xdd, 0xda, 0x11, 0x31, 0x1a, 0x21, - 0x09, 0xc0, 0xf6, 0x72, 0x86, 0x2d, 0x98, 0xad, 0x8a, 0x66, 0x16, 0xf1, 0xbd, 0xd0, 0xa6, 0x46, - 0x40, 0x6a, 0x5e, 0x60, 0xc9, 0x2c, 0xa8, 0x5d, 0x3b, 0x36, 0x1c, 0xfb, 0x6e, 0xc3, 0xb6, 0x6c, - 0x0a, 0xec, 0x14, 0x4a, 0x09, 0xc0, 0x9e, 0xe7, 0x18, 0x01, 0x09, 0x49, 0x70, 0x8f, 0xc4, 0xb8, - 0x97, 0x12, 0x43, 0x9c, 0x40, 0x6b, 0x51, 0xe4, 0x24, 0x66, 0xa3, 0xe6, 0xd9, 0x31, 0x0f, 0x25, - 0x60, 0x94, 0xbf, 0x1d, 0x34, 0xee, 0x68, 0xd4, 0xae, 0x93, 0x90, 0x9a, 0x75, 0x1f, 0x0c, 0xfe, - 0xaf, 0xdb, 0x6f, 0x2a, 0x9e, 0x3a, 0xa1, 0xa6, 0x65, 0x52, 0x33, 0x32, 0x50, 0x97, 0x10, 0xfe, - 0x06, 0x9b, 0x83, 0x3d, 0x4e, 0xae, 0x4e, 0xee, 0x36, 0x48, 0x48, 0xd5, 0xd7, 0xd1, 0x62, 0xa2, - 0x35, 0xf4, 0x3d, 0x37, 0x24, 0x78, 0x13, 0x4d, 0x44, 0x93, 0x90, 0x57, 0x56, 0x95, 0xf5, 0xe9, - 0xad, 0xc5, 0xb2, 0x20, 0x86, 0x72, 0x64, 0x5c, 0x19, 0xff, 0xa8, 0x55, 0x3a, 0xa5, 0x83, 0xa1, - 0x6a, 0xa2, 0xe7, 0xf9, 0x48, 0xb7, 0x08, 0x7d, 0x93, 0x31, 0xbf, 0xcb, 0x88, 0xdf, 0x8f, 0x78, - 0x7f, 0x2b, 0x24, 0x01, 0x78, 0xc4, 0x79, 0x74, 0xc6, 0xb4, 0xac, 0x80, 0x84, 0xd1, 0xd8, 0x53, - 0x7a, 0xfc, 0x8a, 0x4b, 0x68, 0x3a, 0x9e, 0xd3, 0x63, 0xd2, 0xcc, 0x8f, 0xf1, 0xaf, 0x08, 0x9a, - 0xde, 0x20, 0x4d, 0xf5, 0x5d, 0x05, 0x5d, 0xce, 0xf0, 0x01, 0xf8, 0x4d, 0x94, 0x4f, 0x93, 0x0a, - 0x44, 0xa4, 0x26, 0x22, 0x92, 0x8e, 0xc6, 0x03, 0x54, 0xf4, 0x73, 0x8e, 0xec, 0xa3, 0xea, 0x42, - 0xbc, 0xdb, 0x8e, 0xd3, 0x37, 0xde, 0xd7, 0x10, 0xea, 0xa8, 0x1d, 0x9c, 0x5f, 0x29, 0x47, 0x32, - 0x28, 0x33, 0x19, 0x94, 0xa3, 0x45, 0x07, 0x62, 0x28, 0xef, 0x99, 0x87, 0x04, 0xfa, 0xea, 0x42, - 0x4f, 0xf5, 0xd3, 0x38, 0xf8, 0x74, 0x87, 0x03, 0x05, 0x9f, 0x1b, 0x41, 0xf0, 0xf8, 0x56, 0x22, - 0xa8, 0x31, 0x1e, 0xd4, 0x5a, 0x66, 0x50, 0x11, 0xbe, 0x44, 0x54, 0xbf, 0x50, 0xd0, 0x6a, 0xea, - 0x94, 0xc6, 0x14, 0x9e, 0x47, 0x67, 0x7c, 0xd3, 0x0e, 0x0c, 0xdb, 0x02, 0xc9, 0x4c, 0xb0, 0xd7, - 0xaa, 0x85, 0x2f, 0x22, 0xc4, 0x17, 0xa7, 0xed, 0x5a, 0xe4, 0x84, 0xc3, 0xc8, 0xe9, 0x53, 0xac, - 0xa5, 0xca, 0x1a, 0xf0, 0x05, 0x34, 0x49, 0xbd, 0x63, 0xe2, 0x1a, 0xb6, 0x9b, 0xcf, 0x45, 0x5a, - 0xe3, 0xef, 0x55, 0xb7, 0x5b, 0x6b, 0xe3, 0x3d, 0x5a, 0x6b, 0xa2, 0x4b, 0x7d, 0x70, 0x01, 0xd3, - 0xfb, 0x68, 0x51, 0xc2, 0x34, 0x4c, 0x72, 0xb1, 0x3f, 0xc9, 0x40, 0xf0, 0x42, 0x0f, 0xc1, 0xea, - 0x07, 0x31, 0x27, 0xb2, 0x99, 0xce, 0xe4, 0x44, 0x0c, 0x7a, 0x2c, 0x19, 0x74, 0x52, 0x8a, 0xb9, - 0xa7, 0x96, 0xe2, 0x5f, 0x15, 0x20, 0x47, 0x0e, 0x30, 0x8b, 0x9c, 0xdc, 0x33, 0x90, 0x33, 0x3a, - 0xe5, 0xfd, 0x10, 0x2d, 0xc7, 0x31, 0x30, 0x49, 0xef, 0x44, 0x69, 0x20, 0xcc, 0xde, 0xa6, 0x5e, - 0x93, 0x20, 0x78, 0x1a, 0x16, 0x7f, 0xab, 0xa0, 0x15, 0x39, 0x02, 0x20, 0xf0, 0xcb, 0x68, 0x12, - 0x92, 0x53, 0x08, 0xac, 0x15, 0x12, 0xac, 0x41, 0x07, 0x9d, 0x27, 0x2e, 0x60, 0xac, 0xdd, 0x63, - 0x74, 0x44, 0xbd, 0xa3, 0xa0, 0xa2, 0x88, 0xb3, 0x33, 0x59, 0xff, 0x43, 0xb2, 0xfe, 0xac, 0xa0, - 0x52, 0x2a, 0x08, 0xe0, 0xeb, 0x0d, 0x34, 0x23, 0x08, 0x2e, 0x1c, 0x7a, 0xaf, 0x9b, 0xee, 0xa8, - 0x6d, 0x84, 0xf4, 0xfd, 0x4a, 0x98, 0xe6, 0x7d, 0xbb, 0x76, 0xfc, 0x66, 0x7c, 0x90, 0xf8, 0x22, - 0xac, 0xe4, 0x0f, 0x15, 0x74, 0x31, 0x05, 0x1c, 0x90, 0x7a, 0x0b, 0x9d, 0x4d, 0x9e, 0x7f, 0xa4, - 0x52, 0x4c, 0xf4, 0x05, 0x3a, 0x67, 0xa9, 0xd8, 0x38, 0x3a, 0x42, 0x3f, 0x50, 0xd0, 0x7a, 0xbc, - 0x35, 0x57, 0x5d, 0xb3, 0x46, 0xed, 0x7b, 0x64, 0xa4, 0xdb, 0x64, 0x32, 0xab, 0xe4, 0xba, 0xb3, - 0x4a, 0x66, 0xea, 0xf8, 0xa9, 0x82, 0xae, 0x0e, 0x00, 0x10, 0x08, 0x26, 0x68, 0xc5, 0x06, 0x23, - 0xe3, 0x59, 0x93, 0xc9, 0x05, 0x3b, 0xcd, 0x9d, 0x1a, 0x00, 0x69, 0xdb, 0x8e, 0x93, 0x49, 0xda, - 0xa8, 0x8e, 0x2c, 0xff, 0x8c, 0x89, 0xe8, 0xef, 0x74, 0x60, 0x22, 0x72, 0x23, 0x20, 0x62, 0x74, - 0x3a, 0xfc, 0xa5, 0xd2, 0xc9, 0x20, 0x7b, 0x9e, 0xe7, 0xe8, 0x70, 0xfe, 0xff, 0x22, 0xac, 0xeb, - 0xdf, 0x09, 0x9b, 0x4e, 0x12, 0x1b, 0x90, 0xbd, 0x83, 0x66, 0x13, 0x97, 0x16, 0x60, 0xf7, 0x42, - 0xf2, 0x9c, 0x2f, 0xf4, 0x04, 0x62, 0x67, 0x7c, 0xa1, 0x6d, 0xa4, 0x39, 0x66, 0x39, 0x5e, 0x32, - 0xa3, 0xe2, 0x32, 0x63, 0x19, 0xcf, 0xa3, 0xdc, 0x1d, 0x42, 0xf8, 0xf2, 0x1d, 0xd7, 0xd9, 0xa3, - 0x6a, 0x01, 0x67, 0x3d, 0x18, 0xd2, 0x39, 0x53, 0x86, 0xe6, 0x4c, 0xfd, 0x30, 0x07, 0xa7, 0xbb, - 0x57, 0x43, 0x6a, 0xd7, 0x4d, 0x4a, 0x6e, 0x37, 0x1c, 0x6a, 0xbf, 0xee, 0xf9, 0xdf, 0x7c, 0xdb, - 0xf4, 0x85, 0x84, 0x5a, 0x0b, 0x88, 0x49, 0xbd, 0x20, 0x4e, 0xa8, 0xf0, 0x8a, 0x0b, 0x68, 0x32, - 0x20, 0x35, 0x62, 0xdf, 0x23, 0x01, 0x04, 0xdc, 0x7e, 0xc7, 0x5b, 0x68, 0x22, 0xf0, 0x1a, 0x94, - 0x84, 0xf9, 0x9c, 0x64, 0x8f, 0x8e, 0xfd, 0xe8, 0xcc, 0x44, 0x07, 0x4b, 0xfc, 0x7d, 0x34, 0x65, - 0xd6, 0xbd, 0x86, 0x4b, 0x19, 0x83, 0x7c, 0x2f, 0xab, 0xdc, 0x66, 0xf7, 0xba, 0x7f, 0xb4, 0x4a, - 0x57, 0x0e, 0x6d, 0x7a, 0xd4, 0x38, 0x28, 0xd7, 0xbc, 0xba, 0x06, 0xd7, 0xd6, 0xe8, 0xcf, 0x46, - 0x68, 0x1d, 0x6b, 0xb4, 0xe9, 0x93, 0xb0, 0x5c, 0x75, 0xe9, 0xe3, 0x56, 0x69, 0x32, 0x1a, 0xa2, - 0xea, 0x3e, 0x69, 0x95, 0xe6, 0x9a, 0x66, 0xdd, 0xb9, 0xa9, 0xc6, 0x2d, 0xaa, 0xde, 0xfe, 0x88, - 0x7f, 0xac, 0xa0, 0x79, 0x72, 0x62, 0x53, 0x58, 0xde, 0x7e, 0x60, 0xd7, 0x48, 0xfe, 0x34, 0xf7, - 0x69, 0x81, 0xcf, 0x4d, 0xc1, 0x27, 0x80, 0xdf, 0xf0, 0x82, 0xc3, 0xf8, 0x59, 0x6b, 0x50, 0xdb, - 0x09, 0xb5, 0xba, 0x49, 0x8f, 0xca, 0x7b, 0x01, 0xa9, 0xed, 0x90, 0xda, 0xe3, 0x56, 0xe9, 0x2c, - 0x1b, 0x94, 0xaf, 0xf4, 0x3d, 0x36, 0xe4, 0x93, 0x56, 0xe9, 0x5c, 0x04, 0x22, 0xd9, 0xae, 0xea, - 0x5d, 0x86, 0xf8, 0x0a, 0x9a, 0xf3, 0x99, 0x44, 0x0e, 0x48, 0x48, 0x0d, 0x4e, 0x48, 0x7e, 0x62, - 0x55, 0x59, 0x9f, 0xd4, 0x67, 0x59, 0x73, 0x85, 0xad, 0x2a, 0xd6, 0xa8, 0xfe, 0x3c, 0x3e, 0xf0, - 0xca, 0xe7, 0x0c, 0xf4, 0xe1, 0xa3, 0x49, 0x76, 0x93, 0x37, 0xbc, 0x06, 0x6d, 0x4b, 0x43, 0x5c, - 0x0b, 0xf1, 0x2a, 0xf8, 0x9a, 0x67, 0xbb, 0x95, 0x9b, 0x10, 0xf0, 0xda, 0x00, 0x24, 0xb3, 0x0e, - 0x8f, 0x5b, 0xa5, 0x33, 0x6c, 0xf4, 0xdd, 0x06, 0xd5, 0xe3, 0x07, 0xf5, 0x4f, 0xe3, 0xe8, 0xb9, - 0x04, 0xae, 0x3d, 0xc7, 0xac, 0x09, 0x7b, 0xde, 0xb3, 0xc9, 0xa9, 0xcf, 0xf5, 0x69, 0x19, 0x4d, - 0x45, 0x9f, 0x58, 0xac, 0x51, 0x06, 0x8c, 0x6c, 0x77, 0x1b, 0x14, 0x97, 0xd1, 0x52, 0x67, 0xe1, - 0x19, 0xb6, 0x6b, 0x50, 0x8f, 0xdb, 0x9d, 0xe6, 0x4b, 0x70, 0xbe, 0xbd, 0x04, 0xab, 0xee, 0xbe, - 0xc7, 0xec, 0x13, 0x12, 0x9c, 0xf8, 0x7c, 0x25, 0x78, 0x13, 0x21, 0xc8, 0x2a, 0x4d, 0x9f, 0xe4, - 0xcf, 0xac, 0x2a, 0xeb, 0x67, 0xb7, 0x96, 0xd3, 0x52, 0x4a, 0xd3, 0x27, 0xfa, 0x94, 0x17, 0x3f, - 0xe2, 0xdb, 0x68, 0x8e, 0x9c, 0xf8, 0x76, 0xc0, 0xb7, 0x2c, 0x83, 0xda, 0x75, 0x92, 0x9f, 0xe4, - 0xd3, 0x5c, 0x28, 0x47, 0x55, 0x9b, 0x72, 0x5c, 0xb5, 0x29, 0xef, 0xc7, 0x55, 0x9b, 0xca, 0x24, - 0xdb, 0x02, 0xde, 0xfb, 0x57, 0x49, 0x61, 0xe2, 0x8b, 0x3b, 0xb3, 0xcf, 0xf8, 0x07, 0x68, 0xb6, - 0x6e, 0x9e, 0x6c, 0x47, 0x91, 0x33, 0x7e, 0xa6, 0x78, 0xe8, 0x6f, 0xb1, 0x0e, 0x43, 0x85, 0x3e, - 0xd3, 0x1e, 0x66, 0xb7, 0x41, 0x9f, 0xb4, 0x4a, 0x8b, 0x51, 0xf8, 0x62, 0xab, 0xaa, 0x27, 0x8c, - 0xd4, 0xcf, 0x72, 0x50, 0xbd, 0x48, 0x15, 0x0e, 0x68, 0xfa, 0x7d, 0x05, 0xcd, 0x52, 0x8f, 0x9a, - 0x0e, 0x9b, 0x47, 0x26, 0xbb, 0x6c, 0x65, 0xef, 0x0f, 0xaf, 0xec, 0x69, 0xee, 0xa2, 0xea, 0xb2, - 0xd7, 0x27, 0xad, 0x12, 0x8e, 0x02, 0x10, 0x1a, 0x55, 0x5d, 0x34, 0xc1, 0x3f, 0x51, 0xd0, 0x4c, - 0xf8, 0xb6, 0xe9, 0xb7, 0x41, 0x8d, 0x65, 0x81, 0xd2, 0x87, 0x07, 0x85, 0x98, 0x87, 0x36, 0xa6, - 0x85, 0x08, 0x53, 0xa7, 0x4d, 0xd5, 0x05, 0x03, 0xce, 0x13, 0x47, 0xe4, 0x35, 0x68, 0x04, 0x29, - 0xf7, 0x79, 0xf0, 0xc4, 0x5c, 0xec, 0x36, 0x68, 0x92, 0x27, 0xa1, 0x51, 0xd5, 0x45, 0x13, 0xf5, - 0x7b, 0x68, 0x3e, 0xaa, 0xee, 0xf1, 0x04, 0xf4, 0x6c, 0xc5, 0x14, 0xc8, 0x97, 0xb9, 0x4e, 0xbe, - 0xd4, 0xd0, 0x52, 0x7b, 0xf4, 0x4a, 0xb3, 0xba, 0x23, 0x7a, 0x60, 0x79, 0x12, 0x3c, 0x8c, 0xeb, - 0x13, 0xec, 0xb5, 0x6a, 0xa9, 0x5f, 0x45, 0x0b, 0x02, 0x1c, 0x50, 0xd8, 0x0b, 0x68, 0x9c, 0x7d, - 0x06, 0x5d, 0x2d, 0xf4, 0x24, 0x53, 0x48, 0xa2, 0xdc, 0x48, 0xdd, 0x48, 0x1e, 0x13, 0x6e, 0x43, - 0x89, 0x33, 0xf6, 0x7c, 0x16, 0x8d, 0xb5, 0x9d, 0x8e, 0xd9, 0x56, 0x77, 0x46, 0xef, 0x98, 0x77, - 0x32, 0xfa, 0x9e, 0x58, 0x2a, 0x4d, 0xcd, 0xe8, 0x71, 0x4f, 0xa8, 0x79, 0xce, 0x88, 0x6d, 0x2a, - 0x49, 0x9e, 0x03, 0xbb, 0x41, 0x8d, 0xea, 0x34, 0xdd, 0x7d, 0xa6, 0x93, 0x45, 0xe3, 0x77, 0x45, - 0x93, 0x1b, 0x28, 0x1a, 0x5f, 0x68, 0x1b, 0xd9, 0x99, 0x6e, 0xeb, 0xe3, 0xf3, 0xe8, 0x34, 0xc7, - 0x8b, 0x8f, 0xd0, 0x44, 0x54, 0x32, 0xc6, 0xa5, 0x04, 0x96, 0xde, 0x7a, 0x74, 0x61, 0x35, 0xdd, - 0x20, 0x72, 0xa1, 0x2e, 0xbf, 0xf3, 0xe9, 0x67, 0xef, 0x8f, 0x9d, 0xc3, 0x8b, 0x5a, 0xef, 0x4f, - 0x06, 0xf8, 0x6f, 0x0a, 0x3a, 0x27, 0xbd, 0xe2, 0xe3, 0xcd, 0xde, 0x81, 0x33, 0x2a, 0xd5, 0x85, - 0xad, 0x61, 0xba, 0x00, 0xba, 0x57, 0x39, 0xba, 0xaf, 0xe0, 0x57, 0xb4, 0x41, 0x7e, 0xb6, 0xd0, - 0xee, 0x43, 0x9d, 0xe4, 0x81, 0x76, 0x5f, 0xb8, 0x53, 0x3e, 0xc0, 0x7f, 0x50, 0x50, 0x5e, 0xea, - 0x68, 0xdb, 0x71, 0x64, 0xa1, 0x64, 0x14, 0xa1, 0x65, 0xa1, 0x64, 0x95, 0x91, 0xd5, 0x0d, 0x1e, - 0xca, 0x1a, 0xbe, 0x3c, 0x50, 0x28, 0x0c, 0xf2, 0xa5, 0x34, 0xc8, 0x95, 0xe6, 0x36, 0xd4, 0x83, - 0x5e, 0x90, 0x02, 0x91, 0x97, 0x95, 0x0a, 0x2f, 0x0e, 0x66, 0x0c, 0x78, 0xaf, 0x73, 0xbc, 0xd7, - 0xf0, 0x7a, 0x02, 0x2f, 0xa7, 0x59, 0x2c, 0x0b, 0x75, 0x38, 0xc7, 0x1f, 0x2b, 0x68, 0xa1, 0xf7, - 0x82, 0xb8, 0x31, 0xd8, 0xb4, 0xc7, 0x20, 0xcb, 0x83, 0x9a, 0x03, 0xcc, 0x6f, 0x73, 0x98, 0x3a, - 0xde, 0xcb, 0xa2, 0x55, 0xbb, 0x0f, 0xfb, 0x34, 0x13, 0x07, 0x9c, 0xc3, 0xd8, 0x63, 0x7b, 0x8f, - 0xee, 0x16, 0xcd, 0x1f, 0x15, 0xb4, 0xd4, 0xe3, 0x97, 0x09, 0x66, 0x63, 0xb0, 0xd9, 0xef, 0x13, - 0x51, 0xbf, 0x42, 0xaf, 0xfa, 0x0a, 0x8f, 0xe8, 0x65, 0x7c, 0xe3, 0xa9, 0x22, 0xc2, 0x3f, 0x53, - 0xd0, 0x9c, 0x58, 0xff, 0x64, 0x88, 0xd7, 0x53, 0x67, 0xbe, 0xab, 0x4e, 0x5b, 0xb8, 0x3a, 0x80, - 0x25, 0xe0, 0x7c, 0x91, 0xe3, 0xbc, 0x82, 0x9f, 0xef, 0x15, 0x48, 0x5c, 0x35, 0x15, 0xc4, 0xf1, - 0x1b, 0x05, 0xcd, 0x27, 0xca, 0x5a, 0x0c, 0x97, 0xdc, 0x9b, 0xac, 0xac, 0x57, 0xb8, 0x36, 0x88, - 0x29, 0x20, 0xfb, 0x12, 0x47, 0xb6, 0x85, 0xaf, 0x6b, 0xe9, 0xbf, 0x3b, 0xca, 0xc9, 0xfb, 0x8f, - 0x82, 0x2e, 0xa4, 0x96, 0x56, 0xf0, 0x0d, 0xa9, 0x36, 0xb3, 0xea, 0x3f, 0x85, 0x97, 0x86, 0xed, - 0x06, 0x61, 0x18, 0x3c, 0x8c, 0xef, 0xe0, 0x6f, 0x25, 0xc2, 0xb8, 0x63, 0x3b, 0x0e, 0xb1, 0x8c, - 0x51, 0x28, 0xfc, 0x2f, 0x0a, 0x5a, 0x49, 0x85, 0xc1, 0xe6, 0xe7, 0x86, 0x94, 0xf4, 0xa7, 0x09, - 0x78, 0x90, 0x92, 0x95, 0xaa, 0xf1, 0x80, 0xaf, 0xe2, 0xb5, 0x01, 0x03, 0xc6, 0xbf, 0x56, 0xd0, - 0x9c, 0x58, 0x21, 0x48, 0xd7, 0xba, 0xa4, 0x0a, 0x92, 0xa2, 0x75, 0x59, 0xad, 0x42, 0x7d, 0x99, - 0x23, 0xdb, 0xc4, 0x9a, 0x96, 0xfa, 0x3b, 0xb5, 0x5c, 0x50, 0xbf, 0x57, 0xd0, 0x8c, 0x38, 0xa2, - 0x0c, 0x9e, 0xbc, 0x48, 0x23, 0x83, 0x97, 0x52, 0x4a, 0x51, 0xbf, 0xce, 0xe1, 0xed, 0xe0, 0xca, - 0x90, 0xf0, 0xba, 0xc4, 0x71, 0x87, 0x10, 0xbe, 0x50, 0x97, 0x64, 0xf7, 0x72, 0xd9, 0xb6, 0xd7, - 0xa7, 0xe6, 0x22, 0xdb, 0xf6, 0xfa, 0x5d, 0xf7, 0x53, 0xb6, 0x13, 0x02, 0x5d, 0x8c, 0x3a, 0xeb, - 0x63, 0x1c, 0x79, 0xbe, 0xc1, 0x4e, 0xe4, 0x8c, 0xd7, 0xf3, 0x29, 0x97, 0x2d, 0x7c, 0x3d, 0xdd, - 0xb3, 0xfc, 0x42, 0x5f, 0xd8, 0x1c, 0xa2, 0x47, 0x5f, 0xad, 0xb6, 0xe1, 0xfa, 0xac, 0x9b, 0xa8, - 0x59, 0xfc, 0x00, 0x8d, 0xb3, 0xb9, 0xc3, 0x17, 0x25, 0x47, 0xb2, 0xce, 0x7d, 0xa2, 0x50, 0x4c, - 0xfb, 0x0c, 0x7e, 0x5f, 0xe2, 0x7e, 0xaf, 0xe3, 0x72, 0xcf, 0x54, 0x27, 0x66, 0xb8, 0x67, 0x5a, - 0x03, 0x34, 0x19, 0x5f, 0x2c, 0xf0, 0x25, 0xb9, 0x0f, 0xe1, 0xd2, 0x91, 0x09, 0xe3, 0x39, 0x0e, - 0xe3, 0x22, 0x5e, 0x96, 0xc1, 0x88, 0x6e, 0x2b, 0x0f, 0xf0, 0x8f, 0x40, 0xfc, 0xed, 0xc3, 0x70, - 0xba, 0xf8, 0xbb, 0x4e, 0xf9, 0x7d, 0xc4, 0xdf, 0x7d, 0x4e, 0x57, 0xd7, 0x38, 0x94, 0x4b, 0xb8, - 0xa4, 0xa5, 0xfe, 0xcf, 0x86, 0x76, 0x9f, 0xc1, 0x79, 0x17, 0x76, 0x8b, 0x78, 0x84, 0xfe, 0xbb, - 0xc5, 0x00, 0x88, 0x52, 0x6e, 0x0e, 0xaa, 0xca, 0x11, 0xad, 0xe0, 0x42, 0x3a, 0xa2, 0xca, 0xce, - 0x47, 0x0f, 0x8b, 0xca, 0x27, 0x0f, 0x8b, 0xca, 0xbf, 0x1f, 0x16, 0x95, 0xf7, 0x1e, 0x15, 0x4f, - 0x7d, 0xf2, 0xa8, 0x78, 0xea, 0xef, 0x8f, 0x8a, 0xa7, 0xbe, 0x7b, 0x2d, 0xa3, 0x66, 0x77, 0x12, - 0x65, 0x33, 0x76, 0x91, 0x3d, 0x98, 0xe0, 0x25, 0x92, 0xff, 0xff, 0x6f, 0x00, 0x00, 0x00, 0xff, - 0xff, 0xca, 0x93, 0x0c, 0xc0, 0x76, 0x24, 0x00, 0x00, + 0x15, 0xf6, 0x8a, 0xb2, 0x2c, 0x8d, 0x7e, 0x58, 0x1e, 0xc9, 0x15, 0x4d, 0xc9, 0xa4, 0xb4, 0x89, + 0x2d, 0xd9, 0x89, 0xb8, 0x96, 0x0a, 0x27, 0x45, 0xda, 0xa0, 0x15, 0xab, 0xc4, 0x61, 0x13, 0x43, + 0xea, 0x56, 0x6d, 0x93, 0xa2, 0xc0, 0x62, 0x45, 0x8e, 0xa5, 0x85, 0x96, 0x3b, 0xeb, 0xdd, 0xa1, + 0x43, 0xc2, 0x70, 0x0b, 0xe4, 0x18, 0xf4, 0x10, 0x24, 0x45, 0x8b, 0xf6, 0x90, 0x1e, 0x8a, 0x1e, + 0x8b, 0xb6, 0x40, 0x81, 0x5c, 0x8a, 0x1e, 0x0a, 0x14, 0xc8, 0x21, 0x87, 0x00, 0xb9, 0x14, 0x2d, + 0xc0, 0x16, 0x76, 0x4f, 0xee, 0xa5, 0xd0, 0x5f, 0x50, 0xcc, 0xec, 0x5b, 0x72, 0x97, 0x9c, 0xe5, + 0x92, 0x36, 0x53, 0xe4, 0xa4, 0xdd, 0xd9, 0x37, 0xf3, 0xbe, 0xf7, 0xcd, 0x37, 0xf3, 0x66, 0x1e, + 0x85, 0x96, 0x1c, 0x52, 0x67, 0x1e, 0x75, 0xb4, 0x2a, 0x69, 0x68, 0x77, 0xeb, 0xc4, 0x6b, 0x16, + 0x5d, 0x8f, 0x32, 0x8a, 0xa7, 0xe1, 0x43, 0xb1, 0x4a, 0x1a, 0xb9, 0xc5, 0x23, 0x7a, 0x44, 0x45, + 0xbb, 0xc6, 0x9f, 0x02, 0x93, 0xdc, 0xca, 0x11, 0xa5, 0x47, 0x36, 0xd1, 0x4c, 0xd7, 0xd2, 0x4c, + 0xc7, 0xa1, 0xcc, 0x64, 0x16, 0x75, 0x7c, 0xf8, 0x7a, 0xbd, 0x42, 0xfd, 0x1a, 0xf5, 0xb5, 0x43, + 0xd3, 0x27, 0xc1, 0xc8, 0xda, 0xbd, 0xad, 0x43, 0xc2, 0xcc, 0x2d, 0xcd, 0x35, 0x8f, 0x2c, 0x47, + 0x18, 0x83, 0x6d, 0x36, 0x8a, 0xc2, 0x35, 0x3d, 0xb3, 0xd6, 0x1e, 0x25, 0xfa, 0xc5, 0xb6, 0x6a, + 0x16, 0x33, 0xa8, 0x57, 0x25, 0x9e, 0xc1, 0x3c, 0xd3, 0xa9, 0x1c, 0x13, 0xa3, 0xee, 0x13, 0x0f, + 0x6c, 0xaf, 0xa4, 0xd8, 0x82, 0xd9, 0x6a, 0xd4, 0xac, 0x4a, 0x5c, 0xea, 0x5b, 0xcc, 0xf0, 0x48, + 0x85, 0x7a, 0x55, 0x99, 0x05, 0xb3, 0x2a, 0x27, 0x86, 0x6d, 0xdd, 0xad, 0x5b, 0x55, 0x8b, 0x01, + 0x3b, 0xb9, 0x42, 0x0c, 0x30, 0xa5, 0xb6, 0xe1, 0x11, 0x9f, 0x78, 0xf7, 0x48, 0x88, 0x7b, 0x31, + 0x36, 0x44, 0x03, 0x5a, 0xf3, 0x51, 0x4e, 0x42, 0x36, 0x2a, 0xd4, 0x0a, 0x79, 0x28, 0x00, 0xa3, + 0xe2, 0xed, 0xb0, 0x7e, 0x47, 0x63, 0x56, 0x8d, 0xf8, 0xcc, 0xac, 0xb9, 0x60, 0xf0, 0xa5, 0x6e, + 0xbf, 0x89, 0x78, 0x6a, 0x84, 0x99, 0x55, 0x93, 0x99, 0x81, 0x81, 0xba, 0x88, 0xf0, 0xb7, 0xf9, + 0x1c, 0xec, 0x0b, 0x72, 0x75, 0x72, 0xb7, 0x4e, 0x7c, 0xa6, 0xbe, 0x86, 0x16, 0x62, 0xad, 0xbe, + 0x4b, 0x1d, 0x9f, 0xe0, 0x2d, 0x34, 0x11, 0x4c, 0x42, 0x56, 0x59, 0x55, 0x36, 0xa6, 0xb7, 0x17, + 0x8a, 0x11, 0x31, 0x14, 0x03, 0xe3, 0xd2, 0xf8, 0xc7, 0xad, 0xc2, 0x19, 0x1d, 0x0c, 0x55, 0x13, + 0x3d, 0x2b, 0x46, 0xba, 0x45, 0xd8, 0x1b, 0x9c, 0xf9, 0x3d, 0x4e, 0xfc, 0x41, 0xc0, 0xfb, 0x77, + 0x7d, 0xe2, 0x81, 0x47, 0x9c, 0x45, 0xe7, 0xcc, 0x6a, 0xd5, 0x23, 0x7e, 0x30, 0xf6, 0x94, 0x1e, + 0xbe, 0xe2, 0x02, 0x9a, 0x0e, 0xe7, 0xf4, 0x84, 0x34, 0xb3, 0x63, 0xe2, 0x2b, 0x82, 0xa6, 0xd7, + 0x49, 0x53, 0x7d, 0x57, 0x41, 0x57, 0x52, 0x7c, 0x00, 0x7e, 0x13, 0x65, 0x93, 0xa4, 0x02, 0x11, + 0xa9, 0xb1, 0x88, 0xa4, 0xa3, 0x89, 0x00, 0x15, 0xfd, 0xa2, 0x2d, 0xfb, 0xa8, 0x3a, 0x10, 0xef, + 0x8e, 0x6d, 0xf7, 0x8d, 0xf7, 0x55, 0x84, 0x3a, 0x6a, 0x07, 0xe7, 0x57, 0x8b, 0x81, 0x0c, 0x8a, + 0x5c, 0x06, 0xc5, 0x60, 0xd1, 0x81, 0x18, 0x8a, 0xfb, 0xe6, 0x11, 0x81, 0xbe, 0x7a, 0xa4, 0xa7, + 0xfa, 0x59, 0x18, 0x7c, 0xb2, 0xc3, 0x81, 0x82, 0xcf, 0x8c, 0x20, 0x78, 0x7c, 0x2b, 0x16, 0xd4, + 0x98, 0x08, 0x6a, 0x3d, 0x35, 0xa8, 0x00, 0x5f, 0x2c, 0xaa, 0x9f, 0x29, 0x68, 0x35, 0x71, 0x4a, + 0x43, 0x0a, 0x97, 0xd0, 0x39, 0xd7, 0xb4, 0x3c, 0xc3, 0xaa, 0x82, 0x64, 0x26, 0xf8, 0x6b, 0xb9, + 0x8a, 0x2f, 0x23, 0x24, 0x16, 0xa7, 0xe5, 0x54, 0x49, 0x43, 0xc0, 0xc8, 0xe8, 0x53, 0xbc, 0xa5, + 0xcc, 0x1b, 0xf0, 0x25, 0x34, 0xc9, 0xe8, 0x09, 0x71, 0x0c, 0xcb, 0xc9, 0x66, 0x02, 0xad, 0x89, + 0xf7, 0xb2, 0xd3, 0xad, 0xb5, 0xf1, 0x1e, 0xad, 0x35, 0xd1, 0x5a, 0x1f, 0x5c, 0xc0, 0xf4, 0x01, + 0x5a, 0x90, 0x30, 0x0d, 0x93, 0x9c, 0xef, 0x4f, 0x32, 0x10, 0x7c, 0xa1, 0x87, 0x60, 0xf5, 0xc3, + 0x90, 0x13, 0xd9, 0x4c, 0xa7, 0x72, 0x12, 0x0d, 0x7a, 0x2c, 0x1e, 0x74, 0x5c, 0x8a, 0x99, 0x27, + 0x96, 0xe2, 0x5f, 0x14, 0x20, 0x47, 0x0e, 0x30, 0x8d, 0x9c, 0xcc, 0x53, 0x90, 0x33, 0x3a, 0xe5, + 0xfd, 0x18, 0x2d, 0x87, 0x31, 0x70, 0x49, 0xef, 0x06, 0x69, 0xc0, 0x4f, 0xdf, 0xa6, 0x5e, 0x95, + 0x20, 0x78, 0x12, 0x16, 0x7f, 0xa3, 0xa0, 0x15, 0x39, 0x02, 0x20, 0xf0, 0x6b, 0x68, 0x12, 0x92, + 0x93, 0x0f, 0xac, 0xe5, 0x62, 0xac, 0x41, 0x07, 0x5d, 0x24, 0x2e, 0x60, 0xac, 0xdd, 0x63, 0x74, + 0x44, 0xbd, 0xa3, 0xa0, 0x7c, 0x14, 0x67, 0x67, 0xb2, 0xfe, 0x8f, 0x64, 0x7d, 0xa4, 0xa0, 0x42, + 0x22, 0x08, 0xe0, 0xeb, 0x75, 0x34, 0x13, 0x11, 0x9c, 0x3f, 0xf4, 0x5e, 0x37, 0xdd, 0x51, 0xdb, + 0x08, 0xe9, 0xfb, 0x65, 0x64, 0x9a, 0x0f, 0xac, 0xca, 0xc9, 0x1b, 0xe1, 0x41, 0xe2, 0x8b, 0xb0, + 0x92, 0xff, 0xa0, 0xa0, 0xcb, 0x09, 0xe0, 0x80, 0xd4, 0x5b, 0x68, 0x2e, 0x7e, 0xfe, 0x91, 0x4a, + 0x31, 0xd6, 0x17, 0xe8, 0x9c, 0x65, 0xd1, 0xc6, 0xd1, 0x11, 0xfa, 0xa1, 0x82, 0x36, 0xc2, 0xad, + 0xb9, 0xec, 0x98, 0x15, 0x66, 0xdd, 0x23, 0x23, 0xdd, 0x26, 0xe3, 0x59, 0x25, 0xd3, 0x9d, 0x55, + 0x52, 0x53, 0xc7, 0xfb, 0x0a, 0xba, 0x36, 0x00, 0x40, 0x20, 0x98, 0xa0, 0x15, 0x0b, 0x8c, 0x8c, + 0xa7, 0x4d, 0x26, 0x97, 0xac, 0x24, 0x77, 0xaa, 0x07, 0xa4, 0xed, 0xd8, 0x76, 0x2a, 0x69, 0xa3, + 0x3a, 0xb2, 0xfc, 0x23, 0x24, 0xa2, 0xbf, 0xd3, 0x81, 0x89, 0xc8, 0x8c, 0x80, 0x88, 0xd1, 0xe9, + 0xf0, 0x17, 0x4a, 0x27, 0x83, 0xec, 0x53, 0x6a, 0xeb, 0x70, 0xfe, 0xff, 0x22, 0xac, 0xeb, 0xdf, + 0x46, 0x36, 0x9d, 0x38, 0x36, 0x20, 0x7b, 0x17, 0xcd, 0xc6, 0x2e, 0x2d, 0xc0, 0xee, 0xa5, 0xf8, + 0x39, 0x3f, 0xd2, 0x13, 0x88, 0x9d, 0x71, 0x23, 0x6d, 0x23, 0xcd, 0x31, 0xcb, 0xe1, 0x92, 0x19, + 0x15, 0x97, 0x29, 0xcb, 0x78, 0x1e, 0x65, 0xee, 0x10, 0x22, 0x96, 0xef, 0xb8, 0xce, 0x1f, 0xd5, + 0x2a, 0x70, 0xd6, 0x83, 0x21, 0x99, 0x33, 0x65, 0x68, 0xce, 0xd4, 0x8f, 0x32, 0x70, 0xba, 0x7b, + 0xc5, 0x67, 0x56, 0xcd, 0x64, 0xe4, 0x76, 0xdd, 0x66, 0xd6, 0x6b, 0xd4, 0xfd, 0xce, 0xdb, 0xa6, + 0x1b, 0x49, 0xa8, 0x15, 0x8f, 0x98, 0x8c, 0x7a, 0x61, 0x42, 0x85, 0x57, 0x9c, 0x43, 0x93, 0x1e, + 0xa9, 0x10, 0xeb, 0x1e, 0xf1, 0x20, 0xe0, 0xf6, 0x3b, 0xde, 0x46, 0x13, 0x1e, 0xad, 0x33, 0xe2, + 0x67, 0x33, 0x92, 0x3d, 0x3a, 0xf4, 0xa3, 0x73, 0x13, 0x1d, 0x2c, 0xb1, 0x8d, 0xa6, 0xcc, 0x1a, + 0xad, 0x3b, 0x8c, 0x33, 0x28, 0xf6, 0xb2, 0xd2, 0x1e, 0xbf, 0xd7, 0xfd, 0xbd, 0x55, 0xb8, 0x7a, + 0x64, 0xb1, 0xe3, 0xfa, 0x61, 0xb1, 0x42, 0x6b, 0x1a, 0x5c, 0x5b, 0x83, 0x3f, 0x9b, 0x7e, 0xf5, + 0x44, 0x63, 0x4d, 0x97, 0xf8, 0xc5, 0xb2, 0xc3, 0x1e, 0xb7, 0x0a, 0x9d, 0x21, 0x4e, 0x5b, 0x85, + 0xf9, 0xa6, 0x59, 0xb3, 0x5f, 0x52, 0xdb, 0x4d, 0xaa, 0x3e, 0x19, 0x3c, 0x97, 0x1d, 0xfc, 0xbe, + 0x82, 0xe6, 0x49, 0xc3, 0x62, 0xb0, 0xc0, 0x5d, 0xcf, 0xaa, 0x90, 0xec, 0x59, 0xe1, 0xf5, 0x18, + 0xbc, 0x6e, 0x45, 0xbc, 0x02, 0xfc, 0x4d, 0xea, 0x1d, 0x85, 0xcf, 0x5a, 0x9d, 0x59, 0xb6, 0xaf, + 0xd5, 0x4c, 0x76, 0x5c, 0xdc, 0xf7, 0x48, 0x65, 0x97, 0x54, 0x1e, 0xb7, 0x0a, 0x3d, 0x83, 0x9e, + 0xb6, 0x0a, 0x4b, 0x01, 0x8e, 0xee, 0x2f, 0xaa, 0x3e, 0xc7, 0x9b, 0xc4, 0xc6, 0xb0, 0xcf, 0x1b, + 0xf0, 0x55, 0x74, 0xde, 0xe5, 0x42, 0x39, 0x24, 0x3e, 0x33, 0x04, 0x2d, 0xd9, 0x89, 0x55, 0x65, + 0x63, 0x52, 0x9f, 0xe5, 0xcd, 0x25, 0xbe, 0xb6, 0x78, 0x23, 0xbf, 0xab, 0xac, 0xf5, 0x99, 0x39, + 0x50, 0xc9, 0x5d, 0x34, 0xc9, 0xef, 0xf3, 0x06, 0xad, 0xb3, 0xb6, 0x40, 0xa2, 0x2b, 0x22, 0x5c, + 0x0b, 0xdf, 0xa4, 0x96, 0x53, 0xfa, 0x2a, 0x04, 0xbd, 0x3e, 0x00, 0xd5, 0xbc, 0xc3, 0xe3, 0x56, + 0xa1, 0x3d, 0xba, 0x7e, 0x8e, 0x3f, 0xed, 0xd5, 0x99, 0xfa, 0xa7, 0x71, 0xf4, 0x4c, 0x0c, 0xd8, + 0xbe, 0x6d, 0x56, 0x22, 0x5b, 0xdf, 0xd3, 0xa9, 0xaa, 0xcf, 0x2d, 0x6a, 0x19, 0x4d, 0x05, 0x9f, + 0x78, 0xb0, 0x41, 0x22, 0x0c, 0x6c, 0xf7, 0xea, 0x0c, 0x17, 0xd1, 0x62, 0x67, 0xfd, 0x19, 0x96, + 0x63, 0x30, 0x2a, 0xec, 0xce, 0x8a, 0x95, 0x38, 0xdf, 0x5e, 0x89, 0x65, 0xe7, 0x80, 0x72, 0xfb, + 0x98, 0x12, 0x27, 0x3e, 0x6f, 0x25, 0xbe, 0x84, 0x10, 0xa4, 0x97, 0xa6, 0x4b, 0xb2, 0xe7, 0x56, + 0x95, 0x8d, 0xb9, 0xed, 0xe5, 0xa4, 0xdc, 0xd2, 0x74, 0x89, 0x3e, 0x45, 0xc3, 0x47, 0x7c, 0x1b, + 0x9d, 0x27, 0x0d, 0xd7, 0xf2, 0xc4, 0xde, 0x65, 0x30, 0xab, 0x46, 0xb2, 0x93, 0x62, 0xa6, 0x73, + 0xc5, 0xa0, 0x7c, 0x53, 0x0c, 0xcb, 0x37, 0xc5, 0x83, 0xb0, 0x7c, 0x53, 0x9a, 0xe4, 0x7b, 0xc1, + 0x7b, 0xff, 0x2c, 0x28, 0x5c, 0x7f, 0x61, 0x67, 0xfe, 0x19, 0xff, 0x08, 0xcd, 0xd6, 0xcc, 0xc6, + 0x4e, 0x80, 0x92, 0x33, 0x34, 0x25, 0x82, 0x7f, 0x8b, 0x77, 0x18, 0x2a, 0xf8, 0xb9, 0x9a, 0xd9, + 0x30, 0xcc, 0xf6, 0x38, 0xa7, 0xad, 0xc2, 0xc5, 0x80, 0x81, 0x78, 0xbb, 0xaa, 0xcf, 0xb4, 0xfd, + 0x71, 0xf9, 0xfc, 0x37, 0x03, 0xa5, 0x8c, 0x44, 0xf9, 0x80, 0xb4, 0x7f, 0xae, 0xa0, 0x59, 0x46, + 0x99, 0x69, 0xf3, 0xd9, 0xe4, 0xe2, 0x4b, 0x17, 0xf8, 0x9b, 0xc3, 0x0b, 0x3c, 0xee, 0xe2, 0xb4, + 0x55, 0x58, 0x0c, 0x82, 0x88, 0x35, 0xab, 0xfa, 0xb4, 0x78, 0x2f, 0x3b, 0xbc, 0x17, 0xfe, 0x40, + 0x41, 0x33, 0xfe, 0xdb, 0xa6, 0xdb, 0x06, 0x36, 0x96, 0x06, 0xec, 0x7b, 0xc3, 0x03, 0x8b, 0x79, + 0x38, 0x6d, 0x15, 0x16, 0x02, 0x5c, 0xd1, 0x56, 0x55, 0x47, 0xfc, 0x15, 0x50, 0x71, 0xbe, 0xc4, + 0x57, 0x5a, 0x67, 0x01, 0xac, 0xcc, 0xe7, 0xc1, 0x57, 0xcc, 0x45, 0x87, 0xaf, 0x58, 0xb3, 0xaa, + 0x4f, 0xf3, 0xf7, 0xbd, 0x3a, 0xe3, 0xbd, 0xd4, 0x1f, 0xa2, 0xf9, 0xa0, 0xec, 0x27, 0x32, 0xd3, + 0xd3, 0x55, 0x59, 0x20, 0x91, 0x66, 0x3a, 0x89, 0x54, 0x43, 0x8b, 0xed, 0xd1, 0x4b, 0xcd, 0xf2, + 0x6e, 0xd4, 0x03, 0x4f, 0xa0, 0xe0, 0x61, 0x5c, 0x9f, 0xe0, 0xaf, 0xe5, 0xaa, 0xfa, 0x0d, 0x74, + 0x21, 0x02, 0x07, 0xd4, 0xf6, 0x1c, 0x1a, 0xe7, 0x9f, 0x41, 0x63, 0x17, 0x7a, 0xb2, 0x2c, 0x64, + 0x57, 0x61, 0xa4, 0x6e, 0xc6, 0xcf, 0x0f, 0xb7, 0xa1, 0xf6, 0x19, 0x7a, 0x9e, 0x43, 0x63, 0x6d, + 0xa7, 0x63, 0x56, 0xb5, 0x3b, 0xd5, 0x77, 0xcc, 0x3b, 0xa9, 0x7e, 0x3f, 0x5a, 0x43, 0x4d, 0x4c, + 0xf5, 0x61, 0x4f, 0x28, 0x86, 0xce, 0x44, 0xdb, 0x54, 0x12, 0x3f, 0x20, 0x76, 0x83, 0x1a, 0xd5, + 0x31, 0xbb, 0xfb, 0xb0, 0x27, 0x8b, 0xc6, 0xed, 0x8a, 0x26, 0x33, 0x50, 0x34, 0x6e, 0xa4, 0x6d, + 0x64, 0x87, 0xbd, 0xed, 0x4f, 0x96, 0xd0, 0x59, 0x81, 0x17, 0x1f, 0xa3, 0x89, 0xa0, 0x96, 0x8c, + 0x0b, 0x31, 0x2c, 0xbd, 0x85, 0xea, 0xdc, 0x6a, 0xb2, 0x41, 0xe0, 0x42, 0x5d, 0x7e, 0xe7, 0xb3, + 0x7f, 0x7f, 0x30, 0x76, 0x11, 0x2f, 0x68, 0xbd, 0xbf, 0x25, 0xe0, 0xbf, 0x2a, 0xe8, 0xa2, 0xf4, + 0xee, 0x8f, 0xb7, 0x7a, 0x07, 0x4e, 0x29, 0x61, 0xe7, 0xb6, 0x87, 0xe9, 0x02, 0xe8, 0x5e, 0x11, + 0xe8, 0xbe, 0x8e, 0x5f, 0xd6, 0x06, 0xf9, 0x3d, 0x43, 0xbb, 0x0f, 0x05, 0x94, 0x07, 0xda, 0xfd, + 0xc8, 0x65, 0xf3, 0x01, 0xfe, 0xbd, 0x82, 0xb2, 0x52, 0x47, 0x3b, 0xb6, 0x2d, 0x0b, 0x25, 0xa5, + 0x3a, 0x2d, 0x0b, 0x25, 0xad, 0xbe, 0xac, 0x6e, 0x8a, 0x50, 0xd6, 0xf1, 0x95, 0x81, 0x42, 0xe1, + 0x90, 0xd7, 0x92, 0x20, 0x97, 0x9a, 0x3b, 0x50, 0x28, 0x7a, 0x4e, 0x0a, 0x44, 0x5e, 0x6f, 0xca, + 0x3d, 0x3f, 0x98, 0x31, 0xe0, 0xbd, 0x21, 0xf0, 0x5e, 0xc7, 0x1b, 0x31, 0xbc, 0x82, 0xe6, 0x68, + 0xbd, 0xa8, 0xc3, 0x39, 0xfe, 0x44, 0x41, 0x17, 0x7a, 0x6f, 0x8e, 0x9b, 0x83, 0x4d, 0x7b, 0x08, + 0xb2, 0x38, 0xa8, 0x39, 0xc0, 0x7c, 0x53, 0xc0, 0xd4, 0xf1, 0x7e, 0x1a, 0xad, 0xda, 0x7d, 0xd8, + 0xa7, 0xb9, 0x38, 0xe0, 0x64, 0xc6, 0x1f, 0xdb, 0x7b, 0x74, 0xb7, 0x68, 0xfe, 0xa8, 0xa0, 0xc5, + 0x1e, 0xbf, 0x5c, 0x30, 0x9b, 0x83, 0xcd, 0x7e, 0x9f, 0x88, 0xfa, 0x55, 0x80, 0xd5, 0x97, 0x45, + 0x44, 0x2f, 0xe2, 0x9b, 0x4f, 0x14, 0x11, 0xfe, 0xa9, 0x82, 0xce, 0x47, 0x0b, 0xa3, 0x1c, 0xf1, + 0x46, 0xe2, 0xcc, 0x77, 0x15, 0x70, 0x73, 0xd7, 0x06, 0xb0, 0x04, 0x9c, 0xcf, 0x0b, 0x9c, 0x57, + 0xf1, 0xb3, 0xbd, 0x02, 0x09, 0xcb, 0xa9, 0x11, 0x71, 0xfc, 0x5a, 0x41, 0xf3, 0xb1, 0x7a, 0x17, + 0xc7, 0x25, 0xf7, 0x26, 0xab, 0xf7, 0xe5, 0xae, 0x0f, 0x62, 0x0a, 0xc8, 0xbe, 0x22, 0x90, 0x6d, + 0xe3, 0x1b, 0x5a, 0xf2, 0x0f, 0x92, 0x72, 0xf2, 0xfe, 0xa3, 0xa0, 0x4b, 0x89, 0x35, 0x17, 0x7c, + 0x53, 0xaa, 0xcd, 0xb4, 0xc2, 0x50, 0xee, 0x85, 0x61, 0xbb, 0x41, 0x18, 0x86, 0x08, 0xe3, 0x2d, + 0xfc, 0xfd, 0x58, 0x18, 0x77, 0x2c, 0xdb, 0x26, 0x55, 0x63, 0x14, 0x0a, 0xff, 0xb3, 0x82, 0x56, + 0x12, 0x61, 0xf0, 0xf9, 0xb9, 0x29, 0x25, 0xfd, 0x49, 0x02, 0x1e, 0xa4, 0x96, 0xa5, 0x6a, 0x22, + 0xe0, 0x6b, 0x78, 0x7d, 0xc0, 0x80, 0xf1, 0xaf, 0x14, 0x74, 0x3e, 0x5a, 0x3a, 0x48, 0xd6, 0xba, + 0xa4, 0x3c, 0x92, 0xa0, 0x75, 0x59, 0x11, 0x43, 0x7d, 0x51, 0x20, 0xdb, 0xc2, 0x9a, 0x96, 0xf8, + 0x03, 0xb6, 0x5c, 0x50, 0xbf, 0x53, 0xd0, 0x4c, 0x74, 0x44, 0x19, 0x3c, 0x79, 0xf5, 0x46, 0x06, + 0x2f, 0xa1, 0xc6, 0xa2, 0x7e, 0x4b, 0xc0, 0xdb, 0xc5, 0xa5, 0x21, 0xe1, 0x75, 0x89, 0xe3, 0x0e, + 0x21, 0x62, 0xa1, 0x2e, 0xca, 0xae, 0xea, 0xb2, 0x6d, 0xaf, 0x4f, 0x31, 0x46, 0xb6, 0xed, 0xf5, + 0xab, 0x00, 0x24, 0x6c, 0x27, 0x04, 0xba, 0x18, 0x35, 0xde, 0xc7, 0x38, 0xa6, 0xae, 0xc1, 0x4f, + 0xe4, 0x9c, 0xd7, 0xa5, 0x84, 0x8b, 0x17, 0xbe, 0x91, 0xec, 0x59, 0x7e, 0xc5, 0xcf, 0x6d, 0x0d, + 0xd1, 0xa3, 0xaf, 0x56, 0xdb, 0x70, 0x5d, 0xde, 0x2d, 0xaa, 0x59, 0xfc, 0x00, 0x8d, 0xf3, 0xb9, + 0xc3, 0x97, 0x25, 0x47, 0xb2, 0xce, 0x7d, 0x22, 0x97, 0x4f, 0xfa, 0x0c, 0x7e, 0x5f, 0x10, 0x7e, + 0x6f, 0xe0, 0x62, 0xcf, 0x54, 0xc7, 0x66, 0xb8, 0x67, 0x5a, 0x3d, 0x34, 0x19, 0x5e, 0x2c, 0xf0, + 0x9a, 0xdc, 0x47, 0xe4, 0xd2, 0x91, 0x0a, 0xe3, 0x19, 0x01, 0xe3, 0x32, 0x5e, 0x96, 0xc1, 0x08, + 0x6e, 0x2b, 0x0f, 0xf0, 0x4f, 0x40, 0xfc, 0xed, 0xc3, 0x70, 0xb2, 0xf8, 0xbb, 0x4e, 0xf9, 0x7d, + 0xc4, 0xdf, 0x7d, 0x4e, 0x57, 0xd7, 0x05, 0x94, 0x35, 0x5c, 0xd0, 0x12, 0xff, 0x99, 0x43, 0xbb, + 0xcf, 0xe1, 0xbc, 0x0b, 0xbb, 0x45, 0x38, 0x42, 0xff, 0xdd, 0x62, 0x00, 0x44, 0x09, 0x37, 0x07, + 0x55, 0x15, 0x88, 0x56, 0x70, 0x2e, 0x19, 0x51, 0x69, 0xf7, 0xe3, 0x87, 0x79, 0xe5, 0xd3, 0x87, + 0x79, 0xe5, 0x5f, 0x0f, 0xf3, 0xca, 0x7b, 0x8f, 0xf2, 0x67, 0x3e, 0x7d, 0x94, 0x3f, 0xf3, 0xb7, + 0x47, 0xf9, 0x33, 0x3f, 0xb8, 0x9e, 0x52, 0xca, 0x6b, 0x04, 0xd9, 0x8c, 0x5f, 0x66, 0x0f, 0x27, + 0x44, 0xc9, 0xe4, 0xcb, 0xff, 0x0b, 0x00, 0x00, 0xff, 0xff, 0x6a, 0x1a, 0x15, 0xc0, 0x8f, 0x24, + 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/dex/types/tx.pb.go b/x/dex/types/tx.pb.go index 47e78b1b3..d7aed6aba 100644 --- a/x/dex/types/tx.pb.go +++ b/x/dex/types/tx.pb.go @@ -121,8 +121,8 @@ type MsgDeposit struct { Receiver string `protobuf:"bytes,2,opt,name=receiver,proto3" json:"receiver,omitempty"` TokenA string `protobuf:"bytes,3,opt,name=token_a,json=tokenA,proto3" json:"token_a,omitempty"` TokenB string `protobuf:"bytes,4,opt,name=token_b,json=tokenB,proto3" json:"token_b,omitempty"` - AmountsA []github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,5,rep,name=amounts_a,json=amountsA,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"amountsA" yaml:"amountsA"` - AmountsB []github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,6,rep,name=amounts_b,json=amountsB,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"amountsB" yaml:"amountsB"` + AmountsA []github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,5,rep,name=amounts_a,json=amountsA,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"amounts_a" yaml:"amounts_a"` + AmountsB []github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,6,rep,name=amounts_b,json=amountsB,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"amounts_b" yaml:"amounts_b"` TickIndexesAToB []int64 `protobuf:"varint,7,rep,packed,name=tick_indexes_a_to_b,json=tickIndexesAToB,proto3" json:"tick_indexes_a_to_b,omitempty"` Fees []uint64 `protobuf:"varint,8,rep,packed,name=fees,proto3" json:"fees,omitempty"` Options []*DepositOptions `protobuf:"bytes,9,rep,name=options,proto3" json:"options,omitempty"` @@ -211,8 +211,8 @@ func (m *MsgDeposit) GetOptions() []*DepositOptions { } type MsgDepositResponse struct { - Reserve0Deposited []github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,1,rep,name=reserve0_deposited,json=reserve0Deposited,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"reserve0Deposited" yaml:"reserve0Deposited"` - Reserve1Deposited []github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,rep,name=reserve1_deposited,json=reserve1Deposited,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"reserve1Deposited" yaml:"reserve1Deposited"` + Reserve0Deposited []github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,1,rep,name=reserve0_deposited,json=reserve0Deposited,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"reserve0_deposited" yaml:"reserve0_deposited"` + Reserve1Deposited []github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,rep,name=reserve1_deposited,json=reserve1Deposited,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"reserve1_deposited" yaml:"reserve1_deposited"` } func (m *MsgDepositResponse) Reset() { *m = MsgDepositResponse{} } @@ -253,7 +253,7 @@ type MsgWithdrawal struct { Receiver string `protobuf:"bytes,2,opt,name=receiver,proto3" json:"receiver,omitempty"` TokenA string `protobuf:"bytes,3,opt,name=token_a,json=tokenA,proto3" json:"token_a,omitempty"` TokenB string `protobuf:"bytes,4,opt,name=token_b,json=tokenB,proto3" json:"token_b,omitempty"` - SharesToRemove []github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,5,rep,name=shares_to_remove,json=sharesToRemove,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"sharesToRemove" yaml:"sharesToRemove"` + SharesToRemove []github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,5,rep,name=shares_to_remove,json=sharesToRemove,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"shares_to_remove" yaml:"shares_to_remove"` TickIndexesAToB []int64 `protobuf:"varint,6,rep,packed,name=tick_indexes_a_to_b,json=tickIndexesAToB,proto3" json:"tick_indexes_a_to_b,omitempty"` Fees []uint64 `protobuf:"varint,7,rep,packed,name=fees,proto3" json:"fees,omitempty"` } @@ -375,11 +375,11 @@ type MsgPlaceLimitOrder struct { TokenIn string `protobuf:"bytes,3,opt,name=token_in,json=tokenIn,proto3" json:"token_in,omitempty"` TokenOut string `protobuf:"bytes,4,opt,name=token_out,json=tokenOut,proto3" json:"token_out,omitempty"` TickIndexInToOut int64 `protobuf:"varint,5,opt,name=tick_index_in_to_out,json=tickIndexInToOut,proto3" json:"tick_index_in_to_out,omitempty"` - AmountIn github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,7,opt,name=amount_in,json=amountIn,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"amountIn" yaml:"amountIn"` + AmountIn github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,7,opt,name=amount_in,json=amountIn,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"amount_in" yaml:"amount_in"` OrderType LimitOrderType `protobuf:"varint,8,opt,name=order_type,json=orderType,proto3,enum=neutron.dex.LimitOrderType" json:"order_type,omitempty"` // 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 *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,10,opt,name=max_amount_out,json=maxAmountOut,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"maxAmountOut" yaml:"maxAmountOut"` + MaxAmountOut *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,10,opt,name=max_amount_out,json=maxAmountOut,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"max_amount_out" yaml:"max_amount_out"` } func (m *MsgPlaceLimitOrder) Reset() { *m = MsgPlaceLimitOrder{} } @@ -467,11 +467,11 @@ func (m *MsgPlaceLimitOrder) GetExpirationTime() *time.Time { type MsgPlaceLimitOrderResponse struct { TrancheKey string `protobuf:"bytes,1,opt,name=trancheKey,proto3" json:"trancheKey,omitempty"` // Total amount of coin used for the limit order - CoinIn github_com_cosmos_cosmos_sdk_types.Coin `protobuf:"bytes,2,opt,name=coin_in,json=coinIn,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Coin" json:"coinIn" yaml:"coinIn"` + CoinIn github_com_cosmos_cosmos_sdk_types.Coin `protobuf:"bytes,2,opt,name=coin_in,json=coinIn,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Coin" json:"coin_in" yaml:"coin_in"` // 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 - 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:"takerCoinOut" yaml:"takerCoinOut"` + 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"` } func (m *MsgPlaceLimitOrderResponse) Reset() { *m = MsgPlaceLimitOrderResponse{} } @@ -738,8 +738,8 @@ type MsgMultiHopSwap struct { 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 github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,4,opt,name=amount_in,json=amountIn,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"amountIn" yaml:"amountIn"` - ExitLimitPrice github_com_neutron_org_neutron_utils_math.PrecDec `protobuf:"bytes,5,opt,name=exit_limit_price,json=exitLimitPrice,proto3,customtype=github.com/neutron-org/neutron/utils/math.PrecDec" json:"exitLimitPrice" yaml:"exitLimitPrice"` + AmountIn github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,4,opt,name=amount_in,json=amountIn,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"amount_in" yaml:"amount_in"` + ExitLimitPrice github_com_neutron_org_neutron_utils_math.PrecDec `protobuf:"bytes,5,opt,name=exit_limit_price,json=exitLimitPrice,proto3,customtype=github.com/neutron-org/neutron/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"` @@ -807,7 +807,7 @@ 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:"coinOut"` + 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"` } func (m *MsgMultiHopSwapResponse) Reset() { *m = MsgMultiHopSwapResponse{} } @@ -960,101 +960,101 @@ func init() { func init() { proto.RegisterFile("neutron/dex/tx.proto", fileDescriptor_a489f6e187d5e074) } var fileDescriptor_a489f6e187d5e074 = []byte{ - // 1494 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0x4d, 0x6c, 0x1b, 0xc5, - 0x17, 0xcf, 0xc6, 0xa9, 0x3f, 0x26, 0x5f, 0xee, 0x24, 0xfd, 0x67, 0xe3, 0xfe, 0xff, 0xb6, 0xb5, - 0xfd, 0xd3, 0x9a, 0x88, 0xda, 0x4d, 0x10, 0x3d, 0x84, 0x93, 0x9d, 0xa4, 0xe0, 0xd6, 0xae, 0xa3, - 0xad, 0xcb, 0xa7, 0xc4, 0x6a, 0x6c, 0x4f, 0xed, 0x25, 0xf6, 0xce, 0x6a, 0x67, 0x9c, 0x3a, 0x42, - 0xe2, 0x00, 0x37, 0x90, 0xaa, 0xde, 0xb8, 0x72, 0x42, 0x70, 0xeb, 0x01, 0x71, 0xe5, 0x84, 0xd4, - 0x63, 0xc5, 0x01, 0x21, 0x0e, 0x06, 0xb5, 0x87, 0x4a, 0x3d, 0x46, 0xe2, 0x8e, 0x66, 0x76, 0xbc, - 0xde, 0x5d, 0x37, 0x4d, 0xd3, 0x02, 0x97, 0x66, 0xe7, 0xbd, 0xdf, 0xbc, 0xf7, 0xe6, 0x37, 0xef, - 0x63, 0x5c, 0xb0, 0x6c, 0xe1, 0x3e, 0x73, 0x88, 0x55, 0x68, 0xe1, 0x41, 0x81, 0x0d, 0xf2, 0xb6, - 0x43, 0x18, 0x81, 0xb3, 0x52, 0x9a, 0x6f, 0xe1, 0x41, 0x6a, 0xb9, 0x4d, 0xda, 0x44, 0xc8, 0x0b, - 0xfc, 0xcb, 0x85, 0xa4, 0xd2, 0x4d, 0x42, 0x7b, 0x84, 0x16, 0x1a, 0x88, 0xe2, 0xc2, 0xfe, 0x7a, - 0x03, 0x33, 0xb4, 0x5e, 0x68, 0x12, 0xd3, 0x92, 0xfa, 0x4c, 0x9b, 0x90, 0x76, 0x17, 0x17, 0xc4, - 0xaa, 0xd1, 0xbf, 0x55, 0x60, 0x66, 0x0f, 0x53, 0x86, 0x7a, 0xb6, 0x04, 0x9c, 0x46, 0x3d, 0xd3, - 0x22, 0x05, 0xf1, 0xaf, 0x14, 0xa9, 0xfe, 0x60, 0x6c, 0xe4, 0xa0, 0x1e, 0x95, 0x9a, 0x15, 0xe9, - 0xad, 0x47, 0xdb, 0x85, 0xfd, 0x75, 0xfe, 0x47, 0x2a, 0x56, 0x5d, 0x85, 0xe1, 0xc6, 0xe7, 0x2e, - 0x5c, 0x95, 0xf6, 0x26, 0x58, 0xd8, 0xc6, 0x36, 0xa1, 0x26, 0xab, 0xd9, 0xcc, 0x24, 0x16, 0x85, - 0xaf, 0x82, 0x64, 0xcb, 0xa4, 0xa8, 0xd1, 0xc5, 0x06, 0xea, 0x33, 0x42, 0x6f, 0x23, 0x5b, 0x55, - 0xb2, 0x4a, 0x2e, 0xae, 0x2f, 0x4a, 0x79, 0x51, 0x8a, 0xb5, 0x9f, 0x22, 0x00, 0x54, 0x69, 0x5b, - 0x1a, 0x80, 0x2a, 0x88, 0x35, 0x1d, 0x8c, 0x18, 0x71, 0xc4, 0x86, 0x84, 0x3e, 0x5a, 0xc2, 0x14, - 0x88, 0x3b, 0xb8, 0x89, 0xcd, 0x7d, 0xec, 0xa8, 0xd3, 0x42, 0xe5, 0xad, 0xe1, 0x0a, 0x88, 0x31, - 0xb2, 0x87, 0x2d, 0x03, 0xa9, 0x11, 0xa1, 0x8a, 0x8a, 0x65, 0x71, 0xac, 0x68, 0xa8, 0x33, 0x3e, - 0x45, 0x09, 0x7e, 0x0c, 0x12, 0xa8, 0x47, 0xfa, 0x16, 0xa3, 0x06, 0x52, 0x4f, 0x65, 0x23, 0xb9, - 0x44, 0xa9, 0x7a, 0x7f, 0x98, 0x99, 0xfa, 0x6d, 0x98, 0x39, 0xdf, 0x36, 0x59, 0xa7, 0xdf, 0xc8, - 0x37, 0x49, 0x4f, 0x9e, 0x53, 0xfe, 0xb9, 0x48, 0x5b, 0x7b, 0x05, 0x76, 0x60, 0x63, 0x9a, 0x2f, - 0x5b, 0xec, 0xc9, 0x30, 0x13, 0x97, 0x26, 0x8a, 0x87, 0xc3, 0xcc, 0xe2, 0x01, 0xea, 0x75, 0x37, - 0xb5, 0x91, 0x44, 0xd3, 0x3d, 0xa5, 0xdf, 0x57, 0x43, 0x8d, 0xbe, 0xa4, 0xaf, 0xd2, 0x84, 0xaf, - 0xd2, 0xd8, 0x57, 0x09, 0xbe, 0x06, 0x96, 0x98, 0xd9, 0xdc, 0x33, 0x4c, 0xab, 0x85, 0x07, 0x98, - 0x1a, 0xc8, 0x60, 0xc4, 0x68, 0xa8, 0xb1, 0x6c, 0x24, 0x17, 0xd1, 0x17, 0xb9, 0xaa, 0xec, 0x6a, - 0x8a, 0x75, 0x52, 0x82, 0x10, 0xcc, 0xdc, 0xc2, 0x98, 0xaa, 0xf1, 0x6c, 0x24, 0x37, 0xa3, 0x8b, - 0x6f, 0xf8, 0x06, 0x88, 0x11, 0xf7, 0x1a, 0xd5, 0x44, 0x36, 0x92, 0x9b, 0xdd, 0x38, 0x9b, 0xf7, - 0x25, 0x69, 0x3e, 0x78, 0xd3, 0xfa, 0x08, 0xab, 0xfd, 0x30, 0x0d, 0xe0, 0xf8, 0x1e, 0x75, 0x4c, - 0x6d, 0x62, 0x51, 0x0c, 0xef, 0x28, 0x00, 0x3a, 0x98, 0x62, 0x67, 0x1f, 0x5f, 0x32, 0x5a, 0xae, - 0x12, 0xb7, 0x54, 0x45, 0xb0, 0x60, 0x9c, 0x98, 0x85, 0xd3, 0x23, 0x5b, 0xdb, 0x23, 0x53, 0x87, - 0xc3, 0x8c, 0xea, 0xd2, 0x31, 0xa1, 0xd2, 0xf4, 0x49, 0xb8, 0x3f, 0xa0, 0x75, 0x5f, 0x40, 0xd3, - 0x2f, 0x19, 0xd0, 0xfa, 0xd1, 0x01, 0xad, 0x3f, 0x25, 0x20, 0x9f, 0xec, 0xc7, 0x69, 0x30, 0x5f, - 0xa5, 0xed, 0x77, 0x4d, 0xd6, 0x69, 0x39, 0xe8, 0x36, 0xea, 0xfe, 0x6b, 0x35, 0xf0, 0xb9, 0x02, - 0x92, 0xb4, 0x83, 0x1c, 0x4c, 0x79, 0x92, 0x38, 0xb8, 0x47, 0xf6, 0xb1, 0xac, 0x85, 0xf7, 0x4f, - 0x4c, 0xc4, 0x82, 0x6b, 0xa9, 0x4e, 0x74, 0x61, 0xe7, 0x70, 0x98, 0x39, 0xe3, 0xb2, 0x10, 0x94, - 0x6b, 0x7a, 0x08, 0x78, 0x54, 0xc6, 0x46, 0x9f, 0x9d, 0xb1, 0xb1, 0x71, 0xc6, 0x6a, 0x2b, 0xe0, - 0x4c, 0x80, 0xc0, 0x51, 0xf2, 0x69, 0xdf, 0xcc, 0x88, 0x9c, 0xdc, 0xed, 0xa2, 0x26, 0xae, 0x98, - 0x3d, 0x93, 0xd5, 0x9c, 0x16, 0x76, 0x5e, 0x90, 0xdf, 0x55, 0x10, 0x77, 0x69, 0x34, 0x2d, 0x49, - 0xb0, 0x4b, 0x6b, 0xd9, 0x82, 0x67, 0x41, 0xc2, 0x55, 0x91, 0x3e, 0x93, 0x1c, 0xbb, 0xd8, 0x5a, - 0x9f, 0xc1, 0x3c, 0x58, 0x1e, 0x9f, 0xcf, 0x30, 0x2d, 0x7e, 0x3c, 0x8e, 0x3b, 0x95, 0x55, 0x72, - 0x11, 0x3d, 0xe9, 0x1d, 0xb0, 0x6c, 0xd5, 0x09, 0xc7, 0x7b, 0xdd, 0x82, 0x3b, 0x8a, 0x71, 0x63, - 0x2f, 0xde, 0x2d, 0xca, 0x56, 0xb8, 0x5b, 0x94, 0x2d, 0xaf, 0x5b, 0x94, 0x2d, 0xb8, 0x09, 0x00, - 0xe1, 0x94, 0x18, 0x7c, 0xaf, 0x1a, 0xcf, 0x2a, 0xb9, 0x85, 0x50, 0xb9, 0x8f, 0x69, 0xab, 0x1f, - 0xd8, 0x58, 0x4f, 0x90, 0xd1, 0x27, 0xac, 0x82, 0x45, 0x3c, 0xb0, 0x4d, 0x07, 0xf1, 0xfa, 0x37, - 0xf8, 0xd0, 0x51, 0x13, 0x59, 0x25, 0x37, 0xbb, 0x91, 0xca, 0xbb, 0x13, 0x29, 0x3f, 0x9a, 0x48, - 0xf9, 0xfa, 0x68, 0x22, 0x95, 0xe2, 0xf7, 0x87, 0x19, 0xe5, 0xee, 0xef, 0x19, 0x45, 0x5f, 0x18, - 0x6f, 0xe6, 0x6a, 0xf8, 0x09, 0x58, 0xe8, 0xa1, 0x81, 0x21, 0x8f, 0xce, 0x09, 0x02, 0xe2, 0xec, - 0x37, 0xf9, 0x8e, 0x13, 0x9d, 0x7d, 0xae, 0x87, 0x06, 0x45, 0x61, 0xa6, 0xd6, 0x67, 0x87, 0xc3, - 0xcc, 0x92, 0x7b, 0x7e, 0xbf, 0x54, 0xd3, 0x03, 0x20, 0xed, 0x97, 0x69, 0x90, 0x9a, 0x4c, 0x14, - 0xaf, 0x89, 0xa5, 0x01, 0x60, 0x0e, 0xb2, 0x9a, 0x1d, 0x7c, 0x0d, 0x1f, 0xc8, 0x9c, 0xf1, 0x49, - 0xe0, 0xa7, 0x20, 0xc6, 0x07, 0x32, 0xbf, 0xb0, 0x69, 0x41, 0xc1, 0x6a, 0x5e, 0x0e, 0x48, 0x3e, - 0xb4, 0xf3, 0x72, 0x68, 0xe7, 0xb7, 0x88, 0x69, 0x95, 0xae, 0xca, 0xbb, 0xbc, 0xf0, 0x1c, 0xe7, - 0xe1, 0x1b, 0x9e, 0x0c, 0x33, 0x51, 0x6e, 0x5c, 0x5c, 0xe5, 0xbc, 0x7b, 0x14, 0x77, 0xad, 0xe9, - 0x52, 0x01, 0xbf, 0x52, 0xc0, 0x02, 0x43, 0x7b, 0xd8, 0x31, 0x44, 0x18, 0x9c, 0xbc, 0xc8, 0x71, - 0x71, 0xbc, 0x73, 0xf2, 0x38, 0xe6, 0x84, 0x0f, 0xbe, 0x08, 0x10, 0xeb, 0x97, 0x6a, 0x7a, 0x00, - 0xa4, 0xbd, 0x07, 0xce, 0xfa, 0x4a, 0xf3, 0x8a, 0xd9, 0xed, 0xe2, 0xd6, 0x73, 0x55, 0x62, 0x06, - 0xcc, 0x4a, 0x82, 0x8d, 0x3d, 0x7c, 0x20, 0x8b, 0xd1, 0xc7, 0xb9, 0xf6, 0x0a, 0x38, 0xf7, 0x0c, - 0xcb, 0x5e, 0x0b, 0xd8, 0x05, 0x4b, 0x55, 0xda, 0xde, 0x42, 0x56, 0x13, 0x77, 0xff, 0x1e, 0xc7, - 0xff, 0x13, 0x47, 0x0a, 0x5b, 0xf4, 0x1c, 0x9e, 0x03, 0xf3, 0xd5, 0x7e, 0x97, 0x99, 0x6f, 0x13, - 0x5b, 0x27, 0x7d, 0x86, 0x79, 0xc7, 0xea, 0x10, 0x9b, 0xba, 0x23, 0x4f, 0x17, 0xdf, 0xda, 0xd7, - 0x11, 0xb0, 0x58, 0xa5, 0xed, 0x11, 0xf0, 0xc6, 0x6d, 0x64, 0xbf, 0x60, 0x57, 0xda, 0x00, 0x51, - 0x87, 0xbb, 0xa1, 0x6a, 0x44, 0x0c, 0xeb, 0x54, 0xa0, 0x7a, 0x03, 0x91, 0xe8, 0x12, 0x19, 0xec, - 0x30, 0x33, 0xff, 0x6c, 0x87, 0xb9, 0xa3, 0x80, 0x24, 0x1e, 0x98, 0xcc, 0xe8, 0x72, 0xaa, 0x0c, - 0xdb, 0x31, 0x9b, 0x58, 0xb4, 0xbe, 0x44, 0xa9, 0x25, 0x7d, 0xae, 0xfb, 0x7c, 0xca, 0xe0, 0x2f, - 0x12, 0xa7, 0x3d, 0xfa, 0x2e, 0xf4, 0x99, 0xd9, 0xa5, 0x85, 0x1e, 0x62, 0x9d, 0xfc, 0xae, 0x83, - 0x9b, 0xdb, 0xb8, 0xc9, 0xc7, 0x0d, 0x37, 0x2a, 0xe8, 0xdf, 0xe5, 0x26, 0xc7, 0xe3, 0x26, 0x28, - 0xd7, 0xf4, 0x10, 0x10, 0x9e, 0x07, 0x8b, 0x36, 0x6f, 0xc7, 0x0d, 0x4c, 0x99, 0x21, 0x08, 0x51, - 0xa3, 0xe2, 0x65, 0x3a, 0xcf, 0xc5, 0x25, 0x4c, 0x99, 0x20, 0x4b, 0xfb, 0x52, 0x01, 0x2b, 0xa1, - 0x2b, 0xf2, 0xfa, 0x81, 0x0d, 0xe2, 0x5e, 0xa1, 0x29, 0xc7, 0x15, 0xda, 0xe6, 0xc9, 0x0b, 0x4d, - 0x74, 0x93, 0x5a, 0x9f, 0xe9, 0xa3, 0x0f, 0xed, 0x3b, 0x45, 0x24, 0xcc, 0x4d, 0xbb, 0x85, 0x18, - 0xde, 0x15, 0x0f, 0x76, 0x78, 0x19, 0x24, 0x50, 0x9f, 0x75, 0x88, 0x63, 0x32, 0xd9, 0x94, 0x4a, - 0xea, 0xcf, 0xdf, 0x5f, 0x5c, 0x96, 0x91, 0x14, 0x5b, 0x2d, 0x07, 0x53, 0x7a, 0x83, 0x39, 0xa6, - 0xd5, 0xd6, 0xc7, 0x50, 0x78, 0x19, 0x44, 0xdd, 0x27, 0xbf, 0x6c, 0x56, 0x4b, 0x81, 0x94, 0x71, - 0x8d, 0x97, 0x12, 0x3c, 0xea, 0x6f, 0x1f, 0xdf, 0x5b, 0x53, 0x74, 0x89, 0xde, 0x3c, 0xff, 0xd9, - 0xe3, 0x7b, 0x6b, 0x63, 0x3b, 0x5f, 0x3c, 0xbe, 0xb7, 0xb6, 0xc4, 0x7f, 0x3f, 0x84, 0xe2, 0xd2, - 0x56, 0x05, 0x71, 0x7e, 0xd1, 0x88, 0xb8, 0xb5, 0x01, 0x58, 0x08, 0x0e, 0x14, 0xf8, 0x1f, 0x00, - 0xdf, 0xaa, 0xd5, 0xb6, 0x8d, 0x7a, 0xb9, 0x62, 0x6c, 0x15, 0xaf, 0x6f, 0xed, 0x54, 0x2a, 0x3b, - 0xdb, 0xc9, 0x29, 0x98, 0x04, 0x73, 0x57, 0xca, 0x95, 0x8a, 0x51, 0xd3, 0x8d, 0x6b, 0xe5, 0x4a, - 0x25, 0xa9, 0xc0, 0x15, 0xb0, 0x54, 0xae, 0x56, 0x77, 0xb6, 0xcb, 0xc5, 0xfa, 0x0e, 0x17, 0xbb, - 0xe8, 0xe4, 0x34, 0x87, 0x5e, 0xbd, 0x79, 0xa3, 0x6e, 0x94, 0xaf, 0x1b, 0xf5, 0x72, 0x75, 0x27, - 0x19, 0x81, 0xa7, 0xc1, 0xbc, 0x67, 0x54, 0x88, 0x66, 0x36, 0xfe, 0x9c, 0x01, 0x91, 0x2a, 0x6d, - 0xc3, 0x2d, 0x10, 0x1b, 0xfd, 0xd4, 0x58, 0x09, 0x96, 0x8a, 0xf7, 0x76, 0x4d, 0x65, 0x8e, 0x50, - 0x78, 0xf7, 0x5f, 0x01, 0xc0, 0xf7, 0x5c, 0x4b, 0x85, 0xe1, 0x63, 0x5d, 0x4a, 0x3b, 0x5a, 0xe7, - 0x59, 0xfb, 0x10, 0x2c, 0x86, 0x5f, 0x28, 0x13, 0x11, 0x84, 0x00, 0xa9, 0x0b, 0xc7, 0x00, 0x3c, - 0xe3, 0xfb, 0x40, 0x3d, 0xb2, 0xfb, 0xe6, 0x8e, 0x0a, 0x2e, 0x8c, 0x4c, 0x5d, 0x7a, 0x5e, 0xa4, - 0xe7, 0xf7, 0x23, 0x90, 0x9c, 0x68, 0xba, 0xd9, 0xb0, 0x95, 0x30, 0x22, 0x95, 0x3b, 0x0e, 0xe1, - 0xd9, 0xd7, 0xc1, 0x5c, 0xa0, 0x7b, 0xfe, 0x37, 0xbc, 0xd3, 0xaf, 0x4d, 0xfd, 0xff, 0x59, 0x5a, - 0xbf, 0xcd, 0x40, 0x81, 0x4d, 0xd8, 0xf4, 0x6b, 0x27, 0x6d, 0x3e, 0x2d, 0xe3, 0x4b, 0xdb, 0xf7, - 0x1f, 0xa6, 0x95, 0x07, 0x0f, 0xd3, 0xca, 0x1f, 0x0f, 0xd3, 0xca, 0xdd, 0x47, 0xe9, 0xa9, 0x07, - 0x8f, 0xd2, 0x53, 0xbf, 0x3e, 0x4a, 0x4f, 0x7d, 0xb0, 0x76, 0x4c, 0xdb, 0x1b, 0xb8, 0xff, 0x53, - 0xc0, 0xfb, 0x42, 0x23, 0x2a, 0x9e, 0x52, 0xaf, 0xff, 0x15, 0x00, 0x00, 0xff, 0xff, 0x2e, 0xd9, - 0xb3, 0xc0, 0x45, 0x10, 0x00, 0x00, + // 1501 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0x4f, 0x6c, 0x1b, 0x45, + 0x17, 0xcf, 0xc6, 0xa9, 0xff, 0x4c, 0x12, 0xc7, 0x9d, 0xa4, 0x5f, 0x36, 0xee, 0xf7, 0xd9, 0xd6, + 0xf6, 0xa3, 0x35, 0x11, 0xb5, 0xeb, 0x20, 0x7a, 0x68, 0x4f, 0x76, 0x92, 0x82, 0xa9, 0x5d, 0x47, + 0x5b, 0x57, 0x40, 0x11, 0xac, 0xc6, 0xf6, 0xd4, 0x5e, 0xc5, 0xde, 0x59, 0x76, 0xc6, 0xa9, 0x73, + 0x02, 0x71, 0x41, 0x42, 0x1c, 0x2a, 0xae, 0xdc, 0x11, 0x48, 0x1c, 0x7a, 0xe0, 0xc4, 0x95, 0x4b, + 0xb9, 0x55, 0x9c, 0x10, 0x12, 0x06, 0xb5, 0x87, 0x4a, 0x3d, 0x46, 0xe2, 0x8e, 0x66, 0x76, 0xbc, + 0x5e, 0xaf, 0x9b, 0xa4, 0x69, 0x81, 0x4b, 0x3c, 0xfb, 0x7e, 0x6f, 0xde, 0x7b, 0xf3, 0x9b, 0xf7, + 0x67, 0x37, 0x60, 0xc5, 0xc2, 0x7d, 0xe6, 0x10, 0x2b, 0xdf, 0xc2, 0x83, 0x3c, 0x1b, 0xe4, 0x6c, + 0x87, 0x30, 0x02, 0xe7, 0xa5, 0x34, 0xd7, 0xc2, 0x83, 0xe4, 0x4a, 0x9b, 0xb4, 0x89, 0x90, 0xe7, + 0xf9, 0xca, 0x55, 0x49, 0xa6, 0x9a, 0x84, 0xf6, 0x08, 0xcd, 0x37, 0x10, 0xc5, 0xf9, 0xbd, 0x42, + 0x03, 0x33, 0x54, 0xc8, 0x37, 0x89, 0x69, 0x49, 0x3c, 0xdd, 0x26, 0xa4, 0xdd, 0xc5, 0x79, 0xf1, + 0xd4, 0xe8, 0xdf, 0xc9, 0x33, 0xb3, 0x87, 0x29, 0x43, 0x3d, 0x5b, 0x2a, 0x9c, 0x46, 0x3d, 0xd3, + 0x22, 0x79, 0xf1, 0x57, 0x8a, 0x54, 0x7f, 0x30, 0x36, 0x72, 0x50, 0x8f, 0x4a, 0x64, 0x55, 0x7a, + 0xeb, 0xd1, 0x76, 0x7e, 0xaf, 0xc0, 0x7f, 0x24, 0xb0, 0xe6, 0x02, 0x86, 0x1b, 0x9f, 0xfb, 0xe0, + 0x42, 0xda, 0x55, 0x10, 0xdf, 0xc2, 0x36, 0xa1, 0x26, 0xab, 0xd9, 0xcc, 0x24, 0x16, 0x85, 0xaf, + 0x82, 0x44, 0xcb, 0xa4, 0xa8, 0xd1, 0xc5, 0x06, 0xea, 0x33, 0x42, 0xef, 0x22, 0x5b, 0x55, 0x32, + 0x4a, 0x36, 0xaa, 0x2f, 0x49, 0x79, 0x51, 0x8a, 0xb5, 0x9f, 0x42, 0x00, 0x54, 0x69, 0x5b, 0x1a, + 0x80, 0x2a, 0x88, 0x34, 0x1d, 0x8c, 0x18, 0x71, 0xc4, 0x86, 0x98, 0x3e, 0x7a, 0x84, 0x49, 0x10, + 0x75, 0x70, 0x13, 0x9b, 0x7b, 0xd8, 0x51, 0x67, 0x05, 0xe4, 0x3d, 0xc3, 0x55, 0x10, 0x61, 0x64, + 0x17, 0x5b, 0x06, 0x52, 0x43, 0x02, 0x0a, 0x8b, 0xc7, 0xe2, 0x18, 0x68, 0xa8, 0x73, 0x3e, 0xa0, + 0x04, 0xbb, 0x20, 0x86, 0x7a, 0xa4, 0x6f, 0x31, 0x6a, 0x20, 0xf5, 0x54, 0x26, 0x94, 0x8d, 0x95, + 0x6a, 0x0f, 0x86, 0xe9, 0x99, 0x5f, 0x87, 0xe9, 0xf3, 0x6d, 0x93, 0x75, 0xfa, 0x8d, 0x5c, 0x93, + 0xf4, 0xe4, 0x39, 0xe5, 0xcf, 0x45, 0xda, 0xda, 0xcd, 0xb3, 0x7d, 0x1b, 0xd3, 0x5c, 0xd9, 0x62, + 0x4f, 0x87, 0xe9, 0xb1, 0x89, 0x83, 0x61, 0x3a, 0xb1, 0x8f, 0x7a, 0xdd, 0x2b, 0x9a, 0x27, 0xd2, + 0xf4, 0xa8, 0x5c, 0x17, 0xfd, 0xde, 0x1a, 0x6a, 0xf8, 0x65, 0xbd, 0x35, 0xa6, 0xbd, 0x35, 0xc6, + 0xde, 0x4a, 0xf0, 0x35, 0xb0, 0xcc, 0xcc, 0xe6, 0xae, 0x61, 0x5a, 0x2d, 0x3c, 0xc0, 0xd4, 0x40, + 0x06, 0x23, 0x46, 0x43, 0x8d, 0x64, 0x42, 0xd9, 0x90, 0xbe, 0xc4, 0xa1, 0xb2, 0x8b, 0x14, 0xeb, + 0xa4, 0x04, 0x21, 0x98, 0xbb, 0x83, 0x31, 0x55, 0xa3, 0x99, 0x50, 0x76, 0x4e, 0x17, 0x6b, 0xf8, + 0x06, 0x88, 0x10, 0xf7, 0x2a, 0xd5, 0x58, 0x26, 0x94, 0x9d, 0xdf, 0x38, 0x9b, 0xf3, 0x25, 0x6a, + 0x6e, 0xf2, 0xb6, 0xf5, 0x91, 0xae, 0xf6, 0xc3, 0x2c, 0x80, 0xe3, 0xbb, 0xd4, 0x31, 0xb5, 0x89, + 0x45, 0x31, 0xbc, 0xa7, 0x00, 0xe8, 0x60, 0x8a, 0x9d, 0x3d, 0x7c, 0xc9, 0x68, 0xb9, 0x20, 0x6e, + 0xa9, 0x8a, 0xe0, 0x01, 0x9d, 0x98, 0x87, 0x67, 0xd8, 0x3a, 0x18, 0xa6, 0xd7, 0x5c, 0x42, 0xa6, + 0x31, 0x4d, 0x3f, 0x3d, 0x12, 0x6e, 0x8d, 0x64, 0xfe, 0x90, 0x0a, 0xbe, 0x90, 0x66, 0x5f, 0x32, + 0xa4, 0xc2, 0x11, 0x21, 0x15, 0x9e, 0x15, 0x52, 0xc1, 0x0b, 0x49, 0xfb, 0x71, 0x16, 0x2c, 0x56, + 0x69, 0xfb, 0x1d, 0x93, 0x75, 0x5a, 0x0e, 0xba, 0x8b, 0xba, 0xff, 0x5a, 0x2d, 0x7c, 0xa6, 0x80, + 0x04, 0xed, 0x20, 0x07, 0x53, 0x9e, 0x28, 0x0e, 0xee, 0x91, 0x3d, 0x2c, 0x6b, 0xe2, 0x83, 0x13, + 0x53, 0x31, 0x65, 0xe9, 0x60, 0x98, 0x5e, 0x75, 0x89, 0x08, 0x22, 0x9a, 0x1e, 0x77, 0x45, 0x75, + 0xa2, 0x0b, 0xc1, 0x61, 0x99, 0x1b, 0x3e, 0x3a, 0x73, 0x23, 0xe3, 0xcc, 0xd5, 0x56, 0xc1, 0x99, + 0x09, 0x12, 0x47, 0x49, 0xa8, 0x7d, 0x37, 0x27, 0x72, 0x73, 0xa7, 0x8b, 0x9a, 0xb8, 0x62, 0xf6, + 0x4c, 0x56, 0x73, 0x5a, 0xd8, 0x79, 0x41, 0x8e, 0xd7, 0x40, 0xd4, 0xa5, 0xd2, 0xb4, 0x24, 0xc9, + 0x2e, 0xb5, 0x65, 0x0b, 0x9e, 0x05, 0x31, 0x17, 0x22, 0x7d, 0x26, 0x79, 0x76, 0x75, 0x6b, 0x7d, + 0x06, 0x73, 0x60, 0x65, 0x7c, 0x3e, 0xc3, 0xb4, 0xf8, 0xf1, 0xb8, 0xde, 0xa9, 0x8c, 0x92, 0x0d, + 0xe9, 0x09, 0xef, 0x80, 0x65, 0xab, 0x4e, 0xb8, 0xbe, 0xd7, 0x37, 0xb8, 0xa3, 0x08, 0x37, 0xf6, + 0xe2, 0x7d, 0xc3, 0x30, 0xad, 0x60, 0xdf, 0x30, 0x4c, 0xcb, 0xeb, 0x1b, 0x65, 0x0b, 0x5e, 0x01, + 0x80, 0x70, 0x52, 0x0c, 0xbe, 0x5b, 0x8d, 0x66, 0x94, 0x6c, 0x3c, 0x50, 0xf8, 0x63, 0xe2, 0xea, + 0xfb, 0x36, 0xd6, 0x63, 0x64, 0xb4, 0x84, 0x55, 0xb0, 0x84, 0x07, 0xb6, 0xe9, 0x20, 0xde, 0x09, + 0x0c, 0x3e, 0x82, 0xd4, 0x58, 0x46, 0xc9, 0xce, 0x6f, 0x24, 0x73, 0xee, 0x7c, 0xca, 0x8d, 0xe6, + 0x53, 0xae, 0x3e, 0x9a, 0x4f, 0xa5, 0xe8, 0x83, 0x61, 0x5a, 0xb9, 0xf7, 0x7b, 0x5a, 0xd1, 0xe3, + 0xe3, 0xcd, 0x1c, 0x86, 0x1f, 0x83, 0x78, 0x0f, 0x0d, 0x0c, 0x19, 0x26, 0xa7, 0x08, 0x88, 0xd3, + 0xbf, 0xc7, 0x77, 0x9c, 0xe8, 0xf4, 0x01, 0x3b, 0x07, 0xc3, 0xf4, 0x19, 0x97, 0x82, 0x49, 0xb9, + 0xa6, 0x2f, 0xf4, 0xd0, 0xa0, 0x28, 0x9e, 0x6b, 0x7d, 0xa6, 0xfd, 0x36, 0x0b, 0x92, 0xd3, 0xe9, + 0xe2, 0xb5, 0xb4, 0x14, 0x00, 0xcc, 0x41, 0x56, 0xb3, 0x83, 0xaf, 0xe3, 0x7d, 0x99, 0x39, 0x3e, + 0x09, 0xfc, 0x44, 0x01, 0x11, 0x3e, 0xa3, 0xf9, 0xbd, 0xcd, 0x0a, 0x1e, 0xd6, 0x72, 0x72, 0x66, + 0xf2, 0x39, 0x9e, 0x93, 0x73, 0x3c, 0xb7, 0x49, 0x4c, 0xab, 0x54, 0x91, 0x57, 0x7a, 0xe1, 0x39, + 0x0e, 0xc5, 0x37, 0x3c, 0x1d, 0xa6, 0x47, 0xc6, 0x0f, 0x86, 0xe9, 0xb8, 0x7b, 0x1c, 0x29, 0xd0, + 0xf4, 0x30, 0x5f, 0x95, 0x2d, 0xf8, 0x95, 0x02, 0xe2, 0x0c, 0xed, 0x62, 0xc7, 0x10, 0x10, 0xe7, + 0x30, 0x74, 0x5c, 0x24, 0xb7, 0x4f, 0x1e, 0x49, 0xc0, 0xc7, 0x98, 0xdf, 0x49, 0xb9, 0xa6, 0x2f, + 0x08, 0x01, 0xdf, 0xc5, 0xf9, 0x7d, 0x17, 0x9c, 0xf5, 0xd5, 0xe9, 0x35, 0xb3, 0xdb, 0xc5, 0xad, + 0xe7, 0x2a, 0xcb, 0x34, 0x98, 0x97, 0x3c, 0x1b, 0xbb, 0x78, 0x5f, 0x56, 0xa6, 0x8f, 0x7a, 0xed, + 0x15, 0x70, 0xee, 0x08, 0xcb, 0x5e, 0x3f, 0xd8, 0x01, 0xcb, 0x55, 0xda, 0xde, 0x44, 0x56, 0x13, + 0x77, 0xff, 0x1e, 0xc7, 0xff, 0x13, 0x47, 0x0a, 0x5a, 0xf4, 0x1c, 0x9e, 0x03, 0x8b, 0xd5, 0x7e, + 0x97, 0x99, 0x6f, 0x11, 0x5b, 0x27, 0x7d, 0x86, 0x79, 0xfb, 0xea, 0x10, 0x9b, 0xba, 0x73, 0x50, + 0x17, 0x6b, 0xed, 0xeb, 0x10, 0x58, 0xaa, 0xd2, 0xf6, 0x48, 0xf1, 0xe6, 0x5d, 0x64, 0xbf, 0x60, + 0x8b, 0xda, 0x00, 0x61, 0x87, 0xbb, 0xa1, 0x6a, 0x48, 0x4c, 0xf0, 0xe4, 0x44, 0x21, 0x4f, 0x44, + 0xa2, 0x4b, 0xcd, 0xc9, 0x76, 0x33, 0xf7, 0x4f, 0xb7, 0x9b, 0x2f, 0x15, 0x90, 0xc0, 0x03, 0x93, + 0x19, 0x5d, 0x4e, 0x96, 0x61, 0x3b, 0x66, 0x13, 0x8b, 0x4e, 0x18, 0x2b, 0x75, 0xa4, 0xd7, 0x82, + 0xcf, 0xab, 0x0c, 0xff, 0x22, 0x71, 0xda, 0xa3, 0x75, 0xbe, 0xcf, 0xcc, 0x2e, 0xcd, 0xf7, 0x10, + 0xeb, 0xe4, 0x76, 0x1c, 0xdc, 0xdc, 0xc2, 0x4d, 0x3e, 0x81, 0x82, 0x46, 0xc7, 0x13, 0x28, 0x88, + 0x68, 0xbc, 0xf1, 0x98, 0x4c, 0xdc, 0xd6, 0x0e, 0x17, 0xc0, 0xf3, 0x60, 0xc9, 0xe6, 0x1d, 0xba, + 0x81, 0x29, 0x33, 0x04, 0x2d, 0x6a, 0x58, 0xbc, 0xb8, 0x2e, 0x72, 0x71, 0x09, 0x53, 0x26, 0x28, + 0xd3, 0xbe, 0x50, 0xc0, 0x6a, 0xe0, 0xa2, 0xbc, 0xe6, 0xf0, 0x11, 0x88, 0x7a, 0x25, 0xa7, 0x1c, + 0x57, 0x72, 0x57, 0x4f, 0x5e, 0x72, 0x9e, 0x75, 0x5d, 0xb4, 0x01, 0x5e, 0x4e, 0xdf, 0x2a, 0x22, + 0x6f, 0x6e, 0xd9, 0x2d, 0xc4, 0xf0, 0x8e, 0x78, 0xa1, 0x87, 0x97, 0x41, 0x0c, 0xf5, 0x59, 0x87, + 0x38, 0x26, 0x93, 0x2d, 0xaa, 0xa4, 0xfe, 0xfc, 0xfd, 0xc5, 0x15, 0x19, 0x4a, 0xb1, 0xd5, 0x72, + 0x30, 0xa5, 0x37, 0x99, 0x63, 0x5a, 0x6d, 0x7d, 0xac, 0x0a, 0x2f, 0x83, 0xb0, 0xfb, 0x49, 0x20, + 0x3b, 0xd7, 0xf2, 0x44, 0xe6, 0xb8, 0xc6, 0x4b, 0x31, 0x1e, 0xf6, 0x37, 0x4f, 0xee, 0xaf, 0x2b, + 0xba, 0xd4, 0xbe, 0x72, 0xfe, 0xd3, 0x27, 0xf7, 0xd7, 0xc7, 0x76, 0x3e, 0x7f, 0x72, 0x7f, 0x7d, + 0x99, 0x7f, 0x5f, 0x04, 0xe2, 0xd2, 0xd6, 0x04, 0x73, 0x7e, 0xd1, 0x88, 0xb9, 0xf5, 0x01, 0x88, + 0x4f, 0x8e, 0x18, 0xf8, 0x1f, 0x00, 0xdf, 0xac, 0xd5, 0xb6, 0x8c, 0x7a, 0xb9, 0x62, 0x6c, 0x16, + 0x6f, 0x6c, 0x6e, 0x57, 0x2a, 0xdb, 0x5b, 0x89, 0x19, 0x98, 0x00, 0x0b, 0xd7, 0xca, 0x95, 0x8a, + 0x51, 0xd3, 0x8d, 0xeb, 0xe5, 0x4a, 0x25, 0xa1, 0xc0, 0x55, 0xb0, 0x5c, 0xae, 0x56, 0xb7, 0xb7, + 0xca, 0xc5, 0xfa, 0x36, 0x17, 0xbb, 0xda, 0x89, 0x59, 0xae, 0xfa, 0xf6, 0xad, 0x9b, 0x75, 0xa3, + 0x7c, 0xc3, 0xa8, 0x97, 0xab, 0xdb, 0x89, 0x10, 0x3c, 0x0d, 0x16, 0x3d, 0xa3, 0x42, 0x34, 0xb7, + 0xf1, 0xe7, 0x1c, 0x08, 0x55, 0x69, 0x1b, 0x6e, 0x82, 0xc8, 0xe8, 0x53, 0x64, 0x75, 0xb2, 0x62, + 0xbc, 0xf7, 0xda, 0x64, 0xfa, 0x10, 0xc0, 0x4b, 0x80, 0x0a, 0x00, 0xbe, 0xd7, 0xb8, 0x64, 0x50, + 0x7d, 0x8c, 0x25, 0xb5, 0xc3, 0x31, 0xcf, 0xda, 0xfb, 0x60, 0x29, 0xf8, 0xd6, 0x32, 0x15, 0x41, + 0x40, 0x21, 0x79, 0xe1, 0x18, 0x05, 0xcf, 0xf8, 0x1e, 0x50, 0x0f, 0x6d, 0xc2, 0xd9, 0xc3, 0x82, + 0x0b, 0x6a, 0x26, 0x2f, 0x3d, 0xaf, 0xa6, 0xe7, 0xf7, 0x43, 0x90, 0x98, 0xea, 0xbd, 0x99, 0xa0, + 0x95, 0xa0, 0x46, 0x32, 0x7b, 0x9c, 0x86, 0x67, 0x5f, 0x07, 0x0b, 0x13, 0x4d, 0xf4, 0xbf, 0xc1, + 0x9d, 0x7e, 0x34, 0xf9, 0xff, 0xa3, 0x50, 0xbf, 0xcd, 0x89, 0x02, 0x9b, 0xb2, 0xe9, 0x47, 0xa7, + 0x6d, 0x3e, 0x2b, 0xe3, 0x4b, 0x5b, 0x0f, 0x1e, 0xa5, 0x94, 0x87, 0x8f, 0x52, 0xca, 0x1f, 0x8f, + 0x52, 0xca, 0xbd, 0xc7, 0xa9, 0x99, 0x87, 0x8f, 0x53, 0x33, 0xbf, 0x3c, 0x4e, 0xcd, 0xdc, 0x5e, + 0x3f, 0xa6, 0xf7, 0x0d, 0xdc, 0xff, 0x24, 0xf0, 0xc6, 0xd0, 0x08, 0x8b, 0x97, 0xab, 0xd7, 0xff, + 0x0a, 0x00, 0x00, 0xff, 0xff, 0xe4, 0xfc, 0x40, 0x56, 0x65, 0x10, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. From 2d5d67a2fa945a1bdba989e8be0e051ac14d3e5d Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Wed, 8 Nov 2023 15:44:36 +0200 Subject: [PATCH 223/307] fix json tags --- proto/neutron/dex/deposit_record.proto | 4 +- .../dex/limit_order_tranche_user.proto | 2 +- x/dex/types/deposit_record.pb.go | 49 +++++++-------- x/dex/types/limit_order_tranche_user.pb.go | 62 +++++++++---------- 4 files changed, 58 insertions(+), 59 deletions(-) diff --git a/proto/neutron/dex/deposit_record.proto b/proto/neutron/dex/deposit_record.proto index 86a6c26b9..f699d554a 100644 --- a/proto/neutron/dex/deposit_record.proto +++ b/proto/neutron/dex/deposit_record.proto @@ -8,10 +8,10 @@ import "neutron/dex/pair_id.proto"; message DepositRecord { PairID pair_id = 1; string shares_owned = 2 [ - (gogoproto.moretags) = "yaml:\"total_shares\"", + (gogoproto.moretags) = "yaml:\"shares_owned\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false, - (gogoproto.jsontag) = "total_shares" + (gogoproto.jsontag) = "shares_owned" ]; int64 center_tick_index = 3; int64 lower_tick_index = 4; diff --git a/proto/neutron/dex/limit_order_tranche_user.proto b/proto/neutron/dex/limit_order_tranche_user.proto index 51b8163ef..c8aade199 100644 --- a/proto/neutron/dex/limit_order_tranche_user.proto +++ b/proto/neutron/dex/limit_order_tranche_user.proto @@ -15,7 +15,7 @@ message LimitOrderTrancheUser { (gogoproto.moretags) = "yaml:\"shares_owned\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false, - (gogoproto.jsontag) = "sharesOwned" + (gogoproto.jsontag) = "shares_owned" ]; string shares_withdrawn = 6 [ (gogoproto.moretags) = "yaml:\"shares_withdrawn\"", diff --git a/x/dex/types/deposit_record.pb.go b/x/dex/types/deposit_record.pb.go index 6c773863e..897e3160b 100644 --- a/x/dex/types/deposit_record.pb.go +++ b/x/dex/types/deposit_record.pb.go @@ -26,7 +26,7 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type DepositRecord struct { PairId *PairID `protobuf:"bytes,1,opt,name=pair_id,json=pairId,proto3" json:"pair_id,omitempty"` - SharesOwned github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,opt,name=shares_owned,json=sharesOwned,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"total_shares" yaml:"total_shares"` + SharesOwned github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,opt,name=shares_owned,json=sharesOwned,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"shares_owned" yaml:"shares_owned"` CenterTickIndex int64 `protobuf:"varint,3,opt,name=center_tick_index,json=centerTickIndex,proto3" json:"center_tick_index,omitempty"` LowerTickIndex int64 `protobuf:"varint,4,opt,name=lower_tick_index,json=lowerTickIndex,proto3" json:"lower_tick_index,omitempty"` UpperTickIndex int64 `protobuf:"varint,5,opt,name=upper_tick_index,json=upperTickIndex,proto3" json:"upper_tick_index,omitempty"` @@ -108,30 +108,29 @@ func init() { func init() { proto.RegisterFile("neutron/dex/deposit_record.proto", fileDescriptor_250413eadaebbf28) } var fileDescriptor_250413eadaebbf28 = []byte{ - // 353 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x91, 0xb1, 0x4f, 0xc2, 0x40, - 0x14, 0xc6, 0x7b, 0x80, 0x18, 0x0b, 0x2a, 0x16, 0x87, 0xca, 0xd0, 0x36, 0x0c, 0xa6, 0x21, 0xd2, - 0x26, 0xba, 0x39, 0x12, 0x96, 0x4e, 0x9a, 0x46, 0x17, 0x97, 0xa6, 0xf4, 0xce, 0x72, 0x01, 0xfa, - 0x9a, 0xeb, 0x11, 0xca, 0x7f, 0xe1, 0x9f, 0x85, 0x1b, 0xa3, 0x71, 0x68, 0x0c, 0x6c, 0x8e, 0xfe, - 0x05, 0xa6, 0xd7, 0x1a, 0xcb, 0x74, 0x5f, 0xbe, 0xfb, 0xbd, 0xef, 0x25, 0xdf, 0x93, 0x8d, 0x88, - 0x2c, 0x39, 0x83, 0xc8, 0xc6, 0x24, 0xb5, 0x31, 0x89, 0x21, 0xa1, 0xdc, 0x63, 0x24, 0x00, 0x86, - 0xad, 0x98, 0x01, 0x07, 0xa5, 0x55, 0x12, 0x16, 0x26, 0x69, 0xef, 0x32, 0x84, 0x10, 0x84, 0x6f, - 0xe7, 0xaa, 0x40, 0x7a, 0x57, 0xd5, 0x90, 0xd8, 0xa7, 0xcc, 0xa3, 0xe5, 0x74, 0xff, 0xbd, 0x26, - 0x9f, 0x8e, 0x8b, 0x58, 0x57, 0xa4, 0x2a, 0x37, 0xf2, 0x71, 0x89, 0xa8, 0xc8, 0x40, 0x66, 0xeb, - 0xb6, 0x6b, 0x55, 0x36, 0x58, 0x8f, 0x3e, 0x65, 0xce, 0xd8, 0x6d, 0xe6, 0x8c, 0x83, 0x95, 0x54, - 0x6e, 0x27, 0x53, 0x9f, 0x91, 0xc4, 0x83, 0x55, 0x44, 0xb0, 0x5a, 0x33, 0x90, 0x79, 0x32, 0x7a, - 0xde, 0x64, 0xba, 0xf4, 0x99, 0xe9, 0xd7, 0x21, 0xe5, 0xd3, 0xe5, 0xc4, 0x0a, 0x60, 0x61, 0x07, - 0x90, 0x2c, 0x20, 0x29, 0x9f, 0x61, 0x82, 0x67, 0x36, 0x5f, 0xc7, 0x24, 0xb1, 0x9c, 0x88, 0x7f, - 0x67, 0x7a, 0x9b, 0x03, 0xf7, 0xe7, 0x5e, 0x91, 0xf5, 0x93, 0xe9, 0xdd, 0xb5, 0xbf, 0x98, 0xdf, - 0xf7, 0xab, 0x6e, 0xdf, 0x6d, 0x15, 0xe2, 0x21, 0xdf, 0xa4, 0x0c, 0xe4, 0x8b, 0x80, 0x44, 0x9c, - 0x30, 0x8f, 0xd3, 0x60, 0xe6, 0xd1, 0x08, 0x93, 0x54, 0xad, 0x1b, 0xc8, 0xac, 0xbb, 0xe7, 0xc5, - 0xc7, 0x13, 0x0d, 0x66, 0x4e, 0x6e, 0x2b, 0xa6, 0xdc, 0x99, 0xc3, 0xea, 0x10, 0x6d, 0x08, 0xf4, - 0x4c, 0xf8, 0x07, 0xe4, 0x32, 0x8e, 0x0f, 0xc9, 0xa3, 0x82, 0x14, 0xfe, 0x3f, 0xd9, 0x91, 0xeb, - 0xaf, 0x84, 0xa8, 0x4d, 0x03, 0x99, 0x0d, 0x37, 0x97, 0xa3, 0xf1, 0x66, 0xa7, 0xa1, 0xed, 0x4e, - 0x43, 0x5f, 0x3b, 0x0d, 0xbd, 0xed, 0x35, 0x69, 0xbb, 0xd7, 0xa4, 0x8f, 0xbd, 0x26, 0xbd, 0x0c, - 0x2a, 0x3d, 0x94, 0x65, 0x0e, 0x81, 0x85, 0x7f, 0xda, 0x4e, 0xc5, 0x65, 0x44, 0x1f, 0x93, 0xa6, - 0x38, 0xcc, 0xdd, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x63, 0x8f, 0x8e, 0x7e, 0xfa, 0x01, 0x00, - 0x00, + // 349 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x91, 0xbf, 0x4e, 0xeb, 0x30, + 0x18, 0xc5, 0xe3, 0xb6, 0xb7, 0x57, 0xb8, 0xfc, 0x29, 0x29, 0x43, 0xe8, 0x90, 0x44, 0x1d, 0x50, + 0x54, 0xd1, 0x44, 0x82, 0x8d, 0xb1, 0xea, 0x92, 0x09, 0x14, 0xc1, 0xc2, 0x12, 0xa5, 0xb1, 0x49, + 0xad, 0xb6, 0x71, 0x64, 0xbb, 0x6a, 0xfa, 0x16, 0x3c, 0x56, 0xd9, 0x3a, 0x22, 0x86, 0x08, 0xb5, + 0x1b, 0x23, 0x4f, 0x80, 0xe2, 0x04, 0x91, 0x4c, 0x3e, 0xdf, 0xf1, 0xcf, 0xc7, 0xd2, 0xf9, 0xa0, + 0x19, 0xe3, 0x95, 0x60, 0x34, 0x76, 0x10, 0x4e, 0x1d, 0x84, 0x13, 0xca, 0x89, 0xf0, 0x19, 0x0e, + 0x29, 0x43, 0x76, 0xc2, 0xa8, 0xa0, 0x6a, 0xa7, 0x24, 0x6c, 0x84, 0xd3, 0xfe, 0x45, 0x44, 0x23, + 0x2a, 0x7d, 0x27, 0x57, 0x05, 0xd2, 0xbf, 0xac, 0x86, 0x24, 0x01, 0x61, 0x3e, 0x29, 0x5f, 0x0f, + 0xde, 0x1a, 0xf0, 0x64, 0x52, 0xc4, 0x7a, 0x32, 0x55, 0xbd, 0x86, 0xff, 0x4b, 0x44, 0x03, 0x26, + 0xb0, 0x3a, 0x37, 0x3d, 0xbb, 0xf2, 0x83, 0xfd, 0x10, 0x10, 0xe6, 0x4e, 0xbc, 0x76, 0xce, 0xb8, + 0x48, 0x4d, 0xe1, 0x31, 0x9f, 0x05, 0x0c, 0x73, 0x9f, 0xae, 0x63, 0x8c, 0xb4, 0x86, 0x09, 0xac, + 0xa3, 0xf1, 0xd3, 0x36, 0x33, 0x94, 0x8f, 0xcc, 0xb8, 0x8a, 0x88, 0x98, 0xad, 0xa6, 0x76, 0x48, + 0x97, 0x4e, 0x48, 0xf9, 0x92, 0xf2, 0xf2, 0x18, 0x71, 0x34, 0x77, 0xc4, 0x26, 0xc1, 0xdc, 0x76, + 0x63, 0xf1, 0x95, 0x19, 0xb5, 0x94, 0xef, 0xcc, 0xe8, 0x6d, 0x82, 0xe5, 0xe2, 0x6e, 0x50, 0x75, + 0x07, 0x5e, 0xa7, 0x18, 0xef, 0xf3, 0x49, 0x1d, 0xc2, 0xf3, 0x10, 0xc7, 0x02, 0x33, 0x5f, 0x90, + 0x70, 0xee, 0x93, 0x18, 0xe1, 0x54, 0x6b, 0x9a, 0xc0, 0x6a, 0x7a, 0x67, 0xc5, 0xc5, 0x23, 0x09, + 0xe7, 0x6e, 0x6e, 0xab, 0x16, 0xec, 0x2e, 0xe8, 0xba, 0x8e, 0xb6, 0x24, 0x7a, 0x2a, 0xfd, 0x1a, + 0xb9, 0x4a, 0x92, 0x3a, 0xf9, 0xaf, 0x20, 0xa5, 0xff, 0x47, 0x76, 0x61, 0xf3, 0x05, 0x63, 0xad, + 0x6d, 0x02, 0xab, 0xe5, 0xe5, 0x72, 0x3c, 0xd9, 0xee, 0x75, 0xb0, 0xdb, 0xeb, 0xe0, 0x73, 0xaf, + 0x83, 0xd7, 0x83, 0xae, 0xec, 0x0e, 0xba, 0xf2, 0x7e, 0xd0, 0x95, 0xe7, 0x61, 0xa5, 0x87, 0xb2, + 0xcc, 0x11, 0x65, 0xd1, 0xaf, 0x76, 0x52, 0xb9, 0x19, 0xd9, 0xc7, 0xb4, 0x2d, 0x17, 0x73, 0xfb, + 0x13, 0x00, 0x00, 0xff, 0xff, 0x49, 0x82, 0xcb, 0xe9, 0xfa, 0x01, 0x00, 0x00, } func (m *DepositRecord) Marshal() (dAtA []byte, err error) { diff --git a/x/dex/types/limit_order_tranche_user.pb.go b/x/dex/types/limit_order_tranche_user.pb.go index 19755ffaf..cedd9aed1 100644 --- a/x/dex/types/limit_order_tranche_user.pb.go +++ b/x/dex/types/limit_order_tranche_user.pb.go @@ -29,7 +29,7 @@ type LimitOrderTrancheUser struct { TickIndexTakerToMaker int64 `protobuf:"varint,2,opt,name=tick_index_taker_to_maker,json=tickIndexTakerToMaker,proto3" json:"tick_index_taker_to_maker,omitempty"` TrancheKey string `protobuf:"bytes,3,opt,name=tranche_key,json=trancheKey,proto3" json:"tranche_key,omitempty"` Address string `protobuf:"bytes,4,opt,name=address,proto3" json:"address,omitempty"` - SharesOwned github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,5,opt,name=shares_owned,json=sharesOwned,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"sharesOwned" yaml:"shares_owned"` + SharesOwned github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,5,opt,name=shares_owned,json=sharesOwned,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"shares_owned" yaml:"shares_owned"` SharesWithdrawn github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,6,opt,name=shares_withdrawn,json=sharesWithdrawn,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"shares_withdrawn" yaml:"shares_withdrawn"` SharesCancelled github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,7,opt,name=shares_cancelled,json=sharesCancelled,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"shares_cancelled" yaml:"shares_cancelled"` OrderType LimitOrderType `protobuf:"varint,8,opt,name=order_type,json=orderType,proto3,enum=neutron.dex.LimitOrderType" json:"order_type,omitempty"` @@ -113,36 +113,36 @@ func init() { var fileDescriptor_67e5ffbd487ea05f = []byte{ // 471 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x52, 0x4f, 0x6b, 0xd4, 0x40, - 0x1c, 0xdd, 0x58, 0xdb, 0xda, 0x89, 0xff, 0x88, 0x2d, 0x8e, 0x15, 0x92, 0x65, 0x0f, 0xb2, 0x14, - 0x9a, 0x40, 0xbd, 0x48, 0xf1, 0x54, 0x7b, 0x59, 0x54, 0x2a, 0x21, 0x22, 0x08, 0x32, 0x4c, 0x33, - 0x3f, 0x76, 0x87, 0xdd, 0x64, 0xc2, 0xcc, 0x2c, 0x9b, 0x7c, 0x03, 0x8f, 0x5e, 0xfc, 0x4e, 0x3d, - 0xf6, 0x28, 0x1e, 0x82, 0xec, 0xde, 0x3c, 0xf6, 0x13, 0xc8, 0x6c, 0xfe, 0x90, 0xa5, 0x27, 0xe9, - 0x69, 0x7e, 0xf3, 0xde, 0xe3, 0xfd, 0xde, 0x0c, 0x0f, 0x1d, 0xa5, 0x30, 0xd7, 0x52, 0xa4, 0x01, - 0x83, 0x3c, 0x98, 0xf1, 0x84, 0x6b, 0x22, 0x24, 0x03, 0x49, 0xb4, 0xa4, 0x69, 0x3c, 0x01, 0x32, - 0x57, 0x20, 0xfd, 0x4c, 0x0a, 0x2d, 0x1c, 0xbb, 0xd6, 0xfa, 0x0c, 0xf2, 0xc3, 0xfd, 0xb1, 0x18, - 0x8b, 0x35, 0x1e, 0x98, 0xa9, 0x92, 0x1c, 0x7a, 0x5d, 0x3b, 0x2d, 0x29, 0x03, 0x92, 0x51, 0x2e, - 0x09, 0x67, 0xb5, 0x60, 0x7f, 0x43, 0x90, 0x57, 0xe8, 0xe0, 0xe7, 0x36, 0x3a, 0xf8, 0x60, 0x96, - 0x5f, 0x98, 0xdd, 0x51, 0xb5, 0xfa, 0xb3, 0x02, 0xe9, 0xbc, 0x45, 0x8f, 0x36, 0x6c, 0xb0, 0xd5, - 0xb7, 0x86, 0xf6, 0x09, 0xf6, 0x3b, 0x59, 0xfc, 0xc8, 0x28, 0x3e, 0x51, 0x2e, 0x47, 0xe7, 0xa1, - 0xad, 0xdb, 0x0b, 0x73, 0xde, 0xa0, 0x17, 0x9a, 0xc7, 0x53, 0xc2, 0x53, 0x06, 0x39, 0xd1, 0x74, - 0x6a, 0x1e, 0x26, 0x48, 0x62, 0x06, 0x7c, 0xaf, 0x6f, 0x0d, 0xb7, 0xc2, 0x03, 0x23, 0x18, 0x19, - 0x3e, 0x32, 0x68, 0x24, 0x3e, 0x9a, 0xc3, 0xf1, 0x90, 0xdd, 0xfc, 0xc0, 0x14, 0x0a, 0xbc, 0xd5, - 0xb7, 0x86, 0x7b, 0x21, 0xaa, 0xa1, 0xf7, 0x50, 0x38, 0x18, 0xed, 0x52, 0xc6, 0x24, 0x28, 0x85, - 0xef, 0xaf, 0xc9, 0xe6, 0xea, 0x2c, 0xd0, 0x43, 0x35, 0xa1, 0x12, 0x14, 0x11, 0x8b, 0x14, 0x18, - 0xde, 0x36, 0xf4, 0x59, 0x74, 0x55, 0x7a, 0xbd, 0xdf, 0xa5, 0xf7, 0x6a, 0xcc, 0xf5, 0x64, 0x7e, - 0xe9, 0xc7, 0x22, 0x09, 0x62, 0xa1, 0x12, 0xa1, 0xea, 0xe3, 0x58, 0xb1, 0x69, 0xa0, 0x8b, 0x0c, - 0x94, 0x3f, 0x4a, 0xf5, 0xdf, 0xd2, 0xb3, 0x2b, 0x97, 0x0b, 0x63, 0x72, 0x53, 0x7a, 0xcf, 0x0a, - 0x9a, 0xcc, 0x4e, 0x07, 0x5d, 0xeb, 0x41, 0xd8, 0xd5, 0x38, 0xdf, 0x2d, 0xf4, 0xb4, 0xa6, 0x17, - 0x5c, 0x4f, 0x98, 0xa4, 0x8b, 0x14, 0xef, 0xac, 0xb7, 0x7f, 0xfb, 0xef, 0xed, 0xb7, 0x9c, 0x6e, - 0x4a, 0xef, 0xf9, 0x46, 0x84, 0x96, 0x19, 0x84, 0x4f, 0x2a, 0xe8, 0x4b, 0x83, 0x74, 0xa3, 0xc4, - 0x34, 0x8d, 0x61, 0x36, 0x03, 0x86, 0x77, 0xef, 0x18, 0xa5, 0x75, 0xba, 0x15, 0xa5, 0x65, 0xda, - 0x28, 0xef, 0x1a, 0xc4, 0x39, 0x45, 0xa8, 0x6e, 0x74, 0x91, 0x01, 0x7e, 0xd0, 0xb7, 0x86, 0x8f, - 0x4f, 0x5e, 0x6e, 0xd4, 0xa7, 0xd3, 0xbc, 0x22, 0x83, 0x70, 0x4f, 0x34, 0xe3, 0xd9, 0xf9, 0xd5, - 0xd2, 0xb5, 0xae, 0x97, 0xae, 0xf5, 0x67, 0xe9, 0x5a, 0x3f, 0x56, 0x6e, 0xef, 0x7a, 0xe5, 0xf6, - 0x7e, 0xad, 0xdc, 0xde, 0xd7, 0xa3, 0x4e, 0xfa, 0xda, 0xeb, 0x58, 0xc8, 0x71, 0x33, 0x07, 0x79, - 0x55, 0x70, 0xf3, 0x8a, 0xcb, 0x9d, 0x75, 0xc9, 0x5f, 0xff, 0x0b, 0x00, 0x00, 0xff, 0xff, 0xb7, - 0xb0, 0x38, 0x91, 0x6c, 0x03, 0x00, 0x00, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x52, 0xcf, 0x6b, 0xd4, 0x40, + 0x18, 0xdd, 0x58, 0xdb, 0xda, 0x89, 0xbf, 0x88, 0x2d, 0x8e, 0x15, 0x92, 0x65, 0x0f, 0xb2, 0x14, + 0x9a, 0x40, 0xbd, 0x48, 0xf1, 0x54, 0x7b, 0x59, 0x54, 0x2a, 0x61, 0x8b, 0x20, 0xc8, 0x30, 0xcd, + 0x7c, 0xec, 0x0e, 0xbb, 0xc9, 0x84, 0x99, 0x59, 0x36, 0xf9, 0x0f, 0x3c, 0x7a, 0xf2, 0x6f, 0xea, + 0xb1, 0x47, 0xf1, 0x10, 0x64, 0xf7, 0xe6, 0xb1, 0x7f, 0x81, 0xcc, 0xe6, 0x07, 0x09, 0x3d, 0x89, + 0xa7, 0x7c, 0xdf, 0x7b, 0x8f, 0xf7, 0xbd, 0x09, 0x0f, 0x1d, 0x25, 0xb0, 0xd0, 0x52, 0x24, 0x01, + 0x83, 0x2c, 0x98, 0xf3, 0x98, 0x6b, 0x22, 0x24, 0x03, 0x49, 0xb4, 0xa4, 0x49, 0x34, 0x05, 0xb2, + 0x50, 0x20, 0xfd, 0x54, 0x0a, 0x2d, 0x1c, 0xbb, 0xd2, 0xfa, 0x0c, 0xb2, 0xc3, 0xfd, 0x89, 0x98, + 0x88, 0x0d, 0x1e, 0x98, 0xa9, 0x94, 0x1c, 0x7a, 0x6d, 0x3b, 0x2d, 0x29, 0x03, 0x92, 0x52, 0x2e, + 0x09, 0x67, 0x95, 0x60, 0xbf, 0x23, 0xc8, 0x4a, 0x74, 0xf0, 0x63, 0x1b, 0x1d, 0x7c, 0x30, 0xc7, + 0x2f, 0xcc, 0xed, 0x71, 0x79, 0xfa, 0x52, 0x81, 0x74, 0xde, 0xa2, 0x47, 0x1d, 0x1b, 0x6c, 0xf5, + 0xad, 0xa1, 0x7d, 0x82, 0xfd, 0x56, 0x16, 0x7f, 0x6c, 0x14, 0x9f, 0x28, 0x97, 0xa3, 0xf3, 0xd0, + 0xd6, 0xcd, 0xc2, 0x9c, 0x37, 0xe8, 0x85, 0xe6, 0xd1, 0x8c, 0xf0, 0x84, 0x41, 0x46, 0x34, 0x9d, + 0x99, 0x87, 0x09, 0x12, 0x9b, 0x01, 0xdf, 0xeb, 0x5b, 0xc3, 0xad, 0xf0, 0xc0, 0x08, 0x46, 0x86, + 0x1f, 0x1b, 0x74, 0x2c, 0x3e, 0x9a, 0x8f, 0xe3, 0x21, 0xbb, 0xfe, 0x03, 0x33, 0xc8, 0xf1, 0x56, + 0xdf, 0x1a, 0xee, 0x85, 0xa8, 0x82, 0xde, 0x43, 0xee, 0x60, 0xb4, 0x4b, 0x19, 0x93, 0xa0, 0x14, + 0xbe, 0xbf, 0x21, 0xeb, 0xd5, 0xc9, 0xd0, 0x43, 0x35, 0xa5, 0x12, 0x14, 0x11, 0xcb, 0x04, 0x18, + 0xde, 0x36, 0xf4, 0xd9, 0xe5, 0x75, 0xe1, 0xf5, 0x7e, 0x15, 0xde, 0xab, 0x09, 0xd7, 0xd3, 0xc5, + 0x95, 0x1f, 0x89, 0x38, 0x88, 0x84, 0x8a, 0x85, 0xaa, 0x3e, 0xc7, 0x8a, 0xcd, 0x02, 0x9d, 0xa7, + 0xa0, 0xfc, 0x51, 0xa2, 0xff, 0x14, 0x5e, 0xc7, 0xe5, 0xb6, 0xf0, 0x9e, 0xe5, 0x34, 0x9e, 0x9f, + 0x0e, 0xda, 0xe8, 0x20, 0xb4, 0xcb, 0xf5, 0xc2, 0x6c, 0xce, 0x37, 0x0b, 0x3d, 0xad, 0xe8, 0x25, + 0xd7, 0x53, 0x26, 0xe9, 0x32, 0xc1, 0x3b, 0x9b, 0xf3, 0x5f, 0xff, 0xf9, 0xfc, 0x1d, 0xa7, 0xdb, + 0xc2, 0x7b, 0xde, 0x89, 0xd0, 0x30, 0x83, 0xf0, 0x49, 0x09, 0x7d, 0xae, 0x91, 0x76, 0x94, 0x88, + 0x26, 0x11, 0xcc, 0xe7, 0xc0, 0xf0, 0xee, 0x7f, 0x46, 0x69, 0x9c, 0xee, 0x44, 0x69, 0x98, 0x26, + 0xca, 0xbb, 0x1a, 0x71, 0x4e, 0x11, 0xaa, 0x2a, 0x9d, 0xa7, 0x80, 0x1f, 0xf4, 0xad, 0xe1, 0xe3, + 0x93, 0x97, 0x9d, 0xfe, 0xb4, 0xaa, 0x97, 0xa7, 0x10, 0xee, 0x89, 0x7a, 0x3c, 0x3b, 0xbf, 0x5e, + 0xb9, 0xd6, 0xcd, 0xca, 0xb5, 0x7e, 0xaf, 0x5c, 0xeb, 0xfb, 0xda, 0xed, 0xdd, 0xac, 0xdd, 0xde, + 0xcf, 0xb5, 0xdb, 0xfb, 0x72, 0xd4, 0x4a, 0x5f, 0x79, 0x1d, 0x0b, 0x39, 0xa9, 0xe7, 0x20, 0x2b, + 0x1b, 0x6e, 0x5e, 0x71, 0xb5, 0xb3, 0x69, 0xf9, 0xeb, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x4e, + 0x33, 0x63, 0x0d, 0x6d, 0x03, 0x00, 0x00, } func (m *LimitOrderTrancheUser) Marshal() (dAtA []byte, err error) { From f5cf93489ae1c1818a99c37c571958964c290dd7 Mon Sep 17 00:00:00 2001 From: Julian Compagni Portis Date: Wed, 8 Nov 2023 12:44:23 -0500 Subject: [PATCH 224/307] save --- go.mod | 6 ++-- go.sum | 4 +-- tests/ibc/swap_forward_test.go | 2 -- x/ibcswap/ibc_middleware.go | 50 +++++++++++++++++++++++++++++++++- 4 files changed, 53 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index 1f0796f6d..f6ddeb46f 100644 --- a/go.mod +++ b/go.mod @@ -17,9 +17,7 @@ require ( github.com/cosmos/cosmos-sdk v0.47.5 github.com/cosmos/gaia/v11 v11.0.0-00010101000000-000000000000 github.com/cosmos/gogoproto v1.4.10 - // TEMP: Using this version to support duality swap-and-forward - github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.0-20230629164013-34f5e666f806 - // github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.0-20230803181732-7c8f814d3b79 + github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.1 github.com/cosmos/ibc-go/v7 v7.2.0 github.com/cosmos/ics23/go v0.10.0 github.com/cosmos/interchain-security/v3 v3.1.0 @@ -38,9 +36,9 @@ require ( github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.16.0 github.com/stretchr/testify v1.8.4 + golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d google.golang.org/grpc v1.59.0 - golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb google.golang.org/protobuf v1.31.0 gopkg.in/yaml.v2 v2.4.0 ) diff --git a/go.sum b/go.sum index 524231754..1d2952b0f 100644 --- a/go.sum +++ b/go.sum @@ -399,8 +399,8 @@ github.com/cosmos/gogoproto v1.4.10 h1:QH/yT8X+c0F4ZDacDv3z+xE3WU1P1Z3wQoLMBRJoK github.com/cosmos/gogoproto v1.4.10/go.mod h1:3aAZzeRWpAwr+SS/LLkICX2/kDFyaYVzckBDzygIxek= github.com/cosmos/iavl v0.20.0 h1:fTVznVlepH0KK8NyKq8w+U7c2L6jofa27aFX6YGlm38= github.com/cosmos/iavl v0.20.0/go.mod h1:WO7FyvaZJoH65+HFOsDir7xU9FWk2w9cHXNW1XHcl7A= -github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.0-20230629164013-34f5e666f806 h1:iFWb/KrnP5jthNZ23l72wqE8nzHJHzoVe22giUfJce8= -github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.0-20230629164013-34f5e666f806/go.mod h1:fctjEnz9xaBFOlmYYPdKL8Hs1Y3GUKilSwsJdqBb5QU= +github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.0-20230803181732-7c8f814d3b79 h1:n+PjYB3JnbKN+sGmX6khST4xMP+D0UdrMNj7O91fuOg= +github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.0-20230803181732-7c8f814d3b79/go.mod h1:fctjEnz9xaBFOlmYYPdKL8Hs1Y3GUKilSwsJdqBb5QU= github.com/cosmos/ibc-go/v7 v7.2.0 h1:dx0DLUl7rxdyZ8NiT6UsrbzKOJx/w7s+BOaewFRH6cg= github.com/cosmos/ibc-go/v7 v7.2.0/go.mod h1:OOcjKIRku/j1Xs1RgKK0yvKRrJ5iFuZYMetR1n3yMlc= github.com/cosmos/ics23/go v0.10.0 h1:iXqLLgp2Lp+EdpIuwXTYIQU+AiHj9mOC2X9ab++bZDM= diff --git a/tests/ibc/swap_forward_test.go b/tests/ibc/swap_forward_test.go index 12d07e448..e04dac8d6 100644 --- a/tests/ibc/swap_forward_test.go +++ b/tests/ibc/swap_forward_test.go @@ -122,8 +122,6 @@ func (s *IBCTestSuite) TestSwapAndForward_Success() { // Check that the funds are now present in the acc on chainB s.assertChainBBalance(chainBAddr, transferDenomNeutronChainB, expectedAmountOut) - - s.Assert().NoError(err) } func (s *IBCTestSuite) TestSwapAndForward_MultiHopSuccess() { diff --git a/x/ibcswap/ibc_middleware.go b/x/ibcswap/ibc_middleware.go index 4abad72ce..f7fec4c73 100644 --- a/x/ibcswap/ibc_middleware.go +++ b/x/ibcswap/ibc_middleware.go @@ -3,11 +3,13 @@ package ibcswap import ( "context" "encoding/json" + "fmt" "strings" sdkerrors "cosmossdk.io/errors" "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/types/address" capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" forwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router/types" transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" @@ -127,6 +129,16 @@ func (im IBCMiddleware) OnRecvPacket( } metadata := m.Swap + + // override the receiver so that senders cannot move funds through arbitrary addresses. + // also needed to match behavior of PFM + overrideReceiver, err := getReceiver(packet.DestinationChannel, data.Sender) + if err != nil { + return channeltypes.NewErrorAcknowledgement(err) + } + metadata.Receiver = overrideReceiver + metadata.Creator = overrideReceiver + if err := metadata.Validate(); err != nil { return channeltypes.NewErrorAcknowledgement(err) } @@ -145,7 +157,9 @@ func (im IBCMiddleware) OnRecvPacket( ) wrappedSdkCtx := ctx.WithContext(ctxWithForwardFlags) - ack := im.app.OnRecvPacket(wrappedSdkCtx, packet, relayer) + overridePacket := NewPacketWithOverrideReceiver(packet, data, overrideReceiver) + + ack := im.app.OnRecvPacket(wrappedSdkCtx, overridePacket, relayer) if ack == nil || !ack.Success() { return ack } @@ -372,3 +386,37 @@ func getDenomForThisChain( prefixedDenom := transfertypes.GetDenomPrefix(port, channel) + denom return transfertypes.ParseDenomTrace(prefixedDenom).IBCDenom() } + +func NewPacketWithOverrideReceiver(oldPacket channeltypes.Packet, data transfertypes.FungibleTokenPacketData, overrideReceiver string) channeltypes.Packet { + overrideData := transfertypes.FungibleTokenPacketData{ + Denom: data.Denom, + Amount: data.Amount, + Sender: data.Sender, + Receiver: overrideReceiver, // override receiver + } + overrideDataBz := transfertypes.ModuleCdc.MustMarshalJSON(&overrideData) + + return channeltypes.Packet{ + Sequence: oldPacket.Sequence, + SourcePort: oldPacket.SourcePort, + SourceChannel: oldPacket.SourceChannel, + DestinationPort: oldPacket.DestinationPort, + DestinationChannel: oldPacket.DestinationChannel, + Data: overrideDataBz, // override data + TimeoutHeight: oldPacket.TimeoutHeight, + TimeoutTimestamp: oldPacket.TimeoutTimestamp, + } +} + +// NOTE: This has been copied from https://github.com/cosmos/ibc-apps/blob/0288bf5c3ec205134e288815f654b59611bd2153/middleware/packet-forward-middleware/packetforward/ibc_middleware.go#L143 +// this allows us to use the same address as the PFM. +// Unfortunately, this is a very brittle solution that depends on the corresponding function in th PFM not being changed. +// Nonetheless, any breaking changes in the PFM will be caught by tests. +// An issue has been created on the cosmos/ibc-apps repo to make this function public so we can use it directly: https://github.com/cosmos/ibc-apps/issues/131 +func getReceiver(channel, originalSender string) (string, error) { + senderStr := fmt.Sprintf("%s/%s", channel, originalSender) + senderHash32 := address.Hash(forwardtypes.ModuleName, []byte(senderStr)) + sender := sdk.AccAddress(senderHash32[:20]) + bech32Prefix := sdk.GetConfig().GetBech32AccountAddrPrefix() + return sdk.Bech32ifyAddressBytes(bech32Prefix, sender) +} From e4f3ea509cb87b77931b58fb537d47ce31be0a08 Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Wed, 8 Nov 2023 22:29:21 +0200 Subject: [PATCH 225/307] fix max_gas limit for tests --- network/init-neutrond.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/network/init-neutrond.sh b/network/init-neutrond.sh index d2461210f..6d7ce50ff 100755 --- a/network/init-neutrond.sh +++ b/network/init-neutrond.sh @@ -643,7 +643,7 @@ set_genesis_param_jq ".app_state.globalfee.params.bypass_min_fee_msg_types" "$BY set_genesis_param proposer_fee "\"0.25\"" # builder(POB) set_genesis_param escrow_account_address "\"$DAO_CONTRACT_ADDRESS_B64\"," # builder(POB) set_genesis_param sudo_call_gas_limit "\"1000000\"" # contractmanager -set_genesis_param max_gas "\"40000000\"" # consensus_params +set_genesis_param max_gas "\"1000000000\"" # consensus_params if ! jq -e . "$GENESIS_PATH" >/dev/null 2>&1; then echo "genesis appears to become incorrect json" >&2 From 1558368c96f6a2ddebd6ad2b915a99307e5b32a7 Mon Sep 17 00:00:00 2001 From: sotnikov-s Date: Thu, 9 Nov 2023 08:38:50 +0300 Subject: [PATCH 226/307] add warning comment about expected error to AddContractFailure --- x/contractmanager/keeper/failure.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/x/contractmanager/keeper/failure.go b/x/contractmanager/keeper/failure.go index 6adc60fd5..54bb3435b 100644 --- a/x/contractmanager/keeper/failure.go +++ b/x/contractmanager/keeper/failure.go @@ -8,7 +8,14 @@ import ( "github.com/neutron-org/neutron/x/contractmanager/types" ) -// AddContractFailure adds a specific failure to the store using address as the key +// AddContractFailure adds a specific failure to the store. The provided address is used to determine +// the failure ID and they both are used to create a storage key for the failure. +// +// WARNING: The errMsg string parameter is expected to be deterministic. It means that the errMsg +// must be OS/library version agnostic and carry a concrete defined error message. One of the good +// ways to do so is to redact error as it is done in SudoLimitWrapper Sudo method: +// https://github.com/neutron-org/neutron/blob/4ee803ff75bb8fdddee1ed62fbf8b771d8006347/x/contractmanager/ibc_middleware.go#L40. +// Another good way could be passing here some constant value. func (k Keeper) AddContractFailure(ctx sdk.Context, address string, sudoPayload []byte, errMsg string) types.Failure { failure := types.Failure{ Address: address, From 10ab425a892abeda108188e2edb847cf4730685c Mon Sep 17 00:00:00 2001 From: Julian Compagni Portis Date: Thu, 9 Nov 2023 03:16:43 -0500 Subject: [PATCH 227/307] Upgrade x/ibcswap to be compatible with PFM v7.0.2 - Fix issues relating to PFMs new overrideReceiver address - Small cleanup up OnRecvPacket for greater clarity - Get rid of NonRefundable swap param and just use presence NeutronRefundAddress to determine refund behavior. - Improve refund behavior to allow for IBC refund after failed forward - Add additional validation to ensure that only the amount transfered is used for swap --- go.mod | 3 +- go.sum | 4 +- tests/ibc/ibc_setup_test.go | 16 ++++ tests/ibc/swap_forward_test.go | 155 +++++++++++++++++++++++++++----- tests/ibc/swap_test.go | 53 +---------- x/ibcswap/ibc_middleware.go | 159 ++++++++++++++++++--------------- x/ibcswap/keeper/keeper.go | 5 +- x/ibcswap/types/swap.go | 23 +++-- 8 files changed, 266 insertions(+), 152 deletions(-) diff --git a/go.mod b/go.mod index be9d3d6f8..52c19731c 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/cosmos/cosmos-sdk v0.47.5 github.com/cosmos/gaia/v11 v11.0.0-00010101000000-000000000000 github.com/cosmos/gogoproto v1.4.10 - github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.1 + github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.2-0.20231103132047-e5a274cf6fc2 github.com/cosmos/ibc-go/v7 v7.3.1 github.com/cosmos/ics23/go v0.10.0 github.com/cosmos/interchain-security/v3 v3.1.0 @@ -169,7 +169,6 @@ require ( go.etcd.io/bbolt v1.3.7 // indirect go.opencensus.io v0.24.0 // indirect golang.org/x/crypto v0.13.0 // indirect - golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb // indirect golang.org/x/net v0.15.0 // indirect golang.org/x/oauth2 v0.12.0 // indirect golang.org/x/sync v0.3.0 // indirect diff --git a/go.sum b/go.sum index 9cdb5e74d..9ab2d13a7 100644 --- a/go.sum +++ b/go.sum @@ -399,8 +399,8 @@ github.com/cosmos/gogoproto v1.4.10 h1:QH/yT8X+c0F4ZDacDv3z+xE3WU1P1Z3wQoLMBRJoK github.com/cosmos/gogoproto v1.4.10/go.mod h1:3aAZzeRWpAwr+SS/LLkICX2/kDFyaYVzckBDzygIxek= github.com/cosmos/iavl v0.20.1 h1:rM1kqeG3/HBT85vsZdoSNsehciqUQPWrR4BYmqE2+zg= github.com/cosmos/iavl v0.20.1/go.mod h1:WO7FyvaZJoH65+HFOsDir7xU9FWk2w9cHXNW1XHcl7A= -github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.1 h1:8mK4Ha/56P6jkRcLhIYhg/ipWhEuXBtj5O4I6fAi6vg= -github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.1/go.mod h1:GGUJN4LnB3J1Luu4kxTklQLbW69So3QXUndSalB003s= +github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.2-0.20231103132047-e5a274cf6fc2 h1:FM6+3eZI9j9/Gud4TM6t+v1WgHpvyu95PU3Hwk3pPmk= +github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.2-0.20231103132047-e5a274cf6fc2/go.mod h1:GGUJN4LnB3J1Luu4kxTklQLbW69So3QXUndSalB003s= github.com/cosmos/ibc-go/v7 v7.3.1 h1:bil1IjnHdyWDASFYKfwdRiNtFP6WK3osW7QFEAgU4I8= github.com/cosmos/ibc-go/v7 v7.3.1/go.mod h1:wvx4pPBofe5ZdMNV3OFRxSI4auEP5Qfqf8JXLLNV04g= github.com/cosmos/ics23/go v0.10.0 h1:iXqLLgp2Lp+EdpIuwXTYIQU+AiHj9mOC2X9ab++bZDM= diff --git a/tests/ibc/ibc_setup_test.go b/tests/ibc/ibc_setup_test.go index e3df4b424..827920bf2 100644 --- a/tests/ibc/ibc_setup_test.go +++ b/tests/ibc/ibc_setup_test.go @@ -6,6 +6,7 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward" transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" @@ -325,6 +326,14 @@ func (s *IBCTestSuite) assertChainCBalance(addr sdk.AccAddress, denom string, ex s.assertBalance(s.bundleC.App.GetTestBankKeeper(), s.bundleC.Chain, addr, denom, expectedAmt) } +func (s *IBCTestSuite) ReceiverOverrideAddr(channel, sender string) sdk.AccAddress { + addr, err := packetforward.GetReceiver(channel, sender) + if err != nil { + panic("Cannot calc receiver override: " + err.Error()) + } + return sdk.MustAccAddressFromBech32(addr) +} + //nolint:unparam // keep this flexible even if we aren't currently using all the params func (s *IBCTestSuite) neutronDeposit( token0 string, @@ -355,11 +364,18 @@ func (s *IBCTestSuite) neutronDeposit( func (s *IBCTestSuite) RelayAllPacketsAToB(path *icsibctesting.Path) error { sentPackets := path.EndpointA.Chain.SentPackets + chainB := path.EndpointB.Chain if len(sentPackets) == 0 { return fmt.Errorf("No packets to send") } for _, packet := range sentPackets { + // Skip if packet has already been sent + ack, _ := chainB.App.GetIBCKeeper().ChannelKeeper. + GetPacketAcknowledgement(chainB.GetContext(), packet.GetDestPort(), packet.GetDestChannel(), packet.GetSequence()) + if ack != nil { + continue + } err := path.RelayPacket(packet) if err != nil { return err diff --git a/tests/ibc/swap_forward_test.go b/tests/ibc/swap_forward_test.go index 4d8e499d8..e975878a0 100644 --- a/tests/ibc/swap_forward_test.go +++ b/tests/ibc/swap_forward_test.go @@ -333,11 +333,29 @@ func (s *IBCTestSuite) TestSwapAndForward_UnwindIBCDenomSuccess() { metadataBz, err := json.Marshal(metadata) s.Require().NoError(err) + // Transfer native denom from neutron to provider + s.IBCTransfer( + s.neutronTransferPath, + s.neutronTransferPath.EndpointA, + s.neutronAddr, + s.providerAddr, + nativeDenom, + ibcTransferAmount, + "", + ) + transferDenomPath := transfertypes.GetPrefixedDenom( + transfertypes.PortID, + s.neutronTransferPath.EndpointB.ChannelID, + nativeDenom, + ) + transferDenomNeutronProvider := transfertypes.ParseDenomTrace(transferDenomPath).IBCDenom() + s.assertProviderBalance(s.providerAddr, transferDenomNeutronProvider, ibcTransferAmount) + // Send an IBC transfer from provider to neutron with packet memo containing the swap metadata s.IBCTransferProviderToNeutron( s.providerAddr, s.neutronAddr, - nativeDenom, + transferDenomNeutronProvider, ibcTransferAmount, string(metadataBz), ) @@ -347,23 +365,18 @@ func (s *IBCTestSuite) TestSwapAndForward_UnwindIBCDenomSuccess() { s.Assert().NoError(err) s.coordinator.CommitBlock(s.neutronChain) - // Check that the amountIn is deduced from the neutron account - s.assertNeutronBalance(s.neutronAddr, nativeDenom, postDepositNeutronBalNative.Sub(swapAmount)) - // Check that the amountIn has been deducted from the neutron chain - s.assertNeutronBalance(s.neutronAddr, nativeDenom, postDepositNeutronBalNative.Sub(swapAmount)) // Check that the funds are now present on the provider chainer s.assertProviderBalance( s.providerAddr, nativeDenom, - newProviderBalNative.Sub(ibcTransferAmount).Add(expectedAmountOut), + newProviderBalNative.Add(expectedAmountOut), ) - - s.Assert().NoError(err) } -// TestSwapAndForward_ForwardFails asserts that the swap and forward middleware stack works as intended in the case -// that an incoming IBC swap succeeds but the forward fails. -func (s *IBCTestSuite) TestSwapAndForward_ForwardFails() { +// TestSwapAndForward_ForwardFailsRefundAddr asserts that the swap and forward middleware stack works as intended in the case +// that an incoming IBC swap succeeds but the forward fails when a NeutronRefundAddress is provided. +// The swap will be reverted and the transferred amount will be credited to the refundAddr +func (s *IBCTestSuite) TestSwapAndForward_ForwardFailsRefundAddr() { // Send an IBC transfer from provider chain to neutron, so we can initialize a pool with the IBC denom token + native Neutron token s.IBCTransferProviderToNeutron( s.providerAddr, @@ -397,7 +410,6 @@ func (s *IBCTestSuite) TestSwapAndForward_ForwardFails() { // Compose the IBC transfer memo metadata to be used in the swap and forward swapAmount := math.NewInt(100000) - expectedAmountOut := math.NewInt(99990) chainBAddr := s.bundleB.Chain.SenderAccount.GetAddress() retries := uint8(0) @@ -420,6 +432,7 @@ func (s *IBCTestSuite) TestSwapAndForward_ForwardFails() { err = json.Unmarshal(bz, nextJSON) s.Assert().NoError(err) + refundAddr := s.neutronChain.SenderAccounts[1].SenderAccount.GetAddress() metadata := swaptypes.PacketMetadata{ Swap: &swaptypes.SwapMetadata{ MsgPlaceLimitOrder: &types.MsgPlaceLimitOrder{ @@ -431,7 +444,8 @@ func (s *IBCTestSuite) TestSwapAndForward_ForwardFails() { TickIndexInToOut: 2, OrderType: types.LimitOrderType_FILL_OR_KILL, }, - Next: nextJSON, + NeutronRefundAddress: refundAddr.String(), + Next: nextJSON, }, } @@ -459,14 +473,13 @@ func (s *IBCTestSuite) TestSwapAndForward_ForwardFails() { newProviderBalNative.Sub(ibcTransferAmount), ) - // Check that the amountIn is deduced from the neutron account - s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, math.ZeroInt()) - // Check that the amountOut stays on the neutronchain - s.assertNeutronBalance( - s.neutronAddr, - nativeDenom, - postDepositNeutronBalNative.Add(expectedAmountOut), - ) + // Check that nothing remains in the overrideReceiver account + overrideAddr := s.ReceiverOverrideAddr(s.neutronTransferPath.EndpointA.ChannelID, s.providerAddr.String()) + s.assertNeutronBalance(overrideAddr, s.providerToNeutronDenom, math.ZeroInt()) + s.assertNeutronBalance(overrideAddr, nativeDenom, math.ZeroInt()) + + // Check that the swap was reverted and the transfer amount is in the refundAddr + s.assertNeutronBalance(refundAddr, s.providerToNeutronDenom, ibcTransferAmount) // Check that nothing made it to chainB transferDenomPath := transfertypes.GetPrefixedDenom( @@ -478,3 +491,103 @@ func (s *IBCTestSuite) TestSwapAndForward_ForwardFails() { s.assertChainBBalance(chainBAddr, transferDenomNeutronChainB, math.ZeroInt()) } + +// TestSwapAndForward_ForwardFailsRefundAddr asserts that the swap and forward middleware stack works as intended in the case +// that an incoming IBC swap succeeds but the forward fails when no NeutronRefundAddress is provided. +// The swap will be reverted and a refund to the src chain will take place. +func (s *IBCTestSuite) TestSwapAndForward_ForwardFails() { + // Send an IBC transfer from provider chain to neutron, so we can initialize a pool with the IBC denom token + native Neutron token + s.IBCTransferProviderToNeutron( + s.providerAddr, + s.neutronAddr, + nativeDenom, + ibcTransferAmount, + "", + ) + + // Assert that the funds are gone from the acc on provider and present in the acc on Neutron + newProviderBalNative := genesisWalletAmount.Sub(ibcTransferAmount) + s.assertProviderBalance(s.providerAddr, nativeDenom, newProviderBalNative) + + s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, ibcTransferAmount) + + // deposit stake<>ibcTransferToken to initialize the pool on Neutron + depositAmount := math.NewInt(100_000) + s.neutronDeposit( + nativeDenom, + s.providerToNeutronDenom, + depositAmount, + depositAmount, + 0, + 1, + s.neutronAddr) + + // Assert that the deposit was successful and the funds are moved out of the Neutron user acc + s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, math.ZeroInt()) + postDepositNeutronBalNative := genesisWalletAmount.Sub(depositAmount) + s.assertNeutronBalance(s.neutronAddr, nativeDenom, postDepositNeutronBalNative) + + // Compose the IBC transfer memo metadata to be used in the swap and forward + swapAmount := math.NewInt(100000) + chainBAddr := s.bundleB.Chain.SenderAccount.GetAddress() + + retries := uint8(0) + + forwardMetadata := pfmtypes.PacketMetadata{ + Forward: &pfmtypes.ForwardMetadata{ + Receiver: chainBAddr.String(), + Port: s.neutronChainBPath.EndpointA.ChannelConfig.PortID, + Channel: "invalid-channel", // add an invalid channel identifier so the forward fails + Timeout: pfmtypes.Duration(5 * time.Minute), + Retries: &retries, + Next: nil, + }, + } + + bz, err := json.Marshal(forwardMetadata) + s.Assert().NoError(err) + + nextJSON := new(swaptypes.JSONObject) + err = json.Unmarshal(bz, nextJSON) + s.Assert().NoError(err) + + metadata := swaptypes.PacketMetadata{ + Swap: &swaptypes.SwapMetadata{ + MsgPlaceLimitOrder: &types.MsgPlaceLimitOrder{ + Creator: s.neutronAddr.String(), + Receiver: s.neutronAddr.String(), + TokenIn: s.providerToNeutronDenom, + TokenOut: nativeDenom, + AmountIn: swapAmount, + TickIndexInToOut: 2, + OrderType: types.LimitOrderType_FILL_OR_KILL, + }, + Next: nextJSON, + }, + } + + metadataBz, err := json.Marshal(metadata) + s.Require().NoError(err) + + // Send an IBC transfer from provider to neutron with packet memo containing the swap metadata + s.IBCTransferProviderToNeutron( + s.providerAddr, + s.neutronAddr, + nativeDenom, + ibcTransferAmount, + string(metadataBz), + ) + + // Relay the packets from neutron => ChainB + err = s.RelayAllPacketsAToB(s.neutronChainBPath) + // Relay Fails + s.Assert().Error(err) + + // Check that nothing remains in the overrideReceiver account + overrideAddr := s.ReceiverOverrideAddr(s.neutronTransferPath.EndpointA.ChannelID, s.providerAddr.String()) + s.assertNeutronBalance(overrideAddr, s.providerToNeutronDenom, math.ZeroInt()) + s.assertNeutronBalance(overrideAddr, nativeDenom, math.ZeroInt()) + + // Check that the refund takes place and the funds are moved back to the account on Gaia + s.assertProviderBalance(s.providerAddr, nativeDenom, genesisWalletAmount.Sub(depositAmount)) +} diff --git a/tests/ibc/swap_test.go b/tests/ibc/swap_test.go index a7cf723af..8c7ac2432 100644 --- a/tests/ibc/swap_test.go +++ b/tests/ibc/swap_test.go @@ -102,8 +102,7 @@ func (s *IBCTestSuite) TestIBCSwapMiddleware_FailRefund() { TickIndexInToOut: 1, OrderType: dextypes.LimitOrderType_FILL_OR_KILL, }, - NonRefundable: false, - Next: nil, + Next: nil, }, } @@ -127,51 +126,6 @@ func (s *IBCTestSuite) TestIBCSwapMiddleware_FailRefund() { s.assertProviderBalance(s.providerAddr, nativeDenom, genesisWalletAmount) } -// TestIBCSwapMiddleware_FailNoRefund asserts that the IBC swap middleware works as intended with Neutron running as a -// consumer chain connected to the Cosmos Hub. The swap should fail and funds should remain on Neutron. -func (s *IBCTestSuite) TestIBCSwapMiddleware_FailNoRefund() { - // Compose the swap metadata, this swap will fail because there is no pool initialized for this pair - swapAmount := math.NewInt(100000) - metadata := swaptypes.PacketMetadata{ - Swap: &swaptypes.SwapMetadata{ - MsgPlaceLimitOrder: &dextypes.MsgPlaceLimitOrder{ - Creator: s.neutronAddr.String(), - Receiver: s.neutronAddr.String(), - TokenIn: s.providerToNeutronDenom, - TokenOut: nativeDenom, - AmountIn: swapAmount, - TickIndexInToOut: 1, - OrderType: dextypes.LimitOrderType_FILL_OR_KILL, - }, - NonRefundable: true, - Next: nil, - }, - } - - metadataBz, err := json.Marshal(metadata) - s.Require().NoError(err) - - // Send (failing) IBC transfer with swap metadata - s.IBCTransferProviderToNeutron( - s.providerAddr, - s.neutronAddr, - nativeDenom, - ibcTransferAmount, - string(metadataBz), - ) - - // Check that the funds are present in the account on Neutron - s.assertNeutronBalance(s.neutronAddr, nativeDenom, genesisWalletAmount) - s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, ibcTransferAmount) - - // Check that no refund takes place and the funds are not in the account on provider - s.assertProviderBalance(s.providerAddr, nativeDenom, genesisWalletAmount.Sub(ibcTransferAmount)) -} - -// TestIBCSwapMiddleware_FailWithRefundAddr asserts that the IBC swap middleware works as intended with Neutron running as a -// consumer chain connected to the Cosmos Hub. The swap should fail and funds should remain on Neutron but be moved -// to the refund address. - func (s *IBCTestSuite) TestIBCSwapMiddleware_FailWithRefundAddr() { // Compose the swap metadata, this swap will fail because there is no pool initialized for this pair refundAddr := s.neutronChain.SenderAccounts[1].SenderAccount.GetAddress() @@ -187,9 +141,8 @@ func (s *IBCTestSuite) TestIBCSwapMiddleware_FailWithRefundAddr() { TickIndexInToOut: 1, OrderType: dextypes.LimitOrderType_FILL_OR_KILL, }, - RefundAddress: refundAddr.String(), - NonRefundable: true, - Next: nil, + NeutronRefundAddress: refundAddr.String(), + Next: nil, }, } diff --git a/x/ibcswap/ibc_middleware.go b/x/ibcswap/ibc_middleware.go index 28ff228a8..b4f732e6b 100644 --- a/x/ibcswap/ibc_middleware.go +++ b/x/ibcswap/ibc_middleware.go @@ -3,14 +3,14 @@ package ibcswap import ( "context" "encoding/json" - "fmt" + "errors" "strings" sdkerrors "cosmossdk.io/errors" "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/types/address" capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" + "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward" pfmtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types" transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" @@ -111,6 +111,15 @@ func (im IBCMiddleware) OnChanCloseConfirm(ctx sdk.Context, portID, channelID st // OnRecvPacket checks the memo field on this packet and if the metadata inside's root key indicates this packet // should be handled by the swap middleware it attempts to perform a swap. If the swap is successful // the underlying application's OnRecvPacket callback is invoked. + +// For clarity, here is a breakdown of the steps +// 1. Check if this is a swap packet; if not pass it to next middleware +// 2. validate swapMetadata; ErrAck if invalid +// 3. Pass through the middleware stack to ibc-go/transfer#OnRecvPacket; transfer coins are sent to receiver +// 4. Do swap; handle failures +// 5. If no PFM is present we are done; return ack +// 6. Unpack packet so that it is a valid PFM packet and set required context variables +// 7. Pass through middleware stack again where the forward is handled by packet-forward-middleware#OnRecvPacket func (im IBCMiddleware) OnRecvPacket( ctx sdk.Context, packet channeltypes.Packet, @@ -130,48 +139,43 @@ func (im IBCMiddleware) OnRecvPacket( metadata := m.Swap - // override the receiver so that senders cannot move funds through arbitrary addresses. - // also needed to match behavior of PFM - overrideReceiver, err := getReceiver(packet.DestinationChannel, data.Sender) - if err != nil { + if err := metadata.Validate(); err != nil { return channeltypes.NewErrorAcknowledgement(err) } - metadata.Receiver = overrideReceiver - metadata.Creator = overrideReceiver - if err := metadata.Validate(); err != nil { + if err := validateSwapPacket(packet, data, *metadata); err != nil { return channeltypes.NewErrorAcknowledgement(err) } - // Compose our context with values that will be used to pass through to the forward middleware - ctxWithForwardFlags := context.WithValue(ctx.Context(), pfmtypes.ProcessedKey{}, true) - ctxWithForwardFlags = context.WithValue( - ctxWithForwardFlags, - pfmtypes.NonrefundableKey{}, - true, - ) - ctxWithForwardFlags = context.WithValue( - ctxWithForwardFlags, - pfmtypes.DisableDenomCompositionKey{}, - true, - ) - wrappedSdkCtx := ctx.WithContext(ctxWithForwardFlags) - - overridePacket := NewPacketWithOverrideReceiver(packet, data, overrideReceiver) + // Use overrideReceiver so that users cannot ibcswap through arbitrary addresses. + // Instead generate a unique address for each user based on their channel and origin-address + overrideReceiver, err := packetforward.GetReceiver(packet.DestinationChannel, data.Sender) + if err != nil { + return channeltypes.NewErrorAcknowledgement(err) + } + metadata.Creator = overrideReceiver + // Update packet data to match the new receiver so that transfer middleware adds tokens to the expected address + packet = newPacketWithOverrideReceiver(packet, data, overrideReceiver) + if metadata.ContainsPFM() { + // If we are using PFM change receiver to the expected address for forwarding + metadata.Receiver = overrideReceiver + } - ack := im.app.OnRecvPacket(wrappedSdkCtx, overridePacket, relayer) + ack := im.app.OnRecvPacket(ctx, packet, relayer) if ack == nil || !ack.Success() { return ack } - // Attempt to perform a swap since this packets memo included swap metadata. - res, err := im.keeper.Swap(ctx, metadata.MsgPlaceLimitOrder) + // Attempt to perform a swap using a cacheCtx + cacheCtx, writeCache := ctx.CacheContext() + res, err := im.keeper.Swap(cacheCtx, metadata.MsgPlaceLimitOrder) if err != nil { return im.handleFailedSwap(ctx, packet, data, metadata, err) } // If there is no next field set in the metadata return ack if metadata.Next == nil { + writeCache() return ack } @@ -182,30 +186,46 @@ func (im IBCMiddleware) OnRecvPacket( return ack } - data.Memo = string(memoBz) + postSwapData := data + postSwapData.Memo = string(memoBz) // Override the packet data to include the token denom and amount that was received from the swap. - data.Denom = res.TakerCoinOut.Denom - data.Amount = res.TakerCoinOut.Amount.String() + postSwapData.Denom = res.TakerCoinOut.Denom + postSwapData.Amount = res.TakerCoinOut.Amount.String() // After a successful swap funds are now in the receiver account from the MsgPlaceLimitOrder so, // we need to override the packets receiver field before invoking the forward middlewares OnRecvPacket. - data.Receiver = m.Swap.Receiver + postSwapData.Receiver = m.Swap.Receiver - dataBz, err := transfertypes.ModuleCdc.MarshalJSON(&data) + dataBz, err := transfertypes.ModuleCdc.MarshalJSON(&postSwapData) if err != nil { return ack } packet.Data = dataBz + // Compose our context with values that will be used to pass through to the forward middleware + ctxWithForwardFlags := context.WithValue(cacheCtx.Context(), pfmtypes.ProcessedKey{}, true) + ctxWithForwardFlags = context.WithValue( + ctxWithForwardFlags, + pfmtypes.NonrefundableKey{}, + true, + ) + ctxWithForwardFlags = context.WithValue( + ctxWithForwardFlags, + pfmtypes.DisableDenomCompositionKey{}, + true, + ) + wrappedSdkCtx := cacheCtx.WithContext(ctxWithForwardFlags) + // The forward middleware should return a nil ack if the forward is initiated properly. // If not an error occurred, and we return the original ack. newAck := im.app.OnRecvPacket(wrappedSdkCtx, packet, relayer) if newAck != nil { - return ack + return im.handleFailedSwap(ctx, packet, data, metadata, errors.New(string(newAck.Acknowledgement()))) } + writeCache() return nil } @@ -286,38 +306,29 @@ func (im IBCMiddleware) handleFailedSwap( "AmountIn", metadata.AmountIn, "TickIndexInToOut", metadata.TickIndexInToOut, "OrderType", metadata.OrderType, - "refundable", metadata.NonRefundable, - "refund address", metadata.RefundAddress, + "refund address", metadata.NeutronRefundAddress, ) // The current denom is from the sender chains perspective, we need to compose the appropriate denom for this side - denomOnThisChain := getDenomForThisChain( - packet.DestinationPort, packet.DestinationChannel, - packet.SourcePort, packet.SourceChannel, - data.Denom, - ) + denomOnThisChain := getDenomForThisChain(packet, data.Denom) - if metadata.NonRefundable { - return im.handleNoRefund(ctx, data, metadata, denomOnThisChain, err) + if len(metadata.NeutronRefundAddress) != 0 { + return im.handleOnChainRefund(ctx, data, metadata, denomOnThisChain, err) } - return im.handleRefund(ctx, packet, data, denomOnThisChain, err) + return im.handleIBCRefund(ctx, packet, data, metadata, denomOnThisChain, err) } -// handleNoRefund will compose a successful ack to send back to the counterparty chain containing any error messages. +// handleOnChainRefund will compose a successful ack to send back to the counterparty chain containing any error messages. // Returning a successful ack ensures that a refund is not issued on the counterparty chain. // See: https://github.com/cosmos/ibc-go/blob/3ecc7dd3aef5790ec5d906936a297b34adf1ee41/modules/apps/transfer/keeper/relay.go#L320 -func (im IBCMiddleware) handleNoRefund( +func (im IBCMiddleware) handleOnChainRefund( ctx sdk.Context, data transfertypes.FungibleTokenPacketData, metadata *types.SwapMetadata, newDenom string, swapErr error, ) ibcexported.Acknowledgement { - if metadata.RefundAddress == "" { - return channeltypes.NewResultAcknowledgement([]byte(swapErr.Error())) - } - amount, ok := math.NewIntFromString(data.Amount) if !ok { wrappedErr := sdkerrors.Wrapf( @@ -330,7 +341,7 @@ func (im IBCMiddleware) handleNoRefund( } token := sdk.NewCoin(newDenom, amount) - err := im.keeper.SendCoins(ctx, data.Receiver, metadata.RefundAddress, sdk.NewCoins(token)) + err := im.keeper.SendCoins(ctx, metadata.Creator, metadata.NeutronRefundAddress, sdk.NewCoins(token)) if err != nil { wrappedErr := sdkerrors.Wrap(err, "failed to move funds to refund address") wrappedErr = sdkerrors.Wrap(swapErr, wrappedErr.Error()) @@ -340,19 +351,20 @@ func (im IBCMiddleware) handleNoRefund( return channeltypes.NewResultAcknowledgement([]byte(swapErr.Error())) } -// handleRefund will either burn or transfer the funds back to the appropriate escrow account. +// handleIBCRefund will either burn or transfer the funds back to the appropriate escrow account. // When a packet comes in the transfer module's OnRecvPacket callback is invoked which either // mints or unescrows funds on this side so if the swap fails an explicit refund is required. -func (im IBCMiddleware) handleRefund( +func (im IBCMiddleware) handleIBCRefund( ctx sdk.Context, packet channeltypes.Packet, data transfertypes.FungibleTokenPacketData, + metadata *types.SwapMetadata, newDenom string, swapErr error, ) ibcexported.Acknowledgement { data.Denom = newDenom - err := im.keeper.RefundPacketToken(ctx, packet, data) + err := im.keeper.RefundPacketToken(ctx, packet, data, metadata) if err != nil { wrappedErr := sdkerrors.Wrap(swapErr, err.Error()) @@ -366,10 +378,8 @@ func (im IBCMiddleware) handleRefund( // getDenomForThisChain composes a new token denom by either unwinding or prefixing the specified token denom appropriately. // This is necessary because the token denom in the packet data is from the perspective of the counterparty chain. -func getDenomForThisChain( - port, channel, counterpartyPort, counterpartyChannel, denom string, -) string { - counterpartyPrefix := transfertypes.GetDenomPrefix(counterpartyPort, counterpartyChannel) +func getDenomForThisChain(packet channeltypes.Packet, denom string) string { + counterpartyPrefix := transfertypes.GetDenomPrefix(packet.SourcePort, packet.SourceChannel) if strings.HasPrefix(denom, counterpartyPrefix) { // unwind denom unwoundDenom := denom[len(counterpartyPrefix):] @@ -383,11 +393,12 @@ func getDenomForThisChain( } // append port and channel from this chain to denom - prefixedDenom := transfertypes.GetDenomPrefix(port, channel) + denom + prefixedDenom := transfertypes.GetDenomPrefix(packet.DestinationPort, packet.DestinationChannel) + denom return transfertypes.ParseDenomTrace(prefixedDenom).IBCDenom() } -func NewPacketWithOverrideReceiver(oldPacket channeltypes.Packet, data transfertypes.FungibleTokenPacketData, overrideReceiver string) channeltypes.Packet { +// Update the packet data to reflect the new receiver address that is used by the PFM +func newPacketWithOverrideReceiver(oldPacket channeltypes.Packet, data transfertypes.FungibleTokenPacketData, overrideReceiver string) channeltypes.Packet { overrideData := transfertypes.FungibleTokenPacketData{ Denom: data.Denom, Amount: data.Amount, @@ -408,15 +419,23 @@ func NewPacketWithOverrideReceiver(oldPacket channeltypes.Packet, data transfert } } -// NOTE: This has been copied from https://github.com/cosmos/ibc-apps/blob/0288bf5c3ec205134e288815f654b59611bd2153/middleware/packet-forward-middleware/packetforward/ibc_middleware.go#L143 -// this allows us to use the same address as the PFM. -// Unfortunately, this is a very brittle solution that depends on the corresponding function in th PFM not being changed. -// Nonetheless, any breaking changes in the PFM will be caught by tests. -// An issue has been created on the cosmos/ibc-apps repo to make this function public so we can use it directly: https://github.com/cosmos/ibc-apps/issues/131 -func getReceiver(channel, originalSender string) (string, error) { - senderStr := fmt.Sprintf("%s/%s", channel, originalSender) - senderHash32 := address.Hash(pfmtypes.ModuleName, []byte(senderStr)) - sender := sdk.AccAddress(senderHash32[:20]) - bech32Prefix := sdk.GetConfig().GetBech32AccountAddrPrefix() - return sdk.Bech32ifyAddressBytes(bech32Prefix, sender) +func validateSwapPacket(packet channeltypes.Packet, transferData transfertypes.FungibleTokenPacketData, sm types.SwapMetadata) error { + denomOnNeutron := getDenomForThisChain(packet, transferData.Denom) + if denomOnNeutron != sm.TokenIn { + return sdkerrors.Wrap(types.ErrInvalidSwapMetadata, "Transfer Denom must match TokenIn") + } + + transferAmount, ok := math.NewIntFromString(transferData.Amount) + if !ok { + return sdkerrors.Wrapf( + transfertypes.ErrInvalidAmount, + "unable to parse transfer amount (%s) into math.Int", + transferData.Amount, + ) + } + + if transferAmount.LT(sm.AmountIn) { + return sdkerrors.Wrap(types.ErrInvalidSwapMetadata, "Transfer amount must be <= AmountIn") + } + return nil } diff --git a/x/ibcswap/keeper/keeper.go b/x/ibcswap/keeper/keeper.go index 3902568b5..e3f48b3d0 100644 --- a/x/ibcswap/keeper/keeper.go +++ b/x/ibcswap/keeper/keeper.go @@ -113,6 +113,7 @@ func (k Keeper) RefundPacketToken( ctx sdk.Context, packet channeltypes.Packet, data transfertypes.FungibleTokenPacketData, + metadata *types.SwapMetadata, ) error { // parse the denomination from the full denom path trace := transfertypes.ParseDenomTrace(data.Denom) @@ -128,8 +129,8 @@ func (k Keeper) RefundPacketToken( } token := sdk.NewCoin(trace.IBCDenom(), transferAmount) - // decode the receiver address - receiver, err := sdk.AccAddressFromBech32(data.Receiver) + // decode the creator address + receiver, err := sdk.AccAddressFromBech32(metadata.Creator) if err != nil { return err } diff --git a/x/ibcswap/types/swap.go b/x/ibcswap/types/swap.go index 57e9faf5e..3c4965db9 100644 --- a/x/ibcswap/types/swap.go +++ b/x/ibcswap/types/swap.go @@ -20,8 +20,11 @@ type PacketMetadata struct { // further in the middleware stack or on the counterparty. type SwapMetadata struct { *dextypes.MsgPlaceLimitOrder - NonRefundable bool `json:"non-refundable,omitempty"` - RefundAddress string `json:"refund-address,omitempty"` + NonRefundable bool `json:"non-refundable,omitempty"` + // If a value is provided for NeutronRefundAddress and the swap fails the Transfer.Amount will be moved to this address for later recovery. + // If no NeutronRefundAddress is provided and a swap fails we will fail the ibc transfer and tokens will be refunded on the source chain. + + NeutronRefundAddress string `json:"refund-address,omitempty"` // Using JSONObject so that objects for next property will not be mutated by golang's lexicographic key sort on map keys during Marshal. // Supports primitives for Unmarshal/Marshal so that an escaped JSON-marshaled string is also valid. @@ -39,10 +42,10 @@ func (sm SwapMetadata) Validate() error { if sm.TokenOut == "" { return sdkerrors.Wrap(ErrInvalidSwapMetadata, "limit order tokenOut cannot be an empty string") } - if sm.RefundAddress != "" { - _, err := sdk.AccAddressFromBech32(sm.RefundAddress) + if sm.NeutronRefundAddress != "" { + _, err := sdk.AccAddressFromBech32(sm.NeutronRefundAddress) if err != nil { - return sdkerrors.Wrapf(dextypes.ErrInvalidAddress, "%s is not a valid Neutron address", sm.RefundAddress) + return sdkerrors.Wrapf(dextypes.ErrInvalidAddress, "%s is not a valid Neutron address", sm.NeutronRefundAddress) } } @@ -53,6 +56,16 @@ func (sm SwapMetadata) Validate() error { return nil } +// ContainsPFM checks if the Swapetadata is wrapping packet-forward-middleware +func (sm SwapMetadata) ContainsPFM() bool { + if sm.Next == nil { + return false + } + forward, _ := sm.Next.orderedMap.Get("forward") + + return forward != nil +} + // JSONObject is a wrapper type to allow either a primitive type or a JSON object. // In the case the value is a JSON object, OrderedMap type is used so that key order // is retained across Unmarshal/Marshal. From a0f09684ce11189c8de0e30fc01a8a9ba0b7258d Mon Sep 17 00:00:00 2001 From: sotnikov-s Date: Thu, 9 Nov 2023 12:39:24 +0300 Subject: [PATCH 228/307] register error for sudo out of gas cases --- x/contractmanager/ibc_middleware.go | 2 +- x/contractmanager/types/errors.go | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/x/contractmanager/ibc_middleware.go b/x/contractmanager/ibc_middleware.go index 5ea900776..bf17b64ea 100644 --- a/x/contractmanager/ibc_middleware.go +++ b/x/contractmanager/ibc_middleware.go @@ -69,7 +69,7 @@ func outOfGasRecovery( if !ok || !gasMeter.IsOutOfGas() { panic(r) } - *err = errorsmod.Wrapf(errorsmod.ErrPanic, "%v", r) + *err = contractmanagertypes.ErrSudoOutOfGas } } diff --git a/x/contractmanager/types/errors.go b/x/contractmanager/types/errors.go index 612d6742f..d6da70e65 100644 --- a/x/contractmanager/types/errors.go +++ b/x/contractmanager/types/errors.go @@ -9,4 +9,5 @@ var ( IncorrectAckType = errors.Register(ModuleName, 1100, "incorrect acknowledgement type") IncorrectFailureToResubmit = errors.Register(ModuleName, 1101, "incorrect failure to resubmit") FailedToResubmitFailure = errors.Register(ModuleName, 1102, "failed to resubmit acknowledgement") + ErrSudoOutOfGas = errors.Register(ModuleName, 1103, "sudo handling went beyond the gas limit allowed by the module") ) From c54bae5ab8e92a03f1691754d35f9d47e1a58265 Mon Sep 17 00:00:00 2001 From: sotnikov-s Date: Thu, 9 Nov 2023 12:43:25 +0300 Subject: [PATCH 229/307] uniform and polish contractmanager registered errors --- x/contractmanager/keeper/failure.go | 4 ++-- x/contractmanager/types/errors.go | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/x/contractmanager/keeper/failure.go b/x/contractmanager/keeper/failure.go index 54bb3435b..5698a8831 100644 --- a/x/contractmanager/keeper/failure.go +++ b/x/contractmanager/keeper/failure.go @@ -78,11 +78,11 @@ func (k Keeper) GetFailure(ctx sdk.Context, contractAddr sdk.AccAddress, id uint // ResubmitFailure tries to call sudo handler for contract with same parameters as initially. func (k Keeper) ResubmitFailure(ctx sdk.Context, contractAddr sdk.AccAddress, failure *types.Failure) error { if failure.SudoPayload == nil { - return errorsmod.Wrapf(types.IncorrectFailureToResubmit, "cannot resubmit failure without sudo payload; failureId = %d", failure.Id) + return errorsmod.Wrapf(types.ErrIncorrectFailureToResubmit, "cannot resubmit failure without sudo payload; failureId = %d", failure.Id) } if _, err := k.wasmKeeper.Sudo(ctx, contractAddr, failure.SudoPayload); err != nil { - return errorsmod.Wrapf(types.FailedToResubmitFailure, "cannot resubmit failure; failureId = %d; err = %s", failure.Id, err) + return errorsmod.Wrapf(types.ErrFailedToResubmitFailure, "cannot resubmit failure; failureId = %d; err = %s", failure.Id, err) } // Cleanup failure since we resubmitted it successfully diff --git a/x/contractmanager/types/errors.go b/x/contractmanager/types/errors.go index d6da70e65..ba32da1fe 100644 --- a/x/contractmanager/types/errors.go +++ b/x/contractmanager/types/errors.go @@ -6,8 +6,7 @@ import ( // x/contractmanager module sentinel errors var ( - IncorrectAckType = errors.Register(ModuleName, 1100, "incorrect acknowledgement type") - IncorrectFailureToResubmit = errors.Register(ModuleName, 1101, "incorrect failure to resubmit") - FailedToResubmitFailure = errors.Register(ModuleName, 1102, "failed to resubmit acknowledgement") - ErrSudoOutOfGas = errors.Register(ModuleName, 1103, "sudo handling went beyond the gas limit allowed by the module") + ErrIncorrectFailureToResubmit = errors.Register(ModuleName, 1101, "incorrect failure to resubmit") + ErrFailedToResubmitFailure = errors.Register(ModuleName, 1102, "failed to resubmit failure") + ErrSudoOutOfGas = errors.Register(ModuleName, 1103, "sudo handling went beyond the gas limit allowed by the module") ) From eb8b5ae50907439ff9af0527a42ef0cb448a78b5 Mon Sep 17 00:00:00 2001 From: sotnikov-s Date: Thu, 9 Nov 2023 17:14:02 +0300 Subject: [PATCH 230/307] move RedactError func to contractmanager keeper and make public --- x/contractmanager/ibc_middleware.go | 31 +++++++---------------------- x/contractmanager/keeper/failure.go | 26 +++++++++++++++++++++++- 2 files changed, 32 insertions(+), 25 deletions(-) diff --git a/x/contractmanager/ibc_middleware.go b/x/contractmanager/ibc_middleware.go index bf17b64ea..47bb73cdc 100644 --- a/x/contractmanager/ibc_middleware.go +++ b/x/contractmanager/ibc_middleware.go @@ -3,12 +3,10 @@ package contractmanager import ( "fmt" - errorsmod "cosmossdk.io/errors" - wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" - wasmvmtypes "github.com/CosmWasm/wasmvm/types" "github.com/cometbft/cometbft/libs/log" sdk "github.com/cosmos/cosmos-sdk/types" + contractmanagerkeeper "github.com/neutron-org/neutron/x/contractmanager/keeper" contractmanagertypes "github.com/neutron-org/neutron/x/contractmanager/types" ) @@ -37,7 +35,12 @@ func (k SudoLimitWrapper) Sudo(ctx sdk.Context, contractAddress sdk.AccAddress, resp, err = k.WasmKeeper.Sudo(cacheCtx, contractAddress, msg) }() if err != nil { // the contract either returned an error or panicked with `out of gas` - failure := k.contractManager.AddContractFailure(ctx, contractAddress.String(), msg, redactError(err).Error()) + failure := k.contractManager.AddContractFailure( + ctx, + contractAddress.String(), + msg, + contractmanagerkeeper.RedactError(err).Error(), + ) ctx.EventManager().EmitEvents(sdk.Events{ sdk.NewEvent( wasmtypes.EventTypeSudo, @@ -80,23 +83,3 @@ func createCachedContext(ctx sdk.Context, gasLimit uint64) (sdk.Context, func()) cacheCtx = cacheCtx.WithGasMeter(gasMeter) return cacheCtx, writeFn } - -// redactError removes non-determenistic details from the error returning just codespace and core -// of the error. Returns full error for system errors. -// -// Copy+paste from https://github.com/neutron-org/wasmd/blob/5b59886e41ed55a7a4a9ae196e34b0852285503d/x/wasm/keeper/msg_dispatcher.go#L175-L190 -func redactError(err error) error { - // Do not redact system errors - // SystemErrors must be created in x/wasm and we can ensure determinism - if wasmvmtypes.ToSystemError(err) != nil { - return err - } - - // FIXME: do we want to hardcode some constant string mappings here as well? - // Or better document them? (SDK error string may change on a patch release to fix wording) - // sdk/11 is out of gas - // sdk/5 is insufficient funds (on bank send) - // (we can theoretically redact less in the future, but this is a first step to safety) - codespace, code, _ := errorsmod.ABCIInfo(err, false) - return fmt.Errorf("codespace: %s, code: %d", codespace, code) -} diff --git a/x/contractmanager/keeper/failure.go b/x/contractmanager/keeper/failure.go index 5698a8831..8418ad099 100644 --- a/x/contractmanager/keeper/failure.go +++ b/x/contractmanager/keeper/failure.go @@ -1,7 +1,10 @@ package keeper import ( + "fmt" + errorsmod "cosmossdk.io/errors" + wasmvmtypes "github.com/CosmWasm/wasmvm/types" "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" @@ -13,7 +16,8 @@ import ( // // WARNING: The errMsg string parameter is expected to be deterministic. It means that the errMsg // must be OS/library version agnostic and carry a concrete defined error message. One of the good -// ways to do so is to redact error as it is done in SudoLimitWrapper Sudo method: +// ways to do so is to redact error using the RedactError func as it is done in SudoLimitWrapper +// Sudo method: // https://github.com/neutron-org/neutron/blob/4ee803ff75bb8fdddee1ed62fbf8b771d8006347/x/contractmanager/ibc_middleware.go#L40. // Another good way could be passing here some constant value. func (k Keeper) AddContractFailure(ctx sdk.Context, address string, sudoPayload []byte, errMsg string) types.Failure { @@ -96,3 +100,23 @@ func (k Keeper) removeFailure(ctx sdk.Context, contractAddr sdk.AccAddress, id u failureKey := types.GetFailureKey(contractAddr.String(), id) store.Delete(failureKey) } + +// RedactError removes non-determenistic details from the error returning just codespace and core +// of the error. Returns full error for system errors. +// +// Copy+paste from https://github.com/neutron-org/wasmd/blob/5b59886e41ed55a7a4a9ae196e34b0852285503d/x/wasm/keeper/msg_dispatcher.go#L175-L190 +func RedactError(err error) error { + // Do not redact system errors + // SystemErrors must be created in x/wasm and we can ensure determinism + if wasmvmtypes.ToSystemError(err) != nil { + return err + } + + // FIXME: do we want to hardcode some constant string mappings here as well? + // Or better document them? (SDK error string may change on a patch release to fix wording) + // sdk/11 is out of gas + // sdk/5 is insufficient funds (on bank send) + // (we can theoretically redact less in the future, but this is a first step to safety) + codespace, code, _ := errorsmod.ABCIInfo(err, false) + return fmt.Errorf("codespace: %s, code: %d", codespace, code) +} From 11b610b2f00ec67667aefbc9444138c57fd21d0a Mon Sep 17 00:00:00 2001 From: sotnikov-s Date: Thu, 9 Nov 2023 17:15:28 +0300 Subject: [PATCH 231/307] update link to RedactError usage example --- x/contractmanager/keeper/failure.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x/contractmanager/keeper/failure.go b/x/contractmanager/keeper/failure.go index 8418ad099..2be5209f9 100644 --- a/x/contractmanager/keeper/failure.go +++ b/x/contractmanager/keeper/failure.go @@ -18,7 +18,7 @@ import ( // must be OS/library version agnostic and carry a concrete defined error message. One of the good // ways to do so is to redact error using the RedactError func as it is done in SudoLimitWrapper // Sudo method: -// https://github.com/neutron-org/neutron/blob/4ee803ff75bb8fdddee1ed62fbf8b771d8006347/x/contractmanager/ibc_middleware.go#L40. +// https://github.com/neutron-org/neutron/blob/eb8b5ae50907439ff9af0527a42ef0cb448a78b5/x/contractmanager/ibc_middleware.go#L42. // Another good way could be passing here some constant value. func (k Keeper) AddContractFailure(ctx sdk.Context, address string, sudoPayload []byte, errMsg string) types.Failure { failure := types.Failure{ From 824e229d7fcf517b8247cf671c7973c4e2c21e65 Mon Sep 17 00:00:00 2001 From: sotnikov-s Date: Thu, 9 Nov 2023 17:16:04 +0300 Subject: [PATCH 232/307] regenerate mocks and update tests --- .../contractmanager/types/expected_keepers.go | 43 +++++++----- .../interchaintxs/types/expected_keepers.go | 68 +++++++++++-------- wasmbinding/test/custom_message_test.go | 6 +- x/contractmanager/ibc_middleware_test.go | 11 +-- x/contractmanager/keeper/failure_test.go | 18 ++--- x/interchaintxs/keeper/msg_server_test.go | 5 ++ 6 files changed, 90 insertions(+), 61 deletions(-) diff --git a/testutil/mocks/contractmanager/types/expected_keepers.go b/testutil/mocks/contractmanager/types/expected_keepers.go index c69dcf649..67887c4bc 100644 --- a/testutil/mocks/contractmanager/types/expected_keepers.go +++ b/testutil/mocks/contractmanager/types/expected_keepers.go @@ -7,10 +7,10 @@ package mock_types import ( reflect "reflect" - wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" - types "github.com/cosmos/cosmos-sdk/types" + types "github.com/CosmWasm/wasmd/x/wasm/types" + types0 "github.com/cosmos/cosmos-sdk/types" gomock "github.com/golang/mock/gomock" - types0 "github.com/neutron-org/neutron/x/contractmanager/types" + types1 "github.com/neutron-org/neutron/x/contractmanager/types" ) // MockWasmKeeper is a mock of WasmKeeper interface. @@ -19,11 +19,6 @@ type MockWasmKeeper struct { recorder *MockWasmKeeperMockRecorder } -func (m *MockWasmKeeper) GetContractInfo(ctx types.Context, contractAddress types.AccAddress) *wasmtypes.ContractInfo { - //TODO implement me - panic("implement me") -} - // MockWasmKeeperMockRecorder is the mock recorder for MockWasmKeeper. type MockWasmKeeperMockRecorder struct { mock *MockWasmKeeper @@ -41,8 +36,22 @@ func (m *MockWasmKeeper) EXPECT() *MockWasmKeeperMockRecorder { return m.recorder } +// GetContractInfo mocks base method. +func (m *MockWasmKeeper) GetContractInfo(ctx types0.Context, contractAddress types0.AccAddress) *types.ContractInfo { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "GetContractInfo", ctx, contractAddress) + ret0, _ := ret[0].(*types.ContractInfo) + return ret0 +} + +// GetContractInfo indicates an expected call of GetContractInfo. +func (mr *MockWasmKeeperMockRecorder) GetContractInfo(ctx, contractAddress interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetContractInfo", reflect.TypeOf((*MockWasmKeeper)(nil).GetContractInfo), ctx, contractAddress) +} + // HasContractInfo mocks base method. -func (m *MockWasmKeeper) HasContractInfo(ctx types.Context, contractAddress types.AccAddress) bool { +func (m *MockWasmKeeper) HasContractInfo(ctx types0.Context, contractAddress types0.AccAddress) bool { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "HasContractInfo", ctx, contractAddress) ret0, _ := ret[0].(bool) @@ -56,7 +65,7 @@ func (mr *MockWasmKeeperMockRecorder) HasContractInfo(ctx, contractAddress inter } // Sudo mocks base method. -func (m *MockWasmKeeper) Sudo(ctx types.Context, contractAddress types.AccAddress, msg []byte) ([]byte, error) { +func (m *MockWasmKeeper) Sudo(ctx types0.Context, contractAddress types0.AccAddress, msg []byte) ([]byte, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Sudo", ctx, contractAddress, msg) ret0, _ := ret[0].([]byte) @@ -94,22 +103,24 @@ func (m *MockContractManagerKeeper) EXPECT() *MockContractManagerKeeperMockRecor } // AddContractFailure mocks base method. -func (m *MockContractManagerKeeper) AddContractFailure(ctx types.Context, address string, sudoPayload []byte) { +func (m *MockContractManagerKeeper) AddContractFailure(ctx types0.Context, address string, sudoPayload []byte, errMsg string) types1.Failure { m.ctrl.T.Helper() - m.ctrl.Call(m, "AddContractFailure", ctx, address, sudoPayload) + ret := m.ctrl.Call(m, "AddContractFailure", ctx, address, sudoPayload, errMsg) + ret0, _ := ret[0].(types1.Failure) + return ret0 } // AddContractFailure indicates an expected call of AddContractFailure. -func (mr *MockContractManagerKeeperMockRecorder) AddContractFailure(ctx, address, sudoPayload interface{}) *gomock.Call { +func (mr *MockContractManagerKeeperMockRecorder) AddContractFailure(ctx, address, sudoPayload, errMsg interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddContractFailure", reflect.TypeOf((*MockContractManagerKeeper)(nil).AddContractFailure), ctx, address, sudoPayload) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddContractFailure", reflect.TypeOf((*MockContractManagerKeeper)(nil).AddContractFailure), ctx, address, sudoPayload, errMsg) } // GetParams mocks base method. -func (m *MockContractManagerKeeper) GetParams(ctx types.Context) types0.Params { +func (m *MockContractManagerKeeper) GetParams(ctx types0.Context) types1.Params { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetParams", ctx) - ret0, _ := ret[0].(types0.Params) + ret0, _ := ret[0].(types1.Params) return ret0 } diff --git a/testutil/mocks/interchaintxs/types/expected_keepers.go b/testutil/mocks/interchaintxs/types/expected_keepers.go index de9a6d792..32923a9b6 100644 --- a/testutil/mocks/interchaintxs/types/expected_keepers.go +++ b/testutil/mocks/interchaintxs/types/expected_keepers.go @@ -7,15 +7,15 @@ package mock_types import ( reflect "reflect" - wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" - types "github.com/cosmos/cosmos-sdk/types" - types0 "github.com/cosmos/cosmos-sdk/x/auth/types" - types1 "github.com/cosmos/cosmos-sdk/x/capability/types" - types2 "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" - types3 "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" + types "github.com/CosmWasm/wasmd/x/wasm/types" + types0 "github.com/cosmos/cosmos-sdk/types" + types1 "github.com/cosmos/cosmos-sdk/x/auth/types" + types2 "github.com/cosmos/cosmos-sdk/x/capability/types" + types3 "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" + types4 "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" exported "github.com/cosmos/ibc-go/v7/modules/core/exported" gomock "github.com/golang/mock/gomock" - types4 "github.com/neutron-org/neutron/x/feerefunder/types" + types5 "github.com/neutron-org/neutron/x/feerefunder/types" ) // MockAccountKeeper is a mock of AccountKeeper interface. @@ -42,10 +42,10 @@ func (m *MockAccountKeeper) EXPECT() *MockAccountKeeperMockRecorder { } // GetAccount mocks base method. -func (m *MockAccountKeeper) GetAccount(ctx types.Context, addr types.AccAddress) types0.AccountI { +func (m *MockAccountKeeper) GetAccount(ctx types0.Context, addr types0.AccAddress) types1.AccountI { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetAccount", ctx, addr) - ret0, _ := ret[0].(types0.AccountI) + ret0, _ := ret[0].(types1.AccountI) return ret0 } @@ -79,7 +79,7 @@ func (m *MockBankKeeper) EXPECT() *MockBankKeeperMockRecorder { } // SendCoins mocks base method. -func (m *MockBankKeeper) SendCoins(ctx types.Context, fromAddr, toAddr types.AccAddress, amt types.Coins) error { +func (m *MockBankKeeper) SendCoins(ctx types0.Context, fromAddr, toAddr types0.AccAddress, amt types0.Coins) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "SendCoins", ctx, fromAddr, toAddr, amt) ret0, _ := ret[0].(error) @@ -93,10 +93,10 @@ func (mr *MockBankKeeperMockRecorder) SendCoins(ctx, fromAddr, toAddr, amt inter } // SpendableCoins mocks base method. -func (m *MockBankKeeper) SpendableCoins(ctx types.Context, addr types.AccAddress) types.Coins { +func (m *MockBankKeeper) SpendableCoins(ctx types0.Context, addr types0.AccAddress) types0.Coins { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "SpendableCoins", ctx, addr) - ret0, _ := ret[0].(types.Coins) + ret0, _ := ret[0].(types0.Coins) return ret0 } @@ -112,10 +112,6 @@ type MockWasmKeeper struct { recorder *MockWasmKeeperMockRecorder } -func (m *MockWasmKeeper) GetContractInfo(ctx types.Context, contractAddress types.AccAddress) *wasmtypes.ContractInfo { - return &wasmtypes.ContractInfo{CodeID: 1} -} - // MockWasmKeeperMockRecorder is the mock recorder for MockWasmKeeper. type MockWasmKeeperMockRecorder struct { mock *MockWasmKeeper @@ -133,8 +129,22 @@ func (m *MockWasmKeeper) EXPECT() *MockWasmKeeperMockRecorder { return m.recorder } +// GetContractInfo mocks base method. +func (m *MockWasmKeeper) GetContractInfo(ctx types0.Context, contractAddress types0.AccAddress) *types.ContractInfo { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "GetContractInfo", ctx, contractAddress) + ret0, _ := ret[0].(*types.ContractInfo) + return ret0 +} + +// GetContractInfo indicates an expected call of GetContractInfo. +func (mr *MockWasmKeeperMockRecorder) GetContractInfo(ctx, contractAddress interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetContractInfo", reflect.TypeOf((*MockWasmKeeper)(nil).GetContractInfo), ctx, contractAddress) +} + // HasContractInfo mocks base method. -func (m *MockWasmKeeper) HasContractInfo(ctx types.Context, contractAddress types.AccAddress) bool { +func (m *MockWasmKeeper) HasContractInfo(ctx types0.Context, contractAddress types0.AccAddress) bool { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "HasContractInfo", ctx, contractAddress) ret0, _ := ret[0].(bool) @@ -148,7 +158,7 @@ func (mr *MockWasmKeeperMockRecorder) HasContractInfo(ctx, contractAddress inter } // Sudo mocks base method. -func (m *MockWasmKeeper) Sudo(ctx types.Context, contractAddress types.AccAddress, msg []byte) ([]byte, error) { +func (m *MockWasmKeeper) Sudo(ctx types0.Context, contractAddress types0.AccAddress, msg []byte) ([]byte, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Sudo", ctx, contractAddress, msg) ret0, _ := ret[0].([]byte) @@ -186,7 +196,7 @@ func (m *MockICAControllerKeeper) EXPECT() *MockICAControllerKeeperMockRecorder } // GetActiveChannelID mocks base method. -func (m *MockICAControllerKeeper) GetActiveChannelID(ctx types.Context, connectionID, portID string) (string, bool) { +func (m *MockICAControllerKeeper) GetActiveChannelID(ctx types0.Context, connectionID, portID string) (string, bool) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetActiveChannelID", ctx, connectionID, portID) ret0, _ := ret[0].(string) @@ -201,7 +211,7 @@ func (mr *MockICAControllerKeeperMockRecorder) GetActiveChannelID(ctx, connectio } // GetInterchainAccountAddress mocks base method. -func (m *MockICAControllerKeeper) GetInterchainAccountAddress(ctx types.Context, connectionID, portID string) (string, bool) { +func (m *MockICAControllerKeeper) GetInterchainAccountAddress(ctx types0.Context, connectionID, portID string) (string, bool) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetInterchainAccountAddress", ctx, connectionID, portID) ret0, _ := ret[0].(string) @@ -216,7 +226,7 @@ func (mr *MockICAControllerKeeperMockRecorder) GetInterchainAccountAddress(ctx, } // RegisterInterchainAccount mocks base method. -func (m *MockICAControllerKeeper) RegisterInterchainAccount(ctx types.Context, connectionID, owner, version string) error { +func (m *MockICAControllerKeeper) RegisterInterchainAccount(ctx types0.Context, connectionID, owner, version string) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "RegisterInterchainAccount", ctx, connectionID, owner, version) ret0, _ := ret[0].(error) @@ -230,7 +240,7 @@ func (mr *MockICAControllerKeeperMockRecorder) RegisterInterchainAccount(ctx, co } // SendTx mocks base method. -func (m *MockICAControllerKeeper) SendTx(ctx types.Context, chanCap *types1.Capability, connectionID, portID string, icaPacketData types2.InterchainAccountPacketData, timeoutTimestamp uint64) (uint64, error) { +func (m *MockICAControllerKeeper) SendTx(ctx types0.Context, chanCap *types2.Capability, connectionID, portID string, icaPacketData types3.InterchainAccountPacketData, timeoutTimestamp uint64) (uint64, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "SendTx", ctx, chanCap, connectionID, portID, icaPacketData, timeoutTimestamp) ret0, _ := ret[0].(uint64) @@ -268,7 +278,7 @@ func (m *MockFeeRefunderKeeper) EXPECT() *MockFeeRefunderKeeperMockRecorder { } // DistributeAcknowledgementFee mocks base method. -func (m *MockFeeRefunderKeeper) DistributeAcknowledgementFee(ctx types.Context, receiver types.AccAddress, packetID types4.PacketID) { +func (m *MockFeeRefunderKeeper) DistributeAcknowledgementFee(ctx types0.Context, receiver types0.AccAddress, packetID types5.PacketID) { m.ctrl.T.Helper() m.ctrl.Call(m, "DistributeAcknowledgementFee", ctx, receiver, packetID) } @@ -280,7 +290,7 @@ func (mr *MockFeeRefunderKeeperMockRecorder) DistributeAcknowledgementFee(ctx, r } // DistributeTimeoutFee mocks base method. -func (m *MockFeeRefunderKeeper) DistributeTimeoutFee(ctx types.Context, receiver types.AccAddress, packetID types4.PacketID) { +func (m *MockFeeRefunderKeeper) DistributeTimeoutFee(ctx types0.Context, receiver types0.AccAddress, packetID types5.PacketID) { m.ctrl.T.Helper() m.ctrl.Call(m, "DistributeTimeoutFee", ctx, receiver, packetID) } @@ -292,7 +302,7 @@ func (mr *MockFeeRefunderKeeperMockRecorder) DistributeTimeoutFee(ctx, receiver, } // LockFees mocks base method. -func (m *MockFeeRefunderKeeper) LockFees(ctx types.Context, payer types.AccAddress, packetID types4.PacketID, fee types4.Fee) error { +func (m *MockFeeRefunderKeeper) LockFees(ctx types0.Context, payer types0.AccAddress, packetID types5.PacketID, fee types5.Fee) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "LockFees", ctx, payer, packetID, fee) ret0, _ := ret[0].(error) @@ -329,10 +339,10 @@ func (m *MockChannelKeeper) EXPECT() *MockChannelKeeperMockRecorder { } // GetChannel mocks base method. -func (m *MockChannelKeeper) GetChannel(ctx types.Context, srcPort, srcChan string) (types3.Channel, bool) { +func (m *MockChannelKeeper) GetChannel(ctx types0.Context, srcPort, srcChan string) (types4.Channel, bool) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetChannel", ctx, srcPort, srcChan) - ret0, _ := ret[0].(types3.Channel) + ret0, _ := ret[0].(types4.Channel) ret1, _ := ret[1].(bool) return ret0, ret1 } @@ -344,7 +354,7 @@ func (mr *MockChannelKeeperMockRecorder) GetChannel(ctx, srcPort, srcChan interf } // GetConnection mocks base method. -func (m *MockChannelKeeper) GetConnection(ctx types.Context, connectionID string) (exported.ConnectionI, error) { +func (m *MockChannelKeeper) GetConnection(ctx types0.Context, connectionID string) (exported.ConnectionI, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetConnection", ctx, connectionID) ret0, _ := ret[0].(exported.ConnectionI) @@ -359,7 +369,7 @@ func (mr *MockChannelKeeperMockRecorder) GetConnection(ctx, connectionID interfa } // GetNextSequenceSend mocks base method. -func (m *MockChannelKeeper) GetNextSequenceSend(ctx types.Context, portID, channelID string) (uint64, bool) { +func (m *MockChannelKeeper) GetNextSequenceSend(ctx types0.Context, portID, channelID string) (uint64, bool) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetNextSequenceSend", ctx, portID, channelID) ret0, _ := ret[0].(uint64) diff --git a/wasmbinding/test/custom_message_test.go b/wasmbinding/test/custom_message_test.go index a79dd73db..373aa67b7 100644 --- a/wasmbinding/test/custom_message_test.go +++ b/wasmbinding/test/custom_message_test.go @@ -637,7 +637,7 @@ func (suite *CustomMessengerTestSuite) TestResubmitFailureAck() { payload, err := keeper2.PrepareSudoCallbackMessage(packet, &ack) require.NoError(suite.T(), err) failureID := suite.messenger.ContractmanagerKeeper.GetNextFailureIDKey(suite.ctx, suite.contractAddress.String()) - suite.messenger.ContractmanagerKeeper.AddContractFailure(suite.ctx, suite.contractAddress.String(), payload) + suite.messenger.ContractmanagerKeeper.AddContractFailure(suite.ctx, suite.contractAddress.String(), payload, "test error") // Craft message msg, err := json.Marshal(bindings.NeutronMsg{ @@ -669,7 +669,7 @@ func (suite *CustomMessengerTestSuite) TestResubmitFailureTimeout() { payload, err := keeper2.PrepareSudoCallbackMessage(packet, nil) require.NoError(suite.T(), err) failureID := suite.messenger.ContractmanagerKeeper.GetNextFailureIDKey(suite.ctx, suite.contractAddress.String()) - suite.messenger.ContractmanagerKeeper.AddContractFailure(suite.ctx, suite.contractAddress.String(), payload) + suite.messenger.ContractmanagerKeeper.AddContractFailure(suite.ctx, suite.contractAddress.String(), payload, "test error") // Craft message msg, err := json.Marshal(bindings.NeutronMsg{ @@ -704,7 +704,7 @@ func (suite *CustomMessengerTestSuite) TestResubmitFailureFromDifferentContract( failureID := suite.messenger.ContractmanagerKeeper.GetNextFailureIDKey(suite.ctx, testutil.TestOwnerAddress) payload, err := keeper2.PrepareSudoCallbackMessage(packet, &ack) require.NoError(suite.T(), err) - suite.messenger.ContractmanagerKeeper.AddContractFailure(suite.ctx, testutil.TestOwnerAddress, payload) + suite.messenger.ContractmanagerKeeper.AddContractFailure(suite.ctx, testutil.TestOwnerAddress, payload, "test error") // Craft message msg, err := json.Marshal(bindings.NeutronMsg{ diff --git a/x/contractmanager/ibc_middleware_test.go b/x/contractmanager/ibc_middleware_test.go index 991d93af7..edadde2cb 100644 --- a/x/contractmanager/ibc_middleware_test.go +++ b/x/contractmanager/ibc_middleware_test.go @@ -1,13 +1,14 @@ package contractmanager_test import ( - "fmt" "testing" + wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/golang/mock/gomock" test_keeper "github.com/neutron-org/neutron/testutil/interchaintxs/keeper" mock_types "github.com/neutron-org/neutron/testutil/mocks/contractmanager/types" + contractmanagerkeeper "github.com/neutron-org/neutron/x/contractmanager/keeper" "github.com/neutron-org/neutron/x/contractmanager/types" "github.com/stretchr/testify/require" ) @@ -49,11 +50,11 @@ func TestSudo(t *testing.T) { // error during Sudo ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 10000}) - cmKeeper.EXPECT().AddContractFailure(ctx, contractAddress.String(), msg) + cmKeeper.EXPECT().AddContractFailure(ctx, contractAddress.String(), msg, contractmanagerkeeper.RedactError(wasmtypes.ErrExecuteFailed)) wmKeeper.EXPECT().Sudo(gomock.AssignableToTypeOf(ctx), contractAddress, msg).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, msg []byte) { st := cachedCtx.KVStore(storeKey) st.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) - }).Return(nil, fmt.Errorf("sudo error")) + }).Return(nil, wasmtypes.ErrExecuteFailed) _, err = middleware.Sudo(ctx, contractAddress, msg) require.Error(t, err) require.Nil(t, st.Get(ShouldNotBeWrittenKey)) @@ -61,13 +62,13 @@ func TestSudo(t *testing.T) { // ou of gas during Sudo ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 10000}) - cmKeeper.EXPECT().AddContractFailure(ctx, contractAddress.String(), msg) + cmKeeper.EXPECT().AddContractFailure(ctx, contractAddress.String(), msg, contractmanagerkeeper.RedactError(types.ErrSudoOutOfGas)) wmKeeper.EXPECT().Sudo(gomock.AssignableToTypeOf(ctx), contractAddress, msg).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, msg []byte) { st := cachedCtx.KVStore(storeKey) st.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) cachedCtx.GasMeter().ConsumeGas(10001, "heavy calculations") }) _, err = middleware.Sudo(ctx, contractAddress, msg) - require.ErrorContains(t, err, "{heavy calculations}: panic") + require.ErrorContains(t, err, types.ErrSudoOutOfGas.Error()) require.Nil(t, st.Get(ShouldNotBeWrittenKey)) } diff --git a/x/contractmanager/keeper/failure_test.go b/x/contractmanager/keeper/failure_test.go index b76ef3013..d0871d3e8 100644 --- a/x/contractmanager/keeper/failure_test.go +++ b/x/contractmanager/keeper/failure_test.go @@ -48,7 +48,8 @@ func createNFailure(k *keeper.Keeper, ctx sdk.Context, addresses, failures int) panic(err) } items[i][c].SudoPayload = sudo - k.AddContractFailure(ctx, items[i][c].Address, sudo) + items[i][c].Error = "test error" + k.AddContractFailure(ctx, items[i][c].Address, sudo, "test error") } } return items @@ -87,11 +88,12 @@ func TestAddGetFailure(t *testing.T) { k, ctx := keepertest.ContractManagerKeeper(t, nil) failureID := k.GetNextFailureIDKey(ctx, contractAddress.String()) sudoPayload := []byte("payload") - k.AddContractFailure(ctx, contractAddress.String(), sudoPayload) + k.AddContractFailure(ctx, contractAddress.String(), sudoPayload, "test error") failure, err := k.GetFailure(ctx, contractAddress, failureID) require.NoError(t, err) require.Equal(t, failureID, failure.Id) require.Equal(t, sudoPayload, failure.SudoPayload) + require.Equal(t, "test error", failure.Error) // non-existent id _, err = k.GetFailure(ctx, contractAddress, failureID+1) @@ -123,7 +125,7 @@ func TestResubmitFailure(t *testing.T) { failureID := k.GetNextFailureIDKey(ctx, contractAddr.String()) payload, err := keeper.PrepareSudoCallbackMessage(packet, &ack) require.NoError(t, err) - k.AddContractFailure(ctx, contractAddr.String(), payload) + k.AddContractFailure(ctx, contractAddr.String(), payload, "test error") // success response xSuc := types.MessageSudoCallback{Response: &types.ResponseSudoPayload{ @@ -159,7 +161,7 @@ func TestResubmitFailure(t *testing.T) { failureID2 := k.GetNextFailureIDKey(ctx, contractAddr.String()) payload, err = keeper.PrepareSudoCallbackMessage(packet, &ack) require.NoError(t, err) - k.AddContractFailure(ctx, contractAddr.String(), payload) + k.AddContractFailure(ctx, contractAddr.String(), payload, "test error") wk.EXPECT().Sudo(ctx, contractAddr, msgSuc).Return(nil, fmt.Errorf("failed to sudo")) @@ -177,7 +179,7 @@ func TestResubmitFailure(t *testing.T) { failureID3 := k.GetNextFailureIDKey(ctx, contractAddr.String()) payload, err = keeper.PrepareSudoCallbackMessage(packet, &ackError) require.NoError(t, err) - k.AddContractFailure(ctx, contractAddr.String(), payload) + k.AddContractFailure(ctx, contractAddr.String(), payload, "test error") wk.EXPECT().Sudo(gomock.AssignableToTypeOf(ctx), contractAddr, msgErr).Return([]byte{}, nil) @@ -193,7 +195,7 @@ func TestResubmitFailure(t *testing.T) { failureID4 := k.GetNextFailureIDKey(ctx, contractAddr.String()) payload, err = keeper.PrepareSudoCallbackMessage(packet, &ackError) require.NoError(t, err) - k.AddContractFailure(ctx, contractAddr.String(), payload) + k.AddContractFailure(ctx, contractAddr.String(), payload, "test error") wk.EXPECT().Sudo(gomock.AssignableToTypeOf(ctx), contractAddr, msgErr).Return(nil, fmt.Errorf("failed to sudo")) @@ -211,7 +213,7 @@ func TestResubmitFailure(t *testing.T) { failureID5 := k.GetNextFailureIDKey(ctx, contractAddr.String()) payload, err = keeper.PrepareSudoCallbackMessage(packet, nil) require.NoError(t, err) - k.AddContractFailure(ctx, contractAddr.String(), payload) + k.AddContractFailure(ctx, contractAddr.String(), payload, "test error") wk.EXPECT().Sudo(gomock.AssignableToTypeOf(ctx), contractAddr, msgTimeout).Return([]byte{}, nil) @@ -227,7 +229,7 @@ func TestResubmitFailure(t *testing.T) { failureID6 := k.GetNextFailureIDKey(ctx, contractAddr.String()) payload, err = keeper.PrepareSudoCallbackMessage(packet, nil) require.NoError(t, err) - k.AddContractFailure(ctx, contractAddr.String(), payload) + k.AddContractFailure(ctx, contractAddr.String(), payload, "test error") wk.EXPECT().Sudo(gomock.AssignableToTypeOf(ctx), contractAddr, msgTimeout).Return(nil, fmt.Errorf("failed to sudo")) diff --git a/x/interchaintxs/keeper/msg_server_test.go b/x/interchaintxs/keeper/msg_server_test.go index c4c173deb..b542bb112 100644 --- a/x/interchaintxs/keeper/msg_server_test.go +++ b/x/interchaintxs/keeper/msg_server_test.go @@ -7,6 +7,7 @@ import ( "github.com/neutron-org/neutron/app/params" + wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" feerefundertypes "github.com/neutron-org/neutron/x/feerefunder/types" "github.com/neutron-org/neutron/x/interchaintxs/keeper" @@ -54,6 +55,7 @@ func TestRegisterInterchainAccount(t *testing.T) { require.Nil(t, resp) wmKeeper.EXPECT().HasContractInfo(ctx, contractAddress).Return(true) + wmKeeper.EXPECT().GetContractInfo(ctx, contractAddress).Return(&wasmtypes.ContractInfo{CodeID: 1}) resp, err = icak.RegisterInterchainAccount(goCtx, &msgRegAcc) require.ErrorContains(t, err, "failed to charge fees to pay for RegisterInterchainAccount msg") require.Nil(t, resp) @@ -61,6 +63,7 @@ func TestRegisterInterchainAccount(t *testing.T) { msgRegAcc.RegisterFee = sdk.NewCoins(sdk.NewCoin(params.DefaultDenom, sdk.NewInt(1000))) wmKeeper.EXPECT().HasContractInfo(ctx, contractAddress).Return(true) + wmKeeper.EXPECT().GetContractInfo(ctx, contractAddress).Return(&wasmtypes.ContractInfo{CodeID: 1}) bankKeeper.EXPECT().SendCoins(ctx, sdk.MustAccAddressFromBech32(msgRegAcc.FromAddress), sdk.MustAccAddressFromBech32(TestFeeCollectorAddr), msgRegAcc.RegisterFee) icaKeeper.EXPECT().RegisterInterchainAccount(ctx, msgRegAcc.ConnectionId, icaOwner.String(), "").Return(fmt.Errorf("failed to register ica")) resp, err = icak.RegisterInterchainAccount(goCtx, &msgRegAcc) @@ -68,6 +71,7 @@ func TestRegisterInterchainAccount(t *testing.T) { require.Nil(t, resp) wmKeeper.EXPECT().HasContractInfo(ctx, contractAddress).Return(true) + wmKeeper.EXPECT().GetContractInfo(ctx, contractAddress).Return(&wasmtypes.ContractInfo{CodeID: 1}) bankKeeper.EXPECT(). SendCoins(ctx, sdk.MustAccAddressFromBech32(msgRegAcc.FromAddress), sdk.MustAccAddressFromBech32(TestFeeCollectorAddr), msgRegAcc.RegisterFee). Return(fmt.Errorf("failed to send coins")) @@ -76,6 +80,7 @@ func TestRegisterInterchainAccount(t *testing.T) { require.Nil(t, resp) wmKeeper.EXPECT().HasContractInfo(ctx, contractAddress).Return(true) + wmKeeper.EXPECT().GetContractInfo(ctx, contractAddress).Return(&wasmtypes.ContractInfo{CodeID: 1}) bankKeeper.EXPECT().SendCoins(ctx, sdk.MustAccAddressFromBech32(msgRegAcc.FromAddress), sdk.MustAccAddressFromBech32(TestFeeCollectorAddr), msgRegAcc.RegisterFee) icaKeeper.EXPECT().RegisterInterchainAccount(ctx, msgRegAcc.ConnectionId, icaOwner.String(), "").Return(nil) resp, err = icak.RegisterInterchainAccount(goCtx, &msgRegAcc) From bed0634b683111745246c4082374cb95832064ea Mon Sep 17 00:00:00 2001 From: sotnikov-s Date: Thu, 9 Nov 2023 17:27:26 +0300 Subject: [PATCH 233/307] fix types difference in EXPECT().AddContractFailure --- x/contractmanager/ibc_middleware_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x/contractmanager/ibc_middleware_test.go b/x/contractmanager/ibc_middleware_test.go index edadde2cb..f56fbd95c 100644 --- a/x/contractmanager/ibc_middleware_test.go +++ b/x/contractmanager/ibc_middleware_test.go @@ -50,7 +50,7 @@ func TestSudo(t *testing.T) { // error during Sudo ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 10000}) - cmKeeper.EXPECT().AddContractFailure(ctx, contractAddress.String(), msg, contractmanagerkeeper.RedactError(wasmtypes.ErrExecuteFailed)) + cmKeeper.EXPECT().AddContractFailure(ctx, contractAddress.String(), msg, contractmanagerkeeper.RedactError(wasmtypes.ErrExecuteFailed).Error()) wmKeeper.EXPECT().Sudo(gomock.AssignableToTypeOf(ctx), contractAddress, msg).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, msg []byte) { st := cachedCtx.KVStore(storeKey) st.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) @@ -62,7 +62,7 @@ func TestSudo(t *testing.T) { // ou of gas during Sudo ctx = infCtx.WithGasMeter(sdk.NewGasMeter(1_000_000_000_000)) cmKeeper.EXPECT().GetParams(ctx).Return(types.Params{SudoCallGasLimit: 10000}) - cmKeeper.EXPECT().AddContractFailure(ctx, contractAddress.String(), msg, contractmanagerkeeper.RedactError(types.ErrSudoOutOfGas)) + cmKeeper.EXPECT().AddContractFailure(ctx, contractAddress.String(), msg, contractmanagerkeeper.RedactError(types.ErrSudoOutOfGas).Error()) wmKeeper.EXPECT().Sudo(gomock.AssignableToTypeOf(ctx), contractAddress, msg).Do(func(cachedCtx sdk.Context, senderAddress sdk.AccAddress, msg []byte) { st := cachedCtx.KVStore(storeKey) st.Set(ShouldNotBeWrittenKey, ShouldNotBeWritten) From 2940131f782223065e69d5fb227b377b788a867c Mon Sep 17 00:00:00 2001 From: Julian Compagni Portis Date: Thu, 9 Nov 2023 21:20:09 -0500 Subject: [PATCH 234/307] Add extra logic to ensure GetLimitOrderTrancheByKey cannot return nil, true --- x/dex/keeper/limit_order_tranche.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/x/dex/keeper/limit_order_tranche.go b/x/dex/keeper/limit_order_tranche.go index 791629989..07974b925 100644 --- a/x/dex/keeper/limit_order_tranche.go +++ b/x/dex/keeper/limit_order_tranche.go @@ -102,7 +102,11 @@ func (k Keeper) GetLimitOrderTrancheByKey( var tick types.TickLiquidity k.cdc.MustUnmarshal(b, &tick) - return tick.GetLimitOrderTranche(), true + tranche = tick.GetLimitOrderTranche() + if tranche != nil { + return tranche, true + } + return nil, false } func (k Keeper) RemoveLimitOrderTranche(ctx sdk.Context, trancheKey *types.LimitOrderTrancheKey) { From 0249e41cde5904ddfd11c3bf312e2983cbb4141c Mon Sep 17 00:00:00 2001 From: Julian Compagni Portis Date: Thu, 9 Nov 2023 21:30:49 -0500 Subject: [PATCH 235/307] Rename SwapExactAmountIn to be more accurate and add more disclaimers --- x/dex/keeper/multihop_swap.go | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/x/dex/keeper/multihop_swap.go b/x/dex/keeper/multihop_swap.go index 656a76732..6565425da 100644 --- a/x/dex/keeper/multihop_swap.go +++ b/x/dex/keeper/multihop_swap.go @@ -76,10 +76,12 @@ func (k Keeper) MultihopStep( } // TODO: Due to rounding on swap it is possible to leak tokens at each hop. - // In these cases the user will end up with trace amounts of tokens from intermediary steps. + // In these cases the user will lose trace amounts of tokens from intermediary steps. // To fix this we would have to pre-calculate the route such that the amount - // in will be used completely at each step - coinOut, err := k.SwapExactAmountIn(bctx.Ctx, step.tradePairID, inCoin.Amount) + // in will be used completely at each step. + // As an intermediary fix, we should credit the unswapped coins back to the user's account. + + coinOut, err := k.SwapFullAmountIn(bctx.Ctx, step.tradePairID, inCoin.Amount) ctxBranch := bctx.Branch() stepCache[cacheKey] = StepResult{Ctx: bctx, CoinOut: coinOut, Err: err} if err != nil { @@ -139,7 +141,9 @@ func (k Keeper) RunMultihopRoute( return currentOutCoin, bCacheCtx.WriteCache, nil } -func (k Keeper) SwapExactAmountIn(ctx sdk.Context, +// NOTE: SwapFullAmountIn does not ensure that 100% of amountIn is used. Due to rounding it is possible that +// a dust amount of AmountIn remains unswapped. It is the caller's responsibility to handle this appropriately. +func (k Keeper) SwapFullAmountIn(ctx sdk.Context, tradePairID *types.TradePairID, amountIn math.Int, ) (totalOut sdk.Coin, err error) { From dde0a57bb2cec513b95d83b8572593369a9bce63 Mon Sep 17 00:00:00 2001 From: Julian Compagni Portis Date: Thu, 9 Nov 2023 21:35:39 -0500 Subject: [PATCH 236/307] FIX: valid options array is correct length for deposit --- x/dex/types/message_deposit.go | 3 ++- x/dex/types/message_deposit_test.go | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/x/dex/types/message_deposit.go b/x/dex/types/message_deposit.go index 841b0328e..aa097c823 100644 --- a/x/dex/types/message_deposit.go +++ b/x/dex/types/message_deposit.go @@ -71,7 +71,8 @@ func (msg *MsgDeposit) ValidateBasic() error { numDeposits := len(msg.AmountsA) if numDeposits != len(msg.Fees) || numDeposits != len(msg.TickIndexesAToB) || - numDeposits != len(msg.AmountsB) { + numDeposits != len(msg.AmountsB) || + numDeposits != len(msg.Options) { return ErrUnbalancedTxArray } if numDeposits == 0 { diff --git a/x/dex/types/message_deposit_test.go b/x/dex/types/message_deposit_test.go index 33c8baf35..61d35a13d 100644 --- a/x/dex/types/message_deposit_test.go +++ b/x/dex/types/message_deposit_test.go @@ -24,6 +24,7 @@ func TestMsgDeposit_ValidateBasic(t *testing.T) { TickIndexesAToB: []int64{0}, AmountsA: []math.Int{math.OneInt()}, AmountsB: []math.Int{math.OneInt()}, + Options: []*DepositOptions{{true}}, }, err: ErrInvalidAddress, }, @@ -36,6 +37,7 @@ func TestMsgDeposit_ValidateBasic(t *testing.T) { TickIndexesAToB: []int64{0}, AmountsA: []math.Int{math.OneInt()}, AmountsB: []math.Int{math.OneInt()}, + Options: []*DepositOptions{{true}}, }, err: ErrInvalidAddress, }, @@ -48,6 +50,7 @@ func TestMsgDeposit_ValidateBasic(t *testing.T) { TickIndexesAToB: []int64{}, AmountsA: []math.Int{}, AmountsB: []math.Int{}, + Options: []*DepositOptions{{true}}, }, err: ErrUnbalancedTxArray, }, @@ -60,6 +63,7 @@ func TestMsgDeposit_ValidateBasic(t *testing.T) { TickIndexesAToB: []int64{0}, AmountsA: []math.Int{}, AmountsB: []math.Int{}, + Options: []*DepositOptions{{true}}, }, err: ErrUnbalancedTxArray, }, @@ -72,6 +76,7 @@ func TestMsgDeposit_ValidateBasic(t *testing.T) { TickIndexesAToB: []int64{}, AmountsA: []math.Int{math.OneInt()}, AmountsB: []math.Int{}, + Options: []*DepositOptions{{true}}, }, err: ErrUnbalancedTxArray, }, @@ -84,6 +89,20 @@ func TestMsgDeposit_ValidateBasic(t *testing.T) { TickIndexesAToB: []int64{}, AmountsA: []math.Int{}, AmountsB: []math.Int{math.OneInt()}, + Options: []*DepositOptions{{true}}, + }, + err: ErrUnbalancedTxArray, + }, + { + name: "invalid options length", + msg: MsgDeposit{ + Creator: sample.AccAddress(), + Receiver: sample.AccAddress(), + Fees: []uint64{1}, + TickIndexesAToB: []int64{1}, + AmountsA: []math.Int{math.OneInt()}, + AmountsB: []math.Int{math.OneInt()}, + Options: []*DepositOptions{}, }, err: ErrUnbalancedTxArray, }, @@ -96,6 +115,7 @@ func TestMsgDeposit_ValidateBasic(t *testing.T) { TickIndexesAToB: []int64{}, AmountsA: []math.Int{}, AmountsB: []math.Int{}, + Options: []*DepositOptions{}, }, err: ErrZeroDeposit, }, @@ -108,6 +128,7 @@ func TestMsgDeposit_ValidateBasic(t *testing.T) { TickIndexesAToB: []int64{0}, AmountsA: []math.Int{math.ZeroInt()}, AmountsB: []math.Int{math.ZeroInt()}, + Options: []*DepositOptions{{true}}, }, err: ErrZeroDeposit, }, @@ -120,6 +141,7 @@ func TestMsgDeposit_ValidateBasic(t *testing.T) { TickIndexesAToB: []int64{0}, AmountsA: []math.Int{math.OneInt()}, AmountsB: []math.Int{math.OneInt()}, + Options: []*DepositOptions{{true}}, }, }, } From 47d47dbad2fd168d3118bf1828c5dcbc92cee516 Mon Sep 17 00:00:00 2001 From: Julian Compagni Portis Date: Thu, 9 Nov 2023 21:02:50 -0500 Subject: [PATCH 237/307] Ensure deposit, withdraw and place/withdraw limit order correctly validate inputs to ensure that abs(tick) + fee < MaxTickExp This not only provides better validation for transactins that will fail at later price checks, but also ensures that tick + fee combinations that could overflow an int64 are not allowed into the system. --- x/dex/types/errors.go | 2 +- x/dex/types/message_deposit.go | 3 +++ x/dex/types/message_deposit_test.go | 24 +++++++++++++++++ x/dex/types/message_place_limit_order.go | 4 +++ x/dex/types/message_place_limit_order_test.go | 26 +++++++++++++++++++ x/dex/types/message_withdrawl.go | 3 +++ x/dex/types/message_withdrawl_test.go | 22 ++++++++++++++++ x/dex/types/price.go | 11 +++++++- 8 files changed, 93 insertions(+), 2 deletions(-) diff --git a/x/dex/types/errors.go b/x/dex/types/errors.go index 7f4eaa964..38ce01170 100644 --- a/x/dex/types/errors.go +++ b/x/dex/types/errors.go @@ -42,7 +42,7 @@ var ( ErrTickOutsideRange = sdkerrors.Register( ModuleName, 1117, - "Supplying a tick > 559,680 is not allowed", + "abs(tick) + fee must be < 559,680", ) ErrInvalidPoolDenom = sdkerrors.Register( ModuleName, diff --git a/x/dex/types/message_deposit.go b/x/dex/types/message_deposit.go index 841b0328e..300ad5c45 100644 --- a/x/dex/types/message_deposit.go +++ b/x/dex/types/message_deposit.go @@ -85,6 +85,9 @@ func (msg *MsgDeposit) ValidateBasic() error { if msg.AmountsA[i].Equal(math.ZeroInt()) && msg.AmountsB[i].Equal(math.ZeroInt()) { return ErrZeroDeposit } + if err := ValidateTickFee(msg.TickIndexesAToB[i], msg.Fees[i]); err != nil { + return err + } } return nil diff --git a/x/dex/types/message_deposit_test.go b/x/dex/types/message_deposit_test.go index 33c8baf35..46d57d599 100644 --- a/x/dex/types/message_deposit_test.go +++ b/x/dex/types/message_deposit_test.go @@ -111,6 +111,30 @@ func TestMsgDeposit_ValidateBasic(t *testing.T) { }, err: ErrZeroDeposit, }, + { + name: "invalid tick + fee upper", + msg: MsgDeposit{ + Creator: sample.AccAddress(), + Receiver: sample.AccAddress(), + Fees: []uint64{3}, + TickIndexesAToB: []int64{559678}, + AmountsA: []math.Int{math.OneInt()}, + AmountsB: []math.Int{math.OneInt()}, + }, + err: ErrTickOutsideRange, + }, + { + name: "invalid tick + fee lower", + msg: MsgDeposit{ + Creator: sample.AccAddress(), + Receiver: sample.AccAddress(), + Fees: []uint64{50}, + TickIndexesAToB: []int64{-559631}, + AmountsA: []math.Int{math.OneInt()}, + AmountsB: []math.Int{math.OneInt()}, + }, + err: ErrTickOutsideRange, + }, { name: "valid msg", msg: MsgDeposit{ diff --git a/x/dex/types/message_place_limit_order.go b/x/dex/types/message_place_limit_order.go index 33593ad26..5b3c4e83a 100644 --- a/x/dex/types/message_place_limit_order.go +++ b/x/dex/types/message_place_limit_order.go @@ -90,6 +90,10 @@ func (msg *MsgPlaceLimitOrder) ValidateBasic() error { } } + if IsTickOutOfRange(msg.TickIndexInToOut) { + return ErrTickOutsideRange + } + return nil } diff --git a/x/dex/types/message_place_limit_order_test.go b/x/dex/types/message_place_limit_order_test.go index 2c80d90d1..37ca551f3 100644 --- a/x/dex/types/message_place_limit_order_test.go +++ b/x/dex/types/message_place_limit_order_test.go @@ -81,6 +81,32 @@ func TestMsgPlaceLimitOrder_ValidateBasic(t *testing.T) { }, err: ErrInvalidMaxAmountOutForMaker, }, + { + name: "tick outside range upper", + msg: MsgPlaceLimitOrder{ + Creator: sample.AccAddress(), + Receiver: sample.AccAddress(), + TokenIn: "TokenA", + TokenOut: "TokenB", + TickIndexInToOut: 700_000, + AmountIn: math.OneInt(), + OrderType: LimitOrderType_GOOD_TIL_CANCELLED, + }, + err: ErrTickOutsideRange, + }, + { + name: "tick outside range lower", + msg: MsgPlaceLimitOrder{ + Creator: sample.AccAddress(), + Receiver: sample.AccAddress(), + TokenIn: "TokenA", + TokenOut: "TokenB", + TickIndexInToOut: -600_000, + AmountIn: math.OneInt(), + OrderType: LimitOrderType_GOOD_TIL_CANCELLED, + }, + err: ErrTickOutsideRange, + }, { name: "valid msg", msg: MsgPlaceLimitOrder{ diff --git a/x/dex/types/message_withdrawl.go b/x/dex/types/message_withdrawl.go index 564b3edbf..168208a62 100644 --- a/x/dex/types/message_withdrawl.go +++ b/x/dex/types/message_withdrawl.go @@ -76,6 +76,9 @@ func (msg *MsgWithdrawal) ValidateBasic() error { if msg.SharesToRemove[i].LTE(math.ZeroInt()) { return ErrZeroWithdraw } + if err := ValidateTickFee(msg.TickIndexesAToB[i], msg.Fees[i]); err != nil { + return err + } } return nil diff --git a/x/dex/types/message_withdrawl_test.go b/x/dex/types/message_withdrawl_test.go index b2bfce5ba..58cfa13c6 100644 --- a/x/dex/types/message_withdrawl_test.go +++ b/x/dex/types/message_withdrawl_test.go @@ -92,6 +92,28 @@ func TestMsgWithdrawal_ValidateBasic(t *testing.T) { }, err: ErrZeroWithdraw, }, + { + name: "invalid tick + fee upper", + msg: MsgWithdrawal{ + Creator: sample.AccAddress(), + Receiver: sample.AccAddress(), + Fees: []uint64{3}, + TickIndexesAToB: []int64{559678}, + SharesToRemove: []math.Int{math.OneInt()}, + }, + err: ErrTickOutsideRange, + }, + { + name: "invalid tick + fee lower", + msg: MsgWithdrawal{ + Creator: sample.AccAddress(), + Receiver: sample.AccAddress(), + Fees: []uint64{50}, + TickIndexesAToB: []int64{-559631}, + SharesToRemove: []math.Int{math.OneInt()}, + }, + err: ErrTickOutsideRange, + }, { name: "valid msg", msg: MsgWithdrawal{ diff --git a/x/dex/types/price.go b/x/dex/types/price.go index 82625f700..aae2876fb 100644 --- a/x/dex/types/price.go +++ b/x/dex/types/price.go @@ -33,5 +33,14 @@ func MustCalcPrice(relativeTickIndex int64) math_utils.PrecDec { } func IsTickOutOfRange(tickIndex int64) bool { - return tickIndex > 0 && uint64(tickIndex) > MaxTickExp + return utils.Abs(tickIndex) > MaxTickExp +} + +func ValidateTickFee(tick int64, fee uint64) error { + // Ensure |tick| + fee <= MaxTickExp + // NOTE: Ugly arithmetic is to ensure that we don't overflow uint64 + if utils.Abs(tick) > MaxTickExp-fee { + return ErrTickOutsideRange + } + return nil } From 8afbca93a8b0a2759ea11ee11c75ed39b368d1bb Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Sat, 11 Nov 2023 13:18:56 +0200 Subject: [PATCH 238/307] revert returning an error in Swap() --- x/dex/keeper/core.go | 5 ++++- x/dex/keeper/liquidity.go | 10 +++++----- x/dex/keeper/liquidity_test.go | 6 ++++-- x/dex/keeper/multihop_swap.go | 5 ++++- 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/x/dex/keeper/core.go b/x/dex/keeper/core.go index cab8d8e05..ec7122a68 100644 --- a/x/dex/keeper/core.go +++ b/x/dex/keeper/core.go @@ -331,13 +331,16 @@ func (k Keeper) PlaceLimitOrderCore( } var orderFilled bool - swapInCoin, swapOutCoin, orderFilled = k.SwapWithCache( + swapInCoin, swapOutCoin, orderFilled, err = k.SwapWithCache( ctx, takerTradePairID, amountIn, maxAmountOut, &limitPrice, ) + if err != nil { + return + } if orderType.IsFoK() && !orderFilled { err = types.ErrFoKLimitOrderNotFilled diff --git a/x/dex/keeper/liquidity.go b/x/dex/keeper/liquidity.go index 6bae05491..1b86c504b 100644 --- a/x/dex/keeper/liquidity.go +++ b/x/dex/keeper/liquidity.go @@ -14,7 +14,7 @@ func (k Keeper) Swap( maxAmountTakerDenom math.Int, maxAmountMakerDenom *math.Int, limitPrice *math_utils.PrecDec, -) (totalTakerCoin, totalMakerCoin sdk.Coin, orderFilled bool) { +) (totalTakerCoin, totalMakerCoin sdk.Coin, orderFilled bool, err error) { useMaxOut := maxAmountMakerDenom != nil var remainingMakerDenom *math.Int if useMaxOut { @@ -73,7 +73,7 @@ func (k Keeper) Swap( ), sdk.NewCoin( tradePairID.MakerDenom, totalMakerDenom, - ), orderFilled + ), orderFilled, nil } func (k Keeper) SwapWithCache( @@ -82,9 +82,9 @@ func (k Keeper) SwapWithCache( maxAmountIn math.Int, maxAmountOut *math.Int, limitPrice *math_utils.PrecDec, -) (totalIn, totalOut sdk.Coin, orderFilled bool) { +) (totalIn, totalOut sdk.Coin, orderFilled bool, err error) { cacheCtx, writeCache := ctx.CacheContext() - totalIn, totalOut, orderFilled = k.Swap( + totalIn, totalOut, orderFilled, err = k.Swap( cacheCtx, tradePairID, maxAmountIn, @@ -94,7 +94,7 @@ func (k Keeper) SwapWithCache( writeCache() - return totalIn, totalOut, orderFilled + return totalIn, totalOut, orderFilled, err } func (k Keeper) SaveLiquidity(sdkCtx sdk.Context, liquidityI types.Liquidity) { diff --git a/x/dex/keeper/liquidity_test.go b/x/dex/keeper/liquidity_test.go index 1896dc28d..94d42ef68 100644 --- a/x/dex/keeper/liquidity_test.go +++ b/x/dex/keeper/liquidity_test.go @@ -591,13 +591,14 @@ func (s *DexTestSuite) swap( ) (coinIn, coinOut sdk.Coin) { tradePairID, err := types.NewTradePairID(tokenIn, tokenOut) s.Assert().NoError(err) - coinIn, coinOut, _ = s.App.DexKeeper.Swap( + coinIn, coinOut, _, err = s.App.DexKeeper.Swap( s.Ctx, tradePairID, sdkmath.NewInt(maxAmountIn).Mul(denomMultiple), nil, nil, ) + s.Assert().NoError(err) return coinIn, coinOut } @@ -609,13 +610,14 @@ func (s *DexTestSuite) swapWithMaxOut( ) (coinIn, coinOut sdk.Coin) { tradePairID := types.MustNewTradePairID(tokenIn, tokenOut) maxAmountOutInt := sdkmath.NewInt(maxAmountOut).Mul(denomMultiple) - coinIn, coinOut, _ = s.App.DexKeeper.Swap( + coinIn, coinOut, _, err := s.App.DexKeeper.Swap( s.Ctx, tradePairID, sdkmath.NewInt(maxAmountIn).Mul(denomMultiple), &maxAmountOutInt, nil, ) + s.Assert().NoError(err) return coinIn, coinOut } diff --git a/x/dex/keeper/multihop_swap.go b/x/dex/keeper/multihop_swap.go index 0704e83b5..a9acc89e4 100644 --- a/x/dex/keeper/multihop_swap.go +++ b/x/dex/keeper/multihop_swap.go @@ -144,13 +144,16 @@ func (k Keeper) SwapExactAmountIn(ctx sdk.Context, tradePairID *types.TradePairID, amountIn math.Int, ) (totalOut sdk.Coin, err error) { - _, swapAmountMakerDenom, orderFilled := k.Swap( + _, swapAmountMakerDenom, orderFilled, err := k.Swap( ctx, tradePairID, amountIn, nil, nil, ) + if err != nil { + return sdk.Coin{}, err + } if !orderFilled { return sdk.Coin{}, types.ErrInsufficientLiquidity } From fc0d5de7a115c646d0b0cc2a51b4f9669e8774c3 Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Mon, 13 Nov 2023 19:42:51 +0200 Subject: [PATCH 239/307] proper params --- app/app.go | 5 ++- .../testdata/neutron_interchain_txs.wasm | Bin 430188 -> 440533 bytes app/upgrades/nextupgrade/upgrades.go | 34 +++++++++------- app/upgrades/nextupgrade/upgrades_test.go | 4 +- app/upgrades/types.go | 2 + network/init-neutrond.sh | 37 ++++++++++-------- wasmbinding/test/custom_message_test.go | 4 +- x/interchaintxs/keeper/msg_server_test.go | 3 +- x/interchaintxs/types/params.go | 3 +- 9 files changed, 53 insertions(+), 39 deletions(-) diff --git a/app/app.go b/app/app.go index 1bdd4b5c5..a2ff1ca87 100644 --- a/app/app.go +++ b/app/app.go @@ -599,8 +599,8 @@ func New( keys[auctiontypes.StoreKey], app.AccountKeeper, &app.BankKeeper, - // 25% of rewards should be sent to the redistribute address - rewardsaddressprovider.NewFixedAddressRewardsAddressProvider(app.AccountKeeper.GetModuleAddress(ccvconsumertypes.ConsumerRedistributeName)), + // 25% of rewards should be sent to the Hub + rewardsaddressprovider.NewFixedAddressRewardsAddressProvider(app.AccountKeeper.GetModuleAddress(ccvconsumertypes.ConsumerToSendToProviderName)), authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String(), ) @@ -1056,6 +1056,7 @@ func (app *App) setupUpgradeHandlers() { app.mm, app.configurator, &upgrades.UpgradeKeepers{ + AccountKeeper: app.AccountKeeper, FeeBurnerKeeper: app.FeeBurnerKeeper, CronKeeper: app.CronKeeper, IcqKeeper: app.InterchainQueriesKeeper, diff --git a/app/upgrades/nextupgrade/testdata/neutron_interchain_txs.wasm b/app/upgrades/nextupgrade/testdata/neutron_interchain_txs.wasm index 6f3dc56be1f8351a518f68cc9fe4ac3417f169d1..2c797b97946c5535cbddd68b07759c0b72b76334 100644 GIT binary patch literal 440533 zcmeFa4YXX>Rp)s>t6shL>Z$Z)%O6RqDkeOQ?Lq0~NG5m~m6qfr-C2zTUJDN^Gqw|n z*s|g{vJ#SMFZ(5y6D4s#Bu-+2AxdJ#W;%4cn{;Ca6BIDrP7^>)!i=FE5YuK*HwMJC z1Ew*<{Qi5NbMLKs^`2xY!QE*|wyNrW>~qdO`|Pv7Pjch!Z%vaVNk5YfZ^-VtE4d-R zOaJmUz01Dyk#eErvThXqk?MBKuEmR7X!`}O%!F@zO$77KI}^a9cLq2-YXG@Qd;FU; z-sWp3zRvp&^iIB6d-_5r1hC*=LAX;L3!UNRs%^f{Re)?jYZ^cGl_%CuTnd*3l)L$z zcUFkFGy7z=Cf{@GJIfp2^tSy6l0x6xyWe#E{yjJDPTKl4!>=FOfAfJoNur+}yZP3) zy>n0f@a=ED@zx}duim=nT?hQt?v1;5@4x-7;MUqTUU=KBH@}%X|LdM4 z)0_V6P49T?jki|UdbjU+^KF0cRaXqL)_RfZQ@l7`#c=JtTx60jn-t>;Q_-N+d{*FES-+ld?Z@Tg3 zTj}plw12z}DWyq~B!$rw-}Nm`xn_6xW?}Q{6sy{Zk@GEI&N!jWpNtw3Fss(E&Edjx^YGygO zDObFA{9E@^uh)MJgW)HGwLh(yl0S?+*OR3N1B5)+%~q){aFqvA{`3FyA}e&8?&{T2 zC`(iSH$0=BlnG<&B*1I6(t>wq${Bw{@LJ^zh*N9&lcYtFb!c!SlL2h~pYbYG(c#no zB=d%BU?w@_kfn2TYNwR|TF)d5qUiE1AWTS`_!9udt8JR#?X0Mp&;#I%k*BkCdv11a zj*;nhTgVIVr!^_kd0I`^rfbh{B|Mq5_*rz4*$r6=qQH{qip#CE#qfm-{$t8pX*QoE z3q`iDu#V>-{dEQXDH!m)fiJVR|50y&5q_wH%+#cj<`nLV=&XT#CZ@vA%jkg}S zSv=_{^7fv0?RoP%`1+H1X{$f^R9@Wvj@@rdj^ypP-u#yRdhFAAxqr`X``(>=ChzUv z^Y(Y#ynoN_*WbG59S8Qm?bhU<7wd1n^}wF}KX~Jt_lUFHe)HRIz5Yrr&)m3g-`n1- z_y1`*yL(Ud>yfesLRW6N`PR4a^x6tA*Y>|fuQe~if$7TI_H%Le`s-n+H(tNz*4=qJ zcm4G@?YZ%`>)&+a?R)a9^A*_AD4qL-Y|GzfhtdzETMp(+`A5<%?@!;GzbCgVcjtdx z{(9@4{E76@^ykwrrC&~eF8w#@uce35-$;KweP6!i6Yc+49!`I*_?_Zk7KgHr=by+Q z0Me7i$BPfPf2Z`vwtTF7pgffQ>-0BT?`efgTMp+xoc~CEU;5GXU#0iv`g_R!ejwN1 z58B`N=lc60`}?u<p0D36p!(=Vn!S$?YgborU`v*m;3PnG{$`B3?A`O~4b6Xl=h z|0!Q8-c$U3{`2X<;(f(a`Q63)i?8MHEk02EUVcw;sED2TWU=L=#b=5~izCHP7N079 zTtC6WmY*#?S8Vy2;$IYx6#umNC&iY3Tzs_n-+Ai;>F0}A{!;OU;^)(&#TN@3#4&s6 zE5#>^uNJ>ue6aj_@lVQo@-2T^{6%QyH;XNY(#KnWQ2ashGv$`g(UJh&Q~q%I8^w>7 z|FV3JmOoN{G$L!u;qphy50^~GM~j2`v&HAjEuSbqS3U{`W4C{-{PFVs@{{G3FR7)a z{GR-GTU-90@(=m-r{$lOC(A!C|5N$(@-NE2ET1d4Jkb8D@;{eDOAn-#Xsyr1^7-Y=B>e6;)$i_y(#>j&*u1bW#|CS4_kW6IhF~m&b|{=iK48DY_vr%eznvyS1_gw!s=&>*_L4e&PUmxr8|qf zy{p>+&FR|*d1koZJe(PJMwf}=JEOk=`!oH#n~pkz*8ChZU2Grq{A;1HXbgRU6u7>? z@j&4ZaAh!|1=;AC$XI!(F(J$~vm|htcyIH; zK4O=_xK=me!~RI%Uv?8-ypzY;TeIz2uZG`6q27zK|V)k0^<4*N!F?;>o z)@;7dzOXf$;e!^~2E@^A8*p+oeO}9!X)|E#G$^PWKKonABr@+D;oc zy3eyA9MLXu32%-bPxp?VPkNtiU&s%(X7C#}WxB%#tgV(UL|gL6+w#rWnlcig&)OId zrvf5;#@&&ImT!+BGwurZUT=eMt#p^)bXL1^S?$W7PqjtUUBg#t0JS{}fdZv%^l0W- zI;*YnedAlDeok(cyPNw62!~RZZI-1rOY}3Q^UQZk$Uf|cXS8n$FG6ayZ$4!#-uBI3 zOp}RGB&>`D)M<5G?e_NeUdhLd%Oqjz9>19TEq{4hOP6^g%&zsQn1zY;nA-_;bry;pe$w=J9~2R)Od^dq|NWot>~dqo+tXh)bnJ8)TXUCOkW*j`YjXWoin^Dar$rGKI-W`TPcha=~E61p01* zNa3JIiMpY!BM%akHPc;#tdIkL_?qq-I(IBn?`~IDzM2hYh0|l15kTmWZJdv0Chkj6 zcrx2Nn1cydVr74J0h>dH3>%@jtOb}BbX1Lt+km05OV!AuV|S4Zx%PNA=<4%mHkjAv zV~Cj}qnKroO#l;Bj)Szz^wMB01Xw1ZJ(h`_98NYmlI`vNICG=Hh7K|v?fzWQ!`hJR zFz?Ut5w7s)iEIGI7PDuvK~JA2v%v;^KAR2J>hrm5uuh-PXM>IUT*?O>eICpQ>$RC2 z$_E$FgGWFD3X>^mNEY_(;cQ1b*u+?kJ^7qeSk!8qm<+IJq8eCi+?|~pC38aA+<;Z7 z^%-TWC_&bAw|0;tjOHeco)?ADynmhvqw6KA2RXDMp-I7V`8=OrZ*%gRCdTQu+k4RomYJ$ZEY;R@Oi6f>v?ALGHV>N_InvD5_UGkc$1=~xQKZOzY%-X3RB zHd^+^)T_rN6_1`mB(sOYRyE!iL|XbHZIr$wznyK%ALUzsCsF>FGARHvgF>8rn6rks z$tsV8=bA*|yGE>zg8?i|3|AX3JIo?@8ogEi-V>*ohKh?mohHW^ualuod<~GY^l)PqezQ(n};}uH##jb7(QJgK@)D}8GH{g50 zG$l0U4}+#-hTJC&xjfXoeN4AC(cP`t1H$I~*6epBHS)m-M-Q zYxca}>uk-Q(T{}EsQI6zq-@kM9YG}`0wBzZy^}CN^~rZCZxn(MK?Cp0BYa@bdO$8DL@ce zl!U^naXmWeUXH?^S~ImSrj>TWH?9Ad^Ifv9gDxmfP;OIlBZEnoE5|V?Hh( zK!_MMS*3hz7)YnIcU?p5xq*qX_h+O(nj+ofgH<=r2ed5hTJ}LcOuJ@fAS7&{6;t=5 zkOoP_V2EfcOt;(y(`XH}!WBSqi=D1o4n&!igith{$w);Oq>yce^&q?jbAb4*f(M<)`ru zkev4RgmJ-`Dn*2?$V|2v>gga|KU0HkM6~o4YyG%%`MNXylg>2n(qyG_e#&GzQ%Qa{ zPji`Sk5#5x>%S=^CQoYzm8@2X;`qLHT;*V%qslR(?N*P>^Z2Wi%lN@WFET~jZ{eTC zy}gffTc#fbL{tgpm4|o2_roJvHbu`x6MIO6ow4fp$Bjgy8!cVg_OEdEvqd7MNncw` z@HA#QtwEy^y`1dYmcup!P;G`UvyN1D@I>FN*O6&%H=fBhNb}Zs#Ubl{*fUWW`=~cE zugeqEi5O6S4-97(GVCZqqQB*I7GBd1>t=f>ZgYOqU=C5;#FHBwuG=CfUaf>@fAv!J z;|5bPaWU|H-(XfBHx0nzVzwK}&KBO3_IW(CZ=@U=HAQz)%a+Aimit;+!i^_wOx9|- zBwmABGJj2X;Z&CUh~u@4&@A`v&zQHFGQ0M2^v*_{X5cAcHA{^&r;G{&E*sU=-CT1U zG$73Q#s1L)?>*|ujyw(^@d*5n3jCZ@EJ$&3`d{!I z3Itp)>aiF%gb694@)58PB|F|z*(Xuq{Uv_E!S$9Uds-^SsL z0PRWf1~;CsH`Mi9Zo6LxBtD??IOkI9DsDH>pVopyJ-41{>N)06~Rx_P$Ih0wd* z0--jmmmFZjG;Umer^NPL?h>9%-mxve!5FLniqXBrhy{y~Dbyx5dcTslm>_6P%$UQH z_wyUJC9mUsZ1CC%#QNSRgr}ufM*uB{~h001Mf~0JU zZ5z?{B8P*w@Fec|yg#c3u=gk8OWIP$Hz(Fh0)$-BncFVq^P6{Rb^|6&y>9I?>jv1Q zUf<5bo#r;{9RQ|@fUL_XLuI3-RGZL;30bPFy%X^UCTPAyyh6ffB>_nYbn7id6Rfu@ ziKn(MwK2K~+OXatp{l=HgBnQ`OWQmvxp&O`8j&c>O||a|8GQ_Hxa@k!lPk%Z1OsUG zHDyhDX7Xh|GC}I!RxOO$Z*nN%+! zQmeZ*eyat0#u*L%@qQuXq#!4RLkM3yW#dm7|3KOW$jME}f>^#G=JNkH%Vu26Q6Pbl zm}Z^D=}|3+JUJJ7FN=hBC3|n?w!Z$}p?1T^SvoU8F||OFt0aO!Ca=d3%EvY8xt!z> z!H_kmw>G zEX+P1knY8NK$V;Lz#f3&C3&wcJ42vl#W`5V>GqKKfGy&^Y6xIJ>G8lQ=3P_QdJvz5yk>Yhzb;K|&=l6E?40edSPATnpfE0Vlx4hmRU>pue=o9w{44j)ZMbo3@A`W#e*5_;`xo z9?bf=Tge>G5)F+W#ZfKM>j^WW`0mC&d=#tIpn@cZYtP&(9=t>*k#rFTJ$O^aZy^Dsv=mkkq%c5mY{GR2UIA3e+GY-N(eRJo5?z*2dCYO|5;+m^ppvvPmxuA)0+&Q*{|C0E=e zrS~=H)5!>14eKJi`Xb*KcEKz`; zhu}AYXqyWbMqK!f!kb05}dxkr!H+nq~ushaUrHm zDpX*BG6XP@9oV0I&MUGtR9*PTEdRHg&5W^0S_y12<;j#M*(+@U0=JskGvYPCvEJia z0%w;esiG1tPZI4r=znptHP{#&{z_d>!-!T=P@g~1Y8^>)_2388=AMsNQdC;|; zNXr*Vjfs3Bm}R(Sv6kv}=&{fMpNos!^d)nFSaU6mdPE+SQr?{Xh6N_}8&DW9Ef8Xj zN7Es!%zD-Xnc5hzup`_;YkaSH@gn_oJyxUdR(dQGoxB}bVlsLW1hFFFleRcJyIAr4 zHT%tZ;p>$pYIDg@B>h^^yE#nr%g8kTpJ>NJ}aE+(W1fxQH zuw)~bHSycvw^hWhfD33}i_fizm(iY^U z6tVx3WrGN<9kcHL#1q1twXiX?aGqY|fB5N&t<1+(>KQPr<#%Gt>HSh@et-x zQ`jmkc9*y40pDX|oAQ(xr?p75jkS2;X|_1Gyu~T=HRY*l&MZC%im>>grxBE6NRN|q zMHNzLYnoH{ERf42o!lKP(A|`$HUg389{po+KFr3PbdotmPDy}{E7Jw&p%%ae5}y0B zwi0Kfpxowy1m#QM5f}9@L_zNon9$uYzp+~9W>@lcUJHutc@{cA*U~!^6b0t$?s{9f zx;16xcGs@V2M@F#4Ulk>wQ4!_ZRx zZ}b1m{1*7rE)%7~WB*o<&B##w-^lqFC-0GJkaH^F!z~-Tfd~Y*6FRwFr2## z8E!qKTbp$2(z$-O*j~ds5__aO5kuARM8ekp@wH@^XD3P77YsYKdCexsO3M$&O+?hC zdKfyg%QQT`3NY4OZ+UKq`E+nRVrIlJSgcbXvk)#ny~NvdbRgCnd$1N41nSa|qCJ zfpui8u3ZsB$(u-@P!1Bq{43&5q!NCzc|xF@iA0e&5q%I*5EW#}_clQ;QytMy6HZMa zR1i!myUJNXL0)@6`}@3j=?-TF2?5n0Ssd0`K|<~`NQ$97yFQ^{1F6Y8 zOrb+@V4|Lnv*xn6X4GZz@hS5O9h1e8k(oqxl$q$d`Fbsj3v4ZmKP!&4RwA@1y2dg_ zfs42W1Hr|TozkjH7F_zA_0Ho?0g^M@7x6z!c@y+HKe!m4Wt@q%H3|%C9H0ynK1Kz5 z5#5^d5(+SaS8yvqy~i5O2I9y!AoN}n|c%&Zv{v; zGEriF4)(+c`HTj7LIh3w`8<{_Pd?2?PurEp8duy^NoGv-jO)K>q}3ICceL@< z#+8G%Ql1)LDGxyGhtxIr+UHm`*YXkp9nl=`eP+{?GI)slJGsx!T3N{MPu)a@&y71c zo1gGlIup?X`+PoVr(rF!IE{UR#0ShI+ntjv5M%JKyh@CFp7YA0A>D9{fNT4crQ5FtbeVL=kg%Vc3=A2go@*k>lB)XFVdJ1uH2lsLfl zTY3ZW(Q+4S3sYIrf2pa_tz9hIwtm0Feiyso2DAF@i7fNGupG!F=2|z%l~e$tD;2LE zVx`AxwrYR0^!QJUPQt7;CQOsXIC^St&e~sR0f-B`T(9>K#0|S(DSc-7cE9S;Xy@&M zV__GJSKSk{Ndb*mXyVm*gL>hves@>@A`5Hm+7(+v;Dr?=TR}fsg2Cl*5W*U<7W56V z{efExgi;N6$+EHz2<1~E>w0ytowuHN^d3kgwsDg+pP<%bee_G0giBY{m$rmU+i$6! zx=NSkekD&^ia3j*jZK#xjxT&{?rQ4iZb^dy;uVoqKMRVq?xevqXfKeRDtEHKjoSks z-lkzD_Lwox<`AgwzdYQQ49$a=dAQ^vM8dC2-1XOog!px_f>!G{-S@Z2+$7L2Yu*!! zYInOk0}1+co0QSBoYbIMUOxYZ#D-vCkz&@OHQXOqw=W(PT1nBBcX72UauNb7W3RCk zv#hf)6fs$9mobDBb}E}Bt4n@ypCb*;Usoe|odD$HBuJFT;y4_v)?oNXpVd?Ej>aL7 z7D4%$R@QPmld284oe48f%<+yhmC-G?^QeP(-Ee!$pd0d)`g+41f|o#)%pkja-yMQT z3VOqp#@uW~`h5ZMWtDa4Yp8iGGY3gsCD^!)^GPP2Rq~bX0RWM0Vwg4w*+pUmfTqBV zWyX?GMl=HrlC|WLyTV~Y%Ft_v3T1>A*dVTf4blDAt7?D+EfQA?Y89RBTYxseD@-Bb zsbNcOLrzdR3iKRN9=(r-CUD|l%N4+AAcxJ9%^v>>6J{>&CXQnKqX=JSG;6EB-NFLt zgb!xe@xh0y&azMYsoP1DY=Q2tNGI zj{c$Vwpi#H`(_DjGmY?Jwauj1Vph{Z-e4t;b61SG1ju|cBWk?K=(Mn6?1I!bR$Ab7 z8M{-M(FV8EwGMoYDhOIWZkn8hpD_|GV~21g68LNUovj~F=dyWw;m+~V|mz%TpqUVeY=y*yAVR>H68ir&v5!GwCYe$-IyS`6Ndy@ zjoyQtkeI(XA6+2`_f_I?t{Cfl^g!bRfiqlj*+R=LH^Dd`eXjA$SM8ZvTDM9vJc+a( z79}fhbMkIQ1L|9LFH+uRJTQQP%2$;LF53p-&iH)zAtJ#=&a;XEynwsaV4d_d)+(=k z)7~g>H@3_>D&~-n5c(_bFkcru0qmx|y+vO(e{6%`NeNMlgUt5i&A!y_DqLcl zLa|2zBsxB74wt{k&L*+lfB{o+ImVyj1u-UZ?#y=M-Va8`zx-1ivI?++m0OCzoF%%q zXF9WU8YSDyndTZOA||A}qfCZxNa5idK{Vl;@`t=&jJ8q##ts_3AxDL8Y|r7F__04{ z(}x;SSZD2;?g`VnQspiDFh4RFAI$Y@DLWs_WPAMEPcEl0TFK?Suy%{R5(OklK?7n| zb^d#AuOoZPttqMT7w0h~Uy7=%WSI&HbMg3-jR0?L^gGqIJTK zk;dI4%DVrZMlUYEX($npFIRfnkG3g(ZE@lDvVqB%iyrfKi3_*=C<4yfdaxEkc-y9- z*&S06&ep8Y2g;ygIoK!_%fTk9j3E?z?WKsdVK0>)EK=sfBwXf|rF8Lt+me4JgjQQ- z2wu~s?X#{Ok%t@0w;}O{y&cnq@9ib)VvyiNn5w^6v}U1zL@N71wzJ^I6|t0W?Nh&- z>fO}dmFCzs(OPkHty90-h!Qm|HD(@dzXh`WHyg9HL2jrCi5MR;9<&?CXupOOZ* zAk)!5zNscaqiPcDHOknRA^vBQ8(8qK-0-h-=3f$}OG)ohz?9H#K3I#UDJ}4>6T*3L{V*Zs`SF0BZk^T9nZHmA{0Wrr zqIW>ud?JKF=fD*Vkas%<{VHg+Bh7$Y_Vv-F?hf+>)Q%&%r(G+6L9P@&02rVwF(^b zMLdvV9kL~|tWOrRqP}{c%n8NV?6NuF+UAtw0VK~jH|95Enn7GM;U3vd?!S&$gw66r zO3`2>TF_?Z!+dCFK6t>xSSMuq4|*0WH$tytc;b9dD8xbtb1Pjl$l;#^3tR&vGk0xWlIQwMrQIeODObo04t3l<*Wd) z4+#+B2eZDxvWU*6U+iE9tRjk};O3A(R2Xh;*48j3s&Yd{Wew9tt#^Y6Y6kEF);TLy zW~DfIA^CM)@Tg2#tW6aDRI2q!%+mt$7nX;Phh8zyqd<=C1&HjC$48H>(94|FYQZye zM1{1K9;KBx3Ix9#4stDzs3)$<#nI*%|FxXlBpe3Iq&EiJdQ<{r)?w<@7j|ZaCicE=1AGh%i+y=iNd=WG=e-YY zb^>~nkeVb365Ecd2sn_d;J9v|H?-JQ^^^C+ix;zYURr%ojQiVd6g6KDMsQpb#h0*7KqS|i zM7lbVSpk_fAm*oViPVF=jsB$iuCM$D2ZkG@v75-g-pHmOl7l3LYc(G?)%Od{1TZ%N zLrqN+u$Y)60!^W!c`5Le@<1#mnf89U%z_x#RASxPFo38KDw$+if+=BuFpq%%VKQ|i zITW@5{e}flWqo<=IkUGa2>~(w?+*#FDMtV7!@n&3@WOtIB5=4E5S*84&Wyp^=|i~5qe3Jd;PuH#K} zg-D(@E6?RZk?VLWYJgUEnd^9qa5{cr)YC`hvY`4y_3ku}g)}#~l{7axKhFmoR+<|d zu{1Z?`6Zy3=GJkpi|e%|B5V6D~i=Nl|{H|BM;tUy%!;Gg?cT|gP%nZH?1k8ELn29X-zFTcZ2K< z%Z{>hKWa@Dc;Z@8=i|jPTa z?S`jK_MC+<{raT=NW8p=P=gW=WU@tgY%#kpID9AIn20IHF18x9t)-CIVp`3;sW7?7 z-Z)?#P>8Id-Aur;5lCTmSf&8V($vc@md#F))xNJ>d#v8R!3UEd}BH$ z6(zIA$4Qt-ly8){^{$WMzTKp{8vmK=G1JB>{4X0To*c=3+I+Z;E!XrI1p_KIL?N1O zao2d~%evFzj^0@B5u6ik*`$gI`Sr$J<0Wu8bK(t~)p{mOGl{cm0lL#>Re}H$yqs_( zpl8w&BHd49(95LQ2wNkTqN#0QdN3@322W_X&(w~P(0~QoB@I1gBI+XI7z~Y{lAhQy zkgg=ni3RTSg@Z`O?dnyRyae_jDAyLSq@hf_@6aXAd4vAsKB0X^Sr<7pCJ`?A80{?y zkT)Si_xt&&^@vz6MbK6im$a(1)y0lK5IU~#mc|&g&j1dlz0Xq`kbB}gfUffpD8Z`- z5f7I_9s(TRdT4b+jQ~c0U|g7ve1pyed}!56xvq9$_1e`5Q?xAG333_zmXl-!hpY+~aZ;Kx!m+NLv@W_c!Z zn_g6KN08l!D3S2iA^;;bDa`0w$_n{slJ*gbm3<;zKs_Lzj8{FJD6UR;S6#eO1W3G* zWJ}Pb-4+pjCvULE5fr>wS4hE2*_N5c?F|{eDb$+`UkUYYTsSUjS6Yi?yKW`h?Hevs zc_dwz?G~nN=d6=D$;`k6D)()l?tpu9&hBKAy%3j;)n#)!$Mc2&e8fR=KVm}T-&DsG zsC124w)>EqCv>B_papzK76hK_a8jEv!%8WFvX?a|Ndfz4b8#Z(Q-1 z0?}%v8!_2$tme|dROmIDHUX`GE|BXs4W$94y}u9+tcDgpJ@Z~t*-$P6__hQ#ZVwPI zr}z`N$IgQN`44-f)R!vJd$`IEIvx8nGva^6xlYU04E2FcnA+m7w73IlWpHh6+n2ks zna!2rfjo#P`EaV#WUtw8^Up(rVQZq6Q1vX^fY*GPvnDxu*_?R^HblNB=)ZyfMjyh9f2iTS})KGEH* zE$h)SyJVcj>jjYXrrXpDcmiG}3}vx3bJGeX~o!aZF8G80$C7!1SWe$ zTNBpkIR$12ZbWxX#<1y>24T}FWH)Wheg=bPf_QU@V#K@q!~MByx;@!z!%V`_BIw$p z45b9nOevr{9O|Ha51YdP(8DID%wrWi#;W37pT5k6v1x->Q2(;Qt9B9oP?X0s_Jzlm zjIKvN_1++QN$Q&O`bEHqG)$!bOT{Pg=2IRb_k;z zc8EwfA`_<@+br6BHj4!LSy7?Y42@fheMyIjLeDv6H6+Y)6*iq1!A>RKkw;1w;&}=U zY0HQ#t}G!>aOjpqGN*U1ndw4;_GH94W{wHeQzv*z(jYZGg^QE=Il4ENdG*=#AbP=T zH8*Y{Ny4E?k71zJGWJJ+JhQx$YDok6vORXln~t_n3ESiL*3j2(%L*w(G5|>Ohe$=t zjf6=xBVqD4`6+rvoRToJ5xZI%ifmqpIL7A4g-7JwbrS)<9(B8G;TVA-o>7)TEI3|*NOM_r zVIP&ex5SW8+_l3?L$baId@$V7(@8;r4oOg8yxUDs$PE`VE%Rh0DVS^)MFn$j^1zs^ zfH=epGNVGHj7K)*)g+^s_-{Q!j?yrV%q*~&LzU(}nG*g+*MLj;L}5M&-LhGbROokK zAMe&;qfMgUy)ND*H-H{ayt_NzMQUDt7bCg1iyYj%JNFY=S|~J+QcWIQf#@K^r2>s< zmbf>MJ55GiUC>`$ynvng`}Qsrd6KYmj25uN6{GLjD`)no^F7eE**2}tYTA3es^AlRM3x)-IW!^vM0?hC%#O#VWpNX zt(_or%!NuIyWx!M;~?!aGKs;mhy!3D`Wai#W8}d^FB^q|s%koAl_cD_8>;E7ATcU2 zR3hRGYrv1x^3tJ*i1=zuM5LB1-)GSpST(!4U9+P4a+xY5dhv7-|BTI*fgvZ?=1WsN zWxl!{C#^_cK0lcYhf_ul;Y2K&WX!}cGAF_^>!W^fTU%*`+$Pf^j?_w=d!EVc*1KxsfCKS!b65l>i#rIV&hg zGe9wU4{@p40~au!MJ7AVOi3&}fMU^Ar(>;_DcOe8B7@lq_JNLN7PTwOT$NdbX%6_3 zt3{xrKpAdM3v9*c%5i9Bx#tX>(x)vYvXRb|TY{qC1p2GsNN6((3~;381URR+G=k88bF7-u6<)z$=^1ZU6dr5*E^K7`yE0rz7Jz$!F05>%L}6u< z=_j~~Mjx`dBa%Ym)`CKGO*|yeY0b9e?o_0Q*H+h)K362C#n91g^dorv@$;F~D+Aqw ztWFtEkLZ(OJgn78q& zzowl5_g#Dn~zM)#i6v{^0od>3M})=!duOUFf8l|H-xe$vIp?5YTWa3Cj6o zkcOGkrNt8^|GuMQzYjykENq$02GTLYHy${44-ag#2P8R-ke3qoD-)-lprm_0^>64x zlKLM`jzMNSMFYk323Sk@xYdBgFT)Dm`7F*Ft})3WPfXv`W4WlU#E`8TABC=IicF^a z>DhQVSM4oD;D$1$hn|YxUjx4{s+oHOBE(PKwRhp=McN6&oc=MJc4#*r{V#hL=CUOI znX$gG5twKU^adr27qh;acgbPe&j-@ie(YW@AXjgWTO2fe7ILEPf=Sdj959*eQyQEG zV)iLT0wQf77DP$iwPJ-Kh)fQrF{Xwe_whqKC^-KOAPb4b5H8{80X(eF1fbw|Rs-%& zMmezNzS9c5wt3V6qbAPnHi0OTIB;4dj=&V=P2BFlB*IBt>gL?4rEnKBalS zhSS?j-Dg`esV1yKBd}`Cc_IOBAd8uBW*nE4y7yYTrzNECuNyx)Vf!smg=hfn#pj1b`%g(Z6rUofZvImtb2KsV^CIXkt@yhT05b8qs{N?o*YBLlEfHEk`W7u@hsV~rn2tf zC^+KQtV!E7+&2&w%o5nlAS$N}V?MSfC|u5KtY zf^loGNu+d=0z>$4&Tm5UH@;}An4Vdv1cRLDnO&Y0SbDZrpY*INIQo7tSX(DxS)hj8 zNaLfl%k2Qmlz(8&PJ?AiYVXHbgf<)-!*l82yf7BX!@2TAyQW}VovsQ6xa&$G8t@regB>RB)sU8U1UXc7w-1%oHNK|dVPl2=1|HZ6Rg`bTj_eKQltVC(vj3rjM?((5 z%PnF@a~E!@2$M(b4CngiKZF1hr`1U(;#W0Xyc>}SU)Eo@i~uErve&a`MELJj(;Zn7 z`c-B_Xu2{%%)d-%3Rmw@hZHC@PZ{3WW<|!4#-@>;$-2_<{(K!dWX5(_yQdH8cUqF4M3m^*rtej1G(UsMBe^urER|%P0y!S2dl6;iN->35(8+D-nzqr6a*Y(E}JZ zD+7ZpdA`mCRjG6y6qLXkDk$p|xhd5kyxI$|Y7qs%@_(BT+0U{YeV$n^6@(mGuMU91)VRIaSsV8G;(tkE&?X#%=jgJxj4DvrIthvP_JSvn^+Z ztT3`Ovi^D7@+bM+k@PnhU%V)smDsRgDAR#A8+MOScK53dYsqr^$#NTu>@apntqoCj znljo}MCzYo0m@1uyU1*17m>}RD?gQ?BIpM)k1!H=t@tA1c+*OvSr86uD~TC?od799 zHnxgcuk!N=r*7qHyApaDPrKDmq`)2$__C-WtdZx^y|2oW@3yhpA`)S^!;SWgtc=(j zt7E0kao{AYLK5!_xAkbxp>z{r;^BNc#;;d!+Y z(XJ;Db7J}}HW+p7u$j1?NLMp)X}@R~G$j3|QRz2Bgi;+eTXnAf%4rTMbeHq?kGMs6 zbyJp9o_=9Z%K!xL(@a1OLB+M{mgz`CF;md{N)itW1%cJ4{%NrU4``8XS68F%iY3E# z!`F?5rWCR(ithi(1(o{w^2X|ENXG;L8-LWV$3+N=WrZsFYcuCtd zIW!Z6my{M%xhhSd(qSVF?<}P#erCttrguwm!B#V9)!tfWb!JDhW48B@#Na;LQ1y$m zV0I+mOB5Ezjl#BxGQ0yWJag@SiENwm{t)qvP8j4nhMoT0wL0I4rtaYJ*=s2kIrjq> znRpk>Wj-G!5j#3NLk{i5iOjEDzTK3qPUUMJLVu)qPD?yR!$uPD!V-pcybYj91XE7} zWYXKa!}yE1!VcM}p&nk8I2Wc=C}Q5@WTql-qzU1bg{T-y)1l}2fC0|%fgHjT(xUaS z$GUxyA%;iv?7ywt%!gaCh*X$=&HbtVs#8uIMi=90?_-8G3F3?FJ&ojzHi`_Jax}Ab z(M7PYwY*JT*FlCJuoi;V(tfssXrYstgeEeC@hG+%Nzf2L3~28I%7PEAQfAA1%y#x6 zU+vdJh3f!yJB53^9jVAm1^XyL%5ocE z1b{$8^alhCZJ*4==EH;Gv8ZQyd!Zkt>&n&-K!$=^ONxz9=88ssZ!v&a(3Lq9N1q3S zcXI+x^k7@pq7kd`VdC2NljkvY#OX0phmLMH8)Dv|GdEoFX2^w)=P9D4<6mOx`-TQA zHP#j)8rF*?WsqISE@ToNeH(rJ?xWHJU80NACrS3+(qu{-)WK5xY{bk-%w$J3flvR| zFfAfVVMQ)#JZX}hMT$pR;{;Txwf3|=k$s3VBh(Zq?!7`@MC!8sO;olN6Nkxb%HYM> zPF^|QkbsV-Lp%H>V-07jYlS3))1Op~jbZtsO#N>lN;Nfo!; z;C23A?8WLD^8~JKO}?gRpK9^$f_Nb_NWk{$0`lJ=ubiP&HN>3fuGlrTZzn5<5r z{6760-P_WFu}N@->DWJ{-oeJEGck8*GdWN|(1-B`f_;;N!@2|}6J3!(oN#Snz>X7M z_=MYr4U}Ji09G;Vx-i?EkO`78skh=4F&Crr8@(|sU zNZXq+-I$+RE~FI6VCtArGamNEjTu@2< z5#$KdHmDlQ{$oJ_#vpsI6kPbBkI>@+Y#|yCBrZT)(0o6NSZ1BAahH`=onAfMk^u5Y zN=8}HYb}hPQly7hS#2KihGn9?R<>s_GeBi9=cts$sBI3&(MKM(Z9?v6^|jCzoQ{4h zUhU==vL8i1FymUypADHLa{ULdaIqJwm1!@*8-G5sza> zxtt8~ds0I%2n^O|cUl=FqBPaF@xT3b3p3&9ine*DZ2@Yz^gb!3aepQY(fX#ex89_^ z!_FPj;mddAZ|LfH3$4|$L;MaS0v}JsL@={13Oz`77GYI4az9`cIWz#mVuq2`yc`V0 zOvVhwJPhmXWvU$Q2oXm$fKNmKcwh_wQmDr`=`#Z81po^GXvj|*W(B}KEtENK{>`&Y5*H_Zkv;77vvGk zlMTK-KC9o)E$eahJoIAEZ}#T~m-u_`_;S*65j@hAgmp|Dketa-hcg$Q<(}f*xxvdN zL$A?4J^izGM>aQj1@E8$N9yL>ZhEV_I|mkTZh8>iQdJkkHLcAL3;24q zX=T=Gz}0fG^#+mJFKRRngC!1t7$QH|_`%pHC!OB2dW*rt?7R3z!&ZL~nMGgdH%!0T9wf`xk}-CV1ru zNu6um%fq=6_88|!*khX}9_xuB?3f9AjA%A{?7WG`*4Xx=Qzz^(#AbU80sYHrJT|%@ zGRXRzU}}$T2#*mFT0drwj2hW_*IYDwxhBL$_J{_|$mF3R0wd{n8LnJBI;+FnHT|vGefmwZKz|K459V)s4y|L^FiK1eb8!8u5UY=b#6haNE^w(ogd- zBO+#yP9TWIITfb0bRizoB8|!xp%!=D`Q7B#h1+$nPHIvk3c*f>n8yQxy5z?-bavsY z!BgTM5OlI} zUfLAth1SPJeFzQ=pUB`VGWO!C&;tVuz14{VvdYd{>3rpj!+%OM^m^K_yAdWWi9AsF zvj8I~u{Q5^OssE7te>TK$IVXlKd6hxgLx8T*k}oxt|$__9}Jjr!II359y;?~e0$OqPs>d7Vh3;lqsn8b zukfN`h=TM6nbJmTrW0+yWz+Uc$1x zKIy2U%DwUoF9L<6EJ-?C)2AojOC~9{qt!}}GQI#>+mQsq+yz35C+2i{XR`v%lONKwb(*Xrct1X$!YloP@opanNeUxeyJw@@+6UiCQ)Ed zO$R31)b>cE+@?JeiUXyx>|tX!(;>kaX6Spy4ES#7WAi_up|PacMH|x^7nGndasG%V z9lY8^uymL}7g2mw*e>ua3(nfDWDUD%?_^K&&NJF{%yLi1o-yAGNU|1q*WWVD&liNf znEWB@^n^z4pe2?3nc?MW94#S=3sY&+^yi&ESs10pPM?4^1V|)7(|ws9y&=<|Gz9;t zPFk-PY00gC@;0kEX>zjQ>_KHBv+c{mihFaf}l zvDpU4t$im;S^Mr?wO*m<;*{1t@$O|-KCL;o@z&~7dIhggU^CX!(=f^XqVhp(Lq6>sU!iDxE0!@ac-Qf- z)^*0kpqiVp-t0GQZiwR1->O>!^JZ7Y@~+0w=w8!Yvc3CS?Q7urD{R3sLum_!4862C z8Td?ttO0hIskm*?`yVw)(e}Y+Wydl5_UaG#W*MK*P(-U?dp#ZuaUt4q+8ZpT@WyuW zSh6$QL=Dpt`+kV6x6JPG@Ihpa>H<28Ref7&>oj*p*fPUrxy+O@!}&QJMay2a>Q-s# zE6Z#q6ct6JsceT6NNc%N@+^UKCY4M>f|&I(v|)^qrEbQHqfC44G;kNPB=7eP^&<*= zos|K?)VnBWENAp?BBV=|3rH$m!lJ^^)YKHhltD{XWs3)ye=5*l8Z^V#Yno+9c3JH%*Y32pw zH>$I0u!;cGzzJl2aW<1#aockAdxwnTAGQd*v)N1xUOo=*3^$X9s;X{O)bLWk@aUKa zm2G#1As>kt20R*xTtQrEPTr^(9~{pElSZV#D*ni~mAJ7Hm6XqDHu7eC7w;*qP1kJ` z%41BG^5mE)I}b=lA(dyRX!6kp$U2P^Kn=(oJLL)}^mx~c8D z2T{944N`!4z<1sFgoc7b%ysigoD4pRuO&)Uyg{TD(-^NgKE>gH>xOc#sJ9v zliB{GJvD5)QXT3|m#7E>`@Gp{8!&*99R&WfW@6JzTzJ;()u2W{N4!(1Qf!QXn%H#j zL5CvFOPj7BYt#Kpeh^zhMOTg2;4E^n4rZt~-IL@WSTKXbwv7^`N1XYld&mMhY&F!I zF5pw3Pam`eo2YTD2>y_CAT~^xna21uDRFhggCR|ut|jRz;=wjuZLlZQMr9uuR$=oa zT432YtQDid#Pm#BvN$uQ(M$qmKq%=%GzD8^rlbU0NK@EAs{k?$;&84F^n-u*+SrV3 zpqrCqbo{eN6F$H9tdubWmydxv!|n46d77&nRUM9PTNkkki8(t%go$rqMc7T(j%O3I z4r4a)jF~l{S&HY7O^jt!vg)GE3I8m{T;lEQ!YT)%&63n(Pbk}di`JlQsLqk?A|i{Sbp>4G-dAlo9(Lu<*dZTTjB6G_@q!}Uf-WJj>A zJ=7@%NHk7uH~T+wY9vJ34|Le;?{f*?O6E3+ zJ0>L0<3}S={9MBKxrA?v-czjs2?$hFIG6CwUGI$g|kYztVbG;((tXQn}S z#x(Lu9k;T)60k|BKpo%b>iA8N;F6hhi0=!PBv;6+X^$;tH&r^hKj%uh z7ge~ono2X`9K^MCz}0dU5DR*_)edvLe1(>4)m&A-t~1?Sprs{WuOUz`%#`y`{1x+i z(9ucgp-_c&HR|g0Qo(u+WnJB>wDr2n(eD|luP5p=Q%Y#Y{Gsv_&_b`OSt%=@)IsWt zc~3z_-O~e=K7Um4{$Z*Xk3f z>ok0QUjg!LgzQ-JKpJyr#y(Fxq587cf>nW}1=Vge1h3MHN}n}wY%z-N0gSCoJfT^z zR;v*b0_;RJ)`FT9{U@a0W&C zR<6`G7ZmCH5@>&8e*?5XtD}0?>Kyh!!&9BAZOheK=2Yzw#^krAP-i#P8E7urni7i~ zS_ECwFw#{4h;dh|Ir7>%`H2G{L+q2{eg9g{(hZ)^mCj#60E3Hk!I%29ZlAB{CDtqX z&MAPyt>4ux3v6QSI_SB&^A+7`>m`e?ogiuvR#$Q5swumvw~!fY4H}tZJZS(%FWRyV#WOMinH~`yN_G&w1j%L(^%mH zB>dH!@^fSZ5H{DgWHGJQQCJ_L{7UYJ8*62GsDP+{bjTtP1RqmoPTB2bu#x|XXjnI3 zB@R1^@G&|bg@ssw6UVb`hyc!(05Cvi1Pf|=Bs;SU)?mU?9|t2&5x^+%JM_v7tw2Q6 z3UvZCtiVbt0A2M%aWVmbD)Qq@j63Z-*fGmPKe}Li(C%CR` zxu^9>(30h?q2S$%lBL>$hxADqz~^)y_vf?vq|D$!T_=rhNuSK(^SaK8IaMhdRmbv} zN@x;f^G?26DVmn4e^n%b3yr8sO3W&NTEfvr5m%>RQ?D~7AM{OFpQemr%I9I<>C9ru(lJFTO?j#D~z5j>mT z?pM7kAh~E1-`nVyJjZMzXoWhFOqA2d@ccSx;6}F?sTvHnB6&EA(D7EO1@ShEoH&DYe26V(R-LOjgav z)d|U@r79w=qEh%X$U?4G_)nd1zt^fic*YA(_k}U#dRfV71F8lTl8YAzD>%`%Oh~ zV<@NB6BWS{jPcw#jens=|o{u$D)>4lpRQz^eS9jOB zxZxNcBa+$41rq7m38a$fCnm?nExL1LH_$-^1&P=T54ja~3RP&+9;b@+{aMk}*gVJ( zyJlq|+PKGooaaCqggIEFn8)5jqm%^0s;}cjE`~V{Cv>Jko`at3w@iV69Pt#2x;D8L zya-o+OT{9rPJ(Io;p(sHs_7nx%@u@S(N(K^V1*?n5L^jNQ>Y&S$O?B)P`^Z<37MS^ zS2DYWma6tZEWm9BVhTl67tAni1s-U$3O@Cs+9BhE+Ia5$P*ab{60e@P9PzMzBJ_Lg zsHB<)Qz>_dTXq#;Lr22$VqHobVQaP9X!xt$HbLVQCA7zT<$bO@z^;lEL_ekF)6ZmT z32kSXh|7xEGY_Syeh%7l{Ut{kI>b|A<>3HYfqO6bCAV#G_`?fnscpG1_0&`aztz+F z{In$kZhtzhhHhkY0YGL&Y zDEfR@6(7l6G7MJ({d3iZ7_Nr3!d2ttfy83n=!c!eV%=z;I(z+5?yNU4NmX0=YyIn! zeBIz*KVjK3-S18$NpW(sm3@duh5_hd4fJqGqxoqzxkM%QxOPx&DuuF&;9TeBy++Qy zif|H|O~FZ*4B*U0?eul|l2G!Ju&+rVRLn~NnNN#G;_S=S1=&eMTb9ZyeRQH=T}#ys zFw6a;y$kJ>BUv~vL#u4{gjIN9I{L^5j_S;dhud9AfVMVLMN5B?>wJE1H$yHkWu+K_ z!qJ!Xe4FPlGULyv7%7GJn6A$GRWbOGrDK`1MD=ozRaQ%b-pvGIuqb3mCRKK<6Ba{i zA=_h}P}Mw|gMl_XQDA|xPUOu_0JZ9brQ4of1-$1w*^JNKQsquQ4ar~Z`m|*Hfu?Q| z@{h?s%P6$9Ej!2#u_}81 zP@M}t=r%l-jvN@yn4QI))Gp36ywt~G1HpHFgU6J&-6}Z#yjdhA(D?J0s+}ABP=`X_ z_qlL=lW??{?e;v5NwLb}oaeAd0sb)ekJeFq1V74Q6xp`oS#EY@bYXpg#$x z#Aow-AcD^D0VfWP01+^Z&=EaI-@P}NiT+uaR1+j3tJW$xRu^?dO_!g{t{{|cE zw?f_fP`omDC_=F*alikP>fTen2sRJbUDes}cU1R&jL?HWT06uyq3(TMSv0|AcdqU| zMS{d{idd*DxSJd0(qKSlx?=yg;~t9M=`7V#n6BiuYPy@Pf~Lw&xxjR;?!7EcPoJxM z|4prXe?L_>RyHI=eOipj!<+T3!;XzPEYzLAYM*j!c6?Ny+Qya{6jIiX8x+vbR2!?n zWu1=hp!P?eWvL|U)eGCBOEv0Ut#DBLVv>v={PfX;Pjn*L9#%i8UCn1{n($~*7w4J| zyjTG^Mi9K8NXu20v7KiXN|KnBpsvTSZKdFm{h9-=Mc-`tYLr zm>?k9wiop;n3B@#d-iJ(eVTA%M`7iq%-A6{un31DTYv?V`%E|#*&SdGzXj}gTCIoT z%l}dKzE9my`kcvq?p`dmqs^%|rh@u&uCU`KG~2Z{A*_DqHlrpMkBFO1VPHDhRE~i0$|jZJqX>qN8EM}EJ*@l)B^LA4Ve-PnGMmQ? zHV?mL&b1ZC-d=s|3}yM)W&EJ)tx+!1Z{>=5K=r^%1;@!(Va=|F7*?hEnc|R^l`tt> z&2An|7aDB z&3f-GG>eR}RpReqa*1HFm(>bR9DT34@|On7UZ!kGTKBE?qEO=5y(sw60LTkMD@(!< zI0`roa($-b8_ZT>WE{*Q(}!=A9xVzr3alB8aLgo5l`znz4dKCb*r`q8cAeO}+9d9> zn%p1^Tb6lvw2$lX6tBl}*MfMuJ+Jxsw1x>TAR^k9b7BP-gT}0Rt$hW?zhAJ=K?8S# z{)=E1DK(06^d%J$lWqQN%_0U5vw0I{sEcuxDB1w6ZHVxHXq z#KlkEw%B@wm`TXYdzS{e(k>JKWZ^sZNofe^(n>?jc-0Wa8pZc2an=rhsyiFQ>CV+& zIahl{L77fvF$zzjW_R{n?G@IGMTg=iJXd=Km5W$ESj)NEE46n!Amd!^m2bh?D_AqX zMQX1w5;pvEwO7v7UfD}LDfXVEe_n0Zk+kTRk>BoSv%z?L+Tn5ykyZlmsg23lkZEut zXbwYbogSmGML#SmcUf6CHxJvB=`pzNa)RP|9Gs|E2xXWaIcFL7{tQvtxnbDlpIwBA#f_oCLC^ zdN(g^Py+NZg%UKRv7kV6uE<-clxj@x&7eT@ao^MQaWgjZC@f4nrc}o;Z9!I`qgwSC zyC*#uu#U02)>eVWjsbQRP=OK+O>=`3zzTEcY#>>21yx~m*oz3NyVgB41pjfXu1sXs zX!Y}ex;54j?_>xUY`{U~Z9|M^OI8u3+s2G~KO|B+NU{N4N3%Em*hicEkXx|TNNt(F zZCmm`0RZ>bwH|)R#Epk8!T>Bvfd)gzwQ6;WhLRg>_S7C+#W)Kj7c!9m6v#z}eZ|%* z#L75|X9<<*t(h8h1_#hEsO-t%4kIfCAag%AGCYBKM2WJe@|REwO~$iVI9>{?n6 z;e^am6;2pVa#A>L^oHRPGW$44+H(Bv+y4XN9JiS$5+1kx8`dU? zq&l)&XgSajNPN5bqH(F)jE{x4iEW;UP#2R6H$8Q2pR=o*2ApLpvpbZtGlAs>Gm%!qR&P}QhCwZtUtrDh zwa>twW`c+pl4V<5up|TImsWpPiLxqv({0Ss@=;4X3dpO6t79$|nxjybOde5$kFVbi6X@c4?{_@ImyGf1W-Wgx5j^y% zIq_aKr#VNqtub?&BiosnYMW*V94<2n11L9y>^kt-IQ-k@)j z`3gZ?u~q3KYvv5p;!4OFu!Ic@t$>`y#TDlfMl}dq5>ey|c+S6CNX!9qY8X?Jiln70 zD1o|G%GXd5b%26Ih-?VQ5}$|@v0}akM;$|Y7Vl)zSeUq}&s#18>zf1$9R-E3(;+DW zXN}dw&^1amS>|8MOJIc5KP5{nAQF(@H=Zo9;N>nV=|*)|P&78@*Qqqu3K<~_I=+H< zh^-Pc6fW80g90qbPs-L%nuzkDX-`MBn#d9oBTpwyq|KuBQX(Bmc3$nn^cv)sBQLi6 za{JzePLyB1VbaT?_Zj0lP3c8lh|tZ2ob4dJ z1S5(#;rLOXjo?o#CiPLD+UEMk>-^kp@(x+D;keK4LX~$IrJ?}=coW4%;H_*Gwqe0n zgWxiepJ$enmXy~Zw9Nb2&f&mqKku_!XCAgZpX3BS%c6%?K+%s7NjFP}RZqz*C3n`2 zP<8s5Y&f%!r-=@wv!{63H>ss?beZ0Ep#QT2?c(#agEojeFO)5g}c35mzY_9@R*?Sy_2c?HHS9DJmjeMg7vg?1L zmfEz=1Z*%)ce#aO!r!Ghy|>zRv1`=*W5VkYdUxyDGZ?ix+82gv$Cj=cn# zDpf+t?M3q!%=PCVvK`A2K28uK6mKpP#M)^DA#y+}6z51So~q~d*=!W6i2bTsGQyFyZ3^Morn#JOuty>f#N5yEQ&lCIHd7hs zNV9StJuutMGnq8(VCH$YK7Y+AAMm1fH_uR+fb*hx8iA9q!92qb$Jx@-PgFl}2nu64 zzK}@j1<SwRk;x6?4& zCcg{rSQc31d5kmQ(yUX=V`ZIU$ZZc4(c3J)K-!Y@0$xe`3w9YN3?l@UkF!a$o@#6e zvYw{O7*&SBwFE~Fm0HJUoSC$jZJLDfW5VGJKVID107V$3us?w}JMmn21L9bXJ*2$j zT$hZ-3FjF#9&)Rtwrla4INGS&*jat)1YvQpq_^0Wdb=RoH&`8&`co#I-C{ z#Pwy71qkqC)JvlFReOSbjWRE?BGsO{dgTfEPeys)3QdGl{@$Q^5)^pIM=2>A#~w1q zSyh?H^fd9nRRRf5!^kG5HvDC2m5gbEaDu6YU|%~?GOHAlX1-JI2vP;>cs za}26#?gdno`1i`MC?x5fOyW_pLDIv7FqWDVdmcZHw#6(_2sRilVHn%?FUzf z6^XN{QfGG$%gX)bZ~1l@UK7zt;|orf>)h3K4Wm(UO$0Dwms4Jp5I6RsZJ^;ro%cSA z2na`teI096yS=|`qDXjaM&g#GuQqqEQPKW_)AbG056;V4O zaLo$6zQry_?QA3)eO5Tl+}||?HB#s&M|X9%(EQH21T^KPFn{$#bc91quwh5yk1QrD zzQ1ffW_TZDR_|wS4uBW3#e7W#%hpJGQn4&CNG?88U6jdd1);}gLPan9TuGh`CsksN zp%1EA0b32l!5Tgasq~WH7IAc>G%0S*39Vw!+o}8DI|rN5RqE!c0Lix61k{-d$jlkI zG-#sHkj;W9p9Lr=}Rc(1T0kJJ}@~A>A7_&+nnw67@ z95%m^W#wv_k{Z0!8EI|Gk^FbE#rT3l#A=>|p#|V`dBPZ~H za(F_rqz!Qc%i7*fdta~%)s|^i9~pSO7?SKt$ODXBb{;b(X;0DIZg2w=52yuu#)++< z$N3<|4xNq)O*y|)KCHS&3Pfh57~MsNjhzXDBE-HWnaVatwdRN=0m}KDw&k`OUCb^H zwkT^`Q*NGd%WwQ*7V{go?+pjV)8%NLI2~-V#f@R}KW7=ZSJfl%X=zE|&^&}!(fKfF zkzjVkwp=dFiVLl6?A`K$3s;Uja$> zB9(&dnou`=lL+6)QT7^%esCij|XVB;xLP4*?WMrScec*iZLGNXiIF)PdKq z03$Onj%N%GIuePBj%+F3R~^9Ji{fKrDaO6N!Q5D2-$&wfnqveORT_QTH>}pyE8}~~ zj*T=bhMkYTXRoY7qt5q86H&6HUAM>b(KU8+ki&z-D<3zJRV;vxzFoFwz7pI(y5W}B z@v9iU`gQUyN3JKvB0-y1;kNnD?3lfC*m?*i+S<`SWIAbO2ao+LkWRf-afsr3U~PcY zU16mshW}zDV1KYN?;o6;cSo}^gowX5+hP}i*9NXLHo-5(P`=g}%GbVeL-|*y<#(7u zvse|Y{aA}bMGK6}I_LM@7jDwndz~8(b1aks$nH|8_+g%AiHL3V^}|QKOyMpf^U~3O zh(EQB#0{A+*Fy4oIy$M_O0=YM9K_bwuKK*L<-L!|#yh2nyx9a^rd67dd8yfiZTnDm zqY240PD4B#)}V|=fn!XkA=zW9!BFHts%w40s~JqxJq+9C3J+(_b6yOR{BVOLKm3g& z$&+cC-G%bqKW*kY)KPf3&In|uPmF;dkr77nh5v-T^AnaTW(2L?)F4&J^73Q@L>Zoi z_xrQ{s{f4K5IXC9-V(XtqTi8h{H~@4`9G7eB)zxTF#8ZBL`V`b(YmpjJ=()?gRzDgvdCtS z84A`Pbmr+HN$v@X zfu^}dF%8q7m)hk9j5n#BYl-S6f>K|Dr3PwQ9@`VFG}6t-%W1f`)2uWe;xpTCch_ip z2nb=VM-NL~QX?W{En-*0HD-n|nL^@7o2ZyMB`T&_oV*{b~}EIj;*Y}Ub~4-tN#iT;xk|o%;6YQXb0EP{7tK_2{_vQZ!ob&dqhBy zj0C8iO$(4Qcay^-k29F+q1!y(zad+9S1!Zyk<-q-n96M?Igl2{nQ$Lg->lwkav(pn zWGpLVj0++5DQncTGIG`KpU!0lWt-sBA6;fU>wZ<&)&O0$$iy#p7sCNqpQ2RrIICMVT({z5u4Ux51LsY zOB0-I|9dU4H|&YX@y>eBFlRMqJv(06=Zs-|IP9#08xTYRlPHV@7KN8E(6Nh zlxE1`&!#kEYqxK*5^*;@sw0Y3c$!dYM0VL^B25uiv8I5=Y|4ntg7N2lL`)$Ej5km6 z3UEm%s8l^aGGig>KZC$6XK^{tRL7FH;cc5Vk4>|6e@EvSjxM|m!r5_4&4_o~@8ElS z0mE5EDE%x8rR&g=&Am;Og<2ivDvm5U%jC7GEj9H5${?)f(dSa8lj%_$V&st@Rx$zr zKsg|z1OOE>FuSvTJ;^B8EA~}^{gz&55!`b@{#pt0SYMz+rFa|pUYr#IN2%J|FTeT# zPfseI?zKFAb*SdEI+Zohl?QXq~ItPO!UVXx%6j#a`8v4cSVQ-F8@Bk`5fo(o7p9@pI$;>cU z!uc!JnG)%lGogZ3tNrq>`XR_Jw51fpTltAt?N3@6fmSP-0P-f0F8LuQsMm!6JTK&;`jwPTckk>U(S zNY`75>t^q8BlU6>2hh^Y4(J?5jy=K^5PZxtb7yPc+=EkIQ3fG^4mCV^KTOqii(POOhZ z_6nU)d~iYSMy=IgQU`;5qx0#^6z;Y1sslZ4%+`IIam2wyrBXZUm|l~bf(sZocb0e- zHkBZvC^L2C<->3-82cB8gFA+2rooXoEcG*=VjppTsQ5yFNztrIPFMX_$~U~aK&SPo zx?plSpVc9$wI~&zbrM@B0C@@6*?yb_^wPwF@}p*n3|&0SP$9rHe+jyyattX}r1{Mx zUkqIg80Fg`rQ)Tc48Teb7r#`XFQBAt2r-Q2SP~a4WfwHnZ%td@i|-H!w#R0E0e)zE zy{Db6BjPqK;NuJ7{Ycn=fkY-VZ;d z(5cSg`ID>p!Oy1a4gO%ih zUZsBTw~lZ`5lw>$K}U_(uNt&fcwlt`c9k^0NiKt+GX(N%P@iWFL=Pf(u@wWLvP}{xcEz+>2)J2GvdWi?edJBNSDQbv-Olb%)llG+~ zq4X5&@i?K$HM7s(eB2WiXS&CuwO6mU2My)ngH`PD`1L&hKPql62~Be7mKdbb9vOdwv6idhSBiM#cV9^ zI3!hzDgn#x{^p8;^(zIq=`_^rD3HVQLqU7n;+uGVGf6?WVqZ%qo3xNn@%T5rC4}@1 zwhc1-&UN|*u#R#Ymvn{8bku(>AxQ({TC{)3)*GW+$BKOtHu--0Q;i$yX(xo66=O#Q ztM>waK3_018apS1ovD>#M|H;A6o1SX?kZw-NH?N3svb!bboh?RV z=F@t>Q_%3ja(m;e@6^||Ez@!%8`<)cgOjH~jh^dj^wIwU_|Ao}&s2?Cd-bf+-Wt{D zQvi*yarBoXF`X$i!p6~+_SOiE1M9UiVWfVOPc>vxa55z!WLuZeNb9Tv2%OrINtxH= zw7e2fhP%S5N%mX64khV;OZi;v5`g89)iW%d>>cq=IQlYQlyDn2By^Wqln};(OjnIc zeYmI6dW2F>)%6HPPm8dyGK+)qfb}|^bftKR>qGt@bbT6*{4`r*JR-{LLms}}4kE3t z5BU}s4M_nNbvv8%F> z$ssVdqM6+ER9h9lY(;Dc!KOt8z;NGO;C%X5F!~Q_)>XZk4(#v`DqPHA=3h{Ael(Z|yL#QuF(7-W?!6Zf~sb z=>gOFE7=>%Raug_1-?wY(-NmFaS>#NX?uRk2{60~EIVVepWccBM^BURClA6bQd z)PS_+o8>P-JC?dL?Wpc-b$8KSRX-Nptx-STKAE(aD*P>Nf^4Dkx%gK`f3^5d;f>+^ zENNLhTg$`Z$nG2{8B2PQBxNYSqX-w5wN(4t9!y%EkR3i$>on2xIyz-$L-n0~T`DVU z570qhax?ST-R<9C_W>e}n<);iMR8^;Ji`S_@7}}&*$z)|x zr${|-PzG?R3g8Hqp`D49P4!!0lx1i%mxYGH8N<*B6}(M@AXQ%PSMk?`cJjlu+2Fe% zj{sCrk6i{7SG8lGeN+Ke$%m3RFE-l)?_p^QTW6CUQOLwrX0NSqmz*KB6?008wnV#1 zPmWu-Jn7YnOfOE`3vU835YP!ZK1-gHRaO;GM8B2G&8GP@>5I98SW1e(ZeB~|E25Qd z3{}CQl1OD(l)LW%&TN{?H>)I}jX5Vp`P*KDV!e~$%zLM}S{(>2mBgkpU9n0yu3?}8 zn1U@*no3DigW_vUX46Z3B9{n8v+0W{M49GY9%%Ey*r};CvMFzQt9V=$0g4~is z)Ybl=Jz^Wxu#bCbBZVRUwu)if8a(XZZnf!R_#x>vSx7IhI|=;C9?<#X1+fs^s7m3= zCaH+Cynv+2c~;k0FtKsoUf%=WN>OafP4 zM(w_?vqyVv-vCv6DaM<>s+;vtB0CJqRU#GnKLQ`CMl16|0e#$9B#|h%pjHE{+QA*= zU7KgYF^Yf!5LJ2lPhVz6?Jw_!H5g&{(_9<~S_mo;`AZ~p(#kdy5-S(0`879yWWU(T zxNJA~D4ngRFs2pnZGnic$MTi&`oW9BifNVhw?K?D!64T&z9B6y_HtKX!uS;bc3>8r67cvZztQVgbZuVmj}(>(zRVGG*1 zs~tL4QG_8=g6F`irQ$=|_p~KxuWPpNDdmSv+x$J>d`oKQ zQosVvRQgFZCJdpSOD~pXA=i%lzwT+R9zH_Suj z%1TXf$@y7hrBSB%;>|TxAz3oVwFoBPTysL}14f(SrqU*g%{8qoTpChA!#bvjEc?>t zniIacrq{{;vN%0og~5O+43<7?Qwy1UBa$sQajI{zxu(DDx+K1ha?sn1QbnP5Bmrz^ zM-qs4Bu!NXj6pij@|XFr$L6S(q}{wF-l?2zP-&>xV{@nxlci#LZ{)dQ6n2@~X;t01 zg5}f%kYuAWkv!Cnv3w}DW?JTeEQG4enT*9Mt$F@X(!JP=ust?es)83Ww8y60B6$(r z-iGQPo5R|cG-JbS`~m+^QKt6TbUcUk4i!Akq`~xxp9KOHrx0XD&Gf7sVx^gCX$n+` zs#JBBB-(GHR6uNlBt;mki)_e*`xp?|0a85JctBnu|#F);)F2R8S#*ch#@r0}*#6A4t%Bg4^<~sAyUw z?yYndx5A>=C0gNa2f{@uzN*HoBULm6B>O&h>^XAwwzgW5hT3aV7%dJ!d4*es z>LPHN+YLd)+DqV4%ZUOmv}PwK2Zh>(8ZEH$3Ski`4krTw9pWaV!`x784QeUP5V17{ zOjAJG=jX6+9+Y4RBUOD>MWA@nig58x)v=a9U_?p#LmZ-hxvbu%3@bf8&J7Lx;@+t3 zSS7_R{~n8_=^l1e)aFP83Ef4$t=R!-IFf8g z;^&S~RqxtmW^9twBtLo=fh(b;vyE~dWjeV@k*_fHw)W}qg>YJu1w7Ebsd4el=1F!IgTR`OLQ(Su|2J1%nk!4_oLJofKBb?g^-Rv7 zRj$chU|%x1`bH3v*DR|#k-{j)1*7WfAbf}wjmneP2wxMjgz8$@#Gq>{(4}U|_>`kA zRs2s%wB~w1YW1ajMWkC74PUP!Efq+mqNR+;9H6%Ue9$x~80nw>Bp#>E2SJCowHU_~ zY9PkE9hU7%y+rM0A~dvPdYg9IzS=n;ODd7!+Q=QbhAe#0Yvior6iS&$K}PhBc|&kC zZ<*0yYcN)kt%B?A@f$8KvAbPU+b}k@4WruXP0J(oC4ZbXg3rxaBLJ-Mx$%?H)N-D$ z;{#V(D3*Sp@KS-hvK8`S_zK7b zoKHlDUQN7YP^@wEM_uz?;i(JprG!A(#KKSaQcO$hv(cD3SJbrdbxs`qtT%D3cgMqF z5dYQ&A)P8xgvcZoFfaQXaO2qd!SzCQ6gFZt;Vqjo3k_p2_%;zEw5(%76C_IQ{gt+f z@ZgH=<)eJ(3ukoPDEs-qmrX^h%g2qv0@1iCqSdy|HH}Xar_r`P269iGPJ5zlG1%Lw z8Fv0R2Yu>p_=rghdBc+qK5{t7Vg#_YsM6aCz@G8#A?X8^yP)@mV0b|i@(pE{Qbw{`>qoB$&-1bYSa3= zP7P?Y=hFFLelv7~VBT%cy{H+JC%&`P6;{*hf zxvO)ju)Dv(pGO1k4RK}?uYJ`1qHwc&pr(t=)06v&ky1KXYep;ZQC}#l9VxNnJpakG z$_fZFbjQ*K3YJQ4xRD;(5JTxx$lT4umf z`|E)=oPl*9mAN23?iE6+s*BV~pOdabB}R$}LRk#2vL8}Ao{_TyuzCHN1Q>xFri%oo zOE(raUT+(2pwgsy+@G{vmCUC!&2!9Rz>M~S+MSqtLj19~l$|llY_zSFf>`V+S6Y{m zD+iB2b*iAIhpG(pMh+cYuvV(xfoL3O3(arG(NdLW1ee zh)Uq)*aZ_vhRUfisFcU;h$*4c4?!P~6$qql9s$BfGAcjjNmwX|V0Ad7+yc5{3Zv4f zrl*YGrStrF7z<_M0U}S#tVYf7Rf70RcjxeXxb=~0sPj&ObiPrJOmQR;ZlmmHQ>M|! zDYYcqR|@6*Jaz~^4=ws`IcThiU_lwCTd-lH5f5i)bMBHQTQqhrQYKN3PF{s6Gg znE_RU*T(~5I~%lGDc?SlDA=}-!2u5WD9sGV<~;dZ)3?f)5|&+g5U3qALSj$zQUp-a zACSI?4{0%;1+Tf6vajN$>@GPD_XO1=x5c~^Qyo0u;1BQx;3fE$v0<1(;rZJk32q)x zzPWqVAwlVcJ>D+{(yri;KbH*fMif?JK!8Qxwfnwg3vy>iDwLy)e2n=3A~aprL<*>g zAsb+HxJ2jyt;A^z8KOl_iwgT28Ey(sU0WUf-wx6%we5_ynIUxgGE{S3oV1V(SQ4hb zQDb3h2kc4`{3;oe7PObAX8}~l+5r8h=qjF`9m6h#Xc|?Xo~Cx(^x}bhmw=r^yXz94 zv_1bMn#`z1w`}mzg-Q7>=wLg0L3%A=uV)Fd*|aBO@MysKf^{E`Ag`)#M(W!+Y1fzl z(OT!dKMUu+NYdI*SrOV9V5}9?(jdEgyWZ8hXI8g~R$0HQ=co0&rWN)_*5)5RVa9w^Pc+%+SXbf` z+RLKzD{0cGY?lphCEfp1a~6ko+2!9k)HkM1eFJQ_7yPE`BhzdHf+g-@?OR(X*!6k| zo}Nv&Izw-R1(8qBOQwsRuX*)?8e`Ge>D=_LNg^>F*U$ype}nfhkp)aW!Nd!+VE-mp zZ?LTyEfa;Hu%&{+`h9M?@$HMLy9-J8%LX^y{gR1eThMs-d1>M$k%#<%)}sB@e#=gN z;&_cYX;hu5$@WC6>H9_sP=asvgV!CeWzXt<#RZZm7O1eXHutv*8r@Gdr?-i0(Ff1G z$TkVL-D0=7_vsJ!6NgTC$6@3G%TAP-J}>X@t-nHlJM#W!o_VHCpPM&*TuonCG=0vQ zHciz*fYM`X`kxg|pM9oHZ_S&2$3dF@nb>rI{~ADTDHKDUilAhY8UB8@CZ`rur;u;= zcTJgf_spma64%q@(-TxISf$wA)O;qi^K)PE5`&AT`0@LrKadmYHZeRs6IS>jM*XEJs+8jp?ca3lJ*m7--BnKrc?it_c z@ez$$F_e+R2iJ=n6vkgpIs}j`QWk_3#({ZmG3G2`5UJs#Hh$L?Wx4LI{Yb?eJo~b| zsWkbgYH}i5_~ekPu#n4WUB7RcQJzqfo$OGlNzYH69zXMI7q@BVxuNZWh_)1Ei(hgE zT3-Ija)>+lI>tYjIkH8w{V_E!s7=dDz?j3& zkVk~6HFVFMJ-erHwWeIWNANeihb1y}&oX%So|c?@vk*%Qy>0>P5SlWzl=swbah!Gz{6A<1}` z^pVE}MFCpHUDAnuR}PQg#RHG;PQ<(NwES)K>5#5?VfUk@E9^PU^~XwAJmv9t>B=qk%z?CM z=XSetV=9MM0UMyWqxPpn>Cx@_p6Wn*vQgQ81=dX^mu-;J16q-9L+%l*0_Y0T9`iVN z<~ajT-t1E`4lKsp|1J5lyoyKDKt~a%@4j>5TrbTRd?72A%*smOZg-MtCB8Q1jZLbwE zG8#s5j5&JFF_%A$5F=wha?GU#VlG<(F=g7WAjW8Wt%xz(Z4}3tv+RiZrKb^M=C021 zGFRXwTLLd-(yrjeNPDe#ktIEnVQev!Fr;%buqZUIBUn~mfc==aPBfL-?8~J5xftP14ftNC6SMXw#y;i&^=rxjGEbQrc`GuzuUKHpJ zo@KYd%cdppQl{(*UW~HWiWkKlN8-f-x{jCs;c0{yRp11?cx|8Q7h4>oSf~p7hC(rA z%C6wWD0{7VQRsIRUM&2Zsxy4=;-@wwLKu*tX>^|1Ag{3^-4uibWZiH$VpUz!^)!(=L>`Sr};mNPOfhGpo zpQ_YE!BwF8IG6OKk<9Pw{;aw%VtKWGUZ9^)e3E_b_59qfpU`lU-L0SJ@>7)C72&>t z-CMl+>_qMAL47;bKZ04>{c^KJ4s{Y=Di+gbrk;l8TTyXjuV~#UT~Ky(!XE3+=!_=X z(v9rSH`4P2_qXp?^@*AP$lREwOW>5H>hQgzUjCXgY)Rg@KxBmw#>$&Ociwz z1s7jF^6STI*;&~S^g-bo5YFz=_g_E6pGhuk3l|RSf|4?`;lgk0f|j^IV|Vi%=89yp zZ;1{Msr61cVua>c_h%jY$s$~!WZ$pcrY991r-S?X-u+?T!KafN^pMyM4OBxHi*A`Z z9(@aJtHTZ`vT9ycziXIQ&ij|_7GG>~*?^}wt%`)eXLRzM@(cBF;jM}0*<+c&K00rR zd`O@)!bWaNYBYMRa=22Prtr|^dT2J?Yc=%^tJ81NXM9d47w+S2WaWp&ZRhiy-n!qU zJC(dQvl$jQ!4r)g^_{!wU2bELHZrS#_maSxU)gPI@yOp;_uI)@@N}6+!bvt(5DS#l z27idqmxr@=SGryIN}X7ZZ9`1z-!!|>e1jYaJ&FUgdgi@U*Mld)l~02!D<#gMIaVvc zDmSjH+=|4TK)ktlDvPf`%SccFIzoOSxE^>K3$FW;s6|+xkt-1}*}Vf2H-XNIiy0-* zOihfDk;r#Ziz)!bBSv*x>hACU3CKXiEAk`l5Y}Dr)Q);jk5yVt^}dm^q`oqL5LO}X zbq{gxPti+UZ*qxhXIeH32K45HkUla69@^A^mt0(#v@ywcZdk>m(QE!%YSjInk@8$N zqg=1ei)Ikpap3~l>A;Z^FmU4!Wd34T%7$nn@0w~&I0^EA0qDSO0HQQ-eK!vX&v1HE z9QWNiAVHLEjYQHE44c>ryzi2!NeVaJCT-p3h5{TyvbAeFMA4pzghsZBNYq$PBqV=l zMI@D03nFQPy#VxbFUt{0GbrtM)P3%USh3q;?k&TAG540{z7@Fo+}k{W2$M2sX}J`0 z@C!j1w6p>bu(wRUw@Mqbw6va-jneA-dOUQUo?*efDFe!FX~|v*5ZA-nZEFFHf{dsU ztV?MGUY#4%qekG_y@F6nHcu<;FkMm!Ey?x(BOAsg!o*@L2nw>r6SU5*BrJf14TJ`C zgtf}w)47tcAzsTF@VZ&<*PAedO-L?xXu#|lq0+h(Neg1=e%~gvUD|>!dj^vx+M=aJ zq0r~Q9yVXxR9Y9y(`?j+PrMYYSCV) z??)b_dsZx>o2Nz)PqE}?#MQz|h?$^x659h01qT@zEL|E;s4?Z5E05u4?g z?96W0vG$S-0~k-T&VGvoL~tVp6Dpe6#M@^TCvpEuCn3vSetCI3!~Lsmfyb7L9Zi$8 z2;YFMr2D$WDKTQbhER{|<{Eq#gi}uMQYX)=HJ@LT!#80VrwEUW7t|WyIS!%CHx&i) zVY7me)9zo`YB3ZsE!$xN;3b$%Hr(kPFQ%1+m!X%ugC$=QqN+XBY*b6WWNuhFz-7oo z;Qufk;teEn1eOtXi8;0ybJznPwV9sT^1=w<((*!iJJSx*5`eKG3uZ`B5Y7&cZ)E=i zVK8N|Zz++w2{PKCVWU!kT{@%kUV!{k?-`2>zZZbN)O(|VZ)Ez`q*f-%j3dl85=Sik zS7WS6_Tk?+PKd%}Aw(GpIP;R!6T0iir1^5w9hAO4^k<)a!|&es!22Ge&Xpm?mtvi3 z4~doCuNUh>Rh+iwbOisrHYpEP=H^fMXDt6XuztcnQ4KlYtvmm`X)*sy<^1EU^M?cj zS(B-pK*0rP&N}y~*^#XCs&@47gOyvb&EjvIu$5vx6-%SdC#D$qKhylARz$7X7=EK( zQQWvu7_%}&3VW5c2&(g3qrHlE90qrjdfJc=ZiZ0l+S=?fb&2+(>368$mQAK8S1SiLN1y8j!vJd`>WBc}99T zNVv7ctPp^!)CNe$)hX06!_8fdf&Jli1f8GEJ_dAtbh-mCf)<;xqzr!ifcN>-B zA7dBj9KGD#md+Wo#Mqbk+ns$j?3Sxbs3pWZWn9|Zv$`~tAo6ks^^@)3F2V7?LDkcR z|_ah^ZXIHq8I1!apPhpdYTNf;Q6?JMtB0CdiMc*W(TTmpB>wdDIu#X zIS{fUMOBFceAz-k(}B@wY7e1lP)3t*0*1_Jaa26~uH&`m)oRa=sQ4!ILV)>qKmA@T=1jRuZk=iUZG_2PuNtL+Ckz9W@er@Y}Db8Wx~9Ou#q znIUy;r2&_S+IZ$dJ;U+9mUyu`2BVMooN}~kvSuS!t3rKn2iTE-WO=GmOA zDG_M&#hG-#PWFnUDd4N1Y(q@ZC;+c9QQ9E;MnwkDZ%+wLOMk-b_Pj149JXz0vd+HG zHhw%~!v>l*-jLQ?47$5NZ!7`mj)!kUpc8@U^B7iQ)l`&NJ zdrt=F9unv_|9F7zBa0aJ=%*sp-4ebHQJrWGYp`DHe!lr6@a*>mJyG_LCE*1<1K|bD zGfa4aXa72R58sc z8b2(CQ_3V-63#*(<1>k|r_jrvuPKvQ&h`zZHS( zk+))o90Age%fc9+Jl zB{diC@80QgCu@@MGEa@HBf56!CLQX3;BDy$vAPxRjcIHlS=^d39UA{8p^IJ;Ds5-jJ~&c@ajo}H|Tyw;};#?H`L^+YQZW^eo0NXXp+jeTS^F9 zU9DKTNqoZ`TM9_7E=^;B#luu)jsel35eN=(%n~o^if3vV*$|&f3Hv?dW7KK&?1)u8 z;=`|3cosO^>j1@;$Z-gyDZBl2xRF){_v05;T+fi~s}Dno+RJ@JS}S|KZi-Bi!14Z% zJMg~QinMmhYvqR(ntq!qT%^O^CUC4yhyAX-0t8D{0Z)z&`vdh<{}Ji15z{h-vpV@z z(P1C3@dGJx_d$ob-dUX_E7Z;h)nIcS03tEFoZ1-&khN=_KOO}SiL_N|9TV)2j5h;D zSQhId*TdSUG-;^}v|>SbAJoD+dAG9TWGZ(*j1%Xc7RcXZ49NAK)p0^s!9cd^$5~mj zeOj1Jw^Qg_y!J=@2=B<7)%8XR;-}CCq&s8=EOvP9qrePc+h|$GA`CXQs)Z zcYw&ztO7*GL|Gfp;Dcooc1$@N4n|X6UW5))T1fQfp`@Qg$lb>dj|Ml;z`G}kcg)I6 zwcVpa`toO0Gr?by)%g{1oNbbrUm;x26%Ja;uZYvx(!F%$VyuVK&^SLyv2=sVPCoER zI8`aV(7)cVO$F;Z>=n3QM@#u+9glusnITe9_UbuNVcuOXV?&?Qt8+$;>4IQn1<0^@|1KaV?~_QLJCeL%`q?qc+X80z@4|#kRFJf16PbVH(CN3r;0;0O5U9 zga=s)m=GRU@cAy$+b7M;`j2_?Y=R)ogs5IE5LwjPp6-!mo_6d_z?OXo8;a~>1al&` zB_YX7lCQ9g4X;{!gBF}+9=!QD-N8IQ=Lz76WBKIvd3t1@|Hr}`Nd4&ywa#3+^I zsb{zRHjB?rVcOV*?&~Kk^^aFADl!xd+<@(Vp$R9&jG;m>WUW5J+u1H&Wd-qL`hMc= zH1`1c$zN-vog$B=SeO)=L{?KaMZ3?!XL>;-$&W`QiG=lidVmq;3kO^rLQ=ZdeXf{V z|HR~Tg-GOhV6}jV)A~DoHKBNk4jmLd+RM&N_Er#zFLI%HX@5%XUD78SCZT92L`&XT zMo^+q?BhbwPF3C#q~W6Xc}IlsB0i=rN-yPugx@86K%k77*=NVz28hn)yJZB`Zewll+y?2D2Q>rCSW$8P5c{pZsd; zyX1UG6p`nXgedjx@?USJ1!r5dZ;Q_UQme}0d53=Xm-iw1@I$Tb7*L&Nt!Y_?v-7@Y zIvHd>)@GR=C>0ftfpyUX&bwhVA{)?g0lsq)2nAo!OGUwZY1+m}`#BY--7lJsV`?H{ zJ<)wNrynJeQU&@UN{!S8VG=&6^+`H1k#NSF2#Dp2PKhr3!5yTi4)zXW<$3m?Q=S&b zqcn0NyxcT%{+?5zzeWKZO>i!(KCbW+GB1Z1p+XizN;QipMm!-p1Kls-gG0W7hRE%5 zJ|I2^NTNx{9TRAOY-4<86?NMH`Y4jp~iP}w?b=#n02b`4xFCB}=y4Yjm z6IJr?;N|cTJ?*VPu-5apMIs_iTf|8Xv@JQIZ>QW;ipNOG4lw6Dqsrh+z8VRJ!PxWR zD(!1MDUR)R{8{*i`b)F+buZ&<`{njacV7OomwETlIfEAsOZqwcSha?Tgu^8R&0-25 zvfti8hBaS_-KLeI&}_!~uYxfBn~^6-k$IkT z;s0kVX(<#A;!!GwGBWn~Uo3z4s* z&`|Mi`N9dW=yOyNM=JL>=;JDX`AS~4L$Xz8V0@_Yz+AoN9liP;gAMb&*B#iEUJkf0 z9&*XF+efN#`$#dkqJEW#4Z_K7{V?ny>4bGVES_3B5K1#P=HATw?$_}LB7e>N?CTEb z>%!v`ubJO!R~HseZ+y*s`*jC&qkT{?<^tch>O0Tr`Yhjhoo~Aj9yoBor@yy9qtXhW zD)8EEU>8Jo4mka|+nWH6f|@b9KrHI@Jvlbq+Gjl^r&@Ex_$P%pMTEZKUE-uS)$4S( z(q-=;5BFwnmA(fnSzX&(*scrllCaE^V?)3|`FOdVF`Tq5+gLa|kCI-sInqi-jr=vtlk` zR)r$=N-J`NbU8WG_Svn=_>j@TgrG($jF0N5Fg`}$Sv^nJPo&Ps! zDm>unt@4rpF^H7>;=9g(I0nuG) zMwF5)tIzSp3ii3LG2o%Kr3LKUR{hkPV?Hzn7Z;4MmJcY^{8NtWPFZQgr;-Z*vD{iY zfe34>Egpi9N0&{isJciXa=5t=i3pL#iNd>P=}7fuslFx=)$7Iae4ueVCS$Gyq4 z(}%ZZTxk}A`qjPUGEE=WOuB#NGe$YtgnM?NA|fj>V+G`M1+gVgl#`y-I{#CU7)5hw zY%U$u9O^5yg#oU%XybkCA4nMpsH$I=r7s)Q?&!Buh7>RZtG4@Af8pPH?fwMJ%?>dO zH@r+{3!n!lV(A9QA)gCSYM5%wMbCEzb?qMmip-8+o-mNmI5Gdk6SaTE$Hc(_ElSFS zMpWWaX``=_6*WpIEw(dY#`}Bii)jg#U@M$E`V%RV1Z)cc6P&M}bc$hO*r~9Vf2CnE zvM|ixgfrTr7s5N3`{Rb{4Gmg8*rFwc2n?&* z5w`Gxhz%JzFj?PTW%TPSiAUbT%3E=X>Yx!xVmAqR$SCc;Q5;sMAk5K6z;>&<+FDt! z$--Y0iT!NtXLyHw%$%m`iZ*0tiKy!Gr!VGX;dew-yZN?R!2sTq$!c3(@%3l;c7=pLU{gLnsJU6Q9_sRFP&a=)YGQDqn~0{(HL+it=vm!8 z1!?)zu!gY@HT6Q3heCSIl0%}Fo#ibno8^cp!bO^NK1GI1UIeD$!)6%E^TRxEZKfOY zNyeSO^4^)G}A>(6vpB>W3;voD)75%gHtJ`;js6U}!?fxYF+|b*!S0LtsY%j!g z@2vi&UKd%|u@U0Tp;KB}ohW0kaYt|R4mqzpGR@-~czh$VrwRIz9-Zm*r{eI-pOV0} z4I4JHDa6LOq2op=5dyW;8M2x?g^KuQ$Mo1YS$KZU4kEE@L<_<-Q@Lh!Gj?eZqcUk> z8lfI3Mby#dh?^Eu9Cs6m96BHj(aIVxK!4R<_|iQYyG&)x7oLZ;T*ny|mK1vdBL$LN zVLEDgy96qeP3}F2DUe!jQe((Sq+2)+3mlh7Q3~HW#G-O&=w4faCkxeK4)hs)O>yD# z`M_nH<%73+d=Sgs#s|SDMYA?s#7f~>Z{tO2myfP5qHqtZcNRXLtl4#6mG(K1 z6xZl_Qh=@~t@>)X35xRjQlFwk@vrUp3fy#MEk$TD_FXKEEYku+r2wQ=en~#ADhbTs zLJesE-q({@0uk4xNjw!h>1uK-+X3v+{{rabK*svKWEeCuLDvWxo2W_b6@sQbQS*5| z(uflcwH`pOGSkTHE1&Uiy@MHR!z<_^lqtwjQL{!bZ`XZdgQa?z;^r;7Nu*N-&3mk- zpt2x5yG{2ML}kOY`@?-icHa1%y01MZo>km$4ntg9%dQdPRy?s9h${rXI$~4+Jgy)c ziPpK^B8oR2SzQ^3(ax&s9?HaX%9Q^1H%IDO;3&m0<*$)~#(kQjtxBTF_C%}MsHaH{ zb>L)}eMNKoJRxwRD~54v*)dyKAx$OKQg{d@FeU%EUvcd zozvsrIW^*)b8-ls)Kt6cP{i{LniPbWsvSM0&cvPtT=&dq=ZgEs5C6o7;h&uk|GR2& zJqn9AuVDBK@1!$jk;}v1#PF&1;O|IoJ3eCgXXV2`s20~_I~YnBmWBSC)S31LFNQAz zPcbh+U>0p4nlsaXAt3iID^3j?2_$%6i@$lGmYRo3rwsF#nl)2d!Zx%Ba9h19B$B!uM?B z{_IunI$oo?>!O-|6VCVnK-&@bg!y*_fDmG)H`4nCfzH|9b>d7 zsH4s|Ddu>4W*Z*)s8t??`(DTRFM!wuwXaxik(|}@YF|p8pHLKYL5(*PP5ypsVV3jW z0T|sqFWFhzqWWK~a*Jx!K7zNhVuC)O%+YA0ZF$)aE`gPkKS%+0YSj}A zc}IF5r6k80tD^4weTcH0$L;8NeyF}%1#+M&)+zA{k6Tf3X4}!{JNi!c?Y1uVp?G#KiKC_Uji=+)2(gxNf3%{)f#hNTZ z;$QzLAkixz(JLUa=upc75>ji6A;Dy7*fCS<+LSm_d8w*I}2&_QD5V%%I$O>8v2`r%qiGTT{ zfCNH5LW1IpctrA|qY?{9GLAl`rRM*xW&449u049W0Go&^|k z>{Y;E*jp+Ioy6Om-UdIbHfUDGiJ^1ESsbPk!& z-HqJEeMz!gZfGmue7i`GB5o@~+j+VfZlayL7EJwAFgphB|M-wqE}`rFt_~ zy;SF}U$k@m{tew`yWOs}+ey2fw(Aq^2CjExGI!FV-&M|lD zx}%9wEzLz_T#|i97dPl4xoj@N?n(A4Wm9agY^o->*yw2G4L5#6H#YOM&d-Dp5=^@6 zp^tsx4Xqc>q&m!#R2`3!cF2zEQ8gTn+H70C-~+n4$*+R+%2Au6PYYoy{7qoFI4p#d zLk!*7mv5ylLtNb^sqtiA)x{~zC$&j39zQMQ>$-7HF&;lH z>BFx7^V;N~J)c~mo4xk@#Otp2N30lL%`e=bSx(vGnkWXQb>o#26nH3WO|?b?9NG`r zx%wtS0_@5%9an)RX= zCjH|=^tXgaMgGSi`n$SccSOf{*G~|=qHWLD_xR&1^0Sf&ktGo`IZNg&eSUGj#L@_Y z&w7SLwq2D`<+-epQH||Z6{|M3TU83dxNcP`f-=`pT}V0LdIpFiCYDA+MY0Y7Tn^G2 z0dC-16~GOAs{wc!dRDr%&XoLx+mR_UlF2rXpkyfZi-A&0^qV~p-`Y~V^>n1L#dIw0#3v#RkSK@!EvYNN) z6nRyPa-7~(m<0D%8?{fIwqv35?hkA$YD}e8V>P+5#p_dF62gi?oVZ`Xw zRSw_(Pi?B4q|jP>W(GWPczmOWMl|}zR^=78tvsk zKJXMCf_M>P7Z9LVoh zi|ZjgsgGS&_K#)m@uOcDF?w~C1Nj4*fatEw+|T5J!{Zx0G@{XSbC7&$y+EQG-sRNc z7uA`3|3cpFnRy1oKh0XjG38jNlo%M|?xObh0kwGcI*4o4<1RCNANTLO2-!2UnGruS ze%vQVjJv4g{D<`dy9#la8F%*j-v>xCnsI5P|KmcH4OGT}{e&_uLtu|ZzqW|s&1!T5 zjSla4`^fl4PcGN!JJqNZA|Z$Jp0}sRw|Q#0Hjk=J85~5zDziU09(fBRkXM=g@2OEy zGMiUa8a+I|(L>8Lic9oMl?#Hs?9ph zKBg9*xeg?^lA8Gk)R}zbA#ZGz>lD;g31@gtA1L8Wbpm5l!f|DghEzhivFsZf;ARFm zTNMziTpCkp^KrE)cjm%sn~#hi=gH;9`K#{@ZI*dgiw{nZZ*GThwBH7Bqyq z)?h0ctYvvO2gwi}tZwz2dWvL_{f@@3GWnvW-MDR4tK%x?4LB9NuS8jEU(b-`s%MA@ z4vxpy!U!U$O!-btS&_zq2yDu$T!2z;lg7}uxiZtL%%kH+cx1!~$%_QZ@?i~cJyzo= zU$UHmm{Sz62=Q@)#j2wImY9j@+?=2aN5xuPO;*5{frb`=E!yQarzc-;v8n`(7OG>f zkB@!ct_zLzRS=(mK}zBI3Yv#@EF29 z7HSRM!ypa!uz`l|{b*KWgw^eYX0;T<;i5v-D$HP!a4)3&N-$Gi%HM;0hTa2X;a(EI z35TbeO0TVRQsP@;Hzg%Tq=&Na>ZVfCl?+=UJx}Ytyp|$n^|VZResZ`NFs2l&N=s$u zQ%M^3$e5x)ff^ow##*mGPBFRt7ZT{R#V_uCzVhoM#V?-xT=9!1KUMklh03oFRet?R z<=5SnUmr_5e~~A=@=a=_DXR&ubj}S(iM8eAYs}xWCBsMp%QNYe)aMVB(q2wlpLO8} zY2~B`!QL0H66Gne-A{^P#vBd5&Y9(i*&J)-WM+=m(Q?DF`js53L->0d)JUwe5I+-S zWTWeno_;u4&$^We(~;bf7kX8=V+i0+@4A&UA!wH_fA%z%F8{dd9*?{qBT;456(cd% zFc53z$xX|()L3S27%u8$>2-S;x)I1=CL6ss)7X6q-~R?b%ka7l{=!j8W^ z)$i9S79Z5(?q+dUHG6_)bhrt%0JgHAzJ>;Et6IGm8{BFQ_SW2>Wxr#CokMkI9W88q z+CHuu8ZxnEToc$}y4wDMxo8tP+1P%OHo`SsvKjiNZXD`18|wBo57j2gKK(ZNjU68x zYZtUhTs|_A^4{N*H-rc+I<@_ewXB$_YhS}9!J!BP&j}vOJjZqn9L?ZkeCbaQnJH3c(L(7RlT5GgJXF_P+m#!N1IQ(s0b^!gXhU3`Z zu1lR4hi!h_gTyb_`Zc(S+)weObJ4h-w(jq%-Xd=3-Ff~hT4aKicYl7-yJG9H1A?t9 zuivH}ybTq0+7&qAlpSWH#pqkFVaM@&Rwda`usj#1$9EPPyb5QVeMz#UtV038iXO1z z?;;?wPMV#JJDtwIUo_Lz_8jGd&MI*l6W+HEf#kun(+S&x8TuTwB8s)ma+6)4t^t0W ze!=#Sk&xqOk8K&50p}C5Qs+NhKbYh!-`?bW`||TPOw@v3ul|^S>ioWaAhBs9&~5;6 z>a21X{n%!aVf*RxB^lgx8b9eOZk^O!n2J!<>S{=%m+Cx@hL1{n@`t@EiDJhYFaBg{ z5~moqZzbB(RvF}m4Vw8`jb>}2Jvr5xwvgOtGz{|@aM{U@?~Gcz<8R{UZXwN>uCcm_ z#5rs-AV{<*APC}V&k$fx3jDq^US(g^aA~*bQwNl(f75h)883q(*^8oi&>E3h)2}Gh zMflc`2-$`)ajsP8UFS!fN__vAkwa!XSSKXy1e-voBbjz(qY}{b5ybgl94|Qv!nk~_ zdsK$%gPnFgmZL2wGe;X>JF}4mcu7D91_59k9zWoCfejHm`YLn6R=|aml?=n=ej+Mr zI=?TU7Z7Xi11eT%$%jZgglpgV~A|jB$mW9(lB7!1lc%D@0rmiE|F4Pf{c5198no} z8&R2^x7yd?%rH`|NnICU&y<0!{j%1j)#-Apw&#}7_8#jX61Q!^<%XicD_++i49vFS zAX{(?dzAgm`OKUV<1;hxtsOJv3(>iIzYdfz8!PyH z=44ocEj(Y>@U0bVdr26Zn`AIf^BLKE*xo1DKy3U|!wgC>gVIC`PBmQjY96XZv8AfJ zC^>7H>lha@*90MhbZ}eFPpdQnaormppun&+H3NlB%|Jmk<-hWUvq{~GzNwkEa_hF~ zJ=OXxbaR7+`+c@3mvP&uns%7BEqno)wiEN$=LVjewk@}9ebJGbws-~G2ePb86==h! zVbhkJaZM*`@MJJ;S7VzB9Eo$inS*OEZ7mreh{5XN3}O}H3_2~~F7&5KMVeBblq(-q z^h6|D6{&47;UkpY9$qPpTf|vvXgqO-eibT+tuS^KqQtHvYw2nb0C-bD0F;PxLS)HF zF-DdXC9>2+MV3jSkdtr}rBN8$Z$xsXSvQz`mWGF1sj0f7fCAJyjw;omQ6)#^IaPkO zm2`B9)rok(C%%{M6t`wB z^*Sqsy|H*4Hw1pk&p_7U6#O zpD9QzHNtQ9!m>`{9%BvLZOqQhVzhSXjZcl{yUeaQuQ8oNy!g4pI+&ER9JB-kUsI=r zFtG+6ighsPgk8xRgqmy!gK0*kr_=cZ>@LCKZJbS}&EhziU<4rjFg~EK{aM;b6NCR0 zhyVi`;uLH!>P0qRu`@u006SS@2mw`HZ4S=Lsa4B9IEpBdJ&*niqOkp z$t!Fc2N`kL!w4vf84wa|`*O182ShKT83tJ)8MKNzZi~PaIHcWz{@9Ai)>^;2kxYrb z^3$B5TgEF+Do!2Ij`SMm z@gaI^{K9!0g80M}PdxhsY8=2d7PBdOl{CE!s z1Y#iL5EbZI0Wq#2t&B!|q9#W;h;V40-G``4fOVWg(3;duhS5%lI^#ffw6_xpW3*$$ z^Wj;1Y2Zh_=&3NO7PHbGH-;q>n-1!ZtsTSZ$~f4z86r+_ zNWx*n^*E+sS)3iGlrkL8OCZQaY28obL^idU03F= zcAB><=j#g78gv-IBBAZ)v`LMqm@{I6Mazovmz{jME#L_-ASasLhl7BZfv9+H!ggh@ zHk0hSaCj=x&(I}YODhD-sPMcO(IgwkncYYN;ODr>`CCdrtW}0RvS8=_KHOmJ1p=JY zHC*u*w&y?wkxn5kh4~l;7takxk3+BHHNvsPw{UGkkjC}b5m$HJ;QO~4o27mru9OMG zd-Max?aX8*&V}xqbv|^@dNGm=dM8R29&*8w9r(lJek$wk{nNT(nO zzMYLpuf=ILrxA4(P3}BP#q4F9c0NoxFHb2+F6p11Cs3TdT!A2sxpmoj8=B^(=$z{K zNF#U4+61h$(OgJWm@2egO=ootVX7Bsh8){~zA>TKQ(1ws~ zn55osYHEs-zak-7dWBY$hV|mn;r6&W0%F_pnKT$l_pzij646aQA-;Q0A*Cs*3v(RN zlQPBHUr!D+-^^*YZ}kd18~B1caaXgCkJ&f4X-U{xs&8DszCW*!3dZV*wQo+3;lY3q zrqy=nn^A9rFl3+&r56TH}=zK7NczU(&X+bHvsG^-Rlm@B8iSukR14=v>pA*|V zG)Dyd!?Cq?pl1FYT}+2AwhBw%Q~$X`7ut0)-X6JQR(+V)s5d*$t(9IW!YcxEbV}*P zj;HJV`sTEbMlaLe`0qUuSQfx&D2ZcxS$Gm>CQss6NNhUHnO@rYTpSEsvO{f!vEG24 zsuf$a@f$2-30_fJQ(Z1xEZlA=d24wKvOQk~B+< zREPJC!VPlU`Y;@>7b1E?bBTzF1Rrq|g0VtQtgtY06zi18@ysbBP$<@#lST+?5#DtQ z+%rR6lZ}EaMHFu~y)=-LW5Y@K@^J0KFw4+JxLO1bXVZP*8Wxo!7XZYdp`R@8Exy8^ zo5i3uWO$xxP2}l$Et-vVbjVD0YnFvUYb8${gerOB9dN;#b*ErWqdj7+?6D*5M@u}3 zsP>}7Ta*aZx`im9tI{^eCHlWF(I49AM$KfImV!<~Rybh0pcSnw2TI}k zXnL`ToXCK!=Zj}Y7!Jl%mdtfcM5{K8)y&A|VVxOAlm|v)*7Hx+o>l@Ez_or>GyEkn zG409yCB|LN>8x#*$QIJwOk#Niprrsw{%_x!}S*HL(7@CYQ zi4DyTnCPy7W@lh9{csD&zbQ#%59Cbod}*M?vl#2{2=URF``u)yhOSofV&L#lz$cf( zyKh+Sis8*`SH|nR#l>@N%}Fp&QH4#yuK0k=t%)-+s5m$9Xs7dUtXgZ7Rh`pmu!7yt z-5L$uNFTBEF;I^{mIJVJNnQ(PdANoJEg9t3>}R_#e}a)?NZylNqqxUCc3wu$F-KIA z0AS~9RZzOeW{QRwK$g7h-)GPMkJ;ok*`IP`cI)K|Wu}PiUV52_qYQxq^P(8rsK<$P zV1=^rHSP!74-arXvaMy>zE4`$% z$!6*-YTb_#tlN<` z6gUH*9g-xtPizcs_t8;07TX@!Xb<$2Li1*>$eTfB<&P2buy(MB$R&k#uxj!Lyhw}F zj$LExv1qSbe(P(!_pDvBleY*HUkmO?pe== zr*l#IB0h-d&+##B`%m{~bZ|Gb=qtu~Z=+wu z{3jx4R|!RK@ryh6_s;fjvqX{fjdANhZ&@OYk>Hy0Q8cBy3MzFi#AD%HqUUuB^L)N# zUZ9d}#C4nOQpx$&7o|rzR9vy1BYY|r+RU(;@_E7V*sH!rl*iIbD$Ue=^92UB(^=D?69-5}x^3s)P?;zoSyNAF(!KrN&(N9X z&0p(+tbf z_HhA=F1z0(hk)Zas523SL(@)pG*IwQPwb!`EC{h7BB3o!Qdu>; zFrx*)%ku}4fmk({h1qk+Vm&8|=bcT!OV8p|vyYcfG26-+RUa$;?(WYXEC1%yvq#In zAIg7lZa_18j!@Xh+_5A_)d&TU#IYNeZV^bFmdPRnTrqHojR8V4q^5T=84e&jpAY2f zEFaT47s~ay({VCc}y2x7796GV5`ra^b{uxgN$-yue5)!K9qELgD z{ETP_;FgeuAQ%~S2qiuNvN@m7%K6AIK4y*j`LbI^AD;@INW&^$!=Dg3F!?I{g{HT1 z3$@H&=rTwp8;lEL=S{=+A>`n-K)}Xh_`TBMv(LaG20$8(9uV;I0ZHLEME?wWGO+N{ zjBUm`!;8s}Bzul2#oL=!>yJ`Ak}E}&EGEjVWhBj}caF8{5aU=lbys~i0?8PcVHo4{ z8v^}@oO>m8z)h~7OtAnz%BZ~l!1PnIlpHlZ*HmUSpx?x;vY>4mmoSm??YJ*}u7Vw|O4vg>STp;2 zEg3vD%qXj5p{zniN)t;*1dYfG1Z^-01l`1pqS1mu!vO2ETop0@@NE$Dz3Lvoxf(1H zGwLS}O2ZG7*RoVF(t4O|CO(XSgOHpNk`VT~98oA%Asss`ZwY8K(E z)T&dl(ZQSq_byCAD(o&wMa70HQE?oIE`hfLV5Oj2r^w|L(nQckuseHt9MP#hiOhFV ztFm>bagZy_35`Q}#zpB~|3JQ^^a_n=X^BkCR6y_kz2%zQh`cnLF|2V!A;RVg40?`F z;cb8LBJ8r%sKwsyKAxo5{81UHM9LHCX^;t`4$GgXB^jW!IRqkX>8rtQr&_s|S|2`M zVIC>x$M8VX{dR(8QW{G3d|Y?PQ`bp01vVFRhIp8hgta@T0}gxKLHyV#0t#(#jyHP_ ziv;L}8sspP;>p*g?dLEx0q`qoBHLZ zjjU13dAmJ8hM8;+57dE&al>~d+Tn&25QrOSdLfZjXrjFe>|*L-Q06{Y;RdFca|6wg zIMxs`f|da^79daw7NCt;%HvoP$OLq6I}Q|FLFWe&00$(%zNh!{n~HwFRL!Bj&ycAwBs93k5Fy0GpW z3z^QvxhT>DpLp zA@n!$<92?ix{2V2d9ef4;PlVp2YDFP-q!l^o#D2@q<%a@U12eA=HlU&3hh*k$DP4B zd^huHfOR;FelatiJ92v5%VkRb8cvT7dC-=;GXv-5WYC^T%1%t01t(^TXmf9B$cdT4 z-7h;aQ!roIiJ5}g%TCM`hyO*72PdYTJ;$A1tZ>Mszm1Ur8GU`0RQ{2q|5H$UPbLj; z3>0M%m}kjaQYN6c&A#=1%8hM_ge>XnfAam*o(f>kv|>6|q1LOYlwX%W;h z%iJ)~{YH!B?_eFwVFadmquCKE7tiaRn|A^PPI5l>E$YF{x}&WK1DS8V^8!F*(!W+sBzhW0>PTRmS!!+(ossGeDcT}5=2*OS(A~kv0 z%vnSTdu$j!8$Gt@u~}_f+^amlBj8_LHPly@+&ZMMA2H9O=$O#(Z4r1}&j~ zO(SGccqP{JaA}Jk35Xexe9&ku^3NMFI%9&xZ&}1ouYk6+H?0+*GyGJJjmGYjGtcL- z1eW9Tb~*ce9!>g8PXRt&;u8@zrO#V%`pHc?v4+tb*H3F6s?zadKo7n8HR>_#uz2Nk zdf3!K7yuuABQ!-Az=gncQJSCqv4a-uBj>WGE*#ye2<%8*6!v~|kio4((A;Xh{HgWkv z25!O5r;7UDxN0bZ4?H$jG`cpBcMY( zf4G&ta(>~Pe~R6RDA}tF1Yg=63F02%mAgcZoRD*;J~v$iLiyZy5eVgzb8(OA^Q?`Z?rG~Ff(9Zq%FFDCT_^=nb;v{mlOuoPm|cM5^D8r)!ncc_3Wu7!g^|){!`1am7W7o%kr27`2i3!n?t@}c@ zfOZhM8ae8zG&c`;PSESVS8YglVSC0w$?~$~f$LG9KSqwF5741`iGDNV%;Nil(qdzM z8<`RcQhE2=@Q)KOI1)Qv0A2WGmh(VZ@yi#4NKzc)*F?Oh8NOmy{WKIbZ%-%okz*3l zLsf~C>>O2{crU3pPq_TBa)w^8O%8x;RcJs>o^DFPhl~V+3Ef%AuZ<_aVCDit$}gZQ zZA$rMWRHpmOd#{A--q=ZTFj6d-M=*XWUMQz3wyCfz^|It)Jh6F%+=pFEiJ5ktBwG& zE`guMU=qm&6>J#0Ko%()JN|^ls@xFr3#b+YxE?pMaV_#>h;az}K@%H@duex57-7e4 z-$6c>R8SC@B_WU(OO1^hhXVC6dz$A) zk2Q>;rUM8zqu2U1i(bTduG02~at*d$>viPLEfwih%ES_2SZ1j}(M9-KYvY!lPOS7aNd6)@LdDRPK6D#am50OiywR zmlu36sSQ`v;{|h^`B}9_Gya#_mxQYDBzr5#q;L>@R#T;XlD%D*w(2zVdS_);SBtX!0H(e>OjbtKYrln=4;(AH}VH)jm0&%i!6cB$7F^~mzmI1R4wUEiXD^r z*P@wE!1{Ue6Y=vQkLD7;!CEmPiZf%9<7g z7+dhy>~SHaq54GrZjYj_VL_J$Hgu4EmO) z(u~OLq#Cugztu4Oe_k(g{EqAAQ75^-56~6nG zCI9vs@QHTJ?yx$fv}Lv@xU}F5IEj21s5qP8!a>g$mQv5@;UnPbw0( zl`t6}+dMlli|fd*^Yv$^+(gaH<%JI1FpV`xy0<5B*k&`=2UD>m<)ncFa0=UU0!3qi+)k16t;nx#j<_lErI(;;Sl-OYU6BCIoLxv6VD!=Nn-S>gzLaxfY1VA2kf zTnunqVxTlkMu!<<6<0n<8PPDijtXuO$)R8D=z6sFWqTFKw&*~3keI+`GpvRD!sN=RmFj~9Mj)LL zh9F}pgjs0K?eXnG`<+Hu-ZgOvtV+60gOP867)UR_VBCNP@+ce#a?=um3SCliXTc@G z)@RNjI=zm*t7KZaNNs@QbwPn|0*g^0s7k1^GPJ5R;=;lErLL|KD(uddg6tAHmebll zM;|-;TeF~Eso2{}A5QMLEl%z@G0(vG`!e*+(n~eVGr@~S;i}dSjia0QlMd_BmpL_H ziPZp89TUH z*O1hbECx~`SKK4;Nnreekr`4t)G4e`;fpqpAU2#)4ofd--wnVX?Rcbapd#7v=yw?z zi5VHZd$Tf;07Bz(I)Z|#;a!CqF+kN_>&7E7G(@po5h*Ur~nHE0jKTigw{0Ki4B=KkO3(tlS|AYKg&dI?$N85jxcrrf`1MrlK|HuH0#C01?q+S7F=du5q4owKrE6m8 z0atR1Jg6yjI!dGylp3DW$2Lqb!<(UR*3d`9ql!Ml9Rt;~ln_X?ql!SHWLzjAkVqOA zN(fXqWds66j{?vA`UET|M4!3I$5Ea#BsbdmuOYp` z2N)$g4`XS>rtx zjj&Utr3~3GiXXkn2FT5h5FY%Ml>P~~Sm6CKHrNEs_cEAShBQbhLAlK6Q-^M1KgV>T z`wj*M?sVUPHGqqT<)vvsb`K$5PHSqQrkpU86%i7K`l^H>DB>G7Jz;E#6L=xzJJP!> zLyj*>7-FV@jG!rV`-uxKt~3ib5$^Hr;pu~szLpAmE_)yj93oi1Ys~OaFhx%KvLVV2 z!>tUagQUEzN8?@i&R)zOx4Wt*00O6VTWieterFwDkk4avyg)v0uOq?uJX%N2@p+^k z5{Gq+8-CwX@32M&30gAf%@YZ!K}-ZAOiLUZt<_LsqM-nV4gQU=PLVjoa)XpXO+wg! z&qoq7xh!a~8gt8_>Mu#BmO<>Fl|ER*PT(A#_RK{c4XOvS`4SKx(Uv}ndCsN95M zFejCT61SHTZtM-{*bz*=Od=Xhs^@axH6l&ff3d`~C6!exLVwpO<^2eO=ud z?kDTSN3QM+)QQEL7A2G8Bo;HlVC|TZMD}84WAVDNs>ueoaJiTmWmBeAP5VeNP`sj< z*H#Nmy1G}|85dxx$1#RlrH3IB{t5xliMWy!M-1H;GC8snplXsN24GYv9*{7`v1~0Q ztrXKQn^_bN=U?`OP%@l=+0vk7I0G}G2pmFpT2!NB!kL_L>gZl~H1Im`);pNWWe|nl z^CrB6%>niy__T!g_m=Da%3h|}uqP|B;oga{hiIewv!a79SmWA}Mj2JD?`zWWbtdNn<+>;P|yyA zX_daOkV&Y0IMT$r+FJ||2{tp(oAzyRubOd^6v`#Y5fa#ZctE%(`!-oMt7pkmB$|SY zP|(Ogeq|@abr_H!H zafR)PNe2rSY7m-ehLJb zVXVQbfT7d{xXe0Q$PANMj^l~y%fiBUlVnqiK#DITs3OdQH$~rXhYf%7Beiu`C@$^; z+^2S>kE&m2KF7LyU-KU8?%xmZHNDV+l{$z>v^i~Oo@dxChcGI62F!z?Z#p*=X-mPV zn+c$umau_s@i-A|HP)jc-&4bf@shis9&pc_3t;lLl`lxnqFZ8Dxg8t_RD?$<&AB91 zEL>4u2vraV|0Coq?S(HBp=9oMMo6Z;}t>Uaw&|X6X+u53> zun~*ZoCUG(Aw2b2qE+{cmRQvNpXh+}VZ@N6-e`8h93Zrcd<(zIGFmf5!=btWm&xMz zpq3#m13=n_bhdpbo5o3YXVrbH)`3ee+LK&V7HT3$tp%k8O92I;(Q$Ta`Pg8ahG$)| zEy4M#Wb_M)Mxoyp#)`|-GDKKljdf~N+Ej$3OjWT`|D}nt81CpHoc6pi?bK9m#VHZ6fKxov(<@;%(-R{AJsa@Y?%VPIjXuvvH%@ z=A^>xHGc&SY8x7&_n_l`0*nfv%#es}V@p8;2^lE8pD4vPHb9!#1vS8@7Iqoif-QK* zTGCSBD+TX#l?`L>NF$Z8ye1I+H~?Bbt2t``At4KIX1`HeAtC!_QovMjPh>Kf!dUK9 zPj!@H9TaLwa@sQ;vPtU5A8F6(J#< zs;1wQo<7VEdJe@RBxDMKF=2rL>r69vRKei#>M0tkzSXAN;0lbl!E`d;hEjm&kdJ#ts~P4~8966&4Fp-G4x`ru@|d6ez~(8+8P z0s~CKN!G-Hhelt$T_)jS5i_vKCLt9b><)5rhwEEUcB8tJ2HHoko5LhTQn}=#jgoJ= zCflTe%_5MN#;!*~o#fz2pXUb7S`GL+8; zD%ntesi8vb!C0uslp(qrebVK~x}s#Z3(ByAr)oR6Qvvy=9c<*(W-oRyY9tm1TbLj4 zQvWqWJD39b_GZ6Ln%8<}?rQ0<4%23mjc;MQgVM#%{WXA}dAf?^Q(M zYil24AM0OXhC~`L3CB;w^ylX$ts0JZ*_dTTBLIES^hj4~lP~`a^8Z2FE3b7Y5tDQ|O1j^T>><&z$4-)-2*PUhR4sJC~WjF}8A9Hqm zMthd=y=L6_a8`_rk3r!Wvn@X|EDwWrvwXsd!Q^8hf{DnXf=@Fqu!?IKGlnnwZKaQh z+`L9Ad+A(Yq`8os1r#zk?i^Fy5v&ifc~sy$s0<~~PVL!^hgVF0 zY#L9tCL$e8I-b#D=mWnl0SdQvs=t*4sM&yZFUlz0uZ5JO2oPN>*vY~~^9hSp#n@S( z?w!N|3_b6g>}Of};3N$1#SRHcQSkm^@YlRmofn@glx&S}2xlrZPQmaDgQ4Q&A}(Lh z*d)9!?_a^y8EpTndq3@V9@(IUA_Pe82|G~~r#1U6+JjY8SK#8+3NN9)Ozvp!28f%V zZAiL@7_@{Mtf3H>>QV0hPOJ6zeXmVT_4C=QqPEShjYpePZL?9^6t%stemiRWRqhjO zD(0s8h5EV9dNV;Bo8*^qVL?Zkh*KE{f;dB1cYcV1Sf#hZvz9vrqKhFFon|U!#fZo- zVlyS3YEusCak+RQ-ZdEG&;4eN@o!`4jGpi&P^>Y2s?GIY^$;b&U-dI%`SA1r7M&MC zWGo+%Snpb6E@^8Yn_Gv}HLfi$(=FSUF}=90SU!VnPL;O}uGCU89eR>j8=nt)ZTobY zscCPJ@FDv*+4UtVA5zm^=t|TS#L2?+230j2bRsC#{s6IO^rbo|fbx50y4JDPAF)zQxLOk8!}GtFDyv6~H)x}NC}0^(y( z%+-&v*O<*mSBQF;q1A%!4MA=M->*f`;Tp60vKV5F=tye`OC33;YN?Yo)YYM(uHn7? z4rp4Wp$@umK53|jxeGHuiV7`Z4P`MS4Yf!}9UBTM)Y5~HEv-PPwUDAm5U0p_tdLq> zaEROEpRjX=3|d))9P!ELe0gnqp_4_(si5$qxN=1B&k5E;20EodEmBBze-_CP3FLE? zA10F( zW>+c4Z)o%HCd&|2-o7SX?kW$vN_@9xmt#0}YB~1ikYjgTEOLyaD%jt@L|8%V7FO0` z2rCOOgq4L?5>_BFgw+@%Dm8$G)r?l=lB85*OSW$;YqEud2^0p94O*s@++CA|#|htM zQL@0@h|yE+bIDPrp-CH7`(5&MqXfTzWEsP>seQ&Id@WNBW)P|T7}pQ`8eQ1cc8$k< zS3To;283iCprAVGTaY+T6ry{V80!aJnEU@QcMVY}4#8NrFgpNCGIQ>ISj|YzFj0W{ z`baGM4TKT2bk~{(OM#h(&Ai%!^^8^j^WojIrT?r;UTBm&=aL6DWbbsRdfp`uHcDP_ z$wQ42EE3v!WJ3*OLGl^qT9zqXKS$Qfrx}c<8L>pK_BEZ;ltJWmka@@vy)hiwM;K@f zsk-WWJSzMbxn@4Eq&Gaoj9OJFOH!6Ywo-d@;g^fa01_Cp!J9Uyn~4b;RaP6)H!74U zm*=zE=MofEE>SP{;W3frrt1S-%Zg;4&LXXT_fJN^=%bSgAtelQQkw_n%cmyiyi@mP&B6-QVj7* zuAB>{zlE!B@i<<`)oas;4$y6Fs?jhs91TOX{kVoR)88C$ypkV(kj@-c^|^@C#S*j? zCZ4K&bb5$^{ShI8v$s)rFba)lg~~nzn7rk0|n)`Z24V&BqlpAEd`durRZ`HFq_?P>7`ocw%PM z8EoLdh4u_g!4^yNG+nXL(d>%t3?5&ZWE7@+dI!TjHJIO_TDqGa54+oVOn1}cVR!wQ z?pX(@Tc{KXvFGagBcy2=iSlGacpMDQx_UPUkiK}?+xjz4kP9Bu)LiGZy(VTT%ft-* znV6wS6Ejl1NyLz>Ha{c+#^-r=h0BxwC)fke))x>_ld?k@P0EREA>~BgtYFbVB48UQ zvEN7pe5Ju}k<(6)0X5#{6eu~+7Cb~95nHe8w5_&A2@aa{4(^zQlKc)RIb1(JGVbxQ z`tkA6$LiGyKPc-Ua$F%722!v>Q&95#rcO%w~T(T9n0 z6${UfZg&((=TS!BO9K}}v6A2pE>avexB!pBMG_$)R;HflPnuM)T?j0qMU)JvRxdh2 zw>7d1`C1@SwP}coO+!>`8cG6Cw8LkT+lhVf_np$8Jf#^vs7PM5d1R!gk*!W4N z&i28MnZWP+joR}!Pva;i8fi}8?QvW>fv4Uh)8SEG^zoRO*wAe=;OYEj_?zY?oDTp8^ma}c2I z(=S{kPonNI4WSYZ?V;&C60jPgG`v8Hx#>MfhxpydwnS2YfzV{BZ{)_?l%oH#bW-)i zn9@E5sHWyxWg#xmrYL3~Gb$;Vd?cwHgmEgVfuIgeXYYo7HTr$i5c0^<&8-_J8|xaC z(?iHY*1Coi3F|h-?@0`2)$q*Z8-YDWJ7(Qv?@RcFurVg*L}&n4iQ{JPN=qQxCkjyk zqo8HO|0J2J7~IK8cd4lUpFNw}MY~0q1o7?!!B>BiWE`YOkeP$aO3_*0s`MPfmvA}N z`*Jo`!Q&gf6S^w0#v3}epRY+y-lS)R4M8p)CnYP0AJUJy;;ccB_1&10>J0IX>)ycyQ>l0*>@j7!gj|Z}qY~SmG2IuoT zdEx96(6$$0fT-P&;CG1|Qp-YLfp%lnjs^wz<6<{0tMRM&Z?i?Jr8=|}OxJENU%-?E zOlLL>!31zvkfB__<1gb*U;?J$=bVhyfYY(&Be9=YG_7mWpS{U?W1Fo!Jd`|Cm+WIE z>yjxTNWvCV)Cyiw`XYyFKsI=GH4RmJ>G?Y~JV=<+NG-=CJ%jh5y)IKV(K0wj(sgIz z&=QJP?#w(?78U`Wg5JV~OZC&}UifLmmz@MHGnnko-W+ZqWlVXQ-P!JPhioxJEr#=u znSel*rq+gGNEeOtn5I_Q`wBL zaEW*kh3RX&#sq+3ycuyT2TGAHJ!fa`oagKn0#;$7X-e{W`6SmOedbQnGu90cdl)B&?vLtGa)2USs?&`!^a~|O{z2Zb;Dve0=w#i+ z(|(JN)+J|LLPv9nDE$Q4diI$wktZ8=us|gq#VLW)#VfWrY^a&RWIgC5q2a1B0%IY4 zbB6C9&^5N*!_%&Z`s{U*t~zP^vnDYeX*oT<7sj)@|6Bnl|gP=6u@IR zEdf*=GVo6{fPb8l5nm54ABT_*3hv>kIm%^q$UQk(*2u0z-t?_e0<}`YcCbtk6%f@mOhXCInYv`3OYjTj67?6aTR0bwxX1VdGr91T)yN&?Q|c8&2_S6xTX~!k(DrXg zak&nyH_<@?BP1b+zSBm*0hSMK5Hf5>E+8e6*Z64i8XrkZUWcc&7J6;_P!i@(+5lsN z<5YOp4q9zOP>-ex_NNLSNfkVtD%h7QcrYxu6$l8~hGS#KwjbV2U=Vb6Cc78*dI2{I z9|(6g)cr=`KO~h10eb4a&EbP${RYEUr4UL8v`;gg8l7K z#|m@|)9GI^AS8Xa=C7)ha z9r)N`9R;OXO+BXsDkNBsc_lq+145$B4ym|(=l*YAYzBnO z5Tlg}+m@2spH$EJTz|QhyGG9wwXo7BGmVuMXd#hB>OKxSHgz2qK%HAvcF}WajxcO0~u-tT6uYd!UpDO!(@ikf8#}vjJz>3R94DrB7x!_Z!qo!T**BEYl;7tr#IVyGDVf z7WgyKF}jM?|0JrlJ|7-bYX~T^Lj-L56dWY|^E8lEcaH0qDbg{1cYh0B5`I;~bGpab z_N?yNMGq_6`gJ5!pioHoQB7D7GW~Y+l#zAY}Lofm4^nwi^Ua zE(vrI$eb3B?hg1{q9n;?_?tPCU~>V^W5_S0m`d&Zdfwpha6(6i0A6Mw9H4OhgV2EY}ixJ*!RP`Safh6H7O1l zw35|TZq}3$lw0MUO)Ei*wH|tpaP-#h`|lfU+Fjhvi<=%JMxS4$=fvjIc$wAka}6dP zKT70@4^p`tv^yxH7J&+L3$k^|7PeX&#<|2z#l9i0@`IZJX)~4kspvgy{(hm1bIXL= z7+ZBD1w9bJ*47$ujGE{56VCM|1-CcJU;;&Cd2UlP$)O)b1h^$a$%ifUey?K#07xwq zj2z7JO{TX2m5UP}c3BYRz-J1>5OgveG%96Dx0Mca8! zQWP87%4fNh(;JTk$#b5OsP*u5OctG*jlda!%ny1@*a^`nIVmDfrVW=cTFISb5CB}M zVP^KF_Zba8kLZ*`K$;CVTI#?>T+Y#lYau>r!e(azBkRlIldMP#)Ip9g%z`WdgSiA? z&Hxh7SRHQ-?;^hT7noppM2{c1cwG zVUz14sdG_1%uTYkY*76e29*v+lR(b~l?1Qwal*hyYU&qhd0f9B^(epiKTQSbskAnx zNl5R%`_c31(dqnXW#+w}j0qwEd=82U7t;zmS~*}>L_+fj2SYc;2o}Ega?_m$)MiXK zygtNt$CZ_;8GyrKfOra3C;4@7Z}Ltcd|ShZDWX!ETK9(Z3n4rHtp`TCp;+0$PECD& zSg_gRyYY#sy@MFQ8qWIKV~KsBbY=t|^+tBV zZ4M_w40b4Og=WUVFpa}HD?-SJlof%>fW~kO+*3Xr!24c1)kgtb-T}AkPOAA-qu}H0 zk0i%9^W9c!dkg7Dd##UPZEVZ?-<~S%K*p6-G7c*jSkmi}EUO|_(D19IBTYv&o^6eN zV00ig?R*F+89<#5A*H*Gdq}W53?q@rJy|UrJ>05pFb55V$)FY{%7AWRQlPe~r+GPT zl<_p~829zGjcMGG=Dk#W^Zv=y@FOLtB-?F()3K-wvJ{;soU03Fv5z~ zk+RmvTo51FDu!WcYEDENd@8v_P+>Xe^9YJ+L(UjK2%9;2{xWnNO`JNeBs{XC9a(_J zdVtjDM`RCYc| z;M)|noB(>FD@oZ$z2U7Ut4zZIw9s3rg0YG#J*zd>Hk_OsUI8T}x3FHw%M<(B*tRq8 zXcwLPzqM6uiz9Ir0c^oGX!m}bO&tuPyuP)iDt@rTb=<@RbnRwr=$9qiP&MFd?^T_@bX9iR-B_{ ze~%g5>#Qy1c*4!5v!9_pg0x)?SH!FzRU_*mFTXaC&V=sUq!!__U`WT7E z{U~Q&q7cX3X`K6?n@KIRfPc_IUs4|g_ z{5o=@K~N9}v#=I7GXL~JCKwTw(H*vq2?%MNoYo>G)1E$6Jz=Mr99o(@Q!eVTr0^*O z%e>C#jkm>Prln6LnAP&`g7O&lRFlW8dmw6SO5@|Ygl4HjKDH|Cs=yTGLSO<^|}?mUCXPtw?kg-Vy3c{@kksm zl2=o;yh6kbg%!A|g;g;stW-x5R{q$+DiNQyMQ3tK0+3PR6Up#ojZ*ZtQ)AsZgy%Nh zZyVmv>%IYRRD#H(hQIMqo8k!{wcBG6N#k*=NjlycOVYC;DoxTkfKFPWL8Q`JnWV?P zKKi!Muj5SrLiU8k8u;ddS1 zhaKxiu?c(cDnw4Z92~k0iy2dogEH>g^F~_GMRglFqwq^d_Zkg#hYiWt8Q)N}L;vb_ z+8FEGFvT$sZzDImT-UhB(dQCQ<~kHNotC(`6Ny?lZ1@Z&p9T` zc2KZGIvw5Q<`3dZ_`7jH`aO>P?vquTo&F`P!5=$G8|Rg8)?0mO5IiTM<$asg9btws z%ciXg&6`7mQwtj)A<;8s*$$lRT(MD{YqV^Zrg=lP7(x2YM!G7$bpREqldcmIczx@J zNEc41s}F&~Te+Pbk*PM|$|Z*(_I})bycru)-b|odRByrG1+Yc+H@wag1Pg8m`OX?4 z&rw~BzJ~m*HRMIhI>?Ks36et95c0PU*txfpL9tA+66ASn6!N@(HprhewbO+yOM*EGTECb!i zz|np#2^2&uc$8ooBANmIj2%W6H)ZvEpE}&CfMf4x<=Y`t4z}y*^<||`go`dKFmNx9 zj=<*~Q|qX}NF(qZXrY}4fK}1Ps<2Q%HrF!UWTjG*l}5A&eT7g*^6;KN2-<>bis~5+ zssy#xBO(HgXjQeoezB&ov<8-6gv_N~v>Iay+bPoFR?9Hq##KY2Q!#}lThd77P*DKn z=>1=+_ai+=6m?=53sWTdb3%Z?JH**bY;crdLljFOh?jI?<#Jz);zC~tWD?d=(0pZc z;wxpw03_7S7~mj<8Uqu;+(*yM;o0uE>cQ z^F+i9DjGGN3aCn?)h^pD8Vd%MU`Dsb4W!Ku^hcfUu37TlCP#mLAH+WyudWwUGv62; z9}z8MbWxM3ztkkD^yZyP*oayrm$YWeequry*( zofeS03CN~O0BtKA>XfP2Myt0%gtHMrh%g(0VYvFn0fLY=wPiqP%&XT0%&(M&L z4-&__``RKTL!{j0L4-05TLj}I1W0VHkld$7soR$O(QW#+Ot&q9nRAf!U82q47MPar zmdCkbr!m8rMo^W4B#gMT$=zkt(Mrk%h>pqxL3ELFiJ8EM#tS}ck=g=d#H7c!V| z?|R|DezxQ9lKIp7&t2KlVI)-_d^cr1mDP4t^(%UBin8^Y_MC%-^atao>7JXGo`YKf zGj*~8=C?TyPu{Z&KOHy7P~z>RqR@i5OBZxTu8^t~X4uB=ax-l3%ydfMLlc_Pds>S! zTy|C)l(CExY?ZTe(mv2Y^0tNQduC+A{@ZJ}F3Xp)Kp_nIXB01}NuW%| zaOlbyv0FjzIM^0*iIUB8rAgf0TxF7uPyD5AC}}oKKUD<1!_Pz0FG|DolNCpc%t(5t zEb4k2Sx}ZqhKC>bkUYBGdy+@Ddk?3@%yseTx_>c^k?R=KZP=KcP~#h`M_0E+FKGvI z>r(Te8^Or*L9c1L8<+`< zDOL>f08^^kSXd`r^P_o|hTN9Wur<)|rb}qB-uuELG+an-$ZcKX zh9&05V45=W%^?|nJ=;YTkn zM2H^_jPOH^1$L|$4M&T+szX0~{)lKcB`oCnsrzM+OYgk6@Bl!VF_<>_O}_rj7&^Ev z*-c7N*2RE5&j~8xNX?}jFLiU0Qf{jIJumq@^&+%h|KkW_Tv$bs+j_Yb#YKpQ_rHW_ z$ZfscXju0J^56MoJO`V-PFZ@Tau{~8nswXd77xB*+`Ix;mew7>Kl(cWSP^6Pmf^Zu z9{_*-mAX3fXeUPvDZ+D|A`lMz3P9eHfSdun4iN~SOA!c!d&u>C<94>wbCseFUf+5H z*IMP!=`=s_IDMGJZhEiZ-KC|7wof+AfdVNoi-^Q<-twMeY6;Q0jamt_nvK{3Z9Gb` z1&vrPzsM%shVR$0Tn}(Um7YH_4ZKIt_Yo{*gF2a zA!iNn{x9wFx<0alXbrga_qMl4WTS6x&=x_*1$Z+TpVeD1wB_Z70kP?$L4b-)cX+Ko zrzux0t*gaf)V@MU92C%q5~eLh36BkQM+3ICcDpM0jt#oQ20#}pHd}!pgblB|{(Q%U znI}AVN%|z|^N~-&8Fl>oy3G^*uyE- z(IpB_0Dh+c{MvN~@K-JYI05*u0KERL<}Y6Ya02jGFU(Z=>z8D30`Tu^CU?cUi-=cj zSi_^_hq%8~F0DGRQtYw6G2HOsh~G8nR9&UeEUW8MQY5VYa4Y9sb17T1{nJuz5ubi(eVM23Ph_g{VmYhi`pP+|$Wx$=Qu3GYemm)T59>@l z2H)AlPf0N@e4PW%PaF!aj)ZqUJ~*f>;$FDWCq=RBCt3ziM<<8aQz~4X{B_nqO?i`otj(_UKTnD){; zyKC90jk4z~nnfMXrTF#G**<|~~XQ|VCta?%Gak5XVQr0Q0(|Z^0Q|0*a{nHi3 zr{To-yzb9-=rxSbv2Gq;j8xq|r|~I2UfW46mGcH@bB~KQ%nAkV&oO+qPe;m7WkAIk zN#I!Pw`$7f$|C4F51ehwI!~)Ii59)L6+` JKj9rDix{b4_NMjkPy~@dz$&-EM;t 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
      K2I;DoM$(X9I$+4oZ72qM!Yv#5a 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

      t+FWCNG$U~#zW#`t zY1Hlt+iWUhr-6~g9E4)}DE5ti;mg4-sppqamwTsUc`l_%d)cxTb}%dROAvz23PtXVVp zB4uB-xMO0cXzyO$7qS7H1Go{04+4ecOFokUG_FQ_^AX>n+IB@Wu zWjH6nNvgGZ1@CZtjCy2f*lfUaBSI5`&A+QdD?%#}+1J|FR)?xrfK0Ny#v{#mzCs_o zg1rW);hbJ_P}*_h=!e`y-Jv@Cj6hvOU1MESU2|PaU29!iU3-09eSLjHePex7eRF+F zeQSMNeS1S)Lw!R-Lt{fzLvuq*Lu*4@LwjRgV|`;oV`F1eV{>CmV{2nuV|!CwQ+-oI zQ)5$8Q*%>GQ)^ROQ+sn=bA59|b7ON;b8~Y`b8B;3b9+l&OMOd2OJhq@OLI$0OKVG8 zOM7cwYkg}&Yh!CuYjbN$Yiny;YkON=TYXzYTVq>OTXS1WTWeceTYEc(*pBYo(R4ei zwd2*~tvsL5Y_GNJ+YLj{``@uX#D(rPYr(r#gf;{R@VOBAPs1om+Q4!e*H^ppXCsre zLYH5NG_@!4HmI~cNDzcqh5%NXL&Lp1C4gTkt=eB7lW_S1#8tUA_=N`9Ld79zv(@>s zzRVLn35Q$(`KTlk*jMRevk@_Iqxt{&&**sQ*I?cnt>gZAivGO(Gdf;o)i2Mb4~Y1} zykloG1GpAXgrBnoNt`EF1-|9uQkvJOQ&!M+BO(vYr0{d_vesRwLtgRYh>0hR%WG2j5@mS~$PZIzG^wnz-_?%tld@E#0J)&tOQ?4)Vsh`~J#?Du+Ja!1 z9-q(ew*vlPpk!8PQR)1$1?3ep%4T{iJZGG7X2~3Lu6Ld}-?JdF&|G9Konw10@T@GY zG3z|_R)hJl^+D@H-VX==X#L6eXX`JXS4%#6X#A~jf1qyfo8J1i+ZO%HjG0@u{^^yP z+6(tx(fi}0Z@=aCcYN@%&wc(YPk-$ne(>^7Up2h5&RAaG)EZv3X7j~Y9K8jZpZwhC zpZHAuYKd$@>$FAYV+R9_g#rE1ik(C52DIf zzV^eHe|oHZ)&^L7CXRmm@h?8{!ncq8=M6W$^}&a}_{3Mf`t0|a*Ye;d|HJ zc~{-7OaJ+s-*|QVj>|3&1ZP$(tNrD#63Nyz7j|yA?e^}$>@#0`?)mS0_h)~3)v$Z3 zuK%I;`t`wuUjM8kADJ=nVc*h{BMUwAgQmCE+vE*+%z!^IE3|Xw8G+pak9Se1#1r%c zJQhx3nb+qj^_w%!@@)?+4D1b9{<&p4yuPe?!+^`>mT(j z@L&ID&!vGmCG$#Vm(4EQ?+^JG_%97y;M*8l;Vtu;p8C=i-Ua?r&%{TNRa?K!Gx1<> zwP&Vhb)YSHf$#cPXUz-N&RXfIoLM<@;%(mR@0?$H*3EbLYJIB$){J>26JM;#ludkV zL78vjRo}!9%YJ>Yr?uqBzS$F>2~PZ@FEnqJC**GnZVZhm;rhUF2xo`JQe9^PeGqW5bpoz&@zCgeV z21~4vuhg31tuSXLw4XTIe7k@Yk0&#hnD$Gm^A{^9izR>*A8GrSbTi%xgM#AFu9WiI$r#`)KQ6Ly9ojtdu zJ^XYe`3tJfU3=lre(|eUzw)%#KKtDBsvFzFn=anE zvwQa*!d_q0890zWbnSJ2{oscldGyKWKK4i=`Nel$S#`C~<6Y?)@R+qV6W1^H)X!Yx zJ*Q-e?*iX??~L;&KIA{gdycm{*i^c`>qu+KoKSGystxU)Xt1Pij<3?Q&}Xh|^KS9g zdP9Mdz&d-Gx2&Ya6ZS0#c*_DiH@7yHHwJ2gp(E$*+Hyhg{5cEGTQqxa$#!(GzI=Wl z zWt&Pu8#gT66zneF90*PPeq(5{=c3K6o*BWAzdaB-(lS4=%Cl&XIkTbshPwx{r4vv6 z_10+l(YlH`w|?mQi|+sI_3eT4z5D#?(=;h89Z+l?YI)cQVe+VA^*7+q5 z{Om~MOmne+hBtWRZEx`&@RfT?0u}G*yQn0ydgAw?ba3>njaTs~>@Ar;@mEJK^4!=t z^Q@ygm-_t^FI?bTTWOB2^epgNN7gN!7514&o;&~gf1UWRD}#H*km1--;Z}^UPmZ#h^=I!<4e9bKLwqbJB!K&>? zdde1KEG@wqC|VMj_{VcYNBz^{aD~fzc?ke$Jb$53UOJpqFK@UtUYw9Lvk9o3eAT|} z)wy^5NS}?MKh@yox!OTj-03jVLN?0@X+ndI-x0%))(Po^A0;ZRvkG+{ME}+3VLX@&KHzLiV<)K_Et z#cp}ut9>nhHhQM&V+&5)7Dy zf99sry0a=w2iVlIOz+v|l7*L-hD%D!d0w*w$j5hqXLa!Wd8XZp3f>^FW*}rOHp8s$ z4WdZMT3}jMJFt}30+u$HSRS*KX&(xhv#mM6VJMBZgJ!@JvX+>uP`3;PLl|w?O7SoHYc8pK=ve?{YdT|@nG=t_PrWGg)_M28oX<)Op5bc>}>kJb;`by1n zO3VST>Bpd~`IgsH;Vs9b-<)Y;?LCXFCHS|_G6O-=DlIWVJIt(AWghf+trFAk`92l_ zqYbb{E9ehdX5G?yZynM;v$~|rvN1{1(}qk`^n`D? zyMuhQpX-5K$AeAv86~FmJM26l!n_Urc}+W1?H4=cw>&jia4>2py=xAJf>y5bqXVot zpp9Lb26nf}=i`&%GOYq*PvF1WJz@6V<&Hq)$ diff --git a/app/upgrades/nextupgrade/upgrades.go b/app/upgrades/nextupgrade/upgrades.go index 79b3b7aaf..dd8da735e 100644 --- a/app/upgrades/nextupgrade/upgrades.go +++ b/app/upgrades/nextupgrade/upgrades.go @@ -7,13 +7,15 @@ import ( "github.com/cosmos/cosmos-sdk/baseapp" consensuskeeper "github.com/cosmos/cosmos-sdk/x/consensus/keeper" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" + + authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" + "github.com/neutron-org/neutron/app/params" "cosmossdk.io/math" "github.com/cosmos/cosmos-sdk/codec" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/types/bech32" "github.com/cosmos/cosmos-sdk/types/module" capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" paramskeeper "github.com/cosmos/cosmos-sdk/x/params/keeper" @@ -28,7 +30,6 @@ import ( contractmanagerkeeper "github.com/neutron-org/neutron/x/contractmanager/keeper" contractmanagertypes "github.com/neutron-org/neutron/x/contractmanager/types" crontypes "github.com/neutron-org/neutron/x/cron/types" - feeburnerkeeper "github.com/neutron-org/neutron/x/feeburner/keeper" feeburnertypes "github.com/neutron-org/neutron/x/feeburner/types" feerefundertypes "github.com/neutron-org/neutron/x/feerefunder/types" icqtypes "github.com/neutron-org/neutron/x/interchainqueries/types" @@ -87,7 +88,7 @@ func CreateUpgradeHandler( } ctx.Logger().Info("Setting pob params...") - err = setAuctionParams(ctx, keepers.FeeBurnerKeeper, keepers.AuctionKeeper) + err = setAuctionParams(ctx, keepers.AccountKeeper, keepers.AuctionKeeper) if err != nil { return nil, err } @@ -127,20 +128,21 @@ func CreateUpgradeHandler( } } -func setAuctionParams(ctx sdk.Context, feeBurnerKeeper *feeburnerkeeper.Keeper, auctionKeeper auctionkeeper.Keeper) error { - treasury := feeBurnerKeeper.GetParams(ctx).TreasuryAddress - _, data, err := bech32.DecodeAndConvert(treasury) - if err != nil { - return err - } +func setAuctionParams(ctx sdk.Context, accountKeeper authkeeper.AccountKeeper, auctionKeeper auctionkeeper.Keeper) error { + consumerRedistributeAddr := accountKeeper.GetModuleAddress(ccvconsumertypes.ConsumerRedistributeName) auctionParams := auctiontypes.Params{ - MaxBundleSize: 2, - EscrowAccountAddress: data, - ReserveFee: sdk.Coin{Denom: "untrn", Amount: sdk.NewInt(1_000_000)}, - MinBidIncrement: sdk.Coin{Denom: "untrn", Amount: sdk.NewInt(1_000_000)}, - FrontRunningProtection: true, - ProposerFee: math.LegacyNewDecWithPrec(25, 2), + MaxBundleSize: 4, + // 75% of rewards goes to consumer redistribution module and then to the FeeBurner module + // where all the NTRNs are burned + EscrowAccountAddress: consumerRedistributeAddr, + ReserveFee: sdk.Coin{Denom: params.DefaultDenom, Amount: sdk.NewInt(500_000)}, + MinBidIncrement: sdk.Coin{Denom: params.DefaultDenom, Amount: sdk.NewInt(100_000)}, + FrontRunningProtection: false, + // in the app.go on L603 set FixedAddressRewardsAddressProvider (where 25% goes to) + // to ConsumerToSendToProviderName module from where rewards goes to the Hub + // Meaning we sent 25% of the MEV rewards to the Hub + ProposerFee: math.LegacyNewDecWithPrec(25, 2), } return auctionKeeper.SetParams(ctx, auctionParams) } @@ -219,6 +221,8 @@ func migrateInterchainQueriesParams(ctx sdk.Context, paramsKeepers paramskeeper. subspace, _ := paramsKeepers.GetSubspace(icqtypes.StoreKey) subspace.GetParamSet(ctx, &currParams) + currParams.QueryDeposit = sdk.NewCoins(sdk.NewCoin(params.DefaultDenom, sdk.NewInt(1_000_000))) + if err := currParams.Validate(); err != nil { return err } diff --git a/app/upgrades/nextupgrade/upgrades_test.go b/app/upgrades/nextupgrade/upgrades_test.go index bd4180a9c..cded4dca8 100644 --- a/app/upgrades/nextupgrade/upgrades_test.go +++ b/app/upgrades/nextupgrade/upgrades_test.go @@ -171,7 +171,7 @@ func (suite *UpgradeTestSuite) TestRegisterInterchainAccountCreationFee() { ctx = suite.ChainA.GetContext() ) - suite.FundAcc(sdk.AccAddress("neutron1weweewe"), sdk.NewCoins(sdk.NewCoin("untrn", sdk.NewInt(10000)))) + suite.FundAcc(sdk.AccAddress("neutron1weweewe"), sdk.NewCoins(sdk.NewCoin("untrn", sdk.NewInt(1_000_000)))) contractKeeper := keeper.NewDefaultPermissionKeeper(app.WasmKeeper) // store contract for register ica w/o fees codeIDBefore := suite.StoreTestCode(ctx, sdk.AccAddress("neutron1_ica"), "testdata/neutron_interchain_txs.wasm") @@ -200,7 +200,7 @@ func (suite *UpgradeTestSuite) TestRegisterInterchainAccountCreationFee() { // register with fees jsonStringAfterUpgrade := `{"register": {"connection_id":"connection-1","interchain_account_id":"test-3"}}` byteEncodedMsgAfterUpgrade := []byte(jsonStringAfterUpgrade) - _, err = contractKeeper.Execute(ctx, contractAddressAfterUpgrade, sdk.AccAddress("neutron1weweewe"), byteEncodedMsgAfterUpgrade, sdk.NewCoins(sdk.NewCoin("untrn", sdk.NewInt(1000)))) + _, err = contractKeeper.Execute(ctx, contractAddressAfterUpgrade, sdk.AccAddress("neutron1weweewe"), byteEncodedMsgAfterUpgrade, sdk.NewCoins(sdk.NewCoin("untrn", sdk.NewInt(1_000_000)))) suite.Require().NoError(err) // failed register due lack of fees (fees required) diff --git a/app/upgrades/types.go b/app/upgrades/types.go index 6271ecbae..13747e54b 100644 --- a/app/upgrades/types.go +++ b/app/upgrades/types.go @@ -5,6 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" store "github.com/cosmos/cosmos-sdk/store/types" "github.com/cosmos/cosmos-sdk/types/module" + authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" capabilitykeeper "github.com/cosmos/cosmos-sdk/x/capability/keeper" consensuskeeper "github.com/cosmos/cosmos-sdk/x/consensus/keeper" paramskeeper "github.com/cosmos/cosmos-sdk/x/params/keeper" @@ -38,6 +39,7 @@ type Upgrade struct { type UpgradeKeepers struct { // keepers + AccountKeeper authkeeper.AccountKeeper IcqKeeper icqkeeper.Keeper CronKeeper cronkeeper.Keeper TokenFactoryKeeper *tokenfactorykeeper.Keeper diff --git a/network/init-neutrond.sh b/network/init-neutrond.sh index 390284816..603397211 100755 --- a/network/init-neutrond.sh +++ b/network/init-neutrond.sh @@ -627,22 +627,27 @@ function convert_bech32_base64_esc() { DAO_CONTRACT_ADDRESS_B64=$(convert_bech32_base64_esc "$DAO_CONTRACT_ADDRESS") echo $DAO_CONTRACT_ADDRESS_B64 -set_genesis_param admins "[\"$DAO_CONTRACT_ADDRESS\"]" # admin module -set_genesis_param treasury_address "\"$DAO_CONTRACT_ADDRESS\"" # feeburner -set_genesis_param fee_collector_address "\"$DAO_CONTRACT_ADDRESS\"" # tokenfactory -set_genesis_param security_address "\"$SECURITY_SUBDAO_CORE_CONTRACT_ADDRESS\"," # cron -set_genesis_param limit 5 # cron -#set_genesis_param allow_messages "[\"*\"]" # interchainaccounts -set_genesis_param signed_blocks_window "\"$SLASHING_SIGNED_BLOCKS_WINDOW\"," # slashing -set_genesis_param min_signed_per_window "\"$SLASHING_MIN_SIGNED\"," # slashing -set_genesis_param slash_fraction_double_sign "\"$SLASHING_FRACTION_DOUBLE_SIGN\"," # slashing -set_genesis_param slash_fraction_downtime "\"$SLASHING_FRACTION_DOWNTIME\"" # slashing -set_genesis_param minimum_gas_prices "$MIN_GAS_PRICES," # globalfee -set_genesis_param max_total_bypass_min_fee_msg_gas_usage "\"$MAX_TOTAL_BYPASS_MIN_FEE_MSG_GAS_USAGE\"" # globalfee -set_genesis_param_jq ".app_state.globalfee.params.bypass_min_fee_msg_types" "$BYPASS_MIN_FEE_MSG_TYPES" # globalfee -set_genesis_param proposer_fee "\"0.25\"" # builder(POB) -set_genesis_param escrow_account_address "\"$DAO_CONTRACT_ADDRESS_B64\"," # builder(POB) -set_genesis_param sudo_call_gas_limit "\"1000000\"" # contractmanager +CONSUMER_REDISTRIBUTE_ACCOUNT_ADDRESS="neutron1x69dz0c0emw8m2c6kp5v6c08kgjxmu30f4a8w5" +CONSUMER_REDISTRIBUTE_ACCOUNT_ADDRESS_B64=$(convert_bech32_base64_esc "$CONSUMER_REDISTRIBUTE_ACCOUNT_ADDRESS") + +set_genesis_param admins "[\"$DAO_CONTRACT_ADDRESS\"]" # admin module +set_genesis_param treasury_address "\"$DAO_CONTRACT_ADDRESS\"" # feeburner +set_genesis_param fee_collector_address "\"$DAO_CONTRACT_ADDRESS\"" # tokenfactory +set_genesis_param security_address "\"$SECURITY_SUBDAO_CORE_CONTRACT_ADDRESS\"," # cron +set_genesis_param limit 5 # cron +#set_genesis_param allow_messages "[\"*\"]" # interchainaccounts +set_genesis_param signed_blocks_window "\"$SLASHING_SIGNED_BLOCKS_WINDOW\"," # slashing +set_genesis_param min_signed_per_window "\"$SLASHING_MIN_SIGNED\"," # slashing +set_genesis_param slash_fraction_double_sign "\"$SLASHING_FRACTION_DOUBLE_SIGN\"," # slashing +set_genesis_param slash_fraction_downtime "\"$SLASHING_FRACTION_DOWNTIME\"" # slashing +set_genesis_param minimum_gas_prices "$MIN_GAS_PRICES," # globalfee +set_genesis_param max_total_bypass_min_fee_msg_gas_usage "\"$MAX_TOTAL_BYPASS_MIN_FEE_MSG_GAS_USAGE\"" # globalfee +set_genesis_param_jq ".app_state.globalfee.params.bypass_min_fee_msg_types" "$BYPASS_MIN_FEE_MSG_TYPES" # globalfee +set_genesis_param proposer_fee "\"0.25\"" # builder(POB) +set_genesis_param escrow_account_address "\"$CONSUMER_REDISTRIBUTE_ACCOUNT_ADDRESS_B64\"," # builder(POB) +set_genesis_param sudo_call_gas_limit "\"1000000\"" # contractmanager + +cat $GENESIS_PATH if ! jq -e . "$GENESIS_PATH" >/dev/null 2>&1; then echo "genesis appears to become incorrect json" >&2 diff --git a/wasmbinding/test/custom_message_test.go b/wasmbinding/test/custom_message_test.go index a79dd73db..ec4662a27 100644 --- a/wasmbinding/test/custom_message_test.go +++ b/wasmbinding/test/custom_message_test.go @@ -90,14 +90,14 @@ func (suite *CustomMessengerTestSuite) TestRegisterInterchainAccount() { RegisterInterchainAccount: &bindings.RegisterInterchainAccount{ ConnectionId: suite.Path.EndpointA.ConnectionID, InterchainAccountId: testutil.TestInterchainID, - RegisterFee: sdk.NewCoins(sdk.NewCoin(params.DefaultDenom, sdk.NewInt(1000))), + RegisterFee: sdk.NewCoins(sdk.NewCoin(params.DefaultDenom, sdk.NewInt(1_000_000))), }, }) suite.NoError(err) bankKeeper := suite.neutron.BankKeeper senderAddress := suite.ChainA.SenderAccounts[0].SenderAccount.GetAddress() - err = bankKeeper.SendCoins(suite.ctx, senderAddress, suite.contractAddress, sdk.NewCoins(sdk.NewCoin(params.DefaultDenom, sdk.NewInt(1000)))) + err = bankKeeper.SendCoins(suite.ctx, senderAddress, suite.contractAddress, sdk.NewCoins(sdk.NewCoin(params.DefaultDenom, sdk.NewInt(1_000_000)))) suite.NoError(err) // Dispatch RegisterInterchainAccount message diff --git a/x/interchaintxs/keeper/msg_server_test.go b/x/interchaintxs/keeper/msg_server_test.go index c4c173deb..a54ca6c2a 100644 --- a/x/interchaintxs/keeper/msg_server_test.go +++ b/x/interchaintxs/keeper/msg_server_test.go @@ -8,6 +8,7 @@ import ( "github.com/neutron-org/neutron/app/params" icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" + feerefundertypes "github.com/neutron-org/neutron/x/feerefunder/types" "github.com/neutron-org/neutron/x/interchaintxs/keeper" @@ -58,7 +59,7 @@ func TestRegisterInterchainAccount(t *testing.T) { require.ErrorContains(t, err, "failed to charge fees to pay for RegisterInterchainAccount msg") require.Nil(t, resp) - msgRegAcc.RegisterFee = sdk.NewCoins(sdk.NewCoin(params.DefaultDenom, sdk.NewInt(1000))) + msgRegAcc.RegisterFee = sdk.NewCoins(sdk.NewCoin(params.DefaultDenom, sdk.NewInt(1_000_000))) wmKeeper.EXPECT().HasContractInfo(ctx, contractAddress).Return(true) bankKeeper.EXPECT().SendCoins(ctx, sdk.MustAccAddressFromBech32(msgRegAcc.FromAddress), sdk.MustAccAddressFromBech32(TestFeeCollectorAddr), msgRegAcc.RegisterFee) diff --git a/x/interchaintxs/types/params.go b/x/interchaintxs/types/params.go index 58ae59bbe..8a12684df 100644 --- a/x/interchaintxs/types/params.go +++ b/x/interchaintxs/types/params.go @@ -5,6 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" + "github.com/neutron-org/neutron/app/params" "gopkg.in/yaml.v2" @@ -15,7 +16,7 @@ var _ paramtypes.ParamSet = (*Params)(nil) var ( KeyMsgSubmitTxMaxMessages = []byte("MsgSubmitTxMaxMessages") DefaultMsgSubmitTxMaxMessages = uint64(16) - DefaultRegisterFee = sdk.NewCoins(sdk.NewCoin(params.DefaultDenom, sdk.NewInt(1000))) + DefaultRegisterFee = sdk.NewCoins(sdk.NewCoin(params.DefaultDenom, sdk.NewInt(1_000_000))) ) func ParamKeyTable() paramtypes.KeyTable { From e0f8d7db40712894b77299f48ce3839013f48b84 Mon Sep 17 00:00:00 2001 From: Julian Compagni Portis Date: Thu, 9 Nov 2023 20:34:01 -0500 Subject: [PATCH 240/307] switch rounding to favor taker update tests accordingly --- tests/ibc/gmp_swap_forward_test.go | 4 +- tests/ibc/swap_forward_test.go | 18 ++- tests/ibc/swap_test.go | 2 +- .../integration_deposit_doublesided_test.go | 14 +-- .../integration_deposit_singlesided_test.go | 4 +- x/dex/keeper/integration_multihopswap_test.go | 44 +++---- .../integration_placelimitorder_test.go | 10 +- x/dex/keeper/liquidity.go | 7 +- x/dex/keeper/liquidity_test.go | 112 +++++++++--------- x/dex/types/limit_order_tranche.go | 2 +- x/dex/types/pool.go | 1 - 11 files changed, 110 insertions(+), 108 deletions(-) diff --git a/tests/ibc/gmp_swap_forward_test.go b/tests/ibc/gmp_swap_forward_test.go index 06dfa33a3..433093ea4 100644 --- a/tests/ibc/gmp_swap_forward_test.go +++ b/tests/ibc/gmp_swap_forward_test.go @@ -98,8 +98,8 @@ func (s *IBCTestSuite) TestGMPSwapAndForward_Success() { // Check that the funds are moved out of the acc on providerChain s.assertProviderBalance(s.providerAddr, nativeDenom, newProviderBalNative.Sub(ibcTransferAmount)) - // Check that the amountIn is deduced from the neutron account - s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, math.ZeroInt()) + // Check that the amountIn is deducted from the neutron account + s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, math.OneInt()) // Check that neutron account did not keep any of the transfer denom s.assertNeutronBalance(s.neutronAddr, nativeDenom, genesisWalletAmount.Sub(swapAmount)) diff --git a/tests/ibc/swap_forward_test.go b/tests/ibc/swap_forward_test.go index 12d07e448..5267f663f 100644 --- a/tests/ibc/swap_forward_test.go +++ b/tests/ibc/swap_forward_test.go @@ -109,7 +109,7 @@ func (s *IBCTestSuite) TestSwapAndForward_Success() { ) // Check that the amountIn is deducted from the neutron account - s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, math.ZeroInt()) + s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, math.OneInt()) // Check that neutron account did not keep any of the transfer denom s.assertNeutronBalance(s.neutronAddr, nativeDenom, genesisWalletAmount.Sub(swapAmount)) @@ -285,7 +285,7 @@ func (s *IBCTestSuite) TestSwapAndForward_UnwindIBCDenomSuccess() { s.providerToNeutronDenom, depositAmount, depositAmount, - 0, + 1, 1, s.neutronAddr) @@ -294,8 +294,8 @@ func (s *IBCTestSuite) TestSwapAndForward_UnwindIBCDenomSuccess() { postDepositNeutronBalNative := genesisWalletAmount.Sub(depositAmount) s.assertNeutronBalance(s.neutronAddr, nativeDenom, postDepositNeutronBalNative) - swapAmount := math.NewInt(100000) - expectedAmountOut := math.NewInt(99990) + swapAmount := math.NewInt(100_000) + expectedAmountOut := math.NewInt(99980) retries := uint8(0) @@ -340,7 +340,7 @@ func (s *IBCTestSuite) TestSwapAndForward_UnwindIBCDenomSuccess() { s.providerAddr, s.neutronAddr, nativeDenom, - ibcTransferAmount, + swapAmount, string(metadataBz), ) @@ -349,10 +349,8 @@ func (s *IBCTestSuite) TestSwapAndForward_UnwindIBCDenomSuccess() { s.Assert().NoError(err) s.coordinator.CommitBlock(s.neutronChain) - // Check that the amountIn is deduced from the neutron account - s.assertNeutronBalance(s.neutronAddr, nativeDenom, postDepositNeutronBalNative.Sub(swapAmount)) - // Check that the amountIn has been deducted from the neutron chain - s.assertNeutronBalance(s.neutronAddr, nativeDenom, postDepositNeutronBalNative.Sub(swapAmount)) + // Check that the amountIn is deducted from the neutron account + s.assertNeutronBalance(s.neutronAddr, nativeDenom, postDepositNeutronBalNative.Sub(swapAmount).Add(math.OneInt())) // Check that the funds are now present on the provider chainer s.assertProviderBalance( s.providerAddr, @@ -462,7 +460,7 @@ func (s *IBCTestSuite) TestSwapAndForward_ForwardFails() { ) // Check that the amountIn is deduced from the neutron account - s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, math.ZeroInt()) + s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, math.OneInt()) // Check that the amountOut stays on the neutronchain s.assertNeutronBalance( s.neutronAddr, diff --git a/tests/ibc/swap_test.go b/tests/ibc/swap_test.go index a7cf723af..dbb21ad65 100644 --- a/tests/ibc/swap_test.go +++ b/tests/ibc/swap_test.go @@ -83,7 +83,7 @@ func (s *IBCTestSuite) TestIBCSwapMiddleware_Success() { s.assertNeutronBalance(s.neutronAddr, nativeDenom, postDepositNeutronBalNative.Add(expectedOut)) // Check that all of the IBC transfer denom have been used up - s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, math.ZeroInt()) + s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, math.OneInt()) } // TestIBCSwapMiddleware_FailRefund asserts that the IBC swap middleware works as intended with Neutron running as a diff --git a/x/dex/keeper/integration_deposit_doublesided_test.go b/x/dex/keeper/integration_deposit_doublesided_test.go index 951ffb004..35c9e3020 100644 --- a/x/dex/keeper/integration_deposit_doublesided_test.go +++ b/x/dex/keeper/integration_deposit_doublesided_test.go @@ -232,19 +232,19 @@ func (s *DexTestSuite) TestDepositValueAccural() { s.bobLimitSells("TokenA", 10, 1000, types.LimitOrderType_IMMEDIATE_OR_CANCEL) } } - s.assertLiquidityAtTickInt(math.NewInt(110516593), math.ZeroInt(), 0, 10) - s.assertDexBalancesInt(math.NewInt(110516593), math.ZeroInt()) + s.assertLiquidityAtTickInt(math.NewInt(110516491), math.ZeroInt(), 0, 10) + s.assertDexBalancesInt(math.NewInt(110516491), math.ZeroInt()) - s.assertLiquidityAtTickInt(math.NewInt(110516593), math.ZeroInt(), 0, 10) + s.assertLiquidityAtTickInt(math.NewInt(110516491), math.ZeroInt(), 0, 10) // Carol deposits 100TokenA @tick0 s.carolDeposits(NewDeposit(100, 0, 0, 10)) - s.assertLiquidityAtTickInt(math.NewInt(210516593), math.ZeroInt(), 0, 10) - s.assertAccountSharesInt(s.carol, 0, 10, math.NewInt(90484150)) + s.assertLiquidityAtTickInt(math.NewInt(210516491), math.ZeroInt(), 0, 10) + s.assertAccountSharesInt(s.carol, 0, 10, math.NewInt(90484233)) // Alice gets back 100% of the accrued trade value s.aliceWithdraws(NewWithdrawal(100, 0, 10)) - s.assertAliceBalancesInt(math.NewInt(110516593), math.NewInt(0)) + s.assertAliceBalancesInt(math.NewInt(110516491), math.NewInt(0)) // AND carol get's back only what she put in - s.carolWithdraws(NewWithdrawalInt(math.NewInt(90484150), 0, 10)) + s.carolWithdraws(NewWithdrawalInt(math.NewInt(90484233), 0, 10)) s.assertCarolBalances(100, 1) } diff --git a/x/dex/keeper/integration_deposit_singlesided_test.go b/x/dex/keeper/integration_deposit_singlesided_test.go index 661747407..cdf8ca9f9 100644 --- a/x/dex/keeper/integration_deposit_singlesided_test.go +++ b/x/dex/keeper/integration_deposit_singlesided_test.go @@ -277,7 +277,7 @@ func (s *DexTestSuite) TestDepositSingleSidedCreatingArbToken0() { // Bob arbs s.bobLimitSells("TokenB", -1, 50, types.LimitOrderType_IMMEDIATE_OR_CANCEL) s.bobLimitSells("TokenA", 1, 10) - s.assertBobBalancesInt(sdkmath.NewInt(50_000_000), sdkmath.NewInt(53_294_995)) + s.assertBobBalancesInt(sdkmath.NewInt(50_000_000), sdkmath.NewInt(53_294_996)) } func (s *DexTestSuite) TestDepositSingleSidedCreatingArbToken1() { @@ -302,7 +302,7 @@ func (s *DexTestSuite) TestDepositSingleSidedCreatingArbToken1() { // Bob arbs s.bobLimitSells("TokenA", -1, 50, types.LimitOrderType_IMMEDIATE_OR_CANCEL) s.bobLimitSells("TokenB", -1, 10) - s.assertBobBalancesInt(sdkmath.NewInt(53_295_665), sdkmath.NewInt(50_000_000)) + s.assertBobBalancesInt(sdkmath.NewInt(53_295_666), sdkmath.NewInt(50_000_000)) } func (s *DexTestSuite) TestDepositSingleSidedMultiA() { diff --git a/x/dex/keeper/integration_multihopswap_test.go b/x/dex/keeper/integration_multihopswap_test.go index 776b13e7f..4ce918b03 100644 --- a/x/dex/keeper/integration_multihopswap_test.go +++ b/x/dex/keeper/integration_multihopswap_test.go @@ -50,9 +50,9 @@ func (s *DexTestSuite) TestMultiHopSwapSingleRoute() { // 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("TokenA", "TokenB", 0, 100, -1, 1), + NewPoolSetup("TokenB", "TokenC", 0, 100, -1, 1), + NewPoolSetup("TokenC", "TokenD", 0, 100, -1, 1), ) // WHEN alice multihopswaps A<>B => B<>C => C<>D, @@ -61,12 +61,12 @@ func (s *DexTestSuite) TestMultiHopSwapSingleRoute() { // THEN alice gets out 99 TokenD s.assertAccountBalanceWithDenom(s.alice, "TokenA", 0) - s.assertAccountBalanceWithDenomInt(s.alice, "TokenD", math.NewInt(99_970_003)) + s.assertAccountBalanceWithDenom(s.alice, "TokenD", 100) s.assertDexBalanceWithDenom("TokenA", 100) s.assertDexBalanceWithDenom("TokenB", 100) s.assertDexBalanceWithDenom("TokenC", 100) - s.assertDexBalanceWithDenomInt("TokenD", math.NewInt(29_997)) + s.assertDexBalanceWithDenom("TokenD", 0) } func (s *DexTestSuite) TestMultiHopSwapInsufficientLiquiditySingleRoute() { @@ -116,15 +116,15 @@ func (s *DexTestSuite) TestMultiHopSwapMultiRouteOneGood() { // GIVEN viable liquidity in pools A<>B, B<>E, E<>X s.SetupMultiplePools( - NewPoolSetup("TokenA", "TokenB", 0, 100, 0, 1), + NewPoolSetup("TokenA", "TokenB", 0, 100, -1, 1), NewPoolSetup("TokenB", "TokenC", 0, 100, 0, 1), NewPoolSetup("TokenC", "TokenX", 0, 50, 0, 1), NewPoolSetup("TokenC", "TokenX", 0, 50, 2200, 1), NewPoolSetup("TokenB", "TokenD", 0, 100, 0, 1), NewPoolSetup("TokenD", "TokenX", 0, 50, 0, 1), NewPoolSetup("TokenD", "TokenX", 0, 50, 2200, 1), - NewPoolSetup("TokenB", "TokenE", 0, 100, 0, 1), - NewPoolSetup("TokenE", "TokenX", 0, 100, 0, 1), + NewPoolSetup("TokenB", "TokenE", 0, 100, -1, 1), + NewPoolSetup("TokenE", "TokenX", 0, 100, -1, 1), ) // WHEN alice multihopswaps with three routes the first two routes fail and the third works @@ -137,26 +137,26 @@ func (s *DexTestSuite) TestMultiHopSwapMultiRouteOneGood() { // THEN swap succeeds through route A<>B, B<>E, E<>X s.assertAccountBalanceWithDenom(s.alice, "TokenA", 0) - s.assertAccountBalanceWithDenomInt(s.alice, "TokenX", math.NewInt(99_970_003)) - s.assertLiquidityAtTickWithDenomInt( + s.assertAccountBalanceWithDenomInt(s.alice, "TokenX", math.NewInt(100_000_000)) + s.assertLiquidityAtTickWithDenom( &types.PairID{Token0: "TokenA", Token1: "TokenB"}, - math.NewInt(99_999_999), - math.NewInt(10_000), + 100, 0, + -1, 1, ) - s.assertLiquidityAtTickWithDenomInt( + s.assertLiquidityAtTickWithDenom( &types.PairID{Token0: "TokenB", Token1: "TokenE"}, - math.NewInt(99_990_000), - math.NewInt(19_999), + 100, 0, + -1, 1, ) - s.assertLiquidityAtTickWithDenomInt( + s.assertLiquidityAtTickWithDenom( &types.PairID{Token0: "TokenE", Token1: "TokenX"}, - math.NewInt(99_980_001), - math.NewInt(29_997), + 100, 0, + -1, 1, ) @@ -276,14 +276,14 @@ func (s *DexTestSuite) TestMultiHopSwapMultiRouteFindBestRoute() { s.assertAccountBalanceWithDenomInt(s.alice, "TokenX", math.NewInt(134_943_366)) s.assertLiquidityAtTickWithDenomInt( &types.PairID{Token0: "TokenA", Token1: "TokenB"}, - math.NewInt(99_999_999), + math.NewInt(99_999_998), math.NewInt(10000), 0, 1, ) s.assertLiquidityAtTickWithDenomInt( &types.PairID{Token0: "TokenB", Token1: "TokenE"}, - math.NewInt(99_990_000), + math.NewInt(99_989_999), math.NewInt(19_999), 0, 1, @@ -291,7 +291,7 @@ func (s *DexTestSuite) TestMultiHopSwapMultiRouteFindBestRoute() { s.assertLiquidityAtTickWithDenomInt( &types.PairID{Token0: "TokenE", Token1: "TokenX"}, - math.NewInt(99_980_001), + math.NewInt(99_980_000), math.NewInt(865_056_634), -3000, 1, @@ -369,7 +369,7 @@ func (s *DexTestSuite) TestMultiHopSwapLongRouteWithCache() { s.assertAccountBalanceWithDenomInt(s.alice, "TokenX", math.NewInt(99_880_066)) s.assertLiquidityAtTickWithDenomInt( &types.PairID{Token0: "TokenM", Token1: "TokenX"}, - math.NewInt(99_890_055), + math.NewInt(99_890_054), math.NewInt(119_934), 0, 1, diff --git a/x/dex/keeper/integration_placelimitorder_test.go b/x/dex/keeper/integration_placelimitorder_test.go index 0fc08221f..34358ad0f 100644 --- a/x/dex/keeper/integration_placelimitorder_test.go +++ b/x/dex/keeper/integration_placelimitorder_test.go @@ -389,7 +389,7 @@ func (s *DexTestSuite) TestPlaceLimitOrderFoK0TotalAmountInNotUsed() { // WHEN alice submits FoK limitOrder for 9998 it succeeds // even though trueAmountIn < specifiedAmountIn due to rounding s.aliceLimitSells("TokenA", 21000, 9998, types.LimitOrderType_FILL_OR_KILL) - s.assertAliceBalancesInt(sdkmath.NewInt(5), sdkmath.NewInt(1_353_046_854)) + s.assertAliceBalancesInt(sdkmath.NewInt(7), sdkmath.NewInt(1_353_046_854)) } func (s *DexTestSuite) TestPlaceLimitOrderFoK1TotalAmountInNotUsed() { @@ -403,7 +403,7 @@ func (s *DexTestSuite) TestPlaceLimitOrderFoK1TotalAmountInNotUsed() { // WHEN alice submits FoK limitOrder for 9998 it succeeds // even though trueAmountIn < specifiedAmountIn due to rounding s.aliceLimitSells("TokenB", -21000, 9998, types.LimitOrderType_FILL_OR_KILL) - s.assertAliceBalancesInt(sdkmath.NewInt(135_3046_854), sdkmath.NewInt(5)) + s.assertAliceBalancesInt(sdkmath.NewInt(135_3046_854), sdkmath.NewInt(7)) } func (s *DexTestSuite) TestPlaceLimitOrderFoKMaxOutUsed() { @@ -417,7 +417,7 @@ func (s *DexTestSuite) TestPlaceLimitOrderFoKMaxOutUsed() { s.aliceLimitSellsWithMaxOut("TokenB", 0, 50, 20) // THEN alice swap ~19 BIGTokenB and gets back 20 BIGTokenA - s.assertAliceBalancesInt(sdkmath.NewInt(20_000_000), sdkmath.NewInt(31_162_769)) + s.assertAliceBalancesInt(sdkmath.NewInt(20_000_000), sdkmath.NewInt(31_162_770)) } func (s *DexTestSuite) TestPlaceLimitOrderFoKMaxOutUsedMultiTick() { @@ -433,7 +433,7 @@ func (s *DexTestSuite) TestPlaceLimitOrderFoKMaxOutUsedMultiTick() { s.aliceLimitSellsWithMaxOut("TokenB", 0, 50, 20) // THEN alice swap ~19 BIGTokenB and gets back 20 BIGTokenA - s.assertAliceBalancesInt(sdkmath.NewInt(20_000_000), sdkmath.NewInt(31_165_594)) + s.assertAliceBalancesInt(sdkmath.NewInt(20_000_000), sdkmath.NewInt(31_165_596)) } // Immediate Or Cancel LimitOrders //////////////////////////////////////////////////////////////////// @@ -542,7 +542,7 @@ func (s *DexTestSuite) TestPlaceLimitOrderJITBehindEnemyLines() { s.assertLimitLiquidityAtTick("TokenA", 1, 0) // Alice can withdraw ~10 BIGTokenB s.aliceWithdrawsLimitSell(trancheKey) - s.assertAliceBalancesInt(sdkmath.ZeroInt(), sdkmath.NewInt(9999000)) + s.assertAliceBalancesInt(sdkmath.ZeroInt(), sdkmath.NewInt(9998999)) } func (s *DexTestSuite) TestPlaceLimitOrderJITNextBlock() { diff --git a/x/dex/keeper/liquidity.go b/x/dex/keeper/liquidity.go index 1b86c504b..e86e77b89 100644 --- a/x/dex/keeper/liquidity.go +++ b/x/dex/keeper/liquidity.go @@ -49,7 +49,12 @@ func (k Keeper) Swap( // break if remainingTakerDenom will yield less than 1 tokenOut at current price // this avoids unnecessary iteration since outAmount will always be 0 going forward // this also catches the normal exit case where remainingTakerDenom == 0 - if liq.Price().MulInt(remainingTakerDenom).LT(math_utils.OnePrecDec()) { + + // NOTE: In theory this check should be: price * remainingTakerDenom < 1 + // but due to rounding and inaccuracy of fixed decimal math, it is possible + // for liq.swap to use the full the amount of taker liquidity and have a leftover + // amount amount of the taker Denom > than 1 token worth of maker denom + if liq.Price().MulInt(remainingTakerDenom).LT(math_utils.NewPrecDec(2)) { orderFilled = true break } diff --git a/x/dex/keeper/liquidity_test.go b/x/dex/keeper/liquidity_test.go index 94d42ef68..ec15601ed 100644 --- a/x/dex/keeper/liquidity_test.go +++ b/x/dex/keeper/liquidity_test.go @@ -53,8 +53,8 @@ func (s *DexTestSuite) TestSwap0To1PartialFillLP() { // THEN swap should return ~10 BIGTokenA in and 10 BIGTokenB out s.Assert().Equal("TokenA", tokenIn.Denom) s.Assert().Equal("TokenB", tokenOut.Denom) - s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(10_001_000), tokenOut, sdkmath.NewInt(10_000_000)) - s.assertTickBalancesInt(sdkmath.NewInt(10_001_000), sdkmath.ZeroInt()) + s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(10_000_999), tokenOut, sdkmath.NewInt(10_000_000)) + s.assertTickBalancesInt(sdkmath.NewInt(10_000_999), sdkmath.ZeroInt()) s.assertCurr0To1(math.MaxInt64) s.assertCurr1To0(-1) @@ -70,8 +70,8 @@ func (s *DexTestSuite) TestSwap1To0PartialFillLP() { // THEN swap should return ~10 BIGTokenB in and 10 BIGTokenA out s.Assert().Equal("TokenB", tokenIn.Denom) s.Assert().Equal("TokenA", tokenOut.Denom) - s.assertSwapOutputInt(tokenIn, sdk.NewInt(10_001_000), tokenOut, sdk.NewInt(10_000_000)) - s.assertTickBalancesInt(sdk.ZeroInt(), sdk.NewInt(10001000)) + s.assertSwapOutputInt(tokenIn, sdk.NewInt(10_000_999), tokenOut, sdk.NewInt(10_000_000)) + s.assertTickBalancesInt(sdk.ZeroInt(), sdk.NewInt(10_000_999)) s.assertCurr0To1(1) s.assertCurr1To0(math.MinInt64) @@ -87,8 +87,8 @@ func (s *DexTestSuite) TestSwap0To1FillLP() { // THEN swap should return 100 BIGTokenA in and ~98 BIGTokenB out s.Assert().Equal("TokenA", tokenIn.Denom) s.Assert().Equal("TokenB", tokenOut.Denom) - s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(100_000_000), tokenOut, sdkmath.NewInt(97_970_970)) - s.assertTickBalancesInt(sdkmath.NewInt(100_000_000), sdkmath.NewInt(20_29_030)) + s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(99_999_999), tokenOut, sdkmath.NewInt(97_970_970)) + s.assertTickBalancesInt(sdkmath.NewInt(99_999_999), sdkmath.NewInt(20_29_030)) s.assertCurr0To1(205) s.assertCurr1To0(195) @@ -105,8 +105,8 @@ func (s *DexTestSuite) TestSwap1To0FillLP() { s.Assert().Equal("TokenB", tokenIn.Denom) s.Assert().Equal("TokenA", tokenOut.Denom) // NOTE: Given rounding for amountOut, amountIn does not use the full maxAmount - s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(99_999_998), tokenOut, sdkmath.NewInt(13_533_528)) - s.assertTickBalancesInt(sdkmath.NewInt(86_466_472), sdkmath.NewInt(99_999_998)) + s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(99_999_997), tokenOut, sdkmath.NewInt(13_533_528)) + s.assertTickBalancesInt(sdkmath.NewInt(86_466_472), sdkmath.NewInt(99_999_997)) s.assertCurr0To1(-19_999) s.assertCurr1To0(-20_001) @@ -122,8 +122,8 @@ func (s *DexTestSuite) TestSwap0To1FillLPHighFee() { // THEN swap should return ~99 BIGTokenA in and ~12 BIGTokenB out s.Assert().Equal("TokenA", tokenIn.Denom) s.Assert().Equal("TokenB", tokenOut.Denom) - s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(99_999_996), tokenOut, sdkmath.NewInt(12_246_928)) - s.assertTickBalancesInt(sdkmath.NewInt(99_999_996), sdkmath.NewInt(87_753_072)) + s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(99_999_995), tokenOut, sdkmath.NewInt(12_246_928)) + s.assertTickBalancesInt(sdkmath.NewInt(99_999_995), sdkmath.NewInt(87_753_072)) s.assertCurr0To1(21_000) s.assertCurr1To0(19_000) @@ -139,8 +139,8 @@ func (s *DexTestSuite) TestSwap1To0FillLPHighFee() { // THEN swap should return 100 BIGTokenB in and ~668 BIGTokenA out s.Assert().Equal("TokenB", tokenIn.Denom) s.Assert().Equal("TokenA", tokenOut.Denom) - s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(100_000_000), tokenOut, sdkmath.NewInt(668_525_935)) - s.assertTickBalancesInt(sdkmath.NewInt(331_474_065), sdkmath.NewInt(100_000_000)) + s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(99_999_999), tokenOut, sdkmath.NewInt(668_525_935)) + s.assertTickBalancesInt(sdkmath.NewInt(331_474_065), sdkmath.NewInt(99_999_999)) s.assertCurr0To1(21_000) s.assertCurr1To0(19_000) @@ -160,8 +160,8 @@ func (s *DexTestSuite) TestSwap0To1PartialFillMultipleLP() { // THEN swap should return ~40 BIGTokenA in and 300 TokenB out s.Assert().Equal("TokenA", tokenIn.Denom) s.Assert().Equal("TokenB", tokenOut.Denom) - s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(40_604_647), tokenOut, sdkmath.NewInt(300_000_000)) - s.assertTickBalancesInt(sdkmath.NewInt(40_604_647), sdkmath.ZeroInt()) + s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(40_604_644), tokenOut, sdkmath.NewInt(300_000_000)) + s.assertTickBalancesInt(sdkmath.NewInt(40_604_644), sdkmath.ZeroInt()) s.assertCurr0To1(math.MaxInt64) s.assertCurr1To0(-20_001) @@ -181,8 +181,8 @@ func (s *DexTestSuite) TestSwap1To0PartialFillMultipleLP() { // THEN swap should return ~41 BIGTokenB in and 300 BIGTokenA out s.Assert().Equal("TokenB", tokenIn.Denom) s.Assert().Equal("TokenA", tokenOut.Denom) - s.assertSwapOutputInt(tokenIn, sdk.NewInt(40604647), tokenOut, sdk.NewInt(300000000)) - s.assertTickBalancesInt(sdk.ZeroInt(), sdk.NewInt(40604647)) + s.assertSwapOutputInt(tokenIn, sdk.NewInt(40604644), tokenOut, sdk.NewInt(300000000)) + s.assertTickBalancesInt(sdk.ZeroInt(), sdk.NewInt(40604644)) s.assertCurr0To1(20_001) s.assertCurr1To0(math.MinInt64) @@ -203,8 +203,8 @@ func (s *DexTestSuite) TestSwap0To1FillMultipleLP() { // THEN swap should return ~399 BIGTokenA in and 400 BIGTokenB out s.Assert().Equal("TokenA", tokenIn.Denom) s.Assert().Equal("TokenB", tokenOut.Denom) - s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(399_180_884), tokenOut, sdkmath.NewInt(400_000_000)) - s.assertTickBalancesInt(sdkmath.NewInt(399_180_884), sdkmath.ZeroInt()) + s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(399_180_880), tokenOut, sdkmath.NewInt(400_000_000)) + s.assertTickBalancesInt(sdkmath.NewInt(399_180_880), sdkmath.ZeroInt()) s.assertCurr0To1(math.MaxInt64) s.assertCurr1To0(-21) @@ -225,8 +225,8 @@ func (s *DexTestSuite) TestSwap1To0FillMultipleLP() { // THEN swap should return 400 BIGTokenB in and ~400 BIGTokenA out s.Assert().Equal("TokenB", tokenIn.Denom) s.Assert().Equal("TokenA", tokenOut.Denom) - s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(399_180_884), tokenOut, sdkmath.NewInt(400_000_000)) - s.assertTickBalancesInt(sdkmath.ZeroInt(), sdkmath.NewInt(399_180_884)) + s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(399_180_880), tokenOut, sdkmath.NewInt(400_000_000)) + s.assertTickBalancesInt(sdkmath.ZeroInt(), sdkmath.NewInt(399_180_880)) s.assertCurr0To1(21) s.assertCurr1To0(math.MinInt64) @@ -240,8 +240,8 @@ func (s *DexTestSuite) TestSwap0To1LPMaxAmountUsed() { tokenIn, tokenOut := s.swapWithMaxOut("TokenA", "TokenB", 50, 5) // THEN swap should return ~5 BIGTokenA in and 5 BIGTokenB out - s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(5_000_500), tokenOut, sdkmath.NewInt(5_000_000)) - s.assertTickBalancesInt(sdkmath.NewInt(5_000_500), sdkmath.NewInt(5_000_000)) + s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(5_000_499), tokenOut, sdkmath.NewInt(5_000_000)) + s.assertTickBalancesInt(sdkmath.NewInt(5_000_499), sdkmath.NewInt(5_000_000)) } func (s *DexTestSuite) TestSwap1To0LPMaxAmountUsed() { @@ -252,8 +252,8 @@ func (s *DexTestSuite) TestSwap1To0LPMaxAmountUsed() { tokenIn, tokenOut := s.swapWithMaxOut("TokenB", "TokenA", 50, 5) // THEN swap should return ~5 BIGTokenB in and 5 BIGTokenA out - s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(5_000_500), tokenOut, sdkmath.NewInt(5_000_000)) - s.assertTickBalancesInt(sdkmath.NewInt(5_000_000), sdkmath.NewInt(5_000_500)) + s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(5_000_499), tokenOut, sdkmath.NewInt(5_000_000)) + s.assertTickBalancesInt(sdkmath.NewInt(5_000_000), sdkmath.NewInt(5_000_499)) } func (s *DexTestSuite) TestSwap0To1LPMaxAmountNotUsed() { @@ -264,8 +264,8 @@ func (s *DexTestSuite) TestSwap0To1LPMaxAmountNotUsed() { tokenIn, tokenOut := s.swapWithMaxOut("TokenA", "TokenB", 8, 15) // THEN swap should return 8 BIGTokenA in and ~8 BIGTokenB out - s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(8_000_000), tokenOut, sdkmath.NewInt(7_999_200)) - s.assertTickBalancesInt(sdkmath.NewInt(8_000_000), sdkmath.NewInt(20_00_800)) + s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(7_999_999), tokenOut, sdkmath.NewInt(7_999_200)) + s.assertTickBalancesInt(sdkmath.NewInt(7_999_999), sdkmath.NewInt(20_00_800)) } func (s *DexTestSuite) TestSwap1To0LPMaxAmountNotUsed() { @@ -276,8 +276,8 @@ func (s *DexTestSuite) TestSwap1To0LPMaxAmountNotUsed() { tokenIn, tokenOut := s.swapWithMaxOut("TokenB", "TokenA", 8, 15) // THEN swap should return 8 BIGTokenB in and ~8 BIGTokenA out - s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(8_000_000), tokenOut, sdkmath.NewInt(7_999_200)) - s.assertTickBalancesInt(sdkmath.NewInt(2000800), sdkmath.NewInt(8_000_000)) + s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(7_999_999), tokenOut, sdkmath.NewInt(7_999_200)) + s.assertTickBalancesInt(sdkmath.NewInt(2000800), sdkmath.NewInt(7_999_999)) } func (s *DexTestSuite) TestSwap0To1LPMaxAmountUsedMultiTick() { @@ -294,8 +294,8 @@ func (s *DexTestSuite) TestSwap0To1LPMaxAmountUsedMultiTick() { tokenIn, tokenOut := s.swapWithMaxOut("TokenA", "TokenB", 50, 20) // THEN swap should return ~20 BIGTokenA in and 20 BIGTokenB out - s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(20_005_003), tokenOut, sdkmath.NewInt(20_000_000)) - s.assertTickBalancesInt(sdkmath.NewInt(20_005_003), sdkmath.NewInt(30_000_000)) + s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(20_004_999), tokenOut, sdkmath.NewInt(20_000_000)) + s.assertTickBalancesInt(sdkmath.NewInt(20_004_999), sdkmath.NewInt(30_000_000)) } func (s *DexTestSuite) TestSwap1To0LPMaxAmountUsedMultiTick() { @@ -312,8 +312,8 @@ func (s *DexTestSuite) TestSwap1To0LPMaxAmountUsedMultiTick() { tokenIn, tokenOut := s.swapWithMaxOut("TokenB", "TokenA", 50, 20) // THEN swap should return ~ 20 BIGTokenB in and 20 BIGTokenA out - s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(19_994_002), tokenOut, sdkmath.NewInt(20_000_000)) - s.assertTickBalancesInt(sdkmath.NewInt(30_000_000), sdkmath.NewInt(19_994_002)) + s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(19_994_001), tokenOut, sdkmath.NewInt(20_000_000)) + s.assertTickBalancesInt(sdkmath.NewInt(30_000_000), sdkmath.NewInt(19_994_001)) } func (s *DexTestSuite) TestSwap0To1LPMaxAmountNotUsedMultiTick() { @@ -330,8 +330,8 @@ func (s *DexTestSuite) TestSwap0To1LPMaxAmountNotUsedMultiTick() { tokenIn, tokenOut := s.swapWithMaxOut("TokenA", "TokenB", 19, 20) // THEN swap should return 19 BIGTokenA in and 19 BIGTokenB out - s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(19_000_000), tokenOut, sdkmath.NewInt(18_995_399)) - s.assertTickBalancesInt(sdkmath.NewInt(19_000_000), sdkmath.NewInt(31_004_601)) + s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(18_999_999), tokenOut, sdkmath.NewInt(18_995_402)) + s.assertTickBalancesInt(sdkmath.NewInt(18_999_999), sdkmath.NewInt(31_004_598)) } // swaps against LOs only ///////////////////////////////////////////////////// @@ -346,8 +346,8 @@ func (s *DexTestSuite) TestSwap0To1PartialFillLO() { // THEN swap should return ~11 BIGTokenA in and 10 BIGTokenB out s.Assert().Equal("TokenA", tokenIn.Denom) s.Assert().Equal("TokenB", tokenOut.Denom) - s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(11_051_654), tokenOut, sdkmath.NewInt(10_000_000)) - s.assertTickBalancesInt(sdkmath.NewInt(11_051_654), sdkmath.ZeroInt()) + s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(11_051_653), tokenOut, sdkmath.NewInt(10_000_000)) + s.assertTickBalancesInt(sdkmath.NewInt(11_051_653), sdkmath.ZeroInt()) } func (s *DexTestSuite) TestSwap1To0PartialFillLO() { @@ -360,8 +360,8 @@ func (s *DexTestSuite) TestSwap1To0PartialFillLO() { // THEN swap should return ~11 BIGTokenB in and 10 BIGTokenA out s.Assert().Equal("TokenB", tokenIn.Denom) s.Assert().Equal("TokenA", tokenOut.Denom) - s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(11_051_654), tokenOut, sdkmath.NewInt(10_000_000)) - s.assertTickBalancesInt(sdkmath.ZeroInt(), sdkmath.NewInt(11_051_654)) + s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(11_051_653), tokenOut, sdkmath.NewInt(10_000_000)) + s.assertTickBalancesInt(sdkmath.ZeroInt(), sdkmath.NewInt(11_051_653)) s.assertCurr0To1(math.MaxInt64) s.assertCurr1To0(math.MinInt64) @@ -377,8 +377,8 @@ func (s *DexTestSuite) TestSwap0To1FillLO() { // THEN swap should return ~99 BIGTokenA in and ~37 BIGTokenB out s.Assert().Equal("TokenA", tokenIn.Denom) s.Assert().Equal("TokenB", tokenOut.Denom) - s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(99_999_999), tokenOut, sdkmath.NewInt(36_789_783)) - s.assertTickBalancesInt(sdkmath.NewInt(99_999_999), sdkmath.NewInt(63_210_217)) + s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(99_999_998), tokenOut, sdkmath.NewInt(36_789_783)) + s.assertTickBalancesInt(sdkmath.NewInt(99_999_998), sdkmath.NewInt(63_210_217)) s.assertCurr0To1(10_000) s.assertCurr1To0(math.MinInt64) @@ -394,8 +394,8 @@ func (s *DexTestSuite) TestSwap1To0FillLO() { // THEN swap should return 10 BIGTokenB in and ~4 BIGTokenA out s.Assert().Equal("TokenB", tokenIn.Denom) s.Assert().Equal("TokenA", tokenOut.Denom) - s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(10_000_000), tokenOut, sdkmath.NewInt(3_678_978)) - s.assertTickBalancesInt(sdkmath.NewInt(96_321_022), sdkmath.NewInt(10_000_000)) + s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(9_999_999), tokenOut, sdkmath.NewInt(3_678_978)) + s.assertTickBalancesInt(sdkmath.NewInt(96_321_022), sdkmath.NewInt(9_999_999)) s.assertCurr0To1(math.MaxInt64) s.assertCurr1To0(-10_000) @@ -413,8 +413,8 @@ func (s *DexTestSuite) TestSwap0To1FillMultipleLO() { // THEN swap should return 300 BIGTokenA in and ~271 BIGTokenB out s.Assert().Equal("TokenA", tokenIn.Denom) s.Assert().Equal("TokenB", tokenOut.Denom) - s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(300_000_000), tokenOut, sdkmath.NewInt(271_428_295)) - s.assertTickBalancesInt(sdkmath.NewInt(300_000_000), sdkmath.NewInt(28_571_705)) + s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(299_999_999), tokenOut, sdkmath.NewInt(271_428_297)) + s.assertTickBalancesInt(sdkmath.NewInt(299_999_999), sdkmath.NewInt(28_571_703)) s.assertCurr0To1(1_002) s.assertCurr1To0(math.MinInt64) @@ -432,8 +432,8 @@ func (s *DexTestSuite) TestSwap1To0FillMultipleLO() { // THEN swap should return 300 BIGTokenB in and ~271 BIGTokenB out s.Assert().Equal("TokenB", tokenIn.Denom) s.Assert().Equal("TokenA", tokenOut.Denom) - s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(300_000_000), tokenOut, sdkmath.NewInt(271_428_295)) - s.assertTickBalancesInt(sdkmath.NewInt(28_571_705), sdkmath.NewInt(300_000_000)) + s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(299_999_999), tokenOut, sdkmath.NewInt(271_428_297)) + s.assertTickBalancesInt(sdkmath.NewInt(28_571_703), sdkmath.NewInt(299_999_999)) s.assertCurr0To1(math.MaxInt64) s.assertCurr1To0(-1_002) @@ -447,8 +447,8 @@ func (s *DexTestSuite) TestSwap0To1LOMaxAmountUsed() { tokenIn, tokenOut := s.swapWithMaxOut("TokenA", "TokenB", 50, 5) // THEN swap should return ~5 BIGTokenA in and 5 BIGTokenB out - s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(5_000_500), tokenOut, sdkmath.NewInt(5_000_000)) - s.assertTickBalancesInt(sdkmath.NewInt(5_000_500), sdkmath.NewInt(5_000_000)) + s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(5_000_499), tokenOut, sdkmath.NewInt(5_000_000)) + s.assertTickBalancesInt(sdkmath.NewInt(5_000_499), sdkmath.NewInt(5_000_000)) } func (s *DexTestSuite) TestSwap1To0LOMaxAmountUsed() { @@ -471,8 +471,8 @@ func (s *DexTestSuite) TestSwap0To1LOMaxAmountNotUsed() { tokenIn, tokenOut := s.swapWithMaxOut("TokenA", "TokenB", 8, 15) // THEN swap should return 8 BIGTokenA in and ~8 BIGTokenB out - s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(8_000_000), tokenOut, sdkmath.NewInt(7_999_200)) - s.assertTickBalancesInt(sdkmath.NewInt(8_000_000), sdkmath.NewInt(2_000_800)) + s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(7_999_999), tokenOut, sdkmath.NewInt(7_999_200)) + s.assertTickBalancesInt(sdkmath.NewInt(7_999_999), sdkmath.NewInt(2_000_800)) } func (s *DexTestSuite) TestSwap1To0LOMaxAmountNotUsed() { @@ -499,8 +499,8 @@ func (s *DexTestSuite) TestSwap0To1LOMaxAmountUsedMultiTick() { tokenIn, tokenOut := s.swapWithMaxOut("TokenA", "TokenB", 50, 20) // THEN swap should return ~20 BIGTokenA in and 20 TokenB out - s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(20_003_002), tokenOut, sdkmath.NewInt(20_000_000)) - s.assertTickBalancesInt(sdkmath.NewInt(20_003_002), sdkmath.NewInt(30_000_000)) + s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(20_002_999), tokenOut, sdkmath.NewInt(20_000_000)) + s.assertTickBalancesInt(sdkmath.NewInt(20_002_999), sdkmath.NewInt(30_000_000)) } func (s *DexTestSuite) TestSwap1To0LOMaxAmountUsedMultiTick() { @@ -515,8 +515,8 @@ func (s *DexTestSuite) TestSwap1To0LOMaxAmountUsedMultiTick() { tokenIn, tokenOut := s.swapWithMaxOut("TokenB", "TokenA", 50, 20) // THEN swap should return ~20 BIGTokenB in and 20 BIGTokenA out - s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(19_992_002), tokenOut, sdkmath.NewInt(20_000_000)) - s.assertTickBalancesInt(sdkmath.NewInt(30_000_000), sdkmath.NewInt(19_992_002)) + s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(19_992_001), tokenOut, sdkmath.NewInt(20_000_000)) + s.assertTickBalancesInt(sdkmath.NewInt(30_000_000), sdkmath.NewInt(19_992_001)) } func (s *DexTestSuite) TestSwap0To1LOMaxAmountNotUsedMultiTick() { @@ -531,8 +531,8 @@ func (s *DexTestSuite) TestSwap0To1LOMaxAmountNotUsedMultiTick() { tokenIn, tokenOut := s.swapWithMaxOut("TokenA", "TokenB", 19, 20) // THEN swap should return 19 BIGTokenA in and ~19 BIGTokenB out - s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(19_000_000), tokenOut, sdkmath.NewInt(18_997_299)) - s.assertTickBalancesInt(sdkmath.NewInt(19_000_000), sdkmath.NewInt(31_002_701)) + s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(18_999_999), tokenOut, sdkmath.NewInt(18_997_301)) + s.assertTickBalancesInt(sdkmath.NewInt(18_999_999), sdkmath.NewInt(31_002_699)) } // Swap LO and LP //////////////////////////////////////////////////////////// diff --git a/x/dex/types/limit_order_tranche.go b/x/dex/types/limit_order_tranche.go index 6e9a7dc74..383741837 100644 --- a/x/dex/types/limit_order_tranche.go +++ b/x/dex/types/limit_order_tranche.go @@ -148,7 +148,7 @@ func (t *LimitOrderTranche) Swap(maxAmountTakerIn math.Int, maxAmountMakerOut *m } outAmount = utils.MinIntArr(possibleOutAmounts) - inAmount = math_utils.NewPrecDecFromInt(outAmount).Quo(t.PriceTakerToMaker).Ceil().TruncateInt() + inAmount = math_utils.NewPrecDecFromInt(outAmount).Quo(t.PriceTakerToMaker).TruncateInt() *fillTokenIn = fillTokenIn.Add(inAmount) *totalTokenIn = totalTokenIn.Add(inAmount) diff --git a/x/dex/types/pool.go b/x/dex/types/pool.go index 72e73e9ae..9b0536fd3 100644 --- a/x/dex/types/pool.go +++ b/x/dex/types/pool.go @@ -97,7 +97,6 @@ func (p *Pool) Swap( amountMakerOut = utils.MinIntArr(possibleAmountsMakerOut) amountTakerIn = math_utils.NewPrecDecFromInt(amountMakerOut). Quo(makerReserves.PriceTakerToMaker). - Ceil(). TruncateInt() takerReserves.ReservesMakerDenom = takerReserves.ReservesMakerDenom.Add(amountTakerIn) From b50963ace0596074fb7fe3d05494de008e456928 Mon Sep 17 00:00:00 2001 From: Julian Compagni Portis Date: Fri, 10 Nov 2023 02:24:27 -0500 Subject: [PATCH 241/307] Add swap logic to abort if taker will be getting an unfair price due to rounding --- x/dex/keeper/liquidity.go | 26 ++++++++++++++++++++++++++ x/dex/types/errors.go | 5 +++++ 2 files changed, 31 insertions(+) diff --git a/x/dex/keeper/liquidity.go b/x/dex/keeper/liquidity.go index e86e77b89..7c67568ff 100644 --- a/x/dex/keeper/liquidity.go +++ b/x/dex/keeper/liquidity.go @@ -41,6 +41,21 @@ func (k Keeper) Swap( } inAmount, outAmount := liq.Swap(remainingTakerDenom, remainingMakerDenom) + + // If (due to rounding) the actual price given to the maker is demonstrably unfair + // we do not save the results of the swap and we exit. + // While the decrease in price quality for the maker is semi-linear with the amount + // being swapped, it is possible that the next swap could yield a "fair" price. + // Nonethless, once the remainingTakerDenom gets small enough to start causing unfair swaps + // it is much simpler to just abort. + if isUnfairTruePrice(inAmount, outAmount, liq) { + // If they've already swapped just end the swap + if remainingTakerDenom.LT(maxAmountTakerDenom) { + break + } + // If they have not swapped anything return informative error + return sdk.Coin{}, sdk.Coin{}, false, types.ErrSwapAmountTooSmall + } k.SaveLiquidity(ctx, liq) remainingTakerDenom = remainingTakerDenom.Sub(inAmount) @@ -113,3 +128,14 @@ func (k Keeper) SaveLiquidity(sdkCtx sdk.Context, liquidityI types.Liquidity) { panic("Invalid liquidity type") } } + +var MaxTrueMakerSpread = math_utils.MustNewPrecDecFromStr("0.005") + +func isUnfairTruePrice(inAmount, outAmount math.Int, liq types.Liquidity) bool { + bookPrice := liq.Price() + truePrice := math_utils.NewPrecDecFromInt(outAmount).QuoInt(inAmount) + priceDiffFromExpected := truePrice.Sub(bookPrice) + pctDiff := priceDiffFromExpected.Quo(bookPrice) + + return pctDiff.GT(MaxTrueMakerSpread) +} diff --git a/x/dex/types/errors.go b/x/dex/types/errors.go index 024a67bbe..cb1c080a4 100644 --- a/x/dex/types/errors.go +++ b/x/dex/types/errors.go @@ -169,4 +169,9 @@ var ( 1150, "Can only provide a single deposit amount for each tick, fee pair", ) + ErrSwapAmountTooSmall = sdkerrors.Register( + ModuleName, + 1151, + "Swap amount too small; creates unfair spread for liquidity providers", + ) ) From 4ff34987a933496f3225d035b714cf68595ef948 Mon Sep 17 00:00:00 2001 From: Julian Compagni Portis Date: Fri, 10 Nov 2023 16:11:00 -0500 Subject: [PATCH 242/307] handle swap case where amountIn is 0 --- x/dex/keeper/liquidity.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x/dex/keeper/liquidity.go b/x/dex/keeper/liquidity.go index 7c67568ff..e2442996e 100644 --- a/x/dex/keeper/liquidity.go +++ b/x/dex/keeper/liquidity.go @@ -48,7 +48,7 @@ func (k Keeper) Swap( // being swapped, it is possible that the next swap could yield a "fair" price. // Nonethless, once the remainingTakerDenom gets small enough to start causing unfair swaps // it is much simpler to just abort. - if isUnfairTruePrice(inAmount, outAmount, liq) { + if inAmount.IsZero() || isUnfairTruePrice(inAmount, outAmount, liq) { // If they've already swapped just end the swap if remainingTakerDenom.LT(maxAmountTakerDenom) { break From 1836856cdc16b75f81b2b7e3fbe3a87a0b9e96aa Mon Sep 17 00:00:00 2001 From: Julian Compagni Portis Date: Fri, 10 Nov 2023 18:25:55 -0500 Subject: [PATCH 243/307] add tests for swap rouding behavior --- .../integration_placelimitorder_test.go | 37 ++++++ x/dex/keeper/liquidity_test.go | 114 ++++++++++++++---- x/dex/keeper/msg_server_test.go | 15 ++- 3 files changed, 138 insertions(+), 28 deletions(-) diff --git a/x/dex/keeper/integration_placelimitorder_test.go b/x/dex/keeper/integration_placelimitorder_test.go index 34358ad0f..40c2760c5 100644 --- a/x/dex/keeper/integration_placelimitorder_test.go +++ b/x/dex/keeper/integration_placelimitorder_test.go @@ -503,6 +503,43 @@ func (s *DexTestSuite) TestPlaceLimitOrderIoCWithLPNoFill() { s.assertLimitLiquidityAtTick("TokenA", 1, 0) } +func (s *DexTestSuite) TestPlaceLimitOrderIoCUnfairPriceFails() { + s.fundAliceBalances(10, 0) + s.fundBobBalances(0, 1) + // GIVEN LP of 1 TokenB at tick -20 + s.bobDeposits(NewDeposit(0, 1, -20, 1)) + // WHEN alice submits IoC limitOrder for 2 tokenA + _, err := s.limitSellsInt(s.alice, "TokenA", 10, sdkmath.NewInt(2), types.LimitOrderType_IMMEDIATE_OR_CANCEL) + + // THEN alice's LimitOrder failswith SwapAmountTooSmall + s.ErrorIs(err, types.ErrSwapAmountTooSmall) + + // Nothing is changed + s.assertAliceBalances(10, 0) + s.assertLiquidityAtTick(0, 1, -20, 1) +} + +func (s *DexTestSuite) TestPlaceLimitOrderIoCUnfairPriceAbortsEarly() { + s.fundAliceBalances(1, 0) + s.fundBobBalances(0, 2) + // GIVEN LP of 1 TokenB at ticks -20 & -21 + s.bobDeposits( + NewDeposit(0, 1, -21, 1), + NewDeposit(0, 1, -20, 1), + ) + // WHEN alice submits IoC limitOrder for 999_004 small TokenA + _, err := s.limitSellsInt(s.alice, "TokenA", 10, sdkmath.NewInt(998_004), types.LimitOrderType_IMMEDIATE_OR_CANCEL) + + // THEN alice's LimitOrder swaps through the first tick, but does not swap the second tick due to unfair pricing + s.NoError(err) + + // The first tick swapped and the second tick is not + s.assertLiquidityAtTickInt(sdkmath.NewInt(998_002), sdkmath.ZeroInt(), -21, 1) + s.assertLiquidityAtTick(0, 1, -20, 1) + // only the first swap is deducted from alices balance + s.assertAliceBalancesInt(sdkmath.NewInt(1998), sdkmath.NewInt(1_000_000)) +} + // Just In Time Limit Orders ////////////////////////////////////////////////// func (s *DexTestSuite) TestPlaceLimitOrderJITFills() { diff --git a/x/dex/keeper/liquidity_test.go b/x/dex/keeper/liquidity_test.go index ec15601ed..03136fd10 100644 --- a/x/dex/keeper/liquidity_test.go +++ b/x/dex/keeper/liquidity_test.go @@ -17,7 +17,7 @@ func (s *DexTestSuite) TestSwap0To1NoLiquidity() { s.placeGTCLimitOrder("TokenA", 1000, 10) // WHEN swap 10 of tokenB - tokenIn, tokenOut := s.swap("TokenA", "TokenB", 10) + tokenIn, tokenOut := s.swapSuccess("TokenA", "TokenB", 10) // THEN swap should do nothing s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(0o_000_000), tokenOut, sdkmath.NewInt(0o_000_000)) @@ -32,7 +32,7 @@ func (s *DexTestSuite) TestSwap1To0NoLiquidity() { s.placeGTCLimitOrder("TokenB", 1000, 10) // WHEN swap 10 of tokenB - tokenIn, tokenOut := s.swap("TokenB", "TokenA", 10) + tokenIn, tokenOut := s.swapSuccess("TokenB", "TokenA", 10) // THEN swap should do nothing s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(0o_000_000), tokenOut, sdkmath.NewInt(0o_000_000)) @@ -41,6 +41,65 @@ func (s *DexTestSuite) TestSwap1To0NoLiquidity() { s.assertCurr1To0(math.MinInt64) } +func (s *DexTestSuite) TestSwapZeroInFailsLowTick() { + // GIVEN liquidity tokenA at tick -20,002 + s.addDeposit(NewDeposit(10000, 0, -20_000, 2)) + + // WHEN swap 7 tokenB + _, _, _, err := s.swap("TokenB", "TokenA", sdkmath.NewInt(7)) + + // THEN swap would give an InAmount and outAmount of 0 and fail + // Floor(7 * 1.0001^-20,000) = 0 + s.ErrorIs(err, types.ErrSwapAmountTooSmall) +} + +func (s *DexTestSuite) TestSwapUnfairPriceFailsLowTick() { + // GIVEN liquidity tokenA at tick -20,002 + s.addDeposit(NewDeposit(10000, 0, -20_000, 2)) + + // WHEN swap 8 tokenB + _, _, _, err := s.swap("TokenB", "TokenA", sdkmath.NewInt(8)) + + // THEN swap fails because maker is selling at an unfair true price + // AmountOut = Floor(8 * 1.0001^-20,000) = 1 + // AmountIn = Floor(1 * 1.0001^20000) = 7 + // TruePrice = AmountOut/AmountIn = 1/7 = .142857 + // BookPrice = 0.135348817 (thus maker is getting a price 5.5% worse than expected) + s.ErrorIs(err, types.ErrSwapAmountTooSmall) +} + +func (s *DexTestSuite) TestSwapUnfairPriceFailsHighTick() { + // GIVEN liquidity tokenA at tick 159,680 + s.addDeposit(NewDeposit(2000, 0, 159681, 1)) + + // WHEN swap 8 tokenB + _, _, _, err := s.swap("TokenB", "TokenA", sdk.NewInt(200)) + + // THEN swap fails because maker is selling at an unfair true price + // AmountOut = Floor(200 * 1.0001^159,680) = 1,719,877,698 + // AmountIn = Floor(1,719,877,697 * 1.0001^-159,680) = 199 + // TruePrice = AmountOut/AmountIn = 1,719,877,698/199 = 8,642,601 + // BookPrice = 8,599,388 (thus maker is getting a price .502% worse than expected) + s.ErrorIs(err, types.ErrSwapAmountTooSmall) +} + +func (s *DexTestSuite) TestSwapUnfairPriceAbortEarly() { + // GIVEN liquidity tokenA at tick 159,681 and 159,680 + s.addDeposits( + NewDeposit(2580, 0, 159682, 1), + NewDeposit(2000, 0, 159681, 1), + ) + + // WHEN swap 700 BIgTokenB + tokenIn, tokenOut, orderFilled, err := s.swap("TokenB", "TokenA", sdk.NewInt(499)) + + // THEN swap works on the first tick, but aborts on the second tick because of Unfair price condition + s.NoError(err) + s.assertSwapOutputInt(tokenIn, sdkmath.NewInt(299), tokenOut, sdkmath.NewInt(2580000000)) + s.False(orderFilled) + s.assertTickBalancesInt(sdkmath.NewInt(2_000_000_000), sdkmath.NewInt(299)) +} + // swaps against LPs only ///////////////////////////////////////////////////// func (s *DexTestSuite) TestSwap0To1PartialFillLP() { @@ -48,7 +107,7 @@ func (s *DexTestSuite) TestSwap0To1PartialFillLP() { s.addDeposit(NewDeposit(0, 10, 0, 1)) // WHEN swap 20 of tokenA - tokenIn, tokenOut := s.swap("TokenA", "TokenB", 20) + tokenIn, tokenOut := s.swapSuccess("TokenA", "TokenB", 20) // THEN swap should return ~10 BIGTokenA in and 10 BIGTokenB out s.Assert().Equal("TokenA", tokenIn.Denom) @@ -65,7 +124,7 @@ func (s *DexTestSuite) TestSwap1To0PartialFillLP() { s.addDeposit(NewDeposit(10, 0, 0, 1)) // WHEN swap 20 of tokenB - tokenIn, tokenOut := s.swap("TokenB", "TokenA", 20) + tokenIn, tokenOut := s.swapSuccess("TokenB", "TokenA", 20) // THEN swap should return ~10 BIGTokenB in and 10 BIGTokenA out s.Assert().Equal("TokenB", tokenIn.Denom) @@ -82,7 +141,7 @@ func (s *DexTestSuite) TestSwap0To1FillLP() { s.addDeposit(NewDeposit(0, 100, 200, 5)) // WHEN swap 100 of tokenA - tokenIn, tokenOut := s.swap("TokenA", "TokenB", 100) + tokenIn, tokenOut := s.swapSuccess("TokenA", "TokenB", 100) // THEN swap should return 100 BIGTokenA in and ~98 BIGTokenB out s.Assert().Equal("TokenA", tokenIn.Denom) @@ -99,7 +158,7 @@ func (s *DexTestSuite) TestSwap1To0FillLP() { s.addDeposit(NewDeposit(100, 0, -20_000, 1)) // WHEN swap 100 of tokenB - tokenIn, tokenOut := s.swap("TokenB", "TokenA", 100) + tokenIn, tokenOut := s.swapSuccess("TokenB", "TokenA", 100) // THEN swap should return ~99 BIGTokenB in and ~14 BIGTokenA out s.Assert().Equal("TokenB", tokenIn.Denom) @@ -117,7 +176,7 @@ func (s *DexTestSuite) TestSwap0To1FillLPHighFee() { s.addDeposit(NewDeposit(0, 100, 20_000, 1_000)) // WHEN swap 100 of tokenA - tokenIn, tokenOut := s.swap("TokenA", "TokenB", 100) + tokenIn, tokenOut := s.swapSuccess("TokenA", "TokenB", 100) // THEN swap should return ~99 BIGTokenA in and ~12 BIGTokenB out s.Assert().Equal("TokenA", tokenIn.Denom) @@ -134,7 +193,7 @@ func (s *DexTestSuite) TestSwap1To0FillLPHighFee() { s.addDeposit(NewDeposit(1000, 0, 20_000, 1000)) // WHEN swap 100 of tokenB - tokenIn, tokenOut := s.swap("TokenB", "TokenA", 100) + tokenIn, tokenOut := s.swapSuccess("TokenB", "TokenA", 100) // THEN swap should return 100 BIGTokenB in and ~668 BIGTokenA out s.Assert().Equal("TokenB", tokenIn.Denom) @@ -155,7 +214,7 @@ func (s *DexTestSuite) TestSwap0To1PartialFillMultipleLP() { ) // WHEN swap 100 of tokenA - tokenIn, tokenOut := s.swap("TokenA", "TokenB", 100) + tokenIn, tokenOut := s.swapSuccess("TokenA", "TokenB", 100) // THEN swap should return ~40 BIGTokenA in and 300 TokenB out s.Assert().Equal("TokenA", tokenIn.Denom) @@ -176,7 +235,7 @@ func (s *DexTestSuite) TestSwap1To0PartialFillMultipleLP() { ) // WHEN swap 100 of tokenB - tokenIn, tokenOut := s.swap("TokenB", "TokenA", 100) + tokenIn, tokenOut := s.swapSuccess("TokenB", "TokenA", 100) // THEN swap should return ~41 BIGTokenB in and 300 BIGTokenA out s.Assert().Equal("TokenB", tokenIn.Denom) @@ -198,7 +257,7 @@ func (s *DexTestSuite) TestSwap0To1FillMultipleLP() { ) // WHEN swap 100 of tokenA - tokenIn, tokenOut := s.swap("TokenA", "TokenB", 400) + tokenIn, tokenOut := s.swapSuccess("TokenA", "TokenB", 400) // THEN swap should return ~399 BIGTokenA in and 400 BIGTokenB out s.Assert().Equal("TokenA", tokenIn.Denom) @@ -220,7 +279,7 @@ func (s *DexTestSuite) TestSwap1To0FillMultipleLP() { ) // WHEN swap 400 of tokenB - tokenIn, tokenOut := s.swap("TokenB", "TokenA", 400) + tokenIn, tokenOut := s.swapSuccess("TokenB", "TokenA", 400) // THEN swap should return 400 BIGTokenB in and ~400 BIGTokenA out s.Assert().Equal("TokenB", tokenIn.Denom) @@ -341,7 +400,7 @@ func (s *DexTestSuite) TestSwap0To1PartialFillLO() { s.placeGTCLimitOrder("TokenB", 10, 1_000) // WHEN swap 20 of tokenA - tokenIn, tokenOut := s.swap("TokenA", "TokenB", 20) + tokenIn, tokenOut := s.swapSuccess("TokenA", "TokenB", 20) // THEN swap should return ~11 BIGTokenA in and 10 BIGTokenB out s.Assert().Equal("TokenA", tokenIn.Denom) @@ -355,7 +414,7 @@ func (s *DexTestSuite) TestSwap1To0PartialFillLO() { s.placeGTCLimitOrder("TokenA", 10, -1_000) // WHEN swap 20 of tokenB - tokenIn, tokenOut := s.swap("TokenB", "TokenA", 20) + tokenIn, tokenOut := s.swapSuccess("TokenB", "TokenA", 20) // THEN swap should return ~11 BIGTokenB in and 10 BIGTokenA out s.Assert().Equal("TokenB", tokenIn.Denom) @@ -372,7 +431,7 @@ func (s *DexTestSuite) TestSwap0To1FillLO() { s.placeGTCLimitOrder("TokenB", 100, 10_000) // WHEN swap 100 of tokenA - tokenIn, tokenOut := s.swap("TokenA", "TokenB", 100) + tokenIn, tokenOut := s.swapSuccess("TokenA", "TokenB", 100) // THEN swap should return ~99 BIGTokenA in and ~37 BIGTokenB out s.Assert().Equal("TokenA", tokenIn.Denom) @@ -389,7 +448,7 @@ func (s *DexTestSuite) TestSwap1To0FillLO() { s.placeGTCLimitOrder("TokenA", 100, -10_000) // WHEN swap 10 of tokenB - tokenIn, tokenOut := s.swap("TokenB", "TokenA", 10) + tokenIn, tokenOut := s.swapSuccess("TokenB", "TokenA", 10) // THEN swap should return 10 BIGTokenB in and ~4 BIGTokenA out s.Assert().Equal("TokenB", tokenIn.Denom) @@ -408,7 +467,7 @@ func (s *DexTestSuite) TestSwap0To1FillMultipleLO() { s.placeGTCLimitOrder("TokenB", 100, 1_002) // WHEN swap 300 of tokenA - tokenIn, tokenOut := s.swap("TokenA", "TokenB", 300) + tokenIn, tokenOut := s.swapSuccess("TokenA", "TokenB", 300) // THEN swap should return 300 BIGTokenA in and ~271 BIGTokenB out s.Assert().Equal("TokenA", tokenIn.Denom) @@ -427,7 +486,7 @@ func (s *DexTestSuite) TestSwap1To0FillMultipleLO() { s.placeGTCLimitOrder("TokenA", 100, -1_002) // WHEN swap 300 of tokenB - tokenIn, tokenOut := s.swap("TokenB", "TokenA", 300) + tokenIn, tokenOut := s.swapSuccess("TokenB", "TokenA", 300) // THEN swap should return 300 BIGTokenB in and ~271 BIGTokenB out s.Assert().Equal("TokenB", tokenIn.Denom) @@ -587,17 +646,25 @@ func (s *DexTestSuite) placeGTCLimitOrder( func (s *DexTestSuite) swap( tokenIn string, tokenOut string, - maxAmountIn int64, -) (coinIn, coinOut sdk.Coin) { + maxAmountIn sdkmath.Int, +) (coinIn, coinOut sdk.Coin, filled bool, err error) { tradePairID, err := types.NewTradePairID(tokenIn, tokenOut) s.Assert().NoError(err) - coinIn, coinOut, _, err = s.App.DexKeeper.Swap( + return s.App.DexKeeper.Swap( s.Ctx, tradePairID, - sdkmath.NewInt(maxAmountIn).Mul(denomMultiple), + maxAmountIn, nil, nil, ) +} + +func (s *DexTestSuite) swapSuccess( + tokenIn string, + tokenOut string, + maxAmountIn int64, +) (coinIn, coinOut sdk.Coin) { + coinIn, coinOut, _, err := s.swap(tokenIn, tokenOut, sdk.NewInt(maxAmountIn).Mul(denomMultiple)) s.Assert().NoError(err) return coinIn, coinOut } @@ -690,9 +757,6 @@ func (s *DexTestSuite) assertTickBalancesInt(expectedABalance, expectedBBalance } func (s *DexTestSuite) assertTickBalances(expectedABalance, expectedBBalance int64) { - // NOTE: We can't just check the actual DEX bank balances since we are testing swap - // before any transfers take place. Instead we have to sum up the total amount of coins - // at each tick expectedAInt := sdkmath.NewInt(expectedABalance).Mul(denomMultiple) expectedBInt := sdkmath.NewInt(expectedBBalance).Mul(denomMultiple) s.assertTickBalancesInt(expectedAInt, expectedBInt) diff --git a/x/dex/keeper/msg_server_test.go b/x/dex/keeper/msg_server_test.go index 999c4d817..056c63da2 100644 --- a/x/dex/keeper/msg_server_test.go +++ b/x/dex/keeper/msg_server_test.go @@ -394,10 +394,10 @@ func (s *DexTestSuite) limitSellsWithMaxOut( return msg.TrancheKey } -func (s *DexTestSuite) limitSells( +func (s *DexTestSuite) limitSellsInt( account sdk.AccAddress, tokenIn string, - tickIndexNormalized, amountIn int, + tickIndexNormalized int, amountIn sdkmath.Int, orderTypeOpt ...types.LimitOrderType, ) (string, error) { var orderType types.LimitOrderType @@ -415,13 +415,22 @@ func (s *DexTestSuite) limitSells( TokenIn: tradePairID.TakerDenom, TokenOut: tradePairID.MakerDenom, TickIndexInToOut: tickIndexTakerToMaker, - AmountIn: sdkmath.NewInt(int64(amountIn)).Mul(denomMultiple), + AmountIn: amountIn, OrderType: orderType, }) return msg.TrancheKey, err } +func (s *DexTestSuite) limitSells( + account sdk.AccAddress, + tokenIn string, + tickIndexNormalized, amountIn int, + orderTypeOpt ...types.LimitOrderType, +) (string, error) { + return s.limitSellsInt(account, tokenIn, tickIndexNormalized, sdkmath.NewInt(int64(amountIn)).Mul(denomMultiple), orderTypeOpt...) +} + func (s *DexTestSuite) limitSellsGoodTil( account sdk.AccAddress, tokenIn string, From 38923059654b803e6a17a1f46071b9f7b996bbea Mon Sep 17 00:00:00 2001 From: Julian Compagni Portis Date: Mon, 13 Nov 2023 17:34:56 -0500 Subject: [PATCH 244/307] Store MaxTrueTakerSpread as a dex param --- proto/neutron/dex/params.proto | 9 ++++- x/dex/keeper/liquidity.go | 13 +++--- x/dex/types/params.go | 15 ++++--- x/dex/types/params.pb.go | 74 +++++++++++++++++++++++++++++----- 4 files changed, 90 insertions(+), 21 deletions(-) diff --git a/proto/neutron/dex/params.proto b/proto/neutron/dex/params.proto index 70c65c293..8e7bfe2c6 100644 --- a/proto/neutron/dex/params.proto +++ b/proto/neutron/dex/params.proto @@ -8,5 +8,12 @@ option go_package = "github.com/neutron-org/neutron/x/dex/types"; // Params defines the parameters for the module. message Params { option (gogoproto.goproto_stringer) = false; - repeated uint64 fee_tiers = 1; + 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/utils/math.PrecDec", + (gogoproto.nullable) = false, + (gogoproto.jsontag) = "max_true_taker_spread" + ]; + } diff --git a/x/dex/keeper/liquidity.go b/x/dex/keeper/liquidity.go index e2442996e..c50b68e00 100644 --- a/x/dex/keeper/liquidity.go +++ b/x/dex/keeper/liquidity.go @@ -15,6 +15,7 @@ func (k Keeper) Swap( maxAmountMakerDenom *math.Int, limitPrice *math_utils.PrecDec, ) (totalTakerCoin, totalMakerCoin sdk.Coin, orderFilled bool, err error) { + params := k.GetParams(ctx) useMaxOut := maxAmountMakerDenom != nil var remainingMakerDenom *math.Int if useMaxOut { @@ -48,7 +49,7 @@ func (k Keeper) Swap( // being swapped, it is possible that the next swap could yield a "fair" price. // Nonethless, once the remainingTakerDenom gets small enough to start causing unfair swaps // it is much simpler to just abort. - if inAmount.IsZero() || isUnfairTruePrice(inAmount, outAmount, liq) { + if inAmount.IsZero() || isUnfairTruePrice(params.MaxTrueTakerSpread, inAmount, outAmount, liq) { // If they've already swapped just end the swap if remainingTakerDenom.LT(maxAmountTakerDenom) { break @@ -129,13 +130,15 @@ func (k Keeper) SaveLiquidity(sdkCtx sdk.Context, liquidityI types.Liquidity) { } } -var MaxTrueMakerSpread = math_utils.MustNewPrecDecFromStr("0.005") - -func isUnfairTruePrice(inAmount, outAmount math.Int, liq types.Liquidity) bool { +func isUnfairTruePrice( + maxTrueTakerSpread math_utils.PrecDec, + inAmount, outAmount math.Int, + liq types.Liquidity, +) bool { bookPrice := liq.Price() truePrice := math_utils.NewPrecDecFromInt(outAmount).QuoInt(inAmount) priceDiffFromExpected := truePrice.Sub(bookPrice) pctDiff := priceDiffFromExpected.Quo(bookPrice) - return pctDiff.GT(MaxTrueMakerSpread) + return pctDiff.GT(maxTrueTakerSpread) } diff --git a/x/dex/types/params.go b/x/dex/types/params.go index 8bb7fdc0b..b62659eac 100644 --- a/x/dex/types/params.go +++ b/x/dex/types/params.go @@ -4,14 +4,16 @@ import ( fmt "fmt" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" + math_utils "github.com/neutron-org/neutron/utils/math" "gopkg.in/yaml.v2" ) var _ paramtypes.ParamSet = (*Params)(nil) var ( - KeyFeeTiers = []byte("FeeTiers") - DefaultFeeTiers = []uint64{0, 1, 2, 3, 4, 5, 10, 20, 50, 100, 150, 200} + KeyFeeTiers = []byte("FeeTiers") + DefaultFeeTiers = []uint64{0, 1, 2, 3, 4, 5, 10, 20, 50, 100, 150, 200} + DefaultMaxTrueTakerSpread = math_utils.MustNewPrecDecFromStr("0.005") ) // ParamKeyTable the param key table for launch module @@ -20,13 +22,16 @@ func ParamKeyTable() paramtypes.KeyTable { } // NewParams creates a new Params instance -func NewParams(feeTiers []uint64) Params { - return Params{FeeTiers: feeTiers} +func NewParams(feeTiers []uint64, maxTrueTakerSpread math_utils.PrecDec) Params { + return Params{ + FeeTiers: feeTiers, + MaxTrueTakerSpread: maxTrueTakerSpread, + } } // DefaultParams returns a default set of parameters func DefaultParams() Params { - return NewParams(DefaultFeeTiers) + return NewParams(DefaultFeeTiers, DefaultMaxTrueTakerSpread) } // ParamSetPairs get the params.ParamSet diff --git a/x/dex/types/params.pb.go b/x/dex/types/params.pb.go index 8ec299924..4333552ee 100644 --- a/x/dex/types/params.pb.go +++ b/x/dex/types/params.pb.go @@ -7,6 +7,7 @@ import ( fmt "fmt" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" + github_com_neutron_org_neutron_utils_math "github.com/neutron-org/neutron/utils/math" io "io" math "math" math_bits "math/bits" @@ -25,7 +26,8 @@ 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"` + FeeTiers []uint64 `protobuf:"varint,1,rep,packed,name=fee_tiers,json=feeTiers,proto3" json:"fee_tiers,omitempty"` + MaxTrueTakerSpread github_com_neutron_org_neutron_utils_math.PrecDec `protobuf:"bytes,2,opt,name=max_true_taker_spread,json=maxTrueTakerSpread,proto3,customtype=github.com/neutron-org/neutron/utils/math.PrecDec" json:"max_true_taker_spread" yaml:"max_true_taker_spread"` } func (m *Params) Reset() { *m = Params{} } @@ -74,18 +76,24 @@ func init() { func init() { proto.RegisterFile("neutron/dex/params.proto", fileDescriptor_84a6bffcfc21009c) } var fileDescriptor_84a6bffcfc21009c = []byte{ - // 173 bytes of a gzipped FileDescriptorProto + // 272 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xc8, 0x4b, 0x2d, 0x2d, 0x29, 0xca, 0xcf, 0xd3, 0x4f, 0x49, 0xad, 0xd0, 0x2f, 0x48, 0x2c, 0x4a, 0xcc, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x86, 0xca, 0xe8, 0xa5, 0xa4, 0x56, 0x48, 0x89, 0xa4, 0xe7, - 0xa7, 0xe7, 0x83, 0xc5, 0xf5, 0x41, 0x2c, 0x88, 0x12, 0x25, 0x6d, 0x2e, 0xb6, 0x00, 0xb0, 0x16, - 0x21, 0x69, 0x2e, 0xce, 0xb4, 0xd4, 0xd4, 0xf8, 0x92, 0xcc, 0xd4, 0xa2, 0x62, 0x09, 0x46, 0x05, - 0x66, 0x0d, 0x96, 0x20, 0x8e, 0xb4, 0xd4, 0xd4, 0x10, 0x10, 0xdf, 0x8a, 0x65, 0xc6, 0x02, 0x79, - 0x06, 0x27, 0x97, 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, 0x4a, 0xcf, - 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x87, 0x5a, 0xaa, 0x9b, 0x5f, 0x94, 0x0e, - 0x63, 0xeb, 0x57, 0x80, 0x1d, 0x57, 0x52, 0x59, 0x90, 0x5a, 0x9c, 0xc4, 0x06, 0xb6, 0xd9, 0x18, - 0x10, 0x00, 0x00, 0xff, 0xff, 0x6a, 0x44, 0xce, 0x46, 0xb8, 0x00, 0x00, 0x00, + 0xa7, 0xe7, 0x83, 0xc5, 0xf5, 0x41, 0x2c, 0x88, 0x12, 0xa5, 0xcb, 0x8c, 0x5c, 0x6c, 0x01, 0x60, + 0x3d, 0x42, 0xd2, 0x5c, 0x9c, 0x69, 0xa9, 0xa9, 0xf1, 0x25, 0x99, 0xa9, 0x45, 0xc5, 0x12, 0x8c, + 0x0a, 0xcc, 0x1a, 0x2c, 0x41, 0x1c, 0x69, 0xa9, 0xa9, 0x21, 0x20, 0xbe, 0xd0, 0x52, 0x46, 0x2e, + 0xd1, 0xdc, 0xc4, 0x8a, 0xf8, 0x92, 0xa2, 0xd2, 0xd4, 0xf8, 0x92, 0xc4, 0xec, 0xd4, 0xa2, 0xf8, + 0xe2, 0x82, 0xa2, 0xd4, 0xc4, 0x14, 0x09, 0x26, 0x05, 0x46, 0x0d, 0x4e, 0xa7, 0xa2, 0x13, 0xf7, + 0xe4, 0x19, 0x6e, 0xdd, 0x93, 0x37, 0x4c, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, + 0xd5, 0x87, 0xda, 0xae, 0x9b, 0x5f, 0x94, 0x0e, 0x63, 0xeb, 0x97, 0x96, 0x64, 0xe6, 0x14, 0xeb, + 0xe7, 0x26, 0x96, 0x64, 0xe8, 0x05, 0x14, 0xa5, 0x26, 0xbb, 0xa4, 0x26, 0xbf, 0xba, 0x27, 0x8f, + 0xdd, 0xe4, 0x4f, 0xf7, 0xe4, 0x65, 0x2a, 0x13, 0x73, 0x73, 0xac, 0x94, 0xb0, 0x4a, 0x2b, 0x05, + 0x09, 0xe5, 0x26, 0x56, 0x84, 0x14, 0x95, 0xa6, 0x86, 0x80, 0x44, 0x83, 0xc1, 0x82, 0x56, 0x2c, + 0x33, 0x16, 0xc8, 0x33, 0x38, 0xb9, 0x9c, 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, 0x16, 0x01, 0xf7, 0x55, 0x80, 0x43, 0xb1, 0xa4, 0xb2, 0x20, 0xb5, 0x38, 0x89, 0x0d, 0x1c, + 0x44, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe4, 0xa1, 0x2f, 0xd0, 0x61, 0x01, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { @@ -108,6 +116,16 @@ func (m *Params) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + { + size := m.MaxTrueTakerSpread.Size() + i -= size + if _, err := m.MaxTrueTakerSpread.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintParams(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 if len(m.FeeTiers) > 0 { dAtA2 := make([]byte, len(m.FeeTiers)*10) var j1 int @@ -153,6 +171,8 @@ func (m *Params) Size() (n int) { } n += 1 + sovParams(uint64(l)) + l } + l = m.MaxTrueTakerSpread.Size() + n += 1 + l + sovParams(uint64(l)) return n } @@ -267,6 +287,40 @@ func (m *Params) Unmarshal(dAtA []byte) error { } else { return fmt.Errorf("proto: wrong wireType = %d for field FeeTiers", wireType) } + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field MaxTrueTakerSpread", 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 + } + if err := m.MaxTrueTakerSpread.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipParams(dAtA[iNdEx:]) From 35a0950980c4dd8462df5c4b235f6158b3ebfeed Mon Sep 17 00:00:00 2001 From: Julian Compagni Portis Date: Mon, 13 Nov 2023 17:39:40 -0500 Subject: [PATCH 245/307] FIX: cleanup tests; make linter happy --- x/dex/keeper/liquidity_test.go | 37 +++++++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 10 deletions(-) diff --git a/x/dex/keeper/liquidity_test.go b/x/dex/keeper/liquidity_test.go index 03136fd10..265ffd5b7 100644 --- a/x/dex/keeper/liquidity_test.go +++ b/x/dex/keeper/liquidity_test.go @@ -46,11 +46,10 @@ func (s *DexTestSuite) TestSwapZeroInFailsLowTick() { s.addDeposit(NewDeposit(10000, 0, -20_000, 2)) // WHEN swap 7 tokenB - _, _, _, err := s.swap("TokenB", "TokenA", sdkmath.NewInt(7)) // THEN swap would give an InAmount and outAmount of 0 and fail // Floor(7 * 1.0001^-20,000) = 0 - s.ErrorIs(err, types.ErrSwapAmountTooSmall) + s.swapIntFails(types.ErrSwapAmountTooSmall, "TokenB", "TokenA", sdkmath.NewInt(7)) } func (s *DexTestSuite) TestSwapUnfairPriceFailsLowTick() { @@ -58,29 +57,27 @@ func (s *DexTestSuite) TestSwapUnfairPriceFailsLowTick() { s.addDeposit(NewDeposit(10000, 0, -20_000, 2)) // WHEN swap 8 tokenB - _, _, _, err := s.swap("TokenB", "TokenA", sdkmath.NewInt(8)) // THEN swap fails because maker is selling at an unfair true price // AmountOut = Floor(8 * 1.0001^-20,000) = 1 // AmountIn = Floor(1 * 1.0001^20000) = 7 // TruePrice = AmountOut/AmountIn = 1/7 = .142857 // BookPrice = 0.135348817 (thus maker is getting a price 5.5% worse than expected) - s.ErrorIs(err, types.ErrSwapAmountTooSmall) + s.swapIntFails(types.ErrSwapAmountTooSmall, "TokenB", "TokenA", sdkmath.NewInt(8)) } func (s *DexTestSuite) TestSwapUnfairPriceFailsHighTick() { // GIVEN liquidity tokenA at tick 159,680 s.addDeposit(NewDeposit(2000, 0, 159681, 1)) - // WHEN swap 8 tokenB - _, _, _, err := s.swap("TokenB", "TokenA", sdk.NewInt(200)) + // WHEN swap 200 tokenB // THEN swap fails because maker is selling at an unfair true price // AmountOut = Floor(200 * 1.0001^159,680) = 1,719,877,698 // AmountIn = Floor(1,719,877,697 * 1.0001^-159,680) = 199 // TruePrice = AmountOut/AmountIn = 1,719,877,698/199 = 8,642,601 // BookPrice = 8,599,388 (thus maker is getting a price .502% worse than expected) - s.ErrorIs(err, types.ErrSwapAmountTooSmall) + s.swapIntFails(types.ErrSwapAmountTooSmall, "TokenB", "TokenA", sdk.NewInt(200)) } func (s *DexTestSuite) TestSwapUnfairPriceAbortEarly() { @@ -91,7 +88,7 @@ func (s *DexTestSuite) TestSwapUnfairPriceAbortEarly() { ) // WHEN swap 700 BIgTokenB - tokenIn, tokenOut, orderFilled, err := s.swap("TokenB", "TokenA", sdk.NewInt(499)) + tokenIn, tokenOut, orderFilled, err := s.swapInt("TokenB", "TokenA", sdk.NewInt(499)) // THEN swap works on the first tick, but aborts on the second tick because of Unfair price condition s.NoError(err) @@ -643,7 +640,7 @@ func (s *DexTestSuite) placeGTCLimitOrder( s.App.DexKeeper.SaveTranche(s.Ctx, tranche) } -func (s *DexTestSuite) swap( +func (s *DexTestSuite) swapInt( tokenIn string, tokenOut string, maxAmountIn sdkmath.Int, @@ -659,12 +656,32 @@ func (s *DexTestSuite) swap( ) } +func (s *DexTestSuite) swapIntFails( + targetErr error, + tokenIn string, + tokenOut string, + maxAmountIn sdkmath.Int, +) { + tradePairID, err := types.NewTradePairID(tokenIn, tokenOut) + s.Assert().NoError(err) + coinIn, coinOut, _, err := s.App.DexKeeper.Swap( + s.Ctx, + tradePairID, + maxAmountIn, + nil, + nil, + ) + s.Assert().Equal(coinIn, sdk.Coin{}) + s.Assert().Equal(coinOut, sdk.Coin{}) + s.ErrorIs(err, targetErr) +} + func (s *DexTestSuite) swapSuccess( tokenIn string, tokenOut string, maxAmountIn int64, ) (coinIn, coinOut sdk.Coin) { - coinIn, coinOut, _, err := s.swap(tokenIn, tokenOut, sdk.NewInt(maxAmountIn).Mul(denomMultiple)) + coinIn, coinOut, _, err := s.swapInt(tokenIn, tokenOut, sdk.NewInt(maxAmountIn).Mul(denomMultiple)) s.Assert().NoError(err) return coinIn, coinOut } From 1ffecd060b4306212f5c6c011d80a80c0864ec31 Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Tue, 14 Nov 2023 14:58:16 +0200 Subject: [PATCH 246/307] bump pfm to the latest release --- app/app.go | 41 +++++++++++++++--------------- app/proposals_allowlisting.go | 3 +-- go.mod | 3 +-- go.sum | 5 ++-- tests/ibc/gmp_swap_forward_test.go | 2 +- tests/ibc/swap_forward_test.go | 2 +- x/ibcswap/ibc_middleware.go | 2 +- x/ibcswap/types/swap_test.go | 2 +- 8 files changed, 29 insertions(+), 31 deletions(-) diff --git a/app/app.go b/app/app.go index 668bc5629..beb826874 100644 --- a/app/app.go +++ b/app/app.go @@ -9,8 +9,7 @@ import ( "path/filepath" globalfeetypes "github.com/cosmos/gaia/v11/x/globalfee/types" - "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router" - + "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward" "github.com/cosmos/interchain-security/v3/testutil/integration" wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" @@ -147,8 +146,8 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" consensusparamkeeper "github.com/cosmos/cosmos-sdk/x/consensus/keeper" consensusparamtypes "github.com/cosmos/cosmos-sdk/x/consensus/types" - routerkeeper "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router/keeper" - routertypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router/types" + pfmkeeper "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/keeper" + pfmtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types" "github.com/neutron-org/neutron/x/dex" dexkeeper "github.com/neutron-org/neutron/x/dex/keeper" @@ -225,7 +224,7 @@ var ( ), ), ibchooks.AppModuleBasic{}, - router.AppModuleBasic{}, + packetforward.AppModuleBasic{}, auction.AppModuleBasic{}, globalfee.AppModule{}, dex.AppModuleBasic{}, @@ -310,11 +309,11 @@ type App struct { ConsumerKeeper ccvconsumerkeeper.Keeper TokenFactoryKeeper *tokenfactorykeeper.Keeper CronKeeper cronkeeper.Keeper - PFMKeeper *routerkeeper.Keeper + PFMKeeper *pfmkeeper.Keeper DexKeeper dexkeeper.Keeper SwapKeeper ibcswapkeeper.Keeper - RouterModule router.AppModule + PFMModule packetforward.AppModule HooksTransferIBCModule *ibchooks.IBCMiddleware HooksICS4Wrapper ibchooks.ICS4Middleware @@ -396,7 +395,7 @@ func New( evidencetypes.StoreKey, ibctransfertypes.StoreKey, icacontrollertypes.StoreKey, icahosttypes.StoreKey, capabilitytypes.StoreKey, interchainqueriesmoduletypes.StoreKey, contractmanagermoduletypes.StoreKey, interchaintxstypes.StoreKey, wasmtypes.StoreKey, feetypes.StoreKey, - feeburnertypes.StoreKey, adminmoduletypes.StoreKey, ccvconsumertypes.StoreKey, tokenfactorytypes.StoreKey, routertypes.StoreKey, + feeburnertypes.StoreKey, adminmoduletypes.StoreKey, ccvconsumertypes.StoreKey, tokenfactorytypes.StoreKey, pfmtypes.StoreKey, crontypes.StoreKey, ibchookstypes.StoreKey, consensusparamtypes.StoreKey, crisistypes.StoreKey, auctiontypes.StoreKey, dextypes.StoreKey, ) tkeys := sdk.NewTransientStoreKeys(paramstypes.TStoreKey) @@ -532,15 +531,15 @@ func New( feeBurnerModule := feeburner.NewAppModule(appCodec, *app.FeeBurnerKeeper) // PFMKeeper must be created before TransferKeeper - app.PFMKeeper = routerkeeper.NewKeeper( + app.PFMKeeper = pfmkeeper.NewKeeper( appCodec, - app.keys[routertypes.StoreKey], - app.GetSubspace(routertypes.ModuleName), + app.keys[pfmtypes.StoreKey], app.TransferKeeper.Keeper, 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.HooksICS4Wrapper = ibchooks.NewICS4Middleware( @@ -751,14 +750,14 @@ func New( contractManagerModule := contractmanager.NewAppModule(appCodec, app.ContractManagerKeeper) ibcHooksModule := ibchooks.NewAppModule(app.AccountKeeper) - app.RouterModule = router.NewAppModule(app.PFMKeeper) + app.PFMModule = packetforward.NewAppModule(app.PFMKeeper, app.GetSubspace(pfmtypes.ModuleName)) - var ibcStack ibcporttypes.IBCModule = router.NewIBCMiddleware( + var ibcStack ibcporttypes.IBCModule = packetforward.NewIBCMiddleware( app.HooksTransferIBCModule, app.PFMKeeper, 0, - routerkeeper.DefaultForwardTransferPacketTimeoutTimestamp, - routerkeeper.DefaultRefundTransferPacketTimeoutTimestamp, + pfmkeeper.DefaultForwardTransferPacketTimeoutTimestamp, + pfmkeeper.DefaultRefundTransferPacketTimeoutTimestamp, ) ibcStack = ibcswap.NewIBCMiddleware(ibcStack, app.SwapKeeper) @@ -799,7 +798,7 @@ func New( transferModule, consumerModule, icaModule, - app.RouterModule, + app.PFMModule, interchainQueriesModule, interchainTxsModule, feeModule, @@ -846,7 +845,7 @@ func New( feeburnertypes.ModuleName, adminmoduletypes.ModuleName, ibchookstypes.ModuleName, - routertypes.ModuleName, + pfmtypes.ModuleName, crontypes.ModuleName, globalfee.ModuleName, ibcswaptypes.ModuleName, @@ -879,7 +878,7 @@ func New( feeburnertypes.ModuleName, adminmoduletypes.ModuleName, ibchookstypes.ModuleName, - routertypes.ModuleName, + pfmtypes.ModuleName, crontypes.ModuleName, globalfee.ModuleName, ibcswaptypes.ModuleName, @@ -919,7 +918,7 @@ func New( feeburnertypes.ModuleName, adminmoduletypes.ModuleName, ibchookstypes.ModuleName, // after auth keeper - routertypes.ModuleName, + pfmtypes.ModuleName, crontypes.ModuleName, globalfee.ModuleName, ibcswaptypes.ModuleName, @@ -947,7 +946,7 @@ func New( transferModule, consumerModule, icaModule, - app.RouterModule, + app.PFMModule, interchainQueriesModule, interchainTxsModule, feeBurnerModule, @@ -1288,7 +1287,7 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino paramsKeeper.Subspace(icacontrollertypes.SubModuleName).WithKeyTable(icacontrollertypes.ParamKeyTable()) paramsKeeper.Subspace(icahosttypes.SubModuleName).WithKeyTable(icahosttypes.ParamKeyTable()) - paramsKeeper.Subspace(routertypes.ModuleName).WithKeyTable(routertypes.ParamKeyTable()) + paramsKeeper.Subspace(pfmtypes.ModuleName).WithKeyTable(pfmtypes.ParamKeyTable()) paramsKeeper.Subspace(globalfee.ModuleName).WithKeyTable(globalfeetypes.ParamKeyTable()) diff --git a/app/proposals_allowlisting.go b/app/proposals_allowlisting.go index 007a6d2cb..e0cb809ef 100644 --- a/app/proposals_allowlisting.go +++ b/app/proposals_allowlisting.go @@ -7,7 +7,6 @@ import ( "github.com/cosmos/cosmos-sdk/x/params/types/proposal" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" globalfeetypes "github.com/cosmos/gaia/v11/x/globalfee/types" - packetforwardmiddlewaretypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router/types" icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types" ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" @@ -105,5 +104,5 @@ var WhitelistedParams = map[paramChangeKey]struct{}{ // {Subspace: crontypes.ModuleName, Key: string(crontypes.KeySecurityAddress)}: {}, // {Subspace: crontypes.ModuleName, Key: string(crontypes.KeyLimit)}: {}, // packet-forward-middleware - {Subspace: packetforwardmiddlewaretypes.ModuleName, Key: string(packetforwardmiddlewaretypes.KeyFeePercentage)}: {}, + //{Subspace: packetforwardmiddlewaretypes.ModuleName, Key: string(packetforwardmiddlewaretypes.KeyFeePercentage)}: {}, } diff --git a/go.mod b/go.mod index ed4c0788d..7e8e05939 100644 --- a/go.mod +++ b/go.mod @@ -17,8 +17,7 @@ require ( github.com/cosmos/cosmos-sdk v0.47.5 github.com/cosmos/gaia/v11 v11.0.0-00010101000000-000000000000 github.com/cosmos/gogoproto v1.4.10 - // TEMP: Using this version to support duality swap-and-forward - github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.0-20230629164013-34f5e666f806 + github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.1.0 github.com/cosmos/ibc-go/v7 v7.3.1 github.com/cosmos/ics23/go v0.10.0 github.com/cosmos/interchain-security/v3 v3.1.0 diff --git a/go.sum b/go.sum index ac01e1a77..724451783 100644 --- a/go.sum +++ b/go.sum @@ -399,8 +399,8 @@ github.com/cosmos/gogoproto v1.4.10 h1:QH/yT8X+c0F4ZDacDv3z+xE3WU1P1Z3wQoLMBRJoK github.com/cosmos/gogoproto v1.4.10/go.mod h1:3aAZzeRWpAwr+SS/LLkICX2/kDFyaYVzckBDzygIxek= github.com/cosmos/iavl v0.20.1 h1:rM1kqeG3/HBT85vsZdoSNsehciqUQPWrR4BYmqE2+zg= github.com/cosmos/iavl v0.20.1/go.mod h1:WO7FyvaZJoH65+HFOsDir7xU9FWk2w9cHXNW1XHcl7A= -github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.0-20230629164013-34f5e666f806 h1:iFWb/KrnP5jthNZ23l72wqE8nzHJHzoVe22giUfJce8= -github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.0-20230629164013-34f5e666f806/go.mod h1:fctjEnz9xaBFOlmYYPdKL8Hs1Y3GUKilSwsJdqBb5QU= +github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.1.0 h1:v4JhwpC2Z+y0ECpLuxGgooSv+HZitmxlG+n/6xDmwHk= +github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.1.0/go.mod h1:W2/sU0MZ7tFh3irQuoGIWTIw0lWOS6GZCR8WY5OBUGE= github.com/cosmos/ibc-go/v7 v7.3.1 h1:bil1IjnHdyWDASFYKfwdRiNtFP6WK3osW7QFEAgU4I8= github.com/cosmos/ibc-go/v7 v7.3.1/go.mod h1:wvx4pPBofe5ZdMNV3OFRxSI4auEP5Qfqf8JXLLNV04g= github.com/cosmos/ics23/go v0.10.0 h1:iXqLLgp2Lp+EdpIuwXTYIQU+AiHj9mOC2X9ab++bZDM= @@ -1203,6 +1203,7 @@ go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= +go.uber.org/mock v0.2.0 h1:TaP3xedm7JaAgScZO7tlvlKrqT0p7I6OsdGB5YNSMDU= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= diff --git a/tests/ibc/gmp_swap_forward_test.go b/tests/ibc/gmp_swap_forward_test.go index bc188d290..b35866c44 100644 --- a/tests/ibc/gmp_swap_forward_test.go +++ b/tests/ibc/gmp_swap_forward_test.go @@ -5,7 +5,7 @@ import ( "time" "cosmossdk.io/math" - forwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router/types" + forwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types" transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" "github.com/neutron-org/neutron/x/dex/types" diff --git a/tests/ibc/swap_forward_test.go b/tests/ibc/swap_forward_test.go index 33d382bd6..9f177a834 100644 --- a/tests/ibc/swap_forward_test.go +++ b/tests/ibc/swap_forward_test.go @@ -5,7 +5,7 @@ import ( "time" "cosmossdk.io/math" - forwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router/types" + forwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types" transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" "github.com/iancoleman/orderedmap" "golang.org/x/exp/maps" diff --git a/x/ibcswap/ibc_middleware.go b/x/ibcswap/ibc_middleware.go index c5ceccc8d..3829378ec 100644 --- a/x/ibcswap/ibc_middleware.go +++ b/x/ibcswap/ibc_middleware.go @@ -9,7 +9,7 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" - forwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router/types" + forwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types" transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" diff --git a/x/ibcswap/types/swap_test.go b/x/ibcswap/types/swap_test.go index 87f7107d8..c4f4c468f 100644 --- a/x/ibcswap/types/swap_test.go +++ b/x/ibcswap/types/swap_test.go @@ -5,7 +5,7 @@ import ( "testing" "cosmossdk.io/math" - forwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router/types" + forwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types" "github.com/iancoleman/orderedmap" "github.com/stretchr/testify/require" From 8a7a960196257940645824b1e47a8cea787d3d45 Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Tue, 14 Nov 2023 15:12:26 +0200 Subject: [PATCH 247/307] update whitelisted msgs --- app/proposals_allowlisting.go | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/app/proposals_allowlisting.go b/app/proposals_allowlisting.go index 064d3d3d3..12c6249e0 100644 --- a/app/proposals_allowlisting.go +++ b/app/proposals_allowlisting.go @@ -3,7 +3,11 @@ package app import ( wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" sdk "github.com/cosmos/cosmos-sdk/types" + authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" + banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" + crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" + minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" "github.com/cosmos/cosmos-sdk/x/params/types/proposal" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" globalfeetypes "github.com/cosmos/gaia/v11/x/globalfee/types" @@ -61,7 +65,11 @@ func isSdkMessageWhitelisted(msg sdk.Msg) bool { *feeburnertypes.MsgUpdateParams, *feerefundertypes.MsgUpdateParams, *crontypes.MsgUpdateParams, - *contractmanagertypes.MsgUpdateParams: + *contractmanagertypes.MsgUpdateParams, + *banktypes.MsgUpdateParams, + *crisistypes.MsgUpdateParams, + *minttypes.MsgUpdateParams, + *authtypes.MsgUpdateParams: return true } return false @@ -78,30 +86,10 @@ var WhitelistedParams = map[paramChangeKey]struct{}{ // ica {Subspace: icahosttypes.SubModuleName, Key: string(icahosttypes.KeyHostEnabled)}: {}, {Subspace: icahosttypes.SubModuleName, Key: string(icahosttypes.KeyAllowMessages)}: {}, - // cosmwasm - // {Subspace: wasmtypes.ModuleName, Key: string(wasmtypes.ParamStoreKeyUploadAccess)}: {}, - // {Subspace: wasmtypes.ModuleName, Key: string(wasmtypes.ParamStoreKeyInstantiateAccess)}: {}, - // feerefunder - // {Subspace: feerefundertypes.ModuleName, Key: string(feerefundertypes.KeyFees)}: {}, - // interchaintxs - // {Subspace: interchaintxstypes.ModuleName, Key: string(interchaintxstypes.KeyMsgSubmitTxMaxMessages)}: {}, - // interchainqueries - // {Subspace: interchainqueriestypes.ModuleName, Key: string(interchainqueriestypes.KeyQuerySubmitTimeout)}: {}, - // {Subspace: interchainqueriestypes.ModuleName, Key: string(interchainqueriestypes.KeyQueryDeposit)}: {}, - // {Subspace: interchainqueriestypes.ModuleName, Key: string(interchainqueriestypes.KeyTxQueryRemovalLimit)}: {}, - // feeburner - // {Subspace: feeburnertypes.ModuleName, Key: string(feeburnertypes.KeyTreasuryAddress)}: {}, - // {Subspace: feeburnertypes.ModuleName, Key: string(feeburnertypes.KeyNeutronDenom)}: {}, - // tokenfactory - // {Subspace: tokenfactorytypes.ModuleName, Key: string(tokenfactorytypes.KeyDenomCreationFee)}: {}, - // {Subspace: tokenfactorytypes.ModuleName, Key: string(tokenfactorytypes.KeyFeeCollectorAddress)}: {}, // globalfee {Subspace: globalfeetypes.ModuleName, Key: string(globalfeetypes.ParamStoreKeyMinGasPrices)}: {}, {Subspace: globalfeetypes.ModuleName, Key: string(globalfeetypes.ParamStoreKeyBypassMinFeeMsgTypes)}: {}, {Subspace: globalfeetypes.ModuleName, Key: string(globalfeetypes.ParamStoreKeyMaxTotalBypassMinFeeMsgGasUsage)}: {}, - // cron - // {Subspace: crontypes.ModuleName, Key: string(crontypes.KeySecurityAddress)}: {}, - // {Subspace: crontypes.ModuleName, Key: string(crontypes.KeyLimit)}: {}, // packet-forward-middleware {Subspace: packetforwardmiddlewaretypes.ModuleName, Key: string(packetforwardmiddlewaretypes.KeyFeePercentage)}: {}, } From 9d5147510a4949873232ee82477ee4775ce0e1a0 Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Tue, 14 Nov 2023 15:14:15 +0200 Subject: [PATCH 248/307] fmt --- app/proposals_allowlisting.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/proposals_allowlisting.go b/app/proposals_allowlisting.go index e0cb809ef..3a00c7391 100644 --- a/app/proposals_allowlisting.go +++ b/app/proposals_allowlisting.go @@ -104,5 +104,5 @@ var WhitelistedParams = map[paramChangeKey]struct{}{ // {Subspace: crontypes.ModuleName, Key: string(crontypes.KeySecurityAddress)}: {}, // {Subspace: crontypes.ModuleName, Key: string(crontypes.KeyLimit)}: {}, // packet-forward-middleware - //{Subspace: packetforwardmiddlewaretypes.ModuleName, Key: string(packetforwardmiddlewaretypes.KeyFeePercentage)}: {}, + // {Subspace: packetforwardmiddlewaretypes.ModuleName, Key: string(packetforwardmiddlewaretypes.KeyFeePercentage)}: {}, } From 566045ee1ef2f857fd990affb95a543ba5f1e55b Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Tue, 14 Nov 2023 15:20:47 +0200 Subject: [PATCH 249/307] proper upgrade name --- app/app.go | 4 ++-- app/upgrades/{nextupgrade => v1.1.0}/constants.go | 7 ++++--- .../testdata/neutron_interchain_txs.wasm | Bin app/upgrades/{nextupgrade => v1.1.0}/upgrades.go | 3 ++- .../{nextupgrade => v1.1.0}/upgrades_test.go | 12 ++++++------ wasmbinding/message_plugin.go | 2 +- 6 files changed, 15 insertions(+), 13 deletions(-) rename app/upgrades/{nextupgrade => v1.1.0}/constants.go (93%) rename app/upgrades/{nextupgrade => v1.1.0}/testdata/neutron_interchain_txs.wasm (100%) rename app/upgrades/{nextupgrade => v1.1.0}/upgrades.go (99%) rename app/upgrades/{nextupgrade => v1.1.0}/upgrades_test.go (97%) diff --git a/app/app.go b/app/app.go index 1bdd4b5c5..0e59a76f2 100644 --- a/app/app.go +++ b/app/app.go @@ -22,8 +22,8 @@ import ( "github.com/neutron-org/neutron/docs" "github.com/neutron-org/neutron/app/upgrades" - "github.com/neutron-org/neutron/app/upgrades/nextupgrade" v044 "github.com/neutron-org/neutron/app/upgrades/v0.4.4" + "github.com/neutron-org/neutron/app/upgrades/v1.1.0" v3 "github.com/neutron-org/neutron/app/upgrades/v3" "github.com/neutron-org/neutron/x/cron" @@ -169,7 +169,7 @@ const ( ) var ( - Upgrades = []upgrades.Upgrade{v3.Upgrade, v044.Upgrade, nextupgrade.Upgrade} + Upgrades = []upgrades.Upgrade{v3.Upgrade, v044.Upgrade, v1_1_0.Upgrade} // DefaultNodeHome default home directories for the application daemon DefaultNodeHome string diff --git a/app/upgrades/nextupgrade/constants.go b/app/upgrades/v1.1.0/constants.go similarity index 93% rename from app/upgrades/nextupgrade/constants.go rename to app/upgrades/v1.1.0/constants.go index c6e0a35c9..463632392 100644 --- a/app/upgrades/nextupgrade/constants.go +++ b/app/upgrades/v1.1.0/constants.go @@ -1,16 +1,17 @@ -package nextupgrade +package v1_1_0 import ( "github.com/cosmos/cosmos-sdk/store/types" consensusparamtypes "github.com/cosmos/cosmos-sdk/x/consensus/types" crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types" - "github.com/neutron-org/neutron/app/upgrades" auctiontypes "github.com/skip-mev/block-sdk/x/auction/types" + + "github.com/neutron-org/neutron/app/upgrades" ) const ( // UpgradeName defines the on-chain upgrade name. - UpgradeName = "Next-Upgrade" + UpgradeName = "v1.1.0" AtomDenom = "ibc/C4CFF46FD6DE35CA4CF4CE031E643C8FDC9BA4B99AE598E9B0ED98FE3A2319F9" AxelarUsdcDenom = "ibc/F082B65C88E4B6D5EF1DB243CDA1D331D002759E938A0F5CD3FFDC5D53B3E349" ) diff --git a/app/upgrades/nextupgrade/testdata/neutron_interchain_txs.wasm b/app/upgrades/v1.1.0/testdata/neutron_interchain_txs.wasm similarity index 100% rename from app/upgrades/nextupgrade/testdata/neutron_interchain_txs.wasm rename to app/upgrades/v1.1.0/testdata/neutron_interchain_txs.wasm diff --git a/app/upgrades/nextupgrade/upgrades.go b/app/upgrades/v1.1.0/upgrades.go similarity index 99% rename from app/upgrades/nextupgrade/upgrades.go rename to app/upgrades/v1.1.0/upgrades.go index 79b3b7aaf..466db88f2 100644 --- a/app/upgrades/nextupgrade/upgrades.go +++ b/app/upgrades/v1.1.0/upgrades.go @@ -1,4 +1,4 @@ -package nextupgrade +package v1_1_0 import ( "fmt" @@ -7,6 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/baseapp" consensuskeeper "github.com/cosmos/cosmos-sdk/x/consensus/keeper" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" + "github.com/neutron-org/neutron/app/params" "cosmossdk.io/math" diff --git a/app/upgrades/nextupgrade/upgrades_test.go b/app/upgrades/v1.1.0/upgrades_test.go similarity index 97% rename from app/upgrades/nextupgrade/upgrades_test.go rename to app/upgrades/v1.1.0/upgrades_test.go index bd4180a9c..86785dac6 100644 --- a/app/upgrades/nextupgrade/upgrades_test.go +++ b/app/upgrades/v1.1.0/upgrades_test.go @@ -1,4 +1,4 @@ -package nextupgrade_test +package v1_1_0_test import ( "testing" @@ -24,7 +24,7 @@ import ( globalfeetypes "github.com/cosmos/gaia/v11/x/globalfee/types" "github.com/stretchr/testify/suite" - "github.com/neutron-org/neutron/app/upgrades/nextupgrade" + "github.com/neutron-org/neutron/app/upgrades/v1.1.0" "github.com/neutron-org/neutron/testutil" ) @@ -80,7 +80,7 @@ func (suite *UpgradeTestSuite) TestGlobalFeesUpgrade() { suite.Require().True(globalFeeSubspace.Has(ctx, globalfeetypes.ParamStoreKeyMaxTotalBypassMinFeeMsgGasUsage)) upgrade := upgradetypes.Plan{ - Name: nextupgrade.UpgradeName, + Name: v1_1_0.UpgradeName, Info: "some text here", Height: 100, } @@ -126,7 +126,7 @@ func (suite *UpgradeTestSuite) TestRewardDenomsUpgrade() { suite.Require().Equal(denomsBefore, []string{params.DefaultDenom}) upgrade := upgradetypes.Plan{ - Name: nextupgrade.UpgradeName, + Name: v1_1_0.UpgradeName, Info: "some text here", Height: 100, } @@ -154,7 +154,7 @@ func (suite *UpgradeTestSuite) TestAdminModuleUpgrade() { suite.Require().Error(err) upgrade := upgradetypes.Plan{ - Name: nextupgrade.UpgradeName, + Name: v1_1_0.UpgradeName, Info: "some text here", Height: 100, } @@ -178,7 +178,7 @@ func (suite *UpgradeTestSuite) TestRegisterInterchainAccountCreationFee() { contractAddressBeforeUpgrade := suite.InstantiateTestContract(ctx, sdk.AccAddress("neutron1_ica"), codeIDBefore) upgrade := upgradetypes.Plan{ - Name: nextupgrade.UpgradeName, + Name: v1_1_0.UpgradeName, Info: "some text here", Height: 100, } diff --git a/wasmbinding/message_plugin.go b/wasmbinding/message_plugin.go index 09aac1336..808015814 100644 --- a/wasmbinding/message_plugin.go +++ b/wasmbinding/message_plugin.go @@ -315,7 +315,7 @@ func (m *CustomMessenger) submitAdminProposal(ctx sdk.Context, contractAddr sdk. if err != nil { return nil, nil, errors.Wrap(err, "invalid proposal quantity") } - // here we handle pre-nextupgrade style of proposals: param change, upgrade, client update + // here we handle pre-v1.1.0 style of proposals: param change, upgrade, client update if m.isLegacyProposal(adminProposal) { resp, err := m.performSubmitAdminProposalLegacy(ctx, contractAddr, adminProposal) if err != nil { From 92bd291ba48f7770452c99a0a490f4bb0256b572 Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Tue, 14 Nov 2023 15:26:51 +0200 Subject: [PATCH 250/307] rename package --- app/app.go | 4 ++-- app/upgrades/v1.1.0/constants.go | 2 +- app/upgrades/v1.1.0/upgrades.go | 2 +- app/upgrades/v1.1.0/upgrades_test.go | 12 ++++++------ 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/app.go b/app/app.go index 0e59a76f2..590d37529 100644 --- a/app/app.go +++ b/app/app.go @@ -23,7 +23,7 @@ import ( "github.com/neutron-org/neutron/app/upgrades" v044 "github.com/neutron-org/neutron/app/upgrades/v0.4.4" - "github.com/neutron-org/neutron/app/upgrades/v1.1.0" + v110 "github.com/neutron-org/neutron/app/upgrades/v1.1.0" v3 "github.com/neutron-org/neutron/app/upgrades/v3" "github.com/neutron-org/neutron/x/cron" @@ -169,7 +169,7 @@ const ( ) var ( - Upgrades = []upgrades.Upgrade{v3.Upgrade, v044.Upgrade, v1_1_0.Upgrade} + Upgrades = []upgrades.Upgrade{v3.Upgrade, v044.Upgrade, v110.Upgrade} // DefaultNodeHome default home directories for the application daemon DefaultNodeHome string diff --git a/app/upgrades/v1.1.0/constants.go b/app/upgrades/v1.1.0/constants.go index 463632392..8fc8e6d94 100644 --- a/app/upgrades/v1.1.0/constants.go +++ b/app/upgrades/v1.1.0/constants.go @@ -1,4 +1,4 @@ -package v1_1_0 +package v110 import ( "github.com/cosmos/cosmos-sdk/store/types" diff --git a/app/upgrades/v1.1.0/upgrades.go b/app/upgrades/v1.1.0/upgrades.go index 466db88f2..a5d24d776 100644 --- a/app/upgrades/v1.1.0/upgrades.go +++ b/app/upgrades/v1.1.0/upgrades.go @@ -1,4 +1,4 @@ -package v1_1_0 +package v110 import ( "fmt" diff --git a/app/upgrades/v1.1.0/upgrades_test.go b/app/upgrades/v1.1.0/upgrades_test.go index 86785dac6..114663527 100644 --- a/app/upgrades/v1.1.0/upgrades_test.go +++ b/app/upgrades/v1.1.0/upgrades_test.go @@ -1,4 +1,4 @@ -package v1_1_0_test +package v110_test import ( "testing" @@ -24,7 +24,7 @@ import ( globalfeetypes "github.com/cosmos/gaia/v11/x/globalfee/types" "github.com/stretchr/testify/suite" - "github.com/neutron-org/neutron/app/upgrades/v1.1.0" + v110 "github.com/neutron-org/neutron/app/upgrades/v1.1.0" "github.com/neutron-org/neutron/testutil" ) @@ -80,7 +80,7 @@ func (suite *UpgradeTestSuite) TestGlobalFeesUpgrade() { suite.Require().True(globalFeeSubspace.Has(ctx, globalfeetypes.ParamStoreKeyMaxTotalBypassMinFeeMsgGasUsage)) upgrade := upgradetypes.Plan{ - Name: v1_1_0.UpgradeName, + Name: v110.UpgradeName, Info: "some text here", Height: 100, } @@ -126,7 +126,7 @@ func (suite *UpgradeTestSuite) TestRewardDenomsUpgrade() { suite.Require().Equal(denomsBefore, []string{params.DefaultDenom}) upgrade := upgradetypes.Plan{ - Name: v1_1_0.UpgradeName, + Name: v110.UpgradeName, Info: "some text here", Height: 100, } @@ -154,7 +154,7 @@ func (suite *UpgradeTestSuite) TestAdminModuleUpgrade() { suite.Require().Error(err) upgrade := upgradetypes.Plan{ - Name: v1_1_0.UpgradeName, + Name: v110.UpgradeName, Info: "some text here", Height: 100, } @@ -178,7 +178,7 @@ func (suite *UpgradeTestSuite) TestRegisterInterchainAccountCreationFee() { contractAddressBeforeUpgrade := suite.InstantiateTestContract(ctx, sdk.AccAddress("neutron1_ica"), codeIDBefore) upgrade := upgradetypes.Plan{ - Name: v1_1_0.UpgradeName, + Name: v110.UpgradeName, Info: "some text here", Height: 100, } From c248b083aa2f046702a67b140ec375e19716d739 Mon Sep 17 00:00:00 2001 From: Julian Compagni Portis Date: Tue, 14 Nov 2023 09:13:25 -0500 Subject: [PATCH 251/307] Update to pfm v7.1.0 --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 52c19731c..de7366582 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/cosmos/cosmos-sdk v0.47.5 github.com/cosmos/gaia/v11 v11.0.0-00010101000000-000000000000 github.com/cosmos/gogoproto v1.4.10 - github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.2-0.20231103132047-e5a274cf6fc2 + github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.1.0 github.com/cosmos/ibc-go/v7 v7.3.1 github.com/cosmos/ics23/go v0.10.0 github.com/cosmos/interchain-security/v3 v3.1.0 From e1505680265f94b52b3e2289da0362c32e958440 Mon Sep 17 00:00:00 2001 From: Julian Compagni Portis Date: Tue, 14 Nov 2023 11:27:52 -0500 Subject: [PATCH 252/307] Fix test logic to account for PFM changes --- tests/ibc/gmp_swap_forward_test.go | 9 +++++---- tests/ibc/swap_forward_test.go | 12 +++++++----- tests/ibc/swap_test.go | 3 ++- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/tests/ibc/gmp_swap_forward_test.go b/tests/ibc/gmp_swap_forward_test.go index ba0c4f5d6..652e4f211 100644 --- a/tests/ibc/gmp_swap_forward_test.go +++ b/tests/ibc/gmp_swap_forward_test.go @@ -99,10 +99,11 @@ func (s *IBCTestSuite) TestGMPSwapAndForward_Success() { // Check that the funds are moved out of the acc on providerChain s.assertProviderBalance(s.providerAddr, nativeDenom, newProviderBalNative.Sub(ibcTransferAmount)) - // Check that the amountIn is deducted from the neutron account - s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, math.OneInt()) - // Check that neutron account did not keep any of the transfer denom - s.assertNeutronBalance(s.neutronAddr, nativeDenom, genesisWalletAmount.Sub(swapAmount)) + // Check that the amountIn is deducted from the neutron override account + overrideAddr := s.ReceiverOverrideAddr(s.neutronTransferPath.EndpointA.ChannelID, s.providerAddr.String()) + s.assertNeutronBalance(overrideAddr, s.providerToNeutronDenom, math.OneInt()) + // Check that neutron override account did not keep any of the transfer denom + s.assertNeutronBalance(overrideAddr, nativeDenom, math.ZeroInt()) transferDenomPath := transfertypes.GetPrefixedDenom( transfertypes.PortID, diff --git a/tests/ibc/swap_forward_test.go b/tests/ibc/swap_forward_test.go index 110d0e54b..070378e10 100644 --- a/tests/ibc/swap_forward_test.go +++ b/tests/ibc/swap_forward_test.go @@ -109,10 +109,11 @@ func (s *IBCTestSuite) TestSwapAndForward_Success() { newProviderBalNative.Sub(ibcTransferAmount), ) - // Check that the amountIn is deducted from the neutron account - s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, math.OneInt()) + // Check that the amountIn is deducted from the neutron overrid receiver account + overrideAddr := s.ReceiverOverrideAddr(s.neutronTransferPath.EndpointA.ChannelID, s.providerAddr.String()) + s.assertNeutronBalance(overrideAddr, s.providerToNeutronDenom, math.OneInt()) // Check that neutron account did not keep any of the transfer denom - s.assertNeutronBalance(s.neutronAddr, nativeDenom, genesisWalletAmount.Sub(swapAmount)) + s.assertNeutronBalance(overrideAddr, nativeDenom, math.ZeroInt()) transferDenomPath := transfertypes.GetPrefixedDenom( transfertypes.PortID, @@ -366,8 +367,9 @@ func (s *IBCTestSuite) TestSwapAndForward_UnwindIBCDenomSuccess() { s.Assert().NoError(err) s.coordinator.CommitBlock(s.neutronChain) - // Check that the amountIn is deducted from the neutron account - s.assertNeutronBalance(s.neutronAddr, nativeDenom, postDepositNeutronBalNative.Sub(swapAmount).Add(math.OneInt())) + // Check that the amountIn is deducted from the neutron override receiever account + overrideAddr := s.ReceiverOverrideAddr(s.neutronTransferPath.EndpointA.ChannelID, s.providerAddr.String()) + s.assertNeutronBalance(overrideAddr, nativeDenom, math.OneInt()) // Check that the funds are now present on the provider chainer s.assertProviderBalance( s.providerAddr, diff --git a/tests/ibc/swap_test.go b/tests/ibc/swap_test.go index ae3f54d13..44e4c2be4 100644 --- a/tests/ibc/swap_test.go +++ b/tests/ibc/swap_test.go @@ -83,7 +83,8 @@ func (s *IBCTestSuite) TestIBCSwapMiddleware_Success() { s.assertNeutronBalance(s.neutronAddr, nativeDenom, postDepositNeutronBalNative.Add(expectedOut)) // Check that all of the IBC transfer denom have been used up - s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, math.OneInt()) + overrideAddr := s.ReceiverOverrideAddr(s.neutronTransferPath.EndpointA.ChannelID, s.providerAddr.String()) + s.assertNeutronBalance(overrideAddr, s.providerToNeutronDenom, math.OneInt()) } // TestIBCSwapMiddleware_FailRefund asserts that the IBC swap middleware works as intended with Neutron running as a From 012034fd5c953882da0e71eed492735f93f1f3c3 Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Wed, 15 Nov 2023 12:53:02 +0200 Subject: [PATCH 253/307] update admin-module version --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 4554067b1..16ba65528 100644 --- a/go.mod +++ b/go.mod @@ -191,7 +191,7 @@ replace ( github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0 github.com/ChainSafe/go-schnorrkel => github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d github.com/CosmWasm/wasmd => github.com/neutron-org/wasmd v0.43.0 - github.com/cosmos/admin-module => github.com/neutron-org/admin-module v0.0.0-20231102080303-b3efc44ef5d9 + github.com/cosmos/admin-module => github.com/neutron-org/admin-module v1.0.0 github.com/cosmos/cosmos-sdk => github.com/neutron-org/cosmos-sdk v0.47.5 github.com/cosmos/gaia/v11 => github.com/cosmos/gaia/v11 v11.0.0-20230724152830-861ba391c3b4 github.com/cosmos/ledger-cosmos-go => github.com/cosmos/ledger-cosmos-go v0.12.1 diff --git a/go.sum b/go.sum index bb93f181f..c8e1b5c21 100644 --- a/go.sum +++ b/go.sum @@ -934,8 +934,8 @@ github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxzi github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/neilotoole/errgroup v0.1.6/go.mod h1:Q2nLGf+594h0CLBs/Mbg6qOr7GtqDK7C2S41udRnToE= -github.com/neutron-org/admin-module v0.0.0-20231102080303-b3efc44ef5d9 h1:46M72zk3g8Uff2i3Fl0Nl/vE/QVL2Fv+jfwqCYI2Ki0= -github.com/neutron-org/admin-module v0.0.0-20231102080303-b3efc44ef5d9/go.mod h1:INknneN2W3Fr9Eld7SpfLRdjyHR1muzFbbqXln1ixic= +github.com/neutron-org/admin-module v1.0.0 h1:mmX5U6jz4rX+lk8SB5Bx0Lsugu9bh4PCREMnVkLQoIs= +github.com/neutron-org/admin-module v1.0.0/go.mod h1:INknneN2W3Fr9Eld7SpfLRdjyHR1muzFbbqXln1ixic= github.com/neutron-org/cosmos-sdk v0.47.5 h1:BUBqUPI5I8rF9ql3RfSCo9XkpZBJPhTZSIWexyxutA4= github.com/neutron-org/cosmos-sdk v0.47.5/go.mod h1:3uZbdGpMOT5usEich5wHANLxz0VbKE9lL1PUq+rzkS4= github.com/neutron-org/wasmd v0.43.0 h1:aXzN9diVRAKTs2+EdK4zoTOmNCjjr8vpAhIq8VbBUJc= From a13d3c13584a2f14b9ab2a9b5621e4f6ae4c960b Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Wed, 15 Nov 2023 18:06:08 +0200 Subject: [PATCH 254/307] proper tokenfactory params update --- app/upgrades/v1.1.0/upgrades.go | 1 + app/upgrades/v1.1.0/upgrades_test.go | 36 ++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/app/upgrades/v1.1.0/upgrades.go b/app/upgrades/v1.1.0/upgrades.go index 986e79527..c696599e0 100644 --- a/app/upgrades/v1.1.0/upgrades.go +++ b/app/upgrades/v1.1.0/upgrades.go @@ -188,6 +188,7 @@ func migrateTokenFactoryParams(ctx sdk.Context, paramsKeepers paramskeeper.Keepe var currParams tokenfactorytypes.Params subspace, _ := paramsKeepers.GetSubspace(tokenfactorytypes.StoreKey) subspace.Set(ctx, tokenfactorytypes.KeyDenomCreationGasConsume, uint64(0)) + subspace.Set(ctx, tokenfactorytypes.KeyDenomCreationFee, sdk.NewCoins()) subspace.GetParamSet(ctx, &currParams) if err := currParams.Validate(); err != nil { diff --git a/app/upgrades/v1.1.0/upgrades_test.go b/app/upgrades/v1.1.0/upgrades_test.go index 2af99a9bb..2507cdcb6 100644 --- a/app/upgrades/v1.1.0/upgrades_test.go +++ b/app/upgrades/v1.1.0/upgrades_test.go @@ -165,6 +165,42 @@ func (suite *UpgradeTestSuite) TestAdminModuleUpgrade() { suite.Require().Equal(uint64(1), id) } +func (suite *UpgradeTestSuite) TestTokenFactoryUpgrade() { + var ( + app = suite.GetNeutronZoneApp(suite.ChainA) + tokenFactorySubspace = app.GetSubspace(tokenfactorytypes.ModuleName) + ctx = suite.ChainA.GetContext() + ) + + var denomGasBefore uint64 + tokenFactorySubspace.Get(ctx, tokenfactorytypes.KeyDenomCreationGasConsume, &denomGasBefore) + suite.Require().Equal(denomGasBefore, uint64(0)) + + // emulate mainnet state + tokenFactorySubspace.Set(ctx, tokenfactorytypes.KeyDenomCreationFee, sdk.NewCoins(sdk.NewCoin(params.DefaultDenom, sdk.NewInt(100_000_000)))) + + var denomFeeBefore sdk.Coins + tokenFactorySubspace.Get(ctx, tokenfactorytypes.KeyDenomCreationFee, &denomFeeBefore) + suite.Require().Equal(denomFeeBefore, sdk.NewCoins(sdk.NewCoin(params.DefaultDenom, sdk.NewInt(100_000_000)))) + + upgrade := upgradetypes.Plan{ + Name: v110.UpgradeName, + Info: "some text here", + Height: 100, + } + app.UpgradeKeeper.ApplyUpgrade(ctx, upgrade) + + var denomGas uint64 + tokenFactorySubspace.Get(ctx, tokenfactorytypes.KeyDenomCreationGasConsume, &denomGas) + requiredGasDenom := uint64(0) + suite.Require().Equal(requiredGasDenom, denomGas) + + var denomFee sdk.Coins + tokenFactorySubspace.Get(ctx, tokenfactorytypes.KeyDenomCreationFee, &denomFee) + requiredFeeDenom := sdk.NewCoins() + suite.Require().Equal(len(requiredFeeDenom), len(denomFee)) +} + func (suite *UpgradeTestSuite) TestRegisterInterchainAccountCreationFee() { var ( app = suite.GetNeutronZoneApp(suite.ChainA) From e94fe0580134f9e5192c0dc0714d2b4ba18ce37a Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Thu, 16 Nov 2023 00:06:23 +0200 Subject: [PATCH 255/307] bump pfm to 7.1.1 --- app/app.go | 4 ++-- app/proposals_allowlisting.go | 3 +-- go.mod | 2 +- go.sum | 4 ++-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/app/app.go b/app/app.go index d53280128..ae75a88b9 100644 --- a/app/app.go +++ b/app/app.go @@ -519,12 +519,12 @@ func New( app.RouterKeeper = pfmkeeper.NewKeeper( appCodec, app.keys[pfmtypes.StoreKey], - app.GetSubspace(pfmtypes.ModuleName), app.TransferKeeper.Keeper, 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.HooksICS4Wrapper = ibchooks.NewICS4Middleware( @@ -716,7 +716,7 @@ func New( contractManagerModule := contractmanager.NewAppModule(appCodec, app.ContractManagerKeeper) ibcHooksModule := ibchooks.NewAppModule(app.AccountKeeper) - app.RouterModule = packetforward.NewAppModule(app.RouterKeeper) + app.RouterModule = packetforward.NewAppModule(app.RouterKeeper, app.GetSubspace(pfmtypes.ModuleName)) ibcStack := packetforward.NewIBCMiddleware( app.HooksTransferIBCModule, diff --git a/app/proposals_allowlisting.go b/app/proposals_allowlisting.go index 064d3d3d3..96b155ce3 100644 --- a/app/proposals_allowlisting.go +++ b/app/proposals_allowlisting.go @@ -7,7 +7,6 @@ import ( "github.com/cosmos/cosmos-sdk/x/params/types/proposal" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" globalfeetypes "github.com/cosmos/gaia/v11/x/globalfee/types" - packetforwardmiddlewaretypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types" icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types" ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" @@ -103,5 +102,5 @@ var WhitelistedParams = map[paramChangeKey]struct{}{ // {Subspace: crontypes.ModuleName, Key: string(crontypes.KeySecurityAddress)}: {}, // {Subspace: crontypes.ModuleName, Key: string(crontypes.KeyLimit)}: {}, // packet-forward-middleware - {Subspace: packetforwardmiddlewaretypes.ModuleName, Key: string(packetforwardmiddlewaretypes.KeyFeePercentage)}: {}, + //{Subspace: packetforwardmiddlewaretypes.ModuleName, Key: string(packetforwardmiddlewaretypes.KeyFeePercentage)}: {}, } diff --git a/go.mod b/go.mod index 16ba65528..ed457d3f1 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/cosmos/cosmos-sdk v0.47.5 github.com/cosmos/gaia/v11 v11.0.0-00010101000000-000000000000 github.com/cosmos/gogoproto v1.4.10 - github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.1 + github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.1.1 github.com/cosmos/ibc-go/v7 v7.3.1 github.com/cosmos/ics23/go v0.10.0 github.com/cosmos/interchain-security/v3 v3.1.0 diff --git a/go.sum b/go.sum index c8e1b5c21..626d4a95e 100644 --- a/go.sum +++ b/go.sum @@ -399,8 +399,8 @@ github.com/cosmos/gogoproto v1.4.10 h1:QH/yT8X+c0F4ZDacDv3z+xE3WU1P1Z3wQoLMBRJoK github.com/cosmos/gogoproto v1.4.10/go.mod h1:3aAZzeRWpAwr+SS/LLkICX2/kDFyaYVzckBDzygIxek= github.com/cosmos/iavl v0.20.1 h1:rM1kqeG3/HBT85vsZdoSNsehciqUQPWrR4BYmqE2+zg= github.com/cosmos/iavl v0.20.1/go.mod h1:WO7FyvaZJoH65+HFOsDir7xU9FWk2w9cHXNW1XHcl7A= -github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.1 h1:8mK4Ha/56P6jkRcLhIYhg/ipWhEuXBtj5O4I6fAi6vg= -github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.1/go.mod h1:GGUJN4LnB3J1Luu4kxTklQLbW69So3QXUndSalB003s= +github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.1.1 h1:PqIK9vTr6zxCdQmrDZwxwL4KMAqg/GRGsiMEiaMP4wA= +github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.1.1/go.mod h1:UvDmcGIWJPIytq+Q78/ff5NTOsuX/7IrNgEugTW5i0s= github.com/cosmos/ibc-go/v7 v7.3.1 h1:bil1IjnHdyWDASFYKfwdRiNtFP6WK3osW7QFEAgU4I8= github.com/cosmos/ibc-go/v7 v7.3.1/go.mod h1:wvx4pPBofe5ZdMNV3OFRxSI4auEP5Qfqf8JXLLNV04g= github.com/cosmos/ics23/go v0.10.0 h1:iXqLLgp2Lp+EdpIuwXTYIQU+AiHj9mOC2X9ab++bZDM= From 7bc333f426e86a780ed61f39054f89e4a29744e6 Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Thu, 16 Nov 2023 00:07:48 +0200 Subject: [PATCH 256/307] fmt --- app/proposals_allowlisting.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/proposals_allowlisting.go b/app/proposals_allowlisting.go index 96b155ce3..50913d27f 100644 --- a/app/proposals_allowlisting.go +++ b/app/proposals_allowlisting.go @@ -102,5 +102,5 @@ var WhitelistedParams = map[paramChangeKey]struct{}{ // {Subspace: crontypes.ModuleName, Key: string(crontypes.KeySecurityAddress)}: {}, // {Subspace: crontypes.ModuleName, Key: string(crontypes.KeyLimit)}: {}, // packet-forward-middleware - //{Subspace: packetforwardmiddlewaretypes.ModuleName, Key: string(packetforwardmiddlewaretypes.KeyFeePercentage)}: {}, + // {Subspace: packetforwardmiddlewaretypes.ModuleName, Key: string(packetforwardmiddlewaretypes.KeyFeePercentage)}: {}, } From 009e80e7f96e05de7f5ac00d65d5f284ad0cdeb1 Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Thu, 16 Nov 2023 23:13:13 +0200 Subject: [PATCH 257/307] whitelist dex stargate queries --- wasmbinding/stargate_allowlist.go | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/wasmbinding/stargate_allowlist.go b/wasmbinding/stargate_allowlist.go index 30f0843b2..392908493 100644 --- a/wasmbinding/stargate_allowlist.go +++ b/wasmbinding/stargate_allowlist.go @@ -8,6 +8,7 @@ import ( ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" ibcconnectiontypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" + dextypes "github.com/neutron-org/neutron/x/dex/types" feeburnertypes "github.com/neutron-org/neutron/x/feeburner/types" interchainqueriestypes "github.com/neutron-org/neutron/x/interchainqueries/types" @@ -54,14 +55,23 @@ func AcceptedStargateQueries() wasmkeeper.AcceptedStargateQueries { "/neutron.feeburner.Query/Params": &feeburnertypes.QueryParamsResponse{}, // dex - "/neutron.dex.Query/Params": &dextypes.QueryParamsResponse{}, - "/neutron.dex.Query/LimitOrderTrancheUser": &dextypes.QueryGetLimitOrderTrancheUserResponse{}, - "/neutron.dex.Query/LimitOrderTranche": &dextypes.QueryGetLimitOrderTrancheResponse{}, - "/neutron.dex.Query/UserDepositsAll": &dextypes.QueryAllUserDepositsResponse{}, - "/neutron.dex.Query/UserLimitOrdersAll": &dextypes.QueryAllUserLimitOrdersResponse{}, - "/neutron.dex.Query/InactiveLimitOrderTranche": &dextypes.QueryGetInactiveLimitOrderTrancheResponse{}, - "/neutron.dex.Query/PoolReserves": &dextypes.QueryGetPoolReservesResponse{}, - "/neutron.dex.Query/EstimateMultiHopSwap": &dextypes.QueryEstimateMultiHopSwapResponse{}, - "/neutron.dex.Query/EstimatePlaceLimitOrder": &dextypes.QueryEstimatePlaceLimitOrderResponse{}, + "/neutron.dex.Query/Params": &dextypes.QueryParamsResponse{}, + "/neutron.dex.Query/LimitOrderTrancheUser": &dextypes.QueryGetLimitOrderTrancheUserResponse{}, + "/neutron.dex.Query/LimitOrderTrancheUserAll": &dextypes.QueryAllLimitOrderTrancheUserResponse{}, + "/neutron.dex.Query/LimitOrderTrancheUserAllByAddress": &dextypes.QueryAllUserLimitOrdersResponse{}, + "/neutron.dex.Query/LimitOrderTranche": &dextypes.QueryGetLimitOrderTrancheResponse{}, + "/neutron.dex.Query/UserDepositsAll": &dextypes.QueryAllUserDepositsResponse{}, + "/neutron.dex.Query/TickLiquidityAll": &dextypes.QueryAllTickLiquidityResponse{}, + "/neutron.dex.Query/UserLimitOrdersAll": &dextypes.QueryAllUserLimitOrdersResponse{}, + "/neutron.dex.Query/InactiveLimitOrderTranche": &dextypes.QueryGetInactiveLimitOrderTrancheResponse{}, + "/neutron.dex.Query/InactiveLimitOrderTrancheAll": &dextypes.QueryAllInactiveLimitOrderTrancheResponse{}, + "/neutron.dex.Query/PoolReservesAll": &dextypes.QueryAllPoolReservesResponse{}, + "/neutron.dex.Query/PoolReserves": &dextypes.QueryGetPoolReservesResponse{}, + "/neutron.dex.Query/EstimateMultiHopSwap": &dextypes.QueryEstimateMultiHopSwapResponse{}, + "/neutron.dex.Query/EstimatePlaceLimitOrder": &dextypes.QueryEstimatePlaceLimitOrderResponse{}, + "/neutron.dex.Query/Pool": &dextypes.QueryPoolResponse{}, + "/neutron.dex.Query/PoolByID": &dextypes.QueryPoolResponse{}, + "/neutron.dex.Query/PoolMetadata": &dextypes.QueryGetPoolMetadataResponse{}, + "/neutron.dex.Query/PoolMetadataAll": &dextypes.QueryAllPoolMetadataResponse{}, } } From 739f1aae9e904c13c26d3e4024a069564f872d2c Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Thu, 16 Nov 2023 23:39:42 +0200 Subject: [PATCH 258/307] /neutron.dex.Query/LimitOrderTrancheAll query --- wasmbinding/stargate_allowlist.go | 1 + 1 file changed, 1 insertion(+) diff --git a/wasmbinding/stargate_allowlist.go b/wasmbinding/stargate_allowlist.go index 392908493..66216a0b1 100644 --- a/wasmbinding/stargate_allowlist.go +++ b/wasmbinding/stargate_allowlist.go @@ -60,6 +60,7 @@ func AcceptedStargateQueries() wasmkeeper.AcceptedStargateQueries { "/neutron.dex.Query/LimitOrderTrancheUserAll": &dextypes.QueryAllLimitOrderTrancheUserResponse{}, "/neutron.dex.Query/LimitOrderTrancheUserAllByAddress": &dextypes.QueryAllUserLimitOrdersResponse{}, "/neutron.dex.Query/LimitOrderTranche": &dextypes.QueryGetLimitOrderTrancheResponse{}, + "/neutron.dex.Query/LimitOrderTrancheAll": &dextypes.QueryAllLimitOrderTrancheResponse{}, "/neutron.dex.Query/UserDepositsAll": &dextypes.QueryAllUserDepositsResponse{}, "/neutron.dex.Query/TickLiquidityAll": &dextypes.QueryAllTickLiquidityResponse{}, "/neutron.dex.Query/UserLimitOrdersAll": &dextypes.QueryAllUserLimitOrdersResponse{}, From d5a6f7b5851041dc7feddf1a7b1eb51e929906dd Mon Sep 17 00:00:00 2001 From: Julian Compagni Portis Date: Thu, 16 Nov 2023 21:01:43 -0500 Subject: [PATCH 259/307] Revert "Merge pull request #359 from neutron-org/fix/ibc-_swap_pfm_issues" This reverts commit 798bb43a453038f8a9b0c1dfb8bcf3731fd851e3, reversing changes made to 483f875f12d28b3aaaf304194cc926de0fccf0c4. --- tests/ibc/gmp_swap_forward_test.go | 8 +- tests/ibc/ibc_setup_test.go | 16 --- tests/ibc/swap_forward_test.go | 191 ++++++----------------------- tests/ibc/swap_test.go | 53 +++++++- x/ibcswap/ibc_middleware.go | 163 ++++++++---------------- x/ibcswap/keeper/keeper.go | 5 +- x/ibcswap/types/swap.go | 23 +--- x/ibcswap/types/swap_test.go | 6 +- 8 files changed, 152 insertions(+), 313 deletions(-) diff --git a/tests/ibc/gmp_swap_forward_test.go b/tests/ibc/gmp_swap_forward_test.go index 8199afe7c..b35866c44 100644 --- a/tests/ibc/gmp_swap_forward_test.go +++ b/tests/ibc/gmp_swap_forward_test.go @@ -5,7 +5,7 @@ import ( "time" "cosmossdk.io/math" - pfmtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types" + forwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types" transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" "github.com/neutron-org/neutron/x/dex/types" @@ -42,12 +42,12 @@ func (s *IBCTestSuite) TestGMPSwapAndForward_Success() { chainBAddr := s.bundleB.Chain.SenderAccount.GetAddress() retries := uint8(0) - forwardMetadata := pfmtypes.PacketMetadata{ - Forward: &pfmtypes.ForwardMetadata{ + forwardMetadata := forwardtypes.PacketMetadata{ + Forward: &forwardtypes.ForwardMetadata{ Receiver: chainBAddr.String(), Port: s.neutronChainBPath.EndpointA.ChannelConfig.PortID, Channel: s.neutronChainBPath.EndpointA.ChannelID, - Timeout: pfmtypes.Duration(5 * time.Minute), + Timeout: forwardtypes.Duration(5 * time.Minute), Retries: &retries, Next: nil, }, diff --git a/tests/ibc/ibc_setup_test.go b/tests/ibc/ibc_setup_test.go index 827920bf2..e3df4b424 100644 --- a/tests/ibc/ibc_setup_test.go +++ b/tests/ibc/ibc_setup_test.go @@ -6,7 +6,6 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward" transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" @@ -326,14 +325,6 @@ func (s *IBCTestSuite) assertChainCBalance(addr sdk.AccAddress, denom string, ex s.assertBalance(s.bundleC.App.GetTestBankKeeper(), s.bundleC.Chain, addr, denom, expectedAmt) } -func (s *IBCTestSuite) ReceiverOverrideAddr(channel, sender string) sdk.AccAddress { - addr, err := packetforward.GetReceiver(channel, sender) - if err != nil { - panic("Cannot calc receiver override: " + err.Error()) - } - return sdk.MustAccAddressFromBech32(addr) -} - //nolint:unparam // keep this flexible even if we aren't currently using all the params func (s *IBCTestSuite) neutronDeposit( token0 string, @@ -364,18 +355,11 @@ func (s *IBCTestSuite) neutronDeposit( func (s *IBCTestSuite) RelayAllPacketsAToB(path *icsibctesting.Path) error { sentPackets := path.EndpointA.Chain.SentPackets - chainB := path.EndpointB.Chain if len(sentPackets) == 0 { return fmt.Errorf("No packets to send") } for _, packet := range sentPackets { - // Skip if packet has already been sent - ack, _ := chainB.App.GetIBCKeeper().ChannelKeeper. - GetPacketAcknowledgement(chainB.GetContext(), packet.GetDestPort(), packet.GetDestChannel(), packet.GetSequence()) - if ack != nil { - continue - } err := path.RelayPacket(packet) if err != nil { return err diff --git a/tests/ibc/swap_forward_test.go b/tests/ibc/swap_forward_test.go index 41f643de6..9f177a834 100644 --- a/tests/ibc/swap_forward_test.go +++ b/tests/ibc/swap_forward_test.go @@ -5,7 +5,7 @@ import ( "time" "cosmossdk.io/math" - pfmtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types" + forwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types" transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" "github.com/iancoleman/orderedmap" "golang.org/x/exp/maps" @@ -53,12 +53,12 @@ func (s *IBCTestSuite) TestSwapAndForward_Success() { retries := uint8(0) - forwardMetadata := pfmtypes.PacketMetadata{ - Forward: &pfmtypes.ForwardMetadata{ + forwardMetadata := forwardtypes.PacketMetadata{ + Forward: &forwardtypes.ForwardMetadata{ Receiver: chainBAddr.String(), Port: s.neutronChainBPath.EndpointA.ChannelConfig.PortID, Channel: s.neutronChainBPath.EndpointA.ChannelID, - Timeout: pfmtypes.Duration(5 * time.Minute), + Timeout: forwardtypes.Duration(5 * time.Minute), Retries: &retries, Next: nil, }, @@ -123,6 +123,8 @@ func (s *IBCTestSuite) TestSwapAndForward_Success() { // Check that the funds are now present in the acc on chainB s.assertChainBBalance(chainBAddr, transferDenomNeutronChainB, expectedAmountOut) + + s.Assert().NoError(err) } func (s *IBCTestSuite) TestSwapAndForward_MultiHopSuccess() { @@ -166,26 +168,26 @@ func (s *IBCTestSuite) TestSwapAndForward_MultiHopSuccess() { chainCAddr := s.bundleC.Chain.SenderAccount.GetAddress() retries := uint8(0) - nextForward := pfmtypes.PacketMetadata{ - Forward: &pfmtypes.ForwardMetadata{ + nextForward := forwardtypes.PacketMetadata{ + Forward: &forwardtypes.ForwardMetadata{ Receiver: chainCAddr.String(), Port: s.chainBChainCPath.EndpointA.ChannelConfig.PortID, Channel: s.chainBChainCPath.EndpointA.ChannelID, - Timeout: pfmtypes.Duration(5 * time.Minute), + Timeout: forwardtypes.Duration(5 * time.Minute), Retries: &retries, Next: nil, }, } nextForwardBz, err := json.Marshal(nextForward) s.Assert().NoError(err) - nextForwardJSON := pfmtypes.NewJSONObject(false, nextForwardBz, orderedmap.OrderedMap{}) + nextForwardJSON := forwardtypes.NewJSONObject(false, nextForwardBz, orderedmap.OrderedMap{}) - forwardMetadata := pfmtypes.PacketMetadata{ - Forward: &pfmtypes.ForwardMetadata{ + forwardMetadata := forwardtypes.PacketMetadata{ + Forward: &forwardtypes.ForwardMetadata{ Receiver: chainBAddr.String(), Port: s.neutronChainBPath.EndpointA.ChannelConfig.PortID, Channel: s.neutronChainBPath.EndpointA.ChannelID, - Timeout: pfmtypes.Duration(5 * time.Minute), + Timeout: forwardtypes.Duration(5 * time.Minute), Retries: &retries, Next: nextForwardJSON, }, @@ -298,12 +300,12 @@ func (s *IBCTestSuite) TestSwapAndForward_UnwindIBCDenomSuccess() { retries := uint8(0) - forwardMetadata := pfmtypes.PacketMetadata{ - Forward: &pfmtypes.ForwardMetadata{ + forwardMetadata := forwardtypes.PacketMetadata{ + Forward: &forwardtypes.ForwardMetadata{ Receiver: s.providerAddr.String(), Port: s.neutronTransferPath.EndpointA.ChannelConfig.PortID, Channel: s.neutronTransferPath.EndpointA.ChannelID, - Timeout: pfmtypes.Duration(5 * time.Minute), + Timeout: forwardtypes.Duration(5 * time.Minute), Retries: &retries, Next: nil, }, @@ -334,29 +336,11 @@ func (s *IBCTestSuite) TestSwapAndForward_UnwindIBCDenomSuccess() { metadataBz, err := json.Marshal(metadata) s.Require().NoError(err) - // Transfer native denom from neutron to provider - s.IBCTransfer( - s.neutronTransferPath, - s.neutronTransferPath.EndpointA, - s.neutronAddr, - s.providerAddr, - nativeDenom, - ibcTransferAmount, - "", - ) - transferDenomPath := transfertypes.GetPrefixedDenom( - transfertypes.PortID, - s.neutronTransferPath.EndpointB.ChannelID, - nativeDenom, - ) - transferDenomNeutronProvider := transfertypes.ParseDenomTrace(transferDenomPath).IBCDenom() - s.assertProviderBalance(s.providerAddr, transferDenomNeutronProvider, ibcTransferAmount) - // Send an IBC transfer from provider to neutron with packet memo containing the swap metadata s.IBCTransferProviderToNeutron( s.providerAddr, s.neutronAddr, - transferDenomNeutronProvider, + nativeDenom, ibcTransferAmount, string(metadataBz), ) @@ -366,18 +350,23 @@ func (s *IBCTestSuite) TestSwapAndForward_UnwindIBCDenomSuccess() { s.Assert().NoError(err) s.coordinator.CommitBlock(s.neutronChain) + // Check that the amountIn is deduced from the neutron account + s.assertNeutronBalance(s.neutronAddr, nativeDenom, postDepositNeutronBalNative.Sub(swapAmount)) + // Check that the amountIn has been deducted from the neutron chain + s.assertNeutronBalance(s.neutronAddr, nativeDenom, postDepositNeutronBalNative.Sub(swapAmount)) // Check that the funds are now present on the provider chainer s.assertProviderBalance( s.providerAddr, nativeDenom, - newProviderBalNative.Add(expectedAmountOut), + newProviderBalNative.Sub(ibcTransferAmount).Add(expectedAmountOut), ) + + s.Assert().NoError(err) } -// TestSwapAndForward_ForwardFailsRefundAddr asserts that the swap and forward middleware stack works as intended in the case -// that an incoming IBC swap succeeds but the forward fails when a NeutronRefundAddress is provided. -// The swap will be reverted and the transferred amount will be credited to the refundAddr -func (s *IBCTestSuite) TestSwapAndForward_ForwardFailsRefundAddr() { +// TestSwapAndForward_ForwardFails asserts that the swap and forward middleware stack works as intended in the case +// that an incoming IBC swap succeeds but the forward fails. +func (s *IBCTestSuite) TestSwapAndForward_ForwardFails() { // Send an IBC transfer from provider chain to neutron, so we can initialize a pool with the IBC denom token + native Neutron token s.IBCTransferProviderToNeutron( s.providerAddr, @@ -411,16 +400,17 @@ func (s *IBCTestSuite) TestSwapAndForward_ForwardFailsRefundAddr() { // Compose the IBC transfer memo metadata to be used in the swap and forward swapAmount := math.NewInt(100000) + expectedAmountOut := math.NewInt(99990) chainBAddr := s.bundleB.Chain.SenderAccount.GetAddress() retries := uint8(0) - forwardMetadata := pfmtypes.PacketMetadata{ - Forward: &pfmtypes.ForwardMetadata{ + forwardMetadata := forwardtypes.PacketMetadata{ + Forward: &forwardtypes.ForwardMetadata{ Receiver: chainBAddr.String(), Port: s.neutronChainBPath.EndpointA.ChannelConfig.PortID, Channel: "invalid-channel", // add an invalid channel identifier so the forward fails - Timeout: pfmtypes.Duration(5 * time.Minute), + Timeout: forwardtypes.Duration(5 * time.Minute), Retries: &retries, Next: nil, }, @@ -433,7 +423,6 @@ func (s *IBCTestSuite) TestSwapAndForward_ForwardFailsRefundAddr() { err = json.Unmarshal(bz, nextJSON) s.Assert().NoError(err) - refundAddr := s.neutronChain.SenderAccounts[1].SenderAccount.GetAddress() metadata := swaptypes.PacketMetadata{ Swap: &swaptypes.SwapMetadata{ MsgPlaceLimitOrder: &types.MsgPlaceLimitOrder{ @@ -445,8 +434,7 @@ func (s *IBCTestSuite) TestSwapAndForward_ForwardFailsRefundAddr() { TickIndexInToOut: 2, OrderType: types.LimitOrderType_FILL_OR_KILL, }, - NeutronRefundAddress: refundAddr.String(), - Next: nextJSON, + Next: nextJSON, }, } @@ -474,13 +462,14 @@ func (s *IBCTestSuite) TestSwapAndForward_ForwardFailsRefundAddr() { newProviderBalNative.Sub(ibcTransferAmount), ) - // Check that nothing remains in the overrideReceiver account - overrideAddr := s.ReceiverOverrideAddr(s.neutronTransferPath.EndpointA.ChannelID, s.providerAddr.String()) - s.assertNeutronBalance(overrideAddr, s.providerToNeutronDenom, math.ZeroInt()) - s.assertNeutronBalance(overrideAddr, nativeDenom, math.ZeroInt()) - - // Check that the swap was reverted and the transfer amount is in the refundAddr - s.assertNeutronBalance(refundAddr, s.providerToNeutronDenom, ibcTransferAmount) + // Check that the amountIn is deduced from the neutron account + s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, math.ZeroInt()) + // Check that the amountOut stays on the neutronchain + s.assertNeutronBalance( + s.neutronAddr, + nativeDenom, + postDepositNeutronBalNative.Add(expectedAmountOut), + ) // Check that nothing made it to chainB transferDenomPath := transfertypes.GetPrefixedDenom( @@ -492,103 +481,3 @@ func (s *IBCTestSuite) TestSwapAndForward_ForwardFailsRefundAddr() { s.assertChainBBalance(chainBAddr, transferDenomNeutronChainB, math.ZeroInt()) } - -// TestSwapAndForward_ForwardFailsRefundAddr asserts that the swap and forward middleware stack works as intended in the case -// that an incoming IBC swap succeeds but the forward fails when no NeutronRefundAddress is provided. -// The swap will be reverted and a refund to the src chain will take place. -func (s *IBCTestSuite) TestSwapAndForward_ForwardFails() { - // Send an IBC transfer from provider chain to neutron, so we can initialize a pool with the IBC denom token + native Neutron token - s.IBCTransferProviderToNeutron( - s.providerAddr, - s.neutronAddr, - nativeDenom, - ibcTransferAmount, - "", - ) - - // Assert that the funds are gone from the acc on provider and present in the acc on Neutron - newProviderBalNative := genesisWalletAmount.Sub(ibcTransferAmount) - s.assertProviderBalance(s.providerAddr, nativeDenom, newProviderBalNative) - - s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, ibcTransferAmount) - - // deposit stake<>ibcTransferToken to initialize the pool on Neutron - depositAmount := math.NewInt(100_000) - s.neutronDeposit( - nativeDenom, - s.providerToNeutronDenom, - depositAmount, - depositAmount, - 0, - 1, - s.neutronAddr) - - // Assert that the deposit was successful and the funds are moved out of the Neutron user acc - s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, math.ZeroInt()) - postDepositNeutronBalNative := genesisWalletAmount.Sub(depositAmount) - s.assertNeutronBalance(s.neutronAddr, nativeDenom, postDepositNeutronBalNative) - - // Compose the IBC transfer memo metadata to be used in the swap and forward - swapAmount := math.NewInt(100000) - chainBAddr := s.bundleB.Chain.SenderAccount.GetAddress() - - retries := uint8(0) - - forwardMetadata := pfmtypes.PacketMetadata{ - Forward: &pfmtypes.ForwardMetadata{ - Receiver: chainBAddr.String(), - Port: s.neutronChainBPath.EndpointA.ChannelConfig.PortID, - Channel: "invalid-channel", // add an invalid channel identifier so the forward fails - Timeout: pfmtypes.Duration(5 * time.Minute), - Retries: &retries, - Next: nil, - }, - } - - bz, err := json.Marshal(forwardMetadata) - s.Assert().NoError(err) - - nextJSON := new(swaptypes.JSONObject) - err = json.Unmarshal(bz, nextJSON) - s.Assert().NoError(err) - - metadata := swaptypes.PacketMetadata{ - Swap: &swaptypes.SwapMetadata{ - MsgPlaceLimitOrder: &types.MsgPlaceLimitOrder{ - Creator: s.neutronAddr.String(), - Receiver: s.neutronAddr.String(), - TokenIn: s.providerToNeutronDenom, - TokenOut: nativeDenom, - AmountIn: swapAmount, - TickIndexInToOut: 2, - OrderType: types.LimitOrderType_FILL_OR_KILL, - }, - Next: nextJSON, - }, - } - - metadataBz, err := json.Marshal(metadata) - s.Require().NoError(err) - - // Send an IBC transfer from provider to neutron with packet memo containing the swap metadata - s.IBCTransferProviderToNeutron( - s.providerAddr, - s.neutronAddr, - nativeDenom, - ibcTransferAmount, - string(metadataBz), - ) - - // Relay the packets from neutron => ChainB - err = s.RelayAllPacketsAToB(s.neutronChainBPath) - // Relay Fails - s.Assert().Error(err) - - // Check that nothing remains in the overrideReceiver account - overrideAddr := s.ReceiverOverrideAddr(s.neutronTransferPath.EndpointA.ChannelID, s.providerAddr.String()) - s.assertNeutronBalance(overrideAddr, s.providerToNeutronDenom, math.ZeroInt()) - s.assertNeutronBalance(overrideAddr, nativeDenom, math.ZeroInt()) - - // Check that the refund takes place and the funds are moved back to the account on Gaia - s.assertProviderBalance(s.providerAddr, nativeDenom, genesisWalletAmount.Sub(depositAmount)) -} diff --git a/tests/ibc/swap_test.go b/tests/ibc/swap_test.go index 8c7ac2432..a7cf723af 100644 --- a/tests/ibc/swap_test.go +++ b/tests/ibc/swap_test.go @@ -102,7 +102,8 @@ func (s *IBCTestSuite) TestIBCSwapMiddleware_FailRefund() { TickIndexInToOut: 1, OrderType: dextypes.LimitOrderType_FILL_OR_KILL, }, - Next: nil, + NonRefundable: false, + Next: nil, }, } @@ -126,6 +127,51 @@ func (s *IBCTestSuite) TestIBCSwapMiddleware_FailRefund() { s.assertProviderBalance(s.providerAddr, nativeDenom, genesisWalletAmount) } +// TestIBCSwapMiddleware_FailNoRefund asserts that the IBC swap middleware works as intended with Neutron running as a +// consumer chain connected to the Cosmos Hub. The swap should fail and funds should remain on Neutron. +func (s *IBCTestSuite) TestIBCSwapMiddleware_FailNoRefund() { + // Compose the swap metadata, this swap will fail because there is no pool initialized for this pair + swapAmount := math.NewInt(100000) + metadata := swaptypes.PacketMetadata{ + Swap: &swaptypes.SwapMetadata{ + MsgPlaceLimitOrder: &dextypes.MsgPlaceLimitOrder{ + Creator: s.neutronAddr.String(), + Receiver: s.neutronAddr.String(), + TokenIn: s.providerToNeutronDenom, + TokenOut: nativeDenom, + AmountIn: swapAmount, + TickIndexInToOut: 1, + OrderType: dextypes.LimitOrderType_FILL_OR_KILL, + }, + NonRefundable: true, + Next: nil, + }, + } + + metadataBz, err := json.Marshal(metadata) + s.Require().NoError(err) + + // Send (failing) IBC transfer with swap metadata + s.IBCTransferProviderToNeutron( + s.providerAddr, + s.neutronAddr, + nativeDenom, + ibcTransferAmount, + string(metadataBz), + ) + + // Check that the funds are present in the account on Neutron + s.assertNeutronBalance(s.neutronAddr, nativeDenom, genesisWalletAmount) + s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, ibcTransferAmount) + + // Check that no refund takes place and the funds are not in the account on provider + s.assertProviderBalance(s.providerAddr, nativeDenom, genesisWalletAmount.Sub(ibcTransferAmount)) +} + +// TestIBCSwapMiddleware_FailWithRefundAddr asserts that the IBC swap middleware works as intended with Neutron running as a +// consumer chain connected to the Cosmos Hub. The swap should fail and funds should remain on Neutron but be moved +// to the refund address. + func (s *IBCTestSuite) TestIBCSwapMiddleware_FailWithRefundAddr() { // Compose the swap metadata, this swap will fail because there is no pool initialized for this pair refundAddr := s.neutronChain.SenderAccounts[1].SenderAccount.GetAddress() @@ -141,8 +187,9 @@ func (s *IBCTestSuite) TestIBCSwapMiddleware_FailWithRefundAddr() { TickIndexInToOut: 1, OrderType: dextypes.LimitOrderType_FILL_OR_KILL, }, - NeutronRefundAddress: refundAddr.String(), - Next: nil, + RefundAddress: refundAddr.String(), + NonRefundable: true, + Next: nil, }, } diff --git a/x/ibcswap/ibc_middleware.go b/x/ibcswap/ibc_middleware.go index df315b06e..3829378ec 100644 --- a/x/ibcswap/ibc_middleware.go +++ b/x/ibcswap/ibc_middleware.go @@ -3,15 +3,13 @@ package ibcswap import ( "context" "encoding/json" - "errors" "strings" sdkerrors "cosmossdk.io/errors" "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" - "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward" - pfmtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types" + forwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types" transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" @@ -112,15 +110,6 @@ func (im IBCMiddleware) OnChanCloseConfirm(ctx sdk.Context, portID, channelID st // OnRecvPacket checks the memo field on this packet and if the metadata inside's root key indicates this packet // should be handled by the swap middleware it attempts to perform a swap. If the swap is successful // the underlying application's OnRecvPacket callback is invoked. - -// For clarity, here is a breakdown of the steps -// 1. Check if this is a swap packet; if not pass it to next middleware -// 2. validate swapMetadata; ErrAck if invalid -// 3. Pass through the middleware stack to ibc-go/transfer#OnRecvPacket; transfer coins are sent to receiver -// 4. Do swap; handle failures -// 5. If no PFM is present we are done; return ack -// 6. Unpack packet so that it is a valid PFM packet and set required context variables -// 7. Pass through middleware stack again where the forward is handled by packet-forward-middleware#OnRecvPacket func (im IBCMiddleware) OnRecvPacket( ctx sdk.Context, packet channeltypes.Packet, @@ -139,44 +128,37 @@ func (im IBCMiddleware) OnRecvPacket( } metadata := m.Swap - if err := metadata.Validate(); err != nil { return channeltypes.NewErrorAcknowledgement(err) } - if err := validateSwapPacket(packet, data, *metadata); err != nil { - return channeltypes.NewErrorAcknowledgement(err) - } - - // Use overrideReceiver so that users cannot ibcswap through arbitrary addresses. - // Instead generate a unique address for each user based on their channel and origin-address - overrideReceiver, err := packetforward.GetReceiver(packet.DestinationChannel, data.Sender) - if err != nil { - return channeltypes.NewErrorAcknowledgement(err) - } - metadata.Creator = overrideReceiver - // Update packet data to match the new receiver so that transfer middleware adds tokens to the expected address - packet = newPacketWithOverrideReceiver(packet, data, overrideReceiver) - if metadata.ContainsPFM() { - // If we are using PFM change receiver to the expected address for forwarding - metadata.Receiver = overrideReceiver - } + // Compose our context with values that will be used to pass through to the forward middleware + ctxWithForwardFlags := context.WithValue(ctx.Context(), forwardtypes.ProcessedKey{}, true) + ctxWithForwardFlags = context.WithValue( + ctxWithForwardFlags, + forwardtypes.NonrefundableKey{}, + true, + ) + ctxWithForwardFlags = context.WithValue( + ctxWithForwardFlags, + forwardtypes.DisableDenomCompositionKey{}, + true, + ) + wrappedSdkCtx := ctx.WithContext(ctxWithForwardFlags) - ack := im.app.OnRecvPacket(ctx, packet, relayer) + ack := im.app.OnRecvPacket(wrappedSdkCtx, packet, relayer) if ack == nil || !ack.Success() { return ack } - // Attempt to perform a swap using a cacheCtx - cacheCtx, writeCache := ctx.CacheContext() - res, err := im.keeper.Swap(cacheCtx, metadata.MsgPlaceLimitOrder) + // Attempt to perform a swap since this packets memo included swap metadata. + res, err := im.keeper.Swap(ctx, metadata.MsgPlaceLimitOrder) if err != nil { return im.handleFailedSwap(ctx, packet, data, metadata, err) } // If there is no next field set in the metadata return ack if metadata.Next == nil { - writeCache() return ack } @@ -187,46 +169,30 @@ func (im IBCMiddleware) OnRecvPacket( return ack } - postSwapData := data - postSwapData.Memo = string(memoBz) + data.Memo = string(memoBz) // Override the packet data to include the token denom and amount that was received from the swap. - postSwapData.Denom = res.TakerCoinOut.Denom - postSwapData.Amount = res.TakerCoinOut.Amount.String() + data.Denom = res.TakerCoinOut.Denom + data.Amount = res.TakerCoinOut.Amount.String() // After a successful swap funds are now in the receiver account from the MsgPlaceLimitOrder so, // we need to override the packets receiver field before invoking the forward middlewares OnRecvPacket. - postSwapData.Receiver = m.Swap.Receiver + data.Receiver = m.Swap.Receiver - dataBz, err := transfertypes.ModuleCdc.MarshalJSON(&postSwapData) + dataBz, err := transfertypes.ModuleCdc.MarshalJSON(&data) if err != nil { return ack } packet.Data = dataBz - // Compose our context with values that will be used to pass through to the forward middleware - ctxWithForwardFlags := context.WithValue(cacheCtx.Context(), pfmtypes.ProcessedKey{}, true) - ctxWithForwardFlags = context.WithValue( - ctxWithForwardFlags, - pfmtypes.NonrefundableKey{}, - true, - ) - ctxWithForwardFlags = context.WithValue( - ctxWithForwardFlags, - pfmtypes.DisableDenomCompositionKey{}, - true, - ) - wrappedSdkCtx := cacheCtx.WithContext(ctxWithForwardFlags) - // The forward middleware should return a nil ack if the forward is initiated properly. // If not an error occurred, and we return the original ack. newAck := im.app.OnRecvPacket(wrappedSdkCtx, packet, relayer) if newAck != nil { - return im.handleFailedSwap(ctx, packet, data, metadata, errors.New(string(newAck.Acknowledgement()))) + return ack } - writeCache() return nil } @@ -307,29 +273,38 @@ func (im IBCMiddleware) handleFailedSwap( "AmountIn", metadata.AmountIn, "TickIndexInToOut", metadata.TickIndexInToOut, "OrderType", metadata.OrderType, - "refund address", metadata.NeutronRefundAddress, + "refundable", metadata.NonRefundable, + "refund address", metadata.RefundAddress, ) // The current denom is from the sender chains perspective, we need to compose the appropriate denom for this side - denomOnThisChain := getDenomForThisChain(packet, data.Denom) + denomOnThisChain := getDenomForThisChain( + packet.DestinationPort, packet.DestinationChannel, + packet.SourcePort, packet.SourceChannel, + data.Denom, + ) - if len(metadata.NeutronRefundAddress) != 0 { - return im.handleOnChainRefund(ctx, data, metadata, denomOnThisChain, err) + if metadata.NonRefundable { + return im.handleNoRefund(ctx, data, metadata, denomOnThisChain, err) } - return im.handleIBCRefund(ctx, packet, data, metadata, denomOnThisChain, err) + return im.handleRefund(ctx, packet, data, denomOnThisChain, err) } -// handleOnChainRefund will compose a successful ack to send back to the counterparty chain containing any error messages. +// handleNoRefund will compose a successful ack to send back to the counterparty chain containing any error messages. // Returning a successful ack ensures that a refund is not issued on the counterparty chain. // See: https://github.com/cosmos/ibc-go/blob/3ecc7dd3aef5790ec5d906936a297b34adf1ee41/modules/apps/transfer/keeper/relay.go#L320 -func (im IBCMiddleware) handleOnChainRefund( +func (im IBCMiddleware) handleNoRefund( ctx sdk.Context, data transfertypes.FungibleTokenPacketData, metadata *types.SwapMetadata, newDenom string, swapErr error, ) ibcexported.Acknowledgement { + if metadata.RefundAddress == "" { + return channeltypes.NewResultAcknowledgement([]byte(swapErr.Error())) + } + amount, ok := math.NewIntFromString(data.Amount) if !ok { wrappedErr := sdkerrors.Wrapf( @@ -342,7 +317,7 @@ func (im IBCMiddleware) handleOnChainRefund( } token := sdk.NewCoin(newDenom, amount) - err := im.keeper.SendCoins(ctx, metadata.Creator, metadata.NeutronRefundAddress, sdk.NewCoins(token)) + err := im.keeper.SendCoins(ctx, data.Receiver, metadata.RefundAddress, sdk.NewCoins(token)) if err != nil { wrappedErr := sdkerrors.Wrap(err, "failed to move funds to refund address") wrappedErr = sdkerrors.Wrap(swapErr, wrappedErr.Error()) @@ -352,20 +327,19 @@ func (im IBCMiddleware) handleOnChainRefund( return channeltypes.NewResultAcknowledgement([]byte(swapErr.Error())) } -// handleIBCRefund will either burn or transfer the funds back to the appropriate escrow account. +// handleRefund will either burn or transfer the funds back to the appropriate escrow account. // When a packet comes in the transfer module's OnRecvPacket callback is invoked which either // mints or unescrows funds on this side so if the swap fails an explicit refund is required. -func (im IBCMiddleware) handleIBCRefund( +func (im IBCMiddleware) handleRefund( ctx sdk.Context, packet channeltypes.Packet, data transfertypes.FungibleTokenPacketData, - metadata *types.SwapMetadata, newDenom string, swapErr error, ) ibcexported.Acknowledgement { data.Denom = newDenom - err := im.keeper.RefundPacketToken(ctx, packet, data, metadata) + err := im.keeper.RefundPacketToken(ctx, packet, data) if err != nil { wrappedErr := sdkerrors.Wrap(swapErr, err.Error()) @@ -379,8 +353,10 @@ func (im IBCMiddleware) handleIBCRefund( // getDenomForThisChain composes a new token denom by either unwinding or prefixing the specified token denom appropriately. // This is necessary because the token denom in the packet data is from the perspective of the counterparty chain. -func getDenomForThisChain(packet channeltypes.Packet, denom string) string { - counterpartyPrefix := transfertypes.GetDenomPrefix(packet.SourcePort, packet.SourceChannel) +func getDenomForThisChain( + port, channel, counterpartyPort, counterpartyChannel, denom string, +) string { + counterpartyPrefix := transfertypes.GetDenomPrefix(counterpartyPort, counterpartyChannel) if strings.HasPrefix(denom, counterpartyPrefix) { // unwind denom unwoundDenom := denom[len(counterpartyPrefix):] @@ -394,49 +370,6 @@ func getDenomForThisChain(packet channeltypes.Packet, denom string) string { } // append port and channel from this chain to denom - prefixedDenom := transfertypes.GetDenomPrefix(packet.DestinationPort, packet.DestinationChannel) + denom + prefixedDenom := transfertypes.GetDenomPrefix(port, channel) + denom return transfertypes.ParseDenomTrace(prefixedDenom).IBCDenom() } - -// Update the packet data to reflect the new receiver address that is used by the PFM -func newPacketWithOverrideReceiver(oldPacket channeltypes.Packet, data transfertypes.FungibleTokenPacketData, overrideReceiver string) channeltypes.Packet { - overrideData := transfertypes.FungibleTokenPacketData{ - Denom: data.Denom, - Amount: data.Amount, - Sender: data.Sender, - Receiver: overrideReceiver, // override receiver - } - overrideDataBz := transfertypes.ModuleCdc.MustMarshalJSON(&overrideData) - - return channeltypes.Packet{ - Sequence: oldPacket.Sequence, - SourcePort: oldPacket.SourcePort, - SourceChannel: oldPacket.SourceChannel, - DestinationPort: oldPacket.DestinationPort, - DestinationChannel: oldPacket.DestinationChannel, - Data: overrideDataBz, // override data - TimeoutHeight: oldPacket.TimeoutHeight, - TimeoutTimestamp: oldPacket.TimeoutTimestamp, - } -} - -func validateSwapPacket(packet channeltypes.Packet, transferData transfertypes.FungibleTokenPacketData, sm types.SwapMetadata) error { - denomOnNeutron := getDenomForThisChain(packet, transferData.Denom) - if denomOnNeutron != sm.TokenIn { - return sdkerrors.Wrap(types.ErrInvalidSwapMetadata, "Transfer Denom must match TokenIn") - } - - transferAmount, ok := math.NewIntFromString(transferData.Amount) - if !ok { - return sdkerrors.Wrapf( - transfertypes.ErrInvalidAmount, - "unable to parse transfer amount (%s) into math.Int", - transferData.Amount, - ) - } - - if transferAmount.LT(sm.AmountIn) { - return sdkerrors.Wrap(types.ErrInvalidSwapMetadata, "Transfer amount must be <= AmountIn") - } - return nil -} diff --git a/x/ibcswap/keeper/keeper.go b/x/ibcswap/keeper/keeper.go index e3f48b3d0..3902568b5 100644 --- a/x/ibcswap/keeper/keeper.go +++ b/x/ibcswap/keeper/keeper.go @@ -113,7 +113,6 @@ func (k Keeper) RefundPacketToken( ctx sdk.Context, packet channeltypes.Packet, data transfertypes.FungibleTokenPacketData, - metadata *types.SwapMetadata, ) error { // parse the denomination from the full denom path trace := transfertypes.ParseDenomTrace(data.Denom) @@ -129,8 +128,8 @@ func (k Keeper) RefundPacketToken( } token := sdk.NewCoin(trace.IBCDenom(), transferAmount) - // decode the creator address - receiver, err := sdk.AccAddressFromBech32(metadata.Creator) + // decode the receiver address + receiver, err := sdk.AccAddressFromBech32(data.Receiver) if err != nil { return err } diff --git a/x/ibcswap/types/swap.go b/x/ibcswap/types/swap.go index 3c4965db9..57e9faf5e 100644 --- a/x/ibcswap/types/swap.go +++ b/x/ibcswap/types/swap.go @@ -20,11 +20,8 @@ type PacketMetadata struct { // further in the middleware stack or on the counterparty. type SwapMetadata struct { *dextypes.MsgPlaceLimitOrder - NonRefundable bool `json:"non-refundable,omitempty"` - // If a value is provided for NeutronRefundAddress and the swap fails the Transfer.Amount will be moved to this address for later recovery. - // If no NeutronRefundAddress is provided and a swap fails we will fail the ibc transfer and tokens will be refunded on the source chain. - - NeutronRefundAddress string `json:"refund-address,omitempty"` + NonRefundable bool `json:"non-refundable,omitempty"` + RefundAddress string `json:"refund-address,omitempty"` // Using JSONObject so that objects for next property will not be mutated by golang's lexicographic key sort on map keys during Marshal. // Supports primitives for Unmarshal/Marshal so that an escaped JSON-marshaled string is also valid. @@ -42,10 +39,10 @@ func (sm SwapMetadata) Validate() error { if sm.TokenOut == "" { return sdkerrors.Wrap(ErrInvalidSwapMetadata, "limit order tokenOut cannot be an empty string") } - if sm.NeutronRefundAddress != "" { - _, err := sdk.AccAddressFromBech32(sm.NeutronRefundAddress) + if sm.RefundAddress != "" { + _, err := sdk.AccAddressFromBech32(sm.RefundAddress) if err != nil { - return sdkerrors.Wrapf(dextypes.ErrInvalidAddress, "%s is not a valid Neutron address", sm.NeutronRefundAddress) + return sdkerrors.Wrapf(dextypes.ErrInvalidAddress, "%s is not a valid Neutron address", sm.RefundAddress) } } @@ -56,16 +53,6 @@ func (sm SwapMetadata) Validate() error { return nil } -// ContainsPFM checks if the Swapetadata is wrapping packet-forward-middleware -func (sm SwapMetadata) ContainsPFM() bool { - if sm.Next == nil { - return false - } - forward, _ := sm.Next.orderedMap.Get("forward") - - return forward != nil -} - // JSONObject is a wrapper type to allow either a primitive type or a JSON object. // In the case the value is a JSON object, OrderedMap type is used so that key order // is retained across Unmarshal/Marshal. diff --git a/x/ibcswap/types/swap_test.go b/x/ibcswap/types/swap_test.go index b341bb394..c4f4c468f 100644 --- a/x/ibcswap/types/swap_test.go +++ b/x/ibcswap/types/swap_test.go @@ -5,7 +5,7 @@ import ( "testing" "cosmossdk.io/math" - pfmtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types" + forwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types" "github.com/iancoleman/orderedmap" "github.com/stretchr/testify/require" @@ -41,8 +41,8 @@ func TestPacketMetadata_Marshal(t *testing.T) { // TestPacketMetadata_MarshalWithNext asserts that the marshaling of the swap metadata works as intended with next field initialized. func TestPacketMetadata_MarshalWithNext(t *testing.T) { - forwardMedata := &pfmtypes.PacketMetadata{ - Forward: &pfmtypes.ForwardMetadata{ + forwardMedata := &forwardtypes.PacketMetadata{ + Forward: &forwardtypes.ForwardMetadata{ Receiver: "cosmos14zde8usc4ur04y3aqnufzzmv2uqdpwwttr5uwv", Port: "transfer", Channel: "channel-0", From 72ee33aa95deb377b8593c3c137c5990f45c40de Mon Sep 17 00:00:00 2001 From: Julian Compagni Portis Date: Thu, 16 Nov 2023 21:08:23 -0500 Subject: [PATCH 260/307] Revert "Merge pull request #369 from neutron-org/chore/bump-pfm-again" This reverts commit 3765f6e71870c8f0f1b3f163ef5e8a634351c4c9, reversing changes made to 3ee6217d485f6e818b2db7c9ad94869d1b8e0eba. --- app/app.go | 4 ++-- app/proposals_allowlisting.go | 3 ++- go.mod | 2 +- go.sum | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/app.go b/app/app.go index 2123aafe8..781739738 100644 --- a/app/app.go +++ b/app/app.go @@ -534,12 +534,12 @@ func New( app.PFMKeeper = pfmkeeper.NewKeeper( appCodec, app.keys[pfmtypes.StoreKey], + app.GetSubspace(pfmtypes.ModuleName), app.TransferKeeper.Keeper, 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.HooksICS4Wrapper = ibchooks.NewICS4Middleware( @@ -750,7 +750,7 @@ func New( contractManagerModule := contractmanager.NewAppModule(appCodec, app.ContractManagerKeeper) ibcHooksModule := ibchooks.NewAppModule(app.AccountKeeper) - app.PFMModule = packetforward.NewAppModule(app.PFMKeeper, app.GetSubspace(pfmtypes.ModuleName)) + app.RouterModule = packetforward.NewAppModule(app.RouterKeeper) var ibcStack ibcporttypes.IBCModule = packetforward.NewIBCMiddleware( app.HooksTransferIBCModule, diff --git a/app/proposals_allowlisting.go b/app/proposals_allowlisting.go index 3a00c7391..90d63c99f 100644 --- a/app/proposals_allowlisting.go +++ b/app/proposals_allowlisting.go @@ -7,6 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/params/types/proposal" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" globalfeetypes "github.com/cosmos/gaia/v11/x/globalfee/types" + packetforwardmiddlewaretypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types" icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types" ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" @@ -104,5 +105,5 @@ var WhitelistedParams = map[paramChangeKey]struct{}{ // {Subspace: crontypes.ModuleName, Key: string(crontypes.KeySecurityAddress)}: {}, // {Subspace: crontypes.ModuleName, Key: string(crontypes.KeyLimit)}: {}, // packet-forward-middleware - // {Subspace: packetforwardmiddlewaretypes.ModuleName, Key: string(packetforwardmiddlewaretypes.KeyFeePercentage)}: {}, + {Subspace: packetforwardmiddlewaretypes.ModuleName, Key: string(packetforwardmiddlewaretypes.KeyFeePercentage)}: {}, } diff --git a/go.mod b/go.mod index 467aaaa2b..73db24cc2 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/cosmos/cosmos-sdk v0.47.5 github.com/cosmos/gaia/v11 v11.0.0-00010101000000-000000000000 github.com/cosmos/gogoproto v1.4.10 - github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.1.1 + github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.1 github.com/cosmos/ibc-go/v7 v7.3.1 github.com/cosmos/ics23/go v0.10.0 github.com/cosmos/interchain-security/v3 v3.1.0 diff --git a/go.sum b/go.sum index 626d4a95e..c8e1b5c21 100644 --- a/go.sum +++ b/go.sum @@ -399,8 +399,8 @@ github.com/cosmos/gogoproto v1.4.10 h1:QH/yT8X+c0F4ZDacDv3z+xE3WU1P1Z3wQoLMBRJoK github.com/cosmos/gogoproto v1.4.10/go.mod h1:3aAZzeRWpAwr+SS/LLkICX2/kDFyaYVzckBDzygIxek= github.com/cosmos/iavl v0.20.1 h1:rM1kqeG3/HBT85vsZdoSNsehciqUQPWrR4BYmqE2+zg= github.com/cosmos/iavl v0.20.1/go.mod h1:WO7FyvaZJoH65+HFOsDir7xU9FWk2w9cHXNW1XHcl7A= -github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.1.1 h1:PqIK9vTr6zxCdQmrDZwxwL4KMAqg/GRGsiMEiaMP4wA= -github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.1.1/go.mod h1:UvDmcGIWJPIytq+Q78/ff5NTOsuX/7IrNgEugTW5i0s= +github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.1 h1:8mK4Ha/56P6jkRcLhIYhg/ipWhEuXBtj5O4I6fAi6vg= +github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.1/go.mod h1:GGUJN4LnB3J1Luu4kxTklQLbW69So3QXUndSalB003s= github.com/cosmos/ibc-go/v7 v7.3.1 h1:bil1IjnHdyWDASFYKfwdRiNtFP6WK3osW7QFEAgU4I8= github.com/cosmos/ibc-go/v7 v7.3.1/go.mod h1:wvx4pPBofe5ZdMNV3OFRxSI4auEP5Qfqf8JXLLNV04g= github.com/cosmos/ics23/go v0.10.0 h1:iXqLLgp2Lp+EdpIuwXTYIQU+AiHj9mOC2X9ab++bZDM= From 70f288401b7651b5a7ab4fcea176ea77f8aaf480 Mon Sep 17 00:00:00 2001 From: Julian Compagni Portis Date: Thu, 16 Nov 2023 21:35:54 -0500 Subject: [PATCH 261/307] Revert "bump pfm to the latest release" This reverts commit 1ffecd060b4306212f5c6c011d80a80c0864ec31. --- app/app.go | 41 +++++++++++++++--------------- app/proposals_allowlisting.go | 2 +- go.mod | 3 ++- go.sum | 5 ++-- tests/ibc/gmp_swap_forward_test.go | 2 +- tests/ibc/swap_forward_test.go | 2 +- x/ibcswap/ibc_middleware.go | 2 +- x/ibcswap/types/swap_test.go | 2 +- 8 files changed, 30 insertions(+), 29 deletions(-) diff --git a/app/app.go b/app/app.go index 781739738..5219bccb5 100644 --- a/app/app.go +++ b/app/app.go @@ -9,7 +9,8 @@ import ( "path/filepath" globalfeetypes "github.com/cosmos/gaia/v11/x/globalfee/types" - "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward" + "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router" + "github.com/cosmos/interchain-security/v3/testutil/integration" wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" @@ -146,8 +147,8 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" consensusparamkeeper "github.com/cosmos/cosmos-sdk/x/consensus/keeper" consensusparamtypes "github.com/cosmos/cosmos-sdk/x/consensus/types" - pfmkeeper "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/keeper" - pfmtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types" + routerkeeper "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router/keeper" + routertypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router/types" "github.com/neutron-org/neutron/x/dex" dexkeeper "github.com/neutron-org/neutron/x/dex/keeper" @@ -224,7 +225,7 @@ var ( ), ), ibchooks.AppModuleBasic{}, - packetforward.AppModuleBasic{}, + router.AppModuleBasic{}, auction.AppModuleBasic{}, globalfee.AppModule{}, dex.AppModuleBasic{}, @@ -309,11 +310,11 @@ type App struct { ConsumerKeeper ccvconsumerkeeper.Keeper TokenFactoryKeeper *tokenfactorykeeper.Keeper CronKeeper cronkeeper.Keeper - PFMKeeper *pfmkeeper.Keeper + PFMKeeper *routerkeeper.Keeper DexKeeper dexkeeper.Keeper SwapKeeper ibcswapkeeper.Keeper - PFMModule packetforward.AppModule + RouterModule router.AppModule HooksTransferIBCModule *ibchooks.IBCMiddleware HooksICS4Wrapper ibchooks.ICS4Middleware @@ -395,7 +396,7 @@ func New( evidencetypes.StoreKey, ibctransfertypes.StoreKey, icacontrollertypes.StoreKey, icahosttypes.StoreKey, capabilitytypes.StoreKey, interchainqueriesmoduletypes.StoreKey, contractmanagermoduletypes.StoreKey, interchaintxstypes.StoreKey, wasmtypes.StoreKey, feetypes.StoreKey, - feeburnertypes.StoreKey, adminmoduletypes.StoreKey, ccvconsumertypes.StoreKey, tokenfactorytypes.StoreKey, pfmtypes.StoreKey, + feeburnertypes.StoreKey, adminmoduletypes.StoreKey, ccvconsumertypes.StoreKey, tokenfactorytypes.StoreKey, routertypes.StoreKey, crontypes.StoreKey, ibchookstypes.StoreKey, consensusparamtypes.StoreKey, crisistypes.StoreKey, auctiontypes.StoreKey, dextypes.StoreKey, ) tkeys := sdk.NewTransientStoreKeys(paramstypes.TStoreKey) @@ -531,10 +532,10 @@ func New( feeBurnerModule := feeburner.NewAppModule(appCodec, *app.FeeBurnerKeeper) // PFMKeeper must be created before TransferKeeper - app.PFMKeeper = pfmkeeper.NewKeeper( + app.PFMKeeper = routerkeeper.NewKeeper( appCodec, - app.keys[pfmtypes.StoreKey], - app.GetSubspace(pfmtypes.ModuleName), + app.keys[routertypes.StoreKey], + app.GetSubspace(routertypes.ModuleName), app.TransferKeeper.Keeper, app.IBCKeeper.ChannelKeeper, app.FeeBurnerKeeper, @@ -750,14 +751,14 @@ func New( contractManagerModule := contractmanager.NewAppModule(appCodec, app.ContractManagerKeeper) ibcHooksModule := ibchooks.NewAppModule(app.AccountKeeper) - app.RouterModule = packetforward.NewAppModule(app.RouterKeeper) + app.RouterModule = router.NewAppModule(app.PFMKeeper) - var ibcStack ibcporttypes.IBCModule = packetforward.NewIBCMiddleware( + var ibcStack ibcporttypes.IBCModule = router.NewIBCMiddleware( app.HooksTransferIBCModule, app.PFMKeeper, 0, - pfmkeeper.DefaultForwardTransferPacketTimeoutTimestamp, - pfmkeeper.DefaultRefundTransferPacketTimeoutTimestamp, + routerkeeper.DefaultForwardTransferPacketTimeoutTimestamp, + routerkeeper.DefaultRefundTransferPacketTimeoutTimestamp, ) ibcStack = ibcswap.NewIBCMiddleware(ibcStack, app.SwapKeeper) @@ -798,7 +799,7 @@ func New( transferModule, consumerModule, icaModule, - app.PFMModule, + app.RouterModule, interchainQueriesModule, interchainTxsModule, feeModule, @@ -845,7 +846,7 @@ func New( feeburnertypes.ModuleName, adminmoduletypes.ModuleName, ibchookstypes.ModuleName, - pfmtypes.ModuleName, + routertypes.ModuleName, crontypes.ModuleName, globalfee.ModuleName, ibcswaptypes.ModuleName, @@ -878,7 +879,7 @@ func New( feeburnertypes.ModuleName, adminmoduletypes.ModuleName, ibchookstypes.ModuleName, - pfmtypes.ModuleName, + routertypes.ModuleName, crontypes.ModuleName, globalfee.ModuleName, ibcswaptypes.ModuleName, @@ -918,7 +919,7 @@ func New( feeburnertypes.ModuleName, adminmoduletypes.ModuleName, ibchookstypes.ModuleName, // after auth keeper - pfmtypes.ModuleName, + routertypes.ModuleName, crontypes.ModuleName, globalfee.ModuleName, ibcswaptypes.ModuleName, @@ -946,7 +947,7 @@ func New( transferModule, consumerModule, icaModule, - app.PFMModule, + app.RouterModule, interchainQueriesModule, interchainTxsModule, feeBurnerModule, @@ -1288,7 +1289,7 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino paramsKeeper.Subspace(icacontrollertypes.SubModuleName).WithKeyTable(icacontrollertypes.ParamKeyTable()) paramsKeeper.Subspace(icahosttypes.SubModuleName).WithKeyTable(icahosttypes.ParamKeyTable()) - paramsKeeper.Subspace(pfmtypes.ModuleName).WithKeyTable(pfmtypes.ParamKeyTable()) + paramsKeeper.Subspace(routertypes.ModuleName).WithKeyTable(routertypes.ParamKeyTable()) paramsKeeper.Subspace(globalfee.ModuleName).WithKeyTable(globalfeetypes.ParamKeyTable()) diff --git a/app/proposals_allowlisting.go b/app/proposals_allowlisting.go index 90d63c99f..007a6d2cb 100644 --- a/app/proposals_allowlisting.go +++ b/app/proposals_allowlisting.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/params/types/proposal" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" globalfeetypes "github.com/cosmos/gaia/v11/x/globalfee/types" - packetforwardmiddlewaretypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types" + packetforwardmiddlewaretypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router/types" icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types" ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" diff --git a/go.mod b/go.mod index 73db24cc2..689dd9625 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,8 @@ require ( github.com/cosmos/cosmos-sdk v0.47.5 github.com/cosmos/gaia/v11 v11.0.0-00010101000000-000000000000 github.com/cosmos/gogoproto v1.4.10 - github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.1 + // TEMP: Using this version to support duality swap-and-forward + github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.0-20230629164013-34f5e666f806 github.com/cosmos/ibc-go/v7 v7.3.1 github.com/cosmos/ics23/go v0.10.0 github.com/cosmos/interchain-security/v3 v3.1.0 diff --git a/go.sum b/go.sum index c8e1b5c21..caa8c5cf0 100644 --- a/go.sum +++ b/go.sum @@ -399,8 +399,8 @@ github.com/cosmos/gogoproto v1.4.10 h1:QH/yT8X+c0F4ZDacDv3z+xE3WU1P1Z3wQoLMBRJoK github.com/cosmos/gogoproto v1.4.10/go.mod h1:3aAZzeRWpAwr+SS/LLkICX2/kDFyaYVzckBDzygIxek= github.com/cosmos/iavl v0.20.1 h1:rM1kqeG3/HBT85vsZdoSNsehciqUQPWrR4BYmqE2+zg= github.com/cosmos/iavl v0.20.1/go.mod h1:WO7FyvaZJoH65+HFOsDir7xU9FWk2w9cHXNW1XHcl7A= -github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.1 h1:8mK4Ha/56P6jkRcLhIYhg/ipWhEuXBtj5O4I6fAi6vg= -github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.1/go.mod h1:GGUJN4LnB3J1Luu4kxTklQLbW69So3QXUndSalB003s= +github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.0-20230629164013-34f5e666f806 h1:iFWb/KrnP5jthNZ23l72wqE8nzHJHzoVe22giUfJce8= +github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.0-20230629164013-34f5e666f806/go.mod h1:fctjEnz9xaBFOlmYYPdKL8Hs1Y3GUKilSwsJdqBb5QU= github.com/cosmos/ibc-go/v7 v7.3.1 h1:bil1IjnHdyWDASFYKfwdRiNtFP6WK3osW7QFEAgU4I8= github.com/cosmos/ibc-go/v7 v7.3.1/go.mod h1:wvx4pPBofe5ZdMNV3OFRxSI4auEP5Qfqf8JXLLNV04g= github.com/cosmos/ics23/go v0.10.0 h1:iXqLLgp2Lp+EdpIuwXTYIQU+AiHj9mOC2X9ab++bZDM= @@ -1203,7 +1203,6 @@ go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= -go.uber.org/mock v0.2.0 h1:TaP3xedm7JaAgScZO7tlvlKrqT0p7I6OsdGB5YNSMDU= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= diff --git a/tests/ibc/gmp_swap_forward_test.go b/tests/ibc/gmp_swap_forward_test.go index b35866c44..bc188d290 100644 --- a/tests/ibc/gmp_swap_forward_test.go +++ b/tests/ibc/gmp_swap_forward_test.go @@ -5,7 +5,7 @@ import ( "time" "cosmossdk.io/math" - forwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types" + forwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router/types" transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" "github.com/neutron-org/neutron/x/dex/types" diff --git a/tests/ibc/swap_forward_test.go b/tests/ibc/swap_forward_test.go index 9f177a834..33d382bd6 100644 --- a/tests/ibc/swap_forward_test.go +++ b/tests/ibc/swap_forward_test.go @@ -5,7 +5,7 @@ import ( "time" "cosmossdk.io/math" - forwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types" + forwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router/types" transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" "github.com/iancoleman/orderedmap" "golang.org/x/exp/maps" diff --git a/x/ibcswap/ibc_middleware.go b/x/ibcswap/ibc_middleware.go index 3829378ec..c5ceccc8d 100644 --- a/x/ibcswap/ibc_middleware.go +++ b/x/ibcswap/ibc_middleware.go @@ -9,7 +9,7 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" - forwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types" + forwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router/types" transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" diff --git a/x/ibcswap/types/swap_test.go b/x/ibcswap/types/swap_test.go index c4f4c468f..87f7107d8 100644 --- a/x/ibcswap/types/swap_test.go +++ b/x/ibcswap/types/swap_test.go @@ -5,7 +5,7 @@ import ( "testing" "cosmossdk.io/math" - forwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types" + forwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router/types" "github.com/iancoleman/orderedmap" "github.com/stretchr/testify/require" From a43c2e89882fc8ae6acc87e0c3a2d03a42368ffc Mon Sep 17 00:00:00 2001 From: Julian Compagni Portis Date: Thu, 16 Nov 2023 21:49:20 -0500 Subject: [PATCH 262/307] Add validation for ibcSwap to ensure transfer receiver is sender also ensure that swap amount <= transferAmount --- x/ibcswap/ibc_middleware.go | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/x/ibcswap/ibc_middleware.go b/x/ibcswap/ibc_middleware.go index c5ceccc8d..262baee59 100644 --- a/x/ibcswap/ibc_middleware.go +++ b/x/ibcswap/ibc_middleware.go @@ -132,6 +132,10 @@ func (im IBCMiddleware) OnRecvPacket( return channeltypes.NewErrorAcknowledgement(err) } + if err := validateSwapPacket(packet, data, *metadata); err != nil { + return channeltypes.NewErrorAcknowledgement(err) + } + // Compose our context with values that will be used to pass through to the forward middleware ctxWithForwardFlags := context.WithValue(ctx.Context(), forwardtypes.ProcessedKey{}, true) ctxWithForwardFlags = context.WithValue( @@ -373,3 +377,34 @@ func getDenomForThisChain( prefixedDenom := transfertypes.GetDenomPrefix(port, channel) + denom return transfertypes.ParseDenomTrace(prefixedDenom).IBCDenom() } + +func validateSwapPacket(packet channeltypes.Packet, transferData transfertypes.FungibleTokenPacketData, sm types.SwapMetadata) error { + denomOnNeutron := getDenomForThisChain( + packet.DestinationPort, + packet.DestinationChannel, + packet.SourcePort, + packet.SourceChannel, + transferData.Denom, + ) + if denomOnNeutron != sm.TokenIn { + return sdkerrors.Wrap(types.ErrInvalidSwapMetadata, "Transfer Denom must match TokenIn") + } + + transferAmount, ok := math.NewIntFromString(transferData.Amount) + if !ok { + return sdkerrors.Wrapf( + transfertypes.ErrInvalidAmount, + "unable to parse transfer amount (%s) into math.Int", + transferData.Amount, + ) + } + + if transferAmount.LT(sm.AmountIn) { + return sdkerrors.Wrap(types.ErrInvalidSwapMetadata, "Transfer amount must be >= AmountIn") + } + + if transferData.Receiver != sm.Creator || transferData.Receiver != sm.Receiver { + return sdkerrors.Wrap(types.ErrInvalidSwapMetadata, "Transfer receiver must equal swap Creator and Receiver") + } + return nil +} From 015140309c1ead9895a537a5897402f07fd56c75 Mon Sep 17 00:00:00 2001 From: Julian Compagni Portis Date: Thu, 16 Nov 2023 22:09:02 -0500 Subject: [PATCH 263/307] Fix tests --- tests/ibc/ibc_setup_test.go | 7 +++++++ tests/ibc/swap_forward_test.go | 14 +++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/tests/ibc/ibc_setup_test.go b/tests/ibc/ibc_setup_test.go index e3df4b424..a5092cf7a 100644 --- a/tests/ibc/ibc_setup_test.go +++ b/tests/ibc/ibc_setup_test.go @@ -355,11 +355,18 @@ func (s *IBCTestSuite) neutronDeposit( func (s *IBCTestSuite) RelayAllPacketsAToB(path *icsibctesting.Path) error { sentPackets := path.EndpointA.Chain.SentPackets + chainB := path.EndpointB.Chain if len(sentPackets) == 0 { return fmt.Errorf("No packets to send") } for _, packet := range sentPackets { + // Skip if packet has already been sent + ack, _ := chainB.App.GetIBCKeeper().ChannelKeeper. + GetPacketAcknowledgement(chainB.GetContext(), packet.GetDestPort(), packet.GetDestChannel(), packet.GetSequence()) + if ack != nil { + continue + } err := path.RelayPacket(packet) if err != nil { return err diff --git a/tests/ibc/swap_forward_test.go b/tests/ibc/swap_forward_test.go index 33d382bd6..3ce2ec86a 100644 --- a/tests/ibc/swap_forward_test.go +++ b/tests/ibc/swap_forward_test.go @@ -298,8 +298,16 @@ func (s *IBCTestSuite) TestSwapAndForward_UnwindIBCDenomSuccess() { swapAmount := math.NewInt(100000) expectedAmountOut := math.NewInt(99990) - retries := uint8(0) + // Send native denom to gaia chain so it can be swapped + s.IBCTransfer(s.neutronTransferPath, s.neutronTransferPath.EndpointA, s.neutronAddr, s.providerAddr, nativeDenom, swapAmount, "") + transferDenomPath := transfertypes.GetPrefixedDenom( + transfertypes.PortID, + s.neutronTransferPath.EndpointA.ChannelID, + nativeDenom, + ) + transferDenomNeutronToProvider := transfertypes.ParseDenomTrace(transferDenomPath).IBCDenom() + retries := uint8(0) forwardMetadata := forwardtypes.PacketMetadata{ Forward: &forwardtypes.ForwardMetadata{ Receiver: s.providerAddr.String(), @@ -340,7 +348,7 @@ func (s *IBCTestSuite) TestSwapAndForward_UnwindIBCDenomSuccess() { s.IBCTransferProviderToNeutron( s.providerAddr, s.neutronAddr, - nativeDenom, + transferDenomNeutronToProvider, ibcTransferAmount, string(metadataBz), ) @@ -358,7 +366,7 @@ func (s *IBCTestSuite) TestSwapAndForward_UnwindIBCDenomSuccess() { s.assertProviderBalance( s.providerAddr, nativeDenom, - newProviderBalNative.Sub(ibcTransferAmount).Add(expectedAmountOut), + newProviderBalNative.Add(expectedAmountOut), ) s.Assert().NoError(err) From bf2acf85cf36604ac7e57e8a7fa81b0050ad2b89 Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Fri, 17 Nov 2023 13:41:06 +0200 Subject: [PATCH 264/307] whitelist ccvconsumer params --- app/proposals_allowlisting.go | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/app/proposals_allowlisting.go b/app/proposals_allowlisting.go index 12c6249e0..bf9dd285e 100644 --- a/app/proposals_allowlisting.go +++ b/app/proposals_allowlisting.go @@ -15,6 +15,7 @@ import ( icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types" ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" + ccvconsumertypes "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types" contractmanagertypes "github.com/neutron-org/neutron/x/contractmanager/types" crontypes "github.com/neutron-org/neutron/x/cron/types" @@ -92,4 +93,16 @@ var WhitelistedParams = map[paramChangeKey]struct{}{ {Subspace: globalfeetypes.ModuleName, Key: string(globalfeetypes.ParamStoreKeyMaxTotalBypassMinFeeMsgGasUsage)}: {}, // packet-forward-middleware {Subspace: packetforwardmiddlewaretypes.ModuleName, Key: string(packetforwardmiddlewaretypes.KeyFeePercentage)}: {}, + // ICS consumer + {Subspace: ccvconsumertypes.ModuleName, Key: string(ccvconsumertypes.KeyRewardDenoms)}: {}, + {Subspace: ccvconsumertypes.ModuleName, Key: string(ccvconsumertypes.KeyEnabled)}: {}, + {Subspace: ccvconsumertypes.ModuleName, Key: string(ccvconsumertypes.KeyBlocksPerDistributionTransmission)}: {}, + {Subspace: ccvconsumertypes.ModuleName, Key: string(ccvconsumertypes.KeyDistributionTransmissionChannel)}: {}, + {Subspace: ccvconsumertypes.ModuleName, Key: string(ccvconsumertypes.KeyProviderFeePoolAddrStr)}: {}, + {Subspace: ccvconsumertypes.ModuleName, Key: string(ccvconsumertypes.KeyTransferTimeoutPeriod)}: {}, + {Subspace: ccvconsumertypes.ModuleName, Key: string(ccvconsumertypes.KeyConsumerRedistributionFrac)}: {}, + {Subspace: ccvconsumertypes.ModuleName, Key: string(ccvconsumertypes.KeyHistoricalEntries)}: {}, + {Subspace: ccvconsumertypes.ModuleName, Key: string(ccvconsumertypes.KeyConsumerUnbondingPeriod)}: {}, + {Subspace: ccvconsumertypes.ModuleName, Key: string(ccvconsumertypes.KeySoftOptOutThreshold)}: {}, + {Subspace: ccvconsumertypes.ModuleName, Key: string(ccvconsumertypes.KeyProviderRewardDenoms)}: {}, } From 55792670d1962eb3385606b088aadafa7a2d1192 Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Tue, 14 Nov 2023 15:12:26 +0200 Subject: [PATCH 265/307] update whitelisted msgs --- app/proposals_allowlisting.go | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/app/proposals_allowlisting.go b/app/proposals_allowlisting.go index 3a00c7391..6bb7bf9a4 100644 --- a/app/proposals_allowlisting.go +++ b/app/proposals_allowlisting.go @@ -3,7 +3,11 @@ package app import ( wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" sdk "github.com/cosmos/cosmos-sdk/types" + authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" + banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" + crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" + minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" "github.com/cosmos/cosmos-sdk/x/params/types/proposal" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" globalfeetypes "github.com/cosmos/gaia/v11/x/globalfee/types" @@ -62,7 +66,11 @@ func isSdkMessageWhitelisted(msg sdk.Msg) bool { *feerefundertypes.MsgUpdateParams, *crontypes.MsgUpdateParams, *contractmanagertypes.MsgUpdateParams, - *dextypes.MsgUpdateParams: + *dextypes.MsgUpdateParams, + *banktypes.MsgUpdateParams, + *crisistypes.MsgUpdateParams, + *minttypes.MsgUpdateParams, + *authtypes.MsgUpdateParams: return true } return false @@ -79,30 +87,10 @@ var WhitelistedParams = map[paramChangeKey]struct{}{ // ica {Subspace: icahosttypes.SubModuleName, Key: string(icahosttypes.KeyHostEnabled)}: {}, {Subspace: icahosttypes.SubModuleName, Key: string(icahosttypes.KeyAllowMessages)}: {}, - // cosmwasm - // {Subspace: wasmtypes.ModuleName, Key: string(wasmtypes.ParamStoreKeyUploadAccess)}: {}, - // {Subspace: wasmtypes.ModuleName, Key: string(wasmtypes.ParamStoreKeyInstantiateAccess)}: {}, - // feerefunder - // {Subspace: feerefundertypes.ModuleName, Key: string(feerefundertypes.KeyFees)}: {}, - // interchaintxs - // {Subspace: interchaintxstypes.ModuleName, Key: string(interchaintxstypes.KeyMsgSubmitTxMaxMessages)}: {}, - // interchainqueries - // {Subspace: interchainqueriestypes.ModuleName, Key: string(interchainqueriestypes.KeyQuerySubmitTimeout)}: {}, - // {Subspace: interchainqueriestypes.ModuleName, Key: string(interchainqueriestypes.KeyQueryDeposit)}: {}, - // {Subspace: interchainqueriestypes.ModuleName, Key: string(interchainqueriestypes.KeyTxQueryRemovalLimit)}: {}, - // feeburner - // {Subspace: feeburnertypes.ModuleName, Key: string(feeburnertypes.KeyTreasuryAddress)}: {}, - // {Subspace: feeburnertypes.ModuleName, Key: string(feeburnertypes.KeyNeutronDenom)}: {}, - // tokenfactory - // {Subspace: tokenfactorytypes.ModuleName, Key: string(tokenfactorytypes.KeyDenomCreationFee)}: {}, - // {Subspace: tokenfactorytypes.ModuleName, Key: string(tokenfactorytypes.KeyFeeCollectorAddress)}: {}, // globalfee {Subspace: globalfeetypes.ModuleName, Key: string(globalfeetypes.ParamStoreKeyMinGasPrices)}: {}, {Subspace: globalfeetypes.ModuleName, Key: string(globalfeetypes.ParamStoreKeyBypassMinFeeMsgTypes)}: {}, {Subspace: globalfeetypes.ModuleName, Key: string(globalfeetypes.ParamStoreKeyMaxTotalBypassMinFeeMsgGasUsage)}: {}, - // cron - // {Subspace: crontypes.ModuleName, Key: string(crontypes.KeySecurityAddress)}: {}, - // {Subspace: crontypes.ModuleName, Key: string(crontypes.KeyLimit)}: {}, // packet-forward-middleware // {Subspace: packetforwardmiddlewaretypes.ModuleName, Key: string(packetforwardmiddlewaretypes.KeyFeePercentage)}: {}, } From 4a4c0f33593dac49be043602ea7fdc774e074826 Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Fri, 17 Nov 2023 13:41:06 +0200 Subject: [PATCH 266/307] whitelist ccvconsumer params --- app/proposals_allowlisting.go | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/app/proposals_allowlisting.go b/app/proposals_allowlisting.go index 6bb7bf9a4..791c9d689 100644 --- a/app/proposals_allowlisting.go +++ b/app/proposals_allowlisting.go @@ -14,6 +14,7 @@ import ( icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types" ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" + ccvconsumertypes "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types" contractmanagertypes "github.com/neutron-org/neutron/x/contractmanager/types" crontypes "github.com/neutron-org/neutron/x/cron/types" @@ -91,6 +92,16 @@ var WhitelistedParams = map[paramChangeKey]struct{}{ {Subspace: globalfeetypes.ModuleName, Key: string(globalfeetypes.ParamStoreKeyMinGasPrices)}: {}, {Subspace: globalfeetypes.ModuleName, Key: string(globalfeetypes.ParamStoreKeyBypassMinFeeMsgTypes)}: {}, {Subspace: globalfeetypes.ModuleName, Key: string(globalfeetypes.ParamStoreKeyMaxTotalBypassMinFeeMsgGasUsage)}: {}, - // packet-forward-middleware - // {Subspace: packetforwardmiddlewaretypes.ModuleName, Key: string(packetforwardmiddlewaretypes.KeyFeePercentage)}: {}, + // ICS consumer + {Subspace: ccvconsumertypes.ModuleName, Key: string(ccvconsumertypes.KeyRewardDenoms)}: {}, + {Subspace: ccvconsumertypes.ModuleName, Key: string(ccvconsumertypes.KeyEnabled)}: {}, + {Subspace: ccvconsumertypes.ModuleName, Key: string(ccvconsumertypes.KeyBlocksPerDistributionTransmission)}: {}, + {Subspace: ccvconsumertypes.ModuleName, Key: string(ccvconsumertypes.KeyDistributionTransmissionChannel)}: {}, + {Subspace: ccvconsumertypes.ModuleName, Key: string(ccvconsumertypes.KeyProviderFeePoolAddrStr)}: {}, + {Subspace: ccvconsumertypes.ModuleName, Key: string(ccvconsumertypes.KeyTransferTimeoutPeriod)}: {}, + {Subspace: ccvconsumertypes.ModuleName, Key: string(ccvconsumertypes.KeyConsumerRedistributionFrac)}: {}, + {Subspace: ccvconsumertypes.ModuleName, Key: string(ccvconsumertypes.KeyHistoricalEntries)}: {}, + {Subspace: ccvconsumertypes.ModuleName, Key: string(ccvconsumertypes.KeyConsumerUnbondingPeriod)}: {}, + {Subspace: ccvconsumertypes.ModuleName, Key: string(ccvconsumertypes.KeySoftOptOutThreshold)}: {}, + {Subspace: ccvconsumertypes.ModuleName, Key: string(ccvconsumertypes.KeyProviderRewardDenoms)}: {}, } From 196b157820d9a7490bb5b72fba231776b936a62b Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Fri, 17 Nov 2023 15:18:03 +0200 Subject: [PATCH 267/307] pfm update params whitelits --- app/proposals_allowlisting.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/proposals_allowlisting.go b/app/proposals_allowlisting.go index 791c9d689..6bc45f305 100644 --- a/app/proposals_allowlisting.go +++ b/app/proposals_allowlisting.go @@ -11,6 +11,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/params/types/proposal" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" globalfeetypes "github.com/cosmos/gaia/v11/x/globalfee/types" + pfmtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types" icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types" ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" @@ -71,6 +72,7 @@ func isSdkMessageWhitelisted(msg sdk.Msg) bool { *banktypes.MsgUpdateParams, *crisistypes.MsgUpdateParams, *minttypes.MsgUpdateParams, + *pfmtypes.MsgUpdateParams, *authtypes.MsgUpdateParams: return true } From bd8f153ed8e604552c6144cfe5cb2a1279785203 Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Fri, 17 Nov 2023 16:03:36 +0200 Subject: [PATCH 268/307] fix tokenfactory params upgrade --- app/upgrades/v1.1.0/upgrades.go | 1 + app/upgrades/v1.1.0/upgrades_test.go | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/app/upgrades/v1.1.0/upgrades.go b/app/upgrades/v1.1.0/upgrades.go index c696599e0..3ba3a35ef 100644 --- a/app/upgrades/v1.1.0/upgrades.go +++ b/app/upgrades/v1.1.0/upgrades.go @@ -189,6 +189,7 @@ func migrateTokenFactoryParams(ctx sdk.Context, paramsKeepers paramskeeper.Keepe subspace, _ := paramsKeepers.GetSubspace(tokenfactorytypes.StoreKey) subspace.Set(ctx, tokenfactorytypes.KeyDenomCreationGasConsume, uint64(0)) subspace.Set(ctx, tokenfactorytypes.KeyDenomCreationFee, sdk.NewCoins()) + subspace.Set(ctx, tokenfactorytypes.KeyFeeCollectorAddress, "") subspace.GetParamSet(ctx, &currParams) if err := currParams.Validate(); err != nil { diff --git a/app/upgrades/v1.1.0/upgrades_test.go b/app/upgrades/v1.1.0/upgrades_test.go index 2507cdcb6..b035e780f 100644 --- a/app/upgrades/v1.1.0/upgrades_test.go +++ b/app/upgrades/v1.1.0/upgrades_test.go @@ -178,6 +178,7 @@ func (suite *UpgradeTestSuite) TestTokenFactoryUpgrade() { // emulate mainnet state tokenFactorySubspace.Set(ctx, tokenfactorytypes.KeyDenomCreationFee, sdk.NewCoins(sdk.NewCoin(params.DefaultDenom, sdk.NewInt(100_000_000)))) + tokenFactorySubspace.Set(ctx, tokenfactorytypes.KeyFeeCollectorAddress, "neutron17dtl0mjt3t77kpuhg2edqzjpszulwhgzcdvagh") var denomFeeBefore sdk.Coins tokenFactorySubspace.Get(ctx, tokenfactorytypes.KeyDenomCreationFee, &denomFeeBefore) @@ -199,6 +200,11 @@ func (suite *UpgradeTestSuite) TestTokenFactoryUpgrade() { tokenFactorySubspace.Get(ctx, tokenfactorytypes.KeyDenomCreationFee, &denomFee) requiredFeeDenom := sdk.NewCoins() suite.Require().Equal(len(requiredFeeDenom), len(denomFee)) + + var feeCollector string + tokenFactorySubspace.Get(ctx, tokenfactorytypes.KeyFeeCollectorAddress, &feeCollector) + requiredFeeCollector := "" + suite.Require().Equal(requiredFeeCollector, feeCollector) } func (suite *UpgradeTestSuite) TestRegisterInterchainAccountCreationFee() { From 22e763ca031d2f0504d8459bc04acc95d48bfc2b Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Fri, 17 Nov 2023 16:03:36 +0200 Subject: [PATCH 269/307] fix tokenfactory params upgrade --- app/upgrades/v1.1.0/upgrades.go | 1 + app/upgrades/v1.1.0/upgrades_test.go | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/app/upgrades/v1.1.0/upgrades.go b/app/upgrades/v1.1.0/upgrades.go index c696599e0..3ba3a35ef 100644 --- a/app/upgrades/v1.1.0/upgrades.go +++ b/app/upgrades/v1.1.0/upgrades.go @@ -189,6 +189,7 @@ func migrateTokenFactoryParams(ctx sdk.Context, paramsKeepers paramskeeper.Keepe subspace, _ := paramsKeepers.GetSubspace(tokenfactorytypes.StoreKey) subspace.Set(ctx, tokenfactorytypes.KeyDenomCreationGasConsume, uint64(0)) subspace.Set(ctx, tokenfactorytypes.KeyDenomCreationFee, sdk.NewCoins()) + subspace.Set(ctx, tokenfactorytypes.KeyFeeCollectorAddress, "") subspace.GetParamSet(ctx, &currParams) if err := currParams.Validate(); err != nil { diff --git a/app/upgrades/v1.1.0/upgrades_test.go b/app/upgrades/v1.1.0/upgrades_test.go index 2507cdcb6..b035e780f 100644 --- a/app/upgrades/v1.1.0/upgrades_test.go +++ b/app/upgrades/v1.1.0/upgrades_test.go @@ -178,6 +178,7 @@ func (suite *UpgradeTestSuite) TestTokenFactoryUpgrade() { // emulate mainnet state tokenFactorySubspace.Set(ctx, tokenfactorytypes.KeyDenomCreationFee, sdk.NewCoins(sdk.NewCoin(params.DefaultDenom, sdk.NewInt(100_000_000)))) + tokenFactorySubspace.Set(ctx, tokenfactorytypes.KeyFeeCollectorAddress, "neutron17dtl0mjt3t77kpuhg2edqzjpszulwhgzcdvagh") var denomFeeBefore sdk.Coins tokenFactorySubspace.Get(ctx, tokenfactorytypes.KeyDenomCreationFee, &denomFeeBefore) @@ -199,6 +200,11 @@ func (suite *UpgradeTestSuite) TestTokenFactoryUpgrade() { tokenFactorySubspace.Get(ctx, tokenfactorytypes.KeyDenomCreationFee, &denomFee) requiredFeeDenom := sdk.NewCoins() suite.Require().Equal(len(requiredFeeDenom), len(denomFee)) + + var feeCollector string + tokenFactorySubspace.Get(ctx, tokenfactorytypes.KeyFeeCollectorAddress, &feeCollector) + requiredFeeCollector := "" + suite.Require().Equal(requiredFeeCollector, feeCollector) } func (suite *UpgradeTestSuite) TestRegisterInterchainAccountCreationFee() { From 0988cc4bc715b1cfc1389bd298c8ad4d2ca2f8c9 Mon Sep 17 00:00:00 2001 From: Julian Compagni Portis Date: Thu, 16 Nov 2023 22:25:54 -0500 Subject: [PATCH 270/307] fix ibcswap tests to account for changes to swap rounding --- tests/ibc/gmp_swap_forward_test.go | 9 ++++----- tests/ibc/swap_forward_test.go | 13 +++++-------- tests/ibc/swap_test.go | 3 +-- 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/tests/ibc/gmp_swap_forward_test.go b/tests/ibc/gmp_swap_forward_test.go index caccfad09..a0bc6eb7b 100644 --- a/tests/ibc/gmp_swap_forward_test.go +++ b/tests/ibc/gmp_swap_forward_test.go @@ -99,11 +99,10 @@ func (s *IBCTestSuite) TestGMPSwapAndForward_Success() { // Check that the funds are moved out of the acc on providerChain s.assertProviderBalance(s.providerAddr, nativeDenom, newProviderBalNative.Sub(ibcTransferAmount)) - // Check that the amountIn is deducted from the neutron override account - overrideAddr := s.ReceiverOverrideAddr(s.neutronTransferPath.EndpointA.ChannelID, s.providerAddr.String()) - s.assertNeutronBalance(overrideAddr, s.providerToNeutronDenom, math.OneInt()) - // Check that neutron override account did not keep any of the transfer denom - s.assertNeutronBalance(overrideAddr, nativeDenom, math.ZeroInt()) + // Check that the amountIn is deduced from the neutron account + s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, math.OneInt()) + // Check that neutron account did not keep any of the transfer denom + s.assertNeutronBalance(s.neutronAddr, nativeDenom, genesisWalletAmount.Sub(swapAmount)) transferDenomPath := transfertypes.GetPrefixedDenom( transfertypes.PortID, diff --git a/tests/ibc/swap_forward_test.go b/tests/ibc/swap_forward_test.go index 2db01e8ed..24284e304 100644 --- a/tests/ibc/swap_forward_test.go +++ b/tests/ibc/swap_forward_test.go @@ -109,11 +109,10 @@ func (s *IBCTestSuite) TestSwapAndForward_Success() { newProviderBalNative.Sub(ibcTransferAmount), ) - // Check that the amountIn is deducted from the neutron overrid receiver account - overrideAddr := s.ReceiverOverrideAddr(s.neutronTransferPath.EndpointA.ChannelID, s.providerAddr.String()) - s.assertNeutronBalance(overrideAddr, s.providerToNeutronDenom, math.OneInt()) + // Check that the amountIn is deducted from the neutron account + s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, math.OneInt()) // Check that neutron account did not keep any of the transfer denom - s.assertNeutronBalance(overrideAddr, nativeDenom, math.ZeroInt()) + s.assertNeutronBalance(s.neutronAddr, nativeDenom, postDepositNeutronBalNative) transferDenomPath := transfertypes.GetPrefixedDenom( transfertypes.PortID, @@ -359,10 +358,8 @@ func (s *IBCTestSuite) TestSwapAndForward_UnwindIBCDenomSuccess() { s.Assert().NoError(err) s.coordinator.CommitBlock(s.neutronChain) - // Check that the amountIn is deduced from the neutron account - s.assertNeutronBalance(s.neutronAddr, nativeDenom, postDepositNeutronBalNative.Sub(swapAmount)) // Check that the amountIn has been deducted from the neutron chain - s.assertNeutronBalance(s.neutronAddr, nativeDenom, postDepositNeutronBalNative.Sub(swapAmount)) + s.assertNeutronBalance(s.neutronAddr, nativeDenom, postDepositNeutronBalNative.Sub(swapAmount).Add(math.OneInt())) // Check that the funds are now present on the provider chainer s.assertProviderBalance( s.providerAddr, @@ -472,7 +469,7 @@ func (s *IBCTestSuite) TestSwapAndForward_ForwardFails() { ) // Check that the amountIn is deduced from the neutron account - s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, math.ZeroInt()) + s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, math.OneInt()) // Check that the amountOut stays on the neutronchain s.assertNeutronBalance( s.neutronAddr, diff --git a/tests/ibc/swap_test.go b/tests/ibc/swap_test.go index 05d51e95b..dbb21ad65 100644 --- a/tests/ibc/swap_test.go +++ b/tests/ibc/swap_test.go @@ -83,8 +83,7 @@ func (s *IBCTestSuite) TestIBCSwapMiddleware_Success() { s.assertNeutronBalance(s.neutronAddr, nativeDenom, postDepositNeutronBalNative.Add(expectedOut)) // Check that all of the IBC transfer denom have been used up - overrideAddr := s.ReceiverOverrideAddr(s.neutronTransferPath.EndpointA.ChannelID, s.providerAddr.String()) - s.assertNeutronBalance(overrideAddr, s.providerToNeutronDenom, math.OneInt()) + s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, math.OneInt()) } // TestIBCSwapMiddleware_FailRefund asserts that the IBC swap middleware works as intended with Neutron running as a From 208737bd13d800dff65bb67cede31549c3ec3e5f Mon Sep 17 00:00:00 2001 From: Julian Compagni Portis Date: Fri, 17 Nov 2023 10:22:33 -0500 Subject: [PATCH 271/307] Revert "pfm update params whitelits" This reverts commit 196b157820d9a7490bb5b72fba231776b936a62b. --- app/proposals_allowlisting.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/proposals_allowlisting.go b/app/proposals_allowlisting.go index 6bc45f305..791c9d689 100644 --- a/app/proposals_allowlisting.go +++ b/app/proposals_allowlisting.go @@ -11,7 +11,6 @@ import ( "github.com/cosmos/cosmos-sdk/x/params/types/proposal" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" globalfeetypes "github.com/cosmos/gaia/v11/x/globalfee/types" - pfmtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types" icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types" ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" @@ -72,7 +71,6 @@ func isSdkMessageWhitelisted(msg sdk.Msg) bool { *banktypes.MsgUpdateParams, *crisistypes.MsgUpdateParams, *minttypes.MsgUpdateParams, - *pfmtypes.MsgUpdateParams, *authtypes.MsgUpdateParams: return true } From 433576aa716eb8cd1f285ba5778367e27a8411d5 Mon Sep 17 00:00:00 2001 From: Julian Compagni Portis Date: Fri, 17 Nov 2023 10:50:46 -0500 Subject: [PATCH 272/307] whitelist pfm params --- app/proposals_allowlisting.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/proposals_allowlisting.go b/app/proposals_allowlisting.go index 791c9d689..2c9213774 100644 --- a/app/proposals_allowlisting.go +++ b/app/proposals_allowlisting.go @@ -11,6 +11,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/params/types/proposal" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" globalfeetypes "github.com/cosmos/gaia/v11/x/globalfee/types" + packetforwardmiddlewaretypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router/types" icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types" ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" @@ -92,6 +93,8 @@ var WhitelistedParams = map[paramChangeKey]struct{}{ {Subspace: globalfeetypes.ModuleName, Key: string(globalfeetypes.ParamStoreKeyMinGasPrices)}: {}, {Subspace: globalfeetypes.ModuleName, Key: string(globalfeetypes.ParamStoreKeyBypassMinFeeMsgTypes)}: {}, {Subspace: globalfeetypes.ModuleName, Key: string(globalfeetypes.ParamStoreKeyMaxTotalBypassMinFeeMsgGasUsage)}: {}, + // packet-forward-middleware + {Subspace: packetforwardmiddlewaretypes.ModuleName, Key: string(packetforwardmiddlewaretypes.KeyFeePercentage)}: {}, // ICS consumer {Subspace: ccvconsumertypes.ModuleName, Key: string(ccvconsumertypes.KeyRewardDenoms)}: {}, {Subspace: ccvconsumertypes.ModuleName, Key: string(ccvconsumertypes.KeyEnabled)}: {}, From d88d5bf0f92577f24c42fa03cb14d8b7da32cf28 Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Fri, 17 Nov 2023 19:24:23 +0200 Subject: [PATCH 273/307] whitelist MsgUpdateParams for auction module --- app/proposals_allowlisting.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/proposals_allowlisting.go b/app/proposals_allowlisting.go index 23722d742..898547166 100644 --- a/app/proposals_allowlisting.go +++ b/app/proposals_allowlisting.go @@ -15,6 +15,7 @@ import ( ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" ccvconsumertypes "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types" + auctiontypes "github.com/skip-mev/block-sdk/x/auction/types" contractmanagertypes "github.com/neutron-org/neutron/x/contractmanager/types" crontypes "github.com/neutron-org/neutron/x/cron/types" @@ -66,6 +67,7 @@ func isSdkMessageWhitelisted(msg sdk.Msg) bool { *feerefundertypes.MsgUpdateParams, *crontypes.MsgUpdateParams, *contractmanagertypes.MsgUpdateParams, + *auctiontypes.MsgUpdateParams, *banktypes.MsgUpdateParams, *crisistypes.MsgUpdateParams, *minttypes.MsgUpdateParams, From 7a775631eb6cb38bb04a09d1ebbcc8d9bc762f4d Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Sun, 19 Nov 2023 21:15:19 +0200 Subject: [PATCH 274/307] revert SkipCcvMsgFilter const --- app/ccv_msg_filter_add.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/ccv_msg_filter_add.go b/app/ccv_msg_filter_add.go index 0f883f44e..d4ead58a7 100644 --- a/app/ccv_msg_filter_add.go +++ b/app/ccv_msg_filter_add.go @@ -2,4 +2,4 @@ package app -const SkipCcvMsgFilter = true // TODO вернуть false +const SkipCcvMsgFilter = false From e2441a1a82a1c1c9c8f5b717f781101e02d6749e Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Sun, 19 Nov 2023 22:46:48 +0200 Subject: [PATCH 275/307] update cosmos-sdk to 0.47.6 --- go.mod | 32 ++++++++++++++--------------- go.sum | 64 +++++++++++++++++++++++++++++----------------------------- 2 files changed, 48 insertions(+), 48 deletions(-) diff --git a/go.mod b/go.mod index ed457d3f1..3d91873c5 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( cosmossdk.io/core v0.5.1 cosmossdk.io/errors v1.0.0 cosmossdk.io/log v1.2.1 - cosmossdk.io/math v1.1.2 + cosmossdk.io/math v1.2.0 github.com/CosmWasm/wasmd v0.43.0 github.com/CosmWasm/wasmvm v1.4.1 github.com/armon/go-metrics v0.4.1 @@ -14,7 +14,7 @@ require ( github.com/cometbft/cometbft-db v0.8.0 github.com/cosmos/admin-module v0.0.0-20220204080909-475a98e03f31 github.com/cosmos/cosmos-proto v1.0.0-beta.2 - github.com/cosmos/cosmos-sdk v0.47.5 + github.com/cosmos/cosmos-sdk v0.47.6 github.com/cosmos/gaia/v11 v11.0.0-00010101000000-000000000000 github.com/cosmos/gogoproto v1.4.10 github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.1.1 @@ -35,16 +35,16 @@ require ( github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.16.0 github.com/stretchr/testify v1.8.4 - google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d + google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97 google.golang.org/grpc v1.59.0 gopkg.in/yaml.v2 v2.4.0 ) require ( - cloud.google.com/go v0.110.7 // indirect + cloud.google.com/go v0.110.8 // indirect cloud.google.com/go/compute v1.23.0 // indirect cloud.google.com/go/compute/metadata v0.2.3 // indirect - cloud.google.com/go/iam v1.1.1 // indirect + cloud.google.com/go/iam v1.1.2 // indirect cloud.google.com/go/storage v1.30.1 // indirect cosmossdk.io/api v0.3.1 // indirect cosmossdk.io/depinject v1.0.0-alpha.4 // indirect @@ -103,8 +103,8 @@ require ( github.com/google/orderedcode v0.0.1 // indirect github.com/google/s2a-go v0.1.4 // indirect github.com/google/uuid v1.3.1 // indirect - github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect - github.com/googleapis/gax-go/v2 v2.11.0 // indirect + github.com/googleapis/enterprise-certificate-proxy v0.2.4 // indirect + github.com/googleapis/gax-go/v2 v2.12.0 // indirect github.com/gorilla/handlers v1.5.1 // indirect github.com/gorilla/websocket v1.5.0 // indirect github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect @@ -162,23 +162,23 @@ require ( github.com/tendermint/go-amino v0.16.0 // indirect github.com/tidwall/btree v1.6.0 // indirect github.com/ulikunitz/xz v0.5.11 // indirect - github.com/zondax/hid v0.9.1 // indirect - github.com/zondax/ledger-go v0.14.1 // indirect + github.com/zondax/hid v0.9.2 // indirect + github.com/zondax/ledger-go v0.14.3 // indirect go.etcd.io/bbolt v1.3.7 // indirect go.opencensus.io v0.24.0 // indirect - golang.org/x/crypto v0.13.0 // indirect + golang.org/x/crypto v0.14.0 // indirect golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb // indirect golang.org/x/net v0.15.0 // indirect golang.org/x/oauth2 v0.12.0 // indirect golang.org/x/sync v0.3.0 // indirect - golang.org/x/sys v0.12.0 // indirect - golang.org/x/term v0.12.0 // indirect + golang.org/x/sys v0.13.0 // indirect + golang.org/x/term v0.13.0 // indirect golang.org/x/text v0.13.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect - google.golang.org/api v0.126.0 // indirect + google.golang.org/api v0.128.0 // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect + google.golang.org/genproto v0.0.0-20230920204549-e6e6cdab5c13 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13 // indirect google.golang.org/protobuf v1.31.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect @@ -192,7 +192,7 @@ replace ( github.com/ChainSafe/go-schnorrkel => github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d github.com/CosmWasm/wasmd => github.com/neutron-org/wasmd v0.43.0 github.com/cosmos/admin-module => github.com/neutron-org/admin-module v1.0.0 - github.com/cosmos/cosmos-sdk => github.com/neutron-org/cosmos-sdk v0.47.5 + github.com/cosmos/cosmos-sdk => github.com/neutron-org/cosmos-sdk v0.47.6 github.com/cosmos/gaia/v11 => github.com/cosmos/gaia/v11 v11.0.0-20230724152830-861ba391c3b4 github.com/cosmos/ledger-cosmos-go => github.com/cosmos/ledger-cosmos-go v0.12.1 github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 diff --git a/go.sum b/go.sum index 626d4a95e..0e9619a6e 100644 --- a/go.sum +++ b/go.sum @@ -34,8 +34,8 @@ cloud.google.com/go v0.100.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w9 cloud.google.com/go v0.102.0/go.mod h1:oWcCzKlqJ5zgHQt9YsaeTY9KzIvjyy0ArmiBUgpQ+nc= cloud.google.com/go v0.102.1/go.mod h1:XZ77E9qnTEnrgEOvr4xzfdX5TRo7fB4T2F4O6+34hIU= cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA= -cloud.google.com/go v0.110.7 h1:rJyC7nWRg2jWGZ4wSJ5nY65GTdYJkg0cd/uXb+ACI6o= -cloud.google.com/go v0.110.7/go.mod h1:+EYjdK8e5RME/VY/qLCAtuyALQ9q67dvuum8i+H5xsI= +cloud.google.com/go v0.110.8 h1:tyNdfIxjzaWctIiLYOTalaLKZ17SI44SKFW26QbOhME= +cloud.google.com/go v0.110.8/go.mod h1:Iz8AkXJf1qmxC3Oxoep8R1T36w8B92yU29PcBhHO5fk= cloud.google.com/go/aiplatform v1.22.0/go.mod h1:ig5Nct50bZlzV6NvKaTwmplLLddFx0YReh9WfTO5jKw= cloud.google.com/go/aiplatform v1.24.0/go.mod h1:67UUvRBKG6GTayHKV8DBv2RtR1t93YRu5B1P3x99mYY= cloud.google.com/go/analytics v0.11.0/go.mod h1:DjEWCu41bVbYcKyvlws9Er60YE4a//bK6mnhWvQeFNI= @@ -114,8 +114,8 @@ cloud.google.com/go/gkehub v0.10.0/go.mod h1:UIPwxI0DsrpsVoWpLB0stwKCP+WFVG9+y97 cloud.google.com/go/grafeas v0.2.0/go.mod h1:KhxgtF2hb0P191HlY5besjYm6MqTSTj3LSI+M+ByZHc= cloud.google.com/go/iam v0.3.0/go.mod h1:XzJPvDayI+9zsASAFO68Hk07u3z+f+JrT2xXNdp4bnY= cloud.google.com/go/iam v0.5.0/go.mod h1:wPU9Vt0P4UmCux7mqtRu6jcpPAb74cP1fh50J3QpkUc= -cloud.google.com/go/iam v1.1.1 h1:lW7fzj15aVIXYHREOqjRBV9PsH0Z6u8Y46a1YGvQP4Y= -cloud.google.com/go/iam v1.1.1/go.mod h1:A5avdyVL2tCppe4unb0951eI9jreack+RJ0/d+KUZOU= +cloud.google.com/go/iam v1.1.2 h1:gacbrBdWcoVmGLozRuStX45YKvJtzIjJdAolzUs1sm4= +cloud.google.com/go/iam v1.1.2/go.mod h1:A5avdyVL2tCppe4unb0951eI9jreack+RJ0/d+KUZOU= cloud.google.com/go/language v1.4.0/go.mod h1:F9dRpNFQmJbkaop6g0JhSBXCNlO90e1KWx5iDdxbWic= cloud.google.com/go/language v1.6.0/go.mod h1:6dJ8t3B+lUYfStgls25GusK04NLh3eDLQnWM3mdEbhI= cloud.google.com/go/lifesciences v0.5.0/go.mod h1:3oIKy8ycWGPUyZDR/8RNnTOYevhaMLqh5vLUXs9zvT8= @@ -201,8 +201,8 @@ cosmossdk.io/errors v1.0.0 h1:nxF07lmlBbB8NKQhtJ+sJm6ef5uV1XkvPXG2bUntb04= cosmossdk.io/errors v1.0.0/go.mod h1:+hJZLuhdDE0pYN8HkOrVNwrIOYvUGnn6+4fjnJs/oV0= cosmossdk.io/log v1.2.1 h1:Xc1GgTCicniwmMiKwDxUjO4eLhPxoVdI9vtMW8Ti/uk= cosmossdk.io/log v1.2.1/go.mod h1:GNSCc/6+DhFIj1aLn/j7Id7PaO8DzNylUZoOYBL9+I4= -cosmossdk.io/math v1.1.2 h1:ORZetZCTyWkI5GlZ6CZS28fMHi83ZYf+A2vVnHNzZBM= -cosmossdk.io/math v1.1.2/go.mod h1:l2Gnda87F0su8a/7FEKJfFdJrM0JZRXQaohlgJeyQh0= +cosmossdk.io/math v1.2.0 h1:8gudhTkkD3NxOP2YyyJIYYmt6dQ55ZfJkDOaxXpy7Ig= +cosmossdk.io/math v1.2.0/go.mod h1:l2Gnda87F0su8a/7FEKJfFdJrM0JZRXQaohlgJeyQh0= cosmossdk.io/tools/rosetta v0.2.1 h1:ddOMatOH+pbxWbrGJKRAawdBkPYLfKXutK9IETnjYxw= cosmossdk.io/tools/rosetta v0.2.1/go.mod h1:Pqdc1FdvkNV3LcNIkYWt2RQY6IP1ge6YWZk8MhhO9Hw= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= @@ -313,7 +313,7 @@ github.com/btcsuite/snappy-go v0.0.0-20151229074030-0bdef8d06723/go.mod h1:8woku github.com/btcsuite/snappy-go v1.0.0/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc= github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod h1:ghJtEyQwv5/p4Mg4C0fgbePVuGr935/5ddU9Z3TmDRY= github.com/btcsuite/winsvc v1.0.0/go.mod h1:jsenWakMcC0zFBFurPLEAyrnc/teJEM1O46fmI40EZs= -github.com/bufbuild/protocompile v0.5.1 h1:mixz5lJX4Hiz4FpqFREJHIXLfaLBntfaJv1h+/jS+Qg= +github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA= github.com/bwesterb/go-ristretto v1.2.0/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0= github.com/c-bata/go-prompt v0.2.2/go.mod h1:VzqtzE2ksDBcdln8G7mk2RX9QyGjH+OVqOCSiVIqS34= github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= @@ -667,8 +667,8 @@ github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+ github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/enterprise-certificate-proxy v0.1.0/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg= -github.com/googleapis/enterprise-certificate-proxy v0.2.3 h1:yk9/cqRKtT9wXZSsRH9aurXEpJX+U6FLtpYTdC3R06k= -github.com/googleapis/enterprise-certificate-proxy v0.2.3/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k= +github.com/googleapis/enterprise-certificate-proxy v0.2.4 h1:uGy6JWR/uMIILU8wbf+OkstIrNiMjGpEIyhx8f6W7s4= +github.com/googleapis/enterprise-certificate-proxy v0.2.4/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0= @@ -678,8 +678,8 @@ github.com/googleapis/gax-go/v2 v2.3.0/go.mod h1:b8LNqSzNabLiUpXKkY7HAR5jr6bIT99 github.com/googleapis/gax-go/v2 v2.4.0/go.mod h1:XOTVJ59hdnfJLIP/dh8n5CGryZR2LxK9wbMD5+iXC6c= github.com/googleapis/gax-go/v2 v2.5.1/go.mod h1:h6B0KMMFNtI2ddbGJn3T3ZbwkeT6yqEF02fYlzkUCyo= github.com/googleapis/gax-go/v2 v2.6.0/go.mod h1:1mjbznJAPHFpesgE5ucqfYEscaz5kMdcIDwU/6+DDoY= -github.com/googleapis/gax-go/v2 v2.11.0 h1:9V9PWXEsWnPpQhu/PeQIkS4eGzMlTLGgt80cUUI8Ki4= -github.com/googleapis/gax-go/v2 v2.11.0/go.mod h1:DxmR61SGKkGLa2xigwuZIQpkCI2S5iydzRfb3peWZJI= +github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56etFpas= +github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU= github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4= github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= @@ -936,13 +936,13 @@ github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OS github.com/neilotoole/errgroup v0.1.6/go.mod h1:Q2nLGf+594h0CLBs/Mbg6qOr7GtqDK7C2S41udRnToE= github.com/neutron-org/admin-module v1.0.0 h1:mmX5U6jz4rX+lk8SB5Bx0Lsugu9bh4PCREMnVkLQoIs= github.com/neutron-org/admin-module v1.0.0/go.mod h1:INknneN2W3Fr9Eld7SpfLRdjyHR1muzFbbqXln1ixic= -github.com/neutron-org/cosmos-sdk v0.47.5 h1:BUBqUPI5I8rF9ql3RfSCo9XkpZBJPhTZSIWexyxutA4= -github.com/neutron-org/cosmos-sdk v0.47.5/go.mod h1:3uZbdGpMOT5usEich5wHANLxz0VbKE9lL1PUq+rzkS4= +github.com/neutron-org/cosmos-sdk v0.47.6 h1:FaHH5DUb4JP1zI945/j+CzbhBvhxqe6iFIn2HER4xks= +github.com/neutron-org/cosmos-sdk v0.47.6/go.mod h1:7BmlRp0txKo2UZ01OLq4DGEjgLDiPgmpRpjLOq89Jys= github.com/neutron-org/wasmd v0.43.0 h1:aXzN9diVRAKTs2+EdK4zoTOmNCjjr8vpAhIq8VbBUJc= github.com/neutron-org/wasmd v0.43.0/go.mod h1:GEWnDHjbx7qtVHQ+5ocrNe1sIHNiXcTlSocXyLQNnRY= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= +github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= -github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs= github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= @@ -1178,10 +1178,10 @@ github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -github.com/zondax/hid v0.9.1 h1:gQe66rtmyZ8VeGFcOpbuH3r7erYtNEAezCAYu8LdkJo= -github.com/zondax/hid v0.9.1/go.mod h1:l5wttcP0jwtdLjqjMMWFVEE7d1zO0jvSPA9OPZxWpEM= -github.com/zondax/ledger-go v0.14.1 h1:Pip65OOl4iJ84WTpA4BKChvOufMhhbxED3BaihoZN4c= -github.com/zondax/ledger-go v0.14.1/go.mod h1:fZ3Dqg6qcdXWSOJFKMG8GCTnD7slO/RL2feOQv8K320= +github.com/zondax/hid v0.9.2 h1:WCJFnEDMiqGF64nlZz28E9qLVZ0KSJ7xpc5DLEyma2U= +github.com/zondax/hid v0.9.2/go.mod h1:l5wttcP0jwtdLjqjMMWFVEE7d1zO0jvSPA9OPZxWpEM= +github.com/zondax/ledger-go v0.14.3 h1:wEpJt2CEcBJ428md/5MgSLsXLBos98sBOyxNmCjfUCw= +github.com/zondax/ledger-go v0.14.3/go.mod h1:IKKaoxupuB43g4NxeQmbLXv7T9AlQyie1UpHb342ycI= go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.7 h1:j+zJOnnEjF/kyHlDDgGnVL/AIqIJPq8UoB2GSNfkUfQ= go.etcd.io/bbolt v1.3.7/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw= @@ -1236,8 +1236,8 @@ golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220314234659-1baeb1ce4c0b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck= -golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= +golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= +golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -1501,14 +1501,14 @@ golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20221010170243-090e33056c14/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o= -golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= +golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.12.0 h1:/ZfYdc3zq+q02Rv9vGqTeSItdzZTSNDmfTi0mBAuidU= -golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU= +golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek= +golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1657,8 +1657,8 @@ google.golang.org/api v0.96.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ google.golang.org/api v0.97.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= google.golang.org/api v0.98.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70= -google.golang.org/api v0.126.0 h1:q4GJq+cAdMAC7XP7njvQ4tvohGLiSlytuL4BQxbIZ+o= -google.golang.org/api v0.126.0/go.mod h1:mBwVAtz+87bEN6CbA1GtZPDOqY2R5ONPqJeIlvyo4Aw= +google.golang.org/api v0.128.0 h1:RjPESny5CnQRn9V6siglged+DZCgfu9l6mO9dkX9VOg= +google.golang.org/api v0.128.0/go.mod h1:Y611qgqaE92On/7g65MQgxYul3c0rEB894kniWLY750= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -1779,12 +1779,12 @@ google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqw google.golang.org/genproto v0.0.0-20221014173430-6e2ab493f96b/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221025140454-527a21cfbd71/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s= -google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d h1:VBu5YqKPv6XiJ199exd8Br+Aetz+o08F+PLMnwJQHAY= -google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d/go.mod h1:yZTlhN0tQnXo3h00fuXNCxJdLdIdnVFVBaRJ5LWBbw4= -google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d h1:DoPTO70H+bcDXcd39vOqb2viZxgqeBeSGtZ55yZU4/Q= -google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d/go.mod h1:KjSP20unUpOx5kyQUFa7k4OJg0qeJ7DEZflGDu2p6Bk= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d h1:uvYuEyMHKNt+lT4K3bN6fGswmK8qSvcreM3BwjDh+y4= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M= +google.golang.org/genproto v0.0.0-20230920204549-e6e6cdab5c13 h1:vlzZttNJGVqTsRFU9AmdnrcO1Znh8Ew9kCD//yjigk0= +google.golang.org/genproto v0.0.0-20230920204549-e6e6cdab5c13/go.mod h1:CCviP9RmpZ1mxVr8MUjCnSiY09IbAXZxhLE6EhHIdPU= +google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97 h1:W18sezcAYs+3tDZX4F80yctqa12jcP1PUS2gQu1zTPU= +google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97/go.mod h1:iargEX0SFPm3xcfMI0d1domjg0ZF4Aa0p2awqyxhvF0= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13 h1:N3bU/SQDCDyD6R528GJ/PwW9KjYcJA3dgyH+MovAkIM= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13/go.mod h1:KSqppvjFjtoCI+KGd4PELB0qLNxdJHRGqRI09mB6pQA= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= From cae36089abf98f32e2972a0c0a7e4261788419e1 Mon Sep 17 00:00:00 2001 From: Julian Compagni Portis Date: Sun, 19 Nov 2023 23:17:02 -0500 Subject: [PATCH 276/307] Revert "Merge pull request #372 from neutron-org/fix/revert-pfm-upgrade" This reverts commit 4e974e456c7f465b8e86d2ba631a9d7549cbd5e6, reversing changes made to 22e763ca031d2f0504d8459bc04acc95d48bfc2b. --- app/app.go | 41 +++--- app/proposals_allowlisting.go | 5 +- go.mod | 3 +- go.sum | 5 +- tests/ibc/gmp_swap_forward_test.go | 17 +-- tests/ibc/ibc_setup_test.go | 9 ++ tests/ibc/swap_forward_test.go | 211 ++++++++++++++++++++++------- tests/ibc/swap_test.go | 56 +------- x/ibcswap/ibc_middleware.go | 152 +++++++++++++-------- x/ibcswap/keeper/keeper.go | 5 +- x/ibcswap/types/swap.go | 23 +++- x/ibcswap/types/swap_test.go | 6 +- 12 files changed, 330 insertions(+), 203 deletions(-) diff --git a/app/app.go b/app/app.go index 5219bccb5..2123aafe8 100644 --- a/app/app.go +++ b/app/app.go @@ -9,8 +9,7 @@ import ( "path/filepath" globalfeetypes "github.com/cosmos/gaia/v11/x/globalfee/types" - "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router" - + "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward" "github.com/cosmos/interchain-security/v3/testutil/integration" wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" @@ -147,8 +146,8 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" consensusparamkeeper "github.com/cosmos/cosmos-sdk/x/consensus/keeper" consensusparamtypes "github.com/cosmos/cosmos-sdk/x/consensus/types" - routerkeeper "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router/keeper" - routertypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router/types" + pfmkeeper "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/keeper" + pfmtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types" "github.com/neutron-org/neutron/x/dex" dexkeeper "github.com/neutron-org/neutron/x/dex/keeper" @@ -225,7 +224,7 @@ var ( ), ), ibchooks.AppModuleBasic{}, - router.AppModuleBasic{}, + packetforward.AppModuleBasic{}, auction.AppModuleBasic{}, globalfee.AppModule{}, dex.AppModuleBasic{}, @@ -310,11 +309,11 @@ type App struct { ConsumerKeeper ccvconsumerkeeper.Keeper TokenFactoryKeeper *tokenfactorykeeper.Keeper CronKeeper cronkeeper.Keeper - PFMKeeper *routerkeeper.Keeper + PFMKeeper *pfmkeeper.Keeper DexKeeper dexkeeper.Keeper SwapKeeper ibcswapkeeper.Keeper - RouterModule router.AppModule + PFMModule packetforward.AppModule HooksTransferIBCModule *ibchooks.IBCMiddleware HooksICS4Wrapper ibchooks.ICS4Middleware @@ -396,7 +395,7 @@ func New( evidencetypes.StoreKey, ibctransfertypes.StoreKey, icacontrollertypes.StoreKey, icahosttypes.StoreKey, capabilitytypes.StoreKey, interchainqueriesmoduletypes.StoreKey, contractmanagermoduletypes.StoreKey, interchaintxstypes.StoreKey, wasmtypes.StoreKey, feetypes.StoreKey, - feeburnertypes.StoreKey, adminmoduletypes.StoreKey, ccvconsumertypes.StoreKey, tokenfactorytypes.StoreKey, routertypes.StoreKey, + feeburnertypes.StoreKey, adminmoduletypes.StoreKey, ccvconsumertypes.StoreKey, tokenfactorytypes.StoreKey, pfmtypes.StoreKey, crontypes.StoreKey, ibchookstypes.StoreKey, consensusparamtypes.StoreKey, crisistypes.StoreKey, auctiontypes.StoreKey, dextypes.StoreKey, ) tkeys := sdk.NewTransientStoreKeys(paramstypes.TStoreKey) @@ -532,15 +531,15 @@ func New( feeBurnerModule := feeburner.NewAppModule(appCodec, *app.FeeBurnerKeeper) // PFMKeeper must be created before TransferKeeper - app.PFMKeeper = routerkeeper.NewKeeper( + app.PFMKeeper = pfmkeeper.NewKeeper( appCodec, - app.keys[routertypes.StoreKey], - app.GetSubspace(routertypes.ModuleName), + app.keys[pfmtypes.StoreKey], app.TransferKeeper.Keeper, 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.HooksICS4Wrapper = ibchooks.NewICS4Middleware( @@ -751,14 +750,14 @@ func New( contractManagerModule := contractmanager.NewAppModule(appCodec, app.ContractManagerKeeper) ibcHooksModule := ibchooks.NewAppModule(app.AccountKeeper) - app.RouterModule = router.NewAppModule(app.PFMKeeper) + app.PFMModule = packetforward.NewAppModule(app.PFMKeeper, app.GetSubspace(pfmtypes.ModuleName)) - var ibcStack ibcporttypes.IBCModule = router.NewIBCMiddleware( + var ibcStack ibcporttypes.IBCModule = packetforward.NewIBCMiddleware( app.HooksTransferIBCModule, app.PFMKeeper, 0, - routerkeeper.DefaultForwardTransferPacketTimeoutTimestamp, - routerkeeper.DefaultRefundTransferPacketTimeoutTimestamp, + pfmkeeper.DefaultForwardTransferPacketTimeoutTimestamp, + pfmkeeper.DefaultRefundTransferPacketTimeoutTimestamp, ) ibcStack = ibcswap.NewIBCMiddleware(ibcStack, app.SwapKeeper) @@ -799,7 +798,7 @@ func New( transferModule, consumerModule, icaModule, - app.RouterModule, + app.PFMModule, interchainQueriesModule, interchainTxsModule, feeModule, @@ -846,7 +845,7 @@ func New( feeburnertypes.ModuleName, adminmoduletypes.ModuleName, ibchookstypes.ModuleName, - routertypes.ModuleName, + pfmtypes.ModuleName, crontypes.ModuleName, globalfee.ModuleName, ibcswaptypes.ModuleName, @@ -879,7 +878,7 @@ func New( feeburnertypes.ModuleName, adminmoduletypes.ModuleName, ibchookstypes.ModuleName, - routertypes.ModuleName, + pfmtypes.ModuleName, crontypes.ModuleName, globalfee.ModuleName, ibcswaptypes.ModuleName, @@ -919,7 +918,7 @@ func New( feeburnertypes.ModuleName, adminmoduletypes.ModuleName, ibchookstypes.ModuleName, // after auth keeper - routertypes.ModuleName, + pfmtypes.ModuleName, crontypes.ModuleName, globalfee.ModuleName, ibcswaptypes.ModuleName, @@ -947,7 +946,7 @@ func New( transferModule, consumerModule, icaModule, - app.RouterModule, + app.PFMModule, interchainQueriesModule, interchainTxsModule, feeBurnerModule, @@ -1289,7 +1288,7 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino paramsKeeper.Subspace(icacontrollertypes.SubModuleName).WithKeyTable(icacontrollertypes.ParamKeyTable()) paramsKeeper.Subspace(icahosttypes.SubModuleName).WithKeyTable(icahosttypes.ParamKeyTable()) - paramsKeeper.Subspace(routertypes.ModuleName).WithKeyTable(routertypes.ParamKeyTable()) + paramsKeeper.Subspace(pfmtypes.ModuleName).WithKeyTable(pfmtypes.ParamKeyTable()) paramsKeeper.Subspace(globalfee.ModuleName).WithKeyTable(globalfeetypes.ParamKeyTable()) diff --git a/app/proposals_allowlisting.go b/app/proposals_allowlisting.go index 2c9213774..6bc45f305 100644 --- a/app/proposals_allowlisting.go +++ b/app/proposals_allowlisting.go @@ -11,7 +11,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/params/types/proposal" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" globalfeetypes "github.com/cosmos/gaia/v11/x/globalfee/types" - packetforwardmiddlewaretypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router/types" + pfmtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types" icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types" ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" @@ -72,6 +72,7 @@ func isSdkMessageWhitelisted(msg sdk.Msg) bool { *banktypes.MsgUpdateParams, *crisistypes.MsgUpdateParams, *minttypes.MsgUpdateParams, + *pfmtypes.MsgUpdateParams, *authtypes.MsgUpdateParams: return true } @@ -93,8 +94,6 @@ var WhitelistedParams = map[paramChangeKey]struct{}{ {Subspace: globalfeetypes.ModuleName, Key: string(globalfeetypes.ParamStoreKeyMinGasPrices)}: {}, {Subspace: globalfeetypes.ModuleName, Key: string(globalfeetypes.ParamStoreKeyBypassMinFeeMsgTypes)}: {}, {Subspace: globalfeetypes.ModuleName, Key: string(globalfeetypes.ParamStoreKeyMaxTotalBypassMinFeeMsgGasUsage)}: {}, - // packet-forward-middleware - {Subspace: packetforwardmiddlewaretypes.ModuleName, Key: string(packetforwardmiddlewaretypes.KeyFeePercentage)}: {}, // ICS consumer {Subspace: ccvconsumertypes.ModuleName, Key: string(ccvconsumertypes.KeyRewardDenoms)}: {}, {Subspace: ccvconsumertypes.ModuleName, Key: string(ccvconsumertypes.KeyEnabled)}: {}, diff --git a/go.mod b/go.mod index 689dd9625..467aaaa2b 100644 --- a/go.mod +++ b/go.mod @@ -17,8 +17,7 @@ require ( github.com/cosmos/cosmos-sdk v0.47.5 github.com/cosmos/gaia/v11 v11.0.0-00010101000000-000000000000 github.com/cosmos/gogoproto v1.4.10 - // TEMP: Using this version to support duality swap-and-forward - github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.0-20230629164013-34f5e666f806 + github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.1.1 github.com/cosmos/ibc-go/v7 v7.3.1 github.com/cosmos/ics23/go v0.10.0 github.com/cosmos/interchain-security/v3 v3.1.0 diff --git a/go.sum b/go.sum index caa8c5cf0..626d4a95e 100644 --- a/go.sum +++ b/go.sum @@ -399,8 +399,8 @@ github.com/cosmos/gogoproto v1.4.10 h1:QH/yT8X+c0F4ZDacDv3z+xE3WU1P1Z3wQoLMBRJoK github.com/cosmos/gogoproto v1.4.10/go.mod h1:3aAZzeRWpAwr+SS/LLkICX2/kDFyaYVzckBDzygIxek= github.com/cosmos/iavl v0.20.1 h1:rM1kqeG3/HBT85vsZdoSNsehciqUQPWrR4BYmqE2+zg= github.com/cosmos/iavl v0.20.1/go.mod h1:WO7FyvaZJoH65+HFOsDir7xU9FWk2w9cHXNW1XHcl7A= -github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.0-20230629164013-34f5e666f806 h1:iFWb/KrnP5jthNZ23l72wqE8nzHJHzoVe22giUfJce8= -github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.0-20230629164013-34f5e666f806/go.mod h1:fctjEnz9xaBFOlmYYPdKL8Hs1Y3GUKilSwsJdqBb5QU= +github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.1.1 h1:PqIK9vTr6zxCdQmrDZwxwL4KMAqg/GRGsiMEiaMP4wA= +github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.1.1/go.mod h1:UvDmcGIWJPIytq+Q78/ff5NTOsuX/7IrNgEugTW5i0s= github.com/cosmos/ibc-go/v7 v7.3.1 h1:bil1IjnHdyWDASFYKfwdRiNtFP6WK3osW7QFEAgU4I8= github.com/cosmos/ibc-go/v7 v7.3.1/go.mod h1:wvx4pPBofe5ZdMNV3OFRxSI4auEP5Qfqf8JXLLNV04g= github.com/cosmos/ics23/go v0.10.0 h1:iXqLLgp2Lp+EdpIuwXTYIQU+AiHj9mOC2X9ab++bZDM= @@ -1203,6 +1203,7 @@ go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= +go.uber.org/mock v0.2.0 h1:TaP3xedm7JaAgScZO7tlvlKrqT0p7I6OsdGB5YNSMDU= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= diff --git a/tests/ibc/gmp_swap_forward_test.go b/tests/ibc/gmp_swap_forward_test.go index a0bc6eb7b..652e4f211 100644 --- a/tests/ibc/gmp_swap_forward_test.go +++ b/tests/ibc/gmp_swap_forward_test.go @@ -5,7 +5,7 @@ import ( "time" "cosmossdk.io/math" - forwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router/types" + pfmtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types" transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" "github.com/neutron-org/neutron/x/dex/types" @@ -42,12 +42,12 @@ func (s *IBCTestSuite) TestGMPSwapAndForward_Success() { chainBAddr := s.bundleB.Chain.SenderAccount.GetAddress() retries := uint8(0) - forwardMetadata := forwardtypes.PacketMetadata{ - Forward: &forwardtypes.ForwardMetadata{ + forwardMetadata := pfmtypes.PacketMetadata{ + Forward: &pfmtypes.ForwardMetadata{ Receiver: chainBAddr.String(), Port: s.neutronChainBPath.EndpointA.ChannelConfig.PortID, Channel: s.neutronChainBPath.EndpointA.ChannelID, - Timeout: forwardtypes.Duration(5 * time.Minute), + Timeout: pfmtypes.Duration(5 * time.Minute), Retries: &retries, Next: nil, }, @@ -99,10 +99,11 @@ func (s *IBCTestSuite) TestGMPSwapAndForward_Success() { // Check that the funds are moved out of the acc on providerChain s.assertProviderBalance(s.providerAddr, nativeDenom, newProviderBalNative.Sub(ibcTransferAmount)) - // Check that the amountIn is deduced from the neutron account - s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, math.OneInt()) - // Check that neutron account did not keep any of the transfer denom - s.assertNeutronBalance(s.neutronAddr, nativeDenom, genesisWalletAmount.Sub(swapAmount)) + // Check that the amountIn is deducted from the neutron override account + overrideAddr := s.ReceiverOverrideAddr(s.neutronTransferPath.EndpointA.ChannelID, s.providerAddr.String()) + s.assertNeutronBalance(overrideAddr, s.providerToNeutronDenom, math.OneInt()) + // Check that neutron override account did not keep any of the transfer denom + s.assertNeutronBalance(overrideAddr, nativeDenom, math.ZeroInt()) transferDenomPath := transfertypes.GetPrefixedDenom( transfertypes.PortID, diff --git a/tests/ibc/ibc_setup_test.go b/tests/ibc/ibc_setup_test.go index a5092cf7a..827920bf2 100644 --- a/tests/ibc/ibc_setup_test.go +++ b/tests/ibc/ibc_setup_test.go @@ -6,6 +6,7 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward" transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" @@ -325,6 +326,14 @@ func (s *IBCTestSuite) assertChainCBalance(addr sdk.AccAddress, denom string, ex s.assertBalance(s.bundleC.App.GetTestBankKeeper(), s.bundleC.Chain, addr, denom, expectedAmt) } +func (s *IBCTestSuite) ReceiverOverrideAddr(channel, sender string) sdk.AccAddress { + addr, err := packetforward.GetReceiver(channel, sender) + if err != nil { + panic("Cannot calc receiver override: " + err.Error()) + } + return sdk.MustAccAddressFromBech32(addr) +} + //nolint:unparam // keep this flexible even if we aren't currently using all the params func (s *IBCTestSuite) neutronDeposit( token0 string, diff --git a/tests/ibc/swap_forward_test.go b/tests/ibc/swap_forward_test.go index 24284e304..070378e10 100644 --- a/tests/ibc/swap_forward_test.go +++ b/tests/ibc/swap_forward_test.go @@ -5,7 +5,7 @@ import ( "time" "cosmossdk.io/math" - forwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router/types" + pfmtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types" transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" "github.com/iancoleman/orderedmap" "golang.org/x/exp/maps" @@ -53,12 +53,12 @@ func (s *IBCTestSuite) TestSwapAndForward_Success() { retries := uint8(0) - forwardMetadata := forwardtypes.PacketMetadata{ - Forward: &forwardtypes.ForwardMetadata{ + forwardMetadata := pfmtypes.PacketMetadata{ + Forward: &pfmtypes.ForwardMetadata{ Receiver: chainBAddr.String(), Port: s.neutronChainBPath.EndpointA.ChannelConfig.PortID, Channel: s.neutronChainBPath.EndpointA.ChannelID, - Timeout: forwardtypes.Duration(5 * time.Minute), + Timeout: pfmtypes.Duration(5 * time.Minute), Retries: &retries, Next: nil, }, @@ -109,10 +109,11 @@ func (s *IBCTestSuite) TestSwapAndForward_Success() { newProviderBalNative.Sub(ibcTransferAmount), ) - // Check that the amountIn is deducted from the neutron account - s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, math.OneInt()) + // Check that the amountIn is deducted from the neutron overrid receiver account + overrideAddr := s.ReceiverOverrideAddr(s.neutronTransferPath.EndpointA.ChannelID, s.providerAddr.String()) + s.assertNeutronBalance(overrideAddr, s.providerToNeutronDenom, math.OneInt()) // Check that neutron account did not keep any of the transfer denom - s.assertNeutronBalance(s.neutronAddr, nativeDenom, postDepositNeutronBalNative) + s.assertNeutronBalance(overrideAddr, nativeDenom, math.ZeroInt()) transferDenomPath := transfertypes.GetPrefixedDenom( transfertypes.PortID, @@ -123,8 +124,6 @@ func (s *IBCTestSuite) TestSwapAndForward_Success() { // Check that the funds are now present in the acc on chainB s.assertChainBBalance(chainBAddr, transferDenomNeutronChainB, expectedAmountOut) - - s.Assert().NoError(err) } func (s *IBCTestSuite) TestSwapAndForward_MultiHopSuccess() { @@ -168,26 +167,26 @@ func (s *IBCTestSuite) TestSwapAndForward_MultiHopSuccess() { chainCAddr := s.bundleC.Chain.SenderAccount.GetAddress() retries := uint8(0) - nextForward := forwardtypes.PacketMetadata{ - Forward: &forwardtypes.ForwardMetadata{ + nextForward := pfmtypes.PacketMetadata{ + Forward: &pfmtypes.ForwardMetadata{ Receiver: chainCAddr.String(), Port: s.chainBChainCPath.EndpointA.ChannelConfig.PortID, Channel: s.chainBChainCPath.EndpointA.ChannelID, - Timeout: forwardtypes.Duration(5 * time.Minute), + Timeout: pfmtypes.Duration(5 * time.Minute), Retries: &retries, Next: nil, }, } nextForwardBz, err := json.Marshal(nextForward) s.Assert().NoError(err) - nextForwardJSON := forwardtypes.NewJSONObject(false, nextForwardBz, orderedmap.OrderedMap{}) + nextForwardJSON := pfmtypes.NewJSONObject(false, nextForwardBz, orderedmap.OrderedMap{}) - forwardMetadata := forwardtypes.PacketMetadata{ - Forward: &forwardtypes.ForwardMetadata{ + forwardMetadata := pfmtypes.PacketMetadata{ + Forward: &pfmtypes.ForwardMetadata{ Receiver: chainBAddr.String(), Port: s.neutronChainBPath.EndpointA.ChannelConfig.PortID, Channel: s.neutronChainBPath.EndpointA.ChannelID, - Timeout: forwardtypes.Duration(5 * time.Minute), + Timeout: pfmtypes.Duration(5 * time.Minute), Retries: &retries, Next: nextForwardJSON, }, @@ -298,22 +297,14 @@ func (s *IBCTestSuite) TestSwapAndForward_UnwindIBCDenomSuccess() { swapAmount := math.NewInt(100_000) expectedAmountOut := math.NewInt(99980) - // Send native denom to gaia chain so it can be swapped - s.IBCTransfer(s.neutronTransferPath, s.neutronTransferPath.EndpointA, s.neutronAddr, s.providerAddr, nativeDenom, swapAmount, "") - transferDenomPath := transfertypes.GetPrefixedDenom( - transfertypes.PortID, - s.neutronTransferPath.EndpointA.ChannelID, - nativeDenom, - ) - transferDenomNeutronToProvider := transfertypes.ParseDenomTrace(transferDenomPath).IBCDenom() - retries := uint8(0) - forwardMetadata := forwardtypes.PacketMetadata{ - Forward: &forwardtypes.ForwardMetadata{ + + forwardMetadata := pfmtypes.PacketMetadata{ + Forward: &pfmtypes.ForwardMetadata{ Receiver: s.providerAddr.String(), Port: s.neutronTransferPath.EndpointA.ChannelConfig.PortID, Channel: s.neutronTransferPath.EndpointA.ChannelID, - Timeout: forwardtypes.Duration(5 * time.Minute), + Timeout: pfmtypes.Duration(5 * time.Minute), Retries: &retries, Next: nil, }, @@ -344,11 +335,29 @@ func (s *IBCTestSuite) TestSwapAndForward_UnwindIBCDenomSuccess() { metadataBz, err := json.Marshal(metadata) s.Require().NoError(err) + // Transfer native denom from neutron to provider + s.IBCTransfer( + s.neutronTransferPath, + s.neutronTransferPath.EndpointA, + s.neutronAddr, + s.providerAddr, + nativeDenom, + ibcTransferAmount, + "", + ) + transferDenomPath := transfertypes.GetPrefixedDenom( + transfertypes.PortID, + s.neutronTransferPath.EndpointB.ChannelID, + nativeDenom, + ) + transferDenomNeutronProvider := transfertypes.ParseDenomTrace(transferDenomPath).IBCDenom() + s.assertProviderBalance(s.providerAddr, transferDenomNeutronProvider, ibcTransferAmount) + // Send an IBC transfer from provider to neutron with packet memo containing the swap metadata s.IBCTransferProviderToNeutron( s.providerAddr, s.neutronAddr, - transferDenomNeutronToProvider, + transferDenomNeutronProvider, swapAmount, string(metadataBz), ) @@ -358,21 +367,21 @@ func (s *IBCTestSuite) TestSwapAndForward_UnwindIBCDenomSuccess() { s.Assert().NoError(err) s.coordinator.CommitBlock(s.neutronChain) - // Check that the amountIn has been deducted from the neutron chain - s.assertNeutronBalance(s.neutronAddr, nativeDenom, postDepositNeutronBalNative.Sub(swapAmount).Add(math.OneInt())) + // Check that the amountIn is deducted from the neutron override receiever account + overrideAddr := s.ReceiverOverrideAddr(s.neutronTransferPath.EndpointA.ChannelID, s.providerAddr.String()) + s.assertNeutronBalance(overrideAddr, nativeDenom, math.OneInt()) // Check that the funds are now present on the provider chainer s.assertProviderBalance( s.providerAddr, nativeDenom, newProviderBalNative.Add(expectedAmountOut), ) - - s.Assert().NoError(err) } -// TestSwapAndForward_ForwardFails asserts that the swap and forward middleware stack works as intended in the case -// that an incoming IBC swap succeeds but the forward fails. -func (s *IBCTestSuite) TestSwapAndForward_ForwardFails() { +// TestSwapAndForward_ForwardFailsRefundAddr asserts that the swap and forward middleware stack works as intended in the case +// that an incoming IBC swap succeeds but the forward fails when a NeutronRefundAddress is provided. +// The swap will be reverted and the transferred amount will be credited to the refundAddr +func (s *IBCTestSuite) TestSwapAndForward_ForwardFailsRefundAddr() { // Send an IBC transfer from provider chain to neutron, so we can initialize a pool with the IBC denom token + native Neutron token s.IBCTransferProviderToNeutron( s.providerAddr, @@ -406,17 +415,16 @@ func (s *IBCTestSuite) TestSwapAndForward_ForwardFails() { // Compose the IBC transfer memo metadata to be used in the swap and forward swapAmount := math.NewInt(100000) - expectedAmountOut := math.NewInt(99990) chainBAddr := s.bundleB.Chain.SenderAccount.GetAddress() retries := uint8(0) - forwardMetadata := forwardtypes.PacketMetadata{ - Forward: &forwardtypes.ForwardMetadata{ + forwardMetadata := pfmtypes.PacketMetadata{ + Forward: &pfmtypes.ForwardMetadata{ Receiver: chainBAddr.String(), Port: s.neutronChainBPath.EndpointA.ChannelConfig.PortID, Channel: "invalid-channel", // add an invalid channel identifier so the forward fails - Timeout: forwardtypes.Duration(5 * time.Minute), + Timeout: pfmtypes.Duration(5 * time.Minute), Retries: &retries, Next: nil, }, @@ -429,6 +437,7 @@ func (s *IBCTestSuite) TestSwapAndForward_ForwardFails() { err = json.Unmarshal(bz, nextJSON) s.Assert().NoError(err) + refundAddr := s.neutronChain.SenderAccounts[1].SenderAccount.GetAddress() metadata := swaptypes.PacketMetadata{ Swap: &swaptypes.SwapMetadata{ MsgPlaceLimitOrder: &types.MsgPlaceLimitOrder{ @@ -440,7 +449,8 @@ func (s *IBCTestSuite) TestSwapAndForward_ForwardFails() { TickIndexInToOut: 2, OrderType: types.LimitOrderType_FILL_OR_KILL, }, - Next: nextJSON, + NeutronRefundAddress: refundAddr.String(), + Next: nextJSON, }, } @@ -468,15 +478,121 @@ func (s *IBCTestSuite) TestSwapAndForward_ForwardFails() { newProviderBalNative.Sub(ibcTransferAmount), ) - // Check that the amountIn is deduced from the neutron account - s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, math.OneInt()) - // Check that the amountOut stays on the neutronchain - s.assertNeutronBalance( + // Check that nothing remains in the overrideReceiver account + overrideAddr := s.ReceiverOverrideAddr(s.neutronTransferPath.EndpointA.ChannelID, s.providerAddr.String()) + s.assertNeutronBalance(overrideAddr, s.providerToNeutronDenom, math.ZeroInt()) + s.assertNeutronBalance(overrideAddr, nativeDenom, math.ZeroInt()) + + // Check that the swap was reverted and the transfer amount is in the refundAddr + s.assertNeutronBalance(refundAddr, s.providerToNeutronDenom, ibcTransferAmount) + + // Check that nothing made it to chainB + transferDenomPath := transfertypes.GetPrefixedDenom( + transfertypes.PortID, + s.neutronChainBPath.EndpointA.ChannelID, + nativeDenom, + ) + transferDenomNeutronChainB := transfertypes.ParseDenomTrace(transferDenomPath).IBCDenom() + + s.assertChainBBalance(chainBAddr, transferDenomNeutronChainB, math.ZeroInt()) +} + +// TestSwapAndForward_ForwardFailsRefundAddr asserts that the swap and forward middleware stack works as intended in the case +// that an incoming IBC swap succeeds but the forward fails when no NeutronRefundAddress is provided. +// The swap will be reverted and a refund to the src chain will take place. +func (s *IBCTestSuite) TestSwapAndForward_ForwardFails() { + // Send an IBC transfer from provider chain to neutron, so we can initialize a pool with the IBC denom token + native Neutron token + s.IBCTransferProviderToNeutron( + s.providerAddr, s.neutronAddr, nativeDenom, - postDepositNeutronBalNative.Add(expectedAmountOut), + ibcTransferAmount, + "", ) + // Assert that the funds are gone from the acc on provider and present in the acc on Neutron + newProviderBalNative := genesisWalletAmount.Sub(ibcTransferAmount) + s.assertProviderBalance(s.providerAddr, nativeDenom, newProviderBalNative) + + s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, ibcTransferAmount) + + // deposit stake<>ibcTransferToken to initialize the pool on Neutron + depositAmount := math.NewInt(100_000) + s.neutronDeposit( + nativeDenom, + s.providerToNeutronDenom, + depositAmount, + depositAmount, + 0, + 1, + s.neutronAddr) + + // Assert that the deposit was successful and the funds are moved out of the Neutron user acc + s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, math.ZeroInt()) + postDepositNeutronBalNative := genesisWalletAmount.Sub(depositAmount) + s.assertNeutronBalance(s.neutronAddr, nativeDenom, postDepositNeutronBalNative) + + // Compose the IBC transfer memo metadata to be used in the swap and forward + swapAmount := math.NewInt(100000) + chainBAddr := s.bundleB.Chain.SenderAccount.GetAddress() + + retries := uint8(0) + + forwardMetadata := pfmtypes.PacketMetadata{ + Forward: &pfmtypes.ForwardMetadata{ + Receiver: chainBAddr.String(), + Port: s.neutronChainBPath.EndpointA.ChannelConfig.PortID, + Channel: "invalid-channel", // add an invalid channel identifier so the forward fails + Timeout: pfmtypes.Duration(5 * time.Minute), + Retries: &retries, + Next: nil, + }, + } + + bz, err := json.Marshal(forwardMetadata) + s.Assert().NoError(err) + + nextJSON := new(swaptypes.JSONObject) + err = json.Unmarshal(bz, nextJSON) + s.Assert().NoError(err) + + metadata := swaptypes.PacketMetadata{ + Swap: &swaptypes.SwapMetadata{ + MsgPlaceLimitOrder: &types.MsgPlaceLimitOrder{ + Creator: s.neutronAddr.String(), + Receiver: s.neutronAddr.String(), + TokenIn: s.providerToNeutronDenom, + TokenOut: nativeDenom, + AmountIn: swapAmount, + TickIndexInToOut: 2, + OrderType: types.LimitOrderType_FILL_OR_KILL, + }, + Next: nextJSON, + }, + } + + metadataBz, err := json.Marshal(metadata) + s.Require().NoError(err) + + // Send an IBC transfer from provider to neutron with packet memo containing the swap metadata + s.IBCTransferProviderToNeutron( + s.providerAddr, + s.neutronAddr, + nativeDenom, + ibcTransferAmount, + string(metadataBz), + ) + + // Relay the packets from neutron => ChainB + err = s.RelayAllPacketsAToB(s.neutronChainBPath) + // Relay Fails + s.Assert().Error(err) + + // Check that nothing remains in the overrideReceiver account + overrideAddr := s.ReceiverOverrideAddr(s.neutronTransferPath.EndpointA.ChannelID, s.providerAddr.String()) + s.assertNeutronBalance(overrideAddr, s.providerToNeutronDenom, math.ZeroInt()) + s.assertNeutronBalance(overrideAddr, nativeDenom, math.ZeroInt()) + // Check that nothing made it to chainB transferDenomPath := transfertypes.GetPrefixedDenom( transfertypes.PortID, @@ -486,4 +602,7 @@ func (s *IBCTestSuite) TestSwapAndForward_ForwardFails() { transferDenomNeutronChainB := transfertypes.ParseDenomTrace(transferDenomPath).IBCDenom() s.assertChainBBalance(chainBAddr, transferDenomNeutronChainB, math.ZeroInt()) + + // Check that the refund takes place and the funds are moved back to the account on Gaia + s.assertProviderBalance(s.providerAddr, nativeDenom, genesisWalletAmount.Sub(depositAmount)) } diff --git a/tests/ibc/swap_test.go b/tests/ibc/swap_test.go index dbb21ad65..44e4c2be4 100644 --- a/tests/ibc/swap_test.go +++ b/tests/ibc/swap_test.go @@ -83,7 +83,8 @@ func (s *IBCTestSuite) TestIBCSwapMiddleware_Success() { s.assertNeutronBalance(s.neutronAddr, nativeDenom, postDepositNeutronBalNative.Add(expectedOut)) // Check that all of the IBC transfer denom have been used up - s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, math.OneInt()) + overrideAddr := s.ReceiverOverrideAddr(s.neutronTransferPath.EndpointA.ChannelID, s.providerAddr.String()) + s.assertNeutronBalance(overrideAddr, s.providerToNeutronDenom, math.OneInt()) } // TestIBCSwapMiddleware_FailRefund asserts that the IBC swap middleware works as intended with Neutron running as a @@ -102,8 +103,7 @@ func (s *IBCTestSuite) TestIBCSwapMiddleware_FailRefund() { TickIndexInToOut: 1, OrderType: dextypes.LimitOrderType_FILL_OR_KILL, }, - NonRefundable: false, - Next: nil, + Next: nil, }, } @@ -127,51 +127,6 @@ func (s *IBCTestSuite) TestIBCSwapMiddleware_FailRefund() { s.assertProviderBalance(s.providerAddr, nativeDenom, genesisWalletAmount) } -// TestIBCSwapMiddleware_FailNoRefund asserts that the IBC swap middleware works as intended with Neutron running as a -// consumer chain connected to the Cosmos Hub. The swap should fail and funds should remain on Neutron. -func (s *IBCTestSuite) TestIBCSwapMiddleware_FailNoRefund() { - // Compose the swap metadata, this swap will fail because there is no pool initialized for this pair - swapAmount := math.NewInt(100000) - metadata := swaptypes.PacketMetadata{ - Swap: &swaptypes.SwapMetadata{ - MsgPlaceLimitOrder: &dextypes.MsgPlaceLimitOrder{ - Creator: s.neutronAddr.String(), - Receiver: s.neutronAddr.String(), - TokenIn: s.providerToNeutronDenom, - TokenOut: nativeDenom, - AmountIn: swapAmount, - TickIndexInToOut: 1, - OrderType: dextypes.LimitOrderType_FILL_OR_KILL, - }, - NonRefundable: true, - Next: nil, - }, - } - - metadataBz, err := json.Marshal(metadata) - s.Require().NoError(err) - - // Send (failing) IBC transfer with swap metadata - s.IBCTransferProviderToNeutron( - s.providerAddr, - s.neutronAddr, - nativeDenom, - ibcTransferAmount, - string(metadataBz), - ) - - // Check that the funds are present in the account on Neutron - s.assertNeutronBalance(s.neutronAddr, nativeDenom, genesisWalletAmount) - s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, ibcTransferAmount) - - // Check that no refund takes place and the funds are not in the account on provider - s.assertProviderBalance(s.providerAddr, nativeDenom, genesisWalletAmount.Sub(ibcTransferAmount)) -} - -// TestIBCSwapMiddleware_FailWithRefundAddr asserts that the IBC swap middleware works as intended with Neutron running as a -// consumer chain connected to the Cosmos Hub. The swap should fail and funds should remain on Neutron but be moved -// to the refund address. - func (s *IBCTestSuite) TestIBCSwapMiddleware_FailWithRefundAddr() { // Compose the swap metadata, this swap will fail because there is no pool initialized for this pair refundAddr := s.neutronChain.SenderAccounts[1].SenderAccount.GetAddress() @@ -187,9 +142,8 @@ func (s *IBCTestSuite) TestIBCSwapMiddleware_FailWithRefundAddr() { TickIndexInToOut: 1, OrderType: dextypes.LimitOrderType_FILL_OR_KILL, }, - RefundAddress: refundAddr.String(), - NonRefundable: true, - Next: nil, + NeutronRefundAddress: refundAddr.String(), + Next: nil, }, } diff --git a/x/ibcswap/ibc_middleware.go b/x/ibcswap/ibc_middleware.go index 262baee59..df315b06e 100644 --- a/x/ibcswap/ibc_middleware.go +++ b/x/ibcswap/ibc_middleware.go @@ -3,13 +3,15 @@ package ibcswap import ( "context" "encoding/json" + "errors" "strings" sdkerrors "cosmossdk.io/errors" "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" - forwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router/types" + "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward" + pfmtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types" transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" @@ -110,6 +112,15 @@ func (im IBCMiddleware) OnChanCloseConfirm(ctx sdk.Context, portID, channelID st // OnRecvPacket checks the memo field on this packet and if the metadata inside's root key indicates this packet // should be handled by the swap middleware it attempts to perform a swap. If the swap is successful // the underlying application's OnRecvPacket callback is invoked. + +// For clarity, here is a breakdown of the steps +// 1. Check if this is a swap packet; if not pass it to next middleware +// 2. validate swapMetadata; ErrAck if invalid +// 3. Pass through the middleware stack to ibc-go/transfer#OnRecvPacket; transfer coins are sent to receiver +// 4. Do swap; handle failures +// 5. If no PFM is present we are done; return ack +// 6. Unpack packet so that it is a valid PFM packet and set required context variables +// 7. Pass through middleware stack again where the forward is handled by packet-forward-middleware#OnRecvPacket func (im IBCMiddleware) OnRecvPacket( ctx sdk.Context, packet channeltypes.Packet, @@ -128,6 +139,7 @@ func (im IBCMiddleware) OnRecvPacket( } metadata := m.Swap + if err := metadata.Validate(); err != nil { return channeltypes.NewErrorAcknowledgement(err) } @@ -136,33 +148,35 @@ func (im IBCMiddleware) OnRecvPacket( return channeltypes.NewErrorAcknowledgement(err) } - // Compose our context with values that will be used to pass through to the forward middleware - ctxWithForwardFlags := context.WithValue(ctx.Context(), forwardtypes.ProcessedKey{}, true) - ctxWithForwardFlags = context.WithValue( - ctxWithForwardFlags, - forwardtypes.NonrefundableKey{}, - true, - ) - ctxWithForwardFlags = context.WithValue( - ctxWithForwardFlags, - forwardtypes.DisableDenomCompositionKey{}, - true, - ) - wrappedSdkCtx := ctx.WithContext(ctxWithForwardFlags) + // Use overrideReceiver so that users cannot ibcswap through arbitrary addresses. + // Instead generate a unique address for each user based on their channel and origin-address + overrideReceiver, err := packetforward.GetReceiver(packet.DestinationChannel, data.Sender) + if err != nil { + return channeltypes.NewErrorAcknowledgement(err) + } + metadata.Creator = overrideReceiver + // Update packet data to match the new receiver so that transfer middleware adds tokens to the expected address + packet = newPacketWithOverrideReceiver(packet, data, overrideReceiver) + if metadata.ContainsPFM() { + // If we are using PFM change receiver to the expected address for forwarding + metadata.Receiver = overrideReceiver + } - ack := im.app.OnRecvPacket(wrappedSdkCtx, packet, relayer) + ack := im.app.OnRecvPacket(ctx, packet, relayer) if ack == nil || !ack.Success() { return ack } - // Attempt to perform a swap since this packets memo included swap metadata. - res, err := im.keeper.Swap(ctx, metadata.MsgPlaceLimitOrder) + // Attempt to perform a swap using a cacheCtx + cacheCtx, writeCache := ctx.CacheContext() + res, err := im.keeper.Swap(cacheCtx, metadata.MsgPlaceLimitOrder) if err != nil { return im.handleFailedSwap(ctx, packet, data, metadata, err) } // If there is no next field set in the metadata return ack if metadata.Next == nil { + writeCache() return ack } @@ -173,30 +187,46 @@ func (im IBCMiddleware) OnRecvPacket( return ack } - data.Memo = string(memoBz) + postSwapData := data + postSwapData.Memo = string(memoBz) // Override the packet data to include the token denom and amount that was received from the swap. - data.Denom = res.TakerCoinOut.Denom - data.Amount = res.TakerCoinOut.Amount.String() + postSwapData.Denom = res.TakerCoinOut.Denom + postSwapData.Amount = res.TakerCoinOut.Amount.String() // After a successful swap funds are now in the receiver account from the MsgPlaceLimitOrder so, // we need to override the packets receiver field before invoking the forward middlewares OnRecvPacket. - data.Receiver = m.Swap.Receiver + postSwapData.Receiver = m.Swap.Receiver - dataBz, err := transfertypes.ModuleCdc.MarshalJSON(&data) + dataBz, err := transfertypes.ModuleCdc.MarshalJSON(&postSwapData) if err != nil { return ack } packet.Data = dataBz + // Compose our context with values that will be used to pass through to the forward middleware + ctxWithForwardFlags := context.WithValue(cacheCtx.Context(), pfmtypes.ProcessedKey{}, true) + ctxWithForwardFlags = context.WithValue( + ctxWithForwardFlags, + pfmtypes.NonrefundableKey{}, + true, + ) + ctxWithForwardFlags = context.WithValue( + ctxWithForwardFlags, + pfmtypes.DisableDenomCompositionKey{}, + true, + ) + wrappedSdkCtx := cacheCtx.WithContext(ctxWithForwardFlags) + // The forward middleware should return a nil ack if the forward is initiated properly. // If not an error occurred, and we return the original ack. newAck := im.app.OnRecvPacket(wrappedSdkCtx, packet, relayer) if newAck != nil { - return ack + return im.handleFailedSwap(ctx, packet, data, metadata, errors.New(string(newAck.Acknowledgement()))) } + writeCache() return nil } @@ -277,38 +307,29 @@ func (im IBCMiddleware) handleFailedSwap( "AmountIn", metadata.AmountIn, "TickIndexInToOut", metadata.TickIndexInToOut, "OrderType", metadata.OrderType, - "refundable", metadata.NonRefundable, - "refund address", metadata.RefundAddress, + "refund address", metadata.NeutronRefundAddress, ) // The current denom is from the sender chains perspective, we need to compose the appropriate denom for this side - denomOnThisChain := getDenomForThisChain( - packet.DestinationPort, packet.DestinationChannel, - packet.SourcePort, packet.SourceChannel, - data.Denom, - ) + denomOnThisChain := getDenomForThisChain(packet, data.Denom) - if metadata.NonRefundable { - return im.handleNoRefund(ctx, data, metadata, denomOnThisChain, err) + if len(metadata.NeutronRefundAddress) != 0 { + return im.handleOnChainRefund(ctx, data, metadata, denomOnThisChain, err) } - return im.handleRefund(ctx, packet, data, denomOnThisChain, err) + return im.handleIBCRefund(ctx, packet, data, metadata, denomOnThisChain, err) } -// handleNoRefund will compose a successful ack to send back to the counterparty chain containing any error messages. +// handleOnChainRefund will compose a successful ack to send back to the counterparty chain containing any error messages. // Returning a successful ack ensures that a refund is not issued on the counterparty chain. // See: https://github.com/cosmos/ibc-go/blob/3ecc7dd3aef5790ec5d906936a297b34adf1ee41/modules/apps/transfer/keeper/relay.go#L320 -func (im IBCMiddleware) handleNoRefund( +func (im IBCMiddleware) handleOnChainRefund( ctx sdk.Context, data transfertypes.FungibleTokenPacketData, metadata *types.SwapMetadata, newDenom string, swapErr error, ) ibcexported.Acknowledgement { - if metadata.RefundAddress == "" { - return channeltypes.NewResultAcknowledgement([]byte(swapErr.Error())) - } - amount, ok := math.NewIntFromString(data.Amount) if !ok { wrappedErr := sdkerrors.Wrapf( @@ -321,7 +342,7 @@ func (im IBCMiddleware) handleNoRefund( } token := sdk.NewCoin(newDenom, amount) - err := im.keeper.SendCoins(ctx, data.Receiver, metadata.RefundAddress, sdk.NewCoins(token)) + err := im.keeper.SendCoins(ctx, metadata.Creator, metadata.NeutronRefundAddress, sdk.NewCoins(token)) if err != nil { wrappedErr := sdkerrors.Wrap(err, "failed to move funds to refund address") wrappedErr = sdkerrors.Wrap(swapErr, wrappedErr.Error()) @@ -331,19 +352,20 @@ func (im IBCMiddleware) handleNoRefund( return channeltypes.NewResultAcknowledgement([]byte(swapErr.Error())) } -// handleRefund will either burn or transfer the funds back to the appropriate escrow account. +// handleIBCRefund will either burn or transfer the funds back to the appropriate escrow account. // When a packet comes in the transfer module's OnRecvPacket callback is invoked which either // mints or unescrows funds on this side so if the swap fails an explicit refund is required. -func (im IBCMiddleware) handleRefund( +func (im IBCMiddleware) handleIBCRefund( ctx sdk.Context, packet channeltypes.Packet, data transfertypes.FungibleTokenPacketData, + metadata *types.SwapMetadata, newDenom string, swapErr error, ) ibcexported.Acknowledgement { data.Denom = newDenom - err := im.keeper.RefundPacketToken(ctx, packet, data) + err := im.keeper.RefundPacketToken(ctx, packet, data, metadata) if err != nil { wrappedErr := sdkerrors.Wrap(swapErr, err.Error()) @@ -357,10 +379,8 @@ func (im IBCMiddleware) handleRefund( // getDenomForThisChain composes a new token denom by either unwinding or prefixing the specified token denom appropriately. // This is necessary because the token denom in the packet data is from the perspective of the counterparty chain. -func getDenomForThisChain( - port, channel, counterpartyPort, counterpartyChannel, denom string, -) string { - counterpartyPrefix := transfertypes.GetDenomPrefix(counterpartyPort, counterpartyChannel) +func getDenomForThisChain(packet channeltypes.Packet, denom string) string { + counterpartyPrefix := transfertypes.GetDenomPrefix(packet.SourcePort, packet.SourceChannel) if strings.HasPrefix(denom, counterpartyPrefix) { // unwind denom unwoundDenom := denom[len(counterpartyPrefix):] @@ -374,18 +394,34 @@ func getDenomForThisChain( } // append port and channel from this chain to denom - prefixedDenom := transfertypes.GetDenomPrefix(port, channel) + denom + prefixedDenom := transfertypes.GetDenomPrefix(packet.DestinationPort, packet.DestinationChannel) + denom return transfertypes.ParseDenomTrace(prefixedDenom).IBCDenom() } +// Update the packet data to reflect the new receiver address that is used by the PFM +func newPacketWithOverrideReceiver(oldPacket channeltypes.Packet, data transfertypes.FungibleTokenPacketData, overrideReceiver string) channeltypes.Packet { + overrideData := transfertypes.FungibleTokenPacketData{ + Denom: data.Denom, + Amount: data.Amount, + Sender: data.Sender, + Receiver: overrideReceiver, // override receiver + } + overrideDataBz := transfertypes.ModuleCdc.MustMarshalJSON(&overrideData) + + return channeltypes.Packet{ + Sequence: oldPacket.Sequence, + SourcePort: oldPacket.SourcePort, + SourceChannel: oldPacket.SourceChannel, + DestinationPort: oldPacket.DestinationPort, + DestinationChannel: oldPacket.DestinationChannel, + Data: overrideDataBz, // override data + TimeoutHeight: oldPacket.TimeoutHeight, + TimeoutTimestamp: oldPacket.TimeoutTimestamp, + } +} + func validateSwapPacket(packet channeltypes.Packet, transferData transfertypes.FungibleTokenPacketData, sm types.SwapMetadata) error { - denomOnNeutron := getDenomForThisChain( - packet.DestinationPort, - packet.DestinationChannel, - packet.SourcePort, - packet.SourceChannel, - transferData.Denom, - ) + denomOnNeutron := getDenomForThisChain(packet, transferData.Denom) if denomOnNeutron != sm.TokenIn { return sdkerrors.Wrap(types.ErrInvalidSwapMetadata, "Transfer Denom must match TokenIn") } @@ -400,11 +436,7 @@ func validateSwapPacket(packet channeltypes.Packet, transferData transfertypes.F } if transferAmount.LT(sm.AmountIn) { - return sdkerrors.Wrap(types.ErrInvalidSwapMetadata, "Transfer amount must be >= AmountIn") - } - - if transferData.Receiver != sm.Creator || transferData.Receiver != sm.Receiver { - return sdkerrors.Wrap(types.ErrInvalidSwapMetadata, "Transfer receiver must equal swap Creator and Receiver") + return sdkerrors.Wrap(types.ErrInvalidSwapMetadata, "Transfer amount must be <= AmountIn") } return nil } diff --git a/x/ibcswap/keeper/keeper.go b/x/ibcswap/keeper/keeper.go index 3902568b5..e3f48b3d0 100644 --- a/x/ibcswap/keeper/keeper.go +++ b/x/ibcswap/keeper/keeper.go @@ -113,6 +113,7 @@ func (k Keeper) RefundPacketToken( ctx sdk.Context, packet channeltypes.Packet, data transfertypes.FungibleTokenPacketData, + metadata *types.SwapMetadata, ) error { // parse the denomination from the full denom path trace := transfertypes.ParseDenomTrace(data.Denom) @@ -128,8 +129,8 @@ func (k Keeper) RefundPacketToken( } token := sdk.NewCoin(trace.IBCDenom(), transferAmount) - // decode the receiver address - receiver, err := sdk.AccAddressFromBech32(data.Receiver) + // decode the creator address + receiver, err := sdk.AccAddressFromBech32(metadata.Creator) if err != nil { return err } diff --git a/x/ibcswap/types/swap.go b/x/ibcswap/types/swap.go index 57e9faf5e..3c4965db9 100644 --- a/x/ibcswap/types/swap.go +++ b/x/ibcswap/types/swap.go @@ -20,8 +20,11 @@ type PacketMetadata struct { // further in the middleware stack or on the counterparty. type SwapMetadata struct { *dextypes.MsgPlaceLimitOrder - NonRefundable bool `json:"non-refundable,omitempty"` - RefundAddress string `json:"refund-address,omitempty"` + NonRefundable bool `json:"non-refundable,omitempty"` + // If a value is provided for NeutronRefundAddress and the swap fails the Transfer.Amount will be moved to this address for later recovery. + // If no NeutronRefundAddress is provided and a swap fails we will fail the ibc transfer and tokens will be refunded on the source chain. + + NeutronRefundAddress string `json:"refund-address,omitempty"` // Using JSONObject so that objects for next property will not be mutated by golang's lexicographic key sort on map keys during Marshal. // Supports primitives for Unmarshal/Marshal so that an escaped JSON-marshaled string is also valid. @@ -39,10 +42,10 @@ func (sm SwapMetadata) Validate() error { if sm.TokenOut == "" { return sdkerrors.Wrap(ErrInvalidSwapMetadata, "limit order tokenOut cannot be an empty string") } - if sm.RefundAddress != "" { - _, err := sdk.AccAddressFromBech32(sm.RefundAddress) + if sm.NeutronRefundAddress != "" { + _, err := sdk.AccAddressFromBech32(sm.NeutronRefundAddress) if err != nil { - return sdkerrors.Wrapf(dextypes.ErrInvalidAddress, "%s is not a valid Neutron address", sm.RefundAddress) + return sdkerrors.Wrapf(dextypes.ErrInvalidAddress, "%s is not a valid Neutron address", sm.NeutronRefundAddress) } } @@ -53,6 +56,16 @@ func (sm SwapMetadata) Validate() error { return nil } +// ContainsPFM checks if the Swapetadata is wrapping packet-forward-middleware +func (sm SwapMetadata) ContainsPFM() bool { + if sm.Next == nil { + return false + } + forward, _ := sm.Next.orderedMap.Get("forward") + + return forward != nil +} + // JSONObject is a wrapper type to allow either a primitive type or a JSON object. // In the case the value is a JSON object, OrderedMap type is used so that key order // is retained across Unmarshal/Marshal. diff --git a/x/ibcswap/types/swap_test.go b/x/ibcswap/types/swap_test.go index 87f7107d8..b341bb394 100644 --- a/x/ibcswap/types/swap_test.go +++ b/x/ibcswap/types/swap_test.go @@ -5,7 +5,7 @@ import ( "testing" "cosmossdk.io/math" - forwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router/types" + pfmtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types" "github.com/iancoleman/orderedmap" "github.com/stretchr/testify/require" @@ -41,8 +41,8 @@ func TestPacketMetadata_Marshal(t *testing.T) { // TestPacketMetadata_MarshalWithNext asserts that the marshaling of the swap metadata works as intended with next field initialized. func TestPacketMetadata_MarshalWithNext(t *testing.T) { - forwardMedata := &forwardtypes.PacketMetadata{ - Forward: &forwardtypes.ForwardMetadata{ + forwardMedata := &pfmtypes.PacketMetadata{ + Forward: &pfmtypes.ForwardMetadata{ Receiver: "cosmos14zde8usc4ur04y3aqnufzzmv2uqdpwwttr5uwv", Port: "transfer", Channel: "channel-0", From ccb221160d7eed6f6cf32f0526b50b2606143d2c Mon Sep 17 00:00:00 2001 From: Julian Compagni Portis Date: Sun, 19 Nov 2023 23:42:43 -0500 Subject: [PATCH 277/307] disable use of ibcswap middleware with forward-middleware --- tests/ibc/swap_forward_test.go | 1213 ++++++++++++++++---------------- x/ibcswap/ibc_middleware.go | 53 +- 2 files changed, 636 insertions(+), 630 deletions(-) diff --git a/tests/ibc/swap_forward_test.go b/tests/ibc/swap_forward_test.go index 070378e10..ca44a5357 100644 --- a/tests/ibc/swap_forward_test.go +++ b/tests/ibc/swap_forward_test.go @@ -1,608 +1,609 @@ package ibc_test -import ( - "encoding/json" - "time" - - "cosmossdk.io/math" - pfmtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types" - transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" - "github.com/iancoleman/orderedmap" - "golang.org/x/exp/maps" - - "github.com/neutron-org/neutron/x/dex/types" - swaptypes "github.com/neutron-org/neutron/x/ibcswap/types" -) - -func (s *IBCTestSuite) TestSwapAndForward_Success() { - // Send an IBC transfer from provider chain to neutron, so we can initialize a pool with the IBC denom token + native Neutron token - s.IBCTransferProviderToNeutron( - s.providerAddr, - s.neutronAddr, - nativeDenom, - ibcTransferAmount, - "", - ) - - // Assert that the funds are gone from the acc on provider and present in the acc on Neutron - newProviderBalNative := genesisWalletAmount.Sub(ibcTransferAmount) - s.assertProviderBalance(s.providerAddr, nativeDenom, newProviderBalNative) - - s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, ibcTransferAmount) - - // deposit stake<>ibcTransferToken to initialize the pool on Neutron - depositAmount := math.NewInt(100_000) - s.neutronDeposit( - nativeDenom, - s.providerToNeutronDenom, - depositAmount, - depositAmount, - 0, - 1, - s.neutronAddr) - - // Assert that the deposit was successful and the funds are moved out of the Neutron user acc - s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, math.ZeroInt()) - postDepositNeutronBalNative := genesisWalletAmount.Sub(depositAmount) - s.assertNeutronBalance(s.neutronAddr, nativeDenom, postDepositNeutronBalNative) - - // Compose the IBC transfer memo metadata to be used in the swap and forward - swapAmount := math.NewInt(100000) - expectedAmountOut := math.NewInt(99990) - chainBAddr := s.bundleB.Chain.SenderAccount.GetAddress() - - retries := uint8(0) - - forwardMetadata := pfmtypes.PacketMetadata{ - Forward: &pfmtypes.ForwardMetadata{ - Receiver: chainBAddr.String(), - Port: s.neutronChainBPath.EndpointA.ChannelConfig.PortID, - Channel: s.neutronChainBPath.EndpointA.ChannelID, - Timeout: pfmtypes.Duration(5 * time.Minute), - Retries: &retries, - Next: nil, - }, - } - - bz, err := json.Marshal(forwardMetadata) - s.Assert().NoError(err) - - nextJSON := new(swaptypes.JSONObject) - err = json.Unmarshal(bz, nextJSON) - s.Assert().NoError(err) - - metadata := swaptypes.PacketMetadata{ - Swap: &swaptypes.SwapMetadata{ - MsgPlaceLimitOrder: &types.MsgPlaceLimitOrder{ - Creator: s.neutronAddr.String(), - Receiver: s.neutronAddr.String(), - TokenIn: s.providerToNeutronDenom, - TokenOut: nativeDenom, - AmountIn: swapAmount, - TickIndexInToOut: 2, - OrderType: types.LimitOrderType_FILL_OR_KILL, - }, - Next: nextJSON, - }, - } - - metadataBz, err := json.Marshal(metadata) - s.Require().NoError(err) - - // Send an IBC transfer from provider to neutron with packet memo containing the swap metadata - s.IBCTransferProviderToNeutron( - s.providerAddr, - s.neutronAddr, - nativeDenom, - ibcTransferAmount, - string(metadataBz), - ) - - // Relay the packets - err = s.RelayAllPacketsAToB(s.neutronChainBPath) - s.Assert().NoError(err) - - // Check that the funds are moved out of the acc on providerChain - s.assertProviderBalance( - s.providerAddr, - nativeDenom, - newProviderBalNative.Sub(ibcTransferAmount), - ) - - // Check that the amountIn is deducted from the neutron overrid receiver account - overrideAddr := s.ReceiverOverrideAddr(s.neutronTransferPath.EndpointA.ChannelID, s.providerAddr.String()) - s.assertNeutronBalance(overrideAddr, s.providerToNeutronDenom, math.OneInt()) - // Check that neutron account did not keep any of the transfer denom - s.assertNeutronBalance(overrideAddr, nativeDenom, math.ZeroInt()) - - transferDenomPath := transfertypes.GetPrefixedDenom( - transfertypes.PortID, - s.neutronChainBPath.EndpointA.ChannelID, - nativeDenom, - ) - transferDenomNeutronChainB := transfertypes.ParseDenomTrace(transferDenomPath).IBCDenom() - - // Check that the funds are now present in the acc on chainB - s.assertChainBBalance(chainBAddr, transferDenomNeutronChainB, expectedAmountOut) -} - -func (s *IBCTestSuite) TestSwapAndForward_MultiHopSuccess() { - // Send an IBC transfer from provider chain to neutron, so we can initialize a pool with the IBC denom token + native Neutron token - s.IBCTransferProviderToNeutron( - s.providerAddr, - s.neutronAddr, - nativeDenom, - ibcTransferAmount, - "", - ) - - // Assert that the funds are gone from the acc on provider and present in the acc on Neutron - newProviderBalNative := genesisWalletAmount.Sub(ibcTransferAmount) - s.assertProviderBalance(s.providerAddr, nativeDenom, newProviderBalNative) - - s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, ibcTransferAmount) - - // deposit stake<>ibcTransferToken to initialize the pool on Neutron - depositAmount := math.NewInt(100_000) - s.neutronDeposit( - nativeDenom, - s.providerToNeutronDenom, - depositAmount, - depositAmount, - 0, - 1, - s.neutronAddr) - - // Assert that the deposit was successful and the funds are moved out of the Neutron user acc - s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, math.ZeroInt()) - postDepositNeutronBalNative := genesisWalletAmount.Sub(depositAmount) - s.assertNeutronBalance(s.neutronAddr, nativeDenom, postDepositNeutronBalNative) - - // Compose the IBC transfer memo metadata to be used in the swap and forward - swapAmount := math.NewInt(100000) - - expectedOut := math.NewInt(99_990) - - chainBAddr := s.bundleB.Chain.SenderAccount.GetAddress() - chainCAddr := s.bundleC.Chain.SenderAccount.GetAddress() - - retries := uint8(0) - nextForward := pfmtypes.PacketMetadata{ - Forward: &pfmtypes.ForwardMetadata{ - Receiver: chainCAddr.String(), - Port: s.chainBChainCPath.EndpointA.ChannelConfig.PortID, - Channel: s.chainBChainCPath.EndpointA.ChannelID, - Timeout: pfmtypes.Duration(5 * time.Minute), - Retries: &retries, - Next: nil, - }, - } - nextForwardBz, err := json.Marshal(nextForward) - s.Assert().NoError(err) - nextForwardJSON := pfmtypes.NewJSONObject(false, nextForwardBz, orderedmap.OrderedMap{}) - - forwardMetadata := pfmtypes.PacketMetadata{ - Forward: &pfmtypes.ForwardMetadata{ - Receiver: chainBAddr.String(), - Port: s.neutronChainBPath.EndpointA.ChannelConfig.PortID, - Channel: s.neutronChainBPath.EndpointA.ChannelID, - Timeout: pfmtypes.Duration(5 * time.Minute), - Retries: &retries, - Next: nextForwardJSON, - }, - } - bz, err := json.Marshal(forwardMetadata) - s.Assert().NoError(err) - - nextJSON := new(swaptypes.JSONObject) - err = json.Unmarshal(bz, nextJSON) - s.Assert().NoError(err) - - metadata := swaptypes.PacketMetadata{ - Swap: &swaptypes.SwapMetadata{ - MsgPlaceLimitOrder: &types.MsgPlaceLimitOrder{ - Creator: s.neutronAddr.String(), - Receiver: s.neutronAddr.String(), - TokenIn: s.providerToNeutronDenom, - TokenOut: nativeDenom, - AmountIn: swapAmount, - TickIndexInToOut: 2, - OrderType: types.LimitOrderType_FILL_OR_KILL, - }, - Next: nextJSON, - }, - } - - metadataBz, err := json.Marshal(metadata) - s.Assert().NoError(err) - - // Send an IBC transfer from provider to neutron with packet memo containing the swap metadata - s.IBCTransferProviderToNeutron( - s.providerAddr, - s.neutronAddr, - nativeDenom, - ibcTransferAmount, - string(metadataBz), - ) - - neutronPacket := maps.Values(s.neutronChain.SentPackets)[0] - err = s.neutronChainBPath.EndpointB.UpdateClient() - s.Require().NoError(err) - err = s.neutronChainBPath.EndpointB.RecvPacket(neutronPacket) - s.Require().NoError(err) - err = s.RelayAllPacketsAToB(s.chainBChainCPath) - s.Require().NoError(err) - - transferDenomPathNeutronChainB := transfertypes.GetPrefixedDenom( - transfertypes.PortID, - s.neutronChainBPath.EndpointB.ChannelID, - nativeDenom, - ) - transferDenomNeutronChainB := transfertypes.ParseDenomTrace(transferDenomPathNeutronChainB).IBCDenom() - transferDenomPathChainC := transfertypes.GetPrefixedDenom( - transfertypes.PortID, - s.chainBChainCPath.EndpointB.ChannelID, - transferDenomPathNeutronChainB, - ) - transferDenomChainC := transfertypes.ParseDenomTrace(transferDenomPathChainC).IBCDenom() - - // Check that the funds are moved out of the acc on chainA - s.assertProviderBalance( - s.providerAddr, - nativeDenom, - newProviderBalNative.Sub(ibcTransferAmount), - ) - // Check that chain B balance is unchanged - s.assertChainBBalance(chainBAddr, transferDenomNeutronChainB, math.ZeroInt()) - - // Check that funds made it to chainC - s.assertChainCBalance(chainCAddr, transferDenomChainC, expectedOut) -} - -// TestSwapAndForward_UnwindIBCDenomSuccess asserts that the swap and forward middleware stack works as intended in the -// case that a native token from ChainB is sent to ChainA and then ChainA initiates a swap and forward with the token. -// This asserts that denom unwinding works as intended when going provider->neutron->provider -func (s *IBCTestSuite) TestSwapAndForward_UnwindIBCDenomSuccess() { - // Send an IBC transfer from provider chain to neutron, so we can initialize a pool with the IBC denom token + native Neutron token - s.IBCTransferProviderToNeutron( - s.providerAddr, - s.neutronAddr, - nativeDenom, - ibcTransferAmount, - "", - ) - - // Assert that the funds are gone from the acc on provider and present in the acc on Neutron - newProviderBalNative := genesisWalletAmount.Sub(ibcTransferAmount) - s.assertProviderBalance(s.providerAddr, nativeDenom, newProviderBalNative) - - s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, ibcTransferAmount) - - // deposit stake<>ibcTransferToken to initialize the pool on Neutron - depositAmount := math.NewInt(100_000) - s.neutronDeposit( - nativeDenom, - s.providerToNeutronDenom, - depositAmount, - depositAmount, - 1, - 1, - s.neutronAddr) - - // Assert that the deposit was successful and the funds are moved out of the Neutron user acc - s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, math.ZeroInt()) - postDepositNeutronBalNative := genesisWalletAmount.Sub(depositAmount) - s.assertNeutronBalance(s.neutronAddr, nativeDenom, postDepositNeutronBalNative) - - swapAmount := math.NewInt(100_000) - expectedAmountOut := math.NewInt(99980) - - retries := uint8(0) - - forwardMetadata := pfmtypes.PacketMetadata{ - Forward: &pfmtypes.ForwardMetadata{ - Receiver: s.providerAddr.String(), - Port: s.neutronTransferPath.EndpointA.ChannelConfig.PortID, - Channel: s.neutronTransferPath.EndpointA.ChannelID, - Timeout: pfmtypes.Duration(5 * time.Minute), - Retries: &retries, - Next: nil, - }, - } - - bz, err := json.Marshal(forwardMetadata) - s.Assert().NoError(err) - - nextJSON := new(swaptypes.JSONObject) - err = json.Unmarshal(bz, nextJSON) - s.Assert().NoError(err) - - metadata := swaptypes.PacketMetadata{ - Swap: &swaptypes.SwapMetadata{ - MsgPlaceLimitOrder: &types.MsgPlaceLimitOrder{ - Creator: s.neutronAddr.String(), - Receiver: s.neutronAddr.String(), - TokenIn: nativeDenom, - TokenOut: s.providerToNeutronDenom, - AmountIn: swapAmount, - TickIndexInToOut: 2, - OrderType: types.LimitOrderType_FILL_OR_KILL, - }, - Next: nextJSON, - }, - } - - metadataBz, err := json.Marshal(metadata) - s.Require().NoError(err) - - // Transfer native denom from neutron to provider - s.IBCTransfer( - s.neutronTransferPath, - s.neutronTransferPath.EndpointA, - s.neutronAddr, - s.providerAddr, - nativeDenom, - ibcTransferAmount, - "", - ) - transferDenomPath := transfertypes.GetPrefixedDenom( - transfertypes.PortID, - s.neutronTransferPath.EndpointB.ChannelID, - nativeDenom, - ) - transferDenomNeutronProvider := transfertypes.ParseDenomTrace(transferDenomPath).IBCDenom() - s.assertProviderBalance(s.providerAddr, transferDenomNeutronProvider, ibcTransferAmount) - - // Send an IBC transfer from provider to neutron with packet memo containing the swap metadata - s.IBCTransferProviderToNeutron( - s.providerAddr, - s.neutronAddr, - transferDenomNeutronProvider, - swapAmount, - string(metadataBz), - ) - - // Relay the packets - err = s.RelayAllPacketsAToB(s.neutronTransferPath) - s.Assert().NoError(err) - s.coordinator.CommitBlock(s.neutronChain) - - // Check that the amountIn is deducted from the neutron override receiever account - overrideAddr := s.ReceiverOverrideAddr(s.neutronTransferPath.EndpointA.ChannelID, s.providerAddr.String()) - s.assertNeutronBalance(overrideAddr, nativeDenom, math.OneInt()) - // Check that the funds are now present on the provider chainer - s.assertProviderBalance( - s.providerAddr, - nativeDenom, - newProviderBalNative.Add(expectedAmountOut), - ) -} - -// TestSwapAndForward_ForwardFailsRefundAddr asserts that the swap and forward middleware stack works as intended in the case -// that an incoming IBC swap succeeds but the forward fails when a NeutronRefundAddress is provided. -// The swap will be reverted and the transferred amount will be credited to the refundAddr -func (s *IBCTestSuite) TestSwapAndForward_ForwardFailsRefundAddr() { - // Send an IBC transfer from provider chain to neutron, so we can initialize a pool with the IBC denom token + native Neutron token - s.IBCTransferProviderToNeutron( - s.providerAddr, - s.neutronAddr, - nativeDenom, - ibcTransferAmount, - "", - ) - - // Assert that the funds are gone from the acc on provider and present in the acc on Neutron - newProviderBalNative := genesisWalletAmount.Sub(ibcTransferAmount) - s.assertProviderBalance(s.providerAddr, nativeDenom, newProviderBalNative) - - s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, ibcTransferAmount) - - // deposit stake<>ibcTransferToken to initialize the pool on Neutron - depositAmount := math.NewInt(100_000) - s.neutronDeposit( - nativeDenom, - s.providerToNeutronDenom, - depositAmount, - depositAmount, - 0, - 1, - s.neutronAddr) - - // Assert that the deposit was successful and the funds are moved out of the Neutron user acc - s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, math.ZeroInt()) - postDepositNeutronBalNative := genesisWalletAmount.Sub(depositAmount) - s.assertNeutronBalance(s.neutronAddr, nativeDenom, postDepositNeutronBalNative) - - // Compose the IBC transfer memo metadata to be used in the swap and forward - swapAmount := math.NewInt(100000) - chainBAddr := s.bundleB.Chain.SenderAccount.GetAddress() - - retries := uint8(0) - - forwardMetadata := pfmtypes.PacketMetadata{ - Forward: &pfmtypes.ForwardMetadata{ - Receiver: chainBAddr.String(), - Port: s.neutronChainBPath.EndpointA.ChannelConfig.PortID, - Channel: "invalid-channel", // add an invalid channel identifier so the forward fails - Timeout: pfmtypes.Duration(5 * time.Minute), - Retries: &retries, - Next: nil, - }, - } - - bz, err := json.Marshal(forwardMetadata) - s.Assert().NoError(err) - - nextJSON := new(swaptypes.JSONObject) - err = json.Unmarshal(bz, nextJSON) - s.Assert().NoError(err) - - refundAddr := s.neutronChain.SenderAccounts[1].SenderAccount.GetAddress() - metadata := swaptypes.PacketMetadata{ - Swap: &swaptypes.SwapMetadata{ - MsgPlaceLimitOrder: &types.MsgPlaceLimitOrder{ - Creator: s.neutronAddr.String(), - Receiver: s.neutronAddr.String(), - TokenIn: s.providerToNeutronDenom, - TokenOut: nativeDenom, - AmountIn: swapAmount, - TickIndexInToOut: 2, - OrderType: types.LimitOrderType_FILL_OR_KILL, - }, - NeutronRefundAddress: refundAddr.String(), - Next: nextJSON, - }, - } - - metadataBz, err := json.Marshal(metadata) - s.Require().NoError(err) - - // Send an IBC transfer from provider to neutron with packet memo containing the swap metadata - s.IBCTransferProviderToNeutron( - s.providerAddr, - s.neutronAddr, - nativeDenom, - ibcTransferAmount, - string(metadataBz), - ) - - // Relay the packets from neutron => ChainB - err = s.RelayAllPacketsAToB(s.neutronChainBPath) - // Relay Fails - s.Assert().Error(err) - - // Check that the funds are moved out of the acc on providerChain - s.assertProviderBalance( - s.providerAddr, - nativeDenom, - newProviderBalNative.Sub(ibcTransferAmount), - ) - - // Check that nothing remains in the overrideReceiver account - overrideAddr := s.ReceiverOverrideAddr(s.neutronTransferPath.EndpointA.ChannelID, s.providerAddr.String()) - s.assertNeutronBalance(overrideAddr, s.providerToNeutronDenom, math.ZeroInt()) - s.assertNeutronBalance(overrideAddr, nativeDenom, math.ZeroInt()) - - // Check that the swap was reverted and the transfer amount is in the refundAddr - s.assertNeutronBalance(refundAddr, s.providerToNeutronDenom, ibcTransferAmount) - - // Check that nothing made it to chainB - transferDenomPath := transfertypes.GetPrefixedDenom( - transfertypes.PortID, - s.neutronChainBPath.EndpointA.ChannelID, - nativeDenom, - ) - transferDenomNeutronChainB := transfertypes.ParseDenomTrace(transferDenomPath).IBCDenom() - - s.assertChainBBalance(chainBAddr, transferDenomNeutronChainB, math.ZeroInt()) -} - -// TestSwapAndForward_ForwardFailsRefundAddr asserts that the swap and forward middleware stack works as intended in the case -// that an incoming IBC swap succeeds but the forward fails when no NeutronRefundAddress is provided. -// The swap will be reverted and a refund to the src chain will take place. -func (s *IBCTestSuite) TestSwapAndForward_ForwardFails() { - // Send an IBC transfer from provider chain to neutron, so we can initialize a pool with the IBC denom token + native Neutron token - s.IBCTransferProviderToNeutron( - s.providerAddr, - s.neutronAddr, - nativeDenom, - ibcTransferAmount, - "", - ) - - // Assert that the funds are gone from the acc on provider and present in the acc on Neutron - newProviderBalNative := genesisWalletAmount.Sub(ibcTransferAmount) - s.assertProviderBalance(s.providerAddr, nativeDenom, newProviderBalNative) - - s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, ibcTransferAmount) - - // deposit stake<>ibcTransferToken to initialize the pool on Neutron - depositAmount := math.NewInt(100_000) - s.neutronDeposit( - nativeDenom, - s.providerToNeutronDenom, - depositAmount, - depositAmount, - 0, - 1, - s.neutronAddr) - - // Assert that the deposit was successful and the funds are moved out of the Neutron user acc - s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, math.ZeroInt()) - postDepositNeutronBalNative := genesisWalletAmount.Sub(depositAmount) - s.assertNeutronBalance(s.neutronAddr, nativeDenom, postDepositNeutronBalNative) - - // Compose the IBC transfer memo metadata to be used in the swap and forward - swapAmount := math.NewInt(100000) - chainBAddr := s.bundleB.Chain.SenderAccount.GetAddress() - - retries := uint8(0) - - forwardMetadata := pfmtypes.PacketMetadata{ - Forward: &pfmtypes.ForwardMetadata{ - Receiver: chainBAddr.String(), - Port: s.neutronChainBPath.EndpointA.ChannelConfig.PortID, - Channel: "invalid-channel", // add an invalid channel identifier so the forward fails - Timeout: pfmtypes.Duration(5 * time.Minute), - Retries: &retries, - Next: nil, - }, - } - - bz, err := json.Marshal(forwardMetadata) - s.Assert().NoError(err) - - nextJSON := new(swaptypes.JSONObject) - err = json.Unmarshal(bz, nextJSON) - s.Assert().NoError(err) - - metadata := swaptypes.PacketMetadata{ - Swap: &swaptypes.SwapMetadata{ - MsgPlaceLimitOrder: &types.MsgPlaceLimitOrder{ - Creator: s.neutronAddr.String(), - Receiver: s.neutronAddr.String(), - TokenIn: s.providerToNeutronDenom, - TokenOut: nativeDenom, - AmountIn: swapAmount, - TickIndexInToOut: 2, - OrderType: types.LimitOrderType_FILL_OR_KILL, - }, - Next: nextJSON, - }, - } - - metadataBz, err := json.Marshal(metadata) - s.Require().NoError(err) - - // Send an IBC transfer from provider to neutron with packet memo containing the swap metadata - s.IBCTransferProviderToNeutron( - s.providerAddr, - s.neutronAddr, - nativeDenom, - ibcTransferAmount, - string(metadataBz), - ) - - // Relay the packets from neutron => ChainB - err = s.RelayAllPacketsAToB(s.neutronChainBPath) - // Relay Fails - s.Assert().Error(err) - - // Check that nothing remains in the overrideReceiver account - overrideAddr := s.ReceiverOverrideAddr(s.neutronTransferPath.EndpointA.ChannelID, s.providerAddr.String()) - s.assertNeutronBalance(overrideAddr, s.providerToNeutronDenom, math.ZeroInt()) - s.assertNeutronBalance(overrideAddr, nativeDenom, math.ZeroInt()) - - // Check that nothing made it to chainB - transferDenomPath := transfertypes.GetPrefixedDenom( - transfertypes.PortID, - s.neutronChainBPath.EndpointA.ChannelID, - nativeDenom, - ) - transferDenomNeutronChainB := transfertypes.ParseDenomTrace(transferDenomPath).IBCDenom() - - s.assertChainBBalance(chainBAddr, transferDenomNeutronChainB, math.ZeroInt()) - - // Check that the refund takes place and the funds are moved back to the account on Gaia - s.assertProviderBalance(s.providerAddr, nativeDenom, genesisWalletAmount.Sub(depositAmount)) -} +// TODO: fully validate PFM post ibcswap before re-enabling this +// import ( +// "encoding/json" +// "time" + +// "cosmossdk.io/math" +// pfmtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types" +// transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" +// "github.com/iancoleman/orderedmap" +// "golang.org/x/exp/maps" + +// "github.com/neutron-org/neutron/x/dex/types" +// swaptypes "github.com/neutron-org/neutron/x/ibcswap/types" +// ) + +// func (s *IBCTestSuite) TestSwapAndForward_Success() { +// // Send an IBC transfer from provider chain to neutron, so we can initialize a pool with the IBC denom token + native Neutron token +// s.IBCTransferProviderToNeutron( +// s.providerAddr, +// s.neutronAddr, +// nativeDenom, +// ibcTransferAmount, +// "", +// ) + +// // Assert that the funds are gone from the acc on provider and present in the acc on Neutron +// newProviderBalNative := genesisWalletAmount.Sub(ibcTransferAmount) +// s.assertProviderBalance(s.providerAddr, nativeDenom, newProviderBalNative) + +// s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, ibcTransferAmount) + +// // deposit stake<>ibcTransferToken to initialize the pool on Neutron +// depositAmount := math.NewInt(100_000) +// s.neutronDeposit( +// nativeDenom, +// s.providerToNeutronDenom, +// depositAmount, +// depositAmount, +// 0, +// 1, +// s.neutronAddr) + +// // Assert that the deposit was successful and the funds are moved out of the Neutron user acc +// s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, math.ZeroInt()) +// postDepositNeutronBalNative := genesisWalletAmount.Sub(depositAmount) +// s.assertNeutronBalance(s.neutronAddr, nativeDenom, postDepositNeutronBalNative) + +// // Compose the IBC transfer memo metadata to be used in the swap and forward +// swapAmount := math.NewInt(100000) +// expectedAmountOut := math.NewInt(99990) +// chainBAddr := s.bundleB.Chain.SenderAccount.GetAddress() + +// retries := uint8(0) + +// forwardMetadata := pfmtypes.PacketMetadata{ +// Forward: &pfmtypes.ForwardMetadata{ +// Receiver: chainBAddr.String(), +// Port: s.neutronChainBPath.EndpointA.ChannelConfig.PortID, +// Channel: s.neutronChainBPath.EndpointA.ChannelID, +// Timeout: pfmtypes.Duration(5 * time.Minute), +// Retries: &retries, +// Next: nil, +// }, +// } + +// bz, err := json.Marshal(forwardMetadata) +// s.Assert().NoError(err) + +// nextJSON := new(swaptypes.JSONObject) +// err = json.Unmarshal(bz, nextJSON) +// s.Assert().NoError(err) + +// metadata := swaptypes.PacketMetadata{ +// Swap: &swaptypes.SwapMetadata{ +// MsgPlaceLimitOrder: &types.MsgPlaceLimitOrder{ +// Creator: s.neutronAddr.String(), +// Receiver: s.neutronAddr.String(), +// TokenIn: s.providerToNeutronDenom, +// TokenOut: nativeDenom, +// AmountIn: swapAmount, +// TickIndexInToOut: 2, +// OrderType: types.LimitOrderType_FILL_OR_KILL, +// }, +// Next: nextJSON, +// }, +// } + +// metadataBz, err := json.Marshal(metadata) +// s.Require().NoError(err) + +// // Send an IBC transfer from provider to neutron with packet memo containing the swap metadata +// s.IBCTransferProviderToNeutron( +// s.providerAddr, +// s.neutronAddr, +// nativeDenom, +// ibcTransferAmount, +// string(metadataBz), +// ) + +// // Relay the packets +// err = s.RelayAllPacketsAToB(s.neutronChainBPath) +// s.Assert().NoError(err) + +// // Check that the funds are moved out of the acc on providerChain +// s.assertProviderBalance( +// s.providerAddr, +// nativeDenom, +// newProviderBalNative.Sub(ibcTransferAmount), +// ) + +// // Check that the amountIn is deducted from the neutron overrid receiver account +// overrideAddr := s.ReceiverOverrideAddr(s.neutronTransferPath.EndpointA.ChannelID, s.providerAddr.String()) +// s.assertNeutronBalance(overrideAddr, s.providerToNeutronDenom, math.OneInt()) +// // Check that neutron account did not keep any of the transfer denom +// s.assertNeutronBalance(overrideAddr, nativeDenom, math.ZeroInt()) + +// transferDenomPath := transfertypes.GetPrefixedDenom( +// transfertypes.PortID, +// s.neutronChainBPath.EndpointA.ChannelID, +// nativeDenom, +// ) +// transferDenomNeutronChainB := transfertypes.ParseDenomTrace(transferDenomPath).IBCDenom() + +// // Check that the funds are now present in the acc on chainB +// s.assertChainBBalance(chainBAddr, transferDenomNeutronChainB, expectedAmountOut) +// } + +// func (s *IBCTestSuite) TestSwapAndForward_MultiHopSuccess() { +// // Send an IBC transfer from provider chain to neutron, so we can initialize a pool with the IBC denom token + native Neutron token +// s.IBCTransferProviderToNeutron( +// s.providerAddr, +// s.neutronAddr, +// nativeDenom, +// ibcTransferAmount, +// "", +// ) + +// // Assert that the funds are gone from the acc on provider and present in the acc on Neutron +// newProviderBalNative := genesisWalletAmount.Sub(ibcTransferAmount) +// s.assertProviderBalance(s.providerAddr, nativeDenom, newProviderBalNative) + +// s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, ibcTransferAmount) + +// // deposit stake<>ibcTransferToken to initialize the pool on Neutron +// depositAmount := math.NewInt(100_000) +// s.neutronDeposit( +// nativeDenom, +// s.providerToNeutronDenom, +// depositAmount, +// depositAmount, +// 0, +// 1, +// s.neutronAddr) + +// // Assert that the deposit was successful and the funds are moved out of the Neutron user acc +// s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, math.ZeroInt()) +// postDepositNeutronBalNative := genesisWalletAmount.Sub(depositAmount) +// s.assertNeutronBalance(s.neutronAddr, nativeDenom, postDepositNeutronBalNative) + +// // Compose the IBC transfer memo metadata to be used in the swap and forward +// swapAmount := math.NewInt(100000) + +// expectedOut := math.NewInt(99_990) + +// chainBAddr := s.bundleB.Chain.SenderAccount.GetAddress() +// chainCAddr := s.bundleC.Chain.SenderAccount.GetAddress() + +// retries := uint8(0) +// nextForward := pfmtypes.PacketMetadata{ +// Forward: &pfmtypes.ForwardMetadata{ +// Receiver: chainCAddr.String(), +// Port: s.chainBChainCPath.EndpointA.ChannelConfig.PortID, +// Channel: s.chainBChainCPath.EndpointA.ChannelID, +// Timeout: pfmtypes.Duration(5 * time.Minute), +// Retries: &retries, +// Next: nil, +// }, +// } +// nextForwardBz, err := json.Marshal(nextForward) +// s.Assert().NoError(err) +// nextForwardJSON := pfmtypes.NewJSONObject(false, nextForwardBz, orderedmap.OrderedMap{}) + +// forwardMetadata := pfmtypes.PacketMetadata{ +// Forward: &pfmtypes.ForwardMetadata{ +// Receiver: chainBAddr.String(), +// Port: s.neutronChainBPath.EndpointA.ChannelConfig.PortID, +// Channel: s.neutronChainBPath.EndpointA.ChannelID, +// Timeout: pfmtypes.Duration(5 * time.Minute), +// Retries: &retries, +// Next: nextForwardJSON, +// }, +// } +// bz, err := json.Marshal(forwardMetadata) +// s.Assert().NoError(err) + +// nextJSON := new(swaptypes.JSONObject) +// err = json.Unmarshal(bz, nextJSON) +// s.Assert().NoError(err) + +// metadata := swaptypes.PacketMetadata{ +// Swap: &swaptypes.SwapMetadata{ +// MsgPlaceLimitOrder: &types.MsgPlaceLimitOrder{ +// Creator: s.neutronAddr.String(), +// Receiver: s.neutronAddr.String(), +// TokenIn: s.providerToNeutronDenom, +// TokenOut: nativeDenom, +// AmountIn: swapAmount, +// TickIndexInToOut: 2, +// OrderType: types.LimitOrderType_FILL_OR_KILL, +// }, +// Next: nextJSON, +// }, +// } + +// metadataBz, err := json.Marshal(metadata) +// s.Assert().NoError(err) + +// // Send an IBC transfer from provider to neutron with packet memo containing the swap metadata +// s.IBCTransferProviderToNeutron( +// s.providerAddr, +// s.neutronAddr, +// nativeDenom, +// ibcTransferAmount, +// string(metadataBz), +// ) + +// neutronPacket := maps.Values(s.neutronChain.SentPackets)[0] +// err = s.neutronChainBPath.EndpointB.UpdateClient() +// s.Require().NoError(err) +// err = s.neutronChainBPath.EndpointB.RecvPacket(neutronPacket) +// s.Require().NoError(err) +// err = s.RelayAllPacketsAToB(s.chainBChainCPath) +// s.Require().NoError(err) + +// transferDenomPathNeutronChainB := transfertypes.GetPrefixedDenom( +// transfertypes.PortID, +// s.neutronChainBPath.EndpointB.ChannelID, +// nativeDenom, +// ) +// transferDenomNeutronChainB := transfertypes.ParseDenomTrace(transferDenomPathNeutronChainB).IBCDenom() +// transferDenomPathChainC := transfertypes.GetPrefixedDenom( +// transfertypes.PortID, +// s.chainBChainCPath.EndpointB.ChannelID, +// transferDenomPathNeutronChainB, +// ) +// transferDenomChainC := transfertypes.ParseDenomTrace(transferDenomPathChainC).IBCDenom() + +// // Check that the funds are moved out of the acc on chainA +// s.assertProviderBalance( +// s.providerAddr, +// nativeDenom, +// newProviderBalNative.Sub(ibcTransferAmount), +// ) +// // Check that chain B balance is unchanged +// s.assertChainBBalance(chainBAddr, transferDenomNeutronChainB, math.ZeroInt()) + +// // Check that funds made it to chainC +// s.assertChainCBalance(chainCAddr, transferDenomChainC, expectedOut) +// } + +// // TestSwapAndForward_UnwindIBCDenomSuccess asserts that the swap and forward middleware stack works as intended in the +// // case that a native token from ChainB is sent to ChainA and then ChainA initiates a swap and forward with the token. +// // This asserts that denom unwinding works as intended when going provider->neutron->provider +// func (s *IBCTestSuite) TestSwapAndForward_UnwindIBCDenomSuccess() { +// // Send an IBC transfer from provider chain to neutron, so we can initialize a pool with the IBC denom token + native Neutron token +// s.IBCTransferProviderToNeutron( +// s.providerAddr, +// s.neutronAddr, +// nativeDenom, +// ibcTransferAmount, +// "", +// ) + +// // Assert that the funds are gone from the acc on provider and present in the acc on Neutron +// newProviderBalNative := genesisWalletAmount.Sub(ibcTransferAmount) +// s.assertProviderBalance(s.providerAddr, nativeDenom, newProviderBalNative) + +// s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, ibcTransferAmount) + +// // deposit stake<>ibcTransferToken to initialize the pool on Neutron +// depositAmount := math.NewInt(100_000) +// s.neutronDeposit( +// nativeDenom, +// s.providerToNeutronDenom, +// depositAmount, +// depositAmount, +// 1, +// 1, +// s.neutronAddr) + +// // Assert that the deposit was successful and the funds are moved out of the Neutron user acc +// s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, math.ZeroInt()) +// postDepositNeutronBalNative := genesisWalletAmount.Sub(depositAmount) +// s.assertNeutronBalance(s.neutronAddr, nativeDenom, postDepositNeutronBalNative) + +// swapAmount := math.NewInt(100_000) +// expectedAmountOut := math.NewInt(99980) + +// retries := uint8(0) + +// forwardMetadata := pfmtypes.PacketMetadata{ +// Forward: &pfmtypes.ForwardMetadata{ +// Receiver: s.providerAddr.String(), +// Port: s.neutronTransferPath.EndpointA.ChannelConfig.PortID, +// Channel: s.neutronTransferPath.EndpointA.ChannelID, +// Timeout: pfmtypes.Duration(5 * time.Minute), +// Retries: &retries, +// Next: nil, +// }, +// } + +// bz, err := json.Marshal(forwardMetadata) +// s.Assert().NoError(err) + +// nextJSON := new(swaptypes.JSONObject) +// err = json.Unmarshal(bz, nextJSON) +// s.Assert().NoError(err) + +// metadata := swaptypes.PacketMetadata{ +// Swap: &swaptypes.SwapMetadata{ +// MsgPlaceLimitOrder: &types.MsgPlaceLimitOrder{ +// Creator: s.neutronAddr.String(), +// Receiver: s.neutronAddr.String(), +// TokenIn: nativeDenom, +// TokenOut: s.providerToNeutronDenom, +// AmountIn: swapAmount, +// TickIndexInToOut: 2, +// OrderType: types.LimitOrderType_FILL_OR_KILL, +// }, +// Next: nextJSON, +// }, +// } + +// metadataBz, err := json.Marshal(metadata) +// s.Require().NoError(err) + +// // Transfer native denom from neutron to provider +// s.IBCTransfer( +// s.neutronTransferPath, +// s.neutronTransferPath.EndpointA, +// s.neutronAddr, +// s.providerAddr, +// nativeDenom, +// ibcTransferAmount, +// "", +// ) +// transferDenomPath := transfertypes.GetPrefixedDenom( +// transfertypes.PortID, +// s.neutronTransferPath.EndpointB.ChannelID, +// nativeDenom, +// ) +// transferDenomNeutronProvider := transfertypes.ParseDenomTrace(transferDenomPath).IBCDenom() +// s.assertProviderBalance(s.providerAddr, transferDenomNeutronProvider, ibcTransferAmount) + +// // Send an IBC transfer from provider to neutron with packet memo containing the swap metadata +// s.IBCTransferProviderToNeutron( +// s.providerAddr, +// s.neutronAddr, +// transferDenomNeutronProvider, +// swapAmount, +// string(metadataBz), +// ) + +// // Relay the packets +// err = s.RelayAllPacketsAToB(s.neutronTransferPath) +// s.Assert().NoError(err) +// s.coordinator.CommitBlock(s.neutronChain) + +// // Check that the amountIn is deducted from the neutron override receiever account +// overrideAddr := s.ReceiverOverrideAddr(s.neutronTransferPath.EndpointA.ChannelID, s.providerAddr.String()) +// s.assertNeutronBalance(overrideAddr, nativeDenom, math.OneInt()) +// // Check that the funds are now present on the provider chainer +// s.assertProviderBalance( +// s.providerAddr, +// nativeDenom, +// newProviderBalNative.Add(expectedAmountOut), +// ) +// } + +// // TestSwapAndForward_ForwardFailsRefundAddr asserts that the swap and forward middleware stack works as intended in the case +// // that an incoming IBC swap succeeds but the forward fails when a NeutronRefundAddress is provided. +// // The swap will be reverted and the transferred amount will be credited to the refundAddr +// func (s *IBCTestSuite) TestSwapAndForward_ForwardFailsRefundAddr() { +// // Send an IBC transfer from provider chain to neutron, so we can initialize a pool with the IBC denom token + native Neutron token +// s.IBCTransferProviderToNeutron( +// s.providerAddr, +// s.neutronAddr, +// nativeDenom, +// ibcTransferAmount, +// "", +// ) + +// // Assert that the funds are gone from the acc on provider and present in the acc on Neutron +// newProviderBalNative := genesisWalletAmount.Sub(ibcTransferAmount) +// s.assertProviderBalance(s.providerAddr, nativeDenom, newProviderBalNative) + +// s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, ibcTransferAmount) + +// // deposit stake<>ibcTransferToken to initialize the pool on Neutron +// depositAmount := math.NewInt(100_000) +// s.neutronDeposit( +// nativeDenom, +// s.providerToNeutronDenom, +// depositAmount, +// depositAmount, +// 0, +// 1, +// s.neutronAddr) + +// // Assert that the deposit was successful and the funds are moved out of the Neutron user acc +// s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, math.ZeroInt()) +// postDepositNeutronBalNative := genesisWalletAmount.Sub(depositAmount) +// s.assertNeutronBalance(s.neutronAddr, nativeDenom, postDepositNeutronBalNative) + +// // Compose the IBC transfer memo metadata to be used in the swap and forward +// swapAmount := math.NewInt(100000) +// chainBAddr := s.bundleB.Chain.SenderAccount.GetAddress() + +// retries := uint8(0) + +// forwardMetadata := pfmtypes.PacketMetadata{ +// Forward: &pfmtypes.ForwardMetadata{ +// Receiver: chainBAddr.String(), +// Port: s.neutronChainBPath.EndpointA.ChannelConfig.PortID, +// Channel: "invalid-channel", // add an invalid channel identifier so the forward fails +// Timeout: pfmtypes.Duration(5 * time.Minute), +// Retries: &retries, +// Next: nil, +// }, +// } + +// bz, err := json.Marshal(forwardMetadata) +// s.Assert().NoError(err) + +// nextJSON := new(swaptypes.JSONObject) +// err = json.Unmarshal(bz, nextJSON) +// s.Assert().NoError(err) + +// refundAddr := s.neutronChain.SenderAccounts[1].SenderAccount.GetAddress() +// metadata := swaptypes.PacketMetadata{ +// Swap: &swaptypes.SwapMetadata{ +// MsgPlaceLimitOrder: &types.MsgPlaceLimitOrder{ +// Creator: s.neutronAddr.String(), +// Receiver: s.neutronAddr.String(), +// TokenIn: s.providerToNeutronDenom, +// TokenOut: nativeDenom, +// AmountIn: swapAmount, +// TickIndexInToOut: 2, +// OrderType: types.LimitOrderType_FILL_OR_KILL, +// }, +// NeutronRefundAddress: refundAddr.String(), +// Next: nextJSON, +// }, +// } + +// metadataBz, err := json.Marshal(metadata) +// s.Require().NoError(err) + +// // Send an IBC transfer from provider to neutron with packet memo containing the swap metadata +// s.IBCTransferProviderToNeutron( +// s.providerAddr, +// s.neutronAddr, +// nativeDenom, +// ibcTransferAmount, +// string(metadataBz), +// ) + +// // Relay the packets from neutron => ChainB +// err = s.RelayAllPacketsAToB(s.neutronChainBPath) +// // Relay Fails +// s.Assert().Error(err) + +// // Check that the funds are moved out of the acc on providerChain +// s.assertProviderBalance( +// s.providerAddr, +// nativeDenom, +// newProviderBalNative.Sub(ibcTransferAmount), +// ) + +// // Check that nothing remains in the overrideReceiver account +// overrideAddr := s.ReceiverOverrideAddr(s.neutronTransferPath.EndpointA.ChannelID, s.providerAddr.String()) +// s.assertNeutronBalance(overrideAddr, s.providerToNeutronDenom, math.ZeroInt()) +// s.assertNeutronBalance(overrideAddr, nativeDenom, math.ZeroInt()) + +// // Check that the swap was reverted and the transfer amount is in the refundAddr +// s.assertNeutronBalance(refundAddr, s.providerToNeutronDenom, ibcTransferAmount) + +// // Check that nothing made it to chainB +// transferDenomPath := transfertypes.GetPrefixedDenom( +// transfertypes.PortID, +// s.neutronChainBPath.EndpointA.ChannelID, +// nativeDenom, +// ) +// transferDenomNeutronChainB := transfertypes.ParseDenomTrace(transferDenomPath).IBCDenom() + +// s.assertChainBBalance(chainBAddr, transferDenomNeutronChainB, math.ZeroInt()) +// } + +// // TestSwapAndForward_ForwardFailsRefundAddr asserts that the swap and forward middleware stack works as intended in the case +// // that an incoming IBC swap succeeds but the forward fails when no NeutronRefundAddress is provided. +// // The swap will be reverted and a refund to the src chain will take place. +// func (s *IBCTestSuite) TestSwapAndForward_ForwardFails() { +// // Send an IBC transfer from provider chain to neutron, so we can initialize a pool with the IBC denom token + native Neutron token +// s.IBCTransferProviderToNeutron( +// s.providerAddr, +// s.neutronAddr, +// nativeDenom, +// ibcTransferAmount, +// "", +// ) + +// // Assert that the funds are gone from the acc on provider and present in the acc on Neutron +// newProviderBalNative := genesisWalletAmount.Sub(ibcTransferAmount) +// s.assertProviderBalance(s.providerAddr, nativeDenom, newProviderBalNative) + +// s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, ibcTransferAmount) + +// // deposit stake<>ibcTransferToken to initialize the pool on Neutron +// depositAmount := math.NewInt(100_000) +// s.neutronDeposit( +// nativeDenom, +// s.providerToNeutronDenom, +// depositAmount, +// depositAmount, +// 0, +// 1, +// s.neutronAddr) + +// // Assert that the deposit was successful and the funds are moved out of the Neutron user acc +// s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, math.ZeroInt()) +// postDepositNeutronBalNative := genesisWalletAmount.Sub(depositAmount) +// s.assertNeutronBalance(s.neutronAddr, nativeDenom, postDepositNeutronBalNative) + +// // Compose the IBC transfer memo metadata to be used in the swap and forward +// swapAmount := math.NewInt(100000) +// chainBAddr := s.bundleB.Chain.SenderAccount.GetAddress() + +// retries := uint8(0) + +// forwardMetadata := pfmtypes.PacketMetadata{ +// Forward: &pfmtypes.ForwardMetadata{ +// Receiver: chainBAddr.String(), +// Port: s.neutronChainBPath.EndpointA.ChannelConfig.PortID, +// Channel: "invalid-channel", // add an invalid channel identifier so the forward fails +// Timeout: pfmtypes.Duration(5 * time.Minute), +// Retries: &retries, +// Next: nil, +// }, +// } + +// bz, err := json.Marshal(forwardMetadata) +// s.Assert().NoError(err) + +// nextJSON := new(swaptypes.JSONObject) +// err = json.Unmarshal(bz, nextJSON) +// s.Assert().NoError(err) + +// metadata := swaptypes.PacketMetadata{ +// Swap: &swaptypes.SwapMetadata{ +// MsgPlaceLimitOrder: &types.MsgPlaceLimitOrder{ +// Creator: s.neutronAddr.String(), +// Receiver: s.neutronAddr.String(), +// TokenIn: s.providerToNeutronDenom, +// TokenOut: nativeDenom, +// AmountIn: swapAmount, +// TickIndexInToOut: 2, +// OrderType: types.LimitOrderType_FILL_OR_KILL, +// }, +// Next: nextJSON, +// }, +// } + +// metadataBz, err := json.Marshal(metadata) +// s.Require().NoError(err) + +// // Send an IBC transfer from provider to neutron with packet memo containing the swap metadata +// s.IBCTransferProviderToNeutron( +// s.providerAddr, +// s.neutronAddr, +// nativeDenom, +// ibcTransferAmount, +// string(metadataBz), +// ) + +// // Relay the packets from neutron => ChainB +// err = s.RelayAllPacketsAToB(s.neutronChainBPath) +// // Relay Fails +// s.Assert().Error(err) + +// // Check that nothing remains in the overrideReceiver account +// overrideAddr := s.ReceiverOverrideAddr(s.neutronTransferPath.EndpointA.ChannelID, s.providerAddr.String()) +// s.assertNeutronBalance(overrideAddr, s.providerToNeutronDenom, math.ZeroInt()) +// s.assertNeutronBalance(overrideAddr, nativeDenom, math.ZeroInt()) + +// // Check that nothing made it to chainB +// transferDenomPath := transfertypes.GetPrefixedDenom( +// transfertypes.PortID, +// s.neutronChainBPath.EndpointA.ChannelID, +// nativeDenom, +// ) +// transferDenomNeutronChainB := transfertypes.ParseDenomTrace(transferDenomPath).IBCDenom() + +// s.assertChainBBalance(chainBAddr, transferDenomNeutronChainB, math.ZeroInt()) + +// // Check that the refund takes place and the funds are moved back to the account on Gaia +// s.assertProviderBalance(s.providerAddr, nativeDenom, genesisWalletAmount.Sub(depositAmount)) +// } diff --git a/x/ibcswap/ibc_middleware.go b/x/ibcswap/ibc_middleware.go index df315b06e..85981c188 100644 --- a/x/ibcswap/ibc_middleware.go +++ b/x/ibcswap/ibc_middleware.go @@ -1,7 +1,6 @@ package ibcswap import ( - "context" "encoding/json" "errors" "strings" @@ -11,7 +10,6 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward" - pfmtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types" transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" @@ -118,9 +116,7 @@ func (im IBCMiddleware) OnChanCloseConfirm(ctx sdk.Context, portID, channelID st // 2. validate swapMetadata; ErrAck if invalid // 3. Pass through the middleware stack to ibc-go/transfer#OnRecvPacket; transfer coins are sent to receiver // 4. Do swap; handle failures -// 5. If no PFM is present we are done; return ack -// 6. Unpack packet so that it is a valid PFM packet and set required context variables -// 7. Pass through middleware stack again where the forward is handled by packet-forward-middleware#OnRecvPacket + func (im IBCMiddleware) OnRecvPacket( ctx sdk.Context, packet channeltypes.Packet, @@ -157,10 +153,11 @@ func (im IBCMiddleware) OnRecvPacket( metadata.Creator = overrideReceiver // Update packet data to match the new receiver so that transfer middleware adds tokens to the expected address packet = newPacketWithOverrideReceiver(packet, data, overrideReceiver) - if metadata.ContainsPFM() { - // If we are using PFM change receiver to the expected address for forwarding - metadata.Receiver = overrideReceiver - } + // TODO: fully validate PFM with ibcswap before re-enabling + // if metadata.ContainsPFM() { + // // If we are using PFM change receiver to the expected address for forwarding + // metadata.Receiver = overrideReceiver + // } ack := im.app.OnRecvPacket(ctx, packet, relayer) if ack == nil || !ack.Success() { @@ -205,23 +202,24 @@ func (im IBCMiddleware) OnRecvPacket( packet.Data = dataBz - // Compose our context with values that will be used to pass through to the forward middleware - ctxWithForwardFlags := context.WithValue(cacheCtx.Context(), pfmtypes.ProcessedKey{}, true) - ctxWithForwardFlags = context.WithValue( - ctxWithForwardFlags, - pfmtypes.NonrefundableKey{}, - true, - ) - ctxWithForwardFlags = context.WithValue( - ctxWithForwardFlags, - pfmtypes.DisableDenomCompositionKey{}, - true, - ) - wrappedSdkCtx := cacheCtx.WithContext(ctxWithForwardFlags) + // TODO: fully validate PFM post ibcswap before re-enabling this + // // Compose our context with values that will be used to pass through to the forward middleware + // ctxWithForwardFlags := context.WithValue(cacheCtx.Context(), pfmtypes.ProcessedKey{}, true) + // ctxWithForwardFlags = context.WithValue( + // ctxWithForwardFlags, + // pfmtypes.NonrefundableKey{}, + // true, + // ) + // ctxWithForwardFlags = context.WithValue( + // ctxWithForwardFlags, + // pfmtypes.DisableDenomCompositionKey{}, + // true, + // ) + // wrappedSdkCtx := cacheCtx.WithContext(ctxWithForwardFlags) // The forward middleware should return a nil ack if the forward is initiated properly. // If not an error occurred, and we return the original ack. - newAck := im.app.OnRecvPacket(wrappedSdkCtx, packet, relayer) + newAck := im.app.OnRecvPacket(cacheCtx, packet, relayer) if newAck != nil { return im.handleFailedSwap(ctx, packet, data, metadata, errors.New(string(newAck.Acknowledgement()))) } @@ -436,7 +434,14 @@ func validateSwapPacket(packet channeltypes.Packet, transferData transfertypes.F } if transferAmount.LT(sm.AmountIn) { - return sdkerrors.Wrap(types.ErrInvalidSwapMetadata, "Transfer amount must be <= AmountIn") + return sdkerrors.Wrap(types.ErrInvalidSwapMetadata, "Transfer amount must be >= AmountIn") + } + + if sm.ContainsPFM() { + return sdkerrors.Wrap( + types.ErrInvalidSwapMetadata, + "ibcswap middle cannot be used in conjunction with packet-forward-middleware", + ) } return nil } From 5ab3c497464148f9b3898c32858404abf6c1fc39 Mon Sep 17 00:00:00 2001 From: Julian Compagni Portis Date: Tue, 14 Nov 2023 13:18:29 -0500 Subject: [PATCH 278/307] Return unused tokenIn to original creator addr --- tests/ibc/gmp_swap_forward_test.go | 5 ++--- tests/ibc/swap_test.go | 8 ++++++-- x/ibcswap/ibc_middleware.go | 3 ++- x/ibcswap/keeper/keeper.go | 15 +++++++++++++++ 4 files changed, 25 insertions(+), 6 deletions(-) diff --git a/tests/ibc/gmp_swap_forward_test.go b/tests/ibc/gmp_swap_forward_test.go index 652e4f211..c8a46781f 100644 --- a/tests/ibc/gmp_swap_forward_test.go +++ b/tests/ibc/gmp_swap_forward_test.go @@ -99,10 +99,9 @@ func (s *IBCTestSuite) TestGMPSwapAndForward_Success() { // Check that the funds are moved out of the acc on providerChain s.assertProviderBalance(s.providerAddr, nativeDenom, newProviderBalNative.Sub(ibcTransferAmount)) - // Check that the amountIn is deducted from the neutron override account + // Check that neutron override account did not keep anything overrideAddr := s.ReceiverOverrideAddr(s.neutronTransferPath.EndpointA.ChannelID, s.providerAddr.String()) - s.assertNeutronBalance(overrideAddr, s.providerToNeutronDenom, math.OneInt()) - // Check that neutron override account did not keep any of the transfer denom + s.assertNeutronBalance(overrideAddr, s.providerToNeutronDenom, math.ZeroInt()) s.assertNeutronBalance(overrideAddr, nativeDenom, math.ZeroInt()) transferDenomPath := transfertypes.GetPrefixedDenom( diff --git a/tests/ibc/swap_test.go b/tests/ibc/swap_test.go index 44e4c2be4..68ea752de 100644 --- a/tests/ibc/swap_test.go +++ b/tests/ibc/swap_test.go @@ -82,9 +82,13 @@ func (s *IBCTestSuite) TestIBCSwapMiddleware_Success() { // Check that the swap funds are now present in the acc on Neutron s.assertNeutronBalance(s.neutronAddr, nativeDenom, postDepositNeutronBalNative.Add(expectedOut)) - // Check that all of the IBC transfer denom have been used up + // Check that the overrideReceiver did not keep anything overrideAddr := s.ReceiverOverrideAddr(s.neutronTransferPath.EndpointA.ChannelID, s.providerAddr.String()) - s.assertNeutronBalance(overrideAddr, s.providerToNeutronDenom, math.OneInt()) + s.assertNeutronBalance(overrideAddr, s.providerToNeutronDenom, math.ZeroInt()) + s.assertNeutronBalance(overrideAddr, s.providerToNeutronDenom, math.ZeroInt()) + + // Check that the unused balance is credited to the original creator + s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, math.OneInt()) } // TestIBCSwapMiddleware_FailRefund asserts that the IBC swap middleware works as intended with Neutron running as a diff --git a/x/ibcswap/ibc_middleware.go b/x/ibcswap/ibc_middleware.go index 85981c188..75bc9457a 100644 --- a/x/ibcswap/ibc_middleware.go +++ b/x/ibcswap/ibc_middleware.go @@ -146,6 +146,7 @@ func (im IBCMiddleware) OnRecvPacket( // Use overrideReceiver so that users cannot ibcswap through arbitrary addresses. // Instead generate a unique address for each user based on their channel and origin-address + originalCreator := m.Swap.Creator overrideReceiver, err := packetforward.GetReceiver(packet.DestinationChannel, data.Sender) if err != nil { return channeltypes.NewErrorAcknowledgement(err) @@ -166,7 +167,7 @@ func (im IBCMiddleware) OnRecvPacket( // Attempt to perform a swap using a cacheCtx cacheCtx, writeCache := ctx.CacheContext() - res, err := im.keeper.Swap(cacheCtx, metadata.MsgPlaceLimitOrder) + res, err := im.keeper.Swap(cacheCtx, originalCreator, metadata.MsgPlaceLimitOrder) if err != nil { return im.handleFailedSwap(ctx, packet, data, metadata, err) } diff --git a/x/ibcswap/keeper/keeper.go b/x/ibcswap/keeper/keeper.go index e3f48b3d0..2e6073b77 100644 --- a/x/ibcswap/keeper/keeper.go +++ b/x/ibcswap/keeper/keeper.go @@ -53,6 +53,7 @@ func (k Keeper) Logger(ctx sdk.Context) log.Logger { // Swap calls into the base app's msg service router so that the appropriate handler is called when sending the swap msg. func (k Keeper) Swap( ctx sdk.Context, + originalCreator string, msg *dextypes.MsgPlaceLimitOrder, ) (*dextypes.MsgPlaceLimitOrderResponse, error) { swapHandler := k.msgServiceRouter.Handler(msg) @@ -73,6 +74,20 @@ func (k Keeper) Swap( return nil, err } + amountUnused := msg.AmountIn.Sub(msgSwapRes.CoinIn.Amount) + // If not all tokenIn is swapped and a temporary creator address has been used + // return the unused portion to the original creator address + if amountUnused.IsPositive() && originalCreator != msg.Creator { + overrrideCreatorAddr := sdk.MustAccAddressFromBech32(msg.Creator) + originalCreatorAddr := sdk.MustAccAddressFromBech32(originalCreator) + unusedCoin := sdk.NewCoin(msg.TokenIn, amountUnused) + + err := k.bankKeeper.SendCoins(ctx, overrrideCreatorAddr, originalCreatorAddr, sdk.Coins{unusedCoin}) + if err != nil { + return nil, err + } + } + return msgSwapRes, nil } From 535a383e29413bebe5f3418b806e4f5375a45313 Mon Sep 17 00:00:00 2001 From: Julian Compagni Portis Date: Mon, 20 Nov 2023 00:06:15 -0500 Subject: [PATCH 279/307] Disable gmp swap and forward tests. Add simple gmp ibcswap test --- tests/ibc/gmp_swap_forward_test.go | 167 +++++++++++++++++++++-------- 1 file changed, 121 insertions(+), 46 deletions(-) diff --git a/tests/ibc/gmp_swap_forward_test.go b/tests/ibc/gmp_swap_forward_test.go index c8a46781f..37673c3e4 100644 --- a/tests/ibc/gmp_swap_forward_test.go +++ b/tests/ibc/gmp_swap_forward_test.go @@ -2,19 +2,15 @@ package ibc_test import ( "encoding/json" - "time" "cosmossdk.io/math" - pfmtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types" - transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" "github.com/neutron-org/neutron/x/dex/types" "github.com/neutron-org/neutron/x/gmp" swaptypes "github.com/neutron-org/neutron/x/ibcswap/types" ) -// TestSwapAndForward_Success asserts that the swap and forward middleware stack works as intended with Neutron running as a -// consumer chain connected to two other chains via IBC. +// TestGMPSwap_Success asserts that the swap middleware works as intended when the original message is sent via GMP func (s *IBCTestSuite) TestGMPSwapAndForward_Success() { // Send an IBC transfer from provider to Neutron, so we can initialize a pool with the IBC denom token + native Neutron token s.IBCTransferProviderToNeutron(s.providerAddr, s.neutronAddr, nativeDenom, ibcTransferAmount, "") @@ -27,6 +23,7 @@ func (s *IBCTestSuite) TestGMPSwapAndForward_Success() { // deposit stake<>ibcTransferToken to initialize the pool on Neutron depositAmount := math.NewInt(100_000) + postDepositNeutronBalNative := genesisWalletAmount.Sub(depositAmount) s.neutronDeposit( nativeDenom, s.providerToNeutronDenom, @@ -38,27 +35,7 @@ func (s *IBCTestSuite) TestGMPSwapAndForward_Success() { // Compose the IBC transfer memo metadata to be used in the swap and forward swapAmount := math.NewInt(100000) - expectedAmountOut := math.NewInt(99990) - chainBAddr := s.bundleB.Chain.SenderAccount.GetAddress() - - retries := uint8(0) - forwardMetadata := pfmtypes.PacketMetadata{ - Forward: &pfmtypes.ForwardMetadata{ - Receiver: chainBAddr.String(), - Port: s.neutronChainBPath.EndpointA.ChannelConfig.PortID, - Channel: s.neutronChainBPath.EndpointA.ChannelID, - Timeout: pfmtypes.Duration(5 * time.Minute), - Retries: &retries, - Next: nil, - }, - } - - forwardBz, err := json.Marshal(forwardMetadata) - s.Require().NoError(err) - - forwardNextJSON := new(swaptypes.JSONObject) - err = json.Unmarshal(forwardBz, forwardNextJSON) - s.Require().NoError(err) + expectedOut := math.NewInt(99990) swapMetadata := swaptypes.PacketMetadata{ Swap: &swaptypes.SwapMetadata{ @@ -71,7 +48,6 @@ func (s *IBCTestSuite) TestGMPSwapAndForward_Success() { TickIndexInToOut: 2, OrderType: types.LimitOrderType_FILL_OR_KILL, }, - Next: forwardNextJSON, }, } swapMetadataBz, err := json.Marshal(swapMetadata) @@ -88,31 +64,130 @@ func (s *IBCTestSuite) TestGMPSwapAndForward_Success() { gmpMetadataBz, err := json.Marshal(gmpMetadata) s.Require().NoError(err) - // Send an IBC transfer from chainA to chainB with packet memo containing the swap metadata + // Send an IBC transfer from chainA to chainB with GMP payload containing the swap metadata s.IBCTransferProviderToNeutron(s.providerAddr, s.neutronAddr, nativeDenom, ibcTransferAmount, string(gmpMetadataBz)) - // Relay the packet - err = s.RelayAllPacketsAToB(s.neutronChainBPath) - s.Assert().NoError(err) - // Check that the funds are moved out of the acc on providerChain - s.assertProviderBalance(s.providerAddr, nativeDenom, newProviderBalNative.Sub(ibcTransferAmount)) - - // Check that neutron override account did not keep anything - overrideAddr := s.ReceiverOverrideAddr(s.neutronTransferPath.EndpointA.ChannelID, s.providerAddr.String()) - s.assertNeutronBalance(overrideAddr, s.providerToNeutronDenom, math.ZeroInt()) - s.assertNeutronBalance(overrideAddr, nativeDenom, math.ZeroInt()) - - transferDenomPath := transfertypes.GetPrefixedDenom( - transfertypes.PortID, - s.neutronChainBPath.EndpointA.ChannelID, + s.assertProviderBalance( + s.providerAddr, nativeDenom, + newProviderBalNative.Sub(ibcTransferAmount), ) - transferDenomChainB := transfertypes.ParseDenomTrace(transferDenomPath).IBCDenom() - // Check that the funds are now present in the acc on chainB - s.assertChainBBalance(chainBAddr, transferDenomChainB, expectedAmountOut) + // Check that the swap funds are now present in the acc on Neutron + s.assertNeutronBalance(s.neutronAddr, nativeDenom, postDepositNeutronBalNative.Add(expectedOut)) + + // Check that the overrideReceiver did not keep anything + overrideAddr := s.ReceiverOverrideAddr(s.neutronTransferPath.EndpointA.ChannelID, s.providerAddr.String()) + s.assertNeutronBalance(overrideAddr, s.providerToNeutronDenom, math.ZeroInt()) + s.assertNeutronBalance(overrideAddr, s.providerToNeutronDenom, math.ZeroInt()) - s.Assert().NoError(err) + // Check that the unused balance is credited to the original creator + s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, math.OneInt()) } + +// TODO: fully validate PFM post ibcswap before re-enabling this +// // TestSwapAndForward_Success asserts that the swap and forward middleware stack works as intended with Neutron running as a +// // consumer chain connected to two other chains via IBC. +// func (s *IBCTestSuite) TestGMPSwapAndForward_Success() { +// // Send an IBC transfer from provider to Neutron, so we can initialize a pool with the IBC denom token + native Neutron token +// s.IBCTransferProviderToNeutron(s.providerAddr, s.neutronAddr, nativeDenom, ibcTransferAmount, "") + +// // Assert that the funds are gone from the acc on provider and present in the acc on Neutron +// newProviderBalNative := genesisWalletAmount.Sub(ibcTransferAmount) +// s.assertProviderBalance(s.providerAddr, nativeDenom, newProviderBalNative) + +// s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, ibcTransferAmount) + +// // deposit stake<>ibcTransferToken to initialize the pool on Neutron +// depositAmount := math.NewInt(100_000) +// s.neutronDeposit( +// nativeDenom, +// s.providerToNeutronDenom, +// depositAmount, +// depositAmount, +// 0, +// 1, +// s.neutronAddr) + +// // Compose the IBC transfer memo metadata to be used in the swap and forward +// swapAmount := math.NewInt(100000) +// expectedAmountOut := math.NewInt(99990) +// chainBAddr := s.bundleB.Chain.SenderAccount.GetAddress() + +// retries := uint8(0) +// forwardMetadata := pfmtypes.PacketMetadata{ +// Forward: &pfmtypes.ForwardMetadata{ +// Receiver: chainBAddr.String(), +// Port: s.neutronChainBPath.EndpointA.ChannelConfig.PortID, +// Channel: s.neutronChainBPath.EndpointA.ChannelID, +// Timeout: pfmtypes.Duration(5 * time.Minute), +// Retries: &retries, +// Next: nil, +// }, +// } + +// forwardBz, err := json.Marshal(forwardMetadata) +// s.Require().NoError(err) + +// forwardNextJSON := new(swaptypes.JSONObject) +// err = json.Unmarshal(forwardBz, forwardNextJSON) +// s.Require().NoError(err) + +// swapMetadata := swaptypes.PacketMetadata{ +// Swap: &swaptypes.SwapMetadata{ +// MsgPlaceLimitOrder: &types.MsgPlaceLimitOrder{ +// Creator: s.neutronAddr.String(), +// Receiver: s.neutronAddr.String(), +// TokenIn: s.providerToNeutronDenom, +// TokenOut: nativeDenom, +// AmountIn: swapAmount, +// TickIndexInToOut: 2, +// OrderType: types.LimitOrderType_FILL_OR_KILL, +// }, +// Next: forwardNextJSON, +// }, +// } +// swapMetadataBz, err := json.Marshal(swapMetadata) + +// s.Require().NoError(err) + +// gmpMetadata := gmp.Message{ +// SourceChain: "axelar", +// SourceAddress: "alice", +// Payload: swapMetadataBz, +// Type: gmp.TypeGeneralMessageWithToken, +// } + +// gmpMetadataBz, err := json.Marshal(gmpMetadata) +// s.Require().NoError(err) + +// // Send an IBC transfer from chainA to chainB with packet memo containing the swap metadata + +// s.IBCTransferProviderToNeutron(s.providerAddr, s.neutronAddr, nativeDenom, ibcTransferAmount, string(gmpMetadataBz)) + +// // Relay the packet +// err = s.RelayAllPacketsAToB(s.neutronChainBPath) +// s.Assert().NoError(err) + +// // Check that the funds are moved out of the acc on providerChain +// s.assertProviderBalance(s.providerAddr, nativeDenom, newProviderBalNative.Sub(ibcTransferAmount)) + +// // Check that neutron override account did not keep anything +// overrideAddr := s.ReceiverOverrideAddr(s.neutronTransferPath.EndpointA.ChannelID, s.providerAddr.String()) +// s.assertNeutronBalance(overrideAddr, s.providerToNeutronDenom, math.ZeroInt()) +// s.assertNeutronBalance(overrideAddr, nativeDenom, math.ZeroInt()) + +// transferDenomPath := transfertypes.GetPrefixedDenom( +// transfertypes.PortID, +// s.neutronChainBPath.EndpointA.ChannelID, +// nativeDenom, +// ) +// transferDenomChainB := transfertypes.ParseDenomTrace(transferDenomPath).IBCDenom() + +// // Check that the funds are now present in the acc on chainB +// s.assertChainBBalance(chainBAddr, transferDenomChainB, expectedAmountOut) + +// s.Assert().NoError(err) +// } From 0289bbac57e8046f606057149cc0d2423972708a Mon Sep 17 00:00:00 2001 From: Julian Compagni Portis Date: Mon, 20 Nov 2023 00:11:35 -0500 Subject: [PATCH 280/307] Add test to ensure that swap-and-forward fails gracefully --- tests/ibc/swap_forward_test.go | 109 ++++++++++++++++++++++++++++----- 1 file changed, 95 insertions(+), 14 deletions(-) diff --git a/tests/ibc/swap_forward_test.go b/tests/ibc/swap_forward_test.go index ca44a5357..91acbf480 100644 --- a/tests/ibc/swap_forward_test.go +++ b/tests/ibc/swap_forward_test.go @@ -1,20 +1,101 @@ package ibc_test -// TODO: fully validate PFM post ibcswap before re-enabling this -// import ( -// "encoding/json" -// "time" - -// "cosmossdk.io/math" -// pfmtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types" -// transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" -// "github.com/iancoleman/orderedmap" -// "golang.org/x/exp/maps" - -// "github.com/neutron-org/neutron/x/dex/types" -// swaptypes "github.com/neutron-org/neutron/x/ibcswap/types" -// ) +import ( + "encoding/json" + "time" + + "cosmossdk.io/math" + pfmtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types" + + "github.com/neutron-org/neutron/x/dex/types" + swaptypes "github.com/neutron-org/neutron/x/ibcswap/types" +) + +// TestSwapAndForward_Fails asserts that the IBC swap middleware fails gracefully when provided with a package-forward memo +func (s *IBCTestSuite) TestSwapAndForward_Fails() { + // Send an IBC transfer from provider chain to neutron, so we can initialize a pool with the IBC denom token + native Neutron token + s.IBCTransferProviderToNeutron( + s.providerAddr, + s.neutronAddr, + nativeDenom, + ibcTransferAmount, + "", + ) + newProviderBalNative := genesisWalletAmount.Sub(ibcTransferAmount) + + // deposit stake<>ibcTransferToken to initialize the pool on Neutron + depositAmount := math.NewInt(100_000) + s.neutronDeposit( + nativeDenom, + s.providerToNeutronDenom, + depositAmount, + depositAmount, + 0, + 1, + s.neutronAddr) + + postDepositNeutronBalNative := genesisWalletAmount.Sub(depositAmount) + + // Compose the IBC transfer memo metadata to be used in the swap and forward + swapAmount := math.NewInt(100000) + chainBAddr := s.bundleB.Chain.SenderAccount.GetAddress() + + retries := uint8(0) + + forwardMetadata := pfmtypes.PacketMetadata{ + Forward: &pfmtypes.ForwardMetadata{ + Receiver: chainBAddr.String(), + Port: s.neutronChainBPath.EndpointA.ChannelConfig.PortID, + Channel: s.neutronChainBPath.EndpointA.ChannelID, + Timeout: pfmtypes.Duration(5 * time.Minute), + Retries: &retries, + Next: nil, + }, + } + + bz, err := json.Marshal(forwardMetadata) + s.Assert().NoError(err) + + nextJSON := new(swaptypes.JSONObject) + err = json.Unmarshal(bz, nextJSON) + s.Assert().NoError(err) + + metadata := swaptypes.PacketMetadata{ + Swap: &swaptypes.SwapMetadata{ + MsgPlaceLimitOrder: &types.MsgPlaceLimitOrder{ + Creator: s.neutronAddr.String(), + Receiver: s.neutronAddr.String(), + TokenIn: s.providerToNeutronDenom, + TokenOut: nativeDenom, + AmountIn: swapAmount, + TickIndexInToOut: 2, + OrderType: types.LimitOrderType_FILL_OR_KILL, + }, + Next: nextJSON, + }, + } + + metadataBz, err := json.Marshal(metadata) + s.Require().NoError(err) + + // Send (failing) IBC transfer with PFM data + s.IBCTransferProviderToNeutron( + s.providerAddr, + s.neutronAddr, + nativeDenom, + ibcTransferAmount, + string(metadataBz), + ) + + // Check that the funds are not present in the account on Neutron + s.assertNeutronBalance(s.neutronAddr, nativeDenom, postDepositNeutronBalNative) + s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, math.ZeroInt()) + + // Check that the refund takes place and the funds are moved back to the account on Gaia + s.assertProviderBalance(s.providerAddr, nativeDenom, newProviderBalNative) +} +// TODO: fully validate PFM post ibcswap before re-enabling this // func (s *IBCTestSuite) TestSwapAndForward_Success() { // // Send an IBC transfer from provider chain to neutron, so we can initialize a pool with the IBC denom token + native Neutron token // s.IBCTransferProviderToNeutron( From 5f225afb6e2a55f5e25241f845072e65feb1752f Mon Sep 17 00:00:00 2001 From: Julian Compagni Portis Date: Mon, 20 Nov 2023 00:20:51 -0500 Subject: [PATCH 281/307] fix typo --- x/ibcswap/ibc_middleware.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x/ibcswap/ibc_middleware.go b/x/ibcswap/ibc_middleware.go index 75bc9457a..0466dc3a7 100644 --- a/x/ibcswap/ibc_middleware.go +++ b/x/ibcswap/ibc_middleware.go @@ -441,7 +441,7 @@ func validateSwapPacket(packet channeltypes.Packet, transferData transfertypes.F if sm.ContainsPFM() { return sdkerrors.Wrap( types.ErrInvalidSwapMetadata, - "ibcswap middle cannot be used in conjunction with packet-forward-middleware", + "ibcswap middleware cannot be used in conjunction with packet-forward-middleware", ) } return nil From 8757db9ab355f8f8a581a6e6d5a5dc2d87db3efc Mon Sep 17 00:00:00 2001 From: Julian Compagni Portis Date: Mon, 20 Nov 2023 00:24:27 -0500 Subject: [PATCH 282/307] remove unused NonRefundable key from SwapMetadata --- x/ibcswap/types/swap.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/x/ibcswap/types/swap.go b/x/ibcswap/types/swap.go index 3c4965db9..0aedf4bc8 100644 --- a/x/ibcswap/types/swap.go +++ b/x/ibcswap/types/swap.go @@ -20,10 +20,8 @@ type PacketMetadata struct { // further in the middleware stack or on the counterparty. type SwapMetadata struct { *dextypes.MsgPlaceLimitOrder - NonRefundable bool `json:"non-refundable,omitempty"` // If a value is provided for NeutronRefundAddress and the swap fails the Transfer.Amount will be moved to this address for later recovery. // If no NeutronRefundAddress is provided and a swap fails we will fail the ibc transfer and tokens will be refunded on the source chain. - NeutronRefundAddress string `json:"refund-address,omitempty"` // Using JSONObject so that objects for next property will not be mutated by golang's lexicographic key sort on map keys during Marshal. From 1587c5e8bc82a073ee58fd901c1156082868a266 Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Mon, 20 Nov 2023 15:54:26 +0200 Subject: [PATCH 283/307] update cosmos-sdk to 0.47.6 --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 3d91873c5..fe521e720 100644 --- a/go.mod +++ b/go.mod @@ -192,7 +192,7 @@ replace ( github.com/ChainSafe/go-schnorrkel => github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d github.com/CosmWasm/wasmd => github.com/neutron-org/wasmd v0.43.0 github.com/cosmos/admin-module => github.com/neutron-org/admin-module v1.0.0 - github.com/cosmos/cosmos-sdk => github.com/neutron-org/cosmos-sdk v0.47.6 + github.com/cosmos/cosmos-sdk => github.com/neutron-org/cosmos-sdk v0.47.6-neutron github.com/cosmos/gaia/v11 => github.com/cosmos/gaia/v11 v11.0.0-20230724152830-861ba391c3b4 github.com/cosmos/ledger-cosmos-go => github.com/cosmos/ledger-cosmos-go v0.12.1 github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 diff --git a/go.sum b/go.sum index 0e9619a6e..290740da2 100644 --- a/go.sum +++ b/go.sum @@ -936,8 +936,8 @@ github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OS github.com/neilotoole/errgroup v0.1.6/go.mod h1:Q2nLGf+594h0CLBs/Mbg6qOr7GtqDK7C2S41udRnToE= github.com/neutron-org/admin-module v1.0.0 h1:mmX5U6jz4rX+lk8SB5Bx0Lsugu9bh4PCREMnVkLQoIs= github.com/neutron-org/admin-module v1.0.0/go.mod h1:INknneN2W3Fr9Eld7SpfLRdjyHR1muzFbbqXln1ixic= -github.com/neutron-org/cosmos-sdk v0.47.6 h1:FaHH5DUb4JP1zI945/j+CzbhBvhxqe6iFIn2HER4xks= -github.com/neutron-org/cosmos-sdk v0.47.6/go.mod h1:7BmlRp0txKo2UZ01OLq4DGEjgLDiPgmpRpjLOq89Jys= +github.com/neutron-org/cosmos-sdk v0.47.6-neutron h1:agxUiBWlAGQf5+8A7e5omYrpgbylL+SoSQlCVuQTd3Y= +github.com/neutron-org/cosmos-sdk v0.47.6-neutron/go.mod h1:7BmlRp0txKo2UZ01OLq4DGEjgLDiPgmpRpjLOq89Jys= github.com/neutron-org/wasmd v0.43.0 h1:aXzN9diVRAKTs2+EdK4zoTOmNCjjr8vpAhIq8VbBUJc= github.com/neutron-org/wasmd v0.43.0/go.mod h1:GEWnDHjbx7qtVHQ+5ocrNe1sIHNiXcTlSocXyLQNnRY= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= From 25b8b59a28862e4098e09009a2e02af96171fc02 Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Mon, 20 Nov 2023 16:51:51 +0200 Subject: [PATCH 284/307] lint && format --- tests/ibc/ibc_setup_test.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/ibc/ibc_setup_test.go b/tests/ibc/ibc_setup_test.go index 5b42507c0..2beb6a438 100644 --- a/tests/ibc/ibc_setup_test.go +++ b/tests/ibc/ibc_setup_test.go @@ -320,10 +320,12 @@ func (s *IBCTestSuite) assertProviderBalance( s.assertBalance(s.providerApp.GetTestBankKeeper(), s.providerChain, addr, denom, expectedAmt) } +//nolint:unused func (s *IBCTestSuite) assertChainBBalance(addr sdk.AccAddress, denom string, expectedAmt math.Int) { s.assertBalance(s.bundleB.App.GetTestBankKeeper(), s.bundleB.Chain, addr, denom, expectedAmt) } +//nolint:unused func (s *IBCTestSuite) assertChainCBalance(addr sdk.AccAddress, denom string, expectedAmt math.Int) { s.assertBalance(s.bundleC.App.GetTestBankKeeper(), s.bundleC.Chain, addr, denom, expectedAmt) } @@ -336,7 +338,6 @@ func (s *IBCTestSuite) ReceiverOverrideAddr(channel, sender string) sdk.AccAddre return sdk.MustAccAddressFromBech32(addr) } -//nolint:unparam // keep this flexible even if we aren't currently using all the params func (s *IBCTestSuite) neutronDeposit( token0 string, token1 string, From 728a63e3f4f553ee8a728244181a33312c973118 Mon Sep 17 00:00:00 2001 From: Julian Compagni Portis Date: Mon, 20 Nov 2023 12:22:36 -0500 Subject: [PATCH 285/307] delete commented code --- tests/ibc/gmp_swap_forward_test.go | 105 ----- tests/ibc/swap_forward_test.go | 594 ----------------------------- x/ibcswap/ibc_middleware.go | 20 - 3 files changed, 719 deletions(-) diff --git a/tests/ibc/gmp_swap_forward_test.go b/tests/ibc/gmp_swap_forward_test.go index 37673c3e4..8d35b825b 100644 --- a/tests/ibc/gmp_swap_forward_test.go +++ b/tests/ibc/gmp_swap_forward_test.go @@ -86,108 +86,3 @@ func (s *IBCTestSuite) TestGMPSwapAndForward_Success() { // Check that the unused balance is credited to the original creator s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, math.OneInt()) } - -// TODO: fully validate PFM post ibcswap before re-enabling this -// // TestSwapAndForward_Success asserts that the swap and forward middleware stack works as intended with Neutron running as a -// // consumer chain connected to two other chains via IBC. -// func (s *IBCTestSuite) TestGMPSwapAndForward_Success() { -// // Send an IBC transfer from provider to Neutron, so we can initialize a pool with the IBC denom token + native Neutron token -// s.IBCTransferProviderToNeutron(s.providerAddr, s.neutronAddr, nativeDenom, ibcTransferAmount, "") - -// // Assert that the funds are gone from the acc on provider and present in the acc on Neutron -// newProviderBalNative := genesisWalletAmount.Sub(ibcTransferAmount) -// s.assertProviderBalance(s.providerAddr, nativeDenom, newProviderBalNative) - -// s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, ibcTransferAmount) - -// // deposit stake<>ibcTransferToken to initialize the pool on Neutron -// depositAmount := math.NewInt(100_000) -// s.neutronDeposit( -// nativeDenom, -// s.providerToNeutronDenom, -// depositAmount, -// depositAmount, -// 0, -// 1, -// s.neutronAddr) - -// // Compose the IBC transfer memo metadata to be used in the swap and forward -// swapAmount := math.NewInt(100000) -// expectedAmountOut := math.NewInt(99990) -// chainBAddr := s.bundleB.Chain.SenderAccount.GetAddress() - -// retries := uint8(0) -// forwardMetadata := pfmtypes.PacketMetadata{ -// Forward: &pfmtypes.ForwardMetadata{ -// Receiver: chainBAddr.String(), -// Port: s.neutronChainBPath.EndpointA.ChannelConfig.PortID, -// Channel: s.neutronChainBPath.EndpointA.ChannelID, -// Timeout: pfmtypes.Duration(5 * time.Minute), -// Retries: &retries, -// Next: nil, -// }, -// } - -// forwardBz, err := json.Marshal(forwardMetadata) -// s.Require().NoError(err) - -// forwardNextJSON := new(swaptypes.JSONObject) -// err = json.Unmarshal(forwardBz, forwardNextJSON) -// s.Require().NoError(err) - -// swapMetadata := swaptypes.PacketMetadata{ -// Swap: &swaptypes.SwapMetadata{ -// MsgPlaceLimitOrder: &types.MsgPlaceLimitOrder{ -// Creator: s.neutronAddr.String(), -// Receiver: s.neutronAddr.String(), -// TokenIn: s.providerToNeutronDenom, -// TokenOut: nativeDenom, -// AmountIn: swapAmount, -// TickIndexInToOut: 2, -// OrderType: types.LimitOrderType_FILL_OR_KILL, -// }, -// Next: forwardNextJSON, -// }, -// } -// swapMetadataBz, err := json.Marshal(swapMetadata) - -// s.Require().NoError(err) - -// gmpMetadata := gmp.Message{ -// SourceChain: "axelar", -// SourceAddress: "alice", -// Payload: swapMetadataBz, -// Type: gmp.TypeGeneralMessageWithToken, -// } - -// gmpMetadataBz, err := json.Marshal(gmpMetadata) -// s.Require().NoError(err) - -// // Send an IBC transfer from chainA to chainB with packet memo containing the swap metadata - -// s.IBCTransferProviderToNeutron(s.providerAddr, s.neutronAddr, nativeDenom, ibcTransferAmount, string(gmpMetadataBz)) - -// // Relay the packet -// err = s.RelayAllPacketsAToB(s.neutronChainBPath) -// s.Assert().NoError(err) - -// // Check that the funds are moved out of the acc on providerChain -// s.assertProviderBalance(s.providerAddr, nativeDenom, newProviderBalNative.Sub(ibcTransferAmount)) - -// // Check that neutron override account did not keep anything -// overrideAddr := s.ReceiverOverrideAddr(s.neutronTransferPath.EndpointA.ChannelID, s.providerAddr.String()) -// s.assertNeutronBalance(overrideAddr, s.providerToNeutronDenom, math.ZeroInt()) -// s.assertNeutronBalance(overrideAddr, nativeDenom, math.ZeroInt()) - -// transferDenomPath := transfertypes.GetPrefixedDenom( -// transfertypes.PortID, -// s.neutronChainBPath.EndpointA.ChannelID, -// nativeDenom, -// ) -// transferDenomChainB := transfertypes.ParseDenomTrace(transferDenomPath).IBCDenom() - -// // Check that the funds are now present in the acc on chainB -// s.assertChainBBalance(chainBAddr, transferDenomChainB, expectedAmountOut) - -// s.Assert().NoError(err) -// } diff --git a/tests/ibc/swap_forward_test.go b/tests/ibc/swap_forward_test.go index 91acbf480..9e66d0406 100644 --- a/tests/ibc/swap_forward_test.go +++ b/tests/ibc/swap_forward_test.go @@ -94,597 +94,3 @@ func (s *IBCTestSuite) TestSwapAndForward_Fails() { // Check that the refund takes place and the funds are moved back to the account on Gaia s.assertProviderBalance(s.providerAddr, nativeDenom, newProviderBalNative) } - -// TODO: fully validate PFM post ibcswap before re-enabling this -// func (s *IBCTestSuite) TestSwapAndForward_Success() { -// // Send an IBC transfer from provider chain to neutron, so we can initialize a pool with the IBC denom token + native Neutron token -// s.IBCTransferProviderToNeutron( -// s.providerAddr, -// s.neutronAddr, -// nativeDenom, -// ibcTransferAmount, -// "", -// ) - -// // Assert that the funds are gone from the acc on provider and present in the acc on Neutron -// newProviderBalNative := genesisWalletAmount.Sub(ibcTransferAmount) -// s.assertProviderBalance(s.providerAddr, nativeDenom, newProviderBalNative) - -// s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, ibcTransferAmount) - -// // deposit stake<>ibcTransferToken to initialize the pool on Neutron -// depositAmount := math.NewInt(100_000) -// s.neutronDeposit( -// nativeDenom, -// s.providerToNeutronDenom, -// depositAmount, -// depositAmount, -// 0, -// 1, -// s.neutronAddr) - -// // Assert that the deposit was successful and the funds are moved out of the Neutron user acc -// s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, math.ZeroInt()) -// postDepositNeutronBalNative := genesisWalletAmount.Sub(depositAmount) -// s.assertNeutronBalance(s.neutronAddr, nativeDenom, postDepositNeutronBalNative) - -// // Compose the IBC transfer memo metadata to be used in the swap and forward -// swapAmount := math.NewInt(100000) -// expectedAmountOut := math.NewInt(99990) -// chainBAddr := s.bundleB.Chain.SenderAccount.GetAddress() - -// retries := uint8(0) - -// forwardMetadata := pfmtypes.PacketMetadata{ -// Forward: &pfmtypes.ForwardMetadata{ -// Receiver: chainBAddr.String(), -// Port: s.neutronChainBPath.EndpointA.ChannelConfig.PortID, -// Channel: s.neutronChainBPath.EndpointA.ChannelID, -// Timeout: pfmtypes.Duration(5 * time.Minute), -// Retries: &retries, -// Next: nil, -// }, -// } - -// bz, err := json.Marshal(forwardMetadata) -// s.Assert().NoError(err) - -// nextJSON := new(swaptypes.JSONObject) -// err = json.Unmarshal(bz, nextJSON) -// s.Assert().NoError(err) - -// metadata := swaptypes.PacketMetadata{ -// Swap: &swaptypes.SwapMetadata{ -// MsgPlaceLimitOrder: &types.MsgPlaceLimitOrder{ -// Creator: s.neutronAddr.String(), -// Receiver: s.neutronAddr.String(), -// TokenIn: s.providerToNeutronDenom, -// TokenOut: nativeDenom, -// AmountIn: swapAmount, -// TickIndexInToOut: 2, -// OrderType: types.LimitOrderType_FILL_OR_KILL, -// }, -// Next: nextJSON, -// }, -// } - -// metadataBz, err := json.Marshal(metadata) -// s.Require().NoError(err) - -// // Send an IBC transfer from provider to neutron with packet memo containing the swap metadata -// s.IBCTransferProviderToNeutron( -// s.providerAddr, -// s.neutronAddr, -// nativeDenom, -// ibcTransferAmount, -// string(metadataBz), -// ) - -// // Relay the packets -// err = s.RelayAllPacketsAToB(s.neutronChainBPath) -// s.Assert().NoError(err) - -// // Check that the funds are moved out of the acc on providerChain -// s.assertProviderBalance( -// s.providerAddr, -// nativeDenom, -// newProviderBalNative.Sub(ibcTransferAmount), -// ) - -// // Check that the amountIn is deducted from the neutron overrid receiver account -// overrideAddr := s.ReceiverOverrideAddr(s.neutronTransferPath.EndpointA.ChannelID, s.providerAddr.String()) -// s.assertNeutronBalance(overrideAddr, s.providerToNeutronDenom, math.OneInt()) -// // Check that neutron account did not keep any of the transfer denom -// s.assertNeutronBalance(overrideAddr, nativeDenom, math.ZeroInt()) - -// transferDenomPath := transfertypes.GetPrefixedDenom( -// transfertypes.PortID, -// s.neutronChainBPath.EndpointA.ChannelID, -// nativeDenom, -// ) -// transferDenomNeutronChainB := transfertypes.ParseDenomTrace(transferDenomPath).IBCDenom() - -// // Check that the funds are now present in the acc on chainB -// s.assertChainBBalance(chainBAddr, transferDenomNeutronChainB, expectedAmountOut) -// } - -// func (s *IBCTestSuite) TestSwapAndForward_MultiHopSuccess() { -// // Send an IBC transfer from provider chain to neutron, so we can initialize a pool with the IBC denom token + native Neutron token -// s.IBCTransferProviderToNeutron( -// s.providerAddr, -// s.neutronAddr, -// nativeDenom, -// ibcTransferAmount, -// "", -// ) - -// // Assert that the funds are gone from the acc on provider and present in the acc on Neutron -// newProviderBalNative := genesisWalletAmount.Sub(ibcTransferAmount) -// s.assertProviderBalance(s.providerAddr, nativeDenom, newProviderBalNative) - -// s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, ibcTransferAmount) - -// // deposit stake<>ibcTransferToken to initialize the pool on Neutron -// depositAmount := math.NewInt(100_000) -// s.neutronDeposit( -// nativeDenom, -// s.providerToNeutronDenom, -// depositAmount, -// depositAmount, -// 0, -// 1, -// s.neutronAddr) - -// // Assert that the deposit was successful and the funds are moved out of the Neutron user acc -// s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, math.ZeroInt()) -// postDepositNeutronBalNative := genesisWalletAmount.Sub(depositAmount) -// s.assertNeutronBalance(s.neutronAddr, nativeDenom, postDepositNeutronBalNative) - -// // Compose the IBC transfer memo metadata to be used in the swap and forward -// swapAmount := math.NewInt(100000) - -// expectedOut := math.NewInt(99_990) - -// chainBAddr := s.bundleB.Chain.SenderAccount.GetAddress() -// chainCAddr := s.bundleC.Chain.SenderAccount.GetAddress() - -// retries := uint8(0) -// nextForward := pfmtypes.PacketMetadata{ -// Forward: &pfmtypes.ForwardMetadata{ -// Receiver: chainCAddr.String(), -// Port: s.chainBChainCPath.EndpointA.ChannelConfig.PortID, -// Channel: s.chainBChainCPath.EndpointA.ChannelID, -// Timeout: pfmtypes.Duration(5 * time.Minute), -// Retries: &retries, -// Next: nil, -// }, -// } -// nextForwardBz, err := json.Marshal(nextForward) -// s.Assert().NoError(err) -// nextForwardJSON := pfmtypes.NewJSONObject(false, nextForwardBz, orderedmap.OrderedMap{}) - -// forwardMetadata := pfmtypes.PacketMetadata{ -// Forward: &pfmtypes.ForwardMetadata{ -// Receiver: chainBAddr.String(), -// Port: s.neutronChainBPath.EndpointA.ChannelConfig.PortID, -// Channel: s.neutronChainBPath.EndpointA.ChannelID, -// Timeout: pfmtypes.Duration(5 * time.Minute), -// Retries: &retries, -// Next: nextForwardJSON, -// }, -// } -// bz, err := json.Marshal(forwardMetadata) -// s.Assert().NoError(err) - -// nextJSON := new(swaptypes.JSONObject) -// err = json.Unmarshal(bz, nextJSON) -// s.Assert().NoError(err) - -// metadata := swaptypes.PacketMetadata{ -// Swap: &swaptypes.SwapMetadata{ -// MsgPlaceLimitOrder: &types.MsgPlaceLimitOrder{ -// Creator: s.neutronAddr.String(), -// Receiver: s.neutronAddr.String(), -// TokenIn: s.providerToNeutronDenom, -// TokenOut: nativeDenom, -// AmountIn: swapAmount, -// TickIndexInToOut: 2, -// OrderType: types.LimitOrderType_FILL_OR_KILL, -// }, -// Next: nextJSON, -// }, -// } - -// metadataBz, err := json.Marshal(metadata) -// s.Assert().NoError(err) - -// // Send an IBC transfer from provider to neutron with packet memo containing the swap metadata -// s.IBCTransferProviderToNeutron( -// s.providerAddr, -// s.neutronAddr, -// nativeDenom, -// ibcTransferAmount, -// string(metadataBz), -// ) - -// neutronPacket := maps.Values(s.neutronChain.SentPackets)[0] -// err = s.neutronChainBPath.EndpointB.UpdateClient() -// s.Require().NoError(err) -// err = s.neutronChainBPath.EndpointB.RecvPacket(neutronPacket) -// s.Require().NoError(err) -// err = s.RelayAllPacketsAToB(s.chainBChainCPath) -// s.Require().NoError(err) - -// transferDenomPathNeutronChainB := transfertypes.GetPrefixedDenom( -// transfertypes.PortID, -// s.neutronChainBPath.EndpointB.ChannelID, -// nativeDenom, -// ) -// transferDenomNeutronChainB := transfertypes.ParseDenomTrace(transferDenomPathNeutronChainB).IBCDenom() -// transferDenomPathChainC := transfertypes.GetPrefixedDenom( -// transfertypes.PortID, -// s.chainBChainCPath.EndpointB.ChannelID, -// transferDenomPathNeutronChainB, -// ) -// transferDenomChainC := transfertypes.ParseDenomTrace(transferDenomPathChainC).IBCDenom() - -// // Check that the funds are moved out of the acc on chainA -// s.assertProviderBalance( -// s.providerAddr, -// nativeDenom, -// newProviderBalNative.Sub(ibcTransferAmount), -// ) -// // Check that chain B balance is unchanged -// s.assertChainBBalance(chainBAddr, transferDenomNeutronChainB, math.ZeroInt()) - -// // Check that funds made it to chainC -// s.assertChainCBalance(chainCAddr, transferDenomChainC, expectedOut) -// } - -// // TestSwapAndForward_UnwindIBCDenomSuccess asserts that the swap and forward middleware stack works as intended in the -// // case that a native token from ChainB is sent to ChainA and then ChainA initiates a swap and forward with the token. -// // This asserts that denom unwinding works as intended when going provider->neutron->provider -// func (s *IBCTestSuite) TestSwapAndForward_UnwindIBCDenomSuccess() { -// // Send an IBC transfer from provider chain to neutron, so we can initialize a pool with the IBC denom token + native Neutron token -// s.IBCTransferProviderToNeutron( -// s.providerAddr, -// s.neutronAddr, -// nativeDenom, -// ibcTransferAmount, -// "", -// ) - -// // Assert that the funds are gone from the acc on provider and present in the acc on Neutron -// newProviderBalNative := genesisWalletAmount.Sub(ibcTransferAmount) -// s.assertProviderBalance(s.providerAddr, nativeDenom, newProviderBalNative) - -// s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, ibcTransferAmount) - -// // deposit stake<>ibcTransferToken to initialize the pool on Neutron -// depositAmount := math.NewInt(100_000) -// s.neutronDeposit( -// nativeDenom, -// s.providerToNeutronDenom, -// depositAmount, -// depositAmount, -// 1, -// 1, -// s.neutronAddr) - -// // Assert that the deposit was successful and the funds are moved out of the Neutron user acc -// s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, math.ZeroInt()) -// postDepositNeutronBalNative := genesisWalletAmount.Sub(depositAmount) -// s.assertNeutronBalance(s.neutronAddr, nativeDenom, postDepositNeutronBalNative) - -// swapAmount := math.NewInt(100_000) -// expectedAmountOut := math.NewInt(99980) - -// retries := uint8(0) - -// forwardMetadata := pfmtypes.PacketMetadata{ -// Forward: &pfmtypes.ForwardMetadata{ -// Receiver: s.providerAddr.String(), -// Port: s.neutronTransferPath.EndpointA.ChannelConfig.PortID, -// Channel: s.neutronTransferPath.EndpointA.ChannelID, -// Timeout: pfmtypes.Duration(5 * time.Minute), -// Retries: &retries, -// Next: nil, -// }, -// } - -// bz, err := json.Marshal(forwardMetadata) -// s.Assert().NoError(err) - -// nextJSON := new(swaptypes.JSONObject) -// err = json.Unmarshal(bz, nextJSON) -// s.Assert().NoError(err) - -// metadata := swaptypes.PacketMetadata{ -// Swap: &swaptypes.SwapMetadata{ -// MsgPlaceLimitOrder: &types.MsgPlaceLimitOrder{ -// Creator: s.neutronAddr.String(), -// Receiver: s.neutronAddr.String(), -// TokenIn: nativeDenom, -// TokenOut: s.providerToNeutronDenom, -// AmountIn: swapAmount, -// TickIndexInToOut: 2, -// OrderType: types.LimitOrderType_FILL_OR_KILL, -// }, -// Next: nextJSON, -// }, -// } - -// metadataBz, err := json.Marshal(metadata) -// s.Require().NoError(err) - -// // Transfer native denom from neutron to provider -// s.IBCTransfer( -// s.neutronTransferPath, -// s.neutronTransferPath.EndpointA, -// s.neutronAddr, -// s.providerAddr, -// nativeDenom, -// ibcTransferAmount, -// "", -// ) -// transferDenomPath := transfertypes.GetPrefixedDenom( -// transfertypes.PortID, -// s.neutronTransferPath.EndpointB.ChannelID, -// nativeDenom, -// ) -// transferDenomNeutronProvider := transfertypes.ParseDenomTrace(transferDenomPath).IBCDenom() -// s.assertProviderBalance(s.providerAddr, transferDenomNeutronProvider, ibcTransferAmount) - -// // Send an IBC transfer from provider to neutron with packet memo containing the swap metadata -// s.IBCTransferProviderToNeutron( -// s.providerAddr, -// s.neutronAddr, -// transferDenomNeutronProvider, -// swapAmount, -// string(metadataBz), -// ) - -// // Relay the packets -// err = s.RelayAllPacketsAToB(s.neutronTransferPath) -// s.Assert().NoError(err) -// s.coordinator.CommitBlock(s.neutronChain) - -// // Check that the amountIn is deducted from the neutron override receiever account -// overrideAddr := s.ReceiverOverrideAddr(s.neutronTransferPath.EndpointA.ChannelID, s.providerAddr.String()) -// s.assertNeutronBalance(overrideAddr, nativeDenom, math.OneInt()) -// // Check that the funds are now present on the provider chainer -// s.assertProviderBalance( -// s.providerAddr, -// nativeDenom, -// newProviderBalNative.Add(expectedAmountOut), -// ) -// } - -// // TestSwapAndForward_ForwardFailsRefundAddr asserts that the swap and forward middleware stack works as intended in the case -// // that an incoming IBC swap succeeds but the forward fails when a NeutronRefundAddress is provided. -// // The swap will be reverted and the transferred amount will be credited to the refundAddr -// func (s *IBCTestSuite) TestSwapAndForward_ForwardFailsRefundAddr() { -// // Send an IBC transfer from provider chain to neutron, so we can initialize a pool with the IBC denom token + native Neutron token -// s.IBCTransferProviderToNeutron( -// s.providerAddr, -// s.neutronAddr, -// nativeDenom, -// ibcTransferAmount, -// "", -// ) - -// // Assert that the funds are gone from the acc on provider and present in the acc on Neutron -// newProviderBalNative := genesisWalletAmount.Sub(ibcTransferAmount) -// s.assertProviderBalance(s.providerAddr, nativeDenom, newProviderBalNative) - -// s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, ibcTransferAmount) - -// // deposit stake<>ibcTransferToken to initialize the pool on Neutron -// depositAmount := math.NewInt(100_000) -// s.neutronDeposit( -// nativeDenom, -// s.providerToNeutronDenom, -// depositAmount, -// depositAmount, -// 0, -// 1, -// s.neutronAddr) - -// // Assert that the deposit was successful and the funds are moved out of the Neutron user acc -// s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, math.ZeroInt()) -// postDepositNeutronBalNative := genesisWalletAmount.Sub(depositAmount) -// s.assertNeutronBalance(s.neutronAddr, nativeDenom, postDepositNeutronBalNative) - -// // Compose the IBC transfer memo metadata to be used in the swap and forward -// swapAmount := math.NewInt(100000) -// chainBAddr := s.bundleB.Chain.SenderAccount.GetAddress() - -// retries := uint8(0) - -// forwardMetadata := pfmtypes.PacketMetadata{ -// Forward: &pfmtypes.ForwardMetadata{ -// Receiver: chainBAddr.String(), -// Port: s.neutronChainBPath.EndpointA.ChannelConfig.PortID, -// Channel: "invalid-channel", // add an invalid channel identifier so the forward fails -// Timeout: pfmtypes.Duration(5 * time.Minute), -// Retries: &retries, -// Next: nil, -// }, -// } - -// bz, err := json.Marshal(forwardMetadata) -// s.Assert().NoError(err) - -// nextJSON := new(swaptypes.JSONObject) -// err = json.Unmarshal(bz, nextJSON) -// s.Assert().NoError(err) - -// refundAddr := s.neutronChain.SenderAccounts[1].SenderAccount.GetAddress() -// metadata := swaptypes.PacketMetadata{ -// Swap: &swaptypes.SwapMetadata{ -// MsgPlaceLimitOrder: &types.MsgPlaceLimitOrder{ -// Creator: s.neutronAddr.String(), -// Receiver: s.neutronAddr.String(), -// TokenIn: s.providerToNeutronDenom, -// TokenOut: nativeDenom, -// AmountIn: swapAmount, -// TickIndexInToOut: 2, -// OrderType: types.LimitOrderType_FILL_OR_KILL, -// }, -// NeutronRefundAddress: refundAddr.String(), -// Next: nextJSON, -// }, -// } - -// metadataBz, err := json.Marshal(metadata) -// s.Require().NoError(err) - -// // Send an IBC transfer from provider to neutron with packet memo containing the swap metadata -// s.IBCTransferProviderToNeutron( -// s.providerAddr, -// s.neutronAddr, -// nativeDenom, -// ibcTransferAmount, -// string(metadataBz), -// ) - -// // Relay the packets from neutron => ChainB -// err = s.RelayAllPacketsAToB(s.neutronChainBPath) -// // Relay Fails -// s.Assert().Error(err) - -// // Check that the funds are moved out of the acc on providerChain -// s.assertProviderBalance( -// s.providerAddr, -// nativeDenom, -// newProviderBalNative.Sub(ibcTransferAmount), -// ) - -// // Check that nothing remains in the overrideReceiver account -// overrideAddr := s.ReceiverOverrideAddr(s.neutronTransferPath.EndpointA.ChannelID, s.providerAddr.String()) -// s.assertNeutronBalance(overrideAddr, s.providerToNeutronDenom, math.ZeroInt()) -// s.assertNeutronBalance(overrideAddr, nativeDenom, math.ZeroInt()) - -// // Check that the swap was reverted and the transfer amount is in the refundAddr -// s.assertNeutronBalance(refundAddr, s.providerToNeutronDenom, ibcTransferAmount) - -// // Check that nothing made it to chainB -// transferDenomPath := transfertypes.GetPrefixedDenom( -// transfertypes.PortID, -// s.neutronChainBPath.EndpointA.ChannelID, -// nativeDenom, -// ) -// transferDenomNeutronChainB := transfertypes.ParseDenomTrace(transferDenomPath).IBCDenom() - -// s.assertChainBBalance(chainBAddr, transferDenomNeutronChainB, math.ZeroInt()) -// } - -// // TestSwapAndForward_ForwardFailsRefundAddr asserts that the swap and forward middleware stack works as intended in the case -// // that an incoming IBC swap succeeds but the forward fails when no NeutronRefundAddress is provided. -// // The swap will be reverted and a refund to the src chain will take place. -// func (s *IBCTestSuite) TestSwapAndForward_ForwardFails() { -// // Send an IBC transfer from provider chain to neutron, so we can initialize a pool with the IBC denom token + native Neutron token -// s.IBCTransferProviderToNeutron( -// s.providerAddr, -// s.neutronAddr, -// nativeDenom, -// ibcTransferAmount, -// "", -// ) - -// // Assert that the funds are gone from the acc on provider and present in the acc on Neutron -// newProviderBalNative := genesisWalletAmount.Sub(ibcTransferAmount) -// s.assertProviderBalance(s.providerAddr, nativeDenom, newProviderBalNative) - -// s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, ibcTransferAmount) - -// // deposit stake<>ibcTransferToken to initialize the pool on Neutron -// depositAmount := math.NewInt(100_000) -// s.neutronDeposit( -// nativeDenom, -// s.providerToNeutronDenom, -// depositAmount, -// depositAmount, -// 0, -// 1, -// s.neutronAddr) - -// // Assert that the deposit was successful and the funds are moved out of the Neutron user acc -// s.assertNeutronBalance(s.neutronAddr, s.providerToNeutronDenom, math.ZeroInt()) -// postDepositNeutronBalNative := genesisWalletAmount.Sub(depositAmount) -// s.assertNeutronBalance(s.neutronAddr, nativeDenom, postDepositNeutronBalNative) - -// // Compose the IBC transfer memo metadata to be used in the swap and forward -// swapAmount := math.NewInt(100000) -// chainBAddr := s.bundleB.Chain.SenderAccount.GetAddress() - -// retries := uint8(0) - -// forwardMetadata := pfmtypes.PacketMetadata{ -// Forward: &pfmtypes.ForwardMetadata{ -// Receiver: chainBAddr.String(), -// Port: s.neutronChainBPath.EndpointA.ChannelConfig.PortID, -// Channel: "invalid-channel", // add an invalid channel identifier so the forward fails -// Timeout: pfmtypes.Duration(5 * time.Minute), -// Retries: &retries, -// Next: nil, -// }, -// } - -// bz, err := json.Marshal(forwardMetadata) -// s.Assert().NoError(err) - -// nextJSON := new(swaptypes.JSONObject) -// err = json.Unmarshal(bz, nextJSON) -// s.Assert().NoError(err) - -// metadata := swaptypes.PacketMetadata{ -// Swap: &swaptypes.SwapMetadata{ -// MsgPlaceLimitOrder: &types.MsgPlaceLimitOrder{ -// Creator: s.neutronAddr.String(), -// Receiver: s.neutronAddr.String(), -// TokenIn: s.providerToNeutronDenom, -// TokenOut: nativeDenom, -// AmountIn: swapAmount, -// TickIndexInToOut: 2, -// OrderType: types.LimitOrderType_FILL_OR_KILL, -// }, -// Next: nextJSON, -// }, -// } - -// metadataBz, err := json.Marshal(metadata) -// s.Require().NoError(err) - -// // Send an IBC transfer from provider to neutron with packet memo containing the swap metadata -// s.IBCTransferProviderToNeutron( -// s.providerAddr, -// s.neutronAddr, -// nativeDenom, -// ibcTransferAmount, -// string(metadataBz), -// ) - -// // Relay the packets from neutron => ChainB -// err = s.RelayAllPacketsAToB(s.neutronChainBPath) -// // Relay Fails -// s.Assert().Error(err) - -// // Check that nothing remains in the overrideReceiver account -// overrideAddr := s.ReceiverOverrideAddr(s.neutronTransferPath.EndpointA.ChannelID, s.providerAddr.String()) -// s.assertNeutronBalance(overrideAddr, s.providerToNeutronDenom, math.ZeroInt()) -// s.assertNeutronBalance(overrideAddr, nativeDenom, math.ZeroInt()) - -// // Check that nothing made it to chainB -// transferDenomPath := transfertypes.GetPrefixedDenom( -// transfertypes.PortID, -// s.neutronChainBPath.EndpointA.ChannelID, -// nativeDenom, -// ) -// transferDenomNeutronChainB := transfertypes.ParseDenomTrace(transferDenomPath).IBCDenom() - -// s.assertChainBBalance(chainBAddr, transferDenomNeutronChainB, math.ZeroInt()) - -// // Check that the refund takes place and the funds are moved back to the account on Gaia -// s.assertProviderBalance(s.providerAddr, nativeDenom, genesisWalletAmount.Sub(depositAmount)) -// } diff --git a/x/ibcswap/ibc_middleware.go b/x/ibcswap/ibc_middleware.go index 0466dc3a7..23c4750e5 100644 --- a/x/ibcswap/ibc_middleware.go +++ b/x/ibcswap/ibc_middleware.go @@ -154,11 +154,6 @@ func (im IBCMiddleware) OnRecvPacket( metadata.Creator = overrideReceiver // Update packet data to match the new receiver so that transfer middleware adds tokens to the expected address packet = newPacketWithOverrideReceiver(packet, data, overrideReceiver) - // TODO: fully validate PFM with ibcswap before re-enabling - // if metadata.ContainsPFM() { - // // If we are using PFM change receiver to the expected address for forwarding - // metadata.Receiver = overrideReceiver - // } ack := im.app.OnRecvPacket(ctx, packet, relayer) if ack == nil || !ack.Success() { @@ -203,21 +198,6 @@ func (im IBCMiddleware) OnRecvPacket( packet.Data = dataBz - // TODO: fully validate PFM post ibcswap before re-enabling this - // // Compose our context with values that will be used to pass through to the forward middleware - // ctxWithForwardFlags := context.WithValue(cacheCtx.Context(), pfmtypes.ProcessedKey{}, true) - // ctxWithForwardFlags = context.WithValue( - // ctxWithForwardFlags, - // pfmtypes.NonrefundableKey{}, - // true, - // ) - // ctxWithForwardFlags = context.WithValue( - // ctxWithForwardFlags, - // pfmtypes.DisableDenomCompositionKey{}, - // true, - // ) - // wrappedSdkCtx := cacheCtx.WithContext(ctxWithForwardFlags) - // The forward middleware should return a nil ack if the forward is initiated properly. // If not an error occurred, and we return the original ack. newAck := im.app.OnRecvPacket(cacheCtx, packet, relayer) From d13ded6bf93cf3b183caf2281f1addb5822025a4 Mon Sep 17 00:00:00 2001 From: Julian Compagni Portis Date: Mon, 20 Nov 2023 12:22:58 -0500 Subject: [PATCH 286/307] bump pfm to 7.1.2 --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 61c7a29f3..dfb978790 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/cosmos/cosmos-sdk v0.47.6 github.com/cosmos/gaia/v11 v11.0.0-00010101000000-000000000000 github.com/cosmos/gogoproto v1.4.10 - github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.1.1 + github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.1.2-0.20231117212947-db2db9b72a0b github.com/cosmos/ibc-go/v7 v7.3.1 github.com/cosmos/ics23/go v0.10.0 github.com/cosmos/interchain-security/v3 v3.1.0 diff --git a/go.sum b/go.sum index 3daa3c9fe..81a9c6f42 100644 --- a/go.sum +++ b/go.sum @@ -401,6 +401,8 @@ github.com/cosmos/iavl v0.20.1 h1:rM1kqeG3/HBT85vsZdoSNsehciqUQPWrR4BYmqE2+zg= github.com/cosmos/iavl v0.20.1/go.mod h1:WO7FyvaZJoH65+HFOsDir7xU9FWk2w9cHXNW1XHcl7A= github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.1.1 h1:PqIK9vTr6zxCdQmrDZwxwL4KMAqg/GRGsiMEiaMP4wA= github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.1.1/go.mod h1:UvDmcGIWJPIytq+Q78/ff5NTOsuX/7IrNgEugTW5i0s= +github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.1.2-0.20231117212947-db2db9b72a0b h1:3//qzSqcb+SKs5H88D0BfYTLZ9z4Idz4LlZ1kkfdGjw= +github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.1.2-0.20231117212947-db2db9b72a0b/go.mod h1:UvDmcGIWJPIytq+Q78/ff5NTOsuX/7IrNgEugTW5i0s= github.com/cosmos/ibc-go/v7 v7.3.1 h1:bil1IjnHdyWDASFYKfwdRiNtFP6WK3osW7QFEAgU4I8= github.com/cosmos/ibc-go/v7 v7.3.1/go.mod h1:wvx4pPBofe5ZdMNV3OFRxSI4auEP5Qfqf8JXLLNV04g= github.com/cosmos/ics23/go v0.10.0 h1:iXqLLgp2Lp+EdpIuwXTYIQU+AiHj9mOC2X9ab++bZDM= From 22fcbef471182d3c430044633dfb37d645a1f575 Mon Sep 17 00:00:00 2001 From: swelf Date: Tue, 21 Nov 2023 17:38:07 +0300 Subject: [PATCH 287/307] updated wasmd to 0.45 --- go.mod | 6 +++--- go.sum | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index fe521e720..2f55ab8d3 100644 --- a/go.mod +++ b/go.mod @@ -7,8 +7,8 @@ require ( cosmossdk.io/errors v1.0.0 cosmossdk.io/log v1.2.1 cosmossdk.io/math v1.2.0 - github.com/CosmWasm/wasmd v0.43.0 - github.com/CosmWasm/wasmvm v1.4.1 + github.com/CosmWasm/wasmd v0.45.0 + github.com/CosmWasm/wasmvm v1.5.0 github.com/armon/go-metrics v0.4.1 github.com/cometbft/cometbft v0.37.2 github.com/cometbft/cometbft-db v0.8.0 @@ -190,7 +190,7 @@ require ( replace ( github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0 github.com/ChainSafe/go-schnorrkel => github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d - github.com/CosmWasm/wasmd => github.com/neutron-org/wasmd v0.43.0 + github.com/CosmWasm/wasmd => github.com/neutron-org/wasmd v0.43.1-0.20231121134303-e47173b19d80 github.com/cosmos/admin-module => github.com/neutron-org/admin-module v1.0.0 github.com/cosmos/cosmos-sdk => github.com/neutron-org/cosmos-sdk v0.47.6-neutron github.com/cosmos/gaia/v11 => github.com/cosmos/gaia/v11 v11.0.0-20230724152830-861ba391c3b4 diff --git a/go.sum b/go.sum index 290740da2..e7a58ec6e 100644 --- a/go.sum +++ b/go.sum @@ -223,6 +223,8 @@ github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d h1:nalkkPQ github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d/go.mod h1:URdX5+vg25ts3aCh8H5IFZybJYKWhJHYMTnf+ULtoC4= github.com/CosmWasm/wasmvm v1.4.1 h1:YgodVlBrXa2HJZzOXjWDH0EIRwQzK3zuA73dDPRRLS4= github.com/CosmWasm/wasmvm v1.4.1/go.mod h1:fXB+m2gyh4v9839zlIXdMZGeLAxqUdYdFQqYsTha2hc= +github.com/CosmWasm/wasmvm v1.5.0 h1:3hKeT9SfwfLhxTGKH3vXaKFzBz1yuvP8SlfwfQXbQfw= +github.com/CosmWasm/wasmvm v1.5.0/go.mod h1:fXB+m2gyh4v9839zlIXdMZGeLAxqUdYdFQqYsTha2hc= github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/DataDog/zstd v1.5.0/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= @@ -940,6 +942,8 @@ github.com/neutron-org/cosmos-sdk v0.47.6-neutron h1:agxUiBWlAGQf5+8A7e5omYrpgby github.com/neutron-org/cosmos-sdk v0.47.6-neutron/go.mod h1:7BmlRp0txKo2UZ01OLq4DGEjgLDiPgmpRpjLOq89Jys= github.com/neutron-org/wasmd v0.43.0 h1:aXzN9diVRAKTs2+EdK4zoTOmNCjjr8vpAhIq8VbBUJc= github.com/neutron-org/wasmd v0.43.0/go.mod h1:GEWnDHjbx7qtVHQ+5ocrNe1sIHNiXcTlSocXyLQNnRY= +github.com/neutron-org/wasmd v0.43.1-0.20231121134303-e47173b19d80 h1:NZxcnl5FHTyRjwuHPh6f4jFPvK5OHez7CQvElN+Nz/E= +github.com/neutron-org/wasmd v0.43.1-0.20231121134303-e47173b19d80/go.mod h1:k2/B7hBKbCEHhhOSaiv7UBHUR2fLVb003pnswasgG/w= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= From bcc99dcd15b709e5057133aadec99732d96807ee Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Wed, 22 Nov 2023 14:00:48 +0200 Subject: [PATCH 288/307] fix ignite --- Makefile | 2 +- config.yml | 25 + docs/static/openapi.yml | 5512 +++++++++++++----- go.mod | 22 +- go.sum | 42 +- proto/neutron/interchaintxs/v1/genesis.proto | 2 +- proto/neutron/interchaintxs/v1/params.proto | 2 +- proto/neutron/interchaintxs/v1/query.proto | 2 +- x/interchaintxs/types/genesis.pb.go | 24 +- x/interchaintxs/types/params.pb.go | 40 +- x/interchaintxs/types/query.pb.go | 81 +- x/interchaintxs/types/tx.pb.go | 104 +- 12 files changed, 4232 insertions(+), 1626 deletions(-) create mode 100644 config.yml diff --git a/Makefile b/Makefile index 8bf3b11ab..b6b749271 100644 --- a/Makefile +++ b/Makefile @@ -250,4 +250,4 @@ stop-docker-container: mocks: @echo "Regenerate mocks..." - @go generate ./... \ No newline at end of file + @go generate ./... diff --git a/config.yml b/config.yml new file mode 100644 index 000000000..cb2ab0eee --- /dev/null +++ b/config.yml @@ -0,0 +1,25 @@ +version: 1 +build: + main: x/../ + proto: + path: proto + third_party_paths: + - third_party/proto + - proto_vendor +accounts: +- name: alice + coins: + - 200000000untrn + - 200000000stake +faucet: + name: bob + coins: + - 500000ustrd + - 100000stake + host: 0.0.0.0:4500 +client: + openapi: + path: docs/static/openapi.yml +validators: +- name: alice + bonded: 100000000stake diff --git a/docs/static/openapi.yml b/docs/static/openapi.yml index 9fdfa7be7..5a4103ac3 100644 --- a/docs/static/openapi.yml +++ b/docs/static/openapi.yml @@ -216,6 +216,487 @@ paths: type: object properties: proposals: + type: array + items: + type: object + properties: + id: + type: string + format: uint64 + description: id defines the unique id of the proposal. + messages: + type: array + items: + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the + type of the serialized + + protocol buffer message. This string must contain + at least + + one "/" character. The last segment of the URL's + path must represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should + be in a canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the + binary all types that they + + expect it to use in the context of Any. However, + for URLs which use the + + scheme `http`, `https`, or no scheme, one can + optionally set up a type + + server that maps type URLs to message definitions + as follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results + based on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently + available in the official + + protobuf release, and it is not used for type URLs + beginning with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty + scheme) might be + + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer + message along with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any + values in the form + + of utility functions or additional generated methods + of the Any type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by + default use + + 'type.googleapis.com/full.type.name' as the type URL + and the unpack + + methods only use the fully qualified type name after + the last '/' + + in the type URL, for example "foo.bar.com/x/y.z" will + yield type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the + regular + + representation of the deserialized, embedded message, + with an + + additional field `@type` which contains the type URL. + Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a + custom JSON + + representation, that representation will be embedded + adding a field + + `value` which holds the custom JSON in addition to the + `@type` + + field. Example (for message + [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + description: >- + messages are the arbitrary messages to be executed if + the proposal passes. + status: + description: status defines the proposal status. + type: string + enum: + - PROPOSAL_STATUS_UNSPECIFIED + - PROPOSAL_STATUS_DEPOSIT_PERIOD + - PROPOSAL_STATUS_VOTING_PERIOD + - PROPOSAL_STATUS_PASSED + - PROPOSAL_STATUS_REJECTED + - PROPOSAL_STATUS_FAILED + default: PROPOSAL_STATUS_UNSPECIFIED + final_tally_result: + description: >- + final_tally_result is the final tally result of the + proposal. When + + querying a proposal via gRPC, this field is not + populated until the + + proposal's voting period has ended. + type: object + properties: + yes_count: + type: string + description: yes_count is the number of yes votes on a proposal. + abstain_count: + type: string + description: >- + abstain_count is the number of abstain votes on a + proposal. + no_count: + type: string + description: no_count is the number of no votes on a proposal. + no_with_veto_count: + type: string + description: >- + no_with_veto_count is the number of no with veto + votes on a proposal. + submit_time: + type: string + format: date-time + description: submit_time is the time of proposal submission. + deposit_end_time: + type: string + format: date-time + description: deposit_end_time is the end time for deposition. + total_deposit: + type: array + items: + type: object + properties: + denom: + type: string + amount: + type: string + 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. + description: total_deposit is the total deposit on the proposal. + voting_start_time: + type: string + format: date-time + description: >- + voting_start_time is the starting time to vote on a + proposal. + voting_end_time: + type: string + format: date-time + description: voting_end_time is the end time of voting on a proposal. + metadata: + type: string + description: >- + metadata is any arbitrary metadata attached to the + proposal. + title: + type: string + description: 'Since: cosmos-sdk 0.47' + title: title is the title of the proposal + summary: + type: string + description: 'Since: cosmos-sdk 0.47' + title: summary is a short summary of the proposal + proposer: + type: string + description: 'Since: cosmos-sdk 0.47' + title: Proposer is the address of the proposal sumbitter + description: >- + Proposal defines the core field members of a governance + proposal. + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type of + the serialized + + protocol buffer message. This string must contain at + least + + one "/" character. The last segment of the URL's path + must represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be in + a canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the binary + all types that they + + expect it to use in the context of Any. However, for + URLs which use the + + scheme `http`, `https`, or no scheme, one can optionally + set up a type + + server that maps type URLs to message definitions as + follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based + on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in + the official + + protobuf release, and it is not used for type URLs + beginning with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty scheme) + might be + + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer + message along with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any values + in the form + + of utility functions or additional generated methods of the + Any type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by + default use + + 'type.googleapis.com/full.type.name' as the type URL and the + unpack + + methods only use the fully qualified type name after the + last '/' + + in the type URL, for example "foo.bar.com/x/y.z" will yield + type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the regular + + representation of the deserialized, embedded message, with + an + + additional field `@type` which contains the type URL. + Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a custom + JSON + + representation, that representation will be embedded adding + a field + + `value` which holds the custom JSON in addition to the + `@type` + + field. Example (for message [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + tags: + - Query + /cosmos/adminmodule/adminmodule/archivedproposalslegacy: + get: + summary: Queries a list of archived proposals. + operationId: CosmosAdminmoduleAdminmoduleArchivedProposalsLegacy + responses: + '200': + description: A successful response. + schema: + type: object + properties: + proposalsLegacy: type: array items: type: object @@ -15435,19 +15916,19 @@ paths: format: int64 title: >- Height at which validator was first a candidate OR was - unjailed + un-jailed index_offset: type: string format: int64 description: >- - Index which is incremented each time the validator was a - bonded + Index which is incremented every time a validator is + bonded in a block and - in a block and may have signed a precommit or not. This - in conjunction with the + _may_ have signed a pre-commit or not. This in + conjunction with the - `SignedBlocksWindow` param determines the index in the - `MissedBlocksBitArray`. + signed_blocks_window param determines the index in the + missed block bitmap. jailed_until: type: string format: date-time @@ -15458,18 +15939,20 @@ paths: type: boolean description: >- Whether or not a validator has been tombstoned (killed - out of validator set). It is set + out of validator - once the validator commits an equivocation or for any - other configured misbehiavor. + set). It is set once the validator commits an + equivocation or for any other + + configured misbehavior. missed_blocks_counter: type: string format: int64 description: >- - A counter kept to avoid unnecessary array reads. + A counter of missed (unsigned) blocks. It is used to + avoid unnecessary - Note that `Sum(MissedBlocksBitArray)` always equals - `MissedBlocksCounter`. + reads in the missed block bitmap. description: >- ValidatorSigningInfo defines a validator's signing info for monitoring their @@ -15609,19 +16092,19 @@ paths: format: int64 title: >- Height at which validator was first a candidate OR was - unjailed + un-jailed index_offset: type: string format: int64 description: >- - Index which is incremented each time the validator was a - bonded + Index which is incremented every time a validator is + bonded in a block and - in a block and may have signed a precommit or not. This in - conjunction with the + _may_ have signed a pre-commit or not. This in conjunction + with the - `SignedBlocksWindow` param determines the index in the - `MissedBlocksBitArray`. + signed_blocks_window param determines the index in the + missed block bitmap. jailed_until: type: string format: date-time @@ -15632,18 +16115,20 @@ paths: type: boolean description: >- Whether or not a validator has been tombstoned (killed out - of validator set). It is set + of validator + + set). It is set once the validator commits an equivocation + or for any other - once the validator commits an equivocation or for any - other configured misbehiavor. + configured misbehavior. missed_blocks_counter: type: string format: int64 description: >- - A counter kept to avoid unnecessary array reads. + A counter of missed (unsigned) blocks. It is used to avoid + unnecessary - Note that `Sum(MissedBlocksBitArray)` always equals - `MissedBlocksCounter`. + reads in the missed block bitmap. description: >- ValidatorSigningInfo defines a validator's signing info for monitoring their @@ -19472,7 +19957,6 @@ paths: enum: - ACCESS_TYPE_UNSPECIFIED - ACCESS_TYPE_NOBODY - - ACCESS_TYPE_ONLY_ADDRESS - ACCESS_TYPE_EVERYBODY - ACCESS_TYPE_ANY_OF_ADDRESSES default: ACCESS_TYPE_UNSPECIFIED @@ -19480,16 +19964,9 @@ paths: - ACCESS_TYPE_UNSPECIFIED: AccessTypeUnspecified placeholder for empty value - ACCESS_TYPE_NOBODY: AccessTypeNobody forbidden - - ACCESS_TYPE_ONLY_ADDRESS: AccessTypeOnlyAddress restricted to a single address - Deprecated: use AccessTypeAnyOfAddresses instead - ACCESS_TYPE_EVERYBODY: AccessTypeEverybody unrestricted - ACCESS_TYPE_ANY_OF_ADDRESSES: AccessTypeAnyOfAddresses allow any of the addresses title: AccessType permission types - address: - type: string - title: |- - Address - Deprecated: replaced by addresses addresses: type: array items: @@ -19792,7 +20269,6 @@ paths: enum: - ACCESS_TYPE_UNSPECIFIED - ACCESS_TYPE_NOBODY - - ACCESS_TYPE_ONLY_ADDRESS - ACCESS_TYPE_EVERYBODY - ACCESS_TYPE_ANY_OF_ADDRESSES default: ACCESS_TYPE_UNSPECIFIED @@ -19800,16 +20276,9 @@ paths: - ACCESS_TYPE_UNSPECIFIED: AccessTypeUnspecified placeholder for empty value - ACCESS_TYPE_NOBODY: AccessTypeNobody forbidden - - ACCESS_TYPE_ONLY_ADDRESS: AccessTypeOnlyAddress restricted to a single address - Deprecated: use AccessTypeAnyOfAddresses instead - ACCESS_TYPE_EVERYBODY: AccessTypeEverybody unrestricted - ACCESS_TYPE_ANY_OF_ADDRESSES: AccessTypeAnyOfAddresses allow any of the addresses title: AccessType permission types - address: - type: string - title: |- - Address - Deprecated: replaced by addresses addresses: type: array items: @@ -20325,7 +20794,6 @@ paths: enum: - ACCESS_TYPE_UNSPECIFIED - ACCESS_TYPE_NOBODY - - ACCESS_TYPE_ONLY_ADDRESS - ACCESS_TYPE_EVERYBODY - ACCESS_TYPE_ANY_OF_ADDRESSES default: ACCESS_TYPE_UNSPECIFIED @@ -20333,16 +20801,9 @@ paths: - ACCESS_TYPE_UNSPECIFIED: AccessTypeUnspecified placeholder for empty value - ACCESS_TYPE_NOBODY: AccessTypeNobody forbidden - - ACCESS_TYPE_ONLY_ADDRESS: AccessTypeOnlyAddress restricted to a single address - Deprecated: use AccessTypeAnyOfAddresses instead - ACCESS_TYPE_EVERYBODY: AccessTypeEverybody unrestricted - ACCESS_TYPE_ANY_OF_ADDRESSES: AccessTypeAnyOfAddresses allow any of the addresses title: AccessType permission types - address: - type: string - title: |- - Address - Deprecated: replaced by addresses addresses: type: array items: @@ -20353,7 +20814,6 @@ paths: enum: - ACCESS_TYPE_UNSPECIFIED - ACCESS_TYPE_NOBODY - - ACCESS_TYPE_ONLY_ADDRESS - ACCESS_TYPE_EVERYBODY - ACCESS_TYPE_ANY_OF_ADDRESSES default: ACCESS_TYPE_UNSPECIFIED @@ -20361,8 +20821,6 @@ paths: - ACCESS_TYPE_UNSPECIFIED: AccessTypeUnspecified placeholder for empty value - ACCESS_TYPE_NOBODY: AccessTypeNobody forbidden - - ACCESS_TYPE_ONLY_ADDRESS: AccessTypeOnlyAddress restricted to a single address - Deprecated: use AccessTypeAnyOfAddresses instead - ACCESS_TYPE_EVERYBODY: AccessTypeEverybody unrestricted - ACCESS_TYPE_ANY_OF_ADDRESSES: AccessTypeAnyOfAddresses allow any of the addresses title: AccessType permission types @@ -36206,7 +36664,7 @@ paths: - Query /neutron/contractmanager/failures: get: - summary: Queries a list of Failure items. + summary: Queries a list of Failures occurred on the network. operationId: NeutronContractmanagerFailures responses: '200': @@ -36219,28 +36677,32 @@ paths: items: type: object properties: - channel_id: - type: string - title: ChannelId address: type: string title: Address of the failed contract id: type: string format: uint64 - title: id of the failure under specific address - ack_id: + title: Id of the failure under specific address + sudo_payload: type: string - format: uint64 - title: ACK id to restore - ack_type: + format: byte + title: >- + Serialized MessageSudoCallback with Packet and Ack(if + exists) + error: type: string - title: Acknowledgement type - description: >- + title: >- + Redacted error response of the sudo call. Full error is + emitted as an event + 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 pagination: type: object properties: @@ -36269,6 +36731,9 @@ paths: repeated Bar results = 1; PageResponse page = 2; } + description: >- + QueryFailuresResponse is response type for the Query/Failures RPC + method. default: description: An unexpected error response. schema: @@ -36286,158 +36751,186 @@ paths: properties: '@type': type: string - additionalProperties: {} - parameters: - - name: address - in: query - required: false - type: string - - name: pagination.key - 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. - in: query - required: false - type: string - format: byte - - name: pagination.offset - description: >- - offset is a numeric offset that can be used when key is unavailable. + description: >- + A URL/resource name that uniquely identifies the type of + the serialized - It is less efficient than using key. Only one of offset or key - should + protocol buffer message. This string must contain at + least - be set. - in: query - required: false - type: string - format: uint64 - - name: pagination.limit - description: >- - limit is the total number of results to be returned in the result - page. + one "/" character. The last segment of the URL's path + must represent - If left empty it will default to a value to be set by each app. - in: query - required: false - type: string - format: uint64 - - name: pagination.count_total - description: >- - count_total is set to true to indicate that the result set should - include + the fully qualified name of the type (as in - a count of the total number of items available for pagination in - UIs. + `path/google.protobuf.Duration`). The name should be in + a canonical form - count_total is only respected when offset is used. It is ignored - when key + (e.g., leading "." is not accepted). - is set. - in: query - required: false - type: boolean - - name: pagination.reverse - description: >- - reverse is set to true if results are to be returned in the - descending order. + In practice, teams usually precompile into the binary + all types that they - Since: cosmos-sdk 0.43 - in: query - required: false - type: boolean - tags: - - Query - /neutron/contractmanager/failures/{address}: - get: - summary: Queries a Failure by address. - operationId: NeutronContractmanagerAddressFailures - responses: - '200': - description: A successful response. - schema: - type: object - properties: - failures: - type: array - items: - type: object - properties: - channel_id: - type: string - title: ChannelId - address: - type: string - title: Address of the failed contract - id: - type: string - format: uint64 - title: id of the failure under specific address - ack_id: - type: string - format: uint64 - title: ACK id to restore - ack_type: - type: string - title: Acknowledgement type - description: >- - Failure message contains information about ACK failures and - can be used to + expect it to use in the context of Any. However, for + URLs which use the - replay ACK in case of requirement. - pagination: - type: object - properties: - next_key: - type: string - format: byte - 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. - total: - type: string - format: uint64 - title: >- - total is total number of results available if - PageRequest.count_total + scheme `http`, `https`, or no scheme, one can optionally + set up a type - was set, its value is undefined otherwise - description: >- - PageResponse is to be embedded in gRPC response messages where - the + server that maps type URLs to message definitions as + follows: - corresponding request message has used PageRequest. - message SomeResponse { - repeated Bar results = 1; - PageResponse page = 2; - } - default: - description: An unexpected error response. - schema: - type: object - properties: - code: - type: integer - format: int32 - message: - type: string - details: - type: array - items: - type: object - properties: - '@type': - type: string + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based + on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in + the official + + protobuf release, and it is not used for type URLs + beginning with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty scheme) + might be + + used with implementation specific semantics. additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer + message along with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any values + in the form + + of utility functions or additional generated methods of the + Any type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by + default use + + 'type.googleapis.com/full.type.name' as the type URL and the + unpack + + methods only use the fully qualified type name after the + last '/' + + in the type URL, for example "foo.bar.com/x/y.z" will yield + type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the regular + + representation of the deserialized, embedded message, with + an + + additional field `@type` which contains the type URL. + Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a custom + JSON + + representation, that representation will be embedded adding + a field + + `value` which holds the custom JSON in addition to the + `@type` + + field. Example (for message [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } parameters: - name: address - in: path - required: true + description: address of the contract which Sudo call failed. + in: query + required: false type: string + - name: failure_id + description: ID of the failure for the given contract. + in: query + required: false + type: string + format: uint64 - name: pagination.key description: |- key is a value returned in PageResponse.next_key to begin @@ -36496,123 +36989,47 @@ paths: type: boolean tags: - Query - /neutron/contractmanager/params: - get: - summary: Parameters queries the parameters of the module. - operationId: NeutronContractmanagerParams - responses: - '200': - description: A successful response. - schema: - type: object - properties: - params: - description: params holds all the parameters of this module. - type: object - description: >- - QueryParamsResponse is response type for the Query/Params RPC - method. - default: - description: An unexpected error response. - schema: - type: object - properties: - code: - type: integer - format: int32 - message: - type: string - details: - type: array - items: - type: object - properties: - '@type': - type: string - additionalProperties: {} - tags: - - Query - /neutron/cron/params: - get: - summary: Queries the parameters of the module. - operationId: NeutronCronParams - responses: - '200': - description: A successful response. - schema: - type: object - properties: - params: - description: params holds all the parameters of this module. - type: object - properties: - security_address: - type: string - title: Security address that can remove schedules - limit: - type: string - format: uint64 - title: Limit of schedules executed in one block - default: - description: An unexpected error response. - schema: - type: object - properties: - code: - type: integer - format: int32 - message: - type: string - details: - type: array - items: - type: object - properties: - '@type': - type: string - additionalProperties: {} - tags: - - Query - /neutron/cron/schedule: + /neutron/contractmanager/failures/{address}: get: - summary: Queries a list of Schedule items. - operationId: NeutronCronSchedules + summary: Queries Failures by contract address. + operationId: NeutronContractmanagerAddressFailures responses: '200': description: A successful response. schema: type: object properties: - schedules: + failures: type: array items: type: object properties: - name: + address: type: string - title: Name of schedule - period: + title: Address of the failed contract + id: type: string format: uint64 - title: Period in blocks - msgs: - type: array - items: - type: object - properties: - contract: - type: string - title: Contract is the address of the smart contract - msg: - type: string - title: >- - Msg is json encoded message to be passed to the - contract - title: Msgs that will be executed every period amount of time - last_execute_height: + title: Id of the failure under specific address + sudo_payload: type: string - format: uint64 - title: Last execution's block height + format: byte + title: >- + Serialized MessageSudoCallback with Packet and Ack(if + exists) + error: + type: string + title: >- + Redacted error response of the sudo call. Full error is + emitted as an event + 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 pagination: type: object properties: @@ -36641,6 +37058,9 @@ paths: repeated Bar results = 1; PageResponse page = 2; } + description: >- + QueryFailuresResponse is response type for the Query/Failures RPC + method. default: description: An unexpected error response. schema: @@ -36658,8 +37078,186 @@ paths: properties: '@type': type: string + description: >- + A URL/resource name that uniquely identifies the type of + the serialized + + protocol buffer message. This string must contain at + least + + one "/" character. The last segment of the URL's path + must represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be in + a canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the binary + all types that they + + expect it to use in the context of Any. However, for + URLs which use the + + scheme `http`, `https`, or no scheme, one can optionally + set up a type + + server that maps type URLs to message definitions as + follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based + on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in + the official + + protobuf release, and it is not used for type URLs + beginning with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty scheme) + might be + + used with implementation specific semantics. additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer + message along with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any values + in the form + + of utility functions or additional generated methods of the + Any type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by + default use + + 'type.googleapis.com/full.type.name' as the type URL and the + unpack + + methods only use the fully qualified type name after the + last '/' + + in the type URL, for example "foo.bar.com/x/y.z" will yield + type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the regular + + representation of the deserialized, embedded message, with + an + + additional field `@type` which contains the type URL. + Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a custom + JSON + + representation, that representation will be embedded adding + a field + + `value` which holds the custom JSON in addition to the + `@type` + + field. Example (for message [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } parameters: + - name: address + description: address of the contract which Sudo call failed. + in: path + required: true + type: string + - name: failure_id + description: ID of the failure for the given contract. + in: query + required: false + type: string + format: uint64 - name: pagination.key description: |- key is a value returned in PageResponse.next_key to begin @@ -36718,98 +37316,77 @@ paths: type: boolean tags: - Query - /neutron/cron/schedule/{name}: + /neutron/contractmanager/failures/{address}/{failure_id}: get: - summary: Queries a Schedule by name. - operationId: NeutronCronSchedule + summary: Queries a Failure by contract address and failure ID. + operationId: NeutronContractmanagerAddressFailure responses: '200': description: A successful response. schema: type: object properties: - schedule: - type: object - properties: - name: - type: string - title: Name of schedule - period: - type: string - format: uint64 - title: Period in blocks - msgs: - type: array - items: - type: object - properties: - contract: - type: string - title: Contract is the address of the smart contract - msg: - type: string - title: >- - Msg is json encoded message to be passed to the - contract - title: Msgs that will be executed every period amount of time - last_execute_height: - type: string - format: uint64 - title: Last execution's block height - default: - description: An unexpected error response. - schema: - type: object - properties: - code: - type: integer - format: int32 - message: - type: string - details: + failures: type: array items: type: object properties: - '@type': + address: type: string - additionalProperties: {} - parameters: - - name: name - in: path - required: true - type: string - tags: - - Query - /neutron/feeburner/params: - get: - summary: Parameters queries the parameters of the module. - operationId: NeutronFeeburnerParams - responses: - '200': - description: A successful response. - schema: - type: object - properties: - params: - description: params holds all the parameters of this module. + title: Address of the failed contract + id: + type: string + format: uint64 + title: Id of the failure under specific address + sudo_payload: + type: string + format: byte + title: >- + Serialized MessageSudoCallback with Packet and Ack(if + exists) + error: + type: string + title: >- + Redacted error response of the sudo call. Full error is + emitted as an event + 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 + pagination: type: object properties: - neutron_denom: + next_key: + type: string + format: byte + 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. + total: type: string + format: uint64 title: >- - Defines Neutron denom, which will be burned during fee - processing, any + total is total number of results available if + PageRequest.count_total - other denom will be sent to Treasury - reserve_address: - type: string - title: Deprecated in v0.4.4. Is not used anymore - treasury_address: - type: string - title: Defines treasury address + was set, its value is undefined otherwise + 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; + } description: >- - QueryParamsResponse is response type for the Query/Params RPC + QueryFailuresResponse is response type for the Query/Failures RPC method. default: description: An unexpected error response. @@ -36828,288 +37405,248 @@ paths: properties: '@type': type: string - additionalProperties: {} - tags: - - Query - /neutron/feeburner/total_burned_neutrons_amount: - get: - summary: TotalBurnedNeutronsAmount queries total amount of burned neutron fees. - operationId: NeutronFeeburnerTotalBurnedNeutronsAmount - responses: - '200': - description: A successful response. - schema: - type: object - properties: - total_burned_neutrons_amount: - type: object - properties: - coin: - type: object - properties: - denom: - type: string - amount: - type: string - description: >- - Coin defines a token with a denomination and an amount. + description: >- + A URL/resource name that uniquely identifies the type of + the serialized + protocol buffer message. This string must contain at + least - NOTE: The amount field is an Int which implements the - custom method + one "/" character. The last segment of the URL's path + must represent - signatures required by gogoproto. - title: >- - TotalBurnedNeutronsAmount defines total amount of burned - neutron fees - description: |- - QueryTotalBurnedNeutronsAmountResponse is response type for the - Query/QueryTotalBurnedNeutronsAmount method. - default: - description: An unexpected error response. - schema: - type: object - properties: - code: - type: integer - format: int32 - message: - type: string - details: - type: array - items: - type: object - properties: - '@type': - type: string - additionalProperties: {} - tags: - - Query - /neutron-org/neutron/feerefunder/info: - get: - operationId: NeutronFeerefunderFeeInfo - responses: - '200': - description: A successful response. - schema: - type: object - properties: - fee_info: - type: object - properties: - payer: - type: string - packet_id: - type: object - properties: - channel_id: - type: string - port_id: - type: string - sequence: - type: string - format: uint64 - fee: - type: object - properties: - recv_fee: - type: array - items: - type: object - properties: - denom: - type: string - amount: - type: string - description: >- - Coin defines a token with a denomination and an - amount. + the fully qualified name of the type (as in + `path/google.protobuf.Duration`). The name should be in + a canonical form - NOTE: The amount field is an Int which implements - the custom method + (e.g., leading "." is not accepted). - signatures required by gogoproto. - title: the packet receive fee - ack_fee: - type: array - items: - type: object - properties: - denom: - type: string - amount: - type: string - description: >- - Coin defines a token with a denomination and an - amount. + In practice, teams usually precompile into the binary + all types that they - NOTE: The amount field is an Int which implements - the custom method + expect it to use in the context of Any. However, for + URLs which use the - signatures required by gogoproto. - title: the packet acknowledgement fee - timeout_fee: - type: array - items: - type: object - properties: - denom: - type: string - amount: - type: string - description: >- - Coin defines a token with a denomination and an - amount. + scheme `http`, `https`, or no scheme, one can optionally + set up a type + server that maps type URLs to message definitions as + follows: - NOTE: The amount field is an Int which implements - the custom method - signatures required by gogoproto. - title: the packet timeout fee - title: >- - Fee defines the ICS29 receive, acknowledgement and timeout - fees - default: - description: An unexpected error response. - schema: - type: object - properties: - code: - type: integer - format: int32 - message: - type: string - details: - type: array - items: - type: object - properties: - '@type': - type: string + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based + on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in + the official + + protobuf release, and it is not used for type URLs + beginning with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty scheme) + might be + + used with implementation specific semantics. additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer + message along with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any values + in the form + + of utility functions or additional generated methods of the + Any type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by + default use + + 'type.googleapis.com/full.type.name' as the type URL and the + unpack + + methods only use the fully qualified type name after the + last '/' + + in the type URL, for example "foo.bar.com/x/y.z" will yield + type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the regular + + representation of the deserialized, embedded message, with + an + + additional field `@type` which contains the type URL. + Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a custom + JSON + + representation, that representation will be embedded adding + a field + + `value` which holds the custom JSON in addition to the + `@type` + + field. Example (for message [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } parameters: - - name: channel_id + - name: address + description: address of the contract which Sudo call failed. + in: path + required: true + type: string + - name: failure_id + description: ID of the failure for the given contract. + in: path + required: true + type: string + format: uint64 + - name: pagination.key + 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. in: query required: false type: string - - name: port_id + format: byte + - name: pagination.offset + 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. in: query required: false type: string - - name: sequence + format: uint64 + - name: pagination.limit + 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. in: query required: false type: string format: uint64 - tags: - - Query - /neutron-org/neutron/feerefunder/params: - get: - summary: Parameters queries the parameters of the module. - operationId: NeutronFeerefunderParams - responses: - '200': - description: A successful response. - schema: - type: object - properties: - params: - description: params holds all the parameters of this module. - type: object - properties: - min_fee: - type: object - properties: - recv_fee: - type: array - items: - type: object - properties: - denom: - type: string - amount: - type: string - 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. - title: the packet receive fee - ack_fee: - type: array - items: - type: object - properties: - denom: - type: string - amount: - type: string - description: >- - Coin defines a token with a denomination and an - amount. - + - name: pagination.count_total + description: >- + count_total is set to true to indicate that the result set should + include - NOTE: The amount field is an Int which implements - the custom method + a count of the total number of items available for pagination in + UIs. - signatures required by gogoproto. - title: the packet acknowledgement fee - timeout_fee: - type: array - items: - type: object - properties: - denom: - type: string - amount: - type: string - description: >- - Coin defines a token with a denomination and an - amount. + count_total is only respected when offset is used. It is ignored + when key + is set. + in: query + required: false + type: boolean + - name: pagination.reverse + description: >- + reverse is set to true if results are to be returned in the + descending order. - NOTE: The amount field is an Int which implements - the custom method - signatures required by gogoproto. - title: the packet timeout fee - title: >- - Fee defines the ICS29 receive, acknowledgement and timeout - fees - description: >- - QueryParamsResponse is response type for the Query/Params RPC - method. - default: - description: An unexpected error response. - schema: - type: object - properties: - code: - type: integer - format: int32 - message: - type: string - details: - type: array - items: - type: object - properties: - '@type': - type: string - additionalProperties: {} + Since: cosmos-sdk 0.43 + in: query + required: false + type: boolean tags: - Query - /neutron/interchainqueries/params: + /neutron/contractmanager/params: get: summary: Parameters queries the parameters of the module. - operationId: NeutronInterchainqueriesParams + operationId: NeutronContractmanagerParams responses: '200': description: A successful response. @@ -37120,43 +37657,9 @@ paths: description: params holds all the parameters of this module. type: object properties: - query_submit_timeout: - type: string - format: uint64 - title: >- - Defines amount of blocks required before query becomes - available for - - removal by anybody - query_deposit: - type: array - items: - type: object - properties: - denom: - type: string - amount: - type: string - 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. - description: Amount of coins deposited for the query. - tx_query_removal_limit: + sudo_call_gas_limit: type: string format: uint64 - description: >- - Amount of tx hashes to be removed during a single - EndBlock. Can vary to - - balance between network cleaning speed and EndBlock - duration. A zero value - - means no limit. description: >- QueryParamsResponse is response type for the Query/Params RPC method. @@ -37347,85 +37850,1078 @@ paths: } tags: - Query - /neutron/interchainqueries/query_result: + /neutron/cron/params: get: - operationId: NeutronInterchainqueriesQueryResult + summary: Queries the parameters of the module. + operationId: NeutronCronParams responses: '200': description: A successful response. schema: type: object properties: - result: + params: + description: params holds all the parameters of this module. type: object properties: - kv_results: - type: array - items: - type: object - properties: - storage_prefix: - type: string - title: is the substore name (acc, staking, etc.) - key: - type: string - format: byte - title: is the key in IAVL store - value: - type: string - format: byte - title: is the value in IAVL store - Proof: - title: >- - is the Merkle Proof which proves existence of - key-value pair in IAVL - - storage - type: object - properties: - ops: - type: array - items: - type: object - properties: - type: - type: string - key: - type: string - format: byte - data: - type: string - format: byte - title: >- - ProofOp defines an operation used for - calculating Merkle root - - The data could be arbitrary format, providing - nessecary data - - for example neighbouring node hash - block: - type: object - properties: - next_block_header: - title: >- - We need to know block X+1 to verify response of - transaction for block X - - since LastResultsHash is root hash of all results from - the txs from the - - previous block + security_address: + type: string + title: Security address that can remove schedules + limit: + type: string + format: uint64 + title: Limit of schedules executed in one block + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + additionalProperties: {} + tags: + - Query + /neutron/cron/schedule: + get: + summary: Queries a list of Schedule items. + operationId: NeutronCronSchedules + responses: + '200': + description: A successful response. + schema: + type: object + properties: + schedules: + type: array + items: + type: object + properties: + name: + type: string + title: Name of schedule + period: + type: string + format: uint64 + title: Period in blocks + msgs: + type: array + items: type: object properties: - '@type': + contract: type: string - description: >- - A URL/resource name that uniquely identifies the - type of the serialized - - protocol buffer message. This string must contain - at least + title: Contract is the address of the smart contract + msg: + type: string + title: >- + Msg is json encoded message to be passed to the + contract + title: Msgs that will be executed every period amount of time + last_execute_height: + type: string + format: uint64 + title: Last execution's block height + pagination: + type: object + properties: + next_key: + type: string + format: byte + 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. + total: + type: string + format: uint64 + title: >- + total is total number of results available if + PageRequest.count_total + + was set, its value is undefined otherwise + 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; + } + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + additionalProperties: {} + parameters: + - name: pagination.key + 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. + in: query + required: false + type: string + format: byte + - name: pagination.offset + 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. + in: query + required: false + type: string + format: uint64 + - name: pagination.limit + 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. + in: query + required: false + type: string + format: uint64 + - name: pagination.count_total + 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 + required: false + type: boolean + - name: pagination.reverse + description: >- + reverse is set to true if results are to be returned in the + descending order. + + + Since: cosmos-sdk 0.43 + in: query + required: false + type: boolean + tags: + - Query + /neutron/cron/schedule/{name}: + get: + summary: Queries a Schedule by name. + operationId: NeutronCronSchedule + responses: + '200': + description: A successful response. + schema: + type: object + properties: + schedule: + type: object + properties: + name: + type: string + title: Name of schedule + period: + type: string + format: uint64 + title: Period in blocks + msgs: + type: array + items: + type: object + properties: + contract: + type: string + title: Contract is the address of the smart contract + msg: + type: string + title: >- + Msg is json encoded message to be passed to the + contract + title: Msgs that will be executed every period amount of time + last_execute_height: + type: string + format: uint64 + title: Last execution's block height + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + additionalProperties: {} + parameters: + - name: name + in: path + required: true + type: string + tags: + - Query + /neutron/feeburner/params: + get: + summary: Parameters queries the parameters of the module. + operationId: NeutronFeeburnerParams + responses: + '200': + description: A successful response. + schema: + type: object + properties: + params: + description: params holds all the parameters of this module. + type: object + properties: + neutron_denom: + type: string + title: >- + Defines Neutron denom, which will be burned during fee + processing, any + + other denom will be sent to Treasury + reserve_address: + type: string + title: Deprecated in v0.4.4. Is not used anymore + treasury_address: + type: string + title: Defines treasury address + description: >- + QueryParamsResponse is response type for the Query/Params RPC + method. + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + additionalProperties: {} + tags: + - Query + /neutron/feeburner/total_burned_neutrons_amount: + get: + summary: TotalBurnedNeutronsAmount queries total amount of burned neutron fees. + operationId: NeutronFeeburnerTotalBurnedNeutronsAmount + responses: + '200': + description: A successful response. + schema: + type: object + properties: + total_burned_neutrons_amount: + type: object + properties: + coin: + type: object + properties: + denom: + type: string + amount: + type: string + 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. + title: >- + TotalBurnedNeutronsAmount defines total amount of burned + neutron fees + description: |- + QueryTotalBurnedNeutronsAmountResponse is response type for the + Query/QueryTotalBurnedNeutronsAmount method. + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + additionalProperties: {} + tags: + - Query + /neutron-org/neutron/feerefunder/info: + get: + operationId: NeutronFeerefunderFeeInfo + responses: + '200': + description: A successful response. + schema: + type: object + properties: + fee_info: + type: object + properties: + payer: + type: string + packet_id: + type: object + properties: + channel_id: + type: string + port_id: + type: string + sequence: + type: string + format: uint64 + fee: + type: object + properties: + recv_fee: + type: array + items: + type: object + properties: + denom: + type: string + amount: + type: string + 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. + title: the packet receive fee + ack_fee: + type: array + items: + type: object + properties: + denom: + type: string + amount: + type: string + 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. + title: the packet acknowledgement fee + timeout_fee: + type: array + items: + type: object + properties: + denom: + type: string + amount: + type: string + 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. + title: the packet timeout fee + title: >- + Fee defines the ICS29 receive, acknowledgement and timeout + fees + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + additionalProperties: {} + parameters: + - name: channel_id + in: query + required: false + type: string + - name: port_id + in: query + required: false + type: string + - name: sequence + in: query + required: false + type: string + format: uint64 + tags: + - Query + /neutron-org/neutron/feerefunder/params: + get: + summary: Parameters queries the parameters of the module. + operationId: NeutronFeerefunderParams + responses: + '200': + description: A successful response. + schema: + type: object + properties: + params: + description: params holds all the parameters of this module. + type: object + properties: + min_fee: + type: object + properties: + recv_fee: + type: array + items: + type: object + properties: + denom: + type: string + amount: + type: string + 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. + title: the packet receive fee + ack_fee: + type: array + items: + type: object + properties: + denom: + type: string + amount: + type: string + 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. + title: the packet acknowledgement fee + timeout_fee: + type: array + items: + type: object + properties: + denom: + type: string + amount: + type: string + 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. + title: the packet timeout fee + title: >- + Fee defines the ICS29 receive, acknowledgement and timeout + fees + description: >- + QueryParamsResponse is response type for the Query/Params RPC + method. + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + additionalProperties: {} + tags: + - Query + /neutron/interchainqueries/params: + get: + summary: Parameters queries the parameters of the module. + operationId: NeutronInterchainqueriesParams + responses: + '200': + description: A successful response. + schema: + type: object + properties: + params: + description: params holds all the parameters of this module. + type: object + properties: + query_submit_timeout: + type: string + format: uint64 + title: >- + Defines amount of blocks required before query becomes + available for + + removal by anybody + query_deposit: + type: array + items: + type: object + properties: + denom: + type: string + amount: + type: string + 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. + description: Amount of coins deposited for the query. + tx_query_removal_limit: + type: string + format: uint64 + description: >- + Amount of tx hashes to be removed during a single + EndBlock. Can vary to + + balance between network cleaning speed and EndBlock + duration. A zero value + + means no limit. + description: >- + QueryParamsResponse is response type for the Query/Params RPC + method. + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type of + the serialized + + protocol buffer message. This string must contain at + least + + one "/" character. The last segment of the URL's path + must represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be in + a canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the binary + all types that they + + expect it to use in the context of Any. However, for + URLs which use the + + scheme `http`, `https`, or no scheme, one can optionally + set up a type + + server that maps type URLs to message definitions as + follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based + on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in + the official + + protobuf release, and it is not used for type URLs + beginning with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty scheme) + might be + + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer + message along with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any values + in the form + + of utility functions or additional generated methods of the + Any type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by + default use + + 'type.googleapis.com/full.type.name' as the type URL and the + unpack + + methods only use the fully qualified type name after the + last '/' + + in the type URL, for example "foo.bar.com/x/y.z" will yield + type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the regular + + representation of the deserialized, embedded message, with + an + + additional field `@type` which contains the type URL. + Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a custom + JSON + + representation, that representation will be embedded adding + a field + + `value` which holds the custom JSON in addition to the + `@type` + + field. Example (for message [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + tags: + - Query + /neutron/interchainqueries/query_result: + get: + operationId: NeutronInterchainqueriesQueryResult + responses: + '200': + description: A successful response. + schema: + type: object + properties: + result: + type: object + properties: + kv_results: + type: array + items: + type: object + properties: + storage_prefix: + type: string + title: is the substore name (acc, staking, etc.) + key: + type: string + format: byte + title: is the key in IAVL store + value: + type: string + format: byte + title: is the value in IAVL store + Proof: + title: >- + is the Merkle Proof which proves existence of + key-value pair in IAVL + + storage + type: object + properties: + ops: + type: array + items: + type: object + properties: + type: + type: string + key: + type: string + format: byte + data: + type: string + format: byte + title: >- + ProofOp defines an operation used for + calculating Merkle root + + The data could be arbitrary format, providing + nessecary data + + for example neighbouring node hash + block: + type: object + properties: + next_block_header: + title: >- + We need to know block X+1 to verify response of + transaction for block X + + since LastResultsHash is root hash of all results from + the txs from the + + previous block + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the + type of the serialized + + protocol buffer message. This string must contain + at least + + one "/" character. The last segment of the URL's + path must represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should + be in a canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the + binary all types that they + + expect it to use in the context of Any. However, + for URLs which use the + + scheme `http`, `https`, or no scheme, one can + optionally set up a type + + server that maps type URLs to message definitions + as follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results + based on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently + available in the official + + protobuf release, and it is not used for type URLs + beginning with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty + scheme) might be + + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer + message along with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any + values in the form + + of utility functions or additional generated methods + of the Any type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by + default use + + 'type.googleapis.com/full.type.name' as the type URL + and the unpack + + methods only use the fully qualified type name after + the last '/' + + in the type URL, for example "foo.bar.com/x/y.z" will + yield type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the + regular + + representation of the deserialized, embedded message, + with an + + additional field `@type` which contains the type URL. + Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a + custom JSON + + representation, that representation will be embedded + adding a field + + `value` which holds the custom JSON in addition to the + `@type` + + field. Example (for message + [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + header: + title: >- + We need to know block X to verify inclusion of + transaction for block X + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the + type of the serialized + + protocol buffer message. This string must contain + at least one "/" character. The last segment of the URL's path must represent @@ -37577,311 +39073,825 @@ paths: If the embedded message type is well-known and has a custom JSON - representation, that representation will be embedded - adding a field + representation, that representation will be embedded + adding a field + + `value` which holds the custom JSON in addition to the + `@type` + + field. Example (for message + [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + tx: + type: object + properties: + response: + type: object + properties: + code: + type: integer + format: int64 + data: + type: string + format: byte + log: + type: string + title: nondeterministic + info: + type: string + title: nondeterministic + gas_wanted: + type: string + format: int64 + gas_used: + type: string + format: int64 + events: + type: array + items: + type: object + properties: + type: + type: string + attributes: + type: array + items: + type: object + properties: + key: + type: string + value: + type: string + index: + type: boolean + title: nondeterministic + description: >- + EventAttribute is a single key-value + pair, associated with an event. + description: >- + Event allows application developers to + attach additional information to + + ResponseBeginBlock, ResponseEndBlock, + ResponseCheckTx and ResponseDeliverTx. + + Later, transactions may be queried using + these events. + title: nondeterministic + codespace: + type: string + delivery_proof: + title: >- + is the Merkle Proof which proves existence of + response in block with height + + next_block_header.Height + type: object + properties: + total: + type: string + format: int64 + index: + type: string + format: int64 + leaf_hash: + type: string + format: byte + aunts: + type: array + items: + type: string + format: byte + inclusion_proof: + title: >- + is the Merkle Proof which proves existence of data + in block with height + + header.Height + type: object + properties: + total: + type: string + format: int64 + index: + type: string + format: int64 + leaf_hash: + type: string + format: byte + aunts: + type: array + items: + type: string + format: byte + data: + type: string + format: byte + title: is body of the transaction + height: + type: string + format: uint64 + revision: + type: string + format: uint64 + allow_kv_callbacks: + type: boolean + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type of + the serialized + + protocol buffer message. This string must contain at + least + + one "/" character. The last segment of the URL's path + must represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be in + a canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the binary + all types that they + + expect it to use in the context of Any. However, for + URLs which use the + + scheme `http`, `https`, or no scheme, one can optionally + set up a type + + server that maps type URLs to message definitions as + follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based + on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in + the official + + protobuf release, and it is not used for type URLs + beginning with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty scheme) + might be + + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer + message along with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any values + in the form + + of utility functions or additional generated methods of the + Any type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by + default use + + 'type.googleapis.com/full.type.name' as the type URL and the + unpack + + methods only use the fully qualified type name after the + last '/' + + in the type URL, for example "foo.bar.com/x/y.z" will yield + type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the regular + + representation of the deserialized, embedded message, with + an + + additional field `@type` which contains the type URL. + Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a custom + JSON + + representation, that representation will be embedded adding + a field + + `value` which holds the custom JSON in addition to the + `@type` + + field. Example (for message [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + parameters: + - name: query_id + in: query + required: false + type: string + format: uint64 + tags: + - Query + /neutron/interchainqueries/registered_queries: + get: + operationId: NeutronInterchainqueriesRegisteredQueries + responses: + '200': + description: A successful response. + schema: + type: object + properties: + registered_queries: + type: array + items: + type: object + properties: + id: + type: string + format: uint64 + description: The unique id of the registered query. + owner: + type: string + description: The address that registered the query. + query_type: + type: string + title: 'The query type identifier: `kv` or `tx` now' + keys: + type: array + items: + type: object + properties: + path: + type: string + title: >- + Path (storage prefix) to the storage where you + want to read value by key + + (usually name of cosmos-sdk module: 'staking', + 'bank', etc.) + key: + type: string + format: byte + title: Key you want to read from the storage + title: >- + The KV-storage keys for which we want to get values from + remote chain + transactions_filter: + type: string + title: The filter for transaction search ICQ + connection_id: + type: string + title: >- + The IBC connection ID for getting ConsensusState to + verify proofs + update_period: + type: string + format: uint64 + description: >- + Parameter that defines how often the query must be + updated. + last_submitted_result_local_height: + type: string + format: uint64 + description: >- + The local chain last block height when the query result + was updated. + last_submitted_result_remote_height: + description: >- + The remote chain last block height when the query result + was updated. + type: object + properties: + revision_number: + type: string + format: uint64 + title: the revision that the client is currently on + revision_height: + type: string + format: uint64 + title: the height within the given revision + title: >- + Height is a monotonically increasing data type + + that can be compared against another Height for the + purposes of updating and + + freezing clients + deposit: + type: array + items: + type: object + properties: + denom: + type: string + amount: + type: string + 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. + description: Amount of coins deposited for the query. + submit_timeout: + type: string + format: uint64 + description: >- + Timeout before query becomes available for everybody to + remove. + registered_at_height: + type: string + format: uint64 + description: The local chain height when the query was registered. + pagination: + description: pagination defines the pagination in the response. + type: object + properties: + next_key: + type: string + format: byte + 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. + total: + type: string + format: uint64 + title: >- + total is total number of results available if + PageRequest.count_total + + was set, its value is undefined otherwise + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type of + the serialized + + protocol buffer message. This string must contain at + least + + one "/" character. The last segment of the URL's path + must represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be in + a canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the binary + all types that they - `value` which holds the custom JSON in addition to the - `@type` + expect it to use in the context of Any. However, for + URLs which use the - field. Example (for message - [google.protobuf.Duration][]): + scheme `http`, `https`, or no scheme, one can optionally + set up a type - { - "@type": "type.googleapis.com/google.protobuf.Duration", - "value": "1.212s" - } - header: - title: >- - We need to know block X to verify inclusion of - transaction for block X - type: object - properties: - '@type': - type: string - description: >- - A URL/resource name that uniquely identifies the - type of the serialized + server that maps type URLs to message definitions as + follows: - protocol buffer message. This string must contain - at least - one "/" character. The last segment of the URL's - path must represent + * If no scheme is provided, `https` is assumed. - the fully qualified name of the type (as in + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based + on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) - `path/google.protobuf.Duration`). The name should - be in a canonical form + Note: this functionality is not currently available in + the official - (e.g., leading "." is not accepted). + protobuf release, and it is not used for type URLs + beginning with + type.googleapis.com. - In practice, teams usually precompile into the - binary all types that they - expect it to use in the context of Any. However, - for URLs which use the + Schemes other than `http`, `https` (or the empty scheme) + might be - scheme `http`, `https`, or no scheme, one can - optionally set up a type + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer + message along with a - server that maps type URLs to message definitions - as follows: + URL that describes the type of the serialized message. - * If no scheme is provided, `https` is assumed. + Protobuf library provides support to pack/unpack Any values + in the form - * An HTTP GET on the URL must yield a - [google.protobuf.Type][] - value in binary format, or produce an error. - * Applications are allowed to cache lookup results - based on the - URL, or have them precompiled into a binary to avoid any - lookup. Therefore, binary compatibility needs to be preserved - on changes to types. (Use versioned type names to manage - breaking changes.) + of utility functions or additional generated methods of the + Any type. - Note: this functionality is not currently - available in the official - protobuf release, and it is not used for type URLs - beginning with + Example 1: Pack and unpack a message in C++. - type.googleapis.com. + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + Example 2: Pack and unpack a message in Java. - Schemes other than `http`, `https` (or the empty - scheme) might be + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } - used with implementation specific semantics. - additionalProperties: {} - description: >- - `Any` contains an arbitrary serialized protocol buffer - message along with a + Example 3: Pack and unpack a message in Python. - URL that describes the type of the serialized message. + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + Example 4: Pack and unpack a message in Go - Protobuf library provides support to pack/unpack Any - values in the form + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } - of utility functions or additional generated methods - of the Any type. + The pack methods provided by protobuf library will by + default use + 'type.googleapis.com/full.type.name' as the type URL and the + unpack - Example 1: Pack and unpack a message in C++. + methods only use the fully qualified type name after the + last '/' - Foo foo = ...; - Any any; - any.PackFrom(foo); - ... - if (any.UnpackTo(&foo)) { - ... - } + in the type URL, for example "foo.bar.com/x/y.z" will yield + type - Example 2: Pack and unpack a message in Java. + name "y.z". - Foo foo = ...; - Any any = Any.pack(foo); - ... - if (any.is(Foo.class)) { - foo = any.unpack(Foo.class); - } - Example 3: Pack and unpack a message in Python. - foo = Foo(...) - any = Any() - any.Pack(foo) - ... - if any.Is(Foo.DESCRIPTOR): - any.Unpack(foo) - ... + JSON - Example 4: Pack and unpack a message in Go + ==== - foo := &pb.Foo{...} - any, err := anypb.New(foo) - if err != nil { - ... - } - ... - foo := &pb.Foo{} - if err := any.UnmarshalTo(foo); err != nil { - ... - } + The JSON representation of an `Any` value uses the regular - The pack methods provided by protobuf library will by - default use + representation of the deserialized, embedded message, with + an - 'type.googleapis.com/full.type.name' as the type URL - and the unpack + additional field `@type` which contains the type URL. + Example: - methods only use the fully qualified type name after - the last '/' + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } - in the type URL, for example "foo.bar.com/x/y.z" will - yield type + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } - name "y.z". + If the embedded message type is well-known and has a custom + JSON + representation, that representation will be embedded adding + a field + `value` which holds the custom JSON in addition to the + `@type` - JSON + field. Example (for message [google.protobuf.Duration][]): - ==== + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + parameters: + - name: owners + in: query + required: false + type: array + items: + type: string + collectionFormat: multi + - name: connection_id + in: query + required: false + type: string + - name: pagination.key + 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. + in: query + required: false + type: string + format: byte + - name: pagination.offset + description: >- + offset is a numeric offset that can be used when key is unavailable. - The JSON representation of an `Any` value uses the - regular + It is less efficient than using key. Only one of offset or key + should - representation of the deserialized, embedded message, - with an + be set. + in: query + required: false + type: string + format: uint64 + - name: pagination.limit + description: >- + limit is the total number of results to be returned in the result + page. - additional field `@type` which contains the type URL. - Example: + If left empty it will default to a value to be set by each app. + in: query + required: false + type: string + format: uint64 + - name: pagination.count_total + description: >- + count_total is set to true to indicate that the result set should + include - package google.profile; - message Person { - string first_name = 1; - string last_name = 2; - } + a count of the total number of items available for pagination in + UIs. - { - "@type": "type.googleapis.com/google.profile.Person", - "firstName": , - "lastName": - } + count_total is only respected when offset is used. It is ignored + when key - If the embedded message type is well-known and has a - custom JSON + is set. + in: query + required: false + type: boolean + - name: pagination.reverse + description: >- + reverse is set to true if results are to be returned in the + descending order. - representation, that representation will be embedded - adding a field - `value` which holds the custom JSON in addition to the - `@type` + Since: cosmos-sdk 0.43 + in: query + required: false + type: boolean + tags: + - Query + /neutron/interchainqueries/registered_query: + get: + operationId: NeutronInterchainqueriesRegisteredQuery + responses: + '200': + description: A successful response. + schema: + type: object + properties: + registered_query: + type: object + properties: + id: + type: string + format: uint64 + description: The unique id of the registered query. + owner: + type: string + description: The address that registered the query. + query_type: + type: string + title: 'The query type identifier: `kv` or `tx` now' + keys: + type: array + items: + type: object + properties: + path: + type: string + title: >- + Path (storage prefix) to the storage where you want + to read value by key - field. Example (for message - [google.protobuf.Duration][]): + (usually name of cosmos-sdk module: 'staking', + 'bank', etc.) + key: + type: string + format: byte + title: Key you want to read from the storage + title: >- + The KV-storage keys for which we want to get values from + remote chain + transactions_filter: + type: string + title: The filter for transaction search ICQ + connection_id: + type: string + title: >- + The IBC connection ID for getting ConsensusState to verify + proofs + update_period: + type: string + format: uint64 + description: >- + Parameter that defines how often the query must be + updated. + last_submitted_result_local_height: + type: string + format: uint64 + description: >- + The local chain last block height when the query result + was updated. + last_submitted_result_remote_height: + description: >- + The remote chain last block height when the query result + was updated. + type: object + properties: + revision_number: + type: string + format: uint64 + title: the revision that the client is currently on + revision_height: + type: string + format: uint64 + title: the height within the given revision + title: >- + Height is a monotonically increasing data type - { - "@type": "type.googleapis.com/google.protobuf.Duration", - "value": "1.212s" - } - tx: - type: object - properties: - response: - type: object - properties: - code: - type: integer - format: int64 - data: - type: string - format: byte - log: - type: string - title: nondeterministic - info: - type: string - title: nondeterministic - gas_wanted: - type: string - format: int64 - gas_used: - type: string - format: int64 - events: - type: array - items: - type: object - properties: - type: - type: string - attributes: - type: array - items: - type: object - properties: - key: - type: string - value: - type: string - index: - type: boolean - title: nondeterministic - description: >- - EventAttribute is a single key-value - pair, associated with an event. - description: >- - Event allows application developers to - attach additional information to + that can be compared against another Height for the + purposes of updating and - ResponseBeginBlock, ResponseEndBlock, - ResponseCheckTx and ResponseDeliverTx. + freezing clients + deposit: + type: array + items: + type: object + properties: + denom: + type: string + amount: + type: string + description: >- + Coin defines a token with a denomination and an amount. - Later, transactions may be queried using - these events. - title: nondeterministic - codespace: - type: string - delivery_proof: - title: >- - is the Merkle Proof which proves existence of - response in block with height - next_block_header.Height - type: object - properties: - total: - type: string - format: int64 - index: - type: string - format: int64 - leaf_hash: - type: string - format: byte - aunts: - type: array - items: - type: string - format: byte - inclusion_proof: - title: >- - is the Merkle Proof which proves existence of data - in block with height + NOTE: The amount field is an Int which implements the + custom method - header.Height - type: object - properties: - total: - type: string - format: int64 - index: - type: string - format: int64 - leaf_hash: - type: string - format: byte - aunts: - type: array - items: - type: string - format: byte - data: - type: string - format: byte - title: is body of the transaction - height: + signatures required by gogoproto. + description: Amount of coins deposited for the query. + submit_timeout: type: string format: uint64 - revision: + description: >- + Timeout before query becomes available for everybody to + remove. + registered_at_height: type: string format: uint64 - allow_kv_callbacks: - type: boolean + description: The local chain height when the query was registered. default: description: An unexpected error response. schema: @@ -38075,139 +40085,18 @@ paths: format: uint64 tags: - Query - /neutron/interchainqueries/registered_queries: + /neutron/interchainqueries/remote_height: get: - operationId: NeutronInterchainqueriesRegisteredQueries + operationId: NeutronInterchainqueriesLastRemoteHeight responses: '200': description: A successful response. schema: type: object properties: - registered_queries: - type: array - items: - type: object - properties: - id: - type: string - format: uint64 - description: The unique id of the registered query. - owner: - type: string - description: The address that registered the query. - query_type: - type: string - title: 'The query type identifier: `kv` or `tx` now' - keys: - type: array - items: - type: object - properties: - path: - type: string - title: >- - Path (storage prefix) to the storage where you - want to read value by key - - (usually name of cosmos-sdk module: 'staking', - 'bank', etc.) - key: - type: string - format: byte - title: Key you want to read from the storage - title: >- - The KV-storage keys for which we want to get values from - remote chain - transactions_filter: - type: string - title: The filter for transaction search ICQ - connection_id: - type: string - title: >- - The IBC connection ID for getting ConsensusState to - verify proofs - update_period: - type: string - format: uint64 - description: >- - Parameter that defines how often the query must be - updated. - last_submitted_result_local_height: - type: string - format: uint64 - description: >- - The local chain last block height when the query result - was updated. - last_submitted_result_remote_height: - description: >- - The remote chain last block height when the query result - was updated. - type: object - properties: - revision_number: - type: string - format: uint64 - title: the revision that the client is currently on - revision_height: - type: string - format: uint64 - title: the height within the given revision - title: >- - Height is a monotonically increasing data type - - that can be compared against another Height for the - purposes of updating and - - freezing clients - deposit: - type: array - items: - type: object - properties: - denom: - type: string - amount: - type: string - 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. - description: Amount of coins deposited for the query. - submit_timeout: - type: string - format: uint64 - description: >- - Timeout before query becomes available for everybody to - remove. - registered_at_height: - type: string - format: uint64 - description: The local chain height when the query was registered. - pagination: - description: pagination defines the pagination in the response. - type: object - properties: - next_key: - type: string - format: byte - 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. - total: - type: string - format: uint64 - title: >- - total is total number of results available if - PageRequest.count_total - - was set, its value is undefined otherwise + height: + type: string + format: uint64 default: description: An unexpected error response. schema: @@ -38394,159 +40283,33 @@ paths: "value": "1.212s" } parameters: - - name: owners - in: query - required: false - type: array - items: - type: string - collectionFormat: multi - name: connection_id in: query required: false type: string - - name: pagination.key - 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. - in: query - required: false - type: string - format: byte - - name: pagination.offset - 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. - in: query - required: false - type: string - format: uint64 - - name: pagination.limit - 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. - in: query - required: false - type: string - format: uint64 - - name: pagination.count_total - 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 - required: false - type: boolean - - name: pagination.reverse - description: >- - reverse is set to true if results are to be returned in the - descending order. - - - Since: cosmos-sdk 0.43 - in: query - required: false - type: boolean tags: - Query - /neutron/interchainqueries/registered_query: + /neutron/interchaintxs/params: get: - operationId: NeutronInterchainqueriesRegisteredQuery + summary: Parameters queries the parameters of the module. + operationId: NeutronInterchaintxsV1Params responses: '200': description: A successful response. schema: type: object properties: - registered_query: + params: + description: params holds all the parameters of this module. type: object properties: - id: + msg_submit_tx_max_messages: type: string format: uint64 - description: The unique id of the registered query. - owner: - type: string - description: The address that registered the query. - query_type: - type: string - title: 'The query type identifier: `kv` or `tx` now' - keys: - type: array - items: - type: object - properties: - path: - type: string - title: >- - Path (storage prefix) to the storage where you want - to read value by key - - (usually name of cosmos-sdk module: 'staking', - 'bank', etc.) - key: - type: string - format: byte - title: Key you want to read from the storage - title: >- - The KV-storage keys for which we want to get values from - remote chain - transactions_filter: - type: string - title: The filter for transaction search ICQ - connection_id: - type: string title: >- - The IBC connection ID for getting ConsensusState to verify - proofs - update_period: - type: string - format: uint64 - description: >- - Parameter that defines how often the query must be - updated. - last_submitted_result_local_height: - type: string - format: uint64 - description: >- - The local chain last block height when the query result - was updated. - last_submitted_result_remote_height: - description: >- - The remote chain last block height when the query result - was updated. - type: object - properties: - revision_number: - type: string - format: uint64 - title: the revision that the client is currently on - revision_height: - type: string - format: uint64 - title: the height within the given revision - title: >- - Height is a monotonically increasing data type - - that can be compared against another Height for the - purposes of updating and - - freezing clients - deposit: + Defines maximum amount of messages to be passed in + MsgSubmitTx + register_fee: type: array items: type: object @@ -38563,17 +40326,12 @@ paths: custom method signatures required by gogoproto. - description: Amount of coins deposited for the query. - submit_timeout: - type: string - format: uint64 - description: >- - Timeout before query becomes available for everybody to - remove. - registered_at_height: - type: string - format: uint64 - description: The local chain height when the query was registered. + title: >- + Defines a minimum fee required to register interchain + account + description: >- + QueryParamsResponse is response type for the Query/Params RPC + method. default: description: An unexpected error response. schema: @@ -38759,26 +40517,21 @@ paths: "@type": "type.googleapis.com/google.protobuf.Duration", "value": "1.212s" } - parameters: - - name: query_id - in: query - required: false - type: string - format: uint64 tags: - Query - /neutron/interchainqueries/remote_height: + /neutron/interchaintxs/{owner_address}/{interchain_account_id}/{connection_id}/interchain_account_address: get: - operationId: NeutronInterchainqueriesLastRemoteHeight + operationId: NeutronInterchaintxsV1InterchainAccountAddress responses: '200': description: A successful response. schema: type: object properties: - height: + interchain_account_address: type: string - format: uint64 + title: The corresponding interchain account address on the host chain + title: Query response for an interchain account address default: description: An unexpected error response. schema: @@ -38965,9 +40718,32 @@ paths: "value": "1.212s" } parameters: + - name: owner_address + description: >- + owner_address is the owner of the interchain account on the + controller + + chain + in: path + required: true + type: string + - name: interchain_account_id + description: >- + interchain_account_id is an identifier of your interchain account + from + + which you want to execute msgs + in: path + required: true + type: string - name: connection_id - in: query - required: false + description: >- + connection_id is an IBC connection identifier between Neutron and + remote + + chain + in: path + required: true type: string tags: - Query @@ -39927,6 +41703,9 @@ paths: - Query /osmosis/tokenfactory/v1beta1/denoms/factory/{creator}/{subdenom}/authority_metadata: get: + summary: |- + DenomAuthorityMetadata defines a gRPC query method for fetching + DenomAuthorityMetadata for a particular denom. operationId: OsmosisTokenfactoryV1Beta1DenomAuthorityMetadata responses: '200': @@ -39948,6 +41727,59 @@ paths: only one Admin permission, but is planned to be extended to the future. + description: >- + QueryDenomAuthorityMetadataResponse defines the response structure + for the + + DenomAuthorityMetadata gRPC query. + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + additionalProperties: {} + parameters: + - name: creator + in: path + required: true + type: string + - name: subdenom + in: path + required: true + type: string + tags: + - Query + /osmosis/tokenfactory/v1beta1/denoms/factory/{creator}/{subdenom}/before_send_hook: + get: + summary: |- + BeforeSendHookAddress defines a gRPC query method for + getting the address registered for the before send hook. + operationId: OsmosisTokenfactoryV1Beta1BeforeSendHookAddress + responses: + '200': + description: A successful response. + schema: + type: object + properties: + contract_addr: + type: string + description: >- + QueryBeforeSendHookAddressResponse defines the response structure + for the + + DenomBeforeSendHook gRPC query. default: description: An unexpected error response. schema: @@ -39979,6 +41811,9 @@ paths: - Query /osmosis/tokenfactory/v1beta1/denoms_from_creator/{creator}: get: + summary: |- + DenomsFromCreator defines a gRPC query method for fetching all + denominations created by a specific admin/creator. operationId: OsmosisTokenfactoryV1Beta1DenomsFromCreator responses: '200': @@ -39990,6 +41825,11 @@ paths: type: array items: type: string + description: >- + QueryDenomsFromCreatorRequest defines the response structure for + the + + DenomsFromCreator gRPC query. default: description: An unexpected error response. schema: @@ -40017,7 +41857,11 @@ paths: - Query /osmosis/tokenfactory/v1beta1/params: get: - summary: Params returns the total set of minting parameters. + summary: >- + Params defines a gRPC query method that returns the tokenfactory + module's + + parameters. operationId: OsmosisTokenfactoryV1Beta1Params responses: '200': @@ -40046,15 +41890,30 @@ paths: custom method signatures required by gogoproto. - title: >- - DenomCreationFee is the fee required to create a new denom - using the tokenfactory module + description: >- + DenomCreationFee defines the fee to be charged on the + creation of a new + + denom. The fee is drawn from the MsgCreateDenom's sender + account, and + + transferred to the community pool. + denom_creation_gas_consume: + type: string + format: uint64 + description: >- + DenomCreationGasConsume defines the gas cost for creating + a new denom. + + This is intended as a spam deterrence mechanism. + + + See: https://github.com/CosmWasm/token-factory/issues/11 fee_collector_address: type: string title: >- FeeCollectorAddress is the address where fees collected from denom creation are sent to - title: Params holds parameters for the tokenfactory module description: >- QueryParamsResponse is the response type for the Query/Params RPC method. @@ -40078,10 +41937,49 @@ paths: additionalProperties: {} tags: - Query - /pob/builder/v1/bid: + /ibc/apps/packetforward/v1/params: + get: + summary: Params queries all parameters of the packetforward module. + operationId: PacketforwardV1Params + responses: + '200': + description: A successful response. + schema: + type: object + properties: + params: + description: params defines the parameters of the module. + type: object + properties: + fee_percentage: + type: string + description: >- + QueryParamsResponse is the response type for the Query/Params RPC + method. + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + additionalProperties: {} + tags: + - Query + /block-sdk/auction/v1/bid: post: - summary: AuctionBid defines a method for sending bids to the x/builder module. - operationId: PobBuilderV1AuctionBid + summary: AuctionBid defines a method for sending bids to the x/auction module. + operationId: SdkAuctionV1AuctionBid responses: '200': description: A successful response. @@ -40137,10 +42035,10 @@ paths: collectionFormat: multi tags: - Msg - /pob/builder/v1/params: + /block-sdk/auction/v1/params: get: - summary: Params queries the parameters of the x/builder module. - operationId: PobBuilderV1Params + summary: Params queries the parameters of the x/auction module. + operationId: SdkAuctionV1Params responses: '200': description: A successful response. @@ -40224,50 +42122,20 @@ paths: additionalProperties: {} tags: - Query - /ibc/apps/router/v1/params: - get: - summary: Params queries all parameters of the router module. - operationId: RouterV1Params - responses: - '200': - description: A successful response. - schema: - type: object - properties: - params: - description: params defines the parameters of the module. - type: object - properties: - fee_percentage: - type: string - description: >- - QueryParamsResponse is the response type for the Query/Params RPC - method. - default: - description: An unexpected error response. - schema: - type: object - properties: - code: - type: integer - format: int32 - message: - type: string - details: - type: array - items: - type: object - properties: - '@type': - type: string - additionalProperties: {} - tags: - - Query definitions: cosmos.adminmodule.adminmodule.MsgAddAdminResponse: type: object cosmos.adminmodule.adminmodule.MsgDeleteAdminResponse: type: object + cosmos.adminmodule.adminmodule.MsgSubmitProposalLegacyResponse: + type: object + properties: + proposal_id: + type: string + format: uint64 + description: >- + MsgSubmitProposalLegacyResponse defines the Msg/SubmitProposalLegacy + response type. cosmos.adminmodule.adminmodule.MsgSubmitProposalResponse: type: object properties: @@ -40282,10 +42150,10 @@ definitions: type: array items: type: string - cosmos.adminmodule.adminmodule.QueryArchivedProposalsResponse: + cosmos.adminmodule.adminmodule.QueryArchivedProposalsLegacyResponse: type: object properties: - proposals: + proposalsLegacy: type: array items: type: object @@ -40427,6 +42295,278 @@ definitions: format: date-time description: voting_end_time is the end time of voting on a proposal. description: Proposal defines the core field members of a governance proposal. + cosmos.adminmodule.adminmodule.QueryArchivedProposalsResponse: + type: object + properties: + proposals: + type: array + items: + type: object + properties: + id: + type: string + format: uint64 + description: id defines the unique id of the proposal. + messages: + type: array + items: + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type of + the serialized + + protocol buffer message. This string must contain at least + + one "/" character. The last segment of the URL's path must + represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be in a + canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the binary all + types that they + + expect it to use in the context of Any. However, for URLs + which use the + + scheme `http`, `https`, or no scheme, one can optionally + set up a type + + server that maps type URLs to message definitions as + follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a + [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based + on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in the + official + + protobuf release, and it is not used for type URLs + beginning with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty scheme) + might be + + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer message + along with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any values in + the form + + of utility functions or additional generated methods of the + Any type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by default + use + + 'type.googleapis.com/full.type.name' as the type URL and the + unpack + + methods only use the fully qualified type name after the last + '/' + + in the type URL, for example "foo.bar.com/x/y.z" will yield + type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the regular + + representation of the deserialized, embedded message, with an + + additional field `@type` which contains the type URL. Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a custom + JSON + + representation, that representation will be embedded adding a + field + + `value` which holds the custom JSON in addition to the `@type` + + field. Example (for message [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + description: >- + messages are the arbitrary messages to be executed if the + proposal passes. + status: + description: status defines the proposal status. + type: string + enum: + - PROPOSAL_STATUS_UNSPECIFIED + - PROPOSAL_STATUS_DEPOSIT_PERIOD + - PROPOSAL_STATUS_VOTING_PERIOD + - PROPOSAL_STATUS_PASSED + - PROPOSAL_STATUS_REJECTED + - PROPOSAL_STATUS_FAILED + default: PROPOSAL_STATUS_UNSPECIFIED + final_tally_result: + description: >- + final_tally_result is the final tally result of the proposal. + When + + querying a proposal via gRPC, this field is not populated until + the + + proposal's voting period has ended. + type: object + properties: + yes_count: + type: string + description: yes_count is the number of yes votes on a proposal. + abstain_count: + type: string + description: abstain_count is the number of abstain votes on a proposal. + no_count: + type: string + description: no_count is the number of no votes on a proposal. + no_with_veto_count: + type: string + description: >- + no_with_veto_count is the number of no with veto votes on a + proposal. + submit_time: + type: string + format: date-time + description: submit_time is the time of proposal submission. + deposit_end_time: + type: string + format: date-time + description: deposit_end_time is the end time for deposition. + total_deposit: + type: array + items: + type: object + properties: + denom: + type: string + amount: + type: string + 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. + description: total_deposit is the total deposit on the proposal. + voting_start_time: + type: string + format: date-time + description: voting_start_time is the starting time to vote on a proposal. + voting_end_time: + type: string + format: date-time + description: voting_end_time is the end time of voting on a proposal. + metadata: + type: string + description: metadata is any arbitrary metadata attached to the proposal. + title: + type: string + description: 'Since: cosmos-sdk 0.47' + title: title is the title of the proposal + summary: + type: string + description: 'Since: cosmos-sdk 0.47' + title: summary is a short summary of the proposal + proposer: + type: string + description: 'Since: cosmos-sdk 0.47' + title: Proposer is the address of the proposal sumbitter + description: Proposal defines the core field members of a governance proposal. cosmos.base.v1beta1.Coin: type: object properties: @@ -40439,6 +42579,297 @@ definitions: NOTE: The amount field is an Int which implements the custom method signatures required by gogoproto. + cosmos.gov.v1.Proposal: + type: object + properties: + id: + type: string + format: uint64 + description: id defines the unique id of the proposal. + messages: + type: array + items: + type: object + properties: + '@type': + type: string + description: >- + A URL/resource name that uniquely identifies the type of the + serialized + + protocol buffer message. This string must contain at least + + one "/" character. The last segment of the URL's path must + represent + + the fully qualified name of the type (as in + + `path/google.protobuf.Duration`). The name should be in a + canonical form + + (e.g., leading "." is not accepted). + + + In practice, teams usually precompile into the binary all types + that they + + expect it to use in the context of Any. However, for URLs which + use the + + scheme `http`, `https`, or no scheme, one can optionally set up + a type + + server that maps type URLs to message definitions as follows: + + + * If no scheme is provided, `https` is assumed. + + * An HTTP GET on the URL must yield a [google.protobuf.Type][] + value in binary format, or produce an error. + * Applications are allowed to cache lookup results based on the + URL, or have them precompiled into a binary to avoid any + lookup. Therefore, binary compatibility needs to be preserved + on changes to types. (Use versioned type names to manage + breaking changes.) + + Note: this functionality is not currently available in the + official + + protobuf release, and it is not used for type URLs beginning + with + + type.googleapis.com. + + + Schemes other than `http`, `https` (or the empty scheme) might + be + + used with implementation specific semantics. + additionalProperties: {} + description: >- + `Any` contains an arbitrary serialized protocol buffer message along + with a + + URL that describes the type of the serialized message. + + + Protobuf library provides support to pack/unpack Any values in the + form + + of utility functions or additional generated methods of the Any + type. + + + Example 1: Pack and unpack a message in C++. + + Foo foo = ...; + Any any; + any.PackFrom(foo); + ... + if (any.UnpackTo(&foo)) { + ... + } + + Example 2: Pack and unpack a message in Java. + + Foo foo = ...; + Any any = Any.pack(foo); + ... + if (any.is(Foo.class)) { + foo = any.unpack(Foo.class); + } + + Example 3: Pack and unpack a message in Python. + + foo = Foo(...) + any = Any() + any.Pack(foo) + ... + if any.Is(Foo.DESCRIPTOR): + any.Unpack(foo) + ... + + Example 4: Pack and unpack a message in Go + + foo := &pb.Foo{...} + any, err := anypb.New(foo) + if err != nil { + ... + } + ... + foo := &pb.Foo{} + if err := any.UnmarshalTo(foo); err != nil { + ... + } + + The pack methods provided by protobuf library will by default use + + 'type.googleapis.com/full.type.name' as the type URL and the unpack + + methods only use the fully qualified type name after the last '/' + + in the type URL, for example "foo.bar.com/x/y.z" will yield type + + name "y.z". + + + + JSON + + ==== + + The JSON representation of an `Any` value uses the regular + + representation of the deserialized, embedded message, with an + + additional field `@type` which contains the type URL. Example: + + package google.profile; + message Person { + string first_name = 1; + string last_name = 2; + } + + { + "@type": "type.googleapis.com/google.profile.Person", + "firstName": , + "lastName": + } + + If the embedded message type is well-known and has a custom JSON + + representation, that representation will be embedded adding a field + + `value` which holds the custom JSON in addition to the `@type` + + field. Example (for message [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + description: >- + messages are the arbitrary messages to be executed if the proposal + passes. + status: + description: status defines the proposal status. + type: string + enum: + - PROPOSAL_STATUS_UNSPECIFIED + - PROPOSAL_STATUS_DEPOSIT_PERIOD + - PROPOSAL_STATUS_VOTING_PERIOD + - PROPOSAL_STATUS_PASSED + - PROPOSAL_STATUS_REJECTED + - PROPOSAL_STATUS_FAILED + default: PROPOSAL_STATUS_UNSPECIFIED + final_tally_result: + description: |- + final_tally_result is the final tally result of the proposal. When + querying a proposal via gRPC, this field is not populated until the + proposal's voting period has ended. + type: object + properties: + yes_count: + type: string + description: yes_count is the number of yes votes on a proposal. + abstain_count: + type: string + description: abstain_count is the number of abstain votes on a proposal. + no_count: + type: string + description: no_count is the number of no votes on a proposal. + no_with_veto_count: + type: string + description: >- + no_with_veto_count is the number of no with veto votes on a + proposal. + submit_time: + type: string + format: date-time + description: submit_time is the time of proposal submission. + deposit_end_time: + type: string + format: date-time + description: deposit_end_time is the end time for deposition. + total_deposit: + type: array + items: + type: object + properties: + denom: + type: string + amount: + type: string + 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. + description: total_deposit is the total deposit on the proposal. + voting_start_time: + type: string + format: date-time + description: voting_start_time is the starting time to vote on a proposal. + voting_end_time: + type: string + format: date-time + description: voting_end_time is the end time of voting on a proposal. + metadata: + type: string + description: metadata is any arbitrary metadata attached to the proposal. + title: + type: string + description: 'Since: cosmos-sdk 0.47' + title: title is the title of the proposal + summary: + type: string + description: 'Since: cosmos-sdk 0.47' + title: summary is a short summary of the proposal + proposer: + type: string + description: 'Since: cosmos-sdk 0.47' + title: Proposer is the address of the proposal sumbitter + description: Proposal defines the core field members of a governance proposal. + cosmos.gov.v1.ProposalStatus: + type: string + enum: + - PROPOSAL_STATUS_UNSPECIFIED + - PROPOSAL_STATUS_DEPOSIT_PERIOD + - PROPOSAL_STATUS_VOTING_PERIOD + - PROPOSAL_STATUS_PASSED + - PROPOSAL_STATUS_REJECTED + - PROPOSAL_STATUS_FAILED + default: PROPOSAL_STATUS_UNSPECIFIED + description: |- + ProposalStatus enumerates the valid statuses of a proposal. + + - PROPOSAL_STATUS_UNSPECIFIED: PROPOSAL_STATUS_UNSPECIFIED defines the default proposal status. + - PROPOSAL_STATUS_DEPOSIT_PERIOD: PROPOSAL_STATUS_DEPOSIT_PERIOD defines a proposal status during the deposit + period. + - PROPOSAL_STATUS_VOTING_PERIOD: PROPOSAL_STATUS_VOTING_PERIOD defines a proposal status during the voting + period. + - PROPOSAL_STATUS_PASSED: PROPOSAL_STATUS_PASSED defines a proposal status of a proposal that has + passed. + - PROPOSAL_STATUS_REJECTED: PROPOSAL_STATUS_REJECTED defines a proposal status of a proposal that has + been rejected. + - PROPOSAL_STATUS_FAILED: PROPOSAL_STATUS_FAILED defines a proposal status of a proposal that has + failed. + cosmos.gov.v1.TallyResult: + type: object + properties: + yes_count: + type: string + description: yes_count is the number of yes votes on a proposal. + abstain_count: + type: string + description: abstain_count is the number of abstain votes on a proposal. + no_count: + type: string + description: no_count is the number of no votes on a proposal. + no_with_veto_count: + type: string + description: no_with_veto_count is the number of no with veto votes on a proposal. + description: TallyResult defines a standard tally for a governance proposal. cosmos.gov.v1beta1.Proposal: type: object properties: @@ -52420,18 +54851,19 @@ definitions: start_height: type: string format: int64 - title: Height at which validator was first a candidate OR was unjailed + title: Height at which validator was first a candidate OR was un-jailed index_offset: type: string format: int64 description: >- - Index which is incremented each time the validator was a bonded + Index which is incremented every time a validator is bonded in a + block and - in a block and may have signed a precommit or not. This in - conjunction with the + _may_ have signed a pre-commit or not. This in conjunction with + the - `SignedBlocksWindow` param determines the index in the - `MissedBlocksBitArray`. + signed_blocks_window param determines the index in the missed + block bitmap. jailed_until: type: string format: date-time @@ -52442,18 +54874,20 @@ definitions: type: boolean description: >- Whether or not a validator has been tombstoned (killed out of - validator set). It is set + validator + + set). It is set once the validator commits an equivocation or for + any other - once the validator commits an equivocation or for any other - configured misbehiavor. + configured misbehavior. missed_blocks_counter: type: string format: int64 description: >- - A counter kept to avoid unnecessary array reads. + A counter of missed (unsigned) blocks. It is used to avoid + unnecessary - Note that `Sum(MissedBlocksBitArray)` always equals - `MissedBlocksCounter`. + reads in the missed block bitmap. description: >- ValidatorSigningInfo defines a validator's signing info for monitoring their @@ -52477,18 +54911,19 @@ definitions: start_height: type: string format: int64 - title: Height at which validator was first a candidate OR was unjailed + title: Height at which validator was first a candidate OR was un-jailed index_offset: type: string format: int64 description: >- - Index which is incremented each time the validator was a bonded + Index which is incremented every time a validator is bonded in a + block and - in a block and may have signed a precommit or not. This in - conjunction with the + _may_ have signed a pre-commit or not. This in conjunction with + the - `SignedBlocksWindow` param determines the index in the - `MissedBlocksBitArray`. + signed_blocks_window param determines the index in the missed + block bitmap. jailed_until: type: string format: date-time @@ -52499,18 +54934,20 @@ definitions: type: boolean description: >- Whether or not a validator has been tombstoned (killed out of - validator set). It is set + validator - once the validator commits an equivocation or for any other - configured misbehiavor. + set). It is set once the validator commits an equivocation or + for any other + + configured misbehavior. missed_blocks_counter: type: string format: int64 description: >- - A counter kept to avoid unnecessary array reads. + A counter of missed (unsigned) blocks. It is used to avoid + unnecessary - Note that `Sum(MissedBlocksBitArray)` always equals - `MissedBlocksCounter`. + reads in the missed block bitmap. description: >- ValidatorSigningInfo defines a validator's signing info for monitoring their @@ -52556,18 +54993,18 @@ definitions: start_height: type: string format: int64 - title: Height at which validator was first a candidate OR was unjailed + title: Height at which validator was first a candidate OR was un-jailed index_offset: type: string format: int64 description: >- - Index which is incremented each time the validator was a bonded + Index which is incremented every time a validator is bonded in a block + and - in a block and may have signed a precommit or not. This in conjunction - with the + _may_ have signed a pre-commit or not. This in conjunction with the - `SignedBlocksWindow` param determines the index in the - `MissedBlocksBitArray`. + signed_blocks_window param determines the index in the missed block + bitmap. jailed_until: type: string format: date-time @@ -52578,18 +55015,18 @@ definitions: type: boolean description: >- Whether or not a validator has been tombstoned (killed out of - validator set). It is set + validator + + set). It is set once the validator commits an equivocation or for any + other - once the validator commits an equivocation or for any other configured - misbehiavor. + configured misbehavior. missed_blocks_counter: type: string format: int64 - description: >- - A counter kept to avoid unnecessary array reads. - - Note that `Sum(MissedBlocksBitArray)` always equals - `MissedBlocksCounter`. + description: |- + A counter of missed (unsigned) blocks. It is used to avoid unnecessary + reads in the missed block bitmap. description: >- ValidatorSigningInfo defines a validator's signing info for monitoring their @@ -56840,7 +59277,6 @@ definitions: enum: - ACCESS_TYPE_UNSPECIFIED - ACCESS_TYPE_NOBODY - - ACCESS_TYPE_ONLY_ADDRESS - ACCESS_TYPE_EVERYBODY - ACCESS_TYPE_ANY_OF_ADDRESSES default: ACCESS_TYPE_UNSPECIFIED @@ -56848,16 +59284,9 @@ definitions: - ACCESS_TYPE_UNSPECIFIED: AccessTypeUnspecified placeholder for empty value - ACCESS_TYPE_NOBODY: AccessTypeNobody forbidden - - ACCESS_TYPE_ONLY_ADDRESS: AccessTypeOnlyAddress restricted to a single address - Deprecated: use AccessTypeAnyOfAddresses instead - ACCESS_TYPE_EVERYBODY: AccessTypeEverybody unrestricted - ACCESS_TYPE_ANY_OF_ADDRESSES: AccessTypeAnyOfAddresses allow any of the addresses title: AccessType permission types - address: - type: string - title: |- - Address - Deprecated: replaced by addresses addresses: type: array items: @@ -56868,7 +59297,6 @@ definitions: enum: - ACCESS_TYPE_UNSPECIFIED - ACCESS_TYPE_NOBODY - - ACCESS_TYPE_ONLY_ADDRESS - ACCESS_TYPE_EVERYBODY - ACCESS_TYPE_ANY_OF_ADDRESSES default: ACCESS_TYPE_UNSPECIFIED @@ -56876,8 +59304,6 @@ definitions: - ACCESS_TYPE_UNSPECIFIED: AccessTypeUnspecified placeholder for empty value - ACCESS_TYPE_NOBODY: AccessTypeNobody forbidden - - ACCESS_TYPE_ONLY_ADDRESS: AccessTypeOnlyAddress restricted to a single address - Deprecated: use AccessTypeAnyOfAddresses instead - ACCESS_TYPE_EVERYBODY: AccessTypeEverybody unrestricted - ACCESS_TYPE_ANY_OF_ADDRESSES: AccessTypeAnyOfAddresses allow any of the addresses title: AccessType permission types @@ -56901,7 +59327,6 @@ definitions: enum: - ACCESS_TYPE_UNSPECIFIED - ACCESS_TYPE_NOBODY - - ACCESS_TYPE_ONLY_ADDRESS - ACCESS_TYPE_EVERYBODY - ACCESS_TYPE_ANY_OF_ADDRESSES default: ACCESS_TYPE_UNSPECIFIED @@ -56909,16 +59334,9 @@ definitions: - ACCESS_TYPE_UNSPECIFIED: AccessTypeUnspecified placeholder for empty value - ACCESS_TYPE_NOBODY: AccessTypeNobody forbidden - - ACCESS_TYPE_ONLY_ADDRESS: AccessTypeOnlyAddress restricted to a single address - Deprecated: use AccessTypeAnyOfAddresses instead - ACCESS_TYPE_EVERYBODY: AccessTypeEverybody unrestricted - ACCESS_TYPE_ANY_OF_ADDRESSES: AccessTypeAnyOfAddresses allow any of the addresses title: AccessType permission types - address: - type: string - title: |- - Address - Deprecated: replaced by addresses addresses: type: array items: @@ -57089,6 +59507,11 @@ definitions: format: byte title: base64-encode raw value title: Model is a struct that holds a KV pair + cosmwasm.wasm.v1.MsgAddCodeUploadParamsAddressesResponse: + type: object + description: |- + MsgAddCodeUploadParamsAddressesResponse defines the response + structure for executing a MsgAddCodeUploadParamsAddresses message. cosmwasm.wasm.v1.MsgClearAdminResponse: type: object title: MsgClearAdminResponse returns empty data @@ -57139,6 +59562,11 @@ definitions: MsgPinCodes message. Since: 0.40 + cosmwasm.wasm.v1.MsgRemoveCodeUploadParamsAddressesResponse: + type: object + description: |- + MsgRemoveCodeUploadParamsAddressesResponse defines the response + structure for executing a MsgRemoveCodeUploadParamsAddresses message. cosmwasm.wasm.v1.MsgStoreAndInstantiateContractResponse: type: object properties: @@ -57154,6 +59582,26 @@ definitions: for executing a MsgStoreAndInstantiateContract message. Since: 0.40 + cosmwasm.wasm.v1.MsgStoreAndMigrateContractResponse: + type: object + properties: + code_id: + type: string + format: uint64 + title: CodeID is the reference to the stored WASM code + checksum: + type: string + format: byte + title: Checksum is the sha256 hash of the stored code + data: + type: string + format: byte + title: Data contains bytes to returned from the contract + description: |- + MsgStoreAndMigrateContractResponse defines the response structure + for executing a MsgStoreAndMigrateContract message. + + Since: 0.42 cosmwasm.wasm.v1.MsgStoreCodeResponse: type: object properties: @@ -57188,6 +59636,9 @@ definitions: cosmwasm.wasm.v1.MsgUpdateAdminResponse: type: object title: MsgUpdateAdminResponse returns empty data + cosmwasm.wasm.v1.MsgUpdateContractLabelResponse: + type: object + title: MsgUpdateContractLabelResponse returns empty data cosmwasm.wasm.v1.MsgUpdateInstantiateConfigResponse: type: object title: MsgUpdateInstantiateConfigResponse returns empty data @@ -57209,7 +59660,6 @@ definitions: enum: - ACCESS_TYPE_UNSPECIFIED - ACCESS_TYPE_NOBODY - - ACCESS_TYPE_ONLY_ADDRESS - ACCESS_TYPE_EVERYBODY - ACCESS_TYPE_ANY_OF_ADDRESSES default: ACCESS_TYPE_UNSPECIFIED @@ -57217,16 +59667,9 @@ definitions: - ACCESS_TYPE_UNSPECIFIED: AccessTypeUnspecified placeholder for empty value - ACCESS_TYPE_NOBODY: AccessTypeNobody forbidden - - ACCESS_TYPE_ONLY_ADDRESS: AccessTypeOnlyAddress restricted to a single address - Deprecated: use AccessTypeAnyOfAddresses instead - ACCESS_TYPE_EVERYBODY: AccessTypeEverybody unrestricted - ACCESS_TYPE_ANY_OF_ADDRESSES: AccessTypeAnyOfAddresses allow any of the addresses title: AccessType permission types - address: - type: string - title: |- - Address - Deprecated: replaced by addresses addresses: type: array items: @@ -57237,7 +59680,6 @@ definitions: enum: - ACCESS_TYPE_UNSPECIFIED - ACCESS_TYPE_NOBODY - - ACCESS_TYPE_ONLY_ADDRESS - ACCESS_TYPE_EVERYBODY - ACCESS_TYPE_ANY_OF_ADDRESSES default: ACCESS_TYPE_UNSPECIFIED @@ -57245,8 +59687,6 @@ definitions: - ACCESS_TYPE_UNSPECIFIED: AccessTypeUnspecified placeholder for empty value - ACCESS_TYPE_NOBODY: AccessTypeNobody forbidden - - ACCESS_TYPE_ONLY_ADDRESS: AccessTypeOnlyAddress restricted to a single address - Deprecated: use AccessTypeAnyOfAddresses instead - ACCESS_TYPE_EVERYBODY: AccessTypeEverybody unrestricted - ACCESS_TYPE_ANY_OF_ADDRESSES: AccessTypeAnyOfAddresses allow any of the addresses title: AccessType permission types @@ -57313,7 +59753,6 @@ definitions: enum: - ACCESS_TYPE_UNSPECIFIED - ACCESS_TYPE_NOBODY - - ACCESS_TYPE_ONLY_ADDRESS - ACCESS_TYPE_EVERYBODY - ACCESS_TYPE_ANY_OF_ADDRESSES default: ACCESS_TYPE_UNSPECIFIED @@ -57321,16 +59760,9 @@ definitions: - ACCESS_TYPE_UNSPECIFIED: AccessTypeUnspecified placeholder for empty value - ACCESS_TYPE_NOBODY: AccessTypeNobody forbidden - - ACCESS_TYPE_ONLY_ADDRESS: AccessTypeOnlyAddress restricted to a single address - Deprecated: use AccessTypeAnyOfAddresses instead - ACCESS_TYPE_EVERYBODY: AccessTypeEverybody unrestricted - ACCESS_TYPE_ANY_OF_ADDRESSES: AccessTypeAnyOfAddresses allow any of the addresses title: AccessType permission types - address: - type: string - title: |- - Address - Deprecated: replaced by addresses addresses: type: array items: @@ -57366,7 +59798,6 @@ definitions: enum: - ACCESS_TYPE_UNSPECIFIED - ACCESS_TYPE_NOBODY - - ACCESS_TYPE_ONLY_ADDRESS - ACCESS_TYPE_EVERYBODY - ACCESS_TYPE_ANY_OF_ADDRESSES default: ACCESS_TYPE_UNSPECIFIED @@ -57374,16 +59805,9 @@ definitions: - ACCESS_TYPE_UNSPECIFIED: AccessTypeUnspecified placeholder for empty value - ACCESS_TYPE_NOBODY: AccessTypeNobody forbidden - - ACCESS_TYPE_ONLY_ADDRESS: AccessTypeOnlyAddress restricted to a single address - Deprecated: use AccessTypeAnyOfAddresses instead - ACCESS_TYPE_EVERYBODY: AccessTypeEverybody unrestricted - ACCESS_TYPE_ANY_OF_ADDRESSES: AccessTypeAnyOfAddresses allow any of the addresses title: AccessType permission types - address: - type: string - title: |- - Address - Deprecated: replaced by addresses addresses: type: array items: @@ -57667,7 +60091,6 @@ definitions: enum: - ACCESS_TYPE_UNSPECIFIED - ACCESS_TYPE_NOBODY - - ACCESS_TYPE_ONLY_ADDRESS - ACCESS_TYPE_EVERYBODY - ACCESS_TYPE_ANY_OF_ADDRESSES default: ACCESS_TYPE_UNSPECIFIED @@ -57675,16 +60098,9 @@ definitions: - ACCESS_TYPE_UNSPECIFIED: AccessTypeUnspecified placeholder for empty value - ACCESS_TYPE_NOBODY: AccessTypeNobody forbidden - - ACCESS_TYPE_ONLY_ADDRESS: AccessTypeOnlyAddress restricted to a single address - Deprecated: use AccessTypeAnyOfAddresses instead - ACCESS_TYPE_EVERYBODY: AccessTypeEverybody unrestricted - ACCESS_TYPE_ANY_OF_ADDRESSES: AccessTypeAnyOfAddresses allow any of the addresses title: AccessType permission types - address: - type: string - title: |- - Address - Deprecated: replaced by addresses addresses: type: array items: @@ -57695,7 +60111,6 @@ definitions: enum: - ACCESS_TYPE_UNSPECIFIED - ACCESS_TYPE_NOBODY - - ACCESS_TYPE_ONLY_ADDRESS - ACCESS_TYPE_EVERYBODY - ACCESS_TYPE_ANY_OF_ADDRESSES default: ACCESS_TYPE_UNSPECIFIED @@ -57703,8 +60118,6 @@ definitions: - ACCESS_TYPE_UNSPECIFIED: AccessTypeUnspecified placeholder for empty value - ACCESS_TYPE_NOBODY: AccessTypeNobody forbidden - - ACCESS_TYPE_ONLY_ADDRESS: AccessTypeOnlyAddress restricted to a single address - Deprecated: use AccessTypeAnyOfAddresses instead - ACCESS_TYPE_EVERYBODY: AccessTypeEverybody unrestricted - ACCESS_TYPE_ANY_OF_ADDRESSES: AccessTypeAnyOfAddresses allow any of the addresses title: AccessType permission types @@ -66081,28 +68494,42 @@ definitions: neutron.contractmanager.Failure: type: object properties: - channel_id: - type: string - title: ChannelId address: type: string title: Address of the failed contract id: type: string format: uint64 - title: id of the failure under specific address - ack_id: + title: Id of the failure under specific address + sudo_payload: type: string - format: uint64 - title: ACK id to restore - ack_type: + format: byte + title: Serialized MessageSudoCallback with Packet and Ack(if exists) + error: type: string - title: Acknowledgement type - description: |- + title: >- + Redacted error response of the sudo call. Full error is emitted as an + event + 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 + neutron.contractmanager.MsgUpdateParamsResponse: + type: object + description: |- + MsgUpdateParamsResponse defines the response structure for executing a + MsgUpdateParams message. + + Since: 0.47 neutron.contractmanager.Params: type: object + properties: + sudo_call_gas_limit: + type: string + format: uint64 description: Params defines the parameters for the module. neutron.contractmanager.QueryFailuresResponse: type: object @@ -66112,28 +68539,30 @@ definitions: items: type: object properties: - channel_id: - type: string - title: ChannelId address: type: string title: Address of the failed contract id: type: string format: uint64 - title: id of the failure under specific address - ack_id: + title: Id of the failure under specific address + sudo_payload: type: string - format: uint64 - title: ACK id to restore - ack_type: + format: byte + title: Serialized MessageSudoCallback with Packet and Ack(if exists) + error: type: string - title: Acknowledgement type - description: >- + title: >- + Redacted error response of the sudo call. Full error is emitted + as an event + 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 pagination: type: object properties: @@ -66160,12 +68589,17 @@ definitions: repeated Bar results = 1; PageResponse page = 2; } + description: QueryFailuresResponse is response type for the Query/Failures RPC method. neutron.contractmanager.QueryParamsResponse: type: object properties: params: description: params holds all the parameters of this module. type: object + properties: + sudo_call_gas_limit: + type: string + format: uint64 description: QueryParamsResponse is response type for the Query/Params RPC method. neutron.cron.MsgExecuteContract: type: object @@ -66176,6 +68610,13 @@ definitions: msg: type: string title: Msg is json encoded message to be passed to the contract + neutron.cron.MsgUpdateParamsResponse: + type: object + description: |- + MsgUpdateParamsResponse defines the response structure for executing a + MsgUpdateParams message. + + Since: 0.47 neutron.cron.Params: type: object properties: @@ -66313,6 +68754,13 @@ definitions: type: string format: uint64 title: Last execution's block height + neutron.feeburner.MsgUpdateParamsResponse: + type: object + description: |- + MsgUpdateParamsResponse defines the response structure for executing a + MsgUpdateParams message. + + Since: 0.47 neutron.feeburner.Params: type: object properties: @@ -66588,6 +69036,13 @@ definitions: signatures required by gogoproto. title: the packet timeout fee title: Fee defines the ICS29 receive, acknowledgement and timeout fees + neutron.feerefunder.MsgUpdateParamsResponse: + type: object + description: |- + MsgUpdateParamsResponse defines the response structure for executing a + MsgUpdateParams message. + + Since: 0.47 neutron.feerefunder.PacketID: type: object properties: @@ -67183,6 +69638,13 @@ definitions: type: object neutron.interchainqueries.MsgUpdateInterchainQueryResponse: type: object + neutron.interchainqueries.MsgUpdateParamsResponse: + type: object + description: |- + MsgUpdateParamsResponse defines the response structure for executing a + MsgUpdateParams message. + + Since: 0.47 neutron.interchainqueries.Params: type: object properties: @@ -68843,22 +71305,60 @@ definitions: The data could be arbitrary format, providing nessecary data for example neighbouring node hash title: ProofOps is Merkle proof defined by the list of ProofOps - neutron.interchaintxs.Params: + neutron.interchaintxs.v1.MsgRegisterInterchainAccountResponse: + type: object + description: |- + MsgRegisterInterchainAccountResponse is the response type for + MsgRegisterInterchainAccount. + neutron.interchaintxs.v1.MsgSubmitTxResponse: + type: object + properties: + sequence_id: + type: string + format: uint64 + description: channel's sequence_id for outgoing ibc packet. Unique per a channel. + channel: + type: string + title: channel src channel on neutron side transaction was submitted from + title: MsgSubmitTxResponse defines the response for Msg/SubmitTx + neutron.interchaintxs.v1.MsgUpdateParamsResponse: + type: object + description: |- + MsgUpdateParamsResponse defines the response structure for executing a + MsgUpdateParams message. + + Since: 0.47 + neutron.interchaintxs.v1.Params: type: object properties: msg_submit_tx_max_messages: type: string format: uint64 title: Defines maximum amount of messages to be passed in MsgSubmitTx + register_fee: + type: array + items: + type: object + properties: + denom: + type: string + amount: + type: string + 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. + title: Defines a minimum fee required to register interchain account description: Params defines the parameters for the module. - neutron.interchaintxs.QueryInterchainAccountAddressResponse: + neutron.interchaintxs.v1.QueryInterchainAccountAddressResponse: type: object properties: interchain_account_address: type: string title: The corresponding interchain account address on the host chain title: Query response for an interchain account address - neutron.interchaintxs.QueryParamsResponse: + neutron.interchaintxs.v1.QueryParamsResponse: type: object properties: params: @@ -68869,23 +71369,25 @@ definitions: type: string format: uint64 title: Defines maximum amount of messages to be passed in MsgSubmitTx + register_fee: + type: array + items: + type: object + properties: + denom: + type: string + amount: + type: string + 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. + title: Defines a minimum fee required to register interchain account description: QueryParamsResponse is response type for the Query/Params RPC method. - neutron.interchaintxs.v1.MsgRegisterInterchainAccountResponse: - type: object - description: |- - MsgRegisterInterchainAccountResponse is the response type for - MsgRegisterInterchainAccount. - neutron.interchaintxs.v1.MsgSubmitTxResponse: - type: object - properties: - sequence_id: - type: string - format: uint64 - description: channel's sequence_id for outgoing ibc packet. Unique per a channel. - channel: - type: string - title: channel src channel on neutron side trasaction was submitted from - title: MsgSubmitTxResponse defines the response for Msg/SubmitTx ibc.applications.transfer.v1.DenomTrace: type: object properties: @@ -69056,6 +71558,9 @@ definitions: type: object osmosis.tokenfactory.v1beta1.MsgChangeAdminResponse: type: object + description: |- + MsgChangeAdminResponse defines the response structure for an executed + MsgChangeAdmin message. osmosis.tokenfactory.v1beta1.MsgCreateDenomResponse: type: object properties: @@ -69064,8 +71569,29 @@ definitions: title: |- MsgCreateDenomResponse is the return value of MsgCreateDenom It returns the full string of the newly created denom + osmosis.tokenfactory.v1beta1.MsgForceTransferResponse: + type: object osmosis.tokenfactory.v1beta1.MsgMintResponse: type: object + osmosis.tokenfactory.v1beta1.MsgSetBeforeSendHookResponse: + type: object + description: >- + MsgSetBeforeSendHookResponse defines the response structure for an + executed + + MsgSetBeforeSendHook message. + osmosis.tokenfactory.v1beta1.MsgSetDenomMetadataResponse: + type: object + description: |- + MsgSetDenomMetadataResponse defines the response structure for an executed + MsgSetDenomMetadata message. + osmosis.tokenfactory.v1beta1.MsgUpdateParamsResponse: + type: object + description: |- + MsgUpdateParamsResponse defines the response structure for executing a + MsgUpdateParams message. + + Since: 0.47 osmosis.tokenfactory.v1beta1.Params: type: object properties: @@ -69083,15 +71609,35 @@ definitions: NOTE: The amount field is an Int which implements the custom method signatures required by gogoproto. - title: >- - DenomCreationFee is the fee required to create a new denom using the - tokenfactory module + description: >- + DenomCreationFee defines the fee to be charged on the creation of a + new + + denom. The fee is drawn from the MsgCreateDenom's sender account, and + + transferred to the community pool. + denom_creation_gas_consume: + type: string + format: uint64 + description: |- + DenomCreationGasConsume defines the gas cost for creating a new denom. + This is intended as a spam deterrence mechanism. + + See: https://github.com/CosmWasm/token-factory/issues/11 fee_collector_address: type: string title: >- FeeCollectorAddress is the address where fees collected from denom creation are sent to - title: Params holds parameters for the tokenfactory module + description: Params defines the parameters for the tokenfactory module. + osmosis.tokenfactory.v1beta1.QueryBeforeSendHookAddressResponse: + type: object + properties: + contract_addr: + type: string + description: |- + QueryBeforeSendHookAddressResponse defines the response structure for the + DenomBeforeSendHook gRPC query. osmosis.tokenfactory.v1beta1.QueryDenomAuthorityMetadataResponse: type: object properties: @@ -69109,6 +71655,9 @@ definitions: Admin permission, but is planned to be extended to the future. + description: |- + QueryDenomAuthorityMetadataResponse defines the response structure for the + DenomAuthorityMetadata gRPC query. osmosis.tokenfactory.v1beta1.QueryDenomsFromCreatorResponse: type: object properties: @@ -69116,6 +71665,9 @@ definitions: type: array items: type: string + description: |- + QueryDenomsFromCreatorRequest defines the response structure for the + DenomsFromCreator gRPC query. osmosis.tokenfactory.v1beta1.QueryParamsResponse: type: object properties: @@ -69140,23 +71692,61 @@ definitions: method signatures required by gogoproto. - title: >- - DenomCreationFee is the fee required to create a new denom using - the tokenfactory module + description: >- + DenomCreationFee defines the fee to be charged on the creation of + a new + + denom. The fee is drawn from the MsgCreateDenom's sender account, + and + + transferred to the community pool. + denom_creation_gas_consume: + type: string + format: uint64 + description: >- + DenomCreationGasConsume defines the gas cost for creating a new + denom. + + This is intended as a spam deterrence mechanism. + + + See: https://github.com/CosmWasm/token-factory/issues/11 fee_collector_address: type: string title: >- FeeCollectorAddress is the address where fees collected from denom creation are sent to - title: Params holds parameters for the tokenfactory module description: QueryParamsResponse is the response type for the Query/Params RPC method. - pob.builder.v1.MsgAuctionBidResponse: + packetforward.v1.MsgUpdateParamsResponse: + type: object + description: |- + MsgUpdateParamsResponse defines the response structure for executing a + MsgUpdateParams message. + + Since: cosmos-sdk 0.47 + packetforward.v1.Params: + type: object + properties: + fee_percentage: + type: string + description: Params defines the set of packetforward parameters. + packetforward.v1.QueryParamsResponse: + type: object + properties: + params: + description: params defines the parameters of the module. + type: object + properties: + fee_percentage: + type: string + description: QueryParamsResponse is the response type for the Query/Params RPC method. + sdk.auction.v1.MsgAuctionBidResponse: type: object description: MsgAuctionBidResponse defines the Msg/AuctionBid response type. - pob.builder.v1.MsgUpdateParamsResponse: + sdk.auction.v1.MsgUpdateParamsResponse: type: object description: MsgUpdateParamsResponse defines the Msg/UpdateParams response type. - pob.builder.v1.Params: + sdk.auction.v1.Params: type: object properties: max_bundle_size: @@ -69207,8 +71797,8 @@ definitions: block proposer that proposed the block. - description: Params defines the parameters of the x/builder module. - pob.builder.v1.QueryParamsResponse: + description: Params defines the parameters of the x/auction module. + sdk.auction.v1.QueryParamsResponse: type: object properties: params: @@ -69266,19 +71856,3 @@ definitions: proposer that proposed the block. description: QueryParamsResponse is the response type for the Query/Params RPC method. - router.v1.Params: - type: object - properties: - fee_percentage: - type: string - description: Params defines the set of IBC router parameters. - router.v1.QueryParamsResponse: - type: object - properties: - params: - description: params defines the parameters of the module. - type: object - properties: - fee_percentage: - type: string - description: QueryParamsResponse is the response type for the Query/Params RPC method. diff --git a/go.mod b/go.mod index fe521e720..640effb3a 100644 --- a/go.mod +++ b/go.mod @@ -26,6 +26,7 @@ require ( github.com/golang/protobuf v1.5.3 github.com/gorilla/mux v1.8.0 github.com/grpc-ecosystem/grpc-gateway v1.16.0 + github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.1 github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.16.0 github.com/rs/zerolog v1.30.0 @@ -35,16 +36,16 @@ require ( github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.16.0 github.com/stretchr/testify v1.8.4 - google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97 + google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 google.golang.org/grpc v1.59.0 gopkg.in/yaml.v2 v2.4.0 ) require ( - cloud.google.com/go v0.110.8 // indirect - cloud.google.com/go/compute v1.23.0 // indirect + cloud.google.com/go v0.110.9 // indirect + cloud.google.com/go/compute v1.23.2 // indirect cloud.google.com/go/compute/metadata v0.2.3 // indirect - cloud.google.com/go/iam v1.1.2 // indirect + cloud.google.com/go/iam v1.1.4 // indirect cloud.google.com/go/storage v1.30.1 // indirect cosmossdk.io/api v0.3.1 // indirect cosmossdk.io/depinject v1.0.0-alpha.4 // indirect @@ -89,6 +90,7 @@ require ( github.com/felixge/httpsnoop v1.0.2 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect github.com/getsentry/sentry-go v0.23.0 // indirect + github.com/ghodss/yaml v1.0.0 // indirect github.com/go-kit/kit v0.12.0 // indirect github.com/go-kit/log v0.2.1 // indirect github.com/go-logfmt/logfmt v0.6.0 // indirect @@ -98,7 +100,7 @@ require ( github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/btree v1.1.2 // indirect - github.com/google/go-cmp v0.5.9 // indirect + github.com/google/go-cmp v0.6.0 // indirect github.com/google/gofuzz v1.2.0 // indirect github.com/google/orderedcode v0.0.1 // indirect github.com/google/s2a-go v0.1.4 // indirect @@ -168,17 +170,17 @@ require ( go.opencensus.io v0.24.0 // indirect golang.org/x/crypto v0.14.0 // indirect golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb // indirect - golang.org/x/net v0.15.0 // indirect - golang.org/x/oauth2 v0.12.0 // indirect + golang.org/x/net v0.17.0 // indirect + golang.org/x/oauth2 v0.13.0 // indirect golang.org/x/sync v0.3.0 // indirect golang.org/x/sys v0.13.0 // indirect golang.org/x/term v0.13.0 // indirect - golang.org/x/text v0.13.0 // indirect + golang.org/x/text v0.14.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect google.golang.org/api v0.128.0 // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto v0.0.0-20230920204549-e6e6cdab5c13 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13 // indirect + google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405 // indirect google.golang.org/protobuf v1.31.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index 290740da2..e204f40c6 100644 --- a/go.sum +++ b/go.sum @@ -34,8 +34,8 @@ cloud.google.com/go v0.100.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w9 cloud.google.com/go v0.102.0/go.mod h1:oWcCzKlqJ5zgHQt9YsaeTY9KzIvjyy0ArmiBUgpQ+nc= cloud.google.com/go v0.102.1/go.mod h1:XZ77E9qnTEnrgEOvr4xzfdX5TRo7fB4T2F4O6+34hIU= cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA= -cloud.google.com/go v0.110.8 h1:tyNdfIxjzaWctIiLYOTalaLKZ17SI44SKFW26QbOhME= -cloud.google.com/go v0.110.8/go.mod h1:Iz8AkXJf1qmxC3Oxoep8R1T36w8B92yU29PcBhHO5fk= +cloud.google.com/go v0.110.9 h1:e7ITSqGFFk4rbz/JFIqZh3G4VEHguhAL4BQcFlWtU68= +cloud.google.com/go v0.110.9/go.mod h1:rpxevX/0Lqvlbc88b7Sc1SPNdyK1riNBTUU6JXhYNpM= cloud.google.com/go/aiplatform v1.22.0/go.mod h1:ig5Nct50bZlzV6NvKaTwmplLLddFx0YReh9WfTO5jKw= cloud.google.com/go/aiplatform v1.24.0/go.mod h1:67UUvRBKG6GTayHKV8DBv2RtR1t93YRu5B1P3x99mYY= cloud.google.com/go/analytics v0.11.0/go.mod h1:DjEWCu41bVbYcKyvlws9Er60YE4a//bK6mnhWvQeFNI= @@ -73,8 +73,8 @@ cloud.google.com/go/compute v1.6.0/go.mod h1:T29tfhtVbq1wvAPo0E3+7vhgmkOYeXjhFvz cloud.google.com/go/compute v1.6.1/go.mod h1:g85FgpzFvNULZ+S8AYq87axRKuf2Kh7deLqV/jJ3thU= cloud.google.com/go/compute v1.7.0/go.mod h1:435lt8av5oL9P3fv1OEzSbSUe+ybHXGMPQHHZWZxy9U= cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU= -cloud.google.com/go/compute v1.23.0 h1:tP41Zoavr8ptEqaW6j+LQOnyBBhO7OkOMAGrgLopTwY= -cloud.google.com/go/compute v1.23.0/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM= +cloud.google.com/go/compute v1.23.2 h1:nWEMDhgbBkBJjfpVySqU4jgWdc22PLR0o4vEexZHers= +cloud.google.com/go/compute v1.23.2/go.mod h1:JJ0atRC0J/oWYiiVBmsSsrRnh92DhZPG4hFDcR04Rns= cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= cloud.google.com/go/containeranalysis v0.5.1/go.mod h1:1D92jd8gRR/c0fGMlymRgxWD3Qw9C1ff6/T7mLgVL8I= @@ -114,8 +114,8 @@ cloud.google.com/go/gkehub v0.10.0/go.mod h1:UIPwxI0DsrpsVoWpLB0stwKCP+WFVG9+y97 cloud.google.com/go/grafeas v0.2.0/go.mod h1:KhxgtF2hb0P191HlY5besjYm6MqTSTj3LSI+M+ByZHc= cloud.google.com/go/iam v0.3.0/go.mod h1:XzJPvDayI+9zsASAFO68Hk07u3z+f+JrT2xXNdp4bnY= cloud.google.com/go/iam v0.5.0/go.mod h1:wPU9Vt0P4UmCux7mqtRu6jcpPAb74cP1fh50J3QpkUc= -cloud.google.com/go/iam v1.1.2 h1:gacbrBdWcoVmGLozRuStX45YKvJtzIjJdAolzUs1sm4= -cloud.google.com/go/iam v1.1.2/go.mod h1:A5avdyVL2tCppe4unb0951eI9jreack+RJ0/d+KUZOU= +cloud.google.com/go/iam v1.1.4 h1:K6n/GZHFTtEoKT5aUG3l9diPi0VduZNQ1PfdnpkkIFk= +cloud.google.com/go/iam v1.1.4/go.mod h1:l/rg8l1AaA+VFMho/HYx2Vv6xinPSLMF8qfhRPIZ0L8= cloud.google.com/go/language v1.4.0/go.mod h1:F9dRpNFQmJbkaop6g0JhSBXCNlO90e1KWx5iDdxbWic= cloud.google.com/go/language v1.6.0/go.mod h1:6dJ8t3B+lUYfStgls25GusK04NLh3eDLQnWM3mdEbhI= cloud.google.com/go/lifesciences v0.5.0/go.mod h1:3oIKy8ycWGPUyZDR/8RNnTOYevhaMLqh5vLUXs9zvT8= @@ -504,6 +504,7 @@ github.com/getkin/kin-openapi v0.53.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW github.com/getkin/kin-openapi v0.61.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4= github.com/getsentry/sentry-go v0.23.0 h1:dn+QRCeJv4pPt9OjVXiMcGIBIefaTJPw/h0bZWO05nE= github.com/getsentry/sentry-go v0.23.0/go.mod h1:lc76E2QywIyW8WuBnwl8Lc4bkmQH4+w1gwTf25trprY= +github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= @@ -624,8 +625,9 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.1.1-0.20200604201612-c04b05f3adfa/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= @@ -704,6 +706,8 @@ github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgf github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.1 h1:6UKoz5ujsI55KNpsJH3UwCq3T8kKbZwNZBNPuTTje8U= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.1/go.mod h1:YvJ2f6MplWDhfxiUC3KpyTy76kYUZA4W3pTv/wdKQ9Y= github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c h1:6rhixN/i8ZofjG1Y75iExal34USq5p+wiN1tpie8IrU= github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c/go.mod h1:NMPJylDgVpX0MLRlPy15sqSwOFv/U1GZ2m21JhFfek0= github.com/gtank/merlin v0.1.1-0.20191105220539-8318aed1a79f/go.mod h1:T86dnYJhcGOh5BjZFCJWTDeTK7XW8uE+E21Cy/bIQ+s= @@ -1348,8 +1352,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= -golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8= -golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= +golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= +golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1375,8 +1379,8 @@ golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094/go.mod h1:h4gKUeWbJ4rQPri golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= golang.org/x/oauth2 v0.1.0/go.mod h1:G9FE4dLTsbXUu90h/Pf85g4w1D+SSAgR+q46nJZ8M4A= -golang.org/x/oauth2 v0.12.0 h1:smVPGxink+n1ZI5pkQa8y6fZT0RW0MgCO5bFpepy4B4= -golang.org/x/oauth2 v0.12.0/go.mod h1:A74bZ3aGXgCY0qaIC9Ahg6Lglin4AMAco8cIv9baba4= +golang.org/x/oauth2 v0.13.0 h1:jDDenyj+WgFtmV3zYVoi8aE2BwtXFLWOA67ZfNWftiY= +golang.org/x/oauth2 v0.13.0/go.mod h1:/JMhi4ZRXAf4HG9LiNmxvk+45+96RUlVThiH8FzNBn0= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -1520,8 +1524,8 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= -golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -1779,12 +1783,12 @@ google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqw google.golang.org/genproto v0.0.0-20221014173430-6e2ab493f96b/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221025140454-527a21cfbd71/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s= -google.golang.org/genproto v0.0.0-20230920204549-e6e6cdab5c13 h1:vlzZttNJGVqTsRFU9AmdnrcO1Znh8Ew9kCD//yjigk0= -google.golang.org/genproto v0.0.0-20230920204549-e6e6cdab5c13/go.mod h1:CCviP9RmpZ1mxVr8MUjCnSiY09IbAXZxhLE6EhHIdPU= -google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97 h1:W18sezcAYs+3tDZX4F80yctqa12jcP1PUS2gQu1zTPU= -google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97/go.mod h1:iargEX0SFPm3xcfMI0d1domjg0ZF4Aa0p2awqyxhvF0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13 h1:N3bU/SQDCDyD6R528GJ/PwW9KjYcJA3dgyH+MovAkIM= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13/go.mod h1:KSqppvjFjtoCI+KGd4PELB0qLNxdJHRGqRI09mB6pQA= +google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405 h1:I6WNifs6pF9tNdSob2W24JtyxIYjzFB9qDlpUC76q+U= +google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405/go.mod h1:3WDQMjmJk36UQhjQ89emUzb1mdaHcPeeAh4SCBKznB4= +google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 h1:JpwMPBpFN3uKhdaekDpiNlImDdkUAyiJ6ez/uxGaUSo= +google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:0xJLfVdJqpAPl8tDg1ujOCGzx6LFLttXT5NhllGOXY4= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405 h1:AB/lmRny7e2pLhFEYIbl5qkDAUt2h0ZRO4wGPhZf+ik= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405/go.mod h1:67X1fPuzjcrkymZzZV1vvkFeTn2Rvc6lYF9MYFGCcwE= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= diff --git a/proto/neutron/interchaintxs/v1/genesis.proto b/proto/neutron/interchaintxs/v1/genesis.proto index 0376f482d..bff673af1 100644 --- a/proto/neutron/interchaintxs/v1/genesis.proto +++ b/proto/neutron/interchaintxs/v1/genesis.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -package neutron.interchaintxs; +package neutron.interchaintxs.v1; import "gogoproto/gogo.proto"; import "neutron/interchaintxs/v1/params.proto"; diff --git a/proto/neutron/interchaintxs/v1/params.proto b/proto/neutron/interchaintxs/v1/params.proto index 734e7cb2e..1a720e961 100644 --- a/proto/neutron/interchaintxs/v1/params.proto +++ b/proto/neutron/interchaintxs/v1/params.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -package neutron.interchaintxs; +package neutron.interchaintxs.v1; import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.proto"; diff --git a/proto/neutron/interchaintxs/v1/query.proto b/proto/neutron/interchaintxs/v1/query.proto index 9af74de0c..285aacdf7 100644 --- a/proto/neutron/interchaintxs/v1/query.proto +++ b/proto/neutron/interchaintxs/v1/query.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -package neutron.interchaintxs; +package neutron.interchaintxs.v1; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; diff --git a/x/interchaintxs/types/genesis.pb.go b/x/interchaintxs/types/genesis.pb.go index dc6f22312..e6a20056e 100644 --- a/x/interchaintxs/types/genesis.pb.go +++ b/x/interchaintxs/types/genesis.pb.go @@ -69,7 +69,7 @@ func (m *GenesisState) GetParams() Params { } func init() { - proto.RegisterType((*GenesisState)(nil), "neutron.interchaintxs.GenesisState") + proto.RegisterType((*GenesisState)(nil), "neutron.interchaintxs.v1.GenesisState") } func init() { @@ -77,20 +77,20 @@ func init() { } var fileDescriptor_d16558b72a810826 = []byte{ - // 201 bytes of a gzipped FileDescriptorProto + // 204 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0xcb, 0x4b, 0x2d, 0x2d, 0x29, 0xca, 0xcf, 0xd3, 0xcf, 0xcc, 0x2b, 0x49, 0x2d, 0x4a, 0xce, 0x48, 0xcc, 0xcc, 0x2b, 0xa9, 0x28, 0xd6, 0x2f, 0x33, 0xd4, 0x4f, 0x4f, 0xcd, 0x4b, 0x2d, 0xce, 0x2c, 0xd6, 0x2b, 0x28, 0xca, - 0x2f, 0xc9, 0x17, 0x12, 0x85, 0xaa, 0xd3, 0x43, 0x51, 0x27, 0x25, 0x92, 0x9e, 0x9f, 0x9e, 0x0f, - 0x56, 0xa1, 0x0f, 0x62, 0x41, 0x14, 0x4b, 0xa9, 0xe2, 0x34, 0xb4, 0x20, 0xb1, 0x28, 0x31, 0x17, - 0x6a, 0xa6, 0x92, 0x37, 0x17, 0x8f, 0x3b, 0xc4, 0x92, 0xe0, 0x92, 0xc4, 0x92, 0x54, 0x21, 0x6b, - 0x2e, 0x36, 0x88, 0xbc, 0x04, 0xa3, 0x02, 0xa3, 0x06, 0xb7, 0x91, 0xac, 0x1e, 0x56, 0x4b, 0xf5, - 0x02, 0xc0, 0x8a, 0x9c, 0x58, 0x4e, 0xdc, 0x93, 0x67, 0x08, 0x82, 0x6a, 0x71, 0xf2, 0x3b, 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, 0x93, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, - 0xbd, 0xe4, 0xfc, 0x5c, 0x7d, 0xa8, 0x81, 0xba, 0xf9, 0x45, 0xe9, 0x30, 0xb6, 0x7e, 0x05, 0x9a, - 0x33, 0x4b, 0x2a, 0x0b, 0x52, 0x8b, 0x93, 0xd8, 0xc0, 0x6e, 0x34, 0x06, 0x04, 0x00, 0x00, 0xff, - 0xff, 0xa2, 0x39, 0x02, 0x0f, 0x21, 0x01, 0x00, 0x00, + 0x2f, 0xc9, 0x17, 0x92, 0x80, 0xaa, 0xd3, 0x43, 0x51, 0xa7, 0x57, 0x66, 0x28, 0x25, 0x92, 0x9e, + 0x9f, 0x9e, 0x0f, 0x56, 0xa4, 0x0f, 0x62, 0x41, 0xd4, 0x4b, 0xa9, 0xe2, 0x34, 0xb7, 0x20, 0xb1, + 0x28, 0x31, 0x17, 0x6a, 0xac, 0x92, 0x1f, 0x17, 0x8f, 0x3b, 0xc4, 0x9e, 0xe0, 0x92, 0xc4, 0x92, + 0x54, 0x21, 0x3b, 0x2e, 0x36, 0x88, 0xbc, 0x04, 0xa3, 0x02, 0xa3, 0x06, 0xb7, 0x91, 0x82, 0x1e, + 0x2e, 0x7b, 0xf5, 0x02, 0xc0, 0xea, 0x9c, 0x58, 0x4e, 0xdc, 0x93, 0x67, 0x08, 0x82, 0xea, 0x72, + 0xf2, 0x3b, 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, 0x93, 0xf4, 0xcc, 0x92, + 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0x7d, 0xa8, 0x99, 0xba, 0xf9, 0x45, 0xe9, 0x30, 0xb6, + 0x7e, 0x05, 0x9a, 0x4b, 0x4b, 0x2a, 0x0b, 0x52, 0x8b, 0x93, 0xd8, 0xc0, 0xce, 0x34, 0x06, 0x04, + 0x00, 0x00, 0xff, 0xff, 0xc0, 0xc8, 0x84, 0x5c, 0x27, 0x01, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/interchaintxs/types/params.pb.go b/x/interchaintxs/types/params.pb.go index 00f396fe7..844def56c 100644 --- a/x/interchaintxs/types/params.pb.go +++ b/x/interchaintxs/types/params.pb.go @@ -79,7 +79,7 @@ func (m *Params) GetRegisterFee() []types.Coin { } func init() { - proto.RegisterType((*Params)(nil), "neutron.interchaintxs.Params") + proto.RegisterType((*Params)(nil), "neutron.interchaintxs.v1.Params") } func init() { @@ -87,25 +87,25 @@ func init() { } var fileDescriptor_52b0ced89d3fa9c6 = []byte{ - // 285 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x90, 0x31, 0x4b, 0x03, 0x31, - 0x18, 0x86, 0x2f, 0x5a, 0x3a, 0x5c, 0x9d, 0x8a, 0x4a, 0xed, 0x90, 0x16, 0x41, 0xe8, 0x62, 0x42, - 0xd5, 0xa9, 0x63, 0x05, 0xb7, 0x8a, 0x54, 0x27, 0x97, 0x23, 0x77, 0x7c, 0xa6, 0x19, 0x92, 0x1c, - 0xf9, 0x72, 0x25, 0xfe, 0x09, 0x71, 0x74, 0xf4, 0xe7, 0x74, 0xec, 0xe8, 0x24, 0x72, 0xf7, 0x47, - 0xa4, 0x77, 0xd7, 0x41, 0xb7, 0x17, 0xde, 0x27, 0x79, 0xf8, 0xde, 0xf8, 0xc2, 0x40, 0xe1, 0x9d, - 0x35, 0x5c, 0x19, 0x0f, 0x2e, 0x5b, 0x09, 0x65, 0x7c, 0x40, 0xbe, 0x9e, 0xf2, 0x5c, 0x38, 0xa1, - 0x91, 0xe5, 0xce, 0x7a, 0xdb, 0x3f, 0x69, 0x31, 0xf6, 0x07, 0x1b, 0x1e, 0x4b, 0x2b, 0x6d, 0x4d, - 0xf0, 0x5d, 0x6a, 0xe0, 0x21, 0xcd, 0x2c, 0x6a, 0x8b, 0x3c, 0x15, 0x08, 0x7c, 0x3d, 0x4d, 0xc1, - 0x8b, 0x29, 0xcf, 0xac, 0x32, 0x4d, 0x7f, 0xfe, 0x46, 0xe2, 0xee, 0x43, 0xfd, 0x7b, 0x7f, 0x16, - 0x0f, 0x35, 0xca, 0x04, 0x8b, 0x54, 0x2b, 0x9f, 0xf8, 0x90, 0x68, 0x11, 0x12, 0x0d, 0x88, 0x42, - 0x02, 0x0e, 0xc8, 0x98, 0x4c, 0x3a, 0xcb, 0x53, 0x8d, 0xf2, 0xb1, 0x06, 0x9e, 0xc2, 0x42, 0x84, - 0x45, 0xdb, 0xf6, 0xe7, 0xf1, 0x91, 0x03, 0xa9, 0xd0, 0x83, 0x4b, 0x5e, 0x00, 0x06, 0x07, 0xe3, - 0xc3, 0x49, 0xef, 0xea, 0x8c, 0x35, 0x76, 0xb6, 0xb3, 0xb3, 0xd6, 0xce, 0x6e, 0xad, 0x32, 0xf3, - 0xce, 0xe6, 0x7b, 0x14, 0x2d, 0x7b, 0xfb, 0x47, 0x77, 0x00, 0xb3, 0xce, 0xc7, 0xe7, 0x28, 0x9a, - 0xdf, 0x6f, 0x4a, 0x4a, 0xb6, 0x25, 0x25, 0x3f, 0x25, 0x25, 0xef, 0x15, 0x8d, 0xb6, 0x15, 0x8d, - 0xbe, 0x2a, 0x1a, 0x3d, 0xdf, 0x48, 0xe5, 0x57, 0x45, 0xca, 0x32, 0xab, 0x79, 0x3b, 0xc1, 0xa5, - 0x75, 0x72, 0x9f, 0x79, 0xf8, 0xb7, 0x9b, 0x7f, 0xcd, 0x01, 0xd3, 0x6e, 0x7d, 0xe7, 0xf5, 0x6f, - 0x00, 0x00, 0x00, 0xff, 0xff, 0x81, 0x7b, 0xd6, 0x7d, 0x5d, 0x01, 0x00, 0x00, + // 288 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x90, 0xb1, 0x4a, 0x33, 0x41, + 0x14, 0x85, 0x77, 0xfe, 0x3f, 0xa4, 0xd8, 0x58, 0x05, 0x91, 0x98, 0x62, 0x12, 0x04, 0x21, 0x8d, + 0x33, 0xac, 0x5a, 0xa5, 0x8c, 0x60, 0x17, 0x91, 0x68, 0x65, 0xb3, 0xcc, 0x2e, 0xd7, 0xc9, 0x14, + 0x33, 0x13, 0xe6, 0xce, 0x2e, 0xe3, 0x4b, 0x88, 0xa5, 0xa5, 0x8f, 0x93, 0x32, 0xa5, 0x95, 0xc8, + 0xee, 0x8b, 0x48, 0x76, 0x37, 0x85, 0x76, 0x07, 0xce, 0x77, 0xf9, 0xb8, 0x27, 0x3e, 0x37, 0x50, + 0x78, 0x67, 0x0d, 0x57, 0xc6, 0x83, 0xcb, 0xd7, 0x42, 0x19, 0x1f, 0x90, 0x97, 0x09, 0xdf, 0x08, + 0x27, 0x34, 0xb2, 0x8d, 0xb3, 0xde, 0x0e, 0x47, 0x1d, 0xc6, 0x7e, 0x61, 0xac, 0x4c, 0xc6, 0xc7, + 0xd2, 0x4a, 0xdb, 0x40, 0x7c, 0x9f, 0x5a, 0x7e, 0x4c, 0x73, 0x8b, 0xda, 0x22, 0xcf, 0x04, 0x02, + 0x2f, 0x93, 0x0c, 0xbc, 0x48, 0x78, 0x6e, 0x95, 0x69, 0xfb, 0xb3, 0x57, 0x12, 0xf7, 0xef, 0x1b, + 0xc1, 0x70, 0x1e, 0x8f, 0x35, 0xca, 0x14, 0x8b, 0x4c, 0x2b, 0x9f, 0xfa, 0x90, 0x6a, 0x11, 0x52, + 0x0d, 0x88, 0x42, 0x02, 0x8e, 0xc8, 0x94, 0xcc, 0x7a, 0xab, 0x13, 0x8d, 0xf2, 0xa1, 0x01, 0x1e, + 0xc3, 0x52, 0x84, 0x65, 0xd7, 0x0e, 0x17, 0xf1, 0x91, 0x03, 0xa9, 0xd0, 0x83, 0x4b, 0x9f, 0x01, + 0x46, 0xff, 0xa6, 0xff, 0x67, 0x83, 0xcb, 0x53, 0xd6, 0xda, 0xd9, 0xde, 0xce, 0x3a, 0x3b, 0xbb, + 0xb1, 0xca, 0x2c, 0x7a, 0xdb, 0xaf, 0x49, 0xb4, 0x1a, 0x1c, 0x8e, 0x6e, 0x01, 0xe6, 0xbd, 0xf7, + 0x8f, 0x49, 0xb4, 0xb8, 0xdb, 0x56, 0x94, 0xec, 0x2a, 0x4a, 0xbe, 0x2b, 0x4a, 0xde, 0x6a, 0x1a, + 0xed, 0x6a, 0x1a, 0x7d, 0xd6, 0x34, 0x7a, 0xba, 0x96, 0xca, 0xaf, 0x8b, 0x8c, 0xe5, 0x56, 0xf3, + 0x6e, 0x85, 0x0b, 0xeb, 0xe4, 0x21, 0xf3, 0xf0, 0x67, 0x3a, 0xff, 0xb2, 0x01, 0xcc, 0xfa, 0xcd, + 0x9f, 0x57, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xc1, 0xcc, 0x9a, 0x6c, 0x60, 0x01, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { diff --git a/x/interchaintxs/types/query.pb.go b/x/interchaintxs/types/query.pb.go index 34432afb6..6d7ea05e7 100644 --- a/x/interchaintxs/types/query.pb.go +++ b/x/interchaintxs/types/query.pb.go @@ -205,10 +205,10 @@ func (m *QueryInterchainAccountAddressResponse) GetInterchainAccountAddress() st } func init() { - proto.RegisterType((*QueryParamsRequest)(nil), "neutron.interchaintxs.QueryParamsRequest") - proto.RegisterType((*QueryParamsResponse)(nil), "neutron.interchaintxs.QueryParamsResponse") - proto.RegisterType((*QueryInterchainAccountAddressRequest)(nil), "neutron.interchaintxs.QueryInterchainAccountAddressRequest") - proto.RegisterType((*QueryInterchainAccountAddressResponse)(nil), "neutron.interchaintxs.QueryInterchainAccountAddressResponse") + proto.RegisterType((*QueryParamsRequest)(nil), "neutron.interchaintxs.v1.QueryParamsRequest") + proto.RegisterType((*QueryParamsResponse)(nil), "neutron.interchaintxs.v1.QueryParamsResponse") + proto.RegisterType((*QueryInterchainAccountAddressRequest)(nil), "neutron.interchaintxs.v1.QueryInterchainAccountAddressRequest") + proto.RegisterType((*QueryInterchainAccountAddressResponse)(nil), "neutron.interchaintxs.v1.QueryInterchainAccountAddressResponse") } func init() { @@ -216,37 +216,38 @@ func init() { } var fileDescriptor_6130c5f6c54e2428 = []byte{ - // 479 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x93, 0x31, 0x6f, 0xd3, 0x40, - 0x14, 0xc7, 0xed, 0x14, 0x22, 0x38, 0x60, 0xb9, 0xb6, 0x52, 0x64, 0x51, 0x07, 0x99, 0x46, 0x82, - 0x4a, 0xf8, 0x94, 0xc0, 0x44, 0xbb, 0xb4, 0x5b, 0x16, 0x04, 0x19, 0x59, 0xa2, 0x8b, 0x7d, 0x72, - 0x4f, 0x90, 0x7b, 0xce, 0xdd, 0xb9, 0xb4, 0x8a, 0xb2, 0x30, 0xa0, 0x8e, 0x48, 0x8c, 0x2c, 0xfd, - 0x04, 0x7c, 0x8e, 0x8e, 0x95, 0x58, 0x98, 0x10, 0x4a, 0x18, 0xf8, 0x18, 0xc8, 0x77, 0xd7, 0x56, - 0x2e, 0x31, 0x45, 0x6c, 0xd1, 0xcb, 0xff, 0xfd, 0xff, 0xbf, 0x7b, 0xef, 0x19, 0x6d, 0x0a, 0x56, - 0x68, 0x09, 0x82, 0x70, 0xa1, 0x99, 0x4c, 0xf6, 0x29, 0x17, 0xfa, 0x50, 0x91, 0x83, 0x2e, 0x99, - 0x14, 0x4c, 0x1e, 0xc5, 0xb9, 0x04, 0x0d, 0x78, 0xdd, 0xa9, 0xe2, 0x8a, 0x2a, 0x58, 0xcb, 0x20, - 0x03, 0xa3, 0x20, 0xe5, 0x2f, 0x2b, 0x0e, 0xee, 0x67, 0x00, 0xd9, 0x5b, 0x46, 0x68, 0xce, 0x09, - 0x15, 0x02, 0x34, 0xd5, 0x1c, 0x84, 0x72, 0xff, 0x6e, 0x25, 0xa0, 0xc6, 0xa0, 0xc8, 0x88, 0x2a, - 0x66, 0x33, 0xc8, 0x41, 0x77, 0xc4, 0x34, 0xed, 0x92, 0x9c, 0x66, 0x5c, 0x18, 0xb1, 0xd3, 0x76, - 0x6a, 0xe1, 0x72, 0x2a, 0xe9, 0xd8, 0x59, 0x46, 0x6b, 0x08, 0xbf, 0x2a, 0x8d, 0x5e, 0x9a, 0xe2, - 0x80, 0x4d, 0x0a, 0xa6, 0x74, 0x34, 0x40, 0xab, 0x95, 0xaa, 0xca, 0x41, 0x28, 0x86, 0xb7, 0x51, - 0xd3, 0x36, 0xb7, 0xfc, 0x07, 0xfe, 0xa3, 0x3b, 0xbd, 0x8d, 0x78, 0xe9, 0xdb, 0x62, 0xdb, 0xb6, - 0x77, 0xe3, 0xf4, 0x7b, 0xdb, 0x1b, 0xb8, 0x96, 0xe8, 0x8b, 0x8f, 0x36, 0x8d, 0x69, 0xff, 0x42, - 0xbb, 0x9b, 0x24, 0x50, 0x08, 0xbd, 0x9b, 0xa6, 0x92, 0xa9, 0xf3, 0x70, 0xfc, 0x10, 0xdd, 0x83, - 0x77, 0x82, 0xc9, 0x21, 0xb5, 0x75, 0x13, 0x76, 0x7b, 0x70, 0xd7, 0x14, 0x9d, 0x16, 0xf7, 0xd0, - 0xfa, 0x65, 0xe6, 0x90, 0x5a, 0xa3, 0x21, 0x4f, 0x5b, 0x0d, 0x23, 0x5e, 0xe5, 0x57, 0x43, 0xfa, - 0x69, 0x69, 0x9c, 0x80, 0x10, 0x2c, 0x29, 0xc7, 0x54, 0x6a, 0x57, 0xac, 0xf1, 0x65, 0xb1, 0x9f, - 0x3e, 0xbf, 0x75, 0x7c, 0xd2, 0xf6, 0x7e, 0x9d, 0xb4, 0xbd, 0x88, 0xa1, 0xce, 0x35, 0xbc, 0x6e, - 0x2c, 0x3b, 0x28, 0x58, 0xc2, 0x52, 0xa5, 0x6f, 0xf1, 0x1a, 0x97, 0xde, 0xe7, 0x15, 0x74, 0xd3, - 0xe4, 0xe0, 0x0f, 0x3e, 0x6a, 0xda, 0xd1, 0xe1, 0xc7, 0x35, 0x93, 0xfd, 0x73, 0x57, 0xc1, 0xd6, - 0xbf, 0x48, 0x2d, 0x69, 0xd4, 0x79, 0xff, 0xf5, 0xe7, 0xa7, 0x46, 0x1b, 0x6f, 0x90, 0xe5, 0xd7, - 0x61, 0x57, 0x85, 0x8f, 0x1b, 0xa8, 0x55, 0xf7, 0x6a, 0xbc, 0xfd, 0xb7, 0xbc, 0x6b, 0x76, 0x1b, - 0xec, 0xfc, 0x5f, 0xb3, 0xc3, 0x9f, 0x18, 0xfc, 0x37, 0x98, 0xd7, 0xe0, 0x4f, 0x2b, 0x77, 0x33, - 0x23, 0xd3, 0xa5, 0x27, 0x32, 0x23, 0xd3, 0xca, 0x19, 0xcc, 0x48, 0xfd, 0xf6, 0xf6, 0x5e, 0x9c, - 0xce, 0x43, 0xff, 0x6c, 0x1e, 0xfa, 0x3f, 0xe6, 0xa1, 0xff, 0x71, 0x11, 0x7a, 0x67, 0x8b, 0xd0, - 0xfb, 0xb6, 0x08, 0xbd, 0xd7, 0xcf, 0x32, 0xae, 0xf7, 0x8b, 0x51, 0x9c, 0xc0, 0xf8, 0x1c, 0xe7, - 0x09, 0xc8, 0xec, 0x02, 0xed, 0xf0, 0x0a, 0x9c, 0x3e, 0xca, 0x99, 0x1a, 0x35, 0xcd, 0x67, 0xf7, - 0xf4, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0x82, 0x97, 0x0f, 0x98, 0x3c, 0x04, 0x00, 0x00, + // 482 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x53, 0x4f, 0x6b, 0x13, 0x41, + 0x14, 0xdf, 0x4d, 0x35, 0xe8, 0xa8, 0x97, 0x69, 0x85, 0x65, 0xd1, 0x4d, 0x59, 0x1b, 0x10, 0xb1, + 0x3b, 0x24, 0x7a, 0x12, 0xa9, 0xb4, 0xb7, 0x5c, 0x44, 0x03, 0x5e, 0xbc, 0x84, 0xc9, 0xee, 0xb0, + 0x1d, 0x34, 0xf3, 0x36, 0x3b, 0xb3, 0xb1, 0x25, 0xe4, 0xe2, 0xc9, 0x83, 0x88, 0xe0, 0x17, 0xe8, + 0xcd, 0x9b, 0x9f, 0xa3, 0xc7, 0x82, 0x17, 0x4f, 0x22, 0x89, 0x07, 0x3f, 0x86, 0xec, 0xcc, 0xb4, + 0x65, 0x6b, 0x96, 0x48, 0x6f, 0xcb, 0xdb, 0xdf, 0xfb, 0xfd, 0x79, 0xef, 0x0d, 0xda, 0x12, 0xac, + 0x50, 0x39, 0x08, 0xc2, 0x85, 0x62, 0x79, 0xbc, 0x4f, 0xb9, 0x50, 0x07, 0x92, 0x4c, 0x3a, 0x64, + 0x5c, 0xb0, 0xfc, 0x30, 0xca, 0x72, 0x50, 0x80, 0x3d, 0x8b, 0x8a, 0x2a, 0xa8, 0x68, 0xd2, 0xf1, + 0x37, 0x52, 0x48, 0x41, 0x83, 0x48, 0xf9, 0x65, 0xf0, 0xfe, 0x9d, 0x14, 0x20, 0x7d, 0xcb, 0x08, + 0xcd, 0x38, 0xa1, 0x42, 0x80, 0xa2, 0x8a, 0x83, 0x90, 0xf6, 0xef, 0x83, 0x18, 0xe4, 0x08, 0x24, + 0x19, 0x52, 0xc9, 0x8c, 0x0c, 0x99, 0x74, 0x86, 0x4c, 0xd1, 0x0e, 0xc9, 0x68, 0xca, 0x85, 0x06, + 0x5b, 0x6c, 0xbb, 0xd6, 0x5f, 0x46, 0x73, 0x3a, 0xb2, 0x94, 0xe1, 0x06, 0xc2, 0x2f, 0x4b, 0xa2, + 0x17, 0xba, 0xd8, 0x67, 0xe3, 0x82, 0x49, 0x15, 0xbe, 0x42, 0xeb, 0x95, 0xaa, 0xcc, 0x40, 0x48, + 0x86, 0x77, 0x50, 0xd3, 0x34, 0x7b, 0xee, 0xa6, 0x7b, 0xff, 0x46, 0x77, 0x33, 0xaa, 0x8b, 0x17, + 0x99, 0xce, 0xbd, 0x2b, 0xc7, 0x3f, 0x5b, 0x4e, 0xdf, 0x76, 0x85, 0xdf, 0x5c, 0xb4, 0xa5, 0x79, + 0x7b, 0x67, 0xf0, 0xdd, 0x38, 0x86, 0x42, 0xa8, 0xdd, 0x24, 0xc9, 0x99, 0x3c, 0xd5, 0xc7, 0xf7, + 0xd0, 0x2d, 0x78, 0x27, 0x58, 0x3e, 0xa0, 0xa6, 0xae, 0xf5, 0xae, 0xf7, 0x6f, 0xea, 0xa2, 0xc5, + 0xe2, 0x2e, 0xba, 0x7d, 0x2e, 0x3b, 0xa0, 0x86, 0x68, 0xc0, 0x13, 0xaf, 0xa1, 0xc1, 0xeb, 0xfc, + 0xa2, 0x48, 0x2f, 0x29, 0x89, 0x63, 0x10, 0x82, 0xc5, 0xe5, 0xa4, 0x4a, 0xec, 0x9a, 0x21, 0x3e, + 0x2f, 0xf6, 0x92, 0x27, 0xd7, 0x3e, 0x1c, 0xb5, 0x9c, 0x3f, 0x47, 0x2d, 0x27, 0x64, 0xa8, 0xbd, + 0xc2, 0xaf, 0x9d, 0xcc, 0x53, 0xe4, 0x2f, 0xf1, 0x52, 0x75, 0xef, 0xf1, 0x1a, 0x96, 0xee, 0xd7, + 0x35, 0x74, 0x55, 0xeb, 0xe0, 0x8f, 0x2e, 0x6a, 0x9a, 0xd1, 0xe1, 0x87, 0xf5, 0xc3, 0xfd, 0x77, + 0x63, 0xfe, 0xf6, 0x7f, 0xa2, 0x8d, 0xdf, 0xb0, 0xfd, 0xfe, 0xfb, 0xef, 0x2f, 0x8d, 0x16, 0xbe, + 0x4b, 0x96, 0x9f, 0x89, 0x59, 0x18, 0xfe, 0xd4, 0x40, 0x5e, 0x5d, 0x76, 0xbc, 0xb3, 0x42, 0x72, + 0xc5, 0x92, 0xfd, 0x67, 0x97, 0xee, 0xb7, 0x21, 0xc6, 0x3a, 0xc4, 0x1b, 0xcc, 0x6b, 0x42, 0x4c, + 0x2b, 0x37, 0x34, 0x23, 0xd3, 0xa5, 0xe7, 0x32, 0x23, 0xd3, 0xca, 0x49, 0xcc, 0x48, 0xfd, 0x26, + 0xf7, 0x9e, 0x1f, 0xcf, 0x03, 0xf7, 0x64, 0x1e, 0xb8, 0xbf, 0xe6, 0x81, 0xfb, 0x79, 0x11, 0x38, + 0x27, 0x8b, 0xc0, 0xf9, 0xb1, 0x08, 0x9c, 0xd7, 0x8f, 0x53, 0xae, 0xf6, 0x8b, 0x61, 0x14, 0xc3, + 0xe8, 0xd4, 0xce, 0x36, 0xe4, 0xe9, 0x99, 0xb5, 0x83, 0x0b, 0xe6, 0xd4, 0x61, 0xc6, 0xe4, 0xb0, + 0xa9, 0x5f, 0xe1, 0xa3, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xad, 0xfd, 0x25, 0x21, 0x4e, 0x04, + 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -276,7 +277,7 @@ func NewQueryClient(cc grpc1.ClientConn) QueryClient { func (c *queryClient) Params(ctx context.Context, in *QueryParamsRequest, opts ...grpc.CallOption) (*QueryParamsResponse, error) { out := new(QueryParamsResponse) - err := c.cc.Invoke(ctx, "/neutron.interchaintxs.Query/Params", in, out, opts...) + err := c.cc.Invoke(ctx, "/neutron.interchaintxs.v1.Query/Params", in, out, opts...) if err != nil { return nil, err } @@ -285,7 +286,7 @@ func (c *queryClient) Params(ctx context.Context, in *QueryParamsRequest, opts . func (c *queryClient) InterchainAccountAddress(ctx context.Context, in *QueryInterchainAccountAddressRequest, opts ...grpc.CallOption) (*QueryInterchainAccountAddressResponse, error) { out := new(QueryInterchainAccountAddressResponse) - err := c.cc.Invoke(ctx, "/neutron.interchaintxs.Query/InterchainAccountAddress", in, out, opts...) + err := c.cc.Invoke(ctx, "/neutron.interchaintxs.v1.Query/InterchainAccountAddress", in, out, opts...) if err != nil { return nil, err } @@ -324,7 +325,7 @@ func _Query_Params_Handler(srv interface{}, ctx context.Context, dec func(interf } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/neutron.interchaintxs.Query/Params", + FullMethod: "/neutron.interchaintxs.v1.Query/Params", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).Params(ctx, req.(*QueryParamsRequest)) @@ -342,7 +343,7 @@ func _Query_InterchainAccountAddress_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/neutron.interchaintxs.Query/InterchainAccountAddress", + FullMethod: "/neutron.interchaintxs.v1.Query/InterchainAccountAddress", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).InterchainAccountAddress(ctx, req.(*QueryInterchainAccountAddressRequest)) @@ -351,7 +352,7 @@ func _Query_InterchainAccountAddress_Handler(srv interface{}, ctx context.Contex } var _Query_serviceDesc = grpc.ServiceDesc{ - ServiceName: "neutron.interchaintxs.Query", + ServiceName: "neutron.interchaintxs.v1.Query", HandlerType: (*QueryServer)(nil), Methods: []grpc.MethodDesc{ { diff --git a/x/interchaintxs/types/tx.pb.go b/x/interchaintxs/types/tx.pb.go index 8a204d154..89d6f5d02 100644 --- a/x/interchaintxs/types/tx.pb.go +++ b/x/interchaintxs/types/tx.pb.go @@ -330,58 +330,58 @@ func init() { func init() { proto.RegisterFile("neutron/interchaintxs/v1/tx.proto", fileDescriptor_50f087790e59c806) } var fileDescriptor_50f087790e59c806 = []byte{ - // 803 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0xbf, 0x6f, 0x1a, 0x4b, - 0x10, 0xe6, 0x80, 0xe7, 0x1f, 0x0b, 0x4f, 0x4f, 0xef, 0x8c, 0xe5, 0x03, 0xd9, 0x80, 0xef, 0x3d, - 0x47, 0xc4, 0x12, 0x77, 0x86, 0x44, 0x2e, 0x2c, 0x25, 0x8a, 0x89, 0x64, 0x89, 0x82, 0xc8, 0x3a, - 0x3b, 0x4d, 0x1a, 0xb4, 0xdc, 0x2d, 0xc7, 0x29, 0xdc, 0x2e, 0xb9, 0xdd, 0xb3, 0xa0, 0x4d, 0x15, - 0xa5, 0x4a, 0x93, 0x32, 0x92, 0xcb, 0x28, 0x95, 0x8b, 0xb4, 0xe9, 0x5d, 0x5a, 0xa9, 0x52, 0x39, - 0x91, 0x5d, 0x38, 0x5d, 0x24, 0xff, 0x05, 0xd1, 0xed, 0xed, 0x99, 0x1f, 0x32, 0xc8, 0x4a, 0x03, - 0x3b, 0x33, 0xdf, 0x7e, 0x33, 0xfb, 0xcd, 0xec, 0x1e, 0x58, 0xc7, 0xc8, 0x67, 0x1e, 0xc1, 0xba, - 0x83, 0x19, 0xf2, 0xcc, 0x0e, 0x74, 0x30, 0xeb, 0x53, 0xfd, 0xa8, 0xa2, 0xb3, 0xbe, 0xd6, 0xf3, - 0x08, 0x23, 0xb2, 0x22, 0x20, 0xda, 0x18, 0x44, 0x3b, 0xaa, 0xe4, 0xb2, 0x26, 0xa1, 0x2e, 0xa1, - 0x4d, 0x8e, 0xd3, 0x43, 0x23, 0xdc, 0x94, 0xcb, 0x87, 0x96, 0xde, 0x82, 0x14, 0xe9, 0x47, 0x95, - 0x16, 0x62, 0xb0, 0xa2, 0x9b, 0xc4, 0xc1, 0x22, 0xbe, 0x31, 0x35, 0x6f, 0x0f, 0x7a, 0xd0, 0x8d, - 0x68, 0x32, 0x36, 0xb1, 0x49, 0x48, 0x1f, 0xac, 0x84, 0x77, 0xd9, 0x26, 0xc4, 0xee, 0x22, 0x1d, - 0xf6, 0x1c, 0xbd, 0xc3, 0x58, 0x4f, 0xb8, 0x57, 0x47, 0xdc, 0x10, 0x63, 0xc2, 0x20, 0x73, 0x08, - 0x8e, 0xa8, 0xb2, 0x22, 0xca, 0xad, 0x96, 0xdf, 0xd6, 0x21, 0x1e, 0x88, 0xd0, 0x5a, 0x54, 0x4c, - 0x1b, 0x21, 0x0f, 0xb5, 0x7d, 0x6c, 0x21, 0x2f, 0x58, 0x8b, 0xf0, 0x8a, 0x38, 0x8b, 0x4b, 0xed, - 0xa0, 0x40, 0x97, 0xda, 0x22, 0xf0, 0x2f, 0x74, 0x1d, 0x4c, 0x74, 0xfe, 0x1b, 0xba, 0xd4, 0xb3, - 0x38, 0x58, 0x6d, 0x50, 0xdb, 0x40, 0xb6, 0x43, 0x19, 0xf2, 0xea, 0x37, 0xa7, 0xdb, 0x35, 0x4d, - 0xe2, 0x63, 0x26, 0xaf, 0x83, 0x74, 0xdb, 0x23, 0x6e, 0x13, 0x5a, 0x96, 0x87, 0x28, 0x55, 0xa4, - 0xa2, 0x54, 0x5a, 0x34, 0x52, 0x81, 0x6f, 0x37, 0x74, 0xc9, 0x8f, 0xc0, 0xdf, 0x26, 0xc1, 0x18, - 0x99, 0x41, 0xf9, 0x4d, 0xc7, 0x52, 0xe2, 0x01, 0xa6, 0xa6, 0x5c, 0x9f, 0x17, 0x32, 0x03, 0xe8, - 0x76, 0x77, 0xd4, 0xb1, 0xb0, 0x6a, 0xa4, 0x87, 0x76, 0xdd, 0x92, 0x0f, 0xc1, 0xf2, 0x50, 0xd4, - 0x26, 0x0c, 0xf3, 0x06, 0x34, 0x09, 0x4e, 0x53, 0xbc, 0x3e, 0x2f, 0xac, 0x86, 0x34, 0xb7, 0xc2, - 0x54, 0x63, 0xc9, 0x99, 0xac, 0xba, 0x6e, 0xc9, 0x18, 0xa4, 0x3d, 0x71, 0xa8, 0x66, 0x1b, 0x21, - 0x25, 0x59, 0x4c, 0x94, 0x52, 0xd5, 0xac, 0x26, 0xba, 0x1e, 0xf4, 0x59, 0x13, 0x7d, 0xd6, 0x9e, - 0x12, 0x07, 0xd7, 0xb6, 0x4e, 0xcf, 0x0b, 0xb1, 0x4f, 0xdf, 0x0b, 0x25, 0xdb, 0x61, 0x1d, 0xbf, - 0xa5, 0x99, 0xc4, 0x15, 0x23, 0x22, 0xfe, 0xca, 0xd4, 0x7a, 0xa9, 0xb3, 0x41, 0x0f, 0x51, 0xbe, - 0x81, 0x1a, 0xa9, 0x28, 0xc1, 0x1e, 0x42, 0x3b, 0x0b, 0x6f, 0x8e, 0x0b, 0xb1, 0x9f, 0xc7, 0x85, - 0x98, 0x7a, 0x0f, 0xfc, 0x3f, 0x4b, 0x51, 0x03, 0xd1, 0x1e, 0xc1, 0x14, 0xa9, 0x1f, 0xe2, 0x20, - 0xd5, 0xa0, 0xf6, 0x81, 0xdf, 0x72, 0x1d, 0x76, 0xd8, 0xbf, 0x8b, 0xd2, 0xd5, 0x69, 0x52, 0x71, - 0xc5, 0x6f, 0x17, 0xe2, 0xbf, 0xc9, 0xee, 0x70, 0x59, 0x27, 0x7a, 0x50, 0x02, 0x49, 0x97, 0xda, - 0x54, 0xa8, 0x94, 0xd1, 0xc2, 0xd9, 0xd3, 0xa2, 0xd9, 0xd3, 0x76, 0xf1, 0xc0, 0xe0, 0x08, 0x59, - 0x06, 0x49, 0x17, 0xb9, 0x44, 0xf9, 0x8b, 0xb3, 0xf0, 0xb5, 0xac, 0x80, 0x79, 0xe6, 0xb8, 0x88, - 0xf8, 0x4c, 0x99, 0x2b, 0x4a, 0xa5, 0xa4, 0x11, 0x99, 0xf2, 0x16, 0x48, 0x04, 0xe2, 0xcf, 0x17, - 0xa5, 0x52, 0xaa, 0xaa, 0x68, 0xd1, 0xcd, 0x1c, 0x99, 0x5b, 0x6d, 0x0f, 0xa1, 0x5a, 0x32, 0xd0, - 0xde, 0x08, 0xa0, 0x23, 0x3a, 0xee, 0x83, 0xa5, 0x11, 0x79, 0x22, 0xd9, 0xe4, 0x02, 0x48, 0x51, - 0xf4, 0xca, 0x47, 0xd8, 0x44, 0xc1, 0x69, 0x24, 0x9e, 0x10, 0x44, 0xae, 0xba, 0x15, 0x54, 0x63, - 0x76, 0x20, 0xc6, 0xa8, 0x2b, 0x64, 0x89, 0x4c, 0xf5, 0x8b, 0x04, 0xfe, 0x69, 0x50, 0xfb, 0x79, - 0xcf, 0x82, 0x0c, 0xed, 0xf3, 0x7b, 0x2b, 0x6f, 0x83, 0x45, 0xe8, 0xb3, 0x0e, 0xf1, 0x1c, 0x36, - 0x08, 0x25, 0xaf, 0x29, 0x5f, 0x3f, 0x97, 0x33, 0x62, 0x4e, 0x84, 0xf2, 0x07, 0xcc, 0x73, 0xb0, - 0x6d, 0x0c, 0xa1, 0xf2, 0x13, 0x30, 0x17, 0xde, 0x7c, 0x9e, 0x24, 0x55, 0x5d, 0xd3, 0x6e, 0x7f, - 0x76, 0xc2, 0x34, 0xb5, 0xc5, 0xe0, 0x84, 0x1f, 0xaf, 0x4e, 0x36, 0x25, 0x43, 0xec, 0xdb, 0xd9, - 0x7a, 0x7d, 0x75, 0xb2, 0x39, 0x64, 0x7c, 0x7b, 0x75, 0xb2, 0xb9, 0x36, 0xfe, 0xba, 0x4c, 0xd4, - 0xaa, 0x66, 0xc1, 0xca, 0x84, 0x2b, 0x52, 0xa5, 0xfa, 0x2b, 0x0e, 0x12, 0x0d, 0x6a, 0xcb, 0xef, - 0x25, 0x90, 0x9d, 0x7e, 0x99, 0xb7, 0xb5, 0x69, 0x6f, 0xa3, 0x36, 0x6b, 0x64, 0x73, 0x8f, 0xff, - 0x6c, 0xdf, 0xcd, 0xa8, 0xc7, 0xe4, 0x16, 0x58, 0xb8, 0x19, 0xf4, 0x8d, 0x99, 0x6c, 0x11, 0x2c, - 0x57, 0xbe, 0x13, 0x6c, 0x24, 0x47, 0x17, 0xa4, 0xc7, 0x5a, 0x7b, 0x7f, 0x26, 0xc1, 0x28, 0x34, - 0x57, 0xb9, 0x33, 0x34, 0xca, 0x57, 0x7b, 0x76, 0x7a, 0x91, 0x97, 0xce, 0x2e, 0xf2, 0xd2, 0x8f, - 0x8b, 0xbc, 0xf4, 0xee, 0x32, 0x1f, 0x3b, 0xbb, 0xcc, 0xc7, 0xbe, 0x5d, 0xe6, 0x63, 0x2f, 0x1e, - 0x8e, 0xbc, 0x20, 0x82, 0xb6, 0x4c, 0x3c, 0x3b, 0x5a, 0xeb, 0xfd, 0x89, 0x8f, 0x08, 0x7f, 0x53, - 0x5a, 0x73, 0xfc, 0xb2, 0x3d, 0xf8, 0x1d, 0x00, 0x00, 0xff, 0xff, 0x1e, 0xbd, 0xdf, 0xb4, 0xe2, - 0x06, 0x00, 0x00, + // 802 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0xbf, 0x6b, 0x1b, 0x4b, + 0x10, 0xd6, 0x49, 0x7a, 0xfe, 0xb1, 0xd2, 0xe3, 0xf1, 0xce, 0x32, 0x3e, 0x09, 0x5b, 0x92, 0xef, + 0x3d, 0x07, 0xc5, 0xa0, 0x3b, 0x4b, 0x09, 0x2e, 0x0c, 0x09, 0x58, 0x06, 0x83, 0x0a, 0x05, 0x73, + 0x76, 0x9a, 0x34, 0x62, 0x75, 0xb7, 0x3a, 0x1d, 0xd1, 0xed, 0x2a, 0xb7, 0x7b, 0x46, 0x6a, 0x53, + 0x85, 0x54, 0x69, 0x52, 0x06, 0x5c, 0x86, 0x54, 0x2e, 0xf2, 0x07, 0xa4, 0x74, 0x69, 0x52, 0xa5, + 0x72, 0x82, 0x5d, 0x38, 0x5d, 0xc0, 0x7f, 0x41, 0xb8, 0xbd, 0x3d, 0xeb, 0x07, 0x96, 0x30, 0x69, + 0xa4, 0x9d, 0x99, 0x6f, 0xbf, 0x99, 0xfd, 0x66, 0x76, 0x0f, 0xac, 0x63, 0xe4, 0x33, 0x8f, 0x60, + 0xdd, 0xc1, 0x0c, 0x79, 0x66, 0x07, 0x3a, 0x98, 0xf5, 0xa9, 0x7e, 0x5c, 0xd1, 0x59, 0x5f, 0xeb, + 0x79, 0x84, 0x11, 0x59, 0x11, 0x10, 0x6d, 0x0c, 0xa2, 0x1d, 0x57, 0x72, 0x59, 0x93, 0x50, 0x97, + 0xd0, 0x26, 0xc7, 0xe9, 0xa1, 0x11, 0x6e, 0xca, 0xe5, 0x43, 0x4b, 0x6f, 0x41, 0x8a, 0xf4, 0xe3, + 0x4a, 0x0b, 0x31, 0x58, 0xd1, 0x4d, 0xe2, 0x60, 0x11, 0xdf, 0x98, 0x9a, 0xb7, 0x07, 0x3d, 0xe8, + 0x46, 0x34, 0x19, 0x9b, 0xd8, 0x24, 0xa4, 0x0f, 0x56, 0xc2, 0xbb, 0x6c, 0x13, 0x62, 0x77, 0x91, + 0x0e, 0x7b, 0x8e, 0xde, 0x61, 0xac, 0x27, 0xdc, 0xab, 0x23, 0x6e, 0x88, 0x31, 0x61, 0x90, 0x39, + 0x04, 0x47, 0x54, 0x59, 0x11, 0xe5, 0x56, 0xcb, 0x6f, 0xeb, 0x10, 0x0f, 0x44, 0x68, 0x2d, 0x2a, + 0xa6, 0x8d, 0x90, 0x87, 0xda, 0x3e, 0xb6, 0x90, 0x17, 0xac, 0x45, 0x78, 0x45, 0x9c, 0xc5, 0xa5, + 0x76, 0x50, 0xa0, 0x4b, 0x6d, 0x11, 0xf8, 0x17, 0xba, 0x0e, 0x26, 0x3a, 0xff, 0x0d, 0x5d, 0xea, + 0x79, 0x1c, 0xac, 0x36, 0xa8, 0x6d, 0x20, 0xdb, 0xa1, 0x0c, 0x79, 0xf5, 0xdb, 0xd3, 0xed, 0x9a, + 0x26, 0xf1, 0x31, 0x93, 0xd7, 0x41, 0xba, 0xed, 0x11, 0xb7, 0x09, 0x2d, 0xcb, 0x43, 0x94, 0x2a, + 0x52, 0x51, 0x2a, 0x2d, 0x1a, 0xa9, 0xc0, 0xb7, 0x1b, 0xba, 0xe4, 0x27, 0xe0, 0x6f, 0x93, 0x60, + 0x8c, 0xcc, 0xa0, 0xfc, 0xa6, 0x63, 0x29, 0xf1, 0x00, 0x53, 0x53, 0x6e, 0x2e, 0x0a, 0x99, 0x01, + 0x74, 0xbb, 0x3b, 0xea, 0x58, 0x58, 0x35, 0xd2, 0x43, 0xbb, 0x6e, 0xc9, 0x47, 0x60, 0x79, 0x28, + 0x6a, 0x13, 0x86, 0x79, 0x03, 0x9a, 0x04, 0xa7, 0x29, 0xde, 0x5c, 0x14, 0x56, 0x43, 0x9a, 0x3b, + 0x61, 0xaa, 0xb1, 0xe4, 0x4c, 0x56, 0x5d, 0xb7, 0x64, 0x0c, 0xd2, 0x9e, 0x38, 0x54, 0xb3, 0x8d, + 0x90, 0x92, 0x2c, 0x26, 0x4a, 0xa9, 0x6a, 0x56, 0x13, 0x5d, 0x0f, 0xfa, 0xac, 0x89, 0x3e, 0x6b, + 0x7b, 0xc4, 0xc1, 0xb5, 0xad, 0xb3, 0x8b, 0x42, 0xec, 0xd3, 0xf7, 0x42, 0xc9, 0x76, 0x58, 0xc7, + 0x6f, 0x69, 0x26, 0x71, 0xc5, 0x88, 0x88, 0xbf, 0x32, 0xb5, 0x5e, 0xea, 0x6c, 0xd0, 0x43, 0x94, + 0x6f, 0xa0, 0x46, 0x2a, 0x4a, 0xb0, 0x8f, 0xd0, 0xce, 0xc2, 0x9b, 0x93, 0x42, 0xec, 0xe7, 0x49, + 0x21, 0xa6, 0x3e, 0x00, 0xff, 0xcf, 0x52, 0xd4, 0x40, 0xb4, 0x47, 0x30, 0x45, 0xea, 0x87, 0x38, + 0x48, 0x35, 0xa8, 0x7d, 0xe8, 0xb7, 0x5c, 0x87, 0x1d, 0xf5, 0xef, 0xa3, 0x74, 0x75, 0x9a, 0x54, + 0x5c, 0xf1, 0xbb, 0x85, 0xf8, 0x6f, 0xb2, 0x3b, 0x5c, 0xd6, 0x89, 0x1e, 0x94, 0x40, 0xd2, 0xa5, + 0x36, 0x15, 0x2a, 0x65, 0xb4, 0x70, 0xf6, 0xb4, 0x68, 0xf6, 0xb4, 0x5d, 0x3c, 0x30, 0x38, 0x42, + 0x96, 0x41, 0xd2, 0x45, 0x2e, 0x51, 0xfe, 0xe2, 0x2c, 0x7c, 0x2d, 0x2b, 0x60, 0x9e, 0x39, 0x2e, + 0x22, 0x3e, 0x53, 0xe6, 0x8a, 0x52, 0x29, 0x69, 0x44, 0xa6, 0xbc, 0x05, 0x12, 0x81, 0xf8, 0xf3, + 0x45, 0xa9, 0x94, 0xaa, 0x2a, 0x5a, 0x74, 0x33, 0x47, 0xe6, 0x56, 0xdb, 0x47, 0xa8, 0x96, 0x0c, + 0xb4, 0x37, 0x02, 0xe8, 0x88, 0x8e, 0x07, 0x60, 0x69, 0x44, 0x9e, 0x48, 0x36, 0xb9, 0x00, 0x52, + 0x14, 0xbd, 0xf2, 0x11, 0x36, 0x51, 0x70, 0x1a, 0x89, 0x27, 0x04, 0x91, 0xab, 0x6e, 0x05, 0xd5, + 0x98, 0x1d, 0x88, 0x31, 0xea, 0x0a, 0x59, 0x22, 0x53, 0xfd, 0x22, 0x81, 0x7f, 0x1a, 0xd4, 0x7e, + 0xde, 0xb3, 0x20, 0x43, 0x07, 0xfc, 0xde, 0xca, 0xdb, 0x60, 0x11, 0xfa, 0xac, 0x43, 0x3c, 0x87, + 0x0d, 0x42, 0xc9, 0x6b, 0xca, 0xd7, 0xcf, 0xe5, 0x8c, 0x98, 0x13, 0xa1, 0xfc, 0x21, 0xf3, 0x1c, + 0x6c, 0x1b, 0x43, 0xa8, 0xbc, 0x07, 0xe6, 0xc2, 0x9b, 0xcf, 0x93, 0xa4, 0xaa, 0x45, 0x6d, 0xda, + 0xb3, 0xa3, 0x85, 0x99, 0x6a, 0x8b, 0xc1, 0x21, 0x3f, 0x5e, 0x9f, 0x6e, 0x4a, 0x86, 0xd8, 0xba, + 0xb3, 0xf5, 0xfa, 0xfa, 0x74, 0x73, 0x48, 0xfa, 0xf6, 0xfa, 0x74, 0x73, 0x6d, 0xfc, 0x81, 0x99, + 0x28, 0x57, 0xcd, 0x82, 0x95, 0x09, 0x57, 0x24, 0x4c, 0xf5, 0x57, 0x1c, 0x24, 0x1a, 0xd4, 0x96, + 0xdf, 0x4b, 0x20, 0x3b, 0xfd, 0x3e, 0x6f, 0x4f, 0xaf, 0x73, 0xd6, 0xd4, 0xe6, 0x9e, 0xfe, 0xd9, + 0xbe, 0xdb, 0x69, 0x8f, 0xc9, 0x2d, 0xb0, 0x70, 0x3b, 0xeb, 0x1b, 0x33, 0xd9, 0x22, 0x58, 0xae, + 0x7c, 0x2f, 0xd8, 0x48, 0x8e, 0x2e, 0x48, 0x8f, 0x75, 0xf7, 0xe1, 0x4c, 0x82, 0x51, 0x68, 0xae, + 0x72, 0x6f, 0x68, 0x94, 0xaf, 0xf6, 0xec, 0xec, 0x32, 0x2f, 0x9d, 0x5f, 0xe6, 0xa5, 0x1f, 0x97, + 0x79, 0xe9, 0xdd, 0x55, 0x3e, 0x76, 0x7e, 0x95, 0x8f, 0x7d, 0xbb, 0xca, 0xc7, 0x5e, 0x3c, 0x1e, + 0x79, 0x44, 0x04, 0x6d, 0x99, 0x78, 0x76, 0xb4, 0xd6, 0xfb, 0x13, 0xdf, 0x11, 0xfe, 0xac, 0xb4, + 0xe6, 0xf8, 0x7d, 0x7b, 0xf4, 0x3b, 0x00, 0x00, 0xff, 0xff, 0xe0, 0xd3, 0x11, 0x00, 0xe5, 0x06, + 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. From 477ef889d329dabe7320147f4960f4ea8c76f741 Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Wed, 22 Nov 2023 14:02:26 +0200 Subject: [PATCH 289/307] fix denom --- config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.yml b/config.yml index cb2ab0eee..9be87cbd9 100644 --- a/config.yml +++ b/config.yml @@ -14,7 +14,7 @@ accounts: faucet: name: bob coins: - - 500000ustrd + - 500000untrn - 100000stake host: 0.0.0.0:4500 client: From 3f9c62289c67066c48dccfd53f5df90548815c24 Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Wed, 22 Nov 2023 14:58:14 +0200 Subject: [PATCH 290/307] fix stargate allowlist --- tools/tools.go | 11 +++++++++++ wasmbinding/stargate_allowlist.go | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 tools/tools.go diff --git a/tools/tools.go b/tools/tools.go new file mode 100644 index 000000000..6e7a12d40 --- /dev/null +++ b/tools/tools.go @@ -0,0 +1,11 @@ +//go:build tools + +package tools + +import ( + _ "github.com/cosmos/gogoproto/protoc-gen-gocosmos" + _ "github.com/golang/protobuf/protoc-gen-go" + _ "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway" + _ "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger" + _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2" +) diff --git a/wasmbinding/stargate_allowlist.go b/wasmbinding/stargate_allowlist.go index 1a1ca5483..f4320b8dd 100644 --- a/wasmbinding/stargate_allowlist.go +++ b/wasmbinding/stargate_allowlist.go @@ -45,7 +45,7 @@ func AcceptedStargateQueries() wasmkeeper.AcceptedStargateQueries { "/cosmos.bank.v1beta1.Query/SupplyOf": &banktypes.QuerySupplyOfResponse{}, // interchaintxs - "/neutron.interchaintxs.Query/Params": &interchaintxstypes.QueryParamsResponse{}, + "/neutron.interchaintxs.v1.Query/Params": &interchaintxstypes.QueryParamsResponse{}, // interchainqueries "/neutron.interchainqueries.Query/Params": &interchainqueriestypes.QueryParamsResponse{}, From f4c3175176519f984b4143743c70105fad4fda8f Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Wed, 22 Nov 2023 15:01:33 +0200 Subject: [PATCH 291/307] add openapi generate command to the Makefile --- Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile index b6b749271..8ba0ca4d3 100644 --- a/Makefile +++ b/Makefile @@ -248,6 +248,9 @@ start-docker-container: stop-docker-container: @docker stop neutron +openapi: + ignite generate openapi + mocks: @echo "Regenerate mocks..." @go generate ./... From 7465bda13527a70e252ef8521c0388050df14cc3 Mon Sep 17 00:00:00 2001 From: swelf Date: Wed, 22 Nov 2023 16:42:04 +0300 Subject: [PATCH 292/307] tagged wasmd version --- go.mod | 2 +- go.sum | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 2f55ab8d3..43357d737 100644 --- a/go.mod +++ b/go.mod @@ -190,7 +190,7 @@ require ( replace ( github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0 github.com/ChainSafe/go-schnorrkel => github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d - github.com/CosmWasm/wasmd => github.com/neutron-org/wasmd v0.43.1-0.20231121134303-e47173b19d80 + github.com/CosmWasm/wasmd => github.com/neutron-org/wasmd v0.45.0 github.com/cosmos/admin-module => github.com/neutron-org/admin-module v1.0.0 github.com/cosmos/cosmos-sdk => github.com/neutron-org/cosmos-sdk v0.47.6-neutron github.com/cosmos/gaia/v11 => github.com/cosmos/gaia/v11 v11.0.0-20230724152830-861ba391c3b4 diff --git a/go.sum b/go.sum index e7a58ec6e..a8841acda 100644 --- a/go.sum +++ b/go.sum @@ -944,6 +944,7 @@ github.com/neutron-org/wasmd v0.43.0 h1:aXzN9diVRAKTs2+EdK4zoTOmNCjjr8vpAhIq8VbB github.com/neutron-org/wasmd v0.43.0/go.mod h1:GEWnDHjbx7qtVHQ+5ocrNe1sIHNiXcTlSocXyLQNnRY= github.com/neutron-org/wasmd v0.43.1-0.20231121134303-e47173b19d80 h1:NZxcnl5FHTyRjwuHPh6f4jFPvK5OHez7CQvElN+Nz/E= github.com/neutron-org/wasmd v0.43.1-0.20231121134303-e47173b19d80/go.mod h1:k2/B7hBKbCEHhhOSaiv7UBHUR2fLVb003pnswasgG/w= +github.com/neutron-org/wasmd v0.45.0/go.mod h1:k2/B7hBKbCEHhhOSaiv7UBHUR2fLVb003pnswasgG/w= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= From b476f7ccb012a705140abc7612e6bee8de2c0965 Mon Sep 17 00:00:00 2001 From: swelf Date: Wed, 22 Nov 2023 17:05:48 +0300 Subject: [PATCH 293/307] go get ./... --- go.sum | 1 + 1 file changed, 1 insertion(+) diff --git a/go.sum b/go.sum index a8841acda..457168a82 100644 --- a/go.sum +++ b/go.sum @@ -944,6 +944,7 @@ github.com/neutron-org/wasmd v0.43.0 h1:aXzN9diVRAKTs2+EdK4zoTOmNCjjr8vpAhIq8VbB github.com/neutron-org/wasmd v0.43.0/go.mod h1:GEWnDHjbx7qtVHQ+5ocrNe1sIHNiXcTlSocXyLQNnRY= github.com/neutron-org/wasmd v0.43.1-0.20231121134303-e47173b19d80 h1:NZxcnl5FHTyRjwuHPh6f4jFPvK5OHez7CQvElN+Nz/E= github.com/neutron-org/wasmd v0.43.1-0.20231121134303-e47173b19d80/go.mod h1:k2/B7hBKbCEHhhOSaiv7UBHUR2fLVb003pnswasgG/w= +github.com/neutron-org/wasmd v0.45.0 h1:K3WpYYTP9Msd7cLtdIau8VBUW1n1CC1qC/yaKPCYJsQ= github.com/neutron-org/wasmd v0.45.0/go.mod h1:k2/B7hBKbCEHhhOSaiv7UBHUR2fLVb003pnswasgG/w= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= From 713963529c4d822ffb2f84f08f754fdfe73fa15e Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Thu, 23 Nov 2023 12:47:23 +0200 Subject: [PATCH 294/307] remove v1 from ictx module --- docs/static/openapi.yml | 16 +- .../interchaintxs/{v1 => }/genesis.proto | 4 +- .../interchaintxs/{v1 => }/params.proto | 2 +- .../interchaintxs/{v1 => }/query.proto | 4 +- proto/neutron/interchaintxs/{v1 => }/tx.proto | 4 +- wasmbinding/stargate_allowlist.go | 2 +- x/interchaintxs/types/genesis.pb.go | 36 ++-- x/interchaintxs/types/params.pb.go | 48 +++--- x/interchaintxs/types/query.pb.go | 105 ++++++------ x/interchaintxs/types/query.pb.gw.go | 2 +- x/interchaintxs/types/tx.pb.go | 155 +++++++++--------- 11 files changed, 187 insertions(+), 191 deletions(-) rename proto/neutron/interchaintxs/{v1 => }/genesis.proto (76%) rename proto/neutron/interchaintxs/{v1 => }/params.proto (94%) rename proto/neutron/interchaintxs/{v1 => }/query.proto (95%) rename proto/neutron/interchaintxs/{v1 => }/tx.proto (97%) diff --git a/docs/static/openapi.yml b/docs/static/openapi.yml index 5a4103ac3..5a6428940 100644 --- a/docs/static/openapi.yml +++ b/docs/static/openapi.yml @@ -40292,7 +40292,7 @@ paths: /neutron/interchaintxs/params: get: summary: Parameters queries the parameters of the module. - operationId: NeutronInterchaintxsV1Params + operationId: NeutronInterchaintxsParams responses: '200': description: A successful response. @@ -40521,7 +40521,7 @@ paths: - Query /neutron/interchaintxs/{owner_address}/{interchain_account_id}/{connection_id}/interchain_account_address: get: - operationId: NeutronInterchaintxsV1InterchainAccountAddress + operationId: NeutronInterchaintxsInterchainAccountAddress responses: '200': description: A successful response. @@ -71305,12 +71305,12 @@ definitions: The data could be arbitrary format, providing nessecary data for example neighbouring node hash title: ProofOps is Merkle proof defined by the list of ProofOps - neutron.interchaintxs.v1.MsgRegisterInterchainAccountResponse: + neutron.interchaintxs.MsgRegisterInterchainAccountResponse: type: object description: |- MsgRegisterInterchainAccountResponse is the response type for MsgRegisterInterchainAccount. - neutron.interchaintxs.v1.MsgSubmitTxResponse: + neutron.interchaintxs.MsgSubmitTxResponse: type: object properties: sequence_id: @@ -71321,14 +71321,14 @@ definitions: type: string title: channel src channel on neutron side transaction was submitted from title: MsgSubmitTxResponse defines the response for Msg/SubmitTx - neutron.interchaintxs.v1.MsgUpdateParamsResponse: + neutron.interchaintxs.MsgUpdateParamsResponse: type: object description: |- MsgUpdateParamsResponse defines the response structure for executing a MsgUpdateParams message. Since: 0.47 - neutron.interchaintxs.v1.Params: + neutron.interchaintxs.Params: type: object properties: msg_submit_tx_max_messages: @@ -71351,14 +71351,14 @@ definitions: signatures required by gogoproto. title: Defines a minimum fee required to register interchain account description: Params defines the parameters for the module. - neutron.interchaintxs.v1.QueryInterchainAccountAddressResponse: + neutron.interchaintxs.QueryInterchainAccountAddressResponse: type: object properties: interchain_account_address: type: string title: The corresponding interchain account address on the host chain title: Query response for an interchain account address - neutron.interchaintxs.v1.QueryParamsResponse: + neutron.interchaintxs.QueryParamsResponse: type: object properties: params: diff --git a/proto/neutron/interchaintxs/v1/genesis.proto b/proto/neutron/interchaintxs/genesis.proto similarity index 76% rename from proto/neutron/interchaintxs/v1/genesis.proto rename to proto/neutron/interchaintxs/genesis.proto index bff673af1..850394c59 100644 --- a/proto/neutron/interchaintxs/v1/genesis.proto +++ b/proto/neutron/interchaintxs/genesis.proto @@ -1,8 +1,8 @@ syntax = "proto3"; -package neutron.interchaintxs.v1; +package neutron.interchaintxs; import "gogoproto/gogo.proto"; -import "neutron/interchaintxs/v1/params.proto"; +import "neutron/interchaintxs/params.proto"; option go_package = "github.com/neutron-org/neutron/x/interchaintxs/types"; diff --git a/proto/neutron/interchaintxs/v1/params.proto b/proto/neutron/interchaintxs/params.proto similarity index 94% rename from proto/neutron/interchaintxs/v1/params.proto rename to proto/neutron/interchaintxs/params.proto index 1a720e961..734e7cb2e 100644 --- a/proto/neutron/interchaintxs/v1/params.proto +++ b/proto/neutron/interchaintxs/params.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -package neutron.interchaintxs.v1; +package neutron.interchaintxs; import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.proto"; diff --git a/proto/neutron/interchaintxs/v1/query.proto b/proto/neutron/interchaintxs/query.proto similarity index 95% rename from proto/neutron/interchaintxs/v1/query.proto rename to proto/neutron/interchaintxs/query.proto index 285aacdf7..e10fb44c5 100644 --- a/proto/neutron/interchaintxs/v1/query.proto +++ b/proto/neutron/interchaintxs/query.proto @@ -1,10 +1,10 @@ syntax = "proto3"; -package neutron.interchaintxs.v1; +package neutron.interchaintxs; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; import "cosmos/base/query/v1beta1/pagination.proto"; -import "neutron/interchaintxs/v1/params.proto"; +import "neutron/interchaintxs/params.proto"; option go_package = "github.com/neutron-org/neutron/x/interchaintxs/types"; diff --git a/proto/neutron/interchaintxs/v1/tx.proto b/proto/neutron/interchaintxs/tx.proto similarity index 97% rename from proto/neutron/interchaintxs/v1/tx.proto rename to proto/neutron/interchaintxs/tx.proto index 5ce7899c8..cb1dabbfd 100644 --- a/proto/neutron/interchaintxs/v1/tx.proto +++ b/proto/neutron/interchaintxs/tx.proto @@ -1,11 +1,11 @@ syntax = "proto3"; -package neutron.interchaintxs.v1; +package neutron.interchaintxs; option go_package = "github.com/neutron-org/neutron/x/interchaintxs/types"; import "cosmos_proto/cosmos.proto"; import "cosmos/base/v1beta1/coin.proto"; -import "neutron/interchaintxs/v1/params.proto"; +import "neutron/interchaintxs/params.proto"; import "gogoproto/gogo.proto"; import "google/api/http.proto"; import "google/api/annotations.proto"; diff --git a/wasmbinding/stargate_allowlist.go b/wasmbinding/stargate_allowlist.go index f4320b8dd..1a1ca5483 100644 --- a/wasmbinding/stargate_allowlist.go +++ b/wasmbinding/stargate_allowlist.go @@ -45,7 +45,7 @@ func AcceptedStargateQueries() wasmkeeper.AcceptedStargateQueries { "/cosmos.bank.v1beta1.Query/SupplyOf": &banktypes.QuerySupplyOfResponse{}, // interchaintxs - "/neutron.interchaintxs.v1.Query/Params": &interchaintxstypes.QueryParamsResponse{}, + "/neutron.interchaintxs.Query/Params": &interchaintxstypes.QueryParamsResponse{}, // interchainqueries "/neutron.interchainqueries.Query/Params": &interchainqueriestypes.QueryParamsResponse{}, diff --git a/x/interchaintxs/types/genesis.pb.go b/x/interchaintxs/types/genesis.pb.go index e6a20056e..0f59b4765 100644 --- a/x/interchaintxs/types/genesis.pb.go +++ b/x/interchaintxs/types/genesis.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: neutron/interchaintxs/v1/genesis.proto +// source: neutron/interchaintxs/genesis.proto package types @@ -32,7 +32,7 @@ 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_d16558b72a810826, []int{0} + return fileDescriptor_e49275bc96c5883d, []int{0} } func (m *GenesisState) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -69,28 +69,28 @@ func (m *GenesisState) GetParams() Params { } func init() { - proto.RegisterType((*GenesisState)(nil), "neutron.interchaintxs.v1.GenesisState") + proto.RegisterType((*GenesisState)(nil), "neutron.interchaintxs.GenesisState") } func init() { - proto.RegisterFile("neutron/interchaintxs/v1/genesis.proto", fileDescriptor_d16558b72a810826) + proto.RegisterFile("neutron/interchaintxs/genesis.proto", fileDescriptor_e49275bc96c5883d) } -var fileDescriptor_d16558b72a810826 = []byte{ - // 204 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0xcb, 0x4b, 0x2d, 0x2d, +var fileDescriptor_e49275bc96c5883d = []byte{ + // 198 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0xce, 0x4b, 0x2d, 0x2d, 0x29, 0xca, 0xcf, 0xd3, 0xcf, 0xcc, 0x2b, 0x49, 0x2d, 0x4a, 0xce, 0x48, 0xcc, 0xcc, 0x2b, 0xa9, - 0x28, 0xd6, 0x2f, 0x33, 0xd4, 0x4f, 0x4f, 0xcd, 0x4b, 0x2d, 0xce, 0x2c, 0xd6, 0x2b, 0x28, 0xca, - 0x2f, 0xc9, 0x17, 0x92, 0x80, 0xaa, 0xd3, 0x43, 0x51, 0xa7, 0x57, 0x66, 0x28, 0x25, 0x92, 0x9e, - 0x9f, 0x9e, 0x0f, 0x56, 0xa4, 0x0f, 0x62, 0x41, 0xd4, 0x4b, 0xa9, 0xe2, 0x34, 0xb7, 0x20, 0xb1, - 0x28, 0x31, 0x17, 0x6a, 0xac, 0x92, 0x1f, 0x17, 0x8f, 0x3b, 0xc4, 0x9e, 0xe0, 0x92, 0xc4, 0x92, - 0x54, 0x21, 0x3b, 0x2e, 0x36, 0x88, 0xbc, 0x04, 0xa3, 0x02, 0xa3, 0x06, 0xb7, 0x91, 0x82, 0x1e, - 0x2e, 0x7b, 0xf5, 0x02, 0xc0, 0xea, 0x9c, 0x58, 0x4e, 0xdc, 0x93, 0x67, 0x08, 0x82, 0xea, 0x72, - 0xf2, 0x3b, 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, 0x93, 0xf4, 0xcc, 0x92, - 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0x7d, 0xa8, 0x99, 0xba, 0xf9, 0x45, 0xe9, 0x30, 0xb6, - 0x7e, 0x05, 0x9a, 0x4b, 0x4b, 0x2a, 0x0b, 0x52, 0x8b, 0x93, 0xd8, 0xc0, 0xce, 0x34, 0x06, 0x04, - 0x00, 0x00, 0xff, 0xff, 0xc0, 0xc8, 0x84, 0x5c, 0x27, 0x01, 0x00, 0x00, + 0x28, 0xd6, 0x4f, 0x4f, 0xcd, 0x4b, 0x2d, 0xce, 0x2c, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, + 0x12, 0x85, 0x2a, 0xd2, 0x43, 0x51, 0x24, 0x25, 0x92, 0x9e, 0x9f, 0x9e, 0x0f, 0x56, 0xa1, 0x0f, + 0x62, 0x41, 0x14, 0x4b, 0x29, 0x61, 0x37, 0xb1, 0x20, 0xb1, 0x28, 0x31, 0x17, 0x6a, 0xa0, 0x92, + 0x37, 0x17, 0x8f, 0x3b, 0xc4, 0x86, 0xe0, 0x92, 0xc4, 0x92, 0x54, 0x21, 0x6b, 0x2e, 0x36, 0x88, + 0xbc, 0x04, 0xa3, 0x02, 0xa3, 0x06, 0xb7, 0x91, 0xac, 0x1e, 0x56, 0x1b, 0xf5, 0x02, 0xc0, 0x8a, + 0x9c, 0x58, 0x4e, 0xdc, 0x93, 0x67, 0x08, 0x82, 0x6a, 0x71, 0xf2, 0x3b, 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, 0x93, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, + 0x5c, 0x7d, 0xa8, 0x81, 0xba, 0xf9, 0x45, 0xe9, 0x30, 0xb6, 0x7e, 0x05, 0x9a, 0x1b, 0x4b, 0x2a, + 0x0b, 0x52, 0x8b, 0x93, 0xd8, 0xc0, 0x6e, 0x34, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0x83, 0x76, + 0x5c, 0x97, 0x1b, 0x01, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/interchaintxs/types/params.pb.go b/x/interchaintxs/types/params.pb.go index 844def56c..205eb708b 100644 --- a/x/interchaintxs/types/params.pb.go +++ b/x/interchaintxs/types/params.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: neutron/interchaintxs/v1/params.proto +// source: neutron/interchaintxs/params.proto package types @@ -35,7 +35,7 @@ type Params struct { func (m *Params) Reset() { *m = Params{} } func (*Params) ProtoMessage() {} func (*Params) Descriptor() ([]byte, []int) { - return fileDescriptor_52b0ced89d3fa9c6, []int{0} + return fileDescriptor_0371c2fec8782216, []int{0} } func (m *Params) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -79,33 +79,33 @@ func (m *Params) GetRegisterFee() []types.Coin { } func init() { - proto.RegisterType((*Params)(nil), "neutron.interchaintxs.v1.Params") + proto.RegisterType((*Params)(nil), "neutron.interchaintxs.Params") } func init() { - proto.RegisterFile("neutron/interchaintxs/v1/params.proto", fileDescriptor_52b0ced89d3fa9c6) + proto.RegisterFile("neutron/interchaintxs/params.proto", fileDescriptor_0371c2fec8782216) } -var fileDescriptor_52b0ced89d3fa9c6 = []byte{ - // 288 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x90, 0xb1, 0x4a, 0x33, 0x41, - 0x14, 0x85, 0x77, 0xfe, 0x3f, 0xa4, 0xd8, 0x58, 0x05, 0x91, 0x98, 0x62, 0x12, 0x04, 0x21, 0x8d, - 0x33, 0xac, 0x5a, 0xa5, 0x8c, 0x60, 0x17, 0x91, 0x68, 0x65, 0xb3, 0xcc, 0x2e, 0xd7, 0xc9, 0x14, - 0x33, 0x13, 0xe6, 0xce, 0x2e, 0xe3, 0x4b, 0x88, 0xa5, 0xa5, 0x8f, 0x93, 0x32, 0xa5, 0x95, 0xc8, - 0xee, 0x8b, 0x48, 0x76, 0x37, 0x85, 0x76, 0x07, 0xce, 0x77, 0xf9, 0xb8, 0x27, 0x3e, 0x37, 0x50, - 0x78, 0x67, 0x0d, 0x57, 0xc6, 0x83, 0xcb, 0xd7, 0x42, 0x19, 0x1f, 0x90, 0x97, 0x09, 0xdf, 0x08, - 0x27, 0x34, 0xb2, 0x8d, 0xb3, 0xde, 0x0e, 0x47, 0x1d, 0xc6, 0x7e, 0x61, 0xac, 0x4c, 0xc6, 0xc7, - 0xd2, 0x4a, 0xdb, 0x40, 0x7c, 0x9f, 0x5a, 0x7e, 0x4c, 0x73, 0x8b, 0xda, 0x22, 0xcf, 0x04, 0x02, - 0x2f, 0x93, 0x0c, 0xbc, 0x48, 0x78, 0x6e, 0x95, 0x69, 0xfb, 0xb3, 0x57, 0x12, 0xf7, 0xef, 0x1b, - 0xc1, 0x70, 0x1e, 0x8f, 0x35, 0xca, 0x14, 0x8b, 0x4c, 0x2b, 0x9f, 0xfa, 0x90, 0x6a, 0x11, 0x52, - 0x0d, 0x88, 0x42, 0x02, 0x8e, 0xc8, 0x94, 0xcc, 0x7a, 0xab, 0x13, 0x8d, 0xf2, 0xa1, 0x01, 0x1e, - 0xc3, 0x52, 0x84, 0x65, 0xd7, 0x0e, 0x17, 0xf1, 0x91, 0x03, 0xa9, 0xd0, 0x83, 0x4b, 0x9f, 0x01, - 0x46, 0xff, 0xa6, 0xff, 0x67, 0x83, 0xcb, 0x53, 0xd6, 0xda, 0xd9, 0xde, 0xce, 0x3a, 0x3b, 0xbb, - 0xb1, 0xca, 0x2c, 0x7a, 0xdb, 0xaf, 0x49, 0xb4, 0x1a, 0x1c, 0x8e, 0x6e, 0x01, 0xe6, 0xbd, 0xf7, - 0x8f, 0x49, 0xb4, 0xb8, 0xdb, 0x56, 0x94, 0xec, 0x2a, 0x4a, 0xbe, 0x2b, 0x4a, 0xde, 0x6a, 0x1a, - 0xed, 0x6a, 0x1a, 0x7d, 0xd6, 0x34, 0x7a, 0xba, 0x96, 0xca, 0xaf, 0x8b, 0x8c, 0xe5, 0x56, 0xf3, - 0x6e, 0x85, 0x0b, 0xeb, 0xe4, 0x21, 0xf3, 0xf0, 0x67, 0x3a, 0xff, 0xb2, 0x01, 0xcc, 0xfa, 0xcd, - 0x9f, 0x57, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xc1, 0xcc, 0x9a, 0x6c, 0x60, 0x01, 0x00, 0x00, +var fileDescriptor_0371c2fec8782216 = []byte{ + // 282 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x90, 0xb1, 0x4e, 0xf3, 0x30, + 0x14, 0x85, 0xe3, 0xff, 0xaf, 0x3a, 0xa4, 0x4c, 0x15, 0xa0, 0xd2, 0xc1, 0xad, 0x3a, 0x75, 0xc1, + 0x56, 0x81, 0xa9, 0x63, 0x90, 0xd8, 0x8a, 0x50, 0x61, 0x62, 0x89, 0x9c, 0xe8, 0xe2, 0x7a, 0xb0, + 0x1d, 0xf9, 0x3a, 0xc8, 0xbc, 0x04, 0x62, 0x64, 0xe4, 0x71, 0x3a, 0x76, 0x64, 0x42, 0x28, 0x79, + 0x11, 0xd4, 0x24, 0x1d, 0x60, 0x3b, 0xd2, 0xf9, 0xec, 0x4f, 0xf7, 0xc4, 0x33, 0x03, 0xa5, 0x77, + 0xd6, 0x70, 0x65, 0x3c, 0xb8, 0x7c, 0x23, 0x94, 0xf1, 0x01, 0x79, 0x21, 0x9c, 0xd0, 0xc8, 0x0a, + 0x67, 0xbd, 0x1d, 0x9e, 0x74, 0x0c, 0xfb, 0xc5, 0x8c, 0x8f, 0xa5, 0x95, 0xb6, 0x21, 0xf8, 0x3e, + 0xb5, 0xf0, 0x98, 0xe6, 0x16, 0xb5, 0x45, 0x9e, 0x09, 0x04, 0xfe, 0xbc, 0xc8, 0xc0, 0x8b, 0x05, + 0xcf, 0xad, 0x32, 0x6d, 0x3f, 0x7b, 0x25, 0x71, 0xff, 0xae, 0xf9, 0x7d, 0xb8, 0x8c, 0xc7, 0x1a, + 0x65, 0x8a, 0x65, 0xa6, 0x95, 0x4f, 0x7d, 0x48, 0xb5, 0x08, 0xa9, 0x06, 0x44, 0x21, 0x01, 0x47, + 0x64, 0x4a, 0xe6, 0xbd, 0xf5, 0xa9, 0x46, 0x79, 0xdf, 0x00, 0x0f, 0x61, 0x25, 0xc2, 0xaa, 0x6b, + 0x87, 0x49, 0x7c, 0xe4, 0x40, 0x2a, 0xf4, 0xe0, 0xd2, 0x27, 0x80, 0xd1, 0xbf, 0xe9, 0xff, 0xf9, + 0xe0, 0xe2, 0x8c, 0xb5, 0x76, 0xb6, 0xb7, 0xb3, 0xce, 0xce, 0xae, 0xad, 0x32, 0x49, 0x6f, 0xfb, + 0x35, 0x89, 0xd6, 0x83, 0xc3, 0xa3, 0x1b, 0x80, 0x65, 0xef, 0xfd, 0x63, 0x12, 0x25, 0xb7, 0xdb, + 0x8a, 0x92, 0x5d, 0x45, 0xc9, 0x77, 0x45, 0xc9, 0x5b, 0x4d, 0xa3, 0x5d, 0x4d, 0xa3, 0xcf, 0x9a, + 0x46, 0x8f, 0x57, 0x52, 0xf9, 0x4d, 0x99, 0xb1, 0xdc, 0x6a, 0xde, 0x4d, 0x70, 0x6e, 0x9d, 0x3c, + 0x64, 0x1e, 0xfe, 0x8c, 0xe6, 0x5f, 0x0a, 0xc0, 0xac, 0xdf, 0xdc, 0x79, 0xf9, 0x13, 0x00, 0x00, + 0xff, 0xff, 0x35, 0xb5, 0x95, 0xb4, 0x5a, 0x01, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { diff --git a/x/interchaintxs/types/query.pb.go b/x/interchaintxs/types/query.pb.go index 6d7ea05e7..514420970 100644 --- a/x/interchaintxs/types/query.pb.go +++ b/x/interchaintxs/types/query.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: neutron/interchaintxs/v1/query.proto +// source: neutron/interchaintxs/query.proto package types @@ -38,7 +38,7 @@ 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_6130c5f6c54e2428, []int{0} + return fileDescriptor_9804d0830e584ce5, []int{0} } func (m *QueryParamsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -77,7 +77,7 @@ 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_6130c5f6c54e2428, []int{1} + return fileDescriptor_9804d0830e584ce5, []int{1} } func (m *QueryParamsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -129,7 +129,7 @@ func (m *QueryInterchainAccountAddressRequest) Reset() { *m = QueryInter func (m *QueryInterchainAccountAddressRequest) String() string { return proto.CompactTextString(m) } func (*QueryInterchainAccountAddressRequest) ProtoMessage() {} func (*QueryInterchainAccountAddressRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_6130c5f6c54e2428, []int{2} + return fileDescriptor_9804d0830e584ce5, []int{2} } func (m *QueryInterchainAccountAddressRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -168,7 +168,7 @@ func (m *QueryInterchainAccountAddressResponse) Reset() { *m = QueryInte func (m *QueryInterchainAccountAddressResponse) String() string { return proto.CompactTextString(m) } func (*QueryInterchainAccountAddressResponse) ProtoMessage() {} func (*QueryInterchainAccountAddressResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_6130c5f6c54e2428, []int{3} + return fileDescriptor_9804d0830e584ce5, []int{3} } func (m *QueryInterchainAccountAddressResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -205,49 +205,46 @@ func (m *QueryInterchainAccountAddressResponse) GetInterchainAccountAddress() st } func init() { - proto.RegisterType((*QueryParamsRequest)(nil), "neutron.interchaintxs.v1.QueryParamsRequest") - proto.RegisterType((*QueryParamsResponse)(nil), "neutron.interchaintxs.v1.QueryParamsResponse") - proto.RegisterType((*QueryInterchainAccountAddressRequest)(nil), "neutron.interchaintxs.v1.QueryInterchainAccountAddressRequest") - proto.RegisterType((*QueryInterchainAccountAddressResponse)(nil), "neutron.interchaintxs.v1.QueryInterchainAccountAddressResponse") -} - -func init() { - proto.RegisterFile("neutron/interchaintxs/v1/query.proto", fileDescriptor_6130c5f6c54e2428) -} - -var fileDescriptor_6130c5f6c54e2428 = []byte{ - // 482 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x53, 0x4f, 0x6b, 0x13, 0x41, - 0x14, 0xdf, 0x4d, 0x35, 0xe8, 0xa8, 0x97, 0x69, 0x85, 0x65, 0xd1, 0x4d, 0x59, 0x1b, 0x10, 0xb1, - 0x3b, 0x24, 0x7a, 0x12, 0xa9, 0xb4, 0xb7, 0x5c, 0x44, 0x03, 0x5e, 0xbc, 0x84, 0xc9, 0xee, 0xb0, - 0x1d, 0x34, 0xf3, 0x36, 0x3b, 0xb3, 0xb1, 0x25, 0xe4, 0xe2, 0xc9, 0x83, 0x88, 0xe0, 0x17, 0xe8, - 0xcd, 0x9b, 0x9f, 0xa3, 0xc7, 0x82, 0x17, 0x4f, 0x22, 0x89, 0x07, 0x3f, 0x86, 0xec, 0xcc, 0xb4, - 0x65, 0x6b, 0x96, 0x48, 0x6f, 0xcb, 0xdb, 0xdf, 0xfb, 0xfd, 0x79, 0xef, 0x0d, 0xda, 0x12, 0xac, - 0x50, 0x39, 0x08, 0xc2, 0x85, 0x62, 0x79, 0xbc, 0x4f, 0xb9, 0x50, 0x07, 0x92, 0x4c, 0x3a, 0x64, - 0x5c, 0xb0, 0xfc, 0x30, 0xca, 0x72, 0x50, 0x80, 0x3d, 0x8b, 0x8a, 0x2a, 0xa8, 0x68, 0xd2, 0xf1, - 0x37, 0x52, 0x48, 0x41, 0x83, 0x48, 0xf9, 0x65, 0xf0, 0xfe, 0x9d, 0x14, 0x20, 0x7d, 0xcb, 0x08, - 0xcd, 0x38, 0xa1, 0x42, 0x80, 0xa2, 0x8a, 0x83, 0x90, 0xf6, 0xef, 0x83, 0x18, 0xe4, 0x08, 0x24, - 0x19, 0x52, 0xc9, 0x8c, 0x0c, 0x99, 0x74, 0x86, 0x4c, 0xd1, 0x0e, 0xc9, 0x68, 0xca, 0x85, 0x06, - 0x5b, 0x6c, 0xbb, 0xd6, 0x5f, 0x46, 0x73, 0x3a, 0xb2, 0x94, 0xe1, 0x06, 0xc2, 0x2f, 0x4b, 0xa2, - 0x17, 0xba, 0xd8, 0x67, 0xe3, 0x82, 0x49, 0x15, 0xbe, 0x42, 0xeb, 0x95, 0xaa, 0xcc, 0x40, 0x48, - 0x86, 0x77, 0x50, 0xd3, 0x34, 0x7b, 0xee, 0xa6, 0x7b, 0xff, 0x46, 0x77, 0x33, 0xaa, 0x8b, 0x17, - 0x99, 0xce, 0xbd, 0x2b, 0xc7, 0x3f, 0x5b, 0x4e, 0xdf, 0x76, 0x85, 0xdf, 0x5c, 0xb4, 0xa5, 0x79, - 0x7b, 0x67, 0xf0, 0xdd, 0x38, 0x86, 0x42, 0xa8, 0xdd, 0x24, 0xc9, 0x99, 0x3c, 0xd5, 0xc7, 0xf7, - 0xd0, 0x2d, 0x78, 0x27, 0x58, 0x3e, 0xa0, 0xa6, 0xae, 0xf5, 0xae, 0xf7, 0x6f, 0xea, 0xa2, 0xc5, - 0xe2, 0x2e, 0xba, 0x7d, 0x2e, 0x3b, 0xa0, 0x86, 0x68, 0xc0, 0x13, 0xaf, 0xa1, 0xc1, 0xeb, 0xfc, - 0xa2, 0x48, 0x2f, 0x29, 0x89, 0x63, 0x10, 0x82, 0xc5, 0xe5, 0xa4, 0x4a, 0xec, 0x9a, 0x21, 0x3e, - 0x2f, 0xf6, 0x92, 0x27, 0xd7, 0x3e, 0x1c, 0xb5, 0x9c, 0x3f, 0x47, 0x2d, 0x27, 0x64, 0xa8, 0xbd, - 0xc2, 0xaf, 0x9d, 0xcc, 0x53, 0xe4, 0x2f, 0xf1, 0x52, 0x75, 0xef, 0xf1, 0x1a, 0x96, 0xee, 0xd7, - 0x35, 0x74, 0x55, 0xeb, 0xe0, 0x8f, 0x2e, 0x6a, 0x9a, 0xd1, 0xe1, 0x87, 0xf5, 0xc3, 0xfd, 0x77, - 0x63, 0xfe, 0xf6, 0x7f, 0xa2, 0x8d, 0xdf, 0xb0, 0xfd, 0xfe, 0xfb, 0xef, 0x2f, 0x8d, 0x16, 0xbe, - 0x4b, 0x96, 0x9f, 0x89, 0x59, 0x18, 0xfe, 0xd4, 0x40, 0x5e, 0x5d, 0x76, 0xbc, 0xb3, 0x42, 0x72, - 0xc5, 0x92, 0xfd, 0x67, 0x97, 0xee, 0xb7, 0x21, 0xc6, 0x3a, 0xc4, 0x1b, 0xcc, 0x6b, 0x42, 0x4c, - 0x2b, 0x37, 0x34, 0x23, 0xd3, 0xa5, 0xe7, 0x32, 0x23, 0xd3, 0xca, 0x49, 0xcc, 0x48, 0xfd, 0x26, - 0xf7, 0x9e, 0x1f, 0xcf, 0x03, 0xf7, 0x64, 0x1e, 0xb8, 0xbf, 0xe6, 0x81, 0xfb, 0x79, 0x11, 0x38, - 0x27, 0x8b, 0xc0, 0xf9, 0xb1, 0x08, 0x9c, 0xd7, 0x8f, 0x53, 0xae, 0xf6, 0x8b, 0x61, 0x14, 0xc3, - 0xe8, 0xd4, 0xce, 0x36, 0xe4, 0xe9, 0x99, 0xb5, 0x83, 0x0b, 0xe6, 0xd4, 0x61, 0xc6, 0xe4, 0xb0, - 0xa9, 0x5f, 0xe1, 0xa3, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xad, 0xfd, 0x25, 0x21, 0x4e, 0x04, - 0x00, 0x00, + proto.RegisterType((*QueryParamsRequest)(nil), "neutron.interchaintxs.QueryParamsRequest") + proto.RegisterType((*QueryParamsResponse)(nil), "neutron.interchaintxs.QueryParamsResponse") + proto.RegisterType((*QueryInterchainAccountAddressRequest)(nil), "neutron.interchaintxs.QueryInterchainAccountAddressRequest") + proto.RegisterType((*QueryInterchainAccountAddressResponse)(nil), "neutron.interchaintxs.QueryInterchainAccountAddressResponse") +} + +func init() { proto.RegisterFile("neutron/interchaintxs/query.proto", fileDescriptor_9804d0830e584ce5) } + +var fileDescriptor_9804d0830e584ce5 = []byte{ + // 474 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x93, 0x31, 0x6f, 0xd3, 0x40, + 0x14, 0xc7, 0xed, 0x14, 0x22, 0x38, 0x60, 0xb9, 0xb6, 0x52, 0x64, 0x51, 0x07, 0x0c, 0x95, 0xa0, + 0x12, 0x3e, 0x35, 0x30, 0xd1, 0x2e, 0xed, 0x96, 0x05, 0x41, 0x46, 0x96, 0xe8, 0x62, 0x9f, 0xdc, + 0x13, 0xe4, 0x9e, 0x73, 0x77, 0x86, 0x56, 0x51, 0x16, 0x06, 0xd4, 0x11, 0x89, 0x91, 0xa5, 0x9f, + 0x80, 0xcf, 0xd1, 0xb1, 0x12, 0x0b, 0x13, 0x42, 0x09, 0x03, 0x1f, 0x03, 0xf9, 0xee, 0xda, 0xca, + 0xc5, 0x6e, 0x11, 0x5b, 0xf4, 0xf2, 0x7f, 0xff, 0xff, 0xef, 0xde, 0x7b, 0x46, 0xf7, 0x05, 0x2b, + 0xb4, 0x04, 0x41, 0xb8, 0xd0, 0x4c, 0x26, 0x7b, 0x94, 0x0b, 0xbd, 0xaf, 0xc8, 0xa4, 0x60, 0xf2, + 0x20, 0xce, 0x25, 0x68, 0xc0, 0xab, 0x4e, 0x12, 0x57, 0x24, 0xc1, 0x4a, 0x06, 0x19, 0x18, 0x05, + 0x29, 0x7f, 0x59, 0x71, 0x70, 0x37, 0x03, 0xc8, 0xde, 0x32, 0x42, 0x73, 0x4e, 0xa8, 0x10, 0xa0, + 0xa9, 0xe6, 0x20, 0x94, 0xfb, 0x77, 0x23, 0x01, 0x35, 0x06, 0x45, 0x46, 0x54, 0x31, 0x9b, 0x41, + 0xde, 0x6d, 0x8e, 0x98, 0xa6, 0x9b, 0x24, 0xa7, 0x19, 0x17, 0x46, 0xec, 0xb4, 0x51, 0x3d, 0x59, + 0x4e, 0x25, 0x1d, 0x3b, 0xbf, 0x68, 0x05, 0xe1, 0x57, 0xa5, 0xcb, 0x4b, 0x53, 0x1c, 0xb0, 0x49, + 0xc1, 0x94, 0x8e, 0x06, 0x68, 0xb9, 0x52, 0x55, 0x39, 0x08, 0xc5, 0xf0, 0x16, 0x6a, 0xdb, 0xe6, + 0x8e, 0x7f, 0xcf, 0x7f, 0x74, 0xab, 0xb7, 0x16, 0xd7, 0x3e, 0x2c, 0xb6, 0x6d, 0xbb, 0xd7, 0x8e, + 0x7f, 0x74, 0xbd, 0x81, 0x6b, 0x89, 0xbe, 0xfa, 0xe8, 0xa1, 0x31, 0xed, 0x9f, 0x69, 0x77, 0x92, + 0x04, 0x0a, 0xa1, 0x77, 0xd2, 0x54, 0x32, 0x75, 0x1a, 0x8e, 0x1f, 0xa0, 0x3b, 0xf0, 0x5e, 0x30, + 0x39, 0xa4, 0xb6, 0x6e, 0xc2, 0x6e, 0x0e, 0x6e, 0x9b, 0xa2, 0xd3, 0xe2, 0x1e, 0x5a, 0x3d, 0xcf, + 0x1c, 0x52, 0x6b, 0x34, 0xe4, 0x69, 0xa7, 0x65, 0xc4, 0xcb, 0xfc, 0x62, 0x48, 0x3f, 0x2d, 0x8d, + 0x13, 0x10, 0x82, 0x25, 0xe5, 0x8c, 0x4a, 0xed, 0x92, 0x35, 0x3e, 0x2f, 0xf6, 0xd3, 0xe7, 0x37, + 0x0e, 0x8f, 0xba, 0xde, 0xef, 0xa3, 0xae, 0x17, 0x31, 0xb4, 0x7e, 0x05, 0xaf, 0x1b, 0xcb, 0x36, + 0x0a, 0x6a, 0x58, 0xaa, 0xf4, 0x1d, 0xde, 0xe0, 0xd2, 0xfb, 0xb2, 0x84, 0xae, 0x9b, 0x1c, 0xfc, + 0xd1, 0x47, 0x6d, 0x3b, 0x3a, 0xfc, 0xb8, 0x61, 0xb2, 0x7f, 0xef, 0x2a, 0xd8, 0xf8, 0x17, 0xa9, + 0x25, 0x8d, 0xd6, 0x3f, 0x7c, 0xfb, 0xf5, 0xb9, 0xd5, 0xc5, 0x6b, 0xe4, 0xb2, 0xd3, 0xc0, 0x87, + 0x2d, 0xd4, 0x69, 0x7a, 0x35, 0xde, 0xba, 0x2c, 0xef, 0x8a, 0xdd, 0x06, 0xdb, 0xff, 0xd7, 0xec, + 0xf0, 0x27, 0x06, 0xff, 0x0d, 0xe6, 0x0d, 0xf8, 0xd3, 0xca, 0xdd, 0xcc, 0xc8, 0xb4, 0xf6, 0x44, + 0x66, 0x64, 0x5a, 0x39, 0x83, 0x19, 0x69, 0xde, 0xde, 0xee, 0x8b, 0xe3, 0x79, 0xe8, 0x9f, 0xcc, + 0x43, 0xff, 0xe7, 0x3c, 0xf4, 0x3f, 0x2d, 0x42, 0xef, 0x64, 0x11, 0x7a, 0xdf, 0x17, 0xa1, 0xf7, + 0xfa, 0x59, 0xc6, 0xf5, 0x5e, 0x31, 0x8a, 0x13, 0x18, 0x9f, 0xe2, 0x3c, 0x01, 0x99, 0x9d, 0xa1, + 0xed, 0x5f, 0x80, 0xd3, 0x07, 0x39, 0x53, 0xa3, 0xb6, 0xf9, 0xec, 0x9e, 0xfe, 0x09, 0x00, 0x00, + 0xff, 0xff, 0x39, 0xa6, 0x49, 0x7e, 0x36, 0x04, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -277,7 +274,7 @@ func NewQueryClient(cc grpc1.ClientConn) QueryClient { func (c *queryClient) Params(ctx context.Context, in *QueryParamsRequest, opts ...grpc.CallOption) (*QueryParamsResponse, error) { out := new(QueryParamsResponse) - err := c.cc.Invoke(ctx, "/neutron.interchaintxs.v1.Query/Params", in, out, opts...) + err := c.cc.Invoke(ctx, "/neutron.interchaintxs.Query/Params", in, out, opts...) if err != nil { return nil, err } @@ -286,7 +283,7 @@ func (c *queryClient) Params(ctx context.Context, in *QueryParamsRequest, opts . func (c *queryClient) InterchainAccountAddress(ctx context.Context, in *QueryInterchainAccountAddressRequest, opts ...grpc.CallOption) (*QueryInterchainAccountAddressResponse, error) { out := new(QueryInterchainAccountAddressResponse) - err := c.cc.Invoke(ctx, "/neutron.interchaintxs.v1.Query/InterchainAccountAddress", in, out, opts...) + err := c.cc.Invoke(ctx, "/neutron.interchaintxs.Query/InterchainAccountAddress", in, out, opts...) if err != nil { return nil, err } @@ -325,7 +322,7 @@ func _Query_Params_Handler(srv interface{}, ctx context.Context, dec func(interf } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/neutron.interchaintxs.v1.Query/Params", + FullMethod: "/neutron.interchaintxs.Query/Params", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).Params(ctx, req.(*QueryParamsRequest)) @@ -343,7 +340,7 @@ func _Query_InterchainAccountAddress_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/neutron.interchaintxs.v1.Query/InterchainAccountAddress", + FullMethod: "/neutron.interchaintxs.Query/InterchainAccountAddress", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).InterchainAccountAddress(ctx, req.(*QueryInterchainAccountAddressRequest)) @@ -352,7 +349,7 @@ func _Query_InterchainAccountAddress_Handler(srv interface{}, ctx context.Contex } var _Query_serviceDesc = grpc.ServiceDesc{ - ServiceName: "neutron.interchaintxs.v1.Query", + ServiceName: "neutron.interchaintxs.Query", HandlerType: (*QueryServer)(nil), Methods: []grpc.MethodDesc{ { @@ -365,7 +362,7 @@ var _Query_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "neutron/interchaintxs/v1/query.proto", + Metadata: "neutron/interchaintxs/query.proto", } func (m *QueryParamsRequest) Marshal() (dAtA []byte, err error) { diff --git a/x/interchaintxs/types/query.pb.gw.go b/x/interchaintxs/types/query.pb.gw.go index 943b58aab..7fd1f4d23 100644 --- a/x/interchaintxs/types/query.pb.gw.go +++ b/x/interchaintxs/types/query.pb.gw.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-grpc-gateway. DO NOT EDIT. -// source: neutron/interchaintxs/v1/query.proto +// source: neutron/interchaintxs/query.proto /* Package types is a reverse proxy. diff --git a/x/interchaintxs/types/tx.pb.go b/x/interchaintxs/types/tx.pb.go index 89d6f5d02..0b6665e65 100644 --- a/x/interchaintxs/types/tx.pb.go +++ b/x/interchaintxs/types/tx.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: neutron/interchaintxs/v1/tx.proto +// source: neutron/interchaintxs/tx.proto package types @@ -48,7 +48,7 @@ func (m *MsgRegisterInterchainAccount) Reset() { *m = MsgRegisterInterch func (m *MsgRegisterInterchainAccount) String() string { return proto.CompactTextString(m) } func (*MsgRegisterInterchainAccount) ProtoMessage() {} func (*MsgRegisterInterchainAccount) Descriptor() ([]byte, []int) { - return fileDescriptor_50f087790e59c806, []int{0} + return fileDescriptor_40a159e5a7dbb364, []int{0} } func (m *MsgRegisterInterchainAccount) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -86,7 +86,7 @@ func (m *MsgRegisterInterchainAccountResponse) Reset() { *m = MsgRegiste func (m *MsgRegisterInterchainAccountResponse) String() string { return proto.CompactTextString(m) } func (*MsgRegisterInterchainAccountResponse) ProtoMessage() {} func (*MsgRegisterInterchainAccountResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_50f087790e59c806, []int{1} + return fileDescriptor_40a159e5a7dbb364, []int{1} } func (m *MsgRegisterInterchainAccountResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -135,7 +135,7 @@ func (m *MsgSubmitTx) Reset() { *m = MsgSubmitTx{} } func (m *MsgSubmitTx) String() string { return proto.CompactTextString(m) } func (*MsgSubmitTx) ProtoMessage() {} func (*MsgSubmitTx) Descriptor() ([]byte, []int) { - return fileDescriptor_50f087790e59c806, []int{2} + return fileDescriptor_40a159e5a7dbb364, []int{2} } func (m *MsgSubmitTx) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -176,7 +176,7 @@ func (m *MsgSubmitTxResponse) Reset() { *m = MsgSubmitTxResponse{} } func (m *MsgSubmitTxResponse) String() string { return proto.CompactTextString(m) } func (*MsgSubmitTxResponse) ProtoMessage() {} func (*MsgSubmitTxResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_50f087790e59c806, []int{3} + return fileDescriptor_40a159e5a7dbb364, []int{3} } func (m *MsgSubmitTxResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -235,7 +235,7 @@ 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_50f087790e59c806, []int{4} + return fileDescriptor_40a159e5a7dbb364, []int{4} } func (m *MsgUpdateParams) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -289,7 +289,7 @@ 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_50f087790e59c806, []int{5} + return fileDescriptor_40a159e5a7dbb364, []int{5} } func (m *MsgUpdateParamsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -319,69 +319,68 @@ func (m *MsgUpdateParamsResponse) XXX_DiscardUnknown() { var xxx_messageInfo_MsgUpdateParamsResponse proto.InternalMessageInfo func init() { - proto.RegisterType((*MsgRegisterInterchainAccount)(nil), "neutron.interchaintxs.v1.MsgRegisterInterchainAccount") - proto.RegisterType((*MsgRegisterInterchainAccountResponse)(nil), "neutron.interchaintxs.v1.MsgRegisterInterchainAccountResponse") - proto.RegisterType((*MsgSubmitTx)(nil), "neutron.interchaintxs.v1.MsgSubmitTx") - proto.RegisterType((*MsgSubmitTxResponse)(nil), "neutron.interchaintxs.v1.MsgSubmitTxResponse") - proto.RegisterType((*MsgUpdateParams)(nil), "neutron.interchaintxs.v1.MsgUpdateParams") - proto.RegisterType((*MsgUpdateParamsResponse)(nil), "neutron.interchaintxs.v1.MsgUpdateParamsResponse") -} - -func init() { proto.RegisterFile("neutron/interchaintxs/v1/tx.proto", fileDescriptor_50f087790e59c806) } - -var fileDescriptor_50f087790e59c806 = []byte{ - // 802 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0xbf, 0x6b, 0x1b, 0x4b, - 0x10, 0xd6, 0x49, 0x7a, 0xfe, 0xb1, 0xd2, 0xe3, 0xf1, 0xce, 0x32, 0x3e, 0x09, 0x5b, 0x92, 0xef, - 0x3d, 0x07, 0xc5, 0xa0, 0x3b, 0x4b, 0x09, 0x2e, 0x0c, 0x09, 0x58, 0x06, 0x83, 0x0a, 0x05, 0x73, - 0x76, 0x9a, 0x34, 0x62, 0x75, 0xb7, 0x3a, 0x1d, 0xd1, 0xed, 0x2a, 0xb7, 0x7b, 0x46, 0x6a, 0x53, - 0x85, 0x54, 0x69, 0x52, 0x06, 0x5c, 0x86, 0x54, 0x2e, 0xf2, 0x07, 0xa4, 0x74, 0x69, 0x52, 0xa5, - 0x72, 0x82, 0x5d, 0x38, 0x5d, 0xc0, 0x7f, 0x41, 0xb8, 0xbd, 0x3d, 0xeb, 0x07, 0x96, 0x30, 0x69, - 0xa4, 0x9d, 0x99, 0x6f, 0xbf, 0x99, 0xfd, 0x66, 0x76, 0x0f, 0xac, 0x63, 0xe4, 0x33, 0x8f, 0x60, - 0xdd, 0xc1, 0x0c, 0x79, 0x66, 0x07, 0x3a, 0x98, 0xf5, 0xa9, 0x7e, 0x5c, 0xd1, 0x59, 0x5f, 0xeb, - 0x79, 0x84, 0x11, 0x59, 0x11, 0x10, 0x6d, 0x0c, 0xa2, 0x1d, 0x57, 0x72, 0x59, 0x93, 0x50, 0x97, - 0xd0, 0x26, 0xc7, 0xe9, 0xa1, 0x11, 0x6e, 0xca, 0xe5, 0x43, 0x4b, 0x6f, 0x41, 0x8a, 0xf4, 0xe3, - 0x4a, 0x0b, 0x31, 0x58, 0xd1, 0x4d, 0xe2, 0x60, 0x11, 0xdf, 0x98, 0x9a, 0xb7, 0x07, 0x3d, 0xe8, - 0x46, 0x34, 0x19, 0x9b, 0xd8, 0x24, 0xa4, 0x0f, 0x56, 0xc2, 0xbb, 0x6c, 0x13, 0x62, 0x77, 0x91, - 0x0e, 0x7b, 0x8e, 0xde, 0x61, 0xac, 0x27, 0xdc, 0xab, 0x23, 0x6e, 0x88, 0x31, 0x61, 0x90, 0x39, - 0x04, 0x47, 0x54, 0x59, 0x11, 0xe5, 0x56, 0xcb, 0x6f, 0xeb, 0x10, 0x0f, 0x44, 0x68, 0x2d, 0x2a, - 0xa6, 0x8d, 0x90, 0x87, 0xda, 0x3e, 0xb6, 0x90, 0x17, 0xac, 0x45, 0x78, 0x45, 0x9c, 0xc5, 0xa5, - 0x76, 0x50, 0xa0, 0x4b, 0x6d, 0x11, 0xf8, 0x17, 0xba, 0x0e, 0x26, 0x3a, 0xff, 0x0d, 0x5d, 0xea, - 0x79, 0x1c, 0xac, 0x36, 0xa8, 0x6d, 0x20, 0xdb, 0xa1, 0x0c, 0x79, 0xf5, 0xdb, 0xd3, 0xed, 0x9a, - 0x26, 0xf1, 0x31, 0x93, 0xd7, 0x41, 0xba, 0xed, 0x11, 0xb7, 0x09, 0x2d, 0xcb, 0x43, 0x94, 0x2a, - 0x52, 0x51, 0x2a, 0x2d, 0x1a, 0xa9, 0xc0, 0xb7, 0x1b, 0xba, 0xe4, 0x27, 0xe0, 0x6f, 0x93, 0x60, - 0x8c, 0xcc, 0xa0, 0xfc, 0xa6, 0x63, 0x29, 0xf1, 0x00, 0x53, 0x53, 0x6e, 0x2e, 0x0a, 0x99, 0x01, - 0x74, 0xbb, 0x3b, 0xea, 0x58, 0x58, 0x35, 0xd2, 0x43, 0xbb, 0x6e, 0xc9, 0x47, 0x60, 0x79, 0x28, - 0x6a, 0x13, 0x86, 0x79, 0x03, 0x9a, 0x04, 0xa7, 0x29, 0xde, 0x5c, 0x14, 0x56, 0x43, 0x9a, 0x3b, - 0x61, 0xaa, 0xb1, 0xe4, 0x4c, 0x56, 0x5d, 0xb7, 0x64, 0x0c, 0xd2, 0x9e, 0x38, 0x54, 0xb3, 0x8d, - 0x90, 0x92, 0x2c, 0x26, 0x4a, 0xa9, 0x6a, 0x56, 0x13, 0x5d, 0x0f, 0xfa, 0xac, 0x89, 0x3e, 0x6b, - 0x7b, 0xc4, 0xc1, 0xb5, 0xad, 0xb3, 0x8b, 0x42, 0xec, 0xd3, 0xf7, 0x42, 0xc9, 0x76, 0x58, 0xc7, - 0x6f, 0x69, 0x26, 0x71, 0xc5, 0x88, 0x88, 0xbf, 0x32, 0xb5, 0x5e, 0xea, 0x6c, 0xd0, 0x43, 0x94, - 0x6f, 0xa0, 0x46, 0x2a, 0x4a, 0xb0, 0x8f, 0xd0, 0xce, 0xc2, 0x9b, 0x93, 0x42, 0xec, 0xe7, 0x49, - 0x21, 0xa6, 0x3e, 0x00, 0xff, 0xcf, 0x52, 0xd4, 0x40, 0xb4, 0x47, 0x30, 0x45, 0xea, 0x87, 0x38, - 0x48, 0x35, 0xa8, 0x7d, 0xe8, 0xb7, 0x5c, 0x87, 0x1d, 0xf5, 0xef, 0xa3, 0x74, 0x75, 0x9a, 0x54, - 0x5c, 0xf1, 0xbb, 0x85, 0xf8, 0x6f, 0xb2, 0x3b, 0x5c, 0xd6, 0x89, 0x1e, 0x94, 0x40, 0xd2, 0xa5, - 0x36, 0x15, 0x2a, 0x65, 0xb4, 0x70, 0xf6, 0xb4, 0x68, 0xf6, 0xb4, 0x5d, 0x3c, 0x30, 0x38, 0x42, - 0x96, 0x41, 0xd2, 0x45, 0x2e, 0x51, 0xfe, 0xe2, 0x2c, 0x7c, 0x2d, 0x2b, 0x60, 0x9e, 0x39, 0x2e, - 0x22, 0x3e, 0x53, 0xe6, 0x8a, 0x52, 0x29, 0x69, 0x44, 0xa6, 0xbc, 0x05, 0x12, 0x81, 0xf8, 0xf3, - 0x45, 0xa9, 0x94, 0xaa, 0x2a, 0x5a, 0x74, 0x33, 0x47, 0xe6, 0x56, 0xdb, 0x47, 0xa8, 0x96, 0x0c, - 0xb4, 0x37, 0x02, 0xe8, 0x88, 0x8e, 0x07, 0x60, 0x69, 0x44, 0x9e, 0x48, 0x36, 0xb9, 0x00, 0x52, - 0x14, 0xbd, 0xf2, 0x11, 0x36, 0x51, 0x70, 0x1a, 0x89, 0x27, 0x04, 0x91, 0xab, 0x6e, 0x05, 0xd5, - 0x98, 0x1d, 0x88, 0x31, 0xea, 0x0a, 0x59, 0x22, 0x53, 0xfd, 0x22, 0x81, 0x7f, 0x1a, 0xd4, 0x7e, - 0xde, 0xb3, 0x20, 0x43, 0x07, 0xfc, 0xde, 0xca, 0xdb, 0x60, 0x11, 0xfa, 0xac, 0x43, 0x3c, 0x87, - 0x0d, 0x42, 0xc9, 0x6b, 0xca, 0xd7, 0xcf, 0xe5, 0x8c, 0x98, 0x13, 0xa1, 0xfc, 0x21, 0xf3, 0x1c, - 0x6c, 0x1b, 0x43, 0xa8, 0xbc, 0x07, 0xe6, 0xc2, 0x9b, 0xcf, 0x93, 0xa4, 0xaa, 0x45, 0x6d, 0xda, - 0xb3, 0xa3, 0x85, 0x99, 0x6a, 0x8b, 0xc1, 0x21, 0x3f, 0x5e, 0x9f, 0x6e, 0x4a, 0x86, 0xd8, 0xba, - 0xb3, 0xf5, 0xfa, 0xfa, 0x74, 0x73, 0x48, 0xfa, 0xf6, 0xfa, 0x74, 0x73, 0x6d, 0xfc, 0x81, 0x99, - 0x28, 0x57, 0xcd, 0x82, 0x95, 0x09, 0x57, 0x24, 0x4c, 0xf5, 0x57, 0x1c, 0x24, 0x1a, 0xd4, 0x96, - 0xdf, 0x4b, 0x20, 0x3b, 0xfd, 0x3e, 0x6f, 0x4f, 0xaf, 0x73, 0xd6, 0xd4, 0xe6, 0x9e, 0xfe, 0xd9, - 0xbe, 0xdb, 0x69, 0x8f, 0xc9, 0x2d, 0xb0, 0x70, 0x3b, 0xeb, 0x1b, 0x33, 0xd9, 0x22, 0x58, 0xae, - 0x7c, 0x2f, 0xd8, 0x48, 0x8e, 0x2e, 0x48, 0x8f, 0x75, 0xf7, 0xe1, 0x4c, 0x82, 0x51, 0x68, 0xae, - 0x72, 0x6f, 0x68, 0x94, 0xaf, 0xf6, 0xec, 0xec, 0x32, 0x2f, 0x9d, 0x5f, 0xe6, 0xa5, 0x1f, 0x97, - 0x79, 0xe9, 0xdd, 0x55, 0x3e, 0x76, 0x7e, 0x95, 0x8f, 0x7d, 0xbb, 0xca, 0xc7, 0x5e, 0x3c, 0x1e, - 0x79, 0x44, 0x04, 0x6d, 0x99, 0x78, 0x76, 0xb4, 0xd6, 0xfb, 0x13, 0xdf, 0x11, 0xfe, 0xac, 0xb4, - 0xe6, 0xf8, 0x7d, 0x7b, 0xf4, 0x3b, 0x00, 0x00, 0xff, 0xff, 0xe0, 0xd3, 0x11, 0x00, 0xe5, 0x06, - 0x00, 0x00, + proto.RegisterType((*MsgRegisterInterchainAccount)(nil), "neutron.interchaintxs.MsgRegisterInterchainAccount") + proto.RegisterType((*MsgRegisterInterchainAccountResponse)(nil), "neutron.interchaintxs.MsgRegisterInterchainAccountResponse") + proto.RegisterType((*MsgSubmitTx)(nil), "neutron.interchaintxs.MsgSubmitTx") + proto.RegisterType((*MsgSubmitTxResponse)(nil), "neutron.interchaintxs.MsgSubmitTxResponse") + proto.RegisterType((*MsgUpdateParams)(nil), "neutron.interchaintxs.MsgUpdateParams") + proto.RegisterType((*MsgUpdateParamsResponse)(nil), "neutron.interchaintxs.MsgUpdateParamsResponse") +} + +func init() { proto.RegisterFile("neutron/interchaintxs/tx.proto", fileDescriptor_40a159e5a7dbb364) } + +var fileDescriptor_40a159e5a7dbb364 = []byte{ + // 795 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0xcf, 0x6f, 0xd3, 0x4a, + 0x10, 0x8e, 0x93, 0xbc, 0xfe, 0xd8, 0xe4, 0xe9, 0xe9, 0xb9, 0xa9, 0xea, 0x44, 0xad, 0x13, 0x0c, + 0xaa, 0xa2, 0x48, 0xb5, 0xdb, 0x14, 0x71, 0x28, 0x42, 0xa2, 0x41, 0xaa, 0x94, 0x43, 0x50, 0xe5, + 0x96, 0x0b, 0x42, 0x8a, 0x36, 0xf6, 0xc6, 0xb1, 0xa8, 0x77, 0x83, 0x77, 0x5d, 0x25, 0x57, 0x4e, + 0x88, 0x0b, 0xfc, 0x03, 0x48, 0x3d, 0x22, 0x4e, 0x3d, 0x70, 0xe5, 0xde, 0x63, 0xc5, 0x89, 0x0b, + 0x05, 0xb5, 0x87, 0x72, 0xee, 0x5f, 0x80, 0xd6, 0x5e, 0x37, 0x3f, 0x94, 0x94, 0x8a, 0x4b, 0xbc, + 0x33, 0xf3, 0xed, 0x37, 0xb3, 0xdf, 0xcc, 0x6e, 0x80, 0x8a, 0x51, 0xc0, 0x7c, 0x82, 0x0d, 0x17, + 0x33, 0xe4, 0x5b, 0x1d, 0xe8, 0x62, 0xd6, 0xa3, 0x06, 0xeb, 0xe9, 0x5d, 0x9f, 0x30, 0x22, 0x2f, + 0x8a, 0xb8, 0x3e, 0x12, 0x2f, 0xe4, 0x2d, 0x42, 0x3d, 0x42, 0x9b, 0x21, 0xc8, 0x88, 0x8c, 0x68, + 0x47, 0x41, 0x8d, 0x2c, 0xa3, 0x05, 0x29, 0x32, 0x0e, 0x37, 0x5a, 0x88, 0xc1, 0x0d, 0xc3, 0x22, + 0x2e, 0x16, 0x71, 0x6d, 0x72, 0xc6, 0x2e, 0xf4, 0xa1, 0x17, 0x73, 0xe4, 0x1c, 0xe2, 0x90, 0x88, + 0x9b, 0xaf, 0x84, 0x77, 0xd1, 0x21, 0xc4, 0x39, 0x40, 0x06, 0xec, 0xba, 0x46, 0x87, 0xb1, 0xae, + 0x70, 0x2f, 0x0f, 0xb9, 0x21, 0xc6, 0x84, 0x41, 0xe6, 0x12, 0x1c, 0x53, 0xe5, 0x45, 0x34, 0xb4, + 0x5a, 0x41, 0xdb, 0x80, 0xb8, 0x2f, 0x42, 0x2b, 0x71, 0x25, 0x6d, 0x84, 0x7c, 0xd4, 0x0e, 0xb0, + 0x8d, 0x7c, 0xbe, 0x16, 0xe1, 0x25, 0x71, 0x10, 0x8f, 0x3a, 0xc6, 0xe1, 0x06, 0xff, 0x88, 0xc0, + 0xff, 0xd0, 0x73, 0x31, 0x31, 0xc2, 0xdf, 0xc8, 0xa5, 0x9d, 0x26, 0xc1, 0x72, 0x83, 0x3a, 0x26, + 0x72, 0x5c, 0xca, 0x90, 0x5f, 0xbf, 0x3e, 0xda, 0xb6, 0x65, 0x91, 0x00, 0x33, 0xf9, 0x0e, 0xc8, + 0xb6, 0x7d, 0xe2, 0x35, 0xa1, 0x6d, 0xfb, 0x88, 0x52, 0x45, 0x2a, 0x49, 0xe5, 0x79, 0x33, 0xc3, + 0x7d, 0xdb, 0x91, 0x4b, 0x7e, 0x04, 0xfe, 0xb5, 0x08, 0xc6, 0xc8, 0xe2, 0xe5, 0x37, 0x5d, 0x5b, + 0x49, 0x72, 0x4c, 0x4d, 0xb9, 0x3a, 0x2b, 0xe6, 0xfa, 0xd0, 0x3b, 0xd8, 0xd2, 0x46, 0xc2, 0x9a, + 0x99, 0x1d, 0xd8, 0x75, 0x5b, 0xde, 0x07, 0x8b, 0x03, 0x45, 0x9b, 0x30, 0xca, 0xcb, 0x69, 0x52, + 0x21, 0x4d, 0xe9, 0xea, 0xac, 0xb8, 0x1c, 0xd1, 0x4c, 0x84, 0x69, 0xe6, 0x82, 0x3b, 0x5e, 0x75, + 0xdd, 0x96, 0x31, 0xc8, 0xfa, 0xe2, 0x50, 0xcd, 0x36, 0x42, 0x4a, 0xba, 0x94, 0x2a, 0x67, 0xaa, + 0x79, 0x5d, 0xb4, 0x9c, 0x37, 0x59, 0x17, 0x4d, 0xd6, 0x9f, 0x10, 0x17, 0xd7, 0xd6, 0x4f, 0xce, + 0x8a, 0x89, 0x4f, 0x3f, 0x8a, 0x65, 0xc7, 0x65, 0x9d, 0xa0, 0xa5, 0x5b, 0xc4, 0x13, 0xf3, 0x21, + 0x3e, 0x6b, 0xd4, 0x7e, 0x69, 0xb0, 0x7e, 0x17, 0xd1, 0x70, 0x03, 0x35, 0x33, 0x71, 0x82, 0x1d, + 0x84, 0xb6, 0xe6, 0xde, 0x1c, 0x15, 0x13, 0xbf, 0x8e, 0x8a, 0x09, 0x6d, 0x15, 0xdc, 0xbb, 0x49, + 0x51, 0x13, 0xd1, 0x2e, 0xc1, 0x14, 0x69, 0x1f, 0x92, 0x20, 0xd3, 0xa0, 0xce, 0x5e, 0xd0, 0xf2, + 0x5c, 0xb6, 0xdf, 0xbb, 0x8d, 0xd2, 0xd5, 0x69, 0x52, 0x85, 0x8a, 0x4f, 0x16, 0xe2, 0xee, 0x78, + 0x77, 0x42, 0x59, 0xc7, 0x7a, 0x50, 0x06, 0x69, 0x8f, 0x3a, 0x54, 0xa8, 0x94, 0xd3, 0xa3, 0xd9, + 0xd3, 0xe3, 0xd9, 0xd3, 0xb7, 0x71, 0xdf, 0x0c, 0x11, 0xb2, 0x0c, 0xd2, 0x1e, 0xf2, 0x88, 0xf2, + 0x4f, 0xc8, 0x12, 0xae, 0x65, 0x05, 0xcc, 0x32, 0xd7, 0x43, 0x24, 0x60, 0xca, 0x4c, 0x49, 0x2a, + 0xa7, 0xcd, 0xd8, 0x94, 0xd7, 0x41, 0x8a, 0x8b, 0x3f, 0x5b, 0x92, 0xca, 0x99, 0xaa, 0xa2, 0xc7, + 0x77, 0x72, 0x68, 0x6e, 0xf5, 0x1d, 0x84, 0x6a, 0x69, 0xae, 0xbd, 0xc9, 0xa1, 0x43, 0x3a, 0xee, + 0x82, 0x85, 0x21, 0x79, 0x62, 0xd9, 0xe4, 0x22, 0xc8, 0x50, 0xf4, 0x2a, 0x40, 0xd8, 0x42, 0xfc, + 0x34, 0x52, 0x98, 0x10, 0xc4, 0xae, 0xba, 0xcd, 0xab, 0xb1, 0x3a, 0x10, 0x63, 0x74, 0x20, 0x64, + 0x89, 0x4d, 0xed, 0x8b, 0x04, 0xfe, 0x6b, 0x50, 0xe7, 0x59, 0xd7, 0x86, 0x0c, 0xed, 0x86, 0xf7, + 0x56, 0x7e, 0x00, 0xe6, 0x61, 0xc0, 0x3a, 0xc4, 0x77, 0x59, 0x3f, 0x92, 0xbc, 0xa6, 0x7c, 0xfd, + 0xbc, 0x96, 0x13, 0x73, 0x22, 0x94, 0xdf, 0x63, 0xbe, 0x8b, 0x1d, 0x73, 0x00, 0x95, 0x1f, 0x83, + 0x99, 0xe8, 0xe6, 0x87, 0x49, 0x32, 0xd5, 0x15, 0x7d, 0xe2, 0x83, 0xa3, 0x47, 0x69, 0x6a, 0xf3, + 0xfc, 0x84, 0x1f, 0x2f, 0x8f, 0x2b, 0x92, 0x29, 0xf6, 0x6d, 0xad, 0xbf, 0xbe, 0x3c, 0xae, 0x0c, + 0x18, 0xdf, 0x5e, 0x1e, 0x57, 0x56, 0x46, 0x9f, 0x96, 0xb1, 0x5a, 0xb5, 0x3c, 0x58, 0x1a, 0x73, + 0xc5, 0xaa, 0x54, 0xbf, 0x27, 0x41, 0xaa, 0x41, 0x1d, 0xf9, 0x9d, 0x04, 0xf2, 0xd3, 0x2f, 0xf3, + 0xe6, 0x94, 0x22, 0x6f, 0x9a, 0xd7, 0xc2, 0xc3, 0xbf, 0xd8, 0x74, 0x3d, 0xe4, 0x09, 0xf9, 0x05, + 0x98, 0xbb, 0x1e, 0x71, 0x6d, 0x3a, 0x55, 0x8c, 0x29, 0x54, 0xfe, 0x8c, 0x19, 0x62, 0x6f, 0x83, + 0xec, 0x48, 0x3b, 0x57, 0xa7, 0xef, 0x1e, 0xc6, 0x15, 0xf4, 0xdb, 0xe1, 0xe2, 0x4c, 0xb5, 0xa7, + 0x27, 0xe7, 0xaa, 0x74, 0x7a, 0xae, 0x4a, 0x3f, 0xcf, 0x55, 0xe9, 0xfd, 0x85, 0x9a, 0x38, 0xbd, + 0x50, 0x13, 0xdf, 0x2e, 0xd4, 0xc4, 0xf3, 0xfb, 0x43, 0xef, 0x85, 0xe0, 0x5c, 0x23, 0xbe, 0x13, + 0xaf, 0x8d, 0xde, 0xf8, 0x3f, 0x14, 0x7f, 0x41, 0x5a, 0x33, 0xe1, 0xd5, 0xda, 0xfc, 0x1d, 0x00, + 0x00, 0xff, 0xff, 0xba, 0xdc, 0x2b, 0xd0, 0xc7, 0x06, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -411,7 +410,7 @@ func NewMsgClient(cc grpc1.ClientConn) MsgClient { func (c *msgClient) RegisterInterchainAccount(ctx context.Context, in *MsgRegisterInterchainAccount, opts ...grpc.CallOption) (*MsgRegisterInterchainAccountResponse, error) { out := new(MsgRegisterInterchainAccountResponse) - err := c.cc.Invoke(ctx, "/neutron.interchaintxs.v1.Msg/RegisterInterchainAccount", in, out, opts...) + err := c.cc.Invoke(ctx, "/neutron.interchaintxs.Msg/RegisterInterchainAccount", in, out, opts...) if err != nil { return nil, err } @@ -420,7 +419,7 @@ func (c *msgClient) RegisterInterchainAccount(ctx context.Context, in *MsgRegist func (c *msgClient) SubmitTx(ctx context.Context, in *MsgSubmitTx, opts ...grpc.CallOption) (*MsgSubmitTxResponse, error) { out := new(MsgSubmitTxResponse) - err := c.cc.Invoke(ctx, "/neutron.interchaintxs.v1.Msg/SubmitTx", in, out, opts...) + err := c.cc.Invoke(ctx, "/neutron.interchaintxs.Msg/SubmitTx", in, out, opts...) if err != nil { return nil, err } @@ -429,7 +428,7 @@ func (c *msgClient) SubmitTx(ctx context.Context, in *MsgSubmitTx, opts ...grpc. func (c *msgClient) UpdateParams(ctx context.Context, in *MsgUpdateParams, opts ...grpc.CallOption) (*MsgUpdateParamsResponse, error) { out := new(MsgUpdateParamsResponse) - err := c.cc.Invoke(ctx, "/neutron.interchaintxs.v1.Msg/UpdateParams", in, out, opts...) + err := c.cc.Invoke(ctx, "/neutron.interchaintxs.Msg/UpdateParams", in, out, opts...) if err != nil { return nil, err } @@ -471,7 +470,7 @@ func _Msg_RegisterInterchainAccount_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/neutron.interchaintxs.v1.Msg/RegisterInterchainAccount", + FullMethod: "/neutron.interchaintxs.Msg/RegisterInterchainAccount", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MsgServer).RegisterInterchainAccount(ctx, req.(*MsgRegisterInterchainAccount)) @@ -489,7 +488,7 @@ func _Msg_SubmitTx_Handler(srv interface{}, ctx context.Context, dec func(interf } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/neutron.interchaintxs.v1.Msg/SubmitTx", + FullMethod: "/neutron.interchaintxs.Msg/SubmitTx", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MsgServer).SubmitTx(ctx, req.(*MsgSubmitTx)) @@ -507,7 +506,7 @@ func _Msg_UpdateParams_Handler(srv interface{}, ctx context.Context, dec func(in } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/neutron.interchaintxs.v1.Msg/UpdateParams", + FullMethod: "/neutron.interchaintxs.Msg/UpdateParams", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MsgServer).UpdateParams(ctx, req.(*MsgUpdateParams)) @@ -516,7 +515,7 @@ func _Msg_UpdateParams_Handler(srv interface{}, ctx context.Context, dec func(in } var _Msg_serviceDesc = grpc.ServiceDesc{ - ServiceName: "neutron.interchaintxs.v1.Msg", + ServiceName: "neutron.interchaintxs.Msg", HandlerType: (*MsgServer)(nil), Methods: []grpc.MethodDesc{ { @@ -533,7 +532,7 @@ var _Msg_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "neutron/interchaintxs/v1/tx.proto", + Metadata: "neutron/interchaintxs/tx.proto", } func (m *MsgRegisterInterchainAccount) Marshal() (dAtA []byte, err error) { From 0d8dc79f2f773714a38b1a44329c70676c9f9f2e Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Thu, 23 Nov 2023 13:13:32 +0200 Subject: [PATCH 295/307] remove skip's block-sdk --- app/ante_handler.go | 22 ------ app/app.go | 118 ++----------------------------- app/proposals_allowlisting.go | 2 - app/upgrades/types.go | 2 - app/upgrades/v1.1.0/constants.go | 2 - app/upgrades/v1.1.0/upgrades.go | 29 -------- go.mod | 33 +++++---- go.sum | 72 +++++++++---------- 8 files changed, 56 insertions(+), 224 deletions(-) diff --git a/app/ante_handler.go b/app/ante_handler.go index d7821cf1a..7f193471d 100644 --- a/app/ante_handler.go +++ b/app/ante_handler.go @@ -15,9 +15,6 @@ import ( ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper" consumerante "github.com/cosmos/interchain-security/v3/app/consumer/ante" ibcconsumerkeeper "github.com/cosmos/interchain-security/v3/x/ccv/consumer/keeper" - blocksdk "github.com/skip-mev/block-sdk/block" - auctionante "github.com/skip-mev/block-sdk/x/auction/ante" - auctionkeeper "github.com/skip-mev/block-sdk/x/auction/keeper" ) // HandlerOptions extend the SDK's AnteHandler options by requiring the IBC @@ -30,13 +27,6 @@ type HandlerOptions struct { WasmConfig *wasmTypes.WasmConfig TXCounterStoreKey storetypes.StoreKey - // block-sdk deps - // Auction deps - AuctionKeeper auctionkeeper.Keeper - TxEncoder sdk.TxEncoder - MEVLane auctionante.MEVLane - Mempool blocksdk.Mempool - // globalFee GlobalFeeSubspace paramtypes.Subspace } @@ -61,13 +51,6 @@ func NewAnteHandler(options HandlerOptions, logger log.Logger) (sdk.AnteHandler, return nil, errors.Wrap(gaiaerrors.ErrNotFound, "globalfee param store is required for AnteHandler") } - if options.Mempool == nil { - return nil, errors.Wrap(gaiaerrors.ErrLogic, "mempool is required for AnteHandler") - } - if options.MEVLane == nil { - return nil, errors.Wrap(gaiaerrors.ErrLogic, "mev lane is required for AnteHandler") - } - sigGasConsumer := options.SigGasConsumer if sigGasConsumer == nil { sigGasConsumer = ante.DefaultSigVerificationGasConsumer @@ -97,11 +80,6 @@ func NewAnteHandler(options HandlerOptions, logger log.Logger) (sdk.AnteHandler, ante.NewSigVerificationDecorator(options.AccountKeeper, options.SignModeHandler), ante.NewIncrementSequenceDecorator(options.AccountKeeper), ibcante.NewRedundantRelayDecorator(options.IBCKeeper), - auctionante.NewAuctionDecorator( - options.AuctionKeeper, - options.TxEncoder, - options.MEVLane, - ), } // Don't delete it even if IDE tells you so. diff --git a/app/app.go b/app/app.go index ae75a88b9..bea69a97a 100644 --- a/app/app.go +++ b/app/app.go @@ -149,19 +149,6 @@ import ( consensusparamtypes "github.com/cosmos/cosmos-sdk/x/consensus/types" pfmkeeper "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/keeper" pfmtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types" - - // Block-sdk imports - blocksdkabci "github.com/skip-mev/block-sdk/abci" - signer_extraction_adapter "github.com/skip-mev/block-sdk/adapters/signer_extraction_adapter" - blocksdk "github.com/skip-mev/block-sdk/block" - blocksdkbase "github.com/skip-mev/block-sdk/block/base" - base_lane "github.com/skip-mev/block-sdk/lanes/base" - mev_lane "github.com/skip-mev/block-sdk/lanes/mev" - "github.com/skip-mev/block-sdk/x/auction" - auctionante "github.com/skip-mev/block-sdk/x/auction/ante" - auctionkeeper "github.com/skip-mev/block-sdk/x/auction/keeper" - rewardsaddressprovider "github.com/skip-mev/block-sdk/x/auction/rewards" - auctiontypes "github.com/skip-mev/block-sdk/x/auction/types" ) const ( @@ -216,14 +203,12 @@ var ( ), ibchooks.AppModuleBasic{}, packetforward.AppModuleBasic{}, - auction.AppModuleBasic{}, globalfee.AppModule{}, ) // module account permissions maccPerms = map[string][]string{ authtypes.FeeCollectorName: nil, - auctiontypes.ModuleName: nil, ibctransfertypes.ModuleName: {authtypes.Minter, authtypes.Burner}, icatypes.ModuleName: nil, wasmtypes.ModuleName: {}, @@ -274,12 +259,10 @@ type App struct { memKeys map[string]*storetypes.MemoryStoreKey // keepers - AccountKeeper authkeeper.AccountKeeper - AdminmoduleKeeper adminmodulekeeper.Keeper - AuthzKeeper authzkeeper.Keeper - BankKeeper bankkeeper.BaseKeeper - // AuctionKeeper is the keeper that handles processing auction transactions - AuctionKeeper auctionkeeper.Keeper + AccountKeeper authkeeper.AccountKeeper + AdminmoduleKeeper adminmodulekeeper.Keeper + AuthzKeeper authzkeeper.Keeper + BankKeeper bankkeeper.BaseKeeper CapabilityKeeper *capabilitykeeper.Keeper SlashingKeeper slashingkeeper.Keeper CrisisKeeper crisiskeeper.Keeper @@ -323,13 +306,6 @@ type App struct { // sm is the simulation manager sm *module.SimulationManager - - // Custom checkTx handler - checkTxHandler mev_lane.CheckTx - - // Lanes - Mempool blocksdk.Mempool - MEVLane auctionante.MEVLane } func (app *App) GetTestBankKeeper() integration.TestBankKeeper { @@ -381,7 +357,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, auctiontypes.StoreKey, + crontypes.StoreKey, ibchookstypes.StoreKey, consensusparamtypes.StoreKey, crisistypes.StoreKey, ) tkeys := sdk.NewTransientStoreKeys(paramstypes.TStoreKey) memKeys := sdk.NewMemoryStoreKeys(capabilitytypes.MemStoreKey, feetypes.MemStoreKey) @@ -594,16 +570,6 @@ func New( app.TokenFactoryKeeper.Hooks(), )) - app.AuctionKeeper = auctionkeeper.NewKeeperWithRewardsAddressProvider( - appCodec, - keys[auctiontypes.StoreKey], - app.AccountKeeper, - &app.BankKeeper, - // 25% of rewards should be sent to the Hub - rewardsaddressprovider.NewFixedAddressRewardsAddressProvider(app.AccountKeeper.GetModuleAddress(ccvconsumertypes.ConsumerToSendToProviderName)), - authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String(), - ) - wasmDir := filepath.Join(homePath, "wasm") wasmConfig, err := wasm.ReadWasmConfig(appOpts) if err != nil { @@ -772,7 +738,6 @@ func New( tokenfactory.NewAppModule(appCodec, *app.TokenFactoryKeeper, app.AccountKeeper, app.BankKeeper), cronModule, globalfee.NewAppModule(app.GetSubspace(globalfee.ModuleName)), - auction.NewAppModule(appCodec, app.AuctionKeeper), crisis.NewAppModule(&app.CrisisKeeper, skipGenesisInvariants, app.GetSubspace(crisistypes.ModuleName)), // always be last to make sure that it checks for all invariants and not only part of them ) @@ -781,7 +746,6 @@ func New( // CanWithdrawInvariant invariant. // NOTE: staking module is required if HistoricalEntries param > 0 app.mm.SetOrderBeginBlockers( - auctiontypes.ModuleName, upgradetypes.ModuleName, capabilitytypes.ModuleName, slashingtypes.ModuleName, @@ -812,7 +776,6 @@ func New( ) app.mm.SetOrderEndBlockers( - auctiontypes.ModuleName, crisistypes.ModuleName, capabilitytypes.ModuleName, authtypes.ModuleName, @@ -848,7 +811,6 @@ func New( // so that other modules that want to create or claim capabilities afterwards in InitChain // can do so safely. app.mm.SetOrderInitGenesis( - auctiontypes.ModuleName, capabilitytypes.ModuleName, authtypes.ModuleName, ibctransfertypes.ModuleName, @@ -916,38 +878,6 @@ func New( app.SetInitChainer(app.InitChainer) app.SetBeginBlocker(app.BeginBlocker) - // initialize block-sdk Mempool - maxTxs := 0 // no limit - cfg := blocksdkbase.LaneConfig{ - Logger: app.Logger(), - TxDecoder: app.GetTxConfig().TxDecoder(), - TxEncoder: app.GetTxConfig().TxEncoder(), - SignerExtractor: signer_extraction_adapter.NewDefaultAdapter(), - MaxBlockSpace: sdk.ZeroDec(), - MaxTxs: maxTxs, - } - - baseLane := base_lane.NewDefaultLane(cfg) - - mevLane := mev_lane.NewMEVLane( - cfg, - mev_lane.NewDefaultAuctionFactory(app.GetTxConfig().TxDecoder(), signer_extraction_adapter.NewDefaultAdapter()), - ) - app.MEVLane = mevLane - // initialize mempool - mempool := blocksdk.NewLanedMempool( - app.Logger(), - true, - []blocksdk.Lane{ - mevLane, // mev-lane is first to prioritize bids being placed at the TOB - baseLane, // finally, all the rest of txs... - }..., - ) - - // set the mempool first - app.SetMempool(mempool) - app.Mempool = mempool - anteHandler, err := NewAnteHandler( HandlerOptions{ HandlerOptions: ante.HandlerOptions{ @@ -962,10 +892,6 @@ func New( TXCounterStoreKey: keys[wasmtypes.StoreKey], ConsumerKeeper: app.ConsumerKeeper, GlobalFeeSubspace: app.GetSubspace(globalfee.ModuleName), - AuctionKeeper: app.AuctionKeeper, - TxEncoder: app.GetTxConfig().TxEncoder(), - Mempool: app.Mempool, - MEVLane: app.MEVLane, }, app.Logger(), ) @@ -974,29 +900,9 @@ func New( } app.SetAnteHandler(anteHandler) - mevLane.SetAnteHandler(anteHandler) - baseLane.SetAnteHandler(anteHandler) app.SetEndBlocker(app.EndBlocker) - handler := blocksdkabci.NewProposalHandler( - app.Logger(), - app.GetTxConfig().TxDecoder(), - app.GetTxConfig().TxEncoder(), - mempool, - ) - app.SetPrepareProposal(handler.PrepareProposalHandler()) - app.SetProcessProposal(handler.ProcessProposalHandler()) - - checkTxHandler := mev_lane.NewCheckTxHandler( - app.BaseApp, - encodingConfig.TxConfig.TxDecoder(), - mevLane, - anteHandler, - chainID, - ) - app.SetCheckTx(checkTxHandler.CheckTx()) - // must be before Loading version // requires the snapshot store to be created and registered as a BaseAppOption // see cmd/wasmd/root.go: 206 - 214 approx @@ -1064,7 +970,6 @@ func (app *App) setupUpgradeHandlers() { SlashingKeeper: app.SlashingKeeper, ParamsKeeper: app.ParamsKeeper, CapabilityKeeper: app.CapabilityKeeper, - AuctionKeeper: app.AuctionKeeper, ContractManager: app.ContractManagerKeeper, AdminModule: app.AdminmoduleKeeper, ConsensusKeeper: &app.ConsensusParamsKeeper, @@ -1078,19 +983,6 @@ func (app *App) setupUpgradeHandlers() { } } -// CheckTx will check the transaction with the provided checkTxHandler. We override the default -// handler so that we can verify bid transactions before they are inserted into the mempool. -// With the POB CheckTx, we can verify the bid transaction and all of the bundled transactions -// before inserting the bid transaction into the mempool. -func (app *App) CheckTx(req abci.RequestCheckTx) abci.ResponseCheckTx { - return app.checkTxHandler(req) -} - -// SetCheckTx sets the checkTxHandler for the app. -func (app *App) SetCheckTx(handler mev_lane.CheckTx) { - app.checkTxHandler = handler -} - // Name returns the name of the App func (app *App) Name() string { return app.BaseApp.Name() } diff --git a/app/proposals_allowlisting.go b/app/proposals_allowlisting.go index 898547166..23722d742 100644 --- a/app/proposals_allowlisting.go +++ b/app/proposals_allowlisting.go @@ -15,7 +15,6 @@ import ( ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" ccvconsumertypes "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types" - auctiontypes "github.com/skip-mev/block-sdk/x/auction/types" contractmanagertypes "github.com/neutron-org/neutron/x/contractmanager/types" crontypes "github.com/neutron-org/neutron/x/cron/types" @@ -67,7 +66,6 @@ func isSdkMessageWhitelisted(msg sdk.Msg) bool { *feerefundertypes.MsgUpdateParams, *crontypes.MsgUpdateParams, *contractmanagertypes.MsgUpdateParams, - *auctiontypes.MsgUpdateParams, *banktypes.MsgUpdateParams, *crisistypes.MsgUpdateParams, *minttypes.MsgUpdateParams, diff --git a/app/upgrades/types.go b/app/upgrades/types.go index 13747e54b..c07d1dad1 100644 --- a/app/upgrades/types.go +++ b/app/upgrades/types.go @@ -11,7 +11,6 @@ import ( paramskeeper "github.com/cosmos/cosmos-sdk/x/params/keeper" slashingkeeper "github.com/cosmos/cosmos-sdk/x/slashing/keeper" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - auctionkeeper "github.com/skip-mev/block-sdk/x/auction/keeper" contractmanagerkeeper "github.com/neutron-org/neutron/x/contractmanager/keeper" cronkeeper "github.com/neutron-org/neutron/x/cron/keeper" @@ -47,7 +46,6 @@ type UpgradeKeepers struct { SlashingKeeper slashingkeeper.Keeper ParamsKeeper paramskeeper.Keeper CapabilityKeeper *capabilitykeeper.Keeper - AuctionKeeper auctionkeeper.Keeper ContractManager contractmanagerkeeper.Keeper AdminModule adminmodulekeeper.Keeper ConsensusKeeper *consensuskeeper.Keeper diff --git a/app/upgrades/v1.1.0/constants.go b/app/upgrades/v1.1.0/constants.go index 8fc8e6d94..030e54299 100644 --- a/app/upgrades/v1.1.0/constants.go +++ b/app/upgrades/v1.1.0/constants.go @@ -4,7 +4,6 @@ import ( "github.com/cosmos/cosmos-sdk/store/types" consensusparamtypes "github.com/cosmos/cosmos-sdk/x/consensus/types" crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types" - auctiontypes "github.com/skip-mev/block-sdk/x/auction/types" "github.com/neutron-org/neutron/app/upgrades" ) @@ -23,7 +22,6 @@ var Upgrade = upgrades.Upgrade{ Added: []string{ consensusparamtypes.ModuleName, crisistypes.ModuleName, - auctiontypes.ModuleName, }, }, } diff --git a/app/upgrades/v1.1.0/upgrades.go b/app/upgrades/v1.1.0/upgrades.go index 3ba3a35ef..9c9e3314a 100644 --- a/app/upgrades/v1.1.0/upgrades.go +++ b/app/upgrades/v1.1.0/upgrades.go @@ -5,13 +5,11 @@ import ( wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" "github.com/cosmos/cosmos-sdk/baseapp" - authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" consensuskeeper "github.com/cosmos/cosmos-sdk/x/consensus/keeper" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" "github.com/neutron-org/neutron/app/params" - "cosmossdk.io/math" "github.com/cosmos/cosmos-sdk/codec" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" @@ -22,8 +20,6 @@ import ( "github.com/cosmos/gaia/v11/x/globalfee/types" v6 "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/migrations/v6" ccvconsumertypes "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types" - auctionkeeper "github.com/skip-mev/block-sdk/x/auction/keeper" - auctiontypes "github.com/skip-mev/block-sdk/x/auction/types" "github.com/neutron-org/neutron/app/upgrades" contractmanagerkeeper "github.com/neutron-org/neutron/x/contractmanager/keeper" @@ -86,12 +82,6 @@ func CreateUpgradeHandler( return nil, err } - ctx.Logger().Info("Setting pob params...") - err = setAuctionParams(ctx, keepers.AccountKeeper, keepers.AuctionKeeper) - if err != nil { - return nil, err - } - ctx.Logger().Info("Setting sudo callback limit...") err = setContractManagerParams(ctx, keepers.ContractManager) if err != nil { @@ -127,25 +117,6 @@ func CreateUpgradeHandler( } } -func setAuctionParams(ctx sdk.Context, accountKeeper authkeeper.AccountKeeper, auctionKeeper auctionkeeper.Keeper) error { - consumerRedistributeAddr := accountKeeper.GetModuleAddress(ccvconsumertypes.ConsumerRedistributeName) - - auctionParams := auctiontypes.Params{ - MaxBundleSize: 4, - // 75% of rewards goes to consumer redistribution module and then to the FeeBurner module - // where all the NTRNs are burned - EscrowAccountAddress: consumerRedistributeAddr, - ReserveFee: sdk.Coin{Denom: params.DefaultDenom, Amount: sdk.NewInt(500_000)}, - MinBidIncrement: sdk.Coin{Denom: params.DefaultDenom, Amount: sdk.NewInt(100_000)}, - FrontRunningProtection: false, - // in the app.go on L603 set FixedAddressRewardsAddressProvider (where 25% goes to) - // to ConsumerToSendToProviderName module from where rewards goes to the Hub - // Meaning we sent 25% of the MEV rewards to the Hub - ProposerFee: math.LegacyNewDecWithPrec(25, 2), - } - return auctionKeeper.SetParams(ctx, auctionParams) -} - func setContractManagerParams(ctx sdk.Context, keeper contractmanagerkeeper.Keeper) error { cmParams := contractmanagertypes.Params{ SudoCallGasLimit: contractmanagertypes.DefaultSudoCallGasLimit, diff --git a/go.mod b/go.mod index fe521e720..340f9db25 100644 --- a/go.mod +++ b/go.mod @@ -24,27 +24,26 @@ require ( github.com/gogo/protobuf v1.3.3 github.com/golang/mock v1.6.0 github.com/golang/protobuf v1.5.3 - github.com/gorilla/mux v1.8.0 + github.com/gorilla/mux v1.8.1 github.com/grpc-ecosystem/grpc-gateway v1.16.0 github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.16.0 github.com/rs/zerolog v1.30.0 - github.com/skip-mev/block-sdk v1.1.0 github.com/spf13/cast v1.5.1 - github.com/spf13/cobra v1.7.0 + github.com/spf13/cobra v1.8.0 github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.16.0 github.com/stretchr/testify v1.8.4 - google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97 + google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 google.golang.org/grpc v1.59.0 gopkg.in/yaml.v2 v2.4.0 ) require ( - cloud.google.com/go v0.110.8 // indirect - cloud.google.com/go/compute v1.23.0 // indirect + cloud.google.com/go v0.110.9 // indirect + cloud.google.com/go/compute v1.23.2 // indirect cloud.google.com/go/compute/metadata v0.2.3 // indirect - cloud.google.com/go/iam v1.1.2 // indirect + cloud.google.com/go/iam v1.1.4 // indirect cloud.google.com/go/storage v1.30.1 // indirect cosmossdk.io/api v0.3.1 // indirect cosmossdk.io/depinject v1.0.0-alpha.4 // indirect @@ -53,13 +52,13 @@ require ( github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect github.com/99designs/keyring v1.2.2 // indirect github.com/ChainSafe/go-schnorrkel v1.0.0 // indirect - github.com/aws/aws-sdk-go v1.44.224 // indirect + github.com/aws/aws-sdk-go v1.44.203 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 // indirect github.com/bits-and-blooms/bitset v1.8.0 // indirect github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect - github.com/cenkalti/backoff/v4 v4.2.1 // indirect + github.com/cenkalti/backoff/v4 v4.1.3 // indirect github.com/cespare/xxhash v1.1.0 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/chzyer/readline v1.5.1 // indirect @@ -125,10 +124,10 @@ require ( github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/jmhodges/levigo v1.0.0 // indirect - github.com/klauspost/compress v1.16.7 // indirect + github.com/klauspost/compress v1.16.5 // indirect github.com/kr/pretty v0.3.1 // indirect github.com/kr/text v0.2.0 // indirect - github.com/lib/pq v1.10.9 // indirect + github.com/lib/pq v1.10.7 // indirect github.com/libp2p/go-buffer-pool v0.1.0 // indirect github.com/linxGnu/grocksdb v1.8.0 // indirect github.com/magiconair/properties v1.8.7 // indirect @@ -149,7 +148,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_model v0.4.0 // indirect github.com/prometheus/common v0.44.0 // indirect - github.com/prometheus/procfs v0.11.0 // indirect + github.com/prometheus/procfs v0.10.1 // indirect github.com/rakyll/statik v0.1.7 // indirect github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect github.com/rogpeppe/go-internal v1.11.0 // indirect @@ -168,8 +167,8 @@ require ( go.opencensus.io v0.24.0 // indirect golang.org/x/crypto v0.14.0 // indirect golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb // indirect - golang.org/x/net v0.15.0 // indirect - golang.org/x/oauth2 v0.12.0 // indirect + golang.org/x/net v0.17.0 // indirect + golang.org/x/oauth2 v0.11.0 // indirect golang.org/x/sync v0.3.0 // indirect golang.org/x/sys v0.13.0 // indirect golang.org/x/term v0.13.0 // indirect @@ -177,12 +176,12 @@ require ( golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect google.golang.org/api v0.128.0 // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto v0.0.0-20230920204549-e6e6cdab5c13 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13 // indirect + google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405 // indirect google.golang.org/protobuf v1.31.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - nhooyr.io/websocket v1.8.7 // indirect + nhooyr.io/websocket v1.8.6 // indirect pgregory.net/rapid v0.6.2 // indirect sigs.k8s.io/yaml v1.3.0 // indirect ) diff --git a/go.sum b/go.sum index 290740da2..2dfa65c97 100644 --- a/go.sum +++ b/go.sum @@ -34,8 +34,8 @@ cloud.google.com/go v0.100.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w9 cloud.google.com/go v0.102.0/go.mod h1:oWcCzKlqJ5zgHQt9YsaeTY9KzIvjyy0ArmiBUgpQ+nc= cloud.google.com/go v0.102.1/go.mod h1:XZ77E9qnTEnrgEOvr4xzfdX5TRo7fB4T2F4O6+34hIU= cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA= -cloud.google.com/go v0.110.8 h1:tyNdfIxjzaWctIiLYOTalaLKZ17SI44SKFW26QbOhME= -cloud.google.com/go v0.110.8/go.mod h1:Iz8AkXJf1qmxC3Oxoep8R1T36w8B92yU29PcBhHO5fk= +cloud.google.com/go v0.110.9 h1:e7ITSqGFFk4rbz/JFIqZh3G4VEHguhAL4BQcFlWtU68= +cloud.google.com/go v0.110.9/go.mod h1:rpxevX/0Lqvlbc88b7Sc1SPNdyK1riNBTUU6JXhYNpM= cloud.google.com/go/aiplatform v1.22.0/go.mod h1:ig5Nct50bZlzV6NvKaTwmplLLddFx0YReh9WfTO5jKw= cloud.google.com/go/aiplatform v1.24.0/go.mod h1:67UUvRBKG6GTayHKV8DBv2RtR1t93YRu5B1P3x99mYY= cloud.google.com/go/analytics v0.11.0/go.mod h1:DjEWCu41bVbYcKyvlws9Er60YE4a//bK6mnhWvQeFNI= @@ -73,8 +73,8 @@ cloud.google.com/go/compute v1.6.0/go.mod h1:T29tfhtVbq1wvAPo0E3+7vhgmkOYeXjhFvz cloud.google.com/go/compute v1.6.1/go.mod h1:g85FgpzFvNULZ+S8AYq87axRKuf2Kh7deLqV/jJ3thU= cloud.google.com/go/compute v1.7.0/go.mod h1:435lt8av5oL9P3fv1OEzSbSUe+ybHXGMPQHHZWZxy9U= cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU= -cloud.google.com/go/compute v1.23.0 h1:tP41Zoavr8ptEqaW6j+LQOnyBBhO7OkOMAGrgLopTwY= -cloud.google.com/go/compute v1.23.0/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM= +cloud.google.com/go/compute v1.23.2 h1:nWEMDhgbBkBJjfpVySqU4jgWdc22PLR0o4vEexZHers= +cloud.google.com/go/compute v1.23.2/go.mod h1:JJ0atRC0J/oWYiiVBmsSsrRnh92DhZPG4hFDcR04Rns= cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= cloud.google.com/go/containeranalysis v0.5.1/go.mod h1:1D92jd8gRR/c0fGMlymRgxWD3Qw9C1ff6/T7mLgVL8I= @@ -114,8 +114,8 @@ cloud.google.com/go/gkehub v0.10.0/go.mod h1:UIPwxI0DsrpsVoWpLB0stwKCP+WFVG9+y97 cloud.google.com/go/grafeas v0.2.0/go.mod h1:KhxgtF2hb0P191HlY5besjYm6MqTSTj3LSI+M+ByZHc= cloud.google.com/go/iam v0.3.0/go.mod h1:XzJPvDayI+9zsASAFO68Hk07u3z+f+JrT2xXNdp4bnY= cloud.google.com/go/iam v0.5.0/go.mod h1:wPU9Vt0P4UmCux7mqtRu6jcpPAb74cP1fh50J3QpkUc= -cloud.google.com/go/iam v1.1.2 h1:gacbrBdWcoVmGLozRuStX45YKvJtzIjJdAolzUs1sm4= -cloud.google.com/go/iam v1.1.2/go.mod h1:A5avdyVL2tCppe4unb0951eI9jreack+RJ0/d+KUZOU= +cloud.google.com/go/iam v1.1.4 h1:K6n/GZHFTtEoKT5aUG3l9diPi0VduZNQ1PfdnpkkIFk= +cloud.google.com/go/iam v1.1.4/go.mod h1:l/rg8l1AaA+VFMho/HYx2Vv6xinPSLMF8qfhRPIZ0L8= cloud.google.com/go/language v1.4.0/go.mod h1:F9dRpNFQmJbkaop6g0JhSBXCNlO90e1KWx5iDdxbWic= cloud.google.com/go/language v1.6.0/go.mod h1:6dJ8t3B+lUYfStgls25GusK04NLh3eDLQnWM3mdEbhI= cloud.google.com/go/lifesciences v0.5.0/go.mod h1:3oIKy8ycWGPUyZDR/8RNnTOYevhaMLqh5vLUXs9zvT8= @@ -263,8 +263,8 @@ github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6l github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.44.122/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= -github.com/aws/aws-sdk-go v1.44.224 h1:09CiaaF35nRmxrzWZ2uRq5v6Ghg/d2RiPjZnSgtt+RQ= -github.com/aws/aws-sdk-go v1.44.224/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= +github.com/aws/aws-sdk-go v1.44.203 h1:pcsP805b9acL3wUqa4JR2vg1k2wnItkDYNvfmcy6F+U= +github.com/aws/aws-sdk-go v1.44.203/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= github.com/aws/aws-sdk-go-v2 v1.2.0/go.mod h1:zEQs02YRBw1DjK0PoJv3ygDYOFTre1ejlJWl8FwAuQo= github.com/aws/aws-sdk-go-v2/config v1.1.1/go.mod h1:0XsVy9lBI/BCXm+2Tuvt39YmdHwS5unDQmxZOYe8F5Y= @@ -320,8 +320,8 @@ github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4= github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= github.com/cenkalti/backoff/v4 v4.1.1/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= -github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM= -github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= +github.com/cenkalti/backoff/v4 v4.1.3 h1:cFAlzYUlVYDysBEH2T5hyJZMh3+5+WCBvSnK6Q8UtC4= +github.com/cenkalti/backoff/v4 v4.1.3/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/cp v0.1.0/go.mod h1:SOGHArjBr4JWaSDEVpWpo/hNg6RoKrls6Oh40hiwW+s= github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= @@ -415,7 +415,7 @@ github.com/cosmos/rosetta-sdk-go v0.10.0 h1:E5RhTruuoA7KTIXUcMicL76cffyeoyvNybzU github.com/cosmos/rosetta-sdk-go v0.10.0/go.mod h1:SImAZkb96YbwvoRkzSMQB6noNJXFgWl/ENIznEoYQI4= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= -github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creachadair/taskgroup v0.4.2 h1:jsBLdAJE42asreGss2xZGZ8fJra7WtwnHWeJFxv2Li8= github.com/creachadair/taskgroup v0.4.2/go.mod h1:qiXUOSrbwAY3u0JPGTzObbE3yf9hcXHDKBZ2ZjpCbgM= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= @@ -688,8 +688,9 @@ github.com/gorilla/handlers v1.5.1 h1:9lRY6j8DEeeBT10CvO9hGW0gmky0BprnvDI5vfhUHH github.com/gorilla/handlers v1.5.1/go.mod h1:t8XrUpc4KVXb7HGyJ4/cEnwQiaxrX/hz1Zv/4g96P1Q= github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= -github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= +github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY= +github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ= github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= @@ -820,8 +821,8 @@ github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYs github.com/klauspost/compress v1.11.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.12.3/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= github.com/klauspost/compress v1.15.11/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM= -github.com/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I= -github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/klauspost/compress v1.16.5 h1:IFV2oUNUzZaz+XyusxpLzpzS8Pt5rh0Z16For/djlyI= +github.com/klauspost/compress v1.16.5/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= github.com/klauspost/cpuid v0.0.0-20170728055534-ae7887de9fa5/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= github.com/klauspost/crc32 v0.0.0-20161016154125-cb6bfca970f6/go.mod h1:+ZoRqAPRLkC4NPOvfYeR5KNOrY6TD+/sAC3HXPZgDYg= github.com/klauspost/pgzip v1.0.2-0.20170402124221-0bf5dcad4ada/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs= @@ -844,8 +845,8 @@ github.com/leanovate/gopter v0.2.9/go.mod h1:U2L/78B+KVFIx2VmW6onHJQzXtFb+p5y3y2 github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w= github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= -github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= +github.com/lib/pq v1.10.7 h1:p7ZhMD+KsSRozJr34udlUrhboJwWAgCg34+/ZZNvZZw= +github.com/lib/pq v1.10.7/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/libp2p/go-buffer-pool v0.1.0 h1:oK4mSFcQz7cTQIfqbe4MIj9gLW+mnanjyFtc6cdF0Y8= github.com/libp2p/go-buffer-pool v0.1.0/go.mod h1:N+vh8gMqimBzdKkSMVuydVDq+UV5QTWy5HSiZacSbPg= github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM= @@ -1037,8 +1038,8 @@ github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsT github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.3.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= -github.com/prometheus/procfs v0.11.0 h1:5EAgkfkMl659uZPbe9AS2N68a7Cc1TJbPEuGzFuRbyk= -github.com/prometheus/procfs v0.11.0/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM= +github.com/prometheus/procfs v0.10.1 h1:kYK1Va/YMlutzCGazswoHKo//tZVlFpKYh+PymziUAg= +github.com/prometheus/procfs v0.10.1/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/rakyll/statik v0.1.7 h1:OF3QCZUuyPxuGEP7B4ypUa7sB/iHtqOTDYZXGM8KOdQ= github.com/rakyll/statik v0.1.7/go.mod h1:AlZONWzMtEnMs7W4e/1LURLiI49pIMmp6V9Unghqrcc= @@ -1079,9 +1080,7 @@ github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPx github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= -github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= -github.com/skip-mev/block-sdk v1.1.0 h1:cYEO/ASxhtasdRStMXhw1cWOjCJ78Z3J+K01n++OHkU= -github.com/skip-mev/block-sdk v1.1.0/go.mod h1:G/ryMdo70R1xOJehV1RqDyTH0x7gffwB1wU9MLMzIHE= +github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= @@ -1097,8 +1096,8 @@ github.com/spf13/cast v1.5.1 h1:R+kOtfhWQE6TVQzY+4D7wJLBgkdVasCEFxSUBYBYIlA= github.com/spf13/cast v1.5.1/go.mod h1:b9PdjNptOpzXr7Rq1q9gJML/2cdGQAo69NKzQ10KN48= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= -github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I= -github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0= +github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0= +github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= @@ -1281,7 +1280,7 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc= +golang.org/x/mod v0.11.0 h1:bUO06HqtnRcc/7l71XBe4WcqTZ+3AH1J59zWDDwLKgU= golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1348,8 +1347,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= -golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8= -golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= +golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= +golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1375,8 +1374,8 @@ golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094/go.mod h1:h4gKUeWbJ4rQPri golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= golang.org/x/oauth2 v0.1.0/go.mod h1:G9FE4dLTsbXUu90h/Pf85g4w1D+SSAgR+q46nJZ8M4A= -golang.org/x/oauth2 v0.12.0 h1:smVPGxink+n1ZI5pkQa8y6fZT0RW0MgCO5bFpepy4B4= -golang.org/x/oauth2 v0.12.0/go.mod h1:A74bZ3aGXgCY0qaIC9Ahg6Lglin4AMAco8cIv9baba4= +golang.org/x/oauth2 v0.11.0 h1:vPL4xzxBM4niKCW6g9whtaWVXTJf1U5e4aZxxFx/gbU= +golang.org/x/oauth2 v0.11.0/go.mod h1:LdF7O/8bLR/qWK9DrpXmbHLTouvRHK0SgJl0GmDBchk= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -1592,7 +1591,7 @@ golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.12.0 h1:YW6HUoUmYBpwSgyaGaZq1fHjrBjX1rlpZ54T6mu2kss= +golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -1779,12 +1778,12 @@ google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqw google.golang.org/genproto v0.0.0-20221014173430-6e2ab493f96b/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221025140454-527a21cfbd71/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s= -google.golang.org/genproto v0.0.0-20230920204549-e6e6cdab5c13 h1:vlzZttNJGVqTsRFU9AmdnrcO1Znh8Ew9kCD//yjigk0= -google.golang.org/genproto v0.0.0-20230920204549-e6e6cdab5c13/go.mod h1:CCviP9RmpZ1mxVr8MUjCnSiY09IbAXZxhLE6EhHIdPU= -google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97 h1:W18sezcAYs+3tDZX4F80yctqa12jcP1PUS2gQu1zTPU= -google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97/go.mod h1:iargEX0SFPm3xcfMI0d1domjg0ZF4Aa0p2awqyxhvF0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13 h1:N3bU/SQDCDyD6R528GJ/PwW9KjYcJA3dgyH+MovAkIM= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13/go.mod h1:KSqppvjFjtoCI+KGd4PELB0qLNxdJHRGqRI09mB6pQA= +google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405 h1:I6WNifs6pF9tNdSob2W24JtyxIYjzFB9qDlpUC76q+U= +google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405/go.mod h1:3WDQMjmJk36UQhjQ89emUzb1mdaHcPeeAh4SCBKznB4= +google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 h1:JpwMPBpFN3uKhdaekDpiNlImDdkUAyiJ6ez/uxGaUSo= +google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:0xJLfVdJqpAPl8tDg1ujOCGzx6LFLttXT5NhllGOXY4= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405 h1:AB/lmRny7e2pLhFEYIbl5qkDAUt2h0ZRO4wGPhZf+ik= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405/go.mod h1:67X1fPuzjcrkymZzZV1vvkFeTn2Rvc6lYF9MYFGCcwE= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= @@ -1893,9 +1892,8 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.1.3/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las= +nhooyr.io/websocket v1.8.6 h1:s+C3xAMLwGmlI31Nyn/eAehUlZPwfYZu2JXM621Q5/k= nhooyr.io/websocket v1.8.6/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0= -nhooyr.io/websocket v1.8.7 h1:usjR2uOr/zjjkVMy0lW+PPohFok7PCow5sDjLgX4P4g= -nhooyr.io/websocket v1.8.7/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0= pgregory.net/rapid v0.6.2 h1:ErW5sL+UKtfBfUTsWHDCoeB+eZKLKMxrSd1VJY6W4bw= pgregory.net/rapid v0.6.2/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= From 1ec52a5ba6d643eedcab23a8b1a65779efab4cb8 Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Thu, 23 Nov 2023 13:16:29 +0200 Subject: [PATCH 296/307] remove unused var --- app/app.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/app.go b/app/app.go index bea69a97a..744b681c4 100644 --- a/app/app.go +++ b/app/app.go @@ -327,7 +327,7 @@ func (app *App) GetTestEvidenceKeeper() integration.TestEvidenceKeeper { // New returns a reference to an initialized blockchain app func New( logger log.Logger, - chainID string, + _ string, db dbm.DB, traceStore io.Writer, loadLatest bool, From dcc09b9243ef06ddc508d007be3f9909aed5b036 Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Thu, 23 Nov 2023 13:21:28 +0200 Subject: [PATCH 297/307] Revert "remove v1 from ictx module" This reverts commit 713963529c4d822ffb2f84f08f754fdfe73fa15e. --- docs/static/openapi.yml | 16 +- .../interchaintxs/{ => v1}/genesis.proto | 4 +- .../interchaintxs/{ => v1}/params.proto | 2 +- .../interchaintxs/{ => v1}/query.proto | 4 +- proto/neutron/interchaintxs/{ => v1}/tx.proto | 4 +- wasmbinding/stargate_allowlist.go | 2 +- x/interchaintxs/types/genesis.pb.go | 36 ++-- x/interchaintxs/types/params.pb.go | 48 +++--- x/interchaintxs/types/query.pb.go | 105 ++++++------ x/interchaintxs/types/query.pb.gw.go | 2 +- x/interchaintxs/types/tx.pb.go | 155 +++++++++--------- 11 files changed, 191 insertions(+), 187 deletions(-) rename proto/neutron/interchaintxs/{ => v1}/genesis.proto (76%) rename proto/neutron/interchaintxs/{ => v1}/params.proto (94%) rename proto/neutron/interchaintxs/{ => v1}/query.proto (95%) rename proto/neutron/interchaintxs/{ => v1}/tx.proto (97%) diff --git a/docs/static/openapi.yml b/docs/static/openapi.yml index 5a6428940..5a4103ac3 100644 --- a/docs/static/openapi.yml +++ b/docs/static/openapi.yml @@ -40292,7 +40292,7 @@ paths: /neutron/interchaintxs/params: get: summary: Parameters queries the parameters of the module. - operationId: NeutronInterchaintxsParams + operationId: NeutronInterchaintxsV1Params responses: '200': description: A successful response. @@ -40521,7 +40521,7 @@ paths: - Query /neutron/interchaintxs/{owner_address}/{interchain_account_id}/{connection_id}/interchain_account_address: get: - operationId: NeutronInterchaintxsInterchainAccountAddress + operationId: NeutronInterchaintxsV1InterchainAccountAddress responses: '200': description: A successful response. @@ -71305,12 +71305,12 @@ definitions: The data could be arbitrary format, providing nessecary data for example neighbouring node hash title: ProofOps is Merkle proof defined by the list of ProofOps - neutron.interchaintxs.MsgRegisterInterchainAccountResponse: + neutron.interchaintxs.v1.MsgRegisterInterchainAccountResponse: type: object description: |- MsgRegisterInterchainAccountResponse is the response type for MsgRegisterInterchainAccount. - neutron.interchaintxs.MsgSubmitTxResponse: + neutron.interchaintxs.v1.MsgSubmitTxResponse: type: object properties: sequence_id: @@ -71321,14 +71321,14 @@ definitions: type: string title: channel src channel on neutron side transaction was submitted from title: MsgSubmitTxResponse defines the response for Msg/SubmitTx - neutron.interchaintxs.MsgUpdateParamsResponse: + neutron.interchaintxs.v1.MsgUpdateParamsResponse: type: object description: |- MsgUpdateParamsResponse defines the response structure for executing a MsgUpdateParams message. Since: 0.47 - neutron.interchaintxs.Params: + neutron.interchaintxs.v1.Params: type: object properties: msg_submit_tx_max_messages: @@ -71351,14 +71351,14 @@ definitions: signatures required by gogoproto. title: Defines a minimum fee required to register interchain account description: Params defines the parameters for the module. - neutron.interchaintxs.QueryInterchainAccountAddressResponse: + neutron.interchaintxs.v1.QueryInterchainAccountAddressResponse: type: object properties: interchain_account_address: type: string title: The corresponding interchain account address on the host chain title: Query response for an interchain account address - neutron.interchaintxs.QueryParamsResponse: + neutron.interchaintxs.v1.QueryParamsResponse: type: object properties: params: diff --git a/proto/neutron/interchaintxs/genesis.proto b/proto/neutron/interchaintxs/v1/genesis.proto similarity index 76% rename from proto/neutron/interchaintxs/genesis.proto rename to proto/neutron/interchaintxs/v1/genesis.proto index 850394c59..bff673af1 100644 --- a/proto/neutron/interchaintxs/genesis.proto +++ b/proto/neutron/interchaintxs/v1/genesis.proto @@ -1,8 +1,8 @@ syntax = "proto3"; -package neutron.interchaintxs; +package neutron.interchaintxs.v1; import "gogoproto/gogo.proto"; -import "neutron/interchaintxs/params.proto"; +import "neutron/interchaintxs/v1/params.proto"; option go_package = "github.com/neutron-org/neutron/x/interchaintxs/types"; diff --git a/proto/neutron/interchaintxs/params.proto b/proto/neutron/interchaintxs/v1/params.proto similarity index 94% rename from proto/neutron/interchaintxs/params.proto rename to proto/neutron/interchaintxs/v1/params.proto index 734e7cb2e..1a720e961 100644 --- a/proto/neutron/interchaintxs/params.proto +++ b/proto/neutron/interchaintxs/v1/params.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -package neutron.interchaintxs; +package neutron.interchaintxs.v1; import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.proto"; diff --git a/proto/neutron/interchaintxs/query.proto b/proto/neutron/interchaintxs/v1/query.proto similarity index 95% rename from proto/neutron/interchaintxs/query.proto rename to proto/neutron/interchaintxs/v1/query.proto index e10fb44c5..285aacdf7 100644 --- a/proto/neutron/interchaintxs/query.proto +++ b/proto/neutron/interchaintxs/v1/query.proto @@ -1,10 +1,10 @@ syntax = "proto3"; -package neutron.interchaintxs; +package neutron.interchaintxs.v1; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; import "cosmos/base/query/v1beta1/pagination.proto"; -import "neutron/interchaintxs/params.proto"; +import "neutron/interchaintxs/v1/params.proto"; option go_package = "github.com/neutron-org/neutron/x/interchaintxs/types"; diff --git a/proto/neutron/interchaintxs/tx.proto b/proto/neutron/interchaintxs/v1/tx.proto similarity index 97% rename from proto/neutron/interchaintxs/tx.proto rename to proto/neutron/interchaintxs/v1/tx.proto index cb1dabbfd..5ce7899c8 100644 --- a/proto/neutron/interchaintxs/tx.proto +++ b/proto/neutron/interchaintxs/v1/tx.proto @@ -1,11 +1,11 @@ syntax = "proto3"; -package neutron.interchaintxs; +package neutron.interchaintxs.v1; option go_package = "github.com/neutron-org/neutron/x/interchaintxs/types"; import "cosmos_proto/cosmos.proto"; import "cosmos/base/v1beta1/coin.proto"; -import "neutron/interchaintxs/params.proto"; +import "neutron/interchaintxs/v1/params.proto"; import "gogoproto/gogo.proto"; import "google/api/http.proto"; import "google/api/annotations.proto"; diff --git a/wasmbinding/stargate_allowlist.go b/wasmbinding/stargate_allowlist.go index 1a1ca5483..f4320b8dd 100644 --- a/wasmbinding/stargate_allowlist.go +++ b/wasmbinding/stargate_allowlist.go @@ -45,7 +45,7 @@ func AcceptedStargateQueries() wasmkeeper.AcceptedStargateQueries { "/cosmos.bank.v1beta1.Query/SupplyOf": &banktypes.QuerySupplyOfResponse{}, // interchaintxs - "/neutron.interchaintxs.Query/Params": &interchaintxstypes.QueryParamsResponse{}, + "/neutron.interchaintxs.v1.Query/Params": &interchaintxstypes.QueryParamsResponse{}, // interchainqueries "/neutron.interchainqueries.Query/Params": &interchainqueriestypes.QueryParamsResponse{}, diff --git a/x/interchaintxs/types/genesis.pb.go b/x/interchaintxs/types/genesis.pb.go index 0f59b4765..e6a20056e 100644 --- a/x/interchaintxs/types/genesis.pb.go +++ b/x/interchaintxs/types/genesis.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: neutron/interchaintxs/genesis.proto +// source: neutron/interchaintxs/v1/genesis.proto package types @@ -32,7 +32,7 @@ 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_e49275bc96c5883d, []int{0} + return fileDescriptor_d16558b72a810826, []int{0} } func (m *GenesisState) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -69,28 +69,28 @@ func (m *GenesisState) GetParams() Params { } func init() { - proto.RegisterType((*GenesisState)(nil), "neutron.interchaintxs.GenesisState") + proto.RegisterType((*GenesisState)(nil), "neutron.interchaintxs.v1.GenesisState") } func init() { - proto.RegisterFile("neutron/interchaintxs/genesis.proto", fileDescriptor_e49275bc96c5883d) + proto.RegisterFile("neutron/interchaintxs/v1/genesis.proto", fileDescriptor_d16558b72a810826) } -var fileDescriptor_e49275bc96c5883d = []byte{ - // 198 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0xce, 0x4b, 0x2d, 0x2d, +var fileDescriptor_d16558b72a810826 = []byte{ + // 204 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0xcb, 0x4b, 0x2d, 0x2d, 0x29, 0xca, 0xcf, 0xd3, 0xcf, 0xcc, 0x2b, 0x49, 0x2d, 0x4a, 0xce, 0x48, 0xcc, 0xcc, 0x2b, 0xa9, - 0x28, 0xd6, 0x4f, 0x4f, 0xcd, 0x4b, 0x2d, 0xce, 0x2c, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, - 0x12, 0x85, 0x2a, 0xd2, 0x43, 0x51, 0x24, 0x25, 0x92, 0x9e, 0x9f, 0x9e, 0x0f, 0x56, 0xa1, 0x0f, - 0x62, 0x41, 0x14, 0x4b, 0x29, 0x61, 0x37, 0xb1, 0x20, 0xb1, 0x28, 0x31, 0x17, 0x6a, 0xa0, 0x92, - 0x37, 0x17, 0x8f, 0x3b, 0xc4, 0x86, 0xe0, 0x92, 0xc4, 0x92, 0x54, 0x21, 0x6b, 0x2e, 0x36, 0x88, - 0xbc, 0x04, 0xa3, 0x02, 0xa3, 0x06, 0xb7, 0x91, 0xac, 0x1e, 0x56, 0x1b, 0xf5, 0x02, 0xc0, 0x8a, - 0x9c, 0x58, 0x4e, 0xdc, 0x93, 0x67, 0x08, 0x82, 0x6a, 0x71, 0xf2, 0x3b, 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, 0x93, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, - 0x5c, 0x7d, 0xa8, 0x81, 0xba, 0xf9, 0x45, 0xe9, 0x30, 0xb6, 0x7e, 0x05, 0x9a, 0x1b, 0x4b, 0x2a, - 0x0b, 0x52, 0x8b, 0x93, 0xd8, 0xc0, 0x6e, 0x34, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0x83, 0x76, - 0x5c, 0x97, 0x1b, 0x01, 0x00, 0x00, + 0x28, 0xd6, 0x2f, 0x33, 0xd4, 0x4f, 0x4f, 0xcd, 0x4b, 0x2d, 0xce, 0x2c, 0xd6, 0x2b, 0x28, 0xca, + 0x2f, 0xc9, 0x17, 0x92, 0x80, 0xaa, 0xd3, 0x43, 0x51, 0xa7, 0x57, 0x66, 0x28, 0x25, 0x92, 0x9e, + 0x9f, 0x9e, 0x0f, 0x56, 0xa4, 0x0f, 0x62, 0x41, 0xd4, 0x4b, 0xa9, 0xe2, 0x34, 0xb7, 0x20, 0xb1, + 0x28, 0x31, 0x17, 0x6a, 0xac, 0x92, 0x1f, 0x17, 0x8f, 0x3b, 0xc4, 0x9e, 0xe0, 0x92, 0xc4, 0x92, + 0x54, 0x21, 0x3b, 0x2e, 0x36, 0x88, 0xbc, 0x04, 0xa3, 0x02, 0xa3, 0x06, 0xb7, 0x91, 0x82, 0x1e, + 0x2e, 0x7b, 0xf5, 0x02, 0xc0, 0xea, 0x9c, 0x58, 0x4e, 0xdc, 0x93, 0x67, 0x08, 0x82, 0xea, 0x72, + 0xf2, 0x3b, 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, 0x93, 0xf4, 0xcc, 0x92, + 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0x7d, 0xa8, 0x99, 0xba, 0xf9, 0x45, 0xe9, 0x30, 0xb6, + 0x7e, 0x05, 0x9a, 0x4b, 0x4b, 0x2a, 0x0b, 0x52, 0x8b, 0x93, 0xd8, 0xc0, 0xce, 0x34, 0x06, 0x04, + 0x00, 0x00, 0xff, 0xff, 0xc0, 0xc8, 0x84, 0x5c, 0x27, 0x01, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/interchaintxs/types/params.pb.go b/x/interchaintxs/types/params.pb.go index 205eb708b..844def56c 100644 --- a/x/interchaintxs/types/params.pb.go +++ b/x/interchaintxs/types/params.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: neutron/interchaintxs/params.proto +// source: neutron/interchaintxs/v1/params.proto package types @@ -35,7 +35,7 @@ type Params struct { func (m *Params) Reset() { *m = Params{} } func (*Params) ProtoMessage() {} func (*Params) Descriptor() ([]byte, []int) { - return fileDescriptor_0371c2fec8782216, []int{0} + return fileDescriptor_52b0ced89d3fa9c6, []int{0} } func (m *Params) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -79,33 +79,33 @@ func (m *Params) GetRegisterFee() []types.Coin { } func init() { - proto.RegisterType((*Params)(nil), "neutron.interchaintxs.Params") + proto.RegisterType((*Params)(nil), "neutron.interchaintxs.v1.Params") } func init() { - proto.RegisterFile("neutron/interchaintxs/params.proto", fileDescriptor_0371c2fec8782216) + proto.RegisterFile("neutron/interchaintxs/v1/params.proto", fileDescriptor_52b0ced89d3fa9c6) } -var fileDescriptor_0371c2fec8782216 = []byte{ - // 282 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x90, 0xb1, 0x4e, 0xf3, 0x30, - 0x14, 0x85, 0xe3, 0xff, 0xaf, 0x3a, 0xa4, 0x4c, 0x15, 0xa0, 0xd2, 0xc1, 0xad, 0x3a, 0x75, 0xc1, - 0x56, 0x81, 0xa9, 0x63, 0x90, 0xd8, 0x8a, 0x50, 0x61, 0x62, 0x89, 0x9c, 0xe8, 0xe2, 0x7a, 0xb0, - 0x1d, 0xf9, 0x3a, 0xc8, 0xbc, 0x04, 0x62, 0x64, 0xe4, 0x71, 0x3a, 0x76, 0x64, 0x42, 0x28, 0x79, - 0x11, 0xd4, 0x24, 0x1d, 0x60, 0x3b, 0xd2, 0xf9, 0xec, 0x4f, 0xf7, 0xc4, 0x33, 0x03, 0xa5, 0x77, - 0xd6, 0x70, 0x65, 0x3c, 0xb8, 0x7c, 0x23, 0x94, 0xf1, 0x01, 0x79, 0x21, 0x9c, 0xd0, 0xc8, 0x0a, - 0x67, 0xbd, 0x1d, 0x9e, 0x74, 0x0c, 0xfb, 0xc5, 0x8c, 0x8f, 0xa5, 0x95, 0xb6, 0x21, 0xf8, 0x3e, - 0xb5, 0xf0, 0x98, 0xe6, 0x16, 0xb5, 0x45, 0x9e, 0x09, 0x04, 0xfe, 0xbc, 0xc8, 0xc0, 0x8b, 0x05, - 0xcf, 0xad, 0x32, 0x6d, 0x3f, 0x7b, 0x25, 0x71, 0xff, 0xae, 0xf9, 0x7d, 0xb8, 0x8c, 0xc7, 0x1a, - 0x65, 0x8a, 0x65, 0xa6, 0x95, 0x4f, 0x7d, 0x48, 0xb5, 0x08, 0xa9, 0x06, 0x44, 0x21, 0x01, 0x47, - 0x64, 0x4a, 0xe6, 0xbd, 0xf5, 0xa9, 0x46, 0x79, 0xdf, 0x00, 0x0f, 0x61, 0x25, 0xc2, 0xaa, 0x6b, - 0x87, 0x49, 0x7c, 0xe4, 0x40, 0x2a, 0xf4, 0xe0, 0xd2, 0x27, 0x80, 0xd1, 0xbf, 0xe9, 0xff, 0xf9, - 0xe0, 0xe2, 0x8c, 0xb5, 0x76, 0xb6, 0xb7, 0xb3, 0xce, 0xce, 0xae, 0xad, 0x32, 0x49, 0x6f, 0xfb, - 0x35, 0x89, 0xd6, 0x83, 0xc3, 0xa3, 0x1b, 0x80, 0x65, 0xef, 0xfd, 0x63, 0x12, 0x25, 0xb7, 0xdb, - 0x8a, 0x92, 0x5d, 0x45, 0xc9, 0x77, 0x45, 0xc9, 0x5b, 0x4d, 0xa3, 0x5d, 0x4d, 0xa3, 0xcf, 0x9a, - 0x46, 0x8f, 0x57, 0x52, 0xf9, 0x4d, 0x99, 0xb1, 0xdc, 0x6a, 0xde, 0x4d, 0x70, 0x6e, 0x9d, 0x3c, - 0x64, 0x1e, 0xfe, 0x8c, 0xe6, 0x5f, 0x0a, 0xc0, 0xac, 0xdf, 0xdc, 0x79, 0xf9, 0x13, 0x00, 0x00, - 0xff, 0xff, 0x35, 0xb5, 0x95, 0xb4, 0x5a, 0x01, 0x00, 0x00, +var fileDescriptor_52b0ced89d3fa9c6 = []byte{ + // 288 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x90, 0xb1, 0x4a, 0x33, 0x41, + 0x14, 0x85, 0x77, 0xfe, 0x3f, 0xa4, 0xd8, 0x58, 0x05, 0x91, 0x98, 0x62, 0x12, 0x04, 0x21, 0x8d, + 0x33, 0xac, 0x5a, 0xa5, 0x8c, 0x60, 0x17, 0x91, 0x68, 0x65, 0xb3, 0xcc, 0x2e, 0xd7, 0xc9, 0x14, + 0x33, 0x13, 0xe6, 0xce, 0x2e, 0xe3, 0x4b, 0x88, 0xa5, 0xa5, 0x8f, 0x93, 0x32, 0xa5, 0x95, 0xc8, + 0xee, 0x8b, 0x48, 0x76, 0x37, 0x85, 0x76, 0x07, 0xce, 0x77, 0xf9, 0xb8, 0x27, 0x3e, 0x37, 0x50, + 0x78, 0x67, 0x0d, 0x57, 0xc6, 0x83, 0xcb, 0xd7, 0x42, 0x19, 0x1f, 0x90, 0x97, 0x09, 0xdf, 0x08, + 0x27, 0x34, 0xb2, 0x8d, 0xb3, 0xde, 0x0e, 0x47, 0x1d, 0xc6, 0x7e, 0x61, 0xac, 0x4c, 0xc6, 0xc7, + 0xd2, 0x4a, 0xdb, 0x40, 0x7c, 0x9f, 0x5a, 0x7e, 0x4c, 0x73, 0x8b, 0xda, 0x22, 0xcf, 0x04, 0x02, + 0x2f, 0x93, 0x0c, 0xbc, 0x48, 0x78, 0x6e, 0x95, 0x69, 0xfb, 0xb3, 0x57, 0x12, 0xf7, 0xef, 0x1b, + 0xc1, 0x70, 0x1e, 0x8f, 0x35, 0xca, 0x14, 0x8b, 0x4c, 0x2b, 0x9f, 0xfa, 0x90, 0x6a, 0x11, 0x52, + 0x0d, 0x88, 0x42, 0x02, 0x8e, 0xc8, 0x94, 0xcc, 0x7a, 0xab, 0x13, 0x8d, 0xf2, 0xa1, 0x01, 0x1e, + 0xc3, 0x52, 0x84, 0x65, 0xd7, 0x0e, 0x17, 0xf1, 0x91, 0x03, 0xa9, 0xd0, 0x83, 0x4b, 0x9f, 0x01, + 0x46, 0xff, 0xa6, 0xff, 0x67, 0x83, 0xcb, 0x53, 0xd6, 0xda, 0xd9, 0xde, 0xce, 0x3a, 0x3b, 0xbb, + 0xb1, 0xca, 0x2c, 0x7a, 0xdb, 0xaf, 0x49, 0xb4, 0x1a, 0x1c, 0x8e, 0x6e, 0x01, 0xe6, 0xbd, 0xf7, + 0x8f, 0x49, 0xb4, 0xb8, 0xdb, 0x56, 0x94, 0xec, 0x2a, 0x4a, 0xbe, 0x2b, 0x4a, 0xde, 0x6a, 0x1a, + 0xed, 0x6a, 0x1a, 0x7d, 0xd6, 0x34, 0x7a, 0xba, 0x96, 0xca, 0xaf, 0x8b, 0x8c, 0xe5, 0x56, 0xf3, + 0x6e, 0x85, 0x0b, 0xeb, 0xe4, 0x21, 0xf3, 0xf0, 0x67, 0x3a, 0xff, 0xb2, 0x01, 0xcc, 0xfa, 0xcd, + 0x9f, 0x57, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xc1, 0xcc, 0x9a, 0x6c, 0x60, 0x01, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { diff --git a/x/interchaintxs/types/query.pb.go b/x/interchaintxs/types/query.pb.go index 514420970..6d7ea05e7 100644 --- a/x/interchaintxs/types/query.pb.go +++ b/x/interchaintxs/types/query.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: neutron/interchaintxs/query.proto +// source: neutron/interchaintxs/v1/query.proto package types @@ -38,7 +38,7 @@ 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_9804d0830e584ce5, []int{0} + return fileDescriptor_6130c5f6c54e2428, []int{0} } func (m *QueryParamsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -77,7 +77,7 @@ 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_9804d0830e584ce5, []int{1} + return fileDescriptor_6130c5f6c54e2428, []int{1} } func (m *QueryParamsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -129,7 +129,7 @@ func (m *QueryInterchainAccountAddressRequest) Reset() { *m = QueryInter func (m *QueryInterchainAccountAddressRequest) String() string { return proto.CompactTextString(m) } func (*QueryInterchainAccountAddressRequest) ProtoMessage() {} func (*QueryInterchainAccountAddressRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_9804d0830e584ce5, []int{2} + return fileDescriptor_6130c5f6c54e2428, []int{2} } func (m *QueryInterchainAccountAddressRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -168,7 +168,7 @@ func (m *QueryInterchainAccountAddressResponse) Reset() { *m = QueryInte func (m *QueryInterchainAccountAddressResponse) String() string { return proto.CompactTextString(m) } func (*QueryInterchainAccountAddressResponse) ProtoMessage() {} func (*QueryInterchainAccountAddressResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_9804d0830e584ce5, []int{3} + return fileDescriptor_6130c5f6c54e2428, []int{3} } func (m *QueryInterchainAccountAddressResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -205,46 +205,49 @@ func (m *QueryInterchainAccountAddressResponse) GetInterchainAccountAddress() st } func init() { - proto.RegisterType((*QueryParamsRequest)(nil), "neutron.interchaintxs.QueryParamsRequest") - proto.RegisterType((*QueryParamsResponse)(nil), "neutron.interchaintxs.QueryParamsResponse") - proto.RegisterType((*QueryInterchainAccountAddressRequest)(nil), "neutron.interchaintxs.QueryInterchainAccountAddressRequest") - proto.RegisterType((*QueryInterchainAccountAddressResponse)(nil), "neutron.interchaintxs.QueryInterchainAccountAddressResponse") -} - -func init() { proto.RegisterFile("neutron/interchaintxs/query.proto", fileDescriptor_9804d0830e584ce5) } - -var fileDescriptor_9804d0830e584ce5 = []byte{ - // 474 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x93, 0x31, 0x6f, 0xd3, 0x40, - 0x14, 0xc7, 0xed, 0x14, 0x22, 0x38, 0x60, 0xb9, 0xb6, 0x52, 0x64, 0x51, 0x07, 0x0c, 0x95, 0xa0, - 0x12, 0x3e, 0x35, 0x30, 0xd1, 0x2e, 0xed, 0x96, 0x05, 0x41, 0x46, 0x96, 0xe8, 0x62, 0x9f, 0xdc, - 0x13, 0xe4, 0x9e, 0x73, 0x77, 0x86, 0x56, 0x51, 0x16, 0x06, 0xd4, 0x11, 0x89, 0x91, 0xa5, 0x9f, - 0x80, 0xcf, 0xd1, 0xb1, 0x12, 0x0b, 0x13, 0x42, 0x09, 0x03, 0x1f, 0x03, 0xf9, 0xee, 0xda, 0xca, - 0xc5, 0x6e, 0x11, 0x5b, 0xf4, 0xf2, 0x7f, 0xff, 0xff, 0xef, 0xde, 0x7b, 0x46, 0xf7, 0x05, 0x2b, - 0xb4, 0x04, 0x41, 0xb8, 0xd0, 0x4c, 0x26, 0x7b, 0x94, 0x0b, 0xbd, 0xaf, 0xc8, 0xa4, 0x60, 0xf2, - 0x20, 0xce, 0x25, 0x68, 0xc0, 0xab, 0x4e, 0x12, 0x57, 0x24, 0xc1, 0x4a, 0x06, 0x19, 0x18, 0x05, - 0x29, 0x7f, 0x59, 0x71, 0x70, 0x37, 0x03, 0xc8, 0xde, 0x32, 0x42, 0x73, 0x4e, 0xa8, 0x10, 0xa0, - 0xa9, 0xe6, 0x20, 0x94, 0xfb, 0x77, 0x23, 0x01, 0x35, 0x06, 0x45, 0x46, 0x54, 0x31, 0x9b, 0x41, - 0xde, 0x6d, 0x8e, 0x98, 0xa6, 0x9b, 0x24, 0xa7, 0x19, 0x17, 0x46, 0xec, 0xb4, 0x51, 0x3d, 0x59, - 0x4e, 0x25, 0x1d, 0x3b, 0xbf, 0x68, 0x05, 0xe1, 0x57, 0xa5, 0xcb, 0x4b, 0x53, 0x1c, 0xb0, 0x49, - 0xc1, 0x94, 0x8e, 0x06, 0x68, 0xb9, 0x52, 0x55, 0x39, 0x08, 0xc5, 0xf0, 0x16, 0x6a, 0xdb, 0xe6, - 0x8e, 0x7f, 0xcf, 0x7f, 0x74, 0xab, 0xb7, 0x16, 0xd7, 0x3e, 0x2c, 0xb6, 0x6d, 0xbb, 0xd7, 0x8e, - 0x7f, 0x74, 0xbd, 0x81, 0x6b, 0x89, 0xbe, 0xfa, 0xe8, 0xa1, 0x31, 0xed, 0x9f, 0x69, 0x77, 0x92, - 0x04, 0x0a, 0xa1, 0x77, 0xd2, 0x54, 0x32, 0x75, 0x1a, 0x8e, 0x1f, 0xa0, 0x3b, 0xf0, 0x5e, 0x30, - 0x39, 0xa4, 0xb6, 0x6e, 0xc2, 0x6e, 0x0e, 0x6e, 0x9b, 0xa2, 0xd3, 0xe2, 0x1e, 0x5a, 0x3d, 0xcf, - 0x1c, 0x52, 0x6b, 0x34, 0xe4, 0x69, 0xa7, 0x65, 0xc4, 0xcb, 0xfc, 0x62, 0x48, 0x3f, 0x2d, 0x8d, - 0x13, 0x10, 0x82, 0x25, 0xe5, 0x8c, 0x4a, 0xed, 0x92, 0x35, 0x3e, 0x2f, 0xf6, 0xd3, 0xe7, 0x37, - 0x0e, 0x8f, 0xba, 0xde, 0xef, 0xa3, 0xae, 0x17, 0x31, 0xb4, 0x7e, 0x05, 0xaf, 0x1b, 0xcb, 0x36, - 0x0a, 0x6a, 0x58, 0xaa, 0xf4, 0x1d, 0xde, 0xe0, 0xd2, 0xfb, 0xb2, 0x84, 0xae, 0x9b, 0x1c, 0xfc, - 0xd1, 0x47, 0x6d, 0x3b, 0x3a, 0xfc, 0xb8, 0x61, 0xb2, 0x7f, 0xef, 0x2a, 0xd8, 0xf8, 0x17, 0xa9, - 0x25, 0x8d, 0xd6, 0x3f, 0x7c, 0xfb, 0xf5, 0xb9, 0xd5, 0xc5, 0x6b, 0xe4, 0xb2, 0xd3, 0xc0, 0x87, - 0x2d, 0xd4, 0x69, 0x7a, 0x35, 0xde, 0xba, 0x2c, 0xef, 0x8a, 0xdd, 0x06, 0xdb, 0xff, 0xd7, 0xec, - 0xf0, 0x27, 0x06, 0xff, 0x0d, 0xe6, 0x0d, 0xf8, 0xd3, 0xca, 0xdd, 0xcc, 0xc8, 0xb4, 0xf6, 0x44, - 0x66, 0x64, 0x5a, 0x39, 0x83, 0x19, 0x69, 0xde, 0xde, 0xee, 0x8b, 0xe3, 0x79, 0xe8, 0x9f, 0xcc, - 0x43, 0xff, 0xe7, 0x3c, 0xf4, 0x3f, 0x2d, 0x42, 0xef, 0x64, 0x11, 0x7a, 0xdf, 0x17, 0xa1, 0xf7, - 0xfa, 0x59, 0xc6, 0xf5, 0x5e, 0x31, 0x8a, 0x13, 0x18, 0x9f, 0xe2, 0x3c, 0x01, 0x99, 0x9d, 0xa1, - 0xed, 0x5f, 0x80, 0xd3, 0x07, 0x39, 0x53, 0xa3, 0xb6, 0xf9, 0xec, 0x9e, 0xfe, 0x09, 0x00, 0x00, - 0xff, 0xff, 0x39, 0xa6, 0x49, 0x7e, 0x36, 0x04, 0x00, 0x00, + proto.RegisterType((*QueryParamsRequest)(nil), "neutron.interchaintxs.v1.QueryParamsRequest") + proto.RegisterType((*QueryParamsResponse)(nil), "neutron.interchaintxs.v1.QueryParamsResponse") + proto.RegisterType((*QueryInterchainAccountAddressRequest)(nil), "neutron.interchaintxs.v1.QueryInterchainAccountAddressRequest") + proto.RegisterType((*QueryInterchainAccountAddressResponse)(nil), "neutron.interchaintxs.v1.QueryInterchainAccountAddressResponse") +} + +func init() { + proto.RegisterFile("neutron/interchaintxs/v1/query.proto", fileDescriptor_6130c5f6c54e2428) +} + +var fileDescriptor_6130c5f6c54e2428 = []byte{ + // 482 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x53, 0x4f, 0x6b, 0x13, 0x41, + 0x14, 0xdf, 0x4d, 0x35, 0xe8, 0xa8, 0x97, 0x69, 0x85, 0x65, 0xd1, 0x4d, 0x59, 0x1b, 0x10, 0xb1, + 0x3b, 0x24, 0x7a, 0x12, 0xa9, 0xb4, 0xb7, 0x5c, 0x44, 0x03, 0x5e, 0xbc, 0x84, 0xc9, 0xee, 0xb0, + 0x1d, 0x34, 0xf3, 0x36, 0x3b, 0xb3, 0xb1, 0x25, 0xe4, 0xe2, 0xc9, 0x83, 0x88, 0xe0, 0x17, 0xe8, + 0xcd, 0x9b, 0x9f, 0xa3, 0xc7, 0x82, 0x17, 0x4f, 0x22, 0x89, 0x07, 0x3f, 0x86, 0xec, 0xcc, 0xb4, + 0x65, 0x6b, 0x96, 0x48, 0x6f, 0xcb, 0xdb, 0xdf, 0xfb, 0xfd, 0x79, 0xef, 0x0d, 0xda, 0x12, 0xac, + 0x50, 0x39, 0x08, 0xc2, 0x85, 0x62, 0x79, 0xbc, 0x4f, 0xb9, 0x50, 0x07, 0x92, 0x4c, 0x3a, 0x64, + 0x5c, 0xb0, 0xfc, 0x30, 0xca, 0x72, 0x50, 0x80, 0x3d, 0x8b, 0x8a, 0x2a, 0xa8, 0x68, 0xd2, 0xf1, + 0x37, 0x52, 0x48, 0x41, 0x83, 0x48, 0xf9, 0x65, 0xf0, 0xfe, 0x9d, 0x14, 0x20, 0x7d, 0xcb, 0x08, + 0xcd, 0x38, 0xa1, 0x42, 0x80, 0xa2, 0x8a, 0x83, 0x90, 0xf6, 0xef, 0x83, 0x18, 0xe4, 0x08, 0x24, + 0x19, 0x52, 0xc9, 0x8c, 0x0c, 0x99, 0x74, 0x86, 0x4c, 0xd1, 0x0e, 0xc9, 0x68, 0xca, 0x85, 0x06, + 0x5b, 0x6c, 0xbb, 0xd6, 0x5f, 0x46, 0x73, 0x3a, 0xb2, 0x94, 0xe1, 0x06, 0xc2, 0x2f, 0x4b, 0xa2, + 0x17, 0xba, 0xd8, 0x67, 0xe3, 0x82, 0x49, 0x15, 0xbe, 0x42, 0xeb, 0x95, 0xaa, 0xcc, 0x40, 0x48, + 0x86, 0x77, 0x50, 0xd3, 0x34, 0x7b, 0xee, 0xa6, 0x7b, 0xff, 0x46, 0x77, 0x33, 0xaa, 0x8b, 0x17, + 0x99, 0xce, 0xbd, 0x2b, 0xc7, 0x3f, 0x5b, 0x4e, 0xdf, 0x76, 0x85, 0xdf, 0x5c, 0xb4, 0xa5, 0x79, + 0x7b, 0x67, 0xf0, 0xdd, 0x38, 0x86, 0x42, 0xa8, 0xdd, 0x24, 0xc9, 0x99, 0x3c, 0xd5, 0xc7, 0xf7, + 0xd0, 0x2d, 0x78, 0x27, 0x58, 0x3e, 0xa0, 0xa6, 0xae, 0xf5, 0xae, 0xf7, 0x6f, 0xea, 0xa2, 0xc5, + 0xe2, 0x2e, 0xba, 0x7d, 0x2e, 0x3b, 0xa0, 0x86, 0x68, 0xc0, 0x13, 0xaf, 0xa1, 0xc1, 0xeb, 0xfc, + 0xa2, 0x48, 0x2f, 0x29, 0x89, 0x63, 0x10, 0x82, 0xc5, 0xe5, 0xa4, 0x4a, 0xec, 0x9a, 0x21, 0x3e, + 0x2f, 0xf6, 0x92, 0x27, 0xd7, 0x3e, 0x1c, 0xb5, 0x9c, 0x3f, 0x47, 0x2d, 0x27, 0x64, 0xa8, 0xbd, + 0xc2, 0xaf, 0x9d, 0xcc, 0x53, 0xe4, 0x2f, 0xf1, 0x52, 0x75, 0xef, 0xf1, 0x1a, 0x96, 0xee, 0xd7, + 0x35, 0x74, 0x55, 0xeb, 0xe0, 0x8f, 0x2e, 0x6a, 0x9a, 0xd1, 0xe1, 0x87, 0xf5, 0xc3, 0xfd, 0x77, + 0x63, 0xfe, 0xf6, 0x7f, 0xa2, 0x8d, 0xdf, 0xb0, 0xfd, 0xfe, 0xfb, 0xef, 0x2f, 0x8d, 0x16, 0xbe, + 0x4b, 0x96, 0x9f, 0x89, 0x59, 0x18, 0xfe, 0xd4, 0x40, 0x5e, 0x5d, 0x76, 0xbc, 0xb3, 0x42, 0x72, + 0xc5, 0x92, 0xfd, 0x67, 0x97, 0xee, 0xb7, 0x21, 0xc6, 0x3a, 0xc4, 0x1b, 0xcc, 0x6b, 0x42, 0x4c, + 0x2b, 0x37, 0x34, 0x23, 0xd3, 0xa5, 0xe7, 0x32, 0x23, 0xd3, 0xca, 0x49, 0xcc, 0x48, 0xfd, 0x26, + 0xf7, 0x9e, 0x1f, 0xcf, 0x03, 0xf7, 0x64, 0x1e, 0xb8, 0xbf, 0xe6, 0x81, 0xfb, 0x79, 0x11, 0x38, + 0x27, 0x8b, 0xc0, 0xf9, 0xb1, 0x08, 0x9c, 0xd7, 0x8f, 0x53, 0xae, 0xf6, 0x8b, 0x61, 0x14, 0xc3, + 0xe8, 0xd4, 0xce, 0x36, 0xe4, 0xe9, 0x99, 0xb5, 0x83, 0x0b, 0xe6, 0xd4, 0x61, 0xc6, 0xe4, 0xb0, + 0xa9, 0x5f, 0xe1, 0xa3, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xad, 0xfd, 0x25, 0x21, 0x4e, 0x04, + 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -274,7 +277,7 @@ func NewQueryClient(cc grpc1.ClientConn) QueryClient { func (c *queryClient) Params(ctx context.Context, in *QueryParamsRequest, opts ...grpc.CallOption) (*QueryParamsResponse, error) { out := new(QueryParamsResponse) - err := c.cc.Invoke(ctx, "/neutron.interchaintxs.Query/Params", in, out, opts...) + err := c.cc.Invoke(ctx, "/neutron.interchaintxs.v1.Query/Params", in, out, opts...) if err != nil { return nil, err } @@ -283,7 +286,7 @@ func (c *queryClient) Params(ctx context.Context, in *QueryParamsRequest, opts . func (c *queryClient) InterchainAccountAddress(ctx context.Context, in *QueryInterchainAccountAddressRequest, opts ...grpc.CallOption) (*QueryInterchainAccountAddressResponse, error) { out := new(QueryInterchainAccountAddressResponse) - err := c.cc.Invoke(ctx, "/neutron.interchaintxs.Query/InterchainAccountAddress", in, out, opts...) + err := c.cc.Invoke(ctx, "/neutron.interchaintxs.v1.Query/InterchainAccountAddress", in, out, opts...) if err != nil { return nil, err } @@ -322,7 +325,7 @@ func _Query_Params_Handler(srv interface{}, ctx context.Context, dec func(interf } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/neutron.interchaintxs.Query/Params", + FullMethod: "/neutron.interchaintxs.v1.Query/Params", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).Params(ctx, req.(*QueryParamsRequest)) @@ -340,7 +343,7 @@ func _Query_InterchainAccountAddress_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/neutron.interchaintxs.Query/InterchainAccountAddress", + FullMethod: "/neutron.interchaintxs.v1.Query/InterchainAccountAddress", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).InterchainAccountAddress(ctx, req.(*QueryInterchainAccountAddressRequest)) @@ -349,7 +352,7 @@ func _Query_InterchainAccountAddress_Handler(srv interface{}, ctx context.Contex } var _Query_serviceDesc = grpc.ServiceDesc{ - ServiceName: "neutron.interchaintxs.Query", + ServiceName: "neutron.interchaintxs.v1.Query", HandlerType: (*QueryServer)(nil), Methods: []grpc.MethodDesc{ { @@ -362,7 +365,7 @@ var _Query_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "neutron/interchaintxs/query.proto", + Metadata: "neutron/interchaintxs/v1/query.proto", } func (m *QueryParamsRequest) Marshal() (dAtA []byte, err error) { diff --git a/x/interchaintxs/types/query.pb.gw.go b/x/interchaintxs/types/query.pb.gw.go index 7fd1f4d23..943b58aab 100644 --- a/x/interchaintxs/types/query.pb.gw.go +++ b/x/interchaintxs/types/query.pb.gw.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-grpc-gateway. DO NOT EDIT. -// source: neutron/interchaintxs/query.proto +// source: neutron/interchaintxs/v1/query.proto /* Package types is a reverse proxy. diff --git a/x/interchaintxs/types/tx.pb.go b/x/interchaintxs/types/tx.pb.go index 0b6665e65..89d6f5d02 100644 --- a/x/interchaintxs/types/tx.pb.go +++ b/x/interchaintxs/types/tx.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: neutron/interchaintxs/tx.proto +// source: neutron/interchaintxs/v1/tx.proto package types @@ -48,7 +48,7 @@ func (m *MsgRegisterInterchainAccount) Reset() { *m = MsgRegisterInterch func (m *MsgRegisterInterchainAccount) String() string { return proto.CompactTextString(m) } func (*MsgRegisterInterchainAccount) ProtoMessage() {} func (*MsgRegisterInterchainAccount) Descriptor() ([]byte, []int) { - return fileDescriptor_40a159e5a7dbb364, []int{0} + return fileDescriptor_50f087790e59c806, []int{0} } func (m *MsgRegisterInterchainAccount) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -86,7 +86,7 @@ func (m *MsgRegisterInterchainAccountResponse) Reset() { *m = MsgRegiste func (m *MsgRegisterInterchainAccountResponse) String() string { return proto.CompactTextString(m) } func (*MsgRegisterInterchainAccountResponse) ProtoMessage() {} func (*MsgRegisterInterchainAccountResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_40a159e5a7dbb364, []int{1} + return fileDescriptor_50f087790e59c806, []int{1} } func (m *MsgRegisterInterchainAccountResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -135,7 +135,7 @@ func (m *MsgSubmitTx) Reset() { *m = MsgSubmitTx{} } func (m *MsgSubmitTx) String() string { return proto.CompactTextString(m) } func (*MsgSubmitTx) ProtoMessage() {} func (*MsgSubmitTx) Descriptor() ([]byte, []int) { - return fileDescriptor_40a159e5a7dbb364, []int{2} + return fileDescriptor_50f087790e59c806, []int{2} } func (m *MsgSubmitTx) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -176,7 +176,7 @@ func (m *MsgSubmitTxResponse) Reset() { *m = MsgSubmitTxResponse{} } func (m *MsgSubmitTxResponse) String() string { return proto.CompactTextString(m) } func (*MsgSubmitTxResponse) ProtoMessage() {} func (*MsgSubmitTxResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_40a159e5a7dbb364, []int{3} + return fileDescriptor_50f087790e59c806, []int{3} } func (m *MsgSubmitTxResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -235,7 +235,7 @@ 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_40a159e5a7dbb364, []int{4} + return fileDescriptor_50f087790e59c806, []int{4} } func (m *MsgUpdateParams) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -289,7 +289,7 @@ 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_40a159e5a7dbb364, []int{5} + return fileDescriptor_50f087790e59c806, []int{5} } func (m *MsgUpdateParamsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -319,68 +319,69 @@ func (m *MsgUpdateParamsResponse) XXX_DiscardUnknown() { var xxx_messageInfo_MsgUpdateParamsResponse proto.InternalMessageInfo func init() { - proto.RegisterType((*MsgRegisterInterchainAccount)(nil), "neutron.interchaintxs.MsgRegisterInterchainAccount") - proto.RegisterType((*MsgRegisterInterchainAccountResponse)(nil), "neutron.interchaintxs.MsgRegisterInterchainAccountResponse") - proto.RegisterType((*MsgSubmitTx)(nil), "neutron.interchaintxs.MsgSubmitTx") - proto.RegisterType((*MsgSubmitTxResponse)(nil), "neutron.interchaintxs.MsgSubmitTxResponse") - proto.RegisterType((*MsgUpdateParams)(nil), "neutron.interchaintxs.MsgUpdateParams") - proto.RegisterType((*MsgUpdateParamsResponse)(nil), "neutron.interchaintxs.MsgUpdateParamsResponse") -} - -func init() { proto.RegisterFile("neutron/interchaintxs/tx.proto", fileDescriptor_40a159e5a7dbb364) } - -var fileDescriptor_40a159e5a7dbb364 = []byte{ - // 795 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0xcf, 0x6f, 0xd3, 0x4a, - 0x10, 0x8e, 0x93, 0xbc, 0xfe, 0xd8, 0xe4, 0xe9, 0xe9, 0xb9, 0xa9, 0xea, 0x44, 0xad, 0x13, 0x0c, - 0xaa, 0xa2, 0x48, 0xb5, 0xdb, 0x14, 0x71, 0x28, 0x42, 0xa2, 0x41, 0xaa, 0x94, 0x43, 0x50, 0xe5, - 0x96, 0x0b, 0x42, 0x8a, 0x36, 0xf6, 0xc6, 0xb1, 0xa8, 0x77, 0x83, 0x77, 0x5d, 0x25, 0x57, 0x4e, - 0x88, 0x0b, 0xfc, 0x03, 0x48, 0x3d, 0x22, 0x4e, 0x3d, 0x70, 0xe5, 0xde, 0x63, 0xc5, 0x89, 0x0b, - 0x05, 0xb5, 0x87, 0x72, 0xee, 0x5f, 0x80, 0xd6, 0x5e, 0x37, 0x3f, 0x94, 0x94, 0x8a, 0x4b, 0xbc, - 0x33, 0xf3, 0xed, 0x37, 0xb3, 0xdf, 0xcc, 0x6e, 0x80, 0x8a, 0x51, 0xc0, 0x7c, 0x82, 0x0d, 0x17, - 0x33, 0xe4, 0x5b, 0x1d, 0xe8, 0x62, 0xd6, 0xa3, 0x06, 0xeb, 0xe9, 0x5d, 0x9f, 0x30, 0x22, 0x2f, - 0x8a, 0xb8, 0x3e, 0x12, 0x2f, 0xe4, 0x2d, 0x42, 0x3d, 0x42, 0x9b, 0x21, 0xc8, 0x88, 0x8c, 0x68, - 0x47, 0x41, 0x8d, 0x2c, 0xa3, 0x05, 0x29, 0x32, 0x0e, 0x37, 0x5a, 0x88, 0xc1, 0x0d, 0xc3, 0x22, - 0x2e, 0x16, 0x71, 0x6d, 0x72, 0xc6, 0x2e, 0xf4, 0xa1, 0x17, 0x73, 0xe4, 0x1c, 0xe2, 0x90, 0x88, - 0x9b, 0xaf, 0x84, 0x77, 0xd1, 0x21, 0xc4, 0x39, 0x40, 0x06, 0xec, 0xba, 0x46, 0x87, 0xb1, 0xae, - 0x70, 0x2f, 0x0f, 0xb9, 0x21, 0xc6, 0x84, 0x41, 0xe6, 0x12, 0x1c, 0x53, 0xe5, 0x45, 0x34, 0xb4, - 0x5a, 0x41, 0xdb, 0x80, 0xb8, 0x2f, 0x42, 0x2b, 0x71, 0x25, 0x6d, 0x84, 0x7c, 0xd4, 0x0e, 0xb0, - 0x8d, 0x7c, 0xbe, 0x16, 0xe1, 0x25, 0x71, 0x10, 0x8f, 0x3a, 0xc6, 0xe1, 0x06, 0xff, 0x88, 0xc0, - 0xff, 0xd0, 0x73, 0x31, 0x31, 0xc2, 0xdf, 0xc8, 0xa5, 0x9d, 0x26, 0xc1, 0x72, 0x83, 0x3a, 0x26, - 0x72, 0x5c, 0xca, 0x90, 0x5f, 0xbf, 0x3e, 0xda, 0xb6, 0x65, 0x91, 0x00, 0x33, 0xf9, 0x0e, 0xc8, - 0xb6, 0x7d, 0xe2, 0x35, 0xa1, 0x6d, 0xfb, 0x88, 0x52, 0x45, 0x2a, 0x49, 0xe5, 0x79, 0x33, 0xc3, - 0x7d, 0xdb, 0x91, 0x4b, 0x7e, 0x04, 0xfe, 0xb5, 0x08, 0xc6, 0xc8, 0xe2, 0xe5, 0x37, 0x5d, 0x5b, - 0x49, 0x72, 0x4c, 0x4d, 0xb9, 0x3a, 0x2b, 0xe6, 0xfa, 0xd0, 0x3b, 0xd8, 0xd2, 0x46, 0xc2, 0x9a, - 0x99, 0x1d, 0xd8, 0x75, 0x5b, 0xde, 0x07, 0x8b, 0x03, 0x45, 0x9b, 0x30, 0xca, 0xcb, 0x69, 0x52, - 0x21, 0x4d, 0xe9, 0xea, 0xac, 0xb8, 0x1c, 0xd1, 0x4c, 0x84, 0x69, 0xe6, 0x82, 0x3b, 0x5e, 0x75, - 0xdd, 0x96, 0x31, 0xc8, 0xfa, 0xe2, 0x50, 0xcd, 0x36, 0x42, 0x4a, 0xba, 0x94, 0x2a, 0x67, 0xaa, - 0x79, 0x5d, 0xb4, 0x9c, 0x37, 0x59, 0x17, 0x4d, 0xd6, 0x9f, 0x10, 0x17, 0xd7, 0xd6, 0x4f, 0xce, - 0x8a, 0x89, 0x4f, 0x3f, 0x8a, 0x65, 0xc7, 0x65, 0x9d, 0xa0, 0xa5, 0x5b, 0xc4, 0x13, 0xf3, 0x21, - 0x3e, 0x6b, 0xd4, 0x7e, 0x69, 0xb0, 0x7e, 0x17, 0xd1, 0x70, 0x03, 0x35, 0x33, 0x71, 0x82, 0x1d, - 0x84, 0xb6, 0xe6, 0xde, 0x1c, 0x15, 0x13, 0xbf, 0x8e, 0x8a, 0x09, 0x6d, 0x15, 0xdc, 0xbb, 0x49, - 0x51, 0x13, 0xd1, 0x2e, 0xc1, 0x14, 0x69, 0x1f, 0x92, 0x20, 0xd3, 0xa0, 0xce, 0x5e, 0xd0, 0xf2, - 0x5c, 0xb6, 0xdf, 0xbb, 0x8d, 0xd2, 0xd5, 0x69, 0x52, 0x85, 0x8a, 0x4f, 0x16, 0xe2, 0xee, 0x78, - 0x77, 0x42, 0x59, 0xc7, 0x7a, 0x50, 0x06, 0x69, 0x8f, 0x3a, 0x54, 0xa8, 0x94, 0xd3, 0xa3, 0xd9, - 0xd3, 0xe3, 0xd9, 0xd3, 0xb7, 0x71, 0xdf, 0x0c, 0x11, 0xb2, 0x0c, 0xd2, 0x1e, 0xf2, 0x88, 0xf2, - 0x4f, 0xc8, 0x12, 0xae, 0x65, 0x05, 0xcc, 0x32, 0xd7, 0x43, 0x24, 0x60, 0xca, 0x4c, 0x49, 0x2a, - 0xa7, 0xcd, 0xd8, 0x94, 0xd7, 0x41, 0x8a, 0x8b, 0x3f, 0x5b, 0x92, 0xca, 0x99, 0xaa, 0xa2, 0xc7, - 0x77, 0x72, 0x68, 0x6e, 0xf5, 0x1d, 0x84, 0x6a, 0x69, 0xae, 0xbd, 0xc9, 0xa1, 0x43, 0x3a, 0xee, - 0x82, 0x85, 0x21, 0x79, 0x62, 0xd9, 0xe4, 0x22, 0xc8, 0x50, 0xf4, 0x2a, 0x40, 0xd8, 0x42, 0xfc, - 0x34, 0x52, 0x98, 0x10, 0xc4, 0xae, 0xba, 0xcd, 0xab, 0xb1, 0x3a, 0x10, 0x63, 0x74, 0x20, 0x64, - 0x89, 0x4d, 0xed, 0x8b, 0x04, 0xfe, 0x6b, 0x50, 0xe7, 0x59, 0xd7, 0x86, 0x0c, 0xed, 0x86, 0xf7, - 0x56, 0x7e, 0x00, 0xe6, 0x61, 0xc0, 0x3a, 0xc4, 0x77, 0x59, 0x3f, 0x92, 0xbc, 0xa6, 0x7c, 0xfd, - 0xbc, 0x96, 0x13, 0x73, 0x22, 0x94, 0xdf, 0x63, 0xbe, 0x8b, 0x1d, 0x73, 0x00, 0x95, 0x1f, 0x83, - 0x99, 0xe8, 0xe6, 0x87, 0x49, 0x32, 0xd5, 0x15, 0x7d, 0xe2, 0x83, 0xa3, 0x47, 0x69, 0x6a, 0xf3, - 0xfc, 0x84, 0x1f, 0x2f, 0x8f, 0x2b, 0x92, 0x29, 0xf6, 0x6d, 0xad, 0xbf, 0xbe, 0x3c, 0xae, 0x0c, - 0x18, 0xdf, 0x5e, 0x1e, 0x57, 0x56, 0x46, 0x9f, 0x96, 0xb1, 0x5a, 0xb5, 0x3c, 0x58, 0x1a, 0x73, - 0xc5, 0xaa, 0x54, 0xbf, 0x27, 0x41, 0xaa, 0x41, 0x1d, 0xf9, 0x9d, 0x04, 0xf2, 0xd3, 0x2f, 0xf3, - 0xe6, 0x94, 0x22, 0x6f, 0x9a, 0xd7, 0xc2, 0xc3, 0xbf, 0xd8, 0x74, 0x3d, 0xe4, 0x09, 0xf9, 0x05, - 0x98, 0xbb, 0x1e, 0x71, 0x6d, 0x3a, 0x55, 0x8c, 0x29, 0x54, 0xfe, 0x8c, 0x19, 0x62, 0x6f, 0x83, - 0xec, 0x48, 0x3b, 0x57, 0xa7, 0xef, 0x1e, 0xc6, 0x15, 0xf4, 0xdb, 0xe1, 0xe2, 0x4c, 0xb5, 0xa7, - 0x27, 0xe7, 0xaa, 0x74, 0x7a, 0xae, 0x4a, 0x3f, 0xcf, 0x55, 0xe9, 0xfd, 0x85, 0x9a, 0x38, 0xbd, - 0x50, 0x13, 0xdf, 0x2e, 0xd4, 0xc4, 0xf3, 0xfb, 0x43, 0xef, 0x85, 0xe0, 0x5c, 0x23, 0xbe, 0x13, - 0xaf, 0x8d, 0xde, 0xf8, 0x3f, 0x14, 0x7f, 0x41, 0x5a, 0x33, 0xe1, 0xd5, 0xda, 0xfc, 0x1d, 0x00, - 0x00, 0xff, 0xff, 0xba, 0xdc, 0x2b, 0xd0, 0xc7, 0x06, 0x00, 0x00, + proto.RegisterType((*MsgRegisterInterchainAccount)(nil), "neutron.interchaintxs.v1.MsgRegisterInterchainAccount") + proto.RegisterType((*MsgRegisterInterchainAccountResponse)(nil), "neutron.interchaintxs.v1.MsgRegisterInterchainAccountResponse") + proto.RegisterType((*MsgSubmitTx)(nil), "neutron.interchaintxs.v1.MsgSubmitTx") + proto.RegisterType((*MsgSubmitTxResponse)(nil), "neutron.interchaintxs.v1.MsgSubmitTxResponse") + proto.RegisterType((*MsgUpdateParams)(nil), "neutron.interchaintxs.v1.MsgUpdateParams") + proto.RegisterType((*MsgUpdateParamsResponse)(nil), "neutron.interchaintxs.v1.MsgUpdateParamsResponse") +} + +func init() { proto.RegisterFile("neutron/interchaintxs/v1/tx.proto", fileDescriptor_50f087790e59c806) } + +var fileDescriptor_50f087790e59c806 = []byte{ + // 802 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0xbf, 0x6b, 0x1b, 0x4b, + 0x10, 0xd6, 0x49, 0x7a, 0xfe, 0xb1, 0xd2, 0xe3, 0xf1, 0xce, 0x32, 0x3e, 0x09, 0x5b, 0x92, 0xef, + 0x3d, 0x07, 0xc5, 0xa0, 0x3b, 0x4b, 0x09, 0x2e, 0x0c, 0x09, 0x58, 0x06, 0x83, 0x0a, 0x05, 0x73, + 0x76, 0x9a, 0x34, 0x62, 0x75, 0xb7, 0x3a, 0x1d, 0xd1, 0xed, 0x2a, 0xb7, 0x7b, 0x46, 0x6a, 0x53, + 0x85, 0x54, 0x69, 0x52, 0x06, 0x5c, 0x86, 0x54, 0x2e, 0xf2, 0x07, 0xa4, 0x74, 0x69, 0x52, 0xa5, + 0x72, 0x82, 0x5d, 0x38, 0x5d, 0xc0, 0x7f, 0x41, 0xb8, 0xbd, 0x3d, 0xeb, 0x07, 0x96, 0x30, 0x69, + 0xa4, 0x9d, 0x99, 0x6f, 0xbf, 0x99, 0xfd, 0x66, 0x76, 0x0f, 0xac, 0x63, 0xe4, 0x33, 0x8f, 0x60, + 0xdd, 0xc1, 0x0c, 0x79, 0x66, 0x07, 0x3a, 0x98, 0xf5, 0xa9, 0x7e, 0x5c, 0xd1, 0x59, 0x5f, 0xeb, + 0x79, 0x84, 0x11, 0x59, 0x11, 0x10, 0x6d, 0x0c, 0xa2, 0x1d, 0x57, 0x72, 0x59, 0x93, 0x50, 0x97, + 0xd0, 0x26, 0xc7, 0xe9, 0xa1, 0x11, 0x6e, 0xca, 0xe5, 0x43, 0x4b, 0x6f, 0x41, 0x8a, 0xf4, 0xe3, + 0x4a, 0x0b, 0x31, 0x58, 0xd1, 0x4d, 0xe2, 0x60, 0x11, 0xdf, 0x98, 0x9a, 0xb7, 0x07, 0x3d, 0xe8, + 0x46, 0x34, 0x19, 0x9b, 0xd8, 0x24, 0xa4, 0x0f, 0x56, 0xc2, 0xbb, 0x6c, 0x13, 0x62, 0x77, 0x91, + 0x0e, 0x7b, 0x8e, 0xde, 0x61, 0xac, 0x27, 0xdc, 0xab, 0x23, 0x6e, 0x88, 0x31, 0x61, 0x90, 0x39, + 0x04, 0x47, 0x54, 0x59, 0x11, 0xe5, 0x56, 0xcb, 0x6f, 0xeb, 0x10, 0x0f, 0x44, 0x68, 0x2d, 0x2a, + 0xa6, 0x8d, 0x90, 0x87, 0xda, 0x3e, 0xb6, 0x90, 0x17, 0xac, 0x45, 0x78, 0x45, 0x9c, 0xc5, 0xa5, + 0x76, 0x50, 0xa0, 0x4b, 0x6d, 0x11, 0xf8, 0x17, 0xba, 0x0e, 0x26, 0x3a, 0xff, 0x0d, 0x5d, 0xea, + 0x79, 0x1c, 0xac, 0x36, 0xa8, 0x6d, 0x20, 0xdb, 0xa1, 0x0c, 0x79, 0xf5, 0xdb, 0xd3, 0xed, 0x9a, + 0x26, 0xf1, 0x31, 0x93, 0xd7, 0x41, 0xba, 0xed, 0x11, 0xb7, 0x09, 0x2d, 0xcb, 0x43, 0x94, 0x2a, + 0x52, 0x51, 0x2a, 0x2d, 0x1a, 0xa9, 0xc0, 0xb7, 0x1b, 0xba, 0xe4, 0x27, 0xe0, 0x6f, 0x93, 0x60, + 0x8c, 0xcc, 0xa0, 0xfc, 0xa6, 0x63, 0x29, 0xf1, 0x00, 0x53, 0x53, 0x6e, 0x2e, 0x0a, 0x99, 0x01, + 0x74, 0xbb, 0x3b, 0xea, 0x58, 0x58, 0x35, 0xd2, 0x43, 0xbb, 0x6e, 0xc9, 0x47, 0x60, 0x79, 0x28, + 0x6a, 0x13, 0x86, 0x79, 0x03, 0x9a, 0x04, 0xa7, 0x29, 0xde, 0x5c, 0x14, 0x56, 0x43, 0x9a, 0x3b, + 0x61, 0xaa, 0xb1, 0xe4, 0x4c, 0x56, 0x5d, 0xb7, 0x64, 0x0c, 0xd2, 0x9e, 0x38, 0x54, 0xb3, 0x8d, + 0x90, 0x92, 0x2c, 0x26, 0x4a, 0xa9, 0x6a, 0x56, 0x13, 0x5d, 0x0f, 0xfa, 0xac, 0x89, 0x3e, 0x6b, + 0x7b, 0xc4, 0xc1, 0xb5, 0xad, 0xb3, 0x8b, 0x42, 0xec, 0xd3, 0xf7, 0x42, 0xc9, 0x76, 0x58, 0xc7, + 0x6f, 0x69, 0x26, 0x71, 0xc5, 0x88, 0x88, 0xbf, 0x32, 0xb5, 0x5e, 0xea, 0x6c, 0xd0, 0x43, 0x94, + 0x6f, 0xa0, 0x46, 0x2a, 0x4a, 0xb0, 0x8f, 0xd0, 0xce, 0xc2, 0x9b, 0x93, 0x42, 0xec, 0xe7, 0x49, + 0x21, 0xa6, 0x3e, 0x00, 0xff, 0xcf, 0x52, 0xd4, 0x40, 0xb4, 0x47, 0x30, 0x45, 0xea, 0x87, 0x38, + 0x48, 0x35, 0xa8, 0x7d, 0xe8, 0xb7, 0x5c, 0x87, 0x1d, 0xf5, 0xef, 0xa3, 0x74, 0x75, 0x9a, 0x54, + 0x5c, 0xf1, 0xbb, 0x85, 0xf8, 0x6f, 0xb2, 0x3b, 0x5c, 0xd6, 0x89, 0x1e, 0x94, 0x40, 0xd2, 0xa5, + 0x36, 0x15, 0x2a, 0x65, 0xb4, 0x70, 0xf6, 0xb4, 0x68, 0xf6, 0xb4, 0x5d, 0x3c, 0x30, 0x38, 0x42, + 0x96, 0x41, 0xd2, 0x45, 0x2e, 0x51, 0xfe, 0xe2, 0x2c, 0x7c, 0x2d, 0x2b, 0x60, 0x9e, 0x39, 0x2e, + 0x22, 0x3e, 0x53, 0xe6, 0x8a, 0x52, 0x29, 0x69, 0x44, 0xa6, 0xbc, 0x05, 0x12, 0x81, 0xf8, 0xf3, + 0x45, 0xa9, 0x94, 0xaa, 0x2a, 0x5a, 0x74, 0x33, 0x47, 0xe6, 0x56, 0xdb, 0x47, 0xa8, 0x96, 0x0c, + 0xb4, 0x37, 0x02, 0xe8, 0x88, 0x8e, 0x07, 0x60, 0x69, 0x44, 0x9e, 0x48, 0x36, 0xb9, 0x00, 0x52, + 0x14, 0xbd, 0xf2, 0x11, 0x36, 0x51, 0x70, 0x1a, 0x89, 0x27, 0x04, 0x91, 0xab, 0x6e, 0x05, 0xd5, + 0x98, 0x1d, 0x88, 0x31, 0xea, 0x0a, 0x59, 0x22, 0x53, 0xfd, 0x22, 0x81, 0x7f, 0x1a, 0xd4, 0x7e, + 0xde, 0xb3, 0x20, 0x43, 0x07, 0xfc, 0xde, 0xca, 0xdb, 0x60, 0x11, 0xfa, 0xac, 0x43, 0x3c, 0x87, + 0x0d, 0x42, 0xc9, 0x6b, 0xca, 0xd7, 0xcf, 0xe5, 0x8c, 0x98, 0x13, 0xa1, 0xfc, 0x21, 0xf3, 0x1c, + 0x6c, 0x1b, 0x43, 0xa8, 0xbc, 0x07, 0xe6, 0xc2, 0x9b, 0xcf, 0x93, 0xa4, 0xaa, 0x45, 0x6d, 0xda, + 0xb3, 0xa3, 0x85, 0x99, 0x6a, 0x8b, 0xc1, 0x21, 0x3f, 0x5e, 0x9f, 0x6e, 0x4a, 0x86, 0xd8, 0xba, + 0xb3, 0xf5, 0xfa, 0xfa, 0x74, 0x73, 0x48, 0xfa, 0xf6, 0xfa, 0x74, 0x73, 0x6d, 0xfc, 0x81, 0x99, + 0x28, 0x57, 0xcd, 0x82, 0x95, 0x09, 0x57, 0x24, 0x4c, 0xf5, 0x57, 0x1c, 0x24, 0x1a, 0xd4, 0x96, + 0xdf, 0x4b, 0x20, 0x3b, 0xfd, 0x3e, 0x6f, 0x4f, 0xaf, 0x73, 0xd6, 0xd4, 0xe6, 0x9e, 0xfe, 0xd9, + 0xbe, 0xdb, 0x69, 0x8f, 0xc9, 0x2d, 0xb0, 0x70, 0x3b, 0xeb, 0x1b, 0x33, 0xd9, 0x22, 0x58, 0xae, + 0x7c, 0x2f, 0xd8, 0x48, 0x8e, 0x2e, 0x48, 0x8f, 0x75, 0xf7, 0xe1, 0x4c, 0x82, 0x51, 0x68, 0xae, + 0x72, 0x6f, 0x68, 0x94, 0xaf, 0xf6, 0xec, 0xec, 0x32, 0x2f, 0x9d, 0x5f, 0xe6, 0xa5, 0x1f, 0x97, + 0x79, 0xe9, 0xdd, 0x55, 0x3e, 0x76, 0x7e, 0x95, 0x8f, 0x7d, 0xbb, 0xca, 0xc7, 0x5e, 0x3c, 0x1e, + 0x79, 0x44, 0x04, 0x6d, 0x99, 0x78, 0x76, 0xb4, 0xd6, 0xfb, 0x13, 0xdf, 0x11, 0xfe, 0xac, 0xb4, + 0xe6, 0xf8, 0x7d, 0x7b, 0xf4, 0x3b, 0x00, 0x00, 0xff, 0xff, 0xe0, 0xd3, 0x11, 0x00, 0xe5, 0x06, + 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -410,7 +411,7 @@ func NewMsgClient(cc grpc1.ClientConn) MsgClient { func (c *msgClient) RegisterInterchainAccount(ctx context.Context, in *MsgRegisterInterchainAccount, opts ...grpc.CallOption) (*MsgRegisterInterchainAccountResponse, error) { out := new(MsgRegisterInterchainAccountResponse) - err := c.cc.Invoke(ctx, "/neutron.interchaintxs.Msg/RegisterInterchainAccount", in, out, opts...) + err := c.cc.Invoke(ctx, "/neutron.interchaintxs.v1.Msg/RegisterInterchainAccount", in, out, opts...) if err != nil { return nil, err } @@ -419,7 +420,7 @@ func (c *msgClient) RegisterInterchainAccount(ctx context.Context, in *MsgRegist func (c *msgClient) SubmitTx(ctx context.Context, in *MsgSubmitTx, opts ...grpc.CallOption) (*MsgSubmitTxResponse, error) { out := new(MsgSubmitTxResponse) - err := c.cc.Invoke(ctx, "/neutron.interchaintxs.Msg/SubmitTx", in, out, opts...) + err := c.cc.Invoke(ctx, "/neutron.interchaintxs.v1.Msg/SubmitTx", in, out, opts...) if err != nil { return nil, err } @@ -428,7 +429,7 @@ func (c *msgClient) SubmitTx(ctx context.Context, in *MsgSubmitTx, opts ...grpc. func (c *msgClient) UpdateParams(ctx context.Context, in *MsgUpdateParams, opts ...grpc.CallOption) (*MsgUpdateParamsResponse, error) { out := new(MsgUpdateParamsResponse) - err := c.cc.Invoke(ctx, "/neutron.interchaintxs.Msg/UpdateParams", in, out, opts...) + err := c.cc.Invoke(ctx, "/neutron.interchaintxs.v1.Msg/UpdateParams", in, out, opts...) if err != nil { return nil, err } @@ -470,7 +471,7 @@ func _Msg_RegisterInterchainAccount_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/neutron.interchaintxs.Msg/RegisterInterchainAccount", + FullMethod: "/neutron.interchaintxs.v1.Msg/RegisterInterchainAccount", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MsgServer).RegisterInterchainAccount(ctx, req.(*MsgRegisterInterchainAccount)) @@ -488,7 +489,7 @@ func _Msg_SubmitTx_Handler(srv interface{}, ctx context.Context, dec func(interf } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/neutron.interchaintxs.Msg/SubmitTx", + FullMethod: "/neutron.interchaintxs.v1.Msg/SubmitTx", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MsgServer).SubmitTx(ctx, req.(*MsgSubmitTx)) @@ -506,7 +507,7 @@ func _Msg_UpdateParams_Handler(srv interface{}, ctx context.Context, dec func(in } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/neutron.interchaintxs.Msg/UpdateParams", + FullMethod: "/neutron.interchaintxs.v1.Msg/UpdateParams", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MsgServer).UpdateParams(ctx, req.(*MsgUpdateParams)) @@ -515,7 +516,7 @@ func _Msg_UpdateParams_Handler(srv interface{}, ctx context.Context, dec func(in } var _Msg_serviceDesc = grpc.ServiceDesc{ - ServiceName: "neutron.interchaintxs.Msg", + ServiceName: "neutron.interchaintxs.v1.Msg", HandlerType: (*MsgServer)(nil), Methods: []grpc.MethodDesc{ { @@ -532,7 +533,7 @@ var _Msg_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "neutron/interchaintxs/tx.proto", + Metadata: "neutron/interchaintxs/v1/tx.proto", } func (m *MsgRegisterInterchainAccount) Marshal() (dAtA []byte, err error) { From 434b089d67fe8e8adda50282a9c6db6f54d3f486 Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Fri, 24 Nov 2023 16:24:09 +0200 Subject: [PATCH 298/307] global fee min gas prices --- app/upgrades/v1.1.0/upgrades.go | 14 ++++++++------ app/upgrades/v1.1.0/upgrades_test.go | 6 +++--- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/app/upgrades/v1.1.0/upgrades.go b/app/upgrades/v1.1.0/upgrades.go index 3ba3a35ef..36ec025cb 100644 --- a/app/upgrades/v1.1.0/upgrades.go +++ b/app/upgrades/v1.1.0/upgrades.go @@ -259,13 +259,15 @@ func setInterchainTxsParams(ctx sdk.Context, paramsKeepers paramskeeper.Keeper, func migrateGlobalFees(ctx sdk.Context, keepers *upgrades.UpgradeKeepers) error { //nolint:unparam ctx.Logger().Info("Implementing GlobalFee Params...") - // global fee is empty set, set global fee to equal to 0.05 USD (for 200k of gas) in appropriate coin - // As of June 22nd, 2023 this is - // 0.9untrn,0.026ibc/C4CFF46FD6DE35CA4CF4CE031E643C8FDC9BA4B99AE598E9B0ED98FE3A2319F9,0.25ibc/F082B65C88E4B6D5EF1DB243CDA1D331D002759E938A0F5CD3FFDC5D53B3E349 + // The average gas cost for an average transaction on Neutron should not go beyond 5 cents. + // Users have three designated coins that can be used for gas: NTRN, ATOM, and axlUSDC + // Assuming average transaction gas on Neutron consumer is ~250000 approximately, ATOM 30D TWAP is $8.4 and NTRN 30D TWAP is $0.36 + // we set minimum-gas-prices as per this formula: + // ((0.05 * 10^(6)) / TOKEN_30d_TWAP) / AVG_GAS_PRICE requiredGlobalFees := sdk.DecCoins{ - sdk.NewDecCoinFromDec(params.DefaultDenom, sdk.MustNewDecFromStr("0.9")), - sdk.NewDecCoinFromDec(AtomDenom, sdk.MustNewDecFromStr("0.026")), - sdk.NewDecCoinFromDec(AxelarUsdcDenom, sdk.MustNewDecFromStr("0.25")), + sdk.NewDecCoinFromDec(params.DefaultDenom, sdk.MustNewDecFromStr("0.56")), + sdk.NewDecCoinFromDec(AtomDenom, sdk.MustNewDecFromStr("0.02")), + sdk.NewDecCoinFromDec(AxelarUsdcDenom, sdk.MustNewDecFromStr("0.2")), } requiredGlobalFees = requiredGlobalFees.Sort() diff --git a/app/upgrades/v1.1.0/upgrades_test.go b/app/upgrades/v1.1.0/upgrades_test.go index b035e780f..318da7923 100644 --- a/app/upgrades/v1.1.0/upgrades_test.go +++ b/app/upgrades/v1.1.0/upgrades_test.go @@ -93,9 +93,9 @@ func (suite *UpgradeTestSuite) TestGlobalFeesUpgrade() { var globalMinGasPrices sdk.DecCoins globalFeeSubspace.Get(ctx, globalfeetypes.ParamStoreKeyMinGasPrices, &globalMinGasPrices) requiredGlobalFees := sdk.DecCoins{ - sdk.NewDecCoinFromDec("ibc/C4CFF46FD6DE35CA4CF4CE031E643C8FDC9BA4B99AE598E9B0ED98FE3A2319F9", sdk.MustNewDecFromStr("0.026")), - sdk.NewDecCoinFromDec("ibc/F082B65C88E4B6D5EF1DB243CDA1D331D002759E938A0F5CD3FFDC5D53B3E349", sdk.MustNewDecFromStr("0.25")), - sdk.NewDecCoinFromDec("untrn", sdk.MustNewDecFromStr("0.9")), + sdk.NewDecCoinFromDec("ibc/C4CFF46FD6DE35CA4CF4CE031E643C8FDC9BA4B99AE598E9B0ED98FE3A2319F9", sdk.MustNewDecFromStr("0.02")), + sdk.NewDecCoinFromDec("ibc/F082B65C88E4B6D5EF1DB243CDA1D331D002759E938A0F5CD3FFDC5D53B3E349", sdk.MustNewDecFromStr("0.2")), + sdk.NewDecCoinFromDec("untrn", sdk.MustNewDecFromStr("0.56")), } suite.Require().Equal(requiredGlobalFees, globalMinGasPrices) From df079eb25bd3bd944fc895856ca4c97f07a487fa Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Fri, 24 Nov 2023 16:32:01 +0200 Subject: [PATCH 299/307] remove unused var --- app/app.go | 1 - app/proposals_allowlisting_test.go | 1 - cmd/neutrond/root.go | 8 ++++---- tests/e2e/interchain_security_test.go | 2 +- testutil/contractmanager/network/network.go | 3 ++- testutil/cron/network/network.go | 3 ++- testutil/interchainqueries/network/network.go | 3 ++- testutil/interchaintxs/network/network.go | 3 ++- testutil/test_helpers.go | 9 ++++----- 9 files changed, 17 insertions(+), 16 deletions(-) diff --git a/app/app.go b/app/app.go index 744b681c4..5eb6e0dcd 100644 --- a/app/app.go +++ b/app/app.go @@ -327,7 +327,6 @@ func (app *App) GetTestEvidenceKeeper() integration.TestEvidenceKeeper { // New returns a reference to an initialized blockchain app func New( logger log.Logger, - _ string, db dbm.DB, traceStore io.Writer, loadLatest bool, diff --git a/app/proposals_allowlisting_test.go b/app/proposals_allowlisting_test.go index a8368f60b..09810f35a 100644 --- a/app/proposals_allowlisting_test.go +++ b/app/proposals_allowlisting_test.go @@ -30,7 +30,6 @@ func SetupTestingAppConsumer() (ibctesting.TestingApp, map[string]json.RawMessag encoding := app.MakeEncodingConfig() testApp := app.New( log.NewNopLogger(), - "test-1", db, nil, true, diff --git a/cmd/neutrond/root.go b/cmd/neutrond/root.go index 7674d3652..3f666acc0 100644 --- a/cmd/neutrond/root.go +++ b/cmd/neutrond/root.go @@ -36,11 +36,12 @@ import ( "github.com/cosmos/cosmos-sdk/x/genutil" genutilcli "github.com/cosmos/cosmos-sdk/x/genutil/client/cli" genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types" - "github.com/neutron-org/neutron/app" - "github.com/neutron-org/neutron/app/params" "github.com/prometheus/client_golang/prometheus" "github.com/spf13/cast" "github.com/spf13/cobra" + + "github.com/neutron-org/neutron/app" + "github.com/neutron-org/neutron/app/params" ) // NewRootCmd creates a new root command for neutrond. It is called once in the @@ -241,7 +242,7 @@ func (ac appCreator) newApp( chainID = appGenesis.ChainID } - return app.New(logger, chainID, db, traceStore, true, skipUpgradeHeights, + return app.New(logger, db, traceStore, true, skipUpgradeHeights, cast.ToString(appOpts.Get(flags.FlagHome)), cast.ToUint(appOpts.Get(server.FlagInvCheckPeriod)), ac.encCfg, @@ -290,7 +291,6 @@ func (ac appCreator) appExport( var emptyWasmOpts []wasmkeeper.Option interchainapp = app.New( logger, - chainID, db, traceStore, loadLatest, diff --git a/tests/e2e/interchain_security_test.go b/tests/e2e/interchain_security_test.go index 2ba3e4f8b..35c80108f 100644 --- a/tests/e2e/interchain_security_test.go +++ b/tests/e2e/interchain_security_test.go @@ -18,7 +18,7 @@ func TestCCVTestSuite(t *testing.T) { // Pass in concrete app types that implement the interfaces defined in /testutil/e2e/interfaces.go ccvSuite := e2e.NewCCVTestSuite[*appProvider.App, *appConsumer.App]( // Pass in ibctesting.AppIniters for provider and consumer. - icssimapp.ProviderAppIniter, testutil.SetupTestingApp("test-1"), + icssimapp.ProviderAppIniter, testutil.SetupTestingApp(), // TODO: These three tests just don't work in IS, so skip them for now []string{"TestSendRewardsRetries", "TestRewardsDistribution", "TestEndBlockRD"}) diff --git a/testutil/contractmanager/network/network.go b/testutil/contractmanager/network/network.go index 20e2b8d73..3ce77f8c4 100644 --- a/testutil/contractmanager/network/network.go +++ b/testutil/contractmanager/network/network.go @@ -22,6 +22,7 @@ import ( genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types" staking "github.com/cosmos/cosmos-sdk/x/staking" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" + "github.com/neutron-org/neutron/app/params" "github.com/neutron-org/neutron/app" @@ -73,7 +74,7 @@ func DefaultConfig() network.Config { } return app.New( - val.GetCtx().Logger, chainID, tmdb.NewMemDB(), nil, true, map[int64]bool{}, val.GetCtx().Config.RootDir, 0, + val.GetCtx().Logger, tmdb.NewMemDB(), nil, true, map[int64]bool{}, val.GetCtx().Config.RootDir, 0, encoding, sims.EmptyAppOptions{}, nil, diff --git a/testutil/cron/network/network.go b/testutil/cron/network/network.go index b31c16d1b..924afd076 100644 --- a/testutil/cron/network/network.go +++ b/testutil/cron/network/network.go @@ -12,6 +12,7 @@ import ( genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types" staking "github.com/cosmos/cosmos-sdk/x/staking" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" + "github.com/neutron-org/neutron/testutil/consumer" "github.com/neutron-org/neutron/app/params" @@ -75,7 +76,7 @@ func DefaultConfig() network.Config { } return app.New( - val.GetCtx().Logger, chainID, tmdb.NewMemDB(), nil, true, map[int64]bool{}, val.GetCtx().Config.RootDir, 0, + val.GetCtx().Logger, tmdb.NewMemDB(), nil, true, map[int64]bool{}, val.GetCtx().Config.RootDir, 0, encoding, sims.EmptyAppOptions{}, nil, diff --git a/testutil/interchainqueries/network/network.go b/testutil/interchainqueries/network/network.go index d7fa4006d..895287529 100644 --- a/testutil/interchainqueries/network/network.go +++ b/testutil/interchainqueries/network/network.go @@ -22,6 +22,7 @@ import ( genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types" staking "github.com/cosmos/cosmos-sdk/x/staking" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" + "github.com/neutron-org/neutron/app/params" "github.com/neutron-org/neutron/app" @@ -73,7 +74,7 @@ func DefaultConfig() network.Config { } return app.New( - val.GetCtx().Logger, chainID, tmdb.NewMemDB(), nil, true, map[int64]bool{}, val.GetCtx().Config.RootDir, 0, + val.GetCtx().Logger, tmdb.NewMemDB(), nil, true, map[int64]bool{}, val.GetCtx().Config.RootDir, 0, encoding, sims.EmptyAppOptions{}, nil, diff --git a/testutil/interchaintxs/network/network.go b/testutil/interchaintxs/network/network.go index 945ee62b3..d68004813 100644 --- a/testutil/interchaintxs/network/network.go +++ b/testutil/interchaintxs/network/network.go @@ -22,6 +22,7 @@ import ( genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types" staking "github.com/cosmos/cosmos-sdk/x/staking" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" + "github.com/neutron-org/neutron/app/params" "github.com/neutron-org/neutron/testutil/consumer" @@ -74,7 +75,7 @@ func DefaultConfig() network.Config { } return app.New( - val.GetCtx().Logger, chainID, tmdb.NewMemDB(), nil, true, map[int64]bool{}, val.GetCtx().Config.RootDir, 0, + val.GetCtx().Logger, tmdb.NewMemDB(), nil, true, map[int64]bool{}, val.GetCtx().Config.RootDir, 0, encoding, sims.EmptyAppOptions{}, nil, diff --git a/testutil/test_helpers.go b/testutil/test_helpers.go index 54ad72935..f215b95ef 100644 --- a/testutil/test_helpers.go +++ b/testutil/test_helpers.go @@ -57,7 +57,7 @@ var ( ) func init() { - ibctesting.DefaultTestingAppInit = SetupTestingApp("test-1") + ibctesting.DefaultTestingAppInit = SetupTestingApp() app.GetDefaultConfig() } @@ -263,11 +263,11 @@ func NewProviderConsumerCoordinator(t *testing.T) *ibctesting.Coordinator { chainID = ibctesting.GetChainID(2) coordinator.Chains[chainID] = NewTestChainWithValSet(t, coordinator, - SetupTestingApp(chainID), chainID, providerChain.Vals, providerChain.Signers) + SetupTestingApp(), chainID, providerChain.Vals, providerChain.Signers) chainID = ibctesting.GetChainID(3) coordinator.Chains[chainID] = NewTestChainWithValSet(t, coordinator, - SetupTestingApp(chainID), chainID, providerChain.Vals, providerChain.Signers) + SetupTestingApp(), chainID, providerChain.Vals, providerChain.Signers) return coordinator } @@ -374,13 +374,12 @@ func RegisterInterchainAccount(endpoint *ibctesting.Endpoint, owner string) erro } // SetupTestingApp initializes the IBC-go testing application -func SetupTestingApp(chainID string) func() (ibctesting.TestingApp, map[string]json.RawMessage) { +func SetupTestingApp() func() (ibctesting.TestingApp, map[string]json.RawMessage) { return func() (ibctesting.TestingApp, map[string]json.RawMessage) { encoding := app.MakeEncodingConfig() db := dbm.NewMemDB() testApp := app.New( log.NewNopLogger(), - chainID, db, nil, true, From 2d30ee660cc28911297e6661dd6777d064f5f3e7 Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Fri, 24 Nov 2023 16:33:45 +0200 Subject: [PATCH 300/307] format --- cmd/neutrond/root.go | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/cmd/neutrond/root.go b/cmd/neutrond/root.go index 3f666acc0..1d78f7a8a 100644 --- a/cmd/neutrond/root.go +++ b/cmd/neutrond/root.go @@ -277,16 +277,6 @@ func (ac appCreator) appExport( return servertypes.ExportedApp{}, errors.New("application home is not set") } - chainID := cast.ToString(appOpts.Get(flags.FlagChainID)) - if chainID == "" { - appGenesis, err := tmtypes.GenesisDocFromFile(filepath.Join(homePath, "config", "genesis.json")) - if err != nil { - panic(err) - } - - chainID = appGenesis.ChainID - } - loadLatest := height == -1 var emptyWasmOpts []wasmkeeper.Option interchainapp = app.New( From 6c7507df4318ecda39633b24924bc6ab892e21a6 Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Fri, 24 Nov 2023 18:35:35 +0200 Subject: [PATCH 301/307] fix go.sum --- go.sum | 2 -- 1 file changed, 2 deletions(-) diff --git a/go.sum b/go.sum index b2550c07b..016833be6 100644 --- a/go.sum +++ b/go.sum @@ -399,8 +399,6 @@ github.com/cosmos/gogoproto v1.4.10 h1:QH/yT8X+c0F4ZDacDv3z+xE3WU1P1Z3wQoLMBRJoK github.com/cosmos/gogoproto v1.4.10/go.mod h1:3aAZzeRWpAwr+SS/LLkICX2/kDFyaYVzckBDzygIxek= github.com/cosmos/iavl v0.20.1 h1:rM1kqeG3/HBT85vsZdoSNsehciqUQPWrR4BYmqE2+zg= github.com/cosmos/iavl v0.20.1/go.mod h1:WO7FyvaZJoH65+HFOsDir7xU9FWk2w9cHXNW1XHcl7A= -github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.1.1 h1:PqIK9vTr6zxCdQmrDZwxwL4KMAqg/GRGsiMEiaMP4wA= -github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.1.1/go.mod h1:UvDmcGIWJPIytq+Q78/ff5NTOsuX/7IrNgEugTW5i0s= github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.1.2-0.20231117212947-db2db9b72a0b h1:3//qzSqcb+SKs5H88D0BfYTLZ9z4Idz4LlZ1kkfdGjw= github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.1.2-0.20231117212947-db2db9b72a0b/go.mod h1:UvDmcGIWJPIytq+Q78/ff5NTOsuX/7IrNgEugTW5i0s= github.com/cosmos/ibc-go/v7 v7.3.1 h1:bil1IjnHdyWDASFYKfwdRiNtFP6WK3osW7QFEAgU4I8= From bc7fa370aa06f50be292d2de82f7f3b98f009b39 Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Fri, 24 Nov 2023 20:07:19 +0200 Subject: [PATCH 302/307] update linter in actions --- .github/workflows/lint.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 13e45fb32..3173af7a2 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -18,14 +18,14 @@ jobs: steps: - uses: actions/setup-go@v4 with: - go-version: '1.19' + go-version: '1.20' cache: false - uses: actions/checkout@v3 - name: golangci-lint uses: golangci/golangci-lint-action@v3 with: # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version - version: 'v1.51.2' + version: 'v1.52.1' # Optional: working directory, useful for monorepos # working-directory: somedir From 70e9fbc3e2376daeaaa07c8530e34225c0ef9af6 Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Fri, 24 Nov 2023 23:20:29 +0200 Subject: [PATCH 303/307] bump pfm --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 016f29dee..13b6f7217 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/cosmos/cosmos-sdk v0.47.6 github.com/cosmos/gaia/v11 v11.0.0-00010101000000-000000000000 github.com/cosmos/gogoproto v1.4.10 - github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.1.2-0.20231117212947-db2db9b72a0b + github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.1.2 github.com/cosmos/ibc-go/v7 v7.3.1 github.com/cosmos/ics23/go v0.10.0 github.com/cosmos/interchain-security/v3 v3.1.0 diff --git a/go.sum b/go.sum index 016833be6..e887edaff 100644 --- a/go.sum +++ b/go.sum @@ -399,8 +399,8 @@ github.com/cosmos/gogoproto v1.4.10 h1:QH/yT8X+c0F4ZDacDv3z+xE3WU1P1Z3wQoLMBRJoK github.com/cosmos/gogoproto v1.4.10/go.mod h1:3aAZzeRWpAwr+SS/LLkICX2/kDFyaYVzckBDzygIxek= github.com/cosmos/iavl v0.20.1 h1:rM1kqeG3/HBT85vsZdoSNsehciqUQPWrR4BYmqE2+zg= github.com/cosmos/iavl v0.20.1/go.mod h1:WO7FyvaZJoH65+HFOsDir7xU9FWk2w9cHXNW1XHcl7A= -github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.1.2-0.20231117212947-db2db9b72a0b h1:3//qzSqcb+SKs5H88D0BfYTLZ9z4Idz4LlZ1kkfdGjw= -github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.1.2-0.20231117212947-db2db9b72a0b/go.mod h1:UvDmcGIWJPIytq+Q78/ff5NTOsuX/7IrNgEugTW5i0s= +github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.1.2 h1:6zjj+yIpMbCTRI2eJ2fXuflElENs3mrUSLH/TSWL8fk= +github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.1.2/go.mod h1:UvDmcGIWJPIytq+Q78/ff5NTOsuX/7IrNgEugTW5i0s= github.com/cosmos/ibc-go/v7 v7.3.1 h1:bil1IjnHdyWDASFYKfwdRiNtFP6WK3osW7QFEAgU4I8= github.com/cosmos/ibc-go/v7 v7.3.1/go.mod h1:wvx4pPBofe5ZdMNV3OFRxSI4auEP5Qfqf8JXLLNV04g= github.com/cosmos/ics23/go v0.10.0 h1:iXqLLgp2Lp+EdpIuwXTYIQU+AiHj9mOC2X9ab++bZDM= From 1151d0dc181e90325c3d7a91d24bc4d5dcaf37d4 Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Fri, 24 Nov 2023 23:20:52 +0200 Subject: [PATCH 304/307] update contracts --- contracts/credits_vault.wasm | Bin 0 -> 196487 bytes contracts/cwd_core.wasm | Bin 469838 -> 460292 bytes contracts/cwd_pre_propose_multiple.wasm | Bin 415074 -> 425490 bytes contracts/cwd_pre_propose_overrule.wasm | Bin 455535 -> 452122 bytes contracts/cwd_pre_propose_single.wasm | Bin 409248 -> 419892 bytes contracts/cwd_proposal_multiple.wasm | Bin 605068 -> 609224 bytes contracts/cwd_proposal_single.wasm | Bin 563822 -> 563948 bytes .../cwd_security_subdao_pre_propose.wasm | Bin 0 -> 407787 bytes contracts/cwd_subdao_core.wasm | Bin 490195 -> 484753 bytes contracts/cwd_subdao_pre_propose_single.wasm | Bin 447380 -> 438712 bytes ...subdao_pre_propose_single_no_timelock.wasm | Bin 0 -> 426278 bytes contracts/cwd_subdao_proposal_single.wasm | Bin 562906 -> 560021 bytes contracts/cwd_subdao_timelock_single.wasm | Bin 405761 -> 458573 bytes contracts/investors_vesting_vault.wasm | Bin 186167 -> 189570 bytes contracts/lockdrop_vault.wasm | Bin 241744 -> 245611 bytes contracts/neutron_distribution.wasm | Bin 185384 -> 189423 bytes contracts/neutron_reserve.wasm | Bin 239440 -> 236337 bytes contracts/neutron_vault.wasm | Bin 204101 -> 208193 bytes contracts/neutron_voting_registry.wasm | Bin 218846 -> 215027 bytes contracts/vesting_lp_vault.wasm | Bin 0 -> 245479 bytes 20 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 contracts/credits_vault.wasm create mode 100644 contracts/cwd_security_subdao_pre_propose.wasm create mode 100644 contracts/cwd_subdao_pre_propose_single_no_timelock.wasm create mode 100644 contracts/vesting_lp_vault.wasm diff --git a/contracts/credits_vault.wasm b/contracts/credits_vault.wasm new file mode 100644 index 0000000000000000000000000000000000000000..57ca3bf852f4c46cabb36fe981d58242ca084b69 GIT binary patch literal 196487 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 z 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 Pb^JE-Tg~t2Wu^ZIfZ9{~ literal 0 HcmV?d00001 diff --git a/contracts/cwd_core.wasm b/contracts/cwd_core.wasm index e679f72a991a64964810699963f85b714a46fe49..435662ea083907bac6b15ac7029683a56d9edcfe 100644 GIT binary patch literal 460292 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

      A#t)DA5o?%xRte7v%8mS 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

    1. UtF3>y3$tSwvSlgi(sJ;PSQtjXo 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�FiXBkSGa*N5QS27w+{7PsL1|I! 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�`y)}(`ap8&+Rz^s7J^KK{mMs=HEncey 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 diff --git a/contracts/cwd_pre_propose_multiple.wasm b/contracts/cwd_pre_propose_multiple.wasm index 2337e0aa6165492b61c6c090c90ec46afa897048..fc5c2e0fe0e97b1f303f7904ffbddf064cd0ab6c 100644 GIT binary patch literal 425490 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 diff --git a/contracts/cwd_pre_propose_overrule.wasm b/contracts/cwd_pre_propose_overrule.wasm index dd92f80c0ae4c62bbcad07fd08b2228bf044d269..9ff2db339c6908db69df982a6f85db2f2b7e27ed 100644 GIT binary patch literal 452122 zcmeFa4YXZXS?|3*_SZRk?~|Q2rRfKB?M;*u?YRwFPeSN>&B{wk8B`7Tc8s^)!5B@U z(e|8B(hzvz9nc&klz1spE)@zFFnlIRD+NJ{paiTKv0{`8Ra=Z&v0gyqwQ9K(d4Krp_xmnLE6udb~-kz*W_ulxj>a{O;@qvR; zRrmGlUU1EUz1LnB)%2^uumAVJ4F~r|v3`!&%NM=)WqZqyU-H6hZ;aAV^v1m}Kj@0K zuf6WN1J}Il+I=@%cP-_uy7l&q0x!Pth8ObY|JxfyD(Swx{-rOv_Qv8_=Ouezxc`TK zWODlH*Su`+fg6766|Rwu<>Lc;Ur0|5T(keBFPPr@ifFxR8ryr_5Bf@wNMf#eHJ**{hty-xkBb7?h8fmqXN>tOQ z^hV>=;8g%XMAc-YepN;(8;y>xqrZ$|U9}d)O?_04YVJQP5&2)#6*n1-u7Dz?B1YI| zsO_k3_et$MJ)(P2yPi_4bN&SyH`PR)Dy!23<&&-^N znuntN?|%KWcAfbQ*ZSw;cI`!bU-aSwuSlZi4L82z;I%g%yg~H(skpxP<$GWFQf@yT zSB)~FUyJK6y5Xk}==HD1odbJsdg%=Z_P*qr8~48S;DHz47=1BrT)S`Ii(jbs?@C6m z+gtqlg=Bs4HBB7&X?^m=xO@nQQSFNl@bK&#Zsf;LUHihlBGi}M@ZuY<*~a71Yp#Kh zuDxdOjn}1d^O|d}-+S%;YhG~eOZKM8$o=3akDDKkulj}fjcI-teEoCjyW;=)2gxVX zHz)6n$A92>{K0thvG^C`op&eiiH|1lO`f&u-N}2B_a*O7K9C$sjwc^Xelht_a%b|6 z_~*Ln8Z^gHoC z$G0Ri$Kg55-SKp5RKK{G-QSLsH{B3;IN0YavSN&dc)qCRKPfjIY zOinYV5653g9!TC7-_P$aCx4#&Me=a+mpuOx|34IeC;8{(ofLnZFAk@-q`wfqJ^i2Q zJJL6&A7_;M=AG$#()XsHP2ZQkKm9;@TY4fL{lYEhePRLi>%SeVL``y$F3Q~AZ) zqo|q1d9*#MSh1|`3f4oxy44zG^{Kqa$JA0UYDs;O>E~Kw^(^hIcg>ZhvV^CfOV6iZ zN+m_}m8?FU$3Nx@=E>ZG`FkFXp6MG*e7Pt&loqMDzIrt-({J`r_}rQrN1I8VWOns=tU zjjWP4rg|}>?rrFffw#t#?w{0c^JzBSOEyLBCf*eFfvLTF7eH$7oSC`pQ@{GQH4@JKh=b?niIBtJk@uES~dlT2GH0?yf5zXPsNR z9mu@ziIu&DkD_h|I?g&53-jI*Zd;B5d@cYP+loNN-L_b3VC-#u(BbnwAQ})Ls`Wd6^p@$*yiU_d9|`OdGu<*{0KJ@@{|MEvwH4`O%wAh(ITz3=o1-tXuA zm$>fZ$~RYWnfZ!d>{jpcEmM=p^?J2Ex;^H~i`%&F+_E)2qU)={ATXKHJL-M86?!a! zb0?EM_5*Pw=1=n-)BJ(udzH@5Q1y7S11{(CtZq}6E4qkJ)z7z1P{i=dy?;;n=E=lw{2 z(M=-8QTJUkr=H@wb;Wnkhi@&f-;~!59%vSSXntnq-sti+RVGgf0?#szO;! zzjpUbg>nnQEYL>|+x{PvF+3aj~%cq+e7KaPLYqcD$}uA8?B$j#r0e&{9nMK9~du$AnpB&$p&8%39s z$p(Ho*&z+YGk9`?s8N_tP|lr?#94yf1%A0i;zp3J&Z*Tbib*Q7 znWSP&QuS=maFBkqnp6nlzz1g{XFVFQE41xBhKf9fs#@1wucnK63^)M*+g{griAfFj zRAmYC4C8+muvILp%H-t|3L=8+e zI8UbXKjk-SNV3Zcm3^|>%#F|sxe>E!3vPtHMn0om(ceh@`(WtcPKd_0m;%+^rIU$S zA;>ms^kP>e&Bv$mZ@m`rgDoRy1kQz-C=N$k&Gy-=Z{f2#Uznidy1|&je<__#AMDE` z`cgb^>X>WR_ocX2a+|-G>9G^aDYZG#g3{TXT-vK|P4~dN^{q)uZjD$_U1AUu(Z!w5 z(i~WB!{qKQrL8`v9mMVY_G68xCmoNTF&VA5I{|}8iz=0JShOD!Gu97iE6pERN)g#q zDxw0JnlM=Tp=y9F4R9lJH0UC{QKNg4{V7x~+5bnx#T?b+2>m;jFtUYEx3$hWOAsid zvjxiNFoAN0SXcqt3c|Z$G}HN=1d#&2b;LRqC>VC>nlRbWO-*4Xvao92G;Q>%qC^uk zsmTk`Wf#up7b3!#Q;db=aDfSH2fpfTv}W1_DyTon==_ZY+ImpweB%m}$gY+7Sk(xT2Ov&+hz2B3_Ue&YufQmaGtp zNH&O0qd9cS1K9zRwzS4)fY?8C-};*PMpescYJRy?mi3@4s{q@}Z!E+{x276(*K6ov zV69rj$6gch;g=+DO@QSY`XvAsKq}&+Vp&b{TLjaw+PVmS`xs$w5g%R^wSXuqVi6x+ zSj2}%^rk3l85G*3%D;-eZRs%I4pqS{^?qKJnesZS;V4!1?BQEm%=`s~Mg zR$qc@tUI`VrC&(=`-UvohpiR|?8s~pF)|<`JYau~NdPAzc1#rkEBu-J5E1U5_|OD} z6il+gm>pqnLSuW>;@0#KB>LyCJ`v?r*svo8<7%q0bD`B>YSw>=-#g(RibBNa(s(U2 zo)n#)MCZxNG0l;RU%kqseIy5pTB$PwW)qC7zKQ5U8Qqj?v~kV4)xu)oX5+poOc=?uZoFcPWnfga zw9-+f!$;MN!?-}n@NsDfEg}(F?b(HeWVrHHlH57DDHTPNoYXaA&Ve602=GLkjq_B|4Oy|3Ax7>uzxK}mS+}sPK3J7`Jd&S=uB%?6 zW+TjbN>q;cP%m*2-B43X?{H3huu>%nX0!cpH~hrFGeig?$#lbF!yib^OjtT znl9#Aw9G@$L)rTL^3D`b%D_-C_6DzcY_mW+*T1TF)-mSBYX9v5V*O*)h}@ABNwLh9 z++?g9d@Fy;n~=seMbI_=wsm+p{kF+itE^iiWOlS}A+x~&tmQ8(TTO}WOgu2wIbe*n zTg}mtMx6|oG>M}znT9je(i&Q; zTn=r4bj8Ojtsf}6`Uy3-uIMU6w3>=HQ}NOU`q!_eUFNQw&gN>KgYy`GSo>)V=$>jA z7BXG&YgN7(DE7|Un%*sLW!(0>mYpT5e!Lvl=QXa@T8-=bmp?A&3Hcyl7?-j1k%fje zGh|q5y^luzKtm&@(nlj!?;Q)(d)or_b`{Jt&xx7LB;O<*YWWE>h-;aFMw`7cJ+32} z##|B${=E-L>#jE{hu`E*JsU-6+v`zH^)V^w!@oR>ve6*4$6QE5#au`lHzE{7#@NRp zB&|G)zFH_S?S!^oNN8JgeWePaZ6B2FTS*H)>xE((vrGCc7JF?m4Kot5dSM0w0xU(F zrLHJosuqH*!C85m*_MdSTI6b-Y47M&TqJD9;&Z;!5Y z*4I^&$rUI=eN|DIH^1jFM8TYcs%bc;g6PyuGla_z-yp_I!(0Vd7w7ihVleyUf|knjNU*Duq~MriM?gCU+~7`6>yxJ(NSLUFOVT zGt6BXD`B5$_P~OhOkOXg%Kg4d^_|%aYqqZwv{ClqGWB8H6(G>>eJN*OmtVE?)ke~G zki_=1X_7dP6(h!AbEBKF`E=7}yV{!&C&w2ORY!-2s_zRTu$4b3@wZ{EB>PjBEZKdG zYaWed68I5K8=D>;qOeX&AJ0-)YQ0agpV83Th+qSA5XwP$>}q%U`mu%DI5VV;UTCA0 ze@FE<*9vstcZtfr0Nvn>nS}>u>IS-d78=&wLx!c+`#|?sia=_jp)u9@erGsYy(br{ z_r&7$9(f)0t`Ay~t9hvwPHsOrYj@1dMV`9$To5Geg=qFSOChPpv8F&RsI-9#p$7Us0yPEYR(0 zpToEwSZG|QhK%b;<+vVJ{pS>db65N9)woHZ$)*EFslhmwGnUsr^2xdzTs+qmlbVBhHW+XyoKVjhtA#k>hR(Dk0|E zIk!&%Jg`u`rxvgGPIX?2g}{r05cb<_2tBe;Bc~T{r0;yWCY5)q$&Re)d^wxfwFL>fTWosT79^MvUQACn`=+NYKOdJTMDAEx zU>}DC3A~ao7iy_!T|wIg;OhBU2*8!4dX4;70np|s+8W8bAx?6l{H@x?X4Pi?on91k z)@5zwoHeh#e}^$#m9sVK(u-u|TXGTZkWVghjuD>T_UPhZJ&#Z2UwjRSLl+Sq0(+L? z+&RmN%V%>&HlID@KSQLuFD-f6e+iG78_D0xg!JGO44C7W%Fy1OnM>f~?!v_4P;cae8b7-Z`<9p)kaj<(65>(4zgI!!q+1bqhudw_wz}1va@? z5icpMpzxMSm?I0x=9wX~d6tAZDgMDq+nnwQVKb}uj)m&IZSi{lNcAd8g@fhz5?5w6 zUmjnmk)w+?Lha-&cg}X;*wrTeCBJ8(D(@ar<@z9TTls1A`P@QR0f*H@^jI{oL?i#7 z)GjitFD$jI-DWVy7m`~?hsdqINa}ajbTCR-6POo|!-}SRj<~XSjPEEEW)BD8QLX1!Z?Ym zSzLpT$U;q=SiFfh_$CJQpjH??uu#RPhE$AX51jgTRXVa(oJ#O|iJV%%Ykp3(EIQ3S z4vBegnaihYyU#a#uLgDwh%lDrY79Gw5Q5wDMpdzH3X$(;0YeL>a-E_T#*LV|O;j%V zj@3ft4xQDq1VPPS;0bZ@GdFXmG&Cz|U-YTm{#h+wP&o{$txFDr)L2H|f+gzKG1T#d zLM_0rAW}Q*4ni9RBOoA{WX|3u)J_)lcrd3+GJ8G z-#FcEhWVuBHG=SDM15_rM7pSWy4O_J6EixX(3t6`RksAJU4XICx9w9k@o z%QEKSvfcCZ0F0xwg2IoPU+igCYF;kevuF$Vh>ux5(Mh_#%>IoF@RHq z(!7Yx<|3B)VitxiH2->H$owlFn4$;+Nl1F;0@=(m%z4YKfPcGj$Xi1D{w-1VIb{Kq zf6EHjId9J{-Vz0x^Oi`6FU$54=IdLWGh|%B3n)4?aj_JKJP)tQ&iM^rW$;v4SCI3&rAms$0>gvnz0dj>slft*orcY&e8D<6vb!t{odM;LW1&?Zt(n|- z`pQu^Bh;PugfsqWlT<}w{=@wAOn16p9atD?Hq-U7vpz1Afdvxym_*S&7VYC_zUDQ1 z(F9#!CjAPy*AgTbqJ|$5hCKIbs8B;6_da!y8h+5F(yyF*F;Z5_si$uR-Pse4?%N2- z0+FDyZdZiX3FO-_^n>;vCg)3OtS<{(50&#Pmc~yl8OkZ}f}swxoDM|{LlyYcSSF&| z>m_%02l4p>t*7bpmE#kMwNiY3QTROT3CHKs*mq%k4)E?!e72e1E2RRgYvF3HE-jRO zXKcaGO1T&X7sTjrtZ(VV`dlu)Xb|h0Ti?GrtUqPtSpQXFeZ%)K)&~%|2p5y?_e5gd z(t#I}-Ipwg^(PNveY|D5VCB3{D(p&m{e8mv_p*&%BJxzfo*vHY?ETbdcKa1JvsvEz z@|I#+8uWgZjcjxlX0J{tSX%W$S$YZWye!(DlJgv29bwYt)-%82jjUo?4ZfuQ| zg9^^>nmG1r;=(CUxJ2T@s=cjEP0NozEU#>2jz$RNK}u@h#|147wI)|=G!T(pSbY#e zDvXA?lycqxCfZM3t@@SoZuv-O*a%d}c_TVpvr2F(0BLtZ0_(BSXrmuX93M za_U@Y%T{>YVWHW@Lt^F~xN^o+D`*euCp&BT?P=9RzJk!50el7RX%o?vw8u2eips5D zAzYM+x{`icHt7oBV!3!Lz=P%2t$)y;u`azh;@- zG$(n-VV(&r+T2peVB%Gg!Q=`|=NmNnt{3Mp`OZU|iu9#=&HPJ0S4?v@^Y&DJy8kzm z@qbeOwo1w=ExO|;I`u+1#j|P;Ydh?~_swaqg)-QAL@k z2WcIzwN(vsDScdcy4oHYf8gO5#nyP4}*vy^0z_Gfl@j$Wdwv}t8$Iy#lN z#BvtEbmdTaA@#w|2vBc4_O(NW4#jDaBa`MI>#MszK%CrJbDdtk-c+?GtXil4lq~|J ztf|tvezc}6#(TVVeW#_|9<@?*3EYQLgSPygR_YF4>S41aoS@`8N)Tk|lG@gHpG@A1kneE?Vr_Fhb4d&ls zRn2(|bo^U}H0Lcu;@^VyId4%W{w>sriW+hbpDYE=2PqP@&W-B8T(e>IE zWrSYqB#UR*U2@%Ia%oF_@gE$Hi{~VBx;8jVgkvPW@J5s9>aB!}Up#_vDVk*svu_sy zv<(QUb#ro^NM%R1j)HCv_I2_IBWqPF5hKDW3?tx^jtg)T(cu^|LEGBs zo<1Zw%QLzOJF{pb$m8tn6q68*N~-A(Td~;&aiy%K9EZ%f-jiaeE{X*mSd}g60ldx+ zBcleuYJzt}?*q)l)D91p70tOcdgrpDOC$1-DM15+iKxFHEq`TSTpQX zszuG|rbye(Xb;c^>Vu0}7qQt>dZ@f=et7|^gB6s2ACgOUOaqSBi-y?(+X9m=olU}H zhcdL5S+A1Id<|L^tWD!;$7nkzi+5*om2IP!#GJDT7hBtpiLTouCA+KyYZD8F1BE7& zZL)QgfdtoWk1lgXv~h9%+S@3lB~-JyLEUaEFH{-D`Vi9r~II2^_b|_!2mVwN@TLzhWAEwG;DCP z!%XiLbb_{_iiY)N>983RU3EQJ-e~$87tRa;Z`ZiAH25+f;a{to4X2&&bM$An>dJas zqTpTXs!3=O$7)fadY6s@XxB;W{(U7@1FA4AL&66F7Yxn1TeD`0&4ozXv%MwOs%ExZ z4~Q1at_;y;WoCWsY4Q^sd8QmZhXeMk^dC7=3J4QPv!#alykb4Djx1e)Ks0j$6=R3j z_)}EO#d5mD`q`537|;5pzxpZ3Z(E3A@Y^=M51qBvlK*v*{FMR8Z=S0-Wd(yRrN7mp zLuZuuY#W3co=hg*@*WzMOk9@8FLnp3c$P99>b$GrBHu!oE0DG=i%=|&8f8v-jrJxD zFKnQ+YI&o+EGlmngpEnO<&7qYd;>%f`R~-Yv^99gBf#8TkAPimIsYqbr3Br3)I{B{ zP+B$URPVnU=)#~(P=C-UUdzKWx1YjlB>IiIri(j3ndHk6Dk` z3KOb#QA`x{HOSz$+?go7;q$!(dF`D`vgZ*03l!f(=3RTYTKgB9Ta6{I zlTlsJ-rQ;?8k}2QvA9Z{zw_PjRKH)Xtu6KxcGc3WwIy4j)-S8pir7fC;p{Rm#IE^r zm$@rWO}&hJg?F^qZ~n(BLlgv=7rMZ88*u}+&$;P4^P)k zpgguCo7dnNwJi!p{&Ow3q}nZiErOBn7<5Uc;#cd6+FI3~PDu7H+P5VRO@yj;#S0g; zBtopkg>x+I7<^AA9gDb_kCiAg<|a~|m1cpg*?O|{i2rG@KN#?f_9p~o`upSBl75-1 zf32~{5YR;!)5S^XX5Z1Q7RKC9^A^T5mA?W9nl>z4X*z#p28sn<9_jDyyiwOZzPr9v zj1LJVPQ{c^T6#o02&Jl&Oe#j21*wH1N;c9JKuRq!YccEy*~LOawyS*e-ZebN&`&X$ zEmNK*1~fYsQMXt*2`YZ3$e$)=uXW^|psr~9zs1uG57+vR;;k{YXbPl4e99{j={Xm| z(;em!7c-B@d%+;I*I4fS!XPYm&*dFvL;FM(Hnb7 zKDuu@-*RAkG?KHeEUDpXKKh(?bUvT(Zoj?aqz)ecMf79td73{Q-5B20Stm-uT-}$^ zZSk(gj>IhK|6)|Urk&Kd%(8 z^`m&7!a~w+sRM(vrJ$-Y6fL$FSD|8`Ougfwo~9cXNAjo^n27`CHUp zUkw|8SLq|2!|p6~NxbV#*^Vdsx}vHxHd6_!7#1xRPIuT~;`__>0`tp@3t7@I(15sL zp47Z4(|$}Mr@1!54wIF#AAB2PIoSx&O*#R~tc86#+Der^K_cc4m~1Lwi-`F$zt>X4 zFk8IaEEn@4{T8SSHuIvZlj&`HX;#C}j|X7{Fkt@l0qR-4fNZqBj($9*N+>Wy)z6s&nu8~rAtXVT@(#G znrdVCJ{xSGPK>;oavaror7&vKKfb*s6;crluq(K7#*awU$Pj10AVY;Q^iT)YaK(M~ zDRttLKAPmGquXHxY!kn^1*Y>xVAGMIZ2A?ju-R>AZW`oI2T5sUHEe4BGvVEhbBQUH z0Ns`B_#LkxnFSlk9Q~Npk5W)S%J0>cin`Lt`sW;VG-z%|7Zvl4F5~1s4k7oO zMq>A|Q~uM?xLVn@(CO~;9q^0+pvZ;Wj=A}&I635Y{n=K1#`E zU|1}^K8_H5+P_N8V!hCJNhF?ZVN*nWLoJfp^ox&`cxAT5yW=?ZLtVVF zo{e&#xmH)a34iHGK{SFOlxP~KqtkU0W-Wk~-_KS6);qSYOyL7M8e$%NpB257*z;Yq zBhAmH_p<=d0RYXv9!YA4Qkg{x41Z6WMGJ19eCC1I{=G#gC8>!}l2Sktyjcm$^aLPA zsV|v8S>(@(kT^7&6b%w;9hbr@g0bufU_~Ug^1qgT6_$o1ZCM?lCt^=GDjJtP#la5X z&S@!&{I1BBGS}P$bAOQ2(zjd$MAGoO9t^vMu8;Ubwq zJt?TVq~4=5o_Z~=2Nm0FtcwAXE9(sj=zTFVQu85U21zy~K(=mYBB)R9@Pcz`FWAr8VO(chDCkOfa<_=~T;=|lhcp|^i@ zjZS31l_oYxCr(YAGN&20-U2D6Am*fY9@*ryTO2g(N|3WL~vsL(`4Aq6Bfc5KyU z1Tf^icw4n*_D=H~#Z(YxjYOD5@={pZNAh4CQlgDhgdJOPV6HhaZ+s$qt++Sc2wRi$ zjBz>th)G{}rU(z2r;=}k{T>R++}6iod7w=DzFH_SotuEy3ki5@t}NAybH(-h1^n0f z?FGCQ@=MoT^Im`Jg(7*gY75H&?X{D67G-*xU`98wUk5hnHg)JX>7K_q2oa;Iv+5o_ zH;G-uNT!i9?6ysHKJOzWE>5!azc}9_=3c6_@yfBRva{{Z8Xq`moU}f10e`S)omAFj zc(76vbJzH#r5$d;2I=2y+hGT=@fZ2+A}WcUnCm}ML`9WE>nEe<*|!3zO4J^qJz8P892cr+_(&TKqHQhtKsX`R2#VY&%xcWaD`oD`EqgFHk zN*UZWjsn@Y5Y=Y$;DBtlom*Ai1O2{Tbr*2o#fGJ;s+(;E%6{Lex(k@B6sJ^ZAW_vq z))GSETYJRu7u zkTI=fx)$WDvo%-N4ErRM;QQwR)T|bKs(MlI6>`7=^J@pba$HLQpTY?%10PFdOYq(L z!L^VE3Q{Z%H=m0)pmpPA4@0vFW&aJ{K>_Mwne6@)S$GcsfuCj=}I37~8{N2zSABESohb+t~1} zi}(Fa5iY>HKxAkNAi;TKPQkTh(L zon@+elNN3m^|sX^n;P(DAip(yCODPzRmO5jlMUv5rX+!!=>z#zNgn-pkFZXhzu{A# z)ifd20shrz;$C%E8<>*%%G}B4(k?-51!f3Hx~R93Ips1JQSX$1`)?-9#o<+H9Es*E z7`NZIq3o!;lV4zWno!eFM)(DO=me4yJk5?&c~F3RbP2(PEmt>v+Li;bGg zp{%X!TGEJ~DA}dP%kaj$vP;ahJcv=iXkY+vU;jlIwFn07YGWC#hQ8ROyhO@BsP1gF z3dMq*i_+K6e~7jkrW~CnvCu;ia!^ckdC+PN#6jPw>esD$C`*ciE;5wWhD6_dOpppg zS#?O19a&3^-zhNJ$+*sNTV+Vp!sJ0(eOz^GYZlSMicKv#YfPZ37bU79rZ5=CT6Ju( z92e$EAI-Ww1UA_KUCeiRG#dstFg@_O0l4krP_$KX_yAk{p6Wh#t#G2M|J86(j%y*D zi~_us;e?%pOFsFU;MQ3yxT)%YHMo`IS_p26&8`e?15+;lD7Y2cYNhTLeK8rZBx(Fa z$$)ZP3&CyW@z{asq?tQ`TOspT3O8*ewK$>qO)BN44%5W)xt2!>&ix5$;E0A&kbp8> zRwd5Li3_H0*EVixRi7LZB(YhHVJ|FH?_ZRTn?<0FV9jNi^S(bmT9#TMI6AE9#bc%Y zQAX`AGu$IxAY5ug==X8U&RVR=-mjgjtLmPhXy~VZ9vbX92z<|Yw=Np`{*mC_9$jiQ zkVQmztew6*hl=x9(wlo;L>YI7CDZ65-4%ja@-baa&2?J8sXtHTZ z@ESr57TkSgNr2iD&^{1-8x-2a^BLs|A|$5V=FYen{ja3D{?Ocj=v z%#-dqS7Az@hx|LlNNUQ=>{arM={GY--%834=gmyl2^G#irh-$9ve8$${ zIX1$G8`T30L7i8Z|44n~`hay^b6T$QTHX^-D98gEXm`ksPFrSDoa!roDh#>ehpaCq zqTi2Q`7u|(AU?oG%J<$5CNrTIA;5Zlkw9>cAJu>c8% zTb&-OM`@a*X$-H_a;@mgtDSpOOEI-=5o`I|wb@it59uI@lKPUhT08&ZtDk)Dv0r-N zBacS^g;Znu0EqI`GAZ3k05vqHk@{dGs;xfQgdklX(f}lor%i^c z-UoVZA#<#1b7ukk-8K}OwlKv;0YuYWZ_$lAbf|Nw2UHb6nYngfB9pnR2+v7(O8~`S z+H}*}D(vAz;rz`Y0xbPjV(EhU?fSVnJ;}}_OrPerxwrSaw^?#Y^qa{uqc?#z*Y0F; zYvK$!htOYxzkH8s4s}WXxa!DVzci6a(aqqPc7bAFR;YU>NOwyy=2Juw@F(Gg;r%&d#VZm$-2qzz&*RYIElJrCQ_tdCZgx{Nfe%V;+OF};$_K|qIKqLRreJ= zCX`u_-9^|>L`*%KfMNj&bduU+_XKJEwj}>1n&HLHsN3cLURv}q^wq9N2>pYIB_*m( zN>sg+7}G?s&ZZO8_v1*(~2o4R^#m9rxsM`2RsLdb!gO7ix z_H2_HwuQ!+G4-j}{?6CF`IV17?4^d*L?bnnBhV)`2Ail1HsMzO3^X9*R)$pXWd;XS zNM=;L%&?>9Z@#J7V}ZaJnTi(X(K%oQKzlkDMA_M{g+BSWIejGQ8jc3L zxmD=XtDSMTr}{#dO}jpvG{rh|P~^Hh;%K7F4(ARup=Z8dXGzb*jAq=iFg(jK_Y={0 z!NzCtNbHigyLKxYlTw(7HUsbp_Rg(F5sMI!3QwOF>EU3K|?J3&f z+*qFtwWjad`Q7+6-HTWql8_(7^Aq-+>djo+*+mplP+=nKBI~w12l)9%)%+RHEq{4& zLTb@PJENVWo!>xrXnD1)LG@kn139x@78Ce}U)j4T>;5;lzrO8);Lz#0%P9kT(Bk{RRCDPG|Hm46H-7X_{TJ}>EH}lAJCCWl- zS>ygKvf>XOkVKRU7i~;LSW{<-+&EAL@lh!2-1GXRb6NtL9j;79j5_XEfCSB`%^h!S z^MpnzRDecA7r#N~k}4-AV!>~X@F$lkD3yI zQ)_y$VH+m3;k5N(%nJ{)%nknOc3?w4(|qI0wgWo5ZM^K6z*0O5%noQEf*O5YtSyb= z1O_ah<}#w5TpCbkxs@1W&Tuk|Yb@{3W<-HB_DJO8bZBXZNurwuQzPN}x2yDrO)bq84@Tw^LA2i$FxKd-s8b~Xn2puHny;L-s`~Uf=AcsidMlryIlIq)J-ORRC*umM>S zPs{qo1XSk8&cPxmW>1{-V~M^)z3?4ef0_%aO_R1JN9$(WmvDA0rZ7^Vjq5!+okP1` zmR`G?`eowK@ePQ3DYQyt3awfww4VS;@^{fBhHmK*lUr5OU#G2&6Gbdyj}afzU?RE} z|7QyuE#b^=M=jcd;g^|{DblUp#oFWEMaRJZMLV-2(pV5=<7FtEO7{Xuau(!K)U`(1 zDf>`0Luqj;n>Cnnf@5?P4Z30-~8wXr>V*sdnz|H|D;$p58;x}#fFD5939sA!1^V|kky zF#gZ-SWTj5?)ElbRQVE^puTyTrRIiO@L7~R=relBMH4~js=kwbg8ZaOLm5>Q(Qo%j zRzW(5@II+}Z_F8UNq&!$swbROMT)KmzYJ+2x~G(`7VO~BCnbqH0JqynQ7hIbMUPCG z&W;`#@Fh=05zdZD^8|$A)wy@^`9X@^O)mltKVss3BD&j+2l$5SaSAa^Op^4m?i-R-lJQD>tjV21#tGhg}c#*)VhS*>x z5+p;NNNDZ?31;^-o!w_Psx|nC2Rov|I&#|dA0)%C*@n3(A{ra$ZqV(GtOFsr`m3PQ zj>~lMtqmqoOx$$bt;CJ(Xb|KKaC*wl@gv8u@}GiyI)-)slw(-YjjrV)1oO}bb0aTN zEwo51QP!62(ll!F-UZdv%d$0Wb)s_$xk-xNnq*Is|7y;I!4*69=Y`w1(zDWzrRR#1 z%dNaaSB&1fO$E)aPD%c5{-6vmY| zG7*tTged^rMS1YMJV&+08_jf#Lj~s92)nnbIeGzMnD=r-S0M2QyBciX$l4YJMgHMC zFikg76?o}9gJ+^Lt+Tb=n84+Qj>nk5(JGu5xZRuB@!Ix|(z2J9mdk1}P0HpZtfxVE zp^GLH_65$5{PGFnz-(}!2}!o);bxpY0XEuQgFB%?droyes_i9gbLaolPDT#JH#28+ z%I|!n^A55Y$Hd9&`TlBW5(PUe=9K8yGmz(h5>1aiwG!9jh5oC?HH&uirpKB|6#lE4 zFN++GiDalg8Qp+{J3L;@MCNoZ=g&jYXfMn;09GM&` zEYc z`j*MQTwSf<`qr7{3kG^3m;^({V1iMgnL)*Z08JNL%qmnpygHj#vNtt4uQW5wT$miY zB>FxTdYUoSh}h?17vdb3F)|Tt!jQ4TU_T5+&qv&A=Y65=WPKT!(J<9)MEGP2^vS5j zr7?-%U{%@nh#0WjJ6^kiauA~lCv{B(@6e|>r=7BENd46ksWNCB)`Tm*=7ce~Ue31a zyw5Oe1Z2B8YN|zyR3LPV0UqvD#GbiRf=r%#2oE}hYUeA% zcYy%}VOjLlTFhXmW@a!fy5YilvQiai0k|G@szLaY4aqyvmc0j=!9=wJzIi|weEx0D zFul}Gd2T_gfFsQfD()n|t|r+?g=|!#@#OIV;{EEQvm31{H#sE=a}@|$`NdMOwn2?B zhg82o!@;s0sus6c3Tneeh)boI6I*b*QVk6wQFD*$Jqsge8 zJWQyX?ty+Xr+Z?fYpEICjhn(D?!@^IJ^61ugR`X>ID{z%;&~;Lpj{GT~6X zGT|s-o0fT9=w7R3Ge3T>e=jE|0B6BxE_7(jgM~o}ED72zVaTC3HhkN<&46Re9~F3I zXuS&2xforCp9pM z6e2`PXuRBM6n5v~;6#9EK7*VK(_mH+Ggib7^B60}1jc$v)2(Hed7`z<0Ms_&e05T6 z!uc<=aQow{Sh$TN8i6=1+|D;B#-}qa_@Vd#4{dfAIq7yeUHaPXk)-Z7^YnY1OGWn} zf7X4I`Xs9u4!~mKRA{4}L(FlamW6(8i!O^g6UKih1%(@jTTYt?ebp~p} znRzn9{F$S~+)13mTVh{MJjrLOhO^P&GV)lMpXMisBUCz^uY3t1HGcn2TzEOAI8Lx^ zKTj3z;Yf_wTpp_Y~2Z``zDJ|0bFqt5ZryaCFJW;3#2UO|Cx^Ca>9AdE4Y z95hhoii@TBgI2R#>D1zN90w4G@Cok9=H!0%#XU|RHYfMRC`xM;70ggi%6}Jq7$~wD ztteW{7H%Gihyc-&H$U1&SXdoB^uHOQ1`CM53|)7SlJgw|T9uRfc4mvcGE2fde6-dF@s$P{K8?ZaQ(?ZGJ69{0_k~JsLB8VlD7@%Tx!0w|PuP=yx=n?w3XWn!M3;%9guE9 z@JPlJ&52ZZ7%gJQ4K~#Zc4`L_hC@XFj2aJi!Ac_YQ+aDdP%Y{$GD&G7eYqF`pc=W0ZcV2Y~f19RuT53g# zF>8?np7F(nT#lG+f~PNk_fm=o&yz`JcOC8^Ri3rDQ)EW6$^`*zTjbw7J83(Kd7{W~ z7czYmz$Zgc`ylx>U{yOi3K+{~S(H4tQ+;jkbkgSO&?RIF7BW*W*f$D#gq)O2Vj0<)qZNs=b$bvP9G|SHL%U+#<#&A}EVADe^q8;J9P+EFeph151@wFols@n}JR`k96@h1AWi zkc|e+2>n1Gm$!8Y(7I!gb1P3VWnESlV3as^XK*PoE4OKT$=V-DA~*BpmLilA8OQ?R z)TNcG0^e6k8_X31cU;3~mWdf^{TLEF>{w~FPDFRcF0h$wj_!)LMz3(Yxj5{GnPKo4 zW*YPNf%ha=MIjp$Kle@|gzt!*r+bGHhNW!XVdZ>QskOJ6&n(34he>TkJ&2Tp3Woq5 zr%7RQ!N!knQty)7_3W*&h+M<#8?$A5Iq=OMXlrngco^0ie(O3it`wmPHUE^WP|nSm zR3bAzn^OpT{Z3|7jm6!zBYN0Bl0Jl~hC9tB!R0m7t9m~gPv1V*)uZ1(96*17i{IsB zF8V_jL?8W3x>@29dx6#5wS*PZfpjS=V{e({S=*r6CEVfi@kfy*6-6iO1$cgiPXdu) z#@TE;CP=?fz%bQUhMo}`wrmEI`_A7jk6Yy`v2a%5cSMqsIQY*K8nCF3Vdy>ei(`>?akW}|5r5yJ+g zJJ{0-P_-L*6Ywwz$==N}9_ls)rU%;p_n`y$>B}pXXCr>a25_ks`wRIe^VL#nG+jn-h#U&}8mR=u)rI9) zDTaX6SS_r^b+nhO+g!K_tmfj;UE#3;`R5>>v1zkeu4PhrGuD;EE7qOtR>-Qu4uj!X~&{1cU!SpuCZo(tje#NyXH8S_uDv@o(X zr78cp?v1dE@yZg(D~2`R@A>+AO?**{rdeIRUC0uzjm!%QLI6m~?pU%TwXV1h6@N<$ zY}9#iqq33E07Xg$)iSvgk}@oCW$$QG3wu!U=0gt%jq@C1xJi=25*rPc7?!+QVr?uj zTW2zdpPiS8VG3xZ``lEK!O9BwCPko#by+0zifthB1{vzb5pT|htP6?89RH;r-- zH?$!Ch78e>vb-PI?DC#j%)&S*$scOeM1-;&uI2*kUd06|vYQKReI>wci`V3O$Zzl> zUJZdO zo0&wk3K@#*Vm%^ZMC7!&OBT7MdeP7;#oCG6qgYuFiA52()zeDBN) zM{vP7EU1fgejBobyEW-0`*p^X;z9`3EWCttWa5KLEQ zBkd7kf5a^~0=BYxJmSpiA+1M9_isE&Oj54yI$fZ{WhfXr%*-6X1B1U3$PGb9n(hG7 z0Ug8_!r@4u!z4{W2Y6tPMR?Gxh^z=HPwv<+6Qa=_T23OLJEX1OAron9`WBXO@>tKE ziC@6mEGdJxGo;)LGiY8J=p5RF|9i&&4mEAk#zwJSr3}FB;DtxhVip;uLKyV)S_tJ8V0YF{x$~_ zVW8loOvlh`@FhV+IO<9+Ao2>R>}TF~BFZzWfeAX#&}2iP>UaomJ3w)@s&79a=keexyK4Pkvv2JlJx=mK6V(8U_ zvdGtIny%uk^op!*bq*1y-Xd~93xHGnQ(!O}5nBhWky#+*dFMhR%um5ebLhkz1Milu z<;+I&OlOHdT=#4g%yNST#JR@G=rwpQ#tAxI9}*lazC*;3K>H!Xqpxm zT9luGwvnHq8E$nPMGUt;UgtDA%gNH_!_Xtxl{8E{12(cK#3#Jt$yD+Oi@p+>-ke;8 z$K!|$duiC~bU#l!obvi+gwW^J2r7gv4XC!0w=Ip6j8Kpd4v-Z3HZ$tnK;*yT&c+gm zTk9(nRw1no)!hc0V>UxeR7iP&j$Ton94=67-F5kEoS!4XUdbP2;fACn(Nxkbsfjxr zNeO@5?wFoTj_}kRK!Zr3oc|qTf4ECA7eLXGa`NR)|tHu;uiY2@><;g?=5HIJ~R(8mwD{7y+7D-@Vbnit zq>7O2@f&ykZ%1$2^n4iFxA0u1f##sdm^Co;jA9@!2uZ%FBlWnm&0HX!?(S)N4Ymsu z-W3gi9g(Gp$*T|yu9yQXhGZxwLy~))@yg|D1R)p6egqC$SmYqK*HDbTO&U14ARVny znz_eE!>W|ZL;X{cPP!jq9aHtxF7Xy^_s&})|+xpmengkta{U_e7lR3NRv>d z@EZPM@YpVpJ&D!6rvB8eDEM99R7{7c3odoqYfNq73BVmmvfjimTiCk^B{P zSLNV3{_0y7*G1_L?2f%(OSk-t5-s_&52U3^DBP#6wfruF28Gpj&H1}94gH+e>Pf;)=&Eq1mIM*-#jh#;?Qi9{B=&zI#?-BbROH4?09rkuD`w=|pus@2Uk+6>}@! z5w$V^CZ0rAxpsuGBbin*e05y&BL-gBCv=>d<`UMI3D$~R3fAP|(xB}+hs`Vo={(;Y z+O=V}*Ne>3HDfl(1X$X_NyxH3dOkkLY7m4Vya=nkR@=&q0(y5)W?USUNzwh}MTh#u zY9F=+)B)`z>~;{g&0hBpCwv3xatWUnjeKq1)Ui1d>sQot*xh!&iI|lThhcdMPzfW2 z79gS7gSFVxayiRQ1Q!ExEd=4C5RsDy%jI^rSJ6sf5dckKRSdZXYUOo8(%Pw&`6>Nx z2dF^`!Q=FL-N|4yrLvEE2k=Lr-ZQs|guvw>PMuQeCtxa>i1z8M9GeYYE&;nz1)?8U zU&HZ(E2rFmEdpMv9;~s?a_P6f1AR~}wlm!@)#(Zg`&sA5x6IY@*TpG=2o{x=GT8Lp zY~A6e#tYzmSHPxA zctL>`)!TISN@Rh{T^&uWqJ@etu#cS0ndvtmL&N`mtgNSk(oDT zv3r4!2M6@(z>^)m>U0ljWCMGVZ;dVl+Ut-M_tPpuH62^5P3 ztWd*jf?d3BMbd1Fbn&8r7%p@IVxd9M$ziU1aC*2g|PWv9$UABuaM7_s>2aYmJV^ z$!J=s*6NKBd{fQCP>FWq(L@Zl^2u%WiBAP@4E(Z5BYEjo$dX8kU$(HQ_+=qu|4RT0 z`Q*MCB0}<(7W%+t54g65)(}(N8MF^2w#3kP%V1*J>w4-Mc6S!me^WdFCI^^moTQbC zLB!WWY^yA~Krbw!wa_?hdZmEN?9N%2UgA7;l?_xWpJ;8(ppT{d2dp#eyBqa zJEEc5aK*;t+{hm^pRAWovlG}LNHo7uWscyvHu>Q- zYmfNNLH3d*x|r1gibArQ{LqLAsIew50L6q-KTrfWO@8344+9Fx34=hfn34e{P?CV6 zAi02&mO$~7ABp3RIY6-iqIHmctl-gK!o2&47OET6Q$IK*;oeOMNY}CvMoa{?*V;My zJiLPjm1?+L2pO@$M;p{W5=|?=9BD|w>75pCRoH$So+&iXnP`LhOU&4X*?sUOKNQKlQ zmo798FDud=eq)2h&`j|gZEYvlhW85dL!!ld$pV1je>c=D^tLaKZw^G2?7$w4fZfi@ zt9tRVEZ)hXhhxz*tI8rmG@^AdoiRhAuG{%VEkMLvM#XA*DHuwotMKzLXe%T&0 zsS(bCpR?|Jl9vViDgl0&gqn633O^B#W>isnnmpyw;llJmiz82OK`fqz6D2l%zR4g% zEfT4(o?S0Uz zC>2;%WJT$pC`80j;O#6XDw6-;^cc(>$&k0KY^T*UKcU%8sZc_*D#H8qZ1yD?r5P5a zYS>ZI>R}aZH6MAdvNJJPcd})y1Y#Yb$9y`IjIJg%GA+4>Ug5i_H<~r>dL^@tquOzj zUb6eLdRb}G&Op6#i`5r42BYQCn_p?^Vd|#|TUJ#w>&+q)22#|5=moJ>V^fk_)6lXF zv?i?MY-?uLHrlGzV*3G9Bw2skqo)Bue2cI!=Rrb7noQ;?;AXj9ekbZRy{CKt9X@8F0JQ>&F!rFtQmuQACA)N~2`ZfA^gVn>LT+uh_mNsofQ=3zc z_Z3G$SScPU5aYKLr4!YMYe~h;Co3})VlYHW2fEQA3@Ux9;^H9cF_R?vHeks-Zgbi6w|J@h|;8ro5~b<^1YqfF0~7O?PO%_ ze*#zmn9dZwf?p44ij^z#k>OxrsNAi(4iYxdbgmE4?iG=C8yabIO+9Thnb2Ycb`TxfR#Kr%|S`qs$Tz z6Y*UiV#bmvW{@I^&Q3>OK=;S>1QTnM#Nq89IT7VsdBDj-gGV~w>NIT@fpn5W(rIn8 zYYjSfkbq;hw4f180l+T`No=b^s4LEspSXaGTrrpTr`kpq;fGO1;c1~WuqNaO22*CI zZm@jv__=^clDxws*JN(CM}w|a5m$h+N?R!dHVdl%OA4A9C2*(>r~k>KvoFnwM)vAO zpL2>_#GLnSHk+@m$1OQRFoGirfuk+O~0kk zL$9_|UP?zgj;S9>KSVd9bmoN1cd`}4GROS?)-Ps8^9U zVi*qjSiw&-zk|k{Q{q#E@IG)#MrapJgHyuQoRSf>!=wDK?t9x0o5=^1y{A@~d>g#U z*O!sSu)L?HRH;M=`Uqq#PtDRCO=1??%ixsQ3ISkUE1eQM%|L~RduldLO}jJRj%Ctp z*hgL!yHLr+Xfb+c7~^H31DvSeU>m@eI5CP%NHpuAAA(I($@lHU4cV}7x?9f=bsPCU zOI4PngM&B7LK&Ir{59MKZlqna+7zj4ayPL8dzMg&yD0pzd_mb((CL&if9OfRPwonc zVY6mXmA~sAlW+jFAtfR@Fsu;-5c->)M{Ly@zpkK~uYrZ<9x$h>KnSi?r8M%?2m`?u zXv(ILRY33P$28;uvZuRfS5ig;aNyVbX8eX?!L3LwrWuVxOAP#AZ*J%lZ1J5hMZYxk&T$2URSrh`3rsx?GU{>&Ej68T4TLlVrVaVm|+uU z4WV7Q7utnTcx*t7o|Nnp-RVNcT%1t7cf}~@(Qmp311Z?vSKFzbZ zsEkb4iq-+-mMU*qSuO_;wwp|@QzKBsWOBXTDQj;JPwr%@#sVW1Ei=r=#Z#61Xgsy^ zs3{NiPE%O6FK%X?RjpU@^b{PUd}%E9$%N@Ey2EaJy7Kr4*PVPnqu;zI;Z7Iw+qhw9 zmX@V7Z9Sz8o}Sjz-P{=QD)kyen;qfwo-d3NDm=hKDJcP%z$;LJqnL^|Vjv9iXGwx} zDMt%7cA6B82$ulLPvBx2H!GpK61J(3apRUAVSDyJJP*~c&6A;*2oy-9k}M52Sb`jUc~_PrH#dpm5Q89NVQV7ni=Tal0jR87ICD8{_) z!{s5ZO$|KHMHVI&1Z;PLJw!-=FAl3V2$DqwD=19Um8OY1AH}Y89%n`q7_i1f`GX%t z&b~{CMJmu3R(&ruFEHu+LaMT8cU9Qzo5+xT&qT)ODsfe99;Hl`Z=?_9dx-ZOYs$Xq zDbT=83n#NGkImo;9}DveHOi!Nd5nCuN1#z)q3RdWprNYDL)A$5emuEO64#2Uwhj;t z#gxX#Jqlfy>m}>-IU>@WY%#5YSQKkito|Ckqqqjs7>89uU{vMyae)c0m!K3Q6Iv4Q z5<_^)38gVw-y|xuAEJ@M26fn{+CRjPT(an+pbY-VI;#G_p zp@w95`?<-e^SVzYfr_YcfQ+QaXFI2Jp9$H!dy+leT*WdWLj=^uzK5g?I%-3VL2b6F z5yS4^RHH(?gQO~+m78jWXQH;AEfA^7UyC~|5aGjT8EtN3VB^UScLr0`wQ9rm8muwQ zQx;V)Q-|2U$;mMlWf#z1>Xw1H4J~k*2*E2U2D!qTOe;p<+YTLJA9$jGS_wkYr>j-B z6qN-daJhY|scYsTSV!a=)P+Xz3o#T}@J+Q^s5xRM62R3gi*EoTgnOuXyjWtA0t*&5 z)5>PI+|zGL?>lpn3=KO_iE*EFdn=I51_>iV;PG+xCvvQMisZk5I6c3Q?ZC9|2691z zGm8eY>UqoZ;qzZU2K#KZO){v94J^-yFo`%lYBO_{{Fpvy*@hW?A7I+>0g|$6XZ2x# z<@f2sr1SrHZEbtw*a=70s3xK+uFNGZWUT`$TQz-ewVFrOV4Q+Fi!K(QyV_{BA-y4a;97y11yw|x zYpkxVIfM#jK#U;XWcXtS6GHRdFi)RDmYW@I?TGOFb&584b-g#4tp}3tWPO`vO z%TlP}a(DciCpM%?Akg!I9bn8aDxxQDZv)!z(WW@ZcjYW2cX70w_E1H+j7l_49waqr z16zuU#^JvOXxw1bPumXqwv}K>)SkXzxK^SAjm)bmX*ZTI=p#HfUQ3ETOxx^^z7IQ|J`jHQfuu=CJglqhJP z?IHk~Cw3vr5IuzEjY`je?m=P~b$Tj~-R6RA{N4uk=lkMHcj;k)HgH>vbFvv5R9fh9&H=*k6N5}H!Unzrcj1*QHYSx2vGxhmE@3{oR^PxlN@$4V=t5V0_$~b5PCiP6jmoaem?|%$Rdv z%KJW*b>0D7W{-~2YgP3QUFj5if}7T7lWu!|#9wE)@&rh5cALuHkEOx*kSP4PO+7oM z$9NF@1t*2_Z)D~fz}+l2iul32R#nr;UKHR|QH|Rh3LJxfG&Q2=J`1ucyvFCWR@w{N z#k`t7&Z8)rj3m>vZMzYZ1vMxg{R3M7{jBNmqx2NP^~b2sivzv^{|w<}3ik5;F%z#w z^`-*UZ`%(L8hNJmH-9~k=%8(!!6_kIwST@XX*`@r4%CURjwO`}tj|Jmc0!R=8T32f^tVUH^(hvc+?=3O zG_;cp-DndM;S1~}?H52lX8dt?D2~nP5gq-*!@~&xVa{ioc(6fYSvUo*hl!c(QVr~C zP9(+2CLxDm3D!az-78vi`;EyCH;9>jmbXt9nAeLll2FC3Bm5#|2aYfb=NJLTCsVi_ zp7S@{@J!3i8eY-A5=+!&Y_I_~xL9DK8Q)06ypgJRNH9jxek)=WbxIFJ4J|H29$_l^ z9P$s1d!T^W?XrhA$F24{VTKXPVcDv9STYEh89%_win*H@%Ae}S)VI%GTj4!B;E7i! z64~aTii<7x%)OIj(6x*s68|<6l*uaAae_3*_!yO;W<#FE2MkiG-oytcI zyeeoL^%Vs_HoG8PjD@4I;;V#e>`sxBEyjKf$?aVzJ+IyRWTMmgw`n2+=hWpeVH6-y z`d5O7b-9coVFS$kYnlO;pP1%j98RUqM)NGl1?+wqFRIb68`s1@enN+(Rs3OTEYI;l zCz}pcZERR=9;hO78w$55aqB_^6z9{c?fz=-Rkh&^Hmg>IhikrQEg`-jGa80Vu;>8I zor=a3ry11o-0L_Py+-HrB&^B7L4%^UKbM$M13&DbxjL=_agBQ4V&6LF6|?bsnu%vF z)i+_mUfou;!tusQ`YuHusS@ubs~Hy2iq{BVx3xq&(pRj<>;Nf@zB+$AU(!ki$AS-t zB8UW83~11^>b>{wbN1J>pZ$FAXR8LC%Urd6(;PdL;U_Dn&oZhadMMC(2(NfR>m(X#&b|z+1f7an zn!_^H@qc_7Cq0fsK!v3BsrR$mm7%XDk2~bxLfcM<2xZ#01G3J|4nF~jP-{Ti-yVlR z%ZedZ%M5@IXa0P32U7tmge{6j>l;L$kG=#lS#zoG^z`9()M_m2BR(44)kz5-?} z)r=v>2CXOGBotMN=cfNr7!0n%>Vu*5fJiuMzcL%Pv)|ccNa# zRNeh%`Mkl=`}n4LQpZ~Yq+{wDJW)jx%NLZH#O@-U*N@$}8JkdnML--25?gR{+JYX4MBxkBFK9$l`{gwIOwq!EOYALgp|s8B6NpZ=wM2&{2(#wm zPTu<_C298u*%biw?V_2Kt3hOgt^M6m|IdE>kw5zJzxab+`}4mW>My*G|3wfSV2D?o z6*$g1^y~Ni5X&_?{CFZTQ5XzRg{E*(_=FaAPKC|(;kE`CfIq4L0uq-`OZBu^bJ4eH;d73N z&p7MyKXma=I@)^t)49C$^m>27r0av&JmzW;?GFAuOj%p)UW+4ZsoF!fI+wA*F{P&z z2od1&y5MOXWd&gC@DOFI5tc;V{TMnegX)y91f|c6^UD)PX0kLfd!{sjbp4(O)`~>^ z6b(|pm)|KMSTY6yB!5S;iO@8yl<_FU$=JJ(BMt-_`z_M_AahG$l@clDgKoh`;@(qS z(Qs>ccL!?1>)txSHYoTPwTR%LghSDxMBkotw<#N(4dANLsTn49DYms^=C|nyDsfIt{8b zQ|-INtIj`D3u#FUYGx{FU*O|_274eYLy8aqF2l6nmUZCdtTRRYV^YYP^V-*_K{s_HA-$LPMgPowQ9t?7PyX<%?1B!Cdj#rz zeRJHjUuW8Vot9qetUJ8;3?taVLt>)I8yGfrs@;+YUe3z0wO46OsVu7D7(r!*rhDGWeqkrKRyJsg<&* z$duqrOQ@RyZLedFa(L-Qwq?VJnt}~$`-m#CXD_l9XVa;R@w_lq)B|#if`OYesz7TuEDY$6acuUs|eFZ6$Q9P2e7B%ssq^89bG*)otQDFrM=ex zc?uWoG}c#R(;#z1;^4RWmn@Uq+0Zjaz%EOUuGZKip8UDD@Z_u_KQL4 z!6IyKT`jEFPa`VrF097LN?7l21xHtE$K=+`H1$ACb6snhY5K8kN0Ewd#zrmS9@q!> zRahNb&56+Z*sTiXnMu!mj@4ccy`>&d`uH$0q2&xSO}!x|JZ}s>QYdAWoDr6)Hz)w1 zj(dt*zNsLD(!E6prQUKJX`Pa=fS(|2BQLr#ZMeC3F=_4z*LXK%sqN8`A}X(=O|loN z!&eAN`ElJc{@1bhsRTxcLLx9q@Iqjm#UkfvB2_ih)CO0fHaIeK+Tflh8$5)lb+e?a z3!CLSso1lW0jC8=n&o=gIL#8-YvWn!!~w!00g-A=gLF8*>;wgU z1)1>*VR1=!QABZ?g@m^LuHw681kS5=y$C_hSgBf>%STJ5#Jo$!&k0F1i2AZ$2R z)PL$J1dezOubZfmO%ToFAR!wzsaRSysVb0Hztb56eY9h^USrr56^M3_Ws5&XnAC$t zx}>+b|GUFUl)D1D4~B!(A~qZ-cO2cnp2^haG>)w7rI_^O(+Sx@`a{}CAoH!-LMFSf zm3K`qp?RAyE9FfH8z5{s{GUWz{W@f8S7>wBfwCwd*VBf`B{p?&8*NCW;)JPet;~v` zjra>0U8GjS3!@LaE)Ot9Zw_f<8H}?Tt+k2gidgEwHprXiY7VQZU|5atn?x*~FZN>( zHpJ71=uKrNT%81U}x5KK*S> zKop-`QcNG-{+rv z>*s#;-+t+|`d!qC>&)6Z*x6Nw<)o9NYPC1~9v|~djUos32X~iek27GB zZJaOS{i2$g z!NVaaeRTgCI|V3l!!19Lw?9Qqhg{38xBh)D#>Uyel8pU^W&P{&NoXF5qz~ z8HjlybnmqmqW;zVwqsQT$fqbnrk?_GUWMF1TFGWKUW9jar_cDgRAsL6)pmt(;zwmE zJ{wMCGqhll@F7{2b-i6X?>rLY!vkt@BYZf)Y0mJtZydZK*2AH@bhY9F;hWOrnw0tZ z4(N!K0Fo)dVk{(_zUEj=5c*B!e<3Te4xOU4rLxD_1*jKPv$+dj9q8@tZ7M}wdw~Z{RcU?vr3+jl>(?NM@Fc{fg)8U7l;}# z1&E`yZ$(ZtMamMwTf3^!q|&7x1==SMCy_;%B=RL3H95&?L=@LGWb+1ANS661NC7kE zsT$GICvRX2E75n{!hkH+_Psp~$2}4wSs)TMeV@H!pTyNzVrpqPNW$xeb4BVY9Y>77 zj~L7~sb}I#{^{8U8n<3+RFUP&5c%>)mFJ&Fl}E`E>`J3@go?5_Ql^pWSaY*P#q<(= z`2$L;CMsoAAo@&;K&1LYUJ-qj1<|02JpKX4m!&F56x4~bSEjOSa#5^mDt)r^=B=p= z?%veCBb9xzQ}+F->~2CwW4So0{yGoF$bBQ$_JrMSVGL#p;~~Myg{V7joBpP%ckan-Ykr$ZeTso#x;3mYQ@T9zTWkV!G9>yz~BZ{riK^MjMbY=&Pw5oI@P zx~v^0rPIBMG-pF*L!rMKyys0V?|IX+$9sN#rpSxG@uyI#SRwIX$~(A-n_1v$HdLGi z=xhK0%fqzIM*0qEQ=I%oRNH>r@PG5xX5;_!^yOlD)J6;>Oye+(<5a~|LPS#$jo&@^ z6<0KENEJ<+U26K4N*g}6(PX>16oVp6!AO|Sk<0|7XD~S(?l4)q*j0$jz%O#~&IZbq zGUMXLaJI%8CMWnBB&HyFY4UK|Sr=Jb1^D$&gF2c+?Z;HK$+}ZL8)lKBs6X@ZU-=u|`%=%zcv04$)>}Qj z#a4l`*9$r;kR|ew!*$=kwb~MgrgbPjOgfH^=#cRiDkA8wBM2<+PL`t~6Lg*HV>J+( zck5!@mY`!W@li&e>~LTpIwh@)xWJMVF6DSLr(DR;kq=_y9oNNHJ))b^y_5&>hU#9* z-VGa56qlxTL!Q)G#F;qsIHTiY4641Ma&~E(3}M_Eugekz%l3xK*`?>=JZZR4zPfdj zA`F}J+vxD_p;u1`C$6{DDEB(}co`=4OVUGb+9E|sTz~){$PG!EKo!t4ER%gd5ANr4 zVXlz6Ka68IqW0q%hk9~Ym8%gKOqdYT^LF9Uaon5PsV8BVC7a|)F! zdRDo6QmVnQU;e`He(IP07!0czhY_k*zvXS9%A8Q8WKAO4u|A+eBX_|f&45&Oj}J~c zHrr%f7xNo*A@rP|?m*}{Ki$00v!{#p;M{nmv~L-mg5X#zY|wXN{bFfXW_07F&g5_5 z-PJKSVNdLRtZIN(|MgoL@w~1GH-LNXpbUFZ`xMdF0$pYqd zbTZn+p$dI2`tUTy^|;g)U)}dpidhzmfsSj)drSQ09ReIl6BRknU&LPk)?^5jql;2D zwz8Dy_R#i`jKCZM`4-wi1iDJix!@WiOY+^muhTJumr6{Q)sC2V5mccJaN|S z1>akCZj}?O8`(b`O+vPrAs!vXUJfjJz1Vj7&d$U6{4G!Jx2HW8$OBD-?X&}9 zLkA&9cl$n*p?R(eCg&I$BU={#r$0tEOe5QxMz$O?-(X}5LBlU{WYkJmgPwb29RIw- zI3#5B$Z&%jW+ptqOh@_~7G)NLdj?L${($yEaX~<)HgBH{ymOat9B&5q@dPQc=<_gKe;QJWAS()7 ze-0`_^mMu*Tzk+bAx$VnJ;5bWPeyZxhzy4)UtGL_)^#AAjmVNKiPPfwM}&}a`((i* z+9bZUD83~&a^q<8jXFIzq@CsSx5J6?+b2V}!-ahX$(v}0h}PnzqduqM35TJbrSrG5 zs&-c0&K6aRqjuTT#_m@D^d&)CA+vW(o}*wM`~EKRnvR}>C7%Kj2SM_v{eFKk$akJ9 zYh?(Dcptkb-L%yrUj!rNo3AWyEvA+ffn95)x6IY^Mmi zP!@n5OO%Ac6Q+P;4Gqjct57&C4$g%*ICq9P*wfMA5C?lm;Zx$EFO-@IaZqlMWVo2R zupC4Qad55`2h|JWU{5T?4=oP*YV?W)Y#N$M62N4k<$$1*CV+y}J;a@_VH9~|NPn-F z_g-0OU<(q-6M>s`L#&0Q7#$z4B-F&!<3)+AGncMgL(&7eNZ7|fk+fI>9{s7*6y0ln zmdndA4lBD}T-era0ohG0kXo$M0-Xs3eJLo**@$vnULK-cmgJT|h=nY7iIJraEHk~1 zmz|BGs)KpO)y$r_4(~{oW8GFC#F)Ntqvfc?3)5I=#a@0R%!{hx@57hGF{x`g1V^+X zDF=05*Em@o@Wnv^_sroMAXha;NLpx_DJ_`Kz9z^#NXmLy7`R0%^O9wUDk|2%bsOeS zt=HhpX9Q5B>y(m!d1!Y;&;P`0EBC<)LlslugztFMJ~*GK=7#g~8Q{*GWGEp=kQya5 zT!QRg^H5zhE2lg;%5LI=Q<1_OUH-GXcaxZ_qAaomcwI<<<)~0K#6JQ66*eFdjU&gR zrG!nXk$GPMq@j~&{#yiH!$xD`-Ro>IQQ7rDX&k);Xc{RJ(xa9v1+X9_l$3xb)~Xq# zRoyF;OyGtW*^DL0>)-f&$-DK%O zA=GB#;2b4Qq6R37`KR`wBonCWiwm4CBCZNC0~!*e3A9q6TH>fl7!$H7> ztQt)O$8RbOPP4dgR)JaA-;+4VYQw{PXLh7VWHqm2HNkpfTZHo5HSE<>=Nby#r1*{> z>f<2K8PqytJ^(CQVtT^duhO2&T*z$+X8%jgL0OEg%??hxhCYB^{=sDeWV12*pY~|jN+JC7-H3I$|jvsN((p3 zzVf-za<~SHWlKk?ua|;+H~Sz^tSI0@F60ef;G!U>5w17_CRmxa*-ul?VaBz(7()*dz6&*x%=A(my5 zQ^9T8+WCyy%&xoKW;j~qV;gBTpHZ8(4CZkPJS2r@ipQetA#lqfmU&0tpuK0q)tvdpo}!kWhEim3Gg4__A|bNVk)n8f z2{_m51+nn?8>mI+Hu`e3ndXY|W=LE;2X?~vmV-jTan!ZOp3|EV#YdBViPCSh0V>F^ zsW2A_tA1n+|8z=0){o1tpf{cfqfv`jH52L6`)rzwB~_c?n$k2Fgw|zcVWaA_&^i!w zpz3;J%H-*YdWC6Erz<45DpC9~#_%m+xO7tFuFxR}9YApo_IWYsyb5Day278wk) z>C*hf&*+(SRFY!{jjXESX#khX%9Y6tI2TK?fWIwjVPjQ3ttN?8C6bXVua{4C7wD9H zNoYTB4R)LPf>2%88~=z9^Y17vK{!40*E@rG=1FX9R`OCYjkQ%$10a zyNaSd{n1Z;Y}P`mZI2Q$=TfMwg;bd$Wta?rHr1Kw!usk-LS2}uo+MPWNtTBbMC*)= zeTk?UaIGA_>X@1uYFloJX!+l5JMTp2R#uaw4 za9O}@m#C`mvB9frsDgW9ioqr+UgF)(np?)*@1?bn3mw?aD`KBpLhhoWM%Fuo6+l8AcbQHP#_D!6MB>~poP0%V%#dnFRa1&87;hKv>5V^r29qgBBAV- z@g@4WRaTTsuouMLBdm_@9$~DU%hXtx_+YGPK*4*-d0>W14FUi$@ZQSE;rW^JEyTW+ z!vKeoXoqADDTuZ+4jL0>yJA}fc&$${+8Tgw)~>r=7I^b|S-xcW_aJHus(SHpC|cMUGi8O6+%#i~s}5s>97ra-yB%wcH9OHQ-W07VG=ClX%XTOR zTx1#AB1e5#;+rGk;^u?G9#8<2Jt{n-@{S}2e23GJ?mwS)-);Fq))uP0z9v)d0i5L8rkN@#caw-58 zVsB~v8NIbdZ-qQo6P{P^|Cbahx|H!D%+>GAzmd=+Lf12AN@yRR9$9q*V}pxr=@Y`) zBZ_lortse!&)M{Wf42z#?)%lvB{5=Mq*D_NqcMNxPu};Fb7YBPDE=AVU7C+698MBHN=!;hS_kxZ#gD4B^h=i9|t^z?ofjIuS4rJ!^S8e1rW z9?N+ok@0M<-DxY{d`L#~Nitg4NHR)RJU?qCqYJg-&9_!O^ul$1n4>i#6#GF$NyJ9=G^3?-XpKi>*5v4kWm-cZuflofA5(XxG15Xnb&w0{1x zk9^>-KJdPeJXL(>lqGLICHMfP&amXAR;sFi^UX?!Iir;%E6q-|Vy?~Z6fuOrlDi{h zr8BH~tIk?5$X;1yo${H4jB{&}fmnU=)&OPB5h4Sj8x*de(j?!R%FSbkAEaOs?{Yjo0O!d^eq zu=xftIP9y=(mdT^^j5txxV*H(WO=+v*pw`fF{oF1P%&N~dCDiBnb7qT2$7+*3c5n# z&J6UucvY4~Mo9^&*~Y`jP=i!vz6%Fo&e-!B+sZn79_8U@^dSrLQ@G$t2&%fizK+e2 zCDCTWc8k4M4JTJ(;EWc)QfSQAQcapKd!vEzYr0Dkv)AHXAI8(@(vr;`!Lwf{^Krr@ zZAZnq*t@DF7LTN98F9@xD=l@Bj1@Y`20+4b0$N;OIK;Stk*0du$8GK_rMsAoXv43J@~b``aKU)WM+rrZT=_H^_h?U+~@x4hd*`nFEF)~ z@I^>kS^uP7jSSum*OrAS1fP*k2Mpf(|EJJZlE457$O}yPq4lAw+F57G;%GXQ@kMs! zbuux~xahM3KQqtOwY?v_ykJLWPoFkf8`Y~F5_?TzfvHK30ee{^E482WlY;AQX+xBVn)I6-BYYg&Blw6%mOY(jQi(}r%(Sv=X0}qbN(cnRGDNSEI zi0MNRIO^Gvm*YsND1`-Cs2(w*LHxCGL;cIBC=oj?85C6h4mmYE7v`Y}D3`u$NwTqf z>@rd?(p>;LEOL5oqqr}C)wA8nEIwBhC7ZD|g>x08(~oC}v<7PBTiS>bJLy zX^5_DV|nKyq8>oq0g`|+A?e*Btx%rO-W%a4GR_;>(@eb^(Dc04S_KSv!UKI(271Bo z9Q$35&V`Vs7t=(6gYVkKjL$S5@#pVL;1NtD@W9@(z#}Y#W1@@w;^u18oBJXWx{@WV z(&D8piO}NZ|JC@dGX1s2lT0pdX~@NQPlt@g#tXyiD@`bpjCIq58@4JyvPot?fkh-o zJ3%Txh)v1M*`pXt-e6a7vPo~OU`(qQ>w*LpZFHSkdJg#Nc+okS35$mUjKOtA!Jhpv zxI)}CD)n89KI|#jylfsL7uMTJuT?8jtmusFwV_tXwmlPpSJ1!QP_}*Z%u@^F>o+rHik_kbdL6D@GJrYFyjOqb zt!oh<;2_aC;iBLCvnTFT+;PF8DDt@O@i7%7+HKpW*~IZ_Ta7GCw=6d9x7v1TPSK%| zQf;+tuw9I$L2$hjiVUdR=+MoLRd^{!7RcKAXPQAjG>K$9vs4?#vJlq*ns^gAd8CU# zelNL6d&Fkm1c7Tr;4trQ6|iY%Q7Q?e_WgVD=3%0wIz9Of)+9HJ(I%A8#lz81vZEvj1pLZ-wdz ztIrp2XA_{tea(7{RqUN9`jNf3#n*EWid3w0)NG)wmYEGfDdXlL#>c4n(I z+UFht%okg8PXqE0WVL3^M5@EEr`|C(BXLM&s?(Y%I#LnLorPrwar;9orp9KZz$#*L zgA1BHuu#)#5*x(-_>g25-0t^@s{2VbTx{u)Ru-a3OYzs^j3#T$UQ!% zPG8ROQsDs3-Tq4C16#(H(UyJR{Pul|!;keON@(<4sH8u`$t67DV(90Mp2JY`5GGsp z6*pt>-ZHx6O_MF(_0QOos3F?60q3+!!e%e@0Z$bPfypOro0L#~Bdi)N+}T+`44SqU zM#E|Q?sW`_z4%hKS#Bru?&`%wW?_g`WRqvwVY4NWb|upETkUKS6Le^opVzHWK;)`>+sa(W-pMf;0|EL3hvaWcPoI^O?-7mB_-9P8tRi# znMN@x`vH*iGILs|y_)jEev#~e`iqNAt>)@5ge|v4e2b$*K{s~odDct>Ybr{Vm?CX@ zDc*O04|o`f`V3EJqpG?ZHF*lzpb3ogek|A zH^gwwe__Pt+KrwS-7np>mW~RE6u9W_Mjb}<5x*?!$5rI>KTSBnAFF7qtjKLR!Fsj# zz!~F!=WpiVZ95QsyNHoUP&j?!t)KI;qZHWifBpy~u|50jBl#EFvyQ-FuW=;sx{yDm zPC~(>>|0Wq4;ZTmqQ}EjdR2Zg&KsxF>`$S|{9^W}P~^oM{NULFT*hVZ27sH}=$uv0 zZA>2-&ygc3YpaJ)a@u>m?jU(?&`~Rc_wNlR8JS%rzs->R9Gj%6mtSN%lc&g)qOW5erQ@wi6P4R z?Yx~bQ7lmT_}iPGB|m>T|AgB%b?0*ui6@(<2rGHaY{sdS6Lb0P`|{f!<=?(7b)@4b zx$fe+x(m7P6V2P5aSZa)-)^4v+P0SR(_d?zwi~Bj&QE_!aK8-L>AWNqqO9N7ykE4f zt;GAqNX+e&>a0#D%1CKBnyEN3#=X5_V`NY%4GnK!*)%ubo1dNO&llyq|EnO(Wqsc} z>B2YKbwJxJ+I~GXI&^@SmKX%Mho>VUi_Av}m7266|5i^o>uCp+Y0=917uE7}42~Iw z@c=IyJFwU^O*QNP2YOi~LFZUV{i2plAv%C=mhjj0RFq6dTgv)xemJ*Wwk@aiCz?<# z5B)NfF`)jG$_CR=Psr5_Ehh=dv)(XW$z#w<;NSkwN^qiXRsmsUWU=|(pQSGuCL=$~ z&*q;DeSKeL{g9r@uqi`(S-&m+MBHp%ZWia=dMZ1n`BBX5NtMk^&uo3>mJMg}Z#S3; zZpvjmr$PN;K&83OlkcJn1%Y=LvLPV9ucxaX6z0nM&ze3f+qC9GV z-^}yp^fU&SQqBDM`zc8mLpJYc*pEs^@POXvPcM!)_kXTPJ=8%WF(*8E{i;_qM=8Yw z`vgD9fKESRZca;qdtSm!Dl!)gE0ZEuQYIFmoF zV=RfGI#$!@N&z7#iWl(M!0&h~hUd}^tFrdGhgY=)gEY}f#>q}5naE3*I(1{pAR@d; zuqZJwbw{AbBD?7^`$LrnzgNNCu}xid`()PHOG(G7lyT4~hAS0}gl0J-n;Z~W^*Y&0 zN&FoNVIfnJ5OYFUBmIP6T4?dw8*$iD&`R!P+jX;d2pn z?MoR&^2tO^H^d_&+NbP)GMqZaE7w7jf@VS@Ei$EH;NMe7wnM#`$HgrfJ(h+KFAcId zOXJ5fdwXdjK^kS)UnBFR(Oi}%XLS_@&^EGUr07$JiU*Za zj<(#IbF`^7iTF%kt$5GEa$VZfY!FW~w$j_}ot|7%1GWj%W4F913KMX}Em0{IN zZ{b-`U{egicG+nNc+y%j-T*D~mWU;;?^Ta|Z;WQ0HSmcYJ82!KAbLi7-WJi^Xb#Ps zRLL1*+)|7!Ms_AfG$R8a^5#&0D9eojCS6`GoWtKj(vG-%8%$JoUtCQiZ2e@o+#0xW zF*Wd}m{$p{+_ZLrx0_qvs@AWX+EU7-+3XG+5m?RSVc6s8f=0fRK99I<$>W^f&bcKr z6^>Xtz%{RnYIUEyZlf01a6hvVFJLJ&=5}$@^$^1DGC*GD?GVkeb#9B4g%Zcu4!JrN zZm*YOJCp=YB?NA35$o|8(0_NN_Z9NjpKX7uHSS=VYAtOCwAwRUYqtZBZ(|CXrHW1{ za9F%EA!&PKiSa_TsZPn|;%<`kUgv6(jDgU!T8SzHqae2zygp)RT11V)*8?8tm2>Ag zOEG*IP{2(A$?7S(5B1$K6;nE+aSCKxe|q9#71lFzoMpv!`as1j9matQ9BAmoy6oAp zt&MI>4&BhNNmVI%fRW|YveGT9FLz{O%AmQDoYJ~lv}i!i>bM7@&B0~69vh)ZY1Wch zuq&h#aMxnNefTvxBADK%U4*cz*S8>&q#EQSHo}ykLFcJV>)T}N37JMkHUoHRcBs>5 zbO^=JcKD6^_I!*2S2fP*hZ zEJohU?I&K}sRV_KBq&@c=jKSmLxw`HS`z;3`|C))5JRmxBRDftVIVf!t(&Q^99N)u zHGEge<|j1=t2wnBy|7Hg$VAO6ywISU1n;W?)sQgh)S(>p<2GYCGgJ6hB{_>nLb-_O zq*87%Z8Qy+MeoYAdF8zW1hL$C>QAkB9C=j|Fj4}!^vkBuj+CrXsIxR6ef>x|rJf*7 z@KS+7H9=Ob=l{WFD|6^7vJ18_*WfgOG&r=`Jc@*<&qO_-J&!stCNE)}7E6%vdN#lq zoG6PHU-XUTLqXrvE4z`m)r>=p>M#8KTFM?PHE5mX3?{Yj3%~!#kNx&1o;dmif*3Tr z^h%=@9{UgtthZY<3hfjBil<=;NIK*1>HRq3)wY%mY$M^?lX_#F!fT!Jsr57S+)&wP zQF41pSN~z%tq@wOwDI@-O#0a!d^YE3exEz_*7tnjgNJ_I$$#1r<@q7D*8lfMKk^@E zb=1U>Szq|*@BJ5)RW!R%n!kc~8;)%>gf^vMsfnhX|Mm?x*SK;`gzf=UU!aWQz`q*^4rpROgmYHFz+ zuOkwU_W!d1uCGRJ#5c>)5}5Gj|F&j!Ydf=BpS_v=&GX3*GN+KB)6MP0Cy7hxh6G75 zIq4H{Rx-q8y$OW$M^Gyg{{K7%-){Oi9B8~2u|N-$ilR~og&I3tP81WT`iE3sVL%np zft<6{q$$2n!ByH?MOK61;ojDo5%I;6v}we<2zSGkdJpoM9@4DL46&QtLg)twhrVu^3-$G8+(d(lsPEK zbM};I;{!Sa&~2ou(9RU-b7muYokkX>8Zmuo1AXx6 z#%TjmmpNhIO3EFwuOMcJh5b$u&w7nn6Ma)Tv4_G!6mM{#y0%AV+2Ppd=eX4iJ4Ix` zsUPEq5Q=)cl@~!ZHti$91r1(yZO=D*(ZVrWSSxuiP&y75o-C2&2oym~P%mq7=3ZZq z@>M}N%C;zDKVbX?%2(15vlWe{j6yXkJ)J`$A@Xu>p95$s$6Tl(umfx2p5pb1IuOW{&V0W?L?!}mRFc|0J|b&;%+jl<5v%(bVuRZS|;bx-j5C=OZGG@HBXWaKx^S4Z7;s|yx!j=^c zs4!yRRO)!c1x04HhrA&&er6)GpqRsyAo2tw&3PriTc$j27xIYU(76jIs2sA_-OchA zqKOw2cj)KP5N^AVxI=|o=EiPnK;^0W1*H-2k@1zNk;Whd%tX|2&QsMGs=^gIL-GdtkIaN6{AL7xJd7|3bvh zIVN}an6G1an5RS2c*m13gMJ5y^7d|l;Y<6pbvoNJ?b*lE_SP+ra}oD;+(1m*8(O6u z$W4Wgd(%D8(^miz&GK-i!@^r1L~9Q^(Iz!y41^-aep67b)}4tPgK{iwf4oSM^Fl4h zR{#u#y?nClgez51Nc&#Sp=%2fS-vQPnQ>z|M~aPy(yDz>hOjtd)d-l}6XCI-#E=9K ziY+2;7U(%rEfpypO8Y{>H*9#rPNeyDPKu&&f;W)et0u&F=Z@br8IHC(DT-cTQ+QdR z*a}0FyIO3V#qtU&xVDDUjy4C$6o`otPhn`p905i zfM9wCDDg=RK;0Zu-<^OuQxx)uwLpD2LAER7MF|=L0KgM%apI>9fjm;*1~P}+FcQZ` z7T-%i9=AYtQ3GWENB;ju#T$DigErIeK85kC8im6eat^+8zX~ zeMp}K_#dgv9qNa?r#4`{ALK=y1mHzye!7qsJ#6qL)2?eW(k0w6*cIcbD#(mY8^{VEzxGf4F`&|(F4G>t6rgw5Aow;pH?o(Z@X2wrhYcvl z(>>zZ@H!n&4ZMbQA(Jq6=73DvOLHj2Mv=k>qO6i69#UfrkOC;2Ys%e=BPD7z`UCDHLxh zFGLuT45!2A;}y*$4)8?h*J`e5H6>snH&!IeDS4AK4erDX%>4K-7WhS4;7dphH(t@a zS!GT40$$Uqo&Pn1xt5f8i8JF#oExot$Y35efEJh&J^)UmS(en2ic>&ua9tp%i^R@L z1!xQ@%Of0yayexIv0hCvp->h3Z^iu1BU7pYx0r;?8Z(SV94`LoTny0;E{&Q zna$4wW?|21ebUA$ea;&-KV!T;!Rv^Or4f|$b*d-6;Hzo&lO#eJ0$x*=FGO*; zWW+@H7J*#HPGjO#On+#v`> zvfK~fU21g0|Jh^Qz%H9iv7XD;JQnKxi0i3^yUW4gZ_i`>(pV}s;In4~``pJr@_uY! zx(>a-zWJYj=W|_)*yBIDhN&Bi7=*ep_{v5J(O_I%vslxRjbz=1`n=aP{zsmK-3tFmJM!5vlYe@)oJnzRaRie< z1^E;ZCVF|V#HrE#4MAU(YEo)EJN$2aS{j^JNR%j#3{zNHL2TX3ky8eV#YV2nQFUdp z(@6=)b17o|b!M=8iXGnXwhHxjNk-68j@T)Di-;>$F*!5T2Y1E(YN_#b`k}cUvZ`nh zy>t#M1|f@SReueUXKkM`lybXDTn)dp^w(Y06+}1{JTA94BPBWp%BWGn#5n+`ZwwY4 zS>G6`W!QG4oaEK!_CT&%Kg{s9j`hMWQAUlKtFY9$n(qPqD#2Q5VSqG4+@wS@*mefg z>l?vQ2TSSKN(_Rs1M-Tr`xA=ZljFz3wFvIvCZ@q~)4+MuR}+>kHF1w5fq^Aq;~4nS zP^vyPZzQ6~_>^)@h%w12nzNWn#(V}~(AsyvAlrL@L74{sZoyy>7CLAXiNc>T7?dl( z5ED$8wc{Q?l(yG1zS&I3gEw!(J(tXs;7mFEl~OnpsOAgLtd8s{wz3Nq)I>O|R+IgA zNk|ZL-haUM4SCGq#1(9P)KLuEpqOZ64sX1*F$)b zI&rR46gEGvucy(RryfF3$K45q_!YL82At>+aNKJ8;7u0iG~?kiu&L^m+lcPvrGQC* zs>J1?YBtDii~X@Z(}$%7k~5h;h&U`URJOr-Fp4FeZwgwYv$~99fvX!(pPMi>QH-H9 z+dNMRCgadJw?#_16(FMJOG~n5Ch(J<3D^G4tnpotu?|A3+LQ zA9n@;Kww$AWZ~kkRW+^KI*|>T=1RO&7HfO;3R`EXQj$R%dzwqP$RV!1(62xAmbH}h zt#eeyvi?HI`ZP5Iy_#v7npIQ1y3VIX`hXi60&HkD0;xVvAN7OF0qcy zE6uTA-mw zTCYAKDLYQ;Xetqppt7^XBe+`sjB1+Ysa&mri5-T|j->U@a{b{=qHty^&dtPunfFP9 z^yO|Q*Zp;}_qTsv>qM;oxsKO`%(`;2R|z{8N%A zMX1a{w6Ju>q1|8Yw~>-<_3Pr>CpytuzwIG>-vV)^F?=4s^)IoMeUore*KC=Wtb9={c>)`CkLTSf7;S&zGBGhmufizl5 zXTmq-WObd_q&H_}-KdY<&D`f1K!3Phuir|{QM44#{~sw>3=h!8b7nIe9`Tg_Y+`9> zR>5{582Ko~YbOiW_V$xsa2g zAt(MqB{e(it^xqFP6*Ua2N2Ls@x6PC?`S6c3Mu8Y&PEVb(T>hO%Gc*Xg2uCQrq1Fj zL9mn@qPg_0<1n%Iy$)l*<2lsKWxs-`NxCCs9~am$K;ql#FM)Aa)z^+V zy!Hmd9u{AI8Rr@-L&1|3yGvpJ`)IjeuYRlSm=z7(HYw`2lz6wOw!f^O{;5Zb;X8yb zWqshMAAu@I+q_uAOK%_kXpaVZs;K_YJDNY>rLWv@21|4Y^nlbydV{U`hgED=c~emg z{u$am5ags!uy7EO@CaQe!1O>4sbTdO*_Xoyp~r}UZS?2+Vo-jg;?MvwrIdbQ$fgazjyUfXD!xK*C!v*T2mx!+h)k>8U22>@cOD+M4UiV?DDe#q!hnLZGMn7`(F#`$H@o6OI#vZW$;@ zEdf5`e(wga3|yzTsbpM(U_!JeP8E#GP6qQs&P%Ca^dyStR- z5%mv}m6p03{4YSNL8G&drpTjVn>M4d6s6J7zeZyartyR=^{l=AA6lU3RwO4`Of~(! zkI9Y8V8^41rSILqxZ(`ZsIT62hG*hL7JO6hd_?bjX`sOzZEaN`HxrH^G6~mhBZiYS zVXO4(8>1t#v9-3Dz}8H)T}?8sg~Rt%v8r*{Z-WWVY&anfYBUofPm!m#P1%~XxDbk% zPClto-blhpFRsv4iz`IcVs1FmZsW;X*qQ1Q#5pH~-yk5@rEht7z` zLKA9Gd>cLR);x5R4@c!P01j8FFxedN5?SR`V?98j&9t+BC=SHu{=UBG z)YLb>0VZ?jHx>4f*0bN&6p*!s$4hMiIb0~%{C)M@8}M;aWeLF&8Kv7wQ|Y8%@Uu>v z%XLIhboz}}d1oz}tYqCPJ;^lT+ZDedXqTMhYNneeS;+=hB6U7b;AGlBKvN#VH-Y6p znqmo5E<_+MoF!x)at_Y$Qjv1FK5dH|Ad7gJno;ZYnTotfd1*Kw5<`|m!H^m1zNVdL z+{CYzv>}8+Tgp*ltp2wHKlV+ic)^{xw6uf(0Mjs&gCV{ln%AuSF}^h)_uwrl6oW>j z*ODUAlax7DC2W1-)!GukoDVUEY&1+yOn3E=$uR`KEhSXOh{0c$WnZ)pj1SspR-!YB z)BlSQaukVpjrFjBOcUiDi}upNLT zv;&>&`4aWsRt07%HLB+9=AbUt*j*iLu7!Rv)y2W>A&^Y8c7owv&9KQ^T_5G@EZtMr(-ORrj(gHc_NqI+ejVR#(Kp@a zX3EFjl9pBhST<1qPUdl!-ek@+g2gnDY?oOc^RdPuplF3NQ1bn~ViIT#Namj@H-G~- zY9v@|f`Y@3gA3|qSTD;0p!T!U4<0()o>yIXvc;8qwJ(-%WwIWH$QF-^W(ce#3DsjAxLg4#SxXA#r)`M{d#>h zt#?yR4gI%x9_j~M>hpuo9x8k_=;{x&Gy8#OZ)S(~RGZ&CtMgE6J&Ov%Ka`eo9E%d< zWJus?&o@<-@%3peja7U-KwRa_@EcmfyZ)OP>Vax9tgCS4>o8QWKGXzu_IyPYe=Dq4 zA!3M6#yOY+Y-|orDOjJ+2XqjKCr1=t$nT>H-skfn9T=kgST%l*Hj2(uWVuM?uT#`0 z#rx4$dNm^+{ykOO-v0d%D=y?MYq( zR>OUY8fMV#g@d}Vl!q44aQi!dNu|SXyd|f84}PGT$2HmTJjzGmQ|H?l`4*QV_X}cL zXjKQ|FEM7O>lWjHNqdW66*qPe{;rMC-XQ4EXJ1s~lq9~Wf-WwV2%T>bgxXb#?xb~} zE!k3YznT2{mjQk&a0>mzsFqg)IWRY*fCx$PJgZUXWR|Dh=C*4uU+O-#z;Dtqxs@wH zfvltzrXoJU{7TWa*urnb{beIUzLG{_0`scNI|tZpbv#E9jn;4)x3wh()=zlf+}j+$ z&>o?iYpcgg&BY7P=wGCI$5AZQtGp4YL3vIK0UUWVQ!HG}zheGqAJwkoJ^DmL5>Xn>zSup> znL*yycTuFhSO4Kp!0A~`ldEqWjJALTjje4zd5=R#fGTiu1dux%Sf=Noq+H-5x|%^; zKTbgZlZU03=#5YC>sa%Pg9G)w%`cAlWcBbAU*#>K#*=*2MFM=~Y`|!9e0_qi3I=5w ztlAkihK339xE5`Jw`!%Rf_Kun)Y*i$g!u0XQB#v3dZLUKu;$fkLZ)2{0H>8 zxEJ!zC)L;Z6nPUC3oL?neS*(f_|{3z@fK2XbtZ#A4BL=d3Dk13-?P#uK^f`jlX)xn zoGSY1UjW2kTmL2>!=EhA;9HnePL{M3x}fUUkxUTh+oD`U_=iFPAAWaKmIbC;7%MO+hxcK_5v!{oQ?KM+5_Y*0TfUhM&+qppS01r~UmW`6?~#Tf6!pWD#6v=& z!LA8FJ5Iw2kUk7wSS$H{$+gu(eCoJ`2n%1wsgs^(~Dcmok z;7x+lbBQ`r&^zc{2t`0=&QHTjJfq>GQYU6U^vvH}gauV1f^8>lsx11#AiX4Hunv z1(C2j?XB+DC-6D@L?Ea|eJm2{>#G(&(m#6f>Fc3#vcv^ zWMFhXApk)`j_Q-)@fUCn|3_hB3?+>0%_?T_x2qV|vOu}cnb`D#G0LcV-;b>o_2qQH zzQzU1JOgFzgDoVO(Du0GkiwJi;!Q$CL}MpfidfarVsgWlKqfpCjJCRMpM7OTjj)rx zYU$bjg^!bPlT`1JevqZixE9mY?n!w`zm+aD{Rf;cjr66jnxw=3tar`6;A$|#eE5y$p*C+f949u}Cb*}-|EWiSj{|M~c z69FovNenq)UtAOnFm~>7_MDi;zPp&~RqJS0!dC4xmVPqRz)wet`VGD+Akg^AaX8?| zFg;+Xyw-=xV5lbJ0_N-0NCgToXt0dH7>u%z-d%br;ihXL_BZJ30{r0(hUa!?noitn z+7Wu1u(c|x8#GjtcVg%DGkMU07^h~>-*`uMx z5iT*n7UU9jWsF}^e!RX#;uKP%dVXWB@q5ojYOYjzg%Fpw<|4@$09K3;fA3`rg3?ad z0L66KJyC|pqjjD43g~i@Nl+*i604w9{33-jCR-}pcH2Zc!rd(GLQ^=pZ8DJbq!;iN zE=6t#e(54ym!fVWq12~;ZLO$x*Y_Q>cq6c0MJ@{KyWo?TLV*jWB^9CKqouSw6}i4R z*d7Q`DIw)t^F#Zh`5~uR{E(t(mL81werZ7)Y&~@=0p&Ccu3ZHQH6wmfpX}h1d?twk zT8~5#$WVg{aFu4&&0)OglIWi`R!iFpv>vD3L|#Ov+DimAqU)!Gqie3M?qDLw$*%*j zf#XCiF^wuYD28|GFd}qzHAinXVO-mCNiX8LxV{qVVRV~qFjrD%DhltFLeMPgIu2CX z2hW4+5HVs#*Wr5bqI z$=HsK1y+MT*Dw~FdMIgGf6uHNlND{)zc!LO*9r?#IPN2jyc-Y14VM@%?Vr{`UEbI*LvDE^0a3(Z4uKJNybVxrs?fF z3Yn(2%ML(l2b-q1W3fUr#7Mo}fwQ(uZ zb=GjU+XU_rW0|Jb!E&-yt2#@CBcX+se0?CkUc%SI@%1Xc-XC8#@fCv1(vQDRZQNUq zFVp8M#?R#mK!-H&^JSAu^>LFd(_FwNv-Ec4&t!h&t4xQsmM*egD(5!qr3SX>sF#O1 z-i1-L!t8Q%?)J$7II>Xh=bX=$;d@GB{Q}1Cxyg>mRj{z9xOwL{S%yK3x9vgK*C@&5=Ia9w$?D!Fc#A)O+6e2b5UX$Yrex0d46 zAMar5TeN2={p85%j82ZWnWJf-4#={f2Sv(muYwIG# zpX%dP(3*^w>e=zm>IUrP>;KR8^Hp285#VHYs8WKaHVfPqW!8b+l0JqIe$lx$3)~hZ z{n?>KU8s*UK8;L6{-nC+^SDQ+70R828J(7f_&e0uOSo&BOMd*^mUM3a5%eDGH1}AZ zWPiNHlO!yV)_fa^<}=1I@j;CfU&IF zpal*(sD)~(1v(QeaNcL8xfD<*Vbh&h_c65R6mX+gKPWc0P&3us_BEpgEM_y~S819| z&(?e2D!)@z>sgs0qDC4tHT)*-T&3~>oyS%m{#9EmqpWs`tvS%pi}Zimwa$8 zbBcx0tFYb9QSU$U9T4?Kv0bohM}j+|>d?);|WAWs=(b?+Q0-Po48q*mKgW%tZY zZoam9Lcd=1-~#P1Oj&W%_>Xu;`r=s z!+XoXsDsd#h5FH%d~L!)eLy9ecOn_Pi+??HZSf9`ll_19oXnAi83^T+Rspe9AZBPj z1*%1h!7e?OhY6T?Qn|W#bkex^B8~gx%!GQVAu4yr*g|KdZ!Od@GFnS)cR@yOx<@C< ztA`84a8RzHw19i@+8A43P2!ChP~d)$N08v^w6yiH&SpB+Zlj=JkLzo?dv zrtU{KQwb|6MZc)doD3_KRgnxU{Yv}#Fb&q>%j+jkap9+ z%{-(%!nXOKKG`!z^wuH3B(5XC9ulmDsU!xq+mi2QFuSA%L1SmLTChvn&_cb|DZu^$ z?sp2{iY#ZR0G7B=A88A`7PFwVGCl6v_YUk$$_%N=9d7m^eBT_`k7b}0b4_Qk+ZRRP zMc&fJ3&dRiHxV#xD{sfOgyq6&&3UcG^i`99J;ftJH77y@VU!x6UL^e#!_B?@SVIZB zy-oMDQ+$4AMx1_jpggFqtV72QePBSCMt3f49f*5w@O*ibSm#C$mYU&Ax466*WDKaR zdoVBVw^38GB4AT&v7KH!)|cV~b!`K?TfQ&_gP6AE8&uQi56{~fbKWv&r#AI`dDu>E z`oUZ~wdn^l?bN0pIIZOdW5B-0{ekn6g?3W6F8Nqgde)tk*F8Scv$=SNEk)0`QeMv_ zw_OPn5cd2Qc0XLRlvs|~p-&hrTqZcBDg60f7Mw)vVSn1ngBP2-)IUrS)WFwtE=Zs> zZ``sMKFC`^{25X|`0>Gn*XsG*NwPX9+(rw9d}SB>!1CkRxS$R&|3wEL0rWv5z?$s7 z=)-+sWxm_|&iSFjQ~iRX1pQ2ih&WgC)#T@;f$`lJ~oANXd7Hl>9WIE(~jbf3lLK zWZ|%ye!7U7&aVsycps#1+eBEXwumXie3+ib`WCoAc@Up z*UoFYy2MS=AvUifHp7ej47#BFgb;<55SvdkU=3A6{7a36&(j{N4y)!)Osc2|))3#a zyh3Kv)!1dHI`vQGDS{-PqDTxnMlZ|Bu9G?zbzN!YWM*&tHokY{ZQpc5DWPeWns)}!0bL_Ci)3Y3TE$p}GSKOTiqVL2ORd2DN4oPs$xwk8 zGM3;YVbp>p8{`VUu33^pw%`>&X?^C|5UQ`(TOHEo9TOp<&%C+2LN?JOUm+n|jL!3g zFsv7$ro^Jmtw6tLELE=%r$ldAs+J∓9$Gkqfpv@^o6!y`%As%LBNDQF~gb)=1NW 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ⅈ~*vda#Gn{9HJP9wO{G*lSE9>EA~kLHt$Ni;)8O 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

      pg>B(5h?B|*Lv4hls~LRybW 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�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 diff --git a/contracts/cwd_pre_propose_single.wasm b/contracts/cwd_pre_propose_single.wasm index 72f30670b99872cab861cc9fb2683f15bac709bb..f3869d36098779365f1600d7087506e07da0e83f 100644 GIT binary patch literal 419892 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 z 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 DY#lA* literal 409248 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≈`y4{y=VTKx2Jr{?gg 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 diff --git a/contracts/cwd_proposal_multiple.wasm b/contracts/cwd_proposal_multiple.wasm index 0889a6c0401fd7d733cf2e353e4f9f4c657451bd..94b0ca1c4bd21711eff14ccc030937a008c7d31d 100644 GIT binary patch literal 609224 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

        7Wk$G~cFKqp`ezU? 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�BA}+W+o?3&X^=kyVm(_AO&`yb9c#t7cXkYkaGd0ZMFBk zj@Rld=OL1NL4yUD@oMDZpal<+gD`SxcE)zt#BMnKAU7OuI|!Ouk(~SmAdn`bsz&v5 z{GH-rZj`_r!zVwveozo*O>fyx?w_NbBvJlP+@L2u8NeUbe{~e#>jJC*JNz)pQfbu< zP)K3X&wE#fGRR{Z5r&z8f)_4bF|91FHf)A^PD9NpL&iHS^-X(-m}~ZM^X`0`AwfDF z9U18S((Tdr6th_;Hgee{2<|up7l$j*C`-jk(fxYU74X94#irY^6z==Q4}SWQ=T=6) z1OZvG)+@fOfIrDNnUZrd=BE)inKf@8?2S(9ed-)USKl>WaaPZC+bxf9?b)>zS&uy0 z_FdBzvUI@bmGSnY_UOd1$)`T{c$D8q2d_z3h;wF9b=cuZQq$io9bP9Yg?c))$p>YJ z>l1%*k{@pNboXLb=-diPa`!7Yj2~cS)xo`SkjIC!SO83sh)F(e^CcaD^2rvS!ocHD z>Vd=jg^O?6SGF?D3_38e54?qoX*P?Wbx$Wo6;CnaRi*E&mBNT$B`&p~|-BM9X66Z+%$7lEFObakqFEHUdy$SueOWgHrN<2}{;aQTX zuX2&~F_718mdj$yWKKTAWv?^CHJ80w{3W}vx*2fp4#YKcRt6ljbt~;w3!m6W1N) z2W;F6Vz{;yq@s&EE@gOp)a~$U76D)NC_(0Vwhgl&^Uw02uwAa22BE<99!JETgMlXH)R>Xd`wn|z@=*lAIJ_H9skADRl$YpyECy_%mzpOSg4@RpO%dSi_7 zH}CQoorGU=ZC99Q9+>g4MO%1!Ux}sl@BRQy7G)}686d#;#5#dRA3z?bJYrt^m}E6N z1n-1HlEOH8M+^pSiSI}`JPzFicXkw*XfRrQ^ zrqf0>>NYf;oD*rt$p(PQJ<^;|I6%F)D|_OEv2wd76Zt7O#pDOams-;yKazfe{A|M& z^=CwW!-o9emY|sH0Ga^Lyw|uwTdOOaNMyHj0bSUPMi69omm`#^tRS?-cq-(V0+iGp zG<4H_4ITMmf7;d4!CE#o(0;H^byQx>c#MWzxGP-T87F{fGO386>bF%shj0Ta-mw14M2? zNkH^DqpfxAgVToB6M~mbV{Od2!b|=BgTX5=>Xh&j`fd$gXl$}M_-95QHxh9JDdQ$v zkTQ&6c?>(+>TF@CTWxCQu~zr7d|&gBA<*%*z_c>Eb(P*N3)E+QFy)>`p;g89^TDBy zO1WEZICR6U&QYQ5g`Q`Md+J{^#E!G#%0DU&LlA634zuD2YGV1nsLn5GIzJQTbW`>v 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%0A4}4)ksZ_AxO>6;~uMOl| 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�j$>U(7Fkf9HJ|K2LNSX%mh^ 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 literal 605068 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
        e-Lg2vvHcDU`;?85D>xRwxhF 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        GPu-PNEBmO4zHfawtRT=dlfX8L?b-?wI*QEr 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

        gjG?4ypNqB=s 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